From 3130e68f89634b226c70ff771ddfa27c488e95d5 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 5 Jan 2019 20:22:44 -0500 Subject: Dump map groups and pointers --- data/maps/groups.inc | 1830 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 1830 insertions(+) create mode 100644 data/maps/groups.inc (limited to 'data/maps') diff --git a/data/maps/groups.inc b/data/maps/groups.inc new file mode 100644 index 000000000..27168da81 --- /dev/null +++ b/data/maps/groups.inc @@ -0,0 +1,1830 @@ +gMap_00_00:: @ 834F188 + .incbin "baserom.gba", 0x34F188, 0x1C + +gMap_00_01:: @ 834F1A4 + .incbin "baserom.gba", 0x34F1A4, 0x1C + +gMap_00_02:: @ 834F1C0 + .incbin "baserom.gba", 0x34F1C0, 0x1C + +gMap_00_03:: @ 834F1DC + .incbin "baserom.gba", 0x34F1DC, 0x1C + +gMap_00_04:: @ 834F1F8 + .incbin "baserom.gba", 0x34F1F8, 0x1C + +gMap_01_00:: @ 834F214 + .incbin "baserom.gba", 0x34F214, 0x1C + +gMap_01_01:: @ 834F230 + .incbin "baserom.gba", 0x34F230, 0x1C + +gMap_01_02:: @ 834F24C + .incbin "baserom.gba", 0x34F24C, 0x1C + +gMap_01_03:: @ 834F268 + .incbin "baserom.gba", 0x34F268, 0x1C + +gMap_01_04:: @ 834F284 + .incbin "baserom.gba", 0x34F284, 0x1C + +gMap_01_05:: @ 834F2A0 + .incbin "baserom.gba", 0x34F2A0, 0x1C + +gMap_01_06:: @ 834F2BC + .incbin "baserom.gba", 0x34F2BC, 0x1C + +gMap_01_07:: @ 834F2D8 + .incbin "baserom.gba", 0x34F2D8, 0x1C + +gMap_01_08:: @ 834F2F4 + .incbin "baserom.gba", 0x34F2F4, 0x1C + +gMap_01_09:: @ 834F310 + .incbin "baserom.gba", 0x34F310, 0x1C + +gMap_01_10:: @ 834F32C + .incbin "baserom.gba", 0x34F32C, 0x1C + +gMap_01_11:: @ 834F348 + .incbin "baserom.gba", 0x34F348, 0x1C + +gMap_01_12:: @ 834F364 + .incbin "baserom.gba", 0x34F364, 0x1C + +gMap_01_13:: @ 834F380 + .incbin "baserom.gba", 0x34F380, 0x1C + +gMap_01_14:: @ 834F39C + .incbin "baserom.gba", 0x34F39C, 0x1C + +gMap_01_15:: @ 834F3B8 + .incbin "baserom.gba", 0x34F3B8, 0x1C + +gMap_01_16:: @ 834F3D4 + .incbin "baserom.gba", 0x34F3D4, 0x1C + +gMap_01_17:: @ 834F3F0 + .incbin "baserom.gba", 0x34F3F0, 0x1C + +gMap_01_18:: @ 834F40C + .incbin "baserom.gba", 0x34F40C, 0x1C + +gMap_01_19:: @ 834F428 + .incbin "baserom.gba", 0x34F428, 0x1C + +gMap_01_20:: @ 834F444 + .incbin "baserom.gba", 0x34F444, 0x1C + +gMap_01_21:: @ 834F460 + .incbin "baserom.gba", 0x34F460, 0x1C + +gMap_01_22:: @ 834F47C + .incbin "baserom.gba", 0x34F47C, 0x1C + +gMap_01_23:: @ 834F498 + .incbin "baserom.gba", 0x34F498, 0x1C + +gMap_01_24:: @ 834F4B4 + .incbin "baserom.gba", 0x34F4B4, 0x1C + +gMap_01_25:: @ 834F4D0 + .incbin "baserom.gba", 0x34F4D0, 0x1C + +gMap_01_26:: @ 834F4EC + .incbin "baserom.gba", 0x34F4EC, 0x1C + +gMap_01_27:: @ 834F508 + .incbin "baserom.gba", 0x34F508, 0x1C + +gMap_01_28:: @ 834F524 + .incbin "baserom.gba", 0x34F524, 0x1C + +gMap_01_29:: @ 834F540 + .incbin "baserom.gba", 0x34F540, 0x1C + +gMap_01_30:: @ 834F55C + .incbin "baserom.gba", 0x34F55C, 0x1C + +gMap_01_31:: @ 834F578 + .incbin "baserom.gba", 0x34F578, 0x1C + +gMap_01_32:: @ 834F594 + .incbin "baserom.gba", 0x34F594, 0x1C + +gMap_01_33:: @ 834F5B0 + .incbin "baserom.gba", 0x34F5B0, 0x1C + +gMap_01_34:: @ 834F5CC + .incbin "baserom.gba", 0x34F5CC, 0x1C + +gMap_01_35:: @ 834F5E8 + .incbin "baserom.gba", 0x34F5E8, 0x1C + +gMap_01_36:: @ 834F604 + .incbin "baserom.gba", 0x34F604, 0x1C + +gMap_01_37:: @ 834F620 + .incbin "baserom.gba", 0x34F620, 0x1C + +gMap_01_38:: @ 834F63C + .incbin "baserom.gba", 0x34F63C, 0x1C + +gMap_01_39:: @ 834F658 + .incbin "baserom.gba", 0x34F658, 0x1C + +gMap_01_40:: @ 834F674 + .incbin "baserom.gba", 0x34F674, 0x1C + +gMap_01_41:: @ 834F690 + .incbin "baserom.gba", 0x34F690, 0x1C + +gMap_01_42:: @ 834F6AC + .incbin "baserom.gba", 0x34F6AC, 0x1C + +gMap_01_43:: @ 834F6C8 + .incbin "baserom.gba", 0x34F6C8, 0x1C + +gMap_01_44:: @ 834F6E4 + .incbin "baserom.gba", 0x34F6E4, 0x1C + +gMap_01_45:: @ 834F700 + .incbin "baserom.gba", 0x34F700, 0x1C + +gMap_01_46:: @ 834F71C + .incbin "baserom.gba", 0x34F71C, 0x1C + +gMap_01_47:: @ 834F738 + .incbin "baserom.gba", 0x34F738, 0x1C + +gMap_01_48:: @ 834F754 + .incbin "baserom.gba", 0x34F754, 0x1C + +gMap_01_49:: @ 834F770 + .incbin "baserom.gba", 0x34F770, 0x1C + +gMap_01_50:: @ 834F78C + .incbin "baserom.gba", 0x34F78C, 0x1C + +gMap_01_51:: @ 834F7A8 + .incbin "baserom.gba", 0x34F7A8, 0x1C + +gMap_01_52:: @ 834F7C4 + .incbin "baserom.gba", 0x34F7C4, 0x1C + +gMap_01_53:: @ 834F7E0 + .incbin "baserom.gba", 0x34F7E0, 0x1C + +gMap_01_54:: @ 834F7FC + .incbin "baserom.gba", 0x34F7FC, 0x1C + +gMap_01_55:: @ 834F818 + .incbin "baserom.gba", 0x34F818, 0x1C + +gMap_01_56:: @ 834F834 + .incbin "baserom.gba", 0x34F834, 0x1C + +gMap_01_57:: @ 834F850 + .incbin "baserom.gba", 0x34F850, 0x1C + +gMap_01_58:: @ 834F86C + .incbin "baserom.gba", 0x34F86C, 0x1C + +gMap_01_59:: @ 834F888 + .incbin "baserom.gba", 0x34F888, 0x1C + +gMap_01_60:: @ 834F8A4 + .incbin "baserom.gba", 0x34F8A4, 0x1C + +gMap_01_61:: @ 834F8C0 + .incbin "baserom.gba", 0x34F8C0, 0x1C + +gMap_01_62:: @ 834F8DC + .incbin "baserom.gba", 0x34F8DC, 0x1C + +gMap_01_63:: @ 834F8F8 + .incbin "baserom.gba", 0x34F8F8, 0x1C + +gMap_01_64:: @ 834F914 + .incbin "baserom.gba", 0x34F914, 0x1C + +gMap_01_65:: @ 834F930 + .incbin "baserom.gba", 0x34F930, 0x1C + +gMap_01_66:: @ 834F94C + .incbin "baserom.gba", 0x34F94C, 0x1C + +gMap_01_67:: @ 834F968 + .incbin "baserom.gba", 0x34F968, 0x1C + +gMap_01_68:: @ 834F984 + .incbin "baserom.gba", 0x34F984, 0x1C + +gMap_01_69:: @ 834F9A0 + .incbin "baserom.gba", 0x34F9A0, 0x1C + +gMap_01_70:: @ 834F9BC + .incbin "baserom.gba", 0x34F9BC, 0x1C + +gMap_01_71:: @ 834F9D8 + .incbin "baserom.gba", 0x34F9D8, 0x1C + +gMap_01_72:: @ 834F9F4 + .incbin "baserom.gba", 0x34F9F4, 0x1C + +gMap_01_73:: @ 834FA10 + .incbin "baserom.gba", 0x34FA10, 0x1C + +gMap_01_74:: @ 834FA2C + .incbin "baserom.gba", 0x34FA2C, 0x1C + +gMap_01_75:: @ 834FA48 + .incbin "baserom.gba", 0x34FA48, 0x1C + +gMap_01_76:: @ 834FA64 + .incbin "baserom.gba", 0x34FA64, 0x1C + +gMap_01_77:: @ 834FA80 + .incbin "baserom.gba", 0x34FA80, 0x1C + +gMap_01_78:: @ 834FA9C + .incbin "baserom.gba", 0x34FA9C, 0x1C + +gMap_01_79:: @ 834FAB8 + .incbin "baserom.gba", 0x34FAB8, 0x1C + +gMap_01_80:: @ 834FAD4 + .incbin "baserom.gba", 0x34FAD4, 0x1C + +gMap_01_81:: @ 834FAF0 + .incbin "baserom.gba", 0x34FAF0, 0x1C + +gMap_01_82:: @ 834FB0C + .incbin "baserom.gba", 0x34FB0C, 0x1C + +gMap_01_83:: @ 834FB28 + .incbin "baserom.gba", 0x34FB28, 0x1C + +gMap_01_84:: @ 834FB44 + .incbin "baserom.gba", 0x34FB44, 0x1C + +gMap_01_85:: @ 834FB60 + .incbin "baserom.gba", 0x34FB60, 0x1C + +gMap_01_86:: @ 834FB7C + .incbin "baserom.gba", 0x34FB7C, 0x1C + +gMap_01_87:: @ 834FB98 + .incbin "baserom.gba", 0x34FB98, 0x1C + +gMap_01_88:: @ 834FBB4 + .incbin "baserom.gba", 0x34FBB4, 0x1C + +gMap_01_89:: @ 834FBD0 + .incbin "baserom.gba", 0x34FBD0, 0x1C + +gMap_01_90:: @ 834FBEC + .incbin "baserom.gba", 0x34FBEC, 0x1C + +gMap_01_91:: @ 834FC08 + .incbin "baserom.gba", 0x34FC08, 0x1C + +gMap_01_92:: @ 834FC24 + .incbin "baserom.gba", 0x34FC24, 0x1C + +gMap_01_93:: @ 834FC40 + .incbin "baserom.gba", 0x34FC40, 0x1C + +gMap_01_94:: @ 834FC5C + .incbin "baserom.gba", 0x34FC5C, 0x1C + +gMap_01_95:: @ 834FC78 + .incbin "baserom.gba", 0x34FC78, 0x1C + +gMap_01_96:: @ 834FC94 + .incbin "baserom.gba", 0x34FC94, 0x1C + +gMap_01_97:: @ 834FCB0 + .incbin "baserom.gba", 0x34FCB0, 0x1C + +gMap_01_98:: @ 834FCCC + .incbin "baserom.gba", 0x34FCCC, 0x1C + +gMap_01_99:: @ 834FCE8 + .incbin "baserom.gba", 0x34FCE8, 0x1C + +gMap_01_100:: @ 834FD04 + .incbin "baserom.gba", 0x34FD04, 0x1C + +gMap_01_101:: @ 834FD20 + .incbin "baserom.gba", 0x34FD20, 0x1C + +gMap_01_102:: @ 834FD3C + .incbin "baserom.gba", 0x34FD3C, 0x1C + +gMap_01_103:: @ 834FD58 + .incbin "baserom.gba", 0x34FD58, 0x1C + +gMap_01_104:: @ 834FD74 + .incbin "baserom.gba", 0x34FD74, 0x1C + +gMap_01_105:: @ 834FD90 + .incbin "baserom.gba", 0x34FD90, 0x1C + +gMap_01_106:: @ 834FDAC + .incbin "baserom.gba", 0x34FDAC, 0x1C + +gMap_01_107:: @ 834FDC8 + .incbin "baserom.gba", 0x34FDC8, 0x1C + +gMap_01_108:: @ 834FDE4 + .incbin "baserom.gba", 0x34FDE4, 0x1C + +gMap_01_109:: @ 834FE00 + .incbin "baserom.gba", 0x34FE00, 0x1C + +gMap_01_110:: @ 834FE1C + .incbin "baserom.gba", 0x34FE1C, 0x1C + +gMap_01_111:: @ 834FE38 + .incbin "baserom.gba", 0x34FE38, 0x1C + +gMap_01_112:: @ 834FE54 + .incbin "baserom.gba", 0x34FE54, 0x1C + +gMap_01_113:: @ 834FE70 + .incbin "baserom.gba", 0x34FE70, 0x1C + +gMap_01_114:: @ 834FE8C + .incbin "baserom.gba", 0x34FE8C, 0x1C + +gMap_01_115:: @ 834FEA8 + .incbin "baserom.gba", 0x34FEA8, 0x1C + +gMap_01_116:: @ 834FEC4 + .incbin "baserom.gba", 0x34FEC4, 0x1C + +gMap_01_117:: @ 834FEE0 + .incbin "baserom.gba", 0x34FEE0, 0x1C + +gMap_01_118:: @ 834FEFC + .incbin "baserom.gba", 0x34FEFC, 0x1C + +gMap_01_119:: @ 834FF18 + .incbin "baserom.gba", 0x34FF18, 0x1C + +gMap_01_120:: @ 834FF34 + .incbin "baserom.gba", 0x34FF34, 0x1C + +gMap_01_121:: @ 834FF50 + .incbin "baserom.gba", 0x34FF50, 0x1C + +gMap_01_122:: @ 834FF6C + .incbin "baserom.gba", 0x34FF6C, 0x1C + +gMap_02_00:: @ 834FF88 + .incbin "baserom.gba", 0x34FF88, 0x1C + +gMap_02_01:: @ 834FFA4 + .incbin "baserom.gba", 0x34FFA4, 0x1C + +gMap_02_02:: @ 834FFC0 + .incbin "baserom.gba", 0x34FFC0, 0x1C + +gMap_02_03:: @ 834FFDC + .incbin "baserom.gba", 0x34FFDC, 0x1C + +gMap_02_04:: @ 834FFF8 + .incbin "baserom.gba", 0x34FFF8, 0x1C + +gMap_02_05:: @ 8350014 + .incbin "baserom.gba", 0x350014, 0x1C + +gMap_02_06:: @ 8350030 + .incbin "baserom.gba", 0x350030, 0x1C + +gMap_02_07:: @ 835004C + .incbin "baserom.gba", 0x35004C, 0x1C + +gMap_02_08:: @ 8350068 + .incbin "baserom.gba", 0x350068, 0x1C + +gMap_02_09:: @ 8350084 + .incbin "baserom.gba", 0x350084, 0x1C + +gMap_02_10:: @ 83500A0 + .incbin "baserom.gba", 0x3500A0, 0x1C + +gMap_02_11:: @ 83500BC + .incbin "baserom.gba", 0x3500BC, 0x1C + +gMap_02_12:: @ 83500D8 + .incbin "baserom.gba", 0x3500D8, 0x1C + +gMap_02_13:: @ 83500F4 + .incbin "baserom.gba", 0x3500F4, 0x1C + +gMap_02_14:: @ 8350110 + .incbin "baserom.gba", 0x350110, 0x1C + +gMap_02_15:: @ 835012C + .incbin "baserom.gba", 0x35012C, 0x1C + +gMap_02_16:: @ 8350148 + .incbin "baserom.gba", 0x350148, 0x1C + +gMap_02_17:: @ 8350164 + .incbin "baserom.gba", 0x350164, 0x1C + +gMap_02_18:: @ 8350180 + .incbin "baserom.gba", 0x350180, 0x1C + +gMap_02_19:: @ 835019C + .incbin "baserom.gba", 0x35019C, 0x1C + +gMap_02_20:: @ 83501B8 + .incbin "baserom.gba", 0x3501B8, 0x1C + +gMap_02_21:: @ 83501D4 + .incbin "baserom.gba", 0x3501D4, 0x1C + +gMap_02_22:: @ 83501F0 + .incbin "baserom.gba", 0x3501F0, 0x1C + +gMap_02_23:: @ 835020C + .incbin "baserom.gba", 0x35020C, 0x1C + +gMap_02_24:: @ 8350228 + .incbin "baserom.gba", 0x350228, 0x1C + +gMap_02_25:: @ 8350244 + .incbin "baserom.gba", 0x350244, 0x1C + +gMap_02_26:: @ 8350260 + .incbin "baserom.gba", 0x350260, 0x1C + +gMap_02_27:: @ 835027C + .incbin "baserom.gba", 0x35027C, 0x1C + +gMap_02_28:: @ 8350298 + .incbin "baserom.gba", 0x350298, 0x1C + +gMap_02_29:: @ 83502B4 + .incbin "baserom.gba", 0x3502B4, 0x1C + +gMap_02_30:: @ 83502D0 + .incbin "baserom.gba", 0x3502D0, 0x1C + +gMap_02_31:: @ 83502EC + .incbin "baserom.gba", 0x3502EC, 0x1C + +gMap_02_32:: @ 8350308 + .incbin "baserom.gba", 0x350308, 0x1C + +gMap_02_33:: @ 8350324 + .incbin "baserom.gba", 0x350324, 0x1C + +gMap_02_34:: @ 8350340 + .incbin "baserom.gba", 0x350340, 0x1C + +gMap_02_35:: @ 835035C + .incbin "baserom.gba", 0x35035C, 0x1C + +gMap_02_36:: @ 8350378 + .incbin "baserom.gba", 0x350378, 0x1C + +gMap_02_37:: @ 8350394 + .incbin "baserom.gba", 0x350394, 0x1C + +gMap_02_38:: @ 83503B0 + .incbin "baserom.gba", 0x3503B0, 0x1C + +gMap_02_39:: @ 83503CC + .incbin "baserom.gba", 0x3503CC, 0x1C + +gMap_02_40:: @ 83503E8 + .incbin "baserom.gba", 0x3503E8, 0x1C + +gMap_02_41:: @ 8350404 + .incbin "baserom.gba", 0x350404, 0x1C + +gMap_02_42:: @ 8350420 + .incbin "baserom.gba", 0x350420, 0x1C + +gMap_02_43:: @ 835043C + .incbin "baserom.gba", 0x35043C, 0x1C + +gMap_02_44:: @ 8350458 + .incbin "baserom.gba", 0x350458, 0x1C + +gMap_02_45:: @ 8350474 + .incbin "baserom.gba", 0x350474, 0x1C + +gMap_02_46:: @ 8350490 + .incbin "baserom.gba", 0x350490, 0x1C + +gMap_02_47:: @ 83504AC + .incbin "baserom.gba", 0x3504AC, 0x1C + +gMap_02_48:: @ 83504C8 + .incbin "baserom.gba", 0x3504C8, 0x1C + +gMap_02_49:: @ 83504E4 + .incbin "baserom.gba", 0x3504E4, 0x1C + +gMap_02_50:: @ 8350500 + .incbin "baserom.gba", 0x350500, 0x1C + +gMap_02_51:: @ 835051C + .incbin "baserom.gba", 0x35051C, 0x1C + +gMap_02_52:: @ 8350538 + .incbin "baserom.gba", 0x350538, 0x1C + +gMap_02_53:: @ 8350554 + .incbin "baserom.gba", 0x350554, 0x1C + +gMap_02_54:: @ 8350570 + .incbin "baserom.gba", 0x350570, 0x1C + +gMap_02_55:: @ 835058C + .incbin "baserom.gba", 0x35058C, 0x1C + +gMap_02_56:: @ 83505A8 + .incbin "baserom.gba", 0x3505A8, 0x1C + +gMap_02_57:: @ 83505C4 + .incbin "baserom.gba", 0x3505C4, 0x1C + +gMap_02_58:: @ 83505E0 + .incbin "baserom.gba", 0x3505E0, 0x1C + +gMap_02_59:: @ 83505FC + .incbin "baserom.gba", 0x3505FC, 0x1C + +gMap_03_00:: @ 8350618 + .incbin "baserom.gba", 0x350618, 0x1C + +gMap_03_01:: @ 8350634 + .incbin "baserom.gba", 0x350634, 0x1C + +gMap_03_02:: @ 8350650 + .incbin "baserom.gba", 0x350650, 0x1C + +gMap_03_03:: @ 835066C + .incbin "baserom.gba", 0x35066C, 0x1C + +gMap_03_04:: @ 8350688 + .incbin "baserom.gba", 0x350688, 0x1C + +gMap_03_05:: @ 83506A4 + .incbin "baserom.gba", 0x3506A4, 0x1C + +gMap_03_06:: @ 83506C0 + .incbin "baserom.gba", 0x3506C0, 0x1C + +gMap_03_07:: @ 83506DC + .incbin "baserom.gba", 0x3506DC, 0x1C + +gMap_03_08:: @ 83506F8 + .incbin "baserom.gba", 0x3506F8, 0x1C + +gMap_03_09:: @ 8350714 + .incbin "baserom.gba", 0x350714, 0x1C + +gMap_03_10:: @ 8350730 + .incbin "baserom.gba", 0x350730, 0x1C + +gMap_03_11:: @ 835074C + .incbin "baserom.gba", 0x35074C, 0x1C + +gMap_03_12:: @ 8350768 + .incbin "baserom.gba", 0x350768, 0x1C + +gMap_03_13:: @ 8350784 + .incbin "baserom.gba", 0x350784, 0x1C + +gMap_03_14:: @ 83507A0 + .incbin "baserom.gba", 0x3507A0, 0x1C + +gMap_03_15:: @ 83507BC + .incbin "baserom.gba", 0x3507BC, 0x1C + +gMap_03_16:: @ 83507D8 + .incbin "baserom.gba", 0x3507D8, 0x1C + +gMap_03_17:: @ 83507F4 + .incbin "baserom.gba", 0x3507F4, 0x1C + +gMap_03_18:: @ 8350810 + .incbin "baserom.gba", 0x350810, 0x1C + +gMap_03_19:: @ 835082C + .incbin "baserom.gba", 0x35082C, 0x1C + +gMap_03_20:: @ 8350848 + .incbin "baserom.gba", 0x350848, 0x1C + +gMap_03_21:: @ 8350864 + .incbin "baserom.gba", 0x350864, 0x1C + +gMap_03_22:: @ 8350880 + .incbin "baserom.gba", 0x350880, 0x1C + +gMap_03_23:: @ 835089C + .incbin "baserom.gba", 0x35089C, 0x1C + +gMap_03_24:: @ 83508B8 + .incbin "baserom.gba", 0x3508B8, 0x1C + +gMap_03_25:: @ 83508D4 + .incbin "baserom.gba", 0x3508D4, 0x1C + +gMap_03_26:: @ 83508F0 + .incbin "baserom.gba", 0x3508F0, 0x1C + +gMap_03_27:: @ 835090C + .incbin "baserom.gba", 0x35090C, 0x1C + +gMap_03_28:: @ 8350928 + .incbin "baserom.gba", 0x350928, 0x1C + +gMap_03_29:: @ 8350944 + .incbin "baserom.gba", 0x350944, 0x1C + +gMap_03_30:: @ 8350960 + .incbin "baserom.gba", 0x350960, 0x1C + +gMap_03_31:: @ 835097C + .incbin "baserom.gba", 0x35097C, 0x1C + +gMap_03_32:: @ 8350998 + .incbin "baserom.gba", 0x350998, 0x1C + +gMap_03_33:: @ 83509B4 + .incbin "baserom.gba", 0x3509B4, 0x1C + +gMap_03_34:: @ 83509D0 + .incbin "baserom.gba", 0x3509D0, 0x1C + +gMap_03_35:: @ 83509EC + .incbin "baserom.gba", 0x3509EC, 0x1C + +gMap_03_36:: @ 8350A08 + .incbin "baserom.gba", 0x350A08, 0x1C + +gMap_03_37:: @ 8350A24 + .incbin "baserom.gba", 0x350A24, 0x1C + +gMap_03_38:: @ 8350A40 + .incbin "baserom.gba", 0x350A40, 0x1C + +gMap_03_39:: @ 8350A5C + .incbin "baserom.gba", 0x350A5C, 0x1C + +gMap_03_40:: @ 8350A78 + .incbin "baserom.gba", 0x350A78, 0x1C + +gMap_03_41:: @ 8350A94 + .incbin "baserom.gba", 0x350A94, 0x1C + +gMap_03_42:: @ 8350AB0 + .incbin "baserom.gba", 0x350AB0, 0x1C + +gMap_03_43:: @ 8350ACC + .incbin "baserom.gba", 0x350ACC, 0x1C + +gMap_03_44:: @ 8350AE8 + .incbin "baserom.gba", 0x350AE8, 0x1C + +gMap_03_45:: @ 8350B04 + .incbin "baserom.gba", 0x350B04, 0x1C + +gMap_03_46:: @ 8350B20 + .incbin "baserom.gba", 0x350B20, 0x1C + +gMap_03_47:: @ 8350B3C + .incbin "baserom.gba", 0x350B3C, 0x1C + +gMap_03_48:: @ 8350B58 + .incbin "baserom.gba", 0x350B58, 0x1C + +gMap_03_49:: @ 8350B74 + .incbin "baserom.gba", 0x350B74, 0x1C + +gMap_03_50:: @ 8350B90 + .incbin "baserom.gba", 0x350B90, 0x1C + +gMap_03_51:: @ 8350BAC + .incbin "baserom.gba", 0x350BAC, 0x1C + +gMap_03_52:: @ 8350BC8 + .incbin "baserom.gba", 0x350BC8, 0x1C + +gMap_03_53:: @ 8350BE4 + .incbin "baserom.gba", 0x350BE4, 0x1C + +gMap_03_54:: @ 8350C00 + .incbin "baserom.gba", 0x350C00, 0x1C + +gMap_03_55:: @ 8350C1C + .incbin "baserom.gba", 0x350C1C, 0x1C + +gMap_03_56:: @ 8350C38 + .incbin "baserom.gba", 0x350C38, 0x1C + +gMap_03_57:: @ 8350C54 + .incbin "baserom.gba", 0x350C54, 0x1C + +gMap_03_58:: @ 8350C70 + .incbin "baserom.gba", 0x350C70, 0x1C + +gMap_03_59:: @ 8350C8C + .incbin "baserom.gba", 0x350C8C, 0x1C + +gMap_03_60:: @ 8350CA8 + .incbin "baserom.gba", 0x350CA8, 0x1C + +gMap_03_61:: @ 8350CC4 + .incbin "baserom.gba", 0x350CC4, 0x1C + +gMap_03_62:: @ 8350CE0 + .incbin "baserom.gba", 0x350CE0, 0x1C + +gMap_03_63:: @ 8350CFC + .incbin "baserom.gba", 0x350CFC, 0x1C + +gMap_03_64:: @ 8350D18 + .incbin "baserom.gba", 0x350D18, 0x1C + +gMap_03_65:: @ 8350D34 + .incbin "baserom.gba", 0x350D34, 0x1C + +gMap_04_00:: @ 8350D50 + .incbin "baserom.gba", 0x350D50, 0x1C + +gMap_04_01:: @ 8350D6C + .incbin "baserom.gba", 0x350D6C, 0x1C + +gMap_04_02:: @ 8350D88 + .incbin "baserom.gba", 0x350D88, 0x1C + +gMap_04_03:: @ 8350DA4 + .incbin "baserom.gba", 0x350DA4, 0x1C + +gMap_05_00:: @ 8350DC0 + .incbin "baserom.gba", 0x350DC0, 0x1C + +gMap_05_01:: @ 8350DDC + .incbin "baserom.gba", 0x350DDC, 0x1C + +gMap_05_02:: @ 8350DF8 + .incbin "baserom.gba", 0x350DF8, 0x1C + +gMap_05_03:: @ 8350E14 + .incbin "baserom.gba", 0x350E14, 0x1C + +gMap_05_04:: @ 8350E30 + .incbin "baserom.gba", 0x350E30, 0x1C + +gMap_05_05:: @ 8350E4C + .incbin "baserom.gba", 0x350E4C, 0x1C + +gMap_06_00:: @ 8350E68 + .incbin "baserom.gba", 0x350E68, 0x1C + +gMap_06_01:: @ 8350E84 + .incbin "baserom.gba", 0x350E84, 0x1C + +gMap_06_02:: @ 8350EA0 + .incbin "baserom.gba", 0x350EA0, 0x1C + +gMap_06_03:: @ 8350EBC + .incbin "baserom.gba", 0x350EBC, 0x1C + +gMap_06_04:: @ 8350ED8 + .incbin "baserom.gba", 0x350ED8, 0x1C + +gMap_06_05:: @ 8350EF4 + .incbin "baserom.gba", 0x350EF4, 0x1C + +gMap_06_06:: @ 8350F10 + .incbin "baserom.gba", 0x350F10, 0x1C + +gMap_06_07:: @ 8350F2C + .incbin "baserom.gba", 0x350F2C, 0x1C + +gMap_07_00:: @ 8350F48 + .incbin "baserom.gba", 0x350F48, 0x1C + +gMap_07_01:: @ 8350F64 + .incbin "baserom.gba", 0x350F64, 0x1C + +gMap_07_02:: @ 8350F80 + .incbin "baserom.gba", 0x350F80, 0x1C + +gMap_07_03:: @ 8350F9C + .incbin "baserom.gba", 0x350F9C, 0x1C + +gMap_07_04:: @ 8350FB8 + .incbin "baserom.gba", 0x350FB8, 0x1C + +gMap_07_05:: @ 8350FD4 + .incbin "baserom.gba", 0x350FD4, 0x1C + +gMap_07_06:: @ 8350FF0 + .incbin "baserom.gba", 0x350FF0, 0x1C + +gMap_07_07:: @ 835100C + .incbin "baserom.gba", 0x35100C, 0x1C + +gMap_07_08:: @ 8351028 + .incbin "baserom.gba", 0x351028, 0x1C + +gMap_07_09:: @ 8351044 + .incbin "baserom.gba", 0x351044, 0x1C + +gMap_08_00:: @ 8351060 + .incbin "baserom.gba", 0x351060, 0x1C + +gMap_08_01:: @ 835107C + .incbin "baserom.gba", 0x35107C, 0x1C + +gMap_08_02:: @ 8351098 + .incbin "baserom.gba", 0x351098, 0x1C + +gMap_08_03:: @ 83510B4 + .incbin "baserom.gba", 0x3510B4, 0x1C + +gMap_08_04:: @ 83510D0 + .incbin "baserom.gba", 0x3510D0, 0x1C + +gMap_08_05:: @ 83510EC + .incbin "baserom.gba", 0x3510EC, 0x1C + +gMap_09_00:: @ 8351108 + .incbin "baserom.gba", 0x351108, 0x1C + +gMap_09_01:: @ 8351124 + .incbin "baserom.gba", 0x351124, 0x1C + +gMap_09_02:: @ 8351140 + .incbin "baserom.gba", 0x351140, 0x1C + +gMap_09_03:: @ 835115C + .incbin "baserom.gba", 0x35115C, 0x1C + +gMap_09_04:: @ 8351178 + .incbin "baserom.gba", 0x351178, 0x1C + +gMap_09_05:: @ 8351194 + .incbin "baserom.gba", 0x351194, 0x1C + +gMap_09_06:: @ 83511B0 + .incbin "baserom.gba", 0x3511B0, 0x1C + +gMap_09_07:: @ 83511CC + .incbin "baserom.gba", 0x3511CC, 0x1C + +gMap_10_00:: @ 83511E8 + .incbin "baserom.gba", 0x3511E8, 0x1C + +gMap_10_01:: @ 8351204 + .incbin "baserom.gba", 0x351204, 0x1C + +gMap_10_02:: @ 8351220 + .incbin "baserom.gba", 0x351220, 0x1C + +gMap_10_03:: @ 835123C + .incbin "baserom.gba", 0x35123C, 0x1C + +gMap_10_04:: @ 8351258 + .incbin "baserom.gba", 0x351258, 0x1C + +gMap_10_05:: @ 8351274 + .incbin "baserom.gba", 0x351274, 0x1C + +gMap_10_06:: @ 8351290 + .incbin "baserom.gba", 0x351290, 0x1C + +gMap_10_07:: @ 83512AC + .incbin "baserom.gba", 0x3512AC, 0x1C + +gMap_10_08:: @ 83512C8 + .incbin "baserom.gba", 0x3512C8, 0x1C + +gMap_10_09:: @ 83512E4 + .incbin "baserom.gba", 0x3512E4, 0x1C + +gMap_10_10:: @ 8351300 + .incbin "baserom.gba", 0x351300, 0x1C + +gMap_10_11:: @ 835131C + .incbin "baserom.gba", 0x35131C, 0x1C + +gMap_10_12:: @ 8351338 + .incbin "baserom.gba", 0x351338, 0x1C + +gMap_10_13:: @ 8351354 + .incbin "baserom.gba", 0x351354, 0x1C + +gMap_10_14:: @ 8351370 + .incbin "baserom.gba", 0x351370, 0x1C + +gMap_10_15:: @ 835138C + .incbin "baserom.gba", 0x35138C, 0x1C + +gMap_10_16:: @ 83513A8 + .incbin "baserom.gba", 0x3513A8, 0x1C + +gMap_10_17:: @ 83513C4 + .incbin "baserom.gba", 0x3513C4, 0x1C + +gMap_10_18:: @ 83513E0 + .incbin "baserom.gba", 0x3513E0, 0x1C + +gMap_10_19:: @ 83513FC + .incbin "baserom.gba", 0x3513FC, 0x1C + +gMap_11_00:: @ 8351418 + .incbin "baserom.gba", 0x351418, 0x1C + +gMap_11_01:: @ 8351434 + .incbin "baserom.gba", 0x351434, 0x1C + +gMap_11_02:: @ 8351450 + .incbin "baserom.gba", 0x351450, 0x1C + +gMap_11_03:: @ 835146C + .incbin "baserom.gba", 0x35146C, 0x1C + +gMap_11_04:: @ 8351488 + .incbin "baserom.gba", 0x351488, 0x1C + +gMap_11_05:: @ 83514A4 + .incbin "baserom.gba", 0x3514A4, 0x1C + +gMap_11_06:: @ 83514C0 + .incbin "baserom.gba", 0x3514C0, 0x1C + +gMap_11_07:: @ 83514DC + .incbin "baserom.gba", 0x3514DC, 0x1C + +gMap_11_08:: @ 83514F8 + .incbin "baserom.gba", 0x3514F8, 0x1C + +gMap_11_09:: @ 8351514 + .incbin "baserom.gba", 0x351514, 0x1C + +gMap_12_00:: @ 8351530 + .incbin "baserom.gba", 0x351530, 0x1C + +gMap_12_01:: @ 835154C + .incbin "baserom.gba", 0x35154C, 0x1C + +gMap_12_02:: @ 8351568 + .incbin "baserom.gba", 0x351568, 0x1C + +gMap_12_03:: @ 8351584 + .incbin "baserom.gba", 0x351584, 0x1C + +gMap_12_04:: @ 83515A0 + .incbin "baserom.gba", 0x3515A0, 0x1C + +gMap_12_05:: @ 83515BC + .incbin "baserom.gba", 0x3515BC, 0x1C + +gMap_12_06:: @ 83515D8 + .incbin "baserom.gba", 0x3515D8, 0x1C + +gMap_12_07:: @ 83515F4 + .incbin "baserom.gba", 0x3515F4, 0x1C + +gMap_13_00:: @ 8351610 + .incbin "baserom.gba", 0x351610, 0x1C + +gMap_13_01:: @ 835162C + .incbin "baserom.gba", 0x35162C, 0x1C + +gMap_14_00:: @ 8351648 + .incbin "baserom.gba", 0x351648, 0x1C + +gMap_14_01:: @ 8351664 + .incbin "baserom.gba", 0x351664, 0x1C + +gMap_14_02:: @ 8351680 + .incbin "baserom.gba", 0x351680, 0x1C + +gMap_14_03:: @ 835169C + .incbin "baserom.gba", 0x35169C, 0x1C + +gMap_14_04:: @ 83516B8 + .incbin "baserom.gba", 0x3516B8, 0x1C + +gMap_14_05:: @ 83516D4 + .incbin "baserom.gba", 0x3516D4, 0x1C + +gMap_14_06:: @ 83516F0 + .incbin "baserom.gba", 0x3516F0, 0x1C + +gMap_14_07:: @ 835170C + .incbin "baserom.gba", 0x35170C, 0x1C + +gMap_14_08:: @ 8351728 + .incbin "baserom.gba", 0x351728, 0x1C + +gMap_14_09:: @ 8351744 + .incbin "baserom.gba", 0x351744, 0x1C + +gMap_15_00:: @ 8351760 + .incbin "baserom.gba", 0x351760, 0x1C + +gMap_15_01:: @ 835177C + .incbin "baserom.gba", 0x35177C, 0x1C + +gMap_15_02:: @ 8351798 + .incbin "baserom.gba", 0x351798, 0x1C + +gMap_15_03:: @ 83517B4 + .incbin "baserom.gba", 0x3517B4, 0x1C + +gMap_16_00:: @ 83517D0 + .incbin "baserom.gba", 0x3517D0, 0x1C + +gMap_16_01:: @ 83517EC + .incbin "baserom.gba", 0x3517EC, 0x1C + +gMap_17_00:: @ 8351808 + .incbin "baserom.gba", 0x351808, 0x1C + +gMap_17_01:: @ 8351824 + .incbin "baserom.gba", 0x351824, 0x1C + +gMap_18_00:: @ 8351840 + .incbin "baserom.gba", 0x351840, 0x1C + +gMap_18_01:: @ 835185C + .incbin "baserom.gba", 0x35185C, 0x1C + +gMap_19_00:: @ 8351878 + .incbin "baserom.gba", 0x351878, 0x1C + +gMap_20_00:: @ 8351894 + .incbin "baserom.gba", 0x351894, 0x1C + +gMap_21_00:: @ 83518B0 + .incbin "baserom.gba", 0x3518B0, 0x1C + +gMap_21_01:: @ 83518CC + .incbin "baserom.gba", 0x3518CC, 0x1C + +gMap_22_00:: @ 83518E8 + .incbin "baserom.gba", 0x3518E8, 0x1C + +gMap_22_01:: @ 8351904 + .incbin "baserom.gba", 0x351904, 0x1C + +gMap_23_00:: @ 8351920 + .incbin "baserom.gba", 0x351920, 0x1C + +gMap_23_01:: @ 835193C + .incbin "baserom.gba", 0x35193C, 0x1C + +gMap_23_02:: @ 8351958 + .incbin "baserom.gba", 0x351958, 0x1C + +gMap_24_00:: @ 8351974 + .incbin "baserom.gba", 0x351974, 0x1C + +gMap_24_01:: @ 8351990 + .incbin "baserom.gba", 0x351990, 0x1C + +gMap_25_00:: @ 83519AC + .incbin "baserom.gba", 0x3519AC, 0x1C + +gMap_25_01:: @ 83519C8 + .incbin "baserom.gba", 0x3519C8, 0x1C + +gMap_25_02:: @ 83519E4 + .incbin "baserom.gba", 0x3519E4, 0x1C + +gMap_26_00:: @ 8351A00 + .incbin "baserom.gba", 0x351A00, 0x1C + +gMap_26_01:: @ 8351A1C + .incbin "baserom.gba", 0x351A1C, 0x1C + +gMap_27_00:: @ 8351A38 + .incbin "baserom.gba", 0x351A38, 0x1C + +gMap_28_00:: @ 8351A54 + .incbin "baserom.gba", 0x351A54, 0x1C + +gMap_29_00:: @ 8351A70 + .incbin "baserom.gba", 0x351A70, 0x1C + +gMap_30_00:: @ 8351A8C + .incbin "baserom.gba", 0x351A8C, 0x1C + +gMap_31_00:: @ 8351AA8 + .incbin "baserom.gba", 0x351AA8, 0x1C + +gMap_31_01:: @ 8351AC4 + .incbin "baserom.gba", 0x351AC4, 0x1C + +gMap_31_02:: @ 8351AE0 + .incbin "baserom.gba", 0x351AE0, 0x1C + +gMap_31_03:: @ 8351AFC + .incbin "baserom.gba", 0x351AFC, 0x1C + +gMap_31_04:: @ 8351B18 + .incbin "baserom.gba", 0x351B18, 0x1C + +gMap_31_05:: @ 8351B34 + .incbin "baserom.gba", 0x351B34, 0x1C + +gMap_31_06:: @ 8351B50 + .incbin "baserom.gba", 0x351B50, 0x1C + +gMap_32_00:: @ 8351B6C + .incbin "baserom.gba", 0x351B6C, 0x1C + +gMap_32_01:: @ 8351B88 + .incbin "baserom.gba", 0x351B88, 0x1C + +gMap_32_02:: @ 8351BA4 + .incbin "baserom.gba", 0x351BA4, 0x1C + +gMap_32_03:: @ 8351BC0 + .incbin "baserom.gba", 0x351BC0, 0x1C + +gMap_32_04:: @ 8351BDC + .incbin "baserom.gba", 0x351BDC, 0x1C + +gMap_33_00:: @ 8351BF8 + .incbin "baserom.gba", 0x351BF8, 0x1C + +gMap_33_01:: @ 8351C14 + .incbin "baserom.gba", 0x351C14, 0x1C + +gMap_33_02:: @ 8351C30 + .incbin "baserom.gba", 0x351C30, 0x1C + +gMap_33_03:: @ 8351C4C + .incbin "baserom.gba", 0x351C4C, 0x1C + +gMap_33_04:: @ 8351C68 + .incbin "baserom.gba", 0x351C68, 0x1C + +gMap_34_00:: @ 8351C84 + .incbin "baserom.gba", 0x351C84, 0x1C + +gMap_34_01:: @ 8351CA0 + .incbin "baserom.gba", 0x351CA0, 0x1C + +gMap_34_02:: @ 8351CBC + .incbin "baserom.gba", 0x351CBC, 0x1C + +gMap_34_03:: @ 8351CD8 + .incbin "baserom.gba", 0x351CD8, 0x1C + +gMap_34_04:: @ 8351CF4 + .incbin "baserom.gba", 0x351CF4, 0x1C + +gMap_34_05:: @ 8351D10 + .incbin "baserom.gba", 0x351D10, 0x1C + +gMap_34_06:: @ 8351D2C + .incbin "baserom.gba", 0x351D2C, 0x1C + +gMap_34_07:: @ 8351D48 + .incbin "baserom.gba", 0x351D48, 0x1C + +gMap_35_00:: @ 8351D64 + .incbin "baserom.gba", 0x351D64, 0x1C + +gMap_35_01:: @ 8351D80 + .incbin "baserom.gba", 0x351D80, 0x1C + +gMap_35_02:: @ 8351D9C + .incbin "baserom.gba", 0x351D9C, 0x1C + +gMap_35_03:: @ 8351DB8 + .incbin "baserom.gba", 0x351DB8, 0x1C + +gMap_35_04:: @ 8351DD4 + .incbin "baserom.gba", 0x351DD4, 0x1C + +gMap_35_05:: @ 8351DF0 + .incbin "baserom.gba", 0x351DF0, 0x1C + +gMap_35_06:: @ 8351E0C + .incbin "baserom.gba", 0x351E0C, 0x1C + +gMap_35_07:: @ 8351E28 + .incbin "baserom.gba", 0x351E28, 0x1C + +gMap_36_00:: @ 8351E44 + .incbin "baserom.gba", 0x351E44, 0x1C + +gMap_36_01:: @ 8351E60 + .incbin "baserom.gba", 0x351E60, 0x1C + +gMap_36_02:: @ 8351E7C + .incbin "baserom.gba", 0x351E7C, 0x1C + +gMap_36_03:: @ 8351E98 + .incbin "baserom.gba", 0x351E98, 0x1C + +gMap_36_04:: @ 8351EB4 + .incbin "baserom.gba", 0x351EB4, 0x1C + +gMap_37_00:: @ 8351ED0 + .incbin "baserom.gba", 0x351ED0, 0x1C + +gMap_37_01:: @ 8351EEC + .incbin "baserom.gba", 0x351EEC, 0x1C + +gMap_37_02:: @ 8351F08 + .incbin "baserom.gba", 0x351F08, 0x1C + +gMap_37_03:: @ 8351F24 + .incbin "baserom.gba", 0x351F24, 0x1C + +gMap_37_04:: @ 8351F40 + .incbin "baserom.gba", 0x351F40, 0x1C + +gMap_38_00:: @ 8351F5C + .incbin "baserom.gba", 0x351F5C, 0x1C + +gMap_39_00:: @ 8351F78 + .incbin "baserom.gba", 0x351F78, 0x1C + +gMap_40_00:: @ 8351F94 + .incbin "baserom.gba", 0x351F94, 0x1C + +gMap_41_00:: @ 8351FB0 + .incbin "baserom.gba", 0x351FB0, 0x1C + +gMap_41_01:: @ 8351FCC + .incbin "baserom.gba", 0x351FCC, 0x1C + +gMap_42_00:: @ 8351FE8 + .incbin "baserom.gba", 0x351FE8, 0x1C + +gMapGroup_00:: @ 8352004 + .4byte gMap_00_00 + .4byte gMap_00_01 + .4byte gMap_00_02 + .4byte gMap_00_03 + .4byte gMap_00_04 + +gMapGroup_01:: @ 8352018 + .4byte gMap_01_00 + .4byte gMap_01_01 + .4byte gMap_01_02 + .4byte gMap_01_03 + .4byte gMap_01_04 + .4byte gMap_01_05 + .4byte gMap_01_06 + .4byte gMap_01_07 + .4byte gMap_01_08 + .4byte gMap_01_09 + .4byte gMap_01_10 + .4byte gMap_01_11 + .4byte gMap_01_12 + .4byte gMap_01_13 + .4byte gMap_01_14 + .4byte gMap_01_15 + .4byte gMap_01_16 + .4byte gMap_01_17 + .4byte gMap_01_18 + .4byte gMap_01_19 + .4byte gMap_01_20 + .4byte gMap_01_21 + .4byte gMap_01_22 + .4byte gMap_01_23 + .4byte gMap_01_24 + .4byte gMap_01_25 + .4byte gMap_01_26 + .4byte gMap_01_27 + .4byte gMap_01_28 + .4byte gMap_01_29 + .4byte gMap_01_30 + .4byte gMap_01_31 + .4byte gMap_01_32 + .4byte gMap_01_33 + .4byte gMap_01_34 + .4byte gMap_01_35 + .4byte gMap_01_36 + .4byte gMap_01_37 + .4byte gMap_01_38 + .4byte gMap_01_39 + .4byte gMap_01_40 + .4byte gMap_01_41 + .4byte gMap_01_42 + .4byte gMap_01_43 + .4byte gMap_01_44 + .4byte gMap_01_45 + .4byte gMap_01_46 + .4byte gMap_01_47 + .4byte gMap_01_48 + .4byte gMap_01_49 + .4byte gMap_01_50 + .4byte gMap_01_51 + .4byte gMap_01_52 + .4byte gMap_01_53 + .4byte gMap_01_54 + .4byte gMap_01_55 + .4byte gMap_01_56 + .4byte gMap_01_57 + .4byte gMap_01_58 + .4byte gMap_01_59 + .4byte gMap_01_60 + .4byte gMap_01_61 + .4byte gMap_01_62 + .4byte gMap_01_63 + .4byte gMap_01_64 + .4byte gMap_01_65 + .4byte gMap_01_66 + .4byte gMap_01_67 + .4byte gMap_01_68 + .4byte gMap_01_69 + .4byte gMap_01_70 + .4byte gMap_01_71 + .4byte gMap_01_72 + .4byte gMap_01_73 + .4byte gMap_01_74 + .4byte gMap_01_75 + .4byte gMap_01_76 + .4byte gMap_01_77 + .4byte gMap_01_78 + .4byte gMap_01_79 + .4byte gMap_01_80 + .4byte gMap_01_81 + .4byte gMap_01_82 + .4byte gMap_01_83 + .4byte gMap_01_84 + .4byte gMap_01_85 + .4byte gMap_01_86 + .4byte gMap_01_87 + .4byte gMap_01_88 + .4byte gMap_01_89 + .4byte gMap_01_90 + .4byte gMap_01_91 + .4byte gMap_01_92 + .4byte gMap_01_93 + .4byte gMap_01_94 + .4byte gMap_01_95 + .4byte gMap_01_96 + .4byte gMap_01_97 + .4byte gMap_01_98 + .4byte gMap_01_99 + .4byte gMap_01_100 + .4byte gMap_01_101 + .4byte gMap_01_102 + .4byte gMap_01_103 + .4byte gMap_01_104 + .4byte gMap_01_105 + .4byte gMap_01_106 + .4byte gMap_01_107 + .4byte gMap_01_108 + .4byte gMap_01_109 + .4byte gMap_01_110 + .4byte gMap_01_111 + .4byte gMap_01_112 + .4byte gMap_01_113 + .4byte gMap_01_114 + .4byte gMap_01_115 + .4byte gMap_01_116 + .4byte gMap_01_117 + .4byte gMap_01_118 + .4byte gMap_01_119 + .4byte gMap_01_120 + .4byte gMap_01_121 + .4byte gMap_01_122 + +gMapGroup_02:: @ 8352204 + .4byte gMap_02_00 + .4byte gMap_02_01 + .4byte gMap_02_02 + .4byte gMap_02_03 + .4byte gMap_02_04 + .4byte gMap_02_05 + .4byte gMap_02_06 + .4byte gMap_02_07 + .4byte gMap_02_08 + .4byte gMap_02_09 + .4byte gMap_02_10 + .4byte gMap_02_11 + .4byte gMap_02_12 + .4byte gMap_02_13 + .4byte gMap_02_14 + .4byte gMap_02_15 + .4byte gMap_02_16 + .4byte gMap_02_17 + .4byte gMap_02_18 + .4byte gMap_02_19 + .4byte gMap_02_20 + .4byte gMap_02_21 + .4byte gMap_02_22 + .4byte gMap_02_23 + .4byte gMap_02_24 + .4byte gMap_02_25 + .4byte gMap_02_26 + .4byte gMap_02_27 + .4byte gMap_02_28 + .4byte gMap_02_29 + .4byte gMap_02_30 + .4byte gMap_02_31 + .4byte gMap_02_32 + .4byte gMap_02_33 + .4byte gMap_02_34 + .4byte gMap_02_35 + .4byte gMap_02_36 + .4byte gMap_02_37 + .4byte gMap_02_38 + .4byte gMap_02_39 + .4byte gMap_02_40 + .4byte gMap_02_41 + .4byte gMap_02_42 + .4byte gMap_02_43 + .4byte gMap_02_44 + .4byte gMap_02_45 + .4byte gMap_02_46 + .4byte gMap_02_47 + .4byte gMap_02_48 + .4byte gMap_02_49 + .4byte gMap_02_50 + .4byte gMap_02_51 + .4byte gMap_02_52 + .4byte gMap_02_53 + .4byte gMap_02_54 + .4byte gMap_02_55 + .4byte gMap_02_56 + .4byte gMap_02_57 + .4byte gMap_02_58 + .4byte gMap_02_59 + +gMapGroup_03:: @ 83522F4 + .4byte gMap_03_00 + .4byte gMap_03_01 + .4byte gMap_03_02 + .4byte gMap_03_03 + .4byte gMap_03_04 + .4byte gMap_03_05 + .4byte gMap_03_06 + .4byte gMap_03_07 + .4byte gMap_03_08 + .4byte gMap_03_09 + .4byte gMap_03_10 + .4byte gMap_03_11 + .4byte gMap_03_12 + .4byte gMap_03_13 + .4byte gMap_03_14 + .4byte gMap_03_15 + .4byte gMap_03_16 + .4byte gMap_03_17 + .4byte gMap_03_18 + .4byte gMap_03_19 + .4byte gMap_03_20 + .4byte gMap_03_21 + .4byte gMap_03_22 + .4byte gMap_03_23 + .4byte gMap_03_24 + .4byte gMap_03_25 + .4byte gMap_03_26 + .4byte gMap_03_27 + .4byte gMap_03_28 + .4byte gMap_03_29 + .4byte gMap_03_30 + .4byte gMap_03_31 + .4byte gMap_03_32 + .4byte gMap_03_33 + .4byte gMap_03_34 + .4byte gMap_03_35 + .4byte gMap_03_36 + .4byte gMap_03_37 + .4byte gMap_03_38 + .4byte gMap_03_39 + .4byte gMap_03_40 + .4byte gMap_03_41 + .4byte gMap_03_42 + .4byte gMap_03_43 + .4byte gMap_03_44 + .4byte gMap_03_45 + .4byte gMap_03_46 + .4byte gMap_03_47 + .4byte gMap_03_48 + .4byte gMap_03_49 + .4byte gMap_03_50 + .4byte gMap_03_51 + .4byte gMap_03_52 + .4byte gMap_03_53 + .4byte gMap_03_54 + .4byte gMap_03_55 + .4byte gMap_03_56 + .4byte gMap_03_57 + .4byte gMap_03_58 + .4byte gMap_03_59 + .4byte gMap_03_60 + .4byte gMap_03_61 + .4byte gMap_03_62 + .4byte gMap_03_63 + .4byte gMap_03_64 + .4byte gMap_03_65 + +gMapGroup_04:: @ 83523FC + .4byte gMap_04_00 + .4byte gMap_04_01 + .4byte gMap_04_02 + .4byte gMap_04_03 + +gMapGroup_05:: @ 835240C + .4byte gMap_05_00 + .4byte gMap_05_01 + .4byte gMap_05_02 + .4byte gMap_05_03 + .4byte gMap_05_04 + .4byte gMap_05_05 + +gMapGroup_06:: @ 8352424 + .4byte gMap_06_00 + .4byte gMap_06_01 + .4byte gMap_06_02 + .4byte gMap_06_03 + .4byte gMap_06_04 + .4byte gMap_06_05 + .4byte gMap_06_06 + .4byte gMap_06_07 + +gMapGroup_07:: @ 8352444 + .4byte gMap_07_00 + .4byte gMap_07_01 + .4byte gMap_07_02 + .4byte gMap_07_03 + .4byte gMap_07_04 + .4byte gMap_07_05 + .4byte gMap_07_06 + .4byte gMap_07_07 + .4byte gMap_07_08 + .4byte gMap_07_09 + +gMapGroup_08:: @ 835246C + .4byte gMap_08_00 + .4byte gMap_08_01 + .4byte gMap_08_02 + .4byte gMap_08_03 + .4byte gMap_08_04 + .4byte gMap_08_05 + +gMapGroup_09:: @ 8352484 + .4byte gMap_09_00 + .4byte gMap_09_01 + .4byte gMap_09_02 + .4byte gMap_09_03 + .4byte gMap_09_04 + .4byte gMap_09_05 + .4byte gMap_09_06 + .4byte gMap_09_07 + +gMapGroup_10:: @ 83524A4 + .4byte gMap_10_00 + .4byte gMap_10_01 + .4byte gMap_10_02 + .4byte gMap_10_03 + .4byte gMap_10_04 + .4byte gMap_10_05 + .4byte gMap_10_06 + .4byte gMap_10_07 + .4byte gMap_10_08 + .4byte gMap_10_09 + .4byte gMap_10_10 + .4byte gMap_10_11 + .4byte gMap_10_12 + .4byte gMap_10_13 + .4byte gMap_10_14 + .4byte gMap_10_15 + .4byte gMap_10_16 + .4byte gMap_10_17 + .4byte gMap_10_18 + .4byte gMap_10_19 + +gMapGroup_11:: @ 83524F4 + .4byte gMap_11_00 + .4byte gMap_11_01 + .4byte gMap_11_02 + .4byte gMap_11_03 + .4byte gMap_11_04 + .4byte gMap_11_05 + .4byte gMap_11_06 + .4byte gMap_11_07 + .4byte gMap_11_08 + .4byte gMap_11_09 + +gMapGroup_12:: @ 835251C + .4byte gMap_12_00 + .4byte gMap_12_01 + .4byte gMap_12_02 + .4byte gMap_12_03 + .4byte gMap_12_04 + .4byte gMap_12_05 + .4byte gMap_12_06 + .4byte gMap_12_07 + +gMapGroup_13:: @ 835253C + .4byte gMap_13_00 + .4byte gMap_13_01 + +gMapGroup_14:: @ 8352544 + .4byte gMap_14_00 + .4byte gMap_14_01 + .4byte gMap_14_02 + .4byte gMap_14_03 + .4byte gMap_14_04 + .4byte gMap_14_05 + .4byte gMap_14_06 + .4byte gMap_14_07 + .4byte gMap_14_08 + .4byte gMap_14_09 + +gMapGroup_15:: @ 835256C + .4byte gMap_15_00 + .4byte gMap_15_01 + .4byte gMap_15_02 + .4byte gMap_15_03 + +gMapGroup_16:: @ 835257C + .4byte gMap_16_00 + .4byte gMap_16_01 + +gMapGroup_17:: @ 8352584 + .4byte gMap_17_00 + .4byte gMap_17_01 + +gMapGroup_18:: @ 835258C + .4byte gMap_18_00 + .4byte gMap_18_01 + +gMapGroup_19:: @ 8352594 + .4byte gMap_19_00 + +gMapGroup_20:: @ 8352598 + .4byte gMap_20_00 + +gMapGroup_21:: @ 835259C + .4byte gMap_21_00 + .4byte gMap_21_01 + +gMapGroup_22:: @ 83525A4 + .4byte gMap_22_00 + .4byte gMap_22_01 + +gMapGroup_23:: @ 83525AC + .4byte gMap_23_00 + .4byte gMap_23_01 + .4byte gMap_23_02 + +gMapGroup_24:: @ 83525B8 + .4byte gMap_24_00 + .4byte gMap_24_01 + +gMapGroup_25:: @ 83525C0 + .4byte gMap_25_00 + .4byte gMap_25_01 + .4byte gMap_25_02 + +gMapGroup_26:: @ 83525CC + .4byte gMap_26_00 + .4byte gMap_26_01 + +gMapGroup_27:: @ 83525D4 + .4byte gMap_27_00 + +gMapGroup_28:: @ 83525D8 + .4byte gMap_28_00 + +gMapGroup_29:: @ 83525DC + .4byte gMap_29_00 + +gMapGroup_30:: @ 83525E0 + .4byte gMap_30_00 + +gMapGroup_31:: @ 83525E4 + .4byte gMap_31_00 + .4byte gMap_31_01 + .4byte gMap_31_02 + .4byte gMap_31_03 + .4byte gMap_31_04 + .4byte gMap_31_05 + .4byte gMap_31_06 + +gMapGroup_32:: @ 8352600 + .4byte gMap_32_00 + .4byte gMap_32_01 + .4byte gMap_32_02 + .4byte gMap_32_03 + .4byte gMap_32_04 + +gMapGroup_33:: @ 8352614 + .4byte gMap_33_00 + .4byte gMap_33_01 + .4byte gMap_33_02 + .4byte gMap_33_03 + .4byte gMap_33_04 + +gMapGroup_34:: @ 8352628 + .4byte gMap_34_00 + .4byte gMap_34_01 + .4byte gMap_34_02 + .4byte gMap_34_03 + .4byte gMap_34_04 + .4byte gMap_34_05 + .4byte gMap_34_06 + .4byte gMap_34_07 + +gMapGroup_35:: @ 8352648 + .4byte gMap_35_00 + .4byte gMap_35_01 + .4byte gMap_35_02 + .4byte gMap_35_03 + .4byte gMap_35_04 + .4byte gMap_35_05 + .4byte gMap_35_06 + .4byte gMap_35_07 + +gMapGroup_36:: @ 8352668 + .4byte gMap_36_00 + .4byte gMap_36_01 + .4byte gMap_36_02 + .4byte gMap_36_03 + .4byte gMap_36_04 + +gMapGroup_37:: @ 835267C + .4byte gMap_37_00 + .4byte gMap_37_01 + .4byte gMap_37_02 + .4byte gMap_37_03 + .4byte gMap_37_04 + +gMapGroup_38:: @ 8352690 + .4byte gMap_38_00 + +gMapGroup_39:: @ 8352694 + .4byte gMap_39_00 + +gMapGroup_40:: @ 8352698 + .4byte gMap_40_00 + +gMapGroup_41:: @ 835269C + .4byte gMap_41_00 + .4byte gMap_41_01 + +gMapGroup_42:: @ 83526A4 + .4byte gMap_42_00 + +gMapGroups:: @ 0x83526A8 + .4byte gMapGroup_00 + .4byte gMapGroup_01 + .4byte gMapGroup_02 + .4byte gMapGroup_03 + .4byte gMapGroup_04 + .4byte gMapGroup_05 + .4byte gMapGroup_06 + .4byte gMapGroup_07 + .4byte gMapGroup_08 + .4byte gMapGroup_09 + .4byte gMapGroup_10 + .4byte gMapGroup_11 + .4byte gMapGroup_12 + .4byte gMapGroup_13 + .4byte gMapGroup_14 + .4byte gMapGroup_15 + .4byte gMapGroup_16 + .4byte gMapGroup_17 + .4byte gMapGroup_18 + .4byte gMapGroup_19 + .4byte gMapGroup_20 + .4byte gMapGroup_21 + .4byte gMapGroup_22 + .4byte gMapGroup_23 + .4byte gMapGroup_24 + .4byte gMapGroup_25 + .4byte gMapGroup_26 + .4byte gMapGroup_27 + .4byte gMapGroup_28 + .4byte gMapGroup_29 + .4byte gMapGroup_30 + .4byte gMapGroup_31 + .4byte gMapGroup_32 + .4byte gMapGroup_33 + .4byte gMapGroup_34 + .4byte gMapGroup_35 + .4byte gMapGroup_36 + .4byte gMapGroup_37 + .4byte gMapGroup_38 + .4byte gMapGroup_39 + .4byte gMapGroup_40 + .4byte gMapGroup_41 + .4byte gMapGroup_42 -- cgit v1.2.3 From d6aac6654022805fd12c5d795d9f8e1860793334 Mon Sep 17 00:00:00 2001 From: garak Date: Tue, 26 Feb 2019 16:13:08 -0500 Subject: name maps --- data/maps/groups.inc | 1700 +++++++++++++++++++++++++------------------------- 1 file changed, 850 insertions(+), 850 deletions(-) (limited to 'data/maps') diff --git a/data/maps/groups.inc b/data/maps/groups.inc index 27168da81..c21c970af 100644 --- a/data/maps/groups.inc +++ b/data/maps/groups.inc @@ -1,1788 +1,1788 @@ -gMap_00_00:: @ 834F188 +UnknownMap_00_00:: @ 834F188 .incbin "baserom.gba", 0x34F188, 0x1C -gMap_00_01:: @ 834F1A4 +UnknownMap_00_01:: @ 834F1A4 .incbin "baserom.gba", 0x34F1A4, 0x1C -gMap_00_02:: @ 834F1C0 +UnknownMap_00_02:: @ 834F1C0 .incbin "baserom.gba", 0x34F1C0, 0x1C -gMap_00_03:: @ 834F1DC +UnknownMap_00_03:: @ 834F1DC .incbin "baserom.gba", 0x34F1DC, 0x1C -gMap_00_04:: @ 834F1F8 +UnknownMap_00_04:: @ 834F1F8 .incbin "baserom.gba", 0x34F1F8, 0x1C -gMap_01_00:: @ 834F214 +ViridianForest:: @ 834F214 .incbin "baserom.gba", 0x34F214, 0x1C -gMap_01_01:: @ 834F230 +MtMoon_1F:: @ 834F230 .incbin "baserom.gba", 0x34F230, 0x1C -gMap_01_02:: @ 834F24C +MtMoon_B1F:: @ 834F24C .incbin "baserom.gba", 0x34F24C, 0x1C -gMap_01_03:: @ 834F268 +MtMoon_B2F:: @ 834F268 .incbin "baserom.gba", 0x34F268, 0x1C -gMap_01_04:: @ 834F284 +SSAnne_Exterior:: @ 834F284 .incbin "baserom.gba", 0x34F284, 0x1C -gMap_01_05:: @ 834F2A0 +SSAnne_1F_Corridor:: @ 834F2A0 .incbin "baserom.gba", 0x34F2A0, 0x1C -gMap_01_06:: @ 834F2BC +SSAnne_2F_Corridor:: @ 834F2BC .incbin "baserom.gba", 0x34F2BC, 0x1C -gMap_01_07:: @ 834F2D8 +SSAnne_3F_Corridor:: @ 834F2D8 .incbin "baserom.gba", 0x34F2D8, 0x1C -gMap_01_08:: @ 834F2F4 +SSAnne_B1F_Corridor:: @ 834F2F4 .incbin "baserom.gba", 0x34F2F4, 0x1C -gMap_01_09:: @ 834F310 +SSAnne_Deck:: @ 834F310 .incbin "baserom.gba", 0x34F310, 0x1C -gMap_01_10:: @ 834F32C +SSAnne_Kitchen:: @ 834F32C .incbin "baserom.gba", 0x34F32C, 0x1C -gMap_01_11:: @ 834F348 +SSAnne_CaptainsOffice:: @ 834F348 .incbin "baserom.gba", 0x34F348, 0x1C -gMap_01_12:: @ 834F364 +SSAnne_1F_Room1:: @ 834F364 .incbin "baserom.gba", 0x34F364, 0x1C -gMap_01_13:: @ 834F380 +SSAnne_1F_Room2:: @ 834F380 .incbin "baserom.gba", 0x34F380, 0x1C -gMap_01_14:: @ 834F39C +SSAnne_1F_Room3:: @ 834F39C .incbin "baserom.gba", 0x34F39C, 0x1C -gMap_01_15:: @ 834F3B8 +SSAnne_1F_Room4:: @ 834F3B8 .incbin "baserom.gba", 0x34F3B8, 0x1C -gMap_01_16:: @ 834F3D4 +SSAnne_1F_Room5:: @ 834F3D4 .incbin "baserom.gba", 0x34F3D4, 0x1C -gMap_01_17:: @ 834F3F0 +SSAnne_1F_Room7:: @ 834F3F0 .incbin "baserom.gba", 0x34F3F0, 0x1C -gMap_01_18:: @ 834F40C +SSAnne_2F_Room1:: @ 834F40C .incbin "baserom.gba", 0x34F40C, 0x1C -gMap_01_19:: @ 834F428 +SSAnne_2F_Room2:: @ 834F428 .incbin "baserom.gba", 0x34F428, 0x1C -gMap_01_20:: @ 834F444 +SSAnne_2F_Room3:: @ 834F444 .incbin "baserom.gba", 0x34F444, 0x1C -gMap_01_21:: @ 834F460 +SSAnne_2F_Room4:: @ 834F460 .incbin "baserom.gba", 0x34F460, 0x1C -gMap_01_22:: @ 834F47C +SSAnne_2F_Room5:: @ 834F47C .incbin "baserom.gba", 0x34F47C, 0x1C -gMap_01_23:: @ 834F498 +SSAnne_2F_Room6:: @ 834F498 .incbin "baserom.gba", 0x34F498, 0x1C -gMap_01_24:: @ 834F4B4 +SSAnne_B1F_Room1:: @ 834F4B4 .incbin "baserom.gba", 0x34F4B4, 0x1C -gMap_01_25:: @ 834F4D0 +SSAnne_B1F_Room2:: @ 834F4D0 .incbin "baserom.gba", 0x34F4D0, 0x1C -gMap_01_26:: @ 834F4EC +SSAnne_B1F_Room3:: @ 834F4EC .incbin "baserom.gba", 0x34F4EC, 0x1C -gMap_01_27:: @ 834F508 +SSAnne_B1F_Room4:: @ 834F508 .incbin "baserom.gba", 0x34F508, 0x1C -gMap_01_28:: @ 834F524 +SSAnne_B1F_Room5:: @ 834F524 .incbin "baserom.gba", 0x34F524, 0x1C -gMap_01_29:: @ 834F540 +SSAnne_1F_Room6:: @ 834F540 .incbin "baserom.gba", 0x34F540, 0x1C -gMap_01_30:: @ 834F55C +UndergroundPath_NorthEntrance:: @ 834F55C .incbin "baserom.gba", 0x34F55C, 0x1C -gMap_01_31:: @ 834F578 +UndergroundPath_NorthSouthTunnel:: @ 834F578 .incbin "baserom.gba", 0x34F578, 0x1C -gMap_01_32:: @ 834F594 +UndergroundPath_SouthEntrance:: @ 834F594 .incbin "baserom.gba", 0x34F594, 0x1C -gMap_01_33:: @ 834F5B0 +UndergroundPath_WestEntrance:: @ 834F5B0 .incbin "baserom.gba", 0x34F5B0, 0x1C -gMap_01_34:: @ 834F5CC +UndergroundPath_EastWestTunnel:: @ 834F5CC .incbin "baserom.gba", 0x34F5CC, 0x1C -gMap_01_35:: @ 834F5E8 +UndergroundPath_EastEntrance:: @ 834F5E8 .incbin "baserom.gba", 0x34F5E8, 0x1C -gMap_01_36:: @ 834F604 +DiglettsCave_NorthEntrance:: @ 834F604 .incbin "baserom.gba", 0x34F604, 0x1C -gMap_01_37:: @ 834F620 +DiglettsCave_B1F:: @ 834F620 .incbin "baserom.gba", 0x34F620, 0x1C -gMap_01_38:: @ 834F63C +DiglettsCave_SouthEntrance:: @ 834F63C .incbin "baserom.gba", 0x34F63C, 0x1C -gMap_01_39:: @ 834F658 +VictoryRoad_1F:: @ 834F658 .incbin "baserom.gba", 0x34F658, 0x1C -gMap_01_40:: @ 834F674 +VictoryRoad_2F:: @ 834F674 .incbin "baserom.gba", 0x34F674, 0x1C -gMap_01_41:: @ 834F690 +VictoryRoad_3F:: @ 834F690 .incbin "baserom.gba", 0x34F690, 0x1C -gMap_01_42:: @ 834F6AC +RocketHideout_B1F:: @ 834F6AC .incbin "baserom.gba", 0x34F6AC, 0x1C -gMap_01_43:: @ 834F6C8 +RocketHideout_B2F:: @ 834F6C8 .incbin "baserom.gba", 0x34F6C8, 0x1C -gMap_01_44:: @ 834F6E4 +RocketHideout_B3F:: @ 834F6E4 .incbin "baserom.gba", 0x34F6E4, 0x1C -gMap_01_45:: @ 834F700 +RocketHideout_B4F:: @ 834F700 .incbin "baserom.gba", 0x34F700, 0x1C -gMap_01_46:: @ 834F71C +RocketHideout_Elevator:: @ 834F71C .incbin "baserom.gba", 0x34F71C, 0x1C -gMap_01_47:: @ 834F738 +SilphCo_1F:: @ 834F738 .incbin "baserom.gba", 0x34F738, 0x1C -gMap_01_48:: @ 834F754 +SilphCo_2F:: @ 834F754 .incbin "baserom.gba", 0x34F754, 0x1C -gMap_01_49:: @ 834F770 +SilphCo_3F:: @ 834F770 .incbin "baserom.gba", 0x34F770, 0x1C -gMap_01_50:: @ 834F78C +SilphCo_4F:: @ 834F78C .incbin "baserom.gba", 0x34F78C, 0x1C -gMap_01_51:: @ 834F7A8 +SilphCo_5F:: @ 834F7A8 .incbin "baserom.gba", 0x34F7A8, 0x1C -gMap_01_52:: @ 834F7C4 +SilphCo_6F:: @ 834F7C4 .incbin "baserom.gba", 0x34F7C4, 0x1C -gMap_01_53:: @ 834F7E0 +SilphCo_7F:: @ 834F7E0 .incbin "baserom.gba", 0x34F7E0, 0x1C -gMap_01_54:: @ 834F7FC +SilphCo_8F:: @ 834F7FC .incbin "baserom.gba", 0x34F7FC, 0x1C -gMap_01_55:: @ 834F818 +SilphCo_9F:: @ 834F818 .incbin "baserom.gba", 0x34F818, 0x1C -gMap_01_56:: @ 834F834 +SilphCo_10F:: @ 834F834 .incbin "baserom.gba", 0x34F834, 0x1C -gMap_01_57:: @ 834F850 +SilphCo_11F:: @ 834F850 .incbin "baserom.gba", 0x34F850, 0x1C -gMap_01_58:: @ 834F86C +SilphCo_Elevator:: @ 834F86C .incbin "baserom.gba", 0x34F86C, 0x1C -gMap_01_59:: @ 834F888 +PokemonMansion_1F:: @ 834F888 .incbin "baserom.gba", 0x34F888, 0x1C -gMap_01_60:: @ 834F8A4 +PokemonMansion_2F:: @ 834F8A4 .incbin "baserom.gba", 0x34F8A4, 0x1C -gMap_01_61:: @ 834F8C0 +PokemonMansion_3F:: @ 834F8C0 .incbin "baserom.gba", 0x34F8C0, 0x1C -gMap_01_62:: @ 834F8DC +PokemonMansion_B1F:: @ 834F8DC .incbin "baserom.gba", 0x34F8DC, 0x1C -gMap_01_63:: @ 834F8F8 +SafariZone_Center:: @ 834F8F8 .incbin "baserom.gba", 0x34F8F8, 0x1C -gMap_01_64:: @ 834F914 +SafariZone_East:: @ 834F914 .incbin "baserom.gba", 0x34F914, 0x1C -gMap_01_65:: @ 834F930 +SafariZone_North:: @ 834F930 .incbin "baserom.gba", 0x34F930, 0x1C -gMap_01_66:: @ 834F94C +SafariZone_West:: @ 834F94C .incbin "baserom.gba", 0x34F94C, 0x1C -gMap_01_67:: @ 834F968 +SafariZone_Building1:: @ 834F968 .incbin "baserom.gba", 0x34F968, 0x1C -gMap_01_68:: @ 834F984 +SafariZone_Building2:: @ 834F984 .incbin "baserom.gba", 0x34F984, 0x1C -gMap_01_69:: @ 834F9A0 +SafariZone_Building3:: @ 834F9A0 .incbin "baserom.gba", 0x34F9A0, 0x1C -gMap_01_70:: @ 834F9BC +SafariZone_Building4:: @ 834F9BC .incbin "baserom.gba", 0x34F9BC, 0x1C -gMap_01_71:: @ 834F9D8 +SafariZone_SecretHouse:: @ 834F9D8 .incbin "baserom.gba", 0x34F9D8, 0x1C -gMap_01_72:: @ 834F9F4 +CeruleanCave_1F:: @ 834F9F4 .incbin "baserom.gba", 0x34F9F4, 0x1C -gMap_01_73:: @ 834FA10 +CeruleanCave_2F:: @ 834FA10 .incbin "baserom.gba", 0x34FA10, 0x1C -gMap_01_74:: @ 834FA2C +CeruleanCave_B1F:: @ 834FA2C .incbin "baserom.gba", 0x34FA2C, 0x1C -gMap_01_75:: @ 834FA48 +PokemonLeague_LoreleisRoom:: @ 834FA48 .incbin "baserom.gba", 0x34FA48, 0x1C -gMap_01_76:: @ 834FA64 +PokemonLeague_BrunosRoom:: @ 834FA64 .incbin "baserom.gba", 0x34FA64, 0x1C -gMap_01_77:: @ 834FA80 +PokemonLeague_AgathasRoom:: @ 834FA80 .incbin "baserom.gba", 0x34FA80, 0x1C -gMap_01_78:: @ 834FA9C +PokemonLeague_LancesRoom:: @ 834FA9C .incbin "baserom.gba", 0x34FA9C, 0x1C -gMap_01_79:: @ 834FAB8 +PokemonLeague_ChampionsRoom:: @ 834FAB8 .incbin "baserom.gba", 0x34FAB8, 0x1C -gMap_01_80:: @ 834FAD4 +PokemonLeague_HallOfFame:: @ 834FAD4 .incbin "baserom.gba", 0x34FAD4, 0x1C -gMap_01_81:: @ 834FAF0 +RockTunnel_1F:: @ 834FAF0 .incbin "baserom.gba", 0x34FAF0, 0x1C -gMap_01_82:: @ 834FB0C +RockTunnel_B1F:: @ 834FB0C .incbin "baserom.gba", 0x34FB0C, 0x1C -gMap_01_83:: @ 834FB28 +SeafoamIslands_1F:: @ 834FB28 .incbin "baserom.gba", 0x34FB28, 0x1C -gMap_01_84:: @ 834FB44 +SeafoamIslands_B1F:: @ 834FB44 .incbin "baserom.gba", 0x34FB44, 0x1C -gMap_01_85:: @ 834FB60 +SeafoamIslands_B2F:: @ 834FB60 .incbin "baserom.gba", 0x34FB60, 0x1C -gMap_01_86:: @ 834FB7C +SeafoamIslands_B3F:: @ 834FB7C .incbin "baserom.gba", 0x34FB7C, 0x1C -gMap_01_87:: @ 834FB98 +SeafoamIslands_B4F:: @ 834FB98 .incbin "baserom.gba", 0x34FB98, 0x1C -gMap_01_88:: @ 834FBB4 +PokemonTower_1F:: @ 834FBB4 .incbin "baserom.gba", 0x34FBB4, 0x1C -gMap_01_89:: @ 834FBD0 +PokemonTower_2F:: @ 834FBD0 .incbin "baserom.gba", 0x34FBD0, 0x1C -gMap_01_90:: @ 834FBEC +PokemonTower_3F:: @ 834FBEC .incbin "baserom.gba", 0x34FBEC, 0x1C -gMap_01_91:: @ 834FC08 +PokemonTower_4F:: @ 834FC08 .incbin "baserom.gba", 0x34FC08, 0x1C -gMap_01_92:: @ 834FC24 +PokemonTower_5F:: @ 834FC24 .incbin "baserom.gba", 0x34FC24, 0x1C -gMap_01_93:: @ 834FC40 +PokemonTower_6F:: @ 834FC40 .incbin "baserom.gba", 0x34FC40, 0x1C -gMap_01_94:: @ 834FC5C +PokemonTower_7F:: @ 834FC5C .incbin "baserom.gba", 0x34FC5C, 0x1C -gMap_01_95:: @ 834FC78 +PowerPlant:: @ 834FC78 .incbin "baserom.gba", 0x34FC78, 0x1C -gMap_01_96:: @ 834FC94 +MtEmber_RubyPath_B4F:: @ 834FC94 .incbin "baserom.gba", 0x34FC94, 0x1C -gMap_01_97:: @ 834FCB0 +MtEmber_Exterior:: @ 834FCB0 .incbin "baserom.gba", 0x34FCB0, 0x1C -gMap_01_98:: @ 834FCCC +MtEmber_SummitPath_1F:: @ 834FCCC .incbin "baserom.gba", 0x34FCCC, 0x1C -gMap_01_99:: @ 834FCE8 +MtEmber_SummitPath_2F:: @ 834FCE8 .incbin "baserom.gba", 0x34FCE8, 0x1C -gMap_01_100:: @ 834FD04 +MtEmber_SummitPath_3F:: @ 834FD04 .incbin "baserom.gba", 0x34FD04, 0x1C -gMap_01_101:: @ 834FD20 +MtEmber_Summit:: @ 834FD20 .incbin "baserom.gba", 0x34FD20, 0x1C -gMap_01_102:: @ 834FD3C +MtEmber_RubyPath_B5F:: @ 834FD3C .incbin "baserom.gba", 0x34FD3C, 0x1C -gMap_01_103:: @ 834FD58 +SSAnne_Kitchen3:: @ 834FD58 .incbin "baserom.gba", 0x34FD58, 0x1C -gMap_01_104:: @ 834FD74 +MtEmber_RubyPath_B1F:: @ 834FD74 .incbin "baserom.gba", 0x34FD74, 0x1C -gMap_01_105:: @ 834FD90 +MtEmber_RubyPath_B2F:: @ 834FD90 .incbin "baserom.gba", 0x34FD90, 0x1C -gMap_01_106:: @ 834FDAC +MtEmber_RubyPath_B3F:: @ 834FDAC .incbin "baserom.gba", 0x34FDAC, 0x1C -gMap_01_107:: @ 834FDC8 +MtEmber_RubyPath_B1F_Stairs:: @ 834FDC8 .incbin "baserom.gba", 0x34FDC8, 0x1C -gMap_01_108:: @ 834FDE4 +MtEmber_RubyPath_B2F_Stairs:: @ 834FDE4 .incbin "baserom.gba", 0x34FDE4, 0x1C -gMap_01_109:: @ 834FE00 +ThreeIsland_BerryForest:: @ 834FE00 .incbin "baserom.gba", 0x34FE00, 0x1C -gMap_01_110:: @ 834FE1C +FourIsland_IcefallCave_Entrance:: @ 834FE1C .incbin "baserom.gba", 0x34FE1C, 0x1C -gMap_01_111:: @ 834FE38 +FourIsland_IcefallCave_1F:: @ 834FE38 .incbin "baserom.gba", 0x34FE38, 0x1C -gMap_01_112:: @ 834FE54 +SSAnne_CaptainsOffice2:: @ 834FE54 .incbin "baserom.gba", 0x34FE54, 0x1C -gMap_01_113:: @ 834FE70 +SSAnne_CaptainsOffice3:: @ 834FE70 .incbin "baserom.gba", 0x34FE70, 0x1C -gMap_01_114:: @ 834FE8C +SSAnne_CaptainsOffice4:: @ 834FE8C .incbin "baserom.gba", 0x34FE8C, 0x1C -gMap_01_115:: @ 834FEA8 +SSAnne_CaptainsOffice5:: @ 834FEA8 .incbin "baserom.gba", 0x34FEA8, 0x1C -gMap_01_116:: @ 834FEC4 +SixIsland_DottedHole_B1F:: @ 834FEC4 .incbin "baserom.gba", 0x34FEC4, 0x1C -gMap_01_117:: @ 834FEE0 +SixIsland_DottedHole_B2F:: @ 834FEE0 .incbin "baserom.gba", 0x34FEE0, 0x1C -gMap_01_118:: @ 834FEFC +SixIsland_DottedHole_B3F:: @ 834FEFC .incbin "baserom.gba", 0x34FEFC, 0x1C -gMap_01_119:: @ 834FF18 +SSAnne_CaptainsOffice9:: @ 834FF18 .incbin "baserom.gba", 0x34FF18, 0x1C -gMap_01_120:: @ 834FF34 +SixIsland_DottedHole_SapphireRoom:: @ 834FF34 .incbin "baserom.gba", 0x34FF34, 0x1C -gMap_01_121:: @ 834FF50 +SSAnne_1F_Room11:: @ 834FF50 .incbin "baserom.gba", 0x34FF50, 0x1C -gMap_01_122:: @ 834FF6C +SSAnne_1F_Room12:: @ 834FF6C .incbin "baserom.gba", 0x34FF6C, 0x1C -gMap_02_00:: @ 834FF88 +NavelRock_Exterior:: @ 834FF88 .incbin "baserom.gba", 0x34FF88, 0x1C -gMap_02_01:: @ 834FFA4 +SevenIsland_TrainerTower_1F:: @ 834FFA4 .incbin "baserom.gba", 0x34FFA4, 0x1C -gMap_02_02:: @ 834FFC0 +SevenIsland_TrainerTower_2F:: @ 834FFC0 .incbin "baserom.gba", 0x34FFC0, 0x1C -gMap_02_03:: @ 834FFDC +SevenIsland_TrainerTower_3F:: @ 834FFDC .incbin "baserom.gba", 0x34FFDC, 0x1C -gMap_02_04:: @ 834FFF8 +SevenIsland_TrainerTower_4F:: @ 834FFF8 .incbin "baserom.gba", 0x34FFF8, 0x1C -gMap_02_05:: @ 8350014 +SevenIsland_TrainerTower_5F:: @ 8350014 .incbin "baserom.gba", 0x350014, 0x1C -gMap_02_06:: @ 8350030 +SevenIsland_TrainerTower_6F:: @ 8350030 .incbin "baserom.gba", 0x350030, 0x1C -gMap_02_07:: @ 835004C +SevenIsland_TrainerTower_7F:: @ 835004C .incbin "baserom.gba", 0x35004C, 0x1C -gMap_02_08:: @ 8350068 +SevenIsland_TrainerTower_8F:: @ 8350068 .incbin "baserom.gba", 0x350068, 0x1C -gMap_02_09:: @ 8350084 +SevenIsland_TrainerTower_Roof:: @ 8350084 .incbin "baserom.gba", 0x350084, 0x1C -gMap_02_10:: @ 83500A0 +SevenIsland_TrainerTower_Lobby:: @ 83500A0 .incbin "baserom.gba", 0x3500A0, 0x1C -gMap_02_11:: @ 83500BC +SevenIsland_TrainerTower_Elevator:: @ 83500BC .incbin "baserom.gba", 0x3500BC, 0x1C -gMap_02_12:: @ 83500D8 +FiveIsland_LostCave_Entrance:: @ 83500D8 .incbin "baserom.gba", 0x3500D8, 0x1C -gMap_02_13:: @ 83500F4 +FiveIsland_LostCave_Room1:: @ 83500F4 .incbin "baserom.gba", 0x3500F4, 0x1C -gMap_02_14:: @ 8350110 +FiveIsland_LostCave_Room2:: @ 8350110 .incbin "baserom.gba", 0x350110, 0x1C -gMap_02_15:: @ 835012C +FiveIsland_LostCave_Room3:: @ 835012C .incbin "baserom.gba", 0x35012C, 0x1C -gMap_02_16:: @ 8350148 +FiveIsland_LostCave_Room4:: @ 8350148 .incbin "baserom.gba", 0x350148, 0x1C -gMap_02_17:: @ 8350164 +FiveIsland_LostCave_Room5:: @ 8350164 .incbin "baserom.gba", 0x350164, 0x1C -gMap_02_18:: @ 8350180 +FiveIsland_LostCave_Room6:: @ 8350180 .incbin "baserom.gba", 0x350180, 0x1C -gMap_02_19:: @ 835019C +FiveIsland_LostCave_Room7:: @ 835019C .incbin "baserom.gba", 0x35019C, 0x1C -gMap_02_20:: @ 83501B8 +FiveIsland_LostCave_Room8:: @ 83501B8 .incbin "baserom.gba", 0x3501B8, 0x1C -gMap_02_21:: @ 83501D4 +FiveIsland_LostCave_Room9:: @ 83501D4 .incbin "baserom.gba", 0x3501D4, 0x1C -gMap_02_22:: @ 83501F0 +FiveIsland_LostCave_Room10:: @ 83501F0 .incbin "baserom.gba", 0x3501F0, 0x1C -gMap_02_23:: @ 835020C +FiveIsland_LostCave_Room11:: @ 835020C .incbin "baserom.gba", 0x35020C, 0x1C -gMap_02_24:: @ 8350228 +FiveIsland_LostCave_Room12:: @ 8350228 .incbin "baserom.gba", 0x350228, 0x1C -gMap_02_25:: @ 8350244 +FiveIsland_LostCave_Room13:: @ 8350244 .incbin "baserom.gba", 0x350244, 0x1C -gMap_02_26:: @ 8350260 +FiveIsland_LostCave_Room14:: @ 8350260 .incbin "baserom.gba", 0x350260, 0x1C -gMap_02_27:: @ 835027C +SevenIsland_TanobyRuins_MoneanChamber:: @ 835027C .incbin "baserom.gba", 0x35027C, 0x1C -gMap_02_28:: @ 8350298 +SevenIsland_TanobyRuins_LiptooChamber:: @ 8350298 .incbin "baserom.gba", 0x350298, 0x1C -gMap_02_29:: @ 83502B4 +SevenIsland_TanobyRuins_WeepthChamber:: @ 83502B4 .incbin "baserom.gba", 0x3502B4, 0x1C -gMap_02_30:: @ 83502D0 +SevenIsland_TanobyRuins_DilfordChamber:: @ 83502D0 .incbin "baserom.gba", 0x3502D0, 0x1C -gMap_02_31:: @ 83502EC +SevenIsland_TanobyRuins_ScufibChamber:: @ 83502EC .incbin "baserom.gba", 0x3502EC, 0x1C -gMap_02_32:: @ 8350308 +SevenIsland_TanobyRuins_RixyChamber:: @ 8350308 .incbin "baserom.gba", 0x350308, 0x1C -gMap_02_33:: @ 8350324 +SevenIsland_TanobyRuins_ViapoisChamber:: @ 8350324 .incbin "baserom.gba", 0x350324, 0x1C -gMap_02_34:: @ 8350340 +ThreeIsland_DunsparceTunnel:: @ 8350340 .incbin "baserom.gba", 0x350340, 0x1C -gMap_02_35:: @ 835035C +SevenIsland_SeavaultCanyon_TanobyKey:: @ 835035C .incbin "baserom.gba", 0x35035C, 0x1C -gMap_02_36:: @ 8350378 +NavelRock_1F:: @ 8350378 .incbin "baserom.gba", 0x350378, 0x1C -gMap_02_37:: @ 8350394 +NavelRock_Summit:: @ 8350394 .incbin "baserom.gba", 0x350394, 0x1C -gMap_02_38:: @ 83503B0 +NavelRock_Base:: @ 83503B0 .incbin "baserom.gba", 0x3503B0, 0x1C -gMap_02_39:: @ 83503CC +NavelRock_SummitPath_2F:: @ 83503CC .incbin "baserom.gba", 0x3503CC, 0x1C -gMap_02_40:: @ 83503E8 +NavelRock_SummitPath_3F:: @ 83503E8 .incbin "baserom.gba", 0x3503E8, 0x1C -gMap_02_41:: @ 8350404 +NavelRock_SummitPath_4F:: @ 8350404 .incbin "baserom.gba", 0x350404, 0x1C -gMap_02_42:: @ 8350420 +NavelRock_SummitPath_5F:: @ 8350420 .incbin "baserom.gba", 0x350420, 0x1C -gMap_02_43:: @ 835043C +NavelRock_BasePath_B1F:: @ 835043C .incbin "baserom.gba", 0x35043C, 0x1C -gMap_02_44:: @ 8350458 +NavelRock_BasePath_B2F:: @ 8350458 .incbin "baserom.gba", 0x350458, 0x1C -gMap_02_45:: @ 8350474 +NavelRock_BasePath_B3F:: @ 8350474 .incbin "baserom.gba", 0x350474, 0x1C -gMap_02_46:: @ 8350490 +NavelRock_BasePath_B4F:: @ 8350490 .incbin "baserom.gba", 0x350490, 0x1C -gMap_02_47:: @ 83504AC +NavelRock_BasePath_B5F:: @ 83504AC .incbin "baserom.gba", 0x3504AC, 0x1C -gMap_02_48:: @ 83504C8 +NavelRock_BasePath_B6F:: @ 83504C8 .incbin "baserom.gba", 0x3504C8, 0x1C -gMap_02_49:: @ 83504E4 +NavelRock_BasePath_B7F:: @ 83504E4 .incbin "baserom.gba", 0x3504E4, 0x1C -gMap_02_50:: @ 8350500 +NavelRock_BasePath_B8F:: @ 8350500 .incbin "baserom.gba", 0x350500, 0x1C -gMap_02_51:: @ 835051C +NavelRock_BasePath_B9F:: @ 835051C .incbin "baserom.gba", 0x35051C, 0x1C -gMap_02_52:: @ 8350538 +NavelRock_BasePath_B10F:: @ 8350538 .incbin "baserom.gba", 0x350538, 0x1C -gMap_02_53:: @ 8350554 +NavelRock_BasePath_B11F:: @ 8350554 .incbin "baserom.gba", 0x350554, 0x1C -gMap_02_54:: @ 8350570 +NavelRock_B1F:: @ 8350570 .incbin "baserom.gba", 0x350570, 0x1C -gMap_02_55:: @ 835058C +NavelRock_Fork:: @ 835058C .incbin "baserom.gba", 0x35058C, 0x1C -gMap_02_56:: @ 83505A8 +BirthIsland_Exterior:: @ 83505A8 .incbin "baserom.gba", 0x3505A8, 0x1C -gMap_02_57:: @ 83505C4 +OneIsland_KindleRoad_EmberSpa:: @ 83505C4 .incbin "baserom.gba", 0x3505C4, 0x1C -gMap_02_58:: @ 83505E0 +BirthIsland_Harbor:: @ 83505E0 .incbin "baserom.gba", 0x3505E0, 0x1C -gMap_02_59:: @ 83505FC +NavelRock_Harbor:: @ 83505FC .incbin "baserom.gba", 0x3505FC, 0x1C -gMap_03_00:: @ 8350618 +PalletTown:: @ 8350618 .incbin "baserom.gba", 0x350618, 0x1C -gMap_03_01:: @ 8350634 +ViridianCity:: @ 8350634 .incbin "baserom.gba", 0x350634, 0x1C -gMap_03_02:: @ 8350650 +PewterCity:: @ 8350650 .incbin "baserom.gba", 0x350650, 0x1C -gMap_03_03:: @ 835066C +CeruleanCity:: @ 835066C .incbin "baserom.gba", 0x35066C, 0x1C -gMap_03_04:: @ 8350688 +LavenderTown:: @ 8350688 .incbin "baserom.gba", 0x350688, 0x1C -gMap_03_05:: @ 83506A4 +VermilionCity:: @ 83506A4 .incbin "baserom.gba", 0x3506A4, 0x1C -gMap_03_06:: @ 83506C0 +CeladonCity:: @ 83506C0 .incbin "baserom.gba", 0x3506C0, 0x1C -gMap_03_07:: @ 83506DC +FuchsiaCity:: @ 83506DC .incbin "baserom.gba", 0x3506DC, 0x1C -gMap_03_08:: @ 83506F8 +CinnabarIsland:: @ 83506F8 .incbin "baserom.gba", 0x3506F8, 0x1C -gMap_03_09:: @ 8350714 +IndigoPlateau_Exterior:: @ 8350714 .incbin "baserom.gba", 0x350714, 0x1C -gMap_03_10:: @ 8350730 +SaffronCity:: @ 8350730 .incbin "baserom.gba", 0x350730, 0x1C -gMap_03_11:: @ 835074C +SaffronCity_Duplicate:: @ 835074C .incbin "baserom.gba", 0x35074C, 0x1C -gMap_03_12:: @ 8350768 +OneIsland:: @ 8350768 .incbin "baserom.gba", 0x350768, 0x1C -gMap_03_13:: @ 8350784 +TwoIsland:: @ 8350784 .incbin "baserom.gba", 0x350784, 0x1C -gMap_03_14:: @ 83507A0 +ThreeIsland:: @ 83507A0 .incbin "baserom.gba", 0x3507A0, 0x1C -gMap_03_15:: @ 83507BC +FourIsland:: @ 83507BC .incbin "baserom.gba", 0x3507BC, 0x1C -gMap_03_16:: @ 83507D8 +FiveIsland:: @ 83507D8 .incbin "baserom.gba", 0x3507D8, 0x1C -gMap_03_17:: @ 83507F4 +SevenIsland:: @ 83507F4 .incbin "baserom.gba", 0x3507F4, 0x1C -gMap_03_18:: @ 8350810 +SixIsland:: @ 8350810 .incbin "baserom.gba", 0x350810, 0x1C -gMap_03_19:: @ 835082C +Route1:: @ 835082C .incbin "baserom.gba", 0x35082C, 0x1C -gMap_03_20:: @ 8350848 +Route2:: @ 8350848 .incbin "baserom.gba", 0x350848, 0x1C -gMap_03_21:: @ 8350864 +Route3:: @ 8350864 .incbin "baserom.gba", 0x350864, 0x1C -gMap_03_22:: @ 8350880 +Route4:: @ 8350880 .incbin "baserom.gba", 0x350880, 0x1C -gMap_03_23:: @ 835089C +Route5:: @ 835089C .incbin "baserom.gba", 0x35089C, 0x1C -gMap_03_24:: @ 83508B8 +Route6:: @ 83508B8 .incbin "baserom.gba", 0x3508B8, 0x1C -gMap_03_25:: @ 83508D4 +Route7:: @ 83508D4 .incbin "baserom.gba", 0x3508D4, 0x1C -gMap_03_26:: @ 83508F0 +Route8:: @ 83508F0 .incbin "baserom.gba", 0x3508F0, 0x1C -gMap_03_27:: @ 835090C +Route9:: @ 835090C .incbin "baserom.gba", 0x35090C, 0x1C -gMap_03_28:: @ 8350928 +Route10:: @ 8350928 .incbin "baserom.gba", 0x350928, 0x1C -gMap_03_29:: @ 8350944 +Route11:: @ 8350944 .incbin "baserom.gba", 0x350944, 0x1C -gMap_03_30:: @ 8350960 +Route12:: @ 8350960 .incbin "baserom.gba", 0x350960, 0x1C -gMap_03_31:: @ 835097C +Route13:: @ 835097C .incbin "baserom.gba", 0x35097C, 0x1C -gMap_03_32:: @ 8350998 +Route14:: @ 8350998 .incbin "baserom.gba", 0x350998, 0x1C -gMap_03_33:: @ 83509B4 +Route15:: @ 83509B4 .incbin "baserom.gba", 0x3509B4, 0x1C -gMap_03_34:: @ 83509D0 +Route16:: @ 83509D0 .incbin "baserom.gba", 0x3509D0, 0x1C -gMap_03_35:: @ 83509EC +Route17:: @ 83509EC .incbin "baserom.gba", 0x3509EC, 0x1C -gMap_03_36:: @ 8350A08 +Route18:: @ 8350A08 .incbin "baserom.gba", 0x350A08, 0x1C -gMap_03_37:: @ 8350A24 +Route19:: @ 8350A24 .incbin "baserom.gba", 0x350A24, 0x1C -gMap_03_38:: @ 8350A40 +Route20:: @ 8350A40 .incbin "baserom.gba", 0x350A40, 0x1C -gMap_03_39:: @ 8350A5C +Route21_North:: @ 8350A5C .incbin "baserom.gba", 0x350A5C, 0x1C -gMap_03_40:: @ 8350A78 +Route21_South:: @ 8350A78 .incbin "baserom.gba", 0x350A78, 0x1C -gMap_03_41:: @ 8350A94 +Route22:: @ 8350A94 .incbin "baserom.gba", 0x350A94, 0x1C -gMap_03_42:: @ 8350AB0 +Route23:: @ 8350AB0 .incbin "baserom.gba", 0x350AB0, 0x1C -gMap_03_43:: @ 8350ACC +Route24:: @ 8350ACC .incbin "baserom.gba", 0x350ACC, 0x1C -gMap_03_44:: @ 8350AE8 +Route25:: @ 8350AE8 .incbin "baserom.gba", 0x350AE8, 0x1C -gMap_03_45:: @ 8350B04 +OneIsland_KindleRoad:: @ 8350B04 .incbin "baserom.gba", 0x350B04, 0x1C -gMap_03_46:: @ 8350B20 +OneIsland_TreasureBeach:: @ 8350B20 .incbin "baserom.gba", 0x350B20, 0x1C -gMap_03_47:: @ 8350B3C +TwoIsland_CapeBrink:: @ 8350B3C .incbin "baserom.gba", 0x350B3C, 0x1C -gMap_03_48:: @ 8350B58 +ThreeIsland_BondBridge:: @ 8350B58 .incbin "baserom.gba", 0x350B58, 0x1C -gMap_03_49:: @ 8350B74 +ThreeIsland_Port:: @ 8350B74 .incbin "baserom.gba", 0x350B74, 0x1C -gMap_03_50:: @ 8350B90 +UnknownMap_03_50:: @ 8350B90 .incbin "baserom.gba", 0x350B90, 0x1C -gMap_03_51:: @ 8350BAC +UnknownMap_03_51:: @ 8350BAC .incbin "baserom.gba", 0x350BAC, 0x1C -gMap_03_52:: @ 8350BC8 +UnknownMap_03_52:: @ 8350BC8 .incbin "baserom.gba", 0x350BC8, 0x1C -gMap_03_53:: @ 8350BE4 +UnknownMap_03_53:: @ 8350BE4 .incbin "baserom.gba", 0x350BE4, 0x1C -gMap_03_54:: @ 8350C00 +FiveIsland_ResortGorgeous:: @ 8350C00 .incbin "baserom.gba", 0x350C00, 0x1C -gMap_03_55:: @ 8350C1C +FiveIsland_WaterLabyrinth:: @ 8350C1C .incbin "baserom.gba", 0x350C1C, 0x1C -gMap_03_56:: @ 8350C38 +FiveIsland_Meadow:: @ 8350C38 .incbin "baserom.gba", 0x350C38, 0x1C -gMap_03_57:: @ 8350C54 +FiveIsland_MemorialPillar:: @ 8350C54 .incbin "baserom.gba", 0x350C54, 0x1C -gMap_03_58:: @ 8350C70 +SixIsland_OutcastIsland:: @ 8350C70 .incbin "baserom.gba", 0x350C70, 0x1C -gMap_03_59:: @ 8350C8C +SixIsland_GreenPath:: @ 8350C8C .incbin "baserom.gba", 0x350C8C, 0x1C -gMap_03_60:: @ 8350CA8 +SixIsland_WaterPath:: @ 8350CA8 .incbin "baserom.gba", 0x350CA8, 0x1C -gMap_03_61:: @ 8350CC4 +SixIsland_RuinValley:: @ 8350CC4 .incbin "baserom.gba", 0x350CC4, 0x1C -gMap_03_62:: @ 8350CE0 +SevenIsland_TrainerTower:: @ 8350CE0 .incbin "baserom.gba", 0x350CE0, 0x1C -gMap_03_63:: @ 8350CFC +SevenIsland_SevaultCanyon_Entrance:: @ 8350CFC .incbin "baserom.gba", 0x350CFC, 0x1C -gMap_03_64:: @ 8350D18 +SevenIsland_SevaultCanyon:: @ 8350D18 .incbin "baserom.gba", 0x350D18, 0x1C -gMap_03_65:: @ 8350D34 +SevenIsland_TanobyRuins:: @ 8350D34 .incbin "baserom.gba", 0x350D34, 0x1C -gMap_04_00:: @ 8350D50 +PalletTown_PlayersHouse_1F:: @ 8350D50 .incbin "baserom.gba", 0x350D50, 0x1C -gMap_04_01:: @ 8350D6C +PalletTown_PlayersHouse_2F:: @ 8350D6C .incbin "baserom.gba", 0x350D6C, 0x1C -gMap_04_02:: @ 8350D88 +PalletTown_GarysHouse:: @ 8350D88 .incbin "baserom.gba", 0x350D88, 0x1C -gMap_04_03:: @ 8350DA4 +PalletTown_ProfessorOaksLab:: @ 8350DA4 .incbin "baserom.gba", 0x350DA4, 0x1C -gMap_05_00:: @ 8350DC0 +ViridianCity_House1:: @ 8350DC0 .incbin "baserom.gba", 0x350DC0, 0x1C -gMap_05_01:: @ 8350DDC +ViridianCity_Gym:: @ 8350DDC .incbin "baserom.gba", 0x350DDC, 0x1C -gMap_05_02:: @ 8350DF8 +ViridianCity_House2:: @ 8350DF8 .incbin "baserom.gba", 0x350DF8, 0x1C -gMap_05_03:: @ 8350E14 +ViridianCity_Mart:: @ 8350E14 .incbin "baserom.gba", 0x350E14, 0x1C -gMap_05_04:: @ 8350E30 +ViridianCity_PokemonCenter_1F:: @ 8350E30 .incbin "baserom.gba", 0x350E30, 0x1C -gMap_05_05:: @ 8350E4C +ViridianCity_PokemonCenter_2F:: @ 8350E4C .incbin "baserom.gba", 0x350E4C, 0x1C -gMap_06_00:: @ 8350E68 +PewterCity_Museum_1F:: @ 8350E68 .incbin "baserom.gba", 0x350E68, 0x1C -gMap_06_01:: @ 8350E84 +PewterCity_Museum_2F:: @ 8350E84 .incbin "baserom.gba", 0x350E84, 0x1C -gMap_06_02:: @ 8350EA0 +PewterCity_Gym:: @ 8350EA0 .incbin "baserom.gba", 0x350EA0, 0x1C -gMap_06_03:: @ 8350EBC +PewterCity_Mart:: @ 8350EBC .incbin "baserom.gba", 0x350EBC, 0x1C -gMap_06_04:: @ 8350ED8 +PewterCity_House1:: @ 8350ED8 .incbin "baserom.gba", 0x350ED8, 0x1C -gMap_06_05:: @ 8350EF4 +PewterCity_PokemonCenter_1F:: @ 8350EF4 .incbin "baserom.gba", 0x350EF4, 0x1C -gMap_06_06:: @ 8350F10 +PewterCity_PokemonCenter_2F:: @ 8350F10 .incbin "baserom.gba", 0x350F10, 0x1C -gMap_06_07:: @ 8350F2C +PewterCity_House2:: @ 8350F2C .incbin "baserom.gba", 0x350F2C, 0x1C -gMap_07_00:: @ 8350F48 +CeruleanCity_House1:: @ 8350F48 .incbin "baserom.gba", 0x350F48, 0x1C -gMap_07_01:: @ 8350F64 +CeruleanCity_House2:: @ 8350F64 .incbin "baserom.gba", 0x350F64, 0x1C -gMap_07_02:: @ 8350F80 +CeruleanCity_House3:: @ 8350F80 .incbin "baserom.gba", 0x350F80, 0x1C -gMap_07_03:: @ 8350F9C +CeruleanCity_PokemonCenter_1F:: @ 8350F9C .incbin "baserom.gba", 0x350F9C, 0x1C -gMap_07_04:: @ 8350FB8 +CeruleanCity_PokemonCenter_2F:: @ 8350FB8 .incbin "baserom.gba", 0x350FB8, 0x1C -gMap_07_05:: @ 8350FD4 +CeruleanCity_Gym:: @ 8350FD4 .incbin "baserom.gba", 0x350FD4, 0x1C -gMap_07_06:: @ 8350FF0 +CeruleanCity_BikeShop:: @ 8350FF0 .incbin "baserom.gba", 0x350FF0, 0x1C -gMap_07_07:: @ 835100C +CeruleanCity_Mart:: @ 835100C .incbin "baserom.gba", 0x35100C, 0x1C -gMap_07_08:: @ 8351028 +CeruleanCity_House4:: @ 8351028 .incbin "baserom.gba", 0x351028, 0x1C -gMap_07_09:: @ 8351044 +CeruleanCity_House5:: @ 8351044 .incbin "baserom.gba", 0x351044, 0x1C -gMap_08_00:: @ 8351060 +LavenderTown_PokemonCenter_1F:: @ 8351060 .incbin "baserom.gba", 0x351060, 0x1C -gMap_08_01:: @ 835107C +LavenderTown_PokemonCenter_2F:: @ 835107C .incbin "baserom.gba", 0x35107C, 0x1C -gMap_08_02:: @ 8351098 +LavenderTown_VolunteerPokemonHouse:: @ 8351098 .incbin "baserom.gba", 0x351098, 0x1C -gMap_08_03:: @ 83510B4 +LavenderTown_House1:: @ 83510B4 .incbin "baserom.gba", 0x3510B4, 0x1C -gMap_08_04:: @ 83510D0 +LavenderTown_House2:: @ 83510D0 .incbin "baserom.gba", 0x3510D0, 0x1C -gMap_08_05:: @ 83510EC +LavenderTown_Mart:: @ 83510EC .incbin "baserom.gba", 0x3510EC, 0x1C -gMap_09_00:: @ 8351108 +VermilionCity_House1:: @ 8351108 .incbin "baserom.gba", 0x351108, 0x1C -gMap_09_01:: @ 8351124 +VermilionCity_PokemonCenter_1F:: @ 8351124 .incbin "baserom.gba", 0x351124, 0x1C -gMap_09_02:: @ 8351140 +VermilionCity_PokemonCenter_2F:: @ 8351140 .incbin "baserom.gba", 0x351140, 0x1C -gMap_09_03:: @ 835115C +VermilionCity_PokemonFanClub:: @ 835115C .incbin "baserom.gba", 0x35115C, 0x1C -gMap_09_04:: @ 8351178 +VermilionCity_House2:: @ 8351178 .incbin "baserom.gba", 0x351178, 0x1C -gMap_09_05:: @ 8351194 +VermilionCity_Mart:: @ 8351194 .incbin "baserom.gba", 0x351194, 0x1C -gMap_09_06:: @ 83511B0 +VermilionCity_Gym:: @ 83511B0 .incbin "baserom.gba", 0x3511B0, 0x1C -gMap_09_07:: @ 83511CC +VermilionCity_House3:: @ 83511CC .incbin "baserom.gba", 0x3511CC, 0x1C -gMap_10_00:: @ 83511E8 +CeladonCity_DepartmentStore_1F:: @ 83511E8 .incbin "baserom.gba", 0x3511E8, 0x1C -gMap_10_01:: @ 8351204 +CeladonCity_DepartmentStore_2F:: @ 8351204 .incbin "baserom.gba", 0x351204, 0x1C -gMap_10_02:: @ 8351220 +CeladonCity_DepartmentStore_3F:: @ 8351220 .incbin "baserom.gba", 0x351220, 0x1C -gMap_10_03:: @ 835123C +CeladonCity_DepartmentStore_4F:: @ 835123C .incbin "baserom.gba", 0x35123C, 0x1C -gMap_10_04:: @ 8351258 +CeladonCity_DepartmentStore_5F:: @ 8351258 .incbin "baserom.gba", 0x351258, 0x1C -gMap_10_05:: @ 8351274 +CeladonCity_DepartmentStore_Roof:: @ 8351274 .incbin "baserom.gba", 0x351274, 0x1C -gMap_10_06:: @ 8351290 +CeladonCity_DepartmentStore_Elevator:: @ 8351290 .incbin "baserom.gba", 0x351290, 0x1C -gMap_10_07:: @ 83512AC +CeladonCity_Condominiums_1F:: @ 83512AC .incbin "baserom.gba", 0x3512AC, 0x1C -gMap_10_08:: @ 83512C8 +CeladonCity_Condominiums_2F:: @ 83512C8 .incbin "baserom.gba", 0x3512C8, 0x1C -gMap_10_09:: @ 83512E4 +CeladonCity_Condominiums_3F:: @ 83512E4 .incbin "baserom.gba", 0x3512E4, 0x1C -gMap_10_10:: @ 8351300 +CeladonCity_Condominiums_Roof:: @ 8351300 .incbin "baserom.gba", 0x351300, 0x1C -gMap_10_11:: @ 835131C +CeladonCity_Condominiums_RoofRoom:: @ 835131C .incbin "baserom.gba", 0x35131C, 0x1C -gMap_10_12:: @ 8351338 +CeladonCity_PokemonCenter_1F:: @ 8351338 .incbin "baserom.gba", 0x351338, 0x1C -gMap_10_13:: @ 8351354 +CeladonCity_PokemonCenter_2F:: @ 8351354 .incbin "baserom.gba", 0x351354, 0x1C -gMap_10_14:: @ 8351370 +CeladonCity_GameCorner:: @ 8351370 .incbin "baserom.gba", 0x351370, 0x1C -gMap_10_15:: @ 835138C +CeladonCity_GameCorner_PrizeRoom:: @ 835138C .incbin "baserom.gba", 0x35138C, 0x1C -gMap_10_16:: @ 83513A8 +CeladonCity_Gym:: @ 83513A8 .incbin "baserom.gba", 0x3513A8, 0x1C -gMap_10_17:: @ 83513C4 +CeladonCity_Restaurant:: @ 83513C4 .incbin "baserom.gba", 0x3513C4, 0x1C -gMap_10_18:: @ 83513E0 +CeladonCity_House1:: @ 83513E0 .incbin "baserom.gba", 0x3513E0, 0x1C -gMap_10_19:: @ 83513FC +CeladonCity_Hotel:: @ 83513FC .incbin "baserom.gba", 0x3513FC, 0x1C -gMap_11_00:: @ 8351418 +FuchsiaCity_SafariZone_Entrance:: @ 8351418 .incbin "baserom.gba", 0x351418, 0x1C -gMap_11_01:: @ 8351434 +FuchsiaCity_Mart:: @ 8351434 .incbin "baserom.gba", 0x351434, 0x1C -gMap_11_02:: @ 8351450 +FuchsiaCity_ZooBuilding:: @ 8351450 .incbin "baserom.gba", 0x351450, 0x1C -gMap_11_03:: @ 835146C +FuchsiaCity_Gym:: @ 835146C .incbin "baserom.gba", 0x35146C, 0x1C -gMap_11_04:: @ 8351488 +FuchsiaCity_House1:: @ 8351488 .incbin "baserom.gba", 0x351488, 0x1C -gMap_11_05:: @ 83514A4 +FuchsiaCity_PokemonCenter_1F:: @ 83514A4 .incbin "baserom.gba", 0x3514A4, 0x1C -gMap_11_06:: @ 83514C0 +FuchsiaCity_PokemonCenter_2F:: @ 83514C0 .incbin "baserom.gba", 0x3514C0, 0x1C -gMap_11_07:: @ 83514DC +FuchsiaCity_Building1:: @ 83514DC .incbin "baserom.gba", 0x3514DC, 0x1C -gMap_11_08:: @ 83514F8 +FuchsiaCity_House2:: @ 83514F8 .incbin "baserom.gba", 0x3514F8, 0x1C -gMap_11_09:: @ 8351514 +FuchsiaCity_House3:: @ 8351514 .incbin "baserom.gba", 0x351514, 0x1C -gMap_12_00:: @ 8351530 +CinnabarIsland_Gym:: @ 8351530 .incbin "baserom.gba", 0x351530, 0x1C -gMap_12_01:: @ 835154C +CinnabarIsland_PokemonLab_Entrance:: @ 835154C .incbin "baserom.gba", 0x35154C, 0x1C -gMap_12_02:: @ 8351568 +CinnabarIsland_PokemonLab_Lounge:: @ 8351568 .incbin "baserom.gba", 0x351568, 0x1C -gMap_12_03:: @ 8351584 +CinnabarIsland_PokemonLab_ResearchRoom:: @ 8351584 .incbin "baserom.gba", 0x351584, 0x1C -gMap_12_04:: @ 83515A0 +CinnabarIsland_PokemonLab_ExperimentRoom:: @ 83515A0 .incbin "baserom.gba", 0x3515A0, 0x1C -gMap_12_05:: @ 83515BC +CinnabarIsland_PokemonCenter_1F:: @ 83515BC .incbin "baserom.gba", 0x3515BC, 0x1C -gMap_12_06:: @ 83515D8 +CinnabarIsland_PokemonCenter_2F:: @ 83515D8 .incbin "baserom.gba", 0x3515D8, 0x1C -gMap_12_07:: @ 83515F4 +CinnabarIsland_Mart:: @ 83515F4 .incbin "baserom.gba", 0x3515F4, 0x1C -gMap_13_00:: @ 8351610 +IndigoPlateau_PokemonCenter_1F:: @ 8351610 .incbin "baserom.gba", 0x351610, 0x1C -gMap_13_01:: @ 835162C +IndigoPlateau_PokemonCenter_2F:: @ 835162C .incbin "baserom.gba", 0x35162C, 0x1C -gMap_14_00:: @ 8351648 +SaffronCity_House1_1F:: @ 8351648 .incbin "baserom.gba", 0x351648, 0x1C -gMap_14_01:: @ 8351664 +SaffronCity_House1_2F:: @ 8351664 .incbin "baserom.gba", 0x351664, 0x1C -gMap_14_02:: @ 8351680 +SaffronCity_Dojo:: @ 8351680 .incbin "baserom.gba", 0x351680, 0x1C -gMap_14_03:: @ 835169C +SaffronCity_Gym:: @ 835169C .incbin "baserom.gba", 0x35169C, 0x1C -gMap_14_04:: @ 83516B8 +SaffronCity_House2:: @ 83516B8 .incbin "baserom.gba", 0x3516B8, 0x1C -gMap_14_05:: @ 83516D4 +SaffronCity_Mart:: @ 83516D4 .incbin "baserom.gba", 0x3516D4, 0x1C -gMap_14_06:: @ 83516F0 +SaffronCity_PokemonCenter_1F:: @ 83516F0 .incbin "baserom.gba", 0x3516F0, 0x1C -gMap_14_07:: @ 835170C +SaffronCity_PokemonCenter_2F:: @ 835170C .incbin "baserom.gba", 0x35170C, 0x1C -gMap_14_08:: @ 8351728 +SaffronCity_House3:: @ 8351728 .incbin "baserom.gba", 0x351728, 0x1C -gMap_14_09:: @ 8351744 +SaffronCity_PokemonTrainerFanClub:: @ 8351744 .incbin "baserom.gba", 0x351744, 0x1C -gMap_15_00:: @ 8351760 +Route2_ViridianForest_SouthEntrance:: @ 8351760 .incbin "baserom.gba", 0x351760, 0x1C -gMap_15_01:: @ 835177C +Route2_House:: @ 835177C .incbin "baserom.gba", 0x35177C, 0x1C -gMap_15_02:: @ 8351798 +Route2_EastBuilding:: @ 8351798 .incbin "baserom.gba", 0x351798, 0x1C -gMap_15_03:: @ 83517B4 +Route2_ViridianForest_NorthEntrance:: @ 83517B4 .incbin "baserom.gba", 0x3517B4, 0x1C -gMap_16_00:: @ 83517D0 +Route4_PokemonCenter_1F:: @ 83517D0 .incbin "baserom.gba", 0x3517D0, 0x1C -gMap_16_01:: @ 83517EC +Route4_PokemonCenter_2F:: @ 83517EC .incbin "baserom.gba", 0x3517EC, 0x1C -gMap_17_00:: @ 8351808 +Route5_PokemonDayCare:: @ 8351808 .incbin "baserom.gba", 0x351808, 0x1C -gMap_17_01:: @ 8351824 +Route5_SouthEntrance:: @ 8351824 .incbin "baserom.gba", 0x351824, 0x1C -gMap_18_00:: @ 8351840 +Route6_NorthEntrance:: @ 8351840 .incbin "baserom.gba", 0x351840, 0x1C -gMap_18_01:: @ 835185C +UnknownMap_18_01:: @ 835185C .incbin "baserom.gba", 0x35185C, 0x1C -gMap_19_00:: @ 8351878 +Route7_EastEntrance:: @ 8351878 .incbin "baserom.gba", 0x351878, 0x1C -gMap_20_00:: @ 8351894 +Route8_WestEntrance:: @ 8351894 .incbin "baserom.gba", 0x351894, 0x1C -gMap_21_00:: @ 83518B0 +Route10_PokemonCenter_1F:: @ 83518B0 .incbin "baserom.gba", 0x3518B0, 0x1C -gMap_21_01:: @ 83518CC +Route10_PokemonCenter_2F:: @ 83518CC .incbin "baserom.gba", 0x3518CC, 0x1C -gMap_22_00:: @ 83518E8 +Route11_EastEntrance_1F:: @ 83518E8 .incbin "baserom.gba", 0x3518E8, 0x1C -gMap_22_01:: @ 8351904 +Route11_EastEntrance_2F:: @ 8351904 .incbin "baserom.gba", 0x351904, 0x1C -gMap_23_00:: @ 8351920 +Route12_NorthEntrance_1F:: @ 8351920 .incbin "baserom.gba", 0x351920, 0x1C -gMap_23_01:: @ 835193C +Route12_NorthEntrance_2F:: @ 835193C .incbin "baserom.gba", 0x35193C, 0x1C -gMap_23_02:: @ 8351958 +Route12_FishingHouse:: @ 8351958 .incbin "baserom.gba", 0x351958, 0x1C -gMap_24_00:: @ 8351974 +Route15_WestEntrance_1F:: @ 8351974 .incbin "baserom.gba", 0x351974, 0x1C -gMap_24_01:: @ 8351990 +Route15_WestEntrance_2F:: @ 8351990 .incbin "baserom.gba", 0x351990, 0x1C -gMap_25_00:: @ 83519AC +Route16_House:: @ 83519AC .incbin "baserom.gba", 0x3519AC, 0x1C -gMap_25_01:: @ 83519C8 +Route16_NorthEntrance_1F:: @ 83519C8 .incbin "baserom.gba", 0x3519C8, 0x1C -gMap_25_02:: @ 83519E4 +Route16_NorthEntrance_2F:: @ 83519E4 .incbin "baserom.gba", 0x3519E4, 0x1C -gMap_26_00:: @ 8351A00 +Route18_EastEntrance_1F:: @ 8351A00 .incbin "baserom.gba", 0x351A00, 0x1C -gMap_26_01:: @ 8351A1C +Route18_EastEntrance_2F:: @ 8351A1C .incbin "baserom.gba", 0x351A1C, 0x1C -gMap_27_00:: @ 8351A38 +UnusedHouse_27_00:: @ 8351A38 .incbin "baserom.gba", 0x351A38, 0x1C -gMap_28_00:: @ 8351A54 +Route22_NorthEntrance:: @ 8351A54 .incbin "baserom.gba", 0x351A54, 0x1C -gMap_29_00:: @ 8351A70 +UnusedHouse_29_00:: @ 8351A70 .incbin "baserom.gba", 0x351A70, 0x1C -gMap_30_00:: @ 8351A8C +Route25_SeaCottage:: @ 8351A8C .incbin "baserom.gba", 0x351A8C, 0x1C -gMap_31_00:: @ 8351AA8 +SevenIsland_House_Room1:: @ 8351AA8 .incbin "baserom.gba", 0x351AA8, 0x1C -gMap_31_01:: @ 8351AC4 +SevenIsland_House_Room2:: @ 8351AC4 .incbin "baserom.gba", 0x351AC4, 0x1C -gMap_31_02:: @ 8351AE0 +SevenIsland_Mart:: @ 8351AE0 .incbin "baserom.gba", 0x351AE0, 0x1C -gMap_31_03:: @ 8351AFC +SevenIsland_PokemonCenter_1F:: @ 8351AFC .incbin "baserom.gba", 0x351AFC, 0x1C -gMap_31_04:: @ 8351B18 +SevenIsland_PokemonCenter_2F:: @ 8351B18 .incbin "baserom.gba", 0x351B18, 0x1C -gMap_31_05:: @ 8351B34 +UnusedHouse_31_05:: @ 8351B34 .incbin "baserom.gba", 0x351B34, 0x1C -gMap_31_06:: @ 8351B50 +SevenIsland_Harbor:: @ 8351B50 .incbin "baserom.gba", 0x351B50, 0x1C -gMap_32_00:: @ 8351B6C +OneIsland_PokemonCenter_1F:: @ 8351B6C .incbin "baserom.gba", 0x351B6C, 0x1C -gMap_32_01:: @ 8351B88 +OneIsland_PokemonCenter_2F:: @ 8351B88 .incbin "baserom.gba", 0x351B88, 0x1C -gMap_32_02:: @ 8351BA4 +OneIsland_House1:: @ 8351BA4 .incbin "baserom.gba", 0x351BA4, 0x1C -gMap_32_03:: @ 8351BC0 +OneIsland_House2:: @ 8351BC0 .incbin "baserom.gba", 0x351BC0, 0x1C -gMap_32_04:: @ 8351BDC +OneIsland_Harbor:: @ 8351BDC .incbin "baserom.gba", 0x351BDC, 0x1C -gMap_33_00:: @ 8351BF8 +TwoIsland_JoyfulGameCorner:: @ 8351BF8 .incbin "baserom.gba", 0x351BF8, 0x1C -gMap_33_01:: @ 8351C14 +TwoIsland_House:: @ 8351C14 .incbin "baserom.gba", 0x351C14, 0x1C -gMap_33_02:: @ 8351C30 +TwoIsland_PokemonCenter_1F:: @ 8351C30 .incbin "baserom.gba", 0x351C30, 0x1C -gMap_33_03:: @ 8351C4C +TwoIsland_PokemonCenter_2F:: @ 8351C4C .incbin "baserom.gba", 0x351C4C, 0x1C -gMap_33_04:: @ 8351C68 +TwoIsland_Harbor:: @ 8351C68 .incbin "baserom.gba", 0x351C68, 0x1C -gMap_34_00:: @ 8351C84 +ThreeIsland_House1:: @ 8351C84 .incbin "baserom.gba", 0x351C84, 0x1C -gMap_34_01:: @ 8351CA0 +ThreeIsland_PokemonCenter_1F:: @ 8351CA0 .incbin "baserom.gba", 0x351CA0, 0x1C -gMap_34_02:: @ 8351CBC +ThreeIsland_PokemonCenter_2F:: @ 8351CBC .incbin "baserom.gba", 0x351CBC, 0x1C -gMap_34_03:: @ 8351CD8 +ThreeIsland_Mart:: @ 8351CD8 .incbin "baserom.gba", 0x351CD8, 0x1C -gMap_34_04:: @ 8351CF4 +ThreeIsland_House2:: @ 8351CF4 .incbin "baserom.gba", 0x351CF4, 0x1C -gMap_34_05:: @ 8351D10 +ThreeIsland_House3:: @ 8351D10 .incbin "baserom.gba", 0x351D10, 0x1C -gMap_34_06:: @ 8351D2C +ThreeIsland_House4:: @ 8351D2C .incbin "baserom.gba", 0x351D2C, 0x1C -gMap_34_07:: @ 8351D48 +ThreeIsland_House5:: @ 8351D48 .incbin "baserom.gba", 0x351D48, 0x1C -gMap_35_00:: @ 8351D64 +FourIsland_PokemonDayCare:: @ 8351D64 .incbin "baserom.gba", 0x351D64, 0x1C -gMap_35_01:: @ 8351D80 +FourIsland_PokemonCenter_1F:: @ 8351D80 .incbin "baserom.gba", 0x351D80, 0x1C -gMap_35_02:: @ 8351D9C +FourIsland_PokemonCenter_2F:: @ 8351D9C .incbin "baserom.gba", 0x351D9C, 0x1C -gMap_35_03:: @ 8351DB8 +FourIsland_House1:: @ 8351DB8 .incbin "baserom.gba", 0x351DB8, 0x1C -gMap_35_04:: @ 8351DD4 +FourIsland_LoreleisHouse:: @ 8351DD4 .incbin "baserom.gba", 0x351DD4, 0x1C -gMap_35_05:: @ 8351DF0 +FourIsland_Harbor:: @ 8351DF0 .incbin "baserom.gba", 0x351DF0, 0x1C -gMap_35_06:: @ 8351E0C +FourIsland_House2:: @ 8351E0C .incbin "baserom.gba", 0x351E0C, 0x1C -gMap_35_07:: @ 8351E28 +FourIsland_Mart:: @ 8351E28 .incbin "baserom.gba", 0x351E28, 0x1C -gMap_36_00:: @ 8351E44 +FiveIsland_PokemonCenter_1F:: @ 8351E44 .incbin "baserom.gba", 0x351E44, 0x1C -gMap_36_01:: @ 8351E60 +FiveIsland_PokemonCenter_2F:: @ 8351E60 .incbin "baserom.gba", 0x351E60, 0x1C -gMap_36_02:: @ 8351E7C +FiveIsland_Harbor:: @ 8351E7C .incbin "baserom.gba", 0x351E7C, 0x1C -gMap_36_03:: @ 8351E98 +FiveIsland_House1:: @ 8351E98 .incbin "baserom.gba", 0x351E98, 0x1C -gMap_36_04:: @ 8351EB4 +FiveIsland_House2:: @ 8351EB4 .incbin "baserom.gba", 0x351EB4, 0x1C -gMap_37_00:: @ 8351ED0 +SixIsland_PokemonCenter_1F:: @ 8351ED0 .incbin "baserom.gba", 0x351ED0, 0x1C -gMap_37_01:: @ 8351EEC +SixIsland_PokemonCenter_2F:: @ 8351EEC .incbin "baserom.gba", 0x351EEC, 0x1C -gMap_37_02:: @ 8351F08 +SixIsland_Harbor:: @ 8351F08 .incbin "baserom.gba", 0x351F08, 0x1C -gMap_37_03:: @ 8351F24 +SixIsland_House:: @ 8351F24 .incbin "baserom.gba", 0x351F24, 0x1C -gMap_37_04:: @ 8351F40 +SixIsland_Mart:: @ 8351F40 .incbin "baserom.gba", 0x351F40, 0x1C -gMap_38_00:: @ 8351F5C +ThreeIsland_Harbor:: @ 8351F5C .incbin "baserom.gba", 0x351F5C, 0x1C -gMap_39_00:: @ 8351F78 +FiveIsland_ResortGorgeous_House:: @ 8351F78 .incbin "baserom.gba", 0x351F78, 0x1C -gMap_40_00:: @ 8351F94 +TwoIsland_CapeBrink_House:: @ 8351F94 .incbin "baserom.gba", 0x351F94, 0x1C -gMap_41_00:: @ 8351FB0 +SixIsland_WaterPath_House1:: @ 8351FB0 .incbin "baserom.gba", 0x351FB0, 0x1C -gMap_41_01:: @ 8351FCC +SixIsland_WaterPath_House2:: @ 8351FCC .incbin "baserom.gba", 0x351FCC, 0x1C -gMap_42_00:: @ 8351FE8 +SevenIsland_SevaultCanyon_House:: @ 8351FE8 .incbin "baserom.gba", 0x351FE8, 0x1C gMapGroup_00:: @ 8352004 - .4byte gMap_00_00 - .4byte gMap_00_01 - .4byte gMap_00_02 - .4byte gMap_00_03 - .4byte gMap_00_04 + .4byte UnknownMap_00_00 + .4byte UnknownMap_00_01 + .4byte UnknownMap_00_02 + .4byte UnknownMap_00_03 + .4byte UnknownMap_00_04 gMapGroup_01:: @ 8352018 - .4byte gMap_01_00 - .4byte gMap_01_01 - .4byte gMap_01_02 - .4byte gMap_01_03 - .4byte gMap_01_04 - .4byte gMap_01_05 - .4byte gMap_01_06 - .4byte gMap_01_07 - .4byte gMap_01_08 - .4byte gMap_01_09 - .4byte gMap_01_10 - .4byte gMap_01_11 - .4byte gMap_01_12 - .4byte gMap_01_13 - .4byte gMap_01_14 - .4byte gMap_01_15 - .4byte gMap_01_16 - .4byte gMap_01_17 - .4byte gMap_01_18 - .4byte gMap_01_19 - .4byte gMap_01_20 - .4byte gMap_01_21 - .4byte gMap_01_22 - .4byte gMap_01_23 - .4byte gMap_01_24 - .4byte gMap_01_25 - .4byte gMap_01_26 - .4byte gMap_01_27 - .4byte gMap_01_28 - .4byte gMap_01_29 - .4byte gMap_01_30 - .4byte gMap_01_31 - .4byte gMap_01_32 - .4byte gMap_01_33 - .4byte gMap_01_34 - .4byte gMap_01_35 - .4byte gMap_01_36 - .4byte gMap_01_37 - .4byte gMap_01_38 - .4byte gMap_01_39 - .4byte gMap_01_40 - .4byte gMap_01_41 - .4byte gMap_01_42 - .4byte gMap_01_43 - .4byte gMap_01_44 - .4byte gMap_01_45 - .4byte gMap_01_46 - .4byte gMap_01_47 - .4byte gMap_01_48 - .4byte gMap_01_49 - .4byte gMap_01_50 - .4byte gMap_01_51 - .4byte gMap_01_52 - .4byte gMap_01_53 - .4byte gMap_01_54 - .4byte gMap_01_55 - .4byte gMap_01_56 - .4byte gMap_01_57 - .4byte gMap_01_58 - .4byte gMap_01_59 - .4byte gMap_01_60 - .4byte gMap_01_61 - .4byte gMap_01_62 - .4byte gMap_01_63 - .4byte gMap_01_64 - .4byte gMap_01_65 - .4byte gMap_01_66 - .4byte gMap_01_67 - .4byte gMap_01_68 - .4byte gMap_01_69 - .4byte gMap_01_70 - .4byte gMap_01_71 - .4byte gMap_01_72 - .4byte gMap_01_73 - .4byte gMap_01_74 - .4byte gMap_01_75 - .4byte gMap_01_76 - .4byte gMap_01_77 - .4byte gMap_01_78 - .4byte gMap_01_79 - .4byte gMap_01_80 - .4byte gMap_01_81 - .4byte gMap_01_82 - .4byte gMap_01_83 - .4byte gMap_01_84 - .4byte gMap_01_85 - .4byte gMap_01_86 - .4byte gMap_01_87 - .4byte gMap_01_88 - .4byte gMap_01_89 - .4byte gMap_01_90 - .4byte gMap_01_91 - .4byte gMap_01_92 - .4byte gMap_01_93 - .4byte gMap_01_94 - .4byte gMap_01_95 - .4byte gMap_01_96 - .4byte gMap_01_97 - .4byte gMap_01_98 - .4byte gMap_01_99 - .4byte gMap_01_100 - .4byte gMap_01_101 - .4byte gMap_01_102 - .4byte gMap_01_103 - .4byte gMap_01_104 - .4byte gMap_01_105 - .4byte gMap_01_106 - .4byte gMap_01_107 - .4byte gMap_01_108 - .4byte gMap_01_109 - .4byte gMap_01_110 - .4byte gMap_01_111 - .4byte gMap_01_112 - .4byte gMap_01_113 - .4byte gMap_01_114 - .4byte gMap_01_115 - .4byte gMap_01_116 - .4byte gMap_01_117 - .4byte gMap_01_118 - .4byte gMap_01_119 - .4byte gMap_01_120 - .4byte gMap_01_121 - .4byte gMap_01_122 + .4byte ViridianForest + .4byte MtMoon_1F + .4byte MtMoon_B1F + .4byte MtMoon_B2F + .4byte SSAnne_Exterior + .4byte SSAnne_1F_Corridor + .4byte SSAnne_2F_Corridor + .4byte SSAnne_3F_Corridor + .4byte SSAnne_B1F_Corridor + .4byte SSAnne_Deck + .4byte SSAnne_Kitchen + .4byte SSAnne_CaptainsOffice + .4byte SSAnne_1F_Room1 + .4byte SSAnne_1F_Room2 + .4byte SSAnne_1F_Room3 + .4byte SSAnne_1F_Room4 + .4byte SSAnne_1F_Room5 + .4byte SSAnne_1F_Room7 + .4byte SSAnne_2F_Room1 + .4byte SSAnne_2F_Room2 + .4byte SSAnne_2F_Room3 + .4byte SSAnne_2F_Room4 + .4byte SSAnne_2F_Room5 + .4byte SSAnne_2F_Room6 + .4byte SSAnne_B1F_Room1 + .4byte SSAnne_B1F_Room2 + .4byte SSAnne_B1F_Room3 + .4byte SSAnne_B1F_Room4 + .4byte SSAnne_B1F_Room5 + .4byte SSAnne_1F_Room6 + .4byte UndergroundPath_NorthEntrance + .4byte UndergroundPath_NorthSouthTunnel + .4byte UndergroundPath_SouthEntrance + .4byte UndergroundPath_WestEntrance + .4byte UndergroundPath_EastWestTunnel + .4byte UndergroundPath_EastEntrance + .4byte DiglettsCave_NorthEntrance + .4byte DiglettsCave_B1F + .4byte DiglettsCave_SouthEntrance + .4byte VictoryRoad_1F + .4byte VictoryRoad_2F + .4byte VictoryRoad_3F + .4byte RocketHideout_B1F + .4byte RocketHideout_B2F + .4byte RocketHideout_B3F + .4byte RocketHideout_B4F + .4byte RocketHideout_Elevator + .4byte SilphCo_1F + .4byte SilphCo_2F + .4byte SilphCo_3F + .4byte SilphCo_4F + .4byte SilphCo_5F + .4byte SilphCo_6F + .4byte SilphCo_7F + .4byte SilphCo_8F + .4byte SilphCo_9F + .4byte SilphCo_10F + .4byte SilphCo_11F + .4byte SilphCo_Elevator + .4byte PokemonMansion_1F + .4byte PokemonMansion_2F + .4byte PokemonMansion_3F + .4byte PokemonMansion_B1F + .4byte SafariZone_Center + .4byte SafariZone_East + .4byte SafariZone_North + .4byte SafariZone_West + .4byte SafariZone_Building1 + .4byte SafariZone_Building2 + .4byte SafariZone_Building3 + .4byte SafariZone_Building4 + .4byte SafariZone_SecretHouse + .4byte CeruleanCave_1F + .4byte CeruleanCave_2F + .4byte CeruleanCave_B1F + .4byte PokemonLeague_LoreleisRoom + .4byte PokemonLeague_BrunosRoom + .4byte PokemonLeague_AgathasRoom + .4byte PokemonLeague_LancesRoom + .4byte PokemonLeague_ChampionsRoom + .4byte PokemonLeague_HallOfFame + .4byte RockTunnel_1F + .4byte RockTunnel_B1F + .4byte SeafoamIslands_1F + .4byte SeafoamIslands_B1F + .4byte SeafoamIslands_B2F + .4byte SeafoamIslands_B3F + .4byte SeafoamIslands_B4F + .4byte PokemonTower_1F + .4byte PokemonTower_2F + .4byte PokemonTower_3F + .4byte PokemonTower_4F + .4byte PokemonTower_5F + .4byte PokemonTower_6F + .4byte PokemonTower_7F + .4byte PowerPlant + .4byte MtEmber_RubyPath_B4F + .4byte MtEmber_Exterior + .4byte MtEmber_SummitPath_1F + .4byte MtEmber_SummitPath_2F + .4byte MtEmber_SummitPath_3F + .4byte MtEmber_Summit + .4byte MtEmber_RubyPath_B5F + .4byte SSAnne_Kitchen3 + .4byte MtEmber_RubyPath_B1F + .4byte MtEmber_RubyPath_B2F + .4byte MtEmber_RubyPath_B3F + .4byte MtEmber_RubyPath_B1F_Stairs + .4byte MtEmber_RubyPath_B2F_Stairs + .4byte ThreeIsland_BerryForest + .4byte FourIsland_IcefallCave_Entrance + .4byte FourIsland_IcefallCave_1F + .4byte SSAnne_CaptainsOffice2 + .4byte SSAnne_CaptainsOffice3 + .4byte SSAnne_CaptainsOffice4 + .4byte SSAnne_CaptainsOffice5 + .4byte SixIsland_DottedHole_B1F + .4byte SixIsland_DottedHole_B2F + .4byte SixIsland_DottedHole_B3F + .4byte SSAnne_CaptainsOffice9 + .4byte SixIsland_DottedHole_SapphireRoom + .4byte SSAnne_1F_Room11 + .4byte SSAnne_1F_Room12 gMapGroup_02:: @ 8352204 - .4byte gMap_02_00 - .4byte gMap_02_01 - .4byte gMap_02_02 - .4byte gMap_02_03 - .4byte gMap_02_04 - .4byte gMap_02_05 - .4byte gMap_02_06 - .4byte gMap_02_07 - .4byte gMap_02_08 - .4byte gMap_02_09 - .4byte gMap_02_10 - .4byte gMap_02_11 - .4byte gMap_02_12 - .4byte gMap_02_13 - .4byte gMap_02_14 - .4byte gMap_02_15 - .4byte gMap_02_16 - .4byte gMap_02_17 - .4byte gMap_02_18 - .4byte gMap_02_19 - .4byte gMap_02_20 - .4byte gMap_02_21 - .4byte gMap_02_22 - .4byte gMap_02_23 - .4byte gMap_02_24 - .4byte gMap_02_25 - .4byte gMap_02_26 - .4byte gMap_02_27 - .4byte gMap_02_28 - .4byte gMap_02_29 - .4byte gMap_02_30 - .4byte gMap_02_31 - .4byte gMap_02_32 - .4byte gMap_02_33 - .4byte gMap_02_34 - .4byte gMap_02_35 - .4byte gMap_02_36 - .4byte gMap_02_37 - .4byte gMap_02_38 - .4byte gMap_02_39 - .4byte gMap_02_40 - .4byte gMap_02_41 - .4byte gMap_02_42 - .4byte gMap_02_43 - .4byte gMap_02_44 - .4byte gMap_02_45 - .4byte gMap_02_46 - .4byte gMap_02_47 - .4byte gMap_02_48 - .4byte gMap_02_49 - .4byte gMap_02_50 - .4byte gMap_02_51 - .4byte gMap_02_52 - .4byte gMap_02_53 - .4byte gMap_02_54 - .4byte gMap_02_55 - .4byte gMap_02_56 - .4byte gMap_02_57 - .4byte gMap_02_58 - .4byte gMap_02_59 + .4byte NavelRock_Exterior + .4byte SevenIsland_TrainerTower_1F + .4byte SevenIsland_TrainerTower_2F + .4byte SevenIsland_TrainerTower_3F + .4byte SevenIsland_TrainerTower_4F + .4byte SevenIsland_TrainerTower_5F + .4byte SevenIsland_TrainerTower_6F + .4byte SevenIsland_TrainerTower_7F + .4byte SevenIsland_TrainerTower_8F + .4byte SevenIsland_TrainerTower_Roof + .4byte SevenIsland_TrainerTower_Lobby + .4byte SevenIsland_TrainerTower_Elevator + .4byte FiveIsland_LostCave_Entrance + .4byte FiveIsland_LostCave_Room1 + .4byte FiveIsland_LostCave_Room2 + .4byte FiveIsland_LostCave_Room3 + .4byte FiveIsland_LostCave_Room4 + .4byte FiveIsland_LostCave_Room5 + .4byte FiveIsland_LostCave_Room6 + .4byte FiveIsland_LostCave_Room7 + .4byte FiveIsland_LostCave_Room8 + .4byte FiveIsland_LostCave_Room9 + .4byte FiveIsland_LostCave_Room10 + .4byte FiveIsland_LostCave_Room11 + .4byte FiveIsland_LostCave_Room12 + .4byte FiveIsland_LostCave_Room13 + .4byte FiveIsland_LostCave_Room14 + .4byte SevenIsland_TanobyRuins_MoneanChamber + .4byte SevenIsland_TanobyRuins_LiptooChamber + .4byte SevenIsland_TanobyRuins_WeepthChamber + .4byte SevenIsland_TanobyRuins_DilfordChamber + .4byte SevenIsland_TanobyRuins_ScufibChamber + .4byte SevenIsland_TanobyRuins_RixyChamber + .4byte SevenIsland_TanobyRuins_ViapoisChamber + .4byte ThreeIsland_DunsparceTunnel + .4byte SevenIsland_SeavaultCanyon_TanobyKey + .4byte NavelRock_1F + .4byte NavelRock_Summit + .4byte NavelRock_Base + .4byte NavelRock_SummitPath_2F + .4byte NavelRock_SummitPath_3F + .4byte NavelRock_SummitPath_4F + .4byte NavelRock_SummitPath_5F + .4byte NavelRock_BasePath_B1F + .4byte NavelRock_BasePath_B2F + .4byte NavelRock_BasePath_B3F + .4byte NavelRock_BasePath_B4F + .4byte NavelRock_BasePath_B5F + .4byte NavelRock_BasePath_B6F + .4byte NavelRock_BasePath_B7F + .4byte NavelRock_BasePath_B8F + .4byte NavelRock_BasePath_B9F + .4byte NavelRock_BasePath_B10F + .4byte NavelRock_BasePath_B11F + .4byte NavelRock_B1F + .4byte NavelRock_Fork + .4byte BirthIsland_Exterior + .4byte OneIsland_KindleRoad_EmberSpa + .4byte BirthIsland_Harbor + .4byte NavelRock_Harbor gMapGroup_03:: @ 83522F4 - .4byte gMap_03_00 - .4byte gMap_03_01 - .4byte gMap_03_02 - .4byte gMap_03_03 - .4byte gMap_03_04 - .4byte gMap_03_05 - .4byte gMap_03_06 - .4byte gMap_03_07 - .4byte gMap_03_08 - .4byte gMap_03_09 - .4byte gMap_03_10 - .4byte gMap_03_11 - .4byte gMap_03_12 - .4byte gMap_03_13 - .4byte gMap_03_14 - .4byte gMap_03_15 - .4byte gMap_03_16 - .4byte gMap_03_17 - .4byte gMap_03_18 - .4byte gMap_03_19 - .4byte gMap_03_20 - .4byte gMap_03_21 - .4byte gMap_03_22 - .4byte gMap_03_23 - .4byte gMap_03_24 - .4byte gMap_03_25 - .4byte gMap_03_26 - .4byte gMap_03_27 - .4byte gMap_03_28 - .4byte gMap_03_29 - .4byte gMap_03_30 - .4byte gMap_03_31 - .4byte gMap_03_32 - .4byte gMap_03_33 - .4byte gMap_03_34 - .4byte gMap_03_35 - .4byte gMap_03_36 - .4byte gMap_03_37 - .4byte gMap_03_38 - .4byte gMap_03_39 - .4byte gMap_03_40 - .4byte gMap_03_41 - .4byte gMap_03_42 - .4byte gMap_03_43 - .4byte gMap_03_44 - .4byte gMap_03_45 - .4byte gMap_03_46 - .4byte gMap_03_47 - .4byte gMap_03_48 - .4byte gMap_03_49 - .4byte gMap_03_50 - .4byte gMap_03_51 - .4byte gMap_03_52 - .4byte gMap_03_53 - .4byte gMap_03_54 - .4byte gMap_03_55 - .4byte gMap_03_56 - .4byte gMap_03_57 - .4byte gMap_03_58 - .4byte gMap_03_59 - .4byte gMap_03_60 - .4byte gMap_03_61 - .4byte gMap_03_62 - .4byte gMap_03_63 - .4byte gMap_03_64 - .4byte gMap_03_65 + .4byte PalletTown + .4byte ViridianCity + .4byte PewterCity + .4byte CeruleanCity + .4byte LavenderTown + .4byte VermilionCity + .4byte CeladonCity + .4byte FuchsiaCity + .4byte CinnabarIsland + .4byte IndigoPlateau_Exterior + .4byte SaffronCity + .4byte SaffronCity_Duplicate + .4byte OneIsland + .4byte TwoIsland + .4byte ThreeIsland + .4byte FourIsland + .4byte FiveIsland + .4byte SevenIsland + .4byte SixIsland + .4byte Route1 + .4byte Route2 + .4byte Route3 + .4byte Route4 + .4byte Route5 + .4byte Route6 + .4byte Route7 + .4byte Route8 + .4byte Route9 + .4byte Route10 + .4byte Route11 + .4byte Route12 + .4byte Route13 + .4byte Route14 + .4byte Route15 + .4byte Route16 + .4byte Route17 + .4byte Route18 + .4byte Route19 + .4byte Route20 + .4byte Route21_North + .4byte Route21_South + .4byte Route22 + .4byte Route23 + .4byte Route24 + .4byte Route25 + .4byte OneIsland_KindleRoad + .4byte OneIsland_TreasureBeach + .4byte TwoIsland_CapeBrink + .4byte ThreeIsland_BondBridge + .4byte ThreeIsland_Port + .4byte UnknownMap_03_50 + .4byte UnknownMap_03_51 + .4byte UnknownMap_03_52 + .4byte UnknownMap_03_53 + .4byte FiveIsland_ResortGorgeous + .4byte FiveIsland_WaterLabyrinth + .4byte FiveIsland_Meadow + .4byte FiveIsland_MemorialPillar + .4byte SixIsland_OutcastIsland + .4byte SixIsland_GreenPath + .4byte SixIsland_WaterPath + .4byte SixIsland_RuinValley + .4byte SevenIsland_TrainerTower + .4byte SevenIsland_SevaultCanyon_Entrance + .4byte SevenIsland_SevaultCanyon + .4byte SevenIsland_TanobyRuins gMapGroup_04:: @ 83523FC - .4byte gMap_04_00 - .4byte gMap_04_01 - .4byte gMap_04_02 - .4byte gMap_04_03 + .4byte PalletTown_PlayersHouse_1F + .4byte PalletTown_PlayersHouse_2F + .4byte PalletTown_GarysHouse + .4byte PalletTown_ProfessorOaksLab gMapGroup_05:: @ 835240C - .4byte gMap_05_00 - .4byte gMap_05_01 - .4byte gMap_05_02 - .4byte gMap_05_03 - .4byte gMap_05_04 - .4byte gMap_05_05 + .4byte ViridianCity_House1 + .4byte ViridianCity_Gym + .4byte ViridianCity_House2 + .4byte ViridianCity_Mart + .4byte ViridianCity_PokemonCenter_1F + .4byte ViridianCity_PokemonCenter_2F gMapGroup_06:: @ 8352424 - .4byte gMap_06_00 - .4byte gMap_06_01 - .4byte gMap_06_02 - .4byte gMap_06_03 - .4byte gMap_06_04 - .4byte gMap_06_05 - .4byte gMap_06_06 - .4byte gMap_06_07 + .4byte PewterCity_Museum_1F + .4byte PewterCity_Museum_2F + .4byte PewterCity_Gym + .4byte PewterCity_Mart + .4byte PewterCity_House1 + .4byte PewterCity_PokemonCenter_1F + .4byte PewterCity_PokemonCenter_2F + .4byte PewterCity_House2 gMapGroup_07:: @ 8352444 - .4byte gMap_07_00 - .4byte gMap_07_01 - .4byte gMap_07_02 - .4byte gMap_07_03 - .4byte gMap_07_04 - .4byte gMap_07_05 - .4byte gMap_07_06 - .4byte gMap_07_07 - .4byte gMap_07_08 - .4byte gMap_07_09 + .4byte CeruleanCity_House1 + .4byte CeruleanCity_House2 + .4byte CeruleanCity_House3 + .4byte CeruleanCity_PokemonCenter_1F + .4byte CeruleanCity_PokemonCenter_2F + .4byte CeruleanCity_Gym + .4byte CeruleanCity_BikeShop + .4byte CeruleanCity_Mart + .4byte CeruleanCity_House4 + .4byte CeruleanCity_House5 gMapGroup_08:: @ 835246C - .4byte gMap_08_00 - .4byte gMap_08_01 - .4byte gMap_08_02 - .4byte gMap_08_03 - .4byte gMap_08_04 - .4byte gMap_08_05 + .4byte LavenderTown_PokemonCenter_1F + .4byte LavenderTown_PokemonCenter_2F + .4byte LavenderTown_VolunteerPokemonHouse + .4byte LavenderTown_House1 + .4byte LavenderTown_House2 + .4byte LavenderTown_Mart gMapGroup_09:: @ 8352484 - .4byte gMap_09_00 - .4byte gMap_09_01 - .4byte gMap_09_02 - .4byte gMap_09_03 - .4byte gMap_09_04 - .4byte gMap_09_05 - .4byte gMap_09_06 - .4byte gMap_09_07 + .4byte VermilionCity_House1 + .4byte VermilionCity_PokemonCenter_1F + .4byte VermilionCity_PokemonCenter_2F + .4byte VermilionCity_PokemonFanClub + .4byte VermilionCity_House2 + .4byte VermilionCity_Mart + .4byte VermilionCity_Gym + .4byte VermilionCity_House3 gMapGroup_10:: @ 83524A4 - .4byte gMap_10_00 - .4byte gMap_10_01 - .4byte gMap_10_02 - .4byte gMap_10_03 - .4byte gMap_10_04 - .4byte gMap_10_05 - .4byte gMap_10_06 - .4byte gMap_10_07 - .4byte gMap_10_08 - .4byte gMap_10_09 - .4byte gMap_10_10 - .4byte gMap_10_11 - .4byte gMap_10_12 - .4byte gMap_10_13 - .4byte gMap_10_14 - .4byte gMap_10_15 - .4byte gMap_10_16 - .4byte gMap_10_17 - .4byte gMap_10_18 - .4byte gMap_10_19 + .4byte CeladonCity_DepartmentStore_1F + .4byte CeladonCity_DepartmentStore_2F + .4byte CeladonCity_DepartmentStore_3F + .4byte CeladonCity_DepartmentStore_4F + .4byte CeladonCity_DepartmentStore_5F + .4byte CeladonCity_DepartmentStore_Roof + .4byte CeladonCity_DepartmentStore_Elevator + .4byte CeladonCity_Condominiums_1F + .4byte CeladonCity_Condominiums_2F + .4byte CeladonCity_Condominiums_3F + .4byte CeladonCity_Condominiums_Roof + .4byte CeladonCity_Condominiums_RoofRoom + .4byte CeladonCity_PokemonCenter_1F + .4byte CeladonCity_PokemonCenter_2F + .4byte CeladonCity_GameCorner + .4byte CeladonCity_GameCorner_PrizeRoom + .4byte CeladonCity_Gym + .4byte CeladonCity_Restaurant + .4byte CeladonCity_House1 + .4byte CeladonCity_Hotel gMapGroup_11:: @ 83524F4 - .4byte gMap_11_00 - .4byte gMap_11_01 - .4byte gMap_11_02 - .4byte gMap_11_03 - .4byte gMap_11_04 - .4byte gMap_11_05 - .4byte gMap_11_06 - .4byte gMap_11_07 - .4byte gMap_11_08 - .4byte gMap_11_09 + .4byte FuchsiaCity_SafariZone_Entrance + .4byte FuchsiaCity_Mart + .4byte FuchsiaCity_ZooBuilding + .4byte FuchsiaCity_Gym + .4byte FuchsiaCity_House1 + .4byte FuchsiaCity_PokemonCenter_1F + .4byte FuchsiaCity_PokemonCenter_2F + .4byte FuchsiaCity_Building1 + .4byte FuchsiaCity_House2 + .4byte FuchsiaCity_House3 gMapGroup_12:: @ 835251C - .4byte gMap_12_00 - .4byte gMap_12_01 - .4byte gMap_12_02 - .4byte gMap_12_03 - .4byte gMap_12_04 - .4byte gMap_12_05 - .4byte gMap_12_06 - .4byte gMap_12_07 + .4byte CinnabarIsland_Gym + .4byte CinnabarIsland_PokemonLab_Entrance + .4byte CinnabarIsland_PokemonLab_Lounge + .4byte CinnabarIsland_PokemonLab_ResearchRoom + .4byte CinnabarIsland_PokemonLab_ExperimentRoom + .4byte CinnabarIsland_PokemonCenter_1F + .4byte CinnabarIsland_PokemonCenter_2F + .4byte CinnabarIsland_Mart gMapGroup_13:: @ 835253C - .4byte gMap_13_00 - .4byte gMap_13_01 + .4byte IndigoPlateau_PokemonCenter_1F + .4byte IndigoPlateau_PokemonCenter_2F gMapGroup_14:: @ 8352544 - .4byte gMap_14_00 - .4byte gMap_14_01 - .4byte gMap_14_02 - .4byte gMap_14_03 - .4byte gMap_14_04 - .4byte gMap_14_05 - .4byte gMap_14_06 - .4byte gMap_14_07 - .4byte gMap_14_08 - .4byte gMap_14_09 + .4byte SaffronCity_House1_1F + .4byte SaffronCity_House1_2F + .4byte SaffronCity_Dojo + .4byte SaffronCity_Gym + .4byte SaffronCity_House2 + .4byte SaffronCity_Mart + .4byte SaffronCity_PokemonCenter_1F + .4byte SaffronCity_PokemonCenter_2F + .4byte SaffronCity_House3 + .4byte SaffronCity_PokemonTrainerFanClub gMapGroup_15:: @ 835256C - .4byte gMap_15_00 - .4byte gMap_15_01 - .4byte gMap_15_02 - .4byte gMap_15_03 + .4byte Route2_ViridianForest_SouthEntrance + .4byte Route2_House + .4byte Route2_EastBuilding + .4byte Route2_ViridianForest_NorthEntrance gMapGroup_16:: @ 835257C - .4byte gMap_16_00 - .4byte gMap_16_01 + .4byte Route4_PokemonCenter_1F + .4byte Route4_PokemonCenter_2F gMapGroup_17:: @ 8352584 - .4byte gMap_17_00 - .4byte gMap_17_01 + .4byte Route5_PokemonDayCare + .4byte Route5_SouthEntrance gMapGroup_18:: @ 835258C - .4byte gMap_18_00 - .4byte gMap_18_01 + .4byte Route6_NorthEntrance + .4byte UnknownMap_18_01 gMapGroup_19:: @ 8352594 - .4byte gMap_19_00 + .4byte Route7_EastEntrance gMapGroup_20:: @ 8352598 - .4byte gMap_20_00 + .4byte Route8_WestEntrance gMapGroup_21:: @ 835259C - .4byte gMap_21_00 - .4byte gMap_21_01 + .4byte Route10_PokemonCenter_1F + .4byte Route10_PokemonCenter_2F gMapGroup_22:: @ 83525A4 - .4byte gMap_22_00 - .4byte gMap_22_01 + .4byte Route11_EastEntrance_1F + .4byte Route11_EastEntrance_2F gMapGroup_23:: @ 83525AC - .4byte gMap_23_00 - .4byte gMap_23_01 - .4byte gMap_23_02 + .4byte Route12_NorthEntrance_1F + .4byte Route12_NorthEntrance_2F + .4byte Route12_FishingHouse gMapGroup_24:: @ 83525B8 - .4byte gMap_24_00 - .4byte gMap_24_01 + .4byte Route15_WestEntrance_1F + .4byte Route15_WestEntrance_2F gMapGroup_25:: @ 83525C0 - .4byte gMap_25_00 - .4byte gMap_25_01 - .4byte gMap_25_02 + .4byte Route16_House + .4byte Route16_NorthEntrance_1F + .4byte Route16_NorthEntrance_2F gMapGroup_26:: @ 83525CC - .4byte gMap_26_00 - .4byte gMap_26_01 + .4byte Route18_EastEntrance_1F + .4byte Route18_EastEntrance_2F gMapGroup_27:: @ 83525D4 - .4byte gMap_27_00 + .4byte UnusedHouse_27_00 gMapGroup_28:: @ 83525D8 - .4byte gMap_28_00 + .4byte Route22_NorthEntrance gMapGroup_29:: @ 83525DC - .4byte gMap_29_00 + .4byte UnusedHouse_29_00 gMapGroup_30:: @ 83525E0 - .4byte gMap_30_00 + .4byte Route25_SeaCottage gMapGroup_31:: @ 83525E4 - .4byte gMap_31_00 - .4byte gMap_31_01 - .4byte gMap_31_02 - .4byte gMap_31_03 - .4byte gMap_31_04 - .4byte gMap_31_05 - .4byte gMap_31_06 + .4byte SevenIsland_House_Room1 + .4byte SevenIsland_House_Room2 + .4byte SevenIsland_Mart + .4byte SevenIsland_PokemonCenter_1F + .4byte SevenIsland_PokemonCenter_2F + .4byte UnusedHouse_31_05 + .4byte SevenIsland_Harbor gMapGroup_32:: @ 8352600 - .4byte gMap_32_00 - .4byte gMap_32_01 - .4byte gMap_32_02 - .4byte gMap_32_03 - .4byte gMap_32_04 + .4byte OneIsland_PokemonCenter_1F + .4byte OneIsland_PokemonCenter_2F + .4byte OneIsland_House1 + .4byte OneIsland_House2 + .4byte OneIsland_Harbor gMapGroup_33:: @ 8352614 - .4byte gMap_33_00 - .4byte gMap_33_01 - .4byte gMap_33_02 - .4byte gMap_33_03 - .4byte gMap_33_04 + .4byte TwoIsland_JoyfulGameCorner + .4byte TwoIsland_House + .4byte TwoIsland_PokemonCenter_1F + .4byte TwoIsland_PokemonCenter_2F + .4byte TwoIsland_Harbor gMapGroup_34:: @ 8352628 - .4byte gMap_34_00 - .4byte gMap_34_01 - .4byte gMap_34_02 - .4byte gMap_34_03 - .4byte gMap_34_04 - .4byte gMap_34_05 - .4byte gMap_34_06 - .4byte gMap_34_07 + .4byte ThreeIsland_House1 + .4byte ThreeIsland_PokemonCenter_1F + .4byte ThreeIsland_PokemonCenter_2F + .4byte ThreeIsland_Mart + .4byte ThreeIsland_House2 + .4byte ThreeIsland_House3 + .4byte ThreeIsland_House4 + .4byte ThreeIsland_House5 gMapGroup_35:: @ 8352648 - .4byte gMap_35_00 - .4byte gMap_35_01 - .4byte gMap_35_02 - .4byte gMap_35_03 - .4byte gMap_35_04 - .4byte gMap_35_05 - .4byte gMap_35_06 - .4byte gMap_35_07 + .4byte FourIsland_PokemonDayCare + .4byte FourIsland_PokemonCenter_1F + .4byte FourIsland_PokemonCenter_2F + .4byte FourIsland_House1 + .4byte FourIsland_LoreleisHouse + .4byte FourIsland_Harbor + .4byte FourIsland_House2 + .4byte FourIsland_Mart gMapGroup_36:: @ 8352668 - .4byte gMap_36_00 - .4byte gMap_36_01 - .4byte gMap_36_02 - .4byte gMap_36_03 - .4byte gMap_36_04 + .4byte FiveIsland_PokemonCenter_1F + .4byte FiveIsland_PokemonCenter_2F + .4byte FiveIsland_Harbor + .4byte FiveIsland_House1 + .4byte FiveIsland_House2 gMapGroup_37:: @ 835267C - .4byte gMap_37_00 - .4byte gMap_37_01 - .4byte gMap_37_02 - .4byte gMap_37_03 - .4byte gMap_37_04 + .4byte SixIsland_PokemonCenter_1F + .4byte SixIsland_PokemonCenter_2F + .4byte SixIsland_Harbor + .4byte SixIsland_House + .4byte SixIsland_Mart gMapGroup_38:: @ 8352690 - .4byte gMap_38_00 + .4byte ThreeIsland_Harbor gMapGroup_39:: @ 8352694 - .4byte gMap_39_00 + .4byte FiveIsland_ResortGorgeous_House gMapGroup_40:: @ 8352698 - .4byte gMap_40_00 + .4byte TwoIsland_CapeBrink_House gMapGroup_41:: @ 835269C - .4byte gMap_41_00 - .4byte gMap_41_01 + .4byte SixIsland_WaterPath_House1 + .4byte SixIsland_WaterPath_House2 gMapGroup_42:: @ 83526A4 - .4byte gMap_42_00 + .4byte SevenIsland_SevaultCanyon_House gMapGroups:: @ 0x83526A8 .4byte gMapGroup_00 -- cgit v1.2.3 From fbd00ab00dfc77396f0201f5fbdd2a1c8d3dd8b8 Mon Sep 17 00:00:00 2001 From: garak Date: Sat, 2 Mar 2019 17:29:35 -0500 Subject: swap SaffronCity map names --- data/maps/groups.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'data/maps') diff --git a/data/maps/groups.inc b/data/maps/groups.inc index c21c970af..4785ec2b7 100644 --- a/data/maps/groups.inc +++ b/data/maps/groups.inc @@ -592,10 +592,10 @@ CinnabarIsland:: @ 83506F8 IndigoPlateau_Exterior:: @ 8350714 .incbin "baserom.gba", 0x350714, 0x1C -SaffronCity:: @ 8350730 +SaffronCity_Duplicate:: @ 8350730 .incbin "baserom.gba", 0x350730, 0x1C -SaffronCity_Duplicate:: @ 835074C +SaffronCity:: @ 835074C .incbin "baserom.gba", 0x35074C, 0x1C OneIsland:: @ 8350768 @@ -1478,8 +1478,8 @@ gMapGroup_03:: @ 83522F4 .4byte FuchsiaCity .4byte CinnabarIsland .4byte IndigoPlateau_Exterior - .4byte SaffronCity .4byte SaffronCity_Duplicate + .4byte SaffronCity .4byte OneIsland .4byte TwoIsland .4byte ThreeIsland -- cgit v1.2.3 From 8ec229b5570acf7b1efd6192bc27968eafdc0474 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 13 Apr 2019 14:12:36 -0400 Subject: Initial map header dump --- data/maps/groups.inc | 3400 +++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 2975 insertions(+), 425 deletions(-) (limited to 'data/maps') diff --git a/data/maps/groups.inc b/data/maps/groups.inc index 4785ec2b7..d96d28329 100644 --- a/data/maps/groups.inc +++ b/data/maps/groups.inc @@ -1,1277 +1,3827 @@ UnknownMap_00_00:: @ 834F188 - .incbin "baserom.gba", 0x34F188, 0x1C + .4byte gMapData_UnknownMap_00_00 @ 0x82D89E8 + .4byte gMapEvents_UnknownMap_00_00 @ 0x83AE0DC + .4byte gMapScripts_UnknownMap_00_00 @ 0x8160478 + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 47 + .byte 0xc4, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08 UnknownMap_00_01:: @ 834F1A4 - .incbin "baserom.gba", 0x34F1A4, 0x1C + .4byte gMapData_UnknownMap_00_01 @ 0x82D8AE4 + .4byte gMapEvents_UnknownMap_00_01 @ 0x83AE138 + .4byte gMapScripts_UnknownMap_00_01 @ 0x8160479 + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 48 + .byte 0xc4, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 UnknownMap_00_02:: @ 834F1C0 - .incbin "baserom.gba", 0x34F1C0, 0x1C + .4byte gMapData_UnknownMap_00_02 @ 0x82D8C98 + .4byte gMapEvents_UnknownMap_00_02 @ 0x83AE1C4 + .4byte gMapScripts_UnknownMap_00_02 @ 0x816047A + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 49 + .byte 0xc4, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 UnknownMap_00_03:: @ 834F1DC - .incbin "baserom.gba", 0x34F1DC, 0x1C + .4byte gMapData_UnknownMap_00_03 @ 0x82D8DB8 + .4byte gMapEvents_UnknownMap_00_03 @ 0x83AE238 + .4byte gMapScripts_UnknownMap_00_03 @ 0x816047B + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 50 + .byte 0xc4, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08 UnknownMap_00_04:: @ 834F1F8 - .incbin "baserom.gba", 0x34F1F8, 0x1C + .4byte gMapData_UnknownMap_00_04 @ 0x83388C4 + .4byte gMapEvents_UnknownMap_00_04 @ 0x83AE32C + .4byte gMapScripts_UnknownMap_00_04 @ 0x816047C + .4byte NULL + .2byte BGM_FRLG_UNION_ROOM + .2byte 262 + .byte 0xc4, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08 ViridianForest:: @ 834F214 - .incbin "baserom.gba", 0x34F214, 0x1C + .4byte gMapData_ViridianForest @ 0x82FE46C + .4byte gMapEvents_ViridianForest @ 0x83AE4D8 + .4byte gMapScripts_ViridianForest @ 0x816051F + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_FOREST + .2byte 117 + .byte 0x7e, 0x00, 0x0b, 0x03, 0x01, 0x07, 0x00, 0x00 MtMoon_1F:: @ 834F230 - .incbin "baserom.gba", 0x34F230, 0x1C + .4byte gMapData_MtMoon_1F @ 0x82FA890 + .4byte gMapEvents_MtMoon_1F @ 0x83AE668 + .4byte gMapScripts_MtMoon_1F @ 0x81605E4 + .4byte NULL + .2byte BGM_FRLG_MT_MOON + .2byte 114 + .byte 0x7f, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 MtMoon_B1F:: @ 834F24C - .incbin "baserom.gba", 0x34F24C, 0x1C + .4byte gMapData_MtMoon_B1F @ 0x82FB804 + .4byte gMapEvents_MtMoon_B1F @ 0x83AE704 + .4byte gMapScripts_MtMoon_B1F @ 0x8160698 + .4byte NULL + .2byte BGM_FRLG_MT_MOON + .2byte 115 + .byte 0x7f, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 MtMoon_B2F:: @ 834F268 - .incbin "baserom.gba", 0x34F268, 0x1C + .4byte gMapData_MtMoon_B2F @ 0x82FC728 + .4byte gMapEvents_MtMoon_B2F @ 0x83AE868 + .4byte gMapScripts_MtMoon_B2F @ 0x8160699 + .4byte NULL + .2byte BGM_FRLG_MT_MOON + .2byte 116 + .byte 0x7f, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 SSAnne_Exterior:: @ 834F284 - .incbin "baserom.gba", 0x34F284, 0x1C + .4byte gMapData_SSAnne_Exterior @ 0x82FF610 + .4byte gMapEvents_SSAnne_Exterior @ 0x83AE8C8 + .4byte gMapScripts_SSAnne_Exterior @ 0x8160840 + .4byte NULL + .2byte BGM_FRLG_SS_ANNE + .2byte 118 + .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 SSAnne_1F_Corridor:: @ 834F2A0 - .incbin "baserom.gba", 0x34F2A0, 0x1C + .4byte gMapData_SSAnne_1F_Corridor @ 0x82FFB4C + .4byte gMapEvents_SSAnne_1F_Corridor @ 0x83AE974 + .4byte gMapScripts_SSAnne_1F_Corridor @ 0x81608CB + .4byte NULL + .2byte BGM_FRLG_SS_ANNE + .2byte 119 + .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 SSAnne_2F_Corridor:: @ 834F2BC - .incbin "baserom.gba", 0x34F2BC, 0x1C + .4byte gMapData_SSAnne_2F_Corridor @ 0x82FFFB0 + .4byte gMapEvents_SSAnne_2F_Corridor @ 0x83AEA30 + .4byte gMapScripts_SSAnne_2F_Corridor @ 0x81608DE + .4byte NULL + .2byte BGM_FRLG_SS_ANNE + .2byte 120 + .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 SSAnne_3F_Corridor:: @ 834F2D8 - .incbin "baserom.gba", 0x34F2D8, 0x1C + .4byte gMapData_SSAnne_3F_Corridor @ 0x8300108 + .4byte gMapEvents_SSAnne_3F_Corridor @ 0x83AEA74 + .4byte gMapScripts_SSAnne_3F_Corridor @ 0x8160A5D + .4byte NULL + .2byte BGM_FRLG_SS_ANNE + .2byte 121 + .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 SSAnne_B1F_Corridor:: @ 834F2F4 - .incbin "baserom.gba", 0x34F2F4, 0x1C + .4byte gMapData_SSAnne_B1F_Corridor @ 0x8300270 + .4byte gMapEvents_SSAnne_B1F_Corridor @ 0x83AEAC4 + .4byte gMapScripts_SSAnne_B1F_Corridor @ 0x8160A67 + .4byte NULL + .2byte BGM_FRLG_SS_ANNE + .2byte 122 + .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 SSAnne_Deck:: @ 834F310 - .incbin "baserom.gba", 0x34F310, 0x1C + .4byte gMapData_SSAnne_Deck @ 0x8300624 + .4byte gMapEvents_SSAnne_Deck @ 0x83AEB60 + .4byte gMapScripts_SSAnne_Deck @ 0x8160A68 + .4byte NULL + .2byte BGM_FRLG_SS_ANNE + .2byte 123 + .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 SSAnne_Kitchen:: @ 834F32C - .incbin "baserom.gba", 0x34F32C, 0x1C + .4byte gMapData_SSAnne_Kitchen @ 0x8319214 + .4byte gMapEvents_SSAnne_Kitchen @ 0x83AEC60 + .4byte gMapScripts_SSAnne_Kitchen @ 0x8160AB2 + .4byte NULL + .2byte BGM_FRLG_SS_ANNE + .2byte 170 + .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 SSAnne_CaptainsOffice:: @ 834F348 - .incbin "baserom.gba", 0x34F348, 0x1C + .4byte gMapData_SSAnne_CaptainsOffice @ 0x83192EC + .4byte gMapEvents_SSAnne_CaptainsOffice @ 0x83AECB8 + .4byte gMapScripts_SSAnne_CaptainsOffice @ 0x8160B39 + .4byte NULL + .2byte BGM_FRLG_SS_ANNE + .2byte 171 + .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 SSAnne_1F_Room1:: @ 834F364 - .incbin "baserom.gba", 0x34F364, 0x1C + .4byte gMapData_SSAnne_1F_Room1 @ 0x8319E74 + .4byte gMapEvents_SSAnne_1F_Room1 @ 0x83AECEC + .4byte gMapScripts_SSAnne_1F_Room1 @ 0x8160BDB + .4byte NULL + .2byte BGM_FRLG_SS_ANNE + .2byte 177 + .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 SSAnne_1F_Room2:: @ 834F380 - .incbin "baserom.gba", 0x34F380, 0x1C + .4byte gMapData_SSAnne_1F_Room2 @ 0x8319E74 + .4byte gMapEvents_SSAnne_1F_Room2 @ 0x83AED68 + .4byte gMapScripts_SSAnne_1F_Room2 @ 0x8160BE5 + .4byte NULL + .2byte BGM_FRLG_SS_ANNE + .2byte 177 + .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 SSAnne_1F_Room3:: @ 834F39C - .incbin "baserom.gba", 0x34F39C, 0x1C + .4byte gMapData_SSAnne_1F_Room3 @ 0x8319E74 + .4byte gMapEvents_SSAnne_1F_Room3 @ 0x83AEDCC + .4byte gMapScripts_SSAnne_1F_Room3 @ 0x8160C1D + .4byte NULL + .2byte BGM_FRLG_SS_ANNE + .2byte 177 + .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 SSAnne_1F_Room4:: @ 834F3B8 - .incbin "baserom.gba", 0x34F3B8, 0x1C + .4byte gMapData_SSAnne_1F_Room4 @ 0x8319E74 + .4byte gMapEvents_SSAnne_1F_Room4 @ 0x83AEE00 + .4byte gMapScripts_SSAnne_1F_Room4 @ 0x8160C43 + .4byte NULL + .2byte BGM_FRLG_SS_ANNE + .2byte 177 + .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 SSAnne_1F_Room5:: @ 834F3D4 - .incbin "baserom.gba", 0x34F3D4, 0x1C + .4byte gMapData_SSAnne_1F_Room5 @ 0x8319E74 + .4byte gMapEvents_SSAnne_1F_Room5 @ 0x83AEE34 + .4byte gMapScripts_SSAnne_1F_Room5 @ 0x8160C66 + .4byte NULL + .2byte BGM_FRLG_SS_ANNE + .2byte 177 + .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 SSAnne_1F_Room7:: @ 834F3F0 - .incbin "baserom.gba", 0x34F3F0, 0x1C + .4byte gMapData_SSAnne_1F_Room7 @ 0x8319E74 + .4byte gMapEvents_SSAnne_1F_Room7 @ 0x83AEE68 + .4byte gMapScripts_SSAnne_1F_Room7 @ 0x8160C7E + .4byte NULL + .2byte BGM_FRLG_SS_ANNE + .2byte 177 + .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 SSAnne_2F_Room1:: @ 834F40C - .incbin "baserom.gba", 0x34F40C, 0x1C + .4byte gMapData_SSAnne_2F_Room1 @ 0x8319F04 + .4byte gMapEvents_SSAnne_2F_Room1 @ 0x83AEE9C + .4byte gMapScripts_SSAnne_2F_Room1 @ 0x8160C96 + .4byte NULL + .2byte BGM_FRLG_SS_ANNE + .2byte 178 + .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 SSAnne_2F_Room2:: @ 834F428 - .incbin "baserom.gba", 0x34F428, 0x1C + .4byte gMapData_SSAnne_2F_Room2 @ 0x8319F04 + .4byte gMapEvents_SSAnne_2F_Room2 @ 0x83AEF00 + .4byte gMapScripts_SSAnne_2F_Room2 @ 0x8160CB0 + .4byte NULL + .2byte BGM_FRLG_SS_ANNE + .2byte 178 + .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 SSAnne_2F_Room3:: @ 834F444 - .incbin "baserom.gba", 0x34F444, 0x1C + .4byte gMapData_SSAnne_2F_Room3 @ 0x8319F04 + .4byte gMapEvents_SSAnne_2F_Room3 @ 0x83AEF4C + .4byte gMapScripts_SSAnne_2F_Room3 @ 0x8160CDF + .4byte NULL + .2byte BGM_FRLG_SS_ANNE + .2byte 178 + .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 SSAnne_2F_Room4:: @ 834F460 - .incbin "baserom.gba", 0x34F460, 0x1C + .4byte gMapData_SSAnne_2F_Room4 @ 0x8319F04 + .4byte gMapEvents_SSAnne_2F_Room4 @ 0x83AEFB0 + .4byte gMapScripts_SSAnne_2F_Room4 @ 0x8160CF2 + .4byte NULL + .2byte BGM_FRLG_SS_ANNE + .2byte 178 + .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 SSAnne_2F_Room5:: @ 834F47C - .incbin "baserom.gba", 0x34F47C, 0x1C + .4byte gMapData_SSAnne_2F_Room5 @ 0x8319F04 + .4byte gMapEvents_SSAnne_2F_Room5 @ 0x83AEFFC + .4byte gMapScripts_SSAnne_2F_Room5 @ 0x8160D21 + .4byte NULL + .2byte BGM_FRLG_SS_ANNE + .2byte 178 + .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 SSAnne_2F_Room6:: @ 834F498 - .incbin "baserom.gba", 0x34F498, 0x1C + .4byte gMapData_SSAnne_2F_Room6 @ 0x8319F04 + .4byte gMapEvents_SSAnne_2F_Room6 @ 0x83AF048 + .4byte gMapScripts_SSAnne_2F_Room6 @ 0x8160D34 + .4byte NULL + .2byte BGM_FRLG_SS_ANNE + .2byte 178 + .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 SSAnne_B1F_Room1:: @ 834F4B4 - .incbin "baserom.gba", 0x34F4B4, 0x1C + .4byte gMapData_SSAnne_B1F_Room1 @ 0x8319F04 + .4byte gMapEvents_SSAnne_B1F_Room1 @ 0x83AF094 + .4byte gMapScripts_SSAnne_B1F_Room1 @ 0x8160D47 + .4byte NULL + .2byte BGM_FRLG_SS_ANNE + .2byte 178 + .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 SSAnne_B1F_Room2:: @ 834F4D0 - .incbin "baserom.gba", 0x34F4D0, 0x1C + .4byte gMapData_SSAnne_B1F_Room2 @ 0x8319F04 + .4byte gMapEvents_SSAnne_B1F_Room2 @ 0x83AF0E0 + .4byte gMapScripts_SSAnne_B1F_Room2 @ 0x8160D76 + .4byte NULL + .2byte BGM_FRLG_SS_ANNE + .2byte 178 + .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 SSAnne_B1F_Room3:: @ 834F4EC - .incbin "baserom.gba", 0x34F4EC, 0x1C + .4byte gMapData_SSAnne_B1F_Room3 @ 0x8319F04 + .4byte gMapEvents_SSAnne_B1F_Room3 @ 0x83AF12C + .4byte gMapScripts_SSAnne_B1F_Room3 @ 0x8160D8E + .4byte NULL + .2byte BGM_FRLG_SS_ANNE + .2byte 178 + .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 SSAnne_B1F_Room4:: @ 834F508 - .incbin "baserom.gba", 0x34F508, 0x1C + .4byte gMapData_SSAnne_B1F_Room4 @ 0x8319F04 + .4byte gMapEvents_SSAnne_B1F_Room4 @ 0x83AF178 + .4byte gMapScripts_SSAnne_B1F_Room4 @ 0x8160DA6 + .4byte NULL + .2byte BGM_FRLG_SS_ANNE + .2byte 178 + .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 SSAnne_B1F_Room5:: @ 834F524 - .incbin "baserom.gba", 0x34F524, 0x1C + .4byte gMapData_SSAnne_B1F_Room5 @ 0x8319F04 + .4byte gMapEvents_SSAnne_B1F_Room5 @ 0x83AF1DC + .4byte gMapScripts_SSAnne_B1F_Room5 @ 0x8160DD5 + .4byte NULL + .2byte BGM_FRLG_SS_ANNE + .2byte 178 + .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 SSAnne_1F_Room6:: @ 834F540 - .incbin "baserom.gba", 0x34F540, 0x1C + .4byte gMapData_SSAnne_1F_Room6 @ 0x8319E74 + .4byte gMapEvents_SSAnne_1F_Room6 @ 0x83AF210 + .4byte gMapScripts_SSAnne_1F_Room6 @ 0x8160DF2 + .4byte NULL + .2byte BGM_FRLG_SS_ANNE + .2byte 177 + .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 UndergroundPath_NorthEntrance:: @ 834F55C - .incbin "baserom.gba", 0x34F55C, 0x1C + .4byte gMapData_UndergroundPath_NorthEntrance @ 0x8319414 + .4byte gMapEvents_UndergroundPath_NorthEntrance @ 0x83AF25C + .4byte gMapScripts_UndergroundPath_NorthEntrance @ 0x8160E38 + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_CITY + .2byte 172 + .byte 0x81, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 UndergroundPath_NorthSouthTunnel:: @ 834F578 - .incbin "baserom.gba", 0x34F578, 0x1C + .4byte gMapData_UndergroundPath_NorthSouthTunnel @ 0x8319CAC + .4byte gMapEvents_UndergroundPath_NorthSouthTunnel @ 0x83AF2D4 + .4byte gMapScripts_UndergroundPath_NorthSouthTunnel @ 0x8160EB5 + .4byte NULL + .2byte BGM_FRLG_ROUTE_1 + .2byte 174 + .byte 0x81, 0x00, 0x00, 0x08, 0x01, 0x06, 0x00, 0x00 UndergroundPath_SouthEntrance:: @ 834F594 - .incbin "baserom.gba", 0x34F594, 0x1C + .4byte gMapData_UndergroundPath_SouthEntrance @ 0x8319414 + .4byte gMapEvents_UndergroundPath_SouthEntrance @ 0x83AF320 + .4byte gMapScripts_UndergroundPath_SouthEntrance @ 0x8160EBF + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_CITY + .2byte 172 + .byte 0x81, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 UndergroundPath_WestEntrance:: @ 834F5B0 - .incbin "baserom.gba", 0x34F5B0, 0x1C + .4byte gMapData_UndergroundPath_WestEntrance @ 0x8319414 + .4byte gMapEvents_UndergroundPath_WestEntrance @ 0x83AF36C + .4byte gMapScripts_UndergroundPath_WestEntrance @ 0x8160EC9 + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_CITY + .2byte 172 + .byte 0x82, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 UndergroundPath_EastWestTunnel:: @ 834F5CC - .incbin "baserom.gba", 0x34F5CC, 0x1C + .4byte gMapData_UndergroundPath_EastWestTunnel @ 0x8319898 + .4byte gMapEvents_UndergroundPath_EastWestTunnel @ 0x83AF3E4 + .4byte gMapScripts_UndergroundPath_EastWestTunnel @ 0x8160ED3 + .4byte NULL + .2byte BGM_FRLG_ROUTE_1 + .2byte 173 + .byte 0x82, 0x00, 0x00, 0x08, 0x01, 0x06, 0x00, 0x00 UndergroundPath_EastEntrance:: @ 834F5E8 - .incbin "baserom.gba", 0x34F5E8, 0x1C + .4byte gMapData_UndergroundPath_EastEntrance @ 0x8319414 + .4byte gMapEvents_UndergroundPath_EastEntrance @ 0x83AF430 + .4byte gMapScripts_UndergroundPath_EastEntrance @ 0x8160EDD + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_CITY + .2byte 172 + .byte 0x82, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 DiglettsCave_NorthEntrance:: @ 834F604 - .incbin "baserom.gba", 0x34F604, 0x1C + .4byte gMapData_DiglettsCave_NorthEntrance @ 0x831EB94 + .4byte gMapEvents_DiglettsCave_NorthEntrance @ 0x83AF46C + .4byte gMapScripts_DiglettsCave_NorthEntrance @ 0x8160EE7 + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_FOREST + .2byte 210 + .byte 0x83, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 DiglettsCave_B1F:: @ 834F620 - .incbin "baserom.gba", 0x34F620, 0x1C + .4byte gMapData_DiglettsCave_B1F @ 0x8303B68 + .4byte gMapEvents_DiglettsCave_B1F @ 0x83AF490 + .4byte gMapScripts_DiglettsCave_B1F @ 0x8160EF1 + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_FOREST + .2byte 124 + .byte 0x83, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 DiglettsCave_SouthEntrance:: @ 834F63C - .incbin "baserom.gba", 0x34F63C, 0x1C + .4byte gMapData_DiglettsCave_SouthEntrance @ 0x831EC58 + .4byte gMapEvents_DiglettsCave_SouthEntrance @ 0x83AF4CC + .4byte gMapScripts_DiglettsCave_SouthEntrance @ 0x8160EFB + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_FOREST + .2byte 211 + .byte 0x83, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 VictoryRoad_1F:: @ 834F658 - .incbin "baserom.gba", 0x34F658, 0x1C + .4byte gMapData_VictoryRoad_1F @ 0x83043CC + .4byte gMapEvents_VictoryRoad_1F @ 0x83AF5C0 + .4byte gMapScripts_VictoryRoad_1F @ 0x8160F05 + .4byte NULL + .2byte BGM_FRLG_MT_MOON + .2byte 125 + .byte 0x84, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 VictoryRoad_2F:: @ 834F674 - .incbin "baserom.gba", 0x34F674, 0x1C + .4byte gMapData_VictoryRoad_2F @ 0x8304CB4 + .4byte gMapEvents_VictoryRoad_2F @ 0x83AF774 + .4byte gMapScripts_VictoryRoad_2F @ 0x8160F92 + .4byte NULL + .2byte BGM_FRLG_MT_MOON + .2byte 126 + .byte 0x84, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 VictoryRoad_3F:: @ 834F690 - .incbin "baserom.gba", 0x34F690, 0x1C + .4byte gMapData_VictoryRoad_3F @ 0x8305494 + .4byte gMapEvents_VictoryRoad_3F @ 0x83AF8E0 + .4byte gMapScripts_VictoryRoad_3F @ 0x81610AA + .4byte NULL + .2byte BGM_FRLG_MT_MOON + .2byte 127 + .byte 0x84, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 RocketHideout_B1F:: @ 834F6AC - .incbin "baserom.gba", 0x34F6AC, 0x1C + .4byte gMapData_RocketHideout_B1F @ 0x8305C28 + .4byte gMapEvents_RocketHideout_B1F @ 0x83AF9D8 + .4byte gMapScripts_RocketHideout_B1F @ 0x8161195 + .4byte NULL + .2byte BGM_FRLG_ROCKET_HIDEOUT + .2byte 128 + .byte 0x85, 0x00, 0x00, 0x08, 0x00, 0x07, 0xff, 0x03 RocketHideout_B2F:: @ 834F6C8 - .incbin "baserom.gba", 0x34F6C8, 0x1C + .4byte gMapData_RocketHideout_B2F @ 0x83061CC + .4byte gMapEvents_RocketHideout_B2F @ 0x83AFA8C + .4byte gMapScripts_RocketHideout_B2F @ 0x81612A1 + .4byte NULL + .2byte BGM_FRLG_ROCKET_HIDEOUT + .2byte 129 + .byte 0x85, 0x00, 0x00, 0x08, 0x00, 0x07, 0xfe, 0x03 RocketHideout_B3F:: @ 834F6E4 - .incbin "baserom.gba", 0x34F6E4, 0x1C + .4byte gMapData_RocketHideout_B3F @ 0x8306694 + .4byte gMapEvents_RocketHideout_B3F @ 0x83AFB34 + .4byte gMapScripts_RocketHideout_B3F @ 0x81612B9 + .4byte NULL + .2byte BGM_FRLG_ROCKET_HIDEOUT + .2byte 130 + .byte 0x85, 0x00, 0x00, 0x08, 0x00, 0x07, 0xfd, 0x03 RocketHideout_B4F:: @ 834F700 - .incbin "baserom.gba", 0x34F700, 0x1C + .4byte gMapData_RocketHideout_B4F @ 0x8306B98 + .4byte gMapEvents_RocketHideout_B4F @ 0x83AFC50 + .4byte gMapScripts_RocketHideout_B4F @ 0x81612E8 + .4byte NULL + .2byte BGM_FRLG_ROCKET_HIDEOUT + .2byte 131 + .byte 0x85, 0x00, 0x00, 0x08, 0x00, 0x07, 0xfc, 0x03 RocketHideout_Elevator:: @ 834F71C - .incbin "baserom.gba", 0x34F71C, 0x1C + .4byte gMapData_RocketHideout_Elevator @ 0x8320EDC + .4byte gMapEvents_RocketHideout_Elevator @ 0x83AFC80 + .4byte gMapScripts_RocketHideout_Elevator @ 0x81614D8 + .4byte NULL + .2byte BGM_FRLG_ROCKET_HIDEOUT + .2byte 225 + .byte 0x85, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x03 SilphCo_1F:: @ 834F738 - .incbin "baserom.gba", 0x34F738, 0x1C + .4byte gMapData_SilphCo_1F @ 0x83071EC + .4byte gMapEvents_SilphCo_1F @ 0x83AFCE0 + .4byte gMapScripts_SilphCo_1F @ 0x8161625 + .4byte NULL + .2byte BGM_FRLG_SILPH + .2byte 132 + .byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x07, 0x01, 0x00 SilphCo_2F:: @ 834F754 - .incbin "baserom.gba", 0x34F754, 0x1C + .4byte gMapData_SilphCo_2F @ 0x8307840 + .4byte gMapEvents_SilphCo_2F @ 0x83AFE1C + .4byte gMapScripts_SilphCo_2F @ 0x8161641 + .4byte NULL + .2byte BGM_FRLG_SILPH + .2byte 133 + .byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x07, 0x02, 0x00 SilphCo_3F:: @ 834F770 - .incbin "baserom.gba", 0x34F770, 0x1C + .4byte gMapData_SilphCo_3F @ 0x8307E94 + .4byte gMapEvents_SilphCo_3F @ 0x83AFF58 + .4byte gMapScripts_SilphCo_3F @ 0x81616C5 + .4byte NULL + .2byte BGM_FRLG_SILPH + .2byte 134 + .byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x07, 0x03, 0x00 SilphCo_4F:: @ 834F78C - .incbin "baserom.gba", 0x34F78C, 0x1C + .4byte gMapData_SilphCo_4F @ 0x83084E8 + .4byte gMapEvents_SilphCo_4F @ 0x83B00DC + .4byte gMapScripts_SilphCo_4F @ 0x8161736 + .4byte NULL + .2byte BGM_FRLG_SILPH + .2byte 135 + .byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x07, 0x04, 0x00 SilphCo_5F:: @ 834F7A8 - .incbin "baserom.gba", 0x34F7A8, 0x1C + .4byte gMapData_SilphCo_5F @ 0x8308B3C + .4byte gMapEvents_SilphCo_5F @ 0x83B02D8 + .4byte gMapScripts_SilphCo_5F @ 0x81617BE + .4byte NULL + .2byte BGM_FRLG_SILPH + .2byte 136 + .byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x07, 0x05, 0x00 SilphCo_6F:: @ 834F7C4 - .incbin "baserom.gba", 0x34F7C4, 0x1C + .4byte gMapData_SilphCo_6F @ 0x8308FFC + .4byte gMapEvents_SilphCo_6F @ 0x83B044C + .4byte gMapScripts_SilphCo_6F @ 0x8161881 + .4byte NULL + .2byte BGM_FRLG_SILPH + .2byte 137 + .byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x07, 0x06, 0x00 SilphCo_7F:: @ 834F7E0 - .incbin "baserom.gba", 0x34F7E0, 0x1C + .4byte gMapData_SilphCo_7F @ 0x83094BC + .4byte gMapEvents_SilphCo_7F @ 0x83B0660 + .4byte gMapScripts_SilphCo_7F @ 0x8161984 + .4byte NULL + .2byte BGM_FRLG_SILPH + .2byte 138 + .byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x07, 0x07, 0x00 SilphCo_8F:: @ 834F7FC - .incbin "baserom.gba", 0x34F7FC, 0x1C + .4byte gMapData_SilphCo_8F @ 0x830997C + .4byte gMapEvents_SilphCo_8F @ 0x83B0784 + .4byte gMapScripts_SilphCo_8F @ 0x8161C5F + .4byte NULL + .2byte BGM_FRLG_SILPH + .2byte 139 + .byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x07, 0x08, 0x00 SilphCo_9F:: @ 834F818 - .incbin "baserom.gba", 0x34F818, 0x1C + .4byte gMapData_SilphCo_9F @ 0x8309E3C + .4byte gMapEvents_SilphCo_9F @ 0x83B0904 + .4byte gMapScripts_SilphCo_9F @ 0x8161CDE + .4byte NULL + .2byte BGM_FRLG_SILPH + .2byte 140 + .byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x07, 0x09, 0x00 SilphCo_10F:: @ 834F834 - .incbin "baserom.gba", 0x34F834, 0x1C + .4byte gMapData_SilphCo_10F @ 0x830A0E8 + .4byte gMapEvents_SilphCo_10F @ 0x83B0A20 + .4byte gMapScripts_SilphCo_10F @ 0x8161D86 + .4byte NULL + .2byte BGM_FRLG_SILPH + .2byte 141 + .byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x07, 0x0a, 0x00 SilphCo_11F:: @ 834F850 - .incbin "baserom.gba", 0x34F850, 0x1C + .4byte gMapData_SilphCo_11F @ 0x830A3B4 + .4byte gMapEvents_SilphCo_11F @ 0x83B0B44 + .4byte gMapScripts_SilphCo_11F @ 0x8161DEE + .4byte NULL + .2byte BGM_FRLG_SILPH + .2byte 142 + .byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x07, 0x0b, 0x00 SilphCo_Elevator:: @ 834F86C - .incbin "baserom.gba", 0x34F86C, 0x1C + .4byte gMapData_SilphCo_Elevator @ 0x8321330 + .4byte gMapEvents_SilphCo_Elevator @ 0x83B0B6C + .4byte gMapScripts_SilphCo_Elevator @ 0x8161F6E + .4byte NULL + .2byte BGM_FRLG_SILPH + .2byte 229 + .byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 PokemonMansion_1F:: @ 834F888 - .incbin "baserom.gba", 0x34F888, 0x1C + .4byte gMapData_PokemonMansion_1F @ 0x830AE3C + .4byte gMapEvents_PokemonMansion_1F @ 0x83B0C60 + .4byte gMapScripts_PokemonMansion_1F @ 0x81621F9 + .4byte NULL + .2byte BGM_FRLG_POKEMON_MANSION + .2byte 143 + .byte 0x87, 0x00, 0x0b, 0x08, 0x00, 0x07, 0x00, 0x03 PokemonMansion_2F:: @ 834F8A4 - .incbin "baserom.gba", 0x34F8A4, 0x1C + .4byte gMapData_PokemonMansion_2F @ 0x830B9A8 + .4byte gMapEvents_PokemonMansion_2F @ 0x83B0D20 + .4byte gMapScripts_PokemonMansion_2F @ 0x8162254 + .4byte NULL + .2byte BGM_FRLG_POKEMON_MANSION + .2byte 144 + .byte 0x87, 0x00, 0x0b, 0x08, 0x00, 0x07, 0x00, 0x03 PokemonMansion_3F:: @ 834F8C0 - .incbin "baserom.gba", 0x34F8C0, 0x1C + .4byte gMapData_PokemonMansion_3F @ 0x830C430 + .4byte gMapEvents_PokemonMansion_3F @ 0x83B0DF8 + .4byte gMapScripts_PokemonMansion_3F @ 0x81622A1 + .4byte NULL + .2byte BGM_FRLG_POKEMON_MANSION + .2byte 145 + .byte 0x87, 0x00, 0x0b, 0x08, 0x00, 0x07, 0x00, 0x03 PokemonMansion_B1F:: @ 834F8DC - .incbin "baserom.gba", 0x34F8DC, 0x1C + .4byte gMapData_PokemonMansion_B1F @ 0x830CEB8 + .4byte gMapEvents_PokemonMansion_B1F @ 0x83B0ED4 + .4byte gMapScripts_PokemonMansion_B1F @ 0x81622FC + .4byte NULL + .2byte BGM_FRLG_POKEMON_MANSION + .2byte 146 + .byte 0x87, 0x00, 0x0b, 0x08, 0x00, 0x07, 0x00, 0x03 SafariZone_Center:: @ 834F8F8 - .incbin "baserom.gba", 0x34F8F8, 0x1C + .4byte gMapData_SafariZone_Center @ 0x830DD38 + .4byte gMapEvents_SafariZone_Center @ 0x83B0F98 + .4byte gMapScripts_SafariZone_Center @ 0x8162357 + .4byte NULL + .2byte BGM_FRLG_SAFARI_ZONE + .2byte 147 + .byte 0x88, 0x00, 0x00, 0x03, 0x01, 0x06, 0x00, 0x00 SafariZone_East:: @ 834F914 - .incbin "baserom.gba", 0x34F914, 0x1C + .4byte gMapData_SafariZone_East @ 0x830EC24 + .4byte gMapEvents_SafariZone_East @ 0x83B1068 + .4byte gMapScripts_SafariZone_East @ 0x816237C + .4byte NULL + .2byte BGM_FRLG_SAFARI_ZONE + .2byte 148 + .byte 0x88, 0x00, 0x00, 0x03, 0x01, 0x06, 0x00, 0x00 SafariZone_North:: @ 834F930 - .incbin "baserom.gba", 0x34F930, 0x1C + .4byte gMapData_SafariZone_North @ 0x830FE1C + .4byte gMapEvents_SafariZone_North @ 0x83B1168 + .4byte gMapScripts_SafariZone_North @ 0x8162398 + .4byte NULL + .2byte BGM_FRLG_SAFARI_ZONE + .2byte 149 + .byte 0x88, 0x00, 0x00, 0x03, 0x01, 0x06, 0x00, 0x00 SafariZone_West:: @ 834F94C - .incbin "baserom.gba", 0x34F94C, 0x1C + .4byte gMapData_SafariZone_West @ 0x8310BC4 + .4byte gMapEvents_SafariZone_West @ 0x83B1270 + .4byte gMapScripts_SafariZone_West @ 0x81623C6 + .4byte NULL + .2byte BGM_FRLG_SAFARI_ZONE + .2byte 150 + .byte 0x88, 0x00, 0x00, 0x03, 0x01, 0x06, 0x00, 0x00 SafariZone_Building1:: @ 834F968 - .incbin "baserom.gba", 0x34F968, 0x1C + .4byte gMapData_SafariZone_Building1 @ 0x831C028 + .4byte gMapEvents_SafariZone_Building1 @ 0x83B12CC + .4byte gMapScripts_SafariZone_Building1 @ 0x81623EB + .4byte NULL + .2byte BGM_FRLG_SAFARI_ZONE + .2byte 198 + .byte 0x88, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 SafariZone_Building2:: @ 834F984 - .incbin "baserom.gba", 0x34F984, 0x1C + .4byte gMapData_SafariZone_Building2 @ 0x831C028 + .4byte gMapEvents_SafariZone_Building2 @ 0x83B1340 + .4byte gMapScripts_SafariZone_Building2 @ 0x81623FE + .4byte NULL + .2byte BGM_FRLG_SAFARI_ZONE + .2byte 198 + .byte 0x88, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 SafariZone_Building3:: @ 834F9A0 - .incbin "baserom.gba", 0x34F9A0, 0x1C + .4byte gMapData_SafariZone_Building3 @ 0x831C028 + .4byte gMapEvents_SafariZone_Building3 @ 0x83B13CC + .4byte gMapScripts_SafariZone_Building3 @ 0x816241A + .4byte NULL + .2byte BGM_FRLG_SAFARI_ZONE + .2byte 198 + .byte 0x88, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 SafariZone_Building4:: @ 834F9BC - .incbin "baserom.gba", 0x34F9BC, 0x1C + .4byte gMapData_SafariZone_Building4 @ 0x831C028 + .4byte gMapEvents_SafariZone_Building4 @ 0x83B1440 + .4byte gMapScripts_SafariZone_Building4 @ 0x8162436 + .4byte NULL + .2byte BGM_FRLG_SAFARI_ZONE + .2byte 198 + .byte 0x88, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 SafariZone_SecretHouse:: @ 834F9D8 - .incbin "baserom.gba", 0x34F9D8, 0x1C + .4byte gMapData_SafariZone_SecretHouse @ 0x831C16C + .4byte gMapEvents_SafariZone_SecretHouse @ 0x83B1484 + .4byte gMapScripts_SafariZone_SecretHouse @ 0x8162452 + .4byte NULL + .2byte BGM_FRLG_SAFARI_ZONE + .2byte 199 + .byte 0x88, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 CeruleanCave_1F:: @ 834F9F4 - .incbin "baserom.gba", 0x34F9F4, 0x1C + .4byte gMapData_CeruleanCave_1F @ 0x8311318 + .4byte gMapEvents_CeruleanCave_1F @ 0x83B15BC + .4byte gMapScripts_CeruleanCave_1F @ 0x81624B3 + .4byte NULL + .2byte BGM_FRLG_ROCKET_HIDEOUT + .2byte 151 + .byte 0x8d, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 CeruleanCave_2F:: @ 834FA10 - .incbin "baserom.gba", 0x34FA10, 0x1C + .4byte gMapData_CeruleanCave_2F @ 0x8311A6C + .4byte gMapEvents_CeruleanCave_2F @ 0x83B1738 + .4byte gMapScripts_CeruleanCave_2F @ 0x81624BD + .4byte NULL + .2byte BGM_FRLG_ROCKET_HIDEOUT + .2byte 152 + .byte 0x8d, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 CeruleanCave_B1F:: @ 834FA2C - .incbin "baserom.gba", 0x34FA2C, 0x1C + .4byte gMapData_CeruleanCave_B1F @ 0x83121C0 + .4byte gMapEvents_CeruleanCave_B1F @ 0x83B1874 + .4byte gMapScripts_CeruleanCave_B1F @ 0x81624BE + .4byte NULL + .2byte BGM_FRLG_ROCKET_HIDEOUT + .2byte 153 + .byte 0x8d, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 PokemonLeague_LoreleisRoom:: @ 834FA48 - .incbin "baserom.gba", 0x34FA48, 0x1C + .4byte gMapData_PokemonLeague_LoreleisRoom @ 0x831F178 + .4byte gMapEvents_PokemonLeague_LoreleisRoom @ 0x83B18B0 + .4byte gMapScripts_PokemonLeague_LoreleisRoom @ 0x816256C + .4byte NULL + .2byte BGM_FRLG_GYM + .2byte 213 + .byte 0x89, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x04 PokemonLeague_BrunosRoom:: @ 834FA64 - .incbin "baserom.gba", 0x34FA64, 0x1C + .4byte gMapData_PokemonLeague_BrunosRoom @ 0x831F2F0 + .4byte gMapEvents_PokemonLeague_BrunosRoom @ 0x83B18EC + .4byte gMapScripts_PokemonLeague_BrunosRoom @ 0x8162685 + .4byte NULL + .2byte BGM_FRLG_ROCKET_HIDEOUT + .2byte 214 + .byte 0x89, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x05 PokemonLeague_AgathasRoom:: @ 834FA80 - .incbin "baserom.gba", 0x34FA80, 0x1C + .4byte gMapData_PokemonLeague_AgathasRoom @ 0x831F468 + .4byte gMapEvents_PokemonLeague_AgathasRoom @ 0x83B1928 + .4byte gMapScripts_PokemonLeague_AgathasRoom @ 0x8162810 + .4byte NULL + .2byte BGM_FRLG_POKEMON_TOWER + .2byte 215 + .byte 0x89, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x06 PokemonLeague_LancesRoom:: @ 834FA9C - .incbin "baserom.gba", 0x34FA9C, 0x1C + .4byte gMapData_PokemonLeague_LancesRoom @ 0x831F9CC + .4byte gMapEvents_PokemonLeague_LancesRoom @ 0x83B1964 + .4byte gMapScripts_PokemonLeague_LancesRoom @ 0x816292D + .4byte NULL + .2byte BGM_FRLG_INDIGO_PLATEAU + .2byte 216 + .byte 0x89, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x07 PokemonLeague_ChampionsRoom:: @ 834FAB8 - .incbin "baserom.gba", 0x34FAB8, 0x1C + .4byte gMapData_PokemonLeague_ChampionsRoom @ 0x831FBF8 + .4byte gMapEvents_PokemonLeague_ChampionsRoom @ 0x83B19B8 + .4byte gMapScripts_PokemonLeague_ChampionsRoom @ 0x8162AE2 + .4byte NULL + .2byte BGM_FRLG_INDIGO_PLATEAU + .2byte 217 + .byte 0x89, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 PokemonLeague_HallOfFame:: @ 834FAD4 - .incbin "baserom.gba", 0x34FAD4, 0x1C + .4byte gMapData_PokemonLeague_HallOfFame @ 0x831FD3C + .4byte gMapEvents_PokemonLeague_HallOfFame @ 0x83B19EC + .4byte gMapScripts_PokemonLeague_HallOfFame @ 0x8162D4C + .4byte NULL + .2byte BGM_FRLG_HALL_OF_FAME_PALLET_TOWN + .2byte 218 + .byte 0x89, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 RockTunnel_1F:: @ 834FAF0 - .incbin "baserom.gba", 0x34FAF0, 0x1C + .4byte gMapData_RockTunnel_1F @ 0x83130E4 + .4byte gMapEvents_RockTunnel_1F @ 0x83B1B2C + .4byte gMapScripts_RockTunnel_1F @ 0x8162DD6 + .4byte NULL + .2byte BGM_FRLG_MT_MOON + .2byte 154 + .byte 0x8a, 0x01, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 RockTunnel_B1F:: @ 834FB0C - .incbin "baserom.gba", 0x34FB0C, 0x1C + .4byte gMapData_RockTunnel_B1F @ 0x8314008 + .4byte gMapEvents_RockTunnel_B1F @ 0x83B1DD0 + .4byte gMapScripts_RockTunnel_B1F @ 0x8162E8A + .4byte NULL + .2byte BGM_FRLG_MT_MOON + .2byte 155 + .byte 0x8a, 0x01, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 SeafoamIslands_1F:: @ 834FB28 - .incbin "baserom.gba", 0x34FB28, 0x1C + .4byte gMapData_SeafoamIslands_1F @ 0x831474C + .4byte gMapEvents_SeafoamIslands_1F @ 0x83B1E64 + .4byte gMapScripts_SeafoamIslands_1F @ 0x8162F43 + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_FOREST + .2byte 156 + .byte 0x8b, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 SeafoamIslands_B1F:: @ 834FB44 - .incbin "baserom.gba", 0x34FB44, 0x1C + .4byte gMapData_SeafoamIslands_B1F @ 0x8314E44 + .4byte gMapEvents_SeafoamIslands_B1F @ 0x83B1F30 + .4byte gMapScripts_SeafoamIslands_B1F @ 0x8162F4D + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_FOREST + .2byte 157 + .byte 0x8b, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 SeafoamIslands_B2F:: @ 834FB60 - .incbin "baserom.gba", 0x34FB60, 0x1C + .4byte gMapData_SeafoamIslands_B2F @ 0x8315588 + .4byte gMapEvents_SeafoamIslands_B2F @ 0x83B1FE4 + .4byte gMapScripts_SeafoamIslands_B2F @ 0x8162F4E + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_FOREST + .2byte 158 + .byte 0x8b, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 SeafoamIslands_B3F:: @ 834FB7C - .incbin "baserom.gba", 0x34FB7C, 0x1C + .4byte gMapData_SeafoamIslands_B3F @ 0x8315CCC + .4byte gMapEvents_SeafoamIslands_B3F @ 0x83B20DC + .4byte gMapScripts_SeafoamIslands_B3F @ 0x8162F4F + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_FOREST + .2byte 159 + .byte 0x8b, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 SeafoamIslands_B4F:: @ 834FB98 - .incbin "baserom.gba", 0x34FB98, 0x1C + .4byte gMapData_SeafoamIslands_B4F @ 0x8316410 + .4byte gMapEvents_SeafoamIslands_B4F @ 0x83B21C4 + .4byte gMapScripts_SeafoamIslands_B4F @ 0x816302E + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_FOREST + .2byte 160 + .byte 0x8b, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 PokemonTower_1F:: @ 834FBB4 - .incbin "baserom.gba", 0x34FBB4, 0x1C + .4byte gMapData_PokemonTower_1F @ 0x83167F4 + .4byte gMapEvents_PokemonTower_1F @ 0x83B2270 + .4byte gMapScripts_PokemonTower_1F @ 0x8163235 + .4byte NULL + .2byte BGM_FRLG_POKEMON_TOWER + .2byte 161 + .byte 0x8c, 0x00, 0x00, 0x08, 0x00, 0x05, 0x00, 0x02 PokemonTower_2F:: @ 834FBD0 - .incbin "baserom.gba", 0x34FBD0, 0x1C + .4byte gMapData_PokemonTower_2F @ 0x8316BD8 + .4byte gMapEvents_PokemonTower_2F @ 0x83B22E4 + .4byte gMapScripts_PokemonTower_2F @ 0x8163285 + .4byte NULL + .2byte BGM_FRLG_POKEMON_TOWER + .2byte 162 + .byte 0x8c, 0x00, 0x00, 0x08, 0x00, 0x05, 0x00, 0x02 PokemonTower_3F:: @ 834FBEC - .incbin "baserom.gba", 0x34FBEC, 0x1C + .4byte gMapData_PokemonTower_3F @ 0x8316FBC + .4byte gMapEvents_PokemonTower_3F @ 0x83B2368 + .4byte gMapScripts_PokemonTower_3F @ 0x81633A6 + .4byte NULL + .2byte BGM_FRLG_POKEMON_TOWER + .2byte 163 + .byte 0x8c, 0x00, 0x06, 0x08, 0x00, 0x05, 0x00, 0x02 PokemonTower_4F:: @ 834FC08 - .incbin "baserom.gba", 0x34FC08, 0x1C + .4byte gMapData_PokemonTower_4F @ 0x83173A0 + .4byte gMapEvents_PokemonTower_4F @ 0x83B241C + .4byte gMapScripts_PokemonTower_4F @ 0x81633EC + .4byte NULL + .2byte BGM_FRLG_POKEMON_TOWER + .2byte 164 + .byte 0x8c, 0x00, 0x06, 0x08, 0x00, 0x05, 0x00, 0x02 PokemonTower_5F:: @ 834FC24 - .incbin "baserom.gba", 0x34FC24, 0x1C + .4byte gMapData_PokemonTower_5F @ 0x8317784 + .4byte gMapEvents_PokemonTower_5F @ 0x83B2604 + .4byte gMapScripts_PokemonTower_5F @ 0x8163432 + .4byte NULL + .2byte BGM_FRLG_POKEMON_TOWER + .2byte 165 + .byte 0x8c, 0x00, 0x06, 0x08, 0x00, 0x05, 0x00, 0x02 PokemonTower_6F:: @ 834FC40 - .incbin "baserom.gba", 0x34FC40, 0x1C + .4byte gMapData_PokemonTower_6F @ 0x8317B68 + .4byte gMapEvents_PokemonTower_6F @ 0x83B26C0 + .4byte gMapScripts_PokemonTower_6F @ 0x81634B7 + .4byte NULL + .2byte BGM_FRLG_POKEMON_TOWER + .2byte 166 + .byte 0x8c, 0x00, 0x06, 0x08, 0x00, 0x05, 0x00, 0x02 PokemonTower_7F:: @ 834FC5C - .incbin "baserom.gba", 0x34FC5C, 0x1C + .4byte gMapData_PokemonTower_7F @ 0x8317F4C + .4byte gMapEvents_PokemonTower_7F @ 0x83B2748 + .4byte gMapScripts_PokemonTower_7F @ 0x8163559 + .4byte NULL + .2byte BGM_FRLG_POKEMON_TOWER + .2byte 167 + .byte 0x8c, 0x00, 0x06, 0x08, 0x00, 0x05, 0x00, 0x02 PowerPlant:: @ 834FC78 - .incbin "baserom.gba", 0x34FC78, 0x1C + .4byte gMapData_PowerPlant @ 0x8318EC0 + .4byte gMapEvents_PowerPlant @ 0x83B285C + .4byte gMapScripts_PowerPlant @ 0x8163764 + .4byte NULL + .2byte BGM_FRLG_POKEMON_MANSION + .2byte 168 + .byte 0x8e, 0x00, 0x00, 0x08, 0x00, 0x07, 0x00, 0x03 MtEmber_RubyPath_B4F:: @ 834FC94 - .incbin "baserom.gba", 0x34FC94, 0x1C + .4byte gMapData_MtEmber_RubyPath_B4F @ 0x8339290 + .4byte gMapEvents_MtEmber_RubyPath_B4F @ 0x83B29B8 + .4byte gMapScripts_MtEmber_RubyPath_B4F @ 0x81638EB + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 269 + .byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 MtEmber_Exterior:: @ 834FCB0 - .incbin "baserom.gba", 0x34FCB0, 0x1C + .4byte gMapData_MtEmber_Exterior @ 0x833D660 + .4byte gMapEvents_MtEmber_Exterior @ 0x83B2C24 + .4byte gMapScripts_MtEmber_Exterior @ 0x8163946 + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 280 + .byte 0xaf, 0x00, 0x00, 0x03, 0x01, 0x06, 0x00, 0x00 MtEmber_SummitPath_1F:: @ 834FCCC - .incbin "baserom.gba", 0x34FCCC, 0x1C + .4byte gMapData_MtEmber_SummitPath_1F @ 0x833DC08 + .4byte gMapEvents_MtEmber_SummitPath_1F @ 0x83B2C48 + .4byte gMapScripts_MtEmber_SummitPath_1F @ 0x8163AF9 + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 282 + .byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 MtEmber_SummitPath_2F:: @ 834FCE8 - .incbin "baserom.gba", 0x34FCE8, 0x1C + .4byte gMapData_MtEmber_SummitPath_2F @ 0x833ED6C + .4byte gMapEvents_MtEmber_SummitPath_2F @ 0x83B2D44 + .4byte gMapScripts_MtEmber_SummitPath_2F @ 0x8163AFA + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 283 + .byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 MtEmber_SummitPath_3F:: @ 834FD04 - .incbin "baserom.gba", 0x34FD04, 0x1C + .4byte gMapData_MtEmber_SummitPath_3F @ 0x833EEDC + .4byte gMapEvents_MtEmber_SummitPath_3F @ 0x83B2D68 + .4byte gMapScripts_MtEmber_SummitPath_3F @ 0x8163AFB + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 284 + .byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 MtEmber_Summit:: @ 834FD20 - .incbin "baserom.gba", 0x34FD20, 0x1C + .4byte gMapData_MtEmber_Summit @ 0x833D9C8 + .4byte gMapEvents_MtEmber_Summit @ 0x83B2DFC + .4byte gMapScripts_MtEmber_Summit @ 0x8163AFC + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 281 + .byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 MtEmber_RubyPath_B5F:: @ 834FD3C - .incbin "baserom.gba", 0x34FD3C, 0x1C + .4byte gMapData_MtEmber_RubyPath_B5F @ 0x833FF60 + .4byte gMapEvents_MtEmber_RubyPath_B5F @ 0x83B2E3C + .4byte gMapScripts_MtEmber_RubyPath_B5F @ 0x8163BAA + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 291 + .byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 SSAnne_Kitchen3:: @ 834FD58 - .incbin "baserom.gba", 0x34FD58, 0x1C + .4byte gMapData_SSAnne_Kitchen3 @ 0x833F304 + .4byte gMapEvents_SSAnne_Kitchen3 @ 0x83B2EE0 + .4byte gMapScripts_SSAnne_Kitchen3 @ 0x8163C45 + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 285 + .byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 MtEmber_RubyPath_B1F:: @ 834FD74 - .incbin "baserom.gba", 0x34FD74, 0x1C + .4byte gMapData_MtEmber_RubyPath_B1F @ 0x833F524 + .4byte gMapEvents_MtEmber_RubyPath_B1F @ 0x83B2F64 + .4byte gMapScripts_MtEmber_RubyPath_B1F @ 0x8163C46 + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 286 + .byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 MtEmber_RubyPath_B2F:: @ 834FD90 - .incbin "baserom.gba", 0x34FD90, 0x1C + .4byte gMapData_MtEmber_RubyPath_B2F @ 0x833F6A8 + .4byte gMapEvents_MtEmber_RubyPath_B2F @ 0x83B3030 + .4byte gMapScripts_MtEmber_RubyPath_B2F @ 0x8163C47 + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 287 + .byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 MtEmber_RubyPath_B3F:: @ 834FDAC - .incbin "baserom.gba", 0x34FDAC, 0x1C + .4byte gMapData_MtEmber_RubyPath_B3F @ 0x833FC60 + .4byte gMapEvents_MtEmber_RubyPath_B3F @ 0x83B314C + .4byte gMapScripts_MtEmber_RubyPath_B3F @ 0x8163C48 + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 288 + .byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 MtEmber_RubyPath_B1F_Stairs:: @ 834FDC8 - .incbin "baserom.gba", 0x34FDC8, 0x1C + .4byte gMapData_MtEmber_RubyPath_B1F_Stairs @ 0x833FCD8 + .4byte gMapEvents_MtEmber_RubyPath_B1F_Stairs @ 0x83B3188 + .4byte gMapScripts_MtEmber_RubyPath_B1F_Stairs @ 0x8163C6F + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 289 + .byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 MtEmber_RubyPath_B2F_Stairs:: @ 834FDE4 - .incbin "baserom.gba", 0x34FDE4, 0x1C + .4byte gMapData_MtEmber_RubyPath_B2F_Stairs @ 0x833FD5C + .4byte gMapEvents_MtEmber_RubyPath_B2F_Stairs @ 0x83B31DC + .4byte gMapScripts_MtEmber_RubyPath_B2F_Stairs @ 0x8163C70 + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 290 + .byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 ThreeIsland_BerryForest:: @ 834FE00 - .incbin "baserom.gba", 0x34FE00, 0x1C + .4byte gMapData_ThreeIsland_BerryForest @ 0x833A7A8 + .4byte gMapEvents_ThreeIsland_BerryForest @ 0x83B340C + .4byte gMapScripts_ThreeIsland_BerryForest @ 0x8163C71 + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_FOREST + .2byte 270 + .byte 0xb0, 0x00, 0x0b, 0x03, 0x01, 0x07, 0x00, 0x00 FourIsland_IcefallCave_Entrance:: @ 834FE1C - .incbin "baserom.gba", 0x34FE1C, 0x1C + .4byte gMapData_FourIsland_IcefallCave_Entrance @ 0x8340E38 + .4byte gMapEvents_FourIsland_IcefallCave_Entrance @ 0x83B3438 + .4byte gMapScripts_FourIsland_IcefallCave_Entrance @ 0x8163D3A + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 293 + .byte 0xb1, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 FourIsland_IcefallCave_1F:: @ 834FE38 - .incbin "baserom.gba", 0x34FE38, 0x1C + .4byte gMapData_FourIsland_IcefallCave_1F @ 0x834117C + .4byte gMapEvents_FourIsland_IcefallCave_1F @ 0x83B34AC + .4byte gMapScripts_FourIsland_IcefallCave_1F @ 0x8163D44 + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 294 + .byte 0xb1, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 SSAnne_CaptainsOffice2:: @ 834FE54 - .incbin "baserom.gba", 0x34FE54, 0x1C + .4byte gMapData_SSAnne_CaptainsOffice2 @ 0x8341560 + .4byte gMapEvents_SSAnne_CaptainsOffice2 @ 0x83B3508 + .4byte gMapScripts_SSAnne_CaptainsOffice2 @ 0x8163D81 + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 295 + .byte 0xb1, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 SSAnne_CaptainsOffice3:: @ 834FE70 - .incbin "baserom.gba", 0x34FE70, 0x1C + .4byte gMapData_SSAnne_CaptainsOffice3 @ 0x8341A98 + .4byte gMapEvents_SSAnne_CaptainsOffice3 @ 0x83B35B4 + .4byte gMapScripts_SSAnne_CaptainsOffice3 @ 0x8163D82 + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 296 + .byte 0xb1, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 SSAnne_CaptainsOffice4:: @ 834FE8C - .incbin "baserom.gba", 0x34FE8C, 0x1C + .4byte gMapData_SSAnne_CaptainsOffice4 @ 0x83405A4 + .4byte gMapEvents_SSAnne_CaptainsOffice4 @ 0x83B381C + .4byte gMapScripts_SSAnne_CaptainsOffice4 @ 0x8163F2E + .4byte NULL + .2byte BGM_FRLG_ROCKET_HIDEOUT + .2byte 292 + .byte 0xb2, 0x00, 0x00, 0x08, 0x00, 0x05, 0x00, 0x03 SSAnne_CaptainsOffice5:: @ 834FEA8 - .incbin "baserom.gba", 0x34FEA8, 0x1C + .4byte gMapData_SSAnne_CaptainsOffice5 @ 0x83436C4 + .4byte gMapEvents_SSAnne_CaptainsOffice5 @ 0x83B3850 + .4byte gMapScripts_SSAnne_CaptainsOffice5 @ 0x8164182 + .4byte NULL + .2byte BGM_FRLG_TANOBY_RUINS + .2byte 309 + .byte 0xb4, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 SixIsland_DottedHole_B1F:: @ 834FEC4 - .incbin "baserom.gba", 0x34FEC4, 0x1C + .4byte gMapData_SixIsland_DottedHole_B1F @ 0x8343808 + .4byte gMapEvents_SixIsland_DottedHole_B1F @ 0x83B3898 + .4byte gMapScripts_SixIsland_DottedHole_B1F @ 0x81641B0 + .4byte NULL + .2byte BGM_FRLG_TANOBY_RUINS + .2byte 310 + .byte 0xb4, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 SixIsland_DottedHole_B2F:: @ 834FEE0 - .incbin "baserom.gba", 0x34FEE0, 0x1C + .4byte gMapData_SixIsland_DottedHole_B2F @ 0x834394C + .4byte gMapEvents_SixIsland_DottedHole_B2F @ 0x83B38E0 + .4byte gMapScripts_SixIsland_DottedHole_B2F @ 0x81641B1 + .4byte NULL + .2byte BGM_FRLG_TANOBY_RUINS + .2byte 311 + .byte 0xb4, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 SixIsland_DottedHole_B3F:: @ 834FEFC - .incbin "baserom.gba", 0x34FEFC, 0x1C + .4byte gMapData_SixIsland_DottedHole_B3F @ 0x8343A90 + .4byte gMapEvents_SixIsland_DottedHole_B3F @ 0x83B3928 + .4byte gMapScripts_SixIsland_DottedHole_B3F @ 0x81641B2 + .4byte NULL + .2byte BGM_FRLG_TANOBY_RUINS + .2byte 312 + .byte 0xb4, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 SSAnne_CaptainsOffice9:: @ 834FF18 - .incbin "baserom.gba", 0x34FF18, 0x1C + .4byte gMapData_SSAnne_CaptainsOffice9 @ 0x8343BD4 + .4byte gMapEvents_SSAnne_CaptainsOffice9 @ 0x83B3970 + .4byte gMapScripts_SSAnne_CaptainsOffice9 @ 0x81641B3 + .4byte NULL + .2byte BGM_FRLG_TANOBY_RUINS + .2byte 313 + .byte 0xb4, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 SixIsland_DottedHole_SapphireRoom:: @ 834FF34 - .incbin "baserom.gba", 0x34FF34, 0x1C + .4byte gMapData_SixIsland_DottedHole_SapphireRoom @ 0x8343DD8 + .4byte gMapEvents_SixIsland_DottedHole_SapphireRoom @ 0x83B39D0 + .4byte gMapScripts_SixIsland_DottedHole_SapphireRoom @ 0x81641B4 + .4byte NULL + .2byte BGM_FRLG_TANOBY_RUINS + .2byte 314 + .byte 0xb4, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 SSAnne_1F_Room11:: @ 834FF50 - .incbin "baserom.gba", 0x34FF50, 0x1C + .4byte gMapData_SSAnne_1F_Room11 @ 0x8345030 + .4byte gMapEvents_SSAnne_1F_Room11 @ 0x83B3B34 + .4byte gMapScripts_SSAnne_1F_Room11 @ 0x8164559 + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_FOREST + .2byte 317 + .byte 0xb6, 0x00, 0x00, 0x03, 0x01, 0x07, 0x00, 0x00 SSAnne_1F_Room12:: @ 834FF6C - .incbin "baserom.gba", 0x34FF6C, 0x1C + .4byte gMapData_SSAnne_1F_Room12 @ 0x8347A50 + .4byte gMapEvents_SSAnne_1F_Room12 @ 0x83B3B50 + .4byte gMapScripts_SSAnne_1F_Room12 @ 0x81646A4 + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 340 + .byte 0xb7, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 NavelRock_Exterior:: @ 834FF88 - .incbin "baserom.gba", 0x34FF88, 0x1C + .4byte gMapData_NavelRock_Exterior @ 0x834873C + .4byte gMapEvents_NavelRock_Exterior @ 0x83B3B74 + .4byte gMapScripts_NavelRock_Exterior @ 0x81646AE + .4byte NULL + .2byte BGM_FRLG_SEVII_ISLANDS + .2byte 343 + .byte 0xae, 0x00, 0x00, 0x03, 0x01, 0x06, 0x00, 0x00 SevenIsland_TrainerTower_1F:: @ 834FFA4 - .incbin "baserom.gba", 0x34FFA4, 0x1C + .4byte gMapData_SevenIsland_TrainerTower_1F @ 0x8341FCC + .4byte gMapEvents_SevenIsland_TrainerTower_1F @ 0x83B3C40 + .4byte gMapScripts_SevenIsland_TrainerTower_1F @ 0x81646B8 + .4byte NULL + .2byte BGM_FRLG_TRAINER_TOWER + .2byte 298 + .byte 0xb3, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00 SevenIsland_TrainerTower_2F:: @ 834FFC0 - .incbin "baserom.gba", 0x34FFC0, 0x1C + .4byte gMapData_SevenIsland_TrainerTower_2F @ 0x8342254 + .4byte gMapEvents_SevenIsland_TrainerTower_2F @ 0x83B3D14 + .4byte gMapScripts_SevenIsland_TrainerTower_2F @ 0x81646E6 + .4byte NULL + .2byte BGM_FRLG_TRAINER_TOWER + .2byte 299 + .byte 0xb3, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00 SevenIsland_TrainerTower_3F:: @ 834FFDC - .incbin "baserom.gba", 0x34FFDC, 0x1C + .4byte gMapData_SevenIsland_TrainerTower_3F @ 0x83424DC + .4byte gMapEvents_SevenIsland_TrainerTower_3F @ 0x83B3DE8 + .4byte gMapScripts_SevenIsland_TrainerTower_3F @ 0x8164714 + .4byte NULL + .2byte BGM_FRLG_TRAINER_TOWER + .2byte 300 + .byte 0xb3, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00 SevenIsland_TrainerTower_4F:: @ 834FFF8 - .incbin "baserom.gba", 0x34FFF8, 0x1C + .4byte gMapData_SevenIsland_TrainerTower_4F @ 0x8342764 + .4byte gMapEvents_SevenIsland_TrainerTower_4F @ 0x83B3EBC + .4byte gMapScripts_SevenIsland_TrainerTower_4F @ 0x8164742 + .4byte NULL + .2byte BGM_FRLG_TRAINER_TOWER + .2byte 301 + .byte 0xb3, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00 SevenIsland_TrainerTower_5F:: @ 8350014 - .incbin "baserom.gba", 0x350014, 0x1C + .4byte gMapData_SevenIsland_TrainerTower_5F @ 0x83429EC + .4byte gMapEvents_SevenIsland_TrainerTower_5F @ 0x83B3F90 + .4byte gMapScripts_SevenIsland_TrainerTower_5F @ 0x8164770 + .4byte NULL + .2byte BGM_FRLG_TRAINER_TOWER + .2byte 302 + .byte 0xb3, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00 SevenIsland_TrainerTower_6F:: @ 8350030 - .incbin "baserom.gba", 0x350030, 0x1C + .4byte gMapData_SevenIsland_TrainerTower_6F @ 0x8342C74 + .4byte gMapEvents_SevenIsland_TrainerTower_6F @ 0x83B4064 + .4byte gMapScripts_SevenIsland_TrainerTower_6F @ 0x816479E + .4byte NULL + .2byte BGM_FRLG_TRAINER_TOWER + .2byte 303 + .byte 0xb3, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00 SevenIsland_TrainerTower_7F:: @ 835004C - .incbin "baserom.gba", 0x35004C, 0x1C + .4byte gMapData_SevenIsland_TrainerTower_7F @ 0x8342EFC + .4byte gMapEvents_SevenIsland_TrainerTower_7F @ 0x83B4138 + .4byte gMapScripts_SevenIsland_TrainerTower_7F @ 0x81647CC + .4byte NULL + .2byte BGM_FRLG_TRAINER_TOWER + .2byte 304 + .byte 0xb3, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00 SevenIsland_TrainerTower_8F:: @ 8350068 - .incbin "baserom.gba", 0x350068, 0x1C + .4byte gMapData_SevenIsland_TrainerTower_8F @ 0x8343184 + .4byte gMapEvents_SevenIsland_TrainerTower_8F @ 0x83B420C + .4byte gMapScripts_SevenIsland_TrainerTower_8F @ 0x81647FA + .4byte NULL + .2byte BGM_FRLG_TRAINER_TOWER + .2byte 305 + .byte 0xb3, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00 SevenIsland_TrainerTower_Roof:: @ 8350084 - .incbin "baserom.gba", 0x350084, 0x1C + .4byte gMapData_SevenIsland_TrainerTower_Roof @ 0x83433E8 + .4byte gMapEvents_SevenIsland_TrainerTower_Roof @ 0x83B4248 + .4byte gMapScripts_SevenIsland_TrainerTower_Roof @ 0x8164828 + .4byte NULL + .2byte BGM_FRLG_TRAINER_TOWER + .2byte 306 + .byte 0xb3, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00 SevenIsland_TrainerTower_Lobby:: @ 83500A0 - .incbin "baserom.gba", 0x3500A0, 0x1C + .4byte gMapData_SevenIsland_TrainerTower_Lobby @ 0x8341D44 + .4byte gMapEvents_SevenIsland_TrainerTower_Lobby @ 0x83B4308 + .4byte gMapScripts_SevenIsland_TrainerTower_Lobby @ 0x8164839 + .4byte NULL + .2byte BGM_FRLG_TRAINER_TOWER + .2byte 297 + .byte 0xb3, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00 SevenIsland_TrainerTower_Elevator:: @ 83500BC - .incbin "baserom.gba", 0x3500BC, 0x1C + .4byte gMapData_SevenIsland_TrainerTower_Elevator @ 0x8343454 + .4byte gMapEvents_SevenIsland_TrainerTower_Elevator @ 0x83B4330 + .4byte gMapScripts_SevenIsland_TrainerTower_Elevator @ 0x8164AF8 + .4byte NULL + .2byte BGM_FRLG_TRAINER_TOWER + .2byte 307 + .byte 0xb3, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00 FiveIsland_LostCave_Entrance:: @ 83500D8 - .incbin "baserom.gba", 0x3500D8, 0x1C + .4byte gMapData_FiveIsland_LostCave_Entrance @ 0x83454D8 + .4byte gMapEvents_FiveIsland_LostCave_Entrance @ 0x83B4354 + .4byte gMapScripts_FiveIsland_LostCave_Entrance @ 0x8164BEC + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 320 + .byte 0xb5, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 FiveIsland_LostCave_Room1:: @ 83500F4 - .incbin "baserom.gba", 0x3500F4, 0x1C + .4byte gMapData_FiveIsland_LostCave_Room1 @ 0x83455F0 + .4byte gMapEvents_FiveIsland_LostCave_Room1 @ 0x83B43A8 + .4byte gMapScripts_FiveIsland_LostCave_Room1 @ 0x8164BF6 + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 321 + .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 FiveIsland_LostCave_Room2:: @ 8350110 - .incbin "baserom.gba", 0x350110, 0x1C + .4byte gMapData_FiveIsland_LostCave_Room2 @ 0x8345708 + .4byte gMapEvents_FiveIsland_LostCave_Room2 @ 0x83B43DC + .4byte gMapScripts_FiveIsland_LostCave_Room2 @ 0x8164C0E + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 322 + .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 FiveIsland_LostCave_Room3:: @ 835012C - .incbin "baserom.gba", 0x35012C, 0x1C + .4byte gMapData_FiveIsland_LostCave_Room3 @ 0x8345820 + .4byte gMapEvents_FiveIsland_LostCave_Room3 @ 0x83B4410 + .4byte gMapScripts_FiveIsland_LostCave_Room3 @ 0x8164C0F + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 323 + .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 FiveIsland_LostCave_Room4:: @ 8350148 - .incbin "baserom.gba", 0x350148, 0x1C + .4byte gMapData_FiveIsland_LostCave_Room4 @ 0x8345938 + .4byte gMapEvents_FiveIsland_LostCave_Room4 @ 0x83B445C + .4byte gMapScripts_FiveIsland_LostCave_Room4 @ 0x8164C10 + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 324 + .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 FiveIsland_LostCave_Room5:: @ 8350164 - .incbin "baserom.gba", 0x350164, 0x1C + .4byte gMapData_FiveIsland_LostCave_Room5 @ 0x8345A50 + .4byte gMapEvents_FiveIsland_LostCave_Room5 @ 0x83B4490 + .4byte gMapScripts_FiveIsland_LostCave_Room5 @ 0x8164C28 + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 325 + .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 FiveIsland_LostCave_Room6:: @ 8350180 - .incbin "baserom.gba", 0x350180, 0x1C + .4byte gMapData_FiveIsland_LostCave_Room6 @ 0x8345B68 + .4byte gMapEvents_FiveIsland_LostCave_Room6 @ 0x83B44C4 + .4byte gMapScripts_FiveIsland_LostCave_Room6 @ 0x8164C29 + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 326 + .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 FiveIsland_LostCave_Room7:: @ 835019C - .incbin "baserom.gba", 0x35019C, 0x1C + .4byte gMapData_FiveIsland_LostCave_Room7 @ 0x8345C80 + .4byte gMapEvents_FiveIsland_LostCave_Room7 @ 0x83B44F8 + .4byte gMapScripts_FiveIsland_LostCave_Room7 @ 0x8164C2A + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 327 + .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 FiveIsland_LostCave_Room8:: @ 83501B8 - .incbin "baserom.gba", 0x3501B8, 0x1C + .4byte gMapData_FiveIsland_LostCave_Room8 @ 0x8345D98 + .4byte gMapEvents_FiveIsland_LostCave_Room8 @ 0x83B452C + .4byte gMapScripts_FiveIsland_LostCave_Room8 @ 0x8164C2B + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 328 + .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 FiveIsland_LostCave_Room9:: @ 83501D4 - .incbin "baserom.gba", 0x3501D4, 0x1C + .4byte gMapData_FiveIsland_LostCave_Room9 @ 0x8345EB0 + .4byte gMapEvents_FiveIsland_LostCave_Room9 @ 0x83B4560 + .4byte gMapScripts_FiveIsland_LostCave_Room9 @ 0x8164C2C + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 329 + .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 FiveIsland_LostCave_Room10:: @ 83501F0 - .incbin "baserom.gba", 0x3501F0, 0x1C + .4byte gMapData_FiveIsland_LostCave_Room10 @ 0x8345FC8 + .4byte gMapEvents_FiveIsland_LostCave_Room10 @ 0x83B45AC + .4byte gMapScripts_FiveIsland_LostCave_Room10 @ 0x8164C2D + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 330 + .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 FiveIsland_LostCave_Room11:: @ 835020C - .incbin "baserom.gba", 0x35020C, 0x1C + .4byte gMapData_FiveIsland_LostCave_Room11 @ 0x83460E0 + .4byte gMapEvents_FiveIsland_LostCave_Room11 @ 0x83B45E0 + .4byte gMapScripts_FiveIsland_LostCave_Room11 @ 0x8164CCB + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 331 + .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 FiveIsland_LostCave_Room12:: @ 8350228 - .incbin "baserom.gba", 0x350228, 0x1C + .4byte gMapData_FiveIsland_LostCave_Room12 @ 0x83461F8 + .4byte gMapEvents_FiveIsland_LostCave_Room12 @ 0x83B4614 + .4byte gMapScripts_FiveIsland_LostCave_Room12 @ 0x8164CCC + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 332 + .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 FiveIsland_LostCave_Room13:: @ 8350244 - .incbin "baserom.gba", 0x350244, 0x1C + .4byte gMapData_FiveIsland_LostCave_Room13 @ 0x8346310 + .4byte gMapEvents_FiveIsland_LostCave_Room13 @ 0x83B4648 + .4byte gMapScripts_FiveIsland_LostCave_Room13 @ 0x8164CCD + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 333 + .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 FiveIsland_LostCave_Room14:: @ 8350260 - .incbin "baserom.gba", 0x350260, 0x1C + .4byte gMapData_FiveIsland_LostCave_Room14 @ 0x8346428 + .4byte gMapEvents_FiveIsland_LostCave_Room14 @ 0x83B467C + .4byte gMapScripts_FiveIsland_LostCave_Room14 @ 0x8164CCE + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 334 + .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 SevenIsland_TanobyRuins_MoneanChamber:: @ 835027C - .incbin "baserom.gba", 0x35027C, 0x1C + .4byte gMapData_SevenIsland_TanobyRuins_MoneanChamber @ 0x834675C + .4byte gMapEvents_SevenIsland_TanobyRuins_MoneanChamber @ 0x83B4698 + .4byte gMapScripts_SevenIsland_TanobyRuins_MoneanChamber @ 0x8164CCF + .4byte NULL + .2byte BGM_FRLG_TANOBY_RUINS + .2byte 335 + .byte 0xbc, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x02 SevenIsland_TanobyRuins_LiptooChamber:: @ 8350298 - .incbin "baserom.gba", 0x350298, 0x1C + .4byte gMapData_SevenIsland_TanobyRuins_LiptooChamber @ 0x8346A90 + .4byte gMapEvents_SevenIsland_TanobyRuins_LiptooChamber @ 0x83B46B4 + .4byte gMapScripts_SevenIsland_TanobyRuins_LiptooChamber @ 0x8164CDE + .4byte NULL + .2byte BGM_FRLG_TANOBY_RUINS + .2byte 336 + .byte 0xbd, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x02 SevenIsland_TanobyRuins_WeepthChamber:: @ 83502B4 - .incbin "baserom.gba", 0x3502B4, 0x1C + .4byte gMapData_SevenIsland_TanobyRuins_WeepthChamber @ 0x8346DC4 + .4byte gMapEvents_SevenIsland_TanobyRuins_WeepthChamber @ 0x83B46D0 + .4byte gMapScripts_SevenIsland_TanobyRuins_WeepthChamber @ 0x8164CEA + .4byte NULL + .2byte BGM_FRLG_TANOBY_RUINS + .2byte 337 + .byte 0xbe, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x02 SevenIsland_TanobyRuins_DilfordChamber:: @ 83502D0 - .incbin "baserom.gba", 0x3502D0, 0x1C + .4byte gMapData_SevenIsland_TanobyRuins_DilfordChamber @ 0x83470F8 + .4byte gMapEvents_SevenIsland_TanobyRuins_DilfordChamber @ 0x83B46EC + .4byte gMapScripts_SevenIsland_TanobyRuins_DilfordChamber @ 0x8164CF6 + .4byte NULL + .2byte BGM_FRLG_TANOBY_RUINS + .2byte 338 + .byte 0xbf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x02 SevenIsland_TanobyRuins_ScufibChamber:: @ 83502EC - .incbin "baserom.gba", 0x3502EC, 0x1C + .4byte gMapData_SevenIsland_TanobyRuins_ScufibChamber @ 0x834742C + .4byte gMapEvents_SevenIsland_TanobyRuins_ScufibChamber @ 0x83B4708 + .4byte gMapScripts_SevenIsland_TanobyRuins_ScufibChamber @ 0x8164D02 + .4byte NULL + .2byte BGM_FRLG_TANOBY_RUINS + .2byte 339 + .byte 0xc0, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x02 SevenIsland_TanobyRuins_RixyChamber:: @ 8350308 - .incbin "baserom.gba", 0x350308, 0x1C + .4byte gMapData_SevenIsland_TanobyRuins_RixyChamber @ 0x8349DC8 + .4byte gMapEvents_SevenIsland_TanobyRuins_RixyChamber @ 0x83B4724 + .4byte gMapScripts_SevenIsland_TanobyRuins_RixyChamber @ 0x8164D0E + .4byte NULL + .2byte BGM_FRLG_TANOBY_RUINS + .2byte 362 + .byte 0xc1, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x02 SevenIsland_TanobyRuins_ViapoisChamber:: @ 8350324 - .incbin "baserom.gba", 0x350324, 0x1C + .4byte gMapData_SevenIsland_TanobyRuins_ViapoisChamber @ 0x834A0FC + .4byte gMapEvents_SevenIsland_TanobyRuins_ViapoisChamber @ 0x83B4740 + .4byte gMapScripts_SevenIsland_TanobyRuins_ViapoisChamber @ 0x8164D1A + .4byte NULL + .2byte BGM_FRLG_TANOBY_RUINS + .2byte 363 + .byte 0xc2, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x02 ThreeIsland_DunsparceTunnel:: @ 8350340 - .incbin "baserom.gba", 0x350340, 0x1C + .4byte gMapData_ThreeIsland_DunsparceTunnel @ 0x83451F8 + .4byte gMapEvents_ThreeIsland_DunsparceTunnel @ 0x83B4788 + .4byte gMapScripts_ThreeIsland_DunsparceTunnel @ 0x8164D26 + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_FOREST + .2byte 318 + .byte 0xb9, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 SevenIsland_SeavaultCanyon_TanobyKey:: @ 835035C - .incbin "baserom.gba", 0x35035C, 0x1C + .4byte gMapData_SevenIsland_SeavaultCanyon_TanobyKey @ 0x8347C54 + .4byte gMapEvents_SevenIsland_SeavaultCanyon_TanobyKey @ 0x83B48BC + .4byte gMapScripts_SevenIsland_SeavaultCanyon_TanobyKey @ 0x8164DCC + .4byte NULL + .2byte BGM_FRLG_TANOBY_RUINS + .2byte 341 + .byte 0xba, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x02 NavelRock_1F:: @ 8350378 - .incbin "baserom.gba", 0x350378, 0x1C + .4byte gMapData_NavelRock_1F @ 0x8348AD4 + .4byte gMapEvents_NavelRock_1F @ 0x83B48E0 + .4byte gMapScripts_NavelRock_1F @ 0x8164F9E + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 344 + .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 NavelRock_Summit:: @ 8350394 - .incbin "baserom.gba", 0x350394, 0x1C + .4byte gMapData_NavelRock_Summit @ 0x8348EB0 + .4byte gMapEvents_NavelRock_Summit @ 0x83B4930 + .4byte gMapScripts_NavelRock_Summit @ 0x8164F9F + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 345 + .byte 0xae, 0x00, 0x0b, 0x04, 0x00, 0x06, 0x00, 0x00 NavelRock_Base:: @ 83503B0 - .incbin "baserom.gba", 0x3503B0, 0x1C + .4byte gMapData_NavelRock_Base @ 0x834929C + .4byte gMapEvents_NavelRock_Base @ 0x83B4964 + .4byte gMapScripts_NavelRock_Base @ 0x81650E7 + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 346 + .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 NavelRock_SummitPath_2F:: @ 83503CC - .incbin "baserom.gba", 0x3503CC, 0x1C + .4byte gMapData_NavelRock_SummitPath_2F @ 0x8349324 + .4byte gMapEvents_NavelRock_SummitPath_2F @ 0x83B4988 + .4byte gMapScripts_NavelRock_SummitPath_2F @ 0x81651F2 + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 347 + .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 NavelRock_SummitPath_3F:: @ 83503E8 - .incbin "baserom.gba", 0x3503E8, 0x1C + .4byte gMapData_NavelRock_SummitPath_3F @ 0x83493AC + .4byte gMapEvents_NavelRock_SummitPath_3F @ 0x83B49AC + .4byte gMapScripts_NavelRock_SummitPath_3F @ 0x81651F3 + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 348 + .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 NavelRock_SummitPath_4F:: @ 8350404 - .incbin "baserom.gba", 0x350404, 0x1C + .4byte gMapData_NavelRock_SummitPath_4F @ 0x8349434 + .4byte gMapEvents_NavelRock_SummitPath_4F @ 0x83B49D0 + .4byte gMapScripts_NavelRock_SummitPath_4F @ 0x81651F4 + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 349 + .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 NavelRock_SummitPath_5F:: @ 8350420 - .incbin "baserom.gba", 0x350420, 0x1C + .4byte gMapData_NavelRock_SummitPath_5F @ 0x83494BC + .4byte gMapEvents_NavelRock_SummitPath_5F @ 0x83B49F4 + .4byte gMapScripts_NavelRock_SummitPath_5F @ 0x81651F5 + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 350 + .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 NavelRock_BasePath_B1F:: @ 835043C - .incbin "baserom.gba", 0x35043C, 0x1C + .4byte gMapData_NavelRock_BasePath_B1F @ 0x8349544 + .4byte gMapEvents_NavelRock_BasePath_B1F @ 0x83B4A18 + .4byte gMapScripts_NavelRock_BasePath_B1F @ 0x81651F6 + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 351 + .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 NavelRock_BasePath_B2F:: @ 8350458 - .incbin "baserom.gba", 0x350458, 0x1C + .4byte gMapData_NavelRock_BasePath_B2F @ 0x83495CC + .4byte gMapEvents_NavelRock_BasePath_B2F @ 0x83B4A3C + .4byte gMapScripts_NavelRock_BasePath_B2F @ 0x81651F7 + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 352 + .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 NavelRock_BasePath_B3F:: @ 8350474 - .incbin "baserom.gba", 0x350474, 0x1C + .4byte gMapData_NavelRock_BasePath_B3F @ 0x8349654 + .4byte gMapEvents_NavelRock_BasePath_B3F @ 0x83B4A60 + .4byte gMapScripts_NavelRock_BasePath_B3F @ 0x81651F8 + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 353 + .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 NavelRock_BasePath_B4F:: @ 8350490 - .incbin "baserom.gba", 0x350490, 0x1C + .4byte gMapData_NavelRock_BasePath_B4F @ 0x83496DC + .4byte gMapEvents_NavelRock_BasePath_B4F @ 0x83B4A84 + .4byte gMapScripts_NavelRock_BasePath_B4F @ 0x81651F9 + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 354 + .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 NavelRock_BasePath_B5F:: @ 83504AC - .incbin "baserom.gba", 0x3504AC, 0x1C + .4byte gMapData_NavelRock_BasePath_B5F @ 0x8349764 + .4byte gMapEvents_NavelRock_BasePath_B5F @ 0x83B4AA8 + .4byte gMapScripts_NavelRock_BasePath_B5F @ 0x81651FA + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 355 + .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 NavelRock_BasePath_B6F:: @ 83504C8 - .incbin "baserom.gba", 0x3504C8, 0x1C + .4byte gMapData_NavelRock_BasePath_B6F @ 0x83497EC + .4byte gMapEvents_NavelRock_BasePath_B6F @ 0x83B4ACC + .4byte gMapScripts_NavelRock_BasePath_B6F @ 0x81651FB + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 356 + .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 NavelRock_BasePath_B7F:: @ 83504E4 - .incbin "baserom.gba", 0x3504E4, 0x1C + .4byte gMapData_NavelRock_BasePath_B7F @ 0x8349874 + .4byte gMapEvents_NavelRock_BasePath_B7F @ 0x83B4AF0 + .4byte gMapScripts_NavelRock_BasePath_B7F @ 0x81651FC + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 357 + .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 NavelRock_BasePath_B8F:: @ 8350500 - .incbin "baserom.gba", 0x350500, 0x1C + .4byte gMapData_NavelRock_BasePath_B8F @ 0x83498FC + .4byte gMapEvents_NavelRock_BasePath_B8F @ 0x83B4B14 + .4byte gMapScripts_NavelRock_BasePath_B8F @ 0x81651FD + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 358 + .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 NavelRock_BasePath_B9F:: @ 835051C - .incbin "baserom.gba", 0x35051C, 0x1C + .4byte gMapData_NavelRock_BasePath_B9F @ 0x8349984 + .4byte gMapEvents_NavelRock_BasePath_B9F @ 0x83B4B38 + .4byte gMapScripts_NavelRock_BasePath_B9F @ 0x81651FE + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 359 + .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 NavelRock_BasePath_B10F:: @ 8350538 - .incbin "baserom.gba", 0x350538, 0x1C + .4byte gMapData_NavelRock_BasePath_B10F @ 0x8349A0C + .4byte gMapEvents_NavelRock_BasePath_B10F @ 0x83B4B5C + .4byte gMapScripts_NavelRock_BasePath_B10F @ 0x81651FF + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 360 + .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 NavelRock_BasePath_B11F:: @ 8350554 - .incbin "baserom.gba", 0x350554, 0x1C + .4byte gMapData_NavelRock_BasePath_B11F @ 0x8349A94 + .4byte gMapEvents_NavelRock_BasePath_B11F @ 0x83B4B80 + .4byte gMapScripts_NavelRock_BasePath_B11F @ 0x8165200 + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 361 + .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 NavelRock_B1F:: @ 8350570 - .incbin "baserom.gba", 0x350570, 0x1C + .4byte gMapData_NavelRock_B1F @ 0x834A210 + .4byte gMapEvents_NavelRock_B1F @ 0x83B4BA4 + .4byte gMapScripts_NavelRock_B1F @ 0x8165201 + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 364 + .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 NavelRock_Fork:: @ 835058C - .incbin "baserom.gba", 0x35058C, 0x1C + .4byte gMapData_NavelRock_Fork @ 0x834B9A4 + .4byte gMapEvents_NavelRock_Fork @ 0x83B4BD0 + .4byte gMapScripts_NavelRock_Fork @ 0x8165202 + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 365 + .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 BirthIsland_Exterior:: @ 83505A8 - .incbin "baserom.gba", 0x3505A8, 0x1C + .4byte gMapData_BirthIsland_Exterior @ 0x8348380 + .4byte gMapEvents_BirthIsland_Exterior @ 0x83B4C1C + .4byte gMapScripts_BirthIsland_Exterior @ 0x8165203 + .4byte NULL + .2byte 0xFFFF + .2byte 342 + .byte 0xbb, 0x00, 0x00, 0x03, 0x00, 0x06, 0x00, 0x00 OneIsland_KindleRoad_EmberSpa:: @ 83505C4 - .incbin "baserom.gba", 0x3505C4, 0x1C + .4byte gMapData_OneIsland_KindleRoad_EmberSpa @ 0x834EB70 + .4byte gMapEvents_OneIsland_KindleRoad_EmberSpa @ 0x83B4CD8 + .4byte gMapScripts_OneIsland_KindleRoad_EmberSpa @ 0x816535B + .4byte NULL + .2byte BGM_FRLG_CERULEAN_CITY + .2byte 383 + .byte 0xc3, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 BirthIsland_Harbor:: @ 83505E0 - .incbin "baserom.gba", 0x3505E0, 0x1C + .4byte gMapData_BirthIsland_Harbor @ 0x8343FB8 + .4byte gMapEvents_BirthIsland_Harbor @ 0x83B4D24 + .4byte gMapScripts_BirthIsland_Harbor @ 0x81653E6 + .4byte NULL + .2byte 0xFFFF + .2byte 315 + .byte 0xbb, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 NavelRock_Harbor:: @ 83505FC - .incbin "baserom.gba", 0x3505FC, 0x1C + .4byte gMapData_NavelRock_Harbor @ 0x8343FB8 + .4byte gMapEvents_NavelRock_Harbor @ 0x83B4D70 + .4byte gMapScripts_NavelRock_Harbor @ 0x8165420 + .4byte NULL + .2byte BGM_FRLG_SEVII_ISLANDS + .2byte 315 + .byte 0xae, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 PalletTown:: @ 8350618 - .incbin "baserom.gba", 0x350618, 0x1C + .4byte gMapData_PalletTown @ 0x82DD4C0 + .4byte gMapEvents_PalletTown @ 0x83B4E50 + .4byte gMapScripts_PalletTown @ 0x816545A + .4byte gMapConnections_PalletTown @ 0x835276C + .2byte BGM_FRLG_PALLET_TOWN + .2byte 78 + .byte 0x58, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 ViridianCity:: @ 8350634 - .incbin "baserom.gba", 0x350634, 0x1C + .4byte gMapData_ViridianCity @ 0x82DE3E4 + .4byte gMapEvents_ViridianCity @ 0x83B4FE0 + .4byte gMapScripts_ViridianCity @ 0x81658D3 + .4byte gMapConnections_ViridianCity @ 0x8352798 + .2byte BGM_FRLG_VIRIDIAN_CITY + .2byte 79 + .byte 0x59, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 PewterCity:: @ 8350650 - .incbin "baserom.gba", 0x350650, 0x1C + .4byte gMapData_PewterCity @ 0x82DF308 + .4byte gMapEvents_PewterCity @ 0x83B518C + .4byte gMapScripts_PewterCity @ 0x8165B8E + .4byte gMapConnections_PewterCity @ 0x83527B8 + .2byte BGM_FRLG_VIRIDIAN_CITY + .2byte 80 + .byte 0x5a, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 CeruleanCity:: @ 835066C - .incbin "baserom.gba", 0x35066C, 0x1C + .4byte gMapData_CeruleanCity @ 0x82E022C + .4byte gMapEvents_CeruleanCity @ 0x83B53E0 + .4byte gMapScripts_CeruleanCity @ 0x8166471 + .4byte gMapConnections_CeruleanCity @ 0x83527F0 + .2byte BGM_FRLG_CERULEAN_CITY + .2byte 81 + .byte 0x5b, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 LavenderTown:: @ 8350688 - .incbin "baserom.gba", 0x350688, 0x1C + .4byte gMapData_LavenderTown @ 0x82E0610 + .4byte gMapEvents_LavenderTown @ 0x83B549C + .4byte gMapScripts_LavenderTown @ 0x816686B + .4byte gMapConnections_LavenderTown @ 0x835281C + .2byte BGM_FRLG_LAVENDER_TOWN + .2byte 82 + .byte 0x5c, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 VermilionCity:: @ 83506A4 - .incbin "baserom.gba", 0x3506A4, 0x1C + .4byte gMapData_VermilionCity @ 0x82E1534 + .4byte gMapEvents_VermilionCity @ 0x83B5648 + .4byte gMapScripts_VermilionCity @ 0x81668DC + .4byte gMapConnections_VermilionCity @ 0x835283C + .2byte BGM_FRLG_VERMILION_CITY + .2byte 83 + .byte 0x5d, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 CeladonCity:: @ 83506C0 - .incbin "baserom.gba", 0x3506C0, 0x1C + .4byte gMapData_CeladonCity @ 0x82E2818 + .4byte gMapEvents_CeladonCity @ 0x83B5898 + .4byte gMapScripts_CeladonCity @ 0x8166C8F + .4byte gMapConnections_CeladonCity @ 0x835285C + .2byte BGM_FRLG_CELADON_CITY + .2byte 84 + .byte 0x5e, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 FuchsiaCity:: @ 83506DC - .incbin "baserom.gba", 0x3506DC, 0x1C + .4byte gMapData_FuchsiaCity @ 0x82E373C + .4byte gMapEvents_FuchsiaCity @ 0x83B5B14 + .4byte gMapScripts_FuchsiaCity @ 0x8166D75 + .4byte gMapConnections_FuchsiaCity @ 0x8352888 + .2byte BGM_FRLG_CERULEAN_CITY + .2byte 85 + .byte 0x5f, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 CinnabarIsland:: @ 83506F8 - .incbin "baserom.gba", 0x3506F8, 0x1C + .4byte gMapData_CinnabarIsland @ 0x82E3B20 + .4byte gMapEvents_CinnabarIsland @ 0x83B5BF0 + .4byte gMapScripts_CinnabarIsland @ 0x8166ED6 + .4byte gMapConnections_CinnabarIsland @ 0x83528A8 + .2byte BGM_FRLG_CINNABAR_ISLAND + .2byte 86 + .byte 0x60, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 IndigoPlateau_Exterior:: @ 8350714 - .incbin "baserom.gba", 0x350714, 0x1C + .4byte gMapData_IndigoPlateau_Exterior @ 0x82E3F04 + .4byte gMapEvents_IndigoPlateau_Exterior @ 0x83B5C3C + .4byte gMapScripts_IndigoPlateau_Exterior @ 0x816723B + .4byte gMapConnections_IndigoPlateau_Exterior @ 0x83528BC + .2byte BGM_FRLG_INDIGO_PLATEAU + .2byte 87 + .byte 0x61, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 SaffronCity_Duplicate:: @ 8350730 - .incbin "baserom.gba", 0x350730, 0x1C + .4byte gMapData_SaffronCity_Duplicate @ 0x831E8D4 + .4byte gMapEvents_SaffronCity_Duplicate @ 0x83B5E9C + .4byte gMapScripts_SaffronCity_Duplicate @ 0x816735F + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_CITY + .2byte 207 + .byte 0x62, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 SaffronCity:: @ 835074C - .incbin "baserom.gba", 0x35074C, 0x1C + .4byte gMapData_SaffronCity @ 0x82E4E28 + .4byte gMapEvents_SaffronCity @ 0x83B5EB0 + .4byte gMapScripts_SaffronCity @ 0x8167483 + .4byte gMapConnections_SaffronCity @ 0x835292C + .2byte BGM_FRLG_VIRIDIAN_CITY + .2byte 88 + .byte 0x62, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 OneIsland:: @ 8350768 - .incbin "baserom.gba", 0x350768, 0x1C + .4byte gMapData_OneIsland @ 0x8321714 + .4byte gMapEvents_OneIsland @ 0x83B5F44 + .4byte gMapScripts_OneIsland @ 0x8167484 + .4byte gMapConnections_OneIsland @ 0x835294C + .2byte BGM_FRLG_ISLAND_ONE + .2byte 230 + .byte 0x8f, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 TwoIsland:: @ 8350784 - .incbin "baserom.gba", 0x350784, 0x1C + .4byte gMapData_TwoIsland @ 0x8321EB8 + .4byte gMapEvents_TwoIsland @ 0x83B6074 + .4byte gMapScripts_TwoIsland @ 0x8167564 + .4byte gMapConnections_TwoIsland @ 0x8352960 + .2byte BGM_FRLG_ISLAND_ONE + .2byte 231 + .byte 0x90, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 ThreeIsland:: @ 83507A0 - .incbin "baserom.gba", 0x3507A0, 0x1C + .4byte gMapData_ThreeIsland @ 0x832265C + .4byte gMapEvents_ThreeIsland @ 0x83B62C8 + .4byte gMapScripts_ThreeIsland @ 0x81677AD + .4byte gMapConnections_ThreeIsland @ 0x8352980 + .2byte BGM_FRLG_ISLAND_ONE + .2byte 232 + .byte 0x91, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 FourIsland:: @ 83507BC - .incbin "baserom.gba", 0x3507BC, 0x1C + .4byte gMapData_FourIsland @ 0x8323580 + .4byte gMapEvents_FourIsland @ 0x83B646C + .4byte gMapScripts_FourIsland @ 0x8167CAE + .4byte NULL + .2byte BGM_FRLG_ISLAND_FOUR + .2byte 233 + .byte 0x92, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 FiveIsland:: @ 83507D8 - .incbin "baserom.gba", 0x3507D8, 0x1C + .4byte gMapData_FiveIsland @ 0x8323964 + .4byte gMapEvents_FiveIsland @ 0x83B64F4 + .4byte gMapScripts_FiveIsland @ 0x8167E8E + .4byte gMapConnections_FiveIsland @ 0x83529A0 + .2byte BGM_FRLG_ISLAND_FOUR + .2byte 234 + .byte 0x93, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 SevenIsland:: @ 83507F4 - .incbin "baserom.gba", 0x3507F4, 0x1C + .4byte gMapData_SevenIsland @ 0x8323D48 + .4byte gMapEvents_SevenIsland @ 0x83B657C + .4byte gMapScripts_SevenIsland @ 0x8167EB3 + .4byte gMapConnections_SevenIsland @ 0x83529C0 + .2byte BGM_FRLG_ISLAND_SIX + .2byte 235 + .byte 0x94, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 SixIsland:: @ 8350810 - .incbin "baserom.gba", 0x350810, 0x1C + .4byte gMapData_SixIsland @ 0x832430C + .4byte gMapEvents_SixIsland @ 0x83B65F8 + .4byte gMapScripts_SixIsland @ 0x8167ED8 + .4byte gMapConnections_SixIsland @ 0x83529D4 + .2byte BGM_FRLG_ISLAND_SIX + .2byte 236 + .byte 0x95, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 Route1:: @ 835082C - .incbin "baserom.gba", 0x35082C, 0x1C + .4byte gMapData_Route1 @ 0x82E55CC + .4byte gMapEvents_Route1 @ 0x83B6648 + .4byte gMapScripts_Route1 @ 0x8167EFD + .4byte gMapConnections_Route1 @ 0x83529F4 + .2byte BGM_FRLG_ROUTE_1 + .2byte 89 + .byte 0x65, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 Route2:: @ 8350848 - .incbin "baserom.gba", 0x350848, 0x1C + .4byte gMapData_Route2 @ 0x82E64F0 + .4byte gMapEvents_Route2 @ 0x83B676C + .4byte gMapScripts_Route2 @ 0x8167F64 + .4byte gMapConnections_Route2 @ 0x8352A14 + .2byte BGM_FRLG_ROUTE_1 + .2byte 90 + .byte 0x66, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 Route3:: @ 8350864 - .incbin "baserom.gba", 0x350864, 0x1C + .4byte gMapData_Route3 @ 0x82E7234 + .4byte gMapEvents_Route3 @ 0x83B6870 + .4byte gMapScripts_Route3 @ 0x8167F77 + .4byte gMapConnections_Route3 @ 0x8352A34 + .2byte BGM_FRLG_ROUTE_3 + .2byte 91 + .byte 0x67, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 Route4:: @ 8350880 - .incbin "baserom.gba", 0x350880, 0x1C + .4byte gMapData_Route4 @ 0x82E8338 + .4byte gMapEvents_Route4 @ 0x83B6980 + .4byte gMapScripts_Route4 @ 0x8167F8A + .4byte gMapConnections_Route4 @ 0x8352A54 + .2byte BGM_FRLG_ROUTE_3 + .2byte 92 + .byte 0x68, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 Route5:: @ 835089C - .incbin "baserom.gba", 0x35089C, 0x1C + .4byte gMapData_Route5 @ 0x82E925C + .4byte gMapEvents_Route5 @ 0x83B69C0 + .4byte gMapScripts_Route5 @ 0x8167FA7 + .4byte gMapConnections_Route5 @ 0x8352A74 + .2byte BGM_FRLG_ROUTE_3 + .2byte 93 + .byte 0x69, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 Route6:: @ 83508B8 - .incbin "baserom.gba", 0x3508B8, 0x1C + .4byte gMapData_Route6 @ 0x82E9A00 + .4byte gMapEvents_Route6 @ 0x83B6AA0 + .4byte gMapScripts_Route6 @ 0x8167FB1 + .4byte gMapConnections_Route6 @ 0x8352A94 + .2byte BGM_FRLG_ROUTE_3 + .2byte 94 + .byte 0x6a, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 Route7:: @ 83508D4 - .incbin "baserom.gba", 0x3508D4, 0x1C + .4byte gMapData_Route7 @ 0x82E9DE4 + .4byte gMapEvents_Route7 @ 0x83B6AF4 + .4byte gMapScripts_Route7 @ 0x8167FBB + .4byte gMapConnections_Route7 @ 0x8352AB4 + .2byte BGM_FRLG_ROUTE_3 + .2byte 95 + .byte 0x6b, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 Route8:: @ 83508F0 - .incbin "baserom.gba", 0x3508F0, 0x1C + .4byte gMapData_Route8 @ 0x82EA948 + .4byte gMapEvents_Route8 @ 0x83B6CB0 + .4byte gMapScripts_Route8 @ 0x8167FC5 + .4byte gMapConnections_Route8 @ 0x8352AD4 + .2byte BGM_FRLG_ROUTE_3 + .2byte 96 + .byte 0x6c, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 Route9:: @ 835090C - .incbin "baserom.gba", 0x35090C, 0x1C + .4byte gMapData_Route9 @ 0x82EB4AC + .4byte gMapEvents_Route9 @ 0x83B6E14 + .4byte gMapScripts_Route9 @ 0x8167FCF + .4byte gMapConnections_Route9 @ 0x8352AF4 + .2byte BGM_FRLG_ROUTE_3 + .2byte 97 + .byte 0x6d, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 Route10:: @ 8350928 - .incbin "baserom.gba", 0x350928, 0x1C + .4byte gMapData_Route10 @ 0x82EC3D0 + .4byte gMapEvents_Route10 @ 0x83B6FA0 + .4byte gMapScripts_Route10 @ 0x8167FD9 + .4byte gMapConnections_Route10 @ 0x8352B14 + .2byte BGM_FRLG_ROUTE_3 + .2byte 98 + .byte 0x6e, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 Route11:: @ 8350944 - .incbin "baserom.gba", 0x350944, 0x1C + .4byte gMapData_Route11 @ 0x82ECF34 + .4byte gMapEvents_Route11 @ 0x83B711C + .4byte gMapScripts_Route11 @ 0x8167FF6 + .4byte gMapConnections_Route11 @ 0x8352B34 + .2byte BGM_FRLG_ROUTE_11 + .2byte 99 + .byte 0x6f, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 Route12:: @ 8350960 - .incbin "baserom.gba", 0x350960, 0x1C + .4byte gMapData_Route12 @ 0x82EE5D8 + .4byte gMapEvents_Route12 @ 0x83B72DC + .4byte gMapScripts_Route12 @ 0x8168000 + .4byte gMapConnections_Route12 @ 0x8352B60 + .2byte BGM_FRLG_ROUTE_11 + .2byte 100 + .byte 0x70, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 Route13:: @ 835097C - .incbin "baserom.gba", 0x35097C, 0x1C + .4byte gMapData_Route13 @ 0x82EF13C + .4byte gMapEvents_Route13 @ 0x83B7428 + .4byte gMapScripts_Route13 @ 0x81680B5 + .4byte gMapConnections_Route13 @ 0x8352B80 + .2byte BGM_FRLG_ROUTE_11 + .2byte 101 + .byte 0x71, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 Route14:: @ 8350998 - .incbin "baserom.gba", 0x350998, 0x1C + .4byte gMapData_Route14 @ 0x82EFCA0 + .4byte gMapEvents_Route14 @ 0x83B75C8 + .4byte gMapScripts_Route14 @ 0x81680D1 + .4byte gMapConnections_Route14 @ 0x8352BA0 + .2byte BGM_FRLG_ROUTE_11 + .2byte 102 + .byte 0x72, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 Route15:: @ 83509B4 - .incbin "baserom.gba", 0x3509B4, 0x1C + .4byte gMapData_Route15 @ 0x82F0804 + .4byte gMapEvents_Route15 @ 0x83B7748 + .4byte gMapScripts_Route15 @ 0x81680DB + .4byte gMapConnections_Route15 @ 0x8352BC0 + .2byte BGM_FRLG_ROUTE_11 + .2byte 103 + .byte 0x73, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 Route16:: @ 83509D0 - .incbin "baserom.gba", 0x3509D0, 0x1C + .4byte gMapData_Route16 @ 0x82F0FA8 + .4byte gMapEvents_Route16 @ 0x83B7898 + .4byte gMapScripts_Route16 @ 0x81680E5 + .4byte gMapConnections_Route16 @ 0x8352BE0 + .2byte BGM_FRLG_ROUTE_3 + .2byte 104 + .byte 0x74, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 Route17:: @ 83509EC - .incbin "baserom.gba", 0x3509EC, 0x1C + .4byte gMapData_Route17 @ 0x82F2DCC + .4byte gMapEvents_Route17 @ 0x83B7A20 + .4byte gMapScripts_Route17 @ 0x81681BF + .4byte gMapConnections_Route17 @ 0x8352C00 + .2byte BGM_FRLG_ROUTE_3 + .2byte 105 + .byte 0x75, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 Route18:: @ 8350A08 - .incbin "baserom.gba", 0x350A08, 0x1C + .4byte gMapData_Route18 @ 0x82F3750 + .4byte gMapEvents_Route18 @ 0x83B7AA4 + .4byte gMapScripts_Route18 @ 0x81681F6 + .4byte gMapConnections_Route18 @ 0x8352C20 + .2byte BGM_FRLG_ROUTE_3 + .2byte 106 + .byte 0x76, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 Route19:: @ 8350A24 - .incbin "baserom.gba", 0x350A24, 0x1C + .4byte gMapData_Route19 @ 0x82F42B4 + .4byte gMapEvents_Route19 @ 0x83B7BE4 + .4byte gMapScripts_Route19 @ 0x8168231 + .4byte gMapConnections_Route19 @ 0x8352C40 + .2byte BGM_FRLG_ROUTE_3 + .2byte 107 + .byte 0x77, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 Route20:: @ 8350A40 - .incbin "baserom.gba", 0x350A40, 0x1C + .4byte gMapData_Route20 @ 0x82F5598 + .4byte gMapEvents_Route20 @ 0x83B7D34 + .4byte gMapScripts_Route20 @ 0x816823B + .4byte gMapConnections_Route20 @ 0x8352C60 + .2byte BGM_FRLG_ROUTE_3 + .2byte 108 + .byte 0x78, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 Route21_North:: @ 8350A5C - .incbin "baserom.gba", 0x350A5C, 0x1C + .4byte gMapData_Route21_North @ 0x82F5F1C + .4byte gMapEvents_Route21_North @ 0x83B7DE4 + .4byte gMapScripts_Route21_North @ 0x8168289 + .4byte gMapConnections_Route21_North @ 0x8352C80 + .2byte BGM_FRLG_ROUTE_3 + .2byte 109 + .byte 0x79, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 Route21_South:: @ 8350A78 - .incbin "baserom.gba", 0x350A78, 0x1C + .4byte gMapData_Route21_South @ 0x83206C0 + .4byte gMapEvents_Route21_South @ 0x83B7E70 + .4byte gMapScripts_Route21_South @ 0x816828A + .4byte gMapConnections_Route21_South @ 0x8352CA0 + .2byte BGM_FRLG_ROUTE_3 + .2byte 219 + .byte 0x79, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 Route22:: @ 8350A94 - .incbin "baserom.gba", 0x350A94, 0x1C + .4byte gMapData_Route22 @ 0x82F6840 + .4byte gMapEvents_Route22 @ 0x83B7F18 + .4byte gMapScripts_Route22 @ 0x816828B + .4byte gMapConnections_Route22 @ 0x8352CC0 + .2byte BGM_FRLG_ROUTE_3 + .2byte 110 + .byte 0x7a, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 Route23:: @ 8350AB0 - .incbin "baserom.gba", 0x350AB0, 0x1C + .4byte gMapData_Route23 @ 0x82F8664 + .4byte gMapEvents_Route23 @ 0x83B8300 + .4byte gMapScripts_Route23 @ 0x81684EB + .4byte gMapConnections_Route23 @ 0x8352CE0 + .2byte BGM_FRLG_INDIGO_PLATEAU + .2byte 111 + .byte 0x7b, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 Route24:: @ 8350ACC - .incbin "baserom.gba", 0x350ACC, 0x1C + .4byte gMapData_Route24 @ 0x82F8E08 + .4byte gMapEvents_Route24 @ 0x83B8400 + .4byte gMapScripts_Route24 @ 0x816861F + .4byte gMapConnections_Route24 @ 0x8352D00 + .2byte BGM_FRLG_ROUTE_24 + .2byte 112 + .byte 0x7c, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 Route25:: @ 8350AE8 - .incbin "baserom.gba", 0x350AE8, 0x1C + .4byte gMapData_Route25 @ 0x82F996C + .4byte gMapEvents_Route25 @ 0x83B8590 + .4byte gMapScripts_Route25 @ 0x8168745 + .4byte gMapConnections_Route25 @ 0x8352D14 + .2byte BGM_FRLG_ROUTE_24 + .2byte 113 + .byte 0x7d, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 OneIsland_KindleRoad:: @ 8350B04 - .incbin "baserom.gba", 0x350B04, 0x1C + .4byte gMapData_OneIsland_KindleRoad @ 0x8325D70 + .4byte gMapEvents_OneIsland_KindleRoad @ 0x83B888C + .4byte gMapScripts_OneIsland_KindleRoad @ 0x8168758 + .4byte gMapConnections_OneIsland_KindleRoad @ 0x8352D28 + .2byte BGM_FRLG_ROUTE_3 + .2byte 237 + .byte 0x96, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 OneIsland_TreasureBeach:: @ 8350B20 - .incbin "baserom.gba", 0x350B20, 0x1C + .4byte gMapData_OneIsland_TreasureBeach @ 0x8326514 + .4byte gMapEvents_OneIsland_TreasureBeach @ 0x83B8930 + .4byte gMapScripts_OneIsland_TreasureBeach @ 0x816876B + .4byte gMapConnections_OneIsland_TreasureBeach @ 0x8352D3C + .2byte BGM_FRLG_ROUTE_3 + .2byte 238 + .byte 0x97, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 TwoIsland_CapeBrink:: @ 8350B3C - .incbin "baserom.gba", 0x350B3C, 0x1C + .4byte gMapData_TwoIsland_CapeBrink @ 0x8326CB8 + .4byte gMapEvents_TwoIsland_CapeBrink @ 0x83B8964 + .4byte gMapScripts_TwoIsland_CapeBrink @ 0x8168775 + .4byte gMapConnections_TwoIsland_CapeBrink @ 0x8352D50 + .2byte BGM_FRLG_ROUTE_3 + .2byte 239 + .byte 0x98, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 ThreeIsland_BondBridge:: @ 8350B58 - .incbin "baserom.gba", 0x350B58, 0x1C + .4byte gMapData_ThreeIsland_BondBridge @ 0x8327BDC + .4byte gMapEvents_ThreeIsland_BondBridge @ 0x83B8A9C + .4byte gMapScripts_ThreeIsland_BondBridge @ 0x8168776 + .4byte gMapConnections_ThreeIsland_BondBridge @ 0x8352D64 + .2byte BGM_FRLG_ROUTE_3 + .2byte 240 + .byte 0x99, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 ThreeIsland_Port:: @ 8350B74 - .incbin "baserom.gba", 0x350B74, 0x1C + .4byte gMapData_ThreeIsland_Port @ 0x8328380 + .4byte gMapEvents_ThreeIsland_Port @ 0x83B8B10 + .4byte gMapScripts_ThreeIsland_Port @ 0x8168789 + .4byte gMapConnections_ThreeIsland_Port @ 0x8352D78 + .2byte BGM_FRLG_ROUTE_3 + .2byte 241 + .byte 0x9a, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 UnknownMap_03_50:: @ 8350B90 - .incbin "baserom.gba", 0x350B90, 0x1C + .4byte gMapData_UnknownMap_03_50 @ 0x83283A8 + .4byte gMapEvents_UnknownMap_03_50 @ 0x83B8B24 + .4byte gMapScripts_UnknownMap_03_50 @ 0x81687E0 + .4byte gMapConnections_UnknownMap_03_50 @ 0x8352D8C + .2byte BGM_FRLG_SEVII_ISLANDS + .2byte 242 + .byte 0x9b, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 UnknownMap_03_51:: @ 8350BAC - .incbin "baserom.gba", 0x350BAC, 0x1C + .4byte gMapData_UnknownMap_03_51 @ 0x83283D0 + .4byte gMapEvents_UnknownMap_03_51 @ 0x83B8B38 + .4byte gMapScripts_UnknownMap_03_51 @ 0x81687E1 + .4byte gMapConnections_UnknownMap_03_51 @ 0x8352DA0 + .2byte BGM_FRLG_SEVII_ISLANDS + .2byte 243 + .byte 0x9c, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 UnknownMap_03_52:: @ 8350BC8 - .incbin "baserom.gba", 0x350BC8, 0x1C + .4byte gMapData_UnknownMap_03_52 @ 0x8329114 + .4byte gMapEvents_UnknownMap_03_52 @ 0x83B8B4C + .4byte gMapScripts_UnknownMap_03_52 @ 0x81687E2 + .4byte NULL + .2byte BGM_FRLG_SEVII_ISLANDS + .2byte 244 + .byte 0x9d, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 UnknownMap_03_53:: @ 8350BE4 - .incbin "baserom.gba", 0x350BE4, 0x1C + .4byte gMapData_UnknownMap_03_53 @ 0x8329C78 + .4byte gMapEvents_UnknownMap_03_53 @ 0x83B8B60 + .4byte gMapScripts_UnknownMap_03_53 @ 0x81687E3 + .4byte NULL + .2byte BGM_FRLG_SEVII_ISLANDS + .2byte 245 + .byte 0x9e, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 FiveIsland_ResortGorgeous:: @ 8350C00 - .incbin "baserom.gba", 0x350C00, 0x1C + .4byte gMapData_FiveIsland_ResortGorgeous @ 0x832A7DC + .4byte gMapEvents_FiveIsland_ResortGorgeous @ 0x83B8C80 + .4byte gMapScripts_FiveIsland_ResortGorgeous @ 0x81687E4 + .4byte gMapConnections_FiveIsland_ResortGorgeous @ 0x8352DB4 + .2byte BGM_FRLG_SEVII_ISLANDS + .2byte 246 + .byte 0x9f, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 FiveIsland_WaterLabyrinth:: @ 8350C1C - .incbin "baserom.gba", 0x350C1C, 0x1C + .4byte gMapData_FiveIsland_WaterLabyrinth @ 0x832B340 + .4byte gMapEvents_FiveIsland_WaterLabyrinth @ 0x83B8CC4 + .4byte gMapScripts_FiveIsland_WaterLabyrinth @ 0x816884D + .4byte gMapConnections_FiveIsland_WaterLabyrinth @ 0x8352DD4 + .2byte BGM_FRLG_SEVII_ISLANDS + .2byte 247 + .byte 0xa0, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 FiveIsland_Meadow:: @ 8350C38 - .incbin "baserom.gba", 0x350C38, 0x1C + .4byte gMapData_FiveIsland_Meadow @ 0x832BAE4 + .4byte gMapEvents_FiveIsland_Meadow @ 0x83B8D94 + .4byte gMapScripts_FiveIsland_Meadow @ 0x8168932 + .4byte gMapConnections_FiveIsland_Meadow @ 0x8352DF4 + .2byte BGM_FRLG_SEVII_ISLANDS + .2byte 248 + .byte 0xa1, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 FiveIsland_MemorialPillar:: @ 8350C54 - .incbin "baserom.gba", 0x350C54, 0x1C + .4byte gMapData_FiveIsland_MemorialPillar @ 0x832C648 + .4byte gMapEvents_FiveIsland_MemorialPillar @ 0x83B8E5C + .4byte gMapScripts_FiveIsland_MemorialPillar @ 0x81689D2 + .4byte gMapConnections_FiveIsland_MemorialPillar @ 0x8352E08 + .2byte BGM_FRLG_SEVII_ISLANDS + .2byte 249 + .byte 0xa2, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 SixIsland_OutcastIsland:: @ 8350C70 - .incbin "baserom.gba", 0x350C70, 0x1C + .4byte gMapData_SixIsland_OutcastIsland @ 0x832D56C + .4byte gMapEvents_SixIsland_OutcastIsland @ 0x83B8F38 + .4byte gMapScripts_SixIsland_OutcastIsland @ 0x8168B15 + .4byte gMapConnections_SixIsland_OutcastIsland @ 0x8352E1C + .2byte BGM_FRLG_SEVII_ISLANDS + .2byte 250 + .byte 0xa3, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 SixIsland_GreenPath:: @ 8350C8C - .incbin "baserom.gba", 0x350C8C, 0x1C + .4byte gMapData_SixIsland_GreenPath @ 0x832E0D0 + .4byte gMapEvents_SixIsland_GreenPath @ 0x83B8FA8 + .4byte gMapScripts_SixIsland_GreenPath @ 0x8168B2D + .4byte gMapConnections_SixIsland_GreenPath @ 0x8352E3C + .2byte BGM_FRLG_SEVII_ISLANDS + .2byte 251 + .byte 0xa4, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 SixIsland_WaterPath:: @ 8350CA8 - .incbin "baserom.gba", 0x350CA8, 0x1C + .4byte gMapData_SixIsland_WaterPath @ 0x832F3B4 + .4byte gMapEvents_SixIsland_WaterPath @ 0x83B90E0 + .4byte gMapScripts_SixIsland_WaterPath @ 0x8168B40 + .4byte gMapConnections_SixIsland_WaterPath @ 0x8352E68 + .2byte BGM_FRLG_SEVII_ISLANDS + .2byte 252 + .byte 0xa5, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 SixIsland_RuinValley:: @ 8350CC4 - .incbin "baserom.gba", 0x350CC4, 0x1C + .4byte gMapData_SixIsland_RuinValley @ 0x83302D8 + .4byte gMapEvents_SixIsland_RuinValley @ 0x83B92A0 + .4byte gMapScripts_SixIsland_RuinValley @ 0x8168B53 + .4byte gMapConnections_SixIsland_RuinValley @ 0x8352E7C + .2byte BGM_FRLG_SEVII_ISLANDS + .2byte 253 + .byte 0xa6, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 SevenIsland_TrainerTower:: @ 8350CE0 - .incbin "baserom.gba", 0x350CE0, 0x1C + .4byte gMapData_SevenIsland_TrainerTower @ 0x833287C + .4byte gMapEvents_SevenIsland_TrainerTower @ 0x83B9328 + .4byte gMapScripts_SevenIsland_TrainerTower @ 0x8168BD5 + .4byte gMapConnections_SevenIsland_TrainerTower @ 0x8352E90 + .2byte BGM_FRLG_SEVII_ISLANDS + .2byte 254 + .byte 0xa7, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 SevenIsland_SevaultCanyon_Entrance:: @ 8350CFC - .incbin "baserom.gba", 0x350CFC, 0x1C + .4byte gMapData_SevenIsland_SevaultCanyon_Entrance @ 0x8333020 + .4byte gMapEvents_SevenIsland_SevaultCanyon_Entrance @ 0x83B93FC + .4byte gMapScripts_SevenIsland_SevaultCanyon_Entrance @ 0x8168BF3 + .4byte gMapConnections_SevenIsland_SevaultCanyon_Entrance @ 0x8352EB0 + .2byte BGM_FRLG_SEVII_ISLANDS + .2byte 255 + .byte 0xa8, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 SevenIsland_SevaultCanyon:: @ 8350D18 - .incbin "baserom.gba", 0x350D18, 0x1C + .4byte gMapData_SevenIsland_SevaultCanyon @ 0x8333F44 + .4byte gMapEvents_SevenIsland_SevaultCanyon @ 0x83B9618 + .4byte gMapScripts_SevenIsland_SevaultCanyon @ 0x8168BFD + .4byte gMapConnections_SevenIsland_SevaultCanyon @ 0x8352ED0 + .2byte BGM_FRLG_SEVII_ISLANDS + .2byte 256 + .byte 0xa9, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 SevenIsland_TanobyRuins:: @ 8350D34 - .incbin "baserom.gba", 0x350D34, 0x1C + .4byte gMapData_SevenIsland_TanobyRuins @ 0x83355E8 + .4byte gMapEvents_SevenIsland_TanobyRuins @ 0x83B96F4 + .4byte gMapScripts_SevenIsland_TanobyRuins @ 0x8168C07 + .4byte gMapConnections_SevenIsland_TanobyRuins @ 0x8352EE4 + .2byte BGM_FRLG_SEVII_ISLANDS + .2byte 257 + .byte 0xaa, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 PalletTown_PlayersHouse_1F:: @ 8350D50 - .incbin "baserom.gba", 0x350D50, 0x1C + .4byte gMapData_PalletTown_PlayersHouse_1F @ 0x82D5200 + .4byte gMapEvents_PalletTown_PlayersHouse_1F @ 0x83B974C + .4byte gMapScripts_PalletTown_PlayersHouse_1F @ 0x8168C08 + .4byte NULL + .2byte BGM_FRLG_PALLET_TOWN + .2byte 1 + .byte 0x58, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 PalletTown_PlayersHouse_2F:: @ 8350D6C - .incbin "baserom.gba", 0x350D6C, 0x1C + .4byte gMapData_PalletTown_PlayersHouse_2F @ 0x82D52FC + .4byte gMapEvents_PalletTown_PlayersHouse_2F @ 0x83B978C + .4byte gMapScripts_PalletTown_PlayersHouse_2F @ 0x8168CA3 + .4byte NULL + .2byte BGM_FRLG_PALLET_TOWN + .2byte 2 + .byte 0x58, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 PalletTown_GarysHouse:: @ 8350D88 - .incbin "baserom.gba", 0x350D88, 0x1C + .4byte gMapData_PalletTown_GarysHouse @ 0x82D5424 + .4byte gMapEvents_PalletTown_GarysHouse @ 0x83B980C + .4byte gMapScripts_PalletTown_GarysHouse @ 0x8168D27 + .4byte NULL + .2byte BGM_FRLG_PALLET_TOWN + .2byte 3 + .byte 0x58, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 PalletTown_ProfessorOaksLab:: @ 8350DA4 - .incbin "baserom.gba", 0x350DA4, 0x1C + .4byte gMapData_PalletTown_ProfessorOaksLab @ 0x82D5668 + .4byte gMapEvents_PalletTown_ProfessorOaksLab @ 0x83B99B8 + .4byte gMapScripts_PalletTown_ProfessorOaksLab @ 0x8168F7E + .4byte NULL + .2byte BGM_FRLG_OAK_LAB + .2byte 5 + .byte 0x58, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 ViridianCity_House1:: @ 8350DC0 - .incbin "baserom.gba", 0x350DC0, 0x1C + .4byte gMapData_ViridianCity_House1 @ 0x833AEAC + .4byte gMapEvents_ViridianCity_House1 @ 0x83B9A38 + .4byte gMapScripts_ViridianCity_House1 @ 0x8169E9A + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_CITY + .2byte 276 + .byte 0x59, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 ViridianCity_Gym:: @ 8350DDC - .incbin "baserom.gba", 0x350DDC, 0x1C + .4byte gMapData_ViridianCity_Gym @ 0x82D86AC + .4byte gMapEvents_ViridianCity_Gym @ 0x83B9B78 + .4byte gMapScripts_ViridianCity_Gym @ 0x8169EC9 + .4byte NULL + .2byte BGM_FRLG_GYM + .2byte 37 + .byte 0x59, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01 ViridianCity_House2:: @ 8350DF8 - .incbin "baserom.gba", 0x350DF8, 0x1C + .4byte gMapData_ViridianCity_House2 @ 0x8338D20 + .4byte gMapEvents_ViridianCity_House2 @ 0x83B9C10 + .4byte gMapScripts_ViridianCity_House2 @ 0x816A07C + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_CITY + .2byte 266 + .byte 0x59, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 ViridianCity_Mart:: @ 8350E14 - .incbin "baserom.gba", 0x350E14, 0x1C + .4byte gMapData_ViridianCity_Mart @ 0x82D5BCC + .4byte gMapEvents_ViridianCity_Mart @ 0x83B9C84 + .4byte gMapScripts_ViridianCity_Mart @ 0x816A1D3 + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 10 + .byte 0x59, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 ViridianCity_PokemonCenter_1F:: @ 8350E30 - .incbin "baserom.gba", 0x350E30, 0x1C + .4byte gMapData_ViridianCity_PokemonCenter_1F @ 0x82D5990 + .4byte gMapEvents_ViridianCity_PokemonCenter_1F @ 0x83B9D18 + .4byte gMapScripts_ViridianCity_PokemonCenter_1F @ 0x816A2C0 + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 8 + .byte 0x59, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 ViridianCity_PokemonCenter_2F:: @ 8350E4C - .incbin "baserom.gba", 0x350E4C, 0x1C + .4byte gMapData_ViridianCity_PokemonCenter_2F @ 0x82D5AE0 + .4byte gMapEvents_ViridianCity_PokemonCenter_2F @ 0x83B9DA4 + .4byte gMapScripts_ViridianCity_PokemonCenter_2F @ 0x816A2F3 + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 9 + .byte 0x59, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 PewterCity_Museum_1F:: @ 8350E68 - .incbin "baserom.gba", 0x350E68, 0x1C + .4byte gMapData_PewterCity_Museum_1F @ 0x831A1FC + .4byte gMapEvents_PewterCity_Museum_1F @ 0x83B9ED8 + .4byte gMapScripts_PewterCity_Museum_1F @ 0x816A31A + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_CITY + .2byte 180 + .byte 0x5a, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 PewterCity_Museum_2F:: @ 8350E84 - .incbin "baserom.gba", 0x350E84, 0x1C + .4byte gMapData_PewterCity_Museum_2F @ 0x831A39C + .4byte gMapEvents_PewterCity_Museum_2F @ 0x83B9FCC + .4byte gMapScripts_PewterCity_Museum_2F @ 0x816A552 + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_CITY + .2byte 181 + .byte 0x5a, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 PewterCity_Gym:: @ 8350EA0 - .incbin "baserom.gba", 0x350EA0, 0x1C + .4byte gMapData_PewterCity_Gym @ 0x82D732C + .4byte gMapEvents_PewterCity_Gym @ 0x83BA058 + .4byte gMapScripts_PewterCity_Gym @ 0x816A592 + .4byte NULL + .2byte BGM_FRLG_GYM + .2byte 28 + .byte 0x5a, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01 PewterCity_Mart:: @ 8350EBC - .incbin "baserom.gba", 0x350EBC, 0x1C + .4byte gMapData_PewterCity_Mart @ 0x82D5BCC + .4byte gMapEvents_PewterCity_Mart @ 0x83BA0CC + .4byte gMapScripts_PewterCity_Mart @ 0x816A6CD + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 10 + .byte 0x5a, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 PewterCity_House1:: @ 8350ED8 - .incbin "baserom.gba", 0x350ED8, 0x1C + .4byte gMapData_PewterCity_House1 @ 0x82D5840 + .4byte gMapEvents_PewterCity_House1 @ 0x83BA140 + .4byte gMapScripts_PewterCity_House1 @ 0x816A71C + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_CITY + .2byte 7 + .byte 0x5a, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 PewterCity_PokemonCenter_1F:: @ 8350EF4 - .incbin "baserom.gba", 0x350EF4, 0x1C + .4byte gMapData_PewterCity_PokemonCenter_1F @ 0x82D5990 + .4byte gMapEvents_PewterCity_PokemonCenter_1F @ 0x83BA21C + .4byte gMapScripts_PewterCity_PokemonCenter_1F @ 0x816A760 + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 8 + .byte 0x5a, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 PewterCity_PokemonCenter_2F:: @ 8350F10 - .incbin "baserom.gba", 0x350F10, 0x1C + .4byte gMapData_PewterCity_PokemonCenter_2F @ 0x82D5AE0 + .4byte gMapEvents_PewterCity_PokemonCenter_2F @ 0x83BA2A8 + .4byte gMapScripts_PewterCity_PokemonCenter_2F @ 0x816A7B5 + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 9 + .byte 0x5a, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 PewterCity_House2:: @ 8350F2C - .incbin "baserom.gba", 0x350F2C, 0x1C + .4byte gMapData_PewterCity_House2 @ 0x82D5840 + .4byte gMapEvents_PewterCity_House2 @ 0x83BA304 + .4byte gMapScripts_PewterCity_House2 @ 0x816A7DC + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_CITY + .2byte 7 + .byte 0x5a, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 CeruleanCity_House1:: @ 8350F48 - .incbin "baserom.gba", 0x350F48, 0x1C + .4byte gMapData_CeruleanCity_House1 @ 0x831A560 + .4byte gMapEvents_CeruleanCity_House1 @ 0x83BA350 + .4byte gMapScripts_CeruleanCity_House1 @ 0x816A7EF + .4byte NULL + .2byte BGM_FRLG_CERULEAN_CITY + .2byte 183 + .byte 0x5b, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 CeruleanCity_House2:: @ 8350F64 - .incbin "baserom.gba", 0x350F64, 0x1C + .4byte gMapData_CeruleanCity_House2 @ 0x831A474 + .4byte gMapEvents_CeruleanCity_House2 @ 0x83BA3C0 + .4byte gMapScripts_CeruleanCity_House2 @ 0x816A975 + .4byte NULL + .2byte BGM_FRLG_CERULEAN_CITY + .2byte 182 + .byte 0x5b, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 CeruleanCity_House3:: @ 8350F80 - .incbin "baserom.gba", 0x350F80, 0x1C + .4byte gMapData_CeruleanCity_House3 @ 0x82D5754 + .4byte gMapEvents_CeruleanCity_House3 @ 0x83BA41C + .4byte gMapScripts_CeruleanCity_House3 @ 0x816A9A7 + .4byte NULL + .2byte BGM_FRLG_CERULEAN_CITY + .2byte 6 + .byte 0x5b, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 CeruleanCity_PokemonCenter_1F:: @ 8350F9C - .incbin "baserom.gba", 0x350F9C, 0x1C + .4byte gMapData_CeruleanCity_PokemonCenter_1F @ 0x82D5990 + .4byte gMapEvents_CeruleanCity_PokemonCenter_1F @ 0x83BA4F8 + .4byte gMapScripts_CeruleanCity_PokemonCenter_1F @ 0x816AA2D + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 8 + .byte 0x5b, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 CeruleanCity_PokemonCenter_2F:: @ 8350FB8 - .incbin "baserom.gba", 0x350FB8, 0x1C + .4byte gMapData_CeruleanCity_PokemonCenter_2F @ 0x82D5AE0 + .4byte gMapEvents_CeruleanCity_PokemonCenter_2F @ 0x83BA584 + .4byte gMapScripts_CeruleanCity_PokemonCenter_2F @ 0x816AA79 + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 9 + .byte 0x5b, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 CeruleanCity_Gym:: @ 8350FD4 - .incbin "baserom.gba", 0x350FD4, 0x1C + .4byte gMapData_CeruleanCity_Gym @ 0x82D5F84 + .4byte gMapEvents_CeruleanCity_Gym @ 0x83BA628 + .4byte gMapScripts_CeruleanCity_Gym @ 0x816AAA0 + .4byte NULL + .2byte BGM_FRLG_GYM + .2byte 12 + .byte 0x5b, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01 CeruleanCity_BikeShop:: @ 8350FF0 - .incbin "baserom.gba", 0x350FF0, 0x1C + .4byte gMapData_CeruleanCity_BikeShop @ 0x82D6F28 + .4byte gMapEvents_CeruleanCity_BikeShop @ 0x83BA6FC + .4byte gMapScripts_CeruleanCity_BikeShop @ 0x816ABBC + .4byte NULL + .2byte BGM_FRLG_CERULEAN_CITY + .2byte 26 + .byte 0x5b, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 CeruleanCity_Mart:: @ 835100C - .incbin "baserom.gba", 0x35100C, 0x1C + .4byte gMapData_CeruleanCity_Mart @ 0x82D5BCC + .4byte gMapEvents_CeruleanCity_Mart @ 0x83BA770 + .4byte gMapScripts_CeruleanCity_Mart @ 0x816AC9D + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 10 + .byte 0x5b, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 CeruleanCity_House4:: @ 8351028 - .incbin "baserom.gba", 0x351028, 0x1C + .4byte gMapData_CeruleanCity_House4 @ 0x82D5754 + .4byte gMapEvents_CeruleanCity_House4 @ 0x83BA7A4 + .4byte gMapScripts_CeruleanCity_House4 @ 0x816ACEE + .4byte NULL + .2byte BGM_FRLG_CERULEAN_CITY + .2byte 6 + .byte 0x5b, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 CeruleanCity_House5:: @ 8351044 - .incbin "baserom.gba", 0x351044, 0x1C + .4byte gMapData_CeruleanCity_House5 @ 0x8343540 + .4byte gMapEvents_CeruleanCity_House5 @ 0x83BA7E4 + .4byte gMapScripts_CeruleanCity_House5 @ 0x816AE4F + .4byte NULL + .2byte BGM_FRLG_CERULEAN_CITY + .2byte 308 + .byte 0x5b, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 LavenderTown_PokemonCenter_1F:: @ 8351060 - .incbin "baserom.gba", 0x351060, 0x1C + .4byte gMapData_LavenderTown_PokemonCenter_1F @ 0x82D5990 + .4byte gMapEvents_LavenderTown_PokemonCenter_1F @ 0x83BA890 + .4byte gMapScripts_LavenderTown_PokemonCenter_1F @ 0x816B0EF + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 8 + .byte 0x5c, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 LavenderTown_PokemonCenter_2F:: @ 835107C - .incbin "baserom.gba", 0x35107C, 0x1C + .4byte gMapData_LavenderTown_PokemonCenter_2F @ 0x82D5AE0 + .4byte gMapEvents_LavenderTown_PokemonCenter_2F @ 0x83BA91C + .4byte gMapScripts_LavenderTown_PokemonCenter_2F @ 0x816B122 + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 9 + .byte 0x5c, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 LavenderTown_VolunteerPokemonHouse:: @ 8351098 - .incbin "baserom.gba", 0x351098, 0x1C + .4byte gMapData_LavenderTown_VolunteerPokemonHouse @ 0x833ACC4 + .4byte gMapEvents_LavenderTown_VolunteerPokemonHouse @ 0x83BA9FC + .4byte gMapScripts_LavenderTown_VolunteerPokemonHouse @ 0x816B149 + .4byte NULL + .2byte BGM_FRLG_LAVENDER_TOWN + .2byte 274 + .byte 0x5c, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 LavenderTown_House1:: @ 83510B4 - .incbin "baserom.gba", 0x3510B4, 0x1C + .4byte gMapData_LavenderTown_House1 @ 0x82D6AF0 + .4byte gMapEvents_LavenderTown_House1 @ 0x83BAA58 + .4byte gMapScripts_LavenderTown_House1 @ 0x816B232 + .4byte NULL + .2byte BGM_FRLG_LAVENDER_TOWN + .2byte 21 + .byte 0x5c, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 LavenderTown_House2:: @ 83510D0 - .incbin "baserom.gba", 0x3510D0, 0x1C + .4byte gMapData_LavenderTown_House2 @ 0x82D6AF0 + .4byte gMapEvents_LavenderTown_House2 @ 0x83BAA9C + .4byte gMapScripts_LavenderTown_House2 @ 0x816B265 + .4byte NULL + .2byte BGM_FRLG_CERULEAN_CITY + .2byte 21 + .byte 0x5c, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 LavenderTown_Mart:: @ 83510EC - .incbin "baserom.gba", 0x3510EC, 0x1C + .4byte gMapData_LavenderTown_Mart @ 0x82D5BCC + .4byte gMapEvents_LavenderTown_Mart @ 0x83BAB28 + .4byte gMapScripts_LavenderTown_Mart @ 0x816B34F + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 10 + .byte 0x5c, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 VermilionCity_House1:: @ 8351108 - .incbin "baserom.gba", 0x351108, 0x1C + .4byte gMapData_VermilionCity_House1 @ 0x82D5754 + .4byte gMapEvents_VermilionCity_House1 @ 0x83BAB6C + .4byte gMapScripts_VermilionCity_House1 @ 0x816B3A6 + .4byte NULL + .2byte BGM_FRLG_CERULEAN_CITY + .2byte 6 + .byte 0x5d, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 VermilionCity_PokemonCenter_1F:: @ 8351124 - .incbin "baserom.gba", 0x351124, 0x1C + .4byte gMapData_VermilionCity_PokemonCenter_1F @ 0x82D5990 + .4byte gMapEvents_VermilionCity_PokemonCenter_1F @ 0x83BAC48 + .4byte gMapScripts_VermilionCity_PokemonCenter_1F @ 0x816B424 + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 8 + .byte 0x5d, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 VermilionCity_PokemonCenter_2F:: @ 8351140 - .incbin "baserom.gba", 0x351140, 0x1C + .4byte gMapData_VermilionCity_PokemonCenter_2F @ 0x82D5AE0 + .4byte gMapEvents_VermilionCity_PokemonCenter_2F @ 0x83BACD4 + .4byte gMapScripts_VermilionCity_PokemonCenter_2F @ 0x816B457 + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 9 + .byte 0x5d, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 VermilionCity_PokemonFanClub:: @ 835115C - .incbin "baserom.gba", 0x35115C, 0x1C + .4byte gMapData_VermilionCity_PokemonFanClub @ 0x833ABC8 + .4byte gMapEvents_VermilionCity_PokemonFanClub @ 0x83BADA8 + .4byte gMapScripts_VermilionCity_PokemonFanClub @ 0x816B47E + .4byte NULL + .2byte BGM_FRLG_VERMILION_CITY + .2byte 273 + .byte 0x5d, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 VermilionCity_House2:: @ 8351178 - .incbin "baserom.gba", 0x351178, 0x1C + .4byte gMapData_VermilionCity_House2 @ 0x82D5754 + .4byte gMapEvents_VermilionCity_House2 @ 0x83BADEC + .4byte gMapScripts_VermilionCity_House2 @ 0x816B5D6 + .4byte NULL + .2byte BGM_FRLG_VERMILION_CITY + .2byte 6 + .byte 0x5d, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 VermilionCity_Mart:: @ 8351194 - .incbin "baserom.gba", 0x351194, 0x1C + .4byte gMapData_VermilionCity_Mart @ 0x82D5BCC + .4byte gMapEvents_VermilionCity_Mart @ 0x83BAE60 + .4byte gMapScripts_VermilionCity_Mart @ 0x816B653 + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 10 + .byte 0x5d, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 VermilionCity_Gym:: @ 83511B0 - .incbin "baserom.gba", 0x3511B0, 0x1C + .4byte gMapData_VermilionCity_Gym @ 0x82D6E28 + .4byte gMapEvents_VermilionCity_Gym @ 0x83BAFD0 + .4byte gMapScripts_VermilionCity_Gym @ 0x816B69E + .4byte NULL + .2byte BGM_FRLG_GYM + .2byte 25 + .byte 0x5d, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01 VermilionCity_House3:: @ 83511CC - .incbin "baserom.gba", 0x3511CC, 0x1C + .4byte gMapData_VermilionCity_House3 @ 0x82D5754 + .4byte gMapEvents_VermilionCity_House3 @ 0x83BB068 + .4byte gMapScripts_VermilionCity_House3 @ 0x816BAA9 + .4byte NULL + .2byte BGM_FRLG_VERMILION_CITY + .2byte 6 + .byte 0x5d, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 CeladonCity_DepartmentStore_1F:: @ 83511E8 - .incbin "baserom.gba", 0x3511E8, 0x1C + .4byte gMapData_CeladonCity_DepartmentStore_1F @ 0x831B5FC + .4byte gMapEvents_CeladonCity_DepartmentStore_1F @ 0x83BB0EC + .4byte gMapScripts_CeladonCity_DepartmentStore_1F @ 0x816BAD8 + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 192 + .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x04, 0x01, 0x00 CeladonCity_DepartmentStore_2F:: @ 8351204 - .incbin "baserom.gba", 0x351204, 0x1C + .4byte gMapData_CeladonCity_DepartmentStore_2F @ 0x831B7A8 + .4byte gMapEvents_CeladonCity_DepartmentStore_2F @ 0x83BB184 + .4byte gMapScripts_CeladonCity_DepartmentStore_2F @ 0x816BAF4 + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 193 + .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x04, 0x02, 0x00 CeladonCity_DepartmentStore_3F:: @ 8351220 - .incbin "baserom.gba", 0x351220, 0x1C + .4byte gMapData_CeladonCity_DepartmentStore_3F @ 0x831B954 + .4byte gMapEvents_CeladonCity_DepartmentStore_3F @ 0x83BB2AC + .4byte gMapScripts_CeladonCity_DepartmentStore_3F @ 0x816BB84 + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 194 + .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x04, 0x03, 0x00 CeladonCity_DepartmentStore_4F:: @ 835123C - .incbin "baserom.gba", 0x35123C, 0x1C + .4byte gMapData_CeladonCity_DepartmentStore_4F @ 0x831BB00 + .4byte gMapEvents_CeladonCity_DepartmentStore_4F @ 0x83BB32C + .4byte gMapScripts_CeladonCity_DepartmentStore_4F @ 0x816BBEE + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 195 + .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x04, 0x04, 0x00 CeladonCity_DepartmentStore_5F:: @ 8351258 - .incbin "baserom.gba", 0x351258, 0x1C + .4byte gMapData_CeladonCity_DepartmentStore_5F @ 0x831BCAC + .4byte gMapEvents_CeladonCity_DepartmentStore_5F @ 0x83BB3C4 + .4byte gMapScripts_CeladonCity_DepartmentStore_5F @ 0x816BC40 + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 196 + .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x04, 0x05, 0x00 CeladonCity_DepartmentStore_Roof:: @ 8351274 - .incbin "baserom.gba", 0x351274, 0x1C + .4byte gMapData_CeladonCity_DepartmentStore_Roof @ 0x831BEE4 + .4byte gMapEvents_CeladonCity_DepartmentStore_Roof @ 0x83BB440 + .4byte gMapScripts_CeladonCity_DepartmentStore_Roof @ 0x816BCCC + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 197 + .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x04, 0x7f, 0x00 CeladonCity_DepartmentStore_Elevator:: @ 8351290 - .incbin "baserom.gba", 0x351290, 0x1C + .4byte gMapData_CeladonCity_DepartmentStore_Elevator @ 0x8319F70 + .4byte gMapEvents_CeladonCity_DepartmentStore_Elevator @ 0x83BB47C + .4byte gMapScripts_CeladonCity_DepartmentStore_Elevator @ 0x816C152 + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 179 + .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 CeladonCity_Condominiums_1F:: @ 83512AC - .incbin "baserom.gba", 0x3512AC, 0x1C + .4byte gMapData_CeladonCity_Condominiums_1F @ 0x831A7DC + .4byte gMapEvents_CeladonCity_Condominiums_1F @ 0x83BB538 + .4byte gMapScripts_CeladonCity_Condominiums_1F @ 0x816C320 + .4byte NULL + .2byte BGM_FRLG_CELADON_CITY + .2byte 184 + .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 CeladonCity_Condominiums_2F:: @ 83512C8 - .incbin "baserom.gba", 0x3512C8, 0x1C + .4byte gMapData_CeladonCity_Condominiums_2F @ 0x831AA58 + .4byte gMapEvents_CeladonCity_Condominiums_2F @ 0x83BB5B4 + .4byte gMapScripts_CeladonCity_Condominiums_2F @ 0x816C3D0 + .4byte NULL + .2byte BGM_FRLG_CELADON_CITY + .2byte 185 + .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 CeladonCity_Condominiums_3F:: @ 83512E4 - .incbin "baserom.gba", 0x3512E4, 0x1C + .4byte gMapData_CeladonCity_Condominiums_3F @ 0x831ACD4 + .4byte gMapEvents_CeladonCity_Condominiums_3F @ 0x83BB6A8 + .4byte gMapScripts_CeladonCity_Condominiums_3F @ 0x816C3DA + .4byte NULL + .2byte BGM_FRLG_CELADON_CITY + .2byte 186 + .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 CeladonCity_Condominiums_Roof:: @ 8351300 - .incbin "baserom.gba", 0x351300, 0x1C + .4byte gMapData_CeladonCity_Condominiums_Roof @ 0x831AF7C + .4byte gMapEvents_CeladonCity_Condominiums_Roof @ 0x83BB6EC + .4byte gMapScripts_CeladonCity_Condominiums_Roof @ 0x816C459 + .4byte NULL + .2byte BGM_FRLG_CELADON_CITY + .2byte 187 + .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 CeladonCity_Condominiums_RoofRoom:: @ 835131C - .incbin "baserom.gba", 0x35131C, 0x1C + .4byte gMapData_CeladonCity_Condominiums_RoofRoom @ 0x831B054 + .4byte gMapEvents_CeladonCity_Condominiums_RoofRoom @ 0x83BB76C + .4byte gMapScripts_CeladonCity_Condominiums_RoofRoom @ 0x816C463 + .4byte NULL + .2byte BGM_FRLG_CELADON_CITY + .2byte 188 + .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 CeladonCity_PokemonCenter_1F:: @ 8351338 - .incbin "baserom.gba", 0x351338, 0x1C + .4byte gMapData_CeladonCity_PokemonCenter_1F @ 0x82D5990 + .4byte gMapEvents_CeladonCity_PokemonCenter_1F @ 0x83BB800 + .4byte gMapScripts_CeladonCity_PokemonCenter_1F @ 0x816C5EC + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 8 + .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 CeladonCity_PokemonCenter_2F:: @ 8351354 - .incbin "baserom.gba", 0x351354, 0x1C + .4byte gMapData_CeladonCity_PokemonCenter_2F @ 0x82D5AE0 + .4byte gMapEvents_CeladonCity_PokemonCenter_2F @ 0x83BB88C + .4byte gMapScripts_CeladonCity_PokemonCenter_2F @ 0x816C61F + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 9 + .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 CeladonCity_GameCorner:: @ 8351370 - .incbin "baserom.gba", 0x351370, 0x1C + .4byte gMapData_CeladonCity_GameCorner @ 0x82D7168 + .4byte gMapEvents_CeladonCity_GameCorner @ 0x83BBB78 + .4byte gMapScripts_CeladonCity_GameCorner @ 0x816C646 + .4byte NULL + .2byte BGM_FRLG_GAMECORNER + .2byte 27 + .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 CeladonCity_GameCorner_PrizeRoom:: @ 835138C - .incbin "baserom.gba", 0x35138C, 0x1C + .4byte gMapData_CeladonCity_GameCorner_PrizeRoom @ 0x831B12C + .4byte gMapEvents_CeladonCity_GameCorner_PrizeRoom @ 0x83BBC1C + .4byte gMapScripts_CeladonCity_GameCorner_PrizeRoom @ 0x816CB75 + .4byte NULL + .2byte BGM_FRLG_CELADON_CITY + .2byte 189 + .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 CeladonCity_Gym:: @ 83513A8 - .incbin "baserom.gba", 0x3513A8, 0x1C + .4byte gMapData_CeladonCity_Gym @ 0x82D6370 + .4byte gMapEvents_CeladonCity_Gym @ 0x83BBD68 + .4byte gMapScripts_CeladonCity_Gym @ 0x816D060 + .4byte NULL + .2byte BGM_FRLG_GYM + .2byte 15 + .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01 CeladonCity_Restaurant:: @ 83513C4 - .incbin "baserom.gba", 0x3513C4, 0x1C + .4byte gMapData_CeladonCity_Restaurant @ 0x831B29C + .4byte gMapEvents_CeladonCity_Restaurant @ 0x83BBE0C + .4byte gMapScripts_CeladonCity_Restaurant @ 0x816D1EA + .4byte NULL + .2byte BGM_FRLG_CELADON_CITY + .2byte 190 + .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 CeladonCity_House1:: @ 83513E0 - .incbin "baserom.gba", 0x3513E0, 0x1C + .4byte gMapData_CeladonCity_House1 @ 0x82D6AF0 + .4byte gMapEvents_CeladonCity_House1 @ 0x83BBE80 + .4byte gMapScripts_CeladonCity_House1 @ 0x816D267 + .4byte NULL + .2byte BGM_FRLG_CELADON_CITY + .2byte 21 + .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 CeladonCity_Hotel:: @ 83513FC - .incbin "baserom.gba", 0x3513FC, 0x1C + .4byte gMapData_CeladonCity_Hotel @ 0x831B438 + .4byte gMapEvents_CeladonCity_Hotel @ 0x83BBF0C + .4byte gMapScripts_CeladonCity_Hotel @ 0x816D283 + .4byte NULL + .2byte BGM_FRLG_CELADON_CITY + .2byte 191 + .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 FuchsiaCity_SafariZone_Entrance:: @ 8351418 - .incbin "baserom.gba", 0x351418, 0x1C + .4byte gMapData_FuchsiaCity_SafariZone_Entrance @ 0x82D8E80 + .4byte gMapEvents_FuchsiaCity_SafariZone_Entrance @ 0x83BBFA0 + .4byte gMapScripts_FuchsiaCity_SafariZone_Entrance @ 0x816D2A8 + .4byte NULL + .2byte BGM_FRLG_CERULEAN_CITY + .2byte 51 + .byte 0x5f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 FuchsiaCity_Mart:: @ 8351434 - .incbin "baserom.gba", 0x351434, 0x1C + .4byte gMapData_FuchsiaCity_Mart @ 0x82D5BCC + .4byte gMapEvents_FuchsiaCity_Mart @ 0x83BC014 + .4byte gMapScripts_FuchsiaCity_Mart @ 0x816D4E0 + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 10 + .byte 0x5f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 FuchsiaCity_ZooBuilding:: @ 8351450 - .incbin "baserom.gba", 0x351450, 0x1C + .4byte gMapData_FuchsiaCity_ZooBuilding @ 0x831C348 + .4byte gMapEvents_FuchsiaCity_ZooBuilding @ 0x83BC0A0 + .4byte gMapScripts_FuchsiaCity_ZooBuilding @ 0x816D528 + .4byte NULL + .2byte BGM_FRLG_CERULEAN_CITY + .2byte 200 + .byte 0x5f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 FuchsiaCity_Gym:: @ 835146C - .incbin "baserom.gba", 0x35146C, 0x1C + .4byte gMapData_FuchsiaCity_Gym @ 0x82D6A04 + .4byte gMapEvents_FuchsiaCity_Gym @ 0x83BC1A4 + .4byte gMapScripts_FuchsiaCity_Gym @ 0x816D54D + .4byte NULL + .2byte BGM_FRLG_GYM + .2byte 20 + .byte 0x5f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01 FuchsiaCity_House1:: @ 8351488 - .incbin "baserom.gba", 0x351488, 0x1C + .4byte gMapData_FuchsiaCity_House1 @ 0x82D5754 + .4byte gMapEvents_FuchsiaCity_House1 @ 0x83BC218 + .4byte gMapScripts_FuchsiaCity_House1 @ 0x816D6C5 + .4byte NULL + .2byte BGM_FRLG_CERULEAN_CITY + .2byte 6 + .byte 0x5f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 FuchsiaCity_PokemonCenter_1F:: @ 83514A4 - .incbin "baserom.gba", 0x3514A4, 0x1C + .4byte gMapData_FuchsiaCity_PokemonCenter_1F @ 0x82D5990 + .4byte gMapEvents_FuchsiaCity_PokemonCenter_1F @ 0x83BC2AC + .4byte gMapScripts_FuchsiaCity_PokemonCenter_1F @ 0x816D6F1 + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 8 + .byte 0x5f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 FuchsiaCity_PokemonCenter_2F:: @ 83514C0 - .incbin "baserom.gba", 0x3514C0, 0x1C + .4byte gMapData_FuchsiaCity_PokemonCenter_2F @ 0x82D5AE0 + .4byte gMapEvents_FuchsiaCity_PokemonCenter_2F @ 0x83BC338 + .4byte gMapScripts_FuchsiaCity_PokemonCenter_2F @ 0x816D724 + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 9 + .byte 0x5f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 FuchsiaCity_Building1:: @ 83514DC - .incbin "baserom.gba", 0x3514DC, 0x1C + .4byte gMapData_FuchsiaCity_Building1 @ 0x831C48C + .4byte gMapEvents_FuchsiaCity_Building1 @ 0x83BC3F4 + .4byte gMapScripts_FuchsiaCity_Building1 @ 0x816D74B + .4byte NULL + .2byte BGM_FRLG_CERULEAN_CITY + .2byte 201 + .byte 0x5f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 FuchsiaCity_House2:: @ 83514F8 - .incbin "baserom.gba", 0x3514F8, 0x1C + .4byte gMapData_FuchsiaCity_House2 @ 0x831C578 + .4byte gMapEvents_FuchsiaCity_House2 @ 0x83BC440 + .4byte gMapScripts_FuchsiaCity_House2 @ 0x816D816 + .4byte NULL + .2byte BGM_FRLG_CERULEAN_CITY + .2byte 202 + .byte 0x5f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 FuchsiaCity_House3:: @ 8351514 - .incbin "baserom.gba", 0x351514, 0x1C + .4byte gMapData_FuchsiaCity_House3 @ 0x82D5754 + .4byte gMapEvents_FuchsiaCity_House3 @ 0x83BC474 + .4byte gMapScripts_FuchsiaCity_House3 @ 0x816D894 + .4byte NULL + .2byte BGM_FRLG_CERULEAN_CITY + .2byte 6 + .byte 0x5f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 CinnabarIsland_Gym:: @ 8351530 - .incbin "baserom.gba", 0x351530, 0x1C + .4byte gMapData_CinnabarIsland_Gym @ 0x82D82C8 + .4byte gMapEvents_CinnabarIsland_Gym @ 0x83BC62C + .4byte gMapScripts_CinnabarIsland_Gym @ 0x816D94B + .4byte NULL + .2byte BGM_FRLG_GYM + .2byte 36 + .byte 0x60, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01 CinnabarIsland_PokemonLab_Entrance:: @ 835154C - .incbin "baserom.gba", 0x35154C, 0x1C + .4byte gMapData_CinnabarIsland_PokemonLab_Entrance @ 0x831C804 + .4byte gMapEvents_CinnabarIsland_PokemonLab_Entrance @ 0x83BC6B8 + .4byte gMapScripts_CinnabarIsland_PokemonLab_Entrance @ 0x816E273 + .4byte NULL + .2byte BGM_FRLG_CINNABAR_ISLAND + .2byte 203 + .byte 0x60, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 CinnabarIsland_PokemonLab_Lounge:: @ 8351568 - .incbin "baserom.gba", 0x351568, 0x1C + .4byte gMapData_CinnabarIsland_PokemonLab_Lounge @ 0x831C974 + .4byte gMapEvents_CinnabarIsland_PokemonLab_Lounge @ 0x83BC71C + .4byte gMapScripts_CinnabarIsland_PokemonLab_Lounge @ 0x816E2B8 + .4byte NULL + .2byte BGM_FRLG_CINNABAR_ISLAND + .2byte 204 + .byte 0x60, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 CinnabarIsland_PokemonLab_ResearchRoom:: @ 8351584 - .incbin "baserom.gba", 0x351584, 0x1C + .4byte gMapData_CinnabarIsland_PokemonLab_ResearchRoom @ 0x831CAE4 + .4byte gMapEvents_CinnabarIsland_PokemonLab_ResearchRoom @ 0x83BC780 + .4byte gMapScripts_CinnabarIsland_PokemonLab_ResearchRoom @ 0x816E3DE + .4byte NULL + .2byte BGM_FRLG_CINNABAR_ISLAND + .2byte 205 + .byte 0x60, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 CinnabarIsland_PokemonLab_ExperimentRoom:: @ 83515A0 - .incbin "baserom.gba", 0x3515A0, 0x1C + .4byte gMapData_CinnabarIsland_PokemonLab_ExperimentRoom @ 0x831CC54 + .4byte gMapEvents_CinnabarIsland_PokemonLab_ExperimentRoom @ 0x83BC7CC + .4byte gMapScripts_CinnabarIsland_PokemonLab_ExperimentRoom @ 0x816E400 + .4byte NULL + .2byte BGM_FRLG_CINNABAR_ISLAND + .2byte 206 + .byte 0x60, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 CinnabarIsland_PokemonCenter_1F:: @ 83515BC - .incbin "baserom.gba", 0x3515BC, 0x1C + .4byte gMapData_CinnabarIsland_PokemonCenter_1F @ 0x82D5990 + .4byte gMapEvents_CinnabarIsland_PokemonCenter_1F @ 0x83BC8A8 + .4byte gMapScripts_CinnabarIsland_PokemonCenter_1F @ 0x816E8D7 + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 8 + .byte 0x60, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 CinnabarIsland_PokemonCenter_2F:: @ 83515D8 - .incbin "baserom.gba", 0x3515D8, 0x1C + .4byte gMapData_CinnabarIsland_PokemonCenter_2F @ 0x82D5AE0 + .4byte gMapEvents_CinnabarIsland_PokemonCenter_2F @ 0x83BC934 + .4byte gMapScripts_CinnabarIsland_PokemonCenter_2F @ 0x816E9E8 + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 9 + .byte 0x60, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 CinnabarIsland_Mart:: @ 83515F4 - .incbin "baserom.gba", 0x3515F4, 0x1C + .4byte gMapData_CinnabarIsland_Mart @ 0x82D5BCC + .4byte gMapEvents_CinnabarIsland_Mart @ 0x83BC9A8 + .4byte gMapScripts_CinnabarIsland_Mart @ 0x816EA0F + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 10 + .byte 0x60, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 IndigoPlateau_PokemonCenter_1F:: @ 8351610 - .incbin "baserom.gba", 0x351610, 0x1C + .4byte gMapData_IndigoPlateau_PokemonCenter_1F @ 0x831F000 + .4byte gMapEvents_IndigoPlateau_PokemonCenter_1F @ 0x83BCA94 + .4byte gMapScripts_IndigoPlateau_PokemonCenter_1F @ 0x816EA5A + .4byte NULL + .2byte BGM_FRLG_GYM + .2byte 212 + .byte 0x61, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01 IndigoPlateau_PokemonCenter_2F:: @ 835162C - .incbin "baserom.gba", 0x35162C, 0x1C + .4byte gMapData_IndigoPlateau_PokemonCenter_2F @ 0x82D5AE0 + .4byte gMapEvents_IndigoPlateau_PokemonCenter_2F @ 0x83BCB20 + .4byte gMapScripts_IndigoPlateau_PokemonCenter_2F @ 0x816EB0F + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 9 + .byte 0x61, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01 SaffronCity_House1_1F:: @ 8351648 - .incbin "baserom.gba", 0x351648, 0x1C + .4byte gMapData_SaffronCity_House1_1F @ 0x8321004 + .4byte gMapEvents_SaffronCity_House1_1F @ 0x83BCB9C + .4byte gMapScripts_SaffronCity_House1_1F @ 0x816EB36 + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_CITY + .2byte 226 + .byte 0x62, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 SaffronCity_House1_2F:: @ 8351664 - .incbin "baserom.gba", 0x351664, 0x1C + .4byte gMapData_SaffronCity_House1_2F @ 0x8321100 + .4byte gMapEvents_SaffronCity_House1_2F @ 0x83BCC3C + .4byte gMapScripts_SaffronCity_House1_2F @ 0x816EB5C + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_CITY + .2byte 227 + .byte 0x62, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 SaffronCity_Dojo:: @ 8351680 - .incbin "baserom.gba", 0x351680, 0x1C + .4byte gMapData_SaffronCity_Dojo @ 0x83212C4 + .4byte gMapEvents_SaffronCity_Dojo @ 0x83BCD60 + .4byte gMapScripts_SaffronCity_Dojo @ 0x816EBDB + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_CITY + .2byte 228 + .byte 0x62, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 SaffronCity_Gym:: @ 835169C - .incbin "baserom.gba", 0x35169C, 0x1C + .4byte gMapData_SaffronCity_Gym @ 0x82D7C44 + .4byte gMapEvents_SaffronCity_Gym @ 0x83BCF6C + .4byte gMapScripts_SaffronCity_Gym @ 0x816EDD7 + .4byte NULL + .2byte BGM_FRLG_GYM + .2byte 34 + .byte 0x62, 0x00, 0x00, 0x08, 0x00, 0x01, 0x00, 0x01 SaffronCity_House2:: @ 83516B8 - .incbin "baserom.gba", 0x3516B8, 0x1C + .4byte gMapData_SaffronCity_House2 @ 0x82D6AF0 + .4byte gMapEvents_SaffronCity_House2 @ 0x83BD004 + .4byte gMapScripts_SaffronCity_House2 @ 0x816EF73 + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_CITY + .2byte 21 + .byte 0x62, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 SaffronCity_Mart:: @ 83516D4 - .incbin "baserom.gba", 0x3516D4, 0x1C + .4byte gMapData_SaffronCity_Mart @ 0x82D5BCC + .4byte gMapEvents_SaffronCity_Mart @ 0x83BD078 + .4byte gMapScripts_SaffronCity_Mart @ 0x816EFA2 + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 10 + .byte 0x62, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 SaffronCity_PokemonCenter_1F:: @ 83516F0 - .incbin "baserom.gba", 0x3516F0, 0x1C + .4byte gMapData_SaffronCity_PokemonCenter_1F @ 0x82D5990 + .4byte gMapEvents_SaffronCity_PokemonCenter_1F @ 0x83BD13C + .4byte gMapScripts_SaffronCity_PokemonCenter_1F @ 0x816EFEC + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 8 + .byte 0x62, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 SaffronCity_PokemonCenter_2F:: @ 835170C - .incbin "baserom.gba", 0x35170C, 0x1C + .4byte gMapData_SaffronCity_PokemonCenter_2F @ 0x82D5AE0 + .4byte gMapEvents_SaffronCity_PokemonCenter_2F @ 0x83BD1C8 + .4byte gMapScripts_SaffronCity_PokemonCenter_2F @ 0x816F037 + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 9 + .byte 0x62, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 SaffronCity_House3:: @ 8351728 - .incbin "baserom.gba", 0x351728, 0x1C + .4byte gMapData_SaffronCity_House3 @ 0x82D6AF0 + .4byte gMapEvents_SaffronCity_House3 @ 0x83BD20C + .4byte gMapScripts_SaffronCity_House3 @ 0x816F05E + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_CITY + .2byte 21 + .byte 0x62, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 SaffronCity_PokemonTrainerFanClub:: @ 8351744 - .incbin "baserom.gba", 0x351744, 0x1C + .4byte gMapData_SaffronCity_PokemonTrainerFanClub @ 0x8338A60 + .4byte gMapEvents_SaffronCity_PokemonTrainerFanClub @ 0x83BD318 + .4byte gMapScripts_SaffronCity_PokemonTrainerFanClub @ 0x816F0BF + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_CITY + .2byte 263 + .byte 0x62, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 Route2_ViridianForest_SouthEntrance:: @ 8351760 - .incbin "baserom.gba", 0x351760, 0x1C + .4byte gMapData_Route2_ViridianForest_SouthEntrance @ 0x8320990 + .4byte gMapEvents_Route2_ViridianForest_SouthEntrance @ 0x83BD37C + .4byte gMapScripts_Route2_ViridianForest_SouthEntrance @ 0x816F5E5 + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_CITY + .2byte 221 + .byte 0x66, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00 Route2_House:: @ 835177C - .incbin "baserom.gba", 0x35177C, 0x1C + .4byte gMapData_Route2_House @ 0x82D5840 + .4byte gMapEvents_Route2_House @ 0x83BD3D8 + .4byte gMapScripts_Route2_House @ 0x816F5F8 + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_CITY + .2byte 7 + .byte 0x66, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 Route2_EastBuilding:: @ 8351798 - .incbin "baserom.gba", 0x351798, 0x1C + .4byte gMapData_Route2_EastBuilding @ 0x8320990 + .4byte gMapEvents_Route2_EastBuilding @ 0x83BD43C + .4byte gMapScripts_Route2_EastBuilding @ 0x816F67E + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_CITY + .2byte 221 + .byte 0x66, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00 Route2_ViridianForest_NorthEntrance:: @ 83517B4 - .incbin "baserom.gba", 0x3517B4, 0x1C + .4byte gMapData_Route2_ViridianForest_NorthEntrance @ 0x8320990 + .4byte gMapEvents_Route2_ViridianForest_NorthEntrance @ 0x83BD4B8 + .4byte gMapScripts_Route2_ViridianForest_NorthEntrance @ 0x816F71D + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_CITY + .2byte 221 + .byte 0x66, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00 Route4_PokemonCenter_1F:: @ 83517D0 - .incbin "baserom.gba", 0x3517D0, 0x1C + .4byte gMapData_Route4_PokemonCenter_1F @ 0x82D5990 + .4byte gMapEvents_Route4_PokemonCenter_1F @ 0x83BD57C + .4byte gMapScripts_Route4_PokemonCenter_1F @ 0x816F739 + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 8 + .byte 0x68, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 Route4_PokemonCenter_2F:: @ 83517EC - .incbin "baserom.gba", 0x3517EC, 0x1C + .4byte gMapData_Route4_PokemonCenter_2F @ 0x82D5AE0 + .4byte gMapEvents_Route4_PokemonCenter_2F @ 0x83BD608 + .4byte gMapScripts_Route4_PokemonCenter_2F @ 0x816F8D8 + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 9 + .byte 0x68, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 Route5_PokemonDayCare:: @ 8351808 - .incbin "baserom.gba", 0x351808, 0x1C + .4byte gMapData_Route5_PokemonDayCare @ 0x833ADC0 + .4byte gMapEvents_Route5_PokemonDayCare @ 0x83BD64C + .4byte gMapScripts_Route5_PokemonDayCare @ 0x816F8FF + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_CITY + .2byte 275 + .byte 0x69, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 Route5_SouthEntrance:: @ 8351824 - .incbin "baserom.gba", 0x351824, 0x1C + .4byte gMapData_Route5_SouthEntrance @ 0x831E9C0 + .4byte gMapEvents_Route5_SouthEntrance @ 0x83BD6C8 + .4byte gMapScripts_Route5_SouthEntrance @ 0x816F900 + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_CITY + .2byte 208 + .byte 0x69, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00 Route6_NorthEntrance:: @ 8351840 - .incbin "baserom.gba", 0x351840, 0x1C + .4byte gMapData_Route6_NorthEntrance @ 0x831E9C0 + .4byte gMapEvents_Route6_NorthEntrance @ 0x83BD744 + .4byte gMapScripts_Route6_NorthEntrance @ 0x816F9C6 + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_CITY + .2byte 208 + .byte 0x6a, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00 UnknownMap_18_01:: @ 835185C - .incbin "baserom.gba", 0x35185C, 0x1C + .4byte gMapData_UnknownMap_18_01 @ 0x82D5840 + .4byte gMapEvents_UnknownMap_18_01 @ 0x83BD758 + .4byte gMapScripts_UnknownMap_18_01 @ 0x816FA8C + .4byte NULL + .2byte BGM_FRLG_ROUTE_3 + .2byte 7 + .byte 0x6a, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 Route7_EastEntrance:: @ 8351878 - .incbin "baserom.gba", 0x351878, 0x1C + .4byte gMapData_Route7_EastEntrance @ 0x831EAD0 + .4byte gMapEvents_Route7_EastEntrance @ 0x83BD7D4 + .4byte gMapScripts_Route7_EastEntrance @ 0x816FA8D + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_CITY + .2byte 209 + .byte 0x6b, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00 Route8_WestEntrance:: @ 8351894 - .incbin "baserom.gba", 0x351894, 0x1C + .4byte gMapData_Route8_WestEntrance @ 0x831EAD0 + .4byte gMapEvents_Route8_WestEntrance @ 0x83BD850 + .4byte gMapScripts_Route8_WestEntrance @ 0x816FB53 + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_CITY + .2byte 209 + .byte 0x6c, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00 Route10_PokemonCenter_1F:: @ 83518B0 - .incbin "baserom.gba", 0x3518B0, 0x1C + .4byte gMapData_Route10_PokemonCenter_1F @ 0x82D5990 + .4byte gMapEvents_Route10_PokemonCenter_1F @ 0x83BD8FC + .4byte gMapScripts_Route10_PokemonCenter_1F @ 0x816FC2F + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 8 + .byte 0x6e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 Route10_PokemonCenter_2F:: @ 83518CC - .incbin "baserom.gba", 0x3518CC, 0x1C + .4byte gMapData_Route10_PokemonCenter_2F @ 0x82D5AE0 + .4byte gMapEvents_Route10_PokemonCenter_2F @ 0x83BD988 + .4byte gMapScripts_Route10_PokemonCenter_2F @ 0x816FCFA + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 9 + .byte 0x6e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 Route11_EastEntrance_1F:: @ 83518E8 - .incbin "baserom.gba", 0x3518E8, 0x1C + .4byte gMapData_Route11_EastEntrance_1F @ 0x8320E70 + .4byte gMapEvents_Route11_EastEntrance_1F @ 0x83BD9F4 + .4byte gMapScripts_Route11_EastEntrance_1F @ 0x816FD21 + .4byte NULL + .2byte BGM_FRLG_VERMILION_CITY + .2byte 224 + .byte 0x6f, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00 Route11_EastEntrance_2F:: @ 8351904 - .incbin "baserom.gba", 0x351904, 0x1C + .4byte gMapData_Route11_EastEntrance_2F @ 0x8320804 + .4byte gMapEvents_Route11_EastEntrance_2F @ 0x83BDA58 + .4byte gMapScripts_Route11_EastEntrance_2F @ 0x816FD34 + .4byte NULL + .2byte BGM_FRLG_VERMILION_CITY + .2byte 220 + .byte 0x6f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 Route12_NorthEntrance_1F:: @ 8351920 - .incbin "baserom.gba", 0x351920, 0x1C + .4byte gMapData_Route12_NorthEntrance_1F @ 0x8319DF0 + .4byte gMapEvents_Route12_NorthEntrance_1F @ 0x83BDAAC + .4byte gMapScripts_Route12_NorthEntrance_1F @ 0x816FE6D + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_CITY + .2byte 176 + .byte 0x70, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00 Route12_NorthEntrance_2F:: @ 835193C - .incbin "baserom.gba", 0x35193C, 0x1C + .4byte gMapData_Route12_NorthEntrance_2F @ 0x8320804 + .4byte gMapEvents_Route12_NorthEntrance_2F @ 0x83BDAF8 + .4byte gMapScripts_Route12_NorthEntrance_2F @ 0x816FE77 + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_CITY + .2byte 220 + .byte 0x70, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 Route12_FishingHouse:: @ 8351958 - .incbin "baserom.gba", 0x351958, 0x1C + .4byte gMapData_Route12_FishingHouse @ 0x82D6070 + .4byte gMapEvents_Route12_FishingHouse @ 0x83BDB48 + .4byte gMapScripts_Route12_FishingHouse @ 0x816FF0B + .4byte NULL + .2byte BGM_FRLG_CELADON_CITY + .2byte 13 + .byte 0x70, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 Route15_WestEntrance_1F:: @ 8351974 - .incbin "baserom.gba", 0x351974, 0x1C + .4byte gMapData_Route15_WestEntrance_1F @ 0x8320E70 + .4byte gMapEvents_Route15_WestEntrance_1F @ 0x83BDB9C + .4byte gMapScripts_Route15_WestEntrance_1F @ 0x8170088 + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_CITY + .2byte 224 + .byte 0x73, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00 Route15_WestEntrance_2F:: @ 8351990 - .incbin "baserom.gba", 0x351990, 0x1C + .4byte gMapData_Route15_WestEntrance_2F @ 0x8320804 + .4byte gMapEvents_Route15_WestEntrance_2F @ 0x83BDBE8 + .4byte gMapScripts_Route15_WestEntrance_2F @ 0x8170092 + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_CITY + .2byte 220 + .byte 0x73, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 Route16_House:: @ 83519AC - .incbin "baserom.gba", 0x3519AC, 0x1C + .4byte gMapData_Route16_House @ 0x82D5754 + .4byte gMapEvents_Route16_House @ 0x83BDC44 + .4byte gMapScripts_Route16_House @ 0x817014E + .4byte NULL + .2byte BGM_FRLG_CELADON_CITY + .2byte 6 + .byte 0x74, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 Route16_NorthEntrance_1F:: @ 83519C8 - .incbin "baserom.gba", 0x3519C8, 0x1C + .4byte gMapData_Route16_NorthEntrance_1F @ 0x8320D14 + .4byte gMapEvents_Route16_NorthEntrance_1F @ 0x83BDD60 + .4byte gMapScripts_Route16_NorthEntrance_1F @ 0x81701C2 + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_CITY + .2byte 223 + .byte 0x74, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00 Route16_NorthEntrance_2F:: @ 83519E4 - .incbin "baserom.gba", 0x3519E4, 0x1C + .4byte gMapData_Route16_NorthEntrance_2F @ 0x8320804 + .4byte gMapEvents_Route16_NorthEntrance_2F @ 0x83BDDDC + .4byte gMapScripts_Route16_NorthEntrance_2F @ 0x81702BE + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_CITY + .2byte 220 + .byte 0x74, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 Route18_EastEntrance_1F:: @ 8351A00 - .incbin "baserom.gba", 0x351A00, 0x1C + .4byte gMapData_Route18_EastEntrance_1F @ 0x8320E70 + .4byte gMapEvents_Route18_EastEntrance_1F @ 0x83BDED0 + .4byte gMapScripts_Route18_EastEntrance_1F @ 0x8170378 + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_CITY + .2byte 224 + .byte 0x76, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00 Route18_EastEntrance_2F:: @ 8351A1C - .incbin "baserom.gba", 0x351A1C, 0x1C + .4byte gMapData_Route18_EastEntrance_2F @ 0x8320804 + .4byte gMapEvents_Route18_EastEntrance_2F @ 0x83BDF1C + .4byte gMapScripts_Route18_EastEntrance_2F @ 0x817046B + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_CITY + .2byte 220 + .byte 0x76, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 UnusedHouse_27_00:: @ 8351A38 - .incbin "baserom.gba", 0x351A38, 0x1C + .4byte gMapData_UnusedHouse_27_00 @ 0x82D5840 + .4byte gMapEvents_UnusedHouse_27_00 @ 0x83BDF30 + .4byte gMapScripts_UnusedHouse_27_00 @ 0x81704FA + .4byte NULL + .2byte BGM_FRLG_ROUTE_3 + .2byte 7 + .byte 0x77, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 Route22_NorthEntrance:: @ 8351A54 - .incbin "baserom.gba", 0x351A54, 0x1C + .4byte gMapData_Route22_NorthEntrance @ 0x8320B1C + .4byte gMapEvents_Route22_NorthEntrance @ 0x83BDF8C + .4byte gMapScripts_Route22_NorthEntrance @ 0x81704FB + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_FOREST + .2byte 222 + .byte 0x7a, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 UnusedHouse_29_00:: @ 8351A70 - .incbin "baserom.gba", 0x351A70, 0x1C + .4byte gMapData_UnusedHouse_29_00 @ 0x82D5840 + .4byte gMapEvents_UnusedHouse_29_00 @ 0x83BDFA0 + .4byte gMapScripts_UnusedHouse_29_00 @ 0x8170522 + .4byte NULL + .2byte BGM_FRLG_INDIGO_PLATEAU + .2byte 7 + .byte 0x7b, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 Route25_SeaCottage:: @ 8351A8C - .incbin "baserom.gba", 0x351A8C, 0x1C + .4byte gMapData_Route25_SeaCottage @ 0x8319030 + .4byte gMapEvents_Route25_SeaCottage @ 0x83BE008 + .4byte gMapScripts_Route25_SeaCottage @ 0x8170523 + .4byte NULL + .2byte BGM_FRLG_CERULEAN_CITY + .2byte 169 + .byte 0x7d, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 SevenIsland_House_Room1:: @ 8351AA8 - .incbin "baserom.gba", 0x351AA8, 0x1C + .4byte gMapData_SevenIsland_House_Room1 @ 0x834E310 + .4byte gMapEvents_SevenIsland_House_Room1 @ 0x83BE050 + .4byte gMapScripts_SevenIsland_House_Room1 @ 0x817088A + .4byte NULL + .2byte BGM_FRLG_ISLAND_SIX + .2byte 382 + .byte 0x94, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01 SevenIsland_House_Room2:: @ 8351AC4 - .incbin "baserom.gba", 0x351AC4, 0x1C + .4byte gMapData_SevenIsland_House_Room2 @ 0x8338C48 + .4byte gMapEvents_SevenIsland_House_Room2 @ 0x83BE084 + .4byte gMapScripts_SevenIsland_House_Room2 @ 0x8170A7E + .4byte NULL + .2byte BGM_FRLG_ISLAND_SIX + .2byte 265 + .byte 0x94, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01 SevenIsland_Mart:: @ 8351AE0 - .incbin "baserom.gba", 0x351AE0, 0x1C + .4byte gMapData_SevenIsland_Mart @ 0x82D5BCC + .4byte gMapEvents_SevenIsland_Mart @ 0x83BE100 + .4byte gMapScripts_SevenIsland_Mart @ 0x8170B30 + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 10 + .byte 0x94, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 SevenIsland_PokemonCenter_1F:: @ 8351AFC - .incbin "baserom.gba", 0x351AFC, 0x1C + .4byte gMapData_SevenIsland_PokemonCenter_1F @ 0x82D5990 + .4byte gMapEvents_SevenIsland_PokemonCenter_1F @ 0x83BE1B4 + .4byte gMapScripts_SevenIsland_PokemonCenter_1F @ 0x8170B89 + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 8 + .byte 0x94, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 SevenIsland_PokemonCenter_2F:: @ 8351B18 - .incbin "baserom.gba", 0x351B18, 0x1C + .4byte gMapData_SevenIsland_PokemonCenter_2F @ 0x82D5AE0 + .4byte gMapEvents_SevenIsland_PokemonCenter_2F @ 0x83BE240 + .4byte gMapScripts_SevenIsland_PokemonCenter_2F @ 0x8170BBC + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 9 + .byte 0x94, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 UnusedHouse_31_05:: @ 8351B34 - .incbin "baserom.gba", 0x351B34, 0x1C + .4byte gMapData_UnusedHouse_31_05 @ 0x82D6070 + .4byte gMapEvents_UnusedHouse_31_05 @ 0x83BE254 + .4byte gMapScripts_UnusedHouse_31_05 @ 0x8170BE3 + .4byte NULL + .2byte BGM_FRLG_ISLAND_SIX + .2byte 13 + .byte 0x94, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 SevenIsland_Harbor:: @ 8351B50 - .incbin "baserom.gba", 0x351B50, 0x1C + .4byte gMapData_SevenIsland_Harbor @ 0x8343FB8 + .4byte gMapEvents_SevenIsland_Harbor @ 0x83BE2A0 + .4byte gMapScripts_SevenIsland_Harbor @ 0x8170BE4 + .4byte NULL + .2byte BGM_FRLG_ISLAND_SIX + .2byte 315 + .byte 0x94, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 OneIsland_PokemonCenter_1F:: @ 8351B6C - .incbin "baserom.gba", 0x351B6C, 0x1C + .4byte gMapData_OneIsland_PokemonCenter_1F @ 0x833A970 + .4byte gMapEvents_OneIsland_PokemonCenter_1F @ 0x83BE400 + .4byte gMapScripts_OneIsland_PokemonCenter_1F @ 0x8170BF8 + .4byte NULL + .2byte BGM_FRLG_POKEMON_NETWORK_CENTER + .2byte 271 + .byte 0x8f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 OneIsland_PokemonCenter_2F:: @ 8351B88 - .incbin "baserom.gba", 0x351B88, 0x1C + .4byte gMapData_OneIsland_PokemonCenter_2F @ 0x8344108 + .4byte gMapEvents_OneIsland_PokemonCenter_2F @ 0x83BE48C + .4byte gMapScripts_OneIsland_PokemonCenter_2F @ 0x8171334 + .4byte NULL + .2byte BGM_FRLG_POKEMON_NETWORK_CENTER + .2byte 316 + .byte 0x8f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 OneIsland_House1:: @ 8351BA4 - .incbin "baserom.gba", 0x351BA4, 0x1C + .4byte gMapData_OneIsland_House1 @ 0x82D5CB8 + .4byte gMapEvents_OneIsland_House1 @ 0x83BE4D8 + .4byte gMapScripts_OneIsland_House1 @ 0x817135B + .4byte NULL + .2byte BGM_FRLG_ISLAND_ONE + .2byte 11 + .byte 0x8f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 OneIsland_House2:: @ 8351BC0 - .incbin "baserom.gba", 0x351BC0, 0x1C + .4byte gMapData_OneIsland_House2 @ 0x82D5CB8 + .4byte gMapEvents_OneIsland_House2 @ 0x83BE50C + .4byte gMapScripts_OneIsland_House2 @ 0x817136E + .4byte NULL + .2byte BGM_FRLG_ISLAND_ONE + .2byte 11 + .byte 0x8f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 OneIsland_Harbor:: @ 8351BDC - .incbin "baserom.gba", 0x351BDC, 0x1C + .4byte gMapData_OneIsland_Harbor @ 0x8343FB8 + .4byte gMapEvents_OneIsland_Harbor @ 0x83BE558 + .4byte gMapScripts_OneIsland_Harbor @ 0x8171378 + .4byte NULL + .2byte BGM_FRLG_ISLAND_ONE + .2byte 315 + .byte 0x8f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 TwoIsland_JoyfulGameCorner:: @ 8351BF8 - .incbin "baserom.gba", 0x351BF8, 0x1C + .4byte gMapData_TwoIsland_JoyfulGameCorner @ 0x833AA84 + .4byte gMapEvents_TwoIsland_JoyfulGameCorner @ 0x83BE5EC + .4byte gMapScripts_TwoIsland_JoyfulGameCorner @ 0x81713D0 + .4byte NULL + .2byte BGM_FRLG_GAMECORNER + .2byte 272 + .byte 0x90, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 TwoIsland_House:: @ 8351C14 - .incbin "baserom.gba", 0x351C14, 0x1C + .4byte gMapData_TwoIsland_House @ 0x82D5CB8 + .4byte gMapEvents_TwoIsland_House @ 0x83BE620 + .4byte gMapScripts_TwoIsland_House @ 0x8171618 + .4byte NULL + .2byte BGM_FRLG_ISLAND_ONE + .2byte 11 + .byte 0x90, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 TwoIsland_PokemonCenter_1F:: @ 8351C30 - .incbin "baserom.gba", 0x351C30, 0x1C + .4byte gMapData_TwoIsland_PokemonCenter_1F @ 0x82D5990 + .4byte gMapEvents_TwoIsland_PokemonCenter_1F @ 0x83BE68C + .4byte gMapScripts_TwoIsland_PokemonCenter_1F @ 0x81717B4 + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 8 + .byte 0x90, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 TwoIsland_PokemonCenter_2F:: @ 8351C4C - .incbin "baserom.gba", 0x351C4C, 0x1C + .4byte gMapData_TwoIsland_PokemonCenter_2F @ 0x82D5AE0 + .4byte gMapEvents_TwoIsland_PokemonCenter_2F @ 0x83BE718 + .4byte gMapScripts_TwoIsland_PokemonCenter_2F @ 0x81717DE + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 9 + .byte 0x90, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 TwoIsland_Harbor:: @ 8351C68 - .incbin "baserom.gba", 0x351C68, 0x1C + .4byte gMapData_TwoIsland_Harbor @ 0x8343FB8 + .4byte gMapEvents_TwoIsland_Harbor @ 0x83BE764 + .4byte gMapScripts_TwoIsland_Harbor @ 0x8171805 + .4byte NULL + .2byte BGM_FRLG_ISLAND_ONE + .2byte 315 + .byte 0x90, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 ThreeIsland_House1:: @ 8351C84 - .incbin "baserom.gba", 0x351C84, 0x1C + .4byte gMapData_ThreeIsland_House1 @ 0x82D7504 + .4byte gMapEvents_ThreeIsland_House1 @ 0x83BE7A4 + .4byte gMapScripts_ThreeIsland_House1 @ 0x8171819 + .4byte NULL + .2byte BGM_FRLG_ISLAND_ONE + .2byte 31 + .byte 0x91, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 ThreeIsland_PokemonCenter_1F:: @ 8351CA0 - .incbin "baserom.gba", 0x351CA0, 0x1C + .4byte gMapData_ThreeIsland_PokemonCenter_1F @ 0x82D5990 + .4byte gMapEvents_ThreeIsland_PokemonCenter_1F @ 0x83BE828 + .4byte gMapScripts_ThreeIsland_PokemonCenter_1F @ 0x8171832 + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 8 + .byte 0x91, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 ThreeIsland_PokemonCenter_2F:: @ 8351CBC - .incbin "baserom.gba", 0x351CBC, 0x1C + .4byte gMapData_ThreeIsland_PokemonCenter_2F @ 0x82D5AE0 + .4byte gMapEvents_ThreeIsland_PokemonCenter_2F @ 0x83BE8B4 + .4byte gMapScripts_ThreeIsland_PokemonCenter_2F @ 0x8171865 + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 9 + .byte 0x91, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 ThreeIsland_Mart:: @ 8351CD8 - .incbin "baserom.gba", 0x351CD8, 0x1C + .4byte gMapData_ThreeIsland_Mart @ 0x82D5BCC + .4byte gMapEvents_ThreeIsland_Mart @ 0x83BE930 + .4byte gMapScripts_ThreeIsland_Mart @ 0x817188C + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 10 + .byte 0x91, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 ThreeIsland_House2:: @ 8351CF4 - .incbin "baserom.gba", 0x351CF4, 0x1C + .4byte gMapData_ThreeIsland_House2 @ 0x82D5CB8 + .4byte gMapEvents_ThreeIsland_House2 @ 0x83BE97C + .4byte gMapScripts_ThreeIsland_House2 @ 0x81718DF + .4byte NULL + .2byte BGM_FRLG_ISLAND_ONE + .2byte 11 + .byte 0x91, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 ThreeIsland_House3:: @ 8351D10 - .incbin "baserom.gba", 0x351D10, 0x1C + .4byte gMapData_ThreeIsland_House3 @ 0x82D5CB8 + .4byte gMapEvents_ThreeIsland_House3 @ 0x83BE9B0 + .4byte gMapScripts_ThreeIsland_House3 @ 0x8171902 + .4byte NULL + .2byte BGM_FRLG_ISLAND_ONE + .2byte 11 + .byte 0x91, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 ThreeIsland_House4:: @ 8351D2C - .incbin "baserom.gba", 0x351D2C, 0x1C + .4byte gMapData_ThreeIsland_House4 @ 0x82D5CB8 + .4byte gMapEvents_ThreeIsland_House4 @ 0x83BE9FC + .4byte gMapScripts_ThreeIsland_House4 @ 0x817190C + .4byte NULL + .2byte BGM_FRLG_ISLAND_ONE + .2byte 11 + .byte 0x91, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 ThreeIsland_House5:: @ 8351D48 - .incbin "baserom.gba", 0x351D48, 0x1C + .4byte gMapData_ThreeIsland_House5 @ 0x82D5CB8 + .4byte gMapEvents_ThreeIsland_House5 @ 0x83BEA30 + .4byte gMapScripts_ThreeIsland_House5 @ 0x817191F + .4byte NULL + .2byte BGM_FRLG_ISLAND_ONE + .2byte 11 + .byte 0x91, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 FourIsland_PokemonDayCare:: @ 8351D64 - .incbin "baserom.gba", 0x351D64, 0x1C + .4byte gMapData_FourIsland_PokemonDayCare @ 0x833AFA8 + .4byte gMapEvents_FourIsland_PokemonDayCare @ 0x83BEA64 + .4byte gMapScripts_FourIsland_PokemonDayCare @ 0x817193F + .4byte NULL + .2byte BGM_FRLG_ISLAND_FOUR + .2byte 277 + .byte 0x92, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 FourIsland_PokemonCenter_1F:: @ 8351D80 - .incbin "baserom.gba", 0x351D80, 0x1C + .4byte gMapData_FourIsland_PokemonCenter_1F @ 0x82D5990 + .4byte gMapEvents_FourIsland_PokemonCenter_1F @ 0x83BEB00 + .4byte gMapScripts_FourIsland_PokemonCenter_1F @ 0x8171BEA + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 8 + .byte 0x92, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 FourIsland_PokemonCenter_2F:: @ 8351D9C - .incbin "baserom.gba", 0x351D9C, 0x1C + .4byte gMapData_FourIsland_PokemonCenter_2F @ 0x82D5AE0 + .4byte gMapEvents_FourIsland_PokemonCenter_2F @ 0x83BEB8C + .4byte gMapScripts_FourIsland_PokemonCenter_2F @ 0x8171C1D + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 9 + .byte 0x92, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 FourIsland_House1:: @ 8351DB8 - .incbin "baserom.gba", 0x351DB8, 0x1C + .4byte gMapData_FourIsland_House1 @ 0x82D5CB8 + .4byte gMapEvents_FourIsland_House1 @ 0x83BEBD8 + .4byte gMapScripts_FourIsland_House1 @ 0x8171C44 + .4byte NULL + .2byte BGM_FRLG_ISLAND_FOUR + .2byte 11 + .byte 0x92, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 FourIsland_LoreleisHouse:: @ 8351DD4 - .incbin "baserom.gba", 0x351DD4, 0x1C + .4byte gMapData_FourIsland_LoreleisHouse @ 0x82D7418 + .4byte gMapEvents_FourIsland_LoreleisHouse @ 0x83BED5C + .4byte gMapScripts_FourIsland_LoreleisHouse @ 0x8171C4E + .4byte NULL + .2byte BGM_FRLG_ISLAND_FOUR + .2byte 30 + .byte 0x92, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 FourIsland_Harbor:: @ 8351DF0 - .incbin "baserom.gba", 0x351DF0, 0x1C + .4byte gMapData_FourIsland_Harbor @ 0x8343FB8 + .4byte gMapEvents_FourIsland_Harbor @ 0x83BEDA8 + .4byte gMapScripts_FourIsland_Harbor @ 0x8171C98 + .4byte NULL + .2byte BGM_FRLG_ISLAND_FOUR + .2byte 315 + .byte 0x92, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 FourIsland_House2:: @ 8351E0C - .incbin "baserom.gba", 0x351E0C, 0x1C + .4byte gMapData_FourIsland_House2 @ 0x82D5CB8 + .4byte gMapEvents_FourIsland_House2 @ 0x83BEDDC + .4byte gMapScripts_FourIsland_House2 @ 0x8171CAC + .4byte NULL + .2byte BGM_FRLG_ISLAND_FOUR + .2byte 11 + .byte 0x92, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 FourIsland_Mart:: @ 8351E28 - .incbin "baserom.gba", 0x351E28, 0x1C + .4byte gMapData_FourIsland_Mart @ 0x82D5BCC + .4byte gMapEvents_FourIsland_Mart @ 0x83BEE40 + .4byte gMapScripts_FourIsland_Mart @ 0x8171CAD + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 10 + .byte 0x92, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 FiveIsland_PokemonCenter_1F:: @ 8351E44 - .incbin "baserom.gba", 0x351E44, 0x1C + .4byte gMapData_FiveIsland_PokemonCenter_1F @ 0x82D5990 + .4byte gMapEvents_FiveIsland_PokemonCenter_1F @ 0x83BEEDC + .4byte gMapScripts_FiveIsland_PokemonCenter_1F @ 0x8171CF1 + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 8 + .byte 0x93, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 FiveIsland_PokemonCenter_2F:: @ 8351E60 - .incbin "baserom.gba", 0x351E60, 0x1C + .4byte gMapData_FiveIsland_PokemonCenter_2F @ 0x82D5AE0 + .4byte gMapEvents_FiveIsland_PokemonCenter_2F @ 0x83BEF68 + .4byte gMapScripts_FiveIsland_PokemonCenter_2F @ 0x8171D1B + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 9 + .byte 0x93, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 FiveIsland_Harbor:: @ 8351E7C - .incbin "baserom.gba", 0x351E7C, 0x1C + .4byte gMapData_FiveIsland_Harbor @ 0x8343FB8 + .4byte gMapEvents_FiveIsland_Harbor @ 0x83BEFB4 + .4byte gMapScripts_FiveIsland_Harbor @ 0x8171D42 + .4byte NULL + .2byte BGM_FRLG_ISLAND_FOUR + .2byte 315 + .byte 0x93, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 FiveIsland_House1:: @ 8351E98 - .incbin "baserom.gba", 0x351E98, 0x1C + .4byte gMapData_FiveIsland_House1 @ 0x82D5CB8 + .4byte gMapEvents_FiveIsland_House1 @ 0x83BEFE8 + .4byte gMapScripts_FiveIsland_House1 @ 0x8171D56 + .4byte NULL + .2byte BGM_FRLG_ISLAND_FOUR + .2byte 11 + .byte 0x93, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 FiveIsland_House2:: @ 8351EB4 - .incbin "baserom.gba", 0x351EB4, 0x1C + .4byte gMapData_FiveIsland_House2 @ 0x82D5CB8 + .4byte gMapEvents_FiveIsland_House2 @ 0x83BF01C + .4byte gMapScripts_FiveIsland_House2 @ 0x8171D60 + .4byte NULL + .2byte BGM_FRLG_ISLAND_FOUR + .2byte 11 + .byte 0x93, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 SixIsland_PokemonCenter_1F:: @ 8351ED0 - .incbin "baserom.gba", 0x351ED0, 0x1C + .4byte gMapData_SixIsland_PokemonCenter_1F @ 0x82D5990 + .4byte gMapEvents_SixIsland_PokemonCenter_1F @ 0x83BF0A0 + .4byte gMapScripts_SixIsland_PokemonCenter_1F @ 0x8171D6A + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 8 + .byte 0x95, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 SixIsland_PokemonCenter_2F:: @ 8351EEC - .incbin "baserom.gba", 0x351EEC, 0x1C + .4byte gMapData_SixIsland_PokemonCenter_2F @ 0x82D5AE0 + .4byte gMapEvents_SixIsland_PokemonCenter_2F @ 0x83BF12C + .4byte gMapScripts_SixIsland_PokemonCenter_2F @ 0x8171E20 + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 9 + .byte 0x95, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 SixIsland_Harbor:: @ 8351F08 - .incbin "baserom.gba", 0x351F08, 0x1C + .4byte gMapData_SixIsland_Harbor @ 0x8343FB8 + .4byte gMapEvents_SixIsland_Harbor @ 0x83BF178 + .4byte gMapScripts_SixIsland_Harbor @ 0x8171E47 + .4byte NULL + .2byte BGM_FRLG_ISLAND_SIX + .2byte 315 + .byte 0x95, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 SixIsland_House:: @ 8351F24 - .incbin "baserom.gba", 0x351F24, 0x1C + .4byte gMapData_SixIsland_House @ 0x82D5CB8 + .4byte gMapEvents_SixIsland_House @ 0x83BF1AC + .4byte gMapScripts_SixIsland_House @ 0x8171E5B + .4byte NULL + .2byte BGM_FRLG_ISLAND_SIX + .2byte 11 + .byte 0x95, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 SixIsland_Mart:: @ 8351F40 - .incbin "baserom.gba", 0x351F40, 0x1C + .4byte gMapData_SixIsland_Mart @ 0x82D5BCC + .4byte gMapEvents_SixIsland_Mart @ 0x83BF210 + .4byte gMapScripts_SixIsland_Mart @ 0x8171E65 + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 10 + .byte 0x95, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 ThreeIsland_Harbor:: @ 8351F5C - .incbin "baserom.gba", 0x351F5C, 0x1C + .4byte gMapData_ThreeIsland_Harbor @ 0x8343FB8 + .4byte gMapEvents_ThreeIsland_Harbor @ 0x83BF25C + .4byte gMapScripts_ThreeIsland_Harbor @ 0x8171EA9 + .4byte NULL + .2byte BGM_FRLG_ISLAND_ONE + .2byte 315 + .byte 0x9a, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 FiveIsland_ResortGorgeous_House:: @ 8351F78 - .incbin "baserom.gba", 0x351F78, 0x1C + .4byte gMapData_FiveIsland_ResortGorgeous_House @ 0x82D657C + .4byte gMapEvents_FiveIsland_ResortGorgeous_House @ 0x83BF2C0 + .4byte gMapScripts_FiveIsland_ResortGorgeous_House @ 0x8171EBD + .4byte NULL + .2byte BGM_FRLG_ISLAND_FOUR + .2byte 17 + .byte 0x9f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 TwoIsland_CapeBrink_House:: @ 8351F94 - .incbin "baserom.gba", 0x351F94, 0x1C + .4byte gMapData_TwoIsland_CapeBrink_House @ 0x82D5CB8 + .4byte gMapEvents_TwoIsland_CapeBrink_House @ 0x83BF2F4 + .4byte gMapScripts_TwoIsland_CapeBrink_House @ 0x817206B + .4byte NULL + .2byte BGM_FRLG_ISLAND_ONE + .2byte 11 + .byte 0x98, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 SixIsland_WaterPath_House1:: @ 8351FB0 - .incbin "baserom.gba", 0x351FB0, 0x1C + .4byte gMapData_SixIsland_WaterPath_House1 @ 0x82D6070 + .4byte gMapEvents_SixIsland_WaterPath_House1 @ 0x83BF334 + .4byte gMapScripts_SixIsland_WaterPath_House1 @ 0x817206C + .4byte NULL + .2byte BGM_FRLG_CERULEAN_CITY + .2byte 13 + .byte 0xa5, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 SixIsland_WaterPath_House2:: @ 8351FCC - .incbin "baserom.gba", 0x351FCC, 0x1C + .4byte gMapData_SixIsland_WaterPath_House2 @ 0x82D5CB8 + .4byte gMapEvents_SixIsland_WaterPath_House2 @ 0x83BF368 + .4byte gMapScripts_SixIsland_WaterPath_House2 @ 0x8172178 + .4byte NULL + .2byte BGM_FRLG_CERULEAN_CITY + .2byte 11 + .byte 0xa5, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 SevenIsland_SevaultCanyon_House:: @ 8351FE8 - .incbin "baserom.gba", 0x351FE8, 0x1C + .4byte gMapData_SevenIsland_SevaultCanyon_House @ 0x82D5CB8 + .4byte gMapEvents_SevenIsland_SevaultCanyon_House @ 0x83BF3CC + .4byte gMapScripts_SevenIsland_SevaultCanyon_House @ 0x8172182 + .4byte NULL + .2byte BGM_FRLG_ISLAND_SIX + .2byte 11 + .byte 0xa9, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 gMapGroup_00:: @ 8352004 .4byte UnknownMap_00_00 -- cgit v1.2.3 From ca4cd0bd633c618eb5c6d4e11b6c82afed8e9b1c Mon Sep 17 00:00:00 2001 From: garak Date: Mon, 15 Apr 2019 10:58:29 -0400 Subject: consolidate shared layout names --- data/maps/groups.inc | 850 +++++++++++++++++++++++++-------------------------- 1 file changed, 425 insertions(+), 425 deletions(-) (limited to 'data/maps') diff --git a/data/maps/groups.inc b/data/maps/groups.inc index d96d28329..c771d4044 100644 --- a/data/maps/groups.inc +++ b/data/maps/groups.inc @@ -1,5 +1,5 @@ UnknownMap_00_00:: @ 834F188 - .4byte gMapData_UnknownMap_00_00 @ 0x82D89E8 + .4byte UnknownMap_00_00_Layout @ 0x82D89E8 .4byte gMapEvents_UnknownMap_00_00 @ 0x83AE0DC .4byte gMapScripts_UnknownMap_00_00 @ 0x8160478 .4byte NULL @@ -8,7 +8,7 @@ UnknownMap_00_00:: @ 834F188 .byte 0xc4, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08 UnknownMap_00_01:: @ 834F1A4 - .4byte gMapData_UnknownMap_00_01 @ 0x82D8AE4 + .4byte UnknownMap_00_01_Layout @ 0x82D8AE4 .4byte gMapEvents_UnknownMap_00_01 @ 0x83AE138 .4byte gMapScripts_UnknownMap_00_01 @ 0x8160479 .4byte NULL @@ -17,7 +17,7 @@ UnknownMap_00_01:: @ 834F1A4 .byte 0xc4, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 UnknownMap_00_02:: @ 834F1C0 - .4byte gMapData_UnknownMap_00_02 @ 0x82D8C98 + .4byte UnknownMap_00_02_Layout @ 0x82D8C98 .4byte gMapEvents_UnknownMap_00_02 @ 0x83AE1C4 .4byte gMapScripts_UnknownMap_00_02 @ 0x816047A .4byte NULL @@ -26,7 +26,7 @@ UnknownMap_00_02:: @ 834F1C0 .byte 0xc4, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 UnknownMap_00_03:: @ 834F1DC - .4byte gMapData_UnknownMap_00_03 @ 0x82D8DB8 + .4byte UnknownMap_00_03_Layout @ 0x82D8DB8 .4byte gMapEvents_UnknownMap_00_03 @ 0x83AE238 .4byte gMapScripts_UnknownMap_00_03 @ 0x816047B .4byte NULL @@ -35,7 +35,7 @@ UnknownMap_00_03:: @ 834F1DC .byte 0xc4, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08 UnknownMap_00_04:: @ 834F1F8 - .4byte gMapData_UnknownMap_00_04 @ 0x83388C4 + .4byte UnknownMap_00_04_Layout @ 0x83388C4 .4byte gMapEvents_UnknownMap_00_04 @ 0x83AE32C .4byte gMapScripts_UnknownMap_00_04 @ 0x816047C .4byte NULL @@ -44,7 +44,7 @@ UnknownMap_00_04:: @ 834F1F8 .byte 0xc4, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08 ViridianForest:: @ 834F214 - .4byte gMapData_ViridianForest @ 0x82FE46C + .4byte ViridianForest_Layout @ 0x82FE46C .4byte gMapEvents_ViridianForest @ 0x83AE4D8 .4byte gMapScripts_ViridianForest @ 0x816051F .4byte NULL @@ -53,7 +53,7 @@ ViridianForest:: @ 834F214 .byte 0x7e, 0x00, 0x0b, 0x03, 0x01, 0x07, 0x00, 0x00 MtMoon_1F:: @ 834F230 - .4byte gMapData_MtMoon_1F @ 0x82FA890 + .4byte MtMoon_1F_Layout @ 0x82FA890 .4byte gMapEvents_MtMoon_1F @ 0x83AE668 .4byte gMapScripts_MtMoon_1F @ 0x81605E4 .4byte NULL @@ -62,7 +62,7 @@ MtMoon_1F:: @ 834F230 .byte 0x7f, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 MtMoon_B1F:: @ 834F24C - .4byte gMapData_MtMoon_B1F @ 0x82FB804 + .4byte MtMoon_B1F_Layout @ 0x82FB804 .4byte gMapEvents_MtMoon_B1F @ 0x83AE704 .4byte gMapScripts_MtMoon_B1F @ 0x8160698 .4byte NULL @@ -71,7 +71,7 @@ MtMoon_B1F:: @ 834F24C .byte 0x7f, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 MtMoon_B2F:: @ 834F268 - .4byte gMapData_MtMoon_B2F @ 0x82FC728 + .4byte MtMoon_B2F_Layout @ 0x82FC728 .4byte gMapEvents_MtMoon_B2F @ 0x83AE868 .4byte gMapScripts_MtMoon_B2F @ 0x8160699 .4byte NULL @@ -80,7 +80,7 @@ MtMoon_B2F:: @ 834F268 .byte 0x7f, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 SSAnne_Exterior:: @ 834F284 - .4byte gMapData_SSAnne_Exterior @ 0x82FF610 + .4byte SSAnne_Exterior_Layout @ 0x82FF610 .4byte gMapEvents_SSAnne_Exterior @ 0x83AE8C8 .4byte gMapScripts_SSAnne_Exterior @ 0x8160840 .4byte NULL @@ -89,7 +89,7 @@ SSAnne_Exterior:: @ 834F284 .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 SSAnne_1F_Corridor:: @ 834F2A0 - .4byte gMapData_SSAnne_1F_Corridor @ 0x82FFB4C + .4byte SSAnne_1F_Corridor_Layout @ 0x82FFB4C .4byte gMapEvents_SSAnne_1F_Corridor @ 0x83AE974 .4byte gMapScripts_SSAnne_1F_Corridor @ 0x81608CB .4byte NULL @@ -98,7 +98,7 @@ SSAnne_1F_Corridor:: @ 834F2A0 .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 SSAnne_2F_Corridor:: @ 834F2BC - .4byte gMapData_SSAnne_2F_Corridor @ 0x82FFFB0 + .4byte SSAnne_2F_Corridor_Layout @ 0x82FFFB0 .4byte gMapEvents_SSAnne_2F_Corridor @ 0x83AEA30 .4byte gMapScripts_SSAnne_2F_Corridor @ 0x81608DE .4byte NULL @@ -107,7 +107,7 @@ SSAnne_2F_Corridor:: @ 834F2BC .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 SSAnne_3F_Corridor:: @ 834F2D8 - .4byte gMapData_SSAnne_3F_Corridor @ 0x8300108 + .4byte SSAnne_3F_Corridor_Layout @ 0x8300108 .4byte gMapEvents_SSAnne_3F_Corridor @ 0x83AEA74 .4byte gMapScripts_SSAnne_3F_Corridor @ 0x8160A5D .4byte NULL @@ -116,7 +116,7 @@ SSAnne_3F_Corridor:: @ 834F2D8 .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 SSAnne_B1F_Corridor:: @ 834F2F4 - .4byte gMapData_SSAnne_B1F_Corridor @ 0x8300270 + .4byte SSAnne_B1F_Corridor_Layout @ 0x8300270 .4byte gMapEvents_SSAnne_B1F_Corridor @ 0x83AEAC4 .4byte gMapScripts_SSAnne_B1F_Corridor @ 0x8160A67 .4byte NULL @@ -125,7 +125,7 @@ SSAnne_B1F_Corridor:: @ 834F2F4 .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 SSAnne_Deck:: @ 834F310 - .4byte gMapData_SSAnne_Deck @ 0x8300624 + .4byte SSAnne_Deck_Layout @ 0x8300624 .4byte gMapEvents_SSAnne_Deck @ 0x83AEB60 .4byte gMapScripts_SSAnne_Deck @ 0x8160A68 .4byte NULL @@ -134,7 +134,7 @@ SSAnne_Deck:: @ 834F310 .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 SSAnne_Kitchen:: @ 834F32C - .4byte gMapData_SSAnne_Kitchen @ 0x8319214 + .4byte SSAnne_Kitchen_Layout @ 0x8319214 .4byte gMapEvents_SSAnne_Kitchen @ 0x83AEC60 .4byte gMapScripts_SSAnne_Kitchen @ 0x8160AB2 .4byte NULL @@ -143,7 +143,7 @@ SSAnne_Kitchen:: @ 834F32C .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 SSAnne_CaptainsOffice:: @ 834F348 - .4byte gMapData_SSAnne_CaptainsOffice @ 0x83192EC + .4byte SSAnne_CaptainsOffice_Layout @ 0x83192EC .4byte gMapEvents_SSAnne_CaptainsOffice @ 0x83AECB8 .4byte gMapScripts_SSAnne_CaptainsOffice @ 0x8160B39 .4byte NULL @@ -152,7 +152,7 @@ SSAnne_CaptainsOffice:: @ 834F348 .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 SSAnne_1F_Room1:: @ 834F364 - .4byte gMapData_SSAnne_1F_Room1 @ 0x8319E74 + .4byte SSAnne_Room1_Layout @ 0x8319E74 .4byte gMapEvents_SSAnne_1F_Room1 @ 0x83AECEC .4byte gMapScripts_SSAnne_1F_Room1 @ 0x8160BDB .4byte NULL @@ -161,7 +161,7 @@ SSAnne_1F_Room1:: @ 834F364 .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 SSAnne_1F_Room2:: @ 834F380 - .4byte gMapData_SSAnne_1F_Room2 @ 0x8319E74 + .4byte SSAnne_Room1_Layout @ 0x8319E74 .4byte gMapEvents_SSAnne_1F_Room2 @ 0x83AED68 .4byte gMapScripts_SSAnne_1F_Room2 @ 0x8160BE5 .4byte NULL @@ -170,7 +170,7 @@ SSAnne_1F_Room2:: @ 834F380 .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 SSAnne_1F_Room3:: @ 834F39C - .4byte gMapData_SSAnne_1F_Room3 @ 0x8319E74 + .4byte SSAnne_Room1_Layout @ 0x8319E74 .4byte gMapEvents_SSAnne_1F_Room3 @ 0x83AEDCC .4byte gMapScripts_SSAnne_1F_Room3 @ 0x8160C1D .4byte NULL @@ -179,7 +179,7 @@ SSAnne_1F_Room3:: @ 834F39C .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 SSAnne_1F_Room4:: @ 834F3B8 - .4byte gMapData_SSAnne_1F_Room4 @ 0x8319E74 + .4byte SSAnne_Room1_Layout @ 0x8319E74 .4byte gMapEvents_SSAnne_1F_Room4 @ 0x83AEE00 .4byte gMapScripts_SSAnne_1F_Room4 @ 0x8160C43 .4byte NULL @@ -188,7 +188,7 @@ SSAnne_1F_Room4:: @ 834F3B8 .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 SSAnne_1F_Room5:: @ 834F3D4 - .4byte gMapData_SSAnne_1F_Room5 @ 0x8319E74 + .4byte SSAnne_Room1_Layout @ 0x8319E74 .4byte gMapEvents_SSAnne_1F_Room5 @ 0x83AEE34 .4byte gMapScripts_SSAnne_1F_Room5 @ 0x8160C66 .4byte NULL @@ -197,7 +197,7 @@ SSAnne_1F_Room5:: @ 834F3D4 .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 SSAnne_1F_Room7:: @ 834F3F0 - .4byte gMapData_SSAnne_1F_Room7 @ 0x8319E74 + .4byte SSAnne_Room1_Layout @ 0x8319E74 .4byte gMapEvents_SSAnne_1F_Room7 @ 0x83AEE68 .4byte gMapScripts_SSAnne_1F_Room7 @ 0x8160C7E .4byte NULL @@ -206,7 +206,7 @@ SSAnne_1F_Room7:: @ 834F3F0 .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 SSAnne_2F_Room1:: @ 834F40C - .4byte gMapData_SSAnne_2F_Room1 @ 0x8319F04 + .4byte SSAnne_Room2_Layout @ 0x8319F04 .4byte gMapEvents_SSAnne_2F_Room1 @ 0x83AEE9C .4byte gMapScripts_SSAnne_2F_Room1 @ 0x8160C96 .4byte NULL @@ -215,7 +215,7 @@ SSAnne_2F_Room1:: @ 834F40C .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 SSAnne_2F_Room2:: @ 834F428 - .4byte gMapData_SSAnne_2F_Room2 @ 0x8319F04 + .4byte SSAnne_Room2_Layout @ 0x8319F04 .4byte gMapEvents_SSAnne_2F_Room2 @ 0x83AEF00 .4byte gMapScripts_SSAnne_2F_Room2 @ 0x8160CB0 .4byte NULL @@ -224,7 +224,7 @@ SSAnne_2F_Room2:: @ 834F428 .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 SSAnne_2F_Room3:: @ 834F444 - .4byte gMapData_SSAnne_2F_Room3 @ 0x8319F04 + .4byte SSAnne_Room2_Layout @ 0x8319F04 .4byte gMapEvents_SSAnne_2F_Room3 @ 0x83AEF4C .4byte gMapScripts_SSAnne_2F_Room3 @ 0x8160CDF .4byte NULL @@ -233,7 +233,7 @@ SSAnne_2F_Room3:: @ 834F444 .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 SSAnne_2F_Room4:: @ 834F460 - .4byte gMapData_SSAnne_2F_Room4 @ 0x8319F04 + .4byte SSAnne_Room2_Layout @ 0x8319F04 .4byte gMapEvents_SSAnne_2F_Room4 @ 0x83AEFB0 .4byte gMapScripts_SSAnne_2F_Room4 @ 0x8160CF2 .4byte NULL @@ -242,7 +242,7 @@ SSAnne_2F_Room4:: @ 834F460 .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 SSAnne_2F_Room5:: @ 834F47C - .4byte gMapData_SSAnne_2F_Room5 @ 0x8319F04 + .4byte SSAnne_Room2_Layout @ 0x8319F04 .4byte gMapEvents_SSAnne_2F_Room5 @ 0x83AEFFC .4byte gMapScripts_SSAnne_2F_Room5 @ 0x8160D21 .4byte NULL @@ -251,7 +251,7 @@ SSAnne_2F_Room5:: @ 834F47C .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 SSAnne_2F_Room6:: @ 834F498 - .4byte gMapData_SSAnne_2F_Room6 @ 0x8319F04 + .4byte SSAnne_Room2_Layout @ 0x8319F04 .4byte gMapEvents_SSAnne_2F_Room6 @ 0x83AF048 .4byte gMapScripts_SSAnne_2F_Room6 @ 0x8160D34 .4byte NULL @@ -260,7 +260,7 @@ SSAnne_2F_Room6:: @ 834F498 .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 SSAnne_B1F_Room1:: @ 834F4B4 - .4byte gMapData_SSAnne_B1F_Room1 @ 0x8319F04 + .4byte SSAnne_Room2_Layout @ 0x8319F04 .4byte gMapEvents_SSAnne_B1F_Room1 @ 0x83AF094 .4byte gMapScripts_SSAnne_B1F_Room1 @ 0x8160D47 .4byte NULL @@ -269,7 +269,7 @@ SSAnne_B1F_Room1:: @ 834F4B4 .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 SSAnne_B1F_Room2:: @ 834F4D0 - .4byte gMapData_SSAnne_B1F_Room2 @ 0x8319F04 + .4byte SSAnne_Room2_Layout @ 0x8319F04 .4byte gMapEvents_SSAnne_B1F_Room2 @ 0x83AF0E0 .4byte gMapScripts_SSAnne_B1F_Room2 @ 0x8160D76 .4byte NULL @@ -278,7 +278,7 @@ SSAnne_B1F_Room2:: @ 834F4D0 .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 SSAnne_B1F_Room3:: @ 834F4EC - .4byte gMapData_SSAnne_B1F_Room3 @ 0x8319F04 + .4byte SSAnne_Room2_Layout @ 0x8319F04 .4byte gMapEvents_SSAnne_B1F_Room3 @ 0x83AF12C .4byte gMapScripts_SSAnne_B1F_Room3 @ 0x8160D8E .4byte NULL @@ -287,7 +287,7 @@ SSAnne_B1F_Room3:: @ 834F4EC .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 SSAnne_B1F_Room4:: @ 834F508 - .4byte gMapData_SSAnne_B1F_Room4 @ 0x8319F04 + .4byte SSAnne_Room2_Layout @ 0x8319F04 .4byte gMapEvents_SSAnne_B1F_Room4 @ 0x83AF178 .4byte gMapScripts_SSAnne_B1F_Room4 @ 0x8160DA6 .4byte NULL @@ -296,7 +296,7 @@ SSAnne_B1F_Room4:: @ 834F508 .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 SSAnne_B1F_Room5:: @ 834F524 - .4byte gMapData_SSAnne_B1F_Room5 @ 0x8319F04 + .4byte SSAnne_Room2_Layout @ 0x8319F04 .4byte gMapEvents_SSAnne_B1F_Room5 @ 0x83AF1DC .4byte gMapScripts_SSAnne_B1F_Room5 @ 0x8160DD5 .4byte NULL @@ -305,7 +305,7 @@ SSAnne_B1F_Room5:: @ 834F524 .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 SSAnne_1F_Room6:: @ 834F540 - .4byte gMapData_SSAnne_1F_Room6 @ 0x8319E74 + .4byte SSAnne_Room1_Layout @ 0x8319E74 .4byte gMapEvents_SSAnne_1F_Room6 @ 0x83AF210 .4byte gMapScripts_SSAnne_1F_Room6 @ 0x8160DF2 .4byte NULL @@ -314,7 +314,7 @@ SSAnne_1F_Room6:: @ 834F540 .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 UndergroundPath_NorthEntrance:: @ 834F55C - .4byte gMapData_UndergroundPath_NorthEntrance @ 0x8319414 + .4byte UndergroundPath_Entrance_Layout @ 0x8319414 .4byte gMapEvents_UndergroundPath_NorthEntrance @ 0x83AF25C .4byte gMapScripts_UndergroundPath_NorthEntrance @ 0x8160E38 .4byte NULL @@ -323,7 +323,7 @@ UndergroundPath_NorthEntrance:: @ 834F55C .byte 0x81, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 UndergroundPath_NorthSouthTunnel:: @ 834F578 - .4byte gMapData_UndergroundPath_NorthSouthTunnel @ 0x8319CAC + .4byte UndergroundPath_NorthSouthTunnel_Layout @ 0x8319CAC .4byte gMapEvents_UndergroundPath_NorthSouthTunnel @ 0x83AF2D4 .4byte gMapScripts_UndergroundPath_NorthSouthTunnel @ 0x8160EB5 .4byte NULL @@ -332,7 +332,7 @@ UndergroundPath_NorthSouthTunnel:: @ 834F578 .byte 0x81, 0x00, 0x00, 0x08, 0x01, 0x06, 0x00, 0x00 UndergroundPath_SouthEntrance:: @ 834F594 - .4byte gMapData_UndergroundPath_SouthEntrance @ 0x8319414 + .4byte UndergroundPath_Entrance_Layout @ 0x8319414 .4byte gMapEvents_UndergroundPath_SouthEntrance @ 0x83AF320 .4byte gMapScripts_UndergroundPath_SouthEntrance @ 0x8160EBF .4byte NULL @@ -341,7 +341,7 @@ UndergroundPath_SouthEntrance:: @ 834F594 .byte 0x81, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 UndergroundPath_WestEntrance:: @ 834F5B0 - .4byte gMapData_UndergroundPath_WestEntrance @ 0x8319414 + .4byte UndergroundPath_Entrance_Layout @ 0x8319414 .4byte gMapEvents_UndergroundPath_WestEntrance @ 0x83AF36C .4byte gMapScripts_UndergroundPath_WestEntrance @ 0x8160EC9 .4byte NULL @@ -350,7 +350,7 @@ UndergroundPath_WestEntrance:: @ 834F5B0 .byte 0x82, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 UndergroundPath_EastWestTunnel:: @ 834F5CC - .4byte gMapData_UndergroundPath_EastWestTunnel @ 0x8319898 + .4byte UndergroundPath_EastWestTunnel_Layout @ 0x8319898 .4byte gMapEvents_UndergroundPath_EastWestTunnel @ 0x83AF3E4 .4byte gMapScripts_UndergroundPath_EastWestTunnel @ 0x8160ED3 .4byte NULL @@ -359,7 +359,7 @@ UndergroundPath_EastWestTunnel:: @ 834F5CC .byte 0x82, 0x00, 0x00, 0x08, 0x01, 0x06, 0x00, 0x00 UndergroundPath_EastEntrance:: @ 834F5E8 - .4byte gMapData_UndergroundPath_EastEntrance @ 0x8319414 + .4byte UndergroundPath_Entrance_Layout @ 0x8319414 .4byte gMapEvents_UndergroundPath_EastEntrance @ 0x83AF430 .4byte gMapScripts_UndergroundPath_EastEntrance @ 0x8160EDD .4byte NULL @@ -368,7 +368,7 @@ UndergroundPath_EastEntrance:: @ 834F5E8 .byte 0x82, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 DiglettsCave_NorthEntrance:: @ 834F604 - .4byte gMapData_DiglettsCave_NorthEntrance @ 0x831EB94 + .4byte DiglettsCave_NorthEntrance_Layout @ 0x831EB94 .4byte gMapEvents_DiglettsCave_NorthEntrance @ 0x83AF46C .4byte gMapScripts_DiglettsCave_NorthEntrance @ 0x8160EE7 .4byte NULL @@ -377,7 +377,7 @@ DiglettsCave_NorthEntrance:: @ 834F604 .byte 0x83, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 DiglettsCave_B1F:: @ 834F620 - .4byte gMapData_DiglettsCave_B1F @ 0x8303B68 + .4byte DiglettsCave_B1F_Layout @ 0x8303B68 .4byte gMapEvents_DiglettsCave_B1F @ 0x83AF490 .4byte gMapScripts_DiglettsCave_B1F @ 0x8160EF1 .4byte NULL @@ -386,7 +386,7 @@ DiglettsCave_B1F:: @ 834F620 .byte 0x83, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 DiglettsCave_SouthEntrance:: @ 834F63C - .4byte gMapData_DiglettsCave_SouthEntrance @ 0x831EC58 + .4byte DiglettsCave_SouthEntrance_Layout @ 0x831EC58 .4byte gMapEvents_DiglettsCave_SouthEntrance @ 0x83AF4CC .4byte gMapScripts_DiglettsCave_SouthEntrance @ 0x8160EFB .4byte NULL @@ -395,7 +395,7 @@ DiglettsCave_SouthEntrance:: @ 834F63C .byte 0x83, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 VictoryRoad_1F:: @ 834F658 - .4byte gMapData_VictoryRoad_1F @ 0x83043CC + .4byte VictoryRoad_1F_Layout @ 0x83043CC .4byte gMapEvents_VictoryRoad_1F @ 0x83AF5C0 .4byte gMapScripts_VictoryRoad_1F @ 0x8160F05 .4byte NULL @@ -404,7 +404,7 @@ VictoryRoad_1F:: @ 834F658 .byte 0x84, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 VictoryRoad_2F:: @ 834F674 - .4byte gMapData_VictoryRoad_2F @ 0x8304CB4 + .4byte VictoryRoad_2F_Layout @ 0x8304CB4 .4byte gMapEvents_VictoryRoad_2F @ 0x83AF774 .4byte gMapScripts_VictoryRoad_2F @ 0x8160F92 .4byte NULL @@ -413,7 +413,7 @@ VictoryRoad_2F:: @ 834F674 .byte 0x84, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 VictoryRoad_3F:: @ 834F690 - .4byte gMapData_VictoryRoad_3F @ 0x8305494 + .4byte VictoryRoad_3F_Layout @ 0x8305494 .4byte gMapEvents_VictoryRoad_3F @ 0x83AF8E0 .4byte gMapScripts_VictoryRoad_3F @ 0x81610AA .4byte NULL @@ -422,7 +422,7 @@ VictoryRoad_3F:: @ 834F690 .byte 0x84, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 RocketHideout_B1F:: @ 834F6AC - .4byte gMapData_RocketHideout_B1F @ 0x8305C28 + .4byte RocketHideout_B1F_Layout @ 0x8305C28 .4byte gMapEvents_RocketHideout_B1F @ 0x83AF9D8 .4byte gMapScripts_RocketHideout_B1F @ 0x8161195 .4byte NULL @@ -431,7 +431,7 @@ RocketHideout_B1F:: @ 834F6AC .byte 0x85, 0x00, 0x00, 0x08, 0x00, 0x07, 0xff, 0x03 RocketHideout_B2F:: @ 834F6C8 - .4byte gMapData_RocketHideout_B2F @ 0x83061CC + .4byte RocketHideout_B2F_Layout @ 0x83061CC .4byte gMapEvents_RocketHideout_B2F @ 0x83AFA8C .4byte gMapScripts_RocketHideout_B2F @ 0x81612A1 .4byte NULL @@ -440,7 +440,7 @@ RocketHideout_B2F:: @ 834F6C8 .byte 0x85, 0x00, 0x00, 0x08, 0x00, 0x07, 0xfe, 0x03 RocketHideout_B3F:: @ 834F6E4 - .4byte gMapData_RocketHideout_B3F @ 0x8306694 + .4byte RocketHideout_B3F_Layout @ 0x8306694 .4byte gMapEvents_RocketHideout_B3F @ 0x83AFB34 .4byte gMapScripts_RocketHideout_B3F @ 0x81612B9 .4byte NULL @@ -449,7 +449,7 @@ RocketHideout_B3F:: @ 834F6E4 .byte 0x85, 0x00, 0x00, 0x08, 0x00, 0x07, 0xfd, 0x03 RocketHideout_B4F:: @ 834F700 - .4byte gMapData_RocketHideout_B4F @ 0x8306B98 + .4byte RocketHideout_B4F_Layout @ 0x8306B98 .4byte gMapEvents_RocketHideout_B4F @ 0x83AFC50 .4byte gMapScripts_RocketHideout_B4F @ 0x81612E8 .4byte NULL @@ -458,7 +458,7 @@ RocketHideout_B4F:: @ 834F700 .byte 0x85, 0x00, 0x00, 0x08, 0x00, 0x07, 0xfc, 0x03 RocketHideout_Elevator:: @ 834F71C - .4byte gMapData_RocketHideout_Elevator @ 0x8320EDC + .4byte RocketHideout_Elevator_Layout @ 0x8320EDC .4byte gMapEvents_RocketHideout_Elevator @ 0x83AFC80 .4byte gMapScripts_RocketHideout_Elevator @ 0x81614D8 .4byte NULL @@ -467,7 +467,7 @@ RocketHideout_Elevator:: @ 834F71C .byte 0x85, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x03 SilphCo_1F:: @ 834F738 - .4byte gMapData_SilphCo_1F @ 0x83071EC + .4byte SilphCo_1F_Layout @ 0x83071EC .4byte gMapEvents_SilphCo_1F @ 0x83AFCE0 .4byte gMapScripts_SilphCo_1F @ 0x8161625 .4byte NULL @@ -476,7 +476,7 @@ SilphCo_1F:: @ 834F738 .byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x07, 0x01, 0x00 SilphCo_2F:: @ 834F754 - .4byte gMapData_SilphCo_2F @ 0x8307840 + .4byte SilphCo_2F_Layout @ 0x8307840 .4byte gMapEvents_SilphCo_2F @ 0x83AFE1C .4byte gMapScripts_SilphCo_2F @ 0x8161641 .4byte NULL @@ -485,7 +485,7 @@ SilphCo_2F:: @ 834F754 .byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x07, 0x02, 0x00 SilphCo_3F:: @ 834F770 - .4byte gMapData_SilphCo_3F @ 0x8307E94 + .4byte SilphCo_3F_Layout @ 0x8307E94 .4byte gMapEvents_SilphCo_3F @ 0x83AFF58 .4byte gMapScripts_SilphCo_3F @ 0x81616C5 .4byte NULL @@ -494,7 +494,7 @@ SilphCo_3F:: @ 834F770 .byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x07, 0x03, 0x00 SilphCo_4F:: @ 834F78C - .4byte gMapData_SilphCo_4F @ 0x83084E8 + .4byte SilphCo_4F_Layout @ 0x83084E8 .4byte gMapEvents_SilphCo_4F @ 0x83B00DC .4byte gMapScripts_SilphCo_4F @ 0x8161736 .4byte NULL @@ -503,7 +503,7 @@ SilphCo_4F:: @ 834F78C .byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x07, 0x04, 0x00 SilphCo_5F:: @ 834F7A8 - .4byte gMapData_SilphCo_5F @ 0x8308B3C + .4byte SilphCo_5F_Layout @ 0x8308B3C .4byte gMapEvents_SilphCo_5F @ 0x83B02D8 .4byte gMapScripts_SilphCo_5F @ 0x81617BE .4byte NULL @@ -512,7 +512,7 @@ SilphCo_5F:: @ 834F7A8 .byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x07, 0x05, 0x00 SilphCo_6F:: @ 834F7C4 - .4byte gMapData_SilphCo_6F @ 0x8308FFC + .4byte SilphCo_6F_Layout @ 0x8308FFC .4byte gMapEvents_SilphCo_6F @ 0x83B044C .4byte gMapScripts_SilphCo_6F @ 0x8161881 .4byte NULL @@ -521,7 +521,7 @@ SilphCo_6F:: @ 834F7C4 .byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x07, 0x06, 0x00 SilphCo_7F:: @ 834F7E0 - .4byte gMapData_SilphCo_7F @ 0x83094BC + .4byte SilphCo_7F_Layout @ 0x83094BC .4byte gMapEvents_SilphCo_7F @ 0x83B0660 .4byte gMapScripts_SilphCo_7F @ 0x8161984 .4byte NULL @@ -530,7 +530,7 @@ SilphCo_7F:: @ 834F7E0 .byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x07, 0x07, 0x00 SilphCo_8F:: @ 834F7FC - .4byte gMapData_SilphCo_8F @ 0x830997C + .4byte SilphCo_8F_Layout @ 0x830997C .4byte gMapEvents_SilphCo_8F @ 0x83B0784 .4byte gMapScripts_SilphCo_8F @ 0x8161C5F .4byte NULL @@ -539,7 +539,7 @@ SilphCo_8F:: @ 834F7FC .byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x07, 0x08, 0x00 SilphCo_9F:: @ 834F818 - .4byte gMapData_SilphCo_9F @ 0x8309E3C + .4byte SilphCo_9F_Layout @ 0x8309E3C .4byte gMapEvents_SilphCo_9F @ 0x83B0904 .4byte gMapScripts_SilphCo_9F @ 0x8161CDE .4byte NULL @@ -548,7 +548,7 @@ SilphCo_9F:: @ 834F818 .byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x07, 0x09, 0x00 SilphCo_10F:: @ 834F834 - .4byte gMapData_SilphCo_10F @ 0x830A0E8 + .4byte SilphCo_10F_Layout @ 0x830A0E8 .4byte gMapEvents_SilphCo_10F @ 0x83B0A20 .4byte gMapScripts_SilphCo_10F @ 0x8161D86 .4byte NULL @@ -557,7 +557,7 @@ SilphCo_10F:: @ 834F834 .byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x07, 0x0a, 0x00 SilphCo_11F:: @ 834F850 - .4byte gMapData_SilphCo_11F @ 0x830A3B4 + .4byte SilphCo_11F_Layout @ 0x830A3B4 .4byte gMapEvents_SilphCo_11F @ 0x83B0B44 .4byte gMapScripts_SilphCo_11F @ 0x8161DEE .4byte NULL @@ -566,7 +566,7 @@ SilphCo_11F:: @ 834F850 .byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x07, 0x0b, 0x00 SilphCo_Elevator:: @ 834F86C - .4byte gMapData_SilphCo_Elevator @ 0x8321330 + .4byte SilphCo_Elevator_Layout @ 0x8321330 .4byte gMapEvents_SilphCo_Elevator @ 0x83B0B6C .4byte gMapScripts_SilphCo_Elevator @ 0x8161F6E .4byte NULL @@ -575,7 +575,7 @@ SilphCo_Elevator:: @ 834F86C .byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 PokemonMansion_1F:: @ 834F888 - .4byte gMapData_PokemonMansion_1F @ 0x830AE3C + .4byte PokemonMansion_1F_Layout @ 0x830AE3C .4byte gMapEvents_PokemonMansion_1F @ 0x83B0C60 .4byte gMapScripts_PokemonMansion_1F @ 0x81621F9 .4byte NULL @@ -584,7 +584,7 @@ PokemonMansion_1F:: @ 834F888 .byte 0x87, 0x00, 0x0b, 0x08, 0x00, 0x07, 0x00, 0x03 PokemonMansion_2F:: @ 834F8A4 - .4byte gMapData_PokemonMansion_2F @ 0x830B9A8 + .4byte PokemonMansion_2F_Layout @ 0x830B9A8 .4byte gMapEvents_PokemonMansion_2F @ 0x83B0D20 .4byte gMapScripts_PokemonMansion_2F @ 0x8162254 .4byte NULL @@ -593,7 +593,7 @@ PokemonMansion_2F:: @ 834F8A4 .byte 0x87, 0x00, 0x0b, 0x08, 0x00, 0x07, 0x00, 0x03 PokemonMansion_3F:: @ 834F8C0 - .4byte gMapData_PokemonMansion_3F @ 0x830C430 + .4byte PokemonMansion_3F_Layout @ 0x830C430 .4byte gMapEvents_PokemonMansion_3F @ 0x83B0DF8 .4byte gMapScripts_PokemonMansion_3F @ 0x81622A1 .4byte NULL @@ -602,7 +602,7 @@ PokemonMansion_3F:: @ 834F8C0 .byte 0x87, 0x00, 0x0b, 0x08, 0x00, 0x07, 0x00, 0x03 PokemonMansion_B1F:: @ 834F8DC - .4byte gMapData_PokemonMansion_B1F @ 0x830CEB8 + .4byte PokemonMansion_B1F_Layout @ 0x830CEB8 .4byte gMapEvents_PokemonMansion_B1F @ 0x83B0ED4 .4byte gMapScripts_PokemonMansion_B1F @ 0x81622FC .4byte NULL @@ -611,7 +611,7 @@ PokemonMansion_B1F:: @ 834F8DC .byte 0x87, 0x00, 0x0b, 0x08, 0x00, 0x07, 0x00, 0x03 SafariZone_Center:: @ 834F8F8 - .4byte gMapData_SafariZone_Center @ 0x830DD38 + .4byte SafariZone_Center_Layout @ 0x830DD38 .4byte gMapEvents_SafariZone_Center @ 0x83B0F98 .4byte gMapScripts_SafariZone_Center @ 0x8162357 .4byte NULL @@ -620,7 +620,7 @@ SafariZone_Center:: @ 834F8F8 .byte 0x88, 0x00, 0x00, 0x03, 0x01, 0x06, 0x00, 0x00 SafariZone_East:: @ 834F914 - .4byte gMapData_SafariZone_East @ 0x830EC24 + .4byte SafariZone_East_Layout @ 0x830EC24 .4byte gMapEvents_SafariZone_East @ 0x83B1068 .4byte gMapScripts_SafariZone_East @ 0x816237C .4byte NULL @@ -629,7 +629,7 @@ SafariZone_East:: @ 834F914 .byte 0x88, 0x00, 0x00, 0x03, 0x01, 0x06, 0x00, 0x00 SafariZone_North:: @ 834F930 - .4byte gMapData_SafariZone_North @ 0x830FE1C + .4byte SafariZone_North_Layout @ 0x830FE1C .4byte gMapEvents_SafariZone_North @ 0x83B1168 .4byte gMapScripts_SafariZone_North @ 0x8162398 .4byte NULL @@ -638,7 +638,7 @@ SafariZone_North:: @ 834F930 .byte 0x88, 0x00, 0x00, 0x03, 0x01, 0x06, 0x00, 0x00 SafariZone_West:: @ 834F94C - .4byte gMapData_SafariZone_West @ 0x8310BC4 + .4byte SafariZone_West_Layout @ 0x8310BC4 .4byte gMapEvents_SafariZone_West @ 0x83B1270 .4byte gMapScripts_SafariZone_West @ 0x81623C6 .4byte NULL @@ -647,7 +647,7 @@ SafariZone_West:: @ 834F94C .byte 0x88, 0x00, 0x00, 0x03, 0x01, 0x06, 0x00, 0x00 SafariZone_Building1:: @ 834F968 - .4byte gMapData_SafariZone_Building1 @ 0x831C028 + .4byte SafariZone_Building_Layout @ 0x831C028 .4byte gMapEvents_SafariZone_Building1 @ 0x83B12CC .4byte gMapScripts_SafariZone_Building1 @ 0x81623EB .4byte NULL @@ -656,7 +656,7 @@ SafariZone_Building1:: @ 834F968 .byte 0x88, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 SafariZone_Building2:: @ 834F984 - .4byte gMapData_SafariZone_Building2 @ 0x831C028 + .4byte SafariZone_Building_Layout @ 0x831C028 .4byte gMapEvents_SafariZone_Building2 @ 0x83B1340 .4byte gMapScripts_SafariZone_Building2 @ 0x81623FE .4byte NULL @@ -665,7 +665,7 @@ SafariZone_Building2:: @ 834F984 .byte 0x88, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 SafariZone_Building3:: @ 834F9A0 - .4byte gMapData_SafariZone_Building3 @ 0x831C028 + .4byte SafariZone_Building_Layout @ 0x831C028 .4byte gMapEvents_SafariZone_Building3 @ 0x83B13CC .4byte gMapScripts_SafariZone_Building3 @ 0x816241A .4byte NULL @@ -674,7 +674,7 @@ SafariZone_Building3:: @ 834F9A0 .byte 0x88, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 SafariZone_Building4:: @ 834F9BC - .4byte gMapData_SafariZone_Building4 @ 0x831C028 + .4byte SafariZone_Building_Layout @ 0x831C028 .4byte gMapEvents_SafariZone_Building4 @ 0x83B1440 .4byte gMapScripts_SafariZone_Building4 @ 0x8162436 .4byte NULL @@ -683,7 +683,7 @@ SafariZone_Building4:: @ 834F9BC .byte 0x88, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 SafariZone_SecretHouse:: @ 834F9D8 - .4byte gMapData_SafariZone_SecretHouse @ 0x831C16C + .4byte SafariZone_SecretHouse_Layout @ 0x831C16C .4byte gMapEvents_SafariZone_SecretHouse @ 0x83B1484 .4byte gMapScripts_SafariZone_SecretHouse @ 0x8162452 .4byte NULL @@ -692,7 +692,7 @@ SafariZone_SecretHouse:: @ 834F9D8 .byte 0x88, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 CeruleanCave_1F:: @ 834F9F4 - .4byte gMapData_CeruleanCave_1F @ 0x8311318 + .4byte CeruleanCave_1F_Layout @ 0x8311318 .4byte gMapEvents_CeruleanCave_1F @ 0x83B15BC .4byte gMapScripts_CeruleanCave_1F @ 0x81624B3 .4byte NULL @@ -701,7 +701,7 @@ CeruleanCave_1F:: @ 834F9F4 .byte 0x8d, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 CeruleanCave_2F:: @ 834FA10 - .4byte gMapData_CeruleanCave_2F @ 0x8311A6C + .4byte CeruleanCave_2F_Layout @ 0x8311A6C .4byte gMapEvents_CeruleanCave_2F @ 0x83B1738 .4byte gMapScripts_CeruleanCave_2F @ 0x81624BD .4byte NULL @@ -710,7 +710,7 @@ CeruleanCave_2F:: @ 834FA10 .byte 0x8d, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 CeruleanCave_B1F:: @ 834FA2C - .4byte gMapData_CeruleanCave_B1F @ 0x83121C0 + .4byte CeruleanCave_B1F_Layout @ 0x83121C0 .4byte gMapEvents_CeruleanCave_B1F @ 0x83B1874 .4byte gMapScripts_CeruleanCave_B1F @ 0x81624BE .4byte NULL @@ -719,7 +719,7 @@ CeruleanCave_B1F:: @ 834FA2C .byte 0x8d, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 PokemonLeague_LoreleisRoom:: @ 834FA48 - .4byte gMapData_PokemonLeague_LoreleisRoom @ 0x831F178 + .4byte PokemonLeague_LoreleisRoom_Layout @ 0x831F178 .4byte gMapEvents_PokemonLeague_LoreleisRoom @ 0x83B18B0 .4byte gMapScripts_PokemonLeague_LoreleisRoom @ 0x816256C .4byte NULL @@ -728,7 +728,7 @@ PokemonLeague_LoreleisRoom:: @ 834FA48 .byte 0x89, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x04 PokemonLeague_BrunosRoom:: @ 834FA64 - .4byte gMapData_PokemonLeague_BrunosRoom @ 0x831F2F0 + .4byte PokemonLeague_BrunosRoom_Layout @ 0x831F2F0 .4byte gMapEvents_PokemonLeague_BrunosRoom @ 0x83B18EC .4byte gMapScripts_PokemonLeague_BrunosRoom @ 0x8162685 .4byte NULL @@ -737,7 +737,7 @@ PokemonLeague_BrunosRoom:: @ 834FA64 .byte 0x89, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x05 PokemonLeague_AgathasRoom:: @ 834FA80 - .4byte gMapData_PokemonLeague_AgathasRoom @ 0x831F468 + .4byte PokemonLeague_AgathasRoom_Layout @ 0x831F468 .4byte gMapEvents_PokemonLeague_AgathasRoom @ 0x83B1928 .4byte gMapScripts_PokemonLeague_AgathasRoom @ 0x8162810 .4byte NULL @@ -746,7 +746,7 @@ PokemonLeague_AgathasRoom:: @ 834FA80 .byte 0x89, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x06 PokemonLeague_LancesRoom:: @ 834FA9C - .4byte gMapData_PokemonLeague_LancesRoom @ 0x831F9CC + .4byte PokemonLeague_LancesRoom_Layout @ 0x831F9CC .4byte gMapEvents_PokemonLeague_LancesRoom @ 0x83B1964 .4byte gMapScripts_PokemonLeague_LancesRoom @ 0x816292D .4byte NULL @@ -755,7 +755,7 @@ PokemonLeague_LancesRoom:: @ 834FA9C .byte 0x89, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x07 PokemonLeague_ChampionsRoom:: @ 834FAB8 - .4byte gMapData_PokemonLeague_ChampionsRoom @ 0x831FBF8 + .4byte PokemonLeague_ChampionsRoom_Layout @ 0x831FBF8 .4byte gMapEvents_PokemonLeague_ChampionsRoom @ 0x83B19B8 .4byte gMapScripts_PokemonLeague_ChampionsRoom @ 0x8162AE2 .4byte NULL @@ -764,7 +764,7 @@ PokemonLeague_ChampionsRoom:: @ 834FAB8 .byte 0x89, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 PokemonLeague_HallOfFame:: @ 834FAD4 - .4byte gMapData_PokemonLeague_HallOfFame @ 0x831FD3C + .4byte PokemonLeague_HallOfFame_Layout @ 0x831FD3C .4byte gMapEvents_PokemonLeague_HallOfFame @ 0x83B19EC .4byte gMapScripts_PokemonLeague_HallOfFame @ 0x8162D4C .4byte NULL @@ -773,7 +773,7 @@ PokemonLeague_HallOfFame:: @ 834FAD4 .byte 0x89, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 RockTunnel_1F:: @ 834FAF0 - .4byte gMapData_RockTunnel_1F @ 0x83130E4 + .4byte RockTunnel_1F_Layout @ 0x83130E4 .4byte gMapEvents_RockTunnel_1F @ 0x83B1B2C .4byte gMapScripts_RockTunnel_1F @ 0x8162DD6 .4byte NULL @@ -782,7 +782,7 @@ RockTunnel_1F:: @ 834FAF0 .byte 0x8a, 0x01, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 RockTunnel_B1F:: @ 834FB0C - .4byte gMapData_RockTunnel_B1F @ 0x8314008 + .4byte RockTunnel_B1F_Layout @ 0x8314008 .4byte gMapEvents_RockTunnel_B1F @ 0x83B1DD0 .4byte gMapScripts_RockTunnel_B1F @ 0x8162E8A .4byte NULL @@ -791,7 +791,7 @@ RockTunnel_B1F:: @ 834FB0C .byte 0x8a, 0x01, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 SeafoamIslands_1F:: @ 834FB28 - .4byte gMapData_SeafoamIslands_1F @ 0x831474C + .4byte SeafoamIslands_1F_Layout @ 0x831474C .4byte gMapEvents_SeafoamIslands_1F @ 0x83B1E64 .4byte gMapScripts_SeafoamIslands_1F @ 0x8162F43 .4byte NULL @@ -800,7 +800,7 @@ SeafoamIslands_1F:: @ 834FB28 .byte 0x8b, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 SeafoamIslands_B1F:: @ 834FB44 - .4byte gMapData_SeafoamIslands_B1F @ 0x8314E44 + .4byte SeafoamIslands_B1F_Layout @ 0x8314E44 .4byte gMapEvents_SeafoamIslands_B1F @ 0x83B1F30 .4byte gMapScripts_SeafoamIslands_B1F @ 0x8162F4D .4byte NULL @@ -809,7 +809,7 @@ SeafoamIslands_B1F:: @ 834FB44 .byte 0x8b, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 SeafoamIslands_B2F:: @ 834FB60 - .4byte gMapData_SeafoamIslands_B2F @ 0x8315588 + .4byte SeafoamIslands_B2F_Layout @ 0x8315588 .4byte gMapEvents_SeafoamIslands_B2F @ 0x83B1FE4 .4byte gMapScripts_SeafoamIslands_B2F @ 0x8162F4E .4byte NULL @@ -818,7 +818,7 @@ SeafoamIslands_B2F:: @ 834FB60 .byte 0x8b, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 SeafoamIslands_B3F:: @ 834FB7C - .4byte gMapData_SeafoamIslands_B3F @ 0x8315CCC + .4byte SeafoamIslands_B3F_Layout @ 0x8315CCC .4byte gMapEvents_SeafoamIslands_B3F @ 0x83B20DC .4byte gMapScripts_SeafoamIslands_B3F @ 0x8162F4F .4byte NULL @@ -827,7 +827,7 @@ SeafoamIslands_B3F:: @ 834FB7C .byte 0x8b, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 SeafoamIslands_B4F:: @ 834FB98 - .4byte gMapData_SeafoamIslands_B4F @ 0x8316410 + .4byte SeafoamIslands_B4F_Layout @ 0x8316410 .4byte gMapEvents_SeafoamIslands_B4F @ 0x83B21C4 .4byte gMapScripts_SeafoamIslands_B4F @ 0x816302E .4byte NULL @@ -836,7 +836,7 @@ SeafoamIslands_B4F:: @ 834FB98 .byte 0x8b, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 PokemonTower_1F:: @ 834FBB4 - .4byte gMapData_PokemonTower_1F @ 0x83167F4 + .4byte PokemonTower_1F_Layout @ 0x83167F4 .4byte gMapEvents_PokemonTower_1F @ 0x83B2270 .4byte gMapScripts_PokemonTower_1F @ 0x8163235 .4byte NULL @@ -845,7 +845,7 @@ PokemonTower_1F:: @ 834FBB4 .byte 0x8c, 0x00, 0x00, 0x08, 0x00, 0x05, 0x00, 0x02 PokemonTower_2F:: @ 834FBD0 - .4byte gMapData_PokemonTower_2F @ 0x8316BD8 + .4byte PokemonTower_2F_Layout @ 0x8316BD8 .4byte gMapEvents_PokemonTower_2F @ 0x83B22E4 .4byte gMapScripts_PokemonTower_2F @ 0x8163285 .4byte NULL @@ -854,7 +854,7 @@ PokemonTower_2F:: @ 834FBD0 .byte 0x8c, 0x00, 0x00, 0x08, 0x00, 0x05, 0x00, 0x02 PokemonTower_3F:: @ 834FBEC - .4byte gMapData_PokemonTower_3F @ 0x8316FBC + .4byte PokemonTower_3F_Layout @ 0x8316FBC .4byte gMapEvents_PokemonTower_3F @ 0x83B2368 .4byte gMapScripts_PokemonTower_3F @ 0x81633A6 .4byte NULL @@ -863,7 +863,7 @@ PokemonTower_3F:: @ 834FBEC .byte 0x8c, 0x00, 0x06, 0x08, 0x00, 0x05, 0x00, 0x02 PokemonTower_4F:: @ 834FC08 - .4byte gMapData_PokemonTower_4F @ 0x83173A0 + .4byte PokemonTower_4F_Layout @ 0x83173A0 .4byte gMapEvents_PokemonTower_4F @ 0x83B241C .4byte gMapScripts_PokemonTower_4F @ 0x81633EC .4byte NULL @@ -872,7 +872,7 @@ PokemonTower_4F:: @ 834FC08 .byte 0x8c, 0x00, 0x06, 0x08, 0x00, 0x05, 0x00, 0x02 PokemonTower_5F:: @ 834FC24 - .4byte gMapData_PokemonTower_5F @ 0x8317784 + .4byte PokemonTower_5F_Layout @ 0x8317784 .4byte gMapEvents_PokemonTower_5F @ 0x83B2604 .4byte gMapScripts_PokemonTower_5F @ 0x8163432 .4byte NULL @@ -881,7 +881,7 @@ PokemonTower_5F:: @ 834FC24 .byte 0x8c, 0x00, 0x06, 0x08, 0x00, 0x05, 0x00, 0x02 PokemonTower_6F:: @ 834FC40 - .4byte gMapData_PokemonTower_6F @ 0x8317B68 + .4byte PokemonTower_6F_Layout @ 0x8317B68 .4byte gMapEvents_PokemonTower_6F @ 0x83B26C0 .4byte gMapScripts_PokemonTower_6F @ 0x81634B7 .4byte NULL @@ -890,7 +890,7 @@ PokemonTower_6F:: @ 834FC40 .byte 0x8c, 0x00, 0x06, 0x08, 0x00, 0x05, 0x00, 0x02 PokemonTower_7F:: @ 834FC5C - .4byte gMapData_PokemonTower_7F @ 0x8317F4C + .4byte PokemonTower_7F_Layout @ 0x8317F4C .4byte gMapEvents_PokemonTower_7F @ 0x83B2748 .4byte gMapScripts_PokemonTower_7F @ 0x8163559 .4byte NULL @@ -899,7 +899,7 @@ PokemonTower_7F:: @ 834FC5C .byte 0x8c, 0x00, 0x06, 0x08, 0x00, 0x05, 0x00, 0x02 PowerPlant:: @ 834FC78 - .4byte gMapData_PowerPlant @ 0x8318EC0 + .4byte PowerPlant_Layout @ 0x8318EC0 .4byte gMapEvents_PowerPlant @ 0x83B285C .4byte gMapScripts_PowerPlant @ 0x8163764 .4byte NULL @@ -908,7 +908,7 @@ PowerPlant:: @ 834FC78 .byte 0x8e, 0x00, 0x00, 0x08, 0x00, 0x07, 0x00, 0x03 MtEmber_RubyPath_B4F:: @ 834FC94 - .4byte gMapData_MtEmber_RubyPath_B4F @ 0x8339290 + .4byte MtEmber_RubyPath_B4F_Layout @ 0x8339290 .4byte gMapEvents_MtEmber_RubyPath_B4F @ 0x83B29B8 .4byte gMapScripts_MtEmber_RubyPath_B4F @ 0x81638EB .4byte NULL @@ -917,7 +917,7 @@ MtEmber_RubyPath_B4F:: @ 834FC94 .byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 MtEmber_Exterior:: @ 834FCB0 - .4byte gMapData_MtEmber_Exterior @ 0x833D660 + .4byte MtEmber_Exterior_Layout @ 0x833D660 .4byte gMapEvents_MtEmber_Exterior @ 0x83B2C24 .4byte gMapScripts_MtEmber_Exterior @ 0x8163946 .4byte NULL @@ -926,7 +926,7 @@ MtEmber_Exterior:: @ 834FCB0 .byte 0xaf, 0x00, 0x00, 0x03, 0x01, 0x06, 0x00, 0x00 MtEmber_SummitPath_1F:: @ 834FCCC - .4byte gMapData_MtEmber_SummitPath_1F @ 0x833DC08 + .4byte MtEmber_SummitPath_1F_Layout @ 0x833DC08 .4byte gMapEvents_MtEmber_SummitPath_1F @ 0x83B2C48 .4byte gMapScripts_MtEmber_SummitPath_1F @ 0x8163AF9 .4byte NULL @@ -935,7 +935,7 @@ MtEmber_SummitPath_1F:: @ 834FCCC .byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 MtEmber_SummitPath_2F:: @ 834FCE8 - .4byte gMapData_MtEmber_SummitPath_2F @ 0x833ED6C + .4byte MtEmber_SummitPath_2F_Layout @ 0x833ED6C .4byte gMapEvents_MtEmber_SummitPath_2F @ 0x83B2D44 .4byte gMapScripts_MtEmber_SummitPath_2F @ 0x8163AFA .4byte NULL @@ -944,7 +944,7 @@ MtEmber_SummitPath_2F:: @ 834FCE8 .byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 MtEmber_SummitPath_3F:: @ 834FD04 - .4byte gMapData_MtEmber_SummitPath_3F @ 0x833EEDC + .4byte MtEmber_SummitPath_3F_Layout @ 0x833EEDC .4byte gMapEvents_MtEmber_SummitPath_3F @ 0x83B2D68 .4byte gMapScripts_MtEmber_SummitPath_3F @ 0x8163AFB .4byte NULL @@ -953,7 +953,7 @@ MtEmber_SummitPath_3F:: @ 834FD04 .byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 MtEmber_Summit:: @ 834FD20 - .4byte gMapData_MtEmber_Summit @ 0x833D9C8 + .4byte MtEmber_Summit_Layout @ 0x833D9C8 .4byte gMapEvents_MtEmber_Summit @ 0x83B2DFC .4byte gMapScripts_MtEmber_Summit @ 0x8163AFC .4byte NULL @@ -962,7 +962,7 @@ MtEmber_Summit:: @ 834FD20 .byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 MtEmber_RubyPath_B5F:: @ 834FD3C - .4byte gMapData_MtEmber_RubyPath_B5F @ 0x833FF60 + .4byte MtEmber_RubyPath_B5F_Layout @ 0x833FF60 .4byte gMapEvents_MtEmber_RubyPath_B5F @ 0x83B2E3C .4byte gMapScripts_MtEmber_RubyPath_B5F @ 0x8163BAA .4byte NULL @@ -971,7 +971,7 @@ MtEmber_RubyPath_B5F:: @ 834FD3C .byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 SSAnne_Kitchen3:: @ 834FD58 - .4byte gMapData_SSAnne_Kitchen3 @ 0x833F304 + .4byte SSAnne_Kitchen3_Layout @ 0x833F304 .4byte gMapEvents_SSAnne_Kitchen3 @ 0x83B2EE0 .4byte gMapScripts_SSAnne_Kitchen3 @ 0x8163C45 .4byte NULL @@ -980,7 +980,7 @@ SSAnne_Kitchen3:: @ 834FD58 .byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 MtEmber_RubyPath_B1F:: @ 834FD74 - .4byte gMapData_MtEmber_RubyPath_B1F @ 0x833F524 + .4byte MtEmber_RubyPath_B1F_Layout @ 0x833F524 .4byte gMapEvents_MtEmber_RubyPath_B1F @ 0x83B2F64 .4byte gMapScripts_MtEmber_RubyPath_B1F @ 0x8163C46 .4byte NULL @@ -989,7 +989,7 @@ MtEmber_RubyPath_B1F:: @ 834FD74 .byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 MtEmber_RubyPath_B2F:: @ 834FD90 - .4byte gMapData_MtEmber_RubyPath_B2F @ 0x833F6A8 + .4byte MtEmber_RubyPath_B2F_Layout @ 0x833F6A8 .4byte gMapEvents_MtEmber_RubyPath_B2F @ 0x83B3030 .4byte gMapScripts_MtEmber_RubyPath_B2F @ 0x8163C47 .4byte NULL @@ -998,7 +998,7 @@ MtEmber_RubyPath_B2F:: @ 834FD90 .byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 MtEmber_RubyPath_B3F:: @ 834FDAC - .4byte gMapData_MtEmber_RubyPath_B3F @ 0x833FC60 + .4byte MtEmber_RubyPath_B3F_Layout @ 0x833FC60 .4byte gMapEvents_MtEmber_RubyPath_B3F @ 0x83B314C .4byte gMapScripts_MtEmber_RubyPath_B3F @ 0x8163C48 .4byte NULL @@ -1007,7 +1007,7 @@ MtEmber_RubyPath_B3F:: @ 834FDAC .byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 MtEmber_RubyPath_B1F_Stairs:: @ 834FDC8 - .4byte gMapData_MtEmber_RubyPath_B1F_Stairs @ 0x833FCD8 + .4byte MtEmber_RubyPath_B1F_Stairs_Layout @ 0x833FCD8 .4byte gMapEvents_MtEmber_RubyPath_B1F_Stairs @ 0x83B3188 .4byte gMapScripts_MtEmber_RubyPath_B1F_Stairs @ 0x8163C6F .4byte NULL @@ -1016,7 +1016,7 @@ MtEmber_RubyPath_B1F_Stairs:: @ 834FDC8 .byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 MtEmber_RubyPath_B2F_Stairs:: @ 834FDE4 - .4byte gMapData_MtEmber_RubyPath_B2F_Stairs @ 0x833FD5C + .4byte MtEmber_RubyPath_B2F_Stairs_Layout @ 0x833FD5C .4byte gMapEvents_MtEmber_RubyPath_B2F_Stairs @ 0x83B31DC .4byte gMapScripts_MtEmber_RubyPath_B2F_Stairs @ 0x8163C70 .4byte NULL @@ -1025,7 +1025,7 @@ MtEmber_RubyPath_B2F_Stairs:: @ 834FDE4 .byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 ThreeIsland_BerryForest:: @ 834FE00 - .4byte gMapData_ThreeIsland_BerryForest @ 0x833A7A8 + .4byte ThreeIsland_BerryForest_Layout @ 0x833A7A8 .4byte gMapEvents_ThreeIsland_BerryForest @ 0x83B340C .4byte gMapScripts_ThreeIsland_BerryForest @ 0x8163C71 .4byte NULL @@ -1034,7 +1034,7 @@ ThreeIsland_BerryForest:: @ 834FE00 .byte 0xb0, 0x00, 0x0b, 0x03, 0x01, 0x07, 0x00, 0x00 FourIsland_IcefallCave_Entrance:: @ 834FE1C - .4byte gMapData_FourIsland_IcefallCave_Entrance @ 0x8340E38 + .4byte FourIsland_IcefallCave_Entrance_Layout @ 0x8340E38 .4byte gMapEvents_FourIsland_IcefallCave_Entrance @ 0x83B3438 .4byte gMapScripts_FourIsland_IcefallCave_Entrance @ 0x8163D3A .4byte NULL @@ -1043,7 +1043,7 @@ FourIsland_IcefallCave_Entrance:: @ 834FE1C .byte 0xb1, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 FourIsland_IcefallCave_1F:: @ 834FE38 - .4byte gMapData_FourIsland_IcefallCave_1F @ 0x834117C + .4byte FourIsland_IcefallCave_1F_Layout @ 0x834117C .4byte gMapEvents_FourIsland_IcefallCave_1F @ 0x83B34AC .4byte gMapScripts_FourIsland_IcefallCave_1F @ 0x8163D44 .4byte NULL @@ -1052,7 +1052,7 @@ FourIsland_IcefallCave_1F:: @ 834FE38 .byte 0xb1, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 SSAnne_CaptainsOffice2:: @ 834FE54 - .4byte gMapData_SSAnne_CaptainsOffice2 @ 0x8341560 + .4byte SSAnne_CaptainsOffice2_Layout @ 0x8341560 .4byte gMapEvents_SSAnne_CaptainsOffice2 @ 0x83B3508 .4byte gMapScripts_SSAnne_CaptainsOffice2 @ 0x8163D81 .4byte NULL @@ -1061,7 +1061,7 @@ SSAnne_CaptainsOffice2:: @ 834FE54 .byte 0xb1, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 SSAnne_CaptainsOffice3:: @ 834FE70 - .4byte gMapData_SSAnne_CaptainsOffice3 @ 0x8341A98 + .4byte SSAnne_CaptainsOffice3_Layout @ 0x8341A98 .4byte gMapEvents_SSAnne_CaptainsOffice3 @ 0x83B35B4 .4byte gMapScripts_SSAnne_CaptainsOffice3 @ 0x8163D82 .4byte NULL @@ -1070,7 +1070,7 @@ SSAnne_CaptainsOffice3:: @ 834FE70 .byte 0xb1, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 SSAnne_CaptainsOffice4:: @ 834FE8C - .4byte gMapData_SSAnne_CaptainsOffice4 @ 0x83405A4 + .4byte SSAnne_CaptainsOffice4_Layout @ 0x83405A4 .4byte gMapEvents_SSAnne_CaptainsOffice4 @ 0x83B381C .4byte gMapScripts_SSAnne_CaptainsOffice4 @ 0x8163F2E .4byte NULL @@ -1079,7 +1079,7 @@ SSAnne_CaptainsOffice4:: @ 834FE8C .byte 0xb2, 0x00, 0x00, 0x08, 0x00, 0x05, 0x00, 0x03 SSAnne_CaptainsOffice5:: @ 834FEA8 - .4byte gMapData_SSAnne_CaptainsOffice5 @ 0x83436C4 + .4byte SSAnne_CaptainsOffice5_Layout @ 0x83436C4 .4byte gMapEvents_SSAnne_CaptainsOffice5 @ 0x83B3850 .4byte gMapScripts_SSAnne_CaptainsOffice5 @ 0x8164182 .4byte NULL @@ -1088,7 +1088,7 @@ SSAnne_CaptainsOffice5:: @ 834FEA8 .byte 0xb4, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 SixIsland_DottedHole_B1F:: @ 834FEC4 - .4byte gMapData_SixIsland_DottedHole_B1F @ 0x8343808 + .4byte SixIsland_DottedHole_B1F_Layout @ 0x8343808 .4byte gMapEvents_SixIsland_DottedHole_B1F @ 0x83B3898 .4byte gMapScripts_SixIsland_DottedHole_B1F @ 0x81641B0 .4byte NULL @@ -1097,7 +1097,7 @@ SixIsland_DottedHole_B1F:: @ 834FEC4 .byte 0xb4, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 SixIsland_DottedHole_B2F:: @ 834FEE0 - .4byte gMapData_SixIsland_DottedHole_B2F @ 0x834394C + .4byte SixIsland_DottedHole_B2F_Layout @ 0x834394C .4byte gMapEvents_SixIsland_DottedHole_B2F @ 0x83B38E0 .4byte gMapScripts_SixIsland_DottedHole_B2F @ 0x81641B1 .4byte NULL @@ -1106,7 +1106,7 @@ SixIsland_DottedHole_B2F:: @ 834FEE0 .byte 0xb4, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 SixIsland_DottedHole_B3F:: @ 834FEFC - .4byte gMapData_SixIsland_DottedHole_B3F @ 0x8343A90 + .4byte SixIsland_DottedHole_B3F_Layout @ 0x8343A90 .4byte gMapEvents_SixIsland_DottedHole_B3F @ 0x83B3928 .4byte gMapScripts_SixIsland_DottedHole_B3F @ 0x81641B2 .4byte NULL @@ -1115,7 +1115,7 @@ SixIsland_DottedHole_B3F:: @ 834FEFC .byte 0xb4, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 SSAnne_CaptainsOffice9:: @ 834FF18 - .4byte gMapData_SSAnne_CaptainsOffice9 @ 0x8343BD4 + .4byte SSAnne_CaptainsOffice9_Layout @ 0x8343BD4 .4byte gMapEvents_SSAnne_CaptainsOffice9 @ 0x83B3970 .4byte gMapScripts_SSAnne_CaptainsOffice9 @ 0x81641B3 .4byte NULL @@ -1124,7 +1124,7 @@ SSAnne_CaptainsOffice9:: @ 834FF18 .byte 0xb4, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 SixIsland_DottedHole_SapphireRoom:: @ 834FF34 - .4byte gMapData_SixIsland_DottedHole_SapphireRoom @ 0x8343DD8 + .4byte SixIsland_DottedHole_SapphireRoom_Layout @ 0x8343DD8 .4byte gMapEvents_SixIsland_DottedHole_SapphireRoom @ 0x83B39D0 .4byte gMapScripts_SixIsland_DottedHole_SapphireRoom @ 0x81641B4 .4byte NULL @@ -1133,7 +1133,7 @@ SixIsland_DottedHole_SapphireRoom:: @ 834FF34 .byte 0xb4, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 SSAnne_1F_Room11:: @ 834FF50 - .4byte gMapData_SSAnne_1F_Room11 @ 0x8345030 + .4byte SSAnne_1F_Room11_Layout @ 0x8345030 .4byte gMapEvents_SSAnne_1F_Room11 @ 0x83B3B34 .4byte gMapScripts_SSAnne_1F_Room11 @ 0x8164559 .4byte NULL @@ -1142,7 +1142,7 @@ SSAnne_1F_Room11:: @ 834FF50 .byte 0xb6, 0x00, 0x00, 0x03, 0x01, 0x07, 0x00, 0x00 SSAnne_1F_Room12:: @ 834FF6C - .4byte gMapData_SSAnne_1F_Room12 @ 0x8347A50 + .4byte SSAnne_1F_Room12_Layout @ 0x8347A50 .4byte gMapEvents_SSAnne_1F_Room12 @ 0x83B3B50 .4byte gMapScripts_SSAnne_1F_Room12 @ 0x81646A4 .4byte NULL @@ -1151,7 +1151,7 @@ SSAnne_1F_Room12:: @ 834FF6C .byte 0xb7, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 NavelRock_Exterior:: @ 834FF88 - .4byte gMapData_NavelRock_Exterior @ 0x834873C + .4byte NavelRock_Exterior_Layout @ 0x834873C .4byte gMapEvents_NavelRock_Exterior @ 0x83B3B74 .4byte gMapScripts_NavelRock_Exterior @ 0x81646AE .4byte NULL @@ -1160,7 +1160,7 @@ NavelRock_Exterior:: @ 834FF88 .byte 0xae, 0x00, 0x00, 0x03, 0x01, 0x06, 0x00, 0x00 SevenIsland_TrainerTower_1F:: @ 834FFA4 - .4byte gMapData_SevenIsland_TrainerTower_1F @ 0x8341FCC + .4byte SevenIsland_TrainerTower_1F_Layout @ 0x8341FCC .4byte gMapEvents_SevenIsland_TrainerTower_1F @ 0x83B3C40 .4byte gMapScripts_SevenIsland_TrainerTower_1F @ 0x81646B8 .4byte NULL @@ -1169,7 +1169,7 @@ SevenIsland_TrainerTower_1F:: @ 834FFA4 .byte 0xb3, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00 SevenIsland_TrainerTower_2F:: @ 834FFC0 - .4byte gMapData_SevenIsland_TrainerTower_2F @ 0x8342254 + .4byte SevenIsland_TrainerTower_2F_Layout @ 0x8342254 .4byte gMapEvents_SevenIsland_TrainerTower_2F @ 0x83B3D14 .4byte gMapScripts_SevenIsland_TrainerTower_2F @ 0x81646E6 .4byte NULL @@ -1178,7 +1178,7 @@ SevenIsland_TrainerTower_2F:: @ 834FFC0 .byte 0xb3, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00 SevenIsland_TrainerTower_3F:: @ 834FFDC - .4byte gMapData_SevenIsland_TrainerTower_3F @ 0x83424DC + .4byte SevenIsland_TrainerTower_3F_Layout @ 0x83424DC .4byte gMapEvents_SevenIsland_TrainerTower_3F @ 0x83B3DE8 .4byte gMapScripts_SevenIsland_TrainerTower_3F @ 0x8164714 .4byte NULL @@ -1187,7 +1187,7 @@ SevenIsland_TrainerTower_3F:: @ 834FFDC .byte 0xb3, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00 SevenIsland_TrainerTower_4F:: @ 834FFF8 - .4byte gMapData_SevenIsland_TrainerTower_4F @ 0x8342764 + .4byte SevenIsland_TrainerTower_4F_Layout @ 0x8342764 .4byte gMapEvents_SevenIsland_TrainerTower_4F @ 0x83B3EBC .4byte gMapScripts_SevenIsland_TrainerTower_4F @ 0x8164742 .4byte NULL @@ -1196,7 +1196,7 @@ SevenIsland_TrainerTower_4F:: @ 834FFF8 .byte 0xb3, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00 SevenIsland_TrainerTower_5F:: @ 8350014 - .4byte gMapData_SevenIsland_TrainerTower_5F @ 0x83429EC + .4byte SevenIsland_TrainerTower_5F_Layout @ 0x83429EC .4byte gMapEvents_SevenIsland_TrainerTower_5F @ 0x83B3F90 .4byte gMapScripts_SevenIsland_TrainerTower_5F @ 0x8164770 .4byte NULL @@ -1205,7 +1205,7 @@ SevenIsland_TrainerTower_5F:: @ 8350014 .byte 0xb3, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00 SevenIsland_TrainerTower_6F:: @ 8350030 - .4byte gMapData_SevenIsland_TrainerTower_6F @ 0x8342C74 + .4byte SevenIsland_TrainerTower_6F_Layout @ 0x8342C74 .4byte gMapEvents_SevenIsland_TrainerTower_6F @ 0x83B4064 .4byte gMapScripts_SevenIsland_TrainerTower_6F @ 0x816479E .4byte NULL @@ -1214,7 +1214,7 @@ SevenIsland_TrainerTower_6F:: @ 8350030 .byte 0xb3, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00 SevenIsland_TrainerTower_7F:: @ 835004C - .4byte gMapData_SevenIsland_TrainerTower_7F @ 0x8342EFC + .4byte SevenIsland_TrainerTower_7F_Layout @ 0x8342EFC .4byte gMapEvents_SevenIsland_TrainerTower_7F @ 0x83B4138 .4byte gMapScripts_SevenIsland_TrainerTower_7F @ 0x81647CC .4byte NULL @@ -1223,7 +1223,7 @@ SevenIsland_TrainerTower_7F:: @ 835004C .byte 0xb3, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00 SevenIsland_TrainerTower_8F:: @ 8350068 - .4byte gMapData_SevenIsland_TrainerTower_8F @ 0x8343184 + .4byte SevenIsland_TrainerTower_8F_Layout @ 0x8343184 .4byte gMapEvents_SevenIsland_TrainerTower_8F @ 0x83B420C .4byte gMapScripts_SevenIsland_TrainerTower_8F @ 0x81647FA .4byte NULL @@ -1232,7 +1232,7 @@ SevenIsland_TrainerTower_8F:: @ 8350068 .byte 0xb3, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00 SevenIsland_TrainerTower_Roof:: @ 8350084 - .4byte gMapData_SevenIsland_TrainerTower_Roof @ 0x83433E8 + .4byte SevenIsland_TrainerTower_Roof_Layout @ 0x83433E8 .4byte gMapEvents_SevenIsland_TrainerTower_Roof @ 0x83B4248 .4byte gMapScripts_SevenIsland_TrainerTower_Roof @ 0x8164828 .4byte NULL @@ -1241,7 +1241,7 @@ SevenIsland_TrainerTower_Roof:: @ 8350084 .byte 0xb3, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00 SevenIsland_TrainerTower_Lobby:: @ 83500A0 - .4byte gMapData_SevenIsland_TrainerTower_Lobby @ 0x8341D44 + .4byte SevenIsland_TrainerTower_Lobby_Layout @ 0x8341D44 .4byte gMapEvents_SevenIsland_TrainerTower_Lobby @ 0x83B4308 .4byte gMapScripts_SevenIsland_TrainerTower_Lobby @ 0x8164839 .4byte NULL @@ -1250,7 +1250,7 @@ SevenIsland_TrainerTower_Lobby:: @ 83500A0 .byte 0xb3, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00 SevenIsland_TrainerTower_Elevator:: @ 83500BC - .4byte gMapData_SevenIsland_TrainerTower_Elevator @ 0x8343454 + .4byte SevenIsland_TrainerTower_Elevator_Layout @ 0x8343454 .4byte gMapEvents_SevenIsland_TrainerTower_Elevator @ 0x83B4330 .4byte gMapScripts_SevenIsland_TrainerTower_Elevator @ 0x8164AF8 .4byte NULL @@ -1259,7 +1259,7 @@ SevenIsland_TrainerTower_Elevator:: @ 83500BC .byte 0xb3, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00 FiveIsland_LostCave_Entrance:: @ 83500D8 - .4byte gMapData_FiveIsland_LostCave_Entrance @ 0x83454D8 + .4byte FiveIsland_LostCave_Entrance_Layout @ 0x83454D8 .4byte gMapEvents_FiveIsland_LostCave_Entrance @ 0x83B4354 .4byte gMapScripts_FiveIsland_LostCave_Entrance @ 0x8164BEC .4byte NULL @@ -1268,7 +1268,7 @@ FiveIsland_LostCave_Entrance:: @ 83500D8 .byte 0xb5, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 FiveIsland_LostCave_Room1:: @ 83500F4 - .4byte gMapData_FiveIsland_LostCave_Room1 @ 0x83455F0 + .4byte FiveIsland_LostCave_Room1_Layout @ 0x83455F0 .4byte gMapEvents_FiveIsland_LostCave_Room1 @ 0x83B43A8 .4byte gMapScripts_FiveIsland_LostCave_Room1 @ 0x8164BF6 .4byte NULL @@ -1277,7 +1277,7 @@ FiveIsland_LostCave_Room1:: @ 83500F4 .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 FiveIsland_LostCave_Room2:: @ 8350110 - .4byte gMapData_FiveIsland_LostCave_Room2 @ 0x8345708 + .4byte FiveIsland_LostCave_Room2_Layout @ 0x8345708 .4byte gMapEvents_FiveIsland_LostCave_Room2 @ 0x83B43DC .4byte gMapScripts_FiveIsland_LostCave_Room2 @ 0x8164C0E .4byte NULL @@ -1286,7 +1286,7 @@ FiveIsland_LostCave_Room2:: @ 8350110 .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 FiveIsland_LostCave_Room3:: @ 835012C - .4byte gMapData_FiveIsland_LostCave_Room3 @ 0x8345820 + .4byte FiveIsland_LostCave_Room3_Layout @ 0x8345820 .4byte gMapEvents_FiveIsland_LostCave_Room3 @ 0x83B4410 .4byte gMapScripts_FiveIsland_LostCave_Room3 @ 0x8164C0F .4byte NULL @@ -1295,7 +1295,7 @@ FiveIsland_LostCave_Room3:: @ 835012C .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 FiveIsland_LostCave_Room4:: @ 8350148 - .4byte gMapData_FiveIsland_LostCave_Room4 @ 0x8345938 + .4byte FiveIsland_LostCave_Room4_Layout @ 0x8345938 .4byte gMapEvents_FiveIsland_LostCave_Room4 @ 0x83B445C .4byte gMapScripts_FiveIsland_LostCave_Room4 @ 0x8164C10 .4byte NULL @@ -1304,7 +1304,7 @@ FiveIsland_LostCave_Room4:: @ 8350148 .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 FiveIsland_LostCave_Room5:: @ 8350164 - .4byte gMapData_FiveIsland_LostCave_Room5 @ 0x8345A50 + .4byte FiveIsland_LostCave_Room5_Layout @ 0x8345A50 .4byte gMapEvents_FiveIsland_LostCave_Room5 @ 0x83B4490 .4byte gMapScripts_FiveIsland_LostCave_Room5 @ 0x8164C28 .4byte NULL @@ -1313,7 +1313,7 @@ FiveIsland_LostCave_Room5:: @ 8350164 .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 FiveIsland_LostCave_Room6:: @ 8350180 - .4byte gMapData_FiveIsland_LostCave_Room6 @ 0x8345B68 + .4byte FiveIsland_LostCave_Room6_Layout @ 0x8345B68 .4byte gMapEvents_FiveIsland_LostCave_Room6 @ 0x83B44C4 .4byte gMapScripts_FiveIsland_LostCave_Room6 @ 0x8164C29 .4byte NULL @@ -1322,7 +1322,7 @@ FiveIsland_LostCave_Room6:: @ 8350180 .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 FiveIsland_LostCave_Room7:: @ 835019C - .4byte gMapData_FiveIsland_LostCave_Room7 @ 0x8345C80 + .4byte FiveIsland_LostCave_Room7_Layout @ 0x8345C80 .4byte gMapEvents_FiveIsland_LostCave_Room7 @ 0x83B44F8 .4byte gMapScripts_FiveIsland_LostCave_Room7 @ 0x8164C2A .4byte NULL @@ -1331,7 +1331,7 @@ FiveIsland_LostCave_Room7:: @ 835019C .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 FiveIsland_LostCave_Room8:: @ 83501B8 - .4byte gMapData_FiveIsland_LostCave_Room8 @ 0x8345D98 + .4byte FiveIsland_LostCave_Room8_Layout @ 0x8345D98 .4byte gMapEvents_FiveIsland_LostCave_Room8 @ 0x83B452C .4byte gMapScripts_FiveIsland_LostCave_Room8 @ 0x8164C2B .4byte NULL @@ -1340,7 +1340,7 @@ FiveIsland_LostCave_Room8:: @ 83501B8 .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 FiveIsland_LostCave_Room9:: @ 83501D4 - .4byte gMapData_FiveIsland_LostCave_Room9 @ 0x8345EB0 + .4byte FiveIsland_LostCave_Room9_Layout @ 0x8345EB0 .4byte gMapEvents_FiveIsland_LostCave_Room9 @ 0x83B4560 .4byte gMapScripts_FiveIsland_LostCave_Room9 @ 0x8164C2C .4byte NULL @@ -1349,7 +1349,7 @@ FiveIsland_LostCave_Room9:: @ 83501D4 .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 FiveIsland_LostCave_Room10:: @ 83501F0 - .4byte gMapData_FiveIsland_LostCave_Room10 @ 0x8345FC8 + .4byte FiveIsland_LostCave_Room10_Layout @ 0x8345FC8 .4byte gMapEvents_FiveIsland_LostCave_Room10 @ 0x83B45AC .4byte gMapScripts_FiveIsland_LostCave_Room10 @ 0x8164C2D .4byte NULL @@ -1358,7 +1358,7 @@ FiveIsland_LostCave_Room10:: @ 83501F0 .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 FiveIsland_LostCave_Room11:: @ 835020C - .4byte gMapData_FiveIsland_LostCave_Room11 @ 0x83460E0 + .4byte FiveIsland_LostCave_Room11_Layout @ 0x83460E0 .4byte gMapEvents_FiveIsland_LostCave_Room11 @ 0x83B45E0 .4byte gMapScripts_FiveIsland_LostCave_Room11 @ 0x8164CCB .4byte NULL @@ -1367,7 +1367,7 @@ FiveIsland_LostCave_Room11:: @ 835020C .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 FiveIsland_LostCave_Room12:: @ 8350228 - .4byte gMapData_FiveIsland_LostCave_Room12 @ 0x83461F8 + .4byte FiveIsland_LostCave_Room12_Layout @ 0x83461F8 .4byte gMapEvents_FiveIsland_LostCave_Room12 @ 0x83B4614 .4byte gMapScripts_FiveIsland_LostCave_Room12 @ 0x8164CCC .4byte NULL @@ -1376,7 +1376,7 @@ FiveIsland_LostCave_Room12:: @ 8350228 .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 FiveIsland_LostCave_Room13:: @ 8350244 - .4byte gMapData_FiveIsland_LostCave_Room13 @ 0x8346310 + .4byte FiveIsland_LostCave_Room13_Layout @ 0x8346310 .4byte gMapEvents_FiveIsland_LostCave_Room13 @ 0x83B4648 .4byte gMapScripts_FiveIsland_LostCave_Room13 @ 0x8164CCD .4byte NULL @@ -1385,7 +1385,7 @@ FiveIsland_LostCave_Room13:: @ 8350244 .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 FiveIsland_LostCave_Room14:: @ 8350260 - .4byte gMapData_FiveIsland_LostCave_Room14 @ 0x8346428 + .4byte FiveIsland_LostCave_Room14_Layout @ 0x8346428 .4byte gMapEvents_FiveIsland_LostCave_Room14 @ 0x83B467C .4byte gMapScripts_FiveIsland_LostCave_Room14 @ 0x8164CCE .4byte NULL @@ -1394,7 +1394,7 @@ FiveIsland_LostCave_Room14:: @ 8350260 .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 SevenIsland_TanobyRuins_MoneanChamber:: @ 835027C - .4byte gMapData_SevenIsland_TanobyRuins_MoneanChamber @ 0x834675C + .4byte SevenIsland_TanobyRuins_MoneanChamber_Layout @ 0x834675C .4byte gMapEvents_SevenIsland_TanobyRuins_MoneanChamber @ 0x83B4698 .4byte gMapScripts_SevenIsland_TanobyRuins_MoneanChamber @ 0x8164CCF .4byte NULL @@ -1403,7 +1403,7 @@ SevenIsland_TanobyRuins_MoneanChamber:: @ 835027C .byte 0xbc, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x02 SevenIsland_TanobyRuins_LiptooChamber:: @ 8350298 - .4byte gMapData_SevenIsland_TanobyRuins_LiptooChamber @ 0x8346A90 + .4byte SevenIsland_TanobyRuins_LiptooChamber_Layout @ 0x8346A90 .4byte gMapEvents_SevenIsland_TanobyRuins_LiptooChamber @ 0x83B46B4 .4byte gMapScripts_SevenIsland_TanobyRuins_LiptooChamber @ 0x8164CDE .4byte NULL @@ -1412,7 +1412,7 @@ SevenIsland_TanobyRuins_LiptooChamber:: @ 8350298 .byte 0xbd, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x02 SevenIsland_TanobyRuins_WeepthChamber:: @ 83502B4 - .4byte gMapData_SevenIsland_TanobyRuins_WeepthChamber @ 0x8346DC4 + .4byte SevenIsland_TanobyRuins_WeepthChamber_Layout @ 0x8346DC4 .4byte gMapEvents_SevenIsland_TanobyRuins_WeepthChamber @ 0x83B46D0 .4byte gMapScripts_SevenIsland_TanobyRuins_WeepthChamber @ 0x8164CEA .4byte NULL @@ -1421,7 +1421,7 @@ SevenIsland_TanobyRuins_WeepthChamber:: @ 83502B4 .byte 0xbe, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x02 SevenIsland_TanobyRuins_DilfordChamber:: @ 83502D0 - .4byte gMapData_SevenIsland_TanobyRuins_DilfordChamber @ 0x83470F8 + .4byte SevenIsland_TanobyRuins_DilfordChamber_Layout @ 0x83470F8 .4byte gMapEvents_SevenIsland_TanobyRuins_DilfordChamber @ 0x83B46EC .4byte gMapScripts_SevenIsland_TanobyRuins_DilfordChamber @ 0x8164CF6 .4byte NULL @@ -1430,7 +1430,7 @@ SevenIsland_TanobyRuins_DilfordChamber:: @ 83502D0 .byte 0xbf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x02 SevenIsland_TanobyRuins_ScufibChamber:: @ 83502EC - .4byte gMapData_SevenIsland_TanobyRuins_ScufibChamber @ 0x834742C + .4byte SevenIsland_TanobyRuins_ScufibChamber_Layout @ 0x834742C .4byte gMapEvents_SevenIsland_TanobyRuins_ScufibChamber @ 0x83B4708 .4byte gMapScripts_SevenIsland_TanobyRuins_ScufibChamber @ 0x8164D02 .4byte NULL @@ -1439,7 +1439,7 @@ SevenIsland_TanobyRuins_ScufibChamber:: @ 83502EC .byte 0xc0, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x02 SevenIsland_TanobyRuins_RixyChamber:: @ 8350308 - .4byte gMapData_SevenIsland_TanobyRuins_RixyChamber @ 0x8349DC8 + .4byte SevenIsland_TanobyRuins_RixyChamber_Layout @ 0x8349DC8 .4byte gMapEvents_SevenIsland_TanobyRuins_RixyChamber @ 0x83B4724 .4byte gMapScripts_SevenIsland_TanobyRuins_RixyChamber @ 0x8164D0E .4byte NULL @@ -1448,7 +1448,7 @@ SevenIsland_TanobyRuins_RixyChamber:: @ 8350308 .byte 0xc1, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x02 SevenIsland_TanobyRuins_ViapoisChamber:: @ 8350324 - .4byte gMapData_SevenIsland_TanobyRuins_ViapoisChamber @ 0x834A0FC + .4byte SevenIsland_TanobyRuins_ViapoisChamber_Layout @ 0x834A0FC .4byte gMapEvents_SevenIsland_TanobyRuins_ViapoisChamber @ 0x83B4740 .4byte gMapScripts_SevenIsland_TanobyRuins_ViapoisChamber @ 0x8164D1A .4byte NULL @@ -1457,7 +1457,7 @@ SevenIsland_TanobyRuins_ViapoisChamber:: @ 8350324 .byte 0xc2, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x02 ThreeIsland_DunsparceTunnel:: @ 8350340 - .4byte gMapData_ThreeIsland_DunsparceTunnel @ 0x83451F8 + .4byte ThreeIsland_DunsparceTunnel_Layout @ 0x83451F8 .4byte gMapEvents_ThreeIsland_DunsparceTunnel @ 0x83B4788 .4byte gMapScripts_ThreeIsland_DunsparceTunnel @ 0x8164D26 .4byte NULL @@ -1466,7 +1466,7 @@ ThreeIsland_DunsparceTunnel:: @ 8350340 .byte 0xb9, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 SevenIsland_SeavaultCanyon_TanobyKey:: @ 835035C - .4byte gMapData_SevenIsland_SeavaultCanyon_TanobyKey @ 0x8347C54 + .4byte SevenIsland_SeavaultCanyon_TanobyKey_Layout @ 0x8347C54 .4byte gMapEvents_SevenIsland_SeavaultCanyon_TanobyKey @ 0x83B48BC .4byte gMapScripts_SevenIsland_SeavaultCanyon_TanobyKey @ 0x8164DCC .4byte NULL @@ -1475,7 +1475,7 @@ SevenIsland_SeavaultCanyon_TanobyKey:: @ 835035C .byte 0xba, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x02 NavelRock_1F:: @ 8350378 - .4byte gMapData_NavelRock_1F @ 0x8348AD4 + .4byte NavelRock_1F_Layout @ 0x8348AD4 .4byte gMapEvents_NavelRock_1F @ 0x83B48E0 .4byte gMapScripts_NavelRock_1F @ 0x8164F9E .4byte NULL @@ -1484,7 +1484,7 @@ NavelRock_1F:: @ 8350378 .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 NavelRock_Summit:: @ 8350394 - .4byte gMapData_NavelRock_Summit @ 0x8348EB0 + .4byte NavelRock_Summit_Layout @ 0x8348EB0 .4byte gMapEvents_NavelRock_Summit @ 0x83B4930 .4byte gMapScripts_NavelRock_Summit @ 0x8164F9F .4byte NULL @@ -1493,7 +1493,7 @@ NavelRock_Summit:: @ 8350394 .byte 0xae, 0x00, 0x0b, 0x04, 0x00, 0x06, 0x00, 0x00 NavelRock_Base:: @ 83503B0 - .4byte gMapData_NavelRock_Base @ 0x834929C + .4byte NavelRock_Base_Layout @ 0x834929C .4byte gMapEvents_NavelRock_Base @ 0x83B4964 .4byte gMapScripts_NavelRock_Base @ 0x81650E7 .4byte NULL @@ -1502,7 +1502,7 @@ NavelRock_Base:: @ 83503B0 .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 NavelRock_SummitPath_2F:: @ 83503CC - .4byte gMapData_NavelRock_SummitPath_2F @ 0x8349324 + .4byte NavelRock_SummitPath_2F_Layout @ 0x8349324 .4byte gMapEvents_NavelRock_SummitPath_2F @ 0x83B4988 .4byte gMapScripts_NavelRock_SummitPath_2F @ 0x81651F2 .4byte NULL @@ -1511,7 +1511,7 @@ NavelRock_SummitPath_2F:: @ 83503CC .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 NavelRock_SummitPath_3F:: @ 83503E8 - .4byte gMapData_NavelRock_SummitPath_3F @ 0x83493AC + .4byte NavelRock_SummitPath_3F_Layout @ 0x83493AC .4byte gMapEvents_NavelRock_SummitPath_3F @ 0x83B49AC .4byte gMapScripts_NavelRock_SummitPath_3F @ 0x81651F3 .4byte NULL @@ -1520,7 +1520,7 @@ NavelRock_SummitPath_3F:: @ 83503E8 .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 NavelRock_SummitPath_4F:: @ 8350404 - .4byte gMapData_NavelRock_SummitPath_4F @ 0x8349434 + .4byte NavelRock_SummitPath_4F_Layout @ 0x8349434 .4byte gMapEvents_NavelRock_SummitPath_4F @ 0x83B49D0 .4byte gMapScripts_NavelRock_SummitPath_4F @ 0x81651F4 .4byte NULL @@ -1529,7 +1529,7 @@ NavelRock_SummitPath_4F:: @ 8350404 .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 NavelRock_SummitPath_5F:: @ 8350420 - .4byte gMapData_NavelRock_SummitPath_5F @ 0x83494BC + .4byte NavelRock_SummitPath_5F_Layout @ 0x83494BC .4byte gMapEvents_NavelRock_SummitPath_5F @ 0x83B49F4 .4byte gMapScripts_NavelRock_SummitPath_5F @ 0x81651F5 .4byte NULL @@ -1538,7 +1538,7 @@ NavelRock_SummitPath_5F:: @ 8350420 .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 NavelRock_BasePath_B1F:: @ 835043C - .4byte gMapData_NavelRock_BasePath_B1F @ 0x8349544 + .4byte NavelRock_BasePath_B1F_Layout @ 0x8349544 .4byte gMapEvents_NavelRock_BasePath_B1F @ 0x83B4A18 .4byte gMapScripts_NavelRock_BasePath_B1F @ 0x81651F6 .4byte NULL @@ -1547,7 +1547,7 @@ NavelRock_BasePath_B1F:: @ 835043C .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 NavelRock_BasePath_B2F:: @ 8350458 - .4byte gMapData_NavelRock_BasePath_B2F @ 0x83495CC + .4byte NavelRock_BasePath_B2F_Layout @ 0x83495CC .4byte gMapEvents_NavelRock_BasePath_B2F @ 0x83B4A3C .4byte gMapScripts_NavelRock_BasePath_B2F @ 0x81651F7 .4byte NULL @@ -1556,7 +1556,7 @@ NavelRock_BasePath_B2F:: @ 8350458 .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 NavelRock_BasePath_B3F:: @ 8350474 - .4byte gMapData_NavelRock_BasePath_B3F @ 0x8349654 + .4byte NavelRock_BasePath_B3F_Layout @ 0x8349654 .4byte gMapEvents_NavelRock_BasePath_B3F @ 0x83B4A60 .4byte gMapScripts_NavelRock_BasePath_B3F @ 0x81651F8 .4byte NULL @@ -1565,7 +1565,7 @@ NavelRock_BasePath_B3F:: @ 8350474 .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 NavelRock_BasePath_B4F:: @ 8350490 - .4byte gMapData_NavelRock_BasePath_B4F @ 0x83496DC + .4byte NavelRock_BasePath_B4F_Layout @ 0x83496DC .4byte gMapEvents_NavelRock_BasePath_B4F @ 0x83B4A84 .4byte gMapScripts_NavelRock_BasePath_B4F @ 0x81651F9 .4byte NULL @@ -1574,7 +1574,7 @@ NavelRock_BasePath_B4F:: @ 8350490 .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 NavelRock_BasePath_B5F:: @ 83504AC - .4byte gMapData_NavelRock_BasePath_B5F @ 0x8349764 + .4byte NavelRock_BasePath_B5F_Layout @ 0x8349764 .4byte gMapEvents_NavelRock_BasePath_B5F @ 0x83B4AA8 .4byte gMapScripts_NavelRock_BasePath_B5F @ 0x81651FA .4byte NULL @@ -1583,7 +1583,7 @@ NavelRock_BasePath_B5F:: @ 83504AC .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 NavelRock_BasePath_B6F:: @ 83504C8 - .4byte gMapData_NavelRock_BasePath_B6F @ 0x83497EC + .4byte NavelRock_BasePath_B6F_Layout @ 0x83497EC .4byte gMapEvents_NavelRock_BasePath_B6F @ 0x83B4ACC .4byte gMapScripts_NavelRock_BasePath_B6F @ 0x81651FB .4byte NULL @@ -1592,7 +1592,7 @@ NavelRock_BasePath_B6F:: @ 83504C8 .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 NavelRock_BasePath_B7F:: @ 83504E4 - .4byte gMapData_NavelRock_BasePath_B7F @ 0x8349874 + .4byte NavelRock_BasePath_B7F_Layout @ 0x8349874 .4byte gMapEvents_NavelRock_BasePath_B7F @ 0x83B4AF0 .4byte gMapScripts_NavelRock_BasePath_B7F @ 0x81651FC .4byte NULL @@ -1601,7 +1601,7 @@ NavelRock_BasePath_B7F:: @ 83504E4 .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 NavelRock_BasePath_B8F:: @ 8350500 - .4byte gMapData_NavelRock_BasePath_B8F @ 0x83498FC + .4byte NavelRock_BasePath_B8F_Layout @ 0x83498FC .4byte gMapEvents_NavelRock_BasePath_B8F @ 0x83B4B14 .4byte gMapScripts_NavelRock_BasePath_B8F @ 0x81651FD .4byte NULL @@ -1610,7 +1610,7 @@ NavelRock_BasePath_B8F:: @ 8350500 .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 NavelRock_BasePath_B9F:: @ 835051C - .4byte gMapData_NavelRock_BasePath_B9F @ 0x8349984 + .4byte NavelRock_BasePath_B9F_Layout @ 0x8349984 .4byte gMapEvents_NavelRock_BasePath_B9F @ 0x83B4B38 .4byte gMapScripts_NavelRock_BasePath_B9F @ 0x81651FE .4byte NULL @@ -1619,7 +1619,7 @@ NavelRock_BasePath_B9F:: @ 835051C .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 NavelRock_BasePath_B10F:: @ 8350538 - .4byte gMapData_NavelRock_BasePath_B10F @ 0x8349A0C + .4byte NavelRock_BasePath_B10F_Layout @ 0x8349A0C .4byte gMapEvents_NavelRock_BasePath_B10F @ 0x83B4B5C .4byte gMapScripts_NavelRock_BasePath_B10F @ 0x81651FF .4byte NULL @@ -1628,7 +1628,7 @@ NavelRock_BasePath_B10F:: @ 8350538 .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 NavelRock_BasePath_B11F:: @ 8350554 - .4byte gMapData_NavelRock_BasePath_B11F @ 0x8349A94 + .4byte NavelRock_BasePath_B11F_Layout @ 0x8349A94 .4byte gMapEvents_NavelRock_BasePath_B11F @ 0x83B4B80 .4byte gMapScripts_NavelRock_BasePath_B11F @ 0x8165200 .4byte NULL @@ -1637,7 +1637,7 @@ NavelRock_BasePath_B11F:: @ 8350554 .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 NavelRock_B1F:: @ 8350570 - .4byte gMapData_NavelRock_B1F @ 0x834A210 + .4byte NavelRock_B1F_Layout @ 0x834A210 .4byte gMapEvents_NavelRock_B1F @ 0x83B4BA4 .4byte gMapScripts_NavelRock_B1F @ 0x8165201 .4byte NULL @@ -1646,7 +1646,7 @@ NavelRock_B1F:: @ 8350570 .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 NavelRock_Fork:: @ 835058C - .4byte gMapData_NavelRock_Fork @ 0x834B9A4 + .4byte NavelRock_Fork_Layout @ 0x834B9A4 .4byte gMapEvents_NavelRock_Fork @ 0x83B4BD0 .4byte gMapScripts_NavelRock_Fork @ 0x8165202 .4byte NULL @@ -1655,7 +1655,7 @@ NavelRock_Fork:: @ 835058C .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 BirthIsland_Exterior:: @ 83505A8 - .4byte gMapData_BirthIsland_Exterior @ 0x8348380 + .4byte BirthIsland_Exterior_Layout @ 0x8348380 .4byte gMapEvents_BirthIsland_Exterior @ 0x83B4C1C .4byte gMapScripts_BirthIsland_Exterior @ 0x8165203 .4byte NULL @@ -1664,7 +1664,7 @@ BirthIsland_Exterior:: @ 83505A8 .byte 0xbb, 0x00, 0x00, 0x03, 0x00, 0x06, 0x00, 0x00 OneIsland_KindleRoad_EmberSpa:: @ 83505C4 - .4byte gMapData_OneIsland_KindleRoad_EmberSpa @ 0x834EB70 + .4byte OneIsland_KindleRoad_EmberSpa_Layout @ 0x834EB70 .4byte gMapEvents_OneIsland_KindleRoad_EmberSpa @ 0x83B4CD8 .4byte gMapScripts_OneIsland_KindleRoad_EmberSpa @ 0x816535B .4byte NULL @@ -1673,7 +1673,7 @@ OneIsland_KindleRoad_EmberSpa:: @ 83505C4 .byte 0xc3, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 BirthIsland_Harbor:: @ 83505E0 - .4byte gMapData_BirthIsland_Harbor @ 0x8343FB8 + .4byte Island_Harbor_Layout @ 0x8343FB8 .4byte gMapEvents_BirthIsland_Harbor @ 0x83B4D24 .4byte gMapScripts_BirthIsland_Harbor @ 0x81653E6 .4byte NULL @@ -1682,7 +1682,7 @@ BirthIsland_Harbor:: @ 83505E0 .byte 0xbb, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 NavelRock_Harbor:: @ 83505FC - .4byte gMapData_NavelRock_Harbor @ 0x8343FB8 + .4byte Island_Harbor_Layout @ 0x8343FB8 .4byte gMapEvents_NavelRock_Harbor @ 0x83B4D70 .4byte gMapScripts_NavelRock_Harbor @ 0x8165420 .4byte NULL @@ -1691,7 +1691,7 @@ NavelRock_Harbor:: @ 83505FC .byte 0xae, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 PalletTown:: @ 8350618 - .4byte gMapData_PalletTown @ 0x82DD4C0 + .4byte PalletTown_Layout @ 0x82DD4C0 .4byte gMapEvents_PalletTown @ 0x83B4E50 .4byte gMapScripts_PalletTown @ 0x816545A .4byte gMapConnections_PalletTown @ 0x835276C @@ -1700,7 +1700,7 @@ PalletTown:: @ 8350618 .byte 0x58, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 ViridianCity:: @ 8350634 - .4byte gMapData_ViridianCity @ 0x82DE3E4 + .4byte ViridianCity_Layout @ 0x82DE3E4 .4byte gMapEvents_ViridianCity @ 0x83B4FE0 .4byte gMapScripts_ViridianCity @ 0x81658D3 .4byte gMapConnections_ViridianCity @ 0x8352798 @@ -1709,7 +1709,7 @@ ViridianCity:: @ 8350634 .byte 0x59, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 PewterCity:: @ 8350650 - .4byte gMapData_PewterCity @ 0x82DF308 + .4byte PewterCity_Layout @ 0x82DF308 .4byte gMapEvents_PewterCity @ 0x83B518C .4byte gMapScripts_PewterCity @ 0x8165B8E .4byte gMapConnections_PewterCity @ 0x83527B8 @@ -1718,7 +1718,7 @@ PewterCity:: @ 8350650 .byte 0x5a, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 CeruleanCity:: @ 835066C - .4byte gMapData_CeruleanCity @ 0x82E022C + .4byte CeruleanCity_Layout @ 0x82E022C .4byte gMapEvents_CeruleanCity @ 0x83B53E0 .4byte gMapScripts_CeruleanCity @ 0x8166471 .4byte gMapConnections_CeruleanCity @ 0x83527F0 @@ -1727,7 +1727,7 @@ CeruleanCity:: @ 835066C .byte 0x5b, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 LavenderTown:: @ 8350688 - .4byte gMapData_LavenderTown @ 0x82E0610 + .4byte LavenderTown_Layout @ 0x82E0610 .4byte gMapEvents_LavenderTown @ 0x83B549C .4byte gMapScripts_LavenderTown @ 0x816686B .4byte gMapConnections_LavenderTown @ 0x835281C @@ -1736,7 +1736,7 @@ LavenderTown:: @ 8350688 .byte 0x5c, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 VermilionCity:: @ 83506A4 - .4byte gMapData_VermilionCity @ 0x82E1534 + .4byte VermilionCity_Layout @ 0x82E1534 .4byte gMapEvents_VermilionCity @ 0x83B5648 .4byte gMapScripts_VermilionCity @ 0x81668DC .4byte gMapConnections_VermilionCity @ 0x835283C @@ -1745,7 +1745,7 @@ VermilionCity:: @ 83506A4 .byte 0x5d, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 CeladonCity:: @ 83506C0 - .4byte gMapData_CeladonCity @ 0x82E2818 + .4byte CeladonCity_Layout @ 0x82E2818 .4byte gMapEvents_CeladonCity @ 0x83B5898 .4byte gMapScripts_CeladonCity @ 0x8166C8F .4byte gMapConnections_CeladonCity @ 0x835285C @@ -1754,7 +1754,7 @@ CeladonCity:: @ 83506C0 .byte 0x5e, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 FuchsiaCity:: @ 83506DC - .4byte gMapData_FuchsiaCity @ 0x82E373C + .4byte FuchsiaCity_Layout @ 0x82E373C .4byte gMapEvents_FuchsiaCity @ 0x83B5B14 .4byte gMapScripts_FuchsiaCity @ 0x8166D75 .4byte gMapConnections_FuchsiaCity @ 0x8352888 @@ -1763,7 +1763,7 @@ FuchsiaCity:: @ 83506DC .byte 0x5f, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 CinnabarIsland:: @ 83506F8 - .4byte gMapData_CinnabarIsland @ 0x82E3B20 + .4byte CinnabarIsland_Layout @ 0x82E3B20 .4byte gMapEvents_CinnabarIsland @ 0x83B5BF0 .4byte gMapScripts_CinnabarIsland @ 0x8166ED6 .4byte gMapConnections_CinnabarIsland @ 0x83528A8 @@ -1772,7 +1772,7 @@ CinnabarIsland:: @ 83506F8 .byte 0x60, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 IndigoPlateau_Exterior:: @ 8350714 - .4byte gMapData_IndigoPlateau_Exterior @ 0x82E3F04 + .4byte IndigoPlateau_Exterior_Layout @ 0x82E3F04 .4byte gMapEvents_IndigoPlateau_Exterior @ 0x83B5C3C .4byte gMapScripts_IndigoPlateau_Exterior @ 0x816723B .4byte gMapConnections_IndigoPlateau_Exterior @ 0x83528BC @@ -1781,7 +1781,7 @@ IndigoPlateau_Exterior:: @ 8350714 .byte 0x61, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 SaffronCity_Duplicate:: @ 8350730 - .4byte gMapData_SaffronCity_Duplicate @ 0x831E8D4 + .4byte SaffronCity_Duplicate_Layout @ 0x831E8D4 .4byte gMapEvents_SaffronCity_Duplicate @ 0x83B5E9C .4byte gMapScripts_SaffronCity_Duplicate @ 0x816735F .4byte NULL @@ -1790,7 +1790,7 @@ SaffronCity_Duplicate:: @ 8350730 .byte 0x62, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 SaffronCity:: @ 835074C - .4byte gMapData_SaffronCity @ 0x82E4E28 + .4byte SaffronCity_Layout @ 0x82E4E28 .4byte gMapEvents_SaffronCity @ 0x83B5EB0 .4byte gMapScripts_SaffronCity @ 0x8167483 .4byte gMapConnections_SaffronCity @ 0x835292C @@ -1799,7 +1799,7 @@ SaffronCity:: @ 835074C .byte 0x62, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 OneIsland:: @ 8350768 - .4byte gMapData_OneIsland @ 0x8321714 + .4byte OneIsland_Layout @ 0x8321714 .4byte gMapEvents_OneIsland @ 0x83B5F44 .4byte gMapScripts_OneIsland @ 0x8167484 .4byte gMapConnections_OneIsland @ 0x835294C @@ -1808,7 +1808,7 @@ OneIsland:: @ 8350768 .byte 0x8f, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 TwoIsland:: @ 8350784 - .4byte gMapData_TwoIsland @ 0x8321EB8 + .4byte TwoIsland_Layout @ 0x8321EB8 .4byte gMapEvents_TwoIsland @ 0x83B6074 .4byte gMapScripts_TwoIsland @ 0x8167564 .4byte gMapConnections_TwoIsland @ 0x8352960 @@ -1817,7 +1817,7 @@ TwoIsland:: @ 8350784 .byte 0x90, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 ThreeIsland:: @ 83507A0 - .4byte gMapData_ThreeIsland @ 0x832265C + .4byte ThreeIsland_Layout @ 0x832265C .4byte gMapEvents_ThreeIsland @ 0x83B62C8 .4byte gMapScripts_ThreeIsland @ 0x81677AD .4byte gMapConnections_ThreeIsland @ 0x8352980 @@ -1826,7 +1826,7 @@ ThreeIsland:: @ 83507A0 .byte 0x91, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 FourIsland:: @ 83507BC - .4byte gMapData_FourIsland @ 0x8323580 + .4byte FourIsland_Layout @ 0x8323580 .4byte gMapEvents_FourIsland @ 0x83B646C .4byte gMapScripts_FourIsland @ 0x8167CAE .4byte NULL @@ -1835,7 +1835,7 @@ FourIsland:: @ 83507BC .byte 0x92, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 FiveIsland:: @ 83507D8 - .4byte gMapData_FiveIsland @ 0x8323964 + .4byte FiveIsland_Layout @ 0x8323964 .4byte gMapEvents_FiveIsland @ 0x83B64F4 .4byte gMapScripts_FiveIsland @ 0x8167E8E .4byte gMapConnections_FiveIsland @ 0x83529A0 @@ -1844,7 +1844,7 @@ FiveIsland:: @ 83507D8 .byte 0x93, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 SevenIsland:: @ 83507F4 - .4byte gMapData_SevenIsland @ 0x8323D48 + .4byte SevenIsland_Layout @ 0x8323D48 .4byte gMapEvents_SevenIsland @ 0x83B657C .4byte gMapScripts_SevenIsland @ 0x8167EB3 .4byte gMapConnections_SevenIsland @ 0x83529C0 @@ -1853,7 +1853,7 @@ SevenIsland:: @ 83507F4 .byte 0x94, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 SixIsland:: @ 8350810 - .4byte gMapData_SixIsland @ 0x832430C + .4byte SixIsland_Layout @ 0x832430C .4byte gMapEvents_SixIsland @ 0x83B65F8 .4byte gMapScripts_SixIsland @ 0x8167ED8 .4byte gMapConnections_SixIsland @ 0x83529D4 @@ -1862,7 +1862,7 @@ SixIsland:: @ 8350810 .byte 0x95, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 Route1:: @ 835082C - .4byte gMapData_Route1 @ 0x82E55CC + .4byte Route1_Layout @ 0x82E55CC .4byte gMapEvents_Route1 @ 0x83B6648 .4byte gMapScripts_Route1 @ 0x8167EFD .4byte gMapConnections_Route1 @ 0x83529F4 @@ -1871,7 +1871,7 @@ Route1:: @ 835082C .byte 0x65, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 Route2:: @ 8350848 - .4byte gMapData_Route2 @ 0x82E64F0 + .4byte Route2_Layout @ 0x82E64F0 .4byte gMapEvents_Route2 @ 0x83B676C .4byte gMapScripts_Route2 @ 0x8167F64 .4byte gMapConnections_Route2 @ 0x8352A14 @@ -1880,7 +1880,7 @@ Route2:: @ 8350848 .byte 0x66, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 Route3:: @ 8350864 - .4byte gMapData_Route3 @ 0x82E7234 + .4byte Route3_Layout @ 0x82E7234 .4byte gMapEvents_Route3 @ 0x83B6870 .4byte gMapScripts_Route3 @ 0x8167F77 .4byte gMapConnections_Route3 @ 0x8352A34 @@ -1889,7 +1889,7 @@ Route3:: @ 8350864 .byte 0x67, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 Route4:: @ 8350880 - .4byte gMapData_Route4 @ 0x82E8338 + .4byte Route4_Layout @ 0x82E8338 .4byte gMapEvents_Route4 @ 0x83B6980 .4byte gMapScripts_Route4 @ 0x8167F8A .4byte gMapConnections_Route4 @ 0x8352A54 @@ -1898,7 +1898,7 @@ Route4:: @ 8350880 .byte 0x68, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 Route5:: @ 835089C - .4byte gMapData_Route5 @ 0x82E925C + .4byte Route5_Layout @ 0x82E925C .4byte gMapEvents_Route5 @ 0x83B69C0 .4byte gMapScripts_Route5 @ 0x8167FA7 .4byte gMapConnections_Route5 @ 0x8352A74 @@ -1907,7 +1907,7 @@ Route5:: @ 835089C .byte 0x69, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 Route6:: @ 83508B8 - .4byte gMapData_Route6 @ 0x82E9A00 + .4byte Route6_Layout @ 0x82E9A00 .4byte gMapEvents_Route6 @ 0x83B6AA0 .4byte gMapScripts_Route6 @ 0x8167FB1 .4byte gMapConnections_Route6 @ 0x8352A94 @@ -1916,7 +1916,7 @@ Route6:: @ 83508B8 .byte 0x6a, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 Route7:: @ 83508D4 - .4byte gMapData_Route7 @ 0x82E9DE4 + .4byte Route7_Layout @ 0x82E9DE4 .4byte gMapEvents_Route7 @ 0x83B6AF4 .4byte gMapScripts_Route7 @ 0x8167FBB .4byte gMapConnections_Route7 @ 0x8352AB4 @@ -1925,7 +1925,7 @@ Route7:: @ 83508D4 .byte 0x6b, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 Route8:: @ 83508F0 - .4byte gMapData_Route8 @ 0x82EA948 + .4byte Route8_Layout @ 0x82EA948 .4byte gMapEvents_Route8 @ 0x83B6CB0 .4byte gMapScripts_Route8 @ 0x8167FC5 .4byte gMapConnections_Route8 @ 0x8352AD4 @@ -1934,7 +1934,7 @@ Route8:: @ 83508F0 .byte 0x6c, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 Route9:: @ 835090C - .4byte gMapData_Route9 @ 0x82EB4AC + .4byte Route9_Layout @ 0x82EB4AC .4byte gMapEvents_Route9 @ 0x83B6E14 .4byte gMapScripts_Route9 @ 0x8167FCF .4byte gMapConnections_Route9 @ 0x8352AF4 @@ -1943,7 +1943,7 @@ Route9:: @ 835090C .byte 0x6d, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 Route10:: @ 8350928 - .4byte gMapData_Route10 @ 0x82EC3D0 + .4byte Route10_Layout @ 0x82EC3D0 .4byte gMapEvents_Route10 @ 0x83B6FA0 .4byte gMapScripts_Route10 @ 0x8167FD9 .4byte gMapConnections_Route10 @ 0x8352B14 @@ -1952,7 +1952,7 @@ Route10:: @ 8350928 .byte 0x6e, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 Route11:: @ 8350944 - .4byte gMapData_Route11 @ 0x82ECF34 + .4byte Route11_Layout @ 0x82ECF34 .4byte gMapEvents_Route11 @ 0x83B711C .4byte gMapScripts_Route11 @ 0x8167FF6 .4byte gMapConnections_Route11 @ 0x8352B34 @@ -1961,7 +1961,7 @@ Route11:: @ 8350944 .byte 0x6f, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 Route12:: @ 8350960 - .4byte gMapData_Route12 @ 0x82EE5D8 + .4byte Route12_Layout @ 0x82EE5D8 .4byte gMapEvents_Route12 @ 0x83B72DC .4byte gMapScripts_Route12 @ 0x8168000 .4byte gMapConnections_Route12 @ 0x8352B60 @@ -1970,7 +1970,7 @@ Route12:: @ 8350960 .byte 0x70, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 Route13:: @ 835097C - .4byte gMapData_Route13 @ 0x82EF13C + .4byte Route13_Layout @ 0x82EF13C .4byte gMapEvents_Route13 @ 0x83B7428 .4byte gMapScripts_Route13 @ 0x81680B5 .4byte gMapConnections_Route13 @ 0x8352B80 @@ -1979,7 +1979,7 @@ Route13:: @ 835097C .byte 0x71, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 Route14:: @ 8350998 - .4byte gMapData_Route14 @ 0x82EFCA0 + .4byte Route14_Layout @ 0x82EFCA0 .4byte gMapEvents_Route14 @ 0x83B75C8 .4byte gMapScripts_Route14 @ 0x81680D1 .4byte gMapConnections_Route14 @ 0x8352BA0 @@ -1988,7 +1988,7 @@ Route14:: @ 8350998 .byte 0x72, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 Route15:: @ 83509B4 - .4byte gMapData_Route15 @ 0x82F0804 + .4byte Route15_Layout @ 0x82F0804 .4byte gMapEvents_Route15 @ 0x83B7748 .4byte gMapScripts_Route15 @ 0x81680DB .4byte gMapConnections_Route15 @ 0x8352BC0 @@ -1997,7 +1997,7 @@ Route15:: @ 83509B4 .byte 0x73, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 Route16:: @ 83509D0 - .4byte gMapData_Route16 @ 0x82F0FA8 + .4byte Route16_Layout @ 0x82F0FA8 .4byte gMapEvents_Route16 @ 0x83B7898 .4byte gMapScripts_Route16 @ 0x81680E5 .4byte gMapConnections_Route16 @ 0x8352BE0 @@ -2006,7 +2006,7 @@ Route16:: @ 83509D0 .byte 0x74, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 Route17:: @ 83509EC - .4byte gMapData_Route17 @ 0x82F2DCC + .4byte Route17_Layout @ 0x82F2DCC .4byte gMapEvents_Route17 @ 0x83B7A20 .4byte gMapScripts_Route17 @ 0x81681BF .4byte gMapConnections_Route17 @ 0x8352C00 @@ -2015,7 +2015,7 @@ Route17:: @ 83509EC .byte 0x75, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 Route18:: @ 8350A08 - .4byte gMapData_Route18 @ 0x82F3750 + .4byte Route18_Layout @ 0x82F3750 .4byte gMapEvents_Route18 @ 0x83B7AA4 .4byte gMapScripts_Route18 @ 0x81681F6 .4byte gMapConnections_Route18 @ 0x8352C20 @@ -2024,7 +2024,7 @@ Route18:: @ 8350A08 .byte 0x76, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 Route19:: @ 8350A24 - .4byte gMapData_Route19 @ 0x82F42B4 + .4byte Route19_Layout @ 0x82F42B4 .4byte gMapEvents_Route19 @ 0x83B7BE4 .4byte gMapScripts_Route19 @ 0x8168231 .4byte gMapConnections_Route19 @ 0x8352C40 @@ -2033,7 +2033,7 @@ Route19:: @ 8350A24 .byte 0x77, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 Route20:: @ 8350A40 - .4byte gMapData_Route20 @ 0x82F5598 + .4byte Route20_Layout @ 0x82F5598 .4byte gMapEvents_Route20 @ 0x83B7D34 .4byte gMapScripts_Route20 @ 0x816823B .4byte gMapConnections_Route20 @ 0x8352C60 @@ -2042,7 +2042,7 @@ Route20:: @ 8350A40 .byte 0x78, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 Route21_North:: @ 8350A5C - .4byte gMapData_Route21_North @ 0x82F5F1C + .4byte Route21_North_Layout @ 0x82F5F1C .4byte gMapEvents_Route21_North @ 0x83B7DE4 .4byte gMapScripts_Route21_North @ 0x8168289 .4byte gMapConnections_Route21_North @ 0x8352C80 @@ -2051,7 +2051,7 @@ Route21_North:: @ 8350A5C .byte 0x79, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 Route21_South:: @ 8350A78 - .4byte gMapData_Route21_South @ 0x83206C0 + .4byte Route21_South_Layout @ 0x83206C0 .4byte gMapEvents_Route21_South @ 0x83B7E70 .4byte gMapScripts_Route21_South @ 0x816828A .4byte gMapConnections_Route21_South @ 0x8352CA0 @@ -2060,7 +2060,7 @@ Route21_South:: @ 8350A78 .byte 0x79, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 Route22:: @ 8350A94 - .4byte gMapData_Route22 @ 0x82F6840 + .4byte Route22_Layout @ 0x82F6840 .4byte gMapEvents_Route22 @ 0x83B7F18 .4byte gMapScripts_Route22 @ 0x816828B .4byte gMapConnections_Route22 @ 0x8352CC0 @@ -2069,7 +2069,7 @@ Route22:: @ 8350A94 .byte 0x7a, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 Route23:: @ 8350AB0 - .4byte gMapData_Route23 @ 0x82F8664 + .4byte Route23_Layout @ 0x82F8664 .4byte gMapEvents_Route23 @ 0x83B8300 .4byte gMapScripts_Route23 @ 0x81684EB .4byte gMapConnections_Route23 @ 0x8352CE0 @@ -2078,7 +2078,7 @@ Route23:: @ 8350AB0 .byte 0x7b, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 Route24:: @ 8350ACC - .4byte gMapData_Route24 @ 0x82F8E08 + .4byte Route24_Layout @ 0x82F8E08 .4byte gMapEvents_Route24 @ 0x83B8400 .4byte gMapScripts_Route24 @ 0x816861F .4byte gMapConnections_Route24 @ 0x8352D00 @@ -2087,7 +2087,7 @@ Route24:: @ 8350ACC .byte 0x7c, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 Route25:: @ 8350AE8 - .4byte gMapData_Route25 @ 0x82F996C + .4byte Route25_Layout @ 0x82F996C .4byte gMapEvents_Route25 @ 0x83B8590 .4byte gMapScripts_Route25 @ 0x8168745 .4byte gMapConnections_Route25 @ 0x8352D14 @@ -2096,7 +2096,7 @@ Route25:: @ 8350AE8 .byte 0x7d, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 OneIsland_KindleRoad:: @ 8350B04 - .4byte gMapData_OneIsland_KindleRoad @ 0x8325D70 + .4byte OneIsland_KindleRoad_Layout @ 0x8325D70 .4byte gMapEvents_OneIsland_KindleRoad @ 0x83B888C .4byte gMapScripts_OneIsland_KindleRoad @ 0x8168758 .4byte gMapConnections_OneIsland_KindleRoad @ 0x8352D28 @@ -2105,7 +2105,7 @@ OneIsland_KindleRoad:: @ 8350B04 .byte 0x96, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 OneIsland_TreasureBeach:: @ 8350B20 - .4byte gMapData_OneIsland_TreasureBeach @ 0x8326514 + .4byte OneIsland_TreasureBeach_Layout @ 0x8326514 .4byte gMapEvents_OneIsland_TreasureBeach @ 0x83B8930 .4byte gMapScripts_OneIsland_TreasureBeach @ 0x816876B .4byte gMapConnections_OneIsland_TreasureBeach @ 0x8352D3C @@ -2114,7 +2114,7 @@ OneIsland_TreasureBeach:: @ 8350B20 .byte 0x97, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 TwoIsland_CapeBrink:: @ 8350B3C - .4byte gMapData_TwoIsland_CapeBrink @ 0x8326CB8 + .4byte TwoIsland_CapeBrink_Layout @ 0x8326CB8 .4byte gMapEvents_TwoIsland_CapeBrink @ 0x83B8964 .4byte gMapScripts_TwoIsland_CapeBrink @ 0x8168775 .4byte gMapConnections_TwoIsland_CapeBrink @ 0x8352D50 @@ -2123,7 +2123,7 @@ TwoIsland_CapeBrink:: @ 8350B3C .byte 0x98, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 ThreeIsland_BondBridge:: @ 8350B58 - .4byte gMapData_ThreeIsland_BondBridge @ 0x8327BDC + .4byte ThreeIsland_BondBridge_Layout @ 0x8327BDC .4byte gMapEvents_ThreeIsland_BondBridge @ 0x83B8A9C .4byte gMapScripts_ThreeIsland_BondBridge @ 0x8168776 .4byte gMapConnections_ThreeIsland_BondBridge @ 0x8352D64 @@ -2132,7 +2132,7 @@ ThreeIsland_BondBridge:: @ 8350B58 .byte 0x99, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 ThreeIsland_Port:: @ 8350B74 - .4byte gMapData_ThreeIsland_Port @ 0x8328380 + .4byte ThreeIsland_Port_Layout @ 0x8328380 .4byte gMapEvents_ThreeIsland_Port @ 0x83B8B10 .4byte gMapScripts_ThreeIsland_Port @ 0x8168789 .4byte gMapConnections_ThreeIsland_Port @ 0x8352D78 @@ -2141,7 +2141,7 @@ ThreeIsland_Port:: @ 8350B74 .byte 0x9a, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 UnknownMap_03_50:: @ 8350B90 - .4byte gMapData_UnknownMap_03_50 @ 0x83283A8 + .4byte UnknownMap_03_50_Layout @ 0x83283A8 .4byte gMapEvents_UnknownMap_03_50 @ 0x83B8B24 .4byte gMapScripts_UnknownMap_03_50 @ 0x81687E0 .4byte gMapConnections_UnknownMap_03_50 @ 0x8352D8C @@ -2150,7 +2150,7 @@ UnknownMap_03_50:: @ 8350B90 .byte 0x9b, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 UnknownMap_03_51:: @ 8350BAC - .4byte gMapData_UnknownMap_03_51 @ 0x83283D0 + .4byte UnknownMap_03_51_Layout @ 0x83283D0 .4byte gMapEvents_UnknownMap_03_51 @ 0x83B8B38 .4byte gMapScripts_UnknownMap_03_51 @ 0x81687E1 .4byte gMapConnections_UnknownMap_03_51 @ 0x8352DA0 @@ -2159,7 +2159,7 @@ UnknownMap_03_51:: @ 8350BAC .byte 0x9c, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 UnknownMap_03_52:: @ 8350BC8 - .4byte gMapData_UnknownMap_03_52 @ 0x8329114 + .4byte UnknownMap_03_52_Layout @ 0x8329114 .4byte gMapEvents_UnknownMap_03_52 @ 0x83B8B4C .4byte gMapScripts_UnknownMap_03_52 @ 0x81687E2 .4byte NULL @@ -2168,7 +2168,7 @@ UnknownMap_03_52:: @ 8350BC8 .byte 0x9d, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 UnknownMap_03_53:: @ 8350BE4 - .4byte gMapData_UnknownMap_03_53 @ 0x8329C78 + .4byte UnknownMap_03_53_Layout @ 0x8329C78 .4byte gMapEvents_UnknownMap_03_53 @ 0x83B8B60 .4byte gMapScripts_UnknownMap_03_53 @ 0x81687E3 .4byte NULL @@ -2177,7 +2177,7 @@ UnknownMap_03_53:: @ 8350BE4 .byte 0x9e, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 FiveIsland_ResortGorgeous:: @ 8350C00 - .4byte gMapData_FiveIsland_ResortGorgeous @ 0x832A7DC + .4byte FiveIsland_ResortGorgeous_Layout @ 0x832A7DC .4byte gMapEvents_FiveIsland_ResortGorgeous @ 0x83B8C80 .4byte gMapScripts_FiveIsland_ResortGorgeous @ 0x81687E4 .4byte gMapConnections_FiveIsland_ResortGorgeous @ 0x8352DB4 @@ -2186,7 +2186,7 @@ FiveIsland_ResortGorgeous:: @ 8350C00 .byte 0x9f, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 FiveIsland_WaterLabyrinth:: @ 8350C1C - .4byte gMapData_FiveIsland_WaterLabyrinth @ 0x832B340 + .4byte FiveIsland_WaterLabyrinth_Layout @ 0x832B340 .4byte gMapEvents_FiveIsland_WaterLabyrinth @ 0x83B8CC4 .4byte gMapScripts_FiveIsland_WaterLabyrinth @ 0x816884D .4byte gMapConnections_FiveIsland_WaterLabyrinth @ 0x8352DD4 @@ -2195,7 +2195,7 @@ FiveIsland_WaterLabyrinth:: @ 8350C1C .byte 0xa0, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 FiveIsland_Meadow:: @ 8350C38 - .4byte gMapData_FiveIsland_Meadow @ 0x832BAE4 + .4byte FiveIsland_Meadow_Layout @ 0x832BAE4 .4byte gMapEvents_FiveIsland_Meadow @ 0x83B8D94 .4byte gMapScripts_FiveIsland_Meadow @ 0x8168932 .4byte gMapConnections_FiveIsland_Meadow @ 0x8352DF4 @@ -2204,7 +2204,7 @@ FiveIsland_Meadow:: @ 8350C38 .byte 0xa1, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 FiveIsland_MemorialPillar:: @ 8350C54 - .4byte gMapData_FiveIsland_MemorialPillar @ 0x832C648 + .4byte FiveIsland_MemorialPillar_Layout @ 0x832C648 .4byte gMapEvents_FiveIsland_MemorialPillar @ 0x83B8E5C .4byte gMapScripts_FiveIsland_MemorialPillar @ 0x81689D2 .4byte gMapConnections_FiveIsland_MemorialPillar @ 0x8352E08 @@ -2213,7 +2213,7 @@ FiveIsland_MemorialPillar:: @ 8350C54 .byte 0xa2, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 SixIsland_OutcastIsland:: @ 8350C70 - .4byte gMapData_SixIsland_OutcastIsland @ 0x832D56C + .4byte SixIsland_OutcastIsland_Layout @ 0x832D56C .4byte gMapEvents_SixIsland_OutcastIsland @ 0x83B8F38 .4byte gMapScripts_SixIsland_OutcastIsland @ 0x8168B15 .4byte gMapConnections_SixIsland_OutcastIsland @ 0x8352E1C @@ -2222,7 +2222,7 @@ SixIsland_OutcastIsland:: @ 8350C70 .byte 0xa3, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 SixIsland_GreenPath:: @ 8350C8C - .4byte gMapData_SixIsland_GreenPath @ 0x832E0D0 + .4byte SixIsland_GreenPath_Layout @ 0x832E0D0 .4byte gMapEvents_SixIsland_GreenPath @ 0x83B8FA8 .4byte gMapScripts_SixIsland_GreenPath @ 0x8168B2D .4byte gMapConnections_SixIsland_GreenPath @ 0x8352E3C @@ -2231,7 +2231,7 @@ SixIsland_GreenPath:: @ 8350C8C .byte 0xa4, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 SixIsland_WaterPath:: @ 8350CA8 - .4byte gMapData_SixIsland_WaterPath @ 0x832F3B4 + .4byte SixIsland_WaterPath_Layout @ 0x832F3B4 .4byte gMapEvents_SixIsland_WaterPath @ 0x83B90E0 .4byte gMapScripts_SixIsland_WaterPath @ 0x8168B40 .4byte gMapConnections_SixIsland_WaterPath @ 0x8352E68 @@ -2240,7 +2240,7 @@ SixIsland_WaterPath:: @ 8350CA8 .byte 0xa5, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 SixIsland_RuinValley:: @ 8350CC4 - .4byte gMapData_SixIsland_RuinValley @ 0x83302D8 + .4byte SixIsland_RuinValley_Layout @ 0x83302D8 .4byte gMapEvents_SixIsland_RuinValley @ 0x83B92A0 .4byte gMapScripts_SixIsland_RuinValley @ 0x8168B53 .4byte gMapConnections_SixIsland_RuinValley @ 0x8352E7C @@ -2249,7 +2249,7 @@ SixIsland_RuinValley:: @ 8350CC4 .byte 0xa6, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 SevenIsland_TrainerTower:: @ 8350CE0 - .4byte gMapData_SevenIsland_TrainerTower @ 0x833287C + .4byte SevenIsland_TrainerTower_Layout @ 0x833287C .4byte gMapEvents_SevenIsland_TrainerTower @ 0x83B9328 .4byte gMapScripts_SevenIsland_TrainerTower @ 0x8168BD5 .4byte gMapConnections_SevenIsland_TrainerTower @ 0x8352E90 @@ -2258,7 +2258,7 @@ SevenIsland_TrainerTower:: @ 8350CE0 .byte 0xa7, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 SevenIsland_SevaultCanyon_Entrance:: @ 8350CFC - .4byte gMapData_SevenIsland_SevaultCanyon_Entrance @ 0x8333020 + .4byte SevenIsland_SevaultCanyon_Entrance_Layout @ 0x8333020 .4byte gMapEvents_SevenIsland_SevaultCanyon_Entrance @ 0x83B93FC .4byte gMapScripts_SevenIsland_SevaultCanyon_Entrance @ 0x8168BF3 .4byte gMapConnections_SevenIsland_SevaultCanyon_Entrance @ 0x8352EB0 @@ -2267,7 +2267,7 @@ SevenIsland_SevaultCanyon_Entrance:: @ 8350CFC .byte 0xa8, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 SevenIsland_SevaultCanyon:: @ 8350D18 - .4byte gMapData_SevenIsland_SevaultCanyon @ 0x8333F44 + .4byte SevenIsland_SevaultCanyon_Layout @ 0x8333F44 .4byte gMapEvents_SevenIsland_SevaultCanyon @ 0x83B9618 .4byte gMapScripts_SevenIsland_SevaultCanyon @ 0x8168BFD .4byte gMapConnections_SevenIsland_SevaultCanyon @ 0x8352ED0 @@ -2276,7 +2276,7 @@ SevenIsland_SevaultCanyon:: @ 8350D18 .byte 0xa9, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 SevenIsland_TanobyRuins:: @ 8350D34 - .4byte gMapData_SevenIsland_TanobyRuins @ 0x83355E8 + .4byte SevenIsland_TanobyRuins_Layout @ 0x83355E8 .4byte gMapEvents_SevenIsland_TanobyRuins @ 0x83B96F4 .4byte gMapScripts_SevenIsland_TanobyRuins @ 0x8168C07 .4byte gMapConnections_SevenIsland_TanobyRuins @ 0x8352EE4 @@ -2285,7 +2285,7 @@ SevenIsland_TanobyRuins:: @ 8350D34 .byte 0xaa, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 PalletTown_PlayersHouse_1F:: @ 8350D50 - .4byte gMapData_PalletTown_PlayersHouse_1F @ 0x82D5200 + .4byte PalletTown_PlayersHouse_1F_Layout @ 0x82D5200 .4byte gMapEvents_PalletTown_PlayersHouse_1F @ 0x83B974C .4byte gMapScripts_PalletTown_PlayersHouse_1F @ 0x8168C08 .4byte NULL @@ -2294,7 +2294,7 @@ PalletTown_PlayersHouse_1F:: @ 8350D50 .byte 0x58, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 PalletTown_PlayersHouse_2F:: @ 8350D6C - .4byte gMapData_PalletTown_PlayersHouse_2F @ 0x82D52FC + .4byte PalletTown_PlayersHouse_2F_Layout @ 0x82D52FC .4byte gMapEvents_PalletTown_PlayersHouse_2F @ 0x83B978C .4byte gMapScripts_PalletTown_PlayersHouse_2F @ 0x8168CA3 .4byte NULL @@ -2303,7 +2303,7 @@ PalletTown_PlayersHouse_2F:: @ 8350D6C .byte 0x58, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 PalletTown_GarysHouse:: @ 8350D88 - .4byte gMapData_PalletTown_GarysHouse @ 0x82D5424 + .4byte PalletTown_GarysHouse_Layout @ 0x82D5424 .4byte gMapEvents_PalletTown_GarysHouse @ 0x83B980C .4byte gMapScripts_PalletTown_GarysHouse @ 0x8168D27 .4byte NULL @@ -2312,7 +2312,7 @@ PalletTown_GarysHouse:: @ 8350D88 .byte 0x58, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 PalletTown_ProfessorOaksLab:: @ 8350DA4 - .4byte gMapData_PalletTown_ProfessorOaksLab @ 0x82D5668 + .4byte PalletTown_ProfessorOaksLab_Layout @ 0x82D5668 .4byte gMapEvents_PalletTown_ProfessorOaksLab @ 0x83B99B8 .4byte gMapScripts_PalletTown_ProfessorOaksLab @ 0x8168F7E .4byte NULL @@ -2321,7 +2321,7 @@ PalletTown_ProfessorOaksLab:: @ 8350DA4 .byte 0x58, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 ViridianCity_House1:: @ 8350DC0 - .4byte gMapData_ViridianCity_House1 @ 0x833AEAC + .4byte ViridianCity_House1_Layout @ 0x833AEAC .4byte gMapEvents_ViridianCity_House1 @ 0x83B9A38 .4byte gMapScripts_ViridianCity_House1 @ 0x8169E9A .4byte NULL @@ -2330,7 +2330,7 @@ ViridianCity_House1:: @ 8350DC0 .byte 0x59, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 ViridianCity_Gym:: @ 8350DDC - .4byte gMapData_ViridianCity_Gym @ 0x82D86AC + .4byte ViridianCity_Gym_Layout @ 0x82D86AC .4byte gMapEvents_ViridianCity_Gym @ 0x83B9B78 .4byte gMapScripts_ViridianCity_Gym @ 0x8169EC9 .4byte NULL @@ -2339,7 +2339,7 @@ ViridianCity_Gym:: @ 8350DDC .byte 0x59, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01 ViridianCity_House2:: @ 8350DF8 - .4byte gMapData_ViridianCity_House2 @ 0x8338D20 + .4byte ViridianCity_House2_Layout @ 0x8338D20 .4byte gMapEvents_ViridianCity_House2 @ 0x83B9C10 .4byte gMapScripts_ViridianCity_House2 @ 0x816A07C .4byte NULL @@ -2348,7 +2348,7 @@ ViridianCity_House2:: @ 8350DF8 .byte 0x59, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 ViridianCity_Mart:: @ 8350E14 - .4byte gMapData_ViridianCity_Mart @ 0x82D5BCC + .4byte Mart_Layout @ 0x82D5BCC .4byte gMapEvents_ViridianCity_Mart @ 0x83B9C84 .4byte gMapScripts_ViridianCity_Mart @ 0x816A1D3 .4byte NULL @@ -2357,7 +2357,7 @@ ViridianCity_Mart:: @ 8350E14 .byte 0x59, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 ViridianCity_PokemonCenter_1F:: @ 8350E30 - .4byte gMapData_ViridianCity_PokemonCenter_1F @ 0x82D5990 + .4byte PokemonCenter_1F_Layout @ 0x82D5990 .4byte gMapEvents_ViridianCity_PokemonCenter_1F @ 0x83B9D18 .4byte gMapScripts_ViridianCity_PokemonCenter_1F @ 0x816A2C0 .4byte NULL @@ -2366,7 +2366,7 @@ ViridianCity_PokemonCenter_1F:: @ 8350E30 .byte 0x59, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 ViridianCity_PokemonCenter_2F:: @ 8350E4C - .4byte gMapData_ViridianCity_PokemonCenter_2F @ 0x82D5AE0 + .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 .4byte gMapEvents_ViridianCity_PokemonCenter_2F @ 0x83B9DA4 .4byte gMapScripts_ViridianCity_PokemonCenter_2F @ 0x816A2F3 .4byte NULL @@ -2375,7 +2375,7 @@ ViridianCity_PokemonCenter_2F:: @ 8350E4C .byte 0x59, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 PewterCity_Museum_1F:: @ 8350E68 - .4byte gMapData_PewterCity_Museum_1F @ 0x831A1FC + .4byte PewterCity_Museum_1F_Layout @ 0x831A1FC .4byte gMapEvents_PewterCity_Museum_1F @ 0x83B9ED8 .4byte gMapScripts_PewterCity_Museum_1F @ 0x816A31A .4byte NULL @@ -2384,7 +2384,7 @@ PewterCity_Museum_1F:: @ 8350E68 .byte 0x5a, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 PewterCity_Museum_2F:: @ 8350E84 - .4byte gMapData_PewterCity_Museum_2F @ 0x831A39C + .4byte PewterCity_Museum_2F_Layout @ 0x831A39C .4byte gMapEvents_PewterCity_Museum_2F @ 0x83B9FCC .4byte gMapScripts_PewterCity_Museum_2F @ 0x816A552 .4byte NULL @@ -2393,7 +2393,7 @@ PewterCity_Museum_2F:: @ 8350E84 .byte 0x5a, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 PewterCity_Gym:: @ 8350EA0 - .4byte gMapData_PewterCity_Gym @ 0x82D732C + .4byte PewterCity_Gym_Layout @ 0x82D732C .4byte gMapEvents_PewterCity_Gym @ 0x83BA058 .4byte gMapScripts_PewterCity_Gym @ 0x816A592 .4byte NULL @@ -2402,7 +2402,7 @@ PewterCity_Gym:: @ 8350EA0 .byte 0x5a, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01 PewterCity_Mart:: @ 8350EBC - .4byte gMapData_PewterCity_Mart @ 0x82D5BCC + .4byte Mart_Layout @ 0x82D5BCC .4byte gMapEvents_PewterCity_Mart @ 0x83BA0CC .4byte gMapScripts_PewterCity_Mart @ 0x816A6CD .4byte NULL @@ -2411,7 +2411,7 @@ PewterCity_Mart:: @ 8350EBC .byte 0x5a, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 PewterCity_House1:: @ 8350ED8 - .4byte gMapData_PewterCity_House1 @ 0x82D5840 + .4byte House2_Layout @ 0x82D5840 .4byte gMapEvents_PewterCity_House1 @ 0x83BA140 .4byte gMapScripts_PewterCity_House1 @ 0x816A71C .4byte NULL @@ -2420,7 +2420,7 @@ PewterCity_House1:: @ 8350ED8 .byte 0x5a, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 PewterCity_PokemonCenter_1F:: @ 8350EF4 - .4byte gMapData_PewterCity_PokemonCenter_1F @ 0x82D5990 + .4byte PokemonCenter_1F_Layout @ 0x82D5990 .4byte gMapEvents_PewterCity_PokemonCenter_1F @ 0x83BA21C .4byte gMapScripts_PewterCity_PokemonCenter_1F @ 0x816A760 .4byte NULL @@ -2429,7 +2429,7 @@ PewterCity_PokemonCenter_1F:: @ 8350EF4 .byte 0x5a, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 PewterCity_PokemonCenter_2F:: @ 8350F10 - .4byte gMapData_PewterCity_PokemonCenter_2F @ 0x82D5AE0 + .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 .4byte gMapEvents_PewterCity_PokemonCenter_2F @ 0x83BA2A8 .4byte gMapScripts_PewterCity_PokemonCenter_2F @ 0x816A7B5 .4byte NULL @@ -2438,7 +2438,7 @@ PewterCity_PokemonCenter_2F:: @ 8350F10 .byte 0x5a, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 PewterCity_House2:: @ 8350F2C - .4byte gMapData_PewterCity_House2 @ 0x82D5840 + .4byte House2_Layout @ 0x82D5840 .4byte gMapEvents_PewterCity_House2 @ 0x83BA304 .4byte gMapScripts_PewterCity_House2 @ 0x816A7DC .4byte NULL @@ -2447,7 +2447,7 @@ PewterCity_House2:: @ 8350F2C .byte 0x5a, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 CeruleanCity_House1:: @ 8350F48 - .4byte gMapData_CeruleanCity_House1 @ 0x831A560 + .4byte CeruleanCity_House1_Layout @ 0x831A560 .4byte gMapEvents_CeruleanCity_House1 @ 0x83BA350 .4byte gMapScripts_CeruleanCity_House1 @ 0x816A7EF .4byte NULL @@ -2456,7 +2456,7 @@ CeruleanCity_House1:: @ 8350F48 .byte 0x5b, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 CeruleanCity_House2:: @ 8350F64 - .4byte gMapData_CeruleanCity_House2 @ 0x831A474 + .4byte CeruleanCity_House2_Layout @ 0x831A474 .4byte gMapEvents_CeruleanCity_House2 @ 0x83BA3C0 .4byte gMapScripts_CeruleanCity_House2 @ 0x816A975 .4byte NULL @@ -2465,7 +2465,7 @@ CeruleanCity_House2:: @ 8350F64 .byte 0x5b, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 CeruleanCity_House3:: @ 8350F80 - .4byte gMapData_CeruleanCity_House3 @ 0x82D5754 + .4byte House1_Layout @ 0x82D5754 .4byte gMapEvents_CeruleanCity_House3 @ 0x83BA41C .4byte gMapScripts_CeruleanCity_House3 @ 0x816A9A7 .4byte NULL @@ -2474,7 +2474,7 @@ CeruleanCity_House3:: @ 8350F80 .byte 0x5b, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 CeruleanCity_PokemonCenter_1F:: @ 8350F9C - .4byte gMapData_CeruleanCity_PokemonCenter_1F @ 0x82D5990 + .4byte PokemonCenter_1F_Layout @ 0x82D5990 .4byte gMapEvents_CeruleanCity_PokemonCenter_1F @ 0x83BA4F8 .4byte gMapScripts_CeruleanCity_PokemonCenter_1F @ 0x816AA2D .4byte NULL @@ -2483,7 +2483,7 @@ CeruleanCity_PokemonCenter_1F:: @ 8350F9C .byte 0x5b, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 CeruleanCity_PokemonCenter_2F:: @ 8350FB8 - .4byte gMapData_CeruleanCity_PokemonCenter_2F @ 0x82D5AE0 + .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 .4byte gMapEvents_CeruleanCity_PokemonCenter_2F @ 0x83BA584 .4byte gMapScripts_CeruleanCity_PokemonCenter_2F @ 0x816AA79 .4byte NULL @@ -2492,7 +2492,7 @@ CeruleanCity_PokemonCenter_2F:: @ 8350FB8 .byte 0x5b, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 CeruleanCity_Gym:: @ 8350FD4 - .4byte gMapData_CeruleanCity_Gym @ 0x82D5F84 + .4byte CeruleanCity_Gym_Layout @ 0x82D5F84 .4byte gMapEvents_CeruleanCity_Gym @ 0x83BA628 .4byte gMapScripts_CeruleanCity_Gym @ 0x816AAA0 .4byte NULL @@ -2501,7 +2501,7 @@ CeruleanCity_Gym:: @ 8350FD4 .byte 0x5b, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01 CeruleanCity_BikeShop:: @ 8350FF0 - .4byte gMapData_CeruleanCity_BikeShop @ 0x82D6F28 + .4byte CeruleanCity_BikeShop_Layout @ 0x82D6F28 .4byte gMapEvents_CeruleanCity_BikeShop @ 0x83BA6FC .4byte gMapScripts_CeruleanCity_BikeShop @ 0x816ABBC .4byte NULL @@ -2510,7 +2510,7 @@ CeruleanCity_BikeShop:: @ 8350FF0 .byte 0x5b, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 CeruleanCity_Mart:: @ 835100C - .4byte gMapData_CeruleanCity_Mart @ 0x82D5BCC + .4byte Mart_Layout @ 0x82D5BCC .4byte gMapEvents_CeruleanCity_Mart @ 0x83BA770 .4byte gMapScripts_CeruleanCity_Mart @ 0x816AC9D .4byte NULL @@ -2519,7 +2519,7 @@ CeruleanCity_Mart:: @ 835100C .byte 0x5b, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 CeruleanCity_House4:: @ 8351028 - .4byte gMapData_CeruleanCity_House4 @ 0x82D5754 + .4byte House1_Layout @ 0x82D5754 .4byte gMapEvents_CeruleanCity_House4 @ 0x83BA7A4 .4byte gMapScripts_CeruleanCity_House4 @ 0x816ACEE .4byte NULL @@ -2528,7 +2528,7 @@ CeruleanCity_House4:: @ 8351028 .byte 0x5b, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 CeruleanCity_House5:: @ 8351044 - .4byte gMapData_CeruleanCity_House5 @ 0x8343540 + .4byte CeruleanCity_House5_Layout @ 0x8343540 .4byte gMapEvents_CeruleanCity_House5 @ 0x83BA7E4 .4byte gMapScripts_CeruleanCity_House5 @ 0x816AE4F .4byte NULL @@ -2537,7 +2537,7 @@ CeruleanCity_House5:: @ 8351044 .byte 0x5b, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 LavenderTown_PokemonCenter_1F:: @ 8351060 - .4byte gMapData_LavenderTown_PokemonCenter_1F @ 0x82D5990 + .4byte PokemonCenter_1F_Layout @ 0x82D5990 .4byte gMapEvents_LavenderTown_PokemonCenter_1F @ 0x83BA890 .4byte gMapScripts_LavenderTown_PokemonCenter_1F @ 0x816B0EF .4byte NULL @@ -2546,7 +2546,7 @@ LavenderTown_PokemonCenter_1F:: @ 8351060 .byte 0x5c, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 LavenderTown_PokemonCenter_2F:: @ 835107C - .4byte gMapData_LavenderTown_PokemonCenter_2F @ 0x82D5AE0 + .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 .4byte gMapEvents_LavenderTown_PokemonCenter_2F @ 0x83BA91C .4byte gMapScripts_LavenderTown_PokemonCenter_2F @ 0x816B122 .4byte NULL @@ -2555,7 +2555,7 @@ LavenderTown_PokemonCenter_2F:: @ 835107C .byte 0x5c, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 LavenderTown_VolunteerPokemonHouse:: @ 8351098 - .4byte gMapData_LavenderTown_VolunteerPokemonHouse @ 0x833ACC4 + .4byte LavenderTown_VolunteerPokemonHouse_Layout @ 0x833ACC4 .4byte gMapEvents_LavenderTown_VolunteerPokemonHouse @ 0x83BA9FC .4byte gMapScripts_LavenderTown_VolunteerPokemonHouse @ 0x816B149 .4byte NULL @@ -2564,7 +2564,7 @@ LavenderTown_VolunteerPokemonHouse:: @ 8351098 .byte 0x5c, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 LavenderTown_House1:: @ 83510B4 - .4byte gMapData_LavenderTown_House1 @ 0x82D6AF0 + .4byte House5_Layout @ 0x82D6AF0 .4byte gMapEvents_LavenderTown_House1 @ 0x83BAA58 .4byte gMapScripts_LavenderTown_House1 @ 0x816B232 .4byte NULL @@ -2573,7 +2573,7 @@ LavenderTown_House1:: @ 83510B4 .byte 0x5c, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 LavenderTown_House2:: @ 83510D0 - .4byte gMapData_LavenderTown_House2 @ 0x82D6AF0 + .4byte House5_Layout @ 0x82D6AF0 .4byte gMapEvents_LavenderTown_House2 @ 0x83BAA9C .4byte gMapScripts_LavenderTown_House2 @ 0x816B265 .4byte NULL @@ -2582,7 +2582,7 @@ LavenderTown_House2:: @ 83510D0 .byte 0x5c, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 LavenderTown_Mart:: @ 83510EC - .4byte gMapData_LavenderTown_Mart @ 0x82D5BCC + .4byte Mart_Layout @ 0x82D5BCC .4byte gMapEvents_LavenderTown_Mart @ 0x83BAB28 .4byte gMapScripts_LavenderTown_Mart @ 0x816B34F .4byte NULL @@ -2591,7 +2591,7 @@ LavenderTown_Mart:: @ 83510EC .byte 0x5c, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 VermilionCity_House1:: @ 8351108 - .4byte gMapData_VermilionCity_House1 @ 0x82D5754 + .4byte House1_Layout @ 0x82D5754 .4byte gMapEvents_VermilionCity_House1 @ 0x83BAB6C .4byte gMapScripts_VermilionCity_House1 @ 0x816B3A6 .4byte NULL @@ -2600,7 +2600,7 @@ VermilionCity_House1:: @ 8351108 .byte 0x5d, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 VermilionCity_PokemonCenter_1F:: @ 8351124 - .4byte gMapData_VermilionCity_PokemonCenter_1F @ 0x82D5990 + .4byte PokemonCenter_1F_Layout @ 0x82D5990 .4byte gMapEvents_VermilionCity_PokemonCenter_1F @ 0x83BAC48 .4byte gMapScripts_VermilionCity_PokemonCenter_1F @ 0x816B424 .4byte NULL @@ -2609,7 +2609,7 @@ VermilionCity_PokemonCenter_1F:: @ 8351124 .byte 0x5d, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 VermilionCity_PokemonCenter_2F:: @ 8351140 - .4byte gMapData_VermilionCity_PokemonCenter_2F @ 0x82D5AE0 + .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 .4byte gMapEvents_VermilionCity_PokemonCenter_2F @ 0x83BACD4 .4byte gMapScripts_VermilionCity_PokemonCenter_2F @ 0x816B457 .4byte NULL @@ -2618,7 +2618,7 @@ VermilionCity_PokemonCenter_2F:: @ 8351140 .byte 0x5d, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 VermilionCity_PokemonFanClub:: @ 835115C - .4byte gMapData_VermilionCity_PokemonFanClub @ 0x833ABC8 + .4byte VermilionCity_PokemonFanClub_Layout @ 0x833ABC8 .4byte gMapEvents_VermilionCity_PokemonFanClub @ 0x83BADA8 .4byte gMapScripts_VermilionCity_PokemonFanClub @ 0x816B47E .4byte NULL @@ -2627,7 +2627,7 @@ VermilionCity_PokemonFanClub:: @ 835115C .byte 0x5d, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 VermilionCity_House2:: @ 8351178 - .4byte gMapData_VermilionCity_House2 @ 0x82D5754 + .4byte House1_Layout @ 0x82D5754 .4byte gMapEvents_VermilionCity_House2 @ 0x83BADEC .4byte gMapScripts_VermilionCity_House2 @ 0x816B5D6 .4byte NULL @@ -2636,7 +2636,7 @@ VermilionCity_House2:: @ 8351178 .byte 0x5d, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 VermilionCity_Mart:: @ 8351194 - .4byte gMapData_VermilionCity_Mart @ 0x82D5BCC + .4byte Mart_Layout @ 0x82D5BCC .4byte gMapEvents_VermilionCity_Mart @ 0x83BAE60 .4byte gMapScripts_VermilionCity_Mart @ 0x816B653 .4byte NULL @@ -2645,7 +2645,7 @@ VermilionCity_Mart:: @ 8351194 .byte 0x5d, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 VermilionCity_Gym:: @ 83511B0 - .4byte gMapData_VermilionCity_Gym @ 0x82D6E28 + .4byte VermilionCity_Gym_Layout @ 0x82D6E28 .4byte gMapEvents_VermilionCity_Gym @ 0x83BAFD0 .4byte gMapScripts_VermilionCity_Gym @ 0x816B69E .4byte NULL @@ -2654,7 +2654,7 @@ VermilionCity_Gym:: @ 83511B0 .byte 0x5d, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01 VermilionCity_House3:: @ 83511CC - .4byte gMapData_VermilionCity_House3 @ 0x82D5754 + .4byte House1_Layout @ 0x82D5754 .4byte gMapEvents_VermilionCity_House3 @ 0x83BB068 .4byte gMapScripts_VermilionCity_House3 @ 0x816BAA9 .4byte NULL @@ -2663,7 +2663,7 @@ VermilionCity_House3:: @ 83511CC .byte 0x5d, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 CeladonCity_DepartmentStore_1F:: @ 83511E8 - .4byte gMapData_CeladonCity_DepartmentStore_1F @ 0x831B5FC + .4byte CeladonCity_DepartmentStore_1F_Layout @ 0x831B5FC .4byte gMapEvents_CeladonCity_DepartmentStore_1F @ 0x83BB0EC .4byte gMapScripts_CeladonCity_DepartmentStore_1F @ 0x816BAD8 .4byte NULL @@ -2672,7 +2672,7 @@ CeladonCity_DepartmentStore_1F:: @ 83511E8 .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x04, 0x01, 0x00 CeladonCity_DepartmentStore_2F:: @ 8351204 - .4byte gMapData_CeladonCity_DepartmentStore_2F @ 0x831B7A8 + .4byte CeladonCity_DepartmentStore_2F_Layout @ 0x831B7A8 .4byte gMapEvents_CeladonCity_DepartmentStore_2F @ 0x83BB184 .4byte gMapScripts_CeladonCity_DepartmentStore_2F @ 0x816BAF4 .4byte NULL @@ -2681,7 +2681,7 @@ CeladonCity_DepartmentStore_2F:: @ 8351204 .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x04, 0x02, 0x00 CeladonCity_DepartmentStore_3F:: @ 8351220 - .4byte gMapData_CeladonCity_DepartmentStore_3F @ 0x831B954 + .4byte CeladonCity_DepartmentStore_3F_Layout @ 0x831B954 .4byte gMapEvents_CeladonCity_DepartmentStore_3F @ 0x83BB2AC .4byte gMapScripts_CeladonCity_DepartmentStore_3F @ 0x816BB84 .4byte NULL @@ -2690,7 +2690,7 @@ CeladonCity_DepartmentStore_3F:: @ 8351220 .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x04, 0x03, 0x00 CeladonCity_DepartmentStore_4F:: @ 835123C - .4byte gMapData_CeladonCity_DepartmentStore_4F @ 0x831BB00 + .4byte CeladonCity_DepartmentStore_4F_Layout @ 0x831BB00 .4byte gMapEvents_CeladonCity_DepartmentStore_4F @ 0x83BB32C .4byte gMapScripts_CeladonCity_DepartmentStore_4F @ 0x816BBEE .4byte NULL @@ -2699,7 +2699,7 @@ CeladonCity_DepartmentStore_4F:: @ 835123C .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x04, 0x04, 0x00 CeladonCity_DepartmentStore_5F:: @ 8351258 - .4byte gMapData_CeladonCity_DepartmentStore_5F @ 0x831BCAC + .4byte CeladonCity_DepartmentStore_5F_Layout @ 0x831BCAC .4byte gMapEvents_CeladonCity_DepartmentStore_5F @ 0x83BB3C4 .4byte gMapScripts_CeladonCity_DepartmentStore_5F @ 0x816BC40 .4byte NULL @@ -2708,7 +2708,7 @@ CeladonCity_DepartmentStore_5F:: @ 8351258 .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x04, 0x05, 0x00 CeladonCity_DepartmentStore_Roof:: @ 8351274 - .4byte gMapData_CeladonCity_DepartmentStore_Roof @ 0x831BEE4 + .4byte CeladonCity_DepartmentStore_Roof_Layout @ 0x831BEE4 .4byte gMapEvents_CeladonCity_DepartmentStore_Roof @ 0x83BB440 .4byte gMapScripts_CeladonCity_DepartmentStore_Roof @ 0x816BCCC .4byte NULL @@ -2717,7 +2717,7 @@ CeladonCity_DepartmentStore_Roof:: @ 8351274 .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x04, 0x7f, 0x00 CeladonCity_DepartmentStore_Elevator:: @ 8351290 - .4byte gMapData_CeladonCity_DepartmentStore_Elevator @ 0x8319F70 + .4byte CeladonCity_DepartmentStore_Elevator_Layout @ 0x8319F70 .4byte gMapEvents_CeladonCity_DepartmentStore_Elevator @ 0x83BB47C .4byte gMapScripts_CeladonCity_DepartmentStore_Elevator @ 0x816C152 .4byte NULL @@ -2726,7 +2726,7 @@ CeladonCity_DepartmentStore_Elevator:: @ 8351290 .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 CeladonCity_Condominiums_1F:: @ 83512AC - .4byte gMapData_CeladonCity_Condominiums_1F @ 0x831A7DC + .4byte CeladonCity_Condominiums_1F_Layout @ 0x831A7DC .4byte gMapEvents_CeladonCity_Condominiums_1F @ 0x83BB538 .4byte gMapScripts_CeladonCity_Condominiums_1F @ 0x816C320 .4byte NULL @@ -2735,7 +2735,7 @@ CeladonCity_Condominiums_1F:: @ 83512AC .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 CeladonCity_Condominiums_2F:: @ 83512C8 - .4byte gMapData_CeladonCity_Condominiums_2F @ 0x831AA58 + .4byte CeladonCity_Condominiums_2F_Layout @ 0x831AA58 .4byte gMapEvents_CeladonCity_Condominiums_2F @ 0x83BB5B4 .4byte gMapScripts_CeladonCity_Condominiums_2F @ 0x816C3D0 .4byte NULL @@ -2744,7 +2744,7 @@ CeladonCity_Condominiums_2F:: @ 83512C8 .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 CeladonCity_Condominiums_3F:: @ 83512E4 - .4byte gMapData_CeladonCity_Condominiums_3F @ 0x831ACD4 + .4byte CeladonCity_Condominiums_3F_Layout @ 0x831ACD4 .4byte gMapEvents_CeladonCity_Condominiums_3F @ 0x83BB6A8 .4byte gMapScripts_CeladonCity_Condominiums_3F @ 0x816C3DA .4byte NULL @@ -2753,7 +2753,7 @@ CeladonCity_Condominiums_3F:: @ 83512E4 .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 CeladonCity_Condominiums_Roof:: @ 8351300 - .4byte gMapData_CeladonCity_Condominiums_Roof @ 0x831AF7C + .4byte CeladonCity_Condominiums_Roof_Layout @ 0x831AF7C .4byte gMapEvents_CeladonCity_Condominiums_Roof @ 0x83BB6EC .4byte gMapScripts_CeladonCity_Condominiums_Roof @ 0x816C459 .4byte NULL @@ -2762,7 +2762,7 @@ CeladonCity_Condominiums_Roof:: @ 8351300 .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 CeladonCity_Condominiums_RoofRoom:: @ 835131C - .4byte gMapData_CeladonCity_Condominiums_RoofRoom @ 0x831B054 + .4byte CeladonCity_Condominiums_RoofRoom_Layout @ 0x831B054 .4byte gMapEvents_CeladonCity_Condominiums_RoofRoom @ 0x83BB76C .4byte gMapScripts_CeladonCity_Condominiums_RoofRoom @ 0x816C463 .4byte NULL @@ -2771,7 +2771,7 @@ CeladonCity_Condominiums_RoofRoom:: @ 835131C .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 CeladonCity_PokemonCenter_1F:: @ 8351338 - .4byte gMapData_CeladonCity_PokemonCenter_1F @ 0x82D5990 + .4byte PokemonCenter_1F_Layout @ 0x82D5990 .4byte gMapEvents_CeladonCity_PokemonCenter_1F @ 0x83BB800 .4byte gMapScripts_CeladonCity_PokemonCenter_1F @ 0x816C5EC .4byte NULL @@ -2780,7 +2780,7 @@ CeladonCity_PokemonCenter_1F:: @ 8351338 .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 CeladonCity_PokemonCenter_2F:: @ 8351354 - .4byte gMapData_CeladonCity_PokemonCenter_2F @ 0x82D5AE0 + .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 .4byte gMapEvents_CeladonCity_PokemonCenter_2F @ 0x83BB88C .4byte gMapScripts_CeladonCity_PokemonCenter_2F @ 0x816C61F .4byte NULL @@ -2789,7 +2789,7 @@ CeladonCity_PokemonCenter_2F:: @ 8351354 .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 CeladonCity_GameCorner:: @ 8351370 - .4byte gMapData_CeladonCity_GameCorner @ 0x82D7168 + .4byte CeladonCity_GameCorner_Layout @ 0x82D7168 .4byte gMapEvents_CeladonCity_GameCorner @ 0x83BBB78 .4byte gMapScripts_CeladonCity_GameCorner @ 0x816C646 .4byte NULL @@ -2798,7 +2798,7 @@ CeladonCity_GameCorner:: @ 8351370 .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 CeladonCity_GameCorner_PrizeRoom:: @ 835138C - .4byte gMapData_CeladonCity_GameCorner_PrizeRoom @ 0x831B12C + .4byte CeladonCity_GameCorner_PrizeRoom_Layout @ 0x831B12C .4byte gMapEvents_CeladonCity_GameCorner_PrizeRoom @ 0x83BBC1C .4byte gMapScripts_CeladonCity_GameCorner_PrizeRoom @ 0x816CB75 .4byte NULL @@ -2807,7 +2807,7 @@ CeladonCity_GameCorner_PrizeRoom:: @ 835138C .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 CeladonCity_Gym:: @ 83513A8 - .4byte gMapData_CeladonCity_Gym @ 0x82D6370 + .4byte CeladonCity_Gym_Layout @ 0x82D6370 .4byte gMapEvents_CeladonCity_Gym @ 0x83BBD68 .4byte gMapScripts_CeladonCity_Gym @ 0x816D060 .4byte NULL @@ -2816,7 +2816,7 @@ CeladonCity_Gym:: @ 83513A8 .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01 CeladonCity_Restaurant:: @ 83513C4 - .4byte gMapData_CeladonCity_Restaurant @ 0x831B29C + .4byte CeladonCity_Restaurant_Layout @ 0x831B29C .4byte gMapEvents_CeladonCity_Restaurant @ 0x83BBE0C .4byte gMapScripts_CeladonCity_Restaurant @ 0x816D1EA .4byte NULL @@ -2825,7 +2825,7 @@ CeladonCity_Restaurant:: @ 83513C4 .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 CeladonCity_House1:: @ 83513E0 - .4byte gMapData_CeladonCity_House1 @ 0x82D6AF0 + .4byte House5_Layout @ 0x82D6AF0 .4byte gMapEvents_CeladonCity_House1 @ 0x83BBE80 .4byte gMapScripts_CeladonCity_House1 @ 0x816D267 .4byte NULL @@ -2834,7 +2834,7 @@ CeladonCity_House1:: @ 83513E0 .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 CeladonCity_Hotel:: @ 83513FC - .4byte gMapData_CeladonCity_Hotel @ 0x831B438 + .4byte CeladonCity_Hotel_Layout @ 0x831B438 .4byte gMapEvents_CeladonCity_Hotel @ 0x83BBF0C .4byte gMapScripts_CeladonCity_Hotel @ 0x816D283 .4byte NULL @@ -2843,7 +2843,7 @@ CeladonCity_Hotel:: @ 83513FC .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 FuchsiaCity_SafariZone_Entrance:: @ 8351418 - .4byte gMapData_FuchsiaCity_SafariZone_Entrance @ 0x82D8E80 + .4byte FuchsiaCity_SafariZone_Entrance_Layout @ 0x82D8E80 .4byte gMapEvents_FuchsiaCity_SafariZone_Entrance @ 0x83BBFA0 .4byte gMapScripts_FuchsiaCity_SafariZone_Entrance @ 0x816D2A8 .4byte NULL @@ -2852,7 +2852,7 @@ FuchsiaCity_SafariZone_Entrance:: @ 8351418 .byte 0x5f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 FuchsiaCity_Mart:: @ 8351434 - .4byte gMapData_FuchsiaCity_Mart @ 0x82D5BCC + .4byte Mart_Layout @ 0x82D5BCC .4byte gMapEvents_FuchsiaCity_Mart @ 0x83BC014 .4byte gMapScripts_FuchsiaCity_Mart @ 0x816D4E0 .4byte NULL @@ -2861,7 +2861,7 @@ FuchsiaCity_Mart:: @ 8351434 .byte 0x5f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 FuchsiaCity_ZooBuilding:: @ 8351450 - .4byte gMapData_FuchsiaCity_ZooBuilding @ 0x831C348 + .4byte FuchsiaCity_ZooBuilding_Layout @ 0x831C348 .4byte gMapEvents_FuchsiaCity_ZooBuilding @ 0x83BC0A0 .4byte gMapScripts_FuchsiaCity_ZooBuilding @ 0x816D528 .4byte NULL @@ -2870,7 +2870,7 @@ FuchsiaCity_ZooBuilding:: @ 8351450 .byte 0x5f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 FuchsiaCity_Gym:: @ 835146C - .4byte gMapData_FuchsiaCity_Gym @ 0x82D6A04 + .4byte FuchsiaCity_Gym_Layout @ 0x82D6A04 .4byte gMapEvents_FuchsiaCity_Gym @ 0x83BC1A4 .4byte gMapScripts_FuchsiaCity_Gym @ 0x816D54D .4byte NULL @@ -2879,7 +2879,7 @@ FuchsiaCity_Gym:: @ 835146C .byte 0x5f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01 FuchsiaCity_House1:: @ 8351488 - .4byte gMapData_FuchsiaCity_House1 @ 0x82D5754 + .4byte House1_Layout @ 0x82D5754 .4byte gMapEvents_FuchsiaCity_House1 @ 0x83BC218 .4byte gMapScripts_FuchsiaCity_House1 @ 0x816D6C5 .4byte NULL @@ -2888,7 +2888,7 @@ FuchsiaCity_House1:: @ 8351488 .byte 0x5f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 FuchsiaCity_PokemonCenter_1F:: @ 83514A4 - .4byte gMapData_FuchsiaCity_PokemonCenter_1F @ 0x82D5990 + .4byte PokemonCenter_1F_Layout @ 0x82D5990 .4byte gMapEvents_FuchsiaCity_PokemonCenter_1F @ 0x83BC2AC .4byte gMapScripts_FuchsiaCity_PokemonCenter_1F @ 0x816D6F1 .4byte NULL @@ -2897,7 +2897,7 @@ FuchsiaCity_PokemonCenter_1F:: @ 83514A4 .byte 0x5f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 FuchsiaCity_PokemonCenter_2F:: @ 83514C0 - .4byte gMapData_FuchsiaCity_PokemonCenter_2F @ 0x82D5AE0 + .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 .4byte gMapEvents_FuchsiaCity_PokemonCenter_2F @ 0x83BC338 .4byte gMapScripts_FuchsiaCity_PokemonCenter_2F @ 0x816D724 .4byte NULL @@ -2906,7 +2906,7 @@ FuchsiaCity_PokemonCenter_2F:: @ 83514C0 .byte 0x5f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 FuchsiaCity_Building1:: @ 83514DC - .4byte gMapData_FuchsiaCity_Building1 @ 0x831C48C + .4byte FuchsiaCity_Building1_Layout @ 0x831C48C .4byte gMapEvents_FuchsiaCity_Building1 @ 0x83BC3F4 .4byte gMapScripts_FuchsiaCity_Building1 @ 0x816D74B .4byte NULL @@ -2915,7 +2915,7 @@ FuchsiaCity_Building1:: @ 83514DC .byte 0x5f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 FuchsiaCity_House2:: @ 83514F8 - .4byte gMapData_FuchsiaCity_House2 @ 0x831C578 + .4byte FuchsiaCity_House2_Layout @ 0x831C578 .4byte gMapEvents_FuchsiaCity_House2 @ 0x83BC440 .4byte gMapScripts_FuchsiaCity_House2 @ 0x816D816 .4byte NULL @@ -2924,7 +2924,7 @@ FuchsiaCity_House2:: @ 83514F8 .byte 0x5f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 FuchsiaCity_House3:: @ 8351514 - .4byte gMapData_FuchsiaCity_House3 @ 0x82D5754 + .4byte House1_Layout @ 0x82D5754 .4byte gMapEvents_FuchsiaCity_House3 @ 0x83BC474 .4byte gMapScripts_FuchsiaCity_House3 @ 0x816D894 .4byte NULL @@ -2933,7 +2933,7 @@ FuchsiaCity_House3:: @ 8351514 .byte 0x5f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 CinnabarIsland_Gym:: @ 8351530 - .4byte gMapData_CinnabarIsland_Gym @ 0x82D82C8 + .4byte CinnabarIsland_Gym_Layout @ 0x82D82C8 .4byte gMapEvents_CinnabarIsland_Gym @ 0x83BC62C .4byte gMapScripts_CinnabarIsland_Gym @ 0x816D94B .4byte NULL @@ -2942,7 +2942,7 @@ CinnabarIsland_Gym:: @ 8351530 .byte 0x60, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01 CinnabarIsland_PokemonLab_Entrance:: @ 835154C - .4byte gMapData_CinnabarIsland_PokemonLab_Entrance @ 0x831C804 + .4byte CinnabarIsland_PokemonLab_Entrance_Layout @ 0x831C804 .4byte gMapEvents_CinnabarIsland_PokemonLab_Entrance @ 0x83BC6B8 .4byte gMapScripts_CinnabarIsland_PokemonLab_Entrance @ 0x816E273 .4byte NULL @@ -2951,7 +2951,7 @@ CinnabarIsland_PokemonLab_Entrance:: @ 835154C .byte 0x60, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 CinnabarIsland_PokemonLab_Lounge:: @ 8351568 - .4byte gMapData_CinnabarIsland_PokemonLab_Lounge @ 0x831C974 + .4byte CinnabarIsland_PokemonLab_Lounge_Layout @ 0x831C974 .4byte gMapEvents_CinnabarIsland_PokemonLab_Lounge @ 0x83BC71C .4byte gMapScripts_CinnabarIsland_PokemonLab_Lounge @ 0x816E2B8 .4byte NULL @@ -2960,7 +2960,7 @@ CinnabarIsland_PokemonLab_Lounge:: @ 8351568 .byte 0x60, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 CinnabarIsland_PokemonLab_ResearchRoom:: @ 8351584 - .4byte gMapData_CinnabarIsland_PokemonLab_ResearchRoom @ 0x831CAE4 + .4byte CinnabarIsland_PokemonLab_ResearchRoom_Layout @ 0x831CAE4 .4byte gMapEvents_CinnabarIsland_PokemonLab_ResearchRoom @ 0x83BC780 .4byte gMapScripts_CinnabarIsland_PokemonLab_ResearchRoom @ 0x816E3DE .4byte NULL @@ -2969,7 +2969,7 @@ CinnabarIsland_PokemonLab_ResearchRoom:: @ 8351584 .byte 0x60, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 CinnabarIsland_PokemonLab_ExperimentRoom:: @ 83515A0 - .4byte gMapData_CinnabarIsland_PokemonLab_ExperimentRoom @ 0x831CC54 + .4byte CinnabarIsland_PokemonLab_ExperimentRoom_Layout @ 0x831CC54 .4byte gMapEvents_CinnabarIsland_PokemonLab_ExperimentRoom @ 0x83BC7CC .4byte gMapScripts_CinnabarIsland_PokemonLab_ExperimentRoom @ 0x816E400 .4byte NULL @@ -2978,7 +2978,7 @@ CinnabarIsland_PokemonLab_ExperimentRoom:: @ 83515A0 .byte 0x60, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 CinnabarIsland_PokemonCenter_1F:: @ 83515BC - .4byte gMapData_CinnabarIsland_PokemonCenter_1F @ 0x82D5990 + .4byte PokemonCenter_1F_Layout @ 0x82D5990 .4byte gMapEvents_CinnabarIsland_PokemonCenter_1F @ 0x83BC8A8 .4byte gMapScripts_CinnabarIsland_PokemonCenter_1F @ 0x816E8D7 .4byte NULL @@ -2987,7 +2987,7 @@ CinnabarIsland_PokemonCenter_1F:: @ 83515BC .byte 0x60, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 CinnabarIsland_PokemonCenter_2F:: @ 83515D8 - .4byte gMapData_CinnabarIsland_PokemonCenter_2F @ 0x82D5AE0 + .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 .4byte gMapEvents_CinnabarIsland_PokemonCenter_2F @ 0x83BC934 .4byte gMapScripts_CinnabarIsland_PokemonCenter_2F @ 0x816E9E8 .4byte NULL @@ -2996,7 +2996,7 @@ CinnabarIsland_PokemonCenter_2F:: @ 83515D8 .byte 0x60, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 CinnabarIsland_Mart:: @ 83515F4 - .4byte gMapData_CinnabarIsland_Mart @ 0x82D5BCC + .4byte Mart_Layout @ 0x82D5BCC .4byte gMapEvents_CinnabarIsland_Mart @ 0x83BC9A8 .4byte gMapScripts_CinnabarIsland_Mart @ 0x816EA0F .4byte NULL @@ -3005,7 +3005,7 @@ CinnabarIsland_Mart:: @ 83515F4 .byte 0x60, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 IndigoPlateau_PokemonCenter_1F:: @ 8351610 - .4byte gMapData_IndigoPlateau_PokemonCenter_1F @ 0x831F000 + .4byte IndigoPlateau_PokemonCenter_1F_Layout @ 0x831F000 .4byte gMapEvents_IndigoPlateau_PokemonCenter_1F @ 0x83BCA94 .4byte gMapScripts_IndigoPlateau_PokemonCenter_1F @ 0x816EA5A .4byte NULL @@ -3014,7 +3014,7 @@ IndigoPlateau_PokemonCenter_1F:: @ 8351610 .byte 0x61, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01 IndigoPlateau_PokemonCenter_2F:: @ 835162C - .4byte gMapData_IndigoPlateau_PokemonCenter_2F @ 0x82D5AE0 + .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 .4byte gMapEvents_IndigoPlateau_PokemonCenter_2F @ 0x83BCB20 .4byte gMapScripts_IndigoPlateau_PokemonCenter_2F @ 0x816EB0F .4byte NULL @@ -3023,7 +3023,7 @@ IndigoPlateau_PokemonCenter_2F:: @ 835162C .byte 0x61, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01 SaffronCity_House1_1F:: @ 8351648 - .4byte gMapData_SaffronCity_House1_1F @ 0x8321004 + .4byte SaffronCity_House1_1F_Layout @ 0x8321004 .4byte gMapEvents_SaffronCity_House1_1F @ 0x83BCB9C .4byte gMapScripts_SaffronCity_House1_1F @ 0x816EB36 .4byte NULL @@ -3032,7 +3032,7 @@ SaffronCity_House1_1F:: @ 8351648 .byte 0x62, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 SaffronCity_House1_2F:: @ 8351664 - .4byte gMapData_SaffronCity_House1_2F @ 0x8321100 + .4byte SaffronCity_House1_2F_Layout @ 0x8321100 .4byte gMapEvents_SaffronCity_House1_2F @ 0x83BCC3C .4byte gMapScripts_SaffronCity_House1_2F @ 0x816EB5C .4byte NULL @@ -3041,7 +3041,7 @@ SaffronCity_House1_2F:: @ 8351664 .byte 0x62, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 SaffronCity_Dojo:: @ 8351680 - .4byte gMapData_SaffronCity_Dojo @ 0x83212C4 + .4byte SaffronCity_Dojo_Layout @ 0x83212C4 .4byte gMapEvents_SaffronCity_Dojo @ 0x83BCD60 .4byte gMapScripts_SaffronCity_Dojo @ 0x816EBDB .4byte NULL @@ -3050,7 +3050,7 @@ SaffronCity_Dojo:: @ 8351680 .byte 0x62, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 SaffronCity_Gym:: @ 835169C - .4byte gMapData_SaffronCity_Gym @ 0x82D7C44 + .4byte SaffronCity_Gym_Layout @ 0x82D7C44 .4byte gMapEvents_SaffronCity_Gym @ 0x83BCF6C .4byte gMapScripts_SaffronCity_Gym @ 0x816EDD7 .4byte NULL @@ -3059,7 +3059,7 @@ SaffronCity_Gym:: @ 835169C .byte 0x62, 0x00, 0x00, 0x08, 0x00, 0x01, 0x00, 0x01 SaffronCity_House2:: @ 83516B8 - .4byte gMapData_SaffronCity_House2 @ 0x82D6AF0 + .4byte House5_Layout @ 0x82D6AF0 .4byte gMapEvents_SaffronCity_House2 @ 0x83BD004 .4byte gMapScripts_SaffronCity_House2 @ 0x816EF73 .4byte NULL @@ -3068,7 +3068,7 @@ SaffronCity_House2:: @ 83516B8 .byte 0x62, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 SaffronCity_Mart:: @ 83516D4 - .4byte gMapData_SaffronCity_Mart @ 0x82D5BCC + .4byte Mart_Layout @ 0x82D5BCC .4byte gMapEvents_SaffronCity_Mart @ 0x83BD078 .4byte gMapScripts_SaffronCity_Mart @ 0x816EFA2 .4byte NULL @@ -3077,7 +3077,7 @@ SaffronCity_Mart:: @ 83516D4 .byte 0x62, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 SaffronCity_PokemonCenter_1F:: @ 83516F0 - .4byte gMapData_SaffronCity_PokemonCenter_1F @ 0x82D5990 + .4byte PokemonCenter_1F_Layout @ 0x82D5990 .4byte gMapEvents_SaffronCity_PokemonCenter_1F @ 0x83BD13C .4byte gMapScripts_SaffronCity_PokemonCenter_1F @ 0x816EFEC .4byte NULL @@ -3086,7 +3086,7 @@ SaffronCity_PokemonCenter_1F:: @ 83516F0 .byte 0x62, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 SaffronCity_PokemonCenter_2F:: @ 835170C - .4byte gMapData_SaffronCity_PokemonCenter_2F @ 0x82D5AE0 + .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 .4byte gMapEvents_SaffronCity_PokemonCenter_2F @ 0x83BD1C8 .4byte gMapScripts_SaffronCity_PokemonCenter_2F @ 0x816F037 .4byte NULL @@ -3095,7 +3095,7 @@ SaffronCity_PokemonCenter_2F:: @ 835170C .byte 0x62, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 SaffronCity_House3:: @ 8351728 - .4byte gMapData_SaffronCity_House3 @ 0x82D6AF0 + .4byte House5_Layout @ 0x82D6AF0 .4byte gMapEvents_SaffronCity_House3 @ 0x83BD20C .4byte gMapScripts_SaffronCity_House3 @ 0x816F05E .4byte NULL @@ -3104,7 +3104,7 @@ SaffronCity_House3:: @ 8351728 .byte 0x62, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 SaffronCity_PokemonTrainerFanClub:: @ 8351744 - .4byte gMapData_SaffronCity_PokemonTrainerFanClub @ 0x8338A60 + .4byte SaffronCity_PokemonTrainerFanClub_Layout @ 0x8338A60 .4byte gMapEvents_SaffronCity_PokemonTrainerFanClub @ 0x83BD318 .4byte gMapScripts_SaffronCity_PokemonTrainerFanClub @ 0x816F0BF .4byte NULL @@ -3113,7 +3113,7 @@ SaffronCity_PokemonTrainerFanClub:: @ 8351744 .byte 0x62, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 Route2_ViridianForest_SouthEntrance:: @ 8351760 - .4byte gMapData_Route2_ViridianForest_SouthEntrance @ 0x8320990 + .4byte Route2_Entrance_Layout @ 0x8320990 .4byte gMapEvents_Route2_ViridianForest_SouthEntrance @ 0x83BD37C .4byte gMapScripts_Route2_ViridianForest_SouthEntrance @ 0x816F5E5 .4byte NULL @@ -3122,7 +3122,7 @@ Route2_ViridianForest_SouthEntrance:: @ 8351760 .byte 0x66, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00 Route2_House:: @ 835177C - .4byte gMapData_Route2_House @ 0x82D5840 + .4byte House2_Layout @ 0x82D5840 .4byte gMapEvents_Route2_House @ 0x83BD3D8 .4byte gMapScripts_Route2_House @ 0x816F5F8 .4byte NULL @@ -3131,7 +3131,7 @@ Route2_House:: @ 835177C .byte 0x66, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 Route2_EastBuilding:: @ 8351798 - .4byte gMapData_Route2_EastBuilding @ 0x8320990 + .4byte Route2_Entrance_Layout @ 0x8320990 .4byte gMapEvents_Route2_EastBuilding @ 0x83BD43C .4byte gMapScripts_Route2_EastBuilding @ 0x816F67E .4byte NULL @@ -3140,7 +3140,7 @@ Route2_EastBuilding:: @ 8351798 .byte 0x66, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00 Route2_ViridianForest_NorthEntrance:: @ 83517B4 - .4byte gMapData_Route2_ViridianForest_NorthEntrance @ 0x8320990 + .4byte Route2_Entrance_Layout @ 0x8320990 .4byte gMapEvents_Route2_ViridianForest_NorthEntrance @ 0x83BD4B8 .4byte gMapScripts_Route2_ViridianForest_NorthEntrance @ 0x816F71D .4byte NULL @@ -3149,7 +3149,7 @@ Route2_ViridianForest_NorthEntrance:: @ 83517B4 .byte 0x66, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00 Route4_PokemonCenter_1F:: @ 83517D0 - .4byte gMapData_Route4_PokemonCenter_1F @ 0x82D5990 + .4byte PokemonCenter_1F_Layout @ 0x82D5990 .4byte gMapEvents_Route4_PokemonCenter_1F @ 0x83BD57C .4byte gMapScripts_Route4_PokemonCenter_1F @ 0x816F739 .4byte NULL @@ -3158,7 +3158,7 @@ Route4_PokemonCenter_1F:: @ 83517D0 .byte 0x68, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 Route4_PokemonCenter_2F:: @ 83517EC - .4byte gMapData_Route4_PokemonCenter_2F @ 0x82D5AE0 + .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 .4byte gMapEvents_Route4_PokemonCenter_2F @ 0x83BD608 .4byte gMapScripts_Route4_PokemonCenter_2F @ 0x816F8D8 .4byte NULL @@ -3167,7 +3167,7 @@ Route4_PokemonCenter_2F:: @ 83517EC .byte 0x68, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 Route5_PokemonDayCare:: @ 8351808 - .4byte gMapData_Route5_PokemonDayCare @ 0x833ADC0 + .4byte Route5_PokemonDayCare_Layout @ 0x833ADC0 .4byte gMapEvents_Route5_PokemonDayCare @ 0x83BD64C .4byte gMapScripts_Route5_PokemonDayCare @ 0x816F8FF .4byte NULL @@ -3176,7 +3176,7 @@ Route5_PokemonDayCare:: @ 8351808 .byte 0x69, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 Route5_SouthEntrance:: @ 8351824 - .4byte gMapData_Route5_SouthEntrance @ 0x831E9C0 + .4byte SaffronCity_NorthSouthEntrance_Layout @ 0x831E9C0 .4byte gMapEvents_Route5_SouthEntrance @ 0x83BD6C8 .4byte gMapScripts_Route5_SouthEntrance @ 0x816F900 .4byte NULL @@ -3185,7 +3185,7 @@ Route5_SouthEntrance:: @ 8351824 .byte 0x69, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00 Route6_NorthEntrance:: @ 8351840 - .4byte gMapData_Route6_NorthEntrance @ 0x831E9C0 + .4byte SaffronCity_NorthSouthEntrance_Layout @ 0x831E9C0 .4byte gMapEvents_Route6_NorthEntrance @ 0x83BD744 .4byte gMapScripts_Route6_NorthEntrance @ 0x816F9C6 .4byte NULL @@ -3194,7 +3194,7 @@ Route6_NorthEntrance:: @ 8351840 .byte 0x6a, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00 UnknownMap_18_01:: @ 835185C - .4byte gMapData_UnknownMap_18_01 @ 0x82D5840 + .4byte House2_Layout @ 0x82D5840 .4byte gMapEvents_UnknownMap_18_01 @ 0x83BD758 .4byte gMapScripts_UnknownMap_18_01 @ 0x816FA8C .4byte NULL @@ -3203,7 +3203,7 @@ UnknownMap_18_01:: @ 835185C .byte 0x6a, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 Route7_EastEntrance:: @ 8351878 - .4byte gMapData_Route7_EastEntrance @ 0x831EAD0 + .4byte SaffronCity_EastWestEntrance_Layout @ 0x831EAD0 .4byte gMapEvents_Route7_EastEntrance @ 0x83BD7D4 .4byte gMapScripts_Route7_EastEntrance @ 0x816FA8D .4byte NULL @@ -3212,7 +3212,7 @@ Route7_EastEntrance:: @ 8351878 .byte 0x6b, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00 Route8_WestEntrance:: @ 8351894 - .4byte gMapData_Route8_WestEntrance @ 0x831EAD0 + .4byte SaffronCity_EastWestEntrance_Layout @ 0x831EAD0 .4byte gMapEvents_Route8_WestEntrance @ 0x83BD850 .4byte gMapScripts_Route8_WestEntrance @ 0x816FB53 .4byte NULL @@ -3221,7 +3221,7 @@ Route8_WestEntrance:: @ 8351894 .byte 0x6c, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00 Route10_PokemonCenter_1F:: @ 83518B0 - .4byte gMapData_Route10_PokemonCenter_1F @ 0x82D5990 + .4byte PokemonCenter_1F_Layout @ 0x82D5990 .4byte gMapEvents_Route10_PokemonCenter_1F @ 0x83BD8FC .4byte gMapScripts_Route10_PokemonCenter_1F @ 0x816FC2F .4byte NULL @@ -3230,7 +3230,7 @@ Route10_PokemonCenter_1F:: @ 83518B0 .byte 0x6e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 Route10_PokemonCenter_2F:: @ 83518CC - .4byte gMapData_Route10_PokemonCenter_2F @ 0x82D5AE0 + .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 .4byte gMapEvents_Route10_PokemonCenter_2F @ 0x83BD988 .4byte gMapScripts_Route10_PokemonCenter_2F @ 0x816FCFA .4byte NULL @@ -3239,7 +3239,7 @@ Route10_PokemonCenter_2F:: @ 83518CC .byte 0x6e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 Route11_EastEntrance_1F:: @ 83518E8 - .4byte gMapData_Route11_EastEntrance_1F @ 0x8320E70 + .4byte Entrance_1F_Layout @ 0x8320E70 .4byte gMapEvents_Route11_EastEntrance_1F @ 0x83BD9F4 .4byte gMapScripts_Route11_EastEntrance_1F @ 0x816FD21 .4byte NULL @@ -3248,7 +3248,7 @@ Route11_EastEntrance_1F:: @ 83518E8 .byte 0x6f, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00 Route11_EastEntrance_2F:: @ 8351904 - .4byte gMapData_Route11_EastEntrance_2F @ 0x8320804 + .4byte Entrance_2F_Layout @ 0x8320804 .4byte gMapEvents_Route11_EastEntrance_2F @ 0x83BDA58 .4byte gMapScripts_Route11_EastEntrance_2F @ 0x816FD34 .4byte NULL @@ -3257,7 +3257,7 @@ Route11_EastEntrance_2F:: @ 8351904 .byte 0x6f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 Route12_NorthEntrance_1F:: @ 8351920 - .4byte gMapData_Route12_NorthEntrance_1F @ 0x8319DF0 + .4byte Route12_NorthEntrance_1F_Layout @ 0x8319DF0 .4byte gMapEvents_Route12_NorthEntrance_1F @ 0x83BDAAC .4byte gMapScripts_Route12_NorthEntrance_1F @ 0x816FE6D .4byte NULL @@ -3266,7 +3266,7 @@ Route12_NorthEntrance_1F:: @ 8351920 .byte 0x70, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00 Route12_NorthEntrance_2F:: @ 835193C - .4byte gMapData_Route12_NorthEntrance_2F @ 0x8320804 + .4byte Entrance_2F_Layout @ 0x8320804 .4byte gMapEvents_Route12_NorthEntrance_2F @ 0x83BDAF8 .4byte gMapScripts_Route12_NorthEntrance_2F @ 0x816FE77 .4byte NULL @@ -3275,7 +3275,7 @@ Route12_NorthEntrance_2F:: @ 835193C .byte 0x70, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 Route12_FishingHouse:: @ 8351958 - .4byte gMapData_Route12_FishingHouse @ 0x82D6070 + .4byte House4_Layout @ 0x82D6070 .4byte gMapEvents_Route12_FishingHouse @ 0x83BDB48 .4byte gMapScripts_Route12_FishingHouse @ 0x816FF0B .4byte NULL @@ -3284,7 +3284,7 @@ Route12_FishingHouse:: @ 8351958 .byte 0x70, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 Route15_WestEntrance_1F:: @ 8351974 - .4byte gMapData_Route15_WestEntrance_1F @ 0x8320E70 + .4byte Entrance_1F_Layout @ 0x8320E70 .4byte gMapEvents_Route15_WestEntrance_1F @ 0x83BDB9C .4byte gMapScripts_Route15_WestEntrance_1F @ 0x8170088 .4byte NULL @@ -3293,7 +3293,7 @@ Route15_WestEntrance_1F:: @ 8351974 .byte 0x73, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00 Route15_WestEntrance_2F:: @ 8351990 - .4byte gMapData_Route15_WestEntrance_2F @ 0x8320804 + .4byte Entrance_2F_Layout @ 0x8320804 .4byte gMapEvents_Route15_WestEntrance_2F @ 0x83BDBE8 .4byte gMapScripts_Route15_WestEntrance_2F @ 0x8170092 .4byte NULL @@ -3302,7 +3302,7 @@ Route15_WestEntrance_2F:: @ 8351990 .byte 0x73, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 Route16_House:: @ 83519AC - .4byte gMapData_Route16_House @ 0x82D5754 + .4byte House1_Layout @ 0x82D5754 .4byte gMapEvents_Route16_House @ 0x83BDC44 .4byte gMapScripts_Route16_House @ 0x817014E .4byte NULL @@ -3311,7 +3311,7 @@ Route16_House:: @ 83519AC .byte 0x74, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 Route16_NorthEntrance_1F:: @ 83519C8 - .4byte gMapData_Route16_NorthEntrance_1F @ 0x8320D14 + .4byte Route16_NorthEntrance_1F_Layout @ 0x8320D14 .4byte gMapEvents_Route16_NorthEntrance_1F @ 0x83BDD60 .4byte gMapScripts_Route16_NorthEntrance_1F @ 0x81701C2 .4byte NULL @@ -3320,7 +3320,7 @@ Route16_NorthEntrance_1F:: @ 83519C8 .byte 0x74, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00 Route16_NorthEntrance_2F:: @ 83519E4 - .4byte gMapData_Route16_NorthEntrance_2F @ 0x8320804 + .4byte Entrance_2F_Layout @ 0x8320804 .4byte gMapEvents_Route16_NorthEntrance_2F @ 0x83BDDDC .4byte gMapScripts_Route16_NorthEntrance_2F @ 0x81702BE .4byte NULL @@ -3329,7 +3329,7 @@ Route16_NorthEntrance_2F:: @ 83519E4 .byte 0x74, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 Route18_EastEntrance_1F:: @ 8351A00 - .4byte gMapData_Route18_EastEntrance_1F @ 0x8320E70 + .4byte Entrance_1F_Layout @ 0x8320E70 .4byte gMapEvents_Route18_EastEntrance_1F @ 0x83BDED0 .4byte gMapScripts_Route18_EastEntrance_1F @ 0x8170378 .4byte NULL @@ -3338,7 +3338,7 @@ Route18_EastEntrance_1F:: @ 8351A00 .byte 0x76, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00 Route18_EastEntrance_2F:: @ 8351A1C - .4byte gMapData_Route18_EastEntrance_2F @ 0x8320804 + .4byte Entrance_2F_Layout @ 0x8320804 .4byte gMapEvents_Route18_EastEntrance_2F @ 0x83BDF1C .4byte gMapScripts_Route18_EastEntrance_2F @ 0x817046B .4byte NULL @@ -3347,7 +3347,7 @@ Route18_EastEntrance_2F:: @ 8351A1C .byte 0x76, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 UnusedHouse_27_00:: @ 8351A38 - .4byte gMapData_UnusedHouse_27_00 @ 0x82D5840 + .4byte House2_Layout @ 0x82D5840 .4byte gMapEvents_UnusedHouse_27_00 @ 0x83BDF30 .4byte gMapScripts_UnusedHouse_27_00 @ 0x81704FA .4byte NULL @@ -3356,7 +3356,7 @@ UnusedHouse_27_00:: @ 8351A38 .byte 0x77, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 Route22_NorthEntrance:: @ 8351A54 - .4byte gMapData_Route22_NorthEntrance @ 0x8320B1C + .4byte Route22_NorthEntrance_Layout @ 0x8320B1C .4byte gMapEvents_Route22_NorthEntrance @ 0x83BDF8C .4byte gMapScripts_Route22_NorthEntrance @ 0x81704FB .4byte NULL @@ -3365,7 +3365,7 @@ Route22_NorthEntrance:: @ 8351A54 .byte 0x7a, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 UnusedHouse_29_00:: @ 8351A70 - .4byte gMapData_UnusedHouse_29_00 @ 0x82D5840 + .4byte House2_Layout @ 0x82D5840 .4byte gMapEvents_UnusedHouse_29_00 @ 0x83BDFA0 .4byte gMapScripts_UnusedHouse_29_00 @ 0x8170522 .4byte NULL @@ -3374,7 +3374,7 @@ UnusedHouse_29_00:: @ 8351A70 .byte 0x7b, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 Route25_SeaCottage:: @ 8351A8C - .4byte gMapData_Route25_SeaCottage @ 0x8319030 + .4byte Route25_SeaCottage_Layout @ 0x8319030 .4byte gMapEvents_Route25_SeaCottage @ 0x83BE008 .4byte gMapScripts_Route25_SeaCottage @ 0x8170523 .4byte NULL @@ -3383,7 +3383,7 @@ Route25_SeaCottage:: @ 8351A8C .byte 0x7d, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 SevenIsland_House_Room1:: @ 8351AA8 - .4byte gMapData_SevenIsland_House_Room1 @ 0x834E310 + .4byte SevenIsland_House_Room1_Layout @ 0x834E310 .4byte gMapEvents_SevenIsland_House_Room1 @ 0x83BE050 .4byte gMapScripts_SevenIsland_House_Room1 @ 0x817088A .4byte NULL @@ -3392,7 +3392,7 @@ SevenIsland_House_Room1:: @ 8351AA8 .byte 0x94, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01 SevenIsland_House_Room2:: @ 8351AC4 - .4byte gMapData_SevenIsland_House_Room2 @ 0x8338C48 + .4byte SevenIsland_House_Room2_Layout @ 0x8338C48 .4byte gMapEvents_SevenIsland_House_Room2 @ 0x83BE084 .4byte gMapScripts_SevenIsland_House_Room2 @ 0x8170A7E .4byte NULL @@ -3401,7 +3401,7 @@ SevenIsland_House_Room2:: @ 8351AC4 .byte 0x94, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01 SevenIsland_Mart:: @ 8351AE0 - .4byte gMapData_SevenIsland_Mart @ 0x82D5BCC + .4byte Mart_Layout @ 0x82D5BCC .4byte gMapEvents_SevenIsland_Mart @ 0x83BE100 .4byte gMapScripts_SevenIsland_Mart @ 0x8170B30 .4byte NULL @@ -3410,7 +3410,7 @@ SevenIsland_Mart:: @ 8351AE0 .byte 0x94, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 SevenIsland_PokemonCenter_1F:: @ 8351AFC - .4byte gMapData_SevenIsland_PokemonCenter_1F @ 0x82D5990 + .4byte PokemonCenter_1F_Layout @ 0x82D5990 .4byte gMapEvents_SevenIsland_PokemonCenter_1F @ 0x83BE1B4 .4byte gMapScripts_SevenIsland_PokemonCenter_1F @ 0x8170B89 .4byte NULL @@ -3419,7 +3419,7 @@ SevenIsland_PokemonCenter_1F:: @ 8351AFC .byte 0x94, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 SevenIsland_PokemonCenter_2F:: @ 8351B18 - .4byte gMapData_SevenIsland_PokemonCenter_2F @ 0x82D5AE0 + .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 .4byte gMapEvents_SevenIsland_PokemonCenter_2F @ 0x83BE240 .4byte gMapScripts_SevenIsland_PokemonCenter_2F @ 0x8170BBC .4byte NULL @@ -3428,7 +3428,7 @@ SevenIsland_PokemonCenter_2F:: @ 8351B18 .byte 0x94, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 UnusedHouse_31_05:: @ 8351B34 - .4byte gMapData_UnusedHouse_31_05 @ 0x82D6070 + .4byte House4_Layout @ 0x82D6070 .4byte gMapEvents_UnusedHouse_31_05 @ 0x83BE254 .4byte gMapScripts_UnusedHouse_31_05 @ 0x8170BE3 .4byte NULL @@ -3437,7 +3437,7 @@ UnusedHouse_31_05:: @ 8351B34 .byte 0x94, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 SevenIsland_Harbor:: @ 8351B50 - .4byte gMapData_SevenIsland_Harbor @ 0x8343FB8 + .4byte Island_Harbor_Layout @ 0x8343FB8 .4byte gMapEvents_SevenIsland_Harbor @ 0x83BE2A0 .4byte gMapScripts_SevenIsland_Harbor @ 0x8170BE4 .4byte NULL @@ -3446,7 +3446,7 @@ SevenIsland_Harbor:: @ 8351B50 .byte 0x94, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 OneIsland_PokemonCenter_1F:: @ 8351B6C - .4byte gMapData_OneIsland_PokemonCenter_1F @ 0x833A970 + .4byte OneIsland_PokemonCenter_1F_Layout @ 0x833A970 .4byte gMapEvents_OneIsland_PokemonCenter_1F @ 0x83BE400 .4byte gMapScripts_OneIsland_PokemonCenter_1F @ 0x8170BF8 .4byte NULL @@ -3455,7 +3455,7 @@ OneIsland_PokemonCenter_1F:: @ 8351B6C .byte 0x8f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 OneIsland_PokemonCenter_2F:: @ 8351B88 - .4byte gMapData_OneIsland_PokemonCenter_2F @ 0x8344108 + .4byte OneIsland_PokemonCenter_2F_Layout @ 0x8344108 .4byte gMapEvents_OneIsland_PokemonCenter_2F @ 0x83BE48C .4byte gMapScripts_OneIsland_PokemonCenter_2F @ 0x8171334 .4byte NULL @@ -3464,7 +3464,7 @@ OneIsland_PokemonCenter_2F:: @ 8351B88 .byte 0x8f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 OneIsland_House1:: @ 8351BA4 - .4byte gMapData_OneIsland_House1 @ 0x82D5CB8 + .4byte House3_Layout @ 0x82D5CB8 .4byte gMapEvents_OneIsland_House1 @ 0x83BE4D8 .4byte gMapScripts_OneIsland_House1 @ 0x817135B .4byte NULL @@ -3473,7 +3473,7 @@ OneIsland_House1:: @ 8351BA4 .byte 0x8f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 OneIsland_House2:: @ 8351BC0 - .4byte gMapData_OneIsland_House2 @ 0x82D5CB8 + .4byte House3_Layout @ 0x82D5CB8 .4byte gMapEvents_OneIsland_House2 @ 0x83BE50C .4byte gMapScripts_OneIsland_House2 @ 0x817136E .4byte NULL @@ -3482,7 +3482,7 @@ OneIsland_House2:: @ 8351BC0 .byte 0x8f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 OneIsland_Harbor:: @ 8351BDC - .4byte gMapData_OneIsland_Harbor @ 0x8343FB8 + .4byte Island_Harbor_Layout @ 0x8343FB8 .4byte gMapEvents_OneIsland_Harbor @ 0x83BE558 .4byte gMapScripts_OneIsland_Harbor @ 0x8171378 .4byte NULL @@ -3491,7 +3491,7 @@ OneIsland_Harbor:: @ 8351BDC .byte 0x8f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 TwoIsland_JoyfulGameCorner:: @ 8351BF8 - .4byte gMapData_TwoIsland_JoyfulGameCorner @ 0x833AA84 + .4byte TwoIsland_JoyfulGameCorner_Layout @ 0x833AA84 .4byte gMapEvents_TwoIsland_JoyfulGameCorner @ 0x83BE5EC .4byte gMapScripts_TwoIsland_JoyfulGameCorner @ 0x81713D0 .4byte NULL @@ -3500,7 +3500,7 @@ TwoIsland_JoyfulGameCorner:: @ 8351BF8 .byte 0x90, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 TwoIsland_House:: @ 8351C14 - .4byte gMapData_TwoIsland_House @ 0x82D5CB8 + .4byte House3_Layout @ 0x82D5CB8 .4byte gMapEvents_TwoIsland_House @ 0x83BE620 .4byte gMapScripts_TwoIsland_House @ 0x8171618 .4byte NULL @@ -3509,7 +3509,7 @@ TwoIsland_House:: @ 8351C14 .byte 0x90, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 TwoIsland_PokemonCenter_1F:: @ 8351C30 - .4byte gMapData_TwoIsland_PokemonCenter_1F @ 0x82D5990 + .4byte PokemonCenter_1F_Layout @ 0x82D5990 .4byte gMapEvents_TwoIsland_PokemonCenter_1F @ 0x83BE68C .4byte gMapScripts_TwoIsland_PokemonCenter_1F @ 0x81717B4 .4byte NULL @@ -3518,7 +3518,7 @@ TwoIsland_PokemonCenter_1F:: @ 8351C30 .byte 0x90, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 TwoIsland_PokemonCenter_2F:: @ 8351C4C - .4byte gMapData_TwoIsland_PokemonCenter_2F @ 0x82D5AE0 + .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 .4byte gMapEvents_TwoIsland_PokemonCenter_2F @ 0x83BE718 .4byte gMapScripts_TwoIsland_PokemonCenter_2F @ 0x81717DE .4byte NULL @@ -3527,7 +3527,7 @@ TwoIsland_PokemonCenter_2F:: @ 8351C4C .byte 0x90, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 TwoIsland_Harbor:: @ 8351C68 - .4byte gMapData_TwoIsland_Harbor @ 0x8343FB8 + .4byte Island_Harbor_Layout @ 0x8343FB8 .4byte gMapEvents_TwoIsland_Harbor @ 0x83BE764 .4byte gMapScripts_TwoIsland_Harbor @ 0x8171805 .4byte NULL @@ -3536,7 +3536,7 @@ TwoIsland_Harbor:: @ 8351C68 .byte 0x90, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 ThreeIsland_House1:: @ 8351C84 - .4byte gMapData_ThreeIsland_House1 @ 0x82D7504 + .4byte ThreeIsland_House1_Layout @ 0x82D7504 .4byte gMapEvents_ThreeIsland_House1 @ 0x83BE7A4 .4byte gMapScripts_ThreeIsland_House1 @ 0x8171819 .4byte NULL @@ -3545,7 +3545,7 @@ ThreeIsland_House1:: @ 8351C84 .byte 0x91, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 ThreeIsland_PokemonCenter_1F:: @ 8351CA0 - .4byte gMapData_ThreeIsland_PokemonCenter_1F @ 0x82D5990 + .4byte PokemonCenter_1F_Layout @ 0x82D5990 .4byte gMapEvents_ThreeIsland_PokemonCenter_1F @ 0x83BE828 .4byte gMapScripts_ThreeIsland_PokemonCenter_1F @ 0x8171832 .4byte NULL @@ -3554,7 +3554,7 @@ ThreeIsland_PokemonCenter_1F:: @ 8351CA0 .byte 0x91, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 ThreeIsland_PokemonCenter_2F:: @ 8351CBC - .4byte gMapData_ThreeIsland_PokemonCenter_2F @ 0x82D5AE0 + .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 .4byte gMapEvents_ThreeIsland_PokemonCenter_2F @ 0x83BE8B4 .4byte gMapScripts_ThreeIsland_PokemonCenter_2F @ 0x8171865 .4byte NULL @@ -3563,7 +3563,7 @@ ThreeIsland_PokemonCenter_2F:: @ 8351CBC .byte 0x91, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 ThreeIsland_Mart:: @ 8351CD8 - .4byte gMapData_ThreeIsland_Mart @ 0x82D5BCC + .4byte Mart_Layout @ 0x82D5BCC .4byte gMapEvents_ThreeIsland_Mart @ 0x83BE930 .4byte gMapScripts_ThreeIsland_Mart @ 0x817188C .4byte NULL @@ -3572,7 +3572,7 @@ ThreeIsland_Mart:: @ 8351CD8 .byte 0x91, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 ThreeIsland_House2:: @ 8351CF4 - .4byte gMapData_ThreeIsland_House2 @ 0x82D5CB8 + .4byte House3_Layout @ 0x82D5CB8 .4byte gMapEvents_ThreeIsland_House2 @ 0x83BE97C .4byte gMapScripts_ThreeIsland_House2 @ 0x81718DF .4byte NULL @@ -3581,7 +3581,7 @@ ThreeIsland_House2:: @ 8351CF4 .byte 0x91, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 ThreeIsland_House3:: @ 8351D10 - .4byte gMapData_ThreeIsland_House3 @ 0x82D5CB8 + .4byte House3_Layout @ 0x82D5CB8 .4byte gMapEvents_ThreeIsland_House3 @ 0x83BE9B0 .4byte gMapScripts_ThreeIsland_House3 @ 0x8171902 .4byte NULL @@ -3590,7 +3590,7 @@ ThreeIsland_House3:: @ 8351D10 .byte 0x91, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 ThreeIsland_House4:: @ 8351D2C - .4byte gMapData_ThreeIsland_House4 @ 0x82D5CB8 + .4byte House3_Layout @ 0x82D5CB8 .4byte gMapEvents_ThreeIsland_House4 @ 0x83BE9FC .4byte gMapScripts_ThreeIsland_House4 @ 0x817190C .4byte NULL @@ -3599,7 +3599,7 @@ ThreeIsland_House4:: @ 8351D2C .byte 0x91, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 ThreeIsland_House5:: @ 8351D48 - .4byte gMapData_ThreeIsland_House5 @ 0x82D5CB8 + .4byte House3_Layout @ 0x82D5CB8 .4byte gMapEvents_ThreeIsland_House5 @ 0x83BEA30 .4byte gMapScripts_ThreeIsland_House5 @ 0x817191F .4byte NULL @@ -3608,7 +3608,7 @@ ThreeIsland_House5:: @ 8351D48 .byte 0x91, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 FourIsland_PokemonDayCare:: @ 8351D64 - .4byte gMapData_FourIsland_PokemonDayCare @ 0x833AFA8 + .4byte FourIsland_PokemonDayCare_Layout @ 0x833AFA8 .4byte gMapEvents_FourIsland_PokemonDayCare @ 0x83BEA64 .4byte gMapScripts_FourIsland_PokemonDayCare @ 0x817193F .4byte NULL @@ -3617,7 +3617,7 @@ FourIsland_PokemonDayCare:: @ 8351D64 .byte 0x92, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 FourIsland_PokemonCenter_1F:: @ 8351D80 - .4byte gMapData_FourIsland_PokemonCenter_1F @ 0x82D5990 + .4byte PokemonCenter_1F_Layout @ 0x82D5990 .4byte gMapEvents_FourIsland_PokemonCenter_1F @ 0x83BEB00 .4byte gMapScripts_FourIsland_PokemonCenter_1F @ 0x8171BEA .4byte NULL @@ -3626,7 +3626,7 @@ FourIsland_PokemonCenter_1F:: @ 8351D80 .byte 0x92, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 FourIsland_PokemonCenter_2F:: @ 8351D9C - .4byte gMapData_FourIsland_PokemonCenter_2F @ 0x82D5AE0 + .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 .4byte gMapEvents_FourIsland_PokemonCenter_2F @ 0x83BEB8C .4byte gMapScripts_FourIsland_PokemonCenter_2F @ 0x8171C1D .4byte NULL @@ -3635,7 +3635,7 @@ FourIsland_PokemonCenter_2F:: @ 8351D9C .byte 0x92, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 FourIsland_House1:: @ 8351DB8 - .4byte gMapData_FourIsland_House1 @ 0x82D5CB8 + .4byte House3_Layout @ 0x82D5CB8 .4byte gMapEvents_FourIsland_House1 @ 0x83BEBD8 .4byte gMapScripts_FourIsland_House1 @ 0x8171C44 .4byte NULL @@ -3644,7 +3644,7 @@ FourIsland_House1:: @ 8351DB8 .byte 0x92, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 FourIsland_LoreleisHouse:: @ 8351DD4 - .4byte gMapData_FourIsland_LoreleisHouse @ 0x82D7418 + .4byte FourIsland_LoreleisHouse_Layout @ 0x82D7418 .4byte gMapEvents_FourIsland_LoreleisHouse @ 0x83BED5C .4byte gMapScripts_FourIsland_LoreleisHouse @ 0x8171C4E .4byte NULL @@ -3653,7 +3653,7 @@ FourIsland_LoreleisHouse:: @ 8351DD4 .byte 0x92, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 FourIsland_Harbor:: @ 8351DF0 - .4byte gMapData_FourIsland_Harbor @ 0x8343FB8 + .4byte Island_Harbor_Layout @ 0x8343FB8 .4byte gMapEvents_FourIsland_Harbor @ 0x83BEDA8 .4byte gMapScripts_FourIsland_Harbor @ 0x8171C98 .4byte NULL @@ -3662,7 +3662,7 @@ FourIsland_Harbor:: @ 8351DF0 .byte 0x92, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 FourIsland_House2:: @ 8351E0C - .4byte gMapData_FourIsland_House2 @ 0x82D5CB8 + .4byte House3_Layout @ 0x82D5CB8 .4byte gMapEvents_FourIsland_House2 @ 0x83BEDDC .4byte gMapScripts_FourIsland_House2 @ 0x8171CAC .4byte NULL @@ -3671,7 +3671,7 @@ FourIsland_House2:: @ 8351E0C .byte 0x92, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 FourIsland_Mart:: @ 8351E28 - .4byte gMapData_FourIsland_Mart @ 0x82D5BCC + .4byte Mart_Layout @ 0x82D5BCC .4byte gMapEvents_FourIsland_Mart @ 0x83BEE40 .4byte gMapScripts_FourIsland_Mart @ 0x8171CAD .4byte NULL @@ -3680,7 +3680,7 @@ FourIsland_Mart:: @ 8351E28 .byte 0x92, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 FiveIsland_PokemonCenter_1F:: @ 8351E44 - .4byte gMapData_FiveIsland_PokemonCenter_1F @ 0x82D5990 + .4byte PokemonCenter_1F_Layout @ 0x82D5990 .4byte gMapEvents_FiveIsland_PokemonCenter_1F @ 0x83BEEDC .4byte gMapScripts_FiveIsland_PokemonCenter_1F @ 0x8171CF1 .4byte NULL @@ -3689,7 +3689,7 @@ FiveIsland_PokemonCenter_1F:: @ 8351E44 .byte 0x93, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 FiveIsland_PokemonCenter_2F:: @ 8351E60 - .4byte gMapData_FiveIsland_PokemonCenter_2F @ 0x82D5AE0 + .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 .4byte gMapEvents_FiveIsland_PokemonCenter_2F @ 0x83BEF68 .4byte gMapScripts_FiveIsland_PokemonCenter_2F @ 0x8171D1B .4byte NULL @@ -3698,7 +3698,7 @@ FiveIsland_PokemonCenter_2F:: @ 8351E60 .byte 0x93, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 FiveIsland_Harbor:: @ 8351E7C - .4byte gMapData_FiveIsland_Harbor @ 0x8343FB8 + .4byte Island_Harbor_Layout @ 0x8343FB8 .4byte gMapEvents_FiveIsland_Harbor @ 0x83BEFB4 .4byte gMapScripts_FiveIsland_Harbor @ 0x8171D42 .4byte NULL @@ -3707,7 +3707,7 @@ FiveIsland_Harbor:: @ 8351E7C .byte 0x93, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 FiveIsland_House1:: @ 8351E98 - .4byte gMapData_FiveIsland_House1 @ 0x82D5CB8 + .4byte House3_Layout @ 0x82D5CB8 .4byte gMapEvents_FiveIsland_House1 @ 0x83BEFE8 .4byte gMapScripts_FiveIsland_House1 @ 0x8171D56 .4byte NULL @@ -3716,7 +3716,7 @@ FiveIsland_House1:: @ 8351E98 .byte 0x93, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 FiveIsland_House2:: @ 8351EB4 - .4byte gMapData_FiveIsland_House2 @ 0x82D5CB8 + .4byte House3_Layout @ 0x82D5CB8 .4byte gMapEvents_FiveIsland_House2 @ 0x83BF01C .4byte gMapScripts_FiveIsland_House2 @ 0x8171D60 .4byte NULL @@ -3725,7 +3725,7 @@ FiveIsland_House2:: @ 8351EB4 .byte 0x93, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 SixIsland_PokemonCenter_1F:: @ 8351ED0 - .4byte gMapData_SixIsland_PokemonCenter_1F @ 0x82D5990 + .4byte PokemonCenter_1F_Layout @ 0x82D5990 .4byte gMapEvents_SixIsland_PokemonCenter_1F @ 0x83BF0A0 .4byte gMapScripts_SixIsland_PokemonCenter_1F @ 0x8171D6A .4byte NULL @@ -3734,7 +3734,7 @@ SixIsland_PokemonCenter_1F:: @ 8351ED0 .byte 0x95, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 SixIsland_PokemonCenter_2F:: @ 8351EEC - .4byte gMapData_SixIsland_PokemonCenter_2F @ 0x82D5AE0 + .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 .4byte gMapEvents_SixIsland_PokemonCenter_2F @ 0x83BF12C .4byte gMapScripts_SixIsland_PokemonCenter_2F @ 0x8171E20 .4byte NULL @@ -3743,7 +3743,7 @@ SixIsland_PokemonCenter_2F:: @ 8351EEC .byte 0x95, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 SixIsland_Harbor:: @ 8351F08 - .4byte gMapData_SixIsland_Harbor @ 0x8343FB8 + .4byte Island_Harbor_Layout @ 0x8343FB8 .4byte gMapEvents_SixIsland_Harbor @ 0x83BF178 .4byte gMapScripts_SixIsland_Harbor @ 0x8171E47 .4byte NULL @@ -3752,7 +3752,7 @@ SixIsland_Harbor:: @ 8351F08 .byte 0x95, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 SixIsland_House:: @ 8351F24 - .4byte gMapData_SixIsland_House @ 0x82D5CB8 + .4byte House3_Layout @ 0x82D5CB8 .4byte gMapEvents_SixIsland_House @ 0x83BF1AC .4byte gMapScripts_SixIsland_House @ 0x8171E5B .4byte NULL @@ -3761,7 +3761,7 @@ SixIsland_House:: @ 8351F24 .byte 0x95, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 SixIsland_Mart:: @ 8351F40 - .4byte gMapData_SixIsland_Mart @ 0x82D5BCC + .4byte Mart_Layout @ 0x82D5BCC .4byte gMapEvents_SixIsland_Mart @ 0x83BF210 .4byte gMapScripts_SixIsland_Mart @ 0x8171E65 .4byte NULL @@ -3770,7 +3770,7 @@ SixIsland_Mart:: @ 8351F40 .byte 0x95, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 ThreeIsland_Harbor:: @ 8351F5C - .4byte gMapData_ThreeIsland_Harbor @ 0x8343FB8 + .4byte Island_Harbor_Layout @ 0x8343FB8 .4byte gMapEvents_ThreeIsland_Harbor @ 0x83BF25C .4byte gMapScripts_ThreeIsland_Harbor @ 0x8171EA9 .4byte NULL @@ -3779,7 +3779,7 @@ ThreeIsland_Harbor:: @ 8351F5C .byte 0x9a, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 FiveIsland_ResortGorgeous_House:: @ 8351F78 - .4byte gMapData_FiveIsland_ResortGorgeous_House @ 0x82D657C + .4byte FiveIsland_ResortGorgeous_House_Layout @ 0x82D657C .4byte gMapEvents_FiveIsland_ResortGorgeous_House @ 0x83BF2C0 .4byte gMapScripts_FiveIsland_ResortGorgeous_House @ 0x8171EBD .4byte NULL @@ -3788,7 +3788,7 @@ FiveIsland_ResortGorgeous_House:: @ 8351F78 .byte 0x9f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 TwoIsland_CapeBrink_House:: @ 8351F94 - .4byte gMapData_TwoIsland_CapeBrink_House @ 0x82D5CB8 + .4byte House3_Layout @ 0x82D5CB8 .4byte gMapEvents_TwoIsland_CapeBrink_House @ 0x83BF2F4 .4byte gMapScripts_TwoIsland_CapeBrink_House @ 0x817206B .4byte NULL @@ -3797,7 +3797,7 @@ TwoIsland_CapeBrink_House:: @ 8351F94 .byte 0x98, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 SixIsland_WaterPath_House1:: @ 8351FB0 - .4byte gMapData_SixIsland_WaterPath_House1 @ 0x82D6070 + .4byte House4_Layout @ 0x82D6070 .4byte gMapEvents_SixIsland_WaterPath_House1 @ 0x83BF334 .4byte gMapScripts_SixIsland_WaterPath_House1 @ 0x817206C .4byte NULL @@ -3806,7 +3806,7 @@ SixIsland_WaterPath_House1:: @ 8351FB0 .byte 0xa5, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 SixIsland_WaterPath_House2:: @ 8351FCC - .4byte gMapData_SixIsland_WaterPath_House2 @ 0x82D5CB8 + .4byte House3_Layout @ 0x82D5CB8 .4byte gMapEvents_SixIsland_WaterPath_House2 @ 0x83BF368 .4byte gMapScripts_SixIsland_WaterPath_House2 @ 0x8172178 .4byte NULL @@ -3815,7 +3815,7 @@ SixIsland_WaterPath_House2:: @ 8351FCC .byte 0xa5, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 SevenIsland_SevaultCanyon_House:: @ 8351FE8 - .4byte gMapData_SevenIsland_SevaultCanyon_House @ 0x82D5CB8 + .4byte House3_Layout @ 0x82D5CB8 .4byte gMapEvents_SevenIsland_SevaultCanyon_House @ 0x83BF3CC .4byte gMapScripts_SevenIsland_SevaultCanyon_House @ 0x8172182 .4byte NULL -- cgit v1.2.3 From f5683b5c46b802cf75491d931a33d2fbe52a332c Mon Sep 17 00:00:00 2001 From: garak Date: Thu, 18 Apr 2019 10:44:26 -0400 Subject: move headers and connections into map dirs --- data/maps/BirthIsland_Exterior/header.inc | 8 + data/maps/BirthIsland_Harbor/header.inc | 8 + data/maps/CeladonCity/connections.inc | 7 + data/maps/CeladonCity/header.inc | 8 + data/maps/CeladonCity_Condominiums_1F/header.inc | 8 + data/maps/CeladonCity_Condominiums_2F/header.inc | 8 + data/maps/CeladonCity_Condominiums_3F/header.inc | 8 + data/maps/CeladonCity_Condominiums_Roof/header.inc | 8 + .../CeladonCity_Condominiums_RoofRoom/header.inc | 8 + .../maps/CeladonCity_DepartmentStore_1F/header.inc | 8 + .../maps/CeladonCity_DepartmentStore_2F/header.inc | 8 + .../maps/CeladonCity_DepartmentStore_3F/header.inc | 8 + .../maps/CeladonCity_DepartmentStore_4F/header.inc | 8 + .../maps/CeladonCity_DepartmentStore_5F/header.inc | 8 + .../header.inc | 8 + .../CeladonCity_DepartmentStore_Roof/header.inc | 8 + data/maps/CeladonCity_GameCorner/header.inc | 8 + .../CeladonCity_GameCorner_PrizeRoom/header.inc | 8 + data/maps/CeladonCity_Gym/header.inc | 8 + data/maps/CeladonCity_Hotel/header.inc | 8 + data/maps/CeladonCity_House1/header.inc | 8 + data/maps/CeladonCity_PokemonCenter_1F/header.inc | 8 + data/maps/CeladonCity_PokemonCenter_2F/header.inc | 8 + data/maps/CeladonCity_Restaurant/header.inc | 8 + data/maps/CeruleanCave_1F/header.inc | 8 + data/maps/CeruleanCave_2F/header.inc | 8 + data/maps/CeruleanCave_B1F/header.inc | 8 + data/maps/CeruleanCity/connections.inc | 9 + data/maps/CeruleanCity/header.inc | 8 + data/maps/CeruleanCity_BikeShop/header.inc | 8 + data/maps/CeruleanCity_Gym/header.inc | 8 + data/maps/CeruleanCity_House1/header.inc | 8 + data/maps/CeruleanCity_House2/header.inc | 8 + data/maps/CeruleanCity_House3/header.inc | 8 + data/maps/CeruleanCity_House4/header.inc | 8 + data/maps/CeruleanCity_House5/header.inc | 8 + data/maps/CeruleanCity_Mart/header.inc | 8 + data/maps/CeruleanCity_PokemonCenter_1F/header.inc | 8 + data/maps/CeruleanCity_PokemonCenter_2F/header.inc | 8 + data/maps/CinnabarIsland/connections.inc | 7 + data/maps/CinnabarIsland/header.inc | 8 + data/maps/CinnabarIsland_Gym/header.inc | 8 + data/maps/CinnabarIsland_Mart/header.inc | 8 + .../CinnabarIsland_PokemonCenter_1F/header.inc | 8 + .../CinnabarIsland_PokemonCenter_2F/header.inc | 8 + .../CinnabarIsland_PokemonLab_Entrance/header.inc | 8 + .../header.inc | 8 + .../CinnabarIsland_PokemonLab_Lounge/header.inc | 8 + .../header.inc | 8 + data/maps/DiglettsCave_B1F/header.inc | 8 + data/maps/DiglettsCave_NorthEntrance/header.inc | 8 + data/maps/DiglettsCave_SouthEntrance/header.inc | 8 + data/maps/FiveIsland/connections.inc | 7 + data/maps/FiveIsland/header.inc | 8 + data/maps/FiveIsland_Harbor/header.inc | 8 + data/maps/FiveIsland_House1/header.inc | 8 + data/maps/FiveIsland_House2/header.inc | 8 + data/maps/FiveIsland_LostCave_Entrance/header.inc | 8 + data/maps/FiveIsland_LostCave_Room1/header.inc | 8 + data/maps/FiveIsland_LostCave_Room10/header.inc | 8 + data/maps/FiveIsland_LostCave_Room11/header.inc | 8 + data/maps/FiveIsland_LostCave_Room12/header.inc | 8 + data/maps/FiveIsland_LostCave_Room13/header.inc | 8 + data/maps/FiveIsland_LostCave_Room14/header.inc | 8 + data/maps/FiveIsland_LostCave_Room2/header.inc | 8 + data/maps/FiveIsland_LostCave_Room3/header.inc | 8 + data/maps/FiveIsland_LostCave_Room4/header.inc | 8 + data/maps/FiveIsland_LostCave_Room5/header.inc | 8 + data/maps/FiveIsland_LostCave_Room6/header.inc | 8 + data/maps/FiveIsland_LostCave_Room7/header.inc | 8 + data/maps/FiveIsland_LostCave_Room8/header.inc | 8 + data/maps/FiveIsland_LostCave_Room9/header.inc | 8 + data/maps/FiveIsland_Meadow/connections.inc | 7 + data/maps/FiveIsland_Meadow/header.inc | 8 + .../maps/FiveIsland_MemorialPillar/connections.inc | 6 + data/maps/FiveIsland_MemorialPillar/header.inc | 8 + data/maps/FiveIsland_PokemonCenter_1F/header.inc | 8 + data/maps/FiveIsland_PokemonCenter_2F/header.inc | 8 + .../maps/FiveIsland_ResortGorgeous/connections.inc | 6 + data/maps/FiveIsland_ResortGorgeous/header.inc | 8 + .../FiveIsland_ResortGorgeous_House/header.inc | 8 + .../maps/FiveIsland_WaterLabyrinth/connections.inc | 7 + data/maps/FiveIsland_WaterLabyrinth/header.inc | 8 + data/maps/FourIsland/header.inc | 8 + data/maps/FourIsland_Harbor/header.inc | 8 + data/maps/FourIsland_House1/header.inc | 8 + data/maps/FourIsland_House2/header.inc | 8 + data/maps/FourIsland_IcefallCave_1F/header.inc | 8 + .../FourIsland_IcefallCave_Entrance/header.inc | 8 + data/maps/FourIsland_LoreleisHouse/header.inc | 8 + data/maps/FourIsland_Mart/header.inc | 8 + data/maps/FourIsland_PokemonCenter_1F/header.inc | 8 + data/maps/FourIsland_PokemonCenter_2F/header.inc | 8 + data/maps/FourIsland_PokemonDayCare/header.inc | 8 + data/maps/FuchsiaCity/connections.inc | 8 + data/maps/FuchsiaCity/header.inc | 8 + data/maps/FuchsiaCity_Building1/header.inc | 8 + data/maps/FuchsiaCity_Gym/header.inc | 8 + data/maps/FuchsiaCity_House1/header.inc | 8 + data/maps/FuchsiaCity_House2/header.inc | 8 + data/maps/FuchsiaCity_House3/header.inc | 8 + data/maps/FuchsiaCity_Mart/header.inc | 8 + data/maps/FuchsiaCity_PokemonCenter_1F/header.inc | 8 + data/maps/FuchsiaCity_PokemonCenter_2F/header.inc | 8 + .../FuchsiaCity_SafariZone_Entrance/header.inc | 8 + data/maps/FuchsiaCity_ZooBuilding/header.inc | 8 + data/maps/IndigoPlateau_Exterior/connections.inc | 6 + data/maps/IndigoPlateau_Exterior/header.inc | 8 + .../maps/IndigoPlateau_PokemonCenter_1F/header.inc | 8 + .../maps/IndigoPlateau_PokemonCenter_2F/header.inc | 8 + data/maps/LavenderTown/connections.inc | 8 + data/maps/LavenderTown/header.inc | 8 + data/maps/LavenderTown_House1/header.inc | 8 + data/maps/LavenderTown_House2/header.inc | 8 + data/maps/LavenderTown_Mart/header.inc | 8 + data/maps/LavenderTown_PokemonCenter_1F/header.inc | 8 + data/maps/LavenderTown_PokemonCenter_2F/header.inc | 8 + .../LavenderTown_VolunteerPokemonHouse/header.inc | 8 + data/maps/MtEmber_Exterior/header.inc | 8 + data/maps/MtEmber_RubyPath_B1F/header.inc | 8 + data/maps/MtEmber_RubyPath_B1F_Stairs/header.inc | 8 + data/maps/MtEmber_RubyPath_B2F/header.inc | 8 + data/maps/MtEmber_RubyPath_B2F_Stairs/header.inc | 8 + data/maps/MtEmber_RubyPath_B3F/header.inc | 8 + data/maps/MtEmber_RubyPath_B4F/header.inc | 8 + data/maps/MtEmber_RubyPath_B5F/header.inc | 8 + data/maps/MtEmber_Summit/header.inc | 8 + data/maps/MtEmber_SummitPath_1F/header.inc | 8 + data/maps/MtEmber_SummitPath_2F/header.inc | 8 + data/maps/MtEmber_SummitPath_3F/header.inc | 8 + data/maps/MtMoon_1F/header.inc | 8 + data/maps/MtMoon_B1F/header.inc | 8 + data/maps/MtMoon_B2F/header.inc | 8 + data/maps/NavelRock_1F/header.inc | 8 + data/maps/NavelRock_B1F/header.inc | 8 + data/maps/NavelRock_Base/header.inc | 8 + data/maps/NavelRock_BasePath_B10F/header.inc | 8 + data/maps/NavelRock_BasePath_B11F/header.inc | 8 + data/maps/NavelRock_BasePath_B1F/header.inc | 8 + data/maps/NavelRock_BasePath_B2F/header.inc | 8 + data/maps/NavelRock_BasePath_B3F/header.inc | 8 + data/maps/NavelRock_BasePath_B4F/header.inc | 8 + data/maps/NavelRock_BasePath_B5F/header.inc | 8 + data/maps/NavelRock_BasePath_B6F/header.inc | 8 + data/maps/NavelRock_BasePath_B7F/header.inc | 8 + data/maps/NavelRock_BasePath_B8F/header.inc | 8 + data/maps/NavelRock_BasePath_B9F/header.inc | 8 + data/maps/NavelRock_Exterior/header.inc | 8 + data/maps/NavelRock_Fork/header.inc | 8 + data/maps/NavelRock_Harbor/header.inc | 8 + data/maps/NavelRock_Summit/header.inc | 8 + data/maps/NavelRock_SummitPath_2F/header.inc | 8 + data/maps/NavelRock_SummitPath_3F/header.inc | 8 + data/maps/NavelRock_SummitPath_4F/header.inc | 8 + data/maps/NavelRock_SummitPath_5F/header.inc | 8 + data/maps/OneIsland/connections.inc | 7 + data/maps/OneIsland/header.inc | 8 + data/maps/OneIsland_Harbor/header.inc | 8 + data/maps/OneIsland_House1/header.inc | 8 + data/maps/OneIsland_House2/header.inc | 8 + data/maps/OneIsland_KindleRoad/connections.inc | 6 + data/maps/OneIsland_KindleRoad/header.inc | 8 + data/maps/OneIsland_KindleRoad_EmberSpa/header.inc | 8 + data/maps/OneIsland_PokemonCenter_1F/header.inc | 8 + data/maps/OneIsland_PokemonCenter_2F/header.inc | 8 + data/maps/OneIsland_TreasureBeach/connections.inc | 6 + data/maps/OneIsland_TreasureBeach/header.inc | 8 + data/maps/PalletTown/connections.inc | 7 + data/maps/PalletTown/header.inc | 8 + data/maps/PalletTown_GarysHouse/header.inc | 8 + data/maps/PalletTown_PlayersHouse_1F/header.inc | 8 + data/maps/PalletTown_PlayersHouse_2F/header.inc | 8 + data/maps/PalletTown_ProfessorOaksLab/header.inc | 8 + data/maps/PewterCity/connections.inc | 7 + data/maps/PewterCity/header.inc | 8 + data/maps/PewterCity_Gym/header.inc | 8 + data/maps/PewterCity_House1/header.inc | 8 + data/maps/PewterCity_House2/header.inc | 8 + data/maps/PewterCity_Mart/header.inc | 8 + data/maps/PewterCity_Museum_1F/header.inc | 8 + data/maps/PewterCity_Museum_2F/header.inc | 8 + data/maps/PewterCity_PokemonCenter_1F/header.inc | 8 + data/maps/PewterCity_PokemonCenter_2F/header.inc | 8 + data/maps/PokemonLeague_AgathasRoom/header.inc | 8 + data/maps/PokemonLeague_BrunosRoom/header.inc | 8 + data/maps/PokemonLeague_ChampionsRoom/header.inc | 8 + data/maps/PokemonLeague_HallOfFame/header.inc | 8 + data/maps/PokemonLeague_LancesRoom/header.inc | 8 + data/maps/PokemonLeague_LoreleisRoom/header.inc | 8 + data/maps/PokemonMansion_1F/header.inc | 8 + data/maps/PokemonMansion_2F/header.inc | 8 + data/maps/PokemonMansion_3F/header.inc | 8 + data/maps/PokemonMansion_B1F/header.inc | 8 + data/maps/PokemonTower_1F/header.inc | 8 + data/maps/PokemonTower_2F/header.inc | 8 + data/maps/PokemonTower_3F/header.inc | 8 + data/maps/PokemonTower_4F/header.inc | 8 + data/maps/PokemonTower_5F/header.inc | 8 + data/maps/PokemonTower_6F/header.inc | 8 + data/maps/PokemonTower_7F/header.inc | 8 + data/maps/PowerPlant/header.inc | 8 + data/maps/RockTunnel_1F/header.inc | 8 + data/maps/RockTunnel_B1F/header.inc | 8 + data/maps/RocketHideout_B1F/header.inc | 8 + data/maps/RocketHideout_B2F/header.inc | 8 + data/maps/RocketHideout_B3F/header.inc | 8 + data/maps/RocketHideout_B4F/header.inc | 8 + data/maps/RocketHideout_Elevator/header.inc | 8 + data/maps/Route1/connections.inc | 7 + data/maps/Route1/header.inc | 8 + data/maps/Route10/connections.inc | 7 + data/maps/Route10/header.inc | 8 + data/maps/Route10_PokemonCenter_1F/header.inc | 8 + data/maps/Route10_PokemonCenter_2F/header.inc | 8 + data/maps/Route11/connections.inc | 7 + data/maps/Route11/header.inc | 8 + data/maps/Route11_EastEntrance_1F/header.inc | 8 + data/maps/Route11_EastEntrance_2F/header.inc | 8 + data/maps/Route12/connections.inc | 8 + data/maps/Route12/header.inc | 8 + data/maps/Route12_FishingHouse/header.inc | 8 + data/maps/Route12_NorthEntrance_1F/header.inc | 8 + data/maps/Route12_NorthEntrance_2F/header.inc | 8 + data/maps/Route13/connections.inc | 7 + data/maps/Route13/header.inc | 8 + data/maps/Route14/connections.inc | 7 + data/maps/Route14/header.inc | 8 + data/maps/Route15/connections.inc | 7 + data/maps/Route15/header.inc | 8 + data/maps/Route15_WestEntrance_1F/header.inc | 8 + data/maps/Route15_WestEntrance_2F/header.inc | 8 + data/maps/Route16/connections.inc | 7 + data/maps/Route16/header.inc | 8 + data/maps/Route16_House/header.inc | 8 + data/maps/Route16_NorthEntrance_1F/header.inc | 8 + data/maps/Route16_NorthEntrance_2F/header.inc | 8 + data/maps/Route17/connections.inc | 7 + data/maps/Route17/header.inc | 8 + data/maps/Route18/connections.inc | 7 + data/maps/Route18/header.inc | 8 + data/maps/Route18_EastEntrance_1F/header.inc | 8 + data/maps/Route18_EastEntrance_2F/header.inc | 8 + data/maps/Route19/connections.inc | 7 + data/maps/Route19/header.inc | 8 + data/maps/Route2/connections.inc | 7 + data/maps/Route2/header.inc | 8 + data/maps/Route20/connections.inc | 7 + data/maps/Route20/header.inc | 8 + data/maps/Route21_North/connections.inc | 7 + data/maps/Route21_North/header.inc | 8 + data/maps/Route21_South/connections.inc | 7 + data/maps/Route21_South/header.inc | 8 + data/maps/Route22/connections.inc | 7 + data/maps/Route22/header.inc | 8 + data/maps/Route22_NorthEntrance/header.inc | 8 + data/maps/Route23/connections.inc | 7 + data/maps/Route23/header.inc | 8 + data/maps/Route24/connections.inc | 7 + data/maps/Route24/header.inc | 8 + data/maps/Route25/connections.inc | 6 + data/maps/Route25/header.inc | 8 + data/maps/Route25_SeaCottage/header.inc | 8 + data/maps/Route2_EastBuilding/header.inc | 8 + data/maps/Route2_House/header.inc | 8 + .../Route2_ViridianForest_NorthEntrance/header.inc | 8 + .../Route2_ViridianForest_SouthEntrance/header.inc | 8 + data/maps/Route3/connections.inc | 7 + data/maps/Route3/header.inc | 8 + data/maps/Route4/connections.inc | 7 + data/maps/Route4/header.inc | 8 + data/maps/Route4_PokemonCenter_1F/header.inc | 8 + data/maps/Route4_PokemonCenter_2F/header.inc | 8 + data/maps/Route5/connections.inc | 7 + data/maps/Route5/header.inc | 8 + data/maps/Route5_PokemonDayCare/header.inc | 8 + data/maps/Route5_SouthEntrance/header.inc | 8 + data/maps/Route6/connections.inc | 7 + data/maps/Route6/header.inc | 8 + data/maps/Route6_NorthEntrance/header.inc | 8 + data/maps/Route7/connections.inc | 7 + data/maps/Route7/header.inc | 8 + data/maps/Route7_EastEntrance/header.inc | 8 + data/maps/Route8/connections.inc | 7 + data/maps/Route8/header.inc | 8 + data/maps/Route8_WestEntrance/header.inc | 8 + data/maps/Route9/connections.inc | 7 + data/maps/Route9/header.inc | 8 + data/maps/SSAnne_1F_Corridor/header.inc | 8 + data/maps/SSAnne_1F_Room1/header.inc | 8 + data/maps/SSAnne_1F_Room11/header.inc | 8 + data/maps/SSAnne_1F_Room12/header.inc | 8 + data/maps/SSAnne_1F_Room2/header.inc | 8 + data/maps/SSAnne_1F_Room3/header.inc | 8 + data/maps/SSAnne_1F_Room4/header.inc | 8 + data/maps/SSAnne_1F_Room5/header.inc | 8 + data/maps/SSAnne_1F_Room6/header.inc | 8 + data/maps/SSAnne_1F_Room7/header.inc | 8 + data/maps/SSAnne_2F_Corridor/header.inc | 8 + data/maps/SSAnne_2F_Room1/header.inc | 8 + data/maps/SSAnne_2F_Room2/header.inc | 8 + data/maps/SSAnne_2F_Room3/header.inc | 8 + data/maps/SSAnne_2F_Room4/header.inc | 8 + data/maps/SSAnne_2F_Room5/header.inc | 8 + data/maps/SSAnne_2F_Room6/header.inc | 8 + data/maps/SSAnne_3F_Corridor/header.inc | 8 + data/maps/SSAnne_B1F_Corridor/header.inc | 8 + data/maps/SSAnne_B1F_Room1/header.inc | 8 + data/maps/SSAnne_B1F_Room2/header.inc | 8 + data/maps/SSAnne_B1F_Room3/header.inc | 8 + data/maps/SSAnne_B1F_Room4/header.inc | 8 + data/maps/SSAnne_B1F_Room5/header.inc | 8 + data/maps/SSAnne_CaptainsOffice/header.inc | 8 + data/maps/SSAnne_CaptainsOffice2/header.inc | 8 + data/maps/SSAnne_CaptainsOffice3/header.inc | 8 + data/maps/SSAnne_CaptainsOffice4/header.inc | 8 + data/maps/SSAnne_CaptainsOffice5/header.inc | 8 + data/maps/SSAnne_CaptainsOffice9/header.inc | 8 + data/maps/SSAnne_Deck/header.inc | 8 + data/maps/SSAnne_Exterior/header.inc | 8 + data/maps/SSAnne_Kitchen/header.inc | 8 + data/maps/SSAnne_Kitchen3/header.inc | 8 + data/maps/SafariZone_Building1/header.inc | 8 + data/maps/SafariZone_Building2/header.inc | 8 + data/maps/SafariZone_Building3/header.inc | 8 + data/maps/SafariZone_Building4/header.inc | 8 + data/maps/SafariZone_Center/header.inc | 8 + data/maps/SafariZone_East/header.inc | 8 + data/maps/SafariZone_North/header.inc | 8 + data/maps/SafariZone_SecretHouse/header.inc | 8 + data/maps/SafariZone_West/header.inc | 8 + data/maps/SaffronCity/connections.inc | 9 + data/maps/SaffronCity/header.inc | 8 + data/maps/SaffronCity_Dojo/header.inc | 8 + data/maps/SaffronCity_Duplicate/connections.inc | 9 + data/maps/SaffronCity_Duplicate/header.inc | 8 + data/maps/SaffronCity_Gym/header.inc | 8 + data/maps/SaffronCity_House1_1F/header.inc | 8 + data/maps/SaffronCity_House1_2F/header.inc | 8 + data/maps/SaffronCity_House2/header.inc | 8 + data/maps/SaffronCity_House3/header.inc | 8 + data/maps/SaffronCity_Mart/header.inc | 8 + data/maps/SaffronCity_PokemonCenter_1F/header.inc | 8 + data/maps/SaffronCity_PokemonCenter_2F/header.inc | 8 + .../SaffronCity_PokemonTrainerFanClub/header.inc | 8 + data/maps/SeafoamIslands_1F/header.inc | 8 + data/maps/SeafoamIslands_B1F/header.inc | 8 + data/maps/SeafoamIslands_B2F/header.inc | 8 + data/maps/SeafoamIslands_B3F/header.inc | 8 + data/maps/SeafoamIslands_B4F/header.inc | 8 + data/maps/SevenIsland/connections.inc | 7 + data/maps/SevenIsland/header.inc | 8 + data/maps/SevenIsland_Harbor/header.inc | 8 + data/maps/SevenIsland_House_Room1/header.inc | 8 + data/maps/SevenIsland_House_Room2/header.inc | 8 + data/maps/SevenIsland_Mart/header.inc | 8 + data/maps/SevenIsland_PokemonCenter_1F/header.inc | 8 + data/maps/SevenIsland_PokemonCenter_2F/header.inc | 8 + .../header.inc | 8 + .../maps/SevenIsland_SevaultCanyon/connections.inc | 7 + data/maps/SevenIsland_SevaultCanyon/header.inc | 8 + .../connections.inc | 7 + .../SevenIsland_SevaultCanyon_Entrance/header.inc | 8 + .../SevenIsland_SevaultCanyon_House/header.inc | 8 + data/maps/SevenIsland_TanobyRuins/connections.inc | 6 + data/maps/SevenIsland_TanobyRuins/header.inc | 8 + .../header.inc | 8 + .../header.inc | 8 + .../header.inc | 8 + .../SevenIsland_TanobyRuins_RixyChamber/header.inc | 8 + .../header.inc | 8 + .../header.inc | 8 + .../header.inc | 8 + data/maps/SevenIsland_TrainerTower/connections.inc | 6 + data/maps/SevenIsland_TrainerTower/header.inc | 8 + data/maps/SevenIsland_TrainerTower_1F/header.inc | 8 + data/maps/SevenIsland_TrainerTower_2F/header.inc | 8 + data/maps/SevenIsland_TrainerTower_3F/header.inc | 8 + data/maps/SevenIsland_TrainerTower_4F/header.inc | 8 + data/maps/SevenIsland_TrainerTower_5F/header.inc | 8 + data/maps/SevenIsland_TrainerTower_6F/header.inc | 8 + data/maps/SevenIsland_TrainerTower_7F/header.inc | 8 + data/maps/SevenIsland_TrainerTower_8F/header.inc | 8 + .../SevenIsland_TrainerTower_Elevator/header.inc | 8 + .../maps/SevenIsland_TrainerTower_Lobby/header.inc | 8 + data/maps/SevenIsland_TrainerTower_Roof/header.inc | 8 + data/maps/SilphCo_10F/header.inc | 8 + data/maps/SilphCo_11F/header.inc | 8 + data/maps/SilphCo_1F/header.inc | 8 + data/maps/SilphCo_2F/header.inc | 8 + data/maps/SilphCo_3F/header.inc | 8 + data/maps/SilphCo_4F/header.inc | 8 + data/maps/SilphCo_5F/header.inc | 8 + data/maps/SilphCo_6F/header.inc | 8 + data/maps/SilphCo_7F/header.inc | 8 + data/maps/SilphCo_8F/header.inc | 8 + data/maps/SilphCo_9F/header.inc | 8 + data/maps/SilphCo_Elevator/header.inc | 8 + data/maps/SixIsland/connections.inc | 6 + data/maps/SixIsland/header.inc | 8 + data/maps/SixIsland_DottedHole_B1F/header.inc | 8 + data/maps/SixIsland_DottedHole_B2F/header.inc | 8 + data/maps/SixIsland_DottedHole_B3F/header.inc | 8 + .../SixIsland_DottedHole_SapphireRoom/header.inc | 8 + data/maps/SixIsland_GreenPath/connections.inc | 7 + data/maps/SixIsland_GreenPath/header.inc | 8 + data/maps/SixIsland_Harbor/header.inc | 8 + data/maps/SixIsland_House/header.inc | 8 + data/maps/SixIsland_Mart/header.inc | 8 + data/maps/SixIsland_OutcastIsland/connections.inc | 6 + data/maps/SixIsland_OutcastIsland/header.inc | 8 + data/maps/SixIsland_PokemonCenter_1F/header.inc | 8 + data/maps/SixIsland_PokemonCenter_2F/header.inc | 8 + data/maps/SixIsland_RuinValley/connections.inc | 6 + data/maps/SixIsland_RuinValley/header.inc | 8 + data/maps/SixIsland_WaterPath/connections.inc | 8 + data/maps/SixIsland_WaterPath/header.inc | 8 + data/maps/SixIsland_WaterPath_House1/header.inc | 8 + data/maps/SixIsland_WaterPath_House2/header.inc | 8 + data/maps/ThreeIsland/connections.inc | 7 + data/maps/ThreeIsland/header.inc | 8 + data/maps/ThreeIsland_BerryForest/header.inc | 8 + data/maps/ThreeIsland_BondBridge/connections.inc | 6 + data/maps/ThreeIsland_BondBridge/header.inc | 8 + data/maps/ThreeIsland_DunsparceTunnel/header.inc | 8 + data/maps/ThreeIsland_Harbor/header.inc | 8 + data/maps/ThreeIsland_House1/header.inc | 8 + data/maps/ThreeIsland_House2/header.inc | 8 + data/maps/ThreeIsland_House3/header.inc | 8 + data/maps/ThreeIsland_House4/header.inc | 8 + data/maps/ThreeIsland_House5/header.inc | 8 + data/maps/ThreeIsland_Mart/header.inc | 8 + data/maps/ThreeIsland_PokemonCenter_1F/header.inc | 8 + data/maps/ThreeIsland_PokemonCenter_2F/header.inc | 8 + data/maps/ThreeIsland_Port/connections.inc | 6 + data/maps/ThreeIsland_Port/header.inc | 8 + data/maps/TwoIsland/connections.inc | 6 + data/maps/TwoIsland/header.inc | 8 + data/maps/TwoIsland_CapeBrink/connections.inc | 6 + data/maps/TwoIsland_CapeBrink/header.inc | 8 + data/maps/TwoIsland_CapeBrink_House/header.inc | 8 + data/maps/TwoIsland_Harbor/header.inc | 8 + data/maps/TwoIsland_House/header.inc | 8 + data/maps/TwoIsland_JoyfulGameCorner/header.inc | 8 + data/maps/TwoIsland_PokemonCenter_1F/header.inc | 8 + data/maps/TwoIsland_PokemonCenter_2F/header.inc | 8 + data/maps/UndergroundPath_EastEntrance/header.inc | 8 + .../maps/UndergroundPath_EastWestTunnel/header.inc | 8 + data/maps/UndergroundPath_NorthEntrance/header.inc | 8 + .../UndergroundPath_NorthSouthTunnel/header.inc | 8 + data/maps/UndergroundPath_SouthEntrance/header.inc | 8 + data/maps/UndergroundPath_WestEntrance/header.inc | 8 + data/maps/UnknownMap_00_00/header.inc | 8 + data/maps/UnknownMap_00_01/header.inc | 8 + data/maps/UnknownMap_00_02/header.inc | 8 + data/maps/UnknownMap_00_03/header.inc | 8 + data/maps/UnknownMap_00_04/header.inc | 8 + data/maps/UnknownMap_03_50/connections.inc | 6 + data/maps/UnknownMap_03_50/header.inc | 8 + data/maps/UnknownMap_03_51/connections.inc | 6 + data/maps/UnknownMap_03_51/header.inc | 8 + data/maps/UnknownMap_03_52/header.inc | 8 + data/maps/UnknownMap_03_53/header.inc | 8 + data/maps/UnknownMap_18_01/header.inc | 8 + data/maps/UnusedHouse_27_00/header.inc | 8 + data/maps/UnusedHouse_29_00/header.inc | 8 + data/maps/UnusedHouse_31_05/header.inc | 8 + data/maps/VermilionCity/connections.inc | 7 + data/maps/VermilionCity/header.inc | 8 + data/maps/VermilionCity_Gym/header.inc | 8 + data/maps/VermilionCity_House1/header.inc | 8 + data/maps/VermilionCity_House2/header.inc | 8 + data/maps/VermilionCity_House3/header.inc | 8 + data/maps/VermilionCity_Mart/header.inc | 8 + .../maps/VermilionCity_PokemonCenter_1F/header.inc | 8 + .../maps/VermilionCity_PokemonCenter_2F/header.inc | 8 + data/maps/VermilionCity_PokemonFanClub/header.inc | 8 + data/maps/VictoryRoad_1F/header.inc | 8 + data/maps/VictoryRoad_2F/header.inc | 8 + data/maps/VictoryRoad_3F/header.inc | 8 + data/maps/ViridianCity/connections.inc | 8 + data/maps/ViridianCity/header.inc | 8 + data/maps/ViridianCity_Gym/header.inc | 8 + data/maps/ViridianCity_House1/header.inc | 8 + data/maps/ViridianCity_House2/header.inc | 8 + data/maps/ViridianCity_Mart/header.inc | 8 + data/maps/ViridianCity_PokemonCenter_1F/header.inc | 8 + data/maps/ViridianCity_PokemonCenter_2F/header.inc | 8 + data/maps/ViridianForest/header.inc | 8 + data/maps/connections.inc | 63 + data/maps/groups.inc | 3825 -------------------- data/maps/headers.inc | 425 +++ 491 files changed, 4323 insertions(+), 3825 deletions(-) create mode 100644 data/maps/BirthIsland_Exterior/header.inc create mode 100644 data/maps/BirthIsland_Harbor/header.inc create mode 100644 data/maps/CeladonCity/connections.inc create mode 100644 data/maps/CeladonCity/header.inc create mode 100644 data/maps/CeladonCity_Condominiums_1F/header.inc create mode 100644 data/maps/CeladonCity_Condominiums_2F/header.inc create mode 100644 data/maps/CeladonCity_Condominiums_3F/header.inc create mode 100644 data/maps/CeladonCity_Condominiums_Roof/header.inc create mode 100644 data/maps/CeladonCity_Condominiums_RoofRoom/header.inc create mode 100644 data/maps/CeladonCity_DepartmentStore_1F/header.inc create mode 100644 data/maps/CeladonCity_DepartmentStore_2F/header.inc create mode 100644 data/maps/CeladonCity_DepartmentStore_3F/header.inc create mode 100644 data/maps/CeladonCity_DepartmentStore_4F/header.inc create mode 100644 data/maps/CeladonCity_DepartmentStore_5F/header.inc create mode 100644 data/maps/CeladonCity_DepartmentStore_Elevator/header.inc create mode 100644 data/maps/CeladonCity_DepartmentStore_Roof/header.inc create mode 100644 data/maps/CeladonCity_GameCorner/header.inc create mode 100644 data/maps/CeladonCity_GameCorner_PrizeRoom/header.inc create mode 100644 data/maps/CeladonCity_Gym/header.inc create mode 100644 data/maps/CeladonCity_Hotel/header.inc create mode 100644 data/maps/CeladonCity_House1/header.inc create mode 100644 data/maps/CeladonCity_PokemonCenter_1F/header.inc create mode 100644 data/maps/CeladonCity_PokemonCenter_2F/header.inc create mode 100644 data/maps/CeladonCity_Restaurant/header.inc create mode 100644 data/maps/CeruleanCave_1F/header.inc create mode 100644 data/maps/CeruleanCave_2F/header.inc create mode 100644 data/maps/CeruleanCave_B1F/header.inc create mode 100644 data/maps/CeruleanCity/connections.inc create mode 100644 data/maps/CeruleanCity/header.inc create mode 100644 data/maps/CeruleanCity_BikeShop/header.inc create mode 100644 data/maps/CeruleanCity_Gym/header.inc create mode 100644 data/maps/CeruleanCity_House1/header.inc create mode 100644 data/maps/CeruleanCity_House2/header.inc create mode 100644 data/maps/CeruleanCity_House3/header.inc create mode 100644 data/maps/CeruleanCity_House4/header.inc create mode 100644 data/maps/CeruleanCity_House5/header.inc create mode 100644 data/maps/CeruleanCity_Mart/header.inc create mode 100644 data/maps/CeruleanCity_PokemonCenter_1F/header.inc create mode 100644 data/maps/CeruleanCity_PokemonCenter_2F/header.inc create mode 100644 data/maps/CinnabarIsland/connections.inc create mode 100644 data/maps/CinnabarIsland/header.inc create mode 100644 data/maps/CinnabarIsland_Gym/header.inc create mode 100644 data/maps/CinnabarIsland_Mart/header.inc create mode 100644 data/maps/CinnabarIsland_PokemonCenter_1F/header.inc create mode 100644 data/maps/CinnabarIsland_PokemonCenter_2F/header.inc create mode 100644 data/maps/CinnabarIsland_PokemonLab_Entrance/header.inc create mode 100644 data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/header.inc create mode 100644 data/maps/CinnabarIsland_PokemonLab_Lounge/header.inc create mode 100644 data/maps/CinnabarIsland_PokemonLab_ResearchRoom/header.inc create mode 100644 data/maps/DiglettsCave_B1F/header.inc create mode 100644 data/maps/DiglettsCave_NorthEntrance/header.inc create mode 100644 data/maps/DiglettsCave_SouthEntrance/header.inc create mode 100644 data/maps/FiveIsland/connections.inc create mode 100644 data/maps/FiveIsland/header.inc create mode 100644 data/maps/FiveIsland_Harbor/header.inc create mode 100644 data/maps/FiveIsland_House1/header.inc create mode 100644 data/maps/FiveIsland_House2/header.inc create mode 100644 data/maps/FiveIsland_LostCave_Entrance/header.inc create mode 100644 data/maps/FiveIsland_LostCave_Room1/header.inc create mode 100644 data/maps/FiveIsland_LostCave_Room10/header.inc create mode 100644 data/maps/FiveIsland_LostCave_Room11/header.inc create mode 100644 data/maps/FiveIsland_LostCave_Room12/header.inc create mode 100644 data/maps/FiveIsland_LostCave_Room13/header.inc create mode 100644 data/maps/FiveIsland_LostCave_Room14/header.inc create mode 100644 data/maps/FiveIsland_LostCave_Room2/header.inc create mode 100644 data/maps/FiveIsland_LostCave_Room3/header.inc create mode 100644 data/maps/FiveIsland_LostCave_Room4/header.inc create mode 100644 data/maps/FiveIsland_LostCave_Room5/header.inc create mode 100644 data/maps/FiveIsland_LostCave_Room6/header.inc create mode 100644 data/maps/FiveIsland_LostCave_Room7/header.inc create mode 100644 data/maps/FiveIsland_LostCave_Room8/header.inc create mode 100644 data/maps/FiveIsland_LostCave_Room9/header.inc create mode 100644 data/maps/FiveIsland_Meadow/connections.inc create mode 100644 data/maps/FiveIsland_Meadow/header.inc create mode 100644 data/maps/FiveIsland_MemorialPillar/connections.inc create mode 100644 data/maps/FiveIsland_MemorialPillar/header.inc create mode 100644 data/maps/FiveIsland_PokemonCenter_1F/header.inc create mode 100644 data/maps/FiveIsland_PokemonCenter_2F/header.inc create mode 100644 data/maps/FiveIsland_ResortGorgeous/connections.inc create mode 100644 data/maps/FiveIsland_ResortGorgeous/header.inc create mode 100644 data/maps/FiveIsland_ResortGorgeous_House/header.inc create mode 100644 data/maps/FiveIsland_WaterLabyrinth/connections.inc create mode 100644 data/maps/FiveIsland_WaterLabyrinth/header.inc create mode 100644 data/maps/FourIsland/header.inc create mode 100644 data/maps/FourIsland_Harbor/header.inc create mode 100644 data/maps/FourIsland_House1/header.inc create mode 100644 data/maps/FourIsland_House2/header.inc create mode 100644 data/maps/FourIsland_IcefallCave_1F/header.inc create mode 100644 data/maps/FourIsland_IcefallCave_Entrance/header.inc create mode 100644 data/maps/FourIsland_LoreleisHouse/header.inc create mode 100644 data/maps/FourIsland_Mart/header.inc create mode 100644 data/maps/FourIsland_PokemonCenter_1F/header.inc create mode 100644 data/maps/FourIsland_PokemonCenter_2F/header.inc create mode 100644 data/maps/FourIsland_PokemonDayCare/header.inc create mode 100644 data/maps/FuchsiaCity/connections.inc create mode 100644 data/maps/FuchsiaCity/header.inc create mode 100644 data/maps/FuchsiaCity_Building1/header.inc create mode 100644 data/maps/FuchsiaCity_Gym/header.inc create mode 100644 data/maps/FuchsiaCity_House1/header.inc create mode 100644 data/maps/FuchsiaCity_House2/header.inc create mode 100644 data/maps/FuchsiaCity_House3/header.inc create mode 100644 data/maps/FuchsiaCity_Mart/header.inc create mode 100644 data/maps/FuchsiaCity_PokemonCenter_1F/header.inc create mode 100644 data/maps/FuchsiaCity_PokemonCenter_2F/header.inc create mode 100644 data/maps/FuchsiaCity_SafariZone_Entrance/header.inc create mode 100644 data/maps/FuchsiaCity_ZooBuilding/header.inc create mode 100644 data/maps/IndigoPlateau_Exterior/connections.inc create mode 100644 data/maps/IndigoPlateau_Exterior/header.inc create mode 100644 data/maps/IndigoPlateau_PokemonCenter_1F/header.inc create mode 100644 data/maps/IndigoPlateau_PokemonCenter_2F/header.inc create mode 100644 data/maps/LavenderTown/connections.inc create mode 100644 data/maps/LavenderTown/header.inc create mode 100644 data/maps/LavenderTown_House1/header.inc create mode 100644 data/maps/LavenderTown_House2/header.inc create mode 100644 data/maps/LavenderTown_Mart/header.inc create mode 100644 data/maps/LavenderTown_PokemonCenter_1F/header.inc create mode 100644 data/maps/LavenderTown_PokemonCenter_2F/header.inc create mode 100644 data/maps/LavenderTown_VolunteerPokemonHouse/header.inc create mode 100644 data/maps/MtEmber_Exterior/header.inc create mode 100644 data/maps/MtEmber_RubyPath_B1F/header.inc create mode 100644 data/maps/MtEmber_RubyPath_B1F_Stairs/header.inc create mode 100644 data/maps/MtEmber_RubyPath_B2F/header.inc create mode 100644 data/maps/MtEmber_RubyPath_B2F_Stairs/header.inc create mode 100644 data/maps/MtEmber_RubyPath_B3F/header.inc create mode 100644 data/maps/MtEmber_RubyPath_B4F/header.inc create mode 100644 data/maps/MtEmber_RubyPath_B5F/header.inc create mode 100644 data/maps/MtEmber_Summit/header.inc create mode 100644 data/maps/MtEmber_SummitPath_1F/header.inc create mode 100644 data/maps/MtEmber_SummitPath_2F/header.inc create mode 100644 data/maps/MtEmber_SummitPath_3F/header.inc create mode 100644 data/maps/MtMoon_1F/header.inc create mode 100644 data/maps/MtMoon_B1F/header.inc create mode 100644 data/maps/MtMoon_B2F/header.inc create mode 100644 data/maps/NavelRock_1F/header.inc create mode 100644 data/maps/NavelRock_B1F/header.inc create mode 100644 data/maps/NavelRock_Base/header.inc create mode 100644 data/maps/NavelRock_BasePath_B10F/header.inc create mode 100644 data/maps/NavelRock_BasePath_B11F/header.inc create mode 100644 data/maps/NavelRock_BasePath_B1F/header.inc create mode 100644 data/maps/NavelRock_BasePath_B2F/header.inc create mode 100644 data/maps/NavelRock_BasePath_B3F/header.inc create mode 100644 data/maps/NavelRock_BasePath_B4F/header.inc create mode 100644 data/maps/NavelRock_BasePath_B5F/header.inc create mode 100644 data/maps/NavelRock_BasePath_B6F/header.inc create mode 100644 data/maps/NavelRock_BasePath_B7F/header.inc create mode 100644 data/maps/NavelRock_BasePath_B8F/header.inc create mode 100644 data/maps/NavelRock_BasePath_B9F/header.inc create mode 100644 data/maps/NavelRock_Exterior/header.inc create mode 100644 data/maps/NavelRock_Fork/header.inc create mode 100644 data/maps/NavelRock_Harbor/header.inc create mode 100644 data/maps/NavelRock_Summit/header.inc create mode 100644 data/maps/NavelRock_SummitPath_2F/header.inc create mode 100644 data/maps/NavelRock_SummitPath_3F/header.inc create mode 100644 data/maps/NavelRock_SummitPath_4F/header.inc create mode 100644 data/maps/NavelRock_SummitPath_5F/header.inc create mode 100644 data/maps/OneIsland/connections.inc create mode 100644 data/maps/OneIsland/header.inc create mode 100644 data/maps/OneIsland_Harbor/header.inc create mode 100644 data/maps/OneIsland_House1/header.inc create mode 100644 data/maps/OneIsland_House2/header.inc create mode 100644 data/maps/OneIsland_KindleRoad/connections.inc create mode 100644 data/maps/OneIsland_KindleRoad/header.inc create mode 100644 data/maps/OneIsland_KindleRoad_EmberSpa/header.inc create mode 100644 data/maps/OneIsland_PokemonCenter_1F/header.inc create mode 100644 data/maps/OneIsland_PokemonCenter_2F/header.inc create mode 100644 data/maps/OneIsland_TreasureBeach/connections.inc create mode 100644 data/maps/OneIsland_TreasureBeach/header.inc create mode 100644 data/maps/PalletTown/connections.inc create mode 100644 data/maps/PalletTown/header.inc create mode 100644 data/maps/PalletTown_GarysHouse/header.inc create mode 100644 data/maps/PalletTown_PlayersHouse_1F/header.inc create mode 100644 data/maps/PalletTown_PlayersHouse_2F/header.inc create mode 100644 data/maps/PalletTown_ProfessorOaksLab/header.inc create mode 100644 data/maps/PewterCity/connections.inc create mode 100644 data/maps/PewterCity/header.inc create mode 100644 data/maps/PewterCity_Gym/header.inc create mode 100644 data/maps/PewterCity_House1/header.inc create mode 100644 data/maps/PewterCity_House2/header.inc create mode 100644 data/maps/PewterCity_Mart/header.inc create mode 100644 data/maps/PewterCity_Museum_1F/header.inc create mode 100644 data/maps/PewterCity_Museum_2F/header.inc create mode 100644 data/maps/PewterCity_PokemonCenter_1F/header.inc create mode 100644 data/maps/PewterCity_PokemonCenter_2F/header.inc create mode 100644 data/maps/PokemonLeague_AgathasRoom/header.inc create mode 100644 data/maps/PokemonLeague_BrunosRoom/header.inc create mode 100644 data/maps/PokemonLeague_ChampionsRoom/header.inc create mode 100644 data/maps/PokemonLeague_HallOfFame/header.inc create mode 100644 data/maps/PokemonLeague_LancesRoom/header.inc create mode 100644 data/maps/PokemonLeague_LoreleisRoom/header.inc create mode 100644 data/maps/PokemonMansion_1F/header.inc create mode 100644 data/maps/PokemonMansion_2F/header.inc create mode 100644 data/maps/PokemonMansion_3F/header.inc create mode 100644 data/maps/PokemonMansion_B1F/header.inc create mode 100644 data/maps/PokemonTower_1F/header.inc create mode 100644 data/maps/PokemonTower_2F/header.inc create mode 100644 data/maps/PokemonTower_3F/header.inc create mode 100644 data/maps/PokemonTower_4F/header.inc create mode 100644 data/maps/PokemonTower_5F/header.inc create mode 100644 data/maps/PokemonTower_6F/header.inc create mode 100644 data/maps/PokemonTower_7F/header.inc create mode 100644 data/maps/PowerPlant/header.inc create mode 100644 data/maps/RockTunnel_1F/header.inc create mode 100644 data/maps/RockTunnel_B1F/header.inc create mode 100644 data/maps/RocketHideout_B1F/header.inc create mode 100644 data/maps/RocketHideout_B2F/header.inc create mode 100644 data/maps/RocketHideout_B3F/header.inc create mode 100644 data/maps/RocketHideout_B4F/header.inc create mode 100644 data/maps/RocketHideout_Elevator/header.inc create mode 100644 data/maps/Route1/connections.inc create mode 100644 data/maps/Route1/header.inc create mode 100644 data/maps/Route10/connections.inc create mode 100644 data/maps/Route10/header.inc create mode 100644 data/maps/Route10_PokemonCenter_1F/header.inc create mode 100644 data/maps/Route10_PokemonCenter_2F/header.inc create mode 100644 data/maps/Route11/connections.inc create mode 100644 data/maps/Route11/header.inc create mode 100644 data/maps/Route11_EastEntrance_1F/header.inc create mode 100644 data/maps/Route11_EastEntrance_2F/header.inc create mode 100644 data/maps/Route12/connections.inc create mode 100644 data/maps/Route12/header.inc create mode 100644 data/maps/Route12_FishingHouse/header.inc create mode 100644 data/maps/Route12_NorthEntrance_1F/header.inc create mode 100644 data/maps/Route12_NorthEntrance_2F/header.inc create mode 100644 data/maps/Route13/connections.inc create mode 100644 data/maps/Route13/header.inc create mode 100644 data/maps/Route14/connections.inc create mode 100644 data/maps/Route14/header.inc create mode 100644 data/maps/Route15/connections.inc create mode 100644 data/maps/Route15/header.inc create mode 100644 data/maps/Route15_WestEntrance_1F/header.inc create mode 100644 data/maps/Route15_WestEntrance_2F/header.inc create mode 100644 data/maps/Route16/connections.inc create mode 100644 data/maps/Route16/header.inc create mode 100644 data/maps/Route16_House/header.inc create mode 100644 data/maps/Route16_NorthEntrance_1F/header.inc create mode 100644 data/maps/Route16_NorthEntrance_2F/header.inc create mode 100644 data/maps/Route17/connections.inc create mode 100644 data/maps/Route17/header.inc create mode 100644 data/maps/Route18/connections.inc create mode 100644 data/maps/Route18/header.inc create mode 100644 data/maps/Route18_EastEntrance_1F/header.inc create mode 100644 data/maps/Route18_EastEntrance_2F/header.inc create mode 100644 data/maps/Route19/connections.inc create mode 100644 data/maps/Route19/header.inc create mode 100644 data/maps/Route2/connections.inc create mode 100644 data/maps/Route2/header.inc create mode 100644 data/maps/Route20/connections.inc create mode 100644 data/maps/Route20/header.inc create mode 100644 data/maps/Route21_North/connections.inc create mode 100644 data/maps/Route21_North/header.inc create mode 100644 data/maps/Route21_South/connections.inc create mode 100644 data/maps/Route21_South/header.inc create mode 100644 data/maps/Route22/connections.inc create mode 100644 data/maps/Route22/header.inc create mode 100644 data/maps/Route22_NorthEntrance/header.inc create mode 100644 data/maps/Route23/connections.inc create mode 100644 data/maps/Route23/header.inc create mode 100644 data/maps/Route24/connections.inc create mode 100644 data/maps/Route24/header.inc create mode 100644 data/maps/Route25/connections.inc create mode 100644 data/maps/Route25/header.inc create mode 100644 data/maps/Route25_SeaCottage/header.inc create mode 100644 data/maps/Route2_EastBuilding/header.inc create mode 100644 data/maps/Route2_House/header.inc create mode 100644 data/maps/Route2_ViridianForest_NorthEntrance/header.inc create mode 100644 data/maps/Route2_ViridianForest_SouthEntrance/header.inc create mode 100644 data/maps/Route3/connections.inc create mode 100644 data/maps/Route3/header.inc create mode 100644 data/maps/Route4/connections.inc create mode 100644 data/maps/Route4/header.inc create mode 100644 data/maps/Route4_PokemonCenter_1F/header.inc create mode 100644 data/maps/Route4_PokemonCenter_2F/header.inc create mode 100644 data/maps/Route5/connections.inc create mode 100644 data/maps/Route5/header.inc create mode 100644 data/maps/Route5_PokemonDayCare/header.inc create mode 100644 data/maps/Route5_SouthEntrance/header.inc create mode 100644 data/maps/Route6/connections.inc create mode 100644 data/maps/Route6/header.inc create mode 100644 data/maps/Route6_NorthEntrance/header.inc create mode 100644 data/maps/Route7/connections.inc create mode 100644 data/maps/Route7/header.inc create mode 100644 data/maps/Route7_EastEntrance/header.inc create mode 100644 data/maps/Route8/connections.inc create mode 100644 data/maps/Route8/header.inc create mode 100644 data/maps/Route8_WestEntrance/header.inc create mode 100644 data/maps/Route9/connections.inc create mode 100644 data/maps/Route9/header.inc create mode 100644 data/maps/SSAnne_1F_Corridor/header.inc create mode 100644 data/maps/SSAnne_1F_Room1/header.inc create mode 100644 data/maps/SSAnne_1F_Room11/header.inc create mode 100644 data/maps/SSAnne_1F_Room12/header.inc create mode 100644 data/maps/SSAnne_1F_Room2/header.inc create mode 100644 data/maps/SSAnne_1F_Room3/header.inc create mode 100644 data/maps/SSAnne_1F_Room4/header.inc create mode 100644 data/maps/SSAnne_1F_Room5/header.inc create mode 100644 data/maps/SSAnne_1F_Room6/header.inc create mode 100644 data/maps/SSAnne_1F_Room7/header.inc create mode 100644 data/maps/SSAnne_2F_Corridor/header.inc create mode 100644 data/maps/SSAnne_2F_Room1/header.inc create mode 100644 data/maps/SSAnne_2F_Room2/header.inc create mode 100644 data/maps/SSAnne_2F_Room3/header.inc create mode 100644 data/maps/SSAnne_2F_Room4/header.inc create mode 100644 data/maps/SSAnne_2F_Room5/header.inc create mode 100644 data/maps/SSAnne_2F_Room6/header.inc create mode 100644 data/maps/SSAnne_3F_Corridor/header.inc create mode 100644 data/maps/SSAnne_B1F_Corridor/header.inc create mode 100644 data/maps/SSAnne_B1F_Room1/header.inc create mode 100644 data/maps/SSAnne_B1F_Room2/header.inc create mode 100644 data/maps/SSAnne_B1F_Room3/header.inc create mode 100644 data/maps/SSAnne_B1F_Room4/header.inc create mode 100644 data/maps/SSAnne_B1F_Room5/header.inc create mode 100644 data/maps/SSAnne_CaptainsOffice/header.inc create mode 100644 data/maps/SSAnne_CaptainsOffice2/header.inc create mode 100644 data/maps/SSAnne_CaptainsOffice3/header.inc create mode 100644 data/maps/SSAnne_CaptainsOffice4/header.inc create mode 100644 data/maps/SSAnne_CaptainsOffice5/header.inc create mode 100644 data/maps/SSAnne_CaptainsOffice9/header.inc create mode 100644 data/maps/SSAnne_Deck/header.inc create mode 100644 data/maps/SSAnne_Exterior/header.inc create mode 100644 data/maps/SSAnne_Kitchen/header.inc create mode 100644 data/maps/SSAnne_Kitchen3/header.inc create mode 100644 data/maps/SafariZone_Building1/header.inc create mode 100644 data/maps/SafariZone_Building2/header.inc create mode 100644 data/maps/SafariZone_Building3/header.inc create mode 100644 data/maps/SafariZone_Building4/header.inc create mode 100644 data/maps/SafariZone_Center/header.inc create mode 100644 data/maps/SafariZone_East/header.inc create mode 100644 data/maps/SafariZone_North/header.inc create mode 100644 data/maps/SafariZone_SecretHouse/header.inc create mode 100644 data/maps/SafariZone_West/header.inc create mode 100644 data/maps/SaffronCity/connections.inc create mode 100644 data/maps/SaffronCity/header.inc create mode 100644 data/maps/SaffronCity_Dojo/header.inc create mode 100644 data/maps/SaffronCity_Duplicate/connections.inc create mode 100644 data/maps/SaffronCity_Duplicate/header.inc create mode 100644 data/maps/SaffronCity_Gym/header.inc create mode 100644 data/maps/SaffronCity_House1_1F/header.inc create mode 100644 data/maps/SaffronCity_House1_2F/header.inc create mode 100644 data/maps/SaffronCity_House2/header.inc create mode 100644 data/maps/SaffronCity_House3/header.inc create mode 100644 data/maps/SaffronCity_Mart/header.inc create mode 100644 data/maps/SaffronCity_PokemonCenter_1F/header.inc create mode 100644 data/maps/SaffronCity_PokemonCenter_2F/header.inc create mode 100644 data/maps/SaffronCity_PokemonTrainerFanClub/header.inc create mode 100644 data/maps/SeafoamIslands_1F/header.inc create mode 100644 data/maps/SeafoamIslands_B1F/header.inc create mode 100644 data/maps/SeafoamIslands_B2F/header.inc create mode 100644 data/maps/SeafoamIslands_B3F/header.inc create mode 100644 data/maps/SeafoamIslands_B4F/header.inc create mode 100644 data/maps/SevenIsland/connections.inc create mode 100644 data/maps/SevenIsland/header.inc create mode 100644 data/maps/SevenIsland_Harbor/header.inc create mode 100644 data/maps/SevenIsland_House_Room1/header.inc create mode 100644 data/maps/SevenIsland_House_Room2/header.inc create mode 100644 data/maps/SevenIsland_Mart/header.inc create mode 100644 data/maps/SevenIsland_PokemonCenter_1F/header.inc create mode 100644 data/maps/SevenIsland_PokemonCenter_2F/header.inc create mode 100644 data/maps/SevenIsland_SeavaultCanyon_TanobyKey/header.inc create mode 100644 data/maps/SevenIsland_SevaultCanyon/connections.inc create mode 100644 data/maps/SevenIsland_SevaultCanyon/header.inc create mode 100644 data/maps/SevenIsland_SevaultCanyon_Entrance/connections.inc create mode 100644 data/maps/SevenIsland_SevaultCanyon_Entrance/header.inc create mode 100644 data/maps/SevenIsland_SevaultCanyon_House/header.inc create mode 100644 data/maps/SevenIsland_TanobyRuins/connections.inc create mode 100644 data/maps/SevenIsland_TanobyRuins/header.inc create mode 100644 data/maps/SevenIsland_TanobyRuins_DilfordChamber/header.inc create mode 100644 data/maps/SevenIsland_TanobyRuins_LiptooChamber/header.inc create mode 100644 data/maps/SevenIsland_TanobyRuins_MoneanChamber/header.inc create mode 100644 data/maps/SevenIsland_TanobyRuins_RixyChamber/header.inc create mode 100644 data/maps/SevenIsland_TanobyRuins_ScufibChamber/header.inc create mode 100644 data/maps/SevenIsland_TanobyRuins_ViapoisChamber/header.inc create mode 100644 data/maps/SevenIsland_TanobyRuins_WeepthChamber/header.inc create mode 100644 data/maps/SevenIsland_TrainerTower/connections.inc create mode 100644 data/maps/SevenIsland_TrainerTower/header.inc create mode 100644 data/maps/SevenIsland_TrainerTower_1F/header.inc create mode 100644 data/maps/SevenIsland_TrainerTower_2F/header.inc create mode 100644 data/maps/SevenIsland_TrainerTower_3F/header.inc create mode 100644 data/maps/SevenIsland_TrainerTower_4F/header.inc create mode 100644 data/maps/SevenIsland_TrainerTower_5F/header.inc create mode 100644 data/maps/SevenIsland_TrainerTower_6F/header.inc create mode 100644 data/maps/SevenIsland_TrainerTower_7F/header.inc create mode 100644 data/maps/SevenIsland_TrainerTower_8F/header.inc create mode 100644 data/maps/SevenIsland_TrainerTower_Elevator/header.inc create mode 100644 data/maps/SevenIsland_TrainerTower_Lobby/header.inc create mode 100644 data/maps/SevenIsland_TrainerTower_Roof/header.inc create mode 100644 data/maps/SilphCo_10F/header.inc create mode 100644 data/maps/SilphCo_11F/header.inc create mode 100644 data/maps/SilphCo_1F/header.inc create mode 100644 data/maps/SilphCo_2F/header.inc create mode 100644 data/maps/SilphCo_3F/header.inc create mode 100644 data/maps/SilphCo_4F/header.inc create mode 100644 data/maps/SilphCo_5F/header.inc create mode 100644 data/maps/SilphCo_6F/header.inc create mode 100644 data/maps/SilphCo_7F/header.inc create mode 100644 data/maps/SilphCo_8F/header.inc create mode 100644 data/maps/SilphCo_9F/header.inc create mode 100644 data/maps/SilphCo_Elevator/header.inc create mode 100644 data/maps/SixIsland/connections.inc create mode 100644 data/maps/SixIsland/header.inc create mode 100644 data/maps/SixIsland_DottedHole_B1F/header.inc create mode 100644 data/maps/SixIsland_DottedHole_B2F/header.inc create mode 100644 data/maps/SixIsland_DottedHole_B3F/header.inc create mode 100644 data/maps/SixIsland_DottedHole_SapphireRoom/header.inc create mode 100644 data/maps/SixIsland_GreenPath/connections.inc create mode 100644 data/maps/SixIsland_GreenPath/header.inc create mode 100644 data/maps/SixIsland_Harbor/header.inc create mode 100644 data/maps/SixIsland_House/header.inc create mode 100644 data/maps/SixIsland_Mart/header.inc create mode 100644 data/maps/SixIsland_OutcastIsland/connections.inc create mode 100644 data/maps/SixIsland_OutcastIsland/header.inc create mode 100644 data/maps/SixIsland_PokemonCenter_1F/header.inc create mode 100644 data/maps/SixIsland_PokemonCenter_2F/header.inc create mode 100644 data/maps/SixIsland_RuinValley/connections.inc create mode 100644 data/maps/SixIsland_RuinValley/header.inc create mode 100644 data/maps/SixIsland_WaterPath/connections.inc create mode 100644 data/maps/SixIsland_WaterPath/header.inc create mode 100644 data/maps/SixIsland_WaterPath_House1/header.inc create mode 100644 data/maps/SixIsland_WaterPath_House2/header.inc create mode 100644 data/maps/ThreeIsland/connections.inc create mode 100644 data/maps/ThreeIsland/header.inc create mode 100644 data/maps/ThreeIsland_BerryForest/header.inc create mode 100644 data/maps/ThreeIsland_BondBridge/connections.inc create mode 100644 data/maps/ThreeIsland_BondBridge/header.inc create mode 100644 data/maps/ThreeIsland_DunsparceTunnel/header.inc create mode 100644 data/maps/ThreeIsland_Harbor/header.inc create mode 100644 data/maps/ThreeIsland_House1/header.inc create mode 100644 data/maps/ThreeIsland_House2/header.inc create mode 100644 data/maps/ThreeIsland_House3/header.inc create mode 100644 data/maps/ThreeIsland_House4/header.inc create mode 100644 data/maps/ThreeIsland_House5/header.inc create mode 100644 data/maps/ThreeIsland_Mart/header.inc create mode 100644 data/maps/ThreeIsland_PokemonCenter_1F/header.inc create mode 100644 data/maps/ThreeIsland_PokemonCenter_2F/header.inc create mode 100644 data/maps/ThreeIsland_Port/connections.inc create mode 100644 data/maps/ThreeIsland_Port/header.inc create mode 100644 data/maps/TwoIsland/connections.inc create mode 100644 data/maps/TwoIsland/header.inc create mode 100644 data/maps/TwoIsland_CapeBrink/connections.inc create mode 100644 data/maps/TwoIsland_CapeBrink/header.inc create mode 100644 data/maps/TwoIsland_CapeBrink_House/header.inc create mode 100644 data/maps/TwoIsland_Harbor/header.inc create mode 100644 data/maps/TwoIsland_House/header.inc create mode 100644 data/maps/TwoIsland_JoyfulGameCorner/header.inc create mode 100644 data/maps/TwoIsland_PokemonCenter_1F/header.inc create mode 100644 data/maps/TwoIsland_PokemonCenter_2F/header.inc create mode 100644 data/maps/UndergroundPath_EastEntrance/header.inc create mode 100644 data/maps/UndergroundPath_EastWestTunnel/header.inc create mode 100644 data/maps/UndergroundPath_NorthEntrance/header.inc create mode 100644 data/maps/UndergroundPath_NorthSouthTunnel/header.inc create mode 100644 data/maps/UndergroundPath_SouthEntrance/header.inc create mode 100644 data/maps/UndergroundPath_WestEntrance/header.inc create mode 100644 data/maps/UnknownMap_00_00/header.inc create mode 100644 data/maps/UnknownMap_00_01/header.inc create mode 100644 data/maps/UnknownMap_00_02/header.inc create mode 100644 data/maps/UnknownMap_00_03/header.inc create mode 100644 data/maps/UnknownMap_00_04/header.inc create mode 100644 data/maps/UnknownMap_03_50/connections.inc create mode 100644 data/maps/UnknownMap_03_50/header.inc create mode 100644 data/maps/UnknownMap_03_51/connections.inc create mode 100644 data/maps/UnknownMap_03_51/header.inc create mode 100644 data/maps/UnknownMap_03_52/header.inc create mode 100644 data/maps/UnknownMap_03_53/header.inc create mode 100644 data/maps/UnknownMap_18_01/header.inc create mode 100644 data/maps/UnusedHouse_27_00/header.inc create mode 100644 data/maps/UnusedHouse_29_00/header.inc create mode 100644 data/maps/UnusedHouse_31_05/header.inc create mode 100644 data/maps/VermilionCity/connections.inc create mode 100644 data/maps/VermilionCity/header.inc create mode 100644 data/maps/VermilionCity_Gym/header.inc create mode 100644 data/maps/VermilionCity_House1/header.inc create mode 100644 data/maps/VermilionCity_House2/header.inc create mode 100644 data/maps/VermilionCity_House3/header.inc create mode 100644 data/maps/VermilionCity_Mart/header.inc create mode 100644 data/maps/VermilionCity_PokemonCenter_1F/header.inc create mode 100644 data/maps/VermilionCity_PokemonCenter_2F/header.inc create mode 100644 data/maps/VermilionCity_PokemonFanClub/header.inc create mode 100644 data/maps/VictoryRoad_1F/header.inc create mode 100644 data/maps/VictoryRoad_2F/header.inc create mode 100644 data/maps/VictoryRoad_3F/header.inc create mode 100644 data/maps/ViridianCity/connections.inc create mode 100644 data/maps/ViridianCity/header.inc create mode 100644 data/maps/ViridianCity_Gym/header.inc create mode 100644 data/maps/ViridianCity_House1/header.inc create mode 100644 data/maps/ViridianCity_House2/header.inc create mode 100644 data/maps/ViridianCity_Mart/header.inc create mode 100644 data/maps/ViridianCity_PokemonCenter_1F/header.inc create mode 100644 data/maps/ViridianCity_PokemonCenter_2F/header.inc create mode 100644 data/maps/ViridianForest/header.inc create mode 100644 data/maps/connections.inc create mode 100644 data/maps/headers.inc (limited to 'data/maps') diff --git a/data/maps/BirthIsland_Exterior/header.inc b/data/maps/BirthIsland_Exterior/header.inc new file mode 100644 index 000000000..5bcc49c74 --- /dev/null +++ b/data/maps/BirthIsland_Exterior/header.inc @@ -0,0 +1,8 @@ +BirthIsland_Exterior:: @ 83505A8 + .4byte BirthIsland_Exterior_Layout @ 0x8348380 + .4byte gMapEvents_BirthIsland_Exterior @ 0x83B4C1C + .4byte gMapScripts_BirthIsland_Exterior @ 0x8165203 + .4byte NULL + .2byte 0xFFFF + .2byte 342 + .byte 0xbb, 0x00, 0x00, 0x03, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/BirthIsland_Harbor/header.inc b/data/maps/BirthIsland_Harbor/header.inc new file mode 100644 index 000000000..a082ac025 --- /dev/null +++ b/data/maps/BirthIsland_Harbor/header.inc @@ -0,0 +1,8 @@ +BirthIsland_Harbor:: @ 83505E0 + .4byte Island_Harbor_Layout @ 0x8343FB8 + .4byte gMapEvents_BirthIsland_Harbor @ 0x83B4D24 + .4byte gMapScripts_BirthIsland_Harbor @ 0x81653E6 + .4byte NULL + .2byte 0xFFFF + .2byte 315 + .byte 0xbb, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CeladonCity/connections.inc b/data/maps/CeladonCity/connections.inc new file mode 100644 index 000000000..6ed150ca1 --- /dev/null +++ b/data/maps/CeladonCity/connections.inc @@ -0,0 +1,7 @@ +CeladonCity_MapConnectionsList: @ 8352844 + connection left, 10, MAP_ROUTE16 + connection right, 10, MAP_ROUTE7 + +CeladonCity_MapConnections:: @ 835285C + .4byte 2 + .4byte CeladonCity_MapConnectionsList diff --git a/data/maps/CeladonCity/header.inc b/data/maps/CeladonCity/header.inc new file mode 100644 index 000000000..146c03ab2 --- /dev/null +++ b/data/maps/CeladonCity/header.inc @@ -0,0 +1,8 @@ +CeladonCity:: @ 83506C0 + .4byte CeladonCity_Layout @ 0x82E2818 + .4byte gMapEvents_CeladonCity @ 0x83B5898 + .4byte gMapScripts_CeladonCity @ 0x8166C8F + .4byte CeladonCity_MapConnections @ 0x835285C + .2byte BGM_FRLG_CELADON_CITY + .2byte 84 + .byte 0x5e, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/CeladonCity_Condominiums_1F/header.inc b/data/maps/CeladonCity_Condominiums_1F/header.inc new file mode 100644 index 000000000..9b842ae2d --- /dev/null +++ b/data/maps/CeladonCity_Condominiums_1F/header.inc @@ -0,0 +1,8 @@ +CeladonCity_Condominiums_1F:: @ 83512AC + .4byte CeladonCity_Condominiums_1F_Layout @ 0x831A7DC + .4byte gMapEvents_CeladonCity_Condominiums_1F @ 0x83BB538 + .4byte gMapScripts_CeladonCity_Condominiums_1F @ 0x816C320 + .4byte NULL + .2byte BGM_FRLG_CELADON_CITY + .2byte 184 + .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CeladonCity_Condominiums_2F/header.inc b/data/maps/CeladonCity_Condominiums_2F/header.inc new file mode 100644 index 000000000..46bc1451a --- /dev/null +++ b/data/maps/CeladonCity_Condominiums_2F/header.inc @@ -0,0 +1,8 @@ +CeladonCity_Condominiums_2F:: @ 83512C8 + .4byte CeladonCity_Condominiums_2F_Layout @ 0x831AA58 + .4byte gMapEvents_CeladonCity_Condominiums_2F @ 0x83BB5B4 + .4byte gMapScripts_CeladonCity_Condominiums_2F @ 0x816C3D0 + .4byte NULL + .2byte BGM_FRLG_CELADON_CITY + .2byte 185 + .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CeladonCity_Condominiums_3F/header.inc b/data/maps/CeladonCity_Condominiums_3F/header.inc new file mode 100644 index 000000000..3af5071bb --- /dev/null +++ b/data/maps/CeladonCity_Condominiums_3F/header.inc @@ -0,0 +1,8 @@ +CeladonCity_Condominiums_3F:: @ 83512E4 + .4byte CeladonCity_Condominiums_3F_Layout @ 0x831ACD4 + .4byte gMapEvents_CeladonCity_Condominiums_3F @ 0x83BB6A8 + .4byte gMapScripts_CeladonCity_Condominiums_3F @ 0x816C3DA + .4byte NULL + .2byte BGM_FRLG_CELADON_CITY + .2byte 186 + .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CeladonCity_Condominiums_Roof/header.inc b/data/maps/CeladonCity_Condominiums_Roof/header.inc new file mode 100644 index 000000000..8ae163248 --- /dev/null +++ b/data/maps/CeladonCity_Condominiums_Roof/header.inc @@ -0,0 +1,8 @@ +CeladonCity_Condominiums_Roof:: @ 8351300 + .4byte CeladonCity_Condominiums_Roof_Layout @ 0x831AF7C + .4byte gMapEvents_CeladonCity_Condominiums_Roof @ 0x83BB6EC + .4byte gMapScripts_CeladonCity_Condominiums_Roof @ 0x816C459 + .4byte NULL + .2byte BGM_FRLG_CELADON_CITY + .2byte 187 + .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/header.inc b/data/maps/CeladonCity_Condominiums_RoofRoom/header.inc new file mode 100644 index 000000000..7bc9c4eb8 --- /dev/null +++ b/data/maps/CeladonCity_Condominiums_RoofRoom/header.inc @@ -0,0 +1,8 @@ +CeladonCity_Condominiums_RoofRoom:: @ 835131C + .4byte CeladonCity_Condominiums_RoofRoom_Layout @ 0x831B054 + .4byte gMapEvents_CeladonCity_Condominiums_RoofRoom @ 0x83BB76C + .4byte gMapScripts_CeladonCity_Condominiums_RoofRoom @ 0x816C463 + .4byte NULL + .2byte BGM_FRLG_CELADON_CITY + .2byte 188 + .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CeladonCity_DepartmentStore_1F/header.inc b/data/maps/CeladonCity_DepartmentStore_1F/header.inc new file mode 100644 index 000000000..3ddab14ae --- /dev/null +++ b/data/maps/CeladonCity_DepartmentStore_1F/header.inc @@ -0,0 +1,8 @@ +CeladonCity_DepartmentStore_1F:: @ 83511E8 + .4byte CeladonCity_DepartmentStore_1F_Layout @ 0x831B5FC + .4byte gMapEvents_CeladonCity_DepartmentStore_1F @ 0x83BB0EC + .4byte gMapScripts_CeladonCity_DepartmentStore_1F @ 0x816BAD8 + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 192 + .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x04, 0x01, 0x00 diff --git a/data/maps/CeladonCity_DepartmentStore_2F/header.inc b/data/maps/CeladonCity_DepartmentStore_2F/header.inc new file mode 100644 index 000000000..126b23342 --- /dev/null +++ b/data/maps/CeladonCity_DepartmentStore_2F/header.inc @@ -0,0 +1,8 @@ +CeladonCity_DepartmentStore_2F:: @ 8351204 + .4byte CeladonCity_DepartmentStore_2F_Layout @ 0x831B7A8 + .4byte gMapEvents_CeladonCity_DepartmentStore_2F @ 0x83BB184 + .4byte gMapScripts_CeladonCity_DepartmentStore_2F @ 0x816BAF4 + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 193 + .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x04, 0x02, 0x00 diff --git a/data/maps/CeladonCity_DepartmentStore_3F/header.inc b/data/maps/CeladonCity_DepartmentStore_3F/header.inc new file mode 100644 index 000000000..cb31d4ae4 --- /dev/null +++ b/data/maps/CeladonCity_DepartmentStore_3F/header.inc @@ -0,0 +1,8 @@ +CeladonCity_DepartmentStore_3F:: @ 8351220 + .4byte CeladonCity_DepartmentStore_3F_Layout @ 0x831B954 + .4byte gMapEvents_CeladonCity_DepartmentStore_3F @ 0x83BB2AC + .4byte gMapScripts_CeladonCity_DepartmentStore_3F @ 0x816BB84 + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 194 + .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x04, 0x03, 0x00 diff --git a/data/maps/CeladonCity_DepartmentStore_4F/header.inc b/data/maps/CeladonCity_DepartmentStore_4F/header.inc new file mode 100644 index 000000000..5cd6b390a --- /dev/null +++ b/data/maps/CeladonCity_DepartmentStore_4F/header.inc @@ -0,0 +1,8 @@ +CeladonCity_DepartmentStore_4F:: @ 835123C + .4byte CeladonCity_DepartmentStore_4F_Layout @ 0x831BB00 + .4byte gMapEvents_CeladonCity_DepartmentStore_4F @ 0x83BB32C + .4byte gMapScripts_CeladonCity_DepartmentStore_4F @ 0x816BBEE + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 195 + .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x04, 0x04, 0x00 diff --git a/data/maps/CeladonCity_DepartmentStore_5F/header.inc b/data/maps/CeladonCity_DepartmentStore_5F/header.inc new file mode 100644 index 000000000..853a6e4f2 --- /dev/null +++ b/data/maps/CeladonCity_DepartmentStore_5F/header.inc @@ -0,0 +1,8 @@ +CeladonCity_DepartmentStore_5F:: @ 8351258 + .4byte CeladonCity_DepartmentStore_5F_Layout @ 0x831BCAC + .4byte gMapEvents_CeladonCity_DepartmentStore_5F @ 0x83BB3C4 + .4byte gMapScripts_CeladonCity_DepartmentStore_5F @ 0x816BC40 + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 196 + .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x04, 0x05, 0x00 diff --git a/data/maps/CeladonCity_DepartmentStore_Elevator/header.inc b/data/maps/CeladonCity_DepartmentStore_Elevator/header.inc new file mode 100644 index 000000000..c78e6449a --- /dev/null +++ b/data/maps/CeladonCity_DepartmentStore_Elevator/header.inc @@ -0,0 +1,8 @@ +CeladonCity_DepartmentStore_Elevator:: @ 8351290 + .4byte CeladonCity_DepartmentStore_Elevator_Layout @ 0x8319F70 + .4byte gMapEvents_CeladonCity_DepartmentStore_Elevator @ 0x83BB47C + .4byte gMapScripts_CeladonCity_DepartmentStore_Elevator @ 0x816C152 + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 179 + .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/header.inc b/data/maps/CeladonCity_DepartmentStore_Roof/header.inc new file mode 100644 index 000000000..a8839e6f9 --- /dev/null +++ b/data/maps/CeladonCity_DepartmentStore_Roof/header.inc @@ -0,0 +1,8 @@ +CeladonCity_DepartmentStore_Roof:: @ 8351274 + .4byte CeladonCity_DepartmentStore_Roof_Layout @ 0x831BEE4 + .4byte gMapEvents_CeladonCity_DepartmentStore_Roof @ 0x83BB440 + .4byte gMapScripts_CeladonCity_DepartmentStore_Roof @ 0x816BCCC + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 197 + .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x04, 0x7f, 0x00 diff --git a/data/maps/CeladonCity_GameCorner/header.inc b/data/maps/CeladonCity_GameCorner/header.inc new file mode 100644 index 000000000..61c4177d9 --- /dev/null +++ b/data/maps/CeladonCity_GameCorner/header.inc @@ -0,0 +1,8 @@ +CeladonCity_GameCorner:: @ 8351370 + .4byte CeladonCity_GameCorner_Layout @ 0x82D7168 + .4byte gMapEvents_CeladonCity_GameCorner @ 0x83BBB78 + .4byte gMapScripts_CeladonCity_GameCorner @ 0x816C646 + .4byte NULL + .2byte BGM_FRLG_GAMECORNER + .2byte 27 + .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/header.inc b/data/maps/CeladonCity_GameCorner_PrizeRoom/header.inc new file mode 100644 index 000000000..5577d1f3e --- /dev/null +++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/header.inc @@ -0,0 +1,8 @@ +CeladonCity_GameCorner_PrizeRoom:: @ 835138C + .4byte CeladonCity_GameCorner_PrizeRoom_Layout @ 0x831B12C + .4byte gMapEvents_CeladonCity_GameCorner_PrizeRoom @ 0x83BBC1C + .4byte gMapScripts_CeladonCity_GameCorner_PrizeRoom @ 0x816CB75 + .4byte NULL + .2byte BGM_FRLG_CELADON_CITY + .2byte 189 + .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CeladonCity_Gym/header.inc b/data/maps/CeladonCity_Gym/header.inc new file mode 100644 index 000000000..3c04d2673 --- /dev/null +++ b/data/maps/CeladonCity_Gym/header.inc @@ -0,0 +1,8 @@ +CeladonCity_Gym:: @ 83513A8 + .4byte CeladonCity_Gym_Layout @ 0x82D6370 + .4byte gMapEvents_CeladonCity_Gym @ 0x83BBD68 + .4byte gMapScripts_CeladonCity_Gym @ 0x816D060 + .4byte NULL + .2byte BGM_FRLG_GYM + .2byte 15 + .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01 diff --git a/data/maps/CeladonCity_Hotel/header.inc b/data/maps/CeladonCity_Hotel/header.inc new file mode 100644 index 000000000..553b4c924 --- /dev/null +++ b/data/maps/CeladonCity_Hotel/header.inc @@ -0,0 +1,8 @@ +CeladonCity_Hotel:: @ 83513FC + .4byte CeladonCity_Hotel_Layout @ 0x831B438 + .4byte gMapEvents_CeladonCity_Hotel @ 0x83BBF0C + .4byte gMapScripts_CeladonCity_Hotel @ 0x816D283 + .4byte NULL + .2byte BGM_FRLG_CELADON_CITY + .2byte 191 + .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CeladonCity_House1/header.inc b/data/maps/CeladonCity_House1/header.inc new file mode 100644 index 000000000..37e671cce --- /dev/null +++ b/data/maps/CeladonCity_House1/header.inc @@ -0,0 +1,8 @@ +CeladonCity_House1:: @ 83513E0 + .4byte House5_Layout @ 0x82D6AF0 + .4byte gMapEvents_CeladonCity_House1 @ 0x83BBE80 + .4byte gMapScripts_CeladonCity_House1 @ 0x816D267 + .4byte NULL + .2byte BGM_FRLG_CELADON_CITY + .2byte 21 + .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CeladonCity_PokemonCenter_1F/header.inc b/data/maps/CeladonCity_PokemonCenter_1F/header.inc new file mode 100644 index 000000000..c29ce7f43 --- /dev/null +++ b/data/maps/CeladonCity_PokemonCenter_1F/header.inc @@ -0,0 +1,8 @@ +CeladonCity_PokemonCenter_1F:: @ 8351338 + .4byte PokemonCenter_1F_Layout @ 0x82D5990 + .4byte gMapEvents_CeladonCity_PokemonCenter_1F @ 0x83BB800 + .4byte gMapScripts_CeladonCity_PokemonCenter_1F @ 0x816C5EC + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 8 + .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CeladonCity_PokemonCenter_2F/header.inc b/data/maps/CeladonCity_PokemonCenter_2F/header.inc new file mode 100644 index 000000000..d3f2b260e --- /dev/null +++ b/data/maps/CeladonCity_PokemonCenter_2F/header.inc @@ -0,0 +1,8 @@ +CeladonCity_PokemonCenter_2F:: @ 8351354 + .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 + .4byte gMapEvents_CeladonCity_PokemonCenter_2F @ 0x83BB88C + .4byte gMapScripts_CeladonCity_PokemonCenter_2F @ 0x816C61F + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 9 + .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CeladonCity_Restaurant/header.inc b/data/maps/CeladonCity_Restaurant/header.inc new file mode 100644 index 000000000..c588eb45d --- /dev/null +++ b/data/maps/CeladonCity_Restaurant/header.inc @@ -0,0 +1,8 @@ +CeladonCity_Restaurant:: @ 83513C4 + .4byte CeladonCity_Restaurant_Layout @ 0x831B29C + .4byte gMapEvents_CeladonCity_Restaurant @ 0x83BBE0C + .4byte gMapScripts_CeladonCity_Restaurant @ 0x816D1EA + .4byte NULL + .2byte BGM_FRLG_CELADON_CITY + .2byte 190 + .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CeruleanCave_1F/header.inc b/data/maps/CeruleanCave_1F/header.inc new file mode 100644 index 000000000..ec467c13e --- /dev/null +++ b/data/maps/CeruleanCave_1F/header.inc @@ -0,0 +1,8 @@ +CeruleanCave_1F:: @ 834F9F4 + .4byte CeruleanCave_1F_Layout @ 0x8311318 + .4byte gMapEvents_CeruleanCave_1F @ 0x83B15BC + .4byte gMapScripts_CeruleanCave_1F @ 0x81624B3 + .4byte NULL + .2byte BGM_FRLG_ROCKET_HIDEOUT + .2byte 151 + .byte 0x8d, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/CeruleanCave_2F/header.inc b/data/maps/CeruleanCave_2F/header.inc new file mode 100644 index 000000000..7fe8ccc03 --- /dev/null +++ b/data/maps/CeruleanCave_2F/header.inc @@ -0,0 +1,8 @@ +CeruleanCave_2F:: @ 834FA10 + .4byte CeruleanCave_2F_Layout @ 0x8311A6C + .4byte gMapEvents_CeruleanCave_2F @ 0x83B1738 + .4byte gMapScripts_CeruleanCave_2F @ 0x81624BD + .4byte NULL + .2byte BGM_FRLG_ROCKET_HIDEOUT + .2byte 152 + .byte 0x8d, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/CeruleanCave_B1F/header.inc b/data/maps/CeruleanCave_B1F/header.inc new file mode 100644 index 000000000..89eaec278 --- /dev/null +++ b/data/maps/CeruleanCave_B1F/header.inc @@ -0,0 +1,8 @@ +CeruleanCave_B1F:: @ 834FA2C + .4byte CeruleanCave_B1F_Layout @ 0x83121C0 + .4byte gMapEvents_CeruleanCave_B1F @ 0x83B1874 + .4byte gMapScripts_CeruleanCave_B1F @ 0x81624BE + .4byte NULL + .2byte BGM_FRLG_ROCKET_HIDEOUT + .2byte 153 + .byte 0x8d, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/CeruleanCity/connections.inc b/data/maps/CeruleanCity/connections.inc new file mode 100644 index 000000000..2372d32c0 --- /dev/null +++ b/data/maps/CeruleanCity/connections.inc @@ -0,0 +1,9 @@ +CeruleanCity_MapConnectionsList: @ 83527C0 + connection up, 12, MAP_ROUTE24 + connection down, 0, MAP_ROUTE5 + connection left, 10, MAP_ROUTE4 + connection right, 10, MAP_ROUTE9 + +CeruleanCity_MapConnections:: @ 83527F0 + .4byte 4 + .4byte CeruleanCity_MapConnectionsList diff --git a/data/maps/CeruleanCity/header.inc b/data/maps/CeruleanCity/header.inc new file mode 100644 index 000000000..7f1bed354 --- /dev/null +++ b/data/maps/CeruleanCity/header.inc @@ -0,0 +1,8 @@ +CeruleanCity:: @ 835066C + .4byte CeruleanCity_Layout @ 0x82E022C + .4byte gMapEvents_CeruleanCity @ 0x83B53E0 + .4byte gMapScripts_CeruleanCity @ 0x8166471 + .4byte CeruleanCity_MapConnections @ 0x83527F0 + .2byte BGM_FRLG_CERULEAN_CITY + .2byte 81 + .byte 0x5b, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/CeruleanCity_BikeShop/header.inc b/data/maps/CeruleanCity_BikeShop/header.inc new file mode 100644 index 000000000..8fd15ec07 --- /dev/null +++ b/data/maps/CeruleanCity_BikeShop/header.inc @@ -0,0 +1,8 @@ +CeruleanCity_BikeShop:: @ 8350FF0 + .4byte CeruleanCity_BikeShop_Layout @ 0x82D6F28 + .4byte gMapEvents_CeruleanCity_BikeShop @ 0x83BA6FC + .4byte gMapScripts_CeruleanCity_BikeShop @ 0x816ABBC + .4byte NULL + .2byte BGM_FRLG_CERULEAN_CITY + .2byte 26 + .byte 0x5b, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CeruleanCity_Gym/header.inc b/data/maps/CeruleanCity_Gym/header.inc new file mode 100644 index 000000000..601a9700c --- /dev/null +++ b/data/maps/CeruleanCity_Gym/header.inc @@ -0,0 +1,8 @@ +CeruleanCity_Gym:: @ 8350FD4 + .4byte CeruleanCity_Gym_Layout @ 0x82D5F84 + .4byte gMapEvents_CeruleanCity_Gym @ 0x83BA628 + .4byte gMapScripts_CeruleanCity_Gym @ 0x816AAA0 + .4byte NULL + .2byte BGM_FRLG_GYM + .2byte 12 + .byte 0x5b, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01 diff --git a/data/maps/CeruleanCity_House1/header.inc b/data/maps/CeruleanCity_House1/header.inc new file mode 100644 index 000000000..622ef5334 --- /dev/null +++ b/data/maps/CeruleanCity_House1/header.inc @@ -0,0 +1,8 @@ +CeruleanCity_House1:: @ 8350F48 + .4byte CeruleanCity_House1_Layout @ 0x831A560 + .4byte gMapEvents_CeruleanCity_House1 @ 0x83BA350 + .4byte gMapScripts_CeruleanCity_House1 @ 0x816A7EF + .4byte NULL + .2byte BGM_FRLG_CERULEAN_CITY + .2byte 183 + .byte 0x5b, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CeruleanCity_House2/header.inc b/data/maps/CeruleanCity_House2/header.inc new file mode 100644 index 000000000..0cc637603 --- /dev/null +++ b/data/maps/CeruleanCity_House2/header.inc @@ -0,0 +1,8 @@ +CeruleanCity_House2:: @ 8350F64 + .4byte CeruleanCity_House2_Layout @ 0x831A474 + .4byte gMapEvents_CeruleanCity_House2 @ 0x83BA3C0 + .4byte gMapScripts_CeruleanCity_House2 @ 0x816A975 + .4byte NULL + .2byte BGM_FRLG_CERULEAN_CITY + .2byte 182 + .byte 0x5b, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CeruleanCity_House3/header.inc b/data/maps/CeruleanCity_House3/header.inc new file mode 100644 index 000000000..bcaabf913 --- /dev/null +++ b/data/maps/CeruleanCity_House3/header.inc @@ -0,0 +1,8 @@ +CeruleanCity_House3:: @ 8350F80 + .4byte House1_Layout @ 0x82D5754 + .4byte gMapEvents_CeruleanCity_House3 @ 0x83BA41C + .4byte gMapScripts_CeruleanCity_House3 @ 0x816A9A7 + .4byte NULL + .2byte BGM_FRLG_CERULEAN_CITY + .2byte 6 + .byte 0x5b, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CeruleanCity_House4/header.inc b/data/maps/CeruleanCity_House4/header.inc new file mode 100644 index 000000000..4996f7e7a --- /dev/null +++ b/data/maps/CeruleanCity_House4/header.inc @@ -0,0 +1,8 @@ +CeruleanCity_House4:: @ 8351028 + .4byte House1_Layout @ 0x82D5754 + .4byte gMapEvents_CeruleanCity_House4 @ 0x83BA7A4 + .4byte gMapScripts_CeruleanCity_House4 @ 0x816ACEE + .4byte NULL + .2byte BGM_FRLG_CERULEAN_CITY + .2byte 6 + .byte 0x5b, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CeruleanCity_House5/header.inc b/data/maps/CeruleanCity_House5/header.inc new file mode 100644 index 000000000..317e64841 --- /dev/null +++ b/data/maps/CeruleanCity_House5/header.inc @@ -0,0 +1,8 @@ +CeruleanCity_House5:: @ 8351044 + .4byte CeruleanCity_House5_Layout @ 0x8343540 + .4byte gMapEvents_CeruleanCity_House5 @ 0x83BA7E4 + .4byte gMapScripts_CeruleanCity_House5 @ 0x816AE4F + .4byte NULL + .2byte BGM_FRLG_CERULEAN_CITY + .2byte 308 + .byte 0x5b, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CeruleanCity_Mart/header.inc b/data/maps/CeruleanCity_Mart/header.inc new file mode 100644 index 000000000..b12b85b10 --- /dev/null +++ b/data/maps/CeruleanCity_Mart/header.inc @@ -0,0 +1,8 @@ +CeruleanCity_Mart:: @ 835100C + .4byte Mart_Layout @ 0x82D5BCC + .4byte gMapEvents_CeruleanCity_Mart @ 0x83BA770 + .4byte gMapScripts_CeruleanCity_Mart @ 0x816AC9D + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 10 + .byte 0x5b, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CeruleanCity_PokemonCenter_1F/header.inc b/data/maps/CeruleanCity_PokemonCenter_1F/header.inc new file mode 100644 index 000000000..810354b9c --- /dev/null +++ b/data/maps/CeruleanCity_PokemonCenter_1F/header.inc @@ -0,0 +1,8 @@ +CeruleanCity_PokemonCenter_1F:: @ 8350F9C + .4byte PokemonCenter_1F_Layout @ 0x82D5990 + .4byte gMapEvents_CeruleanCity_PokemonCenter_1F @ 0x83BA4F8 + .4byte gMapScripts_CeruleanCity_PokemonCenter_1F @ 0x816AA2D + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 8 + .byte 0x5b, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CeruleanCity_PokemonCenter_2F/header.inc b/data/maps/CeruleanCity_PokemonCenter_2F/header.inc new file mode 100644 index 000000000..697f7b369 --- /dev/null +++ b/data/maps/CeruleanCity_PokemonCenter_2F/header.inc @@ -0,0 +1,8 @@ +CeruleanCity_PokemonCenter_2F:: @ 8350FB8 + .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 + .4byte gMapEvents_CeruleanCity_PokemonCenter_2F @ 0x83BA584 + .4byte gMapScripts_CeruleanCity_PokemonCenter_2F @ 0x816AA79 + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 9 + .byte 0x5b, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CinnabarIsland/connections.inc b/data/maps/CinnabarIsland/connections.inc new file mode 100644 index 000000000..e7955f388 --- /dev/null +++ b/data/maps/CinnabarIsland/connections.inc @@ -0,0 +1,7 @@ +CinnabarIsland_MapConnectionsList: @ 8352890 + connection up, 0, MAP_ROUTE21_SOUTH + connection right, 0, MAP_ROUTE20 + +CinnabarIsland_MapConnections:: @ 83528A8 + .4byte 2 + .4byte CinnabarIsland_MapConnectionsList diff --git a/data/maps/CinnabarIsland/header.inc b/data/maps/CinnabarIsland/header.inc new file mode 100644 index 000000000..9b614bd26 --- /dev/null +++ b/data/maps/CinnabarIsland/header.inc @@ -0,0 +1,8 @@ +CinnabarIsland:: @ 83506F8 + .4byte CinnabarIsland_Layout @ 0x82E3B20 + .4byte gMapEvents_CinnabarIsland @ 0x83B5BF0 + .4byte gMapScripts_CinnabarIsland @ 0x8166ED6 + .4byte CinnabarIsland_MapConnections @ 0x83528A8 + .2byte BGM_FRLG_CINNABAR_ISLAND + .2byte 86 + .byte 0x60, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/CinnabarIsland_Gym/header.inc b/data/maps/CinnabarIsland_Gym/header.inc new file mode 100644 index 000000000..8e810be7e --- /dev/null +++ b/data/maps/CinnabarIsland_Gym/header.inc @@ -0,0 +1,8 @@ +CinnabarIsland_Gym:: @ 8351530 + .4byte CinnabarIsland_Gym_Layout @ 0x82D82C8 + .4byte gMapEvents_CinnabarIsland_Gym @ 0x83BC62C + .4byte gMapScripts_CinnabarIsland_Gym @ 0x816D94B + .4byte NULL + .2byte BGM_FRLG_GYM + .2byte 36 + .byte 0x60, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01 diff --git a/data/maps/CinnabarIsland_Mart/header.inc b/data/maps/CinnabarIsland_Mart/header.inc new file mode 100644 index 000000000..f6abdf48e --- /dev/null +++ b/data/maps/CinnabarIsland_Mart/header.inc @@ -0,0 +1,8 @@ +CinnabarIsland_Mart:: @ 83515F4 + .4byte Mart_Layout @ 0x82D5BCC + .4byte gMapEvents_CinnabarIsland_Mart @ 0x83BC9A8 + .4byte gMapScripts_CinnabarIsland_Mart @ 0x816EA0F + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 10 + .byte 0x60, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/header.inc b/data/maps/CinnabarIsland_PokemonCenter_1F/header.inc new file mode 100644 index 000000000..4d0aac7b3 --- /dev/null +++ b/data/maps/CinnabarIsland_PokemonCenter_1F/header.inc @@ -0,0 +1,8 @@ +CinnabarIsland_PokemonCenter_1F:: @ 83515BC + .4byte PokemonCenter_1F_Layout @ 0x82D5990 + .4byte gMapEvents_CinnabarIsland_PokemonCenter_1F @ 0x83BC8A8 + .4byte gMapScripts_CinnabarIsland_PokemonCenter_1F @ 0x816E8D7 + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 8 + .byte 0x60, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CinnabarIsland_PokemonCenter_2F/header.inc b/data/maps/CinnabarIsland_PokemonCenter_2F/header.inc new file mode 100644 index 000000000..01c1b0eb9 --- /dev/null +++ b/data/maps/CinnabarIsland_PokemonCenter_2F/header.inc @@ -0,0 +1,8 @@ +CinnabarIsland_PokemonCenter_2F:: @ 83515D8 + .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 + .4byte gMapEvents_CinnabarIsland_PokemonCenter_2F @ 0x83BC934 + .4byte gMapScripts_CinnabarIsland_PokemonCenter_2F @ 0x816E9E8 + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 9 + .byte 0x60, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CinnabarIsland_PokemonLab_Entrance/header.inc b/data/maps/CinnabarIsland_PokemonLab_Entrance/header.inc new file mode 100644 index 000000000..4e97c56f2 --- /dev/null +++ b/data/maps/CinnabarIsland_PokemonLab_Entrance/header.inc @@ -0,0 +1,8 @@ +CinnabarIsland_PokemonLab_Entrance:: @ 835154C + .4byte CinnabarIsland_PokemonLab_Entrance_Layout @ 0x831C804 + .4byte gMapEvents_CinnabarIsland_PokemonLab_Entrance @ 0x83BC6B8 + .4byte gMapScripts_CinnabarIsland_PokemonLab_Entrance @ 0x816E273 + .4byte NULL + .2byte BGM_FRLG_CINNABAR_ISLAND + .2byte 203 + .byte 0x60, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/header.inc b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/header.inc new file mode 100644 index 000000000..866b195ca --- /dev/null +++ b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/header.inc @@ -0,0 +1,8 @@ +CinnabarIsland_PokemonLab_ExperimentRoom:: @ 83515A0 + .4byte CinnabarIsland_PokemonLab_ExperimentRoom_Layout @ 0x831CC54 + .4byte gMapEvents_CinnabarIsland_PokemonLab_ExperimentRoom @ 0x83BC7CC + .4byte gMapScripts_CinnabarIsland_PokemonLab_ExperimentRoom @ 0x816E400 + .4byte NULL + .2byte BGM_FRLG_CINNABAR_ISLAND + .2byte 206 + .byte 0x60, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CinnabarIsland_PokemonLab_Lounge/header.inc b/data/maps/CinnabarIsland_PokemonLab_Lounge/header.inc new file mode 100644 index 000000000..0e0fe0525 --- /dev/null +++ b/data/maps/CinnabarIsland_PokemonLab_Lounge/header.inc @@ -0,0 +1,8 @@ +CinnabarIsland_PokemonLab_Lounge:: @ 8351568 + .4byte CinnabarIsland_PokemonLab_Lounge_Layout @ 0x831C974 + .4byte gMapEvents_CinnabarIsland_PokemonLab_Lounge @ 0x83BC71C + .4byte gMapScripts_CinnabarIsland_PokemonLab_Lounge @ 0x816E2B8 + .4byte NULL + .2byte BGM_FRLG_CINNABAR_ISLAND + .2byte 204 + .byte 0x60, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/header.inc b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/header.inc new file mode 100644 index 000000000..8c8f7bc28 --- /dev/null +++ b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/header.inc @@ -0,0 +1,8 @@ +CinnabarIsland_PokemonLab_ResearchRoom:: @ 8351584 + .4byte CinnabarIsland_PokemonLab_ResearchRoom_Layout @ 0x831CAE4 + .4byte gMapEvents_CinnabarIsland_PokemonLab_ResearchRoom @ 0x83BC780 + .4byte gMapScripts_CinnabarIsland_PokemonLab_ResearchRoom @ 0x816E3DE + .4byte NULL + .2byte BGM_FRLG_CINNABAR_ISLAND + .2byte 205 + .byte 0x60, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/DiglettsCave_B1F/header.inc b/data/maps/DiglettsCave_B1F/header.inc new file mode 100644 index 000000000..7ebb82a62 --- /dev/null +++ b/data/maps/DiglettsCave_B1F/header.inc @@ -0,0 +1,8 @@ +DiglettsCave_B1F:: @ 834F620 + .4byte DiglettsCave_B1F_Layout @ 0x8303B68 + .4byte gMapEvents_DiglettsCave_B1F @ 0x83AF490 + .4byte gMapScripts_DiglettsCave_B1F @ 0x8160EF1 + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_FOREST + .2byte 124 + .byte 0x83, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/DiglettsCave_NorthEntrance/header.inc b/data/maps/DiglettsCave_NorthEntrance/header.inc new file mode 100644 index 000000000..47df9cac9 --- /dev/null +++ b/data/maps/DiglettsCave_NorthEntrance/header.inc @@ -0,0 +1,8 @@ +DiglettsCave_NorthEntrance:: @ 834F604 + .4byte DiglettsCave_NorthEntrance_Layout @ 0x831EB94 + .4byte gMapEvents_DiglettsCave_NorthEntrance @ 0x83AF46C + .4byte gMapScripts_DiglettsCave_NorthEntrance @ 0x8160EE7 + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_FOREST + .2byte 210 + .byte 0x83, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/DiglettsCave_SouthEntrance/header.inc b/data/maps/DiglettsCave_SouthEntrance/header.inc new file mode 100644 index 000000000..1651d502b --- /dev/null +++ b/data/maps/DiglettsCave_SouthEntrance/header.inc @@ -0,0 +1,8 @@ +DiglettsCave_SouthEntrance:: @ 834F63C + .4byte DiglettsCave_SouthEntrance_Layout @ 0x831EC58 + .4byte gMapEvents_DiglettsCave_SouthEntrance @ 0x83AF4CC + .4byte gMapScripts_DiglettsCave_SouthEntrance @ 0x8160EFB + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_FOREST + .2byte 211 + .byte 0x83, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/FiveIsland/connections.inc b/data/maps/FiveIsland/connections.inc new file mode 100644 index 000000000..ef2c82e8c --- /dev/null +++ b/data/maps/FiveIsland/connections.inc @@ -0,0 +1,7 @@ +FiveIsland_MapConnectionsList: @ 8352988 + connection up, -48, MAP_FIVEISLAND_WATERLABYRINTH + connection right, 0, MAP_FIVEISLAND_MEADOW + +FiveIsland_MapConnections:: @ 83529A0 + .4byte 2 + .4byte FiveIsland_MapConnectionsList diff --git a/data/maps/FiveIsland/header.inc b/data/maps/FiveIsland/header.inc new file mode 100644 index 000000000..ee274936b --- /dev/null +++ b/data/maps/FiveIsland/header.inc @@ -0,0 +1,8 @@ +FiveIsland:: @ 83507D8 + .4byte FiveIsland_Layout @ 0x8323964 + .4byte gMapEvents_FiveIsland @ 0x83B64F4 + .4byte gMapScripts_FiveIsland @ 0x8167E8E + .4byte FiveIsland_MapConnections @ 0x83529A0 + .2byte BGM_FRLG_ISLAND_FOUR + .2byte 234 + .byte 0x93, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/FiveIsland_Harbor/header.inc b/data/maps/FiveIsland_Harbor/header.inc new file mode 100644 index 000000000..623c90298 --- /dev/null +++ b/data/maps/FiveIsland_Harbor/header.inc @@ -0,0 +1,8 @@ +FiveIsland_Harbor:: @ 8351E7C + .4byte Island_Harbor_Layout @ 0x8343FB8 + .4byte gMapEvents_FiveIsland_Harbor @ 0x83BEFB4 + .4byte gMapScripts_FiveIsland_Harbor @ 0x8171D42 + .4byte NULL + .2byte BGM_FRLG_ISLAND_FOUR + .2byte 315 + .byte 0x93, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/FiveIsland_House1/header.inc b/data/maps/FiveIsland_House1/header.inc new file mode 100644 index 000000000..f33f9b4aa --- /dev/null +++ b/data/maps/FiveIsland_House1/header.inc @@ -0,0 +1,8 @@ +FiveIsland_House1:: @ 8351E98 + .4byte House3_Layout @ 0x82D5CB8 + .4byte gMapEvents_FiveIsland_House1 @ 0x83BEFE8 + .4byte gMapScripts_FiveIsland_House1 @ 0x8171D56 + .4byte NULL + .2byte BGM_FRLG_ISLAND_FOUR + .2byte 11 + .byte 0x93, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/FiveIsland_House2/header.inc b/data/maps/FiveIsland_House2/header.inc new file mode 100644 index 000000000..10a02b0ae --- /dev/null +++ b/data/maps/FiveIsland_House2/header.inc @@ -0,0 +1,8 @@ +FiveIsland_House2:: @ 8351EB4 + .4byte House3_Layout @ 0x82D5CB8 + .4byte gMapEvents_FiveIsland_House2 @ 0x83BF01C + .4byte gMapScripts_FiveIsland_House2 @ 0x8171D60 + .4byte NULL + .2byte BGM_FRLG_ISLAND_FOUR + .2byte 11 + .byte 0x93, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/FiveIsland_LostCave_Entrance/header.inc b/data/maps/FiveIsland_LostCave_Entrance/header.inc new file mode 100644 index 000000000..be1cff1e3 --- /dev/null +++ b/data/maps/FiveIsland_LostCave_Entrance/header.inc @@ -0,0 +1,8 @@ +FiveIsland_LostCave_Entrance:: @ 83500D8 + .4byte FiveIsland_LostCave_Entrance_Layout @ 0x83454D8 + .4byte gMapEvents_FiveIsland_LostCave_Entrance @ 0x83B4354 + .4byte gMapScripts_FiveIsland_LostCave_Entrance @ 0x8164BEC + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 320 + .byte 0xb5, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/FiveIsland_LostCave_Room1/header.inc b/data/maps/FiveIsland_LostCave_Room1/header.inc new file mode 100644 index 000000000..053bb4dee --- /dev/null +++ b/data/maps/FiveIsland_LostCave_Room1/header.inc @@ -0,0 +1,8 @@ +FiveIsland_LostCave_Room1:: @ 83500F4 + .4byte FiveIsland_LostCave_Room1_Layout @ 0x83455F0 + .4byte gMapEvents_FiveIsland_LostCave_Room1 @ 0x83B43A8 + .4byte gMapScripts_FiveIsland_LostCave_Room1 @ 0x8164BF6 + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 321 + .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/FiveIsland_LostCave_Room10/header.inc b/data/maps/FiveIsland_LostCave_Room10/header.inc new file mode 100644 index 000000000..f770a1340 --- /dev/null +++ b/data/maps/FiveIsland_LostCave_Room10/header.inc @@ -0,0 +1,8 @@ +FiveIsland_LostCave_Room10:: @ 83501F0 + .4byte FiveIsland_LostCave_Room10_Layout @ 0x8345FC8 + .4byte gMapEvents_FiveIsland_LostCave_Room10 @ 0x83B45AC + .4byte gMapScripts_FiveIsland_LostCave_Room10 @ 0x8164C2D + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 330 + .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/FiveIsland_LostCave_Room11/header.inc b/data/maps/FiveIsland_LostCave_Room11/header.inc new file mode 100644 index 000000000..4e047faf2 --- /dev/null +++ b/data/maps/FiveIsland_LostCave_Room11/header.inc @@ -0,0 +1,8 @@ +FiveIsland_LostCave_Room11:: @ 835020C + .4byte FiveIsland_LostCave_Room11_Layout @ 0x83460E0 + .4byte gMapEvents_FiveIsland_LostCave_Room11 @ 0x83B45E0 + .4byte gMapScripts_FiveIsland_LostCave_Room11 @ 0x8164CCB + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 331 + .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/FiveIsland_LostCave_Room12/header.inc b/data/maps/FiveIsland_LostCave_Room12/header.inc new file mode 100644 index 000000000..417712f1b --- /dev/null +++ b/data/maps/FiveIsland_LostCave_Room12/header.inc @@ -0,0 +1,8 @@ +FiveIsland_LostCave_Room12:: @ 8350228 + .4byte FiveIsland_LostCave_Room12_Layout @ 0x83461F8 + .4byte gMapEvents_FiveIsland_LostCave_Room12 @ 0x83B4614 + .4byte gMapScripts_FiveIsland_LostCave_Room12 @ 0x8164CCC + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 332 + .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/FiveIsland_LostCave_Room13/header.inc b/data/maps/FiveIsland_LostCave_Room13/header.inc new file mode 100644 index 000000000..cbe00c496 --- /dev/null +++ b/data/maps/FiveIsland_LostCave_Room13/header.inc @@ -0,0 +1,8 @@ +FiveIsland_LostCave_Room13:: @ 8350244 + .4byte FiveIsland_LostCave_Room13_Layout @ 0x8346310 + .4byte gMapEvents_FiveIsland_LostCave_Room13 @ 0x83B4648 + .4byte gMapScripts_FiveIsland_LostCave_Room13 @ 0x8164CCD + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 333 + .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/FiveIsland_LostCave_Room14/header.inc b/data/maps/FiveIsland_LostCave_Room14/header.inc new file mode 100644 index 000000000..036d47e93 --- /dev/null +++ b/data/maps/FiveIsland_LostCave_Room14/header.inc @@ -0,0 +1,8 @@ +FiveIsland_LostCave_Room14:: @ 8350260 + .4byte FiveIsland_LostCave_Room14_Layout @ 0x8346428 + .4byte gMapEvents_FiveIsland_LostCave_Room14 @ 0x83B467C + .4byte gMapScripts_FiveIsland_LostCave_Room14 @ 0x8164CCE + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 334 + .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/FiveIsland_LostCave_Room2/header.inc b/data/maps/FiveIsland_LostCave_Room2/header.inc new file mode 100644 index 000000000..3a22600b3 --- /dev/null +++ b/data/maps/FiveIsland_LostCave_Room2/header.inc @@ -0,0 +1,8 @@ +FiveIsland_LostCave_Room2:: @ 8350110 + .4byte FiveIsland_LostCave_Room2_Layout @ 0x8345708 + .4byte gMapEvents_FiveIsland_LostCave_Room2 @ 0x83B43DC + .4byte gMapScripts_FiveIsland_LostCave_Room2 @ 0x8164C0E + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 322 + .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/FiveIsland_LostCave_Room3/header.inc b/data/maps/FiveIsland_LostCave_Room3/header.inc new file mode 100644 index 000000000..0080d605e --- /dev/null +++ b/data/maps/FiveIsland_LostCave_Room3/header.inc @@ -0,0 +1,8 @@ +FiveIsland_LostCave_Room3:: @ 835012C + .4byte FiveIsland_LostCave_Room3_Layout @ 0x8345820 + .4byte gMapEvents_FiveIsland_LostCave_Room3 @ 0x83B4410 + .4byte gMapScripts_FiveIsland_LostCave_Room3 @ 0x8164C0F + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 323 + .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/FiveIsland_LostCave_Room4/header.inc b/data/maps/FiveIsland_LostCave_Room4/header.inc new file mode 100644 index 000000000..019095376 --- /dev/null +++ b/data/maps/FiveIsland_LostCave_Room4/header.inc @@ -0,0 +1,8 @@ +FiveIsland_LostCave_Room4:: @ 8350148 + .4byte FiveIsland_LostCave_Room4_Layout @ 0x8345938 + .4byte gMapEvents_FiveIsland_LostCave_Room4 @ 0x83B445C + .4byte gMapScripts_FiveIsland_LostCave_Room4 @ 0x8164C10 + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 324 + .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/FiveIsland_LostCave_Room5/header.inc b/data/maps/FiveIsland_LostCave_Room5/header.inc new file mode 100644 index 000000000..e5bc7e389 --- /dev/null +++ b/data/maps/FiveIsland_LostCave_Room5/header.inc @@ -0,0 +1,8 @@ +FiveIsland_LostCave_Room5:: @ 8350164 + .4byte FiveIsland_LostCave_Room5_Layout @ 0x8345A50 + .4byte gMapEvents_FiveIsland_LostCave_Room5 @ 0x83B4490 + .4byte gMapScripts_FiveIsland_LostCave_Room5 @ 0x8164C28 + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 325 + .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/FiveIsland_LostCave_Room6/header.inc b/data/maps/FiveIsland_LostCave_Room6/header.inc new file mode 100644 index 000000000..5688b9428 --- /dev/null +++ b/data/maps/FiveIsland_LostCave_Room6/header.inc @@ -0,0 +1,8 @@ +FiveIsland_LostCave_Room6:: @ 8350180 + .4byte FiveIsland_LostCave_Room6_Layout @ 0x8345B68 + .4byte gMapEvents_FiveIsland_LostCave_Room6 @ 0x83B44C4 + .4byte gMapScripts_FiveIsland_LostCave_Room6 @ 0x8164C29 + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 326 + .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/FiveIsland_LostCave_Room7/header.inc b/data/maps/FiveIsland_LostCave_Room7/header.inc new file mode 100644 index 000000000..eff6b2b3b --- /dev/null +++ b/data/maps/FiveIsland_LostCave_Room7/header.inc @@ -0,0 +1,8 @@ +FiveIsland_LostCave_Room7:: @ 835019C + .4byte FiveIsland_LostCave_Room7_Layout @ 0x8345C80 + .4byte gMapEvents_FiveIsland_LostCave_Room7 @ 0x83B44F8 + .4byte gMapScripts_FiveIsland_LostCave_Room7 @ 0x8164C2A + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 327 + .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/FiveIsland_LostCave_Room8/header.inc b/data/maps/FiveIsland_LostCave_Room8/header.inc new file mode 100644 index 000000000..585e219ee --- /dev/null +++ b/data/maps/FiveIsland_LostCave_Room8/header.inc @@ -0,0 +1,8 @@ +FiveIsland_LostCave_Room8:: @ 83501B8 + .4byte FiveIsland_LostCave_Room8_Layout @ 0x8345D98 + .4byte gMapEvents_FiveIsland_LostCave_Room8 @ 0x83B452C + .4byte gMapScripts_FiveIsland_LostCave_Room8 @ 0x8164C2B + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 328 + .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/FiveIsland_LostCave_Room9/header.inc b/data/maps/FiveIsland_LostCave_Room9/header.inc new file mode 100644 index 000000000..2c465cf0e --- /dev/null +++ b/data/maps/FiveIsland_LostCave_Room9/header.inc @@ -0,0 +1,8 @@ +FiveIsland_LostCave_Room9:: @ 83501D4 + .4byte FiveIsland_LostCave_Room9_Layout @ 0x8345EB0 + .4byte gMapEvents_FiveIsland_LostCave_Room9 @ 0x83B4560 + .4byte gMapScripts_FiveIsland_LostCave_Room9 @ 0x8164C2C + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 329 + .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/FiveIsland_Meadow/connections.inc b/data/maps/FiveIsland_Meadow/connections.inc new file mode 100644 index 000000000..87bded6c7 --- /dev/null +++ b/data/maps/FiveIsland_Meadow/connections.inc @@ -0,0 +1,7 @@ +FiveIsland_Meadow_MapConnectionsList: @ 8352DDC + connection left, 0, MAP_FIVEISLAND + connection right, 20, MAP_FIVEISLAND_MEMORIALPILLAR + +FiveIsland_Meadow_MapConnections:: @ 8352DF4 + .4byte 2 + .4byte FiveIsland_Meadow_MapConnectionsList diff --git a/data/maps/FiveIsland_Meadow/header.inc b/data/maps/FiveIsland_Meadow/header.inc new file mode 100644 index 000000000..05ba4c525 --- /dev/null +++ b/data/maps/FiveIsland_Meadow/header.inc @@ -0,0 +1,8 @@ +FiveIsland_Meadow:: @ 8350C38 + .4byte FiveIsland_Meadow_Layout @ 0x832BAE4 + .4byte gMapEvents_FiveIsland_Meadow @ 0x83B8D94 + .4byte gMapScripts_FiveIsland_Meadow @ 0x8168932 + .4byte FiveIsland_Meadow_MapConnections @ 0x8352DF4 + .2byte BGM_FRLG_SEVII_ISLANDS + .2byte 248 + .byte 0xa1, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/FiveIsland_MemorialPillar/connections.inc b/data/maps/FiveIsland_MemorialPillar/connections.inc new file mode 100644 index 000000000..adc49a1af --- /dev/null +++ b/data/maps/FiveIsland_MemorialPillar/connections.inc @@ -0,0 +1,6 @@ +FiveIsland_MemorialPillar_MapConnectionsList: @ 8352DFC + connection left, -20, MAP_FIVEISLAND_MEADOW + +FiveIsland_MemorialPillar_MapConnections:: @ 8352E08 + .4byte 1 + .4byte FiveIsland_MemorialPillar_MapConnectionsList diff --git a/data/maps/FiveIsland_MemorialPillar/header.inc b/data/maps/FiveIsland_MemorialPillar/header.inc new file mode 100644 index 000000000..0db87e74f --- /dev/null +++ b/data/maps/FiveIsland_MemorialPillar/header.inc @@ -0,0 +1,8 @@ +FiveIsland_MemorialPillar:: @ 8350C54 + .4byte FiveIsland_MemorialPillar_Layout @ 0x832C648 + .4byte gMapEvents_FiveIsland_MemorialPillar @ 0x83B8E5C + .4byte gMapScripts_FiveIsland_MemorialPillar @ 0x81689D2 + .4byte FiveIsland_MemorialPillar_MapConnections @ 0x8352E08 + .2byte BGM_FRLG_SEVII_ISLANDS + .2byte 249 + .byte 0xa2, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/FiveIsland_PokemonCenter_1F/header.inc b/data/maps/FiveIsland_PokemonCenter_1F/header.inc new file mode 100644 index 000000000..61ceecc1e --- /dev/null +++ b/data/maps/FiveIsland_PokemonCenter_1F/header.inc @@ -0,0 +1,8 @@ +FiveIsland_PokemonCenter_1F:: @ 8351E44 + .4byte PokemonCenter_1F_Layout @ 0x82D5990 + .4byte gMapEvents_FiveIsland_PokemonCenter_1F @ 0x83BEEDC + .4byte gMapScripts_FiveIsland_PokemonCenter_1F @ 0x8171CF1 + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 8 + .byte 0x93, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/FiveIsland_PokemonCenter_2F/header.inc b/data/maps/FiveIsland_PokemonCenter_2F/header.inc new file mode 100644 index 000000000..a3f51f119 --- /dev/null +++ b/data/maps/FiveIsland_PokemonCenter_2F/header.inc @@ -0,0 +1,8 @@ +FiveIsland_PokemonCenter_2F:: @ 8351E60 + .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 + .4byte gMapEvents_FiveIsland_PokemonCenter_2F @ 0x83BEF68 + .4byte gMapScripts_FiveIsland_PokemonCenter_2F @ 0x8171D1B + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 9 + .byte 0x93, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/FiveIsland_ResortGorgeous/connections.inc b/data/maps/FiveIsland_ResortGorgeous/connections.inc new file mode 100644 index 000000000..97d3b0007 --- /dev/null +++ b/data/maps/FiveIsland_ResortGorgeous/connections.inc @@ -0,0 +1,6 @@ +FiveIsland_ResortGorgeous_MapConnectionsList: @ 8352DA8 + connection down, -48, MAP_FIVEISLAND_WATERLABYRINTH + +FiveIsland_ResortGorgeous_MapConnections:: @ 8352DB4 + .4byte 1 + .4byte FiveIsland_ResortGorgeous_MapConnectionsList diff --git a/data/maps/FiveIsland_ResortGorgeous/header.inc b/data/maps/FiveIsland_ResortGorgeous/header.inc new file mode 100644 index 000000000..13c3647f7 --- /dev/null +++ b/data/maps/FiveIsland_ResortGorgeous/header.inc @@ -0,0 +1,8 @@ +FiveIsland_ResortGorgeous:: @ 8350C00 + .4byte FiveIsland_ResortGorgeous_Layout @ 0x832A7DC + .4byte gMapEvents_FiveIsland_ResortGorgeous @ 0x83B8C80 + .4byte gMapScripts_FiveIsland_ResortGorgeous @ 0x81687E4 + .4byte FiveIsland_ResortGorgeous_MapConnections @ 0x8352DB4 + .2byte BGM_FRLG_SEVII_ISLANDS + .2byte 246 + .byte 0x9f, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/FiveIsland_ResortGorgeous_House/header.inc b/data/maps/FiveIsland_ResortGorgeous_House/header.inc new file mode 100644 index 000000000..06e2fb981 --- /dev/null +++ b/data/maps/FiveIsland_ResortGorgeous_House/header.inc @@ -0,0 +1,8 @@ +FiveIsland_ResortGorgeous_House:: @ 8351F78 + .4byte FiveIsland_ResortGorgeous_House_Layout @ 0x82D657C + .4byte gMapEvents_FiveIsland_ResortGorgeous_House @ 0x83BF2C0 + .4byte gMapScripts_FiveIsland_ResortGorgeous_House @ 0x8171EBD + .4byte NULL + .2byte BGM_FRLG_ISLAND_FOUR + .2byte 17 + .byte 0x9f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/FiveIsland_WaterLabyrinth/connections.inc b/data/maps/FiveIsland_WaterLabyrinth/connections.inc new file mode 100644 index 000000000..69a0b4a6d --- /dev/null +++ b/data/maps/FiveIsland_WaterLabyrinth/connections.inc @@ -0,0 +1,7 @@ +FiveIsland_WaterLabyrinth_MapConnectionsList: @ 8352DBC + connection up, 48, MAP_FIVEISLAND_RESORTGORGEOUS + connection down, 48, MAP_FIVEISLAND + +FiveIsland_WaterLabyrinth_MapConnections:: @ 8352DD4 + .4byte 2 + .4byte FiveIsland_WaterLabyrinth_MapConnectionsList diff --git a/data/maps/FiveIsland_WaterLabyrinth/header.inc b/data/maps/FiveIsland_WaterLabyrinth/header.inc new file mode 100644 index 000000000..ca762bcd5 --- /dev/null +++ b/data/maps/FiveIsland_WaterLabyrinth/header.inc @@ -0,0 +1,8 @@ +FiveIsland_WaterLabyrinth:: @ 8350C1C + .4byte FiveIsland_WaterLabyrinth_Layout @ 0x832B340 + .4byte gMapEvents_FiveIsland_WaterLabyrinth @ 0x83B8CC4 + .4byte gMapScripts_FiveIsland_WaterLabyrinth @ 0x816884D + .4byte FiveIsland_WaterLabyrinth_MapConnections @ 0x8352DD4 + .2byte BGM_FRLG_SEVII_ISLANDS + .2byte 247 + .byte 0xa0, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/FourIsland/header.inc b/data/maps/FourIsland/header.inc new file mode 100644 index 000000000..16949a412 --- /dev/null +++ b/data/maps/FourIsland/header.inc @@ -0,0 +1,8 @@ +FourIsland:: @ 83507BC + .4byte FourIsland_Layout @ 0x8323580 + .4byte gMapEvents_FourIsland @ 0x83B646C + .4byte gMapScripts_FourIsland @ 0x8167CAE + .4byte NULL + .2byte BGM_FRLG_ISLAND_FOUR + .2byte 233 + .byte 0x92, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/FourIsland_Harbor/header.inc b/data/maps/FourIsland_Harbor/header.inc new file mode 100644 index 000000000..224d88240 --- /dev/null +++ b/data/maps/FourIsland_Harbor/header.inc @@ -0,0 +1,8 @@ +FourIsland_Harbor:: @ 8351DF0 + .4byte Island_Harbor_Layout @ 0x8343FB8 + .4byte gMapEvents_FourIsland_Harbor @ 0x83BEDA8 + .4byte gMapScripts_FourIsland_Harbor @ 0x8171C98 + .4byte NULL + .2byte BGM_FRLG_ISLAND_FOUR + .2byte 315 + .byte 0x92, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/FourIsland_House1/header.inc b/data/maps/FourIsland_House1/header.inc new file mode 100644 index 000000000..b72ce9938 --- /dev/null +++ b/data/maps/FourIsland_House1/header.inc @@ -0,0 +1,8 @@ +FourIsland_House1:: @ 8351DB8 + .4byte House3_Layout @ 0x82D5CB8 + .4byte gMapEvents_FourIsland_House1 @ 0x83BEBD8 + .4byte gMapScripts_FourIsland_House1 @ 0x8171C44 + .4byte NULL + .2byte BGM_FRLG_ISLAND_FOUR + .2byte 11 + .byte 0x92, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/FourIsland_House2/header.inc b/data/maps/FourIsland_House2/header.inc new file mode 100644 index 000000000..fafd19dde --- /dev/null +++ b/data/maps/FourIsland_House2/header.inc @@ -0,0 +1,8 @@ +FourIsland_House2:: @ 8351E0C + .4byte House3_Layout @ 0x82D5CB8 + .4byte gMapEvents_FourIsland_House2 @ 0x83BEDDC + .4byte gMapScripts_FourIsland_House2 @ 0x8171CAC + .4byte NULL + .2byte BGM_FRLG_ISLAND_FOUR + .2byte 11 + .byte 0x92, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/FourIsland_IcefallCave_1F/header.inc b/data/maps/FourIsland_IcefallCave_1F/header.inc new file mode 100644 index 000000000..8a4ad3c55 --- /dev/null +++ b/data/maps/FourIsland_IcefallCave_1F/header.inc @@ -0,0 +1,8 @@ +FourIsland_IcefallCave_1F:: @ 834FE38 + .4byte FourIsland_IcefallCave_1F_Layout @ 0x834117C + .4byte gMapEvents_FourIsland_IcefallCave_1F @ 0x83B34AC + .4byte gMapScripts_FourIsland_IcefallCave_1F @ 0x8163D44 + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 294 + .byte 0xb1, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/FourIsland_IcefallCave_Entrance/header.inc b/data/maps/FourIsland_IcefallCave_Entrance/header.inc new file mode 100644 index 000000000..9c183603b --- /dev/null +++ b/data/maps/FourIsland_IcefallCave_Entrance/header.inc @@ -0,0 +1,8 @@ +FourIsland_IcefallCave_Entrance:: @ 834FE1C + .4byte FourIsland_IcefallCave_Entrance_Layout @ 0x8340E38 + .4byte gMapEvents_FourIsland_IcefallCave_Entrance @ 0x83B3438 + .4byte gMapScripts_FourIsland_IcefallCave_Entrance @ 0x8163D3A + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 293 + .byte 0xb1, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/FourIsland_LoreleisHouse/header.inc b/data/maps/FourIsland_LoreleisHouse/header.inc new file mode 100644 index 000000000..112231426 --- /dev/null +++ b/data/maps/FourIsland_LoreleisHouse/header.inc @@ -0,0 +1,8 @@ +FourIsland_LoreleisHouse:: @ 8351DD4 + .4byte FourIsland_LoreleisHouse_Layout @ 0x82D7418 + .4byte gMapEvents_FourIsland_LoreleisHouse @ 0x83BED5C + .4byte gMapScripts_FourIsland_LoreleisHouse @ 0x8171C4E + .4byte NULL + .2byte BGM_FRLG_ISLAND_FOUR + .2byte 30 + .byte 0x92, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/FourIsland_Mart/header.inc b/data/maps/FourIsland_Mart/header.inc new file mode 100644 index 000000000..634c598fc --- /dev/null +++ b/data/maps/FourIsland_Mart/header.inc @@ -0,0 +1,8 @@ +FourIsland_Mart:: @ 8351E28 + .4byte Mart_Layout @ 0x82D5BCC + .4byte gMapEvents_FourIsland_Mart @ 0x83BEE40 + .4byte gMapScripts_FourIsland_Mart @ 0x8171CAD + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 10 + .byte 0x92, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/FourIsland_PokemonCenter_1F/header.inc b/data/maps/FourIsland_PokemonCenter_1F/header.inc new file mode 100644 index 000000000..151688304 --- /dev/null +++ b/data/maps/FourIsland_PokemonCenter_1F/header.inc @@ -0,0 +1,8 @@ +FourIsland_PokemonCenter_1F:: @ 8351D80 + .4byte PokemonCenter_1F_Layout @ 0x82D5990 + .4byte gMapEvents_FourIsland_PokemonCenter_1F @ 0x83BEB00 + .4byte gMapScripts_FourIsland_PokemonCenter_1F @ 0x8171BEA + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 8 + .byte 0x92, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/FourIsland_PokemonCenter_2F/header.inc b/data/maps/FourIsland_PokemonCenter_2F/header.inc new file mode 100644 index 000000000..c79978793 --- /dev/null +++ b/data/maps/FourIsland_PokemonCenter_2F/header.inc @@ -0,0 +1,8 @@ +FourIsland_PokemonCenter_2F:: @ 8351D9C + .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 + .4byte gMapEvents_FourIsland_PokemonCenter_2F @ 0x83BEB8C + .4byte gMapScripts_FourIsland_PokemonCenter_2F @ 0x8171C1D + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 9 + .byte 0x92, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/FourIsland_PokemonDayCare/header.inc b/data/maps/FourIsland_PokemonDayCare/header.inc new file mode 100644 index 000000000..31aa92deb --- /dev/null +++ b/data/maps/FourIsland_PokemonDayCare/header.inc @@ -0,0 +1,8 @@ +FourIsland_PokemonDayCare:: @ 8351D64 + .4byte FourIsland_PokemonDayCare_Layout @ 0x833AFA8 + .4byte gMapEvents_FourIsland_PokemonDayCare @ 0x83BEA64 + .4byte gMapScripts_FourIsland_PokemonDayCare @ 0x817193F + .4byte NULL + .2byte BGM_FRLG_ISLAND_FOUR + .2byte 277 + .byte 0x92, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/FuchsiaCity/connections.inc b/data/maps/FuchsiaCity/connections.inc new file mode 100644 index 000000000..58c41fdcc --- /dev/null +++ b/data/maps/FuchsiaCity/connections.inc @@ -0,0 +1,8 @@ +FuchsiaCity_MapConnectionsList: @ 8352864 + connection down, 12, MAP_ROUTE19 + connection left, 10, MAP_ROUTE18 + connection right, 10, MAP_ROUTE15 + +FuchsiaCity_MapConnections:: @ 8352888 + .4byte 3 + .4byte FuchsiaCity_MapConnectionsList diff --git a/data/maps/FuchsiaCity/header.inc b/data/maps/FuchsiaCity/header.inc new file mode 100644 index 000000000..8017613bc --- /dev/null +++ b/data/maps/FuchsiaCity/header.inc @@ -0,0 +1,8 @@ +FuchsiaCity:: @ 83506DC + .4byte FuchsiaCity_Layout @ 0x82E373C + .4byte gMapEvents_FuchsiaCity @ 0x83B5B14 + .4byte gMapScripts_FuchsiaCity @ 0x8166D75 + .4byte FuchsiaCity_MapConnections @ 0x8352888 + .2byte BGM_FRLG_CERULEAN_CITY + .2byte 85 + .byte 0x5f, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/FuchsiaCity_Building1/header.inc b/data/maps/FuchsiaCity_Building1/header.inc new file mode 100644 index 000000000..db876f27c --- /dev/null +++ b/data/maps/FuchsiaCity_Building1/header.inc @@ -0,0 +1,8 @@ +FuchsiaCity_Building1:: @ 83514DC + .4byte FuchsiaCity_Building1_Layout @ 0x831C48C + .4byte gMapEvents_FuchsiaCity_Building1 @ 0x83BC3F4 + .4byte gMapScripts_FuchsiaCity_Building1 @ 0x816D74B + .4byte NULL + .2byte BGM_FRLG_CERULEAN_CITY + .2byte 201 + .byte 0x5f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/FuchsiaCity_Gym/header.inc b/data/maps/FuchsiaCity_Gym/header.inc new file mode 100644 index 000000000..ed9dfef9e --- /dev/null +++ b/data/maps/FuchsiaCity_Gym/header.inc @@ -0,0 +1,8 @@ +FuchsiaCity_Gym:: @ 835146C + .4byte FuchsiaCity_Gym_Layout @ 0x82D6A04 + .4byte gMapEvents_FuchsiaCity_Gym @ 0x83BC1A4 + .4byte gMapScripts_FuchsiaCity_Gym @ 0x816D54D + .4byte NULL + .2byte BGM_FRLG_GYM + .2byte 20 + .byte 0x5f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01 diff --git a/data/maps/FuchsiaCity_House1/header.inc b/data/maps/FuchsiaCity_House1/header.inc new file mode 100644 index 000000000..ced57d5dd --- /dev/null +++ b/data/maps/FuchsiaCity_House1/header.inc @@ -0,0 +1,8 @@ +FuchsiaCity_House1:: @ 8351488 + .4byte House1_Layout @ 0x82D5754 + .4byte gMapEvents_FuchsiaCity_House1 @ 0x83BC218 + .4byte gMapScripts_FuchsiaCity_House1 @ 0x816D6C5 + .4byte NULL + .2byte BGM_FRLG_CERULEAN_CITY + .2byte 6 + .byte 0x5f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/FuchsiaCity_House2/header.inc b/data/maps/FuchsiaCity_House2/header.inc new file mode 100644 index 000000000..7dbe95373 --- /dev/null +++ b/data/maps/FuchsiaCity_House2/header.inc @@ -0,0 +1,8 @@ +FuchsiaCity_House2:: @ 83514F8 + .4byte FuchsiaCity_House2_Layout @ 0x831C578 + .4byte gMapEvents_FuchsiaCity_House2 @ 0x83BC440 + .4byte gMapScripts_FuchsiaCity_House2 @ 0x816D816 + .4byte NULL + .2byte BGM_FRLG_CERULEAN_CITY + .2byte 202 + .byte 0x5f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/FuchsiaCity_House3/header.inc b/data/maps/FuchsiaCity_House3/header.inc new file mode 100644 index 000000000..6cd078957 --- /dev/null +++ b/data/maps/FuchsiaCity_House3/header.inc @@ -0,0 +1,8 @@ +FuchsiaCity_House3:: @ 8351514 + .4byte House1_Layout @ 0x82D5754 + .4byte gMapEvents_FuchsiaCity_House3 @ 0x83BC474 + .4byte gMapScripts_FuchsiaCity_House3 @ 0x816D894 + .4byte NULL + .2byte BGM_FRLG_CERULEAN_CITY + .2byte 6 + .byte 0x5f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/FuchsiaCity_Mart/header.inc b/data/maps/FuchsiaCity_Mart/header.inc new file mode 100644 index 000000000..7e3661618 --- /dev/null +++ b/data/maps/FuchsiaCity_Mart/header.inc @@ -0,0 +1,8 @@ +FuchsiaCity_Mart:: @ 8351434 + .4byte Mart_Layout @ 0x82D5BCC + .4byte gMapEvents_FuchsiaCity_Mart @ 0x83BC014 + .4byte gMapScripts_FuchsiaCity_Mart @ 0x816D4E0 + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 10 + .byte 0x5f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/FuchsiaCity_PokemonCenter_1F/header.inc b/data/maps/FuchsiaCity_PokemonCenter_1F/header.inc new file mode 100644 index 000000000..da90f4470 --- /dev/null +++ b/data/maps/FuchsiaCity_PokemonCenter_1F/header.inc @@ -0,0 +1,8 @@ +FuchsiaCity_PokemonCenter_1F:: @ 83514A4 + .4byte PokemonCenter_1F_Layout @ 0x82D5990 + .4byte gMapEvents_FuchsiaCity_PokemonCenter_1F @ 0x83BC2AC + .4byte gMapScripts_FuchsiaCity_PokemonCenter_1F @ 0x816D6F1 + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 8 + .byte 0x5f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/FuchsiaCity_PokemonCenter_2F/header.inc b/data/maps/FuchsiaCity_PokemonCenter_2F/header.inc new file mode 100644 index 000000000..890dc2977 --- /dev/null +++ b/data/maps/FuchsiaCity_PokemonCenter_2F/header.inc @@ -0,0 +1,8 @@ +FuchsiaCity_PokemonCenter_2F:: @ 83514C0 + .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 + .4byte gMapEvents_FuchsiaCity_PokemonCenter_2F @ 0x83BC338 + .4byte gMapScripts_FuchsiaCity_PokemonCenter_2F @ 0x816D724 + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 9 + .byte 0x5f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/header.inc b/data/maps/FuchsiaCity_SafariZone_Entrance/header.inc new file mode 100644 index 000000000..f83a6b62f --- /dev/null +++ b/data/maps/FuchsiaCity_SafariZone_Entrance/header.inc @@ -0,0 +1,8 @@ +FuchsiaCity_SafariZone_Entrance:: @ 8351418 + .4byte FuchsiaCity_SafariZone_Entrance_Layout @ 0x82D8E80 + .4byte gMapEvents_FuchsiaCity_SafariZone_Entrance @ 0x83BBFA0 + .4byte gMapScripts_FuchsiaCity_SafariZone_Entrance @ 0x816D2A8 + .4byte NULL + .2byte BGM_FRLG_CERULEAN_CITY + .2byte 51 + .byte 0x5f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/FuchsiaCity_ZooBuilding/header.inc b/data/maps/FuchsiaCity_ZooBuilding/header.inc new file mode 100644 index 000000000..a47f66952 --- /dev/null +++ b/data/maps/FuchsiaCity_ZooBuilding/header.inc @@ -0,0 +1,8 @@ +FuchsiaCity_ZooBuilding:: @ 8351450 + .4byte FuchsiaCity_ZooBuilding_Layout @ 0x831C348 + .4byte gMapEvents_FuchsiaCity_ZooBuilding @ 0x83BC0A0 + .4byte gMapScripts_FuchsiaCity_ZooBuilding @ 0x816D528 + .4byte NULL + .2byte BGM_FRLG_CERULEAN_CITY + .2byte 200 + .byte 0x5f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/IndigoPlateau_Exterior/connections.inc b/data/maps/IndigoPlateau_Exterior/connections.inc new file mode 100644 index 000000000..e218b5480 --- /dev/null +++ b/data/maps/IndigoPlateau_Exterior/connections.inc @@ -0,0 +1,6 @@ +IndigoPlateau_Exterior_MapConnectionsList: @ 83528B0 + connection down, 0, MAP_ROUTE23 + +IndigoPlateau_Exterior_MapConnections:: @ 83528BC + .4byte 1 + .4byte IndigoPlateau_Exterior_MapConnectionsList diff --git a/data/maps/IndigoPlateau_Exterior/header.inc b/data/maps/IndigoPlateau_Exterior/header.inc new file mode 100644 index 000000000..f6d13a5f5 --- /dev/null +++ b/data/maps/IndigoPlateau_Exterior/header.inc @@ -0,0 +1,8 @@ +IndigoPlateau_Exterior:: @ 8350714 + .4byte IndigoPlateau_Exterior_Layout @ 0x82E3F04 + .4byte gMapEvents_IndigoPlateau_Exterior @ 0x83B5C3C + .4byte gMapScripts_IndigoPlateau_Exterior @ 0x816723B + .4byte IndigoPlateau_Exterior_MapConnections @ 0x83528BC + .2byte BGM_FRLG_INDIGO_PLATEAU + .2byte 87 + .byte 0x61, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/header.inc b/data/maps/IndigoPlateau_PokemonCenter_1F/header.inc new file mode 100644 index 000000000..48d8200cd --- /dev/null +++ b/data/maps/IndigoPlateau_PokemonCenter_1F/header.inc @@ -0,0 +1,8 @@ +IndigoPlateau_PokemonCenter_1F:: @ 8351610 + .4byte IndigoPlateau_PokemonCenter_1F_Layout @ 0x831F000 + .4byte gMapEvents_IndigoPlateau_PokemonCenter_1F @ 0x83BCA94 + .4byte gMapScripts_IndigoPlateau_PokemonCenter_1F @ 0x816EA5A + .4byte NULL + .2byte BGM_FRLG_GYM + .2byte 212 + .byte 0x61, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01 diff --git a/data/maps/IndigoPlateau_PokemonCenter_2F/header.inc b/data/maps/IndigoPlateau_PokemonCenter_2F/header.inc new file mode 100644 index 000000000..9b88ab689 --- /dev/null +++ b/data/maps/IndigoPlateau_PokemonCenter_2F/header.inc @@ -0,0 +1,8 @@ +IndigoPlateau_PokemonCenter_2F:: @ 835162C + .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 + .4byte gMapEvents_IndigoPlateau_PokemonCenter_2F @ 0x83BCB20 + .4byte gMapScripts_IndigoPlateau_PokemonCenter_2F @ 0x816EB0F + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 9 + .byte 0x61, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01 diff --git a/data/maps/LavenderTown/connections.inc b/data/maps/LavenderTown/connections.inc new file mode 100644 index 000000000..8b1950468 --- /dev/null +++ b/data/maps/LavenderTown/connections.inc @@ -0,0 +1,8 @@ +LavenderTown_MapConnectionsList: @ 83527F8 + connection up, 0, MAP_ROUTE10 + connection down, 0, MAP_ROUTE12 + connection left, 0, MAP_ROUTE8 + +LavenderTown_MapConnections:: @ 835281C + .4byte 3 + .4byte LavenderTown_MapConnectionsList diff --git a/data/maps/LavenderTown/header.inc b/data/maps/LavenderTown/header.inc new file mode 100644 index 000000000..ba459c4ac --- /dev/null +++ b/data/maps/LavenderTown/header.inc @@ -0,0 +1,8 @@ +LavenderTown:: @ 8350688 + .4byte LavenderTown_Layout @ 0x82E0610 + .4byte gMapEvents_LavenderTown @ 0x83B549C + .4byte gMapScripts_LavenderTown @ 0x816686B + .4byte LavenderTown_MapConnections @ 0x835281C + .2byte BGM_FRLG_LAVENDER_TOWN + .2byte 82 + .byte 0x5c, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/LavenderTown_House1/header.inc b/data/maps/LavenderTown_House1/header.inc new file mode 100644 index 000000000..1ce5034eb --- /dev/null +++ b/data/maps/LavenderTown_House1/header.inc @@ -0,0 +1,8 @@ +LavenderTown_House1:: @ 83510B4 + .4byte House5_Layout @ 0x82D6AF0 + .4byte gMapEvents_LavenderTown_House1 @ 0x83BAA58 + .4byte gMapScripts_LavenderTown_House1 @ 0x816B232 + .4byte NULL + .2byte BGM_FRLG_LAVENDER_TOWN + .2byte 21 + .byte 0x5c, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/LavenderTown_House2/header.inc b/data/maps/LavenderTown_House2/header.inc new file mode 100644 index 000000000..87ec9bcde --- /dev/null +++ b/data/maps/LavenderTown_House2/header.inc @@ -0,0 +1,8 @@ +LavenderTown_House2:: @ 83510D0 + .4byte House5_Layout @ 0x82D6AF0 + .4byte gMapEvents_LavenderTown_House2 @ 0x83BAA9C + .4byte gMapScripts_LavenderTown_House2 @ 0x816B265 + .4byte NULL + .2byte BGM_FRLG_CERULEAN_CITY + .2byte 21 + .byte 0x5c, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/LavenderTown_Mart/header.inc b/data/maps/LavenderTown_Mart/header.inc new file mode 100644 index 000000000..593229dc4 --- /dev/null +++ b/data/maps/LavenderTown_Mart/header.inc @@ -0,0 +1,8 @@ +LavenderTown_Mart:: @ 83510EC + .4byte Mart_Layout @ 0x82D5BCC + .4byte gMapEvents_LavenderTown_Mart @ 0x83BAB28 + .4byte gMapScripts_LavenderTown_Mart @ 0x816B34F + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 10 + .byte 0x5c, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/LavenderTown_PokemonCenter_1F/header.inc b/data/maps/LavenderTown_PokemonCenter_1F/header.inc new file mode 100644 index 000000000..65952d0a1 --- /dev/null +++ b/data/maps/LavenderTown_PokemonCenter_1F/header.inc @@ -0,0 +1,8 @@ +LavenderTown_PokemonCenter_1F:: @ 8351060 + .4byte PokemonCenter_1F_Layout @ 0x82D5990 + .4byte gMapEvents_LavenderTown_PokemonCenter_1F @ 0x83BA890 + .4byte gMapScripts_LavenderTown_PokemonCenter_1F @ 0x816B0EF + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 8 + .byte 0x5c, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/LavenderTown_PokemonCenter_2F/header.inc b/data/maps/LavenderTown_PokemonCenter_2F/header.inc new file mode 100644 index 000000000..81e4c42e5 --- /dev/null +++ b/data/maps/LavenderTown_PokemonCenter_2F/header.inc @@ -0,0 +1,8 @@ +LavenderTown_PokemonCenter_2F:: @ 835107C + .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 + .4byte gMapEvents_LavenderTown_PokemonCenter_2F @ 0x83BA91C + .4byte gMapScripts_LavenderTown_PokemonCenter_2F @ 0x816B122 + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 9 + .byte 0x5c, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/LavenderTown_VolunteerPokemonHouse/header.inc b/data/maps/LavenderTown_VolunteerPokemonHouse/header.inc new file mode 100644 index 000000000..2d58479f3 --- /dev/null +++ b/data/maps/LavenderTown_VolunteerPokemonHouse/header.inc @@ -0,0 +1,8 @@ +LavenderTown_VolunteerPokemonHouse:: @ 8351098 + .4byte LavenderTown_VolunteerPokemonHouse_Layout @ 0x833ACC4 + .4byte gMapEvents_LavenderTown_VolunteerPokemonHouse @ 0x83BA9FC + .4byte gMapScripts_LavenderTown_VolunteerPokemonHouse @ 0x816B149 + .4byte NULL + .2byte BGM_FRLG_LAVENDER_TOWN + .2byte 274 + .byte 0x5c, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/MtEmber_Exterior/header.inc b/data/maps/MtEmber_Exterior/header.inc new file mode 100644 index 000000000..ef95fc172 --- /dev/null +++ b/data/maps/MtEmber_Exterior/header.inc @@ -0,0 +1,8 @@ +MtEmber_Exterior:: @ 834FCB0 + .4byte MtEmber_Exterior_Layout @ 0x833D660 + .4byte gMapEvents_MtEmber_Exterior @ 0x83B2C24 + .4byte gMapScripts_MtEmber_Exterior @ 0x8163946 + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 280 + .byte 0xaf, 0x00, 0x00, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/MtEmber_RubyPath_B1F/header.inc b/data/maps/MtEmber_RubyPath_B1F/header.inc new file mode 100644 index 000000000..bf10f81e3 --- /dev/null +++ b/data/maps/MtEmber_RubyPath_B1F/header.inc @@ -0,0 +1,8 @@ +MtEmber_RubyPath_B1F:: @ 834FD74 + .4byte MtEmber_RubyPath_B1F_Layout @ 0x833F524 + .4byte gMapEvents_MtEmber_RubyPath_B1F @ 0x83B2F64 + .4byte gMapScripts_MtEmber_RubyPath_B1F @ 0x8163C46 + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 286 + .byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/MtEmber_RubyPath_B1F_Stairs/header.inc b/data/maps/MtEmber_RubyPath_B1F_Stairs/header.inc new file mode 100644 index 000000000..8da609b21 --- /dev/null +++ b/data/maps/MtEmber_RubyPath_B1F_Stairs/header.inc @@ -0,0 +1,8 @@ +MtEmber_RubyPath_B1F_Stairs:: @ 834FDC8 + .4byte MtEmber_RubyPath_B1F_Stairs_Layout @ 0x833FCD8 + .4byte gMapEvents_MtEmber_RubyPath_B1F_Stairs @ 0x83B3188 + .4byte gMapScripts_MtEmber_RubyPath_B1F_Stairs @ 0x8163C6F + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 289 + .byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/MtEmber_RubyPath_B2F/header.inc b/data/maps/MtEmber_RubyPath_B2F/header.inc new file mode 100644 index 000000000..f390388e4 --- /dev/null +++ b/data/maps/MtEmber_RubyPath_B2F/header.inc @@ -0,0 +1,8 @@ +MtEmber_RubyPath_B2F:: @ 834FD90 + .4byte MtEmber_RubyPath_B2F_Layout @ 0x833F6A8 + .4byte gMapEvents_MtEmber_RubyPath_B2F @ 0x83B3030 + .4byte gMapScripts_MtEmber_RubyPath_B2F @ 0x8163C47 + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 287 + .byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/MtEmber_RubyPath_B2F_Stairs/header.inc b/data/maps/MtEmber_RubyPath_B2F_Stairs/header.inc new file mode 100644 index 000000000..1b502c77b --- /dev/null +++ b/data/maps/MtEmber_RubyPath_B2F_Stairs/header.inc @@ -0,0 +1,8 @@ +MtEmber_RubyPath_B2F_Stairs:: @ 834FDE4 + .4byte MtEmber_RubyPath_B2F_Stairs_Layout @ 0x833FD5C + .4byte gMapEvents_MtEmber_RubyPath_B2F_Stairs @ 0x83B31DC + .4byte gMapScripts_MtEmber_RubyPath_B2F_Stairs @ 0x8163C70 + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 290 + .byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/MtEmber_RubyPath_B3F/header.inc b/data/maps/MtEmber_RubyPath_B3F/header.inc new file mode 100644 index 000000000..d0936221e --- /dev/null +++ b/data/maps/MtEmber_RubyPath_B3F/header.inc @@ -0,0 +1,8 @@ +MtEmber_RubyPath_B3F:: @ 834FDAC + .4byte MtEmber_RubyPath_B3F_Layout @ 0x833FC60 + .4byte gMapEvents_MtEmber_RubyPath_B3F @ 0x83B314C + .4byte gMapScripts_MtEmber_RubyPath_B3F @ 0x8163C48 + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 288 + .byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/MtEmber_RubyPath_B4F/header.inc b/data/maps/MtEmber_RubyPath_B4F/header.inc new file mode 100644 index 000000000..b91482b18 --- /dev/null +++ b/data/maps/MtEmber_RubyPath_B4F/header.inc @@ -0,0 +1,8 @@ +MtEmber_RubyPath_B4F:: @ 834FC94 + .4byte MtEmber_RubyPath_B4F_Layout @ 0x8339290 + .4byte gMapEvents_MtEmber_RubyPath_B4F @ 0x83B29B8 + .4byte gMapScripts_MtEmber_RubyPath_B4F @ 0x81638EB + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 269 + .byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/MtEmber_RubyPath_B5F/header.inc b/data/maps/MtEmber_RubyPath_B5F/header.inc new file mode 100644 index 000000000..1a351c127 --- /dev/null +++ b/data/maps/MtEmber_RubyPath_B5F/header.inc @@ -0,0 +1,8 @@ +MtEmber_RubyPath_B5F:: @ 834FD3C + .4byte MtEmber_RubyPath_B5F_Layout @ 0x833FF60 + .4byte gMapEvents_MtEmber_RubyPath_B5F @ 0x83B2E3C + .4byte gMapScripts_MtEmber_RubyPath_B5F @ 0x8163BAA + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 291 + .byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/MtEmber_Summit/header.inc b/data/maps/MtEmber_Summit/header.inc new file mode 100644 index 000000000..367a35294 --- /dev/null +++ b/data/maps/MtEmber_Summit/header.inc @@ -0,0 +1,8 @@ +MtEmber_Summit:: @ 834FD20 + .4byte MtEmber_Summit_Layout @ 0x833D9C8 + .4byte gMapEvents_MtEmber_Summit @ 0x83B2DFC + .4byte gMapScripts_MtEmber_Summit @ 0x8163AFC + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 281 + .byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/MtEmber_SummitPath_1F/header.inc b/data/maps/MtEmber_SummitPath_1F/header.inc new file mode 100644 index 000000000..0ea8992a8 --- /dev/null +++ b/data/maps/MtEmber_SummitPath_1F/header.inc @@ -0,0 +1,8 @@ +MtEmber_SummitPath_1F:: @ 834FCCC + .4byte MtEmber_SummitPath_1F_Layout @ 0x833DC08 + .4byte gMapEvents_MtEmber_SummitPath_1F @ 0x83B2C48 + .4byte gMapScripts_MtEmber_SummitPath_1F @ 0x8163AF9 + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 282 + .byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/MtEmber_SummitPath_2F/header.inc b/data/maps/MtEmber_SummitPath_2F/header.inc new file mode 100644 index 000000000..503410f81 --- /dev/null +++ b/data/maps/MtEmber_SummitPath_2F/header.inc @@ -0,0 +1,8 @@ +MtEmber_SummitPath_2F:: @ 834FCE8 + .4byte MtEmber_SummitPath_2F_Layout @ 0x833ED6C + .4byte gMapEvents_MtEmber_SummitPath_2F @ 0x83B2D44 + .4byte gMapScripts_MtEmber_SummitPath_2F @ 0x8163AFA + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 283 + .byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/MtEmber_SummitPath_3F/header.inc b/data/maps/MtEmber_SummitPath_3F/header.inc new file mode 100644 index 000000000..35170cadb --- /dev/null +++ b/data/maps/MtEmber_SummitPath_3F/header.inc @@ -0,0 +1,8 @@ +MtEmber_SummitPath_3F:: @ 834FD04 + .4byte MtEmber_SummitPath_3F_Layout @ 0x833EEDC + .4byte gMapEvents_MtEmber_SummitPath_3F @ 0x83B2D68 + .4byte gMapScripts_MtEmber_SummitPath_3F @ 0x8163AFB + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 284 + .byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/MtMoon_1F/header.inc b/data/maps/MtMoon_1F/header.inc new file mode 100644 index 000000000..3c5cd8a69 --- /dev/null +++ b/data/maps/MtMoon_1F/header.inc @@ -0,0 +1,8 @@ +MtMoon_1F:: @ 834F230 + .4byte MtMoon_1F_Layout @ 0x82FA890 + .4byte gMapEvents_MtMoon_1F @ 0x83AE668 + .4byte gMapScripts_MtMoon_1F @ 0x81605E4 + .4byte NULL + .2byte BGM_FRLG_MT_MOON + .2byte 114 + .byte 0x7f, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/MtMoon_B1F/header.inc b/data/maps/MtMoon_B1F/header.inc new file mode 100644 index 000000000..718e761e4 --- /dev/null +++ b/data/maps/MtMoon_B1F/header.inc @@ -0,0 +1,8 @@ +MtMoon_B1F:: @ 834F24C + .4byte MtMoon_B1F_Layout @ 0x82FB804 + .4byte gMapEvents_MtMoon_B1F @ 0x83AE704 + .4byte gMapScripts_MtMoon_B1F @ 0x8160698 + .4byte NULL + .2byte BGM_FRLG_MT_MOON + .2byte 115 + .byte 0x7f, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/MtMoon_B2F/header.inc b/data/maps/MtMoon_B2F/header.inc new file mode 100644 index 000000000..90329479b --- /dev/null +++ b/data/maps/MtMoon_B2F/header.inc @@ -0,0 +1,8 @@ +MtMoon_B2F:: @ 834F268 + .4byte MtMoon_B2F_Layout @ 0x82FC728 + .4byte gMapEvents_MtMoon_B2F @ 0x83AE868 + .4byte gMapScripts_MtMoon_B2F @ 0x8160699 + .4byte NULL + .2byte BGM_FRLG_MT_MOON + .2byte 116 + .byte 0x7f, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/NavelRock_1F/header.inc b/data/maps/NavelRock_1F/header.inc new file mode 100644 index 000000000..ec20cfcb6 --- /dev/null +++ b/data/maps/NavelRock_1F/header.inc @@ -0,0 +1,8 @@ +NavelRock_1F:: @ 8350378 + .4byte NavelRock_1F_Layout @ 0x8348AD4 + .4byte gMapEvents_NavelRock_1F @ 0x83B48E0 + .4byte gMapScripts_NavelRock_1F @ 0x8164F9E + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 344 + .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/NavelRock_B1F/header.inc b/data/maps/NavelRock_B1F/header.inc new file mode 100644 index 000000000..433e62694 --- /dev/null +++ b/data/maps/NavelRock_B1F/header.inc @@ -0,0 +1,8 @@ +NavelRock_B1F:: @ 8350570 + .4byte NavelRock_B1F_Layout @ 0x834A210 + .4byte gMapEvents_NavelRock_B1F @ 0x83B4BA4 + .4byte gMapScripts_NavelRock_B1F @ 0x8165201 + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 364 + .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/NavelRock_Base/header.inc b/data/maps/NavelRock_Base/header.inc new file mode 100644 index 000000000..bf472a849 --- /dev/null +++ b/data/maps/NavelRock_Base/header.inc @@ -0,0 +1,8 @@ +NavelRock_Base:: @ 83503B0 + .4byte NavelRock_Base_Layout @ 0x834929C + .4byte gMapEvents_NavelRock_Base @ 0x83B4964 + .4byte gMapScripts_NavelRock_Base @ 0x81650E7 + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 346 + .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/NavelRock_BasePath_B10F/header.inc b/data/maps/NavelRock_BasePath_B10F/header.inc new file mode 100644 index 000000000..e08eb617b --- /dev/null +++ b/data/maps/NavelRock_BasePath_B10F/header.inc @@ -0,0 +1,8 @@ +NavelRock_BasePath_B10F:: @ 8350538 + .4byte NavelRock_BasePath_B10F_Layout @ 0x8349A0C + .4byte gMapEvents_NavelRock_BasePath_B10F @ 0x83B4B5C + .4byte gMapScripts_NavelRock_BasePath_B10F @ 0x81651FF + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 360 + .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/NavelRock_BasePath_B11F/header.inc b/data/maps/NavelRock_BasePath_B11F/header.inc new file mode 100644 index 000000000..5803aa630 --- /dev/null +++ b/data/maps/NavelRock_BasePath_B11F/header.inc @@ -0,0 +1,8 @@ +NavelRock_BasePath_B11F:: @ 8350554 + .4byte NavelRock_BasePath_B11F_Layout @ 0x8349A94 + .4byte gMapEvents_NavelRock_BasePath_B11F @ 0x83B4B80 + .4byte gMapScripts_NavelRock_BasePath_B11F @ 0x8165200 + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 361 + .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/NavelRock_BasePath_B1F/header.inc b/data/maps/NavelRock_BasePath_B1F/header.inc new file mode 100644 index 000000000..e34db29ef --- /dev/null +++ b/data/maps/NavelRock_BasePath_B1F/header.inc @@ -0,0 +1,8 @@ +NavelRock_BasePath_B1F:: @ 835043C + .4byte NavelRock_BasePath_B1F_Layout @ 0x8349544 + .4byte gMapEvents_NavelRock_BasePath_B1F @ 0x83B4A18 + .4byte gMapScripts_NavelRock_BasePath_B1F @ 0x81651F6 + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 351 + .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/NavelRock_BasePath_B2F/header.inc b/data/maps/NavelRock_BasePath_B2F/header.inc new file mode 100644 index 000000000..bf0cc1d19 --- /dev/null +++ b/data/maps/NavelRock_BasePath_B2F/header.inc @@ -0,0 +1,8 @@ +NavelRock_BasePath_B2F:: @ 8350458 + .4byte NavelRock_BasePath_B2F_Layout @ 0x83495CC + .4byte gMapEvents_NavelRock_BasePath_B2F @ 0x83B4A3C + .4byte gMapScripts_NavelRock_BasePath_B2F @ 0x81651F7 + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 352 + .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/NavelRock_BasePath_B3F/header.inc b/data/maps/NavelRock_BasePath_B3F/header.inc new file mode 100644 index 000000000..9a85457ec --- /dev/null +++ b/data/maps/NavelRock_BasePath_B3F/header.inc @@ -0,0 +1,8 @@ +NavelRock_BasePath_B3F:: @ 8350474 + .4byte NavelRock_BasePath_B3F_Layout @ 0x8349654 + .4byte gMapEvents_NavelRock_BasePath_B3F @ 0x83B4A60 + .4byte gMapScripts_NavelRock_BasePath_B3F @ 0x81651F8 + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 353 + .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/NavelRock_BasePath_B4F/header.inc b/data/maps/NavelRock_BasePath_B4F/header.inc new file mode 100644 index 000000000..75ea7719a --- /dev/null +++ b/data/maps/NavelRock_BasePath_B4F/header.inc @@ -0,0 +1,8 @@ +NavelRock_BasePath_B4F:: @ 8350490 + .4byte NavelRock_BasePath_B4F_Layout @ 0x83496DC + .4byte gMapEvents_NavelRock_BasePath_B4F @ 0x83B4A84 + .4byte gMapScripts_NavelRock_BasePath_B4F @ 0x81651F9 + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 354 + .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/NavelRock_BasePath_B5F/header.inc b/data/maps/NavelRock_BasePath_B5F/header.inc new file mode 100644 index 000000000..8cc359f34 --- /dev/null +++ b/data/maps/NavelRock_BasePath_B5F/header.inc @@ -0,0 +1,8 @@ +NavelRock_BasePath_B5F:: @ 83504AC + .4byte NavelRock_BasePath_B5F_Layout @ 0x8349764 + .4byte gMapEvents_NavelRock_BasePath_B5F @ 0x83B4AA8 + .4byte gMapScripts_NavelRock_BasePath_B5F @ 0x81651FA + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 355 + .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/NavelRock_BasePath_B6F/header.inc b/data/maps/NavelRock_BasePath_B6F/header.inc new file mode 100644 index 000000000..d69c50370 --- /dev/null +++ b/data/maps/NavelRock_BasePath_B6F/header.inc @@ -0,0 +1,8 @@ +NavelRock_BasePath_B6F:: @ 83504C8 + .4byte NavelRock_BasePath_B6F_Layout @ 0x83497EC + .4byte gMapEvents_NavelRock_BasePath_B6F @ 0x83B4ACC + .4byte gMapScripts_NavelRock_BasePath_B6F @ 0x81651FB + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 356 + .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/NavelRock_BasePath_B7F/header.inc b/data/maps/NavelRock_BasePath_B7F/header.inc new file mode 100644 index 000000000..409329aee --- /dev/null +++ b/data/maps/NavelRock_BasePath_B7F/header.inc @@ -0,0 +1,8 @@ +NavelRock_BasePath_B7F:: @ 83504E4 + .4byte NavelRock_BasePath_B7F_Layout @ 0x8349874 + .4byte gMapEvents_NavelRock_BasePath_B7F @ 0x83B4AF0 + .4byte gMapScripts_NavelRock_BasePath_B7F @ 0x81651FC + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 357 + .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/NavelRock_BasePath_B8F/header.inc b/data/maps/NavelRock_BasePath_B8F/header.inc new file mode 100644 index 000000000..22015b53c --- /dev/null +++ b/data/maps/NavelRock_BasePath_B8F/header.inc @@ -0,0 +1,8 @@ +NavelRock_BasePath_B8F:: @ 8350500 + .4byte NavelRock_BasePath_B8F_Layout @ 0x83498FC + .4byte gMapEvents_NavelRock_BasePath_B8F @ 0x83B4B14 + .4byte gMapScripts_NavelRock_BasePath_B8F @ 0x81651FD + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 358 + .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/NavelRock_BasePath_B9F/header.inc b/data/maps/NavelRock_BasePath_B9F/header.inc new file mode 100644 index 000000000..84f332175 --- /dev/null +++ b/data/maps/NavelRock_BasePath_B9F/header.inc @@ -0,0 +1,8 @@ +NavelRock_BasePath_B9F:: @ 835051C + .4byte NavelRock_BasePath_B9F_Layout @ 0x8349984 + .4byte gMapEvents_NavelRock_BasePath_B9F @ 0x83B4B38 + .4byte gMapScripts_NavelRock_BasePath_B9F @ 0x81651FE + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 359 + .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/NavelRock_Exterior/header.inc b/data/maps/NavelRock_Exterior/header.inc new file mode 100644 index 000000000..24326d2bf --- /dev/null +++ b/data/maps/NavelRock_Exterior/header.inc @@ -0,0 +1,8 @@ +NavelRock_Exterior:: @ 834FF88 + .4byte NavelRock_Exterior_Layout @ 0x834873C + .4byte gMapEvents_NavelRock_Exterior @ 0x83B3B74 + .4byte gMapScripts_NavelRock_Exterior @ 0x81646AE + .4byte NULL + .2byte BGM_FRLG_SEVII_ISLANDS + .2byte 343 + .byte 0xae, 0x00, 0x00, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/NavelRock_Fork/header.inc b/data/maps/NavelRock_Fork/header.inc new file mode 100644 index 000000000..4d2dc4238 --- /dev/null +++ b/data/maps/NavelRock_Fork/header.inc @@ -0,0 +1,8 @@ +NavelRock_Fork:: @ 835058C + .4byte NavelRock_Fork_Layout @ 0x834B9A4 + .4byte gMapEvents_NavelRock_Fork @ 0x83B4BD0 + .4byte gMapScripts_NavelRock_Fork @ 0x8165202 + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 365 + .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/NavelRock_Harbor/header.inc b/data/maps/NavelRock_Harbor/header.inc new file mode 100644 index 000000000..2a6e89bbe --- /dev/null +++ b/data/maps/NavelRock_Harbor/header.inc @@ -0,0 +1,8 @@ +NavelRock_Harbor:: @ 83505FC + .4byte Island_Harbor_Layout @ 0x8343FB8 + .4byte gMapEvents_NavelRock_Harbor @ 0x83B4D70 + .4byte gMapScripts_NavelRock_Harbor @ 0x8165420 + .4byte NULL + .2byte BGM_FRLG_SEVII_ISLANDS + .2byte 315 + .byte 0xae, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/NavelRock_Summit/header.inc b/data/maps/NavelRock_Summit/header.inc new file mode 100644 index 000000000..39b0c4d8f --- /dev/null +++ b/data/maps/NavelRock_Summit/header.inc @@ -0,0 +1,8 @@ +NavelRock_Summit:: @ 8350394 + .4byte NavelRock_Summit_Layout @ 0x8348EB0 + .4byte gMapEvents_NavelRock_Summit @ 0x83B4930 + .4byte gMapScripts_NavelRock_Summit @ 0x8164F9F + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 345 + .byte 0xae, 0x00, 0x0b, 0x04, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/NavelRock_SummitPath_2F/header.inc b/data/maps/NavelRock_SummitPath_2F/header.inc new file mode 100644 index 000000000..bc56502b3 --- /dev/null +++ b/data/maps/NavelRock_SummitPath_2F/header.inc @@ -0,0 +1,8 @@ +NavelRock_SummitPath_2F:: @ 83503CC + .4byte NavelRock_SummitPath_2F_Layout @ 0x8349324 + .4byte gMapEvents_NavelRock_SummitPath_2F @ 0x83B4988 + .4byte gMapScripts_NavelRock_SummitPath_2F @ 0x81651F2 + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 347 + .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/NavelRock_SummitPath_3F/header.inc b/data/maps/NavelRock_SummitPath_3F/header.inc new file mode 100644 index 000000000..3454ffd77 --- /dev/null +++ b/data/maps/NavelRock_SummitPath_3F/header.inc @@ -0,0 +1,8 @@ +NavelRock_SummitPath_3F:: @ 83503E8 + .4byte NavelRock_SummitPath_3F_Layout @ 0x83493AC + .4byte gMapEvents_NavelRock_SummitPath_3F @ 0x83B49AC + .4byte gMapScripts_NavelRock_SummitPath_3F @ 0x81651F3 + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 348 + .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/NavelRock_SummitPath_4F/header.inc b/data/maps/NavelRock_SummitPath_4F/header.inc new file mode 100644 index 000000000..996b28555 --- /dev/null +++ b/data/maps/NavelRock_SummitPath_4F/header.inc @@ -0,0 +1,8 @@ +NavelRock_SummitPath_4F:: @ 8350404 + .4byte NavelRock_SummitPath_4F_Layout @ 0x8349434 + .4byte gMapEvents_NavelRock_SummitPath_4F @ 0x83B49D0 + .4byte gMapScripts_NavelRock_SummitPath_4F @ 0x81651F4 + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 349 + .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/NavelRock_SummitPath_5F/header.inc b/data/maps/NavelRock_SummitPath_5F/header.inc new file mode 100644 index 000000000..5beffe449 --- /dev/null +++ b/data/maps/NavelRock_SummitPath_5F/header.inc @@ -0,0 +1,8 @@ +NavelRock_SummitPath_5F:: @ 8350420 + .4byte NavelRock_SummitPath_5F_Layout @ 0x83494BC + .4byte gMapEvents_NavelRock_SummitPath_5F @ 0x83B49F4 + .4byte gMapScripts_NavelRock_SummitPath_5F @ 0x81651F5 + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 350 + .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/OneIsland/connections.inc b/data/maps/OneIsland/connections.inc new file mode 100644 index 000000000..0b3fa21bf --- /dev/null +++ b/data/maps/OneIsland/connections.inc @@ -0,0 +1,7 @@ +OneIsland_MapConnectionsList: @ 8352934 + connection down, 0, MAP_ONEISLAND_TREASUREBEACH + connection right, -120, MAP_ONEISLAND_KINDLEROAD + +OneIsland_MapConnections:: @ 835294C + .4byte 2 + .4byte OneIsland_MapConnectionsList diff --git a/data/maps/OneIsland/header.inc b/data/maps/OneIsland/header.inc new file mode 100644 index 000000000..f54c47e14 --- /dev/null +++ b/data/maps/OneIsland/header.inc @@ -0,0 +1,8 @@ +OneIsland:: @ 8350768 + .4byte OneIsland_Layout @ 0x8321714 + .4byte gMapEvents_OneIsland @ 0x83B5F44 + .4byte gMapScripts_OneIsland @ 0x8167484 + .4byte OneIsland_MapConnections @ 0x835294C + .2byte BGM_FRLG_ISLAND_ONE + .2byte 230 + .byte 0x8f, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/OneIsland_Harbor/header.inc b/data/maps/OneIsland_Harbor/header.inc new file mode 100644 index 000000000..0a39c9134 --- /dev/null +++ b/data/maps/OneIsland_Harbor/header.inc @@ -0,0 +1,8 @@ +OneIsland_Harbor:: @ 8351BDC + .4byte Island_Harbor_Layout @ 0x8343FB8 + .4byte gMapEvents_OneIsland_Harbor @ 0x83BE558 + .4byte gMapScripts_OneIsland_Harbor @ 0x8171378 + .4byte NULL + .2byte BGM_FRLG_ISLAND_ONE + .2byte 315 + .byte 0x8f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/OneIsland_House1/header.inc b/data/maps/OneIsland_House1/header.inc new file mode 100644 index 000000000..3c8db882b --- /dev/null +++ b/data/maps/OneIsland_House1/header.inc @@ -0,0 +1,8 @@ +OneIsland_House1:: @ 8351BA4 + .4byte House3_Layout @ 0x82D5CB8 + .4byte gMapEvents_OneIsland_House1 @ 0x83BE4D8 + .4byte gMapScripts_OneIsland_House1 @ 0x817135B + .4byte NULL + .2byte BGM_FRLG_ISLAND_ONE + .2byte 11 + .byte 0x8f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/OneIsland_House2/header.inc b/data/maps/OneIsland_House2/header.inc new file mode 100644 index 000000000..7df223934 --- /dev/null +++ b/data/maps/OneIsland_House2/header.inc @@ -0,0 +1,8 @@ +OneIsland_House2:: @ 8351BC0 + .4byte House3_Layout @ 0x82D5CB8 + .4byte gMapEvents_OneIsland_House2 @ 0x83BE50C + .4byte gMapScripts_OneIsland_House2 @ 0x817136E + .4byte NULL + .2byte BGM_FRLG_ISLAND_ONE + .2byte 11 + .byte 0x8f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/OneIsland_KindleRoad/connections.inc b/data/maps/OneIsland_KindleRoad/connections.inc new file mode 100644 index 000000000..a71c8d6cd --- /dev/null +++ b/data/maps/OneIsland_KindleRoad/connections.inc @@ -0,0 +1,6 @@ +OneIsland_KindleRoad_MapConnectionsList: @ 8352D1C + connection left, 120, MAP_ONEISLAND + +OneIsland_KindleRoad_MapConnections:: @ 8352D28 + .4byte 1 + .4byte OneIsland_KindleRoad_MapConnectionsList diff --git a/data/maps/OneIsland_KindleRoad/header.inc b/data/maps/OneIsland_KindleRoad/header.inc new file mode 100644 index 000000000..b1c68b719 --- /dev/null +++ b/data/maps/OneIsland_KindleRoad/header.inc @@ -0,0 +1,8 @@ +OneIsland_KindleRoad:: @ 8350B04 + .4byte OneIsland_KindleRoad_Layout @ 0x8325D70 + .4byte gMapEvents_OneIsland_KindleRoad @ 0x83B888C + .4byte gMapScripts_OneIsland_KindleRoad @ 0x8168758 + .4byte OneIsland_KindleRoad_MapConnections @ 0x8352D28 + .2byte BGM_FRLG_ROUTE_3 + .2byte 237 + .byte 0x96, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/OneIsland_KindleRoad_EmberSpa/header.inc b/data/maps/OneIsland_KindleRoad_EmberSpa/header.inc new file mode 100644 index 000000000..b9be8bb22 --- /dev/null +++ b/data/maps/OneIsland_KindleRoad_EmberSpa/header.inc @@ -0,0 +1,8 @@ +OneIsland_KindleRoad_EmberSpa:: @ 83505C4 + .4byte OneIsland_KindleRoad_EmberSpa_Layout @ 0x834EB70 + .4byte gMapEvents_OneIsland_KindleRoad_EmberSpa @ 0x83B4CD8 + .4byte gMapScripts_OneIsland_KindleRoad_EmberSpa @ 0x816535B + .4byte NULL + .2byte BGM_FRLG_CERULEAN_CITY + .2byte 383 + .byte 0xc3, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/OneIsland_PokemonCenter_1F/header.inc b/data/maps/OneIsland_PokemonCenter_1F/header.inc new file mode 100644 index 000000000..53afa9da1 --- /dev/null +++ b/data/maps/OneIsland_PokemonCenter_1F/header.inc @@ -0,0 +1,8 @@ +OneIsland_PokemonCenter_1F:: @ 8351B6C + .4byte OneIsland_PokemonCenter_1F_Layout @ 0x833A970 + .4byte gMapEvents_OneIsland_PokemonCenter_1F @ 0x83BE400 + .4byte gMapScripts_OneIsland_PokemonCenter_1F @ 0x8170BF8 + .4byte NULL + .2byte BGM_FRLG_POKEMON_NETWORK_CENTER + .2byte 271 + .byte 0x8f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/OneIsland_PokemonCenter_2F/header.inc b/data/maps/OneIsland_PokemonCenter_2F/header.inc new file mode 100644 index 000000000..87fa3c548 --- /dev/null +++ b/data/maps/OneIsland_PokemonCenter_2F/header.inc @@ -0,0 +1,8 @@ +OneIsland_PokemonCenter_2F:: @ 8351B88 + .4byte OneIsland_PokemonCenter_2F_Layout @ 0x8344108 + .4byte gMapEvents_OneIsland_PokemonCenter_2F @ 0x83BE48C + .4byte gMapScripts_OneIsland_PokemonCenter_2F @ 0x8171334 + .4byte NULL + .2byte BGM_FRLG_POKEMON_NETWORK_CENTER + .2byte 316 + .byte 0x8f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/OneIsland_TreasureBeach/connections.inc b/data/maps/OneIsland_TreasureBeach/connections.inc new file mode 100644 index 000000000..6ebdc935b --- /dev/null +++ b/data/maps/OneIsland_TreasureBeach/connections.inc @@ -0,0 +1,6 @@ +OneIsland_TreasureBeach_MapConnectionsList: @ 8352D30 + connection up, 0, MAP_ONEISLAND + +OneIsland_TreasureBeach_MapConnections:: @ 8352D3C + .4byte 1 + .4byte OneIsland_TreasureBeach_MapConnectionsList diff --git a/data/maps/OneIsland_TreasureBeach/header.inc b/data/maps/OneIsland_TreasureBeach/header.inc new file mode 100644 index 000000000..203c7a407 --- /dev/null +++ b/data/maps/OneIsland_TreasureBeach/header.inc @@ -0,0 +1,8 @@ +OneIsland_TreasureBeach:: @ 8350B20 + .4byte OneIsland_TreasureBeach_Layout @ 0x8326514 + .4byte gMapEvents_OneIsland_TreasureBeach @ 0x83B8930 + .4byte gMapScripts_OneIsland_TreasureBeach @ 0x816876B + .4byte OneIsland_TreasureBeach_MapConnections @ 0x8352D3C + .2byte BGM_FRLG_ROUTE_3 + .2byte 238 + .byte 0x97, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/PalletTown/connections.inc b/data/maps/PalletTown/connections.inc new file mode 100644 index 000000000..2a539818b --- /dev/null +++ b/data/maps/PalletTown/connections.inc @@ -0,0 +1,7 @@ +PalletTown_MapConnectionsList: @ 8352754 + connection up, 0, MAP_ROUTE1 + connection down, 0, MAP_ROUTE21_NORTH + +PalletTown_MapConnections:: @ 835276C + .4byte 2 + .4byte PalletTown_MapConnectionsList diff --git a/data/maps/PalletTown/header.inc b/data/maps/PalletTown/header.inc new file mode 100644 index 000000000..f148906c6 --- /dev/null +++ b/data/maps/PalletTown/header.inc @@ -0,0 +1,8 @@ +PalletTown:: @ 8350618 + .4byte PalletTown_Layout @ 0x82DD4C0 + .4byte gMapEvents_PalletTown @ 0x83B4E50 + .4byte gMapScripts_PalletTown @ 0x816545A + .4byte PalletTown_MapConnections @ 0x835276C + .2byte BGM_FRLG_PALLET_TOWN + .2byte 78 + .byte 0x58, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/PalletTown_GarysHouse/header.inc b/data/maps/PalletTown_GarysHouse/header.inc new file mode 100644 index 000000000..6179b28ee --- /dev/null +++ b/data/maps/PalletTown_GarysHouse/header.inc @@ -0,0 +1,8 @@ +PalletTown_GarysHouse:: @ 8350D88 + .4byte PalletTown_GarysHouse_Layout @ 0x82D5424 + .4byte gMapEvents_PalletTown_GarysHouse @ 0x83B980C + .4byte gMapScripts_PalletTown_GarysHouse @ 0x8168D27 + .4byte NULL + .2byte BGM_FRLG_PALLET_TOWN + .2byte 3 + .byte 0x58, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/PalletTown_PlayersHouse_1F/header.inc b/data/maps/PalletTown_PlayersHouse_1F/header.inc new file mode 100644 index 000000000..48c815047 --- /dev/null +++ b/data/maps/PalletTown_PlayersHouse_1F/header.inc @@ -0,0 +1,8 @@ +PalletTown_PlayersHouse_1F:: @ 8350D50 + .4byte PalletTown_PlayersHouse_1F_Layout @ 0x82D5200 + .4byte gMapEvents_PalletTown_PlayersHouse_1F @ 0x83B974C + .4byte gMapScripts_PalletTown_PlayersHouse_1F @ 0x8168C08 + .4byte NULL + .2byte BGM_FRLG_PALLET_TOWN + .2byte 1 + .byte 0x58, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/PalletTown_PlayersHouse_2F/header.inc b/data/maps/PalletTown_PlayersHouse_2F/header.inc new file mode 100644 index 000000000..5b99b625d --- /dev/null +++ b/data/maps/PalletTown_PlayersHouse_2F/header.inc @@ -0,0 +1,8 @@ +PalletTown_PlayersHouse_2F:: @ 8350D6C + .4byte PalletTown_PlayersHouse_2F_Layout @ 0x82D52FC + .4byte gMapEvents_PalletTown_PlayersHouse_2F @ 0x83B978C + .4byte gMapScripts_PalletTown_PlayersHouse_2F @ 0x8168CA3 + .4byte NULL + .2byte BGM_FRLG_PALLET_TOWN + .2byte 2 + .byte 0x58, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/PalletTown_ProfessorOaksLab/header.inc b/data/maps/PalletTown_ProfessorOaksLab/header.inc new file mode 100644 index 000000000..226e0ce92 --- /dev/null +++ b/data/maps/PalletTown_ProfessorOaksLab/header.inc @@ -0,0 +1,8 @@ +PalletTown_ProfessorOaksLab:: @ 8350DA4 + .4byte PalletTown_ProfessorOaksLab_Layout @ 0x82D5668 + .4byte gMapEvents_PalletTown_ProfessorOaksLab @ 0x83B99B8 + .4byte gMapScripts_PalletTown_ProfessorOaksLab @ 0x8168F7E + .4byte NULL + .2byte BGM_FRLG_OAK_LAB + .2byte 5 + .byte 0x58, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/PewterCity/connections.inc b/data/maps/PewterCity/connections.inc new file mode 100644 index 000000000..52933c5ff --- /dev/null +++ b/data/maps/PewterCity/connections.inc @@ -0,0 +1,7 @@ +PewterCity_MapConnectionsList: @ 83527A0 + connection down, 12, MAP_ROUTE2 + connection right, 10, MAP_ROUTE3 + +PewterCity_MapConnections:: @ 83527B8 + .4byte 2 + .4byte PewterCity_MapConnectionsList diff --git a/data/maps/PewterCity/header.inc b/data/maps/PewterCity/header.inc new file mode 100644 index 000000000..9fcbb10ed --- /dev/null +++ b/data/maps/PewterCity/header.inc @@ -0,0 +1,8 @@ +PewterCity:: @ 8350650 + .4byte PewterCity_Layout @ 0x82DF308 + .4byte gMapEvents_PewterCity @ 0x83B518C + .4byte gMapScripts_PewterCity @ 0x8165B8E + .4byte PewterCity_MapConnections @ 0x83527B8 + .2byte BGM_FRLG_VIRIDIAN_CITY + .2byte 80 + .byte 0x5a, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/PewterCity_Gym/header.inc b/data/maps/PewterCity_Gym/header.inc new file mode 100644 index 000000000..4d8348987 --- /dev/null +++ b/data/maps/PewterCity_Gym/header.inc @@ -0,0 +1,8 @@ +PewterCity_Gym:: @ 8350EA0 + .4byte PewterCity_Gym_Layout @ 0x82D732C + .4byte gMapEvents_PewterCity_Gym @ 0x83BA058 + .4byte gMapScripts_PewterCity_Gym @ 0x816A592 + .4byte NULL + .2byte BGM_FRLG_GYM + .2byte 28 + .byte 0x5a, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01 diff --git a/data/maps/PewterCity_House1/header.inc b/data/maps/PewterCity_House1/header.inc new file mode 100644 index 000000000..547b7ca0c --- /dev/null +++ b/data/maps/PewterCity_House1/header.inc @@ -0,0 +1,8 @@ +PewterCity_House1:: @ 8350ED8 + .4byte House2_Layout @ 0x82D5840 + .4byte gMapEvents_PewterCity_House1 @ 0x83BA140 + .4byte gMapScripts_PewterCity_House1 @ 0x816A71C + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_CITY + .2byte 7 + .byte 0x5a, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/PewterCity_House2/header.inc b/data/maps/PewterCity_House2/header.inc new file mode 100644 index 000000000..a793efd1c --- /dev/null +++ b/data/maps/PewterCity_House2/header.inc @@ -0,0 +1,8 @@ +PewterCity_House2:: @ 8350F2C + .4byte House2_Layout @ 0x82D5840 + .4byte gMapEvents_PewterCity_House2 @ 0x83BA304 + .4byte gMapScripts_PewterCity_House2 @ 0x816A7DC + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_CITY + .2byte 7 + .byte 0x5a, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/PewterCity_Mart/header.inc b/data/maps/PewterCity_Mart/header.inc new file mode 100644 index 000000000..ec685db00 --- /dev/null +++ b/data/maps/PewterCity_Mart/header.inc @@ -0,0 +1,8 @@ +PewterCity_Mart:: @ 8350EBC + .4byte Mart_Layout @ 0x82D5BCC + .4byte gMapEvents_PewterCity_Mart @ 0x83BA0CC + .4byte gMapScripts_PewterCity_Mart @ 0x816A6CD + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 10 + .byte 0x5a, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/PewterCity_Museum_1F/header.inc b/data/maps/PewterCity_Museum_1F/header.inc new file mode 100644 index 000000000..255e31980 --- /dev/null +++ b/data/maps/PewterCity_Museum_1F/header.inc @@ -0,0 +1,8 @@ +PewterCity_Museum_1F:: @ 8350E68 + .4byte PewterCity_Museum_1F_Layout @ 0x831A1FC + .4byte gMapEvents_PewterCity_Museum_1F @ 0x83B9ED8 + .4byte gMapScripts_PewterCity_Museum_1F @ 0x816A31A + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_CITY + .2byte 180 + .byte 0x5a, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/PewterCity_Museum_2F/header.inc b/data/maps/PewterCity_Museum_2F/header.inc new file mode 100644 index 000000000..6b6c397ed --- /dev/null +++ b/data/maps/PewterCity_Museum_2F/header.inc @@ -0,0 +1,8 @@ +PewterCity_Museum_2F:: @ 8350E84 + .4byte PewterCity_Museum_2F_Layout @ 0x831A39C + .4byte gMapEvents_PewterCity_Museum_2F @ 0x83B9FCC + .4byte gMapScripts_PewterCity_Museum_2F @ 0x816A552 + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_CITY + .2byte 181 + .byte 0x5a, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/PewterCity_PokemonCenter_1F/header.inc b/data/maps/PewterCity_PokemonCenter_1F/header.inc new file mode 100644 index 000000000..89d2f8208 --- /dev/null +++ b/data/maps/PewterCity_PokemonCenter_1F/header.inc @@ -0,0 +1,8 @@ +PewterCity_PokemonCenter_1F:: @ 8350EF4 + .4byte PokemonCenter_1F_Layout @ 0x82D5990 + .4byte gMapEvents_PewterCity_PokemonCenter_1F @ 0x83BA21C + .4byte gMapScripts_PewterCity_PokemonCenter_1F @ 0x816A760 + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 8 + .byte 0x5a, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/PewterCity_PokemonCenter_2F/header.inc b/data/maps/PewterCity_PokemonCenter_2F/header.inc new file mode 100644 index 000000000..39b506417 --- /dev/null +++ b/data/maps/PewterCity_PokemonCenter_2F/header.inc @@ -0,0 +1,8 @@ +PewterCity_PokemonCenter_2F:: @ 8350F10 + .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 + .4byte gMapEvents_PewterCity_PokemonCenter_2F @ 0x83BA2A8 + .4byte gMapScripts_PewterCity_PokemonCenter_2F @ 0x816A7B5 + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 9 + .byte 0x5a, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/PokemonLeague_AgathasRoom/header.inc b/data/maps/PokemonLeague_AgathasRoom/header.inc new file mode 100644 index 000000000..a5f4c703b --- /dev/null +++ b/data/maps/PokemonLeague_AgathasRoom/header.inc @@ -0,0 +1,8 @@ +PokemonLeague_AgathasRoom:: @ 834FA80 + .4byte PokemonLeague_AgathasRoom_Layout @ 0x831F468 + .4byte gMapEvents_PokemonLeague_AgathasRoom @ 0x83B1928 + .4byte gMapScripts_PokemonLeague_AgathasRoom @ 0x8162810 + .4byte NULL + .2byte BGM_FRLG_POKEMON_TOWER + .2byte 215 + .byte 0x89, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x06 diff --git a/data/maps/PokemonLeague_BrunosRoom/header.inc b/data/maps/PokemonLeague_BrunosRoom/header.inc new file mode 100644 index 000000000..b8fa38018 --- /dev/null +++ b/data/maps/PokemonLeague_BrunosRoom/header.inc @@ -0,0 +1,8 @@ +PokemonLeague_BrunosRoom:: @ 834FA64 + .4byte PokemonLeague_BrunosRoom_Layout @ 0x831F2F0 + .4byte gMapEvents_PokemonLeague_BrunosRoom @ 0x83B18EC + .4byte gMapScripts_PokemonLeague_BrunosRoom @ 0x8162685 + .4byte NULL + .2byte BGM_FRLG_ROCKET_HIDEOUT + .2byte 214 + .byte 0x89, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x05 diff --git a/data/maps/PokemonLeague_ChampionsRoom/header.inc b/data/maps/PokemonLeague_ChampionsRoom/header.inc new file mode 100644 index 000000000..f08a9d072 --- /dev/null +++ b/data/maps/PokemonLeague_ChampionsRoom/header.inc @@ -0,0 +1,8 @@ +PokemonLeague_ChampionsRoom:: @ 834FAB8 + .4byte PokemonLeague_ChampionsRoom_Layout @ 0x831FBF8 + .4byte gMapEvents_PokemonLeague_ChampionsRoom @ 0x83B19B8 + .4byte gMapScripts_PokemonLeague_ChampionsRoom @ 0x8162AE2 + .4byte NULL + .2byte BGM_FRLG_INDIGO_PLATEAU + .2byte 217 + .byte 0x89, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/PokemonLeague_HallOfFame/header.inc b/data/maps/PokemonLeague_HallOfFame/header.inc new file mode 100644 index 000000000..0b1464dbb --- /dev/null +++ b/data/maps/PokemonLeague_HallOfFame/header.inc @@ -0,0 +1,8 @@ +PokemonLeague_HallOfFame:: @ 834FAD4 + .4byte PokemonLeague_HallOfFame_Layout @ 0x831FD3C + .4byte gMapEvents_PokemonLeague_HallOfFame @ 0x83B19EC + .4byte gMapScripts_PokemonLeague_HallOfFame @ 0x8162D4C + .4byte NULL + .2byte BGM_FRLG_HALL_OF_FAME_PALLET_TOWN + .2byte 218 + .byte 0x89, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/PokemonLeague_LancesRoom/header.inc b/data/maps/PokemonLeague_LancesRoom/header.inc new file mode 100644 index 000000000..ac970db8f --- /dev/null +++ b/data/maps/PokemonLeague_LancesRoom/header.inc @@ -0,0 +1,8 @@ +PokemonLeague_LancesRoom:: @ 834FA9C + .4byte PokemonLeague_LancesRoom_Layout @ 0x831F9CC + .4byte gMapEvents_PokemonLeague_LancesRoom @ 0x83B1964 + .4byte gMapScripts_PokemonLeague_LancesRoom @ 0x816292D + .4byte NULL + .2byte BGM_FRLG_INDIGO_PLATEAU + .2byte 216 + .byte 0x89, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x07 diff --git a/data/maps/PokemonLeague_LoreleisRoom/header.inc b/data/maps/PokemonLeague_LoreleisRoom/header.inc new file mode 100644 index 000000000..01f12285b --- /dev/null +++ b/data/maps/PokemonLeague_LoreleisRoom/header.inc @@ -0,0 +1,8 @@ +PokemonLeague_LoreleisRoom:: @ 834FA48 + .4byte PokemonLeague_LoreleisRoom_Layout @ 0x831F178 + .4byte gMapEvents_PokemonLeague_LoreleisRoom @ 0x83B18B0 + .4byte gMapScripts_PokemonLeague_LoreleisRoom @ 0x816256C + .4byte NULL + .2byte BGM_FRLG_GYM + .2byte 213 + .byte 0x89, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x04 diff --git a/data/maps/PokemonMansion_1F/header.inc b/data/maps/PokemonMansion_1F/header.inc new file mode 100644 index 000000000..167c4d42b --- /dev/null +++ b/data/maps/PokemonMansion_1F/header.inc @@ -0,0 +1,8 @@ +PokemonMansion_1F:: @ 834F888 + .4byte PokemonMansion_1F_Layout @ 0x830AE3C + .4byte gMapEvents_PokemonMansion_1F @ 0x83B0C60 + .4byte gMapScripts_PokemonMansion_1F @ 0x81621F9 + .4byte NULL + .2byte BGM_FRLG_POKEMON_MANSION + .2byte 143 + .byte 0x87, 0x00, 0x0b, 0x08, 0x00, 0x07, 0x00, 0x03 diff --git a/data/maps/PokemonMansion_2F/header.inc b/data/maps/PokemonMansion_2F/header.inc new file mode 100644 index 000000000..39716d024 --- /dev/null +++ b/data/maps/PokemonMansion_2F/header.inc @@ -0,0 +1,8 @@ +PokemonMansion_2F:: @ 834F8A4 + .4byte PokemonMansion_2F_Layout @ 0x830B9A8 + .4byte gMapEvents_PokemonMansion_2F @ 0x83B0D20 + .4byte gMapScripts_PokemonMansion_2F @ 0x8162254 + .4byte NULL + .2byte BGM_FRLG_POKEMON_MANSION + .2byte 144 + .byte 0x87, 0x00, 0x0b, 0x08, 0x00, 0x07, 0x00, 0x03 diff --git a/data/maps/PokemonMansion_3F/header.inc b/data/maps/PokemonMansion_3F/header.inc new file mode 100644 index 000000000..9dde682d0 --- /dev/null +++ b/data/maps/PokemonMansion_3F/header.inc @@ -0,0 +1,8 @@ +PokemonMansion_3F:: @ 834F8C0 + .4byte PokemonMansion_3F_Layout @ 0x830C430 + .4byte gMapEvents_PokemonMansion_3F @ 0x83B0DF8 + .4byte gMapScripts_PokemonMansion_3F @ 0x81622A1 + .4byte NULL + .2byte BGM_FRLG_POKEMON_MANSION + .2byte 145 + .byte 0x87, 0x00, 0x0b, 0x08, 0x00, 0x07, 0x00, 0x03 diff --git a/data/maps/PokemonMansion_B1F/header.inc b/data/maps/PokemonMansion_B1F/header.inc new file mode 100644 index 000000000..28d4cec5e --- /dev/null +++ b/data/maps/PokemonMansion_B1F/header.inc @@ -0,0 +1,8 @@ +PokemonMansion_B1F:: @ 834F8DC + .4byte PokemonMansion_B1F_Layout @ 0x830CEB8 + .4byte gMapEvents_PokemonMansion_B1F @ 0x83B0ED4 + .4byte gMapScripts_PokemonMansion_B1F @ 0x81622FC + .4byte NULL + .2byte BGM_FRLG_POKEMON_MANSION + .2byte 146 + .byte 0x87, 0x00, 0x0b, 0x08, 0x00, 0x07, 0x00, 0x03 diff --git a/data/maps/PokemonTower_1F/header.inc b/data/maps/PokemonTower_1F/header.inc new file mode 100644 index 000000000..94aefddf2 --- /dev/null +++ b/data/maps/PokemonTower_1F/header.inc @@ -0,0 +1,8 @@ +PokemonTower_1F:: @ 834FBB4 + .4byte PokemonTower_1F_Layout @ 0x83167F4 + .4byte gMapEvents_PokemonTower_1F @ 0x83B2270 + .4byte gMapScripts_PokemonTower_1F @ 0x8163235 + .4byte NULL + .2byte BGM_FRLG_POKEMON_TOWER + .2byte 161 + .byte 0x8c, 0x00, 0x00, 0x08, 0x00, 0x05, 0x00, 0x02 diff --git a/data/maps/PokemonTower_2F/header.inc b/data/maps/PokemonTower_2F/header.inc new file mode 100644 index 000000000..45838cb9b --- /dev/null +++ b/data/maps/PokemonTower_2F/header.inc @@ -0,0 +1,8 @@ +PokemonTower_2F:: @ 834FBD0 + .4byte PokemonTower_2F_Layout @ 0x8316BD8 + .4byte gMapEvents_PokemonTower_2F @ 0x83B22E4 + .4byte gMapScripts_PokemonTower_2F @ 0x8163285 + .4byte NULL + .2byte BGM_FRLG_POKEMON_TOWER + .2byte 162 + .byte 0x8c, 0x00, 0x00, 0x08, 0x00, 0x05, 0x00, 0x02 diff --git a/data/maps/PokemonTower_3F/header.inc b/data/maps/PokemonTower_3F/header.inc new file mode 100644 index 000000000..cd7c8fa57 --- /dev/null +++ b/data/maps/PokemonTower_3F/header.inc @@ -0,0 +1,8 @@ +PokemonTower_3F:: @ 834FBEC + .4byte PokemonTower_3F_Layout @ 0x8316FBC + .4byte gMapEvents_PokemonTower_3F @ 0x83B2368 + .4byte gMapScripts_PokemonTower_3F @ 0x81633A6 + .4byte NULL + .2byte BGM_FRLG_POKEMON_TOWER + .2byte 163 + .byte 0x8c, 0x00, 0x06, 0x08, 0x00, 0x05, 0x00, 0x02 diff --git a/data/maps/PokemonTower_4F/header.inc b/data/maps/PokemonTower_4F/header.inc new file mode 100644 index 000000000..63fccbe42 --- /dev/null +++ b/data/maps/PokemonTower_4F/header.inc @@ -0,0 +1,8 @@ +PokemonTower_4F:: @ 834FC08 + .4byte PokemonTower_4F_Layout @ 0x83173A0 + .4byte gMapEvents_PokemonTower_4F @ 0x83B241C + .4byte gMapScripts_PokemonTower_4F @ 0x81633EC + .4byte NULL + .2byte BGM_FRLG_POKEMON_TOWER + .2byte 164 + .byte 0x8c, 0x00, 0x06, 0x08, 0x00, 0x05, 0x00, 0x02 diff --git a/data/maps/PokemonTower_5F/header.inc b/data/maps/PokemonTower_5F/header.inc new file mode 100644 index 000000000..d5328464b --- /dev/null +++ b/data/maps/PokemonTower_5F/header.inc @@ -0,0 +1,8 @@ +PokemonTower_5F:: @ 834FC24 + .4byte PokemonTower_5F_Layout @ 0x8317784 + .4byte gMapEvents_PokemonTower_5F @ 0x83B2604 + .4byte gMapScripts_PokemonTower_5F @ 0x8163432 + .4byte NULL + .2byte BGM_FRLG_POKEMON_TOWER + .2byte 165 + .byte 0x8c, 0x00, 0x06, 0x08, 0x00, 0x05, 0x00, 0x02 diff --git a/data/maps/PokemonTower_6F/header.inc b/data/maps/PokemonTower_6F/header.inc new file mode 100644 index 000000000..4f928c92d --- /dev/null +++ b/data/maps/PokemonTower_6F/header.inc @@ -0,0 +1,8 @@ +PokemonTower_6F:: @ 834FC40 + .4byte PokemonTower_6F_Layout @ 0x8317B68 + .4byte gMapEvents_PokemonTower_6F @ 0x83B26C0 + .4byte gMapScripts_PokemonTower_6F @ 0x81634B7 + .4byte NULL + .2byte BGM_FRLG_POKEMON_TOWER + .2byte 166 + .byte 0x8c, 0x00, 0x06, 0x08, 0x00, 0x05, 0x00, 0x02 diff --git a/data/maps/PokemonTower_7F/header.inc b/data/maps/PokemonTower_7F/header.inc new file mode 100644 index 000000000..ada7b480e --- /dev/null +++ b/data/maps/PokemonTower_7F/header.inc @@ -0,0 +1,8 @@ +PokemonTower_7F:: @ 834FC5C + .4byte PokemonTower_7F_Layout @ 0x8317F4C + .4byte gMapEvents_PokemonTower_7F @ 0x83B2748 + .4byte gMapScripts_PokemonTower_7F @ 0x8163559 + .4byte NULL + .2byte BGM_FRLG_POKEMON_TOWER + .2byte 167 + .byte 0x8c, 0x00, 0x06, 0x08, 0x00, 0x05, 0x00, 0x02 diff --git a/data/maps/PowerPlant/header.inc b/data/maps/PowerPlant/header.inc new file mode 100644 index 000000000..2062f30c3 --- /dev/null +++ b/data/maps/PowerPlant/header.inc @@ -0,0 +1,8 @@ +PowerPlant:: @ 834FC78 + .4byte PowerPlant_Layout @ 0x8318EC0 + .4byte gMapEvents_PowerPlant @ 0x83B285C + .4byte gMapScripts_PowerPlant @ 0x8163764 + .4byte NULL + .2byte BGM_FRLG_POKEMON_MANSION + .2byte 168 + .byte 0x8e, 0x00, 0x00, 0x08, 0x00, 0x07, 0x00, 0x03 diff --git a/data/maps/RockTunnel_1F/header.inc b/data/maps/RockTunnel_1F/header.inc new file mode 100644 index 000000000..21bd063fd --- /dev/null +++ b/data/maps/RockTunnel_1F/header.inc @@ -0,0 +1,8 @@ +RockTunnel_1F:: @ 834FAF0 + .4byte RockTunnel_1F_Layout @ 0x83130E4 + .4byte gMapEvents_RockTunnel_1F @ 0x83B1B2C + .4byte gMapScripts_RockTunnel_1F @ 0x8162DD6 + .4byte NULL + .2byte BGM_FRLG_MT_MOON + .2byte 154 + .byte 0x8a, 0x01, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/RockTunnel_B1F/header.inc b/data/maps/RockTunnel_B1F/header.inc new file mode 100644 index 000000000..9b6e260e9 --- /dev/null +++ b/data/maps/RockTunnel_B1F/header.inc @@ -0,0 +1,8 @@ +RockTunnel_B1F:: @ 834FB0C + .4byte RockTunnel_B1F_Layout @ 0x8314008 + .4byte gMapEvents_RockTunnel_B1F @ 0x83B1DD0 + .4byte gMapScripts_RockTunnel_B1F @ 0x8162E8A + .4byte NULL + .2byte BGM_FRLG_MT_MOON + .2byte 155 + .byte 0x8a, 0x01, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/RocketHideout_B1F/header.inc b/data/maps/RocketHideout_B1F/header.inc new file mode 100644 index 000000000..0cba66e5d --- /dev/null +++ b/data/maps/RocketHideout_B1F/header.inc @@ -0,0 +1,8 @@ +RocketHideout_B1F:: @ 834F6AC + .4byte RocketHideout_B1F_Layout @ 0x8305C28 + .4byte gMapEvents_RocketHideout_B1F @ 0x83AF9D8 + .4byte gMapScripts_RocketHideout_B1F @ 0x8161195 + .4byte NULL + .2byte BGM_FRLG_ROCKET_HIDEOUT + .2byte 128 + .byte 0x85, 0x00, 0x00, 0x08, 0x00, 0x07, 0xff, 0x03 diff --git a/data/maps/RocketHideout_B2F/header.inc b/data/maps/RocketHideout_B2F/header.inc new file mode 100644 index 000000000..516adc9a2 --- /dev/null +++ b/data/maps/RocketHideout_B2F/header.inc @@ -0,0 +1,8 @@ +RocketHideout_B2F:: @ 834F6C8 + .4byte RocketHideout_B2F_Layout @ 0x83061CC + .4byte gMapEvents_RocketHideout_B2F @ 0x83AFA8C + .4byte gMapScripts_RocketHideout_B2F @ 0x81612A1 + .4byte NULL + .2byte BGM_FRLG_ROCKET_HIDEOUT + .2byte 129 + .byte 0x85, 0x00, 0x00, 0x08, 0x00, 0x07, 0xfe, 0x03 diff --git a/data/maps/RocketHideout_B3F/header.inc b/data/maps/RocketHideout_B3F/header.inc new file mode 100644 index 000000000..2a639bda8 --- /dev/null +++ b/data/maps/RocketHideout_B3F/header.inc @@ -0,0 +1,8 @@ +RocketHideout_B3F:: @ 834F6E4 + .4byte RocketHideout_B3F_Layout @ 0x8306694 + .4byte gMapEvents_RocketHideout_B3F @ 0x83AFB34 + .4byte gMapScripts_RocketHideout_B3F @ 0x81612B9 + .4byte NULL + .2byte BGM_FRLG_ROCKET_HIDEOUT + .2byte 130 + .byte 0x85, 0x00, 0x00, 0x08, 0x00, 0x07, 0xfd, 0x03 diff --git a/data/maps/RocketHideout_B4F/header.inc b/data/maps/RocketHideout_B4F/header.inc new file mode 100644 index 000000000..0cf775f5a --- /dev/null +++ b/data/maps/RocketHideout_B4F/header.inc @@ -0,0 +1,8 @@ +RocketHideout_B4F:: @ 834F700 + .4byte RocketHideout_B4F_Layout @ 0x8306B98 + .4byte gMapEvents_RocketHideout_B4F @ 0x83AFC50 + .4byte gMapScripts_RocketHideout_B4F @ 0x81612E8 + .4byte NULL + .2byte BGM_FRLG_ROCKET_HIDEOUT + .2byte 131 + .byte 0x85, 0x00, 0x00, 0x08, 0x00, 0x07, 0xfc, 0x03 diff --git a/data/maps/RocketHideout_Elevator/header.inc b/data/maps/RocketHideout_Elevator/header.inc new file mode 100644 index 000000000..70c8c2a22 --- /dev/null +++ b/data/maps/RocketHideout_Elevator/header.inc @@ -0,0 +1,8 @@ +RocketHideout_Elevator:: @ 834F71C + .4byte RocketHideout_Elevator_Layout @ 0x8320EDC + .4byte gMapEvents_RocketHideout_Elevator @ 0x83AFC80 + .4byte gMapScripts_RocketHideout_Elevator @ 0x81614D8 + .4byte NULL + .2byte BGM_FRLG_ROCKET_HIDEOUT + .2byte 225 + .byte 0x85, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x03 diff --git a/data/maps/Route1/connections.inc b/data/maps/Route1/connections.inc new file mode 100644 index 000000000..d266874a8 --- /dev/null +++ b/data/maps/Route1/connections.inc @@ -0,0 +1,7 @@ +Route1_MapConnectionsList: @ 83529DC + connection up, -12, MAP_VIRIDIANCITY + connection down, 0, MAP_PALLETTOWN + +Route1_MapConnections:: @ 83529F4 + .4byte 2 + .4byte Route1_MapConnectionsList diff --git a/data/maps/Route1/header.inc b/data/maps/Route1/header.inc new file mode 100644 index 000000000..6f2a76447 --- /dev/null +++ b/data/maps/Route1/header.inc @@ -0,0 +1,8 @@ +Route1:: @ 835082C + .4byte Route1_Layout @ 0x82E55CC + .4byte gMapEvents_Route1 @ 0x83B6648 + .4byte gMapScripts_Route1 @ 0x8167EFD + .4byte Route1_MapConnections @ 0x83529F4 + .2byte BGM_FRLG_ROUTE_1 + .2byte 89 + .byte 0x65, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/Route10/connections.inc b/data/maps/Route10/connections.inc new file mode 100644 index 000000000..3b6a576d2 --- /dev/null +++ b/data/maps/Route10/connections.inc @@ -0,0 +1,7 @@ +Route10_MapConnectionsList: @ 8352AFC + connection down, 0, MAP_LAVENDERTOWN + connection left, 0, MAP_ROUTE9 + +Route10_MapConnections:: @ 8352B14 + .4byte 2 + .4byte Route10_MapConnectionsList diff --git a/data/maps/Route10/header.inc b/data/maps/Route10/header.inc new file mode 100644 index 000000000..8c8dc7244 --- /dev/null +++ b/data/maps/Route10/header.inc @@ -0,0 +1,8 @@ +Route10:: @ 8350928 + .4byte Route10_Layout @ 0x82EC3D0 + .4byte gMapEvents_Route10 @ 0x83B6FA0 + .4byte gMapScripts_Route10 @ 0x8167FD9 + .4byte Route10_MapConnections @ 0x8352B14 + .2byte BGM_FRLG_ROUTE_3 + .2byte 98 + .byte 0x6e, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/Route10_PokemonCenter_1F/header.inc b/data/maps/Route10_PokemonCenter_1F/header.inc new file mode 100644 index 000000000..3e965c250 --- /dev/null +++ b/data/maps/Route10_PokemonCenter_1F/header.inc @@ -0,0 +1,8 @@ +Route10_PokemonCenter_1F:: @ 83518B0 + .4byte PokemonCenter_1F_Layout @ 0x82D5990 + .4byte gMapEvents_Route10_PokemonCenter_1F @ 0x83BD8FC + .4byte gMapScripts_Route10_PokemonCenter_1F @ 0x816FC2F + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 8 + .byte 0x6e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/Route10_PokemonCenter_2F/header.inc b/data/maps/Route10_PokemonCenter_2F/header.inc new file mode 100644 index 000000000..9502d74d9 --- /dev/null +++ b/data/maps/Route10_PokemonCenter_2F/header.inc @@ -0,0 +1,8 @@ +Route10_PokemonCenter_2F:: @ 83518CC + .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 + .4byte gMapEvents_Route10_PokemonCenter_2F @ 0x83BD988 + .4byte gMapScripts_Route10_PokemonCenter_2F @ 0x816FCFA + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 9 + .byte 0x6e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/Route11/connections.inc b/data/maps/Route11/connections.inc new file mode 100644 index 000000000..3302f7844 --- /dev/null +++ b/data/maps/Route11/connections.inc @@ -0,0 +1,7 @@ +Route11_MapConnectionsList: @ 8352B1C + connection left, -10, MAP_VERMILIONCITY + connection right, -60, MAP_ROUTE12 + +Route11_MapConnections:: @ 8352B34 + .4byte 2 + .4byte Route11_MapConnectionsList diff --git a/data/maps/Route11/header.inc b/data/maps/Route11/header.inc new file mode 100644 index 000000000..93550fb3c --- /dev/null +++ b/data/maps/Route11/header.inc @@ -0,0 +1,8 @@ +Route11:: @ 8350944 + .4byte Route11_Layout @ 0x82ECF34 + .4byte gMapEvents_Route11 @ 0x83B711C + .4byte gMapScripts_Route11 @ 0x8167FF6 + .4byte Route11_MapConnections @ 0x8352B34 + .2byte BGM_FRLG_ROUTE_11 + .2byte 99 + .byte 0x6f, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/Route11_EastEntrance_1F/header.inc b/data/maps/Route11_EastEntrance_1F/header.inc new file mode 100644 index 000000000..d8f7762e3 --- /dev/null +++ b/data/maps/Route11_EastEntrance_1F/header.inc @@ -0,0 +1,8 @@ +Route11_EastEntrance_1F:: @ 83518E8 + .4byte Entrance_1F_Layout @ 0x8320E70 + .4byte gMapEvents_Route11_EastEntrance_1F @ 0x83BD9F4 + .4byte gMapScripts_Route11_EastEntrance_1F @ 0x816FD21 + .4byte NULL + .2byte BGM_FRLG_VERMILION_CITY + .2byte 224 + .byte 0x6f, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00 diff --git a/data/maps/Route11_EastEntrance_2F/header.inc b/data/maps/Route11_EastEntrance_2F/header.inc new file mode 100644 index 000000000..964580122 --- /dev/null +++ b/data/maps/Route11_EastEntrance_2F/header.inc @@ -0,0 +1,8 @@ +Route11_EastEntrance_2F:: @ 8351904 + .4byte Entrance_2F_Layout @ 0x8320804 + .4byte gMapEvents_Route11_EastEntrance_2F @ 0x83BDA58 + .4byte gMapScripts_Route11_EastEntrance_2F @ 0x816FD34 + .4byte NULL + .2byte BGM_FRLG_VERMILION_CITY + .2byte 220 + .byte 0x6f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/Route12/connections.inc b/data/maps/Route12/connections.inc new file mode 100644 index 000000000..b33041939 --- /dev/null +++ b/data/maps/Route12/connections.inc @@ -0,0 +1,8 @@ +Route12_MapConnectionsList: @ 8352B3C + connection up, 0, MAP_LAVENDERTOWN + connection down, -48, MAP_ROUTE13 + connection left, 60, MAP_ROUTE11 + +Route12_MapConnections:: @ 8352B60 + .4byte 3 + .4byte Route12_MapConnectionsList diff --git a/data/maps/Route12/header.inc b/data/maps/Route12/header.inc new file mode 100644 index 000000000..89963d62a --- /dev/null +++ b/data/maps/Route12/header.inc @@ -0,0 +1,8 @@ +Route12:: @ 8350960 + .4byte Route12_Layout @ 0x82EE5D8 + .4byte gMapEvents_Route12 @ 0x83B72DC + .4byte gMapScripts_Route12 @ 0x8168000 + .4byte Route12_MapConnections @ 0x8352B60 + .2byte BGM_FRLG_ROUTE_11 + .2byte 100 + .byte 0x70, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/Route12_FishingHouse/header.inc b/data/maps/Route12_FishingHouse/header.inc new file mode 100644 index 000000000..a7c27f49d --- /dev/null +++ b/data/maps/Route12_FishingHouse/header.inc @@ -0,0 +1,8 @@ +Route12_FishingHouse:: @ 8351958 + .4byte House4_Layout @ 0x82D6070 + .4byte gMapEvents_Route12_FishingHouse @ 0x83BDB48 + .4byte gMapScripts_Route12_FishingHouse @ 0x816FF0B + .4byte NULL + .2byte BGM_FRLG_CELADON_CITY + .2byte 13 + .byte 0x70, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/Route12_NorthEntrance_1F/header.inc b/data/maps/Route12_NorthEntrance_1F/header.inc new file mode 100644 index 000000000..f3a501887 --- /dev/null +++ b/data/maps/Route12_NorthEntrance_1F/header.inc @@ -0,0 +1,8 @@ +Route12_NorthEntrance_1F:: @ 8351920 + .4byte Route12_NorthEntrance_1F_Layout @ 0x8319DF0 + .4byte gMapEvents_Route12_NorthEntrance_1F @ 0x83BDAAC + .4byte gMapScripts_Route12_NorthEntrance_1F @ 0x816FE6D + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_CITY + .2byte 176 + .byte 0x70, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00 diff --git a/data/maps/Route12_NorthEntrance_2F/header.inc b/data/maps/Route12_NorthEntrance_2F/header.inc new file mode 100644 index 000000000..deb9655e1 --- /dev/null +++ b/data/maps/Route12_NorthEntrance_2F/header.inc @@ -0,0 +1,8 @@ +Route12_NorthEntrance_2F:: @ 835193C + .4byte Entrance_2F_Layout @ 0x8320804 + .4byte gMapEvents_Route12_NorthEntrance_2F @ 0x83BDAF8 + .4byte gMapScripts_Route12_NorthEntrance_2F @ 0x816FE77 + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_CITY + .2byte 220 + .byte 0x70, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/Route13/connections.inc b/data/maps/Route13/connections.inc new file mode 100644 index 000000000..2a201358e --- /dev/null +++ b/data/maps/Route13/connections.inc @@ -0,0 +1,7 @@ +Route13_MapConnectionsList: @ 8352B68 + connection up, 48, MAP_ROUTE12 + connection left, 0, MAP_ROUTE14 + +Route13_MapConnections:: @ 8352B80 + .4byte 2 + .4byte Route13_MapConnectionsList diff --git a/data/maps/Route13/header.inc b/data/maps/Route13/header.inc new file mode 100644 index 000000000..2f98d6d15 --- /dev/null +++ b/data/maps/Route13/header.inc @@ -0,0 +1,8 @@ +Route13:: @ 835097C + .4byte Route13_Layout @ 0x82EF13C + .4byte gMapEvents_Route13 @ 0x83B7428 + .4byte gMapScripts_Route13 @ 0x81680B5 + .4byte Route13_MapConnections @ 0x8352B80 + .2byte BGM_FRLG_ROUTE_11 + .2byte 101 + .byte 0x71, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/Route14/connections.inc b/data/maps/Route14/connections.inc new file mode 100644 index 000000000..f10ba89fd --- /dev/null +++ b/data/maps/Route14/connections.inc @@ -0,0 +1,7 @@ +Route14_MapConnectionsList: @ 8352B88 + connection left, 40, MAP_ROUTE15 + connection right, 0, MAP_ROUTE13 + +Route14_MapConnections:: @ 8352BA0 + .4byte 2 + .4byte Route14_MapConnectionsList diff --git a/data/maps/Route14/header.inc b/data/maps/Route14/header.inc new file mode 100644 index 000000000..5fe549443 --- /dev/null +++ b/data/maps/Route14/header.inc @@ -0,0 +1,8 @@ +Route14:: @ 8350998 + .4byte Route14_Layout @ 0x82EFCA0 + .4byte gMapEvents_Route14 @ 0x83B75C8 + .4byte gMapScripts_Route14 @ 0x81680D1 + .4byte Route14_MapConnections @ 0x8352BA0 + .2byte BGM_FRLG_ROUTE_11 + .2byte 102 + .byte 0x72, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/Route15/connections.inc b/data/maps/Route15/connections.inc new file mode 100644 index 000000000..dfd4ba536 --- /dev/null +++ b/data/maps/Route15/connections.inc @@ -0,0 +1,7 @@ +Route15_MapConnectionsList: @ 8352BA8 + connection left, -10, MAP_FUCHSIACITY + connection right, -40, MAP_ROUTE14 + +Route15_MapConnections:: @ 8352BC0 + .4byte 2 + .4byte Route15_MapConnectionsList diff --git a/data/maps/Route15/header.inc b/data/maps/Route15/header.inc new file mode 100644 index 000000000..12dc0221c --- /dev/null +++ b/data/maps/Route15/header.inc @@ -0,0 +1,8 @@ +Route15:: @ 83509B4 + .4byte Route15_Layout @ 0x82F0804 + .4byte gMapEvents_Route15 @ 0x83B7748 + .4byte gMapScripts_Route15 @ 0x81680DB + .4byte Route15_MapConnections @ 0x8352BC0 + .2byte BGM_FRLG_ROUTE_11 + .2byte 103 + .byte 0x73, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/Route15_WestEntrance_1F/header.inc b/data/maps/Route15_WestEntrance_1F/header.inc new file mode 100644 index 000000000..9c8348b58 --- /dev/null +++ b/data/maps/Route15_WestEntrance_1F/header.inc @@ -0,0 +1,8 @@ +Route15_WestEntrance_1F:: @ 8351974 + .4byte Entrance_1F_Layout @ 0x8320E70 + .4byte gMapEvents_Route15_WestEntrance_1F @ 0x83BDB9C + .4byte gMapScripts_Route15_WestEntrance_1F @ 0x8170088 + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_CITY + .2byte 224 + .byte 0x73, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00 diff --git a/data/maps/Route15_WestEntrance_2F/header.inc b/data/maps/Route15_WestEntrance_2F/header.inc new file mode 100644 index 000000000..3be6a3320 --- /dev/null +++ b/data/maps/Route15_WestEntrance_2F/header.inc @@ -0,0 +1,8 @@ +Route15_WestEntrance_2F:: @ 8351990 + .4byte Entrance_2F_Layout @ 0x8320804 + .4byte gMapEvents_Route15_WestEntrance_2F @ 0x83BDBE8 + .4byte gMapScripts_Route15_WestEntrance_2F @ 0x8170092 + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_CITY + .2byte 220 + .byte 0x73, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/Route16/connections.inc b/data/maps/Route16/connections.inc new file mode 100644 index 000000000..5d1dc6f62 --- /dev/null +++ b/data/maps/Route16/connections.inc @@ -0,0 +1,7 @@ +Route16_MapConnectionsList: @ 8352BC8 + connection down, 0, MAP_ROUTE17 + connection right, -10, MAP_CELADONCITY + +Route16_MapConnections:: @ 8352BE0 + .4byte 2 + .4byte Route16_MapConnectionsList diff --git a/data/maps/Route16/header.inc b/data/maps/Route16/header.inc new file mode 100644 index 000000000..8b6cd97fe --- /dev/null +++ b/data/maps/Route16/header.inc @@ -0,0 +1,8 @@ +Route16:: @ 83509D0 + .4byte Route16_Layout @ 0x82F0FA8 + .4byte gMapEvents_Route16 @ 0x83B7898 + .4byte gMapScripts_Route16 @ 0x81680E5 + .4byte Route16_MapConnections @ 0x8352BE0 + .2byte BGM_FRLG_ROUTE_3 + .2byte 104 + .byte 0x74, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/Route16_House/header.inc b/data/maps/Route16_House/header.inc new file mode 100644 index 000000000..473deb93f --- /dev/null +++ b/data/maps/Route16_House/header.inc @@ -0,0 +1,8 @@ +Route16_House:: @ 83519AC + .4byte House1_Layout @ 0x82D5754 + .4byte gMapEvents_Route16_House @ 0x83BDC44 + .4byte gMapScripts_Route16_House @ 0x817014E + .4byte NULL + .2byte BGM_FRLG_CELADON_CITY + .2byte 6 + .byte 0x74, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/Route16_NorthEntrance_1F/header.inc b/data/maps/Route16_NorthEntrance_1F/header.inc new file mode 100644 index 000000000..b0f6c815b --- /dev/null +++ b/data/maps/Route16_NorthEntrance_1F/header.inc @@ -0,0 +1,8 @@ +Route16_NorthEntrance_1F:: @ 83519C8 + .4byte Route16_NorthEntrance_1F_Layout @ 0x8320D14 + .4byte gMapEvents_Route16_NorthEntrance_1F @ 0x83BDD60 + .4byte gMapScripts_Route16_NorthEntrance_1F @ 0x81701C2 + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_CITY + .2byte 223 + .byte 0x74, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00 diff --git a/data/maps/Route16_NorthEntrance_2F/header.inc b/data/maps/Route16_NorthEntrance_2F/header.inc new file mode 100644 index 000000000..91998b7ce --- /dev/null +++ b/data/maps/Route16_NorthEntrance_2F/header.inc @@ -0,0 +1,8 @@ +Route16_NorthEntrance_2F:: @ 83519E4 + .4byte Entrance_2F_Layout @ 0x8320804 + .4byte gMapEvents_Route16_NorthEntrance_2F @ 0x83BDDDC + .4byte gMapScripts_Route16_NorthEntrance_2F @ 0x81702BE + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_CITY + .2byte 220 + .byte 0x74, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/Route17/connections.inc b/data/maps/Route17/connections.inc new file mode 100644 index 000000000..e3db083c2 --- /dev/null +++ b/data/maps/Route17/connections.inc @@ -0,0 +1,7 @@ +Route17_MapConnectionsList: @ 8352BE8 + connection up, 0, MAP_ROUTE16 + connection down, 0, MAP_ROUTE18 + +Route17_MapConnections:: @ 8352C00 + .4byte 2 + .4byte Route17_MapConnectionsList diff --git a/data/maps/Route17/header.inc b/data/maps/Route17/header.inc new file mode 100644 index 000000000..1794580a8 --- /dev/null +++ b/data/maps/Route17/header.inc @@ -0,0 +1,8 @@ +Route17:: @ 83509EC + .4byte Route17_Layout @ 0x82F2DCC + .4byte gMapEvents_Route17 @ 0x83B7A20 + .4byte gMapScripts_Route17 @ 0x81681BF + .4byte Route17_MapConnections @ 0x8352C00 + .2byte BGM_FRLG_ROUTE_3 + .2byte 105 + .byte 0x75, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/Route18/connections.inc b/data/maps/Route18/connections.inc new file mode 100644 index 000000000..93004416c --- /dev/null +++ b/data/maps/Route18/connections.inc @@ -0,0 +1,7 @@ +Route18_MapConnectionsList: @ 8352C08 + connection up, 0, MAP_ROUTE17 + connection right, -10, MAP_FUCHSIACITY + +Route18_MapConnections:: @ 8352C20 + .4byte 2 + .4byte Route18_MapConnectionsList diff --git a/data/maps/Route18/header.inc b/data/maps/Route18/header.inc new file mode 100644 index 000000000..9ca9d432b --- /dev/null +++ b/data/maps/Route18/header.inc @@ -0,0 +1,8 @@ +Route18:: @ 8350A08 + .4byte Route18_Layout @ 0x82F3750 + .4byte gMapEvents_Route18 @ 0x83B7AA4 + .4byte gMapScripts_Route18 @ 0x81681F6 + .4byte Route18_MapConnections @ 0x8352C20 + .2byte BGM_FRLG_ROUTE_3 + .2byte 106 + .byte 0x76, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/Route18_EastEntrance_1F/header.inc b/data/maps/Route18_EastEntrance_1F/header.inc new file mode 100644 index 000000000..74e8f827f --- /dev/null +++ b/data/maps/Route18_EastEntrance_1F/header.inc @@ -0,0 +1,8 @@ +Route18_EastEntrance_1F:: @ 8351A00 + .4byte Entrance_1F_Layout @ 0x8320E70 + .4byte gMapEvents_Route18_EastEntrance_1F @ 0x83BDED0 + .4byte gMapScripts_Route18_EastEntrance_1F @ 0x8170378 + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_CITY + .2byte 224 + .byte 0x76, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00 diff --git a/data/maps/Route18_EastEntrance_2F/header.inc b/data/maps/Route18_EastEntrance_2F/header.inc new file mode 100644 index 000000000..ff41bf2da --- /dev/null +++ b/data/maps/Route18_EastEntrance_2F/header.inc @@ -0,0 +1,8 @@ +Route18_EastEntrance_2F:: @ 8351A1C + .4byte Entrance_2F_Layout @ 0x8320804 + .4byte gMapEvents_Route18_EastEntrance_2F @ 0x83BDF1C + .4byte gMapScripts_Route18_EastEntrance_2F @ 0x817046B + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_CITY + .2byte 220 + .byte 0x76, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/Route19/connections.inc b/data/maps/Route19/connections.inc new file mode 100644 index 000000000..e41f1f3be --- /dev/null +++ b/data/maps/Route19/connections.inc @@ -0,0 +1,7 @@ +Route19_MapConnectionsList: @ 8352C28 + connection up, -12, MAP_FUCHSIACITY + connection left, 40, MAP_ROUTE20 + +Route19_MapConnections:: @ 8352C40 + .4byte 2 + .4byte Route19_MapConnectionsList diff --git a/data/maps/Route19/header.inc b/data/maps/Route19/header.inc new file mode 100644 index 000000000..6be186f94 --- /dev/null +++ b/data/maps/Route19/header.inc @@ -0,0 +1,8 @@ +Route19:: @ 8350A24 + .4byte Route19_Layout @ 0x82F42B4 + .4byte gMapEvents_Route19 @ 0x83B7BE4 + .4byte gMapScripts_Route19 @ 0x8168231 + .4byte Route19_MapConnections @ 0x8352C40 + .2byte BGM_FRLG_ROUTE_3 + .2byte 107 + .byte 0x77, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/Route2/connections.inc b/data/maps/Route2/connections.inc new file mode 100644 index 000000000..43b34821a --- /dev/null +++ b/data/maps/Route2/connections.inc @@ -0,0 +1,7 @@ +Route2_MapConnectionsList: @ 83529FC + connection up, -12, MAP_PEWTERCITY + connection down, -12, MAP_VIRIDIANCITY + +Route2_MapConnections:: @ 8352A14 + .4byte 2 + .4byte Route2_MapConnectionsList diff --git a/data/maps/Route2/header.inc b/data/maps/Route2/header.inc new file mode 100644 index 000000000..2d892eab9 --- /dev/null +++ b/data/maps/Route2/header.inc @@ -0,0 +1,8 @@ +Route2:: @ 8350848 + .4byte Route2_Layout @ 0x82E64F0 + .4byte gMapEvents_Route2 @ 0x83B676C + .4byte gMapScripts_Route2 @ 0x8167F64 + .4byte Route2_MapConnections @ 0x8352A14 + .2byte BGM_FRLG_ROUTE_1 + .2byte 90 + .byte 0x66, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/Route20/connections.inc b/data/maps/Route20/connections.inc new file mode 100644 index 000000000..68e80a6df --- /dev/null +++ b/data/maps/Route20/connections.inc @@ -0,0 +1,7 @@ +Route20_MapConnectionsList: @ 8352C48 + connection left, 0, MAP_CINNABARISLAND + connection right, -40, MAP_ROUTE19 + +Route20_MapConnections:: @ 8352C60 + .4byte 2 + .4byte Route20_MapConnectionsList diff --git a/data/maps/Route20/header.inc b/data/maps/Route20/header.inc new file mode 100644 index 000000000..a4b1a19bc --- /dev/null +++ b/data/maps/Route20/header.inc @@ -0,0 +1,8 @@ +Route20:: @ 8350A40 + .4byte Route20_Layout @ 0x82F5598 + .4byte gMapEvents_Route20 @ 0x83B7D34 + .4byte gMapScripts_Route20 @ 0x816823B + .4byte Route20_MapConnections @ 0x8352C60 + .2byte BGM_FRLG_ROUTE_3 + .2byte 108 + .byte 0x78, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/Route21_North/connections.inc b/data/maps/Route21_North/connections.inc new file mode 100644 index 000000000..ab2268115 --- /dev/null +++ b/data/maps/Route21_North/connections.inc @@ -0,0 +1,7 @@ +Route21_North_MapConnectionsList: @ 8352C68 + connection up, 0, MAP_PALLETTOWN + connection down, 0, MAP_ROUTE21_SOUTH + +Route21_North_MapConnections:: @ 8352C80 + .4byte 2 + .4byte Route21_North_MapConnectionsList diff --git a/data/maps/Route21_North/header.inc b/data/maps/Route21_North/header.inc new file mode 100644 index 000000000..728a8f92c --- /dev/null +++ b/data/maps/Route21_North/header.inc @@ -0,0 +1,8 @@ +Route21_North:: @ 8350A5C + .4byte Route21_North_Layout @ 0x82F5F1C + .4byte gMapEvents_Route21_North @ 0x83B7DE4 + .4byte gMapScripts_Route21_North @ 0x8168289 + .4byte Route21_North_MapConnections @ 0x8352C80 + .2byte BGM_FRLG_ROUTE_3 + .2byte 109 + .byte 0x79, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/Route21_South/connections.inc b/data/maps/Route21_South/connections.inc new file mode 100644 index 000000000..0342cf8db --- /dev/null +++ b/data/maps/Route21_South/connections.inc @@ -0,0 +1,7 @@ +Route21_South_MapConnectionsList: @ 8352C88 + connection up, 0, MAP_ROUTE21_NORTH + connection down, 0, MAP_CINNABARISLAND + +Route21_South_MapConnections:: @ 8352CA0 + .4byte 2 + .4byte Route21_South_MapConnectionsList diff --git a/data/maps/Route21_South/header.inc b/data/maps/Route21_South/header.inc new file mode 100644 index 000000000..c2dd83782 --- /dev/null +++ b/data/maps/Route21_South/header.inc @@ -0,0 +1,8 @@ +Route21_South:: @ 8350A78 + .4byte Route21_South_Layout @ 0x83206C0 + .4byte gMapEvents_Route21_South @ 0x83B7E70 + .4byte gMapScripts_Route21_South @ 0x816828A + .4byte Route21_South_MapConnections @ 0x8352CA0 + .2byte BGM_FRLG_ROUTE_3 + .2byte 219 + .byte 0x79, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/Route22/connections.inc b/data/maps/Route22/connections.inc new file mode 100644 index 000000000..f7818efd5 --- /dev/null +++ b/data/maps/Route22/connections.inc @@ -0,0 +1,7 @@ +Route22_MapConnectionsList: @ 8352CA8 + connection up, 0, MAP_ROUTE23 + connection right, -10, MAP_VIRIDIANCITY + +Route22_MapConnections:: @ 8352CC0 + .4byte 2 + .4byte Route22_MapConnectionsList diff --git a/data/maps/Route22/header.inc b/data/maps/Route22/header.inc new file mode 100644 index 000000000..c24992f76 --- /dev/null +++ b/data/maps/Route22/header.inc @@ -0,0 +1,8 @@ +Route22:: @ 8350A94 + .4byte Route22_Layout @ 0x82F6840 + .4byte gMapEvents_Route22 @ 0x83B7F18 + .4byte gMapScripts_Route22 @ 0x816828B + .4byte Route22_MapConnections @ 0x8352CC0 + .2byte BGM_FRLG_ROUTE_3 + .2byte 110 + .byte 0x7a, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/Route22_NorthEntrance/header.inc b/data/maps/Route22_NorthEntrance/header.inc new file mode 100644 index 000000000..8daef5317 --- /dev/null +++ b/data/maps/Route22_NorthEntrance/header.inc @@ -0,0 +1,8 @@ +Route22_NorthEntrance:: @ 8351A54 + .4byte Route22_NorthEntrance_Layout @ 0x8320B1C + .4byte gMapEvents_Route22_NorthEntrance @ 0x83BDF8C + .4byte gMapScripts_Route22_NorthEntrance @ 0x81704FB + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_FOREST + .2byte 222 + .byte 0x7a, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/Route23/connections.inc b/data/maps/Route23/connections.inc new file mode 100644 index 000000000..74319d6ef --- /dev/null +++ b/data/maps/Route23/connections.inc @@ -0,0 +1,7 @@ +Route23_MapConnectionsList: @ 8352CC8 + connection up, 0, MAP_INDIGOPLATEAU_EXTERIOR + connection down, 0, MAP_ROUTE22 + +Route23_MapConnections:: @ 8352CE0 + .4byte 2 + .4byte Route23_MapConnectionsList diff --git a/data/maps/Route23/header.inc b/data/maps/Route23/header.inc new file mode 100644 index 000000000..3fc71fc59 --- /dev/null +++ b/data/maps/Route23/header.inc @@ -0,0 +1,8 @@ +Route23:: @ 8350AB0 + .4byte Route23_Layout @ 0x82F8664 + .4byte gMapEvents_Route23 @ 0x83B8300 + .4byte gMapScripts_Route23 @ 0x81684EB + .4byte Route23_MapConnections @ 0x8352CE0 + .2byte BGM_FRLG_INDIGO_PLATEAU + .2byte 111 + .byte 0x7b, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/Route24/connections.inc b/data/maps/Route24/connections.inc new file mode 100644 index 000000000..316966465 --- /dev/null +++ b/data/maps/Route24/connections.inc @@ -0,0 +1,7 @@ +Route24_MapConnectionsList: @ 8352CE8 + connection down, -12, MAP_CERULEANCITY + connection right, 0, MAP_ROUTE25 + +Route24_MapConnections:: @ 8352D00 + .4byte 2 + .4byte Route24_MapConnectionsList diff --git a/data/maps/Route24/header.inc b/data/maps/Route24/header.inc new file mode 100644 index 000000000..32b644009 --- /dev/null +++ b/data/maps/Route24/header.inc @@ -0,0 +1,8 @@ +Route24:: @ 8350ACC + .4byte Route24_Layout @ 0x82F8E08 + .4byte gMapEvents_Route24 @ 0x83B8400 + .4byte gMapScripts_Route24 @ 0x816861F + .4byte Route24_MapConnections @ 0x8352D00 + .2byte BGM_FRLG_ROUTE_24 + .2byte 112 + .byte 0x7c, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/Route25/connections.inc b/data/maps/Route25/connections.inc new file mode 100644 index 000000000..b7b963790 --- /dev/null +++ b/data/maps/Route25/connections.inc @@ -0,0 +1,6 @@ +Route25_MapConnectionsList: @ 8352D08 + connection left, 0, MAP_ROUTE24 + +Route25_MapConnections:: @ 8352D14 + .4byte 1 + .4byte Route25_MapConnectionsList diff --git a/data/maps/Route25/header.inc b/data/maps/Route25/header.inc new file mode 100644 index 000000000..38df8e11d --- /dev/null +++ b/data/maps/Route25/header.inc @@ -0,0 +1,8 @@ +Route25:: @ 8350AE8 + .4byte Route25_Layout @ 0x82F996C + .4byte gMapEvents_Route25 @ 0x83B8590 + .4byte gMapScripts_Route25 @ 0x8168745 + .4byte Route25_MapConnections @ 0x8352D14 + .2byte BGM_FRLG_ROUTE_24 + .2byte 113 + .byte 0x7d, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/Route25_SeaCottage/header.inc b/data/maps/Route25_SeaCottage/header.inc new file mode 100644 index 000000000..9108278b2 --- /dev/null +++ b/data/maps/Route25_SeaCottage/header.inc @@ -0,0 +1,8 @@ +Route25_SeaCottage:: @ 8351A8C + .4byte Route25_SeaCottage_Layout @ 0x8319030 + .4byte gMapEvents_Route25_SeaCottage @ 0x83BE008 + .4byte gMapScripts_Route25_SeaCottage @ 0x8170523 + .4byte NULL + .2byte BGM_FRLG_CERULEAN_CITY + .2byte 169 + .byte 0x7d, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/Route2_EastBuilding/header.inc b/data/maps/Route2_EastBuilding/header.inc new file mode 100644 index 000000000..d6ffe1e28 --- /dev/null +++ b/data/maps/Route2_EastBuilding/header.inc @@ -0,0 +1,8 @@ +Route2_EastBuilding:: @ 8351798 + .4byte Route2_Entrance_Layout @ 0x8320990 + .4byte gMapEvents_Route2_EastBuilding @ 0x83BD43C + .4byte gMapScripts_Route2_EastBuilding @ 0x816F67E + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_CITY + .2byte 221 + .byte 0x66, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00 diff --git a/data/maps/Route2_House/header.inc b/data/maps/Route2_House/header.inc new file mode 100644 index 000000000..d59cf73bc --- /dev/null +++ b/data/maps/Route2_House/header.inc @@ -0,0 +1,8 @@ +Route2_House:: @ 835177C + .4byte House2_Layout @ 0x82D5840 + .4byte gMapEvents_Route2_House @ 0x83BD3D8 + .4byte gMapScripts_Route2_House @ 0x816F5F8 + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_CITY + .2byte 7 + .byte 0x66, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/Route2_ViridianForest_NorthEntrance/header.inc b/data/maps/Route2_ViridianForest_NorthEntrance/header.inc new file mode 100644 index 000000000..003e21340 --- /dev/null +++ b/data/maps/Route2_ViridianForest_NorthEntrance/header.inc @@ -0,0 +1,8 @@ +Route2_ViridianForest_NorthEntrance:: @ 83517B4 + .4byte Route2_Entrance_Layout @ 0x8320990 + .4byte gMapEvents_Route2_ViridianForest_NorthEntrance @ 0x83BD4B8 + .4byte gMapScripts_Route2_ViridianForest_NorthEntrance @ 0x816F71D + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_CITY + .2byte 221 + .byte 0x66, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00 diff --git a/data/maps/Route2_ViridianForest_SouthEntrance/header.inc b/data/maps/Route2_ViridianForest_SouthEntrance/header.inc new file mode 100644 index 000000000..133c6a43c --- /dev/null +++ b/data/maps/Route2_ViridianForest_SouthEntrance/header.inc @@ -0,0 +1,8 @@ +Route2_ViridianForest_SouthEntrance:: @ 8351760 + .4byte Route2_Entrance_Layout @ 0x8320990 + .4byte gMapEvents_Route2_ViridianForest_SouthEntrance @ 0x83BD37C + .4byte gMapScripts_Route2_ViridianForest_SouthEntrance @ 0x816F5E5 + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_CITY + .2byte 221 + .byte 0x66, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00 diff --git a/data/maps/Route3/connections.inc b/data/maps/Route3/connections.inc new file mode 100644 index 000000000..b1e352125 --- /dev/null +++ b/data/maps/Route3/connections.inc @@ -0,0 +1,7 @@ +Route3_MapConnectionsList: @ 8352A1C + connection up, 60, MAP_ROUTE4 + connection left, -10, MAP_PEWTERCITY + +Route3_MapConnections:: @ 8352A34 + .4byte 2 + .4byte Route3_MapConnectionsList diff --git a/data/maps/Route3/header.inc b/data/maps/Route3/header.inc new file mode 100644 index 000000000..8c33a7801 --- /dev/null +++ b/data/maps/Route3/header.inc @@ -0,0 +1,8 @@ +Route3:: @ 8350864 + .4byte Route3_Layout @ 0x82E7234 + .4byte gMapEvents_Route3 @ 0x83B6870 + .4byte gMapScripts_Route3 @ 0x8167F77 + .4byte Route3_MapConnections @ 0x8352A34 + .2byte BGM_FRLG_ROUTE_3 + .2byte 91 + .byte 0x67, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/Route4/connections.inc b/data/maps/Route4/connections.inc new file mode 100644 index 000000000..3e735e3b3 --- /dev/null +++ b/data/maps/Route4/connections.inc @@ -0,0 +1,7 @@ +Route4_MapConnectionsList: @ 8352A3C + connection down, -60, MAP_ROUTE3 + connection right, -10, MAP_CERULEANCITY + +Route4_MapConnections:: @ 8352A54 + .4byte 2 + .4byte Route4_MapConnectionsList diff --git a/data/maps/Route4/header.inc b/data/maps/Route4/header.inc new file mode 100644 index 000000000..ed68203b1 --- /dev/null +++ b/data/maps/Route4/header.inc @@ -0,0 +1,8 @@ +Route4:: @ 8350880 + .4byte Route4_Layout @ 0x82E8338 + .4byte gMapEvents_Route4 @ 0x83B6980 + .4byte gMapScripts_Route4 @ 0x8167F8A + .4byte Route4_MapConnections @ 0x8352A54 + .2byte BGM_FRLG_ROUTE_3 + .2byte 92 + .byte 0x68, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/Route4_PokemonCenter_1F/header.inc b/data/maps/Route4_PokemonCenter_1F/header.inc new file mode 100644 index 000000000..f48c8935e --- /dev/null +++ b/data/maps/Route4_PokemonCenter_1F/header.inc @@ -0,0 +1,8 @@ +Route4_PokemonCenter_1F:: @ 83517D0 + .4byte PokemonCenter_1F_Layout @ 0x82D5990 + .4byte gMapEvents_Route4_PokemonCenter_1F @ 0x83BD57C + .4byte gMapScripts_Route4_PokemonCenter_1F @ 0x816F739 + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 8 + .byte 0x68, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/Route4_PokemonCenter_2F/header.inc b/data/maps/Route4_PokemonCenter_2F/header.inc new file mode 100644 index 000000000..8ae29faa7 --- /dev/null +++ b/data/maps/Route4_PokemonCenter_2F/header.inc @@ -0,0 +1,8 @@ +Route4_PokemonCenter_2F:: @ 83517EC + .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 + .4byte gMapEvents_Route4_PokemonCenter_2F @ 0x83BD608 + .4byte gMapScripts_Route4_PokemonCenter_2F @ 0x816F8D8 + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 9 + .byte 0x68, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/Route5/connections.inc b/data/maps/Route5/connections.inc new file mode 100644 index 000000000..edf2fbc65 --- /dev/null +++ b/data/maps/Route5/connections.inc @@ -0,0 +1,7 @@ +Route5_MapConnectionsList: @ 8352A5C + connection up, 0, MAP_CERULEANCITY + connection down, 0, MAP_SAFFRONCITY + +Route5_MapConnections:: @ 8352A74 + .4byte 2 + .4byte Route5_MapConnectionsList diff --git a/data/maps/Route5/header.inc b/data/maps/Route5/header.inc new file mode 100644 index 000000000..e688654a4 --- /dev/null +++ b/data/maps/Route5/header.inc @@ -0,0 +1,8 @@ +Route5:: @ 835089C + .4byte Route5_Layout @ 0x82E925C + .4byte gMapEvents_Route5 @ 0x83B69C0 + .4byte gMapScripts_Route5 @ 0x8167FA7 + .4byte Route5_MapConnections @ 0x8352A74 + .2byte BGM_FRLG_ROUTE_3 + .2byte 93 + .byte 0x69, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/Route5_PokemonDayCare/header.inc b/data/maps/Route5_PokemonDayCare/header.inc new file mode 100644 index 000000000..5d2affab9 --- /dev/null +++ b/data/maps/Route5_PokemonDayCare/header.inc @@ -0,0 +1,8 @@ +Route5_PokemonDayCare:: @ 8351808 + .4byte Route5_PokemonDayCare_Layout @ 0x833ADC0 + .4byte gMapEvents_Route5_PokemonDayCare @ 0x83BD64C + .4byte gMapScripts_Route5_PokemonDayCare @ 0x816F8FF + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_CITY + .2byte 275 + .byte 0x69, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/Route5_SouthEntrance/header.inc b/data/maps/Route5_SouthEntrance/header.inc new file mode 100644 index 000000000..4617ef84b --- /dev/null +++ b/data/maps/Route5_SouthEntrance/header.inc @@ -0,0 +1,8 @@ +Route5_SouthEntrance:: @ 8351824 + .4byte SaffronCity_NorthSouthEntrance_Layout @ 0x831E9C0 + .4byte gMapEvents_Route5_SouthEntrance @ 0x83BD6C8 + .4byte gMapScripts_Route5_SouthEntrance @ 0x816F900 + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_CITY + .2byte 208 + .byte 0x69, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00 diff --git a/data/maps/Route6/connections.inc b/data/maps/Route6/connections.inc new file mode 100644 index 000000000..f4b3500bc --- /dev/null +++ b/data/maps/Route6/connections.inc @@ -0,0 +1,7 @@ +Route6_MapConnectionsList: @ 8352A7C + connection up, 0, MAP_SAFFRONCITY + connection down, -12, MAP_VERMILIONCITY + +Route6_MapConnections:: @ 8352A94 + .4byte 2 + .4byte Route6_MapConnectionsList diff --git a/data/maps/Route6/header.inc b/data/maps/Route6/header.inc new file mode 100644 index 000000000..5d29ba552 --- /dev/null +++ b/data/maps/Route6/header.inc @@ -0,0 +1,8 @@ +Route6:: @ 83508B8 + .4byte Route6_Layout @ 0x82E9A00 + .4byte gMapEvents_Route6 @ 0x83B6AA0 + .4byte gMapScripts_Route6 @ 0x8167FB1 + .4byte Route6_MapConnections @ 0x8352A94 + .2byte BGM_FRLG_ROUTE_3 + .2byte 94 + .byte 0x6a, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/Route6_NorthEntrance/header.inc b/data/maps/Route6_NorthEntrance/header.inc new file mode 100644 index 000000000..1127ca878 --- /dev/null +++ b/data/maps/Route6_NorthEntrance/header.inc @@ -0,0 +1,8 @@ +Route6_NorthEntrance:: @ 8351840 + .4byte SaffronCity_NorthSouthEntrance_Layout @ 0x831E9C0 + .4byte gMapEvents_Route6_NorthEntrance @ 0x83BD744 + .4byte gMapScripts_Route6_NorthEntrance @ 0x816F9C6 + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_CITY + .2byte 208 + .byte 0x6a, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00 diff --git a/data/maps/Route7/connections.inc b/data/maps/Route7/connections.inc new file mode 100644 index 000000000..63d59a73a --- /dev/null +++ b/data/maps/Route7/connections.inc @@ -0,0 +1,7 @@ +Route7_MapConnectionsList: @ 8352A9C + connection left, -10, MAP_CELADONCITY + connection right, -10, MAP_SAFFRONCITY + +Route7_MapConnections:: @ 8352AB4 + .4byte 2 + .4byte Route7_MapConnectionsList diff --git a/data/maps/Route7/header.inc b/data/maps/Route7/header.inc new file mode 100644 index 000000000..8e7e0472a --- /dev/null +++ b/data/maps/Route7/header.inc @@ -0,0 +1,8 @@ +Route7:: @ 83508D4 + .4byte Route7_Layout @ 0x82E9DE4 + .4byte gMapEvents_Route7 @ 0x83B6AF4 + .4byte gMapScripts_Route7 @ 0x8167FBB + .4byte Route7_MapConnections @ 0x8352AB4 + .2byte BGM_FRLG_ROUTE_3 + .2byte 95 + .byte 0x6b, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/Route7_EastEntrance/header.inc b/data/maps/Route7_EastEntrance/header.inc new file mode 100644 index 000000000..1a30930fa --- /dev/null +++ b/data/maps/Route7_EastEntrance/header.inc @@ -0,0 +1,8 @@ +Route7_EastEntrance:: @ 8351878 + .4byte SaffronCity_EastWestEntrance_Layout @ 0x831EAD0 + .4byte gMapEvents_Route7_EastEntrance @ 0x83BD7D4 + .4byte gMapScripts_Route7_EastEntrance @ 0x816FA8D + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_CITY + .2byte 209 + .byte 0x6b, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00 diff --git a/data/maps/Route8/connections.inc b/data/maps/Route8/connections.inc new file mode 100644 index 000000000..38d2746fe --- /dev/null +++ b/data/maps/Route8/connections.inc @@ -0,0 +1,7 @@ +Route8_MapConnectionsList: @ 8352ABC + connection left, -10, MAP_SAFFRONCITY + connection right, 0, MAP_LAVENDERTOWN + +Route8_MapConnections:: @ 8352AD4 + .4byte 2 + .4byte Route8_MapConnectionsList diff --git a/data/maps/Route8/header.inc b/data/maps/Route8/header.inc new file mode 100644 index 000000000..85bc28400 --- /dev/null +++ b/data/maps/Route8/header.inc @@ -0,0 +1,8 @@ +Route8:: @ 83508F0 + .4byte Route8_Layout @ 0x82EA948 + .4byte gMapEvents_Route8 @ 0x83B6CB0 + .4byte gMapScripts_Route8 @ 0x8167FC5 + .4byte Route8_MapConnections @ 0x8352AD4 + .2byte BGM_FRLG_ROUTE_3 + .2byte 96 + .byte 0x6c, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/Route8_WestEntrance/header.inc b/data/maps/Route8_WestEntrance/header.inc new file mode 100644 index 000000000..4eb91b5bd --- /dev/null +++ b/data/maps/Route8_WestEntrance/header.inc @@ -0,0 +1,8 @@ +Route8_WestEntrance:: @ 8351894 + .4byte SaffronCity_EastWestEntrance_Layout @ 0x831EAD0 + .4byte gMapEvents_Route8_WestEntrance @ 0x83BD850 + .4byte gMapScripts_Route8_WestEntrance @ 0x816FB53 + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_CITY + .2byte 209 + .byte 0x6c, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00 diff --git a/data/maps/Route9/connections.inc b/data/maps/Route9/connections.inc new file mode 100644 index 000000000..fb8906ece --- /dev/null +++ b/data/maps/Route9/connections.inc @@ -0,0 +1,7 @@ +Route9_MapConnectionsList: @ 8352ADC + connection left, -10, MAP_CERULEANCITY + connection right, 0, MAP_ROUTE10 + +Route9_MapConnections:: @ 8352AF4 + .4byte 2 + .4byte Route9_MapConnectionsList diff --git a/data/maps/Route9/header.inc b/data/maps/Route9/header.inc new file mode 100644 index 000000000..559f56a41 --- /dev/null +++ b/data/maps/Route9/header.inc @@ -0,0 +1,8 @@ +Route9:: @ 835090C + .4byte Route9_Layout @ 0x82EB4AC + .4byte gMapEvents_Route9 @ 0x83B6E14 + .4byte gMapScripts_Route9 @ 0x8167FCF + .4byte Route9_MapConnections @ 0x8352AF4 + .2byte BGM_FRLG_ROUTE_3 + .2byte 97 + .byte 0x6d, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/SSAnne_1F_Corridor/header.inc b/data/maps/SSAnne_1F_Corridor/header.inc new file mode 100644 index 000000000..ee2523774 --- /dev/null +++ b/data/maps/SSAnne_1F_Corridor/header.inc @@ -0,0 +1,8 @@ +SSAnne_1F_Corridor:: @ 834F2A0 + .4byte SSAnne_1F_Corridor_Layout @ 0x82FFB4C + .4byte gMapEvents_SSAnne_1F_Corridor @ 0x83AE974 + .4byte gMapScripts_SSAnne_1F_Corridor @ 0x81608CB + .4byte NULL + .2byte BGM_FRLG_SS_ANNE + .2byte 119 + .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/SSAnne_1F_Room1/header.inc b/data/maps/SSAnne_1F_Room1/header.inc new file mode 100644 index 000000000..1da716524 --- /dev/null +++ b/data/maps/SSAnne_1F_Room1/header.inc @@ -0,0 +1,8 @@ +SSAnne_1F_Room1:: @ 834F364 + .4byte SSAnne_Room1_Layout @ 0x8319E74 + .4byte gMapEvents_SSAnne_1F_Room1 @ 0x83AECEC + .4byte gMapScripts_SSAnne_1F_Room1 @ 0x8160BDB + .4byte NULL + .2byte BGM_FRLG_SS_ANNE + .2byte 177 + .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/SSAnne_1F_Room11/header.inc b/data/maps/SSAnne_1F_Room11/header.inc new file mode 100644 index 000000000..86a4b43e3 --- /dev/null +++ b/data/maps/SSAnne_1F_Room11/header.inc @@ -0,0 +1,8 @@ +SSAnne_1F_Room11:: @ 834FF50 + .4byte SSAnne_1F_Room11_Layout @ 0x8345030 + .4byte gMapEvents_SSAnne_1F_Room11 @ 0x83B3B34 + .4byte gMapScripts_SSAnne_1F_Room11 @ 0x8164559 + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_FOREST + .2byte 317 + .byte 0xb6, 0x00, 0x00, 0x03, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/SSAnne_1F_Room12/header.inc b/data/maps/SSAnne_1F_Room12/header.inc new file mode 100644 index 000000000..0c1206221 --- /dev/null +++ b/data/maps/SSAnne_1F_Room12/header.inc @@ -0,0 +1,8 @@ +SSAnne_1F_Room12:: @ 834FF6C + .4byte SSAnne_1F_Room12_Layout @ 0x8347A50 + .4byte gMapEvents_SSAnne_1F_Room12 @ 0x83B3B50 + .4byte gMapScripts_SSAnne_1F_Room12 @ 0x81646A4 + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 340 + .byte 0xb7, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/SSAnne_1F_Room2/header.inc b/data/maps/SSAnne_1F_Room2/header.inc new file mode 100644 index 000000000..ff27c0fc5 --- /dev/null +++ b/data/maps/SSAnne_1F_Room2/header.inc @@ -0,0 +1,8 @@ +SSAnne_1F_Room2:: @ 834F380 + .4byte SSAnne_Room1_Layout @ 0x8319E74 + .4byte gMapEvents_SSAnne_1F_Room2 @ 0x83AED68 + .4byte gMapScripts_SSAnne_1F_Room2 @ 0x8160BE5 + .4byte NULL + .2byte BGM_FRLG_SS_ANNE + .2byte 177 + .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/SSAnne_1F_Room3/header.inc b/data/maps/SSAnne_1F_Room3/header.inc new file mode 100644 index 000000000..87fa83e15 --- /dev/null +++ b/data/maps/SSAnne_1F_Room3/header.inc @@ -0,0 +1,8 @@ +SSAnne_1F_Room3:: @ 834F39C + .4byte SSAnne_Room1_Layout @ 0x8319E74 + .4byte gMapEvents_SSAnne_1F_Room3 @ 0x83AEDCC + .4byte gMapScripts_SSAnne_1F_Room3 @ 0x8160C1D + .4byte NULL + .2byte BGM_FRLG_SS_ANNE + .2byte 177 + .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/SSAnne_1F_Room4/header.inc b/data/maps/SSAnne_1F_Room4/header.inc new file mode 100644 index 000000000..20e7592c8 --- /dev/null +++ b/data/maps/SSAnne_1F_Room4/header.inc @@ -0,0 +1,8 @@ +SSAnne_1F_Room4:: @ 834F3B8 + .4byte SSAnne_Room1_Layout @ 0x8319E74 + .4byte gMapEvents_SSAnne_1F_Room4 @ 0x83AEE00 + .4byte gMapScripts_SSAnne_1F_Room4 @ 0x8160C43 + .4byte NULL + .2byte BGM_FRLG_SS_ANNE + .2byte 177 + .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/SSAnne_1F_Room5/header.inc b/data/maps/SSAnne_1F_Room5/header.inc new file mode 100644 index 000000000..17e6e6177 --- /dev/null +++ b/data/maps/SSAnne_1F_Room5/header.inc @@ -0,0 +1,8 @@ +SSAnne_1F_Room5:: @ 834F3D4 + .4byte SSAnne_Room1_Layout @ 0x8319E74 + .4byte gMapEvents_SSAnne_1F_Room5 @ 0x83AEE34 + .4byte gMapScripts_SSAnne_1F_Room5 @ 0x8160C66 + .4byte NULL + .2byte BGM_FRLG_SS_ANNE + .2byte 177 + .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/SSAnne_1F_Room6/header.inc b/data/maps/SSAnne_1F_Room6/header.inc new file mode 100644 index 000000000..21e7d4adf --- /dev/null +++ b/data/maps/SSAnne_1F_Room6/header.inc @@ -0,0 +1,8 @@ +SSAnne_1F_Room6:: @ 834F540 + .4byte SSAnne_Room1_Layout @ 0x8319E74 + .4byte gMapEvents_SSAnne_1F_Room6 @ 0x83AF210 + .4byte gMapScripts_SSAnne_1F_Room6 @ 0x8160DF2 + .4byte NULL + .2byte BGM_FRLG_SS_ANNE + .2byte 177 + .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/SSAnne_1F_Room7/header.inc b/data/maps/SSAnne_1F_Room7/header.inc new file mode 100644 index 000000000..04752a2a5 --- /dev/null +++ b/data/maps/SSAnne_1F_Room7/header.inc @@ -0,0 +1,8 @@ +SSAnne_1F_Room7:: @ 834F3F0 + .4byte SSAnne_Room1_Layout @ 0x8319E74 + .4byte gMapEvents_SSAnne_1F_Room7 @ 0x83AEE68 + .4byte gMapScripts_SSAnne_1F_Room7 @ 0x8160C7E + .4byte NULL + .2byte BGM_FRLG_SS_ANNE + .2byte 177 + .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/SSAnne_2F_Corridor/header.inc b/data/maps/SSAnne_2F_Corridor/header.inc new file mode 100644 index 000000000..6269a69a2 --- /dev/null +++ b/data/maps/SSAnne_2F_Corridor/header.inc @@ -0,0 +1,8 @@ +SSAnne_2F_Corridor:: @ 834F2BC + .4byte SSAnne_2F_Corridor_Layout @ 0x82FFFB0 + .4byte gMapEvents_SSAnne_2F_Corridor @ 0x83AEA30 + .4byte gMapScripts_SSAnne_2F_Corridor @ 0x81608DE + .4byte NULL + .2byte BGM_FRLG_SS_ANNE + .2byte 120 + .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/SSAnne_2F_Room1/header.inc b/data/maps/SSAnne_2F_Room1/header.inc new file mode 100644 index 000000000..0c430c47e --- /dev/null +++ b/data/maps/SSAnne_2F_Room1/header.inc @@ -0,0 +1,8 @@ +SSAnne_2F_Room1:: @ 834F40C + .4byte SSAnne_Room2_Layout @ 0x8319F04 + .4byte gMapEvents_SSAnne_2F_Room1 @ 0x83AEE9C + .4byte gMapScripts_SSAnne_2F_Room1 @ 0x8160C96 + .4byte NULL + .2byte BGM_FRLG_SS_ANNE + .2byte 178 + .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/SSAnne_2F_Room2/header.inc b/data/maps/SSAnne_2F_Room2/header.inc new file mode 100644 index 000000000..9a9e944e1 --- /dev/null +++ b/data/maps/SSAnne_2F_Room2/header.inc @@ -0,0 +1,8 @@ +SSAnne_2F_Room2:: @ 834F428 + .4byte SSAnne_Room2_Layout @ 0x8319F04 + .4byte gMapEvents_SSAnne_2F_Room2 @ 0x83AEF00 + .4byte gMapScripts_SSAnne_2F_Room2 @ 0x8160CB0 + .4byte NULL + .2byte BGM_FRLG_SS_ANNE + .2byte 178 + .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/SSAnne_2F_Room3/header.inc b/data/maps/SSAnne_2F_Room3/header.inc new file mode 100644 index 000000000..6d749d6e0 --- /dev/null +++ b/data/maps/SSAnne_2F_Room3/header.inc @@ -0,0 +1,8 @@ +SSAnne_2F_Room3:: @ 834F444 + .4byte SSAnne_Room2_Layout @ 0x8319F04 + .4byte gMapEvents_SSAnne_2F_Room3 @ 0x83AEF4C + .4byte gMapScripts_SSAnne_2F_Room3 @ 0x8160CDF + .4byte NULL + .2byte BGM_FRLG_SS_ANNE + .2byte 178 + .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/SSAnne_2F_Room4/header.inc b/data/maps/SSAnne_2F_Room4/header.inc new file mode 100644 index 000000000..20b40d53a --- /dev/null +++ b/data/maps/SSAnne_2F_Room4/header.inc @@ -0,0 +1,8 @@ +SSAnne_2F_Room4:: @ 834F460 + .4byte SSAnne_Room2_Layout @ 0x8319F04 + .4byte gMapEvents_SSAnne_2F_Room4 @ 0x83AEFB0 + .4byte gMapScripts_SSAnne_2F_Room4 @ 0x8160CF2 + .4byte NULL + .2byte BGM_FRLG_SS_ANNE + .2byte 178 + .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/SSAnne_2F_Room5/header.inc b/data/maps/SSAnne_2F_Room5/header.inc new file mode 100644 index 000000000..f85f59058 --- /dev/null +++ b/data/maps/SSAnne_2F_Room5/header.inc @@ -0,0 +1,8 @@ +SSAnne_2F_Room5:: @ 834F47C + .4byte SSAnne_Room2_Layout @ 0x8319F04 + .4byte gMapEvents_SSAnne_2F_Room5 @ 0x83AEFFC + .4byte gMapScripts_SSAnne_2F_Room5 @ 0x8160D21 + .4byte NULL + .2byte BGM_FRLG_SS_ANNE + .2byte 178 + .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/SSAnne_2F_Room6/header.inc b/data/maps/SSAnne_2F_Room6/header.inc new file mode 100644 index 000000000..b469ade44 --- /dev/null +++ b/data/maps/SSAnne_2F_Room6/header.inc @@ -0,0 +1,8 @@ +SSAnne_2F_Room6:: @ 834F498 + .4byte SSAnne_Room2_Layout @ 0x8319F04 + .4byte gMapEvents_SSAnne_2F_Room6 @ 0x83AF048 + .4byte gMapScripts_SSAnne_2F_Room6 @ 0x8160D34 + .4byte NULL + .2byte BGM_FRLG_SS_ANNE + .2byte 178 + .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/SSAnne_3F_Corridor/header.inc b/data/maps/SSAnne_3F_Corridor/header.inc new file mode 100644 index 000000000..542dd9301 --- /dev/null +++ b/data/maps/SSAnne_3F_Corridor/header.inc @@ -0,0 +1,8 @@ +SSAnne_3F_Corridor:: @ 834F2D8 + .4byte SSAnne_3F_Corridor_Layout @ 0x8300108 + .4byte gMapEvents_SSAnne_3F_Corridor @ 0x83AEA74 + .4byte gMapScripts_SSAnne_3F_Corridor @ 0x8160A5D + .4byte NULL + .2byte BGM_FRLG_SS_ANNE + .2byte 121 + .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/SSAnne_B1F_Corridor/header.inc b/data/maps/SSAnne_B1F_Corridor/header.inc new file mode 100644 index 000000000..af25e7b96 --- /dev/null +++ b/data/maps/SSAnne_B1F_Corridor/header.inc @@ -0,0 +1,8 @@ +SSAnne_B1F_Corridor:: @ 834F2F4 + .4byte SSAnne_B1F_Corridor_Layout @ 0x8300270 + .4byte gMapEvents_SSAnne_B1F_Corridor @ 0x83AEAC4 + .4byte gMapScripts_SSAnne_B1F_Corridor @ 0x8160A67 + .4byte NULL + .2byte BGM_FRLG_SS_ANNE + .2byte 122 + .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/SSAnne_B1F_Room1/header.inc b/data/maps/SSAnne_B1F_Room1/header.inc new file mode 100644 index 000000000..33e35bdf8 --- /dev/null +++ b/data/maps/SSAnne_B1F_Room1/header.inc @@ -0,0 +1,8 @@ +SSAnne_B1F_Room1:: @ 834F4B4 + .4byte SSAnne_Room2_Layout @ 0x8319F04 + .4byte gMapEvents_SSAnne_B1F_Room1 @ 0x83AF094 + .4byte gMapScripts_SSAnne_B1F_Room1 @ 0x8160D47 + .4byte NULL + .2byte BGM_FRLG_SS_ANNE + .2byte 178 + .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/SSAnne_B1F_Room2/header.inc b/data/maps/SSAnne_B1F_Room2/header.inc new file mode 100644 index 000000000..86a3cac32 --- /dev/null +++ b/data/maps/SSAnne_B1F_Room2/header.inc @@ -0,0 +1,8 @@ +SSAnne_B1F_Room2:: @ 834F4D0 + .4byte SSAnne_Room2_Layout @ 0x8319F04 + .4byte gMapEvents_SSAnne_B1F_Room2 @ 0x83AF0E0 + .4byte gMapScripts_SSAnne_B1F_Room2 @ 0x8160D76 + .4byte NULL + .2byte BGM_FRLG_SS_ANNE + .2byte 178 + .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/SSAnne_B1F_Room3/header.inc b/data/maps/SSAnne_B1F_Room3/header.inc new file mode 100644 index 000000000..f5ab0a506 --- /dev/null +++ b/data/maps/SSAnne_B1F_Room3/header.inc @@ -0,0 +1,8 @@ +SSAnne_B1F_Room3:: @ 834F4EC + .4byte SSAnne_Room2_Layout @ 0x8319F04 + .4byte gMapEvents_SSAnne_B1F_Room3 @ 0x83AF12C + .4byte gMapScripts_SSAnne_B1F_Room3 @ 0x8160D8E + .4byte NULL + .2byte BGM_FRLG_SS_ANNE + .2byte 178 + .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/SSAnne_B1F_Room4/header.inc b/data/maps/SSAnne_B1F_Room4/header.inc new file mode 100644 index 000000000..9b8dc59c7 --- /dev/null +++ b/data/maps/SSAnne_B1F_Room4/header.inc @@ -0,0 +1,8 @@ +SSAnne_B1F_Room4:: @ 834F508 + .4byte SSAnne_Room2_Layout @ 0x8319F04 + .4byte gMapEvents_SSAnne_B1F_Room4 @ 0x83AF178 + .4byte gMapScripts_SSAnne_B1F_Room4 @ 0x8160DA6 + .4byte NULL + .2byte BGM_FRLG_SS_ANNE + .2byte 178 + .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/SSAnne_B1F_Room5/header.inc b/data/maps/SSAnne_B1F_Room5/header.inc new file mode 100644 index 000000000..82dd62873 --- /dev/null +++ b/data/maps/SSAnne_B1F_Room5/header.inc @@ -0,0 +1,8 @@ +SSAnne_B1F_Room5:: @ 834F524 + .4byte SSAnne_Room2_Layout @ 0x8319F04 + .4byte gMapEvents_SSAnne_B1F_Room5 @ 0x83AF1DC + .4byte gMapScripts_SSAnne_B1F_Room5 @ 0x8160DD5 + .4byte NULL + .2byte BGM_FRLG_SS_ANNE + .2byte 178 + .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/SSAnne_CaptainsOffice/header.inc b/data/maps/SSAnne_CaptainsOffice/header.inc new file mode 100644 index 000000000..34c346691 --- /dev/null +++ b/data/maps/SSAnne_CaptainsOffice/header.inc @@ -0,0 +1,8 @@ +SSAnne_CaptainsOffice:: @ 834F348 + .4byte SSAnne_CaptainsOffice_Layout @ 0x83192EC + .4byte gMapEvents_SSAnne_CaptainsOffice @ 0x83AECB8 + .4byte gMapScripts_SSAnne_CaptainsOffice @ 0x8160B39 + .4byte NULL + .2byte BGM_FRLG_SS_ANNE + .2byte 171 + .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/SSAnne_CaptainsOffice2/header.inc b/data/maps/SSAnne_CaptainsOffice2/header.inc new file mode 100644 index 000000000..de121229e --- /dev/null +++ b/data/maps/SSAnne_CaptainsOffice2/header.inc @@ -0,0 +1,8 @@ +SSAnne_CaptainsOffice2:: @ 834FE54 + .4byte SSAnne_CaptainsOffice2_Layout @ 0x8341560 + .4byte gMapEvents_SSAnne_CaptainsOffice2 @ 0x83B3508 + .4byte gMapScripts_SSAnne_CaptainsOffice2 @ 0x8163D81 + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 295 + .byte 0xb1, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/SSAnne_CaptainsOffice3/header.inc b/data/maps/SSAnne_CaptainsOffice3/header.inc new file mode 100644 index 000000000..393ee9983 --- /dev/null +++ b/data/maps/SSAnne_CaptainsOffice3/header.inc @@ -0,0 +1,8 @@ +SSAnne_CaptainsOffice3:: @ 834FE70 + .4byte SSAnne_CaptainsOffice3_Layout @ 0x8341A98 + .4byte gMapEvents_SSAnne_CaptainsOffice3 @ 0x83B35B4 + .4byte gMapScripts_SSAnne_CaptainsOffice3 @ 0x8163D82 + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 296 + .byte 0xb1, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/SSAnne_CaptainsOffice4/header.inc b/data/maps/SSAnne_CaptainsOffice4/header.inc new file mode 100644 index 000000000..2f10ad142 --- /dev/null +++ b/data/maps/SSAnne_CaptainsOffice4/header.inc @@ -0,0 +1,8 @@ +SSAnne_CaptainsOffice4:: @ 834FE8C + .4byte SSAnne_CaptainsOffice4_Layout @ 0x83405A4 + .4byte gMapEvents_SSAnne_CaptainsOffice4 @ 0x83B381C + .4byte gMapScripts_SSAnne_CaptainsOffice4 @ 0x8163F2E + .4byte NULL + .2byte BGM_FRLG_ROCKET_HIDEOUT + .2byte 292 + .byte 0xb2, 0x00, 0x00, 0x08, 0x00, 0x05, 0x00, 0x03 diff --git a/data/maps/SSAnne_CaptainsOffice5/header.inc b/data/maps/SSAnne_CaptainsOffice5/header.inc new file mode 100644 index 000000000..c603c103d --- /dev/null +++ b/data/maps/SSAnne_CaptainsOffice5/header.inc @@ -0,0 +1,8 @@ +SSAnne_CaptainsOffice5:: @ 834FEA8 + .4byte SSAnne_CaptainsOffice5_Layout @ 0x83436C4 + .4byte gMapEvents_SSAnne_CaptainsOffice5 @ 0x83B3850 + .4byte gMapScripts_SSAnne_CaptainsOffice5 @ 0x8164182 + .4byte NULL + .2byte BGM_FRLG_TANOBY_RUINS + .2byte 309 + .byte 0xb4, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/SSAnne_CaptainsOffice9/header.inc b/data/maps/SSAnne_CaptainsOffice9/header.inc new file mode 100644 index 000000000..3354834a2 --- /dev/null +++ b/data/maps/SSAnne_CaptainsOffice9/header.inc @@ -0,0 +1,8 @@ +SSAnne_CaptainsOffice9:: @ 834FF18 + .4byte SSAnne_CaptainsOffice9_Layout @ 0x8343BD4 + .4byte gMapEvents_SSAnne_CaptainsOffice9 @ 0x83B3970 + .4byte gMapScripts_SSAnne_CaptainsOffice9 @ 0x81641B3 + .4byte NULL + .2byte BGM_FRLG_TANOBY_RUINS + .2byte 313 + .byte 0xb4, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/SSAnne_Deck/header.inc b/data/maps/SSAnne_Deck/header.inc new file mode 100644 index 000000000..5c38770bd --- /dev/null +++ b/data/maps/SSAnne_Deck/header.inc @@ -0,0 +1,8 @@ +SSAnne_Deck:: @ 834F310 + .4byte SSAnne_Deck_Layout @ 0x8300624 + .4byte gMapEvents_SSAnne_Deck @ 0x83AEB60 + .4byte gMapScripts_SSAnne_Deck @ 0x8160A68 + .4byte NULL + .2byte BGM_FRLG_SS_ANNE + .2byte 123 + .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/SSAnne_Exterior/header.inc b/data/maps/SSAnne_Exterior/header.inc new file mode 100644 index 000000000..9ad5649b9 --- /dev/null +++ b/data/maps/SSAnne_Exterior/header.inc @@ -0,0 +1,8 @@ +SSAnne_Exterior:: @ 834F284 + .4byte SSAnne_Exterior_Layout @ 0x82FF610 + .4byte gMapEvents_SSAnne_Exterior @ 0x83AE8C8 + .4byte gMapScripts_SSAnne_Exterior @ 0x8160840 + .4byte NULL + .2byte BGM_FRLG_SS_ANNE + .2byte 118 + .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/SSAnne_Kitchen/header.inc b/data/maps/SSAnne_Kitchen/header.inc new file mode 100644 index 000000000..ca1ae5f2f --- /dev/null +++ b/data/maps/SSAnne_Kitchen/header.inc @@ -0,0 +1,8 @@ +SSAnne_Kitchen:: @ 834F32C + .4byte SSAnne_Kitchen_Layout @ 0x8319214 + .4byte gMapEvents_SSAnne_Kitchen @ 0x83AEC60 + .4byte gMapScripts_SSAnne_Kitchen @ 0x8160AB2 + .4byte NULL + .2byte BGM_FRLG_SS_ANNE + .2byte 170 + .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/SSAnne_Kitchen3/header.inc b/data/maps/SSAnne_Kitchen3/header.inc new file mode 100644 index 000000000..c017888c2 --- /dev/null +++ b/data/maps/SSAnne_Kitchen3/header.inc @@ -0,0 +1,8 @@ +SSAnne_Kitchen3:: @ 834FD58 + .4byte SSAnne_Kitchen3_Layout @ 0x833F304 + .4byte gMapEvents_SSAnne_Kitchen3 @ 0x83B2EE0 + .4byte gMapScripts_SSAnne_Kitchen3 @ 0x8163C45 + .4byte NULL + .2byte BGM_FRLG_MT_EMBER + .2byte 285 + .byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/SafariZone_Building1/header.inc b/data/maps/SafariZone_Building1/header.inc new file mode 100644 index 000000000..039fab75c --- /dev/null +++ b/data/maps/SafariZone_Building1/header.inc @@ -0,0 +1,8 @@ +SafariZone_Building1:: @ 834F968 + .4byte SafariZone_Building_Layout @ 0x831C028 + .4byte gMapEvents_SafariZone_Building1 @ 0x83B12CC + .4byte gMapScripts_SafariZone_Building1 @ 0x81623EB + .4byte NULL + .2byte BGM_FRLG_SAFARI_ZONE + .2byte 198 + .byte 0x88, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/SafariZone_Building2/header.inc b/data/maps/SafariZone_Building2/header.inc new file mode 100644 index 000000000..c9d80e2c9 --- /dev/null +++ b/data/maps/SafariZone_Building2/header.inc @@ -0,0 +1,8 @@ +SafariZone_Building2:: @ 834F984 + .4byte SafariZone_Building_Layout @ 0x831C028 + .4byte gMapEvents_SafariZone_Building2 @ 0x83B1340 + .4byte gMapScripts_SafariZone_Building2 @ 0x81623FE + .4byte NULL + .2byte BGM_FRLG_SAFARI_ZONE + .2byte 198 + .byte 0x88, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/SafariZone_Building3/header.inc b/data/maps/SafariZone_Building3/header.inc new file mode 100644 index 000000000..3439dc9a8 --- /dev/null +++ b/data/maps/SafariZone_Building3/header.inc @@ -0,0 +1,8 @@ +SafariZone_Building3:: @ 834F9A0 + .4byte SafariZone_Building_Layout @ 0x831C028 + .4byte gMapEvents_SafariZone_Building3 @ 0x83B13CC + .4byte gMapScripts_SafariZone_Building3 @ 0x816241A + .4byte NULL + .2byte BGM_FRLG_SAFARI_ZONE + .2byte 198 + .byte 0x88, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/SafariZone_Building4/header.inc b/data/maps/SafariZone_Building4/header.inc new file mode 100644 index 000000000..5f783687e --- /dev/null +++ b/data/maps/SafariZone_Building4/header.inc @@ -0,0 +1,8 @@ +SafariZone_Building4:: @ 834F9BC + .4byte SafariZone_Building_Layout @ 0x831C028 + .4byte gMapEvents_SafariZone_Building4 @ 0x83B1440 + .4byte gMapScripts_SafariZone_Building4 @ 0x8162436 + .4byte NULL + .2byte BGM_FRLG_SAFARI_ZONE + .2byte 198 + .byte 0x88, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/SafariZone_Center/header.inc b/data/maps/SafariZone_Center/header.inc new file mode 100644 index 000000000..357564a36 --- /dev/null +++ b/data/maps/SafariZone_Center/header.inc @@ -0,0 +1,8 @@ +SafariZone_Center:: @ 834F8F8 + .4byte SafariZone_Center_Layout @ 0x830DD38 + .4byte gMapEvents_SafariZone_Center @ 0x83B0F98 + .4byte gMapScripts_SafariZone_Center @ 0x8162357 + .4byte NULL + .2byte BGM_FRLG_SAFARI_ZONE + .2byte 147 + .byte 0x88, 0x00, 0x00, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/SafariZone_East/header.inc b/data/maps/SafariZone_East/header.inc new file mode 100644 index 000000000..4a1093a74 --- /dev/null +++ b/data/maps/SafariZone_East/header.inc @@ -0,0 +1,8 @@ +SafariZone_East:: @ 834F914 + .4byte SafariZone_East_Layout @ 0x830EC24 + .4byte gMapEvents_SafariZone_East @ 0x83B1068 + .4byte gMapScripts_SafariZone_East @ 0x816237C + .4byte NULL + .2byte BGM_FRLG_SAFARI_ZONE + .2byte 148 + .byte 0x88, 0x00, 0x00, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/SafariZone_North/header.inc b/data/maps/SafariZone_North/header.inc new file mode 100644 index 000000000..76f71d005 --- /dev/null +++ b/data/maps/SafariZone_North/header.inc @@ -0,0 +1,8 @@ +SafariZone_North:: @ 834F930 + .4byte SafariZone_North_Layout @ 0x830FE1C + .4byte gMapEvents_SafariZone_North @ 0x83B1168 + .4byte gMapScripts_SafariZone_North @ 0x8162398 + .4byte NULL + .2byte BGM_FRLG_SAFARI_ZONE + .2byte 149 + .byte 0x88, 0x00, 0x00, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/SafariZone_SecretHouse/header.inc b/data/maps/SafariZone_SecretHouse/header.inc new file mode 100644 index 000000000..61593dc82 --- /dev/null +++ b/data/maps/SafariZone_SecretHouse/header.inc @@ -0,0 +1,8 @@ +SafariZone_SecretHouse:: @ 834F9D8 + .4byte SafariZone_SecretHouse_Layout @ 0x831C16C + .4byte gMapEvents_SafariZone_SecretHouse @ 0x83B1484 + .4byte gMapScripts_SafariZone_SecretHouse @ 0x8162452 + .4byte NULL + .2byte BGM_FRLG_SAFARI_ZONE + .2byte 199 + .byte 0x88, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/SafariZone_West/header.inc b/data/maps/SafariZone_West/header.inc new file mode 100644 index 000000000..2b2fd6450 --- /dev/null +++ b/data/maps/SafariZone_West/header.inc @@ -0,0 +1,8 @@ +SafariZone_West:: @ 834F94C + .4byte SafariZone_West_Layout @ 0x8310BC4 + .4byte gMapEvents_SafariZone_West @ 0x83B1270 + .4byte gMapScripts_SafariZone_West @ 0x81623C6 + .4byte NULL + .2byte BGM_FRLG_SAFARI_ZONE + .2byte 150 + .byte 0x88, 0x00, 0x00, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/SaffronCity/connections.inc b/data/maps/SaffronCity/connections.inc new file mode 100644 index 000000000..6b2b2b3ff --- /dev/null +++ b/data/maps/SaffronCity/connections.inc @@ -0,0 +1,9 @@ +SaffronCity_MapConnectionsList: @ 83528FC + connection up, 0, MAP_ROUTE5 + connection down, 12, MAP_ROUTE6 + connection left, 10, MAP_ROUTE7 + connection right, 10, MAP_ROUTE8 + +SaffronCity_MapConnections:: @ 835292C + .4byte 4 + .4byte SaffronCity_MapConnectionsList diff --git a/data/maps/SaffronCity/header.inc b/data/maps/SaffronCity/header.inc new file mode 100644 index 000000000..d2f20906d --- /dev/null +++ b/data/maps/SaffronCity/header.inc @@ -0,0 +1,8 @@ +SaffronCity:: @ 835074C + .4byte SaffronCity_Layout @ 0x82E4E28 + .4byte gMapEvents_SaffronCity @ 0x83B5EB0 + .4byte gMapScripts_SaffronCity @ 0x8167483 + .4byte SaffronCity_MapConnections @ 0x835292C + .2byte BGM_FRLG_VIRIDIAN_CITY + .2byte 88 + .byte 0x62, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/SaffronCity_Dojo/header.inc b/data/maps/SaffronCity_Dojo/header.inc new file mode 100644 index 000000000..6710c616d --- /dev/null +++ b/data/maps/SaffronCity_Dojo/header.inc @@ -0,0 +1,8 @@ +SaffronCity_Dojo:: @ 8351680 + .4byte SaffronCity_Dojo_Layout @ 0x83212C4 + .4byte gMapEvents_SaffronCity_Dojo @ 0x83BCD60 + .4byte gMapScripts_SaffronCity_Dojo @ 0x816EBDB + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_CITY + .2byte 228 + .byte 0x62, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/SaffronCity_Duplicate/connections.inc b/data/maps/SaffronCity_Duplicate/connections.inc new file mode 100644 index 000000000..8c6f84d02 --- /dev/null +++ b/data/maps/SaffronCity_Duplicate/connections.inc @@ -0,0 +1,9 @@ +SaffronCity_Duplicate_MapConnectionsList: @ 83528C4 + connection up, 0, MAP_ROUTE5 + connection down, 12, MAP_ROUTE6 + connection left, 10, MAP_ROUTE7 + connection right, 10, MAP_ROUTE8 + +SaffronCity_Duplicate_MapConnections:: @ 83528F4 + .4byte 4 + .4byte SaffronCity_Duplicate_MapConnectionsList diff --git a/data/maps/SaffronCity_Duplicate/header.inc b/data/maps/SaffronCity_Duplicate/header.inc new file mode 100644 index 000000000..62cb00b04 --- /dev/null +++ b/data/maps/SaffronCity_Duplicate/header.inc @@ -0,0 +1,8 @@ +SaffronCity_Duplicate:: @ 8350730 + .4byte SaffronCity_Duplicate_Layout @ 0x831E8D4 + .4byte gMapEvents_SaffronCity_Duplicate @ 0x83B5E9C + .4byte gMapScripts_SaffronCity_Duplicate @ 0x816735F + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_CITY + .2byte 207 + .byte 0x62, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/SaffronCity_Gym/header.inc b/data/maps/SaffronCity_Gym/header.inc new file mode 100644 index 000000000..78f092724 --- /dev/null +++ b/data/maps/SaffronCity_Gym/header.inc @@ -0,0 +1,8 @@ +SaffronCity_Gym:: @ 835169C + .4byte SaffronCity_Gym_Layout @ 0x82D7C44 + .4byte gMapEvents_SaffronCity_Gym @ 0x83BCF6C + .4byte gMapScripts_SaffronCity_Gym @ 0x816EDD7 + .4byte NULL + .2byte BGM_FRLG_GYM + .2byte 34 + .byte 0x62, 0x00, 0x00, 0x08, 0x00, 0x01, 0x00, 0x01 diff --git a/data/maps/SaffronCity_House1_1F/header.inc b/data/maps/SaffronCity_House1_1F/header.inc new file mode 100644 index 000000000..594ddd6c5 --- /dev/null +++ b/data/maps/SaffronCity_House1_1F/header.inc @@ -0,0 +1,8 @@ +SaffronCity_House1_1F:: @ 8351648 + .4byte SaffronCity_House1_1F_Layout @ 0x8321004 + .4byte gMapEvents_SaffronCity_House1_1F @ 0x83BCB9C + .4byte gMapScripts_SaffronCity_House1_1F @ 0x816EB36 + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_CITY + .2byte 226 + .byte 0x62, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/SaffronCity_House1_2F/header.inc b/data/maps/SaffronCity_House1_2F/header.inc new file mode 100644 index 000000000..00dbee440 --- /dev/null +++ b/data/maps/SaffronCity_House1_2F/header.inc @@ -0,0 +1,8 @@ +SaffronCity_House1_2F:: @ 8351664 + .4byte SaffronCity_House1_2F_Layout @ 0x8321100 + .4byte gMapEvents_SaffronCity_House1_2F @ 0x83BCC3C + .4byte gMapScripts_SaffronCity_House1_2F @ 0x816EB5C + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_CITY + .2byte 227 + .byte 0x62, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/SaffronCity_House2/header.inc b/data/maps/SaffronCity_House2/header.inc new file mode 100644 index 000000000..e41fc17e7 --- /dev/null +++ b/data/maps/SaffronCity_House2/header.inc @@ -0,0 +1,8 @@ +SaffronCity_House2:: @ 83516B8 + .4byte House5_Layout @ 0x82D6AF0 + .4byte gMapEvents_SaffronCity_House2 @ 0x83BD004 + .4byte gMapScripts_SaffronCity_House2 @ 0x816EF73 + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_CITY + .2byte 21 + .byte 0x62, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/SaffronCity_House3/header.inc b/data/maps/SaffronCity_House3/header.inc new file mode 100644 index 000000000..3662663c9 --- /dev/null +++ b/data/maps/SaffronCity_House3/header.inc @@ -0,0 +1,8 @@ +SaffronCity_House3:: @ 8351728 + .4byte House5_Layout @ 0x82D6AF0 + .4byte gMapEvents_SaffronCity_House3 @ 0x83BD20C + .4byte gMapScripts_SaffronCity_House3 @ 0x816F05E + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_CITY + .2byte 21 + .byte 0x62, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/SaffronCity_Mart/header.inc b/data/maps/SaffronCity_Mart/header.inc new file mode 100644 index 000000000..55164d967 --- /dev/null +++ b/data/maps/SaffronCity_Mart/header.inc @@ -0,0 +1,8 @@ +SaffronCity_Mart:: @ 83516D4 + .4byte Mart_Layout @ 0x82D5BCC + .4byte gMapEvents_SaffronCity_Mart @ 0x83BD078 + .4byte gMapScripts_SaffronCity_Mart @ 0x816EFA2 + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 10 + .byte 0x62, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/SaffronCity_PokemonCenter_1F/header.inc b/data/maps/SaffronCity_PokemonCenter_1F/header.inc new file mode 100644 index 000000000..671ea67b2 --- /dev/null +++ b/data/maps/SaffronCity_PokemonCenter_1F/header.inc @@ -0,0 +1,8 @@ +SaffronCity_PokemonCenter_1F:: @ 83516F0 + .4byte PokemonCenter_1F_Layout @ 0x82D5990 + .4byte gMapEvents_SaffronCity_PokemonCenter_1F @ 0x83BD13C + .4byte gMapScripts_SaffronCity_PokemonCenter_1F @ 0x816EFEC + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 8 + .byte 0x62, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/SaffronCity_PokemonCenter_2F/header.inc b/data/maps/SaffronCity_PokemonCenter_2F/header.inc new file mode 100644 index 000000000..7ed9818d9 --- /dev/null +++ b/data/maps/SaffronCity_PokemonCenter_2F/header.inc @@ -0,0 +1,8 @@ +SaffronCity_PokemonCenter_2F:: @ 835170C + .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 + .4byte gMapEvents_SaffronCity_PokemonCenter_2F @ 0x83BD1C8 + .4byte gMapScripts_SaffronCity_PokemonCenter_2F @ 0x816F037 + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 9 + .byte 0x62, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/header.inc b/data/maps/SaffronCity_PokemonTrainerFanClub/header.inc new file mode 100644 index 000000000..dd5d8195f --- /dev/null +++ b/data/maps/SaffronCity_PokemonTrainerFanClub/header.inc @@ -0,0 +1,8 @@ +SaffronCity_PokemonTrainerFanClub:: @ 8351744 + .4byte SaffronCity_PokemonTrainerFanClub_Layout @ 0x8338A60 + .4byte gMapEvents_SaffronCity_PokemonTrainerFanClub @ 0x83BD318 + .4byte gMapScripts_SaffronCity_PokemonTrainerFanClub @ 0x816F0BF + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_CITY + .2byte 263 + .byte 0x62, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/SeafoamIslands_1F/header.inc b/data/maps/SeafoamIslands_1F/header.inc new file mode 100644 index 000000000..d6ee69b5e --- /dev/null +++ b/data/maps/SeafoamIslands_1F/header.inc @@ -0,0 +1,8 @@ +SeafoamIslands_1F:: @ 834FB28 + .4byte SeafoamIslands_1F_Layout @ 0x831474C + .4byte gMapEvents_SeafoamIslands_1F @ 0x83B1E64 + .4byte gMapScripts_SeafoamIslands_1F @ 0x8162F43 + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_FOREST + .2byte 156 + .byte 0x8b, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/SeafoamIslands_B1F/header.inc b/data/maps/SeafoamIslands_B1F/header.inc new file mode 100644 index 000000000..975adc757 --- /dev/null +++ b/data/maps/SeafoamIslands_B1F/header.inc @@ -0,0 +1,8 @@ +SeafoamIslands_B1F:: @ 834FB44 + .4byte SeafoamIslands_B1F_Layout @ 0x8314E44 + .4byte gMapEvents_SeafoamIslands_B1F @ 0x83B1F30 + .4byte gMapScripts_SeafoamIslands_B1F @ 0x8162F4D + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_FOREST + .2byte 157 + .byte 0x8b, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/SeafoamIslands_B2F/header.inc b/data/maps/SeafoamIslands_B2F/header.inc new file mode 100644 index 000000000..7d7f353f4 --- /dev/null +++ b/data/maps/SeafoamIslands_B2F/header.inc @@ -0,0 +1,8 @@ +SeafoamIslands_B2F:: @ 834FB60 + .4byte SeafoamIslands_B2F_Layout @ 0x8315588 + .4byte gMapEvents_SeafoamIslands_B2F @ 0x83B1FE4 + .4byte gMapScripts_SeafoamIslands_B2F @ 0x8162F4E + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_FOREST + .2byte 158 + .byte 0x8b, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/SeafoamIslands_B3F/header.inc b/data/maps/SeafoamIslands_B3F/header.inc new file mode 100644 index 000000000..e19764b74 --- /dev/null +++ b/data/maps/SeafoamIslands_B3F/header.inc @@ -0,0 +1,8 @@ +SeafoamIslands_B3F:: @ 834FB7C + .4byte SeafoamIslands_B3F_Layout @ 0x8315CCC + .4byte gMapEvents_SeafoamIslands_B3F @ 0x83B20DC + .4byte gMapScripts_SeafoamIslands_B3F @ 0x8162F4F + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_FOREST + .2byte 159 + .byte 0x8b, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/SeafoamIslands_B4F/header.inc b/data/maps/SeafoamIslands_B4F/header.inc new file mode 100644 index 000000000..b847158b7 --- /dev/null +++ b/data/maps/SeafoamIslands_B4F/header.inc @@ -0,0 +1,8 @@ +SeafoamIslands_B4F:: @ 834FB98 + .4byte SeafoamIslands_B4F_Layout @ 0x8316410 + .4byte gMapEvents_SeafoamIslands_B4F @ 0x83B21C4 + .4byte gMapScripts_SeafoamIslands_B4F @ 0x816302E + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_FOREST + .2byte 160 + .byte 0x8b, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/SevenIsland/connections.inc b/data/maps/SevenIsland/connections.inc new file mode 100644 index 000000000..307457174 --- /dev/null +++ b/data/maps/SevenIsland/connections.inc @@ -0,0 +1,7 @@ +SevenIsland_MapConnectionsList: @ 83529A8 + connection up, -48, MAP_SEVENISLAND_TRAINERTOWER + connection down, 0, MAP_SEVENISLAND_SEVAULTCANYON_ENTRANCE + +SevenIsland_MapConnections:: @ 83529C0 + .4byte 2 + .4byte SevenIsland_MapConnectionsList diff --git a/data/maps/SevenIsland/header.inc b/data/maps/SevenIsland/header.inc new file mode 100644 index 000000000..5838c3499 --- /dev/null +++ b/data/maps/SevenIsland/header.inc @@ -0,0 +1,8 @@ +SevenIsland:: @ 83507F4 + .4byte SevenIsland_Layout @ 0x8323D48 + .4byte gMapEvents_SevenIsland @ 0x83B657C + .4byte gMapScripts_SevenIsland @ 0x8167EB3 + .4byte SevenIsland_MapConnections @ 0x83529C0 + .2byte BGM_FRLG_ISLAND_SIX + .2byte 235 + .byte 0x94, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/SevenIsland_Harbor/header.inc b/data/maps/SevenIsland_Harbor/header.inc new file mode 100644 index 000000000..569b25fad --- /dev/null +++ b/data/maps/SevenIsland_Harbor/header.inc @@ -0,0 +1,8 @@ +SevenIsland_Harbor:: @ 8351B50 + .4byte Island_Harbor_Layout @ 0x8343FB8 + .4byte gMapEvents_SevenIsland_Harbor @ 0x83BE2A0 + .4byte gMapScripts_SevenIsland_Harbor @ 0x8170BE4 + .4byte NULL + .2byte BGM_FRLG_ISLAND_SIX + .2byte 315 + .byte 0x94, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/SevenIsland_House_Room1/header.inc b/data/maps/SevenIsland_House_Room1/header.inc new file mode 100644 index 000000000..5fd335a2d --- /dev/null +++ b/data/maps/SevenIsland_House_Room1/header.inc @@ -0,0 +1,8 @@ +SevenIsland_House_Room1:: @ 8351AA8 + .4byte SevenIsland_House_Room1_Layout @ 0x834E310 + .4byte gMapEvents_SevenIsland_House_Room1 @ 0x83BE050 + .4byte gMapScripts_SevenIsland_House_Room1 @ 0x817088A + .4byte NULL + .2byte BGM_FRLG_ISLAND_SIX + .2byte 382 + .byte 0x94, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01 diff --git a/data/maps/SevenIsland_House_Room2/header.inc b/data/maps/SevenIsland_House_Room2/header.inc new file mode 100644 index 000000000..961157d4a --- /dev/null +++ b/data/maps/SevenIsland_House_Room2/header.inc @@ -0,0 +1,8 @@ +SevenIsland_House_Room2:: @ 8351AC4 + .4byte SevenIsland_House_Room2_Layout @ 0x8338C48 + .4byte gMapEvents_SevenIsland_House_Room2 @ 0x83BE084 + .4byte gMapScripts_SevenIsland_House_Room2 @ 0x8170A7E + .4byte NULL + .2byte BGM_FRLG_ISLAND_SIX + .2byte 265 + .byte 0x94, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01 diff --git a/data/maps/SevenIsland_Mart/header.inc b/data/maps/SevenIsland_Mart/header.inc new file mode 100644 index 000000000..e9a0c01cd --- /dev/null +++ b/data/maps/SevenIsland_Mart/header.inc @@ -0,0 +1,8 @@ +SevenIsland_Mart:: @ 8351AE0 + .4byte Mart_Layout @ 0x82D5BCC + .4byte gMapEvents_SevenIsland_Mart @ 0x83BE100 + .4byte gMapScripts_SevenIsland_Mart @ 0x8170B30 + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 10 + .byte 0x94, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/SevenIsland_PokemonCenter_1F/header.inc b/data/maps/SevenIsland_PokemonCenter_1F/header.inc new file mode 100644 index 000000000..edf42476e --- /dev/null +++ b/data/maps/SevenIsland_PokemonCenter_1F/header.inc @@ -0,0 +1,8 @@ +SevenIsland_PokemonCenter_1F:: @ 8351AFC + .4byte PokemonCenter_1F_Layout @ 0x82D5990 + .4byte gMapEvents_SevenIsland_PokemonCenter_1F @ 0x83BE1B4 + .4byte gMapScripts_SevenIsland_PokemonCenter_1F @ 0x8170B89 + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 8 + .byte 0x94, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/SevenIsland_PokemonCenter_2F/header.inc b/data/maps/SevenIsland_PokemonCenter_2F/header.inc new file mode 100644 index 000000000..1f5a7e0b1 --- /dev/null +++ b/data/maps/SevenIsland_PokemonCenter_2F/header.inc @@ -0,0 +1,8 @@ +SevenIsland_PokemonCenter_2F:: @ 8351B18 + .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 + .4byte gMapEvents_SevenIsland_PokemonCenter_2F @ 0x83BE240 + .4byte gMapScripts_SevenIsland_PokemonCenter_2F @ 0x8170BBC + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 9 + .byte 0x94, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/header.inc b/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/header.inc new file mode 100644 index 000000000..29b6312f3 --- /dev/null +++ b/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/header.inc @@ -0,0 +1,8 @@ +SevenIsland_SeavaultCanyon_TanobyKey:: @ 835035C + .4byte SevenIsland_SeavaultCanyon_TanobyKey_Layout @ 0x8347C54 + .4byte gMapEvents_SevenIsland_SeavaultCanyon_TanobyKey @ 0x83B48BC + .4byte gMapScripts_SevenIsland_SeavaultCanyon_TanobyKey @ 0x8164DCC + .4byte NULL + .2byte BGM_FRLG_TANOBY_RUINS + .2byte 341 + .byte 0xba, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x02 diff --git a/data/maps/SevenIsland_SevaultCanyon/connections.inc b/data/maps/SevenIsland_SevaultCanyon/connections.inc new file mode 100644 index 000000000..a1f25bbdc --- /dev/null +++ b/data/maps/SevenIsland_SevaultCanyon/connections.inc @@ -0,0 +1,7 @@ +SevenIsland_SevaultCanyon_MapConnectionsList: @ 8352EB8 + connection down, -48, MAP_SEVENISLAND_TANOBYRUINS + connection left, -20, MAP_SEVENISLAND_SEVAULTCANYON_ENTRANCE + +SevenIsland_SevaultCanyon_MapConnections:: @ 8352ED0 + .4byte 2 + .4byte SevenIsland_SevaultCanyon_MapConnectionsList diff --git a/data/maps/SevenIsland_SevaultCanyon/header.inc b/data/maps/SevenIsland_SevaultCanyon/header.inc new file mode 100644 index 000000000..d9ac12b23 --- /dev/null +++ b/data/maps/SevenIsland_SevaultCanyon/header.inc @@ -0,0 +1,8 @@ +SevenIsland_SevaultCanyon:: @ 8350D18 + .4byte SevenIsland_SevaultCanyon_Layout @ 0x8333F44 + .4byte gMapEvents_SevenIsland_SevaultCanyon @ 0x83B9618 + .4byte gMapScripts_SevenIsland_SevaultCanyon @ 0x8168BFD + .4byte SevenIsland_SevaultCanyon_MapConnections @ 0x8352ED0 + .2byte BGM_FRLG_SEVII_ISLANDS + .2byte 256 + .byte 0xa9, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/SevenIsland_SevaultCanyon_Entrance/connections.inc b/data/maps/SevenIsland_SevaultCanyon_Entrance/connections.inc new file mode 100644 index 000000000..c4f3ade75 --- /dev/null +++ b/data/maps/SevenIsland_SevaultCanyon_Entrance/connections.inc @@ -0,0 +1,7 @@ +SevenIsland_SevaultCanyon_Entrance_MapConnectionsList: @ 8352E98 + connection up, 0, MAP_SEVENISLAND + connection right, 20, MAP_SEVENISLAND_SEVAULTCANYON + +SevenIsland_SevaultCanyon_Entrance_MapConnections:: @ 8352EB0 + .4byte 2 + .4byte SevenIsland_SevaultCanyon_Entrance_MapConnectionsList diff --git a/data/maps/SevenIsland_SevaultCanyon_Entrance/header.inc b/data/maps/SevenIsland_SevaultCanyon_Entrance/header.inc new file mode 100644 index 000000000..370efc530 --- /dev/null +++ b/data/maps/SevenIsland_SevaultCanyon_Entrance/header.inc @@ -0,0 +1,8 @@ +SevenIsland_SevaultCanyon_Entrance:: @ 8350CFC + .4byte SevenIsland_SevaultCanyon_Entrance_Layout @ 0x8333020 + .4byte gMapEvents_SevenIsland_SevaultCanyon_Entrance @ 0x83B93FC + .4byte gMapScripts_SevenIsland_SevaultCanyon_Entrance @ 0x8168BF3 + .4byte SevenIsland_SevaultCanyon_Entrance_MapConnections @ 0x8352EB0 + .2byte BGM_FRLG_SEVII_ISLANDS + .2byte 255 + .byte 0xa8, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/SevenIsland_SevaultCanyon_House/header.inc b/data/maps/SevenIsland_SevaultCanyon_House/header.inc new file mode 100644 index 000000000..7c3db6084 --- /dev/null +++ b/data/maps/SevenIsland_SevaultCanyon_House/header.inc @@ -0,0 +1,8 @@ +SevenIsland_SevaultCanyon_House:: @ 8351FE8 + .4byte House3_Layout @ 0x82D5CB8 + .4byte gMapEvents_SevenIsland_SevaultCanyon_House @ 0x83BF3CC + .4byte gMapScripts_SevenIsland_SevaultCanyon_House @ 0x8172182 + .4byte NULL + .2byte BGM_FRLG_ISLAND_SIX + .2byte 11 + .byte 0xa9, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/SevenIsland_TanobyRuins/connections.inc b/data/maps/SevenIsland_TanobyRuins/connections.inc new file mode 100644 index 000000000..12dd24cdf --- /dev/null +++ b/data/maps/SevenIsland_TanobyRuins/connections.inc @@ -0,0 +1,6 @@ +SevenIsland_TanobyRuins_MapConnectionsList: @ 8352ED8 + connection up, 48, MAP_SEVENISLAND_SEVAULTCANYON + +SevenIsland_TanobyRuins_MapConnections:: @ 8352EE4 + .4byte 1 + .4byte SevenIsland_TanobyRuins_MapConnectionsList diff --git a/data/maps/SevenIsland_TanobyRuins/header.inc b/data/maps/SevenIsland_TanobyRuins/header.inc new file mode 100644 index 000000000..3593aa312 --- /dev/null +++ b/data/maps/SevenIsland_TanobyRuins/header.inc @@ -0,0 +1,8 @@ +SevenIsland_TanobyRuins:: @ 8350D34 + .4byte SevenIsland_TanobyRuins_Layout @ 0x83355E8 + .4byte gMapEvents_SevenIsland_TanobyRuins @ 0x83B96F4 + .4byte gMapScripts_SevenIsland_TanobyRuins @ 0x8168C07 + .4byte SevenIsland_TanobyRuins_MapConnections @ 0x8352EE4 + .2byte BGM_FRLG_SEVII_ISLANDS + .2byte 257 + .byte 0xaa, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/SevenIsland_TanobyRuins_DilfordChamber/header.inc b/data/maps/SevenIsland_TanobyRuins_DilfordChamber/header.inc new file mode 100644 index 000000000..b2409df20 --- /dev/null +++ b/data/maps/SevenIsland_TanobyRuins_DilfordChamber/header.inc @@ -0,0 +1,8 @@ +SevenIsland_TanobyRuins_DilfordChamber:: @ 83502D0 + .4byte SevenIsland_TanobyRuins_DilfordChamber_Layout @ 0x83470F8 + .4byte gMapEvents_SevenIsland_TanobyRuins_DilfordChamber @ 0x83B46EC + .4byte gMapScripts_SevenIsland_TanobyRuins_DilfordChamber @ 0x8164CF6 + .4byte NULL + .2byte BGM_FRLG_TANOBY_RUINS + .2byte 338 + .byte 0xbf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x02 diff --git a/data/maps/SevenIsland_TanobyRuins_LiptooChamber/header.inc b/data/maps/SevenIsland_TanobyRuins_LiptooChamber/header.inc new file mode 100644 index 000000000..5e2639df1 --- /dev/null +++ b/data/maps/SevenIsland_TanobyRuins_LiptooChamber/header.inc @@ -0,0 +1,8 @@ +SevenIsland_TanobyRuins_LiptooChamber:: @ 8350298 + .4byte SevenIsland_TanobyRuins_LiptooChamber_Layout @ 0x8346A90 + .4byte gMapEvents_SevenIsland_TanobyRuins_LiptooChamber @ 0x83B46B4 + .4byte gMapScripts_SevenIsland_TanobyRuins_LiptooChamber @ 0x8164CDE + .4byte NULL + .2byte BGM_FRLG_TANOBY_RUINS + .2byte 336 + .byte 0xbd, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x02 diff --git a/data/maps/SevenIsland_TanobyRuins_MoneanChamber/header.inc b/data/maps/SevenIsland_TanobyRuins_MoneanChamber/header.inc new file mode 100644 index 000000000..2be9dff00 --- /dev/null +++ b/data/maps/SevenIsland_TanobyRuins_MoneanChamber/header.inc @@ -0,0 +1,8 @@ +SevenIsland_TanobyRuins_MoneanChamber:: @ 835027C + .4byte SevenIsland_TanobyRuins_MoneanChamber_Layout @ 0x834675C + .4byte gMapEvents_SevenIsland_TanobyRuins_MoneanChamber @ 0x83B4698 + .4byte gMapScripts_SevenIsland_TanobyRuins_MoneanChamber @ 0x8164CCF + .4byte NULL + .2byte BGM_FRLG_TANOBY_RUINS + .2byte 335 + .byte 0xbc, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x02 diff --git a/data/maps/SevenIsland_TanobyRuins_RixyChamber/header.inc b/data/maps/SevenIsland_TanobyRuins_RixyChamber/header.inc new file mode 100644 index 000000000..923ab442a --- /dev/null +++ b/data/maps/SevenIsland_TanobyRuins_RixyChamber/header.inc @@ -0,0 +1,8 @@ +SevenIsland_TanobyRuins_RixyChamber:: @ 8350308 + .4byte SevenIsland_TanobyRuins_RixyChamber_Layout @ 0x8349DC8 + .4byte gMapEvents_SevenIsland_TanobyRuins_RixyChamber @ 0x83B4724 + .4byte gMapScripts_SevenIsland_TanobyRuins_RixyChamber @ 0x8164D0E + .4byte NULL + .2byte BGM_FRLG_TANOBY_RUINS + .2byte 362 + .byte 0xc1, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x02 diff --git a/data/maps/SevenIsland_TanobyRuins_ScufibChamber/header.inc b/data/maps/SevenIsland_TanobyRuins_ScufibChamber/header.inc new file mode 100644 index 000000000..755f02e6d --- /dev/null +++ b/data/maps/SevenIsland_TanobyRuins_ScufibChamber/header.inc @@ -0,0 +1,8 @@ +SevenIsland_TanobyRuins_ScufibChamber:: @ 83502EC + .4byte SevenIsland_TanobyRuins_ScufibChamber_Layout @ 0x834742C + .4byte gMapEvents_SevenIsland_TanobyRuins_ScufibChamber @ 0x83B4708 + .4byte gMapScripts_SevenIsland_TanobyRuins_ScufibChamber @ 0x8164D02 + .4byte NULL + .2byte BGM_FRLG_TANOBY_RUINS + .2byte 339 + .byte 0xc0, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x02 diff --git a/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/header.inc b/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/header.inc new file mode 100644 index 000000000..7d1793415 --- /dev/null +++ b/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/header.inc @@ -0,0 +1,8 @@ +SevenIsland_TanobyRuins_ViapoisChamber:: @ 8350324 + .4byte SevenIsland_TanobyRuins_ViapoisChamber_Layout @ 0x834A0FC + .4byte gMapEvents_SevenIsland_TanobyRuins_ViapoisChamber @ 0x83B4740 + .4byte gMapScripts_SevenIsland_TanobyRuins_ViapoisChamber @ 0x8164D1A + .4byte NULL + .2byte BGM_FRLG_TANOBY_RUINS + .2byte 363 + .byte 0xc2, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x02 diff --git a/data/maps/SevenIsland_TanobyRuins_WeepthChamber/header.inc b/data/maps/SevenIsland_TanobyRuins_WeepthChamber/header.inc new file mode 100644 index 000000000..dab134f18 --- /dev/null +++ b/data/maps/SevenIsland_TanobyRuins_WeepthChamber/header.inc @@ -0,0 +1,8 @@ +SevenIsland_TanobyRuins_WeepthChamber:: @ 83502B4 + .4byte SevenIsland_TanobyRuins_WeepthChamber_Layout @ 0x8346DC4 + .4byte gMapEvents_SevenIsland_TanobyRuins_WeepthChamber @ 0x83B46D0 + .4byte gMapScripts_SevenIsland_TanobyRuins_WeepthChamber @ 0x8164CEA + .4byte NULL + .2byte BGM_FRLG_TANOBY_RUINS + .2byte 337 + .byte 0xbe, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x02 diff --git a/data/maps/SevenIsland_TrainerTower/connections.inc b/data/maps/SevenIsland_TrainerTower/connections.inc new file mode 100644 index 000000000..d6a8c579c --- /dev/null +++ b/data/maps/SevenIsland_TrainerTower/connections.inc @@ -0,0 +1,6 @@ +SevenIsland_TrainerTower_MapConnectionsList: @ 8352E84 + connection down, 48, MAP_SEVENISLAND + +SevenIsland_TrainerTower_MapConnections:: @ 8352E90 + .4byte 1 + .4byte SevenIsland_TrainerTower_MapConnectionsList diff --git a/data/maps/SevenIsland_TrainerTower/header.inc b/data/maps/SevenIsland_TrainerTower/header.inc new file mode 100644 index 000000000..41319d0b9 --- /dev/null +++ b/data/maps/SevenIsland_TrainerTower/header.inc @@ -0,0 +1,8 @@ +SevenIsland_TrainerTower:: @ 8350CE0 + .4byte SevenIsland_TrainerTower_Layout @ 0x833287C + .4byte gMapEvents_SevenIsland_TrainerTower @ 0x83B9328 + .4byte gMapScripts_SevenIsland_TrainerTower @ 0x8168BD5 + .4byte SevenIsland_TrainerTower_MapConnections @ 0x8352E90 + .2byte BGM_FRLG_SEVII_ISLANDS + .2byte 254 + .byte 0xa7, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/SevenIsland_TrainerTower_1F/header.inc b/data/maps/SevenIsland_TrainerTower_1F/header.inc new file mode 100644 index 000000000..03addfd0a --- /dev/null +++ b/data/maps/SevenIsland_TrainerTower_1F/header.inc @@ -0,0 +1,8 @@ +SevenIsland_TrainerTower_1F:: @ 834FFA4 + .4byte SevenIsland_TrainerTower_1F_Layout @ 0x8341FCC + .4byte gMapEvents_SevenIsland_TrainerTower_1F @ 0x83B3C40 + .4byte gMapScripts_SevenIsland_TrainerTower_1F @ 0x81646B8 + .4byte NULL + .2byte BGM_FRLG_TRAINER_TOWER + .2byte 298 + .byte 0xb3, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00 diff --git a/data/maps/SevenIsland_TrainerTower_2F/header.inc b/data/maps/SevenIsland_TrainerTower_2F/header.inc new file mode 100644 index 000000000..ef4663130 --- /dev/null +++ b/data/maps/SevenIsland_TrainerTower_2F/header.inc @@ -0,0 +1,8 @@ +SevenIsland_TrainerTower_2F:: @ 834FFC0 + .4byte SevenIsland_TrainerTower_2F_Layout @ 0x8342254 + .4byte gMapEvents_SevenIsland_TrainerTower_2F @ 0x83B3D14 + .4byte gMapScripts_SevenIsland_TrainerTower_2F @ 0x81646E6 + .4byte NULL + .2byte BGM_FRLG_TRAINER_TOWER + .2byte 299 + .byte 0xb3, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00 diff --git a/data/maps/SevenIsland_TrainerTower_3F/header.inc b/data/maps/SevenIsland_TrainerTower_3F/header.inc new file mode 100644 index 000000000..f9400b21e --- /dev/null +++ b/data/maps/SevenIsland_TrainerTower_3F/header.inc @@ -0,0 +1,8 @@ +SevenIsland_TrainerTower_3F:: @ 834FFDC + .4byte SevenIsland_TrainerTower_3F_Layout @ 0x83424DC + .4byte gMapEvents_SevenIsland_TrainerTower_3F @ 0x83B3DE8 + .4byte gMapScripts_SevenIsland_TrainerTower_3F @ 0x8164714 + .4byte NULL + .2byte BGM_FRLG_TRAINER_TOWER + .2byte 300 + .byte 0xb3, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00 diff --git a/data/maps/SevenIsland_TrainerTower_4F/header.inc b/data/maps/SevenIsland_TrainerTower_4F/header.inc new file mode 100644 index 000000000..82b4c0d87 --- /dev/null +++ b/data/maps/SevenIsland_TrainerTower_4F/header.inc @@ -0,0 +1,8 @@ +SevenIsland_TrainerTower_4F:: @ 834FFF8 + .4byte SevenIsland_TrainerTower_4F_Layout @ 0x8342764 + .4byte gMapEvents_SevenIsland_TrainerTower_4F @ 0x83B3EBC + .4byte gMapScripts_SevenIsland_TrainerTower_4F @ 0x8164742 + .4byte NULL + .2byte BGM_FRLG_TRAINER_TOWER + .2byte 301 + .byte 0xb3, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00 diff --git a/data/maps/SevenIsland_TrainerTower_5F/header.inc b/data/maps/SevenIsland_TrainerTower_5F/header.inc new file mode 100644 index 000000000..9e894806f --- /dev/null +++ b/data/maps/SevenIsland_TrainerTower_5F/header.inc @@ -0,0 +1,8 @@ +SevenIsland_TrainerTower_5F:: @ 8350014 + .4byte SevenIsland_TrainerTower_5F_Layout @ 0x83429EC + .4byte gMapEvents_SevenIsland_TrainerTower_5F @ 0x83B3F90 + .4byte gMapScripts_SevenIsland_TrainerTower_5F @ 0x8164770 + .4byte NULL + .2byte BGM_FRLG_TRAINER_TOWER + .2byte 302 + .byte 0xb3, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00 diff --git a/data/maps/SevenIsland_TrainerTower_6F/header.inc b/data/maps/SevenIsland_TrainerTower_6F/header.inc new file mode 100644 index 000000000..e16b71ffa --- /dev/null +++ b/data/maps/SevenIsland_TrainerTower_6F/header.inc @@ -0,0 +1,8 @@ +SevenIsland_TrainerTower_6F:: @ 8350030 + .4byte SevenIsland_TrainerTower_6F_Layout @ 0x8342C74 + .4byte gMapEvents_SevenIsland_TrainerTower_6F @ 0x83B4064 + .4byte gMapScripts_SevenIsland_TrainerTower_6F @ 0x816479E + .4byte NULL + .2byte BGM_FRLG_TRAINER_TOWER + .2byte 303 + .byte 0xb3, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00 diff --git a/data/maps/SevenIsland_TrainerTower_7F/header.inc b/data/maps/SevenIsland_TrainerTower_7F/header.inc new file mode 100644 index 000000000..804576d94 --- /dev/null +++ b/data/maps/SevenIsland_TrainerTower_7F/header.inc @@ -0,0 +1,8 @@ +SevenIsland_TrainerTower_7F:: @ 835004C + .4byte SevenIsland_TrainerTower_7F_Layout @ 0x8342EFC + .4byte gMapEvents_SevenIsland_TrainerTower_7F @ 0x83B4138 + .4byte gMapScripts_SevenIsland_TrainerTower_7F @ 0x81647CC + .4byte NULL + .2byte BGM_FRLG_TRAINER_TOWER + .2byte 304 + .byte 0xb3, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00 diff --git a/data/maps/SevenIsland_TrainerTower_8F/header.inc b/data/maps/SevenIsland_TrainerTower_8F/header.inc new file mode 100644 index 000000000..a395e6b49 --- /dev/null +++ b/data/maps/SevenIsland_TrainerTower_8F/header.inc @@ -0,0 +1,8 @@ +SevenIsland_TrainerTower_8F:: @ 8350068 + .4byte SevenIsland_TrainerTower_8F_Layout @ 0x8343184 + .4byte gMapEvents_SevenIsland_TrainerTower_8F @ 0x83B420C + .4byte gMapScripts_SevenIsland_TrainerTower_8F @ 0x81647FA + .4byte NULL + .2byte BGM_FRLG_TRAINER_TOWER + .2byte 305 + .byte 0xb3, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00 diff --git a/data/maps/SevenIsland_TrainerTower_Elevator/header.inc b/data/maps/SevenIsland_TrainerTower_Elevator/header.inc new file mode 100644 index 000000000..da5559773 --- /dev/null +++ b/data/maps/SevenIsland_TrainerTower_Elevator/header.inc @@ -0,0 +1,8 @@ +SevenIsland_TrainerTower_Elevator:: @ 83500BC + .4byte SevenIsland_TrainerTower_Elevator_Layout @ 0x8343454 + .4byte gMapEvents_SevenIsland_TrainerTower_Elevator @ 0x83B4330 + .4byte gMapScripts_SevenIsland_TrainerTower_Elevator @ 0x8164AF8 + .4byte NULL + .2byte BGM_FRLG_TRAINER_TOWER + .2byte 307 + .byte 0xb3, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00 diff --git a/data/maps/SevenIsland_TrainerTower_Lobby/header.inc b/data/maps/SevenIsland_TrainerTower_Lobby/header.inc new file mode 100644 index 000000000..f62c7dfec --- /dev/null +++ b/data/maps/SevenIsland_TrainerTower_Lobby/header.inc @@ -0,0 +1,8 @@ +SevenIsland_TrainerTower_Lobby:: @ 83500A0 + .4byte SevenIsland_TrainerTower_Lobby_Layout @ 0x8341D44 + .4byte gMapEvents_SevenIsland_TrainerTower_Lobby @ 0x83B4308 + .4byte gMapScripts_SevenIsland_TrainerTower_Lobby @ 0x8164839 + .4byte NULL + .2byte BGM_FRLG_TRAINER_TOWER + .2byte 297 + .byte 0xb3, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00 diff --git a/data/maps/SevenIsland_TrainerTower_Roof/header.inc b/data/maps/SevenIsland_TrainerTower_Roof/header.inc new file mode 100644 index 000000000..3fdaad52f --- /dev/null +++ b/data/maps/SevenIsland_TrainerTower_Roof/header.inc @@ -0,0 +1,8 @@ +SevenIsland_TrainerTower_Roof:: @ 8350084 + .4byte SevenIsland_TrainerTower_Roof_Layout @ 0x83433E8 + .4byte gMapEvents_SevenIsland_TrainerTower_Roof @ 0x83B4248 + .4byte gMapScripts_SevenIsland_TrainerTower_Roof @ 0x8164828 + .4byte NULL + .2byte BGM_FRLG_TRAINER_TOWER + .2byte 306 + .byte 0xb3, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00 diff --git a/data/maps/SilphCo_10F/header.inc b/data/maps/SilphCo_10F/header.inc new file mode 100644 index 000000000..b211cc14d --- /dev/null +++ b/data/maps/SilphCo_10F/header.inc @@ -0,0 +1,8 @@ +SilphCo_10F:: @ 834F834 + .4byte SilphCo_10F_Layout @ 0x830A0E8 + .4byte gMapEvents_SilphCo_10F @ 0x83B0A20 + .4byte gMapScripts_SilphCo_10F @ 0x8161D86 + .4byte NULL + .2byte BGM_FRLG_SILPH + .2byte 141 + .byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x07, 0x0a, 0x00 diff --git a/data/maps/SilphCo_11F/header.inc b/data/maps/SilphCo_11F/header.inc new file mode 100644 index 000000000..6121495c4 --- /dev/null +++ b/data/maps/SilphCo_11F/header.inc @@ -0,0 +1,8 @@ +SilphCo_11F:: @ 834F850 + .4byte SilphCo_11F_Layout @ 0x830A3B4 + .4byte gMapEvents_SilphCo_11F @ 0x83B0B44 + .4byte gMapScripts_SilphCo_11F @ 0x8161DEE + .4byte NULL + .2byte BGM_FRLG_SILPH + .2byte 142 + .byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x07, 0x0b, 0x00 diff --git a/data/maps/SilphCo_1F/header.inc b/data/maps/SilphCo_1F/header.inc new file mode 100644 index 000000000..df174f19c --- /dev/null +++ b/data/maps/SilphCo_1F/header.inc @@ -0,0 +1,8 @@ +SilphCo_1F:: @ 834F738 + .4byte SilphCo_1F_Layout @ 0x83071EC + .4byte gMapEvents_SilphCo_1F @ 0x83AFCE0 + .4byte gMapScripts_SilphCo_1F @ 0x8161625 + .4byte NULL + .2byte BGM_FRLG_SILPH + .2byte 132 + .byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x07, 0x01, 0x00 diff --git a/data/maps/SilphCo_2F/header.inc b/data/maps/SilphCo_2F/header.inc new file mode 100644 index 000000000..870637ea8 --- /dev/null +++ b/data/maps/SilphCo_2F/header.inc @@ -0,0 +1,8 @@ +SilphCo_2F:: @ 834F754 + .4byte SilphCo_2F_Layout @ 0x8307840 + .4byte gMapEvents_SilphCo_2F @ 0x83AFE1C + .4byte gMapScripts_SilphCo_2F @ 0x8161641 + .4byte NULL + .2byte BGM_FRLG_SILPH + .2byte 133 + .byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x07, 0x02, 0x00 diff --git a/data/maps/SilphCo_3F/header.inc b/data/maps/SilphCo_3F/header.inc new file mode 100644 index 000000000..6117e9567 --- /dev/null +++ b/data/maps/SilphCo_3F/header.inc @@ -0,0 +1,8 @@ +SilphCo_3F:: @ 834F770 + .4byte SilphCo_3F_Layout @ 0x8307E94 + .4byte gMapEvents_SilphCo_3F @ 0x83AFF58 + .4byte gMapScripts_SilphCo_3F @ 0x81616C5 + .4byte NULL + .2byte BGM_FRLG_SILPH + .2byte 134 + .byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x07, 0x03, 0x00 diff --git a/data/maps/SilphCo_4F/header.inc b/data/maps/SilphCo_4F/header.inc new file mode 100644 index 000000000..bbbc5688e --- /dev/null +++ b/data/maps/SilphCo_4F/header.inc @@ -0,0 +1,8 @@ +SilphCo_4F:: @ 834F78C + .4byte SilphCo_4F_Layout @ 0x83084E8 + .4byte gMapEvents_SilphCo_4F @ 0x83B00DC + .4byte gMapScripts_SilphCo_4F @ 0x8161736 + .4byte NULL + .2byte BGM_FRLG_SILPH + .2byte 135 + .byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x07, 0x04, 0x00 diff --git a/data/maps/SilphCo_5F/header.inc b/data/maps/SilphCo_5F/header.inc new file mode 100644 index 000000000..803d7b377 --- /dev/null +++ b/data/maps/SilphCo_5F/header.inc @@ -0,0 +1,8 @@ +SilphCo_5F:: @ 834F7A8 + .4byte SilphCo_5F_Layout @ 0x8308B3C + .4byte gMapEvents_SilphCo_5F @ 0x83B02D8 + .4byte gMapScripts_SilphCo_5F @ 0x81617BE + .4byte NULL + .2byte BGM_FRLG_SILPH + .2byte 136 + .byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x07, 0x05, 0x00 diff --git a/data/maps/SilphCo_6F/header.inc b/data/maps/SilphCo_6F/header.inc new file mode 100644 index 000000000..0098e49e4 --- /dev/null +++ b/data/maps/SilphCo_6F/header.inc @@ -0,0 +1,8 @@ +SilphCo_6F:: @ 834F7C4 + .4byte SilphCo_6F_Layout @ 0x8308FFC + .4byte gMapEvents_SilphCo_6F @ 0x83B044C + .4byte gMapScripts_SilphCo_6F @ 0x8161881 + .4byte NULL + .2byte BGM_FRLG_SILPH + .2byte 137 + .byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x07, 0x06, 0x00 diff --git a/data/maps/SilphCo_7F/header.inc b/data/maps/SilphCo_7F/header.inc new file mode 100644 index 000000000..9c4b5225b --- /dev/null +++ b/data/maps/SilphCo_7F/header.inc @@ -0,0 +1,8 @@ +SilphCo_7F:: @ 834F7E0 + .4byte SilphCo_7F_Layout @ 0x83094BC + .4byte gMapEvents_SilphCo_7F @ 0x83B0660 + .4byte gMapScripts_SilphCo_7F @ 0x8161984 + .4byte NULL + .2byte BGM_FRLG_SILPH + .2byte 138 + .byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x07, 0x07, 0x00 diff --git a/data/maps/SilphCo_8F/header.inc b/data/maps/SilphCo_8F/header.inc new file mode 100644 index 000000000..8a46b7924 --- /dev/null +++ b/data/maps/SilphCo_8F/header.inc @@ -0,0 +1,8 @@ +SilphCo_8F:: @ 834F7FC + .4byte SilphCo_8F_Layout @ 0x830997C + .4byte gMapEvents_SilphCo_8F @ 0x83B0784 + .4byte gMapScripts_SilphCo_8F @ 0x8161C5F + .4byte NULL + .2byte BGM_FRLG_SILPH + .2byte 139 + .byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x07, 0x08, 0x00 diff --git a/data/maps/SilphCo_9F/header.inc b/data/maps/SilphCo_9F/header.inc new file mode 100644 index 000000000..d5805078a --- /dev/null +++ b/data/maps/SilphCo_9F/header.inc @@ -0,0 +1,8 @@ +SilphCo_9F:: @ 834F818 + .4byte SilphCo_9F_Layout @ 0x8309E3C + .4byte gMapEvents_SilphCo_9F @ 0x83B0904 + .4byte gMapScripts_SilphCo_9F @ 0x8161CDE + .4byte NULL + .2byte BGM_FRLG_SILPH + .2byte 140 + .byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x07, 0x09, 0x00 diff --git a/data/maps/SilphCo_Elevator/header.inc b/data/maps/SilphCo_Elevator/header.inc new file mode 100644 index 000000000..9a107fb1d --- /dev/null +++ b/data/maps/SilphCo_Elevator/header.inc @@ -0,0 +1,8 @@ +SilphCo_Elevator:: @ 834F86C + .4byte SilphCo_Elevator_Layout @ 0x8321330 + .4byte gMapEvents_SilphCo_Elevator @ 0x83B0B6C + .4byte gMapScripts_SilphCo_Elevator @ 0x8161F6E + .4byte NULL + .2byte BGM_FRLG_SILPH + .2byte 229 + .byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/SixIsland/connections.inc b/data/maps/SixIsland/connections.inc new file mode 100644 index 000000000..771221d95 --- /dev/null +++ b/data/maps/SixIsland/connections.inc @@ -0,0 +1,6 @@ +SixIsland_MapConnectionsList: @ 83529C8 + connection right, -40, MAP_SIXISLAND_WATERPATH + +SixIsland_MapConnections:: @ 83529D4 + .4byte 1 + .4byte SixIsland_MapConnectionsList diff --git a/data/maps/SixIsland/header.inc b/data/maps/SixIsland/header.inc new file mode 100644 index 000000000..561cad4ce --- /dev/null +++ b/data/maps/SixIsland/header.inc @@ -0,0 +1,8 @@ +SixIsland:: @ 8350810 + .4byte SixIsland_Layout @ 0x832430C + .4byte gMapEvents_SixIsland @ 0x83B65F8 + .4byte gMapScripts_SixIsland @ 0x8167ED8 + .4byte SixIsland_MapConnections @ 0x83529D4 + .2byte BGM_FRLG_ISLAND_SIX + .2byte 236 + .byte 0x95, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/SixIsland_DottedHole_B1F/header.inc b/data/maps/SixIsland_DottedHole_B1F/header.inc new file mode 100644 index 000000000..5bcf69805 --- /dev/null +++ b/data/maps/SixIsland_DottedHole_B1F/header.inc @@ -0,0 +1,8 @@ +SixIsland_DottedHole_B1F:: @ 834FEC4 + .4byte SixIsland_DottedHole_B1F_Layout @ 0x8343808 + .4byte gMapEvents_SixIsland_DottedHole_B1F @ 0x83B3898 + .4byte gMapScripts_SixIsland_DottedHole_B1F @ 0x81641B0 + .4byte NULL + .2byte BGM_FRLG_TANOBY_RUINS + .2byte 310 + .byte 0xb4, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/SixIsland_DottedHole_B2F/header.inc b/data/maps/SixIsland_DottedHole_B2F/header.inc new file mode 100644 index 000000000..f5d6a6b1e --- /dev/null +++ b/data/maps/SixIsland_DottedHole_B2F/header.inc @@ -0,0 +1,8 @@ +SixIsland_DottedHole_B2F:: @ 834FEE0 + .4byte SixIsland_DottedHole_B2F_Layout @ 0x834394C + .4byte gMapEvents_SixIsland_DottedHole_B2F @ 0x83B38E0 + .4byte gMapScripts_SixIsland_DottedHole_B2F @ 0x81641B1 + .4byte NULL + .2byte BGM_FRLG_TANOBY_RUINS + .2byte 311 + .byte 0xb4, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/SixIsland_DottedHole_B3F/header.inc b/data/maps/SixIsland_DottedHole_B3F/header.inc new file mode 100644 index 000000000..e30ffe292 --- /dev/null +++ b/data/maps/SixIsland_DottedHole_B3F/header.inc @@ -0,0 +1,8 @@ +SixIsland_DottedHole_B3F:: @ 834FEFC + .4byte SixIsland_DottedHole_B3F_Layout @ 0x8343A90 + .4byte gMapEvents_SixIsland_DottedHole_B3F @ 0x83B3928 + .4byte gMapScripts_SixIsland_DottedHole_B3F @ 0x81641B2 + .4byte NULL + .2byte BGM_FRLG_TANOBY_RUINS + .2byte 312 + .byte 0xb4, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/header.inc b/data/maps/SixIsland_DottedHole_SapphireRoom/header.inc new file mode 100644 index 000000000..8752ac442 --- /dev/null +++ b/data/maps/SixIsland_DottedHole_SapphireRoom/header.inc @@ -0,0 +1,8 @@ +SixIsland_DottedHole_SapphireRoom:: @ 834FF34 + .4byte SixIsland_DottedHole_SapphireRoom_Layout @ 0x8343DD8 + .4byte gMapEvents_SixIsland_DottedHole_SapphireRoom @ 0x83B39D0 + .4byte gMapScripts_SixIsland_DottedHole_SapphireRoom @ 0x81641B4 + .4byte NULL + .2byte BGM_FRLG_TANOBY_RUINS + .2byte 314 + .byte 0xb4, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/SixIsland_GreenPath/connections.inc b/data/maps/SixIsland_GreenPath/connections.inc new file mode 100644 index 000000000..ce5b74baa --- /dev/null +++ b/data/maps/SixIsland_GreenPath/connections.inc @@ -0,0 +1,7 @@ +SixIsland_GreenPath_MapConnectionsList: @ 8352E24 + connection up, 0, MAP_SIXISLAND_OUTCASTISLAND + connection right, 0, MAP_SIXISLAND_WATERPATH + +SixIsland_GreenPath_MapConnections:: @ 8352E3C + .4byte 2 + .4byte SixIsland_GreenPath_MapConnectionsList diff --git a/data/maps/SixIsland_GreenPath/header.inc b/data/maps/SixIsland_GreenPath/header.inc new file mode 100644 index 000000000..091dd662a --- /dev/null +++ b/data/maps/SixIsland_GreenPath/header.inc @@ -0,0 +1,8 @@ +SixIsland_GreenPath:: @ 8350C8C + .4byte SixIsland_GreenPath_Layout @ 0x832E0D0 + .4byte gMapEvents_SixIsland_GreenPath @ 0x83B8FA8 + .4byte gMapScripts_SixIsland_GreenPath @ 0x8168B2D + .4byte SixIsland_GreenPath_MapConnections @ 0x8352E3C + .2byte BGM_FRLG_SEVII_ISLANDS + .2byte 251 + .byte 0xa4, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/SixIsland_Harbor/header.inc b/data/maps/SixIsland_Harbor/header.inc new file mode 100644 index 000000000..cd468e7ce --- /dev/null +++ b/data/maps/SixIsland_Harbor/header.inc @@ -0,0 +1,8 @@ +SixIsland_Harbor:: @ 8351F08 + .4byte Island_Harbor_Layout @ 0x8343FB8 + .4byte gMapEvents_SixIsland_Harbor @ 0x83BF178 + .4byte gMapScripts_SixIsland_Harbor @ 0x8171E47 + .4byte NULL + .2byte BGM_FRLG_ISLAND_SIX + .2byte 315 + .byte 0x95, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/SixIsland_House/header.inc b/data/maps/SixIsland_House/header.inc new file mode 100644 index 000000000..80be57344 --- /dev/null +++ b/data/maps/SixIsland_House/header.inc @@ -0,0 +1,8 @@ +SixIsland_House:: @ 8351F24 + .4byte House3_Layout @ 0x82D5CB8 + .4byte gMapEvents_SixIsland_House @ 0x83BF1AC + .4byte gMapScripts_SixIsland_House @ 0x8171E5B + .4byte NULL + .2byte BGM_FRLG_ISLAND_SIX + .2byte 11 + .byte 0x95, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/SixIsland_Mart/header.inc b/data/maps/SixIsland_Mart/header.inc new file mode 100644 index 000000000..ff490a115 --- /dev/null +++ b/data/maps/SixIsland_Mart/header.inc @@ -0,0 +1,8 @@ +SixIsland_Mart:: @ 8351F40 + .4byte Mart_Layout @ 0x82D5BCC + .4byte gMapEvents_SixIsland_Mart @ 0x83BF210 + .4byte gMapScripts_SixIsland_Mart @ 0x8171E65 + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 10 + .byte 0x95, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/SixIsland_OutcastIsland/connections.inc b/data/maps/SixIsland_OutcastIsland/connections.inc new file mode 100644 index 000000000..d5159adec --- /dev/null +++ b/data/maps/SixIsland_OutcastIsland/connections.inc @@ -0,0 +1,6 @@ +SixIsland_OutcastIsland_MapConnectionsList: @ 8352E10 + connection down, 0, MAP_SIXISLAND_GREENPATH + +SixIsland_OutcastIsland_MapConnections:: @ 8352E1C + .4byte 1 + .4byte SixIsland_OutcastIsland_MapConnectionsList diff --git a/data/maps/SixIsland_OutcastIsland/header.inc b/data/maps/SixIsland_OutcastIsland/header.inc new file mode 100644 index 000000000..70ba73f2b --- /dev/null +++ b/data/maps/SixIsland_OutcastIsland/header.inc @@ -0,0 +1,8 @@ +SixIsland_OutcastIsland:: @ 8350C70 + .4byte SixIsland_OutcastIsland_Layout @ 0x832D56C + .4byte gMapEvents_SixIsland_OutcastIsland @ 0x83B8F38 + .4byte gMapScripts_SixIsland_OutcastIsland @ 0x8168B15 + .4byte SixIsland_OutcastIsland_MapConnections @ 0x8352E1C + .2byte BGM_FRLG_SEVII_ISLANDS + .2byte 250 + .byte 0xa3, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/SixIsland_PokemonCenter_1F/header.inc b/data/maps/SixIsland_PokemonCenter_1F/header.inc new file mode 100644 index 000000000..c26a336c6 --- /dev/null +++ b/data/maps/SixIsland_PokemonCenter_1F/header.inc @@ -0,0 +1,8 @@ +SixIsland_PokemonCenter_1F:: @ 8351ED0 + .4byte PokemonCenter_1F_Layout @ 0x82D5990 + .4byte gMapEvents_SixIsland_PokemonCenter_1F @ 0x83BF0A0 + .4byte gMapScripts_SixIsland_PokemonCenter_1F @ 0x8171D6A + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 8 + .byte 0x95, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/SixIsland_PokemonCenter_2F/header.inc b/data/maps/SixIsland_PokemonCenter_2F/header.inc new file mode 100644 index 000000000..16784fe32 --- /dev/null +++ b/data/maps/SixIsland_PokemonCenter_2F/header.inc @@ -0,0 +1,8 @@ +SixIsland_PokemonCenter_2F:: @ 8351EEC + .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 + .4byte gMapEvents_SixIsland_PokemonCenter_2F @ 0x83BF12C + .4byte gMapScripts_SixIsland_PokemonCenter_2F @ 0x8171E20 + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 9 + .byte 0x95, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/SixIsland_RuinValley/connections.inc b/data/maps/SixIsland_RuinValley/connections.inc new file mode 100644 index 000000000..6755f6439 --- /dev/null +++ b/data/maps/SixIsland_RuinValley/connections.inc @@ -0,0 +1,6 @@ +SixIsland_RuinValley_MapConnectionsList: @ 8352E70 + connection right, -80, MAP_SIXISLAND_WATERPATH + +SixIsland_RuinValley_MapConnections:: @ 8352E7C + .4byte 1 + .4byte SixIsland_RuinValley_MapConnectionsList diff --git a/data/maps/SixIsland_RuinValley/header.inc b/data/maps/SixIsland_RuinValley/header.inc new file mode 100644 index 000000000..bd8cd251b --- /dev/null +++ b/data/maps/SixIsland_RuinValley/header.inc @@ -0,0 +1,8 @@ +SixIsland_RuinValley:: @ 8350CC4 + .4byte SixIsland_RuinValley_Layout @ 0x83302D8 + .4byte gMapEvents_SixIsland_RuinValley @ 0x83B92A0 + .4byte gMapScripts_SixIsland_RuinValley @ 0x8168B53 + .4byte SixIsland_RuinValley_MapConnections @ 0x8352E7C + .2byte BGM_FRLG_SEVII_ISLANDS + .2byte 253 + .byte 0xa6, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/SixIsland_WaterPath/connections.inc b/data/maps/SixIsland_WaterPath/connections.inc new file mode 100644 index 000000000..ab01a61ee --- /dev/null +++ b/data/maps/SixIsland_WaterPath/connections.inc @@ -0,0 +1,8 @@ +SixIsland_WaterPath_MapConnectionsList: @ 8352E44 + connection left, 0, MAP_SIXISLAND_GREENPATH + connection left, 40, MAP_SIXISLAND + connection left, 80, MAP_SIXISLAND_RUINVALLEY + +SixIsland_WaterPath_MapConnections:: @ 8352E68 + .4byte 3 + .4byte SixIsland_WaterPath_MapConnectionsList diff --git a/data/maps/SixIsland_WaterPath/header.inc b/data/maps/SixIsland_WaterPath/header.inc new file mode 100644 index 000000000..f226d3856 --- /dev/null +++ b/data/maps/SixIsland_WaterPath/header.inc @@ -0,0 +1,8 @@ +SixIsland_WaterPath:: @ 8350CA8 + .4byte SixIsland_WaterPath_Layout @ 0x832F3B4 + .4byte gMapEvents_SixIsland_WaterPath @ 0x83B90E0 + .4byte gMapScripts_SixIsland_WaterPath @ 0x8168B40 + .4byte SixIsland_WaterPath_MapConnections @ 0x8352E68 + .2byte BGM_FRLG_SEVII_ISLANDS + .2byte 252 + .byte 0xa5, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/SixIsland_WaterPath_House1/header.inc b/data/maps/SixIsland_WaterPath_House1/header.inc new file mode 100644 index 000000000..45482e174 --- /dev/null +++ b/data/maps/SixIsland_WaterPath_House1/header.inc @@ -0,0 +1,8 @@ +SixIsland_WaterPath_House1:: @ 8351FB0 + .4byte House4_Layout @ 0x82D6070 + .4byte gMapEvents_SixIsland_WaterPath_House1 @ 0x83BF334 + .4byte gMapScripts_SixIsland_WaterPath_House1 @ 0x817206C + .4byte NULL + .2byte BGM_FRLG_CERULEAN_CITY + .2byte 13 + .byte 0xa5, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/SixIsland_WaterPath_House2/header.inc b/data/maps/SixIsland_WaterPath_House2/header.inc new file mode 100644 index 000000000..47c53fc7d --- /dev/null +++ b/data/maps/SixIsland_WaterPath_House2/header.inc @@ -0,0 +1,8 @@ +SixIsland_WaterPath_House2:: @ 8351FCC + .4byte House3_Layout @ 0x82D5CB8 + .4byte gMapEvents_SixIsland_WaterPath_House2 @ 0x83BF368 + .4byte gMapScripts_SixIsland_WaterPath_House2 @ 0x8172178 + .4byte NULL + .2byte BGM_FRLG_CERULEAN_CITY + .2byte 11 + .byte 0xa5, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/ThreeIsland/connections.inc b/data/maps/ThreeIsland/connections.inc new file mode 100644 index 000000000..1d79c0e6a --- /dev/null +++ b/data/maps/ThreeIsland/connections.inc @@ -0,0 +1,7 @@ +ThreeIsland_MapConnectionsList: @ 8352968 + connection down, 0, MAP_THREEISLAND_PORT + connection left, 0, MAP_THREEISLAND_BONDBRIDGE + +ThreeIsland_MapConnections:: @ 8352980 + .4byte 2 + .4byte ThreeIsland_MapConnectionsList diff --git a/data/maps/ThreeIsland/header.inc b/data/maps/ThreeIsland/header.inc new file mode 100644 index 000000000..a73e32050 --- /dev/null +++ b/data/maps/ThreeIsland/header.inc @@ -0,0 +1,8 @@ +ThreeIsland:: @ 83507A0 + .4byte ThreeIsland_Layout @ 0x832265C + .4byte gMapEvents_ThreeIsland @ 0x83B62C8 + .4byte gMapScripts_ThreeIsland @ 0x81677AD + .4byte ThreeIsland_MapConnections @ 0x8352980 + .2byte BGM_FRLG_ISLAND_ONE + .2byte 232 + .byte 0x91, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/ThreeIsland_BerryForest/header.inc b/data/maps/ThreeIsland_BerryForest/header.inc new file mode 100644 index 000000000..3a848ee68 --- /dev/null +++ b/data/maps/ThreeIsland_BerryForest/header.inc @@ -0,0 +1,8 @@ +ThreeIsland_BerryForest:: @ 834FE00 + .4byte ThreeIsland_BerryForest_Layout @ 0x833A7A8 + .4byte gMapEvents_ThreeIsland_BerryForest @ 0x83B340C + .4byte gMapScripts_ThreeIsland_BerryForest @ 0x8163C71 + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_FOREST + .2byte 270 + .byte 0xb0, 0x00, 0x0b, 0x03, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/ThreeIsland_BondBridge/connections.inc b/data/maps/ThreeIsland_BondBridge/connections.inc new file mode 100644 index 000000000..113123ac1 --- /dev/null +++ b/data/maps/ThreeIsland_BondBridge/connections.inc @@ -0,0 +1,6 @@ +ThreeIsland_BondBridge_MapConnectionsList: @ 8352D58 + connection right, 0, MAP_THREEISLAND + +ThreeIsland_BondBridge_MapConnections:: @ 8352D64 + .4byte 1 + .4byte ThreeIsland_BondBridge_MapConnectionsList diff --git a/data/maps/ThreeIsland_BondBridge/header.inc b/data/maps/ThreeIsland_BondBridge/header.inc new file mode 100644 index 000000000..d7305b2bc --- /dev/null +++ b/data/maps/ThreeIsland_BondBridge/header.inc @@ -0,0 +1,8 @@ +ThreeIsland_BondBridge:: @ 8350B58 + .4byte ThreeIsland_BondBridge_Layout @ 0x8327BDC + .4byte gMapEvents_ThreeIsland_BondBridge @ 0x83B8A9C + .4byte gMapScripts_ThreeIsland_BondBridge @ 0x8168776 + .4byte ThreeIsland_BondBridge_MapConnections @ 0x8352D64 + .2byte BGM_FRLG_ROUTE_3 + .2byte 240 + .byte 0x99, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/ThreeIsland_DunsparceTunnel/header.inc b/data/maps/ThreeIsland_DunsparceTunnel/header.inc new file mode 100644 index 000000000..5e3c51372 --- /dev/null +++ b/data/maps/ThreeIsland_DunsparceTunnel/header.inc @@ -0,0 +1,8 @@ +ThreeIsland_DunsparceTunnel:: @ 8350340 + .4byte ThreeIsland_DunsparceTunnel_Layout @ 0x83451F8 + .4byte gMapEvents_ThreeIsland_DunsparceTunnel @ 0x83B4788 + .4byte gMapScripts_ThreeIsland_DunsparceTunnel @ 0x8164D26 + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_FOREST + .2byte 318 + .byte 0xb9, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/ThreeIsland_Harbor/header.inc b/data/maps/ThreeIsland_Harbor/header.inc new file mode 100644 index 000000000..3a29f5fd0 --- /dev/null +++ b/data/maps/ThreeIsland_Harbor/header.inc @@ -0,0 +1,8 @@ +ThreeIsland_Harbor:: @ 8351F5C + .4byte Island_Harbor_Layout @ 0x8343FB8 + .4byte gMapEvents_ThreeIsland_Harbor @ 0x83BF25C + .4byte gMapScripts_ThreeIsland_Harbor @ 0x8171EA9 + .4byte NULL + .2byte BGM_FRLG_ISLAND_ONE + .2byte 315 + .byte 0x9a, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/ThreeIsland_House1/header.inc b/data/maps/ThreeIsland_House1/header.inc new file mode 100644 index 000000000..7886ef8c6 --- /dev/null +++ b/data/maps/ThreeIsland_House1/header.inc @@ -0,0 +1,8 @@ +ThreeIsland_House1:: @ 8351C84 + .4byte ThreeIsland_House1_Layout @ 0x82D7504 + .4byte gMapEvents_ThreeIsland_House1 @ 0x83BE7A4 + .4byte gMapScripts_ThreeIsland_House1 @ 0x8171819 + .4byte NULL + .2byte BGM_FRLG_ISLAND_ONE + .2byte 31 + .byte 0x91, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/ThreeIsland_House2/header.inc b/data/maps/ThreeIsland_House2/header.inc new file mode 100644 index 000000000..25c26564e --- /dev/null +++ b/data/maps/ThreeIsland_House2/header.inc @@ -0,0 +1,8 @@ +ThreeIsland_House2:: @ 8351CF4 + .4byte House3_Layout @ 0x82D5CB8 + .4byte gMapEvents_ThreeIsland_House2 @ 0x83BE97C + .4byte gMapScripts_ThreeIsland_House2 @ 0x81718DF + .4byte NULL + .2byte BGM_FRLG_ISLAND_ONE + .2byte 11 + .byte 0x91, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/ThreeIsland_House3/header.inc b/data/maps/ThreeIsland_House3/header.inc new file mode 100644 index 000000000..68f69ae93 --- /dev/null +++ b/data/maps/ThreeIsland_House3/header.inc @@ -0,0 +1,8 @@ +ThreeIsland_House3:: @ 8351D10 + .4byte House3_Layout @ 0x82D5CB8 + .4byte gMapEvents_ThreeIsland_House3 @ 0x83BE9B0 + .4byte gMapScripts_ThreeIsland_House3 @ 0x8171902 + .4byte NULL + .2byte BGM_FRLG_ISLAND_ONE + .2byte 11 + .byte 0x91, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/ThreeIsland_House4/header.inc b/data/maps/ThreeIsland_House4/header.inc new file mode 100644 index 000000000..d410743d1 --- /dev/null +++ b/data/maps/ThreeIsland_House4/header.inc @@ -0,0 +1,8 @@ +ThreeIsland_House4:: @ 8351D2C + .4byte House3_Layout @ 0x82D5CB8 + .4byte gMapEvents_ThreeIsland_House4 @ 0x83BE9FC + .4byte gMapScripts_ThreeIsland_House4 @ 0x817190C + .4byte NULL + .2byte BGM_FRLG_ISLAND_ONE + .2byte 11 + .byte 0x91, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/ThreeIsland_House5/header.inc b/data/maps/ThreeIsland_House5/header.inc new file mode 100644 index 000000000..7383dee7b --- /dev/null +++ b/data/maps/ThreeIsland_House5/header.inc @@ -0,0 +1,8 @@ +ThreeIsland_House5:: @ 8351D48 + .4byte House3_Layout @ 0x82D5CB8 + .4byte gMapEvents_ThreeIsland_House5 @ 0x83BEA30 + .4byte gMapScripts_ThreeIsland_House5 @ 0x817191F + .4byte NULL + .2byte BGM_FRLG_ISLAND_ONE + .2byte 11 + .byte 0x91, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/ThreeIsland_Mart/header.inc b/data/maps/ThreeIsland_Mart/header.inc new file mode 100644 index 000000000..c3ed2bdf8 --- /dev/null +++ b/data/maps/ThreeIsland_Mart/header.inc @@ -0,0 +1,8 @@ +ThreeIsland_Mart:: @ 8351CD8 + .4byte Mart_Layout @ 0x82D5BCC + .4byte gMapEvents_ThreeIsland_Mart @ 0x83BE930 + .4byte gMapScripts_ThreeIsland_Mart @ 0x817188C + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 10 + .byte 0x91, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/ThreeIsland_PokemonCenter_1F/header.inc b/data/maps/ThreeIsland_PokemonCenter_1F/header.inc new file mode 100644 index 000000000..25fa4275c --- /dev/null +++ b/data/maps/ThreeIsland_PokemonCenter_1F/header.inc @@ -0,0 +1,8 @@ +ThreeIsland_PokemonCenter_1F:: @ 8351CA0 + .4byte PokemonCenter_1F_Layout @ 0x82D5990 + .4byte gMapEvents_ThreeIsland_PokemonCenter_1F @ 0x83BE828 + .4byte gMapScripts_ThreeIsland_PokemonCenter_1F @ 0x8171832 + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 8 + .byte 0x91, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/ThreeIsland_PokemonCenter_2F/header.inc b/data/maps/ThreeIsland_PokemonCenter_2F/header.inc new file mode 100644 index 000000000..40eedca05 --- /dev/null +++ b/data/maps/ThreeIsland_PokemonCenter_2F/header.inc @@ -0,0 +1,8 @@ +ThreeIsland_PokemonCenter_2F:: @ 8351CBC + .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 + .4byte gMapEvents_ThreeIsland_PokemonCenter_2F @ 0x83BE8B4 + .4byte gMapScripts_ThreeIsland_PokemonCenter_2F @ 0x8171865 + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 9 + .byte 0x91, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/ThreeIsland_Port/connections.inc b/data/maps/ThreeIsland_Port/connections.inc new file mode 100644 index 000000000..013d046fb --- /dev/null +++ b/data/maps/ThreeIsland_Port/connections.inc @@ -0,0 +1,6 @@ +ThreeIsland_Port_MapConnectionsList: @ 8352D6C + connection up, 0, MAP_THREEISLAND + +ThreeIsland_Port_MapConnections:: @ 8352D78 + .4byte 1 + .4byte ThreeIsland_Port_MapConnectionsList diff --git a/data/maps/ThreeIsland_Port/header.inc b/data/maps/ThreeIsland_Port/header.inc new file mode 100644 index 000000000..6d7c48e29 --- /dev/null +++ b/data/maps/ThreeIsland_Port/header.inc @@ -0,0 +1,8 @@ +ThreeIsland_Port:: @ 8350B74 + .4byte ThreeIsland_Port_Layout @ 0x8328380 + .4byte gMapEvents_ThreeIsland_Port @ 0x83B8B10 + .4byte gMapScripts_ThreeIsland_Port @ 0x8168789 + .4byte ThreeIsland_Port_MapConnections @ 0x8352D78 + .2byte BGM_FRLG_ROUTE_3 + .2byte 241 + .byte 0x9a, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/TwoIsland/connections.inc b/data/maps/TwoIsland/connections.inc new file mode 100644 index 000000000..fa4754db1 --- /dev/null +++ b/data/maps/TwoIsland/connections.inc @@ -0,0 +1,6 @@ +TwoIsland_MapConnectionsList: @ 8352954 + connection up, 24, MAP_TWOISLAND_CAPEBRINK + +TwoIsland_MapConnections:: @ 8352960 + .4byte 1 + .4byte TwoIsland_MapConnectionsList diff --git a/data/maps/TwoIsland/header.inc b/data/maps/TwoIsland/header.inc new file mode 100644 index 000000000..813ef23bd --- /dev/null +++ b/data/maps/TwoIsland/header.inc @@ -0,0 +1,8 @@ +TwoIsland:: @ 8350784 + .4byte TwoIsland_Layout @ 0x8321EB8 + .4byte gMapEvents_TwoIsland @ 0x83B6074 + .4byte gMapScripts_TwoIsland @ 0x8167564 + .4byte TwoIsland_MapConnections @ 0x8352960 + .2byte BGM_FRLG_ISLAND_ONE + .2byte 231 + .byte 0x90, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/TwoIsland_CapeBrink/connections.inc b/data/maps/TwoIsland_CapeBrink/connections.inc new file mode 100644 index 000000000..f1fc32b1b --- /dev/null +++ b/data/maps/TwoIsland_CapeBrink/connections.inc @@ -0,0 +1,6 @@ +TwoIsland_CapeBrink_MapConnectionsList: @ 8352D44 + connection down, -24, MAP_TWOISLAND + +TwoIsland_CapeBrink_MapConnections:: @ 8352D50 + .4byte 1 + .4byte TwoIsland_CapeBrink_MapConnectionsList diff --git a/data/maps/TwoIsland_CapeBrink/header.inc b/data/maps/TwoIsland_CapeBrink/header.inc new file mode 100644 index 000000000..0e8ec9654 --- /dev/null +++ b/data/maps/TwoIsland_CapeBrink/header.inc @@ -0,0 +1,8 @@ +TwoIsland_CapeBrink:: @ 8350B3C + .4byte TwoIsland_CapeBrink_Layout @ 0x8326CB8 + .4byte gMapEvents_TwoIsland_CapeBrink @ 0x83B8964 + .4byte gMapScripts_TwoIsland_CapeBrink @ 0x8168775 + .4byte TwoIsland_CapeBrink_MapConnections @ 0x8352D50 + .2byte BGM_FRLG_ROUTE_3 + .2byte 239 + .byte 0x98, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/TwoIsland_CapeBrink_House/header.inc b/data/maps/TwoIsland_CapeBrink_House/header.inc new file mode 100644 index 000000000..37cc779c7 --- /dev/null +++ b/data/maps/TwoIsland_CapeBrink_House/header.inc @@ -0,0 +1,8 @@ +TwoIsland_CapeBrink_House:: @ 8351F94 + .4byte House3_Layout @ 0x82D5CB8 + .4byte gMapEvents_TwoIsland_CapeBrink_House @ 0x83BF2F4 + .4byte gMapScripts_TwoIsland_CapeBrink_House @ 0x817206B + .4byte NULL + .2byte BGM_FRLG_ISLAND_ONE + .2byte 11 + .byte 0x98, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/TwoIsland_Harbor/header.inc b/data/maps/TwoIsland_Harbor/header.inc new file mode 100644 index 000000000..9aa296c48 --- /dev/null +++ b/data/maps/TwoIsland_Harbor/header.inc @@ -0,0 +1,8 @@ +TwoIsland_Harbor:: @ 8351C68 + .4byte Island_Harbor_Layout @ 0x8343FB8 + .4byte gMapEvents_TwoIsland_Harbor @ 0x83BE764 + .4byte gMapScripts_TwoIsland_Harbor @ 0x8171805 + .4byte NULL + .2byte BGM_FRLG_ISLAND_ONE + .2byte 315 + .byte 0x90, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/TwoIsland_House/header.inc b/data/maps/TwoIsland_House/header.inc new file mode 100644 index 000000000..6d0ea5f87 --- /dev/null +++ b/data/maps/TwoIsland_House/header.inc @@ -0,0 +1,8 @@ +TwoIsland_House:: @ 8351C14 + .4byte House3_Layout @ 0x82D5CB8 + .4byte gMapEvents_TwoIsland_House @ 0x83BE620 + .4byte gMapScripts_TwoIsland_House @ 0x8171618 + .4byte NULL + .2byte BGM_FRLG_ISLAND_ONE + .2byte 11 + .byte 0x90, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/TwoIsland_JoyfulGameCorner/header.inc b/data/maps/TwoIsland_JoyfulGameCorner/header.inc new file mode 100644 index 000000000..5469caa39 --- /dev/null +++ b/data/maps/TwoIsland_JoyfulGameCorner/header.inc @@ -0,0 +1,8 @@ +TwoIsland_JoyfulGameCorner:: @ 8351BF8 + .4byte TwoIsland_JoyfulGameCorner_Layout @ 0x833AA84 + .4byte gMapEvents_TwoIsland_JoyfulGameCorner @ 0x83BE5EC + .4byte gMapScripts_TwoIsland_JoyfulGameCorner @ 0x81713D0 + .4byte NULL + .2byte BGM_FRLG_GAMECORNER + .2byte 272 + .byte 0x90, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/TwoIsland_PokemonCenter_1F/header.inc b/data/maps/TwoIsland_PokemonCenter_1F/header.inc new file mode 100644 index 000000000..294f0ea5b --- /dev/null +++ b/data/maps/TwoIsland_PokemonCenter_1F/header.inc @@ -0,0 +1,8 @@ +TwoIsland_PokemonCenter_1F:: @ 8351C30 + .4byte PokemonCenter_1F_Layout @ 0x82D5990 + .4byte gMapEvents_TwoIsland_PokemonCenter_1F @ 0x83BE68C + .4byte gMapScripts_TwoIsland_PokemonCenter_1F @ 0x81717B4 + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 8 + .byte 0x90, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/TwoIsland_PokemonCenter_2F/header.inc b/data/maps/TwoIsland_PokemonCenter_2F/header.inc new file mode 100644 index 000000000..27c60df4b --- /dev/null +++ b/data/maps/TwoIsland_PokemonCenter_2F/header.inc @@ -0,0 +1,8 @@ +TwoIsland_PokemonCenter_2F:: @ 8351C4C + .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 + .4byte gMapEvents_TwoIsland_PokemonCenter_2F @ 0x83BE718 + .4byte gMapScripts_TwoIsland_PokemonCenter_2F @ 0x81717DE + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 9 + .byte 0x90, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/UndergroundPath_EastEntrance/header.inc b/data/maps/UndergroundPath_EastEntrance/header.inc new file mode 100644 index 000000000..6a2c0105d --- /dev/null +++ b/data/maps/UndergroundPath_EastEntrance/header.inc @@ -0,0 +1,8 @@ +UndergroundPath_EastEntrance:: @ 834F5E8 + .4byte UndergroundPath_Entrance_Layout @ 0x8319414 + .4byte gMapEvents_UndergroundPath_EastEntrance @ 0x83AF430 + .4byte gMapScripts_UndergroundPath_EastEntrance @ 0x8160EDD + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_CITY + .2byte 172 + .byte 0x82, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/UndergroundPath_EastWestTunnel/header.inc b/data/maps/UndergroundPath_EastWestTunnel/header.inc new file mode 100644 index 000000000..2dc7454b8 --- /dev/null +++ b/data/maps/UndergroundPath_EastWestTunnel/header.inc @@ -0,0 +1,8 @@ +UndergroundPath_EastWestTunnel:: @ 834F5CC + .4byte UndergroundPath_EastWestTunnel_Layout @ 0x8319898 + .4byte gMapEvents_UndergroundPath_EastWestTunnel @ 0x83AF3E4 + .4byte gMapScripts_UndergroundPath_EastWestTunnel @ 0x8160ED3 + .4byte NULL + .2byte BGM_FRLG_ROUTE_1 + .2byte 173 + .byte 0x82, 0x00, 0x00, 0x08, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/UndergroundPath_NorthEntrance/header.inc b/data/maps/UndergroundPath_NorthEntrance/header.inc new file mode 100644 index 000000000..5b6b9b3b8 --- /dev/null +++ b/data/maps/UndergroundPath_NorthEntrance/header.inc @@ -0,0 +1,8 @@ +UndergroundPath_NorthEntrance:: @ 834F55C + .4byte UndergroundPath_Entrance_Layout @ 0x8319414 + .4byte gMapEvents_UndergroundPath_NorthEntrance @ 0x83AF25C + .4byte gMapScripts_UndergroundPath_NorthEntrance @ 0x8160E38 + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_CITY + .2byte 172 + .byte 0x81, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/UndergroundPath_NorthSouthTunnel/header.inc b/data/maps/UndergroundPath_NorthSouthTunnel/header.inc new file mode 100644 index 000000000..02f7553ba --- /dev/null +++ b/data/maps/UndergroundPath_NorthSouthTunnel/header.inc @@ -0,0 +1,8 @@ +UndergroundPath_NorthSouthTunnel:: @ 834F578 + .4byte UndergroundPath_NorthSouthTunnel_Layout @ 0x8319CAC + .4byte gMapEvents_UndergroundPath_NorthSouthTunnel @ 0x83AF2D4 + .4byte gMapScripts_UndergroundPath_NorthSouthTunnel @ 0x8160EB5 + .4byte NULL + .2byte BGM_FRLG_ROUTE_1 + .2byte 174 + .byte 0x81, 0x00, 0x00, 0x08, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/UndergroundPath_SouthEntrance/header.inc b/data/maps/UndergroundPath_SouthEntrance/header.inc new file mode 100644 index 000000000..3811bc87d --- /dev/null +++ b/data/maps/UndergroundPath_SouthEntrance/header.inc @@ -0,0 +1,8 @@ +UndergroundPath_SouthEntrance:: @ 834F594 + .4byte UndergroundPath_Entrance_Layout @ 0x8319414 + .4byte gMapEvents_UndergroundPath_SouthEntrance @ 0x83AF320 + .4byte gMapScripts_UndergroundPath_SouthEntrance @ 0x8160EBF + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_CITY + .2byte 172 + .byte 0x81, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/UndergroundPath_WestEntrance/header.inc b/data/maps/UndergroundPath_WestEntrance/header.inc new file mode 100644 index 000000000..ed95def83 --- /dev/null +++ b/data/maps/UndergroundPath_WestEntrance/header.inc @@ -0,0 +1,8 @@ +UndergroundPath_WestEntrance:: @ 834F5B0 + .4byte UndergroundPath_Entrance_Layout @ 0x8319414 + .4byte gMapEvents_UndergroundPath_WestEntrance @ 0x83AF36C + .4byte gMapScripts_UndergroundPath_WestEntrance @ 0x8160EC9 + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_CITY + .2byte 172 + .byte 0x82, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/UnknownMap_00_00/header.inc b/data/maps/UnknownMap_00_00/header.inc new file mode 100644 index 000000000..1746127c8 --- /dev/null +++ b/data/maps/UnknownMap_00_00/header.inc @@ -0,0 +1,8 @@ +UnknownMap_00_00:: @ 834F188 + .4byte UnknownMap_00_00_Layout @ 0x82D89E8 + .4byte gMapEvents_UnknownMap_00_00 @ 0x83AE0DC + .4byte gMapScripts_UnknownMap_00_00 @ 0x8160478 + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 47 + .byte 0xc4, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08 diff --git a/data/maps/UnknownMap_00_01/header.inc b/data/maps/UnknownMap_00_01/header.inc new file mode 100644 index 000000000..8f6f03655 --- /dev/null +++ b/data/maps/UnknownMap_00_01/header.inc @@ -0,0 +1,8 @@ +UnknownMap_00_01:: @ 834F1A4 + .4byte UnknownMap_00_01_Layout @ 0x82D8AE4 + .4byte gMapEvents_UnknownMap_00_01 @ 0x83AE138 + .4byte gMapScripts_UnknownMap_00_01 @ 0x8160479 + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 48 + .byte 0xc4, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/UnknownMap_00_02/header.inc b/data/maps/UnknownMap_00_02/header.inc new file mode 100644 index 000000000..5616915ee --- /dev/null +++ b/data/maps/UnknownMap_00_02/header.inc @@ -0,0 +1,8 @@ +UnknownMap_00_02:: @ 834F1C0 + .4byte UnknownMap_00_02_Layout @ 0x82D8C98 + .4byte gMapEvents_UnknownMap_00_02 @ 0x83AE1C4 + .4byte gMapScripts_UnknownMap_00_02 @ 0x816047A + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 49 + .byte 0xc4, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/UnknownMap_00_03/header.inc b/data/maps/UnknownMap_00_03/header.inc new file mode 100644 index 000000000..40833172f --- /dev/null +++ b/data/maps/UnknownMap_00_03/header.inc @@ -0,0 +1,8 @@ +UnknownMap_00_03:: @ 834F1DC + .4byte UnknownMap_00_03_Layout @ 0x82D8DB8 + .4byte gMapEvents_UnknownMap_00_03 @ 0x83AE238 + .4byte gMapScripts_UnknownMap_00_03 @ 0x816047B + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 50 + .byte 0xc4, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08 diff --git a/data/maps/UnknownMap_00_04/header.inc b/data/maps/UnknownMap_00_04/header.inc new file mode 100644 index 000000000..9e86235c6 --- /dev/null +++ b/data/maps/UnknownMap_00_04/header.inc @@ -0,0 +1,8 @@ +UnknownMap_00_04:: @ 834F1F8 + .4byte UnknownMap_00_04_Layout @ 0x83388C4 + .4byte gMapEvents_UnknownMap_00_04 @ 0x83AE32C + .4byte gMapScripts_UnknownMap_00_04 @ 0x816047C + .4byte NULL + .2byte BGM_FRLG_UNION_ROOM + .2byte 262 + .byte 0xc4, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08 diff --git a/data/maps/UnknownMap_03_50/connections.inc b/data/maps/UnknownMap_03_50/connections.inc new file mode 100644 index 000000000..272c4d026 --- /dev/null +++ b/data/maps/UnknownMap_03_50/connections.inc @@ -0,0 +1,6 @@ +UnknownMap_03_50_MapConnectionsList: @ 8352D80 + connection up, 0, MAP_THREEISLAND + +UnknownMap_03_50_MapConnections:: @ 8352D8C + .4byte 1 + .4byte UnknownMap_03_50_MapConnectionsList diff --git a/data/maps/UnknownMap_03_50/header.inc b/data/maps/UnknownMap_03_50/header.inc new file mode 100644 index 000000000..8a6415bba --- /dev/null +++ b/data/maps/UnknownMap_03_50/header.inc @@ -0,0 +1,8 @@ +UnknownMap_03_50:: @ 8350B90 + .4byte UnknownMap_03_50_Layout @ 0x83283A8 + .4byte gMapEvents_UnknownMap_03_50 @ 0x83B8B24 + .4byte gMapScripts_UnknownMap_03_50 @ 0x81687E0 + .4byte UnknownMap_03_50_MapConnections @ 0x8352D8C + .2byte BGM_FRLG_SEVII_ISLANDS + .2byte 242 + .byte 0x9b, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/UnknownMap_03_51/connections.inc b/data/maps/UnknownMap_03_51/connections.inc new file mode 100644 index 000000000..034c0c42b --- /dev/null +++ b/data/maps/UnknownMap_03_51/connections.inc @@ -0,0 +1,6 @@ +UnknownMap_03_51_MapConnectionsList: @ 8352D94 + connection up, 0, MAP_THREEISLAND + +UnknownMap_03_51_MapConnections:: @ 8352DA0 + .4byte 1 + .4byte UnknownMap_03_51_MapConnectionsList diff --git a/data/maps/UnknownMap_03_51/header.inc b/data/maps/UnknownMap_03_51/header.inc new file mode 100644 index 000000000..97cd42f9e --- /dev/null +++ b/data/maps/UnknownMap_03_51/header.inc @@ -0,0 +1,8 @@ +UnknownMap_03_51:: @ 8350BAC + .4byte UnknownMap_03_51_Layout @ 0x83283D0 + .4byte gMapEvents_UnknownMap_03_51 @ 0x83B8B38 + .4byte gMapScripts_UnknownMap_03_51 @ 0x81687E1 + .4byte UnknownMap_03_51_MapConnections @ 0x8352DA0 + .2byte BGM_FRLG_SEVII_ISLANDS + .2byte 243 + .byte 0x9c, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/UnknownMap_03_52/header.inc b/data/maps/UnknownMap_03_52/header.inc new file mode 100644 index 000000000..2ab4b7e8b --- /dev/null +++ b/data/maps/UnknownMap_03_52/header.inc @@ -0,0 +1,8 @@ +UnknownMap_03_52:: @ 8350BC8 + .4byte UnknownMap_03_52_Layout @ 0x8329114 + .4byte gMapEvents_UnknownMap_03_52 @ 0x83B8B4C + .4byte gMapScripts_UnknownMap_03_52 @ 0x81687E2 + .4byte NULL + .2byte BGM_FRLG_SEVII_ISLANDS + .2byte 244 + .byte 0x9d, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/UnknownMap_03_53/header.inc b/data/maps/UnknownMap_03_53/header.inc new file mode 100644 index 000000000..9ff13c2a4 --- /dev/null +++ b/data/maps/UnknownMap_03_53/header.inc @@ -0,0 +1,8 @@ +UnknownMap_03_53:: @ 8350BE4 + .4byte UnknownMap_03_53_Layout @ 0x8329C78 + .4byte gMapEvents_UnknownMap_03_53 @ 0x83B8B60 + .4byte gMapScripts_UnknownMap_03_53 @ 0x81687E3 + .4byte NULL + .2byte BGM_FRLG_SEVII_ISLANDS + .2byte 245 + .byte 0x9e, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/UnknownMap_18_01/header.inc b/data/maps/UnknownMap_18_01/header.inc new file mode 100644 index 000000000..23c7c3a83 --- /dev/null +++ b/data/maps/UnknownMap_18_01/header.inc @@ -0,0 +1,8 @@ +UnknownMap_18_01:: @ 835185C + .4byte House2_Layout @ 0x82D5840 + .4byte gMapEvents_UnknownMap_18_01 @ 0x83BD758 + .4byte gMapScripts_UnknownMap_18_01 @ 0x816FA8C + .4byte NULL + .2byte BGM_FRLG_ROUTE_3 + .2byte 7 + .byte 0x6a, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/UnusedHouse_27_00/header.inc b/data/maps/UnusedHouse_27_00/header.inc new file mode 100644 index 000000000..f4032f2f3 --- /dev/null +++ b/data/maps/UnusedHouse_27_00/header.inc @@ -0,0 +1,8 @@ +UnusedHouse_27_00:: @ 8351A38 + .4byte House2_Layout @ 0x82D5840 + .4byte gMapEvents_UnusedHouse_27_00 @ 0x83BDF30 + .4byte gMapScripts_UnusedHouse_27_00 @ 0x81704FA + .4byte NULL + .2byte BGM_FRLG_ROUTE_3 + .2byte 7 + .byte 0x77, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/UnusedHouse_29_00/header.inc b/data/maps/UnusedHouse_29_00/header.inc new file mode 100644 index 000000000..65f677125 --- /dev/null +++ b/data/maps/UnusedHouse_29_00/header.inc @@ -0,0 +1,8 @@ +UnusedHouse_29_00:: @ 8351A70 + .4byte House2_Layout @ 0x82D5840 + .4byte gMapEvents_UnusedHouse_29_00 @ 0x83BDFA0 + .4byte gMapScripts_UnusedHouse_29_00 @ 0x8170522 + .4byte NULL + .2byte BGM_FRLG_INDIGO_PLATEAU + .2byte 7 + .byte 0x7b, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/UnusedHouse_31_05/header.inc b/data/maps/UnusedHouse_31_05/header.inc new file mode 100644 index 000000000..71d619417 --- /dev/null +++ b/data/maps/UnusedHouse_31_05/header.inc @@ -0,0 +1,8 @@ +UnusedHouse_31_05:: @ 8351B34 + .4byte House4_Layout @ 0x82D6070 + .4byte gMapEvents_UnusedHouse_31_05 @ 0x83BE254 + .4byte gMapScripts_UnusedHouse_31_05 @ 0x8170BE3 + .4byte NULL + .2byte BGM_FRLG_ISLAND_SIX + .2byte 13 + .byte 0x94, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/VermilionCity/connections.inc b/data/maps/VermilionCity/connections.inc new file mode 100644 index 000000000..b90cfc5a9 --- /dev/null +++ b/data/maps/VermilionCity/connections.inc @@ -0,0 +1,7 @@ +VermilionCity_MapConnectionsList: @ 8352824 + connection up, 12, MAP_ROUTE6 + connection right, 10, MAP_ROUTE11 + +VermilionCity_MapConnections:: @ 835283C + .4byte 2 + .4byte VermilionCity_MapConnectionsList diff --git a/data/maps/VermilionCity/header.inc b/data/maps/VermilionCity/header.inc new file mode 100644 index 000000000..a2ce4787e --- /dev/null +++ b/data/maps/VermilionCity/header.inc @@ -0,0 +1,8 @@ +VermilionCity:: @ 83506A4 + .4byte VermilionCity_Layout @ 0x82E1534 + .4byte gMapEvents_VermilionCity @ 0x83B5648 + .4byte gMapScripts_VermilionCity @ 0x81668DC + .4byte VermilionCity_MapConnections @ 0x835283C + .2byte BGM_FRLG_VERMILION_CITY + .2byte 83 + .byte 0x5d, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/VermilionCity_Gym/header.inc b/data/maps/VermilionCity_Gym/header.inc new file mode 100644 index 000000000..a3cf66201 --- /dev/null +++ b/data/maps/VermilionCity_Gym/header.inc @@ -0,0 +1,8 @@ +VermilionCity_Gym:: @ 83511B0 + .4byte VermilionCity_Gym_Layout @ 0x82D6E28 + .4byte gMapEvents_VermilionCity_Gym @ 0x83BAFD0 + .4byte gMapScripts_VermilionCity_Gym @ 0x816B69E + .4byte NULL + .2byte BGM_FRLG_GYM + .2byte 25 + .byte 0x5d, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01 diff --git a/data/maps/VermilionCity_House1/header.inc b/data/maps/VermilionCity_House1/header.inc new file mode 100644 index 000000000..73adfa317 --- /dev/null +++ b/data/maps/VermilionCity_House1/header.inc @@ -0,0 +1,8 @@ +VermilionCity_House1:: @ 8351108 + .4byte House1_Layout @ 0x82D5754 + .4byte gMapEvents_VermilionCity_House1 @ 0x83BAB6C + .4byte gMapScripts_VermilionCity_House1 @ 0x816B3A6 + .4byte NULL + .2byte BGM_FRLG_CERULEAN_CITY + .2byte 6 + .byte 0x5d, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/VermilionCity_House2/header.inc b/data/maps/VermilionCity_House2/header.inc new file mode 100644 index 000000000..d80ed7c4f --- /dev/null +++ b/data/maps/VermilionCity_House2/header.inc @@ -0,0 +1,8 @@ +VermilionCity_House2:: @ 8351178 + .4byte House1_Layout @ 0x82D5754 + .4byte gMapEvents_VermilionCity_House2 @ 0x83BADEC + .4byte gMapScripts_VermilionCity_House2 @ 0x816B5D6 + .4byte NULL + .2byte BGM_FRLG_VERMILION_CITY + .2byte 6 + .byte 0x5d, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/VermilionCity_House3/header.inc b/data/maps/VermilionCity_House3/header.inc new file mode 100644 index 000000000..739ca82ff --- /dev/null +++ b/data/maps/VermilionCity_House3/header.inc @@ -0,0 +1,8 @@ +VermilionCity_House3:: @ 83511CC + .4byte House1_Layout @ 0x82D5754 + .4byte gMapEvents_VermilionCity_House3 @ 0x83BB068 + .4byte gMapScripts_VermilionCity_House3 @ 0x816BAA9 + .4byte NULL + .2byte BGM_FRLG_VERMILION_CITY + .2byte 6 + .byte 0x5d, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/VermilionCity_Mart/header.inc b/data/maps/VermilionCity_Mart/header.inc new file mode 100644 index 000000000..06b0c1a40 --- /dev/null +++ b/data/maps/VermilionCity_Mart/header.inc @@ -0,0 +1,8 @@ +VermilionCity_Mart:: @ 8351194 + .4byte Mart_Layout @ 0x82D5BCC + .4byte gMapEvents_VermilionCity_Mart @ 0x83BAE60 + .4byte gMapScripts_VermilionCity_Mart @ 0x816B653 + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 10 + .byte 0x5d, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/VermilionCity_PokemonCenter_1F/header.inc b/data/maps/VermilionCity_PokemonCenter_1F/header.inc new file mode 100644 index 000000000..0c20e889c --- /dev/null +++ b/data/maps/VermilionCity_PokemonCenter_1F/header.inc @@ -0,0 +1,8 @@ +VermilionCity_PokemonCenter_1F:: @ 8351124 + .4byte PokemonCenter_1F_Layout @ 0x82D5990 + .4byte gMapEvents_VermilionCity_PokemonCenter_1F @ 0x83BAC48 + .4byte gMapScripts_VermilionCity_PokemonCenter_1F @ 0x816B424 + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 8 + .byte 0x5d, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/VermilionCity_PokemonCenter_2F/header.inc b/data/maps/VermilionCity_PokemonCenter_2F/header.inc new file mode 100644 index 000000000..34192d487 --- /dev/null +++ b/data/maps/VermilionCity_PokemonCenter_2F/header.inc @@ -0,0 +1,8 @@ +VermilionCity_PokemonCenter_2F:: @ 8351140 + .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 + .4byte gMapEvents_VermilionCity_PokemonCenter_2F @ 0x83BACD4 + .4byte gMapScripts_VermilionCity_PokemonCenter_2F @ 0x816B457 + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 9 + .byte 0x5d, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/VermilionCity_PokemonFanClub/header.inc b/data/maps/VermilionCity_PokemonFanClub/header.inc new file mode 100644 index 000000000..df116263d --- /dev/null +++ b/data/maps/VermilionCity_PokemonFanClub/header.inc @@ -0,0 +1,8 @@ +VermilionCity_PokemonFanClub:: @ 835115C + .4byte VermilionCity_PokemonFanClub_Layout @ 0x833ABC8 + .4byte gMapEvents_VermilionCity_PokemonFanClub @ 0x83BADA8 + .4byte gMapScripts_VermilionCity_PokemonFanClub @ 0x816B47E + .4byte NULL + .2byte BGM_FRLG_VERMILION_CITY + .2byte 273 + .byte 0x5d, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/VictoryRoad_1F/header.inc b/data/maps/VictoryRoad_1F/header.inc new file mode 100644 index 000000000..8717475ee --- /dev/null +++ b/data/maps/VictoryRoad_1F/header.inc @@ -0,0 +1,8 @@ +VictoryRoad_1F:: @ 834F658 + .4byte VictoryRoad_1F_Layout @ 0x83043CC + .4byte gMapEvents_VictoryRoad_1F @ 0x83AF5C0 + .4byte gMapScripts_VictoryRoad_1F @ 0x8160F05 + .4byte NULL + .2byte BGM_FRLG_MT_MOON + .2byte 125 + .byte 0x84, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/VictoryRoad_2F/header.inc b/data/maps/VictoryRoad_2F/header.inc new file mode 100644 index 000000000..6d96addf8 --- /dev/null +++ b/data/maps/VictoryRoad_2F/header.inc @@ -0,0 +1,8 @@ +VictoryRoad_2F:: @ 834F674 + .4byte VictoryRoad_2F_Layout @ 0x8304CB4 + .4byte gMapEvents_VictoryRoad_2F @ 0x83AF774 + .4byte gMapScripts_VictoryRoad_2F @ 0x8160F92 + .4byte NULL + .2byte BGM_FRLG_MT_MOON + .2byte 126 + .byte 0x84, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/VictoryRoad_3F/header.inc b/data/maps/VictoryRoad_3F/header.inc new file mode 100644 index 000000000..7e23cd6ee --- /dev/null +++ b/data/maps/VictoryRoad_3F/header.inc @@ -0,0 +1,8 @@ +VictoryRoad_3F:: @ 834F690 + .4byte VictoryRoad_3F_Layout @ 0x8305494 + .4byte gMapEvents_VictoryRoad_3F @ 0x83AF8E0 + .4byte gMapScripts_VictoryRoad_3F @ 0x81610AA + .4byte NULL + .2byte BGM_FRLG_MT_MOON + .2byte 127 + .byte 0x84, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/ViridianCity/connections.inc b/data/maps/ViridianCity/connections.inc new file mode 100644 index 000000000..580e6a4bd --- /dev/null +++ b/data/maps/ViridianCity/connections.inc @@ -0,0 +1,8 @@ +ViridianCity_MapConnectionsList: @ 8352774 + connection up, 12, MAP_ROUTE2 + connection down, 12, MAP_ROUTE1 + connection left, 10, MAP_ROUTE22 + +ViridianCity_MapConnections:: @ 8352798 + .4byte 3 + .4byte ViridianCity_MapConnectionsList diff --git a/data/maps/ViridianCity/header.inc b/data/maps/ViridianCity/header.inc new file mode 100644 index 000000000..a2442e278 --- /dev/null +++ b/data/maps/ViridianCity/header.inc @@ -0,0 +1,8 @@ +ViridianCity:: @ 8350634 + .4byte ViridianCity_Layout @ 0x82DE3E4 + .4byte gMapEvents_ViridianCity @ 0x83B4FE0 + .4byte gMapScripts_ViridianCity @ 0x81658D3 + .4byte ViridianCity_MapConnections @ 0x8352798 + .2byte BGM_FRLG_VIRIDIAN_CITY + .2byte 79 + .byte 0x59, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/ViridianCity_Gym/header.inc b/data/maps/ViridianCity_Gym/header.inc new file mode 100644 index 000000000..52708bd39 --- /dev/null +++ b/data/maps/ViridianCity_Gym/header.inc @@ -0,0 +1,8 @@ +ViridianCity_Gym:: @ 8350DDC + .4byte ViridianCity_Gym_Layout @ 0x82D86AC + .4byte gMapEvents_ViridianCity_Gym @ 0x83B9B78 + .4byte gMapScripts_ViridianCity_Gym @ 0x8169EC9 + .4byte NULL + .2byte BGM_FRLG_GYM + .2byte 37 + .byte 0x59, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01 diff --git a/data/maps/ViridianCity_House1/header.inc b/data/maps/ViridianCity_House1/header.inc new file mode 100644 index 000000000..a1112bfd1 --- /dev/null +++ b/data/maps/ViridianCity_House1/header.inc @@ -0,0 +1,8 @@ +ViridianCity_House1:: @ 8350DC0 + .4byte ViridianCity_House1_Layout @ 0x833AEAC + .4byte gMapEvents_ViridianCity_House1 @ 0x83B9A38 + .4byte gMapScripts_ViridianCity_House1 @ 0x8169E9A + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_CITY + .2byte 276 + .byte 0x59, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/ViridianCity_House2/header.inc b/data/maps/ViridianCity_House2/header.inc new file mode 100644 index 000000000..62019f35e --- /dev/null +++ b/data/maps/ViridianCity_House2/header.inc @@ -0,0 +1,8 @@ +ViridianCity_House2:: @ 8350DF8 + .4byte ViridianCity_House2_Layout @ 0x8338D20 + .4byte gMapEvents_ViridianCity_House2 @ 0x83B9C10 + .4byte gMapScripts_ViridianCity_House2 @ 0x816A07C + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_CITY + .2byte 266 + .byte 0x59, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/ViridianCity_Mart/header.inc b/data/maps/ViridianCity_Mart/header.inc new file mode 100644 index 000000000..7b250540a --- /dev/null +++ b/data/maps/ViridianCity_Mart/header.inc @@ -0,0 +1,8 @@ +ViridianCity_Mart:: @ 8350E14 + .4byte Mart_Layout @ 0x82D5BCC + .4byte gMapEvents_ViridianCity_Mart @ 0x83B9C84 + .4byte gMapScripts_ViridianCity_Mart @ 0x816A1D3 + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 10 + .byte 0x59, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/ViridianCity_PokemonCenter_1F/header.inc b/data/maps/ViridianCity_PokemonCenter_1F/header.inc new file mode 100644 index 000000000..3910c6ea9 --- /dev/null +++ b/data/maps/ViridianCity_PokemonCenter_1F/header.inc @@ -0,0 +1,8 @@ +ViridianCity_PokemonCenter_1F:: @ 8350E30 + .4byte PokemonCenter_1F_Layout @ 0x82D5990 + .4byte gMapEvents_ViridianCity_PokemonCenter_1F @ 0x83B9D18 + .4byte gMapScripts_ViridianCity_PokemonCenter_1F @ 0x816A2C0 + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 8 + .byte 0x59, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/ViridianCity_PokemonCenter_2F/header.inc b/data/maps/ViridianCity_PokemonCenter_2F/header.inc new file mode 100644 index 000000000..3fa490a6e --- /dev/null +++ b/data/maps/ViridianCity_PokemonCenter_2F/header.inc @@ -0,0 +1,8 @@ +ViridianCity_PokemonCenter_2F:: @ 8350E4C + .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 + .4byte gMapEvents_ViridianCity_PokemonCenter_2F @ 0x83B9DA4 + .4byte gMapScripts_ViridianCity_PokemonCenter_2F @ 0x816A2F3 + .4byte NULL + .2byte BGM_FRLG_POKEMON_CENTER + .2byte 9 + .byte 0x59, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/ViridianForest/header.inc b/data/maps/ViridianForest/header.inc new file mode 100644 index 000000000..9a8cee281 --- /dev/null +++ b/data/maps/ViridianForest/header.inc @@ -0,0 +1,8 @@ +ViridianForest:: @ 834F214 + .4byte ViridianForest_Layout @ 0x82FE46C + .4byte gMapEvents_ViridianForest @ 0x83AE4D8 + .4byte gMapScripts_ViridianForest @ 0x816051F + .4byte NULL + .2byte BGM_FRLG_VIRIDIAN_FOREST + .2byte 117 + .byte 0x7e, 0x00, 0x0b, 0x03, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/connections.inc b/data/maps/connections.inc new file mode 100644 index 000000000..ac4608002 --- /dev/null +++ b/data/maps/connections.inc @@ -0,0 +1,63 @@ + .include "data/maps/PalletTown/connections.inc" + .include "data/maps/ViridianCity/connections.inc" + .include "data/maps/PewterCity/connections.inc" + .include "data/maps/CeruleanCity/connections.inc" + .include "data/maps/LavenderTown/connections.inc" + .include "data/maps/VermilionCity/connections.inc" + .include "data/maps/CeladonCity/connections.inc" + .include "data/maps/FuchsiaCity/connections.inc" + .include "data/maps/CinnabarIsland/connections.inc" + .include "data/maps/IndigoPlateau_Exterior/connections.inc" + .include "data/maps/SaffronCity_Duplicate/connections.inc" + .include "data/maps/SaffronCity/connections.inc" + .include "data/maps/OneIsland/connections.inc" + .include "data/maps/TwoIsland/connections.inc" + .include "data/maps/ThreeIsland/connections.inc" + .include "data/maps/FiveIsland/connections.inc" + .include "data/maps/SevenIsland/connections.inc" + .include "data/maps/SixIsland/connections.inc" + .include "data/maps/Route1/connections.inc" + .include "data/maps/Route2/connections.inc" + .include "data/maps/Route3/connections.inc" + .include "data/maps/Route4/connections.inc" + .include "data/maps/Route5/connections.inc" + .include "data/maps/Route6/connections.inc" + .include "data/maps/Route7/connections.inc" + .include "data/maps/Route8/connections.inc" + .include "data/maps/Route9/connections.inc" + .include "data/maps/Route10/connections.inc" + .include "data/maps/Route11/connections.inc" + .include "data/maps/Route12/connections.inc" + .include "data/maps/Route13/connections.inc" + .include "data/maps/Route14/connections.inc" + .include "data/maps/Route15/connections.inc" + .include "data/maps/Route16/connections.inc" + .include "data/maps/Route17/connections.inc" + .include "data/maps/Route18/connections.inc" + .include "data/maps/Route19/connections.inc" + .include "data/maps/Route20/connections.inc" + .include "data/maps/Route21_North/connections.inc" + .include "data/maps/Route21_South/connections.inc" + .include "data/maps/Route22/connections.inc" + .include "data/maps/Route23/connections.inc" + .include "data/maps/Route24/connections.inc" + .include "data/maps/Route25/connections.inc" + .include "data/maps/OneIsland_KindleRoad/connections.inc" + .include "data/maps/OneIsland_TreasureBeach/connections.inc" + .include "data/maps/TwoIsland_CapeBrink/connections.inc" + .include "data/maps/ThreeIsland_BondBridge/connections.inc" + .include "data/maps/ThreeIsland_Port/connections.inc" + .include "data/maps/UnknownMap_03_50/connections.inc" + .include "data/maps/UnknownMap_03_51/connections.inc" + .include "data/maps/FiveIsland_ResortGorgeous/connections.inc" + .include "data/maps/FiveIsland_WaterLabyrinth/connections.inc" + .include "data/maps/FiveIsland_Meadow/connections.inc" + .include "data/maps/FiveIsland_MemorialPillar/connections.inc" + .include "data/maps/SixIsland_OutcastIsland/connections.inc" + .include "data/maps/SixIsland_GreenPath/connections.inc" + .include "data/maps/SixIsland_WaterPath/connections.inc" + .include "data/maps/SixIsland_RuinValley/connections.inc" + .include "data/maps/SevenIsland_TrainerTower/connections.inc" + .include "data/maps/SevenIsland_SevaultCanyon_Entrance/connections.inc" + .include "data/maps/SevenIsland_SevaultCanyon/connections.inc" + .include "data/maps/SevenIsland_TanobyRuins/connections.inc" diff --git a/data/maps/groups.inc b/data/maps/groups.inc index c771d4044..8e180eafd 100644 --- a/data/maps/groups.inc +++ b/data/maps/groups.inc @@ -1,3828 +1,3 @@ -UnknownMap_00_00:: @ 834F188 - .4byte UnknownMap_00_00_Layout @ 0x82D89E8 - .4byte gMapEvents_UnknownMap_00_00 @ 0x83AE0DC - .4byte gMapScripts_UnknownMap_00_00 @ 0x8160478 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 47 - .byte 0xc4, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08 - -UnknownMap_00_01:: @ 834F1A4 - .4byte UnknownMap_00_01_Layout @ 0x82D8AE4 - .4byte gMapEvents_UnknownMap_00_01 @ 0x83AE138 - .4byte gMapScripts_UnknownMap_00_01 @ 0x8160479 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 48 - .byte 0xc4, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -UnknownMap_00_02:: @ 834F1C0 - .4byte UnknownMap_00_02_Layout @ 0x82D8C98 - .4byte gMapEvents_UnknownMap_00_02 @ 0x83AE1C4 - .4byte gMapScripts_UnknownMap_00_02 @ 0x816047A - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 49 - .byte 0xc4, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -UnknownMap_00_03:: @ 834F1DC - .4byte UnknownMap_00_03_Layout @ 0x82D8DB8 - .4byte gMapEvents_UnknownMap_00_03 @ 0x83AE238 - .4byte gMapScripts_UnknownMap_00_03 @ 0x816047B - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 50 - .byte 0xc4, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08 - -UnknownMap_00_04:: @ 834F1F8 - .4byte UnknownMap_00_04_Layout @ 0x83388C4 - .4byte gMapEvents_UnknownMap_00_04 @ 0x83AE32C - .4byte gMapScripts_UnknownMap_00_04 @ 0x816047C - .4byte NULL - .2byte BGM_FRLG_UNION_ROOM - .2byte 262 - .byte 0xc4, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08 - -ViridianForest:: @ 834F214 - .4byte ViridianForest_Layout @ 0x82FE46C - .4byte gMapEvents_ViridianForest @ 0x83AE4D8 - .4byte gMapScripts_ViridianForest @ 0x816051F - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_FOREST - .2byte 117 - .byte 0x7e, 0x00, 0x0b, 0x03, 0x01, 0x07, 0x00, 0x00 - -MtMoon_1F:: @ 834F230 - .4byte MtMoon_1F_Layout @ 0x82FA890 - .4byte gMapEvents_MtMoon_1F @ 0x83AE668 - .4byte gMapScripts_MtMoon_1F @ 0x81605E4 - .4byte NULL - .2byte BGM_FRLG_MT_MOON - .2byte 114 - .byte 0x7f, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 - -MtMoon_B1F:: @ 834F24C - .4byte MtMoon_B1F_Layout @ 0x82FB804 - .4byte gMapEvents_MtMoon_B1F @ 0x83AE704 - .4byte gMapScripts_MtMoon_B1F @ 0x8160698 - .4byte NULL - .2byte BGM_FRLG_MT_MOON - .2byte 115 - .byte 0x7f, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 - -MtMoon_B2F:: @ 834F268 - .4byte MtMoon_B2F_Layout @ 0x82FC728 - .4byte gMapEvents_MtMoon_B2F @ 0x83AE868 - .4byte gMapScripts_MtMoon_B2F @ 0x8160699 - .4byte NULL - .2byte BGM_FRLG_MT_MOON - .2byte 116 - .byte 0x7f, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 - -SSAnne_Exterior:: @ 834F284 - .4byte SSAnne_Exterior_Layout @ 0x82FF610 - .4byte gMapEvents_SSAnne_Exterior @ 0x83AE8C8 - .4byte gMapScripts_SSAnne_Exterior @ 0x8160840 - .4byte NULL - .2byte BGM_FRLG_SS_ANNE - .2byte 118 - .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 - -SSAnne_1F_Corridor:: @ 834F2A0 - .4byte SSAnne_1F_Corridor_Layout @ 0x82FFB4C - .4byte gMapEvents_SSAnne_1F_Corridor @ 0x83AE974 - .4byte gMapScripts_SSAnne_1F_Corridor @ 0x81608CB - .4byte NULL - .2byte BGM_FRLG_SS_ANNE - .2byte 119 - .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 - -SSAnne_2F_Corridor:: @ 834F2BC - .4byte SSAnne_2F_Corridor_Layout @ 0x82FFFB0 - .4byte gMapEvents_SSAnne_2F_Corridor @ 0x83AEA30 - .4byte gMapScripts_SSAnne_2F_Corridor @ 0x81608DE - .4byte NULL - .2byte BGM_FRLG_SS_ANNE - .2byte 120 - .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 - -SSAnne_3F_Corridor:: @ 834F2D8 - .4byte SSAnne_3F_Corridor_Layout @ 0x8300108 - .4byte gMapEvents_SSAnne_3F_Corridor @ 0x83AEA74 - .4byte gMapScripts_SSAnne_3F_Corridor @ 0x8160A5D - .4byte NULL - .2byte BGM_FRLG_SS_ANNE - .2byte 121 - .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 - -SSAnne_B1F_Corridor:: @ 834F2F4 - .4byte SSAnne_B1F_Corridor_Layout @ 0x8300270 - .4byte gMapEvents_SSAnne_B1F_Corridor @ 0x83AEAC4 - .4byte gMapScripts_SSAnne_B1F_Corridor @ 0x8160A67 - .4byte NULL - .2byte BGM_FRLG_SS_ANNE - .2byte 122 - .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 - -SSAnne_Deck:: @ 834F310 - .4byte SSAnne_Deck_Layout @ 0x8300624 - .4byte gMapEvents_SSAnne_Deck @ 0x83AEB60 - .4byte gMapScripts_SSAnne_Deck @ 0x8160A68 - .4byte NULL - .2byte BGM_FRLG_SS_ANNE - .2byte 123 - .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 - -SSAnne_Kitchen:: @ 834F32C - .4byte SSAnne_Kitchen_Layout @ 0x8319214 - .4byte gMapEvents_SSAnne_Kitchen @ 0x83AEC60 - .4byte gMapScripts_SSAnne_Kitchen @ 0x8160AB2 - .4byte NULL - .2byte BGM_FRLG_SS_ANNE - .2byte 170 - .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 - -SSAnne_CaptainsOffice:: @ 834F348 - .4byte SSAnne_CaptainsOffice_Layout @ 0x83192EC - .4byte gMapEvents_SSAnne_CaptainsOffice @ 0x83AECB8 - .4byte gMapScripts_SSAnne_CaptainsOffice @ 0x8160B39 - .4byte NULL - .2byte BGM_FRLG_SS_ANNE - .2byte 171 - .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 - -SSAnne_1F_Room1:: @ 834F364 - .4byte SSAnne_Room1_Layout @ 0x8319E74 - .4byte gMapEvents_SSAnne_1F_Room1 @ 0x83AECEC - .4byte gMapScripts_SSAnne_1F_Room1 @ 0x8160BDB - .4byte NULL - .2byte BGM_FRLG_SS_ANNE - .2byte 177 - .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 - -SSAnne_1F_Room2:: @ 834F380 - .4byte SSAnne_Room1_Layout @ 0x8319E74 - .4byte gMapEvents_SSAnne_1F_Room2 @ 0x83AED68 - .4byte gMapScripts_SSAnne_1F_Room2 @ 0x8160BE5 - .4byte NULL - .2byte BGM_FRLG_SS_ANNE - .2byte 177 - .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 - -SSAnne_1F_Room3:: @ 834F39C - .4byte SSAnne_Room1_Layout @ 0x8319E74 - .4byte gMapEvents_SSAnne_1F_Room3 @ 0x83AEDCC - .4byte gMapScripts_SSAnne_1F_Room3 @ 0x8160C1D - .4byte NULL - .2byte BGM_FRLG_SS_ANNE - .2byte 177 - .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 - -SSAnne_1F_Room4:: @ 834F3B8 - .4byte SSAnne_Room1_Layout @ 0x8319E74 - .4byte gMapEvents_SSAnne_1F_Room4 @ 0x83AEE00 - .4byte gMapScripts_SSAnne_1F_Room4 @ 0x8160C43 - .4byte NULL - .2byte BGM_FRLG_SS_ANNE - .2byte 177 - .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 - -SSAnne_1F_Room5:: @ 834F3D4 - .4byte SSAnne_Room1_Layout @ 0x8319E74 - .4byte gMapEvents_SSAnne_1F_Room5 @ 0x83AEE34 - .4byte gMapScripts_SSAnne_1F_Room5 @ 0x8160C66 - .4byte NULL - .2byte BGM_FRLG_SS_ANNE - .2byte 177 - .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 - -SSAnne_1F_Room7:: @ 834F3F0 - .4byte SSAnne_Room1_Layout @ 0x8319E74 - .4byte gMapEvents_SSAnne_1F_Room7 @ 0x83AEE68 - .4byte gMapScripts_SSAnne_1F_Room7 @ 0x8160C7E - .4byte NULL - .2byte BGM_FRLG_SS_ANNE - .2byte 177 - .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 - -SSAnne_2F_Room1:: @ 834F40C - .4byte SSAnne_Room2_Layout @ 0x8319F04 - .4byte gMapEvents_SSAnne_2F_Room1 @ 0x83AEE9C - .4byte gMapScripts_SSAnne_2F_Room1 @ 0x8160C96 - .4byte NULL - .2byte BGM_FRLG_SS_ANNE - .2byte 178 - .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 - -SSAnne_2F_Room2:: @ 834F428 - .4byte SSAnne_Room2_Layout @ 0x8319F04 - .4byte gMapEvents_SSAnne_2F_Room2 @ 0x83AEF00 - .4byte gMapScripts_SSAnne_2F_Room2 @ 0x8160CB0 - .4byte NULL - .2byte BGM_FRLG_SS_ANNE - .2byte 178 - .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 - -SSAnne_2F_Room3:: @ 834F444 - .4byte SSAnne_Room2_Layout @ 0x8319F04 - .4byte gMapEvents_SSAnne_2F_Room3 @ 0x83AEF4C - .4byte gMapScripts_SSAnne_2F_Room3 @ 0x8160CDF - .4byte NULL - .2byte BGM_FRLG_SS_ANNE - .2byte 178 - .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 - -SSAnne_2F_Room4:: @ 834F460 - .4byte SSAnne_Room2_Layout @ 0x8319F04 - .4byte gMapEvents_SSAnne_2F_Room4 @ 0x83AEFB0 - .4byte gMapScripts_SSAnne_2F_Room4 @ 0x8160CF2 - .4byte NULL - .2byte BGM_FRLG_SS_ANNE - .2byte 178 - .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 - -SSAnne_2F_Room5:: @ 834F47C - .4byte SSAnne_Room2_Layout @ 0x8319F04 - .4byte gMapEvents_SSAnne_2F_Room5 @ 0x83AEFFC - .4byte gMapScripts_SSAnne_2F_Room5 @ 0x8160D21 - .4byte NULL - .2byte BGM_FRLG_SS_ANNE - .2byte 178 - .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 - -SSAnne_2F_Room6:: @ 834F498 - .4byte SSAnne_Room2_Layout @ 0x8319F04 - .4byte gMapEvents_SSAnne_2F_Room6 @ 0x83AF048 - .4byte gMapScripts_SSAnne_2F_Room6 @ 0x8160D34 - .4byte NULL - .2byte BGM_FRLG_SS_ANNE - .2byte 178 - .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 - -SSAnne_B1F_Room1:: @ 834F4B4 - .4byte SSAnne_Room2_Layout @ 0x8319F04 - .4byte gMapEvents_SSAnne_B1F_Room1 @ 0x83AF094 - .4byte gMapScripts_SSAnne_B1F_Room1 @ 0x8160D47 - .4byte NULL - .2byte BGM_FRLG_SS_ANNE - .2byte 178 - .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 - -SSAnne_B1F_Room2:: @ 834F4D0 - .4byte SSAnne_Room2_Layout @ 0x8319F04 - .4byte gMapEvents_SSAnne_B1F_Room2 @ 0x83AF0E0 - .4byte gMapScripts_SSAnne_B1F_Room2 @ 0x8160D76 - .4byte NULL - .2byte BGM_FRLG_SS_ANNE - .2byte 178 - .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 - -SSAnne_B1F_Room3:: @ 834F4EC - .4byte SSAnne_Room2_Layout @ 0x8319F04 - .4byte gMapEvents_SSAnne_B1F_Room3 @ 0x83AF12C - .4byte gMapScripts_SSAnne_B1F_Room3 @ 0x8160D8E - .4byte NULL - .2byte BGM_FRLG_SS_ANNE - .2byte 178 - .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 - -SSAnne_B1F_Room4:: @ 834F508 - .4byte SSAnne_Room2_Layout @ 0x8319F04 - .4byte gMapEvents_SSAnne_B1F_Room4 @ 0x83AF178 - .4byte gMapScripts_SSAnne_B1F_Room4 @ 0x8160DA6 - .4byte NULL - .2byte BGM_FRLG_SS_ANNE - .2byte 178 - .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 - -SSAnne_B1F_Room5:: @ 834F524 - .4byte SSAnne_Room2_Layout @ 0x8319F04 - .4byte gMapEvents_SSAnne_B1F_Room5 @ 0x83AF1DC - .4byte gMapScripts_SSAnne_B1F_Room5 @ 0x8160DD5 - .4byte NULL - .2byte BGM_FRLG_SS_ANNE - .2byte 178 - .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 - -SSAnne_1F_Room6:: @ 834F540 - .4byte SSAnne_Room1_Layout @ 0x8319E74 - .4byte gMapEvents_SSAnne_1F_Room6 @ 0x83AF210 - .4byte gMapScripts_SSAnne_1F_Room6 @ 0x8160DF2 - .4byte NULL - .2byte BGM_FRLG_SS_ANNE - .2byte 177 - .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 - -UndergroundPath_NorthEntrance:: @ 834F55C - .4byte UndergroundPath_Entrance_Layout @ 0x8319414 - .4byte gMapEvents_UndergroundPath_NorthEntrance @ 0x83AF25C - .4byte gMapScripts_UndergroundPath_NorthEntrance @ 0x8160E38 - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 172 - .byte 0x81, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 - -UndergroundPath_NorthSouthTunnel:: @ 834F578 - .4byte UndergroundPath_NorthSouthTunnel_Layout @ 0x8319CAC - .4byte gMapEvents_UndergroundPath_NorthSouthTunnel @ 0x83AF2D4 - .4byte gMapScripts_UndergroundPath_NorthSouthTunnel @ 0x8160EB5 - .4byte NULL - .2byte BGM_FRLG_ROUTE_1 - .2byte 174 - .byte 0x81, 0x00, 0x00, 0x08, 0x01, 0x06, 0x00, 0x00 - -UndergroundPath_SouthEntrance:: @ 834F594 - .4byte UndergroundPath_Entrance_Layout @ 0x8319414 - .4byte gMapEvents_UndergroundPath_SouthEntrance @ 0x83AF320 - .4byte gMapScripts_UndergroundPath_SouthEntrance @ 0x8160EBF - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 172 - .byte 0x81, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 - -UndergroundPath_WestEntrance:: @ 834F5B0 - .4byte UndergroundPath_Entrance_Layout @ 0x8319414 - .4byte gMapEvents_UndergroundPath_WestEntrance @ 0x83AF36C - .4byte gMapScripts_UndergroundPath_WestEntrance @ 0x8160EC9 - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 172 - .byte 0x82, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 - -UndergroundPath_EastWestTunnel:: @ 834F5CC - .4byte UndergroundPath_EastWestTunnel_Layout @ 0x8319898 - .4byte gMapEvents_UndergroundPath_EastWestTunnel @ 0x83AF3E4 - .4byte gMapScripts_UndergroundPath_EastWestTunnel @ 0x8160ED3 - .4byte NULL - .2byte BGM_FRLG_ROUTE_1 - .2byte 173 - .byte 0x82, 0x00, 0x00, 0x08, 0x01, 0x06, 0x00, 0x00 - -UndergroundPath_EastEntrance:: @ 834F5E8 - .4byte UndergroundPath_Entrance_Layout @ 0x8319414 - .4byte gMapEvents_UndergroundPath_EastEntrance @ 0x83AF430 - .4byte gMapScripts_UndergroundPath_EastEntrance @ 0x8160EDD - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 172 - .byte 0x82, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 - -DiglettsCave_NorthEntrance:: @ 834F604 - .4byte DiglettsCave_NorthEntrance_Layout @ 0x831EB94 - .4byte gMapEvents_DiglettsCave_NorthEntrance @ 0x83AF46C - .4byte gMapScripts_DiglettsCave_NorthEntrance @ 0x8160EE7 - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_FOREST - .2byte 210 - .byte 0x83, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 - -DiglettsCave_B1F:: @ 834F620 - .4byte DiglettsCave_B1F_Layout @ 0x8303B68 - .4byte gMapEvents_DiglettsCave_B1F @ 0x83AF490 - .4byte gMapScripts_DiglettsCave_B1F @ 0x8160EF1 - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_FOREST - .2byte 124 - .byte 0x83, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 - -DiglettsCave_SouthEntrance:: @ 834F63C - .4byte DiglettsCave_SouthEntrance_Layout @ 0x831EC58 - .4byte gMapEvents_DiglettsCave_SouthEntrance @ 0x83AF4CC - .4byte gMapScripts_DiglettsCave_SouthEntrance @ 0x8160EFB - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_FOREST - .2byte 211 - .byte 0x83, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 - -VictoryRoad_1F:: @ 834F658 - .4byte VictoryRoad_1F_Layout @ 0x83043CC - .4byte gMapEvents_VictoryRoad_1F @ 0x83AF5C0 - .4byte gMapScripts_VictoryRoad_1F @ 0x8160F05 - .4byte NULL - .2byte BGM_FRLG_MT_MOON - .2byte 125 - .byte 0x84, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 - -VictoryRoad_2F:: @ 834F674 - .4byte VictoryRoad_2F_Layout @ 0x8304CB4 - .4byte gMapEvents_VictoryRoad_2F @ 0x83AF774 - .4byte gMapScripts_VictoryRoad_2F @ 0x8160F92 - .4byte NULL - .2byte BGM_FRLG_MT_MOON - .2byte 126 - .byte 0x84, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 - -VictoryRoad_3F:: @ 834F690 - .4byte VictoryRoad_3F_Layout @ 0x8305494 - .4byte gMapEvents_VictoryRoad_3F @ 0x83AF8E0 - .4byte gMapScripts_VictoryRoad_3F @ 0x81610AA - .4byte NULL - .2byte BGM_FRLG_MT_MOON - .2byte 127 - .byte 0x84, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 - -RocketHideout_B1F:: @ 834F6AC - .4byte RocketHideout_B1F_Layout @ 0x8305C28 - .4byte gMapEvents_RocketHideout_B1F @ 0x83AF9D8 - .4byte gMapScripts_RocketHideout_B1F @ 0x8161195 - .4byte NULL - .2byte BGM_FRLG_ROCKET_HIDEOUT - .2byte 128 - .byte 0x85, 0x00, 0x00, 0x08, 0x00, 0x07, 0xff, 0x03 - -RocketHideout_B2F:: @ 834F6C8 - .4byte RocketHideout_B2F_Layout @ 0x83061CC - .4byte gMapEvents_RocketHideout_B2F @ 0x83AFA8C - .4byte gMapScripts_RocketHideout_B2F @ 0x81612A1 - .4byte NULL - .2byte BGM_FRLG_ROCKET_HIDEOUT - .2byte 129 - .byte 0x85, 0x00, 0x00, 0x08, 0x00, 0x07, 0xfe, 0x03 - -RocketHideout_B3F:: @ 834F6E4 - .4byte RocketHideout_B3F_Layout @ 0x8306694 - .4byte gMapEvents_RocketHideout_B3F @ 0x83AFB34 - .4byte gMapScripts_RocketHideout_B3F @ 0x81612B9 - .4byte NULL - .2byte BGM_FRLG_ROCKET_HIDEOUT - .2byte 130 - .byte 0x85, 0x00, 0x00, 0x08, 0x00, 0x07, 0xfd, 0x03 - -RocketHideout_B4F:: @ 834F700 - .4byte RocketHideout_B4F_Layout @ 0x8306B98 - .4byte gMapEvents_RocketHideout_B4F @ 0x83AFC50 - .4byte gMapScripts_RocketHideout_B4F @ 0x81612E8 - .4byte NULL - .2byte BGM_FRLG_ROCKET_HIDEOUT - .2byte 131 - .byte 0x85, 0x00, 0x00, 0x08, 0x00, 0x07, 0xfc, 0x03 - -RocketHideout_Elevator:: @ 834F71C - .4byte RocketHideout_Elevator_Layout @ 0x8320EDC - .4byte gMapEvents_RocketHideout_Elevator @ 0x83AFC80 - .4byte gMapScripts_RocketHideout_Elevator @ 0x81614D8 - .4byte NULL - .2byte BGM_FRLG_ROCKET_HIDEOUT - .2byte 225 - .byte 0x85, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x03 - -SilphCo_1F:: @ 834F738 - .4byte SilphCo_1F_Layout @ 0x83071EC - .4byte gMapEvents_SilphCo_1F @ 0x83AFCE0 - .4byte gMapScripts_SilphCo_1F @ 0x8161625 - .4byte NULL - .2byte BGM_FRLG_SILPH - .2byte 132 - .byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x07, 0x01, 0x00 - -SilphCo_2F:: @ 834F754 - .4byte SilphCo_2F_Layout @ 0x8307840 - .4byte gMapEvents_SilphCo_2F @ 0x83AFE1C - .4byte gMapScripts_SilphCo_2F @ 0x8161641 - .4byte NULL - .2byte BGM_FRLG_SILPH - .2byte 133 - .byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x07, 0x02, 0x00 - -SilphCo_3F:: @ 834F770 - .4byte SilphCo_3F_Layout @ 0x8307E94 - .4byte gMapEvents_SilphCo_3F @ 0x83AFF58 - .4byte gMapScripts_SilphCo_3F @ 0x81616C5 - .4byte NULL - .2byte BGM_FRLG_SILPH - .2byte 134 - .byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x07, 0x03, 0x00 - -SilphCo_4F:: @ 834F78C - .4byte SilphCo_4F_Layout @ 0x83084E8 - .4byte gMapEvents_SilphCo_4F @ 0x83B00DC - .4byte gMapScripts_SilphCo_4F @ 0x8161736 - .4byte NULL - .2byte BGM_FRLG_SILPH - .2byte 135 - .byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x07, 0x04, 0x00 - -SilphCo_5F:: @ 834F7A8 - .4byte SilphCo_5F_Layout @ 0x8308B3C - .4byte gMapEvents_SilphCo_5F @ 0x83B02D8 - .4byte gMapScripts_SilphCo_5F @ 0x81617BE - .4byte NULL - .2byte BGM_FRLG_SILPH - .2byte 136 - .byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x07, 0x05, 0x00 - -SilphCo_6F:: @ 834F7C4 - .4byte SilphCo_6F_Layout @ 0x8308FFC - .4byte gMapEvents_SilphCo_6F @ 0x83B044C - .4byte gMapScripts_SilphCo_6F @ 0x8161881 - .4byte NULL - .2byte BGM_FRLG_SILPH - .2byte 137 - .byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x07, 0x06, 0x00 - -SilphCo_7F:: @ 834F7E0 - .4byte SilphCo_7F_Layout @ 0x83094BC - .4byte gMapEvents_SilphCo_7F @ 0x83B0660 - .4byte gMapScripts_SilphCo_7F @ 0x8161984 - .4byte NULL - .2byte BGM_FRLG_SILPH - .2byte 138 - .byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x07, 0x07, 0x00 - -SilphCo_8F:: @ 834F7FC - .4byte SilphCo_8F_Layout @ 0x830997C - .4byte gMapEvents_SilphCo_8F @ 0x83B0784 - .4byte gMapScripts_SilphCo_8F @ 0x8161C5F - .4byte NULL - .2byte BGM_FRLG_SILPH - .2byte 139 - .byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x07, 0x08, 0x00 - -SilphCo_9F:: @ 834F818 - .4byte SilphCo_9F_Layout @ 0x8309E3C - .4byte gMapEvents_SilphCo_9F @ 0x83B0904 - .4byte gMapScripts_SilphCo_9F @ 0x8161CDE - .4byte NULL - .2byte BGM_FRLG_SILPH - .2byte 140 - .byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x07, 0x09, 0x00 - -SilphCo_10F:: @ 834F834 - .4byte SilphCo_10F_Layout @ 0x830A0E8 - .4byte gMapEvents_SilphCo_10F @ 0x83B0A20 - .4byte gMapScripts_SilphCo_10F @ 0x8161D86 - .4byte NULL - .2byte BGM_FRLG_SILPH - .2byte 141 - .byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x07, 0x0a, 0x00 - -SilphCo_11F:: @ 834F850 - .4byte SilphCo_11F_Layout @ 0x830A3B4 - .4byte gMapEvents_SilphCo_11F @ 0x83B0B44 - .4byte gMapScripts_SilphCo_11F @ 0x8161DEE - .4byte NULL - .2byte BGM_FRLG_SILPH - .2byte 142 - .byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x07, 0x0b, 0x00 - -SilphCo_Elevator:: @ 834F86C - .4byte SilphCo_Elevator_Layout @ 0x8321330 - .4byte gMapEvents_SilphCo_Elevator @ 0x83B0B6C - .4byte gMapScripts_SilphCo_Elevator @ 0x8161F6E - .4byte NULL - .2byte BGM_FRLG_SILPH - .2byte 229 - .byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 - -PokemonMansion_1F:: @ 834F888 - .4byte PokemonMansion_1F_Layout @ 0x830AE3C - .4byte gMapEvents_PokemonMansion_1F @ 0x83B0C60 - .4byte gMapScripts_PokemonMansion_1F @ 0x81621F9 - .4byte NULL - .2byte BGM_FRLG_POKEMON_MANSION - .2byte 143 - .byte 0x87, 0x00, 0x0b, 0x08, 0x00, 0x07, 0x00, 0x03 - -PokemonMansion_2F:: @ 834F8A4 - .4byte PokemonMansion_2F_Layout @ 0x830B9A8 - .4byte gMapEvents_PokemonMansion_2F @ 0x83B0D20 - .4byte gMapScripts_PokemonMansion_2F @ 0x8162254 - .4byte NULL - .2byte BGM_FRLG_POKEMON_MANSION - .2byte 144 - .byte 0x87, 0x00, 0x0b, 0x08, 0x00, 0x07, 0x00, 0x03 - -PokemonMansion_3F:: @ 834F8C0 - .4byte PokemonMansion_3F_Layout @ 0x830C430 - .4byte gMapEvents_PokemonMansion_3F @ 0x83B0DF8 - .4byte gMapScripts_PokemonMansion_3F @ 0x81622A1 - .4byte NULL - .2byte BGM_FRLG_POKEMON_MANSION - .2byte 145 - .byte 0x87, 0x00, 0x0b, 0x08, 0x00, 0x07, 0x00, 0x03 - -PokemonMansion_B1F:: @ 834F8DC - .4byte PokemonMansion_B1F_Layout @ 0x830CEB8 - .4byte gMapEvents_PokemonMansion_B1F @ 0x83B0ED4 - .4byte gMapScripts_PokemonMansion_B1F @ 0x81622FC - .4byte NULL - .2byte BGM_FRLG_POKEMON_MANSION - .2byte 146 - .byte 0x87, 0x00, 0x0b, 0x08, 0x00, 0x07, 0x00, 0x03 - -SafariZone_Center:: @ 834F8F8 - .4byte SafariZone_Center_Layout @ 0x830DD38 - .4byte gMapEvents_SafariZone_Center @ 0x83B0F98 - .4byte gMapScripts_SafariZone_Center @ 0x8162357 - .4byte NULL - .2byte BGM_FRLG_SAFARI_ZONE - .2byte 147 - .byte 0x88, 0x00, 0x00, 0x03, 0x01, 0x06, 0x00, 0x00 - -SafariZone_East:: @ 834F914 - .4byte SafariZone_East_Layout @ 0x830EC24 - .4byte gMapEvents_SafariZone_East @ 0x83B1068 - .4byte gMapScripts_SafariZone_East @ 0x816237C - .4byte NULL - .2byte BGM_FRLG_SAFARI_ZONE - .2byte 148 - .byte 0x88, 0x00, 0x00, 0x03, 0x01, 0x06, 0x00, 0x00 - -SafariZone_North:: @ 834F930 - .4byte SafariZone_North_Layout @ 0x830FE1C - .4byte gMapEvents_SafariZone_North @ 0x83B1168 - .4byte gMapScripts_SafariZone_North @ 0x8162398 - .4byte NULL - .2byte BGM_FRLG_SAFARI_ZONE - .2byte 149 - .byte 0x88, 0x00, 0x00, 0x03, 0x01, 0x06, 0x00, 0x00 - -SafariZone_West:: @ 834F94C - .4byte SafariZone_West_Layout @ 0x8310BC4 - .4byte gMapEvents_SafariZone_West @ 0x83B1270 - .4byte gMapScripts_SafariZone_West @ 0x81623C6 - .4byte NULL - .2byte BGM_FRLG_SAFARI_ZONE - .2byte 150 - .byte 0x88, 0x00, 0x00, 0x03, 0x01, 0x06, 0x00, 0x00 - -SafariZone_Building1:: @ 834F968 - .4byte SafariZone_Building_Layout @ 0x831C028 - .4byte gMapEvents_SafariZone_Building1 @ 0x83B12CC - .4byte gMapScripts_SafariZone_Building1 @ 0x81623EB - .4byte NULL - .2byte BGM_FRLG_SAFARI_ZONE - .2byte 198 - .byte 0x88, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -SafariZone_Building2:: @ 834F984 - .4byte SafariZone_Building_Layout @ 0x831C028 - .4byte gMapEvents_SafariZone_Building2 @ 0x83B1340 - .4byte gMapScripts_SafariZone_Building2 @ 0x81623FE - .4byte NULL - .2byte BGM_FRLG_SAFARI_ZONE - .2byte 198 - .byte 0x88, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -SafariZone_Building3:: @ 834F9A0 - .4byte SafariZone_Building_Layout @ 0x831C028 - .4byte gMapEvents_SafariZone_Building3 @ 0x83B13CC - .4byte gMapScripts_SafariZone_Building3 @ 0x816241A - .4byte NULL - .2byte BGM_FRLG_SAFARI_ZONE - .2byte 198 - .byte 0x88, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -SafariZone_Building4:: @ 834F9BC - .4byte SafariZone_Building_Layout @ 0x831C028 - .4byte gMapEvents_SafariZone_Building4 @ 0x83B1440 - .4byte gMapScripts_SafariZone_Building4 @ 0x8162436 - .4byte NULL - .2byte BGM_FRLG_SAFARI_ZONE - .2byte 198 - .byte 0x88, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -SafariZone_SecretHouse:: @ 834F9D8 - .4byte SafariZone_SecretHouse_Layout @ 0x831C16C - .4byte gMapEvents_SafariZone_SecretHouse @ 0x83B1484 - .4byte gMapScripts_SafariZone_SecretHouse @ 0x8162452 - .4byte NULL - .2byte BGM_FRLG_SAFARI_ZONE - .2byte 199 - .byte 0x88, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -CeruleanCave_1F:: @ 834F9F4 - .4byte CeruleanCave_1F_Layout @ 0x8311318 - .4byte gMapEvents_CeruleanCave_1F @ 0x83B15BC - .4byte gMapScripts_CeruleanCave_1F @ 0x81624B3 - .4byte NULL - .2byte BGM_FRLG_ROCKET_HIDEOUT - .2byte 151 - .byte 0x8d, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 - -CeruleanCave_2F:: @ 834FA10 - .4byte CeruleanCave_2F_Layout @ 0x8311A6C - .4byte gMapEvents_CeruleanCave_2F @ 0x83B1738 - .4byte gMapScripts_CeruleanCave_2F @ 0x81624BD - .4byte NULL - .2byte BGM_FRLG_ROCKET_HIDEOUT - .2byte 152 - .byte 0x8d, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 - -CeruleanCave_B1F:: @ 834FA2C - .4byte CeruleanCave_B1F_Layout @ 0x83121C0 - .4byte gMapEvents_CeruleanCave_B1F @ 0x83B1874 - .4byte gMapScripts_CeruleanCave_B1F @ 0x81624BE - .4byte NULL - .2byte BGM_FRLG_ROCKET_HIDEOUT - .2byte 153 - .byte 0x8d, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 - -PokemonLeague_LoreleisRoom:: @ 834FA48 - .4byte PokemonLeague_LoreleisRoom_Layout @ 0x831F178 - .4byte gMapEvents_PokemonLeague_LoreleisRoom @ 0x83B18B0 - .4byte gMapScripts_PokemonLeague_LoreleisRoom @ 0x816256C - .4byte NULL - .2byte BGM_FRLG_GYM - .2byte 213 - .byte 0x89, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x04 - -PokemonLeague_BrunosRoom:: @ 834FA64 - .4byte PokemonLeague_BrunosRoom_Layout @ 0x831F2F0 - .4byte gMapEvents_PokemonLeague_BrunosRoom @ 0x83B18EC - .4byte gMapScripts_PokemonLeague_BrunosRoom @ 0x8162685 - .4byte NULL - .2byte BGM_FRLG_ROCKET_HIDEOUT - .2byte 214 - .byte 0x89, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x05 - -PokemonLeague_AgathasRoom:: @ 834FA80 - .4byte PokemonLeague_AgathasRoom_Layout @ 0x831F468 - .4byte gMapEvents_PokemonLeague_AgathasRoom @ 0x83B1928 - .4byte gMapScripts_PokemonLeague_AgathasRoom @ 0x8162810 - .4byte NULL - .2byte BGM_FRLG_POKEMON_TOWER - .2byte 215 - .byte 0x89, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x06 - -PokemonLeague_LancesRoom:: @ 834FA9C - .4byte PokemonLeague_LancesRoom_Layout @ 0x831F9CC - .4byte gMapEvents_PokemonLeague_LancesRoom @ 0x83B1964 - .4byte gMapScripts_PokemonLeague_LancesRoom @ 0x816292D - .4byte NULL - .2byte BGM_FRLG_INDIGO_PLATEAU - .2byte 216 - .byte 0x89, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x07 - -PokemonLeague_ChampionsRoom:: @ 834FAB8 - .4byte PokemonLeague_ChampionsRoom_Layout @ 0x831FBF8 - .4byte gMapEvents_PokemonLeague_ChampionsRoom @ 0x83B19B8 - .4byte gMapScripts_PokemonLeague_ChampionsRoom @ 0x8162AE2 - .4byte NULL - .2byte BGM_FRLG_INDIGO_PLATEAU - .2byte 217 - .byte 0x89, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -PokemonLeague_HallOfFame:: @ 834FAD4 - .4byte PokemonLeague_HallOfFame_Layout @ 0x831FD3C - .4byte gMapEvents_PokemonLeague_HallOfFame @ 0x83B19EC - .4byte gMapScripts_PokemonLeague_HallOfFame @ 0x8162D4C - .4byte NULL - .2byte BGM_FRLG_HALL_OF_FAME_PALLET_TOWN - .2byte 218 - .byte 0x89, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -RockTunnel_1F:: @ 834FAF0 - .4byte RockTunnel_1F_Layout @ 0x83130E4 - .4byte gMapEvents_RockTunnel_1F @ 0x83B1B2C - .4byte gMapScripts_RockTunnel_1F @ 0x8162DD6 - .4byte NULL - .2byte BGM_FRLG_MT_MOON - .2byte 154 - .byte 0x8a, 0x01, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 - -RockTunnel_B1F:: @ 834FB0C - .4byte RockTunnel_B1F_Layout @ 0x8314008 - .4byte gMapEvents_RockTunnel_B1F @ 0x83B1DD0 - .4byte gMapScripts_RockTunnel_B1F @ 0x8162E8A - .4byte NULL - .2byte BGM_FRLG_MT_MOON - .2byte 155 - .byte 0x8a, 0x01, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 - -SeafoamIslands_1F:: @ 834FB28 - .4byte SeafoamIslands_1F_Layout @ 0x831474C - .4byte gMapEvents_SeafoamIslands_1F @ 0x83B1E64 - .4byte gMapScripts_SeafoamIslands_1F @ 0x8162F43 - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_FOREST - .2byte 156 - .byte 0x8b, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 - -SeafoamIslands_B1F:: @ 834FB44 - .4byte SeafoamIslands_B1F_Layout @ 0x8314E44 - .4byte gMapEvents_SeafoamIslands_B1F @ 0x83B1F30 - .4byte gMapScripts_SeafoamIslands_B1F @ 0x8162F4D - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_FOREST - .2byte 157 - .byte 0x8b, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 - -SeafoamIslands_B2F:: @ 834FB60 - .4byte SeafoamIslands_B2F_Layout @ 0x8315588 - .4byte gMapEvents_SeafoamIslands_B2F @ 0x83B1FE4 - .4byte gMapScripts_SeafoamIslands_B2F @ 0x8162F4E - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_FOREST - .2byte 158 - .byte 0x8b, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 - -SeafoamIslands_B3F:: @ 834FB7C - .4byte SeafoamIslands_B3F_Layout @ 0x8315CCC - .4byte gMapEvents_SeafoamIslands_B3F @ 0x83B20DC - .4byte gMapScripts_SeafoamIslands_B3F @ 0x8162F4F - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_FOREST - .2byte 159 - .byte 0x8b, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 - -SeafoamIslands_B4F:: @ 834FB98 - .4byte SeafoamIslands_B4F_Layout @ 0x8316410 - .4byte gMapEvents_SeafoamIslands_B4F @ 0x83B21C4 - .4byte gMapScripts_SeafoamIslands_B4F @ 0x816302E - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_FOREST - .2byte 160 - .byte 0x8b, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 - -PokemonTower_1F:: @ 834FBB4 - .4byte PokemonTower_1F_Layout @ 0x83167F4 - .4byte gMapEvents_PokemonTower_1F @ 0x83B2270 - .4byte gMapScripts_PokemonTower_1F @ 0x8163235 - .4byte NULL - .2byte BGM_FRLG_POKEMON_TOWER - .2byte 161 - .byte 0x8c, 0x00, 0x00, 0x08, 0x00, 0x05, 0x00, 0x02 - -PokemonTower_2F:: @ 834FBD0 - .4byte PokemonTower_2F_Layout @ 0x8316BD8 - .4byte gMapEvents_PokemonTower_2F @ 0x83B22E4 - .4byte gMapScripts_PokemonTower_2F @ 0x8163285 - .4byte NULL - .2byte BGM_FRLG_POKEMON_TOWER - .2byte 162 - .byte 0x8c, 0x00, 0x00, 0x08, 0x00, 0x05, 0x00, 0x02 - -PokemonTower_3F:: @ 834FBEC - .4byte PokemonTower_3F_Layout @ 0x8316FBC - .4byte gMapEvents_PokemonTower_3F @ 0x83B2368 - .4byte gMapScripts_PokemonTower_3F @ 0x81633A6 - .4byte NULL - .2byte BGM_FRLG_POKEMON_TOWER - .2byte 163 - .byte 0x8c, 0x00, 0x06, 0x08, 0x00, 0x05, 0x00, 0x02 - -PokemonTower_4F:: @ 834FC08 - .4byte PokemonTower_4F_Layout @ 0x83173A0 - .4byte gMapEvents_PokemonTower_4F @ 0x83B241C - .4byte gMapScripts_PokemonTower_4F @ 0x81633EC - .4byte NULL - .2byte BGM_FRLG_POKEMON_TOWER - .2byte 164 - .byte 0x8c, 0x00, 0x06, 0x08, 0x00, 0x05, 0x00, 0x02 - -PokemonTower_5F:: @ 834FC24 - .4byte PokemonTower_5F_Layout @ 0x8317784 - .4byte gMapEvents_PokemonTower_5F @ 0x83B2604 - .4byte gMapScripts_PokemonTower_5F @ 0x8163432 - .4byte NULL - .2byte BGM_FRLG_POKEMON_TOWER - .2byte 165 - .byte 0x8c, 0x00, 0x06, 0x08, 0x00, 0x05, 0x00, 0x02 - -PokemonTower_6F:: @ 834FC40 - .4byte PokemonTower_6F_Layout @ 0x8317B68 - .4byte gMapEvents_PokemonTower_6F @ 0x83B26C0 - .4byte gMapScripts_PokemonTower_6F @ 0x81634B7 - .4byte NULL - .2byte BGM_FRLG_POKEMON_TOWER - .2byte 166 - .byte 0x8c, 0x00, 0x06, 0x08, 0x00, 0x05, 0x00, 0x02 - -PokemonTower_7F:: @ 834FC5C - .4byte PokemonTower_7F_Layout @ 0x8317F4C - .4byte gMapEvents_PokemonTower_7F @ 0x83B2748 - .4byte gMapScripts_PokemonTower_7F @ 0x8163559 - .4byte NULL - .2byte BGM_FRLG_POKEMON_TOWER - .2byte 167 - .byte 0x8c, 0x00, 0x06, 0x08, 0x00, 0x05, 0x00, 0x02 - -PowerPlant:: @ 834FC78 - .4byte PowerPlant_Layout @ 0x8318EC0 - .4byte gMapEvents_PowerPlant @ 0x83B285C - .4byte gMapScripts_PowerPlant @ 0x8163764 - .4byte NULL - .2byte BGM_FRLG_POKEMON_MANSION - .2byte 168 - .byte 0x8e, 0x00, 0x00, 0x08, 0x00, 0x07, 0x00, 0x03 - -MtEmber_RubyPath_B4F:: @ 834FC94 - .4byte MtEmber_RubyPath_B4F_Layout @ 0x8339290 - .4byte gMapEvents_MtEmber_RubyPath_B4F @ 0x83B29B8 - .4byte gMapScripts_MtEmber_RubyPath_B4F @ 0x81638EB - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 269 - .byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 - -MtEmber_Exterior:: @ 834FCB0 - .4byte MtEmber_Exterior_Layout @ 0x833D660 - .4byte gMapEvents_MtEmber_Exterior @ 0x83B2C24 - .4byte gMapScripts_MtEmber_Exterior @ 0x8163946 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 280 - .byte 0xaf, 0x00, 0x00, 0x03, 0x01, 0x06, 0x00, 0x00 - -MtEmber_SummitPath_1F:: @ 834FCCC - .4byte MtEmber_SummitPath_1F_Layout @ 0x833DC08 - .4byte gMapEvents_MtEmber_SummitPath_1F @ 0x83B2C48 - .4byte gMapScripts_MtEmber_SummitPath_1F @ 0x8163AF9 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 282 - .byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 - -MtEmber_SummitPath_2F:: @ 834FCE8 - .4byte MtEmber_SummitPath_2F_Layout @ 0x833ED6C - .4byte gMapEvents_MtEmber_SummitPath_2F @ 0x83B2D44 - .4byte gMapScripts_MtEmber_SummitPath_2F @ 0x8163AFA - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 283 - .byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 - -MtEmber_SummitPath_3F:: @ 834FD04 - .4byte MtEmber_SummitPath_3F_Layout @ 0x833EEDC - .4byte gMapEvents_MtEmber_SummitPath_3F @ 0x83B2D68 - .4byte gMapScripts_MtEmber_SummitPath_3F @ 0x8163AFB - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 284 - .byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 - -MtEmber_Summit:: @ 834FD20 - .4byte MtEmber_Summit_Layout @ 0x833D9C8 - .4byte gMapEvents_MtEmber_Summit @ 0x83B2DFC - .4byte gMapScripts_MtEmber_Summit @ 0x8163AFC - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 281 - .byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 - -MtEmber_RubyPath_B5F:: @ 834FD3C - .4byte MtEmber_RubyPath_B5F_Layout @ 0x833FF60 - .4byte gMapEvents_MtEmber_RubyPath_B5F @ 0x83B2E3C - .4byte gMapScripts_MtEmber_RubyPath_B5F @ 0x8163BAA - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 291 - .byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 - -SSAnne_Kitchen3:: @ 834FD58 - .4byte SSAnne_Kitchen3_Layout @ 0x833F304 - .4byte gMapEvents_SSAnne_Kitchen3 @ 0x83B2EE0 - .4byte gMapScripts_SSAnne_Kitchen3 @ 0x8163C45 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 285 - .byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 - -MtEmber_RubyPath_B1F:: @ 834FD74 - .4byte MtEmber_RubyPath_B1F_Layout @ 0x833F524 - .4byte gMapEvents_MtEmber_RubyPath_B1F @ 0x83B2F64 - .4byte gMapScripts_MtEmber_RubyPath_B1F @ 0x8163C46 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 286 - .byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 - -MtEmber_RubyPath_B2F:: @ 834FD90 - .4byte MtEmber_RubyPath_B2F_Layout @ 0x833F6A8 - .4byte gMapEvents_MtEmber_RubyPath_B2F @ 0x83B3030 - .4byte gMapScripts_MtEmber_RubyPath_B2F @ 0x8163C47 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 287 - .byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 - -MtEmber_RubyPath_B3F:: @ 834FDAC - .4byte MtEmber_RubyPath_B3F_Layout @ 0x833FC60 - .4byte gMapEvents_MtEmber_RubyPath_B3F @ 0x83B314C - .4byte gMapScripts_MtEmber_RubyPath_B3F @ 0x8163C48 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 288 - .byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 - -MtEmber_RubyPath_B1F_Stairs:: @ 834FDC8 - .4byte MtEmber_RubyPath_B1F_Stairs_Layout @ 0x833FCD8 - .4byte gMapEvents_MtEmber_RubyPath_B1F_Stairs @ 0x83B3188 - .4byte gMapScripts_MtEmber_RubyPath_B1F_Stairs @ 0x8163C6F - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 289 - .byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 - -MtEmber_RubyPath_B2F_Stairs:: @ 834FDE4 - .4byte MtEmber_RubyPath_B2F_Stairs_Layout @ 0x833FD5C - .4byte gMapEvents_MtEmber_RubyPath_B2F_Stairs @ 0x83B31DC - .4byte gMapScripts_MtEmber_RubyPath_B2F_Stairs @ 0x8163C70 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 290 - .byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 - -ThreeIsland_BerryForest:: @ 834FE00 - .4byte ThreeIsland_BerryForest_Layout @ 0x833A7A8 - .4byte gMapEvents_ThreeIsland_BerryForest @ 0x83B340C - .4byte gMapScripts_ThreeIsland_BerryForest @ 0x8163C71 - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_FOREST - .2byte 270 - .byte 0xb0, 0x00, 0x0b, 0x03, 0x01, 0x07, 0x00, 0x00 - -FourIsland_IcefallCave_Entrance:: @ 834FE1C - .4byte FourIsland_IcefallCave_Entrance_Layout @ 0x8340E38 - .4byte gMapEvents_FourIsland_IcefallCave_Entrance @ 0x83B3438 - .4byte gMapScripts_FourIsland_IcefallCave_Entrance @ 0x8163D3A - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 293 - .byte 0xb1, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 - -FourIsland_IcefallCave_1F:: @ 834FE38 - .4byte FourIsland_IcefallCave_1F_Layout @ 0x834117C - .4byte gMapEvents_FourIsland_IcefallCave_1F @ 0x83B34AC - .4byte gMapScripts_FourIsland_IcefallCave_1F @ 0x8163D44 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 294 - .byte 0xb1, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 - -SSAnne_CaptainsOffice2:: @ 834FE54 - .4byte SSAnne_CaptainsOffice2_Layout @ 0x8341560 - .4byte gMapEvents_SSAnne_CaptainsOffice2 @ 0x83B3508 - .4byte gMapScripts_SSAnne_CaptainsOffice2 @ 0x8163D81 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 295 - .byte 0xb1, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 - -SSAnne_CaptainsOffice3:: @ 834FE70 - .4byte SSAnne_CaptainsOffice3_Layout @ 0x8341A98 - .4byte gMapEvents_SSAnne_CaptainsOffice3 @ 0x83B35B4 - .4byte gMapScripts_SSAnne_CaptainsOffice3 @ 0x8163D82 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 296 - .byte 0xb1, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 - -SSAnne_CaptainsOffice4:: @ 834FE8C - .4byte SSAnne_CaptainsOffice4_Layout @ 0x83405A4 - .4byte gMapEvents_SSAnne_CaptainsOffice4 @ 0x83B381C - .4byte gMapScripts_SSAnne_CaptainsOffice4 @ 0x8163F2E - .4byte NULL - .2byte BGM_FRLG_ROCKET_HIDEOUT - .2byte 292 - .byte 0xb2, 0x00, 0x00, 0x08, 0x00, 0x05, 0x00, 0x03 - -SSAnne_CaptainsOffice5:: @ 834FEA8 - .4byte SSAnne_CaptainsOffice5_Layout @ 0x83436C4 - .4byte gMapEvents_SSAnne_CaptainsOffice5 @ 0x83B3850 - .4byte gMapScripts_SSAnne_CaptainsOffice5 @ 0x8164182 - .4byte NULL - .2byte BGM_FRLG_TANOBY_RUINS - .2byte 309 - .byte 0xb4, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 - -SixIsland_DottedHole_B1F:: @ 834FEC4 - .4byte SixIsland_DottedHole_B1F_Layout @ 0x8343808 - .4byte gMapEvents_SixIsland_DottedHole_B1F @ 0x83B3898 - .4byte gMapScripts_SixIsland_DottedHole_B1F @ 0x81641B0 - .4byte NULL - .2byte BGM_FRLG_TANOBY_RUINS - .2byte 310 - .byte 0xb4, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 - -SixIsland_DottedHole_B2F:: @ 834FEE0 - .4byte SixIsland_DottedHole_B2F_Layout @ 0x834394C - .4byte gMapEvents_SixIsland_DottedHole_B2F @ 0x83B38E0 - .4byte gMapScripts_SixIsland_DottedHole_B2F @ 0x81641B1 - .4byte NULL - .2byte BGM_FRLG_TANOBY_RUINS - .2byte 311 - .byte 0xb4, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 - -SixIsland_DottedHole_B3F:: @ 834FEFC - .4byte SixIsland_DottedHole_B3F_Layout @ 0x8343A90 - .4byte gMapEvents_SixIsland_DottedHole_B3F @ 0x83B3928 - .4byte gMapScripts_SixIsland_DottedHole_B3F @ 0x81641B2 - .4byte NULL - .2byte BGM_FRLG_TANOBY_RUINS - .2byte 312 - .byte 0xb4, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 - -SSAnne_CaptainsOffice9:: @ 834FF18 - .4byte SSAnne_CaptainsOffice9_Layout @ 0x8343BD4 - .4byte gMapEvents_SSAnne_CaptainsOffice9 @ 0x83B3970 - .4byte gMapScripts_SSAnne_CaptainsOffice9 @ 0x81641B3 - .4byte NULL - .2byte BGM_FRLG_TANOBY_RUINS - .2byte 313 - .byte 0xb4, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 - -SixIsland_DottedHole_SapphireRoom:: @ 834FF34 - .4byte SixIsland_DottedHole_SapphireRoom_Layout @ 0x8343DD8 - .4byte gMapEvents_SixIsland_DottedHole_SapphireRoom @ 0x83B39D0 - .4byte gMapScripts_SixIsland_DottedHole_SapphireRoom @ 0x81641B4 - .4byte NULL - .2byte BGM_FRLG_TANOBY_RUINS - .2byte 314 - .byte 0xb4, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 - -SSAnne_1F_Room11:: @ 834FF50 - .4byte SSAnne_1F_Room11_Layout @ 0x8345030 - .4byte gMapEvents_SSAnne_1F_Room11 @ 0x83B3B34 - .4byte gMapScripts_SSAnne_1F_Room11 @ 0x8164559 - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_FOREST - .2byte 317 - .byte 0xb6, 0x00, 0x00, 0x03, 0x01, 0x07, 0x00, 0x00 - -SSAnne_1F_Room12:: @ 834FF6C - .4byte SSAnne_1F_Room12_Layout @ 0x8347A50 - .4byte gMapEvents_SSAnne_1F_Room12 @ 0x83B3B50 - .4byte gMapScripts_SSAnne_1F_Room12 @ 0x81646A4 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 340 - .byte 0xb7, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 - -NavelRock_Exterior:: @ 834FF88 - .4byte NavelRock_Exterior_Layout @ 0x834873C - .4byte gMapEvents_NavelRock_Exterior @ 0x83B3B74 - .4byte gMapScripts_NavelRock_Exterior @ 0x81646AE - .4byte NULL - .2byte BGM_FRLG_SEVII_ISLANDS - .2byte 343 - .byte 0xae, 0x00, 0x00, 0x03, 0x01, 0x06, 0x00, 0x00 - -SevenIsland_TrainerTower_1F:: @ 834FFA4 - .4byte SevenIsland_TrainerTower_1F_Layout @ 0x8341FCC - .4byte gMapEvents_SevenIsland_TrainerTower_1F @ 0x83B3C40 - .4byte gMapScripts_SevenIsland_TrainerTower_1F @ 0x81646B8 - .4byte NULL - .2byte BGM_FRLG_TRAINER_TOWER - .2byte 298 - .byte 0xb3, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00 - -SevenIsland_TrainerTower_2F:: @ 834FFC0 - .4byte SevenIsland_TrainerTower_2F_Layout @ 0x8342254 - .4byte gMapEvents_SevenIsland_TrainerTower_2F @ 0x83B3D14 - .4byte gMapScripts_SevenIsland_TrainerTower_2F @ 0x81646E6 - .4byte NULL - .2byte BGM_FRLG_TRAINER_TOWER - .2byte 299 - .byte 0xb3, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00 - -SevenIsland_TrainerTower_3F:: @ 834FFDC - .4byte SevenIsland_TrainerTower_3F_Layout @ 0x83424DC - .4byte gMapEvents_SevenIsland_TrainerTower_3F @ 0x83B3DE8 - .4byte gMapScripts_SevenIsland_TrainerTower_3F @ 0x8164714 - .4byte NULL - .2byte BGM_FRLG_TRAINER_TOWER - .2byte 300 - .byte 0xb3, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00 - -SevenIsland_TrainerTower_4F:: @ 834FFF8 - .4byte SevenIsland_TrainerTower_4F_Layout @ 0x8342764 - .4byte gMapEvents_SevenIsland_TrainerTower_4F @ 0x83B3EBC - .4byte gMapScripts_SevenIsland_TrainerTower_4F @ 0x8164742 - .4byte NULL - .2byte BGM_FRLG_TRAINER_TOWER - .2byte 301 - .byte 0xb3, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00 - -SevenIsland_TrainerTower_5F:: @ 8350014 - .4byte SevenIsland_TrainerTower_5F_Layout @ 0x83429EC - .4byte gMapEvents_SevenIsland_TrainerTower_5F @ 0x83B3F90 - .4byte gMapScripts_SevenIsland_TrainerTower_5F @ 0x8164770 - .4byte NULL - .2byte BGM_FRLG_TRAINER_TOWER - .2byte 302 - .byte 0xb3, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00 - -SevenIsland_TrainerTower_6F:: @ 8350030 - .4byte SevenIsland_TrainerTower_6F_Layout @ 0x8342C74 - .4byte gMapEvents_SevenIsland_TrainerTower_6F @ 0x83B4064 - .4byte gMapScripts_SevenIsland_TrainerTower_6F @ 0x816479E - .4byte NULL - .2byte BGM_FRLG_TRAINER_TOWER - .2byte 303 - .byte 0xb3, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00 - -SevenIsland_TrainerTower_7F:: @ 835004C - .4byte SevenIsland_TrainerTower_7F_Layout @ 0x8342EFC - .4byte gMapEvents_SevenIsland_TrainerTower_7F @ 0x83B4138 - .4byte gMapScripts_SevenIsland_TrainerTower_7F @ 0x81647CC - .4byte NULL - .2byte BGM_FRLG_TRAINER_TOWER - .2byte 304 - .byte 0xb3, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00 - -SevenIsland_TrainerTower_8F:: @ 8350068 - .4byte SevenIsland_TrainerTower_8F_Layout @ 0x8343184 - .4byte gMapEvents_SevenIsland_TrainerTower_8F @ 0x83B420C - .4byte gMapScripts_SevenIsland_TrainerTower_8F @ 0x81647FA - .4byte NULL - .2byte BGM_FRLG_TRAINER_TOWER - .2byte 305 - .byte 0xb3, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00 - -SevenIsland_TrainerTower_Roof:: @ 8350084 - .4byte SevenIsland_TrainerTower_Roof_Layout @ 0x83433E8 - .4byte gMapEvents_SevenIsland_TrainerTower_Roof @ 0x83B4248 - .4byte gMapScripts_SevenIsland_TrainerTower_Roof @ 0x8164828 - .4byte NULL - .2byte BGM_FRLG_TRAINER_TOWER - .2byte 306 - .byte 0xb3, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00 - -SevenIsland_TrainerTower_Lobby:: @ 83500A0 - .4byte SevenIsland_TrainerTower_Lobby_Layout @ 0x8341D44 - .4byte gMapEvents_SevenIsland_TrainerTower_Lobby @ 0x83B4308 - .4byte gMapScripts_SevenIsland_TrainerTower_Lobby @ 0x8164839 - .4byte NULL - .2byte BGM_FRLG_TRAINER_TOWER - .2byte 297 - .byte 0xb3, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00 - -SevenIsland_TrainerTower_Elevator:: @ 83500BC - .4byte SevenIsland_TrainerTower_Elevator_Layout @ 0x8343454 - .4byte gMapEvents_SevenIsland_TrainerTower_Elevator @ 0x83B4330 - .4byte gMapScripts_SevenIsland_TrainerTower_Elevator @ 0x8164AF8 - .4byte NULL - .2byte BGM_FRLG_TRAINER_TOWER - .2byte 307 - .byte 0xb3, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00 - -FiveIsland_LostCave_Entrance:: @ 83500D8 - .4byte FiveIsland_LostCave_Entrance_Layout @ 0x83454D8 - .4byte gMapEvents_FiveIsland_LostCave_Entrance @ 0x83B4354 - .4byte gMapScripts_FiveIsland_LostCave_Entrance @ 0x8164BEC - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 320 - .byte 0xb5, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 - -FiveIsland_LostCave_Room1:: @ 83500F4 - .4byte FiveIsland_LostCave_Room1_Layout @ 0x83455F0 - .4byte gMapEvents_FiveIsland_LostCave_Room1 @ 0x83B43A8 - .4byte gMapScripts_FiveIsland_LostCave_Room1 @ 0x8164BF6 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 321 - .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 - -FiveIsland_LostCave_Room2:: @ 8350110 - .4byte FiveIsland_LostCave_Room2_Layout @ 0x8345708 - .4byte gMapEvents_FiveIsland_LostCave_Room2 @ 0x83B43DC - .4byte gMapScripts_FiveIsland_LostCave_Room2 @ 0x8164C0E - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 322 - .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 - -FiveIsland_LostCave_Room3:: @ 835012C - .4byte FiveIsland_LostCave_Room3_Layout @ 0x8345820 - .4byte gMapEvents_FiveIsland_LostCave_Room3 @ 0x83B4410 - .4byte gMapScripts_FiveIsland_LostCave_Room3 @ 0x8164C0F - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 323 - .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 - -FiveIsland_LostCave_Room4:: @ 8350148 - .4byte FiveIsland_LostCave_Room4_Layout @ 0x8345938 - .4byte gMapEvents_FiveIsland_LostCave_Room4 @ 0x83B445C - .4byte gMapScripts_FiveIsland_LostCave_Room4 @ 0x8164C10 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 324 - .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 - -FiveIsland_LostCave_Room5:: @ 8350164 - .4byte FiveIsland_LostCave_Room5_Layout @ 0x8345A50 - .4byte gMapEvents_FiveIsland_LostCave_Room5 @ 0x83B4490 - .4byte gMapScripts_FiveIsland_LostCave_Room5 @ 0x8164C28 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 325 - .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 - -FiveIsland_LostCave_Room6:: @ 8350180 - .4byte FiveIsland_LostCave_Room6_Layout @ 0x8345B68 - .4byte gMapEvents_FiveIsland_LostCave_Room6 @ 0x83B44C4 - .4byte gMapScripts_FiveIsland_LostCave_Room6 @ 0x8164C29 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 326 - .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 - -FiveIsland_LostCave_Room7:: @ 835019C - .4byte FiveIsland_LostCave_Room7_Layout @ 0x8345C80 - .4byte gMapEvents_FiveIsland_LostCave_Room7 @ 0x83B44F8 - .4byte gMapScripts_FiveIsland_LostCave_Room7 @ 0x8164C2A - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 327 - .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 - -FiveIsland_LostCave_Room8:: @ 83501B8 - .4byte FiveIsland_LostCave_Room8_Layout @ 0x8345D98 - .4byte gMapEvents_FiveIsland_LostCave_Room8 @ 0x83B452C - .4byte gMapScripts_FiveIsland_LostCave_Room8 @ 0x8164C2B - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 328 - .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 - -FiveIsland_LostCave_Room9:: @ 83501D4 - .4byte FiveIsland_LostCave_Room9_Layout @ 0x8345EB0 - .4byte gMapEvents_FiveIsland_LostCave_Room9 @ 0x83B4560 - .4byte gMapScripts_FiveIsland_LostCave_Room9 @ 0x8164C2C - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 329 - .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 - -FiveIsland_LostCave_Room10:: @ 83501F0 - .4byte FiveIsland_LostCave_Room10_Layout @ 0x8345FC8 - .4byte gMapEvents_FiveIsland_LostCave_Room10 @ 0x83B45AC - .4byte gMapScripts_FiveIsland_LostCave_Room10 @ 0x8164C2D - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 330 - .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 - -FiveIsland_LostCave_Room11:: @ 835020C - .4byte FiveIsland_LostCave_Room11_Layout @ 0x83460E0 - .4byte gMapEvents_FiveIsland_LostCave_Room11 @ 0x83B45E0 - .4byte gMapScripts_FiveIsland_LostCave_Room11 @ 0x8164CCB - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 331 - .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 - -FiveIsland_LostCave_Room12:: @ 8350228 - .4byte FiveIsland_LostCave_Room12_Layout @ 0x83461F8 - .4byte gMapEvents_FiveIsland_LostCave_Room12 @ 0x83B4614 - .4byte gMapScripts_FiveIsland_LostCave_Room12 @ 0x8164CCC - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 332 - .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 - -FiveIsland_LostCave_Room13:: @ 8350244 - .4byte FiveIsland_LostCave_Room13_Layout @ 0x8346310 - .4byte gMapEvents_FiveIsland_LostCave_Room13 @ 0x83B4648 - .4byte gMapScripts_FiveIsland_LostCave_Room13 @ 0x8164CCD - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 333 - .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 - -FiveIsland_LostCave_Room14:: @ 8350260 - .4byte FiveIsland_LostCave_Room14_Layout @ 0x8346428 - .4byte gMapEvents_FiveIsland_LostCave_Room14 @ 0x83B467C - .4byte gMapScripts_FiveIsland_LostCave_Room14 @ 0x8164CCE - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 334 - .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 - -SevenIsland_TanobyRuins_MoneanChamber:: @ 835027C - .4byte SevenIsland_TanobyRuins_MoneanChamber_Layout @ 0x834675C - .4byte gMapEvents_SevenIsland_TanobyRuins_MoneanChamber @ 0x83B4698 - .4byte gMapScripts_SevenIsland_TanobyRuins_MoneanChamber @ 0x8164CCF - .4byte NULL - .2byte BGM_FRLG_TANOBY_RUINS - .2byte 335 - .byte 0xbc, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x02 - -SevenIsland_TanobyRuins_LiptooChamber:: @ 8350298 - .4byte SevenIsland_TanobyRuins_LiptooChamber_Layout @ 0x8346A90 - .4byte gMapEvents_SevenIsland_TanobyRuins_LiptooChamber @ 0x83B46B4 - .4byte gMapScripts_SevenIsland_TanobyRuins_LiptooChamber @ 0x8164CDE - .4byte NULL - .2byte BGM_FRLG_TANOBY_RUINS - .2byte 336 - .byte 0xbd, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x02 - -SevenIsland_TanobyRuins_WeepthChamber:: @ 83502B4 - .4byte SevenIsland_TanobyRuins_WeepthChamber_Layout @ 0x8346DC4 - .4byte gMapEvents_SevenIsland_TanobyRuins_WeepthChamber @ 0x83B46D0 - .4byte gMapScripts_SevenIsland_TanobyRuins_WeepthChamber @ 0x8164CEA - .4byte NULL - .2byte BGM_FRLG_TANOBY_RUINS - .2byte 337 - .byte 0xbe, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x02 - -SevenIsland_TanobyRuins_DilfordChamber:: @ 83502D0 - .4byte SevenIsland_TanobyRuins_DilfordChamber_Layout @ 0x83470F8 - .4byte gMapEvents_SevenIsland_TanobyRuins_DilfordChamber @ 0x83B46EC - .4byte gMapScripts_SevenIsland_TanobyRuins_DilfordChamber @ 0x8164CF6 - .4byte NULL - .2byte BGM_FRLG_TANOBY_RUINS - .2byte 338 - .byte 0xbf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x02 - -SevenIsland_TanobyRuins_ScufibChamber:: @ 83502EC - .4byte SevenIsland_TanobyRuins_ScufibChamber_Layout @ 0x834742C - .4byte gMapEvents_SevenIsland_TanobyRuins_ScufibChamber @ 0x83B4708 - .4byte gMapScripts_SevenIsland_TanobyRuins_ScufibChamber @ 0x8164D02 - .4byte NULL - .2byte BGM_FRLG_TANOBY_RUINS - .2byte 339 - .byte 0xc0, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x02 - -SevenIsland_TanobyRuins_RixyChamber:: @ 8350308 - .4byte SevenIsland_TanobyRuins_RixyChamber_Layout @ 0x8349DC8 - .4byte gMapEvents_SevenIsland_TanobyRuins_RixyChamber @ 0x83B4724 - .4byte gMapScripts_SevenIsland_TanobyRuins_RixyChamber @ 0x8164D0E - .4byte NULL - .2byte BGM_FRLG_TANOBY_RUINS - .2byte 362 - .byte 0xc1, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x02 - -SevenIsland_TanobyRuins_ViapoisChamber:: @ 8350324 - .4byte SevenIsland_TanobyRuins_ViapoisChamber_Layout @ 0x834A0FC - .4byte gMapEvents_SevenIsland_TanobyRuins_ViapoisChamber @ 0x83B4740 - .4byte gMapScripts_SevenIsland_TanobyRuins_ViapoisChamber @ 0x8164D1A - .4byte NULL - .2byte BGM_FRLG_TANOBY_RUINS - .2byte 363 - .byte 0xc2, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x02 - -ThreeIsland_DunsparceTunnel:: @ 8350340 - .4byte ThreeIsland_DunsparceTunnel_Layout @ 0x83451F8 - .4byte gMapEvents_ThreeIsland_DunsparceTunnel @ 0x83B4788 - .4byte gMapScripts_ThreeIsland_DunsparceTunnel @ 0x8164D26 - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_FOREST - .2byte 318 - .byte 0xb9, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 - -SevenIsland_SeavaultCanyon_TanobyKey:: @ 835035C - .4byte SevenIsland_SeavaultCanyon_TanobyKey_Layout @ 0x8347C54 - .4byte gMapEvents_SevenIsland_SeavaultCanyon_TanobyKey @ 0x83B48BC - .4byte gMapScripts_SevenIsland_SeavaultCanyon_TanobyKey @ 0x8164DCC - .4byte NULL - .2byte BGM_FRLG_TANOBY_RUINS - .2byte 341 - .byte 0xba, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x02 - -NavelRock_1F:: @ 8350378 - .4byte NavelRock_1F_Layout @ 0x8348AD4 - .4byte gMapEvents_NavelRock_1F @ 0x83B48E0 - .4byte gMapScripts_NavelRock_1F @ 0x8164F9E - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 344 - .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 - -NavelRock_Summit:: @ 8350394 - .4byte NavelRock_Summit_Layout @ 0x8348EB0 - .4byte gMapEvents_NavelRock_Summit @ 0x83B4930 - .4byte gMapScripts_NavelRock_Summit @ 0x8164F9F - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 345 - .byte 0xae, 0x00, 0x0b, 0x04, 0x00, 0x06, 0x00, 0x00 - -NavelRock_Base:: @ 83503B0 - .4byte NavelRock_Base_Layout @ 0x834929C - .4byte gMapEvents_NavelRock_Base @ 0x83B4964 - .4byte gMapScripts_NavelRock_Base @ 0x81650E7 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 346 - .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 - -NavelRock_SummitPath_2F:: @ 83503CC - .4byte NavelRock_SummitPath_2F_Layout @ 0x8349324 - .4byte gMapEvents_NavelRock_SummitPath_2F @ 0x83B4988 - .4byte gMapScripts_NavelRock_SummitPath_2F @ 0x81651F2 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 347 - .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 - -NavelRock_SummitPath_3F:: @ 83503E8 - .4byte NavelRock_SummitPath_3F_Layout @ 0x83493AC - .4byte gMapEvents_NavelRock_SummitPath_3F @ 0x83B49AC - .4byte gMapScripts_NavelRock_SummitPath_3F @ 0x81651F3 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 348 - .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 - -NavelRock_SummitPath_4F:: @ 8350404 - .4byte NavelRock_SummitPath_4F_Layout @ 0x8349434 - .4byte gMapEvents_NavelRock_SummitPath_4F @ 0x83B49D0 - .4byte gMapScripts_NavelRock_SummitPath_4F @ 0x81651F4 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 349 - .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 - -NavelRock_SummitPath_5F:: @ 8350420 - .4byte NavelRock_SummitPath_5F_Layout @ 0x83494BC - .4byte gMapEvents_NavelRock_SummitPath_5F @ 0x83B49F4 - .4byte gMapScripts_NavelRock_SummitPath_5F @ 0x81651F5 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 350 - .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 - -NavelRock_BasePath_B1F:: @ 835043C - .4byte NavelRock_BasePath_B1F_Layout @ 0x8349544 - .4byte gMapEvents_NavelRock_BasePath_B1F @ 0x83B4A18 - .4byte gMapScripts_NavelRock_BasePath_B1F @ 0x81651F6 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 351 - .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 - -NavelRock_BasePath_B2F:: @ 8350458 - .4byte NavelRock_BasePath_B2F_Layout @ 0x83495CC - .4byte gMapEvents_NavelRock_BasePath_B2F @ 0x83B4A3C - .4byte gMapScripts_NavelRock_BasePath_B2F @ 0x81651F7 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 352 - .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 - -NavelRock_BasePath_B3F:: @ 8350474 - .4byte NavelRock_BasePath_B3F_Layout @ 0x8349654 - .4byte gMapEvents_NavelRock_BasePath_B3F @ 0x83B4A60 - .4byte gMapScripts_NavelRock_BasePath_B3F @ 0x81651F8 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 353 - .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 - -NavelRock_BasePath_B4F:: @ 8350490 - .4byte NavelRock_BasePath_B4F_Layout @ 0x83496DC - .4byte gMapEvents_NavelRock_BasePath_B4F @ 0x83B4A84 - .4byte gMapScripts_NavelRock_BasePath_B4F @ 0x81651F9 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 354 - .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 - -NavelRock_BasePath_B5F:: @ 83504AC - .4byte NavelRock_BasePath_B5F_Layout @ 0x8349764 - .4byte gMapEvents_NavelRock_BasePath_B5F @ 0x83B4AA8 - .4byte gMapScripts_NavelRock_BasePath_B5F @ 0x81651FA - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 355 - .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 - -NavelRock_BasePath_B6F:: @ 83504C8 - .4byte NavelRock_BasePath_B6F_Layout @ 0x83497EC - .4byte gMapEvents_NavelRock_BasePath_B6F @ 0x83B4ACC - .4byte gMapScripts_NavelRock_BasePath_B6F @ 0x81651FB - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 356 - .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 - -NavelRock_BasePath_B7F:: @ 83504E4 - .4byte NavelRock_BasePath_B7F_Layout @ 0x8349874 - .4byte gMapEvents_NavelRock_BasePath_B7F @ 0x83B4AF0 - .4byte gMapScripts_NavelRock_BasePath_B7F @ 0x81651FC - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 357 - .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 - -NavelRock_BasePath_B8F:: @ 8350500 - .4byte NavelRock_BasePath_B8F_Layout @ 0x83498FC - .4byte gMapEvents_NavelRock_BasePath_B8F @ 0x83B4B14 - .4byte gMapScripts_NavelRock_BasePath_B8F @ 0x81651FD - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 358 - .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 - -NavelRock_BasePath_B9F:: @ 835051C - .4byte NavelRock_BasePath_B9F_Layout @ 0x8349984 - .4byte gMapEvents_NavelRock_BasePath_B9F @ 0x83B4B38 - .4byte gMapScripts_NavelRock_BasePath_B9F @ 0x81651FE - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 359 - .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 - -NavelRock_BasePath_B10F:: @ 8350538 - .4byte NavelRock_BasePath_B10F_Layout @ 0x8349A0C - .4byte gMapEvents_NavelRock_BasePath_B10F @ 0x83B4B5C - .4byte gMapScripts_NavelRock_BasePath_B10F @ 0x81651FF - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 360 - .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 - -NavelRock_BasePath_B11F:: @ 8350554 - .4byte NavelRock_BasePath_B11F_Layout @ 0x8349A94 - .4byte gMapEvents_NavelRock_BasePath_B11F @ 0x83B4B80 - .4byte gMapScripts_NavelRock_BasePath_B11F @ 0x8165200 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 361 - .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 - -NavelRock_B1F:: @ 8350570 - .4byte NavelRock_B1F_Layout @ 0x834A210 - .4byte gMapEvents_NavelRock_B1F @ 0x83B4BA4 - .4byte gMapScripts_NavelRock_B1F @ 0x8165201 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 364 - .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 - -NavelRock_Fork:: @ 835058C - .4byte NavelRock_Fork_Layout @ 0x834B9A4 - .4byte gMapEvents_NavelRock_Fork @ 0x83B4BD0 - .4byte gMapScripts_NavelRock_Fork @ 0x8165202 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 365 - .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 - -BirthIsland_Exterior:: @ 83505A8 - .4byte BirthIsland_Exterior_Layout @ 0x8348380 - .4byte gMapEvents_BirthIsland_Exterior @ 0x83B4C1C - .4byte gMapScripts_BirthIsland_Exterior @ 0x8165203 - .4byte NULL - .2byte 0xFFFF - .2byte 342 - .byte 0xbb, 0x00, 0x00, 0x03, 0x00, 0x06, 0x00, 0x00 - -OneIsland_KindleRoad_EmberSpa:: @ 83505C4 - .4byte OneIsland_KindleRoad_EmberSpa_Layout @ 0x834EB70 - .4byte gMapEvents_OneIsland_KindleRoad_EmberSpa @ 0x83B4CD8 - .4byte gMapScripts_OneIsland_KindleRoad_EmberSpa @ 0x816535B - .4byte NULL - .2byte BGM_FRLG_CERULEAN_CITY - .2byte 383 - .byte 0xc3, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 - -BirthIsland_Harbor:: @ 83505E0 - .4byte Island_Harbor_Layout @ 0x8343FB8 - .4byte gMapEvents_BirthIsland_Harbor @ 0x83B4D24 - .4byte gMapScripts_BirthIsland_Harbor @ 0x81653E6 - .4byte NULL - .2byte 0xFFFF - .2byte 315 - .byte 0xbb, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -NavelRock_Harbor:: @ 83505FC - .4byte Island_Harbor_Layout @ 0x8343FB8 - .4byte gMapEvents_NavelRock_Harbor @ 0x83B4D70 - .4byte gMapScripts_NavelRock_Harbor @ 0x8165420 - .4byte NULL - .2byte BGM_FRLG_SEVII_ISLANDS - .2byte 315 - .byte 0xae, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -PalletTown:: @ 8350618 - .4byte PalletTown_Layout @ 0x82DD4C0 - .4byte gMapEvents_PalletTown @ 0x83B4E50 - .4byte gMapScripts_PalletTown @ 0x816545A - .4byte gMapConnections_PalletTown @ 0x835276C - .2byte BGM_FRLG_PALLET_TOWN - .2byte 78 - .byte 0x58, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 - -ViridianCity:: @ 8350634 - .4byte ViridianCity_Layout @ 0x82DE3E4 - .4byte gMapEvents_ViridianCity @ 0x83B4FE0 - .4byte gMapScripts_ViridianCity @ 0x81658D3 - .4byte gMapConnections_ViridianCity @ 0x8352798 - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 79 - .byte 0x59, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 - -PewterCity:: @ 8350650 - .4byte PewterCity_Layout @ 0x82DF308 - .4byte gMapEvents_PewterCity @ 0x83B518C - .4byte gMapScripts_PewterCity @ 0x8165B8E - .4byte gMapConnections_PewterCity @ 0x83527B8 - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 80 - .byte 0x5a, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 - -CeruleanCity:: @ 835066C - .4byte CeruleanCity_Layout @ 0x82E022C - .4byte gMapEvents_CeruleanCity @ 0x83B53E0 - .4byte gMapScripts_CeruleanCity @ 0x8166471 - .4byte gMapConnections_CeruleanCity @ 0x83527F0 - .2byte BGM_FRLG_CERULEAN_CITY - .2byte 81 - .byte 0x5b, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 - -LavenderTown:: @ 8350688 - .4byte LavenderTown_Layout @ 0x82E0610 - .4byte gMapEvents_LavenderTown @ 0x83B549C - .4byte gMapScripts_LavenderTown @ 0x816686B - .4byte gMapConnections_LavenderTown @ 0x835281C - .2byte BGM_FRLG_LAVENDER_TOWN - .2byte 82 - .byte 0x5c, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 - -VermilionCity:: @ 83506A4 - .4byte VermilionCity_Layout @ 0x82E1534 - .4byte gMapEvents_VermilionCity @ 0x83B5648 - .4byte gMapScripts_VermilionCity @ 0x81668DC - .4byte gMapConnections_VermilionCity @ 0x835283C - .2byte BGM_FRLG_VERMILION_CITY - .2byte 83 - .byte 0x5d, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 - -CeladonCity:: @ 83506C0 - .4byte CeladonCity_Layout @ 0x82E2818 - .4byte gMapEvents_CeladonCity @ 0x83B5898 - .4byte gMapScripts_CeladonCity @ 0x8166C8F - .4byte gMapConnections_CeladonCity @ 0x835285C - .2byte BGM_FRLG_CELADON_CITY - .2byte 84 - .byte 0x5e, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 - -FuchsiaCity:: @ 83506DC - .4byte FuchsiaCity_Layout @ 0x82E373C - .4byte gMapEvents_FuchsiaCity @ 0x83B5B14 - .4byte gMapScripts_FuchsiaCity @ 0x8166D75 - .4byte gMapConnections_FuchsiaCity @ 0x8352888 - .2byte BGM_FRLG_CERULEAN_CITY - .2byte 85 - .byte 0x5f, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 - -CinnabarIsland:: @ 83506F8 - .4byte CinnabarIsland_Layout @ 0x82E3B20 - .4byte gMapEvents_CinnabarIsland @ 0x83B5BF0 - .4byte gMapScripts_CinnabarIsland @ 0x8166ED6 - .4byte gMapConnections_CinnabarIsland @ 0x83528A8 - .2byte BGM_FRLG_CINNABAR_ISLAND - .2byte 86 - .byte 0x60, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 - -IndigoPlateau_Exterior:: @ 8350714 - .4byte IndigoPlateau_Exterior_Layout @ 0x82E3F04 - .4byte gMapEvents_IndigoPlateau_Exterior @ 0x83B5C3C - .4byte gMapScripts_IndigoPlateau_Exterior @ 0x816723B - .4byte gMapConnections_IndigoPlateau_Exterior @ 0x83528BC - .2byte BGM_FRLG_INDIGO_PLATEAU - .2byte 87 - .byte 0x61, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 - -SaffronCity_Duplicate:: @ 8350730 - .4byte SaffronCity_Duplicate_Layout @ 0x831E8D4 - .4byte gMapEvents_SaffronCity_Duplicate @ 0x83B5E9C - .4byte gMapScripts_SaffronCity_Duplicate @ 0x816735F - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 207 - .byte 0x62, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 - -SaffronCity:: @ 835074C - .4byte SaffronCity_Layout @ 0x82E4E28 - .4byte gMapEvents_SaffronCity @ 0x83B5EB0 - .4byte gMapScripts_SaffronCity @ 0x8167483 - .4byte gMapConnections_SaffronCity @ 0x835292C - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 88 - .byte 0x62, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 - -OneIsland:: @ 8350768 - .4byte OneIsland_Layout @ 0x8321714 - .4byte gMapEvents_OneIsland @ 0x83B5F44 - .4byte gMapScripts_OneIsland @ 0x8167484 - .4byte gMapConnections_OneIsland @ 0x835294C - .2byte BGM_FRLG_ISLAND_ONE - .2byte 230 - .byte 0x8f, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 - -TwoIsland:: @ 8350784 - .4byte TwoIsland_Layout @ 0x8321EB8 - .4byte gMapEvents_TwoIsland @ 0x83B6074 - .4byte gMapScripts_TwoIsland @ 0x8167564 - .4byte gMapConnections_TwoIsland @ 0x8352960 - .2byte BGM_FRLG_ISLAND_ONE - .2byte 231 - .byte 0x90, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 - -ThreeIsland:: @ 83507A0 - .4byte ThreeIsland_Layout @ 0x832265C - .4byte gMapEvents_ThreeIsland @ 0x83B62C8 - .4byte gMapScripts_ThreeIsland @ 0x81677AD - .4byte gMapConnections_ThreeIsland @ 0x8352980 - .2byte BGM_FRLG_ISLAND_ONE - .2byte 232 - .byte 0x91, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 - -FourIsland:: @ 83507BC - .4byte FourIsland_Layout @ 0x8323580 - .4byte gMapEvents_FourIsland @ 0x83B646C - .4byte gMapScripts_FourIsland @ 0x8167CAE - .4byte NULL - .2byte BGM_FRLG_ISLAND_FOUR - .2byte 233 - .byte 0x92, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 - -FiveIsland:: @ 83507D8 - .4byte FiveIsland_Layout @ 0x8323964 - .4byte gMapEvents_FiveIsland @ 0x83B64F4 - .4byte gMapScripts_FiveIsland @ 0x8167E8E - .4byte gMapConnections_FiveIsland @ 0x83529A0 - .2byte BGM_FRLG_ISLAND_FOUR - .2byte 234 - .byte 0x93, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 - -SevenIsland:: @ 83507F4 - .4byte SevenIsland_Layout @ 0x8323D48 - .4byte gMapEvents_SevenIsland @ 0x83B657C - .4byte gMapScripts_SevenIsland @ 0x8167EB3 - .4byte gMapConnections_SevenIsland @ 0x83529C0 - .2byte BGM_FRLG_ISLAND_SIX - .2byte 235 - .byte 0x94, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 - -SixIsland:: @ 8350810 - .4byte SixIsland_Layout @ 0x832430C - .4byte gMapEvents_SixIsland @ 0x83B65F8 - .4byte gMapScripts_SixIsland @ 0x8167ED8 - .4byte gMapConnections_SixIsland @ 0x83529D4 - .2byte BGM_FRLG_ISLAND_SIX - .2byte 236 - .byte 0x95, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 - -Route1:: @ 835082C - .4byte Route1_Layout @ 0x82E55CC - .4byte gMapEvents_Route1 @ 0x83B6648 - .4byte gMapScripts_Route1 @ 0x8167EFD - .4byte gMapConnections_Route1 @ 0x83529F4 - .2byte BGM_FRLG_ROUTE_1 - .2byte 89 - .byte 0x65, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 - -Route2:: @ 8350848 - .4byte Route2_Layout @ 0x82E64F0 - .4byte gMapEvents_Route2 @ 0x83B676C - .4byte gMapScripts_Route2 @ 0x8167F64 - .4byte gMapConnections_Route2 @ 0x8352A14 - .2byte BGM_FRLG_ROUTE_1 - .2byte 90 - .byte 0x66, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 - -Route3:: @ 8350864 - .4byte Route3_Layout @ 0x82E7234 - .4byte gMapEvents_Route3 @ 0x83B6870 - .4byte gMapScripts_Route3 @ 0x8167F77 - .4byte gMapConnections_Route3 @ 0x8352A34 - .2byte BGM_FRLG_ROUTE_3 - .2byte 91 - .byte 0x67, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 - -Route4:: @ 8350880 - .4byte Route4_Layout @ 0x82E8338 - .4byte gMapEvents_Route4 @ 0x83B6980 - .4byte gMapScripts_Route4 @ 0x8167F8A - .4byte gMapConnections_Route4 @ 0x8352A54 - .2byte BGM_FRLG_ROUTE_3 - .2byte 92 - .byte 0x68, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 - -Route5:: @ 835089C - .4byte Route5_Layout @ 0x82E925C - .4byte gMapEvents_Route5 @ 0x83B69C0 - .4byte gMapScripts_Route5 @ 0x8167FA7 - .4byte gMapConnections_Route5 @ 0x8352A74 - .2byte BGM_FRLG_ROUTE_3 - .2byte 93 - .byte 0x69, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 - -Route6:: @ 83508B8 - .4byte Route6_Layout @ 0x82E9A00 - .4byte gMapEvents_Route6 @ 0x83B6AA0 - .4byte gMapScripts_Route6 @ 0x8167FB1 - .4byte gMapConnections_Route6 @ 0x8352A94 - .2byte BGM_FRLG_ROUTE_3 - .2byte 94 - .byte 0x6a, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 - -Route7:: @ 83508D4 - .4byte Route7_Layout @ 0x82E9DE4 - .4byte gMapEvents_Route7 @ 0x83B6AF4 - .4byte gMapScripts_Route7 @ 0x8167FBB - .4byte gMapConnections_Route7 @ 0x8352AB4 - .2byte BGM_FRLG_ROUTE_3 - .2byte 95 - .byte 0x6b, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 - -Route8:: @ 83508F0 - .4byte Route8_Layout @ 0x82EA948 - .4byte gMapEvents_Route8 @ 0x83B6CB0 - .4byte gMapScripts_Route8 @ 0x8167FC5 - .4byte gMapConnections_Route8 @ 0x8352AD4 - .2byte BGM_FRLG_ROUTE_3 - .2byte 96 - .byte 0x6c, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 - -Route9:: @ 835090C - .4byte Route9_Layout @ 0x82EB4AC - .4byte gMapEvents_Route9 @ 0x83B6E14 - .4byte gMapScripts_Route9 @ 0x8167FCF - .4byte gMapConnections_Route9 @ 0x8352AF4 - .2byte BGM_FRLG_ROUTE_3 - .2byte 97 - .byte 0x6d, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 - -Route10:: @ 8350928 - .4byte Route10_Layout @ 0x82EC3D0 - .4byte gMapEvents_Route10 @ 0x83B6FA0 - .4byte gMapScripts_Route10 @ 0x8167FD9 - .4byte gMapConnections_Route10 @ 0x8352B14 - .2byte BGM_FRLG_ROUTE_3 - .2byte 98 - .byte 0x6e, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 - -Route11:: @ 8350944 - .4byte Route11_Layout @ 0x82ECF34 - .4byte gMapEvents_Route11 @ 0x83B711C - .4byte gMapScripts_Route11 @ 0x8167FF6 - .4byte gMapConnections_Route11 @ 0x8352B34 - .2byte BGM_FRLG_ROUTE_11 - .2byte 99 - .byte 0x6f, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 - -Route12:: @ 8350960 - .4byte Route12_Layout @ 0x82EE5D8 - .4byte gMapEvents_Route12 @ 0x83B72DC - .4byte gMapScripts_Route12 @ 0x8168000 - .4byte gMapConnections_Route12 @ 0x8352B60 - .2byte BGM_FRLG_ROUTE_11 - .2byte 100 - .byte 0x70, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 - -Route13:: @ 835097C - .4byte Route13_Layout @ 0x82EF13C - .4byte gMapEvents_Route13 @ 0x83B7428 - .4byte gMapScripts_Route13 @ 0x81680B5 - .4byte gMapConnections_Route13 @ 0x8352B80 - .2byte BGM_FRLG_ROUTE_11 - .2byte 101 - .byte 0x71, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 - -Route14:: @ 8350998 - .4byte Route14_Layout @ 0x82EFCA0 - .4byte gMapEvents_Route14 @ 0x83B75C8 - .4byte gMapScripts_Route14 @ 0x81680D1 - .4byte gMapConnections_Route14 @ 0x8352BA0 - .2byte BGM_FRLG_ROUTE_11 - .2byte 102 - .byte 0x72, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 - -Route15:: @ 83509B4 - .4byte Route15_Layout @ 0x82F0804 - .4byte gMapEvents_Route15 @ 0x83B7748 - .4byte gMapScripts_Route15 @ 0x81680DB - .4byte gMapConnections_Route15 @ 0x8352BC0 - .2byte BGM_FRLG_ROUTE_11 - .2byte 103 - .byte 0x73, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 - -Route16:: @ 83509D0 - .4byte Route16_Layout @ 0x82F0FA8 - .4byte gMapEvents_Route16 @ 0x83B7898 - .4byte gMapScripts_Route16 @ 0x81680E5 - .4byte gMapConnections_Route16 @ 0x8352BE0 - .2byte BGM_FRLG_ROUTE_3 - .2byte 104 - .byte 0x74, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 - -Route17:: @ 83509EC - .4byte Route17_Layout @ 0x82F2DCC - .4byte gMapEvents_Route17 @ 0x83B7A20 - .4byte gMapScripts_Route17 @ 0x81681BF - .4byte gMapConnections_Route17 @ 0x8352C00 - .2byte BGM_FRLG_ROUTE_3 - .2byte 105 - .byte 0x75, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 - -Route18:: @ 8350A08 - .4byte Route18_Layout @ 0x82F3750 - .4byte gMapEvents_Route18 @ 0x83B7AA4 - .4byte gMapScripts_Route18 @ 0x81681F6 - .4byte gMapConnections_Route18 @ 0x8352C20 - .2byte BGM_FRLG_ROUTE_3 - .2byte 106 - .byte 0x76, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 - -Route19:: @ 8350A24 - .4byte Route19_Layout @ 0x82F42B4 - .4byte gMapEvents_Route19 @ 0x83B7BE4 - .4byte gMapScripts_Route19 @ 0x8168231 - .4byte gMapConnections_Route19 @ 0x8352C40 - .2byte BGM_FRLG_ROUTE_3 - .2byte 107 - .byte 0x77, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 - -Route20:: @ 8350A40 - .4byte Route20_Layout @ 0x82F5598 - .4byte gMapEvents_Route20 @ 0x83B7D34 - .4byte gMapScripts_Route20 @ 0x816823B - .4byte gMapConnections_Route20 @ 0x8352C60 - .2byte BGM_FRLG_ROUTE_3 - .2byte 108 - .byte 0x78, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 - -Route21_North:: @ 8350A5C - .4byte Route21_North_Layout @ 0x82F5F1C - .4byte gMapEvents_Route21_North @ 0x83B7DE4 - .4byte gMapScripts_Route21_North @ 0x8168289 - .4byte gMapConnections_Route21_North @ 0x8352C80 - .2byte BGM_FRLG_ROUTE_3 - .2byte 109 - .byte 0x79, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 - -Route21_South:: @ 8350A78 - .4byte Route21_South_Layout @ 0x83206C0 - .4byte gMapEvents_Route21_South @ 0x83B7E70 - .4byte gMapScripts_Route21_South @ 0x816828A - .4byte gMapConnections_Route21_South @ 0x8352CA0 - .2byte BGM_FRLG_ROUTE_3 - .2byte 219 - .byte 0x79, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 - -Route22:: @ 8350A94 - .4byte Route22_Layout @ 0x82F6840 - .4byte gMapEvents_Route22 @ 0x83B7F18 - .4byte gMapScripts_Route22 @ 0x816828B - .4byte gMapConnections_Route22 @ 0x8352CC0 - .2byte BGM_FRLG_ROUTE_3 - .2byte 110 - .byte 0x7a, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 - -Route23:: @ 8350AB0 - .4byte Route23_Layout @ 0x82F8664 - .4byte gMapEvents_Route23 @ 0x83B8300 - .4byte gMapScripts_Route23 @ 0x81684EB - .4byte gMapConnections_Route23 @ 0x8352CE0 - .2byte BGM_FRLG_INDIGO_PLATEAU - .2byte 111 - .byte 0x7b, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 - -Route24:: @ 8350ACC - .4byte Route24_Layout @ 0x82F8E08 - .4byte gMapEvents_Route24 @ 0x83B8400 - .4byte gMapScripts_Route24 @ 0x816861F - .4byte gMapConnections_Route24 @ 0x8352D00 - .2byte BGM_FRLG_ROUTE_24 - .2byte 112 - .byte 0x7c, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 - -Route25:: @ 8350AE8 - .4byte Route25_Layout @ 0x82F996C - .4byte gMapEvents_Route25 @ 0x83B8590 - .4byte gMapScripts_Route25 @ 0x8168745 - .4byte gMapConnections_Route25 @ 0x8352D14 - .2byte BGM_FRLG_ROUTE_24 - .2byte 113 - .byte 0x7d, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 - -OneIsland_KindleRoad:: @ 8350B04 - .4byte OneIsland_KindleRoad_Layout @ 0x8325D70 - .4byte gMapEvents_OneIsland_KindleRoad @ 0x83B888C - .4byte gMapScripts_OneIsland_KindleRoad @ 0x8168758 - .4byte gMapConnections_OneIsland_KindleRoad @ 0x8352D28 - .2byte BGM_FRLG_ROUTE_3 - .2byte 237 - .byte 0x96, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 - -OneIsland_TreasureBeach:: @ 8350B20 - .4byte OneIsland_TreasureBeach_Layout @ 0x8326514 - .4byte gMapEvents_OneIsland_TreasureBeach @ 0x83B8930 - .4byte gMapScripts_OneIsland_TreasureBeach @ 0x816876B - .4byte gMapConnections_OneIsland_TreasureBeach @ 0x8352D3C - .2byte BGM_FRLG_ROUTE_3 - .2byte 238 - .byte 0x97, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 - -TwoIsland_CapeBrink:: @ 8350B3C - .4byte TwoIsland_CapeBrink_Layout @ 0x8326CB8 - .4byte gMapEvents_TwoIsland_CapeBrink @ 0x83B8964 - .4byte gMapScripts_TwoIsland_CapeBrink @ 0x8168775 - .4byte gMapConnections_TwoIsland_CapeBrink @ 0x8352D50 - .2byte BGM_FRLG_ROUTE_3 - .2byte 239 - .byte 0x98, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 - -ThreeIsland_BondBridge:: @ 8350B58 - .4byte ThreeIsland_BondBridge_Layout @ 0x8327BDC - .4byte gMapEvents_ThreeIsland_BondBridge @ 0x83B8A9C - .4byte gMapScripts_ThreeIsland_BondBridge @ 0x8168776 - .4byte gMapConnections_ThreeIsland_BondBridge @ 0x8352D64 - .2byte BGM_FRLG_ROUTE_3 - .2byte 240 - .byte 0x99, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 - -ThreeIsland_Port:: @ 8350B74 - .4byte ThreeIsland_Port_Layout @ 0x8328380 - .4byte gMapEvents_ThreeIsland_Port @ 0x83B8B10 - .4byte gMapScripts_ThreeIsland_Port @ 0x8168789 - .4byte gMapConnections_ThreeIsland_Port @ 0x8352D78 - .2byte BGM_FRLG_ROUTE_3 - .2byte 241 - .byte 0x9a, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 - -UnknownMap_03_50:: @ 8350B90 - .4byte UnknownMap_03_50_Layout @ 0x83283A8 - .4byte gMapEvents_UnknownMap_03_50 @ 0x83B8B24 - .4byte gMapScripts_UnknownMap_03_50 @ 0x81687E0 - .4byte gMapConnections_UnknownMap_03_50 @ 0x8352D8C - .2byte BGM_FRLG_SEVII_ISLANDS - .2byte 242 - .byte 0x9b, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 - -UnknownMap_03_51:: @ 8350BAC - .4byte UnknownMap_03_51_Layout @ 0x83283D0 - .4byte gMapEvents_UnknownMap_03_51 @ 0x83B8B38 - .4byte gMapScripts_UnknownMap_03_51 @ 0x81687E1 - .4byte gMapConnections_UnknownMap_03_51 @ 0x8352DA0 - .2byte BGM_FRLG_SEVII_ISLANDS - .2byte 243 - .byte 0x9c, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 - -UnknownMap_03_52:: @ 8350BC8 - .4byte UnknownMap_03_52_Layout @ 0x8329114 - .4byte gMapEvents_UnknownMap_03_52 @ 0x83B8B4C - .4byte gMapScripts_UnknownMap_03_52 @ 0x81687E2 - .4byte NULL - .2byte BGM_FRLG_SEVII_ISLANDS - .2byte 244 - .byte 0x9d, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 - -UnknownMap_03_53:: @ 8350BE4 - .4byte UnknownMap_03_53_Layout @ 0x8329C78 - .4byte gMapEvents_UnknownMap_03_53 @ 0x83B8B60 - .4byte gMapScripts_UnknownMap_03_53 @ 0x81687E3 - .4byte NULL - .2byte BGM_FRLG_SEVII_ISLANDS - .2byte 245 - .byte 0x9e, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 - -FiveIsland_ResortGorgeous:: @ 8350C00 - .4byte FiveIsland_ResortGorgeous_Layout @ 0x832A7DC - .4byte gMapEvents_FiveIsland_ResortGorgeous @ 0x83B8C80 - .4byte gMapScripts_FiveIsland_ResortGorgeous @ 0x81687E4 - .4byte gMapConnections_FiveIsland_ResortGorgeous @ 0x8352DB4 - .2byte BGM_FRLG_SEVII_ISLANDS - .2byte 246 - .byte 0x9f, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 - -FiveIsland_WaterLabyrinth:: @ 8350C1C - .4byte FiveIsland_WaterLabyrinth_Layout @ 0x832B340 - .4byte gMapEvents_FiveIsland_WaterLabyrinth @ 0x83B8CC4 - .4byte gMapScripts_FiveIsland_WaterLabyrinth @ 0x816884D - .4byte gMapConnections_FiveIsland_WaterLabyrinth @ 0x8352DD4 - .2byte BGM_FRLG_SEVII_ISLANDS - .2byte 247 - .byte 0xa0, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 - -FiveIsland_Meadow:: @ 8350C38 - .4byte FiveIsland_Meadow_Layout @ 0x832BAE4 - .4byte gMapEvents_FiveIsland_Meadow @ 0x83B8D94 - .4byte gMapScripts_FiveIsland_Meadow @ 0x8168932 - .4byte gMapConnections_FiveIsland_Meadow @ 0x8352DF4 - .2byte BGM_FRLG_SEVII_ISLANDS - .2byte 248 - .byte 0xa1, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 - -FiveIsland_MemorialPillar:: @ 8350C54 - .4byte FiveIsland_MemorialPillar_Layout @ 0x832C648 - .4byte gMapEvents_FiveIsland_MemorialPillar @ 0x83B8E5C - .4byte gMapScripts_FiveIsland_MemorialPillar @ 0x81689D2 - .4byte gMapConnections_FiveIsland_MemorialPillar @ 0x8352E08 - .2byte BGM_FRLG_SEVII_ISLANDS - .2byte 249 - .byte 0xa2, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 - -SixIsland_OutcastIsland:: @ 8350C70 - .4byte SixIsland_OutcastIsland_Layout @ 0x832D56C - .4byte gMapEvents_SixIsland_OutcastIsland @ 0x83B8F38 - .4byte gMapScripts_SixIsland_OutcastIsland @ 0x8168B15 - .4byte gMapConnections_SixIsland_OutcastIsland @ 0x8352E1C - .2byte BGM_FRLG_SEVII_ISLANDS - .2byte 250 - .byte 0xa3, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 - -SixIsland_GreenPath:: @ 8350C8C - .4byte SixIsland_GreenPath_Layout @ 0x832E0D0 - .4byte gMapEvents_SixIsland_GreenPath @ 0x83B8FA8 - .4byte gMapScripts_SixIsland_GreenPath @ 0x8168B2D - .4byte gMapConnections_SixIsland_GreenPath @ 0x8352E3C - .2byte BGM_FRLG_SEVII_ISLANDS - .2byte 251 - .byte 0xa4, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 - -SixIsland_WaterPath:: @ 8350CA8 - .4byte SixIsland_WaterPath_Layout @ 0x832F3B4 - .4byte gMapEvents_SixIsland_WaterPath @ 0x83B90E0 - .4byte gMapScripts_SixIsland_WaterPath @ 0x8168B40 - .4byte gMapConnections_SixIsland_WaterPath @ 0x8352E68 - .2byte BGM_FRLG_SEVII_ISLANDS - .2byte 252 - .byte 0xa5, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 - -SixIsland_RuinValley:: @ 8350CC4 - .4byte SixIsland_RuinValley_Layout @ 0x83302D8 - .4byte gMapEvents_SixIsland_RuinValley @ 0x83B92A0 - .4byte gMapScripts_SixIsland_RuinValley @ 0x8168B53 - .4byte gMapConnections_SixIsland_RuinValley @ 0x8352E7C - .2byte BGM_FRLG_SEVII_ISLANDS - .2byte 253 - .byte 0xa6, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 - -SevenIsland_TrainerTower:: @ 8350CE0 - .4byte SevenIsland_TrainerTower_Layout @ 0x833287C - .4byte gMapEvents_SevenIsland_TrainerTower @ 0x83B9328 - .4byte gMapScripts_SevenIsland_TrainerTower @ 0x8168BD5 - .4byte gMapConnections_SevenIsland_TrainerTower @ 0x8352E90 - .2byte BGM_FRLG_SEVII_ISLANDS - .2byte 254 - .byte 0xa7, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 - -SevenIsland_SevaultCanyon_Entrance:: @ 8350CFC - .4byte SevenIsland_SevaultCanyon_Entrance_Layout @ 0x8333020 - .4byte gMapEvents_SevenIsland_SevaultCanyon_Entrance @ 0x83B93FC - .4byte gMapScripts_SevenIsland_SevaultCanyon_Entrance @ 0x8168BF3 - .4byte gMapConnections_SevenIsland_SevaultCanyon_Entrance @ 0x8352EB0 - .2byte BGM_FRLG_SEVII_ISLANDS - .2byte 255 - .byte 0xa8, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 - -SevenIsland_SevaultCanyon:: @ 8350D18 - .4byte SevenIsland_SevaultCanyon_Layout @ 0x8333F44 - .4byte gMapEvents_SevenIsland_SevaultCanyon @ 0x83B9618 - .4byte gMapScripts_SevenIsland_SevaultCanyon @ 0x8168BFD - .4byte gMapConnections_SevenIsland_SevaultCanyon @ 0x8352ED0 - .2byte BGM_FRLG_SEVII_ISLANDS - .2byte 256 - .byte 0xa9, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 - -SevenIsland_TanobyRuins:: @ 8350D34 - .4byte SevenIsland_TanobyRuins_Layout @ 0x83355E8 - .4byte gMapEvents_SevenIsland_TanobyRuins @ 0x83B96F4 - .4byte gMapScripts_SevenIsland_TanobyRuins @ 0x8168C07 - .4byte gMapConnections_SevenIsland_TanobyRuins @ 0x8352EE4 - .2byte BGM_FRLG_SEVII_ISLANDS - .2byte 257 - .byte 0xaa, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 - -PalletTown_PlayersHouse_1F:: @ 8350D50 - .4byte PalletTown_PlayersHouse_1F_Layout @ 0x82D5200 - .4byte gMapEvents_PalletTown_PlayersHouse_1F @ 0x83B974C - .4byte gMapScripts_PalletTown_PlayersHouse_1F @ 0x8168C08 - .4byte NULL - .2byte BGM_FRLG_PALLET_TOWN - .2byte 1 - .byte 0x58, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -PalletTown_PlayersHouse_2F:: @ 8350D6C - .4byte PalletTown_PlayersHouse_2F_Layout @ 0x82D52FC - .4byte gMapEvents_PalletTown_PlayersHouse_2F @ 0x83B978C - .4byte gMapScripts_PalletTown_PlayersHouse_2F @ 0x8168CA3 - .4byte NULL - .2byte BGM_FRLG_PALLET_TOWN - .2byte 2 - .byte 0x58, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -PalletTown_GarysHouse:: @ 8350D88 - .4byte PalletTown_GarysHouse_Layout @ 0x82D5424 - .4byte gMapEvents_PalletTown_GarysHouse @ 0x83B980C - .4byte gMapScripts_PalletTown_GarysHouse @ 0x8168D27 - .4byte NULL - .2byte BGM_FRLG_PALLET_TOWN - .2byte 3 - .byte 0x58, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -PalletTown_ProfessorOaksLab:: @ 8350DA4 - .4byte PalletTown_ProfessorOaksLab_Layout @ 0x82D5668 - .4byte gMapEvents_PalletTown_ProfessorOaksLab @ 0x83B99B8 - .4byte gMapScripts_PalletTown_ProfessorOaksLab @ 0x8168F7E - .4byte NULL - .2byte BGM_FRLG_OAK_LAB - .2byte 5 - .byte 0x58, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -ViridianCity_House1:: @ 8350DC0 - .4byte ViridianCity_House1_Layout @ 0x833AEAC - .4byte gMapEvents_ViridianCity_House1 @ 0x83B9A38 - .4byte gMapScripts_ViridianCity_House1 @ 0x8169E9A - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 276 - .byte 0x59, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -ViridianCity_Gym:: @ 8350DDC - .4byte ViridianCity_Gym_Layout @ 0x82D86AC - .4byte gMapEvents_ViridianCity_Gym @ 0x83B9B78 - .4byte gMapScripts_ViridianCity_Gym @ 0x8169EC9 - .4byte NULL - .2byte BGM_FRLG_GYM - .2byte 37 - .byte 0x59, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01 - -ViridianCity_House2:: @ 8350DF8 - .4byte ViridianCity_House2_Layout @ 0x8338D20 - .4byte gMapEvents_ViridianCity_House2 @ 0x83B9C10 - .4byte gMapScripts_ViridianCity_House2 @ 0x816A07C - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 266 - .byte 0x59, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -ViridianCity_Mart:: @ 8350E14 - .4byte Mart_Layout @ 0x82D5BCC - .4byte gMapEvents_ViridianCity_Mart @ 0x83B9C84 - .4byte gMapScripts_ViridianCity_Mart @ 0x816A1D3 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 10 - .byte 0x59, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -ViridianCity_PokemonCenter_1F:: @ 8350E30 - .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte gMapEvents_ViridianCity_PokemonCenter_1F @ 0x83B9D18 - .4byte gMapScripts_ViridianCity_PokemonCenter_1F @ 0x816A2C0 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 8 - .byte 0x59, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -ViridianCity_PokemonCenter_2F:: @ 8350E4C - .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte gMapEvents_ViridianCity_PokemonCenter_2F @ 0x83B9DA4 - .4byte gMapScripts_ViridianCity_PokemonCenter_2F @ 0x816A2F3 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 9 - .byte 0x59, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -PewterCity_Museum_1F:: @ 8350E68 - .4byte PewterCity_Museum_1F_Layout @ 0x831A1FC - .4byte gMapEvents_PewterCity_Museum_1F @ 0x83B9ED8 - .4byte gMapScripts_PewterCity_Museum_1F @ 0x816A31A - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 180 - .byte 0x5a, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -PewterCity_Museum_2F:: @ 8350E84 - .4byte PewterCity_Museum_2F_Layout @ 0x831A39C - .4byte gMapEvents_PewterCity_Museum_2F @ 0x83B9FCC - .4byte gMapScripts_PewterCity_Museum_2F @ 0x816A552 - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 181 - .byte 0x5a, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -PewterCity_Gym:: @ 8350EA0 - .4byte PewterCity_Gym_Layout @ 0x82D732C - .4byte gMapEvents_PewterCity_Gym @ 0x83BA058 - .4byte gMapScripts_PewterCity_Gym @ 0x816A592 - .4byte NULL - .2byte BGM_FRLG_GYM - .2byte 28 - .byte 0x5a, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01 - -PewterCity_Mart:: @ 8350EBC - .4byte Mart_Layout @ 0x82D5BCC - .4byte gMapEvents_PewterCity_Mart @ 0x83BA0CC - .4byte gMapScripts_PewterCity_Mart @ 0x816A6CD - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 10 - .byte 0x5a, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -PewterCity_House1:: @ 8350ED8 - .4byte House2_Layout @ 0x82D5840 - .4byte gMapEvents_PewterCity_House1 @ 0x83BA140 - .4byte gMapScripts_PewterCity_House1 @ 0x816A71C - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 7 - .byte 0x5a, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -PewterCity_PokemonCenter_1F:: @ 8350EF4 - .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte gMapEvents_PewterCity_PokemonCenter_1F @ 0x83BA21C - .4byte gMapScripts_PewterCity_PokemonCenter_1F @ 0x816A760 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 8 - .byte 0x5a, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -PewterCity_PokemonCenter_2F:: @ 8350F10 - .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte gMapEvents_PewterCity_PokemonCenter_2F @ 0x83BA2A8 - .4byte gMapScripts_PewterCity_PokemonCenter_2F @ 0x816A7B5 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 9 - .byte 0x5a, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -PewterCity_House2:: @ 8350F2C - .4byte House2_Layout @ 0x82D5840 - .4byte gMapEvents_PewterCity_House2 @ 0x83BA304 - .4byte gMapScripts_PewterCity_House2 @ 0x816A7DC - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 7 - .byte 0x5a, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -CeruleanCity_House1:: @ 8350F48 - .4byte CeruleanCity_House1_Layout @ 0x831A560 - .4byte gMapEvents_CeruleanCity_House1 @ 0x83BA350 - .4byte gMapScripts_CeruleanCity_House1 @ 0x816A7EF - .4byte NULL - .2byte BGM_FRLG_CERULEAN_CITY - .2byte 183 - .byte 0x5b, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -CeruleanCity_House2:: @ 8350F64 - .4byte CeruleanCity_House2_Layout @ 0x831A474 - .4byte gMapEvents_CeruleanCity_House2 @ 0x83BA3C0 - .4byte gMapScripts_CeruleanCity_House2 @ 0x816A975 - .4byte NULL - .2byte BGM_FRLG_CERULEAN_CITY - .2byte 182 - .byte 0x5b, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -CeruleanCity_House3:: @ 8350F80 - .4byte House1_Layout @ 0x82D5754 - .4byte gMapEvents_CeruleanCity_House3 @ 0x83BA41C - .4byte gMapScripts_CeruleanCity_House3 @ 0x816A9A7 - .4byte NULL - .2byte BGM_FRLG_CERULEAN_CITY - .2byte 6 - .byte 0x5b, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -CeruleanCity_PokemonCenter_1F:: @ 8350F9C - .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte gMapEvents_CeruleanCity_PokemonCenter_1F @ 0x83BA4F8 - .4byte gMapScripts_CeruleanCity_PokemonCenter_1F @ 0x816AA2D - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 8 - .byte 0x5b, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -CeruleanCity_PokemonCenter_2F:: @ 8350FB8 - .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte gMapEvents_CeruleanCity_PokemonCenter_2F @ 0x83BA584 - .4byte gMapScripts_CeruleanCity_PokemonCenter_2F @ 0x816AA79 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 9 - .byte 0x5b, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -CeruleanCity_Gym:: @ 8350FD4 - .4byte CeruleanCity_Gym_Layout @ 0x82D5F84 - .4byte gMapEvents_CeruleanCity_Gym @ 0x83BA628 - .4byte gMapScripts_CeruleanCity_Gym @ 0x816AAA0 - .4byte NULL - .2byte BGM_FRLG_GYM - .2byte 12 - .byte 0x5b, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01 - -CeruleanCity_BikeShop:: @ 8350FF0 - .4byte CeruleanCity_BikeShop_Layout @ 0x82D6F28 - .4byte gMapEvents_CeruleanCity_BikeShop @ 0x83BA6FC - .4byte gMapScripts_CeruleanCity_BikeShop @ 0x816ABBC - .4byte NULL - .2byte BGM_FRLG_CERULEAN_CITY - .2byte 26 - .byte 0x5b, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -CeruleanCity_Mart:: @ 835100C - .4byte Mart_Layout @ 0x82D5BCC - .4byte gMapEvents_CeruleanCity_Mart @ 0x83BA770 - .4byte gMapScripts_CeruleanCity_Mart @ 0x816AC9D - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 10 - .byte 0x5b, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -CeruleanCity_House4:: @ 8351028 - .4byte House1_Layout @ 0x82D5754 - .4byte gMapEvents_CeruleanCity_House4 @ 0x83BA7A4 - .4byte gMapScripts_CeruleanCity_House4 @ 0x816ACEE - .4byte NULL - .2byte BGM_FRLG_CERULEAN_CITY - .2byte 6 - .byte 0x5b, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -CeruleanCity_House5:: @ 8351044 - .4byte CeruleanCity_House5_Layout @ 0x8343540 - .4byte gMapEvents_CeruleanCity_House5 @ 0x83BA7E4 - .4byte gMapScripts_CeruleanCity_House5 @ 0x816AE4F - .4byte NULL - .2byte BGM_FRLG_CERULEAN_CITY - .2byte 308 - .byte 0x5b, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -LavenderTown_PokemonCenter_1F:: @ 8351060 - .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte gMapEvents_LavenderTown_PokemonCenter_1F @ 0x83BA890 - .4byte gMapScripts_LavenderTown_PokemonCenter_1F @ 0x816B0EF - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 8 - .byte 0x5c, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -LavenderTown_PokemonCenter_2F:: @ 835107C - .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte gMapEvents_LavenderTown_PokemonCenter_2F @ 0x83BA91C - .4byte gMapScripts_LavenderTown_PokemonCenter_2F @ 0x816B122 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 9 - .byte 0x5c, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -LavenderTown_VolunteerPokemonHouse:: @ 8351098 - .4byte LavenderTown_VolunteerPokemonHouse_Layout @ 0x833ACC4 - .4byte gMapEvents_LavenderTown_VolunteerPokemonHouse @ 0x83BA9FC - .4byte gMapScripts_LavenderTown_VolunteerPokemonHouse @ 0x816B149 - .4byte NULL - .2byte BGM_FRLG_LAVENDER_TOWN - .2byte 274 - .byte 0x5c, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -LavenderTown_House1:: @ 83510B4 - .4byte House5_Layout @ 0x82D6AF0 - .4byte gMapEvents_LavenderTown_House1 @ 0x83BAA58 - .4byte gMapScripts_LavenderTown_House1 @ 0x816B232 - .4byte NULL - .2byte BGM_FRLG_LAVENDER_TOWN - .2byte 21 - .byte 0x5c, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -LavenderTown_House2:: @ 83510D0 - .4byte House5_Layout @ 0x82D6AF0 - .4byte gMapEvents_LavenderTown_House2 @ 0x83BAA9C - .4byte gMapScripts_LavenderTown_House2 @ 0x816B265 - .4byte NULL - .2byte BGM_FRLG_CERULEAN_CITY - .2byte 21 - .byte 0x5c, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -LavenderTown_Mart:: @ 83510EC - .4byte Mart_Layout @ 0x82D5BCC - .4byte gMapEvents_LavenderTown_Mart @ 0x83BAB28 - .4byte gMapScripts_LavenderTown_Mart @ 0x816B34F - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 10 - .byte 0x5c, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -VermilionCity_House1:: @ 8351108 - .4byte House1_Layout @ 0x82D5754 - .4byte gMapEvents_VermilionCity_House1 @ 0x83BAB6C - .4byte gMapScripts_VermilionCity_House1 @ 0x816B3A6 - .4byte NULL - .2byte BGM_FRLG_CERULEAN_CITY - .2byte 6 - .byte 0x5d, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -VermilionCity_PokemonCenter_1F:: @ 8351124 - .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte gMapEvents_VermilionCity_PokemonCenter_1F @ 0x83BAC48 - .4byte gMapScripts_VermilionCity_PokemonCenter_1F @ 0x816B424 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 8 - .byte 0x5d, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -VermilionCity_PokemonCenter_2F:: @ 8351140 - .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte gMapEvents_VermilionCity_PokemonCenter_2F @ 0x83BACD4 - .4byte gMapScripts_VermilionCity_PokemonCenter_2F @ 0x816B457 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 9 - .byte 0x5d, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -VermilionCity_PokemonFanClub:: @ 835115C - .4byte VermilionCity_PokemonFanClub_Layout @ 0x833ABC8 - .4byte gMapEvents_VermilionCity_PokemonFanClub @ 0x83BADA8 - .4byte gMapScripts_VermilionCity_PokemonFanClub @ 0x816B47E - .4byte NULL - .2byte BGM_FRLG_VERMILION_CITY - .2byte 273 - .byte 0x5d, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -VermilionCity_House2:: @ 8351178 - .4byte House1_Layout @ 0x82D5754 - .4byte gMapEvents_VermilionCity_House2 @ 0x83BADEC - .4byte gMapScripts_VermilionCity_House2 @ 0x816B5D6 - .4byte NULL - .2byte BGM_FRLG_VERMILION_CITY - .2byte 6 - .byte 0x5d, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -VermilionCity_Mart:: @ 8351194 - .4byte Mart_Layout @ 0x82D5BCC - .4byte gMapEvents_VermilionCity_Mart @ 0x83BAE60 - .4byte gMapScripts_VermilionCity_Mart @ 0x816B653 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 10 - .byte 0x5d, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -VermilionCity_Gym:: @ 83511B0 - .4byte VermilionCity_Gym_Layout @ 0x82D6E28 - .4byte gMapEvents_VermilionCity_Gym @ 0x83BAFD0 - .4byte gMapScripts_VermilionCity_Gym @ 0x816B69E - .4byte NULL - .2byte BGM_FRLG_GYM - .2byte 25 - .byte 0x5d, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01 - -VermilionCity_House3:: @ 83511CC - .4byte House1_Layout @ 0x82D5754 - .4byte gMapEvents_VermilionCity_House3 @ 0x83BB068 - .4byte gMapScripts_VermilionCity_House3 @ 0x816BAA9 - .4byte NULL - .2byte BGM_FRLG_VERMILION_CITY - .2byte 6 - .byte 0x5d, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -CeladonCity_DepartmentStore_1F:: @ 83511E8 - .4byte CeladonCity_DepartmentStore_1F_Layout @ 0x831B5FC - .4byte gMapEvents_CeladonCity_DepartmentStore_1F @ 0x83BB0EC - .4byte gMapScripts_CeladonCity_DepartmentStore_1F @ 0x816BAD8 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 192 - .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x04, 0x01, 0x00 - -CeladonCity_DepartmentStore_2F:: @ 8351204 - .4byte CeladonCity_DepartmentStore_2F_Layout @ 0x831B7A8 - .4byte gMapEvents_CeladonCity_DepartmentStore_2F @ 0x83BB184 - .4byte gMapScripts_CeladonCity_DepartmentStore_2F @ 0x816BAF4 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 193 - .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x04, 0x02, 0x00 - -CeladonCity_DepartmentStore_3F:: @ 8351220 - .4byte CeladonCity_DepartmentStore_3F_Layout @ 0x831B954 - .4byte gMapEvents_CeladonCity_DepartmentStore_3F @ 0x83BB2AC - .4byte gMapScripts_CeladonCity_DepartmentStore_3F @ 0x816BB84 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 194 - .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x04, 0x03, 0x00 - -CeladonCity_DepartmentStore_4F:: @ 835123C - .4byte CeladonCity_DepartmentStore_4F_Layout @ 0x831BB00 - .4byte gMapEvents_CeladonCity_DepartmentStore_4F @ 0x83BB32C - .4byte gMapScripts_CeladonCity_DepartmentStore_4F @ 0x816BBEE - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 195 - .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x04, 0x04, 0x00 - -CeladonCity_DepartmentStore_5F:: @ 8351258 - .4byte CeladonCity_DepartmentStore_5F_Layout @ 0x831BCAC - .4byte gMapEvents_CeladonCity_DepartmentStore_5F @ 0x83BB3C4 - .4byte gMapScripts_CeladonCity_DepartmentStore_5F @ 0x816BC40 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 196 - .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x04, 0x05, 0x00 - -CeladonCity_DepartmentStore_Roof:: @ 8351274 - .4byte CeladonCity_DepartmentStore_Roof_Layout @ 0x831BEE4 - .4byte gMapEvents_CeladonCity_DepartmentStore_Roof @ 0x83BB440 - .4byte gMapScripts_CeladonCity_DepartmentStore_Roof @ 0x816BCCC - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 197 - .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x04, 0x7f, 0x00 - -CeladonCity_DepartmentStore_Elevator:: @ 8351290 - .4byte CeladonCity_DepartmentStore_Elevator_Layout @ 0x8319F70 - .4byte gMapEvents_CeladonCity_DepartmentStore_Elevator @ 0x83BB47C - .4byte gMapScripts_CeladonCity_DepartmentStore_Elevator @ 0x816C152 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 179 - .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -CeladonCity_Condominiums_1F:: @ 83512AC - .4byte CeladonCity_Condominiums_1F_Layout @ 0x831A7DC - .4byte gMapEvents_CeladonCity_Condominiums_1F @ 0x83BB538 - .4byte gMapScripts_CeladonCity_Condominiums_1F @ 0x816C320 - .4byte NULL - .2byte BGM_FRLG_CELADON_CITY - .2byte 184 - .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -CeladonCity_Condominiums_2F:: @ 83512C8 - .4byte CeladonCity_Condominiums_2F_Layout @ 0x831AA58 - .4byte gMapEvents_CeladonCity_Condominiums_2F @ 0x83BB5B4 - .4byte gMapScripts_CeladonCity_Condominiums_2F @ 0x816C3D0 - .4byte NULL - .2byte BGM_FRLG_CELADON_CITY - .2byte 185 - .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -CeladonCity_Condominiums_3F:: @ 83512E4 - .4byte CeladonCity_Condominiums_3F_Layout @ 0x831ACD4 - .4byte gMapEvents_CeladonCity_Condominiums_3F @ 0x83BB6A8 - .4byte gMapScripts_CeladonCity_Condominiums_3F @ 0x816C3DA - .4byte NULL - .2byte BGM_FRLG_CELADON_CITY - .2byte 186 - .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -CeladonCity_Condominiums_Roof:: @ 8351300 - .4byte CeladonCity_Condominiums_Roof_Layout @ 0x831AF7C - .4byte gMapEvents_CeladonCity_Condominiums_Roof @ 0x83BB6EC - .4byte gMapScripts_CeladonCity_Condominiums_Roof @ 0x816C459 - .4byte NULL - .2byte BGM_FRLG_CELADON_CITY - .2byte 187 - .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -CeladonCity_Condominiums_RoofRoom:: @ 835131C - .4byte CeladonCity_Condominiums_RoofRoom_Layout @ 0x831B054 - .4byte gMapEvents_CeladonCity_Condominiums_RoofRoom @ 0x83BB76C - .4byte gMapScripts_CeladonCity_Condominiums_RoofRoom @ 0x816C463 - .4byte NULL - .2byte BGM_FRLG_CELADON_CITY - .2byte 188 - .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -CeladonCity_PokemonCenter_1F:: @ 8351338 - .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte gMapEvents_CeladonCity_PokemonCenter_1F @ 0x83BB800 - .4byte gMapScripts_CeladonCity_PokemonCenter_1F @ 0x816C5EC - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 8 - .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -CeladonCity_PokemonCenter_2F:: @ 8351354 - .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte gMapEvents_CeladonCity_PokemonCenter_2F @ 0x83BB88C - .4byte gMapScripts_CeladonCity_PokemonCenter_2F @ 0x816C61F - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 9 - .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -CeladonCity_GameCorner:: @ 8351370 - .4byte CeladonCity_GameCorner_Layout @ 0x82D7168 - .4byte gMapEvents_CeladonCity_GameCorner @ 0x83BBB78 - .4byte gMapScripts_CeladonCity_GameCorner @ 0x816C646 - .4byte NULL - .2byte BGM_FRLG_GAMECORNER - .2byte 27 - .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -CeladonCity_GameCorner_PrizeRoom:: @ 835138C - .4byte CeladonCity_GameCorner_PrizeRoom_Layout @ 0x831B12C - .4byte gMapEvents_CeladonCity_GameCorner_PrizeRoom @ 0x83BBC1C - .4byte gMapScripts_CeladonCity_GameCorner_PrizeRoom @ 0x816CB75 - .4byte NULL - .2byte BGM_FRLG_CELADON_CITY - .2byte 189 - .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -CeladonCity_Gym:: @ 83513A8 - .4byte CeladonCity_Gym_Layout @ 0x82D6370 - .4byte gMapEvents_CeladonCity_Gym @ 0x83BBD68 - .4byte gMapScripts_CeladonCity_Gym @ 0x816D060 - .4byte NULL - .2byte BGM_FRLG_GYM - .2byte 15 - .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01 - -CeladonCity_Restaurant:: @ 83513C4 - .4byte CeladonCity_Restaurant_Layout @ 0x831B29C - .4byte gMapEvents_CeladonCity_Restaurant @ 0x83BBE0C - .4byte gMapScripts_CeladonCity_Restaurant @ 0x816D1EA - .4byte NULL - .2byte BGM_FRLG_CELADON_CITY - .2byte 190 - .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -CeladonCity_House1:: @ 83513E0 - .4byte House5_Layout @ 0x82D6AF0 - .4byte gMapEvents_CeladonCity_House1 @ 0x83BBE80 - .4byte gMapScripts_CeladonCity_House1 @ 0x816D267 - .4byte NULL - .2byte BGM_FRLG_CELADON_CITY - .2byte 21 - .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -CeladonCity_Hotel:: @ 83513FC - .4byte CeladonCity_Hotel_Layout @ 0x831B438 - .4byte gMapEvents_CeladonCity_Hotel @ 0x83BBF0C - .4byte gMapScripts_CeladonCity_Hotel @ 0x816D283 - .4byte NULL - .2byte BGM_FRLG_CELADON_CITY - .2byte 191 - .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -FuchsiaCity_SafariZone_Entrance:: @ 8351418 - .4byte FuchsiaCity_SafariZone_Entrance_Layout @ 0x82D8E80 - .4byte gMapEvents_FuchsiaCity_SafariZone_Entrance @ 0x83BBFA0 - .4byte gMapScripts_FuchsiaCity_SafariZone_Entrance @ 0x816D2A8 - .4byte NULL - .2byte BGM_FRLG_CERULEAN_CITY - .2byte 51 - .byte 0x5f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -FuchsiaCity_Mart:: @ 8351434 - .4byte Mart_Layout @ 0x82D5BCC - .4byte gMapEvents_FuchsiaCity_Mart @ 0x83BC014 - .4byte gMapScripts_FuchsiaCity_Mart @ 0x816D4E0 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 10 - .byte 0x5f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -FuchsiaCity_ZooBuilding:: @ 8351450 - .4byte FuchsiaCity_ZooBuilding_Layout @ 0x831C348 - .4byte gMapEvents_FuchsiaCity_ZooBuilding @ 0x83BC0A0 - .4byte gMapScripts_FuchsiaCity_ZooBuilding @ 0x816D528 - .4byte NULL - .2byte BGM_FRLG_CERULEAN_CITY - .2byte 200 - .byte 0x5f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -FuchsiaCity_Gym:: @ 835146C - .4byte FuchsiaCity_Gym_Layout @ 0x82D6A04 - .4byte gMapEvents_FuchsiaCity_Gym @ 0x83BC1A4 - .4byte gMapScripts_FuchsiaCity_Gym @ 0x816D54D - .4byte NULL - .2byte BGM_FRLG_GYM - .2byte 20 - .byte 0x5f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01 - -FuchsiaCity_House1:: @ 8351488 - .4byte House1_Layout @ 0x82D5754 - .4byte gMapEvents_FuchsiaCity_House1 @ 0x83BC218 - .4byte gMapScripts_FuchsiaCity_House1 @ 0x816D6C5 - .4byte NULL - .2byte BGM_FRLG_CERULEAN_CITY - .2byte 6 - .byte 0x5f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -FuchsiaCity_PokemonCenter_1F:: @ 83514A4 - .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte gMapEvents_FuchsiaCity_PokemonCenter_1F @ 0x83BC2AC - .4byte gMapScripts_FuchsiaCity_PokemonCenter_1F @ 0x816D6F1 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 8 - .byte 0x5f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -FuchsiaCity_PokemonCenter_2F:: @ 83514C0 - .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte gMapEvents_FuchsiaCity_PokemonCenter_2F @ 0x83BC338 - .4byte gMapScripts_FuchsiaCity_PokemonCenter_2F @ 0x816D724 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 9 - .byte 0x5f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -FuchsiaCity_Building1:: @ 83514DC - .4byte FuchsiaCity_Building1_Layout @ 0x831C48C - .4byte gMapEvents_FuchsiaCity_Building1 @ 0x83BC3F4 - .4byte gMapScripts_FuchsiaCity_Building1 @ 0x816D74B - .4byte NULL - .2byte BGM_FRLG_CERULEAN_CITY - .2byte 201 - .byte 0x5f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -FuchsiaCity_House2:: @ 83514F8 - .4byte FuchsiaCity_House2_Layout @ 0x831C578 - .4byte gMapEvents_FuchsiaCity_House2 @ 0x83BC440 - .4byte gMapScripts_FuchsiaCity_House2 @ 0x816D816 - .4byte NULL - .2byte BGM_FRLG_CERULEAN_CITY - .2byte 202 - .byte 0x5f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -FuchsiaCity_House3:: @ 8351514 - .4byte House1_Layout @ 0x82D5754 - .4byte gMapEvents_FuchsiaCity_House3 @ 0x83BC474 - .4byte gMapScripts_FuchsiaCity_House3 @ 0x816D894 - .4byte NULL - .2byte BGM_FRLG_CERULEAN_CITY - .2byte 6 - .byte 0x5f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -CinnabarIsland_Gym:: @ 8351530 - .4byte CinnabarIsland_Gym_Layout @ 0x82D82C8 - .4byte gMapEvents_CinnabarIsland_Gym @ 0x83BC62C - .4byte gMapScripts_CinnabarIsland_Gym @ 0x816D94B - .4byte NULL - .2byte BGM_FRLG_GYM - .2byte 36 - .byte 0x60, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01 - -CinnabarIsland_PokemonLab_Entrance:: @ 835154C - .4byte CinnabarIsland_PokemonLab_Entrance_Layout @ 0x831C804 - .4byte gMapEvents_CinnabarIsland_PokemonLab_Entrance @ 0x83BC6B8 - .4byte gMapScripts_CinnabarIsland_PokemonLab_Entrance @ 0x816E273 - .4byte NULL - .2byte BGM_FRLG_CINNABAR_ISLAND - .2byte 203 - .byte 0x60, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -CinnabarIsland_PokemonLab_Lounge:: @ 8351568 - .4byte CinnabarIsland_PokemonLab_Lounge_Layout @ 0x831C974 - .4byte gMapEvents_CinnabarIsland_PokemonLab_Lounge @ 0x83BC71C - .4byte gMapScripts_CinnabarIsland_PokemonLab_Lounge @ 0x816E2B8 - .4byte NULL - .2byte BGM_FRLG_CINNABAR_ISLAND - .2byte 204 - .byte 0x60, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -CinnabarIsland_PokemonLab_ResearchRoom:: @ 8351584 - .4byte CinnabarIsland_PokemonLab_ResearchRoom_Layout @ 0x831CAE4 - .4byte gMapEvents_CinnabarIsland_PokemonLab_ResearchRoom @ 0x83BC780 - .4byte gMapScripts_CinnabarIsland_PokemonLab_ResearchRoom @ 0x816E3DE - .4byte NULL - .2byte BGM_FRLG_CINNABAR_ISLAND - .2byte 205 - .byte 0x60, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -CinnabarIsland_PokemonLab_ExperimentRoom:: @ 83515A0 - .4byte CinnabarIsland_PokemonLab_ExperimentRoom_Layout @ 0x831CC54 - .4byte gMapEvents_CinnabarIsland_PokemonLab_ExperimentRoom @ 0x83BC7CC - .4byte gMapScripts_CinnabarIsland_PokemonLab_ExperimentRoom @ 0x816E400 - .4byte NULL - .2byte BGM_FRLG_CINNABAR_ISLAND - .2byte 206 - .byte 0x60, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -CinnabarIsland_PokemonCenter_1F:: @ 83515BC - .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte gMapEvents_CinnabarIsland_PokemonCenter_1F @ 0x83BC8A8 - .4byte gMapScripts_CinnabarIsland_PokemonCenter_1F @ 0x816E8D7 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 8 - .byte 0x60, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -CinnabarIsland_PokemonCenter_2F:: @ 83515D8 - .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte gMapEvents_CinnabarIsland_PokemonCenter_2F @ 0x83BC934 - .4byte gMapScripts_CinnabarIsland_PokemonCenter_2F @ 0x816E9E8 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 9 - .byte 0x60, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -CinnabarIsland_Mart:: @ 83515F4 - .4byte Mart_Layout @ 0x82D5BCC - .4byte gMapEvents_CinnabarIsland_Mart @ 0x83BC9A8 - .4byte gMapScripts_CinnabarIsland_Mart @ 0x816EA0F - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 10 - .byte 0x60, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -IndigoPlateau_PokemonCenter_1F:: @ 8351610 - .4byte IndigoPlateau_PokemonCenter_1F_Layout @ 0x831F000 - .4byte gMapEvents_IndigoPlateau_PokemonCenter_1F @ 0x83BCA94 - .4byte gMapScripts_IndigoPlateau_PokemonCenter_1F @ 0x816EA5A - .4byte NULL - .2byte BGM_FRLG_GYM - .2byte 212 - .byte 0x61, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01 - -IndigoPlateau_PokemonCenter_2F:: @ 835162C - .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte gMapEvents_IndigoPlateau_PokemonCenter_2F @ 0x83BCB20 - .4byte gMapScripts_IndigoPlateau_PokemonCenter_2F @ 0x816EB0F - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 9 - .byte 0x61, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01 - -SaffronCity_House1_1F:: @ 8351648 - .4byte SaffronCity_House1_1F_Layout @ 0x8321004 - .4byte gMapEvents_SaffronCity_House1_1F @ 0x83BCB9C - .4byte gMapScripts_SaffronCity_House1_1F @ 0x816EB36 - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 226 - .byte 0x62, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -SaffronCity_House1_2F:: @ 8351664 - .4byte SaffronCity_House1_2F_Layout @ 0x8321100 - .4byte gMapEvents_SaffronCity_House1_2F @ 0x83BCC3C - .4byte gMapScripts_SaffronCity_House1_2F @ 0x816EB5C - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 227 - .byte 0x62, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -SaffronCity_Dojo:: @ 8351680 - .4byte SaffronCity_Dojo_Layout @ 0x83212C4 - .4byte gMapEvents_SaffronCity_Dojo @ 0x83BCD60 - .4byte gMapScripts_SaffronCity_Dojo @ 0x816EBDB - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 228 - .byte 0x62, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -SaffronCity_Gym:: @ 835169C - .4byte SaffronCity_Gym_Layout @ 0x82D7C44 - .4byte gMapEvents_SaffronCity_Gym @ 0x83BCF6C - .4byte gMapScripts_SaffronCity_Gym @ 0x816EDD7 - .4byte NULL - .2byte BGM_FRLG_GYM - .2byte 34 - .byte 0x62, 0x00, 0x00, 0x08, 0x00, 0x01, 0x00, 0x01 - -SaffronCity_House2:: @ 83516B8 - .4byte House5_Layout @ 0x82D6AF0 - .4byte gMapEvents_SaffronCity_House2 @ 0x83BD004 - .4byte gMapScripts_SaffronCity_House2 @ 0x816EF73 - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 21 - .byte 0x62, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -SaffronCity_Mart:: @ 83516D4 - .4byte Mart_Layout @ 0x82D5BCC - .4byte gMapEvents_SaffronCity_Mart @ 0x83BD078 - .4byte gMapScripts_SaffronCity_Mart @ 0x816EFA2 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 10 - .byte 0x62, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -SaffronCity_PokemonCenter_1F:: @ 83516F0 - .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte gMapEvents_SaffronCity_PokemonCenter_1F @ 0x83BD13C - .4byte gMapScripts_SaffronCity_PokemonCenter_1F @ 0x816EFEC - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 8 - .byte 0x62, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -SaffronCity_PokemonCenter_2F:: @ 835170C - .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte gMapEvents_SaffronCity_PokemonCenter_2F @ 0x83BD1C8 - .4byte gMapScripts_SaffronCity_PokemonCenter_2F @ 0x816F037 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 9 - .byte 0x62, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -SaffronCity_House3:: @ 8351728 - .4byte House5_Layout @ 0x82D6AF0 - .4byte gMapEvents_SaffronCity_House3 @ 0x83BD20C - .4byte gMapScripts_SaffronCity_House3 @ 0x816F05E - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 21 - .byte 0x62, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -SaffronCity_PokemonTrainerFanClub:: @ 8351744 - .4byte SaffronCity_PokemonTrainerFanClub_Layout @ 0x8338A60 - .4byte gMapEvents_SaffronCity_PokemonTrainerFanClub @ 0x83BD318 - .4byte gMapScripts_SaffronCity_PokemonTrainerFanClub @ 0x816F0BF - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 263 - .byte 0x62, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -Route2_ViridianForest_SouthEntrance:: @ 8351760 - .4byte Route2_Entrance_Layout @ 0x8320990 - .4byte gMapEvents_Route2_ViridianForest_SouthEntrance @ 0x83BD37C - .4byte gMapScripts_Route2_ViridianForest_SouthEntrance @ 0x816F5E5 - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 221 - .byte 0x66, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00 - -Route2_House:: @ 835177C - .4byte House2_Layout @ 0x82D5840 - .4byte gMapEvents_Route2_House @ 0x83BD3D8 - .4byte gMapScripts_Route2_House @ 0x816F5F8 - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 7 - .byte 0x66, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -Route2_EastBuilding:: @ 8351798 - .4byte Route2_Entrance_Layout @ 0x8320990 - .4byte gMapEvents_Route2_EastBuilding @ 0x83BD43C - .4byte gMapScripts_Route2_EastBuilding @ 0x816F67E - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 221 - .byte 0x66, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00 - -Route2_ViridianForest_NorthEntrance:: @ 83517B4 - .4byte Route2_Entrance_Layout @ 0x8320990 - .4byte gMapEvents_Route2_ViridianForest_NorthEntrance @ 0x83BD4B8 - .4byte gMapScripts_Route2_ViridianForest_NorthEntrance @ 0x816F71D - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 221 - .byte 0x66, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00 - -Route4_PokemonCenter_1F:: @ 83517D0 - .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte gMapEvents_Route4_PokemonCenter_1F @ 0x83BD57C - .4byte gMapScripts_Route4_PokemonCenter_1F @ 0x816F739 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 8 - .byte 0x68, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -Route4_PokemonCenter_2F:: @ 83517EC - .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte gMapEvents_Route4_PokemonCenter_2F @ 0x83BD608 - .4byte gMapScripts_Route4_PokemonCenter_2F @ 0x816F8D8 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 9 - .byte 0x68, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -Route5_PokemonDayCare:: @ 8351808 - .4byte Route5_PokemonDayCare_Layout @ 0x833ADC0 - .4byte gMapEvents_Route5_PokemonDayCare @ 0x83BD64C - .4byte gMapScripts_Route5_PokemonDayCare @ 0x816F8FF - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 275 - .byte 0x69, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -Route5_SouthEntrance:: @ 8351824 - .4byte SaffronCity_NorthSouthEntrance_Layout @ 0x831E9C0 - .4byte gMapEvents_Route5_SouthEntrance @ 0x83BD6C8 - .4byte gMapScripts_Route5_SouthEntrance @ 0x816F900 - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 208 - .byte 0x69, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00 - -Route6_NorthEntrance:: @ 8351840 - .4byte SaffronCity_NorthSouthEntrance_Layout @ 0x831E9C0 - .4byte gMapEvents_Route6_NorthEntrance @ 0x83BD744 - .4byte gMapScripts_Route6_NorthEntrance @ 0x816F9C6 - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 208 - .byte 0x6a, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00 - -UnknownMap_18_01:: @ 835185C - .4byte House2_Layout @ 0x82D5840 - .4byte gMapEvents_UnknownMap_18_01 @ 0x83BD758 - .4byte gMapScripts_UnknownMap_18_01 @ 0x816FA8C - .4byte NULL - .2byte BGM_FRLG_ROUTE_3 - .2byte 7 - .byte 0x6a, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -Route7_EastEntrance:: @ 8351878 - .4byte SaffronCity_EastWestEntrance_Layout @ 0x831EAD0 - .4byte gMapEvents_Route7_EastEntrance @ 0x83BD7D4 - .4byte gMapScripts_Route7_EastEntrance @ 0x816FA8D - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 209 - .byte 0x6b, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00 - -Route8_WestEntrance:: @ 8351894 - .4byte SaffronCity_EastWestEntrance_Layout @ 0x831EAD0 - .4byte gMapEvents_Route8_WestEntrance @ 0x83BD850 - .4byte gMapScripts_Route8_WestEntrance @ 0x816FB53 - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 209 - .byte 0x6c, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00 - -Route10_PokemonCenter_1F:: @ 83518B0 - .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte gMapEvents_Route10_PokemonCenter_1F @ 0x83BD8FC - .4byte gMapScripts_Route10_PokemonCenter_1F @ 0x816FC2F - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 8 - .byte 0x6e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -Route10_PokemonCenter_2F:: @ 83518CC - .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte gMapEvents_Route10_PokemonCenter_2F @ 0x83BD988 - .4byte gMapScripts_Route10_PokemonCenter_2F @ 0x816FCFA - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 9 - .byte 0x6e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -Route11_EastEntrance_1F:: @ 83518E8 - .4byte Entrance_1F_Layout @ 0x8320E70 - .4byte gMapEvents_Route11_EastEntrance_1F @ 0x83BD9F4 - .4byte gMapScripts_Route11_EastEntrance_1F @ 0x816FD21 - .4byte NULL - .2byte BGM_FRLG_VERMILION_CITY - .2byte 224 - .byte 0x6f, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00 - -Route11_EastEntrance_2F:: @ 8351904 - .4byte Entrance_2F_Layout @ 0x8320804 - .4byte gMapEvents_Route11_EastEntrance_2F @ 0x83BDA58 - .4byte gMapScripts_Route11_EastEntrance_2F @ 0x816FD34 - .4byte NULL - .2byte BGM_FRLG_VERMILION_CITY - .2byte 220 - .byte 0x6f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -Route12_NorthEntrance_1F:: @ 8351920 - .4byte Route12_NorthEntrance_1F_Layout @ 0x8319DF0 - .4byte gMapEvents_Route12_NorthEntrance_1F @ 0x83BDAAC - .4byte gMapScripts_Route12_NorthEntrance_1F @ 0x816FE6D - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 176 - .byte 0x70, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00 - -Route12_NorthEntrance_2F:: @ 835193C - .4byte Entrance_2F_Layout @ 0x8320804 - .4byte gMapEvents_Route12_NorthEntrance_2F @ 0x83BDAF8 - .4byte gMapScripts_Route12_NorthEntrance_2F @ 0x816FE77 - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 220 - .byte 0x70, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -Route12_FishingHouse:: @ 8351958 - .4byte House4_Layout @ 0x82D6070 - .4byte gMapEvents_Route12_FishingHouse @ 0x83BDB48 - .4byte gMapScripts_Route12_FishingHouse @ 0x816FF0B - .4byte NULL - .2byte BGM_FRLG_CELADON_CITY - .2byte 13 - .byte 0x70, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -Route15_WestEntrance_1F:: @ 8351974 - .4byte Entrance_1F_Layout @ 0x8320E70 - .4byte gMapEvents_Route15_WestEntrance_1F @ 0x83BDB9C - .4byte gMapScripts_Route15_WestEntrance_1F @ 0x8170088 - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 224 - .byte 0x73, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00 - -Route15_WestEntrance_2F:: @ 8351990 - .4byte Entrance_2F_Layout @ 0x8320804 - .4byte gMapEvents_Route15_WestEntrance_2F @ 0x83BDBE8 - .4byte gMapScripts_Route15_WestEntrance_2F @ 0x8170092 - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 220 - .byte 0x73, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -Route16_House:: @ 83519AC - .4byte House1_Layout @ 0x82D5754 - .4byte gMapEvents_Route16_House @ 0x83BDC44 - .4byte gMapScripts_Route16_House @ 0x817014E - .4byte NULL - .2byte BGM_FRLG_CELADON_CITY - .2byte 6 - .byte 0x74, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -Route16_NorthEntrance_1F:: @ 83519C8 - .4byte Route16_NorthEntrance_1F_Layout @ 0x8320D14 - .4byte gMapEvents_Route16_NorthEntrance_1F @ 0x83BDD60 - .4byte gMapScripts_Route16_NorthEntrance_1F @ 0x81701C2 - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 223 - .byte 0x74, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00 - -Route16_NorthEntrance_2F:: @ 83519E4 - .4byte Entrance_2F_Layout @ 0x8320804 - .4byte gMapEvents_Route16_NorthEntrance_2F @ 0x83BDDDC - .4byte gMapScripts_Route16_NorthEntrance_2F @ 0x81702BE - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 220 - .byte 0x74, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -Route18_EastEntrance_1F:: @ 8351A00 - .4byte Entrance_1F_Layout @ 0x8320E70 - .4byte gMapEvents_Route18_EastEntrance_1F @ 0x83BDED0 - .4byte gMapScripts_Route18_EastEntrance_1F @ 0x8170378 - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 224 - .byte 0x76, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00 - -Route18_EastEntrance_2F:: @ 8351A1C - .4byte Entrance_2F_Layout @ 0x8320804 - .4byte gMapEvents_Route18_EastEntrance_2F @ 0x83BDF1C - .4byte gMapScripts_Route18_EastEntrance_2F @ 0x817046B - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 220 - .byte 0x76, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -UnusedHouse_27_00:: @ 8351A38 - .4byte House2_Layout @ 0x82D5840 - .4byte gMapEvents_UnusedHouse_27_00 @ 0x83BDF30 - .4byte gMapScripts_UnusedHouse_27_00 @ 0x81704FA - .4byte NULL - .2byte BGM_FRLG_ROUTE_3 - .2byte 7 - .byte 0x77, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -Route22_NorthEntrance:: @ 8351A54 - .4byte Route22_NorthEntrance_Layout @ 0x8320B1C - .4byte gMapEvents_Route22_NorthEntrance @ 0x83BDF8C - .4byte gMapScripts_Route22_NorthEntrance @ 0x81704FB - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_FOREST - .2byte 222 - .byte 0x7a, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -UnusedHouse_29_00:: @ 8351A70 - .4byte House2_Layout @ 0x82D5840 - .4byte gMapEvents_UnusedHouse_29_00 @ 0x83BDFA0 - .4byte gMapScripts_UnusedHouse_29_00 @ 0x8170522 - .4byte NULL - .2byte BGM_FRLG_INDIGO_PLATEAU - .2byte 7 - .byte 0x7b, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -Route25_SeaCottage:: @ 8351A8C - .4byte Route25_SeaCottage_Layout @ 0x8319030 - .4byte gMapEvents_Route25_SeaCottage @ 0x83BE008 - .4byte gMapScripts_Route25_SeaCottage @ 0x8170523 - .4byte NULL - .2byte BGM_FRLG_CERULEAN_CITY - .2byte 169 - .byte 0x7d, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -SevenIsland_House_Room1:: @ 8351AA8 - .4byte SevenIsland_House_Room1_Layout @ 0x834E310 - .4byte gMapEvents_SevenIsland_House_Room1 @ 0x83BE050 - .4byte gMapScripts_SevenIsland_House_Room1 @ 0x817088A - .4byte NULL - .2byte BGM_FRLG_ISLAND_SIX - .2byte 382 - .byte 0x94, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01 - -SevenIsland_House_Room2:: @ 8351AC4 - .4byte SevenIsland_House_Room2_Layout @ 0x8338C48 - .4byte gMapEvents_SevenIsland_House_Room2 @ 0x83BE084 - .4byte gMapScripts_SevenIsland_House_Room2 @ 0x8170A7E - .4byte NULL - .2byte BGM_FRLG_ISLAND_SIX - .2byte 265 - .byte 0x94, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01 - -SevenIsland_Mart:: @ 8351AE0 - .4byte Mart_Layout @ 0x82D5BCC - .4byte gMapEvents_SevenIsland_Mart @ 0x83BE100 - .4byte gMapScripts_SevenIsland_Mart @ 0x8170B30 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 10 - .byte 0x94, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -SevenIsland_PokemonCenter_1F:: @ 8351AFC - .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte gMapEvents_SevenIsland_PokemonCenter_1F @ 0x83BE1B4 - .4byte gMapScripts_SevenIsland_PokemonCenter_1F @ 0x8170B89 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 8 - .byte 0x94, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -SevenIsland_PokemonCenter_2F:: @ 8351B18 - .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte gMapEvents_SevenIsland_PokemonCenter_2F @ 0x83BE240 - .4byte gMapScripts_SevenIsland_PokemonCenter_2F @ 0x8170BBC - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 9 - .byte 0x94, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -UnusedHouse_31_05:: @ 8351B34 - .4byte House4_Layout @ 0x82D6070 - .4byte gMapEvents_UnusedHouse_31_05 @ 0x83BE254 - .4byte gMapScripts_UnusedHouse_31_05 @ 0x8170BE3 - .4byte NULL - .2byte BGM_FRLG_ISLAND_SIX - .2byte 13 - .byte 0x94, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -SevenIsland_Harbor:: @ 8351B50 - .4byte Island_Harbor_Layout @ 0x8343FB8 - .4byte gMapEvents_SevenIsland_Harbor @ 0x83BE2A0 - .4byte gMapScripts_SevenIsland_Harbor @ 0x8170BE4 - .4byte NULL - .2byte BGM_FRLG_ISLAND_SIX - .2byte 315 - .byte 0x94, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -OneIsland_PokemonCenter_1F:: @ 8351B6C - .4byte OneIsland_PokemonCenter_1F_Layout @ 0x833A970 - .4byte gMapEvents_OneIsland_PokemonCenter_1F @ 0x83BE400 - .4byte gMapScripts_OneIsland_PokemonCenter_1F @ 0x8170BF8 - .4byte NULL - .2byte BGM_FRLG_POKEMON_NETWORK_CENTER - .2byte 271 - .byte 0x8f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -OneIsland_PokemonCenter_2F:: @ 8351B88 - .4byte OneIsland_PokemonCenter_2F_Layout @ 0x8344108 - .4byte gMapEvents_OneIsland_PokemonCenter_2F @ 0x83BE48C - .4byte gMapScripts_OneIsland_PokemonCenter_2F @ 0x8171334 - .4byte NULL - .2byte BGM_FRLG_POKEMON_NETWORK_CENTER - .2byte 316 - .byte 0x8f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -OneIsland_House1:: @ 8351BA4 - .4byte House3_Layout @ 0x82D5CB8 - .4byte gMapEvents_OneIsland_House1 @ 0x83BE4D8 - .4byte gMapScripts_OneIsland_House1 @ 0x817135B - .4byte NULL - .2byte BGM_FRLG_ISLAND_ONE - .2byte 11 - .byte 0x8f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -OneIsland_House2:: @ 8351BC0 - .4byte House3_Layout @ 0x82D5CB8 - .4byte gMapEvents_OneIsland_House2 @ 0x83BE50C - .4byte gMapScripts_OneIsland_House2 @ 0x817136E - .4byte NULL - .2byte BGM_FRLG_ISLAND_ONE - .2byte 11 - .byte 0x8f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -OneIsland_Harbor:: @ 8351BDC - .4byte Island_Harbor_Layout @ 0x8343FB8 - .4byte gMapEvents_OneIsland_Harbor @ 0x83BE558 - .4byte gMapScripts_OneIsland_Harbor @ 0x8171378 - .4byte NULL - .2byte BGM_FRLG_ISLAND_ONE - .2byte 315 - .byte 0x8f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -TwoIsland_JoyfulGameCorner:: @ 8351BF8 - .4byte TwoIsland_JoyfulGameCorner_Layout @ 0x833AA84 - .4byte gMapEvents_TwoIsland_JoyfulGameCorner @ 0x83BE5EC - .4byte gMapScripts_TwoIsland_JoyfulGameCorner @ 0x81713D0 - .4byte NULL - .2byte BGM_FRLG_GAMECORNER - .2byte 272 - .byte 0x90, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -TwoIsland_House:: @ 8351C14 - .4byte House3_Layout @ 0x82D5CB8 - .4byte gMapEvents_TwoIsland_House @ 0x83BE620 - .4byte gMapScripts_TwoIsland_House @ 0x8171618 - .4byte NULL - .2byte BGM_FRLG_ISLAND_ONE - .2byte 11 - .byte 0x90, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -TwoIsland_PokemonCenter_1F:: @ 8351C30 - .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte gMapEvents_TwoIsland_PokemonCenter_1F @ 0x83BE68C - .4byte gMapScripts_TwoIsland_PokemonCenter_1F @ 0x81717B4 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 8 - .byte 0x90, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -TwoIsland_PokemonCenter_2F:: @ 8351C4C - .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte gMapEvents_TwoIsland_PokemonCenter_2F @ 0x83BE718 - .4byte gMapScripts_TwoIsland_PokemonCenter_2F @ 0x81717DE - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 9 - .byte 0x90, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -TwoIsland_Harbor:: @ 8351C68 - .4byte Island_Harbor_Layout @ 0x8343FB8 - .4byte gMapEvents_TwoIsland_Harbor @ 0x83BE764 - .4byte gMapScripts_TwoIsland_Harbor @ 0x8171805 - .4byte NULL - .2byte BGM_FRLG_ISLAND_ONE - .2byte 315 - .byte 0x90, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -ThreeIsland_House1:: @ 8351C84 - .4byte ThreeIsland_House1_Layout @ 0x82D7504 - .4byte gMapEvents_ThreeIsland_House1 @ 0x83BE7A4 - .4byte gMapScripts_ThreeIsland_House1 @ 0x8171819 - .4byte NULL - .2byte BGM_FRLG_ISLAND_ONE - .2byte 31 - .byte 0x91, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -ThreeIsland_PokemonCenter_1F:: @ 8351CA0 - .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte gMapEvents_ThreeIsland_PokemonCenter_1F @ 0x83BE828 - .4byte gMapScripts_ThreeIsland_PokemonCenter_1F @ 0x8171832 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 8 - .byte 0x91, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -ThreeIsland_PokemonCenter_2F:: @ 8351CBC - .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte gMapEvents_ThreeIsland_PokemonCenter_2F @ 0x83BE8B4 - .4byte gMapScripts_ThreeIsland_PokemonCenter_2F @ 0x8171865 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 9 - .byte 0x91, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -ThreeIsland_Mart:: @ 8351CD8 - .4byte Mart_Layout @ 0x82D5BCC - .4byte gMapEvents_ThreeIsland_Mart @ 0x83BE930 - .4byte gMapScripts_ThreeIsland_Mart @ 0x817188C - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 10 - .byte 0x91, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -ThreeIsland_House2:: @ 8351CF4 - .4byte House3_Layout @ 0x82D5CB8 - .4byte gMapEvents_ThreeIsland_House2 @ 0x83BE97C - .4byte gMapScripts_ThreeIsland_House2 @ 0x81718DF - .4byte NULL - .2byte BGM_FRLG_ISLAND_ONE - .2byte 11 - .byte 0x91, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -ThreeIsland_House3:: @ 8351D10 - .4byte House3_Layout @ 0x82D5CB8 - .4byte gMapEvents_ThreeIsland_House3 @ 0x83BE9B0 - .4byte gMapScripts_ThreeIsland_House3 @ 0x8171902 - .4byte NULL - .2byte BGM_FRLG_ISLAND_ONE - .2byte 11 - .byte 0x91, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -ThreeIsland_House4:: @ 8351D2C - .4byte House3_Layout @ 0x82D5CB8 - .4byte gMapEvents_ThreeIsland_House4 @ 0x83BE9FC - .4byte gMapScripts_ThreeIsland_House4 @ 0x817190C - .4byte NULL - .2byte BGM_FRLG_ISLAND_ONE - .2byte 11 - .byte 0x91, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -ThreeIsland_House5:: @ 8351D48 - .4byte House3_Layout @ 0x82D5CB8 - .4byte gMapEvents_ThreeIsland_House5 @ 0x83BEA30 - .4byte gMapScripts_ThreeIsland_House5 @ 0x817191F - .4byte NULL - .2byte BGM_FRLG_ISLAND_ONE - .2byte 11 - .byte 0x91, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -FourIsland_PokemonDayCare:: @ 8351D64 - .4byte FourIsland_PokemonDayCare_Layout @ 0x833AFA8 - .4byte gMapEvents_FourIsland_PokemonDayCare @ 0x83BEA64 - .4byte gMapScripts_FourIsland_PokemonDayCare @ 0x817193F - .4byte NULL - .2byte BGM_FRLG_ISLAND_FOUR - .2byte 277 - .byte 0x92, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -FourIsland_PokemonCenter_1F:: @ 8351D80 - .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte gMapEvents_FourIsland_PokemonCenter_1F @ 0x83BEB00 - .4byte gMapScripts_FourIsland_PokemonCenter_1F @ 0x8171BEA - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 8 - .byte 0x92, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -FourIsland_PokemonCenter_2F:: @ 8351D9C - .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte gMapEvents_FourIsland_PokemonCenter_2F @ 0x83BEB8C - .4byte gMapScripts_FourIsland_PokemonCenter_2F @ 0x8171C1D - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 9 - .byte 0x92, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -FourIsland_House1:: @ 8351DB8 - .4byte House3_Layout @ 0x82D5CB8 - .4byte gMapEvents_FourIsland_House1 @ 0x83BEBD8 - .4byte gMapScripts_FourIsland_House1 @ 0x8171C44 - .4byte NULL - .2byte BGM_FRLG_ISLAND_FOUR - .2byte 11 - .byte 0x92, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -FourIsland_LoreleisHouse:: @ 8351DD4 - .4byte FourIsland_LoreleisHouse_Layout @ 0x82D7418 - .4byte gMapEvents_FourIsland_LoreleisHouse @ 0x83BED5C - .4byte gMapScripts_FourIsland_LoreleisHouse @ 0x8171C4E - .4byte NULL - .2byte BGM_FRLG_ISLAND_FOUR - .2byte 30 - .byte 0x92, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -FourIsland_Harbor:: @ 8351DF0 - .4byte Island_Harbor_Layout @ 0x8343FB8 - .4byte gMapEvents_FourIsland_Harbor @ 0x83BEDA8 - .4byte gMapScripts_FourIsland_Harbor @ 0x8171C98 - .4byte NULL - .2byte BGM_FRLG_ISLAND_FOUR - .2byte 315 - .byte 0x92, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -FourIsland_House2:: @ 8351E0C - .4byte House3_Layout @ 0x82D5CB8 - .4byte gMapEvents_FourIsland_House2 @ 0x83BEDDC - .4byte gMapScripts_FourIsland_House2 @ 0x8171CAC - .4byte NULL - .2byte BGM_FRLG_ISLAND_FOUR - .2byte 11 - .byte 0x92, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -FourIsland_Mart:: @ 8351E28 - .4byte Mart_Layout @ 0x82D5BCC - .4byte gMapEvents_FourIsland_Mart @ 0x83BEE40 - .4byte gMapScripts_FourIsland_Mart @ 0x8171CAD - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 10 - .byte 0x92, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -FiveIsland_PokemonCenter_1F:: @ 8351E44 - .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte gMapEvents_FiveIsland_PokemonCenter_1F @ 0x83BEEDC - .4byte gMapScripts_FiveIsland_PokemonCenter_1F @ 0x8171CF1 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 8 - .byte 0x93, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -FiveIsland_PokemonCenter_2F:: @ 8351E60 - .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte gMapEvents_FiveIsland_PokemonCenter_2F @ 0x83BEF68 - .4byte gMapScripts_FiveIsland_PokemonCenter_2F @ 0x8171D1B - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 9 - .byte 0x93, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -FiveIsland_Harbor:: @ 8351E7C - .4byte Island_Harbor_Layout @ 0x8343FB8 - .4byte gMapEvents_FiveIsland_Harbor @ 0x83BEFB4 - .4byte gMapScripts_FiveIsland_Harbor @ 0x8171D42 - .4byte NULL - .2byte BGM_FRLG_ISLAND_FOUR - .2byte 315 - .byte 0x93, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -FiveIsland_House1:: @ 8351E98 - .4byte House3_Layout @ 0x82D5CB8 - .4byte gMapEvents_FiveIsland_House1 @ 0x83BEFE8 - .4byte gMapScripts_FiveIsland_House1 @ 0x8171D56 - .4byte NULL - .2byte BGM_FRLG_ISLAND_FOUR - .2byte 11 - .byte 0x93, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -FiveIsland_House2:: @ 8351EB4 - .4byte House3_Layout @ 0x82D5CB8 - .4byte gMapEvents_FiveIsland_House2 @ 0x83BF01C - .4byte gMapScripts_FiveIsland_House2 @ 0x8171D60 - .4byte NULL - .2byte BGM_FRLG_ISLAND_FOUR - .2byte 11 - .byte 0x93, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -SixIsland_PokemonCenter_1F:: @ 8351ED0 - .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte gMapEvents_SixIsland_PokemonCenter_1F @ 0x83BF0A0 - .4byte gMapScripts_SixIsland_PokemonCenter_1F @ 0x8171D6A - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 8 - .byte 0x95, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -SixIsland_PokemonCenter_2F:: @ 8351EEC - .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte gMapEvents_SixIsland_PokemonCenter_2F @ 0x83BF12C - .4byte gMapScripts_SixIsland_PokemonCenter_2F @ 0x8171E20 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 9 - .byte 0x95, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -SixIsland_Harbor:: @ 8351F08 - .4byte Island_Harbor_Layout @ 0x8343FB8 - .4byte gMapEvents_SixIsland_Harbor @ 0x83BF178 - .4byte gMapScripts_SixIsland_Harbor @ 0x8171E47 - .4byte NULL - .2byte BGM_FRLG_ISLAND_SIX - .2byte 315 - .byte 0x95, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -SixIsland_House:: @ 8351F24 - .4byte House3_Layout @ 0x82D5CB8 - .4byte gMapEvents_SixIsland_House @ 0x83BF1AC - .4byte gMapScripts_SixIsland_House @ 0x8171E5B - .4byte NULL - .2byte BGM_FRLG_ISLAND_SIX - .2byte 11 - .byte 0x95, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -SixIsland_Mart:: @ 8351F40 - .4byte Mart_Layout @ 0x82D5BCC - .4byte gMapEvents_SixIsland_Mart @ 0x83BF210 - .4byte gMapScripts_SixIsland_Mart @ 0x8171E65 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 10 - .byte 0x95, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -ThreeIsland_Harbor:: @ 8351F5C - .4byte Island_Harbor_Layout @ 0x8343FB8 - .4byte gMapEvents_ThreeIsland_Harbor @ 0x83BF25C - .4byte gMapScripts_ThreeIsland_Harbor @ 0x8171EA9 - .4byte NULL - .2byte BGM_FRLG_ISLAND_ONE - .2byte 315 - .byte 0x9a, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -FiveIsland_ResortGorgeous_House:: @ 8351F78 - .4byte FiveIsland_ResortGorgeous_House_Layout @ 0x82D657C - .4byte gMapEvents_FiveIsland_ResortGorgeous_House @ 0x83BF2C0 - .4byte gMapScripts_FiveIsland_ResortGorgeous_House @ 0x8171EBD - .4byte NULL - .2byte BGM_FRLG_ISLAND_FOUR - .2byte 17 - .byte 0x9f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -TwoIsland_CapeBrink_House:: @ 8351F94 - .4byte House3_Layout @ 0x82D5CB8 - .4byte gMapEvents_TwoIsland_CapeBrink_House @ 0x83BF2F4 - .4byte gMapScripts_TwoIsland_CapeBrink_House @ 0x817206B - .4byte NULL - .2byte BGM_FRLG_ISLAND_ONE - .2byte 11 - .byte 0x98, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -SixIsland_WaterPath_House1:: @ 8351FB0 - .4byte House4_Layout @ 0x82D6070 - .4byte gMapEvents_SixIsland_WaterPath_House1 @ 0x83BF334 - .4byte gMapScripts_SixIsland_WaterPath_House1 @ 0x817206C - .4byte NULL - .2byte BGM_FRLG_CERULEAN_CITY - .2byte 13 - .byte 0xa5, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -SixIsland_WaterPath_House2:: @ 8351FCC - .4byte House3_Layout @ 0x82D5CB8 - .4byte gMapEvents_SixIsland_WaterPath_House2 @ 0x83BF368 - .4byte gMapScripts_SixIsland_WaterPath_House2 @ 0x8172178 - .4byte NULL - .2byte BGM_FRLG_CERULEAN_CITY - .2byte 11 - .byte 0xa5, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - -SevenIsland_SevaultCanyon_House:: @ 8351FE8 - .4byte House3_Layout @ 0x82D5CB8 - .4byte gMapEvents_SevenIsland_SevaultCanyon_House @ 0x83BF3CC - .4byte gMapScripts_SevenIsland_SevaultCanyon_House @ 0x8172182 - .4byte NULL - .2byte BGM_FRLG_ISLAND_SIX - .2byte 11 - .byte 0xa9, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 - gMapGroup_00:: @ 8352004 .4byte UnknownMap_00_00 .4byte UnknownMap_00_01 diff --git a/data/maps/headers.inc b/data/maps/headers.inc new file mode 100644 index 000000000..7edb2d4d5 --- /dev/null +++ b/data/maps/headers.inc @@ -0,0 +1,425 @@ + .include "data/maps/UnknownMap_00_00/header.inc" + .include "data/maps/UnknownMap_00_01/header.inc" + .include "data/maps/UnknownMap_00_02/header.inc" + .include "data/maps/UnknownMap_00_03/header.inc" + .include "data/maps/UnknownMap_00_04/header.inc" + .include "data/maps/ViridianForest/header.inc" + .include "data/maps/MtMoon_1F/header.inc" + .include "data/maps/MtMoon_B1F/header.inc" + .include "data/maps/MtMoon_B2F/header.inc" + .include "data/maps/SSAnne_Exterior/header.inc" + .include "data/maps/SSAnne_1F_Corridor/header.inc" + .include "data/maps/SSAnne_2F_Corridor/header.inc" + .include "data/maps/SSAnne_3F_Corridor/header.inc" + .include "data/maps/SSAnne_B1F_Corridor/header.inc" + .include "data/maps/SSAnne_Deck/header.inc" + .include "data/maps/SSAnne_Kitchen/header.inc" + .include "data/maps/SSAnne_CaptainsOffice/header.inc" + .include "data/maps/SSAnne_1F_Room1/header.inc" + .include "data/maps/SSAnne_1F_Room2/header.inc" + .include "data/maps/SSAnne_1F_Room3/header.inc" + .include "data/maps/SSAnne_1F_Room4/header.inc" + .include "data/maps/SSAnne_1F_Room5/header.inc" + .include "data/maps/SSAnne_1F_Room7/header.inc" + .include "data/maps/SSAnne_2F_Room1/header.inc" + .include "data/maps/SSAnne_2F_Room2/header.inc" + .include "data/maps/SSAnne_2F_Room3/header.inc" + .include "data/maps/SSAnne_2F_Room4/header.inc" + .include "data/maps/SSAnne_2F_Room5/header.inc" + .include "data/maps/SSAnne_2F_Room6/header.inc" + .include "data/maps/SSAnne_B1F_Room1/header.inc" + .include "data/maps/SSAnne_B1F_Room2/header.inc" + .include "data/maps/SSAnne_B1F_Room3/header.inc" + .include "data/maps/SSAnne_B1F_Room4/header.inc" + .include "data/maps/SSAnne_B1F_Room5/header.inc" + .include "data/maps/SSAnne_1F_Room6/header.inc" + .include "data/maps/UndergroundPath_NorthEntrance/header.inc" + .include "data/maps/UndergroundPath_NorthSouthTunnel/header.inc" + .include "data/maps/UndergroundPath_SouthEntrance/header.inc" + .include "data/maps/UndergroundPath_WestEntrance/header.inc" + .include "data/maps/UndergroundPath_EastWestTunnel/header.inc" + .include "data/maps/UndergroundPath_EastEntrance/header.inc" + .include "data/maps/DiglettsCave_NorthEntrance/header.inc" + .include "data/maps/DiglettsCave_B1F/header.inc" + .include "data/maps/DiglettsCave_SouthEntrance/header.inc" + .include "data/maps/VictoryRoad_1F/header.inc" + .include "data/maps/VictoryRoad_2F/header.inc" + .include "data/maps/VictoryRoad_3F/header.inc" + .include "data/maps/RocketHideout_B1F/header.inc" + .include "data/maps/RocketHideout_B2F/header.inc" + .include "data/maps/RocketHideout_B3F/header.inc" + .include "data/maps/RocketHideout_B4F/header.inc" + .include "data/maps/RocketHideout_Elevator/header.inc" + .include "data/maps/SilphCo_1F/header.inc" + .include "data/maps/SilphCo_2F/header.inc" + .include "data/maps/SilphCo_3F/header.inc" + .include "data/maps/SilphCo_4F/header.inc" + .include "data/maps/SilphCo_5F/header.inc" + .include "data/maps/SilphCo_6F/header.inc" + .include "data/maps/SilphCo_7F/header.inc" + .include "data/maps/SilphCo_8F/header.inc" + .include "data/maps/SilphCo_9F/header.inc" + .include "data/maps/SilphCo_10F/header.inc" + .include "data/maps/SilphCo_11F/header.inc" + .include "data/maps/SilphCo_Elevator/header.inc" + .include "data/maps/PokemonMansion_1F/header.inc" + .include "data/maps/PokemonMansion_2F/header.inc" + .include "data/maps/PokemonMansion_3F/header.inc" + .include "data/maps/PokemonMansion_B1F/header.inc" + .include "data/maps/SafariZone_Center/header.inc" + .include "data/maps/SafariZone_East/header.inc" + .include "data/maps/SafariZone_North/header.inc" + .include "data/maps/SafariZone_West/header.inc" + .include "data/maps/SafariZone_Building1/header.inc" + .include "data/maps/SafariZone_Building2/header.inc" + .include "data/maps/SafariZone_Building3/header.inc" + .include "data/maps/SafariZone_Building4/header.inc" + .include "data/maps/SafariZone_SecretHouse/header.inc" + .include "data/maps/CeruleanCave_1F/header.inc" + .include "data/maps/CeruleanCave_2F/header.inc" + .include "data/maps/CeruleanCave_B1F/header.inc" + .include "data/maps/PokemonLeague_LoreleisRoom/header.inc" + .include "data/maps/PokemonLeague_BrunosRoom/header.inc" + .include "data/maps/PokemonLeague_AgathasRoom/header.inc" + .include "data/maps/PokemonLeague_LancesRoom/header.inc" + .include "data/maps/PokemonLeague_ChampionsRoom/header.inc" + .include "data/maps/PokemonLeague_HallOfFame/header.inc" + .include "data/maps/RockTunnel_1F/header.inc" + .include "data/maps/RockTunnel_B1F/header.inc" + .include "data/maps/SeafoamIslands_1F/header.inc" + .include "data/maps/SeafoamIslands_B1F/header.inc" + .include "data/maps/SeafoamIslands_B2F/header.inc" + .include "data/maps/SeafoamIslands_B3F/header.inc" + .include "data/maps/SeafoamIslands_B4F/header.inc" + .include "data/maps/PokemonTower_1F/header.inc" + .include "data/maps/PokemonTower_2F/header.inc" + .include "data/maps/PokemonTower_3F/header.inc" + .include "data/maps/PokemonTower_4F/header.inc" + .include "data/maps/PokemonTower_5F/header.inc" + .include "data/maps/PokemonTower_6F/header.inc" + .include "data/maps/PokemonTower_7F/header.inc" + .include "data/maps/PowerPlant/header.inc" + .include "data/maps/MtEmber_RubyPath_B4F/header.inc" + .include "data/maps/MtEmber_Exterior/header.inc" + .include "data/maps/MtEmber_SummitPath_1F/header.inc" + .include "data/maps/MtEmber_SummitPath_2F/header.inc" + .include "data/maps/MtEmber_SummitPath_3F/header.inc" + .include "data/maps/MtEmber_Summit/header.inc" + .include "data/maps/MtEmber_RubyPath_B5F/header.inc" + .include "data/maps/SSAnne_Kitchen3/header.inc" + .include "data/maps/MtEmber_RubyPath_B1F/header.inc" + .include "data/maps/MtEmber_RubyPath_B2F/header.inc" + .include "data/maps/MtEmber_RubyPath_B3F/header.inc" + .include "data/maps/MtEmber_RubyPath_B1F_Stairs/header.inc" + .include "data/maps/MtEmber_RubyPath_B2F_Stairs/header.inc" + .include "data/maps/ThreeIsland_BerryForest/header.inc" + .include "data/maps/FourIsland_IcefallCave_Entrance/header.inc" + .include "data/maps/FourIsland_IcefallCave_1F/header.inc" + .include "data/maps/SSAnne_CaptainsOffice2/header.inc" + .include "data/maps/SSAnne_CaptainsOffice3/header.inc" + .include "data/maps/SSAnne_CaptainsOffice4/header.inc" + .include "data/maps/SSAnne_CaptainsOffice5/header.inc" + .include "data/maps/SixIsland_DottedHole_B1F/header.inc" + .include "data/maps/SixIsland_DottedHole_B2F/header.inc" + .include "data/maps/SixIsland_DottedHole_B3F/header.inc" + .include "data/maps/SSAnne_CaptainsOffice9/header.inc" + .include "data/maps/SixIsland_DottedHole_SapphireRoom/header.inc" + .include "data/maps/SSAnne_1F_Room11/header.inc" + .include "data/maps/SSAnne_1F_Room12/header.inc" + .include "data/maps/NavelRock_Exterior/header.inc" + .include "data/maps/SevenIsland_TrainerTower_1F/header.inc" + .include "data/maps/SevenIsland_TrainerTower_2F/header.inc" + .include "data/maps/SevenIsland_TrainerTower_3F/header.inc" + .include "data/maps/SevenIsland_TrainerTower_4F/header.inc" + .include "data/maps/SevenIsland_TrainerTower_5F/header.inc" + .include "data/maps/SevenIsland_TrainerTower_6F/header.inc" + .include "data/maps/SevenIsland_TrainerTower_7F/header.inc" + .include "data/maps/SevenIsland_TrainerTower_8F/header.inc" + .include "data/maps/SevenIsland_TrainerTower_Roof/header.inc" + .include "data/maps/SevenIsland_TrainerTower_Lobby/header.inc" + .include "data/maps/SevenIsland_TrainerTower_Elevator/header.inc" + .include "data/maps/FiveIsland_LostCave_Entrance/header.inc" + .include "data/maps/FiveIsland_LostCave_Room1/header.inc" + .include "data/maps/FiveIsland_LostCave_Room2/header.inc" + .include "data/maps/FiveIsland_LostCave_Room3/header.inc" + .include "data/maps/FiveIsland_LostCave_Room4/header.inc" + .include "data/maps/FiveIsland_LostCave_Room5/header.inc" + .include "data/maps/FiveIsland_LostCave_Room6/header.inc" + .include "data/maps/FiveIsland_LostCave_Room7/header.inc" + .include "data/maps/FiveIsland_LostCave_Room8/header.inc" + .include "data/maps/FiveIsland_LostCave_Room9/header.inc" + .include "data/maps/FiveIsland_LostCave_Room10/header.inc" + .include "data/maps/FiveIsland_LostCave_Room11/header.inc" + .include "data/maps/FiveIsland_LostCave_Room12/header.inc" + .include "data/maps/FiveIsland_LostCave_Room13/header.inc" + .include "data/maps/FiveIsland_LostCave_Room14/header.inc" + .include "data/maps/SevenIsland_TanobyRuins_MoneanChamber/header.inc" + .include "data/maps/SevenIsland_TanobyRuins_LiptooChamber/header.inc" + .include "data/maps/SevenIsland_TanobyRuins_WeepthChamber/header.inc" + .include "data/maps/SevenIsland_TanobyRuins_DilfordChamber/header.inc" + .include "data/maps/SevenIsland_TanobyRuins_ScufibChamber/header.inc" + .include "data/maps/SevenIsland_TanobyRuins_RixyChamber/header.inc" + .include "data/maps/SevenIsland_TanobyRuins_ViapoisChamber/header.inc" + .include "data/maps/ThreeIsland_DunsparceTunnel/header.inc" + .include "data/maps/SevenIsland_SeavaultCanyon_TanobyKey/header.inc" + .include "data/maps/NavelRock_1F/header.inc" + .include "data/maps/NavelRock_Summit/header.inc" + .include "data/maps/NavelRock_Base/header.inc" + .include "data/maps/NavelRock_SummitPath_2F/header.inc" + .include "data/maps/NavelRock_SummitPath_3F/header.inc" + .include "data/maps/NavelRock_SummitPath_4F/header.inc" + .include "data/maps/NavelRock_SummitPath_5F/header.inc" + .include "data/maps/NavelRock_BasePath_B1F/header.inc" + .include "data/maps/NavelRock_BasePath_B2F/header.inc" + .include "data/maps/NavelRock_BasePath_B3F/header.inc" + .include "data/maps/NavelRock_BasePath_B4F/header.inc" + .include "data/maps/NavelRock_BasePath_B5F/header.inc" + .include "data/maps/NavelRock_BasePath_B6F/header.inc" + .include "data/maps/NavelRock_BasePath_B7F/header.inc" + .include "data/maps/NavelRock_BasePath_B8F/header.inc" + .include "data/maps/NavelRock_BasePath_B9F/header.inc" + .include "data/maps/NavelRock_BasePath_B10F/header.inc" + .include "data/maps/NavelRock_BasePath_B11F/header.inc" + .include "data/maps/NavelRock_B1F/header.inc" + .include "data/maps/NavelRock_Fork/header.inc" + .include "data/maps/BirthIsland_Exterior/header.inc" + .include "data/maps/OneIsland_KindleRoad_EmberSpa/header.inc" + .include "data/maps/BirthIsland_Harbor/header.inc" + .include "data/maps/NavelRock_Harbor/header.inc" + .include "data/maps/PalletTown/header.inc" + .include "data/maps/ViridianCity/header.inc" + .include "data/maps/PewterCity/header.inc" + .include "data/maps/CeruleanCity/header.inc" + .include "data/maps/LavenderTown/header.inc" + .include "data/maps/VermilionCity/header.inc" + .include "data/maps/CeladonCity/header.inc" + .include "data/maps/FuchsiaCity/header.inc" + .include "data/maps/CinnabarIsland/header.inc" + .include "data/maps/IndigoPlateau_Exterior/header.inc" + .include "data/maps/SaffronCity_Duplicate/header.inc" + .include "data/maps/SaffronCity/header.inc" + .include "data/maps/OneIsland/header.inc" + .include "data/maps/TwoIsland/header.inc" + .include "data/maps/ThreeIsland/header.inc" + .include "data/maps/FourIsland/header.inc" + .include "data/maps/FiveIsland/header.inc" + .include "data/maps/SevenIsland/header.inc" + .include "data/maps/SixIsland/header.inc" + .include "data/maps/Route1/header.inc" + .include "data/maps/Route2/header.inc" + .include "data/maps/Route3/header.inc" + .include "data/maps/Route4/header.inc" + .include "data/maps/Route5/header.inc" + .include "data/maps/Route6/header.inc" + .include "data/maps/Route7/header.inc" + .include "data/maps/Route8/header.inc" + .include "data/maps/Route9/header.inc" + .include "data/maps/Route10/header.inc" + .include "data/maps/Route11/header.inc" + .include "data/maps/Route12/header.inc" + .include "data/maps/Route13/header.inc" + .include "data/maps/Route14/header.inc" + .include "data/maps/Route15/header.inc" + .include "data/maps/Route16/header.inc" + .include "data/maps/Route17/header.inc" + .include "data/maps/Route18/header.inc" + .include "data/maps/Route19/header.inc" + .include "data/maps/Route20/header.inc" + .include "data/maps/Route21_North/header.inc" + .include "data/maps/Route21_South/header.inc" + .include "data/maps/Route22/header.inc" + .include "data/maps/Route23/header.inc" + .include "data/maps/Route24/header.inc" + .include "data/maps/Route25/header.inc" + .include "data/maps/OneIsland_KindleRoad/header.inc" + .include "data/maps/OneIsland_TreasureBeach/header.inc" + .include "data/maps/TwoIsland_CapeBrink/header.inc" + .include "data/maps/ThreeIsland_BondBridge/header.inc" + .include "data/maps/ThreeIsland_Port/header.inc" + .include "data/maps/UnknownMap_03_50/header.inc" + .include "data/maps/UnknownMap_03_51/header.inc" + .include "data/maps/UnknownMap_03_52/header.inc" + .include "data/maps/UnknownMap_03_53/header.inc" + .include "data/maps/FiveIsland_ResortGorgeous/header.inc" + .include "data/maps/FiveIsland_WaterLabyrinth/header.inc" + .include "data/maps/FiveIsland_Meadow/header.inc" + .include "data/maps/FiveIsland_MemorialPillar/header.inc" + .include "data/maps/SixIsland_OutcastIsland/header.inc" + .include "data/maps/SixIsland_GreenPath/header.inc" + .include "data/maps/SixIsland_WaterPath/header.inc" + .include "data/maps/SixIsland_RuinValley/header.inc" + .include "data/maps/SevenIsland_TrainerTower/header.inc" + .include "data/maps/SevenIsland_SevaultCanyon_Entrance/header.inc" + .include "data/maps/SevenIsland_SevaultCanyon/header.inc" + .include "data/maps/SevenIsland_TanobyRuins/header.inc" + .include "data/maps/PalletTown_PlayersHouse_1F/header.inc" + .include "data/maps/PalletTown_PlayersHouse_2F/header.inc" + .include "data/maps/PalletTown_GarysHouse/header.inc" + .include "data/maps/PalletTown_ProfessorOaksLab/header.inc" + .include "data/maps/ViridianCity_House1/header.inc" + .include "data/maps/ViridianCity_Gym/header.inc" + .include "data/maps/ViridianCity_House2/header.inc" + .include "data/maps/ViridianCity_Mart/header.inc" + .include "data/maps/ViridianCity_PokemonCenter_1F/header.inc" + .include "data/maps/ViridianCity_PokemonCenter_2F/header.inc" + .include "data/maps/PewterCity_Museum_1F/header.inc" + .include "data/maps/PewterCity_Museum_2F/header.inc" + .include "data/maps/PewterCity_Gym/header.inc" + .include "data/maps/PewterCity_Mart/header.inc" + .include "data/maps/PewterCity_House1/header.inc" + .include "data/maps/PewterCity_PokemonCenter_1F/header.inc" + .include "data/maps/PewterCity_PokemonCenter_2F/header.inc" + .include "data/maps/PewterCity_House2/header.inc" + .include "data/maps/CeruleanCity_House1/header.inc" + .include "data/maps/CeruleanCity_House2/header.inc" + .include "data/maps/CeruleanCity_House3/header.inc" + .include "data/maps/CeruleanCity_PokemonCenter_1F/header.inc" + .include "data/maps/CeruleanCity_PokemonCenter_2F/header.inc" + .include "data/maps/CeruleanCity_Gym/header.inc" + .include "data/maps/CeruleanCity_BikeShop/header.inc" + .include "data/maps/CeruleanCity_Mart/header.inc" + .include "data/maps/CeruleanCity_House4/header.inc" + .include "data/maps/CeruleanCity_House5/header.inc" + .include "data/maps/LavenderTown_PokemonCenter_1F/header.inc" + .include "data/maps/LavenderTown_PokemonCenter_2F/header.inc" + .include "data/maps/LavenderTown_VolunteerPokemonHouse/header.inc" + .include "data/maps/LavenderTown_House1/header.inc" + .include "data/maps/LavenderTown_House2/header.inc" + .include "data/maps/LavenderTown_Mart/header.inc" + .include "data/maps/VermilionCity_House1/header.inc" + .include "data/maps/VermilionCity_PokemonCenter_1F/header.inc" + .include "data/maps/VermilionCity_PokemonCenter_2F/header.inc" + .include "data/maps/VermilionCity_PokemonFanClub/header.inc" + .include "data/maps/VermilionCity_House2/header.inc" + .include "data/maps/VermilionCity_Mart/header.inc" + .include "data/maps/VermilionCity_Gym/header.inc" + .include "data/maps/VermilionCity_House3/header.inc" + .include "data/maps/CeladonCity_DepartmentStore_1F/header.inc" + .include "data/maps/CeladonCity_DepartmentStore_2F/header.inc" + .include "data/maps/CeladonCity_DepartmentStore_3F/header.inc" + .include "data/maps/CeladonCity_DepartmentStore_4F/header.inc" + .include "data/maps/CeladonCity_DepartmentStore_5F/header.inc" + .include "data/maps/CeladonCity_DepartmentStore_Roof/header.inc" + .include "data/maps/CeladonCity_DepartmentStore_Elevator/header.inc" + .include "data/maps/CeladonCity_Condominiums_1F/header.inc" + .include "data/maps/CeladonCity_Condominiums_2F/header.inc" + .include "data/maps/CeladonCity_Condominiums_3F/header.inc" + .include "data/maps/CeladonCity_Condominiums_Roof/header.inc" + .include "data/maps/CeladonCity_Condominiums_RoofRoom/header.inc" + .include "data/maps/CeladonCity_PokemonCenter_1F/header.inc" + .include "data/maps/CeladonCity_PokemonCenter_2F/header.inc" + .include "data/maps/CeladonCity_GameCorner/header.inc" + .include "data/maps/CeladonCity_GameCorner_PrizeRoom/header.inc" + .include "data/maps/CeladonCity_Gym/header.inc" + .include "data/maps/CeladonCity_Restaurant/header.inc" + .include "data/maps/CeladonCity_House1/header.inc" + .include "data/maps/CeladonCity_Hotel/header.inc" + .include "data/maps/FuchsiaCity_SafariZone_Entrance/header.inc" + .include "data/maps/FuchsiaCity_Mart/header.inc" + .include "data/maps/FuchsiaCity_ZooBuilding/header.inc" + .include "data/maps/FuchsiaCity_Gym/header.inc" + .include "data/maps/FuchsiaCity_House1/header.inc" + .include "data/maps/FuchsiaCity_PokemonCenter_1F/header.inc" + .include "data/maps/FuchsiaCity_PokemonCenter_2F/header.inc" + .include "data/maps/FuchsiaCity_Building1/header.inc" + .include "data/maps/FuchsiaCity_House2/header.inc" + .include "data/maps/FuchsiaCity_House3/header.inc" + .include "data/maps/CinnabarIsland_Gym/header.inc" + .include "data/maps/CinnabarIsland_PokemonLab_Entrance/header.inc" + .include "data/maps/CinnabarIsland_PokemonLab_Lounge/header.inc" + .include "data/maps/CinnabarIsland_PokemonLab_ResearchRoom/header.inc" + .include "data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/header.inc" + .include "data/maps/CinnabarIsland_PokemonCenter_1F/header.inc" + .include "data/maps/CinnabarIsland_PokemonCenter_2F/header.inc" + .include "data/maps/CinnabarIsland_Mart/header.inc" + .include "data/maps/IndigoPlateau_PokemonCenter_1F/header.inc" + .include "data/maps/IndigoPlateau_PokemonCenter_2F/header.inc" + .include "data/maps/SaffronCity_House1_1F/header.inc" + .include "data/maps/SaffronCity_House1_2F/header.inc" + .include "data/maps/SaffronCity_Dojo/header.inc" + .include "data/maps/SaffronCity_Gym/header.inc" + .include "data/maps/SaffronCity_House2/header.inc" + .include "data/maps/SaffronCity_Mart/header.inc" + .include "data/maps/SaffronCity_PokemonCenter_1F/header.inc" + .include "data/maps/SaffronCity_PokemonCenter_2F/header.inc" + .include "data/maps/SaffronCity_House3/header.inc" + .include "data/maps/SaffronCity_PokemonTrainerFanClub/header.inc" + .include "data/maps/Route2_ViridianForest_SouthEntrance/header.inc" + .include "data/maps/Route2_House/header.inc" + .include "data/maps/Route2_EastBuilding/header.inc" + .include "data/maps/Route2_ViridianForest_NorthEntrance/header.inc" + .include "data/maps/Route4_PokemonCenter_1F/header.inc" + .include "data/maps/Route4_PokemonCenter_2F/header.inc" + .include "data/maps/Route5_PokemonDayCare/header.inc" + .include "data/maps/Route5_SouthEntrance/header.inc" + .include "data/maps/Route6_NorthEntrance/header.inc" + .include "data/maps/UnknownMap_18_01/header.inc" + .include "data/maps/Route7_EastEntrance/header.inc" + .include "data/maps/Route8_WestEntrance/header.inc" + .include "data/maps/Route10_PokemonCenter_1F/header.inc" + .include "data/maps/Route10_PokemonCenter_2F/header.inc" + .include "data/maps/Route11_EastEntrance_1F/header.inc" + .include "data/maps/Route11_EastEntrance_2F/header.inc" + .include "data/maps/Route12_NorthEntrance_1F/header.inc" + .include "data/maps/Route12_NorthEntrance_2F/header.inc" + .include "data/maps/Route12_FishingHouse/header.inc" + .include "data/maps/Route15_WestEntrance_1F/header.inc" + .include "data/maps/Route15_WestEntrance_2F/header.inc" + .include "data/maps/Route16_House/header.inc" + .include "data/maps/Route16_NorthEntrance_1F/header.inc" + .include "data/maps/Route16_NorthEntrance_2F/header.inc" + .include "data/maps/Route18_EastEntrance_1F/header.inc" + .include "data/maps/Route18_EastEntrance_2F/header.inc" + .include "data/maps/UnusedHouse_27_00/header.inc" + .include "data/maps/Route22_NorthEntrance/header.inc" + .include "data/maps/UnusedHouse_29_00/header.inc" + .include "data/maps/Route25_SeaCottage/header.inc" + .include "data/maps/SevenIsland_House_Room1/header.inc" + .include "data/maps/SevenIsland_House_Room2/header.inc" + .include "data/maps/SevenIsland_Mart/header.inc" + .include "data/maps/SevenIsland_PokemonCenter_1F/header.inc" + .include "data/maps/SevenIsland_PokemonCenter_2F/header.inc" + .include "data/maps/UnusedHouse_31_05/header.inc" + .include "data/maps/SevenIsland_Harbor/header.inc" + .include "data/maps/OneIsland_PokemonCenter_1F/header.inc" + .include "data/maps/OneIsland_PokemonCenter_2F/header.inc" + .include "data/maps/OneIsland_House1/header.inc" + .include "data/maps/OneIsland_House2/header.inc" + .include "data/maps/OneIsland_Harbor/header.inc" + .include "data/maps/TwoIsland_JoyfulGameCorner/header.inc" + .include "data/maps/TwoIsland_House/header.inc" + .include "data/maps/TwoIsland_PokemonCenter_1F/header.inc" + .include "data/maps/TwoIsland_PokemonCenter_2F/header.inc" + .include "data/maps/TwoIsland_Harbor/header.inc" + .include "data/maps/ThreeIsland_House1/header.inc" + .include "data/maps/ThreeIsland_PokemonCenter_1F/header.inc" + .include "data/maps/ThreeIsland_PokemonCenter_2F/header.inc" + .include "data/maps/ThreeIsland_Mart/header.inc" + .include "data/maps/ThreeIsland_House2/header.inc" + .include "data/maps/ThreeIsland_House3/header.inc" + .include "data/maps/ThreeIsland_House4/header.inc" + .include "data/maps/ThreeIsland_House5/header.inc" + .include "data/maps/FourIsland_PokemonDayCare/header.inc" + .include "data/maps/FourIsland_PokemonCenter_1F/header.inc" + .include "data/maps/FourIsland_PokemonCenter_2F/header.inc" + .include "data/maps/FourIsland_House1/header.inc" + .include "data/maps/FourIsland_LoreleisHouse/header.inc" + .include "data/maps/FourIsland_Harbor/header.inc" + .include "data/maps/FourIsland_House2/header.inc" + .include "data/maps/FourIsland_Mart/header.inc" + .include "data/maps/FiveIsland_PokemonCenter_1F/header.inc" + .include "data/maps/FiveIsland_PokemonCenter_2F/header.inc" + .include "data/maps/FiveIsland_Harbor/header.inc" + .include "data/maps/FiveIsland_House1/header.inc" + .include "data/maps/FiveIsland_House2/header.inc" + .include "data/maps/SixIsland_PokemonCenter_1F/header.inc" + .include "data/maps/SixIsland_PokemonCenter_2F/header.inc" + .include "data/maps/SixIsland_Harbor/header.inc" + .include "data/maps/SixIsland_House/header.inc" + .include "data/maps/SixIsland_Mart/header.inc" + .include "data/maps/ThreeIsland_Harbor/header.inc" + .include "data/maps/FiveIsland_ResortGorgeous_House/header.inc" + .include "data/maps/TwoIsland_CapeBrink_House/header.inc" + .include "data/maps/SixIsland_WaterPath_House1/header.inc" + .include "data/maps/SixIsland_WaterPath_House2/header.inc" + .include "data/maps/SevenIsland_SevaultCanyon_House/header.inc" -- cgit v1.2.3 From 799e971efef15b66345b255d57e94780733f667a Mon Sep 17 00:00:00 2001 From: garak Date: Thu, 18 Apr 2019 11:03:10 -0400 Subject: fix map events names --- data/maps/BirthIsland_Exterior/header.inc | 4 ++-- data/maps/BirthIsland_Harbor/header.inc | 4 ++-- data/maps/CeladonCity/header.inc | 4 ++-- data/maps/CeladonCity_Condominiums_1F/header.inc | 4 ++-- data/maps/CeladonCity_Condominiums_2F/header.inc | 4 ++-- data/maps/CeladonCity_Condominiums_3F/header.inc | 4 ++-- data/maps/CeladonCity_Condominiums_Roof/header.inc | 4 ++-- data/maps/CeladonCity_Condominiums_RoofRoom/header.inc | 4 ++-- data/maps/CeladonCity_DepartmentStore_1F/header.inc | 4 ++-- data/maps/CeladonCity_DepartmentStore_2F/header.inc | 4 ++-- data/maps/CeladonCity_DepartmentStore_3F/header.inc | 4 ++-- data/maps/CeladonCity_DepartmentStore_4F/header.inc | 4 ++-- data/maps/CeladonCity_DepartmentStore_5F/header.inc | 4 ++-- data/maps/CeladonCity_DepartmentStore_Elevator/header.inc | 4 ++-- data/maps/CeladonCity_DepartmentStore_Roof/header.inc | 4 ++-- data/maps/CeladonCity_GameCorner/header.inc | 4 ++-- data/maps/CeladonCity_GameCorner_PrizeRoom/header.inc | 4 ++-- data/maps/CeladonCity_Gym/header.inc | 4 ++-- data/maps/CeladonCity_Hotel/header.inc | 4 ++-- data/maps/CeladonCity_House1/header.inc | 4 ++-- data/maps/CeladonCity_PokemonCenter_1F/header.inc | 4 ++-- data/maps/CeladonCity_PokemonCenter_2F/header.inc | 4 ++-- data/maps/CeladonCity_Restaurant/header.inc | 4 ++-- data/maps/CeruleanCave_1F/header.inc | 4 ++-- data/maps/CeruleanCave_2F/header.inc | 4 ++-- data/maps/CeruleanCave_B1F/header.inc | 4 ++-- data/maps/CeruleanCity/header.inc | 4 ++-- data/maps/CeruleanCity_BikeShop/header.inc | 4 ++-- data/maps/CeruleanCity_Gym/header.inc | 4 ++-- data/maps/CeruleanCity_House1/header.inc | 4 ++-- data/maps/CeruleanCity_House2/header.inc | 4 ++-- data/maps/CeruleanCity_House3/header.inc | 4 ++-- data/maps/CeruleanCity_House4/header.inc | 4 ++-- data/maps/CeruleanCity_House5/header.inc | 4 ++-- data/maps/CeruleanCity_Mart/header.inc | 4 ++-- data/maps/CeruleanCity_PokemonCenter_1F/header.inc | 4 ++-- data/maps/CeruleanCity_PokemonCenter_2F/header.inc | 4 ++-- data/maps/CinnabarIsland/header.inc | 4 ++-- data/maps/CinnabarIsland_Gym/header.inc | 4 ++-- data/maps/CinnabarIsland_Mart/header.inc | 4 ++-- data/maps/CinnabarIsland_PokemonCenter_1F/header.inc | 4 ++-- data/maps/CinnabarIsland_PokemonCenter_2F/header.inc | 4 ++-- data/maps/CinnabarIsland_PokemonLab_Entrance/header.inc | 4 ++-- data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/header.inc | 4 ++-- data/maps/CinnabarIsland_PokemonLab_Lounge/header.inc | 4 ++-- data/maps/CinnabarIsland_PokemonLab_ResearchRoom/header.inc | 4 ++-- data/maps/DiglettsCave_B1F/header.inc | 4 ++-- data/maps/DiglettsCave_NorthEntrance/header.inc | 4 ++-- data/maps/DiglettsCave_SouthEntrance/header.inc | 4 ++-- data/maps/FiveIsland/header.inc | 4 ++-- data/maps/FiveIsland_Harbor/header.inc | 4 ++-- data/maps/FiveIsland_House1/header.inc | 4 ++-- data/maps/FiveIsland_House2/header.inc | 4 ++-- data/maps/FiveIsland_LostCave_Entrance/header.inc | 4 ++-- data/maps/FiveIsland_LostCave_Room1/header.inc | 4 ++-- data/maps/FiveIsland_LostCave_Room10/header.inc | 4 ++-- data/maps/FiveIsland_LostCave_Room11/header.inc | 4 ++-- data/maps/FiveIsland_LostCave_Room12/header.inc | 4 ++-- data/maps/FiveIsland_LostCave_Room13/header.inc | 4 ++-- data/maps/FiveIsland_LostCave_Room14/header.inc | 4 ++-- data/maps/FiveIsland_LostCave_Room2/header.inc | 4 ++-- data/maps/FiveIsland_LostCave_Room3/header.inc | 4 ++-- data/maps/FiveIsland_LostCave_Room4/header.inc | 4 ++-- data/maps/FiveIsland_LostCave_Room5/header.inc | 4 ++-- data/maps/FiveIsland_LostCave_Room6/header.inc | 4 ++-- data/maps/FiveIsland_LostCave_Room7/header.inc | 4 ++-- data/maps/FiveIsland_LostCave_Room8/header.inc | 4 ++-- data/maps/FiveIsland_LostCave_Room9/header.inc | 4 ++-- data/maps/FiveIsland_Meadow/header.inc | 4 ++-- data/maps/FiveIsland_MemorialPillar/header.inc | 4 ++-- data/maps/FiveIsland_PokemonCenter_1F/header.inc | 4 ++-- data/maps/FiveIsland_PokemonCenter_2F/header.inc | 4 ++-- data/maps/FiveIsland_ResortGorgeous/header.inc | 4 ++-- data/maps/FiveIsland_ResortGorgeous_House/header.inc | 4 ++-- data/maps/FiveIsland_WaterLabyrinth/header.inc | 4 ++-- data/maps/FourIsland/header.inc | 4 ++-- data/maps/FourIsland_Harbor/header.inc | 4 ++-- data/maps/FourIsland_House1/header.inc | 4 ++-- data/maps/FourIsland_House2/header.inc | 4 ++-- data/maps/FourIsland_IcefallCave_1F/header.inc | 4 ++-- data/maps/FourIsland_IcefallCave_Entrance/header.inc | 4 ++-- data/maps/FourIsland_LoreleisHouse/header.inc | 4 ++-- data/maps/FourIsland_Mart/header.inc | 4 ++-- data/maps/FourIsland_PokemonCenter_1F/header.inc | 4 ++-- data/maps/FourIsland_PokemonCenter_2F/header.inc | 4 ++-- data/maps/FourIsland_PokemonDayCare/header.inc | 4 ++-- data/maps/FuchsiaCity/header.inc | 4 ++-- data/maps/FuchsiaCity_Building1/header.inc | 4 ++-- data/maps/FuchsiaCity_Gym/header.inc | 4 ++-- data/maps/FuchsiaCity_House1/header.inc | 4 ++-- data/maps/FuchsiaCity_House2/header.inc | 4 ++-- data/maps/FuchsiaCity_House3/header.inc | 4 ++-- data/maps/FuchsiaCity_Mart/header.inc | 4 ++-- data/maps/FuchsiaCity_PokemonCenter_1F/header.inc | 4 ++-- data/maps/FuchsiaCity_PokemonCenter_2F/header.inc | 4 ++-- data/maps/FuchsiaCity_SafariZone_Entrance/header.inc | 4 ++-- data/maps/FuchsiaCity_ZooBuilding/header.inc | 4 ++-- data/maps/IndigoPlateau_Exterior/header.inc | 4 ++-- data/maps/IndigoPlateau_PokemonCenter_1F/header.inc | 4 ++-- data/maps/IndigoPlateau_PokemonCenter_2F/header.inc | 4 ++-- data/maps/LavenderTown/header.inc | 4 ++-- data/maps/LavenderTown_House1/header.inc | 4 ++-- data/maps/LavenderTown_House2/header.inc | 4 ++-- data/maps/LavenderTown_Mart/header.inc | 4 ++-- data/maps/LavenderTown_PokemonCenter_1F/header.inc | 4 ++-- data/maps/LavenderTown_PokemonCenter_2F/header.inc | 4 ++-- data/maps/LavenderTown_VolunteerPokemonHouse/header.inc | 4 ++-- data/maps/MtEmber_Exterior/header.inc | 4 ++-- data/maps/MtEmber_RubyPath_B1F/header.inc | 4 ++-- data/maps/MtEmber_RubyPath_B1F_Stairs/header.inc | 4 ++-- data/maps/MtEmber_RubyPath_B2F/header.inc | 4 ++-- data/maps/MtEmber_RubyPath_B2F_Stairs/header.inc | 4 ++-- data/maps/MtEmber_RubyPath_B3F/header.inc | 4 ++-- data/maps/MtEmber_RubyPath_B4F/header.inc | 4 ++-- data/maps/MtEmber_RubyPath_B5F/header.inc | 4 ++-- data/maps/MtEmber_Summit/header.inc | 4 ++-- data/maps/MtEmber_SummitPath_1F/header.inc | 4 ++-- data/maps/MtEmber_SummitPath_2F/header.inc | 4 ++-- data/maps/MtEmber_SummitPath_3F/header.inc | 4 ++-- data/maps/MtMoon_1F/header.inc | 4 ++-- data/maps/MtMoon_B1F/header.inc | 4 ++-- data/maps/MtMoon_B2F/header.inc | 4 ++-- data/maps/NavelRock_1F/header.inc | 4 ++-- data/maps/NavelRock_B1F/header.inc | 4 ++-- data/maps/NavelRock_Base/header.inc | 4 ++-- data/maps/NavelRock_BasePath_B10F/header.inc | 4 ++-- data/maps/NavelRock_BasePath_B11F/header.inc | 4 ++-- data/maps/NavelRock_BasePath_B1F/header.inc | 4 ++-- data/maps/NavelRock_BasePath_B2F/header.inc | 4 ++-- data/maps/NavelRock_BasePath_B3F/header.inc | 4 ++-- data/maps/NavelRock_BasePath_B4F/header.inc | 4 ++-- data/maps/NavelRock_BasePath_B5F/header.inc | 4 ++-- data/maps/NavelRock_BasePath_B6F/header.inc | 4 ++-- data/maps/NavelRock_BasePath_B7F/header.inc | 4 ++-- data/maps/NavelRock_BasePath_B8F/header.inc | 4 ++-- data/maps/NavelRock_BasePath_B9F/header.inc | 4 ++-- data/maps/NavelRock_Exterior/header.inc | 4 ++-- data/maps/NavelRock_Fork/header.inc | 4 ++-- data/maps/NavelRock_Harbor/header.inc | 4 ++-- data/maps/NavelRock_Summit/header.inc | 4 ++-- data/maps/NavelRock_SummitPath_2F/header.inc | 4 ++-- data/maps/NavelRock_SummitPath_3F/header.inc | 4 ++-- data/maps/NavelRock_SummitPath_4F/header.inc | 4 ++-- data/maps/NavelRock_SummitPath_5F/header.inc | 4 ++-- data/maps/OneIsland/header.inc | 4 ++-- data/maps/OneIsland_Harbor/header.inc | 4 ++-- data/maps/OneIsland_House1/header.inc | 4 ++-- data/maps/OneIsland_House2/header.inc | 4 ++-- data/maps/OneIsland_KindleRoad/header.inc | 4 ++-- data/maps/OneIsland_KindleRoad_EmberSpa/header.inc | 4 ++-- data/maps/OneIsland_PokemonCenter_1F/header.inc | 4 ++-- data/maps/OneIsland_PokemonCenter_2F/header.inc | 4 ++-- data/maps/OneIsland_TreasureBeach/header.inc | 4 ++-- data/maps/PalletTown/header.inc | 4 ++-- data/maps/PalletTown_GarysHouse/header.inc | 4 ++-- data/maps/PalletTown_PlayersHouse_1F/header.inc | 4 ++-- data/maps/PalletTown_PlayersHouse_2F/header.inc | 4 ++-- data/maps/PalletTown_ProfessorOaksLab/header.inc | 4 ++-- data/maps/PewterCity/header.inc | 4 ++-- data/maps/PewterCity_Gym/header.inc | 4 ++-- data/maps/PewterCity_House1/header.inc | 4 ++-- data/maps/PewterCity_House2/header.inc | 4 ++-- data/maps/PewterCity_Mart/header.inc | 4 ++-- data/maps/PewterCity_Museum_1F/header.inc | 4 ++-- data/maps/PewterCity_Museum_2F/header.inc | 4 ++-- data/maps/PewterCity_PokemonCenter_1F/header.inc | 4 ++-- data/maps/PewterCity_PokemonCenter_2F/header.inc | 4 ++-- data/maps/PokemonLeague_AgathasRoom/header.inc | 4 ++-- data/maps/PokemonLeague_BrunosRoom/header.inc | 4 ++-- data/maps/PokemonLeague_ChampionsRoom/header.inc | 4 ++-- data/maps/PokemonLeague_HallOfFame/header.inc | 4 ++-- data/maps/PokemonLeague_LancesRoom/header.inc | 4 ++-- data/maps/PokemonLeague_LoreleisRoom/header.inc | 4 ++-- data/maps/PokemonMansion_1F/header.inc | 4 ++-- data/maps/PokemonMansion_2F/header.inc | 4 ++-- data/maps/PokemonMansion_3F/header.inc | 4 ++-- data/maps/PokemonMansion_B1F/header.inc | 4 ++-- data/maps/PokemonTower_1F/header.inc | 4 ++-- data/maps/PokemonTower_2F/header.inc | 4 ++-- data/maps/PokemonTower_3F/header.inc | 4 ++-- data/maps/PokemonTower_4F/header.inc | 4 ++-- data/maps/PokemonTower_5F/header.inc | 4 ++-- data/maps/PokemonTower_6F/header.inc | 4 ++-- data/maps/PokemonTower_7F/header.inc | 4 ++-- data/maps/PowerPlant/header.inc | 4 ++-- data/maps/RockTunnel_1F/header.inc | 4 ++-- data/maps/RockTunnel_B1F/header.inc | 4 ++-- data/maps/RocketHideout_B1F/header.inc | 4 ++-- data/maps/RocketHideout_B2F/header.inc | 4 ++-- data/maps/RocketHideout_B3F/header.inc | 4 ++-- data/maps/RocketHideout_B4F/header.inc | 4 ++-- data/maps/RocketHideout_Elevator/header.inc | 4 ++-- data/maps/Route1/header.inc | 4 ++-- data/maps/Route10/header.inc | 4 ++-- data/maps/Route10_PokemonCenter_1F/header.inc | 4 ++-- data/maps/Route10_PokemonCenter_2F/header.inc | 4 ++-- data/maps/Route11/header.inc | 4 ++-- data/maps/Route11_EastEntrance_1F/header.inc | 4 ++-- data/maps/Route11_EastEntrance_2F/header.inc | 4 ++-- data/maps/Route12/header.inc | 4 ++-- data/maps/Route12_FishingHouse/header.inc | 4 ++-- data/maps/Route12_NorthEntrance_1F/header.inc | 4 ++-- data/maps/Route12_NorthEntrance_2F/header.inc | 4 ++-- data/maps/Route13/header.inc | 4 ++-- data/maps/Route14/header.inc | 4 ++-- data/maps/Route15/header.inc | 4 ++-- data/maps/Route15_WestEntrance_1F/header.inc | 4 ++-- data/maps/Route15_WestEntrance_2F/header.inc | 4 ++-- data/maps/Route16/header.inc | 4 ++-- data/maps/Route16_House/header.inc | 4 ++-- data/maps/Route16_NorthEntrance_1F/header.inc | 4 ++-- data/maps/Route16_NorthEntrance_2F/header.inc | 4 ++-- data/maps/Route17/header.inc | 4 ++-- data/maps/Route18/header.inc | 4 ++-- data/maps/Route18_EastEntrance_1F/header.inc | 4 ++-- data/maps/Route18_EastEntrance_2F/header.inc | 4 ++-- data/maps/Route19/header.inc | 4 ++-- data/maps/Route2/header.inc | 4 ++-- data/maps/Route20/header.inc | 4 ++-- data/maps/Route21_North/header.inc | 4 ++-- data/maps/Route21_South/header.inc | 4 ++-- data/maps/Route22/header.inc | 4 ++-- data/maps/Route22_NorthEntrance/header.inc | 4 ++-- data/maps/Route23/header.inc | 4 ++-- data/maps/Route24/header.inc | 4 ++-- data/maps/Route25/header.inc | 4 ++-- data/maps/Route25_SeaCottage/header.inc | 4 ++-- data/maps/Route2_EastBuilding/header.inc | 4 ++-- data/maps/Route2_House/header.inc | 4 ++-- data/maps/Route2_ViridianForest_NorthEntrance/header.inc | 4 ++-- data/maps/Route2_ViridianForest_SouthEntrance/header.inc | 4 ++-- data/maps/Route3/header.inc | 4 ++-- data/maps/Route4/header.inc | 4 ++-- data/maps/Route4_PokemonCenter_1F/header.inc | 4 ++-- data/maps/Route4_PokemonCenter_2F/header.inc | 4 ++-- data/maps/Route5/header.inc | 4 ++-- data/maps/Route5_PokemonDayCare/header.inc | 4 ++-- data/maps/Route5_SouthEntrance/header.inc | 4 ++-- data/maps/Route6/header.inc | 4 ++-- data/maps/Route6_NorthEntrance/header.inc | 4 ++-- data/maps/Route7/header.inc | 4 ++-- data/maps/Route7_EastEntrance/header.inc | 4 ++-- data/maps/Route8/header.inc | 4 ++-- data/maps/Route8_WestEntrance/header.inc | 4 ++-- data/maps/Route9/header.inc | 4 ++-- data/maps/SSAnne_1F_Corridor/header.inc | 4 ++-- data/maps/SSAnne_1F_Room1/header.inc | 4 ++-- data/maps/SSAnne_1F_Room11/header.inc | 4 ++-- data/maps/SSAnne_1F_Room12/header.inc | 4 ++-- data/maps/SSAnne_1F_Room2/header.inc | 4 ++-- data/maps/SSAnne_1F_Room3/header.inc | 4 ++-- data/maps/SSAnne_1F_Room4/header.inc | 4 ++-- data/maps/SSAnne_1F_Room5/header.inc | 4 ++-- data/maps/SSAnne_1F_Room6/header.inc | 4 ++-- data/maps/SSAnne_1F_Room7/header.inc | 4 ++-- data/maps/SSAnne_2F_Corridor/header.inc | 4 ++-- data/maps/SSAnne_2F_Room1/header.inc | 4 ++-- data/maps/SSAnne_2F_Room2/header.inc | 4 ++-- data/maps/SSAnne_2F_Room3/header.inc | 4 ++-- data/maps/SSAnne_2F_Room4/header.inc | 4 ++-- data/maps/SSAnne_2F_Room5/header.inc | 4 ++-- data/maps/SSAnne_2F_Room6/header.inc | 4 ++-- data/maps/SSAnne_3F_Corridor/header.inc | 4 ++-- data/maps/SSAnne_B1F_Corridor/header.inc | 4 ++-- data/maps/SSAnne_B1F_Room1/header.inc | 4 ++-- data/maps/SSAnne_B1F_Room2/header.inc | 4 ++-- data/maps/SSAnne_B1F_Room3/header.inc | 4 ++-- data/maps/SSAnne_B1F_Room4/header.inc | 4 ++-- data/maps/SSAnne_B1F_Room5/header.inc | 4 ++-- data/maps/SSAnne_CaptainsOffice/header.inc | 4 ++-- data/maps/SSAnne_CaptainsOffice2/header.inc | 4 ++-- data/maps/SSAnne_CaptainsOffice3/header.inc | 4 ++-- data/maps/SSAnne_CaptainsOffice4/header.inc | 4 ++-- data/maps/SSAnne_CaptainsOffice5/header.inc | 4 ++-- data/maps/SSAnne_CaptainsOffice9/header.inc | 4 ++-- data/maps/SSAnne_Deck/header.inc | 4 ++-- data/maps/SSAnne_Exterior/header.inc | 4 ++-- data/maps/SSAnne_Kitchen/header.inc | 4 ++-- data/maps/SSAnne_Kitchen3/header.inc | 4 ++-- data/maps/SafariZone_Building1/header.inc | 4 ++-- data/maps/SafariZone_Building2/header.inc | 4 ++-- data/maps/SafariZone_Building3/header.inc | 4 ++-- data/maps/SafariZone_Building4/header.inc | 4 ++-- data/maps/SafariZone_Center/header.inc | 4 ++-- data/maps/SafariZone_East/header.inc | 4 ++-- data/maps/SafariZone_North/header.inc | 4 ++-- data/maps/SafariZone_SecretHouse/header.inc | 4 ++-- data/maps/SafariZone_West/header.inc | 4 ++-- data/maps/SaffronCity/header.inc | 4 ++-- data/maps/SaffronCity_Dojo/header.inc | 4 ++-- data/maps/SaffronCity_Duplicate/header.inc | 4 ++-- data/maps/SaffronCity_Gym/header.inc | 4 ++-- data/maps/SaffronCity_House1_1F/header.inc | 4 ++-- data/maps/SaffronCity_House1_2F/header.inc | 4 ++-- data/maps/SaffronCity_House2/header.inc | 4 ++-- data/maps/SaffronCity_House3/header.inc | 4 ++-- data/maps/SaffronCity_Mart/header.inc | 4 ++-- data/maps/SaffronCity_PokemonCenter_1F/header.inc | 4 ++-- data/maps/SaffronCity_PokemonCenter_2F/header.inc | 4 ++-- data/maps/SaffronCity_PokemonTrainerFanClub/header.inc | 4 ++-- data/maps/SeafoamIslands_1F/header.inc | 4 ++-- data/maps/SeafoamIslands_B1F/header.inc | 4 ++-- data/maps/SeafoamIslands_B2F/header.inc | 4 ++-- data/maps/SeafoamIslands_B3F/header.inc | 4 ++-- data/maps/SeafoamIslands_B4F/header.inc | 4 ++-- data/maps/SevenIsland/header.inc | 4 ++-- data/maps/SevenIsland_Harbor/header.inc | 4 ++-- data/maps/SevenIsland_House_Room1/header.inc | 4 ++-- data/maps/SevenIsland_House_Room2/header.inc | 4 ++-- data/maps/SevenIsland_Mart/header.inc | 4 ++-- data/maps/SevenIsland_PokemonCenter_1F/header.inc | 4 ++-- data/maps/SevenIsland_PokemonCenter_2F/header.inc | 4 ++-- data/maps/SevenIsland_SeavaultCanyon_TanobyKey/header.inc | 4 ++-- data/maps/SevenIsland_SevaultCanyon/header.inc | 4 ++-- data/maps/SevenIsland_SevaultCanyon_Entrance/header.inc | 4 ++-- data/maps/SevenIsland_SevaultCanyon_House/header.inc | 4 ++-- data/maps/SevenIsland_TanobyRuins/header.inc | 4 ++-- data/maps/SevenIsland_TanobyRuins_DilfordChamber/header.inc | 4 ++-- data/maps/SevenIsland_TanobyRuins_LiptooChamber/header.inc | 4 ++-- data/maps/SevenIsland_TanobyRuins_MoneanChamber/header.inc | 4 ++-- data/maps/SevenIsland_TanobyRuins_RixyChamber/header.inc | 4 ++-- data/maps/SevenIsland_TanobyRuins_ScufibChamber/header.inc | 4 ++-- data/maps/SevenIsland_TanobyRuins_ViapoisChamber/header.inc | 4 ++-- data/maps/SevenIsland_TanobyRuins_WeepthChamber/header.inc | 4 ++-- data/maps/SevenIsland_TrainerTower/header.inc | 4 ++-- data/maps/SevenIsland_TrainerTower_1F/header.inc | 4 ++-- data/maps/SevenIsland_TrainerTower_2F/header.inc | 4 ++-- data/maps/SevenIsland_TrainerTower_3F/header.inc | 4 ++-- data/maps/SevenIsland_TrainerTower_4F/header.inc | 4 ++-- data/maps/SevenIsland_TrainerTower_5F/header.inc | 4 ++-- data/maps/SevenIsland_TrainerTower_6F/header.inc | 4 ++-- data/maps/SevenIsland_TrainerTower_7F/header.inc | 4 ++-- data/maps/SevenIsland_TrainerTower_8F/header.inc | 4 ++-- data/maps/SevenIsland_TrainerTower_Elevator/header.inc | 4 ++-- data/maps/SevenIsland_TrainerTower_Lobby/header.inc | 4 ++-- data/maps/SevenIsland_TrainerTower_Roof/header.inc | 4 ++-- data/maps/SilphCo_10F/header.inc | 4 ++-- data/maps/SilphCo_11F/header.inc | 4 ++-- data/maps/SilphCo_1F/header.inc | 4 ++-- data/maps/SilphCo_2F/header.inc | 4 ++-- data/maps/SilphCo_3F/header.inc | 4 ++-- data/maps/SilphCo_4F/header.inc | 4 ++-- data/maps/SilphCo_5F/header.inc | 4 ++-- data/maps/SilphCo_6F/header.inc | 4 ++-- data/maps/SilphCo_7F/header.inc | 4 ++-- data/maps/SilphCo_8F/header.inc | 4 ++-- data/maps/SilphCo_9F/header.inc | 4 ++-- data/maps/SilphCo_Elevator/header.inc | 4 ++-- data/maps/SixIsland/header.inc | 4 ++-- data/maps/SixIsland_DottedHole_B1F/header.inc | 4 ++-- data/maps/SixIsland_DottedHole_B2F/header.inc | 4 ++-- data/maps/SixIsland_DottedHole_B3F/header.inc | 4 ++-- data/maps/SixIsland_DottedHole_SapphireRoom/header.inc | 4 ++-- data/maps/SixIsland_GreenPath/header.inc | 4 ++-- data/maps/SixIsland_Harbor/header.inc | 4 ++-- data/maps/SixIsland_House/header.inc | 4 ++-- data/maps/SixIsland_Mart/header.inc | 4 ++-- data/maps/SixIsland_OutcastIsland/header.inc | 4 ++-- data/maps/SixIsland_PokemonCenter_1F/header.inc | 4 ++-- data/maps/SixIsland_PokemonCenter_2F/header.inc | 4 ++-- data/maps/SixIsland_RuinValley/header.inc | 4 ++-- data/maps/SixIsland_WaterPath/header.inc | 4 ++-- data/maps/SixIsland_WaterPath_House1/header.inc | 4 ++-- data/maps/SixIsland_WaterPath_House2/header.inc | 4 ++-- data/maps/ThreeIsland/header.inc | 4 ++-- data/maps/ThreeIsland_BerryForest/header.inc | 4 ++-- data/maps/ThreeIsland_BondBridge/header.inc | 4 ++-- data/maps/ThreeIsland_DunsparceTunnel/header.inc | 4 ++-- data/maps/ThreeIsland_Harbor/header.inc | 4 ++-- data/maps/ThreeIsland_House1/header.inc | 4 ++-- data/maps/ThreeIsland_House2/header.inc | 4 ++-- data/maps/ThreeIsland_House3/header.inc | 4 ++-- data/maps/ThreeIsland_House4/header.inc | 4 ++-- data/maps/ThreeIsland_House5/header.inc | 4 ++-- data/maps/ThreeIsland_Mart/header.inc | 4 ++-- data/maps/ThreeIsland_PokemonCenter_1F/header.inc | 4 ++-- data/maps/ThreeIsland_PokemonCenter_2F/header.inc | 4 ++-- data/maps/ThreeIsland_Port/header.inc | 4 ++-- data/maps/TwoIsland/header.inc | 4 ++-- data/maps/TwoIsland_CapeBrink/header.inc | 4 ++-- data/maps/TwoIsland_CapeBrink_House/header.inc | 4 ++-- data/maps/TwoIsland_Harbor/header.inc | 4 ++-- data/maps/TwoIsland_House/header.inc | 4 ++-- data/maps/TwoIsland_JoyfulGameCorner/header.inc | 4 ++-- data/maps/TwoIsland_PokemonCenter_1F/header.inc | 4 ++-- data/maps/TwoIsland_PokemonCenter_2F/header.inc | 4 ++-- data/maps/UndergroundPath_EastEntrance/header.inc | 4 ++-- data/maps/UndergroundPath_EastWestTunnel/header.inc | 4 ++-- data/maps/UndergroundPath_NorthEntrance/header.inc | 4 ++-- data/maps/UndergroundPath_NorthSouthTunnel/header.inc | 4 ++-- data/maps/UndergroundPath_SouthEntrance/header.inc | 4 ++-- data/maps/UndergroundPath_WestEntrance/header.inc | 4 ++-- data/maps/UnknownMap_00_00/header.inc | 4 ++-- data/maps/UnknownMap_00_01/header.inc | 4 ++-- data/maps/UnknownMap_00_02/header.inc | 4 ++-- data/maps/UnknownMap_00_03/header.inc | 4 ++-- data/maps/UnknownMap_00_04/header.inc | 4 ++-- data/maps/UnknownMap_03_50/header.inc | 4 ++-- data/maps/UnknownMap_03_51/header.inc | 4 ++-- data/maps/UnknownMap_03_52/header.inc | 4 ++-- data/maps/UnknownMap_03_53/header.inc | 4 ++-- data/maps/UnknownMap_18_01/header.inc | 4 ++-- data/maps/UnusedHouse_27_00/header.inc | 4 ++-- data/maps/UnusedHouse_29_00/header.inc | 4 ++-- data/maps/UnusedHouse_31_05/header.inc | 4 ++-- data/maps/VermilionCity/header.inc | 4 ++-- data/maps/VermilionCity_Gym/header.inc | 4 ++-- data/maps/VermilionCity_House1/header.inc | 4 ++-- data/maps/VermilionCity_House2/header.inc | 4 ++-- data/maps/VermilionCity_House3/header.inc | 4 ++-- data/maps/VermilionCity_Mart/header.inc | 4 ++-- data/maps/VermilionCity_PokemonCenter_1F/header.inc | 4 ++-- data/maps/VermilionCity_PokemonCenter_2F/header.inc | 4 ++-- data/maps/VermilionCity_PokemonFanClub/header.inc | 4 ++-- data/maps/VictoryRoad_1F/header.inc | 4 ++-- data/maps/VictoryRoad_2F/header.inc | 4 ++-- data/maps/VictoryRoad_3F/header.inc | 4 ++-- data/maps/ViridianCity/header.inc | 4 ++-- data/maps/ViridianCity_Gym/header.inc | 4 ++-- data/maps/ViridianCity_House1/header.inc | 4 ++-- data/maps/ViridianCity_House2/header.inc | 4 ++-- data/maps/ViridianCity_Mart/header.inc | 4 ++-- data/maps/ViridianCity_PokemonCenter_1F/header.inc | 4 ++-- data/maps/ViridianCity_PokemonCenter_2F/header.inc | 4 ++-- data/maps/ViridianForest/header.inc | 4 ++-- 425 files changed, 850 insertions(+), 850 deletions(-) (limited to 'data/maps') diff --git a/data/maps/BirthIsland_Exterior/header.inc b/data/maps/BirthIsland_Exterior/header.inc index 5bcc49c74..2634948be 100644 --- a/data/maps/BirthIsland_Exterior/header.inc +++ b/data/maps/BirthIsland_Exterior/header.inc @@ -1,7 +1,7 @@ BirthIsland_Exterior:: @ 83505A8 .4byte BirthIsland_Exterior_Layout @ 0x8348380 - .4byte gMapEvents_BirthIsland_Exterior @ 0x83B4C1C - .4byte gMapScripts_BirthIsland_Exterior @ 0x8165203 + .4byte BirthIsland_Exterior_MapEvents @ 0x83B4C1C + .4byte BirthIsland_Exterior_MapScripts @ 0x8165203 .4byte NULL .2byte 0xFFFF .2byte 342 diff --git a/data/maps/BirthIsland_Harbor/header.inc b/data/maps/BirthIsland_Harbor/header.inc index a082ac025..68253d8df 100644 --- a/data/maps/BirthIsland_Harbor/header.inc +++ b/data/maps/BirthIsland_Harbor/header.inc @@ -1,7 +1,7 @@ BirthIsland_Harbor:: @ 83505E0 .4byte Island_Harbor_Layout @ 0x8343FB8 - .4byte gMapEvents_BirthIsland_Harbor @ 0x83B4D24 - .4byte gMapScripts_BirthIsland_Harbor @ 0x81653E6 + .4byte BirthIsland_Harbor_MapEvents @ 0x83B4D24 + .4byte BirthIsland_Harbor_MapScripts @ 0x81653E6 .4byte NULL .2byte 0xFFFF .2byte 315 diff --git a/data/maps/CeladonCity/header.inc b/data/maps/CeladonCity/header.inc index 146c03ab2..2ec3fc62c 100644 --- a/data/maps/CeladonCity/header.inc +++ b/data/maps/CeladonCity/header.inc @@ -1,7 +1,7 @@ CeladonCity:: @ 83506C0 .4byte CeladonCity_Layout @ 0x82E2818 - .4byte gMapEvents_CeladonCity @ 0x83B5898 - .4byte gMapScripts_CeladonCity @ 0x8166C8F + .4byte CeladonCity_MapEvents @ 0x83B5898 + .4byte CeladonCity_MapScripts @ 0x8166C8F .4byte CeladonCity_MapConnections @ 0x835285C .2byte BGM_FRLG_CELADON_CITY .2byte 84 diff --git a/data/maps/CeladonCity_Condominiums_1F/header.inc b/data/maps/CeladonCity_Condominiums_1F/header.inc index 9b842ae2d..b059b11fd 100644 --- a/data/maps/CeladonCity_Condominiums_1F/header.inc +++ b/data/maps/CeladonCity_Condominiums_1F/header.inc @@ -1,7 +1,7 @@ CeladonCity_Condominiums_1F:: @ 83512AC .4byte CeladonCity_Condominiums_1F_Layout @ 0x831A7DC - .4byte gMapEvents_CeladonCity_Condominiums_1F @ 0x83BB538 - .4byte gMapScripts_CeladonCity_Condominiums_1F @ 0x816C320 + .4byte CeladonCity_Condominiums_1F_MapEvents @ 0x83BB538 + .4byte CeladonCity_Condominiums_1F_MapScripts @ 0x816C320 .4byte NULL .2byte BGM_FRLG_CELADON_CITY .2byte 184 diff --git a/data/maps/CeladonCity_Condominiums_2F/header.inc b/data/maps/CeladonCity_Condominiums_2F/header.inc index 46bc1451a..2a380d25d 100644 --- a/data/maps/CeladonCity_Condominiums_2F/header.inc +++ b/data/maps/CeladonCity_Condominiums_2F/header.inc @@ -1,7 +1,7 @@ CeladonCity_Condominiums_2F:: @ 83512C8 .4byte CeladonCity_Condominiums_2F_Layout @ 0x831AA58 - .4byte gMapEvents_CeladonCity_Condominiums_2F @ 0x83BB5B4 - .4byte gMapScripts_CeladonCity_Condominiums_2F @ 0x816C3D0 + .4byte CeladonCity_Condominiums_2F_MapEvents @ 0x83BB5B4 + .4byte CeladonCity_Condominiums_2F_MapScripts @ 0x816C3D0 .4byte NULL .2byte BGM_FRLG_CELADON_CITY .2byte 185 diff --git a/data/maps/CeladonCity_Condominiums_3F/header.inc b/data/maps/CeladonCity_Condominiums_3F/header.inc index 3af5071bb..e945a6abe 100644 --- a/data/maps/CeladonCity_Condominiums_3F/header.inc +++ b/data/maps/CeladonCity_Condominiums_3F/header.inc @@ -1,7 +1,7 @@ CeladonCity_Condominiums_3F:: @ 83512E4 .4byte CeladonCity_Condominiums_3F_Layout @ 0x831ACD4 - .4byte gMapEvents_CeladonCity_Condominiums_3F @ 0x83BB6A8 - .4byte gMapScripts_CeladonCity_Condominiums_3F @ 0x816C3DA + .4byte CeladonCity_Condominiums_3F_MapEvents @ 0x83BB6A8 + .4byte CeladonCity_Condominiums_3F_MapScripts @ 0x816C3DA .4byte NULL .2byte BGM_FRLG_CELADON_CITY .2byte 186 diff --git a/data/maps/CeladonCity_Condominiums_Roof/header.inc b/data/maps/CeladonCity_Condominiums_Roof/header.inc index 8ae163248..e858a73f0 100644 --- a/data/maps/CeladonCity_Condominiums_Roof/header.inc +++ b/data/maps/CeladonCity_Condominiums_Roof/header.inc @@ -1,7 +1,7 @@ CeladonCity_Condominiums_Roof:: @ 8351300 .4byte CeladonCity_Condominiums_Roof_Layout @ 0x831AF7C - .4byte gMapEvents_CeladonCity_Condominiums_Roof @ 0x83BB6EC - .4byte gMapScripts_CeladonCity_Condominiums_Roof @ 0x816C459 + .4byte CeladonCity_Condominiums_Roof_MapEvents @ 0x83BB6EC + .4byte CeladonCity_Condominiums_Roof_MapScripts @ 0x816C459 .4byte NULL .2byte BGM_FRLG_CELADON_CITY .2byte 187 diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/header.inc b/data/maps/CeladonCity_Condominiums_RoofRoom/header.inc index 7bc9c4eb8..23c2ed330 100644 --- a/data/maps/CeladonCity_Condominiums_RoofRoom/header.inc +++ b/data/maps/CeladonCity_Condominiums_RoofRoom/header.inc @@ -1,7 +1,7 @@ CeladonCity_Condominiums_RoofRoom:: @ 835131C .4byte CeladonCity_Condominiums_RoofRoom_Layout @ 0x831B054 - .4byte gMapEvents_CeladonCity_Condominiums_RoofRoom @ 0x83BB76C - .4byte gMapScripts_CeladonCity_Condominiums_RoofRoom @ 0x816C463 + .4byte CeladonCity_Condominiums_RoofRoom_MapEvents @ 0x83BB76C + .4byte CeladonCity_Condominiums_RoofRoom_MapScripts @ 0x816C463 .4byte NULL .2byte BGM_FRLG_CELADON_CITY .2byte 188 diff --git a/data/maps/CeladonCity_DepartmentStore_1F/header.inc b/data/maps/CeladonCity_DepartmentStore_1F/header.inc index 3ddab14ae..07b027ede 100644 --- a/data/maps/CeladonCity_DepartmentStore_1F/header.inc +++ b/data/maps/CeladonCity_DepartmentStore_1F/header.inc @@ -1,7 +1,7 @@ CeladonCity_DepartmentStore_1F:: @ 83511E8 .4byte CeladonCity_DepartmentStore_1F_Layout @ 0x831B5FC - .4byte gMapEvents_CeladonCity_DepartmentStore_1F @ 0x83BB0EC - .4byte gMapScripts_CeladonCity_DepartmentStore_1F @ 0x816BAD8 + .4byte CeladonCity_DepartmentStore_1F_MapEvents @ 0x83BB0EC + .4byte CeladonCity_DepartmentStore_1F_MapScripts @ 0x816BAD8 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 192 diff --git a/data/maps/CeladonCity_DepartmentStore_2F/header.inc b/data/maps/CeladonCity_DepartmentStore_2F/header.inc index 126b23342..48afe690e 100644 --- a/data/maps/CeladonCity_DepartmentStore_2F/header.inc +++ b/data/maps/CeladonCity_DepartmentStore_2F/header.inc @@ -1,7 +1,7 @@ CeladonCity_DepartmentStore_2F:: @ 8351204 .4byte CeladonCity_DepartmentStore_2F_Layout @ 0x831B7A8 - .4byte gMapEvents_CeladonCity_DepartmentStore_2F @ 0x83BB184 - .4byte gMapScripts_CeladonCity_DepartmentStore_2F @ 0x816BAF4 + .4byte CeladonCity_DepartmentStore_2F_MapEvents @ 0x83BB184 + .4byte CeladonCity_DepartmentStore_2F_MapScripts @ 0x816BAF4 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 193 diff --git a/data/maps/CeladonCity_DepartmentStore_3F/header.inc b/data/maps/CeladonCity_DepartmentStore_3F/header.inc index cb31d4ae4..9bfb8d3c4 100644 --- a/data/maps/CeladonCity_DepartmentStore_3F/header.inc +++ b/data/maps/CeladonCity_DepartmentStore_3F/header.inc @@ -1,7 +1,7 @@ CeladonCity_DepartmentStore_3F:: @ 8351220 .4byte CeladonCity_DepartmentStore_3F_Layout @ 0x831B954 - .4byte gMapEvents_CeladonCity_DepartmentStore_3F @ 0x83BB2AC - .4byte gMapScripts_CeladonCity_DepartmentStore_3F @ 0x816BB84 + .4byte CeladonCity_DepartmentStore_3F_MapEvents @ 0x83BB2AC + .4byte CeladonCity_DepartmentStore_3F_MapScripts @ 0x816BB84 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 194 diff --git a/data/maps/CeladonCity_DepartmentStore_4F/header.inc b/data/maps/CeladonCity_DepartmentStore_4F/header.inc index 5cd6b390a..e25a983da 100644 --- a/data/maps/CeladonCity_DepartmentStore_4F/header.inc +++ b/data/maps/CeladonCity_DepartmentStore_4F/header.inc @@ -1,7 +1,7 @@ CeladonCity_DepartmentStore_4F:: @ 835123C .4byte CeladonCity_DepartmentStore_4F_Layout @ 0x831BB00 - .4byte gMapEvents_CeladonCity_DepartmentStore_4F @ 0x83BB32C - .4byte gMapScripts_CeladonCity_DepartmentStore_4F @ 0x816BBEE + .4byte CeladonCity_DepartmentStore_4F_MapEvents @ 0x83BB32C + .4byte CeladonCity_DepartmentStore_4F_MapScripts @ 0x816BBEE .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 195 diff --git a/data/maps/CeladonCity_DepartmentStore_5F/header.inc b/data/maps/CeladonCity_DepartmentStore_5F/header.inc index 853a6e4f2..321174026 100644 --- a/data/maps/CeladonCity_DepartmentStore_5F/header.inc +++ b/data/maps/CeladonCity_DepartmentStore_5F/header.inc @@ -1,7 +1,7 @@ CeladonCity_DepartmentStore_5F:: @ 8351258 .4byte CeladonCity_DepartmentStore_5F_Layout @ 0x831BCAC - .4byte gMapEvents_CeladonCity_DepartmentStore_5F @ 0x83BB3C4 - .4byte gMapScripts_CeladonCity_DepartmentStore_5F @ 0x816BC40 + .4byte CeladonCity_DepartmentStore_5F_MapEvents @ 0x83BB3C4 + .4byte CeladonCity_DepartmentStore_5F_MapScripts @ 0x816BC40 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 196 diff --git a/data/maps/CeladonCity_DepartmentStore_Elevator/header.inc b/data/maps/CeladonCity_DepartmentStore_Elevator/header.inc index c78e6449a..e7086ace2 100644 --- a/data/maps/CeladonCity_DepartmentStore_Elevator/header.inc +++ b/data/maps/CeladonCity_DepartmentStore_Elevator/header.inc @@ -1,7 +1,7 @@ CeladonCity_DepartmentStore_Elevator:: @ 8351290 .4byte CeladonCity_DepartmentStore_Elevator_Layout @ 0x8319F70 - .4byte gMapEvents_CeladonCity_DepartmentStore_Elevator @ 0x83BB47C - .4byte gMapScripts_CeladonCity_DepartmentStore_Elevator @ 0x816C152 + .4byte CeladonCity_DepartmentStore_Elevator_MapEvents @ 0x83BB47C + .4byte CeladonCity_DepartmentStore_Elevator_MapScripts @ 0x816C152 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 179 diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/header.inc b/data/maps/CeladonCity_DepartmentStore_Roof/header.inc index a8839e6f9..bed42ffb5 100644 --- a/data/maps/CeladonCity_DepartmentStore_Roof/header.inc +++ b/data/maps/CeladonCity_DepartmentStore_Roof/header.inc @@ -1,7 +1,7 @@ CeladonCity_DepartmentStore_Roof:: @ 8351274 .4byte CeladonCity_DepartmentStore_Roof_Layout @ 0x831BEE4 - .4byte gMapEvents_CeladonCity_DepartmentStore_Roof @ 0x83BB440 - .4byte gMapScripts_CeladonCity_DepartmentStore_Roof @ 0x816BCCC + .4byte CeladonCity_DepartmentStore_Roof_MapEvents @ 0x83BB440 + .4byte CeladonCity_DepartmentStore_Roof_MapScripts @ 0x816BCCC .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 197 diff --git a/data/maps/CeladonCity_GameCorner/header.inc b/data/maps/CeladonCity_GameCorner/header.inc index 61c4177d9..dde1f5a6d 100644 --- a/data/maps/CeladonCity_GameCorner/header.inc +++ b/data/maps/CeladonCity_GameCorner/header.inc @@ -1,7 +1,7 @@ CeladonCity_GameCorner:: @ 8351370 .4byte CeladonCity_GameCorner_Layout @ 0x82D7168 - .4byte gMapEvents_CeladonCity_GameCorner @ 0x83BBB78 - .4byte gMapScripts_CeladonCity_GameCorner @ 0x816C646 + .4byte CeladonCity_GameCorner_MapEvents @ 0x83BBB78 + .4byte CeladonCity_GameCorner_MapScripts @ 0x816C646 .4byte NULL .2byte BGM_FRLG_GAMECORNER .2byte 27 diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/header.inc b/data/maps/CeladonCity_GameCorner_PrizeRoom/header.inc index 5577d1f3e..4db3fedfb 100644 --- a/data/maps/CeladonCity_GameCorner_PrizeRoom/header.inc +++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/header.inc @@ -1,7 +1,7 @@ CeladonCity_GameCorner_PrizeRoom:: @ 835138C .4byte CeladonCity_GameCorner_PrizeRoom_Layout @ 0x831B12C - .4byte gMapEvents_CeladonCity_GameCorner_PrizeRoom @ 0x83BBC1C - .4byte gMapScripts_CeladonCity_GameCorner_PrizeRoom @ 0x816CB75 + .4byte CeladonCity_GameCorner_PrizeRoom_MapEvents @ 0x83BBC1C + .4byte CeladonCity_GameCorner_PrizeRoom_MapScripts @ 0x816CB75 .4byte NULL .2byte BGM_FRLG_CELADON_CITY .2byte 189 diff --git a/data/maps/CeladonCity_Gym/header.inc b/data/maps/CeladonCity_Gym/header.inc index 3c04d2673..59ca7c533 100644 --- a/data/maps/CeladonCity_Gym/header.inc +++ b/data/maps/CeladonCity_Gym/header.inc @@ -1,7 +1,7 @@ CeladonCity_Gym:: @ 83513A8 .4byte CeladonCity_Gym_Layout @ 0x82D6370 - .4byte gMapEvents_CeladonCity_Gym @ 0x83BBD68 - .4byte gMapScripts_CeladonCity_Gym @ 0x816D060 + .4byte CeladonCity_Gym_MapEvents @ 0x83BBD68 + .4byte CeladonCity_Gym_MapScripts @ 0x816D060 .4byte NULL .2byte BGM_FRLG_GYM .2byte 15 diff --git a/data/maps/CeladonCity_Hotel/header.inc b/data/maps/CeladonCity_Hotel/header.inc index 553b4c924..b9aecb9a8 100644 --- a/data/maps/CeladonCity_Hotel/header.inc +++ b/data/maps/CeladonCity_Hotel/header.inc @@ -1,7 +1,7 @@ CeladonCity_Hotel:: @ 83513FC .4byte CeladonCity_Hotel_Layout @ 0x831B438 - .4byte gMapEvents_CeladonCity_Hotel @ 0x83BBF0C - .4byte gMapScripts_CeladonCity_Hotel @ 0x816D283 + .4byte CeladonCity_Hotel_MapEvents @ 0x83BBF0C + .4byte CeladonCity_Hotel_MapScripts @ 0x816D283 .4byte NULL .2byte BGM_FRLG_CELADON_CITY .2byte 191 diff --git a/data/maps/CeladonCity_House1/header.inc b/data/maps/CeladonCity_House1/header.inc index 37e671cce..6b0b740f1 100644 --- a/data/maps/CeladonCity_House1/header.inc +++ b/data/maps/CeladonCity_House1/header.inc @@ -1,7 +1,7 @@ CeladonCity_House1:: @ 83513E0 .4byte House5_Layout @ 0x82D6AF0 - .4byte gMapEvents_CeladonCity_House1 @ 0x83BBE80 - .4byte gMapScripts_CeladonCity_House1 @ 0x816D267 + .4byte CeladonCity_House1_MapEvents @ 0x83BBE80 + .4byte CeladonCity_House1_MapScripts @ 0x816D267 .4byte NULL .2byte BGM_FRLG_CELADON_CITY .2byte 21 diff --git a/data/maps/CeladonCity_PokemonCenter_1F/header.inc b/data/maps/CeladonCity_PokemonCenter_1F/header.inc index c29ce7f43..5875a816d 100644 --- a/data/maps/CeladonCity_PokemonCenter_1F/header.inc +++ b/data/maps/CeladonCity_PokemonCenter_1F/header.inc @@ -1,7 +1,7 @@ CeladonCity_PokemonCenter_1F:: @ 8351338 .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte gMapEvents_CeladonCity_PokemonCenter_1F @ 0x83BB800 - .4byte gMapScripts_CeladonCity_PokemonCenter_1F @ 0x816C5EC + .4byte CeladonCity_PokemonCenter_1F_MapEvents @ 0x83BB800 + .4byte CeladonCity_PokemonCenter_1F_MapScripts @ 0x816C5EC .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 8 diff --git a/data/maps/CeladonCity_PokemonCenter_2F/header.inc b/data/maps/CeladonCity_PokemonCenter_2F/header.inc index d3f2b260e..217db66f2 100644 --- a/data/maps/CeladonCity_PokemonCenter_2F/header.inc +++ b/data/maps/CeladonCity_PokemonCenter_2F/header.inc @@ -1,7 +1,7 @@ CeladonCity_PokemonCenter_2F:: @ 8351354 .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte gMapEvents_CeladonCity_PokemonCenter_2F @ 0x83BB88C - .4byte gMapScripts_CeladonCity_PokemonCenter_2F @ 0x816C61F + .4byte CeladonCity_PokemonCenter_2F_MapEvents @ 0x83BB88C + .4byte CeladonCity_PokemonCenter_2F_MapScripts @ 0x816C61F .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 9 diff --git a/data/maps/CeladonCity_Restaurant/header.inc b/data/maps/CeladonCity_Restaurant/header.inc index c588eb45d..2bd3f3867 100644 --- a/data/maps/CeladonCity_Restaurant/header.inc +++ b/data/maps/CeladonCity_Restaurant/header.inc @@ -1,7 +1,7 @@ CeladonCity_Restaurant:: @ 83513C4 .4byte CeladonCity_Restaurant_Layout @ 0x831B29C - .4byte gMapEvents_CeladonCity_Restaurant @ 0x83BBE0C - .4byte gMapScripts_CeladonCity_Restaurant @ 0x816D1EA + .4byte CeladonCity_Restaurant_MapEvents @ 0x83BBE0C + .4byte CeladonCity_Restaurant_MapScripts @ 0x816D1EA .4byte NULL .2byte BGM_FRLG_CELADON_CITY .2byte 190 diff --git a/data/maps/CeruleanCave_1F/header.inc b/data/maps/CeruleanCave_1F/header.inc index ec467c13e..9bedd6dd6 100644 --- a/data/maps/CeruleanCave_1F/header.inc +++ b/data/maps/CeruleanCave_1F/header.inc @@ -1,7 +1,7 @@ CeruleanCave_1F:: @ 834F9F4 .4byte CeruleanCave_1F_Layout @ 0x8311318 - .4byte gMapEvents_CeruleanCave_1F @ 0x83B15BC - .4byte gMapScripts_CeruleanCave_1F @ 0x81624B3 + .4byte CeruleanCave_1F_MapEvents @ 0x83B15BC + .4byte CeruleanCave_1F_MapScripts @ 0x81624B3 .4byte NULL .2byte BGM_FRLG_ROCKET_HIDEOUT .2byte 151 diff --git a/data/maps/CeruleanCave_2F/header.inc b/data/maps/CeruleanCave_2F/header.inc index 7fe8ccc03..37e25ef1b 100644 --- a/data/maps/CeruleanCave_2F/header.inc +++ b/data/maps/CeruleanCave_2F/header.inc @@ -1,7 +1,7 @@ CeruleanCave_2F:: @ 834FA10 .4byte CeruleanCave_2F_Layout @ 0x8311A6C - .4byte gMapEvents_CeruleanCave_2F @ 0x83B1738 - .4byte gMapScripts_CeruleanCave_2F @ 0x81624BD + .4byte CeruleanCave_2F_MapEvents @ 0x83B1738 + .4byte CeruleanCave_2F_MapScripts @ 0x81624BD .4byte NULL .2byte BGM_FRLG_ROCKET_HIDEOUT .2byte 152 diff --git a/data/maps/CeruleanCave_B1F/header.inc b/data/maps/CeruleanCave_B1F/header.inc index 89eaec278..88608f654 100644 --- a/data/maps/CeruleanCave_B1F/header.inc +++ b/data/maps/CeruleanCave_B1F/header.inc @@ -1,7 +1,7 @@ CeruleanCave_B1F:: @ 834FA2C .4byte CeruleanCave_B1F_Layout @ 0x83121C0 - .4byte gMapEvents_CeruleanCave_B1F @ 0x83B1874 - .4byte gMapScripts_CeruleanCave_B1F @ 0x81624BE + .4byte CeruleanCave_B1F_MapEvents @ 0x83B1874 + .4byte CeruleanCave_B1F_MapScripts @ 0x81624BE .4byte NULL .2byte BGM_FRLG_ROCKET_HIDEOUT .2byte 153 diff --git a/data/maps/CeruleanCity/header.inc b/data/maps/CeruleanCity/header.inc index 7f1bed354..720840bf0 100644 --- a/data/maps/CeruleanCity/header.inc +++ b/data/maps/CeruleanCity/header.inc @@ -1,7 +1,7 @@ CeruleanCity:: @ 835066C .4byte CeruleanCity_Layout @ 0x82E022C - .4byte gMapEvents_CeruleanCity @ 0x83B53E0 - .4byte gMapScripts_CeruleanCity @ 0x8166471 + .4byte CeruleanCity_MapEvents @ 0x83B53E0 + .4byte CeruleanCity_MapScripts @ 0x8166471 .4byte CeruleanCity_MapConnections @ 0x83527F0 .2byte BGM_FRLG_CERULEAN_CITY .2byte 81 diff --git a/data/maps/CeruleanCity_BikeShop/header.inc b/data/maps/CeruleanCity_BikeShop/header.inc index 8fd15ec07..3f2bd4de1 100644 --- a/data/maps/CeruleanCity_BikeShop/header.inc +++ b/data/maps/CeruleanCity_BikeShop/header.inc @@ -1,7 +1,7 @@ CeruleanCity_BikeShop:: @ 8350FF0 .4byte CeruleanCity_BikeShop_Layout @ 0x82D6F28 - .4byte gMapEvents_CeruleanCity_BikeShop @ 0x83BA6FC - .4byte gMapScripts_CeruleanCity_BikeShop @ 0x816ABBC + .4byte CeruleanCity_BikeShop_MapEvents @ 0x83BA6FC + .4byte CeruleanCity_BikeShop_MapScripts @ 0x816ABBC .4byte NULL .2byte BGM_FRLG_CERULEAN_CITY .2byte 26 diff --git a/data/maps/CeruleanCity_Gym/header.inc b/data/maps/CeruleanCity_Gym/header.inc index 601a9700c..3b3b044e4 100644 --- a/data/maps/CeruleanCity_Gym/header.inc +++ b/data/maps/CeruleanCity_Gym/header.inc @@ -1,7 +1,7 @@ CeruleanCity_Gym:: @ 8350FD4 .4byte CeruleanCity_Gym_Layout @ 0x82D5F84 - .4byte gMapEvents_CeruleanCity_Gym @ 0x83BA628 - .4byte gMapScripts_CeruleanCity_Gym @ 0x816AAA0 + .4byte CeruleanCity_Gym_MapEvents @ 0x83BA628 + .4byte CeruleanCity_Gym_MapScripts @ 0x816AAA0 .4byte NULL .2byte BGM_FRLG_GYM .2byte 12 diff --git a/data/maps/CeruleanCity_House1/header.inc b/data/maps/CeruleanCity_House1/header.inc index 622ef5334..092348c5b 100644 --- a/data/maps/CeruleanCity_House1/header.inc +++ b/data/maps/CeruleanCity_House1/header.inc @@ -1,7 +1,7 @@ CeruleanCity_House1:: @ 8350F48 .4byte CeruleanCity_House1_Layout @ 0x831A560 - .4byte gMapEvents_CeruleanCity_House1 @ 0x83BA350 - .4byte gMapScripts_CeruleanCity_House1 @ 0x816A7EF + .4byte CeruleanCity_House1_MapEvents @ 0x83BA350 + .4byte CeruleanCity_House1_MapScripts @ 0x816A7EF .4byte NULL .2byte BGM_FRLG_CERULEAN_CITY .2byte 183 diff --git a/data/maps/CeruleanCity_House2/header.inc b/data/maps/CeruleanCity_House2/header.inc index 0cc637603..66b02a6a6 100644 --- a/data/maps/CeruleanCity_House2/header.inc +++ b/data/maps/CeruleanCity_House2/header.inc @@ -1,7 +1,7 @@ CeruleanCity_House2:: @ 8350F64 .4byte CeruleanCity_House2_Layout @ 0x831A474 - .4byte gMapEvents_CeruleanCity_House2 @ 0x83BA3C0 - .4byte gMapScripts_CeruleanCity_House2 @ 0x816A975 + .4byte CeruleanCity_House2_MapEvents @ 0x83BA3C0 + .4byte CeruleanCity_House2_MapScripts @ 0x816A975 .4byte NULL .2byte BGM_FRLG_CERULEAN_CITY .2byte 182 diff --git a/data/maps/CeruleanCity_House3/header.inc b/data/maps/CeruleanCity_House3/header.inc index bcaabf913..6e5885015 100644 --- a/data/maps/CeruleanCity_House3/header.inc +++ b/data/maps/CeruleanCity_House3/header.inc @@ -1,7 +1,7 @@ CeruleanCity_House3:: @ 8350F80 .4byte House1_Layout @ 0x82D5754 - .4byte gMapEvents_CeruleanCity_House3 @ 0x83BA41C - .4byte gMapScripts_CeruleanCity_House3 @ 0x816A9A7 + .4byte CeruleanCity_House3_MapEvents @ 0x83BA41C + .4byte CeruleanCity_House3_MapScripts @ 0x816A9A7 .4byte NULL .2byte BGM_FRLG_CERULEAN_CITY .2byte 6 diff --git a/data/maps/CeruleanCity_House4/header.inc b/data/maps/CeruleanCity_House4/header.inc index 4996f7e7a..979bc788e 100644 --- a/data/maps/CeruleanCity_House4/header.inc +++ b/data/maps/CeruleanCity_House4/header.inc @@ -1,7 +1,7 @@ CeruleanCity_House4:: @ 8351028 .4byte House1_Layout @ 0x82D5754 - .4byte gMapEvents_CeruleanCity_House4 @ 0x83BA7A4 - .4byte gMapScripts_CeruleanCity_House4 @ 0x816ACEE + .4byte CeruleanCity_House4_MapEvents @ 0x83BA7A4 + .4byte CeruleanCity_House4_MapScripts @ 0x816ACEE .4byte NULL .2byte BGM_FRLG_CERULEAN_CITY .2byte 6 diff --git a/data/maps/CeruleanCity_House5/header.inc b/data/maps/CeruleanCity_House5/header.inc index 317e64841..1c11eb58a 100644 --- a/data/maps/CeruleanCity_House5/header.inc +++ b/data/maps/CeruleanCity_House5/header.inc @@ -1,7 +1,7 @@ CeruleanCity_House5:: @ 8351044 .4byte CeruleanCity_House5_Layout @ 0x8343540 - .4byte gMapEvents_CeruleanCity_House5 @ 0x83BA7E4 - .4byte gMapScripts_CeruleanCity_House5 @ 0x816AE4F + .4byte CeruleanCity_House5_MapEvents @ 0x83BA7E4 + .4byte CeruleanCity_House5_MapScripts @ 0x816AE4F .4byte NULL .2byte BGM_FRLG_CERULEAN_CITY .2byte 308 diff --git a/data/maps/CeruleanCity_Mart/header.inc b/data/maps/CeruleanCity_Mart/header.inc index b12b85b10..592847fdf 100644 --- a/data/maps/CeruleanCity_Mart/header.inc +++ b/data/maps/CeruleanCity_Mart/header.inc @@ -1,7 +1,7 @@ CeruleanCity_Mart:: @ 835100C .4byte Mart_Layout @ 0x82D5BCC - .4byte gMapEvents_CeruleanCity_Mart @ 0x83BA770 - .4byte gMapScripts_CeruleanCity_Mart @ 0x816AC9D + .4byte CeruleanCity_Mart_MapEvents @ 0x83BA770 + .4byte CeruleanCity_Mart_MapScripts @ 0x816AC9D .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 10 diff --git a/data/maps/CeruleanCity_PokemonCenter_1F/header.inc b/data/maps/CeruleanCity_PokemonCenter_1F/header.inc index 810354b9c..9978c2508 100644 --- a/data/maps/CeruleanCity_PokemonCenter_1F/header.inc +++ b/data/maps/CeruleanCity_PokemonCenter_1F/header.inc @@ -1,7 +1,7 @@ CeruleanCity_PokemonCenter_1F:: @ 8350F9C .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte gMapEvents_CeruleanCity_PokemonCenter_1F @ 0x83BA4F8 - .4byte gMapScripts_CeruleanCity_PokemonCenter_1F @ 0x816AA2D + .4byte CeruleanCity_PokemonCenter_1F_MapEvents @ 0x83BA4F8 + .4byte CeruleanCity_PokemonCenter_1F_MapScripts @ 0x816AA2D .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 8 diff --git a/data/maps/CeruleanCity_PokemonCenter_2F/header.inc b/data/maps/CeruleanCity_PokemonCenter_2F/header.inc index 697f7b369..6a650315e 100644 --- a/data/maps/CeruleanCity_PokemonCenter_2F/header.inc +++ b/data/maps/CeruleanCity_PokemonCenter_2F/header.inc @@ -1,7 +1,7 @@ CeruleanCity_PokemonCenter_2F:: @ 8350FB8 .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte gMapEvents_CeruleanCity_PokemonCenter_2F @ 0x83BA584 - .4byte gMapScripts_CeruleanCity_PokemonCenter_2F @ 0x816AA79 + .4byte CeruleanCity_PokemonCenter_2F_MapEvents @ 0x83BA584 + .4byte CeruleanCity_PokemonCenter_2F_MapScripts @ 0x816AA79 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 9 diff --git a/data/maps/CinnabarIsland/header.inc b/data/maps/CinnabarIsland/header.inc index 9b614bd26..49ec94a3b 100644 --- a/data/maps/CinnabarIsland/header.inc +++ b/data/maps/CinnabarIsland/header.inc @@ -1,7 +1,7 @@ CinnabarIsland:: @ 83506F8 .4byte CinnabarIsland_Layout @ 0x82E3B20 - .4byte gMapEvents_CinnabarIsland @ 0x83B5BF0 - .4byte gMapScripts_CinnabarIsland @ 0x8166ED6 + .4byte CinnabarIsland_MapEvents @ 0x83B5BF0 + .4byte CinnabarIsland_MapScripts @ 0x8166ED6 .4byte CinnabarIsland_MapConnections @ 0x83528A8 .2byte BGM_FRLG_CINNABAR_ISLAND .2byte 86 diff --git a/data/maps/CinnabarIsland_Gym/header.inc b/data/maps/CinnabarIsland_Gym/header.inc index 8e810be7e..902408c88 100644 --- a/data/maps/CinnabarIsland_Gym/header.inc +++ b/data/maps/CinnabarIsland_Gym/header.inc @@ -1,7 +1,7 @@ CinnabarIsland_Gym:: @ 8351530 .4byte CinnabarIsland_Gym_Layout @ 0x82D82C8 - .4byte gMapEvents_CinnabarIsland_Gym @ 0x83BC62C - .4byte gMapScripts_CinnabarIsland_Gym @ 0x816D94B + .4byte CinnabarIsland_Gym_MapEvents @ 0x83BC62C + .4byte CinnabarIsland_Gym_MapScripts @ 0x816D94B .4byte NULL .2byte BGM_FRLG_GYM .2byte 36 diff --git a/data/maps/CinnabarIsland_Mart/header.inc b/data/maps/CinnabarIsland_Mart/header.inc index f6abdf48e..db46f06e4 100644 --- a/data/maps/CinnabarIsland_Mart/header.inc +++ b/data/maps/CinnabarIsland_Mart/header.inc @@ -1,7 +1,7 @@ CinnabarIsland_Mart:: @ 83515F4 .4byte Mart_Layout @ 0x82D5BCC - .4byte gMapEvents_CinnabarIsland_Mart @ 0x83BC9A8 - .4byte gMapScripts_CinnabarIsland_Mart @ 0x816EA0F + .4byte CinnabarIsland_Mart_MapEvents @ 0x83BC9A8 + .4byte CinnabarIsland_Mart_MapScripts @ 0x816EA0F .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 10 diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/header.inc b/data/maps/CinnabarIsland_PokemonCenter_1F/header.inc index 4d0aac7b3..61259eee7 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_1F/header.inc +++ b/data/maps/CinnabarIsland_PokemonCenter_1F/header.inc @@ -1,7 +1,7 @@ CinnabarIsland_PokemonCenter_1F:: @ 83515BC .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte gMapEvents_CinnabarIsland_PokemonCenter_1F @ 0x83BC8A8 - .4byte gMapScripts_CinnabarIsland_PokemonCenter_1F @ 0x816E8D7 + .4byte CinnabarIsland_PokemonCenter_1F_MapEvents @ 0x83BC8A8 + .4byte CinnabarIsland_PokemonCenter_1F_MapScripts @ 0x816E8D7 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 8 diff --git a/data/maps/CinnabarIsland_PokemonCenter_2F/header.inc b/data/maps/CinnabarIsland_PokemonCenter_2F/header.inc index 01c1b0eb9..462076704 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_2F/header.inc +++ b/data/maps/CinnabarIsland_PokemonCenter_2F/header.inc @@ -1,7 +1,7 @@ CinnabarIsland_PokemonCenter_2F:: @ 83515D8 .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte gMapEvents_CinnabarIsland_PokemonCenter_2F @ 0x83BC934 - .4byte gMapScripts_CinnabarIsland_PokemonCenter_2F @ 0x816E9E8 + .4byte CinnabarIsland_PokemonCenter_2F_MapEvents @ 0x83BC934 + .4byte CinnabarIsland_PokemonCenter_2F_MapScripts @ 0x816E9E8 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 9 diff --git a/data/maps/CinnabarIsland_PokemonLab_Entrance/header.inc b/data/maps/CinnabarIsland_PokemonLab_Entrance/header.inc index 4e97c56f2..8f1b3ce10 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Entrance/header.inc +++ b/data/maps/CinnabarIsland_PokemonLab_Entrance/header.inc @@ -1,7 +1,7 @@ CinnabarIsland_PokemonLab_Entrance:: @ 835154C .4byte CinnabarIsland_PokemonLab_Entrance_Layout @ 0x831C804 - .4byte gMapEvents_CinnabarIsland_PokemonLab_Entrance @ 0x83BC6B8 - .4byte gMapScripts_CinnabarIsland_PokemonLab_Entrance @ 0x816E273 + .4byte CinnabarIsland_PokemonLab_Entrance_MapEvents @ 0x83BC6B8 + .4byte CinnabarIsland_PokemonLab_Entrance_MapScripts @ 0x816E273 .4byte NULL .2byte BGM_FRLG_CINNABAR_ISLAND .2byte 203 diff --git a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/header.inc b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/header.inc index 866b195ca..f3dca36f6 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/header.inc +++ b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/header.inc @@ -1,7 +1,7 @@ CinnabarIsland_PokemonLab_ExperimentRoom:: @ 83515A0 .4byte CinnabarIsland_PokemonLab_ExperimentRoom_Layout @ 0x831CC54 - .4byte gMapEvents_CinnabarIsland_PokemonLab_ExperimentRoom @ 0x83BC7CC - .4byte gMapScripts_CinnabarIsland_PokemonLab_ExperimentRoom @ 0x816E400 + .4byte CinnabarIsland_PokemonLab_ExperimentRoom_MapEvents @ 0x83BC7CC + .4byte CinnabarIsland_PokemonLab_ExperimentRoom_MapScripts @ 0x816E400 .4byte NULL .2byte BGM_FRLG_CINNABAR_ISLAND .2byte 206 diff --git a/data/maps/CinnabarIsland_PokemonLab_Lounge/header.inc b/data/maps/CinnabarIsland_PokemonLab_Lounge/header.inc index 0e0fe0525..ae3a567d7 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Lounge/header.inc +++ b/data/maps/CinnabarIsland_PokemonLab_Lounge/header.inc @@ -1,7 +1,7 @@ CinnabarIsland_PokemonLab_Lounge:: @ 8351568 .4byte CinnabarIsland_PokemonLab_Lounge_Layout @ 0x831C974 - .4byte gMapEvents_CinnabarIsland_PokemonLab_Lounge @ 0x83BC71C - .4byte gMapScripts_CinnabarIsland_PokemonLab_Lounge @ 0x816E2B8 + .4byte CinnabarIsland_PokemonLab_Lounge_MapEvents @ 0x83BC71C + .4byte CinnabarIsland_PokemonLab_Lounge_MapScripts @ 0x816E2B8 .4byte NULL .2byte BGM_FRLG_CINNABAR_ISLAND .2byte 204 diff --git a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/header.inc b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/header.inc index 8c8f7bc28..34e60e452 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/header.inc +++ b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/header.inc @@ -1,7 +1,7 @@ CinnabarIsland_PokemonLab_ResearchRoom:: @ 8351584 .4byte CinnabarIsland_PokemonLab_ResearchRoom_Layout @ 0x831CAE4 - .4byte gMapEvents_CinnabarIsland_PokemonLab_ResearchRoom @ 0x83BC780 - .4byte gMapScripts_CinnabarIsland_PokemonLab_ResearchRoom @ 0x816E3DE + .4byte CinnabarIsland_PokemonLab_ResearchRoom_MapEvents @ 0x83BC780 + .4byte CinnabarIsland_PokemonLab_ResearchRoom_MapScripts @ 0x816E3DE .4byte NULL .2byte BGM_FRLG_CINNABAR_ISLAND .2byte 205 diff --git a/data/maps/DiglettsCave_B1F/header.inc b/data/maps/DiglettsCave_B1F/header.inc index 7ebb82a62..c72ae342e 100644 --- a/data/maps/DiglettsCave_B1F/header.inc +++ b/data/maps/DiglettsCave_B1F/header.inc @@ -1,7 +1,7 @@ DiglettsCave_B1F:: @ 834F620 .4byte DiglettsCave_B1F_Layout @ 0x8303B68 - .4byte gMapEvents_DiglettsCave_B1F @ 0x83AF490 - .4byte gMapScripts_DiglettsCave_B1F @ 0x8160EF1 + .4byte DiglettsCave_B1F_MapEvents @ 0x83AF490 + .4byte DiglettsCave_B1F_MapScripts @ 0x8160EF1 .4byte NULL .2byte BGM_FRLG_VIRIDIAN_FOREST .2byte 124 diff --git a/data/maps/DiglettsCave_NorthEntrance/header.inc b/data/maps/DiglettsCave_NorthEntrance/header.inc index 47df9cac9..ecdeaba44 100644 --- a/data/maps/DiglettsCave_NorthEntrance/header.inc +++ b/data/maps/DiglettsCave_NorthEntrance/header.inc @@ -1,7 +1,7 @@ DiglettsCave_NorthEntrance:: @ 834F604 .4byte DiglettsCave_NorthEntrance_Layout @ 0x831EB94 - .4byte gMapEvents_DiglettsCave_NorthEntrance @ 0x83AF46C - .4byte gMapScripts_DiglettsCave_NorthEntrance @ 0x8160EE7 + .4byte DiglettsCave_NorthEntrance_MapEvents @ 0x83AF46C + .4byte DiglettsCave_NorthEntrance_MapScripts @ 0x8160EE7 .4byte NULL .2byte BGM_FRLG_VIRIDIAN_FOREST .2byte 210 diff --git a/data/maps/DiglettsCave_SouthEntrance/header.inc b/data/maps/DiglettsCave_SouthEntrance/header.inc index 1651d502b..5c84c5307 100644 --- a/data/maps/DiglettsCave_SouthEntrance/header.inc +++ b/data/maps/DiglettsCave_SouthEntrance/header.inc @@ -1,7 +1,7 @@ DiglettsCave_SouthEntrance:: @ 834F63C .4byte DiglettsCave_SouthEntrance_Layout @ 0x831EC58 - .4byte gMapEvents_DiglettsCave_SouthEntrance @ 0x83AF4CC - .4byte gMapScripts_DiglettsCave_SouthEntrance @ 0x8160EFB + .4byte DiglettsCave_SouthEntrance_MapEvents @ 0x83AF4CC + .4byte DiglettsCave_SouthEntrance_MapScripts @ 0x8160EFB .4byte NULL .2byte BGM_FRLG_VIRIDIAN_FOREST .2byte 211 diff --git a/data/maps/FiveIsland/header.inc b/data/maps/FiveIsland/header.inc index ee274936b..b38c6fa44 100644 --- a/data/maps/FiveIsland/header.inc +++ b/data/maps/FiveIsland/header.inc @@ -1,7 +1,7 @@ FiveIsland:: @ 83507D8 .4byte FiveIsland_Layout @ 0x8323964 - .4byte gMapEvents_FiveIsland @ 0x83B64F4 - .4byte gMapScripts_FiveIsland @ 0x8167E8E + .4byte FiveIsland_MapEvents @ 0x83B64F4 + .4byte FiveIsland_MapScripts @ 0x8167E8E .4byte FiveIsland_MapConnections @ 0x83529A0 .2byte BGM_FRLG_ISLAND_FOUR .2byte 234 diff --git a/data/maps/FiveIsland_Harbor/header.inc b/data/maps/FiveIsland_Harbor/header.inc index 623c90298..1f7a96309 100644 --- a/data/maps/FiveIsland_Harbor/header.inc +++ b/data/maps/FiveIsland_Harbor/header.inc @@ -1,7 +1,7 @@ FiveIsland_Harbor:: @ 8351E7C .4byte Island_Harbor_Layout @ 0x8343FB8 - .4byte gMapEvents_FiveIsland_Harbor @ 0x83BEFB4 - .4byte gMapScripts_FiveIsland_Harbor @ 0x8171D42 + .4byte FiveIsland_Harbor_MapEvents @ 0x83BEFB4 + .4byte FiveIsland_Harbor_MapScripts @ 0x8171D42 .4byte NULL .2byte BGM_FRLG_ISLAND_FOUR .2byte 315 diff --git a/data/maps/FiveIsland_House1/header.inc b/data/maps/FiveIsland_House1/header.inc index f33f9b4aa..11d3865ff 100644 --- a/data/maps/FiveIsland_House1/header.inc +++ b/data/maps/FiveIsland_House1/header.inc @@ -1,7 +1,7 @@ FiveIsland_House1:: @ 8351E98 .4byte House3_Layout @ 0x82D5CB8 - .4byte gMapEvents_FiveIsland_House1 @ 0x83BEFE8 - .4byte gMapScripts_FiveIsland_House1 @ 0x8171D56 + .4byte FiveIsland_House1_MapEvents @ 0x83BEFE8 + .4byte FiveIsland_House1_MapScripts @ 0x8171D56 .4byte NULL .2byte BGM_FRLG_ISLAND_FOUR .2byte 11 diff --git a/data/maps/FiveIsland_House2/header.inc b/data/maps/FiveIsland_House2/header.inc index 10a02b0ae..09a7f015f 100644 --- a/data/maps/FiveIsland_House2/header.inc +++ b/data/maps/FiveIsland_House2/header.inc @@ -1,7 +1,7 @@ FiveIsland_House2:: @ 8351EB4 .4byte House3_Layout @ 0x82D5CB8 - .4byte gMapEvents_FiveIsland_House2 @ 0x83BF01C - .4byte gMapScripts_FiveIsland_House2 @ 0x8171D60 + .4byte FiveIsland_House2_MapEvents @ 0x83BF01C + .4byte FiveIsland_House2_MapScripts @ 0x8171D60 .4byte NULL .2byte BGM_FRLG_ISLAND_FOUR .2byte 11 diff --git a/data/maps/FiveIsland_LostCave_Entrance/header.inc b/data/maps/FiveIsland_LostCave_Entrance/header.inc index be1cff1e3..937061b53 100644 --- a/data/maps/FiveIsland_LostCave_Entrance/header.inc +++ b/data/maps/FiveIsland_LostCave_Entrance/header.inc @@ -1,7 +1,7 @@ FiveIsland_LostCave_Entrance:: @ 83500D8 .4byte FiveIsland_LostCave_Entrance_Layout @ 0x83454D8 - .4byte gMapEvents_FiveIsland_LostCave_Entrance @ 0x83B4354 - .4byte gMapScripts_FiveIsland_LostCave_Entrance @ 0x8164BEC + .4byte FiveIsland_LostCave_Entrance_MapEvents @ 0x83B4354 + .4byte FiveIsland_LostCave_Entrance_MapScripts @ 0x8164BEC .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 320 diff --git a/data/maps/FiveIsland_LostCave_Room1/header.inc b/data/maps/FiveIsland_LostCave_Room1/header.inc index 053bb4dee..c251be2c2 100644 --- a/data/maps/FiveIsland_LostCave_Room1/header.inc +++ b/data/maps/FiveIsland_LostCave_Room1/header.inc @@ -1,7 +1,7 @@ FiveIsland_LostCave_Room1:: @ 83500F4 .4byte FiveIsland_LostCave_Room1_Layout @ 0x83455F0 - .4byte gMapEvents_FiveIsland_LostCave_Room1 @ 0x83B43A8 - .4byte gMapScripts_FiveIsland_LostCave_Room1 @ 0x8164BF6 + .4byte FiveIsland_LostCave_Room1_MapEvents @ 0x83B43A8 + .4byte FiveIsland_LostCave_Room1_MapScripts @ 0x8164BF6 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 321 diff --git a/data/maps/FiveIsland_LostCave_Room10/header.inc b/data/maps/FiveIsland_LostCave_Room10/header.inc index f770a1340..e27634f92 100644 --- a/data/maps/FiveIsland_LostCave_Room10/header.inc +++ b/data/maps/FiveIsland_LostCave_Room10/header.inc @@ -1,7 +1,7 @@ FiveIsland_LostCave_Room10:: @ 83501F0 .4byte FiveIsland_LostCave_Room10_Layout @ 0x8345FC8 - .4byte gMapEvents_FiveIsland_LostCave_Room10 @ 0x83B45AC - .4byte gMapScripts_FiveIsland_LostCave_Room10 @ 0x8164C2D + .4byte FiveIsland_LostCave_Room10_MapEvents @ 0x83B45AC + .4byte FiveIsland_LostCave_Room10_MapScripts @ 0x8164C2D .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 330 diff --git a/data/maps/FiveIsland_LostCave_Room11/header.inc b/data/maps/FiveIsland_LostCave_Room11/header.inc index 4e047faf2..56457b055 100644 --- a/data/maps/FiveIsland_LostCave_Room11/header.inc +++ b/data/maps/FiveIsland_LostCave_Room11/header.inc @@ -1,7 +1,7 @@ FiveIsland_LostCave_Room11:: @ 835020C .4byte FiveIsland_LostCave_Room11_Layout @ 0x83460E0 - .4byte gMapEvents_FiveIsland_LostCave_Room11 @ 0x83B45E0 - .4byte gMapScripts_FiveIsland_LostCave_Room11 @ 0x8164CCB + .4byte FiveIsland_LostCave_Room11_MapEvents @ 0x83B45E0 + .4byte FiveIsland_LostCave_Room11_MapScripts @ 0x8164CCB .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 331 diff --git a/data/maps/FiveIsland_LostCave_Room12/header.inc b/data/maps/FiveIsland_LostCave_Room12/header.inc index 417712f1b..8629a364d 100644 --- a/data/maps/FiveIsland_LostCave_Room12/header.inc +++ b/data/maps/FiveIsland_LostCave_Room12/header.inc @@ -1,7 +1,7 @@ FiveIsland_LostCave_Room12:: @ 8350228 .4byte FiveIsland_LostCave_Room12_Layout @ 0x83461F8 - .4byte gMapEvents_FiveIsland_LostCave_Room12 @ 0x83B4614 - .4byte gMapScripts_FiveIsland_LostCave_Room12 @ 0x8164CCC + .4byte FiveIsland_LostCave_Room12_MapEvents @ 0x83B4614 + .4byte FiveIsland_LostCave_Room12_MapScripts @ 0x8164CCC .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 332 diff --git a/data/maps/FiveIsland_LostCave_Room13/header.inc b/data/maps/FiveIsland_LostCave_Room13/header.inc index cbe00c496..cda5b3670 100644 --- a/data/maps/FiveIsland_LostCave_Room13/header.inc +++ b/data/maps/FiveIsland_LostCave_Room13/header.inc @@ -1,7 +1,7 @@ FiveIsland_LostCave_Room13:: @ 8350244 .4byte FiveIsland_LostCave_Room13_Layout @ 0x8346310 - .4byte gMapEvents_FiveIsland_LostCave_Room13 @ 0x83B4648 - .4byte gMapScripts_FiveIsland_LostCave_Room13 @ 0x8164CCD + .4byte FiveIsland_LostCave_Room13_MapEvents @ 0x83B4648 + .4byte FiveIsland_LostCave_Room13_MapScripts @ 0x8164CCD .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 333 diff --git a/data/maps/FiveIsland_LostCave_Room14/header.inc b/data/maps/FiveIsland_LostCave_Room14/header.inc index 036d47e93..6470895b4 100644 --- a/data/maps/FiveIsland_LostCave_Room14/header.inc +++ b/data/maps/FiveIsland_LostCave_Room14/header.inc @@ -1,7 +1,7 @@ FiveIsland_LostCave_Room14:: @ 8350260 .4byte FiveIsland_LostCave_Room14_Layout @ 0x8346428 - .4byte gMapEvents_FiveIsland_LostCave_Room14 @ 0x83B467C - .4byte gMapScripts_FiveIsland_LostCave_Room14 @ 0x8164CCE + .4byte FiveIsland_LostCave_Room14_MapEvents @ 0x83B467C + .4byte FiveIsland_LostCave_Room14_MapScripts @ 0x8164CCE .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 334 diff --git a/data/maps/FiveIsland_LostCave_Room2/header.inc b/data/maps/FiveIsland_LostCave_Room2/header.inc index 3a22600b3..2861812a2 100644 --- a/data/maps/FiveIsland_LostCave_Room2/header.inc +++ b/data/maps/FiveIsland_LostCave_Room2/header.inc @@ -1,7 +1,7 @@ FiveIsland_LostCave_Room2:: @ 8350110 .4byte FiveIsland_LostCave_Room2_Layout @ 0x8345708 - .4byte gMapEvents_FiveIsland_LostCave_Room2 @ 0x83B43DC - .4byte gMapScripts_FiveIsland_LostCave_Room2 @ 0x8164C0E + .4byte FiveIsland_LostCave_Room2_MapEvents @ 0x83B43DC + .4byte FiveIsland_LostCave_Room2_MapScripts @ 0x8164C0E .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 322 diff --git a/data/maps/FiveIsland_LostCave_Room3/header.inc b/data/maps/FiveIsland_LostCave_Room3/header.inc index 0080d605e..33c5484e0 100644 --- a/data/maps/FiveIsland_LostCave_Room3/header.inc +++ b/data/maps/FiveIsland_LostCave_Room3/header.inc @@ -1,7 +1,7 @@ FiveIsland_LostCave_Room3:: @ 835012C .4byte FiveIsland_LostCave_Room3_Layout @ 0x8345820 - .4byte gMapEvents_FiveIsland_LostCave_Room3 @ 0x83B4410 - .4byte gMapScripts_FiveIsland_LostCave_Room3 @ 0x8164C0F + .4byte FiveIsland_LostCave_Room3_MapEvents @ 0x83B4410 + .4byte FiveIsland_LostCave_Room3_MapScripts @ 0x8164C0F .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 323 diff --git a/data/maps/FiveIsland_LostCave_Room4/header.inc b/data/maps/FiveIsland_LostCave_Room4/header.inc index 019095376..966532b31 100644 --- a/data/maps/FiveIsland_LostCave_Room4/header.inc +++ b/data/maps/FiveIsland_LostCave_Room4/header.inc @@ -1,7 +1,7 @@ FiveIsland_LostCave_Room4:: @ 8350148 .4byte FiveIsland_LostCave_Room4_Layout @ 0x8345938 - .4byte gMapEvents_FiveIsland_LostCave_Room4 @ 0x83B445C - .4byte gMapScripts_FiveIsland_LostCave_Room4 @ 0x8164C10 + .4byte FiveIsland_LostCave_Room4_MapEvents @ 0x83B445C + .4byte FiveIsland_LostCave_Room4_MapScripts @ 0x8164C10 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 324 diff --git a/data/maps/FiveIsland_LostCave_Room5/header.inc b/data/maps/FiveIsland_LostCave_Room5/header.inc index e5bc7e389..6ec15156f 100644 --- a/data/maps/FiveIsland_LostCave_Room5/header.inc +++ b/data/maps/FiveIsland_LostCave_Room5/header.inc @@ -1,7 +1,7 @@ FiveIsland_LostCave_Room5:: @ 8350164 .4byte FiveIsland_LostCave_Room5_Layout @ 0x8345A50 - .4byte gMapEvents_FiveIsland_LostCave_Room5 @ 0x83B4490 - .4byte gMapScripts_FiveIsland_LostCave_Room5 @ 0x8164C28 + .4byte FiveIsland_LostCave_Room5_MapEvents @ 0x83B4490 + .4byte FiveIsland_LostCave_Room5_MapScripts @ 0x8164C28 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 325 diff --git a/data/maps/FiveIsland_LostCave_Room6/header.inc b/data/maps/FiveIsland_LostCave_Room6/header.inc index 5688b9428..c45b08d1e 100644 --- a/data/maps/FiveIsland_LostCave_Room6/header.inc +++ b/data/maps/FiveIsland_LostCave_Room6/header.inc @@ -1,7 +1,7 @@ FiveIsland_LostCave_Room6:: @ 8350180 .4byte FiveIsland_LostCave_Room6_Layout @ 0x8345B68 - .4byte gMapEvents_FiveIsland_LostCave_Room6 @ 0x83B44C4 - .4byte gMapScripts_FiveIsland_LostCave_Room6 @ 0x8164C29 + .4byte FiveIsland_LostCave_Room6_MapEvents @ 0x83B44C4 + .4byte FiveIsland_LostCave_Room6_MapScripts @ 0x8164C29 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 326 diff --git a/data/maps/FiveIsland_LostCave_Room7/header.inc b/data/maps/FiveIsland_LostCave_Room7/header.inc index eff6b2b3b..17a168e1d 100644 --- a/data/maps/FiveIsland_LostCave_Room7/header.inc +++ b/data/maps/FiveIsland_LostCave_Room7/header.inc @@ -1,7 +1,7 @@ FiveIsland_LostCave_Room7:: @ 835019C .4byte FiveIsland_LostCave_Room7_Layout @ 0x8345C80 - .4byte gMapEvents_FiveIsland_LostCave_Room7 @ 0x83B44F8 - .4byte gMapScripts_FiveIsland_LostCave_Room7 @ 0x8164C2A + .4byte FiveIsland_LostCave_Room7_MapEvents @ 0x83B44F8 + .4byte FiveIsland_LostCave_Room7_MapScripts @ 0x8164C2A .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 327 diff --git a/data/maps/FiveIsland_LostCave_Room8/header.inc b/data/maps/FiveIsland_LostCave_Room8/header.inc index 585e219ee..21fa63267 100644 --- a/data/maps/FiveIsland_LostCave_Room8/header.inc +++ b/data/maps/FiveIsland_LostCave_Room8/header.inc @@ -1,7 +1,7 @@ FiveIsland_LostCave_Room8:: @ 83501B8 .4byte FiveIsland_LostCave_Room8_Layout @ 0x8345D98 - .4byte gMapEvents_FiveIsland_LostCave_Room8 @ 0x83B452C - .4byte gMapScripts_FiveIsland_LostCave_Room8 @ 0x8164C2B + .4byte FiveIsland_LostCave_Room8_MapEvents @ 0x83B452C + .4byte FiveIsland_LostCave_Room8_MapScripts @ 0x8164C2B .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 328 diff --git a/data/maps/FiveIsland_LostCave_Room9/header.inc b/data/maps/FiveIsland_LostCave_Room9/header.inc index 2c465cf0e..53ef0c34e 100644 --- a/data/maps/FiveIsland_LostCave_Room9/header.inc +++ b/data/maps/FiveIsland_LostCave_Room9/header.inc @@ -1,7 +1,7 @@ FiveIsland_LostCave_Room9:: @ 83501D4 .4byte FiveIsland_LostCave_Room9_Layout @ 0x8345EB0 - .4byte gMapEvents_FiveIsland_LostCave_Room9 @ 0x83B4560 - .4byte gMapScripts_FiveIsland_LostCave_Room9 @ 0x8164C2C + .4byte FiveIsland_LostCave_Room9_MapEvents @ 0x83B4560 + .4byte FiveIsland_LostCave_Room9_MapScripts @ 0x8164C2C .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 329 diff --git a/data/maps/FiveIsland_Meadow/header.inc b/data/maps/FiveIsland_Meadow/header.inc index 05ba4c525..4f30d8ae1 100644 --- a/data/maps/FiveIsland_Meadow/header.inc +++ b/data/maps/FiveIsland_Meadow/header.inc @@ -1,7 +1,7 @@ FiveIsland_Meadow:: @ 8350C38 .4byte FiveIsland_Meadow_Layout @ 0x832BAE4 - .4byte gMapEvents_FiveIsland_Meadow @ 0x83B8D94 - .4byte gMapScripts_FiveIsland_Meadow @ 0x8168932 + .4byte FiveIsland_Meadow_MapEvents @ 0x83B8D94 + .4byte FiveIsland_Meadow_MapScripts @ 0x8168932 .4byte FiveIsland_Meadow_MapConnections @ 0x8352DF4 .2byte BGM_FRLG_SEVII_ISLANDS .2byte 248 diff --git a/data/maps/FiveIsland_MemorialPillar/header.inc b/data/maps/FiveIsland_MemorialPillar/header.inc index 0db87e74f..39944fcdf 100644 --- a/data/maps/FiveIsland_MemorialPillar/header.inc +++ b/data/maps/FiveIsland_MemorialPillar/header.inc @@ -1,7 +1,7 @@ FiveIsland_MemorialPillar:: @ 8350C54 .4byte FiveIsland_MemorialPillar_Layout @ 0x832C648 - .4byte gMapEvents_FiveIsland_MemorialPillar @ 0x83B8E5C - .4byte gMapScripts_FiveIsland_MemorialPillar @ 0x81689D2 + .4byte FiveIsland_MemorialPillar_MapEvents @ 0x83B8E5C + .4byte FiveIsland_MemorialPillar_MapScripts @ 0x81689D2 .4byte FiveIsland_MemorialPillar_MapConnections @ 0x8352E08 .2byte BGM_FRLG_SEVII_ISLANDS .2byte 249 diff --git a/data/maps/FiveIsland_PokemonCenter_1F/header.inc b/data/maps/FiveIsland_PokemonCenter_1F/header.inc index 61ceecc1e..ed32a33e9 100644 --- a/data/maps/FiveIsland_PokemonCenter_1F/header.inc +++ b/data/maps/FiveIsland_PokemonCenter_1F/header.inc @@ -1,7 +1,7 @@ FiveIsland_PokemonCenter_1F:: @ 8351E44 .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte gMapEvents_FiveIsland_PokemonCenter_1F @ 0x83BEEDC - .4byte gMapScripts_FiveIsland_PokemonCenter_1F @ 0x8171CF1 + .4byte FiveIsland_PokemonCenter_1F_MapEvents @ 0x83BEEDC + .4byte FiveIsland_PokemonCenter_1F_MapScripts @ 0x8171CF1 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 8 diff --git a/data/maps/FiveIsland_PokemonCenter_2F/header.inc b/data/maps/FiveIsland_PokemonCenter_2F/header.inc index a3f51f119..fd00cabd4 100644 --- a/data/maps/FiveIsland_PokemonCenter_2F/header.inc +++ b/data/maps/FiveIsland_PokemonCenter_2F/header.inc @@ -1,7 +1,7 @@ FiveIsland_PokemonCenter_2F:: @ 8351E60 .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte gMapEvents_FiveIsland_PokemonCenter_2F @ 0x83BEF68 - .4byte gMapScripts_FiveIsland_PokemonCenter_2F @ 0x8171D1B + .4byte FiveIsland_PokemonCenter_2F_MapEvents @ 0x83BEF68 + .4byte FiveIsland_PokemonCenter_2F_MapScripts @ 0x8171D1B .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 9 diff --git a/data/maps/FiveIsland_ResortGorgeous/header.inc b/data/maps/FiveIsland_ResortGorgeous/header.inc index 13c3647f7..ecbc20c6d 100644 --- a/data/maps/FiveIsland_ResortGorgeous/header.inc +++ b/data/maps/FiveIsland_ResortGorgeous/header.inc @@ -1,7 +1,7 @@ FiveIsland_ResortGorgeous:: @ 8350C00 .4byte FiveIsland_ResortGorgeous_Layout @ 0x832A7DC - .4byte gMapEvents_FiveIsland_ResortGorgeous @ 0x83B8C80 - .4byte gMapScripts_FiveIsland_ResortGorgeous @ 0x81687E4 + .4byte FiveIsland_ResortGorgeous_MapEvents @ 0x83B8C80 + .4byte FiveIsland_ResortGorgeous_MapScripts @ 0x81687E4 .4byte FiveIsland_ResortGorgeous_MapConnections @ 0x8352DB4 .2byte BGM_FRLG_SEVII_ISLANDS .2byte 246 diff --git a/data/maps/FiveIsland_ResortGorgeous_House/header.inc b/data/maps/FiveIsland_ResortGorgeous_House/header.inc index 06e2fb981..9ef744a47 100644 --- a/data/maps/FiveIsland_ResortGorgeous_House/header.inc +++ b/data/maps/FiveIsland_ResortGorgeous_House/header.inc @@ -1,7 +1,7 @@ FiveIsland_ResortGorgeous_House:: @ 8351F78 .4byte FiveIsland_ResortGorgeous_House_Layout @ 0x82D657C - .4byte gMapEvents_FiveIsland_ResortGorgeous_House @ 0x83BF2C0 - .4byte gMapScripts_FiveIsland_ResortGorgeous_House @ 0x8171EBD + .4byte FiveIsland_ResortGorgeous_House_MapEvents @ 0x83BF2C0 + .4byte FiveIsland_ResortGorgeous_House_MapScripts @ 0x8171EBD .4byte NULL .2byte BGM_FRLG_ISLAND_FOUR .2byte 17 diff --git a/data/maps/FiveIsland_WaterLabyrinth/header.inc b/data/maps/FiveIsland_WaterLabyrinth/header.inc index ca762bcd5..9516eb6f8 100644 --- a/data/maps/FiveIsland_WaterLabyrinth/header.inc +++ b/data/maps/FiveIsland_WaterLabyrinth/header.inc @@ -1,7 +1,7 @@ FiveIsland_WaterLabyrinth:: @ 8350C1C .4byte FiveIsland_WaterLabyrinth_Layout @ 0x832B340 - .4byte gMapEvents_FiveIsland_WaterLabyrinth @ 0x83B8CC4 - .4byte gMapScripts_FiveIsland_WaterLabyrinth @ 0x816884D + .4byte FiveIsland_WaterLabyrinth_MapEvents @ 0x83B8CC4 + .4byte FiveIsland_WaterLabyrinth_MapScripts @ 0x816884D .4byte FiveIsland_WaterLabyrinth_MapConnections @ 0x8352DD4 .2byte BGM_FRLG_SEVII_ISLANDS .2byte 247 diff --git a/data/maps/FourIsland/header.inc b/data/maps/FourIsland/header.inc index 16949a412..7efe4469f 100644 --- a/data/maps/FourIsland/header.inc +++ b/data/maps/FourIsland/header.inc @@ -1,7 +1,7 @@ FourIsland:: @ 83507BC .4byte FourIsland_Layout @ 0x8323580 - .4byte gMapEvents_FourIsland @ 0x83B646C - .4byte gMapScripts_FourIsland @ 0x8167CAE + .4byte FourIsland_MapEvents @ 0x83B646C + .4byte FourIsland_MapScripts @ 0x8167CAE .4byte NULL .2byte BGM_FRLG_ISLAND_FOUR .2byte 233 diff --git a/data/maps/FourIsland_Harbor/header.inc b/data/maps/FourIsland_Harbor/header.inc index 224d88240..af0f40483 100644 --- a/data/maps/FourIsland_Harbor/header.inc +++ b/data/maps/FourIsland_Harbor/header.inc @@ -1,7 +1,7 @@ FourIsland_Harbor:: @ 8351DF0 .4byte Island_Harbor_Layout @ 0x8343FB8 - .4byte gMapEvents_FourIsland_Harbor @ 0x83BEDA8 - .4byte gMapScripts_FourIsland_Harbor @ 0x8171C98 + .4byte FourIsland_Harbor_MapEvents @ 0x83BEDA8 + .4byte FourIsland_Harbor_MapScripts @ 0x8171C98 .4byte NULL .2byte BGM_FRLG_ISLAND_FOUR .2byte 315 diff --git a/data/maps/FourIsland_House1/header.inc b/data/maps/FourIsland_House1/header.inc index b72ce9938..6f2cf1099 100644 --- a/data/maps/FourIsland_House1/header.inc +++ b/data/maps/FourIsland_House1/header.inc @@ -1,7 +1,7 @@ FourIsland_House1:: @ 8351DB8 .4byte House3_Layout @ 0x82D5CB8 - .4byte gMapEvents_FourIsland_House1 @ 0x83BEBD8 - .4byte gMapScripts_FourIsland_House1 @ 0x8171C44 + .4byte FourIsland_House1_MapEvents @ 0x83BEBD8 + .4byte FourIsland_House1_MapScripts @ 0x8171C44 .4byte NULL .2byte BGM_FRLG_ISLAND_FOUR .2byte 11 diff --git a/data/maps/FourIsland_House2/header.inc b/data/maps/FourIsland_House2/header.inc index fafd19dde..699623002 100644 --- a/data/maps/FourIsland_House2/header.inc +++ b/data/maps/FourIsland_House2/header.inc @@ -1,7 +1,7 @@ FourIsland_House2:: @ 8351E0C .4byte House3_Layout @ 0x82D5CB8 - .4byte gMapEvents_FourIsland_House2 @ 0x83BEDDC - .4byte gMapScripts_FourIsland_House2 @ 0x8171CAC + .4byte FourIsland_House2_MapEvents @ 0x83BEDDC + .4byte FourIsland_House2_MapScripts @ 0x8171CAC .4byte NULL .2byte BGM_FRLG_ISLAND_FOUR .2byte 11 diff --git a/data/maps/FourIsland_IcefallCave_1F/header.inc b/data/maps/FourIsland_IcefallCave_1F/header.inc index 8a4ad3c55..a77f235f9 100644 --- a/data/maps/FourIsland_IcefallCave_1F/header.inc +++ b/data/maps/FourIsland_IcefallCave_1F/header.inc @@ -1,7 +1,7 @@ FourIsland_IcefallCave_1F:: @ 834FE38 .4byte FourIsland_IcefallCave_1F_Layout @ 0x834117C - .4byte gMapEvents_FourIsland_IcefallCave_1F @ 0x83B34AC - .4byte gMapScripts_FourIsland_IcefallCave_1F @ 0x8163D44 + .4byte FourIsland_IcefallCave_1F_MapEvents @ 0x83B34AC + .4byte FourIsland_IcefallCave_1F_MapScripts @ 0x8163D44 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 294 diff --git a/data/maps/FourIsland_IcefallCave_Entrance/header.inc b/data/maps/FourIsland_IcefallCave_Entrance/header.inc index 9c183603b..758df55d9 100644 --- a/data/maps/FourIsland_IcefallCave_Entrance/header.inc +++ b/data/maps/FourIsland_IcefallCave_Entrance/header.inc @@ -1,7 +1,7 @@ FourIsland_IcefallCave_Entrance:: @ 834FE1C .4byte FourIsland_IcefallCave_Entrance_Layout @ 0x8340E38 - .4byte gMapEvents_FourIsland_IcefallCave_Entrance @ 0x83B3438 - .4byte gMapScripts_FourIsland_IcefallCave_Entrance @ 0x8163D3A + .4byte FourIsland_IcefallCave_Entrance_MapEvents @ 0x83B3438 + .4byte FourIsland_IcefallCave_Entrance_MapScripts @ 0x8163D3A .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 293 diff --git a/data/maps/FourIsland_LoreleisHouse/header.inc b/data/maps/FourIsland_LoreleisHouse/header.inc index 112231426..70bb32a5d 100644 --- a/data/maps/FourIsland_LoreleisHouse/header.inc +++ b/data/maps/FourIsland_LoreleisHouse/header.inc @@ -1,7 +1,7 @@ FourIsland_LoreleisHouse:: @ 8351DD4 .4byte FourIsland_LoreleisHouse_Layout @ 0x82D7418 - .4byte gMapEvents_FourIsland_LoreleisHouse @ 0x83BED5C - .4byte gMapScripts_FourIsland_LoreleisHouse @ 0x8171C4E + .4byte FourIsland_LoreleisHouse_MapEvents @ 0x83BED5C + .4byte FourIsland_LoreleisHouse_MapScripts @ 0x8171C4E .4byte NULL .2byte BGM_FRLG_ISLAND_FOUR .2byte 30 diff --git a/data/maps/FourIsland_Mart/header.inc b/data/maps/FourIsland_Mart/header.inc index 634c598fc..95c316e9a 100644 --- a/data/maps/FourIsland_Mart/header.inc +++ b/data/maps/FourIsland_Mart/header.inc @@ -1,7 +1,7 @@ FourIsland_Mart:: @ 8351E28 .4byte Mart_Layout @ 0x82D5BCC - .4byte gMapEvents_FourIsland_Mart @ 0x83BEE40 - .4byte gMapScripts_FourIsland_Mart @ 0x8171CAD + .4byte FourIsland_Mart_MapEvents @ 0x83BEE40 + .4byte FourIsland_Mart_MapScripts @ 0x8171CAD .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 10 diff --git a/data/maps/FourIsland_PokemonCenter_1F/header.inc b/data/maps/FourIsland_PokemonCenter_1F/header.inc index 151688304..917d92aaf 100644 --- a/data/maps/FourIsland_PokemonCenter_1F/header.inc +++ b/data/maps/FourIsland_PokemonCenter_1F/header.inc @@ -1,7 +1,7 @@ FourIsland_PokemonCenter_1F:: @ 8351D80 .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte gMapEvents_FourIsland_PokemonCenter_1F @ 0x83BEB00 - .4byte gMapScripts_FourIsland_PokemonCenter_1F @ 0x8171BEA + .4byte FourIsland_PokemonCenter_1F_MapEvents @ 0x83BEB00 + .4byte FourIsland_PokemonCenter_1F_MapScripts @ 0x8171BEA .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 8 diff --git a/data/maps/FourIsland_PokemonCenter_2F/header.inc b/data/maps/FourIsland_PokemonCenter_2F/header.inc index c79978793..839d75196 100644 --- a/data/maps/FourIsland_PokemonCenter_2F/header.inc +++ b/data/maps/FourIsland_PokemonCenter_2F/header.inc @@ -1,7 +1,7 @@ FourIsland_PokemonCenter_2F:: @ 8351D9C .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte gMapEvents_FourIsland_PokemonCenter_2F @ 0x83BEB8C - .4byte gMapScripts_FourIsland_PokemonCenter_2F @ 0x8171C1D + .4byte FourIsland_PokemonCenter_2F_MapEvents @ 0x83BEB8C + .4byte FourIsland_PokemonCenter_2F_MapScripts @ 0x8171C1D .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 9 diff --git a/data/maps/FourIsland_PokemonDayCare/header.inc b/data/maps/FourIsland_PokemonDayCare/header.inc index 31aa92deb..7cea7eaa5 100644 --- a/data/maps/FourIsland_PokemonDayCare/header.inc +++ b/data/maps/FourIsland_PokemonDayCare/header.inc @@ -1,7 +1,7 @@ FourIsland_PokemonDayCare:: @ 8351D64 .4byte FourIsland_PokemonDayCare_Layout @ 0x833AFA8 - .4byte gMapEvents_FourIsland_PokemonDayCare @ 0x83BEA64 - .4byte gMapScripts_FourIsland_PokemonDayCare @ 0x817193F + .4byte FourIsland_PokemonDayCare_MapEvents @ 0x83BEA64 + .4byte FourIsland_PokemonDayCare_MapScripts @ 0x817193F .4byte NULL .2byte BGM_FRLG_ISLAND_FOUR .2byte 277 diff --git a/data/maps/FuchsiaCity/header.inc b/data/maps/FuchsiaCity/header.inc index 8017613bc..b4a33e9c5 100644 --- a/data/maps/FuchsiaCity/header.inc +++ b/data/maps/FuchsiaCity/header.inc @@ -1,7 +1,7 @@ FuchsiaCity:: @ 83506DC .4byte FuchsiaCity_Layout @ 0x82E373C - .4byte gMapEvents_FuchsiaCity @ 0x83B5B14 - .4byte gMapScripts_FuchsiaCity @ 0x8166D75 + .4byte FuchsiaCity_MapEvents @ 0x83B5B14 + .4byte FuchsiaCity_MapScripts @ 0x8166D75 .4byte FuchsiaCity_MapConnections @ 0x8352888 .2byte BGM_FRLG_CERULEAN_CITY .2byte 85 diff --git a/data/maps/FuchsiaCity_Building1/header.inc b/data/maps/FuchsiaCity_Building1/header.inc index db876f27c..f598da548 100644 --- a/data/maps/FuchsiaCity_Building1/header.inc +++ b/data/maps/FuchsiaCity_Building1/header.inc @@ -1,7 +1,7 @@ FuchsiaCity_Building1:: @ 83514DC .4byte FuchsiaCity_Building1_Layout @ 0x831C48C - .4byte gMapEvents_FuchsiaCity_Building1 @ 0x83BC3F4 - .4byte gMapScripts_FuchsiaCity_Building1 @ 0x816D74B + .4byte FuchsiaCity_Building1_MapEvents @ 0x83BC3F4 + .4byte FuchsiaCity_Building1_MapScripts @ 0x816D74B .4byte NULL .2byte BGM_FRLG_CERULEAN_CITY .2byte 201 diff --git a/data/maps/FuchsiaCity_Gym/header.inc b/data/maps/FuchsiaCity_Gym/header.inc index ed9dfef9e..16aeeb007 100644 --- a/data/maps/FuchsiaCity_Gym/header.inc +++ b/data/maps/FuchsiaCity_Gym/header.inc @@ -1,7 +1,7 @@ FuchsiaCity_Gym:: @ 835146C .4byte FuchsiaCity_Gym_Layout @ 0x82D6A04 - .4byte gMapEvents_FuchsiaCity_Gym @ 0x83BC1A4 - .4byte gMapScripts_FuchsiaCity_Gym @ 0x816D54D + .4byte FuchsiaCity_Gym_MapEvents @ 0x83BC1A4 + .4byte FuchsiaCity_Gym_MapScripts @ 0x816D54D .4byte NULL .2byte BGM_FRLG_GYM .2byte 20 diff --git a/data/maps/FuchsiaCity_House1/header.inc b/data/maps/FuchsiaCity_House1/header.inc index ced57d5dd..018383387 100644 --- a/data/maps/FuchsiaCity_House1/header.inc +++ b/data/maps/FuchsiaCity_House1/header.inc @@ -1,7 +1,7 @@ FuchsiaCity_House1:: @ 8351488 .4byte House1_Layout @ 0x82D5754 - .4byte gMapEvents_FuchsiaCity_House1 @ 0x83BC218 - .4byte gMapScripts_FuchsiaCity_House1 @ 0x816D6C5 + .4byte FuchsiaCity_House1_MapEvents @ 0x83BC218 + .4byte FuchsiaCity_House1_MapScripts @ 0x816D6C5 .4byte NULL .2byte BGM_FRLG_CERULEAN_CITY .2byte 6 diff --git a/data/maps/FuchsiaCity_House2/header.inc b/data/maps/FuchsiaCity_House2/header.inc index 7dbe95373..6bedf2ac0 100644 --- a/data/maps/FuchsiaCity_House2/header.inc +++ b/data/maps/FuchsiaCity_House2/header.inc @@ -1,7 +1,7 @@ FuchsiaCity_House2:: @ 83514F8 .4byte FuchsiaCity_House2_Layout @ 0x831C578 - .4byte gMapEvents_FuchsiaCity_House2 @ 0x83BC440 - .4byte gMapScripts_FuchsiaCity_House2 @ 0x816D816 + .4byte FuchsiaCity_House2_MapEvents @ 0x83BC440 + .4byte FuchsiaCity_House2_MapScripts @ 0x816D816 .4byte NULL .2byte BGM_FRLG_CERULEAN_CITY .2byte 202 diff --git a/data/maps/FuchsiaCity_House3/header.inc b/data/maps/FuchsiaCity_House3/header.inc index 6cd078957..3b4f76d09 100644 --- a/data/maps/FuchsiaCity_House3/header.inc +++ b/data/maps/FuchsiaCity_House3/header.inc @@ -1,7 +1,7 @@ FuchsiaCity_House3:: @ 8351514 .4byte House1_Layout @ 0x82D5754 - .4byte gMapEvents_FuchsiaCity_House3 @ 0x83BC474 - .4byte gMapScripts_FuchsiaCity_House3 @ 0x816D894 + .4byte FuchsiaCity_House3_MapEvents @ 0x83BC474 + .4byte FuchsiaCity_House3_MapScripts @ 0x816D894 .4byte NULL .2byte BGM_FRLG_CERULEAN_CITY .2byte 6 diff --git a/data/maps/FuchsiaCity_Mart/header.inc b/data/maps/FuchsiaCity_Mart/header.inc index 7e3661618..705b0f301 100644 --- a/data/maps/FuchsiaCity_Mart/header.inc +++ b/data/maps/FuchsiaCity_Mart/header.inc @@ -1,7 +1,7 @@ FuchsiaCity_Mart:: @ 8351434 .4byte Mart_Layout @ 0x82D5BCC - .4byte gMapEvents_FuchsiaCity_Mart @ 0x83BC014 - .4byte gMapScripts_FuchsiaCity_Mart @ 0x816D4E0 + .4byte FuchsiaCity_Mart_MapEvents @ 0x83BC014 + .4byte FuchsiaCity_Mart_MapScripts @ 0x816D4E0 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 10 diff --git a/data/maps/FuchsiaCity_PokemonCenter_1F/header.inc b/data/maps/FuchsiaCity_PokemonCenter_1F/header.inc index da90f4470..2d88508c4 100644 --- a/data/maps/FuchsiaCity_PokemonCenter_1F/header.inc +++ b/data/maps/FuchsiaCity_PokemonCenter_1F/header.inc @@ -1,7 +1,7 @@ FuchsiaCity_PokemonCenter_1F:: @ 83514A4 .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte gMapEvents_FuchsiaCity_PokemonCenter_1F @ 0x83BC2AC - .4byte gMapScripts_FuchsiaCity_PokemonCenter_1F @ 0x816D6F1 + .4byte FuchsiaCity_PokemonCenter_1F_MapEvents @ 0x83BC2AC + .4byte FuchsiaCity_PokemonCenter_1F_MapScripts @ 0x816D6F1 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 8 diff --git a/data/maps/FuchsiaCity_PokemonCenter_2F/header.inc b/data/maps/FuchsiaCity_PokemonCenter_2F/header.inc index 890dc2977..6beffe603 100644 --- a/data/maps/FuchsiaCity_PokemonCenter_2F/header.inc +++ b/data/maps/FuchsiaCity_PokemonCenter_2F/header.inc @@ -1,7 +1,7 @@ FuchsiaCity_PokemonCenter_2F:: @ 83514C0 .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte gMapEvents_FuchsiaCity_PokemonCenter_2F @ 0x83BC338 - .4byte gMapScripts_FuchsiaCity_PokemonCenter_2F @ 0x816D724 + .4byte FuchsiaCity_PokemonCenter_2F_MapEvents @ 0x83BC338 + .4byte FuchsiaCity_PokemonCenter_2F_MapScripts @ 0x816D724 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 9 diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/header.inc b/data/maps/FuchsiaCity_SafariZone_Entrance/header.inc index f83a6b62f..7bfaeb1ec 100644 --- a/data/maps/FuchsiaCity_SafariZone_Entrance/header.inc +++ b/data/maps/FuchsiaCity_SafariZone_Entrance/header.inc @@ -1,7 +1,7 @@ FuchsiaCity_SafariZone_Entrance:: @ 8351418 .4byte FuchsiaCity_SafariZone_Entrance_Layout @ 0x82D8E80 - .4byte gMapEvents_FuchsiaCity_SafariZone_Entrance @ 0x83BBFA0 - .4byte gMapScripts_FuchsiaCity_SafariZone_Entrance @ 0x816D2A8 + .4byte FuchsiaCity_SafariZone_Entrance_MapEvents @ 0x83BBFA0 + .4byte FuchsiaCity_SafariZone_Entrance_MapScripts @ 0x816D2A8 .4byte NULL .2byte BGM_FRLG_CERULEAN_CITY .2byte 51 diff --git a/data/maps/FuchsiaCity_ZooBuilding/header.inc b/data/maps/FuchsiaCity_ZooBuilding/header.inc index a47f66952..e5ad3ae0c 100644 --- a/data/maps/FuchsiaCity_ZooBuilding/header.inc +++ b/data/maps/FuchsiaCity_ZooBuilding/header.inc @@ -1,7 +1,7 @@ FuchsiaCity_ZooBuilding:: @ 8351450 .4byte FuchsiaCity_ZooBuilding_Layout @ 0x831C348 - .4byte gMapEvents_FuchsiaCity_ZooBuilding @ 0x83BC0A0 - .4byte gMapScripts_FuchsiaCity_ZooBuilding @ 0x816D528 + .4byte FuchsiaCity_ZooBuilding_MapEvents @ 0x83BC0A0 + .4byte FuchsiaCity_ZooBuilding_MapScripts @ 0x816D528 .4byte NULL .2byte BGM_FRLG_CERULEAN_CITY .2byte 200 diff --git a/data/maps/IndigoPlateau_Exterior/header.inc b/data/maps/IndigoPlateau_Exterior/header.inc index f6d13a5f5..c40993e89 100644 --- a/data/maps/IndigoPlateau_Exterior/header.inc +++ b/data/maps/IndigoPlateau_Exterior/header.inc @@ -1,7 +1,7 @@ IndigoPlateau_Exterior:: @ 8350714 .4byte IndigoPlateau_Exterior_Layout @ 0x82E3F04 - .4byte gMapEvents_IndigoPlateau_Exterior @ 0x83B5C3C - .4byte gMapScripts_IndigoPlateau_Exterior @ 0x816723B + .4byte IndigoPlateau_Exterior_MapEvents @ 0x83B5C3C + .4byte IndigoPlateau_Exterior_MapScripts @ 0x816723B .4byte IndigoPlateau_Exterior_MapConnections @ 0x83528BC .2byte BGM_FRLG_INDIGO_PLATEAU .2byte 87 diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/header.inc b/data/maps/IndigoPlateau_PokemonCenter_1F/header.inc index 48d8200cd..bb16f0475 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_1F/header.inc +++ b/data/maps/IndigoPlateau_PokemonCenter_1F/header.inc @@ -1,7 +1,7 @@ IndigoPlateau_PokemonCenter_1F:: @ 8351610 .4byte IndigoPlateau_PokemonCenter_1F_Layout @ 0x831F000 - .4byte gMapEvents_IndigoPlateau_PokemonCenter_1F @ 0x83BCA94 - .4byte gMapScripts_IndigoPlateau_PokemonCenter_1F @ 0x816EA5A + .4byte IndigoPlateau_PokemonCenter_1F_MapEvents @ 0x83BCA94 + .4byte IndigoPlateau_PokemonCenter_1F_MapScripts @ 0x816EA5A .4byte NULL .2byte BGM_FRLG_GYM .2byte 212 diff --git a/data/maps/IndigoPlateau_PokemonCenter_2F/header.inc b/data/maps/IndigoPlateau_PokemonCenter_2F/header.inc index 9b88ab689..604c361d8 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_2F/header.inc +++ b/data/maps/IndigoPlateau_PokemonCenter_2F/header.inc @@ -1,7 +1,7 @@ IndigoPlateau_PokemonCenter_2F:: @ 835162C .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte gMapEvents_IndigoPlateau_PokemonCenter_2F @ 0x83BCB20 - .4byte gMapScripts_IndigoPlateau_PokemonCenter_2F @ 0x816EB0F + .4byte IndigoPlateau_PokemonCenter_2F_MapEvents @ 0x83BCB20 + .4byte IndigoPlateau_PokemonCenter_2F_MapScripts @ 0x816EB0F .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 9 diff --git a/data/maps/LavenderTown/header.inc b/data/maps/LavenderTown/header.inc index ba459c4ac..24913dc46 100644 --- a/data/maps/LavenderTown/header.inc +++ b/data/maps/LavenderTown/header.inc @@ -1,7 +1,7 @@ LavenderTown:: @ 8350688 .4byte LavenderTown_Layout @ 0x82E0610 - .4byte gMapEvents_LavenderTown @ 0x83B549C - .4byte gMapScripts_LavenderTown @ 0x816686B + .4byte LavenderTown_MapEvents @ 0x83B549C + .4byte LavenderTown_MapScripts @ 0x816686B .4byte LavenderTown_MapConnections @ 0x835281C .2byte BGM_FRLG_LAVENDER_TOWN .2byte 82 diff --git a/data/maps/LavenderTown_House1/header.inc b/data/maps/LavenderTown_House1/header.inc index 1ce5034eb..5c11f9ff5 100644 --- a/data/maps/LavenderTown_House1/header.inc +++ b/data/maps/LavenderTown_House1/header.inc @@ -1,7 +1,7 @@ LavenderTown_House1:: @ 83510B4 .4byte House5_Layout @ 0x82D6AF0 - .4byte gMapEvents_LavenderTown_House1 @ 0x83BAA58 - .4byte gMapScripts_LavenderTown_House1 @ 0x816B232 + .4byte LavenderTown_House1_MapEvents @ 0x83BAA58 + .4byte LavenderTown_House1_MapScripts @ 0x816B232 .4byte NULL .2byte BGM_FRLG_LAVENDER_TOWN .2byte 21 diff --git a/data/maps/LavenderTown_House2/header.inc b/data/maps/LavenderTown_House2/header.inc index 87ec9bcde..30f103a05 100644 --- a/data/maps/LavenderTown_House2/header.inc +++ b/data/maps/LavenderTown_House2/header.inc @@ -1,7 +1,7 @@ LavenderTown_House2:: @ 83510D0 .4byte House5_Layout @ 0x82D6AF0 - .4byte gMapEvents_LavenderTown_House2 @ 0x83BAA9C - .4byte gMapScripts_LavenderTown_House2 @ 0x816B265 + .4byte LavenderTown_House2_MapEvents @ 0x83BAA9C + .4byte LavenderTown_House2_MapScripts @ 0x816B265 .4byte NULL .2byte BGM_FRLG_CERULEAN_CITY .2byte 21 diff --git a/data/maps/LavenderTown_Mart/header.inc b/data/maps/LavenderTown_Mart/header.inc index 593229dc4..848c25d72 100644 --- a/data/maps/LavenderTown_Mart/header.inc +++ b/data/maps/LavenderTown_Mart/header.inc @@ -1,7 +1,7 @@ LavenderTown_Mart:: @ 83510EC .4byte Mart_Layout @ 0x82D5BCC - .4byte gMapEvents_LavenderTown_Mart @ 0x83BAB28 - .4byte gMapScripts_LavenderTown_Mart @ 0x816B34F + .4byte LavenderTown_Mart_MapEvents @ 0x83BAB28 + .4byte LavenderTown_Mart_MapScripts @ 0x816B34F .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 10 diff --git a/data/maps/LavenderTown_PokemonCenter_1F/header.inc b/data/maps/LavenderTown_PokemonCenter_1F/header.inc index 65952d0a1..ecf848112 100644 --- a/data/maps/LavenderTown_PokemonCenter_1F/header.inc +++ b/data/maps/LavenderTown_PokemonCenter_1F/header.inc @@ -1,7 +1,7 @@ LavenderTown_PokemonCenter_1F:: @ 8351060 .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte gMapEvents_LavenderTown_PokemonCenter_1F @ 0x83BA890 - .4byte gMapScripts_LavenderTown_PokemonCenter_1F @ 0x816B0EF + .4byte LavenderTown_PokemonCenter_1F_MapEvents @ 0x83BA890 + .4byte LavenderTown_PokemonCenter_1F_MapScripts @ 0x816B0EF .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 8 diff --git a/data/maps/LavenderTown_PokemonCenter_2F/header.inc b/data/maps/LavenderTown_PokemonCenter_2F/header.inc index 81e4c42e5..99713d4c8 100644 --- a/data/maps/LavenderTown_PokemonCenter_2F/header.inc +++ b/data/maps/LavenderTown_PokemonCenter_2F/header.inc @@ -1,7 +1,7 @@ LavenderTown_PokemonCenter_2F:: @ 835107C .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte gMapEvents_LavenderTown_PokemonCenter_2F @ 0x83BA91C - .4byte gMapScripts_LavenderTown_PokemonCenter_2F @ 0x816B122 + .4byte LavenderTown_PokemonCenter_2F_MapEvents @ 0x83BA91C + .4byte LavenderTown_PokemonCenter_2F_MapScripts @ 0x816B122 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 9 diff --git a/data/maps/LavenderTown_VolunteerPokemonHouse/header.inc b/data/maps/LavenderTown_VolunteerPokemonHouse/header.inc index 2d58479f3..b10a4798f 100644 --- a/data/maps/LavenderTown_VolunteerPokemonHouse/header.inc +++ b/data/maps/LavenderTown_VolunteerPokemonHouse/header.inc @@ -1,7 +1,7 @@ LavenderTown_VolunteerPokemonHouse:: @ 8351098 .4byte LavenderTown_VolunteerPokemonHouse_Layout @ 0x833ACC4 - .4byte gMapEvents_LavenderTown_VolunteerPokemonHouse @ 0x83BA9FC - .4byte gMapScripts_LavenderTown_VolunteerPokemonHouse @ 0x816B149 + .4byte LavenderTown_VolunteerPokemonHouse_MapEvents @ 0x83BA9FC + .4byte LavenderTown_VolunteerPokemonHouse_MapScripts @ 0x816B149 .4byte NULL .2byte BGM_FRLG_LAVENDER_TOWN .2byte 274 diff --git a/data/maps/MtEmber_Exterior/header.inc b/data/maps/MtEmber_Exterior/header.inc index ef95fc172..8d43c8d97 100644 --- a/data/maps/MtEmber_Exterior/header.inc +++ b/data/maps/MtEmber_Exterior/header.inc @@ -1,7 +1,7 @@ MtEmber_Exterior:: @ 834FCB0 .4byte MtEmber_Exterior_Layout @ 0x833D660 - .4byte gMapEvents_MtEmber_Exterior @ 0x83B2C24 - .4byte gMapScripts_MtEmber_Exterior @ 0x8163946 + .4byte MtEmber_Exterior_MapEvents @ 0x83B2C24 + .4byte MtEmber_Exterior_MapScripts @ 0x8163946 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 280 diff --git a/data/maps/MtEmber_RubyPath_B1F/header.inc b/data/maps/MtEmber_RubyPath_B1F/header.inc index bf10f81e3..659721b8b 100644 --- a/data/maps/MtEmber_RubyPath_B1F/header.inc +++ b/data/maps/MtEmber_RubyPath_B1F/header.inc @@ -1,7 +1,7 @@ MtEmber_RubyPath_B1F:: @ 834FD74 .4byte MtEmber_RubyPath_B1F_Layout @ 0x833F524 - .4byte gMapEvents_MtEmber_RubyPath_B1F @ 0x83B2F64 - .4byte gMapScripts_MtEmber_RubyPath_B1F @ 0x8163C46 + .4byte MtEmber_RubyPath_B1F_MapEvents @ 0x83B2F64 + .4byte MtEmber_RubyPath_B1F_MapScripts @ 0x8163C46 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 286 diff --git a/data/maps/MtEmber_RubyPath_B1F_Stairs/header.inc b/data/maps/MtEmber_RubyPath_B1F_Stairs/header.inc index 8da609b21..605a4c539 100644 --- a/data/maps/MtEmber_RubyPath_B1F_Stairs/header.inc +++ b/data/maps/MtEmber_RubyPath_B1F_Stairs/header.inc @@ -1,7 +1,7 @@ MtEmber_RubyPath_B1F_Stairs:: @ 834FDC8 .4byte MtEmber_RubyPath_B1F_Stairs_Layout @ 0x833FCD8 - .4byte gMapEvents_MtEmber_RubyPath_B1F_Stairs @ 0x83B3188 - .4byte gMapScripts_MtEmber_RubyPath_B1F_Stairs @ 0x8163C6F + .4byte MtEmber_RubyPath_B1F_Stairs_MapEvents @ 0x83B3188 + .4byte MtEmber_RubyPath_B1F_Stairs_MapScripts @ 0x8163C6F .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 289 diff --git a/data/maps/MtEmber_RubyPath_B2F/header.inc b/data/maps/MtEmber_RubyPath_B2F/header.inc index f390388e4..817cf2e47 100644 --- a/data/maps/MtEmber_RubyPath_B2F/header.inc +++ b/data/maps/MtEmber_RubyPath_B2F/header.inc @@ -1,7 +1,7 @@ MtEmber_RubyPath_B2F:: @ 834FD90 .4byte MtEmber_RubyPath_B2F_Layout @ 0x833F6A8 - .4byte gMapEvents_MtEmber_RubyPath_B2F @ 0x83B3030 - .4byte gMapScripts_MtEmber_RubyPath_B2F @ 0x8163C47 + .4byte MtEmber_RubyPath_B2F_MapEvents @ 0x83B3030 + .4byte MtEmber_RubyPath_B2F_MapScripts @ 0x8163C47 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 287 diff --git a/data/maps/MtEmber_RubyPath_B2F_Stairs/header.inc b/data/maps/MtEmber_RubyPath_B2F_Stairs/header.inc index 1b502c77b..875d1f224 100644 --- a/data/maps/MtEmber_RubyPath_B2F_Stairs/header.inc +++ b/data/maps/MtEmber_RubyPath_B2F_Stairs/header.inc @@ -1,7 +1,7 @@ MtEmber_RubyPath_B2F_Stairs:: @ 834FDE4 .4byte MtEmber_RubyPath_B2F_Stairs_Layout @ 0x833FD5C - .4byte gMapEvents_MtEmber_RubyPath_B2F_Stairs @ 0x83B31DC - .4byte gMapScripts_MtEmber_RubyPath_B2F_Stairs @ 0x8163C70 + .4byte MtEmber_RubyPath_B2F_Stairs_MapEvents @ 0x83B31DC + .4byte MtEmber_RubyPath_B2F_Stairs_MapScripts @ 0x8163C70 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 290 diff --git a/data/maps/MtEmber_RubyPath_B3F/header.inc b/data/maps/MtEmber_RubyPath_B3F/header.inc index d0936221e..bcf17a29f 100644 --- a/data/maps/MtEmber_RubyPath_B3F/header.inc +++ b/data/maps/MtEmber_RubyPath_B3F/header.inc @@ -1,7 +1,7 @@ MtEmber_RubyPath_B3F:: @ 834FDAC .4byte MtEmber_RubyPath_B3F_Layout @ 0x833FC60 - .4byte gMapEvents_MtEmber_RubyPath_B3F @ 0x83B314C - .4byte gMapScripts_MtEmber_RubyPath_B3F @ 0x8163C48 + .4byte MtEmber_RubyPath_B3F_MapEvents @ 0x83B314C + .4byte MtEmber_RubyPath_B3F_MapScripts @ 0x8163C48 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 288 diff --git a/data/maps/MtEmber_RubyPath_B4F/header.inc b/data/maps/MtEmber_RubyPath_B4F/header.inc index b91482b18..e6c316632 100644 --- a/data/maps/MtEmber_RubyPath_B4F/header.inc +++ b/data/maps/MtEmber_RubyPath_B4F/header.inc @@ -1,7 +1,7 @@ MtEmber_RubyPath_B4F:: @ 834FC94 .4byte MtEmber_RubyPath_B4F_Layout @ 0x8339290 - .4byte gMapEvents_MtEmber_RubyPath_B4F @ 0x83B29B8 - .4byte gMapScripts_MtEmber_RubyPath_B4F @ 0x81638EB + .4byte MtEmber_RubyPath_B4F_MapEvents @ 0x83B29B8 + .4byte MtEmber_RubyPath_B4F_MapScripts @ 0x81638EB .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 269 diff --git a/data/maps/MtEmber_RubyPath_B5F/header.inc b/data/maps/MtEmber_RubyPath_B5F/header.inc index 1a351c127..8fbb65498 100644 --- a/data/maps/MtEmber_RubyPath_B5F/header.inc +++ b/data/maps/MtEmber_RubyPath_B5F/header.inc @@ -1,7 +1,7 @@ MtEmber_RubyPath_B5F:: @ 834FD3C .4byte MtEmber_RubyPath_B5F_Layout @ 0x833FF60 - .4byte gMapEvents_MtEmber_RubyPath_B5F @ 0x83B2E3C - .4byte gMapScripts_MtEmber_RubyPath_B5F @ 0x8163BAA + .4byte MtEmber_RubyPath_B5F_MapEvents @ 0x83B2E3C + .4byte MtEmber_RubyPath_B5F_MapScripts @ 0x8163BAA .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 291 diff --git a/data/maps/MtEmber_Summit/header.inc b/data/maps/MtEmber_Summit/header.inc index 367a35294..64c30d948 100644 --- a/data/maps/MtEmber_Summit/header.inc +++ b/data/maps/MtEmber_Summit/header.inc @@ -1,7 +1,7 @@ MtEmber_Summit:: @ 834FD20 .4byte MtEmber_Summit_Layout @ 0x833D9C8 - .4byte gMapEvents_MtEmber_Summit @ 0x83B2DFC - .4byte gMapScripts_MtEmber_Summit @ 0x8163AFC + .4byte MtEmber_Summit_MapEvents @ 0x83B2DFC + .4byte MtEmber_Summit_MapScripts @ 0x8163AFC .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 281 diff --git a/data/maps/MtEmber_SummitPath_1F/header.inc b/data/maps/MtEmber_SummitPath_1F/header.inc index 0ea8992a8..380374d2d 100644 --- a/data/maps/MtEmber_SummitPath_1F/header.inc +++ b/data/maps/MtEmber_SummitPath_1F/header.inc @@ -1,7 +1,7 @@ MtEmber_SummitPath_1F:: @ 834FCCC .4byte MtEmber_SummitPath_1F_Layout @ 0x833DC08 - .4byte gMapEvents_MtEmber_SummitPath_1F @ 0x83B2C48 - .4byte gMapScripts_MtEmber_SummitPath_1F @ 0x8163AF9 + .4byte MtEmber_SummitPath_1F_MapEvents @ 0x83B2C48 + .4byte MtEmber_SummitPath_1F_MapScripts @ 0x8163AF9 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 282 diff --git a/data/maps/MtEmber_SummitPath_2F/header.inc b/data/maps/MtEmber_SummitPath_2F/header.inc index 503410f81..b53170ef8 100644 --- a/data/maps/MtEmber_SummitPath_2F/header.inc +++ b/data/maps/MtEmber_SummitPath_2F/header.inc @@ -1,7 +1,7 @@ MtEmber_SummitPath_2F:: @ 834FCE8 .4byte MtEmber_SummitPath_2F_Layout @ 0x833ED6C - .4byte gMapEvents_MtEmber_SummitPath_2F @ 0x83B2D44 - .4byte gMapScripts_MtEmber_SummitPath_2F @ 0x8163AFA + .4byte MtEmber_SummitPath_2F_MapEvents @ 0x83B2D44 + .4byte MtEmber_SummitPath_2F_MapScripts @ 0x8163AFA .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 283 diff --git a/data/maps/MtEmber_SummitPath_3F/header.inc b/data/maps/MtEmber_SummitPath_3F/header.inc index 35170cadb..0d6829bab 100644 --- a/data/maps/MtEmber_SummitPath_3F/header.inc +++ b/data/maps/MtEmber_SummitPath_3F/header.inc @@ -1,7 +1,7 @@ MtEmber_SummitPath_3F:: @ 834FD04 .4byte MtEmber_SummitPath_3F_Layout @ 0x833EEDC - .4byte gMapEvents_MtEmber_SummitPath_3F @ 0x83B2D68 - .4byte gMapScripts_MtEmber_SummitPath_3F @ 0x8163AFB + .4byte MtEmber_SummitPath_3F_MapEvents @ 0x83B2D68 + .4byte MtEmber_SummitPath_3F_MapScripts @ 0x8163AFB .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 284 diff --git a/data/maps/MtMoon_1F/header.inc b/data/maps/MtMoon_1F/header.inc index 3c5cd8a69..13f9175f3 100644 --- a/data/maps/MtMoon_1F/header.inc +++ b/data/maps/MtMoon_1F/header.inc @@ -1,7 +1,7 @@ MtMoon_1F:: @ 834F230 .4byte MtMoon_1F_Layout @ 0x82FA890 - .4byte gMapEvents_MtMoon_1F @ 0x83AE668 - .4byte gMapScripts_MtMoon_1F @ 0x81605E4 + .4byte MtMoon_1F_MapEvents @ 0x83AE668 + .4byte MtMoon_1F_MapScripts @ 0x81605E4 .4byte NULL .2byte BGM_FRLG_MT_MOON .2byte 114 diff --git a/data/maps/MtMoon_B1F/header.inc b/data/maps/MtMoon_B1F/header.inc index 718e761e4..83f710180 100644 --- a/data/maps/MtMoon_B1F/header.inc +++ b/data/maps/MtMoon_B1F/header.inc @@ -1,7 +1,7 @@ MtMoon_B1F:: @ 834F24C .4byte MtMoon_B1F_Layout @ 0x82FB804 - .4byte gMapEvents_MtMoon_B1F @ 0x83AE704 - .4byte gMapScripts_MtMoon_B1F @ 0x8160698 + .4byte MtMoon_B1F_MapEvents @ 0x83AE704 + .4byte MtMoon_B1F_MapScripts @ 0x8160698 .4byte NULL .2byte BGM_FRLG_MT_MOON .2byte 115 diff --git a/data/maps/MtMoon_B2F/header.inc b/data/maps/MtMoon_B2F/header.inc index 90329479b..d84f5a668 100644 --- a/data/maps/MtMoon_B2F/header.inc +++ b/data/maps/MtMoon_B2F/header.inc @@ -1,7 +1,7 @@ MtMoon_B2F:: @ 834F268 .4byte MtMoon_B2F_Layout @ 0x82FC728 - .4byte gMapEvents_MtMoon_B2F @ 0x83AE868 - .4byte gMapScripts_MtMoon_B2F @ 0x8160699 + .4byte MtMoon_B2F_MapEvents @ 0x83AE868 + .4byte MtMoon_B2F_MapScripts @ 0x8160699 .4byte NULL .2byte BGM_FRLG_MT_MOON .2byte 116 diff --git a/data/maps/NavelRock_1F/header.inc b/data/maps/NavelRock_1F/header.inc index ec20cfcb6..770c47ebc 100644 --- a/data/maps/NavelRock_1F/header.inc +++ b/data/maps/NavelRock_1F/header.inc @@ -1,7 +1,7 @@ NavelRock_1F:: @ 8350378 .4byte NavelRock_1F_Layout @ 0x8348AD4 - .4byte gMapEvents_NavelRock_1F @ 0x83B48E0 - .4byte gMapScripts_NavelRock_1F @ 0x8164F9E + .4byte NavelRock_1F_MapEvents @ 0x83B48E0 + .4byte NavelRock_1F_MapScripts @ 0x8164F9E .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 344 diff --git a/data/maps/NavelRock_B1F/header.inc b/data/maps/NavelRock_B1F/header.inc index 433e62694..b9d2192a8 100644 --- a/data/maps/NavelRock_B1F/header.inc +++ b/data/maps/NavelRock_B1F/header.inc @@ -1,7 +1,7 @@ NavelRock_B1F:: @ 8350570 .4byte NavelRock_B1F_Layout @ 0x834A210 - .4byte gMapEvents_NavelRock_B1F @ 0x83B4BA4 - .4byte gMapScripts_NavelRock_B1F @ 0x8165201 + .4byte NavelRock_B1F_MapEvents @ 0x83B4BA4 + .4byte NavelRock_B1F_MapScripts @ 0x8165201 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 364 diff --git a/data/maps/NavelRock_Base/header.inc b/data/maps/NavelRock_Base/header.inc index bf472a849..e452edef9 100644 --- a/data/maps/NavelRock_Base/header.inc +++ b/data/maps/NavelRock_Base/header.inc @@ -1,7 +1,7 @@ NavelRock_Base:: @ 83503B0 .4byte NavelRock_Base_Layout @ 0x834929C - .4byte gMapEvents_NavelRock_Base @ 0x83B4964 - .4byte gMapScripts_NavelRock_Base @ 0x81650E7 + .4byte NavelRock_Base_MapEvents @ 0x83B4964 + .4byte NavelRock_Base_MapScripts @ 0x81650E7 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 346 diff --git a/data/maps/NavelRock_BasePath_B10F/header.inc b/data/maps/NavelRock_BasePath_B10F/header.inc index e08eb617b..5354c6f9f 100644 --- a/data/maps/NavelRock_BasePath_B10F/header.inc +++ b/data/maps/NavelRock_BasePath_B10F/header.inc @@ -1,7 +1,7 @@ NavelRock_BasePath_B10F:: @ 8350538 .4byte NavelRock_BasePath_B10F_Layout @ 0x8349A0C - .4byte gMapEvents_NavelRock_BasePath_B10F @ 0x83B4B5C - .4byte gMapScripts_NavelRock_BasePath_B10F @ 0x81651FF + .4byte NavelRock_BasePath_B10F_MapEvents @ 0x83B4B5C + .4byte NavelRock_BasePath_B10F_MapScripts @ 0x81651FF .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 360 diff --git a/data/maps/NavelRock_BasePath_B11F/header.inc b/data/maps/NavelRock_BasePath_B11F/header.inc index 5803aa630..395f9d82a 100644 --- a/data/maps/NavelRock_BasePath_B11F/header.inc +++ b/data/maps/NavelRock_BasePath_B11F/header.inc @@ -1,7 +1,7 @@ NavelRock_BasePath_B11F:: @ 8350554 .4byte NavelRock_BasePath_B11F_Layout @ 0x8349A94 - .4byte gMapEvents_NavelRock_BasePath_B11F @ 0x83B4B80 - .4byte gMapScripts_NavelRock_BasePath_B11F @ 0x8165200 + .4byte NavelRock_BasePath_B11F_MapEvents @ 0x83B4B80 + .4byte NavelRock_BasePath_B11F_MapScripts @ 0x8165200 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 361 diff --git a/data/maps/NavelRock_BasePath_B1F/header.inc b/data/maps/NavelRock_BasePath_B1F/header.inc index e34db29ef..b7f59616a 100644 --- a/data/maps/NavelRock_BasePath_B1F/header.inc +++ b/data/maps/NavelRock_BasePath_B1F/header.inc @@ -1,7 +1,7 @@ NavelRock_BasePath_B1F:: @ 835043C .4byte NavelRock_BasePath_B1F_Layout @ 0x8349544 - .4byte gMapEvents_NavelRock_BasePath_B1F @ 0x83B4A18 - .4byte gMapScripts_NavelRock_BasePath_B1F @ 0x81651F6 + .4byte NavelRock_BasePath_B1F_MapEvents @ 0x83B4A18 + .4byte NavelRock_BasePath_B1F_MapScripts @ 0x81651F6 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 351 diff --git a/data/maps/NavelRock_BasePath_B2F/header.inc b/data/maps/NavelRock_BasePath_B2F/header.inc index bf0cc1d19..55a55d2ab 100644 --- a/data/maps/NavelRock_BasePath_B2F/header.inc +++ b/data/maps/NavelRock_BasePath_B2F/header.inc @@ -1,7 +1,7 @@ NavelRock_BasePath_B2F:: @ 8350458 .4byte NavelRock_BasePath_B2F_Layout @ 0x83495CC - .4byte gMapEvents_NavelRock_BasePath_B2F @ 0x83B4A3C - .4byte gMapScripts_NavelRock_BasePath_B2F @ 0x81651F7 + .4byte NavelRock_BasePath_B2F_MapEvents @ 0x83B4A3C + .4byte NavelRock_BasePath_B2F_MapScripts @ 0x81651F7 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 352 diff --git a/data/maps/NavelRock_BasePath_B3F/header.inc b/data/maps/NavelRock_BasePath_B3F/header.inc index 9a85457ec..a2c0a7871 100644 --- a/data/maps/NavelRock_BasePath_B3F/header.inc +++ b/data/maps/NavelRock_BasePath_B3F/header.inc @@ -1,7 +1,7 @@ NavelRock_BasePath_B3F:: @ 8350474 .4byte NavelRock_BasePath_B3F_Layout @ 0x8349654 - .4byte gMapEvents_NavelRock_BasePath_B3F @ 0x83B4A60 - .4byte gMapScripts_NavelRock_BasePath_B3F @ 0x81651F8 + .4byte NavelRock_BasePath_B3F_MapEvents @ 0x83B4A60 + .4byte NavelRock_BasePath_B3F_MapScripts @ 0x81651F8 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 353 diff --git a/data/maps/NavelRock_BasePath_B4F/header.inc b/data/maps/NavelRock_BasePath_B4F/header.inc index 75ea7719a..8ea714e88 100644 --- a/data/maps/NavelRock_BasePath_B4F/header.inc +++ b/data/maps/NavelRock_BasePath_B4F/header.inc @@ -1,7 +1,7 @@ NavelRock_BasePath_B4F:: @ 8350490 .4byte NavelRock_BasePath_B4F_Layout @ 0x83496DC - .4byte gMapEvents_NavelRock_BasePath_B4F @ 0x83B4A84 - .4byte gMapScripts_NavelRock_BasePath_B4F @ 0x81651F9 + .4byte NavelRock_BasePath_B4F_MapEvents @ 0x83B4A84 + .4byte NavelRock_BasePath_B4F_MapScripts @ 0x81651F9 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 354 diff --git a/data/maps/NavelRock_BasePath_B5F/header.inc b/data/maps/NavelRock_BasePath_B5F/header.inc index 8cc359f34..cceabefd2 100644 --- a/data/maps/NavelRock_BasePath_B5F/header.inc +++ b/data/maps/NavelRock_BasePath_B5F/header.inc @@ -1,7 +1,7 @@ NavelRock_BasePath_B5F:: @ 83504AC .4byte NavelRock_BasePath_B5F_Layout @ 0x8349764 - .4byte gMapEvents_NavelRock_BasePath_B5F @ 0x83B4AA8 - .4byte gMapScripts_NavelRock_BasePath_B5F @ 0x81651FA + .4byte NavelRock_BasePath_B5F_MapEvents @ 0x83B4AA8 + .4byte NavelRock_BasePath_B5F_MapScripts @ 0x81651FA .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 355 diff --git a/data/maps/NavelRock_BasePath_B6F/header.inc b/data/maps/NavelRock_BasePath_B6F/header.inc index d69c50370..e2c1d0fa6 100644 --- a/data/maps/NavelRock_BasePath_B6F/header.inc +++ b/data/maps/NavelRock_BasePath_B6F/header.inc @@ -1,7 +1,7 @@ NavelRock_BasePath_B6F:: @ 83504C8 .4byte NavelRock_BasePath_B6F_Layout @ 0x83497EC - .4byte gMapEvents_NavelRock_BasePath_B6F @ 0x83B4ACC - .4byte gMapScripts_NavelRock_BasePath_B6F @ 0x81651FB + .4byte NavelRock_BasePath_B6F_MapEvents @ 0x83B4ACC + .4byte NavelRock_BasePath_B6F_MapScripts @ 0x81651FB .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 356 diff --git a/data/maps/NavelRock_BasePath_B7F/header.inc b/data/maps/NavelRock_BasePath_B7F/header.inc index 409329aee..cfcafafb7 100644 --- a/data/maps/NavelRock_BasePath_B7F/header.inc +++ b/data/maps/NavelRock_BasePath_B7F/header.inc @@ -1,7 +1,7 @@ NavelRock_BasePath_B7F:: @ 83504E4 .4byte NavelRock_BasePath_B7F_Layout @ 0x8349874 - .4byte gMapEvents_NavelRock_BasePath_B7F @ 0x83B4AF0 - .4byte gMapScripts_NavelRock_BasePath_B7F @ 0x81651FC + .4byte NavelRock_BasePath_B7F_MapEvents @ 0x83B4AF0 + .4byte NavelRock_BasePath_B7F_MapScripts @ 0x81651FC .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 357 diff --git a/data/maps/NavelRock_BasePath_B8F/header.inc b/data/maps/NavelRock_BasePath_B8F/header.inc index 22015b53c..5849c2805 100644 --- a/data/maps/NavelRock_BasePath_B8F/header.inc +++ b/data/maps/NavelRock_BasePath_B8F/header.inc @@ -1,7 +1,7 @@ NavelRock_BasePath_B8F:: @ 8350500 .4byte NavelRock_BasePath_B8F_Layout @ 0x83498FC - .4byte gMapEvents_NavelRock_BasePath_B8F @ 0x83B4B14 - .4byte gMapScripts_NavelRock_BasePath_B8F @ 0x81651FD + .4byte NavelRock_BasePath_B8F_MapEvents @ 0x83B4B14 + .4byte NavelRock_BasePath_B8F_MapScripts @ 0x81651FD .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 358 diff --git a/data/maps/NavelRock_BasePath_B9F/header.inc b/data/maps/NavelRock_BasePath_B9F/header.inc index 84f332175..d8b3d5364 100644 --- a/data/maps/NavelRock_BasePath_B9F/header.inc +++ b/data/maps/NavelRock_BasePath_B9F/header.inc @@ -1,7 +1,7 @@ NavelRock_BasePath_B9F:: @ 835051C .4byte NavelRock_BasePath_B9F_Layout @ 0x8349984 - .4byte gMapEvents_NavelRock_BasePath_B9F @ 0x83B4B38 - .4byte gMapScripts_NavelRock_BasePath_B9F @ 0x81651FE + .4byte NavelRock_BasePath_B9F_MapEvents @ 0x83B4B38 + .4byte NavelRock_BasePath_B9F_MapScripts @ 0x81651FE .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 359 diff --git a/data/maps/NavelRock_Exterior/header.inc b/data/maps/NavelRock_Exterior/header.inc index 24326d2bf..0d62b0618 100644 --- a/data/maps/NavelRock_Exterior/header.inc +++ b/data/maps/NavelRock_Exterior/header.inc @@ -1,7 +1,7 @@ NavelRock_Exterior:: @ 834FF88 .4byte NavelRock_Exterior_Layout @ 0x834873C - .4byte gMapEvents_NavelRock_Exterior @ 0x83B3B74 - .4byte gMapScripts_NavelRock_Exterior @ 0x81646AE + .4byte NavelRock_Exterior_MapEvents @ 0x83B3B74 + .4byte NavelRock_Exterior_MapScripts @ 0x81646AE .4byte NULL .2byte BGM_FRLG_SEVII_ISLANDS .2byte 343 diff --git a/data/maps/NavelRock_Fork/header.inc b/data/maps/NavelRock_Fork/header.inc index 4d2dc4238..93ab89de4 100644 --- a/data/maps/NavelRock_Fork/header.inc +++ b/data/maps/NavelRock_Fork/header.inc @@ -1,7 +1,7 @@ NavelRock_Fork:: @ 835058C .4byte NavelRock_Fork_Layout @ 0x834B9A4 - .4byte gMapEvents_NavelRock_Fork @ 0x83B4BD0 - .4byte gMapScripts_NavelRock_Fork @ 0x8165202 + .4byte NavelRock_Fork_MapEvents @ 0x83B4BD0 + .4byte NavelRock_Fork_MapScripts @ 0x8165202 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 365 diff --git a/data/maps/NavelRock_Harbor/header.inc b/data/maps/NavelRock_Harbor/header.inc index 2a6e89bbe..39261ab96 100644 --- a/data/maps/NavelRock_Harbor/header.inc +++ b/data/maps/NavelRock_Harbor/header.inc @@ -1,7 +1,7 @@ NavelRock_Harbor:: @ 83505FC .4byte Island_Harbor_Layout @ 0x8343FB8 - .4byte gMapEvents_NavelRock_Harbor @ 0x83B4D70 - .4byte gMapScripts_NavelRock_Harbor @ 0x8165420 + .4byte NavelRock_Harbor_MapEvents @ 0x83B4D70 + .4byte NavelRock_Harbor_MapScripts @ 0x8165420 .4byte NULL .2byte BGM_FRLG_SEVII_ISLANDS .2byte 315 diff --git a/data/maps/NavelRock_Summit/header.inc b/data/maps/NavelRock_Summit/header.inc index 39b0c4d8f..d49b0dc14 100644 --- a/data/maps/NavelRock_Summit/header.inc +++ b/data/maps/NavelRock_Summit/header.inc @@ -1,7 +1,7 @@ NavelRock_Summit:: @ 8350394 .4byte NavelRock_Summit_Layout @ 0x8348EB0 - .4byte gMapEvents_NavelRock_Summit @ 0x83B4930 - .4byte gMapScripts_NavelRock_Summit @ 0x8164F9F + .4byte NavelRock_Summit_MapEvents @ 0x83B4930 + .4byte NavelRock_Summit_MapScripts @ 0x8164F9F .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 345 diff --git a/data/maps/NavelRock_SummitPath_2F/header.inc b/data/maps/NavelRock_SummitPath_2F/header.inc index bc56502b3..9ae52b8ca 100644 --- a/data/maps/NavelRock_SummitPath_2F/header.inc +++ b/data/maps/NavelRock_SummitPath_2F/header.inc @@ -1,7 +1,7 @@ NavelRock_SummitPath_2F:: @ 83503CC .4byte NavelRock_SummitPath_2F_Layout @ 0x8349324 - .4byte gMapEvents_NavelRock_SummitPath_2F @ 0x83B4988 - .4byte gMapScripts_NavelRock_SummitPath_2F @ 0x81651F2 + .4byte NavelRock_SummitPath_2F_MapEvents @ 0x83B4988 + .4byte NavelRock_SummitPath_2F_MapScripts @ 0x81651F2 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 347 diff --git a/data/maps/NavelRock_SummitPath_3F/header.inc b/data/maps/NavelRock_SummitPath_3F/header.inc index 3454ffd77..2eb984a8a 100644 --- a/data/maps/NavelRock_SummitPath_3F/header.inc +++ b/data/maps/NavelRock_SummitPath_3F/header.inc @@ -1,7 +1,7 @@ NavelRock_SummitPath_3F:: @ 83503E8 .4byte NavelRock_SummitPath_3F_Layout @ 0x83493AC - .4byte gMapEvents_NavelRock_SummitPath_3F @ 0x83B49AC - .4byte gMapScripts_NavelRock_SummitPath_3F @ 0x81651F3 + .4byte NavelRock_SummitPath_3F_MapEvents @ 0x83B49AC + .4byte NavelRock_SummitPath_3F_MapScripts @ 0x81651F3 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 348 diff --git a/data/maps/NavelRock_SummitPath_4F/header.inc b/data/maps/NavelRock_SummitPath_4F/header.inc index 996b28555..37baa8cf6 100644 --- a/data/maps/NavelRock_SummitPath_4F/header.inc +++ b/data/maps/NavelRock_SummitPath_4F/header.inc @@ -1,7 +1,7 @@ NavelRock_SummitPath_4F:: @ 8350404 .4byte NavelRock_SummitPath_4F_Layout @ 0x8349434 - .4byte gMapEvents_NavelRock_SummitPath_4F @ 0x83B49D0 - .4byte gMapScripts_NavelRock_SummitPath_4F @ 0x81651F4 + .4byte NavelRock_SummitPath_4F_MapEvents @ 0x83B49D0 + .4byte NavelRock_SummitPath_4F_MapScripts @ 0x81651F4 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 349 diff --git a/data/maps/NavelRock_SummitPath_5F/header.inc b/data/maps/NavelRock_SummitPath_5F/header.inc index 5beffe449..88a1d0a8d 100644 --- a/data/maps/NavelRock_SummitPath_5F/header.inc +++ b/data/maps/NavelRock_SummitPath_5F/header.inc @@ -1,7 +1,7 @@ NavelRock_SummitPath_5F:: @ 8350420 .4byte NavelRock_SummitPath_5F_Layout @ 0x83494BC - .4byte gMapEvents_NavelRock_SummitPath_5F @ 0x83B49F4 - .4byte gMapScripts_NavelRock_SummitPath_5F @ 0x81651F5 + .4byte NavelRock_SummitPath_5F_MapEvents @ 0x83B49F4 + .4byte NavelRock_SummitPath_5F_MapScripts @ 0x81651F5 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 350 diff --git a/data/maps/OneIsland/header.inc b/data/maps/OneIsland/header.inc index f54c47e14..a2d521727 100644 --- a/data/maps/OneIsland/header.inc +++ b/data/maps/OneIsland/header.inc @@ -1,7 +1,7 @@ OneIsland:: @ 8350768 .4byte OneIsland_Layout @ 0x8321714 - .4byte gMapEvents_OneIsland @ 0x83B5F44 - .4byte gMapScripts_OneIsland @ 0x8167484 + .4byte OneIsland_MapEvents @ 0x83B5F44 + .4byte OneIsland_MapScripts @ 0x8167484 .4byte OneIsland_MapConnections @ 0x835294C .2byte BGM_FRLG_ISLAND_ONE .2byte 230 diff --git a/data/maps/OneIsland_Harbor/header.inc b/data/maps/OneIsland_Harbor/header.inc index 0a39c9134..d98fcca3a 100644 --- a/data/maps/OneIsland_Harbor/header.inc +++ b/data/maps/OneIsland_Harbor/header.inc @@ -1,7 +1,7 @@ OneIsland_Harbor:: @ 8351BDC .4byte Island_Harbor_Layout @ 0x8343FB8 - .4byte gMapEvents_OneIsland_Harbor @ 0x83BE558 - .4byte gMapScripts_OneIsland_Harbor @ 0x8171378 + .4byte OneIsland_Harbor_MapEvents @ 0x83BE558 + .4byte OneIsland_Harbor_MapScripts @ 0x8171378 .4byte NULL .2byte BGM_FRLG_ISLAND_ONE .2byte 315 diff --git a/data/maps/OneIsland_House1/header.inc b/data/maps/OneIsland_House1/header.inc index 3c8db882b..7d60ff6d5 100644 --- a/data/maps/OneIsland_House1/header.inc +++ b/data/maps/OneIsland_House1/header.inc @@ -1,7 +1,7 @@ OneIsland_House1:: @ 8351BA4 .4byte House3_Layout @ 0x82D5CB8 - .4byte gMapEvents_OneIsland_House1 @ 0x83BE4D8 - .4byte gMapScripts_OneIsland_House1 @ 0x817135B + .4byte OneIsland_House1_MapEvents @ 0x83BE4D8 + .4byte OneIsland_House1_MapScripts @ 0x817135B .4byte NULL .2byte BGM_FRLG_ISLAND_ONE .2byte 11 diff --git a/data/maps/OneIsland_House2/header.inc b/data/maps/OneIsland_House2/header.inc index 7df223934..0048e308d 100644 --- a/data/maps/OneIsland_House2/header.inc +++ b/data/maps/OneIsland_House2/header.inc @@ -1,7 +1,7 @@ OneIsland_House2:: @ 8351BC0 .4byte House3_Layout @ 0x82D5CB8 - .4byte gMapEvents_OneIsland_House2 @ 0x83BE50C - .4byte gMapScripts_OneIsland_House2 @ 0x817136E + .4byte OneIsland_House2_MapEvents @ 0x83BE50C + .4byte OneIsland_House2_MapScripts @ 0x817136E .4byte NULL .2byte BGM_FRLG_ISLAND_ONE .2byte 11 diff --git a/data/maps/OneIsland_KindleRoad/header.inc b/data/maps/OneIsland_KindleRoad/header.inc index b1c68b719..1c540ae87 100644 --- a/data/maps/OneIsland_KindleRoad/header.inc +++ b/data/maps/OneIsland_KindleRoad/header.inc @@ -1,7 +1,7 @@ OneIsland_KindleRoad:: @ 8350B04 .4byte OneIsland_KindleRoad_Layout @ 0x8325D70 - .4byte gMapEvents_OneIsland_KindleRoad @ 0x83B888C - .4byte gMapScripts_OneIsland_KindleRoad @ 0x8168758 + .4byte OneIsland_KindleRoad_MapEvents @ 0x83B888C + .4byte OneIsland_KindleRoad_MapScripts @ 0x8168758 .4byte OneIsland_KindleRoad_MapConnections @ 0x8352D28 .2byte BGM_FRLG_ROUTE_3 .2byte 237 diff --git a/data/maps/OneIsland_KindleRoad_EmberSpa/header.inc b/data/maps/OneIsland_KindleRoad_EmberSpa/header.inc index b9be8bb22..ca4afdec0 100644 --- a/data/maps/OneIsland_KindleRoad_EmberSpa/header.inc +++ b/data/maps/OneIsland_KindleRoad_EmberSpa/header.inc @@ -1,7 +1,7 @@ OneIsland_KindleRoad_EmberSpa:: @ 83505C4 .4byte OneIsland_KindleRoad_EmberSpa_Layout @ 0x834EB70 - .4byte gMapEvents_OneIsland_KindleRoad_EmberSpa @ 0x83B4CD8 - .4byte gMapScripts_OneIsland_KindleRoad_EmberSpa @ 0x816535B + .4byte OneIsland_KindleRoad_EmberSpa_MapEvents @ 0x83B4CD8 + .4byte OneIsland_KindleRoad_EmberSpa_MapScripts @ 0x816535B .4byte NULL .2byte BGM_FRLG_CERULEAN_CITY .2byte 383 diff --git a/data/maps/OneIsland_PokemonCenter_1F/header.inc b/data/maps/OneIsland_PokemonCenter_1F/header.inc index 53afa9da1..815f1fc82 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/header.inc +++ b/data/maps/OneIsland_PokemonCenter_1F/header.inc @@ -1,7 +1,7 @@ OneIsland_PokemonCenter_1F:: @ 8351B6C .4byte OneIsland_PokemonCenter_1F_Layout @ 0x833A970 - .4byte gMapEvents_OneIsland_PokemonCenter_1F @ 0x83BE400 - .4byte gMapScripts_OneIsland_PokemonCenter_1F @ 0x8170BF8 + .4byte OneIsland_PokemonCenter_1F_MapEvents @ 0x83BE400 + .4byte OneIsland_PokemonCenter_1F_MapScripts @ 0x8170BF8 .4byte NULL .2byte BGM_FRLG_POKEMON_NETWORK_CENTER .2byte 271 diff --git a/data/maps/OneIsland_PokemonCenter_2F/header.inc b/data/maps/OneIsland_PokemonCenter_2F/header.inc index 87fa3c548..d0a077901 100644 --- a/data/maps/OneIsland_PokemonCenter_2F/header.inc +++ b/data/maps/OneIsland_PokemonCenter_2F/header.inc @@ -1,7 +1,7 @@ OneIsland_PokemonCenter_2F:: @ 8351B88 .4byte OneIsland_PokemonCenter_2F_Layout @ 0x8344108 - .4byte gMapEvents_OneIsland_PokemonCenter_2F @ 0x83BE48C - .4byte gMapScripts_OneIsland_PokemonCenter_2F @ 0x8171334 + .4byte OneIsland_PokemonCenter_2F_MapEvents @ 0x83BE48C + .4byte OneIsland_PokemonCenter_2F_MapScripts @ 0x8171334 .4byte NULL .2byte BGM_FRLG_POKEMON_NETWORK_CENTER .2byte 316 diff --git a/data/maps/OneIsland_TreasureBeach/header.inc b/data/maps/OneIsland_TreasureBeach/header.inc index 203c7a407..419a99ea7 100644 --- a/data/maps/OneIsland_TreasureBeach/header.inc +++ b/data/maps/OneIsland_TreasureBeach/header.inc @@ -1,7 +1,7 @@ OneIsland_TreasureBeach:: @ 8350B20 .4byte OneIsland_TreasureBeach_Layout @ 0x8326514 - .4byte gMapEvents_OneIsland_TreasureBeach @ 0x83B8930 - .4byte gMapScripts_OneIsland_TreasureBeach @ 0x816876B + .4byte OneIsland_TreasureBeach_MapEvents @ 0x83B8930 + .4byte OneIsland_TreasureBeach_MapScripts @ 0x816876B .4byte OneIsland_TreasureBeach_MapConnections @ 0x8352D3C .2byte BGM_FRLG_ROUTE_3 .2byte 238 diff --git a/data/maps/PalletTown/header.inc b/data/maps/PalletTown/header.inc index f148906c6..8d9104896 100644 --- a/data/maps/PalletTown/header.inc +++ b/data/maps/PalletTown/header.inc @@ -1,7 +1,7 @@ PalletTown:: @ 8350618 .4byte PalletTown_Layout @ 0x82DD4C0 - .4byte gMapEvents_PalletTown @ 0x83B4E50 - .4byte gMapScripts_PalletTown @ 0x816545A + .4byte PalletTown_MapEvents @ 0x83B4E50 + .4byte PalletTown_MapScripts @ 0x816545A .4byte PalletTown_MapConnections @ 0x835276C .2byte BGM_FRLG_PALLET_TOWN .2byte 78 diff --git a/data/maps/PalletTown_GarysHouse/header.inc b/data/maps/PalletTown_GarysHouse/header.inc index 6179b28ee..da1b1bd3e 100644 --- a/data/maps/PalletTown_GarysHouse/header.inc +++ b/data/maps/PalletTown_GarysHouse/header.inc @@ -1,7 +1,7 @@ PalletTown_GarysHouse:: @ 8350D88 .4byte PalletTown_GarysHouse_Layout @ 0x82D5424 - .4byte gMapEvents_PalletTown_GarysHouse @ 0x83B980C - .4byte gMapScripts_PalletTown_GarysHouse @ 0x8168D27 + .4byte PalletTown_GarysHouse_MapEvents @ 0x83B980C + .4byte PalletTown_GarysHouse_MapScripts @ 0x8168D27 .4byte NULL .2byte BGM_FRLG_PALLET_TOWN .2byte 3 diff --git a/data/maps/PalletTown_PlayersHouse_1F/header.inc b/data/maps/PalletTown_PlayersHouse_1F/header.inc index 48c815047..16a3b2627 100644 --- a/data/maps/PalletTown_PlayersHouse_1F/header.inc +++ b/data/maps/PalletTown_PlayersHouse_1F/header.inc @@ -1,7 +1,7 @@ PalletTown_PlayersHouse_1F:: @ 8350D50 .4byte PalletTown_PlayersHouse_1F_Layout @ 0x82D5200 - .4byte gMapEvents_PalletTown_PlayersHouse_1F @ 0x83B974C - .4byte gMapScripts_PalletTown_PlayersHouse_1F @ 0x8168C08 + .4byte PalletTown_PlayersHouse_1F_MapEvents @ 0x83B974C + .4byte PalletTown_PlayersHouse_1F_MapScripts @ 0x8168C08 .4byte NULL .2byte BGM_FRLG_PALLET_TOWN .2byte 1 diff --git a/data/maps/PalletTown_PlayersHouse_2F/header.inc b/data/maps/PalletTown_PlayersHouse_2F/header.inc index 5b99b625d..8f886a89c 100644 --- a/data/maps/PalletTown_PlayersHouse_2F/header.inc +++ b/data/maps/PalletTown_PlayersHouse_2F/header.inc @@ -1,7 +1,7 @@ PalletTown_PlayersHouse_2F:: @ 8350D6C .4byte PalletTown_PlayersHouse_2F_Layout @ 0x82D52FC - .4byte gMapEvents_PalletTown_PlayersHouse_2F @ 0x83B978C - .4byte gMapScripts_PalletTown_PlayersHouse_2F @ 0x8168CA3 + .4byte PalletTown_PlayersHouse_2F_MapEvents @ 0x83B978C + .4byte PalletTown_PlayersHouse_2F_MapScripts @ 0x8168CA3 .4byte NULL .2byte BGM_FRLG_PALLET_TOWN .2byte 2 diff --git a/data/maps/PalletTown_ProfessorOaksLab/header.inc b/data/maps/PalletTown_ProfessorOaksLab/header.inc index 226e0ce92..2d2667998 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/header.inc +++ b/data/maps/PalletTown_ProfessorOaksLab/header.inc @@ -1,7 +1,7 @@ PalletTown_ProfessorOaksLab:: @ 8350DA4 .4byte PalletTown_ProfessorOaksLab_Layout @ 0x82D5668 - .4byte gMapEvents_PalletTown_ProfessorOaksLab @ 0x83B99B8 - .4byte gMapScripts_PalletTown_ProfessorOaksLab @ 0x8168F7E + .4byte PalletTown_ProfessorOaksLab_MapEvents @ 0x83B99B8 + .4byte PalletTown_ProfessorOaksLab_MapScripts @ 0x8168F7E .4byte NULL .2byte BGM_FRLG_OAK_LAB .2byte 5 diff --git a/data/maps/PewterCity/header.inc b/data/maps/PewterCity/header.inc index 9fcbb10ed..f6f16be53 100644 --- a/data/maps/PewterCity/header.inc +++ b/data/maps/PewterCity/header.inc @@ -1,7 +1,7 @@ PewterCity:: @ 8350650 .4byte PewterCity_Layout @ 0x82DF308 - .4byte gMapEvents_PewterCity @ 0x83B518C - .4byte gMapScripts_PewterCity @ 0x8165B8E + .4byte PewterCity_MapEvents @ 0x83B518C + .4byte PewterCity_MapScripts @ 0x8165B8E .4byte PewterCity_MapConnections @ 0x83527B8 .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 80 diff --git a/data/maps/PewterCity_Gym/header.inc b/data/maps/PewterCity_Gym/header.inc index 4d8348987..088aa1ab1 100644 --- a/data/maps/PewterCity_Gym/header.inc +++ b/data/maps/PewterCity_Gym/header.inc @@ -1,7 +1,7 @@ PewterCity_Gym:: @ 8350EA0 .4byte PewterCity_Gym_Layout @ 0x82D732C - .4byte gMapEvents_PewterCity_Gym @ 0x83BA058 - .4byte gMapScripts_PewterCity_Gym @ 0x816A592 + .4byte PewterCity_Gym_MapEvents @ 0x83BA058 + .4byte PewterCity_Gym_MapScripts @ 0x816A592 .4byte NULL .2byte BGM_FRLG_GYM .2byte 28 diff --git a/data/maps/PewterCity_House1/header.inc b/data/maps/PewterCity_House1/header.inc index 547b7ca0c..933c38e45 100644 --- a/data/maps/PewterCity_House1/header.inc +++ b/data/maps/PewterCity_House1/header.inc @@ -1,7 +1,7 @@ PewterCity_House1:: @ 8350ED8 .4byte House2_Layout @ 0x82D5840 - .4byte gMapEvents_PewterCity_House1 @ 0x83BA140 - .4byte gMapScripts_PewterCity_House1 @ 0x816A71C + .4byte PewterCity_House1_MapEvents @ 0x83BA140 + .4byte PewterCity_House1_MapScripts @ 0x816A71C .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 7 diff --git a/data/maps/PewterCity_House2/header.inc b/data/maps/PewterCity_House2/header.inc index a793efd1c..af76d49ff 100644 --- a/data/maps/PewterCity_House2/header.inc +++ b/data/maps/PewterCity_House2/header.inc @@ -1,7 +1,7 @@ PewterCity_House2:: @ 8350F2C .4byte House2_Layout @ 0x82D5840 - .4byte gMapEvents_PewterCity_House2 @ 0x83BA304 - .4byte gMapScripts_PewterCity_House2 @ 0x816A7DC + .4byte PewterCity_House2_MapEvents @ 0x83BA304 + .4byte PewterCity_House2_MapScripts @ 0x816A7DC .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 7 diff --git a/data/maps/PewterCity_Mart/header.inc b/data/maps/PewterCity_Mart/header.inc index ec685db00..2cd4eccad 100644 --- a/data/maps/PewterCity_Mart/header.inc +++ b/data/maps/PewterCity_Mart/header.inc @@ -1,7 +1,7 @@ PewterCity_Mart:: @ 8350EBC .4byte Mart_Layout @ 0x82D5BCC - .4byte gMapEvents_PewterCity_Mart @ 0x83BA0CC - .4byte gMapScripts_PewterCity_Mart @ 0x816A6CD + .4byte PewterCity_Mart_MapEvents @ 0x83BA0CC + .4byte PewterCity_Mart_MapScripts @ 0x816A6CD .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 10 diff --git a/data/maps/PewterCity_Museum_1F/header.inc b/data/maps/PewterCity_Museum_1F/header.inc index 255e31980..b2ae946ec 100644 --- a/data/maps/PewterCity_Museum_1F/header.inc +++ b/data/maps/PewterCity_Museum_1F/header.inc @@ -1,7 +1,7 @@ PewterCity_Museum_1F:: @ 8350E68 .4byte PewterCity_Museum_1F_Layout @ 0x831A1FC - .4byte gMapEvents_PewterCity_Museum_1F @ 0x83B9ED8 - .4byte gMapScripts_PewterCity_Museum_1F @ 0x816A31A + .4byte PewterCity_Museum_1F_MapEvents @ 0x83B9ED8 + .4byte PewterCity_Museum_1F_MapScripts @ 0x816A31A .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 180 diff --git a/data/maps/PewterCity_Museum_2F/header.inc b/data/maps/PewterCity_Museum_2F/header.inc index 6b6c397ed..d62dc30e1 100644 --- a/data/maps/PewterCity_Museum_2F/header.inc +++ b/data/maps/PewterCity_Museum_2F/header.inc @@ -1,7 +1,7 @@ PewterCity_Museum_2F:: @ 8350E84 .4byte PewterCity_Museum_2F_Layout @ 0x831A39C - .4byte gMapEvents_PewterCity_Museum_2F @ 0x83B9FCC - .4byte gMapScripts_PewterCity_Museum_2F @ 0x816A552 + .4byte PewterCity_Museum_2F_MapEvents @ 0x83B9FCC + .4byte PewterCity_Museum_2F_MapScripts @ 0x816A552 .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 181 diff --git a/data/maps/PewterCity_PokemonCenter_1F/header.inc b/data/maps/PewterCity_PokemonCenter_1F/header.inc index 89d2f8208..9270308b7 100644 --- a/data/maps/PewterCity_PokemonCenter_1F/header.inc +++ b/data/maps/PewterCity_PokemonCenter_1F/header.inc @@ -1,7 +1,7 @@ PewterCity_PokemonCenter_1F:: @ 8350EF4 .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte gMapEvents_PewterCity_PokemonCenter_1F @ 0x83BA21C - .4byte gMapScripts_PewterCity_PokemonCenter_1F @ 0x816A760 + .4byte PewterCity_PokemonCenter_1F_MapEvents @ 0x83BA21C + .4byte PewterCity_PokemonCenter_1F_MapScripts @ 0x816A760 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 8 diff --git a/data/maps/PewterCity_PokemonCenter_2F/header.inc b/data/maps/PewterCity_PokemonCenter_2F/header.inc index 39b506417..c050eb5fb 100644 --- a/data/maps/PewterCity_PokemonCenter_2F/header.inc +++ b/data/maps/PewterCity_PokemonCenter_2F/header.inc @@ -1,7 +1,7 @@ PewterCity_PokemonCenter_2F:: @ 8350F10 .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte gMapEvents_PewterCity_PokemonCenter_2F @ 0x83BA2A8 - .4byte gMapScripts_PewterCity_PokemonCenter_2F @ 0x816A7B5 + .4byte PewterCity_PokemonCenter_2F_MapEvents @ 0x83BA2A8 + .4byte PewterCity_PokemonCenter_2F_MapScripts @ 0x816A7B5 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 9 diff --git a/data/maps/PokemonLeague_AgathasRoom/header.inc b/data/maps/PokemonLeague_AgathasRoom/header.inc index a5f4c703b..1e253cb1c 100644 --- a/data/maps/PokemonLeague_AgathasRoom/header.inc +++ b/data/maps/PokemonLeague_AgathasRoom/header.inc @@ -1,7 +1,7 @@ PokemonLeague_AgathasRoom:: @ 834FA80 .4byte PokemonLeague_AgathasRoom_Layout @ 0x831F468 - .4byte gMapEvents_PokemonLeague_AgathasRoom @ 0x83B1928 - .4byte gMapScripts_PokemonLeague_AgathasRoom @ 0x8162810 + .4byte PokemonLeague_AgathasRoom_MapEvents @ 0x83B1928 + .4byte PokemonLeague_AgathasRoom_MapScripts @ 0x8162810 .4byte NULL .2byte BGM_FRLG_POKEMON_TOWER .2byte 215 diff --git a/data/maps/PokemonLeague_BrunosRoom/header.inc b/data/maps/PokemonLeague_BrunosRoom/header.inc index b8fa38018..4a0db477d 100644 --- a/data/maps/PokemonLeague_BrunosRoom/header.inc +++ b/data/maps/PokemonLeague_BrunosRoom/header.inc @@ -1,7 +1,7 @@ PokemonLeague_BrunosRoom:: @ 834FA64 .4byte PokemonLeague_BrunosRoom_Layout @ 0x831F2F0 - .4byte gMapEvents_PokemonLeague_BrunosRoom @ 0x83B18EC - .4byte gMapScripts_PokemonLeague_BrunosRoom @ 0x8162685 + .4byte PokemonLeague_BrunosRoom_MapEvents @ 0x83B18EC + .4byte PokemonLeague_BrunosRoom_MapScripts @ 0x8162685 .4byte NULL .2byte BGM_FRLG_ROCKET_HIDEOUT .2byte 214 diff --git a/data/maps/PokemonLeague_ChampionsRoom/header.inc b/data/maps/PokemonLeague_ChampionsRoom/header.inc index f08a9d072..8dd19508d 100644 --- a/data/maps/PokemonLeague_ChampionsRoom/header.inc +++ b/data/maps/PokemonLeague_ChampionsRoom/header.inc @@ -1,7 +1,7 @@ PokemonLeague_ChampionsRoom:: @ 834FAB8 .4byte PokemonLeague_ChampionsRoom_Layout @ 0x831FBF8 - .4byte gMapEvents_PokemonLeague_ChampionsRoom @ 0x83B19B8 - .4byte gMapScripts_PokemonLeague_ChampionsRoom @ 0x8162AE2 + .4byte PokemonLeague_ChampionsRoom_MapEvents @ 0x83B19B8 + .4byte PokemonLeague_ChampionsRoom_MapScripts @ 0x8162AE2 .4byte NULL .2byte BGM_FRLG_INDIGO_PLATEAU .2byte 217 diff --git a/data/maps/PokemonLeague_HallOfFame/header.inc b/data/maps/PokemonLeague_HallOfFame/header.inc index 0b1464dbb..aa3d6c3b9 100644 --- a/data/maps/PokemonLeague_HallOfFame/header.inc +++ b/data/maps/PokemonLeague_HallOfFame/header.inc @@ -1,7 +1,7 @@ PokemonLeague_HallOfFame:: @ 834FAD4 .4byte PokemonLeague_HallOfFame_Layout @ 0x831FD3C - .4byte gMapEvents_PokemonLeague_HallOfFame @ 0x83B19EC - .4byte gMapScripts_PokemonLeague_HallOfFame @ 0x8162D4C + .4byte PokemonLeague_HallOfFame_MapEvents @ 0x83B19EC + .4byte PokemonLeague_HallOfFame_MapScripts @ 0x8162D4C .4byte NULL .2byte BGM_FRLG_HALL_OF_FAME_PALLET_TOWN .2byte 218 diff --git a/data/maps/PokemonLeague_LancesRoom/header.inc b/data/maps/PokemonLeague_LancesRoom/header.inc index ac970db8f..d37a1c254 100644 --- a/data/maps/PokemonLeague_LancesRoom/header.inc +++ b/data/maps/PokemonLeague_LancesRoom/header.inc @@ -1,7 +1,7 @@ PokemonLeague_LancesRoom:: @ 834FA9C .4byte PokemonLeague_LancesRoom_Layout @ 0x831F9CC - .4byte gMapEvents_PokemonLeague_LancesRoom @ 0x83B1964 - .4byte gMapScripts_PokemonLeague_LancesRoom @ 0x816292D + .4byte PokemonLeague_LancesRoom_MapEvents @ 0x83B1964 + .4byte PokemonLeague_LancesRoom_MapScripts @ 0x816292D .4byte NULL .2byte BGM_FRLG_INDIGO_PLATEAU .2byte 216 diff --git a/data/maps/PokemonLeague_LoreleisRoom/header.inc b/data/maps/PokemonLeague_LoreleisRoom/header.inc index 01f12285b..c72d978f6 100644 --- a/data/maps/PokemonLeague_LoreleisRoom/header.inc +++ b/data/maps/PokemonLeague_LoreleisRoom/header.inc @@ -1,7 +1,7 @@ PokemonLeague_LoreleisRoom:: @ 834FA48 .4byte PokemonLeague_LoreleisRoom_Layout @ 0x831F178 - .4byte gMapEvents_PokemonLeague_LoreleisRoom @ 0x83B18B0 - .4byte gMapScripts_PokemonLeague_LoreleisRoom @ 0x816256C + .4byte PokemonLeague_LoreleisRoom_MapEvents @ 0x83B18B0 + .4byte PokemonLeague_LoreleisRoom_MapScripts @ 0x816256C .4byte NULL .2byte BGM_FRLG_GYM .2byte 213 diff --git a/data/maps/PokemonMansion_1F/header.inc b/data/maps/PokemonMansion_1F/header.inc index 167c4d42b..b3e59a63c 100644 --- a/data/maps/PokemonMansion_1F/header.inc +++ b/data/maps/PokemonMansion_1F/header.inc @@ -1,7 +1,7 @@ PokemonMansion_1F:: @ 834F888 .4byte PokemonMansion_1F_Layout @ 0x830AE3C - .4byte gMapEvents_PokemonMansion_1F @ 0x83B0C60 - .4byte gMapScripts_PokemonMansion_1F @ 0x81621F9 + .4byte PokemonMansion_1F_MapEvents @ 0x83B0C60 + .4byte PokemonMansion_1F_MapScripts @ 0x81621F9 .4byte NULL .2byte BGM_FRLG_POKEMON_MANSION .2byte 143 diff --git a/data/maps/PokemonMansion_2F/header.inc b/data/maps/PokemonMansion_2F/header.inc index 39716d024..f3b161fdd 100644 --- a/data/maps/PokemonMansion_2F/header.inc +++ b/data/maps/PokemonMansion_2F/header.inc @@ -1,7 +1,7 @@ PokemonMansion_2F:: @ 834F8A4 .4byte PokemonMansion_2F_Layout @ 0x830B9A8 - .4byte gMapEvents_PokemonMansion_2F @ 0x83B0D20 - .4byte gMapScripts_PokemonMansion_2F @ 0x8162254 + .4byte PokemonMansion_2F_MapEvents @ 0x83B0D20 + .4byte PokemonMansion_2F_MapScripts @ 0x8162254 .4byte NULL .2byte BGM_FRLG_POKEMON_MANSION .2byte 144 diff --git a/data/maps/PokemonMansion_3F/header.inc b/data/maps/PokemonMansion_3F/header.inc index 9dde682d0..e86dc4f3b 100644 --- a/data/maps/PokemonMansion_3F/header.inc +++ b/data/maps/PokemonMansion_3F/header.inc @@ -1,7 +1,7 @@ PokemonMansion_3F:: @ 834F8C0 .4byte PokemonMansion_3F_Layout @ 0x830C430 - .4byte gMapEvents_PokemonMansion_3F @ 0x83B0DF8 - .4byte gMapScripts_PokemonMansion_3F @ 0x81622A1 + .4byte PokemonMansion_3F_MapEvents @ 0x83B0DF8 + .4byte PokemonMansion_3F_MapScripts @ 0x81622A1 .4byte NULL .2byte BGM_FRLG_POKEMON_MANSION .2byte 145 diff --git a/data/maps/PokemonMansion_B1F/header.inc b/data/maps/PokemonMansion_B1F/header.inc index 28d4cec5e..a5d64c3bf 100644 --- a/data/maps/PokemonMansion_B1F/header.inc +++ b/data/maps/PokemonMansion_B1F/header.inc @@ -1,7 +1,7 @@ PokemonMansion_B1F:: @ 834F8DC .4byte PokemonMansion_B1F_Layout @ 0x830CEB8 - .4byte gMapEvents_PokemonMansion_B1F @ 0x83B0ED4 - .4byte gMapScripts_PokemonMansion_B1F @ 0x81622FC + .4byte PokemonMansion_B1F_MapEvents @ 0x83B0ED4 + .4byte PokemonMansion_B1F_MapScripts @ 0x81622FC .4byte NULL .2byte BGM_FRLG_POKEMON_MANSION .2byte 146 diff --git a/data/maps/PokemonTower_1F/header.inc b/data/maps/PokemonTower_1F/header.inc index 94aefddf2..61a8cd0fb 100644 --- a/data/maps/PokemonTower_1F/header.inc +++ b/data/maps/PokemonTower_1F/header.inc @@ -1,7 +1,7 @@ PokemonTower_1F:: @ 834FBB4 .4byte PokemonTower_1F_Layout @ 0x83167F4 - .4byte gMapEvents_PokemonTower_1F @ 0x83B2270 - .4byte gMapScripts_PokemonTower_1F @ 0x8163235 + .4byte PokemonTower_1F_MapEvents @ 0x83B2270 + .4byte PokemonTower_1F_MapScripts @ 0x8163235 .4byte NULL .2byte BGM_FRLG_POKEMON_TOWER .2byte 161 diff --git a/data/maps/PokemonTower_2F/header.inc b/data/maps/PokemonTower_2F/header.inc index 45838cb9b..ee7c892ce 100644 --- a/data/maps/PokemonTower_2F/header.inc +++ b/data/maps/PokemonTower_2F/header.inc @@ -1,7 +1,7 @@ PokemonTower_2F:: @ 834FBD0 .4byte PokemonTower_2F_Layout @ 0x8316BD8 - .4byte gMapEvents_PokemonTower_2F @ 0x83B22E4 - .4byte gMapScripts_PokemonTower_2F @ 0x8163285 + .4byte PokemonTower_2F_MapEvents @ 0x83B22E4 + .4byte PokemonTower_2F_MapScripts @ 0x8163285 .4byte NULL .2byte BGM_FRLG_POKEMON_TOWER .2byte 162 diff --git a/data/maps/PokemonTower_3F/header.inc b/data/maps/PokemonTower_3F/header.inc index cd7c8fa57..9d972f0a1 100644 --- a/data/maps/PokemonTower_3F/header.inc +++ b/data/maps/PokemonTower_3F/header.inc @@ -1,7 +1,7 @@ PokemonTower_3F:: @ 834FBEC .4byte PokemonTower_3F_Layout @ 0x8316FBC - .4byte gMapEvents_PokemonTower_3F @ 0x83B2368 - .4byte gMapScripts_PokemonTower_3F @ 0x81633A6 + .4byte PokemonTower_3F_MapEvents @ 0x83B2368 + .4byte PokemonTower_3F_MapScripts @ 0x81633A6 .4byte NULL .2byte BGM_FRLG_POKEMON_TOWER .2byte 163 diff --git a/data/maps/PokemonTower_4F/header.inc b/data/maps/PokemonTower_4F/header.inc index 63fccbe42..fe31ef96b 100644 --- a/data/maps/PokemonTower_4F/header.inc +++ b/data/maps/PokemonTower_4F/header.inc @@ -1,7 +1,7 @@ PokemonTower_4F:: @ 834FC08 .4byte PokemonTower_4F_Layout @ 0x83173A0 - .4byte gMapEvents_PokemonTower_4F @ 0x83B241C - .4byte gMapScripts_PokemonTower_4F @ 0x81633EC + .4byte PokemonTower_4F_MapEvents @ 0x83B241C + .4byte PokemonTower_4F_MapScripts @ 0x81633EC .4byte NULL .2byte BGM_FRLG_POKEMON_TOWER .2byte 164 diff --git a/data/maps/PokemonTower_5F/header.inc b/data/maps/PokemonTower_5F/header.inc index d5328464b..f2e38b1b6 100644 --- a/data/maps/PokemonTower_5F/header.inc +++ b/data/maps/PokemonTower_5F/header.inc @@ -1,7 +1,7 @@ PokemonTower_5F:: @ 834FC24 .4byte PokemonTower_5F_Layout @ 0x8317784 - .4byte gMapEvents_PokemonTower_5F @ 0x83B2604 - .4byte gMapScripts_PokemonTower_5F @ 0x8163432 + .4byte PokemonTower_5F_MapEvents @ 0x83B2604 + .4byte PokemonTower_5F_MapScripts @ 0x8163432 .4byte NULL .2byte BGM_FRLG_POKEMON_TOWER .2byte 165 diff --git a/data/maps/PokemonTower_6F/header.inc b/data/maps/PokemonTower_6F/header.inc index 4f928c92d..6bafef55e 100644 --- a/data/maps/PokemonTower_6F/header.inc +++ b/data/maps/PokemonTower_6F/header.inc @@ -1,7 +1,7 @@ PokemonTower_6F:: @ 834FC40 .4byte PokemonTower_6F_Layout @ 0x8317B68 - .4byte gMapEvents_PokemonTower_6F @ 0x83B26C0 - .4byte gMapScripts_PokemonTower_6F @ 0x81634B7 + .4byte PokemonTower_6F_MapEvents @ 0x83B26C0 + .4byte PokemonTower_6F_MapScripts @ 0x81634B7 .4byte NULL .2byte BGM_FRLG_POKEMON_TOWER .2byte 166 diff --git a/data/maps/PokemonTower_7F/header.inc b/data/maps/PokemonTower_7F/header.inc index ada7b480e..4125a4d9f 100644 --- a/data/maps/PokemonTower_7F/header.inc +++ b/data/maps/PokemonTower_7F/header.inc @@ -1,7 +1,7 @@ PokemonTower_7F:: @ 834FC5C .4byte PokemonTower_7F_Layout @ 0x8317F4C - .4byte gMapEvents_PokemonTower_7F @ 0x83B2748 - .4byte gMapScripts_PokemonTower_7F @ 0x8163559 + .4byte PokemonTower_7F_MapEvents @ 0x83B2748 + .4byte PokemonTower_7F_MapScripts @ 0x8163559 .4byte NULL .2byte BGM_FRLG_POKEMON_TOWER .2byte 167 diff --git a/data/maps/PowerPlant/header.inc b/data/maps/PowerPlant/header.inc index 2062f30c3..530e24a98 100644 --- a/data/maps/PowerPlant/header.inc +++ b/data/maps/PowerPlant/header.inc @@ -1,7 +1,7 @@ PowerPlant:: @ 834FC78 .4byte PowerPlant_Layout @ 0x8318EC0 - .4byte gMapEvents_PowerPlant @ 0x83B285C - .4byte gMapScripts_PowerPlant @ 0x8163764 + .4byte PowerPlant_MapEvents @ 0x83B285C + .4byte PowerPlant_MapScripts @ 0x8163764 .4byte NULL .2byte BGM_FRLG_POKEMON_MANSION .2byte 168 diff --git a/data/maps/RockTunnel_1F/header.inc b/data/maps/RockTunnel_1F/header.inc index 21bd063fd..5a9e6fac6 100644 --- a/data/maps/RockTunnel_1F/header.inc +++ b/data/maps/RockTunnel_1F/header.inc @@ -1,7 +1,7 @@ RockTunnel_1F:: @ 834FAF0 .4byte RockTunnel_1F_Layout @ 0x83130E4 - .4byte gMapEvents_RockTunnel_1F @ 0x83B1B2C - .4byte gMapScripts_RockTunnel_1F @ 0x8162DD6 + .4byte RockTunnel_1F_MapEvents @ 0x83B1B2C + .4byte RockTunnel_1F_MapScripts @ 0x8162DD6 .4byte NULL .2byte BGM_FRLG_MT_MOON .2byte 154 diff --git a/data/maps/RockTunnel_B1F/header.inc b/data/maps/RockTunnel_B1F/header.inc index 9b6e260e9..7ee412e7b 100644 --- a/data/maps/RockTunnel_B1F/header.inc +++ b/data/maps/RockTunnel_B1F/header.inc @@ -1,7 +1,7 @@ RockTunnel_B1F:: @ 834FB0C .4byte RockTunnel_B1F_Layout @ 0x8314008 - .4byte gMapEvents_RockTunnel_B1F @ 0x83B1DD0 - .4byte gMapScripts_RockTunnel_B1F @ 0x8162E8A + .4byte RockTunnel_B1F_MapEvents @ 0x83B1DD0 + .4byte RockTunnel_B1F_MapScripts @ 0x8162E8A .4byte NULL .2byte BGM_FRLG_MT_MOON .2byte 155 diff --git a/data/maps/RocketHideout_B1F/header.inc b/data/maps/RocketHideout_B1F/header.inc index 0cba66e5d..76da1d708 100644 --- a/data/maps/RocketHideout_B1F/header.inc +++ b/data/maps/RocketHideout_B1F/header.inc @@ -1,7 +1,7 @@ RocketHideout_B1F:: @ 834F6AC .4byte RocketHideout_B1F_Layout @ 0x8305C28 - .4byte gMapEvents_RocketHideout_B1F @ 0x83AF9D8 - .4byte gMapScripts_RocketHideout_B1F @ 0x8161195 + .4byte RocketHideout_B1F_MapEvents @ 0x83AF9D8 + .4byte RocketHideout_B1F_MapScripts @ 0x8161195 .4byte NULL .2byte BGM_FRLG_ROCKET_HIDEOUT .2byte 128 diff --git a/data/maps/RocketHideout_B2F/header.inc b/data/maps/RocketHideout_B2F/header.inc index 516adc9a2..6f3624422 100644 --- a/data/maps/RocketHideout_B2F/header.inc +++ b/data/maps/RocketHideout_B2F/header.inc @@ -1,7 +1,7 @@ RocketHideout_B2F:: @ 834F6C8 .4byte RocketHideout_B2F_Layout @ 0x83061CC - .4byte gMapEvents_RocketHideout_B2F @ 0x83AFA8C - .4byte gMapScripts_RocketHideout_B2F @ 0x81612A1 + .4byte RocketHideout_B2F_MapEvents @ 0x83AFA8C + .4byte RocketHideout_B2F_MapScripts @ 0x81612A1 .4byte NULL .2byte BGM_FRLG_ROCKET_HIDEOUT .2byte 129 diff --git a/data/maps/RocketHideout_B3F/header.inc b/data/maps/RocketHideout_B3F/header.inc index 2a639bda8..82aff9271 100644 --- a/data/maps/RocketHideout_B3F/header.inc +++ b/data/maps/RocketHideout_B3F/header.inc @@ -1,7 +1,7 @@ RocketHideout_B3F:: @ 834F6E4 .4byte RocketHideout_B3F_Layout @ 0x8306694 - .4byte gMapEvents_RocketHideout_B3F @ 0x83AFB34 - .4byte gMapScripts_RocketHideout_B3F @ 0x81612B9 + .4byte RocketHideout_B3F_MapEvents @ 0x83AFB34 + .4byte RocketHideout_B3F_MapScripts @ 0x81612B9 .4byte NULL .2byte BGM_FRLG_ROCKET_HIDEOUT .2byte 130 diff --git a/data/maps/RocketHideout_B4F/header.inc b/data/maps/RocketHideout_B4F/header.inc index 0cf775f5a..1d37c165d 100644 --- a/data/maps/RocketHideout_B4F/header.inc +++ b/data/maps/RocketHideout_B4F/header.inc @@ -1,7 +1,7 @@ RocketHideout_B4F:: @ 834F700 .4byte RocketHideout_B4F_Layout @ 0x8306B98 - .4byte gMapEvents_RocketHideout_B4F @ 0x83AFC50 - .4byte gMapScripts_RocketHideout_B4F @ 0x81612E8 + .4byte RocketHideout_B4F_MapEvents @ 0x83AFC50 + .4byte RocketHideout_B4F_MapScripts @ 0x81612E8 .4byte NULL .2byte BGM_FRLG_ROCKET_HIDEOUT .2byte 131 diff --git a/data/maps/RocketHideout_Elevator/header.inc b/data/maps/RocketHideout_Elevator/header.inc index 70c8c2a22..321b9829d 100644 --- a/data/maps/RocketHideout_Elevator/header.inc +++ b/data/maps/RocketHideout_Elevator/header.inc @@ -1,7 +1,7 @@ RocketHideout_Elevator:: @ 834F71C .4byte RocketHideout_Elevator_Layout @ 0x8320EDC - .4byte gMapEvents_RocketHideout_Elevator @ 0x83AFC80 - .4byte gMapScripts_RocketHideout_Elevator @ 0x81614D8 + .4byte RocketHideout_Elevator_MapEvents @ 0x83AFC80 + .4byte RocketHideout_Elevator_MapScripts @ 0x81614D8 .4byte NULL .2byte BGM_FRLG_ROCKET_HIDEOUT .2byte 225 diff --git a/data/maps/Route1/header.inc b/data/maps/Route1/header.inc index 6f2a76447..900563a23 100644 --- a/data/maps/Route1/header.inc +++ b/data/maps/Route1/header.inc @@ -1,7 +1,7 @@ Route1:: @ 835082C .4byte Route1_Layout @ 0x82E55CC - .4byte gMapEvents_Route1 @ 0x83B6648 - .4byte gMapScripts_Route1 @ 0x8167EFD + .4byte Route1_MapEvents @ 0x83B6648 + .4byte Route1_MapScripts @ 0x8167EFD .4byte Route1_MapConnections @ 0x83529F4 .2byte BGM_FRLG_ROUTE_1 .2byte 89 diff --git a/data/maps/Route10/header.inc b/data/maps/Route10/header.inc index 8c8dc7244..3557919fb 100644 --- a/data/maps/Route10/header.inc +++ b/data/maps/Route10/header.inc @@ -1,7 +1,7 @@ Route10:: @ 8350928 .4byte Route10_Layout @ 0x82EC3D0 - .4byte gMapEvents_Route10 @ 0x83B6FA0 - .4byte gMapScripts_Route10 @ 0x8167FD9 + .4byte Route10_MapEvents @ 0x83B6FA0 + .4byte Route10_MapScripts @ 0x8167FD9 .4byte Route10_MapConnections @ 0x8352B14 .2byte BGM_FRLG_ROUTE_3 .2byte 98 diff --git a/data/maps/Route10_PokemonCenter_1F/header.inc b/data/maps/Route10_PokemonCenter_1F/header.inc index 3e965c250..2f7bd05cc 100644 --- a/data/maps/Route10_PokemonCenter_1F/header.inc +++ b/data/maps/Route10_PokemonCenter_1F/header.inc @@ -1,7 +1,7 @@ Route10_PokemonCenter_1F:: @ 83518B0 .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte gMapEvents_Route10_PokemonCenter_1F @ 0x83BD8FC - .4byte gMapScripts_Route10_PokemonCenter_1F @ 0x816FC2F + .4byte Route10_PokemonCenter_1F_MapEvents @ 0x83BD8FC + .4byte Route10_PokemonCenter_1F_MapScripts @ 0x816FC2F .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 8 diff --git a/data/maps/Route10_PokemonCenter_2F/header.inc b/data/maps/Route10_PokemonCenter_2F/header.inc index 9502d74d9..5ed083920 100644 --- a/data/maps/Route10_PokemonCenter_2F/header.inc +++ b/data/maps/Route10_PokemonCenter_2F/header.inc @@ -1,7 +1,7 @@ Route10_PokemonCenter_2F:: @ 83518CC .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte gMapEvents_Route10_PokemonCenter_2F @ 0x83BD988 - .4byte gMapScripts_Route10_PokemonCenter_2F @ 0x816FCFA + .4byte Route10_PokemonCenter_2F_MapEvents @ 0x83BD988 + .4byte Route10_PokemonCenter_2F_MapScripts @ 0x816FCFA .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 9 diff --git a/data/maps/Route11/header.inc b/data/maps/Route11/header.inc index 93550fb3c..92ea71fdb 100644 --- a/data/maps/Route11/header.inc +++ b/data/maps/Route11/header.inc @@ -1,7 +1,7 @@ Route11:: @ 8350944 .4byte Route11_Layout @ 0x82ECF34 - .4byte gMapEvents_Route11 @ 0x83B711C - .4byte gMapScripts_Route11 @ 0x8167FF6 + .4byte Route11_MapEvents @ 0x83B711C + .4byte Route11_MapScripts @ 0x8167FF6 .4byte Route11_MapConnections @ 0x8352B34 .2byte BGM_FRLG_ROUTE_11 .2byte 99 diff --git a/data/maps/Route11_EastEntrance_1F/header.inc b/data/maps/Route11_EastEntrance_1F/header.inc index d8f7762e3..8c54bc523 100644 --- a/data/maps/Route11_EastEntrance_1F/header.inc +++ b/data/maps/Route11_EastEntrance_1F/header.inc @@ -1,7 +1,7 @@ Route11_EastEntrance_1F:: @ 83518E8 .4byte Entrance_1F_Layout @ 0x8320E70 - .4byte gMapEvents_Route11_EastEntrance_1F @ 0x83BD9F4 - .4byte gMapScripts_Route11_EastEntrance_1F @ 0x816FD21 + .4byte Route11_EastEntrance_1F_MapEvents @ 0x83BD9F4 + .4byte Route11_EastEntrance_1F_MapScripts @ 0x816FD21 .4byte NULL .2byte BGM_FRLG_VERMILION_CITY .2byte 224 diff --git a/data/maps/Route11_EastEntrance_2F/header.inc b/data/maps/Route11_EastEntrance_2F/header.inc index 964580122..4b3611c21 100644 --- a/data/maps/Route11_EastEntrance_2F/header.inc +++ b/data/maps/Route11_EastEntrance_2F/header.inc @@ -1,7 +1,7 @@ Route11_EastEntrance_2F:: @ 8351904 .4byte Entrance_2F_Layout @ 0x8320804 - .4byte gMapEvents_Route11_EastEntrance_2F @ 0x83BDA58 - .4byte gMapScripts_Route11_EastEntrance_2F @ 0x816FD34 + .4byte Route11_EastEntrance_2F_MapEvents @ 0x83BDA58 + .4byte Route11_EastEntrance_2F_MapScripts @ 0x816FD34 .4byte NULL .2byte BGM_FRLG_VERMILION_CITY .2byte 220 diff --git a/data/maps/Route12/header.inc b/data/maps/Route12/header.inc index 89963d62a..882794915 100644 --- a/data/maps/Route12/header.inc +++ b/data/maps/Route12/header.inc @@ -1,7 +1,7 @@ Route12:: @ 8350960 .4byte Route12_Layout @ 0x82EE5D8 - .4byte gMapEvents_Route12 @ 0x83B72DC - .4byte gMapScripts_Route12 @ 0x8168000 + .4byte Route12_MapEvents @ 0x83B72DC + .4byte Route12_MapScripts @ 0x8168000 .4byte Route12_MapConnections @ 0x8352B60 .2byte BGM_FRLG_ROUTE_11 .2byte 100 diff --git a/data/maps/Route12_FishingHouse/header.inc b/data/maps/Route12_FishingHouse/header.inc index a7c27f49d..31fa7f94d 100644 --- a/data/maps/Route12_FishingHouse/header.inc +++ b/data/maps/Route12_FishingHouse/header.inc @@ -1,7 +1,7 @@ Route12_FishingHouse:: @ 8351958 .4byte House4_Layout @ 0x82D6070 - .4byte gMapEvents_Route12_FishingHouse @ 0x83BDB48 - .4byte gMapScripts_Route12_FishingHouse @ 0x816FF0B + .4byte Route12_FishingHouse_MapEvents @ 0x83BDB48 + .4byte Route12_FishingHouse_MapScripts @ 0x816FF0B .4byte NULL .2byte BGM_FRLG_CELADON_CITY .2byte 13 diff --git a/data/maps/Route12_NorthEntrance_1F/header.inc b/data/maps/Route12_NorthEntrance_1F/header.inc index f3a501887..60a2f30e5 100644 --- a/data/maps/Route12_NorthEntrance_1F/header.inc +++ b/data/maps/Route12_NorthEntrance_1F/header.inc @@ -1,7 +1,7 @@ Route12_NorthEntrance_1F:: @ 8351920 .4byte Route12_NorthEntrance_1F_Layout @ 0x8319DF0 - .4byte gMapEvents_Route12_NorthEntrance_1F @ 0x83BDAAC - .4byte gMapScripts_Route12_NorthEntrance_1F @ 0x816FE6D + .4byte Route12_NorthEntrance_1F_MapEvents @ 0x83BDAAC + .4byte Route12_NorthEntrance_1F_MapScripts @ 0x816FE6D .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 176 diff --git a/data/maps/Route12_NorthEntrance_2F/header.inc b/data/maps/Route12_NorthEntrance_2F/header.inc index deb9655e1..00a195bd2 100644 --- a/data/maps/Route12_NorthEntrance_2F/header.inc +++ b/data/maps/Route12_NorthEntrance_2F/header.inc @@ -1,7 +1,7 @@ Route12_NorthEntrance_2F:: @ 835193C .4byte Entrance_2F_Layout @ 0x8320804 - .4byte gMapEvents_Route12_NorthEntrance_2F @ 0x83BDAF8 - .4byte gMapScripts_Route12_NorthEntrance_2F @ 0x816FE77 + .4byte Route12_NorthEntrance_2F_MapEvents @ 0x83BDAF8 + .4byte Route12_NorthEntrance_2F_MapScripts @ 0x816FE77 .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 220 diff --git a/data/maps/Route13/header.inc b/data/maps/Route13/header.inc index 2f98d6d15..854f41328 100644 --- a/data/maps/Route13/header.inc +++ b/data/maps/Route13/header.inc @@ -1,7 +1,7 @@ Route13:: @ 835097C .4byte Route13_Layout @ 0x82EF13C - .4byte gMapEvents_Route13 @ 0x83B7428 - .4byte gMapScripts_Route13 @ 0x81680B5 + .4byte Route13_MapEvents @ 0x83B7428 + .4byte Route13_MapScripts @ 0x81680B5 .4byte Route13_MapConnections @ 0x8352B80 .2byte BGM_FRLG_ROUTE_11 .2byte 101 diff --git a/data/maps/Route14/header.inc b/data/maps/Route14/header.inc index 5fe549443..4dc8ad571 100644 --- a/data/maps/Route14/header.inc +++ b/data/maps/Route14/header.inc @@ -1,7 +1,7 @@ Route14:: @ 8350998 .4byte Route14_Layout @ 0x82EFCA0 - .4byte gMapEvents_Route14 @ 0x83B75C8 - .4byte gMapScripts_Route14 @ 0x81680D1 + .4byte Route14_MapEvents @ 0x83B75C8 + .4byte Route14_MapScripts @ 0x81680D1 .4byte Route14_MapConnections @ 0x8352BA0 .2byte BGM_FRLG_ROUTE_11 .2byte 102 diff --git a/data/maps/Route15/header.inc b/data/maps/Route15/header.inc index 12dc0221c..c1fc1f9cd 100644 --- a/data/maps/Route15/header.inc +++ b/data/maps/Route15/header.inc @@ -1,7 +1,7 @@ Route15:: @ 83509B4 .4byte Route15_Layout @ 0x82F0804 - .4byte gMapEvents_Route15 @ 0x83B7748 - .4byte gMapScripts_Route15 @ 0x81680DB + .4byte Route15_MapEvents @ 0x83B7748 + .4byte Route15_MapScripts @ 0x81680DB .4byte Route15_MapConnections @ 0x8352BC0 .2byte BGM_FRLG_ROUTE_11 .2byte 103 diff --git a/data/maps/Route15_WestEntrance_1F/header.inc b/data/maps/Route15_WestEntrance_1F/header.inc index 9c8348b58..7e3573609 100644 --- a/data/maps/Route15_WestEntrance_1F/header.inc +++ b/data/maps/Route15_WestEntrance_1F/header.inc @@ -1,7 +1,7 @@ Route15_WestEntrance_1F:: @ 8351974 .4byte Entrance_1F_Layout @ 0x8320E70 - .4byte gMapEvents_Route15_WestEntrance_1F @ 0x83BDB9C - .4byte gMapScripts_Route15_WestEntrance_1F @ 0x8170088 + .4byte Route15_WestEntrance_1F_MapEvents @ 0x83BDB9C + .4byte Route15_WestEntrance_1F_MapScripts @ 0x8170088 .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 224 diff --git a/data/maps/Route15_WestEntrance_2F/header.inc b/data/maps/Route15_WestEntrance_2F/header.inc index 3be6a3320..7bd72a5b8 100644 --- a/data/maps/Route15_WestEntrance_2F/header.inc +++ b/data/maps/Route15_WestEntrance_2F/header.inc @@ -1,7 +1,7 @@ Route15_WestEntrance_2F:: @ 8351990 .4byte Entrance_2F_Layout @ 0x8320804 - .4byte gMapEvents_Route15_WestEntrance_2F @ 0x83BDBE8 - .4byte gMapScripts_Route15_WestEntrance_2F @ 0x8170092 + .4byte Route15_WestEntrance_2F_MapEvents @ 0x83BDBE8 + .4byte Route15_WestEntrance_2F_MapScripts @ 0x8170092 .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 220 diff --git a/data/maps/Route16/header.inc b/data/maps/Route16/header.inc index 8b6cd97fe..71785a7a5 100644 --- a/data/maps/Route16/header.inc +++ b/data/maps/Route16/header.inc @@ -1,7 +1,7 @@ Route16:: @ 83509D0 .4byte Route16_Layout @ 0x82F0FA8 - .4byte gMapEvents_Route16 @ 0x83B7898 - .4byte gMapScripts_Route16 @ 0x81680E5 + .4byte Route16_MapEvents @ 0x83B7898 + .4byte Route16_MapScripts @ 0x81680E5 .4byte Route16_MapConnections @ 0x8352BE0 .2byte BGM_FRLG_ROUTE_3 .2byte 104 diff --git a/data/maps/Route16_House/header.inc b/data/maps/Route16_House/header.inc index 473deb93f..3fd158b04 100644 --- a/data/maps/Route16_House/header.inc +++ b/data/maps/Route16_House/header.inc @@ -1,7 +1,7 @@ Route16_House:: @ 83519AC .4byte House1_Layout @ 0x82D5754 - .4byte gMapEvents_Route16_House @ 0x83BDC44 - .4byte gMapScripts_Route16_House @ 0x817014E + .4byte Route16_House_MapEvents @ 0x83BDC44 + .4byte Route16_House_MapScripts @ 0x817014E .4byte NULL .2byte BGM_FRLG_CELADON_CITY .2byte 6 diff --git a/data/maps/Route16_NorthEntrance_1F/header.inc b/data/maps/Route16_NorthEntrance_1F/header.inc index b0f6c815b..fffac64b8 100644 --- a/data/maps/Route16_NorthEntrance_1F/header.inc +++ b/data/maps/Route16_NorthEntrance_1F/header.inc @@ -1,7 +1,7 @@ Route16_NorthEntrance_1F:: @ 83519C8 .4byte Route16_NorthEntrance_1F_Layout @ 0x8320D14 - .4byte gMapEvents_Route16_NorthEntrance_1F @ 0x83BDD60 - .4byte gMapScripts_Route16_NorthEntrance_1F @ 0x81701C2 + .4byte Route16_NorthEntrance_1F_MapEvents @ 0x83BDD60 + .4byte Route16_NorthEntrance_1F_MapScripts @ 0x81701C2 .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 223 diff --git a/data/maps/Route16_NorthEntrance_2F/header.inc b/data/maps/Route16_NorthEntrance_2F/header.inc index 91998b7ce..ea494e816 100644 --- a/data/maps/Route16_NorthEntrance_2F/header.inc +++ b/data/maps/Route16_NorthEntrance_2F/header.inc @@ -1,7 +1,7 @@ Route16_NorthEntrance_2F:: @ 83519E4 .4byte Entrance_2F_Layout @ 0x8320804 - .4byte gMapEvents_Route16_NorthEntrance_2F @ 0x83BDDDC - .4byte gMapScripts_Route16_NorthEntrance_2F @ 0x81702BE + .4byte Route16_NorthEntrance_2F_MapEvents @ 0x83BDDDC + .4byte Route16_NorthEntrance_2F_MapScripts @ 0x81702BE .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 220 diff --git a/data/maps/Route17/header.inc b/data/maps/Route17/header.inc index 1794580a8..ae76e440e 100644 --- a/data/maps/Route17/header.inc +++ b/data/maps/Route17/header.inc @@ -1,7 +1,7 @@ Route17:: @ 83509EC .4byte Route17_Layout @ 0x82F2DCC - .4byte gMapEvents_Route17 @ 0x83B7A20 - .4byte gMapScripts_Route17 @ 0x81681BF + .4byte Route17_MapEvents @ 0x83B7A20 + .4byte Route17_MapScripts @ 0x81681BF .4byte Route17_MapConnections @ 0x8352C00 .2byte BGM_FRLG_ROUTE_3 .2byte 105 diff --git a/data/maps/Route18/header.inc b/data/maps/Route18/header.inc index 9ca9d432b..b4861fdf1 100644 --- a/data/maps/Route18/header.inc +++ b/data/maps/Route18/header.inc @@ -1,7 +1,7 @@ Route18:: @ 8350A08 .4byte Route18_Layout @ 0x82F3750 - .4byte gMapEvents_Route18 @ 0x83B7AA4 - .4byte gMapScripts_Route18 @ 0x81681F6 + .4byte Route18_MapEvents @ 0x83B7AA4 + .4byte Route18_MapScripts @ 0x81681F6 .4byte Route18_MapConnections @ 0x8352C20 .2byte BGM_FRLG_ROUTE_3 .2byte 106 diff --git a/data/maps/Route18_EastEntrance_1F/header.inc b/data/maps/Route18_EastEntrance_1F/header.inc index 74e8f827f..87cf71cf7 100644 --- a/data/maps/Route18_EastEntrance_1F/header.inc +++ b/data/maps/Route18_EastEntrance_1F/header.inc @@ -1,7 +1,7 @@ Route18_EastEntrance_1F:: @ 8351A00 .4byte Entrance_1F_Layout @ 0x8320E70 - .4byte gMapEvents_Route18_EastEntrance_1F @ 0x83BDED0 - .4byte gMapScripts_Route18_EastEntrance_1F @ 0x8170378 + .4byte Route18_EastEntrance_1F_MapEvents @ 0x83BDED0 + .4byte Route18_EastEntrance_1F_MapScripts @ 0x8170378 .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 224 diff --git a/data/maps/Route18_EastEntrance_2F/header.inc b/data/maps/Route18_EastEntrance_2F/header.inc index ff41bf2da..56ed2a2a9 100644 --- a/data/maps/Route18_EastEntrance_2F/header.inc +++ b/data/maps/Route18_EastEntrance_2F/header.inc @@ -1,7 +1,7 @@ Route18_EastEntrance_2F:: @ 8351A1C .4byte Entrance_2F_Layout @ 0x8320804 - .4byte gMapEvents_Route18_EastEntrance_2F @ 0x83BDF1C - .4byte gMapScripts_Route18_EastEntrance_2F @ 0x817046B + .4byte Route18_EastEntrance_2F_MapEvents @ 0x83BDF1C + .4byte Route18_EastEntrance_2F_MapScripts @ 0x817046B .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 220 diff --git a/data/maps/Route19/header.inc b/data/maps/Route19/header.inc index 6be186f94..a141f1f92 100644 --- a/data/maps/Route19/header.inc +++ b/data/maps/Route19/header.inc @@ -1,7 +1,7 @@ Route19:: @ 8350A24 .4byte Route19_Layout @ 0x82F42B4 - .4byte gMapEvents_Route19 @ 0x83B7BE4 - .4byte gMapScripts_Route19 @ 0x8168231 + .4byte Route19_MapEvents @ 0x83B7BE4 + .4byte Route19_MapScripts @ 0x8168231 .4byte Route19_MapConnections @ 0x8352C40 .2byte BGM_FRLG_ROUTE_3 .2byte 107 diff --git a/data/maps/Route2/header.inc b/data/maps/Route2/header.inc index 2d892eab9..985fe6d72 100644 --- a/data/maps/Route2/header.inc +++ b/data/maps/Route2/header.inc @@ -1,7 +1,7 @@ Route2:: @ 8350848 .4byte Route2_Layout @ 0x82E64F0 - .4byte gMapEvents_Route2 @ 0x83B676C - .4byte gMapScripts_Route2 @ 0x8167F64 + .4byte Route2_MapEvents @ 0x83B676C + .4byte Route2_MapScripts @ 0x8167F64 .4byte Route2_MapConnections @ 0x8352A14 .2byte BGM_FRLG_ROUTE_1 .2byte 90 diff --git a/data/maps/Route20/header.inc b/data/maps/Route20/header.inc index a4b1a19bc..1b832f0cd 100644 --- a/data/maps/Route20/header.inc +++ b/data/maps/Route20/header.inc @@ -1,7 +1,7 @@ Route20:: @ 8350A40 .4byte Route20_Layout @ 0x82F5598 - .4byte gMapEvents_Route20 @ 0x83B7D34 - .4byte gMapScripts_Route20 @ 0x816823B + .4byte Route20_MapEvents @ 0x83B7D34 + .4byte Route20_MapScripts @ 0x816823B .4byte Route20_MapConnections @ 0x8352C60 .2byte BGM_FRLG_ROUTE_3 .2byte 108 diff --git a/data/maps/Route21_North/header.inc b/data/maps/Route21_North/header.inc index 728a8f92c..cf0397e8a 100644 --- a/data/maps/Route21_North/header.inc +++ b/data/maps/Route21_North/header.inc @@ -1,7 +1,7 @@ Route21_North:: @ 8350A5C .4byte Route21_North_Layout @ 0x82F5F1C - .4byte gMapEvents_Route21_North @ 0x83B7DE4 - .4byte gMapScripts_Route21_North @ 0x8168289 + .4byte Route21_North_MapEvents @ 0x83B7DE4 + .4byte Route21_North_MapScripts @ 0x8168289 .4byte Route21_North_MapConnections @ 0x8352C80 .2byte BGM_FRLG_ROUTE_3 .2byte 109 diff --git a/data/maps/Route21_South/header.inc b/data/maps/Route21_South/header.inc index c2dd83782..b81f0ec6a 100644 --- a/data/maps/Route21_South/header.inc +++ b/data/maps/Route21_South/header.inc @@ -1,7 +1,7 @@ Route21_South:: @ 8350A78 .4byte Route21_South_Layout @ 0x83206C0 - .4byte gMapEvents_Route21_South @ 0x83B7E70 - .4byte gMapScripts_Route21_South @ 0x816828A + .4byte Route21_South_MapEvents @ 0x83B7E70 + .4byte Route21_South_MapScripts @ 0x816828A .4byte Route21_South_MapConnections @ 0x8352CA0 .2byte BGM_FRLG_ROUTE_3 .2byte 219 diff --git a/data/maps/Route22/header.inc b/data/maps/Route22/header.inc index c24992f76..70942583f 100644 --- a/data/maps/Route22/header.inc +++ b/data/maps/Route22/header.inc @@ -1,7 +1,7 @@ Route22:: @ 8350A94 .4byte Route22_Layout @ 0x82F6840 - .4byte gMapEvents_Route22 @ 0x83B7F18 - .4byte gMapScripts_Route22 @ 0x816828B + .4byte Route22_MapEvents @ 0x83B7F18 + .4byte Route22_MapScripts @ 0x816828B .4byte Route22_MapConnections @ 0x8352CC0 .2byte BGM_FRLG_ROUTE_3 .2byte 110 diff --git a/data/maps/Route22_NorthEntrance/header.inc b/data/maps/Route22_NorthEntrance/header.inc index 8daef5317..3f7b86142 100644 --- a/data/maps/Route22_NorthEntrance/header.inc +++ b/data/maps/Route22_NorthEntrance/header.inc @@ -1,7 +1,7 @@ Route22_NorthEntrance:: @ 8351A54 .4byte Route22_NorthEntrance_Layout @ 0x8320B1C - .4byte gMapEvents_Route22_NorthEntrance @ 0x83BDF8C - .4byte gMapScripts_Route22_NorthEntrance @ 0x81704FB + .4byte Route22_NorthEntrance_MapEvents @ 0x83BDF8C + .4byte Route22_NorthEntrance_MapScripts @ 0x81704FB .4byte NULL .2byte BGM_FRLG_VIRIDIAN_FOREST .2byte 222 diff --git a/data/maps/Route23/header.inc b/data/maps/Route23/header.inc index 3fc71fc59..2a6fa4b27 100644 --- a/data/maps/Route23/header.inc +++ b/data/maps/Route23/header.inc @@ -1,7 +1,7 @@ Route23:: @ 8350AB0 .4byte Route23_Layout @ 0x82F8664 - .4byte gMapEvents_Route23 @ 0x83B8300 - .4byte gMapScripts_Route23 @ 0x81684EB + .4byte Route23_MapEvents @ 0x83B8300 + .4byte Route23_MapScripts @ 0x81684EB .4byte Route23_MapConnections @ 0x8352CE0 .2byte BGM_FRLG_INDIGO_PLATEAU .2byte 111 diff --git a/data/maps/Route24/header.inc b/data/maps/Route24/header.inc index 32b644009..298826eef 100644 --- a/data/maps/Route24/header.inc +++ b/data/maps/Route24/header.inc @@ -1,7 +1,7 @@ Route24:: @ 8350ACC .4byte Route24_Layout @ 0x82F8E08 - .4byte gMapEvents_Route24 @ 0x83B8400 - .4byte gMapScripts_Route24 @ 0x816861F + .4byte Route24_MapEvents @ 0x83B8400 + .4byte Route24_MapScripts @ 0x816861F .4byte Route24_MapConnections @ 0x8352D00 .2byte BGM_FRLG_ROUTE_24 .2byte 112 diff --git a/data/maps/Route25/header.inc b/data/maps/Route25/header.inc index 38df8e11d..f4525d40e 100644 --- a/data/maps/Route25/header.inc +++ b/data/maps/Route25/header.inc @@ -1,7 +1,7 @@ Route25:: @ 8350AE8 .4byte Route25_Layout @ 0x82F996C - .4byte gMapEvents_Route25 @ 0x83B8590 - .4byte gMapScripts_Route25 @ 0x8168745 + .4byte Route25_MapEvents @ 0x83B8590 + .4byte Route25_MapScripts @ 0x8168745 .4byte Route25_MapConnections @ 0x8352D14 .2byte BGM_FRLG_ROUTE_24 .2byte 113 diff --git a/data/maps/Route25_SeaCottage/header.inc b/data/maps/Route25_SeaCottage/header.inc index 9108278b2..268e6e59c 100644 --- a/data/maps/Route25_SeaCottage/header.inc +++ b/data/maps/Route25_SeaCottage/header.inc @@ -1,7 +1,7 @@ Route25_SeaCottage:: @ 8351A8C .4byte Route25_SeaCottage_Layout @ 0x8319030 - .4byte gMapEvents_Route25_SeaCottage @ 0x83BE008 - .4byte gMapScripts_Route25_SeaCottage @ 0x8170523 + .4byte Route25_SeaCottage_MapEvents @ 0x83BE008 + .4byte Route25_SeaCottage_MapScripts @ 0x8170523 .4byte NULL .2byte BGM_FRLG_CERULEAN_CITY .2byte 169 diff --git a/data/maps/Route2_EastBuilding/header.inc b/data/maps/Route2_EastBuilding/header.inc index d6ffe1e28..02b30b483 100644 --- a/data/maps/Route2_EastBuilding/header.inc +++ b/data/maps/Route2_EastBuilding/header.inc @@ -1,7 +1,7 @@ Route2_EastBuilding:: @ 8351798 .4byte Route2_Entrance_Layout @ 0x8320990 - .4byte gMapEvents_Route2_EastBuilding @ 0x83BD43C - .4byte gMapScripts_Route2_EastBuilding @ 0x816F67E + .4byte Route2_EastBuilding_MapEvents @ 0x83BD43C + .4byte Route2_EastBuilding_MapScripts @ 0x816F67E .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 221 diff --git a/data/maps/Route2_House/header.inc b/data/maps/Route2_House/header.inc index d59cf73bc..c04a3439c 100644 --- a/data/maps/Route2_House/header.inc +++ b/data/maps/Route2_House/header.inc @@ -1,7 +1,7 @@ Route2_House:: @ 835177C .4byte House2_Layout @ 0x82D5840 - .4byte gMapEvents_Route2_House @ 0x83BD3D8 - .4byte gMapScripts_Route2_House @ 0x816F5F8 + .4byte Route2_House_MapEvents @ 0x83BD3D8 + .4byte Route2_House_MapScripts @ 0x816F5F8 .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 7 diff --git a/data/maps/Route2_ViridianForest_NorthEntrance/header.inc b/data/maps/Route2_ViridianForest_NorthEntrance/header.inc index 003e21340..c460e0cca 100644 --- a/data/maps/Route2_ViridianForest_NorthEntrance/header.inc +++ b/data/maps/Route2_ViridianForest_NorthEntrance/header.inc @@ -1,7 +1,7 @@ Route2_ViridianForest_NorthEntrance:: @ 83517B4 .4byte Route2_Entrance_Layout @ 0x8320990 - .4byte gMapEvents_Route2_ViridianForest_NorthEntrance @ 0x83BD4B8 - .4byte gMapScripts_Route2_ViridianForest_NorthEntrance @ 0x816F71D + .4byte Route2_ViridianForest_NorthEntrance_MapEvents @ 0x83BD4B8 + .4byte Route2_ViridianForest_NorthEntrance_MapScripts @ 0x816F71D .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 221 diff --git a/data/maps/Route2_ViridianForest_SouthEntrance/header.inc b/data/maps/Route2_ViridianForest_SouthEntrance/header.inc index 133c6a43c..936b17158 100644 --- a/data/maps/Route2_ViridianForest_SouthEntrance/header.inc +++ b/data/maps/Route2_ViridianForest_SouthEntrance/header.inc @@ -1,7 +1,7 @@ Route2_ViridianForest_SouthEntrance:: @ 8351760 .4byte Route2_Entrance_Layout @ 0x8320990 - .4byte gMapEvents_Route2_ViridianForest_SouthEntrance @ 0x83BD37C - .4byte gMapScripts_Route2_ViridianForest_SouthEntrance @ 0x816F5E5 + .4byte Route2_ViridianForest_SouthEntrance_MapEvents @ 0x83BD37C + .4byte Route2_ViridianForest_SouthEntrance_MapScripts @ 0x816F5E5 .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 221 diff --git a/data/maps/Route3/header.inc b/data/maps/Route3/header.inc index 8c33a7801..ae86378c2 100644 --- a/data/maps/Route3/header.inc +++ b/data/maps/Route3/header.inc @@ -1,7 +1,7 @@ Route3:: @ 8350864 .4byte Route3_Layout @ 0x82E7234 - .4byte gMapEvents_Route3 @ 0x83B6870 - .4byte gMapScripts_Route3 @ 0x8167F77 + .4byte Route3_MapEvents @ 0x83B6870 + .4byte Route3_MapScripts @ 0x8167F77 .4byte Route3_MapConnections @ 0x8352A34 .2byte BGM_FRLG_ROUTE_3 .2byte 91 diff --git a/data/maps/Route4/header.inc b/data/maps/Route4/header.inc index ed68203b1..7156cf616 100644 --- a/data/maps/Route4/header.inc +++ b/data/maps/Route4/header.inc @@ -1,7 +1,7 @@ Route4:: @ 8350880 .4byte Route4_Layout @ 0x82E8338 - .4byte gMapEvents_Route4 @ 0x83B6980 - .4byte gMapScripts_Route4 @ 0x8167F8A + .4byte Route4_MapEvents @ 0x83B6980 + .4byte Route4_MapScripts @ 0x8167F8A .4byte Route4_MapConnections @ 0x8352A54 .2byte BGM_FRLG_ROUTE_3 .2byte 92 diff --git a/data/maps/Route4_PokemonCenter_1F/header.inc b/data/maps/Route4_PokemonCenter_1F/header.inc index f48c8935e..fc36624b4 100644 --- a/data/maps/Route4_PokemonCenter_1F/header.inc +++ b/data/maps/Route4_PokemonCenter_1F/header.inc @@ -1,7 +1,7 @@ Route4_PokemonCenter_1F:: @ 83517D0 .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte gMapEvents_Route4_PokemonCenter_1F @ 0x83BD57C - .4byte gMapScripts_Route4_PokemonCenter_1F @ 0x816F739 + .4byte Route4_PokemonCenter_1F_MapEvents @ 0x83BD57C + .4byte Route4_PokemonCenter_1F_MapScripts @ 0x816F739 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 8 diff --git a/data/maps/Route4_PokemonCenter_2F/header.inc b/data/maps/Route4_PokemonCenter_2F/header.inc index 8ae29faa7..eb9d2796d 100644 --- a/data/maps/Route4_PokemonCenter_2F/header.inc +++ b/data/maps/Route4_PokemonCenter_2F/header.inc @@ -1,7 +1,7 @@ Route4_PokemonCenter_2F:: @ 83517EC .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte gMapEvents_Route4_PokemonCenter_2F @ 0x83BD608 - .4byte gMapScripts_Route4_PokemonCenter_2F @ 0x816F8D8 + .4byte Route4_PokemonCenter_2F_MapEvents @ 0x83BD608 + .4byte Route4_PokemonCenter_2F_MapScripts @ 0x816F8D8 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 9 diff --git a/data/maps/Route5/header.inc b/data/maps/Route5/header.inc index e688654a4..7092ca60b 100644 --- a/data/maps/Route5/header.inc +++ b/data/maps/Route5/header.inc @@ -1,7 +1,7 @@ Route5:: @ 835089C .4byte Route5_Layout @ 0x82E925C - .4byte gMapEvents_Route5 @ 0x83B69C0 - .4byte gMapScripts_Route5 @ 0x8167FA7 + .4byte Route5_MapEvents @ 0x83B69C0 + .4byte Route5_MapScripts @ 0x8167FA7 .4byte Route5_MapConnections @ 0x8352A74 .2byte BGM_FRLG_ROUTE_3 .2byte 93 diff --git a/data/maps/Route5_PokemonDayCare/header.inc b/data/maps/Route5_PokemonDayCare/header.inc index 5d2affab9..3fef23ccb 100644 --- a/data/maps/Route5_PokemonDayCare/header.inc +++ b/data/maps/Route5_PokemonDayCare/header.inc @@ -1,7 +1,7 @@ Route5_PokemonDayCare:: @ 8351808 .4byte Route5_PokemonDayCare_Layout @ 0x833ADC0 - .4byte gMapEvents_Route5_PokemonDayCare @ 0x83BD64C - .4byte gMapScripts_Route5_PokemonDayCare @ 0x816F8FF + .4byte Route5_PokemonDayCare_MapEvents @ 0x83BD64C + .4byte Route5_PokemonDayCare_MapScripts @ 0x816F8FF .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 275 diff --git a/data/maps/Route5_SouthEntrance/header.inc b/data/maps/Route5_SouthEntrance/header.inc index 4617ef84b..c918b3b50 100644 --- a/data/maps/Route5_SouthEntrance/header.inc +++ b/data/maps/Route5_SouthEntrance/header.inc @@ -1,7 +1,7 @@ Route5_SouthEntrance:: @ 8351824 .4byte SaffronCity_NorthSouthEntrance_Layout @ 0x831E9C0 - .4byte gMapEvents_Route5_SouthEntrance @ 0x83BD6C8 - .4byte gMapScripts_Route5_SouthEntrance @ 0x816F900 + .4byte Route5_SouthEntrance_MapEvents @ 0x83BD6C8 + .4byte Route5_SouthEntrance_MapScripts @ 0x816F900 .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 208 diff --git a/data/maps/Route6/header.inc b/data/maps/Route6/header.inc index 5d29ba552..8e2668411 100644 --- a/data/maps/Route6/header.inc +++ b/data/maps/Route6/header.inc @@ -1,7 +1,7 @@ Route6:: @ 83508B8 .4byte Route6_Layout @ 0x82E9A00 - .4byte gMapEvents_Route6 @ 0x83B6AA0 - .4byte gMapScripts_Route6 @ 0x8167FB1 + .4byte Route6_MapEvents @ 0x83B6AA0 + .4byte Route6_MapScripts @ 0x8167FB1 .4byte Route6_MapConnections @ 0x8352A94 .2byte BGM_FRLG_ROUTE_3 .2byte 94 diff --git a/data/maps/Route6_NorthEntrance/header.inc b/data/maps/Route6_NorthEntrance/header.inc index 1127ca878..6ef93a401 100644 --- a/data/maps/Route6_NorthEntrance/header.inc +++ b/data/maps/Route6_NorthEntrance/header.inc @@ -1,7 +1,7 @@ Route6_NorthEntrance:: @ 8351840 .4byte SaffronCity_NorthSouthEntrance_Layout @ 0x831E9C0 - .4byte gMapEvents_Route6_NorthEntrance @ 0x83BD744 - .4byte gMapScripts_Route6_NorthEntrance @ 0x816F9C6 + .4byte Route6_NorthEntrance_MapEvents @ 0x83BD744 + .4byte Route6_NorthEntrance_MapScripts @ 0x816F9C6 .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 208 diff --git a/data/maps/Route7/header.inc b/data/maps/Route7/header.inc index 8e7e0472a..b7c432750 100644 --- a/data/maps/Route7/header.inc +++ b/data/maps/Route7/header.inc @@ -1,7 +1,7 @@ Route7:: @ 83508D4 .4byte Route7_Layout @ 0x82E9DE4 - .4byte gMapEvents_Route7 @ 0x83B6AF4 - .4byte gMapScripts_Route7 @ 0x8167FBB + .4byte Route7_MapEvents @ 0x83B6AF4 + .4byte Route7_MapScripts @ 0x8167FBB .4byte Route7_MapConnections @ 0x8352AB4 .2byte BGM_FRLG_ROUTE_3 .2byte 95 diff --git a/data/maps/Route7_EastEntrance/header.inc b/data/maps/Route7_EastEntrance/header.inc index 1a30930fa..6ceaa940e 100644 --- a/data/maps/Route7_EastEntrance/header.inc +++ b/data/maps/Route7_EastEntrance/header.inc @@ -1,7 +1,7 @@ Route7_EastEntrance:: @ 8351878 .4byte SaffronCity_EastWestEntrance_Layout @ 0x831EAD0 - .4byte gMapEvents_Route7_EastEntrance @ 0x83BD7D4 - .4byte gMapScripts_Route7_EastEntrance @ 0x816FA8D + .4byte Route7_EastEntrance_MapEvents @ 0x83BD7D4 + .4byte Route7_EastEntrance_MapScripts @ 0x816FA8D .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 209 diff --git a/data/maps/Route8/header.inc b/data/maps/Route8/header.inc index 85bc28400..b4b9bec8d 100644 --- a/data/maps/Route8/header.inc +++ b/data/maps/Route8/header.inc @@ -1,7 +1,7 @@ Route8:: @ 83508F0 .4byte Route8_Layout @ 0x82EA948 - .4byte gMapEvents_Route8 @ 0x83B6CB0 - .4byte gMapScripts_Route8 @ 0x8167FC5 + .4byte Route8_MapEvents @ 0x83B6CB0 + .4byte Route8_MapScripts @ 0x8167FC5 .4byte Route8_MapConnections @ 0x8352AD4 .2byte BGM_FRLG_ROUTE_3 .2byte 96 diff --git a/data/maps/Route8_WestEntrance/header.inc b/data/maps/Route8_WestEntrance/header.inc index 4eb91b5bd..400f52c1c 100644 --- a/data/maps/Route8_WestEntrance/header.inc +++ b/data/maps/Route8_WestEntrance/header.inc @@ -1,7 +1,7 @@ Route8_WestEntrance:: @ 8351894 .4byte SaffronCity_EastWestEntrance_Layout @ 0x831EAD0 - .4byte gMapEvents_Route8_WestEntrance @ 0x83BD850 - .4byte gMapScripts_Route8_WestEntrance @ 0x816FB53 + .4byte Route8_WestEntrance_MapEvents @ 0x83BD850 + .4byte Route8_WestEntrance_MapScripts @ 0x816FB53 .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 209 diff --git a/data/maps/Route9/header.inc b/data/maps/Route9/header.inc index 559f56a41..0066c2e2f 100644 --- a/data/maps/Route9/header.inc +++ b/data/maps/Route9/header.inc @@ -1,7 +1,7 @@ Route9:: @ 835090C .4byte Route9_Layout @ 0x82EB4AC - .4byte gMapEvents_Route9 @ 0x83B6E14 - .4byte gMapScripts_Route9 @ 0x8167FCF + .4byte Route9_MapEvents @ 0x83B6E14 + .4byte Route9_MapScripts @ 0x8167FCF .4byte Route9_MapConnections @ 0x8352AF4 .2byte BGM_FRLG_ROUTE_3 .2byte 97 diff --git a/data/maps/SSAnne_1F_Corridor/header.inc b/data/maps/SSAnne_1F_Corridor/header.inc index ee2523774..120c6e9b0 100644 --- a/data/maps/SSAnne_1F_Corridor/header.inc +++ b/data/maps/SSAnne_1F_Corridor/header.inc @@ -1,7 +1,7 @@ SSAnne_1F_Corridor:: @ 834F2A0 .4byte SSAnne_1F_Corridor_Layout @ 0x82FFB4C - .4byte gMapEvents_SSAnne_1F_Corridor @ 0x83AE974 - .4byte gMapScripts_SSAnne_1F_Corridor @ 0x81608CB + .4byte SSAnne_1F_Corridor_MapEvents @ 0x83AE974 + .4byte SSAnne_1F_Corridor_MapScripts @ 0x81608CB .4byte NULL .2byte BGM_FRLG_SS_ANNE .2byte 119 diff --git a/data/maps/SSAnne_1F_Room1/header.inc b/data/maps/SSAnne_1F_Room1/header.inc index 1da716524..dfe367802 100644 --- a/data/maps/SSAnne_1F_Room1/header.inc +++ b/data/maps/SSAnne_1F_Room1/header.inc @@ -1,7 +1,7 @@ SSAnne_1F_Room1:: @ 834F364 .4byte SSAnne_Room1_Layout @ 0x8319E74 - .4byte gMapEvents_SSAnne_1F_Room1 @ 0x83AECEC - .4byte gMapScripts_SSAnne_1F_Room1 @ 0x8160BDB + .4byte SSAnne_1F_Room1_MapEvents @ 0x83AECEC + .4byte SSAnne_1F_Room1_MapScripts @ 0x8160BDB .4byte NULL .2byte BGM_FRLG_SS_ANNE .2byte 177 diff --git a/data/maps/SSAnne_1F_Room11/header.inc b/data/maps/SSAnne_1F_Room11/header.inc index 86a4b43e3..b7daaaf24 100644 --- a/data/maps/SSAnne_1F_Room11/header.inc +++ b/data/maps/SSAnne_1F_Room11/header.inc @@ -1,7 +1,7 @@ SSAnne_1F_Room11:: @ 834FF50 .4byte SSAnne_1F_Room11_Layout @ 0x8345030 - .4byte gMapEvents_SSAnne_1F_Room11 @ 0x83B3B34 - .4byte gMapScripts_SSAnne_1F_Room11 @ 0x8164559 + .4byte SSAnne_1F_Room11_MapEvents @ 0x83B3B34 + .4byte SSAnne_1F_Room11_MapScripts @ 0x8164559 .4byte NULL .2byte BGM_FRLG_VIRIDIAN_FOREST .2byte 317 diff --git a/data/maps/SSAnne_1F_Room12/header.inc b/data/maps/SSAnne_1F_Room12/header.inc index 0c1206221..067d21360 100644 --- a/data/maps/SSAnne_1F_Room12/header.inc +++ b/data/maps/SSAnne_1F_Room12/header.inc @@ -1,7 +1,7 @@ SSAnne_1F_Room12:: @ 834FF6C .4byte SSAnne_1F_Room12_Layout @ 0x8347A50 - .4byte gMapEvents_SSAnne_1F_Room12 @ 0x83B3B50 - .4byte gMapScripts_SSAnne_1F_Room12 @ 0x81646A4 + .4byte SSAnne_1F_Room12_MapEvents @ 0x83B3B50 + .4byte SSAnne_1F_Room12_MapScripts @ 0x81646A4 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 340 diff --git a/data/maps/SSAnne_1F_Room2/header.inc b/data/maps/SSAnne_1F_Room2/header.inc index ff27c0fc5..051f27424 100644 --- a/data/maps/SSAnne_1F_Room2/header.inc +++ b/data/maps/SSAnne_1F_Room2/header.inc @@ -1,7 +1,7 @@ SSAnne_1F_Room2:: @ 834F380 .4byte SSAnne_Room1_Layout @ 0x8319E74 - .4byte gMapEvents_SSAnne_1F_Room2 @ 0x83AED68 - .4byte gMapScripts_SSAnne_1F_Room2 @ 0x8160BE5 + .4byte SSAnne_1F_Room2_MapEvents @ 0x83AED68 + .4byte SSAnne_1F_Room2_MapScripts @ 0x8160BE5 .4byte NULL .2byte BGM_FRLG_SS_ANNE .2byte 177 diff --git a/data/maps/SSAnne_1F_Room3/header.inc b/data/maps/SSAnne_1F_Room3/header.inc index 87fa83e15..0240062db 100644 --- a/data/maps/SSAnne_1F_Room3/header.inc +++ b/data/maps/SSAnne_1F_Room3/header.inc @@ -1,7 +1,7 @@ SSAnne_1F_Room3:: @ 834F39C .4byte SSAnne_Room1_Layout @ 0x8319E74 - .4byte gMapEvents_SSAnne_1F_Room3 @ 0x83AEDCC - .4byte gMapScripts_SSAnne_1F_Room3 @ 0x8160C1D + .4byte SSAnne_1F_Room3_MapEvents @ 0x83AEDCC + .4byte SSAnne_1F_Room3_MapScripts @ 0x8160C1D .4byte NULL .2byte BGM_FRLG_SS_ANNE .2byte 177 diff --git a/data/maps/SSAnne_1F_Room4/header.inc b/data/maps/SSAnne_1F_Room4/header.inc index 20e7592c8..18b679d2c 100644 --- a/data/maps/SSAnne_1F_Room4/header.inc +++ b/data/maps/SSAnne_1F_Room4/header.inc @@ -1,7 +1,7 @@ SSAnne_1F_Room4:: @ 834F3B8 .4byte SSAnne_Room1_Layout @ 0x8319E74 - .4byte gMapEvents_SSAnne_1F_Room4 @ 0x83AEE00 - .4byte gMapScripts_SSAnne_1F_Room4 @ 0x8160C43 + .4byte SSAnne_1F_Room4_MapEvents @ 0x83AEE00 + .4byte SSAnne_1F_Room4_MapScripts @ 0x8160C43 .4byte NULL .2byte BGM_FRLG_SS_ANNE .2byte 177 diff --git a/data/maps/SSAnne_1F_Room5/header.inc b/data/maps/SSAnne_1F_Room5/header.inc index 17e6e6177..c9e14fcab 100644 --- a/data/maps/SSAnne_1F_Room5/header.inc +++ b/data/maps/SSAnne_1F_Room5/header.inc @@ -1,7 +1,7 @@ SSAnne_1F_Room5:: @ 834F3D4 .4byte SSAnne_Room1_Layout @ 0x8319E74 - .4byte gMapEvents_SSAnne_1F_Room5 @ 0x83AEE34 - .4byte gMapScripts_SSAnne_1F_Room5 @ 0x8160C66 + .4byte SSAnne_1F_Room5_MapEvents @ 0x83AEE34 + .4byte SSAnne_1F_Room5_MapScripts @ 0x8160C66 .4byte NULL .2byte BGM_FRLG_SS_ANNE .2byte 177 diff --git a/data/maps/SSAnne_1F_Room6/header.inc b/data/maps/SSAnne_1F_Room6/header.inc index 21e7d4adf..689a053ef 100644 --- a/data/maps/SSAnne_1F_Room6/header.inc +++ b/data/maps/SSAnne_1F_Room6/header.inc @@ -1,7 +1,7 @@ SSAnne_1F_Room6:: @ 834F540 .4byte SSAnne_Room1_Layout @ 0x8319E74 - .4byte gMapEvents_SSAnne_1F_Room6 @ 0x83AF210 - .4byte gMapScripts_SSAnne_1F_Room6 @ 0x8160DF2 + .4byte SSAnne_1F_Room6_MapEvents @ 0x83AF210 + .4byte SSAnne_1F_Room6_MapScripts @ 0x8160DF2 .4byte NULL .2byte BGM_FRLG_SS_ANNE .2byte 177 diff --git a/data/maps/SSAnne_1F_Room7/header.inc b/data/maps/SSAnne_1F_Room7/header.inc index 04752a2a5..218ed0557 100644 --- a/data/maps/SSAnne_1F_Room7/header.inc +++ b/data/maps/SSAnne_1F_Room7/header.inc @@ -1,7 +1,7 @@ SSAnne_1F_Room7:: @ 834F3F0 .4byte SSAnne_Room1_Layout @ 0x8319E74 - .4byte gMapEvents_SSAnne_1F_Room7 @ 0x83AEE68 - .4byte gMapScripts_SSAnne_1F_Room7 @ 0x8160C7E + .4byte SSAnne_1F_Room7_MapEvents @ 0x83AEE68 + .4byte SSAnne_1F_Room7_MapScripts @ 0x8160C7E .4byte NULL .2byte BGM_FRLG_SS_ANNE .2byte 177 diff --git a/data/maps/SSAnne_2F_Corridor/header.inc b/data/maps/SSAnne_2F_Corridor/header.inc index 6269a69a2..6321b0246 100644 --- a/data/maps/SSAnne_2F_Corridor/header.inc +++ b/data/maps/SSAnne_2F_Corridor/header.inc @@ -1,7 +1,7 @@ SSAnne_2F_Corridor:: @ 834F2BC .4byte SSAnne_2F_Corridor_Layout @ 0x82FFFB0 - .4byte gMapEvents_SSAnne_2F_Corridor @ 0x83AEA30 - .4byte gMapScripts_SSAnne_2F_Corridor @ 0x81608DE + .4byte SSAnne_2F_Corridor_MapEvents @ 0x83AEA30 + .4byte SSAnne_2F_Corridor_MapScripts @ 0x81608DE .4byte NULL .2byte BGM_FRLG_SS_ANNE .2byte 120 diff --git a/data/maps/SSAnne_2F_Room1/header.inc b/data/maps/SSAnne_2F_Room1/header.inc index 0c430c47e..4960880c9 100644 --- a/data/maps/SSAnne_2F_Room1/header.inc +++ b/data/maps/SSAnne_2F_Room1/header.inc @@ -1,7 +1,7 @@ SSAnne_2F_Room1:: @ 834F40C .4byte SSAnne_Room2_Layout @ 0x8319F04 - .4byte gMapEvents_SSAnne_2F_Room1 @ 0x83AEE9C - .4byte gMapScripts_SSAnne_2F_Room1 @ 0x8160C96 + .4byte SSAnne_2F_Room1_MapEvents @ 0x83AEE9C + .4byte SSAnne_2F_Room1_MapScripts @ 0x8160C96 .4byte NULL .2byte BGM_FRLG_SS_ANNE .2byte 178 diff --git a/data/maps/SSAnne_2F_Room2/header.inc b/data/maps/SSAnne_2F_Room2/header.inc index 9a9e944e1..df8bd334f 100644 --- a/data/maps/SSAnne_2F_Room2/header.inc +++ b/data/maps/SSAnne_2F_Room2/header.inc @@ -1,7 +1,7 @@ SSAnne_2F_Room2:: @ 834F428 .4byte SSAnne_Room2_Layout @ 0x8319F04 - .4byte gMapEvents_SSAnne_2F_Room2 @ 0x83AEF00 - .4byte gMapScripts_SSAnne_2F_Room2 @ 0x8160CB0 + .4byte SSAnne_2F_Room2_MapEvents @ 0x83AEF00 + .4byte SSAnne_2F_Room2_MapScripts @ 0x8160CB0 .4byte NULL .2byte BGM_FRLG_SS_ANNE .2byte 178 diff --git a/data/maps/SSAnne_2F_Room3/header.inc b/data/maps/SSAnne_2F_Room3/header.inc index 6d749d6e0..9d3cb6e63 100644 --- a/data/maps/SSAnne_2F_Room3/header.inc +++ b/data/maps/SSAnne_2F_Room3/header.inc @@ -1,7 +1,7 @@ SSAnne_2F_Room3:: @ 834F444 .4byte SSAnne_Room2_Layout @ 0x8319F04 - .4byte gMapEvents_SSAnne_2F_Room3 @ 0x83AEF4C - .4byte gMapScripts_SSAnne_2F_Room3 @ 0x8160CDF + .4byte SSAnne_2F_Room3_MapEvents @ 0x83AEF4C + .4byte SSAnne_2F_Room3_MapScripts @ 0x8160CDF .4byte NULL .2byte BGM_FRLG_SS_ANNE .2byte 178 diff --git a/data/maps/SSAnne_2F_Room4/header.inc b/data/maps/SSAnne_2F_Room4/header.inc index 20b40d53a..d71a41336 100644 --- a/data/maps/SSAnne_2F_Room4/header.inc +++ b/data/maps/SSAnne_2F_Room4/header.inc @@ -1,7 +1,7 @@ SSAnne_2F_Room4:: @ 834F460 .4byte SSAnne_Room2_Layout @ 0x8319F04 - .4byte gMapEvents_SSAnne_2F_Room4 @ 0x83AEFB0 - .4byte gMapScripts_SSAnne_2F_Room4 @ 0x8160CF2 + .4byte SSAnne_2F_Room4_MapEvents @ 0x83AEFB0 + .4byte SSAnne_2F_Room4_MapScripts @ 0x8160CF2 .4byte NULL .2byte BGM_FRLG_SS_ANNE .2byte 178 diff --git a/data/maps/SSAnne_2F_Room5/header.inc b/data/maps/SSAnne_2F_Room5/header.inc index f85f59058..76b09d983 100644 --- a/data/maps/SSAnne_2F_Room5/header.inc +++ b/data/maps/SSAnne_2F_Room5/header.inc @@ -1,7 +1,7 @@ SSAnne_2F_Room5:: @ 834F47C .4byte SSAnne_Room2_Layout @ 0x8319F04 - .4byte gMapEvents_SSAnne_2F_Room5 @ 0x83AEFFC - .4byte gMapScripts_SSAnne_2F_Room5 @ 0x8160D21 + .4byte SSAnne_2F_Room5_MapEvents @ 0x83AEFFC + .4byte SSAnne_2F_Room5_MapScripts @ 0x8160D21 .4byte NULL .2byte BGM_FRLG_SS_ANNE .2byte 178 diff --git a/data/maps/SSAnne_2F_Room6/header.inc b/data/maps/SSAnne_2F_Room6/header.inc index b469ade44..29cb434c7 100644 --- a/data/maps/SSAnne_2F_Room6/header.inc +++ b/data/maps/SSAnne_2F_Room6/header.inc @@ -1,7 +1,7 @@ SSAnne_2F_Room6:: @ 834F498 .4byte SSAnne_Room2_Layout @ 0x8319F04 - .4byte gMapEvents_SSAnne_2F_Room6 @ 0x83AF048 - .4byte gMapScripts_SSAnne_2F_Room6 @ 0x8160D34 + .4byte SSAnne_2F_Room6_MapEvents @ 0x83AF048 + .4byte SSAnne_2F_Room6_MapScripts @ 0x8160D34 .4byte NULL .2byte BGM_FRLG_SS_ANNE .2byte 178 diff --git a/data/maps/SSAnne_3F_Corridor/header.inc b/data/maps/SSAnne_3F_Corridor/header.inc index 542dd9301..e5285ffe9 100644 --- a/data/maps/SSAnne_3F_Corridor/header.inc +++ b/data/maps/SSAnne_3F_Corridor/header.inc @@ -1,7 +1,7 @@ SSAnne_3F_Corridor:: @ 834F2D8 .4byte SSAnne_3F_Corridor_Layout @ 0x8300108 - .4byte gMapEvents_SSAnne_3F_Corridor @ 0x83AEA74 - .4byte gMapScripts_SSAnne_3F_Corridor @ 0x8160A5D + .4byte SSAnne_3F_Corridor_MapEvents @ 0x83AEA74 + .4byte SSAnne_3F_Corridor_MapScripts @ 0x8160A5D .4byte NULL .2byte BGM_FRLG_SS_ANNE .2byte 121 diff --git a/data/maps/SSAnne_B1F_Corridor/header.inc b/data/maps/SSAnne_B1F_Corridor/header.inc index af25e7b96..020aa1ad4 100644 --- a/data/maps/SSAnne_B1F_Corridor/header.inc +++ b/data/maps/SSAnne_B1F_Corridor/header.inc @@ -1,7 +1,7 @@ SSAnne_B1F_Corridor:: @ 834F2F4 .4byte SSAnne_B1F_Corridor_Layout @ 0x8300270 - .4byte gMapEvents_SSAnne_B1F_Corridor @ 0x83AEAC4 - .4byte gMapScripts_SSAnne_B1F_Corridor @ 0x8160A67 + .4byte SSAnne_B1F_Corridor_MapEvents @ 0x83AEAC4 + .4byte SSAnne_B1F_Corridor_MapScripts @ 0x8160A67 .4byte NULL .2byte BGM_FRLG_SS_ANNE .2byte 122 diff --git a/data/maps/SSAnne_B1F_Room1/header.inc b/data/maps/SSAnne_B1F_Room1/header.inc index 33e35bdf8..609acf59e 100644 --- a/data/maps/SSAnne_B1F_Room1/header.inc +++ b/data/maps/SSAnne_B1F_Room1/header.inc @@ -1,7 +1,7 @@ SSAnne_B1F_Room1:: @ 834F4B4 .4byte SSAnne_Room2_Layout @ 0x8319F04 - .4byte gMapEvents_SSAnne_B1F_Room1 @ 0x83AF094 - .4byte gMapScripts_SSAnne_B1F_Room1 @ 0x8160D47 + .4byte SSAnne_B1F_Room1_MapEvents @ 0x83AF094 + .4byte SSAnne_B1F_Room1_MapScripts @ 0x8160D47 .4byte NULL .2byte BGM_FRLG_SS_ANNE .2byte 178 diff --git a/data/maps/SSAnne_B1F_Room2/header.inc b/data/maps/SSAnne_B1F_Room2/header.inc index 86a3cac32..d7a4a9e7f 100644 --- a/data/maps/SSAnne_B1F_Room2/header.inc +++ b/data/maps/SSAnne_B1F_Room2/header.inc @@ -1,7 +1,7 @@ SSAnne_B1F_Room2:: @ 834F4D0 .4byte SSAnne_Room2_Layout @ 0x8319F04 - .4byte gMapEvents_SSAnne_B1F_Room2 @ 0x83AF0E0 - .4byte gMapScripts_SSAnne_B1F_Room2 @ 0x8160D76 + .4byte SSAnne_B1F_Room2_MapEvents @ 0x83AF0E0 + .4byte SSAnne_B1F_Room2_MapScripts @ 0x8160D76 .4byte NULL .2byte BGM_FRLG_SS_ANNE .2byte 178 diff --git a/data/maps/SSAnne_B1F_Room3/header.inc b/data/maps/SSAnne_B1F_Room3/header.inc index f5ab0a506..67e43de94 100644 --- a/data/maps/SSAnne_B1F_Room3/header.inc +++ b/data/maps/SSAnne_B1F_Room3/header.inc @@ -1,7 +1,7 @@ SSAnne_B1F_Room3:: @ 834F4EC .4byte SSAnne_Room2_Layout @ 0x8319F04 - .4byte gMapEvents_SSAnne_B1F_Room3 @ 0x83AF12C - .4byte gMapScripts_SSAnne_B1F_Room3 @ 0x8160D8E + .4byte SSAnne_B1F_Room3_MapEvents @ 0x83AF12C + .4byte SSAnne_B1F_Room3_MapScripts @ 0x8160D8E .4byte NULL .2byte BGM_FRLG_SS_ANNE .2byte 178 diff --git a/data/maps/SSAnne_B1F_Room4/header.inc b/data/maps/SSAnne_B1F_Room4/header.inc index 9b8dc59c7..8a23b71f2 100644 --- a/data/maps/SSAnne_B1F_Room4/header.inc +++ b/data/maps/SSAnne_B1F_Room4/header.inc @@ -1,7 +1,7 @@ SSAnne_B1F_Room4:: @ 834F508 .4byte SSAnne_Room2_Layout @ 0x8319F04 - .4byte gMapEvents_SSAnne_B1F_Room4 @ 0x83AF178 - .4byte gMapScripts_SSAnne_B1F_Room4 @ 0x8160DA6 + .4byte SSAnne_B1F_Room4_MapEvents @ 0x83AF178 + .4byte SSAnne_B1F_Room4_MapScripts @ 0x8160DA6 .4byte NULL .2byte BGM_FRLG_SS_ANNE .2byte 178 diff --git a/data/maps/SSAnne_B1F_Room5/header.inc b/data/maps/SSAnne_B1F_Room5/header.inc index 82dd62873..86c82dabe 100644 --- a/data/maps/SSAnne_B1F_Room5/header.inc +++ b/data/maps/SSAnne_B1F_Room5/header.inc @@ -1,7 +1,7 @@ SSAnne_B1F_Room5:: @ 834F524 .4byte SSAnne_Room2_Layout @ 0x8319F04 - .4byte gMapEvents_SSAnne_B1F_Room5 @ 0x83AF1DC - .4byte gMapScripts_SSAnne_B1F_Room5 @ 0x8160DD5 + .4byte SSAnne_B1F_Room5_MapEvents @ 0x83AF1DC + .4byte SSAnne_B1F_Room5_MapScripts @ 0x8160DD5 .4byte NULL .2byte BGM_FRLG_SS_ANNE .2byte 178 diff --git a/data/maps/SSAnne_CaptainsOffice/header.inc b/data/maps/SSAnne_CaptainsOffice/header.inc index 34c346691..b9f3fba89 100644 --- a/data/maps/SSAnne_CaptainsOffice/header.inc +++ b/data/maps/SSAnne_CaptainsOffice/header.inc @@ -1,7 +1,7 @@ SSAnne_CaptainsOffice:: @ 834F348 .4byte SSAnne_CaptainsOffice_Layout @ 0x83192EC - .4byte gMapEvents_SSAnne_CaptainsOffice @ 0x83AECB8 - .4byte gMapScripts_SSAnne_CaptainsOffice @ 0x8160B39 + .4byte SSAnne_CaptainsOffice_MapEvents @ 0x83AECB8 + .4byte SSAnne_CaptainsOffice_MapScripts @ 0x8160B39 .4byte NULL .2byte BGM_FRLG_SS_ANNE .2byte 171 diff --git a/data/maps/SSAnne_CaptainsOffice2/header.inc b/data/maps/SSAnne_CaptainsOffice2/header.inc index de121229e..9d29a439b 100644 --- a/data/maps/SSAnne_CaptainsOffice2/header.inc +++ b/data/maps/SSAnne_CaptainsOffice2/header.inc @@ -1,7 +1,7 @@ SSAnne_CaptainsOffice2:: @ 834FE54 .4byte SSAnne_CaptainsOffice2_Layout @ 0x8341560 - .4byte gMapEvents_SSAnne_CaptainsOffice2 @ 0x83B3508 - .4byte gMapScripts_SSAnne_CaptainsOffice2 @ 0x8163D81 + .4byte SSAnne_CaptainsOffice2_MapEvents @ 0x83B3508 + .4byte SSAnne_CaptainsOffice2_MapScripts @ 0x8163D81 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 295 diff --git a/data/maps/SSAnne_CaptainsOffice3/header.inc b/data/maps/SSAnne_CaptainsOffice3/header.inc index 393ee9983..47d48f1ec 100644 --- a/data/maps/SSAnne_CaptainsOffice3/header.inc +++ b/data/maps/SSAnne_CaptainsOffice3/header.inc @@ -1,7 +1,7 @@ SSAnne_CaptainsOffice3:: @ 834FE70 .4byte SSAnne_CaptainsOffice3_Layout @ 0x8341A98 - .4byte gMapEvents_SSAnne_CaptainsOffice3 @ 0x83B35B4 - .4byte gMapScripts_SSAnne_CaptainsOffice3 @ 0x8163D82 + .4byte SSAnne_CaptainsOffice3_MapEvents @ 0x83B35B4 + .4byte SSAnne_CaptainsOffice3_MapScripts @ 0x8163D82 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 296 diff --git a/data/maps/SSAnne_CaptainsOffice4/header.inc b/data/maps/SSAnne_CaptainsOffice4/header.inc index 2f10ad142..933c78555 100644 --- a/data/maps/SSAnne_CaptainsOffice4/header.inc +++ b/data/maps/SSAnne_CaptainsOffice4/header.inc @@ -1,7 +1,7 @@ SSAnne_CaptainsOffice4:: @ 834FE8C .4byte SSAnne_CaptainsOffice4_Layout @ 0x83405A4 - .4byte gMapEvents_SSAnne_CaptainsOffice4 @ 0x83B381C - .4byte gMapScripts_SSAnne_CaptainsOffice4 @ 0x8163F2E + .4byte SSAnne_CaptainsOffice4_MapEvents @ 0x83B381C + .4byte SSAnne_CaptainsOffice4_MapScripts @ 0x8163F2E .4byte NULL .2byte BGM_FRLG_ROCKET_HIDEOUT .2byte 292 diff --git a/data/maps/SSAnne_CaptainsOffice5/header.inc b/data/maps/SSAnne_CaptainsOffice5/header.inc index c603c103d..c735393a0 100644 --- a/data/maps/SSAnne_CaptainsOffice5/header.inc +++ b/data/maps/SSAnne_CaptainsOffice5/header.inc @@ -1,7 +1,7 @@ SSAnne_CaptainsOffice5:: @ 834FEA8 .4byte SSAnne_CaptainsOffice5_Layout @ 0x83436C4 - .4byte gMapEvents_SSAnne_CaptainsOffice5 @ 0x83B3850 - .4byte gMapScripts_SSAnne_CaptainsOffice5 @ 0x8164182 + .4byte SSAnne_CaptainsOffice5_MapEvents @ 0x83B3850 + .4byte SSAnne_CaptainsOffice5_MapScripts @ 0x8164182 .4byte NULL .2byte BGM_FRLG_TANOBY_RUINS .2byte 309 diff --git a/data/maps/SSAnne_CaptainsOffice9/header.inc b/data/maps/SSAnne_CaptainsOffice9/header.inc index 3354834a2..5d4aad26b 100644 --- a/data/maps/SSAnne_CaptainsOffice9/header.inc +++ b/data/maps/SSAnne_CaptainsOffice9/header.inc @@ -1,7 +1,7 @@ SSAnne_CaptainsOffice9:: @ 834FF18 .4byte SSAnne_CaptainsOffice9_Layout @ 0x8343BD4 - .4byte gMapEvents_SSAnne_CaptainsOffice9 @ 0x83B3970 - .4byte gMapScripts_SSAnne_CaptainsOffice9 @ 0x81641B3 + .4byte SSAnne_CaptainsOffice9_MapEvents @ 0x83B3970 + .4byte SSAnne_CaptainsOffice9_MapScripts @ 0x81641B3 .4byte NULL .2byte BGM_FRLG_TANOBY_RUINS .2byte 313 diff --git a/data/maps/SSAnne_Deck/header.inc b/data/maps/SSAnne_Deck/header.inc index 5c38770bd..ae12f7727 100644 --- a/data/maps/SSAnne_Deck/header.inc +++ b/data/maps/SSAnne_Deck/header.inc @@ -1,7 +1,7 @@ SSAnne_Deck:: @ 834F310 .4byte SSAnne_Deck_Layout @ 0x8300624 - .4byte gMapEvents_SSAnne_Deck @ 0x83AEB60 - .4byte gMapScripts_SSAnne_Deck @ 0x8160A68 + .4byte SSAnne_Deck_MapEvents @ 0x83AEB60 + .4byte SSAnne_Deck_MapScripts @ 0x8160A68 .4byte NULL .2byte BGM_FRLG_SS_ANNE .2byte 123 diff --git a/data/maps/SSAnne_Exterior/header.inc b/data/maps/SSAnne_Exterior/header.inc index 9ad5649b9..a16473ca7 100644 --- a/data/maps/SSAnne_Exterior/header.inc +++ b/data/maps/SSAnne_Exterior/header.inc @@ -1,7 +1,7 @@ SSAnne_Exterior:: @ 834F284 .4byte SSAnne_Exterior_Layout @ 0x82FF610 - .4byte gMapEvents_SSAnne_Exterior @ 0x83AE8C8 - .4byte gMapScripts_SSAnne_Exterior @ 0x8160840 + .4byte SSAnne_Exterior_MapEvents @ 0x83AE8C8 + .4byte SSAnne_Exterior_MapScripts @ 0x8160840 .4byte NULL .2byte BGM_FRLG_SS_ANNE .2byte 118 diff --git a/data/maps/SSAnne_Kitchen/header.inc b/data/maps/SSAnne_Kitchen/header.inc index ca1ae5f2f..a2128fe93 100644 --- a/data/maps/SSAnne_Kitchen/header.inc +++ b/data/maps/SSAnne_Kitchen/header.inc @@ -1,7 +1,7 @@ SSAnne_Kitchen:: @ 834F32C .4byte SSAnne_Kitchen_Layout @ 0x8319214 - .4byte gMapEvents_SSAnne_Kitchen @ 0x83AEC60 - .4byte gMapScripts_SSAnne_Kitchen @ 0x8160AB2 + .4byte SSAnne_Kitchen_MapEvents @ 0x83AEC60 + .4byte SSAnne_Kitchen_MapScripts @ 0x8160AB2 .4byte NULL .2byte BGM_FRLG_SS_ANNE .2byte 170 diff --git a/data/maps/SSAnne_Kitchen3/header.inc b/data/maps/SSAnne_Kitchen3/header.inc index c017888c2..de8d49593 100644 --- a/data/maps/SSAnne_Kitchen3/header.inc +++ b/data/maps/SSAnne_Kitchen3/header.inc @@ -1,7 +1,7 @@ SSAnne_Kitchen3:: @ 834FD58 .4byte SSAnne_Kitchen3_Layout @ 0x833F304 - .4byte gMapEvents_SSAnne_Kitchen3 @ 0x83B2EE0 - .4byte gMapScripts_SSAnne_Kitchen3 @ 0x8163C45 + .4byte SSAnne_Kitchen3_MapEvents @ 0x83B2EE0 + .4byte SSAnne_Kitchen3_MapScripts @ 0x8163C45 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 285 diff --git a/data/maps/SafariZone_Building1/header.inc b/data/maps/SafariZone_Building1/header.inc index 039fab75c..e65a0ceb1 100644 --- a/data/maps/SafariZone_Building1/header.inc +++ b/data/maps/SafariZone_Building1/header.inc @@ -1,7 +1,7 @@ SafariZone_Building1:: @ 834F968 .4byte SafariZone_Building_Layout @ 0x831C028 - .4byte gMapEvents_SafariZone_Building1 @ 0x83B12CC - .4byte gMapScripts_SafariZone_Building1 @ 0x81623EB + .4byte SafariZone_Building1_MapEvents @ 0x83B12CC + .4byte SafariZone_Building1_MapScripts @ 0x81623EB .4byte NULL .2byte BGM_FRLG_SAFARI_ZONE .2byte 198 diff --git a/data/maps/SafariZone_Building2/header.inc b/data/maps/SafariZone_Building2/header.inc index c9d80e2c9..706671bbb 100644 --- a/data/maps/SafariZone_Building2/header.inc +++ b/data/maps/SafariZone_Building2/header.inc @@ -1,7 +1,7 @@ SafariZone_Building2:: @ 834F984 .4byte SafariZone_Building_Layout @ 0x831C028 - .4byte gMapEvents_SafariZone_Building2 @ 0x83B1340 - .4byte gMapScripts_SafariZone_Building2 @ 0x81623FE + .4byte SafariZone_Building2_MapEvents @ 0x83B1340 + .4byte SafariZone_Building2_MapScripts @ 0x81623FE .4byte NULL .2byte BGM_FRLG_SAFARI_ZONE .2byte 198 diff --git a/data/maps/SafariZone_Building3/header.inc b/data/maps/SafariZone_Building3/header.inc index 3439dc9a8..219c3a1a4 100644 --- a/data/maps/SafariZone_Building3/header.inc +++ b/data/maps/SafariZone_Building3/header.inc @@ -1,7 +1,7 @@ SafariZone_Building3:: @ 834F9A0 .4byte SafariZone_Building_Layout @ 0x831C028 - .4byte gMapEvents_SafariZone_Building3 @ 0x83B13CC - .4byte gMapScripts_SafariZone_Building3 @ 0x816241A + .4byte SafariZone_Building3_MapEvents @ 0x83B13CC + .4byte SafariZone_Building3_MapScripts @ 0x816241A .4byte NULL .2byte BGM_FRLG_SAFARI_ZONE .2byte 198 diff --git a/data/maps/SafariZone_Building4/header.inc b/data/maps/SafariZone_Building4/header.inc index 5f783687e..60fa37573 100644 --- a/data/maps/SafariZone_Building4/header.inc +++ b/data/maps/SafariZone_Building4/header.inc @@ -1,7 +1,7 @@ SafariZone_Building4:: @ 834F9BC .4byte SafariZone_Building_Layout @ 0x831C028 - .4byte gMapEvents_SafariZone_Building4 @ 0x83B1440 - .4byte gMapScripts_SafariZone_Building4 @ 0x8162436 + .4byte SafariZone_Building4_MapEvents @ 0x83B1440 + .4byte SafariZone_Building4_MapScripts @ 0x8162436 .4byte NULL .2byte BGM_FRLG_SAFARI_ZONE .2byte 198 diff --git a/data/maps/SafariZone_Center/header.inc b/data/maps/SafariZone_Center/header.inc index 357564a36..9a2b3f5cc 100644 --- a/data/maps/SafariZone_Center/header.inc +++ b/data/maps/SafariZone_Center/header.inc @@ -1,7 +1,7 @@ SafariZone_Center:: @ 834F8F8 .4byte SafariZone_Center_Layout @ 0x830DD38 - .4byte gMapEvents_SafariZone_Center @ 0x83B0F98 - .4byte gMapScripts_SafariZone_Center @ 0x8162357 + .4byte SafariZone_Center_MapEvents @ 0x83B0F98 + .4byte SafariZone_Center_MapScripts @ 0x8162357 .4byte NULL .2byte BGM_FRLG_SAFARI_ZONE .2byte 147 diff --git a/data/maps/SafariZone_East/header.inc b/data/maps/SafariZone_East/header.inc index 4a1093a74..63835d624 100644 --- a/data/maps/SafariZone_East/header.inc +++ b/data/maps/SafariZone_East/header.inc @@ -1,7 +1,7 @@ SafariZone_East:: @ 834F914 .4byte SafariZone_East_Layout @ 0x830EC24 - .4byte gMapEvents_SafariZone_East @ 0x83B1068 - .4byte gMapScripts_SafariZone_East @ 0x816237C + .4byte SafariZone_East_MapEvents @ 0x83B1068 + .4byte SafariZone_East_MapScripts @ 0x816237C .4byte NULL .2byte BGM_FRLG_SAFARI_ZONE .2byte 148 diff --git a/data/maps/SafariZone_North/header.inc b/data/maps/SafariZone_North/header.inc index 76f71d005..35ceb0989 100644 --- a/data/maps/SafariZone_North/header.inc +++ b/data/maps/SafariZone_North/header.inc @@ -1,7 +1,7 @@ SafariZone_North:: @ 834F930 .4byte SafariZone_North_Layout @ 0x830FE1C - .4byte gMapEvents_SafariZone_North @ 0x83B1168 - .4byte gMapScripts_SafariZone_North @ 0x8162398 + .4byte SafariZone_North_MapEvents @ 0x83B1168 + .4byte SafariZone_North_MapScripts @ 0x8162398 .4byte NULL .2byte BGM_FRLG_SAFARI_ZONE .2byte 149 diff --git a/data/maps/SafariZone_SecretHouse/header.inc b/data/maps/SafariZone_SecretHouse/header.inc index 61593dc82..f91bc7a7b 100644 --- a/data/maps/SafariZone_SecretHouse/header.inc +++ b/data/maps/SafariZone_SecretHouse/header.inc @@ -1,7 +1,7 @@ SafariZone_SecretHouse:: @ 834F9D8 .4byte SafariZone_SecretHouse_Layout @ 0x831C16C - .4byte gMapEvents_SafariZone_SecretHouse @ 0x83B1484 - .4byte gMapScripts_SafariZone_SecretHouse @ 0x8162452 + .4byte SafariZone_SecretHouse_MapEvents @ 0x83B1484 + .4byte SafariZone_SecretHouse_MapScripts @ 0x8162452 .4byte NULL .2byte BGM_FRLG_SAFARI_ZONE .2byte 199 diff --git a/data/maps/SafariZone_West/header.inc b/data/maps/SafariZone_West/header.inc index 2b2fd6450..69547c067 100644 --- a/data/maps/SafariZone_West/header.inc +++ b/data/maps/SafariZone_West/header.inc @@ -1,7 +1,7 @@ SafariZone_West:: @ 834F94C .4byte SafariZone_West_Layout @ 0x8310BC4 - .4byte gMapEvents_SafariZone_West @ 0x83B1270 - .4byte gMapScripts_SafariZone_West @ 0x81623C6 + .4byte SafariZone_West_MapEvents @ 0x83B1270 + .4byte SafariZone_West_MapScripts @ 0x81623C6 .4byte NULL .2byte BGM_FRLG_SAFARI_ZONE .2byte 150 diff --git a/data/maps/SaffronCity/header.inc b/data/maps/SaffronCity/header.inc index d2f20906d..79a6bb684 100644 --- a/data/maps/SaffronCity/header.inc +++ b/data/maps/SaffronCity/header.inc @@ -1,7 +1,7 @@ SaffronCity:: @ 835074C .4byte SaffronCity_Layout @ 0x82E4E28 - .4byte gMapEvents_SaffronCity @ 0x83B5EB0 - .4byte gMapScripts_SaffronCity @ 0x8167483 + .4byte SaffronCity_MapEvents @ 0x83B5EB0 + .4byte SaffronCity_MapScripts @ 0x8167483 .4byte SaffronCity_MapConnections @ 0x835292C .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 88 diff --git a/data/maps/SaffronCity_Dojo/header.inc b/data/maps/SaffronCity_Dojo/header.inc index 6710c616d..a56af7e4a 100644 --- a/data/maps/SaffronCity_Dojo/header.inc +++ b/data/maps/SaffronCity_Dojo/header.inc @@ -1,7 +1,7 @@ SaffronCity_Dojo:: @ 8351680 .4byte SaffronCity_Dojo_Layout @ 0x83212C4 - .4byte gMapEvents_SaffronCity_Dojo @ 0x83BCD60 - .4byte gMapScripts_SaffronCity_Dojo @ 0x816EBDB + .4byte SaffronCity_Dojo_MapEvents @ 0x83BCD60 + .4byte SaffronCity_Dojo_MapScripts @ 0x816EBDB .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 228 diff --git a/data/maps/SaffronCity_Duplicate/header.inc b/data/maps/SaffronCity_Duplicate/header.inc index 62cb00b04..071683449 100644 --- a/data/maps/SaffronCity_Duplicate/header.inc +++ b/data/maps/SaffronCity_Duplicate/header.inc @@ -1,7 +1,7 @@ SaffronCity_Duplicate:: @ 8350730 .4byte SaffronCity_Duplicate_Layout @ 0x831E8D4 - .4byte gMapEvents_SaffronCity_Duplicate @ 0x83B5E9C - .4byte gMapScripts_SaffronCity_Duplicate @ 0x816735F + .4byte SaffronCity_Duplicate_MapEvents @ 0x83B5E9C + .4byte SaffronCity_Duplicate_MapScripts @ 0x816735F .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 207 diff --git a/data/maps/SaffronCity_Gym/header.inc b/data/maps/SaffronCity_Gym/header.inc index 78f092724..98450bd26 100644 --- a/data/maps/SaffronCity_Gym/header.inc +++ b/data/maps/SaffronCity_Gym/header.inc @@ -1,7 +1,7 @@ SaffronCity_Gym:: @ 835169C .4byte SaffronCity_Gym_Layout @ 0x82D7C44 - .4byte gMapEvents_SaffronCity_Gym @ 0x83BCF6C - .4byte gMapScripts_SaffronCity_Gym @ 0x816EDD7 + .4byte SaffronCity_Gym_MapEvents @ 0x83BCF6C + .4byte SaffronCity_Gym_MapScripts @ 0x816EDD7 .4byte NULL .2byte BGM_FRLG_GYM .2byte 34 diff --git a/data/maps/SaffronCity_House1_1F/header.inc b/data/maps/SaffronCity_House1_1F/header.inc index 594ddd6c5..a2d14cf5d 100644 --- a/data/maps/SaffronCity_House1_1F/header.inc +++ b/data/maps/SaffronCity_House1_1F/header.inc @@ -1,7 +1,7 @@ SaffronCity_House1_1F:: @ 8351648 .4byte SaffronCity_House1_1F_Layout @ 0x8321004 - .4byte gMapEvents_SaffronCity_House1_1F @ 0x83BCB9C - .4byte gMapScripts_SaffronCity_House1_1F @ 0x816EB36 + .4byte SaffronCity_House1_1F_MapEvents @ 0x83BCB9C + .4byte SaffronCity_House1_1F_MapScripts @ 0x816EB36 .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 226 diff --git a/data/maps/SaffronCity_House1_2F/header.inc b/data/maps/SaffronCity_House1_2F/header.inc index 00dbee440..ceb4cf6c4 100644 --- a/data/maps/SaffronCity_House1_2F/header.inc +++ b/data/maps/SaffronCity_House1_2F/header.inc @@ -1,7 +1,7 @@ SaffronCity_House1_2F:: @ 8351664 .4byte SaffronCity_House1_2F_Layout @ 0x8321100 - .4byte gMapEvents_SaffronCity_House1_2F @ 0x83BCC3C - .4byte gMapScripts_SaffronCity_House1_2F @ 0x816EB5C + .4byte SaffronCity_House1_2F_MapEvents @ 0x83BCC3C + .4byte SaffronCity_House1_2F_MapScripts @ 0x816EB5C .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 227 diff --git a/data/maps/SaffronCity_House2/header.inc b/data/maps/SaffronCity_House2/header.inc index e41fc17e7..06c30be07 100644 --- a/data/maps/SaffronCity_House2/header.inc +++ b/data/maps/SaffronCity_House2/header.inc @@ -1,7 +1,7 @@ SaffronCity_House2:: @ 83516B8 .4byte House5_Layout @ 0x82D6AF0 - .4byte gMapEvents_SaffronCity_House2 @ 0x83BD004 - .4byte gMapScripts_SaffronCity_House2 @ 0x816EF73 + .4byte SaffronCity_House2_MapEvents @ 0x83BD004 + .4byte SaffronCity_House2_MapScripts @ 0x816EF73 .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 21 diff --git a/data/maps/SaffronCity_House3/header.inc b/data/maps/SaffronCity_House3/header.inc index 3662663c9..94193549c 100644 --- a/data/maps/SaffronCity_House3/header.inc +++ b/data/maps/SaffronCity_House3/header.inc @@ -1,7 +1,7 @@ SaffronCity_House3:: @ 8351728 .4byte House5_Layout @ 0x82D6AF0 - .4byte gMapEvents_SaffronCity_House3 @ 0x83BD20C - .4byte gMapScripts_SaffronCity_House3 @ 0x816F05E + .4byte SaffronCity_House3_MapEvents @ 0x83BD20C + .4byte SaffronCity_House3_MapScripts @ 0x816F05E .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 21 diff --git a/data/maps/SaffronCity_Mart/header.inc b/data/maps/SaffronCity_Mart/header.inc index 55164d967..77c8555ec 100644 --- a/data/maps/SaffronCity_Mart/header.inc +++ b/data/maps/SaffronCity_Mart/header.inc @@ -1,7 +1,7 @@ SaffronCity_Mart:: @ 83516D4 .4byte Mart_Layout @ 0x82D5BCC - .4byte gMapEvents_SaffronCity_Mart @ 0x83BD078 - .4byte gMapScripts_SaffronCity_Mart @ 0x816EFA2 + .4byte SaffronCity_Mart_MapEvents @ 0x83BD078 + .4byte SaffronCity_Mart_MapScripts @ 0x816EFA2 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 10 diff --git a/data/maps/SaffronCity_PokemonCenter_1F/header.inc b/data/maps/SaffronCity_PokemonCenter_1F/header.inc index 671ea67b2..1e2198879 100644 --- a/data/maps/SaffronCity_PokemonCenter_1F/header.inc +++ b/data/maps/SaffronCity_PokemonCenter_1F/header.inc @@ -1,7 +1,7 @@ SaffronCity_PokemonCenter_1F:: @ 83516F0 .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte gMapEvents_SaffronCity_PokemonCenter_1F @ 0x83BD13C - .4byte gMapScripts_SaffronCity_PokemonCenter_1F @ 0x816EFEC + .4byte SaffronCity_PokemonCenter_1F_MapEvents @ 0x83BD13C + .4byte SaffronCity_PokemonCenter_1F_MapScripts @ 0x816EFEC .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 8 diff --git a/data/maps/SaffronCity_PokemonCenter_2F/header.inc b/data/maps/SaffronCity_PokemonCenter_2F/header.inc index 7ed9818d9..8c649319e 100644 --- a/data/maps/SaffronCity_PokemonCenter_2F/header.inc +++ b/data/maps/SaffronCity_PokemonCenter_2F/header.inc @@ -1,7 +1,7 @@ SaffronCity_PokemonCenter_2F:: @ 835170C .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte gMapEvents_SaffronCity_PokemonCenter_2F @ 0x83BD1C8 - .4byte gMapScripts_SaffronCity_PokemonCenter_2F @ 0x816F037 + .4byte SaffronCity_PokemonCenter_2F_MapEvents @ 0x83BD1C8 + .4byte SaffronCity_PokemonCenter_2F_MapScripts @ 0x816F037 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 9 diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/header.inc b/data/maps/SaffronCity_PokemonTrainerFanClub/header.inc index dd5d8195f..9adb9fbb0 100644 --- a/data/maps/SaffronCity_PokemonTrainerFanClub/header.inc +++ b/data/maps/SaffronCity_PokemonTrainerFanClub/header.inc @@ -1,7 +1,7 @@ SaffronCity_PokemonTrainerFanClub:: @ 8351744 .4byte SaffronCity_PokemonTrainerFanClub_Layout @ 0x8338A60 - .4byte gMapEvents_SaffronCity_PokemonTrainerFanClub @ 0x83BD318 - .4byte gMapScripts_SaffronCity_PokemonTrainerFanClub @ 0x816F0BF + .4byte SaffronCity_PokemonTrainerFanClub_MapEvents @ 0x83BD318 + .4byte SaffronCity_PokemonTrainerFanClub_MapScripts @ 0x816F0BF .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 263 diff --git a/data/maps/SeafoamIslands_1F/header.inc b/data/maps/SeafoamIslands_1F/header.inc index d6ee69b5e..f95429a3f 100644 --- a/data/maps/SeafoamIslands_1F/header.inc +++ b/data/maps/SeafoamIslands_1F/header.inc @@ -1,7 +1,7 @@ SeafoamIslands_1F:: @ 834FB28 .4byte SeafoamIslands_1F_Layout @ 0x831474C - .4byte gMapEvents_SeafoamIslands_1F @ 0x83B1E64 - .4byte gMapScripts_SeafoamIslands_1F @ 0x8162F43 + .4byte SeafoamIslands_1F_MapEvents @ 0x83B1E64 + .4byte SeafoamIslands_1F_MapScripts @ 0x8162F43 .4byte NULL .2byte BGM_FRLG_VIRIDIAN_FOREST .2byte 156 diff --git a/data/maps/SeafoamIslands_B1F/header.inc b/data/maps/SeafoamIslands_B1F/header.inc index 975adc757..b81544b6f 100644 --- a/data/maps/SeafoamIslands_B1F/header.inc +++ b/data/maps/SeafoamIslands_B1F/header.inc @@ -1,7 +1,7 @@ SeafoamIslands_B1F:: @ 834FB44 .4byte SeafoamIslands_B1F_Layout @ 0x8314E44 - .4byte gMapEvents_SeafoamIslands_B1F @ 0x83B1F30 - .4byte gMapScripts_SeafoamIslands_B1F @ 0x8162F4D + .4byte SeafoamIslands_B1F_MapEvents @ 0x83B1F30 + .4byte SeafoamIslands_B1F_MapScripts @ 0x8162F4D .4byte NULL .2byte BGM_FRLG_VIRIDIAN_FOREST .2byte 157 diff --git a/data/maps/SeafoamIslands_B2F/header.inc b/data/maps/SeafoamIslands_B2F/header.inc index 7d7f353f4..320d37873 100644 --- a/data/maps/SeafoamIslands_B2F/header.inc +++ b/data/maps/SeafoamIslands_B2F/header.inc @@ -1,7 +1,7 @@ SeafoamIslands_B2F:: @ 834FB60 .4byte SeafoamIslands_B2F_Layout @ 0x8315588 - .4byte gMapEvents_SeafoamIslands_B2F @ 0x83B1FE4 - .4byte gMapScripts_SeafoamIslands_B2F @ 0x8162F4E + .4byte SeafoamIslands_B2F_MapEvents @ 0x83B1FE4 + .4byte SeafoamIslands_B2F_MapScripts @ 0x8162F4E .4byte NULL .2byte BGM_FRLG_VIRIDIAN_FOREST .2byte 158 diff --git a/data/maps/SeafoamIslands_B3F/header.inc b/data/maps/SeafoamIslands_B3F/header.inc index e19764b74..9b61d401a 100644 --- a/data/maps/SeafoamIslands_B3F/header.inc +++ b/data/maps/SeafoamIslands_B3F/header.inc @@ -1,7 +1,7 @@ SeafoamIslands_B3F:: @ 834FB7C .4byte SeafoamIslands_B3F_Layout @ 0x8315CCC - .4byte gMapEvents_SeafoamIslands_B3F @ 0x83B20DC - .4byte gMapScripts_SeafoamIslands_B3F @ 0x8162F4F + .4byte SeafoamIslands_B3F_MapEvents @ 0x83B20DC + .4byte SeafoamIslands_B3F_MapScripts @ 0x8162F4F .4byte NULL .2byte BGM_FRLG_VIRIDIAN_FOREST .2byte 159 diff --git a/data/maps/SeafoamIslands_B4F/header.inc b/data/maps/SeafoamIslands_B4F/header.inc index b847158b7..67c545838 100644 --- a/data/maps/SeafoamIslands_B4F/header.inc +++ b/data/maps/SeafoamIslands_B4F/header.inc @@ -1,7 +1,7 @@ SeafoamIslands_B4F:: @ 834FB98 .4byte SeafoamIslands_B4F_Layout @ 0x8316410 - .4byte gMapEvents_SeafoamIslands_B4F @ 0x83B21C4 - .4byte gMapScripts_SeafoamIslands_B4F @ 0x816302E + .4byte SeafoamIslands_B4F_MapEvents @ 0x83B21C4 + .4byte SeafoamIslands_B4F_MapScripts @ 0x816302E .4byte NULL .2byte BGM_FRLG_VIRIDIAN_FOREST .2byte 160 diff --git a/data/maps/SevenIsland/header.inc b/data/maps/SevenIsland/header.inc index 5838c3499..e9e478fd1 100644 --- a/data/maps/SevenIsland/header.inc +++ b/data/maps/SevenIsland/header.inc @@ -1,7 +1,7 @@ SevenIsland:: @ 83507F4 .4byte SevenIsland_Layout @ 0x8323D48 - .4byte gMapEvents_SevenIsland @ 0x83B657C - .4byte gMapScripts_SevenIsland @ 0x8167EB3 + .4byte SevenIsland_MapEvents @ 0x83B657C + .4byte SevenIsland_MapScripts @ 0x8167EB3 .4byte SevenIsland_MapConnections @ 0x83529C0 .2byte BGM_FRLG_ISLAND_SIX .2byte 235 diff --git a/data/maps/SevenIsland_Harbor/header.inc b/data/maps/SevenIsland_Harbor/header.inc index 569b25fad..fe1165d84 100644 --- a/data/maps/SevenIsland_Harbor/header.inc +++ b/data/maps/SevenIsland_Harbor/header.inc @@ -1,7 +1,7 @@ SevenIsland_Harbor:: @ 8351B50 .4byte Island_Harbor_Layout @ 0x8343FB8 - .4byte gMapEvents_SevenIsland_Harbor @ 0x83BE2A0 - .4byte gMapScripts_SevenIsland_Harbor @ 0x8170BE4 + .4byte SevenIsland_Harbor_MapEvents @ 0x83BE2A0 + .4byte SevenIsland_Harbor_MapScripts @ 0x8170BE4 .4byte NULL .2byte BGM_FRLG_ISLAND_SIX .2byte 315 diff --git a/data/maps/SevenIsland_House_Room1/header.inc b/data/maps/SevenIsland_House_Room1/header.inc index 5fd335a2d..0eeb9bc0f 100644 --- a/data/maps/SevenIsland_House_Room1/header.inc +++ b/data/maps/SevenIsland_House_Room1/header.inc @@ -1,7 +1,7 @@ SevenIsland_House_Room1:: @ 8351AA8 .4byte SevenIsland_House_Room1_Layout @ 0x834E310 - .4byte gMapEvents_SevenIsland_House_Room1 @ 0x83BE050 - .4byte gMapScripts_SevenIsland_House_Room1 @ 0x817088A + .4byte SevenIsland_House_Room1_MapEvents @ 0x83BE050 + .4byte SevenIsland_House_Room1_MapScripts @ 0x817088A .4byte NULL .2byte BGM_FRLG_ISLAND_SIX .2byte 382 diff --git a/data/maps/SevenIsland_House_Room2/header.inc b/data/maps/SevenIsland_House_Room2/header.inc index 961157d4a..90d980166 100644 --- a/data/maps/SevenIsland_House_Room2/header.inc +++ b/data/maps/SevenIsland_House_Room2/header.inc @@ -1,7 +1,7 @@ SevenIsland_House_Room2:: @ 8351AC4 .4byte SevenIsland_House_Room2_Layout @ 0x8338C48 - .4byte gMapEvents_SevenIsland_House_Room2 @ 0x83BE084 - .4byte gMapScripts_SevenIsland_House_Room2 @ 0x8170A7E + .4byte SevenIsland_House_Room2_MapEvents @ 0x83BE084 + .4byte SevenIsland_House_Room2_MapScripts @ 0x8170A7E .4byte NULL .2byte BGM_FRLG_ISLAND_SIX .2byte 265 diff --git a/data/maps/SevenIsland_Mart/header.inc b/data/maps/SevenIsland_Mart/header.inc index e9a0c01cd..9f2aa5ca1 100644 --- a/data/maps/SevenIsland_Mart/header.inc +++ b/data/maps/SevenIsland_Mart/header.inc @@ -1,7 +1,7 @@ SevenIsland_Mart:: @ 8351AE0 .4byte Mart_Layout @ 0x82D5BCC - .4byte gMapEvents_SevenIsland_Mart @ 0x83BE100 - .4byte gMapScripts_SevenIsland_Mart @ 0x8170B30 + .4byte SevenIsland_Mart_MapEvents @ 0x83BE100 + .4byte SevenIsland_Mart_MapScripts @ 0x8170B30 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 10 diff --git a/data/maps/SevenIsland_PokemonCenter_1F/header.inc b/data/maps/SevenIsland_PokemonCenter_1F/header.inc index edf42476e..feef23d0e 100644 --- a/data/maps/SevenIsland_PokemonCenter_1F/header.inc +++ b/data/maps/SevenIsland_PokemonCenter_1F/header.inc @@ -1,7 +1,7 @@ SevenIsland_PokemonCenter_1F:: @ 8351AFC .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte gMapEvents_SevenIsland_PokemonCenter_1F @ 0x83BE1B4 - .4byte gMapScripts_SevenIsland_PokemonCenter_1F @ 0x8170B89 + .4byte SevenIsland_PokemonCenter_1F_MapEvents @ 0x83BE1B4 + .4byte SevenIsland_PokemonCenter_1F_MapScripts @ 0x8170B89 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 8 diff --git a/data/maps/SevenIsland_PokemonCenter_2F/header.inc b/data/maps/SevenIsland_PokemonCenter_2F/header.inc index 1f5a7e0b1..523401267 100644 --- a/data/maps/SevenIsland_PokemonCenter_2F/header.inc +++ b/data/maps/SevenIsland_PokemonCenter_2F/header.inc @@ -1,7 +1,7 @@ SevenIsland_PokemonCenter_2F:: @ 8351B18 .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte gMapEvents_SevenIsland_PokemonCenter_2F @ 0x83BE240 - .4byte gMapScripts_SevenIsland_PokemonCenter_2F @ 0x8170BBC + .4byte SevenIsland_PokemonCenter_2F_MapEvents @ 0x83BE240 + .4byte SevenIsland_PokemonCenter_2F_MapScripts @ 0x8170BBC .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 9 diff --git a/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/header.inc b/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/header.inc index 29b6312f3..dc6bc05ff 100644 --- a/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/header.inc +++ b/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/header.inc @@ -1,7 +1,7 @@ SevenIsland_SeavaultCanyon_TanobyKey:: @ 835035C .4byte SevenIsland_SeavaultCanyon_TanobyKey_Layout @ 0x8347C54 - .4byte gMapEvents_SevenIsland_SeavaultCanyon_TanobyKey @ 0x83B48BC - .4byte gMapScripts_SevenIsland_SeavaultCanyon_TanobyKey @ 0x8164DCC + .4byte SevenIsland_SeavaultCanyon_TanobyKey_MapEvents @ 0x83B48BC + .4byte SevenIsland_SeavaultCanyon_TanobyKey_MapScripts @ 0x8164DCC .4byte NULL .2byte BGM_FRLG_TANOBY_RUINS .2byte 341 diff --git a/data/maps/SevenIsland_SevaultCanyon/header.inc b/data/maps/SevenIsland_SevaultCanyon/header.inc index d9ac12b23..52ca532e5 100644 --- a/data/maps/SevenIsland_SevaultCanyon/header.inc +++ b/data/maps/SevenIsland_SevaultCanyon/header.inc @@ -1,7 +1,7 @@ SevenIsland_SevaultCanyon:: @ 8350D18 .4byte SevenIsland_SevaultCanyon_Layout @ 0x8333F44 - .4byte gMapEvents_SevenIsland_SevaultCanyon @ 0x83B9618 - .4byte gMapScripts_SevenIsland_SevaultCanyon @ 0x8168BFD + .4byte SevenIsland_SevaultCanyon_MapEvents @ 0x83B9618 + .4byte SevenIsland_SevaultCanyon_MapScripts @ 0x8168BFD .4byte SevenIsland_SevaultCanyon_MapConnections @ 0x8352ED0 .2byte BGM_FRLG_SEVII_ISLANDS .2byte 256 diff --git a/data/maps/SevenIsland_SevaultCanyon_Entrance/header.inc b/data/maps/SevenIsland_SevaultCanyon_Entrance/header.inc index 370efc530..5564b0943 100644 --- a/data/maps/SevenIsland_SevaultCanyon_Entrance/header.inc +++ b/data/maps/SevenIsland_SevaultCanyon_Entrance/header.inc @@ -1,7 +1,7 @@ SevenIsland_SevaultCanyon_Entrance:: @ 8350CFC .4byte SevenIsland_SevaultCanyon_Entrance_Layout @ 0x8333020 - .4byte gMapEvents_SevenIsland_SevaultCanyon_Entrance @ 0x83B93FC - .4byte gMapScripts_SevenIsland_SevaultCanyon_Entrance @ 0x8168BF3 + .4byte SevenIsland_SevaultCanyon_Entrance_MapEvents @ 0x83B93FC + .4byte SevenIsland_SevaultCanyon_Entrance_MapScripts @ 0x8168BF3 .4byte SevenIsland_SevaultCanyon_Entrance_MapConnections @ 0x8352EB0 .2byte BGM_FRLG_SEVII_ISLANDS .2byte 255 diff --git a/data/maps/SevenIsland_SevaultCanyon_House/header.inc b/data/maps/SevenIsland_SevaultCanyon_House/header.inc index 7c3db6084..2adfd6a6e 100644 --- a/data/maps/SevenIsland_SevaultCanyon_House/header.inc +++ b/data/maps/SevenIsland_SevaultCanyon_House/header.inc @@ -1,7 +1,7 @@ SevenIsland_SevaultCanyon_House:: @ 8351FE8 .4byte House3_Layout @ 0x82D5CB8 - .4byte gMapEvents_SevenIsland_SevaultCanyon_House @ 0x83BF3CC - .4byte gMapScripts_SevenIsland_SevaultCanyon_House @ 0x8172182 + .4byte SevenIsland_SevaultCanyon_House_MapEvents @ 0x83BF3CC + .4byte SevenIsland_SevaultCanyon_House_MapScripts @ 0x8172182 .4byte NULL .2byte BGM_FRLG_ISLAND_SIX .2byte 11 diff --git a/data/maps/SevenIsland_TanobyRuins/header.inc b/data/maps/SevenIsland_TanobyRuins/header.inc index 3593aa312..1af4d7470 100644 --- a/data/maps/SevenIsland_TanobyRuins/header.inc +++ b/data/maps/SevenIsland_TanobyRuins/header.inc @@ -1,7 +1,7 @@ SevenIsland_TanobyRuins:: @ 8350D34 .4byte SevenIsland_TanobyRuins_Layout @ 0x83355E8 - .4byte gMapEvents_SevenIsland_TanobyRuins @ 0x83B96F4 - .4byte gMapScripts_SevenIsland_TanobyRuins @ 0x8168C07 + .4byte SevenIsland_TanobyRuins_MapEvents @ 0x83B96F4 + .4byte SevenIsland_TanobyRuins_MapScripts @ 0x8168C07 .4byte SevenIsland_TanobyRuins_MapConnections @ 0x8352EE4 .2byte BGM_FRLG_SEVII_ISLANDS .2byte 257 diff --git a/data/maps/SevenIsland_TanobyRuins_DilfordChamber/header.inc b/data/maps/SevenIsland_TanobyRuins_DilfordChamber/header.inc index b2409df20..ff5d89664 100644 --- a/data/maps/SevenIsland_TanobyRuins_DilfordChamber/header.inc +++ b/data/maps/SevenIsland_TanobyRuins_DilfordChamber/header.inc @@ -1,7 +1,7 @@ SevenIsland_TanobyRuins_DilfordChamber:: @ 83502D0 .4byte SevenIsland_TanobyRuins_DilfordChamber_Layout @ 0x83470F8 - .4byte gMapEvents_SevenIsland_TanobyRuins_DilfordChamber @ 0x83B46EC - .4byte gMapScripts_SevenIsland_TanobyRuins_DilfordChamber @ 0x8164CF6 + .4byte SevenIsland_TanobyRuins_DilfordChamber_MapEvents @ 0x83B46EC + .4byte SevenIsland_TanobyRuins_DilfordChamber_MapScripts @ 0x8164CF6 .4byte NULL .2byte BGM_FRLG_TANOBY_RUINS .2byte 338 diff --git a/data/maps/SevenIsland_TanobyRuins_LiptooChamber/header.inc b/data/maps/SevenIsland_TanobyRuins_LiptooChamber/header.inc index 5e2639df1..f25b6c7b4 100644 --- a/data/maps/SevenIsland_TanobyRuins_LiptooChamber/header.inc +++ b/data/maps/SevenIsland_TanobyRuins_LiptooChamber/header.inc @@ -1,7 +1,7 @@ SevenIsland_TanobyRuins_LiptooChamber:: @ 8350298 .4byte SevenIsland_TanobyRuins_LiptooChamber_Layout @ 0x8346A90 - .4byte gMapEvents_SevenIsland_TanobyRuins_LiptooChamber @ 0x83B46B4 - .4byte gMapScripts_SevenIsland_TanobyRuins_LiptooChamber @ 0x8164CDE + .4byte SevenIsland_TanobyRuins_LiptooChamber_MapEvents @ 0x83B46B4 + .4byte SevenIsland_TanobyRuins_LiptooChamber_MapScripts @ 0x8164CDE .4byte NULL .2byte BGM_FRLG_TANOBY_RUINS .2byte 336 diff --git a/data/maps/SevenIsland_TanobyRuins_MoneanChamber/header.inc b/data/maps/SevenIsland_TanobyRuins_MoneanChamber/header.inc index 2be9dff00..b193feafc 100644 --- a/data/maps/SevenIsland_TanobyRuins_MoneanChamber/header.inc +++ b/data/maps/SevenIsland_TanobyRuins_MoneanChamber/header.inc @@ -1,7 +1,7 @@ SevenIsland_TanobyRuins_MoneanChamber:: @ 835027C .4byte SevenIsland_TanobyRuins_MoneanChamber_Layout @ 0x834675C - .4byte gMapEvents_SevenIsland_TanobyRuins_MoneanChamber @ 0x83B4698 - .4byte gMapScripts_SevenIsland_TanobyRuins_MoneanChamber @ 0x8164CCF + .4byte SevenIsland_TanobyRuins_MoneanChamber_MapEvents @ 0x83B4698 + .4byte SevenIsland_TanobyRuins_MoneanChamber_MapScripts @ 0x8164CCF .4byte NULL .2byte BGM_FRLG_TANOBY_RUINS .2byte 335 diff --git a/data/maps/SevenIsland_TanobyRuins_RixyChamber/header.inc b/data/maps/SevenIsland_TanobyRuins_RixyChamber/header.inc index 923ab442a..815c894ee 100644 --- a/data/maps/SevenIsland_TanobyRuins_RixyChamber/header.inc +++ b/data/maps/SevenIsland_TanobyRuins_RixyChamber/header.inc @@ -1,7 +1,7 @@ SevenIsland_TanobyRuins_RixyChamber:: @ 8350308 .4byte SevenIsland_TanobyRuins_RixyChamber_Layout @ 0x8349DC8 - .4byte gMapEvents_SevenIsland_TanobyRuins_RixyChamber @ 0x83B4724 - .4byte gMapScripts_SevenIsland_TanobyRuins_RixyChamber @ 0x8164D0E + .4byte SevenIsland_TanobyRuins_RixyChamber_MapEvents @ 0x83B4724 + .4byte SevenIsland_TanobyRuins_RixyChamber_MapScripts @ 0x8164D0E .4byte NULL .2byte BGM_FRLG_TANOBY_RUINS .2byte 362 diff --git a/data/maps/SevenIsland_TanobyRuins_ScufibChamber/header.inc b/data/maps/SevenIsland_TanobyRuins_ScufibChamber/header.inc index 755f02e6d..66680e148 100644 --- a/data/maps/SevenIsland_TanobyRuins_ScufibChamber/header.inc +++ b/data/maps/SevenIsland_TanobyRuins_ScufibChamber/header.inc @@ -1,7 +1,7 @@ SevenIsland_TanobyRuins_ScufibChamber:: @ 83502EC .4byte SevenIsland_TanobyRuins_ScufibChamber_Layout @ 0x834742C - .4byte gMapEvents_SevenIsland_TanobyRuins_ScufibChamber @ 0x83B4708 - .4byte gMapScripts_SevenIsland_TanobyRuins_ScufibChamber @ 0x8164D02 + .4byte SevenIsland_TanobyRuins_ScufibChamber_MapEvents @ 0x83B4708 + .4byte SevenIsland_TanobyRuins_ScufibChamber_MapScripts @ 0x8164D02 .4byte NULL .2byte BGM_FRLG_TANOBY_RUINS .2byte 339 diff --git a/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/header.inc b/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/header.inc index 7d1793415..1f29dbb8f 100644 --- a/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/header.inc +++ b/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/header.inc @@ -1,7 +1,7 @@ SevenIsland_TanobyRuins_ViapoisChamber:: @ 8350324 .4byte SevenIsland_TanobyRuins_ViapoisChamber_Layout @ 0x834A0FC - .4byte gMapEvents_SevenIsland_TanobyRuins_ViapoisChamber @ 0x83B4740 - .4byte gMapScripts_SevenIsland_TanobyRuins_ViapoisChamber @ 0x8164D1A + .4byte SevenIsland_TanobyRuins_ViapoisChamber_MapEvents @ 0x83B4740 + .4byte SevenIsland_TanobyRuins_ViapoisChamber_MapScripts @ 0x8164D1A .4byte NULL .2byte BGM_FRLG_TANOBY_RUINS .2byte 363 diff --git a/data/maps/SevenIsland_TanobyRuins_WeepthChamber/header.inc b/data/maps/SevenIsland_TanobyRuins_WeepthChamber/header.inc index dab134f18..a6ad1c938 100644 --- a/data/maps/SevenIsland_TanobyRuins_WeepthChamber/header.inc +++ b/data/maps/SevenIsland_TanobyRuins_WeepthChamber/header.inc @@ -1,7 +1,7 @@ SevenIsland_TanobyRuins_WeepthChamber:: @ 83502B4 .4byte SevenIsland_TanobyRuins_WeepthChamber_Layout @ 0x8346DC4 - .4byte gMapEvents_SevenIsland_TanobyRuins_WeepthChamber @ 0x83B46D0 - .4byte gMapScripts_SevenIsland_TanobyRuins_WeepthChamber @ 0x8164CEA + .4byte SevenIsland_TanobyRuins_WeepthChamber_MapEvents @ 0x83B46D0 + .4byte SevenIsland_TanobyRuins_WeepthChamber_MapScripts @ 0x8164CEA .4byte NULL .2byte BGM_FRLG_TANOBY_RUINS .2byte 337 diff --git a/data/maps/SevenIsland_TrainerTower/header.inc b/data/maps/SevenIsland_TrainerTower/header.inc index 41319d0b9..70ebb690e 100644 --- a/data/maps/SevenIsland_TrainerTower/header.inc +++ b/data/maps/SevenIsland_TrainerTower/header.inc @@ -1,7 +1,7 @@ SevenIsland_TrainerTower:: @ 8350CE0 .4byte SevenIsland_TrainerTower_Layout @ 0x833287C - .4byte gMapEvents_SevenIsland_TrainerTower @ 0x83B9328 - .4byte gMapScripts_SevenIsland_TrainerTower @ 0x8168BD5 + .4byte SevenIsland_TrainerTower_MapEvents @ 0x83B9328 + .4byte SevenIsland_TrainerTower_MapScripts @ 0x8168BD5 .4byte SevenIsland_TrainerTower_MapConnections @ 0x8352E90 .2byte BGM_FRLG_SEVII_ISLANDS .2byte 254 diff --git a/data/maps/SevenIsland_TrainerTower_1F/header.inc b/data/maps/SevenIsland_TrainerTower_1F/header.inc index 03addfd0a..5e7e742ab 100644 --- a/data/maps/SevenIsland_TrainerTower_1F/header.inc +++ b/data/maps/SevenIsland_TrainerTower_1F/header.inc @@ -1,7 +1,7 @@ SevenIsland_TrainerTower_1F:: @ 834FFA4 .4byte SevenIsland_TrainerTower_1F_Layout @ 0x8341FCC - .4byte gMapEvents_SevenIsland_TrainerTower_1F @ 0x83B3C40 - .4byte gMapScripts_SevenIsland_TrainerTower_1F @ 0x81646B8 + .4byte SevenIsland_TrainerTower_1F_MapEvents @ 0x83B3C40 + .4byte SevenIsland_TrainerTower_1F_MapScripts @ 0x81646B8 .4byte NULL .2byte BGM_FRLG_TRAINER_TOWER .2byte 298 diff --git a/data/maps/SevenIsland_TrainerTower_2F/header.inc b/data/maps/SevenIsland_TrainerTower_2F/header.inc index ef4663130..b5289b39a 100644 --- a/data/maps/SevenIsland_TrainerTower_2F/header.inc +++ b/data/maps/SevenIsland_TrainerTower_2F/header.inc @@ -1,7 +1,7 @@ SevenIsland_TrainerTower_2F:: @ 834FFC0 .4byte SevenIsland_TrainerTower_2F_Layout @ 0x8342254 - .4byte gMapEvents_SevenIsland_TrainerTower_2F @ 0x83B3D14 - .4byte gMapScripts_SevenIsland_TrainerTower_2F @ 0x81646E6 + .4byte SevenIsland_TrainerTower_2F_MapEvents @ 0x83B3D14 + .4byte SevenIsland_TrainerTower_2F_MapScripts @ 0x81646E6 .4byte NULL .2byte BGM_FRLG_TRAINER_TOWER .2byte 299 diff --git a/data/maps/SevenIsland_TrainerTower_3F/header.inc b/data/maps/SevenIsland_TrainerTower_3F/header.inc index f9400b21e..022a5c1d1 100644 --- a/data/maps/SevenIsland_TrainerTower_3F/header.inc +++ b/data/maps/SevenIsland_TrainerTower_3F/header.inc @@ -1,7 +1,7 @@ SevenIsland_TrainerTower_3F:: @ 834FFDC .4byte SevenIsland_TrainerTower_3F_Layout @ 0x83424DC - .4byte gMapEvents_SevenIsland_TrainerTower_3F @ 0x83B3DE8 - .4byte gMapScripts_SevenIsland_TrainerTower_3F @ 0x8164714 + .4byte SevenIsland_TrainerTower_3F_MapEvents @ 0x83B3DE8 + .4byte SevenIsland_TrainerTower_3F_MapScripts @ 0x8164714 .4byte NULL .2byte BGM_FRLG_TRAINER_TOWER .2byte 300 diff --git a/data/maps/SevenIsland_TrainerTower_4F/header.inc b/data/maps/SevenIsland_TrainerTower_4F/header.inc index 82b4c0d87..cdcedee7f 100644 --- a/data/maps/SevenIsland_TrainerTower_4F/header.inc +++ b/data/maps/SevenIsland_TrainerTower_4F/header.inc @@ -1,7 +1,7 @@ SevenIsland_TrainerTower_4F:: @ 834FFF8 .4byte SevenIsland_TrainerTower_4F_Layout @ 0x8342764 - .4byte gMapEvents_SevenIsland_TrainerTower_4F @ 0x83B3EBC - .4byte gMapScripts_SevenIsland_TrainerTower_4F @ 0x8164742 + .4byte SevenIsland_TrainerTower_4F_MapEvents @ 0x83B3EBC + .4byte SevenIsland_TrainerTower_4F_MapScripts @ 0x8164742 .4byte NULL .2byte BGM_FRLG_TRAINER_TOWER .2byte 301 diff --git a/data/maps/SevenIsland_TrainerTower_5F/header.inc b/data/maps/SevenIsland_TrainerTower_5F/header.inc index 9e894806f..0192b30be 100644 --- a/data/maps/SevenIsland_TrainerTower_5F/header.inc +++ b/data/maps/SevenIsland_TrainerTower_5F/header.inc @@ -1,7 +1,7 @@ SevenIsland_TrainerTower_5F:: @ 8350014 .4byte SevenIsland_TrainerTower_5F_Layout @ 0x83429EC - .4byte gMapEvents_SevenIsland_TrainerTower_5F @ 0x83B3F90 - .4byte gMapScripts_SevenIsland_TrainerTower_5F @ 0x8164770 + .4byte SevenIsland_TrainerTower_5F_MapEvents @ 0x83B3F90 + .4byte SevenIsland_TrainerTower_5F_MapScripts @ 0x8164770 .4byte NULL .2byte BGM_FRLG_TRAINER_TOWER .2byte 302 diff --git a/data/maps/SevenIsland_TrainerTower_6F/header.inc b/data/maps/SevenIsland_TrainerTower_6F/header.inc index e16b71ffa..3835015a0 100644 --- a/data/maps/SevenIsland_TrainerTower_6F/header.inc +++ b/data/maps/SevenIsland_TrainerTower_6F/header.inc @@ -1,7 +1,7 @@ SevenIsland_TrainerTower_6F:: @ 8350030 .4byte SevenIsland_TrainerTower_6F_Layout @ 0x8342C74 - .4byte gMapEvents_SevenIsland_TrainerTower_6F @ 0x83B4064 - .4byte gMapScripts_SevenIsland_TrainerTower_6F @ 0x816479E + .4byte SevenIsland_TrainerTower_6F_MapEvents @ 0x83B4064 + .4byte SevenIsland_TrainerTower_6F_MapScripts @ 0x816479E .4byte NULL .2byte BGM_FRLG_TRAINER_TOWER .2byte 303 diff --git a/data/maps/SevenIsland_TrainerTower_7F/header.inc b/data/maps/SevenIsland_TrainerTower_7F/header.inc index 804576d94..2c0d405a9 100644 --- a/data/maps/SevenIsland_TrainerTower_7F/header.inc +++ b/data/maps/SevenIsland_TrainerTower_7F/header.inc @@ -1,7 +1,7 @@ SevenIsland_TrainerTower_7F:: @ 835004C .4byte SevenIsland_TrainerTower_7F_Layout @ 0x8342EFC - .4byte gMapEvents_SevenIsland_TrainerTower_7F @ 0x83B4138 - .4byte gMapScripts_SevenIsland_TrainerTower_7F @ 0x81647CC + .4byte SevenIsland_TrainerTower_7F_MapEvents @ 0x83B4138 + .4byte SevenIsland_TrainerTower_7F_MapScripts @ 0x81647CC .4byte NULL .2byte BGM_FRLG_TRAINER_TOWER .2byte 304 diff --git a/data/maps/SevenIsland_TrainerTower_8F/header.inc b/data/maps/SevenIsland_TrainerTower_8F/header.inc index a395e6b49..31ff1d39b 100644 --- a/data/maps/SevenIsland_TrainerTower_8F/header.inc +++ b/data/maps/SevenIsland_TrainerTower_8F/header.inc @@ -1,7 +1,7 @@ SevenIsland_TrainerTower_8F:: @ 8350068 .4byte SevenIsland_TrainerTower_8F_Layout @ 0x8343184 - .4byte gMapEvents_SevenIsland_TrainerTower_8F @ 0x83B420C - .4byte gMapScripts_SevenIsland_TrainerTower_8F @ 0x81647FA + .4byte SevenIsland_TrainerTower_8F_MapEvents @ 0x83B420C + .4byte SevenIsland_TrainerTower_8F_MapScripts @ 0x81647FA .4byte NULL .2byte BGM_FRLG_TRAINER_TOWER .2byte 305 diff --git a/data/maps/SevenIsland_TrainerTower_Elevator/header.inc b/data/maps/SevenIsland_TrainerTower_Elevator/header.inc index da5559773..024a3656b 100644 --- a/data/maps/SevenIsland_TrainerTower_Elevator/header.inc +++ b/data/maps/SevenIsland_TrainerTower_Elevator/header.inc @@ -1,7 +1,7 @@ SevenIsland_TrainerTower_Elevator:: @ 83500BC .4byte SevenIsland_TrainerTower_Elevator_Layout @ 0x8343454 - .4byte gMapEvents_SevenIsland_TrainerTower_Elevator @ 0x83B4330 - .4byte gMapScripts_SevenIsland_TrainerTower_Elevator @ 0x8164AF8 + .4byte SevenIsland_TrainerTower_Elevator_MapEvents @ 0x83B4330 + .4byte SevenIsland_TrainerTower_Elevator_MapScripts @ 0x8164AF8 .4byte NULL .2byte BGM_FRLG_TRAINER_TOWER .2byte 307 diff --git a/data/maps/SevenIsland_TrainerTower_Lobby/header.inc b/data/maps/SevenIsland_TrainerTower_Lobby/header.inc index f62c7dfec..243fe1a15 100644 --- a/data/maps/SevenIsland_TrainerTower_Lobby/header.inc +++ b/data/maps/SevenIsland_TrainerTower_Lobby/header.inc @@ -1,7 +1,7 @@ SevenIsland_TrainerTower_Lobby:: @ 83500A0 .4byte SevenIsland_TrainerTower_Lobby_Layout @ 0x8341D44 - .4byte gMapEvents_SevenIsland_TrainerTower_Lobby @ 0x83B4308 - .4byte gMapScripts_SevenIsland_TrainerTower_Lobby @ 0x8164839 + .4byte SevenIsland_TrainerTower_Lobby_MapEvents @ 0x83B4308 + .4byte SevenIsland_TrainerTower_Lobby_MapScripts @ 0x8164839 .4byte NULL .2byte BGM_FRLG_TRAINER_TOWER .2byte 297 diff --git a/data/maps/SevenIsland_TrainerTower_Roof/header.inc b/data/maps/SevenIsland_TrainerTower_Roof/header.inc index 3fdaad52f..da106ecba 100644 --- a/data/maps/SevenIsland_TrainerTower_Roof/header.inc +++ b/data/maps/SevenIsland_TrainerTower_Roof/header.inc @@ -1,7 +1,7 @@ SevenIsland_TrainerTower_Roof:: @ 8350084 .4byte SevenIsland_TrainerTower_Roof_Layout @ 0x83433E8 - .4byte gMapEvents_SevenIsland_TrainerTower_Roof @ 0x83B4248 - .4byte gMapScripts_SevenIsland_TrainerTower_Roof @ 0x8164828 + .4byte SevenIsland_TrainerTower_Roof_MapEvents @ 0x83B4248 + .4byte SevenIsland_TrainerTower_Roof_MapScripts @ 0x8164828 .4byte NULL .2byte BGM_FRLG_TRAINER_TOWER .2byte 306 diff --git a/data/maps/SilphCo_10F/header.inc b/data/maps/SilphCo_10F/header.inc index b211cc14d..32d229ed3 100644 --- a/data/maps/SilphCo_10F/header.inc +++ b/data/maps/SilphCo_10F/header.inc @@ -1,7 +1,7 @@ SilphCo_10F:: @ 834F834 .4byte SilphCo_10F_Layout @ 0x830A0E8 - .4byte gMapEvents_SilphCo_10F @ 0x83B0A20 - .4byte gMapScripts_SilphCo_10F @ 0x8161D86 + .4byte SilphCo_10F_MapEvents @ 0x83B0A20 + .4byte SilphCo_10F_MapScripts @ 0x8161D86 .4byte NULL .2byte BGM_FRLG_SILPH .2byte 141 diff --git a/data/maps/SilphCo_11F/header.inc b/data/maps/SilphCo_11F/header.inc index 6121495c4..d451aa3bf 100644 --- a/data/maps/SilphCo_11F/header.inc +++ b/data/maps/SilphCo_11F/header.inc @@ -1,7 +1,7 @@ SilphCo_11F:: @ 834F850 .4byte SilphCo_11F_Layout @ 0x830A3B4 - .4byte gMapEvents_SilphCo_11F @ 0x83B0B44 - .4byte gMapScripts_SilphCo_11F @ 0x8161DEE + .4byte SilphCo_11F_MapEvents @ 0x83B0B44 + .4byte SilphCo_11F_MapScripts @ 0x8161DEE .4byte NULL .2byte BGM_FRLG_SILPH .2byte 142 diff --git a/data/maps/SilphCo_1F/header.inc b/data/maps/SilphCo_1F/header.inc index df174f19c..e1dca1251 100644 --- a/data/maps/SilphCo_1F/header.inc +++ b/data/maps/SilphCo_1F/header.inc @@ -1,7 +1,7 @@ SilphCo_1F:: @ 834F738 .4byte SilphCo_1F_Layout @ 0x83071EC - .4byte gMapEvents_SilphCo_1F @ 0x83AFCE0 - .4byte gMapScripts_SilphCo_1F @ 0x8161625 + .4byte SilphCo_1F_MapEvents @ 0x83AFCE0 + .4byte SilphCo_1F_MapScripts @ 0x8161625 .4byte NULL .2byte BGM_FRLG_SILPH .2byte 132 diff --git a/data/maps/SilphCo_2F/header.inc b/data/maps/SilphCo_2F/header.inc index 870637ea8..17274ac84 100644 --- a/data/maps/SilphCo_2F/header.inc +++ b/data/maps/SilphCo_2F/header.inc @@ -1,7 +1,7 @@ SilphCo_2F:: @ 834F754 .4byte SilphCo_2F_Layout @ 0x8307840 - .4byte gMapEvents_SilphCo_2F @ 0x83AFE1C - .4byte gMapScripts_SilphCo_2F @ 0x8161641 + .4byte SilphCo_2F_MapEvents @ 0x83AFE1C + .4byte SilphCo_2F_MapScripts @ 0x8161641 .4byte NULL .2byte BGM_FRLG_SILPH .2byte 133 diff --git a/data/maps/SilphCo_3F/header.inc b/data/maps/SilphCo_3F/header.inc index 6117e9567..823d84c46 100644 --- a/data/maps/SilphCo_3F/header.inc +++ b/data/maps/SilphCo_3F/header.inc @@ -1,7 +1,7 @@ SilphCo_3F:: @ 834F770 .4byte SilphCo_3F_Layout @ 0x8307E94 - .4byte gMapEvents_SilphCo_3F @ 0x83AFF58 - .4byte gMapScripts_SilphCo_3F @ 0x81616C5 + .4byte SilphCo_3F_MapEvents @ 0x83AFF58 + .4byte SilphCo_3F_MapScripts @ 0x81616C5 .4byte NULL .2byte BGM_FRLG_SILPH .2byte 134 diff --git a/data/maps/SilphCo_4F/header.inc b/data/maps/SilphCo_4F/header.inc index bbbc5688e..a59872690 100644 --- a/data/maps/SilphCo_4F/header.inc +++ b/data/maps/SilphCo_4F/header.inc @@ -1,7 +1,7 @@ SilphCo_4F:: @ 834F78C .4byte SilphCo_4F_Layout @ 0x83084E8 - .4byte gMapEvents_SilphCo_4F @ 0x83B00DC - .4byte gMapScripts_SilphCo_4F @ 0x8161736 + .4byte SilphCo_4F_MapEvents @ 0x83B00DC + .4byte SilphCo_4F_MapScripts @ 0x8161736 .4byte NULL .2byte BGM_FRLG_SILPH .2byte 135 diff --git a/data/maps/SilphCo_5F/header.inc b/data/maps/SilphCo_5F/header.inc index 803d7b377..2c0d61a47 100644 --- a/data/maps/SilphCo_5F/header.inc +++ b/data/maps/SilphCo_5F/header.inc @@ -1,7 +1,7 @@ SilphCo_5F:: @ 834F7A8 .4byte SilphCo_5F_Layout @ 0x8308B3C - .4byte gMapEvents_SilphCo_5F @ 0x83B02D8 - .4byte gMapScripts_SilphCo_5F @ 0x81617BE + .4byte SilphCo_5F_MapEvents @ 0x83B02D8 + .4byte SilphCo_5F_MapScripts @ 0x81617BE .4byte NULL .2byte BGM_FRLG_SILPH .2byte 136 diff --git a/data/maps/SilphCo_6F/header.inc b/data/maps/SilphCo_6F/header.inc index 0098e49e4..d9c522f9c 100644 --- a/data/maps/SilphCo_6F/header.inc +++ b/data/maps/SilphCo_6F/header.inc @@ -1,7 +1,7 @@ SilphCo_6F:: @ 834F7C4 .4byte SilphCo_6F_Layout @ 0x8308FFC - .4byte gMapEvents_SilphCo_6F @ 0x83B044C - .4byte gMapScripts_SilphCo_6F @ 0x8161881 + .4byte SilphCo_6F_MapEvents @ 0x83B044C + .4byte SilphCo_6F_MapScripts @ 0x8161881 .4byte NULL .2byte BGM_FRLG_SILPH .2byte 137 diff --git a/data/maps/SilphCo_7F/header.inc b/data/maps/SilphCo_7F/header.inc index 9c4b5225b..8208b4ad1 100644 --- a/data/maps/SilphCo_7F/header.inc +++ b/data/maps/SilphCo_7F/header.inc @@ -1,7 +1,7 @@ SilphCo_7F:: @ 834F7E0 .4byte SilphCo_7F_Layout @ 0x83094BC - .4byte gMapEvents_SilphCo_7F @ 0x83B0660 - .4byte gMapScripts_SilphCo_7F @ 0x8161984 + .4byte SilphCo_7F_MapEvents @ 0x83B0660 + .4byte SilphCo_7F_MapScripts @ 0x8161984 .4byte NULL .2byte BGM_FRLG_SILPH .2byte 138 diff --git a/data/maps/SilphCo_8F/header.inc b/data/maps/SilphCo_8F/header.inc index 8a46b7924..5614c0a35 100644 --- a/data/maps/SilphCo_8F/header.inc +++ b/data/maps/SilphCo_8F/header.inc @@ -1,7 +1,7 @@ SilphCo_8F:: @ 834F7FC .4byte SilphCo_8F_Layout @ 0x830997C - .4byte gMapEvents_SilphCo_8F @ 0x83B0784 - .4byte gMapScripts_SilphCo_8F @ 0x8161C5F + .4byte SilphCo_8F_MapEvents @ 0x83B0784 + .4byte SilphCo_8F_MapScripts @ 0x8161C5F .4byte NULL .2byte BGM_FRLG_SILPH .2byte 139 diff --git a/data/maps/SilphCo_9F/header.inc b/data/maps/SilphCo_9F/header.inc index d5805078a..a89767234 100644 --- a/data/maps/SilphCo_9F/header.inc +++ b/data/maps/SilphCo_9F/header.inc @@ -1,7 +1,7 @@ SilphCo_9F:: @ 834F818 .4byte SilphCo_9F_Layout @ 0x8309E3C - .4byte gMapEvents_SilphCo_9F @ 0x83B0904 - .4byte gMapScripts_SilphCo_9F @ 0x8161CDE + .4byte SilphCo_9F_MapEvents @ 0x83B0904 + .4byte SilphCo_9F_MapScripts @ 0x8161CDE .4byte NULL .2byte BGM_FRLG_SILPH .2byte 140 diff --git a/data/maps/SilphCo_Elevator/header.inc b/data/maps/SilphCo_Elevator/header.inc index 9a107fb1d..abfebcfd4 100644 --- a/data/maps/SilphCo_Elevator/header.inc +++ b/data/maps/SilphCo_Elevator/header.inc @@ -1,7 +1,7 @@ SilphCo_Elevator:: @ 834F86C .4byte SilphCo_Elevator_Layout @ 0x8321330 - .4byte gMapEvents_SilphCo_Elevator @ 0x83B0B6C - .4byte gMapScripts_SilphCo_Elevator @ 0x8161F6E + .4byte SilphCo_Elevator_MapEvents @ 0x83B0B6C + .4byte SilphCo_Elevator_MapScripts @ 0x8161F6E .4byte NULL .2byte BGM_FRLG_SILPH .2byte 229 diff --git a/data/maps/SixIsland/header.inc b/data/maps/SixIsland/header.inc index 561cad4ce..3c6a68277 100644 --- a/data/maps/SixIsland/header.inc +++ b/data/maps/SixIsland/header.inc @@ -1,7 +1,7 @@ SixIsland:: @ 8350810 .4byte SixIsland_Layout @ 0x832430C - .4byte gMapEvents_SixIsland @ 0x83B65F8 - .4byte gMapScripts_SixIsland @ 0x8167ED8 + .4byte SixIsland_MapEvents @ 0x83B65F8 + .4byte SixIsland_MapScripts @ 0x8167ED8 .4byte SixIsland_MapConnections @ 0x83529D4 .2byte BGM_FRLG_ISLAND_SIX .2byte 236 diff --git a/data/maps/SixIsland_DottedHole_B1F/header.inc b/data/maps/SixIsland_DottedHole_B1F/header.inc index 5bcf69805..e6781f0e2 100644 --- a/data/maps/SixIsland_DottedHole_B1F/header.inc +++ b/data/maps/SixIsland_DottedHole_B1F/header.inc @@ -1,7 +1,7 @@ SixIsland_DottedHole_B1F:: @ 834FEC4 .4byte SixIsland_DottedHole_B1F_Layout @ 0x8343808 - .4byte gMapEvents_SixIsland_DottedHole_B1F @ 0x83B3898 - .4byte gMapScripts_SixIsland_DottedHole_B1F @ 0x81641B0 + .4byte SixIsland_DottedHole_B1F_MapEvents @ 0x83B3898 + .4byte SixIsland_DottedHole_B1F_MapScripts @ 0x81641B0 .4byte NULL .2byte BGM_FRLG_TANOBY_RUINS .2byte 310 diff --git a/data/maps/SixIsland_DottedHole_B2F/header.inc b/data/maps/SixIsland_DottedHole_B2F/header.inc index f5d6a6b1e..5b02b306b 100644 --- a/data/maps/SixIsland_DottedHole_B2F/header.inc +++ b/data/maps/SixIsland_DottedHole_B2F/header.inc @@ -1,7 +1,7 @@ SixIsland_DottedHole_B2F:: @ 834FEE0 .4byte SixIsland_DottedHole_B2F_Layout @ 0x834394C - .4byte gMapEvents_SixIsland_DottedHole_B2F @ 0x83B38E0 - .4byte gMapScripts_SixIsland_DottedHole_B2F @ 0x81641B1 + .4byte SixIsland_DottedHole_B2F_MapEvents @ 0x83B38E0 + .4byte SixIsland_DottedHole_B2F_MapScripts @ 0x81641B1 .4byte NULL .2byte BGM_FRLG_TANOBY_RUINS .2byte 311 diff --git a/data/maps/SixIsland_DottedHole_B3F/header.inc b/data/maps/SixIsland_DottedHole_B3F/header.inc index e30ffe292..0484d6fb4 100644 --- a/data/maps/SixIsland_DottedHole_B3F/header.inc +++ b/data/maps/SixIsland_DottedHole_B3F/header.inc @@ -1,7 +1,7 @@ SixIsland_DottedHole_B3F:: @ 834FEFC .4byte SixIsland_DottedHole_B3F_Layout @ 0x8343A90 - .4byte gMapEvents_SixIsland_DottedHole_B3F @ 0x83B3928 - .4byte gMapScripts_SixIsland_DottedHole_B3F @ 0x81641B2 + .4byte SixIsland_DottedHole_B3F_MapEvents @ 0x83B3928 + .4byte SixIsland_DottedHole_B3F_MapScripts @ 0x81641B2 .4byte NULL .2byte BGM_FRLG_TANOBY_RUINS .2byte 312 diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/header.inc b/data/maps/SixIsland_DottedHole_SapphireRoom/header.inc index 8752ac442..cb34017a5 100644 --- a/data/maps/SixIsland_DottedHole_SapphireRoom/header.inc +++ b/data/maps/SixIsland_DottedHole_SapphireRoom/header.inc @@ -1,7 +1,7 @@ SixIsland_DottedHole_SapphireRoom:: @ 834FF34 .4byte SixIsland_DottedHole_SapphireRoom_Layout @ 0x8343DD8 - .4byte gMapEvents_SixIsland_DottedHole_SapphireRoom @ 0x83B39D0 - .4byte gMapScripts_SixIsland_DottedHole_SapphireRoom @ 0x81641B4 + .4byte SixIsland_DottedHole_SapphireRoom_MapEvents @ 0x83B39D0 + .4byte SixIsland_DottedHole_SapphireRoom_MapScripts @ 0x81641B4 .4byte NULL .2byte BGM_FRLG_TANOBY_RUINS .2byte 314 diff --git a/data/maps/SixIsland_GreenPath/header.inc b/data/maps/SixIsland_GreenPath/header.inc index 091dd662a..7e378de71 100644 --- a/data/maps/SixIsland_GreenPath/header.inc +++ b/data/maps/SixIsland_GreenPath/header.inc @@ -1,7 +1,7 @@ SixIsland_GreenPath:: @ 8350C8C .4byte SixIsland_GreenPath_Layout @ 0x832E0D0 - .4byte gMapEvents_SixIsland_GreenPath @ 0x83B8FA8 - .4byte gMapScripts_SixIsland_GreenPath @ 0x8168B2D + .4byte SixIsland_GreenPath_MapEvents @ 0x83B8FA8 + .4byte SixIsland_GreenPath_MapScripts @ 0x8168B2D .4byte SixIsland_GreenPath_MapConnections @ 0x8352E3C .2byte BGM_FRLG_SEVII_ISLANDS .2byte 251 diff --git a/data/maps/SixIsland_Harbor/header.inc b/data/maps/SixIsland_Harbor/header.inc index cd468e7ce..edbb428b0 100644 --- a/data/maps/SixIsland_Harbor/header.inc +++ b/data/maps/SixIsland_Harbor/header.inc @@ -1,7 +1,7 @@ SixIsland_Harbor:: @ 8351F08 .4byte Island_Harbor_Layout @ 0x8343FB8 - .4byte gMapEvents_SixIsland_Harbor @ 0x83BF178 - .4byte gMapScripts_SixIsland_Harbor @ 0x8171E47 + .4byte SixIsland_Harbor_MapEvents @ 0x83BF178 + .4byte SixIsland_Harbor_MapScripts @ 0x8171E47 .4byte NULL .2byte BGM_FRLG_ISLAND_SIX .2byte 315 diff --git a/data/maps/SixIsland_House/header.inc b/data/maps/SixIsland_House/header.inc index 80be57344..a98057971 100644 --- a/data/maps/SixIsland_House/header.inc +++ b/data/maps/SixIsland_House/header.inc @@ -1,7 +1,7 @@ SixIsland_House:: @ 8351F24 .4byte House3_Layout @ 0x82D5CB8 - .4byte gMapEvents_SixIsland_House @ 0x83BF1AC - .4byte gMapScripts_SixIsland_House @ 0x8171E5B + .4byte SixIsland_House_MapEvents @ 0x83BF1AC + .4byte SixIsland_House_MapScripts @ 0x8171E5B .4byte NULL .2byte BGM_FRLG_ISLAND_SIX .2byte 11 diff --git a/data/maps/SixIsland_Mart/header.inc b/data/maps/SixIsland_Mart/header.inc index ff490a115..d7483ec18 100644 --- a/data/maps/SixIsland_Mart/header.inc +++ b/data/maps/SixIsland_Mart/header.inc @@ -1,7 +1,7 @@ SixIsland_Mart:: @ 8351F40 .4byte Mart_Layout @ 0x82D5BCC - .4byte gMapEvents_SixIsland_Mart @ 0x83BF210 - .4byte gMapScripts_SixIsland_Mart @ 0x8171E65 + .4byte SixIsland_Mart_MapEvents @ 0x83BF210 + .4byte SixIsland_Mart_MapScripts @ 0x8171E65 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 10 diff --git a/data/maps/SixIsland_OutcastIsland/header.inc b/data/maps/SixIsland_OutcastIsland/header.inc index 70ba73f2b..e6cc6186d 100644 --- a/data/maps/SixIsland_OutcastIsland/header.inc +++ b/data/maps/SixIsland_OutcastIsland/header.inc @@ -1,7 +1,7 @@ SixIsland_OutcastIsland:: @ 8350C70 .4byte SixIsland_OutcastIsland_Layout @ 0x832D56C - .4byte gMapEvents_SixIsland_OutcastIsland @ 0x83B8F38 - .4byte gMapScripts_SixIsland_OutcastIsland @ 0x8168B15 + .4byte SixIsland_OutcastIsland_MapEvents @ 0x83B8F38 + .4byte SixIsland_OutcastIsland_MapScripts @ 0x8168B15 .4byte SixIsland_OutcastIsland_MapConnections @ 0x8352E1C .2byte BGM_FRLG_SEVII_ISLANDS .2byte 250 diff --git a/data/maps/SixIsland_PokemonCenter_1F/header.inc b/data/maps/SixIsland_PokemonCenter_1F/header.inc index c26a336c6..e2d7f3aa9 100644 --- a/data/maps/SixIsland_PokemonCenter_1F/header.inc +++ b/data/maps/SixIsland_PokemonCenter_1F/header.inc @@ -1,7 +1,7 @@ SixIsland_PokemonCenter_1F:: @ 8351ED0 .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte gMapEvents_SixIsland_PokemonCenter_1F @ 0x83BF0A0 - .4byte gMapScripts_SixIsland_PokemonCenter_1F @ 0x8171D6A + .4byte SixIsland_PokemonCenter_1F_MapEvents @ 0x83BF0A0 + .4byte SixIsland_PokemonCenter_1F_MapScripts @ 0x8171D6A .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 8 diff --git a/data/maps/SixIsland_PokemonCenter_2F/header.inc b/data/maps/SixIsland_PokemonCenter_2F/header.inc index 16784fe32..f11114273 100644 --- a/data/maps/SixIsland_PokemonCenter_2F/header.inc +++ b/data/maps/SixIsland_PokemonCenter_2F/header.inc @@ -1,7 +1,7 @@ SixIsland_PokemonCenter_2F:: @ 8351EEC .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte gMapEvents_SixIsland_PokemonCenter_2F @ 0x83BF12C - .4byte gMapScripts_SixIsland_PokemonCenter_2F @ 0x8171E20 + .4byte SixIsland_PokemonCenter_2F_MapEvents @ 0x83BF12C + .4byte SixIsland_PokemonCenter_2F_MapScripts @ 0x8171E20 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 9 diff --git a/data/maps/SixIsland_RuinValley/header.inc b/data/maps/SixIsland_RuinValley/header.inc index bd8cd251b..31ec9bc84 100644 --- a/data/maps/SixIsland_RuinValley/header.inc +++ b/data/maps/SixIsland_RuinValley/header.inc @@ -1,7 +1,7 @@ SixIsland_RuinValley:: @ 8350CC4 .4byte SixIsland_RuinValley_Layout @ 0x83302D8 - .4byte gMapEvents_SixIsland_RuinValley @ 0x83B92A0 - .4byte gMapScripts_SixIsland_RuinValley @ 0x8168B53 + .4byte SixIsland_RuinValley_MapEvents @ 0x83B92A0 + .4byte SixIsland_RuinValley_MapScripts @ 0x8168B53 .4byte SixIsland_RuinValley_MapConnections @ 0x8352E7C .2byte BGM_FRLG_SEVII_ISLANDS .2byte 253 diff --git a/data/maps/SixIsland_WaterPath/header.inc b/data/maps/SixIsland_WaterPath/header.inc index f226d3856..4538a40a2 100644 --- a/data/maps/SixIsland_WaterPath/header.inc +++ b/data/maps/SixIsland_WaterPath/header.inc @@ -1,7 +1,7 @@ SixIsland_WaterPath:: @ 8350CA8 .4byte SixIsland_WaterPath_Layout @ 0x832F3B4 - .4byte gMapEvents_SixIsland_WaterPath @ 0x83B90E0 - .4byte gMapScripts_SixIsland_WaterPath @ 0x8168B40 + .4byte SixIsland_WaterPath_MapEvents @ 0x83B90E0 + .4byte SixIsland_WaterPath_MapScripts @ 0x8168B40 .4byte SixIsland_WaterPath_MapConnections @ 0x8352E68 .2byte BGM_FRLG_SEVII_ISLANDS .2byte 252 diff --git a/data/maps/SixIsland_WaterPath_House1/header.inc b/data/maps/SixIsland_WaterPath_House1/header.inc index 45482e174..dbd7e3ece 100644 --- a/data/maps/SixIsland_WaterPath_House1/header.inc +++ b/data/maps/SixIsland_WaterPath_House1/header.inc @@ -1,7 +1,7 @@ SixIsland_WaterPath_House1:: @ 8351FB0 .4byte House4_Layout @ 0x82D6070 - .4byte gMapEvents_SixIsland_WaterPath_House1 @ 0x83BF334 - .4byte gMapScripts_SixIsland_WaterPath_House1 @ 0x817206C + .4byte SixIsland_WaterPath_House1_MapEvents @ 0x83BF334 + .4byte SixIsland_WaterPath_House1_MapScripts @ 0x817206C .4byte NULL .2byte BGM_FRLG_CERULEAN_CITY .2byte 13 diff --git a/data/maps/SixIsland_WaterPath_House2/header.inc b/data/maps/SixIsland_WaterPath_House2/header.inc index 47c53fc7d..e0d5408a6 100644 --- a/data/maps/SixIsland_WaterPath_House2/header.inc +++ b/data/maps/SixIsland_WaterPath_House2/header.inc @@ -1,7 +1,7 @@ SixIsland_WaterPath_House2:: @ 8351FCC .4byte House3_Layout @ 0x82D5CB8 - .4byte gMapEvents_SixIsland_WaterPath_House2 @ 0x83BF368 - .4byte gMapScripts_SixIsland_WaterPath_House2 @ 0x8172178 + .4byte SixIsland_WaterPath_House2_MapEvents @ 0x83BF368 + .4byte SixIsland_WaterPath_House2_MapScripts @ 0x8172178 .4byte NULL .2byte BGM_FRLG_CERULEAN_CITY .2byte 11 diff --git a/data/maps/ThreeIsland/header.inc b/data/maps/ThreeIsland/header.inc index a73e32050..e49570fa4 100644 --- a/data/maps/ThreeIsland/header.inc +++ b/data/maps/ThreeIsland/header.inc @@ -1,7 +1,7 @@ ThreeIsland:: @ 83507A0 .4byte ThreeIsland_Layout @ 0x832265C - .4byte gMapEvents_ThreeIsland @ 0x83B62C8 - .4byte gMapScripts_ThreeIsland @ 0x81677AD + .4byte ThreeIsland_MapEvents @ 0x83B62C8 + .4byte ThreeIsland_MapScripts @ 0x81677AD .4byte ThreeIsland_MapConnections @ 0x8352980 .2byte BGM_FRLG_ISLAND_ONE .2byte 232 diff --git a/data/maps/ThreeIsland_BerryForest/header.inc b/data/maps/ThreeIsland_BerryForest/header.inc index 3a848ee68..928ba8d4a 100644 --- a/data/maps/ThreeIsland_BerryForest/header.inc +++ b/data/maps/ThreeIsland_BerryForest/header.inc @@ -1,7 +1,7 @@ ThreeIsland_BerryForest:: @ 834FE00 .4byte ThreeIsland_BerryForest_Layout @ 0x833A7A8 - .4byte gMapEvents_ThreeIsland_BerryForest @ 0x83B340C - .4byte gMapScripts_ThreeIsland_BerryForest @ 0x8163C71 + .4byte ThreeIsland_BerryForest_MapEvents @ 0x83B340C + .4byte ThreeIsland_BerryForest_MapScripts @ 0x8163C71 .4byte NULL .2byte BGM_FRLG_VIRIDIAN_FOREST .2byte 270 diff --git a/data/maps/ThreeIsland_BondBridge/header.inc b/data/maps/ThreeIsland_BondBridge/header.inc index d7305b2bc..43c5f0c30 100644 --- a/data/maps/ThreeIsland_BondBridge/header.inc +++ b/data/maps/ThreeIsland_BondBridge/header.inc @@ -1,7 +1,7 @@ ThreeIsland_BondBridge:: @ 8350B58 .4byte ThreeIsland_BondBridge_Layout @ 0x8327BDC - .4byte gMapEvents_ThreeIsland_BondBridge @ 0x83B8A9C - .4byte gMapScripts_ThreeIsland_BondBridge @ 0x8168776 + .4byte ThreeIsland_BondBridge_MapEvents @ 0x83B8A9C + .4byte ThreeIsland_BondBridge_MapScripts @ 0x8168776 .4byte ThreeIsland_BondBridge_MapConnections @ 0x8352D64 .2byte BGM_FRLG_ROUTE_3 .2byte 240 diff --git a/data/maps/ThreeIsland_DunsparceTunnel/header.inc b/data/maps/ThreeIsland_DunsparceTunnel/header.inc index 5e3c51372..4f870e33d 100644 --- a/data/maps/ThreeIsland_DunsparceTunnel/header.inc +++ b/data/maps/ThreeIsland_DunsparceTunnel/header.inc @@ -1,7 +1,7 @@ ThreeIsland_DunsparceTunnel:: @ 8350340 .4byte ThreeIsland_DunsparceTunnel_Layout @ 0x83451F8 - .4byte gMapEvents_ThreeIsland_DunsparceTunnel @ 0x83B4788 - .4byte gMapScripts_ThreeIsland_DunsparceTunnel @ 0x8164D26 + .4byte ThreeIsland_DunsparceTunnel_MapEvents @ 0x83B4788 + .4byte ThreeIsland_DunsparceTunnel_MapScripts @ 0x8164D26 .4byte NULL .2byte BGM_FRLG_VIRIDIAN_FOREST .2byte 318 diff --git a/data/maps/ThreeIsland_Harbor/header.inc b/data/maps/ThreeIsland_Harbor/header.inc index 3a29f5fd0..296d4889a 100644 --- a/data/maps/ThreeIsland_Harbor/header.inc +++ b/data/maps/ThreeIsland_Harbor/header.inc @@ -1,7 +1,7 @@ ThreeIsland_Harbor:: @ 8351F5C .4byte Island_Harbor_Layout @ 0x8343FB8 - .4byte gMapEvents_ThreeIsland_Harbor @ 0x83BF25C - .4byte gMapScripts_ThreeIsland_Harbor @ 0x8171EA9 + .4byte ThreeIsland_Harbor_MapEvents @ 0x83BF25C + .4byte ThreeIsland_Harbor_MapScripts @ 0x8171EA9 .4byte NULL .2byte BGM_FRLG_ISLAND_ONE .2byte 315 diff --git a/data/maps/ThreeIsland_House1/header.inc b/data/maps/ThreeIsland_House1/header.inc index 7886ef8c6..1be2f87cf 100644 --- a/data/maps/ThreeIsland_House1/header.inc +++ b/data/maps/ThreeIsland_House1/header.inc @@ -1,7 +1,7 @@ ThreeIsland_House1:: @ 8351C84 .4byte ThreeIsland_House1_Layout @ 0x82D7504 - .4byte gMapEvents_ThreeIsland_House1 @ 0x83BE7A4 - .4byte gMapScripts_ThreeIsland_House1 @ 0x8171819 + .4byte ThreeIsland_House1_MapEvents @ 0x83BE7A4 + .4byte ThreeIsland_House1_MapScripts @ 0x8171819 .4byte NULL .2byte BGM_FRLG_ISLAND_ONE .2byte 31 diff --git a/data/maps/ThreeIsland_House2/header.inc b/data/maps/ThreeIsland_House2/header.inc index 25c26564e..e0f113fff 100644 --- a/data/maps/ThreeIsland_House2/header.inc +++ b/data/maps/ThreeIsland_House2/header.inc @@ -1,7 +1,7 @@ ThreeIsland_House2:: @ 8351CF4 .4byte House3_Layout @ 0x82D5CB8 - .4byte gMapEvents_ThreeIsland_House2 @ 0x83BE97C - .4byte gMapScripts_ThreeIsland_House2 @ 0x81718DF + .4byte ThreeIsland_House2_MapEvents @ 0x83BE97C + .4byte ThreeIsland_House2_MapScripts @ 0x81718DF .4byte NULL .2byte BGM_FRLG_ISLAND_ONE .2byte 11 diff --git a/data/maps/ThreeIsland_House3/header.inc b/data/maps/ThreeIsland_House3/header.inc index 68f69ae93..63799a6dc 100644 --- a/data/maps/ThreeIsland_House3/header.inc +++ b/data/maps/ThreeIsland_House3/header.inc @@ -1,7 +1,7 @@ ThreeIsland_House3:: @ 8351D10 .4byte House3_Layout @ 0x82D5CB8 - .4byte gMapEvents_ThreeIsland_House3 @ 0x83BE9B0 - .4byte gMapScripts_ThreeIsland_House3 @ 0x8171902 + .4byte ThreeIsland_House3_MapEvents @ 0x83BE9B0 + .4byte ThreeIsland_House3_MapScripts @ 0x8171902 .4byte NULL .2byte BGM_FRLG_ISLAND_ONE .2byte 11 diff --git a/data/maps/ThreeIsland_House4/header.inc b/data/maps/ThreeIsland_House4/header.inc index d410743d1..9a270c499 100644 --- a/data/maps/ThreeIsland_House4/header.inc +++ b/data/maps/ThreeIsland_House4/header.inc @@ -1,7 +1,7 @@ ThreeIsland_House4:: @ 8351D2C .4byte House3_Layout @ 0x82D5CB8 - .4byte gMapEvents_ThreeIsland_House4 @ 0x83BE9FC - .4byte gMapScripts_ThreeIsland_House4 @ 0x817190C + .4byte ThreeIsland_House4_MapEvents @ 0x83BE9FC + .4byte ThreeIsland_House4_MapScripts @ 0x817190C .4byte NULL .2byte BGM_FRLG_ISLAND_ONE .2byte 11 diff --git a/data/maps/ThreeIsland_House5/header.inc b/data/maps/ThreeIsland_House5/header.inc index 7383dee7b..0579cbe99 100644 --- a/data/maps/ThreeIsland_House5/header.inc +++ b/data/maps/ThreeIsland_House5/header.inc @@ -1,7 +1,7 @@ ThreeIsland_House5:: @ 8351D48 .4byte House3_Layout @ 0x82D5CB8 - .4byte gMapEvents_ThreeIsland_House5 @ 0x83BEA30 - .4byte gMapScripts_ThreeIsland_House5 @ 0x817191F + .4byte ThreeIsland_House5_MapEvents @ 0x83BEA30 + .4byte ThreeIsland_House5_MapScripts @ 0x817191F .4byte NULL .2byte BGM_FRLG_ISLAND_ONE .2byte 11 diff --git a/data/maps/ThreeIsland_Mart/header.inc b/data/maps/ThreeIsland_Mart/header.inc index c3ed2bdf8..1bf63765e 100644 --- a/data/maps/ThreeIsland_Mart/header.inc +++ b/data/maps/ThreeIsland_Mart/header.inc @@ -1,7 +1,7 @@ ThreeIsland_Mart:: @ 8351CD8 .4byte Mart_Layout @ 0x82D5BCC - .4byte gMapEvents_ThreeIsland_Mart @ 0x83BE930 - .4byte gMapScripts_ThreeIsland_Mart @ 0x817188C + .4byte ThreeIsland_Mart_MapEvents @ 0x83BE930 + .4byte ThreeIsland_Mart_MapScripts @ 0x817188C .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 10 diff --git a/data/maps/ThreeIsland_PokemonCenter_1F/header.inc b/data/maps/ThreeIsland_PokemonCenter_1F/header.inc index 25fa4275c..d65a7ef6a 100644 --- a/data/maps/ThreeIsland_PokemonCenter_1F/header.inc +++ b/data/maps/ThreeIsland_PokemonCenter_1F/header.inc @@ -1,7 +1,7 @@ ThreeIsland_PokemonCenter_1F:: @ 8351CA0 .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte gMapEvents_ThreeIsland_PokemonCenter_1F @ 0x83BE828 - .4byte gMapScripts_ThreeIsland_PokemonCenter_1F @ 0x8171832 + .4byte ThreeIsland_PokemonCenter_1F_MapEvents @ 0x83BE828 + .4byte ThreeIsland_PokemonCenter_1F_MapScripts @ 0x8171832 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 8 diff --git a/data/maps/ThreeIsland_PokemonCenter_2F/header.inc b/data/maps/ThreeIsland_PokemonCenter_2F/header.inc index 40eedca05..83ab3678c 100644 --- a/data/maps/ThreeIsland_PokemonCenter_2F/header.inc +++ b/data/maps/ThreeIsland_PokemonCenter_2F/header.inc @@ -1,7 +1,7 @@ ThreeIsland_PokemonCenter_2F:: @ 8351CBC .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte gMapEvents_ThreeIsland_PokemonCenter_2F @ 0x83BE8B4 - .4byte gMapScripts_ThreeIsland_PokemonCenter_2F @ 0x8171865 + .4byte ThreeIsland_PokemonCenter_2F_MapEvents @ 0x83BE8B4 + .4byte ThreeIsland_PokemonCenter_2F_MapScripts @ 0x8171865 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 9 diff --git a/data/maps/ThreeIsland_Port/header.inc b/data/maps/ThreeIsland_Port/header.inc index 6d7c48e29..7fac5fe54 100644 --- a/data/maps/ThreeIsland_Port/header.inc +++ b/data/maps/ThreeIsland_Port/header.inc @@ -1,7 +1,7 @@ ThreeIsland_Port:: @ 8350B74 .4byte ThreeIsland_Port_Layout @ 0x8328380 - .4byte gMapEvents_ThreeIsland_Port @ 0x83B8B10 - .4byte gMapScripts_ThreeIsland_Port @ 0x8168789 + .4byte ThreeIsland_Port_MapEvents @ 0x83B8B10 + .4byte ThreeIsland_Port_MapScripts @ 0x8168789 .4byte ThreeIsland_Port_MapConnections @ 0x8352D78 .2byte BGM_FRLG_ROUTE_3 .2byte 241 diff --git a/data/maps/TwoIsland/header.inc b/data/maps/TwoIsland/header.inc index 813ef23bd..698e7544b 100644 --- a/data/maps/TwoIsland/header.inc +++ b/data/maps/TwoIsland/header.inc @@ -1,7 +1,7 @@ TwoIsland:: @ 8350784 .4byte TwoIsland_Layout @ 0x8321EB8 - .4byte gMapEvents_TwoIsland @ 0x83B6074 - .4byte gMapScripts_TwoIsland @ 0x8167564 + .4byte TwoIsland_MapEvents @ 0x83B6074 + .4byte TwoIsland_MapScripts @ 0x8167564 .4byte TwoIsland_MapConnections @ 0x8352960 .2byte BGM_FRLG_ISLAND_ONE .2byte 231 diff --git a/data/maps/TwoIsland_CapeBrink/header.inc b/data/maps/TwoIsland_CapeBrink/header.inc index 0e8ec9654..d97cc38a1 100644 --- a/data/maps/TwoIsland_CapeBrink/header.inc +++ b/data/maps/TwoIsland_CapeBrink/header.inc @@ -1,7 +1,7 @@ TwoIsland_CapeBrink:: @ 8350B3C .4byte TwoIsland_CapeBrink_Layout @ 0x8326CB8 - .4byte gMapEvents_TwoIsland_CapeBrink @ 0x83B8964 - .4byte gMapScripts_TwoIsland_CapeBrink @ 0x8168775 + .4byte TwoIsland_CapeBrink_MapEvents @ 0x83B8964 + .4byte TwoIsland_CapeBrink_MapScripts @ 0x8168775 .4byte TwoIsland_CapeBrink_MapConnections @ 0x8352D50 .2byte BGM_FRLG_ROUTE_3 .2byte 239 diff --git a/data/maps/TwoIsland_CapeBrink_House/header.inc b/data/maps/TwoIsland_CapeBrink_House/header.inc index 37cc779c7..a5cb71beb 100644 --- a/data/maps/TwoIsland_CapeBrink_House/header.inc +++ b/data/maps/TwoIsland_CapeBrink_House/header.inc @@ -1,7 +1,7 @@ TwoIsland_CapeBrink_House:: @ 8351F94 .4byte House3_Layout @ 0x82D5CB8 - .4byte gMapEvents_TwoIsland_CapeBrink_House @ 0x83BF2F4 - .4byte gMapScripts_TwoIsland_CapeBrink_House @ 0x817206B + .4byte TwoIsland_CapeBrink_House_MapEvents @ 0x83BF2F4 + .4byte TwoIsland_CapeBrink_House_MapScripts @ 0x817206B .4byte NULL .2byte BGM_FRLG_ISLAND_ONE .2byte 11 diff --git a/data/maps/TwoIsland_Harbor/header.inc b/data/maps/TwoIsland_Harbor/header.inc index 9aa296c48..a7f4b3c97 100644 --- a/data/maps/TwoIsland_Harbor/header.inc +++ b/data/maps/TwoIsland_Harbor/header.inc @@ -1,7 +1,7 @@ TwoIsland_Harbor:: @ 8351C68 .4byte Island_Harbor_Layout @ 0x8343FB8 - .4byte gMapEvents_TwoIsland_Harbor @ 0x83BE764 - .4byte gMapScripts_TwoIsland_Harbor @ 0x8171805 + .4byte TwoIsland_Harbor_MapEvents @ 0x83BE764 + .4byte TwoIsland_Harbor_MapScripts @ 0x8171805 .4byte NULL .2byte BGM_FRLG_ISLAND_ONE .2byte 315 diff --git a/data/maps/TwoIsland_House/header.inc b/data/maps/TwoIsland_House/header.inc index 6d0ea5f87..ef308156d 100644 --- a/data/maps/TwoIsland_House/header.inc +++ b/data/maps/TwoIsland_House/header.inc @@ -1,7 +1,7 @@ TwoIsland_House:: @ 8351C14 .4byte House3_Layout @ 0x82D5CB8 - .4byte gMapEvents_TwoIsland_House @ 0x83BE620 - .4byte gMapScripts_TwoIsland_House @ 0x8171618 + .4byte TwoIsland_House_MapEvents @ 0x83BE620 + .4byte TwoIsland_House_MapScripts @ 0x8171618 .4byte NULL .2byte BGM_FRLG_ISLAND_ONE .2byte 11 diff --git a/data/maps/TwoIsland_JoyfulGameCorner/header.inc b/data/maps/TwoIsland_JoyfulGameCorner/header.inc index 5469caa39..35934a5f6 100644 --- a/data/maps/TwoIsland_JoyfulGameCorner/header.inc +++ b/data/maps/TwoIsland_JoyfulGameCorner/header.inc @@ -1,7 +1,7 @@ TwoIsland_JoyfulGameCorner:: @ 8351BF8 .4byte TwoIsland_JoyfulGameCorner_Layout @ 0x833AA84 - .4byte gMapEvents_TwoIsland_JoyfulGameCorner @ 0x83BE5EC - .4byte gMapScripts_TwoIsland_JoyfulGameCorner @ 0x81713D0 + .4byte TwoIsland_JoyfulGameCorner_MapEvents @ 0x83BE5EC + .4byte TwoIsland_JoyfulGameCorner_MapScripts @ 0x81713D0 .4byte NULL .2byte BGM_FRLG_GAMECORNER .2byte 272 diff --git a/data/maps/TwoIsland_PokemonCenter_1F/header.inc b/data/maps/TwoIsland_PokemonCenter_1F/header.inc index 294f0ea5b..8999f1fae 100644 --- a/data/maps/TwoIsland_PokemonCenter_1F/header.inc +++ b/data/maps/TwoIsland_PokemonCenter_1F/header.inc @@ -1,7 +1,7 @@ TwoIsland_PokemonCenter_1F:: @ 8351C30 .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte gMapEvents_TwoIsland_PokemonCenter_1F @ 0x83BE68C - .4byte gMapScripts_TwoIsland_PokemonCenter_1F @ 0x81717B4 + .4byte TwoIsland_PokemonCenter_1F_MapEvents @ 0x83BE68C + .4byte TwoIsland_PokemonCenter_1F_MapScripts @ 0x81717B4 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 8 diff --git a/data/maps/TwoIsland_PokemonCenter_2F/header.inc b/data/maps/TwoIsland_PokemonCenter_2F/header.inc index 27c60df4b..4c690b5ac 100644 --- a/data/maps/TwoIsland_PokemonCenter_2F/header.inc +++ b/data/maps/TwoIsland_PokemonCenter_2F/header.inc @@ -1,7 +1,7 @@ TwoIsland_PokemonCenter_2F:: @ 8351C4C .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte gMapEvents_TwoIsland_PokemonCenter_2F @ 0x83BE718 - .4byte gMapScripts_TwoIsland_PokemonCenter_2F @ 0x81717DE + .4byte TwoIsland_PokemonCenter_2F_MapEvents @ 0x83BE718 + .4byte TwoIsland_PokemonCenter_2F_MapScripts @ 0x81717DE .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 9 diff --git a/data/maps/UndergroundPath_EastEntrance/header.inc b/data/maps/UndergroundPath_EastEntrance/header.inc index 6a2c0105d..298cbfe9d 100644 --- a/data/maps/UndergroundPath_EastEntrance/header.inc +++ b/data/maps/UndergroundPath_EastEntrance/header.inc @@ -1,7 +1,7 @@ UndergroundPath_EastEntrance:: @ 834F5E8 .4byte UndergroundPath_Entrance_Layout @ 0x8319414 - .4byte gMapEvents_UndergroundPath_EastEntrance @ 0x83AF430 - .4byte gMapScripts_UndergroundPath_EastEntrance @ 0x8160EDD + .4byte UndergroundPath_EastEntrance_MapEvents @ 0x83AF430 + .4byte UndergroundPath_EastEntrance_MapScripts @ 0x8160EDD .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 172 diff --git a/data/maps/UndergroundPath_EastWestTunnel/header.inc b/data/maps/UndergroundPath_EastWestTunnel/header.inc index 2dc7454b8..bd5afdf6d 100644 --- a/data/maps/UndergroundPath_EastWestTunnel/header.inc +++ b/data/maps/UndergroundPath_EastWestTunnel/header.inc @@ -1,7 +1,7 @@ UndergroundPath_EastWestTunnel:: @ 834F5CC .4byte UndergroundPath_EastWestTunnel_Layout @ 0x8319898 - .4byte gMapEvents_UndergroundPath_EastWestTunnel @ 0x83AF3E4 - .4byte gMapScripts_UndergroundPath_EastWestTunnel @ 0x8160ED3 + .4byte UndergroundPath_EastWestTunnel_MapEvents @ 0x83AF3E4 + .4byte UndergroundPath_EastWestTunnel_MapScripts @ 0x8160ED3 .4byte NULL .2byte BGM_FRLG_ROUTE_1 .2byte 173 diff --git a/data/maps/UndergroundPath_NorthEntrance/header.inc b/data/maps/UndergroundPath_NorthEntrance/header.inc index 5b6b9b3b8..242d5ece9 100644 --- a/data/maps/UndergroundPath_NorthEntrance/header.inc +++ b/data/maps/UndergroundPath_NorthEntrance/header.inc @@ -1,7 +1,7 @@ UndergroundPath_NorthEntrance:: @ 834F55C .4byte UndergroundPath_Entrance_Layout @ 0x8319414 - .4byte gMapEvents_UndergroundPath_NorthEntrance @ 0x83AF25C - .4byte gMapScripts_UndergroundPath_NorthEntrance @ 0x8160E38 + .4byte UndergroundPath_NorthEntrance_MapEvents @ 0x83AF25C + .4byte UndergroundPath_NorthEntrance_MapScripts @ 0x8160E38 .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 172 diff --git a/data/maps/UndergroundPath_NorthSouthTunnel/header.inc b/data/maps/UndergroundPath_NorthSouthTunnel/header.inc index 02f7553ba..9ffc1d01b 100644 --- a/data/maps/UndergroundPath_NorthSouthTunnel/header.inc +++ b/data/maps/UndergroundPath_NorthSouthTunnel/header.inc @@ -1,7 +1,7 @@ UndergroundPath_NorthSouthTunnel:: @ 834F578 .4byte UndergroundPath_NorthSouthTunnel_Layout @ 0x8319CAC - .4byte gMapEvents_UndergroundPath_NorthSouthTunnel @ 0x83AF2D4 - .4byte gMapScripts_UndergroundPath_NorthSouthTunnel @ 0x8160EB5 + .4byte UndergroundPath_NorthSouthTunnel_MapEvents @ 0x83AF2D4 + .4byte UndergroundPath_NorthSouthTunnel_MapScripts @ 0x8160EB5 .4byte NULL .2byte BGM_FRLG_ROUTE_1 .2byte 174 diff --git a/data/maps/UndergroundPath_SouthEntrance/header.inc b/data/maps/UndergroundPath_SouthEntrance/header.inc index 3811bc87d..4e0ef3d33 100644 --- a/data/maps/UndergroundPath_SouthEntrance/header.inc +++ b/data/maps/UndergroundPath_SouthEntrance/header.inc @@ -1,7 +1,7 @@ UndergroundPath_SouthEntrance:: @ 834F594 .4byte UndergroundPath_Entrance_Layout @ 0x8319414 - .4byte gMapEvents_UndergroundPath_SouthEntrance @ 0x83AF320 - .4byte gMapScripts_UndergroundPath_SouthEntrance @ 0x8160EBF + .4byte UndergroundPath_SouthEntrance_MapEvents @ 0x83AF320 + .4byte UndergroundPath_SouthEntrance_MapScripts @ 0x8160EBF .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 172 diff --git a/data/maps/UndergroundPath_WestEntrance/header.inc b/data/maps/UndergroundPath_WestEntrance/header.inc index ed95def83..9ebfd9946 100644 --- a/data/maps/UndergroundPath_WestEntrance/header.inc +++ b/data/maps/UndergroundPath_WestEntrance/header.inc @@ -1,7 +1,7 @@ UndergroundPath_WestEntrance:: @ 834F5B0 .4byte UndergroundPath_Entrance_Layout @ 0x8319414 - .4byte gMapEvents_UndergroundPath_WestEntrance @ 0x83AF36C - .4byte gMapScripts_UndergroundPath_WestEntrance @ 0x8160EC9 + .4byte UndergroundPath_WestEntrance_MapEvents @ 0x83AF36C + .4byte UndergroundPath_WestEntrance_MapScripts @ 0x8160EC9 .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 172 diff --git a/data/maps/UnknownMap_00_00/header.inc b/data/maps/UnknownMap_00_00/header.inc index 1746127c8..a43fc1ec3 100644 --- a/data/maps/UnknownMap_00_00/header.inc +++ b/data/maps/UnknownMap_00_00/header.inc @@ -1,7 +1,7 @@ UnknownMap_00_00:: @ 834F188 .4byte UnknownMap_00_00_Layout @ 0x82D89E8 - .4byte gMapEvents_UnknownMap_00_00 @ 0x83AE0DC - .4byte gMapScripts_UnknownMap_00_00 @ 0x8160478 + .4byte UnknownMap_00_00_MapEvents @ 0x83AE0DC + .4byte UnknownMap_00_00_MapScripts @ 0x8160478 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 47 diff --git a/data/maps/UnknownMap_00_01/header.inc b/data/maps/UnknownMap_00_01/header.inc index 8f6f03655..2e012f5d3 100644 --- a/data/maps/UnknownMap_00_01/header.inc +++ b/data/maps/UnknownMap_00_01/header.inc @@ -1,7 +1,7 @@ UnknownMap_00_01:: @ 834F1A4 .4byte UnknownMap_00_01_Layout @ 0x82D8AE4 - .4byte gMapEvents_UnknownMap_00_01 @ 0x83AE138 - .4byte gMapScripts_UnknownMap_00_01 @ 0x8160479 + .4byte UnknownMap_00_01_MapEvents @ 0x83AE138 + .4byte UnknownMap_00_01_MapScripts @ 0x8160479 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 48 diff --git a/data/maps/UnknownMap_00_02/header.inc b/data/maps/UnknownMap_00_02/header.inc index 5616915ee..39a06131d 100644 --- a/data/maps/UnknownMap_00_02/header.inc +++ b/data/maps/UnknownMap_00_02/header.inc @@ -1,7 +1,7 @@ UnknownMap_00_02:: @ 834F1C0 .4byte UnknownMap_00_02_Layout @ 0x82D8C98 - .4byte gMapEvents_UnknownMap_00_02 @ 0x83AE1C4 - .4byte gMapScripts_UnknownMap_00_02 @ 0x816047A + .4byte UnknownMap_00_02_MapEvents @ 0x83AE1C4 + .4byte UnknownMap_00_02_MapScripts @ 0x816047A .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 49 diff --git a/data/maps/UnknownMap_00_03/header.inc b/data/maps/UnknownMap_00_03/header.inc index 40833172f..df701c238 100644 --- a/data/maps/UnknownMap_00_03/header.inc +++ b/data/maps/UnknownMap_00_03/header.inc @@ -1,7 +1,7 @@ UnknownMap_00_03:: @ 834F1DC .4byte UnknownMap_00_03_Layout @ 0x82D8DB8 - .4byte gMapEvents_UnknownMap_00_03 @ 0x83AE238 - .4byte gMapScripts_UnknownMap_00_03 @ 0x816047B + .4byte UnknownMap_00_03_MapEvents @ 0x83AE238 + .4byte UnknownMap_00_03_MapScripts @ 0x816047B .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 50 diff --git a/data/maps/UnknownMap_00_04/header.inc b/data/maps/UnknownMap_00_04/header.inc index 9e86235c6..585175a4d 100644 --- a/data/maps/UnknownMap_00_04/header.inc +++ b/data/maps/UnknownMap_00_04/header.inc @@ -1,7 +1,7 @@ UnknownMap_00_04:: @ 834F1F8 .4byte UnknownMap_00_04_Layout @ 0x83388C4 - .4byte gMapEvents_UnknownMap_00_04 @ 0x83AE32C - .4byte gMapScripts_UnknownMap_00_04 @ 0x816047C + .4byte UnknownMap_00_04_MapEvents @ 0x83AE32C + .4byte UnknownMap_00_04_MapScripts @ 0x816047C .4byte NULL .2byte BGM_FRLG_UNION_ROOM .2byte 262 diff --git a/data/maps/UnknownMap_03_50/header.inc b/data/maps/UnknownMap_03_50/header.inc index 8a6415bba..f58894d13 100644 --- a/data/maps/UnknownMap_03_50/header.inc +++ b/data/maps/UnknownMap_03_50/header.inc @@ -1,7 +1,7 @@ UnknownMap_03_50:: @ 8350B90 .4byte UnknownMap_03_50_Layout @ 0x83283A8 - .4byte gMapEvents_UnknownMap_03_50 @ 0x83B8B24 - .4byte gMapScripts_UnknownMap_03_50 @ 0x81687E0 + .4byte UnknownMap_03_50_MapEvents @ 0x83B8B24 + .4byte UnknownMap_03_50_MapScripts @ 0x81687E0 .4byte UnknownMap_03_50_MapConnections @ 0x8352D8C .2byte BGM_FRLG_SEVII_ISLANDS .2byte 242 diff --git a/data/maps/UnknownMap_03_51/header.inc b/data/maps/UnknownMap_03_51/header.inc index 97cd42f9e..e7defa615 100644 --- a/data/maps/UnknownMap_03_51/header.inc +++ b/data/maps/UnknownMap_03_51/header.inc @@ -1,7 +1,7 @@ UnknownMap_03_51:: @ 8350BAC .4byte UnknownMap_03_51_Layout @ 0x83283D0 - .4byte gMapEvents_UnknownMap_03_51 @ 0x83B8B38 - .4byte gMapScripts_UnknownMap_03_51 @ 0x81687E1 + .4byte UnknownMap_03_51_MapEvents @ 0x83B8B38 + .4byte UnknownMap_03_51_MapScripts @ 0x81687E1 .4byte UnknownMap_03_51_MapConnections @ 0x8352DA0 .2byte BGM_FRLG_SEVII_ISLANDS .2byte 243 diff --git a/data/maps/UnknownMap_03_52/header.inc b/data/maps/UnknownMap_03_52/header.inc index 2ab4b7e8b..097de23cb 100644 --- a/data/maps/UnknownMap_03_52/header.inc +++ b/data/maps/UnknownMap_03_52/header.inc @@ -1,7 +1,7 @@ UnknownMap_03_52:: @ 8350BC8 .4byte UnknownMap_03_52_Layout @ 0x8329114 - .4byte gMapEvents_UnknownMap_03_52 @ 0x83B8B4C - .4byte gMapScripts_UnknownMap_03_52 @ 0x81687E2 + .4byte UnknownMap_03_52_MapEvents @ 0x83B8B4C + .4byte UnknownMap_03_52_MapScripts @ 0x81687E2 .4byte NULL .2byte BGM_FRLG_SEVII_ISLANDS .2byte 244 diff --git a/data/maps/UnknownMap_03_53/header.inc b/data/maps/UnknownMap_03_53/header.inc index 9ff13c2a4..22e8c0e98 100644 --- a/data/maps/UnknownMap_03_53/header.inc +++ b/data/maps/UnknownMap_03_53/header.inc @@ -1,7 +1,7 @@ UnknownMap_03_53:: @ 8350BE4 .4byte UnknownMap_03_53_Layout @ 0x8329C78 - .4byte gMapEvents_UnknownMap_03_53 @ 0x83B8B60 - .4byte gMapScripts_UnknownMap_03_53 @ 0x81687E3 + .4byte UnknownMap_03_53_MapEvents @ 0x83B8B60 + .4byte UnknownMap_03_53_MapScripts @ 0x81687E3 .4byte NULL .2byte BGM_FRLG_SEVII_ISLANDS .2byte 245 diff --git a/data/maps/UnknownMap_18_01/header.inc b/data/maps/UnknownMap_18_01/header.inc index 23c7c3a83..02fb72d6f 100644 --- a/data/maps/UnknownMap_18_01/header.inc +++ b/data/maps/UnknownMap_18_01/header.inc @@ -1,7 +1,7 @@ UnknownMap_18_01:: @ 835185C .4byte House2_Layout @ 0x82D5840 - .4byte gMapEvents_UnknownMap_18_01 @ 0x83BD758 - .4byte gMapScripts_UnknownMap_18_01 @ 0x816FA8C + .4byte UnknownMap_18_01_MapEvents @ 0x83BD758 + .4byte UnknownMap_18_01_MapScripts @ 0x816FA8C .4byte NULL .2byte BGM_FRLG_ROUTE_3 .2byte 7 diff --git a/data/maps/UnusedHouse_27_00/header.inc b/data/maps/UnusedHouse_27_00/header.inc index f4032f2f3..27571a106 100644 --- a/data/maps/UnusedHouse_27_00/header.inc +++ b/data/maps/UnusedHouse_27_00/header.inc @@ -1,7 +1,7 @@ UnusedHouse_27_00:: @ 8351A38 .4byte House2_Layout @ 0x82D5840 - .4byte gMapEvents_UnusedHouse_27_00 @ 0x83BDF30 - .4byte gMapScripts_UnusedHouse_27_00 @ 0x81704FA + .4byte UnusedHouse_27_00_MapEvents @ 0x83BDF30 + .4byte UnusedHouse_27_00_MapScripts @ 0x81704FA .4byte NULL .2byte BGM_FRLG_ROUTE_3 .2byte 7 diff --git a/data/maps/UnusedHouse_29_00/header.inc b/data/maps/UnusedHouse_29_00/header.inc index 65f677125..79c745105 100644 --- a/data/maps/UnusedHouse_29_00/header.inc +++ b/data/maps/UnusedHouse_29_00/header.inc @@ -1,7 +1,7 @@ UnusedHouse_29_00:: @ 8351A70 .4byte House2_Layout @ 0x82D5840 - .4byte gMapEvents_UnusedHouse_29_00 @ 0x83BDFA0 - .4byte gMapScripts_UnusedHouse_29_00 @ 0x8170522 + .4byte UnusedHouse_29_00_MapEvents @ 0x83BDFA0 + .4byte UnusedHouse_29_00_MapScripts @ 0x8170522 .4byte NULL .2byte BGM_FRLG_INDIGO_PLATEAU .2byte 7 diff --git a/data/maps/UnusedHouse_31_05/header.inc b/data/maps/UnusedHouse_31_05/header.inc index 71d619417..ad4098e09 100644 --- a/data/maps/UnusedHouse_31_05/header.inc +++ b/data/maps/UnusedHouse_31_05/header.inc @@ -1,7 +1,7 @@ UnusedHouse_31_05:: @ 8351B34 .4byte House4_Layout @ 0x82D6070 - .4byte gMapEvents_UnusedHouse_31_05 @ 0x83BE254 - .4byte gMapScripts_UnusedHouse_31_05 @ 0x8170BE3 + .4byte UnusedHouse_31_05_MapEvents @ 0x83BE254 + .4byte UnusedHouse_31_05_MapScripts @ 0x8170BE3 .4byte NULL .2byte BGM_FRLG_ISLAND_SIX .2byte 13 diff --git a/data/maps/VermilionCity/header.inc b/data/maps/VermilionCity/header.inc index a2ce4787e..efc42750d 100644 --- a/data/maps/VermilionCity/header.inc +++ b/data/maps/VermilionCity/header.inc @@ -1,7 +1,7 @@ VermilionCity:: @ 83506A4 .4byte VermilionCity_Layout @ 0x82E1534 - .4byte gMapEvents_VermilionCity @ 0x83B5648 - .4byte gMapScripts_VermilionCity @ 0x81668DC + .4byte VermilionCity_MapEvents @ 0x83B5648 + .4byte VermilionCity_MapScripts @ 0x81668DC .4byte VermilionCity_MapConnections @ 0x835283C .2byte BGM_FRLG_VERMILION_CITY .2byte 83 diff --git a/data/maps/VermilionCity_Gym/header.inc b/data/maps/VermilionCity_Gym/header.inc index a3cf66201..d80a1d2f1 100644 --- a/data/maps/VermilionCity_Gym/header.inc +++ b/data/maps/VermilionCity_Gym/header.inc @@ -1,7 +1,7 @@ VermilionCity_Gym:: @ 83511B0 .4byte VermilionCity_Gym_Layout @ 0x82D6E28 - .4byte gMapEvents_VermilionCity_Gym @ 0x83BAFD0 - .4byte gMapScripts_VermilionCity_Gym @ 0x816B69E + .4byte VermilionCity_Gym_MapEvents @ 0x83BAFD0 + .4byte VermilionCity_Gym_MapScripts @ 0x816B69E .4byte NULL .2byte BGM_FRLG_GYM .2byte 25 diff --git a/data/maps/VermilionCity_House1/header.inc b/data/maps/VermilionCity_House1/header.inc index 73adfa317..789b28501 100644 --- a/data/maps/VermilionCity_House1/header.inc +++ b/data/maps/VermilionCity_House1/header.inc @@ -1,7 +1,7 @@ VermilionCity_House1:: @ 8351108 .4byte House1_Layout @ 0x82D5754 - .4byte gMapEvents_VermilionCity_House1 @ 0x83BAB6C - .4byte gMapScripts_VermilionCity_House1 @ 0x816B3A6 + .4byte VermilionCity_House1_MapEvents @ 0x83BAB6C + .4byte VermilionCity_House1_MapScripts @ 0x816B3A6 .4byte NULL .2byte BGM_FRLG_CERULEAN_CITY .2byte 6 diff --git a/data/maps/VermilionCity_House2/header.inc b/data/maps/VermilionCity_House2/header.inc index d80ed7c4f..a536abeb6 100644 --- a/data/maps/VermilionCity_House2/header.inc +++ b/data/maps/VermilionCity_House2/header.inc @@ -1,7 +1,7 @@ VermilionCity_House2:: @ 8351178 .4byte House1_Layout @ 0x82D5754 - .4byte gMapEvents_VermilionCity_House2 @ 0x83BADEC - .4byte gMapScripts_VermilionCity_House2 @ 0x816B5D6 + .4byte VermilionCity_House2_MapEvents @ 0x83BADEC + .4byte VermilionCity_House2_MapScripts @ 0x816B5D6 .4byte NULL .2byte BGM_FRLG_VERMILION_CITY .2byte 6 diff --git a/data/maps/VermilionCity_House3/header.inc b/data/maps/VermilionCity_House3/header.inc index 739ca82ff..2ab2f1ee8 100644 --- a/data/maps/VermilionCity_House3/header.inc +++ b/data/maps/VermilionCity_House3/header.inc @@ -1,7 +1,7 @@ VermilionCity_House3:: @ 83511CC .4byte House1_Layout @ 0x82D5754 - .4byte gMapEvents_VermilionCity_House3 @ 0x83BB068 - .4byte gMapScripts_VermilionCity_House3 @ 0x816BAA9 + .4byte VermilionCity_House3_MapEvents @ 0x83BB068 + .4byte VermilionCity_House3_MapScripts @ 0x816BAA9 .4byte NULL .2byte BGM_FRLG_VERMILION_CITY .2byte 6 diff --git a/data/maps/VermilionCity_Mart/header.inc b/data/maps/VermilionCity_Mart/header.inc index 06b0c1a40..d82ee87a5 100644 --- a/data/maps/VermilionCity_Mart/header.inc +++ b/data/maps/VermilionCity_Mart/header.inc @@ -1,7 +1,7 @@ VermilionCity_Mart:: @ 8351194 .4byte Mart_Layout @ 0x82D5BCC - .4byte gMapEvents_VermilionCity_Mart @ 0x83BAE60 - .4byte gMapScripts_VermilionCity_Mart @ 0x816B653 + .4byte VermilionCity_Mart_MapEvents @ 0x83BAE60 + .4byte VermilionCity_Mart_MapScripts @ 0x816B653 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 10 diff --git a/data/maps/VermilionCity_PokemonCenter_1F/header.inc b/data/maps/VermilionCity_PokemonCenter_1F/header.inc index 0c20e889c..4f6333c60 100644 --- a/data/maps/VermilionCity_PokemonCenter_1F/header.inc +++ b/data/maps/VermilionCity_PokemonCenter_1F/header.inc @@ -1,7 +1,7 @@ VermilionCity_PokemonCenter_1F:: @ 8351124 .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte gMapEvents_VermilionCity_PokemonCenter_1F @ 0x83BAC48 - .4byte gMapScripts_VermilionCity_PokemonCenter_1F @ 0x816B424 + .4byte VermilionCity_PokemonCenter_1F_MapEvents @ 0x83BAC48 + .4byte VermilionCity_PokemonCenter_1F_MapScripts @ 0x816B424 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 8 diff --git a/data/maps/VermilionCity_PokemonCenter_2F/header.inc b/data/maps/VermilionCity_PokemonCenter_2F/header.inc index 34192d487..7cb7acc59 100644 --- a/data/maps/VermilionCity_PokemonCenter_2F/header.inc +++ b/data/maps/VermilionCity_PokemonCenter_2F/header.inc @@ -1,7 +1,7 @@ VermilionCity_PokemonCenter_2F:: @ 8351140 .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte gMapEvents_VermilionCity_PokemonCenter_2F @ 0x83BACD4 - .4byte gMapScripts_VermilionCity_PokemonCenter_2F @ 0x816B457 + .4byte VermilionCity_PokemonCenter_2F_MapEvents @ 0x83BACD4 + .4byte VermilionCity_PokemonCenter_2F_MapScripts @ 0x816B457 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 9 diff --git a/data/maps/VermilionCity_PokemonFanClub/header.inc b/data/maps/VermilionCity_PokemonFanClub/header.inc index df116263d..930f0d08f 100644 --- a/data/maps/VermilionCity_PokemonFanClub/header.inc +++ b/data/maps/VermilionCity_PokemonFanClub/header.inc @@ -1,7 +1,7 @@ VermilionCity_PokemonFanClub:: @ 835115C .4byte VermilionCity_PokemonFanClub_Layout @ 0x833ABC8 - .4byte gMapEvents_VermilionCity_PokemonFanClub @ 0x83BADA8 - .4byte gMapScripts_VermilionCity_PokemonFanClub @ 0x816B47E + .4byte VermilionCity_PokemonFanClub_MapEvents @ 0x83BADA8 + .4byte VermilionCity_PokemonFanClub_MapScripts @ 0x816B47E .4byte NULL .2byte BGM_FRLG_VERMILION_CITY .2byte 273 diff --git a/data/maps/VictoryRoad_1F/header.inc b/data/maps/VictoryRoad_1F/header.inc index 8717475ee..8c6c1c85c 100644 --- a/data/maps/VictoryRoad_1F/header.inc +++ b/data/maps/VictoryRoad_1F/header.inc @@ -1,7 +1,7 @@ VictoryRoad_1F:: @ 834F658 .4byte VictoryRoad_1F_Layout @ 0x83043CC - .4byte gMapEvents_VictoryRoad_1F @ 0x83AF5C0 - .4byte gMapScripts_VictoryRoad_1F @ 0x8160F05 + .4byte VictoryRoad_1F_MapEvents @ 0x83AF5C0 + .4byte VictoryRoad_1F_MapScripts @ 0x8160F05 .4byte NULL .2byte BGM_FRLG_MT_MOON .2byte 125 diff --git a/data/maps/VictoryRoad_2F/header.inc b/data/maps/VictoryRoad_2F/header.inc index 6d96addf8..5c1c06256 100644 --- a/data/maps/VictoryRoad_2F/header.inc +++ b/data/maps/VictoryRoad_2F/header.inc @@ -1,7 +1,7 @@ VictoryRoad_2F:: @ 834F674 .4byte VictoryRoad_2F_Layout @ 0x8304CB4 - .4byte gMapEvents_VictoryRoad_2F @ 0x83AF774 - .4byte gMapScripts_VictoryRoad_2F @ 0x8160F92 + .4byte VictoryRoad_2F_MapEvents @ 0x83AF774 + .4byte VictoryRoad_2F_MapScripts @ 0x8160F92 .4byte NULL .2byte BGM_FRLG_MT_MOON .2byte 126 diff --git a/data/maps/VictoryRoad_3F/header.inc b/data/maps/VictoryRoad_3F/header.inc index 7e23cd6ee..85fb25b59 100644 --- a/data/maps/VictoryRoad_3F/header.inc +++ b/data/maps/VictoryRoad_3F/header.inc @@ -1,7 +1,7 @@ VictoryRoad_3F:: @ 834F690 .4byte VictoryRoad_3F_Layout @ 0x8305494 - .4byte gMapEvents_VictoryRoad_3F @ 0x83AF8E0 - .4byte gMapScripts_VictoryRoad_3F @ 0x81610AA + .4byte VictoryRoad_3F_MapEvents @ 0x83AF8E0 + .4byte VictoryRoad_3F_MapScripts @ 0x81610AA .4byte NULL .2byte BGM_FRLG_MT_MOON .2byte 127 diff --git a/data/maps/ViridianCity/header.inc b/data/maps/ViridianCity/header.inc index a2442e278..6c027f11f 100644 --- a/data/maps/ViridianCity/header.inc +++ b/data/maps/ViridianCity/header.inc @@ -1,7 +1,7 @@ ViridianCity:: @ 8350634 .4byte ViridianCity_Layout @ 0x82DE3E4 - .4byte gMapEvents_ViridianCity @ 0x83B4FE0 - .4byte gMapScripts_ViridianCity @ 0x81658D3 + .4byte ViridianCity_MapEvents @ 0x83B4FE0 + .4byte ViridianCity_MapScripts @ 0x81658D3 .4byte ViridianCity_MapConnections @ 0x8352798 .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 79 diff --git a/data/maps/ViridianCity_Gym/header.inc b/data/maps/ViridianCity_Gym/header.inc index 52708bd39..5edc31d15 100644 --- a/data/maps/ViridianCity_Gym/header.inc +++ b/data/maps/ViridianCity_Gym/header.inc @@ -1,7 +1,7 @@ ViridianCity_Gym:: @ 8350DDC .4byte ViridianCity_Gym_Layout @ 0x82D86AC - .4byte gMapEvents_ViridianCity_Gym @ 0x83B9B78 - .4byte gMapScripts_ViridianCity_Gym @ 0x8169EC9 + .4byte ViridianCity_Gym_MapEvents @ 0x83B9B78 + .4byte ViridianCity_Gym_MapScripts @ 0x8169EC9 .4byte NULL .2byte BGM_FRLG_GYM .2byte 37 diff --git a/data/maps/ViridianCity_House1/header.inc b/data/maps/ViridianCity_House1/header.inc index a1112bfd1..e29f218c9 100644 --- a/data/maps/ViridianCity_House1/header.inc +++ b/data/maps/ViridianCity_House1/header.inc @@ -1,7 +1,7 @@ ViridianCity_House1:: @ 8350DC0 .4byte ViridianCity_House1_Layout @ 0x833AEAC - .4byte gMapEvents_ViridianCity_House1 @ 0x83B9A38 - .4byte gMapScripts_ViridianCity_House1 @ 0x8169E9A + .4byte ViridianCity_House1_MapEvents @ 0x83B9A38 + .4byte ViridianCity_House1_MapScripts @ 0x8169E9A .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 276 diff --git a/data/maps/ViridianCity_House2/header.inc b/data/maps/ViridianCity_House2/header.inc index 62019f35e..c45bfff14 100644 --- a/data/maps/ViridianCity_House2/header.inc +++ b/data/maps/ViridianCity_House2/header.inc @@ -1,7 +1,7 @@ ViridianCity_House2:: @ 8350DF8 .4byte ViridianCity_House2_Layout @ 0x8338D20 - .4byte gMapEvents_ViridianCity_House2 @ 0x83B9C10 - .4byte gMapScripts_ViridianCity_House2 @ 0x816A07C + .4byte ViridianCity_House2_MapEvents @ 0x83B9C10 + .4byte ViridianCity_House2_MapScripts @ 0x816A07C .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 266 diff --git a/data/maps/ViridianCity_Mart/header.inc b/data/maps/ViridianCity_Mart/header.inc index 7b250540a..29cfbf0d0 100644 --- a/data/maps/ViridianCity_Mart/header.inc +++ b/data/maps/ViridianCity_Mart/header.inc @@ -1,7 +1,7 @@ ViridianCity_Mart:: @ 8350E14 .4byte Mart_Layout @ 0x82D5BCC - .4byte gMapEvents_ViridianCity_Mart @ 0x83B9C84 - .4byte gMapScripts_ViridianCity_Mart @ 0x816A1D3 + .4byte ViridianCity_Mart_MapEvents @ 0x83B9C84 + .4byte ViridianCity_Mart_MapScripts @ 0x816A1D3 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 10 diff --git a/data/maps/ViridianCity_PokemonCenter_1F/header.inc b/data/maps/ViridianCity_PokemonCenter_1F/header.inc index 3910c6ea9..6e26020eb 100644 --- a/data/maps/ViridianCity_PokemonCenter_1F/header.inc +++ b/data/maps/ViridianCity_PokemonCenter_1F/header.inc @@ -1,7 +1,7 @@ ViridianCity_PokemonCenter_1F:: @ 8350E30 .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte gMapEvents_ViridianCity_PokemonCenter_1F @ 0x83B9D18 - .4byte gMapScripts_ViridianCity_PokemonCenter_1F @ 0x816A2C0 + .4byte ViridianCity_PokemonCenter_1F_MapEvents @ 0x83B9D18 + .4byte ViridianCity_PokemonCenter_1F_MapScripts @ 0x816A2C0 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 8 diff --git a/data/maps/ViridianCity_PokemonCenter_2F/header.inc b/data/maps/ViridianCity_PokemonCenter_2F/header.inc index 3fa490a6e..0b1cdbcf7 100644 --- a/data/maps/ViridianCity_PokemonCenter_2F/header.inc +++ b/data/maps/ViridianCity_PokemonCenter_2F/header.inc @@ -1,7 +1,7 @@ ViridianCity_PokemonCenter_2F:: @ 8350E4C .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte gMapEvents_ViridianCity_PokemonCenter_2F @ 0x83B9DA4 - .4byte gMapScripts_ViridianCity_PokemonCenter_2F @ 0x816A2F3 + .4byte ViridianCity_PokemonCenter_2F_MapEvents @ 0x83B9DA4 + .4byte ViridianCity_PokemonCenter_2F_MapScripts @ 0x816A2F3 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 9 diff --git a/data/maps/ViridianForest/header.inc b/data/maps/ViridianForest/header.inc index 9a8cee281..db9e41ad1 100644 --- a/data/maps/ViridianForest/header.inc +++ b/data/maps/ViridianForest/header.inc @@ -1,7 +1,7 @@ ViridianForest:: @ 834F214 .4byte ViridianForest_Layout @ 0x82FE46C - .4byte gMapEvents_ViridianForest @ 0x83AE4D8 - .4byte gMapScripts_ViridianForest @ 0x816051F + .4byte ViridianForest_MapEvents @ 0x83AE4D8 + .4byte ViridianForest_MapScripts @ 0x816051F .4byte NULL .2byte BGM_FRLG_VIRIDIAN_FOREST .2byte 117 -- cgit v1.2.3 From fb1ae058073d64305cb5dbae873095febdd36d74 Mon Sep 17 00:00:00 2001 From: garak Date: Thu, 18 Apr 2019 12:08:12 -0400 Subject: move map events to map directories --- data/maps/BirthIsland_Exterior/events.inc | 9 + data/maps/BirthIsland_Harbor/events.inc | 9 + data/maps/CeladonCity/events.inc | 45 +++ data/maps/CeladonCity_Condominiums_1F/events.inc | 20 + data/maps/CeladonCity_Condominiums_2F/events.inc | 16 + data/maps/CeladonCity_Condominiums_3F/events.inc | 24 ++ data/maps/CeladonCity_Condominiums_Roof/events.inc | 11 + .../CeladonCity_Condominiums_RoofRoom/events.inc | 16 + .../maps/CeladonCity_DepartmentStore_1F/events.inc | 19 + .../maps/CeladonCity_DepartmentStore_2F/events.inc | 16 + .../maps/CeladonCity_DepartmentStore_3F/events.inc | 27 ++ .../maps/CeladonCity_DepartmentStore_4F/events.inc | 15 + .../maps/CeladonCity_DepartmentStore_5F/events.inc | 16 + .../events.inc | 10 + .../CeladonCity_DepartmentStore_Roof/events.inc | 15 + data/maps/CeladonCity_GameCorner/events.inc | 59 +++ .../CeladonCity_GameCorner_PrizeRoom/events.inc | 14 + data/maps/CeladonCity_Gym/events.inc | 24 ++ data/maps/CeladonCity_Hotel/events.inc | 13 + data/maps/CeladonCity_House1/events.inc | 12 + data/maps/CeladonCity_PokemonCenter_1F/events.inc | 14 + data/maps/CeladonCity_PokemonCenter_2F/events.inc | 13 + data/maps/CeladonCity_Restaurant/events.inc | 14 + data/maps/CeruleanCave_1F/events.inc | 26 ++ data/maps/CeruleanCave_2F/events.inc | 25 ++ data/maps/CeruleanCave_B1F/events.inc | 19 + data/maps/CeruleanCity/events.inc | 49 +++ data/maps/CeruleanCity_BikeShop/events.inc | 22 ++ data/maps/CeruleanCity_Gym/events.inc | 17 + data/maps/CeruleanCity_House1/events.inc | 11 + data/maps/CeruleanCity_House2/events.inc | 15 + data/maps/CeruleanCity_House3/events.inc | 11 + data/maps/CeruleanCity_House4/events.inc | 8 + data/maps/CeruleanCity_House5/events.inc | 11 + data/maps/CeruleanCity_Mart/events.inc | 12 + data/maps/CeruleanCity_PokemonCenter_1F/events.inc | 17 + data/maps/CeruleanCity_PokemonCenter_2F/events.inc | 13 + data/maps/CinnabarIsland/events.inc | 24 ++ data/maps/CinnabarIsland_Gym/events.inc | 35 ++ data/maps/CinnabarIsland_Mart/events.inc | 12 + .../CinnabarIsland_PokemonCenter_1F/events.inc | 17 + .../CinnabarIsland_PokemonCenter_2F/events.inc | 13 + .../CinnabarIsland_PokemonLab_Entrance/events.inc | 19 + .../events.inc | 9 + .../CinnabarIsland_PokemonLab_Lounge/events.inc | 10 + .../events.inc | 13 + data/maps/DiglettsCave_B1F/events.inc | 6 + data/maps/DiglettsCave_NorthEntrance/events.inc | 9 + data/maps/DiglettsCave_SouthEntrance/events.inc | 9 + data/maps/FiveIsland/events.inc | 16 + data/maps/FiveIsland_Harbor/events.inc | 9 + data/maps/FiveIsland_House1/events.inc | 8 + data/maps/FiveIsland_House2/events.inc | 8 + data/maps/FiveIsland_LostCave_Entrance/events.inc | 6 + data/maps/FiveIsland_LostCave_Room1/events.inc | 12 + data/maps/FiveIsland_LostCave_Room10/events.inc | 9 + data/maps/FiveIsland_LostCave_Room11/events.inc | 8 + data/maps/FiveIsland_LostCave_Room12/events.inc | 8 + data/maps/FiveIsland_LostCave_Room13/events.inc | 8 + data/maps/FiveIsland_LostCave_Room14/events.inc | 8 + data/maps/FiveIsland_LostCave_Room2/events.inc | 8 + data/maps/FiveIsland_LostCave_Room3/events.inc | 8 + data/maps/FiveIsland_LostCave_Room4/events.inc | 11 + data/maps/FiveIsland_LostCave_Room5/events.inc | 8 + data/maps/FiveIsland_LostCave_Room6/events.inc | 8 + data/maps/FiveIsland_LostCave_Room7/events.inc | 8 + data/maps/FiveIsland_LostCave_Room8/events.inc | 8 + data/maps/FiveIsland_LostCave_Room9/events.inc | 8 + data/maps/FiveIsland_Meadow/events.inc | 17 + data/maps/FiveIsland_MemorialPillar/events.inc | 16 + data/maps/FiveIsland_PokemonCenter_1F/events.inc | 13 + data/maps/FiveIsland_PokemonCenter_2F/events.inc | 13 + data/maps/FiveIsland_ResortGorgeous/events.inc | 23 ++ .../FiveIsland_ResortGorgeous_House/events.inc | 13 + data/maps/FiveIsland_WaterLabyrinth/events.inc | 6 + data/maps/FourIsland/events.inc | 32 ++ data/maps/FourIsland_Harbor/events.inc | 9 + data/maps/FourIsland_House1/events.inc | 9 + data/maps/FourIsland_House2/events.inc | 8 + data/maps/FourIsland_IcefallCave_1F/events.inc | 14 + .../FourIsland_IcefallCave_Entrance/events.inc | 7 + data/maps/FourIsland_LoreleisHouse/events.inc | 22 ++ data/maps/FourIsland_Mart/events.inc | 10 + data/maps/FourIsland_PokemonCenter_1F/events.inc | 16 + data/maps/FourIsland_PokemonCenter_2F/events.inc | 13 + data/maps/FourIsland_PokemonDayCare/events.inc | 8 + data/maps/FuchsiaCity/events.inc | 47 +++ data/maps/FuchsiaCity_Building1/events.inc | 19 + data/maps/FuchsiaCity_Gym/events.inc | 21 + data/maps/FuchsiaCity_House1/events.inc | 12 + data/maps/FuchsiaCity_House2/events.inc | 11 + data/maps/FuchsiaCity_House3/events.inc | 8 + data/maps/FuchsiaCity_Mart/events.inc | 12 + data/maps/FuchsiaCity_PokemonCenter_1F/events.inc | 14 + data/maps/FuchsiaCity_PokemonCenter_2F/events.inc | 13 + .../FuchsiaCity_SafariZone_Entrance/events.inc | 17 + data/maps/FuchsiaCity_ZooBuilding/events.inc | 13 + data/maps/IndigoPlateau_Exterior/events.inc | 9 + .../maps/IndigoPlateau_PokemonCenter_1F/events.inc | 17 + .../maps/IndigoPlateau_PokemonCenter_2F/events.inc | 13 + data/maps/LavenderTown/events.inc | 21 + data/maps/LavenderTown_House1/events.inc | 11 + data/maps/LavenderTown_House2/events.inc | 10 + data/maps/LavenderTown_Mart/events.inc | 13 + data/maps/LavenderTown_PokemonCenter_1F/events.inc | 15 + data/maps/LavenderTown_PokemonCenter_2F/events.inc | 13 + .../LavenderTown_VolunteerPokemonHouse/events.inc | 20 + data/maps/MtEmber_Exterior/events.inc | 41 ++ data/maps/MtEmber_RubyPath_B1F/events.inc | 12 + data/maps/MtEmber_RubyPath_B1F_Stairs/events.inc | 9 + data/maps/MtEmber_RubyPath_B2F/events.inc | 15 + data/maps/MtEmber_RubyPath_B2F_Stairs/events.inc | 10 + data/maps/MtEmber_RubyPath_B3F/events.inc | 19 + data/maps/MtEmber_RubyPath_B4F/events.inc | 34 ++ data/maps/MtEmber_RubyPath_B5F/events.inc | 11 + data/maps/MtEmber_Summit/events.inc | 12 + data/maps/MtEmber_SummitPath_1F/events.inc | 6 + data/maps/MtEmber_SummitPath_2F/events.inc | 17 + data/maps/MtEmber_SummitPath_3F/events.inc | 6 + data/maps/MtMoon_1F/events.inc | 27 ++ data/maps/MtMoon_B1F/events.inc | 20 + data/maps/MtMoon_B2F/events.inc | 28 ++ data/maps/NavelRock_1F/events.inc | 6 + data/maps/NavelRock_B1F/events.inc | 6 + data/maps/NavelRock_Base/events.inc | 8 + data/maps/NavelRock_BasePath_B10F/events.inc | 6 + data/maps/NavelRock_BasePath_B11F/events.inc | 6 + data/maps/NavelRock_BasePath_B1F/events.inc | 6 + data/maps/NavelRock_BasePath_B2F/events.inc | 6 + data/maps/NavelRock_BasePath_B3F/events.inc | 6 + data/maps/NavelRock_BasePath_B4F/events.inc | 6 + data/maps/NavelRock_BasePath_B5F/events.inc | 6 + data/maps/NavelRock_BasePath_B6F/events.inc | 6 + data/maps/NavelRock_BasePath_B7F/events.inc | 6 + data/maps/NavelRock_BasePath_B8F/events.inc | 6 + data/maps/NavelRock_BasePath_B9F/events.inc | 6 + data/maps/NavelRock_Exterior/events.inc | 6 + data/maps/NavelRock_Fork/events.inc | 7 + data/maps/NavelRock_Harbor/events.inc | 9 + data/maps/NavelRock_Summit/events.inc | 14 + data/maps/NavelRock_SummitPath_2F/events.inc | 6 + data/maps/NavelRock_SummitPath_3F/events.inc | 6 + data/maps/NavelRock_SummitPath_4F/events.inc | 6 + data/maps/NavelRock_SummitPath_5F/events.inc | 6 + data/maps/OneIsland/events.inc | 17 + data/maps/OneIsland_Harbor/events.inc | 9 + data/maps/OneIsland_House1/events.inc | 9 + data/maps/OneIsland_House2/events.inc | 8 + data/maps/OneIsland_KindleRoad/events.inc | 42 ++ data/maps/OneIsland_KindleRoad_EmberSpa/events.inc | 16 + data/maps/OneIsland_PokemonCenter_1F/events.inc | 31 ++ data/maps/OneIsland_PokemonCenter_2F/events.inc | 13 + data/maps/OneIsland_TreasureBeach/events.inc | 16 + data/maps/PalletTown/events.inc | 24 ++ data/maps/PalletTown_GarysHouse/events.inc | 16 + data/maps/PalletTown_PlayersHouse_1F/events.inc | 14 + data/maps/PalletTown_PlayersHouse_2F/events.inc | 10 + data/maps/PalletTown_ProfessorOaksLab/events.inc | 33 ++ data/maps/PewterCity/events.inc | 37 ++ data/maps/PewterCity_Gym/events.inc | 16 + data/maps/PewterCity_House1/events.inc | 12 + data/maps/PewterCity_House2/events.inc | 11 + data/maps/PewterCity_Mart/events.inc | 12 + data/maps/PewterCity_Museum_1F/events.inc | 29 ++ data/maps/PewterCity_Museum_2F/events.inc | 22 ++ data/maps/PewterCity_PokemonCenter_1F/events.inc | 17 + data/maps/PewterCity_PokemonCenter_2F/events.inc | 13 + data/maps/PokemonLeague_AgathasRoom/events.inc | 9 + data/maps/PokemonLeague_BrunosRoom/events.inc | 9 + data/maps/PokemonLeague_ChampionsRoom/events.inc | 10 + data/maps/PokemonLeague_HallOfFame/events.inc | 8 + data/maps/PokemonLeague_LancesRoom/events.inc | 9 + data/maps/PokemonLeague_LoreleisRoom/events.inc | 9 + data/maps/PokemonMansion_1F/events.inc | 25 ++ data/maps/PokemonMansion_2F/events.inc | 20 + data/maps/PokemonMansion_3F/events.inc | 23 ++ data/maps/PokemonMansion_B1F/events.inc | 19 + data/maps/PokemonTower_1F/events.inc | 15 + data/maps/PokemonTower_2F/events.inc | 14 + data/maps/PokemonTower_3F/events.inc | 12 + data/maps/PokemonTower_4F/events.inc | 14 + data/maps/PokemonTower_5F/events.inc | 37 ++ data/maps/PokemonTower_6F/events.inc | 17 + data/maps/PokemonTower_7F/events.inc | 14 + data/maps/PowerPlant/events.inc | 23 ++ data/maps/RockTunnel_1F/events.inc | 25 ++ data/maps/RockTunnel_B1F/events.inc | 36 ++ data/maps/RocketHideout_B1F/events.inc | 22 ++ data/maps/RocketHideout_B2F/events.inc | 16 + data/maps/RocketHideout_B3F/events.inc | 16 + data/maps/RocketHideout_B4F/events.inc | 22 ++ data/maps/RocketHideout_Elevator/events.inc | 9 + data/maps/Route1/events.inc | 9 + data/maps/Route10/events.inc | 31 ++ data/maps/Route10_PokemonCenter_1F/events.inc | 15 + data/maps/Route10_PokemonCenter_2F/events.inc | 13 + data/maps/Route11/events.inc | 26 ++ data/maps/Route11_EastEntrance_1F/events.inc | 13 + data/maps/Route11_EastEntrance_2F/events.inc | 13 + data/maps/Route12/events.inc | 31 ++ data/maps/Route12_FishingHouse/events.inc | 13 + data/maps/Route12_NorthEntrance_1F/events.inc | 12 + data/maps/Route12_NorthEntrance_2F/events.inc | 12 + data/maps/Route13/events.inc | 21 + data/maps/Route14/events.inc | 24 ++ data/maps/Route15/events.inc | 25 ++ data/maps/Route15_WestEntrance_1F/events.inc | 12 + data/maps/Route15_WestEntrance_2F/events.inc | 12 + data/maps/Route16/events.inc | 26 ++ data/maps/Route16_House/events.inc | 11 + data/maps/Route16_NorthEntrance_1F/events.inc | 26 ++ data/maps/Route16_NorthEntrance_2F/events.inc | 14 + data/maps/Route17/events.inc | 27 ++ data/maps/Route18/events.inc | 15 + data/maps/Route18_EastEntrance_1F/events.inc | 23 ++ data/maps/Route18_EastEntrance_2F/events.inc | 12 + data/maps/Route19/events.inc | 19 + data/maps/Route2/events.inc | 27 ++ data/maps/Route20/events.inc | 24 ++ data/maps/Route21_North/events.inc | 13 + data/maps/Route21_South/events.inc | 9 + data/maps/Route22/events.inc | 20 + data/maps/Route22_NorthEntrance/events.inc | 14 + data/maps/Route23/events.inc | 72 ++++ data/maps/Route24/events.inc | 19 + data/maps/Route25/events.inc | 27 ++ data/maps/Route25_SeaCottage/events.inc | 14 + data/maps/Route2_EastBuilding/events.inc | 12 + data/maps/Route2_House/events.inc | 11 + .../Route2_ViridianForest_NorthEntrance/events.inc | 13 + .../Route2_ViridianForest_SouthEntrance/events.inc | 12 + data/maps/Route3/events.inc | 17 + data/maps/Route4/events.inc | 23 ++ data/maps/Route4_PokemonCenter_1F/events.inc | 16 + data/maps/Route4_PokemonCenter_2F/events.inc | 13 + data/maps/Route5/events.inc | 11 + data/maps/Route5_PokemonDayCare/events.inc | 10 + data/maps/Route5_SouthEntrance/events.inc | 16 + data/maps/Route6/events.inc | 20 + data/maps/Route6_NorthEntrance/events.inc | 16 + data/maps/Route7/events.inc | 13 + data/maps/Route7_EastEntrance/events.inc | 16 + data/maps/Route8/events.inc | 29 ++ data/maps/Route8_WestEntrance/events.inc | 16 + data/maps/Route9/events.inc | 22 ++ data/maps/SSAnne_1F_Corridor/events.inc | 21 + data/maps/SSAnne_1F_Room1/events.inc | 8 + data/maps/SSAnne_1F_Room11/events.inc | 24 ++ data/maps/SSAnne_1F_Room12/events.inc | 5 + data/maps/SSAnne_1F_Room2/events.inc | 11 + data/maps/SSAnne_1F_Room3/events.inc | 10 + data/maps/SSAnne_1F_Room4/events.inc | 8 + data/maps/SSAnne_1F_Room5/events.inc | 8 + data/maps/SSAnne_1F_Room6/events.inc | 8 + data/maps/SSAnne_1F_Room7/events.inc | 8 + data/maps/SSAnne_2F_Corridor/events.inc | 22 ++ data/maps/SSAnne_2F_Room1/events.inc | 8 + data/maps/SSAnne_2F_Room2/events.inc | 10 + data/maps/SSAnne_2F_Room3/events.inc | 9 + data/maps/SSAnne_2F_Room4/events.inc | 10 + data/maps/SSAnne_2F_Room5/events.inc | 9 + data/maps/SSAnne_2F_Room6/events.inc | 9 + data/maps/SSAnne_3F_Corridor/events.inc | 10 + data/maps/SSAnne_B1F_Corridor/events.inc | 13 + data/maps/SSAnne_B1F_Room1/events.inc | 9 + data/maps/SSAnne_B1F_Room2/events.inc | 9 + data/maps/SSAnne_B1F_Room3/events.inc | 9 + data/maps/SSAnne_B1F_Room4/events.inc | 9 + data/maps/SSAnne_B1F_Room5/events.inc | 10 + data/maps/SSAnne_CaptainsOffice/events.inc | 13 + data/maps/SSAnne_CaptainsOffice2/events.inc | 11 + data/maps/SSAnne_CaptainsOffice3/events.inc | 16 + data/maps/SSAnne_CaptainsOffice4/events.inc | 49 +++ data/maps/SSAnne_CaptainsOffice5/events.inc | 8 + data/maps/SSAnne_CaptainsOffice9/events.inc | 12 + data/maps/SSAnne_Deck/events.inc | 13 + data/maps/SSAnne_Exterior/events.inc | 15 + data/maps/SSAnne_Kitchen/events.inc | 20 + data/maps/SSAnne_Kitchen3/events.inc | 14 + data/maps/SafariZone_Building1/events.inc | 11 + data/maps/SafariZone_Building2/events.inc | 12 + data/maps/SafariZone_Building3/events.inc | 13 + data/maps/SafariZone_Building4/events.inc | 12 + data/maps/SafariZone_Center/events.inc | 26 ++ data/maps/SafariZone_East/events.inc | 22 ++ data/maps/SafariZone_North/events.inc | 29 ++ data/maps/SafariZone_SecretHouse/events.inc | 10 + data/maps/SafariZone_West/events.inc | 28 ++ data/maps/SaffronCity/events.inc | 2 + data/maps/SaffronCity_Dojo/events.inc | 26 ++ data/maps/SaffronCity_Duplicate/events.inc | 47 +++ data/maps/SaffronCity_Gym/events.inc | 52 +++ data/maps/SaffronCity_House1_1F/events.inc | 13 + data/maps/SaffronCity_House1_2F/events.inc | 16 + data/maps/SaffronCity_House2/events.inc | 16 + data/maps/SaffronCity_House3/events.inc | 10 + data/maps/SaffronCity_Mart/events.inc | 12 + data/maps/SaffronCity_PokemonCenter_1F/events.inc | 16 + data/maps/SaffronCity_PokemonCenter_2F/events.inc | 13 + .../SaffronCity_PokemonTrainerFanClub/events.inc | 17 + data/maps/SeafoamIslands_1F/events.inc | 16 + data/maps/SeafoamIslands_B1F/events.inc | 21 + data/maps/SeafoamIslands_B2F/events.inc | 20 + data/maps/SeafoamIslands_B3F/events.inc | 24 ++ data/maps/SeafoamIslands_B4F/events.inc | 24 ++ data/maps/SevenIsland/events.inc | 16 + data/maps/SevenIsland_Harbor/events.inc | 9 + data/maps/SevenIsland_House_Room1/events.inc | 12 + data/maps/SevenIsland_House_Room2/events.inc | 8 + data/maps/SevenIsland_Mart/events.inc | 11 + data/maps/SevenIsland_PokemonCenter_1F/events.inc | 14 + data/maps/SevenIsland_PokemonCenter_2F/events.inc | 13 + .../events.inc | 23 ++ data/maps/SevenIsland_SevaultCanyon/events.inc | 32 ++ .../SevenIsland_SevaultCanyon_Entrance/events.inc | 15 + .../SevenIsland_SevaultCanyon_House/events.inc | 10 + data/maps/SevenIsland_TanobyRuins/events.inc | 23 ++ .../events.inc | 5 + .../events.inc | 5 + .../events.inc | 5 + .../SevenIsland_TanobyRuins_RixyChamber/events.inc | 5 + .../events.inc | 5 + .../events.inc | 5 + .../events.inc | 5 + data/maps/SevenIsland_TrainerTower/events.inc | 16 + data/maps/SevenIsland_TrainerTower_1F/events.inc | 18 + data/maps/SevenIsland_TrainerTower_2F/events.inc | 19 + data/maps/SevenIsland_TrainerTower_3F/events.inc | 19 + data/maps/SevenIsland_TrainerTower_4F/events.inc | 19 + data/maps/SevenIsland_TrainerTower_5F/events.inc | 19 + data/maps/SevenIsland_TrainerTower_6F/events.inc | 19 + data/maps/SevenIsland_TrainerTower_7F/events.inc | 19 + data/maps/SevenIsland_TrainerTower_8F/events.inc | 19 + .../SevenIsland_TrainerTower_Elevator/events.inc | 8 + .../maps/SevenIsland_TrainerTower_Lobby/events.inc | 20 + data/maps/SevenIsland_TrainerTower_Roof/events.inc | 9 + data/maps/SilphCo_10F/events.inc | 26 ++ data/maps/SilphCo_11F/events.inc | 27 ++ data/maps/SilphCo_1F/events.inc | 15 + data/maps/SilphCo_2F/events.inc | 30 ++ data/maps/SilphCo_3F/events.inc | 32 ++ data/maps/SilphCo_4F/events.inc | 33 ++ data/maps/SilphCo_5F/events.inc | 42 ++ data/maps/SilphCo_6F/events.inc | 29 ++ data/maps/SilphCo_7F/events.inc | 43 +++ data/maps/SilphCo_8F/events.inc | 27 ++ data/maps/SilphCo_9F/events.inc | 36 ++ data/maps/SilphCo_Elevator/events.inc | 8 + data/maps/SixIsland/events.inc | 16 + data/maps/SixIsland_DottedHole_B1F/events.inc | 12 + data/maps/SixIsland_DottedHole_B2F/events.inc | 12 + data/maps/SixIsland_DottedHole_B3F/events.inc | 12 + .../SixIsland_DottedHole_SapphireRoom/events.inc | 13 + data/maps/SixIsland_GreenPath/events.inc | 16 + data/maps/SixIsland_Harbor/events.inc | 9 + data/maps/SixIsland_House/events.inc | 8 + data/maps/SixIsland_Mart/events.inc | 10 + data/maps/SixIsland_OutcastIsland/events.inc | 18 + data/maps/SixIsland_PokemonCenter_1F/events.inc | 12 + data/maps/SixIsland_PokemonCenter_2F/events.inc | 13 + data/maps/SixIsland_RuinValley/events.inc | 27 ++ data/maps/SixIsland_WaterPath/events.inc | 24 ++ data/maps/SixIsland_WaterPath_House1/events.inc | 11 + data/maps/SixIsland_WaterPath_House2/events.inc | 8 + data/maps/ThreeIsland/events.inc | 43 +++ data/maps/ThreeIsland_BerryForest/events.inc | 40 ++ data/maps/ThreeIsland_BondBridge/events.inc | 24 ++ data/maps/ThreeIsland_DunsparceTunnel/events.inc | 12 + data/maps/ThreeIsland_Harbor/events.inc | 9 + data/maps/ThreeIsland_House1/events.inc | 11 + data/maps/ThreeIsland_House2/events.inc | 9 + data/maps/ThreeIsland_House3/events.inc | 8 + data/maps/ThreeIsland_House4/events.inc | 9 + data/maps/ThreeIsland_House5/events.inc | 8 + data/maps/ThreeIsland_Mart/events.inc | 11 + data/maps/ThreeIsland_PokemonCenter_1F/events.inc | 12 + data/maps/ThreeIsland_PokemonCenter_2F/events.inc | 13 + data/maps/ThreeIsland_Port/events.inc | 12 + data/maps/TwoIsland/events.inc | 24 ++ data/maps/TwoIsland_CapeBrink/events.inc | 9 + data/maps/TwoIsland_CapeBrink_House/events.inc | 8 + data/maps/TwoIsland_Harbor/events.inc | 9 + data/maps/TwoIsland_House/events.inc | 8 + data/maps/TwoIsland_JoyfulGameCorner/events.inc | 15 + data/maps/TwoIsland_PokemonCenter_1F/events.inc | 11 + data/maps/TwoIsland_PokemonCenter_2F/events.inc | 13 + data/maps/UndergroundPath_EastEntrance/events.inc | 11 + .../maps/UndergroundPath_EastWestTunnel/events.inc | 15 + data/maps/UndergroundPath_NorthEntrance/events.inc | 11 + .../UndergroundPath_NorthSouthTunnel/events.inc | 15 + data/maps/UndergroundPath_SouthEntrance/events.inc | 11 + data/maps/UndergroundPath_WestEntrance/events.inc | 11 + data/maps/UnknownMap_00_00/events.inc | 13 + data/maps/UnknownMap_00_01/events.inc | 13 + data/maps/UnknownMap_00_02/events.inc | 17 + data/maps/UnknownMap_00_03/events.inc | 14 + data/maps/UnknownMap_00_04/events.inc | 16 + data/maps/UnknownMap_03_50/events.inc | 2 + data/maps/UnknownMap_03_51/events.inc | 2 + data/maps/UnknownMap_03_52/events.inc | 2 + data/maps/UnknownMap_03_53/events.inc | 2 + data/maps/UnknownMap_18_01/events.inc | 2 + data/maps/UnusedHouse_27_00/events.inc | 2 + data/maps/UnusedHouse_29_00/events.inc | 2 + data/maps/UnusedHouse_31_05/events.inc | 2 + data/maps/VermilionCity/events.inc | 38 ++ data/maps/VermilionCity_Gym/events.inc | 33 ++ data/maps/VermilionCity_House1/events.inc | 10 + data/maps/VermilionCity_House2/events.inc | 10 + data/maps/VermilionCity_House3/events.inc | 16 + data/maps/VermilionCity_Mart/events.inc | 12 + .../maps/VermilionCity_PokemonCenter_1F/events.inc | 17 + .../maps/VermilionCity_PokemonCenter_2F/events.inc | 13 + data/maps/VermilionCity_PokemonFanClub/events.inc | 19 + data/maps/VictoryRoad_1F/events.inc | 22 ++ data/maps/VictoryRoad_2F/events.inc | 32 ++ data/maps/VictoryRoad_3F/events.inc | 26 ++ data/maps/ViridianCity/events.inc | 33 ++ data/maps/ViridianCity_Gym/events.inc | 24 ++ data/maps/ViridianCity_House1/events.inc | 15 + data/maps/ViridianCity_House2/events.inc | 18 + data/maps/ViridianCity_Mart/events.inc | 12 + data/maps/ViridianCity_PokemonCenter_1F/events.inc | 14 + data/maps/ViridianCity_PokemonCenter_2F/events.inc | 13 + data/maps/ViridianForest/events.inc | 33 ++ data/maps/events.inc | 425 +++++++++++++++++++++ 426 files changed, 7107 insertions(+) create mode 100644 data/maps/BirthIsland_Exterior/events.inc create mode 100644 data/maps/BirthIsland_Harbor/events.inc create mode 100644 data/maps/CeladonCity/events.inc create mode 100644 data/maps/CeladonCity_Condominiums_1F/events.inc create mode 100644 data/maps/CeladonCity_Condominiums_2F/events.inc create mode 100644 data/maps/CeladonCity_Condominiums_3F/events.inc create mode 100644 data/maps/CeladonCity_Condominiums_Roof/events.inc create mode 100644 data/maps/CeladonCity_Condominiums_RoofRoom/events.inc create mode 100644 data/maps/CeladonCity_DepartmentStore_1F/events.inc create mode 100644 data/maps/CeladonCity_DepartmentStore_2F/events.inc create mode 100644 data/maps/CeladonCity_DepartmentStore_3F/events.inc create mode 100644 data/maps/CeladonCity_DepartmentStore_4F/events.inc create mode 100644 data/maps/CeladonCity_DepartmentStore_5F/events.inc create mode 100644 data/maps/CeladonCity_DepartmentStore_Elevator/events.inc create mode 100644 data/maps/CeladonCity_DepartmentStore_Roof/events.inc create mode 100644 data/maps/CeladonCity_GameCorner/events.inc create mode 100644 data/maps/CeladonCity_GameCorner_PrizeRoom/events.inc create mode 100644 data/maps/CeladonCity_Gym/events.inc create mode 100644 data/maps/CeladonCity_Hotel/events.inc create mode 100644 data/maps/CeladonCity_House1/events.inc create mode 100644 data/maps/CeladonCity_PokemonCenter_1F/events.inc create mode 100644 data/maps/CeladonCity_PokemonCenter_2F/events.inc create mode 100644 data/maps/CeladonCity_Restaurant/events.inc create mode 100644 data/maps/CeruleanCave_1F/events.inc create mode 100644 data/maps/CeruleanCave_2F/events.inc create mode 100644 data/maps/CeruleanCave_B1F/events.inc create mode 100644 data/maps/CeruleanCity/events.inc create mode 100644 data/maps/CeruleanCity_BikeShop/events.inc create mode 100644 data/maps/CeruleanCity_Gym/events.inc create mode 100644 data/maps/CeruleanCity_House1/events.inc create mode 100644 data/maps/CeruleanCity_House2/events.inc create mode 100644 data/maps/CeruleanCity_House3/events.inc create mode 100644 data/maps/CeruleanCity_House4/events.inc create mode 100644 data/maps/CeruleanCity_House5/events.inc create mode 100644 data/maps/CeruleanCity_Mart/events.inc create mode 100644 data/maps/CeruleanCity_PokemonCenter_1F/events.inc create mode 100644 data/maps/CeruleanCity_PokemonCenter_2F/events.inc create mode 100644 data/maps/CinnabarIsland/events.inc create mode 100644 data/maps/CinnabarIsland_Gym/events.inc create mode 100644 data/maps/CinnabarIsland_Mart/events.inc create mode 100644 data/maps/CinnabarIsland_PokemonCenter_1F/events.inc create mode 100644 data/maps/CinnabarIsland_PokemonCenter_2F/events.inc create mode 100644 data/maps/CinnabarIsland_PokemonLab_Entrance/events.inc create mode 100644 data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/events.inc create mode 100644 data/maps/CinnabarIsland_PokemonLab_Lounge/events.inc create mode 100644 data/maps/CinnabarIsland_PokemonLab_ResearchRoom/events.inc create mode 100644 data/maps/DiglettsCave_B1F/events.inc create mode 100644 data/maps/DiglettsCave_NorthEntrance/events.inc create mode 100644 data/maps/DiglettsCave_SouthEntrance/events.inc create mode 100644 data/maps/FiveIsland/events.inc create mode 100644 data/maps/FiveIsland_Harbor/events.inc create mode 100644 data/maps/FiveIsland_House1/events.inc create mode 100644 data/maps/FiveIsland_House2/events.inc create mode 100644 data/maps/FiveIsland_LostCave_Entrance/events.inc create mode 100644 data/maps/FiveIsland_LostCave_Room1/events.inc create mode 100644 data/maps/FiveIsland_LostCave_Room10/events.inc create mode 100644 data/maps/FiveIsland_LostCave_Room11/events.inc create mode 100644 data/maps/FiveIsland_LostCave_Room12/events.inc create mode 100644 data/maps/FiveIsland_LostCave_Room13/events.inc create mode 100644 data/maps/FiveIsland_LostCave_Room14/events.inc create mode 100644 data/maps/FiveIsland_LostCave_Room2/events.inc create mode 100644 data/maps/FiveIsland_LostCave_Room3/events.inc create mode 100644 data/maps/FiveIsland_LostCave_Room4/events.inc create mode 100644 data/maps/FiveIsland_LostCave_Room5/events.inc create mode 100644 data/maps/FiveIsland_LostCave_Room6/events.inc create mode 100644 data/maps/FiveIsland_LostCave_Room7/events.inc create mode 100644 data/maps/FiveIsland_LostCave_Room8/events.inc create mode 100644 data/maps/FiveIsland_LostCave_Room9/events.inc create mode 100644 data/maps/FiveIsland_Meadow/events.inc create mode 100644 data/maps/FiveIsland_MemorialPillar/events.inc create mode 100644 data/maps/FiveIsland_PokemonCenter_1F/events.inc create mode 100644 data/maps/FiveIsland_PokemonCenter_2F/events.inc create mode 100644 data/maps/FiveIsland_ResortGorgeous/events.inc create mode 100644 data/maps/FiveIsland_ResortGorgeous_House/events.inc create mode 100644 data/maps/FiveIsland_WaterLabyrinth/events.inc create mode 100644 data/maps/FourIsland/events.inc create mode 100644 data/maps/FourIsland_Harbor/events.inc create mode 100644 data/maps/FourIsland_House1/events.inc create mode 100644 data/maps/FourIsland_House2/events.inc create mode 100644 data/maps/FourIsland_IcefallCave_1F/events.inc create mode 100644 data/maps/FourIsland_IcefallCave_Entrance/events.inc create mode 100644 data/maps/FourIsland_LoreleisHouse/events.inc create mode 100644 data/maps/FourIsland_Mart/events.inc create mode 100644 data/maps/FourIsland_PokemonCenter_1F/events.inc create mode 100644 data/maps/FourIsland_PokemonCenter_2F/events.inc create mode 100644 data/maps/FourIsland_PokemonDayCare/events.inc create mode 100644 data/maps/FuchsiaCity/events.inc create mode 100644 data/maps/FuchsiaCity_Building1/events.inc create mode 100644 data/maps/FuchsiaCity_Gym/events.inc create mode 100644 data/maps/FuchsiaCity_House1/events.inc create mode 100644 data/maps/FuchsiaCity_House2/events.inc create mode 100644 data/maps/FuchsiaCity_House3/events.inc create mode 100644 data/maps/FuchsiaCity_Mart/events.inc create mode 100644 data/maps/FuchsiaCity_PokemonCenter_1F/events.inc create mode 100644 data/maps/FuchsiaCity_PokemonCenter_2F/events.inc create mode 100644 data/maps/FuchsiaCity_SafariZone_Entrance/events.inc create mode 100644 data/maps/FuchsiaCity_ZooBuilding/events.inc create mode 100644 data/maps/IndigoPlateau_Exterior/events.inc create mode 100644 data/maps/IndigoPlateau_PokemonCenter_1F/events.inc create mode 100644 data/maps/IndigoPlateau_PokemonCenter_2F/events.inc create mode 100644 data/maps/LavenderTown/events.inc create mode 100644 data/maps/LavenderTown_House1/events.inc create mode 100644 data/maps/LavenderTown_House2/events.inc create mode 100644 data/maps/LavenderTown_Mart/events.inc create mode 100644 data/maps/LavenderTown_PokemonCenter_1F/events.inc create mode 100644 data/maps/LavenderTown_PokemonCenter_2F/events.inc create mode 100644 data/maps/LavenderTown_VolunteerPokemonHouse/events.inc create mode 100644 data/maps/MtEmber_Exterior/events.inc create mode 100644 data/maps/MtEmber_RubyPath_B1F/events.inc create mode 100644 data/maps/MtEmber_RubyPath_B1F_Stairs/events.inc create mode 100644 data/maps/MtEmber_RubyPath_B2F/events.inc create mode 100644 data/maps/MtEmber_RubyPath_B2F_Stairs/events.inc create mode 100644 data/maps/MtEmber_RubyPath_B3F/events.inc create mode 100644 data/maps/MtEmber_RubyPath_B4F/events.inc create mode 100644 data/maps/MtEmber_RubyPath_B5F/events.inc create mode 100644 data/maps/MtEmber_Summit/events.inc create mode 100644 data/maps/MtEmber_SummitPath_1F/events.inc create mode 100644 data/maps/MtEmber_SummitPath_2F/events.inc create mode 100644 data/maps/MtEmber_SummitPath_3F/events.inc create mode 100644 data/maps/MtMoon_1F/events.inc create mode 100644 data/maps/MtMoon_B1F/events.inc create mode 100644 data/maps/MtMoon_B2F/events.inc create mode 100644 data/maps/NavelRock_1F/events.inc create mode 100644 data/maps/NavelRock_B1F/events.inc create mode 100644 data/maps/NavelRock_Base/events.inc create mode 100644 data/maps/NavelRock_BasePath_B10F/events.inc create mode 100644 data/maps/NavelRock_BasePath_B11F/events.inc create mode 100644 data/maps/NavelRock_BasePath_B1F/events.inc create mode 100644 data/maps/NavelRock_BasePath_B2F/events.inc create mode 100644 data/maps/NavelRock_BasePath_B3F/events.inc create mode 100644 data/maps/NavelRock_BasePath_B4F/events.inc create mode 100644 data/maps/NavelRock_BasePath_B5F/events.inc create mode 100644 data/maps/NavelRock_BasePath_B6F/events.inc create mode 100644 data/maps/NavelRock_BasePath_B7F/events.inc create mode 100644 data/maps/NavelRock_BasePath_B8F/events.inc create mode 100644 data/maps/NavelRock_BasePath_B9F/events.inc create mode 100644 data/maps/NavelRock_Exterior/events.inc create mode 100644 data/maps/NavelRock_Fork/events.inc create mode 100644 data/maps/NavelRock_Harbor/events.inc create mode 100644 data/maps/NavelRock_Summit/events.inc create mode 100644 data/maps/NavelRock_SummitPath_2F/events.inc create mode 100644 data/maps/NavelRock_SummitPath_3F/events.inc create mode 100644 data/maps/NavelRock_SummitPath_4F/events.inc create mode 100644 data/maps/NavelRock_SummitPath_5F/events.inc create mode 100644 data/maps/OneIsland/events.inc create mode 100644 data/maps/OneIsland_Harbor/events.inc create mode 100644 data/maps/OneIsland_House1/events.inc create mode 100644 data/maps/OneIsland_House2/events.inc create mode 100644 data/maps/OneIsland_KindleRoad/events.inc create mode 100644 data/maps/OneIsland_KindleRoad_EmberSpa/events.inc create mode 100644 data/maps/OneIsland_PokemonCenter_1F/events.inc create mode 100644 data/maps/OneIsland_PokemonCenter_2F/events.inc create mode 100644 data/maps/OneIsland_TreasureBeach/events.inc create mode 100644 data/maps/PalletTown/events.inc create mode 100644 data/maps/PalletTown_GarysHouse/events.inc create mode 100644 data/maps/PalletTown_PlayersHouse_1F/events.inc create mode 100644 data/maps/PalletTown_PlayersHouse_2F/events.inc create mode 100644 data/maps/PalletTown_ProfessorOaksLab/events.inc create mode 100644 data/maps/PewterCity/events.inc create mode 100644 data/maps/PewterCity_Gym/events.inc create mode 100644 data/maps/PewterCity_House1/events.inc create mode 100644 data/maps/PewterCity_House2/events.inc create mode 100644 data/maps/PewterCity_Mart/events.inc create mode 100644 data/maps/PewterCity_Museum_1F/events.inc create mode 100644 data/maps/PewterCity_Museum_2F/events.inc create mode 100644 data/maps/PewterCity_PokemonCenter_1F/events.inc create mode 100644 data/maps/PewterCity_PokemonCenter_2F/events.inc create mode 100644 data/maps/PokemonLeague_AgathasRoom/events.inc create mode 100644 data/maps/PokemonLeague_BrunosRoom/events.inc create mode 100644 data/maps/PokemonLeague_ChampionsRoom/events.inc create mode 100644 data/maps/PokemonLeague_HallOfFame/events.inc create mode 100644 data/maps/PokemonLeague_LancesRoom/events.inc create mode 100644 data/maps/PokemonLeague_LoreleisRoom/events.inc create mode 100644 data/maps/PokemonMansion_1F/events.inc create mode 100644 data/maps/PokemonMansion_2F/events.inc create mode 100644 data/maps/PokemonMansion_3F/events.inc create mode 100644 data/maps/PokemonMansion_B1F/events.inc create mode 100644 data/maps/PokemonTower_1F/events.inc create mode 100644 data/maps/PokemonTower_2F/events.inc create mode 100644 data/maps/PokemonTower_3F/events.inc create mode 100644 data/maps/PokemonTower_4F/events.inc create mode 100644 data/maps/PokemonTower_5F/events.inc create mode 100644 data/maps/PokemonTower_6F/events.inc create mode 100644 data/maps/PokemonTower_7F/events.inc create mode 100644 data/maps/PowerPlant/events.inc create mode 100644 data/maps/RockTunnel_1F/events.inc create mode 100644 data/maps/RockTunnel_B1F/events.inc create mode 100644 data/maps/RocketHideout_B1F/events.inc create mode 100644 data/maps/RocketHideout_B2F/events.inc create mode 100644 data/maps/RocketHideout_B3F/events.inc create mode 100644 data/maps/RocketHideout_B4F/events.inc create mode 100644 data/maps/RocketHideout_Elevator/events.inc create mode 100644 data/maps/Route1/events.inc create mode 100644 data/maps/Route10/events.inc create mode 100644 data/maps/Route10_PokemonCenter_1F/events.inc create mode 100644 data/maps/Route10_PokemonCenter_2F/events.inc create mode 100644 data/maps/Route11/events.inc create mode 100644 data/maps/Route11_EastEntrance_1F/events.inc create mode 100644 data/maps/Route11_EastEntrance_2F/events.inc create mode 100644 data/maps/Route12/events.inc create mode 100644 data/maps/Route12_FishingHouse/events.inc create mode 100644 data/maps/Route12_NorthEntrance_1F/events.inc create mode 100644 data/maps/Route12_NorthEntrance_2F/events.inc create mode 100644 data/maps/Route13/events.inc create mode 100644 data/maps/Route14/events.inc create mode 100644 data/maps/Route15/events.inc create mode 100644 data/maps/Route15_WestEntrance_1F/events.inc create mode 100644 data/maps/Route15_WestEntrance_2F/events.inc create mode 100644 data/maps/Route16/events.inc create mode 100644 data/maps/Route16_House/events.inc create mode 100644 data/maps/Route16_NorthEntrance_1F/events.inc create mode 100644 data/maps/Route16_NorthEntrance_2F/events.inc create mode 100644 data/maps/Route17/events.inc create mode 100644 data/maps/Route18/events.inc create mode 100644 data/maps/Route18_EastEntrance_1F/events.inc create mode 100644 data/maps/Route18_EastEntrance_2F/events.inc create mode 100644 data/maps/Route19/events.inc create mode 100644 data/maps/Route2/events.inc create mode 100644 data/maps/Route20/events.inc create mode 100644 data/maps/Route21_North/events.inc create mode 100644 data/maps/Route21_South/events.inc create mode 100644 data/maps/Route22/events.inc create mode 100644 data/maps/Route22_NorthEntrance/events.inc create mode 100644 data/maps/Route23/events.inc create mode 100644 data/maps/Route24/events.inc create mode 100644 data/maps/Route25/events.inc create mode 100644 data/maps/Route25_SeaCottage/events.inc create mode 100644 data/maps/Route2_EastBuilding/events.inc create mode 100644 data/maps/Route2_House/events.inc create mode 100644 data/maps/Route2_ViridianForest_NorthEntrance/events.inc create mode 100644 data/maps/Route2_ViridianForest_SouthEntrance/events.inc create mode 100644 data/maps/Route3/events.inc create mode 100644 data/maps/Route4/events.inc create mode 100644 data/maps/Route4_PokemonCenter_1F/events.inc create mode 100644 data/maps/Route4_PokemonCenter_2F/events.inc create mode 100644 data/maps/Route5/events.inc create mode 100644 data/maps/Route5_PokemonDayCare/events.inc create mode 100644 data/maps/Route5_SouthEntrance/events.inc create mode 100644 data/maps/Route6/events.inc create mode 100644 data/maps/Route6_NorthEntrance/events.inc create mode 100644 data/maps/Route7/events.inc create mode 100644 data/maps/Route7_EastEntrance/events.inc create mode 100644 data/maps/Route8/events.inc create mode 100644 data/maps/Route8_WestEntrance/events.inc create mode 100644 data/maps/Route9/events.inc create mode 100644 data/maps/SSAnne_1F_Corridor/events.inc create mode 100644 data/maps/SSAnne_1F_Room1/events.inc create mode 100644 data/maps/SSAnne_1F_Room11/events.inc create mode 100644 data/maps/SSAnne_1F_Room12/events.inc create mode 100644 data/maps/SSAnne_1F_Room2/events.inc create mode 100644 data/maps/SSAnne_1F_Room3/events.inc create mode 100644 data/maps/SSAnne_1F_Room4/events.inc create mode 100644 data/maps/SSAnne_1F_Room5/events.inc create mode 100644 data/maps/SSAnne_1F_Room6/events.inc create mode 100644 data/maps/SSAnne_1F_Room7/events.inc create mode 100644 data/maps/SSAnne_2F_Corridor/events.inc create mode 100644 data/maps/SSAnne_2F_Room1/events.inc create mode 100644 data/maps/SSAnne_2F_Room2/events.inc create mode 100644 data/maps/SSAnne_2F_Room3/events.inc create mode 100644 data/maps/SSAnne_2F_Room4/events.inc create mode 100644 data/maps/SSAnne_2F_Room5/events.inc create mode 100644 data/maps/SSAnne_2F_Room6/events.inc create mode 100644 data/maps/SSAnne_3F_Corridor/events.inc create mode 100644 data/maps/SSAnne_B1F_Corridor/events.inc create mode 100644 data/maps/SSAnne_B1F_Room1/events.inc create mode 100644 data/maps/SSAnne_B1F_Room2/events.inc create mode 100644 data/maps/SSAnne_B1F_Room3/events.inc create mode 100644 data/maps/SSAnne_B1F_Room4/events.inc create mode 100644 data/maps/SSAnne_B1F_Room5/events.inc create mode 100644 data/maps/SSAnne_CaptainsOffice/events.inc create mode 100644 data/maps/SSAnne_CaptainsOffice2/events.inc create mode 100644 data/maps/SSAnne_CaptainsOffice3/events.inc create mode 100644 data/maps/SSAnne_CaptainsOffice4/events.inc create mode 100644 data/maps/SSAnne_CaptainsOffice5/events.inc create mode 100644 data/maps/SSAnne_CaptainsOffice9/events.inc create mode 100644 data/maps/SSAnne_Deck/events.inc create mode 100644 data/maps/SSAnne_Exterior/events.inc create mode 100644 data/maps/SSAnne_Kitchen/events.inc create mode 100644 data/maps/SSAnne_Kitchen3/events.inc create mode 100644 data/maps/SafariZone_Building1/events.inc create mode 100644 data/maps/SafariZone_Building2/events.inc create mode 100644 data/maps/SafariZone_Building3/events.inc create mode 100644 data/maps/SafariZone_Building4/events.inc create mode 100644 data/maps/SafariZone_Center/events.inc create mode 100644 data/maps/SafariZone_East/events.inc create mode 100644 data/maps/SafariZone_North/events.inc create mode 100644 data/maps/SafariZone_SecretHouse/events.inc create mode 100644 data/maps/SafariZone_West/events.inc create mode 100644 data/maps/SaffronCity/events.inc create mode 100644 data/maps/SaffronCity_Dojo/events.inc create mode 100644 data/maps/SaffronCity_Duplicate/events.inc create mode 100644 data/maps/SaffronCity_Gym/events.inc create mode 100644 data/maps/SaffronCity_House1_1F/events.inc create mode 100644 data/maps/SaffronCity_House1_2F/events.inc create mode 100644 data/maps/SaffronCity_House2/events.inc create mode 100644 data/maps/SaffronCity_House3/events.inc create mode 100644 data/maps/SaffronCity_Mart/events.inc create mode 100644 data/maps/SaffronCity_PokemonCenter_1F/events.inc create mode 100644 data/maps/SaffronCity_PokemonCenter_2F/events.inc create mode 100644 data/maps/SaffronCity_PokemonTrainerFanClub/events.inc create mode 100644 data/maps/SeafoamIslands_1F/events.inc create mode 100644 data/maps/SeafoamIslands_B1F/events.inc create mode 100644 data/maps/SeafoamIslands_B2F/events.inc create mode 100644 data/maps/SeafoamIslands_B3F/events.inc create mode 100644 data/maps/SeafoamIslands_B4F/events.inc create mode 100644 data/maps/SevenIsland/events.inc create mode 100644 data/maps/SevenIsland_Harbor/events.inc create mode 100644 data/maps/SevenIsland_House_Room1/events.inc create mode 100644 data/maps/SevenIsland_House_Room2/events.inc create mode 100644 data/maps/SevenIsland_Mart/events.inc create mode 100644 data/maps/SevenIsland_PokemonCenter_1F/events.inc create mode 100644 data/maps/SevenIsland_PokemonCenter_2F/events.inc create mode 100644 data/maps/SevenIsland_SeavaultCanyon_TanobyKey/events.inc create mode 100644 data/maps/SevenIsland_SevaultCanyon/events.inc create mode 100644 data/maps/SevenIsland_SevaultCanyon_Entrance/events.inc create mode 100644 data/maps/SevenIsland_SevaultCanyon_House/events.inc create mode 100644 data/maps/SevenIsland_TanobyRuins/events.inc create mode 100644 data/maps/SevenIsland_TanobyRuins_DilfordChamber/events.inc create mode 100644 data/maps/SevenIsland_TanobyRuins_LiptooChamber/events.inc create mode 100644 data/maps/SevenIsland_TanobyRuins_MoneanChamber/events.inc create mode 100644 data/maps/SevenIsland_TanobyRuins_RixyChamber/events.inc create mode 100644 data/maps/SevenIsland_TanobyRuins_ScufibChamber/events.inc create mode 100644 data/maps/SevenIsland_TanobyRuins_ViapoisChamber/events.inc create mode 100644 data/maps/SevenIsland_TanobyRuins_WeepthChamber/events.inc create mode 100644 data/maps/SevenIsland_TrainerTower/events.inc create mode 100644 data/maps/SevenIsland_TrainerTower_1F/events.inc create mode 100644 data/maps/SevenIsland_TrainerTower_2F/events.inc create mode 100644 data/maps/SevenIsland_TrainerTower_3F/events.inc create mode 100644 data/maps/SevenIsland_TrainerTower_4F/events.inc create mode 100644 data/maps/SevenIsland_TrainerTower_5F/events.inc create mode 100644 data/maps/SevenIsland_TrainerTower_6F/events.inc create mode 100644 data/maps/SevenIsland_TrainerTower_7F/events.inc create mode 100644 data/maps/SevenIsland_TrainerTower_8F/events.inc create mode 100644 data/maps/SevenIsland_TrainerTower_Elevator/events.inc create mode 100644 data/maps/SevenIsland_TrainerTower_Lobby/events.inc create mode 100644 data/maps/SevenIsland_TrainerTower_Roof/events.inc create mode 100644 data/maps/SilphCo_10F/events.inc create mode 100644 data/maps/SilphCo_11F/events.inc create mode 100644 data/maps/SilphCo_1F/events.inc create mode 100644 data/maps/SilphCo_2F/events.inc create mode 100644 data/maps/SilphCo_3F/events.inc create mode 100644 data/maps/SilphCo_4F/events.inc create mode 100644 data/maps/SilphCo_5F/events.inc create mode 100644 data/maps/SilphCo_6F/events.inc create mode 100644 data/maps/SilphCo_7F/events.inc create mode 100644 data/maps/SilphCo_8F/events.inc create mode 100644 data/maps/SilphCo_9F/events.inc create mode 100644 data/maps/SilphCo_Elevator/events.inc create mode 100644 data/maps/SixIsland/events.inc create mode 100644 data/maps/SixIsland_DottedHole_B1F/events.inc create mode 100644 data/maps/SixIsland_DottedHole_B2F/events.inc create mode 100644 data/maps/SixIsland_DottedHole_B3F/events.inc create mode 100644 data/maps/SixIsland_DottedHole_SapphireRoom/events.inc create mode 100644 data/maps/SixIsland_GreenPath/events.inc create mode 100644 data/maps/SixIsland_Harbor/events.inc create mode 100644 data/maps/SixIsland_House/events.inc create mode 100644 data/maps/SixIsland_Mart/events.inc create mode 100644 data/maps/SixIsland_OutcastIsland/events.inc create mode 100644 data/maps/SixIsland_PokemonCenter_1F/events.inc create mode 100644 data/maps/SixIsland_PokemonCenter_2F/events.inc create mode 100644 data/maps/SixIsland_RuinValley/events.inc create mode 100644 data/maps/SixIsland_WaterPath/events.inc create mode 100644 data/maps/SixIsland_WaterPath_House1/events.inc create mode 100644 data/maps/SixIsland_WaterPath_House2/events.inc create mode 100644 data/maps/ThreeIsland/events.inc create mode 100644 data/maps/ThreeIsland_BerryForest/events.inc create mode 100644 data/maps/ThreeIsland_BondBridge/events.inc create mode 100644 data/maps/ThreeIsland_DunsparceTunnel/events.inc create mode 100644 data/maps/ThreeIsland_Harbor/events.inc create mode 100644 data/maps/ThreeIsland_House1/events.inc create mode 100644 data/maps/ThreeIsland_House2/events.inc create mode 100644 data/maps/ThreeIsland_House3/events.inc create mode 100644 data/maps/ThreeIsland_House4/events.inc create mode 100644 data/maps/ThreeIsland_House5/events.inc create mode 100644 data/maps/ThreeIsland_Mart/events.inc create mode 100644 data/maps/ThreeIsland_PokemonCenter_1F/events.inc create mode 100644 data/maps/ThreeIsland_PokemonCenter_2F/events.inc create mode 100644 data/maps/ThreeIsland_Port/events.inc create mode 100644 data/maps/TwoIsland/events.inc create mode 100644 data/maps/TwoIsland_CapeBrink/events.inc create mode 100644 data/maps/TwoIsland_CapeBrink_House/events.inc create mode 100644 data/maps/TwoIsland_Harbor/events.inc create mode 100644 data/maps/TwoIsland_House/events.inc create mode 100644 data/maps/TwoIsland_JoyfulGameCorner/events.inc create mode 100644 data/maps/TwoIsland_PokemonCenter_1F/events.inc create mode 100644 data/maps/TwoIsland_PokemonCenter_2F/events.inc create mode 100644 data/maps/UndergroundPath_EastEntrance/events.inc create mode 100644 data/maps/UndergroundPath_EastWestTunnel/events.inc create mode 100644 data/maps/UndergroundPath_NorthEntrance/events.inc create mode 100644 data/maps/UndergroundPath_NorthSouthTunnel/events.inc create mode 100644 data/maps/UndergroundPath_SouthEntrance/events.inc create mode 100644 data/maps/UndergroundPath_WestEntrance/events.inc create mode 100644 data/maps/UnknownMap_00_00/events.inc create mode 100644 data/maps/UnknownMap_00_01/events.inc create mode 100644 data/maps/UnknownMap_00_02/events.inc create mode 100644 data/maps/UnknownMap_00_03/events.inc create mode 100644 data/maps/UnknownMap_00_04/events.inc create mode 100644 data/maps/UnknownMap_03_50/events.inc create mode 100644 data/maps/UnknownMap_03_51/events.inc create mode 100644 data/maps/UnknownMap_03_52/events.inc create mode 100644 data/maps/UnknownMap_03_53/events.inc create mode 100644 data/maps/UnknownMap_18_01/events.inc create mode 100644 data/maps/UnusedHouse_27_00/events.inc create mode 100644 data/maps/UnusedHouse_29_00/events.inc create mode 100644 data/maps/UnusedHouse_31_05/events.inc create mode 100644 data/maps/VermilionCity/events.inc create mode 100644 data/maps/VermilionCity_Gym/events.inc create mode 100644 data/maps/VermilionCity_House1/events.inc create mode 100644 data/maps/VermilionCity_House2/events.inc create mode 100644 data/maps/VermilionCity_House3/events.inc create mode 100644 data/maps/VermilionCity_Mart/events.inc create mode 100644 data/maps/VermilionCity_PokemonCenter_1F/events.inc create mode 100644 data/maps/VermilionCity_PokemonCenter_2F/events.inc create mode 100644 data/maps/VermilionCity_PokemonFanClub/events.inc create mode 100644 data/maps/VictoryRoad_1F/events.inc create mode 100644 data/maps/VictoryRoad_2F/events.inc create mode 100644 data/maps/VictoryRoad_3F/events.inc create mode 100644 data/maps/ViridianCity/events.inc create mode 100644 data/maps/ViridianCity_Gym/events.inc create mode 100644 data/maps/ViridianCity_House1/events.inc create mode 100644 data/maps/ViridianCity_House2/events.inc create mode 100644 data/maps/ViridianCity_Mart/events.inc create mode 100644 data/maps/ViridianCity_PokemonCenter_1F/events.inc create mode 100644 data/maps/ViridianCity_PokemonCenter_2F/events.inc create mode 100644 data/maps/ViridianForest/events.inc create mode 100644 data/maps/events.inc (limited to 'data/maps') diff --git a/data/maps/BirthIsland_Exterior/events.inc b/data/maps/BirthIsland_Exterior/events.inc new file mode 100644 index 000000000..92489f6ba --- /dev/null +++ b/data/maps/BirthIsland_Exterior/events.inc @@ -0,0 +1,9 @@ +BirthIsland_Exterior_EventObjects: + object_event 1, 106, 0, 15, 0, 12, 0, 3, 8, 17, 0, 0, 0, 0, 0, BirthIsland_Exterior_EventScript_165271, 154, 0, 0 + object_event 2, 240, 0, 15, 0, 3, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, 153, 0, 0 + +BirthIsland_Exterior_MapWarps: + warp_def 15, 24, 3, 0, 570 + +BirthIsland_Exterior_MapEvents:: + map_events BirthIsland_Exterior_EventObjects, BirthIsland_Exterior_MapWarps, 0x0, 0x0 diff --git a/data/maps/BirthIsland_Harbor/events.inc b/data/maps/BirthIsland_Harbor/events.inc new file mode 100644 index 000000000..90ee12799 --- /dev/null +++ b/data/maps/BirthIsland_Harbor/events.inc @@ -0,0 +1,9 @@ +BirthIsland_Harbor_EventObjects: + object_event 1, 108, 0, 8, 0, 9, 0, 0, 8, 17, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 2, 62, 0, 8, 0, 6, 0, 3, 7, 17, 0, 0, 0, 0, 0, BirthIsland_Harbor_EventScript_1653E7, 0, 0, 0 + +BirthIsland_Harbor_MapWarps: + warp_def 8, 2, 3, 0, 568 + +BirthIsland_Harbor_MapEvents:: + map_events BirthIsland_Harbor_EventObjects, BirthIsland_Harbor_MapWarps, 0x0, 0x0 diff --git a/data/maps/CeladonCity/events.inc b/data/maps/CeladonCity/events.inc new file mode 100644 index 000000000..ebf7a29aa --- /dev/null +++ b/data/maps/CeladonCity/events.inc @@ -0,0 +1,45 @@ +CeladonCity_EventObjects: + object_event 1, 49, 0, 48, 0, 15, 0, 3, 5, 20, 0, 0, 0, 0, 0, CeladonCity_EventScript_166CFA, 95, 0, 0 + object_event 2, 27, 0, 38, 0, 14, 0, 3, 9, 17, 0, 0, 0, 0, 0, CeladonCity_EventScript_166CC5, 0, 0, 0 + object_event 3, 112, 0, 36, 0, 14, 0, 3, 10, 17, 0, 0, 0, 0, 0, CeladonCity_EventScript_166CDC, 0, 0, 0 + object_event 4, 17, 0, 11, 0, 18, 0, 3, 52, 68, 0, 0, 0, 0, 0, CeladonCity_EventScript_166C99, 0, 0, 0 + object_event 5, 28, 0, 18, 0, 22, 0, 3, 2, 82, 0, 0, 0, 0, 0, CeladonCity_EventScript_166CAD, 0, 0, 0 + object_event 6, 32, 0, 30, 0, 24, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeladonCity_EventScript_166CB6, 0, 0, 0 + object_event 7, 33, 0, 26, 0, 19, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeladonCity_EventScript_166CBF, 0, 0, 0 + object_event 8, 49, 0, 38, 0, 31, 0, 3, 5, 21, 0, 0, 0, 0, 0, CeladonCity_EventScript_166D03, 95, 0, 0 + object_event 9, 32, 0, 9, 0, 30, 0, 3, 7, 17, 0, 0, 0, 0, 0, CeladonCity_EventScript_166CA2, 0, 0, 0 + object_event 10, 95, 0, 52, 0, 22, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeladonCity_EventScript_1BDF13, 20, 0, 0 + object_event 11, 95, 0, 40, 0, 35, 0, 0, 8, 17, 0, 0, 0, 0, 0, CeladonCity_EventScript_1BDF13, 19, 0, 0 + object_event 12, 19, 0, 25, 0, 10, 0, 3, 7, 17, 0, 0, 0, 0, 0, CeladonCity_EventScript_166D0C, 0, 0, 0 + object_event 13, 65375, 0, 249, 255, 21, 0, 7, 0, 0, 0, 34, 0, 3, 0, 0x0, 0, 0, 0 + object_event 14, 92, 0, 5, 0, 3, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeladonCity_EventScript_1BEBC0, 465, 0, 0 + object_event 15, 55, 0, 47, 0, 24, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeladonCity_EventScript_166D15, 95, 0, 0 + +CeladonCity_MapWarps: + warp_def 34, 21, 0, 0, 2574 + warp_def 11, 14, 0, 1, 2560 + warp_def 15, 14, 0, 4, 2560 + warp_def 30, 11, 0, 1, 2567 + warp_def 48, 11, 0, 1, 2572 + warp_def 39, 20, 0, 1, 2575 + warp_def 11, 30, 0, 1, 2576 + warp_def 37, 29, 0, 1, 2577 + warp_def 41, 29, 0, 1, 2578 + warp_def 49, 29, 0, 1, 2579 + warp_def 29, 5, 0, 5, 2567 + warp_def 30, 4, 3, 5, 2567 + warp_def 31, 5, 0, 5, 2567 + +CeladonCity_MapBGEvents: + bg_event 45, 23, 0, 0, 0, CeladonCity_EventScript_166D5A + bg_event 38, 23, 0, 0, 0, CeladonCity_EventScript_166D63 + bg_event 33, 23, 0, 0, 0, CeladonCity_EventScript_166D6C + bg_event 22, 18, 3, 0, 0, CeladonCity_EventScript_166D27 + bg_event 26, 11, 0, 0, 0, CeladonCity_EventScript_166D48 + bg_event 33, 16, 0, 0, 0, CeladonCity_EventScript_166D1E + bg_event 18, 14, 3, 0, 0, CeladonCity_EventScript_166D51 + bg_event 16, 31, 0, 0, 0, CeladonCity_EventScript_166D30 + bg_event 55, 20, 3, 7, 0, 69, 47, 1 + +CeladonCity_MapEvents:: + map_events CeladonCity_EventObjects, CeladonCity_MapWarps, 0x0, CeladonCity_MapBGEvents diff --git a/data/maps/CeladonCity_Condominiums_1F/events.inc b/data/maps/CeladonCity_Condominiums_1F/events.inc new file mode 100644 index 000000000..d229b29fe --- /dev/null +++ b/data/maps/CeladonCity_Condominiums_1F/events.inc @@ -0,0 +1,20 @@ +CeladonCity_Condominiums_1F_EventObjects: + object_event 1, 125, 0, 1, 0, 9, 0, 3, 10, 17, 0, 0, 0, 0, 0, CeladonCity_Condominiums_1F_EventScript_16C38E, 0, 0, 0 + object_event 2, 113, 0, 5, 0, 13, 0, 3, 5, 17, 0, 0, 0, 0, 0, CeladonCity_Condominiums_1F_EventScript_16C3A1, 0, 0, 0 + object_event 3, 122, 0, 5, 0, 8, 0, 3, 2, 18, 0, 0, 0, 0, 0, CeladonCity_Condominiums_1F_EventScript_16C3B4, 0, 0, 0 + object_event 4, 35, 0, 2, 0, 9, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeladonCity_Condominiums_1F_EventScript_16C321, 0, 0, 0 + +CeladonCity_Condominiums_1F_MapWarps: + warp_def 11, 19, 0, 3, 774 + warp_def 12, 18, 3, 3, 774 + warp_def 13, 19, 0, 3, 774 + warp_def 4, 2, 3, 0, 2568 + warp_def 12, 2, 3, 3, 2568 + warp_def 2, 1, 3, 11, 774 + +CeladonCity_Condominiums_1F_MapBGEvents: + bg_event 8, 12, 0, 0, 0, CeladonCity_Condominiums_1F_EventScript_16C3C7 + bg_event 7, 12, 0, 0, 0, CeladonCity_Condominiums_1F_EventScript_16C3C7 + +CeladonCity_Condominiums_1F_MapEvents:: + map_events CeladonCity_Condominiums_1F_EventObjects, CeladonCity_Condominiums_1F_MapWarps, 0x0, CeladonCity_Condominiums_1F_MapBGEvents diff --git a/data/maps/CeladonCity_Condominiums_2F/events.inc b/data/maps/CeladonCity_Condominiums_2F/events.inc new file mode 100644 index 000000000..98cf9a52e --- /dev/null +++ b/data/maps/CeladonCity_Condominiums_2F/events.inc @@ -0,0 +1,16 @@ +CeladonCity_Condominiums_2F_EventObjects: + object_event 1, 0, 0, 6, 0, 6, 0, 0, 76, 17, 0, 0, 0, 0, 0, CeladonCity_Condominiums_2F_EventScript_1ACE9D, 158, 0, 0 + object_event 2, 0, 0, 5, 0, 6, 0, 0, 76, 17, 0, 0, 0, 0, 0, CeladonCity_Condominiums_2F_EventScript_1ACE9D, 158, 0, 0 + +CeladonCity_Condominiums_2F_MapWarps: + warp_def 4, 2, 3, 3, 2567 + warp_def 2, 2, 3, 0, 2569 + warp_def 11, 2, 3, 3, 2569 + warp_def 12, 2, 3, 4, 2567 + +CeladonCity_Condominiums_2F_MapBGEvents: + bg_event 8, 12, 0, 0, 0, CeladonCity_Condominiums_2F_EventScript_16C3D1 + bg_event 7, 12, 0, 0, 0, CeladonCity_Condominiums_2F_EventScript_16C3D1 + +CeladonCity_Condominiums_2F_MapEvents:: + map_events CeladonCity_Condominiums_2F_EventObjects, CeladonCity_Condominiums_2F_MapWarps, 0x0, CeladonCity_Condominiums_2F_MapBGEvents diff --git a/data/maps/CeladonCity_Condominiums_3F/events.inc b/data/maps/CeladonCity_Condominiums_3F/events.inc new file mode 100644 index 000000000..1c6d9c947 --- /dev/null +++ b/data/maps/CeladonCity_Condominiums_3F/events.inc @@ -0,0 +1,24 @@ +CeladonCity_Condominiums_3F_EventObjects: + object_event 1, 26, 0, 0, 0, 10, 0, 3, 7, 17, 0, 0, 0, 0, 0, CeladonCity_Condominiums_3F_EventScript_16C3DB, 0, 0, 0 + object_event 2, 25, 0, 3, 0, 8, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeladonCity_Condominiums_3F_EventScript_16C3F6, 0, 0, 0 + object_event 3, 52, 0, 4, 0, 10, 0, 3, 7, 17, 0, 0, 0, 0, 0, CeladonCity_Condominiums_3F_EventScript_16C3E4, 0, 0, 0 + object_event 4, 27, 0, 0, 0, 13, 0, 3, 10, 17, 0, 0, 0, 0, 0, CeladonCity_Condominiums_3F_EventScript_16C3ED, 0, 0, 0 + +CeladonCity_Condominiums_3F_MapWarps: + warp_def 2, 2, 3, 1, 2568 + warp_def 4, 2, 3, 0, 2570 + warp_def 12, 2, 3, 1, 2570 + warp_def 11, 2, 3, 2, 2568 + +CeladonCity_Condominiums_3F_MapBGEvents: + bg_event 8, 12, 0, 0, 0, CeladonCity_Condominiums_3F_EventScript_16C435 + bg_event 1, 9, 0, 1, 0, CeladonCity_Condominiums_3F_EventScript_16C43E + bg_event 5, 9, 0, 1, 0, CeladonCity_Condominiums_3F_EventScript_16C447 + bg_event 1, 12, 0, 1, 0, CeladonCity_Condominiums_3F_EventScript_16C450 + bg_event 7, 12, 0, 0, 0, CeladonCity_Condominiums_3F_EventScript_16C435 + bg_event 0, 12, 0, 1, 0, CeladonCity_Condominiums_3F_EventScript_16C450 + bg_event 0, 9, 0, 1, 0, CeladonCity_Condominiums_3F_EventScript_16C43E + bg_event 4, 9, 0, 1, 0, CeladonCity_Condominiums_3F_EventScript_16C447 + +CeladonCity_Condominiums_3F_MapEvents:: + map_events CeladonCity_Condominiums_3F_EventObjects, CeladonCity_Condominiums_3F_MapWarps, 0x0, CeladonCity_Condominiums_3F_MapBGEvents diff --git a/data/maps/CeladonCity_Condominiums_Roof/events.inc b/data/maps/CeladonCity_Condominiums_Roof/events.inc new file mode 100644 index 000000000..b228d7b14 --- /dev/null +++ b/data/maps/CeladonCity_Condominiums_Roof/events.inc @@ -0,0 +1,11 @@ +CeladonCity_Condominiums_Roof_MapWarps: + warp_def 4, 2, 3, 1, 2569 + warp_def 10, 2, 3, 2, 2569 + warp_def 2, 12, 3, 1, 2571 + +CeladonCity_Condominiums_Roof_MapBGEvents: + bg_event 4, 12, 0, 0, 0, CeladonCity_Condominiums_Roof_EventScript_16C45A + bg_event 3, 12, 0, 0, 0, CeladonCity_Condominiums_Roof_EventScript_16C45A + +CeladonCity_Condominiums_Roof_MapEvents:: + map_events 0x0, CeladonCity_Condominiums_Roof_MapWarps, 0x0, CeladonCity_Condominiums_Roof_MapBGEvents diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/events.inc b/data/maps/CeladonCity_Condominiums_RoofRoom/events.inc new file mode 100644 index 000000000..6e72d86d7 --- /dev/null +++ b/data/maps/CeladonCity_Condominiums_RoofRoom/events.inc @@ -0,0 +1,16 @@ +CeladonCity_Condominiums_RoofRoom_EventObjects: + object_event 1, 54, 0, 3, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeladonCity_Condominiums_RoofRoom_EventScript_16C464, 0, 0, 0 + object_event 2, 92, 0, 7, 0, 3, 0, 0, 8, 17, 0, 0, 0, 0, 0, CeladonCity_Condominiums_RoofRoom_EventScript_16C46D, 87, 0, 0 + +CeladonCity_Condominiums_RoofRoom_MapWarps: + warp_def 3, 8, 0, 2, 2570 + warp_def 4, 7, 3, 2, 2570 + warp_def 5, 8, 0, 2, 2570 + +CeladonCity_Condominiums_RoofRoom_MapBGEvents: + bg_event 4, 1, 0, 0, 0, CeladonCity_Condominiums_RoofRoom_EventScript_16C522 + bg_event 5, 1, 0, 0, 0, CeladonCity_Condominiums_RoofRoom_EventScript_16C522 + bg_event 4, 4, 0, 0, 0, CeladonCity_Condominiums_RoofRoom_EventScript_16C519 + +CeladonCity_Condominiums_RoofRoom_MapEvents:: + map_events CeladonCity_Condominiums_RoofRoom_EventObjects, CeladonCity_Condominiums_RoofRoom_MapWarps, 0x0, CeladonCity_Condominiums_RoofRoom_MapBGEvents diff --git a/data/maps/CeladonCity_DepartmentStore_1F/events.inc b/data/maps/CeladonCity_DepartmentStore_1F/events.inc new file mode 100644 index 000000000..d9b549694 --- /dev/null +++ b/data/maps/CeladonCity_DepartmentStore_1F/events.inc @@ -0,0 +1,19 @@ +CeladonCity_DepartmentStore_1F_EventObjects: + object_event 1, 48, 0, 6, 0, 10, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeladonCity_DepartmentStore_1F_EventScript_16BAD9, 0, 0, 0 + +CeladonCity_DepartmentStore_1F_MapWarps: + warp_def 1, 15, 0, 1, 774 + warp_def 2, 14, 3, 1, 774 + warp_def 3, 15, 0, 1, 774 + warp_def 9, 15, 0, 2, 774 + warp_def 10, 14, 3, 2, 774 + warp_def 11, 15, 0, 2, 774 + warp_def 6, 1, 0, 0, 2566 + warp_def 4, 2, 3, 1, 2561 + +CeladonCity_DepartmentStore_1F_MapBGEvents: + bg_event 9, 11, 0, 0, 0, CeladonCity_DepartmentStore_1F_EventScript_16BAE2 + bg_event 8, 1, 0, 0, 0, CeladonCity_DepartmentStore_1F_EventScript_16BAEB + +CeladonCity_DepartmentStore_1F_MapEvents:: + map_events CeladonCity_DepartmentStore_1F_EventObjects, CeladonCity_DepartmentStore_1F_MapWarps, 0x0, CeladonCity_DepartmentStore_1F_MapBGEvents diff --git a/data/maps/CeladonCity_DepartmentStore_2F/events.inc b/data/maps/CeladonCity_DepartmentStore_2F/events.inc new file mode 100644 index 000000000..b54ec637a --- /dev/null +++ b/data/maps/CeladonCity_DepartmentStore_2F/events.inc @@ -0,0 +1,16 @@ +CeladonCity_DepartmentStore_2F_EventObjects: + object_event 1, 22, 0, 5, 0, 10, 0, 3, 3, 18, 0, 0, 0, 0, 0, CeladonCity_DepartmentStore_2F_EventScript_16BAFE, 0, 0, 0 + object_event 2, 68, 0, 1, 0, 8, 0, 0, 8, 19, 0, 0, 0, 0, 0, CeladonCity_DepartmentStore_2F_EventScript_16BB10, 0, 0, 0 + object_event 3, 68, 0, 1, 0, 6, 0, 3, 10, 19, 0, 0, 0, 0, 0, CeladonCity_DepartmentStore_2F_EventScript_16BB4E, 0, 0, 0 + object_event 4, 23, 0, 11, 0, 6, 0, 3, 5, 17, 0, 0, 0, 0, 0, CeladonCity_DepartmentStore_2F_EventScript_1AD053, 157, 0, 0 + +CeladonCity_DepartmentStore_2F_MapWarps: + warp_def 6, 1, 0, 0, 2566 + warp_def 3, 2, 3, 7, 2560 + warp_def 9, 2, 3, 1, 2562 + +CeladonCity_DepartmentStore_2F_MapBGEvents: + bg_event 4, 1, 0, 0, 0, CeladonCity_DepartmentStore_2F_EventScript_16BB07 + +CeladonCity_DepartmentStore_2F_MapEvents:: + map_events CeladonCity_DepartmentStore_2F_EventObjects, CeladonCity_DepartmentStore_2F_MapWarps, 0x0, CeladonCity_DepartmentStore_2F_MapBGEvents diff --git a/data/maps/CeladonCity_DepartmentStore_3F/events.inc b/data/maps/CeladonCity_DepartmentStore_3F/events.inc new file mode 100644 index 000000000..6d2b546ab --- /dev/null +++ b/data/maps/CeladonCity_DepartmentStore_3F/events.inc @@ -0,0 +1,27 @@ +CeladonCity_DepartmentStore_3F_EventObjects: + object_event 1, 68, 0, 10, 0, 9, 0, 3, 7, 17, 0, 0, 0, 0, 0, CeladonCity_DepartmentStore_3F_EventScript_16BB85, 0, 0, 0 + object_event 2, 51, 0, 11, 0, 6, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeladonCity_DepartmentStore_3F_EventScript_16BB8B, 0, 0, 0 + object_event 3, 51, 0, 4, 0, 9, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeladonCity_DepartmentStore_3F_EventScript_16BB9D, 0, 0, 0 + object_event 4, 51, 0, 1, 0, 9, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeladonCity_DepartmentStore_3F_EventScript_16BB94, 0, 0, 0 + object_event 5, 17, 0, 9, 0, 14, 0, 3, 14, 17, 0, 0, 0, 0, 0, CeladonCity_DepartmentStore_3F_EventScript_16BBA6, 0, 0, 0 + +CeladonCity_DepartmentStore_3F_MapWarps: + warp_def 6, 1, 0, 0, 2566 + warp_def 9, 2, 0, 2, 2561 + warp_def 3, 2, 0, 1, 2563 + +CeladonCity_DepartmentStore_3F_MapBGEvents: + bg_event 8, 1, 0, 0, 0, CeladonCity_DepartmentStore_3F_EventScript_16BBDC + bg_event 2, 8, 0, 1, 0, CeladonCity_DepartmentStore_3F_EventScript_16BBB8 + bg_event 5, 8, 0, 1, 0, CeladonCity_DepartmentStore_3F_EventScript_16BBC1 + bg_event 2, 11, 0, 1, 0, CeladonCity_DepartmentStore_3F_EventScript_16BBCA + bg_event 5, 11, 0, 1, 0, CeladonCity_DepartmentStore_3F_EventScript_16BBD3 + bg_event 1, 8, 0, 0, 0, CeladonCity_DepartmentStore_3F_EventScript_16BBAF + bg_event 1, 11, 0, 0, 0, CeladonCity_DepartmentStore_3F_EventScript_16BBAF + bg_event 4, 8, 0, 0, 0, CeladonCity_DepartmentStore_3F_EventScript_16BBAF + bg_event 4, 11, 0, 0, 0, CeladonCity_DepartmentStore_3F_EventScript_16BBAF + bg_event 2, 4, 0, 1, 0, CeladonCity_DepartmentStore_3F_EventScript_16BBE5 + bg_event 0, 4, 0, 1, 0, CeladonCity_DepartmentStore_3F_EventScript_16BBE5 + +CeladonCity_DepartmentStore_3F_MapEvents:: + map_events CeladonCity_DepartmentStore_3F_EventObjects, CeladonCity_DepartmentStore_3F_MapWarps, 0x0, CeladonCity_DepartmentStore_3F_MapBGEvents diff --git a/data/maps/CeladonCity_DepartmentStore_4F/events.inc b/data/maps/CeladonCity_DepartmentStore_4F/events.inc new file mode 100644 index 000000000..d38604872 --- /dev/null +++ b/data/maps/CeladonCity_DepartmentStore_4F/events.inc @@ -0,0 +1,15 @@ +CeladonCity_DepartmentStore_4F_EventObjects: + object_event 1, 25, 0, 6, 0, 6, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeladonCity_DepartmentStore_4F_EventScript_16BBEF, 0, 0, 0 + object_event 2, 18, 0, 10, 0, 11, 0, 3, 2, 17, 0, 0, 0, 0, 0, CeladonCity_DepartmentStore_4F_EventScript_16BBF8, 0, 0, 0 + object_event 3, 68, 0, 3, 0, 13, 0, 0, 7, 19, 0, 0, 0, 0, 0, CeladonCity_DepartmentStore_4F_EventScript_16BC0A, 0, 0, 0 + +CeladonCity_DepartmentStore_4F_MapWarps: + warp_def 6, 1, 0, 0, 2566 + warp_def 3, 2, 0, 2, 2562 + warp_def 9, 2, 0, 1, 2564 + +CeladonCity_DepartmentStore_4F_MapBGEvents: + bg_event 4, 1, 0, 0, 0, CeladonCity_DepartmentStore_4F_EventScript_16BC01 + +CeladonCity_DepartmentStore_4F_MapEvents:: + map_events CeladonCity_DepartmentStore_4F_EventObjects, CeladonCity_DepartmentStore_4F_MapWarps, 0x0, CeladonCity_DepartmentStore_4F_MapBGEvents diff --git a/data/maps/CeladonCity_DepartmentStore_5F/events.inc b/data/maps/CeladonCity_DepartmentStore_5F/events.inc new file mode 100644 index 000000000..c9c61f94e --- /dev/null +++ b/data/maps/CeladonCity_DepartmentStore_5F/events.inc @@ -0,0 +1,16 @@ +CeladonCity_DepartmentStore_5F_EventObjects: + object_event 1, 61, 0, 11, 0, 6, 0, 3, 5, 17, 0, 0, 0, 0, 0, CeladonCity_DepartmentStore_5F_EventScript_16BC41, 0, 0, 0 + object_event 2, 62, 0, 6, 0, 8, 0, 3, 2, 17, 0, 0, 0, 0, 0, CeladonCity_DepartmentStore_5F_EventScript_16BC4A, 0, 0, 0 + object_event 3, 68, 0, 1, 0, 7, 0, 3, 8, 18, 0, 0, 0, 0, 0, CeladonCity_DepartmentStore_5F_EventScript_16BC5C, 0, 0, 0 + object_event 4, 68, 0, 1, 0, 6, 0, 3, 10, 18, 0, 0, 0, 0, 0, CeladonCity_DepartmentStore_5F_EventScript_16BC96, 0, 0, 0 + +CeladonCity_DepartmentStore_5F_MapWarps: + warp_def 6, 1, 0, 0, 2566 + warp_def 9, 2, 3, 2, 2563 + warp_def 3, 2, 3, 0, 2565 + +CeladonCity_DepartmentStore_5F_MapBGEvents: + bg_event 8, 1, 0, 0, 0, CeladonCity_DepartmentStore_5F_EventScript_16BC53 + +CeladonCity_DepartmentStore_5F_MapEvents:: + map_events CeladonCity_DepartmentStore_5F_EventObjects, CeladonCity_DepartmentStore_5F_MapWarps, 0x0, CeladonCity_DepartmentStore_5F_MapBGEvents diff --git a/data/maps/CeladonCity_DepartmentStore_Elevator/events.inc b/data/maps/CeladonCity_DepartmentStore_Elevator/events.inc new file mode 100644 index 000000000..1a7da8ab1 --- /dev/null +++ b/data/maps/CeladonCity_DepartmentStore_Elevator/events.inc @@ -0,0 +1,10 @@ +CeladonCity_DepartmentStore_Elevator_MapWarps: + warp_def 2, 5, 3, 127, 32639 + warp_def 2, 6, 0, 127, 32639 + +CeladonCity_DepartmentStore_Elevator_MapBGEvents: + bg_event 0, 2, 0, 0, 0, CeladonCity_DepartmentStore_Elevator_EventScript_16C153 + bg_event 4, 1, 0, 0, 0, CeladonCity_DepartmentStore_Elevator_EventScript_16C153 + +CeladonCity_DepartmentStore_Elevator_MapEvents:: + map_events 0x0, CeladonCity_DepartmentStore_Elevator_MapWarps, 0x0, CeladonCity_DepartmentStore_Elevator_MapBGEvents diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/events.inc b/data/maps/CeladonCity_DepartmentStore_Roof/events.inc new file mode 100644 index 000000000..6f6fc6da1 --- /dev/null +++ b/data/maps/CeladonCity_DepartmentStore_Roof/events.inc @@ -0,0 +1,15 @@ +CeladonCity_DepartmentStore_Roof_EventObjects: + object_event 1, 41, 0, 9, 0, 5, 0, 3, 9, 17, 0, 0, 0, 0, 0, CeladonCity_DepartmentStore_Roof_EventScript_16C022, 0, 0, 0 + object_event 2, 17, 0, 5, 0, 4, 0, 3, 2, 18, 0, 0, 0, 0, 0, CeladonCity_DepartmentStore_Roof_EventScript_16BCCD, 0, 0, 0 + +CeladonCity_DepartmentStore_Roof_MapWarps: + warp_def 15, 6, 3, 2, 2564 + +CeladonCity_DepartmentStore_Roof_MapBGEvents: + bg_event 14, 3, 0, 0, 0, CeladonCity_DepartmentStore_Roof_EventScript_16C02B + bg_event 10, 3, 0, 0, 0, CeladonCity_DepartmentStore_Roof_EventScript_16C034 + bg_event 11, 3, 0, 0, 0, CeladonCity_DepartmentStore_Roof_EventScript_16C034 + bg_event 12, 3, 0, 0, 0, CeladonCity_DepartmentStore_Roof_EventScript_16C034 + +CeladonCity_DepartmentStore_Roof_MapEvents:: + map_events CeladonCity_DepartmentStore_Roof_EventObjects, CeladonCity_DepartmentStore_Roof_MapWarps, 0x0, CeladonCity_DepartmentStore_Roof_MapBGEvents diff --git a/data/maps/CeladonCity_GameCorner/events.inc b/data/maps/CeladonCity_GameCorner/events.inc new file mode 100644 index 000000000..9a2a1e5c1 --- /dev/null +++ b/data/maps/CeladonCity_GameCorner/events.inc @@ -0,0 +1,59 @@ +CeladonCity_GameCorner_EventObjects: + object_event 1, 48, 0, 4, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeladonCity_GameCorner_EventScript_16C684, 0, 0, 0 + object_event 2, 47, 0, 6, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeladonCity_GameCorner_EventScript_16C68D, 0, 0, 0 + object_event 3, 30, 0, 1, 0, 6, 0, 3, 9, 17, 0, 0, 0, 0, 0, CeladonCity_GameCorner_EventScript_16C7BA, 0, 0, 0 + object_event 4, 28, 0, 1, 0, 8, 0, 3, 9, 17, 0, 0, 0, 0, 0, CeladonCity_GameCorner_EventScript_16C7D7, 0, 0, 0 + object_event 5, 57, 0, 4, 0, 7, 0, 3, 10, 17, 0, 0, 0, 0, 0, CeladonCity_GameCorner_EventScript_16C7E7, 0, 0, 0 + object_event 6, 91, 0, 7, 0, 10, 0, 3, 9, 17, 0, 0, 0, 0, 0, CeladonCity_GameCorner_EventScript_16C857, 0, 0, 0 + object_event 7, 23, 0, 7, 0, 8, 0, 3, 9, 17, 0, 0, 0, 0, 0, CeladonCity_GameCorner_EventScript_16C87E, 0, 0, 0 + object_event 8, 33, 0, 10, 0, 9, 0, 3, 10, 17, 0, 0, 0, 0, 0, CeladonCity_GameCorner_EventScript_16C88E, 0, 0, 0 + object_event 9, 55, 0, 13, 0, 7, 0, 3, 9, 17, 0, 0, 0, 0, 0, CeladonCity_GameCorner_EventScript_16C89E, 0, 0, 0 + object_event 10, 61, 0, 16, 0, 10, 0, 3, 10, 17, 0, 0, 0, 0, 0, CeladonCity_GameCorner_EventScript_16C8FE, 0, 0, 0 + object_event 11, 49, 0, 11, 0, 2, 0, 3, 7, 17, 0, 1, 0, 0, 0, CeladonCity_GameCorner_EventScript_16CAF5, 91, 0, 0 + +CeladonCity_GameCorner_MapWarps: + warp_def 9, 13, 0, 0, 774 + warp_def 10, 13, 0, 0, 774 + warp_def 11, 13, 0, 0, 774 + warp_def 15, 2, 3, 0, 298 + +CeladonCity_GameCorner_MapBGEvents: + bg_event 2, 4, 3, 7, 0, 0, 51, 10 + bg_event 3, 8, 3, 7, 0, 0, 52, 10 + bg_event 2, 11, 3, 7, 0, 0, 53, 20 + bg_event 6, 12, 3, 7, 0, 0, 54, 10 + bg_event 9, 9, 3, 7, 0, 0, 55, 10 + bg_event 8, 5, 3, 7, 0, 0, 56, 20 + bg_event 10, 4, 3, 7, 0, 0, 57, 10 + bg_event 13, 3, 3, 7, 0, 0, 58, 10 + bg_event 15, 5, 3, 7, 0, 0, 59, 10 + bg_event 17, 5, 3, 7, 0, 0, 60, 40 + bg_event 15, 13, 3, 7, 0, 0, 61, 100 + bg_event 12, 12, 3, 7, 0, 0, 62, 10 + bg_event 0, 7, 0, 4, 0, CeladonCity_GameCorner_EventScript_16C95E + bg_event 0, 9, 0, 4, 0, CeladonCity_GameCorner_EventScript_16C9A4 + bg_event 0, 10, 0, 4, 0, CeladonCity_GameCorner_EventScript_16C9B0 + bg_event 5, 6, 0, 3, 0, CeladonCity_GameCorner_EventScript_16C9BC + bg_event 5, 8, 0, 3, 0, CeladonCity_GameCorner_EventScript_16CB5A + bg_event 5, 9, 0, 3, 0, CeladonCity_GameCorner_EventScript_16C9D4 + bg_event 5, 10, 0, 3, 0, CeladonCity_GameCorner_EventScript_16C9E0 + bg_event 6, 6, 0, 4, 0, CeladonCity_GameCorner_EventScript_16C9EC + bg_event 6, 7, 0, 4, 0, CeladonCity_GameCorner_EventScript_16C9F8 + bg_event 6, 9, 0, 4, 0, CeladonCity_GameCorner_EventScript_16CA04 + bg_event 11, 6, 0, 3, 0, CeladonCity_GameCorner_EventScript_16CA10 + bg_event 11, 7, 0, 3, 0, CeladonCity_GameCorner_EventScript_16CA1C + bg_event 11, 8, 0, 3, 0, CeladonCity_GameCorner_EventScript_16CA28 + bg_event 11, 10, 0, 3, 0, CeladonCity_GameCorner_EventScript_16CA34 + bg_event 12, 6, 0, 4, 0, CeladonCity_GameCorner_EventScript_16CA40 + bg_event 12, 8, 0, 4, 0, CeladonCity_GameCorner_EventScript_16CB63 + bg_event 12, 9, 0, 4, 0, CeladonCity_GameCorner_EventScript_16CA58 + bg_event 12, 10, 0, 4, 0, CeladonCity_GameCorner_EventScript_16CA64 + bg_event 17, 6, 0, 3, 0, CeladonCity_GameCorner_EventScript_16CB6C + bg_event 17, 7, 0, 3, 0, CeladonCity_GameCorner_EventScript_16CA7C + bg_event 17, 8, 0, 3, 0, CeladonCity_GameCorner_EventScript_16CA88 + bg_event 17, 9, 0, 3, 0, CeladonCity_GameCorner_EventScript_16CA94 + bg_event 11, 1, 0, 0, 0, CeladonCity_GameCorner_EventScript_16CAAA + bg_event 17, 13, 0, 3, 0, CeladonCity_GameCorner_EventScript_1B2867 + +CeladonCity_GameCorner_MapEvents:: + map_events CeladonCity_GameCorner_EventObjects, CeladonCity_GameCorner_MapWarps, 0x0, CeladonCity_GameCorner_MapBGEvents diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/events.inc b/data/maps/CeladonCity_GameCorner_PrizeRoom/events.inc new file mode 100644 index 000000000..21ec1b097 --- /dev/null +++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/events.inc @@ -0,0 +1,14 @@ +CeladonCity_GameCorner_PrizeRoom_EventObjects: + object_event 1, 30, 0, 2, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, CeladonCity_GameCorner_PrizeRoom_EventScript_16CB76, 0, 0, 0 + object_event 2, 33, 0, 6, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeladonCity_GameCorner_PrizeRoom_EventScript_16CB7F, 0, 0, 0 + object_event 3, 47, 0, 4, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeladonCity_GameCorner_PrizeRoom_EventScript_16CB88, 0, 0, 0 + object_event 4, 47, 0, 6, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeladonCity_GameCorner_PrizeRoom_EventScript_16CE1D, 0, 0, 0 + object_event 5, 47, 0, 2, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeladonCity_GameCorner_PrizeRoom_EventScript_16CF88, 0, 0, 0 + +CeladonCity_GameCorner_PrizeRoom_MapWarps: + warp_def 3, 9, 0, 5, 774 + warp_def 4, 8, 3, 5, 774 + warp_def 5, 9, 0, 5, 774 + +CeladonCity_GameCorner_PrizeRoom_MapEvents:: + map_events CeladonCity_GameCorner_PrizeRoom_EventObjects, CeladonCity_GameCorner_PrizeRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/CeladonCity_Gym/events.inc b/data/maps/CeladonCity_Gym/events.inc new file mode 100644 index 000000000..d0ce2f383 --- /dev/null +++ b/data/maps/CeladonCity_Gym/events.inc @@ -0,0 +1,24 @@ +CeladonCity_Gym_EventObjects: + object_event 1, 22, 0, 3, 0, 11, 0, 3, 10, 17, 0, 1, 0, 3, 0, CeladonCity_Gym_EventScript_16D111, 0, 0, 0 + object_event 2, 29, 0, 9, 0, 10, 0, 3, 9, 17, 0, 1, 0, 3, 0, CeladonCity_Gym_EventScript_16D163, 0, 0, 0 + object_event 3, 40, 0, 10, 0, 7, 0, 3, 8, 17, 0, 1, 0, 2, 0, CeladonCity_Gym_EventScript_16D14C, 0, 0, 0 + object_event 4, 29, 0, 2, 0, 6, 0, 3, 8, 17, 0, 1, 0, 4, 0, CeladonCity_Gym_EventScript_16D17A, 0, 0, 0 + object_event 5, 29, 0, 5, 0, 4, 0, 3, 8, 17, 0, 1, 0, 3, 0, CeladonCity_Gym_EventScript_16D19E, 0, 0, 0 + object_event 6, 22, 0, 7, 0, 4, 0, 3, 8, 17, 0, 1, 0, 2, 0, CeladonCity_Gym_EventScript_16D128, 0, 0, 0 + object_event 7, 83, 0, 6, 0, 4, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeladonCity_Gym_EventScript_16D061, 0, 0, 0 + object_event 8, 42, 0, 8, 0, 7, 0, 3, 9, 17, 0, 1, 0, 2, 0, CeladonCity_Gym_EventScript_16D1B5, 0, 0, 0 + object_event 9, 95, 0, 6, 0, 8, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeladonCity_Gym_EventScript_1BDF13, 18, 0, 0 + object_event 10, 95, 0, 3, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeladonCity_Gym_EventScript_1BDF13, 19, 0, 0 + object_event 11, 95, 0, 9, 0, 6, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeladonCity_Gym_EventScript_1BDF13, 20, 0, 0 + +CeladonCity_Gym_MapWarps: + warp_def 5, 18, 3, 6, 774 + warp_def 6, 18, 3, 6, 774 + warp_def 7, 18, 3, 6, 774 + +CeladonCity_Gym_MapBGEvents: + bg_event 4, 16, 0, 0, 0, CeladonCity_Gym_EventScript_16D1CC + bg_event 8, 16, 0, 0, 0, CeladonCity_Gym_EventScript_16D1CC + +CeladonCity_Gym_MapEvents:: + map_events CeladonCity_Gym_EventObjects, CeladonCity_Gym_MapWarps, 0x0, CeladonCity_Gym_MapBGEvents diff --git a/data/maps/CeladonCity_Hotel/events.inc b/data/maps/CeladonCity_Hotel/events.inc new file mode 100644 index 000000000..f1b778a97 --- /dev/null +++ b/data/maps/CeladonCity_Hotel/events.inc @@ -0,0 +1,13 @@ +CeladonCity_Hotel_EventObjects: + object_event 1, 35, 0, 5, 0, 4, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeladonCity_Hotel_EventScript_16D284, 0, 0, 0 + object_event 2, 29, 0, 3, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeladonCity_Hotel_EventScript_16D28D, 0, 0, 0 + object_event 3, 25, 0, 9, 0, 7, 0, 3, 5, 17, 0, 0, 0, 0, 0, CeladonCity_Hotel_EventScript_16D296, 0, 0, 0 + object_event 4, 16, 0, 2, 0, 6, 0, 3, 10, 17, 0, 0, 0, 0, 0, CeladonCity_Hotel_EventScript_16D29F, 0, 0, 0 + +CeladonCity_Hotel_MapWarps: + warp_def 3, 10, 0, 9, 774 + warp_def 4, 9, 0, 9, 774 + warp_def 5, 10, 0, 9, 774 + +CeladonCity_Hotel_MapEvents:: + map_events CeladonCity_Hotel_EventObjects, CeladonCity_Hotel_MapWarps, 0x0, 0x0 diff --git a/data/maps/CeladonCity_House1/events.inc b/data/maps/CeladonCity_House1/events.inc new file mode 100644 index 000000000..16b10fbfe --- /dev/null +++ b/data/maps/CeladonCity_House1/events.inc @@ -0,0 +1,12 @@ +CeladonCity_House1_EventObjects: + object_event 1, 33, 0, 5, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeladonCity_House1_EventScript_16D268, 0, 0, 0 + object_event 2, 49, 0, 2, 0, 4, 0, 3, 3, 81, 0, 0, 0, 0, 0, CeladonCity_House1_EventScript_16D271, 0, 0, 0 + object_event 3, 49, 0, 8, 0, 4, 0, 3, 3, 81, 0, 0, 0, 0, 0, CeladonCity_House1_EventScript_16D27A, 0, 0, 0 + +CeladonCity_House1_MapWarps: + warp_def 3, 7, 3, 8, 774 + warp_def 4, 7, 3, 8, 774 + warp_def 5, 7, 3, 8, 774 + +CeladonCity_House1_MapEvents:: + map_events CeladonCity_House1_EventObjects, CeladonCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/CeladonCity_PokemonCenter_1F/events.inc b/data/maps/CeladonCity_PokemonCenter_1F/events.inc new file mode 100644 index 000000000..5817e704e --- /dev/null +++ b/data/maps/CeladonCity_PokemonCenter_1F/events.inc @@ -0,0 +1,14 @@ +CeladonCity_PokemonCenter_1F_EventObjects: + object_event 1, 64, 0, 7, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeladonCity_PokemonCenter_1F_EventScript_16C5FB, 0, 0, 0 + object_event 2, 61, 0, 4, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeladonCity_PokemonCenter_1F_EventScript_16C604, 0, 0, 0 + object_event 3, 42, 0, 10, 0, 6, 0, 3, 5, 18, 0, 0, 0, 0, 0, CeladonCity_PokemonCenter_1F_EventScript_16C60D, 0, 0, 0 + object_event 4, 18, 0, 12, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeladonCity_PokemonCenter_1F_EventScript_16C616, 0, 0, 0 + +CeladonCity_PokemonCenter_1F_MapWarps: + warp_def 6, 8, 3, 4, 774 + warp_def 7, 8, 3, 4, 774 + warp_def 8, 8, 3, 4, 774 + warp_def 1, 6, 4, 0, 2573 + +CeladonCity_PokemonCenter_1F_MapEvents:: + map_events CeladonCity_PokemonCenter_1F_EventObjects, CeladonCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/CeladonCity_PokemonCenter_2F/events.inc b/data/maps/CeladonCity_PokemonCenter_2F/events.inc new file mode 100644 index 000000000..9bed66116 --- /dev/null +++ b/data/maps/CeladonCity_PokemonCenter_2F/events.inc @@ -0,0 +1,13 @@ +CeladonCity_PokemonCenter_2F_EventObjects: + object_event 1, 65, 0, 6, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, CeladonCity_PokemonCenter_2F_EventScript_1A8CF6, 0, 0, 0 + object_event 2, 65, 0, 2, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, CeladonCity_PokemonCenter_2F_EventScript_1A8CFC, 0, 0, 0 + object_event 3, 65, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, CeladonCity_PokemonCenter_2F_EventScript_1A8D02, 0, 0, 0 + object_event 4, 69, 0, 1, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeladonCity_PokemonCenter_2F_EventScript_1BB1D2, 112, 0, 0 + +CeladonCity_PokemonCenter_2F_MapWarps: + warp_def 1, 6, 4, 3, 2572 + warp_def 5, 1, 0, 0, 4 + warp_def 9, 1, 0, 0, 1 + +CeladonCity_PokemonCenter_2F_MapEvents:: + map_events CeladonCity_PokemonCenter_2F_EventObjects, CeladonCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/CeladonCity_Restaurant/events.inc b/data/maps/CeladonCity_Restaurant/events.inc new file mode 100644 index 000000000..02a232d32 --- /dev/null +++ b/data/maps/CeladonCity_Restaurant/events.inc @@ -0,0 +1,14 @@ +CeladonCity_Restaurant_EventObjects: + object_event 1, 59, 0, 12, 0, 7, 0, 3, 5, 18, 0, 0, 0, 0, 0, CeladonCity_Restaurant_EventScript_16D1EB, 0, 0, 0 + object_event 2, 28, 0, 11, 0, 4, 0, 3, 3, 33, 0, 0, 0, 0, 0, CeladonCity_Restaurant_EventScript_16D1F4, 0, 0, 0 + object_event 3, 27, 0, 9, 0, 4, 0, 3, 10, 17, 0, 0, 0, 0, 0, CeladonCity_Restaurant_EventScript_16D25E, 0, 0, 0 + object_event 4, 30, 0, 1, 0, 2, 0, 0, 8, 17, 0, 0, 0, 0, 0, CeladonCity_Restaurant_EventScript_16D1FD, 0, 0, 0 + object_event 5, 47, 0, 3, 0, 7, 0, 0, 9, 17, 0, 0, 0, 0, 0, CeladonCity_Restaurant_EventScript_16D255, 0, 0, 0 + +CeladonCity_Restaurant_MapWarps: + warp_def 5, 9, 0, 7, 774 + warp_def 6, 9, 0, 7, 774 + warp_def 7, 9, 0, 7, 774 + +CeladonCity_Restaurant_MapEvents:: + map_events CeladonCity_Restaurant_EventObjects, CeladonCity_Restaurant_MapWarps, 0x0, 0x0 diff --git a/data/maps/CeruleanCave_1F/events.inc b/data/maps/CeruleanCave_1F/events.inc new file mode 100644 index 000000000..82c1c55e7 --- /dev/null +++ b/data/maps/CeruleanCave_1F/events.inc @@ -0,0 +1,26 @@ +CeruleanCave_1F_EventObjects: + object_event 1, 92, 0, 7, 0, 3, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeruleanCave_1F_EventScript_1BEA47, 434, 0, 0 + object_event 2, 92, 0, 11, 0, 16, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeruleanCave_1F_EventScript_1BEA54, 435, 0, 0 + object_event 3, 92, 0, 25, 0, 5, 0, 4, 8, 17, 0, 0, 0, 0, 0, CeruleanCave_1F_EventScript_1BEA3A, 433, 0, 0 + object_event 4, 96, 0, 7, 0, 21, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeruleanCave_1F_EventScript_1BE00C, 18, 0, 0 + object_event 5, 96, 0, 13, 0, 21, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeruleanCave_1F_EventScript_1BE00C, 19, 0, 0 + object_event 6, 96, 0, 5, 0, 20, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeruleanCave_1F_EventScript_1BE00C, 20, 0, 0 + object_event 7, 96, 0, 14, 0, 20, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeruleanCave_1F_EventScript_1BE00C, 21, 0, 0 + object_event 8, 96, 0, 11, 0, 21, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeruleanCave_1F_EventScript_1BE00C, 22, 0, 0 + object_event 9, 96, 0, 9, 0, 18, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeruleanCave_1F_EventScript_1BE00C, 23, 0, 0 + +CeruleanCave_1F_MapWarps: + warp_def 33, 21, 3, 7, 771 + warp_def 34, 2, 3, 0, 329 + warp_def 1, 7, 3, 0, 330 + warp_def 10, 2, 3, 1, 329 + warp_def 5, 15, 3, 2, 329 + warp_def 30, 10, 4, 3, 329 + warp_def 24, 11, 3, 4, 329 + warp_def 2, 4, 3, 5, 329 + +CeruleanCave_1F_MapBGEvents: + bg_event 12, 2, 3, 7, 0, 2, 39, 1 + +CeruleanCave_1F_MapEvents:: + map_events CeruleanCave_1F_EventObjects, CeruleanCave_1F_MapWarps, 0x0, CeruleanCave_1F_MapBGEvents diff --git a/data/maps/CeruleanCave_2F/events.inc b/data/maps/CeruleanCave_2F/events.inc new file mode 100644 index 000000000..c1218da0a --- /dev/null +++ b/data/maps/CeruleanCave_2F/events.inc @@ -0,0 +1,25 @@ +CeruleanCave_2F_EventObjects: + object_event 1, 92, 0, 9, 0, 18, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeruleanCave_2F_EventScript_1BEA6E, 437, 0, 0 + object_event 2, 92, 0, 29, 0, 16, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeruleanCave_2F_EventScript_1BEA7B, 438, 0, 0 + object_event 3, 92, 0, 33, 0, 12, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeruleanCave_2F_EventScript_1BEA61, 436, 0, 0 + object_event 4, 96, 0, 33, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeruleanCave_2F_EventScript_1BE00C, 18, 0, 0 + object_event 5, 96, 0, 33, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeruleanCave_2F_EventScript_1BE00C, 19, 0, 0 + object_event 6, 96, 0, 25, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeruleanCave_2F_EventScript_1BE00C, 20, 0, 0 + object_event 7, 96, 0, 28, 0, 20, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeruleanCave_2F_EventScript_1BE00C, 21, 0, 0 + object_event 8, 96, 0, 30, 0, 20, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeruleanCave_2F_EventScript_1BE00C, 22, 0, 0 + object_event 9, 96, 0, 9, 0, 13, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeruleanCave_2F_EventScript_1BE00C, 23, 0, 0 + object_event 10, 96, 0, 23, 0, 16, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeruleanCave_2F_EventScript_1BE00C, 24, 0, 0 + object_event 11, 96, 0, 13, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeruleanCave_2F_EventScript_1BE00C, 25, 0, 0 + object_event 12, 96, 0, 4, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeruleanCave_2F_EventScript_1BE00C, 26, 0, 0 + object_event 13, 96, 0, 10, 0, 20, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeruleanCave_2F_EventScript_1BE00C, 27, 0, 0 + +CeruleanCave_2F_MapWarps: + warp_def 33, 4, 3, 1, 328 + warp_def 13, 4, 3, 3, 328 + warp_def 7, 14, 3, 4, 328 + warp_def 26, 9, 3, 5, 328 + warp_def 23, 10, 3, 6, 328 + warp_def 5, 6, 3, 7, 328 + +CeruleanCave_2F_MapEvents:: + map_events CeruleanCave_2F_EventObjects, CeruleanCave_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/CeruleanCave_B1F/events.inc b/data/maps/CeruleanCave_B1F/events.inc new file mode 100644 index 000000000..0febe9996 --- /dev/null +++ b/data/maps/CeruleanCave_B1F/events.inc @@ -0,0 +1,19 @@ +CeruleanCave_B1F_EventObjects: + object_event 1, 92, 0, 31, 0, 9, 0, 4, 8, 17, 0, 0, 0, 0, 0, CeruleanCave_B1F_EventScript_1BEA95, 440, 0, 0 + object_event 2, 92, 0, 32, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeruleanCave_B1F_EventScript_1BEA88, 439, 0, 0 + object_event 3, 139, 0, 7, 0, 12, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeruleanCave_B1F_EventScript_1624F5, 129, 0, 0 + object_event 4, 96, 0, 37, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeruleanCave_B1F_EventScript_1BE00C, 18, 0, 0 + object_event 5, 96, 0, 38, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeruleanCave_B1F_EventScript_1BE00C, 19, 0, 0 + object_event 6, 96, 0, 35, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeruleanCave_B1F_EventScript_1BE00C, 20, 0, 0 + object_event 7, 96, 0, 37, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeruleanCave_B1F_EventScript_1BE00C, 21, 0, 0 + object_event 8, 96, 0, 35, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeruleanCave_B1F_EventScript_1BE00C, 22, 0, 0 + object_event 9, 96, 0, 2, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeruleanCave_B1F_EventScript_1BE00C, 23, 0, 0 + object_event 10, 96, 0, 4, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeruleanCave_B1F_EventScript_1BE00C, 24, 0, 0 + object_event 11, 96, 0, 6, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeruleanCave_B1F_EventScript_1BE00C, 25, 0, 0 + object_event 12, 96, 0, 3, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeruleanCave_B1F_EventScript_1BE00C, 26, 0, 0 + +CeruleanCave_B1F_MapWarps: + warp_def 5, 7, 3, 2, 328 + +CeruleanCave_B1F_MapEvents:: + map_events CeruleanCave_B1F_EventObjects, CeruleanCave_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/CeruleanCity/events.inc b/data/maps/CeruleanCity/events.inc new file mode 100644 index 000000000..276ba2a9b --- /dev/null +++ b/data/maps/CeruleanCity/events.inc @@ -0,0 +1,49 @@ +CeruleanCity_EventObjects: + object_event 1, 60, 0, 31, 0, 12, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeruleanCity_EventScript_1666E7, 0, 0, 0 + object_event 2, 49, 0, 33, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeruleanCity_EventScript_166603, 59, 0, 0 + object_event 3, 16, 0, 16, 0, 21, 0, 3, 3, 49, 0, 0, 0, 0, 0, CeruleanCity_EventScript_1666FE, 0, 0, 0 + object_event 4, 30, 0, 9, 0, 23, 0, 3, 2, 17, 0, 0, 0, 0, 0, CeruleanCity_EventScript_16671D, 0, 0, 0 + object_event 5, 129, 0, 32, 0, 29, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeruleanCity_EventScript_1667DD, 0, 0, 0 + object_event 6, 22, 0, 33, 0, 29, 0, 3, 9, 17, 0, 0, 0, 0, 0, CeruleanCity_EventScript_16674F, 0, 0, 0 + object_event 7, 18, 0, 34, 0, 22, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeruleanCity_EventScript_166726, 0, 0, 0 + object_event 8, 72, 0, 22, 0, 0, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, 60, 0, 0 + object_event 9, 95, 0, 26, 0, 32, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeruleanCity_EventScript_1BDF13, 19, 0, 0 + object_event 10, 65375, 0, 50, 0, 18, 0, 10, 0, 0, 0, 27, 0, 3, 0, 0x0, 0, 0, 0 + object_event 11, 23, 0, 12, 0, 30, 0, 3, 7, 17, 0, 0, 0, 0, 0, CeruleanCity_EventScript_166738, 0, 0, 0 + object_event 12, 41, 0, 1, 0, 13, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeruleanCity_EventScript_16672F, 92, 0, 0 + +CeruleanCity_MapWarps: + warp_def 10, 11, 0, 1, 1792 + warp_def 30, 11, 0, 1, 1793 + warp_def 15, 17, 0, 1, 1794 + warp_def 22, 19, 0, 1, 1795 + warp_def 31, 21, 0, 1, 1797 + warp_def 13, 28, 3, 1, 1798 + warp_def 29, 28, 0, 1, 1799 + warp_def 1, 12, 0, 0, 328 + warp_def 10, 8, 3, 3, 1792 + warp_def 31, 8, 3, 3, 1793 + warp_def 31, 9, 3, 3, 1793 + warp_def 14, 28, 3, 1, 1798 + warp_def 23, 28, 0, 0, 1800 + warp_def 17, 11, 0, 0, 1801 + +CeruleanCity_MapCoordEvents: + coord_event 22, 6, 3, 0, 16466, 0, 0, CeruleanCity_EventScript_16649A + coord_event 23, 6, 3, 0, 16466, 0, 0, CeruleanCity_EventScript_1664A6 + coord_event 24, 6, 3, 0, 16466, 0, 0, CeruleanCity_EventScript_1664B9 + coord_event 33, 5, 3, 0, 16509, 0, 0, CeruleanCity_EventScript_166683 + coord_event 33, 7, 3, 0, 16509, 0, 0, CeruleanCity_EventScript_1666A3 + +CeruleanCity_MapBGEvents: + bg_event 20, 25, 0, 0, 0, CeruleanCity_EventScript_166838 + bg_event 27, 21, 0, 0, 0, CeruleanCity_EventScript_166853 + bg_event 11, 28, 0, 0, 0, CeruleanCity_EventScript_16684A + bg_event 19, 32, 0, 0, 0, CeruleanCity_EventScript_166841 + bg_event 18, 7, 3, 7, 0, 68, 49, 1 + bg_event 11, 25, 0, 0, 0, CeruleanCity_EventScript_16AC94 + bg_event 11, 27, 0, 0, 0, CeruleanCity_EventScript_16AC94 + bg_event 11, 26, 0, 0, 0, CeruleanCity_EventScript_16AC94 + +CeruleanCity_MapEvents:: + map_events CeruleanCity_EventObjects, CeruleanCity_MapWarps, CeruleanCity_MapCoordEvents, CeruleanCity_MapBGEvents diff --git a/data/maps/CeruleanCity_BikeShop/events.inc b/data/maps/CeruleanCity_BikeShop/events.inc new file mode 100644 index 000000000..affb34087 --- /dev/null +++ b/data/maps/CeruleanCity_BikeShop/events.inc @@ -0,0 +1,22 @@ +CeruleanCity_BikeShop_EventObjects: + object_event 1, 25, 0, 9, 0, 3, 0, 3, 9, 17, 0, 0, 0, 0, 0, CeruleanCity_BikeShop_EventScript_16ABBD, 0, 0, 0 + object_event 2, 18, 0, 9, 0, 7, 0, 3, 2, 17, 0, 0, 0, 0, 0, CeruleanCity_BikeShop_EventScript_16AC75, 0, 0, 0 + object_event 3, 28, 0, 5, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeruleanCity_BikeShop_EventScript_16AC6C, 0, 0, 0 + +CeruleanCity_BikeShop_MapWarps: + warp_def 4, 9, 0, 5, 771 + warp_def 5, 8, 3, 5, 771 + warp_def 6, 9, 0, 5, 771 + +CeruleanCity_BikeShop_MapBGEvents: + bg_event 4, 3, 0, 0, 0, CeruleanCity_BikeShop_EventScript_16AC94 + bg_event 4, 4, 0, 0, 0, CeruleanCity_BikeShop_EventScript_16AC94 + bg_event 4, 5, 0, 0, 0, CeruleanCity_BikeShop_EventScript_16AC94 + bg_event 2, 3, 0, 0, 0, CeruleanCity_BikeShop_EventScript_16AC94 + bg_event 1, 4, 0, 0, 0, CeruleanCity_BikeShop_EventScript_16AC94 + bg_event 2, 5, 0, 0, 0, CeruleanCity_BikeShop_EventScript_16AC94 + bg_event 2, 7, 0, 0, 0, CeruleanCity_BikeShop_EventScript_16AC94 + bg_event 2, 8, 0, 0, 0, CeruleanCity_BikeShop_EventScript_16AC94 + +CeruleanCity_BikeShop_MapEvents:: + map_events CeruleanCity_BikeShop_EventObjects, CeruleanCity_BikeShop_MapWarps, 0x0, CeruleanCity_BikeShop_MapBGEvents diff --git a/data/maps/CeruleanCity_Gym/events.inc b/data/maps/CeruleanCity_Gym/events.inc new file mode 100644 index 000000000..3c3fae4d3 --- /dev/null +++ b/data/maps/CeruleanCity_Gym/events.inc @@ -0,0 +1,17 @@ +CeruleanCity_Gym_EventObjects: + object_event 1, 43, 0, 10, 0, 12, 0, 0, 9, 17, 0, 1, 0, 1, 0, CeruleanCity_Gym_EventScript_16AB5B, 0, 0, 0 + object_event 2, 40, 0, 4, 0, 7, 0, 3, 10, 17, 0, 1, 0, 4, 0, CeruleanCity_Gym_EventScript_16AB44, 0, 0, 0 + object_event 3, 81, 0, 8, 0, 6, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeruleanCity_Gym_EventScript_16AAA1, 0, 0, 0 + object_event 4, 91, 0, 7, 0, 16, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeruleanCity_Gym_EventScript_16AB7F, 0, 0, 0 + +CeruleanCity_Gym_MapWarps: + warp_def 7, 18, 3, 4, 771 + warp_def 8, 18, 3, 4, 771 + warp_def 9, 18, 3, 4, 771 + +CeruleanCity_Gym_MapBGEvents: + bg_event 6, 17, 0, 0, 0, CeruleanCity_Gym_EventScript_16AB9E + bg_event 10, 17, 0, 0, 0, CeruleanCity_Gym_EventScript_16AB9E + +CeruleanCity_Gym_MapEvents:: + map_events CeruleanCity_Gym_EventObjects, CeruleanCity_Gym_MapWarps, 0x0, CeruleanCity_Gym_MapBGEvents diff --git a/data/maps/CeruleanCity_House1/events.inc b/data/maps/CeruleanCity_House1/events.inc new file mode 100644 index 000000000..9771589cf --- /dev/null +++ b/data/maps/CeruleanCity_House1/events.inc @@ -0,0 +1,11 @@ +CeruleanCity_House1_EventObjects: + object_event 1, 61, 0, 6, 0, 5, 0, 3, 10, 17, 0, 0, 0, 0, 0, CeruleanCity_House1_EventScript_16A7F0, 0, 0, 0 + +CeruleanCity_House1_MapWarps: + warp_def 2, 9, 0, 0, 771 + warp_def 3, 8, 3, 0, 771 + warp_def 4, 9, 0, 0, 771 + warp_def 3, 1, 3, 8, 771 + +CeruleanCity_House1_MapEvents:: + map_events CeruleanCity_House1_EventObjects, CeruleanCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/CeruleanCity_House2/events.inc b/data/maps/CeruleanCity_House2/events.inc new file mode 100644 index 000000000..d1e7b71db --- /dev/null +++ b/data/maps/CeruleanCity_House2/events.inc @@ -0,0 +1,15 @@ +CeruleanCity_House2_EventObjects: + object_event 1, 56, 0, 1, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeruleanCity_House2_EventScript_16A976, 0, 0, 0 + object_event 2, 22, 0, 7, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, CeruleanCity_House2_EventScript_16A995, 0, 0, 0 + +CeruleanCity_House2_MapWarps: + warp_def 2, 7, 0, 1, 771 + warp_def 3, 7, 0, 1, 771 + warp_def 4, 7, 1, 1, 771 + warp_def 4, 1, 0, 9, 771 + +CeruleanCity_House2_MapBGEvents: + bg_event 4, 1, 0, 0, 0, CeruleanCity_House2_EventScript_16A99E + +CeruleanCity_House2_MapEvents:: + map_events CeruleanCity_House2_EventObjects, CeruleanCity_House2_MapWarps, 0x0, CeruleanCity_House2_MapBGEvents diff --git a/data/maps/CeruleanCity_House3/events.inc b/data/maps/CeruleanCity_House3/events.inc new file mode 100644 index 000000000..7c3b4a954 --- /dev/null +++ b/data/maps/CeruleanCity_House3/events.inc @@ -0,0 +1,11 @@ +CeruleanCity_House3_EventObjects: + object_event 1, 32, 0, 2, 0, 2, 0, 3, 7, 17, 0, 0, 0, 0, 0, CeruleanCity_House3_EventScript_16A9B1, 0, 0, 0 + object_event 2, 35, 0, 7, 0, 5, 0, 3, 9, 17, 0, 0, 0, 0, 0, CeruleanCity_House3_EventScript_16A9A8, 0, 0, 0 + +CeruleanCity_House3_MapWarps: + warp_def 3, 7, 0, 2, 771 + warp_def 4, 7, 0, 2, 771 + warp_def 5, 7, 0, 2, 771 + +CeruleanCity_House3_MapEvents:: + map_events CeruleanCity_House3_EventObjects, CeruleanCity_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/CeruleanCity_House4/events.inc b/data/maps/CeruleanCity_House4/events.inc new file mode 100644 index 000000000..35200dd3c --- /dev/null +++ b/data/maps/CeruleanCity_House4/events.inc @@ -0,0 +1,8 @@ +CeruleanCity_House4_EventObjects: + object_event 1, 32, 0, 5, 0, 3, 0, 3, 7, 17, 0, 0, 0, 0, 0, CeruleanCity_House4_EventScript_16ACEF, 0, 0, 0 + +CeruleanCity_House4_MapWarps: + warp_def 4, 7, 3, 12, 771 + +CeruleanCity_House4_MapEvents:: + map_events CeruleanCity_House4_EventObjects, CeruleanCity_House4_MapWarps, 0x0, 0x0 diff --git a/data/maps/CeruleanCity_House5/events.inc b/data/maps/CeruleanCity_House5/events.inc new file mode 100644 index 000000000..d494639d8 --- /dev/null +++ b/data/maps/CeruleanCity_House5/events.inc @@ -0,0 +1,11 @@ +CeruleanCity_House5_EventObjects: + object_event 1, 33, 0, 7, 0, 4, 0, 3, 10, 17, 0, 0, 0, 0, 0, CeruleanCity_House5_EventScript_16AE50, 0, 0, 0 + +CeruleanCity_House5_MapWarps: + warp_def 4, 7, 3, 13, 771 + +CeruleanCity_House5_MapBGEvents: + bg_event 3, 1, 0, 0, 0, CeruleanCity_House5_EventScript_16B0DA + +CeruleanCity_House5_MapEvents:: + map_events CeruleanCity_House5_EventObjects, CeruleanCity_House5_MapWarps, 0x0, CeruleanCity_House5_MapBGEvents diff --git a/data/maps/CeruleanCity_Mart/events.inc b/data/maps/CeruleanCity_Mart/events.inc new file mode 100644 index 000000000..e38d991fb --- /dev/null +++ b/data/maps/CeruleanCity_Mart/events.inc @@ -0,0 +1,12 @@ +CeruleanCity_Mart_EventObjects: + object_event 1, 68, 0, 2, 0, 3, 0, 0, 10, 17, 0, 0, 0, 0, 0, CeruleanCity_Mart_EventScript_16ACB0, 0, 0, 0 + object_event 2, 23, 0, 9, 0, 2, 0, 3, 5, 20, 0, 0, 0, 0, 0, CeruleanCity_Mart_EventScript_16ACA7, 0, 0, 0 + object_event 3, 18, 0, 1, 0, 7, 0, 3, 7, 17, 0, 0, 0, 0, 0, CeruleanCity_Mart_EventScript_16AC9E, 0, 0, 0 + +CeruleanCity_Mart_MapWarps: + warp_def 3, 7, 3, 6, 771 + warp_def 4, 7, 3, 6, 771 + warp_def 5, 7, 3, 6, 771 + +CeruleanCity_Mart_MapEvents:: + map_events CeruleanCity_Mart_EventObjects, CeruleanCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/CeruleanCity_PokemonCenter_1F/events.inc b/data/maps/CeruleanCity_PokemonCenter_1F/events.inc new file mode 100644 index 000000000..624c743dd --- /dev/null +++ b/data/maps/CeruleanCity_PokemonCenter_1F/events.inc @@ -0,0 +1,17 @@ +CeruleanCity_PokemonCenter_1F_EventObjects: + object_event 1, 64, 0, 7, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeruleanCity_PokemonCenter_1F_EventScript_16AA3C, 0, 0, 0 + object_event 2, 61, 0, 12, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeruleanCity_PokemonCenter_1F_EventScript_16AA45, 0, 0, 0 + object_event 3, 26, 0, 5, 0, 4, 0, 3, 5, 17, 0, 0, 0, 0, 0, CeruleanCity_PokemonCenter_1F_EventScript_16AA4E, 0, 0, 0 + object_event 4, 18, 0, 4, 0, 8, 0, 3, 5, 17, 0, 0, 0, 0, 0, CeruleanCity_PokemonCenter_1F_EventScript_16AA57, 0, 0, 0 + object_event 5, 22, 0, 3, 0, 3, 0, 3, 10, 17, 0, 0, 0, 0, 0, CeruleanCity_PokemonCenter_1F_EventScript_16AA70, 0, 0, 0 + object_event 6, 0, 0, 2, 0, 1, 0, 0, 76, 17, 0, 0, 0, 0, 0, CeruleanCity_PokemonCenter_1F_EventScript_1ACE68, 157, 0, 0 + object_event 7, 0, 0, 3, 0, 1, 0, 0, 76, 17, 0, 0, 0, 0, 0, CeruleanCity_PokemonCenter_1F_EventScript_1ACE68, 157, 0, 0 + +CeruleanCity_PokemonCenter_1F_MapWarps: + warp_def 6, 8, 0, 3, 771 + warp_def 7, 8, 0, 3, 771 + warp_def 8, 8, 0, 3, 771 + warp_def 1, 6, 4, 0, 1796 + +CeruleanCity_PokemonCenter_1F_MapEvents:: + map_events CeruleanCity_PokemonCenter_1F_EventObjects, CeruleanCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/CeruleanCity_PokemonCenter_2F/events.inc b/data/maps/CeruleanCity_PokemonCenter_2F/events.inc new file mode 100644 index 000000000..6a0aeb560 --- /dev/null +++ b/data/maps/CeruleanCity_PokemonCenter_2F/events.inc @@ -0,0 +1,13 @@ +CeruleanCity_PokemonCenter_2F_EventObjects: + object_event 1, 65, 0, 6, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, CeruleanCity_PokemonCenter_2F_EventScript_1A8CF6, 0, 0, 0 + object_event 2, 65, 0, 2, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, CeruleanCity_PokemonCenter_2F_EventScript_1A8CFC, 0, 0, 0 + object_event 3, 65, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, CeruleanCity_PokemonCenter_2F_EventScript_1A8D02, 0, 0, 0 + object_event 4, 69, 0, 1, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeruleanCity_PokemonCenter_2F_EventScript_1BB1D2, 112, 0, 0 + +CeruleanCity_PokemonCenter_2F_MapWarps: + warp_def 1, 6, 4, 3, 1795 + warp_def 5, 1, 0, 0, 4 + warp_def 9, 1, 0, 0, 1 + +CeruleanCity_PokemonCenter_2F_MapEvents:: + map_events CeruleanCity_PokemonCenter_2F_EventObjects, CeruleanCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/CinnabarIsland/events.inc b/data/maps/CinnabarIsland/events.inc new file mode 100644 index 000000000..6b267cd37 --- /dev/null +++ b/data/maps/CinnabarIsland/events.inc @@ -0,0 +1,24 @@ +CinnabarIsland_EventObjects: + object_event 1, 28, 0, 14, 0, 6, 0, 3, 5, 17, 0, 0, 0, 0, 0, CinnabarIsland_EventScript_1671EF, 0, 0, 0 + object_event 2, 32, 0, 11, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, CinnabarIsland_EventScript_167208, 0, 0, 0 + object_event 3, 73, 0, 20, 0, 7, 0, 3, 10, 17, 0, 0, 0, 0, 0, 0x0, 98, 0, 0 + object_event 4, 108, 0, 23, 0, 7, 0, 1, 9, 17, 0, 0, 0, 0, 0, 0x0, 107, 0, 0 + +CinnabarIsland_MapWarps: + warp_def 8, 3, 0, 1, 315 + warp_def 20, 4, 0, 1, 3072 + warp_def 8, 9, 0, 1, 3073 + warp_def 14, 11, 0, 0, 3077 + warp_def 19, 11, 0, 1, 3079 + +CinnabarIsland_MapCoordEvents: + coord_event 20, 5, 3, 0, 16385, 0, 0, CinnabarIsland_EventScript_1671CA + +CinnabarIsland_MapBGEvents: + bg_event 12, 3, 0, 0, 0, CinnabarIsland_EventScript_167211 + bg_event 9, 9, 0, 0, 0, CinnabarIsland_EventScript_16721A + bg_event 22, 5, 0, 0, 0, CinnabarIsland_EventScript_167223 + bg_event 10, 9, 0, 0, 0, CinnabarIsland_EventScript_16721A + +CinnabarIsland_MapEvents:: + map_events CinnabarIsland_EventObjects, CinnabarIsland_MapWarps, CinnabarIsland_MapCoordEvents, CinnabarIsland_MapBGEvents diff --git a/data/maps/CinnabarIsland_Gym/events.inc b/data/maps/CinnabarIsland_Gym/events.inc new file mode 100644 index 000000000..b5f8e63bf --- /dev/null +++ b/data/maps/CinnabarIsland_Gym/events.inc @@ -0,0 +1,35 @@ +CinnabarIsland_Gym_EventObjects: + object_event 1, 52, 0, 25, 0, 11, 0, 3, 8, 17, 0, 1, 0, 0, 0, CinnabarIsland_Gym_EventScript_16DB27, 0, 0, 0 + object_event 2, 55, 0, 25, 0, 4, 0, 3, 8, 17, 0, 1, 0, 0, 0, CinnabarIsland_Gym_EventScript_16DA7F, 0, 0, 0 + object_event 3, 55, 0, 17, 0, 5, 0, 3, 8, 17, 0, 1, 0, 0, 0, CinnabarIsland_Gym_EventScript_16DA96, 0, 0, 0 + object_event 4, 52, 0, 16, 0, 11, 0, 3, 8, 17, 0, 1, 0, 0, 0, CinnabarIsland_Gym_EventScript_16DB53, 0, 0, 0 + object_event 5, 55, 0, 16, 0, 18, 0, 3, 8, 17, 0, 1, 0, 0, 0, CinnabarIsland_Gym_EventScript_16DAC2, 0, 0, 0 + object_event 6, 52, 0, 4, 0, 19, 0, 3, 8, 17, 0, 1, 0, 0, 0, CinnabarIsland_Gym_EventScript_16DB7F, 0, 0, 0 + object_event 7, 55, 0, 4, 0, 11, 0, 3, 8, 17, 0, 1, 0, 0, 0, CinnabarIsland_Gym_EventScript_16DAFB, 0, 0, 0 + object_event 8, 86, 0, 5, 0, 4, 0, 3, 8, 17, 0, 0, 0, 0, 0, CinnabarIsland_Gym_EventScript_16D9D4, 0, 0, 0 + object_event 9, 91, 0, 24, 0, 20, 0, 3, 8, 17, 0, 0, 0, 0, 0, CinnabarIsland_Gym_EventScript_16DBAB, 0, 0, 0 + +CinnabarIsland_Gym_MapWarps: + warp_def 24, 23, 3, 1, 776 + warp_def 25, 23, 3, 1, 776 + warp_def 26, 23, 3, 1, 776 + +CinnabarIsland_Gym_MapBGEvents: + bg_event 23, 20, 0, 0, 0, CinnabarIsland_Gym_EventScript_16DBCA + bg_event 27, 20, 0, 0, 0, CinnabarIsland_Gym_EventScript_16DBCA + bg_event 22, 10, 0, 1, 0, CinnabarIsland_Gym_EventScript_16DBE8 + bg_event 23, 10, 0, 1, 0, CinnabarIsland_Gym_EventScript_16DBF4 + bg_event 15, 2, 0, 1, 0, CinnabarIsland_Gym_EventScript_16DCDD + bg_event 16, 2, 0, 1, 0, CinnabarIsland_Gym_EventScript_16DCE9 + bg_event 13, 10, 0, 1, 0, CinnabarIsland_Gym_EventScript_16DDBB + bg_event 14, 10, 0, 1, 0, CinnabarIsland_Gym_EventScript_16DDC7 + bg_event 13, 17, 0, 1, 0, CinnabarIsland_Gym_EventScript_16DE92 + bg_event 14, 17, 0, 1, 0, CinnabarIsland_Gym_EventScript_16DE9E + bg_event 1, 18, 0, 1, 0, CinnabarIsland_Gym_EventScript_16DF69 + bg_event 2, 18, 0, 1, 0, CinnabarIsland_Gym_EventScript_16DF75 + bg_event 1, 10, 0, 1, 0, CinnabarIsland_Gym_EventScript_16E040 + bg_event 2, 10, 0, 1, 0, CinnabarIsland_Gym_EventScript_16E04C + bg_event 3, 1, 0, 1, 0, CinnabarIsland_Gym_EventScript_1ACF07 + +CinnabarIsland_Gym_MapEvents:: + map_events CinnabarIsland_Gym_EventObjects, CinnabarIsland_Gym_MapWarps, 0x0, CinnabarIsland_Gym_MapBGEvents diff --git a/data/maps/CinnabarIsland_Mart/events.inc b/data/maps/CinnabarIsland_Mart/events.inc new file mode 100644 index 000000000..9d582e374 --- /dev/null +++ b/data/maps/CinnabarIsland_Mart/events.inc @@ -0,0 +1,12 @@ +CinnabarIsland_Mart_EventObjects: + object_event 1, 68, 0, 2, 0, 3, 0, 0, 10, 17, 0, 0, 0, 0, 0, CinnabarIsland_Mart_EventScript_16EA22, 0, 0, 0 + object_event 2, 28, 0, 6, 0, 2, 0, 3, 7, 17, 0, 0, 0, 0, 0, CinnabarIsland_Mart_EventScript_16EA10, 0, 0, 0 + object_event 3, 55, 0, 8, 0, 2, 0, 3, 7, 17, 0, 0, 0, 0, 0, CinnabarIsland_Mart_EventScript_16EA19, 0, 0, 0 + +CinnabarIsland_Mart_MapWarps: + warp_def 3, 7, 3, 4, 776 + warp_def 4, 7, 3, 4, 776 + warp_def 5, 7, 3, 4, 776 + +CinnabarIsland_Mart_MapEvents:: + map_events CinnabarIsland_Mart_EventObjects, CinnabarIsland_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/events.inc b/data/maps/CinnabarIsland_PokemonCenter_1F/events.inc new file mode 100644 index 000000000..50f4c6566 --- /dev/null +++ b/data/maps/CinnabarIsland_PokemonCenter_1F/events.inc @@ -0,0 +1,17 @@ +CinnabarIsland_PokemonCenter_1F_EventObjects: + object_event 1, 64, 0, 7, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, CinnabarIsland_PokemonCenter_1F_EventScript_16E8E6, 0, 0, 0 + object_event 2, 42, 0, 2, 0, 4, 0, 3, 5, 17, 0, 0, 0, 0, 0, CinnabarIsland_PokemonCenter_1F_EventScript_16E8F8, 0, 0, 0 + object_event 3, 61, 0, 9, 0, 7, 0, 3, 2, 17, 0, 0, 0, 0, 0, CinnabarIsland_PokemonCenter_1F_EventScript_16E8EF, 0, 0, 0 + object_event 4, 18, 0, 14, 0, 6, 0, 3, 9, 17, 0, 0, 0, 0, 0, CinnabarIsland_PokemonCenter_1F_EventScript_16E901, 0, 0, 0 + object_event 5, 0, 0, 2, 0, 1, 0, 0, 76, 17, 0, 0, 0, 0, 0, CinnabarIsland_PokemonCenter_1F_EventScript_1AD0B9, 157, 0, 0 + object_event 6, 0, 0, 3, 0, 1, 0, 0, 76, 17, 0, 0, 0, 0, 0, CinnabarIsland_PokemonCenter_1F_EventScript_1AD0B9, 157, 0, 0 + object_event 7, 73, 0, 11, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, CinnabarIsland_PokemonCenter_1F_EventScript_16E90A, 162, 0, 0 + +CinnabarIsland_PokemonCenter_1F_MapWarps: + warp_def 7, 8, 0, 3, 776 + warp_def 6, 8, 3, 3, 776 + warp_def 8, 8, 0, 3, 776 + warp_def 1, 6, 4, 0, 3078 + +CinnabarIsland_PokemonCenter_1F_MapEvents:: + map_events CinnabarIsland_PokemonCenter_1F_EventObjects, CinnabarIsland_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/CinnabarIsland_PokemonCenter_2F/events.inc b/data/maps/CinnabarIsland_PokemonCenter_2F/events.inc new file mode 100644 index 000000000..4d375567e --- /dev/null +++ b/data/maps/CinnabarIsland_PokemonCenter_2F/events.inc @@ -0,0 +1,13 @@ +CinnabarIsland_PokemonCenter_2F_EventObjects: + object_event 1, 65, 0, 6, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, CinnabarIsland_PokemonCenter_2F_EventScript_1A8CF6, 0, 0, 0 + object_event 2, 65, 0, 2, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, CinnabarIsland_PokemonCenter_2F_EventScript_1A8CFC, 0, 0, 0 + object_event 3, 65, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, CinnabarIsland_PokemonCenter_2F_EventScript_1A8D02, 0, 0, 0 + object_event 4, 69, 0, 1, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, CinnabarIsland_PokemonCenter_2F_EventScript_1BB1D2, 112, 0, 0 + +CinnabarIsland_PokemonCenter_2F_MapWarps: + warp_def 1, 6, 4, 3, 3077 + warp_def 5, 1, 0, 0, 4 + warp_def 9, 1, 0, 0, 1 + +CinnabarIsland_PokemonCenter_2F_MapEvents:: + map_events CinnabarIsland_PokemonCenter_2F_EventObjects, CinnabarIsland_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/CinnabarIsland_PokemonLab_Entrance/events.inc b/data/maps/CinnabarIsland_PokemonLab_Entrance/events.inc new file mode 100644 index 000000000..bb6eaa996 --- /dev/null +++ b/data/maps/CinnabarIsland_PokemonLab_Entrance/events.inc @@ -0,0 +1,19 @@ +CinnabarIsland_PokemonLab_Entrance_EventObjects: + object_event 1, 55, 0, 2, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, CinnabarIsland_PokemonLab_Entrance_EventScript_16E28B, 0, 0, 0 + +CinnabarIsland_PokemonLab_Entrance_MapWarps: + warp_def 3, 9, 3, 2, 776 + warp_def 4, 9, 3, 2, 776 + warp_def 5, 9, 3, 2, 776 + warp_def 13, 5, 0, 0, 3074 + warp_def 19, 5, 0, 0, 3075 + warp_def 25, 5, 0, 0, 3076 + +CinnabarIsland_PokemonLab_Entrance_MapBGEvents: + bg_event 4, 1, 0, 0, 0, CinnabarIsland_PokemonLab_Entrance_EventScript_16E294 + bg_event 12, 5, 0, 0, 0, CinnabarIsland_PokemonLab_Entrance_EventScript_16E29D + bg_event 18, 5, 0, 0, 0, CinnabarIsland_PokemonLab_Entrance_EventScript_16E2A6 + bg_event 24, 5, 0, 0, 0, CinnabarIsland_PokemonLab_Entrance_EventScript_16E2AF + +CinnabarIsland_PokemonLab_Entrance_MapEvents:: + map_events CinnabarIsland_PokemonLab_Entrance_EventObjects, CinnabarIsland_PokemonLab_Entrance_MapWarps, 0x0, CinnabarIsland_PokemonLab_Entrance_MapBGEvents diff --git a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/events.inc b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/events.inc new file mode 100644 index 000000000..75a21aaca --- /dev/null +++ b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/events.inc @@ -0,0 +1,9 @@ +CinnabarIsland_PokemonLab_ExperimentRoom_EventObjects: + object_event 1, 19, 0, 11, 0, 8, 0, 3, 7, 17, 0, 0, 0, 0, 0, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E401, 0, 0, 0 + object_event 2, 55, 0, 12, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E47D, 0, 0, 0 + +CinnabarIsland_PokemonLab_ExperimentRoom_MapWarps: + warp_def 7, 9, 3, 5, 3073 + +CinnabarIsland_PokemonLab_ExperimentRoom_MapEvents:: + map_events CinnabarIsland_PokemonLab_ExperimentRoom_EventObjects, CinnabarIsland_PokemonLab_ExperimentRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/CinnabarIsland_PokemonLab_Lounge/events.inc b/data/maps/CinnabarIsland_PokemonLab_Lounge/events.inc new file mode 100644 index 000000000..5a507173c --- /dev/null +++ b/data/maps/CinnabarIsland_PokemonLab_Lounge/events.inc @@ -0,0 +1,10 @@ +CinnabarIsland_PokemonLab_Lounge_EventObjects: + object_event 1, 55, 0, 5, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, CinnabarIsland_PokemonLab_Lounge_EventScript_16E2B9, 0, 0, 0 + object_event 2, 33, 0, 4, 0, 6, 0, 3, 8, 17, 0, 0, 0, 0, 0, CinnabarIsland_PokemonLab_Lounge_EventScript_16E2C2, 0, 0, 0 + object_event 3, 28, 0, 10, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, CinnabarIsland_PokemonLab_Lounge_EventScript_16E33E, 0, 0, 0 + +CinnabarIsland_PokemonLab_Lounge_MapWarps: + warp_def 7, 9, 3, 3, 3073 + +CinnabarIsland_PokemonLab_Lounge_MapEvents:: + map_events CinnabarIsland_PokemonLab_Lounge_EventObjects, CinnabarIsland_PokemonLab_Lounge_MapWarps, 0x0, 0x0 diff --git a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/events.inc b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/events.inc new file mode 100644 index 000000000..5d42ba425 --- /dev/null +++ b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/events.inc @@ -0,0 +1,13 @@ +CinnabarIsland_PokemonLab_ResearchRoom_EventObjects: + object_event 1, 52, 0, 5, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3DF, 0, 0, 0 + object_event 2, 55, 0, 10, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3E5, 0, 0, 0 + +CinnabarIsland_PokemonLab_ResearchRoom_MapWarps: + warp_def 7, 9, 3, 4, 3073 + +CinnabarIsland_PokemonLab_ResearchRoom_MapBGEvents: + bg_event 6, 1, 0, 0, 0, CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3F7 + bg_event 3, 1, 0, 0, 0, CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3EE + +CinnabarIsland_PokemonLab_ResearchRoom_MapEvents:: + map_events CinnabarIsland_PokemonLab_ResearchRoom_EventObjects, CinnabarIsland_PokemonLab_ResearchRoom_MapWarps, 0x0, CinnabarIsland_PokemonLab_ResearchRoom_MapBGEvents diff --git a/data/maps/DiglettsCave_B1F/events.inc b/data/maps/DiglettsCave_B1F/events.inc new file mode 100644 index 000000000..28fc71f2e --- /dev/null +++ b/data/maps/DiglettsCave_B1F/events.inc @@ -0,0 +1,6 @@ +DiglettsCave_B1F_MapWarps: + warp_def 3, 3, 3, 0, 292 + warp_def 82, 71, 3, 1, 294 + +DiglettsCave_B1F_MapEvents:: + map_events 0x0, DiglettsCave_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/DiglettsCave_NorthEntrance/events.inc b/data/maps/DiglettsCave_NorthEntrance/events.inc new file mode 100644 index 000000000..6f209ac58 --- /dev/null +++ b/data/maps/DiglettsCave_NorthEntrance/events.inc @@ -0,0 +1,9 @@ +DiglettsCave_NorthEntrance_EventObjects: + object_event 1, 56, 0, 4, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, DiglettsCave_NorthEntrance_EventScript_160EE8, 0, 0, 0 + +DiglettsCave_NorthEntrance_MapWarps: + warp_def 6, 4, 3, 0, 293 + warp_def 4, 6, 3, 3, 788 + +DiglettsCave_NorthEntrance_MapEvents:: + map_events DiglettsCave_NorthEntrance_EventObjects, DiglettsCave_NorthEntrance_MapWarps, 0x0, 0x0 diff --git a/data/maps/DiglettsCave_SouthEntrance/events.inc b/data/maps/DiglettsCave_SouthEntrance/events.inc new file mode 100644 index 000000000..3fcda108c --- /dev/null +++ b/data/maps/DiglettsCave_SouthEntrance/events.inc @@ -0,0 +1,9 @@ +DiglettsCave_SouthEntrance_EventObjects: + object_event 1, 32, 0, 4, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, DiglettsCave_SouthEntrance_EventScript_160EFC, 0, 0, 0 + +DiglettsCave_SouthEntrance_MapWarps: + warp_def 4, 6, 3, 0, 797 + warp_def 6, 4, 3, 1, 293 + +DiglettsCave_SouthEntrance_MapEvents:: + map_events DiglettsCave_SouthEntrance_EventObjects, DiglettsCave_SouthEntrance_MapWarps, 0x0, 0x0 diff --git a/data/maps/FiveIsland/events.inc b/data/maps/FiveIsland/events.inc new file mode 100644 index 000000000..251987b17 --- /dev/null +++ b/data/maps/FiveIsland/events.inc @@ -0,0 +1,16 @@ +FiveIsland_EventObjects: + object_event 1, 57, 0, 8, 0, 5, 0, 3, 9, 17, 0, 0, 0, 0, 0, FiveIsland_EventScript_167EAA, 0, 0, 0 + object_event 2, 20, 0, 16, 0, 10, 0, 3, 2, 17, 0, 0, 0, 0, 0, FiveIsland_EventScript_167EA1, 0, 0, 0 + object_event 3, 65375, 0, 32, 0, 9, 0, 4, 0, 0, 0, 56, 0, 3, 0, 0x0, 0, 0, 0 + +FiveIsland_MapWarps: + warp_def 12, 14, 3, 0, 9218 + warp_def 18, 6, 0, 0, 9216 + warp_def 12, 6, 0, 0, 9219 + warp_def 22, 9, 0, 0, 9220 + +FiveIsland_MapBGEvents: + bg_event 20, 8, 0, 0, 0, FiveIsland_EventScript_167E98 + +FiveIsland_MapEvents:: + map_events FiveIsland_EventObjects, FiveIsland_MapWarps, 0x0, FiveIsland_MapBGEvents diff --git a/data/maps/FiveIsland_Harbor/events.inc b/data/maps/FiveIsland_Harbor/events.inc new file mode 100644 index 000000000..6417e1ee7 --- /dev/null +++ b/data/maps/FiveIsland_Harbor/events.inc @@ -0,0 +1,9 @@ +FiveIsland_Harbor_EventObjects: + object_event 1, 108, 0, 8, 0, 9, 0, 0, 8, 17, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 2, 62, 0, 8, 0, 6, 0, 3, 7, 17, 0, 0, 0, 0, 0, FiveIsland_Harbor_EventScript_171D43, 0, 0, 0 + +FiveIsland_Harbor_MapWarps: + warp_def 8, 2, 3, 0, 784 + +FiveIsland_Harbor_MapEvents:: + map_events FiveIsland_Harbor_EventObjects, FiveIsland_Harbor_MapWarps, 0x0, 0x0 diff --git a/data/maps/FiveIsland_House1/events.inc b/data/maps/FiveIsland_House1/events.inc new file mode 100644 index 000000000..8c965a738 --- /dev/null +++ b/data/maps/FiveIsland_House1/events.inc @@ -0,0 +1,8 @@ +FiveIsland_House1_EventObjects: + object_event 1, 31, 0, 10, 0, 2, 0, 3, 7, 17, 0, 0, 0, 0, 0, FiveIsland_House1_EventScript_171D57, 0, 0, 0 + +FiveIsland_House1_MapWarps: + warp_def 4, 7, 3, 2, 784 + +FiveIsland_House1_MapEvents:: + map_events FiveIsland_House1_EventObjects, FiveIsland_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/FiveIsland_House2/events.inc b/data/maps/FiveIsland_House2/events.inc new file mode 100644 index 000000000..6884a009e --- /dev/null +++ b/data/maps/FiveIsland_House2/events.inc @@ -0,0 +1,8 @@ +FiveIsland_House2_EventObjects: + object_event 1, 32, 0, 2, 0, 3, 0, 3, 2, 33, 0, 0, 0, 0, 0, FiveIsland_House2_EventScript_171D61, 0, 0, 0 + +FiveIsland_House2_MapWarps: + warp_def 4, 7, 3, 3, 784 + +FiveIsland_House2_MapEvents:: + map_events FiveIsland_House2_EventObjects, FiveIsland_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/FiveIsland_LostCave_Entrance/events.inc b/data/maps/FiveIsland_LostCave_Entrance/events.inc new file mode 100644 index 000000000..663c7163d --- /dev/null +++ b/data/maps/FiveIsland_LostCave_Entrance/events.inc @@ -0,0 +1,6 @@ +FiveIsland_LostCave_Entrance_MapWarps: + warp_def 5, 8, 3, 0, 822 + warp_def 5, 5, 3, 0, 525 + +FiveIsland_LostCave_Entrance_MapEvents:: + map_events 0x0, FiveIsland_LostCave_Entrance_MapWarps, 0x0, 0x0 diff --git a/data/maps/FiveIsland_LostCave_Room1/events.inc b/data/maps/FiveIsland_LostCave_Room1/events.inc new file mode 100644 index 000000000..b9184c4d1 --- /dev/null +++ b/data/maps/FiveIsland_LostCave_Room1/events.inc @@ -0,0 +1,12 @@ +FiveIsland_LostCave_Room1_EventObjects: + object_event 1, 56, 0, 5, 0, 4, 0, 3, 2, 17, 0, 1, 0, 1, 0, FiveIsland_LostCave_Room1_EventScript_164BF7, 0, 0, 0 + +FiveIsland_LostCave_Room1_MapWarps: + warp_def 8, 2, 3, 1, 524 + warp_def 5, 1, 3, 3, 525 + warp_def 8, 5, 3, 3, 526 + warp_def 5, 8, 3, 1, 525 + warp_def 2, 5, 3, 2, 525 + +FiveIsland_LostCave_Room1_MapEvents:: + map_events FiveIsland_LostCave_Room1_EventObjects, FiveIsland_LostCave_Room1_MapWarps, 0x0, 0x0 diff --git a/data/maps/FiveIsland_LostCave_Room10/events.inc b/data/maps/FiveIsland_LostCave_Room10/events.inc new file mode 100644 index 000000000..49d050fc3 --- /dev/null +++ b/data/maps/FiveIsland_LostCave_Room10/events.inc @@ -0,0 +1,9 @@ +FiveIsland_LostCave_Room10_EventObjects: + object_event 1, 28, 0, 5, 0, 5, 0, 3, 7, 17, 0, 0, 0, 0, 0, 0x0, 147, 0, 0 + object_event 2, 92, 0, 5, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, FiveIsland_LostCave_Room10_EventScript_1BEDBB, 504, 0, 0 + +FiveIsland_LostCave_Room10_MapWarps: + warp_def 5, 8, 3, 1, 525 + +FiveIsland_LostCave_Room10_MapEvents:: + map_events FiveIsland_LostCave_Room10_EventObjects, FiveIsland_LostCave_Room10_MapWarps, 0x0, 0x0 diff --git a/data/maps/FiveIsland_LostCave_Room11/events.inc b/data/maps/FiveIsland_LostCave_Room11/events.inc new file mode 100644 index 000000000..caa37b4a1 --- /dev/null +++ b/data/maps/FiveIsland_LostCave_Room11/events.inc @@ -0,0 +1,8 @@ +FiveIsland_LostCave_Room11_EventObjects: + object_event 1, 92, 0, 5, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, FiveIsland_LostCave_Room11_EventScript_1BEDC8, 505, 0, 0 + +FiveIsland_LostCave_Room11_MapWarps: + warp_def 5, 1, 3, 3, 525 + +FiveIsland_LostCave_Room11_MapEvents:: + map_events FiveIsland_LostCave_Room11_EventObjects, FiveIsland_LostCave_Room11_MapWarps, 0x0, 0x0 diff --git a/data/maps/FiveIsland_LostCave_Room12/events.inc b/data/maps/FiveIsland_LostCave_Room12/events.inc new file mode 100644 index 000000000..fc54c26b6 --- /dev/null +++ b/data/maps/FiveIsland_LostCave_Room12/events.inc @@ -0,0 +1,8 @@ +FiveIsland_LostCave_Room12_EventObjects: + object_event 1, 92, 0, 5, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, FiveIsland_LostCave_Room12_EventScript_1BEDD5, 506, 0, 0 + +FiveIsland_LostCave_Room12_MapWarps: + warp_def 5, 8, 3, 1, 525 + +FiveIsland_LostCave_Room12_MapEvents:: + map_events FiveIsland_LostCave_Room12_EventObjects, FiveIsland_LostCave_Room12_MapWarps, 0x0, 0x0 diff --git a/data/maps/FiveIsland_LostCave_Room13/events.inc b/data/maps/FiveIsland_LostCave_Room13/events.inc new file mode 100644 index 000000000..0802e023c --- /dev/null +++ b/data/maps/FiveIsland_LostCave_Room13/events.inc @@ -0,0 +1,8 @@ +FiveIsland_LostCave_Room13_EventObjects: + object_event 1, 92, 0, 5, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, FiveIsland_LostCave_Room13_EventScript_1BEDE2, 507, 0, 0 + +FiveIsland_LostCave_Room13_MapWarps: + warp_def 2, 5, 3, 2, 525 + +FiveIsland_LostCave_Room13_MapEvents:: + map_events FiveIsland_LostCave_Room13_EventObjects, FiveIsland_LostCave_Room13_MapWarps, 0x0, 0x0 diff --git a/data/maps/FiveIsland_LostCave_Room14/events.inc b/data/maps/FiveIsland_LostCave_Room14/events.inc new file mode 100644 index 000000000..a591f0c1e --- /dev/null +++ b/data/maps/FiveIsland_LostCave_Room14/events.inc @@ -0,0 +1,8 @@ +FiveIsland_LostCave_Room14_EventObjects: + object_event 1, 92, 0, 5, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, FiveIsland_LostCave_Room14_EventScript_1BEDEF, 508, 0, 0 + +FiveIsland_LostCave_Room14_MapWarps: + warp_def 8, 5, 3, 4, 525 + +FiveIsland_LostCave_Room14_MapEvents:: + map_events FiveIsland_LostCave_Room14_EventObjects, FiveIsland_LostCave_Room14_MapWarps, 0x0, 0x0 diff --git a/data/maps/FiveIsland_LostCave_Room2/events.inc b/data/maps/FiveIsland_LostCave_Room2/events.inc new file mode 100644 index 000000000..30d44861d --- /dev/null +++ b/data/maps/FiveIsland_LostCave_Room2/events.inc @@ -0,0 +1,8 @@ +FiveIsland_LostCave_Room2_MapWarps: + warp_def 5, 1, 3, 2, 527 + warp_def 8, 5, 3, 4, 525 + warp_def 5, 8, 3, 0, 535 + warp_def 2, 5, 3, 2, 525 + +FiveIsland_LostCave_Room2_MapEvents:: + map_events 0x0, FiveIsland_LostCave_Room2_MapWarps, 0x0, 0x0 diff --git a/data/maps/FiveIsland_LostCave_Room3/events.inc b/data/maps/FiveIsland_LostCave_Room3/events.inc new file mode 100644 index 000000000..04e50762a --- /dev/null +++ b/data/maps/FiveIsland_LostCave_Room3/events.inc @@ -0,0 +1,8 @@ +FiveIsland_LostCave_Room3_MapWarps: + warp_def 5, 1, 3, 3, 525 + warp_def 8, 5, 3, 4, 525 + warp_def 5, 8, 3, 0, 528 + warp_def 2, 5, 3, 2, 525 + +FiveIsland_LostCave_Room3_MapEvents:: + map_events 0x0, FiveIsland_LostCave_Room3_MapWarps, 0x0, 0x0 diff --git a/data/maps/FiveIsland_LostCave_Room4/events.inc b/data/maps/FiveIsland_LostCave_Room4/events.inc new file mode 100644 index 000000000..6c7ec30b0 --- /dev/null +++ b/data/maps/FiveIsland_LostCave_Room4/events.inc @@ -0,0 +1,11 @@ +FiveIsland_LostCave_Room4_EventObjects: + object_event 1, 23, 0, 6, 0, 4, 0, 3, 8, 17, 0, 1, 0, 1, 0, FiveIsland_LostCave_Room4_EventScript_164C11, 0, 0, 0 + +FiveIsland_LostCave_Room4_MapWarps: + warp_def 5, 1, 3, 0, 536 + warp_def 8, 5, 3, 4, 525 + warp_def 5, 8, 3, 0, 529 + warp_def 2, 5, 3, 2, 525 + +FiveIsland_LostCave_Room4_MapEvents:: + map_events FiveIsland_LostCave_Room4_EventObjects, FiveIsland_LostCave_Room4_MapWarps, 0x0, 0x0 diff --git a/data/maps/FiveIsland_LostCave_Room5/events.inc b/data/maps/FiveIsland_LostCave_Room5/events.inc new file mode 100644 index 000000000..d16df207c --- /dev/null +++ b/data/maps/FiveIsland_LostCave_Room5/events.inc @@ -0,0 +1,8 @@ +FiveIsland_LostCave_Room5_MapWarps: + warp_def 5, 1, 3, 3, 525 + warp_def 8, 5, 3, 3, 530 + warp_def 5, 8, 3, 1, 525 + warp_def 2, 5, 3, 2, 525 + +FiveIsland_LostCave_Room5_MapEvents:: + map_events 0x0, FiveIsland_LostCave_Room5_MapWarps, 0x0, 0x0 diff --git a/data/maps/FiveIsland_LostCave_Room6/events.inc b/data/maps/FiveIsland_LostCave_Room6/events.inc new file mode 100644 index 000000000..675db376a --- /dev/null +++ b/data/maps/FiveIsland_LostCave_Room6/events.inc @@ -0,0 +1,8 @@ +FiveIsland_LostCave_Room6_MapWarps: + warp_def 5, 1, 3, 3, 525 + warp_def 8, 5, 3, 0, 537 + warp_def 5, 8, 3, 1, 525 + warp_def 2, 5, 3, 1, 531 + +FiveIsland_LostCave_Room6_MapEvents:: + map_events 0x0, FiveIsland_LostCave_Room6_MapWarps, 0x0, 0x0 diff --git a/data/maps/FiveIsland_LostCave_Room7/events.inc b/data/maps/FiveIsland_LostCave_Room7/events.inc new file mode 100644 index 000000000..72dd3255b --- /dev/null +++ b/data/maps/FiveIsland_LostCave_Room7/events.inc @@ -0,0 +1,8 @@ +FiveIsland_LostCave_Room7_MapWarps: + warp_def 5, 1, 3, 3, 525 + warp_def 8, 5, 3, 4, 525 + warp_def 5, 8, 3, 0, 532 + warp_def 2, 5, 3, 2, 525 + +FiveIsland_LostCave_Room7_MapEvents:: + map_events 0x0, FiveIsland_LostCave_Room7_MapWarps, 0x0, 0x0 diff --git a/data/maps/FiveIsland_LostCave_Room8/events.inc b/data/maps/FiveIsland_LostCave_Room8/events.inc new file mode 100644 index 000000000..c7d86e0d8 --- /dev/null +++ b/data/maps/FiveIsland_LostCave_Room8/events.inc @@ -0,0 +1,8 @@ +FiveIsland_LostCave_Room8_MapWarps: + warp_def 5, 1, 3, 3, 525 + warp_def 8, 5, 3, 3, 533 + warp_def 5, 8, 3, 1, 525 + warp_def 2, 5, 3, 0, 538 + +FiveIsland_LostCave_Room8_MapEvents:: + map_events 0x0, FiveIsland_LostCave_Room8_MapWarps, 0x0, 0x0 diff --git a/data/maps/FiveIsland_LostCave_Room9/events.inc b/data/maps/FiveIsland_LostCave_Room9/events.inc new file mode 100644 index 000000000..37bca157c --- /dev/null +++ b/data/maps/FiveIsland_LostCave_Room9/events.inc @@ -0,0 +1,8 @@ +FiveIsland_LostCave_Room9_MapWarps: + warp_def 5, 1, 3, 0, 534 + warp_def 8, 5, 3, 4, 525 + warp_def 5, 8, 3, 1, 525 + warp_def 2, 5, 3, 2, 525 + +FiveIsland_LostCave_Room9_MapEvents:: + map_events 0x0, FiveIsland_LostCave_Room9_MapWarps, 0x0, 0x0 diff --git a/data/maps/FiveIsland_Meadow/events.inc b/data/maps/FiveIsland_Meadow/events.inc new file mode 100644 index 000000000..ec4f57c41 --- /dev/null +++ b/data/maps/FiveIsland_Meadow/events.inc @@ -0,0 +1,17 @@ +FiveIsland_Meadow_EventObjects: + object_event 1, 50, 0, 18, 0, 18, 0, 3, 2, 17, 0, 1, 0, 1, 0, FiveIsland_Meadow_EventScript_1689BB, 136, 0, 0 + object_event 2, 49, 0, 17, 0, 5, 0, 3, 17, 17, 0, 1, 0, 5, 0, FiveIsland_Meadow_EventScript_16898D, 136, 0, 0 + object_event 3, 49, 0, 11, 0, 27, 0, 3, 10, 17, 0, 1, 0, 3, 0, FiveIsland_Meadow_EventScript_1689A4, 136, 0, 0 + object_event 4, 95, 0, 8, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, FiveIsland_Meadow_EventScript_1BDF13, 18, 0, 0 + object_event 5, 95, 0, 19, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, FiveIsland_Meadow_EventScript_1BDF13, 19, 0, 0 + object_event 6, 92, 0, 12, 0, 11, 0, 3, 8, 17, 0, 0, 0, 0, 0, FiveIsland_Meadow_EventScript_1BEC69, 478, 0, 0 + object_event 7, 92, 0, 3, 0, 22, 0, 3, 8, 17, 0, 0, 0, 0, 0, FiveIsland_Meadow_EventScript_1BEC76, 479, 0, 0 + +FiveIsland_Meadow_MapWarps: + warp_def 12, 21, 0, 0, 370 + +FiveIsland_Meadow_MapBGEvents: + bg_event 12, 21, 0, 0, 0, FiveIsland_Meadow_EventScript_168942 + +FiveIsland_Meadow_MapEvents:: + map_events FiveIsland_Meadow_EventObjects, FiveIsland_Meadow_MapWarps, 0x0, FiveIsland_Meadow_MapBGEvents diff --git a/data/maps/FiveIsland_MemorialPillar/events.inc b/data/maps/FiveIsland_MemorialPillar/events.inc new file mode 100644 index 000000000..567b8c789 --- /dev/null +++ b/data/maps/FiveIsland_MemorialPillar/events.inc @@ -0,0 +1,16 @@ +FiveIsland_MemorialPillar_EventObjects: + object_event 1, 25, 0, 8, 0, 44, 0, 4, 15, 17, 0, 0, 0, 0, 0, FiveIsland_MemorialPillar_EventScript_1689D3, 0, 0, 0 + object_event 2, 26, 0, 12, 0, 6, 0, 3, 21, 17, 0, 1, 0, 3, 0, FiveIsland_MemorialPillar_EventScript_1AC317, 0, 0, 0 + object_event 3, 26, 0, 14, 0, 17, 0, 3, 19, 17, 0, 1, 0, 2, 0, FiveIsland_MemorialPillar_EventScript_1AC355, 0, 0, 0 + object_event 4, 26, 0, 17, 0, 31, 0, 3, 2, 17, 0, 1, 0, 3, 0, FiveIsland_MemorialPillar_EventScript_1AC393, 0, 0, 0 + object_event 5, 92, 0, 4, 0, 47, 0, 3, 8, 17, 0, 0, 0, 0, 0, FiveIsland_MemorialPillar_EventScript_1BEC83, 480, 0, 0 + +FiveIsland_MemorialPillar_MapBGEvents: + bg_event 9, 43, 0, 1, 0, FiveIsland_MemorialPillar_EventScript_168A48 + bg_event 8, 52, 3, 7, 0, 107, 170, 1 + bg_event 15, 7, 3, 7, 0, 148, 171, 1 + bg_event 17, 22, 3, 7, 0, 142, 172, 1 + bg_event 14, 25, 3, 7, 0, 149, 173, 1 + +FiveIsland_MemorialPillar_MapEvents:: + map_events FiveIsland_MemorialPillar_EventObjects, 0x0, 0x0, FiveIsland_MemorialPillar_MapBGEvents diff --git a/data/maps/FiveIsland_PokemonCenter_1F/events.inc b/data/maps/FiveIsland_PokemonCenter_1F/events.inc new file mode 100644 index 000000000..3e7db2299 --- /dev/null +++ b/data/maps/FiveIsland_PokemonCenter_1F/events.inc @@ -0,0 +1,13 @@ +FiveIsland_PokemonCenter_1F_EventObjects: + object_event 1, 64, 0, 7, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, FiveIsland_PokemonCenter_1F_EventScript_171D00, 0, 0, 0 + object_event 2, 42, 0, 9, 0, 4, 0, 3, 7, 17, 0, 0, 0, 0, 0, FiveIsland_PokemonCenter_1F_EventScript_171D12, 0, 0, 0 + object_event 3, 59, 0, 4, 0, 8, 0, 3, 5, 17, 0, 0, 0, 0, 0, FiveIsland_PokemonCenter_1F_EventScript_171D09, 0, 0, 0 + object_event 4, 0, 0, 2, 0, 1, 0, 0, 76, 17, 0, 0, 0, 0, 0, FiveIsland_PokemonCenter_1F_EventScript_1ACF5F, 157, 0, 0 + object_event 5, 0, 0, 3, 0, 1, 0, 0, 76, 17, 0, 0, 0, 0, 0, FiveIsland_PokemonCenter_1F_EventScript_1ACF5F, 157, 0, 0 + +FiveIsland_PokemonCenter_1F_MapWarps: + warp_def 7, 8, 3, 1, 784 + warp_def 1, 6, 4, 0, 9217 + +FiveIsland_PokemonCenter_1F_MapEvents:: + map_events FiveIsland_PokemonCenter_1F_EventObjects, FiveIsland_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/FiveIsland_PokemonCenter_2F/events.inc b/data/maps/FiveIsland_PokemonCenter_2F/events.inc new file mode 100644 index 000000000..13819a9a9 --- /dev/null +++ b/data/maps/FiveIsland_PokemonCenter_2F/events.inc @@ -0,0 +1,13 @@ +FiveIsland_PokemonCenter_2F_EventObjects: + object_event 1, 65, 0, 6, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FiveIsland_PokemonCenter_2F_EventScript_1A8CF6, 0, 0, 0 + object_event 2, 65, 0, 2, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FiveIsland_PokemonCenter_2F_EventScript_1A8CFC, 0, 0, 0 + object_event 3, 65, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FiveIsland_PokemonCenter_2F_EventScript_1A8D02, 0, 0, 0 + object_event 4, 69, 0, 1, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, FiveIsland_PokemonCenter_2F_EventScript_1BB1D2, 112, 0, 0 + +FiveIsland_PokemonCenter_2F_MapWarps: + warp_def 1, 6, 4, 1, 9216 + warp_def 5, 1, 0, 0, 4 + warp_def 9, 1, 0, 0, 1 + +FiveIsland_PokemonCenter_2F_MapEvents:: + map_events FiveIsland_PokemonCenter_2F_EventObjects, FiveIsland_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/FiveIsland_ResortGorgeous/events.inc b/data/maps/FiveIsland_ResortGorgeous/events.inc new file mode 100644 index 000000000..a9f1df1db --- /dev/null +++ b/data/maps/FiveIsland_ResortGorgeous/events.inc @@ -0,0 +1,23 @@ +FiveIsland_ResortGorgeous_EventObjects: + object_event 1, 22, 0, 44, 0, 10, 0, 3, 18, 17, 0, 1, 0, 3, 0, FiveIsland_ResortGorgeous_EventScript_1AC127, 0, 0, 0 + object_event 2, 22, 0, 33, 0, 12, 0, 3, 7, 17, 0, 1, 0, 4, 0, FiveIsland_ResortGorgeous_EventScript_1AC165, 0, 0, 0 + object_event 3, 22, 0, 12, 0, 10, 0, 3, 8, 17, 0, 1, 0, 1, 0, FiveIsland_ResortGorgeous_EventScript_1AC1A3, 0, 0, 0 + object_event 4, 28, 0, 23, 0, 9, 0, 3, 2, 18, 0, 1, 0, 1, 0, FiveIsland_ResortGorgeous_EventScript_1AC1E1, 0, 0, 0 + object_event 5, 28, 0, 33, 0, 8, 0, 3, 8, 17, 0, 1, 0, 1, 0, FiveIsland_ResortGorgeous_EventScript_1AC21F, 0, 0, 0 + object_event 6, 18, 0, 33, 0, 3, 0, 3, 46, 26, 0, 1, 0, 1, 0, FiveIsland_ResortGorgeous_EventScript_1AC25D, 0, 0, 0 + object_event 7, 43, 0, 56, 0, 7, 0, 1, 1, 17, 0, 1, 0, 1, 0, FiveIsland_ResortGorgeous_EventScript_1AC29B, 0, 0, 0 + object_event 8, 28, 0, 39, 0, 9, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, 148, 0, 0 + +FiveIsland_ResortGorgeous_MapWarps: + warp_def 64, 13, 3, 0, 524 + warp_def 39, 8, 0, 0, 9984 + +FiveIsland_ResortGorgeous_MapBGEvents: + bg_event 10, 7, 3, 7, 0, 8, 174, 1 + bg_event 27, 11, 3, 7, 0, 108, 175, 1 + bg_event 40, 12, 3, 7, 0, 109, 176, 1 + bg_event 27, 5, 3, 7, 0, 108, 177, 1 + bg_event 42, 9, 0, 0, 0, FiveIsland_ResortGorgeous_EventScript_168844 + +FiveIsland_ResortGorgeous_MapEvents:: + map_events FiveIsland_ResortGorgeous_EventObjects, FiveIsland_ResortGorgeous_MapWarps, 0x0, FiveIsland_ResortGorgeous_MapBGEvents diff --git a/data/maps/FiveIsland_ResortGorgeous_House/events.inc b/data/maps/FiveIsland_ResortGorgeous_House/events.inc new file mode 100644 index 000000000..ea5ba7114 --- /dev/null +++ b/data/maps/FiveIsland_ResortGorgeous_House/events.inc @@ -0,0 +1,13 @@ +FiveIsland_ResortGorgeous_House_EventObjects: + object_event 1, 28, 0, 4, 0, 4, 0, 3, 10, 17, 0, 0, 0, 0, 0, FiveIsland_ResortGorgeous_House_EventScript_171EBE, 149, 0, 0 + object_event 2, 61, 0, 6, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, FiveIsland_ResortGorgeous_House_EventScript_172062, 150, 0, 0 + +FiveIsland_ResortGorgeous_House_MapWarps: + warp_def 4, 7, 3, 1, 822 + +FiveIsland_ResortGorgeous_House_MapBGEvents: + bg_event 9, 1, 0, 1, 0, FiveIsland_ResortGorgeous_House_EventScript_1ACF2C + bg_event 8, 1, 0, 1, 0, FiveIsland_ResortGorgeous_House_EventScript_1ACF2C + +FiveIsland_ResortGorgeous_House_MapEvents:: + map_events FiveIsland_ResortGorgeous_House_EventObjects, FiveIsland_ResortGorgeous_House_MapWarps, 0x0, FiveIsland_ResortGorgeous_House_MapBGEvents diff --git a/data/maps/FiveIsland_WaterLabyrinth/events.inc b/data/maps/FiveIsland_WaterLabyrinth/events.inc new file mode 100644 index 000000000..400b22c61 --- /dev/null +++ b/data/maps/FiveIsland_WaterLabyrinth/events.inc @@ -0,0 +1,6 @@ +FiveIsland_WaterLabyrinth_EventObjects: + object_event 1, 61, 0, 14, 0, 11, 0, 3, 8, 17, 0, 0, 0, 0, 0, FiveIsland_WaterLabyrinth_EventScript_16884E, 0, 0, 0 + object_event 2, 28, 0, 9, 0, 7, 0, 3, 2, 17, 0, 1, 0, 1, 0, FiveIsland_WaterLabyrinth_EventScript_1AC2D9, 0, 0, 0 + +FiveIsland_WaterLabyrinth_MapEvents:: + map_events FiveIsland_WaterLabyrinth_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/FourIsland/events.inc b/data/maps/FourIsland/events.inc new file mode 100644 index 000000000..5e34db60d --- /dev/null +++ b/data/maps/FourIsland/events.inc @@ -0,0 +1,32 @@ +FourIsland_EventObjects: + object_event 1, 32, 0, 16, 0, 13, 0, 3, 8, 17, 0, 0, 0, 0, 0, FourIsland_EventScript_167D55, 0, 0, 0 + object_event 2, 132, 0, 12, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 3, 122, 0, 13, 0, 7, 0, 3, 10, 17, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 4, 123, 0, 14, 0, 7, 0, 3, 9, 17, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 5, 121, 0, 17, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 6, 35, 0, 26, 0, 19, 0, 3, 9, 17, 0, 0, 0, 0, 0, FourIsland_EventScript_167E2E, 0, 0, 0 + object_event 7, 96, 0, 5, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, FourIsland_EventScript_1BE00C, 18, 0, 0 + object_event 8, 92, 0, 5, 0, 6, 0, 3, 8, 17, 0, 0, 0, 0, 0, FourIsland_EventScript_1BEC28, 473, 0, 0 + object_event 9, 92, 0, 32, 0, 19, 0, 3, 8, 17, 0, 0, 0, 0, 0, FourIsland_EventScript_1BEC35, 474, 0, 0 + object_event 10, 72, 0, 8, 0, 25, 0, 3, 9, 17, 0, 0, 0, 0, 0, 0x0, 151, 0, 0 + object_event 11, 27, 0, 36, 0, 13, 0, 3, 8, 17, 0, 0, 0, 0, 0, FourIsland_EventScript_167E73, 0, 0, 0 + object_event 12, 17, 0, 31, 0, 21, 0, 3, 10, 17, 0, 0, 0, 0, 0, FourIsland_EventScript_167E5A, 0, 0, 0 + +FourIsland_MapWarps: + warp_def 18, 20, 0, 0, 8961 + warp_def 12, 13, 0, 0, 8960 + warp_def 25, 14, 0, 0, 8963 + warp_def 38, 12, 0, 0, 366 + warp_def 33, 23, 0, 0, 8964 + warp_def 25, 26, 0, 0, 8966 + warp_def 10, 28, 3, 0, 8965 + warp_def 22, 26, 0, 0, 8967 + +FourIsland_MapBGEvents: + bg_event 13, 19, 0, 0, 0, FourIsland_EventScript_167E7C + bg_event 22, 34, 3, 7, 0, 106, 168, 1 + bg_event 6, 21, 3, 7, 0, 2, 169, 1 + bg_event 31, 23, 0, 0, 0, FourIsland_EventScript_167E85 + +FourIsland_MapEvents:: + map_events FourIsland_EventObjects, FourIsland_MapWarps, 0x0, FourIsland_MapBGEvents diff --git a/data/maps/FourIsland_Harbor/events.inc b/data/maps/FourIsland_Harbor/events.inc new file mode 100644 index 000000000..34b82cbe5 --- /dev/null +++ b/data/maps/FourIsland_Harbor/events.inc @@ -0,0 +1,9 @@ +FourIsland_Harbor_EventObjects: + object_event 1, 108, 0, 8, 0, 9, 0, 0, 8, 17, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 2, 62, 0, 8, 0, 6, 0, 3, 7, 17, 0, 0, 0, 0, 0, FourIsland_Harbor_EventScript_171C99, 0, 0, 0 + +FourIsland_Harbor_MapWarps: + warp_def 8, 2, 3, 6, 783 + +FourIsland_Harbor_MapEvents:: + map_events FourIsland_Harbor_EventObjects, FourIsland_Harbor_MapWarps, 0x0, 0x0 diff --git a/data/maps/FourIsland_House1/events.inc b/data/maps/FourIsland_House1/events.inc new file mode 100644 index 000000000..16874c5ca --- /dev/null +++ b/data/maps/FourIsland_House1/events.inc @@ -0,0 +1,9 @@ +FourIsland_House1_EventObjects: + object_event 1, 27, 0, 8, 0, 3, 0, 3, 10, 17, 0, 0, 0, 0, 0, FourIsland_House1_EventScript_1C4D84, 0, 0, 0 + object_event 2, 27, 0, 9, 0, 3, 0, 3, 9, 17, 0, 0, 0, 0, 0, FourIsland_House1_EventScript_171C45, 0, 0, 0 + +FourIsland_House1_MapWarps: + warp_def 4, 7, 3, 2, 783 + +FourIsland_House1_MapEvents:: + map_events FourIsland_House1_EventObjects, FourIsland_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/FourIsland_House2/events.inc b/data/maps/FourIsland_House2/events.inc new file mode 100644 index 000000000..07985cb74 --- /dev/null +++ b/data/maps/FourIsland_House2/events.inc @@ -0,0 +1,8 @@ +FourIsland_House2_EventObjects: + object_event 1, 25, 0, 4, 0, 4, 0, 3, 8, 17, 0, 0, 0, 0, 0, FourIsland_House2_EventScript_1B2938, 0, 0, 0 + +FourIsland_House2_MapWarps: + warp_def 4, 7, 3, 5, 783 + +FourIsland_House2_MapEvents:: + map_events FourIsland_House2_EventObjects, FourIsland_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/FourIsland_IcefallCave_1F/events.inc b/data/maps/FourIsland_IcefallCave_1F/events.inc new file mode 100644 index 000000000..f4b81511d --- /dev/null +++ b/data/maps/FourIsland_IcefallCave_1F/events.inc @@ -0,0 +1,14 @@ +FourIsland_IcefallCave_1F_EventObjects: + object_event 1, 92, 0, 11, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, FourIsland_IcefallCave_1F_EventScript_1BED53, 496, 0, 0 + object_event 2, 92, 0, 12, 0, 16, 0, 3, 8, 17, 0, 0, 0, 0, 0, FourIsland_IcefallCave_1F_EventScript_1BED60, 497, 0, 0 + +FourIsland_IcefallCave_1F_MapWarps: + warp_def 3, 17, 0, 1, 366 + warp_def 2, 8, 3, 2, 366 + warp_def 12, 12, 3, 0, 368 + warp_def 12, 3, 3, 1, 368 + warp_def 15, 16, 3, 2, 368 + warp_def 3, 6, 3, 0, 369 + +FourIsland_IcefallCave_1F_MapEvents:: + map_events FourIsland_IcefallCave_1F_EventObjects, FourIsland_IcefallCave_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/FourIsland_IcefallCave_Entrance/events.inc b/data/maps/FourIsland_IcefallCave_Entrance/events.inc new file mode 100644 index 000000000..fc6ec6e8b --- /dev/null +++ b/data/maps/FourIsland_IcefallCave_Entrance/events.inc @@ -0,0 +1,7 @@ +FourIsland_IcefallCave_Entrance_MapWarps: + warp_def 17, 30, 3, 3, 783 + warp_def 10, 21, 3, 0, 367 + warp_def 9, 7, 3, 1, 367 + +FourIsland_IcefallCave_Entrance_MapEvents:: + map_events 0x0, FourIsland_IcefallCave_Entrance_MapWarps, 0x0, 0x0 diff --git a/data/maps/FourIsland_LoreleisHouse/events.inc b/data/maps/FourIsland_LoreleisHouse/events.inc new file mode 100644 index 000000000..3861ecf62 --- /dev/null +++ b/data/maps/FourIsland_LoreleisHouse/events.inc @@ -0,0 +1,22 @@ +FourIsland_LoreleisHouse_EventObjects: + object_event 1, 77, 0, 7, 0, 4, 0, 3, 9, 17, 0, 0, 0, 0, 0, FourIsland_LoreleisHouse_EventScript_171C58, 140, 0, 0 + object_event 2, 131, 0, 0, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, FourIsland_LoreleisHouse_EventScript_171C8D, 0, 0, 0 + object_event 3, 126, 0, 10, 0, 3, 0, 0, 8, 17, 0, 0, 0, 0, 0, FourIsland_LoreleisHouse_EventScript_171C8D, 0, 0, 0 + object_event 4, 120, 0, 9, 0, 3, 0, 0, 8, 17, 0, 0, 0, 0, 0, FourIsland_LoreleisHouse_EventScript_171C8D, 0, 0, 0 + object_event 5, 128, 0, 7, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, FourIsland_LoreleisHouse_EventScript_171C8D, 0, 0, 0 + object_event 6, 129, 0, 6, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, FourIsland_LoreleisHouse_EventScript_171C8D, 0, 0, 0 + object_event 7, 121, 0, 6, 0, 4, 0, 0, 8, 17, 0, 0, 0, 0, 0, FourIsland_LoreleisHouse_EventScript_171C8D, 0, 0, 0 + object_event 8, 125, 0, 9, 0, 4, 0, 0, 8, 17, 0, 0, 0, 0, 0, FourIsland_LoreleisHouse_EventScript_171C8D, 165, 0, 0 + object_event 9, 117, 0, 10, 0, 4, 0, 0, 8, 17, 0, 0, 0, 0, 0, FourIsland_LoreleisHouse_EventScript_171C8D, 166, 0, 0 + object_event 10, 115, 0, 0, 0, 3, 0, 3, 8, 17, 0, 0, 0, 0, 0, FourIsland_LoreleisHouse_EventScript_171C8D, 168, 0, 0 + object_event 11, 122, 0, 0, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, FourIsland_LoreleisHouse_EventScript_171C8D, 167, 0, 0 + object_event 12, 123, 0, 1, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, FourIsland_LoreleisHouse_EventScript_171C8D, 169, 0, 0 + object_event 13, 114, 0, 9, 0, 0, 0, 3, 8, 17, 0, 0, 0, 0, 0, FourIsland_LoreleisHouse_EventScript_171C8D, 171, 0, 0 + object_event 14, 133, 0, 10, 0, 0, 0, 3, 8, 17, 0, 0, 0, 0, 0, FourIsland_LoreleisHouse_EventScript_171C8D, 170, 0, 0 + object_event 15, 107, 0, 9, 0, 6, 0, 3, 8, 17, 0, 0, 0, 0, 0, FourIsland_LoreleisHouse_EventScript_171C8D, 172, 0, 0 + +FourIsland_LoreleisHouse_MapWarps: + warp_def 4, 7, 3, 4, 783 + +FourIsland_LoreleisHouse_MapEvents:: + map_events FourIsland_LoreleisHouse_EventObjects, FourIsland_LoreleisHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/FourIsland_Mart/events.inc b/data/maps/FourIsland_Mart/events.inc new file mode 100644 index 000000000..1a90c86f5 --- /dev/null +++ b/data/maps/FourIsland_Mart/events.inc @@ -0,0 +1,10 @@ +FourIsland_Mart_EventObjects: + object_event 1, 68, 0, 2, 0, 3, 0, 0, 10, 17, 0, 0, 0, 0, 0, FourIsland_Mart_EventScript_171CAE, 0, 0, 0 + object_event 2, 32, 0, 6, 0, 5, 0, 3, 10, 17, 0, 0, 0, 0, 0, FourIsland_Mart_EventScript_1ACF46, 0, 0, 0 + object_event 3, 39, 0, 8, 0, 3, 0, 3, 2, 18, 0, 0, 0, 0, 0, FourIsland_Mart_EventScript_171CE8, 0, 0, 0 + +FourIsland_Mart_MapWarps: + warp_def 4, 7, 3, 7, 783 + +FourIsland_Mart_MapEvents:: + map_events FourIsland_Mart_EventObjects, FourIsland_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/FourIsland_PokemonCenter_1F/events.inc b/data/maps/FourIsland_PokemonCenter_1F/events.inc new file mode 100644 index 000000000..4f9608cd0 --- /dev/null +++ b/data/maps/FourIsland_PokemonCenter_1F/events.inc @@ -0,0 +1,16 @@ +FourIsland_PokemonCenter_1F_EventObjects: + object_event 1, 64, 0, 7, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, FourIsland_PokemonCenter_1F_EventScript_171BF9, 0, 0, 0 + object_event 2, 25, 0, 10, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, FourIsland_PokemonCenter_1F_EventScript_171C02, 0, 0, 0 + object_event 3, 31, 0, 5, 0, 5, 0, 3, 13, 17, 0, 0, 0, 0, 0, FourIsland_PokemonCenter_1F_EventScript_171C0B, 0, 0, 0 + object_event 4, 61, 0, 2, 0, 2, 0, 3, 7, 17, 0, 0, 0, 0, 0, FourIsland_PokemonCenter_1F_EventScript_171C14, 0, 0, 0 + +FourIsland_PokemonCenter_1F_MapWarps: + warp_def 7, 8, 3, 0, 783 + warp_def 1, 6, 4, 0, 8962 + +FourIsland_PokemonCenter_1F_MapBGEvents: + bg_event 3, 1, 0, 1, 0, FourIsland_PokemonCenter_1F_EventScript_1ACDD0 + bg_event 2, 1, 0, 1, 0, FourIsland_PokemonCenter_1F_EventScript_1ACDD0 + +FourIsland_PokemonCenter_1F_MapEvents:: + map_events FourIsland_PokemonCenter_1F_EventObjects, FourIsland_PokemonCenter_1F_MapWarps, 0x0, FourIsland_PokemonCenter_1F_MapBGEvents diff --git a/data/maps/FourIsland_PokemonCenter_2F/events.inc b/data/maps/FourIsland_PokemonCenter_2F/events.inc new file mode 100644 index 000000000..53415e4f7 --- /dev/null +++ b/data/maps/FourIsland_PokemonCenter_2F/events.inc @@ -0,0 +1,13 @@ +FourIsland_PokemonCenter_2F_EventObjects: + object_event 1, 65, 0, 6, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FourIsland_PokemonCenter_2F_EventScript_1A8CF6, 0, 0, 0 + object_event 2, 65, 0, 2, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FourIsland_PokemonCenter_2F_EventScript_1A8CFC, 0, 0, 0 + object_event 3, 65, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FourIsland_PokemonCenter_2F_EventScript_1A8D02, 0, 0, 0 + object_event 4, 69, 0, 1, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, FourIsland_PokemonCenter_2F_EventScript_1BB1D2, 112, 0, 0 + +FourIsland_PokemonCenter_2F_MapWarps: + warp_def 1, 6, 4, 1, 8961 + warp_def 5, 1, 0, 0, 4 + warp_def 9, 1, 0, 0, 1 + +FourIsland_PokemonCenter_2F_MapEvents:: + map_events FourIsland_PokemonCenter_2F_EventObjects, FourIsland_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/FourIsland_PokemonDayCare/events.inc b/data/maps/FourIsland_PokemonDayCare/events.inc new file mode 100644 index 000000000..e2022383b --- /dev/null +++ b/data/maps/FourIsland_PokemonDayCare/events.inc @@ -0,0 +1,8 @@ +FourIsland_PokemonDayCare_EventObjects: + object_event 1, 35, 0, 2, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, FourIsland_PokemonDayCare_EventScript_171940, 0, 0, 0 + +FourIsland_PokemonDayCare_MapWarps: + warp_def 4, 7, 3, 1, 783 + +FourIsland_PokemonDayCare_MapEvents:: + map_events FourIsland_PokemonDayCare_EventObjects, FourIsland_PokemonDayCare_MapWarps, 0x0, 0x0 diff --git a/data/maps/FuchsiaCity/events.inc b/data/maps/FuchsiaCity/events.inc new file mode 100644 index 000000000..29dae023d --- /dev/null +++ b/data/maps/FuchsiaCity/events.inc @@ -0,0 +1,47 @@ +FuchsiaCity_EventObjects: + object_event 1, 27, 0, 37, 0, 17, 0, 3, 8, 17, 0, 0, 0, 0, 0, FuchsiaCity_EventScript_166DAF, 0, 0, 0 + object_event 2, 128, 0, 36, 0, 15, 0, 3, 80, 20, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 3, 127, 0, 33, 0, 8, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 4, 18, 0, 33, 0, 11, 0, 3, 7, 17, 0, 0, 0, 0, 0, FuchsiaCity_EventScript_166DB8, 0, 0, 0 + object_event 5, 117, 0, 39, 0, 8, 0, 3, 2, 19, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 6, 16, 0, 14, 0, 15, 0, 3, 5, 19, 0, 0, 0, 0, 0, FuchsiaCity_EventScript_166D9D, 0, 0, 0 + object_event 7, 135, 0, 12, 0, 20, 0, 1, 2, 18, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 8, 32, 0, 36, 0, 20, 0, 3, 5, 20, 0, 0, 0, 0, 0, FuchsiaCity_EventScript_166DA6, 0, 0, 0 + object_event 9, 240, 0, 8, 0, 8, 0, 1, 8, 17, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 10, 119, 0, 16, 0, 9, 0, 3, 2, 20, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 11, 95, 0, 30, 0, 10, 0, 3, 8, 17, 0, 0, 0, 0, 0, FuchsiaCity_EventScript_1BDF13, 18, 0, 0 + object_event 12, 95, 0, 21, 0, 13, 0, 3, 8, 17, 0, 0, 0, 0, 0, FuchsiaCity_EventScript_1BDF13, 19, 0, 0 + object_event 13, 95, 0, 32, 0, 16, 0, 3, 8, 17, 0, 0, 0, 0, 0, FuchsiaCity_EventScript_1BDF13, 20, 0, 0 + object_event 14, 95, 0, 24, 0, 22, 0, 3, 8, 17, 0, 0, 0, 0, 0, FuchsiaCity_EventScript_1BDF13, 21, 0, 0 + object_event 15, 20, 0, 15, 0, 11, 0, 3, 7, 17, 0, 0, 0, 0, 0, FuchsiaCity_EventScript_1C4AEE, 0, 0, 0 + object_event 16, 22, 0, 40, 0, 6, 0, 3, 8, 17, 0, 0, 0, 0, 0, FuchsiaCity_EventScript_166DC1, 157, 0, 0 + +FuchsiaCity_MapWarps: + warp_def 24, 5, 0, 2, 2816 + warp_def 33, 31, 0, 1, 2823 + warp_def 11, 15, 0, 1, 2817 + warp_def 28, 16, 0, 1, 2818 + warp_def 9, 32, 0, 1, 2819 + warp_def 14, 31, 0, 1, 2820 + warp_def 25, 31, 3, 1, 2821 + warp_def 38, 31, 0, 1, 2824 + warp_def 39, 28, 3, 3, 2824 + warp_def 39, 29, 3, 3, 2824 + warp_def 19, 31, 0, 0, 2825 + +FuchsiaCity_MapBGEvents: + bg_event 31, 18, 3, 0, 0, FuchsiaCity_EventScript_166DDA + bg_event 26, 18, 0, 0, 0, FuchsiaCity_EventScript_166DE3 + bg_event 5, 32, 0, 0, 0, FuchsiaCity_EventScript_166E07 + bg_event 31, 31, 0, 0, 0, FuchsiaCity_EventScript_166DF5 + bg_event 35, 10, 0, 0, 0, FuchsiaCity_EventScript_166E38 + bg_event 38, 16, 3, 0, 0, FuchsiaCity_EventScript_166E6A + bg_event 41, 10, 0, 0, 0, FuchsiaCity_EventScript_166E1F + bg_event 17, 10, 0, 0, 0, FuchsiaCity_EventScript_166E51 + bg_event 11, 10, 0, 0, 0, FuchsiaCity_EventScript_166E9C + bg_event 17, 18, 3, 0, 0, FuchsiaCity_EventScript_166E83 + bg_event 22, 7, 0, 0, 0, FuchsiaCity_EventScript_166DEC + bg_event 33, 26, 3, 7, 0, 25, 133, 1 + +FuchsiaCity_MapEvents:: + map_events FuchsiaCity_EventObjects, FuchsiaCity_MapWarps, 0x0, FuchsiaCity_MapBGEvents diff --git a/data/maps/FuchsiaCity_Building1/events.inc b/data/maps/FuchsiaCity_Building1/events.inc new file mode 100644 index 000000000..bf912ccb4 --- /dev/null +++ b/data/maps/FuchsiaCity_Building1/events.inc @@ -0,0 +1,19 @@ +FuchsiaCity_Building1_EventObjects: + object_event 1, 33, 0, 3, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, FuchsiaCity_Building1_EventScript_16D74C, 0, 0, 0 + object_event 2, 97, 0, 11, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, FuchsiaCity_Building1_EventScript_1BE11D, 0, 0, 0 + object_event 3, 92, 0, 11, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, FuchsiaCity_Building1_EventScript_1BEAA2, 441, 0, 0 + object_event 4, 0, 0, 4, 0, 1, 0, 0, 76, 17, 0, 0, 0, 0, 0, FuchsiaCity_Building1_EventScript_1ACEB8, 159, 0, 0 + +FuchsiaCity_Building1_MapWarps: + warp_def 5, 10, 0, 1, 775 + warp_def 6, 9, 3, 1, 775 + warp_def 7, 10, 0, 1, 775 + +FuchsiaCity_Building1_MapBGEvents: + bg_event 7, 4, 0, 0, 0, FuchsiaCity_Building1_EventScript_16D80D + bg_event 4, 4, 0, 0, 0, FuchsiaCity_Building1_EventScript_16D804 + bg_event 5, 4, 0, 0, 0, FuchsiaCity_Building1_EventScript_16D804 + bg_event 6, 4, 0, 0, 0, FuchsiaCity_Building1_EventScript_16D80D + +FuchsiaCity_Building1_MapEvents:: + map_events FuchsiaCity_Building1_EventObjects, FuchsiaCity_Building1_MapWarps, 0x0, FuchsiaCity_Building1_MapBGEvents diff --git a/data/maps/FuchsiaCity_Gym/events.inc b/data/maps/FuchsiaCity_Gym/events.inc new file mode 100644 index 000000000..96ffb0d3e --- /dev/null +++ b/data/maps/FuchsiaCity_Gym/events.inc @@ -0,0 +1,21 @@ +FuchsiaCity_Gym_EventObjects: + object_event 1, 26, 0, 12, 0, 16, 0, 3, 18, 17, 0, 1, 0, 4, 0, FuchsiaCity_Gym_EventScript_16D65A, 0, 0, 0 + object_event 2, 26, 0, 2, 0, 9, 0, 3, 9, 17, 0, 1, 0, 1, 0, FuchsiaCity_Gym_EventScript_16D643, 0, 0, 0 + object_event 3, 26, 0, 11, 0, 11, 0, 3, 10, 17, 0, 1, 0, 3, 0, FuchsiaCity_Gym_EventScript_16D61F, 0, 0, 0 + object_event 4, 25, 0, 13, 0, 4, 0, 3, 1, 17, 0, 1, 0, 2, 0, FuchsiaCity_Gym_EventScript_16D608, 0, 0, 0 + object_event 5, 25, 0, 4, 0, 6, 0, 3, 1, 17, 0, 1, 0, 2, 0, FuchsiaCity_Gym_EventScript_16D5F1, 0, 0, 0 + object_event 6, 26, 0, 2, 0, 16, 0, 3, 8, 17, 0, 1, 0, 4, 0, FuchsiaCity_Gym_EventScript_16D671, 0, 0, 0 + object_event 7, 84, 0, 7, 0, 13, 0, 3, 8, 17, 0, 0, 0, 0, 0, FuchsiaCity_Gym_EventScript_16D54E, 0, 0, 0 + object_event 8, 91, 0, 11, 0, 19, 0, 3, 8, 17, 0, 0, 0, 0, 0, FuchsiaCity_Gym_EventScript_16D688, 0, 0, 0 + +FuchsiaCity_Gym_MapWarps: + warp_def 6, 21, 3, 4, 775 + warp_def 7, 21, 3, 4, 775 + warp_def 8, 21, 3, 4, 775 + +FuchsiaCity_Gym_MapBGEvents: + bg_event 4, 19, 0, 0, 0, FuchsiaCity_Gym_EventScript_16D6A7 + bg_event 10, 19, 0, 0, 0, FuchsiaCity_Gym_EventScript_16D6A7 + +FuchsiaCity_Gym_MapEvents:: + map_events FuchsiaCity_Gym_EventObjects, FuchsiaCity_Gym_MapWarps, 0x0, FuchsiaCity_Gym_MapBGEvents diff --git a/data/maps/FuchsiaCity_House1/events.inc b/data/maps/FuchsiaCity_House1/events.inc new file mode 100644 index 000000000..a91390530 --- /dev/null +++ b/data/maps/FuchsiaCity_House1/events.inc @@ -0,0 +1,12 @@ +FuchsiaCity_House1_EventObjects: + object_event 1, 32, 0, 7, 0, 4, 0, 3, 9, 17, 0, 0, 0, 0, 0, FuchsiaCity_House1_EventScript_16D6CF, 0, 0, 0 + object_event 2, 28, 0, 1, 0, 2, 0, 3, 7, 17, 0, 0, 0, 0, 0, FuchsiaCity_House1_EventScript_16D6C6, 0, 0, 0 + object_event 3, 16, 0, 2, 0, 5, 0, 3, 2, 17, 0, 0, 0, 0, 0, FuchsiaCity_House1_EventScript_16D6E8, 0, 0, 0 + +FuchsiaCity_House1_MapWarps: + warp_def 3, 7, 3, 5, 775 + warp_def 4, 7, 3, 5, 775 + warp_def 5, 7, 3, 5, 775 + +FuchsiaCity_House1_MapEvents:: + map_events FuchsiaCity_House1_EventObjects, FuchsiaCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/FuchsiaCity_House2/events.inc b/data/maps/FuchsiaCity_House2/events.inc new file mode 100644 index 000000000..41dfb4f21 --- /dev/null +++ b/data/maps/FuchsiaCity_House2/events.inc @@ -0,0 +1,11 @@ +FuchsiaCity_House2_EventObjects: + object_event 1, 57, 0, 6, 0, 5, 0, 3, 10, 17, 0, 0, 0, 0, 0, FuchsiaCity_House2_EventScript_16D817, 0, 0, 0 + +FuchsiaCity_House2_MapWarps: + warp_def 2, 9, 0, 7, 775 + warp_def 3, 8, 3, 7, 775 + warp_def 4, 9, 0, 7, 775 + warp_def 3, 1, 3, 8, 775 + +FuchsiaCity_House2_MapEvents:: + map_events FuchsiaCity_House2_EventObjects, FuchsiaCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/FuchsiaCity_House3/events.inc b/data/maps/FuchsiaCity_House3/events.inc new file mode 100644 index 000000000..e5c0b9550 --- /dev/null +++ b/data/maps/FuchsiaCity_House3/events.inc @@ -0,0 +1,8 @@ +FuchsiaCity_House3_EventObjects: + object_event 1, 30, 0, 4, 0, 4, 0, 3, 10, 17, 0, 0, 0, 0, 0, FuchsiaCity_House3_EventScript_16D895, 0, 0, 0 + +FuchsiaCity_House3_MapWarps: + warp_def 4, 7, 3, 10, 775 + +FuchsiaCity_House3_MapEvents:: + map_events FuchsiaCity_House3_EventObjects, FuchsiaCity_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/FuchsiaCity_Mart/events.inc b/data/maps/FuchsiaCity_Mart/events.inc new file mode 100644 index 000000000..d2c3f8a97 --- /dev/null +++ b/data/maps/FuchsiaCity_Mart/events.inc @@ -0,0 +1,12 @@ +FuchsiaCity_Mart_EventObjects: + object_event 1, 68, 0, 2, 0, 3, 0, 0, 10, 17, 0, 0, 0, 0, 0, FuchsiaCity_Mart_EventScript_16D4F3, 0, 0, 0 + object_event 2, 61, 0, 6, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, FuchsiaCity_Mart_EventScript_16D4EA, 0, 0, 0 + object_event 3, 42, 0, 9, 0, 5, 0, 3, 2, 17, 0, 0, 0, 0, 0, FuchsiaCity_Mart_EventScript_16D4E1, 0, 0, 0 + +FuchsiaCity_Mart_MapWarps: + warp_def 3, 7, 3, 2, 775 + warp_def 4, 7, 3, 2, 775 + warp_def 5, 7, 3, 2, 775 + +FuchsiaCity_Mart_MapEvents:: + map_events FuchsiaCity_Mart_EventObjects, FuchsiaCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/FuchsiaCity_PokemonCenter_1F/events.inc b/data/maps/FuchsiaCity_PokemonCenter_1F/events.inc new file mode 100644 index 000000000..789937055 --- /dev/null +++ b/data/maps/FuchsiaCity_PokemonCenter_1F/events.inc @@ -0,0 +1,14 @@ +FuchsiaCity_PokemonCenter_1F_EventObjects: + object_event 1, 64, 0, 7, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, FuchsiaCity_PokemonCenter_1F_EventScript_16D700, 0, 0, 0 + object_event 2, 25, 0, 12, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, FuchsiaCity_PokemonCenter_1F_EventScript_16D709, 0, 0, 0 + object_event 3, 42, 0, 13, 0, 3, 0, 3, 7, 17, 0, 0, 0, 0, 0, FuchsiaCity_PokemonCenter_1F_EventScript_16D712, 0, 0, 0 + object_event 4, 18, 0, 4, 0, 8, 0, 3, 5, 17, 0, 0, 0, 0, 0, FuchsiaCity_PokemonCenter_1F_EventScript_16D71B, 0, 0, 0 + +FuchsiaCity_PokemonCenter_1F_MapWarps: + warp_def 6, 8, 3, 6, 775 + warp_def 7, 8, 3, 6, 775 + warp_def 8, 8, 3, 6, 775 + warp_def 1, 6, 4, 0, 2822 + +FuchsiaCity_PokemonCenter_1F_MapEvents:: + map_events FuchsiaCity_PokemonCenter_1F_EventObjects, FuchsiaCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/FuchsiaCity_PokemonCenter_2F/events.inc b/data/maps/FuchsiaCity_PokemonCenter_2F/events.inc new file mode 100644 index 000000000..2baf36957 --- /dev/null +++ b/data/maps/FuchsiaCity_PokemonCenter_2F/events.inc @@ -0,0 +1,13 @@ +FuchsiaCity_PokemonCenter_2F_EventObjects: + object_event 1, 65, 0, 6, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FuchsiaCity_PokemonCenter_2F_EventScript_1A8CF6, 0, 0, 0 + object_event 2, 65, 0, 2, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FuchsiaCity_PokemonCenter_2F_EventScript_1A8CFC, 0, 0, 0 + object_event 3, 65, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FuchsiaCity_PokemonCenter_2F_EventScript_1A8D02, 0, 0, 0 + object_event 4, 69, 0, 1, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, FuchsiaCity_PokemonCenter_2F_EventScript_1BB1D2, 112, 0, 0 + +FuchsiaCity_PokemonCenter_2F_MapWarps: + warp_def 1, 6, 4, 3, 2821 + warp_def 5, 1, 0, 0, 4 + warp_def 9, 1, 0, 0, 1 + +FuchsiaCity_PokemonCenter_2F_MapEvents:: + map_events FuchsiaCity_PokemonCenter_2F_EventObjects, FuchsiaCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/events.inc b/data/maps/FuchsiaCity_SafariZone_Entrance/events.inc new file mode 100644 index 000000000..ab9d88a00 --- /dev/null +++ b/data/maps/FuchsiaCity_SafariZone_Entrance/events.inc @@ -0,0 +1,17 @@ +FuchsiaCity_SafariZone_Entrance_EventObjects: + object_event 1, 47, 0, 7, 0, 3, 0, 3, 9, 17, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 2, 47, 0, 1, 0, 6, 0, 3, 10, 17, 0, 0, 0, 0, 0, FuchsiaCity_SafariZone_Entrance_EventScript_16D4B7, 0, 0, 0 + +FuchsiaCity_SafariZone_Entrance_MapWarps: + warp_def 4, 1, 3, 1, 319 + warp_def 5, 7, 3, 0, 775 + warp_def 4, 7, 3, 0, 775 + warp_def 3, 7, 3, 0, 775 + +FuchsiaCity_SafariZone_Entrance_MapCoordEvents: + coord_event 4, 3, 3, 0, 16385, 0, 0, FuchsiaCity_SafariZone_Entrance_EventScript_16D36D + coord_event 5, 3, 3, 0, 16385, 0, 0, FuchsiaCity_SafariZone_Entrance_EventScript_16D379 + coord_event 3, 3, 3, 0, 16385, 0, 0, FuchsiaCity_SafariZone_Entrance_EventScript_16D385 + +FuchsiaCity_SafariZone_Entrance_MapEvents:: + map_events FuchsiaCity_SafariZone_Entrance_EventObjects, FuchsiaCity_SafariZone_Entrance_MapWarps, FuchsiaCity_SafariZone_Entrance_MapCoordEvents, 0x0 diff --git a/data/maps/FuchsiaCity_ZooBuilding/events.inc b/data/maps/FuchsiaCity_ZooBuilding/events.inc new file mode 100644 index 000000000..344b95e6f --- /dev/null +++ b/data/maps/FuchsiaCity_ZooBuilding/events.inc @@ -0,0 +1,13 @@ +FuchsiaCity_ZooBuilding_EventObjects: + object_event 1, 47, 0, 2, 0, 2, 0, 3, 7, 17, 0, 0, 0, 0, 0, FuchsiaCity_ZooBuilding_EventScript_16D532, 0, 0, 0 + object_event 2, 47, 0, 12, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, FuchsiaCity_ZooBuilding_EventScript_16D53B, 0, 0, 0 + object_event 3, 47, 0, 6, 0, 4, 0, 3, 10, 17, 0, 0, 0, 0, 0, FuchsiaCity_ZooBuilding_EventScript_16D529, 0, 0, 0 + object_event 4, 47, 0, 10, 0, 8, 0, 3, 9, 18, 0, 0, 0, 0, 0, FuchsiaCity_ZooBuilding_EventScript_16D544, 0, 0, 0 + +FuchsiaCity_ZooBuilding_MapWarps: + warp_def 5, 9, 0, 3, 775 + warp_def 6, 9, 0, 3, 775 + warp_def 7, 9, 3, 3, 775 + +FuchsiaCity_ZooBuilding_MapEvents:: + map_events FuchsiaCity_ZooBuilding_EventObjects, FuchsiaCity_ZooBuilding_MapWarps, 0x0, 0x0 diff --git a/data/maps/IndigoPlateau_Exterior/events.inc b/data/maps/IndigoPlateau_Exterior/events.inc new file mode 100644 index 000000000..1a29fa392 --- /dev/null +++ b/data/maps/IndigoPlateau_Exterior/events.inc @@ -0,0 +1,9 @@ +IndigoPlateau_Exterior_EventObjects: + object_event 1, 72, 0, 11, 0, 6, 0, 0, 8, 17, 0, 0, 0, 0, 0, 0x0, 163, 0, 0 + object_event 2, 71, 0, 11, 0, 6, 0, 0, 8, 17, 0, 0, 0, 0, 0, 0x0, 164, 0, 0 + +IndigoPlateau_Exterior_MapWarps: + warp_def 11, 6, 0, 0, 3328 + +IndigoPlateau_Exterior_MapEvents:: + map_events IndigoPlateau_Exterior_EventObjects, IndigoPlateau_Exterior_MapWarps, 0x0, 0x0 diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/events.inc b/data/maps/IndigoPlateau_PokemonCenter_1F/events.inc new file mode 100644 index 000000000..0f6cfcfb5 --- /dev/null +++ b/data/maps/IndigoPlateau_PokemonCenter_1F/events.inc @@ -0,0 +1,17 @@ +IndigoPlateau_PokemonCenter_1F_EventObjects: + object_event 1, 68, 0, 0, 0, 7, 0, 3, 10, 17, 0, 0, 0, 0, 0, IndigoPlateau_PokemonCenter_1F_EventScript_16EACC, 0, 0, 0 + object_event 2, 64, 0, 13, 0, 10, 0, 3, 8, 17, 0, 0, 0, 0, 0, IndigoPlateau_PokemonCenter_1F_EventScript_16EB06, 0, 0, 0 + object_event 3, 91, 0, 7, 0, 14, 0, 3, 10, 17, 0, 0, 0, 0, 0, IndigoPlateau_PokemonCenter_1F_EventScript_16EAC3, 0, 0, 0 + object_event 4, 42, 0, 5, 0, 3, 0, 3, 8, 17, 0, 0, 0, 0, 0, IndigoPlateau_PokemonCenter_1F_EventScript_16EA8A, 0, 0, 0 + object_event 5, 54, 0, 23, 0, 13, 0, 3, 10, 17, 0, 0, 0, 0, 0, IndigoPlateau_PokemonCenter_1F_EventScript_1ACFAE, 157, 0, 0 + object_event 6, 0, 0, 22, 0, 9, 0, 0, 76, 17, 0, 0, 0, 0, 0, IndigoPlateau_PokemonCenter_1F_EventScript_1AD06C, 157, 0, 0 + object_event 7, 41, 0, 16, 0, 15, 0, 3, 2, 17, 0, 0, 0, 0, 0, IndigoPlateau_PokemonCenter_1F_EventScript_1AD087, 157, 0, 0 + object_event 8, 0, 0, 23, 0, 9, 0, 0, 76, 17, 0, 0, 0, 0, 0, IndigoPlateau_PokemonCenter_1F_EventScript_1AD06C, 157, 0, 0 + +IndigoPlateau_PokemonCenter_1F_MapWarps: + warp_def 11, 16, 3, 0, 777 + warp_def 4, 1, 3, 0, 331 + warp_def 1, 14, 4, 0, 3329 + +IndigoPlateau_PokemonCenter_1F_MapEvents:: + map_events IndigoPlateau_PokemonCenter_1F_EventObjects, IndigoPlateau_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/IndigoPlateau_PokemonCenter_2F/events.inc b/data/maps/IndigoPlateau_PokemonCenter_2F/events.inc new file mode 100644 index 000000000..f0061ff98 --- /dev/null +++ b/data/maps/IndigoPlateau_PokemonCenter_2F/events.inc @@ -0,0 +1,13 @@ +IndigoPlateau_PokemonCenter_2F_EventObjects: + object_event 1, 65, 0, 6, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, IndigoPlateau_PokemonCenter_2F_EventScript_1A8CF6, 0, 0, 0 + object_event 2, 65, 0, 2, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, IndigoPlateau_PokemonCenter_2F_EventScript_1A8CFC, 0, 0, 0 + object_event 3, 65, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, IndigoPlateau_PokemonCenter_2F_EventScript_1A8D02, 0, 0, 0 + object_event 4, 69, 0, 1, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, IndigoPlateau_PokemonCenter_2F_EventScript_1BB1D2, 112, 0, 0 + +IndigoPlateau_PokemonCenter_2F_MapWarps: + warp_def 1, 6, 4, 2, 3328 + warp_def 5, 1, 0, 0, 4 + warp_def 9, 1, 0, 0, 1 + +IndigoPlateau_PokemonCenter_2F_MapEvents:: + map_events IndigoPlateau_PokemonCenter_2F_EventObjects, IndigoPlateau_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/LavenderTown/events.inc b/data/maps/LavenderTown/events.inc new file mode 100644 index 000000000..db3a3cc3e --- /dev/null +++ b/data/maps/LavenderTown/events.inc @@ -0,0 +1,21 @@ +LavenderTown_EventObjects: + object_event 1, 17, 0, 19, 0, 10, 0, 3, 2, 18, 0, 0, 0, 0, 0, LavenderTown_EventScript_16687D, 0, 0, 0 + object_event 2, 47, 0, 12, 0, 12, 0, 3, 8, 17, 0, 0, 0, 0, 0, LavenderTown_EventScript_1668A6, 0, 0, 0 + object_event 3, 19, 0, 10, 0, 7, 0, 3, 14, 17, 0, 0, 0, 0, 0, LavenderTown_EventScript_1668AF, 0, 0, 0 + +LavenderTown_MapWarps: + warp_def 18, 6, 0, 1, 344 + warp_def 6, 5, 0, 1, 2048 + warp_def 10, 11, 0, 1, 2050 + warp_def 5, 16, 0, 1, 2051 + warp_def 10, 16, 0, 1, 2052 + warp_def 20, 15, 0, 1, 2053 + +LavenderTown_MapBGEvents: + bg_event 12, 4, 0, 0, 0, LavenderTown_EventScript_1668C1 + bg_event 15, 11, 0, 0, 0, LavenderTown_EventScript_1668B8 + bg_event 21, 7, 0, 0, 0, LavenderTown_EventScript_1668D3 + bg_event 7, 11, 0, 0, 0, LavenderTown_EventScript_1668CA + +LavenderTown_MapEvents:: + map_events LavenderTown_EventObjects, LavenderTown_MapWarps, 0x0, LavenderTown_MapBGEvents diff --git a/data/maps/LavenderTown_House1/events.inc b/data/maps/LavenderTown_House1/events.inc new file mode 100644 index 000000000..6cfc603da --- /dev/null +++ b/data/maps/LavenderTown_House1/events.inc @@ -0,0 +1,11 @@ +LavenderTown_House1_EventObjects: + object_event 1, 42, 0, 4, 0, 4, 0, 3, 8, 17, 0, 0, 0, 0, 0, LavenderTown_House1_EventScript_16B233, 0, 0, 0 + object_event 2, 111, 0, 8, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, LavenderTown_House1_EventScript_16B252, 0, 0, 0 + +LavenderTown_House1_MapWarps: + warp_def 3, 7, 3, 3, 772 + warp_def 4, 7, 3, 3, 772 + warp_def 5, 7, 3, 3, 772 + +LavenderTown_House1_MapEvents:: + map_events LavenderTown_House1_EventObjects, LavenderTown_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/LavenderTown_House2/events.inc b/data/maps/LavenderTown_House2/events.inc new file mode 100644 index 000000000..df507a60f --- /dev/null +++ b/data/maps/LavenderTown_House2/events.inc @@ -0,0 +1,10 @@ +LavenderTown_House2_EventObjects: + object_event 1, 61, 0, 4, 0, 4, 0, 3, 8, 17, 0, 0, 0, 0, 0, LavenderTown_House2_EventScript_16B266, 0, 0, 0 + +LavenderTown_House2_MapWarps: + warp_def 3, 7, 3, 4, 772 + warp_def 4, 7, 3, 4, 772 + warp_def 5, 7, 3, 4, 772 + +LavenderTown_House2_MapEvents:: + map_events LavenderTown_House2_EventObjects, LavenderTown_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/LavenderTown_Mart/events.inc b/data/maps/LavenderTown_Mart/events.inc new file mode 100644 index 000000000..8bd84d44a --- /dev/null +++ b/data/maps/LavenderTown_Mart/events.inc @@ -0,0 +1,13 @@ +LavenderTown_Mart_EventObjects: + object_event 1, 68, 0, 2, 0, 3, 0, 0, 10, 17, 0, 0, 0, 0, 0, LavenderTown_Mart_EventScript_16B36B, 0, 0, 0 + object_event 2, 30, 0, 6, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0, 0, LavenderTown_Mart_EventScript_16B350, 0, 0, 0 + object_event 3, 26, 0, 9, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0, 0, LavenderTown_Mart_EventScript_16B359, 0, 0, 0 + object_event 4, 18, 0, 9, 0, 5, 0, 3, 14, 17, 0, 0, 0, 0, 0, LavenderTown_Mart_EventScript_16B362, 0, 0, 0 + +LavenderTown_Mart_MapWarps: + warp_def 3, 7, 3, 5, 772 + warp_def 4, 7, 3, 5, 772 + warp_def 5, 7, 3, 5, 772 + +LavenderTown_Mart_MapEvents:: + map_events LavenderTown_Mart_EventObjects, LavenderTown_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/LavenderTown_PokemonCenter_1F/events.inc b/data/maps/LavenderTown_PokemonCenter_1F/events.inc new file mode 100644 index 000000000..aa5197cd3 --- /dev/null +++ b/data/maps/LavenderTown_PokemonCenter_1F/events.inc @@ -0,0 +1,15 @@ +LavenderTown_PokemonCenter_1F_EventObjects: + object_event 1, 64, 0, 7, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, LavenderTown_PokemonCenter_1F_EventScript_16B0FE, 0, 0, 0 + object_event 2, 61, 0, 9, 0, 4, 0, 3, 8, 17, 0, 0, 0, 0, 0, LavenderTown_PokemonCenter_1F_EventScript_16B107, 0, 0, 0 + object_event 3, 22, 0, 5, 0, 6, 0, 3, 3, 33, 0, 0, 0, 0, 0, LavenderTown_PokemonCenter_1F_EventScript_16B110, 0, 0, 0 + object_event 4, 18, 0, 2, 0, 2, 0, 3, 2, 17, 0, 0, 0, 0, 0, LavenderTown_PokemonCenter_1F_EventScript_16B119, 0, 0, 0 + object_event 5, 30, 0, 14, 0, 6, 0, 3, 9, 17, 0, 0, 0, 0, 0, LavenderTown_PokemonCenter_1F_EventScript_1AD0A0, 157, 0, 0 + +LavenderTown_PokemonCenter_1F_MapWarps: + warp_def 6, 8, 3, 1, 772 + warp_def 7, 8, 3, 1, 772 + warp_def 8, 8, 3, 1, 772 + warp_def 1, 6, 4, 0, 2049 + +LavenderTown_PokemonCenter_1F_MapEvents:: + map_events LavenderTown_PokemonCenter_1F_EventObjects, LavenderTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/LavenderTown_PokemonCenter_2F/events.inc b/data/maps/LavenderTown_PokemonCenter_2F/events.inc new file mode 100644 index 000000000..69295dbe9 --- /dev/null +++ b/data/maps/LavenderTown_PokemonCenter_2F/events.inc @@ -0,0 +1,13 @@ +LavenderTown_PokemonCenter_2F_EventObjects: + object_event 1, 65, 0, 6, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LavenderTown_PokemonCenter_2F_EventScript_1A8CF6, 0, 0, 0 + object_event 2, 65, 0, 2, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LavenderTown_PokemonCenter_2F_EventScript_1A8CFC, 0, 0, 0 + object_event 3, 65, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LavenderTown_PokemonCenter_2F_EventScript_1A8D02, 0, 0, 0 + object_event 4, 69, 0, 1, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, LavenderTown_PokemonCenter_2F_EventScript_1BB1D2, 112, 0, 0 + +LavenderTown_PokemonCenter_2F_MapWarps: + warp_def 1, 6, 4, 3, 2048 + warp_def 5, 1, 0, 0, 4 + warp_def 9, 1, 0, 0, 1 + +LavenderTown_PokemonCenter_2F_MapEvents:: + map_events LavenderTown_PokemonCenter_2F_EventObjects, LavenderTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/LavenderTown_VolunteerPokemonHouse/events.inc b/data/maps/LavenderTown_VolunteerPokemonHouse/events.inc new file mode 100644 index 000000000..8d3a472af --- /dev/null +++ b/data/maps/LavenderTown_VolunteerPokemonHouse/events.inc @@ -0,0 +1,20 @@ +LavenderTown_VolunteerPokemonHouse_EventObjects: + object_event 1, 78, 0, 3, 0, 3, 0, 3, 8, 17, 0, 0, 0, 0, 0, LavenderTown_VolunteerPokemonHouse_EventScript_16B14A, 53, 0, 0 + object_event 2, 124, 0, 1, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, LavenderTown_VolunteerPokemonHouse_EventScript_16B1EB, 0, 0, 0 + object_event 3, 121, 0, 9, 0, 6, 0, 3, 7, 17, 0, 0, 0, 0, 0, LavenderTown_VolunteerPokemonHouse_EventScript_16B1FE, 0, 0, 0 + object_event 4, 16, 0, 9, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, LavenderTown_VolunteerPokemonHouse_EventScript_16B1C3, 0, 0, 0 + object_event 5, 18, 0, 3, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, LavenderTown_VolunteerPokemonHouse_EventScript_16B1CC, 0, 0, 0 + object_event 6, 17, 0, 7, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0, 0, LavenderTown_VolunteerPokemonHouse_EventScript_16B1AA, 0, 0, 0 + +LavenderTown_VolunteerPokemonHouse_MapWarps: + warp_def 3, 7, 3, 2, 772 + warp_def 4, 7, 3, 2, 772 + warp_def 5, 7, 3, 2, 772 + +LavenderTown_VolunteerPokemonHouse_MapBGEvents: + bg_event 5, 4, 0, 0, 0, LavenderTown_VolunteerPokemonHouse_EventScript_16B211 + bg_event 3, 1, 0, 0, 0, LavenderTown_VolunteerPokemonHouse_EventScript_16B229 + bg_event 4, 1, 0, 0, 0, LavenderTown_VolunteerPokemonHouse_EventScript_16B229 + +LavenderTown_VolunteerPokemonHouse_MapEvents:: + map_events LavenderTown_VolunteerPokemonHouse_EventObjects, LavenderTown_VolunteerPokemonHouse_MapWarps, 0x0, LavenderTown_VolunteerPokemonHouse_MapBGEvents diff --git a/data/maps/MtEmber_Exterior/events.inc b/data/maps/MtEmber_Exterior/events.inc new file mode 100644 index 000000000..1e821866e --- /dev/null +++ b/data/maps/MtEmber_Exterior/events.inc @@ -0,0 +1,41 @@ +MtEmber_Exterior_EventObjects: + object_event 1, 56, 0, 29, 0, 45, 0, 3, 7, 17, 0, 0, 0, 0, 0, MtEmber_Exterior_EventScript_1C48E6, 0, 0, 0 + object_event 2, 49, 0, 41, 0, 40, 0, 3, 10, 17, 0, 0, 0, 0, 0, MtEmber_Exterior_EventScript_16397F, 137, 0, 0 + object_event 3, 49, 0, 42, 0, 40, 0, 3, 9, 17, 0, 0, 0, 0, 0, MtEmber_Exterior_EventScript_1639F0, 137, 0, 0 + object_event 4, 24, 0, 22, 0, 35, 0, 3, 46, 53, 0, 1, 0, 1, 0, MtEmber_Exterior_EventScript_163AE2, 0, 0, 0 + object_event 5, 39, 0, 15, 0, 28, 0, 3, 8, 17, 0, 1, 0, 5, 0, MtEmber_Exterior_EventScript_163AB4, 0, 0, 0 + object_event 6, 40, 0, 14, 0, 42, 0, 3, 17, 17, 0, 1, 0, 3, 0, MtEmber_Exterior_EventScript_163ACB, 0, 0, 0 + object_event 7, 96, 0, 29, 0, 41, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_Exterior_EventScript_1BE00C, 18, 0, 0 + object_event 8, 96, 0, 30, 0, 42, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_Exterior_EventScript_1BE00C, 19, 0, 0 + object_event 9, 97, 0, 22, 0, 45, 0, 3, 1, 0, 0, 0, 0, 0, 0, MtEmber_Exterior_EventScript_1BE11D, 0, 0, 0 + object_event 10, 97, 0, 17, 0, 46, 0, 3, 1, 0, 0, 0, 0, 0, 0, MtEmber_Exterior_EventScript_1BE11D, 0, 0, 0 + object_event 11, 97, 0, 36, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, MtEmber_Exterior_EventScript_1BE11D, 0, 0, 0 + object_event 12, 96, 0, 34, 0, 14, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_Exterior_EventScript_1BE00C, 20, 0, 0 + object_event 13, 96, 0, 36, 0, 15, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_Exterior_EventScript_1BE00C, 21, 0, 0 + object_event 14, 97, 0, 35, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, MtEmber_Exterior_EventScript_1BE11D, 0, 0, 0 + object_event 15, 97, 0, 35, 0, 17, 0, 3, 1, 0, 0, 0, 0, 0, 0, MtEmber_Exterior_EventScript_1BE11D, 0, 0, 0 + object_event 16, 96, 0, 18, 0, 39, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_Exterior_EventScript_1BE00C, 22, 0, 0 + object_event 17, 96, 0, 19, 0, 40, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_Exterior_EventScript_1BE00C, 23, 0, 0 + object_event 18, 92, 0, 13, 0, 6, 0, 3, 8, 17, 0, 0, 0, 0, 0, MtEmber_Exterior_EventScript_1BED2C, 493, 0, 0 + object_event 19, 92, 0, 38, 0, 10, 0, 3, 8, 17, 0, 0, 0, 0, 0, MtEmber_Exterior_EventScript_1BED39, 494, 0, 0 + object_event 20, 92, 0, 48, 0, 20, 0, 3, 8, 17, 0, 0, 0, 0, 0, MtEmber_Exterior_EventScript_1BED46, 495, 0, 0 + +MtEmber_Exterior_MapWarps: + warp_def 28, 48, 3, 0, 813 + warp_def 29, 48, 3, 1, 813 + warp_def 14, 24, 3, 0, 354 + warp_def 39, 19, 3, 1, 356 + warp_def 29, 7, 3, 0, 357 + warp_def 42, 39, 0, 0, 359 + +MtEmber_Exterior_MapCoordEvents: + coord_event 37, 43, 0, 0, 16511, 1, 0, MtEmber_Exterior_EventScript_163A4E + coord_event 38, 43, 0, 0, 16511, 1, 0, MtEmber_Exterior_EventScript_163A4E + coord_event 39, 43, 0, 0, 16511, 1, 0, MtEmber_Exterior_EventScript_163A4E + +MtEmber_Exterior_MapBGEvents: + bg_event 18, 17, 0, 7, 0, 95, 158, 1 + bg_event 8, 30, 3, 7, 0, 2, 162, 1 + +MtEmber_Exterior_MapEvents:: + map_events MtEmber_Exterior_EventObjects, MtEmber_Exterior_MapWarps, MtEmber_Exterior_MapCoordEvents, MtEmber_Exterior_MapBGEvents diff --git a/data/maps/MtEmber_RubyPath_B1F/events.inc b/data/maps/MtEmber_RubyPath_B1F/events.inc new file mode 100644 index 000000000..73d8954bc --- /dev/null +++ b/data/maps/MtEmber_RubyPath_B1F/events.inc @@ -0,0 +1,12 @@ +MtEmber_RubyPath_B1F_EventObjects: + object_event 1, 96, 0, 1, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_RubyPath_B1F_EventScript_1BE00C, 18, 0, 0 + object_event 2, 96, 0, 1, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_RubyPath_B1F_EventScript_1BE00C, 19, 0, 0 + object_event 3, 96, 0, 3, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_RubyPath_B1F_EventScript_1BE00C, 20, 0, 0 + object_event 4, 96, 0, 5, 0, 14, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_RubyPath_B1F_EventScript_1BE00C, 21, 0, 0 + +MtEmber_RubyPath_B1F_MapWarps: + warp_def 9, 21, 0, 1, 359 + warp_def 6, 1, 0, 0, 361 + +MtEmber_RubyPath_B1F_MapEvents:: + map_events MtEmber_RubyPath_B1F_EventObjects, MtEmber_RubyPath_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MtEmber_RubyPath_B1F_Stairs/events.inc b/data/maps/MtEmber_RubyPath_B1F_Stairs/events.inc new file mode 100644 index 000000000..023110a70 --- /dev/null +++ b/data/maps/MtEmber_RubyPath_B1F_Stairs/events.inc @@ -0,0 +1,9 @@ +MtEmber_RubyPath_B1F_Stairs_EventObjects: + object_event 1, 96, 0, 4, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_RubyPath_B1F_Stairs_EventScript_1BE00C, 18, 0, 0 + +MtEmber_RubyPath_B1F_Stairs_MapWarps: + warp_def 4, 1, 0, 1, 362 + warp_def 1, 5, 0, 0, 364 + +MtEmber_RubyPath_B1F_Stairs_MapEvents:: + map_events MtEmber_RubyPath_B1F_Stairs_EventObjects, MtEmber_RubyPath_B1F_Stairs_MapWarps, 0x0, 0x0 diff --git a/data/maps/MtEmber_RubyPath_B2F/events.inc b/data/maps/MtEmber_RubyPath_B2F/events.inc new file mode 100644 index 000000000..2ad1c1b0e --- /dev/null +++ b/data/maps/MtEmber_RubyPath_B2F/events.inc @@ -0,0 +1,15 @@ +MtEmber_RubyPath_B2F_EventObjects: + object_event 1, 97, 0, 9, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, MtEmber_RubyPath_B2F_EventScript_1BE11D, 0, 0, 0 + object_event 2, 97, 0, 12, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, MtEmber_RubyPath_B2F_EventScript_1BE11D, 0, 0, 0 + object_event 3, 97, 0, 12, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, MtEmber_RubyPath_B2F_EventScript_1BE11D, 0, 0, 0 + object_event 4, 96, 0, 4, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_RubyPath_B2F_EventScript_1BE00C, 18, 0, 0 + object_event 5, 96, 0, 1, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_RubyPath_B2F_EventScript_1BE00C, 19, 0, 0 + object_event 6, 96, 0, 4, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_RubyPath_B2F_EventScript_1BE00C, 20, 0, 0 + object_event 7, 96, 0, 5, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_RubyPath_B2F_EventScript_1BE00C, 21, 0, 0 + +MtEmber_RubyPath_B2F_MapWarps: + warp_def 1, 7, 3, 1, 360 + warp_def 13, 9, 3, 0, 362 + +MtEmber_RubyPath_B2F_MapEvents:: + map_events MtEmber_RubyPath_B2F_EventObjects, MtEmber_RubyPath_B2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MtEmber_RubyPath_B2F_Stairs/events.inc b/data/maps/MtEmber_RubyPath_B2F_Stairs/events.inc new file mode 100644 index 000000000..60013f627 --- /dev/null +++ b/data/maps/MtEmber_RubyPath_B2F_Stairs/events.inc @@ -0,0 +1,10 @@ +MtEmber_RubyPath_B2F_Stairs_EventObjects: + object_event 1, 96, 0, 4, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_RubyPath_B2F_Stairs_EventScript_1BE00C, 18, 0, 0 + object_event 2, 96, 0, 6, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_RubyPath_B2F_Stairs_EventScript_1BE00C, 19, 0, 0 + +MtEmber_RubyPath_B2F_Stairs_MapWarps: + warp_def 6, 1, 0, 1, 363 + warp_def 1, 4, 0, 2, 359 + +MtEmber_RubyPath_B2F_Stairs_MapEvents:: + map_events MtEmber_RubyPath_B2F_Stairs_EventObjects, MtEmber_RubyPath_B2F_Stairs_MapWarps, 0x0, 0x0 diff --git a/data/maps/MtEmber_RubyPath_B3F/events.inc b/data/maps/MtEmber_RubyPath_B3F/events.inc new file mode 100644 index 000000000..0bab7c507 --- /dev/null +++ b/data/maps/MtEmber_RubyPath_B3F/events.inc @@ -0,0 +1,19 @@ +MtEmber_RubyPath_B3F_EventObjects: + object_event 1, 97, 0, 10, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, MtEmber_RubyPath_B3F_EventScript_1BE11D, 0, 0, 0 + object_event 2, 97, 0, 26, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, MtEmber_RubyPath_B3F_EventScript_1BE11D, 0, 0, 0 + object_event 3, 97, 0, 28, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, MtEmber_RubyPath_B3F_EventScript_1BE11D, 0, 0, 0 + object_event 4, 96, 0, 7, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_RubyPath_B3F_EventScript_1BE00C, 18, 0, 0 + object_event 5, 96, 0, 4, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_RubyPath_B3F_EventScript_1BE00C, 19, 0, 0 + object_event 6, 96, 0, 6, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_RubyPath_B3F_EventScript_1BE00C, 20, 0, 0 + object_event 7, 96, 0, 7, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_RubyPath_B3F_EventScript_1BE00C, 21, 0, 0 + object_event 8, 96, 0, 4, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_RubyPath_B3F_EventScript_1BE00C, 22, 0, 0 + object_event 9, 96, 0, 5, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_RubyPath_B3F_EventScript_1BE00C, 23, 0, 0 + object_event 10, 97, 0, 15, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, MtEmber_RubyPath_B3F_EventScript_1BE11D, 0, 0, 0 + +MtEmber_RubyPath_B3F_MapWarps: + warp_def 1, 4, 0, 1, 361 + warp_def 19, 19, 3, 0, 363 + warp_def 5, 19, 3, 1, 352 + +MtEmber_RubyPath_B3F_MapEvents:: + map_events MtEmber_RubyPath_B3F_EventObjects, MtEmber_RubyPath_B3F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MtEmber_RubyPath_B4F/events.inc b/data/maps/MtEmber_RubyPath_B4F/events.inc new file mode 100644 index 000000000..f14a83237 --- /dev/null +++ b/data/maps/MtEmber_RubyPath_B4F/events.inc @@ -0,0 +1,34 @@ +MtEmber_RubyPath_B4F_MapWarps: + warp_def 14, 14, 3, 0, 358 + warp_def 4, 2, 3, 2, 362 + +MtEmber_RubyPath_B4F_MapBGEvents: + bg_event 3, 7, 0, 1, 0, MtEmber_RubyPath_B4F_EventScript_1638EC + bg_event 4, 7, 0, 1, 0, MtEmber_RubyPath_B4F_EventScript_1638EC + bg_event 5, 7, 0, 1, 0, MtEmber_RubyPath_B4F_EventScript_1638EC + bg_event 4, 9, 0, 1, 0, MtEmber_RubyPath_B4F_EventScript_1638F5 + bg_event 3, 9, 0, 1, 0, MtEmber_RubyPath_B4F_EventScript_1638F5 + bg_event 5, 9, 0, 1, 0, MtEmber_RubyPath_B4F_EventScript_1638F5 + bg_event 3, 11, 0, 1, 0, MtEmber_RubyPath_B4F_EventScript_1638FE + bg_event 4, 11, 0, 1, 0, MtEmber_RubyPath_B4F_EventScript_1638FE + bg_event 5, 11, 0, 1, 0, MtEmber_RubyPath_B4F_EventScript_1638FE + bg_event 3, 13, 0, 1, 0, MtEmber_RubyPath_B4F_EventScript_163907 + bg_event 4, 13, 0, 1, 0, MtEmber_RubyPath_B4F_EventScript_163907 + bg_event 5, 13, 0, 1, 0, MtEmber_RubyPath_B4F_EventScript_163907 + bg_event 7, 7, 0, 1, 0, MtEmber_RubyPath_B4F_EventScript_163910 + bg_event 8, 7, 0, 1, 0, MtEmber_RubyPath_B4F_EventScript_163910 + bg_event 9, 7, 0, 1, 0, MtEmber_RubyPath_B4F_EventScript_163910 + bg_event 7, 9, 0, 1, 0, MtEmber_RubyPath_B4F_EventScript_163919 + bg_event 8, 9, 0, 1, 0, MtEmber_RubyPath_B4F_EventScript_163919 + bg_event 9, 9, 0, 1, 0, MtEmber_RubyPath_B4F_EventScript_163919 + bg_event 7, 11, 0, 1, 0, MtEmber_RubyPath_B4F_EventScript_163922 + bg_event 11, 7, 0, 1, 0, MtEmber_RubyPath_B4F_EventScript_163934 + bg_event 11, 9, 0, 1, 0, MtEmber_RubyPath_B4F_EventScript_16393D + bg_event 8, 11, 0, 1, 0, MtEmber_RubyPath_B4F_EventScript_163922 + bg_event 9, 11, 0, 1, 0, MtEmber_RubyPath_B4F_EventScript_163922 + bg_event 7, 13, 0, 1, 0, MtEmber_RubyPath_B4F_EventScript_16392B + bg_event 9, 13, 0, 1, 0, MtEmber_RubyPath_B4F_EventScript_16392B + bg_event 8, 13, 0, 1, 0, MtEmber_RubyPath_B4F_EventScript_16392B + +MtEmber_RubyPath_B4F_MapEvents:: + map_events 0x0, MtEmber_RubyPath_B4F_MapWarps, 0x0, MtEmber_RubyPath_B4F_MapBGEvents diff --git a/data/maps/MtEmber_RubyPath_B5F/events.inc b/data/maps/MtEmber_RubyPath_B5F/events.inc new file mode 100644 index 000000000..a9f1890eb --- /dev/null +++ b/data/maps/MtEmber_RubyPath_B5F/events.inc @@ -0,0 +1,11 @@ +MtEmber_RubyPath_B5F_EventObjects: + object_event 1, 99, 0, 7, 0, 7, 0, 0, 8, 0, 0, 0, 0, 0, 0, MtEmber_RubyPath_B5F_EventScript_163C49, 138, 0, 0 + +MtEmber_RubyPath_B5F_MapWarps: + warp_def 11, 7, 3, 0, 352 + +MtEmber_RubyPath_B5F_MapBGEvents: + bg_event 7, 2, 0, 1, 0, MtEmber_RubyPath_B5F_EventScript_163BAB + +MtEmber_RubyPath_B5F_MapEvents:: + map_events MtEmber_RubyPath_B5F_EventObjects, MtEmber_RubyPath_B5F_MapWarps, 0x0, MtEmber_RubyPath_B5F_MapBGEvents diff --git a/data/maps/MtEmber_Summit/events.inc b/data/maps/MtEmber_Summit/events.inc new file mode 100644 index 000000000..c821765e0 --- /dev/null +++ b/data/maps/MtEmber_Summit/events.inc @@ -0,0 +1,12 @@ +MtEmber_Summit_EventObjects: + object_event 1, 137, 0, 9, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, MtEmber_Summit_EventScript_163B33, 82, 0, 0 + object_event 2, 97, 0, 10, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, MtEmber_Summit_EventScript_1BE11D, 0, 0, 0 + object_event 3, 97, 0, 9, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, MtEmber_Summit_EventScript_1BE11D, 0, 0, 0 + object_event 4, 97, 0, 8, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, MtEmber_Summit_EventScript_1BE11D, 0, 0, 0 + object_event 5, 97, 0, 8, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, MtEmber_Summit_EventScript_1BE11D, 0, 0, 0 + +MtEmber_Summit_MapWarps: + warp_def 9, 15, 0, 4, 353 + +MtEmber_Summit_MapEvents:: + map_events MtEmber_Summit_EventObjects, MtEmber_Summit_MapWarps, 0x0, 0x0 diff --git a/data/maps/MtEmber_SummitPath_1F/events.inc b/data/maps/MtEmber_SummitPath_1F/events.inc new file mode 100644 index 000000000..715d9ba7a --- /dev/null +++ b/data/maps/MtEmber_SummitPath_1F/events.inc @@ -0,0 +1,6 @@ +MtEmber_SummitPath_1F_MapWarps: + warp_def 2, 15, 0, 2, 353 + warp_def 11, 1, 0, 0, 355 + +MtEmber_SummitPath_1F_MapEvents:: + map_events 0x0, MtEmber_SummitPath_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MtEmber_SummitPath_2F/events.inc b/data/maps/MtEmber_SummitPath_2F/events.inc new file mode 100644 index 000000000..92a3d062f --- /dev/null +++ b/data/maps/MtEmber_SummitPath_2F/events.inc @@ -0,0 +1,17 @@ +MtEmber_SummitPath_2F_EventObjects: + object_event 1, 96, 0, 40, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_SummitPath_2F_EventScript_1BE00C, 18, 0, 0 + object_event 2, 96, 0, 33, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_SummitPath_2F_EventScript_1BE00C, 19, 0, 0 + object_event 3, 96, 0, 15, 0, 19, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_SummitPath_2F_EventScript_1BE00C, 20, 0, 0 + object_event 4, 96, 0, 13, 0, 23, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_SummitPath_2F_EventScript_1BE00C, 21, 0, 0 + object_event 5, 96, 0, 13, 0, 21, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_SummitPath_2F_EventScript_1BE00C, 22, 0, 0 + object_event 6, 96, 0, 7, 0, 38, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_SummitPath_2F_EventScript_1BE00C, 23, 0, 0 + object_event 7, 96, 0, 9, 0, 35, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_SummitPath_2F_EventScript_1BE00C, 24, 0, 0 + object_event 8, 96, 0, 7, 0, 34, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_SummitPath_2F_EventScript_1BE00C, 25, 0, 0 + object_event 9, 96, 0, 15, 0, 26, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_SummitPath_2F_EventScript_1BE00C, 26, 0, 0 + +MtEmber_SummitPath_2F_MapWarps: + warp_def 8, 39, 0, 1, 354 + warp_def 39, 6, 3, 0, 356 + +MtEmber_SummitPath_2F_MapEvents:: + map_events MtEmber_SummitPath_2F_EventObjects, MtEmber_SummitPath_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MtEmber_SummitPath_3F/events.inc b/data/maps/MtEmber_SummitPath_3F/events.inc new file mode 100644 index 000000000..b05d6e6de --- /dev/null +++ b/data/maps/MtEmber_SummitPath_3F/events.inc @@ -0,0 +1,6 @@ +MtEmber_SummitPath_3F_MapWarps: + warp_def 2, 4, 0, 1, 355 + warp_def 11, 8, 0, 3, 353 + +MtEmber_SummitPath_3F_MapEvents:: + map_events 0x0, MtEmber_SummitPath_3F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MtMoon_1F/events.inc b/data/maps/MtMoon_1F/events.inc new file mode 100644 index 000000000..9c0ffa77e --- /dev/null +++ b/data/maps/MtMoon_1F/events.inc @@ -0,0 +1,27 @@ +MtMoon_1F_EventObjects: + object_event 1, 22, 0, 20, 0, 26, 0, 3, 8, 17, 0, 1, 0, 2, 0, MtMoon_1F_EventScript_16063C, 0, 0, 0 + object_event 2, 20, 0, 36, 0, 30, 0, 3, 10, 17, 0, 1, 0, 2, 0, MtMoon_1F_EventScript_160681, 0, 0, 0 + object_event 3, 55, 0, 30, 0, 35, 0, 3, 1, 17, 0, 1, 0, 4, 0, MtMoon_1F_EventScript_160653, 0, 0, 0 + object_event 4, 22, 0, 33, 0, 4, 0, 3, 47, 53, 0, 1, 0, 2, 0, MtMoon_1F_EventScript_160625, 0, 0, 0 + object_event 5, 20, 0, 7, 0, 26, 0, 3, 8, 17, 0, 1, 0, 4, 0, MtMoon_1F_EventScript_16066A, 0, 0, 0 + object_event 6, 18, 0, 13, 0, 17, 0, 3, 10, 17, 0, 1, 0, 4, 0, MtMoon_1F_EventScript_16060E, 0, 0, 0 + object_event 7, 56, 0, 7, 0, 10, 0, 3, 2, 34, 0, 1, 0, 1, 0, MtMoon_1F_EventScript_1605F7, 0, 0, 0 + object_event 8, 92, 0, 2, 0, 22, 0, 3, 8, 17, 0, 0, 0, 0, 0, MtMoon_1F_EventScript_1BE5CF, 345, 0, 0 + object_event 9, 92, 0, 11, 0, 35, 0, 3, 8, 17, 0, 0, 0, 0, 0, MtMoon_1F_EventScript_1BE5DC, 346, 0, 0 + object_event 10, 92, 0, 26, 0, 32, 0, 3, 8, 17, 0, 0, 0, 0, 0, MtMoon_1F_EventScript_1BE5E9, 347, 0, 0 + object_event 11, 92, 0, 42, 0, 35, 0, 3, 8, 17, 0, 0, 0, 0, 0, MtMoon_1F_EventScript_1BE5F6, 348, 0, 0 + object_event 12, 92, 0, 44, 0, 21, 0, 3, 8, 17, 0, 0, 0, 0, 0, MtMoon_1F_EventScript_1BE603, 349, 0, 0 + object_event 13, 92, 0, 3, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, MtMoon_1F_EventScript_1BE610, 350, 0, 0 + object_event 14, 30, 0, 42, 0, 7, 0, 3, 17, 17, 0, 0, 0, 0, 0, MtMoon_1F_EventScript_1ACE03, 0, 0, 0 + +MtMoon_1F_MapWarps: + warp_def 5, 6, 3, 0, 258 + warp_def 19, 14, 3, 1, 258 + warp_def 31, 16, 3, 2, 258 + warp_def 18, 37, 3, 0, 790 + +MtMoon_1F_MapBGEvents: + bg_event 19, 26, 0, 0, 0, MtMoon_1F_EventScript_1605EE + +MtMoon_1F_MapEvents:: + map_events MtMoon_1F_EventObjects, MtMoon_1F_MapWarps, 0x0, MtMoon_1F_MapBGEvents diff --git a/data/maps/MtMoon_B1F/events.inc b/data/maps/MtMoon_B1F/events.inc new file mode 100644 index 000000000..966f371bc --- /dev/null +++ b/data/maps/MtMoon_B1F/events.inc @@ -0,0 +1,20 @@ +MtMoon_B1F_MapWarps: + warp_def 3, 3, 3, 0, 257 + warp_def 25, 4, 3, 1, 257 + warp_def 43, 21, 3, 2, 257 + warp_def 22, 18, 3, 0, 259 + warp_def 17, 5, 3, 1, 259 + warp_def 26, 36, 3, 2, 259 + warp_def 39, 4, 3, 3, 259 + warp_def 45, 4, 3, 1, 790 + +MtMoon_B1F_MapBGEvents: + bg_event 46, 2, 0, 7, 0, 103, 84, 1 + bg_event 26, 2, 0, 7, 0, 103, 85, 1 + bg_event 39, 34, 0, 7, 0, 103, 86, 1 + bg_event 24, 35, 0, 7, 0, 104, 87, 1 + bg_event 6, 12, 0, 7, 0, 104, 88, 1 + bg_event 25, 34, 0, 7, 0, 104, 89, 1 + +MtMoon_B1F_MapEvents:: + map_events 0x0, MtMoon_B1F_MapWarps, 0x0, MtMoon_B1F_MapBGEvents diff --git a/data/maps/MtMoon_B2F/events.inc b/data/maps/MtMoon_B2F/events.inc new file mode 100644 index 000000000..e2bea66aa --- /dev/null +++ b/data/maps/MtMoon_B2F/events.inc @@ -0,0 +1,28 @@ +MtMoon_B2F_EventObjects: + object_event 1, 98, 0, 13, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, MtMoon_B2F_EventScript_16071B, 47, 0, 0 + object_event 2, 98, 0, 14, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, MtMoon_B2F_EventScript_16077F, 48, 0, 0 + object_event 3, 55, 0, 13, 0, 11, 0, 3, 10, 17, 0, 0, 0, 0, 0, MtMoon_B2F_EventScript_1606C2, 0, 0, 0 + object_event 4, 49, 0, 37, 0, 21, 0, 3, 1, 17, 0, 1, 0, 3, 0, MtMoon_B2F_EventScript_160829, 173, 0, 0 + object_event 5, 49, 0, 12, 0, 20, 0, 3, 8, 17, 0, 1, 0, 2, 0, MtMoon_B2F_EventScript_1607E4, 173, 0, 0 + object_event 6, 49, 0, 35, 0, 12, 0, 3, 7, 17, 0, 1, 0, 4, 0, MtMoon_B2F_EventScript_160812, 173, 0, 0 + object_event 7, 49, 0, 18, 0, 27, 0, 3, 8, 17, 0, 1, 0, 4, 0, MtMoon_B2F_EventScript_1607FB, 173, 0, 0 + object_event 8, 92, 0, 30, 0, 26, 0, 3, 8, 17, 0, 0, 0, 0, 0, MtMoon_B2F_EventScript_1BE61D, 351, 0, 0 + object_event 9, 92, 0, 35, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, MtMoon_B2F_EventScript_1BE62A, 352, 0, 0 + object_event 10, 92, 0, 24, 0, 6, 0, 3, 8, 17, 0, 0, 0, 0, 0, MtMoon_B2F_EventScript_1BEAD6, 447, 0, 0 + object_event 11, 92, 0, 3, 0, 11, 0, 3, 8, 17, 0, 0, 0, 0, 0, MtMoon_B2F_EventScript_1BEAE3, 448, 0, 0 + +MtMoon_B2F_MapWarps: + warp_def 25, 21, 3, 3, 258 + warp_def 31, 11, 3, 4, 258 + warp_def 17, 31, 3, 5, 258 + warp_def 5, 10, 3, 6, 258 + +MtMoon_B2F_MapCoordEvents: + coord_event 14, 11, 3, 0, 16523, 0, 0, MtMoon_B2F_EventScript_1606B0 + +MtMoon_B2F_MapBGEvents: + bg_event 20, 16, 3, 7, 0, 94, 2, 1 + bg_event 39, 11, 3, 7, 0, 34, 3, 1 + +MtMoon_B2F_MapEvents:: + map_events MtMoon_B2F_EventObjects, MtMoon_B2F_MapWarps, MtMoon_B2F_MapCoordEvents, MtMoon_B2F_MapBGEvents diff --git a/data/maps/NavelRock_1F/events.inc b/data/maps/NavelRock_1F/events.inc new file mode 100644 index 000000000..935817429 --- /dev/null +++ b/data/maps/NavelRock_1F/events.inc @@ -0,0 +1,6 @@ +NavelRock_1F_MapWarps: + warp_def 8, 4, 3, 0, 566 + warp_def 8, 23, 3, 0, 512 + +NavelRock_1F_MapEvents:: + map_events 0x0, NavelRock_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_B1F/events.inc b/data/maps/NavelRock_B1F/events.inc new file mode 100644 index 000000000..bed605cad --- /dev/null +++ b/data/maps/NavelRock_B1F/events.inc @@ -0,0 +1,6 @@ +NavelRock_B1F_MapWarps: + warp_def 4, 2, 3, 0, 548 + warp_def 11, 5, 3, 0, 567 + +NavelRock_B1F_MapEvents:: + map_events 0x0, NavelRock_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_Base/events.inc b/data/maps/NavelRock_Base/events.inc new file mode 100644 index 000000000..cf94327da --- /dev/null +++ b/data/maps/NavelRock_Base/events.inc @@ -0,0 +1,8 @@ +NavelRock_Base_EventObjects: + object_event 1, 144, 0, 10, 0, 15, 0, 3, 8, 17, 0, 0, 0, 0, 0, NavelRock_Base_EventScript_165134, 155, 0, 0 + +NavelRock_Base_MapWarps: + warp_def 13, 20, 3, 1, 565 + +NavelRock_Base_MapEvents:: + map_events NavelRock_Base_EventObjects, NavelRock_Base_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_BasePath_B10F/events.inc b/data/maps/NavelRock_BasePath_B10F/events.inc new file mode 100644 index 000000000..cdbc551a0 --- /dev/null +++ b/data/maps/NavelRock_BasePath_B10F/events.inc @@ -0,0 +1,6 @@ +NavelRock_BasePath_B10F_MapWarps: + warp_def 4, 4, 3, 1, 563 + warp_def 2, 2, 3, 0, 565 + +NavelRock_BasePath_B10F_MapEvents:: + map_events 0x0, NavelRock_BasePath_B10F_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_BasePath_B11F/events.inc b/data/maps/NavelRock_BasePath_B11F/events.inc new file mode 100644 index 000000000..4d1fe74d7 --- /dev/null +++ b/data/maps/NavelRock_BasePath_B11F/events.inc @@ -0,0 +1,6 @@ +NavelRock_BasePath_B11F_MapWarps: + warp_def 2, 2, 3, 1, 564 + warp_def 4, 4, 3, 0, 550 + +NavelRock_BasePath_B11F_MapEvents:: + map_events 0x0, NavelRock_BasePath_B11F_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_BasePath_B1F/events.inc b/data/maps/NavelRock_BasePath_B1F/events.inc new file mode 100644 index 000000000..a380bde04 --- /dev/null +++ b/data/maps/NavelRock_BasePath_B1F/events.inc @@ -0,0 +1,6 @@ +NavelRock_BasePath_B1F_MapWarps: + warp_def 2, 2, 3, 2, 567 + warp_def 4, 4, 3, 0, 556 + +NavelRock_BasePath_B1F_MapEvents:: + map_events 0x0, NavelRock_BasePath_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_BasePath_B2F/events.inc b/data/maps/NavelRock_BasePath_B2F/events.inc new file mode 100644 index 000000000..ecd9fb93b --- /dev/null +++ b/data/maps/NavelRock_BasePath_B2F/events.inc @@ -0,0 +1,6 @@ +NavelRock_BasePath_B2F_MapWarps: + warp_def 4, 4, 3, 1, 555 + warp_def 2, 2, 3, 0, 557 + +NavelRock_BasePath_B2F_MapEvents:: + map_events 0x0, NavelRock_BasePath_B2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_BasePath_B3F/events.inc b/data/maps/NavelRock_BasePath_B3F/events.inc new file mode 100644 index 000000000..729c045eb --- /dev/null +++ b/data/maps/NavelRock_BasePath_B3F/events.inc @@ -0,0 +1,6 @@ +NavelRock_BasePath_B3F_MapWarps: + warp_def 2, 2, 3, 1, 556 + warp_def 4, 4, 3, 0, 558 + +NavelRock_BasePath_B3F_MapEvents:: + map_events 0x0, NavelRock_BasePath_B3F_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_BasePath_B4F/events.inc b/data/maps/NavelRock_BasePath_B4F/events.inc new file mode 100644 index 000000000..359d4cf56 --- /dev/null +++ b/data/maps/NavelRock_BasePath_B4F/events.inc @@ -0,0 +1,6 @@ +NavelRock_BasePath_B4F_MapWarps: + warp_def 4, 4, 3, 1, 557 + warp_def 2, 2, 3, 0, 559 + +NavelRock_BasePath_B4F_MapEvents:: + map_events 0x0, NavelRock_BasePath_B4F_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_BasePath_B5F/events.inc b/data/maps/NavelRock_BasePath_B5F/events.inc new file mode 100644 index 000000000..1dd28d72e --- /dev/null +++ b/data/maps/NavelRock_BasePath_B5F/events.inc @@ -0,0 +1,6 @@ +NavelRock_BasePath_B5F_MapWarps: + warp_def 2, 2, 3, 1, 558 + warp_def 4, 4, 3, 0, 560 + +NavelRock_BasePath_B5F_MapEvents:: + map_events 0x0, NavelRock_BasePath_B5F_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_BasePath_B6F/events.inc b/data/maps/NavelRock_BasePath_B6F/events.inc new file mode 100644 index 000000000..310eae42d --- /dev/null +++ b/data/maps/NavelRock_BasePath_B6F/events.inc @@ -0,0 +1,6 @@ +NavelRock_BasePath_B6F_MapWarps: + warp_def 4, 4, 3, 1, 559 + warp_def 2, 2, 3, 0, 561 + +NavelRock_BasePath_B6F_MapEvents:: + map_events 0x0, NavelRock_BasePath_B6F_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_BasePath_B7F/events.inc b/data/maps/NavelRock_BasePath_B7F/events.inc new file mode 100644 index 000000000..7d6af60b8 --- /dev/null +++ b/data/maps/NavelRock_BasePath_B7F/events.inc @@ -0,0 +1,6 @@ +NavelRock_BasePath_B7F_MapWarps: + warp_def 2, 2, 3, 1, 560 + warp_def 4, 4, 3, 0, 562 + +NavelRock_BasePath_B7F_MapEvents:: + map_events 0x0, NavelRock_BasePath_B7F_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_BasePath_B8F/events.inc b/data/maps/NavelRock_BasePath_B8F/events.inc new file mode 100644 index 000000000..00004438d --- /dev/null +++ b/data/maps/NavelRock_BasePath_B8F/events.inc @@ -0,0 +1,6 @@ +NavelRock_BasePath_B8F_MapWarps: + warp_def 4, 4, 3, 1, 561 + warp_def 2, 2, 3, 0, 563 + +NavelRock_BasePath_B8F_MapEvents:: + map_events 0x0, NavelRock_BasePath_B8F_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_BasePath_B9F/events.inc b/data/maps/NavelRock_BasePath_B9F/events.inc new file mode 100644 index 000000000..a17fa1c9e --- /dev/null +++ b/data/maps/NavelRock_BasePath_B9F/events.inc @@ -0,0 +1,6 @@ +NavelRock_BasePath_B9F_MapWarps: + warp_def 2, 2, 3, 1, 562 + warp_def 4, 4, 3, 0, 564 + +NavelRock_BasePath_B9F_MapEvents:: + map_events 0x0, NavelRock_BasePath_B9F_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_Exterior/events.inc b/data/maps/NavelRock_Exterior/events.inc new file mode 100644 index 000000000..57f0baacd --- /dev/null +++ b/data/maps/NavelRock_Exterior/events.inc @@ -0,0 +1,6 @@ +NavelRock_Exterior_MapWarps: + warp_def 9, 8, 3, 1, 548 + warp_def 9, 16, 3, 0, 571 + +NavelRock_Exterior_MapEvents:: + map_events 0x0, NavelRock_Exterior_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_Fork/events.inc b/data/maps/NavelRock_Fork/events.inc new file mode 100644 index 000000000..15b6ad4ab --- /dev/null +++ b/data/maps/NavelRock_Fork/events.inc @@ -0,0 +1,7 @@ +NavelRock_Fork_MapWarps: + warp_def 13, 95, 3, 1, 566 + warp_def 3, 1, 3, 0, 551 + warp_def 26, 1, 3, 0, 555 + +NavelRock_Fork_MapEvents:: + map_events 0x0, NavelRock_Fork_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_Harbor/events.inc b/data/maps/NavelRock_Harbor/events.inc new file mode 100644 index 000000000..83b6e9b34 --- /dev/null +++ b/data/maps/NavelRock_Harbor/events.inc @@ -0,0 +1,9 @@ +NavelRock_Harbor_EventObjects: + object_event 1, 108, 0, 8, 0, 9, 0, 0, 8, 17, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 2, 62, 0, 8, 0, 6, 0, 3, 7, 17, 0, 0, 0, 0, 0, NavelRock_Harbor_EventScript_165421, 0, 0, 0 + +NavelRock_Harbor_MapWarps: + warp_def 8, 2, 3, 1, 512 + +NavelRock_Harbor_MapEvents:: + map_events NavelRock_Harbor_EventObjects, NavelRock_Harbor_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_Summit/events.inc b/data/maps/NavelRock_Summit/events.inc new file mode 100644 index 000000000..c9092ab54 --- /dev/null +++ b/data/maps/NavelRock_Summit/events.inc @@ -0,0 +1,14 @@ +NavelRock_Summit_EventObjects: + object_event 1, 145, 0, 9, 0, 6, 0, 0, 8, 17, 0, 0, 0, 0, 0, 0x0, 156, 0, 0 + +NavelRock_Summit_MapWarps: + warp_def 10, 18, 3, 1, 554 + +NavelRock_Summit_MapCoordEvents: + coord_event 9, 12, 3, 0, 16385, 0, 0, NavelRock_Summit_EventScript_164FFB + +NavelRock_Summit_MapBGEvents: + bg_event 9, 11, 3, 7, 0, 45, 160, 129 + +NavelRock_Summit_MapEvents:: + map_events NavelRock_Summit_EventObjects, NavelRock_Summit_MapWarps, NavelRock_Summit_MapCoordEvents, NavelRock_Summit_MapBGEvents diff --git a/data/maps/NavelRock_SummitPath_2F/events.inc b/data/maps/NavelRock_SummitPath_2F/events.inc new file mode 100644 index 000000000..04d5d4651 --- /dev/null +++ b/data/maps/NavelRock_SummitPath_2F/events.inc @@ -0,0 +1,6 @@ +NavelRock_SummitPath_2F_MapWarps: + warp_def 4, 4, 3, 1, 567 + warp_def 2, 2, 3, 0, 552 + +NavelRock_SummitPath_2F_MapEvents:: + map_events 0x0, NavelRock_SummitPath_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_SummitPath_3F/events.inc b/data/maps/NavelRock_SummitPath_3F/events.inc new file mode 100644 index 000000000..7af26c9fa --- /dev/null +++ b/data/maps/NavelRock_SummitPath_3F/events.inc @@ -0,0 +1,6 @@ +NavelRock_SummitPath_3F_MapWarps: + warp_def 2, 2, 3, 1, 551 + warp_def 4, 4, 3, 0, 553 + +NavelRock_SummitPath_3F_MapEvents:: + map_events 0x0, NavelRock_SummitPath_3F_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_SummitPath_4F/events.inc b/data/maps/NavelRock_SummitPath_4F/events.inc new file mode 100644 index 000000000..7ed7e09f4 --- /dev/null +++ b/data/maps/NavelRock_SummitPath_4F/events.inc @@ -0,0 +1,6 @@ +NavelRock_SummitPath_4F_MapWarps: + warp_def 4, 4, 3, 1, 552 + warp_def 2, 2, 3, 0, 554 + +NavelRock_SummitPath_4F_MapEvents:: + map_events 0x0, NavelRock_SummitPath_4F_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_SummitPath_5F/events.inc b/data/maps/NavelRock_SummitPath_5F/events.inc new file mode 100644 index 000000000..96882960f --- /dev/null +++ b/data/maps/NavelRock_SummitPath_5F/events.inc @@ -0,0 +1,6 @@ +NavelRock_SummitPath_5F_MapWarps: + warp_def 2, 2, 3, 1, 553 + warp_def 4, 4, 3, 0, 549 + +NavelRock_SummitPath_5F_MapEvents:: + map_events 0x0, NavelRock_SummitPath_5F_MapWarps, 0x0, 0x0 diff --git a/data/maps/OneIsland/events.inc b/data/maps/OneIsland/events.inc new file mode 100644 index 000000000..802ec6794 --- /dev/null +++ b/data/maps/OneIsland/events.inc @@ -0,0 +1,17 @@ +OneIsland_EventObjects: + object_event 1, 73, 0, 12, 0, 16, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, 113, 0, 0 + object_event 2, 32, 0, 16, 0, 12, 0, 3, 2, 17, 0, 0, 0, 0, 0, OneIsland_EventScript_167517, 0, 0, 0 + object_event 3, 30, 0, 13, 0, 9, 0, 3, 13, 17, 0, 0, 0, 0, 0, OneIsland_EventScript_167549, 0, 0, 0 + +OneIsland_MapWarps: + warp_def 14, 5, 0, 0, 8192 + warp_def 19, 9, 0, 0, 8194 + warp_def 8, 11, 0, 0, 8195 + warp_def 12, 18, 3, 0, 8196 + +OneIsland_MapBGEvents: + bg_event 14, 13, 0, 0, 0, OneIsland_EventScript_167552 + bg_event 15, 6, 0, 0, 0, OneIsland_EventScript_16755B + +OneIsland_MapEvents:: + map_events OneIsland_EventObjects, OneIsland_MapWarps, 0x0, OneIsland_MapBGEvents diff --git a/data/maps/OneIsland_Harbor/events.inc b/data/maps/OneIsland_Harbor/events.inc new file mode 100644 index 000000000..18ac28587 --- /dev/null +++ b/data/maps/OneIsland_Harbor/events.inc @@ -0,0 +1,9 @@ +OneIsland_Harbor_EventObjects: + object_event 1, 108, 0, 8, 0, 9, 0, 0, 8, 17, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 2, 62, 0, 8, 0, 6, 0, 3, 7, 17, 0, 0, 0, 0, 0, OneIsland_Harbor_EventScript_1713BD, 0, 0, 0 + +OneIsland_Harbor_MapWarps: + warp_def 8, 2, 3, 3, 780 + +OneIsland_Harbor_MapEvents:: + map_events OneIsland_Harbor_EventObjects, OneIsland_Harbor_MapWarps, 0x0, 0x0 diff --git a/data/maps/OneIsland_House1/events.inc b/data/maps/OneIsland_House1/events.inc new file mode 100644 index 000000000..070680038 --- /dev/null +++ b/data/maps/OneIsland_House1/events.inc @@ -0,0 +1,9 @@ +OneIsland_House1_EventObjects: + object_event 1, 32, 0, 4, 0, 5, 0, 3, 10, 17, 0, 0, 0, 0, 0, OneIsland_House1_EventScript_17135C, 0, 0, 0 + object_event 2, 35, 0, 7, 0, 5, 0, 3, 9, 17, 0, 0, 0, 0, 0, OneIsland_House1_EventScript_171365, 0, 0, 0 + +OneIsland_House1_MapWarps: + warp_def 4, 7, 3, 1, 780 + +OneIsland_House1_MapEvents:: + map_events OneIsland_House1_EventObjects, OneIsland_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/OneIsland_House2/events.inc b/data/maps/OneIsland_House2/events.inc new file mode 100644 index 000000000..948e63339 --- /dev/null +++ b/data/maps/OneIsland_House2/events.inc @@ -0,0 +1,8 @@ +OneIsland_House2_EventObjects: + object_event 1, 22, 0, 9, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, OneIsland_House2_EventScript_17136F, 0, 0, 0 + +OneIsland_House2_MapWarps: + warp_def 4, 7, 3, 2, 780 + +OneIsland_House2_MapEvents:: + map_events OneIsland_House2_EventObjects, OneIsland_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/OneIsland_KindleRoad/events.inc b/data/maps/OneIsland_KindleRoad/events.inc new file mode 100644 index 000000000..e2f7aabea --- /dev/null +++ b/data/maps/OneIsland_KindleRoad/events.inc @@ -0,0 +1,42 @@ +OneIsland_KindleRoad_EventObjects: + object_event 1, 44, 0, 11, 0, 32, 0, 1, 14, 17, 0, 1, 0, 4, 0, OneIsland_KindleRoad_EventScript_1ABBF1, 0, 0, 0 + object_event 2, 46, 0, 17, 0, 132, 0, 3, 8, 17, 0, 1, 0, 2, 0, OneIsland_KindleRoad_EventScript_1ABC2F, 0, 0, 0 + object_event 3, 43, 0, 7, 0, 39, 0, 1, 52, 54, 0, 1, 0, 1, 0, OneIsland_KindleRoad_EventScript_1ABC6D, 0, 0, 0 + object_event 4, 45, 0, 19, 0, 79, 0, 3, 8, 17, 0, 1, 0, 1, 0, OneIsland_KindleRoad_EventScript_1ABCAB, 0, 0, 0 + object_event 5, 57, 0, 15, 0, 25, 0, 3, 9, 17, 0, 1, 0, 0, 0, OneIsland_KindleRoad_EventScript_1ABCE9, 0, 0, 0 + object_event 6, 24, 0, 9, 0, 53, 0, 3, 26, 113, 0, 1, 0, 1, 0, OneIsland_KindleRoad_EventScript_1ABD27, 0, 0, 0 + object_event 7, 24, 0, 18, 0, 105, 0, 4, 50, 65, 0, 1, 0, 1, 0, OneIsland_KindleRoad_EventScript_1ABD65, 0, 0, 0 + object_event 8, 54, 0, 16, 0, 64, 0, 3, 27, 18, 0, 1, 0, 1, 0, OneIsland_KindleRoad_EventScript_1ABDA3, 0, 0, 0 + object_event 9, 54, 0, 11, 0, 64, 0, 3, 28, 18, 0, 1, 0, 1, 0, OneIsland_KindleRoad_EventScript_1ABDE1, 0, 0, 0 + object_event 10, 39, 0, 11, 0, 89, 0, 3, 14, 17, 0, 1, 0, 3, 0, OneIsland_KindleRoad_EventScript_1ABE1F, 0, 0, 0 + object_event 11, 40, 0, 9, 0, 108, 0, 3, 1, 17, 0, 1, 0, 1, 0, OneIsland_KindleRoad_EventScript_1ABE5D, 0, 0, 0 + object_event 12, 54, 0, 8, 0, 68, 0, 3, 8, 17, 0, 1, 0, 1, 0, OneIsland_KindleRoad_EventScript_1ABEE1, 0, 0, 0 + object_event 13, 24, 0, 9, 0, 68, 0, 3, 8, 17, 0, 1, 0, 1, 0, OneIsland_KindleRoad_EventScript_1ABE9B, 0, 0, 0 + object_event 14, 96, 0, 8, 0, 104, 0, 3, 1, 17, 0, 0, 0, 0, 0, OneIsland_KindleRoad_EventScript_1BE00C, 19, 0, 0 + object_event 15, 96, 0, 11, 0, 95, 0, 3, 1, 17, 0, 0, 0, 0, 0, OneIsland_KindleRoad_EventScript_1BE00C, 21, 0, 0 + object_event 16, 96, 0, 12, 0, 96, 0, 3, 1, 17, 0, 0, 0, 0, 0, OneIsland_KindleRoad_EventScript_1BE00C, 22, 0, 0 + object_event 17, 96, 0, 10, 0, 95, 0, 3, 1, 17, 0, 0, 0, 0, 0, OneIsland_KindleRoad_EventScript_1BE00C, 23, 0, 0 + object_event 18, 96, 0, 9, 0, 105, 0, 3, 1, 17, 0, 0, 0, 0, 0, OneIsland_KindleRoad_EventScript_1BE00C, 24, 0, 0 + object_event 19, 96, 0, 15, 0, 75, 0, 3, 1, 17, 0, 0, 0, 0, 0, OneIsland_KindleRoad_EventScript_1BE00C, 25, 0, 0 + object_event 20, 96, 0, 9, 0, 84, 0, 3, 1, 17, 0, 0, 0, 0, 0, OneIsland_KindleRoad_EventScript_1BE00C, 26, 0, 0 + object_event 21, 96, 0, 15, 0, 74, 0, 3, 1, 17, 0, 0, 0, 0, 0, OneIsland_KindleRoad_EventScript_1BE00C, 27, 0, 0 + object_event 22, 96, 0, 15, 0, 73, 0, 3, 1, 17, 0, 0, 0, 0, 0, OneIsland_KindleRoad_EventScript_1BE00C, 28, 0, 0 + object_event 23, 96, 0, 18, 0, 111, 0, 4, 1, 17, 0, 0, 0, 0, 0, OneIsland_KindleRoad_EventScript_1BE00C, 29, 0, 0 + object_event 24, 96, 0, 10, 0, 86, 0, 3, 1, 17, 0, 0, 0, 0, 0, OneIsland_KindleRoad_EventScript_1BE00C, 30, 0, 0 + object_event 25, 96, 0, 9, 0, 110, 0, 3, 1, 17, 0, 0, 0, 0, 0, OneIsland_KindleRoad_EventScript_1BE00C, 31, 0, 0 + object_event 26, 96, 0, 18, 0, 112, 0, 4, 1, 17, 0, 0, 0, 0, 0, OneIsland_KindleRoad_EventScript_1BE00C, 17, 0, 0 + object_event 27, 92, 0, 15, 0, 70, 0, 3, 8, 17, 0, 0, 0, 0, 0, OneIsland_KindleRoad_EventScript_1BEC42, 475, 0, 0 + object_event 28, 92, 0, 17, 0, 103, 0, 3, 8, 17, 0, 0, 0, 0, 0, OneIsland_KindleRoad_EventScript_1BEC4F, 476, 0, 0 + object_event 29, 92, 0, 18, 0, 114, 0, 4, 8, 17, 0, 0, 0, 0, 0, OneIsland_KindleRoad_EventScript_1BEC5C, 477, 0, 0 + +OneIsland_KindleRoad_MapWarps: + warp_def 11, 6, 3, 0, 353 + warp_def 12, 6, 3, 1, 353 + warp_def 15, 58, 3, 0, 569 + +OneIsland_KindleRoad_MapBGEvents: + bg_event 13, 59, 0, 0, 0, OneIsland_KindleRoad_EventScript_168762 + bg_event 8, 115, 0, 0, 0, OneIsland_KindleRoad_EventScript_168759 + +OneIsland_KindleRoad_MapEvents:: + map_events OneIsland_KindleRoad_EventObjects, OneIsland_KindleRoad_MapWarps, 0x0, OneIsland_KindleRoad_MapBGEvents diff --git a/data/maps/OneIsland_KindleRoad_EmberSpa/events.inc b/data/maps/OneIsland_KindleRoad_EmberSpa/events.inc new file mode 100644 index 000000000..14906a2a9 --- /dev/null +++ b/data/maps/OneIsland_KindleRoad_EmberSpa/events.inc @@ -0,0 +1,16 @@ +OneIsland_KindleRoad_EmberSpa_EventObjects: + object_event 1, 32, 0, 11, 0, 13, 0, 3, 8, 17, 0, 0, 0, 0, 0, OneIsland_KindleRoad_EmberSpa_EventScript_16535C, 0, 0, 0 + object_event 2, 30, 0, 15, 0, 11, 0, 3, 18, 17, 0, 0, 0, 0, 0, OneIsland_KindleRoad_EmberSpa_EventScript_165365, 0, 0, 0 + object_event 3, 54, 0, 6, 0, 8, 0, 3, 5, 18, 0, 0, 0, 0, 0, OneIsland_KindleRoad_EmberSpa_EventScript_165380, 157, 0, 0 + object_event 4, 35, 0, 20, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, OneIsland_KindleRoad_EmberSpa_EventScript_165377, 0, 0, 0 + object_event 5, 32, 0, 10, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, OneIsland_KindleRoad_EmberSpa_EventScript_165399, 0, 0, 0 + object_event 6, 30, 0, 11, 0, 20, 0, 3, 5, 17, 0, 0, 0, 0, 0, OneIsland_KindleRoad_EmberSpa_EventScript_16536E, 0, 0, 0 + +OneIsland_KindleRoad_EmberSpa_MapWarps: + warp_def 13, 36, 3, 2, 813 + +OneIsland_KindleRoad_EmberSpa_MapCoordEvents: + coord_event 13, 13, 3, 0, 16385, 0, 0, OneIsland_KindleRoad_EmberSpa_EventScript_1653CF + +OneIsland_KindleRoad_EmberSpa_MapEvents:: + map_events OneIsland_KindleRoad_EmberSpa_EventObjects, OneIsland_KindleRoad_EmberSpa_MapWarps, OneIsland_KindleRoad_EmberSpa_MapCoordEvents, 0x0 diff --git a/data/maps/OneIsland_PokemonCenter_1F/events.inc b/data/maps/OneIsland_PokemonCenter_1F/events.inc new file mode 100644 index 000000000..b82526e6f --- /dev/null +++ b/data/maps/OneIsland_PokemonCenter_1F/events.inc @@ -0,0 +1,31 @@ +OneIsland_PokemonCenter_1F_EventObjects: + object_event 1, 64, 0, 5, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, OneIsland_PokemonCenter_1F_EventScript_170E94, 0, 0, 0 + object_event 2, 73, 0, 14, 0, 6, 0, 3, 7, 17, 0, 0, 0, 0, 0, OneIsland_PokemonCenter_1F_EventScript_170E9D, 114, 0, 0 + object_event 3, 89, 0, 15, 0, 6, 0, 3, 7, 17, 0, 0, 0, 0, 0, OneIsland_PokemonCenter_1F_EventScript_170EC5, 115, 0, 0 + object_event 4, 16, 0, 6, 0, 8, 0, 3, 2, 17, 0, 0, 0, 0, 0, OneIsland_PokemonCenter_1F_EventScript_171148, 0, 0, 0 + object_event 5, 56, 0, 3, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, OneIsland_PokemonCenter_1F_EventScript_171151, 0, 0, 0 + object_event 6, 24, 0, 7, 0, 4, 0, 3, 10, 17, 0, 0, 0, 0, 0, OneIsland_PokemonCenter_1F_EventScript_17115A, 0, 0, 0 + +OneIsland_PokemonCenter_1F_MapWarps: + warp_def 9, 9, 3, 0, 780 + warp_def 1, 5, 4, 0, 8193 + +OneIsland_PokemonCenter_1F_MapCoordEvents: + coord_event 12, 6, 3, 0, 16502, 2, 0, OneIsland_PokemonCenter_1F_EventScript_1711AA + coord_event 12, 7, 3, 0, 16502, 2, 0, OneIsland_PokemonCenter_1F_EventScript_1711B6 + coord_event 12, 8, 3, 0, 16502, 2, 0, OneIsland_PokemonCenter_1F_EventScript_1711C2 + coord_event 12, 9, 3, 0, 16502, 2, 0, OneIsland_PokemonCenter_1F_EventScript_1711CE + +OneIsland_PokemonCenter_1F_MapBGEvents: + bg_event 12, 2, 0, 0, 0, OneIsland_PokemonCenter_1F_EventScript_171179 + bg_event 12, 3, 0, 0, 0, OneIsland_PokemonCenter_1F_EventScript_171179 + bg_event 12, 4, 0, 0, 0, OneIsland_PokemonCenter_1F_EventScript_171179 + bg_event 12, 5, 0, 0, 0, OneIsland_PokemonCenter_1F_EventScript_171179 + bg_event 13, 5, 0, 0, 0, OneIsland_PokemonCenter_1F_EventScript_171179 + bg_event 15, 5, 0, 0, 0, OneIsland_PokemonCenter_1F_EventScript_171179 + bg_event 14, 5, 0, 0, 0, OneIsland_PokemonCenter_1F_EventScript_171179 + bg_event 16, 5, 0, 0, 0, OneIsland_PokemonCenter_1F_EventScript_171179 + bg_event 17, 5, 0, 0, 0, OneIsland_PokemonCenter_1F_EventScript_171179 + +OneIsland_PokemonCenter_1F_MapEvents:: + map_events OneIsland_PokemonCenter_1F_EventObjects, OneIsland_PokemonCenter_1F_MapWarps, OneIsland_PokemonCenter_1F_MapCoordEvents, OneIsland_PokemonCenter_1F_MapBGEvents diff --git a/data/maps/OneIsland_PokemonCenter_2F/events.inc b/data/maps/OneIsland_PokemonCenter_2F/events.inc new file mode 100644 index 000000000..2e285716f --- /dev/null +++ b/data/maps/OneIsland_PokemonCenter_2F/events.inc @@ -0,0 +1,13 @@ +OneIsland_PokemonCenter_2F_EventObjects: + object_event 1, 65, 0, 6, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, OneIsland_PokemonCenter_2F_EventScript_1A8CF6, 0, 0, 0 + object_event 2, 65, 0, 2, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, OneIsland_PokemonCenter_2F_EventScript_1A8CFC, 0, 0, 0 + object_event 3, 65, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, OneIsland_PokemonCenter_2F_EventScript_1A8D02, 0, 0, 0 + object_event 4, 69, 0, 1, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, OneIsland_PokemonCenter_2F_EventScript_1BB1D2, 112, 0, 0 + +OneIsland_PokemonCenter_2F_MapWarps: + warp_def 1, 6, 4, 1, 8192 + warp_def 5, 1, 0, 0, 4 + warp_def 9, 1, 0, 0, 1 + +OneIsland_PokemonCenter_2F_MapEvents:: + map_events OneIsland_PokemonCenter_2F_EventObjects, OneIsland_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/OneIsland_TreasureBeach/events.inc b/data/maps/OneIsland_TreasureBeach/events.inc new file mode 100644 index 000000000..78ca6a94b --- /dev/null +++ b/data/maps/OneIsland_TreasureBeach/events.inc @@ -0,0 +1,16 @@ +OneIsland_TreasureBeach_EventObjects: + object_event 1, 44, 0, 8, 0, 11, 0, 1, 2, 18, 0, 1, 0, 1, 0, OneIsland_TreasureBeach_EventScript_1ABF27, 0, 0, 0 + object_event 2, 19, 0, 13, 0, 20, 0, 3, 2, 17, 0, 0, 0, 0, 0, OneIsland_TreasureBeach_EventScript_16876C, 0, 0, 0 + +OneIsland_TreasureBeach_MapBGEvents: + bg_event 8, 20, 3, 7, 0, 108, 103, 1 + bg_event 13, 27, 3, 7, 0, 108, 104, 1 + bg_event 11, 31, 3, 7, 0, 106, 105, 1 + bg_event 9, 34, 3, 7, 0, 106, 106, 1 + bg_event 15, 22, 3, 7, 0, 2, 107, 1 + bg_event 16, 33, 3, 7, 0, 2, 108, 1 + bg_event 15, 29, 3, 7, 0, 109, 109, 1 + bg_event 8, 27, 3, 7, 0, 107, 110, 1 + +OneIsland_TreasureBeach_MapEvents:: + map_events OneIsland_TreasureBeach_EventObjects, 0x0, 0x0, OneIsland_TreasureBeach_MapBGEvents diff --git a/data/maps/PalletTown/events.inc b/data/maps/PalletTown/events.inc new file mode 100644 index 000000000..9fb85293c --- /dev/null +++ b/data/maps/PalletTown/events.inc @@ -0,0 +1,24 @@ +PalletTown_EventObjects: + object_event 1, 23, 0, 3, 0, 10, 0, 3, 2, 65, 0, 0, 0, 0, 0, PalletTown_EventScript_16575C, 0, 0, 0 + object_event 2, 27, 0, 13, 0, 17, 0, 3, 2, 38, 0, 0, 0, 0, 0, PalletTown_EventScript_16582F, 0, 0, 0 + object_event 3, 71, 0, 10, 0, 8, 0, 3, 7, 17, 0, 0, 0, 0, 0, 0x0, 44, 0, 0 + +PalletTown_MapWarps: + warp_def 6, 7, 0, 1, 1024 + warp_def 15, 7, 0, 0, 1026 + warp_def 16, 13, 0, 0, 1027 + +PalletTown_MapCoordEvents: + coord_event 12, 1, 3, 0, 16464, 0, 0, PalletTown_EventScript_1655ED + coord_event 13, 1, 3, 0, 16464, 0, 0, PalletTown_EventScript_1655F9 + coord_event 13, 2, 3, 0, 16386, 1, 0, PalletTown_EventScript_16587B + +PalletTown_MapBGEvents: + bg_event 16, 16, 0, 0, 0, PalletTown_EventScript_165838 + bg_event 4, 7, 0, 0, 0, PalletTown_EventScript_165850 + bg_event 13, 7, 0, 0, 0, PalletTown_EventScript_165859 + bg_event 9, 11, 0, 0, 0, PalletTown_EventScript_165862 + bg_event 5, 14, 0, 0, 0, PalletTown_EventScript_16586B + +PalletTown_MapEvents:: + map_events PalletTown_EventObjects, PalletTown_MapWarps, PalletTown_MapCoordEvents, PalletTown_MapBGEvents diff --git a/data/maps/PalletTown_GarysHouse/events.inc b/data/maps/PalletTown_GarysHouse/events.inc new file mode 100644 index 000000000..b6f3fdbde --- /dev/null +++ b/data/maps/PalletTown_GarysHouse/events.inc @@ -0,0 +1,16 @@ +PalletTown_GarysHouse_EventObjects: + object_event 1, 76, 0, 10, 0, 6, 0, 3, 2, 49, 0, 0, 0, 0, 0, PalletTown_GarysHouse_EventScript_168D56, 0, 0, 0 + object_event 2, 93, 0, 6, 0, 4, 0, 3, 8, 17, 0, 0, 0, 0, 0, PalletTown_GarysHouse_EventScript_168F63, 57, 0, 0 + +PalletTown_GarysHouse_MapWarps: + warp_def 4, 8, 3, 1, 768 + warp_def 5, 8, 3, 1, 768 + warp_def 3, 8, 3, 1, 768 + +PalletTown_GarysHouse_MapBGEvents: + bg_event 12, 1, 0, 0, 0, PalletTown_GarysHouse_EventScript_168F6C + bg_event 11, 1, 0, 0, 0, PalletTown_GarysHouse_EventScript_168F6C + bg_event 9, 1, 0, 0, 0, PalletTown_GarysHouse_EventScript_168F75 + +PalletTown_GarysHouse_MapEvents:: + map_events PalletTown_GarysHouse_EventObjects, PalletTown_GarysHouse_MapWarps, 0x0, PalletTown_GarysHouse_MapBGEvents diff --git a/data/maps/PalletTown_PlayersHouse_1F/events.inc b/data/maps/PalletTown_PlayersHouse_1F/events.inc new file mode 100644 index 000000000..1b9cc714e --- /dev/null +++ b/data/maps/PalletTown_PlayersHouse_1F/events.inc @@ -0,0 +1,14 @@ +PalletTown_PlayersHouse_1F_EventObjects: + object_event 1, 88, 0, 8, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, PalletTown_PlayersHouse_1F_EventScript_168C09, 0, 0, 0 + +PalletTown_PlayersHouse_1F_MapWarps: + warp_def 5, 8, 3, 0, 768 + warp_def 4, 8, 3, 0, 768 + warp_def 10, 2, 3, 0, 1025 + warp_def 3, 9, 0, 0, 768 + +PalletTown_PlayersHouse_1F_MapBGEvents: + bg_event 6, 1, 0, 0, 0, PalletTown_PlayersHouse_1F_EventScript_168C62 + +PalletTown_PlayersHouse_1F_MapEvents:: + map_events PalletTown_PlayersHouse_1F_EventObjects, PalletTown_PlayersHouse_1F_MapWarps, 0x0, PalletTown_PlayersHouse_1F_MapBGEvents diff --git a/data/maps/PalletTown_PlayersHouse_2F/events.inc b/data/maps/PalletTown_PlayersHouse_2F/events.inc new file mode 100644 index 000000000..7695ec797 --- /dev/null +++ b/data/maps/PalletTown_PlayersHouse_2F/events.inc @@ -0,0 +1,10 @@ +PalletTown_PlayersHouse_2F_MapWarps: + warp_def 10, 2, 3, 2, 1024 + +PalletTown_PlayersHouse_2F_MapBGEvents: + bg_event 6, 5, 3, 0, 0, PalletTown_PlayersHouse_2F_EventScript_168CD2 + bg_event 1, 1, 0, 0, 0, PalletTown_PlayersHouse_2F_EventScript_168CE4 + bg_event 11, 1, 0, 0, 0, PalletTown_PlayersHouse_2F_EventScript_168CDB + +PalletTown_PlayersHouse_2F_MapEvents:: + map_events 0x0, PalletTown_PlayersHouse_2F_MapWarps, 0x0, PalletTown_PlayersHouse_2F_MapBGEvents diff --git a/data/maps/PalletTown_ProfessorOaksLab/events.inc b/data/maps/PalletTown_ProfessorOaksLab/events.inc new file mode 100644 index 000000000..9941e265f --- /dev/null +++ b/data/maps/PalletTown_ProfessorOaksLab/events.inc @@ -0,0 +1,33 @@ +PalletTown_ProfessorOaksLab_EventObjects: + object_event 1, 55, 0, 3, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, PalletTown_ProfessorOaksLab_EventScript_169DEE, 0, 0, 0 + object_event 2, 48, 0, 2, 0, 10, 0, 3, 3, 64, 0, 0, 0, 0, 0, PalletTown_ProfessorOaksLab_EventScript_169E46, 0, 0, 0 + object_event 3, 55, 0, 11, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, PalletTown_ProfessorOaksLab_EventScript_169E1A, 0, 0, 0 + object_event 4, 71, 0, 6, 0, 3, 0, 3, 8, 17, 0, 0, 0, 0, 0, PalletTown_ProfessorOaksLab_EventScript_169595, 43, 0, 0 + object_event 5, 92, 0, 8, 0, 4, 0, 0, 8, 17, 0, 0, 0, 0, 0, PalletTown_ProfessorOaksLab_EventScript_169BAB, 40, 0, 0 + object_event 6, 92, 0, 9, 0, 4, 0, 0, 8, 17, 0, 0, 0, 0, 0, PalletTown_ProfessorOaksLab_EventScript_169D78, 41, 0, 0 + object_event 7, 92, 0, 10, 0, 4, 0, 0, 8, 17, 0, 0, 0, 0, 0, PalletTown_ProfessorOaksLab_EventScript_169DAE, 42, 0, 0 + object_event 8, 72, 0, 5, 0, 4, 0, 3, 8, 17, 0, 0, 0, 0, 0, PalletTown_ProfessorOaksLab_EventScript_16955F, 45, 0, 0 + object_event 9, 94, 0, 4, 0, 1, 0, 0, 8, 17, 0, 0, 0, 0, 0, PalletTown_ProfessorOaksLab_EventScript_169E5F, 58, 0, 0 + object_event 10, 94, 0, 5, 0, 1, 0, 0, 8, 17, 0, 0, 0, 0, 0, PalletTown_ProfessorOaksLab_EventScript_169E5F, 58, 0, 0 + +PalletTown_ProfessorOaksLab_MapWarps: + warp_def 6, 12, 3, 2, 768 + warp_def 7, 12, 3, 2, 768 + warp_def 5, 12, 3, 2, 768 + +PalletTown_ProfessorOaksLab_MapCoordEvents: + coord_event 5, 8, 3, 0, 16469, 2, 0, PalletTown_ProfessorOaksLab_EventScript_1692C3 + coord_event 6, 8, 3, 0, 16469, 2, 0, PalletTown_ProfessorOaksLab_EventScript_1692C3 + coord_event 7, 8, 3, 0, 16469, 2, 0, PalletTown_ProfessorOaksLab_EventScript_1692C3 + coord_event 5, 8, 3, 0, 16469, 3, 0, PalletTown_ProfessorOaksLab_EventScript_1692E7 + coord_event 6, 8, 3, 0, 16469, 3, 0, PalletTown_ProfessorOaksLab_EventScript_1692F3 + coord_event 7, 8, 3, 0, 16469, 3, 0, PalletTown_ProfessorOaksLab_EventScript_1692FF + +PalletTown_ProfessorOaksLab_MapBGEvents: + bg_event 2, 1, 0, 0, 0, PalletTown_ProfessorOaksLab_EventScript_169E68 + bg_event 3, 1, 0, 0, 0, PalletTown_ProfessorOaksLab_EventScript_169E68 + bg_event 6, 1, 0, 0, 0, PalletTown_ProfessorOaksLab_EventScript_169E71 + bg_event 7, 1, 0, 0, 0, PalletTown_ProfessorOaksLab_EventScript_169E7A + +PalletTown_ProfessorOaksLab_MapEvents:: + map_events PalletTown_ProfessorOaksLab_EventObjects, PalletTown_ProfessorOaksLab_MapWarps, PalletTown_ProfessorOaksLab_MapCoordEvents, PalletTown_ProfessorOaksLab_MapBGEvents diff --git a/data/maps/PewterCity/events.inc b/data/maps/PewterCity/events.inc new file mode 100644 index 000000000..c059dc865 --- /dev/null +++ b/data/maps/PewterCity/events.inc @@ -0,0 +1,37 @@ +PewterCity_EventObjects: + object_event 1, 22, 0, 6, 0, 15, 0, 3, 1, 17, 0, 0, 0, 0, 0, PewterCity_EventScript_166075, 0, 0, 0 + object_event 2, 25, 0, 33, 0, 17, 0, 3, 1, 17, 0, 0, 0, 0, 0, PewterCity_EventScript_16607E, 80, 0, 0 + object_event 3, 27, 0, 21, 0, 28, 0, 3, 8, 17, 0, 0, 0, 0, 0, PewterCity_EventScript_16622B, 0, 0, 0 + object_event 4, 20, 0, 33, 0, 27, 0, 3, 5, 18, 0, 0, 0, 0, 0, PewterCity_EventScript_166244, 0, 0, 0 + object_event 5, 19, 0, 42, 0, 20, 0, 3, 8, 17, 0, 0, 0, 0, 0, PewterCity_EventScript_165B9D, 46, 0, 0 + object_event 6, 95, 0, 30, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, PewterCity_EventScript_1BDF13, 18, 0, 0 + object_event 7, 55, 0, 46, 0, 20, 0, 3, 10, 17, 0, 0, 0, 0, 0, PewterCity_EventScript_1662A9, 146, 0, 0 + +PewterCity_MapWarps: + warp_def 17, 6, 0, 1, 1536 + warp_def 25, 4, 0, 3, 1536 + warp_def 15, 16, 0, 1, 1538 + warp_def 28, 18, 0, 1, 1539 + warp_def 33, 11, 0, 1, 1540 + warp_def 17, 25, 0, 1, 1541 + warp_def 9, 30, 0, 1, 1543 + +PewterCity_MapCoordEvents: + coord_event 42, 21, 3, 0, 16492, 0, 0, PewterCity_EventScript_165D8E + coord_event 42, 22, 3, 0, 16492, 0, 0, PewterCity_EventScript_165D9A + coord_event 42, 23, 3, 0, 16492, 0, 0, PewterCity_EventScript_165DA6 + coord_event 43, 23, 3, 0, 16492, 0, 0, PewterCity_EventScript_165DB2 + coord_event 46, 21, 3, 0, 16492, 1, 0, PewterCity_EventScript_1662B7 + coord_event 46, 22, 3, 0, 16492, 1, 0, PewterCity_EventScript_1662C4 + coord_event 46, 23, 3, 0, 16492, 1, 0, PewterCity_EventScript_1662D1 + +PewterCity_MapBGEvents: + bg_event 19, 7, 0, 0, 0, PewterCity_EventScript_16627F + bg_event 39, 19, 0, 0, 0, PewterCity_EventScript_166276 + bg_event 11, 16, 0, 0, 0, PewterCity_EventScript_166288 + bg_event 20, 30, 0, 0, 0, PewterCity_EventScript_16626D + bg_event 31, 25, 0, 0, 0, PewterCity_EventScript_1662A0 + bg_event 6, 3, 3, 7, 0, 4, 112, 1 + +PewterCity_MapEvents:: + map_events PewterCity_EventObjects, PewterCity_MapWarps, PewterCity_MapCoordEvents, PewterCity_MapBGEvents diff --git a/data/maps/PewterCity_Gym/events.inc b/data/maps/PewterCity_Gym/events.inc new file mode 100644 index 000000000..72a587cd1 --- /dev/null +++ b/data/maps/PewterCity_Gym/events.inc @@ -0,0 +1,16 @@ +PewterCity_Gym_EventObjects: + object_event 1, 80, 0, 6, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, PewterCity_Gym_EventScript_16A593, 0, 0, 0 + object_event 2, 39, 0, 3, 0, 8, 0, 3, 10, 17, 0, 1, 0, 4, 0, PewterCity_Gym_EventScript_16A63E, 0, 0, 0 + object_event 3, 91, 0, 7, 0, 12, 0, 3, 8, 17, 0, 0, 0, 0, 0, PewterCity_Gym_EventScript_16A655, 0, 0, 0 + +PewterCity_Gym_MapWarps: + warp_def 5, 14, 3, 2, 770 + warp_def 6, 14, 3, 2, 770 + warp_def 7, 14, 3, 2, 770 + +PewterCity_Gym_MapBGEvents: + bg_event 4, 12, 0, 0, 0, PewterCity_Gym_EventScript_16A6AF + bg_event 8, 12, 0, 0, 0, PewterCity_Gym_EventScript_16A6AF + +PewterCity_Gym_MapEvents:: + map_events PewterCity_Gym_EventObjects, PewterCity_Gym_MapWarps, 0x0, PewterCity_Gym_MapBGEvents diff --git a/data/maps/PewterCity_House1/events.inc b/data/maps/PewterCity_House1/events.inc new file mode 100644 index 000000000..04f6bff20 --- /dev/null +++ b/data/maps/PewterCity_House1/events.inc @@ -0,0 +1,12 @@ +PewterCity_House1_EventObjects: + object_event 1, 30, 0, 1, 0, 2, 0, 3, 7, 17, 0, 0, 0, 0, 0, PewterCity_House1_EventScript_16A71D, 0, 0, 0 + object_event 2, 16, 0, 5, 0, 3, 0, 3, 10, 17, 0, 0, 0, 0, 0, PewterCity_House1_EventScript_16A726, 0, 0, 0 + object_event 3, 123, 0, 6, 0, 3, 0, 3, 9, 17, 0, 0, 0, 0, 0, PewterCity_House1_EventScript_16A736, 0, 0, 0 + +PewterCity_House1_MapWarps: + warp_def 3, 7, 0, 4, 770 + warp_def 4, 7, 0, 4, 770 + warp_def 5, 7, 0, 4, 770 + +PewterCity_House1_MapEvents:: + map_events PewterCity_House1_EventObjects, PewterCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/PewterCity_House2/events.inc b/data/maps/PewterCity_House2/events.inc new file mode 100644 index 000000000..1c02eceb8 --- /dev/null +++ b/data/maps/PewterCity_House2/events.inc @@ -0,0 +1,11 @@ +PewterCity_House2_EventObjects: + object_event 1, 32, 0, 3, 0, 3, 0, 3, 10, 17, 0, 0, 0, 0, 0, PewterCity_House2_EventScript_16A7DD, 0, 0, 0 + object_event 2, 16, 0, 5, 0, 3, 0, 3, 13, 17, 0, 0, 0, 0, 0, PewterCity_House2_EventScript_16A7E6, 0, 0, 0 + +PewterCity_House2_MapWarps: + warp_def 3, 7, 0, 6, 770 + warp_def 4, 7, 0, 6, 770 + warp_def 5, 7, 0, 6, 770 + +PewterCity_House2_MapEvents:: + map_events PewterCity_House2_EventObjects, PewterCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/PewterCity_Mart/events.inc b/data/maps/PewterCity_Mart/events.inc new file mode 100644 index 000000000..4d39a67d9 --- /dev/null +++ b/data/maps/PewterCity_Mart/events.inc @@ -0,0 +1,12 @@ +PewterCity_Mart_EventObjects: + object_event 1, 18, 0, 8, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0, 0, PewterCity_Mart_EventScript_16A6CE, 0, 0, 0 + object_event 2, 19, 0, 6, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, PewterCity_Mart_EventScript_16A6D7, 0, 0, 0 + object_event 3, 68, 0, 2, 0, 3, 0, 0, 10, 17, 0, 0, 0, 0, 0, PewterCity_Mart_EventScript_16A6E0, 0, 0, 0 + +PewterCity_Mart_MapWarps: + warp_def 3, 7, 3, 3, 770 + warp_def 4, 7, 3, 3, 770 + warp_def 5, 7, 3, 3, 770 + +PewterCity_Mart_MapEvents:: + map_events PewterCity_Mart_EventObjects, PewterCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/PewterCity_Museum_1F/events.inc b/data/maps/PewterCity_Museum_1F/events.inc new file mode 100644 index 000000000..ff58a1c0c --- /dev/null +++ b/data/maps/PewterCity_Museum_1F/events.inc @@ -0,0 +1,29 @@ +PewterCity_Museum_1F_EventObjects: + object_event 1, 47, 0, 16, 0, 5, 0, 3, 9, 17, 0, 0, 0, 0, 0, PewterCity_Museum_1F_EventScript_16A31B, 0, 0, 0 + object_event 2, 32, 0, 2, 0, 4, 0, 3, 10, 17, 0, 0, 0, 0, 0, PewterCity_Museum_1F_EventScript_16A4A5, 0, 0, 0 + object_event 3, 55, 0, 21, 0, 3, 0, 3, 8, 17, 0, 0, 0, 0, 0, PewterCity_Museum_1F_EventScript_16A4AE, 0, 0, 0 + object_event 4, 101, 0, 22, 0, 3, 0, 0, 8, 17, 0, 0, 0, 0, 0, PewterCity_Museum_1F_EventScript_16A509, 86, 0, 0 + object_event 5, 55, 0, 26, 0, 4, 0, 3, 10, 17, 0, 0, 0, 0, 0, PewterCity_Museum_1F_EventScript_16A49C, 0, 0, 0 + object_event 6, 55, 0, 26, 0, 7, 0, 3, 10, 17, 0, 0, 0, 0, 0, PewterCity_Museum_1F_EventScript_1C4BBE, 0, 0, 0 + +PewterCity_Museum_1F_MapWarps: + warp_def 13, 9, 3, 0, 770 + warp_def 14, 9, 3, 0, 770 + warp_def 15, 9, 3, 0, 770 + warp_def 21, 9, 3, 1, 770 + warp_def 22, 9, 3, 1, 770 + warp_def 8, 8, 3, 0, 1537 + +PewterCity_Museum_1F_MapCoordEvents: + coord_event 12, 5, 3, 0, 16481, 0, 0, PewterCity_Museum_1F_EventScript_16A38F + coord_event 13, 5, 3, 0, 16481, 0, 0, PewterCity_Museum_1F_EventScript_16A3A5 + coord_event 14, 5, 3, 0, 16481, 0, 0, PewterCity_Museum_1F_EventScript_16A3BB + +PewterCity_Museum_1F_MapBGEvents: + bg_event 4, 4, 0, 0, 0, PewterCity_Museum_1F_EventScript_16A512 + bg_event 4, 7, 0, 0, 0, PewterCity_Museum_1F_EventScript_16A532 + bg_event 27, 1, 0, 1, 0, PewterCity_Museum_1F_EventScript_1ACE1C + bg_event 26, 1, 0, 1, 0, PewterCity_Museum_1F_EventScript_1ACE1C + +PewterCity_Museum_1F_MapEvents:: + map_events PewterCity_Museum_1F_EventObjects, PewterCity_Museum_1F_MapWarps, PewterCity_Museum_1F_MapCoordEvents, PewterCity_Museum_1F_MapBGEvents diff --git a/data/maps/PewterCity_Museum_2F/events.inc b/data/maps/PewterCity_Museum_2F/events.inc new file mode 100644 index 000000000..45bc62846 --- /dev/null +++ b/data/maps/PewterCity_Museum_2F/events.inc @@ -0,0 +1,22 @@ +PewterCity_Museum_2F_EventObjects: + object_event 1, 55, 0, 10, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, PewterCity_Museum_2F_EventScript_16A565, 0, 0, 0 + object_event 2, 25, 0, 4, 0, 9, 0, 3, 5, 19, 0, 0, 0, 0, 0, PewterCity_Museum_2F_EventScript_16A553, 0, 0, 0 + object_event 3, 33, 0, 0, 0, 6, 0, 3, 1, 19, 0, 0, 0, 0, 0, PewterCity_Museum_2F_EventScript_16A55C, 0, 0, 0 + object_event 4, 17, 0, 15, 0, 8, 0, 3, 10, 17, 0, 0, 0, 0, 0, PewterCity_Museum_2F_EventScript_16A56E, 0, 0, 0 + object_event 5, 30, 0, 16, 0, 8, 0, 3, 8, 17, 0, 0, 0, 0, 0, PewterCity_Museum_2F_EventScript_16A577, 0, 0, 0 + +PewterCity_Museum_2F_MapWarps: + warp_def 11, 8, 3, 5, 1536 + +PewterCity_Museum_2F_MapBGEvents: + bg_event 3, 6, 0, 0, 0, PewterCity_Museum_2F_EventScript_16A589 + bg_event 15, 5, 0, 0, 0, PewterCity_Museum_2F_EventScript_16A580 + bg_event 14, 5, 0, 0, 0, PewterCity_Museum_2F_EventScript_16A580 + bg_event 16, 5, 0, 0, 0, PewterCity_Museum_2F_EventScript_16A580 + bg_event 14, 4, 0, 0, 0, PewterCity_Museum_2F_EventScript_16A580 + bg_event 15, 4, 0, 0, 0, PewterCity_Museum_2F_EventScript_16A580 + bg_event 16, 4, 0, 0, 0, PewterCity_Museum_2F_EventScript_16A580 + bg_event 3, 5, 0, 0, 0, PewterCity_Museum_2F_EventScript_16A589 + +PewterCity_Museum_2F_MapEvents:: + map_events PewterCity_Museum_2F_EventObjects, PewterCity_Museum_2F_MapWarps, 0x0, PewterCity_Museum_2F_MapBGEvents diff --git a/data/maps/PewterCity_PokemonCenter_1F/events.inc b/data/maps/PewterCity_PokemonCenter_1F/events.inc new file mode 100644 index 000000000..efeff4714 --- /dev/null +++ b/data/maps/PewterCity_PokemonCenter_1F/events.inc @@ -0,0 +1,17 @@ +PewterCity_PokemonCenter_1F_EventObjects: + object_event 1, 115, 0, 2, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, PewterCity_PokemonCenter_1F_EventScript_16A781, 0, 0, 0 + object_event 2, 61, 0, 4, 0, 8, 0, 3, 14, 17, 0, 0, 0, 0, 0, PewterCity_PokemonCenter_1F_EventScript_16A778, 0, 0, 0 + object_event 3, 64, 0, 7, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, PewterCity_PokemonCenter_1F_EventScript_16A76F, 0, 0, 0 + object_event 4, 18, 0, 1, 0, 2, 0, 3, 10, 17, 0, 0, 0, 0, 0, PewterCity_PokemonCenter_1F_EventScript_16A798, 0, 0, 0 + object_event 5, 23, 0, 13, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, PewterCity_PokemonCenter_1F_EventScript_1BEE16, 0, 0, 0 + object_event 6, 51, 0, 10, 0, 7, 0, 3, 10, 17, 0, 0, 0, 0, 0, PewterCity_PokemonCenter_1F_EventScript_16A7A1, 0, 0, 0 + object_event 7, 51, 0, 14, 0, 6, 0, 3, 9, 17, 0, 0, 0, 0, 0, PewterCity_PokemonCenter_1F_EventScript_16A7AC, 0, 0, 0 + +PewterCity_PokemonCenter_1F_MapWarps: + warp_def 6, 8, 0, 5, 770 + warp_def 7, 8, 3, 5, 770 + warp_def 8, 8, 0, 5, 770 + warp_def 1, 6, 4, 0, 1542 + +PewterCity_PokemonCenter_1F_MapEvents:: + map_events PewterCity_PokemonCenter_1F_EventObjects, PewterCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/PewterCity_PokemonCenter_2F/events.inc b/data/maps/PewterCity_PokemonCenter_2F/events.inc new file mode 100644 index 000000000..fee2be7d2 --- /dev/null +++ b/data/maps/PewterCity_PokemonCenter_2F/events.inc @@ -0,0 +1,13 @@ +PewterCity_PokemonCenter_2F_EventObjects: + object_event 1, 65, 0, 6, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, PewterCity_PokemonCenter_2F_EventScript_1A8CF6, 0, 0, 0 + object_event 2, 65, 0, 2, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, PewterCity_PokemonCenter_2F_EventScript_1A8CFC, 0, 0, 0 + object_event 3, 65, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, PewterCity_PokemonCenter_2F_EventScript_1A8D02, 0, 0, 0 + object_event 4, 69, 0, 1, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, PewterCity_PokemonCenter_2F_EventScript_1BB1D2, 112, 0, 0 + +PewterCity_PokemonCenter_2F_MapWarps: + warp_def 1, 6, 4, 3, 1541 + warp_def 5, 1, 0, 0, 4 + warp_def 9, 1, 0, 0, 1 + +PewterCity_PokemonCenter_2F_MapEvents:: + map_events PewterCity_PokemonCenter_2F_EventObjects, PewterCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/PokemonLeague_AgathasRoom/events.inc b/data/maps/PokemonLeague_AgathasRoom/events.inc new file mode 100644 index 000000000..0b6a8136a --- /dev/null +++ b/data/maps/PokemonLeague_AgathasRoom/events.inc @@ -0,0 +1,9 @@ +PokemonLeague_AgathasRoom_EventObjects: + object_event 1, 75, 0, 6, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, PokemonLeague_AgathasRoom_EventScript_162877, 0, 0, 0 + +PokemonLeague_AgathasRoom_MapWarps: + warp_def 6, 12, 0, 1, 332 + warp_def 6, 2, 0, 0, 334 + +PokemonLeague_AgathasRoom_MapEvents:: + map_events PokemonLeague_AgathasRoom_EventObjects, PokemonLeague_AgathasRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/PokemonLeague_BrunosRoom/events.inc b/data/maps/PokemonLeague_BrunosRoom/events.inc new file mode 100644 index 000000000..940c91903 --- /dev/null +++ b/data/maps/PokemonLeague_BrunosRoom/events.inc @@ -0,0 +1,9 @@ +PokemonLeague_BrunosRoom_EventObjects: + object_event 1, 79, 0, 6, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, PokemonLeague_BrunosRoom_EventScript_1626EC, 0, 0, 0 + +PokemonLeague_BrunosRoom_MapWarps: + warp_def 6, 12, 0, 1, 331 + warp_def 6, 2, 0, 0, 333 + +PokemonLeague_BrunosRoom_MapEvents:: + map_events PokemonLeague_BrunosRoom_EventObjects, PokemonLeague_BrunosRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/PokemonLeague_ChampionsRoom/events.inc b/data/maps/PokemonLeague_ChampionsRoom/events.inc new file mode 100644 index 000000000..bd581b352 --- /dev/null +++ b/data/maps/PokemonLeague_ChampionsRoom/events.inc @@ -0,0 +1,10 @@ +PokemonLeague_ChampionsRoom_EventObjects: + object_event 1, 72, 0, 6, 0, 8, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 2, 71, 0, 6, 0, 15, 0, 0, 7, 17, 0, 0, 0, 0, 0, 0x0, 90, 0, 0 + +PokemonLeague_ChampionsRoom_MapWarps: + warp_def 6, 19, 3, 1, 334 + warp_def 6, 2, 3, 0, 336 + +PokemonLeague_ChampionsRoom_MapEvents:: + map_events PokemonLeague_ChampionsRoom_EventObjects, PokemonLeague_ChampionsRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/PokemonLeague_HallOfFame/events.inc b/data/maps/PokemonLeague_HallOfFame/events.inc new file mode 100644 index 000000000..efc8efd4a --- /dev/null +++ b/data/maps/PokemonLeague_HallOfFame/events.inc @@ -0,0 +1,8 @@ +PokemonLeague_HallOfFame_EventObjects: + object_event 1, 71, 0, 6, 0, 4, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + +PokemonLeague_HallOfFame_MapWarps: + warp_def 5, 12, 3, 1, 335 + +PokemonLeague_HallOfFame_MapEvents:: + map_events PokemonLeague_HallOfFame_EventObjects, PokemonLeague_HallOfFame_MapWarps, 0x0, 0x0 diff --git a/data/maps/PokemonLeague_LancesRoom/events.inc b/data/maps/PokemonLeague_LancesRoom/events.inc new file mode 100644 index 000000000..9d5fcca8e --- /dev/null +++ b/data/maps/PokemonLeague_LancesRoom/events.inc @@ -0,0 +1,9 @@ +PokemonLeague_LancesRoom_EventObjects: + object_event 1, 74, 0, 6, 0, 8, 0, 3, 8, 17, 0, 0, 0, 0, 0, PokemonLeague_LancesRoom_EventScript_162A14, 0, 0, 0 + +PokemonLeague_LancesRoom_MapWarps: + warp_def 23, 13, 3, 1, 333 + warp_def 6, 5, 0, 0, 335 + +PokemonLeague_LancesRoom_MapEvents:: + map_events PokemonLeague_LancesRoom_EventObjects, PokemonLeague_LancesRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/PokemonLeague_LoreleisRoom/events.inc b/data/maps/PokemonLeague_LoreleisRoom/events.inc new file mode 100644 index 000000000..9f763ac45 --- /dev/null +++ b/data/maps/PokemonLeague_LoreleisRoom/events.inc @@ -0,0 +1,9 @@ +PokemonLeague_LoreleisRoom_EventObjects: + object_event 1, 77, 0, 6, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, PokemonLeague_LoreleisRoom_EventScript_1625DC, 0, 0, 0 + +PokemonLeague_LoreleisRoom_MapWarps: + warp_def 6, 12, 0, 1, 3328 + warp_def 6, 2, 0, 0, 332 + +PokemonLeague_LoreleisRoom_MapEvents:: + map_events PokemonLeague_LoreleisRoom_EventObjects, PokemonLeague_LoreleisRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/PokemonMansion_1F/events.inc b/data/maps/PokemonMansion_1F/events.inc new file mode 100644 index 000000000..88470ec39 --- /dev/null +++ b/data/maps/PokemonMansion_1F/events.inc @@ -0,0 +1,25 @@ +PokemonMansion_1F_EventObjects: + object_event 1, 55, 0, 22, 0, 24, 0, 3, 9, 17, 0, 1, 0, 4, 0, PokemonMansion_1F_EventScript_162226, 0, 0, 0 + object_event 2, 92, 0, 29, 0, 32, 0, 3, 8, 17, 0, 0, 0, 0, 0, PokemonMansion_1F_EventScript_1BE95D, 415, 0, 0 + object_event 3, 92, 0, 22, 0, 6, 0, 3, 8, 17, 0, 0, 0, 0, 0, PokemonMansion_1F_EventScript_1BE96A, 416, 0, 0 + object_event 4, 92, 0, 27, 0, 15, 0, 3, 8, 17, 0, 0, 0, 0, 0, PokemonMansion_1F_EventScript_1BEB65, 458, 0, 0 + object_event 5, 18, 0, 8, 0, 8, 0, 3, 5, 18, 0, 1, 0, 1, 0, PokemonMansion_1F_EventScript_16223D, 0, 0, 0 + +PokemonMansion_1F_MapWarps: + warp_def 7, 33, 3, 0, 776 + warp_def 8, 33, 3, 0, 776 + warp_def 9, 33, 3, 0, 776 + warp_def 10, 13, 3, 2, 316 + warp_def 25, 27, 3, 0, 318 + warp_def 34, 33, 3, 0, 776 + warp_def 35, 34, 0, 0, 776 + warp_def 19, 22, 3, 3, 317 + warp_def 20, 22, 3, 4, 317 + warp_def 11, 13, 0, 2, 316 + +PokemonMansion_1F_MapBGEvents: + bg_event 5, 5, 0, 1, 0, PokemonMansion_1F_EventScript_162212 + bg_event 2, 21, 0, 7, 0, 94, 31, 1 + +PokemonMansion_1F_MapEvents:: + map_events PokemonMansion_1F_EventObjects, PokemonMansion_1F_MapWarps, 0x0, PokemonMansion_1F_MapBGEvents diff --git a/data/maps/PokemonMansion_2F/events.inc b/data/maps/PokemonMansion_2F/events.inc new file mode 100644 index 000000000..e71547b95 --- /dev/null +++ b/data/maps/PokemonMansion_2F/events.inc @@ -0,0 +1,20 @@ +PokemonMansion_2F_EventObjects: + object_event 1, 52, 0, 5, 0, 23, 0, 3, 1, 17, 0, 1, 0, 1, 0, PokemonMansion_2F_EventScript_16228A, 0, 0, 0 + object_event 2, 92, 0, 36, 0, 8, 0, 3, 8, 17, 0, 0, 0, 0, 0, PokemonMansion_2F_EventScript_1BE977, 417, 0, 0 + object_event 3, 92, 0, 18, 0, 23, 0, 3, 8, 17, 0, 0, 0, 0, 0, PokemonMansion_2F_EventScript_1BEB72, 459, 0, 0 + object_event 4, 92, 0, 35, 0, 17, 0, 3, 8, 17, 0, 0, 0, 0, 0, PokemonMansion_2F_EventScript_1BEB7F, 460, 0, 0 + +PokemonMansion_2F_MapWarps: + warp_def 9, 3, 3, 0, 317 + warp_def 34, 22, 3, 1, 317 + warp_def 6, 14, 3, 3, 315 + warp_def 9, 14, 3, 2, 317 + warp_def 27, 17, 3, 5, 317 + +PokemonMansion_2F_MapBGEvents: + bg_event 2, 16, 0, 1, 0, PokemonMansion_2F_EventScript_162264 + bg_event 6, 31, 0, 0, 0, PokemonMansion_2F_EventScript_162281 + bg_event 25, 4, 0, 0, 0, PokemonMansion_2F_EventScript_162278 + +PokemonMansion_2F_MapEvents:: + map_events PokemonMansion_2F_EventObjects, PokemonMansion_2F_MapWarps, 0x0, PokemonMansion_2F_MapBGEvents diff --git a/data/maps/PokemonMansion_3F/events.inc b/data/maps/PokemonMansion_3F/events.inc new file mode 100644 index 000000000..8ceb850c8 --- /dev/null +++ b/data/maps/PokemonMansion_3F/events.inc @@ -0,0 +1,23 @@ +PokemonMansion_3F_EventObjects: + object_event 1, 52, 0, 7, 0, 13, 0, 3, 2, 17, 0, 1, 0, 1, 0, PokemonMansion_3F_EventScript_1622CE, 0, 0, 0 + object_event 2, 55, 0, 22, 0, 13, 0, 3, 8, 17, 0, 1, 0, 1, 0, PokemonMansion_3F_EventScript_1622E5, 0, 0, 0 + object_event 3, 92, 0, 9, 0, 19, 0, 3, 8, 17, 0, 0, 0, 0, 0, PokemonMansion_3F_EventScript_1BE984, 418, 0, 0 + object_event 4, 92, 0, 32, 0, 6, 0, 3, 8, 17, 0, 0, 0, 0, 0, PokemonMansion_3F_EventScript_1BE991, 419, 0, 0 + +PokemonMansion_3F_MapWarps: + warp_def 8, 3, 3, 0, 316 + warp_def 34, 18, 3, 1, 316 + warp_def 11, 11, 3, 3, 316 + warp_def 18, 18, 3, 7, 315 + warp_def 19, 18, 3, 8, 315 + warp_def 23, 18, 3, 4, 316 + warp_def 20, 18, 3, 8, 315 + warp_def 24, 18, 3, 4, 316 + +PokemonMansion_3F_MapBGEvents: + bg_event 8, 16, 0, 0, 0, PokemonMansion_3F_EventScript_1622C5 + bg_event 12, 5, 0, 1, 0, PokemonMansion_3F_EventScript_1622B1 + bg_event 36, 13, 3, 7, 0, 68, 32, 1 + +PokemonMansion_3F_MapEvents:: + map_events PokemonMansion_3F_EventObjects, PokemonMansion_3F_MapWarps, 0x0, PokemonMansion_3F_MapBGEvents diff --git a/data/maps/PokemonMansion_B1F/events.inc b/data/maps/PokemonMansion_B1F/events.inc new file mode 100644 index 000000000..26dc5dd4f --- /dev/null +++ b/data/maps/PokemonMansion_B1F/events.inc @@ -0,0 +1,19 @@ +PokemonMansion_B1F_EventObjects: + object_event 1, 92, 0, 6, 0, 21, 0, 3, 8, 17, 0, 0, 0, 0, 0, PokemonMansion_B1F_EventScript_1BE9B8, 423, 0, 0 + object_event 2, 52, 0, 20, 0, 25, 0, 3, 2, 17, 0, 1, 0, 1, 0, PokemonMansion_B1F_EventScript_162329, 0, 0, 0 + object_event 3, 55, 0, 34, 0, 13, 0, 3, 8, 17, 0, 1, 0, 6, 0, PokemonMansion_B1F_EventScript_162340, 0, 0, 0 + object_event 4, 92, 0, 23, 0, 4, 0, 3, 8, 17, 0, 0, 0, 0, 0, PokemonMansion_B1F_EventScript_1BE99E, 420, 0, 0 + object_event 5, 92, 0, 2, 0, 29, 0, 3, 8, 17, 0, 0, 0, 0, 0, PokemonMansion_B1F_EventScript_1BE9AB, 421, 0, 0 + object_event 6, 92, 0, 5, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, PokemonMansion_B1F_EventScript_1BE9C5, 424, 0, 0 + +PokemonMansion_B1F_MapWarps: + warp_def 34, 29, 3, 4, 315 + +PokemonMansion_B1F_MapBGEvents: + bg_event 21, 27, 0, 0, 0, PokemonMansion_B1F_EventScript_162320 + bg_event 24, 29, 0, 1, 0, PokemonMansion_B1F_EventScript_16230C + bg_event 27, 5, 0, 1, 0, PokemonMansion_B1F_EventScript_16230C + bg_event 35, 5, 3, 7, 0, 36, 33, 1 + +PokemonMansion_B1F_MapEvents:: + map_events PokemonMansion_B1F_EventObjects, PokemonMansion_B1F_MapWarps, 0x0, PokemonMansion_B1F_MapBGEvents diff --git a/data/maps/PokemonTower_1F/events.inc b/data/maps/PokemonTower_1F/events.inc new file mode 100644 index 000000000..26c172711 --- /dev/null +++ b/data/maps/PokemonTower_1F/events.inc @@ -0,0 +1,15 @@ +PokemonTower_1F_EventObjects: + object_event 1, 48, 0, 18, 0, 13, 0, 3, 7, 17, 0, 0, 0, 0, 0, PokemonTower_1F_EventScript_16327C, 0, 0, 0 + object_event 2, 58, 0, 18, 0, 7, 0, 3, 9, 17, 0, 0, 0, 0, 0, PokemonTower_1F_EventScript_16323F, 0, 0, 0 + object_event 3, 28, 0, 15, 0, 6, 0, 3, 7, 17, 0, 0, 0, 0, 0, PokemonTower_1F_EventScript_163248, 0, 0, 0 + object_event 4, 31, 0, 7, 0, 8, 0, 3, 2, 17, 0, 0, 0, 0, 0, PokemonTower_1F_EventScript_16325A, 0, 0, 0 + object_event 5, 30, 0, 8, 0, 12, 0, 3, 2, 34, 0, 0, 0, 0, 0, PokemonTower_1F_EventScript_163251, 0, 0, 0 + +PokemonTower_1F_MapWarps: + warp_def 10, 19, 3, 0, 772 + warp_def 11, 18, 3, 0, 772 + warp_def 12, 19, 3, 0, 772 + warp_def 18, 9, 3, 1, 345 + +PokemonTower_1F_MapEvents:: + map_events PokemonTower_1F_EventObjects, PokemonTower_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/PokemonTower_2F/events.inc b/data/maps/PokemonTower_2F/events.inc new file mode 100644 index 000000000..332b2cedc --- /dev/null +++ b/data/maps/PokemonTower_2F/events.inc @@ -0,0 +1,14 @@ +PokemonTower_2F_EventObjects: + object_event 1, 72, 0, 16, 0, 5, 0, 3, 7, 17, 0, 0, 0, 0, 0, 0x0, 81, 0, 0 + object_event 2, 58, 0, 3, 0, 7, 0, 0, 10, 17, 0, 0, 0, 0, 0, PokemonTower_2F_EventScript_163286, 0, 0, 0 + +PokemonTower_2F_MapWarps: + warp_def 4, 10, 3, 0, 346 + warp_def 18, 10, 3, 3, 344 + +PokemonTower_2F_MapCoordEvents: + coord_event 17, 5, 3, 0, 16477, 0, 0, PokemonTower_2F_EventScript_16328F + coord_event 16, 6, 3, 0, 16477, 0, 0, PokemonTower_2F_EventScript_16329B + +PokemonTower_2F_MapEvents:: + map_events PokemonTower_2F_EventObjects, PokemonTower_2F_MapWarps, PokemonTower_2F_MapCoordEvents, 0x0 diff --git a/data/maps/PokemonTower_3F/events.inc b/data/maps/PokemonTower_3F/events.inc new file mode 100644 index 000000000..487e99cc5 --- /dev/null +++ b/data/maps/PokemonTower_3F/events.inc @@ -0,0 +1,12 @@ +PokemonTower_3F_EventObjects: + object_event 1, 58, 0, 10, 0, 14, 0, 3, 8, 17, 0, 1, 0, 3, 0, PokemonTower_3F_EventScript_1633A7, 0, 0, 0 + object_event 2, 58, 0, 9, 0, 9, 0, 3, 8, 17, 0, 1, 0, 3, 0, PokemonTower_3F_EventScript_1633BE, 0, 0, 0 + object_event 3, 58, 0, 12, 0, 4, 0, 3, 13, 17, 0, 1, 0, 2, 0, PokemonTower_3F_EventScript_1633D5, 0, 0, 0 + object_event 4, 92, 0, 13, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, PokemonTower_3F_EventScript_1BE755, 375, 0, 0 + +PokemonTower_3F_MapWarps: + warp_def 4, 10, 3, 0, 345 + warp_def 18, 10, 3, 1, 347 + +PokemonTower_3F_MapEvents:: + map_events PokemonTower_3F_EventObjects, PokemonTower_3F_MapWarps, 0x0, 0x0 diff --git a/data/maps/PokemonTower_4F/events.inc b/data/maps/PokemonTower_4F/events.inc new file mode 100644 index 000000000..9dd2cb2aa --- /dev/null +++ b/data/maps/PokemonTower_4F/events.inc @@ -0,0 +1,14 @@ +PokemonTower_4F_EventObjects: + object_event 1, 58, 0, 17, 0, 7, 0, 3, 8, 17, 0, 1, 0, 3, 0, PokemonTower_4F_EventScript_163404, 0, 0, 0 + object_event 2, 58, 0, 15, 0, 13, 0, 3, 9, 17, 0, 1, 0, 5, 0, PokemonTower_4F_EventScript_16341B, 0, 0, 0 + object_event 3, 58, 0, 4, 0, 12, 0, 3, 10, 17, 0, 1, 0, 2, 0, PokemonTower_4F_EventScript_1633ED, 0, 0, 0 + object_event 4, 92, 0, 12, 0, 11, 0, 3, 8, 17, 0, 0, 0, 0, 0, PokemonTower_4F_EventScript_1BE762, 376, 0, 0 + object_event 5, 92, 0, 8, 0, 11, 0, 3, 8, 17, 0, 0, 0, 0, 0, PokemonTower_4F_EventScript_1BE76F, 377, 0, 0 + object_event 6, 92, 0, 11, 0, 16, 0, 3, 8, 17, 0, 0, 0, 0, 0, PokemonTower_4F_EventScript_1BE77C, 378, 0, 0 + +PokemonTower_4F_MapWarps: + warp_def 4, 10, 3, 0, 348 + warp_def 18, 10, 3, 1, 346 + +PokemonTower_4F_MapEvents:: + map_events PokemonTower_4F_EventObjects, PokemonTower_4F_MapWarps, 0x0, 0x0 diff --git a/data/maps/PokemonTower_5F/events.inc b/data/maps/PokemonTower_5F/events.inc new file mode 100644 index 000000000..88e67476b --- /dev/null +++ b/data/maps/PokemonTower_5F/events.inc @@ -0,0 +1,37 @@ +PokemonTower_5F_EventObjects: + object_event 1, 58, 0, 11, 0, 4, 0, 3, 1, 17, 0, 1, 0, 2, 0, PokemonTower_5F_EventScript_163472, 0, 0, 0 + object_event 2, 58, 0, 19, 0, 7, 0, 3, 9, 17, 0, 1, 0, 3, 0, PokemonTower_5F_EventScript_16345B, 0, 0, 0 + object_event 3, 58, 0, 7, 0, 12, 0, 3, 10, 17, 0, 1, 0, 2, 0, PokemonTower_5F_EventScript_163489, 0, 0, 0 + object_event 4, 58, 0, 11, 0, 16, 0, 3, 1, 17, 0, 1, 0, 2, 0, PokemonTower_5F_EventScript_1634A0, 0, 0, 0 + object_event 5, 58, 0, 12, 0, 8, 0, 3, 10, 17, 0, 0, 0, 0, 0, PokemonTower_5F_EventScript_163433, 0, 0, 0 + object_event 6, 92, 0, 6, 0, 16, 0, 3, 8, 17, 0, 0, 0, 0, 0, PokemonTower_5F_EventScript_1BE789, 379, 0, 0 + object_event 7, 92, 0, 11, 0, 9, 0, 3, 8, 17, 0, 0, 0, 0, 0, PokemonTower_5F_EventScript_1BEBB3, 464, 0, 0 + +PokemonTower_5F_MapWarps: + warp_def 4, 10, 3, 0, 347 + warp_def 18, 10, 3, 1, 349 + +PokemonTower_5F_MapCoordEvents: + coord_event 10, 8, 3, 0, 16385, 0, 0, PokemonTower_5F_EventScript_16343C + coord_event 11, 8, 3, 0, 16385, 0, 0, PokemonTower_5F_EventScript_16343C + coord_event 12, 8, 3, 0, 16385, 0, 0, PokemonTower_5F_EventScript_16343C + coord_event 10, 9, 3, 0, 16385, 0, 0, PokemonTower_5F_EventScript_16343C + coord_event 9, 8, 3, 0, 16385, 1, 0, PokemonTower_5F_EventScript_163453 + coord_event 12, 9, 3, 0, 16385, 0, 0, PokemonTower_5F_EventScript_16343C + coord_event 10, 10, 3, 0, 16385, 0, 0, PokemonTower_5F_EventScript_16343C + coord_event 11, 10, 3, 0, 16385, 0, 0, PokemonTower_5F_EventScript_16343C + coord_event 12, 10, 0, 0, 16385, 0, 0, PokemonTower_5F_EventScript_16343C + coord_event 9, 9, 3, 0, 16385, 1, 0, PokemonTower_5F_EventScript_163453 + coord_event 9, 10, 3, 0, 16385, 1, 0, PokemonTower_5F_EventScript_163453 + coord_event 10, 11, 3, 0, 16385, 1, 0, PokemonTower_5F_EventScript_163453 + coord_event 11, 11, 3, 0, 16385, 1, 0, PokemonTower_5F_EventScript_163453 + coord_event 12, 11, 0, 0, 16385, 1, 0, PokemonTower_5F_EventScript_163453 + coord_event 13, 8, 0, 0, 16385, 1, 0, PokemonTower_5F_EventScript_163453 + coord_event 13, 9, 0, 0, 16385, 1, 0, PokemonTower_5F_EventScript_163453 + coord_event 13, 10, 0, 0, 16385, 1, 0, PokemonTower_5F_EventScript_163453 + +PokemonTower_5F_MapBGEvents: + bg_event 7, 3, 3, 7, 0, 104, 14, 1 + +PokemonTower_5F_MapEvents:: + map_events PokemonTower_5F_EventObjects, PokemonTower_5F_MapWarps, PokemonTower_5F_MapCoordEvents, PokemonTower_5F_MapBGEvents diff --git a/data/maps/PokemonTower_6F/events.inc b/data/maps/PokemonTower_6F/events.inc new file mode 100644 index 000000000..71638ab67 --- /dev/null +++ b/data/maps/PokemonTower_6F/events.inc @@ -0,0 +1,17 @@ +PokemonTower_6F_EventObjects: + object_event 1, 58, 0, 13, 0, 10, 0, 3, 10, 17, 0, 1, 0, 3, 0, PokemonTower_6F_EventScript_163514, 0, 0, 0 + object_event 2, 58, 0, 18, 0, 6, 0, 3, 9, 17, 0, 1, 0, 3, 0, PokemonTower_6F_EventScript_163542, 0, 0, 0 + object_event 3, 58, 0, 9, 0, 6, 0, 3, 8, 17, 0, 1, 0, 3, 0, PokemonTower_6F_EventScript_16352B, 0, 0, 0 + object_event 4, 92, 0, 5, 0, 15, 0, 3, 8, 17, 0, 0, 0, 0, 0, PokemonTower_6F_EventScript_1BE796, 380, 0, 0 + object_event 5, 92, 0, 15, 0, 15, 0, 3, 8, 17, 0, 0, 0, 0, 0, PokemonTower_6F_EventScript_1BE7A3, 381, 0, 0 + +PokemonTower_6F_MapWarps: + warp_def 11, 16, 3, 0, 350 + warp_def 18, 10, 3, 1, 348 + +PokemonTower_6F_MapCoordEvents: + coord_event 11, 15, 3, 0, 16473, 0, 0, PokemonTower_6F_EventScript_1634B8 + coord_event 12, 16, 3, 0, 16473, 0, 0, PokemonTower_6F_EventScript_1634B8 + +PokemonTower_6F_MapEvents:: + map_events PokemonTower_6F_EventObjects, PokemonTower_6F_MapWarps, PokemonTower_6F_MapCoordEvents, 0x0 diff --git a/data/maps/PokemonTower_7F/events.inc b/data/maps/PokemonTower_7F/events.inc new file mode 100644 index 000000000..a665515ff --- /dev/null +++ b/data/maps/PokemonTower_7F/events.inc @@ -0,0 +1,14 @@ +PokemonTower_7F_EventObjects: + object_event 1, 78, 0, 11, 0, 4, 0, 3, 8, 17, 0, 0, 0, 0, 0, PokemonTower_7F_EventScript_16355A, 52, 0, 0 + object_event 2, 49, 0, 9, 0, 10, 0, 3, 10, 17, 0, 1, 0, 4, 0, PokemonTower_7F_EventScript_163586, 94, 0, 0 + object_event 3, 49, 0, 13, 0, 8, 0, 3, 9, 17, 0, 1, 0, 4, 0, PokemonTower_7F_EventScript_16363D, 131, 0, 0 + object_event 4, 49, 0, 9, 0, 6, 0, 3, 10, 17, 0, 1, 0, 4, 0, PokemonTower_7F_EventScript_1636D6, 132, 0, 0 + +PokemonTower_7F_MapWarps: + warp_def 11, 16, 3, 0, 349 + +PokemonTower_7F_MapBGEvents: + bg_event 11, 4, 3, 7, 0, 184, 159, 129 + +PokemonTower_7F_MapEvents:: + map_events PokemonTower_7F_EventObjects, PokemonTower_7F_MapWarps, 0x0, PokemonTower_7F_MapBGEvents diff --git a/data/maps/PowerPlant/events.inc b/data/maps/PowerPlant/events.inc new file mode 100644 index 000000000..fcdaab532 --- /dev/null +++ b/data/maps/PowerPlant/events.inc @@ -0,0 +1,23 @@ +PowerPlant_EventObjects: + object_event 1, 92, 0, 7, 0, 27, 0, 3, 8, 17, 0, 0, 0, 0, 0, PowerPlant_EventScript_1BE91C, 410, 0, 0 + object_event 2, 92, 0, 40, 0, 22, 0, 3, 8, 17, 0, 0, 0, 0, 0, PowerPlant_EventScript_1BE929, 411, 0, 0 + object_event 3, 92, 0, 46, 0, 37, 0, 3, 8, 17, 0, 0, 0, 0, 0, PowerPlant_EventScript_1BE936, 412, 0, 0 + object_event 4, 92, 0, 45, 0, 4, 0, 3, 8, 17, 0, 0, 0, 0, 0, PowerPlant_EventScript_1BE943, 413, 0, 0 + object_event 5, 92, 0, 26, 0, 22, 0, 3, 8, 17, 0, 0, 0, 0, 0, PowerPlant_EventScript_1BE950, 414, 0, 0 + object_event 6, 136, 0, 5, 0, 11, 0, 3, 8, 17, 0, 0, 0, 0, 0, PowerPlant_EventScript_1637B8, 93, 0, 0 + object_event 7, 92, 0, 36, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, PowerPlant_EventScript_16388D, 134, 0, 0 + object_event 8, 92, 0, 30, 0, 38, 0, 3, 8, 17, 0, 0, 0, 0, 0, PowerPlant_EventScript_16382F, 133, 0, 0 + +PowerPlant_MapWarps: + warp_def 4, 39, 3, 2, 796 + warp_def 5, 38, 3, 2, 796 + warp_def 6, 39, 3, 2, 796 + warp_def 1, 11, 3, 4, 796 + warp_def 0, 13, 3, 2, 796 + +PowerPlant_MapBGEvents: + bg_event 29, 16, 3, 7, 0, 37, 27, 1 + bg_event 8, 12, 3, 7, 0, 96, 28, 1 + +PowerPlant_MapEvents:: + map_events PowerPlant_EventObjects, PowerPlant_MapWarps, 0x0, PowerPlant_MapBGEvents diff --git a/data/maps/RockTunnel_1F/events.inc b/data/maps/RockTunnel_1F/events.inc new file mode 100644 index 000000000..e9166bed9 --- /dev/null +++ b/data/maps/RockTunnel_1F/events.inc @@ -0,0 +1,25 @@ +RockTunnel_1F_EventObjects: + object_event 1, 40, 0, 26, 0, 28, 0, 3, 8, 17, 0, 1, 0, 3, 0, RockTunnel_1F_EventScript_162E73, 0, 0, 0 + object_event 2, 40, 0, 39, 0, 27, 0, 3, 10, 17, 0, 1, 0, 4, 0, RockTunnel_1F_EventScript_162E5C, 0, 0, 0 + object_event 3, 40, 0, 45, 0, 24, 0, 3, 9, 17, 0, 1, 0, 5, 0, RockTunnel_1F_EventScript_162E45, 0, 0, 0 + object_event 4, 56, 0, 20, 0, 17, 0, 3, 9, 17, 0, 1, 0, 4, 0, RockTunnel_1F_EventScript_162E17, 0, 0, 0 + object_event 5, 56, 0, 5, 0, 20, 0, 3, 8, 17, 0, 1, 0, 4, 0, RockTunnel_1F_EventScript_162E00, 0, 0, 0 + object_event 6, 56, 0, 7, 0, 5, 0, 3, 8, 17, 0, 1, 0, 4, 0, RockTunnel_1F_EventScript_162DE9, 0, 0, 0 + object_event 7, 52, 0, 27, 0, 10, 0, 3, 9, 17, 0, 1, 0, 3, 0, RockTunnel_1F_EventScript_162E2E, 0, 0, 0 + object_event 8, 92, 0, 37, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, RockTunnel_1F_EventScript_1BEB0A, 451, 0, 0 + object_event 9, 92, 0, 33, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, RockTunnel_1F_EventScript_1BEB17, 452, 0, 0 + object_event 10, 92, 0, 22, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, RockTunnel_1F_EventScript_1BEB24, 453, 0, 0 + +RockTunnel_1F_MapWarps: + warp_def 17, 2, 3, 0, 796 + warp_def 45, 2, 3, 0, 338 + warp_def 4, 2, 3, 1, 338 + warp_def 20, 13, 3, 2, 338 + warp_def 45, 21, 3, 3, 338 + warp_def 18, 37, 3, 1, 796 + +RockTunnel_1F_MapBGEvents: + bg_event 14, 33, 3, 0, 0, RockTunnel_1F_EventScript_162DE0 + +RockTunnel_1F_MapEvents:: + map_events RockTunnel_1F_EventObjects, RockTunnel_1F_MapWarps, 0x0, RockTunnel_1F_MapBGEvents diff --git a/data/maps/RockTunnel_B1F/events.inc b/data/maps/RockTunnel_B1F/events.inc new file mode 100644 index 000000000..f0f2ad914 --- /dev/null +++ b/data/maps/RockTunnel_B1F/events.inc @@ -0,0 +1,36 @@ +RockTunnel_B1F_EventObjects: + object_event 1, 52, 0, 2, 0, 6, 0, 3, 1, 17, 0, 1, 0, 2, 0, RockTunnel_B1F_EventScript_162EFE, 0, 0, 0 + object_event 2, 56, 0, 5, 0, 11, 0, 3, 8, 17, 0, 1, 0, 4, 0, RockTunnel_B1F_EventScript_162EB9, 0, 0, 0 + object_event 3, 40, 0, 11, 0, 15, 0, 3, 8, 17, 0, 1, 0, 4, 0, RockTunnel_B1F_EventScript_162E8B, 0, 0, 0 + object_event 4, 56, 0, 36, 0, 11, 0, 3, 8, 17, 0, 1, 0, 3, 0, RockTunnel_B1F_EventScript_162ED0, 0, 0, 0 + object_event 5, 56, 0, 41, 0, 5, 0, 3, 10, 17, 0, 1, 0, 3, 0, RockTunnel_B1F_EventScript_162EE7, 0, 0, 0 + object_event 6, 52, 0, 23, 0, 23, 0, 3, 10, 17, 0, 1, 0, 4, 0, RockTunnel_B1F_EventScript_162F15, 0, 0, 0 + object_event 7, 40, 0, 15, 0, 33, 0, 3, 10, 17, 0, 1, 0, 2, 0, RockTunnel_B1F_EventScript_162EA2, 0, 0, 0 + object_event 8, 52, 0, 29, 0, 35, 0, 3, 8, 17, 0, 1, 0, 3, 0, RockTunnel_B1F_EventScript_162F2C, 0, 0, 0 + object_event 9, 18, 0, 2, 0, 29, 0, 3, 10, 17, 0, 0, 0, 0, 0, RockTunnel_B1F_EventScript_1C487E, 0, 0, 0 + object_event 10, 92, 0, 2, 0, 37, 0, 3, 8, 17, 0, 0, 0, 0, 0, RockTunnel_B1F_EventScript_1BEB31, 454, 0, 0 + object_event 11, 92, 0, 9, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, RockTunnel_B1F_EventScript_1BEB3E, 455, 0, 0 + object_event 12, 96, 0, 1, 0, 20, 0, 3, 1, 17, 0, 0, 0, 0, 0, RockTunnel_B1F_EventScript_1BE00C, 18, 0, 0 + object_event 13, 96, 0, 1, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, RockTunnel_B1F_EventScript_1BE00C, 19, 0, 0 + object_event 14, 96, 0, 4, 0, 23, 0, 3, 1, 17, 0, 0, 0, 0, 0, RockTunnel_B1F_EventScript_1BE00C, 20, 0, 0 + object_event 15, 96, 0, 2, 0, 23, 0, 3, 1, 17, 0, 0, 0, 0, 0, RockTunnel_B1F_EventScript_1BE00C, 21, 0, 0 + object_event 16, 96, 0, 39, 0, 26, 0, 3, 1, 17, 0, 0, 0, 0, 0, RockTunnel_B1F_EventScript_1BE00C, 22, 0, 0 + object_event 17, 96, 0, 42, 0, 26, 0, 3, 1, 17, 0, 0, 0, 0, 0, RockTunnel_B1F_EventScript_1BE00C, 23, 0, 0 + object_event 18, 96, 0, 43, 0, 28, 0, 3, 1, 17, 0, 0, 0, 0, 0, RockTunnel_B1F_EventScript_1BE00C, 24, 0, 0 + object_event 19, 96, 0, 45, 0, 30, 0, 3, 1, 17, 0, 0, 0, 0, 0, RockTunnel_B1F_EventScript_1BE00C, 25, 0, 0 + object_event 20, 96, 0, 45, 0, 33, 0, 3, 1, 17, 0, 0, 0, 0, 0, RockTunnel_B1F_EventScript_1BE00C, 26, 0, 0 + object_event 21, 96, 0, 25, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0, 0, RockTunnel_B1F_EventScript_1BE00C, 27, 0, 0 + object_event 22, 96, 0, 27, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, RockTunnel_B1F_EventScript_1BE00C, 28, 0, 0 + object_event 23, 96, 0, 23, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0, 0, RockTunnel_B1F_EventScript_1BE00C, 29, 0, 0 + object_event 24, 96, 0, 26, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0, 0, RockTunnel_B1F_EventScript_1BE00C, 30, 0, 0 + object_event 25, 96, 0, 24, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, RockTunnel_B1F_EventScript_1BE00C, 31, 0, 0 + object_event 26, 96, 0, 27, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, RockTunnel_B1F_EventScript_1BE00C, 17, 0, 0 + +RockTunnel_B1F_MapWarps: + warp_def 38, 28, 3, 1, 337 + warp_def 33, 3, 3, 2, 337 + warp_def 27, 12, 3, 3, 337 + warp_def 2, 3, 3, 4, 337 + +RockTunnel_B1F_MapEvents:: + map_events RockTunnel_B1F_EventObjects, RockTunnel_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/RocketHideout_B1F/events.inc b/data/maps/RocketHideout_B1F/events.inc new file mode 100644 index 000000000..d70fd2b8a --- /dev/null +++ b/data/maps/RocketHideout_B1F/events.inc @@ -0,0 +1,22 @@ +RocketHideout_B1F_EventObjects: + object_event 1, 49, 0, 4, 0, 9, 0, 3, 10, 17, 0, 1, 0, 5, 0, RocketHideout_B1F_EventScript_1611C5, 173, 0, 0 + object_event 2, 49, 0, 24, 0, 12, 0, 3, 9, 17, 0, 1, 0, 2, 0, RocketHideout_B1F_EventScript_1611AE, 173, 0, 0 + object_event 3, 49, 0, 6, 0, 32, 0, 3, 10, 17, 0, 1, 0, 4, 0, RocketHideout_B1F_EventScript_1611F3, 173, 0, 0 + object_event 4, 49, 0, 10, 0, 22, 0, 3, 8, 17, 0, 1, 0, 3, 0, RocketHideout_B1F_EventScript_1611DC, 173, 0, 0 + object_event 5, 49, 0, 21, 0, 27, 0, 3, 16, 17, 0, 1, 0, 3, 0, RocketHideout_B1F_EventScript_16120A, 173, 0, 0 + object_event 6, 92, 0, 5, 0, 16, 0, 0, 8, 17, 0, 0, 0, 0, 0, RocketHideout_B1F_EventScript_1BE6C6, 364, 0, 0 + object_event 7, 92, 0, 1, 0, 22, 0, 3, 8, 17, 0, 0, 0, 0, 0, RocketHideout_B1F_EventScript_1BE6D3, 365, 0, 0 + +RocketHideout_B1F_MapWarps: + warp_def 12, 2, 3, 3, 2574 + warp_def 17, 2, 3, 1, 299 + warp_def 15, 30, 3, 2, 299 + warp_def 23, 25, 0, 1, 302 + warp_def 24, 25, 0, 1, 302 + warp_def 25, 25, 0, 1, 302 + +RocketHideout_B1F_MapBGEvents: + bg_event 16, 17, 0, 7, 0, 69, 11, 1 + +RocketHideout_B1F_MapEvents:: + map_events RocketHideout_B1F_EventObjects, RocketHideout_B1F_MapWarps, 0x0, RocketHideout_B1F_MapBGEvents diff --git a/data/maps/RocketHideout_B2F/events.inc b/data/maps/RocketHideout_B2F/events.inc new file mode 100644 index 000000000..a28f1b8b2 --- /dev/null +++ b/data/maps/RocketHideout_B2F/events.inc @@ -0,0 +1,16 @@ +RocketHideout_B2F_EventObjects: + object_event 1, 49, 0, 20, 0, 6, 0, 3, 1, 17, 0, 1, 0, 2, 0, RocketHideout_B2F_EventScript_1612A2, 173, 0, 0 + object_event 2, 92, 0, 15, 0, 3, 0, 3, 8, 17, 0, 0, 0, 0, 0, RocketHideout_B2F_EventScript_1BE6E0, 366, 0, 0 + object_event 3, 92, 0, 2, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, RocketHideout_B2F_EventScript_1BE6ED, 367, 0, 0 + object_event 4, 92, 0, 5, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, RocketHideout_B2F_EventScript_1BE6FA, 368, 0, 0 + object_event 5, 92, 0, 0, 0, 14, 0, 3, 8, 17, 0, 0, 0, 0, 0, RocketHideout_B2F_EventScript_1BE707, 369, 0, 0 + +RocketHideout_B2F_MapWarps: + warp_def 21, 2, 3, 0, 300 + warp_def 28, 2, 3, 1, 298 + warp_def 23, 12, 3, 2, 298 + warp_def 28, 16, 0, 1, 302 + warp_def 29, 16, 0, 1, 302 + +RocketHideout_B2F_MapEvents:: + map_events RocketHideout_B2F_EventObjects, RocketHideout_B2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/RocketHideout_B3F/events.inc b/data/maps/RocketHideout_B3F/events.inc new file mode 100644 index 000000000..a04b9cdc4 --- /dev/null +++ b/data/maps/RocketHideout_B3F/events.inc @@ -0,0 +1,16 @@ +RocketHideout_B3F_EventObjects: + object_event 1, 49, 0, 19, 0, 9, 0, 3, 7, 17, 0, 1, 0, 4, 0, RocketHideout_B3F_EventScript_1612D1, 173, 0, 0 + object_event 2, 49, 0, 2, 0, 20, 0, 3, 10, 17, 0, 1, 0, 2, 0, RocketHideout_B3F_EventScript_1612BA, 173, 0, 0 + object_event 3, 92, 0, 12, 0, 12, 0, 3, 8, 17, 0, 0, 0, 0, 0, RocketHideout_B3F_EventScript_1BE714, 370, 0, 0 + object_event 4, 92, 0, 19, 0, 14, 0, 3, 8, 17, 0, 0, 0, 0, 0, RocketHideout_B3F_EventScript_1BE721, 371, 0, 0 + object_event 5, 92, 0, 14, 0, 24, 0, 3, 8, 17, 0, 0, 0, 0, 0, RocketHideout_B3F_EventScript_1BEBCD, 466, 0, 0 + +RocketHideout_B3F_MapWarps: + warp_def 18, 2, 3, 0, 299 + warp_def 15, 18, 3, 0, 301 + +RocketHideout_B3F_MapBGEvents: + bg_event 1, 3, 3, 7, 0, 110, 12, 1 + +RocketHideout_B3F_MapEvents:: + map_events RocketHideout_B3F_EventObjects, RocketHideout_B3F_MapWarps, 0x0, RocketHideout_B3F_MapBGEvents diff --git a/data/maps/RocketHideout_B4F/events.inc b/data/maps/RocketHideout_B4F/events.inc new file mode 100644 index 000000000..1f2d1013a --- /dev/null +++ b/data/maps/RocketHideout_B4F/events.inc @@ -0,0 +1,22 @@ +RocketHideout_B4F_EventObjects: + object_event 1, 87, 0, 19, 0, 4, 0, 3, 8, 17, 0, 0, 0, 0, 0, RocketHideout_B4F_EventScript_161317, 56, 0, 0 + object_event 2, 92, 0, 20, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, RocketHideout_B4F_EventScript_161363, 55, 0, 0 + object_event 3, 49, 0, 4, 0, 2, 0, 3, 8, 17, 0, 1, 0, 1, 0, RocketHideout_B4F_EventScript_161381, 173, 0, 0 + object_event 4, 92, 0, 3, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, RocketHideout_B4F_EventScript_1613AD, 54, 0, 0 + object_event 5, 49, 0, 19, 0, 14, 0, 3, 8, 17, 0, 1, 0, 0, 0, RocketHideout_B4F_EventScript_161418, 173, 0, 0 + object_event 6, 49, 0, 16, 0, 14, 0, 3, 8, 17, 0, 1, 0, 0, 0, RocketHideout_B4F_EventScript_1613CE, 173, 0, 0 + object_event 7, 92, 0, 1, 0, 6, 0, 3, 8, 17, 0, 0, 0, 0, 0, RocketHideout_B4F_EventScript_1BE72E, 372, 0, 0 + object_event 8, 92, 0, 4, 0, 14, 0, 0, 8, 17, 0, 0, 0, 0, 0, RocketHideout_B4F_EventScript_1BE73B, 373, 0, 0 + object_event 9, 92, 0, 6, 0, 23, 0, 0, 8, 17, 0, 0, 0, 0, 0, RocketHideout_B4F_EventScript_1BE748, 374, 0, 0 + +RocketHideout_B4F_MapWarps: + warp_def 11, 15, 3, 1, 300 + warp_def 20, 23, 0, 1, 302 + warp_def 21, 23, 0, 1, 302 + +RocketHideout_B4F_MapBGEvents: + bg_event 22, 6, 3, 7, 0, 8, 13, 1 + bg_event 16, 6, 3, 7, 0, 6, 134, 1 + +RocketHideout_B4F_MapEvents:: + map_events RocketHideout_B4F_EventObjects, RocketHideout_B4F_MapWarps, 0x0, RocketHideout_B4F_MapBGEvents diff --git a/data/maps/RocketHideout_Elevator/events.inc b/data/maps/RocketHideout_Elevator/events.inc new file mode 100644 index 000000000..d60afa41d --- /dev/null +++ b/data/maps/RocketHideout_Elevator/events.inc @@ -0,0 +1,9 @@ +RocketHideout_Elevator_MapWarps: + warp_def 1, 5, 3, 127, 32639 + warp_def 2, 5, 3, 127, 32639 + +RocketHideout_Elevator_MapBGEvents: + bg_event 0, 2, 0, 0, 0, RocketHideout_Elevator_EventScript_1614D9 + +RocketHideout_Elevator_MapEvents:: + map_events 0x0, RocketHideout_Elevator_MapWarps, 0x0, RocketHideout_Elevator_MapBGEvents diff --git a/data/maps/Route1/events.inc b/data/maps/Route1/events.inc new file mode 100644 index 000000000..a485d4951 --- /dev/null +++ b/data/maps/Route1/events.inc @@ -0,0 +1,9 @@ +Route1_EventObjects: + object_event 1, 68, 0, 6, 0, 28, 0, 3, 3, 17, 0, 0, 0, 0, 0, Route1_EventScript_167EFE, 0, 0, 0 + object_event 2, 19, 0, 19, 0, 16, 0, 3, 5, 49, 0, 0, 0, 0, 0, Route1_EventScript_167F52, 0, 0, 0 + +Route1_MapBGEvents: + bg_event 9, 31, 0, 0, 0, Route1_EventScript_167F5B + +Route1_MapEvents:: + map_events Route1_EventObjects, 0x0, 0x0, Route1_MapBGEvents diff --git a/data/maps/Route10/events.inc b/data/maps/Route10/events.inc new file mode 100644 index 000000000..3f1ba88db --- /dev/null +++ b/data/maps/Route10/events.inc @@ -0,0 +1,31 @@ +Route10_EventObjects: + object_event 1, 40, 0, 7, 0, 60, 0, 3, 1, 17, 0, 1, 0, 2, 0, Route10_EventScript_1A9FE5, 0, 0, 0 + object_event 2, 56, 0, 4, 0, 62, 0, 3, 1, 17, 0, 1, 0, 1, 0, Route10_EventScript_1AA09F, 0, 0, 0 + object_event 3, 52, 0, 15, 0, 70, 0, 3, 5, 18, 0, 1, 0, 2, 0, Route10_EventScript_1AA061, 0, 0, 0 + object_event 4, 56, 0, 4, 0, 68, 0, 3, 9, 17, 0, 1, 0, 2, 0, Route10_EventScript_1AA0DD, 0, 0, 0 + object_event 5, 52, 0, 13, 0, 44, 0, 3, 9, 17, 0, 1, 0, 5, 0, Route10_EventScript_1AA023, 0, 0, 0 + object_event 6, 40, 0, 9, 0, 27, 0, 3, 8, 17, 0, 1, 0, 2, 0, Route10_EventScript_1A9FA7, 0, 0, 0 + object_event 7, 95, 0, 10, 0, 20, 0, 0, 8, 17, 0, 0, 0, 0, 0, Route10_EventScript_1BDF13, 18, 0, 0 + object_event 8, 95, 0, 10, 0, 22, 0, 0, 8, 17, 0, 0, 0, 0, 0, Route10_EventScript_1BDF13, 19, 0, 0 + object_event 9, 95, 0, 10, 0, 24, 0, 0, 8, 17, 0, 0, 0, 0, 0, Route10_EventScript_1BDF13, 20, 0, 0 + object_event 10, 95, 0, 10, 0, 26, 0, 0, 8, 17, 0, 0, 0, 0, 0, Route10_EventScript_1BDF13, 21, 0, 0 + +Route10_MapWarps: + warp_def 8, 19, 3, 0, 337 + warp_def 8, 57, 3, 5, 337 + warp_def 7, 40, 3, 1, 351 + warp_def 13, 20, 0, 1, 5376 + warp_def 2, 37, 3, 3, 351 + +Route10_MapBGEvents: + bg_event 15, 59, 0, 0, 0, Route10_EventScript_167FE4 + bg_event 6, 42, 0, 0, 0, Route10_EventScript_167FED + bg_event 7, 21, 0, 0, 0, Route10_EventScript_167FDB + bg_event 10, 19, 0, 7, 0, 22, 9, 1 + bg_event 12, 40, 3, 7, 0, 35, 10, 1 + bg_event 6, 26, 3, 7, 0, 133, 126, 1 + bg_event 17, 29, 3, 7, 0, 140, 125, 1 + bg_event 20, 57, 3, 7, 0, 150, 151, 1 + +Route10_MapEvents:: + map_events Route10_EventObjects, Route10_MapWarps, 0x0, Route10_MapBGEvents diff --git a/data/maps/Route10_PokemonCenter_1F/events.inc b/data/maps/Route10_PokemonCenter_1F/events.inc new file mode 100644 index 000000000..bcfe02b9c --- /dev/null +++ b/data/maps/Route10_PokemonCenter_1F/events.inc @@ -0,0 +1,15 @@ +Route10_PokemonCenter_1F_EventObjects: + object_event 1, 64, 0, 7, 0, 2, 0, 0, 8, 17, 0, 0, 0, 0, 0, Route10_PokemonCenter_1F_EventScript_16FC41, 0, 0, 0 + object_event 2, 61, 0, 9, 0, 4, 0, 3, 5, 17, 0, 0, 0, 0, 0, Route10_PokemonCenter_1F_EventScript_16FC53, 0, 0, 0 + object_event 3, 27, 0, 2, 0, 3, 0, 3, 5, 17, 0, 0, 0, 0, 0, Route10_PokemonCenter_1F_EventScript_16FC4A, 0, 0, 0 + object_event 4, 18, 0, 14, 0, 6, 0, 3, 9, 17, 0, 0, 0, 0, 0, Route10_PokemonCenter_1F_EventScript_16FC5C, 0, 0, 0 + object_event 5, 55, 0, 12, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route10_PokemonCenter_1F_EventScript_16FC65, 0, 0, 0 + +Route10_PokemonCenter_1F_MapWarps: + warp_def 6, 8, 3, 3, 796 + warp_def 7, 8, 3, 3, 796 + warp_def 8, 8, 3, 3, 796 + warp_def 1, 6, 4, 0, 5377 + +Route10_PokemonCenter_1F_MapEvents:: + map_events Route10_PokemonCenter_1F_EventObjects, Route10_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route10_PokemonCenter_2F/events.inc b/data/maps/Route10_PokemonCenter_2F/events.inc new file mode 100644 index 000000000..b3cdd3e38 --- /dev/null +++ b/data/maps/Route10_PokemonCenter_2F/events.inc @@ -0,0 +1,13 @@ +Route10_PokemonCenter_2F_EventObjects: + object_event 1, 65, 0, 6, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route10_PokemonCenter_2F_EventScript_1A8CF6, 0, 0, 0 + object_event 2, 65, 0, 2, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route10_PokemonCenter_2F_EventScript_1A8CFC, 0, 0, 0 + object_event 3, 65, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route10_PokemonCenter_2F_EventScript_1A8D02, 0, 0, 0 + object_event 4, 69, 0, 1, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route10_PokemonCenter_2F_EventScript_1BB1D2, 112, 0, 0 + +Route10_PokemonCenter_2F_MapWarps: + warp_def 1, 6, 4, 3, 5376 + warp_def 5, 1, 0, 0, 4 + warp_def 9, 1, 0, 0, 1 + +Route10_PokemonCenter_2F_MapEvents:: + map_events Route10_PokemonCenter_2F_EventObjects, Route10_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route11/events.inc b/data/maps/Route11/events.inc new file mode 100644 index 000000000..4e32954ea --- /dev/null +++ b/data/maps/Route11/events.inc @@ -0,0 +1,26 @@ +Route11_EventObjects: + object_event 1, 18, 0, 19, 0, 8, 0, 3, 17, 17, 0, 1, 0, 4, 0, Route11_EventScript_1A9B0D, 0, 0, 0 + object_event 2, 32, 0, 16, 0, 17, 0, 3, 1, 17, 0, 1, 0, 1, 0, Route11_EventScript_1A9C81, 0, 0, 0 + object_event 3, 18, 0, 31, 0, 8, 0, 3, 15, 17, 0, 1, 0, 4, 0, Route11_EventScript_1A9B4B, 0, 0, 0 + object_event 4, 18, 0, 28, 0, 10, 0, 3, 40, 72, 0, 1, 0, 1, 0, Route11_EventScript_1A9BC7, 0, 0, 0 + object_event 5, 32, 0, 38, 0, 15, 0, 3, 1, 17, 0, 1, 0, 1, 0, Route11_EventScript_1A9CBF, 0, 0, 0 + object_event 6, 32, 0, 50, 0, 4, 0, 3, 1, 17, 0, 1, 0, 1, 0, Route11_EventScript_1A9D3B, 0, 0, 0 + object_event 7, 30, 0, 42, 0, 8, 0, 3, 14, 17, 0, 1, 0, 4, 0, Route11_EventScript_1A9C05, 0, 0, 0 + object_event 8, 18, 0, 50, 0, 14, 0, 3, 25, 65, 0, 1, 0, 1, 0, Route11_EventScript_1A9B89, 0, 0, 0 + object_event 9, 32, 0, 57, 0, 16, 0, 3, 1, 17, 0, 1, 0, 1, 0, Route11_EventScript_1A9CFD, 0, 0, 0 + object_event 10, 30, 0, 32, 0, 18, 0, 3, 14, 17, 0, 1, 0, 6, 0, Route11_EventScript_1A9C43, 0, 0, 0 + object_event 11, 92, 0, 42, 0, 12, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route11_EventScript_1BEAF0, 449, 0, 0 + object_event 12, 92, 0, 63, 0, 13, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route11_EventScript_1BEB99, 462, 0, 0 + object_event 13, 92, 0, 13, 0, 3, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route11_EventScript_1BEBA6, 463, 0, 0 + +Route11_MapWarps: + warp_def 6, 7, 0, 0, 294 + warp_def 58, 10, 3, 0, 5632 + warp_def 65, 10, 3, 2, 5632 + +Route11_MapBGEvents: + bg_event 3, 7, 3, 0, 0, Route11_EventScript_167FF7 + bg_event 58, 5, 0, 7, 0, 85, 41, 1 + +Route11_MapEvents:: + map_events Route11_EventObjects, Route11_MapWarps, 0x0, Route11_MapBGEvents diff --git a/data/maps/Route11_EastEntrance_1F/events.inc b/data/maps/Route11_EastEntrance_1F/events.inc new file mode 100644 index 000000000..db740f2b5 --- /dev/null +++ b/data/maps/Route11_EastEntrance_1F/events.inc @@ -0,0 +1,13 @@ +Route11_EastEntrance_1F_EventObjects: + object_event 1, 60, 0, 6, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route11_EastEntrance_1F_EventScript_16FD22, 0, 0, 0 + object_event 2, 60, 0, 4, 0, 10, 0, 0, 7, 17, 0, 0, 0, 0, 0, Route11_EastEntrance_1F_EventScript_16FD2B, 0, 0, 0 + +Route11_EastEntrance_1F_MapWarps: + warp_def 1, 6, 3, 1, 797 + warp_def 1, 7, 3, 1, 797 + warp_def 11, 6, 3, 2, 797 + warp_def 11, 7, 3, 2, 797 + warp_def 9, 10, 3, 0, 5633 + +Route11_EastEntrance_1F_MapEvents:: + map_events Route11_EastEntrance_1F_EventObjects, Route11_EastEntrance_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route11_EastEntrance_2F/events.inc b/data/maps/Route11_EastEntrance_2F/events.inc new file mode 100644 index 000000000..66cfc6c89 --- /dev/null +++ b/data/maps/Route11_EastEntrance_2F/events.inc @@ -0,0 +1,13 @@ +Route11_EastEntrance_2F_EventObjects: + object_event 1, 18, 0, 7, 0, 3, 0, 3, 5, 18, 0, 0, 0, 0, 0, Route11_EastEntrance_2F_EventScript_16FD5C, 0, 0, 0 + object_event 2, 55, 0, 2, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route11_EastEntrance_2F_EventScript_16FDD8, 0, 0, 0 + +Route11_EastEntrance_2F_MapWarps: + warp_def 10, 9, 3, 4, 5632 + +Route11_EastEntrance_2F_MapBGEvents: + bg_event 4, 1, 0, 0, 0, Route11_EastEntrance_2F_EventScript_16FD35 + bg_event 8, 1, 0, 0, 0, Route11_EastEntrance_2F_EventScript_16FD53 + +Route11_EastEntrance_2F_MapEvents:: + map_events Route11_EastEntrance_2F_EventObjects, Route11_EastEntrance_2F_MapWarps, 0x0, Route11_EastEntrance_2F_MapBGEvents diff --git a/data/maps/Route12/events.inc b/data/maps/Route12/events.inc new file mode 100644 index 000000000..bfb2acbbf --- /dev/null +++ b/data/maps/Route12/events.inc @@ -0,0 +1,31 @@ +Route12_EventObjects: + object_event 1, 57, 0, 17, 0, 32, 0, 3, 13, 17, 0, 1, 0, 1, 0, Route12_EventScript_1AA451, 0, 0, 0 + object_event 2, 57, 0, 9, 0, 40, 0, 3, 14, 17, 0, 1, 0, 1, 0, Route12_EventScript_1AA48F, 0, 0, 0 + object_event 3, 57, 0, 16, 0, 47, 0, 3, 17, 17, 0, 1, 0, 4, 0, Route12_EventScript_1AA4CD, 0, 0, 0 + object_event 4, 57, 0, 13, 0, 59, 0, 3, 13, 17, 0, 1, 0, 1, 0, Route12_EventScript_1AA50B, 0, 0, 0 + object_event 5, 109, 0, 14, 0, 70, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route12_EventScript_168014, 84, 0, 0 + object_event 6, 26, 0, 13, 0, 92, 0, 3, 37, 68, 0, 1, 0, 1, 0, Route12_EventScript_1AA587, 0, 0, 0 + object_event 7, 39, 0, 10, 0, 99, 0, 3, 8, 17, 0, 1, 0, 1, 0, Route12_EventScript_1AA5C5, 0, 0, 0 + object_event 8, 57, 0, 18, 0, 108, 0, 3, 14, 17, 0, 1, 0, 1, 0, Route12_EventScript_1AA549, 0, 0, 0 + object_event 9, 95, 0, 11, 0, 100, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route12_EventScript_1BDF13, 18, 0, 0 + object_event 10, 92, 0, 18, 0, 36, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route12_EventScript_1BE7B0, 382, 0, 0 + object_event 11, 92, 0, 9, 0, 101, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route12_EventScript_1BE7BD, 383, 0, 0 + object_event 12, 29, 0, 19, 0, 64, 0, 3, 10, 17, 0, 1, 0, 0, 0, Route12_EventScript_1AA649, 0, 0, 0 + object_event 13, 25, 0, 19, 0, 63, 0, 3, 10, 17, 0, 1, 0, 0, 0, Route12_EventScript_1AA603, 0, 0, 0 + object_event 14, 95, 0, 12, 0, 111, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route12_EventScript_1BDF13, 19, 0, 0 + +Route12_MapWarps: + warp_def 12, 86, 0, 1, 5890 + warp_def 14, 15, 3, 0, 5888 + warp_def 15, 15, 3, 1, 5888 + warp_def 14, 21, 3, 2, 5888 + +Route12_MapBGEvents: + bg_event 17, 13, 0, 0, 0, Route12_EventScript_1680A3 + bg_event 15, 69, 0, 0, 0, Route12_EventScript_1680AC + bg_event 18, 57, 3, 7, 0, 21, 42, 1 + bg_event 14, 70, 3, 7, 0, 200, 131, 129 + bg_event 9, 116, 3, 7, 0, 68, 130, 1 + +Route12_MapEvents:: + map_events Route12_EventObjects, Route12_MapWarps, 0x0, Route12_MapBGEvents diff --git a/data/maps/Route12_FishingHouse/events.inc b/data/maps/Route12_FishingHouse/events.inc new file mode 100644 index 000000000..158407b87 --- /dev/null +++ b/data/maps/Route12_FishingHouse/events.inc @@ -0,0 +1,13 @@ +Route12_FishingHouse_EventObjects: + object_event 1, 57, 0, 4, 0, 4, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route12_FishingHouse_EventScript_16FF0C, 0, 0, 0 + +Route12_FishingHouse_MapWarps: + warp_def 2, 8, 0, 0, 798 + warp_def 3, 7, 3, 0, 798 + warp_def 4, 8, 0, 0, 798 + +Route12_FishingHouse_MapBGEvents: + bg_event 9, 1, 0, 0, 0, Route12_FishingHouse_EventScript_170067 + +Route12_FishingHouse_MapEvents:: + map_events Route12_FishingHouse_EventObjects, Route12_FishingHouse_MapWarps, 0x0, Route12_FishingHouse_MapBGEvents diff --git a/data/maps/Route12_NorthEntrance_1F/events.inc b/data/maps/Route12_NorthEntrance_1F/events.inc new file mode 100644 index 000000000..3fb1b1b13 --- /dev/null +++ b/data/maps/Route12_NorthEntrance_1F/events.inc @@ -0,0 +1,12 @@ +Route12_NorthEntrance_1F_EventObjects: + object_event 1, 60, 0, 1, 0, 5, 0, 3, 10, 17, 0, 0, 0, 0, 0, Route12_NorthEntrance_1F_EventScript_16FE6E, 0, 0, 0 + +Route12_NorthEntrance_1F_MapWarps: + warp_def 5, 1, 3, 1, 798 + warp_def 6, 1, 0, 2, 798 + warp_def 5, 11, 3, 3, 798 + warp_def 6, 11, 3, 3, 798 + warp_def 8, 10, 3, 0, 5889 + +Route12_NorthEntrance_1F_MapEvents:: + map_events Route12_NorthEntrance_1F_EventObjects, Route12_NorthEntrance_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route12_NorthEntrance_2F/events.inc b/data/maps/Route12_NorthEntrance_2F/events.inc new file mode 100644 index 000000000..798f5ac97 --- /dev/null +++ b/data/maps/Route12_NorthEntrance_2F/events.inc @@ -0,0 +1,12 @@ +Route12_NorthEntrance_2F_EventObjects: + object_event 1, 22, 0, 7, 0, 5, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route12_NorthEntrance_2F_EventScript_16FE8A, 0, 0, 0 + +Route12_NorthEntrance_2F_MapWarps: + warp_def 10, 9, 3, 4, 5888 + +Route12_NorthEntrance_2F_MapBGEvents: + bg_event 4, 1, 0, 0, 0, Route12_NorthEntrance_2F_EventScript_16FE78 + bg_event 8, 1, 0, 0, 0, Route12_NorthEntrance_2F_EventScript_16FE81 + +Route12_NorthEntrance_2F_MapEvents:: + map_events Route12_NorthEntrance_2F_EventObjects, Route12_NorthEntrance_2F_MapWarps, 0x0, Route12_NorthEntrance_2F_MapBGEvents diff --git a/data/maps/Route13/events.inc b/data/maps/Route13/events.inc new file mode 100644 index 000000000..b02655643 --- /dev/null +++ b/data/maps/Route13/events.inc @@ -0,0 +1,21 @@ +Route13_EventObjects: + object_event 1, 40, 0, 62, 0, 6, 0, 3, 2, 17, 0, 1, 0, 1, 0, Route13_EventScript_1AA803, 0, 0, 0 + object_event 2, 26, 0, 63, 0, 12, 0, 3, 2, 17, 0, 1, 0, 1, 0, Route13_EventScript_1AA749, 0, 0, 0 + object_event 3, 40, 0, 54, 0, 11, 0, 3, 2, 17, 0, 1, 0, 1, 0, Route13_EventScript_1AA841, 0, 0, 0 + object_event 4, 29, 0, 42, 0, 7, 0, 3, 8, 17, 0, 1, 0, 3, 0, Route13_EventScript_1AA70B, 0, 0, 0 + object_event 5, 29, 0, 43, 0, 7, 0, 3, 8, 17, 0, 1, 0, 3, 0, Route13_EventScript_1AA6CD, 0, 0, 0 + object_event 6, 40, 0, 35, 0, 10, 0, 3, 8, 17, 0, 1, 0, 1, 0, Route13_EventScript_1AA87F, 0, 0, 0 + object_event 7, 40, 0, 29, 0, 11, 0, 3, 9, 17, 0, 1, 0, 3, 0, Route13_EventScript_1AA8BD, 0, 0, 0 + object_event 8, 26, 0, 9, 0, 14, 0, 3, 7, 17, 0, 1, 0, 3, 0, Route13_EventScript_1AA7C5, 0, 0, 0 + object_event 9, 26, 0, 16, 0, 5, 0, 3, 10, 17, 0, 1, 0, 3, 0, Route13_EventScript_1AA787, 0, 0, 0 + object_event 10, 53, 0, 14, 0, 8, 0, 3, 1, 17, 0, 1, 0, 1, 0, Route13_EventScript_1AA68F, 0, 0, 0 + object_event 11, 95, 0, 44, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route13_EventScript_1BDF13, 18, 0, 0 + +Route13_MapBGEvents: + bg_event 41, 12, 0, 0, 0, Route13_EventScript_1680C8 + bg_event 37, 6, 0, 0, 0, Route13_EventScript_1680BF + bg_event 21, 14, 0, 0, 0, Route13_EventScript_1680B6 + bg_event 23, 14, 3, 7, 0, 69, 15, 1 + +Route13_MapEvents:: + map_events Route13_EventObjects, 0x0, 0x0, Route13_MapBGEvents diff --git a/data/maps/Route14/events.inc b/data/maps/Route14/events.inc new file mode 100644 index 000000000..90606e7d4 --- /dev/null +++ b/data/maps/Route14/events.inc @@ -0,0 +1,24 @@ +Route14_EventObjects: + object_event 1, 53, 0, 7, 0, 37, 0, 3, 10, 17, 0, 1, 0, 2, 0, Route14_EventScript_1AA9B5, 0, 0, 0 + object_event 2, 26, 0, 18, 0, 35, 0, 3, 2, 34, 0, 1, 0, 1, 0, Route14_EventScript_1AA9F3, 0, 0, 0 + object_event 3, 26, 0, 10, 0, 14, 0, 3, 10, 17, 0, 1, 0, 4, 0, Route14_EventScript_1AAAEB, 0, 0, 0 + object_event 4, 26, 0, 16, 0, 16, 0, 3, 7, 17, 0, 1, 0, 3, 0, Route14_EventScript_1AAB29, 0, 0, 0 + object_event 5, 53, 0, 7, 0, 31, 0, 3, 10, 17, 0, 1, 0, 2, 0, Route14_EventScript_1AA977, 0, 0, 0 + object_event 6, 53, 0, 7, 0, 34, 0, 3, 10, 17, 0, 1, 0, 2, 0, Route14_EventScript_1AA8FB, 0, 0, 0 + object_event 7, 26, 0, 8, 0, 9, 0, 3, 5, 17, 0, 1, 0, 1, 0, Route14_EventScript_1AAAAD, 0, 0, 0 + object_event 8, 26, 0, 7, 0, 6, 0, 3, 10, 17, 0, 1, 0, 1, 0, Route14_EventScript_1AAA6F, 0, 0, 0 + object_event 9, 53, 0, 10, 0, 37, 0, 3, 25, 97, 0, 1, 0, 1, 0, Route14_EventScript_1AA939, 0, 0, 0 + object_event 10, 26, 0, 18, 0, 47, 0, 3, 2, 34, 0, 1, 0, 1, 0, Route14_EventScript_1AAA31, 0, 0, 0 + object_event 11, 95, 0, 7, 0, 26, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route14_EventScript_1BDF13, 18, 0, 0 + object_event 12, 95, 0, 12, 0, 35, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route14_EventScript_1BDF13, 19, 0, 0 + object_event 13, 95, 0, 1, 0, 47, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route14_EventScript_1BDF13, 20, 0, 0 + object_event 14, 17, 0, 13, 0, 51, 0, 3, 8, 17, 0, 1, 0, 1, 0, Route14_EventScript_1AABAD, 0, 0, 0 + object_event 15, 17, 0, 12, 0, 51, 0, 3, 8, 17, 0, 1, 0, 1, 0, Route14_EventScript_1AAB67, 0, 0, 0 + +Route14_MapBGEvents: + bg_event 17, 12, 0, 0, 0, Route14_EventScript_1680D2 + bg_event 9, 20, 3, 7, 0, 70, 149, 1 + bg_event 19, 53, 3, 7, 0, 152, 157, 1 + +Route14_MapEvents:: + map_events Route14_EventObjects, 0x0, 0x0, Route14_MapBGEvents diff --git a/data/maps/Route15/events.inc b/data/maps/Route15/events.inc new file mode 100644 index 000000000..ecb7f3069 --- /dev/null +++ b/data/maps/Route15/events.inc @@ -0,0 +1,25 @@ +Route15_EventObjects: + object_event 1, 40, 0, 22, 0, 13, 0, 3, 2, 17, 0, 1, 0, 1, 0, Route15_EventScript_1AAD67, 0, 0, 0 + object_event 2, 26, 0, 31, 0, 12, 0, 3, 9, 17, 0, 1, 0, 5, 0, Route15_EventScript_1AACEB, 0, 0, 0 + object_event 3, 26, 0, 37, 0, 14, 0, 3, 7, 17, 0, 1, 0, 2, 0, Route15_EventScript_1AAD29, 0, 0, 0 + object_event 4, 40, 0, 44, 0, 13, 0, 3, 2, 17, 0, 1, 0, 1, 0, Route15_EventScript_1AADA5, 0, 0, 0 + object_event 5, 29, 0, 50, 0, 12, 0, 3, 8, 17, 0, 1, 0, 2, 0, Route15_EventScript_1AACAD, 0, 0, 0 + object_event 6, 53, 0, 59, 0, 12, 0, 3, 18, 17, 0, 1, 0, 2, 0, Route15_EventScript_1AAC31, 0, 0, 0 + object_event 7, 53, 0, 63, 0, 13, 0, 3, 13, 17, 0, 1, 0, 1, 0, Route15_EventScript_1AABF3, 0, 0, 0 + object_event 8, 40, 0, 52, 0, 8, 0, 3, 2, 66, 0, 1, 0, 1, 0, Route15_EventScript_1AADE3, 0, 0, 0 + object_event 9, 29, 0, 54, 0, 12, 0, 3, 8, 17, 0, 1, 0, 2, 0, Route15_EventScript_1AAC6F, 0, 0, 0 + object_event 10, 40, 0, 28, 0, 6, 0, 3, 2, 66, 0, 1, 0, 1, 0, Route15_EventScript_1AAE21, 0, 0, 0 + object_event 11, 92, 0, 20, 0, 6, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route15_EventScript_1BE7CA, 384, 0, 0 + object_event 12, 54, 0, 39, 0, 7, 0, 3, 8, 17, 0, 1, 0, 1, 0, Route15_EventScript_1AAEA5, 0, 0, 0 + object_event 13, 24, 0, 40, 0, 7, 0, 3, 8, 17, 0, 1, 0, 1, 0, Route15_EventScript_1AAE5F, 0, 0, 0 + object_event 14, 65375, 0, 73, 0, 7, 0, 13, 0, 0, 0, 32, 0, 3, 0, 0x0, 0, 0, 0 + +Route15_MapWarps: + warp_def 9, 11, 3, 0, 6144 + warp_def 16, 11, 3, 2, 6144 + +Route15_MapBGEvents: + bg_event 41, 11, 0, 0, 0, Route15_EventScript_1680DC + +Route15_MapEvents:: + map_events Route15_EventObjects, Route15_MapWarps, 0x0, Route15_MapBGEvents diff --git a/data/maps/Route15_WestEntrance_1F/events.inc b/data/maps/Route15_WestEntrance_1F/events.inc new file mode 100644 index 000000000..6eed70559 --- /dev/null +++ b/data/maps/Route15_WestEntrance_1F/events.inc @@ -0,0 +1,12 @@ +Route15_WestEntrance_1F_EventObjects: + object_event 1, 60, 0, 6, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route15_WestEntrance_1F_EventScript_170089, 0, 0, 0 + +Route15_WestEntrance_1F_MapWarps: + warp_def 1, 6, 3, 0, 801 + warp_def 1, 7, 3, 0, 801 + warp_def 11, 6, 3, 1, 801 + warp_def 11, 7, 3, 1, 801 + warp_def 9, 10, 3, 0, 6145 + +Route15_WestEntrance_1F_MapEvents:: + map_events Route15_WestEntrance_1F_EventObjects, Route15_WestEntrance_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route15_WestEntrance_2F/events.inc b/data/maps/Route15_WestEntrance_2F/events.inc new file mode 100644 index 000000000..538d744f4 --- /dev/null +++ b/data/maps/Route15_WestEntrance_2F/events.inc @@ -0,0 +1,12 @@ +Route15_WestEntrance_2F_EventObjects: + object_event 1, 55, 0, 5, 0, 5, 0, 3, 7, 17, 0, 0, 0, 0, 0, Route15_WestEntrance_2F_EventScript_1700B9, 0, 0, 0 + +Route15_WestEntrance_2F_MapWarps: + warp_def 10, 9, 3, 4, 6144 + +Route15_WestEntrance_2F_MapBGEvents: + bg_event 4, 1, 0, 0, 0, Route15_WestEntrance_2F_EventScript_170093 + bg_event 8, 1, 0, 0, 0, Route15_WestEntrance_2F_EventScript_1700B0 + +Route15_WestEntrance_2F_MapEvents:: + map_events Route15_WestEntrance_2F_EventObjects, Route15_WestEntrance_2F_MapWarps, 0x0, Route15_WestEntrance_2F_MapBGEvents diff --git a/data/maps/Route16/events.inc b/data/maps/Route16/events.inc new file mode 100644 index 000000000..316615eab --- /dev/null +++ b/data/maps/Route16/events.inc @@ -0,0 +1,26 @@ +Route16_EventObjects: + object_event 1, 53, 0, 16, 0, 12, 0, 3, 1, 17, 0, 1, 0, 1, 0, Route16_EventScript_1AAEEB, 0, 0, 0 + object_event 2, 53, 0, 14, 0, 14, 0, 3, 1, 17, 0, 1, 0, 1, 0, Route16_EventScript_1AAFA5, 0, 0, 0 + object_event 3, 53, 0, 12, 0, 12, 0, 3, 1, 17, 0, 1, 0, 1, 0, Route16_EventScript_1AAFE3, 0, 0, 0 + object_event 4, 53, 0, 8, 0, 12, 0, 3, 1, 17, 0, 1, 0, 1, 0, Route16_EventScript_1AAF67, 0, 0, 0 + object_event 5, 53, 0, 10, 0, 14, 0, 3, 1, 17, 0, 1, 0, 1, 0, Route16_EventScript_1AAF29, 0, 0, 0 + object_event 6, 53, 0, 6, 0, 14, 0, 3, 1, 17, 0, 1, 0, 1, 0, Route16_EventScript_1AB021, 0, 0, 0 + object_event 7, 95, 0, 41, 0, 11, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route16_EventScript_1BDF13, 18, 0, 0 + object_event 8, 29, 0, 30, 0, 5, 0, 3, 8, 17, 0, 1, 0, 1, 0, Route16_EventScript_1AB0A5, 0, 0, 0 + object_event 9, 25, 0, 31, 0, 5, 0, 3, 8, 17, 0, 1, 0, 1, 0, Route16_EventScript_1AB05F, 0, 0, 0 + object_event 10, 109, 0, 31, 0, 13, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route16_EventScript_168121, 128, 0, 0 + +Route16_MapWarps: + warp_def 10, 5, 0, 1, 6400 + warp_def 20, 6, 3, 0, 6401 + warp_def 27, 6, 3, 1, 6401 + warp_def 20, 13, 3, 2, 6401 + warp_def 27, 13, 3, 3, 6401 + +Route16_MapBGEvents: + bg_event 6, 17, 0, 0, 0, Route16_EventScript_1681B6 + bg_event 33, 11, 0, 0, 0, Route16_EventScript_1681AD + bg_event 31, 13, 3, 7, 0, 200, 132, 129 + +Route16_MapEvents:: + map_events Route16_EventObjects, Route16_MapWarps, 0x0, Route16_MapBGEvents diff --git a/data/maps/Route16_House/events.inc b/data/maps/Route16_House/events.inc new file mode 100644 index 000000000..0983be77b --- /dev/null +++ b/data/maps/Route16_House/events.inc @@ -0,0 +1,11 @@ +Route16_House_EventObjects: + object_event 1, 23, 0, 4, 0, 2, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route16_House_EventScript_17014F, 0, 0, 0 + object_event 2, 133, 0, 9, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route16_House_EventScript_1701AF, 0, 0, 0 + +Route16_House_MapWarps: + warp_def 3, 7, 3, 0, 802 + warp_def 4, 7, 3, 0, 802 + warp_def 5, 7, 3, 0, 802 + +Route16_House_MapEvents:: + map_events Route16_House_EventObjects, Route16_House_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route16_NorthEntrance_1F/events.inc b/data/maps/Route16_NorthEntrance_1F/events.inc new file mode 100644 index 000000000..151d6a858 --- /dev/null +++ b/data/maps/Route16_NorthEntrance_1F/events.inc @@ -0,0 +1,26 @@ +Route16_NorthEntrance_1F_EventObjects: + object_event 1, 60, 0, 6, 0, 8, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route16_NorthEntrance_1F_EventScript_1701DB, 0, 0, 0 + object_event 2, 32, 0, 7, 0, 4, 0, 3, 5, 17, 0, 0, 0, 0, 0, Route16_NorthEntrance_1F_EventScript_1702B5, 0, 0, 0 + +Route16_NorthEntrance_1F_MapWarps: + warp_def 1, 3, 3, 1, 802 + warp_def 11, 3, 3, 2, 802 + warp_def 1, 12, 3, 3, 802 + warp_def 11, 12, 3, 4, 802 + warp_def 9, 16, 3, 0, 6402 + +Route16_NorthEntrance_1F_MapCoordEvents: + coord_event 10, 12, 3, 0, 16478, 1, 0, Route16_NorthEntrance_1F_EventScript_1A77B6 + coord_event 2, 12, 3, 0, 16478, 0, 0, Route16_NorthEntrance_1F_EventScript_1A77C1 + coord_event 6, 10, 3, 0, 16385, 0, 0, Route16_NorthEntrance_1F_EventScript_1701E4 + coord_event 6, 11, 3, 0, 16385, 0, 0, Route16_NorthEntrance_1F_EventScript_1701F0 + coord_event 1, 13, 3, 0, 16478, 0, 0, Route16_NorthEntrance_1F_EventScript_1A77C1 + coord_event 1, 11, 3, 0, 16478, 0, 0, Route16_NorthEntrance_1F_EventScript_1A77C1 + coord_event 11, 11, 3, 0, 16478, 1, 0, Route16_NorthEntrance_1F_EventScript_1A77B6 + coord_event 11, 13, 3, 0, 16478, 1, 0, Route16_NorthEntrance_1F_EventScript_1A77B6 + coord_event 6, 12, 3, 0, 16385, 0, 0, Route16_NorthEntrance_1F_EventScript_1701FC + coord_event 6, 13, 3, 0, 16385, 0, 0, Route16_NorthEntrance_1F_EventScript_170208 + coord_event 6, 14, 3, 0, 16385, 0, 0, Route16_NorthEntrance_1F_EventScript_170214 + +Route16_NorthEntrance_1F_MapEvents:: + map_events Route16_NorthEntrance_1F_EventObjects, Route16_NorthEntrance_1F_MapWarps, Route16_NorthEntrance_1F_MapCoordEvents, 0x0 diff --git a/data/maps/Route16_NorthEntrance_2F/events.inc b/data/maps/Route16_NorthEntrance_2F/events.inc new file mode 100644 index 000000000..5a163e96f --- /dev/null +++ b/data/maps/Route16_NorthEntrance_2F/events.inc @@ -0,0 +1,14 @@ +Route16_NorthEntrance_2F_EventObjects: + object_event 1, 16, 0, 6, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route16_NorthEntrance_2F_EventScript_1702BF, 0, 0, 0 + object_event 2, 17, 0, 4, 0, 8, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route16_NorthEntrance_2F_EventScript_1702C8, 0, 0, 0 + object_event 3, 55, 0, 10, 0, 6, 0, 0, 9, 17, 0, 0, 0, 0, 0, Route16_NorthEntrance_2F_EventScript_1702E3, 0, 0, 0 + +Route16_NorthEntrance_2F_MapWarps: + warp_def 10, 9, 3, 4, 6401 + +Route16_NorthEntrance_2F_MapBGEvents: + bg_event 4, 1, 0, 0, 0, Route16_NorthEntrance_2F_EventScript_1702D1 + bg_event 8, 1, 0, 0, 0, Route16_NorthEntrance_2F_EventScript_1702DA + +Route16_NorthEntrance_2F_MapEvents:: + map_events Route16_NorthEntrance_2F_EventObjects, Route16_NorthEntrance_2F_MapWarps, 0x0, Route16_NorthEntrance_2F_MapBGEvents diff --git a/data/maps/Route17/events.inc b/data/maps/Route17/events.inc new file mode 100644 index 000000000..a0fc66d38 --- /dev/null +++ b/data/maps/Route17/events.inc @@ -0,0 +1,27 @@ +Route17_EventObjects: + object_event 1, 53, 0, 4, 0, 18, 0, 3, 26, 97, 0, 1, 0, 1, 0, Route17_EventScript_1AB319, 0, 0, 0 + object_event 2, 53, 0, 11, 0, 15, 0, 3, 26, 81, 0, 1, 0, 1, 0, Route17_EventScript_1AB221, 0, 0, 0 + object_event 3, 53, 0, 15, 0, 24, 0, 3, 52, 36, 0, 1, 0, 1, 0, Route17_EventScript_1AB1E3, 0, 0, 0 + object_event 4, 53, 0, 18, 0, 41, 0, 3, 26, 81, 0, 1, 0, 1, 0, Route17_EventScript_1AB129, 0, 0, 0 + object_event 5, 53, 0, 7, 0, 38, 0, 3, 14, 17, 0, 1, 0, 5, 0, Route17_EventScript_1AB0EB, 0, 0, 0 + object_event 6, 53, 0, 2, 0, 61, 0, 3, 10, 17, 0, 1, 0, 4, 0, Route17_EventScript_1AB29D, 0, 0, 0 + object_event 7, 53, 0, 21, 0, 61, 0, 3, 9, 17, 0, 1, 0, 3, 0, Route17_EventScript_1AB25F, 0, 0, 0 + object_event 8, 53, 0, 18, 0, 94, 0, 3, 26, 81, 0, 1, 0, 1, 0, Route17_EventScript_1AB2DB, 0, 0, 0 + object_event 9, 53, 0, 16, 0, 134, 0, 3, 47, 24, 0, 1, 0, 1, 0, Route17_EventScript_1AB1A5, 0, 0, 0 + object_event 10, 53, 0, 4, 0, 116, 0, 3, 26, 81, 0, 1, 0, 1, 0, Route17_EventScript_1AB167, 0, 0, 0 + +Route17_MapBGEvents: + bg_event 12, 97, 0, 0, 0, Route17_EventScript_1681DB + bg_event 12, 83, 0, 0, 0, Route17_EventScript_1681D2 + bg_event 12, 68, 0, 0, 0, Route17_EventScript_1681C9 + bg_event 12, 53, 0, 0, 0, Route17_EventScript_1681C0 + bg_event 12, 125, 3, 0, 0, Route17_EventScript_1681E4 + bg_event 11, 157, 0, 0, 0, Route17_EventScript_1681ED + bg_event 18, 83, 3, 7, 0, 68, 17, 1 + bg_event 10, 53, 3, 7, 0, 19, 18, 1 + bg_event 4, 68, 3, 7, 0, 69, 19, 1 + bg_event 4, 125, 3, 7, 0, 25, 20, 1 + bg_event 14, 157, 3, 7, 0, 37, 21, 1 + +Route17_MapEvents:: + map_events Route17_EventObjects, 0x0, 0x0, Route17_MapBGEvents diff --git a/data/maps/Route18/events.inc b/data/maps/Route18/events.inc new file mode 100644 index 000000000..a07028aa1 --- /dev/null +++ b/data/maps/Route18/events.inc @@ -0,0 +1,15 @@ +Route18_EventObjects: + object_event 1, 26, 0, 46, 0, 14, 0, 3, 9, 17, 0, 1, 0, 4, 0, Route18_EventScript_1AB3D3, 0, 0, 0 + object_event 2, 26, 0, 41, 0, 15, 0, 3, 1, 17, 0, 1, 0, 1, 0, Route18_EventScript_1AB395, 0, 0, 0 + object_event 3, 26, 0, 39, 0, 12, 0, 3, 10, 17, 0, 1, 0, 6, 0, Route18_EventScript_1AB357, 0, 0, 0 + +Route18_MapWarps: + warp_def 41, 9, 3, 0, 6656 + warp_def 48, 9, 3, 1, 6656 + +Route18_MapBGEvents: + bg_event 37, 7, 0, 0, 0, Route18_EventScript_168228 + bg_event 52, 7, 0, 0, 0, Route18_EventScript_16821F + +Route18_MapEvents:: + map_events Route18_EventObjects, Route18_MapWarps, 0x0, Route18_MapBGEvents diff --git a/data/maps/Route18_EastEntrance_1F/events.inc b/data/maps/Route18_EastEntrance_1F/events.inc new file mode 100644 index 000000000..1e7e8795c --- /dev/null +++ b/data/maps/Route18_EastEntrance_1F/events.inc @@ -0,0 +1,23 @@ +Route18_EastEntrance_1F_EventObjects: + object_event 1, 60, 0, 6, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route18_EastEntrance_1F_EventScript_170391, 0, 0, 0 + +Route18_EastEntrance_1F_MapWarps: + warp_def 1, 6, 3, 0, 804 + warp_def 11, 6, 3, 1, 804 + warp_def 9, 10, 3, 0, 6657 + +Route18_EastEntrance_1F_MapCoordEvents: + coord_event 2, 6, 3, 0, 16478, 0, 0, Route18_EastEntrance_1F_EventScript_1A77C1 + coord_event 6, 4, 3, 0, 16385, 0, 0, Route18_EastEntrance_1F_EventScript_17039A + coord_event 6, 5, 3, 0, 16385, 0, 0, Route18_EastEntrance_1F_EventScript_1703A6 + coord_event 6, 6, 3, 0, 16385, 0, 0, Route18_EastEntrance_1F_EventScript_1703B2 + coord_event 6, 7, 3, 0, 16385, 0, 0, Route18_EastEntrance_1F_EventScript_1703BE + coord_event 6, 8, 3, 0, 16385, 0, 0, Route18_EastEntrance_1F_EventScript_1703CA + coord_event 10, 6, 3, 0, 16478, 1, 0, Route18_EastEntrance_1F_EventScript_1A77B6 + coord_event 11, 5, 3, 0, 16478, 1, 0, Route18_EastEntrance_1F_EventScript_1A77B6 + coord_event 11, 7, 3, 0, 16478, 1, 0, Route18_EastEntrance_1F_EventScript_1A77B6 + coord_event 1, 5, 3, 0, 16478, 0, 0, Route18_EastEntrance_1F_EventScript_1A77C1 + coord_event 1, 7, 3, 0, 16478, 0, 0, Route18_EastEntrance_1F_EventScript_1A77C1 + +Route18_EastEntrance_1F_MapEvents:: + map_events Route18_EastEntrance_1F_EventObjects, Route18_EastEntrance_1F_MapWarps, Route18_EastEntrance_1F_MapCoordEvents, 0x0 diff --git a/data/maps/Route18_EastEntrance_2F/events.inc b/data/maps/Route18_EastEntrance_2F/events.inc new file mode 100644 index 000000000..4b156befa --- /dev/null +++ b/data/maps/Route18_EastEntrance_2F/events.inc @@ -0,0 +1,12 @@ +Route18_EastEntrance_2F_EventObjects: + object_event 1, 19, 0, 5, 0, 3, 0, 3, 9, 17, 0, 0, 0, 0, 0, Route18_EastEntrance_2F_EventScript_17047E, 0, 0, 0 + +Route18_EastEntrance_2F_MapWarps: + warp_def 10, 9, 3, 2, 6656 + +Route18_EastEntrance_2F_MapBGEvents: + bg_event 4, 1, 0, 0, 0, Route18_EastEntrance_2F_EventScript_17046C + bg_event 8, 1, 0, 0, 0, Route18_EastEntrance_2F_EventScript_170475 + +Route18_EastEntrance_2F_MapEvents:: + map_events Route18_EastEntrance_2F_EventObjects, Route18_EastEntrance_2F_MapWarps, 0x0, Route18_EastEntrance_2F_MapBGEvents diff --git a/data/maps/Route19/events.inc b/data/maps/Route19/events.inc new file mode 100644 index 000000000..d1d6dcdeb --- /dev/null +++ b/data/maps/Route19/events.inc @@ -0,0 +1,19 @@ +Route19_EventObjects: + object_event 1, 45, 0, 15, 0, 10, 0, 3, 9, 54, 0, 1, 0, 3, 0, Route19_EventScript_1AB44F, 0, 0, 0 + object_event 2, 45, 0, 10, 0, 9, 0, 3, 10, 17, 0, 1, 0, 3, 0, Route19_EventScript_1AB411, 0, 0, 0 + object_event 3, 43, 0, 12, 0, 17, 0, 1, 1, 17, 0, 1, 0, 3, 0, Route19_EventScript_1AB547, 0, 0, 0 + object_event 4, 43, 0, 18, 0, 33, 0, 1, 51, 53, 0, 1, 0, 1, 0, Route19_EventScript_1AB48D, 0, 0, 0 + object_event 5, 43, 0, 8, 0, 27, 0, 1, 2, 34, 0, 1, 0, 1, 0, Route19_EventScript_1AB4CB, 0, 0, 0 + object_event 6, 43, 0, 16, 0, 22, 0, 1, 14, 17, 0, 1, 0, 6, 0, Route19_EventScript_1AB509, 0, 0, 0 + object_event 7, 43, 0, 11, 0, 47, 0, 1, 1, 17, 0, 1, 0, 1, 0, Route19_EventScript_1AB585, 0, 0, 0 + object_event 8, 44, 0, 14, 0, 48, 0, 1, 1, 17, 0, 1, 0, 1, 0, Route19_EventScript_1AB601, 0, 0, 0 + object_event 9, 44, 0, 12, 0, 49, 0, 1, 1, 17, 0, 1, 0, 1, 0, Route19_EventScript_1AB63F, 0, 0, 0 + object_event 10, 44, 0, 9, 0, 48, 0, 1, 1, 17, 0, 1, 0, 1, 0, Route19_EventScript_1AB5C3, 0, 0, 0 + object_event 11, 44, 0, 8, 0, 41, 0, 1, 8, 17, 0, 1, 0, 1, 0, Route19_EventScript_1AB67D, 0, 0, 0 + object_event 12, 36, 0, 9, 0, 41, 0, 1, 8, 17, 0, 1, 0, 1, 0, Route19_EventScript_1AB6C3, 0, 0, 0 + +Route19_MapBGEvents: + bg_event 13, 12, 0, 0, 0, Route19_EventScript_168232 + +Route19_MapEvents:: + map_events Route19_EventObjects, 0x0, 0x0, Route19_MapBGEvents diff --git a/data/maps/Route2/events.inc b/data/maps/Route2/events.inc new file mode 100644 index 000000000..316893612 --- /dev/null +++ b/data/maps/Route2/events.inc @@ -0,0 +1,27 @@ +Route2_EventObjects: + object_event 1, 95, 0, 16, 0, 62, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route2_EventScript_1BDF13, 20, 0, 0 + object_event 2, 95, 0, 15, 0, 69, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route2_EventScript_1BDF13, 19, 0, 0 + object_event 3, 95, 0, 11, 0, 13, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route2_EventScript_1BDF13, 21, 0, 0 + object_event 4, 95, 0, 18, 0, 26, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route2_EventScript_1BDF13, 22, 0, 0 + object_event 5, 92, 0, 17, 0, 54, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route2_EventScript_1BE58E, 340, 0, 0 + object_event 6, 92, 0, 17, 0, 64, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route2_EventScript_1BE59B, 341, 0, 0 + object_event 7, 65375, 0, 6, 0, 85, 0, 8, 0, 0, 0, 1, 0, 3, 0, 0x0, 0, 0, 0 + +Route2_MapWarps: + warp_def 5, 13, 3, 3, 3843 + warp_def 6, 13, 3, 3, 3843 + warp_def 5, 51, 3, 1, 3840 + warp_def 17, 11, 3, 1, 292 + warp_def 17, 22, 0, 1, 3841 + warp_def 18, 46, 3, 1, 3842 + warp_def 18, 41, 3, 3, 3842 + warp_def 19, 41, 3, 3, 3842 + warp_def 19, 46, 3, 1, 3842 + warp_def 6, 51, 3, 1, 3840 + +Route2_MapBGEvents: + bg_event 14, 12, 0, 0, 0, Route2_EventScript_167F6E + bg_event 7, 73, 0, 0, 0, Route2_EventScript_167F65 + +Route2_MapEvents:: + map_events Route2_EventObjects, Route2_MapWarps, 0x0, Route2_MapBGEvents diff --git a/data/maps/Route20/events.inc b/data/maps/Route20/events.inc new file mode 100644 index 000000000..468c7d951 --- /dev/null +++ b/data/maps/Route20/events.inc @@ -0,0 +1,24 @@ +Route20_EventObjects: + object_event 1, 44, 0, 8, 0, 11, 0, 1, 13, 17, 0, 1, 0, 3, 0, Route20_EventScript_1AB83F, 0, 0, 0 + object_event 2, 40, 0, 16, 0, 14, 0, 3, 8, 17, 0, 1, 0, 1, 0, Route20_EventScript_1AB8F9, 0, 0, 0 + object_event 3, 44, 0, 34, 0, 7, 0, 1, 8, 17, 0, 1, 0, 4, 0, Route20_EventScript_1AB801, 0, 0, 0 + object_event 4, 26, 0, 43, 0, 9, 0, 3, 2, 17, 0, 1, 0, 1, 0, Route20_EventScript_1AB8BB, 0, 0, 0 + object_event 5, 43, 0, 23, 0, 10, 0, 1, 52, 69, 0, 1, 0, 1, 0, Route20_EventScript_1AB747, 0, 0, 0 + object_event 6, 40, 0, 73, 0, 16, 0, 3, 9, 17, 0, 1, 0, 2, 0, Route20_EventScript_1AB937, 0, 0, 0 + object_event 7, 43, 0, 111, 0, 9, 0, 1, 45, 53, 0, 1, 0, 1, 0, Route20_EventScript_1AB709, 0, 0, 0 + object_event 8, 43, 0, 106, 0, 11, 0, 1, 50, 53, 0, 1, 0, 1, 0, Route20_EventScript_1AB785, 0, 0, 0 + object_event 9, 44, 0, 93, 0, 10, 0, 1, 1, 17, 0, 1, 0, 5, 0, Route20_EventScript_1AB87D, 0, 0, 0 + object_event 10, 44, 0, 54, 0, 11, 0, 1, 1, 17, 0, 1, 0, 1, 0, Route20_EventScript_1AB7C3, 0, 0, 0 + object_event 11, 39, 0, 69, 0, 3, 0, 3, 5, 18, 0, 0, 0, 0, 0, Route20_EventScript_1ACE36, 0, 0, 0 + +Route20_MapWarps: + warp_def 60, 8, 3, 3, 339 + warp_def 72, 14, 3, 4, 339 + +Route20_MapBGEvents: + bg_event 68, 14, 0, 0, 0, Route20_EventScript_168280 + bg_event 64, 8, 0, 0, 0, Route20_EventScript_168280 + bg_event 23, 6, 3, 7, 0, 108, 153, 1 + +Route20_MapEvents:: + map_events Route20_EventObjects, Route20_MapWarps, 0x0, Route20_MapBGEvents diff --git a/data/maps/Route21_North/events.inc b/data/maps/Route21_North/events.inc new file mode 100644 index 000000000..b4ab54566 --- /dev/null +++ b/data/maps/Route21_North/events.inc @@ -0,0 +1,13 @@ +Route21_North_EventObjects: + object_event 1, 57, 0, 7, 0, 27, 0, 3, 7, 17, 0, 1, 0, 0, 0, Route21_North_EventScript_1AB975, 0, 0, 0 + object_event 2, 57, 0, 16, 0, 26, 0, 3, 8, 17, 0, 1, 0, 0, 0, Route21_North_EventScript_1AB9F1, 0, 0, 0 + object_event 3, 43, 0, 12, 0, 44, 0, 1, 51, 36, 0, 1, 0, 1, 0, Route21_North_EventScript_1ABA6D, 0, 0, 0 + object_event 4, 44, 0, 14, 0, 35, 0, 1, 8, 17, 0, 1, 0, 1, 0, Route21_North_EventScript_1ABB65, 0, 0, 0 + object_event 5, 36, 0, 15, 0, 35, 0, 1, 8, 17, 0, 1, 0, 1, 0, Route21_North_EventScript_1ABBAB, 0, 0, 0 + object_event 6, 65307, 0, 13, 0, 253, 255, 2, 0, 0, 0, 0, 0, 3, 0, 0x0, 0, 0, 0 + +Route21_North_MapBGEvents: + bg_event 17, 42, 3, 7, 0, 106, 154, 1 + +Route21_North_MapEvents:: + map_events Route21_North_EventObjects, 0x0, 0x0, Route21_North_MapBGEvents diff --git a/data/maps/Route21_South/events.inc b/data/maps/Route21_South/events.inc new file mode 100644 index 000000000..558743026 --- /dev/null +++ b/data/maps/Route21_South/events.inc @@ -0,0 +1,9 @@ +Route21_South_EventObjects: + object_event 1, 57, 0, 11, 0, 8, 0, 3, 10, 17, 0, 1, 0, 0, 0, Route21_South_EventScript_1AB9B3, 0, 0, 0 + object_event 2, 57, 0, 14, 0, 15, 0, 3, 9, 17, 0, 1, 0, 0, 0, Route21_South_EventScript_1ABA2F, 0, 0, 0 + object_event 3, 43, 0, 15, 0, 24, 0, 1, 14, 17, 0, 1, 0, 3, 0, Route21_South_EventScript_1ABAAB, 0, 0, 0 + object_event 4, 43, 0, 15, 0, 38, 0, 1, 9, 17, 0, 1, 0, 3, 0, Route21_South_EventScript_1ABAE9, 0, 0, 0 + object_event 5, 43, 0, 10, 0, 29, 0, 1, 2, 34, 0, 1, 0, 4, 0, Route21_South_EventScript_1ABB27, 0, 0, 0 + +Route21_South_MapEvents:: + map_events Route21_South_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/Route22/events.inc b/data/maps/Route22/events.inc new file mode 100644 index 000000000..76c259321 --- /dev/null +++ b/data/maps/Route22/events.inc @@ -0,0 +1,20 @@ +Route22_EventObjects: + object_event 1, 72, 0, 25, 0, 4, 0, 3, 10, 17, 0, 0, 0, 0, 0, 0x0, 79, 0, 0 + +Route22_MapWarps: + warp_def 8, 5, 0, 2, 7168 + warp_def 9, 5, 0, 2, 7168 + +Route22_MapCoordEvents: + coord_event 33, 4, 3, 0, 16468, 1, 0, Route22_EventScript_16828C + coord_event 33, 5, 3, 0, 16468, 1, 0, Route22_EventScript_168298 + coord_event 33, 6, 0, 0, 16468, 1, 0, Route22_EventScript_1682AB + coord_event 33, 4, 3, 0, 16468, 3, 0, Route22_EventScript_1683ED + coord_event 33, 5, 3, 0, 16468, 3, 0, Route22_EventScript_1683F9 + coord_event 33, 6, 0, 0, 16468, 3, 0, Route22_EventScript_16840C + +Route22_MapBGEvents: + bg_event 7, 12, 0, 0, 0, Route22_EventScript_1684E2 + +Route22_MapEvents:: + map_events Route22_EventObjects, Route22_MapWarps, Route22_MapCoordEvents, Route22_MapBGEvents diff --git a/data/maps/Route22_NorthEntrance/events.inc b/data/maps/Route22_NorthEntrance/events.inc new file mode 100644 index 000000000..1e37f8e7c --- /dev/null +++ b/data/maps/Route22_NorthEntrance/events.inc @@ -0,0 +1,14 @@ +Route22_NorthEntrance_EventObjects: + object_event 1, 60, 0, 8, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route22_NorthEntrance_EventScript_1704FC, 0, 0, 0 + +Route22_NorthEntrance_MapWarps: + warp_def 7, 1, 3, 2, 810 + warp_def 6, 10, 3, 0, 809 + warp_def 7, 10, 3, 0, 809 + warp_def 8, 10, 3, 0, 809 + +Route22_NorthEntrance_MapCoordEvents: + coord_event 7, 2, 3, 0, 16479, 0, 0, Route22_NorthEntrance_EventScript_17050D + +Route22_NorthEntrance_MapEvents:: + map_events Route22_NorthEntrance_EventObjects, Route22_NorthEntrance_MapWarps, Route22_NorthEntrance_MapCoordEvents, 0x0 diff --git a/data/maps/Route23/events.inc b/data/maps/Route23/events.inc new file mode 100644 index 000000000..1ae156d8f --- /dev/null +++ b/data/maps/Route23/events.inc @@ -0,0 +1,72 @@ +Route23_EventObjects: + object_event 1, 60, 0, 15, 0, 149, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route23_EventScript_16850C, 0, 0, 0 + object_event 2, 60, 0, 8, 0, 140, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route23_EventScript_16851D, 0, 0, 0 + object_event 3, 60, 0, 14, 0, 123, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route23_EventScript_16852E, 0, 0, 0 + object_event 4, 60, 0, 16, 0, 112, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route23_EventScript_16853F, 0, 0, 0 + object_event 5, 60, 0, 10, 0, 94, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route23_EventScript_168550, 0, 0, 0 + object_event 6, 60, 0, 14, 0, 61, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route23_EventScript_168561, 0, 0, 0 + object_event 7, 60, 0, 6, 0, 35, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route23_EventScript_168572, 0, 0, 0 + +Route23_MapWarps: + warp_def 5, 28, 3, 1, 295 + warp_def 18, 28, 3, 6, 296 + warp_def 8, 153, 3, 0, 7168 + warp_def 9, 154, 0, 0, 7168 + +Route23_MapCoordEvents: + coord_event 13, 149, 3, 0, 16479, 1, 0, Route23_EventScript_168583 + coord_event 7, 140, 3, 0, 16479, 2, 0, Route23_EventScript_168598 + coord_event 12, 123, 3, 0, 16479, 3, 0, Route23_EventScript_1685AD + coord_event 11, 111, 0, 0, 16479, 4, 0, Route23_EventScript_1685C2 + coord_event 9, 94, 1, 0, 16479, 5, 0, Route23_EventScript_1685D7 + coord_event 12, 61, 3, 0, 16479, 6, 0, Route23_EventScript_1685EC + coord_event 1, 35, 0, 0, 16479, 7, 0, Route23_EventScript_168601 + coord_event 1, 34, 0, 0, 16479, 7, 0, Route23_EventScript_168601 + coord_event 1, 32, 3, 0, 16479, 7, 0, Route23_EventScript_168601 + coord_event 1, 33, 0, 0, 16479, 7, 0, Route23_EventScript_168601 + coord_event 1, 31, 0, 0, 16479, 7, 0, Route23_EventScript_168601 + coord_event 1, 36, 0, 0, 16479, 7, 0, Route23_EventScript_168601 + coord_event 5, 35, 3, 0, 16479, 7, 0, Route23_EventScript_168601 + coord_event 4, 35, 3, 0, 16479, 7, 0, Route23_EventScript_168601 + coord_event 10, 60, 0, 0, 16479, 6, 0, Route23_EventScript_1685EC + coord_event 13, 61, 3, 0, 16479, 6, 0, Route23_EventScript_1685EC + coord_event 11, 60, 0, 0, 16479, 6, 0, Route23_EventScript_1685EC + coord_event 8, 94, 1, 0, 16479, 5, 0, Route23_EventScript_1685D7 + coord_event 5, 92, 1, 0, 16479, 5, 0, Route23_EventScript_1685D7 + coord_event 7, 94, 1, 0, 16479, 5, 0, Route23_EventScript_1685D7 + coord_event 4, 92, 1, 0, 16479, 5, 0, Route23_EventScript_1685D7 + coord_event 3, 92, 1, 0, 16479, 5, 0, Route23_EventScript_1685D7 + coord_event 2, 92, 1, 0, 16479, 5, 0, Route23_EventScript_1685D7 + coord_event 4, 139, 0, 0, 16479, 2, 0, Route23_EventScript_168598 + coord_event 5, 139, 0, 0, 16479, 2, 0, Route23_EventScript_168598 + coord_event 6, 140, 3, 0, 16479, 2, 0, Route23_EventScript_168598 + coord_event 10, 122, 0, 0, 16479, 3, 0, Route23_EventScript_1685AD + coord_event 11, 122, 0, 0, 16479, 3, 0, Route23_EventScript_1685AD + coord_event 13, 123, 3, 0, 16479, 3, 0, Route23_EventScript_1685AD + coord_event 8, 109, 1, 0, 16479, 4, 0, Route23_EventScript_1685C2 + coord_event 9, 109, 1, 0, 16479, 4, 0, Route23_EventScript_1685C2 + coord_event 10, 109, 1, 0, 16479, 4, 0, Route23_EventScript_1685C2 + coord_event 11, 109, 1, 0, 16479, 4, 0, Route23_EventScript_1685C2 + coord_event 12, 109, 1, 0, 16479, 4, 0, Route23_EventScript_1685C2 + coord_event 12, 111, 0, 0, 16479, 4, 0, Route23_EventScript_1685C2 + coord_event 14, 112, 1, 0, 16479, 4, 0, Route23_EventScript_1685C2 + coord_event 13, 112, 1, 0, 16479, 4, 0, Route23_EventScript_1685C2 + coord_event 15, 112, 1, 0, 16479, 4, 0, Route23_EventScript_1685C2 + coord_event 12, 148, 0, 0, 16479, 1, 0, Route23_EventScript_168583 + coord_event 11, 148, 0, 0, 16479, 1, 0, Route23_EventScript_168583 + coord_event 14, 149, 3, 0, 16479, 1, 0, Route23_EventScript_168583 + coord_event 10, 148, 0, 0, 16479, 1, 0, Route23_EventScript_168583 + +Route23_MapBGEvents: + bg_event 19, 42, 0, 7, 0, 19, 34, 1 + bg_event 20, 72, 0, 7, 0, 2, 35, 1 + bg_event 11, 101, 3, 7, 0, 35, 36, 1 + bg_event 3, 18, 3, 7, 0, 141, 145, 1 + bg_event 2, 29, 3, 7, 0, 142, 146, 1 + bg_event 10, 67, 3, 7, 0, 137, 147, 1 + bg_event 3, 128, 3, 7, 0, 138, 148, 1 + bg_event 9, 8, 3, 7, 0, 37, 155, 1 + bg_event 3, 31, 0, 0, 0, Route23_EventScript_168616 + +Route23_MapEvents:: + map_events Route23_EventObjects, Route23_MapWarps, Route23_MapCoordEvents, Route23_MapBGEvents diff --git a/data/maps/Route24/events.inc b/data/maps/Route24/events.inc new file mode 100644 index 000000000..701cc2b25 --- /dev/null +++ b/data/maps/Route24/events.inc @@ -0,0 +1,19 @@ +Route24_EventObjects: + object_event 1, 25, 0, 12, 0, 15, 0, 3, 9, 17, 0, 0, 0, 0, 0, Route24_EventScript_168620, 49, 0, 0 + object_event 2, 39, 0, 12, 0, 19, 0, 3, 9, 17, 0, 1, 0, 2, 0, Route24_EventScript_1A972D, 0, 0, 0 + object_event 3, 22, 0, 10, 0, 22, 0, 3, 10, 17, 0, 1, 0, 2, 0, Route24_EventScript_1A9673, 0, 0, 0 + object_event 4, 18, 0, 12, 0, 25, 0, 3, 9, 17, 0, 1, 0, 2, 0, Route24_EventScript_1A95F7, 0, 0, 0 + object_event 5, 22, 0, 10, 0, 28, 0, 3, 10, 17, 0, 1, 0, 2, 0, Route24_EventScript_1A96B1, 0, 0, 0 + object_event 6, 20, 0, 12, 0, 31, 0, 3, 9, 17, 0, 1, 0, 2, 0, Route24_EventScript_1A9635, 0, 0, 0 + object_event 7, 39, 0, 5, 0, 21, 0, 3, 7, 17, 0, 1, 0, 5, 0, Route24_EventScript_1A96EF, 0, 0, 0 + object_event 8, 92, 0, 11, 0, 4, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route24_EventScript_1BE644, 354, 0, 0 + +Route24_MapCoordEvents: + coord_event 10, 15, 3, 0, 16491, 0, 0, Route24_EventScript_168660 + coord_event 11, 15, 3, 0, 16491, 0, 0, Route24_EventScript_16866C + +Route24_MapBGEvents: + bg_event 19, 4, 3, 7, 0, 135, 115, 1 + +Route24_MapEvents:: + map_events Route24_EventObjects, 0x0, Route24_MapCoordEvents, Route24_MapBGEvents diff --git a/data/maps/Route25/events.inc b/data/maps/Route25/events.inc new file mode 100644 index 000000000..e4085c154 --- /dev/null +++ b/data/maps/Route25/events.inc @@ -0,0 +1,27 @@ +Route25_EventObjects: + object_event 1, 56, 0, 11, 0, 4, 0, 3, 10, 17, 0, 1, 0, 4, 0, Route25_EventScript_1A98A1, 0, 0, 0 + object_event 2, 18, 0, 18, 0, 2, 0, 3, 8, 17, 0, 1, 0, 2, 0, Route25_EventScript_1A976B, 0, 0, 0 + object_event 3, 56, 0, 17, 0, 7, 0, 3, 10, 17, 0, 1, 0, 2, 0, Route25_EventScript_1A991D, 0, 0, 0 + object_event 4, 18, 0, 22, 0, 4, 0, 3, 1, 17, 0, 1, 0, 2, 0, Route25_EventScript_1A97A9, 0, 0, 0 + object_event 5, 40, 0, 22, 0, 8, 0, 3, 10, 17, 0, 1, 0, 2, 0, Route25_EventScript_1A9825, 0, 0, 0 + object_event 6, 56, 0, 27, 0, 9, 0, 3, 7, 17, 0, 1, 0, 3, 0, Route25_EventScript_1A98DF, 0, 0, 0 + object_event 7, 39, 0, 28, 0, 4, 0, 3, 8, 17, 0, 1, 0, 3, 0, Route25_EventScript_1A995B, 0, 0, 0 + object_event 8, 18, 0, 36, 0, 4, 0, 3, 26, 49, 0, 1, 0, 2, 0, Route25_EventScript_1A97E7, 0, 0, 0 + object_event 9, 22, 0, 42, 0, 5, 0, 3, 8, 17, 0, 1, 0, 3, 0, Route25_EventScript_1A9863, 0, 0, 0 + object_event 10, 92, 0, 26, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route25_EventScript_1BE651, 355, 0, 0 + object_event 11, 95, 0, 30, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route25_EventScript_1BDF13, 18, 0, 0 + object_event 12, 29, 0, 49, 0, 10, 0, 3, 9, 17, 0, 0, 0, 0, 0, Route25_EventScript_1ACE4F, 0, 0, 0 + object_event 13, 25, 0, 49, 0, 11, 0, 3, 9, 17, 0, 0, 0, 0, 0, Route25_EventScript_16874F, 0, 0, 0 + +Route25_MapWarps: + warp_def 51, 4, 0, 1, 7680 + +Route25_MapBGEvents: + bg_event 48, 4, 0, 0, 0, Route25_EventScript_168746 + bg_event 14, 2, 3, 7, 0, 36, 4, 1 + bg_event 58, 6, 3, 7, 0, 34, 5, 1 + bg_event 33, 8, 3, 7, 0, 139, 116, 1 + bg_event 40, 3, 3, 7, 0, 149, 117, 1 + +Route25_MapEvents:: + map_events Route25_EventObjects, Route25_MapWarps, 0x0, Route25_MapBGEvents diff --git a/data/maps/Route25_SeaCottage/events.inc b/data/maps/Route25_SeaCottage/events.inc new file mode 100644 index 000000000..e7a6f4a9c --- /dev/null +++ b/data/maps/Route25_SeaCottage/events.inc @@ -0,0 +1,14 @@ +Route25_SeaCottage_EventObjects: + object_event 1, 73, 0, 7, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route25_SeaCottage_EventScript_17054B, 51, 0, 0 + object_event 2, 113, 0, 10, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route25_SeaCottage_EventScript_17054B, 50, 0, 0 + +Route25_SeaCottage_MapWarps: + warp_def 6, 9, 3, 0, 812 + warp_def 7, 9, 3, 0, 812 + warp_def 8, 9, 3, 0, 812 + +Route25_SeaCottage_MapBGEvents: + bg_event 4, 5, 0, 1, 0, Route25_SeaCottage_EventScript_1706DD + +Route25_SeaCottage_MapEvents:: + map_events Route25_SeaCottage_EventObjects, Route25_SeaCottage_MapWarps, 0x0, Route25_SeaCottage_MapBGEvents diff --git a/data/maps/Route2_EastBuilding/events.inc b/data/maps/Route2_EastBuilding/events.inc new file mode 100644 index 000000000..c50a03aad --- /dev/null +++ b/data/maps/Route2_EastBuilding/events.inc @@ -0,0 +1,12 @@ +Route2_EastBuilding_EventObjects: + object_event 1, 55, 0, 4, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route2_EastBuilding_EventScript_16F67F, 0, 0, 0 + object_event 2, 26, 0, 10, 0, 3, 0, 3, 5, 18, 0, 0, 0, 0, 0, Route2_EastBuilding_EventScript_16F714, 0, 0, 0 + +Route2_EastBuilding_MapWarps: + warp_def 6, 10, 0, 5, 788 + warp_def 7, 10, 3, 5, 788 + warp_def 8, 10, 3, 5, 788 + warp_def 7, 1, 3, 6, 788 + +Route2_EastBuilding_MapEvents:: + map_events Route2_EastBuilding_EventObjects, Route2_EastBuilding_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route2_House/events.inc b/data/maps/Route2_House/events.inc new file mode 100644 index 000000000..e6f06bc09 --- /dev/null +++ b/data/maps/Route2_House/events.inc @@ -0,0 +1,11 @@ +Route2_House_EventObjects: + object_event 1, 55, 0, 4, 0, 5, 0, 3, 10, 17, 0, 0, 0, 0, 0, Route2_House_EventScript_16F5F9, 0, 0, 0 + object_event 2, 51, 0, 7, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route2_House_EventScript_16F602, 0, 0, 0 + +Route2_House_MapWarps: + warp_def 3, 7, 0, 4, 788 + warp_def 4, 7, 0, 4, 788 + warp_def 5, 7, 0, 4, 788 + +Route2_House_MapEvents:: + map_events Route2_House_EventObjects, Route2_House_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route2_ViridianForest_NorthEntrance/events.inc b/data/maps/Route2_ViridianForest_NorthEntrance/events.inc new file mode 100644 index 000000000..f7baf4e08 --- /dev/null +++ b/data/maps/Route2_ViridianForest_NorthEntrance/events.inc @@ -0,0 +1,13 @@ +Route2_ViridianForest_NorthEntrance_EventObjects: + object_event 1, 18, 0, 5, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route2_ViridianForest_NorthEntrance_EventScript_16F71E, 0, 0, 0 + object_event 2, 32, 0, 4, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route2_ViridianForest_NorthEntrance_EventScript_16F727, 0, 0, 0 + object_event 3, 42, 0, 10, 0, 5, 0, 3, 10, 17, 0, 0, 0, 0, 0, Route2_ViridianForest_NorthEntrance_EventScript_16F730, 0, 0, 0 + +Route2_ViridianForest_NorthEntrance_MapWarps: + warp_def 6, 10, 3, 2, 256 + warp_def 7, 10, 3, 2, 256 + warp_def 8, 10, 3, 2, 256 + warp_def 7, 1, 3, 0, 788 + +Route2_ViridianForest_NorthEntrance_MapEvents:: + map_events Route2_ViridianForest_NorthEntrance_EventObjects, Route2_ViridianForest_NorthEntrance_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route2_ViridianForest_SouthEntrance/events.inc b/data/maps/Route2_ViridianForest_SouthEntrance/events.inc new file mode 100644 index 000000000..1011b52a7 --- /dev/null +++ b/data/maps/Route2_ViridianForest_SouthEntrance/events.inc @@ -0,0 +1,12 @@ +Route2_ViridianForest_SouthEntrance_EventObjects: + object_event 1, 28, 0, 10, 0, 6, 0, 3, 9, 17, 0, 0, 0, 0, 0, Route2_ViridianForest_SouthEntrance_EventScript_16F5E6, 0, 0, 0 + object_event 2, 23, 0, 4, 0, 7, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route2_ViridianForest_SouthEntrance_EventScript_16F5EF, 0, 0, 0 + +Route2_ViridianForest_SouthEntrance_MapWarps: + warp_def 6, 10, 3, 2, 788 + warp_def 7, 10, 3, 2, 788 + warp_def 8, 10, 3, 2, 788 + warp_def 7, 1, 3, 0, 256 + +Route2_ViridianForest_SouthEntrance_MapEvents:: + map_events Route2_ViridianForest_SouthEntrance_EventObjects, Route2_ViridianForest_SouthEntrance_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route3/events.inc b/data/maps/Route3/events.inc new file mode 100644 index 000000000..9328d0926 --- /dev/null +++ b/data/maps/Route3/events.inc @@ -0,0 +1,17 @@ +Route3_EventObjects: + object_event 1, 18, 0, 70, 0, 13, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route3_EventScript_167F78, 0, 0, 0 + object_event 2, 22, 0, 40, 0, 11, 0, 3, 3, 17, 0, 1, 0, 3, 0, Route3_EventScript_1A957B, 0, 0, 0 + object_event 3, 20, 0, 32, 0, 6, 0, 3, 10, 17, 0, 1, 0, 4, 0, Route3_EventScript_1A94C1, 0, 0, 0 + object_event 4, 22, 0, 30, 0, 3, 0, 3, 9, 17, 0, 1, 0, 5, 0, Route3_EventScript_1A953D, 0, 0, 0 + object_event 5, 20, 0, 25, 0, 4, 0, 3, 8, 17, 0, 1, 0, 2, 0, Route3_EventScript_1A9483, 0, 0, 0 + object_event 6, 18, 0, 29, 0, 10, 0, 3, 9, 17, 0, 1, 0, 5, 0, Route3_EventScript_1A9407, 0, 0, 0 + object_event 7, 22, 0, 19, 0, 9, 0, 3, 9, 17, 0, 1, 0, 5, 0, Route3_EventScript_1A94FF, 0, 0, 0 + object_event 8, 20, 0, 12, 0, 6, 0, 3, 10, 17, 0, 1, 0, 3, 0, Route3_EventScript_1A9445, 0, 0, 0 + object_event 9, 18, 0, 17, 0, 4, 0, 3, 8, 17, 0, 1, 0, 2, 0, Route3_EventScript_1A93C9, 0, 0, 0 + +Route3_MapBGEvents: + bg_event 72, 11, 0, 0, 0, Route3_EventScript_167F81 + bg_event 26, 9, 3, 7, 0, 139, 113, 1 + +Route3_MapEvents:: + map_events Route3_EventObjects, 0x0, 0x0, Route3_MapBGEvents diff --git a/data/maps/Route4/events.inc b/data/maps/Route4/events.inc new file mode 100644 index 000000000..812193ff7 --- /dev/null +++ b/data/maps/Route4/events.inc @@ -0,0 +1,23 @@ +Route4_EventObjects: + object_event 1, 23, 0, 9, 0, 8, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route4_EventScript_167F8C, 0, 0, 0 + object_event 2, 22, 0, 75, 0, 3, 0, 3, 10, 17, 0, 1, 0, 4, 0, Route4_EventScript_1A95B9, 0, 0, 0 + object_event 3, 92, 0, 67, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route4_EventScript_1BE637, 353, 0, 0 + object_event 4, 19, 0, 15, 0, 14, 0, 3, 5, 17, 0, 0, 0, 0, 0, Route4_EventScript_1ACDEA, 0, 0, 0 + object_event 5, 54, 0, 47, 0, 3, 0, 3, 10, 17, 0, 0, 0, 0, 0, Route4_EventScript_1C494E, 0, 0, 0 + object_event 6, 54, 0, 50, 0, 3, 0, 3, 9, 17, 0, 0, 0, 0, 0, Route4_EventScript_1C49B6, 0, 0, 0 + object_event 7, 65321, 0, 109, 0, 3, 0, 12, 0, 0, 0, 3, 0, 3, 0, 0x0, 0, 0, 0 + +Route4_MapWarps: + warp_def 19, 5, 3, 3, 257 + warp_def 32, 5, 0, 7, 258 + warp_def 12, 5, 0, 1, 4096 + +Route4_MapBGEvents: + bg_event 18, 7, 0, 0, 0, Route4_EventScript_167F95 + bg_event 34, 7, 0, 0, 0, Route4_EventScript_167F9E + bg_event 43, 2, 3, 7, 0, 3, 50, 1 + bg_event 5, 4, 3, 7, 0, 140, 114, 1 + bg_event 67, 17, 3, 7, 0, 148, 156, 1 + +Route4_MapEvents:: + map_events Route4_EventObjects, Route4_MapWarps, 0x0, Route4_MapBGEvents diff --git a/data/maps/Route4_PokemonCenter_1F/events.inc b/data/maps/Route4_PokemonCenter_1F/events.inc new file mode 100644 index 000000000..8e00de94c --- /dev/null +++ b/data/maps/Route4_PokemonCenter_1F/events.inc @@ -0,0 +1,16 @@ +Route4_PokemonCenter_1F_EventObjects: + object_event 1, 64, 0, 7, 0, 2, 0, 0, 8, 17, 0, 0, 0, 0, 0, Route4_PokemonCenter_1F_EventScript_16F8BB, 0, 0, 0 + object_event 2, 30, 0, 1, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route4_PokemonCenter_1F_EventScript_16F75F, 0, 0, 0 + object_event 3, 61, 0, 12, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route4_PokemonCenter_1F_EventScript_16F754, 0, 0, 0 + object_event 4, 19, 0, 5, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route4_PokemonCenter_1F_EventScript_16F74B, 0, 0, 0 + object_event 5, 18, 0, 14, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route4_PokemonCenter_1F_EventScript_16F8C4, 0, 0, 0 + object_event 6, 105, 0, 12, 0, 6, 0, 0, 8, 17, 0, 0, 0, 0, 0, Route4_PokemonCenter_1F_EventScript_16F8CD, 0, 0, 0 + +Route4_PokemonCenter_1F_MapWarps: + warp_def 6, 8, 3, 2, 790 + warp_def 7, 8, 3, 2, 790 + warp_def 8, 8, 3, 2, 790 + warp_def 1, 6, 4, 0, 4097 + +Route4_PokemonCenter_1F_MapEvents:: + map_events Route4_PokemonCenter_1F_EventObjects, Route4_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route4_PokemonCenter_2F/events.inc b/data/maps/Route4_PokemonCenter_2F/events.inc new file mode 100644 index 000000000..0a78cdf65 --- /dev/null +++ b/data/maps/Route4_PokemonCenter_2F/events.inc @@ -0,0 +1,13 @@ +Route4_PokemonCenter_2F_EventObjects: + object_event 1, 65, 0, 6, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route4_PokemonCenter_2F_EventScript_1A8CF6, 0, 0, 0 + object_event 2, 65, 0, 2, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route4_PokemonCenter_2F_EventScript_1A8CFC, 0, 0, 0 + object_event 3, 65, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route4_PokemonCenter_2F_EventScript_1A8D02, 0, 0, 0 + object_event 4, 69, 0, 1, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route4_PokemonCenter_2F_EventScript_1BB1D2, 112, 0, 0 + +Route4_PokemonCenter_2F_MapWarps: + warp_def 1, 6, 4, 3, 4096 + warp_def 5, 1, 0, 0, 4 + warp_def 9, 1, 0, 0, 1 + +Route4_PokemonCenter_2F_MapEvents:: + map_events Route4_PokemonCenter_2F_EventObjects, Route4_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route5/events.inc b/data/maps/Route5/events.inc new file mode 100644 index 000000000..3b136630c --- /dev/null +++ b/data/maps/Route5/events.inc @@ -0,0 +1,11 @@ +Route5_MapWarps: + warp_def 31, 31, 0, 1, 286 + warp_def 23, 25, 0, 1, 4352 + warp_def 24, 32, 3, 1, 4353 + warp_def 25, 32, 3, 1, 4353 + +Route5_MapBGEvents: + bg_event 32, 32, 0, 0, 0, Route5_EventScript_167FA8 + +Route5_MapEvents:: + map_events 0x0, Route5_MapWarps, 0x0, Route5_MapBGEvents diff --git a/data/maps/Route5_PokemonDayCare/events.inc b/data/maps/Route5_PokemonDayCare/events.inc new file mode 100644 index 000000000..ac1bce238 --- /dev/null +++ b/data/maps/Route5_PokemonDayCare/events.inc @@ -0,0 +1,10 @@ +Route5_PokemonDayCare_EventObjects: + object_event 1, 61, 0, 4, 0, 4, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route5_PokemonDayCare_EventScript_1BF398, 0, 0, 0 + +Route5_PokemonDayCare_MapWarps: + warp_def 3, 7, 0, 1, 791 + warp_def 4, 7, 0, 1, 791 + warp_def 5, 7, 0, 1, 791 + +Route5_PokemonDayCare_MapEvents:: + map_events Route5_PokemonDayCare_EventObjects, Route5_PokemonDayCare_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route5_SouthEntrance/events.inc b/data/maps/Route5_SouthEntrance/events.inc new file mode 100644 index 000000000..a1ef1e12f --- /dev/null +++ b/data/maps/Route5_SouthEntrance/events.inc @@ -0,0 +1,16 @@ +Route5_SouthEntrance_EventObjects: + object_event 1, 60, 0, 1, 0, 5, 0, 3, 10, 17, 0, 0, 0, 0, 0, Route5_SouthEntrance_EventScript_16F901, 0, 0, 0 + +Route5_SouthEntrance_MapWarps: + warp_def 3, 9, 3, 9, 778 + warp_def 4, 1, 3, 2, 791 + warp_def 4, 9, 3, 9, 778 + warp_def 5, 1, 0, 3, 791 + +Route5_SouthEntrance_MapCoordEvents: + coord_event 3, 5, 3, 0, 16482, 0, 0, Route5_SouthEntrance_EventScript_16F90A + coord_event 4, 5, 3, 0, 16482, 0, 0, Route5_SouthEntrance_EventScript_16F916 + coord_event 5, 5, 3, 0, 16482, 0, 0, Route5_SouthEntrance_EventScript_16F922 + +Route5_SouthEntrance_MapEvents:: + map_events Route5_SouthEntrance_EventObjects, Route5_SouthEntrance_MapWarps, Route5_SouthEntrance_MapCoordEvents, 0x0 diff --git a/data/maps/Route6/events.inc b/data/maps/Route6/events.inc new file mode 100644 index 000000000..a6ff2b010 --- /dev/null +++ b/data/maps/Route6/events.inc @@ -0,0 +1,20 @@ +Route6_EventObjects: + object_event 1, 20, 0, 3, 0, 16, 0, 3, 10, 17, 0, 1, 0, 5, 0, Route6_EventScript_1A9999, 0, 0, 0 + object_event 2, 39, 0, 12, 0, 21, 0, 3, 10, 17, 0, 1, 0, 0, 0, Route6_EventScript_1A9A15, 0, 0, 0 + object_event 3, 40, 0, 13, 0, 21, 0, 3, 9, 17, 0, 1, 0, 0, 0, Route6_EventScript_1A9A91, 0, 0, 0 + object_event 4, 20, 0, 20, 0, 25, 0, 3, 9, 17, 0, 1, 0, 3, 0, Route6_EventScript_1A99D7, 0, 0, 0 + object_event 5, 40, 0, 13, 0, 32, 0, 3, 9, 17, 0, 1, 0, 3, 0, Route6_EventScript_1A9ACF, 0, 0, 0 + object_event 6, 39, 0, 13, 0, 33, 0, 3, 9, 17, 0, 1, 0, 3, 0, Route6_EventScript_1A9A53, 0, 0, 0 + +Route6_MapWarps: + warp_def 19, 13, 0, 1, 288 + warp_def 12, 5, 3, 2, 4608 + warp_def 13, 5, 3, 2, 4608 + +Route6_MapBGEvents: + bg_event 21, 15, 0, 0, 0, Route6_EventScript_167FB2 + bg_event 5, 5, 3, 7, 0, 142, 118, 1 + bg_event 19, 5, 3, 7, 0, 68, 119, 1 + +Route6_MapEvents:: + map_events Route6_EventObjects, Route6_MapWarps, 0x0, Route6_MapBGEvents diff --git a/data/maps/Route6_NorthEntrance/events.inc b/data/maps/Route6_NorthEntrance/events.inc new file mode 100644 index 000000000..c6b34841e --- /dev/null +++ b/data/maps/Route6_NorthEntrance/events.inc @@ -0,0 +1,16 @@ +Route6_NorthEntrance_EventObjects: + object_event 1, 60, 0, 7, 0, 5, 0, 3, 9, 17, 0, 0, 0, 0, 0, Route6_NorthEntrance_EventScript_16F9C7, 0, 0, 0 + +Route6_NorthEntrance_MapWarps: + warp_def 4, 1, 0, 11, 778 + warp_def 5, 1, 0, 11, 778 + warp_def 4, 9, 3, 1, 792 + warp_def 5, 9, 3, 1, 792 + +Route6_NorthEntrance_MapCoordEvents: + coord_event 3, 5, 3, 0, 16482, 0, 0, Route6_NorthEntrance_EventScript_16F9D0 + coord_event 4, 5, 3, 0, 16482, 0, 0, Route6_NorthEntrance_EventScript_16F9DC + coord_event 5, 5, 3, 0, 16482, 0, 0, Route6_NorthEntrance_EventScript_16F9E8 + +Route6_NorthEntrance_MapEvents:: + map_events Route6_NorthEntrance_EventObjects, Route6_NorthEntrance_MapWarps, Route6_NorthEntrance_MapCoordEvents, 0x0 diff --git a/data/maps/Route7/events.inc b/data/maps/Route7/events.inc new file mode 100644 index 000000000..a394e8394 --- /dev/null +++ b/data/maps/Route7/events.inc @@ -0,0 +1,13 @@ +Route7_EventObjects: + object_event 1, 65375, 0, 248, 255, 12, 0, 10, 0, 0, 0, 6, 0, 3, 0, 0x0, 0, 0, 0 + +Route7_MapWarps: + warp_def 7, 14, 0, 1, 289 + warp_def 15, 10, 3, 0, 4864 + +Route7_MapBGEvents: + bg_event 5, 14, 0, 0, 0, Route7_EventScript_167FBC + bg_event 16, 15, 3, 7, 0, 151, 152, 1 + +Route7_MapEvents:: + map_events Route7_EventObjects, Route7_MapWarps, 0x0, Route7_MapBGEvents diff --git a/data/maps/Route7_EastEntrance/events.inc b/data/maps/Route7_EastEntrance/events.inc new file mode 100644 index 000000000..8c7b7a30f --- /dev/null +++ b/data/maps/Route7_EastEntrance/events.inc @@ -0,0 +1,16 @@ +Route7_EastEntrance_EventObjects: + object_event 1, 60, 0, 6, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route7_EastEntrance_EventScript_16FA8E, 0, 0, 0 + +Route7_EastEntrance_MapWarps: + warp_def 1, 5, 3, 1, 793 + warp_def 1, 6, 3, 1, 793 + warp_def 11, 5, 3, 8, 778 + warp_def 11, 6, 3, 8, 778 + +Route7_EastEntrance_MapCoordEvents: + coord_event 6, 4, 3, 0, 16482, 0, 0, Route7_EastEntrance_EventScript_16FA97 + coord_event 6, 5, 3, 0, 16482, 0, 0, Route7_EastEntrance_EventScript_16FAA3 + coord_event 6, 6, 3, 0, 16482, 0, 0, Route7_EastEntrance_EventScript_16FAAF + +Route7_EastEntrance_MapEvents:: + map_events Route7_EastEntrance_EventObjects, Route7_EastEntrance_MapWarps, Route7_EastEntrance_MapCoordEvents, 0x0 diff --git a/data/maps/Route8/events.inc b/data/maps/Route8/events.inc new file mode 100644 index 000000000..7492f0cda --- /dev/null +++ b/data/maps/Route8/events.inc @@ -0,0 +1,29 @@ +Route8_EventObjects: + object_event 1, 22, 0, 62, 0, 14, 0, 3, 9, 17, 0, 1, 0, 6, 0, Route8_EventScript_1AA1D5, 0, 0, 0 + object_event 2, 32, 0, 55, 0, 15, 0, 3, 8, 17, 0, 1, 0, 3, 0, Route8_EventScript_1AA30B, 0, 0, 0 + object_event 3, 55, 0, 51, 0, 6, 0, 3, 1, 17, 0, 1, 0, 4, 0, Route8_EventScript_1AA251, 0, 0, 0 + object_event 4, 22, 0, 29, 0, 3, 0, 3, 9, 17, 0, 1, 0, 3, 0, Route8_EventScript_1AA11B, 0, 0, 0 + object_event 5, 55, 0, 29, 0, 4, 0, 3, 10, 17, 0, 1, 0, 6, 0, Route8_EventScript_1AA28F, 0, 0, 0 + object_event 6, 22, 0, 29, 0, 5, 0, 3, 9, 17, 0, 1, 0, 3, 0, Route8_EventScript_1AA159, 0, 0, 0 + object_event 7, 22, 0, 29, 0, 6, 0, 3, 10, 17, 0, 1, 0, 6, 0, Route8_EventScript_1AA197, 0, 0, 0 + object_event 8, 32, 0, 21, 0, 3, 0, 3, 1, 17, 0, 1, 0, 1, 0, Route8_EventScript_1AA2CD, 0, 0, 0 + object_event 9, 55, 0, 9, 0, 6, 0, 3, 10, 17, 0, 1, 0, 4, 0, Route8_EventScript_1AA213, 0, 0, 0 + object_event 10, 95, 0, 33, 0, 15, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route8_EventScript_1BDF13, 18, 0, 0 + object_event 11, 95, 0, 47, 0, 12, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route8_EventScript_1BDF13, 19, 0, 0 + object_event 12, 17, 0, 40, 0, 3, 0, 3, 8, 17, 0, 1, 0, 1, 0, Route8_EventScript_1AA349, 0, 0, 0 + object_event 13, 17, 0, 41, 0, 3, 0, 3, 8, 17, 0, 1, 0, 1, 0, Route8_EventScript_1AA38F, 0, 0, 0 + object_event 14, 53, 0, 14, 0, 16, 0, 3, 52, 37, 0, 1, 0, 1, 0, Route8_EventScript_1AA3D5, 0, 0, 0 + object_event 15, 53, 0, 24, 0, 17, 0, 3, 41, 85, 0, 1, 0, 1, 0, Route8_EventScript_1AA413, 0, 0, 0 + +Route8_MapWarps: + warp_def 13, 4, 0, 1, 291 + warp_def 7, 10, 3, 2, 5120 + +Route8_MapBGEvents: + bg_event 16, 5, 0, 0, 0, Route8_EventScript_167FC6 + bg_event 42, 10, 3, 7, 0, 136, 127, 1 + bg_event 38, 11, 3, 7, 0, 141, 128, 1 + bg_event 42, 15, 3, 7, 0, 138, 129, 1 + +Route8_MapEvents:: + map_events Route8_EventObjects, Route8_MapWarps, 0x0, Route8_MapBGEvents diff --git a/data/maps/Route8_WestEntrance/events.inc b/data/maps/Route8_WestEntrance/events.inc new file mode 100644 index 000000000..1352ddb0c --- /dev/null +++ b/data/maps/Route8_WestEntrance/events.inc @@ -0,0 +1,16 @@ +Route8_WestEntrance_EventObjects: + object_event 1, 60, 0, 6, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route8_WestEntrance_EventScript_16FB54, 0, 0, 0 + +Route8_WestEntrance_MapWarps: + warp_def 1, 4, 3, 10, 778 + warp_def 1, 5, 3, 10, 778 + warp_def 11, 5, 3, 1, 794 + warp_def 11, 6, 3, 1, 794 + +Route8_WestEntrance_MapCoordEvents: + coord_event 6, 4, 3, 0, 16482, 0, 0, Route8_WestEntrance_EventScript_16FB5D + coord_event 6, 5, 3, 0, 16482, 0, 0, Route8_WestEntrance_EventScript_16FB69 + coord_event 6, 6, 3, 0, 16482, 0, 0, Route8_WestEntrance_EventScript_16FB75 + +Route8_WestEntrance_MapEvents:: + map_events Route8_WestEntrance_EventObjects, Route8_WestEntrance_MapWarps, Route8_WestEntrance_MapCoordEvents, 0x0 diff --git a/data/maps/Route9/events.inc b/data/maps/Route9/events.inc new file mode 100644 index 000000000..3e027e71b --- /dev/null +++ b/data/maps/Route9/events.inc @@ -0,0 +1,22 @@ +Route9_EventObjects: + object_event 1, 40, 0, 14, 0, 10, 0, 3, 9, 17, 0, 1, 0, 3, 0, Route9_EventScript_1A9E71, 0, 0, 0 + object_event 2, 56, 0, 20, 0, 17, 0, 3, 15, 17, 0, 1, 0, 4, 0, Route9_EventScript_1A9F69, 0, 0, 0 + object_event 3, 56, 0, 61, 0, 16, 0, 3, 8, 17, 0, 1, 0, 1, 0, Route9_EventScript_1A9EED, 0, 0, 0 + object_event 4, 39, 0, 26, 0, 7, 0, 3, 1, 17, 0, 1, 0, 3, 0, Route9_EventScript_1A9DF5, 0, 0, 0 + object_event 5, 20, 0, 26, 0, 1, 0, 3, 8, 17, 0, 1, 0, 2, 0, Route9_EventScript_1A9D79, 0, 0, 0 + object_event 6, 20, 0, 49, 0, 7, 0, 3, 10, 17, 0, 1, 0, 3, 0, Route9_EventScript_1A9DB7, 0, 0, 0 + object_event 7, 56, 0, 53, 0, 2, 0, 3, 5, 19, 0, 1, 0, 1, 0, Route9_EventScript_1A9F2B, 0, 0, 0 + object_event 8, 40, 0, 60, 0, 9, 0, 3, 10, 17, 0, 1, 0, 4, 0, Route9_EventScript_1A9EAF, 0, 0, 0 + object_event 9, 39, 0, 36, 0, 6, 0, 3, 10, 17, 0, 1, 0, 5, 0, Route9_EventScript_1A9E33, 0, 0, 0 + object_event 10, 95, 0, 2, 0, 8, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route9_EventScript_1BDF13, 18, 0, 0 + object_event 11, 92, 0, 12, 0, 17, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route9_EventScript_1BE6B9, 363, 0, 0 + object_event 12, 92, 0, 65, 0, 17, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route9_EventScript_1BEAFD, 450, 0, 0 + +Route9_MapBGEvents: + bg_event 29, 7, 0, 0, 0, Route9_EventScript_167FD0 + bg_event 15, 7, 0, 7, 0, 34, 6, 1 + bg_event 63, 2, 3, 7, 0, 68, 123, 1 + bg_event 48, 2, 3, 7, 0, 134, 150, 1 + +Route9_MapEvents:: + map_events Route9_EventObjects, 0x0, 0x0, Route9_MapBGEvents diff --git a/data/maps/SSAnne_1F_Corridor/events.inc b/data/maps/SSAnne_1F_Corridor/events.inc new file mode 100644 index 000000000..b14b6eb29 --- /dev/null +++ b/data/maps/SSAnne_1F_Corridor/events.inc @@ -0,0 +1,21 @@ +SSAnne_1F_Corridor_EventObjects: + object_event 1, 62, 0, 18, 0, 8, 0, 3, 7, 17, 0, 0, 0, 0, 0, SSAnne_1F_Corridor_EventScript_1608D5, 0, 0, 0 + object_event 2, 47, 0, 12, 0, 9, 0, 3, 8, 17, 0, 0, 0, 0, 0, SSAnne_1F_Corridor_EventScript_1608CC, 0, 0, 0 + +SSAnne_1F_Corridor_MapWarps: + warp_def 3, 8, 3, 0, 262 + warp_def 2, 18, 3, 0, 266 + warp_def 19, 1, 3, 2, 260 + warp_def 20, 0, 0, 3, 260 + warp_def 3, 20, 0, 0, 266 + warp_def 28, 17, 3, 0, 264 + warp_def 5, 10, 3, 0, 268 + warp_def 8, 10, 3, 0, 269 + warp_def 11, 10, 3, 0, 270 + warp_def 14, 10, 3, 0, 271 + warp_def 17, 10, 3, 0, 272 + warp_def 23, 10, 3, 0, 273 + warp_def 20, 10, 3, 0, 285 + +SSAnne_1F_Corridor_MapEvents:: + map_events SSAnne_1F_Corridor_EventObjects, SSAnne_1F_Corridor_MapWarps, 0x0, 0x0 diff --git a/data/maps/SSAnne_1F_Room1/events.inc b/data/maps/SSAnne_1F_Room1/events.inc new file mode 100644 index 000000000..d4a52f794 --- /dev/null +++ b/data/maps/SSAnne_1F_Room1/events.inc @@ -0,0 +1,8 @@ +SSAnne_1F_Room1_EventObjects: + object_event 1, 61, 0, 2, 0, 5, 0, 3, 5, 18, 0, 0, 0, 0, 0, SSAnne_1F_Room1_EventScript_160BDC, 0, 0, 0 + +SSAnne_1F_Room1_MapWarps: + warp_def 2, 1, 0, 6, 261 + +SSAnne_1F_Room1_MapEvents:: + map_events SSAnne_1F_Room1_EventObjects, SSAnne_1F_Room1_MapWarps, 0x0, 0x0 diff --git a/data/maps/SSAnne_1F_Room11/events.inc b/data/maps/SSAnne_1F_Room11/events.inc new file mode 100644 index 000000000..eb4cf4b37 --- /dev/null +++ b/data/maps/SSAnne_1F_Room11/events.inc @@ -0,0 +1,24 @@ +SSAnne_1F_Room11_EventObjects: + object_event 1, 28, 0, 48, 0, 15, 0, 3, 20, 17, 0, 1, 0, 3, 0, SSAnne_1F_Room11_EventScript_164590, 0, 0, 0 + object_event 2, 28, 0, 10, 0, 5, 0, 3, 18, 17, 0, 1, 0, 2, 0, SSAnne_1F_Room11_EventScript_1645A7, 0, 0, 0 + object_event 3, 20, 0, 51, 0, 6, 0, 3, 8, 17, 0, 1, 0, 2, 0, SSAnne_1F_Room11_EventScript_1645BE, 0, 0, 0 + object_event 4, 20, 0, 12, 0, 13, 0, 3, 2, 33, 0, 1, 0, 2, 0, SSAnne_1F_Room11_EventScript_1645D5, 0, 0, 0 + object_event 5, 20, 0, 37, 0, 23, 0, 3, 51, 82, 0, 1, 0, 1, 0, SSAnne_1F_Room11_EventScript_1645EC, 0, 0, 0 + object_event 6, 18, 0, 32, 0, 5, 0, 3, 8, 17, 0, 1, 0, 2, 0, SSAnne_1F_Room11_EventScript_164603, 0, 0, 0 + object_event 7, 18, 0, 52, 0, 20, 0, 3, 10, 17, 0, 1, 0, 4, 0, SSAnne_1F_Room11_EventScript_16461A, 0, 0, 0 + object_event 8, 22, 0, 8, 0, 21, 0, 3, 17, 17, 0, 1, 0, 5, 0, SSAnne_1F_Room11_EventScript_164631, 0, 0, 0 + object_event 9, 22, 0, 39, 0, 6, 0, 3, 2, 17, 0, 1, 0, 3, 0, SSAnne_1F_Room11_EventScript_164648, 0, 0, 0 + object_event 10, 39, 0, 3, 0, 9, 0, 3, 3, 33, 0, 1, 0, 3, 0, SSAnne_1F_Room11_EventScript_16465F, 0, 0, 0 + object_event 11, 40, 0, 19, 0, 24, 0, 3, 28, 21, 0, 1, 0, 1, 0, SSAnne_1F_Room11_EventScript_164676, 0, 0, 0 + object_event 12, 56, 0, 30, 0, 19, 0, 3, 7, 17, 0, 1, 0, 3, 0, SSAnne_1F_Room11_EventScript_16468D, 0, 0, 0 + +SSAnne_1F_Room11_MapWarps: + warp_def 54, 26, 3, 0, 827 + warp_def 55, 26, 3, 0, 827 + warp_def 56, 26, 3, 1, 827 + warp_def 3, 26, 3, 2, 827 + warp_def 4, 26, 3, 2, 827 + warp_def 5, 26, 3, 3, 827 + +SSAnne_1F_Room11_MapEvents:: + map_events SSAnne_1F_Room11_EventObjects, SSAnne_1F_Room11_MapWarps, 0x0, 0x0 diff --git a/data/maps/SSAnne_1F_Room12/events.inc b/data/maps/SSAnne_1F_Room12/events.inc new file mode 100644 index 000000000..b6bafe7e3 --- /dev/null +++ b/data/maps/SSAnne_1F_Room12/events.inc @@ -0,0 +1,5 @@ +SSAnne_1F_Room12_MapWarps: + warp_def 18, 22, 3, 0, 826 + +SSAnne_1F_Room12_MapEvents:: + map_events 0x0, SSAnne_1F_Room12_MapWarps, 0x0, 0x0 diff --git a/data/maps/SSAnne_1F_Room2/events.inc b/data/maps/SSAnne_1F_Room2/events.inc new file mode 100644 index 000000000..72afcb7d2 --- /dev/null +++ b/data/maps/SSAnne_1F_Room2/events.inc @@ -0,0 +1,11 @@ +SSAnne_1F_Room2_EventObjects: + object_event 1, 22, 0, 5, 0, 3, 0, 3, 17, 17, 0, 1, 0, 2, 0, SSAnne_1F_Room2_EventScript_160BEF, 0, 0, 0 + object_event 2, 18, 0, 0, 0, 4, 0, 3, 10, 17, 0, 1, 0, 3, 0, SSAnne_1F_Room2_EventScript_160C06, 0, 0, 0 + object_event 3, 28, 0, 2, 0, 6, 0, 3, 9, 17, 0, 0, 0, 1, 0, SSAnne_1F_Room2_EventScript_160BE6, 0, 0, 0 + object_event 4, 92, 0, 5, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, SSAnne_1F_Room2_EventScript_1BE65E, 356, 0, 0 + +SSAnne_1F_Room2_MapWarps: + warp_def 2, 1, 0, 7, 261 + +SSAnne_1F_Room2_MapEvents:: + map_events SSAnne_1F_Room2_EventObjects, SSAnne_1F_Room2_MapWarps, 0x0, 0x0 diff --git a/data/maps/SSAnne_1F_Room3/events.inc b/data/maps/SSAnne_1F_Room3/events.inc new file mode 100644 index 000000000..47565243b --- /dev/null +++ b/data/maps/SSAnne_1F_Room3/events.inc @@ -0,0 +1,10 @@ +SSAnne_1F_Room3_EventObjects: + object_event 1, 17, 0, 3, 0, 4, 0, 3, 52, 50, 0, 0, 0, 0, 0, SSAnne_1F_Room3_EventScript_160C1E, 0, 0, 0 + object_event 2, 131, 0, 4, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, SSAnne_1F_Room3_EventScript_160C30, 0, 0, 0 + object_event 3, 30, 0, 0, 0, 4, 0, 3, 10, 17, 0, 0, 0, 0, 0, SSAnne_1F_Room3_EventScript_160C27, 0, 0, 0 + +SSAnne_1F_Room3_MapWarps: + warp_def 2, 1, 0, 8, 261 + +SSAnne_1F_Room3_MapEvents:: + map_events SSAnne_1F_Room3_EventObjects, SSAnne_1F_Room3_MapWarps, 0x0, 0x0 diff --git a/data/maps/SSAnne_1F_Room4/events.inc b/data/maps/SSAnne_1F_Room4/events.inc new file mode 100644 index 000000000..45969a0a8 --- /dev/null +++ b/data/maps/SSAnne_1F_Room4/events.inc @@ -0,0 +1,8 @@ +SSAnne_1F_Room4_EventObjects: + object_event 1, 23, 0, 2, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, SSAnne_1F_Room4_EventScript_160C44, 0, 0, 0 + +SSAnne_1F_Room4_MapWarps: + warp_def 2, 1, 0, 9, 261 + +SSAnne_1F_Room4_MapEvents:: + map_events SSAnne_1F_Room4_EventObjects, SSAnne_1F_Room4_MapWarps, 0x0, 0x0 diff --git a/data/maps/SSAnne_1F_Room5/events.inc b/data/maps/SSAnne_1F_Room5/events.inc new file mode 100644 index 000000000..214544b3c --- /dev/null +++ b/data/maps/SSAnne_1F_Room5/events.inc @@ -0,0 +1,8 @@ +SSAnne_1F_Room5_EventObjects: + object_event 1, 61, 0, 2, 0, 6, 0, 3, 7, 17, 0, 1, 0, 4, 0, SSAnne_1F_Room5_EventScript_160C67, 0, 0, 0 + +SSAnne_1F_Room5_MapWarps: + warp_def 2, 1, 0, 10, 261 + +SSAnne_1F_Room5_MapEvents:: + map_events SSAnne_1F_Room5_EventObjects, SSAnne_1F_Room5_MapWarps, 0x0, 0x0 diff --git a/data/maps/SSAnne_1F_Room6/events.inc b/data/maps/SSAnne_1F_Room6/events.inc new file mode 100644 index 000000000..bbbd7b8f8 --- /dev/null +++ b/data/maps/SSAnne_1F_Room6/events.inc @@ -0,0 +1,8 @@ +SSAnne_1F_Room6_EventObjects: + object_event 1, 28, 0, 3, 0, 5, 0, 3, 7, 17, 0, 0, 0, 0, 0, SSAnne_1F_Room6_EventScript_160DF3, 0, 0, 0 + +SSAnne_1F_Room6_MapWarps: + warp_def 2, 1, 0, 12, 261 + +SSAnne_1F_Room6_MapEvents:: + map_events SSAnne_1F_Room6_EventObjects, SSAnne_1F_Room6_MapWarps, 0x0, 0x0 diff --git a/data/maps/SSAnne_1F_Room7/events.inc b/data/maps/SSAnne_1F_Room7/events.inc new file mode 100644 index 000000000..e8ea182ed --- /dev/null +++ b/data/maps/SSAnne_1F_Room7/events.inc @@ -0,0 +1,8 @@ +SSAnne_1F_Room7_EventObjects: + object_event 1, 61, 0, 4, 0, 3, 0, 3, 9, 17, 0, 1, 0, 3, 0, SSAnne_1F_Room7_EventScript_160C7F, 0, 0, 0 + +SSAnne_1F_Room7_MapWarps: + warp_def 2, 1, 0, 11, 261 + +SSAnne_1F_Room7_MapEvents:: + map_events SSAnne_1F_Room7_EventObjects, SSAnne_1F_Room7_MapWarps, 0x0, 0x0 diff --git a/data/maps/SSAnne_2F_Corridor/events.inc b/data/maps/SSAnne_2F_Corridor/events.inc new file mode 100644 index 000000000..040240ef5 --- /dev/null +++ b/data/maps/SSAnne_2F_Corridor/events.inc @@ -0,0 +1,22 @@ +SSAnne_2F_Corridor_EventObjects: + object_event 1, 72, 0, 30, 0, 2, 0, 3, 9, 17, 0, 0, 0, 0, 0, 0x0, 61, 0, 0 + object_event 2, 62, 0, 2, 0, 7, 0, 3, 3, 33, 0, 0, 0, 0, 0, SSAnne_2F_Corridor_EventScript_160A54, 0, 0, 0 + +SSAnne_2F_Corridor_MapWarps: + warp_def 2, 2, 3, 0, 261 + warp_def 3, 12, 3, 1, 263 + warp_def 30, 2, 3, 0, 267 + warp_def 6, 10, 0, 0, 274 + warp_def 10, 10, 0, 0, 275 + warp_def 14, 10, 0, 0, 276 + warp_def 18, 10, 0, 0, 277 + warp_def 22, 10, 0, 0, 278 + warp_def 26, 10, 0, 0, 279 + +SSAnne_2F_Corridor_MapCoordEvents: + coord_event 30, 6, 3, 0, 16475, 0, 0, SSAnne_2F_Corridor_EventScript_1608DF + coord_event 31, 6, 3, 0, 16475, 0, 0, SSAnne_2F_Corridor_EventScript_1608EB + coord_event 32, 6, 3, 0, 16475, 0, 0, SSAnne_2F_Corridor_EventScript_1608F7 + +SSAnne_2F_Corridor_MapEvents:: + map_events SSAnne_2F_Corridor_EventObjects, SSAnne_2F_Corridor_MapWarps, SSAnne_2F_Corridor_MapCoordEvents, 0x0 diff --git a/data/maps/SSAnne_2F_Room1/events.inc b/data/maps/SSAnne_2F_Room1/events.inc new file mode 100644 index 000000000..0faf232db --- /dev/null +++ b/data/maps/SSAnne_2F_Room1/events.inc @@ -0,0 +1,8 @@ +SSAnne_2F_Room1_EventObjects: + object_event 1, 61, 0, 1, 0, 4, 0, 3, 9, 17, 0, 0, 0, 0, 0, SSAnne_2F_Room1_EventScript_160C97, 0, 0, 0 + +SSAnne_2F_Room1_MapWarps: + warp_def 4, 7, 3, 3, 262 + +SSAnne_2F_Room1_MapEvents:: + map_events SSAnne_2F_Room1_EventObjects, SSAnne_2F_Room1_MapWarps, 0x0, 0x0 diff --git a/data/maps/SSAnne_2F_Room2/events.inc b/data/maps/SSAnne_2F_Room2/events.inc new file mode 100644 index 000000000..a7df1228a --- /dev/null +++ b/data/maps/SSAnne_2F_Room2/events.inc @@ -0,0 +1,10 @@ +SSAnne_2F_Room2_EventObjects: + object_event 1, 57, 0, 5, 0, 5, 0, 3, 9, 17, 0, 1, 0, 3, 0, SSAnne_2F_Room2_EventScript_160CB1, 0, 0, 0 + object_event 2, 61, 0, 1, 0, 4, 0, 3, 10, 17, 0, 1, 0, 2, 0, SSAnne_2F_Room2_EventScript_160CC8, 0, 0, 0 + object_event 3, 92, 0, 3, 0, 3, 0, 0, 8, 17, 0, 0, 0, 0, 0, SSAnne_2F_Room2_EventScript_1BE66B, 357, 0, 0 + +SSAnne_2F_Room2_MapWarps: + warp_def 4, 7, 3, 4, 262 + +SSAnne_2F_Room2_MapEvents:: + map_events SSAnne_2F_Room2_EventObjects, SSAnne_2F_Room2_MapWarps, 0x0, 0x0 diff --git a/data/maps/SSAnne_2F_Room3/events.inc b/data/maps/SSAnne_2F_Room3/events.inc new file mode 100644 index 000000000..82a89c51f --- /dev/null +++ b/data/maps/SSAnne_2F_Room3/events.inc @@ -0,0 +1,9 @@ +SSAnne_2F_Room3_EventObjects: + object_event 1, 61, 0, 2, 0, 5, 0, 3, 5, 17, 0, 0, 0, 0, 0, SSAnne_2F_Room3_EventScript_160CE0, 0, 0, 0 + object_event 2, 32, 0, 3, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, SSAnne_2F_Room3_EventScript_160CE9, 0, 0, 0 + +SSAnne_2F_Room3_MapWarps: + warp_def 4, 7, 3, 5, 262 + +SSAnne_2F_Room3_MapEvents:: + map_events SSAnne_2F_Room3_EventObjects, SSAnne_2F_Room3_MapWarps, 0x0, 0x0 diff --git a/data/maps/SSAnne_2F_Room4/events.inc b/data/maps/SSAnne_2F_Room4/events.inc new file mode 100644 index 000000000..2a9d4f9f5 --- /dev/null +++ b/data/maps/SSAnne_2F_Room4/events.inc @@ -0,0 +1,10 @@ +SSAnne_2F_Room4_EventObjects: + object_event 1, 61, 0, 0, 0, 5, 0, 3, 10, 17, 0, 1, 0, 3, 0, SSAnne_2F_Room4_EventScript_160CF3, 0, 0, 0 + object_event 2, 22, 0, 3, 0, 3, 0, 3, 8, 17, 0, 1, 0, 3, 0, SSAnne_2F_Room4_EventScript_160D0A, 0, 0, 0 + object_event 3, 92, 0, 2, 0, 4, 0, 3, 8, 17, 0, 0, 0, 0, 0, SSAnne_2F_Room4_EventScript_1BE678, 358, 0, 0 + +SSAnne_2F_Room4_MapWarps: + warp_def 4, 7, 3, 6, 262 + +SSAnne_2F_Room4_MapEvents:: + map_events SSAnne_2F_Room4_EventObjects, SSAnne_2F_Room4_MapWarps, 0x0, 0x0 diff --git a/data/maps/SSAnne_2F_Room5/events.inc b/data/maps/SSAnne_2F_Room5/events.inc new file mode 100644 index 000000000..ee7fdaee9 --- /dev/null +++ b/data/maps/SSAnne_2F_Room5/events.inc @@ -0,0 +1,9 @@ +SSAnne_2F_Room5_EventObjects: + object_event 1, 61, 0, 5, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, SSAnne_2F_Room5_EventScript_160D22, 0, 0, 0 + object_event 2, 16, 0, 3, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, SSAnne_2F_Room5_EventScript_160D2B, 0, 0, 0 + +SSAnne_2F_Room5_MapWarps: + warp_def 4, 7, 3, 7, 262 + +SSAnne_2F_Room5_MapEvents:: + map_events SSAnne_2F_Room5_EventObjects, SSAnne_2F_Room5_MapWarps, 0x0, 0x0 diff --git a/data/maps/SSAnne_2F_Room6/events.inc b/data/maps/SSAnne_2F_Room6/events.inc new file mode 100644 index 000000000..a531dacaf --- /dev/null +++ b/data/maps/SSAnne_2F_Room6/events.inc @@ -0,0 +1,9 @@ +SSAnne_2F_Room6_EventObjects: + object_event 1, 31, 0, 1, 0, 4, 0, 3, 10, 17, 0, 0, 0, 0, 0, SSAnne_2F_Room6_EventScript_160D3E, 0, 0, 0 + object_event 2, 23, 0, 4, 0, 4, 0, 3, 9, 17, 0, 0, 0, 0, 0, SSAnne_2F_Room6_EventScript_160D35, 0, 0, 0 + +SSAnne_2F_Room6_MapWarps: + warp_def 4, 7, 3, 8, 262 + +SSAnne_2F_Room6_MapEvents:: + map_events SSAnne_2F_Room6_EventObjects, SSAnne_2F_Room6_MapWarps, 0x0, 0x0 diff --git a/data/maps/SSAnne_3F_Corridor/events.inc b/data/maps/SSAnne_3F_Corridor/events.inc new file mode 100644 index 000000000..73c712193 --- /dev/null +++ b/data/maps/SSAnne_3F_Corridor/events.inc @@ -0,0 +1,10 @@ +SSAnne_3F_Corridor_EventObjects: + object_event 1, 62, 0, 10, 0, 4, 0, 3, 5, 19, 0, 0, 0, 0, 0, SSAnne_3F_Corridor_EventScript_160A5E, 0, 0, 0 + +SSAnne_3F_Corridor_MapWarps: + warp_def 1, 4, 3, 0, 265 + warp_def 18, 2, 3, 1, 262 + warp_def 0, 5, 0, 0, 265 + +SSAnne_3F_Corridor_MapEvents:: + map_events SSAnne_3F_Corridor_EventObjects, SSAnne_3F_Corridor_MapWarps, 0x0, 0x0 diff --git a/data/maps/SSAnne_B1F_Corridor/events.inc b/data/maps/SSAnne_B1F_Corridor/events.inc new file mode 100644 index 000000000..09ca9c4a3 --- /dev/null +++ b/data/maps/SSAnne_B1F_Corridor/events.inc @@ -0,0 +1,13 @@ +SSAnne_B1F_Corridor_MapWarps: + warp_def 19, 3, 3, 5, 261 + warp_def 2, 2, 0, 0, 280 + warp_def 6, 2, 0, 0, 281 + warp_def 10, 2, 0, 0, 282 + warp_def 14, 2, 0, 0, 283 + warp_def 18, 2, 0, 0, 284 + +SSAnne_B1F_Corridor_MapBGEvents: + bg_event 21, 5, 3, 7, 0, 21, 8, 1 + +SSAnne_B1F_Corridor_MapEvents:: + map_events 0x0, SSAnne_B1F_Corridor_MapWarps, 0x0, SSAnne_B1F_Corridor_MapBGEvents diff --git a/data/maps/SSAnne_B1F_Room1/events.inc b/data/maps/SSAnne_B1F_Room1/events.inc new file mode 100644 index 000000000..ef1e2b945 --- /dev/null +++ b/data/maps/SSAnne_B1F_Room1/events.inc @@ -0,0 +1,9 @@ +SSAnne_B1F_Room1_EventObjects: + object_event 1, 57, 0, 5, 0, 2, 0, 3, 8, 17, 0, 1, 0, 2, 0, SSAnne_B1F_Room1_EventScript_160D48, 0, 0, 0 + object_event 2, 62, 0, 3, 0, 2, 0, 3, 8, 17, 0, 1, 0, 2, 0, SSAnne_B1F_Room1_EventScript_160D5F, 0, 0, 0 + +SSAnne_B1F_Room1_MapWarps: + warp_def 4, 7, 3, 1, 264 + +SSAnne_B1F_Room1_MapEvents:: + map_events SSAnne_B1F_Room1_EventObjects, SSAnne_B1F_Room1_MapWarps, 0x0, 0x0 diff --git a/data/maps/SSAnne_B1F_Room2/events.inc b/data/maps/SSAnne_B1F_Room2/events.inc new file mode 100644 index 000000000..21419a175 --- /dev/null +++ b/data/maps/SSAnne_B1F_Room2/events.inc @@ -0,0 +1,9 @@ +SSAnne_B1F_Room2_EventObjects: + object_event 1, 62, 0, 3, 0, 5, 0, 3, 1, 17, 0, 1, 0, 1, 0, SSAnne_B1F_Room2_EventScript_160D77, 0, 0, 0 + object_event 2, 92, 0, 3, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, SSAnne_B1F_Room2_EventScript_1BE685, 359, 0, 0 + +SSAnne_B1F_Room2_MapWarps: + warp_def 4, 7, 3, 2, 264 + +SSAnne_B1F_Room2_MapEvents:: + map_events SSAnne_B1F_Room2_EventObjects, SSAnne_B1F_Room2_MapWarps, 0x0, 0x0 diff --git a/data/maps/SSAnne_B1F_Room3/events.inc b/data/maps/SSAnne_B1F_Room3/events.inc new file mode 100644 index 000000000..b2c057b00 --- /dev/null +++ b/data/maps/SSAnne_B1F_Room3/events.inc @@ -0,0 +1,9 @@ +SSAnne_B1F_Room3_EventObjects: + object_event 1, 62, 0, 4, 0, 4, 0, 3, 8, 17, 0, 1, 0, 3, 0, SSAnne_B1F_Room3_EventScript_160D8F, 0, 0, 0 + object_event 2, 92, 0, 1, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, SSAnne_B1F_Room3_EventScript_1BE692, 360, 0, 0 + +SSAnne_B1F_Room3_MapWarps: + warp_def 4, 7, 3, 3, 264 + +SSAnne_B1F_Room3_MapEvents:: + map_events SSAnne_B1F_Room3_EventObjects, SSAnne_B1F_Room3_MapWarps, 0x0, 0x0 diff --git a/data/maps/SSAnne_B1F_Room4/events.inc b/data/maps/SSAnne_B1F_Room4/events.inc new file mode 100644 index 000000000..19eb044d2 --- /dev/null +++ b/data/maps/SSAnne_B1F_Room4/events.inc @@ -0,0 +1,9 @@ +SSAnne_B1F_Room4_EventObjects: + object_event 1, 62, 0, 3, 0, 3, 0, 3, 8, 17, 0, 1, 0, 3, 0, SSAnne_B1F_Room4_EventScript_160DBE, 0, 0, 0 + object_event 2, 62, 0, 2, 0, 6, 0, 3, 1, 17, 0, 1, 0, 1, 0, SSAnne_B1F_Room4_EventScript_160DA7, 0, 0, 0 + +SSAnne_B1F_Room4_MapWarps: + warp_def 4, 7, 3, 4, 264 + +SSAnne_B1F_Room4_MapEvents:: + map_events SSAnne_B1F_Room4_EventObjects, SSAnne_B1F_Room4_MapWarps, 0x0, 0x0 diff --git a/data/maps/SSAnne_B1F_Room5/events.inc b/data/maps/SSAnne_B1F_Room5/events.inc new file mode 100644 index 000000000..4f8fe1f69 --- /dev/null +++ b/data/maps/SSAnne_B1F_Room5/events.inc @@ -0,0 +1,10 @@ +SSAnne_B1F_Room5_EventObjects: + object_event 1, 19, 0, 3, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, SSAnne_B1F_Room5_EventScript_160DD6, 0, 0, 0 + object_event 2, 134, 0, 2, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, SSAnne_B1F_Room5_EventScript_160DDF, 0, 0, 0 + object_event 3, 92, 0, 2, 0, 2, 0, 0, 8, 17, 0, 0, 0, 0, 0, SSAnne_B1F_Room5_EventScript_1BE69F, 361, 0, 0 + +SSAnne_B1F_Room5_MapWarps: + warp_def 4, 7, 3, 5, 264 + +SSAnne_B1F_Room5_MapEvents:: + map_events SSAnne_B1F_Room5_EventObjects, SSAnne_B1F_Room5_MapWarps, 0x0, 0x0 diff --git a/data/maps/SSAnne_CaptainsOffice/events.inc b/data/maps/SSAnne_CaptainsOffice/events.inc new file mode 100644 index 000000000..a8c88a0a7 --- /dev/null +++ b/data/maps/SSAnne_CaptainsOffice/events.inc @@ -0,0 +1,13 @@ +SSAnne_CaptainsOffice_EventObjects: + object_event 1, 63, 0, 5, 0, 4, 0, 3, 7, 17, 0, 0, 0, 0, 0, SSAnne_CaptainsOffice_EventScript_160B3A, 0, 0, 0 + +SSAnne_CaptainsOffice_MapWarps: + warp_def 3, 7, 3, 2, 262 + +SSAnne_CaptainsOffice_MapBGEvents: + bg_event 2, 4, 0, 0, 0, SSAnne_CaptainsOffice_EventScript_160BD2 + bg_event 5, 3, 0, 0, 0, SSAnne_CaptainsOffice_EventScript_160BC9 + bg_event 2, 3, 0, 0, 0, SSAnne_CaptainsOffice_EventScript_160BD2 + +SSAnne_CaptainsOffice_MapEvents:: + map_events SSAnne_CaptainsOffice_EventObjects, SSAnne_CaptainsOffice_MapWarps, 0x0, SSAnne_CaptainsOffice_MapBGEvents diff --git a/data/maps/SSAnne_CaptainsOffice2/events.inc b/data/maps/SSAnne_CaptainsOffice2/events.inc new file mode 100644 index 000000000..dd11ae294 --- /dev/null +++ b/data/maps/SSAnne_CaptainsOffice2/events.inc @@ -0,0 +1,11 @@ +SSAnne_CaptainsOffice2_EventObjects: + object_event 1, 92, 0, 10, 0, 14, 0, 3, 8, 17, 0, 0, 0, 0, 0, SSAnne_CaptainsOffice2_EventScript_1BED6D, 498, 0, 0 + object_event 2, 92, 0, 21, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, SSAnne_CaptainsOffice2_EventScript_1BED7A, 499, 0, 0 + +SSAnne_CaptainsOffice2_MapWarps: + warp_def 12, 12, 3, 2, 367 + warp_def 12, 3, 3, 3, 367 + warp_def 15, 16, 3, 4, 367 + +SSAnne_CaptainsOffice2_MapEvents:: + map_events SSAnne_CaptainsOffice2_EventObjects, SSAnne_CaptainsOffice2_MapWarps, 0x0, 0x0 diff --git a/data/maps/SSAnne_CaptainsOffice3/events.inc b/data/maps/SSAnne_CaptainsOffice3/events.inc new file mode 100644 index 000000000..23f6df9a6 --- /dev/null +++ b/data/maps/SSAnne_CaptainsOffice3/events.inc @@ -0,0 +1,16 @@ +SSAnne_CaptainsOffice3_EventObjects: + object_event 1, 49, 0, 11, 0, 14, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, 141, 0, 0 + object_event 2, 49, 0, 13, 0, 14, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, 141, 0, 0 + object_event 3, 77, 0, 12, 0, 16, 0, 3, 7, 17, 0, 0, 0, 0, 0, SSAnne_CaptainsOffice3_EventScript_163F25, 139, 0, 0 + object_event 4, 49, 0, 10, 0, 15, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, 141, 0, 0 + +SSAnne_CaptainsOffice3_MapWarps: + warp_def 12, 23, 0, 5, 367 + +SSAnne_CaptainsOffice3_MapCoordEvents: + coord_event 11, 18, 3, 0, 16512, 0, 0, SSAnne_CaptainsOffice3_EventScript_163D98 + coord_event 12, 18, 3, 0, 16512, 0, 0, SSAnne_CaptainsOffice3_EventScript_163D98 + coord_event 13, 18, 3, 0, 16512, 0, 0, SSAnne_CaptainsOffice3_EventScript_163D98 + +SSAnne_CaptainsOffice3_MapEvents:: + map_events SSAnne_CaptainsOffice3_EventObjects, SSAnne_CaptainsOffice3_MapWarps, SSAnne_CaptainsOffice3_MapCoordEvents, 0x0 diff --git a/data/maps/SSAnne_CaptainsOffice4/events.inc b/data/maps/SSAnne_CaptainsOffice4/events.inc new file mode 100644 index 000000000..6aa2900e4 --- /dev/null +++ b/data/maps/SSAnne_CaptainsOffice4/events.inc @@ -0,0 +1,49 @@ +SSAnne_CaptainsOffice4_EventObjects: + object_event 1, 49, 0, 15, 0, 11, 0, 3, 17, 17, 0, 1, 0, 1, 0, SSAnne_CaptainsOffice4_EventScript_163FE6, 136, 0, 0 + object_event 2, 49, 0, 17, 0, 15, 0, 3, 10, 17, 0, 1, 0, 1, 0, SSAnne_CaptainsOffice4_EventScript_163FFD, 136, 0, 0 + object_event 3, 50, 0, 27, 0, 16, 0, 3, 9, 17, 0, 1, 0, 3, 0, SSAnne_CaptainsOffice4_EventScript_164087, 136, 0, 0 + object_event 4, 49, 0, 25, 0, 11, 0, 3, 10, 17, 0, 1, 0, 3, 0, SSAnne_CaptainsOffice4_EventScript_164014, 136, 0, 0 + object_event 5, 50, 0, 6, 0, 6, 0, 3, 16, 17, 0, 1, 0, 3, 0, SSAnne_CaptainsOffice4_EventScript_164070, 136, 0, 0 + object_event 6, 55, 0, 27, 0, 4, 0, 3, 9, 17, 0, 1, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_163F93, 0, 0, 0 + object_event 7, 92, 0, 8, 0, 25, 0, 3, 8, 17, 0, 0, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_1BED87, 500, 0, 0 + object_event 8, 92, 0, 17, 0, 3, 0, 0, 8, 17, 0, 0, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_1BED94, 501, 0, 0 + object_event 9, 92, 0, 1, 0, 16, 0, 3, 8, 17, 0, 0, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_1BEDA1, 502, 0, 0 + object_event 10, 92, 0, 4, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_1BEDAE, 503, 0, 0 + +SSAnne_CaptainsOffice4_MapWarps: + warp_def 24, 25, 3, 0, 824 + +SSAnne_CaptainsOffice4_MapCoordEvents: + coord_event 22, 11, 3, 0, 16520, 0, 0, SSAnne_CaptainsOffice4_EventScript_163F81 + coord_event 23, 11, 3, 0, 16520, 0, 0, SSAnne_CaptainsOffice4_EventScript_163F81 + coord_event 24, 11, 3, 0, 16520, 0, 0, SSAnne_CaptainsOffice4_EventScript_163F81 + +SSAnne_CaptainsOffice4_MapBGEvents: + bg_event 11, 2, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_163F5A + bg_event 26, 11, 0, 3, 0, SSAnne_CaptainsOffice4_EventScript_163F78 + bg_event 27, 2, 0, 7, 0, 8, 68, 1 + bg_event 7, 16, 0, 7, 0, 6, 69, 1 + bg_event 12, 2, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_163F5A + bg_event 10, 2, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_163F5A + bg_event 9, 2, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_163F5A + bg_event 8, 2, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_163F5A + bg_event 7, 2, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_163F5A + bg_event 11, 5, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_163F5A + bg_event 10, 5, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_163F5A + bg_event 11, 4, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_163F5A + bg_event 10, 4, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_163F5A + bg_event 8, 4, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_163F5A + bg_event 7, 4, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_163F5A + bg_event 8, 5, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_163F5A + bg_event 7, 5, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_163F5A + bg_event 5, 3, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_163F5A + bg_event 4, 3, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_163F5A + bg_event 5, 4, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_163F5A + bg_event 4, 4, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_163F5A + bg_event 3, 4, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_163F5A + bg_event 2, 4, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_163F5A + bg_event 2, 5, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_163F5A + bg_event 3, 5, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_163F5A + +SSAnne_CaptainsOffice4_MapEvents:: + map_events SSAnne_CaptainsOffice4_EventObjects, SSAnne_CaptainsOffice4_MapWarps, SSAnne_CaptainsOffice4_MapCoordEvents, SSAnne_CaptainsOffice4_MapBGEvents diff --git a/data/maps/SSAnne_CaptainsOffice5/events.inc b/data/maps/SSAnne_CaptainsOffice5/events.inc new file mode 100644 index 000000000..6939d5902 --- /dev/null +++ b/data/maps/SSAnne_CaptainsOffice5/events.inc @@ -0,0 +1,8 @@ +SSAnne_CaptainsOffice5_MapWarps: + warp_def 6, 9, 3, 0, 829 + warp_def 6, 5, 3, 0, 372 + warp_def 13, 5, 3, 0, 376 + warp_def 6, 7, 3, 2, 372 + +SSAnne_CaptainsOffice5_MapEvents:: + map_events 0x0, SSAnne_CaptainsOffice5_MapWarps, 0x0, 0x0 diff --git a/data/maps/SSAnne_CaptainsOffice9/events.inc b/data/maps/SSAnne_CaptainsOffice9/events.inc new file mode 100644 index 000000000..aeaa11fa8 --- /dev/null +++ b/data/maps/SSAnne_CaptainsOffice9/events.inc @@ -0,0 +1,12 @@ +SSAnne_CaptainsOffice9_MapWarps: + warp_def 6, 7, 3, 2, 374 + warp_def 6, 1, 3, 3, 371 + warp_def 11, 5, 3, 3, 371 + warp_def 6, 9, 3, 1, 376 + warp_def 1, 5, 3, 3, 371 + +SSAnne_CaptainsOffice9_MapBGEvents: + bg_event 6, 5, 0, 1, 0, SSAnne_CaptainsOffice9_EventScript_164195 + +SSAnne_CaptainsOffice9_MapEvents:: + map_events 0x0, SSAnne_CaptainsOffice9_MapWarps, 0x0, SSAnne_CaptainsOffice9_MapBGEvents diff --git a/data/maps/SSAnne_Deck/events.inc b/data/maps/SSAnne_Deck/events.inc new file mode 100644 index 000000000..9e18e8087 --- /dev/null +++ b/data/maps/SSAnne_Deck/events.inc @@ -0,0 +1,13 @@ +SSAnne_Deck_EventObjects: + object_event 1, 62, 0, 12, 0, 10, 0, 3, 7, 17, 0, 1, 0, 2, 0, SSAnne_Deck_EventScript_160A9B, 0, 0, 0 + object_event 2, 30, 0, 14, 0, 11, 0, 3, 8, 17, 0, 0, 0, 0, 0, SSAnne_Deck_EventScript_160A72, 0, 0, 0 + object_event 3, 62, 0, 13, 0, 13, 0, 3, 27, 20, 0, 0, 0, 0, 0, SSAnne_Deck_EventScript_160A7B, 0, 0, 0 + object_event 4, 62, 0, 6, 0, 9, 0, 3, 2, 17, 0, 1, 0, 1, 0, SSAnne_Deck_EventScript_160A84, 0, 0, 0 + object_event 5, 18, 0, 11, 0, 5, 0, 3, 9, 17, 0, 0, 0, 0, 0, SSAnne_Deck_EventScript_160A69, 0, 0, 0 + +SSAnne_Deck_MapWarps: + warp_def 16, 8, 3, 0, 263 + warp_def 16, 9, 3, 0, 263 + +SSAnne_Deck_MapEvents:: + map_events SSAnne_Deck_EventObjects, SSAnne_Deck_MapWarps, 0x0, 0x0 diff --git a/data/maps/SSAnne_Exterior/events.inc b/data/maps/SSAnne_Exterior/events.inc new file mode 100644 index 000000000..06c219134 --- /dev/null +++ b/data/maps/SSAnne_Exterior/events.inc @@ -0,0 +1,15 @@ +SSAnne_Exterior_EventObjects: + object_event 1, 151, 0, 30, 0, 16, 0, 1, 8, 17, 0, 0, 0, 0, 0, 0x0, 135, 0, 0 + +SSAnne_Exterior_MapWarps: + warp_def 31, 5, 0, 0, 773 + warp_def 32, 5, 3, 1, 773 + warp_def 32, 14, 3, 2, 261 + warp_def 33, 15, 0, 3, 261 + warp_def 33, 5, 0, 2, 773 + +SSAnne_Exterior_MapBGEvents: + bg_event 58, 28, 3, 7, 0, 38, 190, 1 + +SSAnne_Exterior_MapEvents:: + map_events SSAnne_Exterior_EventObjects, SSAnne_Exterior_MapWarps, 0x0, SSAnne_Exterior_MapBGEvents diff --git a/data/maps/SSAnne_Kitchen/events.inc b/data/maps/SSAnne_Kitchen/events.inc new file mode 100644 index 000000000..d5034af53 --- /dev/null +++ b/data/maps/SSAnne_Kitchen/events.inc @@ -0,0 +1,20 @@ +SSAnne_Kitchen_EventObjects: + object_event 1, 59, 0, 1, 0, 5, 0, 3, 3, 17, 0, 0, 0, 0, 0, SSAnne_Kitchen_EventScript_160AB3, 0, 0, 0 + object_event 2, 59, 0, 6, 0, 6, 0, 3, 3, 33, 0, 0, 0, 0, 0, SSAnne_Kitchen_EventScript_160ABC, 0, 0, 0 + object_event 3, 59, 0, 10, 0, 4, 0, 3, 18, 17, 0, 0, 0, 0, 0, SSAnne_Kitchen_EventScript_160AC5, 0, 0, 0 + object_event 4, 59, 0, 8, 0, 9, 0, 3, 7, 17, 0, 0, 0, 0, 0, SSAnne_Kitchen_EventScript_160ACE, 0, 0, 0 + object_event 5, 59, 0, 14, 0, 5, 0, 3, 7, 17, 0, 0, 0, 0, 0, SSAnne_Kitchen_EventScript_160B1E, 0, 0, 0 + object_event 6, 59, 0, 14, 0, 7, 0, 3, 9, 17, 0, 0, 0, 0, 0, SSAnne_Kitchen_EventScript_160B27, 0, 0, 0 + object_event 7, 59, 0, 14, 0, 9, 0, 3, 7, 17, 0, 0, 0, 0, 0, SSAnne_Kitchen_EventScript_160B30, 0, 0, 0 + object_event 8, 92, 0, 1, 0, 10, 0, 3, 8, 17, 0, 0, 0, 0, 0, SSAnne_Kitchen_EventScript_1BE6AC, 362, 0, 0 + +SSAnne_Kitchen_MapWarps: + warp_def 7, 1, 0, 1, 261 + +SSAnne_Kitchen_MapBGEvents: + bg_event 14, 8, 0, 7, 0, 134, 122, 1 + bg_event 14, 4, 0, 7, 0, 135, 120, 1 + bg_event 14, 6, 0, 7, 0, 133, 121, 1 + +SSAnne_Kitchen_MapEvents:: + map_events SSAnne_Kitchen_EventObjects, SSAnne_Kitchen_MapWarps, 0x0, SSAnne_Kitchen_MapBGEvents diff --git a/data/maps/SSAnne_Kitchen3/events.inc b/data/maps/SSAnne_Kitchen3/events.inc new file mode 100644 index 000000000..0c7152178 --- /dev/null +++ b/data/maps/SSAnne_Kitchen3/events.inc @@ -0,0 +1,14 @@ +SSAnne_Kitchen3_EventObjects: + object_event 1, 96, 0, 18, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, SSAnne_Kitchen3_EventScript_1BE00C, 18, 0, 0 + object_event 2, 96, 0, 23, 0, 16, 0, 3, 1, 17, 0, 0, 0, 0, 0, SSAnne_Kitchen3_EventScript_1BE00C, 19, 0, 0 + object_event 3, 96, 0, 20, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, SSAnne_Kitchen3_EventScript_1BE00C, 20, 0, 0 + object_event 4, 96, 0, 19, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, SSAnne_Kitchen3_EventScript_1BE00C, 21, 0, 0 + object_event 5, 96, 0, 21, 0, 15, 0, 3, 1, 17, 0, 0, 0, 0, 0, SSAnne_Kitchen3_EventScript_1BE00C, 22, 0, 0 + +SSAnne_Kitchen3_MapWarps: + warp_def 22, 17, 3, 5, 353 + warp_def 1, 1, 0, 0, 360 + warp_def 24, 5, 0, 1, 364 + +SSAnne_Kitchen3_MapEvents:: + map_events SSAnne_Kitchen3_EventObjects, SSAnne_Kitchen3_MapWarps, 0x0, 0x0 diff --git a/data/maps/SafariZone_Building1/events.inc b/data/maps/SafariZone_Building1/events.inc new file mode 100644 index 000000000..afd3d4575 --- /dev/null +++ b/data/maps/SafariZone_Building1/events.inc @@ -0,0 +1,11 @@ +SafariZone_Building1_EventObjects: + object_event 1, 55, 0, 3, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, SafariZone_Building1_EventScript_1623F5, 0, 0, 0 + object_event 2, 23, 0, 7, 0, 3, 0, 3, 8, 17, 0, 0, 0, 0, 0, SafariZone_Building1_EventScript_1623EC, 0, 0, 0 + +SafariZone_Building1_MapWarps: + warp_def 3, 9, 3, 12, 319 + warp_def 4, 9, 3, 12, 319 + warp_def 5, 9, 3, 12, 319 + +SafariZone_Building1_MapEvents:: + map_events SafariZone_Building1_EventObjects, SafariZone_Building1_MapWarps, 0x0, 0x0 diff --git a/data/maps/SafariZone_Building2/events.inc b/data/maps/SafariZone_Building2/events.inc new file mode 100644 index 000000000..fadf6acc5 --- /dev/null +++ b/data/maps/SafariZone_Building2/events.inc @@ -0,0 +1,12 @@ +SafariZone_Building2_EventObjects: + object_event 1, 55, 0, 3, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, SafariZone_Building2_EventScript_162408, 0, 0, 0 + object_event 2, 26, 0, 6, 0, 3, 0, 3, 8, 17, 0, 0, 0, 0, 0, SafariZone_Building2_EventScript_1623FF, 0, 0, 0 + object_event 3, 30, 0, 7, 0, 3, 0, 3, 8, 17, 0, 0, 0, 0, 0, SafariZone_Building2_EventScript_162411, 0, 0, 0 + +SafariZone_Building2_MapWarps: + warp_def 3, 9, 3, 6, 320 + warp_def 4, 9, 3, 6, 320 + warp_def 5, 9, 3, 6, 320 + +SafariZone_Building2_MapEvents:: + map_events SafariZone_Building2_EventObjects, SafariZone_Building2_MapWarps, 0x0, 0x0 diff --git a/data/maps/SafariZone_Building3/events.inc b/data/maps/SafariZone_Building3/events.inc new file mode 100644 index 000000000..ec99802bb --- /dev/null +++ b/data/maps/SafariZone_Building3/events.inc @@ -0,0 +1,13 @@ +SafariZone_Building3_EventObjects: + object_event 1, 61, 0, 3, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, SafariZone_Building3_EventScript_16242D, 0, 0, 0 + object_event 2, 55, 0, 7, 0, 5, 0, 3, 2, 17, 0, 0, 0, 0, 0, SafariZone_Building3_EventScript_162424, 0, 0, 0 + object_event 3, 57, 0, 6, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0, 0, SafariZone_Building3_EventScript_16241B, 0, 0, 0 + object_event 4, 30, 0, 11, 0, 2, 0, 3, 7, 17, 0, 0, 0, 0, 0, SafariZone_Building3_EventScript_1ACED3, 0, 0, 0 + +SafariZone_Building3_MapWarps: + warp_def 3, 9, 3, 12, 321 + warp_def 4, 9, 3, 12, 321 + warp_def 5, 9, 3, 12, 321 + +SafariZone_Building3_MapEvents:: + map_events SafariZone_Building3_EventObjects, SafariZone_Building3_MapWarps, 0x0, 0x0 diff --git a/data/maps/SafariZone_Building4/events.inc b/data/maps/SafariZone_Building4/events.inc new file mode 100644 index 000000000..e22f4251e --- /dev/null +++ b/data/maps/SafariZone_Building4/events.inc @@ -0,0 +1,12 @@ +SafariZone_Building4_EventObjects: + object_event 1, 55, 0, 3, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, SafariZone_Building4_EventScript_162440, 0, 0, 0 + object_event 2, 25, 0, 2, 0, 2, 0, 0, 1, 17, 0, 0, 0, 0, 0, SafariZone_Building4_EventScript_162437, 0, 0, 0 + object_event 3, 42, 0, 7, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, SafariZone_Building4_EventScript_162449, 0, 0, 0 + +SafariZone_Building4_MapWarps: + warp_def 3, 9, 3, 10, 322 + warp_def 4, 9, 3, 10, 322 + warp_def 5, 9, 3, 10, 322 + +SafariZone_Building4_MapEvents:: + map_events SafariZone_Building4_EventObjects, SafariZone_Building4_MapWarps, 0x0, 0x0 diff --git a/data/maps/SafariZone_Center/events.inc b/data/maps/SafariZone_Center/events.inc new file mode 100644 index 000000000..d77cae266 --- /dev/null +++ b/data/maps/SafariZone_Center/events.inc @@ -0,0 +1,26 @@ +SafariZone_Center_EventObjects: + object_event 1, 92, 0, 24, 0, 15, 0, 3, 8, 17, 0, 0, 0, 0, 0, SafariZone_Center_EventScript_1BE7D7, 385, 0, 0 + +SafariZone_Center_MapWarps: + warp_def 25, 30, 3, 0, 2816 + warp_def 26, 30, 3, 0, 2816 + warp_def 27, 30, 3, 0, 2816 + warp_def 25, 5, 3, 9, 321 + warp_def 26, 5, 3, 10, 321 + warp_def 27, 5, 0, 11, 321 + warp_def 8, 17, 3, 6, 322 + warp_def 8, 18, 3, 7, 322 + warp_def 8, 19, 0, 8, 322 + warp_def 43, 15, 3, 3, 320 + warp_def 43, 16, 3, 4, 320 + warp_def 43, 17, 0, 5, 320 + warp_def 29, 25, 0, 1, 323 + +SafariZone_Center_MapBGEvents: + bg_event 30, 26, 0, 0, 0, SafariZone_Center_EventScript_162361 + bg_event 25, 27, 0, 0, 0, SafariZone_Center_EventScript_16236A + bg_event 27, 15, 3, 7, 0, 98, 22, 1 + bg_event 33, 20, 0, 0, 0, SafariZone_Center_EventScript_162373 + +SafariZone_Center_MapEvents:: + map_events SafariZone_Center_EventObjects, SafariZone_Center_MapWarps, 0x0, SafariZone_Center_MapBGEvents diff --git a/data/maps/SafariZone_East/events.inc b/data/maps/SafariZone_East/events.inc new file mode 100644 index 000000000..f273e32f9 --- /dev/null +++ b/data/maps/SafariZone_East/events.inc @@ -0,0 +1,22 @@ +SafariZone_East_EventObjects: + object_event 1, 92, 0, 13, 0, 12, 0, 3, 8, 17, 0, 0, 0, 0, 0, SafariZone_East_EventScript_1BE7E4, 386, 0, 0 + object_event 2, 92, 0, 37, 0, 15, 0, 3, 8, 17, 0, 0, 0, 0, 0, SafariZone_East_EventScript_1BE7F1, 387, 0, 0 + object_event 3, 92, 0, 31, 0, 18, 0, 3, 8, 17, 0, 0, 0, 0, 0, SafariZone_East_EventScript_1BE7FE, 388, 0, 0 + object_event 4, 92, 0, 36, 0, 17, 0, 4, 8, 17, 0, 0, 0, 0, 0, SafariZone_East_EventScript_1BE80B, 389, 0, 0 + +SafariZone_East_MapWarps: + warp_def 8, 9, 3, 6, 321 + warp_def 8, 10, 3, 7, 321 + warp_def 8, 11, 0, 8, 321 + warp_def 8, 26, 3, 9, 319 + warp_def 8, 27, 3, 10, 319 + warp_def 8, 28, 0, 11, 319 + warp_def 40, 14, 0, 1, 324 + +SafariZone_East_MapBGEvents: + bg_event 18, 27, 0, 0, 0, SafariZone_East_EventScript_16238F + bg_event 43, 15, 0, 0, 0, SafariZone_East_EventScript_16237D + bg_event 17, 8, 0, 0, 0, SafariZone_East_EventScript_162386 + +SafariZone_East_MapEvents:: + map_events SafariZone_East_EventObjects, SafariZone_East_MapWarps, 0x0, SafariZone_East_MapBGEvents diff --git a/data/maps/SafariZone_North/events.inc b/data/maps/SafariZone_North/events.inc new file mode 100644 index 000000000..8894652dd --- /dev/null +++ b/data/maps/SafariZone_North/events.inc @@ -0,0 +1,29 @@ +SafariZone_North_EventObjects: + object_event 1, 92, 0, 33, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, SafariZone_North_EventScript_1BE818, 390, 0, 0 + object_event 2, 92, 0, 28, 0, 9, 0, 3, 8, 17, 0, 0, 0, 0, 0, SafariZone_North_EventScript_1BE825, 391, 0, 0 + object_event 3, 92, 0, 29, 0, 17, 0, 3, 8, 17, 0, 0, 0, 0, 0, SafariZone_North_EventScript_1BEBDA, 467, 0, 0 + +SafariZone_North_MapWarps: + warp_def 10, 34, 3, 0, 322 + warp_def 11, 34, 3, 1, 322 + warp_def 12, 34, 0, 2, 322 + warp_def 20, 34, 3, 3, 322 + warp_def 21, 34, 3, 4, 322 + warp_def 22, 34, 0, 5, 322 + warp_def 48, 31, 3, 0, 320 + warp_def 48, 32, 3, 1, 320 + warp_def 48, 33, 0, 2, 320 + warp_def 30, 34, 3, 3, 319 + warp_def 31, 34, 3, 4, 319 + warp_def 32, 34, 0, 5, 319 + warp_def 43, 8, 0, 1, 325 + +SafariZone_North_MapBGEvents: + bg_event 13, 27, 0, 0, 0, SafariZone_North_EventScript_1623A2 + bg_event 23, 31, 0, 0, 0, SafariZone_North_EventScript_1623AB + bg_event 29, 32, 0, 0, 0, SafariZone_North_EventScript_1623B4 + bg_event 34, 28, 0, 0, 0, SafariZone_North_EventScript_1623BD + bg_event 44, 9, 0, 0, 0, SafariZone_North_EventScript_162399 + +SafariZone_North_MapEvents:: + map_events SafariZone_North_EventObjects, SafariZone_North_MapWarps, 0x0, SafariZone_North_MapBGEvents diff --git a/data/maps/SafariZone_SecretHouse/events.inc b/data/maps/SafariZone_SecretHouse/events.inc new file mode 100644 index 000000000..eb746f4c5 --- /dev/null +++ b/data/maps/SafariZone_SecretHouse/events.inc @@ -0,0 +1,10 @@ +SafariZone_SecretHouse_EventObjects: + object_event 1, 47, 0, 6, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, SafariZone_SecretHouse_EventScript_162453, 0, 0, 0 + +SafariZone_SecretHouse_MapWarps: + warp_def 3, 9, 3, 9, 322 + warp_def 4, 9, 3, 9, 322 + warp_def 5, 9, 3, 9, 322 + +SafariZone_SecretHouse_MapEvents:: + map_events SafariZone_SecretHouse_EventObjects, SafariZone_SecretHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/SafariZone_West/events.inc b/data/maps/SafariZone_West/events.inc new file mode 100644 index 000000000..a41c7a187 --- /dev/null +++ b/data/maps/SafariZone_West/events.inc @@ -0,0 +1,28 @@ +SafariZone_West_EventObjects: + object_event 1, 92, 0, 28, 0, 14, 0, 3, 8, 17, 0, 0, 0, 0, 0, SafariZone_West_EventScript_1BE83F, 393, 0, 0 + object_event 2, 92, 0, 17, 0, 13, 0, 3, 8, 17, 0, 0, 0, 0, 0, SafariZone_West_EventScript_1BE832, 392, 0, 0 + object_event 3, 92, 0, 16, 0, 27, 0, 3, 8, 17, 0, 0, 0, 0, 0, SafariZone_West_EventScript_1BE84C, 394, 0, 0 + object_event 4, 92, 0, 27, 0, 24, 0, 3, 8, 17, 0, 0, 0, 0, 0, SafariZone_West_EventScript_1BE859, 395, 0, 0 + +SafariZone_West_MapWarps: + warp_def 30, 5, 3, 0, 321 + warp_def 31, 5, 3, 1, 321 + warp_def 32, 5, 0, 2, 321 + warp_def 37, 5, 3, 3, 321 + warp_def 38, 5, 3, 4, 321 + warp_def 39, 5, 0, 5, 321 + warp_def 40, 26, 3, 6, 319 + warp_def 40, 27, 3, 7, 319 + warp_def 40, 28, 0, 8, 319 + warp_def 12, 7, 0, 1, 327 + warp_def 19, 18, 0, 1, 326 + +SafariZone_West_MapBGEvents: + bg_event 27, 9, 0, 0, 0, SafariZone_West_EventScript_1623D0 + bg_event 36, 10, 0, 0, 0, SafariZone_West_EventScript_1623D9 + bg_event 35, 26, 0, 0, 0, SafariZone_West_EventScript_1623E2 + bg_event 22, 19, 0, 0, 0, SafariZone_West_EventScript_1623C7 + bg_event 13, 11, 3, 7, 0, 24, 23, 1 + +SafariZone_West_MapEvents:: + map_events SafariZone_West_EventObjects, SafariZone_West_MapWarps, 0x0, SafariZone_West_MapBGEvents diff --git a/data/maps/SaffronCity/events.inc b/data/maps/SaffronCity/events.inc new file mode 100644 index 000000000..969d5a74f --- /dev/null +++ b/data/maps/SaffronCity/events.inc @@ -0,0 +1,2 @@ +SaffronCity_MapEvents:: + map_events 0x0, 0x0, 0x0, 0x0 diff --git a/data/maps/SaffronCity_Dojo/events.inc b/data/maps/SaffronCity_Dojo/events.inc new file mode 100644 index 000000000..fab821072 --- /dev/null +++ b/data/maps/SaffronCity_Dojo/events.inc @@ -0,0 +1,26 @@ +SaffronCity_Dojo_EventObjects: + object_event 1, 54, 0, 11, 0, 10, 0, 3, 9, 17, 0, 1, 0, 7, 0, SaffronCity_Dojo_EventScript_16ED46, 0, 0, 0 + object_event 2, 54, 0, 1, 0, 10, 0, 3, 10, 17, 0, 1, 0, 7, 0, SaffronCity_Dojo_EventScript_16ED5D, 0, 0, 0 + object_event 3, 54, 0, 11, 0, 8, 0, 3, 9, 17, 0, 1, 0, 7, 0, SaffronCity_Dojo_EventScript_16ED74, 0, 0, 0 + object_event 4, 54, 0, 1, 0, 8, 0, 3, 10, 17, 0, 1, 0, 7, 0, SaffronCity_Dojo_EventScript_16ED8B, 0, 0, 0 + object_event 5, 54, 0, 6, 0, 5, 0, 3, 8, 17, 0, 1, 0, 2, 0, SaffronCity_Dojo_EventScript_16EDA2, 0, 0, 0 + object_event 6, 92, 0, 5, 0, 3, 0, 3, 8, 17, 0, 0, 0, 0, 0, SaffronCity_Dojo_EventScript_16EC00, 96, 0, 0 + object_event 7, 92, 0, 7, 0, 3, 0, 3, 8, 17, 0, 0, 0, 0, 0, SaffronCity_Dojo_EventScript_16EC46, 97, 0, 0 + +SaffronCity_Dojo_MapWarps: + warp_def 5, 14, 3, 2, 778 + warp_def 6, 14, 3, 2, 778 + warp_def 7, 14, 3, 2, 778 + +SaffronCity_Dojo_MapCoordEvents: + coord_event 5, 5, 3, 0, 16513, 0, 0, SaffronCity_Dojo_EventScript_16EBDC + coord_event 7, 5, 3, 0, 16513, 0, 0, SaffronCity_Dojo_EventScript_16EBEE + +SaffronCity_Dojo_MapBGEvents: + bg_event 3, 13, 0, 0, 0, SaffronCity_Dojo_EventScript_16ED2B + bg_event 9, 13, 0, 0, 0, SaffronCity_Dojo_EventScript_16ED2B + bg_event 5, 2, 0, 0, 0, SaffronCity_Dojo_EventScript_16ED34 + bg_event 7, 2, 0, 0, 0, SaffronCity_Dojo_EventScript_16ED3D + +SaffronCity_Dojo_MapEvents:: + map_events SaffronCity_Dojo_EventObjects, SaffronCity_Dojo_MapWarps, SaffronCity_Dojo_MapCoordEvents, SaffronCity_Dojo_MapBGEvents diff --git a/data/maps/SaffronCity_Duplicate/events.inc b/data/maps/SaffronCity_Duplicate/events.inc new file mode 100644 index 000000000..f81e26f92 --- /dev/null +++ b/data/maps/SaffronCity_Duplicate/events.inc @@ -0,0 +1,47 @@ +SaffronCity_Duplicate_EventObjects: + object_event 1, 49, 0, 22, 0, 15, 0, 3, 8, 17, 0, 0, 0, 0, 0, SaffronCity_Duplicate_EventScript_16737A, 62, 0, 0 + object_event 2, 49, 0, 26, 0, 16, 0, 3, 5, 20, 0, 0, 0, 0, 0, SaffronCity_Duplicate_EventScript_167383, 62, 0, 0 + object_event 3, 49, 0, 46, 0, 13, 0, 3, 8, 17, 0, 0, 0, 0, 0, SaffronCity_Duplicate_EventScript_16738C, 62, 0, 0 + object_event 4, 49, 0, 27, 0, 22, 0, 3, 8, 17, 0, 0, 0, 0, 0, SaffronCity_Duplicate_EventScript_167395, 62, 0, 0 + object_event 5, 49, 0, 25, 0, 33, 0, 3, 5, 23, 0, 0, 0, 0, 0, SaffronCity_Duplicate_EventScript_16739E, 62, 0, 0 + object_event 6, 49, 0, 34, 0, 31, 0, 3, 8, 17, 0, 0, 0, 0, 0, SaffronCity_Duplicate_EventScript_1673B9, 62, 0, 0 + object_event 7, 49, 0, 30, 0, 39, 0, 3, 5, 21, 0, 0, 0, 0, 0, SaffronCity_Duplicate_EventScript_1673B0, 62, 0, 0 + object_event 8, 49, 0, 48, 0, 24, 0, 3, 5, 20, 0, 0, 0, 0, 0, SaffronCity_Duplicate_EventScript_1673A7, 62, 0, 0 + object_event 9, 18, 0, 37, 0, 32, 0, 3, 1, 17, 0, 0, 0, 0, 0, SaffronCity_Duplicate_EventScript_1673EC, 63, 0, 0 + object_event 10, 47, 0, 21, 0, 23, 0, 3, 2, 17, 0, 0, 0, 0, 0, SaffronCity_Duplicate_EventScript_1673E3, 63, 0, 0 + object_event 11, 25, 0, 39, 0, 16, 0, 3, 7, 17, 0, 0, 0, 0, 0, SaffronCity_Duplicate_EventScript_16741A, 63, 0, 0 + object_event 12, 19, 0, 44, 0, 22, 0, 3, 8, 17, 0, 0, 0, 0, 0, SaffronCity_Duplicate_EventScript_1673FE, 63, 0, 0 + object_event 13, 114, 0, 45, 0, 22, 0, 3, 8, 17, 0, 0, 0, 0, 0, SaffronCity_Duplicate_EventScript_167407, 63, 0, 0 + object_event 14, 22, 0, 32, 0, 39, 0, 3, 5, 21, 0, 0, 0, 0, 0, SaffronCity_Duplicate_EventScript_1673F5, 63, 0, 0 + object_event 15, 24, 0, 47, 0, 24, 0, 3, 5, 17, 0, 0, 0, 0, 0, SaffronCity_Duplicate_EventScript_1AD03A, 157, 0, 0 + +SaffronCity_Duplicate_MapWarps: + warp_def 33, 30, 0, 1, 303 + warp_def 22, 14, 0, 1, 3584 + warp_def 40, 12, 0, 1, 3586 + warp_def 46, 12, 0, 1, 3587 + warp_def 27, 21, 0, 1, 3588 + warp_def 40, 21, 0, 1, 3589 + warp_def 24, 38, 0, 1, 3590 + warp_def 43, 38, 0, 1, 3592 + warp_def 8, 27, 3, 2, 4864 + warp_def 34, 5, 3, 2, 4353 + warp_def 58, 27, 3, 1, 5120 + warp_def 34, 46, 3, 0, 4608 + warp_def 35, 46, 3, 0, 4608 + warp_def 35, 5, 3, 2, 4353 + warp_def 47, 21, 0, 0, 3593 + +SaffronCity_Duplicate_MapBGEvents: + bg_event 29, 14, 0, 0, 0, SaffronCity_Duplicate_EventScript_167423 + bg_event 42, 14, 0, 0, 0, SaffronCity_Duplicate_EventScript_16742C + bg_event 13, 25, 0, 0, 0, SaffronCity_Duplicate_EventScript_167471 + bg_event 18, 30, 0, 0, 0, SaffronCity_Duplicate_EventScript_167456 + bg_event 29, 31, 0, 0, 0, SaffronCity_Duplicate_EventScript_16745F + bg_event 54, 25, 0, 0, 0, SaffronCity_Duplicate_EventScript_16744D + bg_event 50, 14, 0, 0, 0, SaffronCity_Duplicate_EventScript_167435 + bg_event 40, 38, 0, 0, 0, SaffronCity_Duplicate_EventScript_167468 + bg_event 49, 22, 0, 0, 0, SaffronCity_Duplicate_EventScript_16747A + +SaffronCity_Duplicate_MapEvents:: + map_events SaffronCity_Duplicate_EventObjects, SaffronCity_Duplicate_MapWarps, 0x0, SaffronCity_Duplicate_MapBGEvents diff --git a/data/maps/SaffronCity_Gym/events.inc b/data/maps/SaffronCity_Gym/events.inc new file mode 100644 index 000000000..99ebd74d5 --- /dev/null +++ b/data/maps/SaffronCity_Gym/events.inc @@ -0,0 +1,52 @@ +SaffronCity_Gym_EventObjects: + object_event 1, 41, 0, 24, 0, 18, 0, 3, 8, 17, 0, 1, 0, 3, 0, SaffronCity_Gym_EventScript_16EEC3, 0, 0, 0 + object_event 2, 41, 0, 24, 0, 2, 0, 3, 8, 17, 0, 1, 0, 3, 0, SaffronCity_Gym_EventScript_16EE88, 0, 0, 0 + object_event 3, 41, 0, 4, 0, 2, 0, 3, 8, 17, 0, 1, 0, 3, 0, SaffronCity_Gym_EventScript_16EEDA, 0, 0, 0 + object_event 4, 58, 0, 14, 0, 2, 0, 3, 8, 17, 0, 1, 0, 3, 0, SaffronCity_Gym_EventScript_16EEF1, 0, 0, 0 + object_event 5, 58, 0, 4, 0, 10, 0, 3, 8, 17, 0, 1, 0, 3, 0, SaffronCity_Gym_EventScript_16EF08, 0, 0, 0 + object_event 6, 58, 0, 4, 0, 18, 0, 3, 8, 17, 0, 1, 0, 3, 0, SaffronCity_Gym_EventScript_16EF1F, 0, 0, 0 + object_event 7, 85, 0, 14, 0, 11, 0, 3, 8, 17, 0, 0, 0, 0, 0, SaffronCity_Gym_EventScript_16EDD8, 0, 0, 0 + object_event 8, 41, 0, 24, 0, 10, 0, 3, 8, 17, 0, 1, 0, 3, 0, SaffronCity_Gym_EventScript_16EE9F, 0, 0, 0 + object_event 9, 91, 0, 15, 0, 20, 0, 3, 8, 17, 0, 0, 0, 0, 0, SaffronCity_Gym_EventScript_16EF36, 0, 0, 0 + +SaffronCity_Gym_MapWarps: + warp_def 13, 23, 3, 3, 778 + warp_def 14, 23, 3, 3, 778 + warp_def 15, 23, 3, 3, 778 + warp_def 18, 20, 3, 32, 3587 + warp_def 0, 4, 3, 22, 3587 + warp_def 0, 7, 3, 20, 3587 + warp_def 0, 12, 3, 30, 3587 + warp_def 0, 15, 3, 11, 3587 + warp_def 0, 20, 3, 28, 3587 + warp_def 0, 23, 3, 19, 3587 + warp_def 8, 4, 3, 18, 3587 + warp_def 8, 7, 3, 7, 3587 + warp_def 8, 12, 3, 17, 3587 + warp_def 8, 15, 3, 15, 3587 + warp_def 8, 20, 3, 26, 3587 + warp_def 8, 23, 3, 13, 3587 + warp_def 12, 4, 3, 24, 3587 + warp_def 12, 7, 3, 12, 3587 + warp_def 16, 4, 3, 10, 3587 + warp_def 16, 7, 3, 9, 3587 + warp_def 18, 15, 3, 5, 3587 + warp_def 20, 4, 3, 23, 3587 + warp_def 20, 7, 3, 4, 3587 + warp_def 20, 12, 3, 21, 3587 + warp_def 20, 15, 3, 16, 3587 + warp_def 20, 20, 3, 27, 3587 + warp_def 20, 23, 3, 14, 3587 + warp_def 28, 4, 3, 25, 3587 + warp_def 28, 7, 3, 8, 3587 + warp_def 28, 12, 3, 31, 3587 + warp_def 28, 15, 3, 6, 3587 + warp_def 28, 20, 3, 29, 3587 + warp_def 28, 23, 3, 3, 3587 + +SaffronCity_Gym_MapBGEvents: + bg_event 12, 20, 0, 0, 0, SaffronCity_Gym_EventScript_16EF55 + bg_event 16, 20, 0, 0, 0, SaffronCity_Gym_EventScript_16EF55 + +SaffronCity_Gym_MapEvents:: + map_events SaffronCity_Gym_EventObjects, SaffronCity_Gym_MapWarps, 0x0, SaffronCity_Gym_MapBGEvents diff --git a/data/maps/SaffronCity_House1_1F/events.inc b/data/maps/SaffronCity_House1_1F/events.inc new file mode 100644 index 000000000..8cf2bd177 --- /dev/null +++ b/data/maps/SaffronCity_House1_1F/events.inc @@ -0,0 +1,13 @@ +SaffronCity_House1_1F_EventObjects: + object_event 1, 30, 0, 8, 0, 4, 0, 3, 9, 17, 0, 0, 0, 0, 0, SaffronCity_House1_1F_EventScript_16EB40, 0, 0, 0 + object_event 2, 31, 0, 3, 0, 3, 0, 3, 8, 17, 0, 0, 0, 0, 0, SaffronCity_House1_1F_EventScript_16EB37, 0, 0, 0 + object_event 3, 117, 0, 4, 0, 4, 0, 3, 3, 33, 0, 0, 0, 0, 0, SaffronCity_House1_1F_EventScript_16EB49, 0, 0, 0 + +SaffronCity_House1_1F_MapWarps: + warp_def 3, 8, 3, 1, 778 + warp_def 4, 8, 3, 1, 778 + warp_def 5, 8, 3, 1, 778 + warp_def 10, 2, 3, 0, 3585 + +SaffronCity_House1_1F_MapEvents:: + map_events SaffronCity_House1_1F_EventObjects, SaffronCity_House1_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SaffronCity_House1_2F/events.inc b/data/maps/SaffronCity_House1_2F/events.inc new file mode 100644 index 000000000..40e137d0f --- /dev/null +++ b/data/maps/SaffronCity_House1_2F/events.inc @@ -0,0 +1,16 @@ +SaffronCity_House1_2F_EventObjects: + object_event 1, 132, 0, 6, 0, 8, 0, 3, 2, 17, 0, 0, 0, 0, 0, SaffronCity_House1_2F_EventScript_16EB5D, 0, 0, 0 + object_event 2, 120, 0, 4, 0, 6, 0, 3, 8, 17, 0, 0, 0, 0, 0, SaffronCity_House1_2F_EventScript_16EB70, 0, 0, 0 + object_event 3, 115, 0, 7, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, SaffronCity_House1_2F_EventScript_16EB70, 0, 0, 0 + object_event 4, 17, 0, 9, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, SaffronCity_House1_2F_EventScript_16EB7B, 0, 0, 0 + +SaffronCity_House1_2F_MapWarps: + warp_def 10, 2, 3, 3, 3584 + +SaffronCity_House1_2F_MapBGEvents: + bg_event 1, 1, 0, 0, 0, SaffronCity_House1_2F_EventScript_16EBC9 + bg_event 3, 5, 0, 0, 0, SaffronCity_House1_2F_EventScript_16EBD2 + bg_event 2, 1, 0, 7, 0, 110, 26, 1 + +SaffronCity_House1_2F_MapEvents:: + map_events SaffronCity_House1_2F_EventObjects, SaffronCity_House1_2F_MapWarps, 0x0, SaffronCity_House1_2F_MapBGEvents diff --git a/data/maps/SaffronCity_House2/events.inc b/data/maps/SaffronCity_House2/events.inc new file mode 100644 index 000000000..6859d12b6 --- /dev/null +++ b/data/maps/SaffronCity_House2/events.inc @@ -0,0 +1,16 @@ +SaffronCity_House2_EventObjects: + object_event 1, 116, 0, 0, 0, 5, 0, 3, 3, 65, 0, 0, 0, 0, 0, SaffronCity_House2_EventScript_16EF86, 0, 0, 0 + object_event 2, 22, 0, 4, 0, 4, 0, 3, 10, 17, 0, 0, 0, 0, 0, SaffronCity_House2_EventScript_16EF74, 0, 0, 0 + object_event 3, 18, 0, 6, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, SaffronCity_House2_EventScript_16EF7D, 0, 0, 0 + object_event 4, 105, 0, 5, 0, 4, 0, 0, 7, 17, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + +SaffronCity_House2_MapWarps: + warp_def 3, 7, 3, 4, 778 + warp_def 4, 7, 3, 4, 778 + warp_def 5, 7, 3, 4, 778 + +SaffronCity_House2_MapBGEvents: + bg_event 5, 4, 3, 0, 0, SaffronCity_House2_EventScript_16EF99 + +SaffronCity_House2_MapEvents:: + map_events SaffronCity_House2_EventObjects, SaffronCity_House2_MapWarps, 0x0, SaffronCity_House2_MapBGEvents diff --git a/data/maps/SaffronCity_House3/events.inc b/data/maps/SaffronCity_House3/events.inc new file mode 100644 index 000000000..dea32514e --- /dev/null +++ b/data/maps/SaffronCity_House3/events.inc @@ -0,0 +1,10 @@ +SaffronCity_House3_EventObjects: + object_event 1, 30, 0, 7, 0, 4, 0, 3, 9, 17, 0, 0, 0, 0, 0, SaffronCity_House3_EventScript_16F05F, 0, 0, 0 + +SaffronCity_House3_MapWarps: + warp_def 3, 7, 3, 7, 778 + warp_def 4, 7, 3, 7, 778 + warp_def 5, 7, 3, 7, 778 + +SaffronCity_House3_MapEvents:: + map_events SaffronCity_House3_EventObjects, SaffronCity_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/SaffronCity_Mart/events.inc b/data/maps/SaffronCity_Mart/events.inc new file mode 100644 index 000000000..62dcd60e8 --- /dev/null +++ b/data/maps/SaffronCity_Mart/events.inc @@ -0,0 +1,12 @@ +SaffronCity_Mart_EventObjects: + object_event 1, 68, 0, 2, 0, 3, 0, 0, 10, 17, 0, 0, 0, 0, 0, SaffronCity_Mart_EventScript_16EFB5, 0, 0, 0 + object_event 2, 18, 0, 1, 0, 7, 0, 3, 10, 17, 0, 0, 0, 0, 0, SaffronCity_Mart_EventScript_16EFAC, 0, 0, 0 + object_event 3, 22, 0, 9, 0, 5, 0, 3, 3, 17, 0, 0, 0, 0, 0, SaffronCity_Mart_EventScript_16EFA3, 0, 0, 0 + +SaffronCity_Mart_MapWarps: + warp_def 3, 7, 3, 5, 778 + warp_def 4, 7, 3, 5, 778 + warp_def 5, 7, 3, 5, 778 + +SaffronCity_Mart_MapEvents:: + map_events SaffronCity_Mart_EventObjects, SaffronCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/SaffronCity_PokemonCenter_1F/events.inc b/data/maps/SaffronCity_PokemonCenter_1F/events.inc new file mode 100644 index 000000000..478989842 --- /dev/null +++ b/data/maps/SaffronCity_PokemonCenter_1F/events.inc @@ -0,0 +1,16 @@ +SaffronCity_PokemonCenter_1F_EventObjects: + object_event 1, 64, 0, 7, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, SaffronCity_PokemonCenter_1F_EventScript_16EFFB, 0, 0, 0 + object_event 2, 61, 0, 14, 0, 6, 0, 3, 9, 17, 0, 0, 0, 0, 0, SaffronCity_PokemonCenter_1F_EventScript_16F004, 0, 0, 0 + object_event 3, 31, 0, 4, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, SaffronCity_PokemonCenter_1F_EventScript_16F00D, 0, 0, 0 + object_event 4, 18, 0, 9, 0, 6, 0, 3, 3, 17, 0, 0, 0, 0, 0, SaffronCity_PokemonCenter_1F_EventScript_16F016, 0, 0, 0 + object_event 5, 0, 0, 2, 0, 1, 0, 0, 76, 17, 0, 0, 0, 0, 0, SaffronCity_PokemonCenter_1F_EventScript_1ACEEC, 174, 0, 0 + object_event 6, 0, 0, 3, 0, 1, 0, 0, 76, 17, 0, 0, 0, 0, 0, SaffronCity_PokemonCenter_1F_EventScript_1ACEEC, 174, 0, 0 + +SaffronCity_PokemonCenter_1F_MapWarps: + warp_def 6, 8, 3, 6, 778 + warp_def 7, 8, 3, 6, 778 + warp_def 8, 8, 3, 6, 778 + warp_def 1, 6, 4, 0, 3591 + +SaffronCity_PokemonCenter_1F_MapEvents:: + map_events SaffronCity_PokemonCenter_1F_EventObjects, SaffronCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SaffronCity_PokemonCenter_2F/events.inc b/data/maps/SaffronCity_PokemonCenter_2F/events.inc new file mode 100644 index 000000000..9d740b6d7 --- /dev/null +++ b/data/maps/SaffronCity_PokemonCenter_2F/events.inc @@ -0,0 +1,13 @@ +SaffronCity_PokemonCenter_2F_EventObjects: + object_event 1, 65, 0, 6, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SaffronCity_PokemonCenter_2F_EventScript_1A8CF6, 0, 0, 0 + object_event 2, 65, 0, 2, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SaffronCity_PokemonCenter_2F_EventScript_1A8CFC, 0, 0, 0 + object_event 3, 65, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SaffronCity_PokemonCenter_2F_EventScript_1A8D02, 0, 0, 0 + object_event 4, 69, 0, 1, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, SaffronCity_PokemonCenter_2F_EventScript_1BB1D2, 112, 0, 0 + +SaffronCity_PokemonCenter_2F_MapWarps: + warp_def 1, 6, 4, 3, 3590 + warp_def 5, 1, 0, 0, 4 + warp_def 9, 1, 0, 0, 1 + +SaffronCity_PokemonCenter_2F_MapEvents:: + map_events SaffronCity_PokemonCenter_2F_EventObjects, SaffronCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/events.inc b/data/maps/SaffronCity_PokemonTrainerFanClub/events.inc new file mode 100644 index 000000000..a1139c312 --- /dev/null +++ b/data/maps/SaffronCity_PokemonTrainerFanClub/events.inc @@ -0,0 +1,17 @@ +SaffronCity_PokemonTrainerFanClub_EventObjects: + object_event 1, 24, 0, 7, 0, 13, 0, 3, 9, 17, 0, 0, 0, 0, 0, SaffronCity_PokemonTrainerFanClub_EventScript_16F281, 0, 0, 0 + object_event 2, 17, 0, 6, 0, 11, 0, 3, 8, 17, 0, 0, 0, 0, 0, SaffronCity_PokemonTrainerFanClub_EventScript_16F2F8, 0, 0, 0 + object_event 3, 18, 0, 3, 0, 13, 0, 3, 10, 17, 0, 0, 0, 0, 0, SaffronCity_PokemonTrainerFanClub_EventScript_16F36F, 0, 0, 0 + object_event 4, 61, 0, 3, 0, 12, 0, 3, 10, 17, 0, 0, 0, 0, 0, SaffronCity_PokemonTrainerFanClub_EventScript_16F3E6, 0, 0, 0 + object_event 5, 31, 0, 9, 0, 11, 0, 3, 8, 17, 0, 0, 0, 0, 0, SaffronCity_PokemonTrainerFanClub_EventScript_16F45D, 110, 0, 0 + object_event 6, 26, 0, 7, 0, 12, 0, 3, 9, 17, 0, 0, 0, 0, 0, SaffronCity_PokemonTrainerFanClub_EventScript_16F4BF, 109, 0, 0 + object_event 7, 29, 0, 9, 0, 12, 0, 3, 7, 17, 0, 0, 0, 0, 0, SaffronCity_PokemonTrainerFanClub_EventScript_16F521, 111, 0, 0 + object_event 8, 54, 0, 5, 0, 11, 0, 3, 8, 17, 0, 0, 0, 0, 0, SaffronCity_PokemonTrainerFanClub_EventScript_16F583, 108, 0, 0 + object_event 9, 0, 0, 2, 0, 1, 0, 0, 76, 17, 0, 0, 0, 0, 0, SaffronCity_PokemonTrainerFanClub_EventScript_1ACF7A, 157, 0, 0 + object_event 10, 0, 0, 3, 0, 1, 0, 0, 76, 17, 0, 0, 0, 0, 0, SaffronCity_PokemonTrainerFanClub_EventScript_1ACF7A, 157, 0, 0 + +SaffronCity_PokemonTrainerFanClub_MapWarps: + warp_def 5, 15, 3, 14, 778 + +SaffronCity_PokemonTrainerFanClub_MapEvents:: + map_events SaffronCity_PokemonTrainerFanClub_EventObjects, SaffronCity_PokemonTrainerFanClub_MapWarps, 0x0, 0x0 diff --git a/data/maps/SeafoamIslands_1F/events.inc b/data/maps/SeafoamIslands_1F/events.inc new file mode 100644 index 000000000..ad0e8a938 --- /dev/null +++ b/data/maps/SeafoamIslands_1F/events.inc @@ -0,0 +1,16 @@ +SeafoamIslands_1F_EventObjects: + object_event 1, 97, 0, 22, 0, 12, 0, 3, 8, 0, 0, 66, 0, 0, 0, SeafoamIslands_1F_EventScript_1BE11D, 64, 0, 0 + object_event 2, 97, 0, 32, 0, 9, 0, 3, 8, 0, 0, 67, 0, 0, 0, SeafoamIslands_1F_EventScript_1BE11D, 65, 0, 0 + object_event 3, 92, 0, 11, 0, 8, 0, 3, 8, 17, 0, 0, 0, 0, 0, SeafoamIslands_1F_EventScript_1BEBE7, 468, 0, 0 + +SeafoamIslands_1F_MapWarps: + warp_def 10, 6, 3, 0, 340 + warp_def 31, 4, 3, 1, 340 + warp_def 28, 19, 3, 2, 340 + warp_def 6, 21, 3, 0, 806 + warp_def 32, 21, 3, 1, 806 + warp_def 21, 8, 3, 9, 340 + warp_def 30, 8, 3, 10, 340 + +SeafoamIslands_1F_MapEvents:: + map_events SeafoamIslands_1F_EventObjects, SeafoamIslands_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SeafoamIslands_B1F/events.inc b/data/maps/SeafoamIslands_B1F/events.inc new file mode 100644 index 000000000..b8f166929 --- /dev/null +++ b/data/maps/SeafoamIslands_B1F/events.inc @@ -0,0 +1,21 @@ +SeafoamIslands_B1F_EventObjects: + object_event 1, 97, 0, 22, 0, 8, 0, 3, 8, 0, 0, 68, 0, 0, 0, SeafoamIslands_B1F_EventScript_1BE11D, 66, 0, 0 + object_event 2, 97, 0, 30, 0, 8, 0, 3, 8, 0, 0, 69, 0, 0, 0, SeafoamIslands_B1F_EventScript_1BE11D, 67, 0, 0 + object_event 3, 92, 0, 19, 0, 18, 0, 3, 8, 17, 0, 0, 0, 0, 0, SeafoamIslands_B1F_EventScript_1BEBF4, 469, 0, 0 + object_event 4, 92, 0, 24, 0, 14, 0, 4, 8, 17, 0, 0, 0, 0, 0, SeafoamIslands_B1F_EventScript_1BEC01, 470, 0, 0 + +SeafoamIslands_B1F_MapWarps: + warp_def 10, 6, 4, 0, 339 + warp_def 31, 4, 3, 1, 339 + warp_def 28, 19, 3, 2, 339 + warp_def 7, 3, 3, 3, 341 + warp_def 17, 9, 4, 4, 341 + warp_def 25, 19, 3, 5, 341 + warp_def 32, 14, 3, 6, 341 + warp_def 23, 8, 3, 7, 341 + warp_def 28, 8, 3, 8, 341 + warp_def 21, 8, 3, 5, 339 + warp_def 29, 8, 3, 6, 339 + +SeafoamIslands_B1F_MapEvents:: + map_events SeafoamIslands_B1F_EventObjects, SeafoamIslands_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SeafoamIslands_B2F/events.inc b/data/maps/SeafoamIslands_B2F/events.inc new file mode 100644 index 000000000..11165d646 --- /dev/null +++ b/data/maps/SeafoamIslands_B2F/events.inc @@ -0,0 +1,20 @@ +SeafoamIslands_B2F_EventObjects: + object_event 1, 97, 0, 22, 0, 8, 0, 3, 8, 0, 0, 70, 0, 0, 0, SeafoamIslands_B2F_EventScript_1BE11D, 68, 0, 0 + object_event 2, 97, 0, 30, 0, 8, 0, 3, 8, 0, 0, 71, 0, 0, 0, SeafoamIslands_B2F_EventScript_1BE11D, 69, 0, 0 + object_event 3, 92, 0, 18, 0, 15, 0, 3, 8, 17, 0, 0, 0, 0, 0, SeafoamIslands_B2F_EventScript_1BEC0E, 471, 0, 0 + +SeafoamIslands_B2F_MapWarps: + warp_def 7, 17, 3, 0, 342 + warp_def 32, 4, 3, 1, 342 + warp_def 31, 17, 4, 2, 342 + warp_def 7, 4, 3, 3, 340 + warp_def 17, 9, 4, 4, 340 + warp_def 25, 19, 3, 5, 340 + warp_def 32, 14, 4, 6, 340 + warp_def 22, 7, 3, 7, 340 + warp_def 29, 8, 3, 8, 340 + warp_def 24, 8, 3, 5, 342 + warp_def 27, 8, 3, 6, 342 + +SeafoamIslands_B2F_MapEvents:: + map_events SeafoamIslands_B2F_EventObjects, SeafoamIslands_B2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SeafoamIslands_B3F/events.inc b/data/maps/SeafoamIslands_B3F/events.inc new file mode 100644 index 000000000..144502290 --- /dev/null +++ b/data/maps/SeafoamIslands_B3F/events.inc @@ -0,0 +1,24 @@ +SeafoamIslands_B3F_EventObjects: + object_event 1, 97, 0, 23, 0, 8, 0, 1, 8, 17, 0, 0, 0, 0, 0, 0x0, 70, 0, 0 + object_event 2, 97, 0, 24, 0, 8, 0, 1, 8, 17, 0, 0, 0, 0, 0, 0x0, 71, 0, 0 + object_event 3, 97, 0, 12, 0, 16, 0, 3, 8, 0, 0, 77, 0, 0, 0, SeafoamIslands_B3F_EventScript_1BE11D, 74, 0, 0 + object_event 4, 97, 0, 13, 0, 16, 0, 3, 8, 0, 0, 0, 0, 0, 0, SeafoamIslands_B3F_EventScript_1BE11D, 75, 0, 0 + object_event 5, 97, 0, 9, 0, 16, 0, 3, 8, 0, 0, 0, 0, 0, 0, SeafoamIslands_B3F_EventScript_1BE11D, 73, 0, 0 + object_event 6, 97, 0, 6, 0, 17, 0, 3, 8, 0, 0, 76, 0, 0, 0, SeafoamIslands_B3F_EventScript_1BE11D, 72, 0, 0 + +SeafoamIslands_B3F_MapWarps: + warp_def 8, 14, 4, 0, 341 + warp_def 31, 4, 3, 1, 341 + warp_def 31, 16, 4, 2, 341 + warp_def 12, 9, 3, 0, 343 + warp_def 29, 5, 3, 1, 343 + warp_def 23, 9, 1, 7, 341 + warp_def 24, 9, 1, 8, 341 + warp_def 6, 18, 3, 2, 343 + warp_def 9, 18, 3, 3, 343 + +SeafoamIslands_B3F_MapBGEvents: + bg_event 5, 12, 0, 7, 0, 110, 29, 1 + +SeafoamIslands_B3F_MapEvents:: + map_events SeafoamIslands_B3F_EventObjects, SeafoamIslands_B3F_MapWarps, 0x0, SeafoamIslands_B3F_MapBGEvents diff --git a/data/maps/SeafoamIslands_B4F/events.inc b/data/maps/SeafoamIslands_B4F/events.inc new file mode 100644 index 000000000..fc894489e --- /dev/null +++ b/data/maps/SeafoamIslands_B4F/events.inc @@ -0,0 +1,24 @@ +SeafoamIslands_B4F_EventObjects: + object_event 1, 97, 0, 8, 0, 18, 0, 1, 8, 17, 0, 0, 0, 0, 0, 0x0, 76, 0, 0 + object_event 2, 97, 0, 9, 0, 18, 0, 1, 8, 17, 0, 0, 0, 0, 0, 0x0, 77, 0, 0 + object_event 3, 138, 0, 9, 0, 2, 0, 4, 8, 17, 0, 0, 0, 0, 0, SeafoamIslands_B4F_EventScript_1631AC, 130, 0, 0 + object_event 4, 92, 0, 22, 0, 19, 0, 4, 8, 17, 0, 0, 0, 0, 0, SeafoamIslands_B4F_EventScript_1BEC1B, 472, 0, 0 + +SeafoamIslands_B4F_MapWarps: + warp_def 15, 9, 4, 3, 342 + warp_def 32, 5, 4, 4, 342 + warp_def 8, 17, 1, 7, 342 + warp_def 9, 17, 1, 8, 342 + +SeafoamIslands_B4F_MapCoordEvents: + coord_event 26, 19, 1, 0, 16483, 0, 0, SeafoamIslands_B4F_EventScript_16319D + coord_event 27, 19, 1, 0, 16483, 0, 0, SeafoamIslands_B4F_EventScript_16319D + coord_event 28, 19, 1, 0, 16483, 0, 0, SeafoamIslands_B4F_EventScript_16319D + +SeafoamIslands_B4F_MapBGEvents: + bg_event 13, 8, 0, 7, 0, 97, 30, 1 + bg_event 30, 2, 0, 0, 0, SeafoamIslands_B4F_EventScript_16322C + bg_event 14, 18, 0, 0, 0, SeafoamIslands_B4F_EventScript_163223 + +SeafoamIslands_B4F_MapEvents:: + map_events SeafoamIslands_B4F_EventObjects, SeafoamIslands_B4F_MapWarps, SeafoamIslands_B4F_MapCoordEvents, SeafoamIslands_B4F_MapBGEvents diff --git a/data/maps/SevenIsland/events.inc b/data/maps/SevenIsland/events.inc new file mode 100644 index 000000000..ec2915745 --- /dev/null +++ b/data/maps/SevenIsland/events.inc @@ -0,0 +1,16 @@ +SevenIsland_EventObjects: + object_event 1, 41, 0, 7, 0, 18, 0, 3, 9, 17, 0, 0, 0, 0, 0, SevenIsland_EventScript_1C4B56, 0, 0, 0 + object_event 2, 35, 0, 9, 0, 7, 0, 3, 13, 17, 0, 0, 0, 0, 0, SevenIsland_EventScript_167EC6, 0, 0, 0 + object_event 3, 55, 0, 15, 0, 5, 0, 3, 2, 17, 0, 0, 0, 0, 0, SevenIsland_EventScript_167ECF, 0, 0, 0 + +SevenIsland_MapWarps: + warp_def 11, 9, 0, 0, 7936 + warp_def 5, 9, 0, 0, 7938 + warp_def 12, 3, 0, 0, 7939 + warp_def 16, 13, 3, 0, 7942 + +SevenIsland_MapBGEvents: + bg_event 17, 9, 0, 0, 0, SevenIsland_EventScript_167EBD + +SevenIsland_MapEvents:: + map_events SevenIsland_EventObjects, SevenIsland_MapWarps, 0x0, SevenIsland_MapBGEvents diff --git a/data/maps/SevenIsland_Harbor/events.inc b/data/maps/SevenIsland_Harbor/events.inc new file mode 100644 index 000000000..29a248be5 --- /dev/null +++ b/data/maps/SevenIsland_Harbor/events.inc @@ -0,0 +1,9 @@ +SevenIsland_Harbor_EventObjects: + object_event 1, 108, 0, 8, 0, 9, 0, 0, 8, 17, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 2, 62, 0, 8, 0, 6, 0, 3, 7, 17, 0, 0, 0, 0, 0, SevenIsland_Harbor_EventScript_170BE5, 0, 0, 0 + +SevenIsland_Harbor_MapWarps: + warp_def 8, 2, 3, 3, 785 + +SevenIsland_Harbor_MapEvents:: + map_events SevenIsland_Harbor_EventObjects, SevenIsland_Harbor_MapWarps, 0x0, 0x0 diff --git a/data/maps/SevenIsland_House_Room1/events.inc b/data/maps/SevenIsland_House_Room1/events.inc new file mode 100644 index 000000000..7acc86cca --- /dev/null +++ b/data/maps/SevenIsland_House_Room1/events.inc @@ -0,0 +1,12 @@ +SevenIsland_House_Room1_EventObjects: + object_event 1, 35, 0, 4, 0, 4, 0, 3, 10, 17, 0, 0, 0, 0, 0, SevenIsland_House_Room1_EventScript_170958, 0, 0, 0 + +SevenIsland_House_Room1_MapWarps: + warp_def 4, 7, 3, 0, 785 + warp_def 4, 1, 0, 0, 7937 + +SevenIsland_House_Room1_MapBGEvents: + bg_event 4, 1, 0, 0, 0, SevenIsland_House_Room1_EventScript_170A75 + +SevenIsland_House_Room1_MapEvents:: + map_events SevenIsland_House_Room1_EventObjects, SevenIsland_House_Room1_MapWarps, 0x0, SevenIsland_House_Room1_MapBGEvents diff --git a/data/maps/SevenIsland_House_Room2/events.inc b/data/maps/SevenIsland_House_Room2/events.inc new file mode 100644 index 000000000..509ebebeb --- /dev/null +++ b/data/maps/SevenIsland_House_Room2/events.inc @@ -0,0 +1,8 @@ +SevenIsland_House_Room2_EventObjects: + object_event 1, 240, 0, 6, 0, 5, 0, 0, 9, 17, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + +SevenIsland_House_Room2_MapWarps: + warp_def 3, 1, 0, 1, 7936 + +SevenIsland_House_Room2_MapEvents:: + map_events SevenIsland_House_Room2_EventObjects, SevenIsland_House_Room2_MapWarps, 0x0, 0x0 diff --git a/data/maps/SevenIsland_Mart/events.inc b/data/maps/SevenIsland_Mart/events.inc new file mode 100644 index 000000000..4ab092243 --- /dev/null +++ b/data/maps/SevenIsland_Mart/events.inc @@ -0,0 +1,11 @@ +SevenIsland_Mart_EventObjects: + object_event 1, 68, 0, 2, 0, 3, 0, 0, 10, 17, 0, 0, 0, 0, 0, SevenIsland_Mart_EventScript_170B31, 0, 0, 0 + object_event 2, 22, 0, 6, 0, 2, 0, 3, 16, 17, 0, 0, 0, 0, 0, SevenIsland_Mart_EventScript_170B6E, 0, 0, 0 + object_event 3, 57, 0, 9, 0, 5, 0, 3, 3, 17, 0, 0, 0, 0, 0, SevenIsland_Mart_EventScript_170B80, 0, 0, 0 + object_event 4, 56, 0, 5, 0, 4, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_Mart_EventScript_170B77, 0, 0, 0 + +SevenIsland_Mart_MapWarps: + warp_def 4, 7, 3, 1, 785 + +SevenIsland_Mart_MapEvents:: + map_events SevenIsland_Mart_EventObjects, SevenIsland_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/SevenIsland_PokemonCenter_1F/events.inc b/data/maps/SevenIsland_PokemonCenter_1F/events.inc new file mode 100644 index 000000000..59ada2640 --- /dev/null +++ b/data/maps/SevenIsland_PokemonCenter_1F/events.inc @@ -0,0 +1,14 @@ +SevenIsland_PokemonCenter_1F_EventObjects: + object_event 1, 64, 0, 7, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_PokemonCenter_1F_EventScript_170B98, 0, 0, 0 + object_event 2, 32, 0, 11, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_PokemonCenter_1F_EventScript_170BA1, 0, 0, 0 + object_event 3, 62, 0, 14, 0, 6, 0, 3, 9, 17, 0, 0, 0, 0, 0, SevenIsland_PokemonCenter_1F_EventScript_170BAA, 0, 0, 0 + object_event 4, 29, 0, 4, 0, 4, 0, 3, 10, 17, 0, 0, 0, 0, 0, SevenIsland_PokemonCenter_1F_EventScript_170BB3, 0, 0, 0 + object_event 5, 0, 0, 3, 0, 1, 0, 0, 76, 17, 0, 0, 0, 0, 0, SevenIsland_PokemonCenter_1F_EventScript_1ACFD4, 157, 0, 0 + object_event 6, 0, 0, 2, 0, 1, 0, 0, 76, 17, 0, 0, 0, 0, 0, SevenIsland_PokemonCenter_1F_EventScript_1ACFD4, 157, 0, 0 + +SevenIsland_PokemonCenter_1F_MapWarps: + warp_def 7, 8, 3, 2, 785 + warp_def 1, 6, 4, 0, 7940 + +SevenIsland_PokemonCenter_1F_MapEvents:: + map_events SevenIsland_PokemonCenter_1F_EventObjects, SevenIsland_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SevenIsland_PokemonCenter_2F/events.inc b/data/maps/SevenIsland_PokemonCenter_2F/events.inc new file mode 100644 index 000000000..e7b0a0dcb --- /dev/null +++ b/data/maps/SevenIsland_PokemonCenter_2F/events.inc @@ -0,0 +1,13 @@ +SevenIsland_PokemonCenter_2F_EventObjects: + object_event 1, 65, 0, 6, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SevenIsland_PokemonCenter_2F_EventScript_1A8CF6, 0, 0, 0 + object_event 2, 65, 0, 2, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SevenIsland_PokemonCenter_2F_EventScript_1A8CFC, 0, 0, 0 + object_event 3, 65, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SevenIsland_PokemonCenter_2F_EventScript_1A8D02, 0, 0, 0 + object_event 4, 69, 0, 1, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_PokemonCenter_2F_EventScript_1BB1D2, 112, 0, 0 + +SevenIsland_PokemonCenter_2F_MapWarps: + warp_def 1, 6, 4, 1, 7939 + warp_def 5, 1, 0, 0, 4 + warp_def 9, 1, 0, 0, 1 + +SevenIsland_PokemonCenter_2F_MapEvents:: + map_events SevenIsland_PokemonCenter_2F_EventObjects, SevenIsland_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/events.inc b/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/events.inc new file mode 100644 index 000000000..bf869b229 --- /dev/null +++ b/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/events.inc @@ -0,0 +1,23 @@ +SevenIsland_SeavaultCanyon_TanobyKey_EventObjects: + object_event 1, 97, 0, 7, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, SevenIsland_SeavaultCanyon_TanobyKey_EventScript_1BE11D, 0, 0, 0 + object_event 2, 97, 0, 8, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, SevenIsland_SeavaultCanyon_TanobyKey_EventScript_1BE11D, 0, 0, 0 + object_event 3, 97, 0, 8, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, SevenIsland_SeavaultCanyon_TanobyKey_EventScript_1BE11D, 0, 0, 0 + object_event 4, 97, 0, 6, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, SevenIsland_SeavaultCanyon_TanobyKey_EventScript_1BE11D, 0, 0, 0 + object_event 5, 97, 0, 8, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, SevenIsland_SeavaultCanyon_TanobyKey_EventScript_1BE11D, 0, 0, 0 + object_event 6, 97, 0, 6, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, SevenIsland_SeavaultCanyon_TanobyKey_EventScript_1BE11D, 0, 0, 0 + object_event 7, 97, 0, 6, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, SevenIsland_SeavaultCanyon_TanobyKey_EventScript_1BE11D, 0, 0, 0 + +SevenIsland_SeavaultCanyon_TanobyKey_MapWarps: + warp_def 7, 13, 3, 0, 832 + +SevenIsland_SeavaultCanyon_TanobyKey_MapCoordEvents: + coord_event 7, 2, 3, 0, 16385, 99, 0, SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E39 + coord_event 9, 8, 3, 0, 16391, 99, 0, SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164F0B + coord_event 5, 8, 3, 0, 16390, 99, 0, SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EE8 + coord_event 9, 6, 3, 0, 16389, 99, 0, SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EC5 + coord_event 5, 6, 3, 0, 16388, 99, 0, SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EA2 + coord_event 10, 4, 3, 0, 16387, 99, 0, SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E7F + coord_event 4, 4, 3, 0, 16386, 99, 0, SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E5C + +SevenIsland_SeavaultCanyon_TanobyKey_MapEvents:: + map_events SevenIsland_SeavaultCanyon_TanobyKey_EventObjects, SevenIsland_SeavaultCanyon_TanobyKey_MapWarps, SevenIsland_SeavaultCanyon_TanobyKey_MapCoordEvents, 0x0 diff --git a/data/maps/SevenIsland_SevaultCanyon/events.inc b/data/maps/SevenIsland_SevaultCanyon/events.inc new file mode 100644 index 000000000..02dc62ccb --- /dev/null +++ b/data/maps/SevenIsland_SevaultCanyon/events.inc @@ -0,0 +1,32 @@ +SevenIsland_SevaultCanyon_EventObjects: + object_event 1, 24, 0, 13, 0, 43, 0, 3, 7, 17, 0, 1, 0, 2, 0, SevenIsland_SevaultCanyon_EventScript_1ACA4D, 0, 0, 0 + object_event 2, 25, 0, 13, 0, 36, 0, 3, 18, 17, 0, 1, 0, 2, 0, SevenIsland_SevaultCanyon_EventScript_1ACA8B, 0, 0, 0 + object_event 3, 39, 0, 3, 0, 35, 0, 3, 21, 17, 0, 1, 0, 3, 0, SevenIsland_SevaultCanyon_EventScript_1ACAC9, 0, 0, 0 + object_event 4, 40, 0, 3, 0, 36, 0, 3, 22, 17, 0, 1, 0, 3, 0, SevenIsland_SevaultCanyon_EventScript_1ACB07, 0, 0, 0 + object_event 5, 41, 0, 7, 0, 56, 0, 3, 2, 17, 0, 1, 0, 1, 0, SevenIsland_SevaultCanyon_EventScript_1ACB45, 0, 0, 0 + object_event 6, 42, 0, 11, 0, 63, 0, 3, 2, 17, 0, 1, 0, 1, 0, SevenIsland_SevaultCanyon_EventScript_1ACB83, 0, 0, 0 + object_event 7, 41, 0, 14, 0, 13, 0, 3, 10, 17, 0, 1, 0, 1, 0, SevenIsland_SevaultCanyon_EventScript_1ACBC1, 0, 0, 0 + object_event 8, 42, 0, 14, 0, 14, 0, 3, 10, 17, 0, 1, 0, 1, 0, SevenIsland_SevaultCanyon_EventScript_1ACC07, 0, 0, 0 + object_event 9, 96, 0, 3, 0, 41, 0, 3, 1, 17, 0, 0, 0, 0, 0, SevenIsland_SevaultCanyon_EventScript_1BE00C, 18, 0, 0 + object_event 10, 97, 0, 13, 0, 47, 0, 3, 1, 0, 0, 0, 0, 0, 0, SevenIsland_SevaultCanyon_EventScript_1BE11D, 0, 0, 0 + object_event 11, 96, 0, 7, 0, 44, 0, 3, 1, 17, 0, 0, 0, 0, 0, SevenIsland_SevaultCanyon_EventScript_1BE00C, 19, 0, 0 + object_event 12, 96, 0, 12, 0, 47, 0, 3, 1, 17, 0, 0, 0, 0, 0, SevenIsland_SevaultCanyon_EventScript_1BE00C, 21, 0, 0 + object_event 13, 96, 0, 15, 0, 46, 0, 3, 1, 17, 0, 0, 0, 0, 0, SevenIsland_SevaultCanyon_EventScript_1BE00C, 22, 0, 0 + object_event 14, 96, 0, 16, 0, 47, 0, 3, 1, 17, 0, 0, 0, 0, 0, SevenIsland_SevaultCanyon_EventScript_1BE00C, 23, 0, 0 + object_event 15, 97, 0, 17, 0, 47, 0, 3, 1, 0, 0, 0, 0, 0, 0, SevenIsland_SevaultCanyon_EventScript_1BE11D, 0, 0, 0 + object_event 16, 96, 0, 11, 0, 31, 0, 3, 1, 17, 0, 0, 0, 0, 0, SevenIsland_SevaultCanyon_EventScript_1BE00C, 27, 0, 0 + object_event 17, 92, 0, 18, 0, 45, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_SevaultCanyon_EventScript_1BECDE, 487, 0, 0 + object_event 18, 92, 0, 7, 0, 38, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_SevaultCanyon_EventScript_1BECEB, 488, 0, 0 + object_event 19, 92, 0, 17, 0, 23, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_SevaultCanyon_EventScript_1BECF8, 489, 0, 0 + object_event 20, 54, 0, 8, 0, 26, 0, 3, 7, 17, 0, 0, 0, 0, 0, SevenIsland_SevaultCanyon_EventScript_1ACF95, 0, 0, 0 + +SevenIsland_SevaultCanyon_MapWarps: + warp_def 7, 17, 5, 0, 547 + warp_def 14, 61, 0, 0, 10752 + +SevenIsland_SevaultCanyon_MapBGEvents: + bg_event 15, 66, 3, 7, 0, 133, 63, 1 + bg_event 16, 71, 0, 0, 0, SevenIsland_SevaultCanyon_EventScript_168BFE + +SevenIsland_SevaultCanyon_MapEvents:: + map_events SevenIsland_SevaultCanyon_EventObjects, SevenIsland_SevaultCanyon_MapWarps, 0x0, SevenIsland_SevaultCanyon_MapBGEvents diff --git a/data/maps/SevenIsland_SevaultCanyon_Entrance/events.inc b/data/maps/SevenIsland_SevaultCanyon_Entrance/events.inc new file mode 100644 index 000000000..17c105a28 --- /dev/null +++ b/data/maps/SevenIsland_SevaultCanyon_Entrance/events.inc @@ -0,0 +1,15 @@ +SevenIsland_SevaultCanyon_Entrance_EventObjects: + object_event 1, 28, 0, 12, 0, 6, 0, 3, 9, 17, 0, 1, 0, 5, 0, SevenIsland_SevaultCanyon_Entrance_EventScript_1AC8C9, 0, 0, 0 + object_event 2, 29, 0, 3, 0, 34, 0, 3, 10, 17, 0, 1, 0, 1, 0, SevenIsland_SevaultCanyon_Entrance_EventScript_1AC907, 0, 0, 0 + object_event 3, 25, 0, 4, 0, 34, 0, 3, 9, 17, 0, 1, 0, 1, 0, SevenIsland_SevaultCanyon_Entrance_EventScript_1AC94D, 0, 0, 0 + object_event 4, 39, 0, 11, 0, 26, 0, 3, 20, 17, 0, 1, 0, 2, 0, SevenIsland_SevaultCanyon_Entrance_EventScript_1AC9D1, 0, 0, 0 + object_event 5, 40, 0, 10, 0, 26, 0, 3, 19, 17, 0, 1, 0, 2, 0, SevenIsland_SevaultCanyon_Entrance_EventScript_1ACA0F, 0, 0, 0 + object_event 6, 26, 0, 11, 0, 17, 0, 5, 23, 17, 0, 1, 0, 1, 0, SevenIsland_SevaultCanyon_Entrance_EventScript_1AC993, 0, 0, 0 + object_event 7, 65321, 0, 7, 0, 254, 255, 1, 0, 0, 0, 17, 0, 3, 0, 0x0, 0, 0, 0 + +SevenIsland_SevaultCanyon_Entrance_MapBGEvents: + bg_event 8, 29, 5, 7, 0, 136, 188, 1 + bg_event 14, 26, 0, 0, 0, SevenIsland_SevaultCanyon_Entrance_EventScript_168BF4 + +SevenIsland_SevaultCanyon_Entrance_MapEvents:: + map_events SevenIsland_SevaultCanyon_Entrance_EventObjects, 0x0, 0x0, SevenIsland_SevaultCanyon_Entrance_MapBGEvents diff --git a/data/maps/SevenIsland_SevaultCanyon_House/events.inc b/data/maps/SevenIsland_SevaultCanyon_House/events.inc new file mode 100644 index 000000000..3cc9f5bfc --- /dev/null +++ b/data/maps/SevenIsland_SevaultCanyon_House/events.inc @@ -0,0 +1,10 @@ +SevenIsland_SevaultCanyon_House_EventObjects: + object_event 1, 30, 0, 2, 0, 4, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_SevaultCanyon_House_EventScript_172183, 0, 0, 0 + object_event 2, 117, 0, 4, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_SevaultCanyon_House_EventScript_172242, 0, 0, 0 + object_event 3, 92, 0, 6, 0, 4, 0, 0, 8, 17, 0, 0, 0, 0, 0, SevenIsland_SevaultCanyon_House_EventScript_1BEDFC, 509, 0, 0 + +SevenIsland_SevaultCanyon_House_MapWarps: + warp_def 4, 7, 3, 1, 832 + +SevenIsland_SevaultCanyon_House_MapEvents:: + map_events SevenIsland_SevaultCanyon_House_EventObjects, SevenIsland_SevaultCanyon_House_MapWarps, 0x0, 0x0 diff --git a/data/maps/SevenIsland_TanobyRuins/events.inc b/data/maps/SevenIsland_TanobyRuins/events.inc new file mode 100644 index 000000000..32176aeda --- /dev/null +++ b/data/maps/SevenIsland_TanobyRuins/events.inc @@ -0,0 +1,23 @@ +SevenIsland_TanobyRuins_EventObjects: + object_event 1, 56, 0, 35, 0, 7, 0, 3, 2, 17, 0, 1, 0, 1, 0, SevenIsland_TanobyRuins_EventScript_1ACC4D, 0, 0, 0 + object_event 2, 56, 0, 121, 0, 11, 0, 3, 1, 17, 0, 1, 0, 1, 0, SevenIsland_TanobyRuins_EventScript_1ACC8B, 0, 0, 0 + object_event 3, 22, 0, 85, 0, 8, 0, 3, 10, 17, 0, 1, 0, 1, 0, SevenIsland_TanobyRuins_EventScript_1ACCC9, 0, 0, 0 + object_event 4, 61, 0, 85, 0, 5, 0, 3, 2, 17, 0, 1, 0, 1, 0, SevenIsland_TanobyRuins_EventScript_1ACD07, 0, 0, 0 + +SevenIsland_TanobyRuins_MapWarps: + warp_def 120, 10, 3, 0, 539 + warp_def 103, 10, 3, 0, 540 + warp_def 88, 8, 3, 0, 541 + warp_def 44, 11, 3, 0, 542 + warp_def 32, 9, 3, 0, 543 + warp_def 12, 15, 3, 0, 544 + warp_def 11, 6, 3, 0, 545 + +SevenIsland_TanobyRuins_MapBGEvents: + bg_event 33, 10, 3, 7, 0, 111, 65, 1 + bg_event 86, 9, 3, 7, 0, 111, 66, 1 + bg_event 125, 5, 3, 7, 0, 111, 67, 1 + bg_event 8, 2, 3, 7, 0, 111, 64, 1 + +SevenIsland_TanobyRuins_MapEvents:: + map_events SevenIsland_TanobyRuins_EventObjects, SevenIsland_TanobyRuins_MapWarps, 0x0, SevenIsland_TanobyRuins_MapBGEvents diff --git a/data/maps/SevenIsland_TanobyRuins_DilfordChamber/events.inc b/data/maps/SevenIsland_TanobyRuins_DilfordChamber/events.inc new file mode 100644 index 000000000..2d94f2129 --- /dev/null +++ b/data/maps/SevenIsland_TanobyRuins_DilfordChamber/events.inc @@ -0,0 +1,5 @@ +SevenIsland_TanobyRuins_DilfordChamber_MapWarps: + warp_def 11, 15, 3, 3, 833 + +SevenIsland_TanobyRuins_DilfordChamber_MapEvents:: + map_events 0x0, SevenIsland_TanobyRuins_DilfordChamber_MapWarps, 0x0, 0x0 diff --git a/data/maps/SevenIsland_TanobyRuins_LiptooChamber/events.inc b/data/maps/SevenIsland_TanobyRuins_LiptooChamber/events.inc new file mode 100644 index 000000000..6529a346b --- /dev/null +++ b/data/maps/SevenIsland_TanobyRuins_LiptooChamber/events.inc @@ -0,0 +1,5 @@ +SevenIsland_TanobyRuins_LiptooChamber_MapWarps: + warp_def 11, 15, 3, 1, 833 + +SevenIsland_TanobyRuins_LiptooChamber_MapEvents:: + map_events 0x0, SevenIsland_TanobyRuins_LiptooChamber_MapWarps, 0x0, 0x0 diff --git a/data/maps/SevenIsland_TanobyRuins_MoneanChamber/events.inc b/data/maps/SevenIsland_TanobyRuins_MoneanChamber/events.inc new file mode 100644 index 000000000..938602a70 --- /dev/null +++ b/data/maps/SevenIsland_TanobyRuins_MoneanChamber/events.inc @@ -0,0 +1,5 @@ +SevenIsland_TanobyRuins_MoneanChamber_MapWarps: + warp_def 11, 15, 3, 0, 833 + +SevenIsland_TanobyRuins_MoneanChamber_MapEvents:: + map_events 0x0, SevenIsland_TanobyRuins_MoneanChamber_MapWarps, 0x0, 0x0 diff --git a/data/maps/SevenIsland_TanobyRuins_RixyChamber/events.inc b/data/maps/SevenIsland_TanobyRuins_RixyChamber/events.inc new file mode 100644 index 000000000..8becb5f72 --- /dev/null +++ b/data/maps/SevenIsland_TanobyRuins_RixyChamber/events.inc @@ -0,0 +1,5 @@ +SevenIsland_TanobyRuins_RixyChamber_MapWarps: + warp_def 11, 15, 3, 5, 833 + +SevenIsland_TanobyRuins_RixyChamber_MapEvents:: + map_events 0x0, SevenIsland_TanobyRuins_RixyChamber_MapWarps, 0x0, 0x0 diff --git a/data/maps/SevenIsland_TanobyRuins_ScufibChamber/events.inc b/data/maps/SevenIsland_TanobyRuins_ScufibChamber/events.inc new file mode 100644 index 000000000..6a2c9f679 --- /dev/null +++ b/data/maps/SevenIsland_TanobyRuins_ScufibChamber/events.inc @@ -0,0 +1,5 @@ +SevenIsland_TanobyRuins_ScufibChamber_MapWarps: + warp_def 11, 15, 3, 4, 833 + +SevenIsland_TanobyRuins_ScufibChamber_MapEvents:: + map_events 0x0, SevenIsland_TanobyRuins_ScufibChamber_MapWarps, 0x0, 0x0 diff --git a/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/events.inc b/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/events.inc new file mode 100644 index 000000000..fa4434348 --- /dev/null +++ b/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/events.inc @@ -0,0 +1,5 @@ +SevenIsland_TanobyRuins_ViapoisChamber_MapWarps: + warp_def 11, 15, 3, 6, 833 + +SevenIsland_TanobyRuins_ViapoisChamber_MapEvents:: + map_events 0x0, SevenIsland_TanobyRuins_ViapoisChamber_MapWarps, 0x0, 0x0 diff --git a/data/maps/SevenIsland_TanobyRuins_WeepthChamber/events.inc b/data/maps/SevenIsland_TanobyRuins_WeepthChamber/events.inc new file mode 100644 index 000000000..57cea380b --- /dev/null +++ b/data/maps/SevenIsland_TanobyRuins_WeepthChamber/events.inc @@ -0,0 +1,5 @@ +SevenIsland_TanobyRuins_WeepthChamber_MapWarps: + warp_def 11, 15, 3, 2, 833 + +SevenIsland_TanobyRuins_WeepthChamber_MapEvents:: + map_events 0x0, SevenIsland_TanobyRuins_WeepthChamber_MapWarps, 0x0, 0x0 diff --git a/data/maps/SevenIsland_TrainerTower/events.inc b/data/maps/SevenIsland_TrainerTower/events.inc new file mode 100644 index 000000000..45aa2f532 --- /dev/null +++ b/data/maps/SevenIsland_TrainerTower/events.inc @@ -0,0 +1,16 @@ +SevenIsland_TrainerTower_EventObjects: + object_event 1, 19, 0, 56, 0, 26, 0, 3, 7, 17, 0, 1, 0, 1, 0, SevenIsland_TrainerTower_EventScript_1AC84D, 0, 0, 0 + object_event 2, 23, 0, 56, 0, 29, 0, 3, 8, 17, 0, 1, 0, 1, 0, SevenIsland_TrainerTower_EventScript_1AC88B, 0, 0, 0 + +SevenIsland_TrainerTower_MapWarps: + warp_def 58, 7, 3, 1, 522 + +SevenIsland_TrainerTower_MapBGEvents: + bg_event 49, 27, 3, 7, 0, 107, 185, 1 + bg_event 47, 30, 3, 7, 0, 106, 186, 1 + bg_event 59, 32, 3, 7, 0, 150, 187, 1 + bg_event 56, 8, 0, 0, 0, SevenIsland_TrainerTower_EventScript_168BE1 + bg_event 50, 30, 0, 0, 0, SevenIsland_TrainerTower_EventScript_168BEA + +SevenIsland_TrainerTower_MapEvents:: + map_events SevenIsland_TrainerTower_EventObjects, SevenIsland_TrainerTower_MapWarps, 0x0, SevenIsland_TrainerTower_MapBGEvents diff --git a/data/maps/SevenIsland_TrainerTower_1F/events.inc b/data/maps/SevenIsland_TrainerTower_1F/events.inc new file mode 100644 index 000000000..c46a41bc8 --- /dev/null +++ b/data/maps/SevenIsland_TrainerTower_1F/events.inc @@ -0,0 +1,18 @@ +SevenIsland_TrainerTower_1F_EventObjects: + object_event 1, 70, 0, 9, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, 6, 0, 0 + object_event 2, 240, 0, 11, 0, 10, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_1F_EventScript_1646C8, 2, 0, 0 + object_event 3, 241, 0, 15, 0, 13, 0, 3, 9, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_1F_EventScript_1646CE, 3, 0, 0 + object_event 4, 242, 0, 10, 0, 16, 0, 3, 7, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_1F_EventScript_1646D4, 4, 0, 0 + object_event 5, 243, 0, 10, 0, 10, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_1F_EventScript_1646DA, 5, 0, 0 + +SevenIsland_TrainerTower_1F_MapWarps: + warp_def 15, 6, 3, 1, 514 + warp_def 4, 6, 3, 0, 522 + +SevenIsland_TrainerTower_1F_MapCoordEvents: + coord_event 10, 13, 3, 0, 16398, 0, 0, SevenIsland_TrainerTower_1F_EventScript_1C54AF + coord_event 9, 12, 0, 0, 16399, 0, 0, SevenIsland_TrainerTower_1F_EventScript_1C54B4 + coord_event 9, 13, 3, 0, 16399, 0, 0, SevenIsland_TrainerTower_1F_EventScript_1C54EA + +SevenIsland_TrainerTower_1F_MapEvents:: + map_events SevenIsland_TrainerTower_1F_EventObjects, SevenIsland_TrainerTower_1F_MapWarps, SevenIsland_TrainerTower_1F_MapCoordEvents, 0x0 diff --git a/data/maps/SevenIsland_TrainerTower_2F/events.inc b/data/maps/SevenIsland_TrainerTower_2F/events.inc new file mode 100644 index 000000000..e26da5628 --- /dev/null +++ b/data/maps/SevenIsland_TrainerTower_2F/events.inc @@ -0,0 +1,19 @@ +SevenIsland_TrainerTower_2F_EventObjects: + object_event 1, 70, 0, 9, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_2F_EventScript_1646E0, 6, 0, 0 + object_event 2, 240, 0, 10, 0, 10, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_2F_EventScript_1646C8, 2, 0, 0 + object_event 3, 241, 0, 15, 0, 13, 0, 3, 9, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_2F_EventScript_1646CE, 3, 0, 0 + object_event 4, 242, 0, 10, 0, 16, 0, 3, 7, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_2F_EventScript_1646D4, 4, 0, 0 + object_event 5, 243, 0, 11, 0, 10, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_2F_EventScript_1646DA, 5, 0, 0 + +SevenIsland_TrainerTower_2F_MapWarps: + warp_def 15, 6, 3, 1, 515 + warp_def 4, 6, 3, 0, 513 + warp_def 13, 5, 0, 0, 523 + +SevenIsland_TrainerTower_2F_MapCoordEvents: + coord_event 10, 13, 3, 0, 16398, 0, 0, SevenIsland_TrainerTower_2F_EventScript_1C54AF + coord_event 9, 12, 3, 0, 16399, 0, 0, SevenIsland_TrainerTower_2F_EventScript_1C54B4 + coord_event 9, 13, 3, 0, 16399, 0, 0, SevenIsland_TrainerTower_2F_EventScript_1C54EA + +SevenIsland_TrainerTower_2F_MapEvents:: + map_events SevenIsland_TrainerTower_2F_EventObjects, SevenIsland_TrainerTower_2F_MapWarps, SevenIsland_TrainerTower_2F_MapCoordEvents, 0x0 diff --git a/data/maps/SevenIsland_TrainerTower_3F/events.inc b/data/maps/SevenIsland_TrainerTower_3F/events.inc new file mode 100644 index 000000000..534660edd --- /dev/null +++ b/data/maps/SevenIsland_TrainerTower_3F/events.inc @@ -0,0 +1,19 @@ +SevenIsland_TrainerTower_3F_EventObjects: + object_event 1, 70, 0, 9, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_3F_EventScript_1646E0, 6, 0, 0 + object_event 2, 240, 0, 10, 0, 10, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_3F_EventScript_1646C8, 2, 0, 0 + object_event 3, 241, 0, 15, 0, 13, 0, 3, 9, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_3F_EventScript_1646CE, 3, 0, 0 + object_event 4, 242, 0, 10, 0, 16, 0, 3, 7, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_3F_EventScript_1646D4, 4, 0, 0 + object_event 5, 243, 0, 11, 0, 10, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_3F_EventScript_1646DA, 5, 0, 0 + +SevenIsland_TrainerTower_3F_MapWarps: + warp_def 15, 6, 3, 1, 516 + warp_def 4, 6, 3, 0, 514 + warp_def 13, 5, 0, 0, 523 + +SevenIsland_TrainerTower_3F_MapCoordEvents: + coord_event 10, 13, 3, 0, 16398, 0, 0, SevenIsland_TrainerTower_3F_EventScript_1C54AF + coord_event 9, 12, 3, 0, 16399, 0, 0, SevenIsland_TrainerTower_3F_EventScript_1C54B4 + coord_event 9, 13, 3, 0, 16399, 0, 0, SevenIsland_TrainerTower_3F_EventScript_1C54EA + +SevenIsland_TrainerTower_3F_MapEvents:: + map_events SevenIsland_TrainerTower_3F_EventObjects, SevenIsland_TrainerTower_3F_MapWarps, SevenIsland_TrainerTower_3F_MapCoordEvents, 0x0 diff --git a/data/maps/SevenIsland_TrainerTower_4F/events.inc b/data/maps/SevenIsland_TrainerTower_4F/events.inc new file mode 100644 index 000000000..90ee6424c --- /dev/null +++ b/data/maps/SevenIsland_TrainerTower_4F/events.inc @@ -0,0 +1,19 @@ +SevenIsland_TrainerTower_4F_EventObjects: + object_event 1, 70, 0, 9, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_4F_EventScript_1646E0, 6, 0, 0 + object_event 2, 240, 0, 10, 0, 10, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_4F_EventScript_1646C8, 2, 0, 0 + object_event 3, 241, 0, 15, 0, 13, 0, 3, 9, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_4F_EventScript_1646CE, 3, 0, 0 + object_event 4, 242, 0, 10, 0, 16, 0, 3, 7, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_4F_EventScript_1646D4, 4, 0, 0 + object_event 5, 243, 0, 11, 0, 10, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_4F_EventScript_1646DA, 5, 0, 0 + +SevenIsland_TrainerTower_4F_MapWarps: + warp_def 15, 6, 3, 1, 517 + warp_def 4, 6, 3, 0, 515 + warp_def 13, 5, 0, 0, 523 + +SevenIsland_TrainerTower_4F_MapCoordEvents: + coord_event 10, 13, 3, 0, 16398, 0, 0, SevenIsland_TrainerTower_4F_EventScript_1C54AF + coord_event 9, 12, 3, 0, 16399, 0, 0, SevenIsland_TrainerTower_4F_EventScript_1C54B4 + coord_event 9, 13, 3, 0, 16399, 0, 0, SevenIsland_TrainerTower_4F_EventScript_1C54EA + +SevenIsland_TrainerTower_4F_MapEvents:: + map_events SevenIsland_TrainerTower_4F_EventObjects, SevenIsland_TrainerTower_4F_MapWarps, SevenIsland_TrainerTower_4F_MapCoordEvents, 0x0 diff --git a/data/maps/SevenIsland_TrainerTower_5F/events.inc b/data/maps/SevenIsland_TrainerTower_5F/events.inc new file mode 100644 index 000000000..05f34de05 --- /dev/null +++ b/data/maps/SevenIsland_TrainerTower_5F/events.inc @@ -0,0 +1,19 @@ +SevenIsland_TrainerTower_5F_EventObjects: + object_event 1, 70, 0, 9, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_5F_EventScript_1646E0, 6, 0, 0 + object_event 2, 240, 0, 10, 0, 10, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_5F_EventScript_1646C8, 2, 0, 0 + object_event 3, 241, 0, 15, 0, 13, 0, 3, 9, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_5F_EventScript_1646CE, 3, 0, 0 + object_event 4, 242, 0, 10, 0, 16, 0, 3, 7, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_5F_EventScript_1646D4, 4, 0, 0 + object_event 5, 243, 0, 11, 0, 10, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_5F_EventScript_1646DA, 5, 0, 0 + +SevenIsland_TrainerTower_5F_MapWarps: + warp_def 15, 6, 3, 1, 518 + warp_def 4, 6, 3, 0, 516 + warp_def 13, 5, 0, 0, 523 + +SevenIsland_TrainerTower_5F_MapCoordEvents: + coord_event 10, 13, 3, 0, 16398, 0, 0, SevenIsland_TrainerTower_5F_EventScript_1C54AF + coord_event 9, 12, 3, 0, 16399, 0, 0, SevenIsland_TrainerTower_5F_EventScript_1C54B4 + coord_event 9, 13, 3, 0, 16399, 0, 0, SevenIsland_TrainerTower_5F_EventScript_1C54EA + +SevenIsland_TrainerTower_5F_MapEvents:: + map_events SevenIsland_TrainerTower_5F_EventObjects, SevenIsland_TrainerTower_5F_MapWarps, SevenIsland_TrainerTower_5F_MapCoordEvents, 0x0 diff --git a/data/maps/SevenIsland_TrainerTower_6F/events.inc b/data/maps/SevenIsland_TrainerTower_6F/events.inc new file mode 100644 index 000000000..19d7c16d0 --- /dev/null +++ b/data/maps/SevenIsland_TrainerTower_6F/events.inc @@ -0,0 +1,19 @@ +SevenIsland_TrainerTower_6F_EventObjects: + object_event 1, 70, 0, 9, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_6F_EventScript_1646E0, 6, 0, 0 + object_event 2, 240, 0, 10, 0, 10, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_6F_EventScript_1646C8, 2, 0, 0 + object_event 3, 241, 0, 15, 0, 13, 0, 3, 9, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_6F_EventScript_1646CE, 3, 0, 0 + object_event 4, 242, 0, 10, 0, 16, 0, 3, 7, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_6F_EventScript_1646D4, 4, 0, 0 + object_event 5, 243, 0, 11, 0, 10, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_6F_EventScript_1646DA, 5, 0, 0 + +SevenIsland_TrainerTower_6F_MapWarps: + warp_def 15, 6, 3, 1, 519 + warp_def 4, 6, 3, 0, 517 + warp_def 13, 5, 0, 0, 523 + +SevenIsland_TrainerTower_6F_MapCoordEvents: + coord_event 10, 13, 3, 0, 16398, 0, 0, SevenIsland_TrainerTower_6F_EventScript_1C54AF + coord_event 9, 12, 3, 0, 16399, 0, 0, SevenIsland_TrainerTower_6F_EventScript_1C54B4 + coord_event 9, 13, 3, 0, 16399, 0, 0, SevenIsland_TrainerTower_6F_EventScript_1C54EA + +SevenIsland_TrainerTower_6F_MapEvents:: + map_events SevenIsland_TrainerTower_6F_EventObjects, SevenIsland_TrainerTower_6F_MapWarps, SevenIsland_TrainerTower_6F_MapCoordEvents, 0x0 diff --git a/data/maps/SevenIsland_TrainerTower_7F/events.inc b/data/maps/SevenIsland_TrainerTower_7F/events.inc new file mode 100644 index 000000000..7a79976e2 --- /dev/null +++ b/data/maps/SevenIsland_TrainerTower_7F/events.inc @@ -0,0 +1,19 @@ +SevenIsland_TrainerTower_7F_EventObjects: + object_event 1, 70, 0, 9, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_7F_EventScript_1646E0, 6, 0, 0 + object_event 2, 240, 0, 10, 0, 10, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_7F_EventScript_1646C8, 2, 0, 0 + object_event 3, 241, 0, 15, 0, 13, 0, 3, 9, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_7F_EventScript_1646CE, 3, 0, 0 + object_event 4, 242, 0, 10, 0, 16, 0, 3, 7, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_7F_EventScript_1646D4, 4, 0, 0 + object_event 5, 243, 0, 11, 0, 10, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_7F_EventScript_1646DA, 5, 0, 0 + +SevenIsland_TrainerTower_7F_MapWarps: + warp_def 15, 6, 3, 1, 520 + warp_def 4, 6, 3, 0, 518 + warp_def 13, 5, 0, 0, 523 + +SevenIsland_TrainerTower_7F_MapCoordEvents: + coord_event 10, 13, 3, 0, 16398, 0, 0, SevenIsland_TrainerTower_7F_EventScript_1C54AF + coord_event 9, 12, 3, 0, 16399, 0, 0, SevenIsland_TrainerTower_7F_EventScript_1C54B4 + coord_event 9, 13, 3, 0, 16399, 0, 0, SevenIsland_TrainerTower_7F_EventScript_1C54EA + +SevenIsland_TrainerTower_7F_MapEvents:: + map_events SevenIsland_TrainerTower_7F_EventObjects, SevenIsland_TrainerTower_7F_MapWarps, SevenIsland_TrainerTower_7F_MapCoordEvents, 0x0 diff --git a/data/maps/SevenIsland_TrainerTower_8F/events.inc b/data/maps/SevenIsland_TrainerTower_8F/events.inc new file mode 100644 index 000000000..954156501 --- /dev/null +++ b/data/maps/SevenIsland_TrainerTower_8F/events.inc @@ -0,0 +1,19 @@ +SevenIsland_TrainerTower_8F_EventObjects: + object_event 1, 70, 0, 9, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_8F_EventScript_1646E0, 6, 0, 0 + object_event 2, 240, 0, 10, 0, 10, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_8F_EventScript_1646C8, 2, 0, 0 + object_event 3, 241, 0, 15, 0, 13, 0, 3, 9, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_8F_EventScript_1646CE, 3, 0, 0 + object_event 4, 242, 0, 10, 0, 16, 0, 3, 7, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_8F_EventScript_1646D4, 4, 0, 0 + object_event 5, 243, 0, 11, 0, 10, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_8F_EventScript_1646DA, 5, 0, 0 + +SevenIsland_TrainerTower_8F_MapWarps: + warp_def 15, 6, 3, 1, 521 + warp_def 4, 6, 3, 0, 519 + warp_def 13, 5, 0, 0, 523 + +SevenIsland_TrainerTower_8F_MapCoordEvents: + coord_event 10, 13, 3, 0, 16398, 0, 0, SevenIsland_TrainerTower_8F_EventScript_1C54AF + coord_event 9, 12, 3, 0, 16399, 0, 0, SevenIsland_TrainerTower_8F_EventScript_1C54B4 + coord_event 9, 13, 3, 0, 16399, 0, 0, SevenIsland_TrainerTower_8F_EventScript_1C54EA + +SevenIsland_TrainerTower_8F_MapEvents:: + map_events SevenIsland_TrainerTower_8F_EventObjects, SevenIsland_TrainerTower_8F_MapWarps, SevenIsland_TrainerTower_8F_MapCoordEvents, 0x0 diff --git a/data/maps/SevenIsland_TrainerTower_Elevator/events.inc b/data/maps/SevenIsland_TrainerTower_Elevator/events.inc new file mode 100644 index 000000000..4bbf2d788 --- /dev/null +++ b/data/maps/SevenIsland_TrainerTower_Elevator/events.inc @@ -0,0 +1,8 @@ +SevenIsland_TrainerTower_Elevator_MapWarps: + warp_def 2, 5, 3, 127, 32639 + +SevenIsland_TrainerTower_Elevator_MapBGEvents: + bg_event 0, 2, 0, 0, 0, SevenIsland_TrainerTower_Elevator_EventScript_164B03 + +SevenIsland_TrainerTower_Elevator_MapEvents:: + map_events 0x0, SevenIsland_TrainerTower_Elevator_MapWarps, 0x0, SevenIsland_TrainerTower_Elevator_MapBGEvents diff --git a/data/maps/SevenIsland_TrainerTower_Lobby/events.inc b/data/maps/SevenIsland_TrainerTower_Lobby/events.inc new file mode 100644 index 000000000..6a4caa607 --- /dev/null +++ b/data/maps/SevenIsland_TrainerTower_Lobby/events.inc @@ -0,0 +1,20 @@ +SevenIsland_TrainerTower_Lobby_EventObjects: + object_event 1, 64, 0, 4, 0, 9, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_Lobby_EventScript_16495D, 0, 0, 0 + object_event 2, 66, 0, 14, 0, 9, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_Lobby_EventScript_164992, 0, 0, 0 + object_event 3, 66, 0, 11, 0, 7, 0, 3, 9, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_Lobby_EventScript_164966, 0, 0, 0 + object_event 4, 42, 0, 12, 0, 13, 0, 3, 2, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_Lobby_EventScript_164AE6, 0, 0, 0 + object_event 5, 30, 0, 2, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_Lobby_EventScript_164AEF, 0, 0, 0 + +SevenIsland_TrainerTower_Lobby_MapWarps: + warp_def 9, 2, 3, 1, 513 + warp_def 9, 15, 3, 0, 830 + warp_def 17, 8, 0, 0, 523 + +SevenIsland_TrainerTower_Lobby_MapCoordEvents: + coord_event 9, 7, 3, 0, 16514, 0, 0, SevenIsland_TrainerTower_Lobby_EventScript_1649CE + +SevenIsland_TrainerTower_Lobby_MapBGEvents: + bg_event 8, 10, 0, 1, 0, SevenIsland_TrainerTower_Lobby_EventScript_164AD8 + +SevenIsland_TrainerTower_Lobby_MapEvents:: + map_events SevenIsland_TrainerTower_Lobby_EventObjects, SevenIsland_TrainerTower_Lobby_MapWarps, SevenIsland_TrainerTower_Lobby_MapCoordEvents, SevenIsland_TrainerTower_Lobby_MapBGEvents diff --git a/data/maps/SevenIsland_TrainerTower_Roof/events.inc b/data/maps/SevenIsland_TrainerTower_Roof/events.inc new file mode 100644 index 000000000..c4453519c --- /dev/null +++ b/data/maps/SevenIsland_TrainerTower_Roof/events.inc @@ -0,0 +1,9 @@ +SevenIsland_TrainerTower_Roof_EventObjects: + object_event 1, 70, 0, 9, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_Roof_EventScript_1646E0, 6, 0, 0 + +SevenIsland_TrainerTower_Roof_MapWarps: + warp_def 13, 5, 0, 0, 523 + warp_def 4, 6, 3, 0, 520 + +SevenIsland_TrainerTower_Roof_MapEvents:: + map_events SevenIsland_TrainerTower_Roof_EventObjects, SevenIsland_TrainerTower_Roof_MapWarps, 0x0, 0x0 diff --git a/data/maps/SilphCo_10F/events.inc b/data/maps/SilphCo_10F/events.inc new file mode 100644 index 000000000..fac92e748 --- /dev/null +++ b/data/maps/SilphCo_10F/events.inc @@ -0,0 +1,26 @@ +SilphCo_10F_EventObjects: + object_event 1, 55, 0, 2, 0, 7, 0, 3, 2, 34, 0, 1, 0, 1, 0, SilphCo_10F_EventScript_161DC0, 83, 0, 0 + object_event 2, 48, 0, 10, 0, 17, 0, 3, 8, 17, 0, 0, 0, 0, 0, SilphCo_10F_EventScript_161D96, 0, 0, 0 + object_event 3, 49, 0, 0, 0, 13, 0, 3, 10, 17, 0, 1, 0, 4, 0, SilphCo_10F_EventScript_161DD7, 83, 0, 0 + object_event 4, 92, 0, 5, 0, 15, 0, 3, 8, 17, 0, 0, 0, 0, 0, SilphCo_10F_EventScript_1BE8F5, 407, 0, 0 + object_event 5, 92, 0, 2, 0, 15, 0, 3, 8, 17, 0, 0, 0, 0, 0, SilphCo_10F_EventScript_1BE902, 408, 0, 0 + object_event 6, 92, 0, 3, 0, 17, 0, 3, 8, 17, 0, 0, 0, 0, 0, SilphCo_10F_EventScript_1BE90F, 409, 0, 0 + +SilphCo_10F_MapWarps: + warp_def 6, 2, 3, 0, 313 + warp_def 10, 14, 3, 3, 306 + warp_def 14, 9, 3, 5, 306 + warp_def 8, 2, 3, 3, 311 + warp_def 14, 17, 3, 4, 306 + warp_def 13, 3, 0, 0, 314 + +SilphCo_10F_MapBGEvents: + bg_event 12, 11, 0, 0, 0, SilphCo_10F_EventScript_1A8AEF + bg_event 13, 11, 0, 0, 0, SilphCo_10F_EventScript_1A8AEF + bg_event 12, 12, 0, 0, 0, SilphCo_10F_EventScript_1A8AEF + bg_event 13, 12, 0, 0, 0, SilphCo_10F_EventScript_1A8AEF + bg_event 9, 9, 0, 7, 0, 63, 143, 1 + bg_event 7, 1, 0, 0, 0, SilphCo_10F_EventScript_161DB7 + +SilphCo_10F_MapEvents:: + map_events SilphCo_10F_EventObjects, SilphCo_10F_MapWarps, 0x0, SilphCo_10F_MapBGEvents diff --git a/data/maps/SilphCo_11F/events.inc b/data/maps/SilphCo_11F/events.inc new file mode 100644 index 000000000..1621f58ec --- /dev/null +++ b/data/maps/SilphCo_11F/events.inc @@ -0,0 +1,27 @@ +SilphCo_11F_EventObjects: + object_event 1, 33, 0, 9, 0, 9, 0, 3, 8, 17, 0, 0, 0, 0, 0, SilphCo_11F_EventScript_161DFE, 0, 0, 0 + object_event 2, 48, 0, 11, 0, 9, 0, 3, 8, 17, 0, 0, 0, 0, 0, SilphCo_11F_EventScript_161E7F, 0, 0, 0 + object_event 3, 87, 0, 6, 0, 11, 0, 3, 10, 17, 0, 0, 0, 0, 0, 0x0, 83, 0, 0 + object_event 4, 49, 0, 16, 0, 12, 0, 3, 7, 17, 0, 1, 0, 5, 0, SilphCo_11F_EventScript_161F40, 83, 0, 0 + object_event 5, 92, 0, 16, 0, 18, 0, 3, 8, 17, 0, 0, 0, 0, 0, SilphCo_11F_EventScript_1BEB58, 457, 0, 0 + object_event 6, 49, 0, 2, 0, 19, 0, 3, 7, 17, 0, 1, 0, 5, 0, SilphCo_11F_EventScript_161F57, 83, 0, 0 + +SilphCo_11F_MapWarps: + warp_def 7, 2, 3, 0, 312 + warp_def 2, 5, 3, 1, 309 + warp_def 13, 3, 0, 0, 314 + +SilphCo_11F_MapCoordEvents: + coord_event 5, 15, 3, 0, 16480, 0, 0, SilphCo_11F_EventScript_161E88 + coord_event 6, 15, 3, 0, 16480, 0, 0, SilphCo_11F_EventScript_161E94 + +SilphCo_11F_MapBGEvents: + bg_event 5, 16, 3, 0, 0, SilphCo_11F_EventScript_1A8B09 + bg_event 5, 17, 3, 0, 0, SilphCo_11F_EventScript_1A8B09 + bg_event 6, 16, 3, 0, 0, SilphCo_11F_EventScript_1A8B09 + bg_event 6, 17, 3, 0, 0, SilphCo_11F_EventScript_1A8B09 + bg_event 10, 18, 0, 7, 0, 24, 144, 1 + bg_event 8, 1, 0, 0, 0, SilphCo_11F_EventScript_161F37 + +SilphCo_11F_MapEvents:: + map_events SilphCo_11F_EventObjects, SilphCo_11F_MapWarps, SilphCo_11F_MapCoordEvents, SilphCo_11F_MapBGEvents diff --git a/data/maps/SilphCo_1F/events.inc b/data/maps/SilphCo_1F/events.inc new file mode 100644 index 000000000..2b23153f7 --- /dev/null +++ b/data/maps/SilphCo_1F/events.inc @@ -0,0 +1,15 @@ +SilphCo_1F_EventObjects: + object_event 1, 48, 0, 3, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, SilphCo_1F_EventScript_16162F, 63, 0, 0 + +SilphCo_1F_MapWarps: + warp_def 7, 21, 0, 0, 778 + warp_def 8, 20, 3, 0, 778 + warp_def 9, 20, 3, 0, 778 + warp_def 31, 2, 3, 3, 304 + warp_def 22, 3, 0, 0, 314 + +SilphCo_1F_MapBGEvents: + bg_event 30, 1, 0, 0, 0, SilphCo_1F_EventScript_161638 + +SilphCo_1F_MapEvents:: + map_events SilphCo_1F_EventObjects, SilphCo_1F_MapWarps, 0x0, SilphCo_1F_MapBGEvents diff --git a/data/maps/SilphCo_2F/events.inc b/data/maps/SilphCo_2F/events.inc new file mode 100644 index 000000000..166629955 --- /dev/null +++ b/data/maps/SilphCo_2F/events.inc @@ -0,0 +1,30 @@ +SilphCo_2F_EventObjects: + object_event 1, 49, 0, 29, 0, 12, 0, 3, 7, 17, 0, 1, 0, 5, 0, SilphCo_2F_EventScript_1616AE, 83, 0, 0 + object_event 2, 55, 0, 28, 0, 18, 0, 3, 15, 17, 0, 1, 0, 4, 0, SilphCo_2F_EventScript_161680, 83, 0, 0 + object_event 3, 49, 0, 20, 0, 14, 0, 3, 13, 17, 0, 1, 0, 3, 0, SilphCo_2F_EventScript_161697, 83, 0, 0 + object_event 4, 55, 0, 5, 0, 19, 0, 3, 1, 17, 0, 1, 0, 0, 0, SilphCo_2F_EventScript_161669, 83, 0, 0 + object_event 5, 28, 0, 10, 0, 4, 0, 0, 7, 17, 0, 0, 0, 0, 0, SilphCo_2F_EventScript_16165A, 0, 0, 0 + +SilphCo_2F_MapWarps: + warp_def 28, 2, 3, 0, 305 + warp_def 2, 6, 3, 8, 305 + warp_def 15, 6, 3, 5, 310 + warp_def 30, 2, 3, 3, 303 + warp_def 7, 19, 3, 1, 308 + warp_def 33, 19, 3, 2, 310 + warp_def 22, 3, 0, 0, 314 + +SilphCo_2F_MapBGEvents: + bg_event 5, 8, 0, 0, 0, SilphCo_2F_EventScript_1A891B + bg_event 6, 8, 0, 0, 0, SilphCo_2F_EventScript_1A891B + bg_event 5, 9, 0, 0, 0, SilphCo_2F_EventScript_1A891B + bg_event 6, 9, 0, 0, 0, SilphCo_2F_EventScript_1A891B + bg_event 5, 15, 0, 0, 0, SilphCo_2F_EventScript_1A8935 + bg_event 6, 15, 0, 0, 0, SilphCo_2F_EventScript_1A8935 + bg_event 5, 16, 0, 0, 0, SilphCo_2F_EventScript_1A8935 + bg_event 6, 16, 0, 0, 0, SilphCo_2F_EventScript_1A8935 + bg_event 11, 21, 0, 7, 0, 2, 135, 1 + bg_event 29, 1, 0, 0, 0, SilphCo_2F_EventScript_161660 + +SilphCo_2F_MapEvents:: + map_events SilphCo_2F_EventObjects, SilphCo_2F_MapWarps, 0x0, SilphCo_2F_MapBGEvents diff --git a/data/maps/SilphCo_3F/events.inc b/data/maps/SilphCo_3F/events.inc new file mode 100644 index 000000000..7db296662 --- /dev/null +++ b/data/maps/SilphCo_3F/events.inc @@ -0,0 +1,32 @@ +SilphCo_3F_EventObjects: + object_event 1, 49, 0, 25, 0, 9, 0, 3, 9, 17, 0, 1, 0, 3, 0, SilphCo_3F_EventScript_16171F, 83, 0, 0 + object_event 2, 47, 0, 31, 0, 13, 0, 3, 1, 17, 0, 0, 0, 0, 0, SilphCo_3F_EventScript_1616DE, 0, 0, 0 + object_event 3, 55, 0, 4, 0, 12, 0, 3, 1, 17, 0, 1, 0, 0, 0, SilphCo_3F_EventScript_161708, 83, 0, 0 + object_event 4, 92, 0, 8, 0, 10, 0, 3, 8, 17, 0, 0, 0, 0, 0, SilphCo_3F_EventScript_1BE866, 396, 0, 0 + +SilphCo_3F_MapWarps: + warp_def 28, 2, 3, 0, 304 + warp_def 4, 6, 3, 1, 307 + warp_def 13, 14, 3, 4, 309 + warp_def 30, 2, 3, 2, 306 + warp_def 2, 14, 3, 2, 311 + warp_def 3, 20, 3, 4, 307 + warp_def 29, 14, 3, 7, 305 + warp_def 32, 20, 3, 6, 305 + warp_def 33, 5, 3, 1, 304 + warp_def 22, 3, 0, 0, 314 + +SilphCo_3F_MapBGEvents: + bg_event 10, 12, 3, 0, 0, SilphCo_3F_EventScript_1A894F + bg_event 10, 13, 3, 0, 0, SilphCo_3F_EventScript_1A894F + bg_event 21, 12, 3, 0, 0, SilphCo_3F_EventScript_1A8969 + bg_event 21, 13, 3, 0, 0, SilphCo_3F_EventScript_1A8969 + bg_event 9, 12, 3, 0, 0, SilphCo_3F_EventScript_1A894F + bg_event 9, 13, 3, 0, 0, SilphCo_3F_EventScript_1A894F + bg_event 20, 12, 3, 0, 0, SilphCo_3F_EventScript_1A8969 + bg_event 20, 13, 3, 0, 0, SilphCo_3F_EventScript_1A8969 + bg_event 34, 18, 0, 7, 0, 64, 136, 1 + bg_event 29, 1, 0, 0, 0, SilphCo_3F_EventScript_1616FF + +SilphCo_3F_MapEvents:: + map_events SilphCo_3F_EventObjects, SilphCo_3F_MapWarps, 0x0, SilphCo_3F_MapBGEvents diff --git a/data/maps/SilphCo_4F/events.inc b/data/maps/SilphCo_4F/events.inc new file mode 100644 index 000000000..175e147b8 --- /dev/null +++ b/data/maps/SilphCo_4F/events.inc @@ -0,0 +1,33 @@ +SilphCo_4F_EventObjects: + object_event 1, 49, 0, 33, 0, 16, 0, 3, 2, 17, 0, 1, 0, 1, 0, SilphCo_4F_EventScript_1617A7, 83, 0, 0 + object_event 2, 49, 0, 10, 0, 19, 0, 3, 10, 17, 0, 1, 0, 5, 0, SilphCo_4F_EventScript_161790, 83, 0, 0 + object_event 3, 55, 0, 14, 0, 8, 0, 3, 17, 17, 0, 1, 0, 2, 0, SilphCo_4F_EventScript_161779, 83, 0, 0 + object_event 4, 47, 0, 5, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, SilphCo_4F_EventScript_16174F, 0, 0, 0 + object_event 5, 92, 0, 3, 0, 11, 0, 3, 8, 17, 0, 0, 0, 0, 0, SilphCo_4F_EventScript_1BE873, 397, 0, 0 + object_event 6, 92, 0, 4, 0, 12, 0, 3, 8, 17, 0, 0, 0, 0, 0, SilphCo_4F_EventScript_1BE880, 398, 0, 0 + object_event 7, 92, 0, 2, 0, 13, 0, 3, 8, 17, 0, 0, 0, 0, 0, SilphCo_4F_EventScript_1BE88D, 399, 0, 0 + object_event 8, 92, 0, 30, 0, 18, 0, 0, 8, 17, 0, 0, 0, 0, 0, SilphCo_4F_EventScript_1BEE09, 510, 0, 0 + +SilphCo_4F_MapWarps: + warp_def 28, 2, 3, 0, 307 + warp_def 18, 6, 3, 3, 308 + warp_def 30, 2, 3, 3, 305 + warp_def 12, 9, 3, 1, 312 + warp_def 2, 20, 3, 4, 312 + warp_def 18, 14, 3, 2, 312 + warp_def 22, 3, 0, 0, 314 + +SilphCo_4F_MapBGEvents: + bg_event 3, 16, 0, 0, 0, SilphCo_4F_EventScript_1A8983 + bg_event 4, 16, 0, 0, 0, SilphCo_4F_EventScript_1A8983 + bg_event 3, 17, 0, 0, 0, SilphCo_4F_EventScript_1A8983 + bg_event 4, 17, 0, 0, 0, SilphCo_4F_EventScript_1A8983 + bg_event 15, 11, 0, 0, 0, SilphCo_4F_EventScript_1A899D + bg_event 14, 11, 0, 0, 0, SilphCo_4F_EventScript_1A899D + bg_event 14, 12, 0, 0, 0, SilphCo_4F_EventScript_1A899D + bg_event 15, 12, 0, 0, 0, SilphCo_4F_EventScript_1A899D + bg_event 35, 20, 0, 7, 0, 65, 137, 1 + bg_event 29, 1, 0, 0, 0, SilphCo_4F_EventScript_161770 + +SilphCo_4F_MapEvents:: + map_events SilphCo_4F_EventObjects, SilphCo_4F_MapWarps, 0x0, SilphCo_4F_MapBGEvents diff --git a/data/maps/SilphCo_5F/events.inc b/data/maps/SilphCo_5F/events.inc new file mode 100644 index 000000000..86c9cc92b --- /dev/null +++ b/data/maps/SilphCo_5F/events.inc @@ -0,0 +1,42 @@ +SilphCo_5F_EventObjects: + object_event 1, 49, 0, 35, 0, 7, 0, 3, 7, 17, 0, 1, 0, 2, 0, SilphCo_5F_EventScript_161853, 83, 0, 0 + object_event 2, 26, 0, 23, 0, 13, 0, 3, 13, 17, 0, 1, 0, 4, 0, SilphCo_5F_EventScript_16186A, 83, 0, 0 + object_event 3, 47, 0, 16, 0, 13, 0, 3, 1, 17, 0, 0, 0, 0, 0, SilphCo_5F_EventScript_1617E0, 0, 0, 0 + object_event 4, 55, 0, 11, 0, 6, 0, 3, 2, 17, 0, 1, 0, 1, 0, SilphCo_5F_EventScript_161825, 83, 0, 0 + object_event 5, 49, 0, 9, 0, 21, 0, 3, 16, 17, 0, 1, 0, 3, 0, SilphCo_5F_EventScript_16183C, 83, 0, 0 + object_event 6, 92, 0, 4, 0, 9, 0, 3, 8, 17, 0, 0, 0, 0, 0, SilphCo_5F_EventScript_1BE89A, 400, 0, 0 + object_event 7, 92, 0, 1, 0, 18, 0, 3, 8, 17, 0, 0, 0, 0, 0, SilphCo_5F_EventScript_1BE8A7, 401, 0, 0 + object_event 8, 92, 0, 22, 0, 21, 0, 3, 8, 17, 0, 0, 0, 0, 0, SilphCo_5F_EventScript_1BE8B4, 402, 0, 0 + object_event 9, 55, 0, 2, 0, 7, 0, 3, 28, 18, 0, 0, 0, 0, 0, SilphCo_5F_EventScript_1AD0D4, 0, 0, 0 + +SilphCo_5F_MapWarps: + warp_def 28, 2, 3, 0, 306 + warp_def 15, 7, 3, 1, 305 + warp_def 30, 2, 3, 2, 308 + warp_def 10, 20, 3, 1, 311 + warp_def 2, 20, 3, 5, 305 + warp_def 33, 5, 3, 2, 309 + warp_def 22, 3, 0, 0, 314 + +SilphCo_5F_MapBGEvents: + bg_event 13, 16, 0, 7, 0, 36, 24, 1 + bg_event 8, 9, 0, 0, 0, SilphCo_5F_EventScript_1A89B7 + bg_event 8, 10, 0, 0, 0, SilphCo_5F_EventScript_1A89B7 + bg_event 8, 18, 0, 0, 0, SilphCo_5F_EventScript_1A89D1 + bg_event 8, 19, 0, 0, 0, SilphCo_5F_EventScript_1A89D1 + bg_event 19, 13, 0, 0, 0, SilphCo_5F_EventScript_1A89EB + bg_event 19, 14, 0, 0, 0, SilphCo_5F_EventScript_1A89EB + bg_event 7, 9, 0, 0, 0, SilphCo_5F_EventScript_1A89B7 + bg_event 7, 10, 0, 0, 0, SilphCo_5F_EventScript_1A89B7 + bg_event 7, 19, 0, 0, 0, SilphCo_5F_EventScript_1A89D1 + bg_event 7, 18, 0, 0, 0, SilphCo_5F_EventScript_1A89D1 + bg_event 18, 13, 0, 0, 0, SilphCo_5F_EventScript_1A89EB + bg_event 18, 14, 0, 0, 0, SilphCo_5F_EventScript_1A89EB + bg_event 28, 11, 0, 0, 0, SilphCo_5F_EventScript_161813 + bg_event 30, 13, 0, 0, 0, SilphCo_5F_EventScript_16180A + bg_event 25, 15, 0, 0, 0, SilphCo_5F_EventScript_161801 + bg_event 32, 9, 0, 7, 0, 69, 138, 1 + bg_event 29, 1, 0, 0, 0, SilphCo_5F_EventScript_16181C + +SilphCo_5F_MapEvents:: + map_events SilphCo_5F_EventObjects, SilphCo_5F_MapWarps, 0x0, SilphCo_5F_MapBGEvents diff --git a/data/maps/SilphCo_6F/events.inc b/data/maps/SilphCo_6F/events.inc new file mode 100644 index 000000000..e83088be8 --- /dev/null +++ b/data/maps/SilphCo_6F/events.inc @@ -0,0 +1,29 @@ +SilphCo_6F_EventObjects: + object_event 1, 49, 0, 21, 0, 5, 0, 3, 10, 17, 0, 1, 0, 2, 0, SilphCo_6F_EventScript_161956, 83, 0, 0 + object_event 2, 47, 0, 23, 0, 9, 0, 3, 8, 17, 0, 0, 0, 0, 0, SilphCo_6F_EventScript_1618D3, 0, 0, 0 + object_event 3, 48, 0, 24, 0, 9, 0, 3, 8, 17, 0, 0, 0, 0, 0, SilphCo_6F_EventScript_1618F4, 0, 0, 0 + object_event 4, 47, 0, 22, 0, 13, 0, 3, 7, 17, 0, 0, 0, 0, 0, SilphCo_6F_EventScript_161891, 0, 0, 0 + object_event 5, 47, 0, 14, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, SilphCo_6F_EventScript_1618B2, 0, 0, 0 + object_event 6, 48, 0, 16, 0, 12, 0, 3, 10, 17, 0, 0, 0, 0, 0, SilphCo_6F_EventScript_161915, 0, 0, 0 + object_event 7, 55, 0, 9, 0, 11, 0, 3, 8, 17, 0, 1, 0, 4, 0, SilphCo_6F_EventScript_16193F, 83, 0, 0 + object_event 8, 92, 0, 2, 0, 14, 0, 3, 8, 17, 0, 0, 0, 0, 0, SilphCo_6F_EventScript_1BE8C1, 403, 0, 0 + object_event 9, 92, 0, 1, 0, 17, 0, 3, 8, 17, 0, 0, 0, 0, 0, SilphCo_6F_EventScript_1BE8CE, 404, 0, 0 + object_event 10, 49, 0, 18, 0, 17, 0, 3, 9, 17, 0, 1, 0, 2, 0, SilphCo_6F_EventScript_16196D, 83, 0, 0 + +SilphCo_6F_MapWarps: + warp_def 14, 2, 3, 0, 309 + warp_def 29, 5, 3, 4, 304 + warp_def 26, 2, 3, 2, 307 + warp_def 2, 6, 3, 1, 306 + warp_def 20, 3, 0, 0, 314 + +SilphCo_6F_MapBGEvents: + bg_event 6, 15, 0, 0, 0, SilphCo_6F_EventScript_1A8A05 + bg_event 6, 16, 0, 0, 0, SilphCo_6F_EventScript_1A8A05 + bg_event 5, 15, 0, 0, 0, SilphCo_6F_EventScript_1A8A05 + bg_event 5, 16, 0, 0, 0, SilphCo_6F_EventScript_1A8A05 + bg_event 1, 8, 0, 7, 0, 66, 139, 1 + bg_event 25, 1, 0, 0, 0, SilphCo_6F_EventScript_161936 + +SilphCo_6F_MapEvents:: + map_events SilphCo_6F_EventObjects, SilphCo_6F_MapWarps, 0x0, SilphCo_6F_MapBGEvents diff --git a/data/maps/SilphCo_7F/events.inc b/data/maps/SilphCo_7F/events.inc new file mode 100644 index 000000000..8373b3a57 --- /dev/null +++ b/data/maps/SilphCo_7F/events.inc @@ -0,0 +1,43 @@ +SilphCo_7F_EventObjects: + object_event 1, 72, 0, 2, 0, 6, 0, 3, 7, 17, 0, 0, 0, 0, 0, 0x0, 78, 0, 0 + object_event 2, 47, 0, 0, 0, 7, 0, 3, 10, 17, 0, 0, 0, 0, 0, SilphCo_7F_EventScript_161AC8, 0, 0, 0 + object_event 3, 49, 0, 24, 0, 5, 0, 3, 9, 17, 0, 1, 0, 4, 0, SilphCo_7F_EventScript_161C1A, 83, 0, 0 + object_event 4, 49, 0, 24, 0, 15, 0, 3, 10, 17, 0, 1, 0, 2, 0, SilphCo_7F_EventScript_161C31, 83, 0, 0 + object_event 5, 49, 0, 13, 0, 4, 0, 3, 8, 17, 0, 1, 0, 3, 0, SilphCo_7F_EventScript_161C48, 83, 0, 0 + object_event 6, 48, 0, 10, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, SilphCo_7F_EventScript_161BD9, 0, 0, 0 + object_event 7, 47, 0, 13, 0, 14, 0, 3, 9, 17, 0, 0, 0, 0, 0, SilphCo_7F_EventScript_161B97, 0, 0, 0 + object_event 8, 47, 0, 9, 0, 14, 0, 3, 27, 17, 0, 0, 0, 0, 0, SilphCo_7F_EventScript_161BB8, 0, 0, 0 + object_event 9, 55, 0, 3, 0, 13, 0, 3, 5, 18, 0, 1, 0, 1, 0, SilphCo_7F_EventScript_161C03, 83, 0, 0 + object_event 10, 92, 0, 0, 0, 12, 0, 3, 8, 17, 0, 0, 0, 0, 0, SilphCo_7F_EventScript_1BE8DB, 405, 0, 0 + object_event 11, 92, 0, 30, 0, 11, 0, 3, 8, 17, 0, 0, 0, 0, 0, SilphCo_7F_EventScript_1BE8E8, 406, 0, 0 + +SilphCo_7F_MapWarps: + warp_def 19, 2, 3, 0, 308 + warp_def 5, 8, 3, 1, 313 + warp_def 25, 17, 3, 5, 307 + warp_def 27, 2, 3, 3, 310 + warp_def 5, 4, 3, 2, 305 + warp_def 23, 3, 0, 0, 314 + +SilphCo_7F_MapCoordEvents: + coord_event 2, 4, 3, 0, 16476, 0, 0, SilphCo_7F_EventScript_1619BC + coord_event 2, 5, 3, 0, 16476, 0, 0, SilphCo_7F_EventScript_1619C8 + +SilphCo_7F_MapBGEvents: + bg_event 11, 8, 0, 0, 0, SilphCo_7F_EventScript_1A8A1F + bg_event 12, 8, 0, 0, 0, SilphCo_7F_EventScript_1A8A1F + bg_event 11, 9, 0, 0, 0, SilphCo_7F_EventScript_1A8A1F + bg_event 12, 9, 0, 0, 0, SilphCo_7F_EventScript_1A8A1F + bg_event 24, 7, 0, 0, 0, SilphCo_7F_EventScript_1A8A39 + bg_event 25, 7, 0, 0, 0, SilphCo_7F_EventScript_1A8A39 + bg_event 25, 8, 0, 0, 0, SilphCo_7F_EventScript_1A8A39 + bg_event 24, 8, 0, 0, 0, SilphCo_7F_EventScript_1A8A39 + bg_event 25, 13, 0, 0, 0, SilphCo_7F_EventScript_1A8A53 + bg_event 26, 13, 0, 0, 0, SilphCo_7F_EventScript_1A8A53 + bg_event 25, 14, 0, 0, 0, SilphCo_7F_EventScript_1A8A53 + bg_event 26, 14, 0, 0, 0, SilphCo_7F_EventScript_1A8A53 + bg_event 22, 11, 0, 7, 0, 70, 140, 1 + bg_event 20, 1, 0, 0, 0, SilphCo_7F_EventScript_161BFA + +SilphCo_7F_MapEvents:: + map_events SilphCo_7F_EventObjects, SilphCo_7F_MapWarps, SilphCo_7F_MapCoordEvents, SilphCo_7F_MapBGEvents diff --git a/data/maps/SilphCo_8F/events.inc b/data/maps/SilphCo_8F/events.inc new file mode 100644 index 000000000..31ffa6f67 --- /dev/null +++ b/data/maps/SilphCo_8F/events.inc @@ -0,0 +1,27 @@ +SilphCo_8F_EventObjects: + object_event 1, 49, 0, 28, 0, 5, 0, 3, 9, 17, 0, 1, 0, 4, 0, SilphCo_8F_EventScript_161CB0, 83, 0, 0 + object_event 2, 49, 0, 10, 0, 17, 0, 3, 10, 17, 0, 1, 0, 5, 0, SilphCo_8F_EventScript_161CC7, 83, 0, 0 + object_event 3, 55, 0, 9, 0, 4, 0, 3, 8, 17, 0, 1, 0, 2, 0, SilphCo_8F_EventScript_161C99, 83, 0, 0 + object_event 4, 47, 0, 2, 0, 5, 0, 3, 5, 17, 0, 0, 0, 0, 0, SilphCo_8F_EventScript_161C6F, 0, 0, 0 + object_event 5, 92, 0, 24, 0, 8, 0, 3, 8, 17, 0, 0, 0, 0, 0, SilphCo_8F_EventScript_1BEB4B, 456, 0, 0 + object_event 6, 55, 0, 29, 0, 9, 0, 3, 8, 17, 0, 0, 0, 0, 0, SilphCo_8F_EventScript_1AD0ED, 0, 0, 0 + +SilphCo_8F_MapWarps: + warp_def 16, 2, 3, 0, 311 + warp_def 11, 10, 3, 4, 310 + warp_def 10, 6, 3, 5, 304 + warp_def 28, 2, 3, 3, 309 + warp_def 2, 12, 3, 1, 310 + warp_def 2, 17, 3, 2, 304 + warp_def 22, 3, 0, 0, 314 + +SilphCo_8F_MapBGEvents: + bg_event 6, 10, 0, 0, 0, SilphCo_8F_EventScript_1A8A6D + bg_event 6, 11, 0, 0, 0, SilphCo_8F_EventScript_1A8A6D + bg_event 5, 11, 0, 0, 0, SilphCo_8F_EventScript_1A8A6D + bg_event 5, 10, 0, 0, 0, SilphCo_8F_EventScript_1A8A6D + bg_event 29, 10, 0, 7, 0, 110, 141, 1 + bg_event 27, 1, 0, 0, 0, SilphCo_8F_EventScript_161C90 + +SilphCo_8F_MapEvents:: + map_events SilphCo_8F_EventObjects, SilphCo_8F_MapWarps, 0x0, SilphCo_8F_MapBGEvents diff --git a/data/maps/SilphCo_9F/events.inc b/data/maps/SilphCo_9F/events.inc new file mode 100644 index 000000000..0b93cb550 --- /dev/null +++ b/data/maps/SilphCo_9F/events.inc @@ -0,0 +1,36 @@ +SilphCo_9F_EventObjects: + object_event 1, 55, 0, 26, 0, 16, 0, 3, 3, 17, 0, 1, 0, 2, 0, SilphCo_9F_EventScript_161D41, 83, 0, 0 + object_event 2, 49, 0, 15, 0, 18, 0, 3, 7, 17, 0, 1, 0, 3, 0, SilphCo_9F_EventScript_161D6F, 83, 0, 0 + object_event 3, 28, 0, 2, 0, 16, 0, 0, 8, 17, 0, 0, 0, 0, 0, SilphCo_9F_EventScript_161D09, 0, 0, 0 + object_event 4, 49, 0, 1, 0, 6, 0, 3, 8, 17, 0, 1, 0, 5, 0, SilphCo_9F_EventScript_161D58, 83, 0, 0 + +SilphCo_9F_MapWarps: + warp_def 16, 2, 0, 0, 310 + warp_def 22, 18, 3, 3, 307 + warp_def 9, 4, 3, 4, 305 + warp_def 18, 2, 3, 3, 312 + warp_def 24, 3, 0, 0, 314 + +SilphCo_9F_MapBGEvents: + bg_event 11, 14, 3, 7, 0, 20, 25, 1 + bg_event 3, 10, 0, 0, 0, SilphCo_9F_EventScript_1A8A87 + bg_event 3, 11, 0, 0, 0, SilphCo_9F_EventScript_1A8A87 + bg_event 13, 16, 0, 0, 0, SilphCo_9F_EventScript_1A8AA1 + bg_event 13, 17, 0, 0, 0, SilphCo_9F_EventScript_1A8AA1 + bg_event 21, 6, 0, 0, 0, SilphCo_9F_EventScript_1A8ABB + bg_event 22, 6, 0, 0, 0, SilphCo_9F_EventScript_1A8ABB + bg_event 22, 7, 0, 0, 0, SilphCo_9F_EventScript_1A8ABB + bg_event 21, 7, 0, 0, 0, SilphCo_9F_EventScript_1A8ABB + bg_event 21, 13, 0, 0, 0, SilphCo_9F_EventScript_1A8AD5 + bg_event 21, 12, 0, 0, 0, SilphCo_9F_EventScript_1A8AD5 + bg_event 22, 12, 0, 0, 0, SilphCo_9F_EventScript_1A8AD5 + bg_event 22, 13, 0, 0, 0, SilphCo_9F_EventScript_1A8AD5 + bg_event 2, 11, 0, 0, 0, SilphCo_9F_EventScript_1A8A87 + bg_event 2, 10, 0, 0, 0, SilphCo_9F_EventScript_1A8A87 + bg_event 12, 16, 0, 0, 0, SilphCo_9F_EventScript_1A8AA1 + bg_event 12, 17, 0, 0, 0, SilphCo_9F_EventScript_1A8AA1 + bg_event 5, 8, 0, 7, 0, 67, 142, 1 + bg_event 17, 1, 0, 0, 0, SilphCo_9F_EventScript_161D38 + +SilphCo_9F_MapEvents:: + map_events SilphCo_9F_EventObjects, SilphCo_9F_MapWarps, 0x0, SilphCo_9F_MapBGEvents diff --git a/data/maps/SilphCo_Elevator/events.inc b/data/maps/SilphCo_Elevator/events.inc new file mode 100644 index 000000000..90faa28a2 --- /dev/null +++ b/data/maps/SilphCo_Elevator/events.inc @@ -0,0 +1,8 @@ +SilphCo_Elevator_MapWarps: + warp_def 2, 5, 3, 127, 32639 + +SilphCo_Elevator_MapBGEvents: + bg_event 0, 2, 3, 0, 0, SilphCo_Elevator_EventScript_161F6F + +SilphCo_Elevator_MapEvents:: + map_events 0x0, SilphCo_Elevator_MapWarps, 0x0, SilphCo_Elevator_MapBGEvents diff --git a/data/maps/SixIsland/events.inc b/data/maps/SixIsland/events.inc new file mode 100644 index 000000000..71688d896 --- /dev/null +++ b/data/maps/SixIsland/events.inc @@ -0,0 +1,16 @@ +SixIsland_EventObjects: + object_event 1, 19, 0, 10, 0, 15, 0, 3, 9, 17, 0, 0, 0, 0, 0, SixIsland_EventScript_167EEB, 0, 0, 0 + object_event 2, 56, 0, 15, 0, 13, 0, 3, 18, 17, 0, 0, 0, 0, 0, SixIsland_EventScript_167EE2, 0, 0, 0 + +SixIsland_MapWarps: + warp_def 11, 23, 3, 0, 9474 + warp_def 11, 11, 0, 0, 9472 + warp_def 16, 17, 0, 0, 9475 + warp_def 20, 11, 0, 0, 9476 + +SixIsland_MapBGEvents: + bg_event 9, 17, 0, 0, 0, SixIsland_EventScript_167EF4 + bg_event 9, 7, 3, 7, 0, 138, 184, 1 + +SixIsland_MapEvents:: + map_events SixIsland_EventObjects, SixIsland_MapWarps, 0x0, SixIsland_MapBGEvents diff --git a/data/maps/SixIsland_DottedHole_B1F/events.inc b/data/maps/SixIsland_DottedHole_B1F/events.inc new file mode 100644 index 000000000..c871cb9b3 --- /dev/null +++ b/data/maps/SixIsland_DottedHole_B1F/events.inc @@ -0,0 +1,12 @@ +SixIsland_DottedHole_B1F_MapWarps: + warp_def 6, 7, 3, 1, 371 + warp_def 6, 1, 3, 0, 373 + warp_def 11, 5, 3, 3, 371 + warp_def 6, 9, 3, 3, 371 + warp_def 1, 5, 3, 3, 371 + +SixIsland_DottedHole_B1F_MapBGEvents: + bg_event 6, 5, 0, 1, 0, SixIsland_DottedHole_B1F_EventScript_16418C + +SixIsland_DottedHole_B1F_MapEvents:: + map_events 0x0, SixIsland_DottedHole_B1F_MapWarps, 0x0, SixIsland_DottedHole_B1F_MapBGEvents diff --git a/data/maps/SixIsland_DottedHole_B2F/events.inc b/data/maps/SixIsland_DottedHole_B2F/events.inc new file mode 100644 index 000000000..14b3b3f1e --- /dev/null +++ b/data/maps/SixIsland_DottedHole_B2F/events.inc @@ -0,0 +1,12 @@ +SixIsland_DottedHole_B2F_MapWarps: + warp_def 6, 7, 3, 1, 372 + warp_def 6, 1, 3, 3, 371 + warp_def 11, 5, 3, 3, 371 + warp_def 6, 9, 3, 3, 371 + warp_def 1, 5, 3, 0, 374 + +SixIsland_DottedHole_B2F_MapBGEvents: + bg_event 6, 5, 0, 1, 0, SixIsland_DottedHole_B2F_EventScript_1641A7 + +SixIsland_DottedHole_B2F_MapEvents:: + map_events 0x0, SixIsland_DottedHole_B2F_MapWarps, 0x0, SixIsland_DottedHole_B2F_MapBGEvents diff --git a/data/maps/SixIsland_DottedHole_B3F/events.inc b/data/maps/SixIsland_DottedHole_B3F/events.inc new file mode 100644 index 000000000..684924658 --- /dev/null +++ b/data/maps/SixIsland_DottedHole_B3F/events.inc @@ -0,0 +1,12 @@ +SixIsland_DottedHole_B3F_MapWarps: + warp_def 6, 7, 3, 4, 373 + warp_def 6, 1, 3, 3, 371 + warp_def 11, 5, 3, 0, 375 + warp_def 6, 9, 3, 3, 371 + warp_def 1, 5, 3, 3, 371 + +SixIsland_DottedHole_B3F_MapBGEvents: + bg_event 6, 5, 0, 1, 0, SixIsland_DottedHole_B3F_EventScript_16419E + +SixIsland_DottedHole_B3F_MapEvents:: + map_events 0x0, SixIsland_DottedHole_B3F_MapWarps, 0x0, SixIsland_DottedHole_B3F_MapBGEvents diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/events.inc b/data/maps/SixIsland_DottedHole_SapphireRoom/events.inc new file mode 100644 index 000000000..2d8531934 --- /dev/null +++ b/data/maps/SixIsland_DottedHole_SapphireRoom/events.inc @@ -0,0 +1,13 @@ +SixIsland_DottedHole_SapphireRoom_EventObjects: + object_event 1, 100, 0, 7, 0, 7, 0, 0, 8, 17, 0, 0, 0, 0, 0, SixIsland_DottedHole_SapphireRoom_EventScript_1641B5, 143, 0, 0 + object_event 2, 55, 0, 5, 0, 9, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, 144, 0, 0 + +SixIsland_DottedHole_SapphireRoom_MapWarps: + warp_def 11, 7, 3, 2, 371 + warp_def 5, 9, 3, 3, 375 + +SixIsland_DottedHole_SapphireRoom_MapBGEvents: + bg_event 7, 2, 0, 1, 0, SixIsland_DottedHole_SapphireRoom_EventScript_16441F + +SixIsland_DottedHole_SapphireRoom_MapEvents:: + map_events SixIsland_DottedHole_SapphireRoom_EventObjects, SixIsland_DottedHole_SapphireRoom_MapWarps, 0x0, SixIsland_DottedHole_SapphireRoom_MapBGEvents diff --git a/data/maps/SixIsland_GreenPath/events.inc b/data/maps/SixIsland_GreenPath/events.inc new file mode 100644 index 000000000..025b2dba6 --- /dev/null +++ b/data/maps/SixIsland_GreenPath/events.inc @@ -0,0 +1,16 @@ +SixIsland_GreenPath_EventObjects: + object_event 1, 23, 0, 11, 0, 8, 0, 3, 20, 17, 0, 1, 0, 2, 0, SixIsland_GreenPath_EventScript_1AC517, 0, 0, 0 + +SixIsland_GreenPath_MapWarps: + warp_def 63, 10, 3, 1, 377 + warp_def 64, 10, 3, 1, 377 + warp_def 45, 10, 3, 4, 377 + warp_def 46, 10, 3, 4, 377 + +SixIsland_GreenPath_MapBGEvents: + bg_event 40, 10, 0, 0, 0, SixIsland_GreenPath_EventScript_168B37 + bg_event 69, 10, 0, 0, 0, SixIsland_GreenPath_EventScript_168B2E + bg_event 12, 9, 3, 7, 0, 2, 180, 1 + +SixIsland_GreenPath_MapEvents:: + map_events SixIsland_GreenPath_EventObjects, SixIsland_GreenPath_MapWarps, 0x0, SixIsland_GreenPath_MapBGEvents diff --git a/data/maps/SixIsland_Harbor/events.inc b/data/maps/SixIsland_Harbor/events.inc new file mode 100644 index 000000000..7ef15357c --- /dev/null +++ b/data/maps/SixIsland_Harbor/events.inc @@ -0,0 +1,9 @@ +SixIsland_Harbor_EventObjects: + object_event 1, 108, 0, 8, 0, 9, 0, 0, 8, 17, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 2, 62, 0, 8, 0, 6, 0, 3, 7, 17, 0, 0, 0, 0, 0, SixIsland_Harbor_EventScript_171E48, 0, 0, 0 + +SixIsland_Harbor_MapWarps: + warp_def 8, 2, 3, 0, 786 + +SixIsland_Harbor_MapEvents:: + map_events SixIsland_Harbor_EventObjects, SixIsland_Harbor_MapWarps, 0x0, 0x0 diff --git a/data/maps/SixIsland_House/events.inc b/data/maps/SixIsland_House/events.inc new file mode 100644 index 000000000..583a8c1e8 --- /dev/null +++ b/data/maps/SixIsland_House/events.inc @@ -0,0 +1,8 @@ +SixIsland_House_EventObjects: + object_event 1, 32, 0, 7, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, SixIsland_House_EventScript_171E5C, 0, 0, 0 + +SixIsland_House_MapWarps: + warp_def 4, 7, 3, 2, 786 + +SixIsland_House_MapEvents:: + map_events SixIsland_House_EventObjects, SixIsland_House_MapWarps, 0x0, 0x0 diff --git a/data/maps/SixIsland_Mart/events.inc b/data/maps/SixIsland_Mart/events.inc new file mode 100644 index 000000000..a2dd4ff20 --- /dev/null +++ b/data/maps/SixIsland_Mart/events.inc @@ -0,0 +1,10 @@ +SixIsland_Mart_EventObjects: + object_event 1, 68, 0, 2, 0, 3, 0, 0, 10, 17, 0, 0, 0, 0, 0, SixIsland_Mart_EventScript_171E66, 0, 0, 0 + object_event 2, 35, 0, 8, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, SixIsland_Mart_EventScript_1ACFEF, 0, 0, 0 + object_event 3, 40, 0, 7, 0, 7, 0, 3, 2, 17, 0, 0, 0, 0, 0, SixIsland_Mart_EventScript_171EA0, 0, 0, 0 + +SixIsland_Mart_MapWarps: + warp_def 4, 7, 3, 3, 786 + +SixIsland_Mart_MapEvents:: + map_events SixIsland_Mart_EventObjects, SixIsland_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/SixIsland_OutcastIsland/events.inc b/data/maps/SixIsland_OutcastIsland/events.inc new file mode 100644 index 000000000..4c7dd1b88 --- /dev/null +++ b/data/maps/SixIsland_OutcastIsland/events.inc @@ -0,0 +1,18 @@ +SixIsland_OutcastIsland_EventObjects: + object_event 1, 49, 0, 9, 0, 24, 0, 3, 1, 17, 0, 1, 0, 1, 0, SixIsland_OutcastIsland_EventScript_168B16, 136, 0, 0 + object_event 2, 57, 0, 12, 0, 15, 0, 3, 7, 17, 0, 1, 0, 1, 0, SixIsland_OutcastIsland_EventScript_1AC3D1, 0, 0, 0 + object_event 3, 43, 0, 13, 0, 34, 0, 1, 1, 17, 0, 1, 0, 1, 0, SixIsland_OutcastIsland_EventScript_1AC40F, 0, 0, 0 + object_event 4, 44, 0, 14, 0, 61, 0, 1, 50, 66, 0, 1, 0, 1, 0, SixIsland_OutcastIsland_EventScript_1AC44D, 0, 0, 0 + object_event 5, 44, 0, 10, 0, 44, 0, 1, 7, 17, 0, 1, 0, 1, 0, SixIsland_OutcastIsland_EventScript_1AC48B, 0, 0, 0 + object_event 6, 36, 0, 11, 0, 44, 0, 1, 7, 17, 0, 1, 0, 1, 0, SixIsland_OutcastIsland_EventScript_1AC4D1, 0, 0, 0 + object_event 7, 92, 0, 11, 0, 16, 0, 3, 8, 17, 0, 0, 0, 0, 0, SixIsland_OutcastIsland_EventScript_1BEC90, 481, 0, 0 + +SixIsland_OutcastIsland_MapWarps: + warp_def 7, 21, 3, 0, 378 + +SixIsland_OutcastIsland_MapBGEvents: + bg_event 16, 23, 3, 7, 0, 109, 178, 1 + bg_event 6, 24, 3, 7, 0, 6, 179, 1 + +SixIsland_OutcastIsland_MapEvents:: + map_events SixIsland_OutcastIsland_EventObjects, SixIsland_OutcastIsland_MapWarps, 0x0, SixIsland_OutcastIsland_MapBGEvents diff --git a/data/maps/SixIsland_PokemonCenter_1F/events.inc b/data/maps/SixIsland_PokemonCenter_1F/events.inc new file mode 100644 index 000000000..ffbd1be14 --- /dev/null +++ b/data/maps/SixIsland_PokemonCenter_1F/events.inc @@ -0,0 +1,12 @@ +SixIsland_PokemonCenter_1F_EventObjects: + object_event 1, 64, 0, 7, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, SixIsland_PokemonCenter_1F_EventScript_171E05, 0, 0, 0 + object_event 2, 72, 0, 5, 0, 5, 0, 3, 9, 17, 0, 0, 0, 0, 0, 0x0, 152, 0, 0 + object_event 3, 56, 0, 13, 0, 3, 0, 3, 7, 17, 0, 0, 0, 0, 0, SixIsland_PokemonCenter_1F_EventScript_171E0E, 0, 0, 0 + object_event 4, 33, 0, 12, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, SixIsland_PokemonCenter_1F_EventScript_171E17, 0, 0, 0 + +SixIsland_PokemonCenter_1F_MapWarps: + warp_def 7, 8, 3, 1, 786 + warp_def 1, 6, 4, 0, 9473 + +SixIsland_PokemonCenter_1F_MapEvents:: + map_events SixIsland_PokemonCenter_1F_EventObjects, SixIsland_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SixIsland_PokemonCenter_2F/events.inc b/data/maps/SixIsland_PokemonCenter_2F/events.inc new file mode 100644 index 000000000..c26511927 --- /dev/null +++ b/data/maps/SixIsland_PokemonCenter_2F/events.inc @@ -0,0 +1,13 @@ +SixIsland_PokemonCenter_2F_EventObjects: + object_event 1, 65, 0, 6, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SixIsland_PokemonCenter_2F_EventScript_1A8CF6, 0, 0, 0 + object_event 2, 65, 0, 2, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SixIsland_PokemonCenter_2F_EventScript_1A8CFC, 0, 0, 0 + object_event 3, 65, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SixIsland_PokemonCenter_2F_EventScript_1A8D02, 0, 0, 0 + object_event 4, 69, 0, 1, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, SixIsland_PokemonCenter_2F_EventScript_1BB1D2, 112, 0, 0 + +SixIsland_PokemonCenter_2F_MapWarps: + warp_def 1, 6, 4, 1, 9472 + warp_def 5, 1, 0, 0, 4 + warp_def 9, 1, 0, 0, 1 + +SixIsland_PokemonCenter_2F_MapEvents:: + map_events SixIsland_PokemonCenter_2F_EventObjects, SixIsland_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SixIsland_RuinValley/events.inc b/data/maps/SixIsland_RuinValley/events.inc new file mode 100644 index 000000000..381543e3b --- /dev/null +++ b/data/maps/SixIsland_RuinValley/events.inc @@ -0,0 +1,27 @@ +SixIsland_RuinValley_EventObjects: + object_event 1, 55, 0, 24, 0, 25, 0, 3, 7, 17, 0, 0, 0, 0, 0, SixIsland_RuinValley_EventScript_168B6D, 142, 0, 0 + object_event 2, 56, 0, 32, 0, 11, 0, 5, 17, 17, 0, 1, 0, 4, 0, SixIsland_RuinValley_EventScript_1AC717, 0, 0, 0 + object_event 3, 56, 0, 33, 0, 16, 0, 5, 14, 17, 0, 1, 0, 2, 0, SixIsland_RuinValley_EventScript_1AC755, 0, 0, 0 + object_event 4, 56, 0, 31, 0, 24, 0, 5, 9, 17, 0, 1, 0, 1, 0, SixIsland_RuinValley_EventScript_1AC793, 0, 0, 0 + object_event 5, 56, 0, 14, 0, 10, 0, 5, 8, 17, 0, 1, 0, 2, 0, SixIsland_RuinValley_EventScript_1AC7D1, 0, 0, 0 + object_event 6, 52, 0, 21, 0, 29, 0, 5, 2, 50, 0, 1, 0, 1, 0, SixIsland_RuinValley_EventScript_1AC80F, 0, 0, 0 + object_event 7, 97, 0, 17, 0, 10, 0, 5, 1, 0, 0, 0, 0, 0, 0, SixIsland_RuinValley_EventScript_1BE11D, 0, 0, 0 + object_event 8, 97, 0, 17, 0, 12, 0, 5, 1, 0, 0, 0, 0, 0, 0, SixIsland_RuinValley_EventScript_1BE11D, 0, 0, 0 + object_event 9, 97, 0, 18, 0, 11, 0, 5, 1, 0, 0, 0, 0, 0, 0, SixIsland_RuinValley_EventScript_1BE11D, 0, 0, 0 + object_event 10, 97, 0, 6, 0, 33, 0, 3, 1, 0, 0, 0, 0, 0, 0, SixIsland_RuinValley_EventScript_1BE11D, 0, 0, 0 + object_event 11, 97, 0, 6, 0, 34, 0, 3, 1, 0, 0, 0, 0, 0, 0, SixIsland_RuinValley_EventScript_1BE11D, 0, 0, 0 + object_event 12, 97, 0, 41, 0, 32, 0, 3, 1, 0, 0, 0, 0, 0, 0, SixIsland_RuinValley_EventScript_1BE11D, 0, 0, 0 + object_event 13, 97, 0, 41, 0, 33, 0, 3, 1, 0, 0, 0, 0, 0, 0, SixIsland_RuinValley_EventScript_1BE11D, 0, 0, 0 + object_event 14, 97, 0, 42, 0, 33, 0, 3, 1, 0, 0, 0, 0, 0, 0, SixIsland_RuinValley_EventScript_1BE11D, 0, 0, 0 + object_event 15, 92, 0, 5, 0, 33, 0, 3, 8, 17, 0, 0, 0, 0, 0, SixIsland_RuinValley_EventScript_1BECC4, 485, 0, 0 + object_event 16, 92, 0, 19, 0, 11, 0, 5, 8, 17, 0, 0, 0, 0, 0, SixIsland_RuinValley_EventScript_1BECB7, 484, 0, 0 + object_event 17, 92, 0, 43, 0, 32, 0, 3, 8, 17, 0, 0, 0, 0, 0, SixIsland_RuinValley_EventScript_1BECD1, 486, 0, 0 + +SixIsland_RuinValley_MapWarps: + warp_def 24, 24, 3, 0, 371 + +SixIsland_RuinValley_MapBGEvents: + bg_event 24, 24, 3, 0, 0, SixIsland_RuinValley_EventScript_168B94 + +SixIsland_RuinValley_MapEvents:: + map_events SixIsland_RuinValley_EventObjects, SixIsland_RuinValley_MapWarps, 0x0, SixIsland_RuinValley_MapBGEvents diff --git a/data/maps/SixIsland_WaterPath/events.inc b/data/maps/SixIsland_WaterPath/events.inc new file mode 100644 index 000000000..f40c157b9 --- /dev/null +++ b/data/maps/SixIsland_WaterPath/events.inc @@ -0,0 +1,24 @@ +SixIsland_WaterPath_EventObjects: + object_event 1, 28, 0, 12, 0, 13, 0, 3, 19, 17, 0, 1, 0, 3, 0, SixIsland_WaterPath_EventScript_1AC555, 0, 0, 0 + object_event 2, 26, 0, 11, 0, 52, 0, 3, 7, 17, 0, 1, 0, 3, 0, SixIsland_WaterPath_EventScript_1AC593, 0, 0, 0 + object_event 3, 43, 0, 13, 0, 35, 0, 1, 1, 17, 0, 1, 0, 4, 0, SixIsland_WaterPath_EventScript_1AC5D1, 0, 0, 0 + object_event 4, 44, 0, 15, 0, 45, 0, 1, 2, 17, 0, 1, 0, 1, 0, SixIsland_WaterPath_EventScript_1AC60F, 0, 0, 0 + object_event 5, 17, 0, 6, 0, 21, 0, 3, 8, 17, 0, 1, 0, 1, 0, SixIsland_WaterPath_EventScript_1AC64D, 0, 0, 0 + object_event 6, 17, 0, 7, 0, 21, 0, 3, 8, 17, 0, 1, 0, 1, 0, SixIsland_WaterPath_EventScript_1AC693, 0, 0, 0 + object_event 7, 56, 0, 11, 0, 76, 0, 3, 15, 17, 0, 1, 0, 4, 0, SixIsland_WaterPath_EventScript_1AC6D9, 0, 0, 0 + object_event 8, 92, 0, 17, 0, 19, 0, 0, 8, 17, 0, 0, 0, 0, 0, SixIsland_WaterPath_EventScript_1BEC9D, 482, 0, 0 + object_event 9, 92, 0, 17, 0, 87, 0, 3, 8, 17, 0, 0, 0, 0, 0, SixIsland_WaterPath_EventScript_1BECAA, 483, 0, 0 + +SixIsland_WaterPath_MapWarps: + warp_def 5, 13, 0, 0, 10496 + warp_def 11, 19, 0, 0, 10497 + +SixIsland_WaterPath_MapBGEvents: + bg_event 8, 14, 0, 0, 0, SixIsland_WaterPath_EventScript_168B41 + bg_event 15, 76, 3, 7, 0, 137, 181, 1 + bg_event 3, 8, 3, 7, 0, 139, 182, 1 + bg_event 13, 63, 3, 7, 0, 152, 183, 1 + bg_event 12, 54, 0, 0, 0, SixIsland_WaterPath_EventScript_168B4A + +SixIsland_WaterPath_MapEvents:: + map_events SixIsland_WaterPath_EventObjects, SixIsland_WaterPath_MapWarps, 0x0, SixIsland_WaterPath_MapBGEvents diff --git a/data/maps/SixIsland_WaterPath_House1/events.inc b/data/maps/SixIsland_WaterPath_House1/events.inc new file mode 100644 index 000000000..72b19c6e5 --- /dev/null +++ b/data/maps/SixIsland_WaterPath_House1/events.inc @@ -0,0 +1,11 @@ +SixIsland_WaterPath_House1_EventObjects: + object_event 1, 29, 0, 3, 0, 4, 0, 3, 8, 17, 0, 0, 0, 0, 0, SixIsland_WaterPath_House1_EventScript_17206D, 0, 0, 0 + +SixIsland_WaterPath_House1_MapWarps: + warp_def 3, 7, 3, 0, 828 + +SixIsland_WaterPath_House1_MapBGEvents: + bg_event 9, 1, 0, 0, 0, SixIsland_WaterPath_House1_EventScript_172157 + +SixIsland_WaterPath_House1_MapEvents:: + map_events SixIsland_WaterPath_House1_EventObjects, SixIsland_WaterPath_House1_MapWarps, 0x0, SixIsland_WaterPath_House1_MapBGEvents diff --git a/data/maps/SixIsland_WaterPath_House2/events.inc b/data/maps/SixIsland_WaterPath_House2/events.inc new file mode 100644 index 000000000..09ee22d31 --- /dev/null +++ b/data/maps/SixIsland_WaterPath_House2/events.inc @@ -0,0 +1,8 @@ +SixIsland_WaterPath_House2_EventObjects: + object_event 1, 25, 0, 7, 0, 4, 0, 3, 15, 17, 0, 0, 0, 0, 0, SixIsland_WaterPath_House2_EventScript_172179, 0, 0, 0 + +SixIsland_WaterPath_House2_MapWarps: + warp_def 4, 7, 3, 1, 828 + +SixIsland_WaterPath_House2_MapEvents:: + map_events SixIsland_WaterPath_House2_EventObjects, SixIsland_WaterPath_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/ThreeIsland/events.inc b/data/maps/ThreeIsland/events.inc new file mode 100644 index 000000000..d72c40b6c --- /dev/null +++ b/data/maps/ThreeIsland/events.inc @@ -0,0 +1,43 @@ +ThreeIsland_EventObjects: + object_event 1, 25, 0, 7, 0, 24, 0, 3, 10, 17, 0, 0, 0, 0, 0, ThreeIsland_EventScript_1677E5, 126, 0, 0 + object_event 2, 25, 0, 8, 0, 23, 0, 3, 10, 17, 0, 0, 0, 0, 0, ThreeIsland_EventScript_167989, 126, 0, 0 + object_event 3, 53, 0, 8, 0, 24, 0, 3, 9, 17, 0, 0, 0, 0, 0, ThreeIsland_EventScript_1677D8, 145, 0, 0 + object_event 4, 53, 0, 9, 0, 23, 0, 3, 9, 17, 0, 0, 0, 0, 0, ThreeIsland_EventScript_1677D8, 121, 0, 0 + object_event 5, 53, 0, 9, 0, 24, 0, 3, 9, 17, 0, 0, 0, 0, 0, ThreeIsland_EventScript_1677D8, 121, 0, 0 + object_event 6, 53, 0, 10, 0, 22, 0, 3, 9, 17, 0, 0, 0, 0, 0, ThreeIsland_EventScript_1677D8, 121, 0, 0 + object_event 7, 53, 0, 10, 0, 24, 0, 3, 9, 17, 0, 0, 0, 0, 0, ThreeIsland_EventScript_1677D8, 121, 0, 0 + object_event 8, 53, 0, 11, 0, 23, 0, 3, 9, 17, 0, 0, 0, 0, 0, ThreeIsland_EventScript_1677D8, 121, 0, 0 + object_event 9, 95, 0, 20, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, ThreeIsland_EventScript_1BDF13, 18, 0, 0 + object_event 10, 92, 0, 18, 0, 17, 0, 3, 8, 17, 0, 0, 0, 0, 0, ThreeIsland_EventScript_1BEABC, 443, 0, 0 + object_event 11, 23, 0, 15, 0, 7, 0, 3, 5, 17, 0, 0, 0, 0, 0, ThreeIsland_EventScript_167C77, 0, 0, 0 + object_event 12, 16, 0, 14, 0, 14, 0, 3, 10, 17, 0, 0, 0, 0, 0, ThreeIsland_EventScript_167C80, 0, 0, 0 + object_event 13, 132, 0, 15, 0, 14, 0, 3, 9, 17, 0, 0, 0, 0, 0, ThreeIsland_EventScript_167C89, 0, 0, 0 + object_event 14, 53, 0, 15, 0, 31, 0, 3, 5, 17, 0, 0, 0, 0, 0, ThreeIsland_EventScript_167CA5, 121, 0, 0 + +ThreeIsland_MapWarps: + warp_def 3, 31, 0, 0, 8704 + warp_def 14, 27, 0, 0, 8705 + warp_def 18, 12, 0, 0, 8707 + warp_def 4, 6, 0, 0, 8708 + warp_def 12, 6, 0, 0, 8709 + warp_def 12, 12, 0, 0, 8710 + warp_def 13, 19, 0, 0, 8711 + +ThreeIsland_MapCoordEvents: + coord_event 7, 27, 3, 0, 16507, 2, 0, ThreeIsland_EventScript_1679B5 + coord_event 8, 27, 3, 0, 16507, 2, 0, ThreeIsland_EventScript_1679B5 + coord_event 9, 27, 3, 0, 16507, 2, 0, ThreeIsland_EventScript_1679B5 + coord_event 10, 27, 3, 0, 16507, 2, 0, ThreeIsland_EventScript_1679B5 + coord_event 7, 26, 3, 0, 16507, 3, 0, ThreeIsland_EventScript_167A1D + coord_event 8, 26, 3, 0, 16507, 3, 0, ThreeIsland_EventScript_167A29 + coord_event 9, 26, 3, 0, 16507, 3, 0, ThreeIsland_EventScript_167A35 + coord_event 11, 27, 3, 0, 16507, 2, 0, ThreeIsland_EventScript_1679B5 + coord_event 10, 26, 3, 0, 16507, 3, 0, ThreeIsland_EventScript_167A41 + coord_event 11, 26, 3, 0, 16507, 3, 0, ThreeIsland_EventScript_167A4D + +ThreeIsland_MapBGEvents: + bg_event 12, 31, 0, 0, 0, ThreeIsland_EventScript_167C9C + bg_event 5, 13, 3, 7, 0, 69, 164, 1 + +ThreeIsland_MapEvents:: + map_events ThreeIsland_EventObjects, ThreeIsland_MapWarps, ThreeIsland_MapCoordEvents, ThreeIsland_MapBGEvents diff --git a/data/maps/ThreeIsland_BerryForest/events.inc b/data/maps/ThreeIsland_BerryForest/events.inc new file mode 100644 index 000000000..0ae949e3f --- /dev/null +++ b/data/maps/ThreeIsland_BerryForest/events.inc @@ -0,0 +1,40 @@ +ThreeIsland_BerryForest_EventObjects: + object_event 1, 17, 0, 4, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, ThreeIsland_BerryForest_EventScript_163C83, 122, 0, 0 + object_event 2, 95, 0, 12, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, ThreeIsland_BerryForest_EventScript_1BDF13, 18, 0, 0 + object_event 3, 95, 0, 19, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, ThreeIsland_BerryForest_EventScript_1BDF13, 19, 0, 0 + object_event 4, 95, 0, 23, 0, 17, 0, 3, 1, 17, 0, 0, 0, 0, 0, ThreeIsland_BerryForest_EventScript_1BDF13, 20, 0, 0 + object_event 5, 95, 0, 38, 0, 23, 0, 3, 1, 17, 0, 0, 0, 0, 0, ThreeIsland_BerryForest_EventScript_1BDF13, 21, 0, 0 + object_event 6, 95, 0, 44, 0, 23, 0, 3, 1, 17, 0, 0, 0, 0, 0, ThreeIsland_BerryForest_EventScript_1BDF13, 22, 0, 0 + object_event 7, 95, 0, 44, 0, 29, 0, 3, 1, 17, 0, 0, 0, 0, 0, ThreeIsland_BerryForest_EventScript_1BDF13, 23, 0, 0 + object_event 8, 95, 0, 16, 0, 43, 0, 3, 1, 17, 0, 0, 0, 0, 0, ThreeIsland_BerryForest_EventScript_1BDF13, 24, 0, 0 + object_event 9, 95, 0, 17, 0, 39, 0, 3, 1, 17, 0, 0, 0, 0, 0, ThreeIsland_BerryForest_EventScript_1BDF13, 25, 0, 0 + object_event 10, 95, 0, 14, 0, 39, 0, 3, 1, 17, 0, 0, 0, 0, 0, ThreeIsland_BerryForest_EventScript_1BDF13, 26, 0, 0 + object_event 11, 95, 0, 11, 0, 39, 0, 3, 1, 17, 0, 0, 0, 0, 0, ThreeIsland_BerryForest_EventScript_1BDF13, 27, 0, 0 + object_event 12, 92, 0, 12, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, ThreeIsland_BerryForest_EventScript_1BED05, 490, 0, 0 + object_event 13, 92, 0, 27, 0, 11, 0, 3, 8, 17, 0, 0, 0, 0, 0, ThreeIsland_BerryForest_EventScript_1BED12, 491, 0, 0 + object_event 14, 92, 0, 12, 0, 43, 0, 3, 8, 17, 0, 0, 0, 0, 0, ThreeIsland_BerryForest_EventScript_1BED1F, 492, 0, 0 + +ThreeIsland_BerryForest_MapWarps: + warp_def 43, 41, 3, 0, 816 + warp_def 42, 41, 3, 0, 816 + warp_def 44, 41, 3, 1, 816 + +ThreeIsland_BerryForest_MapBGEvents: + bg_event 7, 27, 0, 0, 0, ThreeIsland_BerryForest_EventScript_163D31 + bg_event 39, 35, 0, 0, 0, ThreeIsland_BerryForest_EventScript_163D28 + bg_event 31, 25, 3, 7, 0, 148, 90, 1 + bg_event 15, 15, 3, 7, 0, 149, 91, 1 + bg_event 25, 24, 3, 7, 0, 150, 92, 1 + bg_event 11, 24, 3, 7, 0, 151, 93, 1 + bg_event 37, 18, 3, 7, 0, 139, 94, 1 + bg_event 14, 23, 3, 7, 0, 133, 95, 1 + bg_event 47, 5, 3, 7, 0, 134, 96, 1 + bg_event 7, 30, 3, 7, 0, 135, 97, 1 + bg_event 16, 5, 3, 7, 0, 136, 98, 1 + bg_event 25, 6, 3, 7, 0, 137, 99, 1 + bg_event 46, 32, 3, 7, 0, 140, 100, 1 + bg_event 43, 16, 3, 7, 0, 152, 101, 1 + bg_event 8, 5, 3, 7, 0, 141, 102, 1 + +ThreeIsland_BerryForest_MapEvents:: + map_events ThreeIsland_BerryForest_EventObjects, ThreeIsland_BerryForest_MapWarps, 0x0, ThreeIsland_BerryForest_MapBGEvents diff --git a/data/maps/ThreeIsland_BondBridge/events.inc b/data/maps/ThreeIsland_BondBridge/events.inc new file mode 100644 index 000000000..015d463ac --- /dev/null +++ b/data/maps/ThreeIsland_BondBridge/events.inc @@ -0,0 +1,24 @@ +ThreeIsland_BondBridge_EventObjects: + object_event 1, 28, 0, 27, 0, 10, 0, 3, 2, 17, 0, 1, 0, 5, 0, ThreeIsland_BondBridge_EventScript_1ABF65, 0, 0, 0 + object_event 2, 28, 0, 68, 0, 10, 0, 3, 9, 17, 0, 1, 0, 2, 0, ThreeIsland_BondBridge_EventScript_1ABFA3, 0, 0, 0 + object_event 3, 37, 0, 33, 0, 13, 0, 3, 10, 17, 0, 1, 0, 1, 0, ThreeIsland_BondBridge_EventScript_1ABFE1, 0, 0, 0 + object_event 4, 37, 0, 50, 0, 11, 0, 3, 27, 18, 0, 1, 0, 1, 0, ThreeIsland_BondBridge_EventScript_1AC01F, 0, 0, 0 + object_event 5, 44, 0, 36, 0, 4, 0, 1, 1, 17, 0, 1, 0, 1, 0, ThreeIsland_BondBridge_EventScript_1AC05D, 0, 0, 0 + object_event 6, 17, 0, 77, 0, 5, 0, 3, 8, 17, 0, 1, 0, 1, 0, ThreeIsland_BondBridge_EventScript_1AC09B, 0, 0, 0 + object_event 7, 17, 0, 78, 0, 5, 0, 3, 8, 17, 0, 1, 0, 1, 0, ThreeIsland_BondBridge_EventScript_1AC0E1, 0, 0, 0 + object_event 8, 95, 0, 72, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, ThreeIsland_BondBridge_EventScript_1BDF13, 18, 0, 0 + object_event 9, 95, 0, 86, 0, 13, 0, 3, 1, 17, 0, 0, 0, 0, 0, ThreeIsland_BondBridge_EventScript_1BDF13, 19, 0, 0 + +ThreeIsland_BondBridge_MapWarps: + warp_def 12, 6, 3, 0, 365 + warp_def 13, 6, 3, 0, 365 + +ThreeIsland_BondBridge_MapBGEvents: + bg_event 14, 7, 0, 0, 0, ThreeIsland_BondBridge_EventScript_168777 + bg_event 61, 5, 0, 7, 0, 84, 165, 1 + bg_event 44, 12, 3, 7, 0, 106, 166, 1 + bg_event 33, 7, 3, 7, 0, 108, 167, 1 + bg_event 91, 9, 0, 0, 0, ThreeIsland_BondBridge_EventScript_168780 + +ThreeIsland_BondBridge_MapEvents:: + map_events ThreeIsland_BondBridge_EventObjects, ThreeIsland_BondBridge_MapWarps, 0x0, ThreeIsland_BondBridge_MapBGEvents diff --git a/data/maps/ThreeIsland_DunsparceTunnel/events.inc b/data/maps/ThreeIsland_DunsparceTunnel/events.inc new file mode 100644 index 000000000..ed3dd51d8 --- /dev/null +++ b/data/maps/ThreeIsland_DunsparceTunnel/events.inc @@ -0,0 +1,12 @@ +ThreeIsland_DunsparceTunnel_EventObjects: + object_event 1, 27, 0, 23, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, ThreeIsland_DunsparceTunnel_EventScript_164D60, 0, 0, 0 + +ThreeIsland_DunsparceTunnel_MapWarps: + warp_def 3, 4, 3, 0, 817 + warp_def 25, 5, 3, 1, 817 + +ThreeIsland_DunsparceTunnel_MapBGEvents: + bg_event 21, 3, 0, 7, 0, 110, 163, 1 + +ThreeIsland_DunsparceTunnel_MapEvents:: + map_events ThreeIsland_DunsparceTunnel_EventObjects, ThreeIsland_DunsparceTunnel_MapWarps, 0x0, ThreeIsland_DunsparceTunnel_MapBGEvents diff --git a/data/maps/ThreeIsland_Harbor/events.inc b/data/maps/ThreeIsland_Harbor/events.inc new file mode 100644 index 000000000..be18b4dc7 --- /dev/null +++ b/data/maps/ThreeIsland_Harbor/events.inc @@ -0,0 +1,9 @@ +ThreeIsland_Harbor_EventObjects: + object_event 1, 108, 0, 8, 0, 9, 0, 0, 8, 17, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 2, 62, 0, 8, 0, 6, 0, 3, 7, 17, 0, 0, 0, 0, 0, ThreeIsland_Harbor_EventScript_171EAA, 0, 0, 0 + +ThreeIsland_Harbor_MapWarps: + warp_def 8, 2, 3, 2, 817 + +ThreeIsland_Harbor_MapEvents:: + map_events ThreeIsland_Harbor_EventObjects, ThreeIsland_Harbor_MapWarps, 0x0, 0x0 diff --git a/data/maps/ThreeIsland_House1/events.inc b/data/maps/ThreeIsland_House1/events.inc new file mode 100644 index 000000000..1b252b532 --- /dev/null +++ b/data/maps/ThreeIsland_House1/events.inc @@ -0,0 +1,11 @@ +ThreeIsland_House1_EventObjects: + object_event 1, 17, 0, 3, 0, 4, 0, 0, 10, 17, 0, 0, 0, 0, 0, ThreeIsland_House1_EventScript_17181A, 118, 0, 0 + +ThreeIsland_House1_MapWarps: + warp_def 4, 7, 3, 0, 782 + +ThreeIsland_House1_MapBGEvents: + bg_event 2, 1, 0, 0, 0, ThreeIsland_House1_EventScript_171829 + +ThreeIsland_House1_MapEvents:: + map_events ThreeIsland_House1_EventObjects, ThreeIsland_House1_MapWarps, 0x0, ThreeIsland_House1_MapBGEvents diff --git a/data/maps/ThreeIsland_House2/events.inc b/data/maps/ThreeIsland_House2/events.inc new file mode 100644 index 000000000..911e78290 --- /dev/null +++ b/data/maps/ThreeIsland_House2/events.inc @@ -0,0 +1,9 @@ +ThreeIsland_House2_EventObjects: + object_event 1, 26, 0, 4, 0, 4, 0, 3, 10, 17, 0, 0, 0, 0, 0, ThreeIsland_House2_EventScript_1718F9, 0, 0, 0 + object_event 2, 25, 0, 7, 0, 4, 0, 3, 9, 17, 0, 0, 0, 0, 0, ThreeIsland_House2_EventScript_1718E0, 0, 0, 0 + +ThreeIsland_House2_MapWarps: + warp_def 4, 7, 3, 3, 782 + +ThreeIsland_House2_MapEvents:: + map_events ThreeIsland_House2_EventObjects, ThreeIsland_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/ThreeIsland_House3/events.inc b/data/maps/ThreeIsland_House3/events.inc new file mode 100644 index 000000000..5635e1472 --- /dev/null +++ b/data/maps/ThreeIsland_House3/events.inc @@ -0,0 +1,8 @@ +ThreeIsland_House3_EventObjects: + object_event 1, 29, 0, 8, 0, 2, 0, 3, 7, 17, 0, 0, 0, 0, 0, ThreeIsland_House3_EventScript_171903, 0, 0, 0 + +ThreeIsland_House3_MapWarps: + warp_def 4, 7, 3, 4, 782 + +ThreeIsland_House3_MapEvents:: + map_events ThreeIsland_House3_EventObjects, ThreeIsland_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/ThreeIsland_House4/events.inc b/data/maps/ThreeIsland_House4/events.inc new file mode 100644 index 000000000..650f0d0ad --- /dev/null +++ b/data/maps/ThreeIsland_House4/events.inc @@ -0,0 +1,9 @@ +ThreeIsland_House4_EventObjects: + object_event 1, 30, 0, 7, 0, 4, 0, 3, 9, 17, 0, 0, 0, 0, 0, ThreeIsland_House4_EventScript_17190D, 0, 0, 0 + object_event 2, 16, 0, 6, 0, 3, 0, 3, 2, 18, 0, 0, 0, 0, 0, ThreeIsland_House4_EventScript_171916, 0, 0, 0 + +ThreeIsland_House4_MapWarps: + warp_def 4, 7, 3, 5, 782 + +ThreeIsland_House4_MapEvents:: + map_events ThreeIsland_House4_EventObjects, ThreeIsland_House4_MapWarps, 0x0, 0x0 diff --git a/data/maps/ThreeIsland_House5/events.inc b/data/maps/ThreeIsland_House5/events.inc new file mode 100644 index 000000000..2c7fe7072 --- /dev/null +++ b/data/maps/ThreeIsland_House5/events.inc @@ -0,0 +1,8 @@ +ThreeIsland_House5_EventObjects: + object_event 1, 17, 0, 2, 0, 5, 0, 3, 2, 17, 0, 0, 0, 0, 0, ThreeIsland_House5_EventScript_171920, 0, 0, 0 + +ThreeIsland_House5_MapWarps: + warp_def 4, 7, 3, 6, 782 + +ThreeIsland_House5_MapEvents:: + map_events ThreeIsland_House5_EventObjects, ThreeIsland_House5_MapWarps, 0x0, 0x0 diff --git a/data/maps/ThreeIsland_Mart/events.inc b/data/maps/ThreeIsland_Mart/events.inc new file mode 100644 index 000000000..1bbd353ad --- /dev/null +++ b/data/maps/ThreeIsland_Mart/events.inc @@ -0,0 +1,11 @@ +ThreeIsland_Mart_EventObjects: + object_event 1, 68, 0, 2, 0, 3, 0, 0, 10, 17, 0, 0, 0, 0, 0, ThreeIsland_Mart_EventScript_17188D, 0, 0, 0 + object_event 2, 40, 0, 2, 0, 7, 0, 3, 7, 17, 0, 0, 0, 0, 0, ThreeIsland_Mart_EventScript_1718C4, 0, 0, 0 + object_event 3, 20, 0, 7, 0, 2, 0, 3, 7, 17, 0, 0, 0, 0, 0, ThreeIsland_Mart_EventScript_1718CD, 0, 0, 0 + object_event 4, 18, 0, 6, 0, 5, 0, 3, 2, 17, 0, 0, 0, 0, 0, ThreeIsland_Mart_EventScript_1718D6, 0, 0, 0 + +ThreeIsland_Mart_MapWarps: + warp_def 4, 7, 3, 2, 782 + +ThreeIsland_Mart_MapEvents:: + map_events ThreeIsland_Mart_EventObjects, ThreeIsland_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/ThreeIsland_PokemonCenter_1F/events.inc b/data/maps/ThreeIsland_PokemonCenter_1F/events.inc new file mode 100644 index 000000000..2e48a021b --- /dev/null +++ b/data/maps/ThreeIsland_PokemonCenter_1F/events.inc @@ -0,0 +1,12 @@ +ThreeIsland_PokemonCenter_1F_EventObjects: + object_event 1, 64, 0, 7, 0, 2, 0, 0, 8, 17, 0, 0, 0, 0, 0, ThreeIsland_PokemonCenter_1F_EventScript_171841, 0, 0, 0 + object_event 2, 26, 0, 12, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, ThreeIsland_PokemonCenter_1F_EventScript_17185C, 0, 0, 0 + object_event 3, 22, 0, 3, 0, 4, 0, 3, 5, 17, 0, 0, 0, 0, 0, ThreeIsland_PokemonCenter_1F_EventScript_171853, 0, 0, 0 + object_event 4, 62, 0, 11, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, ThreeIsland_PokemonCenter_1F_EventScript_17184A, 0, 0, 0 + +ThreeIsland_PokemonCenter_1F_MapWarps: + warp_def 7, 8, 3, 1, 782 + warp_def 1, 6, 4, 0, 8706 + +ThreeIsland_PokemonCenter_1F_MapEvents:: + map_events ThreeIsland_PokemonCenter_1F_EventObjects, ThreeIsland_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/ThreeIsland_PokemonCenter_2F/events.inc b/data/maps/ThreeIsland_PokemonCenter_2F/events.inc new file mode 100644 index 000000000..1498826df --- /dev/null +++ b/data/maps/ThreeIsland_PokemonCenter_2F/events.inc @@ -0,0 +1,13 @@ +ThreeIsland_PokemonCenter_2F_EventObjects: + object_event 1, 65, 0, 6, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, ThreeIsland_PokemonCenter_2F_EventScript_1A8CF6, 0, 0, 0 + object_event 2, 65, 0, 2, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, ThreeIsland_PokemonCenter_2F_EventScript_1A8CFC, 0, 0, 0 + object_event 3, 65, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, ThreeIsland_PokemonCenter_2F_EventScript_1A8D02, 0, 0, 0 + object_event 4, 69, 0, 1, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, ThreeIsland_PokemonCenter_2F_EventScript_1BB1D2, 112, 0, 0 + +ThreeIsland_PokemonCenter_2F_MapWarps: + warp_def 1, 6, 4, 1, 8705 + warp_def 5, 1, 0, 0, 4 + warp_def 9, 1, 0, 0, 1 + +ThreeIsland_PokemonCenter_2F_MapEvents:: + map_events ThreeIsland_PokemonCenter_2F_EventObjects, ThreeIsland_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/ThreeIsland_Port/events.inc b/data/maps/ThreeIsland_Port/events.inc new file mode 100644 index 000000000..8a6894ed1 --- /dev/null +++ b/data/maps/ThreeIsland_Port/events.inc @@ -0,0 +1,12 @@ +ThreeIsland_Port_EventObjects: + object_event 1, 31, 0, 14, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, ThreeIsland_Port_EventScript_168796, 0, 0, 0 + object_event 2, 53, 0, 8, 0, 8, 0, 3, 28, 19, 0, 0, 0, 0, 0, ThreeIsland_Port_EventScript_1687CC, 121, 0, 0 + object_event 3, 53, 0, 13, 0, 10, 0, 3, 49, 34, 0, 0, 0, 0, 0, ThreeIsland_Port_EventScript_1687D5, 121, 0, 0 + +ThreeIsland_Port_MapWarps: + warp_def 16, 4, 0, 0, 546 + warp_def 38, 5, 3, 1, 546 + warp_def 12, 13, 3, 0, 9728 + +ThreeIsland_Port_MapEvents:: + map_events ThreeIsland_Port_EventObjects, ThreeIsland_Port_MapWarps, 0x0, 0x0 diff --git a/data/maps/TwoIsland/events.inc b/data/maps/TwoIsland/events.inc new file mode 100644 index 000000000..5ae72f9ed --- /dev/null +++ b/data/maps/TwoIsland/events.inc @@ -0,0 +1,24 @@ +TwoIsland_EventObjects: + object_event 1, 68, 0, 28, 0, 4, 0, 3, 8, 33, 0, 0, 0, 0, 0, TwoIsland_EventScript_16760F, 0, 0, 0 + object_event 2, 23, 0, 31, 0, 6, 0, 3, 7, 17, 0, 0, 0, 0, 0, TwoIsland_EventScript_167755, 123, 0, 0 + object_event 3, 29, 0, 30, 0, 11, 0, 3, 7, 17, 0, 0, 0, 0, 0, TwoIsland_EventScript_16775E, 124, 0, 0 + object_event 4, 62, 0, 26, 0, 5, 0, 3, 10, 17, 0, 0, 0, 0, 0, TwoIsland_EventScript_16774C, 0, 0, 0 + object_event 5, 52, 0, 27, 0, 6, 0, 3, 10, 17, 0, 0, 0, 0, 0, TwoIsland_EventScript_167777, 125, 0, 0 + object_event 6, 95, 0, 30, 0, 16, 0, 3, 1, 17, 0, 0, 0, 0, 0, TwoIsland_EventScript_1BDF13, 18, 0, 0 + object_event 7, 92, 0, 39, 0, 16, 0, 3, 8, 17, 0, 0, 0, 0, 0, TwoIsland_EventScript_1BEAAF, 442, 0, 0 + object_event 8, 16, 0, 37, 0, 12, 0, 3, 8, 17, 0, 0, 0, 0, 0, TwoIsland_EventScript_167789, 0, 0, 0 + object_event 9, 19, 0, 24, 0, 12, 0, 3, 2, 17, 0, 0, 0, 0, 0, TwoIsland_EventScript_167780, 0, 0, 0 + +TwoIsland_MapWarps: + warp_def 39, 9, 0, 0, 8448 + warp_def 33, 9, 0, 0, 8449 + warp_def 21, 7, 0, 0, 8450 + warp_def 10, 8, 3, 0, 8452 + +TwoIsland_MapBGEvents: + bg_event 29, 8, 0, 0, 0, TwoIsland_EventScript_167792 + bg_event 40, 10, 0, 0, 0, TwoIsland_EventScript_16779B + bg_event 8, 3, 0, 0, 0, TwoIsland_EventScript_1677A4 + +TwoIsland_MapEvents:: + map_events TwoIsland_EventObjects, TwoIsland_MapWarps, 0x0, TwoIsland_MapBGEvents diff --git a/data/maps/TwoIsland_CapeBrink/events.inc b/data/maps/TwoIsland_CapeBrink/events.inc new file mode 100644 index 000000000..6892de68a --- /dev/null +++ b/data/maps/TwoIsland_CapeBrink/events.inc @@ -0,0 +1,9 @@ +TwoIsland_CapeBrink_MapWarps: + warp_def 12, 16, 0, 0, 10240 + +TwoIsland_CapeBrink_MapBGEvents: + bg_event 16, 28, 3, 7, 0, 71, 161, 129 + bg_event 15, 13, 3, 7, 0, 68, 111, 1 + +TwoIsland_CapeBrink_MapEvents:: + map_events 0x0, TwoIsland_CapeBrink_MapWarps, 0x0, TwoIsland_CapeBrink_MapBGEvents diff --git a/data/maps/TwoIsland_CapeBrink_House/events.inc b/data/maps/TwoIsland_CapeBrink_House/events.inc new file mode 100644 index 000000000..0c656e121 --- /dev/null +++ b/data/maps/TwoIsland_CapeBrink_House/events.inc @@ -0,0 +1,8 @@ +TwoIsland_CapeBrink_House_EventObjects: + object_event 1, 58, 0, 4, 0, 4, 0, 3, 8, 17, 0, 0, 0, 0, 0, TwoIsland_CapeBrink_House_EventScript_1C4DEC, 0, 0, 0 + +TwoIsland_CapeBrink_House_MapWarps: + warp_def 4, 7, 3, 0, 815 + +TwoIsland_CapeBrink_House_MapEvents:: + map_events TwoIsland_CapeBrink_House_EventObjects, TwoIsland_CapeBrink_House_MapWarps, 0x0, 0x0 diff --git a/data/maps/TwoIsland_Harbor/events.inc b/data/maps/TwoIsland_Harbor/events.inc new file mode 100644 index 000000000..bcc123c41 --- /dev/null +++ b/data/maps/TwoIsland_Harbor/events.inc @@ -0,0 +1,9 @@ +TwoIsland_Harbor_EventObjects: + object_event 1, 108, 0, 8, 0, 9, 0, 0, 8, 17, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 2, 62, 0, 8, 0, 6, 0, 3, 7, 17, 0, 0, 0, 0, 0, TwoIsland_Harbor_EventScript_171806, 0, 0, 0 + +TwoIsland_Harbor_MapWarps: + warp_def 8, 2, 3, 3, 781 + +TwoIsland_Harbor_MapEvents:: + map_events TwoIsland_Harbor_EventObjects, TwoIsland_Harbor_MapWarps, 0x0, 0x0 diff --git a/data/maps/TwoIsland_House/events.inc b/data/maps/TwoIsland_House/events.inc new file mode 100644 index 000000000..44f34a69b --- /dev/null +++ b/data/maps/TwoIsland_House/events.inc @@ -0,0 +1,8 @@ +TwoIsland_House_EventObjects: + object_event 1, 27, 0, 7, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, TwoIsland_House_EventScript_171619, 0, 0, 0 + +TwoIsland_House_MapWarps: + warp_def 4, 7, 3, 1, 781 + +TwoIsland_House_MapEvents:: + map_events TwoIsland_House_EventObjects, TwoIsland_House_MapWarps, 0x0, 0x0 diff --git a/data/maps/TwoIsland_JoyfulGameCorner/events.inc b/data/maps/TwoIsland_JoyfulGameCorner/events.inc new file mode 100644 index 000000000..152c9e001 --- /dev/null +++ b/data/maps/TwoIsland_JoyfulGameCorner/events.inc @@ -0,0 +1,15 @@ +TwoIsland_JoyfulGameCorner_EventObjects: + object_event 1, 30, 0, 5, 0, 5, 0, 1, 10, 17, 0, 0, 0, 0, 0, TwoIsland_JoyfulGameCorner_EventScript_17155F, 0, 0, 0 + object_event 2, 53, 0, 5, 0, 8, 0, 3, 7, 17, 0, 0, 0, 0, 0, 0x0, 116, 0, 0 + object_event 3, 17, 0, 6, 0, 5, 0, 1, 9, 17, 0, 0, 0, 0, 0, TwoIsland_JoyfulGameCorner_EventScript_17160C, 117, 0, 0 + object_event 4, 25, 0, 4, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, TwoIsland_JoyfulGameCorner_EventScript_171535, 0, 0, 0 + +TwoIsland_JoyfulGameCorner_MapWarps: + warp_def 5, 8, 3, 0, 781 + +TwoIsland_JoyfulGameCorner_MapBGEvents: + bg_event 1, 1, 0, 0, 0, TwoIsland_JoyfulGameCorner_EventScript_1BC2E7 + bg_event 0, 1, 0, 0, 0, TwoIsland_JoyfulGameCorner_EventScript_1BC2FC + +TwoIsland_JoyfulGameCorner_MapEvents:: + map_events TwoIsland_JoyfulGameCorner_EventObjects, TwoIsland_JoyfulGameCorner_MapWarps, 0x0, TwoIsland_JoyfulGameCorner_MapBGEvents diff --git a/data/maps/TwoIsland_PokemonCenter_1F/events.inc b/data/maps/TwoIsland_PokemonCenter_1F/events.inc new file mode 100644 index 000000000..01d9c8105 --- /dev/null +++ b/data/maps/TwoIsland_PokemonCenter_1F/events.inc @@ -0,0 +1,11 @@ +TwoIsland_PokemonCenter_1F_EventObjects: + object_event 1, 64, 0, 7, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, TwoIsland_PokemonCenter_1F_EventScript_1717C3, 0, 0, 0 + object_event 2, 51, 0, 11, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, TwoIsland_PokemonCenter_1F_EventScript_1717CC, 0, 0, 0 + object_event 3, 20, 0, 4, 0, 4, 0, 3, 5, 17, 0, 0, 0, 0, 0, TwoIsland_PokemonCenter_1F_EventScript_1717D5, 0, 0, 0 + +TwoIsland_PokemonCenter_1F_MapWarps: + warp_def 7, 8, 3, 2, 781 + warp_def 1, 6, 4, 0, 8451 + +TwoIsland_PokemonCenter_1F_MapEvents:: + map_events TwoIsland_PokemonCenter_1F_EventObjects, TwoIsland_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/TwoIsland_PokemonCenter_2F/events.inc b/data/maps/TwoIsland_PokemonCenter_2F/events.inc new file mode 100644 index 000000000..f8aff41d4 --- /dev/null +++ b/data/maps/TwoIsland_PokemonCenter_2F/events.inc @@ -0,0 +1,13 @@ +TwoIsland_PokemonCenter_2F_EventObjects: + object_event 1, 65, 0, 6, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, TwoIsland_PokemonCenter_2F_EventScript_1A8CF6, 0, 0, 0 + object_event 2, 65, 0, 2, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, TwoIsland_PokemonCenter_2F_EventScript_1A8CFC, 0, 0, 0 + object_event 3, 65, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, TwoIsland_PokemonCenter_2F_EventScript_1A8D02, 0, 0, 0 + object_event 4, 69, 0, 1, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, TwoIsland_PokemonCenter_2F_EventScript_1BB1D2, 112, 0, 0 + +TwoIsland_PokemonCenter_2F_MapWarps: + warp_def 1, 6, 4, 1, 8450 + warp_def 5, 1, 0, 0, 4 + warp_def 9, 1, 0, 0, 1 + +TwoIsland_PokemonCenter_2F_MapEvents:: + map_events TwoIsland_PokemonCenter_2F_EventObjects, TwoIsland_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/UndergroundPath_EastEntrance/events.inc b/data/maps/UndergroundPath_EastEntrance/events.inc new file mode 100644 index 000000000..d94ffd53f --- /dev/null +++ b/data/maps/UndergroundPath_EastEntrance/events.inc @@ -0,0 +1,11 @@ +UndergroundPath_EastEntrance_EventObjects: + object_event 1, 28, 0, 5, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, UndergroundPath_EastEntrance_EventScript_160EDE, 0, 0, 0 + +UndergroundPath_EastEntrance_MapWarps: + warp_def 5, 8, 3, 0, 794 + warp_def 6, 8, 3, 0, 794 + warp_def 7, 8, 3, 0, 794 + warp_def 7, 4, 3, 0, 290 + +UndergroundPath_EastEntrance_MapEvents:: + map_events UndergroundPath_EastEntrance_EventObjects, UndergroundPath_EastEntrance_MapWarps, 0x0, 0x0 diff --git a/data/maps/UndergroundPath_EastWestTunnel/events.inc b/data/maps/UndergroundPath_EastWestTunnel/events.inc new file mode 100644 index 000000000..acbabe99f --- /dev/null +++ b/data/maps/UndergroundPath_EastWestTunnel/events.inc @@ -0,0 +1,15 @@ +UndergroundPath_EastWestTunnel_MapWarps: + warp_def 76, 3, 3, 3, 291 + warp_def 3, 4, 3, 3, 289 + +UndergroundPath_EastWestTunnel_MapBGEvents: + bg_event 7, 3, 3, 7, 0, 13, 77, 1 + bg_event 17, 5, 3, 7, 0, 18, 79, 1 + bg_event 31, 4, 3, 7, 0, 17, 80, 1 + bg_event 45, 3, 3, 7, 0, 15, 81, 1 + bg_event 70, 3, 3, 7, 0, 16, 82, 1 + bg_event 55, 2, 3, 7, 0, 34, 83, 1 + bg_event 62, 5, 3, 7, 0, 14, 78, 1 + +UndergroundPath_EastWestTunnel_MapEvents:: + map_events 0x0, UndergroundPath_EastWestTunnel_MapWarps, 0x0, UndergroundPath_EastWestTunnel_MapBGEvents diff --git a/data/maps/UndergroundPath_NorthEntrance/events.inc b/data/maps/UndergroundPath_NorthEntrance/events.inc new file mode 100644 index 000000000..ae884375b --- /dev/null +++ b/data/maps/UndergroundPath_NorthEntrance/events.inc @@ -0,0 +1,11 @@ +UndergroundPath_NorthEntrance_EventObjects: + object_event 1, 17, 0, 5, 0, 6, 0, 3, 8, 17, 0, 0, 0, 0, 0, UndergroundPath_NorthEntrance_EventScript_160E39, 0, 0, 0 + +UndergroundPath_NorthEntrance_MapWarps: + warp_def 5, 8, 3, 0, 791 + warp_def 6, 8, 3, 0, 791 + warp_def 7, 8, 3, 0, 791 + warp_def 7, 4, 3, 0, 287 + +UndergroundPath_NorthEntrance_MapEvents:: + map_events UndergroundPath_NorthEntrance_EventObjects, UndergroundPath_NorthEntrance_MapWarps, 0x0, 0x0 diff --git a/data/maps/UndergroundPath_NorthSouthTunnel/events.inc b/data/maps/UndergroundPath_NorthSouthTunnel/events.inc new file mode 100644 index 000000000..488c80de0 --- /dev/null +++ b/data/maps/UndergroundPath_NorthSouthTunnel/events.inc @@ -0,0 +1,15 @@ +UndergroundPath_NorthSouthTunnel_MapWarps: + warp_def 4, 3, 3, 3, 286 + warp_def 3, 60, 3, 3, 288 + +UndergroundPath_NorthSouthTunnel_MapBGEvents: + bg_event 5, 30, 3, 7, 0, 13, 70, 1 + bg_event 5, 6, 3, 7, 0, 14, 71, 1 + bg_event 2, 57, 3, 7, 0, 15, 74, 1 + bg_event 1, 24, 3, 7, 0, 17, 73, 1 + bg_event 6, 53, 3, 7, 0, 16, 75, 1 + bg_event 3, 15, 3, 7, 0, 18, 72, 1 + bg_event 3, 39, 3, 7, 0, 34, 76, 1 + +UndergroundPath_NorthSouthTunnel_MapEvents:: + map_events 0x0, UndergroundPath_NorthSouthTunnel_MapWarps, 0x0, UndergroundPath_NorthSouthTunnel_MapBGEvents diff --git a/data/maps/UndergroundPath_SouthEntrance/events.inc b/data/maps/UndergroundPath_SouthEntrance/events.inc new file mode 100644 index 000000000..19020f601 --- /dev/null +++ b/data/maps/UndergroundPath_SouthEntrance/events.inc @@ -0,0 +1,11 @@ +UndergroundPath_SouthEntrance_EventObjects: + object_event 1, 28, 0, 5, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, UndergroundPath_SouthEntrance_EventScript_160EC0, 0, 0, 0 + +UndergroundPath_SouthEntrance_MapWarps: + warp_def 5, 8, 3, 0, 792 + warp_def 6, 8, 3, 0, 792 + warp_def 7, 8, 3, 0, 792 + warp_def 7, 4, 3, 1, 287 + +UndergroundPath_SouthEntrance_MapEvents:: + map_events UndergroundPath_SouthEntrance_EventObjects, UndergroundPath_SouthEntrance_MapWarps, 0x0, 0x0 diff --git a/data/maps/UndergroundPath_WestEntrance/events.inc b/data/maps/UndergroundPath_WestEntrance/events.inc new file mode 100644 index 000000000..a5797c577 --- /dev/null +++ b/data/maps/UndergroundPath_WestEntrance/events.inc @@ -0,0 +1,11 @@ +UndergroundPath_WestEntrance_EventObjects: + object_event 1, 30, 0, 5, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, UndergroundPath_WestEntrance_EventScript_160ECA, 0, 0, 0 + +UndergroundPath_WestEntrance_MapWarps: + warp_def 5, 8, 3, 0, 793 + warp_def 6, 8, 3, 0, 793 + warp_def 7, 8, 3, 0, 793 + warp_def 7, 4, 3, 1, 290 + +UndergroundPath_WestEntrance_MapEvents:: + map_events UndergroundPath_WestEntrance_EventObjects, UndergroundPath_WestEntrance_MapWarps, 0x0, 0x0 diff --git a/data/maps/UnknownMap_00_00/events.inc b/data/maps/UnknownMap_00_00/events.inc new file mode 100644 index 000000000..4781c2e87 --- /dev/null +++ b/data/maps/UnknownMap_00_00/events.inc @@ -0,0 +1,13 @@ +UnknownMap_00_00_EventObjects: + object_event 1, 66, 0, 9, 0, 3, 0, 3, 9, 0, 0, 0, 0, 0, 0, UnknownMap_00_00_EventScript_1BB9AF, 0, 0, 0 + +UnknownMap_00_00_MapWarps: + warp_def 6, 8, 3, 127, 32639 + warp_def 7, 8, 3, 127, 32639 + +UnknownMap_00_00_MapCoordEvents: + coord_event 3, 5, 3, 0, 16384, 0, 0, UnknownMap_00_00_EventScript_1BB8C3 + coord_event 10, 5, 3, 0, 16384, 0, 0, UnknownMap_00_00_EventScript_1BB8CF + +UnknownMap_00_00_MapEvents:: + map_events UnknownMap_00_00_EventObjects, UnknownMap_00_00_MapWarps, UnknownMap_00_00_MapCoordEvents, 0x0 diff --git a/data/maps/UnknownMap_00_01/events.inc b/data/maps/UnknownMap_00_01/events.inc new file mode 100644 index 000000000..023a95c07 --- /dev/null +++ b/data/maps/UnknownMap_00_01/events.inc @@ -0,0 +1,13 @@ +UnknownMap_00_01_EventObjects: + object_event 1, 66, 0, 9, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, UnknownMap_00_01_EventScript_1BB9C1, 0, 0, 0 + +UnknownMap_00_01_MapWarps: + warp_def 5, 8, 3, 127, 32639 + warp_def 6, 8, 3, 127, 32639 + +UnknownMap_00_01_MapCoordEvents: + coord_event 4, 5, 3, 0, 16384, 0, 0, UnknownMap_00_01_EventScript_1BB950 + coord_event 7, 5, 3, 0, 16384, 0, 0, UnknownMap_00_01_EventScript_1BB95C + +UnknownMap_00_01_MapEvents:: + map_events UnknownMap_00_01_EventObjects, UnknownMap_00_01_MapWarps, UnknownMap_00_01_MapCoordEvents, 0x0 diff --git a/data/maps/UnknownMap_00_02/events.inc b/data/maps/UnknownMap_00_02/events.inc new file mode 100644 index 000000000..26a2fcee1 --- /dev/null +++ b/data/maps/UnknownMap_00_02/events.inc @@ -0,0 +1,17 @@ +UnknownMap_00_02_EventObjects: + object_event 1, 66, 0, 10, 0, 5, 0, 0, 8, 0, 0, 0, 0, 0, 0, UnknownMap_00_02_EventScript_1BB9D3, 0, 0, 0 + +UnknownMap_00_02_MapWarps: + warp_def 8, 9, 3, 127, 32639 + warp_def 9, 9, 3, 127, 32639 + warp_def 11, 9, 3, 127, 32639 + warp_def 10, 9, 3, 127, 32639 + +UnknownMap_00_02_MapCoordEvents: + coord_event 6, 4, 3, 0, 16384, 0, 0, UnknownMap_00_02_EventScript_1BB980 + coord_event 6, 6, 3, 0, 16384, 0, 0, UnknownMap_00_02_EventScript_1BB980 + coord_event 13, 4, 3, 0, 16384, 0, 0, UnknownMap_00_02_EventScript_1BB980 + coord_event 13, 6, 3, 0, 16384, 0, 0, UnknownMap_00_02_EventScript_1BB980 + +UnknownMap_00_02_MapEvents:: + map_events UnknownMap_00_02_EventObjects, UnknownMap_00_02_MapWarps, UnknownMap_00_02_MapCoordEvents, 0x0 diff --git a/data/maps/UnknownMap_00_03/events.inc b/data/maps/UnknownMap_00_03/events.inc new file mode 100644 index 000000000..c8e9b630a --- /dev/null +++ b/data/maps/UnknownMap_00_03/events.inc @@ -0,0 +1,14 @@ +UnknownMap_00_03_MapWarps: + warp_def 5, 8, 3, 127, 32639 + warp_def 6, 8, 3, 127, 32639 + warp_def 7, 8, 3, 127, 32639 + warp_def 8, 8, 3, 127, 32639 + +UnknownMap_00_03_MapCoordEvents: + coord_event 3, 4, 3, 0, 16384, 0, 0, UnknownMap_00_03_EventScript_1BB8DB + coord_event 3, 6, 3, 0, 16384, 0, 0, UnknownMap_00_03_EventScript_1BB915 + coord_event 10, 4, 3, 0, 16384, 0, 0, UnknownMap_00_03_EventScript_1BB8F8 + coord_event 10, 6, 3, 0, 16384, 0, 0, UnknownMap_00_03_EventScript_1BB932 + +UnknownMap_00_03_MapEvents:: + map_events 0x0, UnknownMap_00_03_MapWarps, UnknownMap_00_03_MapCoordEvents, 0x0 diff --git a/data/maps/UnknownMap_00_04/events.inc b/data/maps/UnknownMap_00_04/events.inc new file mode 100644 index 000000000..b456138b1 --- /dev/null +++ b/data/maps/UnknownMap_00_04/events.inc @@ -0,0 +1,16 @@ +UnknownMap_00_04_EventObjects: + object_event 1, 66, 0, 3, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, UnknownMap_00_04_EventScript_16050C, 0, 0, 0 + object_event 2, 243, 0, 1, 0, 8, 0, 3, 2, 17, 0, 0, 0, 0, 0, UnknownMap_00_04_EventScript_1604DA, 102, 0, 0 + object_event 3, 247, 0, 7, 0, 8, 0, 3, 2, 17, 0, 0, 0, 0, 0, UnknownMap_00_04_EventScript_160502, 106, 0, 0 + object_event 4, 246, 0, 1, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, UnknownMap_00_04_EventScript_1604F8, 105, 0, 0 + object_event 5, 245, 0, 7, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, UnknownMap_00_04_EventScript_1604EE, 104, 0, 0 + object_event 6, 244, 0, 13, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, UnknownMap_00_04_EventScript_1604E4, 103, 0, 0 + object_event 7, 242, 0, 10, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, UnknownMap_00_04_EventScript_1604D0, 101, 0, 0 + object_event 8, 241, 0, 13, 0, 8, 0, 3, 2, 17, 0, 0, 0, 0, 0, UnknownMap_00_04_EventScript_1604C6, 100, 0, 0 + object_event 9, 240, 0, 4, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, UnknownMap_00_04_EventScript_1604BC, 99, 0, 0 + +UnknownMap_00_04_MapWarps: + warp_def 7, 11, 3, 127, 32639 + +UnknownMap_00_04_MapEvents:: + map_events UnknownMap_00_04_EventObjects, UnknownMap_00_04_MapWarps, 0x0, 0x0 diff --git a/data/maps/UnknownMap_03_50/events.inc b/data/maps/UnknownMap_03_50/events.inc new file mode 100644 index 000000000..6cc1b9f0c --- /dev/null +++ b/data/maps/UnknownMap_03_50/events.inc @@ -0,0 +1,2 @@ +UnknownMap_03_50_MapEvents:: + map_events 0x0, 0x0, 0x0, 0x0 diff --git a/data/maps/UnknownMap_03_51/events.inc b/data/maps/UnknownMap_03_51/events.inc new file mode 100644 index 000000000..7da7d5a75 --- /dev/null +++ b/data/maps/UnknownMap_03_51/events.inc @@ -0,0 +1,2 @@ +UnknownMap_03_51_MapEvents:: + map_events 0x0, 0x0, 0x0, 0x0 diff --git a/data/maps/UnknownMap_03_52/events.inc b/data/maps/UnknownMap_03_52/events.inc new file mode 100644 index 000000000..afded324a --- /dev/null +++ b/data/maps/UnknownMap_03_52/events.inc @@ -0,0 +1,2 @@ +UnknownMap_03_52_MapEvents:: + map_events 0x0, 0x0, 0x0, 0x0 diff --git a/data/maps/UnknownMap_03_53/events.inc b/data/maps/UnknownMap_03_53/events.inc new file mode 100644 index 000000000..b3f4c34f1 --- /dev/null +++ b/data/maps/UnknownMap_03_53/events.inc @@ -0,0 +1,2 @@ +UnknownMap_03_53_MapEvents:: + map_events 0x0, 0x0, 0x0, 0x0 diff --git a/data/maps/UnknownMap_18_01/events.inc b/data/maps/UnknownMap_18_01/events.inc new file mode 100644 index 000000000..95c4daa1c --- /dev/null +++ b/data/maps/UnknownMap_18_01/events.inc @@ -0,0 +1,2 @@ +UnknownMap_18_01_MapEvents:: + map_events 0x0, 0x0, 0x0, 0x0 diff --git a/data/maps/UnusedHouse_27_00/events.inc b/data/maps/UnusedHouse_27_00/events.inc new file mode 100644 index 000000000..086aa89d7 --- /dev/null +++ b/data/maps/UnusedHouse_27_00/events.inc @@ -0,0 +1,2 @@ +UnusedHouse_27_00_MapEvents:: + map_events 0x0, 0x0, 0x0, 0x0 diff --git a/data/maps/UnusedHouse_29_00/events.inc b/data/maps/UnusedHouse_29_00/events.inc new file mode 100644 index 000000000..be21c75df --- /dev/null +++ b/data/maps/UnusedHouse_29_00/events.inc @@ -0,0 +1,2 @@ +UnusedHouse_29_00_MapEvents:: + map_events 0x0, 0x0, 0x0, 0x0 diff --git a/data/maps/UnusedHouse_31_05/events.inc b/data/maps/UnusedHouse_31_05/events.inc new file mode 100644 index 000000000..f367b0911 --- /dev/null +++ b/data/maps/UnusedHouse_31_05/events.inc @@ -0,0 +1,2 @@ +UnusedHouse_31_05_MapEvents:: + map_events 0x0, 0x0, 0x0, 0x0 diff --git a/data/maps/VermilionCity/events.inc b/data/maps/VermilionCity/events.inc new file mode 100644 index 000000000..2178a9d13 --- /dev/null +++ b/data/maps/VermilionCity/events.inc @@ -0,0 +1,38 @@ +VermilionCity_EventObjects: + object_event 1, 23, 0, 22, 0, 11, 0, 3, 5, 20, 0, 0, 0, 0, 0, VermilionCity_EventScript_166917, 0, 0, 0 + object_event 2, 32, 0, 17, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, VermilionCity_EventScript_166920, 0, 0, 0 + object_event 3, 33, 0, 36, 0, 10, 0, 0, 17, 17, 0, 0, 0, 0, 0, VermilionCity_EventScript_166C2F, 0, 0, 0 + object_event 4, 130, 0, 35, 0, 11, 0, 3, 2, 34, 0, 0, 0, 0, 0, VermilionCity_EventScript_166C38, 0, 0, 0 + object_event 5, 62, 0, 31, 0, 30, 0, 3, 5, 20, 0, 0, 0, 0, 0, VermilionCity_EventScript_166C17, 0, 0, 0 + object_event 6, 62, 0, 24, 0, 33, 0, 3, 7, 17, 0, 0, 0, 0, 0, VermilionCity_EventScript_166941, 0, 0, 0 + object_event 7, 95, 0, 19, 0, 24, 0, 3, 8, 17, 0, 0, 0, 0, 0, VermilionCity_EventScript_1BDF13, 18, 0, 0 + object_event 8, 55, 0, 25, 0, 7, 0, 3, 1, 20, 0, 0, 0, 0, 0, VermilionCity_EventScript_166C20, 161, 0, 0 + +VermilionCity_MapWarps: + warp_def 22, 34, 3, 1, 260 + warp_def 23, 34, 3, 1, 260 + warp_def 24, 34, 3, 1, 260 + warp_def 9, 6, 0, 1, 2304 + warp_def 15, 6, 3, 1, 2305 + warp_def 12, 17, 0, 1, 2307 + warp_def 19, 17, 0, 1, 2308 + warp_def 29, 17, 0, 1, 2309 + warp_def 28, 24, 0, 1, 2311 + warp_def 14, 25, 0, 1, 2310 + +VermilionCity_MapCoordEvents: + coord_event 22, 33, 0, 0, 16467, 0, 0, VermilionCity_EventScript_166B8A + coord_event 23, 33, 0, 0, 16467, 0, 0, VermilionCity_EventScript_166B91 + coord_event 22, 32, 0, 0, 16385, 0, 0, VermilionCity_EventScript_166B98 + coord_event 23, 32, 0, 0, 16385, 0, 0, VermilionCity_EventScript_166B98 + +VermilionCity_MapBGEvents: + bg_event 33, 6, 0, 0, 0, VermilionCity_EventScript_166C53 + bg_event 10, 17, 3, 0, 0, VermilionCity_EventScript_166C65 + bg_event 10, 24, 0, 0, 0, VermilionCity_EventScript_166C6E + bg_event 34, 18, 0, 0, 0, VermilionCity_EventScript_166C86 + bg_event 45, 17, 3, 0, 0, VermilionCity_EventScript_166C5C + bg_event 14, 11, 3, 7, 0, 35, 48, 1 + +VermilionCity_MapEvents:: + map_events VermilionCity_EventObjects, VermilionCity_MapWarps, VermilionCity_MapCoordEvents, VermilionCity_MapBGEvents diff --git a/data/maps/VermilionCity_Gym/events.inc b/data/maps/VermilionCity_Gym/events.inc new file mode 100644 index 000000000..94ce9dbdb --- /dev/null +++ b/data/maps/VermilionCity_Gym/events.inc @@ -0,0 +1,33 @@ +VermilionCity_Gym_EventObjects: + object_event 1, 82, 0, 5, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, VermilionCity_Gym_EventScript_16B94A, 0, 0, 0 + object_event 2, 30, 0, 2, 0, 11, 0, 3, 1, 17, 0, 1, 0, 3, 0, VermilionCity_Gym_EventScript_16BA1E, 0, 0, 0 + object_event 3, 62, 0, 8, 0, 13, 0, 3, 1, 17, 0, 1, 0, 3, 0, VermilionCity_Gym_EventScript_16B9FA, 0, 0, 0 + object_event 4, 91, 0, 4, 0, 17, 0, 3, 8, 17, 0, 0, 0, 0, 0, VermilionCity_Gym_EventScript_16BA6C, 0, 0, 0 + object_event 5, 61, 0, 7, 0, 8, 0, 3, 9, 17, 0, 1, 0, 3, 0, VermilionCity_Gym_EventScript_16BA35, 0, 0, 0 + +VermilionCity_Gym_MapWarps: + warp_def 4, 19, 3, 9, 773 + warp_def 5, 19, 3, 9, 773 + warp_def 6, 19, 3, 9, 773 + +VermilionCity_Gym_MapBGEvents: + bg_event 3, 17, 0, 0, 0, VermilionCity_Gym_EventScript_16BA8B + bg_event 7, 17, 0, 0, 0, VermilionCity_Gym_EventScript_16BA8B + bg_event 1, 10, 0, 0, 0, VermilionCity_Gym_EventScript_16B78F + bg_event 3, 10, 0, 0, 0, VermilionCity_Gym_EventScript_16B79B + bg_event 5, 10, 0, 0, 0, VermilionCity_Gym_EventScript_16B7A7 + bg_event 7, 10, 0, 0, 0, VermilionCity_Gym_EventScript_16B7B3 + bg_event 9, 10, 0, 0, 0, VermilionCity_Gym_EventScript_16B7BF + bg_event 1, 12, 0, 0, 0, VermilionCity_Gym_EventScript_16B7CB + bg_event 3, 12, 0, 0, 0, VermilionCity_Gym_EventScript_16B7D7 + bg_event 5, 12, 0, 0, 0, VermilionCity_Gym_EventScript_16B7E3 + bg_event 7, 12, 0, 0, 0, VermilionCity_Gym_EventScript_16B7EF + bg_event 9, 12, 0, 0, 0, VermilionCity_Gym_EventScript_16B7FB + bg_event 1, 14, 0, 0, 0, VermilionCity_Gym_EventScript_16B807 + bg_event 3, 14, 0, 0, 0, VermilionCity_Gym_EventScript_16B813 + bg_event 5, 14, 0, 0, 0, VermilionCity_Gym_EventScript_16B81F + bg_event 7, 14, 0, 0, 0, VermilionCity_Gym_EventScript_16B82B + bg_event 9, 14, 0, 0, 0, VermilionCity_Gym_EventScript_16B837 + +VermilionCity_Gym_MapEvents:: + map_events VermilionCity_Gym_EventObjects, VermilionCity_Gym_MapWarps, 0x0, VermilionCity_Gym_MapBGEvents diff --git a/data/maps/VermilionCity_House1/events.inc b/data/maps/VermilionCity_House1/events.inc new file mode 100644 index 000000000..e5f44384b --- /dev/null +++ b/data/maps/VermilionCity_House1/events.inc @@ -0,0 +1,10 @@ +VermilionCity_House1_EventObjects: + object_event 1, 57, 0, 4, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, VermilionCity_House1_EventScript_16B3A7, 0, 0, 0 + +VermilionCity_House1_MapWarps: + warp_def 3, 7, 3, 3, 773 + warp_def 4, 7, 3, 3, 773 + warp_def 5, 7, 3, 3, 773 + +VermilionCity_House1_MapEvents:: + map_events VermilionCity_House1_EventObjects, VermilionCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/VermilionCity_House2/events.inc b/data/maps/VermilionCity_House2/events.inc new file mode 100644 index 000000000..8e8eb781c --- /dev/null +++ b/data/maps/VermilionCity_House2/events.inc @@ -0,0 +1,10 @@ +VermilionCity_House2_EventObjects: + object_event 1, 17, 0, 4, 0, 4, 0, 3, 7, 17, 0, 0, 0, 0, 0, VermilionCity_House2_EventScript_16B5D7, 0, 0, 0 + +VermilionCity_House2_MapWarps: + warp_def 3, 7, 3, 6, 773 + warp_def 4, 7, 3, 6, 773 + warp_def 5, 7, 3, 6, 773 + +VermilionCity_House2_MapEvents:: + map_events VermilionCity_House2_EventObjects, VermilionCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/VermilionCity_House3/events.inc b/data/maps/VermilionCity_House3/events.inc new file mode 100644 index 000000000..746a1b637 --- /dev/null +++ b/data/maps/VermilionCity_House3/events.inc @@ -0,0 +1,16 @@ +VermilionCity_House3_EventObjects: + object_event 1, 19, 0, 7, 0, 4, 0, 3, 9, 17, 0, 0, 0, 0, 0, VermilionCity_House3_EventScript_16BAAA, 0, 0, 0 + object_event 2, 116, 0, 2, 0, 5, 0, 3, 5, 18, 0, 0, 0, 0, 0, VermilionCity_House3_EventScript_16BABC, 0, 0, 0 + object_event 3, 105, 0, 6, 0, 4, 0, 0, 1, 17, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 4, 22, 0, 2, 0, 4, 0, 3, 8, 17, 0, 0, 0, 0, 0, VermilionCity_House3_EventScript_16BAB3, 0, 0, 0 + +VermilionCity_House3_MapWarps: + warp_def 3, 7, 3, 8, 773 + warp_def 4, 7, 3, 8, 773 + warp_def 5, 7, 3, 8, 773 + +VermilionCity_House3_MapBGEvents: + bg_event 6, 4, 3, 0, 0, VermilionCity_House3_EventScript_16BACF + +VermilionCity_House3_MapEvents:: + map_events VermilionCity_House3_EventObjects, VermilionCity_House3_MapWarps, 0x0, VermilionCity_House3_MapBGEvents diff --git a/data/maps/VermilionCity_Mart/events.inc b/data/maps/VermilionCity_Mart/events.inc new file mode 100644 index 000000000..2a659bf50 --- /dev/null +++ b/data/maps/VermilionCity_Mart/events.inc @@ -0,0 +1,12 @@ +VermilionCity_Mart_EventObjects: + object_event 1, 68, 0, 2, 0, 3, 0, 0, 10, 17, 0, 0, 0, 0, 0, VermilionCity_Mart_EventScript_16B666, 0, 0, 0 + object_event 2, 42, 0, 4, 0, 2, 0, 3, 9, 17, 0, 0, 0, 0, 0, VermilionCity_Mart_EventScript_16B654, 0, 0, 0 + object_event 3, 30, 0, 9, 0, 4, 0, 3, 2, 33, 0, 0, 0, 0, 0, VermilionCity_Mart_EventScript_16B65D, 0, 0, 0 + +VermilionCity_Mart_MapWarps: + warp_def 3, 7, 3, 7, 773 + warp_def 4, 7, 3, 7, 773 + warp_def 5, 7, 3, 7, 773 + +VermilionCity_Mart_MapEvents:: + map_events VermilionCity_Mart_EventObjects, VermilionCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/VermilionCity_PokemonCenter_1F/events.inc b/data/maps/VermilionCity_PokemonCenter_1F/events.inc new file mode 100644 index 000000000..6db98e763 --- /dev/null +++ b/data/maps/VermilionCity_PokemonCenter_1F/events.inc @@ -0,0 +1,17 @@ +VermilionCity_PokemonCenter_1F_EventObjects: + object_event 1, 64, 0, 7, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, VermilionCity_PokemonCenter_1F_EventScript_16B433, 0, 0, 0 + object_event 2, 25, 0, 4, 0, 8, 0, 3, 5, 17, 0, 0, 0, 0, 0, VermilionCity_PokemonCenter_1F_EventScript_16B43C, 0, 0, 0 + object_event 3, 56, 0, 12, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, VermilionCity_PokemonCenter_1F_EventScript_16B445, 0, 0, 0 + object_event 4, 18, 0, 14, 0, 4, 0, 3, 3, 17, 0, 0, 0, 0, 0, VermilionCity_PokemonCenter_1F_EventScript_16B44E, 0, 0, 0 + object_event 5, 42, 0, 6, 0, 4, 0, 3, 8, 17, 0, 0, 0, 0, 0, VermilionCity_PokemonCenter_1F_EventScript_1A8D08, 0, 0, 0 + object_event 6, 0, 0, 2, 0, 1, 0, 0, 76, 17, 0, 0, 0, 0, 0, VermilionCity_PokemonCenter_1F_EventScript_1ACE83, 160, 0, 0 + object_event 7, 0, 0, 3, 0, 1, 0, 0, 76, 17, 0, 0, 0, 0, 0, VermilionCity_PokemonCenter_1F_EventScript_1ACE83, 160, 0, 0 + +VermilionCity_PokemonCenter_1F_MapWarps: + warp_def 6, 8, 3, 4, 773 + warp_def 7, 8, 3, 4, 773 + warp_def 8, 8, 3, 4, 773 + warp_def 1, 6, 4, 0, 2306 + +VermilionCity_PokemonCenter_1F_MapEvents:: + map_events VermilionCity_PokemonCenter_1F_EventObjects, VermilionCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/VermilionCity_PokemonCenter_2F/events.inc b/data/maps/VermilionCity_PokemonCenter_2F/events.inc new file mode 100644 index 000000000..eca0aaf89 --- /dev/null +++ b/data/maps/VermilionCity_PokemonCenter_2F/events.inc @@ -0,0 +1,13 @@ +VermilionCity_PokemonCenter_2F_EventObjects: + object_event 1, 65, 0, 6, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, VermilionCity_PokemonCenter_2F_EventScript_1A8CF6, 0, 0, 0 + object_event 2, 65, 0, 2, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, VermilionCity_PokemonCenter_2F_EventScript_1A8CFC, 0, 0, 0 + object_event 3, 65, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, VermilionCity_PokemonCenter_2F_EventScript_1A8D02, 0, 0, 0 + object_event 4, 69, 0, 1, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, VermilionCity_PokemonCenter_2F_EventScript_1BB1D2, 112, 0, 0 + +VermilionCity_PokemonCenter_2F_MapWarps: + warp_def 1, 6, 4, 3, 2305 + warp_def 5, 1, 0, 0, 4 + warp_def 9, 1, 0, 0, 1 + +VermilionCity_PokemonCenter_2F_MapEvents:: + map_events VermilionCity_PokemonCenter_2F_EventObjects, VermilionCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/VermilionCity_PokemonFanClub/events.inc b/data/maps/VermilionCity_PokemonFanClub/events.inc new file mode 100644 index 000000000..6f4a7f4b1 --- /dev/null +++ b/data/maps/VermilionCity_PokemonFanClub/events.inc @@ -0,0 +1,19 @@ +VermilionCity_PokemonFanClub_EventObjects: + object_event 1, 61, 0, 5, 0, 4, 0, 4, 8, 17, 0, 0, 0, 0, 0, VermilionCity_PokemonFanClub_EventScript_16B47F, 0, 0, 0 + object_event 2, 48, 0, 6, 0, 4, 0, 4, 8, 17, 0, 0, 0, 0, 0, VermilionCity_PokemonFanClub_EventScript_16B4FC, 0, 0, 0 + object_event 3, 120, 0, 7, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, VermilionCity_PokemonFanClub_EventScript_16B59E, 0, 0, 0 + object_event 4, 126, 0, 4, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, VermilionCity_PokemonFanClub_EventScript_16B5B1, 0, 0, 0 + object_event 5, 23, 0, 4, 0, 5, 0, 0, 8, 17, 0, 0, 0, 0, 0, VermilionCity_PokemonFanClub_EventScript_16B528, 0, 0, 0 + object_event 6, 27, 0, 7, 0, 5, 0, 0, 8, 17, 0, 0, 0, 0, 0, VermilionCity_PokemonFanClub_EventScript_16B563, 0, 0, 0 + +VermilionCity_PokemonFanClub_MapWarps: + warp_def 4, 10, 3, 5, 773 + warp_def 5, 10, 3, 5, 773 + warp_def 6, 10, 3, 5, 773 + +VermilionCity_PokemonFanClub_MapBGEvents: + bg_event 2, 1, 0, 0, 0, VermilionCity_PokemonFanClub_EventScript_16B5C4 + bg_event 9, 1, 0, 0, 0, VermilionCity_PokemonFanClub_EventScript_16B5CD + +VermilionCity_PokemonFanClub_MapEvents:: + map_events VermilionCity_PokemonFanClub_EventObjects, VermilionCity_PokemonFanClub_MapWarps, 0x0, VermilionCity_PokemonFanClub_MapBGEvents diff --git a/data/maps/VictoryRoad_1F/events.inc b/data/maps/VictoryRoad_1F/events.inc new file mode 100644 index 000000000..1c5c17cb1 --- /dev/null +++ b/data/maps/VictoryRoad_1F/events.inc @@ -0,0 +1,22 @@ +VictoryRoad_1F_EventObjects: + object_event 1, 41, 0, 5, 0, 2, 0, 3, 8, 17, 0, 1, 0, 4, 0, VictoryRoad_1F_EventScript_160F7B, 0, 0, 0 + object_event 2, 42, 0, 14, 0, 6, 0, 4, 8, 17, 0, 1, 0, 4, 0, VictoryRoad_1F_EventScript_160F64, 0, 0, 0 + object_event 3, 92, 0, 12, 0, 3, 0, 3, 8, 17, 0, 0, 0, 0, 0, VictoryRoad_1F_EventScript_1BE9D2, 425, 0, 0 + object_event 4, 92, 0, 14, 0, 1, 0, 3, 8, 17, 0, 0, 0, 0, 0, VictoryRoad_1F_EventScript_1BE9DF, 426, 0, 0 + object_event 5, 97, 0, 7, 0, 18, 0, 3, 8, 0, 0, 0, 0, 0, 0, VictoryRoad_1F_EventScript_1BE11D, 0, 0, 0 + object_event 6, 97, 0, 4, 0, 12, 0, 3, 8, 0, 0, 0, 0, 0, 0, VictoryRoad_1F_EventScript_1BE11D, 0, 0, 0 + object_event 7, 97, 0, 16, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, VictoryRoad_1F_EventScript_1BE11D, 0, 0, 0 + +VictoryRoad_1F_MapWarps: + warp_def 3, 2, 3, 0, 296 + warp_def 11, 20, 3, 0, 810 + +VictoryRoad_1F_MapCoordEvents: + coord_event 20, 16, 3, 0, 16484, 99, 0, VictoryRoad_1F_EventScript_160F33 + +VictoryRoad_1F_MapBGEvents: + bg_event 12, 12, 0, 7, 0, 2, 37, 1 + bg_event 16, 1, 0, 7, 0, 19, 38, 1 + +VictoryRoad_1F_MapEvents:: + map_events VictoryRoad_1F_EventObjects, VictoryRoad_1F_MapWarps, VictoryRoad_1F_MapCoordEvents, VictoryRoad_1F_MapBGEvents diff --git a/data/maps/VictoryRoad_2F/events.inc b/data/maps/VictoryRoad_2F/events.inc new file mode 100644 index 000000000..67e5fa5f5 --- /dev/null +++ b/data/maps/VictoryRoad_2F/events.inc @@ -0,0 +1,32 @@ +VictoryRoad_2F_EventObjects: + object_event 1, 52, 0, 7, 0, 4, 0, 3, 8, 17, 0, 1, 0, 1, 0, VictoryRoad_2F_EventScript_161037, 0, 0, 0 + object_event 2, 54, 0, 20, 0, 11, 0, 4, 17, 17, 0, 1, 0, 4, 0, VictoryRoad_2F_EventScript_16104E, 0, 0, 0 + object_event 3, 26, 0, 31, 0, 16, 0, 4, 9, 17, 0, 1, 0, 4, 0, VictoryRoad_2F_EventScript_161065, 0, 0, 0 + object_event 4, 25, 0, 26, 0, 6, 0, 3, 40, 68, 0, 1, 0, 1, 0, VictoryRoad_2F_EventScript_161093, 0, 0, 0 + object_event 5, 26, 0, 36, 0, 5, 0, 3, 7, 17, 0, 1, 0, 3, 0, VictoryRoad_2F_EventScript_16107C, 0, 0, 0 + object_event 6, 92, 0, 17, 0, 6, 0, 3, 8, 17, 0, 0, 0, 0, 0, VictoryRoad_2F_EventScript_1BE9EC, 427, 0, 0 + object_event 7, 92, 0, 40, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, VictoryRoad_2F_EventScript_1BE9F9, 428, 0, 0 + object_event 8, 92, 0, 25, 0, 13, 0, 3, 8, 17, 0, 0, 0, 0, 0, VictoryRoad_2F_EventScript_1BEA06, 429, 0, 0 + object_event 9, 92, 0, 14, 0, 13, 0, 3, 8, 17, 0, 0, 0, 0, 0, VictoryRoad_2F_EventScript_1BEA13, 430, 0, 0 + object_event 10, 97, 0, 8, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, VictoryRoad_2F_EventScript_1BE11D, 0, 0, 0 + object_event 11, 97, 0, 6, 0, 17, 0, 3, 8, 0, 0, 0, 0, 0, 0, VictoryRoad_2F_EventScript_1BE11D, 0, 0, 0 + object_event 12, 97, 0, 33, 0, 19, 0, 3, 8, 0, 0, 0, 0, 0, 0, VictoryRoad_2F_EventScript_1BE11D, 88, 0, 0 + object_event 13, 41, 0, 40, 0, 9, 0, 3, 8, 17, 0, 0, 0, 0, 0, VictoryRoad_2F_EventScript_1C47AE, 0, 0, 0 + +VictoryRoad_2F_MapWarps: + warp_def 1, 9, 3, 0, 295 + warp_def 3, 3, 3, 0, 297 + warp_def 34, 9, 3, 1, 297 + warp_def 38, 9, 3, 2, 297 + warp_def 36, 17, 4, 3, 297 + warp_def 49, 13, 0, 1, 810 + warp_def 48, 12, 3, 1, 810 + warp_def 47, 13, 0, 1, 810 + warp_def 34, 19, 3, 4, 297 + +VictoryRoad_2F_MapCoordEvents: + coord_event 2, 19, 3, 0, 16485, 99, 0, VictoryRoad_2F_EventScript_160FD5 + coord_event 14, 19, 3, 0, 16486, 99, 0, VictoryRoad_2F_EventScript_161006 + +VictoryRoad_2F_MapEvents:: + map_events VictoryRoad_2F_EventObjects, VictoryRoad_2F_MapWarps, VictoryRoad_2F_MapCoordEvents, 0x0 diff --git a/data/maps/VictoryRoad_3F/events.inc b/data/maps/VictoryRoad_3F/events.inc new file mode 100644 index 000000000..dfac9f3ce --- /dev/null +++ b/data/maps/VictoryRoad_3F/events.inc @@ -0,0 +1,26 @@ +VictoryRoad_3F_EventObjects: + object_event 1, 41, 0, 40, 0, 7, 0, 3, 9, 17, 0, 1, 0, 1, 0, VictoryRoad_3F_EventScript_161103, 0, 0, 0 + object_event 2, 42, 0, 21, 0, 5, 0, 4, 10, 17, 0, 1, 0, 4, 0, VictoryRoad_3F_EventScript_161148, 0, 0, 0 + object_event 3, 41, 0, 10, 0, 17, 0, 3, 9, 17, 0, 1, 0, 5, 0, VictoryRoad_3F_EventScript_16111A, 0, 0, 0 + object_event 4, 42, 0, 11, 0, 16, 0, 3, 10, 17, 0, 1, 0, 5, 0, VictoryRoad_3F_EventScript_161131, 0, 0, 0 + object_event 5, 92, 0, 38, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, VictoryRoad_3F_EventScript_1BEA20, 431, 0, 0 + object_event 6, 92, 0, 12, 0, 9, 0, 3, 8, 17, 0, 0, 0, 0, 0, VictoryRoad_3F_EventScript_1BEA2D, 432, 0, 0 + object_event 7, 97, 0, 19, 0, 15, 0, 3, 8, 0, 0, 0, 0, 0, 0, VictoryRoad_3F_EventScript_1BE11D, 0, 0, 0 + object_event 8, 97, 0, 33, 0, 18, 0, 0, 8, 0, 0, 88, 0, 0, 0, VictoryRoad_3F_EventScript_1BE11D, 89, 0, 0 + object_event 9, 97, 0, 35, 0, 13, 0, 3, 8, 0, 0, 0, 0, 0, 0, VictoryRoad_3F_EventScript_1BE11D, 0, 0, 0 + object_event 10, 97, 0, 32, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, VictoryRoad_3F_EventScript_1BE11D, 0, 0, 0 + object_event 11, 41, 0, 38, 0, 13, 0, 3, 8, 17, 0, 1, 0, 1, 0, VictoryRoad_3F_EventScript_16115F, 0, 0, 0 + object_event 12, 42, 0, 39, 0, 13, 0, 3, 8, 17, 0, 1, 0, 1, 0, VictoryRoad_3F_EventScript_16117A, 0, 0, 0 + +VictoryRoad_3F_MapWarps: + warp_def 5, 2, 3, 1, 296 + warp_def 34, 9, 3, 2, 296 + warp_def 37, 10, 3, 3, 296 + warp_def 39, 17, 3, 4, 296 + warp_def 34, 18, 3, 8, 296 + +VictoryRoad_3F_MapCoordEvents: + coord_event 7, 7, 3, 0, 16487, 99, 0, VictoryRoad_3F_EventScript_1610CF + +VictoryRoad_3F_MapEvents:: + map_events VictoryRoad_3F_EventObjects, VictoryRoad_3F_MapWarps, VictoryRoad_3F_MapCoordEvents, 0x0 diff --git a/data/maps/ViridianCity/events.inc b/data/maps/ViridianCity/events.inc new file mode 100644 index 000000000..ec87ad511 --- /dev/null +++ b/data/maps/ViridianCity/events.inc @@ -0,0 +1,33 @@ +ViridianCity_EventObjects: + object_event 1, 27, 0, 8, 0, 26, 0, 3, 8, 0, 0, 0, 0, 0, 0, ViridianCity_EventScript_165AF0, 0, 0, 0 + object_event 2, 95, 0, 11, 0, 24, 0, 3, 8, 17, 0, 0, 0, 0, 0, ViridianCity_EventScript_1BDF13, 17, 0, 0 + object_event 3, 32, 0, 34, 0, 11, 0, 3, 7, 0, 0, 0, 0, 0, 0, ViridianCity_EventScript_1659CA, 0, 0, 0 + object_event 4, 240, 0, 21, 0, 6, 0, 3, 1, 50, 0, 0, 0, 0, 0, ViridianCity_EventScript_1659F6, 0, 0, 0 + object_event 5, 31, 0, 20, 0, 12, 0, 3, 7, 49, 0, 0, 0, 0, 0, ViridianCity_EventScript_165AC4, 0, 0, 0 + object_event 6, 18, 0, 33, 0, 26, 0, 3, 3, 32, 0, 0, 0, 0, 0, ViridianCity_EventScript_165A8F, 0, 0, 0 + object_event 7, 19, 0, 16, 0, 22, 0, 3, 2, 33, 0, 0, 0, 0, 0, ViridianCity_EventScript_1659C1, 0, 0, 0 + object_event 8, 95, 0, 18, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, ViridianCity_EventScript_1BDF13, 18, 0, 0 + object_event 9, 92, 0, 17, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, ViridianCity_EventScript_1BEB8C, 461, 0, 0 + +ViridianCity_MapWarps: + warp_def 26, 26, 0, 1, 1284 + warp_def 25, 11, 3, 1, 1280 + warp_def 36, 10, 0, 1, 1281 + warp_def 25, 18, 0, 1, 1282 + warp_def 36, 19, 0, 1, 1283 + +ViridianCity_MapCoordEvents: + coord_event 22, 11, 3, 0, 16465, 0, 0, ViridianCity_EventScript_165AF6 + coord_event 36, 11, 3, 0, 16474, 0, 0, ViridianCity_EventScript_16596D + coord_event 20, 8, 3, 0, 16465, 1, 0, ViridianCity_EventScript_165B10 + coord_event 22, 8, 3, 0, 16465, 1, 0, ViridianCity_EventScript_165B2E + +ViridianCity_MapBGEvents: + bg_event 23, 1, 3, 0, 0, ViridianCity_EventScript_16599D + bg_event 32, 10, 0, 0, 0, ViridianCity_EventScript_1659AF + bg_event 20, 31, 0, 0, 0, ViridianCity_EventScript_1659A6 + bg_event 20, 16, 0, 0, 0, ViridianCity_EventScript_165994 + bg_event 36, 10, 0, 0, 0, ViridianCity_EventScript_1659B8 + +ViridianCity_MapEvents:: + map_events ViridianCity_EventObjects, ViridianCity_MapWarps, ViridianCity_MapCoordEvents, ViridianCity_MapBGEvents diff --git a/data/maps/ViridianCity_Gym/events.inc b/data/maps/ViridianCity_Gym/events.inc new file mode 100644 index 000000000..b2469c9b7 --- /dev/null +++ b/data/maps/ViridianCity_Gym/events.inc @@ -0,0 +1,24 @@ +ViridianCity_Gym_EventObjects: + object_event 1, 54, 0, 10, 0, 2, 0, 3, 8, 17, 0, 1, 0, 3, 0, ViridianCity_Gym_EventScript_169FD6, 0, 0, 0 + object_event 2, 41, 0, 12, 0, 10, 0, 3, 8, 17, 0, 1, 0, 3, 0, ViridianCity_Gym_EventScript_16A004, 0, 0, 0 + object_event 3, 54, 0, 11, 0, 14, 0, 3, 7, 17, 0, 1, 0, 3, 0, ViridianCity_Gym_EventScript_169FA8, 0, 0, 0 + object_event 4, 25, 0, 10, 0, 10, 0, 3, 8, 17, 0, 1, 0, 3, 0, ViridianCity_Gym_EventScript_169F7A, 0, 0, 0 + object_event 5, 25, 0, 2, 0, 21, 0, 3, 10, 17, 0, 1, 0, 2, 0, ViridianCity_Gym_EventScript_169F91, 0, 0, 0 + object_event 6, 54, 0, 3, 0, 11, 0, 3, 9, 17, 0, 1, 0, 2, 0, ViridianCity_Gym_EventScript_169FBF, 0, 0, 0 + object_event 7, 41, 0, 6, 0, 8, 0, 3, 8, 17, 0, 1, 0, 3, 0, ViridianCity_Gym_EventScript_169FED, 0, 0, 0 + object_event 8, 87, 0, 2, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, ViridianCity_Gym_EventScript_169ECA, 85, 0, 0 + object_event 9, 41, 0, 13, 0, 7, 0, 3, 10, 17, 0, 1, 0, 3, 0, ViridianCity_Gym_EventScript_16A01B, 0, 0, 0 + object_event 10, 91, 0, 16, 0, 20, 0, 3, 8, 17, 0, 0, 0, 0, 0, ViridianCity_Gym_EventScript_16A032, 0, 0, 0 + +ViridianCity_Gym_MapWarps: + warp_def 16, 22, 3, 2, 769 + warp_def 17, 22, 3, 2, 769 + warp_def 18, 22, 3, 2, 769 + +ViridianCity_Gym_MapBGEvents: + bg_event 15, 20, 0, 0, 0, ViridianCity_Gym_EventScript_16A05E + bg_event 19, 20, 0, 0, 0, ViridianCity_Gym_EventScript_16A05E + bg_event 2, 2, 3, 7, 0, 181, 189, 129 + +ViridianCity_Gym_MapEvents:: + map_events ViridianCity_Gym_EventObjects, ViridianCity_Gym_MapWarps, 0x0, ViridianCity_Gym_MapBGEvents diff --git a/data/maps/ViridianCity_House1/events.inc b/data/maps/ViridianCity_House1/events.inc new file mode 100644 index 000000000..138574c82 --- /dev/null +++ b/data/maps/ViridianCity_House1/events.inc @@ -0,0 +1,15 @@ +ViridianCity_House1_EventObjects: + object_event 1, 30, 0, 7, 0, 4, 0, 3, 9, 17, 0, 0, 0, 0, 0, ViridianCity_House1_EventScript_169E9B, 0, 0, 0 + object_event 2, 17, 0, 2, 0, 5, 0, 3, 3, 33, 0, 0, 0, 0, 0, ViridianCity_House1_EventScript_169EA4, 0, 0, 0 + object_event 3, 110, 0, 6, 0, 6, 0, 3, 5, 20, 0, 0, 0, 0, 0, ViridianCity_House1_EventScript_169EAD, 0, 0, 0 + +ViridianCity_House1_MapWarps: + warp_def 3, 7, 0, 1, 769 + warp_def 4, 7, 0, 1, 769 + warp_def 5, 7, 3, 1, 769 + +ViridianCity_House1_MapBGEvents: + bg_event 7, 1, 0, 0, 0, ViridianCity_House1_EventScript_169EC0 + +ViridianCity_House1_MapEvents:: + map_events ViridianCity_House1_EventObjects, ViridianCity_House1_MapWarps, 0x0, ViridianCity_House1_MapBGEvents diff --git a/data/maps/ViridianCity_House2/events.inc b/data/maps/ViridianCity_House2/events.inc new file mode 100644 index 000000000..4d2ac979a --- /dev/null +++ b/data/maps/ViridianCity_House2/events.inc @@ -0,0 +1,18 @@ +ViridianCity_House2_EventObjects: + object_event 1, 28, 0, 6, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, ViridianCity_House2_EventScript_16A094, 0, 0, 0 + object_event 2, 22, 0, 4, 0, 5, 0, 3, 7, 17, 0, 0, 0, 0, 0, ViridianCity_House2_EventScript_16A07D, 0, 0, 0 + +ViridianCity_House2_MapWarps: + warp_def 3, 7, 0, 3, 769 + warp_def 4, 7, 0, 3, 769 + warp_def 5, 7, 3, 3, 769 + +ViridianCity_House2_MapBGEvents: + bg_event 4, 4, 0, 0, 0, ViridianCity_House2_EventScript_16A0AB + bg_event 5, 1, 0, 0, 0, ViridianCity_House2_EventScript_16A11D + bg_event 4, 1, 0, 0, 0, ViridianCity_House2_EventScript_16A11D + bg_event 9, 2, 0, 1, 0, ViridianCity_House2_EventScript_1ACD65 + bg_event 8, 2, 0, 1, 0, ViridianCity_House2_EventScript_1ACD65 + +ViridianCity_House2_MapEvents:: + map_events ViridianCity_House2_EventObjects, ViridianCity_House2_MapWarps, 0x0, ViridianCity_House2_MapBGEvents diff --git a/data/maps/ViridianCity_Mart/events.inc b/data/maps/ViridianCity_Mart/events.inc new file mode 100644 index 000000000..5900a7f39 --- /dev/null +++ b/data/maps/ViridianCity_Mart/events.inc @@ -0,0 +1,12 @@ +ViridianCity_Mart_EventObjects: + object_event 1, 68, 0, 2, 0, 3, 0, 0, 10, 17, 0, 0, 0, 0, 0, ViridianCity_Mart_EventScript_16A268, 0, 0, 0 + object_event 2, 18, 0, 6, 0, 2, 0, 3, 2, 17, 0, 0, 0, 0, 0, ViridianCity_Mart_EventScript_16A2B7, 0, 0, 0 + object_event 3, 23, 0, 9, 0, 5, 0, 3, 3, 17, 0, 0, 0, 0, 0, ViridianCity_Mart_EventScript_16A2AE, 0, 0, 0 + +ViridianCity_Mart_MapWarps: + warp_def 3, 7, 3, 4, 769 + warp_def 4, 7, 3, 4, 769 + warp_def 5, 7, 3, 4, 769 + +ViridianCity_Mart_MapEvents:: + map_events ViridianCity_Mart_EventObjects, ViridianCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/ViridianCity_PokemonCenter_1F/events.inc b/data/maps/ViridianCity_PokemonCenter_1F/events.inc new file mode 100644 index 000000000..1e2b40a28 --- /dev/null +++ b/data/maps/ViridianCity_PokemonCenter_1F/events.inc @@ -0,0 +1,14 @@ +ViridianCity_PokemonCenter_1F_EventObjects: + object_event 1, 64, 0, 7, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, ViridianCity_PokemonCenter_1F_EventScript_16A2CF, 0, 0, 0 + object_event 2, 61, 0, 12, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, ViridianCity_PokemonCenter_1F_EventScript_16A2E1, 0, 0, 0 + object_event 3, 19, 0, 4, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, ViridianCity_PokemonCenter_1F_EventScript_16A2D8, 0, 0, 0 + object_event 4, 18, 0, 2, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, ViridianCity_PokemonCenter_1F_EventScript_16A2EA, 0, 0, 0 + +ViridianCity_PokemonCenter_1F_MapWarps: + warp_def 6, 8, 3, 0, 769 + warp_def 7, 8, 3, 0, 769 + warp_def 8, 8, 3, 0, 769 + warp_def 1, 6, 4, 0, 1285 + +ViridianCity_PokemonCenter_1F_MapEvents:: + map_events ViridianCity_PokemonCenter_1F_EventObjects, ViridianCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/ViridianCity_PokemonCenter_2F/events.inc b/data/maps/ViridianCity_PokemonCenter_2F/events.inc new file mode 100644 index 000000000..d30b58656 --- /dev/null +++ b/data/maps/ViridianCity_PokemonCenter_2F/events.inc @@ -0,0 +1,13 @@ +ViridianCity_PokemonCenter_2F_EventObjects: + object_event 1, 65, 0, 6, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, ViridianCity_PokemonCenter_2F_EventScript_1A8CF6, 0, 0, 0 + object_event 2, 65, 0, 2, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, ViridianCity_PokemonCenter_2F_EventScript_1A8CFC, 0, 0, 0 + object_event 3, 65, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, ViridianCity_PokemonCenter_2F_EventScript_1A8D02, 0, 0, 0 + object_event 4, 69, 0, 1, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, ViridianCity_PokemonCenter_2F_EventScript_1BB1D2, 112, 0, 0 + +ViridianCity_PokemonCenter_2F_MapWarps: + warp_def 1, 6, 4, 3, 1284 + warp_def 5, 1, 0, 0, 4 + warp_def 9, 1, 0, 0, 1 + +ViridianCity_PokemonCenter_2F_MapEvents:: + map_events ViridianCity_PokemonCenter_2F_EventObjects, ViridianCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/ViridianForest/events.inc b/data/maps/ViridianForest/events.inc new file mode 100644 index 000000000..f0f5b8855 --- /dev/null +++ b/data/maps/ViridianForest/events.inc @@ -0,0 +1,33 @@ +ViridianForest_EventObjects: + object_event 1, 18, 0, 29, 0, 58, 0, 3, 7, 17, 0, 0, 0, 0, 0, ViridianForest_EventScript_160529, 0, 0, 0 + object_event 2, 19, 0, 45, 0, 58, 0, 3, 9, 17, 0, 0, 0, 0, 0, ViridianForest_EventScript_160532, 0, 0, 0 + object_event 3, 20, 0, 47, 0, 45, 0, 3, 9, 17, 0, 1, 0, 5, 0, ViridianForest_EventScript_160571, 0, 0, 0 + object_event 4, 20, 0, 47, 0, 29, 0, 3, 9, 17, 0, 1, 0, 4, 0, ViridianForest_EventScript_160588, 0, 0, 0 + object_event 5, 20, 0, 7, 0, 22, 0, 3, 9, 17, 0, 1, 0, 4, 0, ViridianForest_EventScript_16059F, 0, 0, 0 + object_event 6, 92, 0, 5, 0, 41, 0, 3, 8, 17, 0, 0, 0, 0, 0, ViridianForest_EventScript_1BE5A8, 342, 0, 0 + object_event 7, 92, 0, 40, 0, 21, 0, 3, 8, 17, 0, 0, 0, 0, 0, ViridianForest_EventScript_1BE5B5, 343, 0, 0 + object_event 8, 92, 0, 21, 0, 34, 0, 3, 8, 17, 0, 0, 0, 0, 0, ViridianForest_EventScript_1BE5C2, 344, 0, 0 + object_event 9, 20, 0, 43, 0, 6, 0, 3, 13, 17, 0, 1, 0, 1, 0, ViridianForest_EventScript_1605B6, 0, 0, 0 + object_event 10, 20, 0, 16, 0, 5, 0, 3, 7, 17, 0, 1, 0, 1, 0, ViridianForest_EventScript_1605CD, 0, 0, 0 + object_event 11, 92, 0, 49, 0, 60, 0, 3, 8, 17, 0, 0, 0, 0, 0, ViridianForest_EventScript_1BEAC9, 446, 0, 0 + +ViridianForest_MapWarps: + warp_def 29, 62, 3, 3, 3840 + warp_def 28, 62, 3, 3, 3840 + warp_def 5, 9, 3, 1, 3843 + warp_def 6, 9, 3, 1, 3843 + warp_def 30, 62, 3, 3, 3840 + warp_def 4, 9, 3, 1, 3843 + +ViridianForest_MapBGEvents: + bg_event 39, 59, 3, 0, 0, ViridianForest_EventScript_16053B + bg_event 43, 26, 0, 0, 0, ViridianForest_EventScript_16054D + bg_event 9, 29, 0, 0, 0, ViridianForest_EventScript_160556 + bg_event 6, 12, 0, 0, 0, ViridianForest_EventScript_160568 + bg_event 28, 44, 0, 0, 0, ViridianForest_EventScript_160544 + bg_event 31, 60, 0, 0, 0, ViridianForest_EventScript_16055F + bg_event 3, 22, 3, 7, 0, 13, 0, 1 + bg_event 28, 57, 0, 7, 0, 14, 1, 1 + +ViridianForest_MapEvents:: + map_events ViridianForest_EventObjects, ViridianForest_MapWarps, 0x0, ViridianForest_MapBGEvents diff --git a/data/maps/events.inc b/data/maps/events.inc new file mode 100644 index 000000000..56619a28f --- /dev/null +++ b/data/maps/events.inc @@ -0,0 +1,425 @@ + .include "data/maps/UnknownMap_00_00/events.inc" + .include "data/maps/UnknownMap_00_01/events.inc" + .include "data/maps/UnknownMap_00_02/events.inc" + .include "data/maps/UnknownMap_00_03/events.inc" + .include "data/maps/UnknownMap_00_04/events.inc" + .include "data/maps/ViridianForest/events.inc" + .include "data/maps/MtMoon_1F/events.inc" + .include "data/maps/MtMoon_B1F/events.inc" + .include "data/maps/MtMoon_B2F/events.inc" + .include "data/maps/SSAnne_Exterior/events.inc" + .include "data/maps/SSAnne_1F_Corridor/events.inc" + .include "data/maps/SSAnne_2F_Corridor/events.inc" + .include "data/maps/SSAnne_3F_Corridor/events.inc" + .include "data/maps/SSAnne_B1F_Corridor/events.inc" + .include "data/maps/SSAnne_Deck/events.inc" + .include "data/maps/SSAnne_Kitchen/events.inc" + .include "data/maps/SSAnne_CaptainsOffice/events.inc" + .include "data/maps/SSAnne_1F_Room1/events.inc" + .include "data/maps/SSAnne_1F_Room2/events.inc" + .include "data/maps/SSAnne_1F_Room3/events.inc" + .include "data/maps/SSAnne_1F_Room4/events.inc" + .include "data/maps/SSAnne_1F_Room5/events.inc" + .include "data/maps/SSAnne_1F_Room7/events.inc" + .include "data/maps/SSAnne_2F_Room1/events.inc" + .include "data/maps/SSAnne_2F_Room2/events.inc" + .include "data/maps/SSAnne_2F_Room3/events.inc" + .include "data/maps/SSAnne_2F_Room4/events.inc" + .include "data/maps/SSAnne_2F_Room5/events.inc" + .include "data/maps/SSAnne_2F_Room6/events.inc" + .include "data/maps/SSAnne_B1F_Room1/events.inc" + .include "data/maps/SSAnne_B1F_Room2/events.inc" + .include "data/maps/SSAnne_B1F_Room3/events.inc" + .include "data/maps/SSAnne_B1F_Room4/events.inc" + .include "data/maps/SSAnne_B1F_Room5/events.inc" + .include "data/maps/SSAnne_1F_Room6/events.inc" + .include "data/maps/UndergroundPath_NorthEntrance/events.inc" + .include "data/maps/UndergroundPath_NorthSouthTunnel/events.inc" + .include "data/maps/UndergroundPath_SouthEntrance/events.inc" + .include "data/maps/UndergroundPath_WestEntrance/events.inc" + .include "data/maps/UndergroundPath_EastWestTunnel/events.inc" + .include "data/maps/UndergroundPath_EastEntrance/events.inc" + .include "data/maps/DiglettsCave_NorthEntrance/events.inc" + .include "data/maps/DiglettsCave_B1F/events.inc" + .include "data/maps/DiglettsCave_SouthEntrance/events.inc" + .include "data/maps/VictoryRoad_1F/events.inc" + .include "data/maps/VictoryRoad_2F/events.inc" + .include "data/maps/VictoryRoad_3F/events.inc" + .include "data/maps/RocketHideout_B1F/events.inc" + .include "data/maps/RocketHideout_B2F/events.inc" + .include "data/maps/RocketHideout_B3F/events.inc" + .include "data/maps/RocketHideout_B4F/events.inc" + .include "data/maps/RocketHideout_Elevator/events.inc" + .include "data/maps/SilphCo_1F/events.inc" + .include "data/maps/SilphCo_2F/events.inc" + .include "data/maps/SilphCo_3F/events.inc" + .include "data/maps/SilphCo_4F/events.inc" + .include "data/maps/SilphCo_5F/events.inc" + .include "data/maps/SilphCo_6F/events.inc" + .include "data/maps/SilphCo_7F/events.inc" + .include "data/maps/SilphCo_8F/events.inc" + .include "data/maps/SilphCo_9F/events.inc" + .include "data/maps/SilphCo_10F/events.inc" + .include "data/maps/SilphCo_11F/events.inc" + .include "data/maps/SilphCo_Elevator/events.inc" + .include "data/maps/PokemonMansion_1F/events.inc" + .include "data/maps/PokemonMansion_2F/events.inc" + .include "data/maps/PokemonMansion_3F/events.inc" + .include "data/maps/PokemonMansion_B1F/events.inc" + .include "data/maps/SafariZone_Center/events.inc" + .include "data/maps/SafariZone_East/events.inc" + .include "data/maps/SafariZone_North/events.inc" + .include "data/maps/SafariZone_West/events.inc" + .include "data/maps/SafariZone_Building1/events.inc" + .include "data/maps/SafariZone_Building2/events.inc" + .include "data/maps/SafariZone_Building3/events.inc" + .include "data/maps/SafariZone_Building4/events.inc" + .include "data/maps/SafariZone_SecretHouse/events.inc" + .include "data/maps/CeruleanCave_1F/events.inc" + .include "data/maps/CeruleanCave_2F/events.inc" + .include "data/maps/CeruleanCave_B1F/events.inc" + .include "data/maps/PokemonLeague_LoreleisRoom/events.inc" + .include "data/maps/PokemonLeague_BrunosRoom/events.inc" + .include "data/maps/PokemonLeague_AgathasRoom/events.inc" + .include "data/maps/PokemonLeague_LancesRoom/events.inc" + .include "data/maps/PokemonLeague_ChampionsRoom/events.inc" + .include "data/maps/PokemonLeague_HallOfFame/events.inc" + .include "data/maps/RockTunnel_1F/events.inc" + .include "data/maps/RockTunnel_B1F/events.inc" + .include "data/maps/SeafoamIslands_1F/events.inc" + .include "data/maps/SeafoamIslands_B1F/events.inc" + .include "data/maps/SeafoamIslands_B2F/events.inc" + .include "data/maps/SeafoamIslands_B3F/events.inc" + .include "data/maps/SeafoamIslands_B4F/events.inc" + .include "data/maps/PokemonTower_1F/events.inc" + .include "data/maps/PokemonTower_2F/events.inc" + .include "data/maps/PokemonTower_3F/events.inc" + .include "data/maps/PokemonTower_4F/events.inc" + .include "data/maps/PokemonTower_5F/events.inc" + .include "data/maps/PokemonTower_6F/events.inc" + .include "data/maps/PokemonTower_7F/events.inc" + .include "data/maps/PowerPlant/events.inc" + .include "data/maps/MtEmber_RubyPath_B4F/events.inc" + .include "data/maps/MtEmber_Exterior/events.inc" + .include "data/maps/MtEmber_SummitPath_1F/events.inc" + .include "data/maps/MtEmber_SummitPath_2F/events.inc" + .include "data/maps/MtEmber_SummitPath_3F/events.inc" + .include "data/maps/MtEmber_Summit/events.inc" + .include "data/maps/MtEmber_RubyPath_B5F/events.inc" + .include "data/maps/SSAnne_Kitchen3/events.inc" + .include "data/maps/MtEmber_RubyPath_B1F/events.inc" + .include "data/maps/MtEmber_RubyPath_B2F/events.inc" + .include "data/maps/MtEmber_RubyPath_B3F/events.inc" + .include "data/maps/MtEmber_RubyPath_B1F_Stairs/events.inc" + .include "data/maps/MtEmber_RubyPath_B2F_Stairs/events.inc" + .include "data/maps/ThreeIsland_BerryForest/events.inc" + .include "data/maps/FourIsland_IcefallCave_Entrance/events.inc" + .include "data/maps/FourIsland_IcefallCave_1F/events.inc" + .include "data/maps/SSAnne_CaptainsOffice2/events.inc" + .include "data/maps/SSAnne_CaptainsOffice3/events.inc" + .include "data/maps/SSAnne_CaptainsOffice4/events.inc" + .include "data/maps/SSAnne_CaptainsOffice5/events.inc" + .include "data/maps/SixIsland_DottedHole_B1F/events.inc" + .include "data/maps/SixIsland_DottedHole_B2F/events.inc" + .include "data/maps/SixIsland_DottedHole_B3F/events.inc" + .include "data/maps/SSAnne_CaptainsOffice9/events.inc" + .include "data/maps/SixIsland_DottedHole_SapphireRoom/events.inc" + .include "data/maps/SSAnne_1F_Room11/events.inc" + .include "data/maps/SSAnne_1F_Room12/events.inc" + .include "data/maps/NavelRock_Exterior/events.inc" + .include "data/maps/SevenIsland_TrainerTower_1F/events.inc" + .include "data/maps/SevenIsland_TrainerTower_2F/events.inc" + .include "data/maps/SevenIsland_TrainerTower_3F/events.inc" + .include "data/maps/SevenIsland_TrainerTower_4F/events.inc" + .include "data/maps/SevenIsland_TrainerTower_5F/events.inc" + .include "data/maps/SevenIsland_TrainerTower_6F/events.inc" + .include "data/maps/SevenIsland_TrainerTower_7F/events.inc" + .include "data/maps/SevenIsland_TrainerTower_8F/events.inc" + .include "data/maps/SevenIsland_TrainerTower_Roof/events.inc" + .include "data/maps/SevenIsland_TrainerTower_Lobby/events.inc" + .include "data/maps/SevenIsland_TrainerTower_Elevator/events.inc" + .include "data/maps/FiveIsland_LostCave_Entrance/events.inc" + .include "data/maps/FiveIsland_LostCave_Room1/events.inc" + .include "data/maps/FiveIsland_LostCave_Room2/events.inc" + .include "data/maps/FiveIsland_LostCave_Room3/events.inc" + .include "data/maps/FiveIsland_LostCave_Room4/events.inc" + .include "data/maps/FiveIsland_LostCave_Room5/events.inc" + .include "data/maps/FiveIsland_LostCave_Room6/events.inc" + .include "data/maps/FiveIsland_LostCave_Room7/events.inc" + .include "data/maps/FiveIsland_LostCave_Room8/events.inc" + .include "data/maps/FiveIsland_LostCave_Room9/events.inc" + .include "data/maps/FiveIsland_LostCave_Room10/events.inc" + .include "data/maps/FiveIsland_LostCave_Room11/events.inc" + .include "data/maps/FiveIsland_LostCave_Room12/events.inc" + .include "data/maps/FiveIsland_LostCave_Room13/events.inc" + .include "data/maps/FiveIsland_LostCave_Room14/events.inc" + .include "data/maps/SevenIsland_TanobyRuins_MoneanChamber/events.inc" + .include "data/maps/SevenIsland_TanobyRuins_LiptooChamber/events.inc" + .include "data/maps/SevenIsland_TanobyRuins_WeepthChamber/events.inc" + .include "data/maps/SevenIsland_TanobyRuins_DilfordChamber/events.inc" + .include "data/maps/SevenIsland_TanobyRuins_ScufibChamber/events.inc" + .include "data/maps/SevenIsland_TanobyRuins_RixyChamber/events.inc" + .include "data/maps/SevenIsland_TanobyRuins_ViapoisChamber/events.inc" + .include "data/maps/ThreeIsland_DunsparceTunnel/events.inc" + .include "data/maps/SevenIsland_SeavaultCanyon_TanobyKey/events.inc" + .include "data/maps/NavelRock_1F/events.inc" + .include "data/maps/NavelRock_Summit/events.inc" + .include "data/maps/NavelRock_Base/events.inc" + .include "data/maps/NavelRock_SummitPath_2F/events.inc" + .include "data/maps/NavelRock_SummitPath_3F/events.inc" + .include "data/maps/NavelRock_SummitPath_4F/events.inc" + .include "data/maps/NavelRock_SummitPath_5F/events.inc" + .include "data/maps/NavelRock_BasePath_B1F/events.inc" + .include "data/maps/NavelRock_BasePath_B2F/events.inc" + .include "data/maps/NavelRock_BasePath_B3F/events.inc" + .include "data/maps/NavelRock_BasePath_B4F/events.inc" + .include "data/maps/NavelRock_BasePath_B5F/events.inc" + .include "data/maps/NavelRock_BasePath_B6F/events.inc" + .include "data/maps/NavelRock_BasePath_B7F/events.inc" + .include "data/maps/NavelRock_BasePath_B8F/events.inc" + .include "data/maps/NavelRock_BasePath_B9F/events.inc" + .include "data/maps/NavelRock_BasePath_B10F/events.inc" + .include "data/maps/NavelRock_BasePath_B11F/events.inc" + .include "data/maps/NavelRock_B1F/events.inc" + .include "data/maps/NavelRock_Fork/events.inc" + .include "data/maps/BirthIsland_Exterior/events.inc" + .include "data/maps/OneIsland_KindleRoad_EmberSpa/events.inc" + .include "data/maps/BirthIsland_Harbor/events.inc" + .include "data/maps/NavelRock_Harbor/events.inc" + .include "data/maps/PalletTown/events.inc" + .include "data/maps/ViridianCity/events.inc" + .include "data/maps/PewterCity/events.inc" + .include "data/maps/CeruleanCity/events.inc" + .include "data/maps/LavenderTown/events.inc" + .include "data/maps/VermilionCity/events.inc" + .include "data/maps/CeladonCity/events.inc" + .include "data/maps/FuchsiaCity/events.inc" + .include "data/maps/CinnabarIsland/events.inc" + .include "data/maps/IndigoPlateau_Exterior/events.inc" + .include "data/maps/SaffronCity_Duplicate/events.inc" + .include "data/maps/SaffronCity/events.inc" + .include "data/maps/OneIsland/events.inc" + .include "data/maps/TwoIsland/events.inc" + .include "data/maps/ThreeIsland/events.inc" + .include "data/maps/FourIsland/events.inc" + .include "data/maps/FiveIsland/events.inc" + .include "data/maps/SevenIsland/events.inc" + .include "data/maps/SixIsland/events.inc" + .include "data/maps/Route1/events.inc" + .include "data/maps/Route2/events.inc" + .include "data/maps/Route3/events.inc" + .include "data/maps/Route4/events.inc" + .include "data/maps/Route5/events.inc" + .include "data/maps/Route6/events.inc" + .include "data/maps/Route7/events.inc" + .include "data/maps/Route8/events.inc" + .include "data/maps/Route9/events.inc" + .include "data/maps/Route10/events.inc" + .include "data/maps/Route11/events.inc" + .include "data/maps/Route12/events.inc" + .include "data/maps/Route13/events.inc" + .include "data/maps/Route14/events.inc" + .include "data/maps/Route15/events.inc" + .include "data/maps/Route16/events.inc" + .include "data/maps/Route17/events.inc" + .include "data/maps/Route18/events.inc" + .include "data/maps/Route19/events.inc" + .include "data/maps/Route20/events.inc" + .include "data/maps/Route21_North/events.inc" + .include "data/maps/Route21_South/events.inc" + .include "data/maps/Route22/events.inc" + .include "data/maps/Route23/events.inc" + .include "data/maps/Route24/events.inc" + .include "data/maps/Route25/events.inc" + .include "data/maps/OneIsland_KindleRoad/events.inc" + .include "data/maps/OneIsland_TreasureBeach/events.inc" + .include "data/maps/TwoIsland_CapeBrink/events.inc" + .include "data/maps/ThreeIsland_BondBridge/events.inc" + .include "data/maps/ThreeIsland_Port/events.inc" + .include "data/maps/UnknownMap_03_50/events.inc" + .include "data/maps/UnknownMap_03_51/events.inc" + .include "data/maps/UnknownMap_03_52/events.inc" + .include "data/maps/UnknownMap_03_53/events.inc" + .include "data/maps/FiveIsland_ResortGorgeous/events.inc" + .include "data/maps/FiveIsland_WaterLabyrinth/events.inc" + .include "data/maps/FiveIsland_Meadow/events.inc" + .include "data/maps/FiveIsland_MemorialPillar/events.inc" + .include "data/maps/SixIsland_OutcastIsland/events.inc" + .include "data/maps/SixIsland_GreenPath/events.inc" + .include "data/maps/SixIsland_WaterPath/events.inc" + .include "data/maps/SixIsland_RuinValley/events.inc" + .include "data/maps/SevenIsland_TrainerTower/events.inc" + .include "data/maps/SevenIsland_SevaultCanyon_Entrance/events.inc" + .include "data/maps/SevenIsland_SevaultCanyon/events.inc" + .include "data/maps/SevenIsland_TanobyRuins/events.inc" + .include "data/maps/PalletTown_PlayersHouse_1F/events.inc" + .include "data/maps/PalletTown_PlayersHouse_2F/events.inc" + .include "data/maps/PalletTown_GarysHouse/events.inc" + .include "data/maps/PalletTown_ProfessorOaksLab/events.inc" + .include "data/maps/ViridianCity_House1/events.inc" + .include "data/maps/ViridianCity_Gym/events.inc" + .include "data/maps/ViridianCity_House2/events.inc" + .include "data/maps/ViridianCity_Mart/events.inc" + .include "data/maps/ViridianCity_PokemonCenter_1F/events.inc" + .include "data/maps/ViridianCity_PokemonCenter_2F/events.inc" + .include "data/maps/PewterCity_Museum_1F/events.inc" + .include "data/maps/PewterCity_Museum_2F/events.inc" + .include "data/maps/PewterCity_Gym/events.inc" + .include "data/maps/PewterCity_Mart/events.inc" + .include "data/maps/PewterCity_House1/events.inc" + .include "data/maps/PewterCity_PokemonCenter_1F/events.inc" + .include "data/maps/PewterCity_PokemonCenter_2F/events.inc" + .include "data/maps/PewterCity_House2/events.inc" + .include "data/maps/CeruleanCity_House1/events.inc" + .include "data/maps/CeruleanCity_House2/events.inc" + .include "data/maps/CeruleanCity_House3/events.inc" + .include "data/maps/CeruleanCity_PokemonCenter_1F/events.inc" + .include "data/maps/CeruleanCity_PokemonCenter_2F/events.inc" + .include "data/maps/CeruleanCity_Gym/events.inc" + .include "data/maps/CeruleanCity_BikeShop/events.inc" + .include "data/maps/CeruleanCity_Mart/events.inc" + .include "data/maps/CeruleanCity_House4/events.inc" + .include "data/maps/CeruleanCity_House5/events.inc" + .include "data/maps/LavenderTown_PokemonCenter_1F/events.inc" + .include "data/maps/LavenderTown_PokemonCenter_2F/events.inc" + .include "data/maps/LavenderTown_VolunteerPokemonHouse/events.inc" + .include "data/maps/LavenderTown_House1/events.inc" + .include "data/maps/LavenderTown_House2/events.inc" + .include "data/maps/LavenderTown_Mart/events.inc" + .include "data/maps/VermilionCity_House1/events.inc" + .include "data/maps/VermilionCity_PokemonCenter_1F/events.inc" + .include "data/maps/VermilionCity_PokemonCenter_2F/events.inc" + .include "data/maps/VermilionCity_PokemonFanClub/events.inc" + .include "data/maps/VermilionCity_House2/events.inc" + .include "data/maps/VermilionCity_Mart/events.inc" + .include "data/maps/VermilionCity_Gym/events.inc" + .include "data/maps/VermilionCity_House3/events.inc" + .include "data/maps/CeladonCity_DepartmentStore_1F/events.inc" + .include "data/maps/CeladonCity_DepartmentStore_2F/events.inc" + .include "data/maps/CeladonCity_DepartmentStore_3F/events.inc" + .include "data/maps/CeladonCity_DepartmentStore_4F/events.inc" + .include "data/maps/CeladonCity_DepartmentStore_5F/events.inc" + .include "data/maps/CeladonCity_DepartmentStore_Roof/events.inc" + .include "data/maps/CeladonCity_DepartmentStore_Elevator/events.inc" + .include "data/maps/CeladonCity_Condominiums_1F/events.inc" + .include "data/maps/CeladonCity_Condominiums_2F/events.inc" + .include "data/maps/CeladonCity_Condominiums_3F/events.inc" + .include "data/maps/CeladonCity_Condominiums_Roof/events.inc" + .include "data/maps/CeladonCity_Condominiums_RoofRoom/events.inc" + .include "data/maps/CeladonCity_PokemonCenter_1F/events.inc" + .include "data/maps/CeladonCity_PokemonCenter_2F/events.inc" + .include "data/maps/CeladonCity_GameCorner/events.inc" + .include "data/maps/CeladonCity_GameCorner_PrizeRoom/events.inc" + .include "data/maps/CeladonCity_Gym/events.inc" + .include "data/maps/CeladonCity_Restaurant/events.inc" + .include "data/maps/CeladonCity_House1/events.inc" + .include "data/maps/CeladonCity_Hotel/events.inc" + .include "data/maps/FuchsiaCity_SafariZone_Entrance/events.inc" + .include "data/maps/FuchsiaCity_Mart/events.inc" + .include "data/maps/FuchsiaCity_ZooBuilding/events.inc" + .include "data/maps/FuchsiaCity_Gym/events.inc" + .include "data/maps/FuchsiaCity_House1/events.inc" + .include "data/maps/FuchsiaCity_PokemonCenter_1F/events.inc" + .include "data/maps/FuchsiaCity_PokemonCenter_2F/events.inc" + .include "data/maps/FuchsiaCity_Building1/events.inc" + .include "data/maps/FuchsiaCity_House2/events.inc" + .include "data/maps/FuchsiaCity_House3/events.inc" + .include "data/maps/CinnabarIsland_Gym/events.inc" + .include "data/maps/CinnabarIsland_PokemonLab_Entrance/events.inc" + .include "data/maps/CinnabarIsland_PokemonLab_Lounge/events.inc" + .include "data/maps/CinnabarIsland_PokemonLab_ResearchRoom/events.inc" + .include "data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/events.inc" + .include "data/maps/CinnabarIsland_PokemonCenter_1F/events.inc" + .include "data/maps/CinnabarIsland_PokemonCenter_2F/events.inc" + .include "data/maps/CinnabarIsland_Mart/events.inc" + .include "data/maps/IndigoPlateau_PokemonCenter_1F/events.inc" + .include "data/maps/IndigoPlateau_PokemonCenter_2F/events.inc" + .include "data/maps/SaffronCity_House1_1F/events.inc" + .include "data/maps/SaffronCity_House1_2F/events.inc" + .include "data/maps/SaffronCity_Dojo/events.inc" + .include "data/maps/SaffronCity_Gym/events.inc" + .include "data/maps/SaffronCity_House2/events.inc" + .include "data/maps/SaffronCity_Mart/events.inc" + .include "data/maps/SaffronCity_PokemonCenter_1F/events.inc" + .include "data/maps/SaffronCity_PokemonCenter_2F/events.inc" + .include "data/maps/SaffronCity_House3/events.inc" + .include "data/maps/SaffronCity_PokemonTrainerFanClub/events.inc" + .include "data/maps/Route2_ViridianForest_SouthEntrance/events.inc" + .include "data/maps/Route2_House/events.inc" + .include "data/maps/Route2_EastBuilding/events.inc" + .include "data/maps/Route2_ViridianForest_NorthEntrance/events.inc" + .include "data/maps/Route4_PokemonCenter_1F/events.inc" + .include "data/maps/Route4_PokemonCenter_2F/events.inc" + .include "data/maps/Route5_PokemonDayCare/events.inc" + .include "data/maps/Route5_SouthEntrance/events.inc" + .include "data/maps/Route6_NorthEntrance/events.inc" + .include "data/maps/UnknownMap_18_01/events.inc" + .include "data/maps/Route7_EastEntrance/events.inc" + .include "data/maps/Route8_WestEntrance/events.inc" + .include "data/maps/Route10_PokemonCenter_1F/events.inc" + .include "data/maps/Route10_PokemonCenter_2F/events.inc" + .include "data/maps/Route11_EastEntrance_1F/events.inc" + .include "data/maps/Route11_EastEntrance_2F/events.inc" + .include "data/maps/Route12_NorthEntrance_1F/events.inc" + .include "data/maps/Route12_NorthEntrance_2F/events.inc" + .include "data/maps/Route12_FishingHouse/events.inc" + .include "data/maps/Route15_WestEntrance_1F/events.inc" + .include "data/maps/Route15_WestEntrance_2F/events.inc" + .include "data/maps/Route16_House/events.inc" + .include "data/maps/Route16_NorthEntrance_1F/events.inc" + .include "data/maps/Route16_NorthEntrance_2F/events.inc" + .include "data/maps/Route18_EastEntrance_1F/events.inc" + .include "data/maps/Route18_EastEntrance_2F/events.inc" + .include "data/maps/UnusedHouse_27_00/events.inc" + .include "data/maps/Route22_NorthEntrance/events.inc" + .include "data/maps/UnusedHouse_29_00/events.inc" + .include "data/maps/Route25_SeaCottage/events.inc" + .include "data/maps/SevenIsland_House_Room1/events.inc" + .include "data/maps/SevenIsland_House_Room2/events.inc" + .include "data/maps/SevenIsland_Mart/events.inc" + .include "data/maps/SevenIsland_PokemonCenter_1F/events.inc" + .include "data/maps/SevenIsland_PokemonCenter_2F/events.inc" + .include "data/maps/UnusedHouse_31_05/events.inc" + .include "data/maps/SevenIsland_Harbor/events.inc" + .include "data/maps/OneIsland_PokemonCenter_1F/events.inc" + .include "data/maps/OneIsland_PokemonCenter_2F/events.inc" + .include "data/maps/OneIsland_House1/events.inc" + .include "data/maps/OneIsland_House2/events.inc" + .include "data/maps/OneIsland_Harbor/events.inc" + .include "data/maps/TwoIsland_JoyfulGameCorner/events.inc" + .include "data/maps/TwoIsland_House/events.inc" + .include "data/maps/TwoIsland_PokemonCenter_1F/events.inc" + .include "data/maps/TwoIsland_PokemonCenter_2F/events.inc" + .include "data/maps/TwoIsland_Harbor/events.inc" + .include "data/maps/ThreeIsland_House1/events.inc" + .include "data/maps/ThreeIsland_PokemonCenter_1F/events.inc" + .include "data/maps/ThreeIsland_PokemonCenter_2F/events.inc" + .include "data/maps/ThreeIsland_Mart/events.inc" + .include "data/maps/ThreeIsland_House2/events.inc" + .include "data/maps/ThreeIsland_House3/events.inc" + .include "data/maps/ThreeIsland_House4/events.inc" + .include "data/maps/ThreeIsland_House5/events.inc" + .include "data/maps/FourIsland_PokemonDayCare/events.inc" + .include "data/maps/FourIsland_PokemonCenter_1F/events.inc" + .include "data/maps/FourIsland_PokemonCenter_2F/events.inc" + .include "data/maps/FourIsland_House1/events.inc" + .include "data/maps/FourIsland_LoreleisHouse/events.inc" + .include "data/maps/FourIsland_Harbor/events.inc" + .include "data/maps/FourIsland_House2/events.inc" + .include "data/maps/FourIsland_Mart/events.inc" + .include "data/maps/FiveIsland_PokemonCenter_1F/events.inc" + .include "data/maps/FiveIsland_PokemonCenter_2F/events.inc" + .include "data/maps/FiveIsland_Harbor/events.inc" + .include "data/maps/FiveIsland_House1/events.inc" + .include "data/maps/FiveIsland_House2/events.inc" + .include "data/maps/SixIsland_PokemonCenter_1F/events.inc" + .include "data/maps/SixIsland_PokemonCenter_2F/events.inc" + .include "data/maps/SixIsland_Harbor/events.inc" + .include "data/maps/SixIsland_House/events.inc" + .include "data/maps/SixIsland_Mart/events.inc" + .include "data/maps/ThreeIsland_Harbor/events.inc" + .include "data/maps/FiveIsland_ResortGorgeous_House/events.inc" + .include "data/maps/TwoIsland_CapeBrink_House/events.inc" + .include "data/maps/SixIsland_WaterPath_House1/events.inc" + .include "data/maps/SixIsland_WaterPath_House2/events.inc" + .include "data/maps/SevenIsland_SevaultCanyon_House/events.inc" -- cgit v1.2.3 From 4e5d818f89caae9153dd53ba321900e0d4e16c1e Mon Sep 17 00:00:00 2001 From: garak Date: Mon, 6 May 2019 22:13:57 -0400 Subject: dump event scripts --- data/maps/BirthIsland_Exterior/scripts.inc | 132 ++ data/maps/BirthIsland_Harbor/scripts.inc | 37 + data/maps/CeladonCity/scripts.inc | 123 ++ data/maps/CeladonCity_Condominiums_1F/scripts.inc | 78 + data/maps/CeladonCity_Condominiums_2F/scripts.inc | 7 + data/maps/CeladonCity_Condominiums_3F/scripts.inc | 64 + .../maps/CeladonCity_Condominiums_Roof/scripts.inc | 7 + .../CeladonCity_Condominiums_RoofRoom/scripts.inc | 127 ++ .../CeladonCity_DepartmentStore_1F/scripts.inc | 17 + .../CeladonCity_DepartmentStore_2F/scripts.inc | 72 + .../CeladonCity_DepartmentStore_3F/scripts.inc | 61 + .../CeladonCity_DepartmentStore_4F/scripts.inc | 43 + .../CeladonCity_DepartmentStore_5F/scripts.inc | 70 + .../scripts.inc | 135 ++ .../CeladonCity_DepartmentStore_Roof/scripts.inc | 358 +++++ data/maps/CeladonCity_GameCorner/scripts.inc | 524 +++++++ .../CeladonCity_GameCorner_PrizeRoom/scripts.inc | 387 +++++ data/maps/CeladonCity_Gym/scripts.inc | 116 ++ data/maps/CeladonCity_Hotel/scripts.inc | 22 + data/maps/CeladonCity_House1/scripts.inc | 17 + data/maps/CeladonCity_PokemonCenter_1F/scripts.inc | 30 + data/maps/CeladonCity_PokemonCenter_2F/scripts.inc | 18 + data/maps/CeladonCity_Restaurant/scripts.inc | 54 + data/maps/CeruleanCave_1F/scripts.inc | 7 + data/maps/CeruleanCave_2F/scripts.inc | 2 + data/maps/CeruleanCave_B1F/scripts.inc | 70 + data/maps/CeruleanCity/scripts.inc | 415 +++++ data/maps/CeruleanCity_BikeShop/scripts.inc | 92 ++ data/maps/CeruleanCity_Gym/scripts.inc | 96 ++ data/maps/CeruleanCity_House1/scripts.inc | 121 ++ data/maps/CeruleanCity_House2/scripts.inc | 28 + data/maps/CeruleanCity_House3/scripts.inc | 50 + data/maps/CeruleanCity_House4/scripts.inc | 112 ++ data/maps/CeruleanCity_House5/scripts.inc | 214 +++ data/maps/CeruleanCity_Mart/scripts.inc | 41 + .../maps/CeruleanCity_PokemonCenter_1F/scripts.inc | 41 + .../maps/CeruleanCity_PokemonCenter_2F/scripts.inc | 18 + data/maps/CinnabarIsland/scripts.inc | 384 +++++ data/maps/CinnabarIsland_Gym/scripts.inc | 816 ++++++++++ data/maps/CinnabarIsland_Mart/scripts.inc | 39 + .../CinnabarIsland_PokemonCenter_1F/scripts.inc | 150 ++ .../CinnabarIsland_PokemonCenter_2F/scripts.inc | 18 + .../CinnabarIsland_PokemonLab_Entrance/scripts.inc | 37 + .../scripts.inc | 362 +++++ .../CinnabarIsland_PokemonLab_Lounge/scripts.inc | 103 ++ .../scripts.inc | 21 + data/maps/DiglettsCave_B1F/scripts.inc | 7 + data/maps/DiglettsCave_NorthEntrance/scripts.inc | 7 + data/maps/DiglettsCave_SouthEntrance/scripts.inc | 7 + data/maps/FiveIsland/scripts.inc | 22 + data/maps/FiveIsland_Harbor/scripts.inc | 11 + data/maps/FiveIsland_House1/scripts.inc | 7 + data/maps/FiveIsland_House2/scripts.inc | 7 + data/maps/FiveIsland_LostCave_Entrance/scripts.inc | 7 + data/maps/FiveIsland_LostCave_Room1/scripts.inc | 8 + data/maps/FiveIsland_LostCave_Room10/scripts.inc | 68 + data/maps/FiveIsland_LostCave_Room11/scripts.inc | 2 + data/maps/FiveIsland_LostCave_Room12/scripts.inc | 2 + data/maps/FiveIsland_LostCave_Room13/scripts.inc | 2 + data/maps/FiveIsland_LostCave_Room14/scripts.inc | 2 + data/maps/FiveIsland_LostCave_Room2/scripts.inc | 2 + data/maps/FiveIsland_LostCave_Room3/scripts.inc | 2 + data/maps/FiveIsland_LostCave_Room4/scripts.inc | 8 + data/maps/FiveIsland_LostCave_Room5/scripts.inc | 2 + data/maps/FiveIsland_LostCave_Room6/scripts.inc | 2 + data/maps/FiveIsland_LostCave_Room7/scripts.inc | 2 + data/maps/FiveIsland_LostCave_Room8/scripts.inc | 2 + data/maps/FiveIsland_LostCave_Room9/scripts.inc | 2 + data/maps/FiveIsland_Meadow/scripts.inc | 59 + data/maps/FiveIsland_MemorialPillar/scripts.inc | 110 ++ data/maps/FiveIsland_PokemonCenter_1F/scripts.inc | 25 + data/maps/FiveIsland_PokemonCenter_2F/scripts.inc | 18 + data/maps/FiveIsland_ResortGorgeous/scripts.inc | 46 + .../FiveIsland_ResortGorgeous_House/scripts.inc | 163 ++ data/maps/FiveIsland_WaterLabyrinth/scripts.inc | 80 + data/maps/FourIsland/scripts.inc | 194 +++ data/maps/FourIsland_Harbor/scripts.inc | 11 + data/maps/FourIsland_House1/scripts.inc | 7 + data/maps/FourIsland_House2/scripts.inc | 2 + data/maps/FourIsland_IcefallCave_1F/scripts.inc | 33 + .../FourIsland_IcefallCave_Entrance/scripts.inc | 7 + data/maps/FourIsland_LoreleisHouse/scripts.inc | 39 + data/maps/FourIsland_Mart/scripts.inc | 35 + data/maps/FourIsland_PokemonCenter_1F/scripts.inc | 30 + data/maps/FourIsland_PokemonCenter_2F/scripts.inc | 18 + data/maps/FourIsland_PokemonDayCare/scripts.inc | 235 +++ data/maps/FuchsiaCity/scripts.inc | 163 ++ data/maps/FuchsiaCity_Building1/scripts.inc | 79 + data/maps/FuchsiaCity_Gym/scripts.inc | 120 ++ data/maps/FuchsiaCity_House1/scripts.inc | 23 + data/maps/FuchsiaCity_House2/scripts.inc | 46 + data/maps/FuchsiaCity_House3/scripts.inc | 68 + data/maps/FuchsiaCity_Mart/scripts.inc | 38 + data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc | 30 + data/maps/FuchsiaCity_PokemonCenter_2F/scripts.inc | 18 + .../FuchsiaCity_SafariZone_Entrance/scripts.inc | 231 +++ data/maps/FuchsiaCity_ZooBuilding/scripts.inc | 22 + data/maps/IndigoPlateau_Exterior/scripts.inc | 167 ++ .../IndigoPlateau_PokemonCenter_1F/scripts.inc | 81 + .../IndigoPlateau_PokemonCenter_2F/scripts.inc | 18 + data/maps/LavenderTown/scripts.inc | 57 + data/maps/LavenderTown_House1/scripts.inc | 29 + data/maps/LavenderTown_House2/scripts.inc | 81 + data/maps/LavenderTown_Mart/scripts.inc | 46 + .../maps/LavenderTown_PokemonCenter_1F/scripts.inc | 30 + .../maps/LavenderTown_PokemonCenter_2F/scripts.inc | 18 + .../LavenderTown_VolunteerPokemonHouse/scripts.inc | 105 ++ data/maps/MtEmber_Exterior/scripts.inc | 146 ++ data/maps/MtEmber_RubyPath_B1F/scripts.inc | 2 + data/maps/MtEmber_RubyPath_B1F_Stairs/scripts.inc | 2 + data/maps/MtEmber_RubyPath_B2F/scripts.inc | 2 + data/maps/MtEmber_RubyPath_B2F_Stairs/scripts.inc | 2 + data/maps/MtEmber_RubyPath_B3F/scripts.inc | 17 + data/maps/MtEmber_RubyPath_B4F/scripts.inc | 72 + data/maps/MtEmber_RubyPath_B5F/scripts.inc | 38 + data/maps/MtEmber_Summit/scripts.inc | 66 + data/maps/MtEmber_SummitPath_1F/scripts.inc | 2 + data/maps/MtEmber_SummitPath_2F/scripts.inc | 2 + data/maps/MtEmber_SummitPath_3F/scripts.inc | 2 + data/maps/MtMoon_1F/scripts.inc | 54 + data/maps/MtMoon_B1F/scripts.inc | 2 + data/maps/MtMoon_B2F/scripts.inc | 160 ++ data/maps/NavelRock_1F/scripts.inc | 2 + data/maps/NavelRock_B1F/scripts.inc | 2 + data/maps/NavelRock_Base/scripts.inc | 91 ++ data/maps/NavelRock_BasePath_B10F/scripts.inc | 2 + data/maps/NavelRock_BasePath_B11F/scripts.inc | 2 + data/maps/NavelRock_BasePath_B1F/scripts.inc | 2 + data/maps/NavelRock_BasePath_B2F/scripts.inc | 2 + data/maps/NavelRock_BasePath_B3F/scripts.inc | 2 + data/maps/NavelRock_BasePath_B4F/scripts.inc | 2 + data/maps/NavelRock_BasePath_B5F/scripts.inc | 2 + data/maps/NavelRock_BasePath_B6F/scripts.inc | 2 + data/maps/NavelRock_BasePath_B7F/scripts.inc | 2 + data/maps/NavelRock_BasePath_B8F/scripts.inc | 2 + data/maps/NavelRock_BasePath_B9F/scripts.inc | 2 + data/maps/NavelRock_Exterior/scripts.inc | 7 + data/maps/NavelRock_Fork/scripts.inc | 2 + data/maps/NavelRock_Harbor/scripts.inc | 1 + data/maps/NavelRock_Summit/scripts.inc | 130 ++ data/maps/NavelRock_SummitPath_2F/scripts.inc | 2 + data/maps/NavelRock_SummitPath_3F/scripts.inc | 2 + data/maps/NavelRock_SummitPath_4F/scripts.inc | 2 + data/maps/NavelRock_SummitPath_5F/scripts.inc | 2 + data/maps/OneIsland/scripts.inc | 121 ++ data/maps/OneIsland_Harbor/scripts.inc | 42 + data/maps/OneIsland_House1/scripts.inc | 12 + data/maps/OneIsland_House2/scripts.inc | 7 + data/maps/OneIsland_KindleRoad/scripts.inc | 12 + .../maps/OneIsland_KindleRoad_EmberSpa/scripts.inc | 66 + data/maps/OneIsland_PokemonCenter_1F/scripts.inc | 658 ++++++++ data/maps/OneIsland_PokemonCenter_2F/scripts.inc | 18 + data/maps/OneIsland_TreasureBeach/scripts.inc | 7 + data/maps/PalletTown/scripts.inc | 527 +++++++ data/maps/PalletTown_GarysHouse/scripts.inc | 217 +++ data/maps/PalletTown_PlayersHouse_1F/scripts.inc | 66 + data/maps/PalletTown_PlayersHouse_2F/scripts.inc | 59 + data/maps/PalletTown_ProfessorOaksLab/scripts.inc | 1474 ++++++++++++++++++ data/maps/PewterCity/scripts.inc | 1614 ++++++++++++++++++++ data/maps/PewterCity_Gym/scripts.inc | 110 ++ data/maps/PewterCity_House1/scripts.inc | 34 + data/maps/PewterCity_House2/scripts.inc | 12 + data/maps/PewterCity_Mart/scripts.inc | 40 + data/maps/PewterCity_Museum_1F/scripts.inc | 228 +++ data/maps/PewterCity_Museum_2F/scripts.inc | 37 + data/maps/PewterCity_PokemonCenter_1F/scripts.inc | 49 + data/maps/PewterCity_PokemonCenter_2F/scripts.inc | 18 + data/maps/PokemonLeague_AgathasRoom/scripts.inc | 110 ++ data/maps/PokemonLeague_BrunosRoom/scripts.inc | 140 ++ data/maps/PokemonLeague_ChampionsRoom/scripts.inc | 254 +++ data/maps/PokemonLeague_HallOfFame/scripts.inc | 55 + data/maps/PokemonLeague_LancesRoom/scripts.inc | 184 +++ data/maps/PokemonLeague_LoreleisRoom/scripts.inc | 112 ++ data/maps/PokemonMansion_1F/scripts.inc | 35 + data/maps/PokemonMansion_2F/scripts.inc | 34 + data/maps/PokemonMansion_3F/scripts.inc | 35 + data/maps/PokemonMansion_B1F/scripts.inc | 35 + data/maps/PokemonTower_1F/scripts.inc | 44 + data/maps/PokemonTower_2F/scripts.inc | 111 ++ data/maps/PokemonTower_3F/scripts.inc | 20 + data/maps/PokemonTower_4F/scripts.inc | 20 + data/maps/PokemonTower_5F/scripts.inc | 48 + data/maps/PokemonTower_6F/scripts.inc | 56 + data/maps/PokemonTower_7F/scripts.inc | 249 +++ data/maps/PowerPlant/scripts.inc | 141 ++ data/maps/RockTunnel_1F/scripts.inc | 54 + data/maps/RockTunnel_B1F/scripts.inc | 50 + data/maps/RocketHideout_B1F/scripts.inc | 69 + data/maps/RocketHideout_B2F/scripts.inc | 8 + data/maps/RocketHideout_B3F/scripts.inc | 14 + data/maps/RocketHideout_B4F/scripts.inc | 145 ++ data/maps/RocketHideout_Elevator/scripts.inc | 115 ++ data/maps/Route1/scripts.inc | 42 + data/maps/Route10/scripts.inc | 20 + data/maps/Route10_PokemonCenter_1F/scripts.inc | 75 + data/maps/Route10_PokemonCenter_2F/scripts.inc | 18 + data/maps/Route11/scripts.inc | 7 + data/maps/Route11_EastEntrance_1F/scripts.inc | 12 + data/maps/Route11_EastEntrance_2F/scripts.inc | 109 ++ data/maps/Route12/scripts.inc | 72 + data/maps/Route12_FishingHouse/scripts.inc | 137 ++ data/maps/Route12_NorthEntrance_1F/scripts.inc | 7 + data/maps/Route12_NorthEntrance_2F/scripts.inc | 59 + data/maps/Route13/scripts.inc | 17 + data/maps/Route14/scripts.inc | 7 + data/maps/Route15/scripts.inc | 7 + data/maps/Route15_WestEntrance_1F/scripts.inc | 7 + data/maps/Route15_WestEntrance_2F/scripts.inc | 64 + data/maps/Route16/scripts.inc | 90 ++ data/maps/Route16_House/scripts.inc | 47 + data/maps/Route16_NorthEntrance_1F/scripts.inc | 123 ++ data/maps/Route16_NorthEntrance_2F/scripts.inc | 66 + data/maps/Route17/scripts.inc | 32 + data/maps/Route18/scripts.inc | 31 + data/maps/Route18_EastEntrance_1F/scripts.inc | 118 ++ data/maps/Route18_EastEntrance_2F/scripts.inc | 55 + data/maps/Route19/scripts.inc | 7 + data/maps/Route2/scripts.inc | 12 + data/maps/Route20/scripts.inc | 35 + data/maps/Route21_North/scripts.inc | 2 + data/maps/Route21_South/scripts.inc | 2 + data/maps/Route22/scripts.inc | 266 ++++ data/maps/Route22_NorthEntrance/scripts.inc | 18 + data/maps/Route23/scripts.inc | 129 ++ data/maps/Route24/scripts.inc | 114 ++ data/maps/Route25/scripts.inc | 12 + data/maps/Route25_SeaCottage/scripts.inc | 337 ++++ data/maps/Route2_EastBuilding/scripts.inc | 51 + data/maps/Route2_House/scripts.inc | 50 + .../scripts.inc | 17 + .../scripts.inc | 12 + data/maps/Route3/scripts.inc | 12 + data/maps/Route4/scripts.inc | 20 + data/maps/Route4_PokemonCenter_1F/scripts.inc | 181 +++ data/maps/Route4_PokemonCenter_2F/scripts.inc | 18 + data/maps/Route5/scripts.inc | 7 + data/maps/Route5_PokemonDayCare/scripts.inc | 2 + data/maps/Route5_SouthEntrance/scripts.inc | 92 ++ data/maps/Route6/scripts.inc | 7 + data/maps/Route6_NorthEntrance/scripts.inc | 92 ++ data/maps/Route7/scripts.inc | 7 + data/maps/Route7_EastEntrance/scripts.inc | 92 ++ data/maps/Route8/scripts.inc | 7 + data/maps/Route8_WestEntrance/scripts.inc | 102 ++ data/maps/Route9/scripts.inc | 7 + data/maps/SSAnne_1F_Corridor/scripts.inc | 12 + data/maps/SSAnne_1F_Room1/scripts.inc | 7 + data/maps/SSAnne_1F_Room11/scripts.inc | 92 ++ data/maps/SSAnne_1F_Room12/scripts.inc | 7 + data/maps/SSAnne_1F_Room2/scripts.inc | 19 + data/maps/SSAnne_1F_Room3/scripts.inc | 23 + data/maps/SSAnne_1F_Room4/scripts.inc | 19 + data/maps/SSAnne_1F_Room5/scripts.inc | 8 + data/maps/SSAnne_1F_Room6/scripts.inc | 31 + data/maps/SSAnne_1F_Room7/scripts.inc | 8 + data/maps/SSAnne_2F_Corridor/scripts.inc | 187 +++ data/maps/SSAnne_2F_Room1/scripts.inc | 15 + data/maps/SSAnne_2F_Room2/scripts.inc | 14 + data/maps/SSAnne_2F_Room3/scripts.inc | 12 + data/maps/SSAnne_2F_Room4/scripts.inc | 14 + data/maps/SSAnne_2F_Room5/scripts.inc | 12 + data/maps/SSAnne_2F_Room6/scripts.inc | 12 + data/maps/SSAnne_3F_Corridor/scripts.inc | 7 + data/maps/SSAnne_B1F_Corridor/scripts.inc | 2 + data/maps/SSAnne_B1F_Room1/scripts.inc | 14 + data/maps/SSAnne_B1F_Room2/scripts.inc | 8 + data/maps/SSAnne_B1F_Room3/scripts.inc | 8 + data/maps/SSAnne_B1F_Room4/scripts.inc | 14 + data/maps/SSAnne_B1F_Room5/scripts.inc | 18 + data/maps/SSAnne_CaptainsOffice/scripts.inc | 59 + data/maps/SSAnne_CaptainsOffice2/scripts.inc | 2 + data/maps/SSAnne_CaptainsOffice3/scripts.inc | 201 +++ data/maps/SSAnne_CaptainsOffice4/scripts.inc | 202 +++ data/maps/SSAnne_CaptainsOffice5/scripts.inc | 35 + data/maps/SSAnne_CaptainsOffice9/scripts.inc | 2 + data/maps/SSAnne_Deck/scripts.inc | 29 + data/maps/SSAnne_Exterior/scripts.inc | 67 + data/maps/SSAnne_Kitchen/scripts.inc | 63 + data/maps/SSAnne_Kitchen3/scripts.inc | 2 + data/maps/SafariZone_Building1/scripts.inc | 12 + data/maps/SafariZone_Building2/scripts.inc | 17 + data/maps/SafariZone_Building3/scripts.inc | 17 + data/maps/SafariZone_Building4/scripts.inc | 17 + data/maps/SafariZone_Center/scripts.inc | 22 + data/maps/SafariZone_East/scripts.inc | 17 + data/maps/SafariZone_North/scripts.inc | 27 + data/maps/SafariZone_SecretHouse/scripts.inc | 36 + data/maps/SafariZone_West/scripts.inc | 22 + data/maps/SaffronCity/scripts.inc | 2 + data/maps/SaffronCity_Dojo/scripts.inc | 174 +++ data/maps/SaffronCity_Duplicate/scripts.inc | 152 ++ data/maps/SaffronCity_Gym/scripts.inc | 129 ++ data/maps/SaffronCity_House1_1F/scripts.inc | 23 + data/maps/SaffronCity_House1_2F/scripts.inc | 58 + data/maps/SaffronCity_House2/scripts.inc | 28 + data/maps/SaffronCity_House3/scripts.inc | 36 + data/maps/SaffronCity_Mart/scripts.inc | 38 + data/maps/SaffronCity_PokemonCenter_1F/scripts.inc | 41 + data/maps/SaffronCity_PokemonCenter_2F/scripts.inc | 18 + .../SaffronCity_PokemonTrainerFanClub/scripts.inc | 492 ++++++ data/maps/SeafoamIslands_1F/scripts.inc | 7 + data/maps/SeafoamIslands_B1F/scripts.inc | 2 + data/maps/SeafoamIslands_B2F/scripts.inc | 2 + data/maps/SeafoamIslands_B3F/scripts.inc | 103 ++ data/maps/SeafoamIslands_B4F/scripts.inc | 218 +++ data/maps/SevenIsland/scripts.inc | 22 + data/maps/SevenIsland_Harbor/scripts.inc | 11 + data/maps/SevenIsland_House_Room1/scripts.inc | 194 +++ data/maps/SevenIsland_House_Room2/scripts.inc | 79 + data/maps/SevenIsland_Mart/scripts.inc | 46 + data/maps/SevenIsland_PokemonCenter_1F/scripts.inc | 30 + data/maps/SevenIsland_PokemonCenter_2F/scripts.inc | 18 + .../scripts.inc | 144 ++ data/maps/SevenIsland_SevaultCanyon/scripts.inc | 7 + .../SevenIsland_SevaultCanyon_Entrance/scripts.inc | 7 + .../SevenIsland_SevaultCanyon_House/scripts.inc | 89 ++ data/maps/SevenIsland_TanobyRuins/scripts.inc | 2 + .../scripts.inc | 7 + .../scripts.inc | 7 + .../scripts.inc | 8 + .../scripts.inc | 7 + .../scripts.inc | 7 + .../scripts.inc | 7 + .../scripts.inc | 7 + data/maps/SevenIsland_TrainerTower/scripts.inc | 17 + data/maps/SevenIsland_TrainerTower_1F/scripts.inc | 60 + data/maps/SevenIsland_TrainerTower_2F/scripts.inc | 25 + data/maps/SevenIsland_TrainerTower_3F/scripts.inc | 25 + data/maps/SevenIsland_TrainerTower_4F/scripts.inc | 25 + data/maps/SevenIsland_TrainerTower_5F/scripts.inc | 25 + data/maps/SevenIsland_TrainerTower_6F/scripts.inc | 25 + data/maps/SevenIsland_TrainerTower_7F/scripts.inc | 25 + data/maps/SevenIsland_TrainerTower_8F/scripts.inc | 25 + .../SevenIsland_TrainerTower_Elevator/scripts.inc | 87 ++ .../SevenIsland_TrainerTower_Lobby/scripts.inc | 263 ++++ .../maps/SevenIsland_TrainerTower_Roof/scripts.inc | 8 + data/maps/SilphCo_10F/scripts.inc | 41 + data/maps/SilphCo_11F/scripts.inc | 160 ++ data/maps/SilphCo_1F/scripts.inc | 17 + data/maps/SilphCo_2F/scripts.inc | 45 + data/maps/SilphCo_3F/scripts.inc | 43 + data/maps/SilphCo_4F/scripts.inc | 49 + data/maps/SilphCo_5F/scripts.inc | 72 + data/maps/SilphCo_6F/scripts.inc | 111 ++ data/maps/SilphCo_7F/scripts.inc | 282 ++++ data/maps/SilphCo_8F/scripts.inc | 47 + data/maps/SilphCo_9F/scripts.inc | 57 + data/maps/SilphCo_Elevator/scripts.inc | 190 +++ data/maps/SixIsland/scripts.inc | 22 + data/maps/SixIsland_DottedHole_B1F/scripts.inc | 2 + data/maps/SixIsland_DottedHole_B2F/scripts.inc | 2 + data/maps/SixIsland_DottedHole_B3F/scripts.inc | 2 + .../SixIsland_DottedHole_SapphireRoom/scripts.inc | 306 ++++ data/maps/SixIsland_GreenPath/scripts.inc | 12 + data/maps/SixIsland_Harbor/scripts.inc | 11 + data/maps/SixIsland_House/scripts.inc | 7 + data/maps/SixIsland_Mart/scripts.inc | 35 + data/maps/SixIsland_OutcastIsland/scripts.inc | 8 + data/maps/SixIsland_PokemonCenter_1F/scripts.inc | 82 + data/maps/SixIsland_PokemonCenter_2F/scripts.inc | 18 + data/maps/SixIsland_RuinValley/scripts.inc | 52 + data/maps/SixIsland_WaterPath/scripts.inc | 12 + data/maps/SixIsland_WaterPath_House1/scripts.inc | 101 ++ data/maps/SixIsland_WaterPath_House2/scripts.inc | 7 + data/maps/ThreeIsland/scripts.inc | 443 ++++++ data/maps/ThreeIsland_BerryForest/scripts.inc | 74 + data/maps/ThreeIsland_BondBridge/scripts.inc | 12 + data/maps/ThreeIsland_DunsparceTunnel/scripts.inc | 62 + data/maps/ThreeIsland_Harbor/scripts.inc | 11 + data/maps/ThreeIsland_House1/scripts.inc | 16 + data/maps/ThreeIsland_House2/scripts.inc | 18 + data/maps/ThreeIsland_House3/scripts.inc | 7 + data/maps/ThreeIsland_House4/scripts.inc | 12 + data/maps/ThreeIsland_House5/scripts.inc | 18 + data/maps/ThreeIsland_Mart/scripts.inc | 43 + data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc | 30 + data/maps/ThreeIsland_PokemonCenter_2F/scripts.inc | 18 + data/maps/ThreeIsland_Port/scripts.inc | 44 + data/maps/TwoIsland/scripts.inc | 254 +++ data/maps/TwoIsland_CapeBrink/scripts.inc | 2 + data/maps/TwoIsland_CapeBrink_House/scripts.inc | 2 + data/maps/TwoIsland_Harbor/scripts.inc | 11 + data/maps/TwoIsland_House/scripts.inc | 143 ++ data/maps/TwoIsland_JoyfulGameCorner/scripts.inc | 216 +++ data/maps/TwoIsland_PokemonCenter_1F/scripts.inc | 25 + data/maps/TwoIsland_PokemonCenter_2F/scripts.inc | 18 + data/maps/UndergroundPath_EastEntrance/scripts.inc | 7 + .../UndergroundPath_EastWestTunnel/scripts.inc | 7 + .../maps/UndergroundPath_NorthEntrance/scripts.inc | 45 + .../UndergroundPath_NorthSouthTunnel/scripts.inc | 7 + .../maps/UndergroundPath_SouthEntrance/scripts.inc | 7 + data/maps/UndergroundPath_WestEntrance/scripts.inc | 7 + data/maps/UnknownMap_00_00/scripts.inc | 2 + data/maps/UnknownMap_00_01/scripts.inc | 2 + data/maps/UnknownMap_00_02/scripts.inc | 2 + data/maps/UnknownMap_00_03/scripts.inc | 2 + data/maps/UnknownMap_00_04/scripts.inc | 106 ++ data/maps/UnknownMap_03_50/scripts.inc | 2 + data/maps/UnknownMap_03_51/scripts.inc | 2 + data/maps/UnknownMap_03_52/scripts.inc | 2 + data/maps/UnknownMap_03_53/scripts.inc | 2 + data/maps/UnknownMap_18_01/scripts.inc | 2 + data/maps/UnusedHouse_27_00/scripts.inc | 2 + data/maps/UnusedHouse_29_00/scripts.inc | 2 + data/maps/UnusedHouse_31_05/scripts.inc | 2 + data/maps/VermilionCity/scripts.inc | 330 ++++ data/maps/VermilionCity_Gym/scripts.inc | 329 ++++ data/maps/VermilionCity_House1/scripts.inc | 46 + data/maps/VermilionCity_House2/scripts.inc | 1 + data/maps/VermilionCity_House3/scripts.inc | 28 + data/maps/VermilionCity_Mart/scripts.inc | 39 + .../VermilionCity_PokemonCenter_1F/scripts.inc | 30 + .../VermilionCity_PokemonCenter_2F/scripts.inc | 18 + data/maps/VermilionCity_PokemonFanClub/scripts.inc | 191 +++ data/maps/VictoryRoad_1F/scripts.inc | 48 + data/maps/VictoryRoad_2F/scripts.inc | 86 ++ data/maps/VictoryRoad_3F/scripts.inc | 68 + data/maps/ViridianCity/scripts.inc | 284 ++++ data/maps/ViridianCity_Gym/scripts.inc | 137 ++ data/maps/ViridianCity_House1/scripts.inc | 28 + data/maps/ViridianCity_House2/scripts.inc | 120 ++ data/maps/ViridianCity_Mart/scripts.inc | 100 ++ .../maps/ViridianCity_PokemonCenter_1F/scripts.inc | 30 + .../maps/ViridianCity_PokemonCenter_2F/scripts.inc | 18 + data/maps/ViridianForest/scripts.inc | 77 + 425 files changed, 29565 insertions(+) create mode 100644 data/maps/BirthIsland_Exterior/scripts.inc create mode 100644 data/maps/BirthIsland_Harbor/scripts.inc create mode 100644 data/maps/CeladonCity/scripts.inc create mode 100644 data/maps/CeladonCity_Condominiums_1F/scripts.inc create mode 100644 data/maps/CeladonCity_Condominiums_2F/scripts.inc create mode 100644 data/maps/CeladonCity_Condominiums_3F/scripts.inc create mode 100644 data/maps/CeladonCity_Condominiums_Roof/scripts.inc create mode 100644 data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc create mode 100644 data/maps/CeladonCity_DepartmentStore_1F/scripts.inc create mode 100644 data/maps/CeladonCity_DepartmentStore_2F/scripts.inc create mode 100644 data/maps/CeladonCity_DepartmentStore_3F/scripts.inc create mode 100644 data/maps/CeladonCity_DepartmentStore_4F/scripts.inc create mode 100644 data/maps/CeladonCity_DepartmentStore_5F/scripts.inc create mode 100644 data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc create mode 100644 data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc create mode 100644 data/maps/CeladonCity_GameCorner/scripts.inc create mode 100644 data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc create mode 100644 data/maps/CeladonCity_Gym/scripts.inc create mode 100644 data/maps/CeladonCity_Hotel/scripts.inc create mode 100644 data/maps/CeladonCity_House1/scripts.inc create mode 100644 data/maps/CeladonCity_PokemonCenter_1F/scripts.inc create mode 100644 data/maps/CeladonCity_PokemonCenter_2F/scripts.inc create mode 100644 data/maps/CeladonCity_Restaurant/scripts.inc create mode 100644 data/maps/CeruleanCave_1F/scripts.inc create mode 100644 data/maps/CeruleanCave_2F/scripts.inc create mode 100644 data/maps/CeruleanCave_B1F/scripts.inc create mode 100644 data/maps/CeruleanCity/scripts.inc create mode 100644 data/maps/CeruleanCity_BikeShop/scripts.inc create mode 100644 data/maps/CeruleanCity_Gym/scripts.inc create mode 100644 data/maps/CeruleanCity_House1/scripts.inc create mode 100644 data/maps/CeruleanCity_House2/scripts.inc create mode 100644 data/maps/CeruleanCity_House3/scripts.inc create mode 100644 data/maps/CeruleanCity_House4/scripts.inc create mode 100644 data/maps/CeruleanCity_House5/scripts.inc create mode 100644 data/maps/CeruleanCity_Mart/scripts.inc create mode 100644 data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc create mode 100644 data/maps/CeruleanCity_PokemonCenter_2F/scripts.inc create mode 100644 data/maps/CinnabarIsland/scripts.inc create mode 100644 data/maps/CinnabarIsland_Gym/scripts.inc create mode 100644 data/maps/CinnabarIsland_Mart/scripts.inc create mode 100644 data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc create mode 100644 data/maps/CinnabarIsland_PokemonCenter_2F/scripts.inc create mode 100644 data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc create mode 100644 data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc create mode 100644 data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc create mode 100644 data/maps/CinnabarIsland_PokemonLab_ResearchRoom/scripts.inc create mode 100644 data/maps/DiglettsCave_B1F/scripts.inc create mode 100644 data/maps/DiglettsCave_NorthEntrance/scripts.inc create mode 100644 data/maps/DiglettsCave_SouthEntrance/scripts.inc create mode 100644 data/maps/FiveIsland/scripts.inc create mode 100644 data/maps/FiveIsland_Harbor/scripts.inc create mode 100644 data/maps/FiveIsland_House1/scripts.inc create mode 100644 data/maps/FiveIsland_House2/scripts.inc create mode 100644 data/maps/FiveIsland_LostCave_Entrance/scripts.inc create mode 100644 data/maps/FiveIsland_LostCave_Room1/scripts.inc create mode 100644 data/maps/FiveIsland_LostCave_Room10/scripts.inc create mode 100644 data/maps/FiveIsland_LostCave_Room11/scripts.inc create mode 100644 data/maps/FiveIsland_LostCave_Room12/scripts.inc create mode 100644 data/maps/FiveIsland_LostCave_Room13/scripts.inc create mode 100644 data/maps/FiveIsland_LostCave_Room14/scripts.inc create mode 100644 data/maps/FiveIsland_LostCave_Room2/scripts.inc create mode 100644 data/maps/FiveIsland_LostCave_Room3/scripts.inc create mode 100644 data/maps/FiveIsland_LostCave_Room4/scripts.inc create mode 100644 data/maps/FiveIsland_LostCave_Room5/scripts.inc create mode 100644 data/maps/FiveIsland_LostCave_Room6/scripts.inc create mode 100644 data/maps/FiveIsland_LostCave_Room7/scripts.inc create mode 100644 data/maps/FiveIsland_LostCave_Room8/scripts.inc create mode 100644 data/maps/FiveIsland_LostCave_Room9/scripts.inc create mode 100644 data/maps/FiveIsland_Meadow/scripts.inc create mode 100644 data/maps/FiveIsland_MemorialPillar/scripts.inc create mode 100644 data/maps/FiveIsland_PokemonCenter_1F/scripts.inc create mode 100644 data/maps/FiveIsland_PokemonCenter_2F/scripts.inc create mode 100644 data/maps/FiveIsland_ResortGorgeous/scripts.inc create mode 100644 data/maps/FiveIsland_ResortGorgeous_House/scripts.inc create mode 100644 data/maps/FiveIsland_WaterLabyrinth/scripts.inc create mode 100644 data/maps/FourIsland/scripts.inc create mode 100644 data/maps/FourIsland_Harbor/scripts.inc create mode 100644 data/maps/FourIsland_House1/scripts.inc create mode 100644 data/maps/FourIsland_House2/scripts.inc create mode 100644 data/maps/FourIsland_IcefallCave_1F/scripts.inc create mode 100644 data/maps/FourIsland_IcefallCave_Entrance/scripts.inc create mode 100644 data/maps/FourIsland_LoreleisHouse/scripts.inc create mode 100644 data/maps/FourIsland_Mart/scripts.inc create mode 100644 data/maps/FourIsland_PokemonCenter_1F/scripts.inc create mode 100644 data/maps/FourIsland_PokemonCenter_2F/scripts.inc create mode 100644 data/maps/FourIsland_PokemonDayCare/scripts.inc create mode 100644 data/maps/FuchsiaCity/scripts.inc create mode 100644 data/maps/FuchsiaCity_Building1/scripts.inc create mode 100644 data/maps/FuchsiaCity_Gym/scripts.inc create mode 100644 data/maps/FuchsiaCity_House1/scripts.inc create mode 100644 data/maps/FuchsiaCity_House2/scripts.inc create mode 100644 data/maps/FuchsiaCity_House3/scripts.inc create mode 100644 data/maps/FuchsiaCity_Mart/scripts.inc create mode 100644 data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc create mode 100644 data/maps/FuchsiaCity_PokemonCenter_2F/scripts.inc create mode 100644 data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc create mode 100644 data/maps/FuchsiaCity_ZooBuilding/scripts.inc create mode 100644 data/maps/IndigoPlateau_Exterior/scripts.inc create mode 100644 data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc create mode 100644 data/maps/IndigoPlateau_PokemonCenter_2F/scripts.inc create mode 100644 data/maps/LavenderTown/scripts.inc create mode 100644 data/maps/LavenderTown_House1/scripts.inc create mode 100644 data/maps/LavenderTown_House2/scripts.inc create mode 100644 data/maps/LavenderTown_Mart/scripts.inc create mode 100644 data/maps/LavenderTown_PokemonCenter_1F/scripts.inc create mode 100644 data/maps/LavenderTown_PokemonCenter_2F/scripts.inc create mode 100644 data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc create mode 100644 data/maps/MtEmber_Exterior/scripts.inc create mode 100644 data/maps/MtEmber_RubyPath_B1F/scripts.inc create mode 100644 data/maps/MtEmber_RubyPath_B1F_Stairs/scripts.inc create mode 100644 data/maps/MtEmber_RubyPath_B2F/scripts.inc create mode 100644 data/maps/MtEmber_RubyPath_B2F_Stairs/scripts.inc create mode 100644 data/maps/MtEmber_RubyPath_B3F/scripts.inc create mode 100644 data/maps/MtEmber_RubyPath_B4F/scripts.inc create mode 100644 data/maps/MtEmber_RubyPath_B5F/scripts.inc create mode 100644 data/maps/MtEmber_Summit/scripts.inc create mode 100644 data/maps/MtEmber_SummitPath_1F/scripts.inc create mode 100644 data/maps/MtEmber_SummitPath_2F/scripts.inc create mode 100644 data/maps/MtEmber_SummitPath_3F/scripts.inc create mode 100644 data/maps/MtMoon_1F/scripts.inc create mode 100644 data/maps/MtMoon_B1F/scripts.inc create mode 100644 data/maps/MtMoon_B2F/scripts.inc create mode 100644 data/maps/NavelRock_1F/scripts.inc create mode 100644 data/maps/NavelRock_B1F/scripts.inc create mode 100644 data/maps/NavelRock_Base/scripts.inc create mode 100644 data/maps/NavelRock_BasePath_B10F/scripts.inc create mode 100644 data/maps/NavelRock_BasePath_B11F/scripts.inc create mode 100644 data/maps/NavelRock_BasePath_B1F/scripts.inc create mode 100644 data/maps/NavelRock_BasePath_B2F/scripts.inc create mode 100644 data/maps/NavelRock_BasePath_B3F/scripts.inc create mode 100644 data/maps/NavelRock_BasePath_B4F/scripts.inc create mode 100644 data/maps/NavelRock_BasePath_B5F/scripts.inc create mode 100644 data/maps/NavelRock_BasePath_B6F/scripts.inc create mode 100644 data/maps/NavelRock_BasePath_B7F/scripts.inc create mode 100644 data/maps/NavelRock_BasePath_B8F/scripts.inc create mode 100644 data/maps/NavelRock_BasePath_B9F/scripts.inc create mode 100644 data/maps/NavelRock_Exterior/scripts.inc create mode 100644 data/maps/NavelRock_Fork/scripts.inc create mode 100644 data/maps/NavelRock_Harbor/scripts.inc create mode 100644 data/maps/NavelRock_Summit/scripts.inc create mode 100644 data/maps/NavelRock_SummitPath_2F/scripts.inc create mode 100644 data/maps/NavelRock_SummitPath_3F/scripts.inc create mode 100644 data/maps/NavelRock_SummitPath_4F/scripts.inc create mode 100644 data/maps/NavelRock_SummitPath_5F/scripts.inc create mode 100644 data/maps/OneIsland/scripts.inc create mode 100644 data/maps/OneIsland_Harbor/scripts.inc create mode 100644 data/maps/OneIsland_House1/scripts.inc create mode 100644 data/maps/OneIsland_House2/scripts.inc create mode 100644 data/maps/OneIsland_KindleRoad/scripts.inc create mode 100644 data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc create mode 100644 data/maps/OneIsland_PokemonCenter_1F/scripts.inc create mode 100644 data/maps/OneIsland_PokemonCenter_2F/scripts.inc create mode 100644 data/maps/OneIsland_TreasureBeach/scripts.inc create mode 100644 data/maps/PalletTown/scripts.inc create mode 100644 data/maps/PalletTown_GarysHouse/scripts.inc create mode 100644 data/maps/PalletTown_PlayersHouse_1F/scripts.inc create mode 100644 data/maps/PalletTown_PlayersHouse_2F/scripts.inc create mode 100644 data/maps/PalletTown_ProfessorOaksLab/scripts.inc create mode 100644 data/maps/PewterCity/scripts.inc create mode 100644 data/maps/PewterCity_Gym/scripts.inc create mode 100644 data/maps/PewterCity_House1/scripts.inc create mode 100644 data/maps/PewterCity_House2/scripts.inc create mode 100644 data/maps/PewterCity_Mart/scripts.inc create mode 100644 data/maps/PewterCity_Museum_1F/scripts.inc create mode 100644 data/maps/PewterCity_Museum_2F/scripts.inc create mode 100644 data/maps/PewterCity_PokemonCenter_1F/scripts.inc create mode 100644 data/maps/PewterCity_PokemonCenter_2F/scripts.inc create mode 100644 data/maps/PokemonLeague_AgathasRoom/scripts.inc create mode 100644 data/maps/PokemonLeague_BrunosRoom/scripts.inc create mode 100644 data/maps/PokemonLeague_ChampionsRoom/scripts.inc create mode 100644 data/maps/PokemonLeague_HallOfFame/scripts.inc create mode 100644 data/maps/PokemonLeague_LancesRoom/scripts.inc create mode 100644 data/maps/PokemonLeague_LoreleisRoom/scripts.inc create mode 100644 data/maps/PokemonMansion_1F/scripts.inc create mode 100644 data/maps/PokemonMansion_2F/scripts.inc create mode 100644 data/maps/PokemonMansion_3F/scripts.inc create mode 100644 data/maps/PokemonMansion_B1F/scripts.inc create mode 100644 data/maps/PokemonTower_1F/scripts.inc create mode 100644 data/maps/PokemonTower_2F/scripts.inc create mode 100644 data/maps/PokemonTower_3F/scripts.inc create mode 100644 data/maps/PokemonTower_4F/scripts.inc create mode 100644 data/maps/PokemonTower_5F/scripts.inc create mode 100644 data/maps/PokemonTower_6F/scripts.inc create mode 100644 data/maps/PokemonTower_7F/scripts.inc create mode 100644 data/maps/PowerPlant/scripts.inc create mode 100644 data/maps/RockTunnel_1F/scripts.inc create mode 100644 data/maps/RockTunnel_B1F/scripts.inc create mode 100644 data/maps/RocketHideout_B1F/scripts.inc create mode 100644 data/maps/RocketHideout_B2F/scripts.inc create mode 100644 data/maps/RocketHideout_B3F/scripts.inc create mode 100644 data/maps/RocketHideout_B4F/scripts.inc create mode 100644 data/maps/RocketHideout_Elevator/scripts.inc create mode 100644 data/maps/Route1/scripts.inc create mode 100644 data/maps/Route10/scripts.inc create mode 100644 data/maps/Route10_PokemonCenter_1F/scripts.inc create mode 100644 data/maps/Route10_PokemonCenter_2F/scripts.inc create mode 100644 data/maps/Route11/scripts.inc create mode 100644 data/maps/Route11_EastEntrance_1F/scripts.inc create mode 100644 data/maps/Route11_EastEntrance_2F/scripts.inc create mode 100644 data/maps/Route12/scripts.inc create mode 100644 data/maps/Route12_FishingHouse/scripts.inc create mode 100644 data/maps/Route12_NorthEntrance_1F/scripts.inc create mode 100644 data/maps/Route12_NorthEntrance_2F/scripts.inc create mode 100644 data/maps/Route13/scripts.inc create mode 100644 data/maps/Route14/scripts.inc create mode 100644 data/maps/Route15/scripts.inc create mode 100644 data/maps/Route15_WestEntrance_1F/scripts.inc create mode 100644 data/maps/Route15_WestEntrance_2F/scripts.inc create mode 100644 data/maps/Route16/scripts.inc create mode 100644 data/maps/Route16_House/scripts.inc create mode 100644 data/maps/Route16_NorthEntrance_1F/scripts.inc create mode 100644 data/maps/Route16_NorthEntrance_2F/scripts.inc create mode 100644 data/maps/Route17/scripts.inc create mode 100644 data/maps/Route18/scripts.inc create mode 100644 data/maps/Route18_EastEntrance_1F/scripts.inc create mode 100644 data/maps/Route18_EastEntrance_2F/scripts.inc create mode 100644 data/maps/Route19/scripts.inc create mode 100644 data/maps/Route2/scripts.inc create mode 100644 data/maps/Route20/scripts.inc create mode 100644 data/maps/Route21_North/scripts.inc create mode 100644 data/maps/Route21_South/scripts.inc create mode 100644 data/maps/Route22/scripts.inc create mode 100644 data/maps/Route22_NorthEntrance/scripts.inc create mode 100644 data/maps/Route23/scripts.inc create mode 100644 data/maps/Route24/scripts.inc create mode 100644 data/maps/Route25/scripts.inc create mode 100644 data/maps/Route25_SeaCottage/scripts.inc create mode 100644 data/maps/Route2_EastBuilding/scripts.inc create mode 100644 data/maps/Route2_House/scripts.inc create mode 100644 data/maps/Route2_ViridianForest_NorthEntrance/scripts.inc create mode 100644 data/maps/Route2_ViridianForest_SouthEntrance/scripts.inc create mode 100644 data/maps/Route3/scripts.inc create mode 100644 data/maps/Route4/scripts.inc create mode 100644 data/maps/Route4_PokemonCenter_1F/scripts.inc create mode 100644 data/maps/Route4_PokemonCenter_2F/scripts.inc create mode 100644 data/maps/Route5/scripts.inc create mode 100644 data/maps/Route5_PokemonDayCare/scripts.inc create mode 100644 data/maps/Route5_SouthEntrance/scripts.inc create mode 100644 data/maps/Route6/scripts.inc create mode 100644 data/maps/Route6_NorthEntrance/scripts.inc create mode 100644 data/maps/Route7/scripts.inc create mode 100644 data/maps/Route7_EastEntrance/scripts.inc create mode 100644 data/maps/Route8/scripts.inc create mode 100644 data/maps/Route8_WestEntrance/scripts.inc create mode 100644 data/maps/Route9/scripts.inc create mode 100644 data/maps/SSAnne_1F_Corridor/scripts.inc create mode 100644 data/maps/SSAnne_1F_Room1/scripts.inc create mode 100644 data/maps/SSAnne_1F_Room11/scripts.inc create mode 100644 data/maps/SSAnne_1F_Room12/scripts.inc create mode 100644 data/maps/SSAnne_1F_Room2/scripts.inc create mode 100644 data/maps/SSAnne_1F_Room3/scripts.inc create mode 100644 data/maps/SSAnne_1F_Room4/scripts.inc create mode 100644 data/maps/SSAnne_1F_Room5/scripts.inc create mode 100644 data/maps/SSAnne_1F_Room6/scripts.inc create mode 100644 data/maps/SSAnne_1F_Room7/scripts.inc create mode 100644 data/maps/SSAnne_2F_Corridor/scripts.inc create mode 100644 data/maps/SSAnne_2F_Room1/scripts.inc create mode 100644 data/maps/SSAnne_2F_Room2/scripts.inc create mode 100644 data/maps/SSAnne_2F_Room3/scripts.inc create mode 100644 data/maps/SSAnne_2F_Room4/scripts.inc create mode 100644 data/maps/SSAnne_2F_Room5/scripts.inc create mode 100644 data/maps/SSAnne_2F_Room6/scripts.inc create mode 100644 data/maps/SSAnne_3F_Corridor/scripts.inc create mode 100644 data/maps/SSAnne_B1F_Corridor/scripts.inc create mode 100644 data/maps/SSAnne_B1F_Room1/scripts.inc create mode 100644 data/maps/SSAnne_B1F_Room2/scripts.inc create mode 100644 data/maps/SSAnne_B1F_Room3/scripts.inc create mode 100644 data/maps/SSAnne_B1F_Room4/scripts.inc create mode 100644 data/maps/SSAnne_B1F_Room5/scripts.inc create mode 100644 data/maps/SSAnne_CaptainsOffice/scripts.inc create mode 100644 data/maps/SSAnne_CaptainsOffice2/scripts.inc create mode 100644 data/maps/SSAnne_CaptainsOffice3/scripts.inc create mode 100644 data/maps/SSAnne_CaptainsOffice4/scripts.inc create mode 100644 data/maps/SSAnne_CaptainsOffice5/scripts.inc create mode 100644 data/maps/SSAnne_CaptainsOffice9/scripts.inc create mode 100644 data/maps/SSAnne_Deck/scripts.inc create mode 100644 data/maps/SSAnne_Exterior/scripts.inc create mode 100644 data/maps/SSAnne_Kitchen/scripts.inc create mode 100644 data/maps/SSAnne_Kitchen3/scripts.inc create mode 100644 data/maps/SafariZone_Building1/scripts.inc create mode 100644 data/maps/SafariZone_Building2/scripts.inc create mode 100644 data/maps/SafariZone_Building3/scripts.inc create mode 100644 data/maps/SafariZone_Building4/scripts.inc create mode 100644 data/maps/SafariZone_Center/scripts.inc create mode 100644 data/maps/SafariZone_East/scripts.inc create mode 100644 data/maps/SafariZone_North/scripts.inc create mode 100644 data/maps/SafariZone_SecretHouse/scripts.inc create mode 100644 data/maps/SafariZone_West/scripts.inc create mode 100644 data/maps/SaffronCity/scripts.inc create mode 100644 data/maps/SaffronCity_Dojo/scripts.inc create mode 100644 data/maps/SaffronCity_Duplicate/scripts.inc create mode 100644 data/maps/SaffronCity_Gym/scripts.inc create mode 100644 data/maps/SaffronCity_House1_1F/scripts.inc create mode 100644 data/maps/SaffronCity_House1_2F/scripts.inc create mode 100644 data/maps/SaffronCity_House2/scripts.inc create mode 100644 data/maps/SaffronCity_House3/scripts.inc create mode 100644 data/maps/SaffronCity_Mart/scripts.inc create mode 100644 data/maps/SaffronCity_PokemonCenter_1F/scripts.inc create mode 100644 data/maps/SaffronCity_PokemonCenter_2F/scripts.inc create mode 100644 data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc create mode 100644 data/maps/SeafoamIslands_1F/scripts.inc create mode 100644 data/maps/SeafoamIslands_B1F/scripts.inc create mode 100644 data/maps/SeafoamIslands_B2F/scripts.inc create mode 100644 data/maps/SeafoamIslands_B3F/scripts.inc create mode 100644 data/maps/SeafoamIslands_B4F/scripts.inc create mode 100644 data/maps/SevenIsland/scripts.inc create mode 100644 data/maps/SevenIsland_Harbor/scripts.inc create mode 100644 data/maps/SevenIsland_House_Room1/scripts.inc create mode 100644 data/maps/SevenIsland_House_Room2/scripts.inc create mode 100644 data/maps/SevenIsland_Mart/scripts.inc create mode 100644 data/maps/SevenIsland_PokemonCenter_1F/scripts.inc create mode 100644 data/maps/SevenIsland_PokemonCenter_2F/scripts.inc create mode 100644 data/maps/SevenIsland_SeavaultCanyon_TanobyKey/scripts.inc create mode 100644 data/maps/SevenIsland_SevaultCanyon/scripts.inc create mode 100644 data/maps/SevenIsland_SevaultCanyon_Entrance/scripts.inc create mode 100644 data/maps/SevenIsland_SevaultCanyon_House/scripts.inc create mode 100644 data/maps/SevenIsland_TanobyRuins/scripts.inc create mode 100644 data/maps/SevenIsland_TanobyRuins_DilfordChamber/scripts.inc create mode 100644 data/maps/SevenIsland_TanobyRuins_LiptooChamber/scripts.inc create mode 100644 data/maps/SevenIsland_TanobyRuins_MoneanChamber/scripts.inc create mode 100644 data/maps/SevenIsland_TanobyRuins_RixyChamber/scripts.inc create mode 100644 data/maps/SevenIsland_TanobyRuins_ScufibChamber/scripts.inc create mode 100644 data/maps/SevenIsland_TanobyRuins_ViapoisChamber/scripts.inc create mode 100644 data/maps/SevenIsland_TanobyRuins_WeepthChamber/scripts.inc create mode 100644 data/maps/SevenIsland_TrainerTower/scripts.inc create mode 100644 data/maps/SevenIsland_TrainerTower_1F/scripts.inc create mode 100644 data/maps/SevenIsland_TrainerTower_2F/scripts.inc create mode 100644 data/maps/SevenIsland_TrainerTower_3F/scripts.inc create mode 100644 data/maps/SevenIsland_TrainerTower_4F/scripts.inc create mode 100644 data/maps/SevenIsland_TrainerTower_5F/scripts.inc create mode 100644 data/maps/SevenIsland_TrainerTower_6F/scripts.inc create mode 100644 data/maps/SevenIsland_TrainerTower_7F/scripts.inc create mode 100644 data/maps/SevenIsland_TrainerTower_8F/scripts.inc create mode 100644 data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc create mode 100644 data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc create mode 100644 data/maps/SevenIsland_TrainerTower_Roof/scripts.inc create mode 100644 data/maps/SilphCo_10F/scripts.inc create mode 100644 data/maps/SilphCo_11F/scripts.inc create mode 100644 data/maps/SilphCo_1F/scripts.inc create mode 100644 data/maps/SilphCo_2F/scripts.inc create mode 100644 data/maps/SilphCo_3F/scripts.inc create mode 100644 data/maps/SilphCo_4F/scripts.inc create mode 100644 data/maps/SilphCo_5F/scripts.inc create mode 100644 data/maps/SilphCo_6F/scripts.inc create mode 100644 data/maps/SilphCo_7F/scripts.inc create mode 100644 data/maps/SilphCo_8F/scripts.inc create mode 100644 data/maps/SilphCo_9F/scripts.inc create mode 100644 data/maps/SilphCo_Elevator/scripts.inc create mode 100644 data/maps/SixIsland/scripts.inc create mode 100644 data/maps/SixIsland_DottedHole_B1F/scripts.inc create mode 100644 data/maps/SixIsland_DottedHole_B2F/scripts.inc create mode 100644 data/maps/SixIsland_DottedHole_B3F/scripts.inc create mode 100644 data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc create mode 100644 data/maps/SixIsland_GreenPath/scripts.inc create mode 100644 data/maps/SixIsland_Harbor/scripts.inc create mode 100644 data/maps/SixIsland_House/scripts.inc create mode 100644 data/maps/SixIsland_Mart/scripts.inc create mode 100644 data/maps/SixIsland_OutcastIsland/scripts.inc create mode 100644 data/maps/SixIsland_PokemonCenter_1F/scripts.inc create mode 100644 data/maps/SixIsland_PokemonCenter_2F/scripts.inc create mode 100644 data/maps/SixIsland_RuinValley/scripts.inc create mode 100644 data/maps/SixIsland_WaterPath/scripts.inc create mode 100644 data/maps/SixIsland_WaterPath_House1/scripts.inc create mode 100644 data/maps/SixIsland_WaterPath_House2/scripts.inc create mode 100644 data/maps/ThreeIsland/scripts.inc create mode 100644 data/maps/ThreeIsland_BerryForest/scripts.inc create mode 100644 data/maps/ThreeIsland_BondBridge/scripts.inc create mode 100644 data/maps/ThreeIsland_DunsparceTunnel/scripts.inc create mode 100644 data/maps/ThreeIsland_Harbor/scripts.inc create mode 100644 data/maps/ThreeIsland_House1/scripts.inc create mode 100644 data/maps/ThreeIsland_House2/scripts.inc create mode 100644 data/maps/ThreeIsland_House3/scripts.inc create mode 100644 data/maps/ThreeIsland_House4/scripts.inc create mode 100644 data/maps/ThreeIsland_House5/scripts.inc create mode 100644 data/maps/ThreeIsland_Mart/scripts.inc create mode 100644 data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc create mode 100644 data/maps/ThreeIsland_PokemonCenter_2F/scripts.inc create mode 100644 data/maps/ThreeIsland_Port/scripts.inc create mode 100644 data/maps/TwoIsland/scripts.inc create mode 100644 data/maps/TwoIsland_CapeBrink/scripts.inc create mode 100644 data/maps/TwoIsland_CapeBrink_House/scripts.inc create mode 100644 data/maps/TwoIsland_Harbor/scripts.inc create mode 100644 data/maps/TwoIsland_House/scripts.inc create mode 100644 data/maps/TwoIsland_JoyfulGameCorner/scripts.inc create mode 100644 data/maps/TwoIsland_PokemonCenter_1F/scripts.inc create mode 100644 data/maps/TwoIsland_PokemonCenter_2F/scripts.inc create mode 100644 data/maps/UndergroundPath_EastEntrance/scripts.inc create mode 100644 data/maps/UndergroundPath_EastWestTunnel/scripts.inc create mode 100644 data/maps/UndergroundPath_NorthEntrance/scripts.inc create mode 100644 data/maps/UndergroundPath_NorthSouthTunnel/scripts.inc create mode 100644 data/maps/UndergroundPath_SouthEntrance/scripts.inc create mode 100644 data/maps/UndergroundPath_WestEntrance/scripts.inc create mode 100644 data/maps/UnknownMap_00_00/scripts.inc create mode 100644 data/maps/UnknownMap_00_01/scripts.inc create mode 100644 data/maps/UnknownMap_00_02/scripts.inc create mode 100644 data/maps/UnknownMap_00_03/scripts.inc create mode 100644 data/maps/UnknownMap_00_04/scripts.inc create mode 100644 data/maps/UnknownMap_03_50/scripts.inc create mode 100644 data/maps/UnknownMap_03_51/scripts.inc create mode 100644 data/maps/UnknownMap_03_52/scripts.inc create mode 100644 data/maps/UnknownMap_03_53/scripts.inc create mode 100644 data/maps/UnknownMap_18_01/scripts.inc create mode 100644 data/maps/UnusedHouse_27_00/scripts.inc create mode 100644 data/maps/UnusedHouse_29_00/scripts.inc create mode 100644 data/maps/UnusedHouse_31_05/scripts.inc create mode 100644 data/maps/VermilionCity/scripts.inc create mode 100644 data/maps/VermilionCity_Gym/scripts.inc create mode 100644 data/maps/VermilionCity_House1/scripts.inc create mode 100644 data/maps/VermilionCity_House2/scripts.inc create mode 100644 data/maps/VermilionCity_House3/scripts.inc create mode 100644 data/maps/VermilionCity_Mart/scripts.inc create mode 100644 data/maps/VermilionCity_PokemonCenter_1F/scripts.inc create mode 100644 data/maps/VermilionCity_PokemonCenter_2F/scripts.inc create mode 100644 data/maps/VermilionCity_PokemonFanClub/scripts.inc create mode 100644 data/maps/VictoryRoad_1F/scripts.inc create mode 100644 data/maps/VictoryRoad_2F/scripts.inc create mode 100644 data/maps/VictoryRoad_3F/scripts.inc create mode 100644 data/maps/ViridianCity/scripts.inc create mode 100644 data/maps/ViridianCity_Gym/scripts.inc create mode 100644 data/maps/ViridianCity_House1/scripts.inc create mode 100644 data/maps/ViridianCity_House2/scripts.inc create mode 100644 data/maps/ViridianCity_Mart/scripts.inc create mode 100644 data/maps/ViridianCity_PokemonCenter_1F/scripts.inc create mode 100644 data/maps/ViridianCity_PokemonCenter_2F/scripts.inc create mode 100644 data/maps/ViridianForest/scripts.inc (limited to 'data/maps') diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc new file mode 100644 index 000000000..93618c138 --- /dev/null +++ b/data/maps/BirthIsland_Exterior/scripts.inc @@ -0,0 +1,132 @@ +BirthIsland_Exterior_MapScripts:: @ 8165203 + map_script 3, BirthIsland_Exterior_MapScript1_165217 + map_script 5, BirthIsland_Exterior_MapScript2_165253 + map_script 7, BirthIsland_Exterior_MapScript3_165213 + .byte 0 + +BirthIsland_Exterior_MapScript3_165213:: @ 8165213 + special sub_80CD008 + end + +BirthIsland_Exterior_MapScript1_165217:: @ 8165217 + setworldmapflag 2242 + setvar VAR_0x4010, 150 + setvar VAR_SECRET_BASE_MAP, 0 + setvar VAR_ALTERING_CAVE_WILD_SET, 0 + checkflag FLAG_0x2E4 + call_if 1, EventScript_16523C + checkflag FLAG_0x2E4 + call_if 0, EventScript_165243 + end + +EventScript_16523C:: @ 816523C + setflag FLAG_0x099 + setflag FLAG_0x09A + return + +EventScript_165243:: @ 8165243 + checkflag FLAG_0x2F7 + goto_if 1, EventScript_1A77A9 + clearflag FLAG_0x09A + clearflag 2120 + return + +BirthIsland_Exterior_MapScript2_165253:: @ 8165253 + checkflag 2055 + call_if 1, EventScript_16525D + end + +EventScript_16525D:: @ 816525D + specialvar VAR_RESULT, sub_80CA74C + compare_var_to_value VAR_RESULT, 7 + goto_if 5, EventScript_1A77A9 + removeobject 2 + return + +BirthIsland_Exterior_EventScript_165271:: @ 8165271 + lock + faceplayer + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + special sub_8112364 + special sub_80CCDFC + waitstate + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_1652BA + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_1652BC + compare_var_to_value VAR_0x8000, 2 + goto_if 1, EventScript_1652C0 + compare_var_to_value VAR_0x8000, 3 + goto_if 1, EventScript_1652BE + end + +EventScript_1652BA:: @ 81652BA + release + end + +EventScript_1652BC:: @ 81652BC + release + end + +EventScript_1652BE:: @ 81652BE + release + end + +EventScript_1652C0:: @ 81652C0 + addobject 2 + waitse + setfieldeffectarg 0, 1 + setfieldeffectarg 1, 56 + setfieldeffectarg 2, 2 + dofieldeffect 68 + playbgm BGM_FRLG_DEOXYS_EYE, 0 + waitfieldeffect 68 + applymovement 2, Movement_165353 + waitmovement 0 + waitse + playmoncry SPECIES_DEOXYS, 2 + delay 40 + waitmoncry + setvar VAR_LAST_TALKED, 2 + setvar VAR_0x8004, 410 + setvar VAR_0x8005, 30 + setvar VAR_0x8006, 0 + special sub_8044838 + setflag 2055 + special sub_807F9D8 + waitstate + clearflag 2055 + specialvar VAR_RESULT, sub_80CA74C + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16533A + compare_var_to_value VAR_RESULT, 4 + goto_if 1, EventScript_165348 + compare_var_to_value VAR_RESULT, 5 + goto_if 1, EventScript_165348 + setflag FLAG_0x2E4 + release + end + +EventScript_16533A:: @ 816533A + setflag FLAG_0x2F7 + setvar VAR_0x8004, 410 + goto EventScript_1A9236 + end + +EventScript_165348:: @ 8165348 + setvar VAR_0x8004, 410 + goto EventScript_1A9236 + end + +Movement_165353:: @ 8165353 + step_down + step_down + step_down + step_down + step_down + step_down + step_down + step_end diff --git a/data/maps/BirthIsland_Harbor/scripts.inc b/data/maps/BirthIsland_Harbor/scripts.inc new file mode 100644 index 000000000..d92a62d8e --- /dev/null +++ b/data/maps/BirthIsland_Harbor/scripts.inc @@ -0,0 +1,37 @@ +BirthIsland_Harbor_MapScripts:: @ 81653E6 + .byte 0 + +BirthIsland_Harbor_EventScript_1653E7:: @ 81653E7 + lock + faceplayer + message Text_181726 + waitmessage + setvar VAR_0x8004, 10 + multichoice 20, 8, 61, 0 + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_1A91D5 + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_1A90F6 + compare_var_to_value VAR_0x8000, 127 + goto_if 1, EventScript_1A90F6 + end + +NavelRock_Harbor_MapScripts:: @ 8165420 + .byte 0 + +NavelRock_Harbor_EventScript_165421:: @ 8165421 + lock + faceplayer + message Text_181726 + waitmessage + setvar VAR_0x8004, 9 + multichoice 20, 8, 61, 0 + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_1A91D5 + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_1A90F6 + compare_var_to_value VAR_0x8000, 127 + goto_if 1, EventScript_1A90F6 + end diff --git a/data/maps/CeladonCity/scripts.inc b/data/maps/CeladonCity/scripts.inc new file mode 100644 index 000000000..54579baae --- /dev/null +++ b/data/maps/CeladonCity/scripts.inc @@ -0,0 +1,123 @@ +CeladonCity_MapScripts:: @ 8166C8F + map_script 3, CeladonCity_MapScript1_166C95 + .byte 0 + +CeladonCity_MapScript1_166C95:: @ 8166C95 + setworldmapflag 2198 + end + +CeladonCity_EventScript_166C99:: @ 8166C99 + loadword 0, gUnknown_817FEC3 + callstd 2 + end + +CeladonCity_EventScript_166CA2:: @ 8166CA2 + lock + loadword 0, gUnknown_817FF1C + callstd 4 + release + end + +CeladonCity_EventScript_166CAD:: @ 8166CAD + loadword 0, gUnknown_817FF4A + callstd 2 + end + +CeladonCity_EventScript_166CB6:: @ 8166CB6 + loadword 0, gUnknown_817FFC5 + callstd 2 + end + +CeladonCity_EventScript_166CBF:: @ 8166CBF + goto EventScript_1C4A86 + end + +CeladonCity_EventScript_166CC5:: @ 8166CC5 + lock + faceplayer + loadword 0, gUnknown_818001B + callstd 4 + closemessage + applymovement 2, Movement_1A75E5 + waitmovement 0 + release + end + +CeladonCity_EventScript_166CDC:: @ 8166CDC + lock + faceplayer + waitse + playmoncry SPECIES_POLIWRATH, 0 + loadword 0, gUnknown_8180075 + callstd 4 + closemessage + waitmoncry + applymovement 3, Movement_1A75E5 + waitmovement 0 + release + end + +CeladonCity_EventScript_166CFA:: @ 8166CFA + loadword 0, gUnknown_81800C2 + callstd 2 + end + +CeladonCity_EventScript_166D03:: @ 8166D03 + loadword 0, gUnknown_818008C + callstd 2 + end + +CeladonCity_EventScript_166D0C:: @ 8166D0C + loadword 0, gUnknown_8180300 + callstd 2 + end + +CeladonCity_EventScript_166D15:: @ 8166D15 + loadword 0, gUnknown_81804E1 + callstd 2 + end + +CeladonCity_EventScript_166D1E:: @ 8166D1E + loadword 0, gUnknown_81800E1 + callstd 3 + end + +CeladonCity_EventScript_166D27:: @ 8166D27 + loadword 0, gUnknown_818017A + callstd 3 + end + +CeladonCity_EventScript_166D30:: @ 8166D30 + lockall + setvar VAR_0x8004, 5 + setvar VAR_0x8005, 0 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_81801A2 + callstd 4 + releaseall + end + +CeladonCity_EventScript_166D48:: @ 8166D48 + loadword 0, gUnknown_81801E5 + callstd 3 + end + +CeladonCity_EventScript_166D51:: @ 8166D51 + loadword 0, gUnknown_81801F5 + callstd 3 + end + +CeladonCity_EventScript_166D5A:: @ 8166D5A + loadword 0, gUnknown_8180224 + callstd 3 + end + +CeladonCity_EventScript_166D63:: @ 8166D63 + loadword 0, gUnknown_81802A4 + callstd 3 + end + +CeladonCity_EventScript_166D6C:: @ 8166D6C + loadword 0, gUnknown_81802CF + callstd 3 + end diff --git a/data/maps/CeladonCity_Condominiums_1F/scripts.inc b/data/maps/CeladonCity_Condominiums_1F/scripts.inc new file mode 100644 index 000000000..868c58812 --- /dev/null +++ b/data/maps/CeladonCity_Condominiums_1F/scripts.inc @@ -0,0 +1,78 @@ +CeladonCity_Condominiums_1F_MapScripts:: @ 816C320 + .byte 0 + +CeladonCity_Condominiums_1F_EventScript_16C321:: @ 816C321 + lock + faceplayer + checkflag FLAG_0x2F8 + goto_if 1, EventScript_16C36A + checkflag 2092 + goto_if 1, EventScript_16C374 + checkflag FLAG_0x2A6 + goto_if 1, EventScript_16C36A + loadword 0, gUnknown_81960C9 + callstd 4 + setflag FLAG_0x2A6 + setorcopyvar VAR_0x8000, 369 + setorcopyvar VAR_0x8001, 1 + callstd 0 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_1A6BF9 + loadword 0, gUnknown_8196109 + callstd 4 + release + end + +EventScript_16C36A:: @ 816C36A + loadword 0, gUnknown_8196148 + callstd 4 + release + end + +EventScript_16C374:: @ 816C374 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 4 + special SetFlavorTextFlagFromSpecialVars + setflag FLAG_0x2F8 + loadword 0, gUnknown_8196188 + callstd 4 + release + end + +CeladonCity_Condominiums_1F_EventScript_16C38E:: @ 816C38E + lock + faceplayer + waitse + playmoncry SPECIES_MEOWTH, 0 + loadword 0, gUnknown_81960BB + callstd 4 + waitmoncry + release + end + +CeladonCity_Condominiums_1F_EventScript_16C3A1:: @ 816C3A1 + lock + faceplayer + waitse + playmoncry SPECIES_CLEFAIRY, 0 + loadword 0, gUnknown_819625B + callstd 4 + waitmoncry + release + end + +CeladonCity_Condominiums_1F_EventScript_16C3B4:: @ 816C3B4 + lock + faceplayer + waitse + playmoncry SPECIES_NIDORAN_F, 0 + loadword 0, gUnknown_8196272 + callstd 4 + waitmoncry + release + end + +CeladonCity_Condominiums_1F_EventScript_16C3C7:: @ 816C3C7 + loadword 0, gUnknown_8196287 + callstd 3 + end diff --git a/data/maps/CeladonCity_Condominiums_2F/scripts.inc b/data/maps/CeladonCity_Condominiums_2F/scripts.inc new file mode 100644 index 000000000..f7c6fa8d7 --- /dev/null +++ b/data/maps/CeladonCity_Condominiums_2F/scripts.inc @@ -0,0 +1,7 @@ +CeladonCity_Condominiums_2F_MapScripts:: @ 816C3D0 + .byte 0 + +CeladonCity_Condominiums_2F_EventScript_16C3D1:: @ 816C3D1 + loadword 0, gUnknown_81962A7 + callstd 3 + end diff --git a/data/maps/CeladonCity_Condominiums_3F/scripts.inc b/data/maps/CeladonCity_Condominiums_3F/scripts.inc new file mode 100644 index 000000000..fe18ab649 --- /dev/null +++ b/data/maps/CeladonCity_Condominiums_3F/scripts.inc @@ -0,0 +1,64 @@ +CeladonCity_Condominiums_3F_MapScripts:: @ 816C3DA + .byte 0 + +CeladonCity_Condominiums_3F_EventScript_16C3DB:: @ 816C3DB + loadword 0, gUnknown_81962BF + callstd 2 + end + +CeladonCity_Condominiums_3F_EventScript_16C3E4:: @ 816C3E4 + loadword 0, gUnknown_81962D7 + callstd 2 + end + +CeladonCity_Condominiums_3F_EventScript_16C3ED:: @ 816C3ED + loadword 0, gUnknown_81962FB + callstd 2 + end + +CeladonCity_Condominiums_3F_EventScript_16C3F6:: @ 816C3F6 + lock + faceplayer + specialvar VAR_RESULT, sub_8088F58 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16C412 + loadword 0, gUnknown_8196356 + callstd 4 + release + end + +EventScript_16C412:: @ 816C412 + goto EventScript_16C418 + end + +EventScript_16C418:: @ 816C418 + message Text_1963CD + waitmessage + delay 60 + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + special sub_80CA618 + waitstate + release + end + +CeladonCity_Condominiums_3F_EventScript_16C435:: @ 816C435 + loadword 0, gUnknown_81964A8 + callstd 3 + end + +CeladonCity_Condominiums_3F_EventScript_16C43E:: @ 816C43E + loadword 0, gUnknown_819640C + callstd 3 + end + +CeladonCity_Condominiums_3F_EventScript_16C447:: @ 816C447 + loadword 0, gUnknown_819644B + callstd 3 + end + +CeladonCity_Condominiums_3F_EventScript_16C450:: @ 816C450 + loadword 0, gUnknown_8196478 + callstd 3 + end diff --git a/data/maps/CeladonCity_Condominiums_Roof/scripts.inc b/data/maps/CeladonCity_Condominiums_Roof/scripts.inc new file mode 100644 index 000000000..dd3d686c0 --- /dev/null +++ b/data/maps/CeladonCity_Condominiums_Roof/scripts.inc @@ -0,0 +1,7 @@ +CeladonCity_Condominiums_Roof_MapScripts:: @ 816C459 + .byte 0 + +CeladonCity_Condominiums_Roof_EventScript_16C45A:: @ 816C45A + loadword 0, gUnknown_81964C4 + callstd 3 + end diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc b/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc new file mode 100644 index 000000000..ee5cf4777 --- /dev/null +++ b/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc @@ -0,0 +1,127 @@ +CeladonCity_Condominiums_RoofRoom_MapScripts:: @ 816C463 + .byte 0 + +CeladonCity_Condominiums_RoofRoom_EventScript_16C464:: @ 816C464 + loadword 0, gUnknown_81964D7 + callstd 2 + end + +CeladonCity_Condominiums_RoofRoom_EventScript_16C46D:: @ 816C46D + lock + faceplayer + setvar VAR_0x4001, 133 + givemon SPECIES_EEVEE, 25, ITEM_NONE, 0, 0, 0 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16C4A6 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16C4DA + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A927C + release + end + +EventScript_16C4A6:: @ 816C4A6 + removeobject 2 + playfanfare MUS_FANFA1 + message Text_196591 + waitmessage + waitfanfare + getspeciesname 0, SPECIES_EEVEE + loadword 0, gUnknown_81A56A7 + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16C514 + call EventScript_1A8C27 + call EventScript_1A74EB + goto EventScript_16C514 + end + +EventScript_16C4DA:: @ 816C4DA + removeobject 2 + playfanfare MUS_FANFA1 + message Text_196591 + waitmessage + waitfanfare + getspeciesname 0, SPECIES_EEVEE + loadword 0, gUnknown_81A56A7 + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16C509 + call EventScript_1A8C33 + goto EventScript_16C509 + end + +EventScript_16C509:: @ 816C509 + call EventScript_1A8C3C + goto EventScript_16C514 + end + +EventScript_16C514:: @ 816C514 + setflag FLAG_0x263 + release + end + +CeladonCity_Condominiums_RoofRoom_EventScript_16C519:: @ 816C519 + loadword 0, gUnknown_81967E3 + callstd 3 + end + +CeladonCity_Condominiums_RoofRoom_EventScript_16C522:: @ 816C522 + lockall + loadword 0, gUnknown_81965C2 + callstd 4 + message Text_1965F4 + waitmessage + setvar VAR_0x8004, 4 + multichoice 0, 0, 43, 0 + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_16C5C0 + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_16C5CE + compare_var_to_value VAR_0x8000, 2 + goto_if 1, EventScript_16C5DC + compare_var_to_value VAR_0x8000, 3 + goto_if 1, EventScript_16C5EA + compare_var_to_value VAR_0x8000, 127 + goto_if 1, EventScript_16C5EA + end + +EventScript_16C578:: @ 816C578 + message Text_1965F4 + waitmessage + multichoice 0, 0, 43, 0 + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_16C5C0 + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_16C5CE + compare_var_to_value VAR_0x8000, 2 + goto_if 1, EventScript_16C5DC + compare_var_to_value VAR_0x8000, 3 + goto_if 1, EventScript_16C5EA + compare_var_to_value VAR_0x8000, 127 + goto_if 1, EventScript_16C5EA + end + +EventScript_16C5C0:: @ 816C5C0 + loadword 0, gUnknown_8196617 + callstd 4 + goto EventScript_16C578 + end + +EventScript_16C5CE:: @ 816C5CE + loadword 0, gUnknown_8196695 + callstd 4 + goto EventScript_16C578 + end + +EventScript_16C5DC:: @ 816C5DC + loadword 0, gUnknown_819673C + callstd 4 + goto EventScript_16C578 + end + +EventScript_16C5EA:: @ 816C5EA + releaseall + end diff --git a/data/maps/CeladonCity_DepartmentStore_1F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_1F/scripts.inc new file mode 100644 index 000000000..c17ca3c25 --- /dev/null +++ b/data/maps/CeladonCity_DepartmentStore_1F/scripts.inc @@ -0,0 +1,17 @@ +CeladonCity_DepartmentStore_1F_MapScripts:: @ 816BAD8 + .byte 0 + +CeladonCity_DepartmentStore_1F_EventScript_16BAD9:: @ 816BAD9 + loadword 0, gUnknown_81954DD + callstd 2 + end + +CeladonCity_DepartmentStore_1F_EventScript_16BAE2:: @ 816BAE2 + loadword 0, gUnknown_8195537 + callstd 3 + end + +CeladonCity_DepartmentStore_1F_EventScript_16BAEB:: @ 816BAEB + loadword 0, gUnknown_81955B3 + callstd 3 + end diff --git a/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc new file mode 100644 index 000000000..1c1e0ab95 --- /dev/null +++ b/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc @@ -0,0 +1,72 @@ +CeladonCity_DepartmentStore_2F_MapScripts:: @ 816BAF4 + .byte 0 + +CeladonCity_DepartmentStore_2F_EventScript_16BAF5:: @ 816BAF5 + loadword 0, gUnknown_81955C7 + callstd 2 + end + +CeladonCity_DepartmentStore_2F_EventScript_16BAFE:: @ 816BAFE + loadword 0, gUnknown_819560F + callstd 2 + end + +CeladonCity_DepartmentStore_2F_EventScript_16BB07:: @ 816BB07 + loadword 0, gUnknown_8195638 + callstd 3 + end + +CeladonCity_DepartmentStore_2F_EventScript_16BB10:: @ 816BB10 + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + lock + faceplayer + message Text_1A6211 + waitmessage + pokemart Items_16BB38 + loadword 0, gUnknown_81A5190 + callstd 4 + release + end + + .align 2 +Items_16BB38:: @ 816BB38 + .2byte ITEM_GREAT_BALL + .2byte ITEM_SUPER_POTION + .2byte ITEM_REVIVE + .2byte ITEM_ANTIDOTE + .2byte ITEM_PARALYZE_HEAL + .2byte ITEM_AWAKENING + .2byte ITEM_BURN_HEAL + .2byte ITEM_ICE_HEAL + .2byte ITEM_SUPER_REPEL + .2byte ITEM_NONE + release + end + +CeladonCity_DepartmentStore_2F_EventScript_16BB4E:: @ 816BB4E + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + lock + faceplayer + message Text_1A6211 + waitmessage + pokemart Items_16BB74 + loadword 0, gUnknown_81A5190 + callstd 4 + release + end + + .align 2 +Items_16BB74:: @ 816BB74 + .2byte ITEM_TM05 + .2byte ITEM_TM15 + .2byte ITEM_TM28 + .2byte ITEM_TM31 + .2byte ITEM_TM43 + .2byte ITEM_TM45 + .2byte ITEM_NONE + release + end diff --git a/data/maps/CeladonCity_DepartmentStore_3F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_3F/scripts.inc new file mode 100644 index 000000000..b615859f3 --- /dev/null +++ b/data/maps/CeladonCity_DepartmentStore_3F/scripts.inc @@ -0,0 +1,61 @@ +CeladonCity_DepartmentStore_3F_MapScripts:: @ 816BB84 + .byte 0 + +CeladonCity_DepartmentStore_3F_EventScript_16BB85:: @ 816BB85 + goto EventScript_1C4C26 + end + +CeladonCity_DepartmentStore_3F_EventScript_16BB8B:: @ 816BB8B + loadword 0, gUnknown_81956E9 + callstd 2 + end + +CeladonCity_DepartmentStore_3F_EventScript_16BB94:: @ 816BB94 + loadword 0, gUnknown_8195769 + callstd 2 + end + +CeladonCity_DepartmentStore_3F_EventScript_16BB9D:: @ 816BB9D + loadword 0, gUnknown_81957B0 + callstd 2 + end + +CeladonCity_DepartmentStore_3F_EventScript_16BBA6:: @ 816BBA6 + loadword 0, gUnknown_8195823 + callstd 2 + end + +CeladonCity_DepartmentStore_3F_EventScript_16BBAF:: @ 816BBAF + loadword 0, gUnknown_8195863 + callstd 3 + end + +CeladonCity_DepartmentStore_3F_EventScript_16BBB8:: @ 816BBB8 + loadword 0, gUnknown_8195875 + callstd 3 + end + +CeladonCity_DepartmentStore_3F_EventScript_16BBC1:: @ 816BBC1 + loadword 0, gUnknown_8195897 + callstd 3 + end + +CeladonCity_DepartmentStore_3F_EventScript_16BBCA:: @ 816BBCA + loadword 0, gUnknown_81958B8 + callstd 3 + end + +CeladonCity_DepartmentStore_3F_EventScript_16BBD3:: @ 816BBD3 + loadword 0, gUnknown_81958D8 + callstd 3 + end + +CeladonCity_DepartmentStore_3F_EventScript_16BBDC:: @ 816BBDC + loadword 0, gUnknown_81958F6 + callstd 3 + end + +CeladonCity_DepartmentStore_3F_EventScript_16BBE5:: @ 816BBE5 + loadword 0, gUnknown_8195907 + callstd 3 + end diff --git a/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc new file mode 100644 index 000000000..ac1acefa0 --- /dev/null +++ b/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc @@ -0,0 +1,43 @@ +CeladonCity_DepartmentStore_4F_MapScripts:: @ 816BBEE + .byte 0 + +CeladonCity_DepartmentStore_4F_EventScript_16BBEF:: @ 816BBEF + loadword 0, gUnknown_8195A68 + callstd 2 + end + +CeladonCity_DepartmentStore_4F_EventScript_16BBF8:: @ 816BBF8 + loadword 0, gUnknown_8195AC9 + callstd 2 + end + +CeladonCity_DepartmentStore_4F_EventScript_16BC01:: @ 816BC01 + loadword 0, gUnknown_8195B5B + callstd 3 + end + +CeladonCity_DepartmentStore_4F_EventScript_16BC0A:: @ 816BC0A + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + lock + faceplayer + message Text_1A6211 + waitmessage + pokemart Items_16BC30 + loadword 0, gUnknown_81A5190 + callstd 4 + release + end + + .align 2 +Items_16BC30:: @ 816BC30 + .2byte ITEM_POKE_DOLL + .2byte ITEM_RETRO_MAIL + .2byte ITEM_FIRE_STONE + .2byte ITEM_THUNDER_STONE + .2byte ITEM_WATER_STONE + .2byte ITEM_LEAF_STONE + .2byte ITEM_NONE + release + end diff --git a/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc new file mode 100644 index 000000000..5562858c0 --- /dev/null +++ b/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc @@ -0,0 +1,70 @@ +CeladonCity_DepartmentStore_5F_MapScripts:: @ 816BC40 + .byte 0 + +CeladonCity_DepartmentStore_5F_EventScript_16BC41:: @ 816BC41 + loadword 0, gUnknown_8195BBA + callstd 2 + end + +CeladonCity_DepartmentStore_5F_EventScript_16BC4A:: @ 816BC4A + loadword 0, gUnknown_8195CA0 + callstd 2 + end + +CeladonCity_DepartmentStore_5F_EventScript_16BC53:: @ 816BC53 + loadword 0, gUnknown_8195D14 + callstd 3 + end + +CeladonCity_DepartmentStore_5F_EventScript_16BC5C:: @ 816BC5C + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + lock + faceplayer + message Text_1A6211 + waitmessage + pokemart Items_16BC84 + loadword 0, gUnknown_81A5190 + callstd 4 + release + end + + .align 2 +Items_16BC84:: @ 816BC84 + .2byte ITEM_X_ATTACK + .2byte ITEM_X_DEFEND + .2byte ITEM_X_SPEED + .2byte ITEM_X_SPECIAL + .2byte ITEM_X_ACCURACY + .2byte ITEM_GUARD_SPEC + .2byte ITEM_DIRE_HIT + .2byte ITEM_NONE + release + end + +CeladonCity_DepartmentStore_5F_EventScript_16BC96:: @ 816BC96 + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + lock + faceplayer + message Text_1A6211 + waitmessage + pokemart Items_16BCBC + loadword 0, gUnknown_81A5190 + callstd 4 + release + end + + .align 2 +Items_16BCBC:: @ 816BCBC + .2byte ITEM_HP_UP + .2byte ITEM_PROTEIN + .2byte ITEM_IRON + .2byte ITEM_CALCIUM + .2byte ITEM_ZINC + .2byte ITEM_CARBOS + .2byte ITEM_NONE + release + end diff --git a/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc new file mode 100644 index 000000000..9043b3cef --- /dev/null +++ b/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc @@ -0,0 +1,135 @@ +CeladonCity_DepartmentStore_Elevator_MapScripts:: @ 816C152 + .byte 0 + +CeladonCity_DepartmentStore_Elevator_EventScript_16C153:: @ 816C153 + lockall + setvar VAR_0x8004, 3 + checkflag FLAG_0x002 + call_if 0, EventScript_1A7AB9 + copyvar VAR_0x8005, VAR_0x403A + special sub_80CB580 + message Text_1A535C + waitmessage + setvar VAR_0x8004, 3 + specialvar VAR_RESULT, sub_80CB328 + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_16C1B7 + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_16C1C3 + compare_var_to_value VAR_0x8000, 2 + goto_if 1, EventScript_16C1CF + compare_var_to_value VAR_0x8000, 3 + goto_if 1, EventScript_16C1DB + compare_var_to_value VAR_0x8000, 4 + goto_if 1, EventScript_16C1E7 + end + +EventScript_16C1B7:: @ 816C1B7 + multichoicedefault 0, 0, 31, 0, 0 + goto EventScript_16C1F3 + +EventScript_16C1C2:: @ 816C1C2 + end + +EventScript_16C1C3:: @ 816C1C3 + multichoicedefault 0, 0, 31, 1, 0 + goto EventScript_16C1F3 + end + +EventScript_16C1CF:: @ 816C1CF + multichoicedefault 0, 0, 31, 2, 0 + goto EventScript_16C1F3 + end + +EventScript_16C1DB:: @ 816C1DB + multichoicedefault 0, 0, 31, 3, 0 + goto EventScript_16C1F3 + end + +EventScript_16C1E7:: @ 816C1E7 + multichoicedefault 0, 0, 31, 4, 0 + goto EventScript_16C1F3 + end + +EventScript_16C1F3:: @ 816C1F3 + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_16C2E6 + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_16C2BE + compare_var_to_value VAR_0x8000, 2 + goto_if 1, EventScript_16C296 + compare_var_to_value VAR_0x8000, 3 + goto_if 1, EventScript_16C26E + compare_var_to_value VAR_0x8000, 4 + goto_if 1, EventScript_16C246 + compare_var_to_value VAR_0x8000, 5 + goto_if 1, EventScript_16C30E + compare_var_to_value VAR_0x8000, 127 + goto_if 1, EventScript_16C30E + end + +EventScript_16C246:: @ 816C246 + setvar VAR_0x8006, 4 + setdynamicwarp MAP_CELADONCITY_DEPARTMENTSTORE_1F, 255, 6, 1 + compare_var_to_value VAR_0x403A, 4 + goto_if 1, EventScript_16C30E + call EventScript_16C313 + setvar VAR_0x403A, 4 + goto EventScript_16C30E + end + +EventScript_16C26E:: @ 816C26E + setvar VAR_0x8006, 5 + setdynamicwarp MAP_CELADONCITY_DEPARTMENTSTORE_2F, 255, 6, 1 + compare_var_to_value VAR_0x403A, 5 + goto_if 1, EventScript_16C30E + call EventScript_16C313 + setvar VAR_0x403A, 5 + goto EventScript_16C30E + end + +EventScript_16C296:: @ 816C296 + setvar VAR_0x8006, 6 + setdynamicwarp MAP_CELADONCITY_DEPARTMENTSTORE_3F, 255, 6, 1 + compare_var_to_value VAR_0x403A, 6 + goto_if 1, EventScript_16C30E + call EventScript_16C313 + setvar VAR_0x403A, 6 + goto EventScript_16C30E + end + +EventScript_16C2BE:: @ 816C2BE + setvar VAR_0x8006, 7 + setdynamicwarp MAP_CELADONCITY_DEPARTMENTSTORE_4F, 255, 6, 1 + compare_var_to_value VAR_0x403A, 7 + goto_if 1, EventScript_16C30E + call EventScript_16C313 + setvar VAR_0x403A, 7 + goto EventScript_16C30E + end + +EventScript_16C2E6:: @ 816C2E6 + setvar VAR_0x8006, 8 + setdynamicwarp MAP_CELADONCITY_DEPARTMENTSTORE_5F, 255, 6, 1 + compare_var_to_value VAR_0x403A, 8 + goto_if 1, EventScript_16C30E + call EventScript_16C313 + setvar VAR_0x403A, 8 + goto EventScript_16C30E + end + +EventScript_16C30E:: @ 816C30E + special sub_80CB63C + releaseall + end + +EventScript_16C313:: @ 816C313 + special sub_80CB63C + closemessage + waitse + special sub_80CB498 + waitstate + setflag FLAG_0x002 + return diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc new file mode 100644 index 000000000..165942ca3 --- /dev/null +++ b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc @@ -0,0 +1,358 @@ +CeladonCity_DepartmentStore_Roof_MapScripts:: @ 816BCCC + .byte 0 + +CeladonCity_DepartmentStore_Roof_EventScript_16BCCD:: @ 816BCCD + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + special sub_8112364 + lock + faceplayer + call EventScript_16BCF6 + compare_var_to_value VAR_0x4001, 0 + goto_if 1, EventScript_16C00E + goto EventScript_16BD3E + end + +EventScript_16BCF6:: @ 816BCF6 + setvar VAR_0x4001, 0 + checkitem ITEM_FRESH_WATER, 1 + compare_var_to_value VAR_RESULT, 1 + call_if 1, EventScript_16BD2C + checkitem ITEM_SODA_POP, 1 + compare_var_to_value VAR_RESULT, 1 + call_if 1, EventScript_16BD32 + checkitem ITEM_LEMONADE, 1 + compare_var_to_value VAR_RESULT, 1 + call_if 1, EventScript_16BD38 + return + +EventScript_16BD2C:: @ 816BD2C + addvar VAR_0x4001, 1 + return + +EventScript_16BD32:: @ 816BD32 + addvar VAR_0x4001, 2 + return + +EventScript_16BD38:: @ 816BD38 + addvar VAR_0x4001, 4 + return + +EventScript_16BD3E:: @ 816BD3E + loadword 0, gUnknown_8195D22 + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16C00C + textcolor 3 + message Text_195D5F + waitmessage + textcolor 1 + copyvar VAR_0x8000, VAR_0x4001 + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_16BDAE + compare_var_to_value VAR_0x8000, 2 + goto_if 1, EventScript_16BDDA + compare_var_to_value VAR_0x8000, 3 + goto_if 1, EventScript_16BE06 + compare_var_to_value VAR_0x8000, 4 + goto_if 1, EventScript_16BE3D + compare_var_to_value VAR_0x8000, 5 + goto_if 1, EventScript_16BE69 + compare_var_to_value VAR_0x8000, 6 + goto_if 1, EventScript_16BEA0 + compare_var_to_value VAR_0x8000, 7 + goto_if 1, EventScript_16BED7 + end + +EventScript_16BDAE:: @ 816BDAE + multichoice 0, 0, 32, 0 + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_16BF19 + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_16C00C + compare_var_to_value VAR_0x8000, 127 + goto_if 1, EventScript_16C00C + end + +EventScript_16BDDA:: @ 816BDDA + multichoice 0, 0, 33, 0 + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_16BF3A + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_16C00C + compare_var_to_value VAR_0x8000, 127 + goto_if 1, EventScript_16C00C + end + +EventScript_16BE06:: @ 816BE06 + multichoice 0, 0, 34, 0 + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_16BF19 + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_16BF3A + compare_var_to_value VAR_0x8000, 2 + goto_if 1, EventScript_16C00C + compare_var_to_value VAR_0x8000, 127 + goto_if 1, EventScript_16C00C + end + +EventScript_16BE3D:: @ 816BE3D + multichoice 0, 0, 35, 0 + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_16BF5B + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_16C00C + compare_var_to_value VAR_0x8000, 127 + goto_if 1, EventScript_16C00C + end + +EventScript_16BE69:: @ 816BE69 + multichoice 0, 0, 36, 0 + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_16BF19 + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_16BF5B + compare_var_to_value VAR_0x8000, 2 + goto_if 1, EventScript_16C00C + compare_var_to_value VAR_0x8000, 127 + goto_if 1, EventScript_16C00C + end + +EventScript_16BEA0:: @ 816BEA0 + multichoice 0, 0, 37, 0 + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_16BF3A + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_16BF5B + compare_var_to_value VAR_0x8000, 2 + goto_if 1, EventScript_16C00C + compare_var_to_value VAR_0x8000, 127 + goto_if 1, EventScript_16C00C + end + +EventScript_16BED7:: @ 816BED7 + multichoice 0, 0, 38, 0 + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_16BF19 + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_16BF3A + compare_var_to_value VAR_0x8000, 2 + goto_if 1, EventScript_16BF5B + compare_var_to_value VAR_0x8000, 3 + goto_if 1, EventScript_16C00C + compare_var_to_value VAR_0x8000, 127 + goto_if 1, EventScript_16C00C + end + +EventScript_16BF19:: @ 816BF19 + setvar VAR_0x8008, 26 + setvar VAR_0x8009, 304 + checkflag FLAG_0x296 + goto_if 1, EventScript_16C018 + loadword 0, gUnknown_8195D75 + callstd 4 + goto EventScript_16BF7C + end + +EventScript_16BF3A:: @ 816BF3A + setvar VAR_0x8008, 27 + setvar VAR_0x8009, 308 + checkflag FLAG_0x295 + goto_if 1, EventScript_16C018 + loadword 0, gUnknown_8195E33 + callstd 4 + goto EventScript_16BF7C + end + +EventScript_16BF5B:: @ 816BF5B + setvar VAR_0x8008, 28 + setvar VAR_0x8009, 321 + checkflag FLAG_0x294 + goto_if 1, EventScript_16C018 + loadword 0, gUnknown_8195EBF + callstd 4 + goto EventScript_16BF7C + end + +EventScript_16BF7C:: @ 816BF7C + getitemname 0, 32776 + getitemname 1, 32777 + removeitem 32776, 1 + checkitemspace 32777, 1 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16C002 + additem 32777, 1 + textcolor 3 + playfanfare MUS_FANFA1 + message Text_195DAD + waitmessage + waitfanfare + setorcopyvar VAR_0x8000, VAR_0x8009 + setorcopyvar VAR_0x8001, 1 + callstd 8 + call EventScript_1A6675 + compare_var_to_value VAR_0x8008, 26 + call_if 1, EventScript_16BFDE + compare_var_to_value VAR_0x8008, 27 + call_if 1, EventScript_16BFEA + compare_var_to_value VAR_0x8008, 28 + call_if 1, EventScript_16BFF6 + release + end + +EventScript_16BFDE:: @ 816BFDE + setflag FLAG_0x296 + loadword 0, gUnknown_8195DD4 + callstd 4 + return + +EventScript_16BFEA:: @ 816BFEA + setflag FLAG_0x295 + loadword 0, gUnknown_8195E68 + callstd 4 + return + +EventScript_16BFF6:: @ 816BFF6 + setflag FLAG_0x294 + loadword 0, gUnknown_8195EF4 + callstd 4 + return + +EventScript_16C002:: @ 816C002 + loadword 0, gUnknown_8195F4F + callstd 4 + release + end + +EventScript_16C00C:: @ 816C00C + release + end + +EventScript_16C00E:: @ 816C00E + loadword 0, gUnknown_8195FEF + callstd 4 + release + end + +EventScript_16C018:: @ 816C018 + loadword 0, gUnknown_8195F6E + callstd 4 + release + end + +CeladonCity_DepartmentStore_Roof_EventScript_16C022:: @ 816C022 + loadword 0, gUnknown_8195F98 + callstd 2 + end + +CeladonCity_DepartmentStore_Roof_EventScript_16C02B:: @ 816C02B + loadword 0, gUnknown_8196017 + callstd 3 + end + +CeladonCity_DepartmentStore_Roof_EventScript_16C034:: @ 816C034 + lockall + message Text_196038 + waitmessage + showmoneybox 0, 0, 0 + goto EventScript_16C045 + end + +EventScript_16C045:: @ 816C045 + multichoice 12, 0, 26, 0 + copyvar VAR_0x4001, VAR_RESULT + copyvar VAR_0x8000, VAR_0x4001 + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_16C083 + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_16C094 + compare_var_to_value VAR_0x8000, 2 + goto_if 1, EventScript_16C0A5 + loadword 0, gUnknown_81960AE + callstd 4 + goto EventScript_16C14D + end + +EventScript_16C083:: @ 816C083 + setvar VAR_0x4000, 26 + checkmoney 200, 0 + goto EventScript_16C0CB + end + +EventScript_16C094:: @ 816C094 + setvar VAR_0x4000, 27 + checkmoney 300, 0 + goto EventScript_16C0CB + end + +EventScript_16C0A5:: @ 816C0A5 + setvar VAR_0x4000, 28 + checkmoney 350, 0 + goto EventScript_16C0CB + end + +EventScript_16C0B6:: @ 816C0B6 + takemoney 200, 0 + return + +EventScript_16C0BD:: @ 816C0BD + takemoney 300, 0 + return + +EventScript_16C0C4:: @ 816C0C4 + takemoney 350, 0 + return + +EventScript_16C0CB:: @ 816C0CB + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16C131 + checkitemspace 16384, 1 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16C13F + compare_var_to_value VAR_0x4001, 0 + call_if 1, EventScript_16C0B6 + compare_var_to_value VAR_0x4001, 1 + call_if 1, EventScript_16C0BD + compare_var_to_value VAR_0x4001, 2 + call_if 1, EventScript_16C0C4 + updatemoneybox 0, 0, 0 + getitemname 0, 16384 + playse SE_C_PASI + loadword 0, gUnknown_8196076 + callstd 4 + additem 16384, 1 + goto EventScript_16C125 + end + +EventScript_16C125:: @ 816C125 + message Text_196038 + waitmessage + goto EventScript_16C045 + end + +EventScript_16C131:: @ 816C131 + loadword 0, gUnknown_819605E + callstd 4 + goto EventScript_16C14D + end + +EventScript_16C13F:: @ 816C13F + loadword 0, gUnknown_819608E + callstd 4 + goto EventScript_16C14D + end + +EventScript_16C14D:: @ 816C14D + hidemoneybox + .byte 0 + .byte 0 + releaseall + end diff --git a/data/maps/CeladonCity_GameCorner/scripts.inc b/data/maps/CeladonCity_GameCorner/scripts.inc new file mode 100644 index 000000000..d32aa8afd --- /dev/null +++ b/data/maps/CeladonCity_GameCorner/scripts.inc @@ -0,0 +1,524 @@ +CeladonCity_GameCorner_MapScripts:: @ 816C646 + map_script 1, CeladonCity_GameCorner_MapScript1_16C64C + .byte 0 + +CeladonCity_GameCorner_MapScript1_16C64C:: @ 816C64C + checkflag FLAG_0x26D + call_if 0, EventScript_16C656 + end + +EventScript_16C656:: @ 816C656 + setmetatile 15, 2, 658, 0 + setmetatile 16, 2, 658, 0 + setmetatile 17, 2, 658, 0 + setmetatile 16, 3, 719, 1 + setmetatile 17, 3, 719, 1 + return + +CeladonCity_GameCorner_EventScript_16C684:: @ 816C684 + loadword 0, gUnknown_8196940 + callstd 2 + end + +CeladonCity_GameCorner_EventScript_16C68D:: @ 816C68D + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + lock + faceplayer + showmoneybox 0, 0, 0 + showcoinsbox 0, 5 + message Text_196984 + waitmessage + multichoice 13, 0, 27, 0 + copyvar VAR_0x8009, VAR_RESULT + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_16C6E6 + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_16C6E6 + compare_var_to_value VAR_0x8000, 2 + goto_if 1, EventScript_16C782 + compare_var_to_value VAR_0x8000, 127 + goto_if 1, EventScript_16C782 + end + +EventScript_16C6E6:: @ 816C6E6 + checkflag FLAG_0x243 + goto_if 0, EventScript_16C790 + compare_var_to_value VAR_0x8009, 0 + goto_if 1, EventScript_16C734 + compare_var_to_value VAR_0x8009, 1 + goto_if 1, EventScript_16C706 + end + +EventScript_16C706:: @ 816C706 + checkcoins VAR_0x4001 + compare_var_to_value VAR_0x4001, 9500 + goto_if 4, EventScript_16C79E + checkmoney 10000, 0 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16C7AC + givecoins 500 + takemoney 10000, 0 + goto EventScript_16C762 + end + +EventScript_16C734:: @ 816C734 + checkcoins VAR_0x4001 + compare_var_to_value VAR_0x4001, 9950 + goto_if 4, EventScript_16C79E + checkmoney 1000, 0 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16C7AC + givecoins 50 + takemoney 1000, 0 + goto EventScript_16C762 + end + +EventScript_16C762:: @ 816C762 + updatemoneybox 0, 0, 0 + updatecoinsbox 0, 5 + playse 248 + loadword 0, gUnknown_8196A62 + callstd 4 + goto EventScript_16C77A + end + +EventScript_16C77A:: @ 816C77A + hidemoneybox + .byte 0 + .byte 0 + hidecoinsbox 0, 5 + release + end + +EventScript_16C782:: @ 816C782 + loadword 0, gUnknown_81969DC + callstd 4 + goto EventScript_16C77A + end + +EventScript_16C790:: @ 816C790 + loadword 0, gUnknown_81969FB + callstd 4 + goto EventScript_16C77A + end + +EventScript_16C79E:: @ 816C79E + loadword 0, gUnknown_8196A26 + callstd 4 + goto EventScript_16C77A + end + +EventScript_16C7AC:: @ 816C7AC + loadword 0, gUnknown_8196A46 + callstd 4 + goto EventScript_16C77A + end + +CeladonCity_GameCorner_EventScript_16C7BA:: @ 816C7BA + lock + faceplayer + loadword 0, gUnknown_8196A82 + callstd 4 + goto EventScript_16C7CA + end + +EventScript_16C7CA:: @ 816C7CA + closemessage + applymovement VAR_LAST_TALKED, Movement_1A75E5 + waitmovement 0 + release + end + +CeladonCity_GameCorner_EventScript_16C7D7:: @ 816C7D7 + lock + faceplayer + loadword 0, gUnknown_8196AC7 + callstd 4 + goto EventScript_16C7CA + end + +CeladonCity_GameCorner_EventScript_16C7E7:: @ 816C7E7 + lock + faceplayer + checkflag FLAG_0x26E + goto_if 1, EventScript_16C849 + loadword 0, gUnknown_8196AF3 + callstd 4 + checkflag FLAG_0x243 + goto_if 0, EventScript_16C839 + checkcoins VAR_0x4001 + compare_var_to_value VAR_0x4001, 9990 + goto_if 4, EventScript_16C82B + givecoins 10 + textcolor 3 + loadword 0, gUnknown_8196B0D + callstd 4 + playse 248 + waitse + setflag FLAG_0x26E + goto EventScript_16C7CA + end + +EventScript_16C82B:: @ 816C82B + loadword 0, gUnknown_8196B30 + callstd 4 + goto EventScript_16C7CA + end + +EventScript_16C839:: @ 816C839 + textcolor 3 + loadword 0, gUnknown_8196F26 + callstd 4 + goto EventScript_16C7CA + end + +EventScript_16C849:: @ 816C849 + loadword 0, gUnknown_8196B49 + callstd 4 + goto EventScript_16C7CA + end + +CeladonCity_GameCorner_EventScript_16C857:: @ 816C857 + lock + faceplayer + checkflag FLAG_0x4B3 + goto_if 1, EventScript_16C870 + loadword 0, gUnknown_8196BAD + callstd 4 + goto EventScript_16C7CA + end + +EventScript_16C870:: @ 816C870 + loadword 0, gUnknown_8196CA1 + callstd 4 + goto EventScript_16C7CA + end + +CeladonCity_GameCorner_EventScript_16C87E:: @ 816C87E + lock + faceplayer + loadword 0, gUnknown_8196B7B + callstd 4 + goto EventScript_16C7CA + end + +CeladonCity_GameCorner_EventScript_16C88E:: @ 816C88E + lock + faceplayer + loadword 0, gUnknown_8196CFE + callstd 4 + goto EventScript_16C7CA + end + +CeladonCity_GameCorner_EventScript_16C89E:: @ 816C89E + lock + faceplayer + checkflag FLAG_0x26F + goto_if 1, EventScript_16C8F0 + loadword 0, gUnknown_8196D2B + callstd 4 + checkflag FLAG_0x243 + goto_if 0, EventScript_16C839 + checkcoins VAR_0x4001 + compare_var_to_value VAR_0x4001, 9980 + goto_if 4, EventScript_16C8E2 + givecoins 20 + textcolor 3 + loadword 0, gUnknown_8196D47 + callstd 4 + playse 248 + waitse + setflag FLAG_0x26F + goto EventScript_16C7CA + end + +EventScript_16C8E2:: @ 816C8E2 + loadword 0, gUnknown_8196D6F + callstd 4 + goto EventScript_16C7CA + end + +EventScript_16C8F0:: @ 816C8F0 + loadword 0, gUnknown_8196D87 + callstd 4 + goto EventScript_16C7CA + end + +CeladonCity_GameCorner_EventScript_16C8FE:: @ 816C8FE + lock + faceplayer + checkflag FLAG_0x270 + goto_if 1, EventScript_16C950 + loadword 0, gUnknown_8196DB7 + callstd 4 + checkflag FLAG_0x243 + goto_if 0, EventScript_16C839 + checkcoins VAR_0x4001 + compare_var_to_value VAR_0x4001, 9980 + goto_if 4, EventScript_16C942 + givecoins 20 + textcolor 3 + loadword 0, gUnknown_8196DF8 + callstd 4 + playse 248 + waitse + setflag FLAG_0x270 + goto EventScript_16C7CA + end + +EventScript_16C942:: @ 816C942 + loadword 0, gUnknown_8196E1B + callstd 4 + goto EventScript_16C7CA + end + +EventScript_16C950:: @ 816C950 + loadword 0, gUnknown_8196E40 + callstd 4 + goto EventScript_16C7CA + end + +CeladonCity_GameCorner_EventScript_16C95E:: @ 816C95E + lockall + setvar VAR_0x8004, 0 + goto EventScript_16C96C + end + +EventScript_16C96A:: @ 816C96A + releaseall + end + +EventScript_16C96C:: @ 816C96C + checkflag FLAG_0x243 + goto_if 0, EventScript_16CAA0 + loadword 0, gUnknown_8196F46 + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16C96A + setfieldeffectarg 0, 255 + setfieldeffectarg 1, 10 + setfieldeffectarg 2, 14 + dofieldeffect 64 + waitfieldeffect 64 + specialvar VAR_RESULT, sub_80CAABC + playslotmachine VAR_RESULT + releaseall + end + +CeladonCity_GameCorner_EventScript_16C9A4:: @ 816C9A4 + lockall + setvar VAR_0x8004, 1 + goto EventScript_16C96C + end + +CeladonCity_GameCorner_EventScript_16C9B0:: @ 816C9B0 + lockall + setvar VAR_0x8004, 2 + goto EventScript_16C96C + end + +CeladonCity_GameCorner_EventScript_16C9BC:: @ 816C9BC + lockall + setvar VAR_0x8004, 3 + goto EventScript_16C96C + end + +EventScript_16C9C8:: @ 816C9C8 + lockall + setvar VAR_0x8004, 4 + goto EventScript_16C96C + end + +CeladonCity_GameCorner_EventScript_16C9D4:: @ 816C9D4 + lockall + setvar VAR_0x8004, 5 + goto EventScript_16C96C + end + +CeladonCity_GameCorner_EventScript_16C9E0:: @ 816C9E0 + lockall + setvar VAR_0x8004, 6 + goto EventScript_16C96C + end + +CeladonCity_GameCorner_EventScript_16C9EC:: @ 816C9EC + lockall + setvar VAR_0x8004, 7 + goto EventScript_16C96C + end + +CeladonCity_GameCorner_EventScript_16C9F8:: @ 816C9F8 + lockall + setvar VAR_0x8004, 8 + goto EventScript_16C96C + end + +CeladonCity_GameCorner_EventScript_16CA04:: @ 816CA04 + lockall + setvar VAR_0x8004, 9 + goto EventScript_16C96C + end + +CeladonCity_GameCorner_EventScript_16CA10:: @ 816CA10 + lockall + setvar VAR_0x8004, 10 + goto EventScript_16C96C + end + +CeladonCity_GameCorner_EventScript_16CA1C:: @ 816CA1C + lockall + setvar VAR_0x8004, 11 + goto EventScript_16C96C + end + +CeladonCity_GameCorner_EventScript_16CA28:: @ 816CA28 + lockall + setvar VAR_0x8004, 12 + goto EventScript_16C96C + end + +CeladonCity_GameCorner_EventScript_16CA34:: @ 816CA34 + lockall + setvar VAR_0x8004, 13 + goto EventScript_16C96C + end + +CeladonCity_GameCorner_EventScript_16CA40:: @ 816CA40 + lockall + setvar VAR_0x8004, 14 + goto EventScript_16C96C + end + +EventScript_16CA4C:: @ 816CA4C + lockall + setvar VAR_0x8004, 15 + goto EventScript_16C96C + end + +CeladonCity_GameCorner_EventScript_16CA58:: @ 816CA58 + lockall + setvar VAR_0x8004, 16 + goto EventScript_16C96C + end + +CeladonCity_GameCorner_EventScript_16CA64:: @ 816CA64 + lockall + setvar VAR_0x8004, 17 + goto EventScript_16C96C + end + +EventScript_16CA70:: @ 816CA70 + lockall + setvar VAR_0x8004, 18 + goto EventScript_16C96C + end + +CeladonCity_GameCorner_EventScript_16CA7C:: @ 816CA7C + lockall + setvar VAR_0x8004, 19 + goto EventScript_16C96C + end + +CeladonCity_GameCorner_EventScript_16CA88:: @ 816CA88 + lockall + setvar VAR_0x8004, 20 + goto EventScript_16C96C + end + +CeladonCity_GameCorner_EventScript_16CA94:: @ 816CA94 + lockall + setvar VAR_0x8004, 21 + goto EventScript_16C96C + end + +EventScript_16CAA0:: @ 816CAA0 + loadword 0, gUnknown_8196F0D + callstd 4 + releaseall + end + +CeladonCity_GameCorner_EventScript_16CAAA:: @ 816CAAA + lockall + loadword 0, gUnknown_8196EDC + callstd 4 + checkflag FLAG_0x26D + call_if 0, EventScript_16CABE + releaseall + end + +EventScript_16CABE:: @ 816CABE + playse SE_FU_ZAKU2 + setmetatile 15, 2, 669, 0 + setmetatile 16, 2, 670, 1 + setmetatile 17, 2, 671, 1 + setmetatile 16, 3, 678, 1 + setmetatile 17, 3, 679, 1 + special DrawWholeMapView + setflag FLAG_0x26D + return + +CeladonCity_GameCorner_EventScript_16CAF5:: @ 816CAF5 + trainerbattle 2, 357, 0, Text_196E69, Text_196E95, EventScript_16CB10 + loadword 0, gUnknown_8196E9B + callstd 6 + end + +EventScript_16CB10:: @ 816CB10 + loadword 0, gUnknown_8196E9B + callstd 4 + closemessage + compare_var_to_value VAR_FACING, 3 + call_if 1, EventScript_16CB34 + compare_var_to_value VAR_FACING, 3 + call_if 5, EventScript_16CB3F + removeobject 11 + release + end + +EventScript_16CB34:: @ 816CB34 + applymovement 11, Movement_16CB4A + waitmovement 0 + return + +EventScript_16CB3F:: @ 816CB3F + applymovement 11, Movement_16CB53 + waitmovement 0 + return + +Movement_16CB4A:: @ 816CB4A + step_10 + step_13 + step_13 + step_11 + step_13 + step_13 + step_13 + step_13 + step_end + +Movement_16CB53:: @ 816CB53 + step_13 + step_13 + step_13 + step_13 + step_13 + step_13 + step_end + +CeladonCity_GameCorner_EventScript_16CB5A:: @ 816CB5A + loadword 0, gUnknown_8196F64 + callstd 3 + end + +CeladonCity_GameCorner_EventScript_16CB63:: @ 816CB63 + loadword 0, gUnknown_8196F81 + callstd 3 + end + +CeladonCity_GameCorner_EventScript_16CB6C:: @ 816CB6C + loadword 0, gUnknown_8196FA0 + callstd 3 + end diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc new file mode 100644 index 000000000..8b71e03c2 --- /dev/null +++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc @@ -0,0 +1,387 @@ +CeladonCity_GameCorner_PrizeRoom_MapScripts:: @ 816CB75 + .byte 0 + +CeladonCity_GameCorner_PrizeRoom_EventScript_16CB76:: @ 816CB76 + loadword 0, gUnknown_8196FC1 + callstd 2 + end + +CeladonCity_GameCorner_PrizeRoom_EventScript_16CB7F:: @ 816CB7F + loadword 0, gUnknown_8196FFF + callstd 2 + end + +CeladonCity_GameCorner_PrizeRoom_EventScript_16CB88:: @ 816CB88 + lock + faceplayer + checkflag FLAG_0x243 + goto_if 0, EventScript_16CD99 + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + showcoinsbox 0, 0 + loadword 0, gUnknown_8197057 + callstd 4 + goto EventScript_16CBB2 + end + +EventScript_16CBB2:: @ 816CBB2 + message Text_19707A + waitmessage + multichoice 11, 0, 14, 0 + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_16CC15 + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_16CC25 + compare_var_to_value VAR_0x8000, 2 + goto_if 1, EventScript_16CC35 + compare_var_to_value VAR_0x8000, 3 + goto_if 1, EventScript_16CC45 + compare_var_to_value VAR_0x8000, 4 + goto_if 1, EventScript_16CC55 + compare_var_to_value VAR_0x8000, 5 + goto_if 1, EventScript_16CC10 + compare_var_to_value VAR_0x8000, 127 + goto_if 1, EventScript_16CC10 + end + +EventScript_16CC10:: @ 816CC10 + hidecoinsbox 0, 0 + release + end + +EventScript_16CC15:: @ 816CC15 + setvar VAR_0x4001, 63 + setvar VAR_0x4002, 180 + goto EventScript_16CC65 + end + +EventScript_16CC25:: @ 816CC25 + setvar VAR_0x4001, 35 + setvar VAR_0x4002, 500 + goto EventScript_16CC65 + end + +EventScript_16CC35:: @ 816CC35 + setvar VAR_0x4001, 147 + setvar VAR_0x4002, 2800 + goto EventScript_16CC65 + end + +EventScript_16CC45:: @ 816CC45 + setvar VAR_0x4001, 123 + setvar VAR_0x4002, 5500 + goto EventScript_16CC65 + end + +EventScript_16CC55:: @ 816CC55 + setvar VAR_0x4001, 137 + setvar VAR_0x4002, 9999 + goto EventScript_16CC65 + end + +EventScript_16CC65:: @ 816CC65 + getspeciesname 0, 16385 + loadword 0, gUnknown_819709D + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16CC10 + checkcoins VAR_RESULT + compare_var_to_var VAR_RESULT, VAR_0x4002 + goto_if 0, EventScript_16CDA5 + textcolor 3 + copyvar VAR_0x8000, VAR_0x4001 + compare_var_to_value VAR_0x8000, 63 + goto_if 1, EventScript_16CCD4 + compare_var_to_value VAR_0x8000, 35 + goto_if 1, EventScript_16CCE9 + compare_var_to_value VAR_0x8000, 147 + goto_if 1, EventScript_16CCFE + compare_var_to_value VAR_0x8000, 123 + goto_if 1, EventScript_16CD13 + compare_var_to_value VAR_0x8000, 137 + goto_if 1, EventScript_16CD28 + compare_var_to_value VAR_0x8000, 127 + goto_if 1, EventScript_16CD3D + end + +EventScript_16CCD4:: @ 816CCD4 + givemon 16385, 9, ITEM_NONE, 0, 0, 0 + goto EventScript_16CD52 + end + +EventScript_16CCE9:: @ 816CCE9 + givemon 16385, 8, ITEM_NONE, 0, 0, 0 + goto EventScript_16CD52 + end + +EventScript_16CCFE:: @ 816CCFE + givemon 16385, 18, ITEM_NONE, 0, 0, 0 + goto EventScript_16CD52 + end + +EventScript_16CD13:: @ 816CD13 + givemon 16385, 25, ITEM_NONE, 0, 0, 0 + goto EventScript_16CD52 + end + +EventScript_16CD28:: @ 816CD28 + givemon 16385, 26, ITEM_NONE, 0, 0, 0 + goto EventScript_16CD52 + end + +EventScript_16CD3D:: @ 816CD3D + givemon 16385, 18, ITEM_NONE, 0, 0, 0 + goto EventScript_16CD52 + end + +EventScript_16CD52:: @ 816CD52 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16CDB3 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16CDE0 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_16CD74 + end + +EventScript_16CD74:: @ 816CD74 + textcolor 3 + loadword 0, gUnknown_81A5E31 + callstd 4 + hidecoinsbox 0, 0 + release + end + +EventScript_16CD83:: @ 816CD83 + countpokemon + subvar VAR_RESULT, 1 + copyvar VAR_0x8004, VAR_RESULT + call EventScript_1A74EB + goto EventScript_16CC10 + end + +EventScript_16CD99:: @ 816CD99 + textcolor 3 + loadword 0, gUnknown_819703E + callstd 4 + release + end + +EventScript_16CDA5:: @ 816CDA5 + loadword 0, gUnknown_81970D5 + callstd 4 + goto EventScript_16CC10 + end + +EventScript_16CDB3:: @ 816CDB3 + takecoins VAR_0x4002 + updatecoinsbox 0, 5 + getspeciesname 0, 16385 + playfanfare MUS_FANFA1 + message Text_1A5DF1 + waitmessage + waitfanfare + loadword 0, gUnknown_81A56A7 + callstd 5 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16CD83 + goto EventScript_16CC10 + end + +EventScript_16CDE0:: @ 816CDE0 + takecoins VAR_0x4002 + updatecoinsbox 0, 5 + getspeciesname 0, 16385 + playfanfare MUS_FANFA1 + message Text_1A5DF1 + waitmessage + waitfanfare + loadword 0, gUnknown_81A56A7 + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16CE12 + call EventScript_1A8C33 + goto EventScript_16CE12 + end + +EventScript_16CE12:: @ 816CE12 + call EventScript_1A8C3C + goto EventScript_16CC10 + end + +CeladonCity_GameCorner_PrizeRoom_EventScript_16CE1D:: @ 816CE1D + lock + faceplayer + checkflag FLAG_0x243 + goto_if 0, EventScript_16CD99 + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + showcoinsbox 0, 0 + loadword 0, gUnknown_8197057 + callstd 4 + goto EventScript_16CE47 + end + +EventScript_16CE47:: @ 816CE47 + message Text_19707A + waitmessage + multichoice 11, 0, 30, 0 + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_16CEA5 + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_16CEB9 + compare_var_to_value VAR_0x8000, 2 + goto_if 1, EventScript_16CECD + compare_var_to_value VAR_0x8000, 3 + goto_if 1, EventScript_16CEE1 + compare_var_to_value VAR_0x8000, 4 + goto_if 1, EventScript_16CEF5 + compare_var_to_value VAR_0x8000, 5 + goto_if 1, EventScript_16CC10 + compare_var_to_value VAR_0x8000, 127 + goto_if 1, EventScript_16CC10 + end + +EventScript_16CEA5:: @ 816CEA5 + setvar VAR_0x4001, 301 + setvar VAR_0x4002, 4000 + getmovename 1, MOVE_ICE_BEAM + goto EventScript_16CF09 + end + +EventScript_16CEB9:: @ 816CEB9 + setvar VAR_0x4001, 311 + setvar VAR_0x4002, 3500 + getmovename 1, MOVE_IRON_TAIL + goto EventScript_16CF09 + end + +EventScript_16CECD:: @ 816CECD + setvar VAR_0x4001, 312 + setvar VAR_0x4002, 4000 + getmovename 1, MOVE_THUNDERBOLT + goto EventScript_16CF09 + end + +EventScript_16CEE1:: @ 816CEE1 + setvar VAR_0x4001, 318 + setvar VAR_0x4002, 4500 + getmovename 1, MOVE_SHADOW_BALL + goto EventScript_16CF09 + end + +EventScript_16CEF5:: @ 816CEF5 + setvar VAR_0x4001, 323 + setvar VAR_0x4002, 4000 + getmovename 1, MOVE_FLAMETHROWER + goto EventScript_16CF09 + end + +EventScript_16CF09:: @ 816CF09 + loadword 0, gUnknown_81970B2 + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16CC10 + goto EventScript_16CF3F + end + +EventScript_16CF22:: @ 816CF22 + getitemname 0, 16385 + loadword 0, gUnknown_819709D + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16CC10 + goto EventScript_16CF3F + end + +EventScript_16CF3F:: @ 816CF3F + getitemname 0, 16385 + checkcoins VAR_RESULT + compare_var_to_var VAR_RESULT, VAR_0x4002 + goto_if 0, EventScript_16CDA5 + checkitemspace 16385, 1 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16CF79 + takecoins VAR_0x4002 + updatecoinsbox 0, 5 + setorcopyvar VAR_0x8000, VAR_0x4001 + setorcopyvar VAR_0x8001, 1 + callstd 0 + goto EventScript_16CC10 + end + +EventScript_16CF79:: @ 816CF79 + textcolor 3 + loadword 0, gUnknown_81A5242 + callstd 4 + hidecoinsbox 0, 0 + release + end + +CeladonCity_GameCorner_PrizeRoom_EventScript_16CF88:: @ 816CF88 + lock + faceplayer + checkflag FLAG_0x243 + goto_if 0, EventScript_16CD99 + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + showcoinsbox 0, 0 + loadword 0, gUnknown_8197057 + callstd 4 + goto EventScript_16CFB2 + end + +EventScript_16CFB2:: @ 816CFB2 + message Text_19707A + waitmessage + multichoice 10, 0, 41, 0 + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_16D010 + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_16D020 + compare_var_to_value VAR_0x8000, 2 + goto_if 1, EventScript_16D030 + compare_var_to_value VAR_0x8000, 3 + goto_if 1, EventScript_16D040 + compare_var_to_value VAR_0x8000, 4 + goto_if 1, EventScript_16D050 + compare_var_to_value VAR_0x8000, 5 + goto_if 1, EventScript_16CC10 + compare_var_to_value VAR_0x8000, 127 + goto_if 1, EventScript_16CC10 + end + +EventScript_16D010:: @ 816D010 + setvar VAR_0x4001, 194 + setvar VAR_0x4002, 800 + goto EventScript_16CF22 + end + +EventScript_16D020:: @ 816D020 + setvar VAR_0x4001, 205 + setvar VAR_0x4002, 1000 + goto EventScript_16CF22 + end + +EventScript_16D030:: @ 816D030 + setvar VAR_0x4001, 215 + setvar VAR_0x4002, 1000 + goto EventScript_16CF22 + end + +EventScript_16D040:: @ 816D040 + setvar VAR_0x4001, 209 + setvar VAR_0x4002, 1000 + goto EventScript_16CF22 + end + +EventScript_16D050:: @ 816D050 + setvar VAR_0x4001, 40 + setvar VAR_0x4002, 1600 + goto EventScript_16CF22 + end diff --git a/data/maps/CeladonCity_Gym/scripts.inc b/data/maps/CeladonCity_Gym/scripts.inc new file mode 100644 index 000000000..298c4a7da --- /dev/null +++ b/data/maps/CeladonCity_Gym/scripts.inc @@ -0,0 +1,116 @@ +CeladonCity_Gym_MapScripts:: @ 816D060 + .byte 0 + +CeladonCity_Gym_EventScript_16D061:: @ 816D061 + setvar VAR_0x8004, 5 + setvar VAR_0x8005, 2 + special UpdatePickStateFromSpecialVar8005 + trainerbattle 1, 417, 0, Text_197114, Text_197260, EventScript_16D0A0 + checkflag FLAG_0x293 + goto_if 0, EventScript_16D0C6 + setvar VAR_0x8004, 5 + setvar VAR_0x8005, 4 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_81972B8 + callstd 4 + release + end + +EventScript_16D0A0:: @ 816D0A0 + setvar VAR_0x8004, 5 + setvar VAR_0x8005, 1 + special SetFlavorTextFlagFromSpecialVars + clearflag FLAG_0x09E + setflag FLAG_0x4B3 + setflag 2083 + setvar VAR_0x8008, 4 + call EventScript_1A6B18 + goto EventScript_16D0C6 + end + +EventScript_16D0C6:: @ 816D0C6 + loadword 0, gUnknown_8197327 + callstd 4 + checkitemspace ITEM_TM19, 1 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16D107 + additem ITEM_TM19, 1 + loadword 0, gUnknown_81973BA + setorcopyvar VAR_0x8000, 307 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 257 + callstd 9 + setflag FLAG_0x293 + loadword 0, gUnknown_81973D7 + callstd 4 + release + end + +EventScript_16D107:: @ 816D107 + loadword 0, gUnknown_819745D + callstd 4 + release + end + +CeladonCity_Gym_EventScript_16D111:: @ 816D111 + trainerbattle 0, 132, 0, Text_19747C, Text_1974C4 + loadword 0, gUnknown_81974D6 + callstd 6 + end + +CeladonCity_Gym_EventScript_16D128:: @ 816D128 + trainerbattle 0, 133, 0, Text_1976C5, Text_1976FF + setvar VAR_0x8004, 5 + setvar VAR_0x8005, 2 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_8197708 + callstd 6 + end + +CeladonCity_Gym_EventScript_16D14C:: @ 816D14C + trainerbattle 0, 160, 0, Text_197595, Text_1975BB + loadword 0, gUnknown_81975D1 + callstd 6 + end + +CeladonCity_Gym_EventScript_16D163:: @ 816D163 + trainerbattle 0, 265, 0, Text_1974FA, Text_19751C + loadword 0, gUnknown_8197527 + callstd 6 + end + +CeladonCity_Gym_EventScript_16D17A:: @ 816D17A + trainerbattle 0, 266, 0, Text_19760B, Text_197660 + setvar VAR_0x8004, 5 + setvar VAR_0x8005, 3 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_8197664 + callstd 6 + end + +CeladonCity_Gym_EventScript_16D19E:: @ 816D19E + trainerbattle 0, 267, 0, Text_197747, Text_19777A + loadword 0, gUnknown_8197788 + callstd 6 + end + +CeladonCity_Gym_EventScript_16D1B5:: @ 816D1B5 + trainerbattle 0, 402, 0, Text_1977E5, Text_197832 + loadword 0, gUnknown_819783E + callstd 6 + end + +CeladonCity_Gym_EventScript_16D1CC:: @ 816D1CC + lockall + checkflag 2083 + goto_if 1, EventScript_16D1E0 + loadword 0, gUnknown_8197874 + callstd 4 + releaseall + end + +EventScript_16D1E0:: @ 816D1E0 + loadword 0, gUnknown_81978AB + callstd 4 + releaseall + end diff --git a/data/maps/CeladonCity_Hotel/scripts.inc b/data/maps/CeladonCity_Hotel/scripts.inc new file mode 100644 index 000000000..51a5ba906 --- /dev/null +++ b/data/maps/CeladonCity_Hotel/scripts.inc @@ -0,0 +1,22 @@ +CeladonCity_Hotel_MapScripts:: @ 816D283 + .byte 0 + +CeladonCity_Hotel_EventScript_16D284:: @ 816D284 + loadword 0, gUnknown_8197B77 + callstd 2 + end + +CeladonCity_Hotel_EventScript_16D28D:: @ 816D28D + loadword 0, gUnknown_8197BBE + callstd 2 + end + +CeladonCity_Hotel_EventScript_16D296:: @ 816D296 + loadword 0, gUnknown_8197C0C + callstd 2 + end + +CeladonCity_Hotel_EventScript_16D29F:: @ 816D29F + loadword 0, gUnknown_8197C30 + callstd 2 + end diff --git a/data/maps/CeladonCity_House1/scripts.inc b/data/maps/CeladonCity_House1/scripts.inc new file mode 100644 index 000000000..22d98478b --- /dev/null +++ b/data/maps/CeladonCity_House1/scripts.inc @@ -0,0 +1,17 @@ +CeladonCity_House1_MapScripts:: @ 816D267 + .byte 0 + +CeladonCity_House1_EventScript_16D268:: @ 816D268 + loadword 0, gUnknown_8197A9F + callstd 2 + end + +CeladonCity_House1_EventScript_16D271:: @ 816D271 + loadword 0, gUnknown_8197AD3 + callstd 2 + end + +CeladonCity_House1_EventScript_16D27A:: @ 816D27A + loadword 0, gUnknown_8197B20 + callstd 2 + end diff --git a/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc b/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc new file mode 100644 index 000000000..adb65d7d3 --- /dev/null +++ b/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc @@ -0,0 +1,30 @@ +CeladonCity_PokemonCenter_1F_MapScripts:: @ 816C5EC + map_script 3, CeladonCity_PokemonCenter_1F_MapScript1_16C5F7 + map_script 5, CeladonCity_PokemonCenter_1F_MapScript2_1BC05C + .byte 0 + +CeladonCity_PokemonCenter_1F_MapScript1_16C5F7:: @ 816C5F7 + setrespawn 7 + end + +CeladonCity_PokemonCenter_1F_EventScript_16C5FB:: @ 816C5FB + lock + faceplayer + call EventScript_1A6578 + release + end + +CeladonCity_PokemonCenter_1F_EventScript_16C604:: @ 816C604 + loadword 0, gUnknown_819685B + callstd 2 + end + +CeladonCity_PokemonCenter_1F_EventScript_16C60D:: @ 816C60D + loadword 0, gUnknown_81968C2 + callstd 2 + end + +CeladonCity_PokemonCenter_1F_EventScript_16C616:: @ 816C616 + loadword 0, gUnknown_8196913 + callstd 2 + end diff --git a/data/maps/CeladonCity_PokemonCenter_2F/scripts.inc b/data/maps/CeladonCity_PokemonCenter_2F/scripts.inc new file mode 100644 index 000000000..08ce23ad1 --- /dev/null +++ b/data/maps/CeladonCity_PokemonCenter_2F/scripts.inc @@ -0,0 +1,18 @@ +CeladonCity_PokemonCenter_2F_MapScripts:: @ 816C61F + map_script 2, CeladonCity_PokemonCenter_2F_MapScript1_1BB2A3 + map_script 4, CeladonCity_PokemonCenter_2F_MapScript2_1BB1ED + map_script 1, CeladonCity_PokemonCenter_2F_MapScript3_1BB237 + map_script 3, CeladonCity_PokemonCenter_2F_MapScript4_1BB1B4 + .byte 0 + +CeladonCity_PokemonCenter_2F_EventScript_16C634:: @ 816C634 + call EventScript_1BB4A3 + end + +EventScript_16C63A:: @ 816C63A + call EventScript_1BB6AB + end + +EventScript_16C640:: @ 816C640 + call EventScript_1BB7DE + end diff --git a/data/maps/CeladonCity_Restaurant/scripts.inc b/data/maps/CeladonCity_Restaurant/scripts.inc new file mode 100644 index 000000000..2b84f09f0 --- /dev/null +++ b/data/maps/CeladonCity_Restaurant/scripts.inc @@ -0,0 +1,54 @@ +CeladonCity_Restaurant_MapScripts:: @ 816D1EA + .byte 0 + +CeladonCity_Restaurant_EventScript_16D1EB:: @ 816D1EB + loadword 0, gUnknown_81978E6 + callstd 2 + end + +CeladonCity_Restaurant_EventScript_16D1F4:: @ 816D1F4 + loadword 0, gUnknown_8197915 + callstd 2 + end + +CeladonCity_Restaurant_EventScript_16D1FD:: @ 816D1FD + lock + faceplayer + checkflag FLAG_0x243 + goto_if 1, EventScript_16D24B + loadword 0, gUnknown_81979C1 + callstd 4 + checkitemspace ITEM_COIN_CASE, 1 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16D241 + additem ITEM_COIN_CASE, 1 + loadword 0, gUnknown_8197A38 + setorcopyvar VAR_0x8000, 260 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 257 + callstd 9 + setflag FLAG_0x243 + release + end + +EventScript_16D241:: @ 816D241 + loadword 0, gUnknown_8197A5E + callstd 4 + release + end + +EventScript_16D24B:: @ 816D24B + loadword 0, gUnknown_8197A72 + callstd 4 + release + end + +CeladonCity_Restaurant_EventScript_16D255:: @ 816D255 + loadword 0, gUnknown_8197952 + callstd 2 + end + +CeladonCity_Restaurant_EventScript_16D25E:: @ 816D25E + loadword 0, gUnknown_819798A + callstd 2 + end diff --git a/data/maps/CeruleanCave_1F/scripts.inc b/data/maps/CeruleanCave_1F/scripts.inc new file mode 100644 index 000000000..be15e9b22 --- /dev/null +++ b/data/maps/CeruleanCave_1F/scripts.inc @@ -0,0 +1,7 @@ +CeruleanCave_1F_MapScripts:: @ 81624B3 + map_script 3, CeruleanCave_1F_MapScript1_1624B9 + .byte 0 + +CeruleanCave_1F_MapScript1_1624B9:: @ 81624B9 + setworldmapflag 2227 + end diff --git a/data/maps/CeruleanCave_2F/scripts.inc b/data/maps/CeruleanCave_2F/scripts.inc new file mode 100644 index 000000000..a950a3854 --- /dev/null +++ b/data/maps/CeruleanCave_2F/scripts.inc @@ -0,0 +1,2 @@ +CeruleanCave_2F_MapScripts:: @ 81624BD + .byte 0 diff --git a/data/maps/CeruleanCave_B1F/scripts.inc b/data/maps/CeruleanCave_B1F/scripts.inc new file mode 100644 index 000000000..983fea617 --- /dev/null +++ b/data/maps/CeruleanCave_B1F/scripts.inc @@ -0,0 +1,70 @@ +CeruleanCave_B1F_MapScripts:: @ 81624BE + map_script 5, CeruleanCave_B1F_MapScript1_1624C9 + map_script 3, CeruleanCave_B1F_MapScript2_1624E7 + .byte 0 + +CeruleanCave_B1F_MapScript1_1624C9:: @ 81624C9 + checkflag 2055 + call_if 1, EventScript_1624D3 + end + +EventScript_1624D3:: @ 81624D3 + specialvar VAR_RESULT, sub_80CA74C + compare_var_to_value VAR_RESULT, 7 + goto_if 5, EventScript_1A77A9 + removeobject VAR_LAST_TALKED + return + +CeruleanCave_B1F_MapScript2_1624E7:: @ 81624E7 + checkflag FLAG_0x2BC + call_if 0, EventScript_1624F1 + end + +EventScript_1624F1:: @ 81624F1 + clearflag FLAG_0x081 + return + +CeruleanCave_B1F_EventScript_1624F5:: @ 81624F5 + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + special sub_8112364 + lock + faceplayer + waitse + playmoncry SPECIES_MEWTWO, 2 + message Text_177F9F + waitmessage + waitmoncry + delay 20 + playbgm BGM_FRLG_LEADER_EYE, 0 + waitbuttonpress + setwildbattle SPECIES_MEWTWO, 70, ITEM_NONE + setflag 2055 + special sub_807F9D8 + waitstate + clearflag 2055 + specialvar VAR_RESULT, sub_80CA74C + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_162558 + compare_var_to_value VAR_RESULT, 4 + goto_if 1, EventScript_162561 + compare_var_to_value VAR_RESULT, 5 + goto_if 1, EventScript_162561 + setflag FLAG_0x2BC + release + end + +EventScript_162558:: @ 8162558 + setflag FLAG_0x2BC + goto EventScript_1A922D + +EventScript_162560:: @ 8162560 + end + +EventScript_162561:: @ 8162561 + setvar VAR_0x8004, 150 + goto EventScript_1A9236 + +EventScript_16256B:: @ 816256B + end diff --git a/data/maps/CeruleanCity/scripts.inc b/data/maps/CeruleanCity/scripts.inc new file mode 100644 index 000000000..7f8e62f5b --- /dev/null +++ b/data/maps/CeruleanCity/scripts.inc @@ -0,0 +1,415 @@ +CeruleanCity_MapScripts:: @ 8166471 + map_script 3, CeruleanCity_MapScript1_166477 + .byte 0 + +CeruleanCity_MapScript1_166477:: @ 8166477 + setworldmapflag 2195 + checkflag FLAG_0x234 + call_if 0, EventScript_166484 + end + +EventScript_166484:: @ 8166484 + setobjectxyperm 1, 30, 12 + setobjectxyperm 5, 26, 31 + setobjectxyperm 6, 27, 31 + return + +CeruleanCity_EventScript_16649A:: @ 816649A + lockall + setvar VAR_0x4001, 0 + goto EventScript_1664CC + end + +CeruleanCity_EventScript_1664A6:: @ 81664A6 + lockall + setvar VAR_0x4001, 1 + setobjectxyperm 8, 23, 0 + goto EventScript_1664CC + end + +CeruleanCity_EventScript_1664B9:: @ 81664B9 + lockall + setvar VAR_0x4001, 2 + setobjectxyperm 8, 24, 0 + goto EventScript_1664CC + end + +EventScript_1664CC:: @ 81664CC + textcolor 0 + setvar VAR_0x4054, 2 + playbgm BGM_FRLG_RIVAL, 0 + addobject 8 + applymovement 8, Movement_1665D3 + waitmovement 0 + loadword 0, gUnknown_817EAD7 + callstd 4 + setvar VAR_LAST_TALKED, 8 + compare_var_to_value VAR_STARTER_MON, 2 + call_if 1, EventScript_166582 + compare_var_to_value VAR_STARTER_MON, 1 + call_if 1, EventScript_16658D + compare_var_to_value VAR_STARTER_MON, 0 + call_if 1, EventScript_166598 + setvar VAR_0x8004, 13 + setvar VAR_0x8005, 0 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_817EB95 + callstd 4 + closemessage + playbgm BGM_FRLG_RIVAL_POSTBATTLE, 0 + compare_var_to_value VAR_0x4001, 0 + call_if 1, EventScript_1665A3 + compare_var_to_value VAR_0x4001, 1 + call_if 1, EventScript_1665A3 + compare_var_to_value VAR_0x4001, 2 + call_if 1, EventScript_1665B5 + loadword 0, gUnknown_817ECD4 + callstd 4 + setvar VAR_0x4052, 1 + setflag FLAG_0x29B + setorcopyvar VAR_0x8000, 363 + setorcopyvar VAR_0x8001, 1 + callstd 0 + loadword 0, gUnknown_817ED5D + callstd 4 + closemessage + applymovement 8, Movement_1665FB + waitmovement 0 + fadedefaultbgm + removeobject 8 + releaseall + end + +EventScript_166582:: @ 8166582 + trainerbattle 3, 332, 0, Text_17EB71 + return + +EventScript_16658D:: @ 816658D + trainerbattle 3, 333, 0, Text_17EB71 + return + +EventScript_166598:: @ 8166598 + trainerbattle 3, 334, 0, Text_17EB71 + return + +EventScript_1665A3:: @ 81665A3 + applymovement 255, Movement_1665C7 + applymovement 8, Movement_1665D9 + waitmovement 0 + return + +EventScript_1665B5:: @ 81665B5 + applymovement 255, Movement_1665CD + applymovement 8, Movement_1665EA + waitmovement 0 + return + +Movement_1665C7:: @ 81665C7 + step_1c + step_1b + step_30 + step_1c + step_2d + step_end + +Movement_1665CD:: @ 81665CD + step_1c + step_1b + step_2f + step_1c + step_2d + step_end + +Movement_1665D3:: @ 81665D3 + step_10 + step_10 + step_10 + step_10 + step_10 + step_end + +Movement_1665D9:: @ 81665D9 + step_13 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_1c + step_1c + step_12 + step_11 + step_11 + step_11 + step_11 + step_11 + step_end + +Movement_1665EA:: @ 81665EA + step_12 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_1c + step_1c + step_13 + step_11 + step_11 + step_11 + step_11 + step_11 + step_end + +Movement_1665FB:: @ 81665FB + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_end + +CeruleanCity_EventScript_166603:: @ 8166603 + lock + faceplayer + checktrainerflag 355 + goto_if 1, EventScript_16662E + message Text_17EE0E + waitmessage + playbgm BGM_FRLG_SUSPICIOUS_EYE, 0 + waitbuttonpress + trainerbattle 3, 355, 0, Text_17EE70 + setvar VAR_0x407D, 1 + goto EventScript_16662E + end + +EventScript_16662E:: @ 816662E + loadword 0, gUnknown_817EE9C + callstd 4 + checkitemspace ITEM_TM28, 1 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_166677 + additem ITEM_TM28, 1 + loadword 0, gUnknown_817EEBF + setorcopyvar VAR_0x8000, 316 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 257 + callstd 9 + loadword 0, gUnknown_817EEED + callstd 4 + closemessage + fadescreen 1 + removeobject 2 + fadescreen 0 + setflag FLAG_0x23F + release + end + +EventScript_166677:: @ 8166677 + textcolor 0 + loadword 0, gUnknown_817EF07 + callstd 4 + release + end + +CeruleanCity_EventScript_166683:: @ 8166683 + lockall + setvar VAR_0x4001, 0 + applymovement 2, Movement_1A75E9 + waitmovement 0 + applymovement 255, Movement_1A75ED + waitmovement 0 + goto EventScript_1666C3 + end + +CeruleanCity_EventScript_1666A3:: @ 81666A3 + lockall + setvar VAR_0x4001, 1 + applymovement 2, Movement_1A75ED + waitmovement 0 + applymovement 255, Movement_1A75E9 + waitmovement 0 + goto EventScript_1666C3 + end + +EventScript_1666C3:: @ 81666C3 + textcolor 0 + loadword 0, Text_17EE0E + callstd 4 + setvar VAR_LAST_TALKED, 2 + trainerbattle 3, 355, 0, Text_17EE70 + setvar VAR_0x407D, 1 + goto EventScript_16662E + end + +CeruleanCity_EventScript_1666E7:: @ 81666E7 + lock + faceplayer + loadword 0, gUnknown_817F0F1 + callstd 4 + closemessage + applymovement 1, Movement_1A75E5 + waitmovement 0 + release + end + +CeruleanCity_EventScript_1666FE:: @ 81666FE + lock + faceplayer + checkflag FLAG_0x234 + goto_if 1, EventScript_166713 + loadword 0, gUnknown_817F01D + callstd 4 + release + end + +EventScript_166713:: @ 8166713 + loadword 0, gUnknown_817EF89 + callstd 4 + release + end + +CeruleanCity_EventScript_16671D:: @ 816671D + loadword 0, gUnknown_817F0B2 + callstd 2 + end + +CeruleanCity_EventScript_166726:: @ 8166726 + loadword 0, gUnknown_817EF3F + callstd 2 + end + +CeruleanCity_EventScript_16672F:: @ 816672F + loadword 0, gUnknown_817F319 + callstd 2 + end + +CeruleanCity_EventScript_166738:: @ 8166738 + lock + faceplayer + loadword 0, gUnknown_817F2CF + callstd 4 + closemessage + applymovement 11, Movement_1A75E5 + waitmovement 0 + release + end + +CeruleanCity_EventScript_16674F:: @ 816674F + lock + random 3 + copyvar VAR_0x8008, VAR_RESULT + compare_var_to_value VAR_0x8008, 0 + call_if 1, EventScript_1667B0 + compare_var_to_value VAR_0x8008, 1 + call_if 1, EventScript_1667B6 + compare_var_to_value VAR_0x8008, 2 + call_if 1, EventScript_1667BC + waitmessage + delay 40 + playse SE_PIN + applymovement 5, Movement_1A75D9 + waitmovement 0 + delay 30 + compare_var_to_value VAR_0x8008, 0 + call_if 1, EventScript_1667C2 + compare_var_to_value VAR_0x8008, 1 + call_if 1, EventScript_1667CB + compare_var_to_value VAR_0x8008, 2 + call_if 1, EventScript_1667D4 + release + end + +EventScript_1667B0:: @ 81667B0 + message Text_17F183 + return + +EventScript_1667B6:: @ 81667B6 + message Text_17F1C2 + return + +EventScript_1667BC:: @ 81667BC + message Text_17F1E9 + return + +EventScript_1667C2:: @ 81667C2 + loadword 0, gUnknown_817F1A1 + callstd 4 + return + +EventScript_1667CB:: @ 81667CB + loadword 0, gUnknown_817F1D2 + callstd 4 + return + +EventScript_1667D4:: @ 81667D4 + loadword 0, gUnknown_817F1FC + callstd 4 + return + +CeruleanCity_EventScript_1667DD:: @ 81667DD + lock + random 4 + copyvar VAR_0x8008, VAR_RESULT + compare_var_to_value VAR_0x8008, 0 + call_if 1, EventScript_166814 + compare_var_to_value VAR_0x8008, 1 + call_if 1, EventScript_16681D + compare_var_to_value VAR_0x8008, 2 + call_if 1, EventScript_166826 + compare_var_to_value VAR_0x8008, 3 + call_if 1, EventScript_16682F + release + end + +EventScript_166814:: @ 8166814 + loadword 0, gUnknown_817F270 + callstd 4 + return + +EventScript_16681D:: @ 816681D + loadword 0, gUnknown_817F287 + callstd 4 + return + +EventScript_166826:: @ 8166826 + loadword 0, gUnknown_817F2A2 + callstd 4 + return + +EventScript_16682F:: @ 816682F + loadword 0, gUnknown_817F2B7 + callstd 4 + return + +CeruleanCity_EventScript_166838:: @ 8166838 + loadword 0, gUnknown_817F420 + callstd 3 + end + +CeruleanCity_EventScript_166841:: @ 8166841 + loadword 0, gUnknown_817F453 + callstd 3 + end + +CeruleanCity_EventScript_16684A:: @ 816684A + loadword 0, gUnknown_817F4C5 + callstd 3 + end + +CeruleanCity_EventScript_166853:: @ 8166853 + lockall + setvar VAR_0x8004, 3 + setvar VAR_0x8005, 0 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_817F4EF + callstd 4 + releaseall + end diff --git a/data/maps/CeruleanCity_BikeShop/scripts.inc b/data/maps/CeruleanCity_BikeShop/scripts.inc new file mode 100644 index 000000000..7999511ef --- /dev/null +++ b/data/maps/CeruleanCity_BikeShop/scripts.inc @@ -0,0 +1,92 @@ +CeruleanCity_BikeShop_MapScripts:: @ 816ABBC + .byte 0 + +CeruleanCity_BikeShop_EventScript_16ABBD:: @ 816ABBD + lock + faceplayer + checkflag FLAG_0x271 + goto_if 1, EventScript_16AC58 + checkflag FLAG_0x241 + goto_if 1, EventScript_16AC22 + showmoneybox 0, 0, 0 + message Text_192755 + waitmessage + multichoice 11, 0, 13, 0 + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_16AC07 + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_16AC15 + compare_var_to_value VAR_0x8000, 127 + goto_if 1, EventScript_16AC15 + end + +EventScript_16AC07:: @ 816AC07 + loadword 0, gUnknown_8192796 + callstd 4 + goto EventScript_16AC15 + end + +EventScript_16AC15:: @ 816AC15 + loadword 0, gUnknown_819280E + callstd 4 + hidemoneybox + .byte 0 + .byte 0 + release + end + +EventScript_16AC22:: @ 816AC22 + loadword 0, gUnknown_81927B2 + callstd 4 + loadword 0, gUnknown_81927E1 + setorcopyvar VAR_0x8000, 360 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 318 + callstd 9 + setflag FLAG_0x271 + additem ITEM_BICYCLE, 1 + removeitem ITEM_BIKE_VOUCHER, 1 + loadword 0, gUnknown_819280E + callstd 4 + release + end + +EventScript_16AC58:: @ 816AC58 + loadword 0, gUnknown_8192833 + callstd 4 + release + end + +EventScript_16AC62:: @ 816AC62 + loadword 0, gUnknown_81928A8 + callstd 4 + release + end + +CeruleanCity_BikeShop_EventScript_16AC6C:: @ 816AC6C + loadword 0, gUnknown_81928CF + callstd 2 + end + +CeruleanCity_BikeShop_EventScript_16AC75:: @ 816AC75 + lock + faceplayer + checkflag FLAG_0x271 + goto_if 1, EventScript_16AC8A + loadword 0, gUnknown_8192937 + callstd 4 + release + end + +EventScript_16AC8A:: @ 816AC8A + loadword 0, gUnknown_8192968 + callstd 4 + release + end + +CeruleanCity_BikeShop_EventScript_16AC94:: @ 816AC94 +CeruleanCity_EventScript_16AC94:: @ 816AC94 + loadword 0, gUnknown_81929AD + callstd 3 + end diff --git a/data/maps/CeruleanCity_Gym/scripts.inc b/data/maps/CeruleanCity_Gym/scripts.inc new file mode 100644 index 000000000..850e8b23d --- /dev/null +++ b/data/maps/CeruleanCity_Gym/scripts.inc @@ -0,0 +1,96 @@ +CeruleanCity_Gym_MapScripts:: @ 816AAA0 + .byte 0 + +CeruleanCity_Gym_EventScript_16AAA1:: @ 816AAA1 + setvar VAR_0x8004, 3 + setvar VAR_0x8005, 2 + special UpdatePickStateFromSpecialVar8005 + trainerbattle 1, 415, 0, Text_1921EF, Text_19242D, EventScript_16AAD3 + checkflag FLAG_0x297 + goto_if 0, EventScript_16AAF9 + loadword 0, gUnknown_81922BF + callstd 4 + release + end + +EventScript_16AAD3:: @ 816AAD3 + setvar VAR_0x8004, 3 + setvar VAR_0x8005, 1 + special SetFlavorTextFlagFromSpecialVars + setflag FLAG_0x4B1 + setflag 2081 + setrespawn 4 + setvar VAR_0x8008, 2 + call EventScript_1A6B18 + goto EventScript_16AAF9 + end + +EventScript_16AAF9:: @ 816AAF9 + loadword 0, gUnknown_81922F7 + callstd 4 + checkitemspace ITEM_TM03, 1 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16AB3A + additem ITEM_TM03, 1 + loadword 0, gUnknown_81923F1 + setorcopyvar VAR_0x8000, 291 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 257 + callstd 9 + setflag FLAG_0x297 + loadword 0, gUnknown_81922BF + callstd 4 + release + end + +EventScript_16AB3A:: @ 816AB3A + loadword 0, gUnknown_819240E + callstd 4 + release + end + +CeruleanCity_Gym_EventScript_16AB44:: @ 816AB44 + trainerbattle 0, 150, 0, Text_192481, Text_1924D0 + loadword 0, gUnknown_81924E4 + callstd 6 + end + +CeruleanCity_Gym_EventScript_16AB5B:: @ 816AB5B + trainerbattle 0, 234, 0, Text_192524, Text_192547 + setvar VAR_0x8004, 3 + setvar VAR_0x8005, 2 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_8192556 + callstd 6 + end + +CeruleanCity_Gym_EventScript_16AB7F:: @ 816AB7F + lock + faceplayer + checkflag FLAG_0x4B1 + goto_if 1, EventScript_16AB94 + loadword 0, gUnknown_81925AC + callstd 4 + release + end + +EventScript_16AB94:: @ 816AB94 + loadword 0, gUnknown_8192688 + callstd 4 + release + end + +CeruleanCity_Gym_EventScript_16AB9E:: @ 816AB9E + lockall + checkflag 2081 + goto_if 1, EventScript_16ABB2 + loadword 0, gUnknown_81926E1 + callstd 4 + releaseall + end + +EventScript_16ABB2:: @ 816ABB2 + loadword 0, gUnknown_8192719 + callstd 4 + releaseall + end diff --git a/data/maps/CeruleanCity_House1/scripts.inc b/data/maps/CeruleanCity_House1/scripts.inc new file mode 100644 index 000000000..1e42bbe80 --- /dev/null +++ b/data/maps/CeruleanCity_House1/scripts.inc @@ -0,0 +1,121 @@ +CeruleanCity_House1_MapScripts:: @ 816A7EF + .byte 0 + +CeruleanCity_House1_EventScript_16A7F0:: @ 816A7F0 + lock + faceplayer + loadword 0, gUnknown_81918E7 + callstd 4 + message Text_191967 + waitmessage + setvar VAR_0x8004, 0 + special sub_80CB7C4 + waitstate + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_16A8FB + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_16A909 + compare_var_to_value VAR_0x8000, 2 + goto_if 1, EventScript_16A917 + compare_var_to_value VAR_0x8000, 3 + goto_if 1, EventScript_16A925 + compare_var_to_value VAR_0x8000, 4 + goto_if 1, EventScript_16A933 + compare_var_to_value VAR_0x8000, 5 + goto_if 1, EventScript_16A941 + compare_var_to_value VAR_0x8000, 6 + goto_if 1, EventScript_16A94F + compare_var_to_value VAR_0x8000, 7 + goto_if 1, EventScript_16A95D + compare_var_to_value VAR_0x8000, 8 + goto_if 1, EventScript_16A96B + compare_var_to_value VAR_0x8000, 127 + goto_if 1, EventScript_16A96B + end + +EventScript_16A87D:: @ 816A87D + message Text_191967 + waitmessage + special sub_80CBC5C + waitstate + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_16A8FB + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_16A909 + compare_var_to_value VAR_0x8000, 2 + goto_if 1, EventScript_16A917 + compare_var_to_value VAR_0x8000, 3 + goto_if 1, EventScript_16A925 + compare_var_to_value VAR_0x8000, 4 + goto_if 1, EventScript_16A933 + compare_var_to_value VAR_0x8000, 5 + goto_if 1, EventScript_16A941 + compare_var_to_value VAR_0x8000, 6 + goto_if 1, EventScript_16A94F + compare_var_to_value VAR_0x8000, 7 + goto_if 1, EventScript_16A95D + compare_var_to_value VAR_0x8000, 8 + goto_if 1, EventScript_16A96B + compare_var_to_value VAR_0x8000, 127 + goto_if 1, EventScript_16A96B + end + +EventScript_16A8FB:: @ 816A8FB + loadword 0, gUnknown_81919BE + callstd 4 + goto EventScript_16A87D + end + +EventScript_16A909:: @ 816A909 + loadword 0, gUnknown_8191A31 + callstd 4 + goto EventScript_16A87D + end + +EventScript_16A917:: @ 816A917 + loadword 0, gUnknown_8191AF9 + callstd 4 + goto EventScript_16A87D + end + +EventScript_16A925:: @ 816A925 + loadword 0, gUnknown_8191B69 + callstd 4 + goto EventScript_16A87D + end + +EventScript_16A933:: @ 816A933 + loadword 0, gUnknown_8191C36 + callstd 4 + goto EventScript_16A87D + end + +EventScript_16A941:: @ 816A941 + loadword 0, gUnknown_8191CA9 + callstd 4 + goto EventScript_16A87D + end + +EventScript_16A94F:: @ 816A94F + loadword 0, gUnknown_8191D78 + callstd 4 + goto EventScript_16A87D + +EventScript_16A95C:: @ 816A95C + end + +EventScript_16A95D:: @ 816A95D + loadword 0, gUnknown_8191DF8 + callstd 4 + goto EventScript_16A87D + +EventScript_16A96A:: @ 816A96A + end + +EventScript_16A96B:: @ 816A96B + loadword 0, gUnknown_819199E + callstd 4 + release + end diff --git a/data/maps/CeruleanCity_House2/scripts.inc b/data/maps/CeruleanCity_House2/scripts.inc new file mode 100644 index 000000000..3d098c13a --- /dev/null +++ b/data/maps/CeruleanCity_House2/scripts.inc @@ -0,0 +1,28 @@ +CeruleanCity_House2_MapScripts:: @ 816A975 + .byte 0 + +CeruleanCity_House2_EventScript_16A976:: @ 816A976 + lock + faceplayer + checkflag FLAG_0x23F + goto_if 1, EventScript_16A98B + loadword 0, gUnknown_8191E13 + callstd 4 + release + end + +EventScript_16A98B:: @ 816A98B + loadword 0, gUnknown_8191ED8 + callstd 4 + release + end + +CeruleanCity_House2_EventScript_16A995:: @ 816A995 + loadword 0, gUnknown_8191F2A + callstd 2 + end + +CeruleanCity_House2_EventScript_16A99E:: @ 816A99E + loadword 0, gUnknown_8191F64 + callstd 3 + end diff --git a/data/maps/CeruleanCity_House3/scripts.inc b/data/maps/CeruleanCity_House3/scripts.inc new file mode 100644 index 000000000..91037b14c --- /dev/null +++ b/data/maps/CeruleanCity_House3/scripts.inc @@ -0,0 +1,50 @@ +CeruleanCity_House3_MapScripts:: @ 816A9A7 + .byte 0 + +CeruleanCity_House3_EventScript_16A9A8:: @ 816A9A8 + loadword 0, gUnknown_8191F80 + callstd 2 + end + +CeruleanCity_House3_EventScript_16A9B1:: @ 816A9B1 + lock + faceplayer + setvar VAR_0x8008, 1 + call EventScript_1A8CAD + checkflag FLAG_0x24A + goto_if 1, EventScript_16AA23 + loadword 0, gUnknown_81A59FE + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16AA0B + call EventScript_1A8CBD + compare_var_to_value VAR_0x8004, 6 + goto_if 4, EventScript_16AA0B + call EventScript_1A8CC9 + compare_var_to_var VAR_RESULT, VAR_0x8009 + goto_if 5, EventScript_16AA15 + call EventScript_1A8CD9 + loadword 0, gUnknown_81A5A9D + callstd 4 + setflag FLAG_0x24A + release + end + +EventScript_16AA0B:: @ 816AA0B + loadword 0, gUnknown_81A5A4E + callstd 4 + release + end + +EventScript_16AA15:: @ 816AA15 + getspeciesname 0, 32777 + loadword 0, gUnknown_81A5A6A + callstd 4 + release + end + +EventScript_16AA23:: @ 816AA23 + loadword 0, gUnknown_81A5AA5 + callstd 4 + release + end diff --git a/data/maps/CeruleanCity_House4/scripts.inc b/data/maps/CeruleanCity_House4/scripts.inc new file mode 100644 index 000000000..ffda63cab --- /dev/null +++ b/data/maps/CeruleanCity_House4/scripts.inc @@ -0,0 +1,112 @@ +CeruleanCity_House4_MapScripts:: @ 816ACEE + .byte 0 + +CeruleanCity_House4_EventScript_16ACEF:: @ 816ACEF + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + special sub_8112364 + lock + specialvar VAR_0x8004, sub_8146CE8 + copyvar VAR_0x8008, VAR_RESULT + compare_var_to_value VAR_0x8004, 0 + goto_if 1, EventScript_16AD59 + compare_var_to_value VAR_0x8004, 1 + goto_if 1, EventScript_16AD63 + compare_var_to_value VAR_0x8004, 2 + goto_if 1, EventScript_16AD89 + compare_var_to_value VAR_0x8004, 3 + goto_if 1, EventScript_16ADAF + compare_var_to_value VAR_0x8004, 4 + goto_if 1, EventScript_16ADC3 + compare_var_to_value VAR_0x8004, 5 + goto_if 1, EventScript_16ADE9 + compare_var_to_value VAR_0x8004, 6 + goto_if 1, EventScript_16AE0F + end + +EventScript_16AD59:: @ 816AD59 + loadword 0, gUnknown_8192AF0 + callstd 4 + release + end + +EventScript_16AD63:: @ 816AD63 + call EventScript_16AE23 + loadword 0, gUnknown_8192B43 + callstd 4 + setorcopyvar VAR_0x8000, VAR_0x8008 + setorcopyvar VAR_0x8001, 1 + callstd 0 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16AE45 + release + end + +EventScript_16AD89:: @ 816AD89 + call EventScript_16AE23 + loadword 0, gUnknown_8192C07 + callstd 4 + setorcopyvar VAR_0x8000, VAR_0x8008 + setorcopyvar VAR_0x8001, 4 + callstd 0 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16AE45 + release + end + +EventScript_16ADAF:: @ 816ADAF + applymovement 1, Movement_1A75E1 + waitmovement 0 + loadword 0, gUnknown_8192CD5 + callstd 4 + release + end + +EventScript_16ADC3:: @ 816ADC3 + call EventScript_16AE23 + loadword 0, gUnknown_8192D4B + callstd 4 + setorcopyvar VAR_0x8000, VAR_0x8008 + setorcopyvar VAR_0x8001, 1 + callstd 0 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16AE45 + release + end + +EventScript_16ADE9:: @ 816ADE9 + call EventScript_16AE23 + loadword 0, gUnknown_8192DE3 + callstd 4 + setorcopyvar VAR_0x8000, VAR_0x8008 + setorcopyvar VAR_0x8001, 4 + callstd 0 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16AE45 + release + end + +EventScript_16AE0F:: @ 816AE0F + applymovement 1, Movement_1A75E1 + waitmovement 0 + loadword 0, gUnknown_8192EC5 + callstd 4 + release + end + +EventScript_16AE23:: @ 816AE23 + playse SE_PIN + applymovement 1, Movement_1A75DB + waitmovement 0 + applymovement 1, Movement_1A75E1 + waitmovement 0 + applymovement 1, Movement_1A75DD + waitmovement 0 + return + +EventScript_16AE45:: @ 816AE45 + loadword 0, gUnknown_8192F2A + callstd 4 + release + end diff --git a/data/maps/CeruleanCity_House5/scripts.inc b/data/maps/CeruleanCity_House5/scripts.inc new file mode 100644 index 000000000..081499778 --- /dev/null +++ b/data/maps/CeruleanCity_House5/scripts.inc @@ -0,0 +1,214 @@ +CeruleanCity_House5_MapScripts:: @ 816AE4F + .byte 0 + +CeruleanCity_House5_EventScript_16AE50:: @ 816AE50 + lock + faceplayer + checkflag FLAG_0x2BB + goto_if 1, EventScript_16AEB7 + loadword 0, gUnknown_8192F67 + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16AEAD + checkflag 2119 + goto_if 0, EventScript_16AEA3 + loadword 0, gUnknown_8193003 + callstd 4 + setflag FLAG_0x2BB + setorcopyvar VAR_0x8000, 372 + setorcopyvar VAR_0x8001, 1 + callstd 0 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_1A6BF9 + loadword 0, gUnknown_8193033 + callstd 4 + release + end + +EventScript_16AEA3:: @ 816AEA3 + loadword 0, gUnknown_819321D + callstd 4 + release + end + +EventScript_16AEAD:: @ 816AEAD + loadword 0, gUnknown_819325E + callstd 4 + release + end + +EventScript_16AEB7:: @ 816AEB7 + special sub_815F094 + loadword 0, gUnknown_81932C5 + callstd 4 + goto EventScript_16AEC8 + end + +EventScript_16AEC8:: @ 816AEC8 + message Text_1932F4 + waitmessage + setvar VAR_0x8004, 5 + special sub_80CB7C4 + waitstate + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_16AF6C + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_16AF80 + compare_var_to_value VAR_0x8000, 2 + goto_if 1, EventScript_16AF94 + compare_var_to_value VAR_0x8000, 3 + goto_if 1, EventScript_16AFA8 + compare_var_to_value VAR_0x8000, 4 + goto_if 1, EventScript_16AFBC + compare_var_to_value VAR_0x8000, 5 + goto_if 1, EventScript_16AFD0 + compare_var_to_value VAR_0x8000, 6 + goto_if 1, EventScript_16AFE4 + compare_var_to_value VAR_0x8000, 7 + goto_if 1, EventScript_16AFF8 + compare_var_to_value VAR_0x8000, 8 + goto_if 1, EventScript_16B00C + compare_var_to_value VAR_0x8000, 9 + goto_if 1, EventScript_16B020 + compare_var_to_value VAR_0x8000, 10 + goto_if 1, EventScript_16B034 + compare_var_to_value VAR_0x8000, 11 + goto_if 1, EventScript_16B048 + compare_var_to_value VAR_0x8000, 127 + goto_if 1, EventScript_16B048 + end + +EventScript_16AF6C:: @ 816AF6C + getitemname 0, ITEM_ENERGY_POWDER + setvar VAR_0x8008, 30 + setvar VAR_0x8009, 50 + goto EventScript_16B055 + end + +EventScript_16AF80:: @ 816AF80 + getitemname 0, ITEM_ENERGY_ROOT + setvar VAR_0x8008, 31 + setvar VAR_0x8009, 80 + goto EventScript_16B055 + end + +EventScript_16AF94:: @ 816AF94 + getitemname 0, ITEM_HEAL_POWDER + setvar VAR_0x8008, 32 + setvar VAR_0x8009, 50 + goto EventScript_16B055 + end + +EventScript_16AFA8:: @ 816AFA8 + getitemname 0, ITEM_REVIVAL_HERB + setvar VAR_0x8008, 33 + setvar VAR_0x8009, 300 + goto EventScript_16B055 + end + +EventScript_16AFBC:: @ 816AFBC + getitemname 0, ITEM_PROTEIN + setvar VAR_0x8008, 64 + setvar VAR_0x8009, 1000 + goto EventScript_16B055 + end + +EventScript_16AFD0:: @ 816AFD0 + getitemname 0, ITEM_IRON + setvar VAR_0x8008, 65 + setvar VAR_0x8009, 1000 + goto EventScript_16B055 + end + +EventScript_16AFE4:: @ 816AFE4 + getitemname 0, ITEM_CARBOS + setvar VAR_0x8008, 66 + setvar VAR_0x8009, 1000 + goto EventScript_16B055 + end + +EventScript_16AFF8:: @ 816AFF8 + getitemname 0, ITEM_CALCIUM + setvar VAR_0x8008, 67 + setvar VAR_0x8009, 1000 + goto EventScript_16B055 + end + +EventScript_16B00C:: @ 816B00C + getitemname 0, ITEM_ZINC + setvar VAR_0x8008, 70 + setvar VAR_0x8009, 1000 + goto EventScript_16B055 + end + +EventScript_16B020:: @ 816B020 + getitemname 0, ITEM_HP_UP + setvar VAR_0x8008, 63 + setvar VAR_0x8009, 1000 + goto EventScript_16B055 + end + +EventScript_16B034:: @ 816B034 + getitemname 0, ITEM_PP_UP + setvar VAR_0x8008, 69 + setvar VAR_0x8009, 3000 + goto EventScript_16B055 + end + +EventScript_16B048:: @ 816B048 + loadword 0, gUnknown_819342F + callstd 4 + special sub_815F114 + release + end + +EventScript_16B055:: @ 816B055 + loadword 0, gUnknown_819331E + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16AEC8 + copyvar VAR_0x8004, VAR_0x8009 + specialvar VAR_RESULT, sub_815EEB0 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16B0CC + setorcopyvar VAR_0x8000, VAR_0x8008 + setorcopyvar VAR_0x8001, 1 + callstd 0 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16B0BF + copyvar VAR_0x8004, VAR_0x8009 + special sub_815EF5C + special sub_815F070 + loadword 0, gUnknown_819337A + callstd 5 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16AEC8 + loadword 0, gUnknown_81933FB + callstd 4 + special sub_815F114 + release + end + +EventScript_16B0BF:: @ 816B0BF + loadword 0, gUnknown_81A5207 + callstd 4 + special sub_815F114 + release + end + +EventScript_16B0CC:: @ 816B0CC + loadword 0, gUnknown_8193352 + callstd 4 + goto EventScript_16AEC8 + end + +CeruleanCity_House5_EventScript_16B0DA:: @ 816B0DA + lockall + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + special sub_814EA7C + waitstate + releaseall + end diff --git a/data/maps/CeruleanCity_Mart/scripts.inc b/data/maps/CeruleanCity_Mart/scripts.inc new file mode 100644 index 000000000..e9fc440c4 --- /dev/null +++ b/data/maps/CeruleanCity_Mart/scripts.inc @@ -0,0 +1,41 @@ +CeruleanCity_Mart_MapScripts:: @ 816AC9D + .byte 0 + +CeruleanCity_Mart_EventScript_16AC9E:: @ 816AC9E + loadword 0, gUnknown_81929C2 + callstd 2 + end + +CeruleanCity_Mart_EventScript_16ACA7:: @ 816ACA7 + loadword 0, gUnknown_8192A79 + callstd 2 + end + +CeruleanCity_Mart_EventScript_16ACB0:: @ 816ACB0 + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + lock + faceplayer + message Text_1A6211 + waitmessage + pokemart Items_16ACD8 + loadword 0, gUnknown_81A5190 + callstd 4 + release + end + + .align 2 +Items_16ACD8:: @ 816ACD8 + .2byte ITEM_POKE_BALL + .2byte ITEM_SUPER_POTION + .2byte ITEM_POTION + .2byte ITEM_ANTIDOTE + .2byte ITEM_PARALYZE_HEAL + .2byte ITEM_AWAKENING + .2byte ITEM_BURN_HEAL + .2byte ITEM_ESCAPE_ROPE + .2byte ITEM_REPEL + .2byte ITEM_NONE + release + end diff --git a/data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc b/data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc new file mode 100644 index 000000000..f9d2b2c9a --- /dev/null +++ b/data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc @@ -0,0 +1,41 @@ +CeruleanCity_PokemonCenter_1F_MapScripts:: @ 816AA2D + map_script 3, CeruleanCity_PokemonCenter_1F_MapScript1_16AA38 + map_script 5, CeruleanCity_PokemonCenter_1F_MapScript2_1BC05C + .byte 0 + +CeruleanCity_PokemonCenter_1F_MapScript1_16AA38:: @ 816AA38 + setrespawn 4 + end + +CeruleanCity_PokemonCenter_1F_EventScript_16AA3C:: @ 816AA3C + lock + faceplayer + call EventScript_1A6578 + release + end + +CeruleanCity_PokemonCenter_1F_EventScript_16AA45:: @ 816AA45 + loadword 0, gUnknown_8192079 + callstd 2 + end + +CeruleanCity_PokemonCenter_1F_EventScript_16AA4E:: @ 816AA4E + loadword 0, gUnknown_8191FFB + callstd 2 + end + +CeruleanCity_PokemonCenter_1F_EventScript_16AA57:: @ 816AA57 + lock + faceplayer + setvar VAR_0x8004, 13 + setvar VAR_0x8005, 1 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_8192116 + callstd 4 + release + end + +CeruleanCity_PokemonCenter_1F_EventScript_16AA70:: @ 816AA70 + loadword 0, gUnknown_819214C + callstd 2 + end diff --git a/data/maps/CeruleanCity_PokemonCenter_2F/scripts.inc b/data/maps/CeruleanCity_PokemonCenter_2F/scripts.inc new file mode 100644 index 000000000..6abf8a484 --- /dev/null +++ b/data/maps/CeruleanCity_PokemonCenter_2F/scripts.inc @@ -0,0 +1,18 @@ +CeruleanCity_PokemonCenter_2F_MapScripts:: @ 816AA79 + map_script 2, CeruleanCity_PokemonCenter_2F_MapScript1_1BB2A3 + map_script 4, CeruleanCity_PokemonCenter_2F_MapScript2_1BB1ED + map_script 1, CeruleanCity_PokemonCenter_2F_MapScript3_1BB237 + map_script 3, CeruleanCity_PokemonCenter_2F_MapScript4_1BB1B4 + .byte 0 + +CeruleanCity_PokemonCenter_2F_EventScript_16AA8E:: @ 816AA8E + call EventScript_1BB4A3 + end + +EventScript_16AA94:: @ 816AA94 + call EventScript_1BB6AB + end + +EventScript_16AA9A:: @ 816AA9A + call EventScript_1BB7DE + end diff --git a/data/maps/CinnabarIsland/scripts.inc b/data/maps/CinnabarIsland/scripts.inc new file mode 100644 index 000000000..10a075b72 --- /dev/null +++ b/data/maps/CinnabarIsland/scripts.inc @@ -0,0 +1,384 @@ +CinnabarIsland_MapScripts:: @ 8166ED6 + map_script 3, CinnabarIsland_MapScript1_166EE1 + map_script 2, CinnabarIsland_MapScript2_166F6E + .byte 0 + +CinnabarIsland_MapScript1_166EE1:: @ 8166EE1 + setworldmapflag 2200 + call EventScript_166F5E + compare_var_to_value VAR_0x4071, 1 + call_if 1, EventScript_166F24 + compare_var_to_value VAR_0x4071, 3 + call_if 1, EventScript_166F52 + compare_var_to_value VAR_0x408A, 1 + call_if 1, EventScript_166F0B + end + +EventScript_166F0B:: @ 8166F0B + savebgm BGM_FRLG_FOLLOW_ME + setflag FLAG_0x002 + setobjectxyperm 3, 15, 12 + setobjectmovementtype 3, 9 + setobjectxyperm 4, 30, 12 + return + +EventScript_166F24:: @ 8166F24 + getplayerxy VAR_0x8004, VAR_0x8005 + compare_var_to_value VAR_0x8004, 18 + goto_if 4, EventScript_166F4A + setflag FLAG_0x002 + setobjectxyperm 3, 18, 12 + setobjectmovementtype 3, 7 + setobjectxyperm 4, 30, 12 + return + +EventScript_166F4A:: @ 8166F4A + setobjectxyperm 4, 30, 8 + return + +EventScript_166F52:: @ 8166F52 + setobjectxyperm 3, 21, 8 + setobjectmovementtype 3, 7 + return + +EventScript_166F5E:: @ 8166F5E + checkflag FLAG_0x1A8 + goto_if 1, EventScript_166F68 + return + +EventScript_166F68:: @ 8166F68 + setvar VAR_0x4001, 1 + return + +CinnabarIsland_MapScript2_166F6E:: @ 8166F6E + map_script_2 VAR_0x408A, 1, EventScript_166F88 + map_script_2 VAR_0x4071, 1, EventScript_166FCD + map_script_2 VAR_0x4071, 3, EventScript_166FA0 + .2byte 0 + +EventScript_166F88:: @ 8166F88 + lockall + clearflag FLAG_SPECIAL_FLAG_0x4001 + savebgm MUS_DUMMY + textcolor 0 + setvar VAR_0x408A, 2 + delay 20 + call EventScript_1670E6 + releaseall + end + +EventScript_166FA0:: @ 8166FA0 + lockall + textcolor 0 + loadword 0, gUnknown_8180F09 + callstd 4 + closemessage + applymovement 3, Movement_166FC6 + waitmovement 0 + removeobject 3 + setvar VAR_0x4071, 4 + setflag FLAG_0x075 + clearflag FLAG_0x076 + releaseall + end + +Movement_166FC6:: @ 8166FC6 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_end + +EventScript_166FCD:: @ 8166FCD + lockall + textcolor 0 + checkflag FLAG_0x002 + call_if 0, EventScript_167032 + checkflag FLAG_0x002 + call_if 1, EventScript_16703D + playse SE_PIN + applymovement 3, Movement_1A75DB + waitmovement 0 + applymovement 3, Movement_1A75DD + waitmovement 0 + checkflag FLAG_0x002 + call_if 0, EventScript_167048 + checkflag FLAG_0x002 + call_if 1, EventScript_167053 + loadword 0, gUnknown_8180C90 + callstd 4 + loadword 0, gUnknown_8180CAA + callstd 5 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_167068 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_167078 + end + +EventScript_167032:: @ 8167032 + applymovement 3, Movement_1A75E9 + waitmovement 0 + return + +EventScript_16703D:: @ 816703D + applymovement 3, Movement_1A75E7 + waitmovement 0 + return + +EventScript_167048:: @ 8167048 + applymovement 3, Movement_1671A4 + waitmovement 0 + return + +EventScript_167053:: @ 8167053 + applymovement 3, Movement_1671A6 + waitmovement 0 + applymovement 255, Movement_1A75EB + waitmovement 0 + return + +EventScript_167068:: @ 8167068 + loadword 0, gUnknown_8180DDD + callstd 4 + closemessage + call EventScript_1670E6 + releaseall + end + +EventScript_167078:: @ 8167078 + loadword 0, gUnknown_8180DF8 + callstd 4 + closemessage + checkflag FLAG_0x002 + call_if 0, EventScript_1670A0 + checkflag FLAG_0x002 + call_if 1, EventScript_1670B3 + removeobject 3 + setvar VAR_0x4071, 2 + clearflag FLAG_0x0A2 + releaseall + end + +EventScript_1670A0:: @ 81670A0 + applymovement 3, Movement_1670AB + waitmovement 0 + return + +Movement_1670AB:: @ 81670AB + step_13 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_end + +EventScript_1670B3:: @ 81670B3 + applymovement 255, Movement_1670DB + applymovement 3, Movement_1670DE + waitmovement 0 + opendoor 14, 11 + waitdooranim + applymovement 3, Movement_1670E2 + waitmovement 0 + closedoor 14, 11 + waitdooranim + return + +Movement_1670DB:: @ 81670DB + step_12 + step_30 + step_end + +Movement_1670DE:: @ 81670DE + step_1c + step_12 + step_2e + step_end + +Movement_1670E2:: @ 81670E2 + step_11 + step_1a + step_60 + step_end + +EventScript_1670E6:: @ 81670E6 + checkflag FLAG_0x002 + call_if 1, EventScript_167142 + addobject 4 + checkflag FLAG_0x002 + call_if 0, EventScript_167154 + checkflag FLAG_0x002 + call_if 1, EventScript_167166 + loadword 0, gUnknown_8180EAD + callstd 4 + closemessage + checkflag FLAG_0x002 + call_if 0, EventScript_167171 + checkflag FLAG_0x002 + call_if 1, EventScript_167183 + setvar VAR_0x4071, 2 + removeobject 3 + delay 40 + setflag FLAG_0x06B + setvar VAR_0x4075, 1 + setvar VAR_0x8004, 8 + setvar VAR_0x8006, 1 + goto EventScript_1A90DA + end + +EventScript_167142:: @ 8167142 + applymovement 3, Movement_1671AF + applymovement 255, Movement_1671AF + waitmovement 0 + return + +EventScript_167154:: @ 8167154 + applymovement 3, Movement_1671AA + applymovement 4, Movement_167195 + waitmovement 0 + return + +EventScript_167166:: @ 8167166 + applymovement 4, Movement_167195 + waitmovement 0 + return + +EventScript_167171:: @ 8167171 + applymovement 3, Movement_16719D + applymovement 255, Movement_1671BA + waitmovement 0 + return + +EventScript_167183:: @ 8167183 + applymovement 3, Movement_1671B6 + applymovement 255, Movement_1671C4 + waitmovement 0 + return + +Movement_167195:: @ 8167195 + step_1c + step_1c + step_1f + step_1f + step_12 + step_left + step_left + step_end + +Movement_16719D:: @ 816719D + step_13 + step_10 + step_10 + step_13 + step_1a + step_60 + step_end + +Movement_1671A4:: @ 81671A4 + step_11 + step_end + +Movement_1671A6:: @ 81671A6 + step_12 + step_12 + step_12 + step_end + +Movement_1671AA:: @ 81671AA + step_1c + step_1c + step_1b + step_30 + step_end + +Movement_1671AF:: @ 81671AF + step_13 + step_13 + step_13 + step_13 + step_13 + step_13 + step_end + +Movement_1671B6:: @ 81671B6 + step_13 + step_1a + step_60 + step_end + +Movement_1671BA:: @ 81671BA + step_10 + step_13 + step_10 + step_10 + step_30 + step_1a + step_13 + step_1a + step_60 + step_end + +Movement_1671C4:: @ 81671C4 + step_13 + step_1a + step_13 + step_1a + step_60 + step_end + +CinnabarIsland_EventScript_1671CA:: @ 81671CA + lockall + applymovement 255, Movement_1A75E9 + waitmovement 0 + delay 20 + loadword 0, gUnknown_8180B20 + callstd 4 + closemessage + applymovement 255, Movement_1671ED + waitmovement 0 + releaseall + end + +Movement_1671ED:: @ 81671ED + step_10 + step_end + +CinnabarIsland_EventScript_1671EF:: @ 81671EF + lock + faceplayer + setvar VAR_0x8004, 8 + setvar VAR_0x8005, 3 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_8180B34 + callstd 4 + release + end + +CinnabarIsland_EventScript_167208:: @ 8167208 + loadword 0, gUnknown_8180BA0 + callstd 2 + end + +CinnabarIsland_EventScript_167211:: @ 8167211 + loadword 0, gUnknown_8180C0D + callstd 3 + end + +CinnabarIsland_EventScript_16721A:: @ 816721A + loadword 0, gUnknown_8180C3E + callstd 3 + end + +CinnabarIsland_EventScript_167223:: @ 8167223 + lockall + setvar VAR_0x8004, 8 + setvar VAR_0x8005, 0 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_8180C4A + callstd 4 + releaseall + end diff --git a/data/maps/CinnabarIsland_Gym/scripts.inc b/data/maps/CinnabarIsland_Gym/scripts.inc new file mode 100644 index 000000000..afe1f7a7b --- /dev/null +++ b/data/maps/CinnabarIsland_Gym/scripts.inc @@ -0,0 +1,816 @@ +CinnabarIsland_Gym_MapScripts:: @ 816D94B + map_script 1, CinnabarIsland_Gym_MapScript1_16D951 + .byte 0 + +CinnabarIsland_Gym_MapScript1_16D951:: @ 816D951 + checkflag FLAG_0x4B6 + goto_if 1, EventScript_16D991 + checkflag FLAG_0x265 + call_if 1, EventScript_16D9B0 + checkflag FLAG_0x267 + call_if 1, EventScript_16D9B6 + checkflag FLAG_0x268 + call_if 1, EventScript_16D9BC + checkflag FLAG_0x269 + call_if 1, EventScript_16D9C2 + checkflag FLAG_0x26A + call_if 1, EventScript_16D9C8 + checkflag FLAG_0x26B + call_if 1, EventScript_16D9CE + end + +EventScript_16D991:: @ 816D991 + call EventScript_16E117 + call EventScript_16E157 + call EventScript_16E197 + call EventScript_16E1D7 + call EventScript_16E1F3 + call EventScript_16E233 + end + +EventScript_16D9B0:: @ 816D9B0 + call EventScript_16E117 + return + +EventScript_16D9B6:: @ 816D9B6 + call EventScript_16E157 + return + +EventScript_16D9BC:: @ 816D9BC + call EventScript_16E197 + return + +EventScript_16D9C2:: @ 816D9C2 + call EventScript_16E1D7 + return + +EventScript_16D9C8:: @ 816D9C8 + call EventScript_16E1F3 + return + +EventScript_16D9CE:: @ 816D9CE + call EventScript_16E233 + return + +CinnabarIsland_Gym_EventScript_16D9D4:: @ 816D9D4 + setvar VAR_0x8004, 8 + setvar VAR_0x8005, 2 + special UpdatePickStateFromSpecialVar8005 + trainerbattle 1, 419, 0, Text_199543, Text_1995FA, EventScript_16DA06 + checkflag FLAG_0x24E + goto_if 0, EventScript_16DA34 + loadword 0, gUnknown_819971D + callstd 4 + release + end + +EventScript_16DA06:: @ 816DA06 + setvar VAR_0x8004, 8 + setvar VAR_0x8005, 1 + special SetFlavorTextFlagFromSpecialVars + setflag FLAG_0x4B6 + setflag FLAG_UNK826 + setrespawn 9 + setvar VAR_0x4071, 1 + clearflag FLAG_0x062 + setvar VAR_0x8008, 7 + call EventScript_1A6B18 + goto EventScript_16DA34 + end + +EventScript_16DA34:: @ 816DA34 + loadword 0, gUnknown_819969E + callstd 4 + checkitemspace ITEM_TM38, 1 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16DA75 + additem ITEM_TM38, 1 + loadword 0, gUnknown_81996FF + setorcopyvar VAR_0x8000, 326 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 257 + callstd 9 + setflag FLAG_0x24E + loadword 0, gUnknown_8199652 + callstd 4 + release + end + +EventScript_16DA75:: @ 816DA75 + loadword 0, gUnknown_8199789 + callstd 4 + release + end + +CinnabarIsland_Gym_EventScript_16DA7F:: @ 816DA7F + trainerbattle 0, 177, 0, Text_1997A5, Text_1997D6 + loadword 0, gUnknown_81997EA + callstd 6 + end + +CinnabarIsland_Gym_EventScript_16DA96:: @ 816DA96 + trainerbattle 2, 178, 0, Text_1998BD, Text_1998ED, EventScript_16DAB1 + loadword 0, gUnknown_8199911 + callstd 6 + end + +EventScript_16DAB1:: @ 816DAB1 + checkflag FLAG_0x267 + call_if 0, EventScript_16DABC + release + end + +EventScript_16DABC:: @ 816DABC + call EventScript_16DD31 + return + +CinnabarIsland_Gym_EventScript_16DAC2:: @ 816DAC2 + trainerbattle 2, 179, 0, Text_1999B7, Text_1999DB, EventScript_16DAEA + setvar VAR_0x8004, 8 + setvar VAR_0x8005, 2 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_81999DF + callstd 6 + end + +EventScript_16DAEA:: @ 816DAEA + checkflag FLAG_0x269 + call_if 0, EventScript_16DAF5 + release + end + +EventScript_16DAF5:: @ 816DAF5 + call EventScript_16DEE6 + return + +CinnabarIsland_Gym_EventScript_16DAFB:: @ 816DAFB + trainerbattle 2, 180, 0, Text_199AFC, Text_199B16, EventScript_16DB16 + loadword 0, gUnknown_8199B27 + callstd 6 + end + +EventScript_16DB16:: @ 816DB16 + checkflag FLAG_0x26B + call_if 0, EventScript_16DB21 + release + end + +EventScript_16DB21:: @ 816DB21 + call EventScript_16E094 + return + +CinnabarIsland_Gym_EventScript_16DB27:: @ 816DB27 + trainerbattle 2, 213, 0, Text_19983F, Text_199870, EventScript_16DB42 + loadword 0, gUnknown_819987D + callstd 6 + end + +EventScript_16DB42:: @ 816DB42 + checkflag FLAG_0x265 + call_if 0, EventScript_16DB4D + release + end + +EventScript_16DB4D:: @ 816DB4D + call EventScript_16DC58 + return + +CinnabarIsland_Gym_EventScript_16DB53:: @ 816DB53 + trainerbattle 2, 214, 0, Text_199948, Text_199973, EventScript_16DB6E + loadword 0, gUnknown_8199986 + callstd 6 + end + +EventScript_16DB6E:: @ 816DB6E + checkflag FLAG_0x268 + call_if 0, EventScript_16DB79 + release + end + +EventScript_16DB79:: @ 816DB79 + call EventScript_16DE0F + return + +CinnabarIsland_Gym_EventScript_16DB7F:: @ 816DB7F + trainerbattle 2, 215, 0, Text_199A7F, Text_199AB9, EventScript_16DB9A + loadword 0, gUnknown_8199AC9 + callstd 6 + end + +EventScript_16DB9A:: @ 816DB9A + checkflag FLAG_0x26A + call_if 0, EventScript_16DBA5 + release + end + +EventScript_16DBA5:: @ 816DBA5 + call EventScript_16DFBD + return + +CinnabarIsland_Gym_EventScript_16DBAB:: @ 816DBAB + lock + faceplayer + checkflag FLAG_0x4B6 + goto_if 1, EventScript_16DBC0 + loadword 0, gUnknown_8199B81 + callstd 4 + release + end + +EventScript_16DBC0:: @ 816DBC0 + loadword 0, gUnknown_8199C0C + callstd 4 + release + end + +CinnabarIsland_Gym_EventScript_16DBCA:: @ 816DBCA + lockall + checkflag FLAG_UNK826 + goto_if 1, EventScript_16DBDE + loadword 0, gUnknown_8199C29 + callstd 4 + releaseall + end + +EventScript_16DBDE:: @ 816DBDE + loadword 0, gUnknown_8199C62 + callstd 4 + releaseall + end + +CinnabarIsland_Gym_EventScript_16DBE8:: @ 816DBE8 + lockall + setvar VAR_0x4001, 0 + goto EventScript_16DC00 + end + +CinnabarIsland_Gym_EventScript_16DBF4:: @ 816DBF4 + lockall + setvar VAR_0x4001, 1 + goto EventScript_16DC00 + end + +EventScript_16DC00:: @ 816DC00 + loadword 0, gUnknown_8199C9F + callstd 4 + loadword 0, gUnknown_8199D5A + callstd 5 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16DC43 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16DC6A + end + +EventScript_16DC27:: @ 816DC27 + playfanfare MUS_FANFA1 + waitfanfare + loadword 0, gUnknown_8199E4F + callstd 4 + return + +EventScript_16DC34:: @ 816DC34 + waitse + playse SE_BOO + waitse + loadword 0, gUnknown_8199E79 + callstd 4 + closemessage + return + +EventScript_16DC43:: @ 816DC43 + call EventScript_16DC27 + checkflag FLAG_0x265 + goto_if 1, EventScript_16DC68 + call EventScript_16DC58 + releaseall + end + +EventScript_16DC58:: @ 816DC58 + playse SE_FU_ZAKU2 + waitse + call EventScript_16E117 + special DrawWholeMapView + setflag FLAG_0x265 + return + +EventScript_16DC68:: @ 816DC68 + releaseall + end + +EventScript_16DC6A:: @ 816DC6A + call EventScript_16DC34 + checktrainerflag 213 + goto_if 0, EventScript_16DC7A + releaseall + end + +EventScript_16DC7A:: @ 816DC7A + compare_var_to_value VAR_0x4001, 0 + call_if 1, EventScript_16DCB4 + compare_var_to_value VAR_0x4001, 1 + call_if 1, EventScript_16DCC6 + textcolor 0 + loadword 0, gUnknown_819983F + callstd 4 + trainerbattle 3, 213, 0, Text_199870 + checkflag FLAG_0x265 + goto_if 1, EventScript_16DC68 + call EventScript_16DC58 + releaseall + end + +EventScript_16DCB4:: @ 816DCB4 + applymovement 255, Movement_1A75EB + applymovement 1, Movement_16DCD8 + waitmovement 0 + return + +EventScript_16DCC6:: @ 816DCC6 + applymovement 255, Movement_1A75EB + applymovement 1, Movement_16DCDB + waitmovement 0 + return + +Movement_16DCD8:: @ 816DCD8 + step_12 + step_12 + step_end + +Movement_16DCDB:: @ 816DCDB + step_12 + step_end + +CinnabarIsland_Gym_EventScript_16DCDD:: @ 816DCDD + lockall + setvar VAR_0x4001, 0 + goto EventScript_16DCF5 + end + +CinnabarIsland_Gym_EventScript_16DCE9:: @ 816DCE9 + lockall + setvar VAR_0x4001, 1 + goto EventScript_16DCF5 + end + +EventScript_16DCF5:: @ 816DCF5 + loadword 0, gUnknown_8199C9F + callstd 4 + loadword 0, gUnknown_8199D79 + callstd 5 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16DD41 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16DD1C + end + +EventScript_16DD1C:: @ 816DD1C + call EventScript_16DC27 + checkflag FLAG_0x267 + goto_if 1, EventScript_16DC68 + call EventScript_16DD31 + releaseall + end + +EventScript_16DD31:: @ 816DD31 + playse SE_FU_ZAKU2 + waitse + call EventScript_16E157 + special DrawWholeMapView + setflag FLAG_0x267 + return + +EventScript_16DD41:: @ 816DD41 + call EventScript_16DC34 + checktrainerflag 178 + goto_if 0, EventScript_16DD51 + releaseall + end + +EventScript_16DD51:: @ 816DD51 + compare_var_to_value VAR_0x4001, 0 + call_if 1, EventScript_16DD8B + compare_var_to_value VAR_0x4001, 1 + call_if 1, EventScript_16DD9D + textcolor 0 + loadword 0, gUnknown_81998BD + callstd 4 + trainerbattle 3, 178, 0, Text_1998ED + checkflag FLAG_0x267 + goto_if 1, EventScript_16DC68 + call EventScript_16DD31 + releaseall + end + +EventScript_16DD8B:: @ 816DD8B + applymovement 255, Movement_16DDB7 + applymovement 3, Movement_16DDAF + waitmovement 0 + return + +EventScript_16DD9D:: @ 816DD9D + applymovement 255, Movement_16DDB7 + applymovement 3, Movement_16DDB3 + waitmovement 0 + return + +Movement_16DDAF:: @ 816DDAF + step_11 + step_11 + step_12 + step_end + +Movement_16DDB3:: @ 816DDB3 + step_11 + step_11 + step_2f + step_end + +Movement_16DDB7:: @ 816DDB7 + step_1c + step_1c + step_30 + step_end + +CinnabarIsland_Gym_EventScript_16DDBB:: @ 816DDBB + lockall + setvar VAR_0x4001, 0 + goto EventScript_16DDD3 + end + +CinnabarIsland_Gym_EventScript_16DDC7:: @ 816DDC7 + lockall + setvar VAR_0x4001, 1 + goto EventScript_16DDD3 + end + +EventScript_16DDD3:: @ 816DDD3 + loadword 0, gUnknown_8199C9F + callstd 4 + loadword 0, gUnknown_8199DA9 + callstd 5 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16DE1F + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16DDFA + end + +EventScript_16DDFA:: @ 816DDFA + call EventScript_16DC27 + checkflag FLAG_0x268 + goto_if 1, EventScript_16DC68 + call EventScript_16DE0F + releaseall + end + +EventScript_16DE0F:: @ 816DE0F + playse SE_FU_ZAKU2 + waitse + call EventScript_16E197 + special DrawWholeMapView + setflag FLAG_0x268 + return + +EventScript_16DE1F:: @ 816DE1F + call EventScript_16DC34 + checktrainerflag 214 + goto_if 0, EventScript_16DE2F + releaseall + end + +EventScript_16DE2F:: @ 816DE2F + compare_var_to_value VAR_0x4001, 0 + call_if 1, EventScript_16DE69 + compare_var_to_value VAR_0x4001, 1 + call_if 1, EventScript_16DE7B + textcolor 0 + loadword 0, gUnknown_8199948 + callstd 4 + trainerbattle 3, 214, 0, Text_199973 + checkflag FLAG_0x268 + goto_if 1, EventScript_16DC68 + call EventScript_16DE0F + releaseall + end + +EventScript_16DE69:: @ 816DE69 + applymovement 255, Movement_1A75EB + applymovement 4, Movement_16DE8D + waitmovement 0 + return + +EventScript_16DE7B:: @ 816DE7B + applymovement 255, Movement_1A75EB + applymovement 4, Movement_16DE90 + waitmovement 0 + return + +Movement_16DE8D:: @ 816DE8D + step_12 + step_12 + step_end + +Movement_16DE90:: @ 816DE90 + step_12 + step_end + +CinnabarIsland_Gym_EventScript_16DE92:: @ 816DE92 + lockall + setvar VAR_0x4001, 0 + goto EventScript_16DEAA + end + +CinnabarIsland_Gym_EventScript_16DE9E:: @ 816DE9E + lockall + setvar VAR_0x4001, 1 + goto EventScript_16DEAA + end + +EventScript_16DEAA:: @ 816DEAA + loadword 0, gUnknown_8199C9F + callstd 4 + loadword 0, gUnknown_8199DC6 + callstd 5 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16DEF6 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16DED1 + end + +EventScript_16DED1:: @ 816DED1 + call EventScript_16DC27 + checkflag FLAG_0x269 + goto_if 1, EventScript_16DC68 + call EventScript_16DEE6 + releaseall + end + +EventScript_16DEE6:: @ 816DEE6 + playse SE_FU_ZAKU2 + waitse + call EventScript_16E1D7 + special DrawWholeMapView + setflag FLAG_0x269 + return + +EventScript_16DEF6:: @ 816DEF6 + call EventScript_16DC34 + checktrainerflag 179 + goto_if 0, EventScript_16DF06 + releaseall + end + +EventScript_16DF06:: @ 816DF06 + compare_var_to_value VAR_0x4001, 0 + call_if 1, EventScript_16DF40 + compare_var_to_value VAR_0x4001, 1 + call_if 1, EventScript_16DF52 + textcolor 0 + loadword 0, gUnknown_81999B7 + callstd 4 + trainerbattle 3, 179, 0, Text_1999DB + checkflag FLAG_0x269 + goto_if 1, EventScript_16DC68 + call EventScript_16DEE6 + releaseall + end + +EventScript_16DF40:: @ 816DF40 + applymovement 255, Movement_1A75EB + applymovement 5, Movement_16DF64 + waitmovement 0 + return + +EventScript_16DF52:: @ 816DF52 + applymovement 255, Movement_1A75EB + applymovement 5, Movement_16DF67 + waitmovement 0 + return + +Movement_16DF64:: @ 816DF64 + step_12 + step_12 + step_end + +Movement_16DF67:: @ 816DF67 + step_12 + step_end + +CinnabarIsland_Gym_EventScript_16DF69:: @ 816DF69 + lockall + setvar VAR_0x4001, 0 + goto EventScript_16DF81 + end + +CinnabarIsland_Gym_EventScript_16DF75:: @ 816DF75 + lockall + setvar VAR_0x4001, 1 + goto EventScript_16DF81 + end + +EventScript_16DF81:: @ 816DF81 + loadword 0, gUnknown_8199C9F + callstd 4 + loadword 0, gUnknown_8199E00 + callstd 5 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16DFA8 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16DFCD + end + +EventScript_16DFA8:: @ 816DFA8 + call EventScript_16DC27 + checkflag FLAG_0x26A + goto_if 1, EventScript_16DC68 + call EventScript_16DFBD + releaseall + end + +EventScript_16DFBD:: @ 816DFBD + playse SE_FU_ZAKU2 + waitse + call EventScript_16E1F3 + special DrawWholeMapView + setflag FLAG_0x26A + return + +EventScript_16DFCD:: @ 816DFCD + call EventScript_16DC34 + checktrainerflag 215 + goto_if 0, EventScript_16DFDD + releaseall + end + +EventScript_16DFDD:: @ 816DFDD + compare_var_to_value VAR_0x4001, 0 + call_if 1, EventScript_16E017 + compare_var_to_value VAR_0x4001, 1 + call_if 1, EventScript_16E029 + textcolor 0 + loadword 0, gUnknown_8199A7F + callstd 4 + trainerbattle 3, 215, 0, Text_199AB9 + checkflag FLAG_0x26A + goto_if 1, EventScript_16DC68 + call EventScript_16DFBD + releaseall + end + +EventScript_16E017:: @ 816E017 + applymovement 255, Movement_1A75EB + applymovement 6, Movement_16E03B + waitmovement 0 + return + +EventScript_16E029:: @ 816E029 + applymovement 255, Movement_1A75EB + applymovement 6, Movement_16E03E + waitmovement 0 + return + +Movement_16E03B:: @ 816E03B + step_12 + step_12 + step_end + +Movement_16E03E:: @ 816E03E + step_12 + step_end + +CinnabarIsland_Gym_EventScript_16E040:: @ 816E040 + lockall + setvar VAR_0x4001, 0 + goto EventScript_16E058 + end + +CinnabarIsland_Gym_EventScript_16E04C:: @ 816E04C + lockall + setvar VAR_0x4001, 1 + goto EventScript_16E058 + end + +EventScript_16E058:: @ 816E058 + loadword 0, gUnknown_8199C9F + callstd 4 + loadword 0, gUnknown_8199E36 + callstd 5 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16E0A4 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16E07F + end + +EventScript_16E07F:: @ 816E07F + call EventScript_16DC27 + checkflag FLAG_0x26B + goto_if 1, EventScript_16DC68 + call EventScript_16E094 + releaseall + end + +EventScript_16E094:: @ 816E094 + playse SE_FU_ZAKU2 + waitse + call EventScript_16E233 + special DrawWholeMapView + setflag FLAG_0x26B + return + +EventScript_16E0A4:: @ 816E0A4 + call EventScript_16DC34 + checktrainerflag 180 + goto_if 0, EventScript_16E0B4 + releaseall + end + +EventScript_16E0B4:: @ 816E0B4 + compare_var_to_value VAR_0x4001, 0 + call_if 1, EventScript_16E0EE + compare_var_to_value VAR_0x4001, 1 + call_if 1, EventScript_16E100 + textcolor 0 + loadword 0, gUnknown_8199AFC + callstd 4 + trainerbattle 3, 180, 0, Text_199B16 + checkflag FLAG_0x26B + goto_if 1, EventScript_16DC68 + call EventScript_16E094 + releaseall + end + +EventScript_16E0EE:: @ 816E0EE + applymovement 255, Movement_1A75EB + applymovement 7, Movement_16E112 + waitmovement 0 + return + +EventScript_16E100:: @ 816E100 + applymovement 255, Movement_1A75EB + applymovement 7, Movement_16E115 + waitmovement 0 + return + +Movement_16E112:: @ 816E112 + step_12 + step_12 + step_end + +Movement_16E115:: @ 816E115 + step_12 + step_end + +EventScript_16E117:: @ 816E117 + setmetatile 26, 8, 711, 0 + setmetatile 27, 8, 710, 0 + setmetatile 26, 9, 719, 0 + setmetatile 27, 9, 718, 0 + setmetatile 26, 10, 649, 0 + setmetatile 27, 10, 641, 0 + setmetatile 28, 10, 642, 0 + return + +EventScript_16E157:: @ 816E157 + setmetatile 17, 8, 711, 0 + setmetatile 18, 8, 710, 0 + setmetatile 17, 9, 719, 0 + setmetatile 18, 9, 718, 0 + setmetatile 17, 10, 649, 0 + setmetatile 18, 10, 641, 0 + setmetatile 19, 10, 642, 0 + return + +EventScript_16E197:: @ 816E197 + setmetatile 17, 15, 711, 0 + setmetatile 18, 15, 710, 0 + setmetatile 17, 16, 719, 0 + setmetatile 18, 16, 718, 0 + setmetatile 17, 17, 649, 0 + setmetatile 18, 17, 641, 0 + setmetatile 19, 17, 642, 0 + return + +EventScript_16E1D7:: @ 816E1D7 + setmetatile 11, 21, 721, 1 + setmetatile 11, 22, 649, 0 + setmetatile 11, 23, 641, 0 + return + +EventScript_16E1F3:: @ 816E1F3 + setmetatile 5, 16, 711, 0 + setmetatile 6, 16, 710, 0 + setmetatile 5, 17, 719, 0 + setmetatile 6, 17, 718, 0 + setmetatile 5, 18, 649, 0 + setmetatile 6, 18, 641, 0 + setmetatile 7, 18, 642, 0 + return + +EventScript_16E233:: @ 816E233 + setmetatile 5, 8, 711, 0 + setmetatile 6, 8, 710, 0 + setmetatile 5, 9, 719, 0 + setmetatile 6, 9, 718, 0 + setmetatile 5, 10, 649, 0 + setmetatile 6, 10, 641, 0 + setmetatile 7, 10, 642, 0 + return diff --git a/data/maps/CinnabarIsland_Mart/scripts.inc b/data/maps/CinnabarIsland_Mart/scripts.inc new file mode 100644 index 000000000..f9808d872 --- /dev/null +++ b/data/maps/CinnabarIsland_Mart/scripts.inc @@ -0,0 +1,39 @@ +CinnabarIsland_Mart_MapScripts:: @ 816EA0F + .byte 0 + +CinnabarIsland_Mart_EventScript_16EA10:: @ 816EA10 + loadword 0, gUnknown_819A7A0 + callstd 2 + end + +CinnabarIsland_Mart_EventScript_16EA19:: @ 816EA19 + loadword 0, gUnknown_819A7F1 + callstd 2 + end + +CinnabarIsland_Mart_EventScript_16EA22:: @ 816EA22 + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + lock + faceplayer + message Text_1A6211 + waitmessage + pokemart Items_16EA48 + loadword 0, gUnknown_81A5190 + callstd 4 + release + end + + .align 2 +Items_16EA48:: @ 816EA48 + .2byte ITEM_ULTRA_BALL + .2byte ITEM_GREAT_BALL + .2byte ITEM_HYPER_POTION + .2byte ITEM_REVIVE + .2byte ITEM_FULL_HEAL + .2byte ITEM_ESCAPE_ROPE + .2byte ITEM_MAX_REPEL + .2byte ITEM_NONE + release + end diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc new file mode 100644 index 000000000..554dd6943 --- /dev/null +++ b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc @@ -0,0 +1,150 @@ +CinnabarIsland_PokemonCenter_1F_MapScripts:: @ 816E8D7 + map_script 3, CinnabarIsland_PokemonCenter_1F_MapScript1_16E8E2 + map_script 5, CinnabarIsland_PokemonCenter_1F_MapScript2_1BC05C + .byte 0 + +CinnabarIsland_PokemonCenter_1F_MapScript1_16E8E2:: @ 816E8E2 + setrespawn 9 + end + +CinnabarIsland_PokemonCenter_1F_EventScript_16E8E6:: @ 816E8E6 + lock + faceplayer + call EventScript_1A6578 + release + end + +CinnabarIsland_PokemonCenter_1F_EventScript_16E8EF:: @ 816E8EF + loadword 0, gUnknown_819A5BE + callstd 2 + end + +CinnabarIsland_PokemonCenter_1F_EventScript_16E8F8:: @ 816E8F8 + loadword 0, gUnknown_819A4F8 + callstd 2 + end + +CinnabarIsland_PokemonCenter_1F_EventScript_16E901:: @ 816E901 + loadword 0, gUnknown_819A6B1 + callstd 2 + end + +CinnabarIsland_PokemonCenter_1F_EventScript_16E90A:: @ 816E90A + lock + faceplayer + loadword 0, gUnknown_819A725 + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16E9A5 + loadword 0, gUnknown_819A785 + callstd 4 + closemessage + playbgm BGM_FRLG_FOLLOW_ME, 1 + savebgm BGM_FRLG_FOLLOW_ME + setflag FLAG_SPECIAL_FLAG_0x4001 + setflag FLAG_0x0A2 + delay 20 + compare_var_to_value VAR_FACING, 1 + call_if 1, EventScript_16E96F + compare_var_to_value VAR_FACING, 4 + call_if 1, EventScript_16E981 + compare_var_to_value VAR_FACING, 3 + call_if 1, EventScript_16E993 + removeobject 7 + setvar VAR_0x408A, 1 + clearflag FLAG_0x062 + warp MAP_CINNABARISLAND, 255, 14, 11 + waitstate + release + end + +EventScript_16E96F:: @ 816E96F + applymovement 7, Movement_16E9AF + applymovement 255, Movement_16E9B9 + waitmovement 0 + return + +EventScript_16E981:: @ 816E981 + applymovement 7, Movement_16E9C3 + applymovement 255, Movement_16E9CF + waitmovement 0 + return + +EventScript_16E993:: @ 816E993 + applymovement 7, Movement_16E9AF + applymovement 255, Movement_16E9DE + waitmovement 0 + return + +EventScript_16E9A5:: @ 816E9A5 + loadword 0, gUnknown_819A766 + callstd 4 + release + end + +Movement_16E9AF:: @ 816E9AF + step_12 + step_12 + step_12 + step_12 + step_10 + step_10 + step_10 + step_1b + step_60 + step_end + +Movement_16E9B9:: @ 816E9B9 + step_10 + step_12 + step_12 + step_12 + step_12 + step_10 + step_10 + step_1c + step_10 + step_end + +Movement_16E9C3:: @ 816E9C3 + step_11 + step_12 + step_12 + step_10 + step_12 + step_12 + step_10 + step_10 + step_10 + step_1b + step_60 + step_end + +Movement_16E9CF:: @ 816E9CF + step_1c + step_1c + step_1c + step_02 + step_1c + step_12 + step_12 + step_12 + step_10 + step_10 + step_1b + step_10 + step_1b + step_60 + step_end + +Movement_16E9DE:: @ 816E9DE + step_12 + step_12 + step_12 + step_12 + step_12 + step_10 + step_10 + step_1c + step_10 + step_end diff --git a/data/maps/CinnabarIsland_PokemonCenter_2F/scripts.inc b/data/maps/CinnabarIsland_PokemonCenter_2F/scripts.inc new file mode 100644 index 000000000..90969f46d --- /dev/null +++ b/data/maps/CinnabarIsland_PokemonCenter_2F/scripts.inc @@ -0,0 +1,18 @@ +CinnabarIsland_PokemonCenter_2F_MapScripts:: @ 816E9E8 + map_script 2, CinnabarIsland_PokemonCenter_2F_MapScript1_1BB2A3 + map_script 4, CinnabarIsland_PokemonCenter_2F_MapScript2_1BB1ED + map_script 1, CinnabarIsland_PokemonCenter_2F_MapScript3_1BB237 + map_script 3, CinnabarIsland_PokemonCenter_2F_MapScript4_1BB1B4 + .byte 0 + +CinnabarIsland_PokemonCenter_2F_EventScript_16E9FD:: @ 816E9FD + call EventScript_1BB4A3 + end + +EventScript_16EA03:: @ 816EA03 + call EventScript_1BB6AB + end + +EventScript_16EA09:: @ 816EA09 + call EventScript_1BB7DE + end diff --git a/data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc new file mode 100644 index 000000000..e32112ffc --- /dev/null +++ b/data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc @@ -0,0 +1,37 @@ +CinnabarIsland_PokemonLab_Entrance_MapScripts:: @ 816E273 + map_script 3, CinnabarIsland_PokemonLab_Entrance_MapScript1_16E279 + .byte 0 + +CinnabarIsland_PokemonLab_Entrance_MapScript1_16E279:: @ 816E279 + compare_var_to_value VAR_0x406A, 1 + call_if 1, EventScript_16E285 + end + +EventScript_16E285:: @ 816E285 + setvar VAR_0x406A, 2 + return + +CinnabarIsland_PokemonLab_Entrance_EventScript_16E28B:: @ 816E28B + loadword 0, gUnknown_8199EE5 + callstd 2 + end + +CinnabarIsland_PokemonLab_Entrance_EventScript_16E294:: @ 816E294 + loadword 0, gUnknown_8199F41 + callstd 3 + end + +CinnabarIsland_PokemonLab_Entrance_EventScript_16E29D:: @ 816E29D + loadword 0, gUnknown_8199F6A + callstd 3 + end + +CinnabarIsland_PokemonLab_Entrance_EventScript_16E2A6:: @ 816E2A6 + loadword 0, gUnknown_8199F83 + callstd 3 + end + +CinnabarIsland_PokemonLab_Entrance_EventScript_16E2AF:: @ 816E2AF + loadword 0, gUnknown_8199F9A + callstd 3 + end diff --git a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc new file mode 100644 index 000000000..3b0168728 --- /dev/null +++ b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc @@ -0,0 +1,362 @@ +CinnabarIsland_PokemonLab_ExperimentRoom_MapScripts:: @ 816E400 + .byte 0 + +CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E401:: @ 816E401 + lock + faceplayer + setvar VAR_0x8008, 8 + call EventScript_1A8CAD + checkflag FLAG_0x276 + goto_if 1, EventScript_16E473 + loadword 0, gUnknown_81A597B + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16E45B + call EventScript_1A8CBD + compare_var_to_value VAR_0x8004, 6 + goto_if 4, EventScript_16E45B + call EventScript_1A8CC9 + compare_var_to_var VAR_RESULT, VAR_0x8009 + goto_if 5, EventScript_16E465 + call EventScript_1A8CD9 + loadword 0, gUnknown_81A59DA + callstd 4 + setflag FLAG_0x276 + release + end + +EventScript_16E45B:: @ 816E45B + loadword 0, gUnknown_81A59B6 + callstd 4 + release + end + +EventScript_16E465:: @ 816E465 + getspeciesname 0, 32777 + loadword 0, gUnknown_81A59C6 + callstd 4 + release + end + +EventScript_16E473:: @ 816E473 + loadword 0, gUnknown_81A59E7 + callstd 4 + release + end + +CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E47D:: @ 816E47D + lock + faceplayer + setvar VAR_RESULT, 0 + checkflag FLAG_0x2EE + call_if 1, EventScript_16E8A1 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16E897 + compare_var_to_value VAR_0x406A, 2 + goto_if 1, EventScript_16E736 + compare_var_to_value VAR_0x406A, 1 + goto_if 1, EventScript_16E72C + call EventScript_16E4EC + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16E544 + call EventScript_16E504 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16E586 + call EventScript_16E51C + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16E5C8 + loadword 0, gUnknown_819A282 + callstd 4 + goto EventScript_16E53A + end + +EventScript_16E4EC:: @ 816E4EC + checkflag FLAG_0x273 + goto_if 0, EventScript_16E534 + checkflag FLAG_0x2ED + goto_if 1, EventScript_16E534 + setvar VAR_RESULT, 1 + return + +EventScript_16E504:: @ 816E504 + checkflag FLAG_0x272 + goto_if 0, EventScript_16E534 + checkflag FLAG_0x2EC + goto_if 1, EventScript_16E534 + setvar VAR_RESULT, 1 + return + +EventScript_16E51C:: @ 816E51C + checkflag FLAG_0x25E + goto_if 0, EventScript_16E534 + checkflag FLAG_0x2EE + goto_if 1, EventScript_16E534 + setvar VAR_RESULT, 1 + return + +EventScript_16E534:: @ 816E534 + setvar VAR_RESULT, 0 + return + +EventScript_16E53A:: @ 816E53A + loadword 0, gUnknown_819A314 + callstd 4 + release + end + +EventScript_16E544:: @ 816E544 + message Text_19A282 + waitmessage + call EventScript_16E51C + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16E5FA + multichoice 0, 0, 21, 0 + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_16E668 + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_16E53A + compare_var_to_value VAR_0x8000, 127 + goto_if 1, EventScript_16E53A + end + +EventScript_16E586:: @ 816E586 + message Text_19A282 + waitmessage + call EventScript_16E51C + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16E631 + multichoice 0, 0, 22, 0 + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_16E6A6 + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_16E53A + compare_var_to_value VAR_0x8000, 127 + goto_if 1, EventScript_16E53A + end + +EventScript_16E5C8:: @ 816E5C8 + message Text_19A282 + waitmessage + multichoice 0, 0, 23, 0 + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_16E6E4 + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_16E53A + compare_var_to_value VAR_0x8000, 127 + goto_if 1, EventScript_16E53A + end + +EventScript_16E5FA:: @ 816E5FA + multichoice 0, 0, 24, 0 + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_16E668 + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_16E6E4 + compare_var_to_value VAR_0x8000, 2 + goto_if 1, EventScript_16E53A + compare_var_to_value VAR_0x8000, 127 + goto_if 1, EventScript_16E53A + end + +EventScript_16E631:: @ 816E631 + multichoice 0, 0, 25, 0 + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_16E6A6 + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_16E6E4 + compare_var_to_value VAR_0x8000, 2 + goto_if 1, EventScript_16E53A + compare_var_to_value VAR_0x8000, 127 + goto_if 1, EventScript_16E53A + end + +EventScript_16E668:: @ 816E668 + getspeciesname 0, SPECIES_OMANYTE + getitemname 1, ITEM_HELIX_FOSSIL + loadword 0, gUnknown_819A3D4 + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16E722 + loadword 0, gUnknown_819A45D + callstd 4 + textcolor 0 + removeitem ITEM_HELIX_FOSSIL, 1 + loadword 0, gUnknown_819A4AB + callstd 4 + setvar VAR_0x406A, 1 + setvar VAR_0x4069, 1 + release + end + +EventScript_16E6A6:: @ 816E6A6 + getspeciesname 0, SPECIES_KABUTO + getitemname 1, ITEM_DOME_FOSSIL + loadword 0, gUnknown_819A3D4 + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16E722 + loadword 0, gUnknown_819A45D + callstd 4 + textcolor 0 + removeitem ITEM_DOME_FOSSIL, 1 + loadword 0, gUnknown_819A4AB + callstd 4 + setvar VAR_0x406A, 1 + setvar VAR_0x4069, 2 + release + end + +EventScript_16E6E4:: @ 816E6E4 + getspeciesname 0, SPECIES_AERODACTYL + getitemname 1, ITEM_OLD_AMBER + loadword 0, gUnknown_819A3D4 + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16E722 + loadword 0, gUnknown_819A45D + callstd 4 + textcolor 0 + removeitem ITEM_OLD_AMBER, 1 + loadword 0, gUnknown_819A4AB + callstd 4 + setvar VAR_0x406A, 1 + setvar VAR_0x4069, 3 + release + end + +EventScript_16E722:: @ 816E722 + loadword 0, gUnknown_819A4E1 + callstd 4 + release + end + +EventScript_16E72C:: @ 816E72C + loadword 0, gUnknown_819A4AB + callstd 4 + release + end + +EventScript_16E736:: @ 816E736 + compare_var_to_value VAR_0x4069, 1 + goto_if 1, EventScript_16E758 + compare_var_to_value VAR_0x4069, 2 + goto_if 1, EventScript_16E79D + compare_var_to_value VAR_0x4069, 3 + goto_if 1, EventScript_16E7E2 + end + +EventScript_16E758:: @ 816E758 + setvar VAR_0x4001, 138 + getspeciesname 0, SPECIES_OMANYTE + loadword 0, gUnknown_819A34F + callstd 4 + givemon SPECIES_OMANYTE, 5, ITEM_NONE, 0, 0, 0 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A927C + setflag FLAG_0x2ED + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16E827 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16E85B + end + +EventScript_16E79D:: @ 816E79D + setvar VAR_0x4001, 140 + getspeciesname 0, SPECIES_KABUTO + loadword 0, gUnknown_819A34F + callstd 4 + givemon SPECIES_KABUTO, 5, ITEM_NONE, 0, 0, 0 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A927C + setflag FLAG_0x2EC + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16E827 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16E85B + end + +EventScript_16E7E2:: @ 816E7E2 + setvar VAR_0x4001, 142 + getspeciesname 0, SPECIES_AERODACTYL + loadword 0, gUnknown_819A34F + callstd 4 + givemon SPECIES_AERODACTYL, 5, ITEM_NONE, 0, 0, 0 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A927C + setflag FLAG_0x2EE + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16E827 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16E85B + end + +EventScript_16E827:: @ 816E827 + textcolor 3 + playfanfare MUS_FANFA1 + message Text_19A39E + waitmessage + waitfanfare + setvar VAR_0x406A, 0 + loadword 0, gUnknown_81A56A7 + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16E895 + call EventScript_1A8C27 + call EventScript_1A74EB + goto EventScript_16E895 + end + +EventScript_16E85B:: @ 816E85B + textcolor 3 + playfanfare MUS_FANFA1 + message Text_19A39E + waitmessage + waitfanfare + setvar VAR_0x406A, 0 + loadword 0, gUnknown_81A56A7 + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16E88A + call EventScript_1A8C33 + goto EventScript_16E88A + end + +EventScript_16E88A:: @ 816E88A + call EventScript_1A8C3C + goto EventScript_16E895 + end + +EventScript_16E895:: @ 816E895 + release + end + +EventScript_16E897:: @ 816E897 + loadword 0, gUnknown_819A4E1 + callstd 4 + release + end + +EventScript_16E8A1:: @ 816E8A1 + checkflag FLAG_0x273 + goto_if 1, EventScript_16E8B9 + checkflag FLAG_0x272 + goto_if 1, EventScript_16E8C8 + goto EventScript_16E534 + end + +EventScript_16E8B9:: @ 816E8B9 + checkflag FLAG_0x2ED + goto_if 0, EventScript_16E534 + setvar VAR_RESULT, 1 + return + +EventScript_16E8C8:: @ 816E8C8 + checkflag FLAG_0x2EC + goto_if 0, EventScript_16E534 + setvar VAR_RESULT, 1 + return diff --git a/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc new file mode 100644 index 000000000..cf6b63139 --- /dev/null +++ b/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc @@ -0,0 +1,103 @@ +CinnabarIsland_PokemonLab_Lounge_MapScripts:: @ 816E2B8 + .byte 0 + +CinnabarIsland_PokemonLab_Lounge_EventScript_16E2B9:: @ 816E2B9 + loadword 0, gUnknown_8199FB3 + callstd 2 + end + +CinnabarIsland_PokemonLab_Lounge_EventScript_16E2C2:: @ 816E2C2 + lock + faceplayer + setvar VAR_0x8008, 6 + call EventScript_1A8CAD + checkflag FLAG_0x274 + goto_if 1, EventScript_16E334 + loadword 0, gUnknown_81A59FE + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16E31C + call EventScript_1A8CBD + compare_var_to_value VAR_0x8004, 6 + goto_if 4, EventScript_16E31C + call EventScript_1A8CC9 + compare_var_to_var VAR_RESULT, VAR_0x8009 + goto_if 5, EventScript_16E326 + call EventScript_1A8CD9 + loadword 0, gUnknown_81A5A9D + callstd 4 + setflag FLAG_0x274 + release + end + +EventScript_16E31C:: @ 816E31C + loadword 0, gUnknown_81A5A4E + callstd 4 + release + end + +EventScript_16E326:: @ 816E326 + getspeciesname 0, 32777 + loadword 0, gUnknown_81A5A6A + callstd 4 + release + end + +EventScript_16E334:: @ 816E334 + loadword 0, gUnknown_81A5AA5 + callstd 4 + release + end + +CinnabarIsland_PokemonLab_Lounge_EventScript_16E33E:: @ 816E33E + lock + faceplayer + setvar VAR_0x8008, 7 + copyvar VAR_0x8004, VAR_0x8008 + specialvar VAR_RESULT, sub_8053A9C + copyvar VAR_0x8009, VAR_RESULT + checkflag FLAG_0x275 + goto_if 1, EventScript_16E3D4 + loadword 0, gUnknown_81A5AD6 + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16E3BC + special sub_80BF8FC + waitstate + copyvar VAR_0x800A, VAR_0x8004 + compare_var_to_value VAR_0x8004, 6 + goto_if 4, EventScript_16E3BC + copyvar VAR_0x8005, VAR_0x800A + specialvar VAR_RESULT, sub_8053D2C + copyvar VAR_0x800B, VAR_RESULT + compare_var_to_var VAR_RESULT, VAR_0x8009 + goto_if 5, EventScript_16E3C6 + copyvar VAR_0x8004, VAR_0x8008 + copyvar VAR_0x8005, VAR_0x800A + special sub_8053D68 + special sub_8054440 + waitstate + loadword 0, gUnknown_81A5B4A + callstd 4 + setflag FLAG_0x275 + release + end + +EventScript_16E3BC:: @ 816E3BC + loadword 0, gUnknown_81A5B08 + callstd 4 + release + end + +EventScript_16E3C6:: @ 816E3C6 + getspeciesname 0, 32777 + loadword 0, gUnknown_81A5B18 + callstd 4 + release + end + +EventScript_16E3D4:: @ 816E3D4 + loadword 0, gUnknown_81A5B60 + callstd 4 + release + end diff --git a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/scripts.inc new file mode 100644 index 000000000..00fe86925 --- /dev/null +++ b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/scripts.inc @@ -0,0 +1,21 @@ +CinnabarIsland_PokemonLab_ResearchRoom_MapScripts:: @ 816E3DE + .byte 0 + +CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3DF:: @ 816E3DF + goto EventScript_1C4C8E + end + +CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3E5:: @ 816E3E5 + loadword 0, gUnknown_819A015 + callstd 2 + end + +CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3EE:: @ 816E3EE + loadword 0, gUnknown_819A04A + callstd 3 + end + +CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3F7:: @ 816E3F7 + loadword 0, gUnknown_819A128 + callstd 3 + end diff --git a/data/maps/DiglettsCave_B1F/scripts.inc b/data/maps/DiglettsCave_B1F/scripts.inc new file mode 100644 index 000000000..cda6522cc --- /dev/null +++ b/data/maps/DiglettsCave_B1F/scripts.inc @@ -0,0 +1,7 @@ +DiglettsCave_B1F_MapScripts:: @ 8160EF1 + map_script 3, DiglettsCave_B1F_MapScript1_160EF7 + .byte 0 + +DiglettsCave_B1F_MapScript1_160EF7:: @ 8160EF7 + setworldmapflag 2217 + end diff --git a/data/maps/DiglettsCave_NorthEntrance/scripts.inc b/data/maps/DiglettsCave_NorthEntrance/scripts.inc new file mode 100644 index 000000000..d5361b81a --- /dev/null +++ b/data/maps/DiglettsCave_NorthEntrance/scripts.inc @@ -0,0 +1,7 @@ +DiglettsCave_NorthEntrance_MapScripts:: @ 8160EE7 + .byte 0 + +DiglettsCave_NorthEntrance_EventScript_160EE8:: @ 8160EE8 + loadword 0, gUnknown_817462C + callstd 2 + end diff --git a/data/maps/DiglettsCave_SouthEntrance/scripts.inc b/data/maps/DiglettsCave_SouthEntrance/scripts.inc new file mode 100644 index 000000000..78db82fe7 --- /dev/null +++ b/data/maps/DiglettsCave_SouthEntrance/scripts.inc @@ -0,0 +1,7 @@ +DiglettsCave_SouthEntrance_MapScripts:: @ 8160EFB + .byte 0 + +DiglettsCave_SouthEntrance_EventScript_160EFC:: @ 8160EFC + loadword 0, gUnknown_81746A7 + callstd 2 + end diff --git a/data/maps/FiveIsland/scripts.inc b/data/maps/FiveIsland/scripts.inc new file mode 100644 index 000000000..43db0e050 --- /dev/null +++ b/data/maps/FiveIsland/scripts.inc @@ -0,0 +1,22 @@ +FiveIsland_MapScripts:: @ 8167E8E + map_script 3, FiveIsland_MapScript1_167E94 + .byte 0 + +FiveIsland_MapScript1_167E94:: @ 8167E94 + setworldmapflag 2207 + end + +FiveIsland_EventScript_167E98:: @ 8167E98 + loadword 0, gUnknown_8182DFB + callstd 3 + end + +FiveIsland_EventScript_167EA1:: @ 8167EA1 + loadword 0, gUnknown_8182E26 + callstd 2 + end + +FiveIsland_EventScript_167EAA:: @ 8167EAA + loadword 0, gUnknown_8182E96 + callstd 2 + end diff --git a/data/maps/FiveIsland_Harbor/scripts.inc b/data/maps/FiveIsland_Harbor/scripts.inc new file mode 100644 index 000000000..a88a2f3fd --- /dev/null +++ b/data/maps/FiveIsland_Harbor/scripts.inc @@ -0,0 +1,11 @@ +FiveIsland_Harbor_MapScripts:: @ 8171D42 + .byte 0 + +FiveIsland_Harbor_EventScript_171D43:: @ 8171D43 + lock + faceplayer + message Text_181726 + waitmessage + setvar VAR_0x8004, 5 + goto EventScript_1A900F + end diff --git a/data/maps/FiveIsland_House1/scripts.inc b/data/maps/FiveIsland_House1/scripts.inc new file mode 100644 index 000000000..ca38f9944 --- /dev/null +++ b/data/maps/FiveIsland_House1/scripts.inc @@ -0,0 +1,7 @@ +FiveIsland_House1_MapScripts:: @ 8171D56 + .byte 0 + +FiveIsland_House1_EventScript_171D57:: @ 8171D57 + loadword 0, gUnknown_81A3CAC + callstd 2 + end diff --git a/data/maps/FiveIsland_House2/scripts.inc b/data/maps/FiveIsland_House2/scripts.inc new file mode 100644 index 000000000..313e27a92 --- /dev/null +++ b/data/maps/FiveIsland_House2/scripts.inc @@ -0,0 +1,7 @@ +FiveIsland_House2_MapScripts:: @ 8171D60 + .byte 0 + +FiveIsland_House2_EventScript_171D61:: @ 8171D61 + loadword 0, gUnknown_81A3D5E + callstd 2 + end diff --git a/data/maps/FiveIsland_LostCave_Entrance/scripts.inc b/data/maps/FiveIsland_LostCave_Entrance/scripts.inc new file mode 100644 index 000000000..a6dc91f63 --- /dev/null +++ b/data/maps/FiveIsland_LostCave_Entrance/scripts.inc @@ -0,0 +1,7 @@ +FiveIsland_LostCave_Entrance_MapScripts:: @ 8164BEC + map_script 3, FiveIsland_LostCave_Entrance_MapScript1_164BF2 + .byte 0 + +FiveIsland_LostCave_Entrance_MapScript1_164BF2:: @ 8164BF2 + setworldmapflag 2236 + end diff --git a/data/maps/FiveIsland_LostCave_Room1/scripts.inc b/data/maps/FiveIsland_LostCave_Room1/scripts.inc new file mode 100644 index 000000000..2225c0315 --- /dev/null +++ b/data/maps/FiveIsland_LostCave_Room1/scripts.inc @@ -0,0 +1,8 @@ +FiveIsland_LostCave_Room1_MapScripts:: @ 8164BF6 + .byte 0 + +FiveIsland_LostCave_Room1_EventScript_164BF7:: @ 8164BF7 + trainerbattle 0, 607, 0, Text_17CEF5, Text_17CF42 + loadword 0, gUnknown_817CF54 + callstd 6 + end diff --git a/data/maps/FiveIsland_LostCave_Room10/scripts.inc b/data/maps/FiveIsland_LostCave_Room10/scripts.inc new file mode 100644 index 000000000..4cc0d7204 --- /dev/null +++ b/data/maps/FiveIsland_LostCave_Room10/scripts.inc @@ -0,0 +1,68 @@ +FiveIsland_LostCave_Room10_MapScripts:: @ 8164C2D + map_script 5, FiveIsland_LostCave_Room10_MapScript1_164C38 + map_script 2, FiveIsland_LostCave_Room10_MapScript2_164C48 + .byte 0 + +FiveIsland_LostCave_Room10_MapScript1_164C38:: @ 8164C38 + checktrainerflag 606 + call_if 1, EventScript_164C42 + end + +EventScript_164C42:: @ 8164C42 + setvar VAR_0x4083, 1 + return + +FiveIsland_LostCave_Room10_MapScript2_164C48:: @ 8164C48 + map_script_2 VAR_0x4083, 0, EventScript_164C52 + .2byte 0 + +EventScript_164C52:: @ 8164C52 + lockall + textcolor 1 + applymovement 1, Movement_164CC0 + waitmovement 0 + delay 100 + applymovement 1, Movement_164CC8 + waitmovement 0 + loadword 0, gUnknown_817D062 + callstd 4 + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_164CB6 + trainerbattle 3, 606, 0, Text_17D086 + loadword 0, gUnknown_817D0B2 + callstd 4 + closemessage + call EventScript_164CA5 + warp MAP_FIVEISLAND_RESORTGORGEOUS, 255, 39, 10 + waitstate + releaseall + end + +EventScript_164CA5:: @ 8164CA5 + setflag FLAG_0x093 + clearflag FLAG_0x094 + setvar VAR_0x4083, 1 + setvar VAR_0x4084, 1 + return + +EventScript_164CB6:: @ 8164CB6 + settrainerflag 606 + call EventScript_164CA5 + releaseall + end + +Movement_164CC0:: @ 8164CC0 + step_12 + step_1c + step_13 + step_1c + step_2e + step_1c + step_2d + step_end + +Movement_164CC8:: @ 8164CC8 + step_10 + step_10 + step_end diff --git a/data/maps/FiveIsland_LostCave_Room11/scripts.inc b/data/maps/FiveIsland_LostCave_Room11/scripts.inc new file mode 100644 index 000000000..be5962481 --- /dev/null +++ b/data/maps/FiveIsland_LostCave_Room11/scripts.inc @@ -0,0 +1,2 @@ +FiveIsland_LostCave_Room11_MapScripts:: @ 8164CCB + .byte 0 diff --git a/data/maps/FiveIsland_LostCave_Room12/scripts.inc b/data/maps/FiveIsland_LostCave_Room12/scripts.inc new file mode 100644 index 000000000..388153884 --- /dev/null +++ b/data/maps/FiveIsland_LostCave_Room12/scripts.inc @@ -0,0 +1,2 @@ +FiveIsland_LostCave_Room12_MapScripts:: @ 8164CCC + .byte 0 diff --git a/data/maps/FiveIsland_LostCave_Room13/scripts.inc b/data/maps/FiveIsland_LostCave_Room13/scripts.inc new file mode 100644 index 000000000..9ee934a90 --- /dev/null +++ b/data/maps/FiveIsland_LostCave_Room13/scripts.inc @@ -0,0 +1,2 @@ +FiveIsland_LostCave_Room13_MapScripts:: @ 8164CCD + .byte 0 diff --git a/data/maps/FiveIsland_LostCave_Room14/scripts.inc b/data/maps/FiveIsland_LostCave_Room14/scripts.inc new file mode 100644 index 000000000..b7e59feaa --- /dev/null +++ b/data/maps/FiveIsland_LostCave_Room14/scripts.inc @@ -0,0 +1,2 @@ +FiveIsland_LostCave_Room14_MapScripts:: @ 8164CCE + .byte 0 diff --git a/data/maps/FiveIsland_LostCave_Room2/scripts.inc b/data/maps/FiveIsland_LostCave_Room2/scripts.inc new file mode 100644 index 000000000..29aab8eeb --- /dev/null +++ b/data/maps/FiveIsland_LostCave_Room2/scripts.inc @@ -0,0 +1,2 @@ +FiveIsland_LostCave_Room2_MapScripts:: @ 8164C0E + .byte 0 diff --git a/data/maps/FiveIsland_LostCave_Room3/scripts.inc b/data/maps/FiveIsland_LostCave_Room3/scripts.inc new file mode 100644 index 000000000..e14779342 --- /dev/null +++ b/data/maps/FiveIsland_LostCave_Room3/scripts.inc @@ -0,0 +1,2 @@ +FiveIsland_LostCave_Room3_MapScripts:: @ 8164C0F + .byte 0 diff --git a/data/maps/FiveIsland_LostCave_Room4/scripts.inc b/data/maps/FiveIsland_LostCave_Room4/scripts.inc new file mode 100644 index 000000000..9d2aa1f6a --- /dev/null +++ b/data/maps/FiveIsland_LostCave_Room4/scripts.inc @@ -0,0 +1,8 @@ +FiveIsland_LostCave_Room4_MapScripts:: @ 8164C10 + .byte 0 + +FiveIsland_LostCave_Room4_EventScript_164C11:: @ 8164C11 + trainerbattle 0, 608, 0, Text_17CFC1, Text_17CFFB + loadword 0, gUnknown_817D037 + callstd 6 + end diff --git a/data/maps/FiveIsland_LostCave_Room5/scripts.inc b/data/maps/FiveIsland_LostCave_Room5/scripts.inc new file mode 100644 index 000000000..3bdbbcc3b --- /dev/null +++ b/data/maps/FiveIsland_LostCave_Room5/scripts.inc @@ -0,0 +1,2 @@ +FiveIsland_LostCave_Room5_MapScripts:: @ 8164C28 + .byte 0 diff --git a/data/maps/FiveIsland_LostCave_Room6/scripts.inc b/data/maps/FiveIsland_LostCave_Room6/scripts.inc new file mode 100644 index 000000000..1de5fc8ca --- /dev/null +++ b/data/maps/FiveIsland_LostCave_Room6/scripts.inc @@ -0,0 +1,2 @@ +FiveIsland_LostCave_Room6_MapScripts:: @ 8164C29 + .byte 0 diff --git a/data/maps/FiveIsland_LostCave_Room7/scripts.inc b/data/maps/FiveIsland_LostCave_Room7/scripts.inc new file mode 100644 index 000000000..229bae05b --- /dev/null +++ b/data/maps/FiveIsland_LostCave_Room7/scripts.inc @@ -0,0 +1,2 @@ +FiveIsland_LostCave_Room7_MapScripts:: @ 8164C2A + .byte 0 diff --git a/data/maps/FiveIsland_LostCave_Room8/scripts.inc b/data/maps/FiveIsland_LostCave_Room8/scripts.inc new file mode 100644 index 000000000..833603106 --- /dev/null +++ b/data/maps/FiveIsland_LostCave_Room8/scripts.inc @@ -0,0 +1,2 @@ +FiveIsland_LostCave_Room8_MapScripts:: @ 8164C2B + .byte 0 diff --git a/data/maps/FiveIsland_LostCave_Room9/scripts.inc b/data/maps/FiveIsland_LostCave_Room9/scripts.inc new file mode 100644 index 000000000..73a4425f9 --- /dev/null +++ b/data/maps/FiveIsland_LostCave_Room9/scripts.inc @@ -0,0 +1,2 @@ +FiveIsland_LostCave_Room9_MapScripts:: @ 8164C2C + .byte 0 diff --git a/data/maps/FiveIsland_Meadow/scripts.inc b/data/maps/FiveIsland_Meadow/scripts.inc new file mode 100644 index 000000000..e4636cb65 --- /dev/null +++ b/data/maps/FiveIsland_Meadow/scripts.inc @@ -0,0 +1,59 @@ +FiveIsland_Meadow_MapScripts:: @ 8168932 + map_script 1, FiveIsland_Meadow_MapScript1_168938 + .byte 0 + +FiveIsland_Meadow_MapScript1_168938:: @ 8168938 + checkflag FLAG_0x2D6 + call_if 1, EventScript_168983 + end + +FiveIsland_Meadow_EventScript_168942:: @ 8168942 + lockall + checkflag FLAG_0x2D6 + goto_if 1, EventScript_168979 + checkflag FLAG_0x2D8 + goto_if 1, EventScript_16895F + loadword 0, gUnknown_818AB8E + callstd 4 + releaseall + end + +EventScript_16895F:: @ 816895F + setflag FLAG_0x2D6 + message Text_18ABF4 + waitmessage + delay 60 + call EventScript_168983 + special DrawWholeMapView + playse SE_PIN + waitse + releaseall + end + +EventScript_168979:: @ 8168979 + loadword 0, gUnknown_818AC62 + callstd 4 + releaseall + end + +EventScript_168983:: @ 8168983 + setmetatile 12, 21, 687, 1 + return + +FiveIsland_Meadow_EventScript_16898D:: @ 816898D + trainerbattle 0, 567, 0, Text_18AC88, Text_18ACB3 + loadword 0, gUnknown_818ACC5 + callstd 6 + end + +FiveIsland_Meadow_EventScript_1689A4:: @ 81689A4 + trainerbattle 0, 568, 0, Text_18ACF0, Text_18AD39 + loadword 0, gUnknown_818AD59 + callstd 6 + end + +FiveIsland_Meadow_EventScript_1689BB:: @ 81689BB + trainerbattle 0, 569, 0, Text_18ADC6, Text_18ADFB + loadword 0, gUnknown_818AE16 + callstd 6 + end diff --git a/data/maps/FiveIsland_MemorialPillar/scripts.inc b/data/maps/FiveIsland_MemorialPillar/scripts.inc new file mode 100644 index 000000000..8337e9d6f --- /dev/null +++ b/data/maps/FiveIsland_MemorialPillar/scripts.inc @@ -0,0 +1,110 @@ +FiveIsland_MemorialPillar_MapScripts:: @ 81689D2 + .byte 0 + +FiveIsland_MemorialPillar_EventScript_1689D3:: @ 81689D3 + lock + checkflag FLAG_0x236 + goto_if 1, EventScript_168A18 + checkflag FLAG_0x2D7 + goto_if 1, EventScript_168A22 + loadword 0, gUnknown_818B02E + callstd 4 + closemessage + applymovement 1, Movement_1A75E1 + waitmovement 0 + delay 45 + loadword 0, gUnknown_818B03C + callstd 4 + applymovement 1, Movement_1A75E9 + waitmovement 0 + loadword 0, gUnknown_818B05E + callstd 4 + release + end + +EventScript_168A18:: @ 8168A18 + loadword 0, gUnknown_818B2DA + callstd 4 + release + end + +EventScript_168A22:: @ 8168A22 + loadword 0, gUnknown_818B282 + callstd 4 + setorcopyvar VAR_0x8000, 330 + setorcopyvar VAR_0x8001, 1 + callstd 0 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_168AFE + call EventScript_168AE8 + release + end + +FiveIsland_MemorialPillar_EventScript_168A48:: @ 8168A48 + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + special sub_8112364 + lockall + checkflag FLAG_0x236 + goto_if 1, EventScript_168B0B + checkflag FLAG_0x2D7 + goto_if 1, EventScript_168B0B + loadword 0, gUnknown_818B095 + callstd 4 + checkitem ITEM_LEMONADE, 1 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_168A86 + releaseall + end + +EventScript_168A86:: @ 8168A86 + loadword 0, gUnknown_818B105 + callstd 5 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_168A9B + releaseall + end + +EventScript_168A9B:: @ 8168A9B + removeitem ITEM_LEMONADE, 1 + loadword 0, gUnknown_818B13E + callstd 4 + closemessage + applymovement 1, Movement_1A75EB + waitmovement 0 + delay 45 + applymovement 255, Movement_1A75E7 + waitmovement 0 + textcolor 0 + loadword 0, gUnknown_818B171 + callstd 4 + setorcopyvar VAR_0x8000, 330 + setorcopyvar VAR_0x8001, 1 + callstd 0 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_168AFE + call EventScript_168AE8 + releaseall + end + +EventScript_168AE8:: @ 8168AE8 + loadword 0, gUnknown_818B219 + callstd 4 + applymovement 1, Movement_1A75E9 + waitmovement 0 + setflag FLAG_0x236 + return + +EventScript_168AFE:: @ 8168AFE + setflag FLAG_0x2D7 + loadword 0, gUnknown_818B23E + callstd 4 + releaseall + end + +EventScript_168B0B:: @ 8168B0B + loadword 0, gUnknown_818B2F8 + callstd 4 + releaseall + end diff --git a/data/maps/FiveIsland_PokemonCenter_1F/scripts.inc b/data/maps/FiveIsland_PokemonCenter_1F/scripts.inc new file mode 100644 index 000000000..a9944ee18 --- /dev/null +++ b/data/maps/FiveIsland_PokemonCenter_1F/scripts.inc @@ -0,0 +1,25 @@ +FiveIsland_PokemonCenter_1F_MapScripts:: @ 8171CF1 + map_script 3, FiveIsland_PokemonCenter_1F_MapScript1_171CFC + map_script 5, FiveIsland_PokemonCenter_1F_MapScript2_1BC05C + .byte 0 + +FiveIsland_PokemonCenter_1F_MapScript1_171CFC:: @ 8171CFC + setrespawn 18 + end + +FiveIsland_PokemonCenter_1F_EventScript_171D00:: @ 8171D00 + lock + faceplayer + call EventScript_1A6578 + release + end + +FiveIsland_PokemonCenter_1F_EventScript_171D09:: @ 8171D09 + loadword 0, gUnknown_81A3BBA + callstd 2 + end + +FiveIsland_PokemonCenter_1F_EventScript_171D12:: @ 8171D12 + loadword 0, gUnknown_81A3BFD + callstd 2 + end diff --git a/data/maps/FiveIsland_PokemonCenter_2F/scripts.inc b/data/maps/FiveIsland_PokemonCenter_2F/scripts.inc new file mode 100644 index 000000000..51682056c --- /dev/null +++ b/data/maps/FiveIsland_PokemonCenter_2F/scripts.inc @@ -0,0 +1,18 @@ +FiveIsland_PokemonCenter_2F_MapScripts:: @ 8171D1B + map_script 2, FiveIsland_PokemonCenter_2F_MapScript1_1BB2A3 + map_script 4, FiveIsland_PokemonCenter_2F_MapScript2_1BB1ED + map_script 1, FiveIsland_PokemonCenter_2F_MapScript3_1BB237 + map_script 3, FiveIsland_PokemonCenter_2F_MapScript4_1BB1B4 + .byte 0 + +FiveIsland_PokemonCenter_2F_EventScript_171D30:: @ 8171D30 + call EventScript_1BB4A3 + end + +EventScript_171D36:: @ 8171D36 + call EventScript_1BB6AB + end + +EventScript_171D3C:: @ 8171D3C + call EventScript_1BB7DE + end diff --git a/data/maps/FiveIsland_ResortGorgeous/scripts.inc b/data/maps/FiveIsland_ResortGorgeous/scripts.inc new file mode 100644 index 000000000..997a27bb8 --- /dev/null +++ b/data/maps/FiveIsland_ResortGorgeous/scripts.inc @@ -0,0 +1,46 @@ +FiveIsland_ResortGorgeous_MapScripts:: @ 81687E4 + map_script 4, FiveIsland_ResortGorgeous_MapScript1_1687EF + map_script 2, FiveIsland_ResortGorgeous_MapScript2_1687FE + .byte 0 + +FiveIsland_ResortGorgeous_MapScript1_1687EF:: @ 81687EF + map_script_2 VAR_0x4084, 1, EventScript_1687F9 + .2byte 0 + +EventScript_1687F9:: @ 81687F9 + turnobject 255, 2 + end + +FiveIsland_ResortGorgeous_MapScript2_1687FE:: @ 81687FE + map_script_2 VAR_0x4084, 1, EventScript_168808 + .2byte 0 + +EventScript_168808:: @ 8168808 + lockall + textcolor 1 + loadword 0, gUnknown_818A7DB + callstd 4 + closemessage + applymovement 8, Movement_1A75E9 + waitmovement 0 + opendoor 39, 8 + waitdooranim + applymovement 8, Movement_168841 + waitmovement 0 + closedoor 39, 8 + waitdooranim + removeobject 8 + clearflag FLAG_0x095 + setvar VAR_0x4084, 2 + releaseall + end + +Movement_168841:: @ 8168841 + step_11 + step_60 + step_end + +FiveIsland_ResortGorgeous_EventScript_168844:: @ 8168844 + loadword 0, gUnknown_818A7FE + callstd 3 + end diff --git a/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc b/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc new file mode 100644 index 000000000..5dd91f845 --- /dev/null +++ b/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc @@ -0,0 +1,163 @@ +FiveIsland_ResortGorgeous_House_MapScripts:: @ 8171EBD + .byte 0 + +FiveIsland_ResortGorgeous_House_EventScript_171EBE:: @ 8171EBE + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + special sub_8112364 + lock + faceplayer + checkflag FLAG_0x002 + goto_if 1, EventScript_172043 + compare_var_to_value VAR_STORAGE_UNKNOWN, 65535 + goto_if 1, EventScript_171F0B + compare_var_to_value VAR_STORAGE_UNKNOWN, 0 + goto_if 5, EventScript_171F19 + loadword 0, gUnknown_81A42A0 + callstd 4 + goto EventScript_171EFE + end + +EventScript_171EFE:: @ 8171EFE + special sub_80CB0A8 + loadword 0, gUnknown_81A4315 + callstd 4 + release + end + +EventScript_171F0B:: @ 8171F0B + loadword 0, gUnknown_81A437A + callstd 4 + goto EventScript_171EFE + end + +EventScript_171F19:: @ 8171F19 + copyvar VAR_0x8004, VAR_STORAGE_UNKNOWN + specialvar VAR_RESULT, sub_80CC48C + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_171F34 + goto EventScript_171EFE + end + +EventScript_171F34:: @ 8171F34 + special sub_80CB0A8 + loadword 0, gUnknown_81A43F7 + callstd 4 + addobject 2 + applymovement 2, Movement_172060 + waitmovement 0 + textcolor 0 + loadword 0, gUnknown_81A450B + callstd 4 + applymovement 1, Movement_1A75E9 + waitmovement 0 + textcolor 1 + loadword 0, gUnknown_81A4521 + callstd 4 + textcolor 0 + loadword 0, gUnknown_81A4566 + callstd 4 + closemessage + compare_var_to_value VAR_FACING, 2 + call_if 1, EventScript_171FCD + compare_var_to_value VAR_FACING, 1 + call_if 1, EventScript_171FE9 + compare_var_to_value VAR_FACING, 4 + call_if 1, EventScript_171FFE + compare_var_to_value VAR_FACING, 3 + call_if 1, EventScript_17201A + moveobjectoffscreen 2 + loadword 0, gUnknown_81A458E + callstd 4 + setorcopyvar VAR_0x8000, VAR_0x403B + setorcopyvar VAR_0x8001, 1 + callstd 0 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_172025 + setflag FLAG_0x002 + setvar VAR_STORAGE_UNKNOWN, 0 + release + end + +EventScript_171FCD:: @ 8171FCD + applymovement 1, Movement_1A75ED + applymovement 2, Movement_17204D + waitmovement 0 + applymovement 255, Movement_1A75E7 + waitmovement 0 + return + +EventScript_171FE9:: @ 8171FE9 + applymovement 2, Movement_172055 + waitmovement 0 + applymovement 255, Movement_1A75E9 + waitmovement 0 + return + +EventScript_171FFE:: @ 8171FFE + applymovement 1, Movement_1A75E7 + applymovement 2, Movement_172059 + waitmovement 0 + applymovement 255, Movement_1A75E9 + waitmovement 0 + return + +EventScript_17201A:: @ 817201A + applymovement 2, Movement_17205E + waitmovement 0 + return + +EventScript_172025:: @ 8172025 + textcolor 0 + loadword 0, gUnknown_81A45E8 + callstd 4 + textcolor 1 + loadword 0, gUnknown_81A461B + callstd 4 + setflag FLAG_0x002 + setvar VAR_STORAGE_UNKNOWN, 0 + release + end + +EventScript_172043:: @ 8172043 + loadword 0, gUnknown_81A4632 + callstd 4 + release + end + +Movement_17204D:: @ 817204D + step_12 + step_12 + step_12 + step_10 + step_10 + step_10 + step_30 + step_end + +Movement_172055:: @ 8172055 + step_12 + step_12 + step_2d + step_end + +Movement_172059:: @ 8172059 + step_12 + step_12 + step_12 + step_10 + step_end + +Movement_17205E:: @ 817205E + step_11 + step_end + +Movement_172060:: @ 8172060 + step_25 + step_end + +FiveIsland_ResortGorgeous_House_EventScript_172062:: @ 8172062 + loadword 0, gUnknown_81A4657 + callstd 2 + end diff --git a/data/maps/FiveIsland_WaterLabyrinth/scripts.inc b/data/maps/FiveIsland_WaterLabyrinth/scripts.inc new file mode 100644 index 000000000..0c0eebf58 --- /dev/null +++ b/data/maps/FiveIsland_WaterLabyrinth/scripts.inc @@ -0,0 +1,80 @@ +FiveIsland_WaterLabyrinth_MapScripts:: @ 816884D + .byte 0 + +FiveIsland_WaterLabyrinth_EventScript_16884E:: @ 816884E + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + special sub_8112364 + lock + faceplayer + checkflag FLAG_0x2DA + goto_if 1, EventScript_1688E3 + checkflag FLAG_0x2DB + goto_if 1, EventScript_16892C + loadword 0, gUnknown_818A80D + callstd 4 + specialvar VAR_RESULT, sub_80CA76C + compare_var_to_value VAR_RESULT, 6 + goto_if 1, EventScript_1688AC + loadword 0, gUnknown_818A88F + callstd 4 + release + end + +EventScript_168895:: @ 8168895 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 2 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_818AA0C + callstd 4 + release + end + +EventScript_1688AC:: @ 81688AC + loadword 0, gUnknown_818A8A6 + callstd 4 + goto EventScript_1688BA + end + +EventScript_1688BA:: @ 81688BA + countpokemon + compare_var_to_value VAR_RESULT, 6 + goto_if 1, EventScript_16891F + setflag FLAG_0x2DA + giveegg SPECIES_TOGEPI + textcolor 3 + playfanfare MUS_FANFA1 + message Text_18A91F + waitfanfare + waitmessage + call EventScript_1A6675 + goto EventScript_1688E3 + end + +EventScript_1688E3:: @ 81688E3 + getspeciesname 1, SPECIES_TOGEPI + setvar VAR_0x8004, 175 + specialvar VAR_RESULT, sub_80CD0F4 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_168895 + getspeciesname 1, SPECIES_TOGETIC + setvar VAR_0x8004, 176 + specialvar VAR_RESULT, sub_80CD0F4 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_168895 + loadword 0, gUnknown_818A9C0 + callstd 4 + release + end + +EventScript_16891F:: @ 816891F + setflag FLAG_0x2DB + loadword 0, gUnknown_818A940 + callstd 4 + release + end + +EventScript_16892C:: @ 816892C + goto EventScript_1688BA + end diff --git a/data/maps/FourIsland/scripts.inc b/data/maps/FourIsland/scripts.inc new file mode 100644 index 000000000..1568056b2 --- /dev/null +++ b/data/maps/FourIsland/scripts.inc @@ -0,0 +1,194 @@ +FourIsland_MapScripts:: @ 8167CAE + map_script 3, FourIsland_MapScript1_167CB9 + map_script 2, FourIsland_MapScript2_167CE2 + .byte 0 + +FourIsland_MapScript1_167CB9:: @ 8167CB9 + setworldmapflag 2206 + compare_var_to_value VAR_0x4086, 0 + call_if 1, EventScript_167CCD + call EventScript_167CD1 + end + +EventScript_167CCD:: @ 8167CCD + clearflag FLAG_0x097 + return + +EventScript_167CD1:: @ 8167CD1 + checkflag FLAG_PENDING_DAYCARE_EGG + goto_if 0, EventScript_167CE1 + setobjectxyperm 1, 16, 14 + +EventScript_167CE1:: @ 8167CE1 + return + +FourIsland_MapScript2_167CE2:: @ 8167CE2 + map_script_2 VAR_0x4086, 0, EventScript_167CEC + .2byte 0 + +EventScript_167CEC:: @ 8167CEC + lockall + textcolor 0 + applymovement 10, Movement_1A75ED + waitmovement 0 + playbgm BGM_FRLG_RIVAL, 0 + applymovement 10, Movement_1A75DB + waitmovement 0 + applymovement 10, Movement_1A75DD + waitmovement 0 + delay 25 + applymovement 10, Movement_167D49 + waitmovement 0 + loadword 0, gUnknown_8182B37 + callstd 4 + closemessage + applymovement 255, Movement_167D52 + applymovement 10, Movement_167D4E + waitmovement 0 + fadedefaultbgm + playse SE_KAIDAN + delay 35 + removeobject 10 + setvar VAR_0x4086, 1 + releaseall + end + +Movement_167D49:: @ 8167D49 + step_13 + step_13 + step_10 + step_10 + step_end + +Movement_167D4E:: @ 8167D4E + step_1c + step_1a + step_10 + step_end + +Movement_167D52:: @ 8167D52 + step_12 + step_30 + step_end + +FourIsland_EventScript_167D55:: @ 8167D55 + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + special sub_8112364 + lock + faceplayer + special GetDaycareMonNicknames + specialvar VAR_RESULT, GetDaycareState + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_167D9B + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_167E0C + compare_var_to_value VAR_RESULT, 3 + goto_if 1, EventScript_167E19 + loadword 0, gUnknown_81BF555 + callstd 4 + release + end + +EventScript_167D9B:: @ 8167D9B + loadword 0, gUnknown_81BF5E3 + callstd 5 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_167DD1 + loadword 0, gUnknown_81BF7B6 + callstd 5 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_167DD1 + loadword 0, gUnknown_81BF6CF + callstd 4 + clearflag FLAG_PENDING_DAYCARE_EGG + special RejectEggFromDayCare + release + end + +EventScript_167DD1:: @ 8167DD1 + specialvar VAR_RESULT, CalculatePlayerPartyCount + compare_var_to_value VAR_RESULT, 6 + goto_if 5, EventScript_167DEB + loadword 0, gUnknown_81BF6F0 + callstd 4 + release + end + +EventScript_167DEB:: @ 8167DEB + textcolor 3 + message Text_1BF72A + call EventScript_1A6675 + playfanfare MUS_FANFA1 + waitfanfare + waitbuttonpress + loadword 0, gUnknown_81BF755 + callstd 4 + special GiveEggFromDaycare + clearflag FLAG_PENDING_DAYCARE_EGG + release + end + +EventScript_167E0C:: @ 8167E0C + special GetDaycareMonNicknames + loadword 0, gUnknown_81BF69A + callstd 4 + release + end + +EventScript_167E19:: @ 8167E19 + special GetDaycareMonNicknames + loadword 0, gUnknown_81BF789 + callstd 4 + special SetDaycareCompatibilityString + special sub_80CA68C + waitmessage + waitbuttonpress + release + end + +FourIsland_EventScript_167E2E:: @ 8167E2E + lock + faceplayer + checkflag 2116 + goto_if 1, EventScript_167E43 + loadword 0, gUnknown_8182A2B + callstd 4 + release + end + +EventScript_167E43:: @ 8167E43 + setvar VAR_0x8004, 9 + setvar VAR_0x8005, 5 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_8182A75 + callstd 4 + release + end + +FourIsland_EventScript_167E5A:: @ 8167E5A + lock + faceplayer + setvar VAR_0x8004, 9 + setvar VAR_0x8005, 4 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_8182CE3 + callstd 4 + release + end + +FourIsland_EventScript_167E73:: @ 8167E73 + loadword 0, gUnknown_8182D8E + callstd 2 + end + +FourIsland_EventScript_167E7C:: @ 8167E7C + loadword 0, gUnknown_8182A03 + callstd 3 + end + +FourIsland_EventScript_167E85:: @ 8167E85 + loadword 0, gUnknown_8182DEB + callstd 3 + end diff --git a/data/maps/FourIsland_Harbor/scripts.inc b/data/maps/FourIsland_Harbor/scripts.inc new file mode 100644 index 000000000..0daa45d88 --- /dev/null +++ b/data/maps/FourIsland_Harbor/scripts.inc @@ -0,0 +1,11 @@ +FourIsland_Harbor_MapScripts:: @ 8171C98 + .byte 0 + +FourIsland_Harbor_EventScript_171C99:: @ 8171C99 + lock + faceplayer + message Text_181726 + waitmessage + setvar VAR_0x8004, 4 + goto EventScript_1A900F + end diff --git a/data/maps/FourIsland_House1/scripts.inc b/data/maps/FourIsland_House1/scripts.inc new file mode 100644 index 000000000..aff7f2230 --- /dev/null +++ b/data/maps/FourIsland_House1/scripts.inc @@ -0,0 +1,7 @@ +FourIsland_House1_MapScripts:: @ 8171C44 + .byte 0 + +FourIsland_House1_EventScript_171C45:: @ 8171C45 + loadword 0, gUnknown_81A3802 + callstd 2 + end diff --git a/data/maps/FourIsland_House2/scripts.inc b/data/maps/FourIsland_House2/scripts.inc new file mode 100644 index 000000000..407bad4cb --- /dev/null +++ b/data/maps/FourIsland_House2/scripts.inc @@ -0,0 +1,2 @@ +FourIsland_House2_MapScripts:: @ 8171CAC + .byte 0 diff --git a/data/maps/FourIsland_IcefallCave_1F/scripts.inc b/data/maps/FourIsland_IcefallCave_1F/scripts.inc new file mode 100644 index 000000000..a2b992a6d --- /dev/null +++ b/data/maps/FourIsland_IcefallCave_1F/scripts.inc @@ -0,0 +1,33 @@ +FourIsland_IcefallCave_1F_MapScripts:: @ 8163D44 + map_script 5, FourIsland_IcefallCave_1F_MapScript1_163D54 + map_script 1, FourIsland_IcefallCave_1F_MapScript2_163D57 + map_script 2, FourIsland_IcefallCave_1F_MapScript3_163D5B + .byte 0 + +FourIsland_IcefallCave_1F_MapScript1_163D54:: @ 8163D54 + setstepcallback 4 + end + +FourIsland_IcefallCave_1F_MapScript2_163D57:: @ 8163D57 + special sub_806E99C + end + +FourIsland_IcefallCave_1F_MapScript3_163D5B:: @ 8163D5B + map_script_2 VAR_0x4001, 1, EventScript_163D65 + .2byte 0 + +EventScript_163D65:: @ 8163D65 + lockall + delay 20 + applymovement 255, Movement_163D7F + waitmovement 0 + playse SE_FU_ZAKU + delay 60 + warphole MAP_FOURISLAND_ICEFALLCAVE_B1F + waitstate + releaseall + end + +Movement_163D7F:: @ 8163D7F + step_60 + step_end diff --git a/data/maps/FourIsland_IcefallCave_Entrance/scripts.inc b/data/maps/FourIsland_IcefallCave_Entrance/scripts.inc new file mode 100644 index 000000000..5fef54ab9 --- /dev/null +++ b/data/maps/FourIsland_IcefallCave_Entrance/scripts.inc @@ -0,0 +1,7 @@ +FourIsland_IcefallCave_Entrance_MapScripts:: @ 8163D3A + map_script 3, FourIsland_IcefallCave_Entrance_MapScript1_163D40 + .byte 0 + +FourIsland_IcefallCave_Entrance_MapScript1_163D40:: @ 8163D40 + setworldmapflag 2232 + end diff --git a/data/maps/FourIsland_LoreleisHouse/scripts.inc b/data/maps/FourIsland_LoreleisHouse/scripts.inc new file mode 100644 index 000000000..e475b11a7 --- /dev/null +++ b/data/maps/FourIsland_LoreleisHouse/scripts.inc @@ -0,0 +1,39 @@ +FourIsland_LoreleisHouse_MapScripts:: @ 8171C4E + map_script 3, FourIsland_LoreleisHouse_MapScript1_171C54 + .byte 0 + +FourIsland_LoreleisHouse_MapScript1_171C54:: @ 8171C54 + special sub_80CD154 + end + +FourIsland_LoreleisHouse_EventScript_171C58:: @ 8171C58 + lock + faceplayer + checkflag FLAG_0x2D4 + goto_if 1, EventScript_171C83 + checkflag FLAG_0x2D5 + goto_if 1, EventScript_171C76 + loadword 0, gUnknown_81A3826 + callstd 4 + release + end + +EventScript_171C76:: @ 8171C76 + setflag FLAG_0x2D4 + loadword 0, gUnknown_81A390C + callstd 4 + release + end + +EventScript_171C83:: @ 8171C83 + loadword 0, gUnknown_81A39D8 + callstd 4 + release + end + +FourIsland_LoreleisHouse_EventScript_171C8D:: @ 8171C8D + lock + loadword 0, gUnknown_81A3A42 + callstd 4 + release + end diff --git a/data/maps/FourIsland_Mart/scripts.inc b/data/maps/FourIsland_Mart/scripts.inc new file mode 100644 index 000000000..e146a0b25 --- /dev/null +++ b/data/maps/FourIsland_Mart/scripts.inc @@ -0,0 +1,35 @@ +FourIsland_Mart_MapScripts:: @ 8171CAD + .byte 0 + +FourIsland_Mart_EventScript_171CAE:: @ 8171CAE + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + lock + faceplayer + message Text_1A6211 + waitmessage + pokemart Items_171CD4 + loadword 0, gUnknown_81A5190 + callstd 4 + release + end + + .align 2 +Items_171CD4:: @ 8171CD4 + .2byte ITEM_ULTRA_BALL + .2byte ITEM_FULL_RESTORE + .2byte ITEM_MAX_POTION + .2byte ITEM_REVIVE + .2byte ITEM_ICE_HEAL + .2byte ITEM_FULL_HEAL + .2byte ITEM_ESCAPE_ROPE + .2byte ITEM_MAX_REPEL + .2byte ITEM_NONE + release + end + +FourIsland_Mart_EventScript_171CE8:: @ 8171CE8 + loadword 0, gUnknown_81A3B14 + callstd 2 + end diff --git a/data/maps/FourIsland_PokemonCenter_1F/scripts.inc b/data/maps/FourIsland_PokemonCenter_1F/scripts.inc new file mode 100644 index 000000000..334b32304 --- /dev/null +++ b/data/maps/FourIsland_PokemonCenter_1F/scripts.inc @@ -0,0 +1,30 @@ +FourIsland_PokemonCenter_1F_MapScripts:: @ 8171BEA + map_script 3, FourIsland_PokemonCenter_1F_MapScript1_171BF5 + map_script 5, FourIsland_PokemonCenter_1F_MapScript2_1BC05C + .byte 0 + +FourIsland_PokemonCenter_1F_MapScript1_171BF5:: @ 8171BF5 + setrespawn 17 + end + +FourIsland_PokemonCenter_1F_EventScript_171BF9:: @ 8171BF9 + lock + faceplayer + call EventScript_1A6578 + release + end + +FourIsland_PokemonCenter_1F_EventScript_171C02:: @ 8171C02 + loadword 0, gUnknown_81A3627 + callstd 2 + end + +FourIsland_PokemonCenter_1F_EventScript_171C0B:: @ 8171C0B + loadword 0, gUnknown_81A3697 + callstd 2 + end + +FourIsland_PokemonCenter_1F_EventScript_171C14:: @ 8171C14 + loadword 0, gUnknown_81A3734 + callstd 2 + end diff --git a/data/maps/FourIsland_PokemonCenter_2F/scripts.inc b/data/maps/FourIsland_PokemonCenter_2F/scripts.inc new file mode 100644 index 000000000..37d21446e --- /dev/null +++ b/data/maps/FourIsland_PokemonCenter_2F/scripts.inc @@ -0,0 +1,18 @@ +FourIsland_PokemonCenter_2F_MapScripts:: @ 8171C1D + map_script 2, FourIsland_PokemonCenter_2F_MapScript1_1BB2A3 + map_script 4, FourIsland_PokemonCenter_2F_MapScript2_1BB1ED + map_script 1, FourIsland_PokemonCenter_2F_MapScript3_1BB237 + map_script 3, FourIsland_PokemonCenter_2F_MapScript4_1BB1B4 + .byte 0 + +FourIsland_PokemonCenter_2F_EventScript_171C32:: @ 8171C32 + call EventScript_1BB4A3 + end + +EventScript_171C38:: @ 8171C38 + call EventScript_1BB6AB + end + +EventScript_171C3E:: @ 8171C3E + call EventScript_1BB7DE + end diff --git a/data/maps/FourIsland_PokemonDayCare/scripts.inc b/data/maps/FourIsland_PokemonDayCare/scripts.inc new file mode 100644 index 000000000..1b0011054 --- /dev/null +++ b/data/maps/FourIsland_PokemonDayCare/scripts.inc @@ -0,0 +1,235 @@ +FourIsland_PokemonDayCare_MapScripts:: @ 817193F + .byte 0 + +FourIsland_PokemonDayCare_EventScript_171940:: @ 8171940 + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + lock + faceplayer + specialvar VAR_RESULT, GetDaycareState + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_171A2E + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_171A52 + compare_var_to_value VAR_RESULT, 3 + goto_if 1, EventScript_171B86 + loadword 0, gUnknown_81BF7E4 + callstd 5 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_171993 + loadword 0, gUnknown_81BF916 + callstd 4 + release + end + +EventScript_171993:: @ 8171993 + specialvar VAR_RESULT, CountPartyNonEggMons + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_171A1A + loadword 0, gUnknown_81BF839 + callstd 4 + fadescreen 1 + special ChooseSendDaycareMon + waitstate + compare_var_to_value VAR_0x8004, 6 + goto_if 4, EventScript_1719F7 + specialvar VAR_RESULT, CountPartyAliveNonEggMons_IgnoreVar0x8004Slot + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_171A24 + specialvar VAR_0x8005, GetSelectedMonNickAndSpecies + waitse + playmoncry 32773, 0 + loadword 0, gUnknown_81BF860 + callstd 4 + waitmoncry + special StoreSelectedPokemonInDaycare + incrementgamestat 47 + specialvar VAR_RESULT, GetDaycareState + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_171A01 + release + end + +EventScript_1719F7:: @ 81719F7 + loadword 0, gUnknown_81BF976 + callstd 4 + release + end + +EventScript_171A01:: @ 8171A01 + loadword 0, gUnknown_81BF89F + callstd 5 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_171993 + goto EventScript_1719F7 + end + +EventScript_171A1A:: @ 8171A1A + loadword 0, gUnknown_81BFAAD + callstd 4 + release + end + +EventScript_171A24:: @ 8171A24 + loadword 0, gUnknown_81BFB09 + callstd 4 + release + end + +EventScript_171A2E:: @ 8171A2E + loadword 0, gUnknown_81BF8F6 + callstd 4 + release + end + +EventScript_171A38:: @ 8171A38 + loadword 0, gUnknown_81BF9CC + callstd 4 + return + +EventScript_171A41:: @ 8171A41 + specialvar VAR_RESULT, GetNumLevelsGainedFromDaycare + compare_var_to_value VAR_RESULT, 0 + call_if 5, EventScript_171A38 + return + +EventScript_171A52:: @ 8171A52 + loadword 0, gUnknown_81BF988 + callstd 4 + setvar VAR_0x8004, 0 + call EventScript_171A41 + loadword 0, gUnknown_81BF89F + callstd 5 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_171993 + loadword 0, gUnknown_81BFAE8 + callstd 5 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_171A90 + goto EventScript_1719F7 + end + +EventScript_171A90:: @ 8171A90 + specialvar VAR_RESULT, CalculatePlayerPartyCount + compare_var_to_value VAR_RESULT, 6 + goto_if 1, EventScript_171B67 + specialvar VAR_RESULT, GetDaycareState + setvar VAR_0x8004, 0 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_171ACF + special ShowDaycareLevelMenu + waitstate + copyvar VAR_0x8004, VAR_RESULT + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1719F7 + goto EventScript_171ACF + end + +EventScript_171ACF:: @ 8171ACF + special GetDaycareCost + loadword 0, gUnknown_81BFA3B + callstd 5 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_171AEB + goto EventScript_1719F7 + end + +EventScript_171AEB:: @ 8171AEB + specialvar VAR_RESULT, IsEnoughForCostInVar0x8005 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_171B05 + loadword 0, gUnknown_81BF932 + callstd 4 + release + end + +EventScript_171B05:: @ 8171B05 + applymovement 1, Movement_171B71 + waitmovement 0 + specialvar VAR_RESULT, TakePokemonFromDaycare + special SubtractMoneyFromVar0x8005 + playse SE_T_KAMI2 + loadword 0, gUnknown_81BFA67 + callstd 4 + waitse + playmoncry 32781, 0 + textcolor 3 + loadword 0, gUnknown_81BFA85 + callstd 4 + call EventScript_1A6675 + waitmoncry + specialvar VAR_RESULT, GetDaycareState + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_171B4E + goto EventScript_1719F7 + end + +EventScript_171B4E:: @ 8171B4E + loadword 0, gUnknown_81BF94F + callstd 5 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_171A90 + goto EventScript_1719F7 + end + +EventScript_171B67:: @ 8171B67 + loadword 0, gUnknown_81BF9EF + callstd 4 + release + end + +Movement_171B71:: @ 8171B71 + step_1c + step_1c + step_03 + step_1c + step_1c + step_02 + step_1c + step_1c + step_01 + step_up + step_60 + step_1c + step_1c + step_1c + step_1c + step_1c + step_00 + step_61 + step_down + step_end + +EventScript_171B85:: @ 8171B85 + end + +EventScript_171B86:: @ 8171B86 + loadword 0, gUnknown_81BF988 + callstd 4 + setvar VAR_0x8004, 0 + call EventScript_171A41 + setvar VAR_0x8004, 1 + call EventScript_171A41 + loadword 0, gUnknown_81BFAE8 + callstd 5 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_171A90 + loadword 0, gUnknown_81BF976 + callstd 4 + release + end + +EventScript_171BBF:: @ 8171BBF + special ShowDaycareLevelMenu + waitstate + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1719F7 + copyvar VAR_0x8004, VAR_RESULT + specialvar VAR_RESULT, TakePokemonFromDaycare + loadword 0, gUnknown_81BFA67 + callstd 4 + loadword 0, gUnknown_81BF976 + callstd 4 + release + end diff --git a/data/maps/FuchsiaCity/scripts.inc b/data/maps/FuchsiaCity/scripts.inc new file mode 100644 index 000000000..39624941c --- /dev/null +++ b/data/maps/FuchsiaCity/scripts.inc @@ -0,0 +1,163 @@ +FuchsiaCity_MapScripts:: @ 8166D75 + map_script 3, FuchsiaCity_MapScript1_166D7B + .byte 0 + +FuchsiaCity_MapScript1_166D7B:: @ 8166D7B + setworldmapflag 2199 + checkflag FLAG_0x272 + call_if 1, EventScript_166D91 + checkflag FLAG_0x272 + call_if 0, EventScript_166D97 + end + +EventScript_166D91:: @ 8166D91 + setvar VAR_0x4010, 118 + return + +EventScript_166D97:: @ 8166D97 + setvar VAR_0x4010, 147 + return + +FuchsiaCity_EventScript_166D9D:: @ 8166D9D + loadword 0, gUnknown_818056E + callstd 2 + end + +FuchsiaCity_EventScript_166DA6:: @ 8166DA6 + loadword 0, gUnknown_81805C6 + callstd 2 + end + +FuchsiaCity_EventScript_166DAF:: @ 8166DAF + loadword 0, gUnknown_818062C + callstd 2 + end + +FuchsiaCity_EventScript_166DB8:: @ 8166DB8 + loadword 0, gUnknown_818065A + callstd 2 + end + +FuchsiaCity_EventScript_166DC1:: @ 8166DC1 + lock + faceplayer + setvar VAR_0x8004, 6 + setvar VAR_0x8005, 3 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_8180ABD + callstd 4 + release + end + +FuchsiaCity_EventScript_166DDA:: @ 8166DDA + loadword 0, gUnknown_81806AB + callstd 3 + end + +FuchsiaCity_EventScript_166DE3:: @ 8166DE3 + loadword 0, gUnknown_81806D3 + callstd 3 + end + +FuchsiaCity_EventScript_166DEC:: @ 8166DEC + loadword 0, gUnknown_81806F0 + callstd 3 + end + +FuchsiaCity_EventScript_166DF5:: @ 8166DF5 + loadword 0, gUnknown_818070D + callstd 3 + end + +EventScript_166DFE:: @ 8166DFE + loadword 0, gUnknown_8180727 + callstd 3 + end + +FuchsiaCity_EventScript_166E07:: @ 8166E07 + lockall + setvar VAR_0x8004, 6 + setvar VAR_0x8005, 0 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_8180768 + callstd 4 + releaseall + end + +FuchsiaCity_EventScript_166E1F:: @ 8166E1F + lockall + setvar VAR_0x8004, 113 + special sub_80CBDCC + drawmonpic SPECIES_CHANSEY, 10, 3 + loadword 0, gUnknown_81807A9 + callstd 4 + erasemonpic + releaseall + end + +FuchsiaCity_EventScript_166E38:: @ 8166E38 + lockall + setvar VAR_0x8004, 100 + special sub_80CBDCC + drawmonpic SPECIES_VOLTORB, 10, 3 + loadword 0, gUnknown_81807D9 + callstd 4 + erasemonpic + releaseall + end + +FuchsiaCity_EventScript_166E51:: @ 8166E51 + lockall + setvar VAR_0x8004, 115 + special sub_80CBDCC + drawmonpic SPECIES_KANGASKHAN, 10, 3 + loadword 0, gUnknown_8180806 + callstd 4 + erasemonpic + releaseall + end + +FuchsiaCity_EventScript_166E6A:: @ 8166E6A + lockall + setvar VAR_0x8004, 79 + special sub_80CBDCC + drawmonpic SPECIES_SLOWPOKE, 10, 3 + loadword 0, gUnknown_8180859 + callstd 4 + erasemonpic + releaseall + end + +FuchsiaCity_EventScript_166E83:: @ 8166E83 + lockall + setvar VAR_0x8004, 131 + special sub_80CBDCC + drawmonpic SPECIES_LAPRAS, 10, 3 + loadword 0, gUnknown_8180887 + callstd 4 + erasemonpic + releaseall + end + +FuchsiaCity_EventScript_166E9C:: @ 8166E9C + lockall + checkflag FLAG_0x272 + goto_if 1, EventScript_166EBE + setvar VAR_0x8004, 140 + special sub_80CBDCC + drawmonpic SPECIES_KABUTO, 10, 3 + loadword 0, gUnknown_81808FA + callstd 4 + erasemonpic + releaseall + end + +EventScript_166EBE:: @ 8166EBE + setvar VAR_0x8004, 138 + special sub_80CBDCC + drawmonpic SPECIES_OMANYTE, 10, 3 + loadword 0, gUnknown_81808AE + callstd 4 + erasemonpic + releaseall + end diff --git a/data/maps/FuchsiaCity_Building1/scripts.inc b/data/maps/FuchsiaCity_Building1/scripts.inc new file mode 100644 index 000000000..6b4c7a583 --- /dev/null +++ b/data/maps/FuchsiaCity_Building1/scripts.inc @@ -0,0 +1,79 @@ +FuchsiaCity_Building1_MapScripts:: @ 816D74B + .byte 0 + +FuchsiaCity_Building1_EventScript_16D74C:: @ 816D74C + lock + faceplayer + checkflag FLAG_0x23A + goto_if 1, EventScript_16D7FA + checkflag FLAG_0x189 + goto_if 1, EventScript_16D780 + loadword 0, gUnknown_8198DF9 + callstd 5 + compare_var_to_value VAR_RESULT, 1 + call_if 1, EventScript_16D7E8 + compare_var_to_value VAR_RESULT, 0 + call_if 1, EventScript_16D7F1 + release + end + +EventScript_16D780:: @ 816D780 + textcolor 3 + playfanfare MUS_ME_WAZA + message Text_198E84 + waitmessage + waitfanfare + loadword 0, gUnknown_8198EAA + callstd 4 + call EventScript_1A6675 + checkplayergender + compare_var_to_value VAR_RESULT, 0 + call_if 1, EventScript_16D7D6 + compare_var_to_value VAR_RESULT, 1 + call_if 1, EventScript_16D7DF + additem ITEM_HM04, 1 + loadword 0, gUnknown_8199068 + setorcopyvar VAR_0x8000, 342 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 257 + callstd 9 + setflag FLAG_0x23A + removeitem ITEM_GOLD_TEETH, 1 + release + end + +EventScript_16D7D6:: @ 816D7D6 + loadword 0, gUnknown_8198ECA + callstd 4 + return + +EventScript_16D7DF:: @ 816D7DF + loadword 0, gUnknown_8198F96 + callstd 4 + return + +EventScript_16D7E8:: @ 816D7E8 + loadword 0, gUnknown_8198E3F + callstd 4 + return + +EventScript_16D7F1:: @ 816D7F1 + loadword 0, gUnknown_8198E63 + callstd 4 + return + +EventScript_16D7FA:: @ 816D7FA + loadword 0, gUnknown_819908A + callstd 4 + release + end + +FuchsiaCity_Building1_EventScript_16D804:: @ 816D804 + loadword 0, gUnknown_819913C + callstd 3 + end + +FuchsiaCity_Building1_EventScript_16D80D:: @ 816D80D + loadword 0, gUnknown_8199167 + callstd 3 + end diff --git a/data/maps/FuchsiaCity_Gym/scripts.inc b/data/maps/FuchsiaCity_Gym/scripts.inc new file mode 100644 index 000000000..fee370e20 --- /dev/null +++ b/data/maps/FuchsiaCity_Gym/scripts.inc @@ -0,0 +1,120 @@ +FuchsiaCity_Gym_MapScripts:: @ 816D54D + .byte 0 + +FuchsiaCity_Gym_EventScript_16D54E:: @ 816D54E + setvar VAR_0x8004, 6 + setvar VAR_0x8005, 2 + special UpdatePickStateFromSpecialVar8005 + trainerbattle 1, 418, 0, Text_19832E, Text_198444, EventScript_16D580 + checkflag FLAG_0x259 + goto_if 0, EventScript_16D5A6 + loadword 0, gUnknown_8198481 + callstd 4 + release + end + +EventScript_16D580:: @ 816D580 + setvar VAR_0x8004, 6 + setvar VAR_0x8005, 1 + special SetFlavorTextFlagFromSpecialVars + clearflag FLAG_0x09F + setflag FLAG_0x4B4 + setflag FLAG_UNK824 + setvar VAR_0x8008, 5 + call EventScript_1A6B18 + goto EventScript_16D5A6 + end + +EventScript_16D5A6:: @ 816D5A6 + loadword 0, gUnknown_819850E + callstd 4 + checkitemspace ITEM_TM06, 1 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16D5E7 + additem ITEM_TM06, 1 + loadword 0, gUnknown_819858F + setorcopyvar VAR_0x8000, 294 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 257 + callstd 9 + setflag FLAG_0x259 + loadword 0, gUnknown_81985AB + callstd 4 + release + end + +EventScript_16D5E7:: @ 816D5E7 + loadword 0, gUnknown_819860D + callstd 4 + release + end + +FuchsiaCity_Gym_EventScript_16D5F1:: @ 816D5F1 + trainerbattle 0, 294, 0, Text_198866, Text_1988B6 + loadword 0, gUnknown_81988CB + callstd 6 + end + +FuchsiaCity_Gym_EventScript_16D608:: @ 816D608 + trainerbattle 0, 295, 0, Text_19891F, Text_19897F + loadword 0, gUnknown_8198985 + callstd 6 + end + +FuchsiaCity_Gym_EventScript_16D61F:: @ 816D61F + trainerbattle 0, 288, 0, Text_19871E, Text_198779 + setvar VAR_0x8004, 6 + setvar VAR_0x8005, 2 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_8198787 + callstd 6 + end + +FuchsiaCity_Gym_EventScript_16D643:: @ 816D643 + trainerbattle 0, 289, 0, Text_1989A1, Text_1989EA + loadword 0, gUnknown_8198A10 + callstd 6 + end + +FuchsiaCity_Gym_EventScript_16D65A:: @ 816D65A + trainerbattle 0, 292, 0, Text_198629, Text_1986B4 + loadword 0, gUnknown_81986C9 + callstd 6 + end + +FuchsiaCity_Gym_EventScript_16D671:: @ 816D671 + trainerbattle 0, 293, 0, Text_1987E8, Text_198812 + loadword 0, gUnknown_8198825 + callstd 6 + end + +FuchsiaCity_Gym_EventScript_16D688:: @ 816D688 + lock + faceplayer + checkflag FLAG_0x4B4 + goto_if 1, EventScript_16D69D + loadword 0, gUnknown_8198A5E + callstd 4 + release + end + +EventScript_16D69D:: @ 816D69D + loadword 0, gUnknown_8198B1D + callstd 4 + release + end + +FuchsiaCity_Gym_EventScript_16D6A7:: @ 816D6A7 + lockall + checkflag FLAG_UNK824 + goto_if 1, EventScript_16D6BB + loadword 0, gUnknown_8198B4B + callstd 4 + releaseall + end + +EventScript_16D6BB:: @ 816D6BB + loadword 0, gUnknown_8198B81 + callstd 4 + releaseall + end diff --git a/data/maps/FuchsiaCity_House1/scripts.inc b/data/maps/FuchsiaCity_House1/scripts.inc new file mode 100644 index 000000000..7f3f29d91 --- /dev/null +++ b/data/maps/FuchsiaCity_House1/scripts.inc @@ -0,0 +1,23 @@ +FuchsiaCity_House1_MapScripts:: @ 816D6C5 + .byte 0 + +FuchsiaCity_House1_EventScript_16D6C6:: @ 816D6C6 + loadword 0, gUnknown_8198BBB + callstd 2 + end + +FuchsiaCity_House1_EventScript_16D6CF:: @ 816D6CF + lock + faceplayer + setvar VAR_0x8004, 13 + setvar VAR_0x8005, 2 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_8198C1F + callstd 4 + release + end + +FuchsiaCity_House1_EventScript_16D6E8:: @ 816D6E8 + loadword 0, gUnknown_8198C7B + callstd 2 + end diff --git a/data/maps/FuchsiaCity_House2/scripts.inc b/data/maps/FuchsiaCity_House2/scripts.inc new file mode 100644 index 000000000..82d9cf932 --- /dev/null +++ b/data/maps/FuchsiaCity_House2/scripts.inc @@ -0,0 +1,46 @@ +FuchsiaCity_House2_MapScripts:: @ 816D816 + .byte 0 + +FuchsiaCity_House2_EventScript_16D817:: @ 816D817 + lock + faceplayer + checkflag FLAG_0x244 + goto_if 1, EventScript_16D83F + loadword 0, gUnknown_819918E + callstd 5 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16D849 + loadword 0, gUnknown_8199337 + callstd 4 + release + end + +EventScript_16D83F:: @ 816D83F + loadword 0, gUnknown_8199354 + callstd 4 + release + end + +EventScript_16D849:: @ 816D849 + loadword 0, gUnknown_8199207 + callstd 4 + checkitemspace ITEM_GOOD_ROD, 1 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16D88A + additem ITEM_GOOD_ROD, 1 + loadword 0, gUnknown_819925E + setorcopyvar VAR_0x8000, 263 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 257 + callstd 9 + loadword 0, gUnknown_8199296 + callstd 4 + setflag FLAG_0x244 + release + end + +EventScript_16D88A:: @ 816D88A + loadword 0, gUnknown_819937E + callstd 4 + release + end diff --git a/data/maps/FuchsiaCity_House3/scripts.inc b/data/maps/FuchsiaCity_House3/scripts.inc new file mode 100644 index 000000000..c7a7f60bb --- /dev/null +++ b/data/maps/FuchsiaCity_House3/scripts.inc @@ -0,0 +1,68 @@ +FuchsiaCity_House3_MapScripts:: @ 816D894 + .byte 0 + +FuchsiaCity_House3_EventScript_16D895:: @ 816D895 + lock + faceplayer + loadword 0, gUnknown_81993B9 + callstd 5 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16D8B0 + goto EventScript_16D941 + end + +EventScript_16D8B0:: @ 816D8B0 + loadword 0, gUnknown_8199421 + callstd 4 + special sub_80BF8FC + waitstate + compare_var_to_value VAR_0x8004, 6 + goto_if 4, EventScript_16D941 + special sub_80BFC14 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16D937 + special ScrSpecial_CountPokemonMoves + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16D92A + loadword 0, gUnknown_8199445 + callstd 4 + fadescreen 1 + special sub_80BF9BC + fadescreen 0 + compare_var_to_value VAR_0x8005, 4 + goto_if 1, EventScript_16D8B0 + special ScrSpecial_GetPokemonNicknameAndMoveName + loadword 0, gUnknown_8199485 + callstd 5 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16D919 + goto EventScript_16D941 + end + +EventScript_16D919:: @ 816D919 + special sub_80BFBA8 + playfanfare MUS_ME_WASURE + waitfanfare + loadword 0, gUnknown_81994B1 + callstd 4 + release + end + +EventScript_16D92A:: @ 816D92A + special ScrSpecial_GetPokemonNicknameAndMoveName + loadword 0, gUnknown_8199465 + callstd 4 + release + end + +EventScript_16D937:: @ 816D937 + loadword 0, gUnknown_819951F + callstd 4 + release + end + +EventScript_16D941:: @ 816D941 + loadword 0, gUnknown_81994EA + callstd 4 + release + end diff --git a/data/maps/FuchsiaCity_Mart/scripts.inc b/data/maps/FuchsiaCity_Mart/scripts.inc new file mode 100644 index 000000000..b87c05ce7 --- /dev/null +++ b/data/maps/FuchsiaCity_Mart/scripts.inc @@ -0,0 +1,38 @@ +FuchsiaCity_Mart_MapScripts:: @ 816D4E0 + .byte 0 + +FuchsiaCity_Mart_EventScript_16D4E1:: @ 816D4E1 + loadword 0, gUnknown_8198134 + callstd 2 + end + +FuchsiaCity_Mart_EventScript_16D4EA:: @ 816D4EA + loadword 0, gUnknown_81980BC + callstd 2 + end + +FuchsiaCity_Mart_EventScript_16D4F3:: @ 816D4F3 + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + lock + faceplayer + message Text_1A6211 + waitmessage + pokemart Items_16D518 + loadword 0, gUnknown_81A5190 + callstd 4 + release + end + + .align 2 +Items_16D518:: @ 816D518 + .2byte ITEM_ULTRA_BALL + .2byte ITEM_GREAT_BALL + .2byte ITEM_SUPER_POTION + .2byte ITEM_REVIVE + .2byte ITEM_FULL_HEAL + .2byte ITEM_MAX_REPEL + .2byte ITEM_NONE + release + end diff --git a/data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc b/data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc new file mode 100644 index 000000000..c52bf9f88 --- /dev/null +++ b/data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc @@ -0,0 +1,30 @@ +FuchsiaCity_PokemonCenter_1F_MapScripts:: @ 816D6F1 + map_script 3, FuchsiaCity_PokemonCenter_1F_MapScript1_16D6FC + map_script 5, FuchsiaCity_PokemonCenter_1F_MapScript2_1BC05C + .byte 0 + +FuchsiaCity_PokemonCenter_1F_MapScript1_16D6FC:: @ 816D6FC + setrespawn 8 + end + +FuchsiaCity_PokemonCenter_1F_EventScript_16D700:: @ 816D700 + lock + faceplayer + call EventScript_1A6578 + release + end + +FuchsiaCity_PokemonCenter_1F_EventScript_16D709:: @ 816D709 + loadword 0, gUnknown_8198CB7 + callstd 2 + end + +FuchsiaCity_PokemonCenter_1F_EventScript_16D712:: @ 816D712 + loadword 0, gUnknown_8198D2E + callstd 2 + end + +FuchsiaCity_PokemonCenter_1F_EventScript_16D71B:: @ 816D71B + loadword 0, gUnknown_8198D9B + callstd 2 + end diff --git a/data/maps/FuchsiaCity_PokemonCenter_2F/scripts.inc b/data/maps/FuchsiaCity_PokemonCenter_2F/scripts.inc new file mode 100644 index 000000000..2f62e3591 --- /dev/null +++ b/data/maps/FuchsiaCity_PokemonCenter_2F/scripts.inc @@ -0,0 +1,18 @@ +FuchsiaCity_PokemonCenter_2F_MapScripts:: @ 816D724 + map_script 2, FuchsiaCity_PokemonCenter_2F_MapScript1_1BB2A3 + map_script 4, FuchsiaCity_PokemonCenter_2F_MapScript2_1BB1ED + map_script 1, FuchsiaCity_PokemonCenter_2F_MapScript3_1BB237 + map_script 3, FuchsiaCity_PokemonCenter_2F_MapScript4_1BB1B4 + .byte 0 + +FuchsiaCity_PokemonCenter_2F_EventScript_16D739:: @ 816D739 + call EventScript_1BB4A3 + end + +EventScript_16D73F:: @ 816D73F + call EventScript_1BB6AB + end + +EventScript_16D745:: @ 816D745 + call EventScript_1BB7DE + end diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc new file mode 100644 index 000000000..58d68162b --- /dev/null +++ b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc @@ -0,0 +1,231 @@ +FuchsiaCity_SafariZone_Entrance_MapScripts:: @ 816D2A8 + map_script 2, FuchsiaCity_SafariZone_Entrance_MapScript1_16D2AE + .byte 0 + +FuchsiaCity_SafariZone_Entrance_MapScript1_16D2AE:: @ 816D2AE + map_script_2 VAR_0x406E, 1, EventScript_16D2F2 + map_script_2 VAR_0x406E, 2, EventScript_16D312 + map_script_2 VAR_0x406E, 3, EventScript_16D2C8 + .2byte 0 + +EventScript_16D2C8:: @ 816D2C8 + lockall + textcolor 0 + applymovement 255, Movement_16D36A + waitmovement 0 + loadword 0, gUnknown_8197E85 + callstd 4 + closemessage + applymovement 255, Movement_16D367 + waitmovement 0 + special sub_80A0EEC + setvar VAR_0x406E, 0 + releaseall + end + +EventScript_16D2F2:: @ 816D2F2 + lockall + textcolor 0 + loadword 0, gUnknown_8197E85 + callstd 4 + closemessage + applymovement 255, Movement_16D362 + waitmovement 0 + special sub_80A0EEC + setvar VAR_0x406E, 0 + releaseall + end + +EventScript_16D312:: @ 816D312 + lockall + textcolor 0 + loadword 0, gUnknown_8197E1A + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16D345 + loadword 0, gUnknown_8197E48 + callstd 4 + closemessage + applymovement 255, Movement_16D362 + waitmovement 0 + special sub_80A0EEC + setvar VAR_0x406E, 0 + releaseall + end + +EventScript_16D345:: @ 816D345 + loadword 0, gUnknown_8197E7A + callstd 4 + closemessage + applymovement 255, Movement_16D365 + waitmovement 0 + warp MAP_SAFARIZONE_CENTER, 255, 26, 30 + waitstate + end + +Movement_16D362:: @ 816D362 + step_10 + step_10 + step_end + +Movement_16D365:: @ 816D365 + step_11 + step_end + +Movement_16D367:: @ 816D367 + step_10 + step_10 + step_end + +Movement_16D36A:: @ 816D36A + step_10 + step_1b + step_end + +FuchsiaCity_SafariZone_Entrance_EventScript_16D36D:: @ 816D36D + lockall + setvar VAR_0x4002, 0 + goto EventScript_16D391 + end + +FuchsiaCity_SafariZone_Entrance_EventScript_16D379:: @ 816D379 + lockall + setvar VAR_0x4002, 1 + goto EventScript_16D391 + end + +FuchsiaCity_SafariZone_Entrance_EventScript_16D385:: @ 816D385 + lockall + setvar VAR_0x4002, 2 + goto EventScript_16D391 + end + +EventScript_16D391:: @ 816D391 + textcolor 0 + loadword 0, gUnknown_8197C6B + callstd 4 + applymovement 255, Movement_1A75EB + waitmovement 0 + showmoneybox 0, 0, 0 + loadword 0, gUnknown_8197C87 + callstd 5 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16D3CA + loadword 0, gUnknown_8197DE9 + callstd 4 + goto EventScript_16D49A + end + +EventScript_16D3CA:: @ 816D3CA + call EventScript_16D462 + checkmoney 500, 0 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16D48C + takemoney 500, 0 + updatemoneybox 0, 0, 0 + loadword 0, gUnknown_8197D07 + callstd 4 + textcolor 3 + playfanfare MUS_FANFA1 + message Text_197D50 + waitfanfare + call EventScript_1A6675 + loadword 0, gUnknown_8197D80 + callstd 4 + closemessage + hidemoneybox + .byte 0 + .byte 0 + compare_var_to_value VAR_0x4002, 0 + call_if 1, EventScript_16D44C + compare_var_to_value VAR_0x4002, 1 + call_if 1, EventScript_16D441 + compare_var_to_value VAR_0x4002, 2 + call_if 1, EventScript_16D457 + special sub_80A0EC4 + setvar VAR_0x406E, 2 + warp MAP_SAFARIZONE_CENTER, 255, 26, 30 + waitstate + end + +EventScript_16D441:: @ 816D441 + applymovement 255, Movement_16D4AF + waitmovement 0 + return + +EventScript_16D44C:: @ 816D44C + applymovement 255, Movement_16D4AC + waitmovement 0 + return + +EventScript_16D457:: @ 816D457 + applymovement 255, Movement_16D4B3 + waitmovement 0 + return + +EventScript_16D462:: @ 816D462 + countpokemon + compare_var_to_value VAR_RESULT, 6 + goto_if 5, EventScript_1A77A9 + specialvar VAR_RESULT, sub_80CABD0 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_1A77A9 + loadword 0, gUnknown_81BFEAC + callstd 4 + goto EventScript_16D49A + end + +EventScript_16D48C:: @ 816D48C + loadword 0, gUnknown_8197E02 + callstd 4 + goto EventScript_16D49A + end + +EventScript_16D49A:: @ 816D49A + closemessage + hidemoneybox + .byte 0 + .byte 0 + applymovement 255, Movement_16D4AA + waitmovement 0 + releaseall + end + +Movement_16D4AA:: @ 816D4AA + step_10 + step_end + +Movement_16D4AC:: @ 816D4AC + step_11 + step_11 + step_end + +Movement_16D4AF:: @ 816D4AF + step_11 + step_12 + step_11 + step_end + +Movement_16D4B3:: @ 816D4B3 + step_11 + step_13 + step_11 + step_end + +FuchsiaCity_SafariZone_Entrance_EventScript_16D4B7:: @ 816D4B7 + lock + faceplayer + loadword 0, gUnknown_8197EB0 + callstd 5 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16D4D6 + loadword 0, gUnknown_819809E + callstd 4 + release + end + +EventScript_16D4D6:: @ 816D4D6 + loadword 0, gUnknown_8197EE3 + callstd 4 + release + end diff --git a/data/maps/FuchsiaCity_ZooBuilding/scripts.inc b/data/maps/FuchsiaCity_ZooBuilding/scripts.inc new file mode 100644 index 000000000..80c385909 --- /dev/null +++ b/data/maps/FuchsiaCity_ZooBuilding/scripts.inc @@ -0,0 +1,22 @@ +FuchsiaCity_ZooBuilding_MapScripts:: @ 816D528 + .byte 0 + +FuchsiaCity_ZooBuilding_EventScript_16D529:: @ 816D529 + loadword 0, gUnknown_819816B + callstd 2 + end + +FuchsiaCity_ZooBuilding_EventScript_16D532:: @ 816D532 + loadword 0, gUnknown_81981C2 + callstd 2 + end + +FuchsiaCity_ZooBuilding_EventScript_16D53B:: @ 816D53B + loadword 0, gUnknown_819822A + callstd 2 + end + +FuchsiaCity_ZooBuilding_EventScript_16D544:: @ 816D544 + loadword 0, gUnknown_8198285 + callstd 2 + end diff --git a/data/maps/IndigoPlateau_Exterior/scripts.inc b/data/maps/IndigoPlateau_Exterior/scripts.inc new file mode 100644 index 000000000..101993c19 --- /dev/null +++ b/data/maps/IndigoPlateau_Exterior/scripts.inc @@ -0,0 +1,167 @@ +IndigoPlateau_Exterior_MapScripts:: @ 816723B + map_script 3, IndigoPlateau_Exterior_MapScript1_167246 + map_script 2, IndigoPlateau_Exterior_MapScript2_16725A + .byte 0 + +IndigoPlateau_Exterior_MapScript1_167246:: @ 8167246 + setworldmapflag 2201 + compare_var_to_value VAR_0x4085, 1 + call_if 1, EventScript_167255 + end + +EventScript_167255:: @ 8167255 + playbgm BGM_FRLG_CREDITS, 0 + return + +IndigoPlateau_Exterior_MapScript2_16725A:: @ 816725A + map_script_2 VAR_0x4085, 1, EventScript_167264 + .2byte 0 + +EventScript_167264:: @ 8167264 + lockall + delay 105 + opendoor 11, 6 + waitdooranim + special SpawnScriptFieldObject + addobject 1 + applymovement 1, Movement_167346 + applymovement 255, Movement_167337 + waitmovement 0 + closedoor 11, 6 + waitdooranim + applymovement 255, Movement_16731B + applymovement 1, Movement_16733E + waitmovement 0 + delay 100 + opendoor 11, 6 + waitdooranim + addobject 2 + applymovement 2, Movement_16735D + waitmovement 0 + closedoor 11, 6 + waitdooranim + delay 160 + applymovement 255, Movement_16731F + applymovement 2, Movement_167348 + waitmovement 0 + delay 100 + applymovement 255, Movement_16732E + waitmovement 0 + delay 155 + applymovement 255, Movement_16733C + waitmovement 0 + delay 90 + applymovement 255, Movement_167335 + waitmovement 0 + applymovement 255, Movement_167311 + waitmovement 0 + special RemoveScriptFieldObject + setvar VAR_0x4085, 0 + removeobject 1 + removeobject 2 + special sub_80F39B4 + waitstate + releaseall + end + +Movement_167311:: @ 8167311 + step_3d + step_3d + step_3d + step_3d + step_3d + step_3d + step_end + +Movement_167318:: @ 8167318 + step_10 + step_10 + step_end + +Movement_16731B:: @ 816731B + step_1c + step_1a + step_2d + step_end + +Movement_16731F:: @ 816731F + step_1b + step_30 + step_1c + step_1c + step_1c + step_1c + step_1c + step_1c + step_1c + step_1c + step_1c + step_1c + step_1c + step_2d + step_end + +Movement_16732E:: @ 816732E + step_13 + step_1c + step_10 + step_10 + step_1c + step_1c + step_end + +Movement_167335:: @ 8167335 + step_2d + step_end + +Movement_167337:: @ 8167337 + step_03 + step_4c + step_12 + step_4d + step_end + +Movement_16733C:: @ 816733C + step_2e + step_end + +Movement_16733E:: @ 816733E + step_1d + step_1d + step_1d + step_1d + step_1d + step_1d + step_1d + step_end + +Movement_167346:: @ 8167346 + step_1d + step_end + +Movement_167348:: @ 8167348 + step_2f + step_1c + step_1c + step_1c + step_1c + step_1c + step_1c + step_1c + step_1c + step_1c + step_1c + step_2d + step_1c + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_end + +Movement_16735D:: @ 816735D + step_10 + step_end diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc new file mode 100644 index 000000000..42a3280a2 --- /dev/null +++ b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc @@ -0,0 +1,81 @@ +IndigoPlateau_PokemonCenter_1F_MapScripts:: @ 816EA5A + map_script 3, IndigoPlateau_PokemonCenter_1F_MapScript1_16EA65 + map_script 5, IndigoPlateau_PokemonCenter_1F_MapScript2_1BC05C + .byte 0 + +IndigoPlateau_PokemonCenter_1F_MapScript1_16EA65:: @ 816EA65 + setrespawn 10 + specialvar VAR_RESULT, sub_806E25C + compare_var_to_value VAR_RESULT, 1 + call_if 1, EventScript_16EA79 + end + +EventScript_16EA79:: @ 816EA79 + checkflag 2116 + goto_if 1, EventScript_1A77A9 + setobjectxyperm 4, 4, 2 + return + +IndigoPlateau_PokemonCenter_1F_EventScript_16EA8A:: @ 816EA8A + lock + faceplayer + specialvar VAR_RESULT, sub_806E25C + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16EAA6 + loadword 0, gUnknown_819A8D8 + callstd 4 + release + end + +EventScript_16EAA6:: @ 816EAA6 + checkflag 2116 + goto_if 1, EventScript_16EAB9 + loadword 0, gUnknown_819A943 + callstd 4 + release + end + +EventScript_16EAB9:: @ 816EAB9 + loadword 0, gUnknown_819A8D8 + callstd 4 + release + end + +IndigoPlateau_PokemonCenter_1F_EventScript_16EAC3:: @ 816EAC3 + loadword 0, gUnknown_819A837 + callstd 2 + end + +IndigoPlateau_PokemonCenter_1F_EventScript_16EACC:: @ 816EACC + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + lock + faceplayer + message Text_1A6211 + waitmessage + pokemart Items_16EAF4 + loadword 0, gUnknown_81A5190 + callstd 4 + release + end + + .align 2 +Items_16EAF4:: @ 816EAF4 + .2byte ITEM_ULTRA_BALL + .2byte ITEM_GREAT_BALL + .2byte ITEM_FULL_RESTORE + .2byte ITEM_MAX_POTION + .2byte ITEM_REVIVE + .2byte ITEM_FULL_HEAL + .2byte ITEM_MAX_REPEL + .2byte ITEM_NONE + release + end + +IndigoPlateau_PokemonCenter_1F_EventScript_16EB06:: @ 816EB06 + lock + faceplayer + call EventScript_1A6578 + release + end diff --git a/data/maps/IndigoPlateau_PokemonCenter_2F/scripts.inc b/data/maps/IndigoPlateau_PokemonCenter_2F/scripts.inc new file mode 100644 index 000000000..152e39da9 --- /dev/null +++ b/data/maps/IndigoPlateau_PokemonCenter_2F/scripts.inc @@ -0,0 +1,18 @@ +IndigoPlateau_PokemonCenter_2F_MapScripts:: @ 816EB0F + map_script 2, IndigoPlateau_PokemonCenter_2F_MapScript1_1BB2A3 + map_script 4, IndigoPlateau_PokemonCenter_2F_MapScript2_1BB1ED + map_script 1, IndigoPlateau_PokemonCenter_2F_MapScript3_1BB237 + map_script 3, IndigoPlateau_PokemonCenter_2F_MapScript4_1BB1B4 + .byte 0 + +IndigoPlateau_PokemonCenter_2F_EventScript_16EB24:: @ 816EB24 + call EventScript_1BB4A3 + end + +EventScript_16EB2A:: @ 816EB2A + call EventScript_1BB6AB + end + +EventScript_16EB30:: @ 816EB30 + call EventScript_1BB7DE + end diff --git a/data/maps/LavenderTown/scripts.inc b/data/maps/LavenderTown/scripts.inc new file mode 100644 index 000000000..1f1c178e5 --- /dev/null +++ b/data/maps/LavenderTown/scripts.inc @@ -0,0 +1,57 @@ +LavenderTown_MapScripts:: @ 816686B + map_script 3, LavenderTown_MapScript1_166871 + .byte 0 + +LavenderTown_MapScript1_166871:: @ 8166871 + setworldmapflag 2196 + setvar VAR_0x405B, 1 + setflag FLAG_0x03D + end + +LavenderTown_EventScript_16687D:: @ 816687D + lock + faceplayer + loadword 0, gUnknown_817F52E + callstd 5 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16689C + loadword 0, gUnknown_817F568 + callstd 4 + release + end + +EventScript_16689C:: @ 816689C + loadword 0, gUnknown_817F548 + callstd 4 + release + end + +LavenderTown_EventScript_1668A6:: @ 81668A6 + loadword 0, gUnknown_817F5B6 + callstd 2 + end + +LavenderTown_EventScript_1668AF:: @ 81668AF + loadword 0, gUnknown_817F614 + callstd 2 + end + +LavenderTown_EventScript_1668B8:: @ 81668B8 + loadword 0, gUnknown_817F676 + callstd 3 + end + +LavenderTown_EventScript_1668C1:: @ 81668C1 + loadword 0, gUnknown_817F69A + callstd 3 + end + +LavenderTown_EventScript_1668CA:: @ 81668CA + loadword 0, gUnknown_817F6D6 + callstd 3 + end + +LavenderTown_EventScript_1668D3:: @ 81668D3 + loadword 0, gUnknown_817F6F7 + callstd 3 + end diff --git a/data/maps/LavenderTown_House1/scripts.inc b/data/maps/LavenderTown_House1/scripts.inc new file mode 100644 index 000000000..d29217628 --- /dev/null +++ b/data/maps/LavenderTown_House1/scripts.inc @@ -0,0 +1,29 @@ +LavenderTown_House1_MapScripts:: @ 816B232 + .byte 0 + +LavenderTown_House1_EventScript_16B233:: @ 816B233 + lock + faceplayer + checkflag FLAG_0x23C + goto_if 1, EventScript_16B248 + loadword 0, gUnknown_819397D + callstd 4 + release + end + +EventScript_16B248:: @ 816B248 + loadword 0, gUnknown_81939F8 + callstd 4 + release + end + +LavenderTown_House1_EventScript_16B252:: @ 816B252 + lock + faceplayer + waitse + playmoncry SPECIES_CUBONE, 0 + loadword 0, gUnknown_819396B + callstd 4 + waitmoncry + release + end diff --git a/data/maps/LavenderTown_House2/scripts.inc b/data/maps/LavenderTown_House2/scripts.inc new file mode 100644 index 000000000..a48d89db0 --- /dev/null +++ b/data/maps/LavenderTown_House2/scripts.inc @@ -0,0 +1,81 @@ +LavenderTown_House2_MapScripts:: @ 816B265 + .byte 0 + +LavenderTown_House2_EventScript_16B266:: @ 816B266 + lock + faceplayer + loadword 0, gUnknown_8193A4B + callstd 5 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16B287 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16B2AA + end + +EventScript_16B287:: @ 816B287 + loadword 0, gUnknown_8193AA6 + callstd 4 + special sub_80BF8FC + waitstate + compare_var_to_value VAR_0x8004, 6 + goto_if 0, EventScript_16B2B4 + compare_var_to_value VAR_0x8004, 6 + goto_if 4, EventScript_16B2AA + end + +EventScript_16B2AA:: @ 816B2AA + loadword 0, gUnknown_8193BD4 + callstd 4 + release + end + +EventScript_16B2B4:: @ 816B2B4 + specialvar VAR_RESULT, sub_80CAD54 + compare_var_to_value VAR_RESULT, 412 + goto_if 1, EventScript_16B307 + special TV_CopyNicknameToStringVar1AndEnsureTerminated + special TV_CheckMonOTIDEqualsPlayerID + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16B311 + specialvar VAR_RESULT, sub_80CAD7C + special TV_CopyNicknameToStringVar1AndEnsureTerminated + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16B311 + loadword 0, gUnknown_8193AD2 + callstd 5 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16B31B + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16B2AA + end + +EventScript_16B307:: @ 816B307 + loadword 0, gUnknown_8193CC4 + callstd 4 + release + end + +EventScript_16B311:: @ 816B311 + loadword 0, gUnknown_8193C82 + callstd 4 + release + end + +EventScript_16B31B:: @ 816B31B + loadword 0, gUnknown_8193B36 + callstd 4 + call EventScript_1A74EB + specialvar VAR_RESULT, sub_80CBFA0 + special TV_CopyNicknameToStringVar1AndEnsureTerminated + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16B345 + loadword 0, gUnknown_8193BF0 + callstd 4 + release + end + +EventScript_16B345:: @ 816B345 + loadword 0, gUnknown_8193B66 + callstd 4 + release + end diff --git a/data/maps/LavenderTown_Mart/scripts.inc b/data/maps/LavenderTown_Mart/scripts.inc new file mode 100644 index 000000000..217c3a883 --- /dev/null +++ b/data/maps/LavenderTown_Mart/scripts.inc @@ -0,0 +1,46 @@ +LavenderTown_Mart_MapScripts:: @ 816B34F + .byte 0 + +LavenderTown_Mart_EventScript_16B350:: @ 816B350 + loadword 0, gUnknown_8193CE5 + callstd 2 + end + +LavenderTown_Mart_EventScript_16B359:: @ 816B359 + loadword 0, gUnknown_8193DB6 + callstd 2 + end + +LavenderTown_Mart_EventScript_16B362:: @ 816B362 + loadword 0, gUnknown_8193DF1 + callstd 2 + end + +LavenderTown_Mart_EventScript_16B36B:: @ 816B36B + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + lock + faceplayer + message Text_1A6211 + waitmessage + pokemart Items_16B390 + loadword 0, gUnknown_81A5190 + callstd 4 + release + end + + .align 2 +Items_16B390:: @ 816B390 + .2byte ITEM_GREAT_BALL + .2byte ITEM_SUPER_POTION + .2byte ITEM_REVIVE + .2byte ITEM_ANTIDOTE + .2byte ITEM_PARALYZE_HEAL + .2byte ITEM_BURN_HEAL + .2byte ITEM_ICE_HEAL + .2byte ITEM_ESCAPE_ROPE + .2byte ITEM_SUPER_REPEL + .2byte ITEM_NONE + release + end diff --git a/data/maps/LavenderTown_PokemonCenter_1F/scripts.inc b/data/maps/LavenderTown_PokemonCenter_1F/scripts.inc new file mode 100644 index 000000000..db03c1f85 --- /dev/null +++ b/data/maps/LavenderTown_PokemonCenter_1F/scripts.inc @@ -0,0 +1,30 @@ +LavenderTown_PokemonCenter_1F_MapScripts:: @ 816B0EF + map_script 3, LavenderTown_PokemonCenter_1F_MapScript1_16B0FA + map_script 5, LavenderTown_PokemonCenter_1F_MapScript2_1BC05C + .byte 0 + +LavenderTown_PokemonCenter_1F_MapScript1_16B0FA:: @ 816B0FA + setrespawn 5 + end + +LavenderTown_PokemonCenter_1F_EventScript_16B0FE:: @ 816B0FE + lock + faceplayer + call EventScript_1A6578 + release + end + +LavenderTown_PokemonCenter_1F_EventScript_16B107:: @ 816B107 + loadword 0, gUnknown_8193465 + callstd 2 + end + +LavenderTown_PokemonCenter_1F_EventScript_16B110:: @ 816B110 + loadword 0, gUnknown_81934DE + callstd 2 + end + +LavenderTown_PokemonCenter_1F_EventScript_16B119:: @ 816B119 + loadword 0, gUnknown_819353A + callstd 2 + end diff --git a/data/maps/LavenderTown_PokemonCenter_2F/scripts.inc b/data/maps/LavenderTown_PokemonCenter_2F/scripts.inc new file mode 100644 index 000000000..16d54651b --- /dev/null +++ b/data/maps/LavenderTown_PokemonCenter_2F/scripts.inc @@ -0,0 +1,18 @@ +LavenderTown_PokemonCenter_2F_MapScripts:: @ 816B122 + map_script 2, LavenderTown_PokemonCenter_2F_MapScript1_1BB2A3 + map_script 4, LavenderTown_PokemonCenter_2F_MapScript2_1BB1ED + map_script 1, LavenderTown_PokemonCenter_2F_MapScript3_1BB237 + map_script 3, LavenderTown_PokemonCenter_2F_MapScript4_1BB1B4 + .byte 0 + +LavenderTown_PokemonCenter_2F_EventScript_16B137:: @ 816B137 + call EventScript_1BB4A3 + end + +EventScript_16B13D:: @ 816B13D + call EventScript_1BB6AB + end + +EventScript_16B143:: @ 816B143 + call EventScript_1BB7DE + end diff --git a/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc b/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc new file mode 100644 index 000000000..4671f0bfe --- /dev/null +++ b/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc @@ -0,0 +1,105 @@ +LavenderTown_VolunteerPokemonHouse_MapScripts:: @ 816B149 + .byte 0 + +LavenderTown_VolunteerPokemonHouse_EventScript_16B14A:: @ 816B14A + lock + faceplayer + checkflag FLAG_0x23D + goto_if 1, EventScript_16B196 + loadword 0, gUnknown_81936FF + callstd 4 + checkitemspace ITEM_POKE_FLUTE, 1 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16B1A0 + setflag FLAG_0x23D + additem ITEM_POKE_FLUTE, 1 + loadword 0, gUnknown_81937BD + setorcopyvar VAR_0x8000, 350 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 318 + callstd 9 + loadword 0, gUnknown_81937E5 + callstd 4 + release + end + +EventScript_16B196:: @ 816B196 + loadword 0, gUnknown_8193878 + callstd 4 + release + end + +EventScript_16B1A0:: @ 816B1A0 + loadword 0, gUnknown_819385B + callstd 4 + release + end + +LavenderTown_VolunteerPokemonHouse_EventScript_16B1AA:: @ 816B1AA + lock + faceplayer + setvar VAR_0x8004, 14 + setvar VAR_0x8005, 0 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_8193652 + callstd 4 + release + end + +LavenderTown_VolunteerPokemonHouse_EventScript_16B1C3:: @ 816B1C3 + loadword 0, gUnknown_81936B4 + callstd 2 + end + +LavenderTown_VolunteerPokemonHouse_EventScript_16B1CC:: @ 816B1CC + lock + faceplayer + checkflag FLAG_0x23C + goto_if 1, EventScript_16B1E1 + loadword 0, gUnknown_81935ED + callstd 4 + release + end + +EventScript_16B1E1:: @ 816B1E1 + loadword 0, gUnknown_819361D + callstd 4 + release + end + +LavenderTown_VolunteerPokemonHouse_EventScript_16B1EB:: @ 816B1EB + lock + faceplayer + waitse + playmoncry SPECIES_NIDORINO, 0 + loadword 0, gUnknown_81936DE + callstd 4 + waitmoncry + release + end + +LavenderTown_VolunteerPokemonHouse_EventScript_16B1FE:: @ 816B1FE + lock + faceplayer + waitse + playmoncry SPECIES_PSYDUCK, 0 + loadword 0, gUnknown_81936EE + callstd 4 + waitmoncry + release + end + +LavenderTown_VolunteerPokemonHouse_EventScript_16B211:: @ 816B211 + lockall + setvar VAR_0x8004, 14 + setvar VAR_0x8005, 2 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_81938A0 + callstd 4 + releaseall + end + +LavenderTown_VolunteerPokemonHouse_EventScript_16B229:: @ 816B229 + loadword 0, gUnknown_819392B + callstd 3 + end diff --git a/data/maps/MtEmber_Exterior/scripts.inc b/data/maps/MtEmber_Exterior/scripts.inc new file mode 100644 index 000000000..4ddae76ad --- /dev/null +++ b/data/maps/MtEmber_Exterior/scripts.inc @@ -0,0 +1,146 @@ +MtEmber_Exterior_MapScripts:: @ 8163946 + map_script 3, MtEmber_Exterior_MapScript1_163951 + map_script 1, MtEmber_Exterior_MapScript2_163969 + .byte 0 + +MtEmber_Exterior_MapScript1_163951:: @ 8163951 + setworldmapflag 2230 + compare_var_to_value VAR_0x407F, 2 + call_if 1, EventScript_163960 + end + +EventScript_163960:: @ 8163960 + setobjectmovementtype 2, 8 + setobjectmovementtype 3, 8 + return + +MtEmber_Exterior_MapScript2_163969:: @ 8163969 + compare_var_to_value VAR_0x4076, 4 + call_if 4, EventScript_163975 + end + +EventScript_163975:: @ 8163975 + setmetatile 42, 39, 838, 0 + return + +MtEmber_Exterior_EventScript_16397F:: @ 816397F + lock + checktrainerflag 537 + goto_if 1, EventScript_16399E + compare_var_to_value VAR_0x4076, 4 + goto_if 1, EventScript_1639A8 + loadword 0, gUnknown_817A82A + callstd 4 + release + end + +EventScript_16399E:: @ 816399E + loadword 0, gUnknown_817AA3F + callstd 4 + release + end + +EventScript_1639A8:: @ 81639A8 + applymovement 2, Movement_1A75E1 + waitmovement 0 + playbgm BGM_FRLG_SUSPICIOUS_EYE, 0 + loadword 0, gUnknown_817AA06 + callstd 4 + trainerbattle 3, 537, 0, Text_17AA34 + loadword 0, gUnknown_817AA3F + callstd 4 + checktrainerflag 538 + goto_if 1, EventScript_1639DB + release + end + +EventScript_1639DB:: @ 81639DB + loadword 0, gUnknown_817AAD7 + callstd 4 + closemessage + fadescreen 1 + removeobject 2 + removeobject 3 + fadescreen 0 + release + end + +MtEmber_Exterior_EventScript_1639F0:: @ 81639F0 + lock + faceplayer + checktrainerflag 538 + goto_if 1, EventScript_163A1B + compare_var_to_value VAR_0x4076, 4 + goto_if 1, EventScript_163A25 + loadword 0, gUnknown_817A88C + callstd 4 + closemessage + applymovement 3, Movement_1A75E5 + waitmovement 0 + release + end + +EventScript_163A1B:: @ 8163A1B + loadword 0, gUnknown_817AA99 + callstd 4 + release + end + +EventScript_163A25:: @ 8163A25 + playbgm BGM_FRLG_SUSPICIOUS_EYE, 0 + loadword 0, gUnknown_817AA56 + callstd 4 + trainerbattle 3, 538, 0, Text_17AA8A + loadword 0, gUnknown_817AA99 + callstd 4 + checktrainerflag 537 + goto_if 1, EventScript_1639DB + release + end + +MtEmber_Exterior_EventScript_163A4E:: @ 8163A4E + lockall + textcolor 0 + loadword 0, gUnknown_817A8B4 + callstd 4 + message Text_17A8EE + waitmessage + playse SE_PIN + applymovement 3, Movement_1A75D9 + waitmovement 0 + waitbuttonpress + loadword 0, gUnknown_817A970 + callstd 4 + applymovement 2, Movement_1A75ED + waitmovement 0 + playse SE_PIN + applymovement 2, Movement_1A75DB + waitmovement 0 + applymovement 2, Movement_1A75DD + waitmovement 0 + applymovement 3, Movement_1A75ED + waitmovement 0 + call EventScript_163960 + loadword 0, gUnknown_817A9E1 + callstd 4 + setvar VAR_0x407F, 2 + releaseall + end + +MtEmber_Exterior_EventScript_163AB4:: @ 8163AB4 + trainerbattle 0, 595, 0, Text_17AB73, Text_17ABAA + loadword 0, gUnknown_817ABD8 + callstd 6 + end + +MtEmber_Exterior_EventScript_163ACB:: @ 8163ACB + trainerbattle 0, 597, 0, Text_17AC55, Text_17AC82 + loadword 0, gUnknown_817ACA2 + callstd 6 + end + +MtEmber_Exterior_EventScript_163AE2:: @ 8163AE2 + trainerbattle 0, 592, 0, Text_17AD06, Text_17AD6B + loadword 0, gUnknown_817AD89 + callstd 6 + end diff --git a/data/maps/MtEmber_RubyPath_B1F/scripts.inc b/data/maps/MtEmber_RubyPath_B1F/scripts.inc new file mode 100644 index 000000000..f0b3378d4 --- /dev/null +++ b/data/maps/MtEmber_RubyPath_B1F/scripts.inc @@ -0,0 +1,2 @@ +MtEmber_RubyPath_B1F_MapScripts:: @ 8163C46 + .byte 0 diff --git a/data/maps/MtEmber_RubyPath_B1F_Stairs/scripts.inc b/data/maps/MtEmber_RubyPath_B1F_Stairs/scripts.inc new file mode 100644 index 000000000..39df5df91 --- /dev/null +++ b/data/maps/MtEmber_RubyPath_B1F_Stairs/scripts.inc @@ -0,0 +1,2 @@ +MtEmber_RubyPath_B1F_Stairs_MapScripts:: @ 8163C6F + .byte 0 diff --git a/data/maps/MtEmber_RubyPath_B2F/scripts.inc b/data/maps/MtEmber_RubyPath_B2F/scripts.inc new file mode 100644 index 000000000..8fec3c4d7 --- /dev/null +++ b/data/maps/MtEmber_RubyPath_B2F/scripts.inc @@ -0,0 +1,2 @@ +MtEmber_RubyPath_B2F_MapScripts:: @ 8163C47 + .byte 0 diff --git a/data/maps/MtEmber_RubyPath_B2F_Stairs/scripts.inc b/data/maps/MtEmber_RubyPath_B2F_Stairs/scripts.inc new file mode 100644 index 000000000..50c8f8334 --- /dev/null +++ b/data/maps/MtEmber_RubyPath_B2F_Stairs/scripts.inc @@ -0,0 +1,2 @@ +MtEmber_RubyPath_B2F_Stairs_MapScripts:: @ 8163C70 + .byte 0 diff --git a/data/maps/MtEmber_RubyPath_B3F/scripts.inc b/data/maps/MtEmber_RubyPath_B3F/scripts.inc new file mode 100644 index 000000000..52191ba85 --- /dev/null +++ b/data/maps/MtEmber_RubyPath_B3F/scripts.inc @@ -0,0 +1,17 @@ +MtEmber_RubyPath_B3F_MapScripts:: @ 8163C48 + .byte 0 + +MtEmber_RubyPath_B3F_EventScript_163C49:: @ 8163C49 +MtEmber_RubyPath_B5F_EventScript_163C49:: @ 8163C49 + lock + faceplayer + setflag FLAG_0x2DD + removeobject 1 + additem ITEM_RUBY, 1 + loadword 0, gUnknown_817ADC5 + setorcopyvar VAR_0x8000, 373 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 318 + callstd 9 + release + end diff --git a/data/maps/MtEmber_RubyPath_B4F/scripts.inc b/data/maps/MtEmber_RubyPath_B4F/scripts.inc new file mode 100644 index 000000000..537aa71fe --- /dev/null +++ b/data/maps/MtEmber_RubyPath_B4F/scripts.inc @@ -0,0 +1,72 @@ +MtEmber_RubyPath_B4F_MapScripts:: @ 81638EB + .byte 0 + +MtEmber_RubyPath_B4F_EventScript_1638EC:: @ 81638EC + lockall + braillemessage gUnknown_81A929F + waitbuttonpress + releaseall + end + +MtEmber_RubyPath_B4F_EventScript_1638F5:: @ 81638F5 + lockall + braillemessage gUnknown_81A92A3 + waitbuttonpress + releaseall + end + +MtEmber_RubyPath_B4F_EventScript_1638FE:: @ 81638FE + lockall + braillemessage gUnknown_81A92A7 + waitbuttonpress + releaseall + end + +MtEmber_RubyPath_B4F_EventScript_163907:: @ 8163907 + lockall + braillemessage gUnknown_81A92AB + waitbuttonpress + releaseall + end + +MtEmber_RubyPath_B4F_EventScript_163910:: @ 8163910 + lockall + braillemessage gUnknown_81A92AF + waitbuttonpress + releaseall + end + +MtEmber_RubyPath_B4F_EventScript_163919:: @ 8163919 + lockall + braillemessage gUnknown_81A92B3 + waitbuttonpress + releaseall + end + +MtEmber_RubyPath_B4F_EventScript_163922:: @ 8163922 + lockall + braillemessage gUnknown_81A92B7 + waitbuttonpress + releaseall + end + +MtEmber_RubyPath_B4F_EventScript_16392B:: @ 816392B + lockall + braillemessage gUnknown_81A92BC + waitbuttonpress + releaseall + end + +MtEmber_RubyPath_B4F_EventScript_163934:: @ 8163934 + lockall + braillemessage gUnknown_81A92C1 + waitbuttonpress + releaseall + end + +MtEmber_RubyPath_B4F_EventScript_16393D:: @ 816393D + lockall + braillemessage gUnknown_81A92C3 + waitbuttonpress + releaseall + end diff --git a/data/maps/MtEmber_RubyPath_B5F/scripts.inc b/data/maps/MtEmber_RubyPath_B5F/scripts.inc new file mode 100644 index 000000000..91b69cf5b --- /dev/null +++ b/data/maps/MtEmber_RubyPath_B5F/scripts.inc @@ -0,0 +1,38 @@ +MtEmber_RubyPath_B5F_MapScripts:: @ 8163BAA + .byte 0 + +MtEmber_RubyPath_B5F_EventScript_163BAB:: @ 8163BAB + lockall + setvar VAR_0x8005, 130 + setvar VAR_0x8006, 0 + braillemessage gUnknown_81A92C5 + getbraillestringwidth gUnknown_81A92C5 + call EventScript_1A926C + setvar VAR_0x8006, 0 + braillemessage gUnknown_81A92D0 + getbraillestringwidth gUnknown_81A92D0 + call EventScript_1A926C + setvar VAR_0x8006, 0 + braillemessage gUnknown_81A92DC + getbraillestringwidth gUnknown_81A92DC + call EventScript_1A926C + setvar VAR_0x8006, 0 + braillemessage gUnknown_81A92E6 + getbraillestringwidth gUnknown_81A92E6 + call EventScript_1A926C + setvar VAR_0x8006, 0 + braillemessage gUnknown_81A92F2 + getbraillestringwidth gUnknown_81A92F2 + call EventScript_1A926C + setvar VAR_0x8006, 0 + braillemessage gUnknown_81A92FE + getbraillestringwidth gUnknown_81A92FE + call EventScript_1A926C + setvar VAR_0x8006, 0 + braillemessage gUnknown_81A930A + getbraillestringwidth gUnknown_81A930A + call EventScript_1A926C + braillemessage gUnknown_81A9316 + waitbuttonpress + releaseall + end diff --git a/data/maps/MtEmber_Summit/scripts.inc b/data/maps/MtEmber_Summit/scripts.inc new file mode 100644 index 000000000..85f60fd1d --- /dev/null +++ b/data/maps/MtEmber_Summit/scripts.inc @@ -0,0 +1,66 @@ +MtEmber_Summit_MapScripts:: @ 8163AFC + map_script 3, MtEmber_Summit_MapScript1_163B25 + map_script 5, MtEmber_Summit_MapScript2_163B07 + .byte 0 + +MtEmber_Summit_MapScript2_163B07:: @ 8163B07 + checkflag 2055 + call_if 1, EventScript_163B11 + end + +EventScript_163B11:: @ 8163B11 + specialvar VAR_RESULT, sub_80CA74C + compare_var_to_value VAR_RESULT, 7 + goto_if 5, EventScript_1A77A9 + removeobject VAR_LAST_TALKED + return + +MtEmber_Summit_MapScript1_163B25:: @ 8163B25 + checkflag FLAG_0x2BD + call_if 0, EventScript_163B2F + end + +EventScript_163B2F:: @ 8163B2F + clearflag FLAG_0x052 + return + +MtEmber_Summit_EventScript_163B33:: @ 8163B33 + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + special sub_8112364 + lock + faceplayer + setwildbattle SPECIES_MOLTRES, 50, ITEM_NONE + waitse + playmoncry SPECIES_MOLTRES, 2 + message Text_1A6448 + waitmessage + waitmoncry + delay 10 + playbgm BGM_FRLG_LEADER_EYE, 0 + waitbuttonpress + setflag 2055 + special sub_807F9D8 + waitstate + clearflag 2055 + specialvar VAR_RESULT, sub_80CA74C + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_163B96 + compare_var_to_value VAR_RESULT, 4 + goto_if 1, EventScript_163B9F + compare_var_to_value VAR_RESULT, 5 + goto_if 1, EventScript_163B9F + setflag FLAG_0x2BD + release + end + +EventScript_163B96:: @ 8163B96 + setflag FLAG_0x2BD + goto EventScript_1A922D + end + +EventScript_163B9F:: @ 8163B9F + setvar VAR_0x8004, 146 + goto EventScript_1A9236 + end diff --git a/data/maps/MtEmber_SummitPath_1F/scripts.inc b/data/maps/MtEmber_SummitPath_1F/scripts.inc new file mode 100644 index 000000000..945430a19 --- /dev/null +++ b/data/maps/MtEmber_SummitPath_1F/scripts.inc @@ -0,0 +1,2 @@ +MtEmber_SummitPath_1F_MapScripts:: @ 8163AF9 + .byte 0 diff --git a/data/maps/MtEmber_SummitPath_2F/scripts.inc b/data/maps/MtEmber_SummitPath_2F/scripts.inc new file mode 100644 index 000000000..ca843116e --- /dev/null +++ b/data/maps/MtEmber_SummitPath_2F/scripts.inc @@ -0,0 +1,2 @@ +MtEmber_SummitPath_2F_MapScripts:: @ 8163AFA + .byte 0 diff --git a/data/maps/MtEmber_SummitPath_3F/scripts.inc b/data/maps/MtEmber_SummitPath_3F/scripts.inc new file mode 100644 index 000000000..5f44d2863 --- /dev/null +++ b/data/maps/MtEmber_SummitPath_3F/scripts.inc @@ -0,0 +1,2 @@ +MtEmber_SummitPath_3F_MapScripts:: @ 8163AFB + .byte 0 diff --git a/data/maps/MtMoon_1F/scripts.inc b/data/maps/MtMoon_1F/scripts.inc new file mode 100644 index 000000000..8303d88bf --- /dev/null +++ b/data/maps/MtMoon_1F/scripts.inc @@ -0,0 +1,54 @@ +MtMoon_1F_MapScripts:: @ 81605E4 + map_script 3, MtMoon_1F_MapScript1_1605EA + .byte 0 + +MtMoon_1F_MapScript1_1605EA:: @ 81605EA + setworldmapflag 2213 + end + +MtMoon_1F_EventScript_1605EE:: @ 81605EE + loadword 0, gUnknown_8172AE0 + callstd 3 + end + +MtMoon_1F_EventScript_1605F7:: @ 81605F7 + trainerbattle 0, 181, 0, Text_17279D, Text_1727CB + loadword 0, gUnknown_81727DF + callstd 6 + end + +MtMoon_1F_EventScript_16060E:: @ 816060E + trainerbattle 0, 91, 0, Text_17281D, Text_172844 + loadword 0, gUnknown_8172863 + callstd 6 + end + +MtMoon_1F_EventScript_160625:: @ 8160625 + trainerbattle 0, 120, 0, Text_172896, Text_1728C3 + loadword 0, gUnknown_81728D2 + callstd 6 + end + +MtMoon_1F_EventScript_16063C:: @ 816063C + trainerbattle 0, 121, 0, Text_172972, Text_1729A4 + loadword 0, gUnknown_81729AC + callstd 6 + end + +MtMoon_1F_EventScript_160653:: @ 8160653 + trainerbattle 0, 169, 0, Text_17290B, Text_172927 + loadword 0, gUnknown_817293C + callstd 6 + end + +MtMoon_1F_EventScript_16066A:: @ 816066A + trainerbattle 0, 108, 0, Text_1729EA, Text_172A1A + loadword 0, gUnknown_8172A26 + callstd 6 + end + +MtMoon_1F_EventScript_160681:: @ 8160681 + trainerbattle 0, 109, 0, Text_172A55, Text_172A8F + loadword 0, gUnknown_8172A97 + callstd 6 + end diff --git a/data/maps/MtMoon_B1F/scripts.inc b/data/maps/MtMoon_B1F/scripts.inc new file mode 100644 index 000000000..17e91f4d0 --- /dev/null +++ b/data/maps/MtMoon_B1F/scripts.inc @@ -0,0 +1,2 @@ +MtMoon_B1F_MapScripts:: @ 8160698 + .byte 0 diff --git a/data/maps/MtMoon_B2F/scripts.inc b/data/maps/MtMoon_B2F/scripts.inc new file mode 100644 index 000000000..14e47d472 --- /dev/null +++ b/data/maps/MtMoon_B2F/scripts.inc @@ -0,0 +1,160 @@ +MtMoon_B2F_MapScripts:: @ 8160699 + map_script 3, MtMoon_B2F_MapScript1_16069F + .byte 0 + +MtMoon_B2F_MapScript1_16069F:: @ 816069F + checkflag FLAG_0x232 + call_if 0, EventScript_1606A9 + end + +EventScript_1606A9:: @ 81606A9 + clearflag FLAG_0x02F + clearflag FLAG_0x030 + return + +MtMoon_B2F_EventScript_1606B0:: @ 81606B0 + lockall + applymovement 3, Movement_1A75EB + waitmovement 0 + call EventScript_1606DD + releaseall + end + +MtMoon_B2F_EventScript_1606C2:: @ 81606C2 + lock + faceplayer + checkflag FLAG_0x232 + goto_if 1, EventScript_160707 + checktrainerflag 170 + goto_if 1, EventScript_160711 + call EventScript_1606DD + release + end + +EventScript_1606DD:: @ 81606DD + textcolor 0 + message Text_172B64 + waitmessage + playbgm BGM_FRLG_LEADER_EYE, 0 + waitbuttonpress + setvar VAR_LAST_TALKED, 3 + trainerbattle 3, 170, 0, Text_172B99 + setvar VAR_0x408B, 1 + loadword 0, gUnknown_8172BAB + callstd 4 + return + +EventScript_160707:: @ 8160707 + loadword 0, gUnknown_8172BFB + callstd 4 + release + end + +EventScript_160711:: @ 8160711 + loadword 0, gUnknown_8172BAB + callstd 4 + release + end + +MtMoon_B2F_EventScript_16071B:: @ 816071B + lock + faceplayer + loadword 0, gUnknown_8172E77 + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_1607DE + removeobject 1 + additem ITEM_DOME_FOSSIL, 1 + loadword 0, gUnknown_8172ECD + setorcopyvar VAR_0x8000, 358 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 318 + callstd 9 + closemessage + special sub_8112364 + delay 10 + applymovement 3, Movement_16077A + waitmovement 0 + moveobjectoffscreen 3 + textcolor 0 + playfanfare BGM_FRLG_ME_KEYITEM + message Text_172BD6 + waitmessage + waitfanfare + removeobject 2 + setflag FLAG_0x272 + setflag FLAG_0x232 + release + end + +Movement_16077A:: @ 816077A + step_13 + step_11 + step_11 + step_11 + step_end + +MtMoon_B2F_EventScript_16077F:: @ 816077F + lock + faceplayer + loadword 0, gUnknown_8172E94 + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_1607DE + removeobject 2 + additem ITEM_HELIX_FOSSIL, 1 + loadword 0, gUnknown_8172EB2 + setorcopyvar VAR_0x8000, 357 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 318 + callstd 9 + closemessage + special sub_8112364 + delay 10 + applymovement 3, Movement_1607E0 + waitmovement 0 + moveobjectoffscreen 3 + textcolor 0 + playfanfare BGM_FRLG_ME_KEYITEM + message Text_172BD6 + waitmessage + waitfanfare + removeobject 1 + setflag FLAG_0x273 + setflag FLAG_0x232 + release + end + +EventScript_1607DE:: @ 81607DE + release + end + +Movement_1607E0:: @ 81607E0 + step_11 + step_11 + step_11 + step_end + +MtMoon_B2F_EventScript_1607E4:: @ 81607E4 + trainerbattle 0, 351, 0, Text_172C5A, Text_172CB8 + loadword 0, gUnknown_8172CCB + callstd 6 + end + +MtMoon_B2F_EventScript_1607FB:: @ 81607FB + trainerbattle 0, 352, 0, Text_172CFC, Text_172D46 + loadword 0, gUnknown_8172D51 + callstd 6 + end + +MtMoon_B2F_EventScript_160812:: @ 8160812 + trainerbattle 0, 353, 0, Text_172D82, Text_172DAF + loadword 0, gUnknown_8172DC1 + callstd 6 + end + +MtMoon_B2F_EventScript_160829:: @ 8160829 + trainerbattle 0, 354, 0, Text_172DF0, Text_172E3E + loadword 0, gUnknown_8172E4B + callstd 6 + end diff --git a/data/maps/NavelRock_1F/scripts.inc b/data/maps/NavelRock_1F/scripts.inc new file mode 100644 index 000000000..97852f3d4 --- /dev/null +++ b/data/maps/NavelRock_1F/scripts.inc @@ -0,0 +1,2 @@ +NavelRock_1F_MapScripts:: @ 8164F9E + .byte 0 diff --git a/data/maps/NavelRock_B1F/scripts.inc b/data/maps/NavelRock_B1F/scripts.inc new file mode 100644 index 000000000..d940f8d12 --- /dev/null +++ b/data/maps/NavelRock_B1F/scripts.inc @@ -0,0 +1,2 @@ +NavelRock_B1F_MapScripts:: @ 8165201 + .byte 0 diff --git a/data/maps/NavelRock_Base/scripts.inc b/data/maps/NavelRock_Base/scripts.inc new file mode 100644 index 000000000..cf31f50f2 --- /dev/null +++ b/data/maps/NavelRock_Base/scripts.inc @@ -0,0 +1,91 @@ +NavelRock_Base_MapScripts:: @ 81650E7 + map_script 3, NavelRock_Base_MapScript1_1650F2 + map_script 5, NavelRock_Base_MapScript2_165116 + .byte 0 + +NavelRock_Base_MapScript1_1650F2:: @ 81650F2 + checkflag FLAG_0x2F2 + call_if 1, EventScript_165105 + checkflag FLAG_0x2F2 + call_if 0, EventScript_165109 + end + +EventScript_165105:: @ 8165105 + setflag FLAG_0x09B + return + +EventScript_165109:: @ 8165109 + checkflag FLAG_0x2F5 + goto_if 1, EventScript_1A77A9 + clearflag FLAG_0x09B + return + +NavelRock_Base_MapScript2_165116:: @ 8165116 + checkflag 2055 + call_if 1, EventScript_165120 + end + +EventScript_165120:: @ 8165120 + specialvar VAR_RESULT, sub_80CA74C + compare_var_to_value VAR_RESULT, 7 + goto_if 5, EventScript_1A77A9 + removeobject 1 + return + +NavelRock_Base_EventScript_165134:: @ 8165134 + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + special sub_8112364 + lock + faceplayer + waitse + delay 20 + playse SE_FUUSEN2 + setvar VAR_0x8004, 0 + setvar VAR_0x8005, 3 + setvar VAR_0x8006, 4 + setvar VAR_0x8007, 2 + special sub_80CAC28 + delay 30 + playse SE_FUUSEN2 + setvar VAR_0x8004, 0 + setvar VAR_0x8005, 3 + setvar VAR_0x8006, 4 + setvar VAR_0x8007, 2 + special sub_80CAC28 + delay 30 + delay 50 + waitse + playmoncry SPECIES_LUGIA, 2 + waitmoncry + delay 20 + setvar VAR_0x8004, 249 + setvar VAR_0x8005, 70 + setvar VAR_0x8006, 0 + special sub_8044838 + setflag 2055 + special sub_807F9D8 + waitstate + clearflag 2055 + specialvar VAR_RESULT, sub_80CA74C + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_1651D9 + compare_var_to_value VAR_RESULT, 4 + goto_if 1, EventScript_1651E7 + compare_var_to_value VAR_RESULT, 5 + goto_if 1, EventScript_1651E7 + setflag FLAG_0x2F2 + release + end + +EventScript_1651D9:: @ 81651D9 + setflag FLAG_0x2F5 + setvar VAR_0x8004, 249 + goto EventScript_1A9236 + end + +EventScript_1651E7:: @ 81651E7 + setvar VAR_0x8004, 249 + goto EventScript_1A9236 + end diff --git a/data/maps/NavelRock_BasePath_B10F/scripts.inc b/data/maps/NavelRock_BasePath_B10F/scripts.inc new file mode 100644 index 000000000..367d219c5 --- /dev/null +++ b/data/maps/NavelRock_BasePath_B10F/scripts.inc @@ -0,0 +1,2 @@ +NavelRock_BasePath_B10F_MapScripts:: @ 81651FF + .byte 0 diff --git a/data/maps/NavelRock_BasePath_B11F/scripts.inc b/data/maps/NavelRock_BasePath_B11F/scripts.inc new file mode 100644 index 000000000..ee20f32f5 --- /dev/null +++ b/data/maps/NavelRock_BasePath_B11F/scripts.inc @@ -0,0 +1,2 @@ +NavelRock_BasePath_B11F_MapScripts:: @ 8165200 + .byte 0 diff --git a/data/maps/NavelRock_BasePath_B1F/scripts.inc b/data/maps/NavelRock_BasePath_B1F/scripts.inc new file mode 100644 index 000000000..d15e43a46 --- /dev/null +++ b/data/maps/NavelRock_BasePath_B1F/scripts.inc @@ -0,0 +1,2 @@ +NavelRock_BasePath_B1F_MapScripts:: @ 81651F6 + .byte 0 diff --git a/data/maps/NavelRock_BasePath_B2F/scripts.inc b/data/maps/NavelRock_BasePath_B2F/scripts.inc new file mode 100644 index 000000000..9e41c37a4 --- /dev/null +++ b/data/maps/NavelRock_BasePath_B2F/scripts.inc @@ -0,0 +1,2 @@ +NavelRock_BasePath_B2F_MapScripts:: @ 81651F7 + .byte 0 diff --git a/data/maps/NavelRock_BasePath_B3F/scripts.inc b/data/maps/NavelRock_BasePath_B3F/scripts.inc new file mode 100644 index 000000000..4a306fb7c --- /dev/null +++ b/data/maps/NavelRock_BasePath_B3F/scripts.inc @@ -0,0 +1,2 @@ +NavelRock_BasePath_B3F_MapScripts:: @ 81651F8 + .byte 0 diff --git a/data/maps/NavelRock_BasePath_B4F/scripts.inc b/data/maps/NavelRock_BasePath_B4F/scripts.inc new file mode 100644 index 000000000..80c442795 --- /dev/null +++ b/data/maps/NavelRock_BasePath_B4F/scripts.inc @@ -0,0 +1,2 @@ +NavelRock_BasePath_B4F_MapScripts:: @ 81651F9 + .byte 0 diff --git a/data/maps/NavelRock_BasePath_B5F/scripts.inc b/data/maps/NavelRock_BasePath_B5F/scripts.inc new file mode 100644 index 000000000..9bc4d0e8c --- /dev/null +++ b/data/maps/NavelRock_BasePath_B5F/scripts.inc @@ -0,0 +1,2 @@ +NavelRock_BasePath_B5F_MapScripts:: @ 81651FA + .byte 0 diff --git a/data/maps/NavelRock_BasePath_B6F/scripts.inc b/data/maps/NavelRock_BasePath_B6F/scripts.inc new file mode 100644 index 000000000..718afdcdc --- /dev/null +++ b/data/maps/NavelRock_BasePath_B6F/scripts.inc @@ -0,0 +1,2 @@ +NavelRock_BasePath_B6F_MapScripts:: @ 81651FB + .byte 0 diff --git a/data/maps/NavelRock_BasePath_B7F/scripts.inc b/data/maps/NavelRock_BasePath_B7F/scripts.inc new file mode 100644 index 000000000..6942439e7 --- /dev/null +++ b/data/maps/NavelRock_BasePath_B7F/scripts.inc @@ -0,0 +1,2 @@ +NavelRock_BasePath_B7F_MapScripts:: @ 81651FC + .byte 0 diff --git a/data/maps/NavelRock_BasePath_B8F/scripts.inc b/data/maps/NavelRock_BasePath_B8F/scripts.inc new file mode 100644 index 000000000..8c6e1284d --- /dev/null +++ b/data/maps/NavelRock_BasePath_B8F/scripts.inc @@ -0,0 +1,2 @@ +NavelRock_BasePath_B8F_MapScripts:: @ 81651FD + .byte 0 diff --git a/data/maps/NavelRock_BasePath_B9F/scripts.inc b/data/maps/NavelRock_BasePath_B9F/scripts.inc new file mode 100644 index 000000000..0aa96b407 --- /dev/null +++ b/data/maps/NavelRock_BasePath_B9F/scripts.inc @@ -0,0 +1,2 @@ +NavelRock_BasePath_B9F_MapScripts:: @ 81651FE + .byte 0 diff --git a/data/maps/NavelRock_Exterior/scripts.inc b/data/maps/NavelRock_Exterior/scripts.inc new file mode 100644 index 000000000..31013ff5d --- /dev/null +++ b/data/maps/NavelRock_Exterior/scripts.inc @@ -0,0 +1,7 @@ +NavelRock_Exterior_MapScripts:: @ 81646AE + map_script 3, NavelRock_Exterior_MapScript1_1646B4 + .byte 0 + +NavelRock_Exterior_MapScript1_1646B4:: @ 81646B4 + setworldmapflag 2229 + end diff --git a/data/maps/NavelRock_Fork/scripts.inc b/data/maps/NavelRock_Fork/scripts.inc new file mode 100644 index 000000000..1a202fae9 --- /dev/null +++ b/data/maps/NavelRock_Fork/scripts.inc @@ -0,0 +1,2 @@ +NavelRock_Fork_MapScripts:: @ 8165202 + .byte 0 diff --git a/data/maps/NavelRock_Harbor/scripts.inc b/data/maps/NavelRock_Harbor/scripts.inc new file mode 100644 index 000000000..6e630ca01 --- /dev/null +++ b/data/maps/NavelRock_Harbor/scripts.inc @@ -0,0 +1 @@ +@ .include "data/maps/NavelRock_Harbor/scripts.inc" diff --git a/data/maps/NavelRock_Summit/scripts.inc b/data/maps/NavelRock_Summit/scripts.inc new file mode 100644 index 000000000..eeb47f007 --- /dev/null +++ b/data/maps/NavelRock_Summit/scripts.inc @@ -0,0 +1,130 @@ +NavelRock_Summit_MapScripts:: @ 8164F9F + map_script 3, NavelRock_Summit_MapScript1_164FAA + map_script 5, NavelRock_Summit_MapScript2_164FDD + .byte 0 + +NavelRock_Summit_MapScript1_164FAA:: @ 8164FAA + checkflag FLAG_0x2F3 + call_if 1, EventScript_164FBD + checkflag FLAG_0x2F3 + call_if 0, EventScript_164FC6 + end + +EventScript_164FBD:: @ 8164FBD + setvar VAR_0x4001, 1 + setflag FLAG_0x09C + return + +EventScript_164FC6:: @ 8164FC6 + setvar VAR_0x4001, 1 + checkflag FLAG_0x2F6 + goto_if 1, EventScript_1A77A9 + setvar VAR_0x4001, 0 + clearflag FLAG_0x09C + return + +NavelRock_Summit_MapScript2_164FDD:: @ 8164FDD + checkflag 2055 + call_if 1, EventScript_164FE7 + end + +EventScript_164FE7:: @ 8164FE7 + specialvar VAR_RESULT, sub_80CA74C + compare_var_to_value VAR_RESULT, 7 + goto_if 5, EventScript_1A77A9 + removeobject 1 + return + +NavelRock_Summit_EventScript_164FFB:: @ 8164FFB + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + special sub_8112364 + lockall + setvar VAR_0x4001, 1 + special SpawnScriptFieldObject + setvar VAR_0x8004, 3 + setvar VAR_0x8005, 35 + special sub_80CD1B4 + applymovement 1, Movement_1650E0 + applymovement 127, Movement_1650CD + waitmovement 0 + delay 50 + setweather 0 + doweather + waitse + playmoncry SPECIES_HO_OH, 2 + delay 30 + waitmoncry + delay 60 + setvar VAR_0x8004, 3 + setvar VAR_0x8005, 35 + special sub_80CD1B4 + applymovement 127, Movement_1650D1 + applymovement 1, Movement_1650D7 + waitmovement 0 + special RemoveScriptFieldObject + setvar VAR_0x8004, 250 + setvar VAR_0x8005, 70 + setvar VAR_0x8006, 0 + special sub_8044838 + setflag 2055 + special sub_807F9D8 + waitstate + clearflag 2055 + setvar VAR_LAST_TALKED, 1 + specialvar VAR_RESULT, sub_80CA74C + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_1650B4 + compare_var_to_value VAR_RESULT, 4 + goto_if 1, EventScript_1650C2 + compare_var_to_value VAR_RESULT, 5 + goto_if 1, EventScript_1650C2 + setflag FLAG_0x2F3 + releaseall + end + +EventScript_1650B4:: @ 81650B4 + setflag FLAG_0x2F6 + setvar VAR_0x8004, 250 + goto EventScript_1A9236 + end + +EventScript_1650C2:: @ 81650C2 + setvar VAR_0x8004, 250 + goto EventScript_1A9236 + end + +Movement_1650CD:: @ 81650CD + step_11 + step_11 + step_11 + step_end + +Movement_1650D1:: @ 81650D1 + step_1c + step_1c + step_10 + step_10 + step_10 + step_end + +Movement_1650D7:: @ 81650D7 + step_10 + step_10 + step_10 + step_10 + step_10 + step_25 + step_1c + step_1c + step_end + +Movement_1650E0:: @ 81650E0 + step_1c + step_1c + step_25 + step_25 + step_25 + step_25 + step_end diff --git a/data/maps/NavelRock_SummitPath_2F/scripts.inc b/data/maps/NavelRock_SummitPath_2F/scripts.inc new file mode 100644 index 000000000..1311becf7 --- /dev/null +++ b/data/maps/NavelRock_SummitPath_2F/scripts.inc @@ -0,0 +1,2 @@ +NavelRock_SummitPath_2F_MapScripts:: @ 81651F2 + .byte 0 diff --git a/data/maps/NavelRock_SummitPath_3F/scripts.inc b/data/maps/NavelRock_SummitPath_3F/scripts.inc new file mode 100644 index 000000000..1ca5fc782 --- /dev/null +++ b/data/maps/NavelRock_SummitPath_3F/scripts.inc @@ -0,0 +1,2 @@ +NavelRock_SummitPath_3F_MapScripts:: @ 81651F3 + .byte 0 diff --git a/data/maps/NavelRock_SummitPath_4F/scripts.inc b/data/maps/NavelRock_SummitPath_4F/scripts.inc new file mode 100644 index 000000000..79371b1c5 --- /dev/null +++ b/data/maps/NavelRock_SummitPath_4F/scripts.inc @@ -0,0 +1,2 @@ +NavelRock_SummitPath_4F_MapScripts:: @ 81651F4 + .byte 0 diff --git a/data/maps/NavelRock_SummitPath_5F/scripts.inc b/data/maps/NavelRock_SummitPath_5F/scripts.inc new file mode 100644 index 000000000..d8aa65052 --- /dev/null +++ b/data/maps/NavelRock_SummitPath_5F/scripts.inc @@ -0,0 +1,2 @@ +NavelRock_SummitPath_5F_MapScripts:: @ 81651F5 + .byte 0 diff --git a/data/maps/OneIsland/scripts.inc b/data/maps/OneIsland/scripts.inc new file mode 100644 index 000000000..d400fce9e --- /dev/null +++ b/data/maps/OneIsland/scripts.inc @@ -0,0 +1,121 @@ +OneIsland_MapScripts:: @ 8167484 + map_script 3, OneIsland_MapScript1_16748F + map_script 2, OneIsland_MapScript2_167493 + .byte 0 + +OneIsland_MapScript1_16748F:: @ 816748F + setworldmapflag 2203 + end + +OneIsland_MapScript2_167493:: @ 8167493 + map_script_2 VAR_0x4075, 2, EventScript_16749D + .2byte 0 + +EventScript_16749D:: @ 816749D + lockall + textcolor 0 + applymovement 255, Movement_167505 + waitmovement 0 + loadword 0, gUnknown_818161B + callstd 4 + closemessage + applymovement 1, Movement_167507 + applymovement 255, Movement_1674F4 + waitmovement 0 + opendoor 14, 5 + waitdooranim + applymovement 1, Movement_167514 + applymovement 255, Movement_167501 + waitmovement 0 + closedoor 14, 5 + waitdooranim + removeobject 1 + setvar VAR_0x4075, 3 + warp MAP_ONEISLAND_POKEMONCENTER_1F, 255, 9, 9 + waitstate + releaseall + end + +Movement_1674F4:: @ 81674F4 + step_11 + step_11 + step_11 + step_11 + step_11 + step_13 + step_13 + step_11 + step_11 + step_11 + step_11 + step_11 + step_end + +Movement_167501:: @ 8167501 + step_11 + step_11 + step_60 + step_end + +Movement_167505:: @ 8167505 + step_11 + step_end + +Movement_167507:: @ 8167507 + step_11 + step_11 + step_11 + step_11 + step_13 + step_13 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_end + +Movement_167514:: @ 8167514 + step_11 + step_60 + step_end + +OneIsland_EventScript_167517:: @ 8167517 + lock + faceplayer + checkflag 2116 + goto_if 1, EventScript_16753F + checkflag FLAG_0x2A1 + goto_if 1, EventScript_167535 + loadword 0, gUnknown_818174E + callstd 4 + release + end + +EventScript_167535:: @ 8167535 + loadword 0, gUnknown_8181858 + callstd 4 + release + end + +EventScript_16753F:: @ 816753F + loadword 0, gUnknown_8181901 + callstd 4 + release + end + +OneIsland_EventScript_167549:: @ 8167549 + loadword 0, gUnknown_8181A4A + callstd 2 + end + +OneIsland_EventScript_167552:: @ 8167552 + loadword 0, gUnknown_81819E1 + callstd 3 + end + +OneIsland_EventScript_16755B:: @ 816755B + loadword 0, gUnknown_8181A0A + callstd 3 + end diff --git a/data/maps/OneIsland_Harbor/scripts.inc b/data/maps/OneIsland_Harbor/scripts.inc new file mode 100644 index 000000000..50526fc0d --- /dev/null +++ b/data/maps/OneIsland_Harbor/scripts.inc @@ -0,0 +1,42 @@ +OneIsland_Harbor_MapScripts:: @ 8171378 + map_script 4, OneIsland_Harbor_MapScript1_171383 + map_script 2, OneIsland_Harbor_MapScript2_171392 + .byte 0 + +OneIsland_Harbor_MapScript1_171383:: @ 8171383 + map_script_2 VAR_0x4075, 1, EventScript_17138D + .2byte 0 + +EventScript_17138D:: @ 817138D + turnobject 255, 2 + end + +OneIsland_Harbor_MapScript2_171392:: @ 8171392 + map_script_2 VAR_0x4075, 1, EventScript_17139C + .2byte 0 + +EventScript_17139C:: @ 817139C + lockall + textcolor 0 + applymovement 255, Movement_1713B9 + waitmovement 0 + setvar VAR_0x4075, 2 + warp MAP_ONEISLAND, 255, 12, 18 + waitstate + releaseall + end + +Movement_1713B9:: @ 81713B9 + step_11 + step_11 + step_11 + step_end + +OneIsland_Harbor_EventScript_1713BD:: @ 81713BD + lock + faceplayer + message Text_181726 + waitmessage + setvar VAR_0x8004, 1 + goto EventScript_1A8EC5 + end diff --git a/data/maps/OneIsland_House1/scripts.inc b/data/maps/OneIsland_House1/scripts.inc new file mode 100644 index 000000000..24823bec8 --- /dev/null +++ b/data/maps/OneIsland_House1/scripts.inc @@ -0,0 +1,12 @@ +OneIsland_House1_MapScripts:: @ 817135B + .byte 0 + +OneIsland_House1_EventScript_17135C:: @ 817135C + loadword 0, gUnknown_81A2332 + callstd 2 + end + +OneIsland_House1_EventScript_171365:: @ 8171365 + loadword 0, gUnknown_81A2380 + callstd 2 + end diff --git a/data/maps/OneIsland_House2/scripts.inc b/data/maps/OneIsland_House2/scripts.inc new file mode 100644 index 000000000..a9c79e1c6 --- /dev/null +++ b/data/maps/OneIsland_House2/scripts.inc @@ -0,0 +1,7 @@ +OneIsland_House2_MapScripts:: @ 817136E + .byte 0 + +OneIsland_House2_EventScript_17136F:: @ 817136F + loadword 0, gUnknown_81A23B8 + callstd 2 + end diff --git a/data/maps/OneIsland_KindleRoad/scripts.inc b/data/maps/OneIsland_KindleRoad/scripts.inc new file mode 100644 index 000000000..4a6d76ae1 --- /dev/null +++ b/data/maps/OneIsland_KindleRoad/scripts.inc @@ -0,0 +1,12 @@ +OneIsland_KindleRoad_MapScripts:: @ 8168758 + .byte 0 + +OneIsland_KindleRoad_EventScript_168759:: @ 8168759 + loadword 0, gUnknown_8189D02 + callstd 3 + end + +OneIsland_KindleRoad_EventScript_168762:: @ 8168762 + loadword 0, gUnknown_8189D32 + callstd 3 + end diff --git a/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc b/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc new file mode 100644 index 000000000..8e2409168 --- /dev/null +++ b/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc @@ -0,0 +1,66 @@ +OneIsland_KindleRoad_EmberSpa_MapScripts:: @ 816535B + .byte 0 + +OneIsland_KindleRoad_EmberSpa_EventScript_16535C:: @ 816535C + loadword 0, gUnknown_817D34A + callstd 2 + end + +OneIsland_KindleRoad_EmberSpa_EventScript_165365:: @ 8165365 + loadword 0, gUnknown_817D3DE + callstd 2 + end + +OneIsland_KindleRoad_EmberSpa_EventScript_16536E:: @ 816536E + loadword 0, gUnknown_817D4AA + callstd 2 + end + +OneIsland_KindleRoad_EmberSpa_EventScript_165377:: @ 8165377 + loadword 0, gUnknown_817D4E3 + callstd 2 + end + +OneIsland_KindleRoad_EmberSpa_EventScript_165380:: @ 8165380 + lock + faceplayer + setvar VAR_0x8004, 10 + setvar VAR_0x8005, 3 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_817D550 + callstd 4 + release + end + +OneIsland_KindleRoad_EmberSpa_EventScript_165399:: @ 8165399 + lock + faceplayer + checkflag FLAG_0x2EF + goto_if 1, EventScript_1653C5 + loadword 0, gUnknown_817D622 + callstd 4 + setorcopyvar VAR_0x8000, 344 + setorcopyvar VAR_0x8001, 1 + callstd 0 + setflag FLAG_0x2EF + loadword 0, gUnknown_817D6F3 + callstd 4 + release + end + +EventScript_1653C5:: @ 81653C5 + loadword 0, gUnknown_817D6F3 + callstd 4 + release + end + +OneIsland_KindleRoad_EmberSpa_EventScript_1653CF:: @ 81653CF + lockall + fadescreen 3 + special sp000_heal_pokemon + fadescreen 2 + loadword 0, gUnknown_817D450 + callstd 4 + setvar VAR_0x4001, 1 + releaseall + end diff --git a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc new file mode 100644 index 000000000..4419b669e --- /dev/null +++ b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc @@ -0,0 +1,658 @@ +OneIsland_PokemonCenter_1F_MapScripts:: @ 8170BF8 + map_script 3, OneIsland_PokemonCenter_1F_MapScript1_170C4E + map_script 5, OneIsland_PokemonCenter_1F_MapScript2_1BC05C + map_script 1, OneIsland_PokemonCenter_1F_MapScript3_170C0D + map_script 2, OneIsland_PokemonCenter_1F_MapScript4_170CA7 + .byte 0 + +OneIsland_PokemonCenter_1F_MapScript3_170C0D:: @ 8170C0D + compare_var_to_value VAR_0x4076, 5 + call_if 4, EventScript_170C22 + checkflag 2116 + call_if 1, EventScript_170C36 + end + +EventScript_170C22:: @ 8170C22 + setmetatile 13, 4, 861, 1 + return + +EventScript_170C2C:: @ 8170C2C + setmetatile 16, 4, 863, 1 + return + +EventScript_170C36:: @ 8170C36 + call EventScript_170C2C + setmetatile 14, 4, 858, 1 + setmetatile 15, 4, 859, 1 + return + +OneIsland_PokemonCenter_1F_MapScript1_170C4E:: @ 8170C4E + setrespawn 14 + compare_var_to_value VAR_0x4076, 6 + call_if 1, EventScript_170C73 + compare_var_to_value VAR_0x4076, 0 + call_if 1, EventScript_170C79 + compare_var_to_value VAR_0x4076, 2 + call_if 1, EventScript_170C90 + end + +EventScript_170C73:: @ 8170C73 + setvar VAR_0x4076, 7 + return + +EventScript_170C79:: @ 8170C79 + setobjectxyperm 2, 9, 8 + setobjectmovementtype 2, 7 + setobjectxyperm 3, 15, 6 + setobjectmovementtype 3, 7 + return + +EventScript_170C90:: @ 8170C90 + setobjectxyperm 2, 14, 7 + setobjectmovementtype 2, 9 + setobjectxyperm 3, 14, 8 + setobjectmovementtype 3, 9 + return + +OneIsland_PokemonCenter_1F_MapScript4_170CA7:: @ 8170CA7 + map_script_2 VAR_0x4076, 0, EventScript_170CB1 + .2byte 0 + +EventScript_170CB1:: @ 8170CB1 + lockall + textcolor 0 + applymovement 255, Movement_170E7D + applymovement 2, Movement_170E86 + waitmovement 0 + loadword 0, gUnknown_81A0CDE + callstd 4 + applymovement 255, Movement_1A75EB + waitmovement 0 + playse SE_PIN + applymovement 3, Movement_1A75DB + waitmovement 0 + applymovement 3, Movement_1A75E7 + waitmovement 0 + applymovement 3, Movement_1A75DD + waitmovement 0 + loadword 0, gUnknown_81A0CF7 + callstd 4 + loadword 0, gUnknown_81A0D27 + callstd 4 + applymovement 2, Movement_1A75ED + applymovement 255, Movement_1A75E9 + waitmovement 0 + loadword 0, gUnknown_81A0D72 + callstd 4 + applymovement 2, Movement_1A75EB + waitmovement 0 + applymovement 255, Movement_1A75EB + waitmovement 0 + checkflag 2092 + call_if 1, EventScript_170E34 + checkflag 2092 + call_if 0, EventScript_170E3D + applymovement 3, Movement_1A75ED + waitmovement 0 + loadword 0, gUnknown_81A0E17 + callstd 4 + loadword 0, gUnknown_81A0E90 + callstd 4 + applymovement 3, Movement_1A75E7 + waitmovement 0 + loadword 0, gUnknown_81A0ECC + callstd 4 + closemessage + applymovement 2, Movement_1A75E9 + waitmovement 0 + loadword 0, gUnknown_81A0F40 + callstd 4 + applymovement 2, Movement_1A75ED + waitmovement 0 + applymovement 255, Movement_1A75E9 + waitmovement 0 + loadword 0, gUnknown_81A0FB1 + callstd 4 + loadword 0, gUnknown_81A10EE + setorcopyvar VAR_0x8000, 280 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 318 + callstd 9 + additem ITEM_METEORITE, 1 + applymovement 3, Movement_1A75ED + waitmovement 0 + loadword 0, gUnknown_81A1113 + callstd 4 + additem ITEM_TRI_PASS, 1 + loadword 0, gUnknown_81A231B + setorcopyvar VAR_0x8000, 367 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 318 + callstd 9 + loadword 0, gUnknown_81A1150 + callstd 4 + compare_var_to_value VAR_0x4058, 2 + call_if 4, EventScript_170E46 + compare_var_to_value VAR_0x4058, 2 + call_if 0, EventScript_170E58 + setflag 2117 + loadword 0, gUnknown_81A1230 + callstd 4 + closemessage + applymovement 2, Movement_1A75E9 + waitmovement 0 + applymovement 3, Movement_1A75E9 + waitmovement 0 + setflag 2113 + setvar VAR_0x4076, 1 + releaseall + end + +EventScript_170E34:: @ 8170E34 + loadword 0, gUnknown_81A0DE8 + callstd 4 + return + +EventScript_170E3D:: @ 8170E3D + loadword 0, gUnknown_81A0DAC + callstd 4 + return + +EventScript_170E46:: @ 8170E46 + textcolor 3 + playfanfare BGM_FRLG_ME_KEYITEM + message Text_1A11EC + waitmessage + waitfanfare + call EventScript_1A6675 + return + +EventScript_170E58:: @ 8170E58 + setflag FLAG_0x039 + setvar VAR_0x4058, 2 + additem ITEM_TOWN_MAP, 1 + loadword 0, gUnknown_81A1218 + setorcopyvar VAR_0x8000, 361 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 318 + callstd 9 + return + +Movement_170E7D:: @ 8170E7D + step_11 + step_11 + step_13 + step_13 + step_13 + step_13 + step_13 + step_2e + step_end + +Movement_170E86:: @ 8170E86 + step_11 + step_13 + step_13 + step_13 + step_13 + step_13 + step_11 + step_30 + step_end + +Movement_170E8F:: @ 8170E8F + step_11 + step_end + +Movement_170E91:: @ 8170E91 + step_12 + step_30 + step_end + +OneIsland_PokemonCenter_1F_EventScript_170E94:: @ 8170E94 + lock + faceplayer + call EventScript_1A6578 + release + end + +OneIsland_PokemonCenter_1F_EventScript_170E9D:: @ 8170E9D + lock + checkflag FLAG_0x2A1 + goto_if 1, EventScript_170EB1 + loadword 0, gUnknown_81A1266 + callstd 4 + release + end + +EventScript_170EB1:: @ 8170EB1 + applymovement 2, Movement_1A75E1 + waitmovement 0 + loadword 0, gUnknown_81A128C + callstd 4 + release + end + +OneIsland_PokemonCenter_1F_EventScript_170EC5:: @ 8170EC5 + lock + faceplayer + compare_var_to_value VAR_0x4076, 7 + goto_if 1, EventScript_170F35 + compare_var_to_value VAR_0x4076, 6 + goto_if 1, EventScript_170F9B + checkflag FLAG_0x2DC + goto_if 1, EventScript_170FA5 + compare_var_to_value VAR_0x4076, 5 + goto_if 1, EventScript_17103A + checkflag FLAG_0x2DD + goto_if 1, EventScript_171044 + compare_var_to_value VAR_0x4076, 4 + goto_if 1, EventScript_1710F2 + specialvar VAR_RESULT, sub_806E25C + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_1710FC + compare_var_to_value VAR_0x4076, 3 + goto_if 1, EventScript_171134 + loadword 0, gUnknown_81A1321 + callstd 4 + closemessage + applymovement 3, Movement_1A75E5 + waitmovement 0 + release + end + +EventScript_170F35:: @ 8170F35 + loadword 0, gUnknown_81A1EBD + callstd 4 + random 3 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_170F6D + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_170F84 + setvar VAR_0x8004, 13 + setvar VAR_0x8005, 5 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_81A2076 + callstd 4 + release + end + +EventScript_170F6D:: @ 8170F6D + setvar VAR_0x8004, 13 + setvar VAR_0x8005, 3 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_81A1EF3 + callstd 4 + release + end + +EventScript_170F84:: @ 8170F84 + setvar VAR_0x8004, 13 + setvar VAR_0x8005, 4 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_81A1F7C + callstd 4 + release + end + +EventScript_170F9B:: @ 8170F9B + loadword 0, gUnknown_81A1E39 + callstd 4 + release + end + +EventScript_170FA5:: @ 8170FA5 + textcolor 3 + playfanfare MUS_ME_WAZA + message Text_1A1C2D + waitmessage + waitfanfare + call EventScript_1A6675 + removeitem ITEM_SAPPHIRE, 1 + loadword 0, gUnknown_81A1C4E + callstd 4 + closemessage + applymovement 3, Movement_171142 + waitmovement 0 + playse SE_N + call EventScript_170C2C + special DrawWholeMapView + loadword 0, gUnknown_81A1D45 + callstd 4 + closemessage + delay 60 + applymovement 3, Movement_17113E + waitmovement 0 + delay 30 + applymovement 3, Movement_17113E + waitmovement 0 + delay 40 + playse SE_PC_ON + call EventScript_170C36 + special DrawWholeMapView + loadword 0, gUnknown_81A1D59 + callstd 4 + applymovement 3, Movement_1A75E1 + waitmovement 0 + loadword 0, gUnknown_81A1D7D + callstd 4 + special sub_810B82C + setflag 2116 + setflag FLAG_0x05C + setflag FLAG_0x08C + setvar VAR_0x4076, 6 + special InitRoamer + release + end + +EventScript_17103A:: @ 817103A + loadword 0, gUnknown_81A1BB7 + callstd 4 + release + end + +EventScript_171044:: @ 8171044 + loadword 0, gUnknown_81A197E + callstd 4 + textcolor 3 + playfanfare MUS_ME_WAZA + message Text_1A198D + waitmessage + waitfanfare + call EventScript_1A6675 + closemessage + applymovement 3, Movement_171142 + waitmovement 0 + playse SE_N + call EventScript_170C22 + special DrawWholeMapView + delay 30 + applymovement 3, Movement_1A75E1 + waitmovement 0 + loadword 0, gUnknown_81A19AA + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_171099 + goto EventScript_1710B2 + end + +EventScript_171099:: @ 8171099 + loadword 0, gUnknown_81A1A08 + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_171099 + goto EventScript_1710B2 + end + +EventScript_1710B2:: @ 81710B2 + loadword 0, gUnknown_81A1A3F + callstd 4 + removeitem ITEM_RUBY, 1 + removeitem ITEM_TRI_PASS, 1 + setvar VAR_0x4076, 5 + additem ITEM_RAINBOW_PASS, 1 + setflag 2118 + textcolor 3 + playfanfare BGM_FRLG_ME_KEYITEM + message Text_1A1B56 + waitmessage + waitfanfare + playfanfare BGM_FRLG_ME_KEYITEM + message Text_1A1B8E + waitmessage + waitfanfare + call EventScript_1A6675 + goto EventScript_17103A + end + +EventScript_1710F2:: @ 81710F2 + loadword 0, gUnknown_81A1896 + callstd 4 + release + end + +EventScript_1710FC:: @ 81710FC + loadword 0, gUnknown_81A169B + callstd 4 + applymovement 3, Movement_1A75E9 + waitmovement 0 + loadword 0, gUnknown_81A1723 + callstd 4 + applymovement 3, Movement_1A75E1 + waitmovement 0 + loadword 0, gUnknown_81A17DF + callstd 4 + setvar VAR_0x407F, 1 + setvar VAR_0x4076, 4 + release + end + +EventScript_171134:: @ 8171134 + loadword 0, gUnknown_81A15EC + callstd 4 + release + end + +Movement_17113E:: @ 817113E + step_26 + step_1b + step_26 + step_end + +Movement_171142:: @ 8171142 + step_2e + step_26 + step_1c + step_26 + step_26 + step_end + +OneIsland_PokemonCenter_1F_EventScript_171148:: @ 8171148 + loadword 0, gUnknown_81A20D5 + callstd 2 + end + +OneIsland_PokemonCenter_1F_EventScript_171151:: @ 8171151 + loadword 0, gUnknown_81A212D + callstd 2 + end + +OneIsland_PokemonCenter_1F_EventScript_17115A:: @ 817115A + lock + faceplayer + checkflag 2116 + goto_if 1, EventScript_17116F + loadword 0, gUnknown_81A218D + callstd 4 + release + end + +EventScript_17116F:: @ 817116F + loadword 0, gUnknown_81A21D0 + callstd 4 + release + end + +OneIsland_PokemonCenter_1F_EventScript_171179:: @ 8171179 + lockall + checkflag 2116 + goto_if 1, EventScript_1711A0 + checkflag FLAG_0x2A1 + goto_if 1, EventScript_171196 + loadword 0, gUnknown_81A223F + callstd 4 + releaseall + end + +EventScript_171196:: @ 8171196 + loadword 0, gUnknown_81A2286 + callstd 4 + releaseall + end + +EventScript_1711A0:: @ 81711A0 + loadword 0, gUnknown_81A22CB + callstd 4 + releaseall + end + +OneIsland_PokemonCenter_1F_EventScript_1711AA:: @ 81711AA + lockall + setvar VAR_0x4001, 1 + goto EventScript_1711DA + end + +OneIsland_PokemonCenter_1F_EventScript_1711B6:: @ 81711B6 + lockall + setvar VAR_0x4001, 2 + goto EventScript_1711DA + end + +OneIsland_PokemonCenter_1F_EventScript_1711C2:: @ 81711C2 + lockall + setvar VAR_0x4001, 3 + goto EventScript_1711DA + end + +OneIsland_PokemonCenter_1F_EventScript_1711CE:: @ 81711CE + lockall + setvar VAR_0x4001, 4 + goto EventScript_1711DA + end + +EventScript_1711DA:: @ 81711DA + textcolor 0 + playse SE_PIN + applymovement 2, Movement_1A75DB + waitmovement 0 + loadword 0, gUnknown_81A13B8 + callstd 4 + closemessage + compare_var_to_value VAR_0x4001, 1 + call_if 1, EventScript_1712E4 + compare_var_to_value VAR_0x4001, 2 + call_if 1, EventScript_1712EF + compare_var_to_value VAR_0x4001, 3 + call_if 1, EventScript_1712FA + compare_var_to_value VAR_0x4001, 4 + call_if 1, EventScript_171305 + delay 10 + loadword 0, gUnknown_81A13CB + callstd 4 + applymovement 255, Movement_1A75ED + waitmovement 0 + loadword 0, gUnknown_81A1431 + callstd 4 + applymovement 2, Movement_1A75ED + waitmovement 0 + applymovement 3, Movement_1A75E9 + waitmovement 0 + loadword 0, gUnknown_81A1470 + callstd 4 + loadword 0, gUnknown_81A14E1 + callstd 4 + closemessage + applymovement 2, Movement_1A75E7 + waitmovement 0 + delay 10 + applymovement 255, Movement_1A75EB + waitmovement 0 + delay 15 + loadword 0, gUnknown_81A14FB + callstd 4 + closemessage + applymovement 2, Movement_1A75ED + waitmovement 0 + delay 15 + applymovement 3, Movement_1A75E7 + waitmovement 0 + applymovement 255, Movement_1A75ED + waitmovement 0 + loadword 0, gUnknown_81A1574 + callstd 4 + closemessage + delay 25 + applymovement 255, Movement_171326 + applymovement 2, Movement_17132D + waitmovement 0 + playse SE_KAIDAN + setflag FLAG_0x072 + setvar VAR_0x4076, 3 + clearflag FLAG_0x062 + setvar VAR_0x4071, 3 + setvar VAR_0x8004, 1 + setvar VAR_0x8006, 8 + goto EventScript_1A90DA + end + +EventScript_1712E4:: @ 81712E4 + applymovement 255, Movement_171310 + waitmovement 0 + return + +EventScript_1712EF:: @ 81712EF + applymovement 255, Movement_171314 + waitmovement 0 + return + +EventScript_1712FA:: @ 81712FA + applymovement 255, Movement_171316 + waitmovement 0 + return + +EventScript_171305:: @ 8171305 + applymovement 255, Movement_17131A + waitmovement 0 + return + +Movement_171310:: @ 8171310 + step_13 + step_10 + step_30 + step_end + +Movement_171314:: @ 8171314 + step_13 + step_end + +Movement_171316:: @ 8171316 + step_13 + step_11 + step_30 + step_end + +Movement_17131A:: @ 817131A + step_13 + step_11 + step_11 + step_30 + step_end + +Movement_17131F:: @ 817131F + step_1c + step_1c + step_1a + step_2f + step_end + +Movement_171324:: @ 8171324 + step_29 + step_end + +Movement_171326:: @ 8171326 + step_12 + step_12 + step_12 + step_12 + step_10 + step_10 + step_end + +Movement_17132D:: @ 817132D + step_12 + step_12 + step_12 + step_12 + step_12 + step_10 + step_end diff --git a/data/maps/OneIsland_PokemonCenter_2F/scripts.inc b/data/maps/OneIsland_PokemonCenter_2F/scripts.inc new file mode 100644 index 000000000..255a1693d --- /dev/null +++ b/data/maps/OneIsland_PokemonCenter_2F/scripts.inc @@ -0,0 +1,18 @@ +OneIsland_PokemonCenter_2F_MapScripts:: @ 8171334 + map_script 2, OneIsland_PokemonCenter_2F_MapScript1_1BB2A3 + map_script 4, OneIsland_PokemonCenter_2F_MapScript2_1BB1ED + map_script 1, OneIsland_PokemonCenter_2F_MapScript3_1BB237 + map_script 3, OneIsland_PokemonCenter_2F_MapScript4_1BB1B4 + .byte 0 + +OneIsland_PokemonCenter_2F_EventScript_171349:: @ 8171349 + call EventScript_1BB4A3 + end + +EventScript_17134F:: @ 817134F + call EventScript_1BB6AB + end + +EventScript_171355:: @ 8171355 + call EventScript_1BB7DE + end diff --git a/data/maps/OneIsland_TreasureBeach/scripts.inc b/data/maps/OneIsland_TreasureBeach/scripts.inc new file mode 100644 index 000000000..7c6fb47cd --- /dev/null +++ b/data/maps/OneIsland_TreasureBeach/scripts.inc @@ -0,0 +1,7 @@ +OneIsland_TreasureBeach_MapScripts:: @ 816876B + .byte 0 + +OneIsland_TreasureBeach_EventScript_16876C:: @ 816876C + loadword 0, gUnknown_8189DCE + callstd 2 + end diff --git a/data/maps/PalletTown/scripts.inc b/data/maps/PalletTown/scripts.inc new file mode 100644 index 000000000..e482f1fb4 --- /dev/null +++ b/data/maps/PalletTown/scripts.inc @@ -0,0 +1,527 @@ +PalletTown_MapScripts:: @ 816545A + map_script 3, PalletTown_MapScript1_165465 + map_script 2, PalletTown_MapScript2_1654CE + .byte 0 + +PalletTown_MapScript1_165465:: @ 8165465 + setworldmapflag 2192 + checkflag FLAG_0x291 + call_if 1, EventScript_165488 + compare_var_to_value VAR_0x4070, 0 + call_if 1, EventScript_1654A8 + compare_var_to_value VAR_0x4070, 1 + call_if 1, EventScript_1654A2 + end + +EventScript_165488:: @ 8165488 + checkflag 2110 + goto_if 0, EventScript_1A77A9 + compare_var_to_value VAR_0x4070, 1 + goto_if 4, EventScript_1A77A9 + setvar VAR_0x4070, 1 + return + +EventScript_1654A2:: @ 81654A2 + setvar VAR_0x4070, 2 + return + +EventScript_1654A8:: @ 81654A8 + checkflag FLAG_0x291 + goto_if 1, EventScript_1654BD + setobjectxyperm 1, 5, 15 + setobjectmovementtype 1, 7 + return + +EventScript_1654BD:: @ 81654BD + setobjectxyperm 1, 12, 2 + setobjectmovementtype 1, 8 + setvar VAR_0x4002, 1 + return + +PalletTown_MapScript2_1654CE:: @ 81654CE + map_script_2 VAR_0x4050, 2, EventScript_1654D8 + .2byte 0 + +EventScript_1654D8:: @ 81654D8 + lockall + textcolor 0 + setobjectxyperm 3, 14, 14 + setobjectmovementtype 3, 9 + addobject 3 + applymovement 3, Movement_1655AF + waitmovement 0 + checkflag FLAG_SYS_RIBBON_GET + goto_if 0, EventScript_1655A1 + loadword 0, gUnknown_817D8BF + callstd 4 + setvar VAR_0x8004, 0 + specialvar VAR_RESULT, sub_80CA3D8 + copyvar VAR_0x8008, VAR_0x8005 + copyvar VAR_0x8009, VAR_0x8006 + getnumberstring 0, VAR_0x8008 + getnumberstring 1, VAR_0x8009 + compare_var_to_value VAR_0x8009, 60 + goto_if 0, EventScript_165593 + loadword 0, gUnknown_817D9AA + callstd 4 + closemessage + playbgm BGM_FRLG_FOLLOW_ME, 0 + applymovement 255, Movement_1655DD + applymovement 3, Movement_1655CC + waitmovement 0 + opendoor 16, 13 + waitdooranim + applymovement 3, Movement_16572E + applymovement 255, Movement_165758 + waitmovement 0 + closedoor 16, 13 + waitdooranim + setvar VAR_0x4055, 7 + setvar VAR_0x4050, 3 + setflag FLAG_0x02C + warp MAP_PALLETTOWN_PROFESSOROAKSLAB, 255, 6, 12 + waitstate + releaseall + end + +EventScript_16557E:: @ 816557E + closemessage + applymovement 3, Movement_1655BE + waitmovement 0 + removeobject 3 + setvar VAR_0x4050, 3 + releaseall + end + +EventScript_165593:: @ 8165593 + loadword 0, gUnknown_817D925 + callstd 4 + goto EventScript_16557E + end + +EventScript_1655A1:: @ 81655A1 + loadword 0, gUnknown_817DA16 + callstd 4 + goto EventScript_16557E + end + +Movement_1655AF:: @ 81655AF + step_12 + step_12 + step_12 + step_11 + step_11 + step_11 + step_11 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_2e + step_end + +Movement_1655BE:: @ 81655BE + step_13 + step_13 + step_13 + step_13 + step_13 + step_10 + step_10 + step_10 + step_10 + step_10 + step_13 + step_13 + step_13 + step_end + +Movement_1655CC:: @ 81655CC + step_13 + step_13 + step_13 + step_13 + step_13 + step_10 + step_10 + step_10 + step_10 + step_10 + step_13 + step_13 + step_13 + step_13 + step_13 + step_2e + step_end + +Movement_1655DD:: @ 81655DD + step_10 + step_13 + step_13 + step_13 + step_13 + step_13 + step_10 + step_10 + step_10 + step_10 + step_10 + step_13 + step_13 + step_13 + step_13 + step_end + +PalletTown_EventScript_1655ED:: @ 81655ED + lockall + setvar VAR_0x4001, 0 + goto EventScript_165605 + end + +PalletTown_EventScript_1655F9:: @ 81655F9 + lockall + setvar VAR_0x4001, 1 + goto EventScript_165605 + end + +EventScript_165605:: @ 8165605 + setvar VAR_0x8004, 0 + setvar VAR_0x8005, 2 + special UpdatePickStateFromSpecialVar8005 + textcolor 0 + delay 30 + playbgm BGM_FRLG_PROF_OAK, 0 + message Text_17D72C + waitmessage + delay 85 + closemessage + applymovement 255, Movement_1A75ED + waitmovement 0 + playse SE_PIN + applymovement 255, Movement_1A75DB + waitmovement 0 + delay 30 + addobject 3 + compare_var_to_value VAR_0x4001, 0 + call_if 1, EventScript_1656B8 + compare_var_to_value VAR_0x4001, 1 + call_if 1, EventScript_1656C3 + delay 30 + loadword 0, gUnknown_817D74A + callstd 4 + closemessage + delay 30 + compare_var_to_value VAR_0x4001, 0 + call_if 1, EventScript_1656CE + compare_var_to_value VAR_0x4001, 1 + call_if 1, EventScript_1656E0 + opendoor 16, 13 + waitdooranim + applymovement 3, Movement_16572E + applymovement 255, Movement_165758 + waitmovement 0 + closedoor 16, 13 + waitdooranim + setvar VAR_0x4055, 1 + clearflag FLAG_0x02B + setvar VAR_0x4050, 1 + setflag FLAG_0x02C + setflag FLAG_SPECIAL_FLAG_0x4001 + warp MAP_PALLETTOWN_PROFESSOROAKSLAB, 255, 6, 12 + waitstate + releaseall + end + +EventScript_1656B8:: @ 81656B8 + applymovement 3, Movement_1656F2 + waitmovement 0 + return + +EventScript_1656C3:: @ 81656C3 + applymovement 3, Movement_1656FB + waitmovement 0 + return + +EventScript_1656CE:: @ 81656CE + applymovement 3, Movement_165705 + applymovement 255, Movement_165731 + waitmovement 0 + return + +EventScript_1656E0:: @ 81656E0 + applymovement 3, Movement_165719 + applymovement 255, Movement_165744 + waitmovement 0 + return + +Movement_1656F2:: @ 81656F2 + step_11 + step_11 + step_13 + step_11 + step_11 + step_13 + step_11 + step_11 + step_end + +Movement_1656FB:: @ 81656FB + step_13 + step_11 + step_11 + step_13 + step_11 + step_11 + step_13 + step_11 + step_11 + step_end + +Movement_165705:: @ 8165705 + step_10 + step_12 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_13 + step_13 + step_13 + step_13 + step_13 + step_2e + step_end + +Movement_165719:: @ 8165719 + step_10 + step_12 + step_12 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_13 + step_13 + step_13 + step_13 + step_13 + step_2e + step_end + +Movement_16572E:: @ 816572E + step_11 + step_60 + step_end + +Movement_165731:: @ 8165731 + step_10 + step_10 + step_12 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_13 + step_13 + step_13 + step_13 + step_end + +Movement_165744:: @ 8165744 + step_10 + step_10 + step_12 + step_12 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_13 + step_13 + step_13 + step_13 + step_end + +Movement_165758:: @ 8165758 + step_13 + step_11 + step_60 + step_end + +PalletTown_EventScript_16575C:: @ 816575C + lock + compare_var_to_value VAR_0x4070, 2 + goto_if 1, EventScript_1657ED + compare_var_to_value VAR_0x4070, 1 + goto_if 1, EventScript_165815 + compare_var_to_value VAR_0x4002, 1 + goto_if 1, EventScript_1658C2 + checkflag FLAG_0x002 + goto_if 1, EventScript_165801 + loadword 0, gUnknown_81B1C8B + callstd 4 + applymovement 1, Movement_1A75E1 + waitmovement 0 + playse SE_PIN + applymovement 1, Movement_1A75DB + waitmovement 0 + applymovement 1, Movement_1A75DD + waitmovement 0 + loadword 0, gUnknown_81B1C9F + callstd 4 + closemessage + compare_var_to_value VAR_FACING, 4 + call_if 1, EventScript_1657D7 + compare_var_to_value VAR_FACING, 4 + call_if 5, EventScript_1657E2 + moveobjectoffscreen 1 + setflag FLAG_0x002 + release + end + +EventScript_1657D7:: @ 81657D7 + applymovement 1, Movement_165829 + waitmovement 0 + return + +EventScript_1657E2:: @ 81657E2 + applymovement 1, Movement_16582C + waitmovement 0 + return + +EventScript_1657ED:: @ 81657ED + applymovement 1, Movement_1A75E1 + waitmovement 0 + loadword 0, gUnknown_817D7C8 + callstd 4 + release + end + +EventScript_165801:: @ 8165801 + applymovement 1, Movement_1A75E1 + waitmovement 0 + loadword 0, gUnknown_81B1CAF + callstd 4 + release + end + +EventScript_165815:: @ 8165815 + applymovement 1, Movement_1A75E1 + waitmovement 0 + loadword 0, gUnknown_81B1CEC + callstd 4 + release + end + +Movement_165829:: @ 8165829 + step_13 + step_2f + step_end + +Movement_16582C:: @ 816582C + step_12 + step_30 + step_end + +PalletTown_EventScript_16582F:: @ 816582F + loadword 0, gUnknown_817D80D + callstd 2 + end + +PalletTown_EventScript_165838:: @ 8165838 + lockall + setvar VAR_0x8004, 0 + setvar VAR_0x8005, 0 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_817D866 + callstd 4 + releaseall + end + +PalletTown_EventScript_165850:: @ 8165850 + loadword 0, gUnknown_817D87F + callstd 3 + end + +PalletTown_EventScript_165859:: @ 8165859 + loadword 0, gUnknown_817D88A + callstd 3 + end + +PalletTown_EventScript_165862:: @ 8165862 + loadword 0, gUnknown_817D895 + callstd 3 + end + +PalletTown_EventScript_16586B:: @ 816586B + lockall + loadword 0, gUnknown_81B1CC1 + callstd 4 + setvar VAR_0x4070, 1 + releaseall + end + +PalletTown_EventScript_16587B:: @ 816587B + lockall + applymovement 1, Movement_1A75EB + applymovement 255, Movement_1A75E7 + waitmovement 0 + call EventScript_165894 + releaseall + end + +EventScript_165894:: @ 8165894 + textcolor 1 + loadword 0, gUnknown_81B1D0B + callstd 4 + closemessage + delay 20 + textcolor 3 + setflag 2110 + setvar VAR_0x4070, 1 + setvar VAR_0x4002, 0 + special sub_80699E0 + special sub_80699BC + signmsg + loadword 0, gUnknown_81B1D51 + callstd 4 + normalmsg + return + +EventScript_1658C2:: @ 81658C2 + applymovement 1, Movement_1A75E1 + waitmovement 0 + call EventScript_165894 + release + end diff --git a/data/maps/PalletTown_GarysHouse/scripts.inc b/data/maps/PalletTown_GarysHouse/scripts.inc new file mode 100644 index 000000000..668990b4a --- /dev/null +++ b/data/maps/PalletTown_GarysHouse/scripts.inc @@ -0,0 +1,217 @@ +PalletTown_GarysHouse_MapScripts:: @ 8168D27 + map_script 3, PalletTown_GarysHouse_MapScript1_168D2D + .byte 0 + +PalletTown_GarysHouse_MapScript1_168D2D:: @ 8168D2D + compare_var_to_value VAR_0x4058, 2 + call_if 0, EventScript_168D44 + compare_var_to_value VAR_0x4058, 2 + call_if 4, EventScript_168D50 + end + +EventScript_168D44:: @ 8168D44 + setobjectmovementtype 1, 10 + setobjectxyperm 1, 5, 4 + return + +EventScript_168D50:: @ 8168D50 + setvar VAR_0x4001, 1 + return + +PalletTown_GarysHouse_EventScript_168D56:: @ 8168D56 + lock + faceplayer + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 2 + special UpdatePickStateFromSpecialVar8005 + checkflag 2092 + goto_if 1, EventScript_168DB9 + compare_var_to_value VAR_0x4001, 1 + goto_if 1, EventScript_168EEC + compare_var_to_value VAR_0x4058, 2 + goto_if 1, EventScript_168F59 + compare_var_to_value VAR_0x4058, 1 + goto_if 1, EventScript_168EF6 + compare_var_to_value VAR_0x4055, 1 + goto_if 4, EventScript_168DAF + loadword 0, gUnknown_818D58C + callstd 4 + closemessage + applymovement 1, Movement_1A75E5 + waitmovement 0 + release + end + +EventScript_168DAF:: @ 8168DAF + loadword 0, gUnknown_818D5C4 + callstd 4 + release + end + +EventScript_168DB9:: @ 8168DB9 + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + special sub_8112364 + compare_var_to_value VAR_MIRAGE_RND_L, 500 + goto_if 0, EventScript_168E46 + loadword 0, gUnknown_818D7D3 + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_168E3C + loadword 0, gUnknown_818D8B2 + callstd 4 + special sub_80BF8FC + waitstate + lock + faceplayer + compare_var_to_value VAR_0x8004, 6 + goto_if 4, EventScript_168E3C + specialvar VAR_RESULT, sub_80CAD54 + compare_var_to_value VAR_RESULT, 412 + goto_if 1, EventScript_168E32 + loadword 0, gUnknown_818D8CC + callstd 4 + closemessage + fadescreen 1 + playfanfare MUS_ME_ASA + waitfanfare + special sub_80CC948 + fadescreen 0 + special TV_CopyNicknameToStringVar1AndEnsureTerminated + loadword 0, gUnknown_818D8FE + callstd 4 + release + end + +EventScript_168E32:: @ 8168E32 + loadword 0, gUnknown_818D97B + callstd 4 + release + end + +EventScript_168E3C:: @ 8168E3C + loadword 0, gUnknown_818D875 + callstd 4 + release + end + +EventScript_168E46:: @ 8168E46 + loadword 0, gUnknown_818D9A5 + callstd 4 + specialvar VAR_RESULT, sub_80CA76C + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_168EA6 + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_168EB0 + compare_var_to_value VAR_0x8000, 2 + goto_if 1, EventScript_168EBA + compare_var_to_value VAR_0x8000, 3 + goto_if 1, EventScript_168EC4 + compare_var_to_value VAR_0x8000, 4 + goto_if 1, EventScript_168ECE + compare_var_to_value VAR_0x8000, 5 + goto_if 1, EventScript_168ED8 + compare_var_to_value VAR_0x8000, 6 + goto_if 1, EventScript_168EE2 + end + +EventScript_168EA6:: @ 8168EA6 + loadword 0, gUnknown_818DBDD + callstd 4 + release + end + +EventScript_168EB0:: @ 8168EB0 + loadword 0, gUnknown_818DB88 + callstd 4 + release + end + +EventScript_168EBA:: @ 8168EBA + loadword 0, gUnknown_818DB2E + callstd 4 + release + end + +EventScript_168EC4:: @ 8168EC4 + loadword 0, gUnknown_818DAF3 + callstd 4 + release + end + +EventScript_168ECE:: @ 8168ECE + loadword 0, gUnknown_818DABE + callstd 4 + release + end + +EventScript_168ED8:: @ 8168ED8 + loadword 0, gUnknown_818DA73 + callstd 4 + release + end + +EventScript_168EE2:: @ 8168EE2 + loadword 0, gUnknown_818DA16 + callstd 4 + release + end + +EventScript_168EEC:: @ 8168EEC + loadword 0, gUnknown_818D701 + callstd 4 + release + end + +EventScript_168EF6:: @ 8168EF6 + loadword 0, gUnknown_818D60A + callstd 4 + closemessage + checkitemspace ITEM_TOWN_MAP, 1 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_168F4F + applymovement 1, Movement_1A75EB + waitmovement 0 + removeobject 2 + setvar VAR_0x4058, 2 + delay 15 + applymovement 1, Movement_1A75E1 + waitmovement 0 + delay 12 + additem ITEM_TOWN_MAP, 1 + loadword 0, gUnknown_818D661 + setorcopyvar VAR_0x8000, 361 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 318 + callstd 9 + release + end + +EventScript_168F4F:: @ 8168F4F + loadword 0, gUnknown_818D684 + callstd 4 + release + end + +EventScript_168F59:: @ 8168F59 + loadword 0, gUnknown_818D6AF + callstd 4 + release + end + +PalletTown_GarysHouse_EventScript_168F63:: @ 8168F63 + loadword 0, gUnknown_818D763 + callstd 2 + end + +PalletTown_GarysHouse_EventScript_168F6C:: @ 8168F6C + loadword 0, gUnknown_818D7A1 + callstd 3 + end + +PalletTown_GarysHouse_EventScript_168F75:: @ 8168F75 + loadword 0, gUnknown_818DC47 + callstd 3 + end diff --git a/data/maps/PalletTown_PlayersHouse_1F/scripts.inc b/data/maps/PalletTown_PlayersHouse_1F/scripts.inc new file mode 100644 index 000000000..c0a266344 --- /dev/null +++ b/data/maps/PalletTown_PlayersHouse_1F/scripts.inc @@ -0,0 +1,66 @@ +PalletTown_PlayersHouse_1F_MapScripts:: @ 8168C08 + .byte 0 + +PalletTown_PlayersHouse_1F_EventScript_168C09:: @ 8168C09 + lock + faceplayer + checkflag FLAG_0x258 + goto_if 1, EventScript_168C4A + checkplayergender + compare_var_to_value VAR_RESULT, 0 + call_if 1, EventScript_168C38 + compare_var_to_value VAR_RESULT, 1 + call_if 1, EventScript_168C41 + closemessage + applymovement 1, Movement_1A75E5 + waitmovement 0 + release + end + +EventScript_168C38:: @ 8168C38 + loadword 0, gUnknown_818D2F0 + callstd 4 + return + +EventScript_168C41:: @ 8168C41 + loadword 0, gUnknown_818D360 + callstd 4 + return + +EventScript_168C4A:: @ 8168C4A + loadword 0, gUnknown_818D3D1 + callstd 4 + closemessage + call EventScript_1A6C26 + loadword 0, gUnknown_818D3F8 + callstd 4 + release + end + +PalletTown_PlayersHouse_1F_EventScript_168C62:: @ 8168C62 + lockall + compare_var_to_value VAR_FACING, 2 + goto_if 1, EventScript_168C78 + loadword 0, gUnknown_818D4F9 + callstd 4 + releaseall + end + +EventScript_168C78:: @ 8168C78 + checkplayergender + compare_var_to_value VAR_RESULT, 0 + call_if 1, EventScript_168C91 + compare_var_to_value VAR_RESULT, 1 + call_if 1, EventScript_168C9A + releaseall + end + +EventScript_168C91:: @ 8168C91 + loadword 0, gUnknown_818D43E + callstd 4 + return + +EventScript_168C9A:: @ 8168C9A + loadword 0, gUnknown_818D492 + callstd 4 + return diff --git a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc new file mode 100644 index 000000000..b9e02166c --- /dev/null +++ b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc @@ -0,0 +1,59 @@ +PalletTown_PlayersHouse_2F_MapScripts:: @ 8168CA3 + map_script 3, PalletTown_PlayersHouse_2F_MapScript1_168CAE + map_script 4, PalletTown_PlayersHouse_2F_MapScript2_168CBE + .byte 0 + +PalletTown_PlayersHouse_2F_MapScript1_168CAE:: @ 8168CAE + compare_var_to_value VAR_0x4056, 0 + call_if 1, EventScript_168CBA + end + +EventScript_168CBA:: @ 8168CBA + setrespawn 1 + return + +PalletTown_PlayersHouse_2F_MapScript2_168CBE:: @ 8168CBE + map_script_2 VAR_0x4056, 0, EventScript_168CC8 + .2byte 0 + +EventScript_168CC8:: @ 8168CC8 + turnobject 255, 2 + setvar VAR_0x4056, 1 + end + +PalletTown_PlayersHouse_2F_EventScript_168CD2:: @ 8168CD2 + loadword 0, gUnknown_818D50B + callstd 3 + end + +PalletTown_PlayersHouse_2F_EventScript_168CDB:: @ 8168CDB + loadword 0, gUnknown_818D53B + callstd 3 + end + +gUnknown_8168CE4:: @ 8168CE4 +PalletTown_PlayersHouse_2F_EventScript_168CE4:: @ 8168CE4 + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + lockall + setvar VAR_0x8004, 32 + special sub_812B220 + setvar VAR_0x8004, 1 + special sub_80CA86C + playse SE_PC_ON + loadword 0, gUnknown_81A5420 + callstd 4 + special sub_80EB6AC + waitstate + special sub_812B35C + releaseall + end + +gUnknown_8168D17:: @ 8168D17 + setvar VAR_0x8004, 1 + playse SE_PC_OFF + special sub_80CA9A8 + special sub_812B35C + releaseall + end diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc new file mode 100644 index 000000000..2308b32d2 --- /dev/null +++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc @@ -0,0 +1,1474 @@ +PalletTown_ProfessorOaksLab_MapScripts:: @ 8168F7E + map_script 3, PalletTown_ProfessorOaksLab_MapScript1_168F8E + map_script 4, PalletTown_ProfessorOaksLab_MapScript2_168FE1 + map_script 2, PalletTown_ProfessorOaksLab_MapScript3_168FF0 + .byte 0 + +PalletTown_ProfessorOaksLab_MapScript1_168F8E:: @ 8168F8E + setflag FLAG_0x2CF + compare_var_to_value VAR_0x4055, 1 + call_if 1, EventScript_168FC6 + compare_var_to_value VAR_0x4055, 7 + call_if 1, EventScript_168FD5 + compare_var_to_value VAR_0x4055, 8 + call_if 1, EventScript_168FC0 + checkflag FLAG_0x247 + call_if 1, EventScript_168FBC + end + +EventScript_168FBC:: @ 8168FBC + setflag FLAG_0x24F + return + +EventScript_168FC0:: @ 8168FC0 + setvar VAR_0x4055, 9 + return + +EventScript_168FC6:: @ 8168FC6 + setobjectxyperm 4, 6, 11 + setobjectmovementtype 4, 7 + savebgm BGM_FRLG_PROF_OAK + return + +EventScript_168FD5:: @ 8168FD5 + setobjectxyperm 4, 6, 11 + setobjectmovementtype 4, 7 + return + +PalletTown_ProfessorOaksLab_MapScript2_168FE1:: @ 8168FE1 + map_script_2 VAR_0x4055, 1, EventScript_168FEB + .2byte 0 + +EventScript_168FEB:: @ 8168FEB + turnobject 255, 2 + end + +PalletTown_ProfessorOaksLab_MapScript3_168FF0:: @ 8168FF0 + map_script_2 VAR_0x4055, 1, EventScript_16923E + map_script_2 VAR_0x4055, 7, EventScript_169002 + .2byte 0 + +EventScript_169002:: @ 8169002 + lockall + setvar VAR_FACING, 2 + textcolor 0 + applymovement 4, Movement_1692B0 + waitmovement 0 + removeobject 4 + setobjectxyperm 4, 6, 3 + setobjectmovementtype 4, 8 + clearflag FLAG_0x02B + applymovement 255, Movement_1692B7 + waitmovement 0 + goto EventScript_169035 + end + +EventScript_169035:: @ 8169035 + loadword 0, gUnknown_818EE60 + callstd 4 + closemessage + compare_var_to_value VAR_FACING, 2 + call_if 1, EventScript_169174 + compare_var_to_value VAR_FACING, 1 + call_if 1, EventScript_1691BB + compare_var_to_value VAR_FACING, 4 + call_if 1, EventScript_169194 + compare_var_to_value VAR_FACING, 3 + call_if 1, EventScript_169194 + loadword 0, gUnknown_818EF59 + callstd 4 + fadedefaultbgm + loadword 0, gUnknown_818F004 + callstd 4 + compare_var_to_value VAR_FACING, 2 + call_if 1, EventScript_1691DB + compare_var_to_value VAR_FACING, 3 + call_if 1, EventScript_1691E6 + textcolor 3 + loadword 0, gUnknown_818F062 + callstd 4 + closemessage + call EventScript_1A6675 + compare_var_to_value VAR_FACING, 2 + call_if 1, EventScript_1691F1 + compare_var_to_value VAR_FACING, 1 + call_if 1, EventScript_1691FC + compare_var_to_value VAR_FACING, 4 + call_if 1, EventScript_169215 + compare_var_to_value VAR_FACING, 3 + call_if 1, EventScript_169227 + addobject 9 + addobject 10 + delay 30 + loadword 0, gUnknown_818F085 + callstd 4 + closemessage + removeobject 9 + removeobject 10 + delay 30 + compare_var_to_value VAR_FACING, 2 + call_if 1, EventScript_169845 + compare_var_to_value VAR_FACING, 1 + call_if 1, EventScript_169850 + compare_var_to_value VAR_FACING, 4 + call_if 1, EventScript_16985B + compare_var_to_value VAR_FACING, 3 + call_if 1, EventScript_16986D + textcolor 3 + playfanfare BGM_FRLG_ME_KEYITEM + message Text_18F0E8 + waitmessage + waitfanfare + call EventScript_1A6675 + special EnableNationalPokedex + loadword 0, gUnknown_818F103 + callstd 4 + loadword 0, gUnknown_818F1DB + callstd 4 + closemessage + playbgm BGM_FRLG_RIVAL_POSTBATTLE, 0 + compare_var_to_value VAR_FACING, 2 + call_if 1, EventScript_169B69 + compare_var_to_value VAR_FACING, 1 + call_if 1, EventScript_169B7B + compare_var_to_value VAR_FACING, 4 + call_if 1, EventScript_169B7B + compare_var_to_value VAR_FACING, 3 + call_if 1, EventScript_169B7B + removeobject 8 + fadedefaultbgm + setvar VAR_0x4055, 8 + releaseall + end + +EventScript_169174:: @ 8169174 + setobjectxyperm 8, 5, 10 + addobject 8 + playbgm BGM_FRLG_RIVAL, 0 + applymovement 255, Movement_169B94 + applymovement 8, Movement_169B9D + waitmovement 0 + return + +EventScript_169194:: @ 8169194 + setobjectxyperm 8, 6, 10 + addobject 8 + playbgm BGM_FRLG_RIVAL, 0 + applymovement 4, Movement_1A75ED + applymovement 255, Movement_169B91 + applymovement 8, Movement_169B9D + waitmovement 0 + return + +EventScript_1691BB:: @ 81691BB + setobjectxyperm 8, 6, 10 + addobject 8 + playbgm BGM_FRLG_RIVAL, 0 + applymovement 4, Movement_1A75ED + applymovement 8, Movement_169B9D + waitmovement 0 + return + +EventScript_1691DB:: @ 81691DB + applymovement 255, Movement_1A75E9 + waitmovement 0 + return + +EventScript_1691E6:: @ 81691E6 + applymovement 255, Movement_1A75E7 + waitmovement 0 + return + +EventScript_1691F1:: @ 81691F1 + applymovement 4, Movement_169232 + waitmovement 0 + return + +EventScript_1691FC:: @ 81691FC + applymovement 4, Movement_169238 + applymovement 255, Movement_1698C7 + applymovement 8, Movement_1698C7 + waitmovement 4 + return + +EventScript_169215:: @ 8169215 + applymovement 4, Movement_169232 + applymovement 255, Movement_1698C3 + waitmovement 4 + return + +EventScript_169227:: @ 8169227 + applymovement 4, Movement_169232 + waitmovement 0 + return + +Movement_169232:: @ 8169232 + step_11 + step_12 + step_2e + step_1c + step_1a + step_end + +Movement_169238:: @ 8169238 + step_12 + step_12 + step_11 + step_1c + step_1a + step_end + +EventScript_16923E:: @ 816923E + lockall + textcolor 0 + applymovement 4, Movement_1692B0 + waitmovement 0 + removeobject 4 + setobjectxyperm 4, 6, 3 + setobjectmovementtype 4, 8 + clearflag FLAG_0x02B + applymovement 255, Movement_1692B7 + waitmovement 0 + applymovement 8, Movement_1A75E9 + waitmovement 0 + clearflag FLAG_SPECIAL_FLAG_0x4001 + savebgm SE_STOP + fadedefaultbgm + loadword 0, gUnknown_818DC94 + callstd 4 + closemessage + delay 60 + loadword 0, gUnknown_818DFBC + callstd 4 + closemessage + delay 30 + applymovement 8, Movement_1692C0 + waitmovement 0 + loadword 0, gUnknown_818DCB9 + callstd 4 + loadword 0, gUnknown_818E0EA + callstd 4 + setvar VAR_0x4055, 2 + releaseall + end + +Movement_1692B0:: @ 81692B0 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_end + +Movement_1692B7:: @ 81692B7 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_end + +Movement_1692C0:: @ 81692C0 + step_26 + step_26 + step_end + +PalletTown_ProfessorOaksLab_EventScript_1692C3:: @ 81692C3 + lockall + textcolor 0 + applymovement 4, Movement_1A75F1 + waitmovement 0 + loadword 0, gUnknown_818E177 + callstd 4 + closemessage + applymovement 255, Movement_1692E5 + waitmovement 0 + releaseall + end + +Movement_1692E5:: @ 81692E5 + step_11 + step_end + +PalletTown_ProfessorOaksLab_EventScript_1692E7:: @ 81692E7 + lockall + setvar VAR_0x4002, 1 + goto EventScript_16930B + end + +PalletTown_ProfessorOaksLab_EventScript_1692F3:: @ 81692F3 + lockall + setvar VAR_0x4002, 2 + goto EventScript_16930B + end + +PalletTown_ProfessorOaksLab_EventScript_1692FF:: @ 81692FF + lockall + setvar VAR_0x4002, 3 + goto EventScript_16930B + end + +EventScript_16930B:: @ 816930B + textcolor 0 + playbgm BGM_FRLG_RIVAL, 0 + applymovement 8, Movement_1A75ED + waitmovement 0 + applymovement 255, Movement_1A75E9 + waitmovement 0 + loadword 0, gUnknown_818DDA4 + callstd 4 + closemessage + applymovement 4, Movement_1A75F1 + waitmovement 0 + compare_var_to_value VAR_STARTER_MON, 0 + goto_if 1, EventScript_1693D2 + compare_var_to_value VAR_STARTER_MON, 1 + goto_if 1, EventScript_16944D + compare_var_to_value VAR_STARTER_MON, 2 + goto_if 1, EventScript_16935A + end + +EventScript_16935A:: @ 816935A + compare_var_to_value VAR_0x4002, 1 + goto_if 1, EventScript_16937C + compare_var_to_value VAR_0x4002, 2 + goto_if 1, EventScript_16938C + compare_var_to_value VAR_0x4002, 3 + goto_if 1, EventScript_16939C + end + +EventScript_16937C:: @ 816937C + applymovement 8, Movement_1693C0 + waitmovement 0 + goto EventScript_1693AC + end + +EventScript_16938C:: @ 816938C + applymovement 8, Movement_1693C7 + waitmovement 0 + goto EventScript_1693AC + end + +EventScript_16939C:: @ 816939C + applymovement 8, Movement_1693CD + waitmovement 0 + goto EventScript_1693AC + end + +EventScript_1693AC:: @ 81693AC + trainerbattle 9, 326, 3, Text_18DDEA, Text_18DE1A + goto EventScript_1694C2 + end + +Movement_1693C0:: @ 81693C0 + step_12 + step_12 + step_12 + step_12 + step_10 + step_10 + step_end + +Movement_1693C7:: @ 81693C7 + step_12 + step_12 + step_12 + step_10 + step_10 + step_end + +Movement_1693CD:: @ 81693CD + step_12 + step_12 + step_10 + step_10 + step_end + +EventScript_1693D2:: @ 81693D2 + compare_var_to_value VAR_0x4002, 1 + goto_if 1, EventScript_1693F4 + compare_var_to_value VAR_0x4002, 2 + goto_if 1, EventScript_169404 + compare_var_to_value VAR_0x4002, 3 + goto_if 1, EventScript_169414 + end + +EventScript_1693F4:: @ 81693F4 + applymovement 8, Movement_169438 + waitmovement 0 + goto EventScript_169424 + end + +EventScript_169404:: @ 8169404 + applymovement 8, Movement_169440 + waitmovement 0 + goto EventScript_169424 + end + +EventScript_169414:: @ 8169414 + applymovement 8, Movement_169447 + waitmovement 0 + goto EventScript_169424 + end + +EventScript_169424:: @ 8169424 + trainerbattle 9, 328, 3, Text_18DDEA, Text_18DE1A + goto EventScript_1694C2 + end + +Movement_169438:: @ 8169438 + step_12 + step_12 + step_12 + step_12 + step_12 + step_10 + step_10 + step_end + +Movement_169440:: @ 8169440 + step_12 + step_12 + step_12 + step_12 + step_10 + step_10 + step_end + +Movement_169447:: @ 8169447 + step_12 + step_12 + step_12 + step_10 + step_10 + step_end + +EventScript_16944D:: @ 816944D + compare_var_to_value VAR_0x4002, 1 + goto_if 1, EventScript_16946F + compare_var_to_value VAR_0x4002, 2 + goto_if 1, EventScript_16947F + compare_var_to_value VAR_0x4002, 3 + goto_if 1, EventScript_16948F + end + +EventScript_16946F:: @ 816946F + applymovement 8, Movement_1694B3 + waitmovement 0 + goto EventScript_16949F + end + +EventScript_16947F:: @ 816947F + applymovement 8, Movement_1694B9 + waitmovement 0 + goto EventScript_16949F + end + +EventScript_16948F:: @ 816948F + applymovement 8, Movement_1694BE + waitmovement 0 + goto EventScript_16949F + end + +EventScript_16949F:: @ 816949F + trainerbattle 9, 327, 3, Text_18DDEA, Text_18DE1A + goto EventScript_1694C2 + end + +Movement_1694B3:: @ 81694B3 + step_12 + step_12 + step_12 + step_10 + step_10 + step_end + +Movement_1694B9:: @ 81694B9 + step_12 + step_12 + step_10 + step_10 + step_end + +Movement_1694BE:: @ 81694BE + step_12 + step_10 + step_10 + step_end + +EventScript_1694C2:: @ 81694C2 + special sp000_heal_pokemon + loadword 0, gUnknown_818DE38 + callstd 4 + closemessage + playbgm BGM_FRLG_RIVAL_POSTBATTLE, 0 + compare_var_to_value VAR_0x4002, 1 + call_if 1, EventScript_169504 + compare_var_to_value VAR_0x4002, 2 + call_if 1, EventScript_169516 + compare_var_to_value VAR_0x4002, 3 + call_if 1, EventScript_169528 + removeobject 8 + playse SE_KAIDAN + fadedefaultbgm + setvar VAR_0x4055, 4 + setflag FLAG_0x258 + releaseall + end + +EventScript_169504:: @ 8169504 + applymovement 8, Movement_16953A + applymovement 255, Movement_169553 + waitmovement 8 + return + +EventScript_169516:: @ 8169516 + applymovement 8, Movement_16954A + applymovement 255, Movement_169553 + waitmovement 8 + return + +EventScript_169528:: @ 8169528 + applymovement 8, Movement_169542 + applymovement 255, Movement_169559 + waitmovement 8 + return + +Movement_16953A:: @ 816953A + step_13 + step_10 + step_10 + step_10 + step_10 + step_10 + step_1b + step_end + +Movement_169542:: @ 8169542 + step_12 + step_10 + step_10 + step_10 + step_10 + step_10 + step_1b + step_end + +Movement_16954A:: @ 816954A + step_13 + step_10 + step_10 + step_10 + step_12 + step_10 + step_10 + step_1b + step_end + +Movement_169553:: @ 8169553 + step_1c + step_1b + step_30 + step_1c + step_2d + step_end + +Movement_169559:: @ 8169559 + step_1c + step_1b + step_2f + step_1c + step_2d + step_end + +PalletTown_ProfessorOaksLab_EventScript_16955F:: @ 816955F + lock + faceplayer + compare_var_to_value VAR_0x4055, 3 + goto_if 1, EventScript_16958B + compare_var_to_value VAR_0x4055, 2 + goto_if 1, EventScript_169581 + loadword 0, gUnknown_818DC67 + callstd 4 + release + end + +EventScript_169581:: @ 8169581 + loadword 0, gUnknown_818DCE2 + callstd 4 + release + end + +EventScript_16958B:: @ 816958B + loadword 0, gUnknown_818DD75 + callstd 4 + release + end + +PalletTown_ProfessorOaksLab_EventScript_169595:: @ 8169595 + lock + faceplayer + checkflag FLAG_0x002 + goto_if 1, EventScript_169600 + compare_var_to_value VAR_0x4055, 9 + goto_if 1, EventScript_169903 + compare_var_to_value VAR_0x4055, 8 + goto_if 1, EventScript_169A6E + checkflag 2092 + goto_if 1, EventScript_1699CE + compare_var_to_value VAR_0x4052, 1 + goto_if 1, EventScript_169903 + compare_var_to_value VAR_0x4055, 6 + goto_if 1, EventScript_1698D6 + compare_var_to_value VAR_0x4057, 1 + goto_if 4, EventScript_16961E + compare_var_to_value VAR_0x4055, 4 + goto_if 1, EventScript_169614 + compare_var_to_value VAR_0x4055, 3 + goto_if 1, EventScript_16960A + loadword 0, gUnknown_818E116 + callstd 4 + release + end + +EventScript_169600:: @ 8169600 + loadword 0, gUnknown_81A72AD + callstd 4 + release + end + +EventScript_16960A:: @ 816960A + loadword 0, gUnknown_818E330 + callstd 4 + release + end + +EventScript_169614:: @ 8169614 + loadword 0, gUnknown_818E3AD + callstd 4 + release + end + +EventScript_16961E:: @ 816961E + loadword 0, gUnknown_818E405 + callstd 4 + textcolor 3 + playfanfare MUS_ME_WAZA + message Text_18E4AF + waitmessage + waitfanfare + call EventScript_1A6675 + removeitem ITEM_OAKS_PARCEL, 1 + loadword 0, gUnknown_818E4CA + callstd 4 + playbgm BGM_FRLG_RIVAL, 0 + loadword 0, gUnknown_818DE8D + callstd 4 + closemessage + compare_var_to_value VAR_FACING, 2 + call_if 1, EventScript_169A82 + compare_var_to_value VAR_FACING, 1 + call_if 1, EventScript_169AC1 + compare_var_to_value VAR_FACING, 4 + call_if 1, EventScript_169A9E + compare_var_to_value VAR_FACING, 3 + call_if 1, EventScript_169A9E + fadedefaultbgm + loadword 0, gUnknown_818DE99 + callstd 4 + closemessage + delay 30 + playse SE_PIN + applymovement 4, Movement_1A75DB + waitmovement 0 + applymovement 4, Movement_1A75DD + waitmovement 0 + compare_var_to_value VAR_FACING, 1 + call_if 1, EventScript_169ADD + compare_var_to_value VAR_FACING, 4 + call_if 1, EventScript_169B14 + compare_var_to_value VAR_FACING, 3 + call_if 1, EventScript_169AF5 + compare_var_to_value VAR_FACING, 2 + call_if 1, EventScript_169B86 + loadword 0, gUnknown_818E508 + callstd 4 + closemessage + compare_var_to_value VAR_FACING, 2 + call_if 1, EventScript_169882 + compare_var_to_value VAR_FACING, 1 + call_if 1, EventScript_16988D + compare_var_to_value VAR_FACING, 4 + call_if 1, EventScript_1698A6 + compare_var_to_value VAR_FACING, 3 + call_if 1, EventScript_1698B8 + loadword 0, gUnknown_818E536 + callstd 4 + closemessage + delay 40 + loadword 0, gUnknown_818E5C5 + callstd 4 + closemessage + applymovement 4, Movement_1A75E9 + waitmovement 0 + removeobject 9 + delay 10 + removeobject 10 + delay 25 + compare_var_to_value VAR_FACING, 2 + call_if 1, EventScript_169845 + compare_var_to_value VAR_FACING, 1 + call_if 1, EventScript_169850 + compare_var_to_value VAR_FACING, 4 + call_if 1, EventScript_16985B + compare_var_to_value VAR_FACING, 3 + call_if 1, EventScript_16986D + delay 10 + textcolor 3 + playfanfare BGM_FRLG_ME_KEYITEM + message Text_18E5EA + waitmessage + waitfanfare + call EventScript_1A6675 + setflag 2089 + special sub_810B810 + setvar VAR_0x407C, 1 + loadword 0, gUnknown_818E612 + callstd 4 + additem ITEM_POKE_BALL, 5 + loadword 0, gUnknown_818E6B3 + setorcopyvar VAR_0x8000, 4 + setorcopyvar VAR_0x8001, 5 + setorcopyvar VAR_0x8002, 257 + callstd 9 + loadword 0, gUnknown_818E6D0 + callstd 4 + setvar VAR_0x8004, 0 + setvar VAR_0x8005, 1 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_818E784 + callstd 4 + loadword 0, gUnknown_818DEC8 + callstd 4 + compare_var_to_value VAR_FACING, 2 + call_if 1, EventScript_169B33 + compare_var_to_value VAR_FACING, 1 + call_if 1, EventScript_169B45 + compare_var_to_value VAR_FACING, 4 + call_if 1, EventScript_169B57 + compare_var_to_value VAR_FACING, 3 + call_if 1, EventScript_169B57 + loadword 0, gUnknown_818DEF3 + callstd 4 + closemessage + playbgm BGM_FRLG_RIVAL_POSTBATTLE, 0 + compare_var_to_value VAR_FACING, 2 + call_if 1, EventScript_169B69 + compare_var_to_value VAR_FACING, 1 + call_if 1, EventScript_169B7B + compare_var_to_value VAR_FACING, 4 + call_if 1, EventScript_169B7B + compare_var_to_value VAR_FACING, 3 + call_if 1, EventScript_169B7B + removeobject 8 + fadedefaultbgm + setvar VAR_0x4055, 6 + setvar VAR_0x4057, 2 + setvar VAR_0x4051, 1 + setvar VAR_0x4058, 1 + setvar VAR_0x4054, 1 + release + end + +EventScript_169845:: @ 8169845 + applymovement 4, Movement_16987C + waitmovement 0 + return + +EventScript_169850:: @ 8169850 + applymovement 4, Movement_16987F + waitmovement 0 + return + +EventScript_16985B:: @ 816985B + applymovement 4, Movement_16987C + applymovement 255, Movement_169878 + waitmovement 0 + return + +EventScript_16986D:: @ 816986D + applymovement 4, Movement_16987C + waitmovement 0 + return + +Movement_169878:: @ 8169878 + step_1c + step_1b + step_30 + step_end + +Movement_16987C:: @ 816987C + step_13 + step_10 + step_end + +Movement_16987F:: @ 816987F + step_10 + step_13 + step_end + +EventScript_169882:: @ 8169882 + applymovement 4, Movement_1698CB + waitmovement 0 + return + +EventScript_16988D:: @ 816988D + applymovement 4, Movement_1698D0 + applymovement 255, Movement_1698C7 + applymovement 8, Movement_1698C7 + waitmovement 4 + return + +EventScript_1698A6:: @ 81698A6 + applymovement 4, Movement_1698CB + applymovement 255, Movement_1698C3 + waitmovement 4 + return + +EventScript_1698B8:: @ 81698B8 + applymovement 4, Movement_1698CB + waitmovement 0 + return + +Movement_1698C3:: @ 81698C3 + step_1c + step_1b + step_2e + step_end + +Movement_1698C7:: @ 81698C7 + step_1c + step_1b + step_2f + step_end + +Movement_1698CB:: @ 81698CB + step_11 + step_12 + step_1c + step_2d + step_end + +Movement_1698D0:: @ 81698D0 + step_12 + step_12 + step_11 + step_1c + step_30 + step_end + +EventScript_1698D6:: @ 81698D6 + setvar VAR_0x8004, 0 + specialvar VAR_RESULT, sub_80CA3D8 + copyvar VAR_0x8008, VAR_0x8005 + copyvar VAR_0x8009, VAR_0x8006 + getnumberstring 0, VAR_0x8008 + getnumberstring 1, VAR_0x8009 + compare_var_to_value VAR_0x8009, 1 + goto_if 1, EventScript_1699FB + goto EventScript_169903 + end + +EventScript_169903:: @ 8169903 + call EventScript_1A737B + checkflag FLAG_0x2F4 + goto_if 1, EventScript_169913 + release + end + +EventScript_169913:: @ 8169913 + closemessage + delay 40 + message Text_1A7291 + waitmessage + compare_var_to_value VAR_FACING, 2 + call_if 1, EventScript_169964 + compare_var_to_value VAR_FACING, 1 + call_if 1, EventScript_16996F + compare_var_to_value VAR_FACING, 4 + call_if 1, EventScript_16997A + compare_var_to_value VAR_FACING, 3 + call_if 1, EventScript_169985 + applymovement 4, Movement_1A75E1 + waitmovement 0 + closemessage + delay 70 + loadword 0, gUnknown_81A72AD + callstd 4 + setflag FLAG_0x002 + release + end + +EventScript_169964:: @ 8169964 + applymovement 4, Movement_169990 + waitmovement 0 + return + +EventScript_16996F:: @ 816996F + applymovement 4, Movement_169997 + waitmovement 0 + return + +EventScript_16997A:: @ 816997A + applymovement 4, Movement_16999E + waitmovement 0 + return + +EventScript_169985:: @ 8169985 + applymovement 4, Movement_1699A5 + waitmovement 0 + return + +Movement_169990:: @ 8169990 + step_25 + step_29 + step_25 + step_25 + step_29 + step_25 + step_end + +Movement_169997:: @ 8169997 + step_26 + step_2a + step_26 + step_26 + step_2a + step_26 + step_end + +Movement_16999E:: @ 816999E + step_27 + step_2b + step_27 + step_27 + step_2b + step_27 + step_end + +Movement_1699A5:: @ 81699A5 + step_28 + step_2c + step_28 + step_28 + step_2c + step_28 + step_end + +Movement_1699AC:: @ 81699AC + step_12 + step_2d + step_1b + step_30 + step_1b + step_2e + step_1b + step_2f + step_1b + step_2d + step_1b + step_13 + step_13 + step_2e + step_1b + step_2f + step_1b + step_2d + step_1b + step_30 + step_1b + step_2e + step_1b + step_12 + step_end + +Movement_1699C5: + step_11 + step_10 + step_10 + step_25 + step_11 + step_1c + step_1c + step_1c + step_end + +EventScript_1699CE:: @ 81699CE + call EventScript_1A737B + closemessage + compare_var_to_value VAR_0x8009, 60 + goto_if 0, EventScript_1699F9 + checkflag FLAG_SYS_RIBBON_GET + goto_if 0, EventScript_1699F9 + delay 30 + loadword 0, gUnknown_818EDF5 + callstd 4 + goto EventScript_169035 + end + +EventScript_1699F9:: @ 81699F9 + release + end + +EventScript_1699FB:: @ 81699FB + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + special sub_8112364 + checkflag FLAG_0x24F + goto_if 1, EventScript_169A6E + checkflag FLAG_0x247 + goto_if 1, EventScript_169A78 + checkitem ITEM_POKE_BALL, 1 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_169A34 + goto EventScript_169A6E + end + +EventScript_169A34:: @ 8169A34 + compare_var_to_value VAR_0x4054, 2 + goto_if 4, EventScript_169A45 + goto EventScript_169A6E + end + +EventScript_169A45:: @ 8169A45 + loadword 0, gUnknown_818E89C + callstd 4 + additem ITEM_POKE_BALL, 5 + loadword 0, gUnknown_818E6B3 + setorcopyvar VAR_0x8000, 4 + setorcopyvar VAR_0x8001, 5 + setorcopyvar VAR_0x8002, 257 + callstd 9 + setflag FLAG_0x247 + release + end + +EventScript_169A6E:: @ 8169A6E + loadword 0, gUnknown_818E871 + callstd 4 + release + end + +EventScript_169A78:: @ 8169A78 + loadword 0, gUnknown_818E98E + callstd 4 + release + end + +EventScript_169A82:: @ 8169A82 + setobjectxyperm 8, 5, 10 + addobject 8 + applymovement 255, Movement_169B94 + applymovement 8, Movement_169B9D + waitmovement 0 + return + +EventScript_169A9E:: @ 8169A9E + setobjectxyperm 8, 6, 10 + addobject 8 + applymovement 4, Movement_1A75ED + applymovement 255, Movement_169B91 + applymovement 8, Movement_169B9D + waitmovement 0 + return + +EventScript_169AC1:: @ 8169AC1 + setobjectxyperm 8, 6, 10 + addobject 8 + applymovement 4, Movement_1A75ED + applymovement 8, Movement_169B9D + waitmovement 0 + return + +EventScript_169ADD:: @ 8169ADD + applymovement 4, Movement_1A75E1 + waitmovement 0 + delay 15 + applymovement 4, Movement_1A75ED + waitmovement 0 + return + +EventScript_169AF5:: @ 8169AF5 + applymovement 4, Movement_1A75E1 + waitmovement 0 + delay 15 + applymovement 255, Movement_1A75E7 + applymovement 4, Movement_1A75ED + waitmovement 0 + return + +EventScript_169B14:: @ 8169B14 + applymovement 4, Movement_1A75E1 + waitmovement 0 + delay 15 + applymovement 255, Movement_1A75EB + applymovement 4, Movement_1A75ED + waitmovement 0 + return + +EventScript_169B33:: @ 8169B33 + applymovement 8, Movement_1A75E1 + applymovement 255, Movement_1A75E7 + waitmovement 0 + return + +EventScript_169B45:: @ 8169B45 + applymovement 8, Movement_1A75E9 + applymovement 255, Movement_1A75ED + waitmovement 0 + return + +EventScript_169B57:: @ 8169B57 + applymovement 8, Movement_1A75E1 + applymovement 255, Movement_1A75ED + waitmovement 0 + return + +EventScript_169B69:: @ 8169B69 + applymovement 255, Movement_169B91 + applymovement 8, Movement_169BA4 + waitmovement 0 + return + +EventScript_169B7B:: @ 8169B7B + applymovement 8, Movement_169BA4 + waitmovement 0 + return + +EventScript_169B86:: @ 8169B86 + applymovement 255, Movement_1A75E9 + waitmovement 0 + return + +Movement_169B91:: @ 8169B91 + step_1a + step_2d + step_end + +Movement_169B94:: @ 8169B94 + step_2d + step_1c + step_1c + step_1c + step_1c + step_1c + step_1b + step_2f + step_end + +Movement_169B9D:: @ 8169B9D + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_end + +Movement_169BA4:: @ 8169BA4 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_end + +PalletTown_ProfessorOaksLab_EventScript_169BAB:: @ 8169BAB + lock + faceplayer + setvar VAR_0x4001, 0 + setvar VAR_0x4002, 1 + setvar VAR_0x4003, 4 + setvar VAR_0x4004, 7 + compare_var_to_value VAR_0x4055, 3 + goto_if 4, EventScript_169DE4 + compare_var_to_value VAR_0x4055, 2 + goto_if 1, EventScript_169BE1 + loadword 0, gUnknown_818EA19 + callstd 4 + release + end + +EventScript_169BE1:: @ 8169BE1 + applymovement 4, Movement_1A75EF + waitmovement 0 + drawmonpic 16386, 10, 3 + textcolor 0 + compare_var_to_value VAR_0x4001, 0 + goto_if 1, EventScript_169C14 + compare_var_to_value VAR_0x4001, 1 + goto_if 1, EventScript_169C33 + compare_var_to_value VAR_0x4001, 2 + goto_if 1, EventScript_169C52 + end + +EventScript_169C14:: @ 8169C14 + loadword 0, gUnknown_818E272 + callstd 5 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_169C74 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_169C71 + end + +EventScript_169C33:: @ 8169C33 + loadword 0, gUnknown_818E207 + callstd 5 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_169C74 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_169C71 + end + +EventScript_169C52:: @ 8169C52 + loadword 0, gUnknown_818E194 + callstd 5 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_169C74 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_169C71 + end + +EventScript_169C71:: @ 8169C71 + erasemonpic + release + end + +EventScript_169C74:: @ 8169C74 + erasemonpic + removeobject VAR_LAST_TALKED + loadword 0, gUnknown_818E2E5 + callstd 4 + call EventScript_1A6675 + setflag 2088 + setflag FLAG_0x291 + givemon 16386, 5, ITEM_NONE, 0, 0, 0 + copyvar VAR_STARTER_MON, VAR_0x4001 + getspeciesname 0, 16386 + message Text_18E30D + waitmessage + playfanfare BGM_FRLG_ME_KEYITEM + waitfanfare + loadword 0, gUnknown_81A56A7 + callstd 5 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_169CCC + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_169CDC + end + +EventScript_169CCC:: @ 8169CCC + setvar VAR_0x8004, 0 + call EventScript_1A74EB + goto EventScript_169CDC + end + +EventScript_169CDC:: @ 8169CDC + closemessage + compare_var_to_value VAR_0x4001, 0 + goto_if 1, EventScript_169CFF + compare_var_to_value VAR_0x4001, 1 + goto_if 1, EventScript_169D1F + compare_var_to_value VAR_0x4001, 2 + goto_if 1, EventScript_169D0F + end + +EventScript_169CFF:: @ 8169CFF + applymovement 8, Movement_169D62 + waitmovement 0 + goto EventScript_169D2F + end + +EventScript_169D0F:: @ 8169D0F + applymovement 8, Movement_169D6B + waitmovement 0 + goto EventScript_169D2F + end + +EventScript_169D1F:: @ 8169D1F + applymovement 8, Movement_169D72 + waitmovement 0 + goto EventScript_169D2F + end + +EventScript_169D2F:: @ 8169D2F + textcolor 0 + loadword 0, gUnknown_818DD34 + callstd 4 + removeobject VAR_0x4004 + textcolor 3 + getspeciesname 0, 16387 + message Text_18DD52 + waitmessage + playfanfare BGM_FRLG_ME_KEYITEM + waitfanfare + setvar VAR_0x4055, 3 + checkflag 2110 + call_if 1, EventScript_169D5C + release + end + +EventScript_169D5C:: @ 8169D5C + setvar VAR_0x4070, 1 + return + +Movement_169D62:: @ 8169D62 + step_10 + step_10 + step_13 + step_13 + step_13 + step_13 + step_13 + step_11 + step_end + +Movement_169D6B:: @ 8169D6B + step_10 + step_13 + step_13 + step_13 + step_13 + step_2e + step_end + +Movement_169D72:: @ 8169D72 + step_10 + step_13 + step_13 + step_13 + step_2e + step_end + +PalletTown_ProfessorOaksLab_EventScript_169D78:: @ 8169D78 + lock + faceplayer + setvar VAR_0x4001, 1 + setvar VAR_0x4002, 7 + setvar VAR_0x4003, 1 + setvar VAR_0x4004, 5 + compare_var_to_value VAR_0x4055, 3 + goto_if 4, EventScript_169DE4 + compare_var_to_value VAR_0x4055, 2 + goto_if 1, EventScript_169BE1 + loadword 0, gUnknown_818EA19 + callstd 4 + release + end + +PalletTown_ProfessorOaksLab_EventScript_169DAE:: @ 8169DAE + lock + faceplayer + setvar VAR_0x4001, 2 + setvar VAR_0x4002, 4 + setvar VAR_0x4003, 7 + setvar VAR_0x4004, 6 + compare_var_to_value VAR_0x4055, 3 + goto_if 4, EventScript_169DE4 + compare_var_to_value VAR_0x4055, 2 + goto_if 1, EventScript_169BE1 + loadword 0, gUnknown_818EA19 + callstd 4 + release + end + +EventScript_169DE4:: @ 8169DE4 + loadword 0, gUnknown_818EA45 + callstd 4 + release + end + +PalletTown_ProfessorOaksLab_EventScript_169DEE:: @ 8169DEE + lock + faceplayer + checkflag 2092 + goto_if 1, EventScript_169E03 + loadword 0, gUnknown_818EBE6 + callstd 4 + release + end + +EventScript_169E03:: @ 8169E03 + setvar VAR_0x8004, 0 + setvar VAR_0x8005, 5 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_818ED15 + callstd 4 + release + end + +PalletTown_ProfessorOaksLab_EventScript_169E1A:: @ 8169E1A + lock + faceplayer + checkflag 2092 + goto_if 1, EventScript_169E2F + loadword 0, gUnknown_818EBE6 + callstd 4 + release + end + +EventScript_169E2F:: @ 8169E2F + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 0 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_818EC0B + callstd 4 + release + end + +PalletTown_ProfessorOaksLab_EventScript_169E46:: @ 8169E46 + lock + faceplayer + setvar VAR_0x8004, 0 + setvar VAR_0x8005, 2 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_818ED81 + callstd 4 + release + end + +PalletTown_ProfessorOaksLab_EventScript_169E5F:: @ 8169E5F + loadword 0, gUnknown_818E9E5 + callstd 2 + end + +PalletTown_ProfessorOaksLab_EventScript_169E68:: @ 8169E68 + loadword 0, gUnknown_818EAF4 + callstd 3 + end + +PalletTown_ProfessorOaksLab_EventScript_169E71:: @ 8169E71 + loadword 0, gUnknown_818EA66 + callstd 3 + end + +PalletTown_ProfessorOaksLab_EventScript_169E7A:: @ 8169E7A + lockall + compare_var_to_value VAR_0x4055, 6 + goto_if 4, EventScript_169E90 + loadword 0, gUnknown_818EA84 + callstd 4 + releaseall + end + +EventScript_169E90:: @ 8169E90 + loadword 0, gUnknown_818EAB6 + callstd 4 + releaseall + end diff --git a/data/maps/PewterCity/scripts.inc b/data/maps/PewterCity/scripts.inc new file mode 100644 index 000000000..25d32949d --- /dev/null +++ b/data/maps/PewterCity/scripts.inc @@ -0,0 +1,1614 @@ +PewterCity_MapScripts:: @ 8165B8E + map_script 3, PewterCity_MapScript1_165B94 + .byte 0 + +PewterCity_MapScript1_165B94:: @ 8165B94 + setworldmapflag 2194 + setvar VAR_0x4061, 0 + end + +PewterCity_EventScript_165B9D:: @ 8165B9D + lock + faceplayer + loadword 0, gUnknown_817E67E + callstd 4 + closemessage + playbgm BGM_FRLG_FOLLOW_ME, 0 + compare_var_to_value VAR_FACING, 4 + call_if 1, EventScript_165BD3 + loadword 0, gUnknown_817E6C7 + callstd 4 + closemessage + applymovement 5, Movement_165D83 + waitmovement 0 + fadedefaultbgm + removeobject 5 + clearflag FLAG_0x02E + release + end + +EventScript_165BD3:: @ 8165BD3 + applymovement 255, Movement_165C3C + applymovement 5, Movement_165CDE + waitmovement 0 + applymovement 255, Movement_165C41 + applymovement 5, Movement_165CE3 + waitmovement 0 + return + +EventScript_165BF6:: @ 8165BF6 + applymovement 255, Movement_165C80 + applymovement 5, Movement_165D23 + waitmovement 0 + applymovement 255, Movement_165C82 + applymovement 5, Movement_165D25 + waitmovement 0 + return + +EventScript_165C19:: @ 8165C19 + applymovement 255, Movement_165CAF + applymovement 5, Movement_165D53 + waitmovement 0 + applymovement 255, Movement_165CB1 + applymovement 5, Movement_165D55 + waitmovement 0 + return + +Movement_165C3C:: @ 8165C3C + step_1c + step_1c + step_1a + step_2d + step_end + +Movement_165C41:: @ 8165C41 + step_10 + step_12 + step_12 + step_12 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_13 + step_13 + step_13 + step_13 + step_13 + step_13 + step_13 + step_13 + step_end + +Movement_165C80:: @ 8165C80 + step_1c + step_end + +Movement_165C82:: @ 8165C82 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_13 + step_end + +Movement_165CAF:: @ 8165CAF + step_1c + step_end + +Movement_165CB1:: @ 8165CB1 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_13 + step_end + +Movement_165CDE:: @ 8165CDE + step_10 + step_12 + step_2e + step_26 + step_end + +Movement_165CE3:: @ 8165CE3 + step_12 + step_12 + step_12 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_13 + step_13 + step_13 + step_13 + step_13 + step_13 + step_13 + step_13 + step_13 + step_2f + step_end + +Movement_165D23:: @ 8165D23 + step_28 + step_end + +Movement_165D25:: @ 8165D25 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_13 + step_13 + step_2f + step_end + +Movement_165D53:: @ 8165D53 + step_25 + step_end + +Movement_165D55:: @ 8165D55 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_13 + step_13 + step_2f + step_end + +Movement_165D83:: @ 8165D83 + step_10 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_end + +PewterCity_EventScript_165D8E:: @ 8165D8E + lockall + setvar VAR_0x4001, 0 + goto EventScript_165DBE + end + +PewterCity_EventScript_165D9A:: @ 8165D9A + lockall + setvar VAR_0x4001, 1 + goto EventScript_165DBE + end + +PewterCity_EventScript_165DA6:: @ 8165DA6 + lockall + setvar VAR_0x4001, 2 + goto EventScript_165DBE + end + +PewterCity_EventScript_165DB2:: @ 8165DB2 + lockall + setvar VAR_0x4001, 3 + goto EventScript_165DBE + end + +EventScript_165DBE:: @ 8165DBE + textcolor 0 + loadword 0, gUnknown_817E67E + callstd 4 + closemessage + playbgm BGM_FRLG_FOLLOW_ME, 0 + compare_var_to_value VAR_0x4001, 0 + call_if 1, EventScript_165E0A + compare_var_to_value VAR_0x4001, 1 + call_if 1, EventScript_165E26 + compare_var_to_value VAR_0x4001, 2 + call_if 1, EventScript_165E42 + loadword 0, gUnknown_817E6C7 + callstd 4 + closemessage + applymovement 5, Movement_165D83 + waitmovement 0 + fadedefaultbgm + removeobject 5 + clearflag FLAG_0x02E + releaseall + end + +EventScript_165E0A:: @ 8165E0A + applymovement 5, Movement_165F6C + waitmovement 0 + applymovement 255, Movement_165E7A + applymovement 5, Movement_165F7F + waitmovement 0 + return + +EventScript_165E26:: @ 8165E26 + applymovement 5, Movement_165F71 + waitmovement 0 + applymovement 255, Movement_165EB9 + applymovement 5, Movement_165FBF + waitmovement 0 + return + +EventScript_165E42:: @ 8165E42 + applymovement 5, Movement_165F74 + waitmovement 0 + applymovement 255, Movement_165EF9 + applymovement 5, Movement_166000 + waitmovement 0 + return + +EventScript_165E5E:: @ 8165E5E + applymovement 5, Movement_165F78 + waitmovement 0 + applymovement 255, Movement_165F3A + applymovement 5, Movement_166042 + waitmovement 0 + return + +Movement_165E7A:: @ 8165E7A + step_12 + step_12 + step_12 + step_12 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_13 + step_13 + step_13 + step_13 + step_13 + step_13 + step_13 + step_13 + step_end + +Movement_165EB9:: @ 8165EB9 + step_11 + step_12 + step_12 + step_12 + step_12 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_13 + step_13 + step_13 + step_13 + step_13 + step_13 + step_13 + step_13 + step_end + +Movement_165EF9:: @ 8165EF9 + step_11 + step_11 + step_12 + step_12 + step_12 + step_12 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_13 + step_13 + step_13 + step_13 + step_13 + step_13 + step_13 + step_13 + step_end + +Movement_165F3A:: @ 8165F3A + step_12 + step_12 + step_12 + step_12 + step_11 + step_12 + step_12 + step_12 + step_11 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_13 + step_end + +Movement_165F6C:: @ 8165F6C + step_12 + step_10 + step_30 + step_28 + step_end + +Movement_165F71:: @ 8165F71 + step_10 + step_25 + step_end + +Movement_165F74:: @ 8165F74 + step_10 + step_10 + step_25 + step_end + +Movement_165F78:: @ 8165F78 + step_10 + step_10 + step_13 + step_10 + step_13 + step_28 + step_end + +Movement_165F7F:: @ 8165F7F + step_12 + step_12 + step_12 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_13 + step_13 + step_13 + step_13 + step_13 + step_13 + step_13 + step_13 + step_13 + step_2f + step_end + +Movement_165FBF:: @ 8165FBF + step_12 + step_12 + step_12 + step_12 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_13 + step_13 + step_13 + step_13 + step_13 + step_13 + step_13 + step_13 + step_13 + step_2f + step_end + +Movement_166000:: @ 8166000 + step_11 + step_12 + step_12 + step_12 + step_12 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_13 + step_13 + step_13 + step_13 + step_13 + step_13 + step_13 + step_13 + step_13 + step_2f + step_end + +Movement_166042:: @ 8166042 + step_12 + step_12 + step_12 + step_11 + step_12 + step_12 + step_12 + step_11 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_13 + step_13 + step_2f + step_end + +PewterCity_EventScript_166075:: @ 8166075 + loadword 0, gUnknown_817E436 + callstd 2 + end + +PewterCity_EventScript_16607E:: @ 816607E + lock + faceplayer + loadword 0, gUnknown_817E53E + callstd 5 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_166136 + loadword 0, gUnknown_817E589 + callstd 4 + closemessage + delay 10 + playbgm BGM_FRLG_FOLLOW_ME, 0 + compare_var_to_value VAR_FACING, 2 + call_if 1, EventScript_1660EE + compare_var_to_value VAR_FACING, 1 + call_if 1, EventScript_166100 + compare_var_to_value VAR_FACING, 3 + call_if 1, EventScript_166112 + compare_var_to_value VAR_FACING, 4 + call_if 1, EventScript_166124 + loadword 0, gUnknown_817E5AC + callstd 4 + closemessage + delay 10 + applymovement 2, Movement_16621C + waitmovement 0 + fadedefaultbgm + removeobject 2 + clearflag FLAG_0x050 + release + end + +EventScript_1660EE:: @ 81660EE + applymovement 2, Movement_16615C + applymovement 255, Movement_166140 + waitmovement 0 + return + +EventScript_166100:: @ 8166100 + applymovement 2, Movement_166193 + applymovement 255, Movement_166177 + waitmovement 0 + return + +EventScript_166112:: @ 8166112 + applymovement 2, Movement_1661CA + applymovement 255, Movement_1661AE + waitmovement 0 + return + +EventScript_166124:: @ 8166124 + applymovement 2, Movement_166201 + applymovement 255, Movement_1661E5 + waitmovement 0 + return + +EventScript_166136:: @ 8166136 + loadword 0, gUnknown_817E55C + callstd 4 + release + end + +Movement_166140:: @ 8166140 + step_11 + step_11 + step_11 + step_11 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_11 + step_11 + step_11 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_1b + step_2e + step_end + +Movement_16615C:: @ 816615C + step_11 + step_11 + step_11 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_11 + step_11 + step_11 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_2e + step_end + +Movement_166177:: @ 8166177 + step_1c + step_1c + step_12 + step_11 + step_11 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_11 + step_11 + step_11 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_1b + step_2e + step_end + +Movement_166193:: @ 8166193 + step_12 + step_11 + step_11 + step_11 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_11 + step_11 + step_11 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_2e + step_end + +Movement_1661AE:: @ 81661AE + step_12 + step_11 + step_11 + step_11 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_11 + step_11 + step_11 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_1b + step_2e + step_end + +Movement_1661CA:: @ 81661CA + step_11 + step_11 + step_11 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_11 + step_11 + step_11 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_2e + step_end + +Movement_1661E5:: @ 81661E5 + step_13 + step_11 + step_11 + step_11 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_11 + step_11 + step_11 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_1b + step_2e + step_end + +Movement_166201:: @ 8166201 + step_11 + step_11 + step_11 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_11 + step_11 + step_11 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_2e + step_end + +Movement_16621C:: @ 816621C + step_10 + step_13 + step_13 + step_13 + step_13 + step_13 + step_13 + step_13 + step_10 + step_10 + step_10 + step_13 + step_13 + step_13 + step_end + +PewterCity_EventScript_16622B:: @ 816622B + lock + faceplayer + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 2 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_817E49F + callstd 4 + release + end + +PewterCity_EventScript_166244:: @ 8166244 + lock + faceplayer + loadword 0, gUnknown_817E602 + callstd 5 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_166263 + loadword 0, gUnknown_817E644 + callstd 4 + release + end + +EventScript_166263:: @ 8166263 + loadword 0, gUnknown_817E626 + callstd 4 + release + end + +PewterCity_EventScript_16626D:: @ 816626D + loadword 0, gUnknown_817E6F6 + callstd 3 + end + +PewterCity_EventScript_166276:: @ 8166276 + loadword 0, gUnknown_817E748 + callstd 3 + end + +PewterCity_EventScript_16627F:: @ 816627F + loadword 0, gUnknown_817E7C5 + callstd 3 + end + +PewterCity_EventScript_166288:: @ 8166288 + lockall + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 0 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_817E7DE + callstd 4 + releaseall + end + +PewterCity_EventScript_1662A0:: @ 81662A0 + loadword 0, gUnknown_817E824 + callstd 3 + end + +PewterCity_EventScript_1662A9:: @ 81662A9 + lock + faceplayer + setvar VAR_0x4001, 0 + call EventScript_1662DE + release + end + +PewterCity_EventScript_1662B7:: @ 81662B7 + lockall + setvar VAR_0x4001, 1 + call EventScript_1662DE + releaseall + end + +PewterCity_EventScript_1662C4:: @ 81662C4 + lockall + setvar VAR_0x4001, 2 + call EventScript_1662DE + releaseall + end + +PewterCity_EventScript_1662D1:: @ 81662D1 + lockall + setvar VAR_0x4001, 3 + call EventScript_1662DE + releaseall + end + +EventScript_1662DE:: @ 81662DE + textcolor 0 + compare_var_to_value VAR_0x4001, 1 + call_if 1, EventScript_1663CA + compare_var_to_value VAR_0x4001, 2 + call_if 1, EventScript_1663CA + compare_var_to_value VAR_0x4001, 3 + call_if 1, EventScript_1663CA + waitse + playse SE_PIN + applymovement 7, Movement_1A75DB + waitmovement 0 + applymovement 7, Movement_1A75DD + waitmovement 0 + loadword 0, gUnknown_817E902 + callstd 4 + compare_var_to_value VAR_0x4001, 0 + call_if 1, EventScript_1663D5 + compare_var_to_value VAR_0x4001, 1 + call_if 1, EventScript_1663DA + compare_var_to_value VAR_0x4001, 2 + call_if 1, EventScript_1663E6 + compare_var_to_value VAR_0x4001, 3 + call_if 1, EventScript_1663FC + loadword 0, gUnknown_817E90C + callstd 4 + textcolor 3 + playfanfare BGM_FRLG_ME_KEYITEM + message Text_17E970 + waitmessage + waitfanfare + loadword 0, gUnknown_817E99D + callstd 4 + special sub_80699BC + signmsg + loadword 0, gUnknown_817E9C7 + callstd 4 + normalmsg + call EventScript_1A6675 + loadword 0, gUnknown_817EA06 + callstd 4 + closemessage + compare_var_to_value VAR_0x4001, 0 + call_if 1, EventScript_166412 + compare_var_to_value VAR_0x4001, 1 + call_if 1, EventScript_16641D + compare_var_to_value VAR_0x4001, 2 + call_if 1, EventScript_166428 + compare_var_to_value VAR_0x4001, 3 + call_if 1, EventScript_166433 + delay 30 + textcolor 3 + loadword 0, gUnknown_817EA36 + callstd 4 + closemessage + removeobject 7 + setflag 2095 + setvar VAR_0x406C, 2 + return + +EventScript_1663CA:: @ 81663CA + applymovement 7, Movement_1A75ED + waitmovement 0 + return + +EventScript_1663D5:: @ 81663D5 + closemessage + delay 20 + return + +EventScript_1663DA:: @ 81663DA + closemessage + applymovement 255, Movement_1A75E9 + waitmovement 0 + return + +EventScript_1663E6:: @ 81663E6 + closemessage + applymovement 7, Movement_16643E + waitmovement 0 + applymovement 255, Movement_1A75E9 + waitmovement 0 + return + +EventScript_1663FC:: @ 81663FC + closemessage + applymovement 7, Movement_166441 + waitmovement 0 + applymovement 255, Movement_1A75E9 + waitmovement 0 + return + +EventScript_166412:: @ 8166412 + applymovement 7, Movement_166445 + waitmovement 0 + return + +EventScript_16641D:: @ 816641D + applymovement 7, Movement_166450 + waitmovement 0 + return + +EventScript_166428:: @ 8166428 + applymovement 7, Movement_16645B + waitmovement 0 + return + +EventScript_166433:: @ 8166433 + applymovement 7, Movement_166465 + waitmovement 0 + return + +Movement_16643E:: @ 816643E + step_1a + step_10 + step_end + +Movement_166441:: @ 8166441 + step_1a + step_10 + step_10 + step_end + +Movement_166445:: @ 8166445 + step_10 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_end + +Movement_166450:: @ 8166450 + step_12 + step_10 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_end + +Movement_16645B:: @ 816645B + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_end + +Movement_166465:: @ 8166465 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_end + +Movement_16646F:: @ 816646F + step_27 + step_end diff --git a/data/maps/PewterCity_Gym/scripts.inc b/data/maps/PewterCity_Gym/scripts.inc new file mode 100644 index 000000000..0ba35e23a --- /dev/null +++ b/data/maps/PewterCity_Gym/scripts.inc @@ -0,0 +1,110 @@ +PewterCity_Gym_MapScripts:: @ 816A592 + .byte 0 + +PewterCity_Gym_EventScript_16A593:: @ 816A593 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 2 + special UpdatePickStateFromSpecialVar8005 + trainerbattle 1, 414, 0, Text_190CD4, Text_190E4F, EventScript_16A5C5 + checkflag FLAG_0x254 + goto_if 0, EventScript_16A5F3 + loadword 0, gUnknown_819110F + callstd 4 + release + end + +EventScript_16A5C5:: @ 816A5C5 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 1 + special SetFlavorTextFlagFromSpecialVars + setflag FLAG_0x4B0 + setflag FLAG_UNK820 + setvar VAR_0x406C, 1 + setflag FLAG_0x02E + clearflag FLAG_0x092 + setvar VAR_0x8008, 1 + call EventScript_1A6B18 + goto EventScript_16A5F3 + end + +EventScript_16A5F3:: @ 816A5F3 + loadword 0, gUnknown_8190FC1 + callstd 4 + checkitemspace ITEM_TM39, 1 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16A634 + additem ITEM_TM39, 1 + loadword 0, gUnknown_8190FDB + setorcopyvar VAR_0x8000, 327 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 257 + callstd 9 + setflag FLAG_0x254 + loadword 0, gUnknown_8190FF8 + callstd 4 + release + end + +EventScript_16A634:: @ 816A634 + loadword 0, gUnknown_81911CE + callstd 4 + release + end + +PewterCity_Gym_EventScript_16A63E:: @ 816A63E + trainerbattle 0, 142, 0, Text_1911EC, Text_191237 + loadword 0, gUnknown_819126B + callstd 6 + end + +PewterCity_Gym_EventScript_16A655:: @ 816A655 + lock + faceplayer + checkflag FLAG_0x4B0 + goto_if 1, EventScript_16A67F + loadword 0, gUnknown_8191298 + callstd 5 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16A689 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16A697 + end + +EventScript_16A67F:: @ 816A67F + loadword 0, gUnknown_819143C + callstd 4 + release + end + +EventScript_16A689:: @ 816A689 + loadword 0, gUnknown_819133C + callstd 4 + goto EventScript_16A6A5 + end + +EventScript_16A697:: @ 816A697 + loadword 0, gUnknown_8191412 + callstd 4 + goto EventScript_16A6A5 + end + +EventScript_16A6A5:: @ 816A6A5 + loadword 0, gUnknown_819135C + callstd 4 + release + end + +PewterCity_Gym_EventScript_16A6AF:: @ 816A6AF + lockall + checkflag FLAG_UNK820 + goto_if 1, EventScript_16A6C3 + loadword 0, gUnknown_819146E + callstd 4 + releaseall + end + +EventScript_16A6C3:: @ 816A6C3 + loadword 0, gUnknown_81914A4 + callstd 4 + releaseall + end diff --git a/data/maps/PewterCity_House1/scripts.inc b/data/maps/PewterCity_House1/scripts.inc new file mode 100644 index 000000000..b051c7c2d --- /dev/null +++ b/data/maps/PewterCity_House1/scripts.inc @@ -0,0 +1,34 @@ +PewterCity_House1_MapScripts:: @ 816A71C + .byte 0 + +PewterCity_House1_EventScript_16A71D:: @ 816A71D + loadword 0, gUnknown_81915DB + callstd 2 + end + +PewterCity_House1_EventScript_16A726:: @ 816A726 + lock + loadword 0, gUnknown_81915CD + callstd 4 + call EventScript_16A749 + release + end + +PewterCity_House1_EventScript_16A736:: @ 816A736 + lock + faceplayer + call EventScript_16A749 + applymovement 3, Movement_1A75E5 + waitmovement 0 + release + end + +EventScript_16A749:: @ 816A749 + textcolor 3 + waitse + playmoncry SPECIES_NIDORAN_M, 0 + loadword 0, gUnknown_81915BB + callstd 4 + waitmoncry + call EventScript_1A6675 + return diff --git a/data/maps/PewterCity_House2/scripts.inc b/data/maps/PewterCity_House2/scripts.inc new file mode 100644 index 000000000..8b706eeac --- /dev/null +++ b/data/maps/PewterCity_House2/scripts.inc @@ -0,0 +1,12 @@ +PewterCity_House2_MapScripts:: @ 816A7DC + .byte 0 + +PewterCity_House2_EventScript_16A7DD:: @ 816A7DD + loadword 0, gUnknown_81917E4 + callstd 2 + end + +PewterCity_House2_EventScript_16A7E6:: @ 816A7E6 + loadword 0, gUnknown_8191840 + callstd 2 + end diff --git a/data/maps/PewterCity_Mart/scripts.inc b/data/maps/PewterCity_Mart/scripts.inc new file mode 100644 index 000000000..ea0a47028 --- /dev/null +++ b/data/maps/PewterCity_Mart/scripts.inc @@ -0,0 +1,40 @@ +PewterCity_Mart_MapScripts:: @ 816A6CD + .byte 0 + +PewterCity_Mart_EventScript_16A6CE:: @ 816A6CE + loadword 0, gUnknown_81914DE + callstd 2 + end + +PewterCity_Mart_EventScript_16A6D7:: @ 816A6D7 + loadword 0, gUnknown_8191541 + callstd 2 + end + +PewterCity_Mart_EventScript_16A6E0:: @ 816A6E0 + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + lock + faceplayer + message Text_1A6211 + waitmessage + pokemart Items_16A708 + loadword 0, gUnknown_81A5190 + callstd 4 + release + end + + .align 2 +Items_16A708:: @ 816A708 + .2byte ITEM_POKE_BALL + .2byte ITEM_POTION + .2byte ITEM_ANTIDOTE + .2byte ITEM_PARALYZE_HEAL + .2byte ITEM_AWAKENING + .2byte ITEM_BURN_HEAL + .2byte ITEM_ESCAPE_ROPE + .2byte ITEM_REPEL + .2byte ITEM_NONE + release + end diff --git a/data/maps/PewterCity_Museum_1F/scripts.inc b/data/maps/PewterCity_Museum_1F/scripts.inc new file mode 100644 index 000000000..f597dd916 --- /dev/null +++ b/data/maps/PewterCity_Museum_1F/scripts.inc @@ -0,0 +1,228 @@ +PewterCity_Museum_1F_MapScripts:: @ 816A31A + .byte 0 + +PewterCity_Museum_1F_EventScript_16A31B:: @ 816A31B + lock + faceplayer + compare_var_to_value VAR_FACING, 3 + goto_if 1, EventScript_16A348 + compare_var_to_value VAR_FACING, 1 + goto_if 1, EventScript_16A348 + compare_var_to_value VAR_FACING, 2 + goto_if 1, EventScript_16A348 + loadword 0, gUnknown_8190539 + callstd 4 + release + end + +EventScript_16A348:: @ 816A348 + loadword 0, gUnknown_8190550 + callstd 5 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16A367 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16A37B + end + +EventScript_16A367:: @ 816A367 + loadword 0, gUnknown_81905B1 + callstd 4 + applymovement 1, Movement_1A75E5 + waitmovement 0 + release + end + +EventScript_16A37B:: @ 816A37B + loadword 0, gUnknown_8190627 + callstd 4 + applymovement 1, Movement_1A75E5 + waitmovement 0 + release + end + +PewterCity_Museum_1F_EventScript_16A38F:: @ 816A38F + lockall + setvar VAR_0x4001, 0 + applymovement 255, Movement_1A75EB + waitmovement 0 + goto EventScript_16A3D1 + end + +PewterCity_Museum_1F_EventScript_16A3A5:: @ 816A3A5 + lockall + setvar VAR_0x4001, 1 + applymovement 255, Movement_1A75EB + waitmovement 0 + goto EventScript_16A3D1 + end + +PewterCity_Museum_1F_EventScript_16A3BB:: @ 816A3BB + lockall + setvar VAR_0x4001, 2 + applymovement 255, Movement_1A75EB + waitmovement 0 + goto EventScript_16A3D1 + end + +EventScript_16A3D1:: @ 816A3D1 + textcolor 0 + showmoneybox 0, 0, 0 + loadword 0, gUnknown_81904B5 + callstd 5 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16A402 + loadword 0, gUnknown_81904F9 + callstd 4 + closemessage + hidemoneybox + .byte 0 + .byte 0 + applymovement 255, Movement_16A48E + waitmovement 0 + releaseall + end + +EventScript_16A402:: @ 816A402 + checkmoney 50, 0 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16A476 + closemessage + compare_var_to_value VAR_0x4001, 0 + call_if 1, EventScript_16A455 + compare_var_to_value VAR_0x4001, 1 + call_if 1, EventScript_16A460 + compare_var_to_value VAR_0x4001, 2 + call_if 1, EventScript_16A46B + playse 248 + takemoney 50, 0 + updatemoneybox 0, 0, 0 + waitse + loadword 0, gUnknown_8190505 + callstd 4 + setvar VAR_0x4061, 1 + hidemoneybox + .byte 0 + .byte 0 + releaseall + end + +EventScript_16A455:: @ 816A455 + applymovement 255, Movement_16A490 + waitmovement 0 + return + +EventScript_16A460:: @ 816A460 + applymovement 255, Movement_16A495 + waitmovement 0 + return + +EventScript_16A46B:: @ 816A46B + applymovement 255, Movement_16A499 + waitmovement 0 + return + +EventScript_16A476:: @ 816A476 + loadword 0, gUnknown_819051C + callstd 4 + closemessage + hidemoneybox + .byte 0 + .byte 0 + applymovement 255, Movement_16A48E + waitmovement 0 + releaseall + end + +Movement_16A48E:: @ 816A48E + step_10 + step_end + +Movement_16A490:: @ 816A490 + step_13 + step_13 + step_1b + step_28 + step_end + +Movement_16A495:: @ 816A495 + step_13 + step_1b + step_28 + step_end + +Movement_16A499:: @ 816A499 + step_1b + step_28 + step_end + +PewterCity_Museum_1F_EventScript_16A49C:: @ 816A49C + loadword 0, gUnknown_81908CD + callstd 2 + end + +PewterCity_Museum_1F_EventScript_16A4A5:: @ 816A4A5 + loadword 0, gUnknown_81906B4 + callstd 2 + end + +PewterCity_Museum_1F_EventScript_16A4AE:: @ 816A4AE + lock + faceplayer + checkflag FLAG_0x25E + goto_if 1, EventScript_16A4FF + loadword 0, gUnknown_8190717 + callstd 4 + checkitemspace ITEM_OLD_AMBER, 1 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16A4F5 + setflag FLAG_0x25E + removeobject 4 + additem ITEM_OLD_AMBER, 1 + loadword 0, gUnknown_8190866 + setorcopyvar VAR_0x8000, 354 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 318 + callstd 9 + release + end + +EventScript_16A4F5:: @ 816A4F5 + loadword 0, gUnknown_81908AE + callstd 4 + release + end + +EventScript_16A4FF:: @ 816A4FF + loadword 0, gUnknown_819088E + callstd 4 + release + end + +PewterCity_Museum_1F_EventScript_16A509:: @ 816A509 + loadword 0, gUnknown_819090A + callstd 2 + end + +PewterCity_Museum_1F_EventScript_16A512:: @ 816A512 + lockall + setvar VAR_0x8004, 142 + setvar VAR_0x8005, 10 + setvar VAR_0x8006, 3 + special sub_809D504 + loadword 0, gUnknown_8190945 + callstd 4 + special sub_809D620 + releaseall + end + +PewterCity_Museum_1F_EventScript_16A532:: @ 816A532 + lockall + setvar VAR_0x8004, 141 + setvar VAR_0x8005, 10 + setvar VAR_0x8006, 3 + special sub_809D504 + loadword 0, gUnknown_8190975 + callstd 4 + special sub_809D620 + releaseall + end diff --git a/data/maps/PewterCity_Museum_2F/scripts.inc b/data/maps/PewterCity_Museum_2F/scripts.inc new file mode 100644 index 000000000..e41268793 --- /dev/null +++ b/data/maps/PewterCity_Museum_2F/scripts.inc @@ -0,0 +1,37 @@ +PewterCity_Museum_2F_MapScripts:: @ 816A552 + .byte 0 + +PewterCity_Museum_2F_EventScript_16A553:: @ 816A553 + loadword 0, gUnknown_8190B30 + callstd 2 + end + +PewterCity_Museum_2F_EventScript_16A55C:: @ 816A55C + loadword 0, gUnknown_8190B80 + callstd 2 + end + +PewterCity_Museum_2F_EventScript_16A565:: @ 816A565 + loadword 0, gUnknown_8190BF3 + callstd 2 + end + +PewterCity_Museum_2F_EventScript_16A56E:: @ 816A56E + loadword 0, gUnknown_8190C1E + callstd 2 + end + +PewterCity_Museum_2F_EventScript_16A577:: @ 816A577 + loadword 0, gUnknown_8190C60 + callstd 2 + end + +PewterCity_Museum_2F_EventScript_16A580:: @ 816A580 + loadword 0, gUnknown_8190C81 + callstd 3 + end + +PewterCity_Museum_2F_EventScript_16A589:: @ 816A589 + loadword 0, gUnknown_8190C8F + callstd 3 + end diff --git a/data/maps/PewterCity_PokemonCenter_1F/scripts.inc b/data/maps/PewterCity_PokemonCenter_1F/scripts.inc new file mode 100644 index 000000000..ffdccea77 --- /dev/null +++ b/data/maps/PewterCity_PokemonCenter_1F/scripts.inc @@ -0,0 +1,49 @@ +PewterCity_PokemonCenter_1F_MapScripts:: @ 816A760 + map_script 3, PewterCity_PokemonCenter_1F_MapScript1_16A76B + map_script 5, PewterCity_PokemonCenter_1F_MapScript2_1BC05C + .byte 0 + +PewterCity_PokemonCenter_1F_MapScript1_16A76B:: @ 816A76B + setrespawn 3 + end + +PewterCity_PokemonCenter_1F_EventScript_16A76F:: @ 816A76F + lock + faceplayer + call EventScript_1A6578 + release + end + +PewterCity_PokemonCenter_1F_EventScript_16A778:: @ 816A778 + loadword 0, gUnknown_81916A9 + callstd 2 + end + +PewterCity_PokemonCenter_1F_EventScript_16A781:: @ 816A781 + lock + faceplayer + fadeoutbgm 0 + playbgm BGM_FRLG_JIGGLYPUFF, 0 + message Text_1916EA + waitmessage + delay 455 + playbgm BGM_FRLG_POKEMON_CENTER, 1 + release + end + +PewterCity_PokemonCenter_1F_EventScript_16A798:: @ 816A798 + loadword 0, gUnknown_8191701 + callstd 2 + end + +PewterCity_PokemonCenter_1F_EventScript_16A7A1:: @ 816A7A1 + lock + loadword 0, gUnknown_8191743 + callstd 4 + release + end + +PewterCity_PokemonCenter_1F_EventScript_16A7AC:: @ 816A7AC + loadword 0, gUnknown_8191780 + callstd 2 + end diff --git a/data/maps/PewterCity_PokemonCenter_2F/scripts.inc b/data/maps/PewterCity_PokemonCenter_2F/scripts.inc new file mode 100644 index 000000000..7f019d782 --- /dev/null +++ b/data/maps/PewterCity_PokemonCenter_2F/scripts.inc @@ -0,0 +1,18 @@ +PewterCity_PokemonCenter_2F_MapScripts:: @ 816A7B5 + map_script 2, PewterCity_PokemonCenter_2F_MapScript1_1BB2A3 + map_script 4, PewterCity_PokemonCenter_2F_MapScript2_1BB1ED + map_script 1, PewterCity_PokemonCenter_2F_MapScript3_1BB237 + map_script 3, PewterCity_PokemonCenter_2F_MapScript4_1BB1B4 + .byte 0 + +PewterCity_PokemonCenter_2F_EventScript_16A7CA:: @ 816A7CA + call EventScript_1BB4A3 + end + +EventScript_16A7D0:: @ 816A7D0 + call EventScript_1BB6AB + end + +EventScript_16A7D6:: @ 816A7D6 + call EventScript_1BB7DE + end diff --git a/data/maps/PokemonLeague_AgathasRoom/scripts.inc b/data/maps/PokemonLeague_AgathasRoom/scripts.inc new file mode 100644 index 000000000..6fce65046 --- /dev/null +++ b/data/maps/PokemonLeague_AgathasRoom/scripts.inc @@ -0,0 +1,110 @@ +PokemonLeague_AgathasRoom_MapScripts:: @ 8162810 + map_script 5, PokemonLeague_AgathasRoom_MapScript1_162825 + map_script 1, PokemonLeague_AgathasRoom_MapScript2_162830 + map_script 4, PokemonLeague_AgathasRoom_MapScript3_162851 + map_script 2, PokemonLeague_AgathasRoom_MapScript4_162860 + .byte 0 + +PokemonLeague_AgathasRoom_MapScript1_162825:: @ 8162825 + setvar VAR_0x8004, 2 + call EventScript_1A75D5 + end + +PokemonLeague_AgathasRoom_MapScript2_162830:: @ 8162830 + checkflag FLAG_0x4BA + call_if 1, EventScript_16284B + compare_var_to_value VAR_0x4068, 3 + call_if 1, EventScript_162845 + end + +EventScript_162845:: @ 8162845 + call EventScript_1A759C + return + +EventScript_16284B:: @ 816284B + call EventScript_1A7538 + return + +PokemonLeague_AgathasRoom_MapScript3_162851:: @ 8162851 + map_script_2 VAR_0x4001, 0, EventScript_16285B + .2byte 0 + +EventScript_16285B:: @ 816285B + turnobject 255, 2 + end + +PokemonLeague_AgathasRoom_MapScript4_162860:: @ 8162860 + map_script_2 VAR_0x4068, 2, EventScript_16286A + .2byte 0 + +EventScript_16286A:: @ 816286A + lockall + call EventScript_1A751F + setvar VAR_0x4068, 3 + releaseall + end + +PokemonLeague_AgathasRoom_EventScript_162877:: @ 8162877 + lock + faceplayer + setvar VAR_0x8004, 11 + setvar VAR_0x8005, 2 + special UpdatePickStateFromSpecialVar8005 + checkflag FLAG_0x4BA + goto_if 1, EventScript_162911 + setvar VAR_0x8004, 11 + setvar VAR_0x8005, 0 + special SetFlavorTextFlagFromSpecialVars + setvar VAR_0x8004, 11 + setvar VAR_0x8005, 4 + special SetFlavorTextFlagFromSpecialVars + setvar VAR_0x8004, 0 + setvar VAR_0x8005, 4 + special SetFlavorTextFlagFromSpecialVars + checkflag 2092 + call_if 0, EventScript_1628E9 + checkflag 2092 + call_if 1, EventScript_1628F2 + setflag FLAG_0x003 + setflag FLAG_0x005 + checkflag 2116 + call_if 0, EventScript_1628FB + checkflag 2116 + call_if 1, EventScript_162906 + clearflag FLAG_0x005 + goto EventScript_16291B + +EventScript_1628E8:: @ 81628E8 + end + +EventScript_1628E9:: @ 81628E9 + loadword 0, gUnknown_817844D + callstd 4 + return + +EventScript_1628F2:: @ 81628F2 + loadword 0, gUnknown_817858D + callstd 4 + return + +EventScript_1628FB:: @ 81628FB + trainerbattle 3, 412, 0, Text_1786D7 + return + +EventScript_162906:: @ 8162906 + trainerbattle 3, 737, 0, Text_1786D7 + return + +EventScript_162911:: @ 8162911 + loadword 0, gUnknown_8178700 + callstd 4 + release + end + +EventScript_16291B:: @ 816291B + setflag FLAG_0x4BA + call EventScript_1A7506 + loadword 0, gUnknown_8178700 + callstd 4 + release + end diff --git a/data/maps/PokemonLeague_BrunosRoom/scripts.inc b/data/maps/PokemonLeague_BrunosRoom/scripts.inc new file mode 100644 index 000000000..41116d4cd --- /dev/null +++ b/data/maps/PokemonLeague_BrunosRoom/scripts.inc @@ -0,0 +1,140 @@ +PokemonLeague_BrunosRoom_MapScripts:: @ 8162685 + map_script 5, PokemonLeague_BrunosRoom_MapScript1_16269A + map_script 1, PokemonLeague_BrunosRoom_MapScript2_1626A5 + map_script 4, PokemonLeague_BrunosRoom_MapScript3_1626C6 + map_script 2, PokemonLeague_BrunosRoom_MapScript4_1626D5 + .byte 0 + +PokemonLeague_BrunosRoom_MapScript1_16269A:: @ 816269A + setvar VAR_0x8004, 1 + call EventScript_1A75D5 + end + +PokemonLeague_BrunosRoom_MapScript2_1626A5:: @ 81626A5 + checkflag FLAG_0x4B9 + call_if 1, EventScript_1626C0 + compare_var_to_value VAR_0x4068, 2 + call_if 1, EventScript_1626BA + end + +EventScript_1626BA:: @ 81626BA + call EventScript_1A759C + return + +EventScript_1626C0:: @ 81626C0 + call EventScript_1A7538 + return + +PokemonLeague_BrunosRoom_MapScript3_1626C6:: @ 81626C6 + map_script_2 VAR_0x4001, 0, EventScript_1626D0 + .2byte 0 + +EventScript_1626D0:: @ 81626D0 + turnobject 255, 2 + end + +PokemonLeague_BrunosRoom_MapScript4_1626D5:: @ 81626D5 + map_script_2 VAR_0x4068, 1, EventScript_1626DF + .2byte 0 + +EventScript_1626DF:: @ 81626DF + lockall + call EventScript_1A751F + setvar VAR_0x4068, 2 + releaseall + end + +PokemonLeague_BrunosRoom_EventScript_1626EC:: @ 81626EC + lock + faceplayer + setvar VAR_0x8004, 10 + setvar VAR_0x8005, 2 + special UpdatePickStateFromSpecialVar8005 + checkflag FLAG_0x4B9 + goto_if 1, EventScript_162779 + setvar VAR_0x8004, 10 + setvar VAR_0x8005, 0 + special SetFlavorTextFlagFromSpecialVars + setvar VAR_0x8004, 10 + setvar VAR_0x8005, 1 + special SetFlavorTextFlagFromSpecialVars + checkflag 2092 + call_if 0, EventScript_162751 + checkflag 2092 + call_if 1, EventScript_16275A + setflag FLAG_0x003 + setflag FLAG_0x005 + checkflag 2116 + call_if 0, EventScript_162763 + checkflag 2116 + call_if 1, EventScript_16276E + clearflag FLAG_0x005 + goto EventScript_1627B0 + +EventScript_162750:: @ 8162750 + end + +EventScript_162751:: @ 8162751 + loadword 0, gUnknown_817820F + callstd 4 + return + +EventScript_16275A:: @ 816275A + loadword 0, gUnknown_817830C + callstd 4 + return + +EventScript_162763:: @ 8162763 + trainerbattle 3, 411, 0, Text_178409 + return + +EventScript_16276E:: @ 816276E + trainerbattle 3, 736, 0, Text_178409 + return + +EventScript_162779:: @ 8162779 + loadword 0, gUnknown_8178420 + callstd 4 + closemessage + compare_var_to_value VAR_FACING, 2 + call_if 1, EventScript_1627FA + compare_var_to_value VAR_FACING, 1 + call_if 1, EventScript_1627EF + compare_var_to_value VAR_FACING, 3 + call_if 1, EventScript_162805 + compare_var_to_value VAR_FACING, 4 + call_if 1, EventScript_162805 + release + end + +EventScript_1627B0:: @ 81627B0 + setflag FLAG_0x4B9 + call EventScript_1A7506 + loadword 0, gUnknown_8178420 + callstd 4 + closemessage + compare_var_to_value VAR_FACING, 2 + call_if 1, EventScript_1627FA + compare_var_to_value VAR_FACING, 1 + call_if 1, EventScript_1627EF + compare_var_to_value VAR_FACING, 3 + call_if 1, EventScript_162805 + compare_var_to_value VAR_FACING, 4 + call_if 1, EventScript_162805 + release + end + +EventScript_1627EF:: @ 81627EF + applymovement 1, Movement_1A75E7 + waitmovement 0 + return + +EventScript_1627FA:: @ 81627FA + applymovement 1, Movement_1A75EB + waitmovement 0 + return + +EventScript_162805:: @ 8162805 + applymovement 1, Movement_1A75ED + waitmovement 0 + return diff --git a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc new file mode 100644 index 000000000..367584edb --- /dev/null +++ b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc @@ -0,0 +1,254 @@ +PokemonLeague_ChampionsRoom_MapScripts:: @ 8162AE2 + map_script 4, PokemonLeague_ChampionsRoom_MapScript1_162B5D + map_script 5, PokemonLeague_ChampionsRoom_MapScript2_162AF2 + map_script 2, PokemonLeague_ChampionsRoom_MapScript3_162B6C + .byte 0 + +PokemonLeague_ChampionsRoom_MapScript2_162AF2:: @ 8162AF2 + setvar VAR_0x8004, 4 + call EventScript_1A75D5 + compare_var_to_value VAR_STARTER_MON, 2 + call_if 1, EventScript_162B1E + compare_var_to_value VAR_STARTER_MON, 1 + call_if 1, EventScript_162B31 + compare_var_to_value VAR_STARTER_MON, 0 + call_if 1, EventScript_162B44 + end + +EventScript_162B1E:: @ 8162B1E + checktrainerflag 438 + goto_if 1, EventScript_162B57 + checktrainerflag 739 + goto_if 1, EventScript_162B57 + return + +EventScript_162B31:: @ 8162B31 + checktrainerflag 439 + goto_if 1, EventScript_162B57 + checktrainerflag 740 + goto_if 1, EventScript_162B57 + return + +EventScript_162B44:: @ 8162B44 + checktrainerflag 440 + goto_if 1, EventScript_162B57 + checktrainerflag 741 + goto_if 1, EventScript_162B57 + return + +EventScript_162B57:: @ 8162B57 + setvar VAR_0x4001, 1 + return + +PokemonLeague_ChampionsRoom_MapScript1_162B5D:: @ 8162B5D + map_script_2 VAR_0x4001, 0, EventScript_162B67 + .2byte 0 + +EventScript_162B67:: @ 8162B67 + turnobject 255, 2 + end + +PokemonLeague_ChampionsRoom_MapScript3_162B6C:: @ 8162B6C + map_script_2 VAR_0x4001, 0, EventScript_162B76 + .2byte 0 + +EventScript_162B76:: @ 8162B76 + lockall + textcolor 0 + setflag FLAG_0x002 + applymovement 255, Movement_162D07 + waitmovement 0 + delay 20 + checkflag 2092 + call_if 0, EventScript_162CB3 + checkflag 2092 + call_if 1, EventScript_162CBC + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_162C68 + setflag FLAG_0x003 + setflag FLAG_0x005 + savebgm BGM_FRLG_KACHI_LEADER + checkflag 2116 + call_if 0, EventScript_162C6F + checkflag 2116 + call_if 1, EventScript_162C91 + setflag FLAG_0x004 + clearflag FLAG_0x005 + setflag FLAG_0x4BC + setflag FLAG_0x004 + loadword 0, gUnknown_8178F2F + callstd 4 + playbgm BGM_FRLG_HALL_OF_FAME_PALLET_TOWN, 0 + addobject 2 + loadword 0, gUnknown_8178FC6 + callstd 4 + closemessage + applymovement 255, Movement_162D1F + applymovement 1, Movement_162D41 + applymovement 2, Movement_162D2A + waitmovement 0 + delay 25 + specialvar VAR_RESULT, ScrSpecial_GetStarter + getspeciesname 0, 32781 + loadword 0, gUnknown_8178FCF + callstd 4 + applymovement 2, Movement_1A75EB + applymovement 1, Movement_1A75E7 + waitmovement 0 + loadword 0, gUnknown_817908F + callstd 4 + closemessage + applymovement 2, Movement_1A75ED + waitmovement 0 + delay 20 + loadword 0, gUnknown_81791A3 + callstd 4 + closemessage + delay 13 + applymovement 2, Movement_162D37 + applymovement 255, Movement_162D12 + waitmovement 0 + setvar VAR_0x4001, 1 + warp MAP_POKEMONLEAGUE_HALLOFFAME, 255, 5, 12 + waitstate + releaseall + end + +EventScript_162C68:: @ 8162C68 + call EventScript_162B57 + releaseall + end + +EventScript_162C6F:: @ 8162C6F + compare_var_to_value VAR_STARTER_MON, 2 + call_if 1, EventScript_162CC5 + compare_var_to_value VAR_STARTER_MON, 1 + call_if 1, EventScript_162CD0 + compare_var_to_value VAR_STARTER_MON, 0 + call_if 1, EventScript_162CDB + return + +EventScript_162C91:: @ 8162C91 + compare_var_to_value VAR_STARTER_MON, 2 + call_if 1, EventScript_162CE6 + compare_var_to_value VAR_STARTER_MON, 1 + call_if 1, EventScript_162CF1 + compare_var_to_value VAR_STARTER_MON, 0 + call_if 1, EventScript_162CFC + return + +EventScript_162CB3:: @ 8162CB3 + loadword 0, gUnknown_8178B6C + callstd 4 + return + +EventScript_162CBC:: @ 8162CBC + loadword 0, gUnknown_8178CD4 + callstd 4 + return + +EventScript_162CC5:: @ 8162CC5 + trainerbattle 3, 438, 0, Text_178E3F + return + +EventScript_162CD0:: @ 8162CD0 + trainerbattle 3, 439, 0, Text_178E3F + return + +EventScript_162CDB:: @ 8162CDB + trainerbattle 3, 440, 0, Text_178E3F + return + +EventScript_162CE6:: @ 8162CE6 + trainerbattle 3, 739, 0, Text_178E3F + return + +EventScript_162CF1:: @ 8162CF1 + trainerbattle 3, 740, 0, Text_178E3F + return + +EventScript_162CFC:: @ 8162CFC + trainerbattle 3, 741, 0, Text_178E3F + return + +Movement_162D07:: @ 8162D07 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_end + +Movement_162D12:: @ 8162D12 + step_1c + step_12 + step_11 + step_11 + step_11 + step_13 + step_11 + step_11 + step_11 + step_11 + step_1b + step_60 + step_end + +Movement_162D1F:: @ 8162D1F + step_1b + step_2d + step_1c + step_1c + step_1c + step_1c + step_1c + step_1c + step_1c + step_2f + step_end + +Movement_162D2A:: @ 8162D2A + step_1c + step_1c + step_11 + step_11 + step_11 + step_11 + step_11 + step_12 + step_11 + step_11 + step_2d + step_1c + step_end + +Movement_162D37:: @ 8162D37 + step_11 + step_11 + step_13 + step_11 + step_11 + step_11 + step_11 + step_1b + step_60 + step_end + +Movement_162D41:: @ 8162D41 + step_1c + step_1c + step_1c + step_1c + step_1c + step_1c + step_1c + step_1c + step_1c + step_2f + step_end diff --git a/data/maps/PokemonLeague_HallOfFame/scripts.inc b/data/maps/PokemonLeague_HallOfFame/scripts.inc new file mode 100644 index 000000000..2fd41e840 --- /dev/null +++ b/data/maps/PokemonLeague_HallOfFame/scripts.inc @@ -0,0 +1,55 @@ +PokemonLeague_HallOfFame_MapScripts:: @ 8162D4C + map_script 2, PokemonLeague_HallOfFame_MapScript1_162D66 + map_script 4, PokemonLeague_HallOfFame_MapScript2_162D57 + .byte 0 + +PokemonLeague_HallOfFame_MapScript2_162D57:: @ 8162D57 + map_script_2 VAR_0x4001, 0, EventScript_162D61 + .2byte 0 + +EventScript_162D61:: @ 8162D61 + turnobject 255, 2 + end + +PokemonLeague_HallOfFame_MapScript1_162D66:: @ 8162D66 + map_script_2 VAR_0x4001, 0, EventScript_162D70 + .2byte 0 + +EventScript_162D70:: @ 8162D70 + lockall + textcolor 0 + applymovement 255, Movement_162DCD + waitmovement 0 + applymovement 1, Movement_1A75E7 + applymovement 255, Movement_1A75EB + waitmovement 0 + delay 18 + loadword 0, gUnknown_817922F + callstd 4 + closemessage + applymovement 1, Movement_1A75E9 + applymovement 255, Movement_1A75E9 + waitmovement 0 + delay 20 + dofieldeffect 62 + waitfieldeffect 62 + delay 40 + setvar VAR_0x4001, 1 + call EventScript_1A651A + setrespawn 1 + fadescreenspeed 1, 24 + special sub_80CA2E4 + waitstate + releaseall + end + +Movement_162DCD:: @ 8162DCD + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_end diff --git a/data/maps/PokemonLeague_LancesRoom/scripts.inc b/data/maps/PokemonLeague_LancesRoom/scripts.inc new file mode 100644 index 000000000..f3a181319 --- /dev/null +++ b/data/maps/PokemonLeague_LancesRoom/scripts.inc @@ -0,0 +1,184 @@ +PokemonLeague_LancesRoom_MapScripts:: @ 816292D + map_script 5, PokemonLeague_LancesRoom_MapScript1_162942 + map_script 1, PokemonLeague_LancesRoom_MapScript2_16294D + map_script 4, PokemonLeague_LancesRoom_MapScript3_16296E + map_script 2, PokemonLeague_LancesRoom_MapScript4_16297D + .byte 0 + +PokemonLeague_LancesRoom_MapScript1_162942:: @ 8162942 + setvar VAR_0x8004, 3 + call EventScript_1A75D5 + end + +PokemonLeague_LancesRoom_MapScript2_16294D:: @ 816294D + compare_var_to_value VAR_0x4068, 4 + call_if 1, EventScript_162962 + checkflag FLAG_0x4BB + call_if 1, EventScript_162968 + end + +EventScript_162962:: @ 8162962 + call EventScript_1629A8 + return + +EventScript_162968:: @ 8162968 + call EventScript_1A7589 + return + +PokemonLeague_LancesRoom_MapScript3_16296E:: @ 816296E + map_script_2 VAR_0x4001, 0, EventScript_162978 + .2byte 0 + +EventScript_162978:: @ 8162978 + turnobject 255, 2 + end + +PokemonLeague_LancesRoom_MapScript4_16297D:: @ 816297D + map_script_2 VAR_0x4068, 3, EventScript_162987 + .2byte 0 + +EventScript_162987:: @ 8162987 + lockall + applymovement 255, Movement_1629F1 + waitmovement 0 + setflag FLAG_0x002 + call EventScript_1629A8 + playse SE_FU_ZAKU2 + special DrawWholeMapView + waitse + setvar VAR_0x4068, 4 + releaseall + end + +EventScript_1629A8:: @ 81629A8 + setmetatile 5, 14, 669, 1 + setmetatile 6, 14, 670, 1 + setmetatile 7, 14, 671, 1 + setmetatile 5, 15, 677, 1 + setmetatile 6, 15, 678, 1 + setmetatile 7, 15, 679, 1 + setmetatile 6, 16, 785, 0 + setmetatile 7, 16, 785, 0 + return + +Movement_1629F1:: @ 81629F1 + step_11 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_end + +PokemonLeague_LancesRoom_EventScript_162A14:: @ 8162A14 + lock + faceplayer + setvar VAR_0x8004, 12 + setvar VAR_0x8005, 2 + special UpdatePickStateFromSpecialVar8005 + checkflag FLAG_0x4BB + goto_if 1, EventScript_162AA1 + setvar VAR_0x8004, 12 + setvar VAR_0x8005, 0 + special SetFlavorTextFlagFromSpecialVars + setvar VAR_0x8004, 12 + setvar VAR_0x8005, 1 + special SetFlavorTextFlagFromSpecialVars + checkflag 2092 + call_if 0, EventScript_162A79 + checkflag 2092 + call_if 1, EventScript_162A82 + setflag FLAG_0x003 + setflag FLAG_0x005 + checkflag 2116 + call_if 0, EventScript_162A8B + checkflag 2116 + call_if 1, EventScript_162A96 + clearflag FLAG_0x005 + goto EventScript_162AAB + +EventScript_162A78:: @ 8162A78 + end + +EventScript_162A79:: @ 8162A79 + loadword 0, gUnknown_8178764 + callstd 4 + return + +EventScript_162A82:: @ 8162A82 + loadword 0, gUnknown_81788BD + callstd 4 + return + +EventScript_162A8B:: @ 8162A8B + trainerbattle 3, 413, 0, Text_178A15 + return + +EventScript_162A96:: @ 8162A96 + trainerbattle 3, 738, 0, Text_178A15 + return + +EventScript_162AA1:: @ 8162AA1 + loadword 0, gUnknown_8178A52 + callstd 4 + release + end + +EventScript_162AAB:: @ 8162AAB + setvar VAR_0x8004, 0 + special sub_8113530 + setflag FLAG_0x4BB + call EventScript_1A7563 + loadword 0, gUnknown_8178A52 + callstd 4 + closemessage + release + end + +EventScript_162AC6:: @ 8162AC6 + applymovement 1, Movement_162ADC + waitmovement 0 + return + +EventScript_162AD1:: @ 8162AD1 + applymovement 1, Movement_162ADF + waitmovement 0 + return + +Movement_162ADC:: @ 8162ADC + step_12 + step_30 + step_end + +Movement_162ADF:: @ 8162ADF + step_13 + step_2f + step_end diff --git a/data/maps/PokemonLeague_LoreleisRoom/scripts.inc b/data/maps/PokemonLeague_LoreleisRoom/scripts.inc new file mode 100644 index 000000000..9455e97ed --- /dev/null +++ b/data/maps/PokemonLeague_LoreleisRoom/scripts.inc @@ -0,0 +1,112 @@ +PokemonLeague_LoreleisRoom_MapScripts:: @ 816256C + map_script 5, PokemonLeague_LoreleisRoom_MapScript1_162586 + map_script 1, PokemonLeague_LoreleisRoom_MapScript2_162591 + map_script 3, PokemonLeague_LoreleisRoom_MapScript3_1625B2 + map_script 4, PokemonLeague_LoreleisRoom_MapScript4_1625B6 + map_script 2, PokemonLeague_LoreleisRoom_MapScript5_1625C5 + .byte 0 + +PokemonLeague_LoreleisRoom_MapScript1_162586:: @ 8162586 + setvar VAR_0x8004, 0 + call EventScript_1A75D5 + end + +PokemonLeague_LoreleisRoom_MapScript2_162591:: @ 8162591 + checkflag FLAG_0x4B8 + call_if 1, EventScript_1625AC + compare_var_to_value VAR_0x4068, 1 + call_if 1, EventScript_1625A6 + end + +EventScript_1625A6:: @ 81625A6 + call EventScript_1A759C + return + +EventScript_1625AC:: @ 81625AC + call EventScript_1A7538 + return + +PokemonLeague_LoreleisRoom_MapScript3_1625B2:: @ 81625B2 + setworldmapflag 2223 + end + +PokemonLeague_LoreleisRoom_MapScript4_1625B6:: @ 81625B6 + map_script_2 VAR_0x4001, 0, EventScript_1625C0 + .2byte 0 + +EventScript_1625C0:: @ 81625C0 + turnobject 255, 2 + end + +PokemonLeague_LoreleisRoom_MapScript5_1625C5:: @ 81625C5 + map_script_2 VAR_0x4068, 0, EventScript_1625CF + .2byte 0 + +EventScript_1625CF:: @ 81625CF + lockall + call EventScript_1A751F + setvar VAR_0x4068, 1 + releaseall + end + +PokemonLeague_LoreleisRoom_EventScript_1625DC:: @ 81625DC + lock + faceplayer + setvar VAR_0x8004, 9 + setvar VAR_0x8005, 2 + special UpdatePickStateFromSpecialVar8005 + checkflag FLAG_0x4B8 + goto_if 1, EventScript_162669 + setvar VAR_0x8004, 9 + setvar VAR_0x8005, 0 + special SetFlavorTextFlagFromSpecialVars + setvar VAR_0x8004, 9 + setvar VAR_0x8005, 1 + special SetFlavorTextFlagFromSpecialVars + checkflag 2116 + call_if 0, EventScript_162641 + checkflag 2116 + call_if 1, EventScript_16264A + setflag FLAG_0x003 + setflag FLAG_0x005 + checkflag 2116 + call_if 0, EventScript_162653 + checkflag 2116 + call_if 1, EventScript_16265E + clearflag FLAG_0x005 + goto EventScript_162673 + +EventScript_162640:: @ 8162640 + end + +EventScript_162641:: @ 8162641 + loadword 0, gUnknown_8177FA4 + callstd 4 + return + +EventScript_16264A:: @ 816264A + loadword 0, gUnknown_8178089 + callstd 4 + return + +EventScript_162653:: @ 8162653 + trainerbattle 3, 410, 0, Text_178191 + return + +EventScript_16265E:: @ 816265E + trainerbattle 3, 735, 0, Text_178191 + return + +EventScript_162669:: @ 8162669 + loadword 0, gUnknown_81781B0 + callstd 4 + release + end + +EventScript_162673:: @ 8162673 + setflag FLAG_0x4B8 + call EventScript_1A7506 + loadword 0, gUnknown_81781B0 + callstd 4 + release + end diff --git a/data/maps/PokemonMansion_1F/scripts.inc b/data/maps/PokemonMansion_1F/scripts.inc new file mode 100644 index 000000000..d56f4ed71 --- /dev/null +++ b/data/maps/PokemonMansion_1F/scripts.inc @@ -0,0 +1,35 @@ +PokemonMansion_1F_MapScripts:: @ 81621F9 + map_script 1, PokemonMansion_1F_MapScript1_162204 + map_script 3, PokemonMansion_1F_MapScript2_16220E + .byte 0 + +PokemonMansion_1F_MapScript1_162204:: @ 8162204 + checkflag FLAG_0x26C + call_if 1, EventScript_1A7B7A + end + +PokemonMansion_1F_MapScript2_16220E:: @ 816220E + setworldmapflag 2221 + end + +PokemonMansion_1F_EventScript_162212:: @ 8162212 + lockall + setvar VAR_0x8004, 0 + call EventScript_1A7AE2 + playse SE_FU_ZAKU2 + special DrawWholeMapView + waitse + releaseall + end + +PokemonMansion_1F_EventScript_162226:: @ 8162226 + trainerbattle 0, 335, 0, Text_177364, Text_177391 + loadword 0, gUnknown_8177397 + callstd 6 + end + +PokemonMansion_1F_EventScript_16223D:: @ 816223D + trainerbattle 0, 534, 0, Text_1773C6, Text_1773FD + loadword 0, gUnknown_8177418 + callstd 6 + end diff --git a/data/maps/PokemonMansion_2F/scripts.inc b/data/maps/PokemonMansion_2F/scripts.inc new file mode 100644 index 000000000..1181e8c86 --- /dev/null +++ b/data/maps/PokemonMansion_2F/scripts.inc @@ -0,0 +1,34 @@ +PokemonMansion_2F_MapScripts:: @ 8162254 + map_script 1, PokemonMansion_2F_MapScript1_16225A + .byte 0 + +PokemonMansion_2F_MapScript1_16225A:: @ 816225A + checkflag FLAG_0x26C + call_if 1, EventScript_1A7D3E + end + +PokemonMansion_2F_EventScript_162264:: @ 8162264 + lockall + setvar VAR_0x8004, 1 + call EventScript_1A7AE2 + playse SE_FU_ZAKU2 + special DrawWholeMapView + waitse + releaseall + end + +PokemonMansion_2F_EventScript_162278:: @ 8162278 + loadword 0, gUnknown_817751F + callstd 3 + end + +PokemonMansion_2F_EventScript_162281:: @ 8162281 + loadword 0, gUnknown_8177574 + callstd 3 + end + +PokemonMansion_2F_EventScript_16228A:: @ 816228A + trainerbattle 0, 216, 0, Text_177498, Text_1774CB + loadword 0, gUnknown_81774E3 + callstd 6 + end diff --git a/data/maps/PokemonMansion_3F/scripts.inc b/data/maps/PokemonMansion_3F/scripts.inc new file mode 100644 index 000000000..291dd4649 --- /dev/null +++ b/data/maps/PokemonMansion_3F/scripts.inc @@ -0,0 +1,35 @@ +PokemonMansion_3F_MapScripts:: @ 81622A1 + map_script 1, PokemonMansion_3F_MapScript1_1622A7 + .byte 0 + +PokemonMansion_3F_MapScript1_1622A7:: @ 81622A7 + checkflag FLAG_0x26C + call_if 1, EventScript_1A7E72 + end + +PokemonMansion_3F_EventScript_1622B1:: @ 81622B1 + lockall + setvar VAR_0x8004, 2 + call EventScript_1A7AE2 + playse SE_FU_ZAKU2 + special DrawWholeMapView + waitse + releaseall + end + +PokemonMansion_3F_EventScript_1622C5:: @ 81622C5 + loadword 0, gUnknown_8177685 + callstd 3 + end + +PokemonMansion_3F_EventScript_1622CE:: @ 81622CE + trainerbattle 0, 218, 0, Text_1775E7, Text_177602 + loadword 0, gUnknown_8177608 + callstd 6 + end + +PokemonMansion_3F_EventScript_1622E5:: @ 81622E5 + trainerbattle 0, 346, 0, Text_177628, Text_177643 + loadword 0, gUnknown_8177657 + callstd 6 + end diff --git a/data/maps/PokemonMansion_B1F/scripts.inc b/data/maps/PokemonMansion_B1F/scripts.inc new file mode 100644 index 000000000..3a5b974bd --- /dev/null +++ b/data/maps/PokemonMansion_B1F/scripts.inc @@ -0,0 +1,35 @@ +PokemonMansion_B1F_MapScripts:: @ 81622FC + map_script 1, PokemonMansion_B1F_MapScript1_162302 + .byte 0 + +PokemonMansion_B1F_MapScript1_162302:: @ 8162302 + checkflag FLAG_0x26C + call_if 1, EventScript_1A7F4C + end + +PokemonMansion_B1F_EventScript_16230C:: @ 816230C + lockall + setvar VAR_0x8004, 3 + call EventScript_1A7AE2 + playse SE_FU_ZAKU2 + special DrawWholeMapView + waitse + releaseall + end + +PokemonMansion_B1F_EventScript_162320:: @ 8162320 + loadword 0, gUnknown_8177798 + callstd 3 + end + +PokemonMansion_B1F_EventScript_162329:: @ 8162329 + trainerbattle 0, 219, 0, Text_1776C0, Text_1776D7 + loadword 0, gUnknown_81776DE + callstd 6 + end + +PokemonMansion_B1F_EventScript_162340:: @ 8162340 + trainerbattle 0, 347, 0, Text_177720, Text_177757 + loadword 0, gUnknown_817776A + callstd 6 + end diff --git a/data/maps/PokemonTower_1F/scripts.inc b/data/maps/PokemonTower_1F/scripts.inc new file mode 100644 index 000000000..534901cf6 --- /dev/null +++ b/data/maps/PokemonTower_1F/scripts.inc @@ -0,0 +1,44 @@ +PokemonTower_1F_MapScripts:: @ 8163235 + map_script 3, PokemonTower_1F_MapScript1_16323B + .byte 0 + +PokemonTower_1F_MapScript1_16323B:: @ 816323B + setworldmapflag 2226 + end + +PokemonTower_1F_EventScript_16323F:: @ 816323F + loadword 0, gUnknown_8179CAB + callstd 2 + end + +PokemonTower_1F_EventScript_163248:: @ 8163248 + loadword 0, gUnknown_8179C8C + callstd 2 + end + +PokemonTower_1F_EventScript_163251:: @ 8163251 + loadword 0, gUnknown_8179C41 + callstd 2 + end + +PokemonTower_1F_EventScript_16325A:: @ 816325A + lock + faceplayer + checkplayergender + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_163272 + loadword 0, gUnknown_8179BFC + callstd 4 + release + end + +EventScript_163272:: @ 8163272 + loadword 0, gUnknown_8179BB8 + callstd 4 + release + end + +PokemonTower_1F_EventScript_16327C:: @ 816327C + loadword 0, gUnknown_8179B7A + callstd 2 + end diff --git a/data/maps/PokemonTower_2F/scripts.inc b/data/maps/PokemonTower_2F/scripts.inc new file mode 100644 index 000000000..68c3be0c0 --- /dev/null +++ b/data/maps/PokemonTower_2F/scripts.inc @@ -0,0 +1,111 @@ +PokemonTower_2F_MapScripts:: @ 8163285 + .byte 0 + +PokemonTower_2F_EventScript_163286:: @ 8163286 + loadword 0, gUnknown_8179EAE + callstd 2 + end + +PokemonTower_2F_EventScript_16328F:: @ 816328F + lockall + setvar VAR_0x4001, 0 + goto EventScript_1632A7 + end + +PokemonTower_2F_EventScript_16329B:: @ 816329B + lockall + setvar VAR_0x4001, 1 + goto EventScript_1632A7 + end + +EventScript_1632A7:: @ 81632A7 + textcolor 0 + playbgm BGM_FRLG_RIVAL, 0 + compare_var_to_value VAR_0x4001, 0 + call_if 1, EventScript_163339 + compare_var_to_value VAR_0x4001, 1 + call_if 1, EventScript_16334B + applymovement 1, Movement_1A75DB + waitmovement 0 + applymovement 1, Movement_1A75DD + waitmovement 0 + loadword 0, gUnknown_8179CFF + callstd 4 + setvar VAR_LAST_TALKED, 1 + compare_var_to_value VAR_STARTER_MON, 2 + call_if 1, EventScript_16335D + compare_var_to_value VAR_STARTER_MON, 1 + call_if 1, EventScript_163368 + compare_var_to_value VAR_STARTER_MON, 0 + call_if 1, EventScript_163373 + loadword 0, gUnknown_8179DD4 + callstd 4 + closemessage + playbgm BGM_FRLG_RIVAL_POSTBATTLE, 0 + compare_var_to_value VAR_0x4001, 0 + call_if 1, EventScript_16337E + compare_var_to_value VAR_0x4001, 1 + call_if 1, EventScript_163389 + playse SE_KAIDAN + delay 25 + fadedefaultbgm + removeobject 1 + setvar VAR_0x405D, 1 + releaseall + end + +EventScript_163339:: @ 8163339 + applymovement 1, Movement_1A75EB + applymovement 255, Movement_1A75E7 + waitmovement 0 + return + +EventScript_16334B:: @ 816334B + applymovement 1, Movement_1A75ED + applymovement 255, Movement_1A75E9 + waitmovement 0 + return + +EventScript_16335D:: @ 816335D + trainerbattle 3, 429, 0, Text_179D73 + return + +EventScript_163368:: @ 8163368 + trainerbattle 3, 430, 0, Text_179D73 + return + +EventScript_163373:: @ 8163373 + trainerbattle 3, 431, 0, Text_179D73 + return + +EventScript_16337E:: @ 816337E + applymovement 1, Movement_163394 + waitmovement 0 + return + +EventScript_163389:: @ 8163389 + applymovement 1, Movement_16339D + waitmovement 0 + return + +Movement_163394:: @ 8163394 + step_10 + step_13 + step_13 + step_10 + step_10 + step_10 + step_10 + step_30 + step_end + +Movement_16339D:: @ 816339D + step_13 + step_13 + step_10 + step_10 + step_10 + step_10 + step_10 + step_30 + step_end diff --git a/data/maps/PokemonTower_3F/scripts.inc b/data/maps/PokemonTower_3F/scripts.inc new file mode 100644 index 000000000..69ad8edac --- /dev/null +++ b/data/maps/PokemonTower_3F/scripts.inc @@ -0,0 +1,20 @@ +PokemonTower_3F_MapScripts:: @ 81633A6 + .byte 0 + +PokemonTower_3F_EventScript_1633A7:: @ 81633A7 + trainerbattle 0, 441, 0, Text_179FA0, Text_179FBC + loadword 0, gUnknown_8179FD3 + callstd 6 + end + +PokemonTower_3F_EventScript_1633BE:: @ 81633BE + trainerbattle 0, 442, 0, Text_179F62, Text_179F72 + loadword 0, gUnknown_8179F88 + callstd 6 + end + +PokemonTower_3F_EventScript_1633D5:: @ 81633D5 + trainerbattle 0, 443, 0, Text_179F09, Text_179F21 + loadword 0, gUnknown_8179F31 + callstd 6 + end diff --git a/data/maps/PokemonTower_4F/scripts.inc b/data/maps/PokemonTower_4F/scripts.inc new file mode 100644 index 000000000..ada885b73 --- /dev/null +++ b/data/maps/PokemonTower_4F/scripts.inc @@ -0,0 +1,20 @@ +PokemonTower_4F_MapScripts:: @ 81633EC + .byte 0 + +PokemonTower_4F_EventScript_1633ED:: @ 81633ED + trainerbattle 0, 444, 0, Text_17A004, Text_17A017 + loadword 0, gUnknown_817A02B + callstd 6 + end + +PokemonTower_4F_EventScript_163404:: @ 8163404 + trainerbattle 0, 445, 0, Text_17A046, Text_17A061 + loadword 0, gUnknown_817A067 + callstd 6 + end + +PokemonTower_4F_EventScript_16341B:: @ 816341B + trainerbattle 0, 446, 0, Text_17A096, Text_17A0AB + loadword 0, gUnknown_817A0BB + callstd 6 + end diff --git a/data/maps/PokemonTower_5F/scripts.inc b/data/maps/PokemonTower_5F/scripts.inc new file mode 100644 index 000000000..c7a7e7512 --- /dev/null +++ b/data/maps/PokemonTower_5F/scripts.inc @@ -0,0 +1,48 @@ +PokemonTower_5F_MapScripts:: @ 8163432 + .byte 0 + +PokemonTower_5F_EventScript_163433:: @ 8163433 + loadword 0, gUnknown_817A0E3 + callstd 2 + end + +PokemonTower_5F_EventScript_16343C:: @ 816343C + lockall + fadescreen 3 + special sp000_heal_pokemon + fadescreen 2 + loadword 0, gUnknown_817A1FA + callstd 4 + setvar VAR_0x4001, 1 + releaseall + end + +PokemonTower_5F_EventScript_163453:: @ 8163453 + lockall + setvar VAR_0x4001, 0 + releaseall + end + +PokemonTower_5F_EventScript_16345B:: @ 816345B + trainerbattle 0, 447, 0, Text_17A11F, Text_17A132 + loadword 0, gUnknown_817A138 + callstd 6 + end + +PokemonTower_5F_EventScript_163472:: @ 8163472 + trainerbattle 0, 448, 0, Text_17A150, Text_17A164 + loadword 0, gUnknown_817A176 + callstd 6 + end + +PokemonTower_5F_EventScript_163489:: @ 8163489 + trainerbattle 0, 449, 0, Text_17A187, Text_17A190 + loadword 0, gUnknown_817A194 + callstd 6 + end + +PokemonTower_5F_EventScript_1634A0:: @ 81634A0 + trainerbattle 0, 450, 0, Text_17A1AA, Text_17A1B7 + loadword 0, gUnknown_817A1BD + callstd 6 + end diff --git a/data/maps/PokemonTower_6F/scripts.inc b/data/maps/PokemonTower_6F/scripts.inc new file mode 100644 index 000000000..17e67b0fa --- /dev/null +++ b/data/maps/PokemonTower_6F/scripts.inc @@ -0,0 +1,56 @@ +PokemonTower_6F_MapScripts:: @ 81634B7 + .byte 0 + +PokemonTower_6F_EventScript_1634B8:: @ 81634B8 + lockall + textcolor 2 + loadword 0, gUnknown_817A2F8 + callstd 4 + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + setwildbattle SPECIES_MAROWAK, 30, ITEM_NONE + special sub_807F904 + waitstate + special sub_8112364 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_1634F5 + applymovement 255, Movement_163512 + waitmovement 0 + releaseall + end + +EventScript_1634F5:: @ 81634F5 + message Text_17A30C + waitmessage + waitse + playmoncry SPECIES_MAROWAK, 0 + waitbuttonpress + waitmoncry + loadword 0, gUnknown_817A342 + callstd 4 + setvar VAR_0x4059, 1 + releaseall + end + +Movement_163512:: @ 8163512 + step_11 + step_end + +PokemonTower_6F_EventScript_163514:: @ 8163514 + trainerbattle 0, 451, 0, Text_17A243, Text_17A253 + loadword 0, gUnknown_817A25A + callstd 6 + end + +PokemonTower_6F_EventScript_16352B:: @ 816352B + trainerbattle 0, 452, 0, Text_17A272, Text_17A27F + loadword 0, gUnknown_817A293 + callstd 6 + end + +PokemonTower_6F_EventScript_163542:: @ 8163542 + trainerbattle 0, 453, 0, Text_17A2C8, Text_17A2DC + loadword 0, gUnknown_817A2E2 + callstd 6 + end diff --git a/data/maps/PokemonTower_7F/scripts.inc b/data/maps/PokemonTower_7F/scripts.inc new file mode 100644 index 000000000..cd3cec22d --- /dev/null +++ b/data/maps/PokemonTower_7F/scripts.inc @@ -0,0 +1,249 @@ +PokemonTower_7F_MapScripts:: @ 8163559 + .byte 0 + +PokemonTower_7F_EventScript_16355A:: @ 816355A + lock + faceplayer + setvar VAR_0x8004, 14 + setvar VAR_0x8005, 2 + special UpdatePickStateFromSpecialVar8005 + setflag FLAG_0x034 + clearflag FLAG_0x035 + setflag FLAG_0x23C + loadword 0, gUnknown_817A529 + callstd 4 + closemessage + warp MAP_LAVENDERTOWN_VOLUNTEERPOKEMONHOUSE, 255, 4, 7 + waitstate + release + end + +PokemonTower_7F_EventScript_163586:: @ 8163586 + trainerbattle 2, 369, 0, Text_17A380, Text_17A3A4, EventScript_1635A1 + loadword 0, gUnknown_817A3AF + callstd 6 + end + +EventScript_1635A1:: @ 81635A1 + loadword 0, gUnknown_817A3AF + callstd 4 + closemessage + getplayerxy VAR_0x8004, VAR_0x8005 + compare_var_to_value VAR_0x8004, 10 + goto_if 1, EventScript_1635E0 + compare_var_to_value VAR_0x8004, 11 + goto_if 1, EventScript_1635F0 + compare_var_to_value VAR_0x8004, 9 + goto_if 1, EventScript_163600 + applymovement 2, Movement_16362C + waitmovement 0 + goto EventScript_163616 + end + +EventScript_1635E0:: @ 81635E0 + applymovement 2, Movement_16361B + waitmovement 0 + goto EventScript_163616 + end + +EventScript_1635F0:: @ 81635F0 + applymovement 2, Movement_163624 + waitmovement 0 + goto EventScript_163616 + end + +EventScript_163600:: @ 8163600 + applymovement 2, Movement_163633 + waitmovement 0 + playse SE_KAIDAN + delay 25 + goto EventScript_163616 + end + +EventScript_163616:: @ 8163616 + removeobject 2 + release + end + +Movement_16361B:: @ 816361B + step_10 + step_13 + step_10 + step_10 + step_10 + step_13 + step_10 + step_10 + step_end + +Movement_163624:: @ 8163624 + step_10 + step_10 + step_10 + step_10 + step_13 + step_10 + step_10 + step_end + +Movement_16362C:: @ 816362C + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_end + +Movement_163633:: @ 8163633 + step_13 + step_10 + step_10 + step_10 + step_10 + step_13 + step_10 + step_10 + step_2f + step_end + +PokemonTower_7F_EventScript_16363D:: @ 816363D + trainerbattle 2, 370, 0, Text_17A3CD, Text_17A466, EventScript_163658 + loadword 0, gUnknown_817A477 + callstd 6 + end + +EventScript_163658:: @ 8163658 + setvar VAR_0x8004, 14 + setvar VAR_0x8005, 1 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_817A477 + callstd 4 + closemessage + getplayerxy VAR_0x8004, VAR_0x8005 + compare_var_to_value VAR_0x8004, 12 + goto_if 1, EventScript_163699 + compare_var_to_value VAR_0x8004, 13 + goto_if 1, EventScript_1636A9 + applymovement 3, Movement_1636C6 + waitmovement 0 + goto EventScript_1636B9 + end + +EventScript_163699:: @ 8163699 + applymovement 3, Movement_1636BE + waitmovement 0 + goto EventScript_1636B9 + end + +EventScript_1636A9:: @ 81636A9 + applymovement 3, Movement_1636CD + waitmovement 0 + goto EventScript_1636B9 + end + +EventScript_1636B9:: @ 81636B9 + removeobject 3 + release + end + +Movement_1636BE:: @ 81636BE + step_10 + step_10 + step_10 + step_12 + step_10 + step_10 + step_10 + step_end + +Movement_1636C6:: @ 81636C6 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_end + +Movement_1636CD:: @ 81636CD + step_12 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_end + +PokemonTower_7F_EventScript_1636D6:: @ 81636D6 + trainerbattle 2, 371, 0, Text_17A4CF, Text_17A4EE, EventScript_1636F1 + loadword 0, gUnknown_817A506 + callstd 6 + end + +EventScript_1636F1:: @ 81636F1 + loadword 0, gUnknown_817A506 + callstd 4 + closemessage + getplayerxy VAR_0x8004, VAR_0x8005 + compare_var_to_value VAR_0x8004, 10 + goto_if 1, EventScript_163725 + compare_var_to_value VAR_0x8004, 9 + goto_if 1, EventScript_163735 + applymovement 4, Movement_163754 + waitmovement 0 + goto EventScript_163745 + end + +EventScript_163725:: @ 8163725 + applymovement 4, Movement_16374C + waitmovement 0 + goto EventScript_163745 + end + +EventScript_163735:: @ 8163735 + applymovement 4, Movement_16375B + waitmovement 0 + goto EventScript_163745 + end + +EventScript_163745:: @ 8163745 + removeobject 4 + release + end + +EventScript_16374A:: @ 816374A + release + end + +Movement_16374C:: @ 816374C + step_10 + step_10 + step_10 + step_10 + step_10 + step_13 + step_10 + step_end + +Movement_163754:: @ 8163754 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_end + +Movement_16375B:: @ 816375B + step_13 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_end diff --git a/data/maps/PowerPlant/scripts.inc b/data/maps/PowerPlant/scripts.inc new file mode 100644 index 000000000..78878b456 --- /dev/null +++ b/data/maps/PowerPlant/scripts.inc @@ -0,0 +1,141 @@ +PowerPlant_MapScripts:: @ 8163764 + map_script 5, PowerPlant_MapScript1_16376F + map_script 3, PowerPlant_MapScript2_16378D + .byte 0 + +PowerPlant_MapScript1_16376F:: @ 816376F + checkflag 2055 + call_if 1, EventScript_163779 + end + +EventScript_163779:: @ 8163779 + specialvar VAR_RESULT, sub_80CA74C + compare_var_to_value VAR_RESULT, 7 + goto_if 5, EventScript_1A77A9 + removeobject VAR_LAST_TALKED + return + +PowerPlant_MapScript2_16378D:: @ 816378D + setworldmapflag 2228 + checkflag FLAG_0x2BF + call_if 0, EventScript_1637AC + checkflag FLAG_0x2D0 + call_if 0, EventScript_1637B0 + checkflag FLAG_0x2D1 + call_if 0, EventScript_1637B4 + end + +EventScript_1637AC:: @ 81637AC + clearflag FLAG_0x05D + return + +EventScript_1637B0:: @ 81637B0 + clearflag FLAG_0x085 + return + +EventScript_1637B4:: @ 81637B4 + clearflag FLAG_0x086 + return + +PowerPlant_EventScript_1637B8:: @ 81637B8 + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + special sub_8112364 + lock + faceplayer + setwildbattle SPECIES_ZAPDOS, 50, ITEM_NONE + waitse + playmoncry SPECIES_ZAPDOS, 2 + message Text_1A6448 + waitmessage + waitmoncry + delay 10 + playbgm BGM_FRLG_LEADER_EYE, 0 + waitbuttonpress + setflag 2055 + special sub_807F9D8 + waitstate + clearflag 2055 + specialvar VAR_RESULT, sub_80CA74C + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16381B + compare_var_to_value VAR_RESULT, 4 + goto_if 1, EventScript_163824 + compare_var_to_value VAR_RESULT, 5 + goto_if 1, EventScript_163824 + setflag FLAG_0x2BF + release + end + +EventScript_16381B:: @ 816381B + setflag FLAG_0x2BF + goto EventScript_1A922D + end + +EventScript_163824:: @ 8163824 + setvar VAR_0x8004, 145 + goto EventScript_1A9236 + end + +PowerPlant_EventScript_16382F:: @ 816382F + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + lock + faceplayer + setwildbattle SPECIES_ELECTRODE, 34, ITEM_NONE + waitse + playmoncry SPECIES_ELECTRODE, 2 + delay 40 + waitmoncry + setflag 2055 + dowildbattle + clearflag 2055 + special sub_8112364 + specialvar VAR_RESULT, sub_80CA74C + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_163884 + compare_var_to_value VAR_RESULT, 4 + goto_if 1, EventScript_163884 + compare_var_to_value VAR_RESULT, 5 + goto_if 1, EventScript_163884 + setflag FLAG_0x2D0 + release + end + +EventScript_163884:: @ 8163884 + setflag FLAG_0x2D0 + goto EventScript_1A922D + end + +PowerPlant_EventScript_16388D:: @ 816388D + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + lock + faceplayer + setwildbattle SPECIES_ELECTRODE, 34, ITEM_NONE + waitse + playmoncry SPECIES_ELECTRODE, 2 + delay 40 + waitmoncry + setflag 2055 + dowildbattle + clearflag 2055 + special sub_8112364 + specialvar VAR_RESULT, sub_80CA74C + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_1638E2 + compare_var_to_value VAR_RESULT, 4 + goto_if 1, EventScript_1638E2 + compare_var_to_value VAR_RESULT, 5 + goto_if 1, EventScript_1638E2 + setflag FLAG_0x2D1 + release + end + +EventScript_1638E2:: @ 81638E2 + setflag FLAG_0x2D1 + goto EventScript_1A922D + end diff --git a/data/maps/RockTunnel_1F/scripts.inc b/data/maps/RockTunnel_1F/scripts.inc new file mode 100644 index 000000000..f45f6d1f0 --- /dev/null +++ b/data/maps/RockTunnel_1F/scripts.inc @@ -0,0 +1,54 @@ +RockTunnel_1F_MapScripts:: @ 8162DD6 + map_script 3, RockTunnel_1F_MapScript1_162DDC + .byte 0 + +RockTunnel_1F_MapScript1_162DDC:: @ 8162DDC + setworldmapflag 2224 + end + +RockTunnel_1F_EventScript_162DE0:: @ 8162DE0 + loadword 0, gUnknown_817962D + callstd 3 + end + +RockTunnel_1F_EventScript_162DE9:: @ 8162DE9 + trainerbattle 0, 192, 0, Text_179366, Text_179388 + loadword 0, gUnknown_8179396 + callstd 6 + end + +RockTunnel_1F_EventScript_162E00:: @ 8162E00 + trainerbattle 0, 193, 0, Text_1793F1, Text_17940E + loadword 0, gUnknown_817943A + callstd 6 + end + +RockTunnel_1F_EventScript_162E17:: @ 8162E17 + trainerbattle 0, 194, 0, Text_17947B, Text_1794AC + loadword 0, gUnknown_81794B4 + callstd 6 + end + +RockTunnel_1F_EventScript_162E2E:: @ 8162E2E + trainerbattle 0, 168, 0, Text_1794D4, Text_1794EE + loadword 0, gUnknown_81794F9 + callstd 6 + end + +RockTunnel_1F_EventScript_162E45:: @ 8162E45 + trainerbattle 0, 476, 0, Text_17951C, Text_179547 + loadword 0, gUnknown_8179558 + callstd 6 + end + +RockTunnel_1F_EventScript_162E5C:: @ 8162E5C + trainerbattle 0, 475, 0, Text_1795E5, Text_179604 + loadword 0, gUnknown_8179613 + callstd 6 + end + +RockTunnel_1F_EventScript_162E73:: @ 8162E73 + trainerbattle 0, 474, 0, Text_179577, Text_1795A1 + loadword 0, gUnknown_81795B5 + callstd 6 + end diff --git a/data/maps/RockTunnel_B1F/scripts.inc b/data/maps/RockTunnel_B1F/scripts.inc new file mode 100644 index 000000000..40cf188f3 --- /dev/null +++ b/data/maps/RockTunnel_B1F/scripts.inc @@ -0,0 +1,50 @@ +RockTunnel_B1F_MapScripts:: @ 8162E8A + .byte 0 + +RockTunnel_B1F_EventScript_162E8B:: @ 8162E8B + trainerbattle 0, 158, 0, Text_179657, Text_1796B9 + loadword 0, gUnknown_81796CE + callstd 6 + end + +RockTunnel_B1F_EventScript_162EA2:: @ 8162EA2 + trainerbattle 0, 159, 0, Text_1798AD, Text_1798DD + loadword 0, gUnknown_81798E9 + callstd 6 + end + +RockTunnel_B1F_EventScript_162EB9:: @ 8162EB9 + trainerbattle 0, 189, 0, Text_1796E1, Text_179700 + loadword 0, gUnknown_8179712 + callstd 6 + end + +RockTunnel_B1F_EventScript_162ED0:: @ 8162ED0 + trainerbattle 0, 190, 0, Text_179829, Text_179856 + loadword 0, gUnknown_817987A + callstd 6 + end + +RockTunnel_B1F_EventScript_162EE7:: @ 8162EE7 + trainerbattle 0, 191, 0, Text_179916, Text_179932 + loadword 0, gUnknown_817993E + callstd 6 + end + +RockTunnel_B1F_EventScript_162EFE:: @ 8162EFE + trainerbattle 0, 164, 0, Text_17973A, Text_17975F + loadword 0, gUnknown_8179777 + callstd 6 + end + +RockTunnel_B1F_EventScript_162F15:: @ 8162F15 + trainerbattle 0, 165, 0, Text_1797A4, Text_1797CB + loadword 0, gUnknown_81797DE + callstd 6 + end + +RockTunnel_B1F_EventScript_162F2C:: @ 8162F2C + trainerbattle 0, 166, 0, Text_179968, Text_179997 + loadword 0, gUnknown_81799AC + callstd 6 + end diff --git a/data/maps/RocketHideout_B1F/scripts.inc b/data/maps/RocketHideout_B1F/scripts.inc new file mode 100644 index 000000000..2704c6b79 --- /dev/null +++ b/data/maps/RocketHideout_B1F/scripts.inc @@ -0,0 +1,69 @@ +RocketHideout_B1F_MapScripts:: @ 8161195 + map_script 1, RocketHideout_B1F_MapScript1_1611A0 + map_script 3, RocketHideout_B1F_MapScript2_1611AA + .byte 0 + +RocketHideout_B1F_MapScript1_1611A0:: @ 81611A0 + checktrainerflag 362 + call_if 0, EventScript_161233 + end + +RocketHideout_B1F_MapScript2_1611AA:: @ 81611AA + setworldmapflag 2219 + end + +RocketHideout_B1F_EventScript_1611AE:: @ 81611AE + trainerbattle 0, 358, 0, Text_174ECA, Text_174EED + loadword 0, gUnknown_8174EFA + callstd 6 + end + +RocketHideout_B1F_EventScript_1611C5:: @ 81611C5 + trainerbattle 0, 359, 0, Text_174F2C, Text_174F60 + loadword 0, gUnknown_8174F66 + callstd 6 + end + +RocketHideout_B1F_EventScript_1611DC:: @ 81611DC + trainerbattle 0, 360, 0, Text_174F94, Text_174FA4 + loadword 0, gUnknown_8174FB3 + callstd 6 + end + +RocketHideout_B1F_EventScript_1611F3:: @ 81611F3 + trainerbattle 0, 361, 0, Text_174FE1, Text_174FF8 + loadword 0, gUnknown_8175007 + callstd 6 + end + +RocketHideout_B1F_EventScript_16120A:: @ 816120A + trainerbattle 2, 362, 0, Text_17503A, Text_17505A, EventScript_161225 + loadword 0, gUnknown_8175060 + callstd 6 + end + +EventScript_161225:: @ 8161225 + call EventScript_16126A + playse SE_FU_ZAKU2 + special DrawWholeMapView + waitse + release + end + +EventScript_161233:: @ 8161233 + setmetatile 20, 19, 718, 1 + setmetatile 21, 19, 719, 1 + setmetatile 20, 20, 726, 1 + setmetatile 21, 20, 727, 1 + setmetatile 20, 21, 642, 0 + setmetatile 21, 21, 642, 0 + return + +EventScript_16126A:: @ 816126A + setmetatile 20, 19, 642, 0 + setmetatile 21, 19, 641, 0 + setmetatile 20, 20, 642, 0 + setmetatile 21, 20, 641, 0 + setmetatile 20, 21, 642, 0 + setmetatile 21, 21, 641, 0 + return diff --git a/data/maps/RocketHideout_B2F/scripts.inc b/data/maps/RocketHideout_B2F/scripts.inc new file mode 100644 index 000000000..e1f54c7ef --- /dev/null +++ b/data/maps/RocketHideout_B2F/scripts.inc @@ -0,0 +1,8 @@ +RocketHideout_B2F_MapScripts:: @ 81612A1 + .byte 0 + +RocketHideout_B2F_EventScript_1612A2:: @ 81612A2 + trainerbattle 0, 363, 0, Text_17508C, Text_1750BF + loadword 0, gUnknown_81750CC + callstd 6 + end diff --git a/data/maps/RocketHideout_B3F/scripts.inc b/data/maps/RocketHideout_B3F/scripts.inc new file mode 100644 index 000000000..b60e71b39 --- /dev/null +++ b/data/maps/RocketHideout_B3F/scripts.inc @@ -0,0 +1,14 @@ +RocketHideout_B3F_MapScripts:: @ 81612B9 + .byte 0 + +RocketHideout_B3F_EventScript_1612BA:: @ 81612BA + trainerbattle 0, 364, 0, Text_17511A, Text_17514A + loadword 0, gUnknown_817515B + callstd 6 + end + +RocketHideout_B3F_EventScript_1612D1:: @ 81612D1 + trainerbattle 0, 365, 0, Text_17519E, Text_1751CE + loadword 0, gUnknown_81751E0 + callstd 6 + end diff --git a/data/maps/RocketHideout_B4F/scripts.inc b/data/maps/RocketHideout_B4F/scripts.inc new file mode 100644 index 000000000..c61e0144c --- /dev/null +++ b/data/maps/RocketHideout_B4F/scripts.inc @@ -0,0 +1,145 @@ +RocketHideout_B4F_MapScripts:: @ 81612E8 + map_script 1, RocketHideout_B4F_MapScript1_1612EE + .byte 0 + +RocketHideout_B4F_MapScript1_1612EE:: @ 81612EE + setvar VAR_0x4001, 0 + checktrainerflag 366 + call_if 1, EventScript_161311 + checktrainerflag 367 + call_if 1, EventScript_161311 + compare_var_to_value VAR_0x4001, 2 + call_if 5, EventScript_16146A + end + +EventScript_161311:: @ 8161311 + addvar VAR_0x4001, 1 + return + +RocketHideout_B4F_EventScript_161317:: @ 8161317 + lock + faceplayer + setvar VAR_0x8004, 15 + setvar VAR_0x8005, 0 + special SetFlavorTextFlagFromSpecialVars + message Text_175226 + waitmessage + playbgm BGM_FRLG_SUSPICIOUS_EYE, 0 + waitbuttonpress + trainerbattle 3, 348, 0, Text_175318 + loadword 0, gUnknown_817532D + callstd 4 + fadescreen 1 + closemessage + removeobject 1 + addobject 2 + clearflag FLAG_0x037 + setflag FLAG_0x05F + setvar VAR_0x8004, 15 + setvar VAR_0x8005, 2 + special UpdatePickStateFromSpecialVar8005 + fadescreen 0 + release + end + +RocketHideout_B4F_EventScript_161363:: @ 8161363 + lock + faceplayer + removeobject 2 + setorcopyvar VAR_0x8000, 359 + setorcopyvar VAR_0x8001, 1 + callstd 0 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_1A6BF9 + release + end + +RocketHideout_B4F_EventScript_161381:: @ 8161381 + trainerbattle 2, 368, 0, Text_175488, Text_1754B9, EventScript_16139D + loadword 0, gUnknown_81754BD + callstd 4 + release + end + +EventScript_16139D:: @ 816139D + loadword 0, gUnknown_81754BD + callstd 4 + addobject 4 + clearflag FLAG_0x036 + release + end + +RocketHideout_B4F_EventScript_1613AD:: @ 81613AD + lock + faceplayer + setflag FLAG_0x2A5 + removeobject 4 + setorcopyvar VAR_0x8000, 356 + setorcopyvar VAR_0x8001, 1 + callstd 0 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_1A6BF9 + release + end + +RocketHideout_B4F_EventScript_1613CE:: @ 81613CE + trainerbattle 2, 366, 0, Text_1753D0, Text_1753FE, EventScript_1613E9 + loadword 0, gUnknown_817540C + callstd 6 + end + +EventScript_1613E9:: @ 81613E9 + setvar VAR_0x4001, 0 + checktrainerflag 366 + call_if 1, EventScript_161311 + checktrainerflag 367 + call_if 1, EventScript_161311 + compare_var_to_value VAR_0x4001, 2 + call_if 1, EventScript_1614A1 + compare_var_to_value VAR_0x4001, 2 + call_if 1, EventScript_161462 + release + end + +RocketHideout_B4F_EventScript_161418:: @ 8161418 + trainerbattle 2, 367, 0, Text_175437, Text_175463, EventScript_161433 + loadword 0, gUnknown_817546A + callstd 6 + end + +EventScript_161433:: @ 8161433 + setvar VAR_0x4001, 0 + checktrainerflag 366 + call_if 1, EventScript_161311 + checktrainerflag 367 + call_if 1, EventScript_161311 + compare_var_to_value VAR_0x4001, 2 + call_if 1, EventScript_1614A1 + compare_var_to_value VAR_0x4001, 2 + call_if 1, EventScript_161462 + release + end + +EventScript_161462:: @ 8161462 + playse SE_FU_ZAKU2 + special DrawWholeMapView + waitse + return + +EventScript_16146A:: @ 816146A + setmetatile 17, 12, 718, 1 + setmetatile 18, 12, 719, 1 + setmetatile 17, 13, 726, 1 + setmetatile 18, 13, 727, 1 + setmetatile 17, 14, 642, 0 + setmetatile 18, 14, 642, 0 + return + +EventScript_1614A1:: @ 81614A1 + setmetatile 17, 12, 642, 0 + setmetatile 18, 12, 641, 0 + setmetatile 17, 13, 642, 0 + setmetatile 18, 13, 641, 0 + setmetatile 17, 14, 642, 0 + setmetatile 18, 14, 641, 0 + return diff --git a/data/maps/RocketHideout_Elevator/scripts.inc b/data/maps/RocketHideout_Elevator/scripts.inc new file mode 100644 index 000000000..eaa62ba75 --- /dev/null +++ b/data/maps/RocketHideout_Elevator/scripts.inc @@ -0,0 +1,115 @@ +RocketHideout_Elevator_MapScripts:: @ 81614D8 + .byte 0 + +RocketHideout_Elevator_EventScript_1614D9:: @ 81614D9 + lockall + checkflag FLAG_0x2A5 + goto_if 0, EventScript_16161B + setvar VAR_0x8004, 2 + checkflag FLAG_0x002 + call_if 0, EventScript_1A7AB9 + copyvar VAR_0x8005, VAR_0x403A + special sub_80CB580 + message Text_1A535C + waitmessage + setvar VAR_0x8004, 2 + specialvar VAR_RESULT, sub_80CB328 + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_161530 + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_16153C + compare_var_to_value VAR_0x8000, 2 + goto_if 1, EventScript_161548 + end + +EventScript_161530:: @ 8161530 + multichoicedefault 0, 0, 42, 0, 0 + goto EventScript_161554 + +EventScript_16153B:: @ 816153B + end + +EventScript_16153C:: @ 816153C + multichoicedefault 0, 0, 42, 1, 0 + goto EventScript_161554 + +EventScript_161547:: @ 8161547 + end + +EventScript_161548:: @ 8161548 + multichoicedefault 0, 0, 42, 2, 0 + goto EventScript_161554 + +EventScript_161553:: @ 8161553 + end + +EventScript_161554:: @ 8161554 + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_161591 + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_1615B9 + compare_var_to_value VAR_0x8000, 2 + goto_if 1, EventScript_1615E1 + compare_var_to_value VAR_0x8000, 3 + goto_if 1, EventScript_161609 + compare_var_to_value VAR_0x8000, 127 + goto_if 1, EventScript_161609 + end + +EventScript_161591:: @ 8161591 + setvar VAR_0x8006, 3 + setdynamicwarp MAP_ROCKETHIDEOUT_B1F, 255, 24, 25 + compare_var_to_value VAR_0x403A, 3 + goto_if 1, EventScript_161609 + call EventScript_16160E + setvar VAR_0x403A, 3 + goto EventScript_161609 + +EventScript_1615B8:: @ 81615B8 + end + +EventScript_1615B9:: @ 81615B9 + setvar VAR_0x8006, 2 + setdynamicwarp MAP_ROCKETHIDEOUT_B2F, 255, 28, 16 + compare_var_to_value VAR_0x403A, 2 + goto_if 1, EventScript_161609 + call EventScript_16160E + setvar VAR_0x403A, 2 + goto EventScript_161609 + +EventScript_1615E0:: @ 81615E0 + end + +EventScript_1615E1:: @ 81615E1 + setvar VAR_0x8006, 0 + setdynamicwarp MAP_ROCKETHIDEOUT_B4F, 255, 20, 23 + compare_var_to_value VAR_0x403A, 0 + goto_if 1, EventScript_161609 + call EventScript_16160E + setvar VAR_0x403A, 0 + goto EventScript_161609 + +EventScript_161608:: @ 8161608 + end + +EventScript_161609:: @ 8161609 + special sub_80CB63C + releaseall + end + +EventScript_16160E:: @ 816160E + special sub_80CB63C + closemessage + waitse + special sub_80CB498 + waitstate + setflag FLAG_0x002 + return + +EventScript_16161B:: @ 816161B + loadword 0, gUnknown_81754DD + callstd 4 + releaseall + end diff --git a/data/maps/Route1/scripts.inc b/data/maps/Route1/scripts.inc new file mode 100644 index 000000000..00cca1d96 --- /dev/null +++ b/data/maps/Route1/scripts.inc @@ -0,0 +1,42 @@ +Route1_MapScripts:: @ 8167EFD + .byte 0 + +Route1_EventScript_167EFE:: @ 8167EFE + lock + faceplayer + checkflag FLAG_0x230 + goto_if 1, EventScript_167F48 + loadword 0, gUnknown_818329D + callstd 4 + textcolor 3 + checkitemspace ITEM_POTION, 1 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_1A6BF9 + getitemname 1, ITEM_POTION + playfanfare MUS_FANFA1 + message Text_1A51F6 + waitmessage + waitfanfare + additem ITEM_POTION, 1 + loadword 0, gUnknown_8183387 + callstd 4 + call EventScript_1A6675 + setflag FLAG_0x230 + release + end + +EventScript_167F48:: @ 8167F48 + loadword 0, gUnknown_8183347 + callstd 4 + release + end + +Route1_EventScript_167F52:: @ 8167F52 + loadword 0, gUnknown_81833B9 + callstd 2 + end + +Route1_EventScript_167F5B:: @ 8167F5B + loadword 0, gUnknown_818343A + callstd 3 + end diff --git a/data/maps/Route10/scripts.inc b/data/maps/Route10/scripts.inc new file mode 100644 index 000000000..b714312a2 --- /dev/null +++ b/data/maps/Route10/scripts.inc @@ -0,0 +1,20 @@ +Route10_MapScripts:: @ 8167FD9 + .byte 0 + +Route10_EventScript_167FDA:: @ 8167FDA + end + +Route10_EventScript_167FDB:: @ 8167FDB + loadword 0, gUnknown_8184EC5 + callstd 3 + end + +Route10_EventScript_167FE4:: @ 8167FE4 + loadword 0, gUnknown_8184EE9 + callstd 3 + end + +Route10_EventScript_167FED:: @ 8167FED + loadword 0, gUnknown_8184EF5 + callstd 3 + end diff --git a/data/maps/Route10_PokemonCenter_1F/scripts.inc b/data/maps/Route10_PokemonCenter_1F/scripts.inc new file mode 100644 index 000000000..b9fbf2cde --- /dev/null +++ b/data/maps/Route10_PokemonCenter_1F/scripts.inc @@ -0,0 +1,75 @@ +Route10_PokemonCenter_1F_MapScripts:: @ 816FC2F + map_script 3, Route10_PokemonCenter_1F_MapScript1_16FC3A + map_script 5, Route10_PokemonCenter_1F_MapScript2_1BC05C + .byte 0 + +Route10_PokemonCenter_1F_MapScript1_16FC3A:: @ 816FC3A + setworldmapflag 2211 + setrespawn 13 + end + +Route10_PokemonCenter_1F_EventScript_16FC41:: @ 816FC41 + lock + faceplayer + call EventScript_1A6578 + release + end + +Route10_PokemonCenter_1F_EventScript_16FC4A:: @ 816FC4A + loadword 0, gUnknown_819E59D + callstd 2 + end + +Route10_PokemonCenter_1F_EventScript_16FC53:: @ 816FC53 + loadword 0, gUnknown_819E523 + callstd 2 + end + +Route10_PokemonCenter_1F_EventScript_16FC5C:: @ 816FC5C + loadword 0, gUnknown_819E5D2 + callstd 2 + end + +Route10_PokemonCenter_1F_EventScript_16FC65:: @ 816FC65 + lock + faceplayer + call EventScript_16FCF1 + checkflag FLAG_0x2FA + goto_if 1, EventScript_16FCE7 + loadword 0, gUnknown_819E5FB + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_1A7AD1 + setvar VAR_0x8004, 0 + specialvar VAR_RESULT, sub_80CA3D8 + getnumberstring 2, VAR_0x8006 + call EventScript_16FCF1 + compare_var_to_value VAR_0x8006, 20 + goto_if 0, EventScript_1A7ABD + loadword 0, gUnknown_819E733 + callstd 4 + checkitemspace ITEM_EVERSTONE, 1 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_1A7AC7 + additem ITEM_EVERSTONE, 1 + loadword 0, gUnknown_819E786 + setorcopyvar VAR_0x8000, 195 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 257 + callstd 9 + setflag FLAG_0x2FA + loadword 0, gUnknown_819E7AF + callstd 4 + release + end + +EventScript_16FCE7:: @ 816FCE7 + loadword 0, gUnknown_819E7AF + callstd 4 + release + end + +EventScript_16FCF1:: @ 816FCF1 + getnumberstring 0, 20 + getitemname 1, ITEM_EVERSTONE + return diff --git a/data/maps/Route10_PokemonCenter_2F/scripts.inc b/data/maps/Route10_PokemonCenter_2F/scripts.inc new file mode 100644 index 000000000..26e646ed0 --- /dev/null +++ b/data/maps/Route10_PokemonCenter_2F/scripts.inc @@ -0,0 +1,18 @@ +Route10_PokemonCenter_2F_MapScripts:: @ 816FCFA + map_script 2, Route10_PokemonCenter_2F_MapScript1_1BB2A3 + map_script 4, Route10_PokemonCenter_2F_MapScript2_1BB1ED + map_script 1, Route10_PokemonCenter_2F_MapScript3_1BB237 + map_script 3, Route10_PokemonCenter_2F_MapScript4_1BB1B4 + .byte 0 + +Route10_PokemonCenter_2F_EventScript_16FD0F:: @ 816FD0F + call EventScript_1BB4A3 + end + +EventScript_16FD15:: @ 816FD15 + call EventScript_1BB6AB + end + +EventScript_16FD1B:: @ 816FD1B + call EventScript_1BB7DE + end diff --git a/data/maps/Route11/scripts.inc b/data/maps/Route11/scripts.inc new file mode 100644 index 000000000..5a369712e --- /dev/null +++ b/data/maps/Route11/scripts.inc @@ -0,0 +1,7 @@ +Route11_MapScripts:: @ 8167FF6 + .byte 0 + +Route11_EventScript_167FF7:: @ 8167FF7 + loadword 0, gUnknown_8185308 + callstd 3 + end diff --git a/data/maps/Route11_EastEntrance_1F/scripts.inc b/data/maps/Route11_EastEntrance_1F/scripts.inc new file mode 100644 index 000000000..af3166665 --- /dev/null +++ b/data/maps/Route11_EastEntrance_1F/scripts.inc @@ -0,0 +1,12 @@ +Route11_EastEntrance_1F_MapScripts:: @ 816FD21 + .byte 0 + +Route11_EastEntrance_1F_EventScript_16FD22:: @ 816FD22 + loadword 0, gUnknown_819E8A6 + callstd 2 + end + +Route11_EastEntrance_1F_EventScript_16FD2B:: @ 816FD2B + loadword 0, gUnknown_819E97B + callstd 2 + end diff --git a/data/maps/Route11_EastEntrance_2F/scripts.inc b/data/maps/Route11_EastEntrance_2F/scripts.inc new file mode 100644 index 000000000..9b4451b23 --- /dev/null +++ b/data/maps/Route11_EastEntrance_2F/scripts.inc @@ -0,0 +1,109 @@ +Route11_EastEntrance_2F_MapScripts:: @ 816FD34 + .byte 0 + +Route11_EastEntrance_2F_EventScript_16FD35:: @ 816FD35 + lockall + checkflag FLAG_0x253 + goto_if 1, EventScript_16FD49 + loadword 0, gUnknown_819EC8A + callstd 4 + releaseall + end + +EventScript_16FD49:: @ 816FD49 + loadword 0, gUnknown_819ECD9 + callstd 4 + releaseall + end + +Route11_EastEntrance_2F_EventScript_16FD53:: @ 816FD53 + loadword 0, gUnknown_819ED1F + callstd 3 + end + +Route11_EastEntrance_2F_EventScript_16FD5C:: @ 816FD5C + lock + faceplayer + setvar VAR_0x8008, 4 + call EventScript_1A8CAD + checkflag FLAG_0x251 + goto_if 1, EventScript_16FDCE + loadword 0, gUnknown_81A597B + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16FDB6 + call EventScript_1A8CBD + compare_var_to_value VAR_0x8004, 6 + goto_if 4, EventScript_16FDB6 + call EventScript_1A8CC9 + compare_var_to_var VAR_RESULT, VAR_0x8009 + goto_if 5, EventScript_16FDC0 + call EventScript_1A8CD9 + loadword 0, gUnknown_81A59DA + callstd 4 + setflag FLAG_0x251 + release + end + +EventScript_16FDB6:: @ 816FDB6 + loadword 0, gUnknown_81A59B6 + callstd 4 + release + end + +EventScript_16FDC0:: @ 816FDC0 + getspeciesname 0, 32777 + loadword 0, gUnknown_81A59C6 + callstd 4 + release + end + +EventScript_16FDCE:: @ 816FDCE + loadword 0, gUnknown_81A59E7 + callstd 4 + release + end + +Route11_EastEntrance_2F_EventScript_16FDD8:: @ 816FDD8 + lock + faceplayer + call EventScript_16FE64 + checkflag FLAG_0x252 + goto_if 1, EventScript_16FE5A + loadword 0, gUnknown_819E9E5 + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_1A7AD1 + setvar VAR_0x8004, 0 + specialvar VAR_RESULT, sub_80CA3D8 + getnumberstring 2, VAR_0x8006 + call EventScript_16FE64 + compare_var_to_value VAR_0x8006, 30 + goto_if 0, EventScript_1A7ABD + loadword 0, gUnknown_819EAE4 + callstd 4 + checkitemspace ITEM_ITEMFINDER, 1 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_1A7AC7 + additem ITEM_ITEMFINDER, 1 + loadword 0, gUnknown_819EB37 + setorcopyvar VAR_0x8000, 261 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 257 + callstd 9 + setflag FLAG_0x252 + loadword 0, gUnknown_819EB59 + callstd 4 + release + end + +EventScript_16FE5A:: @ 816FE5A + loadword 0, gUnknown_819EB59 + callstd 4 + release + end + +EventScript_16FE64:: @ 816FE64 + getnumberstring 0, 30 + getitemname 1, ITEM_ITEMFINDER + return diff --git a/data/maps/Route12/scripts.inc b/data/maps/Route12/scripts.inc new file mode 100644 index 000000000..4f587cdd5 --- /dev/null +++ b/data/maps/Route12/scripts.inc @@ -0,0 +1,72 @@ +Route12_MapScripts:: @ 8168000 + map_script 5, Route12_MapScript1_168006 + .byte 0 + +Route12_MapScript1_168006:: @ 8168006 + checkflag 2055 + call_if 1, EventScript_168010 + end + +EventScript_168010:: @ 8168010 + removeobject VAR_LAST_TALKED + return + +Route12_EventScript_168014:: @ 8168014 + lock + faceplayer + checkflag FLAG_0x23D + goto_if 0, EventScript_168099 + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + special sub_8112364 + loadword 0, gUnknown_81853CC + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16808D + call EventScript_1A924B + setwildbattle SPECIES_SNORLAX, 30, ITEM_NONE + waitse + playmoncry SPECIES_SNORLAX, 2 + delay 40 + waitmoncry + setflag FLAG_0x054 + setflag 2055 + setflag FLAG_0x253 + dowildbattle + clearflag 2055 + specialvar VAR_RESULT, sub_80CA74C + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16808F + compare_var_to_value VAR_RESULT, 4 + goto_if 1, EventScript_16808F + compare_var_to_value VAR_RESULT, 5 + goto_if 1, EventScript_16808F + release + end + +EventScript_16808D:: @ 816808D + release + end + +EventScript_16808F:: @ 816808F + loadword 0, gUnknown_8185383 + callstd 4 + release + end + +EventScript_168099:: @ 8168099 + loadword 0, gUnknown_8185317 + callstd 4 + release + end + +Route12_EventScript_1680A3:: @ 81680A3 + loadword 0, gUnknown_8185797 + callstd 3 + end + +Route12_EventScript_1680AC:: @ 81680AC + loadword 0, gUnknown_81857B3 + callstd 3 + end diff --git a/data/maps/Route12_FishingHouse/scripts.inc b/data/maps/Route12_FishingHouse/scripts.inc new file mode 100644 index 000000000..b1da71b49 --- /dev/null +++ b/data/maps/Route12_FishingHouse/scripts.inc @@ -0,0 +1,137 @@ +Route12_FishingHouse_MapScripts:: @ 816FF0B + .byte 0 + +Route12_FishingHouse_EventScript_16FF0C:: @ 816FF0C + lock + faceplayer + checkflag FLAG_0x255 + goto_if 1, EventScript_16FF7F + loadword 0, gUnknown_819EFE0 + callstd 5 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16FF34 + loadword 0, gUnknown_819F1FA + callstd 4 + release + end + +EventScript_16FF34:: @ 816FF34 + checkitemspace ITEM_SUPER_ROD, 1 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16FF75 + additem ITEM_SUPER_ROD, 1 + loadword 0, gUnknown_819F05B + callstd 4 + loadword 0, gUnknown_819F0B2 + setorcopyvar VAR_0x8000, 264 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 257 + callstd 9 + setflag FLAG_0x255 + loadword 0, gUnknown_819F0EB + callstd 4 + release + end + +EventScript_16FF75:: @ 816FF75 + loadword 0, gUnknown_819F494 + callstd 4 + release + end + +EventScript_16FF7F:: @ 816FF7F + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + special sub_8112364 + setvar VAR_0x8004, 129 + specialvar VAR_RESULT, sub_80CC48C + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16FFF5 + special sub_80A096C + loadword 0, gUnknown_819F2DB + callstd 4 + special sub_80BF8FC + waitstate + copyvar VAR_RESULT, VAR_0x8004 + compare_var_to_value VAR_RESULT, 6 + goto_if 4, EventScript_16FFFF + special sub_80A0984 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_170001 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_17000B + compare_var_to_value VAR_RESULT, 3 + goto_if 1, EventScript_170031 + compare_var_to_value VAR_RESULT, 4 + goto_if 1, EventScript_17001E + release + end + +EventScript_16FFF5:: @ 816FFF5 + loadword 0, gUnknown_819F217 + callstd 4 + release + end + +EventScript_16FFFF:: @ 816FFFF + release + end + +EventScript_170001:: @ 8170001 + loadword 0, gUnknown_819F468 + callstd 4 + release + end + +EventScript_17000B:: @ 817000B + checkflag FLAG_0x29C + goto_if 0, EventScript_170031 + loadword 0, gUnknown_819F40A + callstd 4 + release + end + +EventScript_17001E:: @ 817001E + checkflag FLAG_0x29C + goto_if 0, EventScript_170031 + loadword 0, gUnknown_819F3CB + callstd 4 + release + end + +EventScript_170031:: @ 8170031 + setflag FLAG_0x29C + loadword 0, gUnknown_819F31B + callstd 4 + setorcopyvar VAR_0x8000, 6 + setorcopyvar VAR_0x8001, 1 + callstd 0 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_17005D + loadword 0, gUnknown_819F395 + callstd 4 + release + end + +EventScript_17005D:: @ 817005D + loadword 0, gUnknown_819F494 + callstd 4 + release + end + +Route12_FishingHouse_EventScript_170067:: @ 8170067 + lockall + checkflag FLAG_0x29C + goto_if 1, EventScript_17007B + loadword 0, gUnknown_819F50C + callstd 4 + releaseall + end + +EventScript_17007B:: @ 817007B + special sub_80A096C + loadword 0, gUnknown_819F4CF + callstd 4 + releaseall + end diff --git a/data/maps/Route12_NorthEntrance_1F/scripts.inc b/data/maps/Route12_NorthEntrance_1F/scripts.inc new file mode 100644 index 000000000..19b7315df --- /dev/null +++ b/data/maps/Route12_NorthEntrance_1F/scripts.inc @@ -0,0 +1,7 @@ +Route12_NorthEntrance_1F_MapScripts:: @ 816FE6D + .byte 0 + +Route12_NorthEntrance_1F_EventScript_16FE6E:: @ 816FE6E + loadword 0, gUnknown_819EDA7 + callstd 2 + end diff --git a/data/maps/Route12_NorthEntrance_2F/scripts.inc b/data/maps/Route12_NorthEntrance_2F/scripts.inc new file mode 100644 index 000000000..822f721f5 --- /dev/null +++ b/data/maps/Route12_NorthEntrance_2F/scripts.inc @@ -0,0 +1,59 @@ +Route12_NorthEntrance_2F_MapScripts:: @ 816FE77 + .byte 0 + +Route12_NorthEntrance_2F_EventScript_16FE78:: @ 816FE78 + loadword 0, gUnknown_819EF5D + callstd 3 + end + +Route12_NorthEntrance_2F_EventScript_16FE81:: @ 816FE81 + loadword 0, gUnknown_819EFA0 + callstd 3 + end + +Route12_NorthEntrance_2F_EventScript_16FE8A:: @ 816FE8A + lock + faceplayer + checkflag FLAG_0x25B + goto_if 1, EventScript_16FF01 + checkplayergender + compare_var_to_value VAR_RESULT, 0 + call_if 1, EventScript_16FEE5 + compare_var_to_value VAR_RESULT, 1 + call_if 1, EventScript_16FEEE + checkitemspace ITEM_TM27, 1 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16FEF7 + additem ITEM_TM27, 1 + loadword 0, gUnknown_819EE9F + setorcopyvar VAR_0x8000, 315 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 257 + callstd 9 + loadword 0, gUnknown_819EEC6 + callstd 4 + setflag FLAG_0x25B + release + end + +EventScript_16FEE5:: @ 816FEE5 + loadword 0, gUnknown_819EDE1 + callstd 4 + return + +EventScript_16FEEE:: @ 816FEEE + loadword 0, gUnknown_819EE40 + callstd 4 + return + +EventScript_16FEF7:: @ 816FEF7 + loadword 0, gUnknown_819EF3F + callstd 4 + release + end + +EventScript_16FF01:: @ 816FF01 + loadword 0, gUnknown_819EEC6 + callstd 4 + release + end diff --git a/data/maps/Route13/scripts.inc b/data/maps/Route13/scripts.inc new file mode 100644 index 000000000..a2c8ca7c9 --- /dev/null +++ b/data/maps/Route13/scripts.inc @@ -0,0 +1,17 @@ +Route13_MapScripts:: @ 81680B5 + .byte 0 + +Route13_EventScript_1680B6:: @ 81680B6 + loadword 0, gUnknown_8185DB7 + callstd 3 + end + +Route13_EventScript_1680BF:: @ 81680BF + loadword 0, gUnknown_8185DEF + callstd 3 + end + +Route13_EventScript_1680C8:: @ 81680C8 + loadword 0, gUnknown_8185E2C + callstd 3 + end diff --git a/data/maps/Route14/scripts.inc b/data/maps/Route14/scripts.inc new file mode 100644 index 000000000..20cc90520 --- /dev/null +++ b/data/maps/Route14/scripts.inc @@ -0,0 +1,7 @@ +Route14_MapScripts:: @ 81680D1 + .byte 0 + +Route14_EventScript_1680D2:: @ 81680D2 + loadword 0, gUnknown_8186399 + callstd 3 + end diff --git a/data/maps/Route15/scripts.inc b/data/maps/Route15/scripts.inc new file mode 100644 index 000000000..2f19dbbcc --- /dev/null +++ b/data/maps/Route15/scripts.inc @@ -0,0 +1,7 @@ +Route15_MapScripts:: @ 81680DB + .byte 0 + +Route15_EventScript_1680DC:: @ 81680DC + loadword 0, gUnknown_8186A77 + callstd 3 + end diff --git a/data/maps/Route15_WestEntrance_1F/scripts.inc b/data/maps/Route15_WestEntrance_1F/scripts.inc new file mode 100644 index 000000000..32085e1e7 --- /dev/null +++ b/data/maps/Route15_WestEntrance_1F/scripts.inc @@ -0,0 +1,7 @@ +Route15_WestEntrance_1F_MapScripts:: @ 8170088 + .byte 0 + +Route15_WestEntrance_1F_EventScript_170089:: @ 8170089 + loadword 0, gUnknown_819F560 + callstd 2 + end diff --git a/data/maps/Route15_WestEntrance_2F/scripts.inc b/data/maps/Route15_WestEntrance_2F/scripts.inc new file mode 100644 index 000000000..67ccc5214 --- /dev/null +++ b/data/maps/Route15_WestEntrance_2F/scripts.inc @@ -0,0 +1,64 @@ +Route15_WestEntrance_2F_MapScripts:: @ 8170092 + .byte 0 + +Route15_WestEntrance_2F_EventScript_170093:: @ 8170093 + lockall + loadword 0, gUnknown_819F79C + callstd 4 + drawmonpic SPECIES_ARTICUNO, 10, 3 + delay 20 + waitbuttonpress + erasemonpic + setvar VAR_0x8004, 144 + special sub_80CBDCC + releaseall + end + +Route15_WestEntrance_2F_EventScript_1700B0:: @ 81700B0 + loadword 0, gUnknown_819F7F8 + callstd 3 + end + +Route15_WestEntrance_2F_EventScript_1700B9:: @ 81700B9 + lock + faceplayer + call EventScript_170145 + checkflag FLAG_0x256 + goto_if 1, EventScript_17013B + loadword 0, gUnknown_819F5AB + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_1A7AD1 + setvar VAR_0x8004, 0 + specialvar VAR_RESULT, sub_80CA3D8 + getnumberstring 2, VAR_0x8006 + call EventScript_170145 + compare_var_to_value VAR_0x8006, 50 + goto_if 0, EventScript_1A7ABD + loadword 0, gUnknown_819F6AA + callstd 4 + checkitemspace ITEM_EXP_SHARE, 1 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_1A7AC7 + additem ITEM_EXP_SHARE, 1 + loadword 0, gUnknown_819F6FD + setorcopyvar VAR_0x8000, 182 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 257 + callstd 9 + setflag FLAG_0x256 + loadword 0, gUnknown_819F71F + callstd 4 + release + end + +EventScript_17013B:: @ 817013B + loadword 0, gUnknown_819F71F + callstd 4 + release + end + +EventScript_170145:: @ 8170145 + getnumberstring 0, 50 + getitemname 1, ITEM_EXP_SHARE + return diff --git a/data/maps/Route16/scripts.inc b/data/maps/Route16/scripts.inc new file mode 100644 index 000000000..e06522f56 --- /dev/null +++ b/data/maps/Route16/scripts.inc @@ -0,0 +1,90 @@ +Route16_MapScripts:: @ 81680E5 + map_script 5, Route16_MapScript1_1680F5 + map_script 3, Route16_MapScript2_168103 + map_script 4, Route16_MapScript3_168113 + .byte 0 + +Route16_MapScript1_1680F5:: @ 81680F5 + checkflag 2055 + call_if 1, EventScript_1680FF + end + +EventScript_1680FF:: @ 81680FF + removeobject VAR_LAST_TALKED + return + +Route16_MapScript2_168103:: @ 8168103 + compare_var_to_value VAR_0x405E, 1 + call_if 1, EventScript_16810F + end + +EventScript_16810F:: @ 816810F + setflag 2096 + return + +Route16_MapScript3_168113:: @ 8168113 + map_script_2 VAR_0x405E, 1, EventScript_16811D + .2byte 0 + +EventScript_16811D:: @ 816811D + special sub_80CA630 + end + +Route16_EventScript_168121:: @ 8168121 + lock + faceplayer + checkflag FLAG_0x23D + goto_if 0, EventScript_1681A3 + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + special sub_8112364 + loadword 0, gUnknown_81853CC + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_168197 + call EventScript_1A924B + setwildbattle SPECIES_SNORLAX, 30, ITEM_NONE + waitse + playmoncry SPECIES_SNORLAX, 2 + delay 40 + waitmoncry + setflag FLAG_0x080 + setflag 2055 + dowildbattle + clearflag 2055 + specialvar VAR_RESULT, sub_80CA74C + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_168199 + compare_var_to_value VAR_RESULT, 4 + goto_if 1, EventScript_168199 + compare_var_to_value VAR_RESULT, 5 + goto_if 1, EventScript_168199 + release + end + +EventScript_168197:: @ 8168197 + release + end + +EventScript_168199:: @ 8168199 + loadword 0, gUnknown_8185383 + callstd 4 + release + end + +EventScript_1681A3:: @ 81681A3 + loadword 0, gUnknown_8186F3D + callstd 4 + release + end + +Route16_EventScript_1681AD:: @ 81681AD + loadword 0, gUnknown_8186F7A + callstd 3 + end + +Route16_EventScript_1681B6:: @ 81681B6 + loadword 0, gUnknown_8186F98 + callstd 3 + end diff --git a/data/maps/Route16_House/scripts.inc b/data/maps/Route16_House/scripts.inc new file mode 100644 index 000000000..12a4251d8 --- /dev/null +++ b/data/maps/Route16_House/scripts.inc @@ -0,0 +1,47 @@ +Route16_House_MapScripts:: @ 817014E + .byte 0 + +Route16_House_EventScript_17014F:: @ 817014F + lock + faceplayer + checkflag FLAG_0x238 + goto_if 1, EventScript_1701A5 + loadword 0, gUnknown_819F851 + callstd 4 + checkitemspace ITEM_HM02, 1 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_17019B + additem ITEM_HM02, 1 + loadword 0, gUnknown_819F8C0 + setorcopyvar VAR_0x8000, 340 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 257 + callstd 9 + loadword 0, gUnknown_819F8E0 + callstd 4 + setflag FLAG_0x238 + release + end + +EventScript_17019B:: @ 817019B + loadword 0, gUnknown_819F92D + callstd 4 + release + end + +EventScript_1701A5:: @ 81701A5 + loadword 0, gUnknown_819F8E0 + callstd 4 + release + end + +Route16_House_EventScript_1701AF:: @ 81701AF + lock + faceplayer + waitse + playmoncry SPECIES_FEAROW, 0 + loadword 0, gUnknown_819F94F + callstd 4 + waitmoncry + release + end diff --git a/data/maps/Route16_NorthEntrance_1F/scripts.inc b/data/maps/Route16_NorthEntrance_1F/scripts.inc new file mode 100644 index 000000000..b288d45ce --- /dev/null +++ b/data/maps/Route16_NorthEntrance_1F/scripts.inc @@ -0,0 +1,123 @@ +Route16_NorthEntrance_1F_MapScripts:: @ 81701C2 + map_script 3, Route16_NorthEntrance_1F_MapScript1_1701C8 + .byte 0 + +Route16_NorthEntrance_1F_MapScript1_1701C8:: @ 81701C8 + clearflag 2096 + checkflag FLAG_0x271 + call_if 1, EventScript_1701D5 + end + +EventScript_1701D5:: @ 81701D5 + setvar VAR_0x4001, 1 + return + +Route16_NorthEntrance_1F_EventScript_1701DB:: @ 81701DB + loadword 0, gUnknown_819F98B + callstd 2 + end + +Route16_NorthEntrance_1F_EventScript_1701E4:: @ 81701E4 + lockall + setvar VAR_0x8008, 0 + goto EventScript_170220 + end + +Route16_NorthEntrance_1F_EventScript_1701F0:: @ 81701F0 + lockall + setvar VAR_0x8008, 1 + goto EventScript_170220 + end + +Route16_NorthEntrance_1F_EventScript_1701FC:: @ 81701FC + lockall + setvar VAR_0x8008, 2 + goto EventScript_170220 + end + +Route16_NorthEntrance_1F_EventScript_170208:: @ 8170208 + lockall + setvar VAR_0x8008, 3 + goto EventScript_170220 + end + +Route16_NorthEntrance_1F_EventScript_170214:: @ 8170214 + lockall + setvar VAR_0x8008, 4 + goto EventScript_170220 + end + +EventScript_170220:: @ 8170220 + textcolor 0 + loadword 0, gUnknown_819F9CC + callstd 4 + closemessage + applymovement 255, Movement_1A75E9 + waitmovement 0 + delay 20 + compare_var_to_value VAR_0x8008, 1 + call_if 1, EventScript_170279 + compare_var_to_value VAR_0x8008, 2 + call_if 1, EventScript_170284 + compare_var_to_value VAR_0x8008, 3 + call_if 1, EventScript_17028F + compare_var_to_value VAR_0x8008, 4 + call_if 1, EventScript_17029A + loadword 0, gUnknown_819F95F + callstd 4 + closemessage + applymovement 255, Movement_1702B3 + waitmovement 0 + releaseall + end + +EventScript_170279:: @ 8170279 + applymovement 255, Movement_1702A5 + waitmovement 0 + return + +EventScript_170284:: @ 8170284 + applymovement 255, Movement_1702A7 + waitmovement 0 + return + +EventScript_17028F:: @ 817028F + applymovement 255, Movement_1702AA + waitmovement 0 + return + +EventScript_17029A:: @ 817029A + applymovement 255, Movement_1702AE + waitmovement 0 + return + +Movement_1702A5:: @ 81702A5 + step_11 + step_end + +Movement_1702A7:: @ 81702A7 + step_11 + step_11 + step_end + +Movement_1702AA:: @ 81702AA + step_11 + step_11 + step_11 + step_end + +Movement_1702AE:: @ 81702AE + step_11 + step_11 + step_11 + step_11 + step_end + +Movement_1702B3:: @ 81702B3 + step_13 + step_end + +Route16_NorthEntrance_1F_EventScript_1702B5:: @ 81702B5 + loadword 0, gUnknown_819F9E8 + callstd 2 + end diff --git a/data/maps/Route16_NorthEntrance_2F/scripts.inc b/data/maps/Route16_NorthEntrance_2F/scripts.inc new file mode 100644 index 000000000..3a5a2a48b --- /dev/null +++ b/data/maps/Route16_NorthEntrance_2F/scripts.inc @@ -0,0 +1,66 @@ +Route16_NorthEntrance_2F_MapScripts:: @ 81702BE + .byte 0 + +Route16_NorthEntrance_2F_EventScript_1702BF:: @ 81702BF + loadword 0, gUnknown_819FA07 + callstd 2 + end + +Route16_NorthEntrance_2F_EventScript_1702C8:: @ 81702C8 + loadword 0, gUnknown_819FA41 + callstd 2 + end + +Route16_NorthEntrance_2F_EventScript_1702D1:: @ 81702D1 + loadword 0, gUnknown_819FA6F + callstd 3 + end + +Route16_NorthEntrance_2F_EventScript_1702DA:: @ 81702DA + loadword 0, gUnknown_819FAB9 + callstd 3 + end + +Route16_NorthEntrance_2F_EventScript_1702E3:: @ 81702E3 + lock + faceplayer + call EventScript_17036F + checkflag FLAG_0x2FD + goto_if 1, EventScript_170365 + loadword 0, gUnknown_819FB0E + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_1A7AD1 + setvar VAR_0x8004, 0 + specialvar VAR_RESULT, sub_80CA3D8 + getnumberstring 2, VAR_0x8006 + call EventScript_17036F + compare_var_to_value VAR_0x8006, 40 + goto_if 0, EventScript_1A7ABD + loadword 0, gUnknown_819FC15 + callstd 4 + checkitemspace ITEM_AMULET_COIN, 1 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_1A7AC7 + additem ITEM_AMULET_COIN, 1 + loadword 0, gUnknown_819FC68 + setorcopyvar VAR_0x8000, 189 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 257 + callstd 9 + setflag FLAG_0x2FD + loadword 0, gUnknown_819FC93 + callstd 4 + release + end + +EventScript_170365:: @ 8170365 + loadword 0, gUnknown_819FC93 + callstd 4 + release + end + +EventScript_17036F:: @ 817036F + getnumberstring 0, 40 + getitemname 1, ITEM_AMULET_COIN + return diff --git a/data/maps/Route17/scripts.inc b/data/maps/Route17/scripts.inc new file mode 100644 index 000000000..8278392d0 --- /dev/null +++ b/data/maps/Route17/scripts.inc @@ -0,0 +1,32 @@ +Route17_MapScripts:: @ 81681BF + .byte 0 + +Route17_EventScript_1681C0:: @ 81681C0 + loadword 0, gUnknown_81874E4 + callstd 3 + end + +Route17_EventScript_1681C9:: @ 81681C9 + loadword 0, gUnknown_8187512 + callstd 3 + end + +Route17_EventScript_1681D2:: @ 81681D2 + loadword 0, gUnknown_818757B + callstd 3 + end + +Route17_EventScript_1681DB:: @ 81681DB + loadword 0, gUnknown_81875BE + callstd 3 + end + +Route17_EventScript_1681E4:: @ 81681E4 + loadword 0, gUnknown_81875E3 + callstd 3 + end + +Route17_EventScript_1681ED:: @ 81681ED + loadword 0, gUnknown_8187622 + callstd 3 + end diff --git a/data/maps/Route18/scripts.inc b/data/maps/Route18/scripts.inc new file mode 100644 index 000000000..b7fcc41ab --- /dev/null +++ b/data/maps/Route18/scripts.inc @@ -0,0 +1,31 @@ +Route18_MapScripts:: @ 81681F6 + map_script 3, Route18_MapScript1_168201 + map_script 4, Route18_MapScript2_168211 + .byte 0 + +Route18_MapScript1_168201:: @ 8168201 + compare_var_to_value VAR_0x405E, 1 + call_if 1, EventScript_16820D + end + +EventScript_16820D:: @ 816820D + setflag 2096 + return + +Route18_MapScript2_168211:: @ 8168211 + map_script_2 VAR_0x405E, 1, EventScript_16821B + .2byte 0 + +EventScript_16821B:: @ 816821B + special sub_80CA630 + end + +Route18_EventScript_16821F:: @ 816821F + loadword 0, gUnknown_8187757 + callstd 3 + end + +Route18_EventScript_168228:: @ 8168228 + loadword 0, gUnknown_818777C + callstd 3 + end diff --git a/data/maps/Route18_EastEntrance_1F/scripts.inc b/data/maps/Route18_EastEntrance_1F/scripts.inc new file mode 100644 index 000000000..0a55befaa --- /dev/null +++ b/data/maps/Route18_EastEntrance_1F/scripts.inc @@ -0,0 +1,118 @@ +Route18_EastEntrance_1F_MapScripts:: @ 8170378 + map_script 3, Route18_EastEntrance_1F_MapScript1_17037E + .byte 0 + +Route18_EastEntrance_1F_MapScript1_17037E:: @ 817037E + clearflag 2096 + checkflag FLAG_0x271 + call_if 1, EventScript_17038B + end + +EventScript_17038B:: @ 817038B + setvar VAR_0x4001, 1 + return + +Route18_EastEntrance_1F_EventScript_170391:: @ 8170391 + loadword 0, gUnknown_819FD3A + callstd 2 + end + +Route18_EastEntrance_1F_EventScript_17039A:: @ 817039A + lockall + setvar VAR_0x8008, 0 + goto EventScript_1703D6 + end + +Route18_EastEntrance_1F_EventScript_1703A6:: @ 81703A6 + lockall + setvar VAR_0x8008, 1 + goto EventScript_1703D6 + end + +Route18_EastEntrance_1F_EventScript_1703B2:: @ 81703B2 + lockall + setvar VAR_0x8008, 2 + goto EventScript_1703D6 + end + +Route18_EastEntrance_1F_EventScript_1703BE:: @ 81703BE + lockall + setvar VAR_0x8008, 3 + goto EventScript_1703D6 + end + +Route18_EastEntrance_1F_EventScript_1703CA:: @ 81703CA + lockall + setvar VAR_0x8008, 4 + goto EventScript_1703D6 + end + +EventScript_1703D6:: @ 81703D6 + textcolor 0 + loadword 0, gUnknown_819FD60 + callstd 4 + closemessage + applymovement 255, Movement_1A75E9 + waitmovement 0 + delay 20 + compare_var_to_value VAR_0x8008, 1 + call_if 1, EventScript_17042F + compare_var_to_value VAR_0x8008, 2 + call_if 1, EventScript_17043A + compare_var_to_value VAR_0x8008, 3 + call_if 1, EventScript_170445 + compare_var_to_value VAR_0x8008, 4 + call_if 1, EventScript_170450 + loadword 0, gUnknown_819FD0C + callstd 4 + closemessage + applymovement 255, Movement_170469 + waitmovement 0 + releaseall + end + +EventScript_17042F:: @ 817042F + applymovement 255, Movement_17045B + waitmovement 0 + return + +EventScript_17043A:: @ 817043A + applymovement 255, Movement_17045D + waitmovement 0 + return + +EventScript_170445:: @ 8170445 + applymovement 255, Movement_170460 + waitmovement 0 + return + +EventScript_170450:: @ 8170450 + applymovement 255, Movement_170464 + waitmovement 0 + return + +Movement_17045B:: @ 817045B + step_11 + step_end + +Movement_17045D:: @ 817045D + step_11 + step_11 + step_end + +Movement_170460:: @ 8170460 + step_11 + step_11 + step_11 + step_end + +Movement_170464:: @ 8170464 + step_11 + step_11 + step_11 + step_11 + step_end + +Movement_170469:: @ 8170469 + step_13 + step_end diff --git a/data/maps/Route18_EastEntrance_2F/scripts.inc b/data/maps/Route18_EastEntrance_2F/scripts.inc new file mode 100644 index 000000000..84bcd23b3 --- /dev/null +++ b/data/maps/Route18_EastEntrance_2F/scripts.inc @@ -0,0 +1,55 @@ +Route18_EastEntrance_2F_MapScripts:: @ 817046B + .byte 0 + +Route18_EastEntrance_2F_EventScript_17046C:: @ 817046C + loadword 0, gUnknown_819FD6B + callstd 3 + end + +Route18_EastEntrance_2F_EventScript_170475:: @ 8170475 + loadword 0, gUnknown_819FDB3 + callstd 3 + end + +Route18_EastEntrance_2F_EventScript_17047E:: @ 817047E + lock + faceplayer + setvar VAR_0x8008, 5 + call EventScript_1A8CAD + checkflag FLAG_0x257 + goto_if 1, EventScript_1704F0 + loadword 0, gUnknown_81A597B + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_1704D8 + call EventScript_1A8CBD + compare_var_to_value VAR_0x8004, 6 + goto_if 4, EventScript_1704D8 + call EventScript_1A8CC9 + compare_var_to_var VAR_RESULT, VAR_0x8009 + goto_if 5, EventScript_1704E2 + call EventScript_1A8CD9 + loadword 0, gUnknown_81A59DA + callstd 4 + setflag FLAG_0x257 + release + end + +EventScript_1704D8:: @ 81704D8 + loadword 0, gUnknown_81A59B6 + callstd 4 + release + end + +EventScript_1704E2:: @ 81704E2 + getspeciesname 0, 32777 + loadword 0, gUnknown_81A59C6 + callstd 4 + release + end + +EventScript_1704F0:: @ 81704F0 + loadword 0, gUnknown_81A59E7 + callstd 4 + release + end diff --git a/data/maps/Route19/scripts.inc b/data/maps/Route19/scripts.inc new file mode 100644 index 000000000..19af9f870 --- /dev/null +++ b/data/maps/Route19/scripts.inc @@ -0,0 +1,7 @@ +Route19_MapScripts:: @ 8168231 + .byte 0 + +Route19_EventScript_168232:: @ 8168232 + loadword 0, gUnknown_8187C06 + callstd 3 + end diff --git a/data/maps/Route2/scripts.inc b/data/maps/Route2/scripts.inc new file mode 100644 index 000000000..8623b3622 --- /dev/null +++ b/data/maps/Route2/scripts.inc @@ -0,0 +1,12 @@ +Route2_MapScripts:: @ 8167F64 + .byte 0 + +Route2_EventScript_167F65:: @ 8167F65 + loadword 0, gUnknown_818345E + callstd 3 + end + +Route2_EventScript_167F6E:: @ 8167F6E + loadword 0, gUnknown_8183482 + callstd 3 + end diff --git a/data/maps/Route20/scripts.inc b/data/maps/Route20/scripts.inc new file mode 100644 index 000000000..e611d1f73 --- /dev/null +++ b/data/maps/Route20/scripts.inc @@ -0,0 +1,35 @@ +Route20_MapScripts:: @ 816823B + map_script 3, Route20_MapScript1_168241 + .byte 0 + +Route20_MapScript1_168241:: @ 8168241 + checkflag FLAG_0x2D2 + call_if 0, EventScript_168254 + checkflag FLAG_0x2D3 + call_if 0, EventScript_16826D + end + +EventScript_168254:: @ 8168254 + clearflag FLAG_0x040 + clearflag FLAG_0x041 + setflag FLAG_0x042 + setflag FLAG_0x043 + setflag FLAG_0x044 + setflag FLAG_0x045 + setflag FLAG_0x046 + setflag FLAG_0x047 + return + +EventScript_16826D:: @ 816826D + clearflag FLAG_0x048 + clearflag FLAG_0x049 + clearflag FLAG_0x04A + clearflag FLAG_0x04B + setflag FLAG_0x04C + setflag FLAG_0x04D + return + +Route20_EventScript_168280:: @ 8168280 + loadword 0, gUnknown_81882D1 + callstd 3 + end diff --git a/data/maps/Route21_North/scripts.inc b/data/maps/Route21_North/scripts.inc new file mode 100644 index 000000000..a7436e8ec --- /dev/null +++ b/data/maps/Route21_North/scripts.inc @@ -0,0 +1,2 @@ +Route21_North_MapScripts:: @ 8168289 + .byte 0 diff --git a/data/maps/Route21_South/scripts.inc b/data/maps/Route21_South/scripts.inc new file mode 100644 index 000000000..ea3478a2b --- /dev/null +++ b/data/maps/Route21_South/scripts.inc @@ -0,0 +1,2 @@ +Route21_South_MapScripts:: @ 816828A + .byte 0 diff --git a/data/maps/Route22/scripts.inc b/data/maps/Route22/scripts.inc new file mode 100644 index 000000000..30dbed8a1 --- /dev/null +++ b/data/maps/Route22/scripts.inc @@ -0,0 +1,266 @@ +Route22_MapScripts:: @ 816828B + .byte 0 + +Route22_EventScript_16828C:: @ 816828C + lockall + setvar VAR_0x4001, 0 + goto EventScript_1682BE + +EventScript_168297:: @ 8168297 + end + +Route22_EventScript_168298:: @ 8168298 + lockall + setvar VAR_0x4001, 1 + setobjectxyperm 1, 25, 5 + goto EventScript_1682BE + +EventScript_1682AA:: @ 81682AA + end + +Route22_EventScript_1682AB:: @ 81682AB + lockall + setvar VAR_0x4001, 2 + setobjectxyperm 1, 25, 5 + goto EventScript_1682BE + +EventScript_1682BD:: @ 81682BD + end + +EventScript_1682BE:: @ 81682BE + textcolor 0 + playbgm BGM_FRLG_RIVAL, 0 + addobject 1 + compare_var_to_value VAR_0x4001, 0 + call_if 1, EventScript_168350 + compare_var_to_value VAR_0x4001, 1 + call_if 1, EventScript_168350 + compare_var_to_value VAR_0x4001, 2 + call_if 1, EventScript_16835B + delay 6 + loadword 0, gUnknown_8188890 + callstd 4 + compare_var_to_value VAR_STARTER_MON, 2 + call_if 1, EventScript_16836D + compare_var_to_value VAR_STARTER_MON, 1 + call_if 1, EventScript_16837C + compare_var_to_value VAR_STARTER_MON, 0 + call_if 1, EventScript_16838B + loadword 0, gUnknown_8188974 + callstd 4 + closemessage + delay 10 + playbgm BGM_FRLG_RIVAL_POSTBATTLE, 0 + compare_var_to_value VAR_0x4001, 0 + call_if 1, EventScript_16839A + compare_var_to_value VAR_0x4001, 1 + call_if 1, EventScript_16839A + compare_var_to_value VAR_0x4001, 2 + call_if 1, EventScript_1683A5 + fadedefaultbgm + removeobject 1 + setvar VAR_0x4054, 2 + releaseall + end + +EventScript_168350:: @ 8168350 + applymovement 1, Movement_1683D1 + waitmovement 0 + return + +EventScript_16835B:: @ 816835B + applymovement 1, Movement_1683D9 + applymovement 255, Movement_1683E3 + waitmovement 0 + return + +EventScript_16836D:: @ 816836D + trainerbattle 9, 329, 0, Text_188959, Text_18DE1A + return + +EventScript_16837C:: @ 816837C + trainerbattle 9, 330, 0, Text_188959, Text_18DE1A + return + +EventScript_16838B:: @ 816838B + trainerbattle 9, 331, 0, Text_188959, Text_18DE1A + return + +EventScript_16839A:: @ 816839A + applymovement 1, Movement_1683B8 + waitmovement 0 + return + +EventScript_1683A5:: @ 81683A5 + applymovement 1, Movement_1683C5 + waitmovement 0 + return + +Movement_1683B0:: @ 8 + step_13 + step_13 + step_13 + step_13 + step_13 + step_13 + step_13 + step_end + +Movement_1683B8:: @ 81683B8 + step_10 + step_13 + step_13 + step_13 + step_13 + step_13 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_end + +Movement_1683C5:: @ 81683C5 + step_13 + step_13 + step_13 + step_13 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_end + +Movement_1683D1:: @ 81683D1 + step_13 + step_13 + step_13 + step_13 + step_13 + step_13 + step_13 + step_end + +Movement_1683D9:: @ 81683D9 + step_13 + step_13 + step_13 + step_13 + step_13 + step_13 + step_13 + step_13 + step_2d + step_end + +Movement_1683E3:: @ 81683E3 + step_1c + step_1c + step_1c + step_1c + step_1c + step_1c + step_1c + step_1b + step_2e + step_end + +Route22_EventScript_1683ED:: @ 81683ED + lockall + setvar VAR_0x4001, 0 + goto EventScript_16841F + +EventScript_1683F8:: @ 81683F8 + end + +Route22_EventScript_1683F9:: @ 81683F9 + lockall + setvar VAR_0x4001, 1 + setobjectxyperm 1, 25, 5 + goto EventScript_16841F + +EventScript_16840B:: @ 816840B + end + +Route22_EventScript_16840C:: @ 816840C + lockall + setvar VAR_0x4001, 2 + setobjectxyperm 1, 25, 5 + goto EventScript_16841F + +EventScript_16841E:: @ 816841E + end + +EventScript_16841F:: @ 816841F + textcolor 0 + playbgm BGM_FRLG_RIVAL, 0 + addobject 1 + compare_var_to_value VAR_0x4001, 0 + call_if 1, EventScript_16849C + compare_var_to_value VAR_0x4001, 1 + call_if 1, EventScript_16849C + compare_var_to_value VAR_0x4001, 2 + call_if 1, EventScript_1684A7 + loadword 0, gUnknown_8188A3C + callstd 4 + setvar VAR_LAST_TALKED, 1 + compare_var_to_value VAR_STARTER_MON, 2 + call_if 1, EventScript_1684B9 + compare_var_to_value VAR_STARTER_MON, 1 + call_if 1, EventScript_1684C4 + compare_var_to_value VAR_STARTER_MON, 0 + call_if 1, EventScript_1684CF + loadword 0, gUnknown_8188B29 + callstd 4 + closemessage + delay 10 + playbgm BGM_FRLG_RIVAL_POSTBATTLE, 0 + applymovement 1, Movement_1684DA + waitmovement 0 + fadedefaultbgm + removeobject 1 + setvar VAR_0x4054, 4 + releaseall + end + +EventScript_16849C:: @ 816849C + applymovement 1, Movement_1683D1 + waitmovement 0 + return + +EventScript_1684A7:: @ 81684A7 + applymovement 1, Movement_1683D9 + applymovement 255, Movement_1683E3 + waitmovement 0 + return + +EventScript_1684B9:: @ 81684B9 + trainerbattle 3, 435, 0, Text_188B08 + return + +EventScript_1684C4:: @ 81684C4 + trainerbattle 3, 436, 0, Text_188B08 + return + +EventScript_1684CF:: @ 81684CF + trainerbattle 3, 437, 0, Text_188B08 + return + +Movement_1684DA:: @ 81684DA + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_end + +Route22_EventScript_1684E2:: @ 81684E2 + loadword 0, gUnknown_8188BFF + callstd 3 + end diff --git a/data/maps/Route22_NorthEntrance/scripts.inc b/data/maps/Route22_NorthEntrance/scripts.inc new file mode 100644 index 000000000..d7d7c61da --- /dev/null +++ b/data/maps/Route22_NorthEntrance/scripts.inc @@ -0,0 +1,18 @@ +Route22_NorthEntrance_MapScripts:: @ 81704FB + .byte 0 + +Route22_NorthEntrance_EventScript_1704FC:: @ 81704FC + lock + faceplayer + setvar VAR_0x4001, 1 + getstdstring 0, 15 + goto EventScript_1A7803 + end + +Route22_NorthEntrance_EventScript_17050D:: @ 817050D + lockall + setvar VAR_0x4001, 1 + setvar VAR_0x8009, 1 + getstdstring 0, 15 + goto EventScript_1A796E + end diff --git a/data/maps/Route23/scripts.inc b/data/maps/Route23/scripts.inc new file mode 100644 index 000000000..3154a6f0e --- /dev/null +++ b/data/maps/Route23/scripts.inc @@ -0,0 +1,129 @@ +Route23_MapScripts:: @ 81684EB + map_script 3, Route23_MapScript1_1684F1 + .byte 0 + +Route23_MapScript1_1684F1:: @ 81684F1 + clearflag FLAG_0x059 + setflag FLAG_0x058 + setvar VAR_0x4064, 0 + setvar VAR_0x4065, 0 + setvar VAR_0x4066, 0 + setvar VAR_0x4067, 0 + end + +Route23_EventScript_16850C:: @ 816850C + lock + faceplayer + setvar VAR_0x4001, 2 + getstdstring 0, 16 + goto EventScript_1A786C + end + +Route23_EventScript_16851D:: @ 816851D + lock + faceplayer + setvar VAR_0x4001, 3 + getstdstring 0, 17 + goto EventScript_1A786C + end + +Route23_EventScript_16852E:: @ 816852E + lock + faceplayer + setvar VAR_0x4001, 4 + getstdstring 0, 18 + goto EventScript_1A786C + end + +Route23_EventScript_16853F:: @ 816853F + lock + faceplayer + setvar VAR_0x4001, 5 + getstdstring 0, 19 + goto EventScript_1A786C + end + +Route23_EventScript_168550:: @ 8168550 + lock + faceplayer + setvar VAR_0x4001, 6 + getstdstring 0, 20 + goto EventScript_1A786C + end + +Route23_EventScript_168561:: @ 8168561 + lock + faceplayer + setvar VAR_0x4001, 7 + getstdstring 0, 21 + goto EventScript_1A786C + end + +Route23_EventScript_168572:: @ 8168572 + lock + faceplayer + setvar VAR_0x4001, 8 + getstdstring 0, 22 + goto EventScript_1A786C + end + +Route23_EventScript_168583:: @ 8168583 + lockall + setvar VAR_0x4001, 2 + setvar VAR_0x8009, 1 + getstdstring 0, 16 + goto EventScript_1A796E + end + +Route23_EventScript_168598:: @ 8168598 + lockall + setvar VAR_0x4001, 3 + setvar VAR_0x8009, 2 + getstdstring 0, 17 + goto EventScript_1A796E + end + +Route23_EventScript_1685AD:: @ 81685AD + lockall + setvar VAR_0x4001, 4 + setvar VAR_0x8009, 3 + getstdstring 0, 18 + goto EventScript_1A796E + end + +Route23_EventScript_1685C2:: @ 81685C2 + lockall + setvar VAR_0x4001, 5 + setvar VAR_0x8009, 4 + getstdstring 0, 19 + goto EventScript_1A796E + end + +Route23_EventScript_1685D7:: @ 81685D7 + lockall + setvar VAR_0x4001, 6 + setvar VAR_0x8009, 5 + getstdstring 0, 20 + goto EventScript_1A796E + end + +Route23_EventScript_1685EC:: @ 81685EC + lockall + setvar VAR_0x4001, 7 + setvar VAR_0x8009, 6 + getstdstring 0, 21 + goto EventScript_1A796E + end + +Route23_EventScript_168601:: @ 8168601 + lockall + setvar VAR_0x4001, 8 + setvar VAR_0x8009, 7 + getstdstring 0, 22 + goto EventScript_1A796E + end + +Route23_EventScript_168616:: @ 8168616 + loadword 0, gUnknown_8188C19 + callstd 3 + end diff --git a/data/maps/Route24/scripts.inc b/data/maps/Route24/scripts.inc new file mode 100644 index 000000000..811f194a2 --- /dev/null +++ b/data/maps/Route24/scripts.inc @@ -0,0 +1,114 @@ +Route24_MapScripts:: @ 816861F + .byte 0 + +Route24_EventScript_168620:: @ 8168620 + lock + faceplayer + compare_var_to_value VAR_0x406B, 1 + goto_if 1, EventScript_168656 + loadword 0, gUnknown_8188C3C + callstd 4 + checkitemspace ITEM_NUGGET, 1 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16864C + call EventScript_1686B9 + release + end + +EventScript_16864C:: @ 816864C + loadword 0, gUnknown_8188CC2 + callstd 4 + release + end + +EventScript_168656:: @ 8168656 + loadword 0, gUnknown_8188DF1 + callstd 4 + release + end + +Route24_EventScript_168660:: @ 8168660 + lockall + setvar VAR_0x4001, 0 + goto EventScript_168678 + end + +Route24_EventScript_16866C:: @ 816866C + lockall + setvar VAR_0x4001, 1 + goto EventScript_168678 + end + +EventScript_168678:: @ 8168678 + textcolor 0 + compare_var_to_value VAR_0x4001, 0 + call_if 1, EventScript_1686FD + compare_var_to_value VAR_0x4001, 1 + call_if 1, EventScript_168708 + applymovement 255, Movement_1A75EB + waitmovement 0 + loadword 0, gUnknown_8188C3C + callstd 4 + checkitemspace ITEM_NUGGET, 1 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_168713 + call EventScript_1686B9 + releaseall + end + +EventScript_1686B9:: @ 81686B9 + additem ITEM_NUGGET, 1 + loadword 0, gUnknown_8188C93 + setorcopyvar VAR_0x8000, 110 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 257 + callstd 9 + message Text_188CDB + waitmessage + playbgm BGM_FRLG_SUSPICIOUS_EYE, 0 + waitbuttonpress + setvar VAR_LAST_TALKED, 1 + trainerbattle 3, 356, 0, Text_188DDC + loadword 0, gUnknown_8188DF1 + callstd 4 + setvar VAR_0x406B, 1 + return + +EventScript_1686FD:: @ 81686FD + applymovement 1, Movement_16873E + waitmovement 0 + return + +EventScript_168708:: @ 8168708 + applymovement 1, Movement_1A75E7 + waitmovement 0 + return + +EventScript_168713:: @ 8168713 + loadword 0, gUnknown_8188CC2 + callstd 4 + closemessage + applymovement 255, Movement_168743 + waitmovement 0 + compare_var_to_value VAR_0x4001, 0 + call_if 1, EventScript_168733 + release + end + +EventScript_168733:: @ 8168733 + applymovement 1, Movement_168740 + waitmovement 0 + return + +Movement_16873E:: @ 816873E + step_12 + step_end + +Movement_168740:: @ 8168740 + step_13 + step_2f + step_end + +Movement_168743:: @ 8168743 + step_10 + step_end diff --git a/data/maps/Route25/scripts.inc b/data/maps/Route25/scripts.inc new file mode 100644 index 000000000..88bbc1efa --- /dev/null +++ b/data/maps/Route25/scripts.inc @@ -0,0 +1,12 @@ +Route25_MapScripts:: @ 8168745 + .byte 0 + +Route25_EventScript_168746:: @ 8168746 + loadword 0, gUnknown_818954C + callstd 3 + end + +Route25_EventScript_16874F:: @ 816874F + loadword 0, gUnknown_81895C2 + callstd 2 + end diff --git a/data/maps/Route25_SeaCottage/scripts.inc b/data/maps/Route25_SeaCottage/scripts.inc new file mode 100644 index 000000000..c88ed3054 --- /dev/null +++ b/data/maps/Route25_SeaCottage/scripts.inc @@ -0,0 +1,337 @@ +Route25_SeaCottage_MapScripts:: @ 8170523 + map_script 3, Route25_SeaCottage_MapScript1_170529 + .byte 0 + +Route25_SeaCottage_MapScript1_170529:: @ 8170529 + checkflag FLAG_0x233 + call_if 0, EventScript_17053C + checkflag FLAG_0x234 + call_if 1, EventScript_170547 + end + +EventScript_17053C:: @ 817053C + clearflag FLAG_0x032 + setobjectxyperm 1, 3, 3 + return + +EventScript_170547:: @ 8170547 + setflag FLAG_0x003 + return + +Route25_SeaCottage_EventScript_17054B:: @ 817054B + lock + faceplayer + checkflag FLAG_0x003 + goto_if 1, EventScript_1706C8 + checkflag FLAG_0x234 + goto_if 1, EventScript_170640 + checkflag FLAG_0x233 + goto_if 1, EventScript_17064A + checkplayergender + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_170580 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_17058E + end + +EventScript_170580:: @ 8170580 + loadword 0, gUnknown_819FDFA + callstd 5 + goto EventScript_17059C + end + +EventScript_17058E:: @ 817058E + loadword 0, gUnknown_819FEE6 + callstd 5 + goto EventScript_17059C + end + +EventScript_17059C:: @ 817059C + compare_var_to_value VAR_RESULT, 0 + call_if 1, EventScript_170600 + loadword 0, gUnknown_819FFD3 + callstd 4 + closemessage + delay 10 + compare_var_to_value VAR_FACING, 1 + call_if 1, EventScript_17062A + compare_var_to_value VAR_FACING, 2 + call_if 1, EventScript_170635 + compare_var_to_value VAR_FACING, 3 + call_if 1, EventScript_170635 + compare_var_to_value VAR_FACING, 4 + call_if 1, EventScript_170635 + opendoor 10, 3 + waitdooranim + applymovement 2, Movement_1706DB + waitmovement 0 + removeobject 2 + playse SE_EXPMAX + closedoor 10, 3 + waitdooranim + setflag FLAG_0x002 + release + end + +EventScript_170600:: @ 8170600 + checkplayergender + compare_var_to_value VAR_RESULT, 0 + call_if 1, EventScript_170618 + compare_var_to_value VAR_RESULT, 1 + call_if 1, EventScript_170621 + return + +EventScript_170618:: @ 8170618 + loadword 0, gUnknown_81A0035 + callstd 4 + return + +EventScript_170621:: @ 8170621 + loadword 0, gUnknown_81A00B6 + callstd 4 + return + +EventScript_17062A:: @ 817062A + applymovement 2, Movement_1706D5 + waitmovement 0 + return + +EventScript_170635:: @ 8170635 + applymovement 2, Movement_1706D2 + waitmovement 0 + return + +EventScript_170640:: @ 8170640 + loadword 0, gUnknown_81A02CF + callstd 4 + release + end + +EventScript_17064A:: @ 817064A + setvar VAR_0x8004, 13 + setvar VAR_0x8005, 2 + special UpdatePickStateFromSpecialVar8005 + checkplayergender + compare_var_to_value VAR_RESULT, 0 + call_if 1, EventScript_1706AC + compare_var_to_value VAR_RESULT, 1 + call_if 1, EventScript_1706B5 + checkitemspace ITEM_SS_TICKET, 1 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_1706BE + additem ITEM_SS_TICKET, 1 + loadword 0, gUnknown_81A028E + setorcopyvar VAR_0x8000, 265 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 318 + callstd 9 + setflag FLAG_0x235 + setflag FLAG_0x031 + setflag FLAG_0x234 + setflag 2100 + goto EventScript_170640 + end + +EventScript_1706AC:: @ 81706AC + loadword 0, gUnknown_81A013B + callstd 4 + return + +EventScript_1706B5:: @ 81706B5 + loadword 0, gUnknown_81A01E4 + callstd 4 + return + +EventScript_1706BE:: @ 81706BE + loadword 0, gUnknown_81A02B4 + callstd 4 + release + end + +EventScript_1706C8:: @ 81706C8 + loadword 0, gUnknown_81A03AB + callstd 4 + release + end + +Movement_1706D2:: @ 81706D2 + step_11 + step_11 + step_end + +Movement_1706D5:: @ 81706D5 + step_13 + step_11 + step_11 + step_12 + step_2e + step_end + +Movement_1706DB:: @ 81706DB + step_11 + step_end + +Route25_SeaCottage_EventScript_1706DD:: @ 81706DD + lockall + checkflag FLAG_0x003 + goto_if 1, EventScript_1707CA + checkflag FLAG_0x002 + goto_if 1, EventScript_1706FA + loadword 0, gUnknown_81A0402 + callstd 4 + releaseall + end + +EventScript_1706FA:: @ 81706FA + fadeoutbgm 0 + loadword 0, gUnknown_81A042D + callstd 4 + closemessage + clearflag FLAG_0x002 + setflag FLAG_0x233 + special SpawnScriptFieldObject + applymovement 127, Movement_1707BE + waitmovement 0 + delay 35 + playse SE_PIN + waitse + setvar VAR_0x8004, 0 + special sub_809C4A8 + delay 10 + call EventScript_1707B6 + call EventScript_1707B6 + call EventScript_1707B6 + call EventScript_1707B6 + call EventScript_1707B6 + call EventScript_1707B6 + call EventScript_1707B6 + setvar VAR_0x8004, 1 + special sub_809C4A8 + playse SE_FU_ZUZUZU + special sub_809C5FC + waitse + call EventScript_1707B6 + call EventScript_1707B6 + call EventScript_1707B6 + call EventScript_1707B6 + call EventScript_1707B6 + opendoor 3, 3 + waitdooranim + fadeinbgm 0 + addobject 1 + clearflag FLAG_0x033 + delay 50 + playfanfare MUS_FANFA1 + applymovement 1, Movement_170888 + waitmovement 0 + waitfanfare + applymovement 127, Movement_1707C3 + waitmovement 0 + playse SE_EXPMAX + closedoor 3, 3 + waitdooranim + applymovement 1, Movement_170881 + waitmovement 0 + special RemoveScriptFieldObject + releaseall + end + +EventScript_1707B6:: @ 81707B6 + playse SE_BOWA + waitse + delay 20 + return + +Movement_1707BE:: @ 81707BE + step_11 + step_11 + step_13 + step_13 + step_end + +Movement_1707C3:: @ 81707C3 + step_1c + step_1c + step_10 + step_10 + step_12 + step_12 + step_end + +EventScript_1707CA:: @ 81707CA + loadword 0, gUnknown_81A045B + callstd 4 + goto EventScript_1707D8 + end + +EventScript_1707D8:: @ 81707D8 + message Text_1A0479 + waitmessage + multichoice 0, 0, 1, 0 + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_17082B + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_170840 + compare_var_to_value VAR_0x8000, 2 + goto_if 1, EventScript_170855 + compare_var_to_value VAR_0x8000, 3 + goto_if 1, EventScript_17086A + compare_var_to_value VAR_0x8000, 4 + goto_if 1, EventScript_17087F + compare_var_to_value VAR_0x8000, 127 + goto_if 1, EventScript_17087F + end + +EventScript_17082B:: @ 817082B + drawmonpic SPECIES_EEVEE, 10, 3 + waitbuttonpress + erasemonpic + setvar VAR_0x8004, 133 + special sub_80CBDCC + goto EventScript_1707D8 + end + +EventScript_170840:: @ 8170840 + drawmonpic SPECIES_FLAREON, 10, 3 + waitbuttonpress + erasemonpic + setvar VAR_0x8004, 136 + special sub_80CBDCC + goto EventScript_1707D8 + end + +EventScript_170855:: @ 8170855 + drawmonpic SPECIES_JOLTEON, 10, 3 + waitbuttonpress + erasemonpic + setvar VAR_0x8004, 135 + special sub_80CBDCC + goto EventScript_1707D8 + end + +EventScript_17086A:: @ 817086A + drawmonpic SPECIES_VAPOREON, 10, 3 + waitbuttonpress + erasemonpic + setvar VAR_0x8004, 134 + special sub_80CBDCC + goto EventScript_1707D8 + end + +EventScript_17087F:: @ 817087F + releaseall + end + +Movement_170881:: @ 8170881 + step_13 + step_13 + step_13 + step_13 + step_10 + step_10 + step_end + +Movement_170888:: @ 8170888 + step_10 + step_end diff --git a/data/maps/Route2_EastBuilding/scripts.inc b/data/maps/Route2_EastBuilding/scripts.inc new file mode 100644 index 000000000..ac1fcb6bb --- /dev/null +++ b/data/maps/Route2_EastBuilding/scripts.inc @@ -0,0 +1,51 @@ +Route2_EastBuilding_MapScripts:: @ 816F67E + .byte 0 + +Route2_EastBuilding_EventScript_16F67F:: @ 816F67F + lock + faceplayer + call EventScript_16F70B + checkflag FLAG_0x23B + goto_if 1, EventScript_16F701 + loadword 0, gUnknown_819D64F + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_1A7AD1 + setvar VAR_0x8004, 0 + specialvar VAR_RESULT, sub_80CA3D8 + getnumberstring 2, VAR_0x8006 + call EventScript_16F70B + compare_var_to_value VAR_0x8006, 10 + goto_if 0, EventScript_1A7ABD + loadword 0, gUnknown_819D74E + callstd 4 + checkitemspace ITEM_HM05, 1 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_1A7AC7 + additem ITEM_HM05, 1 + loadword 0, gUnknown_819D7A1 + setorcopyvar VAR_0x8000, 343 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 257 + callstd 9 + setflag FLAG_0x23B + loadword 0, gUnknown_819D7C1 + callstd 4 + release + end + +EventScript_16F701:: @ 816F701 + loadword 0, gUnknown_819D7C1 + callstd 4 + release + end + +EventScript_16F70B:: @ 816F70B + getnumberstring 0, 10 + getitemname 1, ITEM_HM05 + return + +Route2_EastBuilding_EventScript_16F714:: @ 816F714 + loadword 0, gUnknown_819D81E + callstd 2 + end diff --git a/data/maps/Route2_House/scripts.inc b/data/maps/Route2_House/scripts.inc new file mode 100644 index 000000000..8f7305c29 --- /dev/null +++ b/data/maps/Route2_House/scripts.inc @@ -0,0 +1,50 @@ +Route2_House_MapScripts:: @ 816F5F8 + .byte 0 + +Route2_House_EventScript_16F5F9:: @ 816F5F9 + loadword 0, gUnknown_819D5E7 + callstd 2 + end + +Route2_House_EventScript_16F602:: @ 816F602 + lock + faceplayer + setvar VAR_0x8008, 0 + call EventScript_1A8CAD + checkflag FLAG_0x248 + goto_if 1, EventScript_16F674 + loadword 0, gUnknown_81A597B + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16F65C + call EventScript_1A8CBD + compare_var_to_value VAR_0x8004, 6 + goto_if 4, EventScript_16F65C + call EventScript_1A8CC9 + compare_var_to_var VAR_RESULT, VAR_0x8009 + goto_if 5, EventScript_16F666 + call EventScript_1A8CD9 + loadword 0, gUnknown_81A59DA + callstd 4 + setflag FLAG_0x248 + release + end + +EventScript_16F65C:: @ 816F65C + loadword 0, gUnknown_81A59B6 + callstd 4 + release + end + +EventScript_16F666:: @ 816F666 + getspeciesname 0, 32777 + loadword 0, gUnknown_81A59C6 + callstd 4 + release + end + +EventScript_16F674:: @ 816F674 + loadword 0, gUnknown_81A59E7 + callstd 4 + release + end diff --git a/data/maps/Route2_ViridianForest_NorthEntrance/scripts.inc b/data/maps/Route2_ViridianForest_NorthEntrance/scripts.inc new file mode 100644 index 000000000..d84ef1b6e --- /dev/null +++ b/data/maps/Route2_ViridianForest_NorthEntrance/scripts.inc @@ -0,0 +1,17 @@ +Route2_ViridianForest_NorthEntrance_MapScripts:: @ 816F71D + .byte 0 + +Route2_ViridianForest_NorthEntrance_EventScript_16F71E:: @ 816F71E + loadword 0, gUnknown_819D85C + callstd 2 + end + +Route2_ViridianForest_NorthEntrance_EventScript_16F727:: @ 816F727 + loadword 0, gUnknown_819D8D0 + callstd 2 + end + +Route2_ViridianForest_NorthEntrance_EventScript_16F730:: @ 816F730 + loadword 0, gUnknown_819D93B + callstd 2 + end diff --git a/data/maps/Route2_ViridianForest_SouthEntrance/scripts.inc b/data/maps/Route2_ViridianForest_SouthEntrance/scripts.inc new file mode 100644 index 000000000..f81d39f8c --- /dev/null +++ b/data/maps/Route2_ViridianForest_SouthEntrance/scripts.inc @@ -0,0 +1,12 @@ +Route2_ViridianForest_SouthEntrance_MapScripts:: @ 816F5E5 + .byte 0 + +Route2_ViridianForest_SouthEntrance_EventScript_16F5E6:: @ 816F5E6 + loadword 0, gUnknown_819D52C + callstd 2 + end + +Route2_ViridianForest_SouthEntrance_EventScript_16F5EF:: @ 816F5EF + loadword 0, gUnknown_819D58B + callstd 2 + end diff --git a/data/maps/Route3/scripts.inc b/data/maps/Route3/scripts.inc new file mode 100644 index 000000000..c74a4401a --- /dev/null +++ b/data/maps/Route3/scripts.inc @@ -0,0 +1,12 @@ +Route3_MapScripts:: @ 8167F77 + .byte 0 + +Route3_EventScript_167F78:: @ 8167F78 + loadword 0, gUnknown_8183491 + callstd 2 + end + +Route3_EventScript_167F81:: @ 8167F81 + loadword 0, gUnknown_81838C0 + callstd 3 + end diff --git a/data/maps/Route4/scripts.inc b/data/maps/Route4/scripts.inc new file mode 100644 index 000000000..51f60f02f --- /dev/null +++ b/data/maps/Route4/scripts.inc @@ -0,0 +1,20 @@ +Route4_MapScripts:: @ 8167F8A + .byte 0 + +Route4_EventScript_167F8B:: @ 8167F8B + end + +Route4_EventScript_167F8C:: @ 8167F8C + loadword 0, gUnknown_81838D7 + callstd 2 + end + +Route4_EventScript_167F95:: @ 8167F95 + loadword 0, gUnknown_818399B + callstd 3 + end + +Route4_EventScript_167F9E:: @ 8167F9E + loadword 0, gUnknown_81839B4 + callstd 3 + end diff --git a/data/maps/Route4_PokemonCenter_1F/scripts.inc b/data/maps/Route4_PokemonCenter_1F/scripts.inc new file mode 100644 index 000000000..e488082c2 --- /dev/null +++ b/data/maps/Route4_PokemonCenter_1F/scripts.inc @@ -0,0 +1,181 @@ +Route4_PokemonCenter_1F_MapScripts:: @ 816F739 + map_script 3, Route4_PokemonCenter_1F_MapScript1_16F744 + map_script 5, Route4_PokemonCenter_1F_MapScript2_1BC05C + .byte 0 + +Route4_PokemonCenter_1F_MapScript1_16F744:: @ 816F744 + setworldmapflag 2210 + setrespawn 12 + end + +Route4_PokemonCenter_1F_EventScript_16F74B:: @ 816F74B + loadword 0, gUnknown_819D9D4 + callstd 2 + end + +Route4_PokemonCenter_1F_EventScript_16F754:: @ 816F754 + lock + loadword 0, gUnknown_819DA3A + callstd 4 + release + end + +Route4_PokemonCenter_1F_EventScript_16F75F:: @ 816F75F + lock + faceplayer + checkflag FLAG_0x249 + goto_if 1, EventScript_16F8A2 + showmoneybox 0, 0, 0 + checkplayergender + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16F786 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16F794 + end + +EventScript_16F786:: @ 816F786 + loadword 0, gUnknown_819DA9A + callstd 5 + goto EventScript_16F7A2 + end + +EventScript_16F794:: @ 816F794 + loadword 0, gUnknown_819DB34 + callstd 5 + goto EventScript_16F7A2 + end + +EventScript_16F7A2:: @ 816F7A2 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16F888 + checkmoney 500, 0 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16F895 + textcolor 3 + setvar VAR_0x4001, 129 + givemon SPECIES_MAGIKARP, 5, ITEM_NONE, 0, 0, 0 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16F7F6 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16F822 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_16F8AC + end + +EventScript_16F7F6:: @ 816F7F6 + call EventScript_16F86F + loadword 0, gUnknown_81A56A7 + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16F861 + call EventScript_1A8C27 + fadescreen 1 + hidemoneybox + .byte 0 + .byte 0 + special ChangePokemonNickname + waitstate + goto EventScript_16F86A + end + +EventScript_16F822:: @ 816F822 + call EventScript_16F86F + loadword 0, gUnknown_81A56A7 + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16F84B + fadescreen 1 + hidemoneybox + .byte 0 + .byte 0 + special ChangeBoxPokemonNickname + waitstate + lock + faceplayer + goto EventScript_16F856 + end + +EventScript_16F84B:: @ 816F84B + call EventScript_1A8C3C + goto EventScript_16F861 + end + +EventScript_16F856:: @ 816F856 + call EventScript_1A8C3C + goto EventScript_16F86A + end + +EventScript_16F861:: @ 816F861 + hidemoneybox + .byte 0 + .byte 0 + goto EventScript_16F86A + end + +EventScript_16F86A:: @ 816F86A + setflag FLAG_0x249 + release + end + +EventScript_16F86F:: @ 816F86F + takemoney 500, 0 + updatemoneybox 0, 0, 0 + playfanfare MUS_FANFA1 + message Text_19DBD3 + waitmessage + waitfanfare + getspeciesname 0, SPECIES_MAGIKARP + return + +EventScript_16F888:: @ 816F888 + loadword 0, gUnknown_819DC07 + callstd 4 + hidemoneybox + .byte 0 + .byte 0 + release + end + +EventScript_16F895:: @ 816F895 + loadword 0, gUnknown_819DC78 + callstd 4 + hidemoneybox + .byte 0 + .byte 0 + release + end + +EventScript_16F8A2:: @ 816F8A2 + loadword 0, gUnknown_819DC9A + callstd 4 + release + end + +EventScript_16F8AC:: @ 816F8AC + textcolor 0 + loadword 0, gUnknown_819DC3E + callstd 4 + hidemoneybox + .byte 0 + .byte 0 + release + end + +Route4_PokemonCenter_1F_EventScript_16F8BB:: @ 816F8BB + lock + faceplayer + call EventScript_1A6578 + release + end + +Route4_PokemonCenter_1F_EventScript_16F8C4:: @ 816F8C4 + loadword 0, gUnknown_819DCDB + callstd 2 + end + +Route4_PokemonCenter_1F_EventScript_16F8CD:: @ 816F8CD + lock + loadword 0, gUnknown_819DD54 + callstd 4 + release + end diff --git a/data/maps/Route4_PokemonCenter_2F/scripts.inc b/data/maps/Route4_PokemonCenter_2F/scripts.inc new file mode 100644 index 000000000..172b29972 --- /dev/null +++ b/data/maps/Route4_PokemonCenter_2F/scripts.inc @@ -0,0 +1,18 @@ +Route4_PokemonCenter_2F_MapScripts:: @ 816F8D8 + map_script 2, Route4_PokemonCenter_2F_MapScript1_1BB2A3 + map_script 4, Route4_PokemonCenter_2F_MapScript2_1BB1ED + map_script 1, Route4_PokemonCenter_2F_MapScript3_1BB237 + map_script 3, Route4_PokemonCenter_2F_MapScript4_1BB1B4 + .byte 0 + +Route4_PokemonCenter_2F_EventScript_16F8ED:: @ 816F8ED + call EventScript_1BB4A3 + end + +EventScript_16F8F3:: @ 816F8F3 + call EventScript_1BB6AB + end + +EventScript_16F8F9:: @ 816F8F9 + call EventScript_1BB7DE + end diff --git a/data/maps/Route5/scripts.inc b/data/maps/Route5/scripts.inc new file mode 100644 index 000000000..a5fde8a87 --- /dev/null +++ b/data/maps/Route5/scripts.inc @@ -0,0 +1,7 @@ +Route5_MapScripts:: @ 8167FA7 + .byte 0 + +Route5_EventScript_167FA8:: @ 8167FA8 + loadword 0, gUnknown_8183DD4 + callstd 3 + end diff --git a/data/maps/Route5_PokemonDayCare/scripts.inc b/data/maps/Route5_PokemonDayCare/scripts.inc new file mode 100644 index 000000000..3946ef43b --- /dev/null +++ b/data/maps/Route5_PokemonDayCare/scripts.inc @@ -0,0 +1,2 @@ +Route5_PokemonDayCare_MapScripts:: @ 816F8FF + .byte 0 diff --git a/data/maps/Route5_SouthEntrance/scripts.inc b/data/maps/Route5_SouthEntrance/scripts.inc new file mode 100644 index 000000000..9e4b41a51 --- /dev/null +++ b/data/maps/Route5_SouthEntrance/scripts.inc @@ -0,0 +1,92 @@ +Route5_SouthEntrance_MapScripts:: @ 816F900 + .byte 0 + +Route5_SouthEntrance_EventScript_16F901:: @ 816F901 + loadword 0, gUnknown_819E16D + callstd 2 + end + +Route5_SouthEntrance_EventScript_16F90A:: @ 816F90A + lockall + setvar VAR_0x4001, 0 + goto EventScript_16F92E + end + +Route5_SouthEntrance_EventScript_16F916:: @ 816F916 + lockall + setvar VAR_0x4001, 1 + goto EventScript_16F92E + end + +Route5_SouthEntrance_EventScript_16F922:: @ 816F922 + lockall + setvar VAR_0x4001, 2 + goto EventScript_16F92E + end + +EventScript_16F92E:: @ 816F92E + textcolor 0 + applymovement 255, Movement_1A75E7 + waitmovement 0 + checkflag FLAG_0x2A6 + goto_if 1, EventScript_16F958 + loadword 0, gUnknown_819E04B + callstd 4 + closemessage + applymovement 255, Movement_16F9C4 + waitmovement 0 + releaseall + end + +EventScript_16F958:: @ 816F958 + removeitem ITEM_TEA, 1 + goto EventScript_16F963 + end + +EventScript_16F963:: @ 816F963 + loadword 0, gUnknown_819E09B + callstd 4 + closemessage + compare_var_to_value VAR_0x4001, 0 + call_if 1, EventScript_16F99C + compare_var_to_value VAR_0x4001, 1 + call_if 1, EventScript_16F9A7 + compare_var_to_value VAR_0x4001, 2 + call_if 1, EventScript_16F9B2 + loadword 0, gUnknown_819E0C1 + callstd 4 + setvar VAR_0x4062, 1 + releaseall + end + +EventScript_16F99C:: @ 816F99C + applymovement 255, Movement_16F9C2 + waitmovement 0 + return + +EventScript_16F9A7:: @ 816F9A7 + applymovement 255, Movement_16F9BD + waitmovement 0 + return + +EventScript_16F9B2:: @ 816F9B2 + applymovement 255, Movement_16F9BF + waitmovement 0 + return + +Movement_16F9BD:: @ 816F9BD + step_12 + step_end + +Movement_16F9BF:: @ 816F9BF + step_12 + step_12 + step_end + +Movement_16F9C2:: @ 816F9C2 + step_27 + step_end + +Movement_16F9C4:: @ 816F9C4 + step_11 + step_end diff --git a/data/maps/Route6/scripts.inc b/data/maps/Route6/scripts.inc new file mode 100644 index 000000000..8cbe2db5a --- /dev/null +++ b/data/maps/Route6/scripts.inc @@ -0,0 +1,7 @@ +Route6_MapScripts:: @ 8167FB1 + .byte 0 + +Route6_EventScript_167FB2:: @ 8167FB2 + loadword 0, gUnknown_8184067 + callstd 3 + end diff --git a/data/maps/Route6_NorthEntrance/scripts.inc b/data/maps/Route6_NorthEntrance/scripts.inc new file mode 100644 index 000000000..836396d94 --- /dev/null +++ b/data/maps/Route6_NorthEntrance/scripts.inc @@ -0,0 +1,92 @@ +Route6_NorthEntrance_MapScripts:: @ 816F9C6 + .byte 0 + +Route6_NorthEntrance_EventScript_16F9C7:: @ 816F9C7 + loadword 0, gUnknown_819E2A3 + callstd 2 + end + +Route6_NorthEntrance_EventScript_16F9D0:: @ 816F9D0 + lockall + setvar VAR_0x4001, 0 + goto EventScript_16F9F4 + end + +Route6_NorthEntrance_EventScript_16F9DC:: @ 816F9DC + lockall + setvar VAR_0x4001, 1 + goto EventScript_16F9F4 + end + +Route6_NorthEntrance_EventScript_16F9E8:: @ 816F9E8 + lockall + setvar VAR_0x4001, 2 + goto EventScript_16F9F4 + end + +EventScript_16F9F4:: @ 816F9F4 + textcolor 0 + applymovement 255, Movement_1A75EB + waitmovement 0 + checkflag FLAG_0x2A6 + goto_if 1, EventScript_16FA1E + loadword 0, gUnknown_819E181 + callstd 4 + closemessage + applymovement 255, Movement_16FA8A + waitmovement 0 + releaseall + end + +EventScript_16FA1E:: @ 816FA1E + removeitem ITEM_TEA, 1 + goto EventScript_16FA29 + end + +EventScript_16FA29:: @ 816FA29 + loadword 0, gUnknown_819E1D1 + callstd 4 + closemessage + compare_var_to_value VAR_0x4001, 0 + call_if 1, EventScript_16FA62 + compare_var_to_value VAR_0x4001, 1 + call_if 1, EventScript_16FA6D + compare_var_to_value VAR_0x4001, 2 + call_if 1, EventScript_16FA78 + loadword 0, gUnknown_819E1F7 + callstd 4 + setvar VAR_0x4062, 1 + releaseall + end + +EventScript_16FA62:: @ 816FA62 + applymovement 255, Movement_16FA83 + waitmovement 0 + return + +EventScript_16FA6D:: @ 816FA6D + applymovement 255, Movement_16FA86 + waitmovement 0 + return + +EventScript_16FA78:: @ 816FA78 + applymovement 255, Movement_16FA88 + waitmovement 0 + return + +Movement_16FA83:: @ 816FA83 + step_13 + step_13 + step_end + +Movement_16FA86:: @ 816FA86 + step_13 + step_end + +Movement_16FA88:: @ 816FA88 + step_28 + step_end + +Movement_16FA8A:: @ 816FA8A + step_10 + step_end diff --git a/data/maps/Route7/scripts.inc b/data/maps/Route7/scripts.inc new file mode 100644 index 000000000..7ec9bd6a0 --- /dev/null +++ b/data/maps/Route7/scripts.inc @@ -0,0 +1,7 @@ +Route7_MapScripts:: @ 8167FBB + .byte 0 + +Route7_EventScript_167FBC:: @ 8167FBC + loadword 0, gUnknown_8184097 + callstd 3 + end diff --git a/data/maps/Route7_EastEntrance/scripts.inc b/data/maps/Route7_EastEntrance/scripts.inc new file mode 100644 index 000000000..242081916 --- /dev/null +++ b/data/maps/Route7_EastEntrance/scripts.inc @@ -0,0 +1,92 @@ +Route7_EastEntrance_MapScripts:: @ 816FA8D + .byte 0 + +Route7_EastEntrance_EventScript_16FA8E:: @ 816FA8E + loadword 0, gUnknown_819E3D9 + callstd 2 + end + +Route7_EastEntrance_EventScript_16FA97:: @ 816FA97 + lockall + setvar VAR_0x4001, 0 + goto EventScript_16FABB + end + +Route7_EastEntrance_EventScript_16FAA3:: @ 816FAA3 + lockall + setvar VAR_0x4001, 1 + goto EventScript_16FABB + end + +Route7_EastEntrance_EventScript_16FAAF:: @ 816FAAF + lockall + setvar VAR_0x4001, 2 + goto EventScript_16FABB + end + +EventScript_16FABB:: @ 816FABB + textcolor 0 + applymovement 255, Movement_1A75E9 + waitmovement 0 + checkflag FLAG_0x2A6 + goto_if 1, EventScript_16FAE5 + loadword 0, gUnknown_819E2B7 + callstd 4 + closemessage + applymovement 255, Movement_16FB51 + waitmovement 0 + releaseall + end + +EventScript_16FAE5:: @ 816FAE5 + removeitem ITEM_TEA, 1 + goto EventScript_16FAF0 + end + +EventScript_16FAF0:: @ 816FAF0 + loadword 0, gUnknown_819E307 + callstd 4 + closemessage + compare_var_to_value VAR_0x4001, 0 + call_if 1, EventScript_16FB29 + compare_var_to_value VAR_0x4001, 1 + call_if 1, EventScript_16FB34 + compare_var_to_value VAR_0x4001, 2 + call_if 1, EventScript_16FB3F + loadword 0, gUnknown_819E32D + callstd 4 + setvar VAR_0x4062, 1 + releaseall + end + +EventScript_16FB29:: @ 816FB29 + applymovement 255, Movement_16FB4F + waitmovement 0 + return + +EventScript_16FB34:: @ 816FB34 + applymovement 255, Movement_16FB4A + waitmovement 0 + return + +EventScript_16FB3F:: @ 816FB3F + applymovement 255, Movement_16FB4C + waitmovement 0 + return + +Movement_16FB4A:: @ 816FB4A + step_11 + step_end + +Movement_16FB4C:: @ 816FB4C + step_11 + step_11 + step_end + +Movement_16FB4F:: @ 816FB4F + step_26 + step_end + +Movement_16FB51:: @ 816FB51 + step_12 + step_end diff --git a/data/maps/Route8/scripts.inc b/data/maps/Route8/scripts.inc new file mode 100644 index 000000000..d789a05d6 --- /dev/null +++ b/data/maps/Route8/scripts.inc @@ -0,0 +1,7 @@ +Route8_MapScripts:: @ 8167FC5 + .byte 0 + +Route8_EventScript_167FC6:: @ 8167FC6 + loadword 0, gUnknown_8184576 + callstd 3 + end diff --git a/data/maps/Route8_WestEntrance/scripts.inc b/data/maps/Route8_WestEntrance/scripts.inc new file mode 100644 index 000000000..472bb5b8f --- /dev/null +++ b/data/maps/Route8_WestEntrance/scripts.inc @@ -0,0 +1,102 @@ +Route8_WestEntrance_MapScripts:: @ 816FB53 + .byte 0 + +Route8_WestEntrance_EventScript_16FB54:: @ 816FB54 + loadword 0, gUnknown_819E50F + callstd 2 + end + +Route8_WestEntrance_EventScript_16FB5D:: @ 816FB5D + lockall + setvar VAR_0x4001, 0 + goto EventScript_16FB81 + end + +Route8_WestEntrance_EventScript_16FB69:: @ 816FB69 + lockall + setvar VAR_0x4001, 1 + goto EventScript_16FB81 + end + +Route8_WestEntrance_EventScript_16FB75:: @ 816FB75 + lockall + setvar VAR_0x4001, 2 + goto EventScript_16FB81 + end + +EventScript_16FB81:: @ 816FB81 + textcolor 0 + applymovement 255, Movement_1A75E9 + waitmovement 0 + checkflag FLAG_0x2A6 + goto_if 1, EventScript_16FBAB + loadword 0, gUnknown_819E3ED + callstd 4 + closemessage + applymovement 255, Movement_16FC2D + waitmovement 0 + releaseall + end + +EventScript_16FBAB:: @ 816FBAB + removeitem ITEM_TEA, 1 + goto EventScript_16FBCC + end + +EventScript_16FBB6:: @ 816FBB6 + removeitem ITEM_SODA_POP, 1 + goto EventScript_16FBCC + end + +EventScript_16FBC1:: @ 816FBC1 + removeitem ITEM_LEMONADE, 1 + goto EventScript_16FBCC + end + +EventScript_16FBCC:: @ 816FBCC + loadword 0, gUnknown_819E43D + callstd 4 + closemessage + compare_var_to_value VAR_0x4001, 0 + call_if 1, EventScript_16FC05 + compare_var_to_value VAR_0x4001, 1 + call_if 1, EventScript_16FC10 + compare_var_to_value VAR_0x4001, 2 + call_if 1, EventScript_16FC1B + loadword 0, gUnknown_819E463 + callstd 4 + setvar VAR_0x4062, 1 + releaseall + end + +EventScript_16FC05:: @ 816FC05 + applymovement 255, Movement_16FC2B + waitmovement 0 + return + +EventScript_16FC10:: @ 816FC10 + applymovement 255, Movement_16FC26 + waitmovement 0 + return + +EventScript_16FC1B:: @ 816FC1B + applymovement 255, Movement_16FC28 + waitmovement 0 + return + +Movement_16FC26:: @ 816FC26 + step_11 + step_end + +Movement_16FC28:: @ 816FC28 + step_11 + step_11 + step_end + +Movement_16FC2B:: @ 816FC2B + step_26 + step_end + +Movement_16FC2D:: @ 816FC2D + step_13 + step_end diff --git a/data/maps/Route9/scripts.inc b/data/maps/Route9/scripts.inc new file mode 100644 index 000000000..a6492a3e1 --- /dev/null +++ b/data/maps/Route9/scripts.inc @@ -0,0 +1,7 @@ +Route9_MapScripts:: @ 8167FCF + .byte 0 + +Route9_EventScript_167FD0:: @ 8167FD0 + loadword 0, gUnknown_8184B66 + callstd 3 + end diff --git a/data/maps/SSAnne_1F_Corridor/scripts.inc b/data/maps/SSAnne_1F_Corridor/scripts.inc new file mode 100644 index 000000000..0d84f7851 --- /dev/null +++ b/data/maps/SSAnne_1F_Corridor/scripts.inc @@ -0,0 +1,12 @@ +SSAnne_1F_Corridor_MapScripts:: @ 81608CB + .byte 0 + +SSAnne_1F_Corridor_EventScript_1608CC:: @ 81608CC + loadword 0, gUnknown_8172EE7 + callstd 2 + end + +SSAnne_1F_Corridor_EventScript_1608D5:: @ 81608D5 + loadword 0, gUnknown_8172F60 + callstd 2 + end diff --git a/data/maps/SSAnne_1F_Room1/scripts.inc b/data/maps/SSAnne_1F_Room1/scripts.inc new file mode 100644 index 000000000..578278550 --- /dev/null +++ b/data/maps/SSAnne_1F_Room1/scripts.inc @@ -0,0 +1,7 @@ +SSAnne_1F_Room1_MapScripts:: @ 8160BDB + .byte 0 + +SSAnne_1F_Room1_EventScript_160BDC:: @ 8160BDC + loadword 0, gUnknown_817393B + callstd 2 + end diff --git a/data/maps/SSAnne_1F_Room11/scripts.inc b/data/maps/SSAnne_1F_Room11/scripts.inc new file mode 100644 index 000000000..4fe45988b --- /dev/null +++ b/data/maps/SSAnne_1F_Room11/scripts.inc @@ -0,0 +1,92 @@ +SSAnne_1F_Room11_MapScripts:: @ 8164559 + map_script 3, SSAnne_1F_Room11_MapScript1_16455F + .byte 0 + +SSAnne_1F_Room11_MapScript1_16455F:: @ 816455F + setworldmapflag 2237 + getplayerxy VAR_0x4001, VAR_0x4002 + compare_var_to_value VAR_0x4001, 50 + call_if 4, EventScript_16457E + compare_var_to_value VAR_0x4001, 49 + call_if 3, EventScript_164587 + end + +EventScript_16457E:: @ 816457E + setescapewarp MAP_SIXISLAND_GREENPATH, 255, 64, 10 + return + +EventScript_164587:: @ 8164587 + setescapewarp MAP_SIXISLAND_GREENPATH, 255, 45, 10 + return + +SSAnne_1F_Room11_EventScript_164590:: @ 8164590 + trainerbattle 0, 609, 0, Text_17BF3A, Text_17BF66 + loadword 0, gUnknown_817BF97 + callstd 6 + end + +SSAnne_1F_Room11_EventScript_1645A7:: @ 81645A7 + trainerbattle 0, 610, 0, Text_17BFEB, Text_17C028 + loadword 0, gUnknown_817C056 + callstd 6 + end + +SSAnne_1F_Room11_EventScript_1645BE:: @ 81645BE + trainerbattle 0, 611, 0, Text_17C0BE, Text_17C0F2 + loadword 0, gUnknown_817C113 + callstd 6 + end + +SSAnne_1F_Room11_EventScript_1645D5:: @ 81645D5 + trainerbattle 0, 612, 0, Text_17C155, Text_17C196 + loadword 0, gUnknown_817C1D0 + callstd 6 + end + +SSAnne_1F_Room11_EventScript_1645EC:: @ 81645EC + trainerbattle 0, 613, 0, Text_17C246, Text_17C275 + loadword 0, gUnknown_817C2A4 + callstd 6 + end + +SSAnne_1F_Room11_EventScript_164603:: @ 8164603 + trainerbattle 0, 614, 0, Text_17C2D9, Text_17C30D + loadword 0, gUnknown_817C31C + callstd 6 + end + +SSAnne_1F_Room11_EventScript_16461A:: @ 816461A + trainerbattle 0, 615, 0, Text_17C373, Text_17C3A5 + loadword 0, gUnknown_817C3CE + callstd 6 + end + +SSAnne_1F_Room11_EventScript_164631:: @ 8164631 + trainerbattle 0, 616, 0, Text_17C42B, Text_17C458 + loadword 0, gUnknown_817C490 + callstd 6 + end + +SSAnne_1F_Room11_EventScript_164648:: @ 8164648 + trainerbattle 0, 617, 0, Text_17C4FE, Text_17C552 + loadword 0, gUnknown_817C590 + callstd 6 + end + +SSAnne_1F_Room11_EventScript_16465F:: @ 816465F + trainerbattle 0, 618, 0, Text_17C5DB, Text_17C609 + loadword 0, gUnknown_817C615 + callstd 6 + end + +SSAnne_1F_Room11_EventScript_164676:: @ 8164676 + trainerbattle 0, 619, 0, Text_17C63E, Text_17C660 + loadword 0, gUnknown_817C68E + callstd 6 + end + +SSAnne_1F_Room11_EventScript_16468D:: @ 816468D + trainerbattle 0, 620, 0, Text_17C6C9, Text_17C6FB + loadword 0, gUnknown_817C728 + callstd 6 + end diff --git a/data/maps/SSAnne_1F_Room12/scripts.inc b/data/maps/SSAnne_1F_Room12/scripts.inc new file mode 100644 index 000000000..5f52018d8 --- /dev/null +++ b/data/maps/SSAnne_1F_Room12/scripts.inc @@ -0,0 +1,7 @@ +SSAnne_1F_Room12_MapScripts:: @ 81646A4 + map_script 3, SSAnne_1F_Room12_MapScript1_1646AA + .byte 0 + +SSAnne_1F_Room12_MapScript1_1646AA:: @ 81646AA + setworldmapflag 2238 + end diff --git a/data/maps/SSAnne_1F_Room2/scripts.inc b/data/maps/SSAnne_1F_Room2/scripts.inc new file mode 100644 index 000000000..f0670a7e6 --- /dev/null +++ b/data/maps/SSAnne_1F_Room2/scripts.inc @@ -0,0 +1,19 @@ +SSAnne_1F_Room2_MapScripts:: @ 8160BE5 + .byte 0 + +SSAnne_1F_Room2_EventScript_160BE6:: @ 8160BE6 + loadword 0, gUnknown_8173AC5 + callstd 2 + end + +SSAnne_1F_Room2_EventScript_160BEF:: @ 8160BEF + trainerbattle 0, 126, 0, Text_173A1A, Text_173A4F + loadword 0, gUnknown_8173A7A + callstd 6 + end + +SSAnne_1F_Room2_EventScript_160C06:: @ 8160C06 + trainerbattle 0, 96, 0, Text_173999, Text_1739B1 + loadword 0, gUnknown_81739C5 + callstd 6 + end diff --git a/data/maps/SSAnne_1F_Room3/scripts.inc b/data/maps/SSAnne_1F_Room3/scripts.inc new file mode 100644 index 000000000..a1f69d1da --- /dev/null +++ b/data/maps/SSAnne_1F_Room3/scripts.inc @@ -0,0 +1,23 @@ +SSAnne_1F_Room3_MapScripts:: @ 8160C1D + .byte 0 + +SSAnne_1F_Room3_EventScript_160C1E:: @ 8160C1E + loadword 0, gUnknown_8173B21 + callstd 2 + end + +SSAnne_1F_Room3_EventScript_160C27:: @ 8160C27 + loadword 0, gUnknown_8173AFA + callstd 2 + end + +SSAnne_1F_Room3_EventScript_160C30:: @ 8160C30 + lock + faceplayer + waitse + playmoncry SPECIES_WIGGLYTUFF, 0 + loadword 0, gUnknown_8173B61 + callstd 4 + waitmoncry + release + end diff --git a/data/maps/SSAnne_1F_Room4/scripts.inc b/data/maps/SSAnne_1F_Room4/scripts.inc new file mode 100644 index 000000000..224bd98fd --- /dev/null +++ b/data/maps/SSAnne_1F_Room4/scripts.inc @@ -0,0 +1,19 @@ +SSAnne_1F_Room4_MapScripts:: @ 8160C43 + .byte 0 + +SSAnne_1F_Room4_EventScript_160C44:: @ 8160C44 + lock + faceplayer + checkplayergender + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_160C5C + loadword 0, gUnknown_8173BA4 + callstd 4 + release + end + +EventScript_160C5C:: @ 8160C5C + loadword 0, gUnknown_8173B79 + callstd 4 + release + end diff --git a/data/maps/SSAnne_1F_Room5/scripts.inc b/data/maps/SSAnne_1F_Room5/scripts.inc new file mode 100644 index 000000000..e56b3d1fc --- /dev/null +++ b/data/maps/SSAnne_1F_Room5/scripts.inc @@ -0,0 +1,8 @@ +SSAnne_1F_Room5_MapScripts:: @ 8160C66 + .byte 0 + +SSAnne_1F_Room5_EventScript_160C67:: @ 8160C67 + trainerbattle 0, 422, 0, Text_173BD1, Text_173BFA + loadword 0, gUnknown_8173C30 + callstd 6 + end diff --git a/data/maps/SSAnne_1F_Room6/scripts.inc b/data/maps/SSAnne_1F_Room6/scripts.inc new file mode 100644 index 000000000..9ebb100d8 --- /dev/null +++ b/data/maps/SSAnne_1F_Room6/scripts.inc @@ -0,0 +1,31 @@ +SSAnne_1F_Room6_MapScripts:: @ 8160DF2 + .byte 0 + +SSAnne_1F_Room6_EventScript_160DF3:: @ 8160DF3 + lock + faceplayer + loadword 0, gUnknown_817445B + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_160E18 + closemessage + call EventScript_1A6C26 + loadword 0, gUnknown_8174490 + callstd 4 + release + end + +EventScript_160E18:: @ 8160E18 + checkplayergender + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_160E2E + loadword 0, gUnknown_8174515 + callstd 4 + release + end + +EventScript_160E2E:: @ 8160E2E + loadword 0, gUnknown_81744D0 + callstd 4 + release + end diff --git a/data/maps/SSAnne_1F_Room7/scripts.inc b/data/maps/SSAnne_1F_Room7/scripts.inc new file mode 100644 index 000000000..7e5387084 --- /dev/null +++ b/data/maps/SSAnne_1F_Room7/scripts.inc @@ -0,0 +1,8 @@ +SSAnne_1F_Room7_MapScripts:: @ 8160C7E + .byte 0 + +SSAnne_1F_Room7_EventScript_160C7F:: @ 8160C7F + trainerbattle 0, 421, 0, Text_173C52, Text_173CB4 + loadword 0, gUnknown_8173CC4 + callstd 6 + end diff --git a/data/maps/SSAnne_2F_Corridor/scripts.inc b/data/maps/SSAnne_2F_Corridor/scripts.inc new file mode 100644 index 000000000..0cecaff2e --- /dev/null +++ b/data/maps/SSAnne_2F_Corridor/scripts.inc @@ -0,0 +1,187 @@ +SSAnne_2F_Corridor_MapScripts:: @ 81608DE + .byte 0 + +SSAnne_2F_Corridor_EventScript_1608DF:: @ 81608DF + lockall + setvar VAR_0x4001, 0 + goto EventScript_160903 + +EventScript_1608EA:: @ 81608EA + end + +SSAnne_2F_Corridor_EventScript_1608EB:: @ 81608EB + lockall + setvar VAR_0x4001, 1 + goto EventScript_160903 + +EventScript_1608F6:: @ 81608F6 + end + +SSAnne_2F_Corridor_EventScript_1608F7:: @ 81608F7 + lockall + setvar VAR_0x4001, 2 + goto EventScript_160903 + +EventScript_160902:: @ 8160902 + end + +EventScript_160903:: @ 8160903 + textcolor 0 + playse SE_KAIDAN + delay 5 + playbgm BGM_FRLG_RIVAL, 0 + addobject 1 + delay 10 + applymovement 1, Movement_1A75ED + waitmovement 0 + delay 20 + compare_var_to_value VAR_0x4001, 0 + call_if 1, EventScript_1609AD + compare_var_to_value VAR_0x4001, 1 + call_if 1, EventScript_1609B8 + compare_var_to_value VAR_0x4001, 2 + call_if 1, EventScript_1609CA + loadword 0, gUnknown_8173035 + callstd 4 + setvar VAR_LAST_TALKED, 1 + compare_var_to_value VAR_STARTER_MON, 2 + call_if 1, EventScript_1609DC + compare_var_to_value VAR_STARTER_MON, 1 + call_if 1, EventScript_1609E7 + compare_var_to_value VAR_STARTER_MON, 0 + call_if 1, EventScript_1609F2 + loadword 0, gUnknown_8173164 + callstd 4 + closemessage + delay 10 + playbgm BGM_FRLG_RIVAL_POSTBATTLE, 0 + compare_var_to_value VAR_0x4001, 0 + call_if 1, EventScript_1609FD + compare_var_to_value VAR_0x4001, 1 + call_if 1, EventScript_160A08 + compare_var_to_value VAR_0x4001, 2 + call_if 1, EventScript_160A13 + fadedefaultbgm + removeobject 1 + setvar VAR_0x405B, 1 + releaseall + end + +EventScript_1609AD:: @ 81609AD + applymovement 1, Movement_160A2A + waitmovement 0 + return + +EventScript_1609B8:: @ 81609B8 + applymovement 1, Movement_160A2E + applymovement 255, Movement_160A24 + waitmovement 0 + return + +EventScript_1609CA:: @ 81609CA + applymovement 255, Movement_160A1E + applymovement 1, Movement_160A34 + waitmovement 0 + return + +EventScript_1609DC:: @ 81609DC + trainerbattle 3, 426, 0, Text_173110 + return + +EventScript_1609E7:: @ 81609E7 + trainerbattle 3, 427, 0, Text_173110 + return + +EventScript_1609F2:: @ 81609F2 + trainerbattle 3, 428, 0, Text_173110 + return + +EventScript_1609FD:: @ 81609FD + applymovement 1, Movement_160A3B + waitmovement 0 + return + +EventScript_160A08:: @ 8160A08 + applymovement 1, Movement_160A44 + waitmovement 0 + return + +EventScript_160A13:: @ 8160A13 + applymovement 1, Movement_160A4C + waitmovement 0 + return + +Movement_160A1E:: @ 8160A1E + step_1c + step_1c + step_1c + step_1c + step_2f + step_end + +Movement_160A24:: @ 8160A24 + step_1c + step_1c + step_1c + step_1c + step_2f + step_end + +Movement_160A2A:: @ 8160A2A + step_10 + step_10 + step_10 + step_end + +Movement_160A2E:: @ 8160A2E + step_10 + step_10 + step_10 + step_10 + step_30 + step_end + +Movement_160A34:: @ 8160A34 + step_10 + step_10 + step_10 + step_10 + step_13 + step_1a + step_end + +Movement_160A3B:: @ 8160A3B + step_13 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_end + +Movement_160A44:: @ 8160A44 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_end + +Movement_160A4C:: @ 8160A4C + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_end + +SSAnne_2F_Corridor_EventScript_160A54:: @ 8160A54 + loadword 0, gUnknown_8172FC3 + callstd 2 + end diff --git a/data/maps/SSAnne_2F_Room1/scripts.inc b/data/maps/SSAnne_2F_Room1/scripts.inc new file mode 100644 index 000000000..65f373a77 --- /dev/null +++ b/data/maps/SSAnne_2F_Room1/scripts.inc @@ -0,0 +1,15 @@ +SSAnne_2F_Room1_MapScripts:: @ 8160C96 + .byte 0 + +SSAnne_2F_Room1_EventScript_160C97:: @ 8160C97 + lock + faceplayer + message Text_173CE3 + waitmessage + setvar VAR_0x8004, 143 + special sub_80CBDCC + drawmonpic SPECIES_SNORLAX, 10, 3 + waitbuttonpress + erasemonpic + release + end diff --git a/data/maps/SSAnne_2F_Room2/scripts.inc b/data/maps/SSAnne_2F_Room2/scripts.inc new file mode 100644 index 000000000..0adab213c --- /dev/null +++ b/data/maps/SSAnne_2F_Room2/scripts.inc @@ -0,0 +1,14 @@ +SSAnne_2F_Room2_MapScripts:: @ 8160CB0 + .byte 0 + +SSAnne_2F_Room2_EventScript_160CB1:: @ 8160CB1 + trainerbattle 0, 223, 0, Text_173DDB, Text_173DF7 + loadword 0, gUnknown_8173E04 + callstd 6 + end + +SSAnne_2F_Room2_EventScript_160CC8:: @ 8160CC8 + trainerbattle 0, 482, 0, Text_173D63, Text_173D92 + loadword 0, gUnknown_8173DB6 + callstd 6 + end diff --git a/data/maps/SSAnne_2F_Room3/scripts.inc b/data/maps/SSAnne_2F_Room3/scripts.inc new file mode 100644 index 000000000..e2acc4ccd --- /dev/null +++ b/data/maps/SSAnne_2F_Room3/scripts.inc @@ -0,0 +1,12 @@ +SSAnne_2F_Room3_MapScripts:: @ 8160CDF + .byte 0 + +SSAnne_2F_Room3_EventScript_160CE0:: @ 8160CE0 + loadword 0, gUnknown_8173E3A + callstd 2 + end + +SSAnne_2F_Room3_EventScript_160CE9:: @ 8160CE9 + loadword 0, gUnknown_8173E7B + callstd 2 + end diff --git a/data/maps/SSAnne_2F_Room4/scripts.inc b/data/maps/SSAnne_2F_Room4/scripts.inc new file mode 100644 index 000000000..d9ffc8a55 --- /dev/null +++ b/data/maps/SSAnne_2F_Room4/scripts.inc @@ -0,0 +1,14 @@ +SSAnne_2F_Room4_MapScripts:: @ 8160CF2 + .byte 0 + +SSAnne_2F_Room4_EventScript_160CF3:: @ 8160CF3 + trainerbattle 0, 483, 0, Text_173F07, Text_173F42 + loadword 0, gUnknown_8173F55 + callstd 6 + end + +SSAnne_2F_Room4_EventScript_160D0A:: @ 8160D0A + trainerbattle 0, 127, 0, Text_173F83, Text_173FAB + loadword 0, gUnknown_8173FB9 + callstd 6 + end diff --git a/data/maps/SSAnne_2F_Room5/scripts.inc b/data/maps/SSAnne_2F_Room5/scripts.inc new file mode 100644 index 000000000..e3d94ecff --- /dev/null +++ b/data/maps/SSAnne_2F_Room5/scripts.inc @@ -0,0 +1,12 @@ +SSAnne_2F_Room5_MapScripts:: @ 8160D21 + .byte 0 + +SSAnne_2F_Room5_EventScript_160D22:: @ 8160D22 + loadword 0, gUnknown_8173FF7 + callstd 2 + end + +SSAnne_2F_Room5_EventScript_160D2B:: @ 8160D2B + loadword 0, gUnknown_817404F + callstd 2 + end diff --git a/data/maps/SSAnne_2F_Room6/scripts.inc b/data/maps/SSAnne_2F_Room6/scripts.inc new file mode 100644 index 000000000..3c43d9243 --- /dev/null +++ b/data/maps/SSAnne_2F_Room6/scripts.inc @@ -0,0 +1,12 @@ +SSAnne_2F_Room6_MapScripts:: @ 8160D34 + .byte 0 + +SSAnne_2F_Room6_EventScript_160D35:: @ 8160D35 + loadword 0, gUnknown_81740A1 + callstd 2 + end + +SSAnne_2F_Room6_EventScript_160D3E:: @ 8160D3E + loadword 0, gUnknown_81740D6 + callstd 2 + end diff --git a/data/maps/SSAnne_3F_Corridor/scripts.inc b/data/maps/SSAnne_3F_Corridor/scripts.inc new file mode 100644 index 000000000..21017b2a2 --- /dev/null +++ b/data/maps/SSAnne_3F_Corridor/scripts.inc @@ -0,0 +1,7 @@ +SSAnne_3F_Corridor_MapScripts:: @ 8160A5D + .byte 0 + +SSAnne_3F_Corridor_EventScript_160A5E:: @ 8160A5E + loadword 0, gUnknown_817320C + callstd 2 + end diff --git a/data/maps/SSAnne_B1F_Corridor/scripts.inc b/data/maps/SSAnne_B1F_Corridor/scripts.inc new file mode 100644 index 000000000..3e4641593 --- /dev/null +++ b/data/maps/SSAnne_B1F_Corridor/scripts.inc @@ -0,0 +1,2 @@ +SSAnne_B1F_Corridor_MapScripts:: @ 8160A67 + .byte 0 diff --git a/data/maps/SSAnne_B1F_Room1/scripts.inc b/data/maps/SSAnne_B1F_Room1/scripts.inc new file mode 100644 index 000000000..4bbfb167a --- /dev/null +++ b/data/maps/SSAnne_B1F_Room1/scripts.inc @@ -0,0 +1,14 @@ +SSAnne_B1F_Room1_MapScripts:: @ 8160D47 + .byte 0 + +SSAnne_B1F_Room1_EventScript_160D48:: @ 8160D48 + trainerbattle 0, 224, 0, Text_174177, Text_1741EF + loadword 0, gUnknown_817420E + callstd 6 + end + +SSAnne_B1F_Room1_EventScript_160D5F:: @ 8160D5F + trainerbattle 0, 140, 0, Text_1740F6, Text_174123 + loadword 0, gUnknown_817413A + callstd 6 + end diff --git a/data/maps/SSAnne_B1F_Room2/scripts.inc b/data/maps/SSAnne_B1F_Room2/scripts.inc new file mode 100644 index 000000000..d982818bc --- /dev/null +++ b/data/maps/SSAnne_B1F_Room2/scripts.inc @@ -0,0 +1,8 @@ +SSAnne_B1F_Room2_MapScripts:: @ 8160D76 + .byte 0 + +SSAnne_B1F_Room2_EventScript_160D77:: @ 8160D77 + trainerbattle 0, 138, 0, Text_174239, Text_17425C + loadword 0, gUnknown_8174272 + callstd 6 + end diff --git a/data/maps/SSAnne_B1F_Room3/scripts.inc b/data/maps/SSAnne_B1F_Room3/scripts.inc new file mode 100644 index 000000000..b61516005 --- /dev/null +++ b/data/maps/SSAnne_B1F_Room3/scripts.inc @@ -0,0 +1,8 @@ +SSAnne_B1F_Room3_MapScripts:: @ 8160D8E + .byte 0 + +SSAnne_B1F_Room3_EventScript_160D8F:: @ 8160D8F + trainerbattle 0, 139, 0, Text_1742A6, Text_1742C3 + loadword 0, gUnknown_81742D2 + callstd 6 + end diff --git a/data/maps/SSAnne_B1F_Room4/scripts.inc b/data/maps/SSAnne_B1F_Room4/scripts.inc new file mode 100644 index 000000000..c81c58192 --- /dev/null +++ b/data/maps/SSAnne_B1F_Room4/scripts.inc @@ -0,0 +1,14 @@ +SSAnne_B1F_Room4_MapScripts:: @ 8160DA6 + .byte 0 + +SSAnne_B1F_Room4_EventScript_160DA7:: @ 8160DA7 + trainerbattle 0, 136, 0, Text_174315, Text_174348 + loadword 0, gUnknown_8174362 + callstd 6 + end + +SSAnne_B1F_Room4_EventScript_160DBE:: @ 8160DBE + trainerbattle 0, 137, 0, Text_174385, Text_1743B3 + loadword 0, gUnknown_81743C8 + callstd 6 + end diff --git a/data/maps/SSAnne_B1F_Room5/scripts.inc b/data/maps/SSAnne_B1F_Room5/scripts.inc new file mode 100644 index 000000000..b38ab6265 --- /dev/null +++ b/data/maps/SSAnne_B1F_Room5/scripts.inc @@ -0,0 +1,18 @@ +SSAnne_B1F_Room5_MapScripts:: @ 8160DD5 + .byte 0 + +SSAnne_B1F_Room5_EventScript_160DD6:: @ 8160DD6 + loadword 0, gUnknown_81743F8 + callstd 2 + end + +SSAnne_B1F_Room5_EventScript_160DDF:: @ 8160DDF + lock + faceplayer + waitse + playmoncry SPECIES_MACHOKE, 0 + loadword 0, gUnknown_8174444 + callstd 4 + waitmoncry + release + end diff --git a/data/maps/SSAnne_CaptainsOffice/scripts.inc b/data/maps/SSAnne_CaptainsOffice/scripts.inc new file mode 100644 index 000000000..98b9c8b42 --- /dev/null +++ b/data/maps/SSAnne_CaptainsOffice/scripts.inc @@ -0,0 +1,59 @@ +SSAnne_CaptainsOffice_MapScripts:: @ 8160B39 + .byte 0 + +SSAnne_CaptainsOffice_EventScript_160B3A:: @ 8160B3A + lock + checkflag FLAG_0x237 + goto_if 1, EventScript_160BB5 + loadword 0, gUnknown_8173646 + callstd 4 + textcolor 3 + message Text_173676 + waitmessage + playfanfare MUS_ME_ASA + waitfanfare + call EventScript_1A6675 + delay 50 + applymovement 1, Movement_1A75E1 + waitmovement 0 + loadword 0, gUnknown_81736A6 + callstd 4 + additem ITEM_HM01, 1 + loadword 0, gUnknown_81737AF + setorcopyvar VAR_0x8000, 339 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 318 + callstd 9 + loadword 0, gUnknown_81737D2 + callstd 4 + setflag FLAG_0x237 + setvar VAR_0x407E, 1 + release + end + +EventScript_160BA0:: @ 8160BA0 + loadword 0, gUnknown_81738C3 + callstd 4 + closemessage + applymovement 1, Movement_1A75E5 + waitmovement 0 + release + end + +EventScript_160BB5:: @ 8160BB5 + applymovement 1, Movement_1A75E1 + waitmovement 0 + loadword 0, gUnknown_8173831 + callstd 4 + release + end + +SSAnne_CaptainsOffice_EventScript_160BC9:: @ 8160BC9 + loadword 0, gUnknown_81738E6 + callstd 3 + end + +SSAnne_CaptainsOffice_EventScript_160BD2:: @ 8160BD2 + loadword 0, gUnknown_8173903 + callstd 3 + end diff --git a/data/maps/SSAnne_CaptainsOffice2/scripts.inc b/data/maps/SSAnne_CaptainsOffice2/scripts.inc new file mode 100644 index 000000000..fb9065ad4 --- /dev/null +++ b/data/maps/SSAnne_CaptainsOffice2/scripts.inc @@ -0,0 +1,2 @@ +SSAnne_CaptainsOffice2_MapScripts:: @ 8163D81 + .byte 0 diff --git a/data/maps/SSAnne_CaptainsOffice3/scripts.inc b/data/maps/SSAnne_CaptainsOffice3/scripts.inc new file mode 100644 index 000000000..350845084 --- /dev/null +++ b/data/maps/SSAnne_CaptainsOffice3/scripts.inc @@ -0,0 +1,201 @@ +SSAnne_CaptainsOffice3_MapScripts:: @ 8163D82 + map_script 3, SSAnne_CaptainsOffice3_MapScript1_163D88 + .byte 0 + +SSAnne_CaptainsOffice3_MapScript1_163D88:: @ 8163D88 + compare_var_to_value VAR_0x4080, 1 + call_if 1, EventScript_163D94 + end + +EventScript_163D94:: @ 8163D94 + setflag FLAG_0x08B + return + +SSAnne_CaptainsOffice3_EventScript_163D98:: @ 8163D98 + lockall + textcolor 1 + loadword 0, gUnknown_817B04F + callstd 4 + applymovement 1, Movement_163EE8 + waitmovement 0 + textcolor 0 + loadword 0, gUnknown_817B0B9 + callstd 4 + closemessage + playse SE_PIN + applymovement 3, Movement_1A75DB + waitmovement 0 + applymovement 3, Movement_1A75ED + waitmovement 0 + applymovement 3, Movement_1A75DD + waitmovement 0 + textcolor 1 + loadword 0, gUnknown_817B109 + callstd 4 + closemessage + applymovement 3, Movement_1A75EB + waitmovement 0 + delay 18 + applymovement 3, Movement_1A75ED + waitmovement 0 + delay 35 + applymovement 4, Movement_163F11 + applymovement 3, Movement_163F18 + applymovement 255, Movement_163EDD + waitmovement 0 + applymovement 2, Movement_163EE8 + waitmovement 0 + playbgm BGM_FRLG_SUSPICIOUS_EYE, 0 + textcolor 0 + loadword 0, gUnknown_817B20B + callstd 4 + setvar VAR_LAST_TALKED, 4 + trainerbattle 3, 539, 0, Text_17B251 + applymovement 3, Movement_163F1B + waitmovement 0 + textcolor 1 + loadword 0, gUnknown_817B269 + callstd 4 + textcolor 0 + loadword 0, gUnknown_817B2EF + callstd 4 + textcolor 1 + message Text_17B313 + waitmessage + waitse + playmoncry SPECIES_LAPRAS, 2 + waitbuttonpress + waitmoncry + applymovement 1, Movement_163EEE + waitmovement 0 + textcolor 0 + loadword 0, gUnknown_817B399 + callstd 4 + closemessage + applymovement 3, Movement_163F1D + applymovement 255, Movement_163EE2 + applymovement 1, Movement_163EF0 + applymovement 2, Movement_163EFA + applymovement 4, Movement_163F05 + waitmovement 0 + removeobject 1 + removeobject 2 + removeobject 4 + delay 50 + applymovement 3, Movement_163F23 + waitmovement 0 + applymovement 255, Movement_1A75E7 + waitmovement 0 + textcolor 1 + loadword 0, gUnknown_817B457 + callstd 4 + setflag FLAG_0x08E + clearflag FLAG_0x08C + setvar VAR_0x4080, 1 + releaseall + end + +Movement_163EDD:: @ 8163EDD + step_11 + step_11 + step_13 + step_11 + step_end + +Movement_163EE2:: @ 8163EE2 + step_1c + step_2f + step_1c + step_1c + step_2d + step_end + +Movement_163EE8:: @ 8163EE8 + step_25 + step_end + +gUnknown_163EEA:: @ 8163EEA + step_4c + step_13 + step_4d + step_end + +Movement_163EEE:: @ 8163EEE + step_29 + step_end + +Movement_163EF0:: @ 8163EF0 + step_13 + step_10 + step_1d + step_1d + step_1d + step_1d + step_1d + step_1d + step_1d + step_end + +Movement_163EFA:: @ 8163EFA + step_1c + step_12 + step_10 + step_1d + step_1d + step_1d + step_1d + step_1d + step_1d + step_1d + step_end + +Movement_163F05:: @ 8163F05 + step_1c + step_10 + step_1c + step_10 + step_20 + step_20 + step_1d + step_1d + step_1d + step_1d + step_1d + step_end + +Movement_163F11:: @ 8163F11 + step_1c + step_1b + step_30 + step_end + +Movement_163F15:: @ 8163F15 + step_12 + step_12 + step_end + +Movement_163F18:: @ 8163F18 + step_12 + step_11 + step_end + +Movement_163F1B:: @ 8163F1B + step_26 + step_end + +Movement_163F1D:: @ 8163F1D + step_1b + step_30 + step_1c + step_1c + step_2d + step_end + +Movement_163F23:: @ 8163F23 + step_13 + step_end + +SSAnne_CaptainsOffice3_EventScript_163F25:: @ 8163F25 + loadword 0, gUnknown_817B457 + callstd 2 + end diff --git a/data/maps/SSAnne_CaptainsOffice4/scripts.inc b/data/maps/SSAnne_CaptainsOffice4/scripts.inc new file mode 100644 index 000000000..ac4d141be --- /dev/null +++ b/data/maps/SSAnne_CaptainsOffice4/scripts.inc @@ -0,0 +1,202 @@ +SSAnne_CaptainsOffice4_MapScripts:: @ 8163F2E + map_script 1, SSAnne_CaptainsOffice4_MapScript1_163F3D + map_script 3, SSAnne_CaptainsOffice4_MapScript2_163F39 + .byte 0 + +SSAnne_CaptainsOffice4_MapScript2_163F39:: @ 8163F39 + setworldmapflag 2233 + end + +SSAnne_CaptainsOffice4_MapScript1_163F3D:: @ 8163F3D + checktrainerflag 543 + call_if 1, EventScript_163F47 + end + +EventScript_163F47:: @ 8163F47 + setmetatile 26, 20, 672, 0 + setmetatile 27, 20, 672, 0 + return + +SSAnne_CaptainsOffice4_EventScript_163F5A:: @ 8163F5A + lockall + checkflag FLAG_0x2D5 + goto_if 1, EventScript_163F6E + loadword 0, gUnknown_817B4E3 + callstd 4 + releaseall + end + +EventScript_163F6E:: @ 8163F6E + loadword 0, gUnknown_817B512 + callstd 4 + releaseall + end + +SSAnne_CaptainsOffice4_EventScript_163F78:: @ 8163F78 + loadword 0, gUnknown_817BB15 + callstd 3 + end + +SSAnne_CaptainsOffice4_EventScript_163F81:: @ 8163F81 + lockall + applymovement 4, Movement_1A75E7 + waitmovement 0 + setvar VAR_0x4088, 1 + releaseall + end + +SSAnne_CaptainsOffice4_EventScript_163F93:: @ 8163F93 + trainerbattle 2, 545, 0, Text_17BBAF, Text_17BC55, EventScript_163FCD + checkflag 2116 + goto_if 1, EventScript_163FB7 + loadword 0, gUnknown_817BCA3 + callstd 6 + end + +EventScript_163FB7:: @ 8163FB7 + setvar VAR_0x8004, 15 + setvar VAR_0x8005, 5 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_817BCD7 + callstd 6 + end + +EventScript_163FCD:: @ 8163FCD + loadword 0, gUnknown_817BC6C + callstd 4 + setflag FLAG_0x2DC + setorcopyvar VAR_0x8000, 374 + setorcopyvar VAR_0x8001, 1 + callstd 0 + release + end + +SSAnne_CaptainsOffice4_EventScript_163FE6:: @ 8163FE6 + trainerbattle 0, 541, 0, Text_17B54D, Text_17B585 + loadword 0, gUnknown_817B5A6 + callstd 6 + end + +SSAnne_CaptainsOffice4_EventScript_163FFD:: @ 8163FFD + trainerbattle 0, 542, 0, Text_17B677, Text_17B6D9 + loadword 0, gUnknown_817B6EF + callstd 6 + end + +SSAnne_CaptainsOffice4_EventScript_164014:: @ 8164014 + trainerbattle 2, 544, 0, Text_17B8DA, Text_17B9FB, EventScript_16402F + loadword 0, gUnknown_817BA64 + callstd 6 + end + +EventScript_16402F:: @ 816402F + getplayerxy VAR_0x8004, VAR_0x8005 + compare_var_to_value VAR_0x8004, 24 + call_if 3, EventScript_164065 + loadword 0, gUnknown_817BA64 + callstd 4 + closemessage + fadescreen 1 + removeobject 1 + removeobject 2 + removeobject 4 + removeobject 3 + setflag FLAG_0x088 + fadescreen 0 + setvar VAR_0x4088, 1 + setflag FLAG_0x2D5 + release + end + +EventScript_164065:: @ 8164065 + applymovement 255, Movement_1A75EB + waitmovement 0 + return + +SSAnne_CaptainsOffice4_EventScript_164070:: @ 8164070 + trainerbattle 0, 516, 0, Text_17B5D6, Text_17B62F + loadword 0, gUnknown_817B642 + callstd 6 + end + +SSAnne_CaptainsOffice4_EventScript_164087:: @ 8164087 + trainerbattle 2, 543, 0, Text_17B72D, Text_17B79C, EventScript_1640A2 + loadword 0, gUnknown_817B7FA + callstd 6 + end + +EventScript_1640A2:: @ 81640A2 + getplayerxy VAR_0x8004, VAR_0x8005 + specialvar VAR_RESULT, player_get_direction_lower_nybble + compare_var_to_value VAR_RESULT, 2 + call_if 1, EventScript_16412E + loadword 0, gUnknown_817B7AE + callstd 4 + closemessage + compare_var_to_value VAR_0x8004, 24 + call_if 3, EventScript_164144 + compare_var_to_value VAR_0x8004, 25 + call_if 1, EventScript_16414F + compare_var_to_value VAR_0x8004, 26 + call_if 1, EventScript_16415A + compare_var_to_value VAR_0x8004, 27 + call_if 1, EventScript_16415A + playse SE_PIN + call EventScript_163F47 + special DrawWholeMapView + waitse + compare_var_to_value VAR_0x8004, 24 + call_if 3, EventScript_164165 + compare_var_to_value VAR_0x8004, 25 + call_if 1, EventScript_164165 + compare_var_to_value VAR_0x8004, 26 + call_if 1, EventScript_164165 + compare_var_to_value VAR_0x8004, 27 + call_if 1, EventScript_164170 + loadword 0, gUnknown_817B7FA + callstd 4 + release + end + +EventScript_16412E:: @ 816412E + compare_var_to_value VAR_0x8004, 27 + goto_if 1, EventScript_1A77A9 + applymovement 255, Movement_1A75EB + waitmovement 0 + return + +EventScript_164144:: @ 8164144 + applymovement 3, Movement_16417B + waitmovement 0 + return + +EventScript_16414F:: @ 816414F + applymovement 3, Movement_16417F + waitmovement 0 + return + +EventScript_16415A:: @ 816415A + applymovement 3, Movement_1A75E9 + waitmovement 0 + return + +EventScript_164165:: @ 8164165 + applymovement 3, Movement_1A75E7 + waitmovement 0 + return + +EventScript_164170:: @ 8164170 + applymovement 3, Movement_1A75ED + waitmovement 0 + return + +Movement_16417B:: @ 816417B + step_13 + step_13 + step_2e + step_end + +Movement_16417F:: @ 816417F + step_13 + step_2e + step_end diff --git a/data/maps/SSAnne_CaptainsOffice5/scripts.inc b/data/maps/SSAnne_CaptainsOffice5/scripts.inc new file mode 100644 index 000000000..7effe1b4a --- /dev/null +++ b/data/maps/SSAnne_CaptainsOffice5/scripts.inc @@ -0,0 +1,35 @@ +SSAnne_CaptainsOffice5_MapScripts:: @ 8164182 + map_script 3, SSAnne_CaptainsOffice5_MapScript1_164188 + .byte 0 + +SSAnne_CaptainsOffice5_MapScript1_164188:: @ 8164188 + setworldmapflag 2235 + end + +SixIsland_DottedHole_B1F_EventScript_16418C:: @ 816418C + lockall + braillemessage gUnknown_81A9288 + waitbuttonpress + releaseall + end + +SSAnne_CaptainsOffice9_EventScript_164195:: @ 8164195 + lockall + braillemessage gUnknown_81A928B + waitbuttonpress + releaseall + end + +SixIsland_DottedHole_B3F_EventScript_16419E:: @ 816419E + lockall + braillemessage gUnknown_81A9290 + waitbuttonpress + releaseall + end + +SixIsland_DottedHole_B2F_EventScript_1641A7:: @ 81641A7 + lockall + braillemessage gUnknown_81A9296 + waitbuttonpress + releaseall + end diff --git a/data/maps/SSAnne_CaptainsOffice9/scripts.inc b/data/maps/SSAnne_CaptainsOffice9/scripts.inc new file mode 100644 index 000000000..5ce3448b5 --- /dev/null +++ b/data/maps/SSAnne_CaptainsOffice9/scripts.inc @@ -0,0 +1,2 @@ +SSAnne_CaptainsOffice9_MapScripts:: @ 81641B3 + .byte 0 diff --git a/data/maps/SSAnne_Deck/scripts.inc b/data/maps/SSAnne_Deck/scripts.inc new file mode 100644 index 000000000..204f994e9 --- /dev/null +++ b/data/maps/SSAnne_Deck/scripts.inc @@ -0,0 +1,29 @@ +SSAnne_Deck_MapScripts:: @ 8160A68 + .byte 0 + +SSAnne_Deck_EventScript_160A69:: @ 8160A69 + loadword 0, gUnknown_817326F + callstd 2 + end + +SSAnne_Deck_EventScript_160A72:: @ 8160A72 + loadword 0, gUnknown_81732C6 + callstd 2 + end + +SSAnne_Deck_EventScript_160A7B:: @ 8160A7B + loadword 0, gUnknown_81732A2 + callstd 2 + end + +SSAnne_Deck_EventScript_160A84:: @ 8160A84 + trainerbattle 0, 134, 0, Text_173308, Text_17332B + loadword 0, gUnknown_817333E + callstd 6 + end + +SSAnne_Deck_EventScript_160A9B:: @ 8160A9B + trainerbattle 0, 135, 0, Text_173382, Text_1733A0 + loadword 0, gUnknown_81733B5 + callstd 6 + end diff --git a/data/maps/SSAnne_Exterior/scripts.inc b/data/maps/SSAnne_Exterior/scripts.inc new file mode 100644 index 000000000..1bcec87a2 --- /dev/null +++ b/data/maps/SSAnne_Exterior/scripts.inc @@ -0,0 +1,67 @@ +SSAnne_Exterior_MapScripts:: @ 8160840 + map_script 3, SSAnne_Exterior_MapScript1_16084B + map_script 2, SSAnne_Exterior_MapScript2_16084F + .byte 0 + +SSAnne_Exterior_MapScript1_16084B:: @ 816084B + setworldmapflag 2214 + end + +SSAnne_Exterior_MapScript2_16084F:: @ 816084F + map_script_2 VAR_0x407E, 1, SSAnne_Exterior_160859 + .2byte 0 + +SSAnne_Exterior_160859:: @ 8160859 + lockall + getplayerxy VAR_0x8004, VAR_0x8005 + compare_var_to_value VAR_0x8005, 6 + call_if 3, EventScript_1608A1 + compare_var_to_value VAR_0x8005, 7 + call_if 4, EventScript_1608AC + fadenewbgm BGM_FRLG_SURF + delay 50 + special sub_815D334 + waitstate + removeobject 1 + applymovement 255, Movement_1608B7 + waitmovement 0 + setvar VAR_0x407E, 2 + setvar VAR_0x4053, 0 + warp MAP_VERMILIONCITY, 255, 23, 34 + waitstate + releaseall + end + +EventScript_1608A1:: @ 81608A1 + applymovement 255, Movement_1608C1 + waitmovement 0 + return + +EventScript_1608AC:: @ 81608AC + applymovement 255, Movement_1A75ED + waitmovement 0 + return + +Movement_1608B7:: @ 81608B7 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_end + +Movement_1608C1:: @ 81608C1 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_end diff --git a/data/maps/SSAnne_Kitchen/scripts.inc b/data/maps/SSAnne_Kitchen/scripts.inc new file mode 100644 index 000000000..79aa88852 --- /dev/null +++ b/data/maps/SSAnne_Kitchen/scripts.inc @@ -0,0 +1,63 @@ +SSAnne_Kitchen_MapScripts:: @ 8160AB2 + .byte 0 + +SSAnne_Kitchen_EventScript_160AB3:: @ 8160AB3 + loadword 0, gUnknown_81733F8 + callstd 2 + end + +SSAnne_Kitchen_EventScript_160ABC:: @ 8160ABC + loadword 0, gUnknown_8173429 + callstd 2 + end + +SSAnne_Kitchen_EventScript_160AC5:: @ 8160AC5 + loadword 0, gUnknown_8173462 + callstd 2 + end + +SSAnne_Kitchen_EventScript_160ACE:: @ 8160ACE + lock + faceplayer + loadword 0, gUnknown_8173570 + callstd 4 + random 3 + copyvar VAR_0x8008, VAR_RESULT + compare_var_to_value VAR_0x8008, 0 + call_if 1, EventScript_160B03 + compare_var_to_value VAR_0x8008, 1 + call_if 1, EventScript_160B0C + compare_var_to_value VAR_0x8008, 2 + call_if 1, EventScript_160B15 + release + end + +EventScript_160B03:: @ 8160B03 + loadword 0, gUnknown_817359F + callstd 4 + return + +EventScript_160B0C:: @ 8160B0C + loadword 0, gUnknown_81735DF + callstd 4 + return + +EventScript_160B15:: @ 8160B15 + loadword 0, gUnknown_8173611 + callstd 4 + return + +SSAnne_Kitchen_EventScript_160B1E:: @ 8160B1E + loadword 0, gUnknown_81734A0 + callstd 2 + end + +SSAnne_Kitchen_EventScript_160B27:: @ 8160B27 + loadword 0, gUnknown_81734D3 + callstd 2 + end + +SSAnne_Kitchen_EventScript_160B30:: @ 8160B30 + loadword 0, gUnknown_817353E + callstd 2 + end diff --git a/data/maps/SSAnne_Kitchen3/scripts.inc b/data/maps/SSAnne_Kitchen3/scripts.inc new file mode 100644 index 000000000..a6a4664e3 --- /dev/null +++ b/data/maps/SSAnne_Kitchen3/scripts.inc @@ -0,0 +1,2 @@ +SSAnne_Kitchen3_MapScripts:: @ 8163C45 + .byte 0 diff --git a/data/maps/SafariZone_Building1/scripts.inc b/data/maps/SafariZone_Building1/scripts.inc new file mode 100644 index 000000000..03f5b8b68 --- /dev/null +++ b/data/maps/SafariZone_Building1/scripts.inc @@ -0,0 +1,12 @@ +SafariZone_Building1_MapScripts:: @ 81623EB + .byte 0 + +SafariZone_Building1_EventScript_1623EC:: @ 81623EC + loadword 0, gUnknown_8177A5A + callstd 2 + end + +SafariZone_Building1_EventScript_1623F5:: @ 81623F5 + loadword 0, gUnknown_8177A82 + callstd 2 + end diff --git a/data/maps/SafariZone_Building2/scripts.inc b/data/maps/SafariZone_Building2/scripts.inc new file mode 100644 index 000000000..55e12e864 --- /dev/null +++ b/data/maps/SafariZone_Building2/scripts.inc @@ -0,0 +1,17 @@ +SafariZone_Building2_MapScripts:: @ 81623FE + .byte 0 + +SafariZone_Building2_EventScript_1623FF:: @ 81623FF + loadword 0, gUnknown_8177AE2 + callstd 2 + end + +SafariZone_Building2_EventScript_162408:: @ 8162408 + loadword 0, gUnknown_8177AAE + callstd 2 + end + +SafariZone_Building2_EventScript_162411:: @ 8162411 + loadword 0, gUnknown_8177B16 + callstd 2 + end diff --git a/data/maps/SafariZone_Building3/scripts.inc b/data/maps/SafariZone_Building3/scripts.inc new file mode 100644 index 000000000..1a3832fd4 --- /dev/null +++ b/data/maps/SafariZone_Building3/scripts.inc @@ -0,0 +1,17 @@ +SafariZone_Building3_MapScripts:: @ 816241A + .byte 0 + +SafariZone_Building3_EventScript_16241B:: @ 816241B + loadword 0, gUnknown_8177BAB + callstd 2 + end + +SafariZone_Building3_EventScript_162424:: @ 8162424 + loadword 0, gUnknown_8177B38 + callstd 2 + end + +SafariZone_Building3_EventScript_16242D:: @ 816242D + loadword 0, gUnknown_8177BEC + callstd 2 + end diff --git a/data/maps/SafariZone_Building4/scripts.inc b/data/maps/SafariZone_Building4/scripts.inc new file mode 100644 index 000000000..2b6aec4b6 --- /dev/null +++ b/data/maps/SafariZone_Building4/scripts.inc @@ -0,0 +1,17 @@ +SafariZone_Building4_MapScripts:: @ 8162436 + .byte 0 + +SafariZone_Building4_EventScript_162437:: @ 8162437 + loadword 0, gUnknown_8177D39 + callstd 2 + end + +SafariZone_Building4_EventScript_162440:: @ 8162440 + loadword 0, gUnknown_8177CEB + callstd 2 + end + +SafariZone_Building4_EventScript_162449:: @ 8162449 + loadword 0, gUnknown_8177D8B + callstd 2 + end diff --git a/data/maps/SafariZone_Center/scripts.inc b/data/maps/SafariZone_Center/scripts.inc new file mode 100644 index 000000000..9a869247c --- /dev/null +++ b/data/maps/SafariZone_Center/scripts.inc @@ -0,0 +1,22 @@ +SafariZone_Center_MapScripts:: @ 8162357 + map_script 3, SafariZone_Center_MapScript1_16235D + .byte 0 + +SafariZone_Center_MapScript1_16235D:: @ 816235D + setworldmapflag 2222 + end + +SafariZone_Center_EventScript_162361:: @ 8162361 + loadword 0, gUnknown_81777F2 + callstd 3 + end + +SafariZone_Center_EventScript_16236A:: @ 816236A + loadword 0, gUnknown_81777FD + callstd 3 + end + +SafariZone_Center_EventScript_162373:: @ 8162373 + loadword 0, gUnknown_817782F + callstd 3 + end diff --git a/data/maps/SafariZone_East/scripts.inc b/data/maps/SafariZone_East/scripts.inc new file mode 100644 index 000000000..8c4edfe07 --- /dev/null +++ b/data/maps/SafariZone_East/scripts.inc @@ -0,0 +1,17 @@ +SafariZone_East_MapScripts:: @ 816237C + .byte 0 + +SafariZone_East_EventScript_16237D:: @ 816237D + loadword 0, gUnknown_817783B + callstd 3 + end + +SafariZone_East_EventScript_162386:: @ 8162386 + loadword 0, gUnknown_8177846 + callstd 3 + end + +SafariZone_East_EventScript_16238F:: @ 816238F + loadword 0, gUnknown_8177884 + callstd 3 + end diff --git a/data/maps/SafariZone_North/scripts.inc b/data/maps/SafariZone_North/scripts.inc new file mode 100644 index 000000000..d507c330b --- /dev/null +++ b/data/maps/SafariZone_North/scripts.inc @@ -0,0 +1,27 @@ +SafariZone_North_MapScripts:: @ 8162398 + .byte 0 + +SafariZone_North_EventScript_162399:: @ 8162399 + loadword 0, gUnknown_817789D + callstd 3 + end + +SafariZone_North_EventScript_1623A2:: @ 81623A2 + loadword 0, gUnknown_81778A8 + callstd 3 + end + +SafariZone_North_EventScript_1623AB:: @ 81623AB + loadword 0, gUnknown_81778D6 + callstd 3 + end + +SafariZone_North_EventScript_1623B4:: @ 81623B4 + loadword 0, gUnknown_81778DD + callstd 3 + end + +SafariZone_North_EventScript_1623BD:: @ 81623BD + loadword 0, gUnknown_8177935 + callstd 3 + end diff --git a/data/maps/SafariZone_SecretHouse/scripts.inc b/data/maps/SafariZone_SecretHouse/scripts.inc new file mode 100644 index 000000000..3be84b145 --- /dev/null +++ b/data/maps/SafariZone_SecretHouse/scripts.inc @@ -0,0 +1,36 @@ +SafariZone_SecretHouse_MapScripts:: @ 8162452 + .byte 0 + +SafariZone_SecretHouse_EventScript_162453:: @ 8162453 + lock + faceplayer + checkflag FLAG_0x239 + goto_if 1, EventScript_1624A9 + loadword 0, gUnknown_8177DC1 + callstd 4 + checkitemspace ITEM_HM03, 1 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16249F + additem ITEM_HM03, 1 + loadword 0, gUnknown_8177E92 + setorcopyvar VAR_0x8000, 341 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 257 + callstd 9 + loadword 0, gUnknown_8177EB7 + callstd 4 + setflag FLAG_0x239 + release + end + +EventScript_16249F:: @ 816249F + loadword 0, gUnknown_8177F72 + callstd 4 + release + end + +EventScript_1624A9:: @ 81624A9 + loadword 0, gUnknown_8177EB7 + callstd 4 + release + end diff --git a/data/maps/SafariZone_West/scripts.inc b/data/maps/SafariZone_West/scripts.inc new file mode 100644 index 000000000..c4a42268c --- /dev/null +++ b/data/maps/SafariZone_West/scripts.inc @@ -0,0 +1,22 @@ +SafariZone_West_MapScripts:: @ 81623C6 + .byte 0 + +SafariZone_West_EventScript_1623C7:: @ 81623C7 + loadword 0, gUnknown_817796E + callstd 3 + end + +SafariZone_West_EventScript_1623D0:: @ 81623D0 + loadword 0, gUnknown_8177979 + callstd 3 + end + +SafariZone_West_EventScript_1623D9:: @ 81623D9 + loadword 0, gUnknown_81779F8 + callstd 3 + end + +SafariZone_West_EventScript_1623E2:: @ 81623E2 + loadword 0, gUnknown_8177A41 + callstd 3 + end diff --git a/data/maps/SaffronCity/scripts.inc b/data/maps/SaffronCity/scripts.inc new file mode 100644 index 000000000..4b90fa5b3 --- /dev/null +++ b/data/maps/SaffronCity/scripts.inc @@ -0,0 +1,2 @@ +SaffronCity_MapScripts:: @ 8167483 + .byte 0 diff --git a/data/maps/SaffronCity_Dojo/scripts.inc b/data/maps/SaffronCity_Dojo/scripts.inc new file mode 100644 index 000000000..f9a91069d --- /dev/null +++ b/data/maps/SaffronCity_Dojo/scripts.inc @@ -0,0 +1,174 @@ +SaffronCity_Dojo_MapScripts:: @ 816EBDB + .byte 0 + +SaffronCity_Dojo_EventScript_16EBDC:: @ 816EBDC + lockall + setvar VAR_0x4081, 1 + applymovement 5, Movement_1A75E7 + waitmovement 0 + releaseall + end + +SaffronCity_Dojo_EventScript_16EBEE:: @ 816EBEE + lockall + setvar VAR_0x4081, 1 + applymovement 5, Movement_1A75EB + waitmovement 0 + releaseall + end + +SaffronCity_Dojo_EventScript_16EC00:: @ 816EC00 + lock + faceplayer + checkflag FLAG_0x278 + goto_if 1, EventScript_16EC3C + drawmonpic SPECIES_HITMONLEE, 10, 3 + setvar VAR_0x4001, 106 + applymovement 5, Movement_1A75E9 + waitmovement 0 + textcolor 0 + loadword 0, gUnknown_819B44E + callstd 5 + call EventScript_1A6675 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16EC82 + erasemonpic + release + end + +EventScript_16EC3C:: @ 816EC3C + loadword 0, gUnknown_819B4E1 + callstd 4 + release + end + +SaffronCity_Dojo_EventScript_16EC46:: @ 816EC46 + lock + faceplayer + checkflag FLAG_0x278 + goto_if 1, EventScript_16EC3C + drawmonpic SPECIES_HITMONCHAN, 10, 3 + setvar VAR_0x4001, 107 + applymovement 5, Movement_1A75E9 + waitmovement 0 + textcolor 0 + loadword 0, gUnknown_819B49E + callstd 5 + call EventScript_1A6675 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16EC82 + erasemonpic + release + end + +EventScript_16EC82:: @ 816EC82 + erasemonpic + givemon 16385, 25, ITEM_NONE, 0, 0, 0 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16ECB5 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16ECEC + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A927C + release + end + +EventScript_16ECB5:: @ 816ECB5 + removeobject VAR_LAST_TALKED + getspeciesname 0, 16385 + playfanfare MUS_FANFA1 + message Text_19B473 + waitmessage + waitfanfare + setflag FLAG_0x278 + loadword 0, gUnknown_81A56A7 + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16ED29 + call EventScript_1A8C27 + call EventScript_1A74EB + goto EventScript_16ED29 + end + +EventScript_16ECEC:: @ 816ECEC + removeobject VAR_LAST_TALKED + getspeciesname 0, 16385 + playfanfare MUS_FANFA1 + message Text_19B473 + waitmessage + waitfanfare + setflag FLAG_0x278 + loadword 0, gUnknown_81A56A7 + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16ED1E + call EventScript_1A8C33 + goto EventScript_16ED1E + end + +EventScript_16ED1E:: @ 816ED1E + call EventScript_1A8C3C + goto EventScript_16ED29 + end + +EventScript_16ED29:: @ 816ED29 + release + end + +SaffronCity_Dojo_EventScript_16ED2B:: @ 816ED2B + loadword 0, gUnknown_819B52E + callstd 3 + end + +SaffronCity_Dojo_EventScript_16ED34:: @ 816ED34 + loadword 0, gUnknown_819B4F8 + callstd 3 + end + +SaffronCity_Dojo_EventScript_16ED3D:: @ 816ED3D + loadword 0, gUnknown_819B50F + callstd 3 + end + +SaffronCity_Dojo_EventScript_16ED46:: @ 816ED46 + trainerbattle 0, 321, 0, Text_19B3DF, Text_19B40F + loadword 0, gUnknown_819B41F + callstd 6 + end + +SaffronCity_Dojo_EventScript_16ED5D:: @ 816ED5D + trainerbattle 0, 319, 0, Text_19B2E0, Text_19B2FD + loadword 0, gUnknown_819B30F + callstd 6 + end + +SaffronCity_Dojo_EventScript_16ED74:: @ 816ED74 + trainerbattle 0, 320, 0, Text_19B341, Text_19B396 + loadword 0, gUnknown_819B3AC + callstd 6 + end + +SaffronCity_Dojo_EventScript_16ED8B:: @ 816ED8B + trainerbattle 0, 318, 0, Text_19B275, Text_19B292 + loadword 0, gUnknown_819B29D + callstd 6 + end + +SaffronCity_Dojo_EventScript_16EDA2:: @ 816EDA2 + trainerbattle 2, 317, 0, Text_19B12C, Text_19B193, EventScript_16EDD0 + checkflag FLAG_0x278 + goto_if 1, EventScript_16EDC6 + loadword 0, gUnknown_819B1A7 + callstd 6 + end + +EventScript_16EDC6:: @ 816EDC6 + loadword 0, gUnknown_819B24C + callstd 4 + release + end + +EventScript_16EDD0:: @ 816EDD0 + setvar VAR_0x4081, 1 + release + end diff --git a/data/maps/SaffronCity_Duplicate/scripts.inc b/data/maps/SaffronCity_Duplicate/scripts.inc new file mode 100644 index 000000000..70dface9b --- /dev/null +++ b/data/maps/SaffronCity_Duplicate/scripts.inc @@ -0,0 +1,152 @@ +SaffronCity_Duplicate_MapScripts:: @ 816735F + map_script 3, SaffronCity_Duplicate_MapScript1_167365 + .byte 0 + +SaffronCity_Duplicate_MapScript1_167365:: @ 8167365 + setworldmapflag 2202 + checkflag FLAG_0x23C + call_if 0, EventScript_167372 + end + +EventScript_167372:: @ 8167372 + setobjectxyperm 6, 33, 31 + return + +SaffronCity_Duplicate_EventScript_16737A:: @ 816737A + loadword 0, gUnknown_8181003 + callstd 2 + end + +SaffronCity_Duplicate_EventScript_167383:: @ 8167383 + loadword 0, gUnknown_818101F + callstd 2 + end + +SaffronCity_Duplicate_EventScript_16738C:: @ 816738C + loadword 0, gUnknown_818105A + callstd 2 + end + +SaffronCity_Duplicate_EventScript_167395:: @ 8167395 + loadword 0, gUnknown_8181087 + callstd 2 + end + +SaffronCity_Duplicate_EventScript_16739E:: @ 816739E + loadword 0, gUnknown_81810A7 + callstd 2 + end + +SaffronCity_Duplicate_EventScript_1673A7:: @ 81673A7 + loadword 0, gUnknown_81810D5 + callstd 2 + end + +SaffronCity_Duplicate_EventScript_1673B0:: @ 81673B0 + loadword 0, gUnknown_81810F5 + callstd 2 + end + +SaffronCity_Duplicate_EventScript_1673B9:: @ 81673B9 + lock + checkflag FLAG_0x23C + goto_if 1, EventScript_1673D7 + applymovement 6, Movement_1A75E1 + waitmovement 0 + loadword 0, gUnknown_81812CA + callstd 4 + release + end + +EventScript_1673D7:: @ 81673D7 + textcolor 3 + loadword 0, gUnknown_8181302 + callstd 4 + release + end + +SaffronCity_Duplicate_EventScript_1673E3:: @ 81673E3 + loadword 0, gUnknown_8181159 + callstd 2 + end + +SaffronCity_Duplicate_EventScript_1673EC:: @ 81673EC + loadword 0, gUnknown_8181189 + callstd 2 + end + +SaffronCity_Duplicate_EventScript_1673F5:: @ 81673F5 + loadword 0, gUnknown_81811BF + callstd 2 + end + +SaffronCity_Duplicate_EventScript_1673FE:: @ 81673FE + loadword 0, gUnknown_8181225 + callstd 2 + end + +SaffronCity_Duplicate_EventScript_167407:: @ 8167407 + lock + faceplayer + waitse + playmoncry SPECIES_PIDGEOT, 0 + loadword 0, gUnknown_8181286 + callstd 4 + waitmoncry + release + end + +SaffronCity_Duplicate_EventScript_16741A:: @ 816741A + loadword 0, gUnknown_8181299 + callstd 2 + end + +SaffronCity_Duplicate_EventScript_167423:: @ 8167423 + loadword 0, gUnknown_8181326 + callstd 3 + end + +SaffronCity_Duplicate_EventScript_16742C:: @ 816742C + loadword 0, gUnknown_8181354 + callstd 3 + end + +SaffronCity_Duplicate_EventScript_167435:: @ 8167435 + lockall + setvar VAR_0x8004, 7 + setvar VAR_0x8005, 0 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_8181362 + callstd 4 + releaseall + end + +SaffronCity_Duplicate_EventScript_16744D:: @ 816744D + loadword 0, gUnknown_81813AA + callstd 3 + end + +SaffronCity_Duplicate_EventScript_167456:: @ 8167456 + loadword 0, gUnknown_8181452 + callstd 3 + end + +SaffronCity_Duplicate_EventScript_16745F:: @ 816745F + loadword 0, gUnknown_81814B9 + callstd 3 + end + +SaffronCity_Duplicate_EventScript_167468:: @ 8167468 + loadword 0, gUnknown_81814D3 + callstd 3 + end + +SaffronCity_Duplicate_EventScript_167471:: @ 8167471 + loadword 0, gUnknown_81814E7 + callstd 3 + end + +SaffronCity_Duplicate_EventScript_16747A:: @ 816747A + loadword 0, gUnknown_8181519 + callstd 3 + end diff --git a/data/maps/SaffronCity_Gym/scripts.inc b/data/maps/SaffronCity_Gym/scripts.inc new file mode 100644 index 000000000..bb101e266 --- /dev/null +++ b/data/maps/SaffronCity_Gym/scripts.inc @@ -0,0 +1,129 @@ +SaffronCity_Gym_MapScripts:: @ 816EDD7 + .byte 0 + +SaffronCity_Gym_EventScript_16EDD8:: @ 816EDD8 + setvar VAR_0x8004, 7 + setvar VAR_0x8005, 2 + special UpdatePickStateFromSpecialVar8005 + trainerbattle 1, 420, 0, Text_19B53C, Text_19B602, EventScript_16EE0A + checkflag FLAG_0x29A + goto_if 0, EventScript_16EE3D + loadword 0, gUnknown_819B7F2 + callstd 4 + release + end + +EventScript_16EE0A:: @ 816EE0A + setvar VAR_0x8004, 7 + setvar VAR_0x8005, 2 + special SetFlavorTextFlagFromSpecialVars + setvar VAR_0x8004, 7 + setvar VAR_0x8005, 3 + special SetFlavorTextFlagFromSpecialVars + clearflag FLAG_0x0AE + setflag FLAG_0x4B5 + setflag 2085 + setvar VAR_0x8008, 6 + call EventScript_1A6B18 + goto EventScript_16EE3D + end + +EventScript_16EE3D:: @ 816EE3D + loadword 0, gUnknown_819B6FA + callstd 4 + checkitemspace ITEM_TM04, 1 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16EE7E + additem ITEM_TM04, 1 + loadword 0, gUnknown_819B7D3 + setorcopyvar VAR_0x8000, 292 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 257 + callstd 9 + setflag FLAG_0x29A + loadword 0, gUnknown_819B685 + callstd 4 + release + end + +EventScript_16EE7E:: @ 816EE7E + loadword 0, gUnknown_819B849 + callstd 4 + release + end + +SaffronCity_Gym_EventScript_16EE88:: @ 816EE88 + trainerbattle 0, 280, 0, Text_19B936, Text_19B957 + loadword 0, gUnknown_819B96D + callstd 6 + end + +SaffronCity_Gym_EventScript_16EE9F:: @ 816EE9F + trainerbattle 0, 281, 0, Text_19BA45, Text_19BA9E + setvar VAR_0x8004, 7 + setvar VAR_0x8005, 5 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_819BAB4 + callstd 6 + end + +SaffronCity_Gym_EventScript_16EEC3:: @ 816EEC3 + trainerbattle 0, 282, 0, Text_19BB49, Text_19BBA1 + loadword 0, gUnknown_819BBB3 + callstd 6 + end + +SaffronCity_Gym_EventScript_16EEDA:: @ 816EEDA + trainerbattle 0, 283, 0, Text_19BC57, Text_19BCBC + loadword 0, gUnknown_819BCC4 + callstd 6 + end + +SaffronCity_Gym_EventScript_16EEF1:: @ 816EEF1 + trainerbattle 0, 462, 0, Text_19B86A, Text_19B8A8 + loadword 0, gUnknown_819B8B9 + callstd 6 + end + +SaffronCity_Gym_EventScript_16EF08:: @ 816EF08 + trainerbattle 0, 463, 0, Text_19B998, Text_19B9EC + loadword 0, gUnknown_819B9F7 + callstd 6 + end + +SaffronCity_Gym_EventScript_16EF1F:: @ 816EF1F + trainerbattle 0, 464, 0, Text_19BAE8, Text_19BB0D + loadword 0, gUnknown_819BB1F + callstd 6 + end + +SaffronCity_Gym_EventScript_16EF36:: @ 816EF36 + lock + faceplayer + checkflag FLAG_0x4B5 + goto_if 1, EventScript_16EF4B + loadword 0, gUnknown_819BCF6 + callstd 4 + release + end + +EventScript_16EF4B:: @ 816EF4B + loadword 0, gUnknown_819BDBB + callstd 4 + release + end + +SaffronCity_Gym_EventScript_16EF55:: @ 816EF55 + lockall + checkflag 2085 + goto_if 1, EventScript_16EF69 + loadword 0, gUnknown_819BDFE + callstd 4 + releaseall + end + +EventScript_16EF69:: @ 816EF69 + loadword 0, gUnknown_819BE37 + callstd 4 + releaseall + end diff --git a/data/maps/SaffronCity_House1_1F/scripts.inc b/data/maps/SaffronCity_House1_1F/scripts.inc new file mode 100644 index 000000000..2f788d241 --- /dev/null +++ b/data/maps/SaffronCity_House1_1F/scripts.inc @@ -0,0 +1,23 @@ +SaffronCity_House1_1F_MapScripts:: @ 816EB36 + .byte 0 + +SaffronCity_House1_1F_EventScript_16EB37:: @ 816EB37 + loadword 0, gUnknown_819AB9B + callstd 2 + end + +SaffronCity_House1_1F_EventScript_16EB40:: @ 816EB40 + loadword 0, gUnknown_819ABD7 + callstd 2 + end + +SaffronCity_House1_1F_EventScript_16EB49:: @ 816EB49 + lock + faceplayer + waitse + playmoncry SPECIES_CHANSEY, 0 + loadword 0, gUnknown_819AC4B + callstd 4 + waitmoncry + release + end diff --git a/data/maps/SaffronCity_House1_2F/scripts.inc b/data/maps/SaffronCity_House1_2F/scripts.inc new file mode 100644 index 000000000..5923bd693 --- /dev/null +++ b/data/maps/SaffronCity_House1_2F/scripts.inc @@ -0,0 +1,58 @@ +SaffronCity_House1_2F_MapScripts:: @ 816EB5C + .byte 0 + +SaffronCity_House1_2F_EventScript_16EB5D:: @ 816EB5D + lock + faceplayer + waitse + playmoncry SPECIES_DODUO, 0 + loadword 0, gUnknown_819B030 + callstd 4 + waitmoncry + release + end + +SaffronCity_House1_2F_EventScript_16EB70:: @ 816EB70 + lock + loadword 0, gUnknown_819B071 + callstd 4 + release + end + +SaffronCity_House1_2F_EventScript_16EB7B:: @ 816EB7B + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + special sub_8112364 + lock + faceplayer + checkitem ITEM_POKE_DOLL, 1 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_1C4CF6 + checkplayergender + compare_var_to_value VAR_RESULT, 0 + call_if 1, EventScript_16EBB7 + compare_var_to_value VAR_RESULT, 1 + call_if 1, EventScript_16EBC0 + release + end + +EventScript_16EBB7:: @ 816EBB7 + loadword 0, gUnknown_819AC60 + callstd 4 + return + +EventScript_16EBC0:: @ 816EBC0 + loadword 0, gUnknown_819ACF1 + callstd 4 + return + +SaffronCity_House1_2F_EventScript_16EBC9:: @ 816EBC9 + loadword 0, gUnknown_819B0D0 + callstd 3 + end + +SaffronCity_House1_2F_EventScript_16EBD2:: @ 816EBD2 + loadword 0, gUnknown_819B0A0 + callstd 3 + end diff --git a/data/maps/SaffronCity_House2/scripts.inc b/data/maps/SaffronCity_House2/scripts.inc new file mode 100644 index 000000000..ed38659ee --- /dev/null +++ b/data/maps/SaffronCity_House2/scripts.inc @@ -0,0 +1,28 @@ +SaffronCity_House2_MapScripts:: @ 816EF73 + .byte 0 + +SaffronCity_House2_EventScript_16EF74:: @ 816EF74 + loadword 0, gUnknown_819BE74 + callstd 2 + end + +SaffronCity_House2_EventScript_16EF7D:: @ 816EF7D + loadword 0, gUnknown_819BED5 + callstd 2 + end + +SaffronCity_House2_EventScript_16EF86:: @ 816EF86 + lock + faceplayer + waitse + playmoncry SPECIES_PIDGEY, 0 + loadword 0, gUnknown_819BEC3 + callstd 4 + waitmoncry + release + end + +SaffronCity_House2_EventScript_16EF99:: @ 816EF99 + loadword 0, gUnknown_819BF07 + callstd 3 + end diff --git a/data/maps/SaffronCity_House3/scripts.inc b/data/maps/SaffronCity_House3/scripts.inc new file mode 100644 index 000000000..2ce0781fc --- /dev/null +++ b/data/maps/SaffronCity_House3/scripts.inc @@ -0,0 +1,36 @@ +SaffronCity_House3_MapScripts:: @ 816F05E + .byte 0 + +SaffronCity_House3_EventScript_16F05F:: @ 816F05F + lock + faceplayer + checkflag FLAG_0x245 + goto_if 1, EventScript_16F0B5 + loadword 0, gUnknown_819C142 + callstd 4 + checkitemspace ITEM_TM29, 1 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16F0AB + additem ITEM_TM29, 1 + loadword 0, gUnknown_819C16C + setorcopyvar VAR_0x8000, 317 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 257 + callstd 9 + loadword 0, gUnknown_819C18F + callstd 4 + setflag FLAG_0x245 + release + end + +EventScript_16F0AB:: @ 816F0AB + loadword 0, gUnknown_819C1FC + callstd 4 + release + end + +EventScript_16F0B5:: @ 816F0B5 + loadword 0, gUnknown_819C18F + callstd 4 + release + end diff --git a/data/maps/SaffronCity_Mart/scripts.inc b/data/maps/SaffronCity_Mart/scripts.inc new file mode 100644 index 000000000..c72f5237b --- /dev/null +++ b/data/maps/SaffronCity_Mart/scripts.inc @@ -0,0 +1,38 @@ +SaffronCity_Mart_MapScripts:: @ 816EFA2 + .byte 0 + +SaffronCity_Mart_EventScript_16EFA3:: @ 816EFA3 + loadword 0, gUnknown_819BFF1 + callstd 2 + end + +SaffronCity_Mart_EventScript_16EFAC:: @ 816EFAC + loadword 0, gUnknown_819BF8F + callstd 2 + end + +SaffronCity_Mart_EventScript_16EFB5:: @ 816EFB5 + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + lock + faceplayer + message Text_1A6211 + waitmessage + pokemart Items_16EFDC + loadword 0, gUnknown_81A5190 + callstd 4 + release + end + + .align 2 +Items_16EFDC:: @ 816EFDC + .2byte ITEM_GREAT_BALL + .2byte ITEM_HYPER_POTION + .2byte ITEM_REVIVE + .2byte ITEM_FULL_HEAL + .2byte ITEM_ESCAPE_ROPE + .2byte ITEM_MAX_REPEL + .2byte ITEM_NONE + release + end diff --git a/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc b/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc new file mode 100644 index 000000000..6eb760d16 --- /dev/null +++ b/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc @@ -0,0 +1,41 @@ +SaffronCity_PokemonCenter_1F_MapScripts:: @ 816EFEC + map_script 3, SaffronCity_PokemonCenter_1F_MapScript1_16EFF7 + map_script 5, SaffronCity_PokemonCenter_1F_MapScript2_1BC05C + .byte 0 + +SaffronCity_PokemonCenter_1F_MapScript1_16EFF7:: @ 816EFF7 + setrespawn 11 + end + +SaffronCity_PokemonCenter_1F_EventScript_16EFFB:: @ 816EFFB + lock + faceplayer + call EventScript_1A6578 + release + end + +SaffronCity_PokemonCenter_1F_EventScript_16F004:: @ 816F004 + loadword 0, gUnknown_819C058 + callstd 2 + end + +SaffronCity_PokemonCenter_1F_EventScript_16F00D:: @ 816F00D + loadword 0, gUnknown_819C023 + callstd 2 + end + +SaffronCity_PokemonCenter_1F_EventScript_16F016:: @ 816F016 + lock + faceplayer + compare_var_to_value VAR_0x4060, 1 + goto_if 1, EventScript_16F02D + loadword 0, gUnknown_819C0B4 + callstd 4 + release + end + +EventScript_16F02D:: @ 816F02D + loadword 0, gUnknown_819C102 + callstd 4 + release + end diff --git a/data/maps/SaffronCity_PokemonCenter_2F/scripts.inc b/data/maps/SaffronCity_PokemonCenter_2F/scripts.inc new file mode 100644 index 000000000..c6f69cc82 --- /dev/null +++ b/data/maps/SaffronCity_PokemonCenter_2F/scripts.inc @@ -0,0 +1,18 @@ +SaffronCity_PokemonCenter_2F_MapScripts:: @ 816F037 + map_script 2, SaffronCity_PokemonCenter_2F_MapScript1_1BB2A3 + map_script 4, SaffronCity_PokemonCenter_2F_MapScript2_1BB1ED + map_script 1, SaffronCity_PokemonCenter_2F_MapScript3_1BB237 + map_script 3, SaffronCity_PokemonCenter_2F_MapScript4_1BB1B4 + .byte 0 + +SaffronCity_PokemonCenter_2F_EventScript_16F04C:: @ 816F04C + call EventScript_1BB4A3 + end + +EventScript_16F052:: @ 816F052 + call EventScript_1BB6AB + end + +EventScript_16F058:: @ 816F058 + call EventScript_1BB7DE + end diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc b/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc new file mode 100644 index 000000000..debc83be8 --- /dev/null +++ b/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc @@ -0,0 +1,492 @@ +SaffronCity_PokemonTrainerFanClub_MapScripts:: @ 816F0BF + map_script 2, SaffronCity_PokemonTrainerFanClub_MapScript1_16F0CA + map_script 3, SaffronCity_PokemonTrainerFanClub_MapScript2_16F144 + .byte 0 + +SaffronCity_PokemonTrainerFanClub_MapScript1_16F0CA:: @ 816F0CA + map_script_2 VAR_0x4073, 1, EventScript_16F0D4 + .2byte 0 + +EventScript_16F0D4:: @ 816F0D4 + lockall + textcolor 1 + applymovement 1, Movement_1A75ED + waitmovement 0 + playse SE_PIN + applymovement 1, Movement_1A75DB + waitmovement 0 + applymovement 1, Movement_1A75DD + waitmovement 0 + loadword 0, gUnknown_819C22B + callstd 4 + closemessage + applymovement 1, Movement_16F124 + waitmovement 0 + applymovement 255, Movement_1A75EB + waitmovement 0 + loadword 0, gUnknown_819C235 + callstd 4 + setvar VAR_0x4073, 2 + releaseall + end + +Movement_16F124:: @ 816F124 + step_1c + step_1b + step_10 + step_1c + step_10 + step_1b + step_12 + step_end + +Movement_16F12C:: @ 816F12C + step_1b + step_2d + step_10 + step_10 + step_10 + step_12 + step_12 + step_end + +Movement_16F134:: @ 816F134 + step_1f + step_1f + step_1d + step_1d + step_1f + step_1d + step_end + +Movement_16F13B:: @ 816F13B + step_10 + step_30 + step_end + +Movement_16F13E:: @ 816F13E + step_55 + step_1e + step_1e + step_20 + step_2d + step_end + +SaffronCity_PokemonTrainerFanClub_MapScript2_16F144:: @ 816F144 + compare_var_to_value VAR_0x4073, 1 + goto_if 1, EventScript_16F267 + compare_var_to_value VAR_0x4073, 2 + goto_if 1, EventScript_16F15B + end + +EventScript_16F15B:: @ 816F15B + special sub_81132CC + setvar VAR_0x8004, 0 + specialvar VAR_RESULT, sub_8113364 + compare_var_to_value VAR_RESULT, 0 + call_if 1, EventScript_16F207 + setvar VAR_0x8004, 1 + specialvar VAR_RESULT, sub_8113364 + compare_var_to_value VAR_RESULT, 0 + call_if 1, EventScript_16F213 + setvar VAR_0x8004, 2 + specialvar VAR_RESULT, sub_8113364 + compare_var_to_value VAR_RESULT, 0 + call_if 1, EventScript_16F21F + setvar VAR_0x8004, 3 + specialvar VAR_RESULT, sub_8113364 + compare_var_to_value VAR_RESULT, 0 + call_if 1, EventScript_16F22B + setvar VAR_0x8004, 4 + specialvar VAR_RESULT, sub_8113364 + compare_var_to_value VAR_RESULT, 0 + call_if 1, EventScript_16F237 + setvar VAR_0x8004, 5 + specialvar VAR_RESULT, sub_8113364 + compare_var_to_value VAR_RESULT, 0 + call_if 1, EventScript_16F243 + setvar VAR_0x8004, 6 + specialvar VAR_RESULT, sub_8113364 + compare_var_to_value VAR_RESULT, 0 + call_if 1, EventScript_16F24F + setvar VAR_0x8004, 7 + specialvar VAR_RESULT, sub_8113364 + compare_var_to_value VAR_RESULT, 0 + call_if 1, EventScript_16F25B + end + +EventScript_16F207:: @ 816F207 + setobjectxyperm 1, 5, 2 + setobjectmovementtype 1, 7 + return + +EventScript_16F213:: @ 816F213 + setobjectxyperm 3, 7, 4 + setobjectmovementtype 3, 9 + return + +EventScript_16F21F:: @ 816F21F + setobjectxyperm 4, 2, 2 + setobjectmovementtype 4, 7 + return + +EventScript_16F22B:: @ 816F22B + setobjectxyperm 2, 3, 4 + setobjectmovementtype 2, 10 + return + +EventScript_16F237:: @ 816F237 + setobjectxyperm 6, 4, 6 + setobjectmovementtype 6, 7 + return + +EventScript_16F243:: @ 816F243 + setobjectxyperm 5, 10, 3 + setobjectmovementtype 5, 7 + return + +EventScript_16F24F:: @ 816F24F + setobjectxyperm 7, 7, 5 + setobjectmovementtype 7, 9 + return + +EventScript_16F25B:: @ 816F25B + setobjectxyperm 8, 9, 6 + setobjectmovementtype 8, 9 + return + +EventScript_16F267:: @ 816F267 + call EventScript_16F22B + call EventScript_16F237 + call EventScript_16F243 + call EventScript_16F24F + call EventScript_16F25B + end + +SaffronCity_PokemonTrainerFanClub_EventScript_16F281:: @ 816F281 + lock + faceplayer + setvar VAR_0x8004, 0 + special sub_81133A4 + compare_var_to_value VAR_0x4073, 0 + goto_if 1, EventScript_16F2EE + specialvar VAR_RESULT, sub_8113364 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16F2C0 + specialvar VAR_RESULT, sub_8113288 + compare_var_to_value VAR_RESULT, 7 + goto_if 1, EventScript_16F2E4 + loadword 0, gUnknown_819C420 + callstd 4 + release + end + +EventScript_16F2C0:: @ 816F2C0 + specialvar VAR_RESULT, sub_8113288 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16F2DA + loadword 0, gUnknown_819C390 + callstd 4 + release + end + +EventScript_16F2DA:: @ 816F2DA + loadword 0, gUnknown_819C3BD + callstd 4 + release + end + +EventScript_16F2E4:: @ 816F2E4 + loadword 0, gUnknown_819C4A5 + callstd 4 + release + end + +EventScript_16F2EE:: @ 816F2EE + loadword 0, gUnknown_819C55C + callstd 4 + release + end + +SaffronCity_PokemonTrainerFanClub_EventScript_16F2F8:: @ 816F2F8 + lock + faceplayer + setvar VAR_0x8004, 3 + special sub_81133A4 + compare_var_to_value VAR_0x4073, 0 + goto_if 1, EventScript_16F365 + specialvar VAR_RESULT, sub_8113364 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16F337 + specialvar VAR_RESULT, sub_8113288 + compare_var_to_value VAR_RESULT, 7 + goto_if 1, EventScript_16F35B + loadword 0, gUnknown_819CBD3 + callstd 4 + release + end + +EventScript_16F337:: @ 816F337 + specialvar VAR_RESULT, sub_8113288 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16F351 + loadword 0, gUnknown_819CB32 + callstd 4 + release + end + +EventScript_16F351:: @ 816F351 + loadword 0, gUnknown_819CB62 + callstd 4 + release + end + +EventScript_16F35B:: @ 816F35B + loadword 0, gUnknown_819CC2B + callstd 4 + release + end + +EventScript_16F365:: @ 816F365 + loadword 0, gUnknown_819CCC2 + callstd 4 + release + end + +SaffronCity_PokemonTrainerFanClub_EventScript_16F36F:: @ 816F36F + lock + faceplayer + setvar VAR_0x8004, 1 + special sub_81133A4 + compare_var_to_value VAR_0x4073, 0 + goto_if 1, EventScript_16F3DC + specialvar VAR_RESULT, sub_8113364 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16F3AE + specialvar VAR_RESULT, sub_8113288 + compare_var_to_value VAR_RESULT, 7 + goto_if 1, EventScript_16F3D2 + loadword 0, gUnknown_819C6BA + callstd 4 + release + end + +EventScript_16F3AE:: @ 816F3AE + specialvar VAR_RESULT, sub_8113288 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16F3C8 + loadword 0, gUnknown_819C5A9 + callstd 4 + release + end + +EventScript_16F3C8:: @ 816F3C8 + loadword 0, gUnknown_819C600 + callstd 4 + release + end + +EventScript_16F3D2:: @ 816F3D2 + loadword 0, gUnknown_819C73A + callstd 4 + release + end + +EventScript_16F3DC:: @ 816F3DC + loadword 0, gUnknown_819C7C8 + callstd 4 + release + end + +SaffronCity_PokemonTrainerFanClub_EventScript_16F3E6:: @ 816F3E6 + lock + faceplayer + setvar VAR_0x8004, 2 + special sub_81133A4 + compare_var_to_value VAR_0x4073, 0 + goto_if 1, EventScript_16F453 + specialvar VAR_RESULT, sub_8113364 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16F425 + specialvar VAR_RESULT, sub_8113288 + compare_var_to_value VAR_RESULT, 7 + goto_if 1, EventScript_16F449 + loadword 0, gUnknown_819C986 + callstd 4 + release + end + +EventScript_16F425:: @ 816F425 + specialvar VAR_RESULT, sub_8113288 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16F43F + loadword 0, gUnknown_819C81E + callstd 4 + release + end + +EventScript_16F43F:: @ 816F43F + loadword 0, gUnknown_819C8C1 + callstd 4 + release + end + +EventScript_16F449:: @ 816F449 + loadword 0, gUnknown_819C9D5 + callstd 4 + release + end + +EventScript_16F453:: @ 816F453 + loadword 0, gUnknown_819CA7C + callstd 4 + release + end + +SaffronCity_PokemonTrainerFanClub_EventScript_16F45D:: @ 816F45D + lock + faceplayer + setvar VAR_0x8004, 5 + special sub_81133A4 + specialvar VAR_RESULT, sub_8113364 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16F491 + specialvar VAR_RESULT, sub_8113288 + compare_var_to_value VAR_RESULT, 7 + goto_if 1, EventScript_16F4B5 + loadword 0, gUnknown_819D01F + callstd 4 + release + end + +EventScript_16F491:: @ 816F491 + specialvar VAR_RESULT, sub_8113288 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16F4AB + loadword 0, gUnknown_819CEDF + callstd 4 + release + end + +EventScript_16F4AB:: @ 816F4AB + loadword 0, gUnknown_819CF6D + callstd 4 + release + end + +EventScript_16F4B5:: @ 816F4B5 + loadword 0, gUnknown_819D075 + callstd 4 + release + end + +SaffronCity_PokemonTrainerFanClub_EventScript_16F4BF:: @ 816F4BF + lock + faceplayer + setvar VAR_0x8004, 4 + special sub_81133A4 + specialvar VAR_RESULT, sub_8113364 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16F4F3 + specialvar VAR_RESULT, sub_8113288 + compare_var_to_value VAR_RESULT, 7 + goto_if 1, EventScript_16F517 + loadword 0, gUnknown_819CDDA + callstd 4 + release + end + +EventScript_16F4F3:: @ 816F4F3 + specialvar VAR_RESULT, sub_8113288 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16F50D + loadword 0, gUnknown_819CCF3 + callstd 4 + release + end + +EventScript_16F50D:: @ 816F50D + loadword 0, gUnknown_819CD4E + callstd 4 + release + end + +EventScript_16F517:: @ 816F517 + loadword 0, gUnknown_819CE3A + callstd 4 + release + end + +SaffronCity_PokemonTrainerFanClub_EventScript_16F521:: @ 816F521 + lock + faceplayer + setvar VAR_0x8004, 6 + special sub_81133A4 + specialvar VAR_RESULT, sub_8113364 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16F555 + specialvar VAR_RESULT, sub_8113288 + compare_var_to_value VAR_RESULT, 7 + goto_if 1, EventScript_16F579 + loadword 0, gUnknown_819D1AE + callstd 4 + release + end + +EventScript_16F555:: @ 816F555 + specialvar VAR_RESULT, sub_8113288 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16F56F + loadword 0, gUnknown_819D0E3 + callstd 4 + release + end + +EventScript_16F56F:: @ 816F56F + loadword 0, gUnknown_819D148 + callstd 4 + release + end + +EventScript_16F579:: @ 816F579 + loadword 0, gUnknown_819D211 + callstd 4 + release + end + +SaffronCity_PokemonTrainerFanClub_EventScript_16F583:: @ 816F583 + lock + faceplayer + setvar VAR_0x8004, 7 + special sub_81133A4 + specialvar VAR_RESULT, sub_8113364 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16F5B7 + specialvar VAR_RESULT, sub_8113288 + compare_var_to_value VAR_RESULT, 7 + goto_if 1, EventScript_16F5DB + loadword 0, gUnknown_819D3D2 + callstd 4 + release + end + +EventScript_16F5B7:: @ 816F5B7 + specialvar VAR_RESULT, sub_8113288 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16F5D1 + loadword 0, gUnknown_819D2B4 + callstd 4 + release + end + +EventScript_16F5D1:: @ 816F5D1 + loadword 0, gUnknown_819D31F + callstd 4 + release + end + +EventScript_16F5DB:: @ 816F5DB + loadword 0, gUnknown_819D477 + callstd 4 + release + end diff --git a/data/maps/SeafoamIslands_1F/scripts.inc b/data/maps/SeafoamIslands_1F/scripts.inc new file mode 100644 index 000000000..8306f6f4c --- /dev/null +++ b/data/maps/SeafoamIslands_1F/scripts.inc @@ -0,0 +1,7 @@ +SeafoamIslands_1F_MapScripts:: @ 8162F43 + map_script 3, SeafoamIslands_1F_MapScript1_162F49 + .byte 0 + +SeafoamIslands_1F_MapScript1_162F49:: @ 8162F49 + setworldmapflag 2225 + end diff --git a/data/maps/SeafoamIslands_B1F/scripts.inc b/data/maps/SeafoamIslands_B1F/scripts.inc new file mode 100644 index 000000000..a3cb050ee --- /dev/null +++ b/data/maps/SeafoamIslands_B1F/scripts.inc @@ -0,0 +1,2 @@ +SeafoamIslands_B1F_MapScripts:: @ 8162F4D + .byte 0 diff --git a/data/maps/SeafoamIslands_B2F/scripts.inc b/data/maps/SeafoamIslands_B2F/scripts.inc new file mode 100644 index 000000000..21a4cd8fb --- /dev/null +++ b/data/maps/SeafoamIslands_B2F/scripts.inc @@ -0,0 +1,2 @@ +SeafoamIslands_B2F_MapScripts:: @ 8162F4E + .byte 0 diff --git a/data/maps/SeafoamIslands_B3F/scripts.inc b/data/maps/SeafoamIslands_B3F/scripts.inc new file mode 100644 index 000000000..1469509eb --- /dev/null +++ b/data/maps/SeafoamIslands_B3F/scripts.inc @@ -0,0 +1,103 @@ +SeafoamIslands_B3F_MapScripts:: @ 8162F4F + map_script 3, SeafoamIslands_B3F_MapScript1_162F5A + map_script 2, SeafoamIslands_B3F_MapScript2_162F98 + .byte 0 + +SeafoamIslands_B3F_MapScript1_162F5A:: @ 8162F5A + checkflag FLAG_0x2D2 + call_if 0, EventScript_162F6D + checkflag FLAG_0x2D2 + call_if 1, EventScript_162F94 + end + +EventScript_162F6D:: @ 8162F6D + setvar VAR_0x4002, 0 + checkflag FLAG_0x046 + call_if 0, EventScript_162FF0 + checkflag FLAG_0x047 + call_if 0, EventScript_162FF0 + compare_var_to_value VAR_0x4002, 2 + call_if 1, EventScript_162F90 + return + +EventScript_162F90:: @ 8162F90 + setflag FLAG_0x2D2 + return + +EventScript_162F94:: @ 8162F94 + setmaplayoutindex LAYOUT_UNUSEDLAYOUT_833B6EC + return + +SeafoamIslands_B3F_MapScript2_162F98:: @ 8162F98 + map_script_2 VAR_0x4001, 1, EventScript_162FA2 + .2byte 0 + +EventScript_162FA2:: @ 8162FA2 + lockall + setvar VAR_0x4002, 0 + checkflag FLAG_0x046 + call_if 0, EventScript_162FF0 + checkflag FLAG_0x047 + call_if 0, EventScript_162FF0 + compare_var_to_value VAR_0x4002, 2 + goto_if 1, EventScript_16300C + getplayerxy VAR_0x8008, VAR_0x8009 + compare_var_to_value VAR_0x8008, 24 + call_if 0, EventScript_162FF6 + compare_var_to_value VAR_0x8008, 24 + call_if 4, EventScript_163001 + setvar VAR_0x4063, 1 + warp MAP_SEAFOAMISLANDS_B4F, 255, 27, 21 + waitstate + releaseall + end + +EventScript_162FF0:: @ 8162FF0 + addvar VAR_0x4002, 1 + return + +EventScript_162FF6:: @ 8162FF6 + applymovement 255, Movement_163013 + waitmovement 0 + return + +EventScript_163001:: @ 8163001 + applymovement 255, Movement_163021 + waitmovement 0 + return + +EventScript_16300C:: @ 816300C + setvar VAR_0x4001, 0 + releaseall + end + +Movement_163013:: @ 8163013 + step_1d + step_1d + step_1d + step_1d + step_20 + step_20 + step_20 + step_1d + step_1d + step_1d + step_1d + step_1d + step_1d + step_end + +Movement_163021:: @ 8163021 + step_1d + step_1d + step_1d + step_1d + step_20 + step_20 + step_1d + step_1d + step_1d + step_1d + step_1d + step_1d + step_end diff --git a/data/maps/SeafoamIslands_B4F/scripts.inc b/data/maps/SeafoamIslands_B4F/scripts.inc new file mode 100644 index 000000000..a202650ee --- /dev/null +++ b/data/maps/SeafoamIslands_B4F/scripts.inc @@ -0,0 +1,218 @@ +SeafoamIslands_B4F_MapScripts:: @ 816302E + map_script 3, SeafoamIslands_B4F_MapScript1_163066 + map_script 5, SeafoamIslands_B4F_MapScript2_163048 + map_script 1, SeafoamIslands_B4F_MapScript3_1630B1 + map_script 4, SeafoamIslands_B4F_MapScript4_1630E7 + map_script 2, SeafoamIslands_B4F_MapScript5_1630F9 + .byte 0 + +SeafoamIslands_B4F_MapScript2_163048:: @ 8163048 + checkflag 2055 + call_if 1, EventScript_163052 + end + +EventScript_163052:: @ 8163052 + specialvar VAR_RESULT, sub_80CA74C + compare_var_to_value VAR_RESULT, 7 + goto_if 5, EventScript_1A77A9 + removeobject VAR_LAST_TALKED + return + +SeafoamIslands_B4F_MapScript1_163066:: @ 8163066 + checkflag FLAG_0x2BE + call_if 0, EventScript_1630AD + checkflag FLAG_0x2D3 + call_if 0, EventScript_163082 + checkflag FLAG_0x2D3 + call_if 1, EventScript_1630A9 + end + +EventScript_163082:: @ 8163082 + setvar VAR_0x4002, 0 + checkflag FLAG_0x04C + call_if 0, EventScript_163169 + checkflag FLAG_0x04D + call_if 0, EventScript_163169 + compare_var_to_value VAR_0x4002, 2 + call_if 1, EventScript_1630A5 + return + +EventScript_1630A5:: @ 81630A5 + setflag FLAG_0x2D3 + return + +EventScript_1630A9:: @ 81630A9 + setmaplayoutindex LAYOUT_UNUSEDLAYOUT_833BE30 + return + +EventScript_1630AD:: @ 81630AD + clearflag FLAG_0x082 + return + +SeafoamIslands_B4F_MapScript3_1630B1:: @ 81630B1 + setvar VAR_0x4002, 0 + checkflag FLAG_0x04C + call_if 0, EventScript_163169 + checkflag FLAG_0x04D + call_if 0, EventScript_163169 + compare_var_to_value VAR_0x4002, 2 + goto_if 1, EventScript_1630D4 + end + +EventScript_1630D4:: @ 81630D4 + setmetatile 12, 14, 299, 0 + setmetatile 13, 14, 299, 0 + end + +SeafoamIslands_B4F_MapScript4_1630E7:: @ 81630E7 + map_script_2 VAR_0x4063, 1, EventScript_1630F1 + .2byte 0 + +EventScript_1630F1:: @ 81630F1 + turnobject 255, 2 + special sub_80CBD80 + end + +SeafoamIslands_B4F_MapScript5_1630F9:: @ 81630F9 + map_script_2 VAR_0x4063, 1, EventScript_16310B + map_script_2 VAR_0x4001, 1, EventScript_163121 + .2byte 0 + +EventScript_16310B:: @ 816310B + lockall + applymovement 255, Movement_16311D + waitmovement 0 + setvar VAR_0x4063, 0 + releaseall + end + +Movement_16311D:: @ 816311D + step_1e + step_1e + step_1e + step_end + +EventScript_163121:: @ 8163121 + lockall + setvar VAR_0x4002, 0 + checkflag FLAG_0x04C + call_if 0, EventScript_163169 + checkflag FLAG_0x04D + call_if 0, EventScript_163169 + compare_var_to_value VAR_0x4002, 2 + goto_if 1, EventScript_163185 + getplayerxy VAR_0x8008, VAR_0x8009 + compare_var_to_value VAR_0x8008, 9 + call_if 0, EventScript_16316F + compare_var_to_value VAR_0x8008, 9 + call_if 4, EventScript_16317A + special sub_805D1A8 + setvar VAR_0x4001, 0 + releaseall + end + +EventScript_163169:: @ 8163169 + addvar VAR_0x4002, 1 + return + +EventScript_16316F:: @ 816316F + applymovement 255, Movement_16318C + waitmovement 0 + return + +EventScript_16317A:: @ 816317A + applymovement 255, Movement_163195 + waitmovement 0 + return + +EventScript_163185:: @ 8163185 + setvar VAR_0x4001, 0 + releaseall + end + +Movement_16318C:: @ 816318C + step_11 + step_11 + step_11 + step_13 + step_13 + step_13 + step_13 + step_11 + step_end + +Movement_163195:: @ 8163195 + step_11 + step_11 + step_11 + step_13 + step_13 + step_13 + step_11 + step_end + +SeafoamIslands_B4F_EventScript_16319D:: @ 816319D + lockall + applymovement 255, Movement_1631AA + waitmovement 0 + releaseall + end + +Movement_1631AA:: @ 81631AA + step_11 + step_end + +SeafoamIslands_B4F_EventScript_1631AC:: @ 81631AC + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + special sub_8112364 + lock + faceplayer + setwildbattle SPECIES_ARTICUNO, 50, ITEM_NONE + waitse + playmoncry SPECIES_ARTICUNO, 2 + message Text_1A6448 + waitmessage + waitmoncry + delay 10 + playbgm BGM_FRLG_LEADER_EYE, 0 + waitbuttonpress + setflag 2055 + special sub_807F9D8 + waitstate + clearflag 2055 + specialvar VAR_RESULT, sub_80CA74C + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16320F + compare_var_to_value VAR_RESULT, 4 + goto_if 1, EventScript_163218 + compare_var_to_value VAR_RESULT, 5 + goto_if 1, EventScript_163218 + setflag FLAG_0x2BE + release + end + +EventScript_16320F:: @ 816320F + setflag FLAG_0x2BE + goto EventScript_1A922D + +EventScript_163217:: @ 8163217 + end + +EventScript_163218:: @ 8163218 + setvar VAR_0x8004, 144 + goto EventScript_1A9236 + +EventScript_163222:: @ 8163222 + end + +SeafoamIslands_B4F_EventScript_163223:: @ 8163223 + loadword 0, gUnknown_8179B36 + callstd 3 + end + +SeafoamIslands_B4F_EventScript_16322C:: @ 816322C + loadword 0, gUnknown_8179B65 + callstd 3 + end diff --git a/data/maps/SevenIsland/scripts.inc b/data/maps/SevenIsland/scripts.inc new file mode 100644 index 000000000..5b932458c --- /dev/null +++ b/data/maps/SevenIsland/scripts.inc @@ -0,0 +1,22 @@ +SevenIsland_MapScripts:: @ 8167EB3 + map_script 3, SevenIsland_MapScript1_167EB9 + .byte 0 + +SevenIsland_MapScript1_167EB9:: @ 8167EB9 + setworldmapflag 2208 + end + +SevenIsland_EventScript_167EBD:: @ 8167EBD + loadword 0, gUnknown_8183046 + callstd 3 + end + +SevenIsland_EventScript_167EC6:: @ 8167EC6 + loadword 0, gUnknown_818306C + callstd 2 + end + +SevenIsland_EventScript_167ECF:: @ 8167ECF + loadword 0, gUnknown_8183143 + callstd 2 + end diff --git a/data/maps/SevenIsland_Harbor/scripts.inc b/data/maps/SevenIsland_Harbor/scripts.inc new file mode 100644 index 000000000..565aa55ee --- /dev/null +++ b/data/maps/SevenIsland_Harbor/scripts.inc @@ -0,0 +1,11 @@ +SevenIsland_Harbor_MapScripts:: @ 8170BE4 + .byte 0 + +SevenIsland_Harbor_EventScript_170BE5:: @ 8170BE5 + lock + faceplayer + message Text_181726 + waitmessage + setvar VAR_0x8004, 7 + goto EventScript_1A900F + end diff --git a/data/maps/SevenIsland_House_Room1/scripts.inc b/data/maps/SevenIsland_House_Room1/scripts.inc new file mode 100644 index 000000000..4838fb2cf --- /dev/null +++ b/data/maps/SevenIsland_House_Room1/scripts.inc @@ -0,0 +1,194 @@ +SevenIsland_House_Room1_MapScripts:: @ 817088A + map_script 3, SevenIsland_House_Room1_MapScript1_170895 + map_script 2, SevenIsland_House_Room1_MapScript2_1708CF + .byte 0 + +SevenIsland_House_Room1_MapScript1_170895:: @ 8170895 + special ValidateEReaderTrainer + compare_var_to_value VAR_RESULT, 0 + call_if 1, EventScript_1708AF + compare_var_to_value VAR_0x4074, 0 + call_if 5, EventScript_1708C3 + end + +EventScript_1708AF:: @ 81708AF + setvar VAR_0x4001, 1 + setobjectxyperm 1, 4, 2 + setobjectmovementtype 1, 8 + setmaplayoutindex LAYOUT_UNUSEDLAYOUT_8338B4C + return + +EventScript_1708C3:: @ 81708C3 + setobjectxyperm 1, 3, 2 + setobjectmovementtype 1, 10 + return + +SevenIsland_House_Room1_MapScript2_1708CF:: @ 81708CF + map_script_2 VAR_0x4074, 1, EventScript_1708E9 + map_script_2 VAR_0x4074, 2, EventScript_1708E9 + map_script_2 VAR_0x4074, 3, EventScript_1708E9 + .2byte 0 + +EventScript_1708E9:: @ 1708E9 + lockall + textcolor 1 + applymovement 255, Movement_170953 + waitmovement 0 + applymovement 1, Movement_170955 + waitmovement 0 + moveobjectoffscreen 1 + applymovement 255, Movement_1A75E9 + waitmovement 0 + compare_var_to_value VAR_0x4074, 1 + call_if 1, EventScript_170938 + compare_var_to_value VAR_0x4074, 2 + call_if 1, EventScript_170941 + compare_var_to_value VAR_0x4074, 3 + call_if 1, EventScript_17094A + special LoadPlayerParty + setvar VAR_0x4074, 0 + releaseall + end + +EventScript_170938:: @ 8170938 + loadword 0, gUnknown_81A088C + callstd 4 + return + +EventScript_170941:: @ 8170941 + loadword 0, gUnknown_81A0971 + callstd 4 + return + +EventScript_17094A:: @ 817094A + loadword 0, gUnknown_81A0807 + callstd 4 + return + +Movement_170953:: @ 8170953 + step_10 + step_end + +Movement_170955:: @ 8170955 + step_13 + step_2d + step_end + +SevenIsland_House_Room1_EventScript_170958:: @ 8170958 + lock + faceplayer + special ValidateEReaderTrainer + compare_var_to_value VAR_RESULT, 1 + call_if 1, EventScript_17097D + compare_var_to_value VAR_0x4001, 1 + goto_if 1, EventScript_170987 + loadword 0, gUnknown_81A049B + callstd 4 + release + end + +EventScript_17097D:: @ 817097D + loadword 0, gUnknown_81A049B + callstd 4 + release + end + +EventScript_170987:: @ 8170987 + special SavePlayerParty + special sub_80CAAAC + loadword 0, gUnknown_81A0598 + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_170A11 + call EventScript_170A1E + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_170A11 + loadword 0, gUnknown_81A0788 + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_170A11 + special LoadPlayerParty + call EventScript_1A4EAF + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_170A11 + special SavePlayerParty + special sub_80A03D8 + loadword 0, gUnknown_81A07C4 + callstd 4 + closemessage + compare_var_to_value VAR_FACING, 2 + call_if 1, EventScript_170A2D + compare_var_to_value VAR_FACING, 4 + call_if 1, EventScript_170A3F + compare_var_to_value VAR_FACING, 3 + call_if 1, EventScript_170A51 + warp MAP_SEVENISLAND_HOUSE_ROOM2, 255, 3, 1 + waitstate + release + end + +EventScript_170A11:: @ 8170A11 + special LoadPlayerParty + loadword 0, gUnknown_81A064E + callstd 4 + release + end + +EventScript_170A1E:: @ 8170A1E + loadword 0, gUnknown_81A06AB + callstd 4 + fadescreen 1 + special sub_80A0334 + waitstate + return + +EventScript_170A2D:: @ 8170A2D + applymovement VAR_LAST_TALKED, Movement_170A6F + applymovement 255, Movement_170A63 + waitmovement 0 + return + +EventScript_170A3F:: @ 8170A3F + applymovement VAR_LAST_TALKED, Movement_170A72 + applymovement 255, Movement_170A67 + waitmovement 0 + return + +EventScript_170A51:: @ 8170A51 + applymovement VAR_LAST_TALKED, Movement_170A6F + applymovement 255, Movement_170A6B + waitmovement 0 + return + +Movement_170A63:: @ 8170A63 + step_1c + step_11 + step_11 + step_end + +Movement_170A67:: @ 8170A67 + step_1c + step_13 + step_11 + step_end + +Movement_170A6B:: @ 8170A6B + step_1c + step_12 + step_11 + step_end + +Movement_170A6F:: @ 8170A6F + step_12 + step_30 + step_end + +Movement_170A72:: @ 8170A72 + step_13 + step_2f + step_end + +SevenIsland_House_Room1_EventScript_170A75:: @ 8170A75 + loadword 0, gUnknown_81A0567 + callstd 3 + end diff --git a/data/maps/SevenIsland_House_Room2/scripts.inc b/data/maps/SevenIsland_House_Room2/scripts.inc new file mode 100644 index 000000000..13d5e0170 --- /dev/null +++ b/data/maps/SevenIsland_House_Room2/scripts.inc @@ -0,0 +1,79 @@ +SevenIsland_House_Room2_MapScripts:: @ 8170A7E + map_script 3, SevenIsland_House_Room2_MapScript1_170A89 + map_script 2, SevenIsland_House_Room2_MapScript2_170A8D + .byte 0 + +SevenIsland_House_Room2_MapScript1_170A89:: @ 8170A89 + special sub_80E5E70 + end + +SevenIsland_House_Room2_MapScript2_170A8D:: @ 8170A8D + map_script_2 VAR_0x4001, 0, EventScript_170A97 + .2byte 0 + +EventScript_170A97:: @ 8170A97 + lockall + applymovement 255, Movement_170B22 + waitmovement 0 + special sub_80E7538 + loadword 0, gStringVar4 @ 2021D18 + callstd 4 + closemessage + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 0 + special sub_80E6900 + waitstate + compare_var_to_value VAR_RESULT, 3 + call_if 1, EventScript_170AFE + compare_var_to_value VAR_RESULT, 1 + call_if 1, EventScript_170B0C + compare_var_to_value VAR_RESULT, 2 + call_if 1, EventScript_170B17 + closemessage + special sp000_heal_pokemon + applymovement 255, Movement_170B28 + waitmovement 0 + special LoadPlayerParty + setvar VAR_0x4001, 1 + warp MAP_SEVENISLAND_HOUSE_ROOM1, 255, 4, 1 + waitstate + releaseall + end + +EventScript_170AFE:: @ 8170AFE + setvar VAR_0x4074, 3 + loadword 0, gUnknown_81A07EC + callstd 4 + return + +EventScript_170B0C:: @ 8170B0C + setvar VAR_0x4074, 1 + special sub_80CA68C + waitmessage + waitbuttonpress + return + +EventScript_170B17:: @ 8170B17 + setvar VAR_0x4074, 2 + special sub_80CA68C + waitmessage + waitbuttonpress + return + +Movement_170B22:: @ 8170B22 + step_10 + step_10 + step_10 + step_13 + step_13 + step_end + +Movement_170B28:: @ 8170B28 + step_12 + step_12 + step_11 + step_11 + step_11 + step_11 + step_1b + step_end diff --git a/data/maps/SevenIsland_Mart/scripts.inc b/data/maps/SevenIsland_Mart/scripts.inc new file mode 100644 index 000000000..c93fb13cb --- /dev/null +++ b/data/maps/SevenIsland_Mart/scripts.inc @@ -0,0 +1,46 @@ +SevenIsland_Mart_MapScripts:: @ 8170B30 + .byte 0 + +SevenIsland_Mart_EventScript_170B31:: @ 8170B31 + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + lock + faceplayer + message Text_1A6211 + waitmessage + pokemart Items_170B58 + loadword 0, gUnknown_81A5190 + callstd 4 + release + end + + .align 2 +Items_170B58:: @ 8170B58 + .2byte ITEM_ULTRA_BALL + .2byte ITEM_GREAT_BALL + .2byte ITEM_FULL_RESTORE + .2byte ITEM_MAX_POTION + .2byte ITEM_HYPER_POTION + .2byte ITEM_REVIVE + .2byte ITEM_FULL_HEAL + .2byte ITEM_ESCAPE_ROPE + .2byte ITEM_MAX_REPEL + .2byte ITEM_NONE + release + end + +SevenIsland_Mart_EventScript_170B6E:: @ 8170B6E + loadword 0, gUnknown_81A0A4F + callstd 2 + end + +SevenIsland_Mart_EventScript_170B77:: @ 8170B77 + loadword 0, gUnknown_81A0ACC + callstd 2 + end + +SevenIsland_Mart_EventScript_170B80:: @ 8170B80 + loadword 0, gUnknown_81A0B09 + callstd 2 + end diff --git a/data/maps/SevenIsland_PokemonCenter_1F/scripts.inc b/data/maps/SevenIsland_PokemonCenter_1F/scripts.inc new file mode 100644 index 000000000..41a994d4e --- /dev/null +++ b/data/maps/SevenIsland_PokemonCenter_1F/scripts.inc @@ -0,0 +1,30 @@ +SevenIsland_PokemonCenter_1F_MapScripts:: @ 8170B89 + map_script 3, SevenIsland_PokemonCenter_1F_MapScript1_170B94 + map_script 5, SevenIsland_PokemonCenter_1F_MapScript2_1BC05C + .byte 0 + +SevenIsland_PokemonCenter_1F_MapScript1_170B94:: @ 8170B94 + setrespawn 19 + end + +SevenIsland_PokemonCenter_1F_EventScript_170B98:: @ 8170B98 + lock + faceplayer + call EventScript_1A6578 + release + end + +SevenIsland_PokemonCenter_1F_EventScript_170BA1:: @ 8170BA1 + loadword 0, gUnknown_81A0B98 + callstd 2 + end + +SevenIsland_PokemonCenter_1F_EventScript_170BAA:: @ 8170BAA + loadword 0, gUnknown_81A0C1F + callstd 2 + end + +SevenIsland_PokemonCenter_1F_EventScript_170BB3:: @ 8170BB3 + loadword 0, gUnknown_81A0CA5 + callstd 2 + end diff --git a/data/maps/SevenIsland_PokemonCenter_2F/scripts.inc b/data/maps/SevenIsland_PokemonCenter_2F/scripts.inc new file mode 100644 index 000000000..31cc13d6c --- /dev/null +++ b/data/maps/SevenIsland_PokemonCenter_2F/scripts.inc @@ -0,0 +1,18 @@ +SevenIsland_PokemonCenter_2F_MapScripts:: @ 8170BBC + map_script 2, SevenIsland_PokemonCenter_2F_MapScript1_1BB2A3 + map_script 4, SevenIsland_PokemonCenter_2F_MapScript2_1BB1ED + map_script 1, SevenIsland_PokemonCenter_2F_MapScript3_1BB237 + map_script 3, SevenIsland_PokemonCenter_2F_MapScript4_1BB1B4 + .byte 0 + +SevenIsland_PokemonCenter_2F_EventScript_170BD1:: @ 8170BD1 + call EventScript_1BB4A3 + end + +EventScript_170BD7:: @ 8170BD7 + call EventScript_1BB6AB + end + +EventScript_170BDD:: @ 8170BDD + call EventScript_1BB7DE + end diff --git a/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/scripts.inc b/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/scripts.inc new file mode 100644 index 000000000..2ed7255f0 --- /dev/null +++ b/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/scripts.inc @@ -0,0 +1,144 @@ +SevenIsland_SeavaultCanyon_TanobyKey_MapScripts:: @ 8164DCC + map_script 3, SevenIsland_SeavaultCanyon_TanobyKey_MapScript1_164DD2 + .byte 0 + +SevenIsland_SeavaultCanyon_TanobyKey_MapScript1_164DD2:: @ 8164DD2 + setworldmapflag 2241 + checkflag 2121 + call_if 1, EventScript_164E07 + setvar VAR_0x4001, 0 + setvar VAR_0x4002, 0 + setvar VAR_0x4003, 0 + setvar VAR_0x4004, 0 + setvar VAR_0x4005, 0 + setvar VAR_0x4006, 0 + setvar VAR_0x4007, 0 + setvar VAR_0x4008, 0 + end + +EventScript_164E07:: @ 8164E07 + setobjectxyperm 1, 7, 2 + setobjectxyperm 2, 4, 4 + setobjectxyperm 3, 10, 4 + setobjectxyperm 4, 5, 6 + setobjectxyperm 5, 9, 6 + setobjectxyperm 6, 5, 8 + setobjectxyperm 7, 9, 8 + return + +SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E39:: @ 8164E39 + lockall + compare_var_to_value VAR_0x4001, 100 + goto_if 1, EventScript_164F8A + call EventScript_164F2E + setvar VAR_0x4001, 100 + compare_var_to_value VAR_0x4008, 7 + goto_if 1, EventScript_164F8C + releaseall + end + +SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E5C:: @ 8164E5C + lockall + compare_var_to_value VAR_0x4002, 100 + goto_if 1, EventScript_164F8A + call EventScript_164F2E + setvar VAR_0x4002, 100 + compare_var_to_value VAR_0x4008, 7 + goto_if 1, EventScript_164F8C + releaseall + end + +SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E7F:: @ 8164E7F + lockall + compare_var_to_value VAR_0x4003, 100 + goto_if 1, EventScript_164F8A + call EventScript_164F2E + setvar VAR_0x4003, 100 + compare_var_to_value VAR_0x4008, 7 + goto_if 1, EventScript_164F8C + releaseall + end + +SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EA2:: @ 8164EA2 + lockall + compare_var_to_value VAR_0x4004, 100 + goto_if 1, EventScript_164F8A + call EventScript_164F2E + setvar VAR_0x4004, 100 + compare_var_to_value VAR_0x4008, 7 + goto_if 1, EventScript_164F8C + releaseall + end + +SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EC5:: @ 8164EC5 + lockall + compare_var_to_value VAR_0x4005, 100 + goto_if 1, EventScript_164F8A + call EventScript_164F2E + setvar VAR_0x4005, 100 + compare_var_to_value VAR_0x4008, 7 + goto_if 1, EventScript_164F8C + releaseall + end + +SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EE8:: @ 8164EE8 + lockall + compare_var_to_value VAR_0x4006, 100 + goto_if 1, EventScript_164F8A + call EventScript_164F2E + setvar VAR_0x4006, 100 + compare_var_to_value VAR_0x4008, 7 + goto_if 1, EventScript_164F8C + releaseall + end + +SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164F0B:: @ 8164F0B + lockall + compare_var_to_value VAR_0x4007, 100 + goto_if 1, EventScript_164F8A + call EventScript_164F2E + setvar VAR_0x4007, 100 + compare_var_to_value VAR_0x4008, 7 + goto_if 1, EventScript_164F8C + releaseall + end + +EventScript_164F2E:: @ 8164F2E + addvar VAR_0x4008, 1 + playse SE_RU_HYUU + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 1 + setvar VAR_0x8006, 8 + setvar VAR_0x8007, 3 + special sub_80CAC28 + delay 60 + return + +EventScript_164F51:: @ 8164F51 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 2 + setvar VAR_0x8006, 10 + setvar VAR_0x8007, 3 + special sub_80CAC28 + delay 60 + setvar VAR_0x8004, 3 + setvar VAR_0x8005, 3 + setvar VAR_0x8006, 12 + setvar VAR_0x8007, 2 + special sub_80CAC28 + delay 60 + playse SE_EXP + waitse + return + +EventScript_164F8A:: @ 8164F8A + releaseall + end + +EventScript_164F8C:: @ 8164F8C + call EventScript_164F51 + loadword 0, gUnknown_817D31B + callstd 4 + setflag 2121 + releaseall + end diff --git a/data/maps/SevenIsland_SevaultCanyon/scripts.inc b/data/maps/SevenIsland_SevaultCanyon/scripts.inc new file mode 100644 index 000000000..862439936 --- /dev/null +++ b/data/maps/SevenIsland_SevaultCanyon/scripts.inc @@ -0,0 +1,7 @@ +SevenIsland_SevaultCanyon_MapScripts:: @ 8168BFD + .byte 0 + +SevenIsland_SevaultCanyon_EventScript_168BFE:: @ 8168BFE + loadword 0, gUnknown_818CF2B + callstd 3 + end diff --git a/data/maps/SevenIsland_SevaultCanyon_Entrance/scripts.inc b/data/maps/SevenIsland_SevaultCanyon_Entrance/scripts.inc new file mode 100644 index 000000000..696ed9483 --- /dev/null +++ b/data/maps/SevenIsland_SevaultCanyon_Entrance/scripts.inc @@ -0,0 +1,7 @@ +SevenIsland_SevaultCanyon_Entrance_MapScripts:: @ 8168BF3 + .byte 0 + +SevenIsland_SevaultCanyon_Entrance_EventScript_168BF4:: @ 8168BF4 + loadword 0, gUnknown_818C82D + callstd 3 + end diff --git a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc new file mode 100644 index 000000000..31df02ba3 --- /dev/null +++ b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc @@ -0,0 +1,89 @@ +SevenIsland_SevaultCanyon_House_MapScripts:: @ 8172182 + .byte 0 + +SevenIsland_SevaultCanyon_House_EventScript_172183:: @ 8172183 + lock + checkflag FLAG_0x002 + goto_if 1, EventScript_172211 + playbgm 267, 0 + applymovement 1, Movement_172231 + waitmovement 0 + fadedefaultbgm + delay 30 + applymovement 1, Movement_1A75E1 + waitmovement 0 + loadword 0, gUnknown_81A4D72 + callstd 4 + textcolor 3 + loadword 0, gUnknown_81A4DAF + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_172225 + loadword 0, gUnknown_81A4DD8 + callstd 4 + closemessage + call EventScript_1A6675 + compare_var_to_value VAR_FACING, 1 + call_if 5, EventScript_172206 + delay 30 + playbgm 267, 0 + applymovement 255, Movement_172231 + waitmovement 0 + fadedefaultbgm + delay 30 + call EventScript_1A6C26 + loadword 0, gUnknown_81A4DF5 + callstd 4 + setflag FLAG_0x002 + release + end + +EventScript_172206:: @ 8172206 + applymovement 255, Movement_1A75ED + waitmovement 0 + return + +EventScript_172211:: @ 8172211 + applymovement 1, Movement_1A75E1 + waitmovement 0 + loadword 0, gUnknown_81A4D72 + callstd 4 + release + end + +EventScript_172225:: @ 8172225 + textcolor 0 + loadword 0, gUnknown_81A4DC8 + callstd 4 + release + end + +Movement_172231:: @ 8172231 + step_25 + step_1c + step_25 + step_1c + step_25 + step_1c + step_25 + step_1c + step_30 + step_1a + step_2e + step_1a + step_2f + step_1a + step_2d + step_1a + step_end + +SevenIsland_SevaultCanyon_House_EventScript_172242:: @ 8172242 + lock + faceplayer + waitse + playmoncry SPECIES_CHANSEY, 0 + loadword 0, gUnknown_81A4E26 + callstd 4 + waitmoncry + release + end diff --git a/data/maps/SevenIsland_TanobyRuins/scripts.inc b/data/maps/SevenIsland_TanobyRuins/scripts.inc new file mode 100644 index 000000000..57a3462f1 --- /dev/null +++ b/data/maps/SevenIsland_TanobyRuins/scripts.inc @@ -0,0 +1,2 @@ +SevenIsland_TanobyRuins_MapScripts:: @ 8168C07 + .byte 0 diff --git a/data/maps/SevenIsland_TanobyRuins_DilfordChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_DilfordChamber/scripts.inc new file mode 100644 index 000000000..421d3c72b --- /dev/null +++ b/data/maps/SevenIsland_TanobyRuins_DilfordChamber/scripts.inc @@ -0,0 +1,7 @@ +SevenIsland_TanobyRuins_DilfordChamber_MapScripts:: @ 8164CF6 + map_script 3, SevenIsland_TanobyRuins_DilfordChamber_MapScript1_164CFC + .byte 0 + +SevenIsland_TanobyRuins_DilfordChamber_MapScript1_164CFC:: @ 8164CFC + call EventScript_1A925E + end diff --git a/data/maps/SevenIsland_TanobyRuins_LiptooChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_LiptooChamber/scripts.inc new file mode 100644 index 000000000..084d58658 --- /dev/null +++ b/data/maps/SevenIsland_TanobyRuins_LiptooChamber/scripts.inc @@ -0,0 +1,7 @@ +SevenIsland_TanobyRuins_LiptooChamber_MapScripts:: @ 8164CDE + map_script 3, SevenIsland_TanobyRuins_LiptooChamber_MapScript1_164CE4 + .byte 0 + +SevenIsland_TanobyRuins_LiptooChamber_MapScript1_164CE4:: @ 8164CE4 + call EventScript_1A925E + end diff --git a/data/maps/SevenIsland_TanobyRuins_MoneanChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_MoneanChamber/scripts.inc new file mode 100644 index 000000000..776299736 --- /dev/null +++ b/data/maps/SevenIsland_TanobyRuins_MoneanChamber/scripts.inc @@ -0,0 +1,8 @@ +SevenIsland_TanobyRuins_MoneanChamber_MapScripts:: @ 8164CCF + map_script 3, SevenIsland_TanobyRuins_MoneanChamber_MapScript1_164CD5 + .byte 0 + +SevenIsland_TanobyRuins_MoneanChamber_MapScript1_164CD5:: @ 8164CD5 + setworldmapflag 2239 + call EventScript_1A925E + end diff --git a/data/maps/SevenIsland_TanobyRuins_RixyChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_RixyChamber/scripts.inc new file mode 100644 index 000000000..cb97039f3 --- /dev/null +++ b/data/maps/SevenIsland_TanobyRuins_RixyChamber/scripts.inc @@ -0,0 +1,7 @@ +SevenIsland_TanobyRuins_RixyChamber_MapScripts:: @ 8164D0E + map_script 3, SevenIsland_TanobyRuins_RixyChamber_MapScript1_164D14 + .byte 0 + +SevenIsland_TanobyRuins_RixyChamber_MapScript1_164D14:: @ 8164D14 + call EventScript_1A925E + end diff --git a/data/maps/SevenIsland_TanobyRuins_ScufibChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_ScufibChamber/scripts.inc new file mode 100644 index 000000000..4c825e5c3 --- /dev/null +++ b/data/maps/SevenIsland_TanobyRuins_ScufibChamber/scripts.inc @@ -0,0 +1,7 @@ +SevenIsland_TanobyRuins_ScufibChamber_MapScripts:: @ 8164D02 + map_script 3, SevenIsland_TanobyRuins_ScufibChamber_MapScript1_164D08 + .byte 0 + +SevenIsland_TanobyRuins_ScufibChamber_MapScript1_164D08:: @ 8164D08 + call EventScript_1A925E + end diff --git a/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/scripts.inc new file mode 100644 index 000000000..8a6d8d90d --- /dev/null +++ b/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/scripts.inc @@ -0,0 +1,7 @@ +SevenIsland_TanobyRuins_ViapoisChamber_MapScripts:: @ 8164D1A + map_script 3, SevenIsland_TanobyRuins_ViapoisChamber_MapScript1_164D20 + .byte 0 + +SevenIsland_TanobyRuins_ViapoisChamber_MapScript1_164D20:: @ 8164D20 + call EventScript_1A925E + end diff --git a/data/maps/SevenIsland_TanobyRuins_WeepthChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_WeepthChamber/scripts.inc new file mode 100644 index 000000000..facb265c2 --- /dev/null +++ b/data/maps/SevenIsland_TanobyRuins_WeepthChamber/scripts.inc @@ -0,0 +1,7 @@ +SevenIsland_TanobyRuins_WeepthChamber_MapScripts:: @ 8164CEA + map_script 3, SevenIsland_TanobyRuins_WeepthChamber_MapScript1_164CF0 + .byte 0 + +SevenIsland_TanobyRuins_WeepthChamber_MapScript1_164CF0:: @ 8164CF0 + call EventScript_1A925E + end diff --git a/data/maps/SevenIsland_TrainerTower/scripts.inc b/data/maps/SevenIsland_TrainerTower/scripts.inc new file mode 100644 index 000000000..db1321f48 --- /dev/null +++ b/data/maps/SevenIsland_TrainerTower/scripts.inc @@ -0,0 +1,17 @@ +SevenIsland_TrainerTower_MapScripts:: @ 8168BD5 + map_script 3, SevenIsland_TrainerTower_MapScript1_168BDB + .byte 0 + +SevenIsland_TrainerTower_MapScript1_168BDB:: @ 8168BDB + setvar VAR_0x4082, 0 + end + +SevenIsland_TrainerTower_EventScript_168BE1:: @ 8168BE1 + loadword 0, gUnknown_818C338 + callstd 3 + end + +SevenIsland_TrainerTower_EventScript_168BEA:: @ 8168BEA + loadword 0, gUnknown_818C370 + callstd 3 + end diff --git a/data/maps/SevenIsland_TrainerTower_1F/scripts.inc b/data/maps/SevenIsland_TrainerTower_1F/scripts.inc new file mode 100644 index 000000000..8ff1c438f --- /dev/null +++ b/data/maps/SevenIsland_TrainerTower_1F/scripts.inc @@ -0,0 +1,60 @@ +SevenIsland_TrainerTower_1F_MapScripts:: @ 81646B8 + map_script 5, SevenIsland_TrainerTower_1F_MapScript1_1C4F54 + map_script 3, SevenIsland_TrainerTower_1F_MapScript2_1C4F62 + map_script 2, SevenIsland_TrainerTower_1F_MapScript3_1C5046 + .byte 0 + +SevenIsland_TrainerTower_2F_EventScript_1646C8:: @ 81646C8 +SevenIsland_TrainerTower_4F_EventScript_1646C8:: @ 81646C8 +SevenIsland_TrainerTower_6F_EventScript_1646C8:: @ 81646C8 +SevenIsland_TrainerTower_8F_EventScript_1646C8:: @ 81646C8 +SevenIsland_TrainerTower_5F_EventScript_1646C8:: @ 81646C8 +SevenIsland_TrainerTower_7F_EventScript_1646C8:: @ 81646C8 +SevenIsland_TrainerTower_3F_EventScript_1646C8:: @ 81646C8 +SevenIsland_TrainerTower_1F_EventScript_1646C8:: @ 81646C8 + call EventScript_1C52F4 + end + +SevenIsland_TrainerTower_2F_EventScript_1646CE:: @ 81646CE +SevenIsland_TrainerTower_4F_EventScript_1646CE:: @ 81646CE +SevenIsland_TrainerTower_6F_EventScript_1646CE:: @ 81646CE +SevenIsland_TrainerTower_8F_EventScript_1646CE:: @ 81646CE +SevenIsland_TrainerTower_5F_EventScript_1646CE:: @ 81646CE +SevenIsland_TrainerTower_7F_EventScript_1646CE:: @ 81646CE +SevenIsland_TrainerTower_3F_EventScript_1646CE:: @ 81646CE +SevenIsland_TrainerTower_1F_EventScript_1646CE:: @ 81646CE + call EventScript_1C533B + end + +SevenIsland_TrainerTower_2F_EventScript_1646D4:: @ 81646D4 +SevenIsland_TrainerTower_4F_EventScript_1646D4:: @ 81646D4 +SevenIsland_TrainerTower_6F_EventScript_1646D4:: @ 81646D4 +SevenIsland_TrainerTower_8F_EventScript_1646D4:: @ 81646D4 +SevenIsland_TrainerTower_5F_EventScript_1646D4:: @ 81646D4 +SevenIsland_TrainerTower_7F_EventScript_1646D4:: @ 81646D4 +SevenIsland_TrainerTower_3F_EventScript_1646D4:: @ 81646D4 +SevenIsland_TrainerTower_1F_EventScript_1646D4:: @ 81646D4 + call EventScript_1C5382 + end + +SevenIsland_TrainerTower_2F_EventScript_1646DA:: @ 81646DA +SevenIsland_TrainerTower_4F_EventScript_1646DA:: @ 81646DA +SevenIsland_TrainerTower_6F_EventScript_1646DA:: @ 81646DA +SevenIsland_TrainerTower_8F_EventScript_1646DA:: @ 81646DA +SevenIsland_TrainerTower_5F_EventScript_1646DA:: @ 81646DA +SevenIsland_TrainerTower_7F_EventScript_1646DA:: @ 81646DA +SevenIsland_TrainerTower_3F_EventScript_1646DA:: @ 81646DA +SevenIsland_TrainerTower_1F_EventScript_1646DA:: @ 81646DA + call EventScript_1C538C + end + +SevenIsland_TrainerTower_2F_EventScript_1646E0:: @ 81646E0 +SevenIsland_TrainerTower_4F_EventScript_1646E0:: @ 81646E0 +SevenIsland_TrainerTower_6F_EventScript_1646E0:: @ 81646E0 +SevenIsland_TrainerTower_8F_EventScript_1646E0:: @ 81646E0 +SevenIsland_TrainerTower_7F_EventScript_1646E0:: @ 81646E0 +SevenIsland_TrainerTower_Roof_EventScript_1646E0:: @ 81646E0 +SevenIsland_TrainerTower_5F_EventScript_1646E0:: @ 81646E0 +SevenIsland_TrainerTower_3F_EventScript_1646E0:: @ 81646E0 + call EventScript_1C53AA + end diff --git a/data/maps/SevenIsland_TrainerTower_2F/scripts.inc b/data/maps/SevenIsland_TrainerTower_2F/scripts.inc new file mode 100644 index 000000000..c62250bb9 --- /dev/null +++ b/data/maps/SevenIsland_TrainerTower_2F/scripts.inc @@ -0,0 +1,25 @@ +SevenIsland_TrainerTower_2F_MapScripts:: @ 81646E6 + map_script 5, SevenIsland_TrainerTower_2F_MapScript1_1C4F54 + map_script 3, SevenIsland_TrainerTower_2F_MapScript2_1C4F62 + map_script 2, SevenIsland_TrainerTower_2F_MapScript3_1C5046 + .byte 0 + +SevenIsland_TrainerTower_2F_EventScript_1646F6:: @ 81646F6 + call EventScript_1C52F4 + end + +EventScript_1646FC:: @ 81646FC + call EventScript_1C533B + end + +EventScript_164702:: @ 8164702 + call EventScript_1C5382 + end + +EventScript_164708:: @ 8164708 + call EventScript_1C538C + end + +EventScript_16470E:: @ 816470E + call EventScript_1C53AA + end diff --git a/data/maps/SevenIsland_TrainerTower_3F/scripts.inc b/data/maps/SevenIsland_TrainerTower_3F/scripts.inc new file mode 100644 index 000000000..c2dcd426f --- /dev/null +++ b/data/maps/SevenIsland_TrainerTower_3F/scripts.inc @@ -0,0 +1,25 @@ +SevenIsland_TrainerTower_3F_MapScripts:: @ 8164714 + map_script 5, SevenIsland_TrainerTower_3F_MapScript1_1C4F54 + map_script 3, SevenIsland_TrainerTower_3F_MapScript2_1C4F62 + map_script 2, SevenIsland_TrainerTower_3F_MapScript3_1C5046 + .byte 0 + +SevenIsland_TrainerTower_3F_EventScript_164724:: @ 8164724 + call EventScript_1C52F4 + end + +EventScript_16472A:: @ 816472A + call EventScript_1C533B + end + +EventScript_164730:: @ 8164730 + call EventScript_1C5382 + end + +EventScript_164736:: @ 8164736 + call EventScript_1C538C + end + +EventScript_16473C:: @ 816473C + call EventScript_1C53AA + end diff --git a/data/maps/SevenIsland_TrainerTower_4F/scripts.inc b/data/maps/SevenIsland_TrainerTower_4F/scripts.inc new file mode 100644 index 000000000..d1cf8a2fc --- /dev/null +++ b/data/maps/SevenIsland_TrainerTower_4F/scripts.inc @@ -0,0 +1,25 @@ +SevenIsland_TrainerTower_4F_MapScripts:: @ 8164742 + map_script 5, SevenIsland_TrainerTower_4F_MapScript1_1C4F54 + map_script 3, SevenIsland_TrainerTower_4F_MapScript2_1C4F62 + map_script 2, SevenIsland_TrainerTower_4F_MapScript3_1C5046 + .byte 0 + +SevenIsland_TrainerTower_4F_EventScript_164752:: @ 8164752 + call EventScript_1C52F4 + end + +EventScript_164758:: @ 8164758 + call EventScript_1C533B + end + +EventScript_16475E:: @ 816475E + call EventScript_1C5382 + end + +EventScript_164764:: @ 8164764 + call EventScript_1C538C + end + +EventScript_16476A:: @ 816476A + call EventScript_1C53AA + end diff --git a/data/maps/SevenIsland_TrainerTower_5F/scripts.inc b/data/maps/SevenIsland_TrainerTower_5F/scripts.inc new file mode 100644 index 000000000..de118c6ca --- /dev/null +++ b/data/maps/SevenIsland_TrainerTower_5F/scripts.inc @@ -0,0 +1,25 @@ +SevenIsland_TrainerTower_5F_MapScripts:: @ 8164770 + map_script 5, SevenIsland_TrainerTower_5F_MapScript1_1C4F54 + map_script 3, SevenIsland_TrainerTower_5F_MapScript2_1C4F62 + map_script 2, SevenIsland_TrainerTower_5F_MapScript3_1C5046 + .byte 0 + +SevenIsland_TrainerTower_5F_EventScript_164780:: @ 8164780 + call EventScript_1C52F4 + end + +EventScript_164786:: @ 8164786 + call EventScript_1C533B + end + +EventScript_16478C:: @ 816478C + call EventScript_1C5382 + end + +EventScript_164792:: @ 8164792 + call EventScript_1C538C + end + +EventScript_164798:: @ 8164798 + call EventScript_1C53AA + end diff --git a/data/maps/SevenIsland_TrainerTower_6F/scripts.inc b/data/maps/SevenIsland_TrainerTower_6F/scripts.inc new file mode 100644 index 000000000..d3b558300 --- /dev/null +++ b/data/maps/SevenIsland_TrainerTower_6F/scripts.inc @@ -0,0 +1,25 @@ +SevenIsland_TrainerTower_6F_MapScripts:: @ 816479E + map_script 5, SevenIsland_TrainerTower_6F_MapScript1_1C4F54 + map_script 3, SevenIsland_TrainerTower_6F_MapScript2_1C4F62 + map_script 2, SevenIsland_TrainerTower_6F_MapScript3_1C5046 + .byte 0 + +SevenIsland_TrainerTower_6F_EventScript_1647AE:: @ 81647AE + call EventScript_1C52F4 + end + +EventScript_1647B4:: @ 81647B4 + call EventScript_1C533B + end + +EventScript_1647BA:: @ 81647BA + call EventScript_1C5382 + end + +EventScript_1647C0:: @ 81647C0 + call EventScript_1C538C + end + +EventScript_1647C6:: @ 81647C6 + call EventScript_1C53AA + end diff --git a/data/maps/SevenIsland_TrainerTower_7F/scripts.inc b/data/maps/SevenIsland_TrainerTower_7F/scripts.inc new file mode 100644 index 000000000..e59cc0166 --- /dev/null +++ b/data/maps/SevenIsland_TrainerTower_7F/scripts.inc @@ -0,0 +1,25 @@ +SevenIsland_TrainerTower_7F_MapScripts:: @ 81647CC + map_script 5, SevenIsland_TrainerTower_7F_MapScript1_1C4F54 + map_script 3, SevenIsland_TrainerTower_7F_MapScript2_1C4F62 + map_script 2, SevenIsland_TrainerTower_7F_MapScript3_1C5046 + .byte 0 + +SevenIsland_TrainerTower_7F_EventScript_1647DC:: @ 81647DC + call EventScript_1C52F4 + end + +EventScript_1647E2:: @ 81647E2 + call EventScript_1C533B + end + +EventScript_1647E8:: @ 81647E8 + call EventScript_1C5382 + end + +EventScript_1647EE:: @ 81647EE + call EventScript_1C538C + end + +EventScript_1647F4:: @ 81647F4 + call EventScript_1C53AA + end diff --git a/data/maps/SevenIsland_TrainerTower_8F/scripts.inc b/data/maps/SevenIsland_TrainerTower_8F/scripts.inc new file mode 100644 index 000000000..1907ddebc --- /dev/null +++ b/data/maps/SevenIsland_TrainerTower_8F/scripts.inc @@ -0,0 +1,25 @@ +SevenIsland_TrainerTower_8F_MapScripts:: @ 81647FA + map_script 5, SevenIsland_TrainerTower_8F_MapScript1_1C4F54 + map_script 3, SevenIsland_TrainerTower_8F_MapScript2_1C4F62 + map_script 2, SevenIsland_TrainerTower_8F_MapScript3_1C5046 + .byte 0 + +SevenIsland_TrainerTower_8F_EventScript_16480A:: @ 816480A + call EventScript_1C52F4 + end + +EventScript_164810:: @ 8164810 + call EventScript_1C533B + end + +EventScript_164816:: @ 8164816 + call EventScript_1C5382 + end + +EventScript_16481C:: @ 816481C + call EventScript_1C538C + end + +EventScript_164822:: @ 8164822 + call EventScript_1C53AA + end diff --git a/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc b/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc new file mode 100644 index 000000000..b26dec885 --- /dev/null +++ b/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc @@ -0,0 +1,87 @@ +SevenIsland_TrainerTower_Elevator_MapScripts:: @ 8164AF8 + map_script 5, SevenIsland_TrainerTower_Elevator_MapScript1_1C4F54 + map_script 2, SevenIsland_TrainerTower_Elevator_MapScript2_1C5046 + .byte 0 + +SevenIsland_TrainerTower_Elevator_EventScript_164B03:: @ 8164B03 + lockall + setvar VAR_0x8004, 6 + checkflag FLAG_0x002 + call_if 0, EventScript_1A7AB9 + copyvar VAR_0x8005, VAR_0x403A + special sub_80CB580 + message Text_1A535C + waitmessage + setvar VAR_0x8004, 6 + specialvar VAR_RESULT, sub_80CB328 + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_164B46 + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_164B52 + end + +EventScript_164B46:: @ 8164B46 + multichoicedefault 0, 0, 20, 0, 0 + goto EventScript_164B5E + end + +EventScript_164B52:: @ 8164B52 + multichoicedefault 0, 0, 20, 1, 0 + goto EventScript_164B5E + end + +EventScript_164B5E:: @ 8164B5E + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_164BCD + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_164B90 + compare_var_to_value VAR_0x8000, 2 + goto_if 1, EventScript_164BD3 + compare_var_to_value VAR_0x8000, 127 + goto_if 1, EventScript_164BD3 + end + +EventScript_164B90:: @ 8164B90 + setvar VAR_0x8006, 3 + setdynamicwarp MAP_SEVENISLAND_TRAINERTOWER_LOBBY, 255, 17, 8 + compare_var_to_value VAR_0x403A, 3 + goto_if 1, EventScript_164BD3 + call EventScript_164BD8 + setvar VAR_0x403A, 3 + special sub_80CB63C + delay 25 + applymovement 255, Movement_164BE5 + waitmovement 0 + warp MAP_SEVENISLAND_TRAINERTOWER_LOBBY, 255, 17, 8 + waitstate + releaseall + end + +EventScript_164BCD:: @ 8164BCD + goto EventScript_164BD3 + end + +EventScript_164BD3:: @ 8164BD3 + special sub_80CB63C + releaseall + end + +EventScript_164BD8:: @ 8164BD8 + special sub_80CB63C + closemessage + waitse + special sub_80CB498 + waitstate + setflag FLAG_0x002 + return + +Movement_164BE5:: @ 8164BE5 + step_2d + step_1c + step_10 + step_13 + step_13 + step_10 + step_end diff --git a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc new file mode 100644 index 000000000..060847ef0 --- /dev/null +++ b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc @@ -0,0 +1,263 @@ +SevenIsland_TrainerTower_Lobby_MapScripts:: @ 8164839 + map_script 5, SevenIsland_TrainerTower_Lobby_MapScript1_164853 + map_script 7, SevenIsland_TrainerTower_Lobby_MapScript2_164887 + map_script 3, SevenIsland_TrainerTower_Lobby_MapScript3_1648AD + map_script 1, SevenIsland_TrainerTower_Lobby_MapScript4_164897 + map_script 2, SevenIsland_TrainerTower_Lobby_MapScript5_1648B6 + .byte 0 + +SevenIsland_TrainerTower_Lobby_MapScript1_164853:: @ 8164853 + setvar VAR_0x4002, 0 + setvar VAR_0x8004, 10 + special sub_815D9E8 + setvar VAR_0x8004, 18 + special sub_815D9E8 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_164886 + setvar VAR_0x4000, 0 + setobjectxy 255, 9, 7 + applymovement 255, Movement_164AD4 + +EventScript_164886:: @ 8164886 + end + +SevenIsland_TrainerTower_Lobby_MapScript2_164887:: @ 8164887 + addobject 1 + addobject 2 + addobject 3 + addobject 4 + addobject 5 + end + +SevenIsland_TrainerTower_Lobby_MapScript4_164897:: @ 8164897 + compare_var_to_value VAR_0x400D, 17 + call_if 1, EventScript_1648A3 + end + +EventScript_1648A3:: @ 81648A3 + setmetatile 17, 10, 647, 0 + return + +SevenIsland_TrainerTower_Lobby_MapScript3_1648AD:: @ 81648AD + setworldmapflag 2234 + getplayerxy VAR_0x400D, VAR_RESULT + end + +SevenIsland_TrainerTower_Lobby_MapScript5_1648B6:: @ 81648B6 + map_script_2 VAR_0x4000, 0, EventScript_1648ED + map_script_2 VAR_0x400D, 0x11, EventScript_1648C8 + .2byte 0 + +EventScript_1648C8:: @ 81648C8 + lockall + applymovement 255, Movement_1648EA + waitmovement 0 + setmetatile 17, 10, 692, 1 + special DrawWholeMapView + playse SE_N + waitse + setvar VAR_0x400D, 0 + releaseall + end + +Movement_1648EA:: @ 81648EA + step_10 + step_10 + step_end + +EventScript_1648ED:: @ 81648ED + setvar VAR_0x4000, 1 + setvar VAR_0x8004, 12 + special sub_815D9E8 + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_164920 + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_164938 + compare_var_to_value VAR_0x8000, 2 + goto_if 1, EventScript_16495C + +EventScript_164920:: @ 8164920 + lock + faceplayer + applymovement 255, Movement_164AD4 + textcolor 1 + loadword 0, gUnknown_817C937 + callstd 4 + goto EventScript_16494B + +EventScript_164938:: @ 8164938 + lock + faceplayer + applymovement 255, Movement_164AD4 + textcolor 1 + loadword 0, gUnknown_817C9C0 + callstd 4 + +EventScript_16494B:: @ 816494B + closemessage + applymovement 255, Movement_164AD6 + waitmovement 0 + setvar VAR_0x4082, 0 + release + +EventScript_16495C:: @ 816495C + end + +SevenIsland_TrainerTower_Lobby_EventScript_16495D:: @ 816495D + lock + faceplayer + call EventScript_1A6578 + release + end + +SevenIsland_TrainerTower_Lobby_EventScript_164966:: @ 8164966 + lock + faceplayer + setvar VAR_0x8004, 20 + special sub_815D9E8 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_164988 + loadword 0, gUnknown_817C9A2 + callstd 4 + goto EventScript_164990 + +EventScript_164988:: @ 8164988 + loadword 0, gUnknown_817CE1F + callstd 4 + +EventScript_164990:: @ 8164990 + release + end + +SevenIsland_TrainerTower_Lobby_EventScript_164992:: @ 8164992 + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + lock + faceplayer + message Text_1A6211 + waitmessage + pokemart Items_1649B8 + loadword 0, gUnknown_81A5190 + callstd 4 + release + end + + .align 2 +Items_1649B8:: @ 81649B8 + .2byte ITEM_ULTRA_BALL + .2byte ITEM_GREAT_BALL + .2byte ITEM_FULL_RESTORE + .2byte ITEM_MAX_POTION + .2byte ITEM_HYPER_POTION + .2byte ITEM_REVIVE + .2byte ITEM_FULL_HEAL + .2byte ITEM_ESCAPE_ROPE + .2byte ITEM_MAX_REPEL + .2byte ITEM_NONE + release + end + +SevenIsland_TrainerTower_Lobby_EventScript_1649CE:: @ 81649CE + lockall + applymovement 255, Movement_164AD4 + textcolor 1 + loadword 0, gUnknown_817C794 + callstd 4 + setvar VAR_0x8004, 17 + special sub_815D9E8 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_164A00 + loadword 0, gUnknown_817C7D9 + callstd 4 + goto EventScript_164A08 + +EventScript_164A00:: @ 8164A00 + loadword 0, gUnknown_817C850 + callstd 4 + +EventScript_164A08:: @ 8164A08 + message Text_17C88D + waitmessage + multichoice 18, 6, 16, 0 + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_164A53 + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_164ABF + compare_var_to_value VAR_0x8000, 2 + goto_if 1, EventScript_164A45 + compare_var_to_value VAR_0x8000, 127 + goto_if 1, EventScript_164ABF + end + +EventScript_164A45:: @ 8164A45 + loadword 0, gUnknown_817CCC9 + callstd 4 + goto EventScript_164A08 + end + +EventScript_164A53:: @ 8164A53 + multichoice 13, 3, 64, 0 + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_164AA0 + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_164AA0 + compare_var_to_value VAR_0x8000, 2 + goto_if 1, EventScript_164AA0 + compare_var_to_value VAR_0x8000, 3 + goto_if 1, EventScript_164AA0 + compare_var_to_value VAR_0x8000, 4 + goto_if 1, EventScript_164ABF + compare_var_to_value VAR_0x8000, 127 + goto_if 1, EventScript_164ABF + end + +EventScript_164AA0:: @ 8164AA0 + copyvar VAR_0x8005, VAR_RESULT + setvar VAR_0x4082, 1 + special sp000_heal_pokemon + loadword 0, gUnknown_817C8BF + callstd 4 + setvar VAR_0x8004, 6 + special sub_815D9E8 + releaseall + end + +EventScript_164ABF:: @ 8164ABF + loadword 0, gUnknown_817C91D + callstd 4 + closemessage + applymovement 255, Movement_164AD6 + waitmovement 0 + releaseall + end + +Movement_164AD4:: @ 8164AD4 + step_03 + step_end + +Movement_164AD6:: @ 8164AD6 + step_10 + step_end + +SevenIsland_TrainerTower_Lobby_EventScript_164AD8:: @ 8164AD8 + lockall + fadescreen 1 + setvar VAR_0x8004, 1 + special sub_80CD228 + waitstate + releaseall + end + +SevenIsland_TrainerTower_Lobby_EventScript_164AE6:: @ 8164AE6 + loadword 0, gUnknown_817CE38 + callstd 2 + end + +SevenIsland_TrainerTower_Lobby_EventScript_164AEF:: @ 8164AEF + loadword 0, gUnknown_817CE9F + callstd 2 + end diff --git a/data/maps/SevenIsland_TrainerTower_Roof/scripts.inc b/data/maps/SevenIsland_TrainerTower_Roof/scripts.inc new file mode 100644 index 000000000..731f6ab97 --- /dev/null +++ b/data/maps/SevenIsland_TrainerTower_Roof/scripts.inc @@ -0,0 +1,8 @@ +SevenIsland_TrainerTower_Roof_MapScripts:: @ 8164828 + map_script 5, SevenIsland_TrainerTower_Roof_MapScript1_1C4F54 + map_script 2, SevenIsland_TrainerTower_Roof_MapScript2_1C5046 + .byte 0 + +SevenIsland_TrainerTower_Roof_EventScript_164833:: @ 8164833 + call EventScript_1C53AA + end diff --git a/data/maps/SilphCo_10F/scripts.inc b/data/maps/SilphCo_10F/scripts.inc new file mode 100644 index 000000000..01ad0175d --- /dev/null +++ b/data/maps/SilphCo_10F/scripts.inc @@ -0,0 +1,41 @@ +SilphCo_10F_MapScripts:: @ 8161D86 + map_script 1, SilphCo_10F_MapScript1_161D8C + .byte 0 + +SilphCo_10F_MapScript1_161D8C:: @ 8161D8C + checkflag FLAG_0x28C + call_if 0, EventScript_1A84D6 + end + +SilphCo_10F_EventScript_161D96:: @ 8161D96 + lock + faceplayer + compare_var_to_value VAR_0x4060, 1 + goto_if 4, EventScript_161DAD + loadword 0, gUnknown_8176DBA + callstd 4 + release + end + +EventScript_161DAD:: @ 8161DAD + loadword 0, gUnknown_8176DCE + callstd 4 + release + end + +SilphCo_10F_EventScript_161DB7:: @ 8161DB7 + loadword 0, gUnknown_8176DF8 + callstd 3 + end + +SilphCo_10F_EventScript_161DC0:: @ 8161DC0 + trainerbattle 0, 345, 0, Text_176D57, Text_176D73 + loadword 0, gUnknown_8176D86 + callstd 6 + end + +SilphCo_10F_EventScript_161DD7:: @ 8161DD7 + trainerbattle 0, 389, 0, Text_176CED, Text_176D18 + loadword 0, gUnknown_8176D25 + callstd 6 + end diff --git a/data/maps/SilphCo_11F/scripts.inc b/data/maps/SilphCo_11F/scripts.inc new file mode 100644 index 000000000..0167964bb --- /dev/null +++ b/data/maps/SilphCo_11F/scripts.inc @@ -0,0 +1,160 @@ +SilphCo_11F_MapScripts:: @ 8161DEE + map_script 1, SilphCo_11F_MapScript1_161DF4 + .byte 0 + +SilphCo_11F_MapScript1_161DF4:: @ 8161DF4 + checkflag FLAG_0x28D + call_if 0, EventScript_1A8504 + end + +SilphCo_11F_EventScript_161DFE:: @ 8161DFE + lock + faceplayer + checkflag FLAG_0x250 + goto_if 1, EventScript_161E75 + checkplayergender + compare_var_to_value VAR_RESULT, 0 + call_if 1, EventScript_161E59 + compare_var_to_value VAR_RESULT, 1 + call_if 1, EventScript_161E62 + checkitemspace ITEM_MASTER_BALL, 1 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_161E6B + additem ITEM_MASTER_BALL, 1 + loadword 0, gUnknown_8176FBD + setorcopyvar VAR_0x8000, 1 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 318 + callstd 9 + loadword 0, gUnknown_8176FEB + callstd 4 + setflag FLAG_0x250 + release + end + +EventScript_161E59:: @ 8161E59 + loadword 0, gUnknown_8176E12 + callstd 4 + return + +EventScript_161E62:: @ 8161E62 + loadword 0, gUnknown_8176EE7 + callstd 4 + return + +EventScript_161E6B:: @ 8161E6B + loadword 0, gUnknown_817708E + callstd 4 + release + end + +EventScript_161E75:: @ 8161E75 + loadword 0, gUnknown_8176FEB + callstd 4 + release + end + +SilphCo_11F_EventScript_161E7F:: @ 8161E7F + loadword 0, gUnknown_81770A9 + callstd 2 + end + +SilphCo_11F_EventScript_161E88:: @ 8161E88 + lockall + setvar VAR_0x4001, 0 + goto EventScript_161EA0 + +EventScript_161E93:: @ 8161E93 + end + +SilphCo_11F_EventScript_161E94:: @ 8161E94 + lockall + setvar VAR_0x4001, 1 + goto EventScript_161EA0 + +EventScript_161E9F:: @ 8161E9F + end + +EventScript_161EA0:: @ 8161EA0 + textcolor 0 + applymovement 3, Movement_1A75ED + waitmovement 0 + delay 25 + loadword 0, gUnknown_8177108 + callstd 4 + closemessage + compare_var_to_value VAR_0x4001, 0 + call_if 1, EventScript_161F00 + compare_var_to_value VAR_0x4001, 1 + call_if 1, EventScript_161F12 + setvar VAR_LAST_TALKED, 3 + trainerbattle 3, 349, 0, Text_1771AB + loadword 0, gUnknown_81771C2 + callstd 4 + closemessage + fadescreen 1 + removeobject 3 + removeobject 4 + removeobject 6 + fadescreen 0 + setvar VAR_0x4060, 1 + setflag FLAG_0x03E + clearflag FLAG_0x03F + releaseall + end + +EventScript_161F00:: @ 8161F00 + applymovement 3, Movement_161F1D + applymovement 255, Movement_161F27 + waitmovement 0 + return + +EventScript_161F12:: @ 8161F12 + applymovement 3, Movement_161F23 + waitmovement 0 + return + +Movement_161F1D:: @ 8161F1D + step_10 + step_10 + step_10 + step_10 + step_2f + step_end + +Movement_161F23:: @ 8161F23 + step_10 + step_10 + step_10 + step_end + +Movement_161F27:: @ 8161F27 + step_1c + step_1c + step_1c + step_1b + step_1a + step_30 + step_end + +EventScript_161F2E:: @ 8161F2E + loadword 0, gUnknown_817732B + callstd 3 + end + +SilphCo_11F_EventScript_161F37:: @ 8161F37 + loadword 0, gUnknown_817734A + callstd 3 + end + +SilphCo_11F_EventScript_161F40:: @ 8161F40 + trainerbattle 0, 390, 0, Text_1772B8, Text_1772E7 + loadword 0, gUnknown_81772F9 + callstd 6 + end + +SilphCo_11F_EventScript_161F57:: @ 8161F57 + trainerbattle 0, 391, 0, Text_17726A, Text_17728C + loadword 0, gUnknown_817729B + callstd 6 + end diff --git a/data/maps/SilphCo_1F/scripts.inc b/data/maps/SilphCo_1F/scripts.inc new file mode 100644 index 000000000..2fffdc782 --- /dev/null +++ b/data/maps/SilphCo_1F/scripts.inc @@ -0,0 +1,17 @@ +SilphCo_1F_MapScripts:: @ 8161625 + map_script 3, SilphCo_1F_MapScript1_16162B + .byte 0 + +SilphCo_1F_MapScript1_16162B:: @ 816162B + setworldmapflag 2220 + end + +SilphCo_1F_EventScript_16162F:: @ 816162F + loadword 0, gUnknown_81754F7 + callstd 2 + end + +SilphCo_1F_EventScript_161638:: @ 8161638 + loadword 0, gUnknown_8175549 + callstd 3 + end diff --git a/data/maps/SilphCo_2F/scripts.inc b/data/maps/SilphCo_2F/scripts.inc new file mode 100644 index 000000000..1c9046768 --- /dev/null +++ b/data/maps/SilphCo_2F/scripts.inc @@ -0,0 +1,45 @@ +SilphCo_2F_MapScripts:: @ 8161641 + map_script 1, SilphCo_2F_MapScript1_161647 + .byte 0 + +SilphCo_2F_MapScript1_161647:: @ 8161647 + checkflag FLAG_0x27A + call_if 0, EventScript_1A8149 + checkflag FLAG_0x27B + call_if 0, EventScript_1A8177 + end + +SilphCo_2F_EventScript_16165A:: @ 816165A + goto EventScript_1C4816 + +EventScript_16165F:: @ 816165F + end + +SilphCo_2F_EventScript_161660:: @ 8161660 + loadword 0, gUnknown_8175894 + callstd 3 + end + +SilphCo_2F_EventScript_161669:: @ 8161669 + trainerbattle 0, 336, 0, Text_175562, Text_17557E + loadword 0, gUnknown_817559F + callstd 6 + end + +SilphCo_2F_EventScript_161680:: @ 8161680 + trainerbattle 0, 337, 0, Text_1755C6, Text_1755E5 + loadword 0, gUnknown_81755F2 + callstd 6 + end + +SilphCo_2F_EventScript_161697:: @ 8161697 + trainerbattle 0, 373, 0, Text_17562D, Text_17564A + loadword 0, gUnknown_8175651 + callstd 6 + end + +SilphCo_2F_EventScript_1616AE:: @ 81616AE + trainerbattle 0, 374, 0, Text_1756AD, Text_1756D8 + loadword 0, gUnknown_81756E2 + callstd 6 + end diff --git a/data/maps/SilphCo_3F/scripts.inc b/data/maps/SilphCo_3F/scripts.inc new file mode 100644 index 000000000..3575a73f9 --- /dev/null +++ b/data/maps/SilphCo_3F/scripts.inc @@ -0,0 +1,43 @@ +SilphCo_3F_MapScripts:: @ 81616C5 + map_script 1, SilphCo_3F_MapScript1_1616CB + .byte 0 + +SilphCo_3F_MapScript1_1616CB:: @ 81616CB + checkflag FLAG_0x27C + call_if 0, EventScript_1A81A5 + checkflag FLAG_0x27D + call_if 0, EventScript_1A81DC + end + +SilphCo_3F_EventScript_1616DE:: @ 81616DE + lock + faceplayer + compare_var_to_value VAR_0x4060, 1 + goto_if 4, EventScript_1616F5 + loadword 0, gUnknown_81758AD + callstd 4 + release + end + +EventScript_1616F5:: @ 81616F5 + loadword 0, gUnknown_81758D3 + callstd 4 + release + end + +SilphCo_3F_EventScript_1616FF:: @ 81616FF + loadword 0, gUnknown_81759DC + callstd 3 + end + +SilphCo_3F_EventScript_161708:: @ 8161708 + trainerbattle 0, 338, 0, Text_175948, Text_17597D + loadword 0, gUnknown_8175990 + callstd 6 + end + +SilphCo_3F_EventScript_16171F:: @ 816171F + trainerbattle 0, 375, 0, Text_1758F6, Text_175911 + loadword 0, gUnknown_817591C + callstd 6 + end diff --git a/data/maps/SilphCo_4F/scripts.inc b/data/maps/SilphCo_4F/scripts.inc new file mode 100644 index 000000000..ce3ecaa70 --- /dev/null +++ b/data/maps/SilphCo_4F/scripts.inc @@ -0,0 +1,49 @@ +SilphCo_4F_MapScripts:: @ 8161736 + map_script 1, SilphCo_4F_MapScript1_16173C + .byte 0 + +SilphCo_4F_MapScript1_16173C:: @ 816173C + checkflag FLAG_0x27E + call_if 0, EventScript_1A8213 + checkflag FLAG_0x27F + call_if 0, EventScript_1A8241 + end + +SilphCo_4F_EventScript_16174F:: @ 816174F + lock + faceplayer + compare_var_to_value VAR_0x4060, 1 + goto_if 4, EventScript_161766 + loadword 0, gUnknown_81759F5 + callstd 4 + release + end + +EventScript_161766:: @ 8161766 + loadword 0, gUnknown_8175A15 + callstd 4 + release + end + +SilphCo_4F_EventScript_161770:: @ 8161770 + loadword 0, gUnknown_8175B57 + callstd 3 + end + +SilphCo_4F_EventScript_161779:: @ 8161779 + trainerbattle 0, 339, 0, Text_175A90, Text_175AB0 + loadword 0, gUnknown_8175AC8 + callstd 6 + end + +SilphCo_4F_EventScript_161790:: @ 8161790 + trainerbattle 0, 376, 0, Text_175A2F, Text_175A5B + loadword 0, gUnknown_8175A62 + callstd 6 + end + +SilphCo_4F_EventScript_1617A7:: @ 81617A7 + trainerbattle 0, 377, 0, Text_175B19, Text_175B2B + loadword 0, gUnknown_8175B38 + callstd 6 + end diff --git a/data/maps/SilphCo_5F/scripts.inc b/data/maps/SilphCo_5F/scripts.inc new file mode 100644 index 000000000..df816db5e --- /dev/null +++ b/data/maps/SilphCo_5F/scripts.inc @@ -0,0 +1,72 @@ +SilphCo_5F_MapScripts:: @ 81617BE + map_script 1, SilphCo_5F_MapScript1_1617C4 + .byte 0 + +SilphCo_5F_MapScript1_1617C4:: @ 81617C4 + checkflag FLAG_0x280 + call_if 0, EventScript_1A826F + checkflag FLAG_0x281 + call_if 0, EventScript_1A82A6 + checkflag FLAG_0x282 + call_if 0, EventScript_1A82DD + end + +SilphCo_5F_EventScript_1617E0:: @ 81617E0 + lock + faceplayer + compare_var_to_value VAR_0x4060, 1 + goto_if 4, EventScript_1617F7 + loadword 0, gUnknown_8175B70 + callstd 4 + release + end + +EventScript_1617F7:: @ 81617F7 + loadword 0, gUnknown_8175BB3 + callstd 4 + release + end + +SilphCo_5F_EventScript_161801:: @ 8161801 + loadword 0, gUnknown_8175D89 + callstd 3 + end + +SilphCo_5F_EventScript_16180A:: @ 816180A + loadword 0, gUnknown_8175DE0 + callstd 3 + end + +SilphCo_5F_EventScript_161813:: @ 8161813 + loadword 0, gUnknown_8175E28 + callstd 3 + end + +SilphCo_5F_EventScript_16181C:: @ 816181C + loadword 0, gUnknown_8175E80 + callstd 3 + end + +SilphCo_5F_EventScript_161825:: @ 8161825 + trainerbattle 0, 340, 0, Text_175C40, Text_175C6D + loadword 0, gUnknown_8175C7D + callstd 6 + end + +SilphCo_5F_EventScript_16183C:: @ 816183C + trainerbattle 0, 378, 0, Text_175BE5, Text_175C09 + loadword 0, gUnknown_8175C0F + callstd 6 + end + +SilphCo_5F_EventScript_161853:: @ 8161853 + trainerbattle 0, 379, 0, Text_175D28, Text_175D4B + loadword 0, gUnknown_8175D59 + callstd 6 + end + +SilphCo_5F_EventScript_16186A:: @ 816186A + trainerbattle 0, 286, 0, Text_175CBD, Text_175CEB + loadword 0, gUnknown_8175CF9 + callstd 6 + end diff --git a/data/maps/SilphCo_6F/scripts.inc b/data/maps/SilphCo_6F/scripts.inc new file mode 100644 index 000000000..013d2e129 --- /dev/null +++ b/data/maps/SilphCo_6F/scripts.inc @@ -0,0 +1,111 @@ +SilphCo_6F_MapScripts:: @ 8161881 + map_script 1, SilphCo_6F_MapScript1_161887 + .byte 0 + +SilphCo_6F_MapScript1_161887:: @ 8161887 + checkflag FLAG_0x283 + call_if 0, EventScript_1A8314 + end + +SilphCo_6F_EventScript_161891:: @ 8161891 + lock + faceplayer + compare_var_to_value VAR_0x4060, 1 + goto_if 4, EventScript_1618A8 + loadword 0, gUnknown_817607E + callstd 4 + release + end + +EventScript_1618A8:: @ 81618A8 + loadword 0, gUnknown_81760B6 + callstd 4 + release + end + +SilphCo_6F_EventScript_1618B2:: @ 81618B2 + lock + faceplayer + compare_var_to_value VAR_0x4060, 1 + goto_if 4, EventScript_1618C9 + loadword 0, gUnknown_8175F24 + callstd 4 + release + end + +EventScript_1618C9:: @ 81618C9 + loadword 0, gUnknown_8175F51 + callstd 4 + release + end + +SilphCo_6F_EventScript_1618D3:: @ 81618D3 + lock + faceplayer + compare_var_to_value VAR_0x4060, 1 + goto_if 4, EventScript_1618EA + loadword 0, gUnknown_8175F70 + callstd 4 + release + end + +EventScript_1618EA:: @ 81618EA + loadword 0, gUnknown_8175F93 + callstd 4 + release + end + +SilphCo_6F_EventScript_1618F4:: @ 81618F4 + lock + faceplayer + compare_var_to_value VAR_0x4060, 1 + goto_if 4, EventScript_16190B + loadword 0, gUnknown_8175FAA + callstd 4 + release + end + +EventScript_16190B:: @ 816190B + loadword 0, gUnknown_8175FD3 + callstd 4 + release + end + +SilphCo_6F_EventScript_161915:: @ 8161915 + lock + faceplayer + compare_var_to_value VAR_0x4060, 1 + goto_if 4, EventScript_16192C + loadword 0, gUnknown_8176012 + callstd 4 + release + end + +EventScript_16192C:: @ 816192C + loadword 0, gUnknown_817604B + callstd 4 + release + end + +SilphCo_6F_EventScript_161936:: @ 8161936 + loadword 0, gUnknown_817624D + callstd 3 + end + +SilphCo_6F_EventScript_16193F:: @ 816193F + trainerbattle 0, 341, 0, Text_176136, Text_1761BD + loadword 0, gUnknown_81761C4 + callstd 6 + end + +SilphCo_6F_EventScript_161956:: @ 8161956 + trainerbattle 0, 380, 0, Text_1760DE, Text_176104 + loadword 0, gUnknown_817610F + callstd 6 + end + +SilphCo_6F_EventScript_16196D:: @ 816196D + trainerbattle 0, 381, 0, Text_1761F1, Text_17620E + loadword 0, gUnknown_817621B + callstd 6 + end diff --git a/data/maps/SilphCo_7F/scripts.inc b/data/maps/SilphCo_7F/scripts.inc new file mode 100644 index 000000000..b1ec6b6b6 --- /dev/null +++ b/data/maps/SilphCo_7F/scripts.inc @@ -0,0 +1,282 @@ +SilphCo_7F_MapScripts:: @ 8161984 + map_script 1, SilphCo_7F_MapScript1_16198F + map_script 3, SilphCo_7F_MapScript2_1619AB + .byte 0 + +SilphCo_7F_MapScript1_16198F:: @ 816198F + checkflag FLAG_0x284 + call_if 0, EventScript_1A834B + checkflag FLAG_0x285 + call_if 0, EventScript_1A8379 + checkflag FLAG_0x286 + call_if 0, EventScript_1A83A7 + end + +SilphCo_7F_MapScript2_1619AB:: @ 81619AB + compare_var_to_value VAR_0x4060, 1 + call_if 4, EventScript_1619B7 + end + +EventScript_1619B7:: @ 81619B7 + setobjectmovementtype 8, 7 + return + +SilphCo_7F_EventScript_1619BC:: @ 81619BC + lockall + setvar VAR_0x4001, 0 + goto EventScript_1619D4 + +EventScript_1619C7:: @ 81619C7 + end + +SilphCo_7F_EventScript_1619C8:: @ 81619C8 + lockall + setvar VAR_0x4001, 1 + goto EventScript_1619D4 + +EventScript_1619D3:: @ 81619D3 + end + +EventScript_1619D4:: @ 81619D4 + textcolor 0 + playbgm BGM_FRLG_RIVAL, 0 + applymovement 1, Movement_1A75DB + waitmovement 0 + applymovement 255, Movement_1A75ED + applymovement 1, Movement_1A75DD + waitmovement 0 + loadword 0, gUnknown_8176710 + callstd 4 + compare_var_to_value VAR_0x4001, 0 + call_if 1, EventScript_161A73 + compare_var_to_value VAR_0x4001, 1 + call_if 1, EventScript_161A7F + loadword 0, gUnknown_8176727 + callstd 4 + setvar VAR_LAST_TALKED, 1 + compare_var_to_value VAR_STARTER_MON, 2 + call_if 1, EventScript_161A80 + compare_var_to_value VAR_STARTER_MON, 1 + call_if 1, EventScript_161A8B + compare_var_to_value VAR_STARTER_MON, 0 + call_if 1, EventScript_161A96 + loadword 0, gUnknown_8176827 + callstd 4 + closemessage + playbgm BGM_FRLG_RIVAL_POSTBATTLE, 0 + compare_var_to_value VAR_0x4001, 0 + call_if 1, EventScript_161AA1 + compare_var_to_value VAR_0x4001, 1 + call_if 1, EventScript_161AAC + playse SE_FU_ZUZUZU + fadedefaultbgm + removeobject 1 + waitse + setvar VAR_0x405C, 1 + releaseall + end + +EventScript_161A73:: @ 8161A73 + closemessage + applymovement 1, Movement_161AB7 + waitmovement 0 + return + +EventScript_161A7F:: @ 8161A7F + return + +EventScript_161A80:: @ 8161A80 + trainerbattle 3, 432, 0, Text_1767D0 + return + +EventScript_161A8B:: @ 8161A8B + trainerbattle 3, 433, 0, Text_1767D0 + return + +EventScript_161A96:: @ 8161A96 + trainerbattle 3, 434, 0, Text_1767D0 + return + +EventScript_161AA1:: @ 8161AA1 + applymovement 1, Movement_161AB9 + waitmovement 0 + return + +EventScript_161AAC:: @ 8161AAC + applymovement 1, Movement_161ABF + waitmovement 0 + return + +Movement_161AB7:: @ 8161AB7 + step_11 + step_end + +Movement_161AB9:: @ 8161AB9 + step_13 + step_13 + step_13 + step_11 + step_1c + step_end + +Movement_161ABF:: @ 8161ABF + step_12 + step_11 + step_11 + step_13 + step_13 + step_13 + step_13 + step_1c + step_end + +SilphCo_7F_EventScript_161AC8:: @ 8161AC8 + lock + faceplayer + checkflag FLAG_0x246 + goto_if 1, EventScript_161B8D + loadword 0, gUnknown_8176266 + callstd 4 + setvar VAR_0x4001, 131 + givemon SPECIES_LAPRAS, 25, ITEM_NONE, 0, 0, 0 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_161B12 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_161B45 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A927C + release + end + +EventScript_161B12:: @ 8161B12 + textcolor 3 + playfanfare MUS_FANFA1 + message Text_1762D7 + waitmessage + waitfanfare + getspeciesname 0, SPECIES_LAPRAS + loadword 0, gUnknown_81A56A7 + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_161B7E + call EventScript_1A8C27 + call EventScript_1A74EB + goto EventScript_161B7E + +EventScript_161B44:: @ 8161B44 + end + +EventScript_161B45:: @ 8161B45 + textcolor 3 + playfanfare MUS_FANFA1 + message Text_1762D7 + waitmessage + waitfanfare + getspeciesname 0, SPECIES_LAPRAS + loadword 0, gUnknown_81A56A7 + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_161B73 + call EventScript_1A8C33 + goto EventScript_161B73 + +EventScript_161B72:: @ 8161B72 + end + +EventScript_161B73:: @ 8161B73 + call EventScript_1A8C3C + goto EventScript_161B7E + +EventScript_161B7D:: @ 8161B7D + end + +EventScript_161B7E:: @ 8161B7E + textcolor 0 + loadword 0, gUnknown_8176305 + callstd 4 + setflag FLAG_0x246 + release + end + +EventScript_161B8D:: @ 8161B8D + loadword 0, gUnknown_81763DD + callstd 4 + release + end + +SilphCo_7F_EventScript_161B97:: @ 8161B97 + lock + faceplayer + compare_var_to_value VAR_0x4060, 1 + goto_if 4, EventScript_161BAE + loadword 0, gUnknown_8176444 + callstd 4 + release + end + +EventScript_161BAE:: @ 8161BAE + loadword 0, gUnknown_8176486 + callstd 4 + release + end + +SilphCo_7F_EventScript_161BB8:: @ 8161BB8 + lock + faceplayer + compare_var_to_value VAR_0x4060, 1 + goto_if 4, EventScript_161BCF + loadword 0, gUnknown_81764C2 + callstd 4 + release + end + +EventScript_161BCF:: @ 8161BCF + loadword 0, gUnknown_8176501 + callstd 4 + release + end + +SilphCo_7F_EventScript_161BD9:: @ 8161BD9 + lock + faceplayer + compare_var_to_value VAR_0x4060, 1 + goto_if 4, EventScript_161BF0 + loadword 0, gUnknown_8176532 + callstd 4 + release + end + +EventScript_161BF0:: @ 8161BF0 + loadword 0, gUnknown_8176573 + callstd 4 + release + end + +SilphCo_7F_EventScript_161BFA:: @ 8161BFA + loadword 0, gUnknown_8176954 + callstd 3 + end + +SilphCo_7F_EventScript_161C03:: @ 8161C03 + trainerbattle 0, 342, 0, Text_1765E2, Text_17660C + loadword 0, gUnknown_8176616 + callstd 6 + end + +SilphCo_7F_EventScript_161C1A:: @ 8161C1A + trainerbattle 0, 383, 0, Text_176643, Text_176669 + loadword 0, gUnknown_8176681 + callstd 6 + end + +SilphCo_7F_EventScript_161C31:: @ 8161C31 + trainerbattle 0, 384, 0, Text_1766B3, Text_1766D7 + loadword 0, gUnknown_81766E5 + callstd 6 + end + +SilphCo_7F_EventScript_161C48:: @ 8161C48 + trainerbattle 0, 385, 0, Text_176586, Text_1765A5 + loadword 0, gUnknown_81765B1 + callstd 6 + end diff --git a/data/maps/SilphCo_8F/scripts.inc b/data/maps/SilphCo_8F/scripts.inc new file mode 100644 index 000000000..d8e3f18b6 --- /dev/null +++ b/data/maps/SilphCo_8F/scripts.inc @@ -0,0 +1,47 @@ +SilphCo_8F_MapScripts:: @ 8161C5F + map_script 1, SilphCo_8F_MapScript1_161C65 + .byte 0 + +SilphCo_8F_MapScript1_161C65:: @ 8161C65 + checkflag FLAG_0x287 + call_if 0, EventScript_1A83D5 + end + +SilphCo_8F_EventScript_161C6F:: @ 8161C6F + lock + faceplayer + compare_var_to_value VAR_0x4060, 1 + goto_if 4, EventScript_161C86 + loadword 0, gUnknown_817696D + callstd 4 + release + end + +EventScript_161C86:: @ 8161C86 + loadword 0, gUnknown_817698C + callstd 4 + release + end + +SilphCo_8F_EventScript_161C90:: @ 8161C90 + loadword 0, gUnknown_8176AB2 + callstd 3 + end + +SilphCo_8F_EventScript_161C99:: @ 8161C99 + trainerbattle 0, 343, 0, Text_1769FD, Text_176A19 + loadword 0, gUnknown_8176A26 + callstd 6 + end + +SilphCo_8F_EventScript_161CB0:: @ 8161CB0 + trainerbattle 0, 382, 0, Text_1769A2, Text_1769BE + loadword 0, gUnknown_81769CF + callstd 6 + end + +SilphCo_8F_EventScript_161CC7:: @ 8161CC7 + trainerbattle 0, 386, 0, Text_176A56, Text_176A7C + loadword 0, gUnknown_8176A90 + callstd 6 + end diff --git a/data/maps/SilphCo_9F/scripts.inc b/data/maps/SilphCo_9F/scripts.inc new file mode 100644 index 000000000..cf234a1b0 --- /dev/null +++ b/data/maps/SilphCo_9F/scripts.inc @@ -0,0 +1,57 @@ +SilphCo_9F_MapScripts:: @ 8161CDE + map_script 1, SilphCo_9F_MapScript1_161CE4 + .byte 0 + +SilphCo_9F_MapScript1_161CE4:: @ 8161CE4 + checkflag FLAG_0x288 + call_if 0, EventScript_1A840C + checkflag FLAG_0x289 + call_if 0, EventScript_1A8443 + checkflag FLAG_0x28A + call_if 0, EventScript_1A847A + checkflag FLAG_0x28B + call_if 0, EventScript_1A84A8 + end + +SilphCo_9F_EventScript_161D09:: @ 8161D09 + lock + faceplayer + compare_var_to_value VAR_0x4060, 1 + goto_if 4, EventScript_161D2E + loadword 0, gUnknown_8176B54 + callstd 4 + closemessage + call EventScript_1A6C26 + loadword 0, gUnknown_8176B81 + callstd 4 + release + end + +EventScript_161D2E:: @ 8161D2E + loadword 0, gUnknown_8176B90 + callstd 4 + release + end + +SilphCo_9F_EventScript_161D38:: @ 8161D38 + loadword 0, gUnknown_8176CD4 + callstd 3 + end + +SilphCo_9F_EventScript_161D41:: @ 8161D41 + trainerbattle 0, 344, 0, Text_176BFB, Text_176C2B + loadword 0, gUnknown_8176C3C + callstd 6 + end + +SilphCo_9F_EventScript_161D58:: @ 8161D58 + trainerbattle 0, 387, 0, Text_176BA3, Text_176BC8 + loadword 0, gUnknown_8176BD0 + callstd 6 + end + +SilphCo_9F_EventScript_161D6F:: @ 8161D6F + trainerbattle 0, 388, 0, Text_176C7A, Text_176CA0 + loadword 0, gUnknown_8176CB8 + callstd 6 + end diff --git a/data/maps/SilphCo_Elevator/scripts.inc b/data/maps/SilphCo_Elevator/scripts.inc new file mode 100644 index 000000000..2f2760c5f --- /dev/null +++ b/data/maps/SilphCo_Elevator/scripts.inc @@ -0,0 +1,190 @@ +SilphCo_Elevator_MapScripts:: @ 8161F6E + .byte 0 + +SilphCo_Elevator_EventScript_161F6F:: @ 8161F6F + lockall + setvar VAR_0x8004, 1 + checkflag FLAG_0x002 + call_if 0, EventScript_1A7AB9 + copyvar VAR_0x8005, VAR_0x403A + special sub_80CB580 + message Text_1A535C + waitmessage + setvar VAR_0x8004, 1 + specialvar VAR_RESULT, sub_80CB328 + special sub_80CB7C4 + waitstate + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_1621BF + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_162197 + compare_var_to_value VAR_0x8000, 2 + goto_if 1, EventScript_16216F + compare_var_to_value VAR_0x8000, 3 + goto_if 1, EventScript_162147 + compare_var_to_value VAR_0x8000, 4 + goto_if 1, EventScript_16211F + compare_var_to_value VAR_0x8000, 5 + goto_if 1, EventScript_1620F7 + compare_var_to_value VAR_0x8000, 6 + goto_if 1, EventScript_1620CF + compare_var_to_value VAR_0x8000, 7 + goto_if 1, EventScript_1620A7 + compare_var_to_value VAR_0x8000, 8 + goto_if 1, EventScript_16207F + compare_var_to_value VAR_0x8000, 9 + goto_if 1, EventScript_162057 + compare_var_to_value VAR_0x8000, 10 + goto_if 1, EventScript_16202F + compare_var_to_value VAR_0x8000, 11 + goto_if 1, EventScript_1621E7 + compare_var_to_value VAR_0x8000, 127 + goto_if 1, EventScript_1621E7 + end + +EventScript_16202F:: @ 816202F + setvar VAR_0x8006, 4 + setdynamicwarp MAP_SILPHCO_1F, 255, 22, 3 + compare_var_to_value VAR_0x403A, 4 + goto_if 1, EventScript_1621E7 + call EventScript_1621EC + setvar VAR_0x403A, 4 + goto EventScript_1621E7 + +EventScript_162056:: @ 8162056 + end + +EventScript_162057:: @ 8162057 + setvar VAR_0x8006, 5 + setdynamicwarp MAP_SILPHCO_2F, 255, 22, 3 + compare_var_to_value VAR_0x403A, 5 + goto_if 1, EventScript_1621E7 + call EventScript_1621EC + setvar VAR_0x403A, 5 + goto EventScript_1621E7 + +EventScript_16207E:: @ 816207E + end + +EventScript_16207F:: @ 816207F + setvar VAR_0x8006, 6 + setdynamicwarp MAP_SILPHCO_3F, 255, 22, 3 + compare_var_to_value VAR_0x403A, 6 + goto_if 1, EventScript_1621E7 + call EventScript_1621EC + setvar VAR_0x403A, 6 + goto EventScript_1621E7 + +EventScript_1620A6:: @ 81620A6 + end + +EventScript_1620A7:: @ 81620A7 + setvar VAR_0x8006, 7 + setdynamicwarp MAP_SILPHCO_4F, 255, 22, 3 + compare_var_to_value VAR_0x403A, 7 + goto_if 1, EventScript_1621E7 + call EventScript_1621EC + setvar VAR_0x403A, 7 + goto EventScript_1621E7 + +EventScript_1620CE:: @ 81620CE + end + +EventScript_1620CF:: @ 81620CF + setvar VAR_0x8006, 8 + setdynamicwarp MAP_SILPHCO_5F, 255, 22, 3 + compare_var_to_value VAR_0x403A, 8 + goto_if 1, EventScript_1621E7 + call EventScript_1621EC + setvar VAR_0x403A, 8 + goto EventScript_1621E7 + +EventScript_1620F6:: @ 81620F6 + end + +EventScript_1620F7:: @ 81620F7 + setvar VAR_0x8006, 9 + setdynamicwarp MAP_SILPHCO_6F, 255, 20, 3 + compare_var_to_value VAR_0x403A, 9 + goto_if 1, EventScript_1621E7 + call EventScript_1621EC + setvar VAR_0x403A, 9 + goto EventScript_1621E7 + +EventScript_16211E:: @ 816211E + end + +EventScript_16211F:: @ 816211F + setvar VAR_0x8006, 10 + setdynamicwarp MAP_SILPHCO_7F, 255, 23, 3 + compare_var_to_value VAR_0x403A, 10 + goto_if 1, EventScript_1621E7 + call EventScript_1621EC + setvar VAR_0x403A, 10 + goto EventScript_1621E7 + +EventScript_162146:: @ 8162146 + end + +EventScript_162147:: @ 8162147 + setvar VAR_0x8006, 11 + setdynamicwarp MAP_SILPHCO_8F, 255, 22, 3 + compare_var_to_value VAR_0x403A, 11 + goto_if 1, EventScript_1621E7 + call EventScript_1621EC + setvar VAR_0x403A, 11 + goto EventScript_1621E7 + +EventScript_16216E:: @ 816216E + end + +EventScript_16216F:: @ 816216F + setvar VAR_0x8006, 12 + setdynamicwarp MAP_SILPHCO_9F, 255, 24, 3 + compare_var_to_value VAR_0x403A, 12 + goto_if 1, EventScript_1621E7 + call EventScript_1621EC + setvar VAR_0x403A, 12 + goto EventScript_1621E7 + +EventScript_162196:: @ 8162196 + end + +EventScript_162197:: @ 8162197 + setvar VAR_0x8006, 13 + setdynamicwarp MAP_SILPHCO_10F, 255, 13, 3 + compare_var_to_value VAR_0x403A, 13 + goto_if 1, EventScript_1621E7 + call EventScript_1621EC + setvar VAR_0x403A, 13 + goto EventScript_1621E7 + +EventScript_1621BE:: @ 81621BE + end + +EventScript_1621BF:: @ 81621BF + setvar VAR_0x8006, 14 + setdynamicwarp MAP_SILPHCO_11F, 255, 13, 3 + compare_var_to_value VAR_0x403A, 14 + goto_if 1, EventScript_1621E7 + call EventScript_1621EC + setvar VAR_0x403A, 14 + goto EventScript_1621E7 + +EventScript_1621E6:: @ 81621E6 + end + +EventScript_1621E7:: @ 81621E7 + special sub_80CB63C + releaseall + end + +EventScript_1621EC:: @ 81621EC + special sub_80CB63C + closemessage + waitse + special sub_80CB498 + waitstate + setflag FLAG_0x002 + return diff --git a/data/maps/SixIsland/scripts.inc b/data/maps/SixIsland/scripts.inc new file mode 100644 index 000000000..17e350a3d --- /dev/null +++ b/data/maps/SixIsland/scripts.inc @@ -0,0 +1,22 @@ +SixIsland_MapScripts:: @ 8167ED8 + map_script 3, SixIsland_MapScript1_167EDE + .byte 0 + +SixIsland_MapScript1_167EDE:: @ 8167EDE + setworldmapflag 2209 + end + +SixIsland_EventScript_167EE2:: @ 8167EE2 + loadword 0, gUnknown_81831EF + callstd 2 + end + +SixIsland_EventScript_167EEB:: @ 8167EEB + loadword 0, gUnknown_8183255 + callstd 2 + end + +SixIsland_EventScript_167EF4:: @ 8167EF4 + loadword 0, gUnknown_81831C6 + callstd 3 + end diff --git a/data/maps/SixIsland_DottedHole_B1F/scripts.inc b/data/maps/SixIsland_DottedHole_B1F/scripts.inc new file mode 100644 index 000000000..09fe57766 --- /dev/null +++ b/data/maps/SixIsland_DottedHole_B1F/scripts.inc @@ -0,0 +1,2 @@ +SixIsland_DottedHole_B1F_MapScripts:: @ 81641B0 + .byte 0 diff --git a/data/maps/SixIsland_DottedHole_B2F/scripts.inc b/data/maps/SixIsland_DottedHole_B2F/scripts.inc new file mode 100644 index 000000000..2647365cc --- /dev/null +++ b/data/maps/SixIsland_DottedHole_B2F/scripts.inc @@ -0,0 +1,2 @@ +SixIsland_DottedHole_B2F_MapScripts:: @ 81641B1 + .byte 0 diff --git a/data/maps/SixIsland_DottedHole_B3F/scripts.inc b/data/maps/SixIsland_DottedHole_B3F/scripts.inc new file mode 100644 index 000000000..68690d897 --- /dev/null +++ b/data/maps/SixIsland_DottedHole_B3F/scripts.inc @@ -0,0 +1,2 @@ +SixIsland_DottedHole_B3F_MapScripts:: @ 81641B2 + .byte 0 diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc b/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc new file mode 100644 index 000000000..f4143ca78 --- /dev/null +++ b/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc @@ -0,0 +1,306 @@ +SixIsland_DottedHole_SapphireRoom_MapScripts:: @ 81641B4 + .byte 0 + +SixIsland_DottedHole_SapphireRoom_EventScript_1641B5:: @ 81641B5 + lock + faceplayer + textcolor 3 + playfanfare BGM_FRLG_ME_KEYITEM + message Text_17BD82 + waitmessage + waitfanfare + closemessage + setobjectxyperm 2, 5, 0 + addobject 2 + playse SE_FU_ZAKU + applymovement 2, Movement_16440F + waitmovement 0 + playse SE_W115 + compare_var_to_value VAR_FACING, 2 + call_if 1, EventScript_16430F + compare_var_to_value VAR_FACING, 1 + call_if 1, EventScript_16430F + compare_var_to_value VAR_FACING, 4 + call_if 1, EventScript_16431A + compare_var_to_value VAR_FACING, 3 + call_if 1, EventScript_16431A + setvar VAR_0x8004, 3 + setvar VAR_0x8005, 0 + setvar VAR_0x8006, 12 + setvar VAR_0x8007, 3 + special sub_80CAC28 + delay 60 + compare_var_to_value VAR_FACING, 2 + call_if 1, EventScript_164325 + compare_var_to_value VAR_FACING, 1 + call_if 1, EventScript_164330 + compare_var_to_value VAR_FACING, 4 + call_if 1, EventScript_16433B + compare_var_to_value VAR_FACING, 3 + call_if 1, EventScript_164346 + textcolor 0 + loadword 0, gUnknown_817BD97 + callstd 4 + closemessage + compare_var_to_value VAR_FACING, 2 + call_if 1, EventScript_164351 + compare_var_to_value VAR_FACING, 1 + call_if 1, EventScript_164366 + compare_var_to_value VAR_FACING, 4 + call_if 1, EventScript_16437B + compare_var_to_value VAR_FACING, 3 + call_if 1, EventScript_164390 + removeobject 1 + compare_var_to_value VAR_FACING, 2 + call_if 1, EventScript_1642F9 + compare_var_to_value VAR_FACING, 1 + call_if 1, EventScript_1642F9 + compare_var_to_value VAR_FACING, 4 + call_if 1, EventScript_164304 + compare_var_to_value VAR_FACING, 3 + call_if 1, EventScript_164304 + loadword 0, gUnknown_817BDD4 + callstd 4 + closemessage + compare_var_to_value VAR_FACING, 2 + call_if 1, EventScript_1643A5 + compare_var_to_value VAR_FACING, 1 + call_if 1, EventScript_1643B7 + compare_var_to_value VAR_FACING, 4 + call_if 1, EventScript_1643C9 + compare_var_to_value VAR_FACING, 3 + call_if 1, EventScript_1643DB + playse SE_KAIDAN + delay 35 + removeobject 2 + setflag FLAG_0x2D8 + release + end + +EventScript_1642F9:: @ 81642F9 + applymovement 255, Movement_1A75E7 + waitmovement 0 + return + +EventScript_164304:: @ 8164304 + applymovement 255, Movement_1A75ED + waitmovement 0 + return + +EventScript_16430F:: @ 816430F + applymovement 255, Movement_1A75E7 + waitmovement 0 + return + +EventScript_16431A:: @ 816431A + applymovement 255, Movement_1A75ED + waitmovement 0 + return + +EventScript_164325:: @ 8164325 + applymovement 2, Movement_1643ED + waitmovement 0 + return + +EventScript_164330:: @ 8164330 + applymovement 2, Movement_1643ED + waitmovement 0 + return + +EventScript_16433B:: @ 816433B + applymovement 2, Movement_1643F1 + waitmovement 0 + return + +EventScript_164346:: @ 8164346 + applymovement 2, Movement_1643F1 + waitmovement 0 + return + +EventScript_164351:: @ 8164351 + applymovement 2, Movement_1643F5 + waitmovement 0 + applymovement 255, Movement_1A75E9 + waitmovement 0 + return + +EventScript_164366:: @ 8164366 + applymovement 2, Movement_1643F5 + waitmovement 0 + applymovement 255, Movement_1A75ED + waitmovement 0 + return + +EventScript_16437B:: @ 816437B + applymovement 2, Movement_1643F7 + waitmovement 0 + applymovement 255, Movement_1A75EB + waitmovement 0 + return + +EventScript_164390:: @ 8164390 + applymovement 2, Movement_1643F7 + waitmovement 0 + applymovement 255, Movement_1A75E7 + waitmovement 0 + return + +EventScript_1643A5:: @ 81643A5 + applymovement 255, Movement_16441C + applymovement 2, Movement_1643F9 + waitmovement 0 + return + +EventScript_1643B7:: @ 81643B7 + applymovement 255, Movement_16441C + applymovement 2, Movement_164401 + waitmovement 0 + return + +EventScript_1643C9:: @ 81643C9 + applymovement 255, Movement_16441C + applymovement 2, Movement_164409 + waitmovement 0 + return + +EventScript_1643DB:: @ 81643DB + applymovement 255, Movement_16441C + applymovement 2, Movement_164409 + waitmovement 0 + return + +Movement_1643ED:: @ 81643ED + step_11 + step_11 + step_30 + step_end + +Movement_1643F1:: @ 81643F1 + step_13 + step_13 + step_2e + step_end + +Movement_1643F5:: @ 81643F5 + step_13 + step_end + +Movement_1643F7:: @ 81643F7 + step_11 + step_end + +Movement_1643F9:: @ 81643F9 + step_1e + step_20 + step_20 + step_20 + step_1d + step_20 + step_20 + step_end + +Movement_164401:: @ 8164401 + step_1d + step_20 + step_20 + step_20 + step_1e + step_20 + step_20 + step_end + +Movement_164409:: @ 8164409 + step_20 + step_20 + step_20 + step_20 + step_1e + step_end + +Movement_16440F:: @ 816440F + step_00 + step_5e + step_39 + step_39 + step_39 + step_39 + step_39 + step_39 + step_39 + step_39 + step_39 + step_5f + step_end + +Movement_16441C:: @ 816441C + step_1c + step_30 + step_end + +SixIsland_DottedHole_SapphireRoom_EventScript_16441F:: @ 816441F + lockall + setvar VAR_0x8005, 130 + setvar VAR_0x8006, 0 + braillemessage gUnknown_81A9321 + getbraillestringwidth gUnknown_81A9321 + call EventScript_1A926C + setvar VAR_0x8006, 0 + braillemessage gUnknown_81A932D + getbraillestringwidth gUnknown_81A932D + call EventScript_1A926C + setvar VAR_0x8006, 0 + braillemessage gUnknown_81A9338 + getbraillestringwidth gUnknown_81A9338 + call EventScript_1A926C + setvar VAR_0x8006, 0 + braillemessage gUnknown_81A933F + getbraillestringwidth gUnknown_81A933F + call EventScript_1A926C + setvar VAR_0x8006, 0 + braillemessage gUnknown_81A934A + getbraillestringwidth gUnknown_81A934A + call EventScript_1A926C + setvar VAR_0x8006, 0 + braillemessage gUnknown_81A9356 + getbraillestringwidth gUnknown_81A9356 + call EventScript_1A926C + setvar VAR_0x8006, 0 + braillemessage gUnknown_81A9362 + getbraillestringwidth gUnknown_81A9362 + call EventScript_1A926C + setvar VAR_0x8006, 0 + braillemessage gUnknown_81A9368 + getbraillestringwidth gUnknown_81A9368 + call EventScript_1A926C + setvar VAR_0x8006, 0 + braillemessage gUnknown_81A9374 + getbraillestringwidth gUnknown_81A9374 + call EventScript_1A926C + setvar VAR_0x8006, 0 + braillemessage gUnknown_81A937C + getbraillestringwidth gUnknown_81A937C + call EventScript_1A926C + setvar VAR_0x8006, 0 + braillemessage gUnknown_81A9387 + getbraillestringwidth gUnknown_81A9387 + call EventScript_1A926C + setvar VAR_0x8006, 0 + braillemessage gUnknown_81A9393 + getbraillestringwidth gUnknown_81A9393 + call EventScript_1A926C + setvar VAR_0x8006, 0 + braillemessage gUnknown_81A939F + getbraillestringwidth gUnknown_81A939F + call EventScript_1A926C + setvar VAR_0x8006, 0 + braillemessage gUnknown_81A93AB + getbraillestringwidth gUnknown_81A93AB + call EventScript_1A926C + setvar VAR_0x8006, 0 + braillemessage gUnknown_81A93B4 + getbraillestringwidth gUnknown_81A93B4 + call EventScript_1A926C + braillemessage gUnknown_81A93C0 + waitbuttonpress + releaseall + end diff --git a/data/maps/SixIsland_GreenPath/scripts.inc b/data/maps/SixIsland_GreenPath/scripts.inc new file mode 100644 index 000000000..860d1a964 --- /dev/null +++ b/data/maps/SixIsland_GreenPath/scripts.inc @@ -0,0 +1,12 @@ +SixIsland_GreenPath_MapScripts:: @ 8168B2D + .byte 0 + +SixIsland_GreenPath_EventScript_168B2E:: @ 8168B2E + loadword 0, gUnknown_818B84D + callstd 3 + end + +SixIsland_GreenPath_EventScript_168B37:: @ 8168B37 + loadword 0, gUnknown_818B86B + callstd 3 + end diff --git a/data/maps/SixIsland_Harbor/scripts.inc b/data/maps/SixIsland_Harbor/scripts.inc new file mode 100644 index 000000000..575746338 --- /dev/null +++ b/data/maps/SixIsland_Harbor/scripts.inc @@ -0,0 +1,11 @@ +SixIsland_Harbor_MapScripts:: @ 8171E47 + .byte 0 + +SixIsland_Harbor_EventScript_171E48:: @ 8171E48 + lock + faceplayer + message Text_181726 + waitmessage + setvar VAR_0x8004, 6 + goto EventScript_1A900F + end diff --git a/data/maps/SixIsland_House/scripts.inc b/data/maps/SixIsland_House/scripts.inc new file mode 100644 index 000000000..d1f6d2c78 --- /dev/null +++ b/data/maps/SixIsland_House/scripts.inc @@ -0,0 +1,7 @@ +SixIsland_House_MapScripts:: @ 8171E5B + .byte 0 + +SixIsland_House_EventScript_171E5C:: @ 8171E5C + loadword 0, gUnknown_81A412E + callstd 2 + end diff --git a/data/maps/SixIsland_Mart/scripts.inc b/data/maps/SixIsland_Mart/scripts.inc new file mode 100644 index 000000000..ea29b5359 --- /dev/null +++ b/data/maps/SixIsland_Mart/scripts.inc @@ -0,0 +1,35 @@ +SixIsland_Mart_MapScripts:: @ 8171E65 + .byte 0 + +SixIsland_Mart_EventScript_171E66:: @ 8171E66 + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + lock + faceplayer + message Text_1A6211 + waitmessage + pokemart Items_171E8C + loadword 0, gUnknown_81A5190 + callstd 4 + release + end + + .align 2 +Items_171E8C:: @ 8171E8C + .2byte ITEM_ULTRA_BALL + .2byte ITEM_FULL_RESTORE + .2byte ITEM_MAX_POTION + .2byte ITEM_REVIVE + .2byte ITEM_FULL_HEAL + .2byte ITEM_ESCAPE_ROPE + .2byte ITEM_MAX_REPEL + .2byte ITEM_DREAM_MAIL + .2byte ITEM_NONE + release + end + +SixIsland_Mart_EventScript_171EA0:: @ 8171EA0 + loadword 0, gUnknown_81A4271 + callstd 2 + end diff --git a/data/maps/SixIsland_OutcastIsland/scripts.inc b/data/maps/SixIsland_OutcastIsland/scripts.inc new file mode 100644 index 000000000..68a9dd535 --- /dev/null +++ b/data/maps/SixIsland_OutcastIsland/scripts.inc @@ -0,0 +1,8 @@ +SixIsland_OutcastIsland_MapScripts:: @ 8168B15 + .byte 0 + +SixIsland_OutcastIsland_EventScript_168B16:: @ 8168B16 + trainerbattle 0, 540, 0, Text_18B35A, Text_18B3C2 + loadword 0, gUnknown_818B3C8 + callstd 6 + end diff --git a/data/maps/SixIsland_PokemonCenter_1F/scripts.inc b/data/maps/SixIsland_PokemonCenter_1F/scripts.inc new file mode 100644 index 000000000..e578c36b7 --- /dev/null +++ b/data/maps/SixIsland_PokemonCenter_1F/scripts.inc @@ -0,0 +1,82 @@ +SixIsland_PokemonCenter_1F_MapScripts:: @ 8171D6A + map_script 3, SixIsland_PokemonCenter_1F_MapScript1_171D7A + map_script 5, SixIsland_PokemonCenter_1F_MapScript2_1BC05C + map_script 2, SixIsland_PokemonCenter_1F_MapScript3_171D8D + .byte 0 + +SixIsland_PokemonCenter_1F_MapScript1_171D7A:: @ 8171D7A + setrespawn 20 + compare_var_to_value VAR_0x4089, 0 + call_if 1, EventScript_171D89 + end + +EventScript_171D89:: @ 8171D89 + clearflag FLAG_0x098 + return + +SixIsland_PokemonCenter_1F_MapScript3_171D8D:: @ 8171D8D + map_script_2 VAR_0x4089, 0, EventScript_171D97 + .2byte 0 + +EventScript_171D97:: @ 8171D97 + lockall + textcolor 0 + applymovement 2, Movement_1A75ED + waitmovement 0 + playbgm BGM_FRLG_RIVAL, 0 + applymovement 2, Movement_1A75DB + waitmovement 0 + applymovement 2, Movement_1A75DD + waitmovement 0 + delay 25 + applymovement 2, Movement_171DF9 + waitmovement 0 + loadword 0, gUnknown_81A3F30 + callstd 4 + closemessage + applymovement 255, Movement_171E02 + applymovement 2, Movement_171DFE + waitmovement 0 + fadedefaultbgm + playse SE_KAIDAN + delay 35 + removeobject 2 + setvar VAR_0x4089, 1 + setvar VAR_0x4086, 1 + releaseall + end + +Movement_171DF9:: @ 8171DF9 + step_13 + step_13 + step_10 + step_10 + step_end + +Movement_171DFE:: @ 8171DFE + step_1c + step_1a + step_10 + step_end + +Movement_171E02:: @ 8171E02 + step_12 + step_30 + step_end + +SixIsland_PokemonCenter_1F_EventScript_171E05:: @ 8171E05 + lock + faceplayer + call EventScript_1A6578 + release + end + +SixIsland_PokemonCenter_1F_EventScript_171E0E:: @ 8171E0E + loadword 0, gUnknown_81A3E02 + callstd 2 + end + +SixIsland_PokemonCenter_1F_EventScript_171E17:: @ 8171E17 + loadword 0, gUnknown_81A3E87 + callstd 2 + end diff --git a/data/maps/SixIsland_PokemonCenter_2F/scripts.inc b/data/maps/SixIsland_PokemonCenter_2F/scripts.inc new file mode 100644 index 000000000..652c22240 --- /dev/null +++ b/data/maps/SixIsland_PokemonCenter_2F/scripts.inc @@ -0,0 +1,18 @@ +SixIsland_PokemonCenter_2F_MapScripts:: @ 8171E20 + map_script 2, SixIsland_PokemonCenter_2F_MapScript1_1BB2A3 + map_script 4, SixIsland_PokemonCenter_2F_MapScript2_1BB1ED + map_script 1, SixIsland_PokemonCenter_2F_MapScript3_1BB237 + map_script 3, SixIsland_PokemonCenter_2F_MapScript4_1BB1B4 + .byte 0 + +SixIsland_PokemonCenter_2F_EventScript_171E35:: @ 8171E35 + call EventScript_1BB4A3 + end + +EventScript_171E3B:: @ 8171E3B + call EventScript_1BB6AB + end + +EventScript_171E41:: @ 8171E41 + call EventScript_1BB7DE + end diff --git a/data/maps/SixIsland_RuinValley/scripts.inc b/data/maps/SixIsland_RuinValley/scripts.inc new file mode 100644 index 000000000..825822e1a --- /dev/null +++ b/data/maps/SixIsland_RuinValley/scripts.inc @@ -0,0 +1,52 @@ +SixIsland_RuinValley_MapScripts:: @ 8168B53 + map_script 1, SixIsland_RuinValley_MapScript1_168B59 + .byte 0 + +SixIsland_RuinValley_MapScript1_168B59:: @ 8168B59 + checkflag FLAG_0x2E3 + call_if 1, EventScript_168B63 + end + +EventScript_168B63:: @ 8168B63 + setmetatile 24, 24, 856, 0 + return + +SixIsland_RuinValley_EventScript_168B6D:: @ 8168B6D + lock + loadword 0, gUnknown_818BD47 + callstd 4 + applymovement 1, Movement_1A75E1 + waitmovement 0 + loadword 0, gUnknown_818BD7A + callstd 4 + applymovement 1, Movement_1A75E5 + waitmovement 0 + release + end + +SixIsland_RuinValley_EventScript_168B94:: @ 8168B94 + lockall + checkflag FLAG_0x2E3 + goto_if 1, EventScript_168BC1 + loadword 0, gUnknown_818BDC0 + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_168BCB + loadword 0, gUnknown_818BE11 + callstd 4 + braillemessage gUnknown_81A929B + waitbuttonpress + releaseall + end + +EventScript_168BC1:: @ 8168BC1 + loadword 0, gUnknown_818BE4B + callstd 4 + releaseall + end + +EventScript_168BCB:: @ 8168BCB + loadword 0, gUnknown_818BDF9 + callstd 4 + releaseall + end diff --git a/data/maps/SixIsland_WaterPath/scripts.inc b/data/maps/SixIsland_WaterPath/scripts.inc new file mode 100644 index 000000000..5d8c10058 --- /dev/null +++ b/data/maps/SixIsland_WaterPath/scripts.inc @@ -0,0 +1,12 @@ +SixIsland_WaterPath_MapScripts:: @ 8168B40 + .byte 0 + +SixIsland_WaterPath_EventScript_168B41:: @ 8168B41 + loadword 0, gUnknown_818BD0C + callstd 3 + end + +SixIsland_WaterPath_EventScript_168B4A:: @ 8168B4A + loadword 0, gUnknown_818BD27 + callstd 3 + end diff --git a/data/maps/SixIsland_WaterPath_House1/scripts.inc b/data/maps/SixIsland_WaterPath_House1/scripts.inc new file mode 100644 index 000000000..d93d01435 --- /dev/null +++ b/data/maps/SixIsland_WaterPath_House1/scripts.inc @@ -0,0 +1,101 @@ +SixIsland_WaterPath_House1_MapScripts:: @ 817206C + .byte 0 + +SixIsland_WaterPath_House1_EventScript_17206D:: @ 817206D + lock + faceplayer + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + special sub_8112364 + setvar VAR_0x8004, 214 + specialvar VAR_RESULT, sub_80CC48C + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_1720E5 + special sub_80A0918 + loadword 0, gUnknown_81A4A3F + callstd 4 + special sub_80BF8FC + waitstate + copyvar VAR_RESULT, VAR_0x8004 + compare_var_to_value VAR_RESULT, 6 + goto_if 4, EventScript_1720EF + special sub_80A0930 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_1720F1 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1720FB + compare_var_to_value VAR_RESULT, 3 + goto_if 1, EventScript_172121 + compare_var_to_value VAR_RESULT, 4 + goto_if 1, EventScript_17210E + release + end + +EventScript_1720E5:: @ 81720E5 + loadword 0, gUnknown_81A49E9 + callstd 4 + release + end + +EventScript_1720EF:: @ 81720EF + release + end + +EventScript_1720F1:: @ 81720F1 + loadword 0, gUnknown_81A4BEF + callstd 4 + release + end + +EventScript_1720FB:: @ 81720FB + checkflag FLAG_0x2D9 + goto_if 0, EventScript_172121 + loadword 0, gUnknown_81A4B7A + callstd 4 + release + end + +EventScript_17210E:: @ 817210E + checkflag FLAG_0x2D9 + goto_if 0, EventScript_172121 + loadword 0, gUnknown_81A4B39 + callstd 4 + release + end + +EventScript_172121:: @ 8172121 + setflag FLAG_0x2D9 + loadword 0, gUnknown_81A4A88 + callstd 4 + setorcopyvar VAR_0x8000, 8 + setorcopyvar VAR_0x8001, 1 + callstd 0 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_17214D + loadword 0, gUnknown_81A4AD9 + callstd 4 + release + end + +EventScript_17214D:: @ 817214D + loadword 0, gUnknown_81A4C47 + callstd 4 + release + end + +SixIsland_WaterPath_House1_EventScript_172157:: @ 8172157 + lockall + checkflag FLAG_0x2D9 + goto_if 1, EventScript_17216B + loadword 0, gUnknown_81A4CB9 + callstd 4 + releaseall + end + +EventScript_17216B:: @ 817216B + special sub_80A0918 + loadword 0, gUnknown_81A4C6E + callstd 4 + releaseall + end diff --git a/data/maps/SixIsland_WaterPath_House2/scripts.inc b/data/maps/SixIsland_WaterPath_House2/scripts.inc new file mode 100644 index 000000000..916bf5fbd --- /dev/null +++ b/data/maps/SixIsland_WaterPath_House2/scripts.inc @@ -0,0 +1,7 @@ +SixIsland_WaterPath_House2_MapScripts:: @ 8172178 + .byte 0 + +SixIsland_WaterPath_House2_EventScript_172179:: @ 8172179 + loadword 0, gUnknown_81A4D0D + callstd 2 + end diff --git a/data/maps/ThreeIsland/scripts.inc b/data/maps/ThreeIsland/scripts.inc new file mode 100644 index 000000000..76813e4ad --- /dev/null +++ b/data/maps/ThreeIsland/scripts.inc @@ -0,0 +1,443 @@ +ThreeIsland_MapScripts:: @ 81677AD + map_script 3, ThreeIsland_MapScript1_1677B3 + .byte 0 + +ThreeIsland_MapScript1_1677B3:: @ 81677B3 + setworldmapflag 2205 + checkflag FLAG_0x2A3 + call_if 1, EventScript_1677CB + compare_var_to_value VAR_0x407B, 4 + call_if 1, EventScript_1677CF + end + +EventScript_1677CB:: @ 81677CB + setflag FLAG_0x07E + return + +EventScript_1677CF:: @ 81677CF + setobjectmovementtype 1, 1 + setobjectmovementtype 2, 1 + return + +ThreeIsland_EventScript_1677D8:: @ 81677D8 + lock + setvar VAR_0x4001, 2 + call EventScript_16786F + release + end + +ThreeIsland_EventScript_1677E5:: @ 81677E5 + lock + checkflag FLAG_0x2FC + goto_if 1, EventScript_167806 + compare_var_to_value VAR_0x407B, 4 + goto_if 1, EventScript_16781A + setvar VAR_0x4001, 0 + call EventScript_16786F + release + end + +EventScript_167806:: @ 8167806 + applymovement 1, Movement_1A75E1 + waitmovement 0 + loadword 0, gUnknown_81827F1 + callstd 4 + release + end + +EventScript_16781A:: @ 816781A + applymovement 1, Movement_1A75E1 + waitmovement 0 + loadword 0, gUnknown_818275A + callstd 4 + checkitemspace ITEM_FULL_RESTORE, 1 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_167865 + loadword 0, gUnknown_81827BE + setorcopyvar VAR_0x8000, 19 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 257 + callstd 9 + additem ITEM_FULL_RESTORE, 1 + setflag FLAG_0x2FC + loadword 0, gUnknown_81827F1 + callstd 4 + release + end + +EventScript_167865:: @ 8167865 + loadword 0, gUnknown_81827DB + callstd 4 + release + end + +EventScript_16786F:: @ 816786F + compare_var_to_value VAR_0x4001, 1 + call_if 1, EventScript_167947 + compare_var_to_value VAR_0x4001, 2 + call_if 1, EventScript_167947 + applymovement 1, Movement_167A1B + waitmovement 0 + loadword 0, gUnknown_81820C0 + callstd 4 + compare_var_to_value VAR_0x4001, 0 + call_if 1, EventScript_167952 + compare_var_to_value VAR_0x4001, 1 + call_if 1, EventScript_167952 + compare_var_to_value VAR_0x4001, 2 + call_if 1, EventScript_16795D + applymovement 5, Movement_167A19 + waitmovement 0 + loadword 0, gUnknown_8182125 + callstd 4 + compare_var_to_value VAR_0x4001, 0 + call_if 1, EventScript_167931 + compare_var_to_value VAR_0x4001, 1 + call_if 1, EventScript_167931 + compare_var_to_value VAR_0x4001, 2 + call_if 1, EventScript_167973 + applymovement 2, Movement_167A1B + waitmovement 0 + loadword 0, gUnknown_81821A9 + callstd 4 + compare_var_to_value VAR_0x4001, 0 + call_if 1, EventScript_167952 + compare_var_to_value VAR_0x4001, 1 + call_if 1, EventScript_167952 + compare_var_to_value VAR_0x4001, 2 + call_if 1, EventScript_16795D + applymovement 4, Movement_167A19 + waitmovement 0 + loadword 0, gUnknown_81821DC + callstd 4 + return + +EventScript_167931:: @ 8167931 + applymovement 255, Movement_1A75E9 + waitmovement 0 + return + +EventScript_16793C:: @ 816793C + applymovement 255, Movement_1A75ED + waitmovement 0 + return + +EventScript_167947:: @ 8167947 + applymovement 255, Movement_1A75E7 + waitmovement 0 + return + +EventScript_167952:: @ 8167952 + applymovement 255, Movement_1A75EB + waitmovement 0 + return + +EventScript_16795D:: @ 816795D + getplayerxy VAR_0x8004, VAR_0x8005 + compare_var_to_value VAR_0x8004, 9 + goto_if 4, EventScript_167931 + goto EventScript_167952 + end + +EventScript_167973:: @ 8167973 + getplayerxy VAR_0x8004, VAR_0x8005 + compare_var_to_value VAR_0x8004, 9 + goto_if 4, EventScript_167947 + goto EventScript_167931 + end + +ThreeIsland_EventScript_167989:: @ 8167989 + lock + compare_var_to_value VAR_0x407B, 4 + goto_if 1, EventScript_1679A1 + setvar VAR_0x4001, 1 + call EventScript_16786F + release + end + +EventScript_1679A1:: @ 81679A1 + applymovement 2, Movement_1A75E1 + waitmovement 0 + loadword 0, gUnknown_8182823 + callstd 4 + release + end + +ThreeIsland_EventScript_1679B5:: @ 81679B5 + lockall + textcolor 0 + applymovement 1, Movement_167A1B + waitmovement 0 + loadword 0, gUnknown_81821F1 + callstd 4 + applymovement 3, Movement_167A19 + waitmovement 0 + loadword 0, gUnknown_818221F + callstd 4 + applymovement 1, Movement_167A1B + waitmovement 0 + loadword 0, gUnknown_8182275 + callstd 4 + applymovement 3, Movement_167A19 + waitmovement 0 + loadword 0, gUnknown_81822FB + callstd 4 + applymovement 1, Movement_167A1B + waitmovement 0 + loadword 0, gUnknown_81823C7 + callstd 4 + setvar VAR_0x407B, 3 + releaseall + end + +Movement_167A19:: @ 8167A19 + step_27 + step_end + +Movement_167A1B:: @ 8167A1B + step_28 + step_end + +ThreeIsland_EventScript_167A1D:: @ 8167A1D + lockall + setvar VAR_0x4001, 0 + goto EventScript_167A59 + end + +ThreeIsland_EventScript_167A29:: @ 8167A29 + lockall + setvar VAR_0x4001, 1 + goto EventScript_167A59 + end + +ThreeIsland_EventScript_167A35:: @ 8167A35 + lockall + setvar VAR_0x4001, 2 + goto EventScript_167A59 + end + +ThreeIsland_EventScript_167A41:: @ 8167A41 + lockall + setvar VAR_0x4001, 3 + goto EventScript_167A59 + end + +ThreeIsland_EventScript_167A4D:: @ 8167A4D + lockall + setvar VAR_0x4001, 4 + goto EventScript_167A59 + end + +EventScript_167A59:: @ 8167A59 + textcolor 0 + applymovement 5, Movement_1A75ED + waitmovement 0 + playse SE_PIN + applymovement 5, Movement_1A75DB + waitmovement 0 + applymovement 5, Movement_1A75DD + waitmovement 0 + applymovement 5, Movement_167C57 + waitmovement 0 + playbgm BGM_FRLG_BOY_EYE, 0 + loadword 0, gUnknown_81823ED + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_167C35 + loadword 0, gUnknown_818247D + callstd 4 + setvar VAR_LAST_TALKED, 5 + trainerbattle 3, 527, 0, Text_1824B7 + applymovement 5, Movement_167C5C + waitmovement 0 + loadword 0, gUnknown_81824CF + callstd 4 + closemessage + applymovement 7, Movement_167C57 + waitmovement 0 + playbgm BGM_FRLG_BOY_EYE, 0 + loadword 0, gUnknown_81824EF + callstd 4 + setvar VAR_LAST_TALKED, 7 + trainerbattle 3, 528, 0, Text_182521 + applymovement 7, Movement_167C5C + waitmovement 0 + loadword 0, gUnknown_8182536 + callstd 4 + closemessage + applymovement 4, Movement_167C57 + waitmovement 0 + playbgm BGM_FRLG_BOY_EYE, 0 + loadword 0, gUnknown_8182582 + callstd 4 + setvar VAR_LAST_TALKED, 4 + trainerbattle 3, 529, 0, Text_1825D4 + applymovement 4, Movement_1A75E7 + waitmovement 0 + applymovement 6, Movement_1A75ED + applymovement 8, Movement_1A75ED + waitmovement 0 + loadword 0, gUnknown_81825E2 + callstd 4 + closemessage + delay 45 + compare_var_to_value VAR_0x4001, 0 + call_if 1, EventScript_167BC6 + compare_var_to_value VAR_0x4001, 1 + call_if 1, EventScript_167BD8 + compare_var_to_value VAR_0x4001, 2 + call_if 1, EventScript_167BEA + compare_var_to_value VAR_0x4001, 3 + call_if 1, EventScript_167C03 + compare_var_to_value VAR_0x4001, 4 + call_if 1, EventScript_167C1C + playbgm BGM_FRLG_BOY_EYE, 0 + loadword 0, gUnknown_8182623 + callstd 4 + setvar VAR_LAST_TALKED, 3 + trainerbattle 3, 742, 0, Text_1826B7 + loadword 0, gUnknown_818271D + callstd 4 + closemessage + fadescreen 1 + removeobject 3 + removeobject 5 + removeobject 7 + removeobject 4 + removeobject 6 + removeobject 8 + removeobject 14 + fadescreen 0 + setvar VAR_0x407B, 4 + releaseall + end + +EventScript_167BC6:: @ 8167BC6 + applymovement 4, Movement_1A75ED + applymovement 3, Movement_167C5E + waitmovement 0 + return + +EventScript_167BD8:: @ 8167BD8 + applymovement 4, Movement_1A75ED + applymovement 3, Movement_167C62 + waitmovement 0 + return + +EventScript_167BEA:: @ 8167BEA + applymovement 4, Movement_1A75ED + applymovement 3, Movement_167C64 + applymovement 255, Movement_167C68 + waitmovement 0 + return + +EventScript_167C03:: @ 8167C03 + applymovement 4, Movement_1A75ED + applymovement 255, Movement_167C68 + applymovement 3, Movement_167C6C + waitmovement 0 + return + +EventScript_167C1C:: @ 8167C1C + applymovement 4, Movement_1A75ED + applymovement 255, Movement_167C68 + applymovement 3, Movement_167C71 + waitmovement 0 + return + +EventScript_167C35:: @ 8167C35 + loadword 0, gUnknown_8182453 + callstd 4 + closemessage + applymovement 255, Movement_167C55 + waitmovement 0 + applymovement 5, Movement_167C59 + waitmovement 0 + fadedefaultbgm + releaseall + end + +Movement_167C55:: @ 8167C55 + step_10 + step_end + +Movement_167C57:: @ 8167C57 + step_10 + step_end + +Movement_167C59:: @ 8167C59 + step_11 + step_2f + step_end + +Movement_167C5C:: @ 8167C5C + step_25 + step_end + +Movement_167C5E:: @ 8167C5E + step_10 + step_12 + step_2d + step_end + +Movement_167C62:: @ 8167C62 + step_10 + step_end + +Movement_167C64:: @ 8167C64 + step_10 + step_10 + step_30 + step_end + +Movement_167C68:: @ 8167C68 + step_1c + step_1c + step_2f + step_end + +Movement_167C6C:: @ 8167C6C + step_10 + step_10 + step_13 + step_30 + step_end + +Movement_167C71:: @ 8167C71 + step_10 + step_10 + step_13 + step_13 + step_30 + step_end + +ThreeIsland_EventScript_167C77:: @ 8167C77 + loadword 0, gUnknown_81828EB + callstd 2 + end + +ThreeIsland_EventScript_167C80:: @ 8167C80 + loadword 0, gUnknown_818298A + callstd 2 + end + +ThreeIsland_EventScript_167C89:: @ 8167C89 + lock + faceplayer + waitse + playmoncry SPECIES_DODUO, 0 + loadword 0, gUnknown_81829F4 + callstd 4 + waitmoncry + release + end + +ThreeIsland_EventScript_167C9C:: @ 8167C9C + loadword 0, gUnknown_8182061 + callstd 3 + end + +ThreeIsland_EventScript_167CA5:: @ 8167CA5 + loadword 0, gUnknown_818208B + callstd 2 + end diff --git a/data/maps/ThreeIsland_BerryForest/scripts.inc b/data/maps/ThreeIsland_BerryForest/scripts.inc new file mode 100644 index 000000000..d6cbbdedf --- /dev/null +++ b/data/maps/ThreeIsland_BerryForest/scripts.inc @@ -0,0 +1,74 @@ +ThreeIsland_BerryForest_MapScripts:: @ 8163C71 + map_script 3, ThreeIsland_BerryForest_MapScript1_163C77 + .byte 0 + +ThreeIsland_BerryForest_MapScript1_163C77:: @ 8163C77 + setworldmapflag 2231 + setescapewarp MAP_THREEISLAND_BONDBRIDGE, 255, 12, 6 + end + +ThreeIsland_BerryForest_EventScript_163C83:: @ 8163C83 + lock + faceplayer + loadword 0, gUnknown_817ADD6 + callstd 4 + playse SE_PIN + applymovement 1, Movement_1A75DB + waitmovement 0 + applymovement 1, Movement_163D22 + waitmovement 0 + loadword 0, gUnknown_817AE8E + callstd 4 + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + waitse + playmoncry SPECIES_HYPNO, 2 + waitmoncry + setwildbattle SPECIES_HYPNO, 30, ITEM_NONE + dowildbattle + special sub_8112364 + applymovement 1, Movement_1A75E1 + waitmovement 0 + loadword 0, gUnknown_817AEE1 + callstd 4 + setorcopyvar VAR_0x8000, 147 + setorcopyvar VAR_0x8001, 1 + callstd 0 + compare_var_to_value VAR_RESULT, 0 + call_if 1, EventScript_163D19 + special sub_80CA6DC + loadword 0, gUnknown_817AF3B + callstd 4 + closemessage + setflag FLAG_0x2A3 + setflag FLAG_0x07A + setvar VAR_0x4079, 2 + clearflag FLAG_0x075 + warp MAP_TWOISLAND_JOYFULGAMECORNER, 255, 6, 6 + waitstate + release + end + +EventScript_163D19:: @ 8163D19 + loadword 0, gUnknown_817AF9F + callstd 4 + return + +Movement_163D22:: @ 8163D22 + step_2f + step_1c + step_30 + step_1b + step_2f + step_end + +ThreeIsland_BerryForest_EventScript_163D28:: @ 8163D28 + loadword 0, gUnknown_817AFD6 + callstd 3 + end + +ThreeIsland_BerryForest_EventScript_163D31:: @ 8163D31 + loadword 0, gUnknown_817B029 + callstd 3 + end diff --git a/data/maps/ThreeIsland_BondBridge/scripts.inc b/data/maps/ThreeIsland_BondBridge/scripts.inc new file mode 100644 index 000000000..567cbfcb8 --- /dev/null +++ b/data/maps/ThreeIsland_BondBridge/scripts.inc @@ -0,0 +1,12 @@ +ThreeIsland_BondBridge_MapScripts:: @ 8168776 + .byte 0 + +ThreeIsland_BondBridge_EventScript_168777:: @ 8168777 + loadword 0, gUnknown_818A210 + callstd 3 + end + +ThreeIsland_BondBridge_EventScript_168780:: @ 8168780 + loadword 0, gUnknown_818A223 + callstd 3 + end diff --git a/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc b/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc new file mode 100644 index 000000000..d90dbfd44 --- /dev/null +++ b/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc @@ -0,0 +1,62 @@ +ThreeIsland_DunsparceTunnel_MapScripts:: @ 8164D26 + map_script 3, ThreeIsland_DunsparceTunnel_MapScript1_164D2C + .byte 0 + +ThreeIsland_DunsparceTunnel_MapScript1_164D2C:: @ 8164D2C + setworldmapflag 2240 + specialvar VAR_RESULT, sub_806E25C + copyvar VAR_0x8008, VAR_RESULT + compare_var_to_value VAR_0x8008, 1 + call_if 1, EventScript_164D50 + compare_var_to_value VAR_0x8008, 0 + call_if 1, EventScript_164D54 + end + +EventScript_164D50:: @ 8164D50 + setmaplayoutindex LAYOUT_UNUSEDLAYOUT_83453C0 + return + +EventScript_164D54:: @ 8164D54 + setobjectxyperm 1, 6, 3 + setobjectmovementtype 1, 10 + return + +ThreeIsland_DunsparceTunnel_EventScript_164D60:: @ 8164D60 + lock + faceplayer + checkflag FLAG_0x2E2 + goto_if 1, EventScript_164DC2 + specialvar VAR_RESULT, sub_806E25C + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_164D90 + loadword 0, gUnknown_817D13B + callstd 4 + closemessage + applymovement 1, Movement_1A75E5 + waitmovement 0 + release + end + +EventScript_164D90:: @ 8164D90 + loadword 0, gUnknown_817D1C9 + callstd 4 + setorcopyvar VAR_0x8000, 110 + setorcopyvar VAR_0x8001, 1 + callstd 0 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_164DB8 + setflag FLAG_0x2E2 + goto EventScript_164DC2 + end + +EventScript_164DB8:: @ 8164DB8 + loadword 0, gUnknown_817D2DC + callstd 4 + release + end + +EventScript_164DC2:: @ 8164DC2 + loadword 0, gUnknown_817D28C + callstd 4 + release + end diff --git a/data/maps/ThreeIsland_Harbor/scripts.inc b/data/maps/ThreeIsland_Harbor/scripts.inc new file mode 100644 index 000000000..da8f083b2 --- /dev/null +++ b/data/maps/ThreeIsland_Harbor/scripts.inc @@ -0,0 +1,11 @@ +ThreeIsland_Harbor_MapScripts:: @ 8171EA9 + .byte 0 + +ThreeIsland_Harbor_EventScript_171EAA:: @ 8171EAA + lock + faceplayer + message Text_181726 + waitmessage + setvar VAR_0x8004, 3 + goto EventScript_1A900F + end diff --git a/data/maps/ThreeIsland_House1/scripts.inc b/data/maps/ThreeIsland_House1/scripts.inc new file mode 100644 index 000000000..62eb26709 --- /dev/null +++ b/data/maps/ThreeIsland_House1/scripts.inc @@ -0,0 +1,16 @@ +ThreeIsland_House1_MapScripts:: @ 8171819 + .byte 0 + +ThreeIsland_House1_EventScript_17181A:: @ 817181A + lock + faceplayer + special sub_80CA6DC + loadword 0, gUnknown_81A2F3E + callstd 4 + release + end + +ThreeIsland_House1_EventScript_171829:: @ 8171829 + loadword 0, gUnknown_81A2F92 + callstd 3 + end diff --git a/data/maps/ThreeIsland_House2/scripts.inc b/data/maps/ThreeIsland_House2/scripts.inc new file mode 100644 index 000000000..21e85b131 --- /dev/null +++ b/data/maps/ThreeIsland_House2/scripts.inc @@ -0,0 +1,18 @@ +ThreeIsland_House2_MapScripts:: @ 81718DF + .byte 0 + +ThreeIsland_House2_EventScript_1718E0:: @ 81718E0 + lock + faceplayer + setvar VAR_0x8004, 7 + setvar VAR_0x8005, 1 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_81A32CA + callstd 4 + release + end + +ThreeIsland_House2_EventScript_1718F9:: @ 81718F9 + loadword 0, gUnknown_81A3245 + callstd 2 + end diff --git a/data/maps/ThreeIsland_House3/scripts.inc b/data/maps/ThreeIsland_House3/scripts.inc new file mode 100644 index 000000000..370290b0d --- /dev/null +++ b/data/maps/ThreeIsland_House3/scripts.inc @@ -0,0 +1,7 @@ +ThreeIsland_House3_MapScripts:: @ 8171902 + .byte 0 + +ThreeIsland_House3_EventScript_171903:: @ 8171903 + loadword 0, gUnknown_81A3379 + callstd 2 + end diff --git a/data/maps/ThreeIsland_House4/scripts.inc b/data/maps/ThreeIsland_House4/scripts.inc new file mode 100644 index 000000000..27ec90e70 --- /dev/null +++ b/data/maps/ThreeIsland_House4/scripts.inc @@ -0,0 +1,12 @@ +ThreeIsland_House4_MapScripts:: @ 817190C + .byte 0 + +ThreeIsland_House4_EventScript_17190D:: @ 817190D + loadword 0, gUnknown_81A33DB + callstd 2 + end + +ThreeIsland_House4_EventScript_171916:: @ 8171916 + loadword 0, gUnknown_81A342F + callstd 2 + end diff --git a/data/maps/ThreeIsland_House5/scripts.inc b/data/maps/ThreeIsland_House5/scripts.inc new file mode 100644 index 000000000..9559b9a23 --- /dev/null +++ b/data/maps/ThreeIsland_House5/scripts.inc @@ -0,0 +1,18 @@ +ThreeIsland_House5_MapScripts:: @ 817191F + .byte 0 + +ThreeIsland_House5_EventScript_171920:: @ 8171920 + lock + faceplayer + checkflag FLAG_0x2A3 + goto_if 1, EventScript_171935 + loadword 0, gUnknown_81A3469 + callstd 4 + release + end + +EventScript_171935:: @ 8171935 + loadword 0, gUnknown_81A34DB + callstd 4 + release + end diff --git a/data/maps/ThreeIsland_Mart/scripts.inc b/data/maps/ThreeIsland_Mart/scripts.inc new file mode 100644 index 000000000..4060673a9 --- /dev/null +++ b/data/maps/ThreeIsland_Mart/scripts.inc @@ -0,0 +1,43 @@ +ThreeIsland_Mart_MapScripts:: @ 817188C + .byte 0 + +ThreeIsland_Mart_EventScript_17188D:: @ 817188D + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + lock + faceplayer + message Text_1A6211 + waitmessage + pokemart Items_1718B4 + loadword 0, gUnknown_81A5190 + callstd 4 + release + end + + .align 2 +Items_1718B4:: @ 81718B4 + .2byte ITEM_ULTRA_BALL + .2byte ITEM_HYPER_POTION + .2byte ITEM_REVIVE + .2byte ITEM_FULL_HEAL + .2byte ITEM_ESCAPE_ROPE + .2byte ITEM_MAX_REPEL + .2byte ITEM_NONE + release + end + +ThreeIsland_Mart_EventScript_1718C4:: @ 81718C4 + loadword 0, gUnknown_81A3114 + callstd 2 + end + +ThreeIsland_Mart_EventScript_1718CD:: @ 81718CD + loadword 0, gUnknown_81A315C + callstd 2 + end + +ThreeIsland_Mart_EventScript_1718D6:: @ 81718D6 + loadword 0, gUnknown_81A31F0 + callstd 2 + end diff --git a/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc b/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc new file mode 100644 index 000000000..711e63498 --- /dev/null +++ b/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc @@ -0,0 +1,30 @@ +ThreeIsland_PokemonCenter_1F_MapScripts:: @ 8171832 + map_script 3, ThreeIsland_PokemonCenter_1F_MapScript1_17183D + map_script 5, ThreeIsland_PokemonCenter_1F_MapScript2_1BC05C + .byte 0 + +ThreeIsland_PokemonCenter_1F_MapScript1_17183D:: @ 817183D + setrespawn 16 + end + +ThreeIsland_PokemonCenter_1F_EventScript_171841:: @ 8171841 + lock + faceplayer + call EventScript_1A6578 + release + end + +ThreeIsland_PokemonCenter_1F_EventScript_17184A:: @ 817184A + loadword 0, gUnknown_81A303B + callstd 2 + end + +ThreeIsland_PokemonCenter_1F_EventScript_171853:: @ 8171853 + loadword 0, gUnknown_81A30A3 + callstd 2 + end + +ThreeIsland_PokemonCenter_1F_EventScript_17185C:: @ 817185C + loadword 0, gUnknown_81A2FB5 + callstd 2 + end diff --git a/data/maps/ThreeIsland_PokemonCenter_2F/scripts.inc b/data/maps/ThreeIsland_PokemonCenter_2F/scripts.inc new file mode 100644 index 000000000..a87ceda5a --- /dev/null +++ b/data/maps/ThreeIsland_PokemonCenter_2F/scripts.inc @@ -0,0 +1,18 @@ +ThreeIsland_PokemonCenter_2F_MapScripts:: @ 8171865 + map_script 2, ThreeIsland_PokemonCenter_2F_MapScript1_1BB2A3 + map_script 4, ThreeIsland_PokemonCenter_2F_MapScript2_1BB1ED + map_script 1, ThreeIsland_PokemonCenter_2F_MapScript3_1BB237 + map_script 3, ThreeIsland_PokemonCenter_2F_MapScript4_1BB1B4 + .byte 0 + +ThreeIsland_PokemonCenter_2F_EventScript_17187A:: @ 817187A + call EventScript_1BB4A3 + end + +EventScript_171880:: @ 8171880 + call EventScript_1BB6AB + end + +EventScript_171886:: @ 8171886 + call EventScript_1BB7DE + end diff --git a/data/maps/ThreeIsland_Port/scripts.inc b/data/maps/ThreeIsland_Port/scripts.inc new file mode 100644 index 000000000..876acaaac --- /dev/null +++ b/data/maps/ThreeIsland_Port/scripts.inc @@ -0,0 +1,44 @@ +ThreeIsland_Port_MapScripts:: @ 8168789 + map_script 3, ThreeIsland_Port_MapScript1_16878F + .byte 0 + +ThreeIsland_Port_MapScript1_16878F:: @ 816878F + clearflag 2113 + setflag FLAG_0x2A1 + end + +ThreeIsland_Port_EventScript_168796:: @ 8168796 + lock + faceplayer + compare_var_to_value VAR_0x4079, 2 + goto_if 4, EventScript_1687B8 + compare_var_to_value VAR_0x407B, 4 + goto_if 4, EventScript_1687C2 + loadword 0, gUnknown_818A307 + callstd 4 + release + end + +EventScript_1687B8:: @ 81687B8 + loadword 0, gUnknown_818A38B + callstd 4 + release + end + +EventScript_1687C2:: @ 81687C2 + loadword 0, gUnknown_818A339 + callstd 4 + release + end + +ThreeIsland_Port_EventScript_1687CC:: @ 81687CC + loadword 0, gUnknown_818A261 + callstd 2 + end + +ThreeIsland_Port_EventScript_1687D5:: @ 81687D5 + lock + loadword 0, gUnknown_818A2D8 + callstd 4 + release + end diff --git a/data/maps/TwoIsland/scripts.inc b/data/maps/TwoIsland/scripts.inc new file mode 100644 index 000000000..3cec3aad1 --- /dev/null +++ b/data/maps/TwoIsland/scripts.inc @@ -0,0 +1,254 @@ +TwoIsland_MapScripts:: @ 8167564 + map_script 3, TwoIsland_MapScript1_16756A + .byte 0 + +TwoIsland_MapScript1_16756A:: @ 816756A + setworldmapflag 2204 + setflag FLAG_0x2A2 + call EventScript_167576 + end + +EventScript_167576:: @ 8167576 + checkflag 2116 + goto_if 1, EventScript_167597 + checkflag 2092 + goto_if 1, EventScript_1675B8 + checkflag FLAG_0x2A3 + goto_if 1, EventScript_1675D9 + goto EventScript_1675E8 + end + +EventScript_167597:: @ 8167597 + checkflag FLAG_0x29D + goto_if 0, EventScript_1675EE + checkflag FLAG_0x29E + goto_if 0, EventScript_1675F4 + checkflag FLAG_0x29F + goto_if 0, EventScript_1675FD + goto EventScript_167606 + end + +EventScript_1675B8:: @ 81675B8 + checkflag FLAG_0x29D + goto_if 0, EventScript_1675EE + checkflag FLAG_0x2A3 + goto_if 0, EventScript_1675EE + checkflag FLAG_0x29E + goto_if 0, EventScript_1675F4 + goto EventScript_1675FD + end + +EventScript_1675D9:: @ 81675D9 + checkflag FLAG_0x29D + goto_if 0, EventScript_1675EE + goto EventScript_1675F4 + end + +EventScript_1675E8:: @ 81675E8 + goto EventScript_1675EE + end + +EventScript_1675EE:: @ 81675EE + setvar VAR_0x4078, 1 + return + +EventScript_1675F4:: @ 81675F4 + setvar VAR_0x4078, 2 + clearflag FLAG_0x07B + return + +EventScript_1675FD:: @ 81675FD + setvar VAR_0x4078, 3 + clearflag FLAG_0x07C + return + +EventScript_167606:: @ 8167606 + setvar VAR_0x4078, 4 + clearflag FLAG_0x07D + return + +TwoIsland_EventScript_16760F:: @ 816760F + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + lock + faceplayer + compare_var_to_value VAR_0x4078, 4 + goto_if 1, EventScript_167646 + compare_var_to_value VAR_0x4078, 3 + goto_if 1, EventScript_16765E + compare_var_to_value VAR_0x4078, 2 + goto_if 1, EventScript_167676 + goto EventScript_16768E + end + +EventScript_167646:: @ 8167646 + checkflag FLAG_0x2A0 + goto_if 1, EventScript_1676A6 + setflag FLAG_0x2A0 + message Text_181CAE + waitmessage + goto EventScript_167728 + end + +EventScript_16765E:: @ 816765E + checkflag FLAG_0x29F + goto_if 1, EventScript_1676A6 + setflag FLAG_0x29F + message Text_181C77 + waitmessage + goto EventScript_167708 + end + +EventScript_167676:: @ 8167676 + checkflag FLAG_0x29E + goto_if 1, EventScript_1676A6 + setflag FLAG_0x29E + message Text_181B7C + waitmessage + goto EventScript_1676EC + end + +EventScript_16768E:: @ 816768E + checkflag FLAG_0x29D + goto_if 1, EventScript_1676A6 + setflag FLAG_0x29D + message Text_181AFE + waitmessage + goto EventScript_1676D3 + end + +EventScript_1676A6:: @ 81676A6 + message Text_1A6211 + waitmessage + compare_var_to_value VAR_0x4078, 4 + goto_if 1, EventScript_167728 + compare_var_to_value VAR_0x4078, 3 + goto_if 1, EventScript_167708 + compare_var_to_value VAR_0x4078, 2 + goto_if 1, EventScript_1676EC + goto EventScript_1676D3 + end + +EventScript_1676D3:: @ 81676D3 + pokemart Items_1676E4 + loadword 0, gUnknown_81A5190 + callstd 4 + release + end + + .align 2 +Items_1676E4:: @ 81676E4 + .2byte ITEM_GREAT_BALL + .2byte ITEM_FRESH_WATER + .2byte ITEM_NONE + release + end + +EventScript_1676EC:: @ 81676EC + pokemart Items_1676FC + loadword 0, gUnknown_81A5190 + callstd 4 + release + end + + .align 2 +Items_1676FC:: @ 81676FC + .2byte ITEM_ULTRA_BALL + .2byte ITEM_GREAT_BALL + .2byte ITEM_SODA_POP + .2byte ITEM_FRESH_WATER + .2byte ITEM_NONE + release + end + +EventScript_167708:: @ 8167708 + pokemart Items_167718 + loadword 0, gUnknown_81A5190 + callstd 4 + release + end + + .align 2 +Items_167718:: @ 8167718 + .2byte ITEM_ULTRA_BALL + .2byte ITEM_GREAT_BALL + .2byte ITEM_LEMONADE + .2byte ITEM_SODA_POP + .2byte ITEM_FRESH_WATER + .2byte ITEM_MOOMOO_MILK + .2byte ITEM_NONE + release + end + +EventScript_167728:: @ 8167728 + pokemart Items_167738 + loadword 0, gUnknown_81A5190 + callstd 4 + release + end + + .align 2 +Items_167738:: @ 8167738 + .2byte ITEM_ULTRA_BALL + .2byte ITEM_REPEAT_BALL + .2byte ITEM_TIMER_BALL + .2byte ITEM_LEMONADE + .2byte ITEM_SODA_POP + .2byte ITEM_FRESH_WATER + .2byte ITEM_MOOMOO_MILK + .2byte ITEM_LAVA_COOKIE + .2byte ITEM_NONE + release + end + +TwoIsland_EventScript_16774C:: @ 816774C + loadword 0, gUnknown_8181D2F + callstd 2 + end + +TwoIsland_EventScript_167755:: @ 8167755 + loadword 0, gUnknown_8181DCA + callstd 2 + end + +TwoIsland_EventScript_16775E:: @ 816775E + lock + faceplayer + setvar VAR_0x8004, 10 + setvar VAR_0x8005, 4 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_8181E47 + callstd 4 + release + end + +TwoIsland_EventScript_167777:: @ 8167777 + loadword 0, gUnknown_8181F28 + callstd 2 + end + +TwoIsland_EventScript_167780:: @ 8167780 + loadword 0, gUnknown_8181F5D + callstd 2 + end + +TwoIsland_EventScript_167789:: @ 8167789 + loadword 0, gUnknown_8181FCE + callstd 2 + end + +TwoIsland_EventScript_167792:: @ 8167792 + loadword 0, gUnknown_8181A88 + callstd 3 + end + +TwoIsland_EventScript_16779B:: @ 816779B + loadword 0, gUnknown_8181AA7 + callstd 3 + end + +TwoIsland_EventScript_1677A4:: @ 81677A4 + loadword 0, gUnknown_8181AC8 + callstd 3 + end diff --git a/data/maps/TwoIsland_CapeBrink/scripts.inc b/data/maps/TwoIsland_CapeBrink/scripts.inc new file mode 100644 index 000000000..f3bfb9df1 --- /dev/null +++ b/data/maps/TwoIsland_CapeBrink/scripts.inc @@ -0,0 +1,2 @@ +TwoIsland_CapeBrink_MapScripts:: @ 8168775 + .byte 0 diff --git a/data/maps/TwoIsland_CapeBrink_House/scripts.inc b/data/maps/TwoIsland_CapeBrink_House/scripts.inc new file mode 100644 index 000000000..77b08f93d --- /dev/null +++ b/data/maps/TwoIsland_CapeBrink_House/scripts.inc @@ -0,0 +1,2 @@ +TwoIsland_CapeBrink_House_MapScripts:: @ 817206B + .byte 0 diff --git a/data/maps/TwoIsland_Harbor/scripts.inc b/data/maps/TwoIsland_Harbor/scripts.inc new file mode 100644 index 000000000..0fdd3694d --- /dev/null +++ b/data/maps/TwoIsland_Harbor/scripts.inc @@ -0,0 +1,11 @@ +TwoIsland_Harbor_MapScripts:: @ 8171805 + .byte 0 + +TwoIsland_Harbor_EventScript_171806:: @ 8171806 + lock + faceplayer + message Text_181726 + waitmessage + setvar VAR_0x8004, 2 + goto EventScript_1A8F54 + end diff --git a/data/maps/TwoIsland_House/scripts.inc b/data/maps/TwoIsland_House/scripts.inc new file mode 100644 index 000000000..907c02348 --- /dev/null +++ b/data/maps/TwoIsland_House/scripts.inc @@ -0,0 +1,143 @@ +TwoIsland_House_MapScripts:: @ 8171618 + .byte 0 + +TwoIsland_House_EventScript_171619:: @ 8171619 + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + special sub_8112364 + lock + faceplayer + clearflag FLAG_0x002 + clearflag FLAG_0x003 + clearflag FLAG_0x004 + checkflag FLAG_0x001 + goto_if 1, EventScript_17164F + loadword 0, gUnknown_81A2B88 + callstd 4 + setflag FLAG_0x001 + goto EventScript_17164F + end + +EventScript_17164F:: @ 817164F + checkitem ITEM_BIG_MUSHROOM, 1 + compare_var_to_value VAR_RESULT, 1 + call_if 1, EventScript_1717A8 + checkitem ITEM_TINY_MUSHROOM, 2 + compare_var_to_value VAR_RESULT, 1 + call_if 1, EventScript_1717AC + checkflag FLAG_0x002 + goto_if 1, EventScript_171687 + checkflag FLAG_0x003 + goto_if 1, EventScript_171696 + goto EventScript_17179E + end + +EventScript_171687:: @ 8171687 + checkflag FLAG_0x003 + call_if 1, EventScript_1717B0 + goto EventScript_1716A5 + end + +EventScript_171696:: @ 8171696 + checkflag FLAG_0x002 + call_if 1, EventScript_1717B0 + goto EventScript_1716A5 + end + +EventScript_1716A5:: @ 81716A5 + loadword 0, gUnknown_81A2C63 + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_17179E + goto EventScript_1716BE + end + +EventScript_1716BE:: @ 81716BE + loadword 0, gUnknown_81A2CC3 + callstd 4 + special sub_80BF93C + waitstate + compare_var_to_value VAR_0x8004, 6 + goto_if 4, EventScript_17179E + special sub_80BFC14 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_171790 + compare_var_to_value VAR_0x8005, 0 + goto_if 1, EventScript_171782 + goto EventScript_1716F4 + end + +EventScript_1716F4:: @ 81716F4 + loadword 0, gUnknown_81A2CE1 + callstd 4 + special sub_80E4634 + waitstate + compare_var_to_value VAR_0x8004, 0 + goto_if 1, EventScript_1716BE + checkflag FLAG_0x004 + goto_if 1, EventScript_17175B + checkflag FLAG_0x002 + goto_if 1, EventScript_171727 + checkflag FLAG_0x003 + goto_if 1, EventScript_171741 + end + +EventScript_171727:: @ 8171727 + removeitem ITEM_BIG_MUSHROOM, 1 + textcolor 3 + loadword 0, gUnknown_81A2DB3 + callstd 4 + call EventScript_1A6675 + goto EventScript_17179E + end + +EventScript_171741:: @ 8171741 + removeitem ITEM_TINY_MUSHROOM, 2 + textcolor 3 + loadword 0, gUnknown_81A2D85 + callstd 4 + call EventScript_1A6675 + goto EventScript_17179E + end + +EventScript_17175B:: @ 817175B + message Text_1A2D43 + waitmessage + multichoice 0, 0, 51, 1 + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_171741 + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_171727 + end + +EventScript_171782:: @ 8171782 + loadword 0, gUnknown_81A2CFC + callstd 4 + goto EventScript_1716BE + end + +EventScript_171790:: @ 8171790 + loadword 0, gUnknown_81A2E20 + callstd 4 + goto EventScript_1716BE + end + +EventScript_17179E:: @ 817179E + loadword 0, gUnknown_81A2DE0 + callstd 4 + release + end + +EventScript_1717A8:: @ 81717A8 + setflag FLAG_0x002 + return + +EventScript_1717AC:: @ 81717AC + setflag FLAG_0x003 + return + +EventScript_1717B0:: @ 81717B0 + setflag FLAG_0x004 + return diff --git a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc new file mode 100644 index 000000000..2d6b06c70 --- /dev/null +++ b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc @@ -0,0 +1,216 @@ +TwoIsland_JoyfulGameCorner_MapScripts:: @ 81713D0 + map_script 3, TwoIsland_JoyfulGameCorner_MapScript1_1713E5 + map_script 4, TwoIsland_JoyfulGameCorner_MapScript2_171404 + map_script 2, TwoIsland_JoyfulGameCorner_MapScript3_17141B + map_script 1, TwoIsland_JoyfulGameCorner_MapScript4_1BB237 + .byte 0 + +TwoIsland_JoyfulGameCorner_MapScript1_1713E5:: @ 81713E5 + checkflag FLAG_0x2FB + call_if 1, EventScript_1713EF + end + +EventScript_1713EF:: @ 81713EF + setobjectxyperm 1, 6, 2 + setobjectmovementtype 1, 8 + setobjectmovementtype 3, 1 + setvar VAR_0x4079, 4 + return + +TwoIsland_JoyfulGameCorner_MapScript2_171404:: @ 8171404 + map_script_2 VAR_0x4079, 2, EventScript_171416 + map_script_2 VAR_0x406F, 8, EventScript_1BB227 + .2byte 0 + +EventScript_171416:: @ 8171416 + turnobject 255, 2 + end + +TwoIsland_JoyfulGameCorner_MapScript3_17141B:: @ 817141B + map_script_2 VAR_0x4079, 0, EventScript_17145F + map_script_2 VAR_0x4079, 2, EventScript_171435 + map_script_2 VAR_0x406F, 8, EventScript_1BB2FD + .2byte 0 + +EventScript_171435:: @ 8171435 + lockall + textcolor 0 + loadword 0, gUnknown_81A28B2 + callstd 4 + textcolor 1 + special sub_80CA6DC + loadword 0, gUnknown_81A2931 + callstd 4 + closemessage + applymovement 3, Movement_1A75ED + waitmovement 0 + setvar VAR_0x4079, 3 + releaseall + end + +EventScript_17145F:: @ 817145F + lockall + textcolor 0 + applymovement 1, Movement_171520 + waitmovement 0 + loadword 0, gUnknown_81A2408 + callstd 4 + closemessage + applymovement 1, Movement_1A75ED + waitmovement 0 + playse SE_PIN + applymovement 1, Movement_1A75DB + waitmovement 0 + applymovement 1, Movement_1A75DD + waitmovement 0 + applymovement 1, Movement_171527 + waitmovement 0 + applymovement 255, Movement_1A75EB + waitmovement 0 + loadword 0, gUnknown_81A2465 + callstd 4 + closemessage + playse SE_DOOR + waitse + applymovement 255, Movement_17152C + waitmovement 0 + playbgm BGM_FRLG_BOY_EYE, 0 + addobject 2 + applymovement 2, Movement_17152F + waitmovement 0 + loadword 0, gUnknown_81A259A + callstd 4 + applymovement 2, Movement_1A75EB + waitmovement 0 + loadword 0, gUnknown_81A2658 + callstd 4 + loadword 0, gUnknown_81A26D5 + callstd 4 + closemessage + applymovement 2, Movement_1A75ED + waitmovement 0 + playse SE_KAIDAN + removeobject 2 + fadedefaultbgm + delay 60 + loadword 0, gUnknown_81A270C + callstd 4 + clearflag FLAG_0x091 + setvar VAR_0x407B, 2 + setvar VAR_0x4079, 1 + releaseall + end + +Movement_171520:: @ 8171520 + step_12 + step_13 + step_13 + step_1b + step_2e + step_1c + step_end + +Movement_171527:: @ 8171527 + step_10 + step_10 + step_10 + step_2f + step_end + +Movement_17152C:: @ 817152C + step_12 + step_30 + step_end + +Movement_17152F:: @ 817152F + step_2f + step_1b + step_30 + step_1b + step_2e + step_end + +TwoIsland_JoyfulGameCorner_EventScript_171535:: @ 8171535 + lock + faceplayer + compare_var_to_value VAR_0x4079, 4 + goto_if 1, EventScript_1BC060 + checkflag FLAG_0x2A3 + goto_if 1, EventScript_171555 + loadword 0, gUnknown_81A285C + callstd 4 + release + end + +EventScript_171555:: @ 8171555 + loadword 0, gUnknown_81A288A + callstd 4 + release + end + +TwoIsland_JoyfulGameCorner_EventScript_17155F:: @ 817155F + lock + faceplayer + compare_var_to_value VAR_0x4079, 4 + goto_if 1, EventScript_1BC0CE + checkflag FLAG_0x2FB + goto_if 1, EventScript_1715F5 + compare_var_to_value VAR_0x4079, 3 + goto_if 1, EventScript_17158A + loadword 0, gUnknown_81A2743 + callstd 4 + release + end + +EventScript_17158A:: @ 817158A + checkflag FLAG_0x2FE + goto_if 1, EventScript_1715C4 + loadword 0, gUnknown_81A296A + callstd 4 + setvar VAR_0x4076, 2 + textcolor 3 + playfanfare MUS_ME_WAZA + message Text_1A29F7 + waitmessage + waitfanfare + call EventScript_1A6675 + removeitem ITEM_METEORITE, 1 + loadword 0, gUnknown_81A2A24 + callstd 4 + goto EventScript_1715C4 + end + +EventScript_1715C4:: @ 81715C4 + checkitemspace ITEM_MOON_STONE, 1 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_1715FF + additem ITEM_MOON_STONE, 1 + setflag FLAG_0x2FB + loadword 0, gUnknown_81A2A9A + setorcopyvar VAR_0x8000, 94 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 257 + callstd 9 + release + end + +EventScript_1715F5:: @ 81715F5 + loadword 0, gUnknown_81A2AF5 + callstd 4 + release + end + +EventScript_1715FF:: @ 81715FF + setflag FLAG_0x2FE + loadword 0, gUnknown_81A2ACA + callstd 4 + release + end + +TwoIsland_JoyfulGameCorner_EventScript_17160C:: @ 817160C + lock + faceplayer + loadword 0, gUnknown_81A2B53 + callstd 4 + release + end diff --git a/data/maps/TwoIsland_PokemonCenter_1F/scripts.inc b/data/maps/TwoIsland_PokemonCenter_1F/scripts.inc new file mode 100644 index 000000000..3f4196829 --- /dev/null +++ b/data/maps/TwoIsland_PokemonCenter_1F/scripts.inc @@ -0,0 +1,25 @@ +TwoIsland_PokemonCenter_1F_MapScripts:: @ 81717B4 + map_script 3, TwoIsland_PokemonCenter_1F_MapScript1_1717BF + map_script 5, TwoIsland_PokemonCenter_1F_MapScript2_1BC05C + .byte 0 + +TwoIsland_PokemonCenter_1F_MapScript1_1717BF:: @ 81717BF + setrespawn 15 + end + +TwoIsland_PokemonCenter_1F_EventScript_1717C3:: @ 81717C3 + lock + faceplayer + call EventScript_1A6578 + release + end + +TwoIsland_PokemonCenter_1F_EventScript_1717CC:: @ 81717CC + loadword 0, gUnknown_81A2E59 + callstd 2 + end + +TwoIsland_PokemonCenter_1F_EventScript_1717D5:: @ 81717D5 + loadword 0, gUnknown_81A2EBE + callstd 2 + end diff --git a/data/maps/TwoIsland_PokemonCenter_2F/scripts.inc b/data/maps/TwoIsland_PokemonCenter_2F/scripts.inc new file mode 100644 index 000000000..b96339801 --- /dev/null +++ b/data/maps/TwoIsland_PokemonCenter_2F/scripts.inc @@ -0,0 +1,18 @@ +TwoIsland_PokemonCenter_2F_MapScripts:: @ 81717DE + map_script 2, TwoIsland_PokemonCenter_2F_MapScript1_1BB2A3 + map_script 4, TwoIsland_PokemonCenter_2F_MapScript2_1BB1ED + map_script 1, TwoIsland_PokemonCenter_2F_MapScript3_1BB237 + map_script 3, TwoIsland_PokemonCenter_2F_MapScript4_1BB1B4 + .byte 0 + +TwoIsland_PokemonCenter_2F_EventScript_1717F3:: @ 81717F3 + call EventScript_1BB4A3 + end + +EventScript_1717F9:: @ 81717F9 + call EventScript_1BB6AB + end + +EventScript_1717FF:: @ 81717FF + call EventScript_1BB7DE + end diff --git a/data/maps/UndergroundPath_EastEntrance/scripts.inc b/data/maps/UndergroundPath_EastEntrance/scripts.inc new file mode 100644 index 000000000..bb7b47f87 --- /dev/null +++ b/data/maps/UndergroundPath_EastEntrance/scripts.inc @@ -0,0 +1,7 @@ +UndergroundPath_EastEntrance_MapScripts:: @ 8160EDD + .byte 0 + +UndergroundPath_EastEntrance_EventScript_160EDE:: @ 8160EDE + loadword 0, gUnknown_81745D9 + callstd 2 + end diff --git a/data/maps/UndergroundPath_EastWestTunnel/scripts.inc b/data/maps/UndergroundPath_EastWestTunnel/scripts.inc new file mode 100644 index 000000000..14132bc0d --- /dev/null +++ b/data/maps/UndergroundPath_EastWestTunnel/scripts.inc @@ -0,0 +1,7 @@ +UndergroundPath_EastWestTunnel_MapScripts:: @ 8160ED3 + map_script 3, UndergroundPath_EastWestTunnel_MapScript1_160ED9 + .byte 0 + +UndergroundPath_EastWestTunnel_MapScript1_160ED9:: @ 8160ED9 + setworldmapflag 2216 + end diff --git a/data/maps/UndergroundPath_NorthEntrance/scripts.inc b/data/maps/UndergroundPath_NorthEntrance/scripts.inc new file mode 100644 index 000000000..38531be14 --- /dev/null +++ b/data/maps/UndergroundPath_NorthEntrance/scripts.inc @@ -0,0 +1,45 @@ +UndergroundPath_NorthEntrance_MapScripts:: @ 8160E38 + .byte 0 + +UndergroundPath_NorthEntrance_EventScript_160E39:: @ 8160E39 + lock + faceplayer + setvar VAR_0x8008, 2 + call EventScript_1A8CAD + checkflag FLAG_0x24B + goto_if 1, EventScript_160EAB + loadword 0, gUnknown_81A5AD6 + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_160E93 + call EventScript_1A8CBD + compare_var_to_value VAR_0x8004, 6 + goto_if 4, EventScript_160E93 + call EventScript_1A8CC9 + compare_var_to_var VAR_RESULT, VAR_0x8009 + goto_if 5, EventScript_160E9D + call EventScript_1A8CD9 + loadword 0, gUnknown_81A5B4A + callstd 4 + setflag FLAG_0x24B + release + end + +EventScript_160E93:: @ 8160E93 + loadword 0, gUnknown_81A5B08 + callstd 4 + release + end + +EventScript_160E9D:: @ 8160E9D + getspeciesname 0, 32777 + loadword 0, gUnknown_81A5B18 + callstd 4 + release + end + +EventScript_160EAB:: @ 8160EAB + loadword 0, gUnknown_81A5B60 + callstd 4 + release + end diff --git a/data/maps/UndergroundPath_NorthSouthTunnel/scripts.inc b/data/maps/UndergroundPath_NorthSouthTunnel/scripts.inc new file mode 100644 index 000000000..237373dc8 --- /dev/null +++ b/data/maps/UndergroundPath_NorthSouthTunnel/scripts.inc @@ -0,0 +1,7 @@ +UndergroundPath_NorthSouthTunnel_MapScripts:: @ 8160EB5 + map_script 3, UndergroundPath_NorthSouthTunnel_MapScript1_160EBB + .byte 0 + +UndergroundPath_NorthSouthTunnel_MapScript1_160EBB:: @ 8160EBB + setworldmapflag 2215 + end diff --git a/data/maps/UndergroundPath_SouthEntrance/scripts.inc b/data/maps/UndergroundPath_SouthEntrance/scripts.inc new file mode 100644 index 000000000..c425e67d4 --- /dev/null +++ b/data/maps/UndergroundPath_SouthEntrance/scripts.inc @@ -0,0 +1,7 @@ +UndergroundPath_SouthEntrance_MapScripts:: @ 8160EBF + .byte 0 + +UndergroundPath_SouthEntrance_EventScript_160EC0:: @ 8160EC0 + loadword 0, gUnknown_8174559 + callstd 2 + end diff --git a/data/maps/UndergroundPath_WestEntrance/scripts.inc b/data/maps/UndergroundPath_WestEntrance/scripts.inc new file mode 100644 index 000000000..77a20cf4b --- /dev/null +++ b/data/maps/UndergroundPath_WestEntrance/scripts.inc @@ -0,0 +1,7 @@ +UndergroundPath_WestEntrance_MapScripts:: @ 8160EC9 + .byte 0 + +UndergroundPath_WestEntrance_EventScript_160ECA:: @ 8160ECA + loadword 0, gUnknown_817459B + callstd 2 + end diff --git a/data/maps/UnknownMap_00_00/scripts.inc b/data/maps/UnknownMap_00_00/scripts.inc new file mode 100644 index 000000000..73507301f --- /dev/null +++ b/data/maps/UnknownMap_00_00/scripts.inc @@ -0,0 +1,2 @@ +UnknownMap_00_00_MapScripts:: @ 8160478 + .byte 0 diff --git a/data/maps/UnknownMap_00_01/scripts.inc b/data/maps/UnknownMap_00_01/scripts.inc new file mode 100644 index 000000000..c419b60c7 --- /dev/null +++ b/data/maps/UnknownMap_00_01/scripts.inc @@ -0,0 +1,2 @@ +UnknownMap_00_01_MapScripts:: @ 8160479 + .byte 0 diff --git a/data/maps/UnknownMap_00_02/scripts.inc b/data/maps/UnknownMap_00_02/scripts.inc new file mode 100644 index 000000000..ab36a21eb --- /dev/null +++ b/data/maps/UnknownMap_00_02/scripts.inc @@ -0,0 +1,2 @@ +UnknownMap_00_02_MapScripts:: @ 816047A + .byte 0 diff --git a/data/maps/UnknownMap_00_03/scripts.inc b/data/maps/UnknownMap_00_03/scripts.inc new file mode 100644 index 000000000..feca41b0f --- /dev/null +++ b/data/maps/UnknownMap_00_03/scripts.inc @@ -0,0 +1,2 @@ +UnknownMap_00_03_MapScripts:: @ 816047B + .byte 0 diff --git a/data/maps/UnknownMap_00_04/scripts.inc b/data/maps/UnknownMap_00_04/scripts.inc new file mode 100644 index 000000000..739bdee00 --- /dev/null +++ b/data/maps/UnknownMap_00_04/scripts.inc @@ -0,0 +1,106 @@ +UnknownMap_00_04_MapScripts:: @ 816047C + map_script 5, UnknownMap_00_04_MapScript1_160487 + map_script 3, UnknownMap_00_04_MapScript2_1604BB + .byte 0 + +UnknownMap_00_04_MapScript1_160487:: @ 8160487 + setflag FLAG_0x063 + setflag FLAG_0x064 + setflag FLAG_0x065 + setflag FLAG_0x066 + setflag FLAG_0x067 + setflag FLAG_0x068 + setflag FLAG_0x069 + setflag FLAG_0x06A + removeobject 9 + removeobject 8 + removeobject 7 + removeobject 2 + removeobject 6 + removeobject 5 + removeobject 4 + removeobject 3 + special UnionRoomSpecial + end + +UnknownMap_00_04_MapScript2_1604BB:: @ 81604BB + end + +UnknownMap_00_04_EventScript_1604BC:: @ 81604BC + lock + faceplayer + setvar VAR_RESULT, 1 + waitstate + release + end + +UnknownMap_00_04_EventScript_1604C6:: @ 81604C6 + lock + faceplayer + setvar VAR_RESULT, 2 + waitstate + release + end + +UnknownMap_00_04_EventScript_1604D0:: @ 81604D0 + lock + faceplayer + setvar VAR_RESULT, 3 + waitstate + release + end + +UnknownMap_00_04_EventScript_1604DA:: @ 81604DA + lock + faceplayer + setvar VAR_RESULT, 4 + waitstate + release + end + +UnknownMap_00_04_EventScript_1604E4:: @ 81604E4 + lock + faceplayer + setvar VAR_RESULT, 5 + waitstate + release + end + +UnknownMap_00_04_EventScript_1604EE:: @ 81604EE + lock + faceplayer + setvar VAR_RESULT, 6 + waitstate + release + end + +UnknownMap_00_04_EventScript_1604F8:: @ 81604F8 + lock + faceplayer + setvar VAR_RESULT, 7 + waitstate + release + end + +UnknownMap_00_04_EventScript_160502:: @ 8160502 + lock + faceplayer + setvar VAR_RESULT, 8 + waitstate + release + end + +UnknownMap_00_04_EventScript_16050C:: @ 816050C + lock + faceplayer + setvar VAR_RESULT, 9 + waitstate + release + end + +UnknownMap_00_04_EventScript_160516:: @ 8160516 + lockall + setvar VAR_RESULT, 10 + waitstate + releaseall + end diff --git a/data/maps/UnknownMap_03_50/scripts.inc b/data/maps/UnknownMap_03_50/scripts.inc new file mode 100644 index 000000000..c18211933 --- /dev/null +++ b/data/maps/UnknownMap_03_50/scripts.inc @@ -0,0 +1,2 @@ +UnknownMap_03_50_MapScripts:: @ 81687E0 + .byte 0 diff --git a/data/maps/UnknownMap_03_51/scripts.inc b/data/maps/UnknownMap_03_51/scripts.inc new file mode 100644 index 000000000..09f9ef2d4 --- /dev/null +++ b/data/maps/UnknownMap_03_51/scripts.inc @@ -0,0 +1,2 @@ +UnknownMap_03_51_MapScripts:: @ 81687E1 + .byte 0 diff --git a/data/maps/UnknownMap_03_52/scripts.inc b/data/maps/UnknownMap_03_52/scripts.inc new file mode 100644 index 000000000..15fc8b160 --- /dev/null +++ b/data/maps/UnknownMap_03_52/scripts.inc @@ -0,0 +1,2 @@ +UnknownMap_03_52_MapScripts:: @ 81687E2 + .byte 0 diff --git a/data/maps/UnknownMap_03_53/scripts.inc b/data/maps/UnknownMap_03_53/scripts.inc new file mode 100644 index 000000000..2ef4453ea --- /dev/null +++ b/data/maps/UnknownMap_03_53/scripts.inc @@ -0,0 +1,2 @@ +UnknownMap_03_53_MapScripts:: @ 81687E3 + .byte 0 diff --git a/data/maps/UnknownMap_18_01/scripts.inc b/data/maps/UnknownMap_18_01/scripts.inc new file mode 100644 index 000000000..461deaf9b --- /dev/null +++ b/data/maps/UnknownMap_18_01/scripts.inc @@ -0,0 +1,2 @@ +UnknownMap_18_01_MapScripts:: @ 816FA8C + .byte 0 diff --git a/data/maps/UnusedHouse_27_00/scripts.inc b/data/maps/UnusedHouse_27_00/scripts.inc new file mode 100644 index 000000000..02c992573 --- /dev/null +++ b/data/maps/UnusedHouse_27_00/scripts.inc @@ -0,0 +1,2 @@ +UnusedHouse_27_00_MapScripts:: @ 81704FA + .byte 0 diff --git a/data/maps/UnusedHouse_29_00/scripts.inc b/data/maps/UnusedHouse_29_00/scripts.inc new file mode 100644 index 000000000..7e984394b --- /dev/null +++ b/data/maps/UnusedHouse_29_00/scripts.inc @@ -0,0 +1,2 @@ +UnusedHouse_29_00_MapScripts:: @ 8170522 + .byte 0 diff --git a/data/maps/UnusedHouse_31_05/scripts.inc b/data/maps/UnusedHouse_31_05/scripts.inc new file mode 100644 index 000000000..11dae233d --- /dev/null +++ b/data/maps/UnusedHouse_31_05/scripts.inc @@ -0,0 +1,2 @@ +UnusedHouse_31_05_MapScripts:: @ 8170BE3 + .byte 0 diff --git a/data/maps/VermilionCity/scripts.inc b/data/maps/VermilionCity/scripts.inc new file mode 100644 index 000000000..b516e0939 --- /dev/null +++ b/data/maps/VermilionCity/scripts.inc @@ -0,0 +1,330 @@ +VermilionCity_MapScripts:: @ 81668DC + map_script 3, VermilionCity_MapScript1_166906 + map_script 2, VermilionCity_MapScript2_1668E7 + .byte 0 + +VermilionCity_MapScript2_1668E7:: @ 81668E7 + map_script_2 VAR_0x407E, 2, EventScript_1668F1 + .2byte 0 + +EventScript_1668F1:: @ 81668F1 + lockall + applymovement 255, Movement_166903 + waitmovement 0 + setvar VAR_0x407E, 3 + releaseall + end + +Movement_166903:: @ 8166903 + step_11 + step_11 + step_end + +VermilionCity_MapScript1_166906:: @ 8166906 + setworldmapflag 2197 + checkflag FLAG_0x2F9 + call_if 1, EventScript_166913 + end + +EventScript_166913:: @ 8166913 + setflag FLAG_0x0A1 + return + +VermilionCity_EventScript_166917:: @ 8166917 + loadword 0, gUnknown_817F723 + callstd 2 + end + +VermilionCity_EventScript_166920:: @ 8166920 + lock + faceplayer + compare_var_to_value VAR_0x407E, 3 + goto_if 1, EventScript_166937 + loadword 0, gUnknown_817F776 + callstd 4 + release + end + +EventScript_166937:: @ 8166937 + loadword 0, gUnknown_817F7A6 + callstd 4 + release + end + +VermilionCity_EventScript_166941:: @ 8166941 + lock + faceplayer + compare_var_to_value VAR_0x407E, 3 + goto_if 1, EventScript_166996 + loadword 0, gUnknown_817FA22 + callstd 4 + release + end + +EventScript_166958:: @ 8166958 + checkflag 2122 + goto_if 0, EventScript_1A77B0 + checkitem ITEM_MYSTIC_TICKET, 1 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_1A77B0 + goto EventScript_1A77AA + end + +EventScript_166977:: @ 8166977 + checkflag 2123 + goto_if 0, EventScript_1A77B0 + checkitem ITEM_AURORA_TICKET, 1 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_1A77B0 + goto EventScript_1A77AA + end + +EventScript_166996:: @ 8166996 + setvar VAR_0x8004, 0 + compare_var_to_value VAR_0x4076, 5 + goto_if 4, EventScript_1669BB + compare_var_to_value VAR_0x4076, 1 + goto_if 4, EventScript_166B3B + loadword 0, gUnknown_817FB10 + callstd 4 + release + end + +EventScript_1669BB:: @ 81669BB + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + special sub_8112364 + call EventScript_166958 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_1669FD + call EventScript_166977 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_166A5F + setvar VAR_0x8004, 0 + message Text_17FBB8 + waitmessage + goto EventScript_1A911E + end + +EventScript_1669FD:: @ 81669FD + call EventScript_166977 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_166AB1 + checkflag FLAG_0x2F0 + call_if 0, EventScript_166A53 + message Text_17FCC1 + waitmessage + multichoice 17, 6, 54, 0 + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_1A911E + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_166B0B + compare_var_to_value VAR_0x8000, 2 + goto_if 1, EventScript_1A90F6 + compare_var_to_value VAR_0x8000, 127 + goto_if 1, EventScript_1A90F6 + end + +EventScript_166A53:: @ 8166A53 + setflag FLAG_0x2F0 + loadword 0, gUnknown_817FC00 + callstd 4 + return + +EventScript_166A5F:: @ 8166A5F + checkflag FLAG_0x2F1 + call_if 0, EventScript_166AA5 + message Text_17FCC1 + waitmessage + multichoice 13, 6, 55, 0 + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_1A911E + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_166B23 + compare_var_to_value VAR_0x8000, 2 + goto_if 1, EventScript_1A90F6 + compare_var_to_value VAR_0x8000, 127 + goto_if 1, EventScript_1A90F6 + end + +EventScript_166AA5:: @ 8166AA5 + setflag FLAG_0x2F1 + loadword 0, gUnknown_817FC5F + callstd 4 + return + +EventScript_166AB1:: @ 8166AB1 + checkflag FLAG_0x2F0 + call_if 0, EventScript_166A53 + checkflag FLAG_0x2F1 + call_if 0, EventScript_166AA5 + message Text_17FCC1 + waitmessage + multichoice 13, 5, 56, 0 + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_1A911E + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_166B0B + compare_var_to_value VAR_0x8000, 2 + goto_if 1, EventScript_166B23 + compare_var_to_value VAR_0x8000, 3 + goto_if 1, EventScript_1A90F6 + compare_var_to_value VAR_0x8000, 127 + goto_if 1, EventScript_1A90F6 + end + +EventScript_166B0B:: @ 8166B0B + loadword 0, gUnknown_817FCEC + callstd 4 + setvar VAR_0x8004, 0 + setvar VAR_0x8006, 9 + goto EventScript_1A90DA + end + +EventScript_166B23:: @ 8166B23 + loadword 0, gUnknown_817FD5F + callstd 4 + setvar VAR_0x8004, 0 + setvar VAR_0x8006, 10 + goto EventScript_1A90DA + end + +EventScript_166B3B:: @ 8166B3B + message Text_17FB23 + waitmessage + setvar VAR_0x8004, 0 + multichoice 19, 5, 57, 0 + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_1A8FEE + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_1A8FF9 + compare_var_to_value VAR_0x8000, 2 + goto_if 1, EventScript_1A9004 + compare_var_to_value VAR_0x8000, 3 + goto_if 1, EventScript_1A90F6 + compare_var_to_value VAR_0x8000, 127 + goto_if 1, EventScript_1A90F6 + end + +EventScript_166B88:: @ 8166B88 + release + end + +VermilionCity_EventScript_166B8A:: @ 8166B8A + lockall + goto EventScript_166BA0 + end + +VermilionCity_EventScript_166B91:: @ 8166B91 + lockall + goto EventScript_166BA0 + end + +VermilionCity_EventScript_166B98:: @ 8166B98 + lockall + setvar VAR_0x4053, 0 + releaseall + end + +EventScript_166BA0:: @ 8166BA0 + textcolor 0 + applymovement 6, Movement_1A75E7 + applymovement 255, Movement_1A75EB + waitmovement 0 + compare_var_to_value VAR_0x407E, 3 + goto_if 1, EventScript_166BED + loadword 0, gUnknown_817FA3C + callstd 4 + checkflag FLAG_0x234 + goto_if 0, EventScript_166BDE + loadword 0, gUnknown_817FA77 + callstd 4 + setvar VAR_0x4053, 1 + releaseall + end + +EventScript_166BDE:: @ 8166BDE + loadword 0, gUnknown_817FABA + callstd 4 + closemessage + goto EventScript_1A9108 + end + +EventScript_166BED:: @ 8166BED + setvar VAR_0x8004, 0 + compare_var_to_value VAR_0x4076, 5 + goto_if 4, EventScript_1669BB + compare_var_to_value VAR_0x4076, 1 + goto_if 4, EventScript_166B3B + loadword 0, gUnknown_817FB10 + callstd 4 + closemessage + goto EventScript_1A9108 + end + +VermilionCity_EventScript_166C17:: @ 8166C17 + loadword 0, gUnknown_817F8AC + callstd 2 + end + +VermilionCity_EventScript_166C20:: @ 8166C20 + lock + faceplayer + setflag FLAG_0x2F9 + loadword 0, gUnknown_817FDD2 + callstd 4 + release + end + +VermilionCity_EventScript_166C2F:: @ 8166C2F + loadword 0, gUnknown_817F7FD + callstd 2 + end + +VermilionCity_EventScript_166C38:: @ 8166C38 + lock + faceplayer + waitse + playmoncry SPECIES_MACHOP, 0 + loadword 0, gUnknown_817F871 + callstd 4 + waitmoncry + loadword 0, gUnknown_817F888 + callstd 4 + release + end + +VermilionCity_EventScript_166C53:: @ 8166C53 + loadword 0, gUnknown_817F8FB + callstd 3 + end + +VermilionCity_EventScript_166C5C:: @ 8166C5C + loadword 0, gUnknown_817F928 + callstd 3 + end + +VermilionCity_EventScript_166C65:: @ 8166C65 + loadword 0, gUnknown_817F9A1 + callstd 3 + end + +VermilionCity_EventScript_166C6E:: @ 8166C6E + lockall + setvar VAR_0x8004, 4 + setvar VAR_0x8005, 0 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_817F9CC + callstd 4 + releaseall + end + +VermilionCity_EventScript_166C86:: @ 8166C86 + loadword 0, gUnknown_817FA11 + callstd 3 + end diff --git a/data/maps/VermilionCity_Gym/scripts.inc b/data/maps/VermilionCity_Gym/scripts.inc new file mode 100644 index 000000000..3d8cd6a52 --- /dev/null +++ b/data/maps/VermilionCity_Gym/scripts.inc @@ -0,0 +1,329 @@ +VermilionCity_Gym_MapScripts:: @ 816B69E + map_script 1, VermilionCity_Gym_MapScript1_16B6A9 + map_script 3, VermilionCity_Gym_MapScript2_16B772 + .byte 0 + +VermilionCity_Gym_MapScript1_16B6A9:: @ 816B6A9 + checkflag FLAG_0x001 + call_if 1, EventScript_16B6BC + checkflag FLAG_0x264 + call_if 1, EventScript_16B717 + end + +EventScript_16B6BC:: @ 816B6BC + setmetatile 3, 6, 699, 1 + setmetatile 4, 6, 700, 1 + setmetatile 5, 6, 701, 1 + setmetatile 6, 6, 702, 1 + setmetatile 7, 6, 703, 1 + setmetatile 3, 7, 707, 1 + setmetatile 4, 7, 708, 1 + setmetatile 5, 7, 709, 1 + setmetatile 6, 7, 710, 1 + setmetatile 7, 7, 711, 1 + return + +EventScript_16B717:: @ 816B717 + setmetatile 3, 6, 659, 1 + setmetatile 4, 6, 660, 0 + setmetatile 5, 6, 641, 0 + setmetatile 6, 6, 661, 0 + setmetatile 7, 6, 662, 1 + setmetatile 3, 7, 667, 1 + setmetatile 4, 7, 668, 0 + setmetatile 5, 7, 641, 0 + setmetatile 6, 7, 669, 0 + setmetatile 7, 7, 670, 1 + return + +VermilionCity_Gym_MapScript2_16B772:: @ 816B772 + call EventScript_16B778 + end + +EventScript_16B778:: @ 816B778 + checkflag FLAG_0x264 + goto_if 1, EventScript_1A77A9 + special sub_80CADEC + copyvar VAR_0x4000, VAR_0x8004 + copyvar VAR_0x4001, VAR_0x8005 + return + +VermilionCity_Gym_EventScript_16B78F:: @ 816B78F + lockall + setvar VAR_0x8008, 1 + goto EventScript_16B843 + end + +VermilionCity_Gym_EventScript_16B79B:: @ 816B79B + lockall + setvar VAR_0x8008, 2 + goto EventScript_16B843 + end + +VermilionCity_Gym_EventScript_16B7A7:: @ 816B7A7 + lockall + setvar VAR_0x8008, 3 + goto EventScript_16B843 + end + +VermilionCity_Gym_EventScript_16B7B3:: @ 816B7B3 + lockall + setvar VAR_0x8008, 4 + goto EventScript_16B843 + end + +VermilionCity_Gym_EventScript_16B7BF:: @ 816B7BF + lockall + setvar VAR_0x8008, 5 + goto EventScript_16B843 + end + +VermilionCity_Gym_EventScript_16B7CB:: @ 816B7CB + lockall + setvar VAR_0x8008, 6 + goto EventScript_16B843 + end + +VermilionCity_Gym_EventScript_16B7D7:: @ 816B7D7 + lockall + setvar VAR_0x8008, 7 + goto EventScript_16B843 + end + +VermilionCity_Gym_EventScript_16B7E3:: @ 816B7E3 + lockall + setvar VAR_0x8008, 8 + goto EventScript_16B843 + end + +VermilionCity_Gym_EventScript_16B7EF:: @ 816B7EF + lockall + setvar VAR_0x8008, 9 + goto EventScript_16B843 + end + +VermilionCity_Gym_EventScript_16B7FB:: @ 816B7FB + lockall + setvar VAR_0x8008, 10 + goto EventScript_16B843 + end + +VermilionCity_Gym_EventScript_16B807:: @ 816B807 + lockall + setvar VAR_0x8008, 11 + goto EventScript_16B843 + end + +VermilionCity_Gym_EventScript_16B813:: @ 816B813 + lockall + setvar VAR_0x8008, 12 + goto EventScript_16B843 + end + +VermilionCity_Gym_EventScript_16B81F:: @ 816B81F + lockall + setvar VAR_0x8008, 13 + goto EventScript_16B843 + end + +VermilionCity_Gym_EventScript_16B82B:: @ 816B82B + lockall + setvar VAR_0x8008, 14 + goto EventScript_16B843 + end + +VermilionCity_Gym_EventScript_16B837:: @ 816B837 + lockall + setvar VAR_0x8008, 15 + goto EventScript_16B843 + end + +EventScript_16B843:: @ 816B843 + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + special sub_8112364 + copyvar VAR_0x8004, VAR_0x4000 + copyvar VAR_0x8005, VAR_0x4001 + checkflag FLAG_0x264 + goto_if 1, EventScript_16B8E5 + checkflag FLAG_0x001 + goto_if 1, EventScript_16B89E + compare_var_to_var VAR_0x8004, VAR_0x8008 + goto_if 1, EventScript_16B885 + loadword 0, gUnknown_8195289 + callstd 4 + releaseall + end + +EventScript_16B885:: @ 816B885 + loadword 0, gUnknown_81952A8 + callstd 4 + playse SE_PIN + waitse + call EventScript_16B6BC + special DrawWholeMapView + setflag FLAG_0x001 + releaseall + end + +EventScript_16B89E:: @ 816B89E + compare_var_to_var VAR_0x8005, VAR_0x8008 + goto_if 1, EventScript_16B8CB + loadword 0, gUnknown_819536C + callstd 4 + clearflag FLAG_0x001 + special sub_80CADEC + copyvar VAR_0x4000, VAR_0x8004 + copyvar VAR_0x4001, VAR_0x8005 + call EventScript_16B8EF + special DrawWholeMapView + releaseall + end + +EventScript_16B8CB:: @ 816B8CB + loadword 0, gUnknown_8195330 + callstd 4 + closemessage + call EventScript_16B717 + special DrawWholeMapView + playse SE_FU_ZAKU2 + waitse + setflag FLAG_0x264 + releaseall + end + +EventScript_16B8E5:: @ 816B8E5 + loadword 0, gUnknown_8195289 + callstd 4 + releaseall + end + +EventScript_16B8EF:: @ 816B8EF + setmetatile 3, 6, 681, 1 + setmetatile 4, 6, 682, 1 + setmetatile 5, 6, 645, 1 + setmetatile 6, 6, 683, 1 + setmetatile 7, 6, 684, 1 + setmetatile 3, 7, 689, 1 + setmetatile 4, 7, 690, 1 + setmetatile 5, 7, 653, 1 + setmetatile 6, 7, 691, 1 + setmetatile 7, 7, 692, 1 + return + +VermilionCity_Gym_EventScript_16B94A:: @ 816B94A + setvar VAR_0x8004, 4 + setvar VAR_0x8005, 2 + special UpdatePickStateFromSpecialVar8005 + trainerbattle 1, 416, 0, Text_194BA4, Text_194E03, EventScript_16B97C + checkflag FLAG_0x231 + goto_if 0, EventScript_16B9AF + loadword 0, gUnknown_8194C8E + callstd 4 + release + end + +EventScript_16B97C:: @ 816B97C + setvar VAR_0x8004, 4 + setvar VAR_0x8005, 1 + special SetFlavorTextFlagFromSpecialVars + checkflag FLAG_0x23B + call_if 0, EventScript_16B9AB + clearflag FLAG_0x0A0 + setflag FLAG_0x4B2 + setflag 2082 + setvar VAR_0x8008, 3 + call EventScript_1A6B18 + goto EventScript_16B9AF + end + +EventScript_16B9AB:: @ 816B9AB + clearflag FLAG_0x0A1 + return + +EventScript_16B9AF:: @ 816B9AF + loadword 0, gUnknown_8194CFA + callstd 4 + checkitemspace ITEM_TM34, 1 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16B9F0 + additem ITEM_TM34, 1 + loadword 0, gUnknown_8194D87 + setorcopyvar VAR_0x8000, 322 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 257 + callstd 9 + setflag FLAG_0x231 + loadword 0, gUnknown_8194DA8 + callstd 4 + release + end + +EventScript_16B9F0:: @ 816B9F0 + loadword 0, gUnknown_8194DE3 + callstd 4 + release + end + +VermilionCity_Gym_EventScript_16B9FA:: @ 816B9FA + trainerbattle 0, 141, 0, Text_194FBD, Text_194FF1 + setvar VAR_0x8004, 4 + setvar VAR_0x8005, 4 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_8195004 + callstd 6 + end + +VermilionCity_Gym_EventScript_16BA1E:: @ 816BA1E + trainerbattle 0, 220, 0, Text_194F1F, Text_194F6F + loadword 0, gUnknown_8194F76 + callstd 6 + end + +VermilionCity_Gym_EventScript_16BA35:: @ 816BA35 + trainerbattle 2, 423, 0, Text_194E57, Text_194EA5, EventScript_16BA5D + setvar VAR_0x8004, 4 + setvar VAR_0x8005, 3 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_8194EBD + callstd 6 + end + +EventScript_16BA5D:: @ 816BA5D + setvar VAR_0x8004, 4 + setvar VAR_0x8005, 2 + special SetFlavorTextFlagFromSpecialVars + release + end + +VermilionCity_Gym_EventScript_16BA6C:: @ 816BA6C + lock + faceplayer + checkflag FLAG_0x4B2 + goto_if 1, EventScript_16BA81 + loadword 0, gUnknown_81950B4 + callstd 4 + release + end + +EventScript_16BA81:: @ 816BA81 + loadword 0, gUnknown_81951EC + callstd 4 + release + end + +VermilionCity_Gym_EventScript_16BA8B:: @ 816BA8B + lockall + checkflag 2082 + goto_if 1, EventScript_16BA9F + loadword 0, gUnknown_819520B + callstd 4 + releaseall + end + +EventScript_16BA9F:: @ 816BA9F + loadword 0, gUnknown_8195248 + callstd 4 + releaseall + end diff --git a/data/maps/VermilionCity_House1/scripts.inc b/data/maps/VermilionCity_House1/scripts.inc new file mode 100644 index 000000000..984961c29 --- /dev/null +++ b/data/maps/VermilionCity_House1/scripts.inc @@ -0,0 +1,46 @@ +VermilionCity_House1_MapScripts:: @ 816B3A6 + .byte 0 + +VermilionCity_House1_EventScript_16B3A7:: @ 816B3A7 + lock + faceplayer + checkflag FLAG_0x240 + goto_if 1, EventScript_16B3CF + loadword 0, gUnknown_8193EC1 + callstd 5 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16B3D9 + loadword 0, gUnknown_8194028 + callstd 4 + release + end + +EventScript_16B3CF:: @ 816B3CF + loadword 0, gUnknown_8194045 + callstd 4 + release + end + +EventScript_16B3D9:: @ 816B3D9 + checkitemspace ITEM_OLD_ROD, 1 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16B41A + additem ITEM_OLD_ROD, 1 + loadword 0, gUnknown_8193F2A + callstd 4 + loadword 0, gUnknown_8193F81 + setorcopyvar VAR_0x8000, 262 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 257 + callstd 9 + setflag FLAG_0x240 + loadword 0, gUnknown_8193FAF + callstd 4 + release + end + +EventScript_16B41A:: @ 816B41A + loadword 0, gUnknown_819406F + callstd 4 + release + end diff --git a/data/maps/VermilionCity_House2/scripts.inc b/data/maps/VermilionCity_House2/scripts.inc new file mode 100644 index 000000000..9179fa716 --- /dev/null +++ b/data/maps/VermilionCity_House2/scripts.inc @@ -0,0 +1 @@ +@ .include "data/maps/VermilionCity_House2/scripts.inc" diff --git a/data/maps/VermilionCity_House3/scripts.inc b/data/maps/VermilionCity_House3/scripts.inc new file mode 100644 index 000000000..0624992be --- /dev/null +++ b/data/maps/VermilionCity_House3/scripts.inc @@ -0,0 +1,28 @@ +VermilionCity_House3_MapScripts:: @ 816BAA9 + .byte 0 + +VermilionCity_House3_EventScript_16BAAA:: @ 816BAAA + loadword 0, gUnknown_81953AF + callstd 2 + end + +VermilionCity_House3_EventScript_16BAB3:: @ 816BAB3 + loadword 0, gUnknown_8195471 + callstd 2 + end + +VermilionCity_House3_EventScript_16BABC:: @ 816BABC + lock + faceplayer + waitse + playmoncry SPECIES_PIDGEY, 0 + loadword 0, gUnknown_81953EE + callstd 4 + waitmoncry + release + end + +VermilionCity_House3_EventScript_16BACF:: @ 816BACF + loadword 0, gUnknown_8195400 + callstd 3 + end diff --git a/data/maps/VermilionCity_Mart/scripts.inc b/data/maps/VermilionCity_Mart/scripts.inc new file mode 100644 index 000000000..712e0c6df --- /dev/null +++ b/data/maps/VermilionCity_Mart/scripts.inc @@ -0,0 +1,39 @@ +VermilionCity_Mart_MapScripts:: @ 816B653 + .byte 0 + +VermilionCity_Mart_EventScript_16B654:: @ 816B654 + loadword 0, gUnknown_8194B65 + callstd 2 + end + +VermilionCity_Mart_EventScript_16B65D:: @ 816B65D + loadword 0, gUnknown_8194A77 + callstd 2 + end + +VermilionCity_Mart_EventScript_16B666:: @ 816B666 + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + lock + faceplayer + message Text_1A6211 + waitmessage + pokemart Items_16B68C + loadword 0, gUnknown_81A5190 + callstd 4 + release + end + + .align 2 +Items_16B68C:: @ 816B68C + .2byte ITEM_POKE_BALL + .2byte ITEM_SUPER_POTION + .2byte ITEM_ANTIDOTE + .2byte ITEM_PARALYZE_HEAL + .2byte ITEM_AWAKENING + .2byte ITEM_ICE_HEAL + .2byte ITEM_REPEL + .2byte ITEM_NONE + release + end diff --git a/data/maps/VermilionCity_PokemonCenter_1F/scripts.inc b/data/maps/VermilionCity_PokemonCenter_1F/scripts.inc new file mode 100644 index 000000000..d6a5c01f2 --- /dev/null +++ b/data/maps/VermilionCity_PokemonCenter_1F/scripts.inc @@ -0,0 +1,30 @@ +VermilionCity_PokemonCenter_1F_MapScripts:: @ 816B424 + map_script 3, VermilionCity_PokemonCenter_1F_MapScript1_16B42F + map_script 5, VermilionCity_PokemonCenter_1F_MapScript2_1BC05C + .byte 0 + +VermilionCity_PokemonCenter_1F_MapScript1_16B42F:: @ 816B42F + setrespawn 6 + end + +VermilionCity_PokemonCenter_1F_EventScript_16B433:: @ 816B433 + lock + faceplayer + call EventScript_1A6578 + release + end + +VermilionCity_PokemonCenter_1F_EventScript_16B43C:: @ 816B43C + loadword 0, gUnknown_8194145 + callstd 2 + end + +VermilionCity_PokemonCenter_1F_EventScript_16B445:: @ 816B445 + loadword 0, gUnknown_81940AF + callstd 2 + end + +VermilionCity_PokemonCenter_1F_EventScript_16B44E:: @ 816B44E + loadword 0, gUnknown_8194180 + callstd 2 + end diff --git a/data/maps/VermilionCity_PokemonCenter_2F/scripts.inc b/data/maps/VermilionCity_PokemonCenter_2F/scripts.inc new file mode 100644 index 000000000..d6ddecd4a --- /dev/null +++ b/data/maps/VermilionCity_PokemonCenter_2F/scripts.inc @@ -0,0 +1,18 @@ +VermilionCity_PokemonCenter_2F_MapScripts:: @ 816B457 + map_script 2, VermilionCity_PokemonCenter_2F_MapScript1_1BB2A3 + map_script 4, VermilionCity_PokemonCenter_2F_MapScript2_1BB1ED + map_script 1, VermilionCity_PokemonCenter_2F_MapScript3_1BB237 + map_script 3, VermilionCity_PokemonCenter_2F_MapScript4_1BB1B4 + .byte 0 + +VermilionCity_PokemonCenter_2F_EventScript_16B46C:: @ 816B46C + call EventScript_1BB4A3 + end + +EventScript_16B472:: @ 816B472 + call EventScript_1BB6AB + end + +EventScript_16B478:: @ 816B478 + call EventScript_1BB7DE + end diff --git a/data/maps/VermilionCity_PokemonFanClub/scripts.inc b/data/maps/VermilionCity_PokemonFanClub/scripts.inc new file mode 100644 index 000000000..d963b6ef3 --- /dev/null +++ b/data/maps/VermilionCity_PokemonFanClub/scripts.inc @@ -0,0 +1,191 @@ +VermilionCity_PokemonFanClub_MapScripts:: @ 816B47E + .byte 0 + +VermilionCity_PokemonFanClub_EventScript_16B47F:: @ 816B47F + lock + faceplayer + checkflag FLAG_0x241 + goto_if 1, EventScript_16B4A7 + loadword 0, gUnknown_819457E + callstd 5 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16B4B1 + loadword 0, gUnknown_8194860 + callstd 4 + release + end + +EventScript_16B4A7:: @ 816B4A7 + loadword 0, gUnknown_819488E + callstd 4 + release + end + +EventScript_16B4B1:: @ 816B4B1 + loadword 0, gUnknown_8194628 + callstd 4 + checkitemspace ITEM_BIKE_VOUCHER, 1 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16B4F2 + setflag FLAG_0x241 + additem ITEM_BIKE_VOUCHER, 1 + loadword 0, gUnknown_819474E + setorcopyvar VAR_0x8000, 352 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 318 + callstd 9 + loadword 0, gUnknown_819477C + callstd 4 + release + end + +EventScript_16B4F2:: @ 816B4F2 + loadword 0, gUnknown_81948D2 + callstd 4 + release + end + +VermilionCity_PokemonFanClub_EventScript_16B4FC:: @ 816B4FC + lock + faceplayer + checkflag 2092 + goto_if 1, EventScript_16B511 + loadword 0, gUnknown_81948E6 + callstd 4 + release + end + +EventScript_16B511:: @ 816B511 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 1 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_8194960 + callstd 4 + release + end + +VermilionCity_PokemonFanClub_EventScript_16B528:: @ 816B528 + lock + faceplayer + checkflag FLAG_0x003 + goto_if 1, EventScript_16B54B + loadword 0, gUnknown_81944CC + callstd 4 + closemessage + applymovement 5, Movement_1A75E5 + waitmovement 0 + setflag FLAG_0x002 + release + end + +EventScript_16B54B:: @ 816B54B + loadword 0, gUnknown_8194518 + callstd 4 + closemessage + applymovement 5, Movement_1A75E5 + waitmovement 0 + clearflag FLAG_0x003 + release + end + +VermilionCity_PokemonFanClub_EventScript_16B563:: @ 816B563 + lock + faceplayer + checkflag FLAG_0x002 + goto_if 1, EventScript_16B586 + loadword 0, gUnknown_819446F + callstd 4 + closemessage + applymovement 6, Movement_1A75E5 + waitmovement 0 + setflag FLAG_0x003 + release + end + +EventScript_16B586:: @ 816B586 + loadword 0, gUnknown_819449C + callstd 4 + closemessage + applymovement 6, Movement_1A75E5 + waitmovement 0 + clearflag FLAG_0x002 + release + end + +VermilionCity_PokemonFanClub_EventScript_16B59E:: @ 816B59E + lock + faceplayer + waitse + playmoncry SPECIES_PIKACHU, 0 + loadword 0, gUnknown_819455A + callstd 4 + waitmoncry + release + end + +VermilionCity_PokemonFanClub_EventScript_16B5B1:: @ 816B5B1 + lock + faceplayer + waitse + playmoncry SPECIES_SEEL, 0 + loadword 0, gUnknown_8194571 + callstd 4 + waitmoncry + release + end + +VermilionCity_PokemonFanClub_EventScript_16B5C4:: @ 816B5C4 + loadword 0, gUnknown_8194910 + callstd 3 + end + +VermilionCity_PokemonFanClub_EventScript_16B5CD:: @ 816B5CD + loadword 0, gUnknown_819493D + callstd 3 + end + +VermilionCity_House2_MapScripts:: @ 816B5D6 + .byte 0 + +VermilionCity_House2_EventScript_16B5D7:: @ 816B5D7 + lock + faceplayer + setvar VAR_0x8008, 3 + call EventScript_1A8CAD + checkflag FLAG_0x24D + goto_if 1, EventScript_16B649 + loadword 0, gUnknown_81949CB + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16B631 + call EventScript_1A8CBD + compare_var_to_value VAR_0x8004, 6 + goto_if 4, EventScript_16B631 + call EventScript_1A8CC9 + compare_var_to_var VAR_RESULT, VAR_0x8009 + goto_if 5, EventScript_16B63B + call EventScript_1A8CD9 + loadword 0, gUnknown_8194A44 + callstd 4 + setflag FLAG_0x24D + release + end + +EventScript_16B631:: @ 816B631 + loadword 0, gUnknown_81949FD + callstd 4 + release + end + +EventScript_16B63B:: @ 816B63B + getspeciesname 0, 32777 + loadword 0, gUnknown_8194A0D + callstd 4 + release + end + +EventScript_16B649:: @ 816B649 + loadword 0, gUnknown_8194A4F + callstd 4 + release + end diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc new file mode 100644 index 000000000..fbd89857b --- /dev/null +++ b/data/maps/VictoryRoad_1F/scripts.inc @@ -0,0 +1,48 @@ +VictoryRoad_1F_MapScripts:: @ 8160F05 + map_script 1, VictoryRoad_1F_MapScript1_160F10 + map_script 3, VictoryRoad_1F_MapScript2_160F2F + .byte 0 + +VictoryRoad_1F_MapScript1_160F10:: @ 8160F10 + compare_var_to_value VAR_0x4064, 100 + call_if 5, EventScript_160F1C + end + +EventScript_160F1C:: @ 8160F1C + setmetatile 12, 14, 775, 1 + setmetatile 12, 15, 791, 1 + return + +VictoryRoad_1F_MapScript2_160F2F:: @ 8160F2F + setworldmapflag 2218 + end + +VictoryRoad_1F_EventScript_160F33:: @ 8160F33 + lockall + compare_var_to_value VAR_0x4064, 100 + goto_if 1, EventScript_160F62 + setmetatile 12, 14, 721, 0 + setmetatile 12, 15, 737, 0 + playse SE_MU_PACHI + special DrawWholeMapView + waitse + moveobjectoffscreen 5 + setvar VAR_0x4064, 100 + releaseall + end + +EventScript_160F62:: @ 8160F62 + releaseall + end + +VictoryRoad_1F_EventScript_160F64:: @ 8160F64 + trainerbattle 0, 406, 0, Text_174710, Text_174738 + loadword 0, gUnknown_8174744 + callstd 6 + end + +VictoryRoad_1F_EventScript_160F7B:: @ 8160F7B + trainerbattle 0, 396, 0, Text_174784, Text_1747B8 + loadword 0, gUnknown_81747C8 + callstd 6 + end diff --git a/data/maps/VictoryRoad_2F/scripts.inc b/data/maps/VictoryRoad_2F/scripts.inc new file mode 100644 index 000000000..20476dac4 --- /dev/null +++ b/data/maps/VictoryRoad_2F/scripts.inc @@ -0,0 +1,86 @@ +VictoryRoad_2F_MapScripts:: @ 8160F92 + map_script 1, VictoryRoad_2F_MapScript1_160F98 + .byte 0 + +VictoryRoad_2F_MapScript1_160F98:: @ 8160F98 + compare_var_to_value VAR_0x4065, 100 + call_if 5, EventScript_160FAF + compare_var_to_value VAR_0x4066, 100 + call_if 5, EventScript_160FC2 + end + +EventScript_160FAF:: @ 8160FAF + setmetatile 13, 10, 775, 1 + setmetatile 13, 11, 791, 1 + return + +EventScript_160FC2:: @ 8160FC2 + setmetatile 33, 16, 775, 1 + setmetatile 33, 17, 791, 1 + return + +VictoryRoad_2F_EventScript_160FD5:: @ 8160FD5 + lockall + compare_var_to_value VAR_0x4065, 100 + goto_if 1, EventScript_161004 + setmetatile 13, 10, 721, 0 + setmetatile 13, 11, 737, 0 + playse SE_MU_PACHI + special DrawWholeMapView + waitse + moveobjectoffscreen 11 + setvar VAR_0x4065, 100 + releaseall + end + +EventScript_161004:: @ 8161004 + releaseall + end + +VictoryRoad_2F_EventScript_161006:: @ 8161006 + lockall + compare_var_to_value VAR_0x4066, 100 + goto_if 1, EventScript_161035 + setmetatile 33, 16, 721, 0 + setmetatile 33, 17, 737, 0 + playse SE_MU_PACHI + special DrawWholeMapView + waitse + moveobjectoffscreen 12 + setvar VAR_0x4066, 100 + releaseall + end + +EventScript_161035:: @ 8161035 + releaseall + end + +VictoryRoad_2F_EventScript_161037:: @ 8161037 + trainerbattle 0, 167, 0, Text_1747EF, Text_17482C + loadword 0, gUnknown_817483E + callstd 6 + end + +VictoryRoad_2F_EventScript_16104E:: @ 816104E + trainerbattle 0, 325, 0, Text_174877, Text_1748B4 + loadword 0, gUnknown_81748BB + callstd 6 + end + +VictoryRoad_2F_EventScript_161065:: @ 8161065 + trainerbattle 0, 287, 0, Text_1748EE, Text_17491B + loadword 0, gUnknown_8174927 + callstd 6 + end + +VictoryRoad_2F_EventScript_16107C:: @ 816107C + trainerbattle 0, 290, 0, Text_174995, Text_1749B0 + loadword 0, gUnknown_81749BB + callstd 6 + end + +VictoryRoad_2F_EventScript_161093:: @ 8161093 + trainerbattle 0, 298, 0, Text_174942, Text_17495A + loadword 0, gUnknown_8174969 + callstd 6 + end diff --git a/data/maps/VictoryRoad_3F/scripts.inc b/data/maps/VictoryRoad_3F/scripts.inc new file mode 100644 index 000000000..5172cbba9 --- /dev/null +++ b/data/maps/VictoryRoad_3F/scripts.inc @@ -0,0 +1,68 @@ +VictoryRoad_3F_MapScripts:: @ 81610AA + map_script 1, VictoryRoad_3F_MapScript1_1610B0 + .byte 0 + +VictoryRoad_3F_MapScript1_1610B0:: @ 81610B0 + compare_var_to_value VAR_0x4067, 100 + call_if 5, EventScript_1610BC + end + +EventScript_1610BC:: @ 81610BC + setmetatile 12, 12, 775, 1 + setmetatile 12, 13, 791, 1 + return + +VictoryRoad_3F_EventScript_1610CF:: @ 81610CF + lockall + compare_var_to_value VAR_0x4067, 100 + goto_if 1, EventScript_161101 + setmetatile 12, 12, 721, 0 + setmetatile 12, 13, 737, 0 + playse SE_MU_PACHI + special DrawWholeMapView + waitse + moveobjectoffscreen 7 + moveobjectoffscreen 10 + setvar VAR_0x4067, 100 + releaseall + end + +EventScript_161101:: @ 8161101 + releaseall + end + +VictoryRoad_3F_EventScript_161103:: @ 8161103 + trainerbattle 0, 393, 0, Text_174B60, Text_174B83 + loadword 0, gUnknown_8174B99 + callstd 6 + end + +VictoryRoad_3F_EventScript_16111A:: @ 816111A + trainerbattle 0, 394, 0, Text_174C8A, Text_174CA9 + loadword 0, gUnknown_8174CBD + callstd 6 + end + +VictoryRoad_3F_EventScript_161131:: @ 8161131 + trainerbattle 0, 403, 0, Text_174C30, Text_174C5A + loadword 0, gUnknown_8174C67 + callstd 6 + end + +VictoryRoad_3F_EventScript_161148:: @ 8161148 + trainerbattle 0, 404, 0, Text_174BCA, Text_174BF4 + loadword 0, gUnknown_8174C03 + callstd 6 + end + +VictoryRoad_3F_EventScript_16115F:: @ 816115F + trainerbattle 4, 485, 0, Text_174D0C, Text_174D45, Text_174D96 + loadword 0, gUnknown_8174D64 + callstd 6 + end + +VictoryRoad_3F_EventScript_16117A:: @ 816117A + trainerbattle 4, 485, 0, Text_174E08, Text_174E39, Text_174E8D + loadword 0, gUnknown_8174E48 + callstd 6 + end diff --git a/data/maps/ViridianCity/scripts.inc b/data/maps/ViridianCity/scripts.inc new file mode 100644 index 000000000..2f8f28b74 --- /dev/null +++ b/data/maps/ViridianCity/scripts.inc @@ -0,0 +1,284 @@ +ViridianCity_MapScripts:: @ 81658D3 + map_script 3, ViridianCity_MapScript1_1658D9 + .byte 0 + +ViridianCity_MapScript1_1658D9:: @ 81658D9 + setworldmapflag 2193 + compare_var_to_value VAR_0x4051, 0 + call_if 1, EventScript_165920 + compare_var_to_value VAR_0x4051, 1 + call_if 1, EventScript_16590F + compare_var_to_value VAR_0x4051, 2 + call_if 4, EventScript_165909 + compare_var_to_value VAR_0x405A, 0 + call_if 1, EventScript_165931 + end + +EventScript_165909:: @ 8165909 + setvar VAR_0x4010, 32 + return + +EventScript_16590F:: @ 816590F + setvar VAR_0x4010, 32 + setobjectxyperm 4, 21, 8 + setobjectmovementtype 4, 1 + return + +EventScript_165920:: @ 8165920 + setvar VAR_0x4010, 34 + setobjectxyperm 4, 21, 11 + setobjectmovementtype 4, 8 + return + +EventScript_165931:: @ 8165931 + checkflag 2081 + goto_if 0, EventScript_1A77A9 + checkflag 2082 + goto_if 0, EventScript_1A77A9 + checkflag 2083 + goto_if 0, EventScript_1A77A9 + checkflag FLAG_UNK824 + goto_if 0, EventScript_1A77A9 + checkflag 2085 + goto_if 0, EventScript_1A77A9 + checkflag FLAG_UNK826 + goto_if 0, EventScript_1A77A9 + setvar VAR_0x405A, 1 + return + +ViridianCity_EventScript_16596D:: @ 816596D + lockall + textcolor 3 + applymovement 255, Movement_1A75E9 + waitmovement 0 + delay 20 + loadword 0, gUnknown_817E2F5 + callstd 4 + closemessage + applymovement 255, Movement_165992 + waitmovement 0 + releaseall + end + +Movement_165992:: @ 8165992 + step_14 + step_end + +ViridianCity_EventScript_165994:: @ 8165994 + loadword 0, gUnknown_817E1BB + callstd 3 + end + +ViridianCity_EventScript_16599D:: @ 816599D + loadword 0, gUnknown_817E1E7 + callstd 3 + end + +ViridianCity_EventScript_1659A6:: @ 81659A6 + loadword 0, gUnknown_817E24D + callstd 3 + end + +ViridianCity_EventScript_1659AF:: @ 81659AF + loadword 0, gUnknown_817E2DB + callstd 3 + end + +ViridianCity_EventScript_1659B8:: @ 81659B8 + loadword 0, gUnknown_817E2F5 + callstd 3 + end + +ViridianCity_EventScript_1659C1:: @ 81659C1 + loadword 0, gUnknown_817DABB + callstd 2 + end + +ViridianCity_EventScript_1659CA:: @ 81659CA + lock + faceplayer + compare_var_to_value VAR_0x405A, 1 + goto_if 1, EventScript_1659EC + loadword 0, gUnknown_817DB39 + callstd 4 + closemessage + applymovement 3, Movement_1A75E5 + waitmovement 0 + release + end + +EventScript_1659EC:: @ 81659EC + loadword 0, gUnknown_817DB78 + callstd 4 + release + end + +ViridianCity_EventScript_1659F6:: @ 81659F6 + lock + faceplayer + checkflag FLAG_UNK820 + goto_if 1, EventScript_165A23 + compare_var_to_value VAR_0x4051, 2 + goto_if 4, EventScript_165A4A + compare_var_to_value VAR_0x4051, 1 + goto_if 1, EventScript_165A54 + compare_var_to_value VAR_0x4051, 0 + goto_if 1, EventScript_165A84 + end + +EventScript_165A23:: @ 8165A23 + loadword 0, gUnknown_817E046 + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_165A40 + loadword 0, gUnknown_817E0EA + callstd 4 + release + end + +EventScript_165A40:: @ 8165A40 + loadword 0, gUnknown_817E14E + callstd 4 + release + end + +EventScript_165A4A:: @ 8165A4A + loadword 0, gUnknown_817DF61 + callstd 4 + release + end + +EventScript_165A54:: @ 8165A54 + call EventScript_165B4C + release + end + +EventScript_165A5B:: @ 8165A5B + loadword 0, gUnknown_817DEEB + callstd 4 + release + end + +EventScript_165A65:: @ 8165A65 + loadword 0, gUnknown_817DE9B + callstd 4 + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + special sub_8112364 + special sub_807F888 + waitstate + release + end + +EventScript_165A84:: @ 8165A84 + loadword 0, gUnknown_817DD03 + callstd 4 + closemessage + release + end + +ViridianCity_EventScript_165A8F:: @ 8165A8F + lock + faceplayer + loadword 0, gUnknown_817DB98 + callstd 5 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_165AB0 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_165ABA + end + +EventScript_165AB0:: @ 8165AB0 + loadword 0, gUnknown_817DBE4 + callstd 4 + release + end + +EventScript_165ABA:: @ 8165ABA + loadword 0, gUnknown_817DBD5 + callstd 4 + release + end + +ViridianCity_EventScript_165AC4:: @ 8165AC4 + lock + faceplayer + compare_var_to_value VAR_0x4051, 0 + goto_if 1, EventScript_165ADB + loadword 0, gUnknown_817DC99 + callstd 4 + release + end + +EventScript_165ADB:: @ 8165ADB + loadword 0, gUnknown_817DC4E + callstd 4 + closemessage + applymovement 5, Movement_1A75E5 + waitmovement 0 + release + end + +ViridianCity_EventScript_165AF0:: @ 8165AF0 + goto EventScript_1C4A1E + end + +ViridianCity_EventScript_165AF6:: @ 8165AF6 + lockall + textcolor 0 + loadword 0, gUnknown_817DD03 + callstd 4 + closemessage + applymovement 255, Movement_165B0E + waitmovement 0 + releaseall + end + +Movement_165B0E:: @ 8165B0E + step_10 + step_end + +ViridianCity_EventScript_165B10:: @ 8165B10 + lockall + textcolor 0 + applymovement 4, Movement_1A75E7 + waitmovement 0 + applymovement 255, Movement_1A75EB + waitmovement 0 + call EventScript_165B4C + release + end + +ViridianCity_EventScript_165B2E:: @ 8165B2E + lockall + textcolor 0 + applymovement 4, Movement_1A75EB + waitmovement 0 + applymovement 255, Movement_1A75E7 + waitmovement 0 + call EventScript_165B4C + release + end + +EventScript_165B4C:: @ 8165B4C + loadword 0, gUnknown_817DD4E + callstd 4 + closemessage + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + special sub_8112364 + special sub_807F888 + waitstate + lock + faceplayer + loadword 0, gUnknown_817DE9B + callstd 4 + setvar VAR_0x4051, 2 + setorcopyvar VAR_0x8000, 366 + setorcopyvar VAR_0x8001, 1 + callstd 0 + loadword 0, gUnknown_817DEEB + callstd 4 + return diff --git a/data/maps/ViridianCity_Gym/scripts.inc b/data/maps/ViridianCity_Gym/scripts.inc new file mode 100644 index 000000000..bd65c80e5 --- /dev/null +++ b/data/maps/ViridianCity_Gym/scripts.inc @@ -0,0 +1,137 @@ +ViridianCity_Gym_MapScripts:: @ 8169EC9 + .byte 0 + +ViridianCity_Gym_EventScript_169ECA:: @ 8169ECA + setvar VAR_0x8004, 15 + setvar VAR_0x8005, 2 + special UpdatePickStateFromSpecialVar8005 + trainerbattle 1, 350, 0, Text_18F352, Text_18F43F, EventScript_169F04 + checkflag FLAG_0x298 + goto_if 0, EventScript_169F2F + loadword 0, gUnknown_818F4A2 + callstd 4 + closemessage + fadescreen 1 + removeobject 8 + fadescreen 0 + release + end + +EventScript_169F04:: @ 8169F04 + setvar VAR_0x8004, 15 + setvar VAR_0x8005, 3 + special SetFlavorTextFlagFromSpecialVars + setflag FLAG_0x0AD + setflag FLAG_0x4B7 + setflag 2087 + setvar VAR_0x4054, 3 + setvar VAR_0x8008, 8 + call EventScript_1A6B18 + goto EventScript_169F2F + end + +EventScript_169F2F:: @ 8169F2F + loadword 0, gUnknown_818F586 + callstd 4 + checkitemspace ITEM_TM26, 1 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_169F70 + additem ITEM_TM26, 1 + loadword 0, gUnknown_818F675 + setorcopyvar VAR_0x8000, 314 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 257 + callstd 9 + setflag FLAG_0x298 + loadword 0, gUnknown_818F695 + callstd 4 + release + end + +EventScript_169F70:: @ 8169F70 + loadword 0, gUnknown_818F71B + callstd 4 + release + end + +ViridianCity_Gym_EventScript_169F7A:: @ 8169F7A + trainerbattle 0, 296, 0, Text_18F7F3, Text_18F824 + loadword 0, gUnknown_818F840 + callstd 6 + end + +ViridianCity_Gym_EventScript_169F91:: @ 8169F91 + trainerbattle 0, 297, 0, Text_18F98A, Text_18F9BB + loadword 0, gUnknown_818F9CC + callstd 6 + end + +ViridianCity_Gym_EventScript_169FA8:: @ 8169FA8 + trainerbattle 0, 322, 0, Text_18F7AD, Text_18F7D6 + loadword 0, gUnknown_818F7DD + callstd 6 + end + +ViridianCity_Gym_EventScript_169FBF:: @ 8169FBF + trainerbattle 0, 323, 0, Text_18F86C, Text_18F899 + loadword 0, gUnknown_818F8A0 + callstd 6 + end + +ViridianCity_Gym_EventScript_169FD6:: @ 8169FD6 + trainerbattle 0, 324, 0, Text_18F92C, Text_18F95A + loadword 0, gUnknown_818F960 + callstd 6 + end + +ViridianCity_Gym_EventScript_169FED:: @ 8169FED + trainerbattle 0, 392, 0, Text_18F9E7, Text_18FA2D + loadword 0, gUnknown_818FA3B + callstd 6 + end + +ViridianCity_Gym_EventScript_16A004:: @ 816A004 + trainerbattle 0, 400, 0, Text_18F73B, Text_18F769 + loadword 0, gUnknown_818F77B + callstd 6 + end + +ViridianCity_Gym_EventScript_16A01B:: @ 816A01B + trainerbattle 0, 401, 0, Text_18F8CB, Text_18F8EE + loadword 0, gUnknown_818F8FE + callstd 6 + end + +ViridianCity_Gym_EventScript_16A032:: @ 816A032 + lock + faceplayer + checkflag FLAG_0x4B7 + goto_if 1, EventScript_16A047 + loadword 0, gUnknown_818FA81 + callstd 4 + release + end + +EventScript_16A047:: @ 816A047 + setvar VAR_0x8004, 15 + setvar VAR_0x8005, 4 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_818FB56 + callstd 4 + release + end + +ViridianCity_Gym_EventScript_16A05E:: @ 816A05E + lockall + checkflag 2087 + goto_if 1, EventScript_16A072 + loadword 0, gUnknown_818FB8D + callstd 4 + releaseall + end + +EventScript_16A072:: @ 816A072 + loadword 0, gUnknown_818FBC1 + callstd 4 + releaseall + end diff --git a/data/maps/ViridianCity_House1/scripts.inc b/data/maps/ViridianCity_House1/scripts.inc new file mode 100644 index 000000000..3ea1f8cd0 --- /dev/null +++ b/data/maps/ViridianCity_House1/scripts.inc @@ -0,0 +1,28 @@ +ViridianCity_House1_MapScripts:: @ 8169E9A + .byte 0 + +ViridianCity_House1_EventScript_169E9B:: @ 8169E9B + loadword 0, gUnknown_818F292 + callstd 2 + end + +ViridianCity_House1_EventScript_169EA4:: @ 8169EA4 + loadword 0, gUnknown_818F30F + callstd 2 + end + +ViridianCity_House1_EventScript_169EAD:: @ 8169EAD + lock + faceplayer + waitse + playmoncry SPECIES_SPEAROW, 0 + loadword 0, gUnknown_818F32C + callstd 4 + waitmoncry + release + end + +ViridianCity_House1_EventScript_169EC0:: @ 8169EC0 + loadword 0, gUnknown_818F33D + callstd 3 + end diff --git a/data/maps/ViridianCity_House2/scripts.inc b/data/maps/ViridianCity_House2/scripts.inc new file mode 100644 index 000000000..da2dec8d2 --- /dev/null +++ b/data/maps/ViridianCity_House2/scripts.inc @@ -0,0 +1,120 @@ +ViridianCity_House2_MapScripts:: @ 816A07C + .byte 0 + +ViridianCity_House2_EventScript_16A07D:: @ 816A07D + lock + faceplayer + loadword 0, gUnknown_818FC00 + callstd 4 + closemessage + applymovement 2, Movement_1A75E9 + waitmovement 0 + release + end + +ViridianCity_House2_EventScript_16A094:: @ 816A094 + lock + faceplayer + loadword 0, gUnknown_818FC2B + callstd 4 + closemessage + applymovement 1, Movement_1A75E5 + waitmovement 0 + release + end + +ViridianCity_House2_EventScript_16A0AB:: @ 816A0AB + lockall + loadword 0, gUnknown_818FC65 + callstd 4 + loadword 0, gUnknown_818FF19 + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16A11B + loadword 0, gUnknown_818FD23 + callstd 4 + loadword 0, gUnknown_818FF19 + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16A11B + loadword 0, gUnknown_818FDA8 + callstd 4 + loadword 0, gUnknown_818FF19 + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16A11B + loadword 0, gUnknown_818FE5C + callstd 4 + applymovement 2, Movement_1A75E9 + waitmovement 0 + textcolor 1 + loadword 0, gUnknown_818FF28 + callstd 4 + releaseall + end + +EventScript_16A11B:: @ 816A11B + releaseall + end + +ViridianCity_House2_EventScript_16A11D:: @ 816A11D + lockall + loadword 0, gUnknown_818FF4B + callstd 4 + goto EventScript_16A12C + end + +EventScript_16A12C:: @ 816A12C + message Text_18FF88 + waitmessage + multichoicegrid 7, 1, 15, 3, 0 + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_16A18B + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_16A1A7 + compare_var_to_value VAR_0x8000, 2 + goto_if 1, EventScript_16A1C3 + compare_var_to_value VAR_0x8000, 3 + goto_if 1, EventScript_16A199 + compare_var_to_value VAR_0x8000, 4 + goto_if 1, EventScript_16A1B5 + compare_var_to_value VAR_0x8000, 5 + goto_if 1, EventScript_16A1D1 + compare_var_to_value VAR_0x8000, 127 + goto_if 1, EventScript_16A1D1 + end + +EventScript_16A18B:: @ 816A18B + loadword 0, gUnknown_818FFA9 + callstd 4 + goto EventScript_16A12C + end + +EventScript_16A199:: @ 816A199 + loadword 0, gUnknown_8190025 + callstd 4 + goto EventScript_16A12C + end + +EventScript_16A1A7:: @ 816A1A7 + loadword 0, gUnknown_819009F + callstd 4 + goto EventScript_16A12C + end + +EventScript_16A1B5:: @ 816A1B5 + loadword 0, gUnknown_819010F + callstd 4 + goto EventScript_16A12C + end + +EventScript_16A1C3:: @ 816A1C3 + loadword 0, gUnknown_8190199 + callstd 4 + goto EventScript_16A12C + end + +EventScript_16A1D1:: @ 816A1D1 + releaseall + end diff --git a/data/maps/ViridianCity_Mart/scripts.inc b/data/maps/ViridianCity_Mart/scripts.inc new file mode 100644 index 000000000..9d36cb183 --- /dev/null +++ b/data/maps/ViridianCity_Mart/scripts.inc @@ -0,0 +1,100 @@ +ViridianCity_Mart_MapScripts:: @ 816A1D3 + map_script 1, ViridianCity_Mart_MapScript1_16A1DE + map_script 2, ViridianCity_Mart_MapScript2_16A1FB + .byte 0 + +ViridianCity_Mart_MapScript1_16A1DE:: @ 816A1DE + checkflag 2089 + goto_if 0, EventScript_16A1E8 + end + +EventScript_16A1E8:: @ 816A1E8 + setmetatile 1, 3, 703, 1 + setmetatile 1, 4, 704, 1 + end + +ViridianCity_Mart_MapScript2_16A1FB:: @ 816A1FB + map_script_2 VAR_0x4057, 0, EventScript_16A205 + .2byte 0 + +EventScript_16A205:: @ 816A205 + lockall + textcolor 0 + applymovement 1, Movement_1A75ED + waitmovement 0 + loadword 0, gUnknown_819021A + callstd 4 + closemessage + applymovement 1, Movement_16A262 + applymovement 255, Movement_16A25C + waitmovement 0 + loadword 0, gUnknown_819023A + callstd 4 + setvar VAR_0x4057, 1 + additem ITEM_OAKS_PARCEL, 1 + loadword 0, gUnknown_8190289 + setorcopyvar VAR_0x8000, 349 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 318 + callstd 9 + setvar VAR_0x4055, 5 + releaseall + end + +Movement_16A25C:: @ 816A25C + step_11 + step_11 + step_11 + step_11 + step_2f + step_end + +Movement_16A262:: @ 816A262 + step_1c + step_1c + step_1c + step_1c + step_30 + step_end + +ViridianCity_Mart_EventScript_16A268:: @ 816A268 + lock + faceplayer + compare_var_to_value VAR_0x4057, 1 + goto_if 1, EventScript_16A2A4 + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + message Text_1A6211 + waitmessage + pokemart Items_16A298 + loadword 0, gUnknown_81A5190 + callstd 4 + release + end + + .align 2 +Items_16A298:: @ 816A298 + .2byte ITEM_POKE_BALL + .2byte ITEM_POTION + .2byte ITEM_ANTIDOTE + .2byte ITEM_PARALYZE_HEAL + .2byte ITEM_NONE + release + end + +EventScript_16A2A4:: @ 816A2A4 + loadword 0, Text_1902BF + callstd 4 + release + end + +ViridianCity_Mart_EventScript_16A2AE:: @ 816A2AE + loadword 0, gUnknown_81902F5 + callstd 2 + end + +ViridianCity_Mart_EventScript_16A2B7:: @ 816A2B7 + loadword 0, gUnknown_819032C + callstd 2 + end diff --git a/data/maps/ViridianCity_PokemonCenter_1F/scripts.inc b/data/maps/ViridianCity_PokemonCenter_1F/scripts.inc new file mode 100644 index 000000000..da39670a3 --- /dev/null +++ b/data/maps/ViridianCity_PokemonCenter_1F/scripts.inc @@ -0,0 +1,30 @@ +ViridianCity_PokemonCenter_1F_MapScripts:: @ 816A2C0 + map_script 3, ViridianCity_PokemonCenter_1F_MapScript1_16A2CB + map_script 5, ViridianCity_PokemonCenter_1F_MapScript2_1BC05C + .byte 0 + +ViridianCity_PokemonCenter_1F_MapScript1_16A2CB:: @ 816A2CB + setrespawn 2 + end + +ViridianCity_PokemonCenter_1F_EventScript_16A2CF:: @ 816A2CF + lock + faceplayer + call EventScript_1A6578 + release + end + +ViridianCity_PokemonCenter_1F_EventScript_16A2D8:: @ 816A2D8 + loadword 0, gUnknown_81903E5 + callstd 2 + end + +ViridianCity_PokemonCenter_1F_EventScript_16A2E1:: @ 816A2E1 + loadword 0, gUnknown_8190384 + callstd 2 + end + +ViridianCity_PokemonCenter_1F_EventScript_16A2EA:: @ 816A2EA + loadword 0, gUnknown_8190450 + callstd 2 + end diff --git a/data/maps/ViridianCity_PokemonCenter_2F/scripts.inc b/data/maps/ViridianCity_PokemonCenter_2F/scripts.inc new file mode 100644 index 000000000..79df14869 --- /dev/null +++ b/data/maps/ViridianCity_PokemonCenter_2F/scripts.inc @@ -0,0 +1,18 @@ +ViridianCity_PokemonCenter_2F_MapScripts:: @ 816A2F3 + map_script 2, ViridianCity_PokemonCenter_2F_MapScript1_1BB2A3 + map_script 4, ViridianCity_PokemonCenter_2F_MapScript2_1BB1ED + map_script 1, ViridianCity_PokemonCenter_2F_MapScript3_1BB237 + map_script 3, ViridianCity_PokemonCenter_2F_MapScript4_1BB1B4 + .byte 0 + +ViridianCity_PokemonCenter_2F_EventScript_16A308:: @ 816A308 + call EventScript_1BB4A3 + end + +EventScript_16A30E:: @ 816A30E + call EventScript_1BB6AB + end + +EventScript_16A314:: @ 816A314 + call EventScript_1BB7DE + end diff --git a/data/maps/ViridianForest/scripts.inc b/data/maps/ViridianForest/scripts.inc new file mode 100644 index 000000000..f5d7b956f --- /dev/null +++ b/data/maps/ViridianForest/scripts.inc @@ -0,0 +1,77 @@ +ViridianForest_MapScripts:: @ 816051F + map_script 3, ViridianForest_MapScript1_160525 + .byte 0 + +ViridianForest_MapScript1_160525:: @ 8160525 + setworldmapflag 2212 + end + +ViridianForest_EventScript_160529:: @ 8160529 + loadword 0, gUnknown_8172255 + callstd 2 + end + +ViridianForest_EventScript_160532:: @ 8160532 + loadword 0, gUnknown_8172559 + callstd 2 + end + +ViridianForest_EventScript_16053B:: @ 816053B + loadword 0, gUnknown_81725C7 + callstd 3 + end + +ViridianForest_EventScript_160544:: @ 8160544 + loadword 0, gUnknown_8172629 + callstd 3 + end + +ViridianForest_EventScript_16054D:: @ 816054D + loadword 0, gUnknown_817265C + callstd 3 + end + +ViridianForest_EventScript_160556:: @ 8160556 + loadword 0, gUnknown_81726A3 + callstd 3 + end + +ViridianForest_EventScript_16055F:: @ 816055F + loadword 0, gUnknown_817271D + callstd 3 + end + +ViridianForest_EventScript_160568:: @ 8160568 + loadword 0, gUnknown_8172773 + callstd 3 + end + +ViridianForest_EventScript_160571:: @ 8160571 + trainerbattle 0, 102, 0, Text_1722C7, Text_1722F9 + loadword 0, gUnknown_8172315 + callstd 6 + end + +ViridianForest_EventScript_160588:: @ 8160588 + trainerbattle 0, 103, 0, Text_17234A, Text_17237D + loadword 0, gUnknown_8172398 + callstd 6 + end + +ViridianForest_EventScript_16059F:: @ 816059F + trainerbattle 0, 104, 0, Text_1723D4, Text_172402 + loadword 0, gUnknown_817241F + callstd 6 + end + +ViridianForest_EventScript_1605B6:: @ 81605B6 + trainerbattle 0, 531, 0, Text_172482, Text_1724BF + loadword 0, gUnknown_81724DC + callstd 6 + end + +ViridianForest_EventScript_1605CD:: @ 81605CD + trainerbattle 0, 532, 0, Text_1724F9, Text_17251B + loadword 0, gUnknown_8172527 + callstd 6 + end -- cgit v1.2.3 From 4b98d7d07a681279022cec9f082071a374ddbdb9 Mon Sep 17 00:00:00 2001 From: garak Date: Fri, 10 May 2019 11:45:18 -0400 Subject: fix map and layout constants --- .../scripts.inc | 10 +++++----- .../CinnabarIsland_PokemonCenter_1F/scripts.inc | 2 +- data/maps/FiveIsland/connections.inc | 4 ++-- data/maps/FiveIsland_LostCave_Room10/scripts.inc | 2 +- data/maps/FiveIsland_Meadow/connections.inc | 4 ++-- .../maps/FiveIsland_MemorialPillar/connections.inc | 2 +- .../maps/FiveIsland_ResortGorgeous/connections.inc | 2 +- .../maps/FiveIsland_WaterLabyrinth/connections.inc | 4 ++-- data/maps/FourIsland_IcefallCave_1F/scripts.inc | 2 +- .../FuchsiaCity_SafariZone_Entrance/scripts.inc | 4 ++-- data/maps/OneIsland/connections.inc | 4 ++-- data/maps/OneIsland/scripts.inc | 2 +- data/maps/OneIsland_Harbor/scripts.inc | 2 +- data/maps/OneIsland_KindleRoad/connections.inc | 2 +- data/maps/OneIsland_TreasureBeach/connections.inc | 2 +- data/maps/PalletTown/scripts.inc | 4 ++-- data/maps/PokemonLeague_ChampionsRoom/scripts.inc | 2 +- data/maps/PokemonTower_7F/scripts.inc | 2 +- data/maps/RocketHideout_Elevator/scripts.inc | 6 +++--- data/maps/Route1/connections.inc | 4 ++-- data/maps/Route10/connections.inc | 2 +- data/maps/Route11/connections.inc | 2 +- data/maps/Route12/connections.inc | 2 +- data/maps/Route15/connections.inc | 2 +- data/maps/Route16/connections.inc | 2 +- data/maps/Route18/connections.inc | 2 +- data/maps/Route19/connections.inc | 2 +- data/maps/Route2/connections.inc | 4 ++-- data/maps/Route20/connections.inc | 2 +- data/maps/Route21_North/connections.inc | 2 +- data/maps/Route21_South/connections.inc | 2 +- data/maps/Route22/connections.inc | 2 +- data/maps/Route23/connections.inc | 2 +- data/maps/Route24/connections.inc | 2 +- data/maps/Route3/connections.inc | 2 +- data/maps/Route4/connections.inc | 2 +- data/maps/Route5/connections.inc | 4 ++-- data/maps/Route6/connections.inc | 4 ++-- data/maps/Route7/connections.inc | 4 ++-- data/maps/Route8/connections.inc | 4 ++-- data/maps/Route9/connections.inc | 2 +- data/maps/SSAnne_1F_Room11/scripts.inc | 4 ++-- data/maps/SSAnne_Exterior/scripts.inc | 2 +- data/maps/SeafoamIslands_B3F/scripts.inc | 4 ++-- data/maps/SeafoamIslands_B4F/scripts.inc | 2 +- data/maps/SevenIsland/connections.inc | 4 ++-- data/maps/SevenIsland_House_Room1/scripts.inc | 4 ++-- data/maps/SevenIsland_House_Room2/scripts.inc | 2 +- .../maps/SevenIsland_SevaultCanyon/connections.inc | 4 ++-- .../connections.inc | 4 ++-- data/maps/SevenIsland_TanobyRuins/connections.inc | 2 +- data/maps/SevenIsland_TrainerTower/connections.inc | 2 +- .../SevenIsland_TrainerTower_Elevator/scripts.inc | 4 ++-- data/maps/SilphCo_Elevator/scripts.inc | 22 +++++++++++----------- data/maps/SixIsland/connections.inc | 2 +- data/maps/SixIsland_GreenPath/connections.inc | 4 ++-- data/maps/SixIsland_OutcastIsland/connections.inc | 2 +- data/maps/SixIsland_RuinValley/connections.inc | 2 +- data/maps/SixIsland_WaterPath/connections.inc | 6 +++--- data/maps/ThreeIsland/connections.inc | 4 ++-- data/maps/ThreeIsland_BerryForest/scripts.inc | 4 ++-- data/maps/ThreeIsland_BondBridge/connections.inc | 2 +- data/maps/ThreeIsland_DunsparceTunnel/scripts.inc | 2 +- data/maps/ThreeIsland_Port/connections.inc | 2 +- data/maps/TwoIsland/connections.inc | 2 +- data/maps/TwoIsland_CapeBrink/connections.inc | 2 +- data/maps/UnknownMap_03_50/connections.inc | 2 +- data/maps/UnknownMap_03_51/connections.inc | 2 +- 68 files changed, 108 insertions(+), 108 deletions(-) (limited to 'data/maps') diff --git a/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc index 9043b3cef..d682f3d7a 100644 --- a/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc @@ -72,7 +72,7 @@ EventScript_16C1F3:: @ 816C1F3 EventScript_16C246:: @ 816C246 setvar VAR_0x8006, 4 - setdynamicwarp MAP_CELADONCITY_DEPARTMENTSTORE_1F, 255, 6, 1 + setdynamicwarp MAP_CELADON_CITY_DEPARTMENTSTORE_1F, 255, 6, 1 compare_var_to_value VAR_0x403A, 4 goto_if 1, EventScript_16C30E call EventScript_16C313 @@ -82,7 +82,7 @@ EventScript_16C246:: @ 816C246 EventScript_16C26E:: @ 816C26E setvar VAR_0x8006, 5 - setdynamicwarp MAP_CELADONCITY_DEPARTMENTSTORE_2F, 255, 6, 1 + setdynamicwarp MAP_CELADON_CITY_DEPARTMENTSTORE_2F, 255, 6, 1 compare_var_to_value VAR_0x403A, 5 goto_if 1, EventScript_16C30E call EventScript_16C313 @@ -92,7 +92,7 @@ EventScript_16C26E:: @ 816C26E EventScript_16C296:: @ 816C296 setvar VAR_0x8006, 6 - setdynamicwarp MAP_CELADONCITY_DEPARTMENTSTORE_3F, 255, 6, 1 + setdynamicwarp MAP_CELADON_CITY_DEPARTMENTSTORE_3F, 255, 6, 1 compare_var_to_value VAR_0x403A, 6 goto_if 1, EventScript_16C30E call EventScript_16C313 @@ -102,7 +102,7 @@ EventScript_16C296:: @ 816C296 EventScript_16C2BE:: @ 816C2BE setvar VAR_0x8006, 7 - setdynamicwarp MAP_CELADONCITY_DEPARTMENTSTORE_4F, 255, 6, 1 + setdynamicwarp MAP_CELADON_CITY_DEPARTMENTSTORE_4F, 255, 6, 1 compare_var_to_value VAR_0x403A, 7 goto_if 1, EventScript_16C30E call EventScript_16C313 @@ -112,7 +112,7 @@ EventScript_16C2BE:: @ 816C2BE EventScript_16C2E6:: @ 816C2E6 setvar VAR_0x8006, 8 - setdynamicwarp MAP_CELADONCITY_DEPARTMENTSTORE_5F, 255, 6, 1 + setdynamicwarp MAP_CELADON_CITY_DEPARTMENTSTORE_5F, 255, 6, 1 compare_var_to_value VAR_0x403A, 8 goto_if 1, EventScript_16C30E call EventScript_16C313 diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc index 554dd6943..3c15dfb23 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc @@ -53,7 +53,7 @@ CinnabarIsland_PokemonCenter_1F_EventScript_16E90A:: @ 816E90A removeobject 7 setvar VAR_0x408A, 1 clearflag FLAG_0x062 - warp MAP_CINNABARISLAND, 255, 14, 11 + warp MAP_CINNABAR_ISLAND, 255, 14, 11 waitstate release end diff --git a/data/maps/FiveIsland/connections.inc b/data/maps/FiveIsland/connections.inc index ef2c82e8c..358b5e899 100644 --- a/data/maps/FiveIsland/connections.inc +++ b/data/maps/FiveIsland/connections.inc @@ -1,6 +1,6 @@ FiveIsland_MapConnectionsList: @ 8352988 - connection up, -48, MAP_FIVEISLAND_WATERLABYRINTH - connection right, 0, MAP_FIVEISLAND_MEADOW + connection up, -48, MAP_FIVE_ISLAND_WATERLABYRINTH + connection right, 0, MAP_FIVE_ISLAND_MEADOW FiveIsland_MapConnections:: @ 83529A0 .4byte 2 diff --git a/data/maps/FiveIsland_LostCave_Room10/scripts.inc b/data/maps/FiveIsland_LostCave_Room10/scripts.inc index 4cc0d7204..f44edc660 100644 --- a/data/maps/FiveIsland_LostCave_Room10/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Room10/scripts.inc @@ -34,7 +34,7 @@ EventScript_164C52:: @ 8164C52 callstd 4 closemessage call EventScript_164CA5 - warp MAP_FIVEISLAND_RESORTGORGEOUS, 255, 39, 10 + warp MAP_FIVE_ISLAND_RESORTGORGEOUS, 255, 39, 10 waitstate releaseall end diff --git a/data/maps/FiveIsland_Meadow/connections.inc b/data/maps/FiveIsland_Meadow/connections.inc index 87bded6c7..e6a63a6e1 100644 --- a/data/maps/FiveIsland_Meadow/connections.inc +++ b/data/maps/FiveIsland_Meadow/connections.inc @@ -1,6 +1,6 @@ FiveIsland_Meadow_MapConnectionsList: @ 8352DDC - connection left, 0, MAP_FIVEISLAND - connection right, 20, MAP_FIVEISLAND_MEMORIALPILLAR + connection left, 0, MAP_FIVE_ISLAND + connection right, 20, MAP_FIVE_ISLAND_MEMORIALPILLAR FiveIsland_Meadow_MapConnections:: @ 8352DF4 .4byte 2 diff --git a/data/maps/FiveIsland_MemorialPillar/connections.inc b/data/maps/FiveIsland_MemorialPillar/connections.inc index adc49a1af..24624b004 100644 --- a/data/maps/FiveIsland_MemorialPillar/connections.inc +++ b/data/maps/FiveIsland_MemorialPillar/connections.inc @@ -1,5 +1,5 @@ FiveIsland_MemorialPillar_MapConnectionsList: @ 8352DFC - connection left, -20, MAP_FIVEISLAND_MEADOW + connection left, -20, MAP_FIVE_ISLAND_MEADOW FiveIsland_MemorialPillar_MapConnections:: @ 8352E08 .4byte 1 diff --git a/data/maps/FiveIsland_ResortGorgeous/connections.inc b/data/maps/FiveIsland_ResortGorgeous/connections.inc index 97d3b0007..a7f2f02dc 100644 --- a/data/maps/FiveIsland_ResortGorgeous/connections.inc +++ b/data/maps/FiveIsland_ResortGorgeous/connections.inc @@ -1,5 +1,5 @@ FiveIsland_ResortGorgeous_MapConnectionsList: @ 8352DA8 - connection down, -48, MAP_FIVEISLAND_WATERLABYRINTH + connection down, -48, MAP_FIVE_ISLAND_WATERLABYRINTH FiveIsland_ResortGorgeous_MapConnections:: @ 8352DB4 .4byte 1 diff --git a/data/maps/FiveIsland_WaterLabyrinth/connections.inc b/data/maps/FiveIsland_WaterLabyrinth/connections.inc index 69a0b4a6d..8c0351ad5 100644 --- a/data/maps/FiveIsland_WaterLabyrinth/connections.inc +++ b/data/maps/FiveIsland_WaterLabyrinth/connections.inc @@ -1,6 +1,6 @@ FiveIsland_WaterLabyrinth_MapConnectionsList: @ 8352DBC - connection up, 48, MAP_FIVEISLAND_RESORTGORGEOUS - connection down, 48, MAP_FIVEISLAND + connection up, 48, MAP_FIVE_ISLAND_RESORTGORGEOUS + connection down, 48, MAP_FIVE_ISLAND FiveIsland_WaterLabyrinth_MapConnections:: @ 8352DD4 .4byte 2 diff --git a/data/maps/FourIsland_IcefallCave_1F/scripts.inc b/data/maps/FourIsland_IcefallCave_1F/scripts.inc index a2b992a6d..0698ff061 100644 --- a/data/maps/FourIsland_IcefallCave_1F/scripts.inc +++ b/data/maps/FourIsland_IcefallCave_1F/scripts.inc @@ -23,7 +23,7 @@ EventScript_163D65:: @ 8163D65 waitmovement 0 playse SE_FU_ZAKU delay 60 - warphole MAP_FOURISLAND_ICEFALLCAVE_B1F + warphole MAP_FOUR_ISLAND_ICEFALLCAVE_B1F waitstate releaseall end diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc index 58d68162b..157b1dbdb 100644 --- a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc +++ b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc @@ -59,7 +59,7 @@ EventScript_16D345:: @ 816D345 closemessage applymovement 255, Movement_16D365 waitmovement 0 - warp MAP_SAFARIZONE_CENTER, 255, 26, 30 + warp MAP_SAFARI_ZONE_CENTER, 255, 26, 30 waitstate end @@ -144,7 +144,7 @@ EventScript_16D3CA:: @ 816D3CA call_if 1, EventScript_16D457 special sub_80A0EC4 setvar VAR_0x406E, 2 - warp MAP_SAFARIZONE_CENTER, 255, 26, 30 + warp MAP_SAFARI_ZONE_CENTER, 255, 26, 30 waitstate end diff --git a/data/maps/OneIsland/connections.inc b/data/maps/OneIsland/connections.inc index 0b3fa21bf..edc8a5047 100644 --- a/data/maps/OneIsland/connections.inc +++ b/data/maps/OneIsland/connections.inc @@ -1,6 +1,6 @@ OneIsland_MapConnectionsList: @ 8352934 - connection down, 0, MAP_ONEISLAND_TREASUREBEACH - connection right, -120, MAP_ONEISLAND_KINDLEROAD + connection down, 0, MAP_ONE_ISLAND_TREASUREBEACH + connection right, -120, MAP_ONE_ISLAND_KINDLEROAD OneIsland_MapConnections:: @ 835294C .4byte 2 diff --git a/data/maps/OneIsland/scripts.inc b/data/maps/OneIsland/scripts.inc index d400fce9e..2735d7481 100644 --- a/data/maps/OneIsland/scripts.inc +++ b/data/maps/OneIsland/scripts.inc @@ -31,7 +31,7 @@ EventScript_16749D:: @ 816749D waitdooranim removeobject 1 setvar VAR_0x4075, 3 - warp MAP_ONEISLAND_POKEMONCENTER_1F, 255, 9, 9 + warp MAP_ONE_ISLAND_POKEMONCENTER_1F, 255, 9, 9 waitstate releaseall end diff --git a/data/maps/OneIsland_Harbor/scripts.inc b/data/maps/OneIsland_Harbor/scripts.inc index 50526fc0d..60a82c17e 100644 --- a/data/maps/OneIsland_Harbor/scripts.inc +++ b/data/maps/OneIsland_Harbor/scripts.inc @@ -21,7 +21,7 @@ EventScript_17139C:: @ 817139C applymovement 255, Movement_1713B9 waitmovement 0 setvar VAR_0x4075, 2 - warp MAP_ONEISLAND, 255, 12, 18 + warp MAP_ONE_ISLAND, 255, 12, 18 waitstate releaseall end diff --git a/data/maps/OneIsland_KindleRoad/connections.inc b/data/maps/OneIsland_KindleRoad/connections.inc index a71c8d6cd..c4f7e4073 100644 --- a/data/maps/OneIsland_KindleRoad/connections.inc +++ b/data/maps/OneIsland_KindleRoad/connections.inc @@ -1,5 +1,5 @@ OneIsland_KindleRoad_MapConnectionsList: @ 8352D1C - connection left, 120, MAP_ONEISLAND + connection left, 120, MAP_ONE_ISLAND OneIsland_KindleRoad_MapConnections:: @ 8352D28 .4byte 1 diff --git a/data/maps/OneIsland_TreasureBeach/connections.inc b/data/maps/OneIsland_TreasureBeach/connections.inc index 6ebdc935b..606768f6d 100644 --- a/data/maps/OneIsland_TreasureBeach/connections.inc +++ b/data/maps/OneIsland_TreasureBeach/connections.inc @@ -1,5 +1,5 @@ OneIsland_TreasureBeach_MapConnectionsList: @ 8352D30 - connection up, 0, MAP_ONEISLAND + connection up, 0, MAP_ONE_ISLAND OneIsland_TreasureBeach_MapConnections:: @ 8352D3C .4byte 1 diff --git a/data/maps/PalletTown/scripts.inc b/data/maps/PalletTown/scripts.inc index e482f1fb4..31b4208ec 100644 --- a/data/maps/PalletTown/scripts.inc +++ b/data/maps/PalletTown/scripts.inc @@ -79,7 +79,7 @@ EventScript_1654D8:: @ 81654D8 setvar VAR_0x4055, 7 setvar VAR_0x4050, 3 setflag FLAG_0x02C - warp MAP_PALLETTOWN_PROFESSOROAKSLAB, 255, 6, 12 + warp MAP_PALLET_TOWN_PROFESSOROAKSLAB, 255, 6, 12 waitstate releaseall end @@ -230,7 +230,7 @@ EventScript_165605:: @ 8165605 setvar VAR_0x4050, 1 setflag FLAG_0x02C setflag FLAG_SPECIAL_FLAG_0x4001 - warp MAP_PALLETTOWN_PROFESSOROAKSLAB, 255, 6, 12 + warp MAP_PALLET_TOWN_PROFESSOROAKSLAB, 255, 6, 12 waitstate releaseall end diff --git a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc index 367584edb..81d3ae0fa 100644 --- a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc +++ b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc @@ -110,7 +110,7 @@ EventScript_162B76:: @ 8162B76 applymovement 255, Movement_162D12 waitmovement 0 setvar VAR_0x4001, 1 - warp MAP_POKEMONLEAGUE_HALLOFFAME, 255, 5, 12 + warp MAP_POKEMON_LEAGUE_HALL_OF_FAME, 255, 5, 12 waitstate releaseall end diff --git a/data/maps/PokemonTower_7F/scripts.inc b/data/maps/PokemonTower_7F/scripts.inc index cd3cec22d..963251b49 100644 --- a/data/maps/PokemonTower_7F/scripts.inc +++ b/data/maps/PokemonTower_7F/scripts.inc @@ -13,7 +13,7 @@ PokemonTower_7F_EventScript_16355A:: @ 816355A loadword 0, gUnknown_817A529 callstd 4 closemessage - warp MAP_LAVENDERTOWN_VOLUNTEERPOKEMONHOUSE, 255, 4, 7 + warp MAP_LAVENDER_TOWN_VOLUNTEERPOKEMONHOUSE, 255, 4, 7 waitstate release end diff --git a/data/maps/RocketHideout_Elevator/scripts.inc b/data/maps/RocketHideout_Elevator/scripts.inc index eaa62ba75..9b504ac68 100644 --- a/data/maps/RocketHideout_Elevator/scripts.inc +++ b/data/maps/RocketHideout_Elevator/scripts.inc @@ -60,7 +60,7 @@ EventScript_161554:: @ 8161554 EventScript_161591:: @ 8161591 setvar VAR_0x8006, 3 - setdynamicwarp MAP_ROCKETHIDEOUT_B1F, 255, 24, 25 + setdynamicwarp MAP_ROCKET_HIDEOUT_B1F, 255, 24, 25 compare_var_to_value VAR_0x403A, 3 goto_if 1, EventScript_161609 call EventScript_16160E @@ -72,7 +72,7 @@ EventScript_1615B8:: @ 81615B8 EventScript_1615B9:: @ 81615B9 setvar VAR_0x8006, 2 - setdynamicwarp MAP_ROCKETHIDEOUT_B2F, 255, 28, 16 + setdynamicwarp MAP_ROCKET_HIDEOUT_B2F, 255, 28, 16 compare_var_to_value VAR_0x403A, 2 goto_if 1, EventScript_161609 call EventScript_16160E @@ -84,7 +84,7 @@ EventScript_1615E0:: @ 81615E0 EventScript_1615E1:: @ 81615E1 setvar VAR_0x8006, 0 - setdynamicwarp MAP_ROCKETHIDEOUT_B4F, 255, 20, 23 + setdynamicwarp MAP_ROCKET_HIDEOUT_B4F, 255, 20, 23 compare_var_to_value VAR_0x403A, 0 goto_if 1, EventScript_161609 call EventScript_16160E diff --git a/data/maps/Route1/connections.inc b/data/maps/Route1/connections.inc index d266874a8..76b5b6814 100644 --- a/data/maps/Route1/connections.inc +++ b/data/maps/Route1/connections.inc @@ -1,6 +1,6 @@ Route1_MapConnectionsList: @ 83529DC - connection up, -12, MAP_VIRIDIANCITY - connection down, 0, MAP_PALLETTOWN + connection up, -12, MAP_VIRIDIAN_CITY + connection down, 0, MAP_PALLET_TOWN Route1_MapConnections:: @ 83529F4 .4byte 2 diff --git a/data/maps/Route10/connections.inc b/data/maps/Route10/connections.inc index 3b6a576d2..bd7b4787f 100644 --- a/data/maps/Route10/connections.inc +++ b/data/maps/Route10/connections.inc @@ -1,5 +1,5 @@ Route10_MapConnectionsList: @ 8352AFC - connection down, 0, MAP_LAVENDERTOWN + connection down, 0, MAP_LAVENDER_TOWN connection left, 0, MAP_ROUTE9 Route10_MapConnections:: @ 8352B14 diff --git a/data/maps/Route11/connections.inc b/data/maps/Route11/connections.inc index 3302f7844..d250bb844 100644 --- a/data/maps/Route11/connections.inc +++ b/data/maps/Route11/connections.inc @@ -1,5 +1,5 @@ Route11_MapConnectionsList: @ 8352B1C - connection left, -10, MAP_VERMILIONCITY + connection left, -10, MAP_VERMILION_CITY connection right, -60, MAP_ROUTE12 Route11_MapConnections:: @ 8352B34 diff --git a/data/maps/Route12/connections.inc b/data/maps/Route12/connections.inc index b33041939..ec99ba53b 100644 --- a/data/maps/Route12/connections.inc +++ b/data/maps/Route12/connections.inc @@ -1,5 +1,5 @@ Route12_MapConnectionsList: @ 8352B3C - connection up, 0, MAP_LAVENDERTOWN + connection up, 0, MAP_LAVENDER_TOWN connection down, -48, MAP_ROUTE13 connection left, 60, MAP_ROUTE11 diff --git a/data/maps/Route15/connections.inc b/data/maps/Route15/connections.inc index dfd4ba536..3706a64ed 100644 --- a/data/maps/Route15/connections.inc +++ b/data/maps/Route15/connections.inc @@ -1,5 +1,5 @@ Route15_MapConnectionsList: @ 8352BA8 - connection left, -10, MAP_FUCHSIACITY + connection left, -10, MAP_FUCHSIA_CITY connection right, -40, MAP_ROUTE14 Route15_MapConnections:: @ 8352BC0 diff --git a/data/maps/Route16/connections.inc b/data/maps/Route16/connections.inc index 5d1dc6f62..c48d0b461 100644 --- a/data/maps/Route16/connections.inc +++ b/data/maps/Route16/connections.inc @@ -1,6 +1,6 @@ Route16_MapConnectionsList: @ 8352BC8 connection down, 0, MAP_ROUTE17 - connection right, -10, MAP_CELADONCITY + connection right, -10, MAP_CELADON_CITY Route16_MapConnections:: @ 8352BE0 .4byte 2 diff --git a/data/maps/Route18/connections.inc b/data/maps/Route18/connections.inc index 93004416c..dd721edac 100644 --- a/data/maps/Route18/connections.inc +++ b/data/maps/Route18/connections.inc @@ -1,6 +1,6 @@ Route18_MapConnectionsList: @ 8352C08 connection up, 0, MAP_ROUTE17 - connection right, -10, MAP_FUCHSIACITY + connection right, -10, MAP_FUCHSIA_CITY Route18_MapConnections:: @ 8352C20 .4byte 2 diff --git a/data/maps/Route19/connections.inc b/data/maps/Route19/connections.inc index e41f1f3be..c93520d52 100644 --- a/data/maps/Route19/connections.inc +++ b/data/maps/Route19/connections.inc @@ -1,5 +1,5 @@ Route19_MapConnectionsList: @ 8352C28 - connection up, -12, MAP_FUCHSIACITY + connection up, -12, MAP_FUCHSIA_CITY connection left, 40, MAP_ROUTE20 Route19_MapConnections:: @ 8352C40 diff --git a/data/maps/Route2/connections.inc b/data/maps/Route2/connections.inc index 43b34821a..d37b77d96 100644 --- a/data/maps/Route2/connections.inc +++ b/data/maps/Route2/connections.inc @@ -1,6 +1,6 @@ Route2_MapConnectionsList: @ 83529FC - connection up, -12, MAP_PEWTERCITY - connection down, -12, MAP_VIRIDIANCITY + connection up, -12, MAP_PEWTER_CITY + connection down, -12, MAP_VIRIDIAN_CITY Route2_MapConnections:: @ 8352A14 .4byte 2 diff --git a/data/maps/Route20/connections.inc b/data/maps/Route20/connections.inc index 68e80a6df..36d679ff9 100644 --- a/data/maps/Route20/connections.inc +++ b/data/maps/Route20/connections.inc @@ -1,5 +1,5 @@ Route20_MapConnectionsList: @ 8352C48 - connection left, 0, MAP_CINNABARISLAND + connection left, 0, MAP_CINNABAR_ISLAND connection right, -40, MAP_ROUTE19 Route20_MapConnections:: @ 8352C60 diff --git a/data/maps/Route21_North/connections.inc b/data/maps/Route21_North/connections.inc index ab2268115..b272c4b9a 100644 --- a/data/maps/Route21_North/connections.inc +++ b/data/maps/Route21_North/connections.inc @@ -1,5 +1,5 @@ Route21_North_MapConnectionsList: @ 8352C68 - connection up, 0, MAP_PALLETTOWN + connection up, 0, MAP_PALLET_TOWN connection down, 0, MAP_ROUTE21_SOUTH Route21_North_MapConnections:: @ 8352C80 diff --git a/data/maps/Route21_South/connections.inc b/data/maps/Route21_South/connections.inc index 0342cf8db..13204e356 100644 --- a/data/maps/Route21_South/connections.inc +++ b/data/maps/Route21_South/connections.inc @@ -1,6 +1,6 @@ Route21_South_MapConnectionsList: @ 8352C88 connection up, 0, MAP_ROUTE21_NORTH - connection down, 0, MAP_CINNABARISLAND + connection down, 0, MAP_CINNABAR_ISLAND Route21_South_MapConnections:: @ 8352CA0 .4byte 2 diff --git a/data/maps/Route22/connections.inc b/data/maps/Route22/connections.inc index f7818efd5..f9c5a939b 100644 --- a/data/maps/Route22/connections.inc +++ b/data/maps/Route22/connections.inc @@ -1,6 +1,6 @@ Route22_MapConnectionsList: @ 8352CA8 connection up, 0, MAP_ROUTE23 - connection right, -10, MAP_VIRIDIANCITY + connection right, -10, MAP_VIRIDIAN_CITY Route22_MapConnections:: @ 8352CC0 .4byte 2 diff --git a/data/maps/Route23/connections.inc b/data/maps/Route23/connections.inc index 74319d6ef..9b052d1c7 100644 --- a/data/maps/Route23/connections.inc +++ b/data/maps/Route23/connections.inc @@ -1,5 +1,5 @@ Route23_MapConnectionsList: @ 8352CC8 - connection up, 0, MAP_INDIGOPLATEAU_EXTERIOR + connection up, 0, MAP_INDIGO_PLATEAU_EXTERIOR connection down, 0, MAP_ROUTE22 Route23_MapConnections:: @ 8352CE0 diff --git a/data/maps/Route24/connections.inc b/data/maps/Route24/connections.inc index 316966465..a255e904a 100644 --- a/data/maps/Route24/connections.inc +++ b/data/maps/Route24/connections.inc @@ -1,5 +1,5 @@ Route24_MapConnectionsList: @ 8352CE8 - connection down, -12, MAP_CERULEANCITY + connection down, -12, MAP_CERULEAN_CITY connection right, 0, MAP_ROUTE25 Route24_MapConnections:: @ 8352D00 diff --git a/data/maps/Route3/connections.inc b/data/maps/Route3/connections.inc index b1e352125..77fc58c67 100644 --- a/data/maps/Route3/connections.inc +++ b/data/maps/Route3/connections.inc @@ -1,6 +1,6 @@ Route3_MapConnectionsList: @ 8352A1C connection up, 60, MAP_ROUTE4 - connection left, -10, MAP_PEWTERCITY + connection left, -10, MAP_PEWTER_CITY Route3_MapConnections:: @ 8352A34 .4byte 2 diff --git a/data/maps/Route4/connections.inc b/data/maps/Route4/connections.inc index 3e735e3b3..7886e6c30 100644 --- a/data/maps/Route4/connections.inc +++ b/data/maps/Route4/connections.inc @@ -1,6 +1,6 @@ Route4_MapConnectionsList: @ 8352A3C connection down, -60, MAP_ROUTE3 - connection right, -10, MAP_CERULEANCITY + connection right, -10, MAP_CERULEAN_CITY Route4_MapConnections:: @ 8352A54 .4byte 2 diff --git a/data/maps/Route5/connections.inc b/data/maps/Route5/connections.inc index edf2fbc65..bf4730e02 100644 --- a/data/maps/Route5/connections.inc +++ b/data/maps/Route5/connections.inc @@ -1,6 +1,6 @@ Route5_MapConnectionsList: @ 8352A5C - connection up, 0, MAP_CERULEANCITY - connection down, 0, MAP_SAFFRONCITY + connection up, 0, MAP_CERULEAN_CITY + connection down, 0, MAP_SAFFRON_CITY Route5_MapConnections:: @ 8352A74 .4byte 2 diff --git a/data/maps/Route6/connections.inc b/data/maps/Route6/connections.inc index f4b3500bc..7f0a3d191 100644 --- a/data/maps/Route6/connections.inc +++ b/data/maps/Route6/connections.inc @@ -1,6 +1,6 @@ Route6_MapConnectionsList: @ 8352A7C - connection up, 0, MAP_SAFFRONCITY - connection down, -12, MAP_VERMILIONCITY + connection up, 0, MAP_SAFFRON_CITY + connection down, -12, MAP_VERMILION_CITY Route6_MapConnections:: @ 8352A94 .4byte 2 diff --git a/data/maps/Route7/connections.inc b/data/maps/Route7/connections.inc index 63d59a73a..dec257fa1 100644 --- a/data/maps/Route7/connections.inc +++ b/data/maps/Route7/connections.inc @@ -1,6 +1,6 @@ Route7_MapConnectionsList: @ 8352A9C - connection left, -10, MAP_CELADONCITY - connection right, -10, MAP_SAFFRONCITY + connection left, -10, MAP_CELADON_CITY + connection right, -10, MAP_SAFFRON_CITY Route7_MapConnections:: @ 8352AB4 .4byte 2 diff --git a/data/maps/Route8/connections.inc b/data/maps/Route8/connections.inc index 38d2746fe..864cc0831 100644 --- a/data/maps/Route8/connections.inc +++ b/data/maps/Route8/connections.inc @@ -1,6 +1,6 @@ Route8_MapConnectionsList: @ 8352ABC - connection left, -10, MAP_SAFFRONCITY - connection right, 0, MAP_LAVENDERTOWN + connection left, -10, MAP_SAFFRON_CITY + connection right, 0, MAP_LAVENDER_TOWN Route8_MapConnections:: @ 8352AD4 .4byte 2 diff --git a/data/maps/Route9/connections.inc b/data/maps/Route9/connections.inc index fb8906ece..6e4cb62e2 100644 --- a/data/maps/Route9/connections.inc +++ b/data/maps/Route9/connections.inc @@ -1,5 +1,5 @@ Route9_MapConnectionsList: @ 8352ADC - connection left, -10, MAP_CERULEANCITY + connection left, -10, MAP_CERULEAN_CITY connection right, 0, MAP_ROUTE10 Route9_MapConnections:: @ 8352AF4 diff --git a/data/maps/SSAnne_1F_Room11/scripts.inc b/data/maps/SSAnne_1F_Room11/scripts.inc index 4fe45988b..35696cb68 100644 --- a/data/maps/SSAnne_1F_Room11/scripts.inc +++ b/data/maps/SSAnne_1F_Room11/scripts.inc @@ -12,11 +12,11 @@ SSAnne_1F_Room11_MapScript1_16455F:: @ 816455F end EventScript_16457E:: @ 816457E - setescapewarp MAP_SIXISLAND_GREENPATH, 255, 64, 10 + setescapewarp MAP_SIX_ISLAND_GREENPATH, 255, 64, 10 return EventScript_164587:: @ 8164587 - setescapewarp MAP_SIXISLAND_GREENPATH, 255, 45, 10 + setescapewarp MAP_SIX_ISLAND_GREENPATH, 255, 45, 10 return SSAnne_1F_Room11_EventScript_164590:: @ 8164590 diff --git a/data/maps/SSAnne_Exterior/scripts.inc b/data/maps/SSAnne_Exterior/scripts.inc index 1bcec87a2..6a4e14a50 100644 --- a/data/maps/SSAnne_Exterior/scripts.inc +++ b/data/maps/SSAnne_Exterior/scripts.inc @@ -27,7 +27,7 @@ SSAnne_Exterior_160859:: @ 8160859 waitmovement 0 setvar VAR_0x407E, 2 setvar VAR_0x4053, 0 - warp MAP_VERMILIONCITY, 255, 23, 34 + warp MAP_VERMILION_CITY, 255, 23, 34 waitstate releaseall end diff --git a/data/maps/SeafoamIslands_B3F/scripts.inc b/data/maps/SeafoamIslands_B3F/scripts.inc index 1469509eb..ee619cb70 100644 --- a/data/maps/SeafoamIslands_B3F/scripts.inc +++ b/data/maps/SeafoamIslands_B3F/scripts.inc @@ -25,7 +25,7 @@ EventScript_162F90:: @ 8162F90 return EventScript_162F94:: @ 8162F94 - setmaplayoutindex LAYOUT_UNUSEDLAYOUT_833B6EC + setmaplayoutindex LAYOUT_UNUSED_LAYOUT_833B6EC return SeafoamIslands_B3F_MapScript2_162F98:: @ 8162F98 @@ -47,7 +47,7 @@ EventScript_162FA2:: @ 8162FA2 compare_var_to_value VAR_0x8008, 24 call_if 4, EventScript_163001 setvar VAR_0x4063, 1 - warp MAP_SEAFOAMISLANDS_B4F, 255, 27, 21 + warp MAP_SEAFOAM_ISLANDS_B4F, 255, 27, 21 waitstate releaseall end diff --git a/data/maps/SeafoamIslands_B4F/scripts.inc b/data/maps/SeafoamIslands_B4F/scripts.inc index a202650ee..47d6deec2 100644 --- a/data/maps/SeafoamIslands_B4F/scripts.inc +++ b/data/maps/SeafoamIslands_B4F/scripts.inc @@ -42,7 +42,7 @@ EventScript_1630A5:: @ 81630A5 return EventScript_1630A9:: @ 81630A9 - setmaplayoutindex LAYOUT_UNUSEDLAYOUT_833BE30 + setmaplayoutindex LAYOUT_UNUSED_LAYOUT_833BE30 return EventScript_1630AD:: @ 81630AD diff --git a/data/maps/SevenIsland/connections.inc b/data/maps/SevenIsland/connections.inc index 307457174..37634bef6 100644 --- a/data/maps/SevenIsland/connections.inc +++ b/data/maps/SevenIsland/connections.inc @@ -1,6 +1,6 @@ SevenIsland_MapConnectionsList: @ 83529A8 - connection up, -48, MAP_SEVENISLAND_TRAINERTOWER - connection down, 0, MAP_SEVENISLAND_SEVAULTCANYON_ENTRANCE + connection up, -48, MAP_SEVEN_ISLAND_TRAINERTOWER + connection down, 0, MAP_SEVEN_ISLAND_SEVAULTCANYON_ENTRANCE SevenIsland_MapConnections:: @ 83529C0 .4byte 2 diff --git a/data/maps/SevenIsland_House_Room1/scripts.inc b/data/maps/SevenIsland_House_Room1/scripts.inc index 4838fb2cf..6b7b8acd4 100644 --- a/data/maps/SevenIsland_House_Room1/scripts.inc +++ b/data/maps/SevenIsland_House_Room1/scripts.inc @@ -15,7 +15,7 @@ EventScript_1708AF:: @ 81708AF setvar VAR_0x4001, 1 setobjectxyperm 1, 4, 2 setobjectmovementtype 1, 8 - setmaplayoutindex LAYOUT_UNUSEDLAYOUT_8338B4C + setmaplayoutindex LAYOUT_UNUSED_LAYOUT_8338B4C return EventScript_1708C3:: @ 81708C3 @@ -122,7 +122,7 @@ EventScript_170987:: @ 8170987 call_if 1, EventScript_170A3F compare_var_to_value VAR_FACING, 3 call_if 1, EventScript_170A51 - warp MAP_SEVENISLAND_HOUSE_ROOM2, 255, 3, 1 + warp MAP_SEVEN_ISLAND_HOUSE_ROOM2, 255, 3, 1 waitstate release end diff --git a/data/maps/SevenIsland_House_Room2/scripts.inc b/data/maps/SevenIsland_House_Room2/scripts.inc index 13d5e0170..0d10a3bec 100644 --- a/data/maps/SevenIsland_House_Room2/scripts.inc +++ b/data/maps/SevenIsland_House_Room2/scripts.inc @@ -35,7 +35,7 @@ EventScript_170A97:: @ 8170A97 waitmovement 0 special LoadPlayerParty setvar VAR_0x4001, 1 - warp MAP_SEVENISLAND_HOUSE_ROOM1, 255, 4, 1 + warp MAP_SEVEN_ISLAND_HOUSE_ROOM1, 255, 4, 1 waitstate releaseall end diff --git a/data/maps/SevenIsland_SevaultCanyon/connections.inc b/data/maps/SevenIsland_SevaultCanyon/connections.inc index a1f25bbdc..a721d7165 100644 --- a/data/maps/SevenIsland_SevaultCanyon/connections.inc +++ b/data/maps/SevenIsland_SevaultCanyon/connections.inc @@ -1,6 +1,6 @@ SevenIsland_SevaultCanyon_MapConnectionsList: @ 8352EB8 - connection down, -48, MAP_SEVENISLAND_TANOBYRUINS - connection left, -20, MAP_SEVENISLAND_SEVAULTCANYON_ENTRANCE + connection down, -48, MAP_SEVEN_ISLAND_TANOBYRUINS + connection left, -20, MAP_SEVEN_ISLAND_SEVAULTCANYON_ENTRANCE SevenIsland_SevaultCanyon_MapConnections:: @ 8352ED0 .4byte 2 diff --git a/data/maps/SevenIsland_SevaultCanyon_Entrance/connections.inc b/data/maps/SevenIsland_SevaultCanyon_Entrance/connections.inc index c4f3ade75..f2f113fcd 100644 --- a/data/maps/SevenIsland_SevaultCanyon_Entrance/connections.inc +++ b/data/maps/SevenIsland_SevaultCanyon_Entrance/connections.inc @@ -1,6 +1,6 @@ SevenIsland_SevaultCanyon_Entrance_MapConnectionsList: @ 8352E98 - connection up, 0, MAP_SEVENISLAND - connection right, 20, MAP_SEVENISLAND_SEVAULTCANYON + connection up, 0, MAP_SEVEN_ISLAND + connection right, 20, MAP_SEVEN_ISLAND_SEVAULTCANYON SevenIsland_SevaultCanyon_Entrance_MapConnections:: @ 8352EB0 .4byte 2 diff --git a/data/maps/SevenIsland_TanobyRuins/connections.inc b/data/maps/SevenIsland_TanobyRuins/connections.inc index 12dd24cdf..988852ae9 100644 --- a/data/maps/SevenIsland_TanobyRuins/connections.inc +++ b/data/maps/SevenIsland_TanobyRuins/connections.inc @@ -1,5 +1,5 @@ SevenIsland_TanobyRuins_MapConnectionsList: @ 8352ED8 - connection up, 48, MAP_SEVENISLAND_SEVAULTCANYON + connection up, 48, MAP_SEVEN_ISLAND_SEVAULTCANYON SevenIsland_TanobyRuins_MapConnections:: @ 8352EE4 .4byte 1 diff --git a/data/maps/SevenIsland_TrainerTower/connections.inc b/data/maps/SevenIsland_TrainerTower/connections.inc index d6a8c579c..4c55ced6e 100644 --- a/data/maps/SevenIsland_TrainerTower/connections.inc +++ b/data/maps/SevenIsland_TrainerTower/connections.inc @@ -1,5 +1,5 @@ SevenIsland_TrainerTower_MapConnectionsList: @ 8352E84 - connection down, 48, MAP_SEVENISLAND + connection down, 48, MAP_SEVEN_ISLAND SevenIsland_TrainerTower_MapConnections:: @ 8352E90 .4byte 1 diff --git a/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc b/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc index b26dec885..725b043e5 100644 --- a/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc @@ -45,7 +45,7 @@ EventScript_164B5E:: @ 8164B5E EventScript_164B90:: @ 8164B90 setvar VAR_0x8006, 3 - setdynamicwarp MAP_SEVENISLAND_TRAINERTOWER_LOBBY, 255, 17, 8 + setdynamicwarp MAP_SEVEN_ISLAND_TRAINERTOWER_LOBBY, 255, 17, 8 compare_var_to_value VAR_0x403A, 3 goto_if 1, EventScript_164BD3 call EventScript_164BD8 @@ -54,7 +54,7 @@ EventScript_164B90:: @ 8164B90 delay 25 applymovement 255, Movement_164BE5 waitmovement 0 - warp MAP_SEVENISLAND_TRAINERTOWER_LOBBY, 255, 17, 8 + warp MAP_SEVEN_ISLAND_TRAINERTOWER_LOBBY, 255, 17, 8 waitstate releaseall end diff --git a/data/maps/SilphCo_Elevator/scripts.inc b/data/maps/SilphCo_Elevator/scripts.inc index 2f2760c5f..118d5efd4 100644 --- a/data/maps/SilphCo_Elevator/scripts.inc +++ b/data/maps/SilphCo_Elevator/scripts.inc @@ -45,7 +45,7 @@ SilphCo_Elevator_EventScript_161F6F:: @ 8161F6F EventScript_16202F:: @ 816202F setvar VAR_0x8006, 4 - setdynamicwarp MAP_SILPHCO_1F, 255, 22, 3 + setdynamicwarp MAP_SILPH_CO_1F, 255, 22, 3 compare_var_to_value VAR_0x403A, 4 goto_if 1, EventScript_1621E7 call EventScript_1621EC @@ -57,7 +57,7 @@ EventScript_162056:: @ 8162056 EventScript_162057:: @ 8162057 setvar VAR_0x8006, 5 - setdynamicwarp MAP_SILPHCO_2F, 255, 22, 3 + setdynamicwarp MAP_SILPH_CO_2F, 255, 22, 3 compare_var_to_value VAR_0x403A, 5 goto_if 1, EventScript_1621E7 call EventScript_1621EC @@ -69,7 +69,7 @@ EventScript_16207E:: @ 816207E EventScript_16207F:: @ 816207F setvar VAR_0x8006, 6 - setdynamicwarp MAP_SILPHCO_3F, 255, 22, 3 + setdynamicwarp MAP_SILPH_CO_3F, 255, 22, 3 compare_var_to_value VAR_0x403A, 6 goto_if 1, EventScript_1621E7 call EventScript_1621EC @@ -81,7 +81,7 @@ EventScript_1620A6:: @ 81620A6 EventScript_1620A7:: @ 81620A7 setvar VAR_0x8006, 7 - setdynamicwarp MAP_SILPHCO_4F, 255, 22, 3 + setdynamicwarp MAP_SILPH_CO_4F, 255, 22, 3 compare_var_to_value VAR_0x403A, 7 goto_if 1, EventScript_1621E7 call EventScript_1621EC @@ -93,7 +93,7 @@ EventScript_1620CE:: @ 81620CE EventScript_1620CF:: @ 81620CF setvar VAR_0x8006, 8 - setdynamicwarp MAP_SILPHCO_5F, 255, 22, 3 + setdynamicwarp MAP_SILPH_CO_5F, 255, 22, 3 compare_var_to_value VAR_0x403A, 8 goto_if 1, EventScript_1621E7 call EventScript_1621EC @@ -105,7 +105,7 @@ EventScript_1620F6:: @ 81620F6 EventScript_1620F7:: @ 81620F7 setvar VAR_0x8006, 9 - setdynamicwarp MAP_SILPHCO_6F, 255, 20, 3 + setdynamicwarp MAP_SILPH_CO_6F, 255, 20, 3 compare_var_to_value VAR_0x403A, 9 goto_if 1, EventScript_1621E7 call EventScript_1621EC @@ -117,7 +117,7 @@ EventScript_16211E:: @ 816211E EventScript_16211F:: @ 816211F setvar VAR_0x8006, 10 - setdynamicwarp MAP_SILPHCO_7F, 255, 23, 3 + setdynamicwarp MAP_SILPH_CO_7F, 255, 23, 3 compare_var_to_value VAR_0x403A, 10 goto_if 1, EventScript_1621E7 call EventScript_1621EC @@ -129,7 +129,7 @@ EventScript_162146:: @ 8162146 EventScript_162147:: @ 8162147 setvar VAR_0x8006, 11 - setdynamicwarp MAP_SILPHCO_8F, 255, 22, 3 + setdynamicwarp MAP_SILPH_CO_8F, 255, 22, 3 compare_var_to_value VAR_0x403A, 11 goto_if 1, EventScript_1621E7 call EventScript_1621EC @@ -141,7 +141,7 @@ EventScript_16216E:: @ 816216E EventScript_16216F:: @ 816216F setvar VAR_0x8006, 12 - setdynamicwarp MAP_SILPHCO_9F, 255, 24, 3 + setdynamicwarp MAP_SILPH_CO_9F, 255, 24, 3 compare_var_to_value VAR_0x403A, 12 goto_if 1, EventScript_1621E7 call EventScript_1621EC @@ -153,7 +153,7 @@ EventScript_162196:: @ 8162196 EventScript_162197:: @ 8162197 setvar VAR_0x8006, 13 - setdynamicwarp MAP_SILPHCO_10F, 255, 13, 3 + setdynamicwarp MAP_SILPH_CO_10F, 255, 13, 3 compare_var_to_value VAR_0x403A, 13 goto_if 1, EventScript_1621E7 call EventScript_1621EC @@ -165,7 +165,7 @@ EventScript_1621BE:: @ 81621BE EventScript_1621BF:: @ 81621BF setvar VAR_0x8006, 14 - setdynamicwarp MAP_SILPHCO_11F, 255, 13, 3 + setdynamicwarp MAP_SILPH_CO_11F, 255, 13, 3 compare_var_to_value VAR_0x403A, 14 goto_if 1, EventScript_1621E7 call EventScript_1621EC diff --git a/data/maps/SixIsland/connections.inc b/data/maps/SixIsland/connections.inc index 771221d95..712c8e2cf 100644 --- a/data/maps/SixIsland/connections.inc +++ b/data/maps/SixIsland/connections.inc @@ -1,5 +1,5 @@ SixIsland_MapConnectionsList: @ 83529C8 - connection right, -40, MAP_SIXISLAND_WATERPATH + connection right, -40, MAP_SIX_ISLAND_WATERPATH SixIsland_MapConnections:: @ 83529D4 .4byte 1 diff --git a/data/maps/SixIsland_GreenPath/connections.inc b/data/maps/SixIsland_GreenPath/connections.inc index ce5b74baa..d79db04f9 100644 --- a/data/maps/SixIsland_GreenPath/connections.inc +++ b/data/maps/SixIsland_GreenPath/connections.inc @@ -1,6 +1,6 @@ SixIsland_GreenPath_MapConnectionsList: @ 8352E24 - connection up, 0, MAP_SIXISLAND_OUTCASTISLAND - connection right, 0, MAP_SIXISLAND_WATERPATH + connection up, 0, MAP_SIX_ISLAND_OUTCASTISLAND + connection right, 0, MAP_SIX_ISLAND_WATERPATH SixIsland_GreenPath_MapConnections:: @ 8352E3C .4byte 2 diff --git a/data/maps/SixIsland_OutcastIsland/connections.inc b/data/maps/SixIsland_OutcastIsland/connections.inc index d5159adec..90a67ec97 100644 --- a/data/maps/SixIsland_OutcastIsland/connections.inc +++ b/data/maps/SixIsland_OutcastIsland/connections.inc @@ -1,5 +1,5 @@ SixIsland_OutcastIsland_MapConnectionsList: @ 8352E10 - connection down, 0, MAP_SIXISLAND_GREENPATH + connection down, 0, MAP_SIX_ISLAND_GREENPATH SixIsland_OutcastIsland_MapConnections:: @ 8352E1C .4byte 1 diff --git a/data/maps/SixIsland_RuinValley/connections.inc b/data/maps/SixIsland_RuinValley/connections.inc index 6755f6439..0ac741f5e 100644 --- a/data/maps/SixIsland_RuinValley/connections.inc +++ b/data/maps/SixIsland_RuinValley/connections.inc @@ -1,5 +1,5 @@ SixIsland_RuinValley_MapConnectionsList: @ 8352E70 - connection right, -80, MAP_SIXISLAND_WATERPATH + connection right, -80, MAP_SIX_ISLAND_WATERPATH SixIsland_RuinValley_MapConnections:: @ 8352E7C .4byte 1 diff --git a/data/maps/SixIsland_WaterPath/connections.inc b/data/maps/SixIsland_WaterPath/connections.inc index ab01a61ee..d6849fbb2 100644 --- a/data/maps/SixIsland_WaterPath/connections.inc +++ b/data/maps/SixIsland_WaterPath/connections.inc @@ -1,7 +1,7 @@ SixIsland_WaterPath_MapConnectionsList: @ 8352E44 - connection left, 0, MAP_SIXISLAND_GREENPATH - connection left, 40, MAP_SIXISLAND - connection left, 80, MAP_SIXISLAND_RUINVALLEY + connection left, 0, MAP_SIX_ISLAND_GREENPATH + connection left, 40, MAP_SIX_ISLAND + connection left, 80, MAP_SIX_ISLAND_RUINVALLEY SixIsland_WaterPath_MapConnections:: @ 8352E68 .4byte 3 diff --git a/data/maps/ThreeIsland/connections.inc b/data/maps/ThreeIsland/connections.inc index 1d79c0e6a..2f2d49e94 100644 --- a/data/maps/ThreeIsland/connections.inc +++ b/data/maps/ThreeIsland/connections.inc @@ -1,6 +1,6 @@ ThreeIsland_MapConnectionsList: @ 8352968 - connection down, 0, MAP_THREEISLAND_PORT - connection left, 0, MAP_THREEISLAND_BONDBRIDGE + connection down, 0, MAP_THREE_ISLAND_PORT + connection left, 0, MAP_THREE_ISLAND_BONDBRIDGE ThreeIsland_MapConnections:: @ 8352980 .4byte 2 diff --git a/data/maps/ThreeIsland_BerryForest/scripts.inc b/data/maps/ThreeIsland_BerryForest/scripts.inc index d6cbbdedf..84eb22b43 100644 --- a/data/maps/ThreeIsland_BerryForest/scripts.inc +++ b/data/maps/ThreeIsland_BerryForest/scripts.inc @@ -4,7 +4,7 @@ ThreeIsland_BerryForest_MapScripts:: @ 8163C71 ThreeIsland_BerryForest_MapScript1_163C77:: @ 8163C77 setworldmapflag 2231 - setescapewarp MAP_THREEISLAND_BONDBRIDGE, 255, 12, 6 + setescapewarp MAP_THREE_ISLAND_BONDBRIDGE, 255, 12, 6 end ThreeIsland_BerryForest_EventScript_163C83:: @ 8163C83 @@ -45,7 +45,7 @@ ThreeIsland_BerryForest_EventScript_163C83:: @ 8163C83 setflag FLAG_0x07A setvar VAR_0x4079, 2 clearflag FLAG_0x075 - warp MAP_TWOISLAND_JOYFULGAMECORNER, 255, 6, 6 + warp MAP_TWO_ISLAND_JOYFULGAMECORNER, 255, 6, 6 waitstate release end diff --git a/data/maps/ThreeIsland_BondBridge/connections.inc b/data/maps/ThreeIsland_BondBridge/connections.inc index 113123ac1..ccbb788ec 100644 --- a/data/maps/ThreeIsland_BondBridge/connections.inc +++ b/data/maps/ThreeIsland_BondBridge/connections.inc @@ -1,5 +1,5 @@ ThreeIsland_BondBridge_MapConnectionsList: @ 8352D58 - connection right, 0, MAP_THREEISLAND + connection right, 0, MAP_THREE_ISLAND ThreeIsland_BondBridge_MapConnections:: @ 8352D64 .4byte 1 diff --git a/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc b/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc index d90dbfd44..dcc142a8d 100644 --- a/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc +++ b/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc @@ -13,7 +13,7 @@ ThreeIsland_DunsparceTunnel_MapScript1_164D2C:: @ 8164D2C end EventScript_164D50:: @ 8164D50 - setmaplayoutindex LAYOUT_UNUSEDLAYOUT_83453C0 + setmaplayoutindex LAYOUT_UNUSED_LAYOUT_83453C0 return EventScript_164D54:: @ 8164D54 diff --git a/data/maps/ThreeIsland_Port/connections.inc b/data/maps/ThreeIsland_Port/connections.inc index 013d046fb..0c166e50d 100644 --- a/data/maps/ThreeIsland_Port/connections.inc +++ b/data/maps/ThreeIsland_Port/connections.inc @@ -1,5 +1,5 @@ ThreeIsland_Port_MapConnectionsList: @ 8352D6C - connection up, 0, MAP_THREEISLAND + connection up, 0, MAP_THREE_ISLAND ThreeIsland_Port_MapConnections:: @ 8352D78 .4byte 1 diff --git a/data/maps/TwoIsland/connections.inc b/data/maps/TwoIsland/connections.inc index fa4754db1..3cd53b58f 100644 --- a/data/maps/TwoIsland/connections.inc +++ b/data/maps/TwoIsland/connections.inc @@ -1,5 +1,5 @@ TwoIsland_MapConnectionsList: @ 8352954 - connection up, 24, MAP_TWOISLAND_CAPEBRINK + connection up, 24, MAP_TWO_ISLAND_CAPEBRINK TwoIsland_MapConnections:: @ 8352960 .4byte 1 diff --git a/data/maps/TwoIsland_CapeBrink/connections.inc b/data/maps/TwoIsland_CapeBrink/connections.inc index f1fc32b1b..0257526a9 100644 --- a/data/maps/TwoIsland_CapeBrink/connections.inc +++ b/data/maps/TwoIsland_CapeBrink/connections.inc @@ -1,5 +1,5 @@ TwoIsland_CapeBrink_MapConnectionsList: @ 8352D44 - connection down, -24, MAP_TWOISLAND + connection down, -24, MAP_TWO_ISLAND TwoIsland_CapeBrink_MapConnections:: @ 8352D50 .4byte 1 diff --git a/data/maps/UnknownMap_03_50/connections.inc b/data/maps/UnknownMap_03_50/connections.inc index 272c4d026..e975befbc 100644 --- a/data/maps/UnknownMap_03_50/connections.inc +++ b/data/maps/UnknownMap_03_50/connections.inc @@ -1,5 +1,5 @@ UnknownMap_03_50_MapConnectionsList: @ 8352D80 - connection up, 0, MAP_THREEISLAND + connection up, 0, MAP_THREE_ISLAND UnknownMap_03_50_MapConnections:: @ 8352D8C .4byte 1 diff --git a/data/maps/UnknownMap_03_51/connections.inc b/data/maps/UnknownMap_03_51/connections.inc index 034c0c42b..a742682c4 100644 --- a/data/maps/UnknownMap_03_51/connections.inc +++ b/data/maps/UnknownMap_03_51/connections.inc @@ -1,5 +1,5 @@ UnknownMap_03_51_MapConnectionsList: @ 8352D94 - connection up, 0, MAP_THREEISLAND + connection up, 0, MAP_THREE_ISLAND UnknownMap_03_51_MapConnections:: @ 8352DA0 .4byte 1 -- cgit v1.2.3 From 55d66b51770b4f657ed55822e7e76f6d6e3261d8 Mon Sep 17 00:00:00 2001 From: garak Date: Mon, 13 May 2019 19:44:24 -0400 Subject: convert map data to json --- data/maps/.gitignore | 7 + data/maps/BirthIsland_Exterior/events.inc | 9 - data/maps/BirthIsland_Exterior/header.inc | 8 - data/maps/BirthIsland_Exterior/map.json | 54 ++ data/maps/BirthIsland_Harbor/events.inc | 9 - data/maps/BirthIsland_Harbor/header.inc | 8 - data/maps/BirthIsland_Harbor/map.json | 54 ++ data/maps/CeladonCity/connections.inc | 7 - data/maps/CeladonCity/events.inc | 45 -- data/maps/CeladonCity/header.inc | 8 - data/maps/CeladonCity/map.json | 384 +++++++++++++ data/maps/CeladonCity_Condominiums_1F/events.inc | 20 - data/maps/CeladonCity_Condominiums_1F/header.inc | 8 - data/maps/CeladonCity_Condominiums_1F/map.json | 130 +++++ data/maps/CeladonCity_Condominiums_2F/events.inc | 16 - data/maps/CeladonCity_Condominiums_2F/header.inc | 8 - data/maps/CeladonCity_Condominiums_2F/map.json | 90 +++ data/maps/CeladonCity_Condominiums_3F/events.inc | 24 - data/maps/CeladonCity_Condominiums_3F/header.inc | 8 - data/maps/CeladonCity_Condominiums_3F/map.json | 158 ++++++ data/maps/CeladonCity_Condominiums_Roof/events.inc | 11 - data/maps/CeladonCity_Condominiums_Roof/header.inc | 8 - data/maps/CeladonCity_Condominiums_Roof/map.json | 56 ++ .../CeladonCity_Condominiums_RoofRoom/events.inc | 16 - .../CeladonCity_Condominiums_RoofRoom/header.inc | 8 - .../CeladonCity_Condominiums_RoofRoom/map.json | 90 +++ .../maps/CeladonCity_DepartmentStore_1F/events.inc | 19 - .../maps/CeladonCity_DepartmentStore_1F/header.inc | 8 - data/maps/CeladonCity_DepartmentStore_1F/map.json | 105 ++++ .../maps/CeladonCity_DepartmentStore_2F/events.inc | 16 - .../maps/CeladonCity_DepartmentStore_2F/header.inc | 8 - data/maps/CeladonCity_DepartmentStore_2F/map.json | 102 ++++ .../maps/CeladonCity_DepartmentStore_3F/events.inc | 27 - .../maps/CeladonCity_DepartmentStore_3F/header.inc | 8 - data/maps/CeladonCity_DepartmentStore_3F/map.json | 185 ++++++ .../maps/CeladonCity_DepartmentStore_4F/events.inc | 15 - .../maps/CeladonCity_DepartmentStore_4F/header.inc | 8 - data/maps/CeladonCity_DepartmentStore_4F/map.json | 89 +++ .../maps/CeladonCity_DepartmentStore_5F/events.inc | 16 - .../maps/CeladonCity_DepartmentStore_5F/header.inc | 8 - data/maps/CeladonCity_DepartmentStore_5F/map.json | 102 ++++ .../events.inc | 10 - .../header.inc | 8 - .../CeladonCity_DepartmentStore_Elevator/map.json | 49 ++ .../scripts.inc | 10 +- .../CeladonCity_DepartmentStore_Roof/events.inc | 15 - .../CeladonCity_DepartmentStore_Roof/header.inc | 8 - .../maps/CeladonCity_DepartmentStore_Roof/map.json | 83 +++ data/maps/CeladonCity_GameCorner/events.inc | 59 -- data/maps/CeladonCity_GameCorner/header.inc | 8 - data/maps/CeladonCity_GameCorner/map.json | 469 ++++++++++++++++ .../CeladonCity_GameCorner_PrizeRoom/events.inc | 14 - .../CeladonCity_GameCorner_PrizeRoom/header.inc | 8 - .../maps/CeladonCity_GameCorner_PrizeRoom/map.json | 107 ++++ data/maps/CeladonCity_Gym/events.inc | 24 - data/maps/CeladonCity_Gym/header.inc | 8 - data/maps/CeladonCity_Gym/map.json | 200 +++++++ data/maps/CeladonCity_Hotel/events.inc | 13 - data/maps/CeladonCity_Hotel/header.inc | 8 - data/maps/CeladonCity_Hotel/map.json | 94 ++++ data/maps/CeladonCity_House1/events.inc | 12 - data/maps/CeladonCity_House1/header.inc | 8 - data/maps/CeladonCity_House1/map.json | 81 +++ data/maps/CeladonCity_PokemonCenter_1F/events.inc | 14 - data/maps/CeladonCity_PokemonCenter_1F/header.inc | 8 - data/maps/CeladonCity_PokemonCenter_1F/map.json | 101 ++++ data/maps/CeladonCity_PokemonCenter_2F/events.inc | 13 - data/maps/CeladonCity_PokemonCenter_2F/header.inc | 8 - data/maps/CeladonCity_PokemonCenter_2F/map.json | 94 ++++ data/maps/CeladonCity_Restaurant/events.inc | 14 - data/maps/CeladonCity_Restaurant/header.inc | 8 - data/maps/CeladonCity_Restaurant/map.json | 107 ++++ data/maps/CeruleanCave_1F/events.inc | 26 - data/maps/CeruleanCave_1F/header.inc | 8 - data/maps/CeruleanCave_1F/map.json | 204 +++++++ data/maps/CeruleanCave_2F/events.inc | 25 - data/maps/CeruleanCave_2F/header.inc | 8 - data/maps/CeruleanCave_2F/map.json | 232 ++++++++ data/maps/CeruleanCave_B1F/events.inc | 19 - data/maps/CeruleanCave_B1F/header.inc | 8 - data/maps/CeruleanCave_B1F/map.json | 184 ++++++ data/maps/CeruleanCity/connections.inc | 9 - data/maps/CeruleanCity/events.inc | 49 -- data/maps/CeruleanCity/events_bad.inc | 43 ++ data/maps/CeruleanCity/header.inc | 8 - data/maps/CeruleanCity/map.json | 401 +++++++++++++ data/maps/CeruleanCity_BikeShop/events.inc | 22 - data/maps/CeruleanCity_BikeShop/header.inc | 8 - data/maps/CeruleanCity_BikeShop/map.json | 138 +++++ data/maps/CeruleanCity_Gym/events.inc | 17 - data/maps/CeruleanCity_Gym/header.inc | 8 - data/maps/CeruleanCity_Gym/map.json | 109 ++++ data/maps/CeruleanCity_House1/events.inc | 11 - data/maps/CeruleanCity_House1/header.inc | 8 - data/maps/CeruleanCity_House1/map.json | 62 ++ data/maps/CeruleanCity_House2/events.inc | 15 - data/maps/CeruleanCity_House2/header.inc | 8 - data/maps/CeruleanCity_House2/map.json | 83 +++ data/maps/CeruleanCity_House3/events.inc | 11 - data/maps/CeruleanCity_House3/header.inc | 8 - data/maps/CeruleanCity_House3/map.json | 68 +++ data/maps/CeruleanCity_House4/events.inc | 8 - data/maps/CeruleanCity_House4/header.inc | 8 - data/maps/CeruleanCity_House4/map.json | 41 ++ data/maps/CeruleanCity_House5/events.inc | 11 - data/maps/CeruleanCity_House5/header.inc | 8 - data/maps/CeruleanCity_House5/map.json | 49 ++ data/maps/CeruleanCity_Mart/events.inc | 12 - data/maps/CeruleanCity_Mart/header.inc | 8 - data/maps/CeruleanCity_Mart/map.json | 81 +++ data/maps/CeruleanCity_PokemonCenter_1F/events.inc | 17 - data/maps/CeruleanCity_PokemonCenter_1F/header.inc | 8 - data/maps/CeruleanCity_PokemonCenter_1F/map.json | 140 +++++ data/maps/CeruleanCity_PokemonCenter_2F/events.inc | 13 - data/maps/CeruleanCity_PokemonCenter_2F/header.inc | 8 - data/maps/CeruleanCity_PokemonCenter_2F/map.json | 94 ++++ data/maps/CinnabarIsland/connections.inc | 7 - data/maps/CinnabarIsland/events.inc | 24 - data/maps/CinnabarIsland/header.inc | 8 - data/maps/CinnabarIsland/map.json | 158 ++++++ data/maps/CinnabarIsland_Gym/events.inc | 35 -- data/maps/CinnabarIsland_Gym/header.inc | 8 - data/maps/CinnabarIsland_Gym/map.json | 265 +++++++++ data/maps/CinnabarIsland_Mart/events.inc | 12 - data/maps/CinnabarIsland_Mart/header.inc | 8 - data/maps/CinnabarIsland_Mart/map.json | 81 +++ .../CinnabarIsland_PokemonCenter_1F/events.inc | 17 - .../CinnabarIsland_PokemonCenter_1F/header.inc | 8 - data/maps/CinnabarIsland_PokemonCenter_1F/map.json | 140 +++++ .../CinnabarIsland_PokemonCenter_2F/events.inc | 13 - .../CinnabarIsland_PokemonCenter_2F/header.inc | 8 - data/maps/CinnabarIsland_PokemonCenter_2F/map.json | 94 ++++ .../CinnabarIsland_PokemonLab_Entrance/events.inc | 19 - .../CinnabarIsland_PokemonLab_Entrance/header.inc | 8 - .../CinnabarIsland_PokemonLab_Entrance/map.json | 105 ++++ .../events.inc | 9 - .../header.inc | 8 - .../map.json | 54 ++ .../CinnabarIsland_PokemonLab_Lounge/events.inc | 10 - .../CinnabarIsland_PokemonLab_Lounge/header.inc | 8 - .../maps/CinnabarIsland_PokemonLab_Lounge/map.json | 67 +++ .../events.inc | 13 - .../header.inc | 8 - .../map.json | 69 +++ data/maps/DiglettsCave_B1F/events.inc | 6 - data/maps/DiglettsCave_B1F/header.inc | 8 - data/maps/DiglettsCave_B1F/map.json | 34 ++ data/maps/DiglettsCave_NorthEntrance/events.inc | 9 - data/maps/DiglettsCave_NorthEntrance/header.inc | 8 - data/maps/DiglettsCave_NorthEntrance/map.json | 48 ++ data/maps/DiglettsCave_SouthEntrance/events.inc | 9 - data/maps/DiglettsCave_SouthEntrance/header.inc | 8 - data/maps/DiglettsCave_SouthEntrance/map.json | 48 ++ data/maps/FiveIsland/connections.inc | 7 - data/maps/FiveIsland/events.inc | 16 - data/maps/FiveIsland/header.inc | 8 - data/maps/FiveIsland/map.json | 107 ++++ data/maps/FiveIsland_Harbor/events.inc | 9 - data/maps/FiveIsland_Harbor/header.inc | 8 - data/maps/FiveIsland_Harbor/map.json | 54 ++ data/maps/FiveIsland_House1/events.inc | 8 - data/maps/FiveIsland_House1/header.inc | 8 - data/maps/FiveIsland_House1/map.json | 41 ++ data/maps/FiveIsland_House2/events.inc | 8 - data/maps/FiveIsland_House2/header.inc | 8 - data/maps/FiveIsland_House2/map.json | 41 ++ data/maps/FiveIsland_LostCave_Entrance/events.inc | 6 - data/maps/FiveIsland_LostCave_Entrance/header.inc | 8 - data/maps/FiveIsland_LostCave_Entrance/map.json | 34 ++ data/maps/FiveIsland_LostCave_Room1/events.inc | 12 - data/maps/FiveIsland_LostCave_Room1/header.inc | 8 - data/maps/FiveIsland_LostCave_Room1/map.json | 69 +++ data/maps/FiveIsland_LostCave_Room10/events.inc | 9 - data/maps/FiveIsland_LostCave_Room10/header.inc | 8 - data/maps/FiveIsland_LostCave_Room10/map.json | 54 ++ data/maps/FiveIsland_LostCave_Room10/scripts.inc | 2 +- data/maps/FiveIsland_LostCave_Room11/events.inc | 8 - data/maps/FiveIsland_LostCave_Room11/header.inc | 8 - data/maps/FiveIsland_LostCave_Room11/map.json | 41 ++ data/maps/FiveIsland_LostCave_Room12/events.inc | 8 - data/maps/FiveIsland_LostCave_Room12/header.inc | 8 - data/maps/FiveIsland_LostCave_Room12/map.json | 41 ++ data/maps/FiveIsland_LostCave_Room13/events.inc | 8 - data/maps/FiveIsland_LostCave_Room13/header.inc | 8 - data/maps/FiveIsland_LostCave_Room13/map.json | 41 ++ data/maps/FiveIsland_LostCave_Room14/events.inc | 8 - data/maps/FiveIsland_LostCave_Room14/header.inc | 8 - data/maps/FiveIsland_LostCave_Room14/map.json | 41 ++ data/maps/FiveIsland_LostCave_Room2/events.inc | 8 - data/maps/FiveIsland_LostCave_Room2/header.inc | 8 - data/maps/FiveIsland_LostCave_Room2/map.json | 48 ++ data/maps/FiveIsland_LostCave_Room3/events.inc | 8 - data/maps/FiveIsland_LostCave_Room3/header.inc | 8 - data/maps/FiveIsland_LostCave_Room3/map.json | 48 ++ data/maps/FiveIsland_LostCave_Room4/events.inc | 11 - data/maps/FiveIsland_LostCave_Room4/header.inc | 8 - data/maps/FiveIsland_LostCave_Room4/map.json | 62 ++ data/maps/FiveIsland_LostCave_Room5/events.inc | 8 - data/maps/FiveIsland_LostCave_Room5/header.inc | 8 - data/maps/FiveIsland_LostCave_Room5/map.json | 48 ++ data/maps/FiveIsland_LostCave_Room6/events.inc | 8 - data/maps/FiveIsland_LostCave_Room6/header.inc | 8 - data/maps/FiveIsland_LostCave_Room6/map.json | 48 ++ data/maps/FiveIsland_LostCave_Room7/events.inc | 8 - data/maps/FiveIsland_LostCave_Room7/header.inc | 8 - data/maps/FiveIsland_LostCave_Room7/map.json | 48 ++ data/maps/FiveIsland_LostCave_Room8/events.inc | 8 - data/maps/FiveIsland_LostCave_Room8/header.inc | 8 - data/maps/FiveIsland_LostCave_Room8/map.json | 48 ++ data/maps/FiveIsland_LostCave_Room9/events.inc | 8 - data/maps/FiveIsland_LostCave_Room9/header.inc | 8 - data/maps/FiveIsland_LostCave_Room9/map.json | 48 ++ data/maps/FiveIsland_Meadow/connections.inc | 7 - data/maps/FiveIsland_Meadow/events.inc | 17 - data/maps/FiveIsland_Meadow/header.inc | 8 - data/maps/FiveIsland_Meadow/map.json | 138 +++++ .../maps/FiveIsland_MemorialPillar/connections.inc | 6 - data/maps/FiveIsland_MemorialPillar/events.inc | 16 - data/maps/FiveIsland_MemorialPillar/header.inc | 8 - data/maps/FiveIsland_MemorialPillar/map.json | 135 +++++ data/maps/FiveIsland_PokemonCenter_1F/events.inc | 13 - data/maps/FiveIsland_PokemonCenter_1F/header.inc | 8 - data/maps/FiveIsland_PokemonCenter_1F/map.json | 100 ++++ data/maps/FiveIsland_PokemonCenter_2F/events.inc | 13 - data/maps/FiveIsland_PokemonCenter_2F/header.inc | 8 - data/maps/FiveIsland_PokemonCenter_2F/map.json | 94 ++++ .../maps/FiveIsland_ResortGorgeous/connections.inc | 6 - data/maps/FiveIsland_ResortGorgeous/events.inc | 23 - data/maps/FiveIsland_ResortGorgeous/header.inc | 8 - data/maps/FiveIsland_ResortGorgeous/map.json | 189 +++++++ .../FiveIsland_ResortGorgeous_House/events.inc | 13 - .../FiveIsland_ResortGorgeous_House/header.inc | 8 - data/maps/FiveIsland_ResortGorgeous_House/map.json | 69 +++ data/maps/FiveIsland_RocketWarehouse/map.json | 366 ++++++++++++ data/maps/FiveIsland_RocketWarehouse/scripts.inc | 202 +++++++ .../maps/FiveIsland_WaterLabyrinth/connections.inc | 7 - data/maps/FiveIsland_WaterLabyrinth/events.inc | 6 - data/maps/FiveIsland_WaterLabyrinth/header.inc | 8 - data/maps/FiveIsland_WaterLabyrinth/map.json | 57 ++ data/maps/FourIsland/events.inc | 32 -- data/maps/FourIsland/header.inc | 8 - data/maps/FourIsland/map.json | 266 +++++++++ data/maps/FourIsland_Harbor/events.inc | 9 - data/maps/FourIsland_Harbor/header.inc | 8 - data/maps/FourIsland_Harbor/map.json | 54 ++ data/maps/FourIsland_House1/events.inc | 9 - data/maps/FourIsland_House1/header.inc | 8 - data/maps/FourIsland_House1/map.json | 54 ++ data/maps/FourIsland_House2/events.inc | 8 - data/maps/FourIsland_House2/header.inc | 8 - data/maps/FourIsland_House2/map.json | 41 ++ data/maps/FourIsland_IcefallCave_1F/events.inc | 14 - data/maps/FourIsland_IcefallCave_1F/header.inc | 8 - data/maps/FourIsland_IcefallCave_1F/map.json | 89 +++ data/maps/FourIsland_IcefallCave_1F/scripts.inc | 2 +- data/maps/FourIsland_IcefallCave_B1F/map.json | 68 +++ data/maps/FourIsland_IcefallCave_B1F/scripts.inc | 2 + data/maps/FourIsland_IcefallCave_Back/map.json | 108 ++++ data/maps/FourIsland_IcefallCave_Back/scripts.inc | 201 +++++++ .../FourIsland_IcefallCave_Entrance/events.inc | 7 - .../FourIsland_IcefallCave_Entrance/header.inc | 8 - data/maps/FourIsland_IcefallCave_Entrance/map.json | 41 ++ data/maps/FourIsland_LoreleisHouse/events.inc | 22 - data/maps/FourIsland_LoreleisHouse/header.inc | 8 - data/maps/FourIsland_LoreleisHouse/map.json | 223 ++++++++ data/maps/FourIsland_Mart/events.inc | 10 - data/maps/FourIsland_Mart/header.inc | 8 - data/maps/FourIsland_Mart/map.json | 67 +++ data/maps/FourIsland_PokemonCenter_1F/events.inc | 16 - data/maps/FourIsland_PokemonCenter_1F/header.inc | 8 - data/maps/FourIsland_PokemonCenter_1F/map.json | 102 ++++ data/maps/FourIsland_PokemonCenter_2F/events.inc | 13 - data/maps/FourIsland_PokemonCenter_2F/header.inc | 8 - data/maps/FourIsland_PokemonCenter_2F/map.json | 94 ++++ data/maps/FourIsland_PokemonDayCare/events.inc | 8 - data/maps/FourIsland_PokemonDayCare/header.inc | 8 - data/maps/FourIsland_PokemonDayCare/map.json | 41 ++ data/maps/FuchsiaCity/connections.inc | 8 - data/maps/FuchsiaCity/events.inc | 47 -- data/maps/FuchsiaCity/header.inc | 8 - data/maps/FuchsiaCity/map.json | 409 ++++++++++++++ data/maps/FuchsiaCity_Building1/events.inc | 19 - data/maps/FuchsiaCity_Building1/header.inc | 8 - data/maps/FuchsiaCity_Building1/map.json | 123 ++++ data/maps/FuchsiaCity_Gym/events.inc | 21 - data/maps/FuchsiaCity_Gym/header.inc | 8 - data/maps/FuchsiaCity_Gym/map.json | 161 ++++++ data/maps/FuchsiaCity_House1/events.inc | 12 - data/maps/FuchsiaCity_House1/header.inc | 8 - data/maps/FuchsiaCity_House1/map.json | 81 +++ data/maps/FuchsiaCity_House2/events.inc | 11 - data/maps/FuchsiaCity_House2/header.inc | 8 - data/maps/FuchsiaCity_House2/map.json | 62 ++ data/maps/FuchsiaCity_House3/events.inc | 8 - data/maps/FuchsiaCity_House3/header.inc | 8 - data/maps/FuchsiaCity_House3/map.json | 41 ++ data/maps/FuchsiaCity_Mart/events.inc | 12 - data/maps/FuchsiaCity_Mart/header.inc | 8 - data/maps/FuchsiaCity_Mart/map.json | 81 +++ data/maps/FuchsiaCity_PokemonCenter_1F/events.inc | 14 - data/maps/FuchsiaCity_PokemonCenter_1F/header.inc | 8 - data/maps/FuchsiaCity_PokemonCenter_1F/map.json | 101 ++++ data/maps/FuchsiaCity_PokemonCenter_2F/events.inc | 13 - data/maps/FuchsiaCity_PokemonCenter_2F/header.inc | 8 - data/maps/FuchsiaCity_PokemonCenter_2F/map.json | 94 ++++ .../FuchsiaCity_SafariZone_Entrance/events.inc | 17 - .../FuchsiaCity_SafariZone_Entrance/header.inc | 8 - data/maps/FuchsiaCity_SafariZone_Entrance/map.json | 103 ++++ data/maps/FuchsiaCity_ZooBuilding/events.inc | 13 - data/maps/FuchsiaCity_ZooBuilding/header.inc | 8 - data/maps/FuchsiaCity_ZooBuilding/map.json | 94 ++++ data/maps/IndigoPlateau_Exterior/connections.inc | 6 - data/maps/IndigoPlateau_Exterior/events.inc | 9 - data/maps/IndigoPlateau_Exterior/header.inc | 8 - data/maps/IndigoPlateau_Exterior/map.json | 60 ++ .../maps/IndigoPlateau_PokemonCenter_1F/events.inc | 17 - .../maps/IndigoPlateau_PokemonCenter_1F/header.inc | 8 - data/maps/IndigoPlateau_PokemonCenter_1F/map.json | 146 +++++ .../maps/IndigoPlateau_PokemonCenter_2F/events.inc | 13 - .../maps/IndigoPlateau_PokemonCenter_2F/header.inc | 8 - data/maps/IndigoPlateau_PokemonCenter_2F/map.json | 94 ++++ data/maps/LavenderTown/connections.inc | 8 - data/maps/LavenderTown/events.inc | 21 - data/maps/LavenderTown/header.inc | 8 - data/maps/LavenderTown/map.json | 147 +++++ data/maps/LavenderTown_House1/events.inc | 11 - data/maps/LavenderTown_House1/header.inc | 8 - data/maps/LavenderTown_House1/map.json | 68 +++ data/maps/LavenderTown_House2/events.inc | 10 - data/maps/LavenderTown_House2/header.inc | 8 - data/maps/LavenderTown_House2/map.json | 55 ++ data/maps/LavenderTown_Mart/events.inc | 13 - data/maps/LavenderTown_Mart/header.inc | 8 - data/maps/LavenderTown_Mart/map.json | 94 ++++ data/maps/LavenderTown_PokemonCenter_1F/events.inc | 15 - data/maps/LavenderTown_PokemonCenter_1F/header.inc | 8 - data/maps/LavenderTown_PokemonCenter_1F/map.json | 114 ++++ data/maps/LavenderTown_PokemonCenter_2F/events.inc | 13 - data/maps/LavenderTown_PokemonCenter_2F/header.inc | 8 - data/maps/LavenderTown_PokemonCenter_2F/map.json | 94 ++++ .../LavenderTown_VolunteerPokemonHouse/events.inc | 20 - .../LavenderTown_VolunteerPokemonHouse/header.inc | 8 - .../LavenderTown_VolunteerPokemonHouse/map.json | 142 +++++ data/maps/MtEmber_Exterior/events.inc | 41 -- data/maps/MtEmber_Exterior/header.inc | 8 - data/maps/MtEmber_Exterior/map.json | 370 ++++++++++++ data/maps/MtEmber_RubyPath_1F/map.json | 107 ++++ data/maps/MtEmber_RubyPath_1F/scripts.inc | 2 + data/maps/MtEmber_RubyPath_B1F/events.inc | 12 - data/maps/MtEmber_RubyPath_B1F/header.inc | 8 - data/maps/MtEmber_RubyPath_B1F/map.json | 87 +++ data/maps/MtEmber_RubyPath_B1F_Stairs/events.inc | 9 - data/maps/MtEmber_RubyPath_B1F_Stairs/header.inc | 8 - data/maps/MtEmber_RubyPath_B1F_Stairs/map.json | 48 ++ data/maps/MtEmber_RubyPath_B2F/events.inc | 15 - data/maps/MtEmber_RubyPath_B2F/header.inc | 8 - data/maps/MtEmber_RubyPath_B2F/map.json | 126 +++++ data/maps/MtEmber_RubyPath_B2F_Stairs/events.inc | 10 - data/maps/MtEmber_RubyPath_B2F_Stairs/header.inc | 8 - data/maps/MtEmber_RubyPath_B2F_Stairs/map.json | 61 ++ data/maps/MtEmber_RubyPath_B3F/events.inc | 19 - data/maps/MtEmber_RubyPath_B3F/header.inc | 8 - data/maps/MtEmber_RubyPath_B3F/map.json | 172 ++++++ data/maps/MtEmber_RubyPath_B4F/events.inc | 34 -- data/maps/MtEmber_RubyPath_B4F/header.inc | 8 - data/maps/MtEmber_RubyPath_B4F/map.json | 217 +++++++ data/maps/MtEmber_RubyPath_B5F/events.inc | 11 - data/maps/MtEmber_RubyPath_B5F/header.inc | 8 - data/maps/MtEmber_RubyPath_B5F/map.json | 49 ++ data/maps/MtEmber_Summit/events.inc | 12 - data/maps/MtEmber_Summit/header.inc | 8 - data/maps/MtEmber_Summit/map.json | 93 +++ data/maps/MtEmber_SummitPath_1F/events.inc | 6 - data/maps/MtEmber_SummitPath_1F/header.inc | 8 - data/maps/MtEmber_SummitPath_1F/map.json | 34 ++ data/maps/MtEmber_SummitPath_2F/events.inc | 17 - data/maps/MtEmber_SummitPath_2F/header.inc | 8 - data/maps/MtEmber_SummitPath_2F/map.json | 152 +++++ data/maps/MtEmber_SummitPath_3F/events.inc | 6 - data/maps/MtEmber_SummitPath_3F/header.inc | 8 - data/maps/MtEmber_SummitPath_3F/map.json | 34 ++ data/maps/MtMoon_1F/events.inc | 27 - data/maps/MtMoon_1F/header.inc | 8 - data/maps/MtMoon_1F/map.json | 239 ++++++++ data/maps/MtMoon_B1F/events.inc | 20 - data/maps/MtMoon_B1F/header.inc | 8 - data/maps/MtMoon_B1F/map.json | 131 +++++ data/maps/MtMoon_B2F/events.inc | 28 - data/maps/MtMoon_B2F/header.inc | 8 - data/maps/MtMoon_B2F/map.json | 221 ++++++++ data/maps/NavelRock_1F/events.inc | 6 - data/maps/NavelRock_1F/header.inc | 8 - data/maps/NavelRock_1F/map.json | 34 ++ data/maps/NavelRock_B1F/events.inc | 6 - data/maps/NavelRock_B1F/header.inc | 8 - data/maps/NavelRock_B1F/map.json | 34 ++ data/maps/NavelRock_Base/events.inc | 8 - data/maps/NavelRock_Base/header.inc | 8 - data/maps/NavelRock_Base/map.json | 41 ++ data/maps/NavelRock_BasePath_B10F/events.inc | 6 - data/maps/NavelRock_BasePath_B10F/header.inc | 8 - data/maps/NavelRock_BasePath_B10F/map.json | 34 ++ data/maps/NavelRock_BasePath_B11F/events.inc | 6 - data/maps/NavelRock_BasePath_B11F/header.inc | 8 - data/maps/NavelRock_BasePath_B11F/map.json | 34 ++ data/maps/NavelRock_BasePath_B1F/events.inc | 6 - data/maps/NavelRock_BasePath_B1F/header.inc | 8 - data/maps/NavelRock_BasePath_B1F/map.json | 34 ++ data/maps/NavelRock_BasePath_B2F/events.inc | 6 - data/maps/NavelRock_BasePath_B2F/header.inc | 8 - data/maps/NavelRock_BasePath_B2F/map.json | 34 ++ data/maps/NavelRock_BasePath_B3F/events.inc | 6 - data/maps/NavelRock_BasePath_B3F/header.inc | 8 - data/maps/NavelRock_BasePath_B3F/map.json | 34 ++ data/maps/NavelRock_BasePath_B4F/events.inc | 6 - data/maps/NavelRock_BasePath_B4F/header.inc | 8 - data/maps/NavelRock_BasePath_B4F/map.json | 34 ++ data/maps/NavelRock_BasePath_B5F/events.inc | 6 - data/maps/NavelRock_BasePath_B5F/header.inc | 8 - data/maps/NavelRock_BasePath_B5F/map.json | 34 ++ data/maps/NavelRock_BasePath_B6F/events.inc | 6 - data/maps/NavelRock_BasePath_B6F/header.inc | 8 - data/maps/NavelRock_BasePath_B6F/map.json | 34 ++ data/maps/NavelRock_BasePath_B7F/events.inc | 6 - data/maps/NavelRock_BasePath_B7F/header.inc | 8 - data/maps/NavelRock_BasePath_B7F/map.json | 34 ++ data/maps/NavelRock_BasePath_B8F/events.inc | 6 - data/maps/NavelRock_BasePath_B8F/header.inc | 8 - data/maps/NavelRock_BasePath_B8F/map.json | 34 ++ data/maps/NavelRock_BasePath_B9F/events.inc | 6 - data/maps/NavelRock_BasePath_B9F/header.inc | 8 - data/maps/NavelRock_BasePath_B9F/map.json | 34 ++ data/maps/NavelRock_Exterior/events.inc | 6 - data/maps/NavelRock_Exterior/header.inc | 8 - data/maps/NavelRock_Exterior/map.json | 34 ++ data/maps/NavelRock_Fork/events.inc | 7 - data/maps/NavelRock_Fork/header.inc | 8 - data/maps/NavelRock_Fork/map.json | 41 ++ data/maps/NavelRock_Harbor/events.inc | 9 - data/maps/NavelRock_Harbor/header.inc | 8 - data/maps/NavelRock_Harbor/map.json | 54 ++ data/maps/NavelRock_Summit/events.inc | 14 - data/maps/NavelRock_Summit/header.inc | 8 - data/maps/NavelRock_Summit/map.json | 61 ++ data/maps/NavelRock_SummitPath_2F/events.inc | 6 - data/maps/NavelRock_SummitPath_2F/header.inc | 8 - data/maps/NavelRock_SummitPath_2F/map.json | 34 ++ data/maps/NavelRock_SummitPath_3F/events.inc | 6 - data/maps/NavelRock_SummitPath_3F/header.inc | 8 - data/maps/NavelRock_SummitPath_3F/map.json | 34 ++ data/maps/NavelRock_SummitPath_4F/events.inc | 6 - data/maps/NavelRock_SummitPath_4F/header.inc | 8 - data/maps/NavelRock_SummitPath_4F/map.json | 34 ++ data/maps/NavelRock_SummitPath_5F/events.inc | 6 - data/maps/NavelRock_SummitPath_5F/header.inc | 8 - data/maps/NavelRock_SummitPath_5F/map.json | 34 ++ data/maps/OneIsland/connections.inc | 7 - data/maps/OneIsland/events.inc | 17 - data/maps/OneIsland/header.inc | 8 - data/maps/OneIsland/map.json | 114 ++++ data/maps/OneIsland/scripts.inc | 2 +- data/maps/OneIsland_Harbor/events.inc | 9 - data/maps/OneIsland_Harbor/header.inc | 8 - data/maps/OneIsland_Harbor/map.json | 54 ++ data/maps/OneIsland_House1/events.inc | 9 - data/maps/OneIsland_House1/header.inc | 8 - data/maps/OneIsland_House1/map.json | 54 ++ data/maps/OneIsland_House2/events.inc | 8 - data/maps/OneIsland_House2/header.inc | 8 - data/maps/OneIsland_House2/map.json | 41 ++ data/maps/OneIsland_KindleRoad/connections.inc | 6 - data/maps/OneIsland_KindleRoad/events.inc | 42 -- data/maps/OneIsland_KindleRoad/header.inc | 8 - data/maps/OneIsland_KindleRoad/map.json | 440 +++++++++++++++ data/maps/OneIsland_KindleRoad_EmberSpa/events.inc | 16 - data/maps/OneIsland_KindleRoad_EmberSpa/header.inc | 8 - data/maps/OneIsland_KindleRoad_EmberSpa/map.json | 116 ++++ data/maps/OneIsland_PokemonCenter_1F/events.inc | 31 - data/maps/OneIsland_PokemonCenter_1F/header.inc | 8 - data/maps/OneIsland_PokemonCenter_1F/map.json | 214 +++++++ data/maps/OneIsland_PokemonCenter_2F/events.inc | 13 - data/maps/OneIsland_PokemonCenter_2F/header.inc | 8 - data/maps/OneIsland_PokemonCenter_2F/map.json | 94 ++++ data/maps/OneIsland_TreasureBeach/connections.inc | 6 - data/maps/OneIsland_TreasureBeach/events.inc | 16 - data/maps/OneIsland_TreasureBeach/header.inc | 8 - data/maps/OneIsland_TreasureBeach/map.json | 125 +++++ data/maps/PalletTown/connections.inc | 7 - data/maps/PalletTown/events.inc | 24 - data/maps/PalletTown/header.inc | 8 - data/maps/PalletTown/map.json | 156 ++++++ data/maps/PalletTown/scripts.inc | 4 +- data/maps/PalletTown_GarysHouse/events.inc | 16 - data/maps/PalletTown_GarysHouse/header.inc | 8 - data/maps/PalletTown_GarysHouse/map.json | 90 +++ data/maps/PalletTown_PlayersHouse_1F/events.inc | 14 - data/maps/PalletTown_PlayersHouse_1F/header.inc | 8 - data/maps/PalletTown_PlayersHouse_1F/map.json | 70 +++ data/maps/PalletTown_PlayersHouse_2F/events.inc | 10 - data/maps/PalletTown_PlayersHouse_2F/header.inc | 8 - data/maps/PalletTown_PlayersHouse_2F/map.json | 49 ++ data/maps/PalletTown_ProfessorOaksLab/events.inc | 33 -- data/maps/PalletTown_ProfessorOaksLab/header.inc | 8 - data/maps/PalletTown_ProfessorOaksLab/map.json | 256 +++++++++ data/maps/PewterCity/connections.inc | 7 - data/maps/PewterCity/events.inc | 37 -- data/maps/PewterCity/header.inc | 8 - data/maps/PewterCity/map.json | 281 ++++++++++ data/maps/PewterCity_Gym/events.inc | 16 - data/maps/PewterCity_Gym/header.inc | 8 - data/maps/PewterCity_Gym/map.json | 96 ++++ data/maps/PewterCity_House1/events.inc | 12 - data/maps/PewterCity_House1/header.inc | 8 - data/maps/PewterCity_House1/map.json | 81 +++ data/maps/PewterCity_House2/events.inc | 11 - data/maps/PewterCity_House2/header.inc | 8 - data/maps/PewterCity_House2/map.json | 68 +++ data/maps/PewterCity_Mart/events.inc | 12 - data/maps/PewterCity_Mart/header.inc | 8 - data/maps/PewterCity_Mart/map.json | 81 +++ data/maps/PewterCity_Museum_1F/events.inc | 29 - data/maps/PewterCity_Museum_1F/header.inc | 8 - data/maps/PewterCity_Museum_1F/map.json | 198 +++++++ data/maps/PewterCity_Museum_2F/events.inc | 22 - data/maps/PewterCity_Museum_2F/header.inc | 8 - data/maps/PewterCity_Museum_2F/map.json | 150 +++++ data/maps/PewterCity_PokemonCenter_1F/events.inc | 17 - data/maps/PewterCity_PokemonCenter_1F/header.inc | 8 - data/maps/PewterCity_PokemonCenter_1F/map.json | 140 +++++ data/maps/PewterCity_PokemonCenter_2F/events.inc | 13 - data/maps/PewterCity_PokemonCenter_2F/header.inc | 8 - data/maps/PewterCity_PokemonCenter_2F/map.json | 94 ++++ data/maps/PokemonLeague_AgathasRoom/events.inc | 9 - data/maps/PokemonLeague_AgathasRoom/header.inc | 8 - data/maps/PokemonLeague_AgathasRoom/map.json | 48 ++ data/maps/PokemonLeague_BrunosRoom/events.inc | 9 - data/maps/PokemonLeague_BrunosRoom/header.inc | 8 - data/maps/PokemonLeague_BrunosRoom/map.json | 48 ++ data/maps/PokemonLeague_ChampionsRoom/events.inc | 10 - data/maps/PokemonLeague_ChampionsRoom/header.inc | 8 - data/maps/PokemonLeague_ChampionsRoom/map.json | 61 ++ data/maps/PokemonLeague_HallOfFame/events.inc | 8 - data/maps/PokemonLeague_HallOfFame/header.inc | 8 - data/maps/PokemonLeague_HallOfFame/map.json | 41 ++ data/maps/PokemonLeague_LancesRoom/events.inc | 9 - data/maps/PokemonLeague_LancesRoom/header.inc | 8 - data/maps/PokemonLeague_LancesRoom/map.json | 48 ++ data/maps/PokemonLeague_LoreleisRoom/events.inc | 9 - data/maps/PokemonLeague_LoreleisRoom/header.inc | 8 - data/maps/PokemonLeague_LoreleisRoom/map.json | 48 ++ data/maps/PokemonMansion_1F/events.inc | 25 - data/maps/PokemonMansion_1F/header.inc | 8 - data/maps/PokemonMansion_1F/map.json | 173 ++++++ data/maps/PokemonMansion_2F/events.inc | 20 - data/maps/PokemonMansion_2F/header.inc | 8 - data/maps/PokemonMansion_2F/map.json | 130 +++++ data/maps/PokemonMansion_3F/events.inc | 23 - data/maps/PokemonMansion_3F/header.inc | 8 - data/maps/PokemonMansion_3F/map.json | 153 +++++ data/maps/PokemonMansion_B1F/events.inc | 19 - data/maps/PokemonMansion_B1F/header.inc | 8 - data/maps/PokemonMansion_B1F/map.json | 137 +++++ data/maps/PokemonTower_1F/events.inc | 15 - data/maps/PokemonTower_1F/header.inc | 8 - data/maps/PokemonTower_1F/map.json | 114 ++++ data/maps/PokemonTower_2F/events.inc | 14 - data/maps/PokemonTower_2F/header.inc | 8 - data/maps/PokemonTower_2F/map.json | 80 +++ data/maps/PokemonTower_3F/events.inc | 12 - data/maps/PokemonTower_3F/header.inc | 8 - data/maps/PokemonTower_3F/map.json | 87 +++ data/maps/PokemonTower_4F/events.inc | 14 - data/maps/PokemonTower_4F/header.inc | 8 - data/maps/PokemonTower_4F/map.json | 113 ++++ data/maps/PokemonTower_5F/events.inc | 37 -- data/maps/PokemonTower_5F/header.inc | 8 - data/maps/PokemonTower_5F/map.json | 290 ++++++++++ data/maps/PokemonTower_6F/events.inc | 17 - data/maps/PokemonTower_6F/header.inc | 8 - data/maps/PokemonTower_6F/map.json | 119 ++++ data/maps/PokemonTower_7F/events.inc | 14 - data/maps/PokemonTower_7F/header.inc | 8 - data/maps/PokemonTower_7F/map.json | 90 +++ data/maps/PokemonTower_7F/scripts.inc | 2 +- data/maps/PowerPlant/events.inc | 23 - data/maps/PowerPlant/header.inc | 8 - data/maps/PowerPlant/map.json | 179 ++++++ data/maps/RockTunnel_1F/events.inc | 25 - data/maps/RockTunnel_1F/header.inc | 8 - data/maps/RockTunnel_1F/map.json | 201 +++++++ data/maps/RockTunnel_B1F/events.inc | 36 -- data/maps/RockTunnel_B1F/header.inc | 8 - data/maps/RockTunnel_B1F/map.json | 387 +++++++++++++ data/maps/RocketHideout_B1F/events.inc | 22 - data/maps/RocketHideout_B1F/header.inc | 8 - data/maps/RocketHideout_B1F/map.json | 164 ++++++ data/maps/RocketHideout_B2F/events.inc | 16 - data/maps/RocketHideout_B2F/header.inc | 8 - data/maps/RocketHideout_B2F/map.json | 121 ++++ data/maps/RocketHideout_B3F/events.inc | 16 - data/maps/RocketHideout_B3F/header.inc | 8 - data/maps/RocketHideout_B3F/map.json | 110 ++++ data/maps/RocketHideout_B4F/events.inc | 22 - data/maps/RocketHideout_B4F/header.inc | 8 - data/maps/RocketHideout_B4F/map.json | 178 ++++++ data/maps/RocketHideout_Elevator/events.inc | 9 - data/maps/RocketHideout_Elevator/header.inc | 8 - data/maps/RocketHideout_Elevator/map.json | 42 ++ data/maps/Route1/connections.inc | 7 - data/maps/Route1/events.inc | 9 - data/maps/Route1/header.inc | 8 - data/maps/Route1/map.json | 65 +++ data/maps/Route10/connections.inc | 7 - data/maps/Route10/events.inc | 31 - data/maps/Route10/header.inc | 8 - data/maps/Route10/map.json | 264 +++++++++ data/maps/Route10_PokemonCenter_1F/events.inc | 15 - data/maps/Route10_PokemonCenter_1F/header.inc | 8 - data/maps/Route10_PokemonCenter_1F/map.json | 114 ++++ data/maps/Route10_PokemonCenter_2F/events.inc | 13 - data/maps/Route10_PokemonCenter_2F/header.inc | 8 - data/maps/Route10_PokemonCenter_2F/map.json | 94 ++++ data/maps/Route11/connections.inc | 7 - data/maps/Route11/events.inc | 26 - data/maps/Route11/header.inc | 8 - data/maps/Route11/map.json | 239 ++++++++ data/maps/Route11_EastEntrance_1F/events.inc | 13 - data/maps/Route11_EastEntrance_1F/header.inc | 8 - data/maps/Route11_EastEntrance_1F/map.json | 82 +++ data/maps/Route11_EastEntrance_2F/events.inc | 13 - data/maps/Route11_EastEntrance_2F/header.inc | 8 - data/maps/Route11_EastEntrance_2F/map.json | 69 +++ data/maps/Route12/connections.inc | 8 - data/maps/Route12/events.inc | 31 - data/maps/Route12/header.inc | 8 - data/maps/Route12/map.json | 289 ++++++++++ data/maps/Route12_FishingHouse/events.inc | 13 - data/maps/Route12_FishingHouse/header.inc | 8 - data/maps/Route12_FishingHouse/map.json | 63 +++ data/maps/Route12_NorthEntrance_1F/events.inc | 12 - data/maps/Route12_NorthEntrance_1F/header.inc | 8 - data/maps/Route12_NorthEntrance_1F/map.json | 69 +++ data/maps/Route12_NorthEntrance_2F/events.inc | 12 - data/maps/Route12_NorthEntrance_2F/header.inc | 8 - data/maps/Route12_NorthEntrance_2F/map.json | 56 ++ data/maps/Route13/connections.inc | 7 - data/maps/Route13/events.inc | 21 - data/maps/Route13/header.inc | 8 - data/maps/Route13/map.json | 205 +++++++ data/maps/Route14/connections.inc | 7 - data/maps/Route14/events.inc | 24 - data/maps/Route14/header.inc | 8 - data/maps/Route14/map.json | 252 +++++++++ data/maps/Route15/connections.inc | 7 - data/maps/Route15/events.inc | 25 - data/maps/Route15/header.inc | 8 - data/maps/Route15/map.json | 236 ++++++++ data/maps/Route15_WestEntrance_1F/events.inc | 12 - data/maps/Route15_WestEntrance_1F/header.inc | 8 - data/maps/Route15_WestEntrance_1F/map.json | 69 +++ data/maps/Route15_WestEntrance_2F/events.inc | 12 - data/maps/Route15_WestEntrance_2F/header.inc | 8 - data/maps/Route15_WestEntrance_2F/map.json | 56 ++ data/maps/Route16/connections.inc | 7 - data/maps/Route16/events.inc | 26 - data/maps/Route16/header.inc | 8 - data/maps/Route16/map.json | 221 ++++++++ data/maps/Route16_House/events.inc | 11 - data/maps/Route16_House/header.inc | 8 - data/maps/Route16_House/map.json | 68 +++ data/maps/Route16_NorthEntrance_1F/events.inc | 26 - data/maps/Route16_NorthEntrance_1F/header.inc | 8 - data/maps/Route16_NorthEntrance_1F/map.json | 182 ++++++ data/maps/Route16_NorthEntrance_2F/events.inc | 14 - data/maps/Route16_NorthEntrance_2F/header.inc | 8 - data/maps/Route16_NorthEntrance_2F/map.json | 82 +++ data/maps/Route17/connections.inc | 7 - data/maps/Route17/events.inc | 27 - data/maps/Route17/header.inc | 8 - data/maps/Route17/map.json | 249 ++++++++ data/maps/Route18/connections.inc | 7 - data/maps/Route18/events.inc | 15 - data/maps/Route18/header.inc | 8 - data/maps/Route18/map.json | 100 ++++ data/maps/Route18_EastEntrance_1F/events.inc | 23 - data/maps/Route18_EastEntrance_1F/header.inc | 8 - data/maps/Route18_EastEntrance_1F/map.json | 155 +++++ data/maps/Route18_EastEntrance_2F/events.inc | 12 - data/maps/Route18_EastEntrance_2F/header.inc | 8 - data/maps/Route18_EastEntrance_2F/map.json | 56 ++ data/maps/Route19/connections.inc | 7 - data/maps/Route19/events.inc | 19 - data/maps/Route19/header.inc | 8 - data/maps/Route19/map.json | 195 +++++++ data/maps/Route2/connections.inc | 7 - data/maps/Route2/events.inc | 27 - data/maps/Route2/header.inc | 8 - data/maps/Route2/map.json | 208 +++++++ data/maps/Route20/connections.inc | 7 - data/maps/Route20/events.inc | 24 - data/maps/Route20/header.inc | 8 - data/maps/Route20/map.json | 213 +++++++ data/maps/Route21_North/connections.inc | 7 - data/maps/Route21_North/events.inc | 13 - data/maps/Route21_North/header.inc | 8 - data/maps/Route21_North/map.json | 119 ++++ data/maps/Route21_South/connections.inc | 7 - data/maps/Route21_South/events.inc | 9 - data/maps/Route21_South/header.inc | 8 - data/maps/Route21_South/map.json | 96 ++++ data/maps/Route22/connections.inc | 7 - data/maps/Route22/events.inc | 20 - data/maps/Route22/header.inc | 8 - data/maps/Route22/map.json | 122 ++++ data/maps/Route22_NorthEntrance/events.inc | 14 - data/maps/Route22_NorthEntrance/header.inc | 8 - data/maps/Route22_NorthEntrance/map.json | 72 +++ data/maps/Route23/connections.inc | 7 - data/maps/Route23/events.inc | 72 --- data/maps/Route23/header.inc | 8 - data/maps/Route23/map.json | 610 ++++++++++++++++++++ data/maps/Route24/connections.inc | 7 - data/maps/Route24/events.inc | 19 - data/maps/Route24/header.inc | 8 - data/maps/Route24/map.json | 164 ++++++ data/maps/Route25/connections.inc | 6 - data/maps/Route25/events.inc | 27 - data/maps/Route25/header.inc | 8 - data/maps/Route25/map.json | 247 ++++++++ data/maps/Route25_SeaCottage/events.inc | 14 - data/maps/Route25_SeaCottage/header.inc | 8 - data/maps/Route25_SeaCottage/map.json | 76 +++ data/maps/Route2_EastBuilding/events.inc | 12 - data/maps/Route2_EastBuilding/header.inc | 8 - data/maps/Route2_EastBuilding/map.json | 75 +++ data/maps/Route2_House/events.inc | 11 - data/maps/Route2_House/header.inc | 8 - data/maps/Route2_House/map.json | 68 +++ .../Route2_ViridianForest_NorthEntrance/events.inc | 13 - .../Route2_ViridianForest_NorthEntrance/header.inc | 8 - .../Route2_ViridianForest_NorthEntrance/map.json | 88 +++ .../Route2_ViridianForest_SouthEntrance/events.inc | 12 - .../Route2_ViridianForest_SouthEntrance/header.inc | 8 - .../Route2_ViridianForest_SouthEntrance/map.json | 75 +++ data/maps/Route3/connections.inc | 7 - data/maps/Route3/events.inc | 17 - data/maps/Route3/header.inc | 8 - data/maps/Route3/map.json | 165 ++++++ data/maps/Route4/connections.inc | 7 - data/maps/Route4/events.inc | 23 - data/maps/Route4/header.inc | 8 - data/maps/Route4/map.json | 186 ++++++ data/maps/Route4_PokemonCenter_1F/events.inc | 16 - data/maps/Route4_PokemonCenter_1F/header.inc | 8 - data/maps/Route4_PokemonCenter_1F/map.json | 127 +++++ data/maps/Route4_PokemonCenter_2F/events.inc | 13 - data/maps/Route4_PokemonCenter_2F/header.inc | 8 - data/maps/Route4_PokemonCenter_2F/map.json | 94 ++++ data/maps/Route5/connections.inc | 7 - data/maps/Route5/events.inc | 11 - data/maps/Route5/header.inc | 8 - data/maps/Route5/map.json | 67 +++ data/maps/Route5_PokemonDayCare/events.inc | 10 - data/maps/Route5_PokemonDayCare/header.inc | 8 - data/maps/Route5_PokemonDayCare/map.json | 55 ++ data/maps/Route5_SouthEntrance/events.inc | 16 - data/maps/Route5_SouthEntrance/header.inc | 8 - data/maps/Route5_SouthEntrance/map.json | 90 +++ data/maps/Route6/connections.inc | 7 - data/maps/Route6/events.inc | 20 - data/maps/Route6/header.inc | 8 - data/maps/Route6/map.json | 157 ++++++ data/maps/Route6_NorthEntrance/events.inc | 16 - data/maps/Route6_NorthEntrance/header.inc | 8 - data/maps/Route6_NorthEntrance/map.json | 90 +++ data/maps/Route7/connections.inc | 7 - data/maps/Route7/events.inc | 13 - data/maps/Route7/header.inc | 8 - data/maps/Route7/map.json | 76 +++ data/maps/Route7_EastEntrance/events.inc | 16 - data/maps/Route7_EastEntrance/header.inc | 8 - data/maps/Route7_EastEntrance/map.json | 90 +++ data/maps/Route8/connections.inc | 7 - data/maps/Route8/events.inc | 29 - data/maps/Route8/header.inc | 8 - data/maps/Route8/map.json | 276 +++++++++ data/maps/Route8_WestEntrance/events.inc | 16 - data/maps/Route8_WestEntrance/header.inc | 8 - data/maps/Route8_WestEntrance/map.json | 90 +++ data/maps/Route9/connections.inc | 7 - data/maps/Route9/events.inc | 22 - data/maps/Route9/header.inc | 8 - data/maps/Route9/map.json | 222 ++++++++ data/maps/SSAnne_1F_Corridor/events.inc | 21 - data/maps/SSAnne_1F_Corridor/header.inc | 8 - data/maps/SSAnne_1F_Corridor/map.json | 138 +++++ data/maps/SSAnne_1F_Room1/events.inc | 8 - data/maps/SSAnne_1F_Room1/header.inc | 8 - data/maps/SSAnne_1F_Room1/map.json | 41 ++ data/maps/SSAnne_1F_Room11/events.inc | 24 - data/maps/SSAnne_1F_Room11/header.inc | 8 - data/maps/SSAnne_1F_Room11/scripts.inc | 92 --- data/maps/SSAnne_1F_Room12/events.inc | 5 - data/maps/SSAnne_1F_Room12/header.inc | 8 - data/maps/SSAnne_1F_Room12/scripts.inc | 7 - data/maps/SSAnne_1F_Room2/events.inc | 11 - data/maps/SSAnne_1F_Room2/header.inc | 8 - data/maps/SSAnne_1F_Room2/map.json | 80 +++ data/maps/SSAnne_1F_Room3/events.inc | 10 - data/maps/SSAnne_1F_Room3/header.inc | 8 - data/maps/SSAnne_1F_Room3/map.json | 67 +++ data/maps/SSAnne_1F_Room4/events.inc | 8 - data/maps/SSAnne_1F_Room4/header.inc | 8 - data/maps/SSAnne_1F_Room4/map.json | 41 ++ data/maps/SSAnne_1F_Room5/events.inc | 8 - data/maps/SSAnne_1F_Room5/header.inc | 8 - data/maps/SSAnne_1F_Room5/map.json | 41 ++ data/maps/SSAnne_1F_Room6/events.inc | 8 - data/maps/SSAnne_1F_Room6/header.inc | 8 - data/maps/SSAnne_1F_Room6/map.json | 41 ++ data/maps/SSAnne_1F_Room7/events.inc | 8 - data/maps/SSAnne_1F_Room7/header.inc | 8 - data/maps/SSAnne_1F_Room7/map.json | 41 ++ data/maps/SSAnne_2F_Corridor/events.inc | 22 - data/maps/SSAnne_2F_Corridor/header.inc | 8 - data/maps/SSAnne_2F_Corridor/map.json | 138 +++++ data/maps/SSAnne_2F_Room1/events.inc | 8 - data/maps/SSAnne_2F_Room1/header.inc | 8 - data/maps/SSAnne_2F_Room1/map.json | 41 ++ data/maps/SSAnne_2F_Room2/events.inc | 10 - data/maps/SSAnne_2F_Room2/header.inc | 8 - data/maps/SSAnne_2F_Room2/map.json | 67 +++ data/maps/SSAnne_2F_Room3/events.inc | 9 - data/maps/SSAnne_2F_Room3/header.inc | 8 - data/maps/SSAnne_2F_Room3/map.json | 54 ++ data/maps/SSAnne_2F_Room4/events.inc | 10 - data/maps/SSAnne_2F_Room4/header.inc | 8 - data/maps/SSAnne_2F_Room4/map.json | 67 +++ data/maps/SSAnne_2F_Room5/events.inc | 9 - data/maps/SSAnne_2F_Room5/header.inc | 8 - data/maps/SSAnne_2F_Room5/map.json | 54 ++ data/maps/SSAnne_2F_Room6/events.inc | 9 - data/maps/SSAnne_2F_Room6/header.inc | 8 - data/maps/SSAnne_2F_Room6/map.json | 54 ++ data/maps/SSAnne_3F_Corridor/events.inc | 10 - data/maps/SSAnne_3F_Corridor/header.inc | 8 - data/maps/SSAnne_3F_Corridor/map.json | 55 ++ data/maps/SSAnne_B1F_Corridor/events.inc | 13 - data/maps/SSAnne_B1F_Corridor/header.inc | 8 - data/maps/SSAnne_B1F_Corridor/map.json | 72 +++ data/maps/SSAnne_B1F_Room1/events.inc | 9 - data/maps/SSAnne_B1F_Room1/header.inc | 8 - data/maps/SSAnne_B1F_Room1/map.json | 54 ++ data/maps/SSAnne_B1F_Room2/events.inc | 9 - data/maps/SSAnne_B1F_Room2/header.inc | 8 - data/maps/SSAnne_B1F_Room2/map.json | 54 ++ data/maps/SSAnne_B1F_Room3/events.inc | 9 - data/maps/SSAnne_B1F_Room3/header.inc | 8 - data/maps/SSAnne_B1F_Room3/map.json | 54 ++ data/maps/SSAnne_B1F_Room4/events.inc | 9 - data/maps/SSAnne_B1F_Room4/header.inc | 8 - data/maps/SSAnne_B1F_Room4/map.json | 54 ++ data/maps/SSAnne_B1F_Room5/events.inc | 10 - data/maps/SSAnne_B1F_Room5/header.inc | 8 - data/maps/SSAnne_B1F_Room5/map.json | 67 +++ data/maps/SSAnne_CaptainsOffice/events.inc | 13 - data/maps/SSAnne_CaptainsOffice/header.inc | 8 - data/maps/SSAnne_CaptainsOffice/map.json | 63 +++ data/maps/SSAnne_CaptainsOffice2/events.inc | 11 - data/maps/SSAnne_CaptainsOffice2/header.inc | 8 - data/maps/SSAnne_CaptainsOffice2/scripts.inc | 2 - data/maps/SSAnne_CaptainsOffice3/events.inc | 16 - data/maps/SSAnne_CaptainsOffice3/header.inc | 8 - data/maps/SSAnne_CaptainsOffice3/scripts.inc | 201 ------- data/maps/SSAnne_CaptainsOffice4/events.inc | 49 -- data/maps/SSAnne_CaptainsOffice4/header.inc | 8 - data/maps/SSAnne_CaptainsOffice4/scripts.inc | 202 ------- data/maps/SSAnne_CaptainsOffice5/events.inc | 8 - data/maps/SSAnne_CaptainsOffice5/header.inc | 8 - data/maps/SSAnne_CaptainsOffice5/scripts.inc | 35 -- data/maps/SSAnne_CaptainsOffice9/events.inc | 12 - data/maps/SSAnne_CaptainsOffice9/header.inc | 8 - data/maps/SSAnne_CaptainsOffice9/scripts.inc | 2 - data/maps/SSAnne_Deck/events.inc | 13 - data/maps/SSAnne_Deck/header.inc | 8 - data/maps/SSAnne_Deck/map.json | 100 ++++ data/maps/SSAnne_Exterior/events.inc | 15 - data/maps/SSAnne_Exterior/header.inc | 8 - data/maps/SSAnne_Exterior/map.json | 79 +++ data/maps/SSAnne_Kitchen/events.inc | 20 - data/maps/SSAnne_Kitchen/header.inc | 8 - data/maps/SSAnne_Kitchen/map.json | 160 ++++++ data/maps/SSAnne_Kitchen3/events.inc | 14 - data/maps/SSAnne_Kitchen3/header.inc | 8 - data/maps/SSAnne_Kitchen3/scripts.inc | 2 - data/maps/SafariZone_Building1/events.inc | 11 - data/maps/SafariZone_Building1/header.inc | 8 - data/maps/SafariZone_Building1/map.json | 68 +++ data/maps/SafariZone_Building2/events.inc | 12 - data/maps/SafariZone_Building2/header.inc | 8 - data/maps/SafariZone_Building2/map.json | 81 +++ data/maps/SafariZone_Building3/events.inc | 13 - data/maps/SafariZone_Building3/header.inc | 8 - data/maps/SafariZone_Building3/map.json | 94 ++++ data/maps/SafariZone_Building4/events.inc | 12 - data/maps/SafariZone_Building4/header.inc | 8 - data/maps/SafariZone_Building4/map.json | 81 +++ data/maps/SafariZone_Center/events.inc | 26 - data/maps/SafariZone_Center/header.inc | 8 - data/maps/SafariZone_Center/map.json | 156 ++++++ data/maps/SafariZone_East/events.inc | 22 - data/maps/SafariZone_East/header.inc | 8 - data/maps/SafariZone_East/map.json | 144 +++++ data/maps/SafariZone_North/events.inc | 29 - data/maps/SafariZone_North/header.inc | 8 - data/maps/SafariZone_North/map.json | 187 +++++++ data/maps/SafariZone_SecretHouse/events.inc | 10 - data/maps/SafariZone_SecretHouse/header.inc | 8 - data/maps/SafariZone_SecretHouse/map.json | 55 ++ data/maps/SafariZone_West/events.inc | 28 - data/maps/SafariZone_West/header.inc | 8 - data/maps/SafariZone_West/map.json | 188 +++++++ data/maps/SaffronCity/connections.inc | 9 - data/maps/SaffronCity/events.inc | 2 - data/maps/SaffronCity/header.inc | 8 - data/maps/SaffronCity/map.json | 40 ++ data/maps/SaffronCity_Dojo/events.inc | 26 - data/maps/SaffronCity_Dojo/header.inc | 8 - data/maps/SaffronCity_Dojo/map.json | 181 ++++++ data/maps/SaffronCity_Duplicate/connections.inc | 9 - data/maps/SaffronCity_Duplicate/events.inc | 47 -- data/maps/SaffronCity_Duplicate/header.inc | 8 - data/maps/SaffronCity_Duplicate/map.json | 407 ++++++++++++++ data/maps/SaffronCity_Gym/events.inc | 52 -- data/maps/SaffronCity_Gym/header.inc | 8 - data/maps/SaffronCity_Gym/map.json | 384 +++++++++++++ data/maps/SaffronCity_House1_1F/events.inc | 13 - data/maps/SaffronCity_House1_1F/header.inc | 8 - data/maps/SaffronCity_House1_1F/map.json | 88 +++ data/maps/SaffronCity_House1_2F/events.inc | 16 - data/maps/SaffronCity_House1_2F/header.inc | 8 - data/maps/SaffronCity_House1_2F/map.json | 104 ++++ data/maps/SaffronCity_House2/events.inc | 16 - data/maps/SaffronCity_House2/header.inc | 8 - data/maps/SaffronCity_House2/map.json | 102 ++++ data/maps/SaffronCity_House3/events.inc | 10 - data/maps/SaffronCity_House3/header.inc | 8 - data/maps/SaffronCity_House3/map.json | 55 ++ data/maps/SaffronCity_Mart/events.inc | 12 - data/maps/SaffronCity_Mart/header.inc | 8 - data/maps/SaffronCity_Mart/map.json | 81 +++ data/maps/SaffronCity_PokemonCenter_1F/events.inc | 16 - data/maps/SaffronCity_PokemonCenter_1F/header.inc | 8 - data/maps/SaffronCity_PokemonCenter_1F/map.json | 127 +++++ data/maps/SaffronCity_PokemonCenter_2F/events.inc | 13 - data/maps/SaffronCity_PokemonCenter_2F/header.inc | 8 - data/maps/SaffronCity_PokemonCenter_2F/map.json | 94 ++++ .../SaffronCity_PokemonTrainerFanClub/events.inc | 17 - .../SaffronCity_PokemonTrainerFanClub/header.inc | 8 - .../SaffronCity_PokemonTrainerFanClub/map.json | 158 ++++++ data/maps/SeafoamIslands_1F/events.inc | 16 - data/maps/SeafoamIslands_1F/header.inc | 8 - data/maps/SeafoamIslands_1F/map.json | 109 ++++ data/maps/SeafoamIslands_B1F/events.inc | 21 - data/maps/SeafoamIslands_B1F/header.inc | 8 - data/maps/SeafoamIslands_B1F/map.json | 150 +++++ data/maps/SeafoamIslands_B2F/events.inc | 20 - data/maps/SeafoamIslands_B2F/header.inc | 8 - data/maps/SeafoamIslands_B2F/map.json | 137 +++++ data/maps/SeafoamIslands_B3F/events.inc | 24 - data/maps/SeafoamIslands_B3F/header.inc | 8 - data/maps/SeafoamIslands_B3F/map.json | 172 ++++++ data/maps/SeafoamIslands_B4F/events.inc | 24 - data/maps/SeafoamIslands_B4F/header.inc | 8 - data/maps/SeafoamIslands_B4F/map.json | 153 +++++ data/maps/SevenIsland/connections.inc | 7 - data/maps/SevenIsland/events.inc | 16 - data/maps/SevenIsland/header.inc | 8 - data/maps/SevenIsland/map.json | 107 ++++ data/maps/SevenIsland_Harbor/events.inc | 9 - data/maps/SevenIsland_Harbor/header.inc | 8 - data/maps/SevenIsland_Harbor/map.json | 54 ++ data/maps/SevenIsland_House_Room1/events.inc | 12 - data/maps/SevenIsland_House_Room1/header.inc | 8 - data/maps/SevenIsland_House_Room1/map.json | 56 ++ data/maps/SevenIsland_House_Room2/events.inc | 8 - data/maps/SevenIsland_House_Room2/header.inc | 8 - data/maps/SevenIsland_House_Room2/map.json | 41 ++ data/maps/SevenIsland_Mart/events.inc | 11 - data/maps/SevenIsland_Mart/header.inc | 8 - data/maps/SevenIsland_Mart/map.json | 80 +++ data/maps/SevenIsland_PokemonCenter_1F/events.inc | 14 - data/maps/SevenIsland_PokemonCenter_1F/header.inc | 8 - data/maps/SevenIsland_PokemonCenter_1F/map.json | 113 ++++ data/maps/SevenIsland_PokemonCenter_2F/events.inc | 13 - data/maps/SevenIsland_PokemonCenter_2F/header.inc | 8 - data/maps/SevenIsland_PokemonCenter_2F/map.json | 94 ++++ .../events.inc | 23 - .../header.inc | 8 - .../SevenIsland_SeavaultCanyon_TanobyKey/map.json | 183 ++++++ .../maps/SevenIsland_SevaultCanyon/connections.inc | 7 - data/maps/SevenIsland_SevaultCanyon/events.inc | 32 -- data/maps/SevenIsland_SevaultCanyon/header.inc | 8 - data/maps/SevenIsland_SevaultCanyon/map.json | 323 +++++++++++ .../connections.inc | 7 - .../SevenIsland_SevaultCanyon_Entrance/events.inc | 15 - .../SevenIsland_SevaultCanyon_Entrance/header.inc | 8 - .../SevenIsland_SevaultCanyon_Entrance/map.json | 139 +++++ .../SevenIsland_SevaultCanyon_House/events.inc | 10 - .../SevenIsland_SevaultCanyon_House/header.inc | 8 - data/maps/SevenIsland_SevaultCanyon_House/map.json | 67 +++ data/maps/SevenIsland_TanobyRuins/connections.inc | 6 - data/maps/SevenIsland_TanobyRuins/events.inc | 23 - data/maps/SevenIsland_TanobyRuins/header.inc | 8 - data/maps/SevenIsland_TanobyRuins/map.json | 165 ++++++ .../events.inc | 5 - .../header.inc | 8 - .../map.json | 27 + .../events.inc | 5 - .../header.inc | 8 - .../SevenIsland_TanobyRuins_LiptooChamber/map.json | 27 + .../events.inc | 5 - .../header.inc | 8 - .../SevenIsland_TanobyRuins_MoneanChamber/map.json | 27 + .../SevenIsland_TanobyRuins_RixyChamber/events.inc | 5 - .../SevenIsland_TanobyRuins_RixyChamber/header.inc | 8 - .../SevenIsland_TanobyRuins_RixyChamber/map.json | 27 + .../events.inc | 5 - .../header.inc | 8 - .../SevenIsland_TanobyRuins_ScufibChamber/map.json | 27 + .../events.inc | 5 - .../header.inc | 8 - .../map.json | 27 + .../events.inc | 5 - .../header.inc | 8 - .../SevenIsland_TanobyRuins_WeepthChamber/map.json | 27 + data/maps/SevenIsland_TrainerTower/connections.inc | 6 - data/maps/SevenIsland_TrainerTower/events.inc | 16 - data/maps/SevenIsland_TrainerTower/header.inc | 8 - data/maps/SevenIsland_TrainerTower/map.json | 102 ++++ data/maps/SevenIsland_TrainerTower_1F/events.inc | 18 - data/maps/SevenIsland_TrainerTower_1F/header.inc | 8 - data/maps/SevenIsland_TrainerTower_1F/map.json | 128 +++++ data/maps/SevenIsland_TrainerTower_2F/events.inc | 19 - data/maps/SevenIsland_TrainerTower_2F/header.inc | 8 - data/maps/SevenIsland_TrainerTower_2F/map.json | 135 +++++ data/maps/SevenIsland_TrainerTower_3F/events.inc | 19 - data/maps/SevenIsland_TrainerTower_3F/header.inc | 8 - data/maps/SevenIsland_TrainerTower_3F/map.json | 135 +++++ data/maps/SevenIsland_TrainerTower_4F/events.inc | 19 - data/maps/SevenIsland_TrainerTower_4F/header.inc | 8 - data/maps/SevenIsland_TrainerTower_4F/map.json | 135 +++++ data/maps/SevenIsland_TrainerTower_5F/events.inc | 19 - data/maps/SevenIsland_TrainerTower_5F/header.inc | 8 - data/maps/SevenIsland_TrainerTower_5F/map.json | 135 +++++ data/maps/SevenIsland_TrainerTower_6F/events.inc | 19 - data/maps/SevenIsland_TrainerTower_6F/header.inc | 8 - data/maps/SevenIsland_TrainerTower_6F/map.json | 135 +++++ data/maps/SevenIsland_TrainerTower_7F/events.inc | 19 - data/maps/SevenIsland_TrainerTower_7F/header.inc | 8 - data/maps/SevenIsland_TrainerTower_7F/map.json | 135 +++++ data/maps/SevenIsland_TrainerTower_8F/events.inc | 19 - data/maps/SevenIsland_TrainerTower_8F/header.inc | 8 - data/maps/SevenIsland_TrainerTower_8F/map.json | 135 +++++ .../SevenIsland_TrainerTower_Elevator/events.inc | 8 - .../SevenIsland_TrainerTower_Elevator/header.inc | 8 - .../SevenIsland_TrainerTower_Elevator/map.json | 35 ++ .../SevenIsland_TrainerTower_Elevator/scripts.inc | 4 +- .../maps/SevenIsland_TrainerTower_Lobby/events.inc | 20 - .../maps/SevenIsland_TrainerTower_Lobby/header.inc | 8 - data/maps/SevenIsland_TrainerTower_Lobby/map.json | 125 +++++ data/maps/SevenIsland_TrainerTower_Roof/events.inc | 9 - data/maps/SevenIsland_TrainerTower_Roof/header.inc | 8 - data/maps/SevenIsland_TrainerTower_Roof/map.json | 48 ++ data/maps/SilphCo_10F/events.inc | 26 - data/maps/SilphCo_10F/header.inc | 8 - data/maps/SilphCo_10F/map.json | 186 ++++++ data/maps/SilphCo_11F/events.inc | 27 - data/maps/SilphCo_11F/header.inc | 8 - data/maps/SilphCo_11F/map.json | 184 ++++++ data/maps/SilphCo_1F/events.inc | 15 - data/maps/SilphCo_1F/header.inc | 8 - data/maps/SilphCo_1F/map.json | 77 +++ data/maps/SilphCo_2F/events.inc | 30 - data/maps/SilphCo_2F/header.inc | 8 - data/maps/SilphCo_2F/map.json | 208 +++++++ data/maps/SilphCo_3F/events.inc | 32 -- data/maps/SilphCo_3F/header.inc | 8 - data/maps/SilphCo_3F/map.json | 216 +++++++ data/maps/SilphCo_4F/events.inc | 33 -- data/maps/SilphCo_4F/header.inc | 8 - data/maps/SilphCo_4F/map.json | 247 ++++++++ data/maps/SilphCo_5F/events.inc | 42 -- data/maps/SilphCo_5F/header.inc | 8 - data/maps/SilphCo_5F/map.json | 318 +++++++++++ data/maps/SilphCo_6F/events.inc | 29 - data/maps/SilphCo_6F/header.inc | 8 - data/maps/SilphCo_6F/map.json | 231 ++++++++ data/maps/SilphCo_7F/events.inc | 43 -- data/maps/SilphCo_7F/header.inc | 8 - data/maps/SilphCo_7F/map.json | 326 +++++++++++ data/maps/SilphCo_8F/events.inc | 27 - data/maps/SilphCo_8F/header.inc | 8 - data/maps/SilphCo_8F/map.json | 193 +++++++ data/maps/SilphCo_9F/events.inc | 36 -- data/maps/SilphCo_9F/header.inc | 8 - data/maps/SilphCo_9F/map.json | 246 ++++++++ data/maps/SilphCo_Elevator/events.inc | 8 - data/maps/SilphCo_Elevator/header.inc | 8 - data/maps/SilphCo_Elevator/map.json | 35 ++ data/maps/SixIsland/connections.inc | 6 - data/maps/SixIsland/events.inc | 16 - data/maps/SixIsland/header.inc | 8 - data/maps/SixIsland/map.json | 98 ++++ data/maps/SixIsland_AlteringCave/map.json | 27 + data/maps/SixIsland_AlteringCave/scripts.inc | 7 + data/maps/SixIsland_DottedHole_1F/map.json | 48 ++ data/maps/SixIsland_DottedHole_1F/scripts.inc | 35 ++ data/maps/SixIsland_DottedHole_B1F/events.inc | 12 - data/maps/SixIsland_DottedHole_B1F/header.inc | 8 - data/maps/SixIsland_DottedHole_B1F/map.json | 63 +++ data/maps/SixIsland_DottedHole_B2F/events.inc | 12 - data/maps/SixIsland_DottedHole_B2F/header.inc | 8 - data/maps/SixIsland_DottedHole_B2F/map.json | 63 +++ data/maps/SixIsland_DottedHole_B3F/events.inc | 12 - data/maps/SixIsland_DottedHole_B3F/header.inc | 8 - data/maps/SixIsland_DottedHole_B3F/map.json | 63 +++ data/maps/SixIsland_DottedHole_B4F/map.json | 63 +++ data/maps/SixIsland_DottedHole_B4F/scripts.inc | 2 + .../SixIsland_DottedHole_SapphireRoom/events.inc | 13 - .../SixIsland_DottedHole_SapphireRoom/header.inc | 8 - .../SixIsland_DottedHole_SapphireRoom/map.json | 69 +++ data/maps/SixIsland_GreenPath/connections.inc | 7 - data/maps/SixIsland_GreenPath/events.inc | 16 - data/maps/SixIsland_GreenPath/header.inc | 8 - data/maps/SixIsland_GreenPath/map.json | 97 ++++ data/maps/SixIsland_Harbor/events.inc | 9 - data/maps/SixIsland_Harbor/header.inc | 8 - data/maps/SixIsland_Harbor/map.json | 54 ++ data/maps/SixIsland_House/events.inc | 8 - data/maps/SixIsland_House/header.inc | 8 - data/maps/SixIsland_House/map.json | 41 ++ data/maps/SixIsland_Mart/events.inc | 10 - data/maps/SixIsland_Mart/header.inc | 8 - data/maps/SixIsland_Mart/map.json | 67 +++ data/maps/SixIsland_OutcastIsland/connections.inc | 6 - data/maps/SixIsland_OutcastIsland/events.inc | 18 - data/maps/SixIsland_OutcastIsland/header.inc | 8 - data/maps/SixIsland_OutcastIsland/map.json | 144 +++++ data/maps/SixIsland_PatternBush/map.json | 219 ++++++++ data/maps/SixIsland_PatternBush/scripts.inc | 92 +++ data/maps/SixIsland_PokemonCenter_1F/events.inc | 12 - data/maps/SixIsland_PokemonCenter_1F/header.inc | 8 - data/maps/SixIsland_PokemonCenter_1F/map.json | 87 +++ data/maps/SixIsland_PokemonCenter_2F/events.inc | 13 - data/maps/SixIsland_PokemonCenter_2F/header.inc | 8 - data/maps/SixIsland_PokemonCenter_2F/map.json | 94 ++++ data/maps/SixIsland_RuinValley/connections.inc | 6 - data/maps/SixIsland_RuinValley/events.inc | 27 - data/maps/SixIsland_RuinValley/header.inc | 8 - data/maps/SixIsland_RuinValley/map.json | 263 +++++++++ data/maps/SixIsland_WaterPath/connections.inc | 8 - data/maps/SixIsland_WaterPath/events.inc | 24 - data/maps/SixIsland_WaterPath/header.inc | 8 - data/maps/SixIsland_WaterPath/map.json | 210 +++++++ data/maps/SixIsland_WaterPath_House1/events.inc | 11 - data/maps/SixIsland_WaterPath_House1/header.inc | 8 - data/maps/SixIsland_WaterPath_House1/map.json | 49 ++ data/maps/SixIsland_WaterPath_House2/events.inc | 8 - data/maps/SixIsland_WaterPath_House2/header.inc | 8 - data/maps/SixIsland_WaterPath_House2/map.json | 41 ++ data/maps/ThreeIsland/connections.inc | 7 - data/maps/ThreeIsland/events.inc | 43 -- data/maps/ThreeIsland/header.inc | 8 - data/maps/ThreeIsland/map.json | 371 ++++++++++++ data/maps/ThreeIsland_BerryForest/events.inc | 40 -- data/maps/ThreeIsland_BerryForest/header.inc | 8 - data/maps/ThreeIsland_BerryForest/map.json | 356 ++++++++++++ data/maps/ThreeIsland_BerryForest/scripts.inc | 4 +- data/maps/ThreeIsland_BondBridge/connections.inc | 6 - data/maps/ThreeIsland_BondBridge/events.inc | 24 - data/maps/ThreeIsland_BondBridge/header.inc | 8 - data/maps/ThreeIsland_BondBridge/map.json | 200 +++++++ data/maps/ThreeIsland_DunsparceTunnel/events.inc | 12 - data/maps/ThreeIsland_DunsparceTunnel/header.inc | 8 - data/maps/ThreeIsland_DunsparceTunnel/map.json | 58 ++ data/maps/ThreeIsland_Harbor/events.inc | 9 - data/maps/ThreeIsland_Harbor/header.inc | 8 - data/maps/ThreeIsland_Harbor/map.json | 54 ++ data/maps/ThreeIsland_House1/events.inc | 11 - data/maps/ThreeIsland_House1/header.inc | 8 - data/maps/ThreeIsland_House1/map.json | 49 ++ data/maps/ThreeIsland_House2/events.inc | 9 - data/maps/ThreeIsland_House2/header.inc | 8 - data/maps/ThreeIsland_House2/map.json | 54 ++ data/maps/ThreeIsland_House3/events.inc | 8 - data/maps/ThreeIsland_House3/header.inc | 8 - data/maps/ThreeIsland_House3/map.json | 41 ++ data/maps/ThreeIsland_House4/events.inc | 9 - data/maps/ThreeIsland_House4/header.inc | 8 - data/maps/ThreeIsland_House4/map.json | 54 ++ data/maps/ThreeIsland_House5/events.inc | 8 - data/maps/ThreeIsland_House5/header.inc | 8 - data/maps/ThreeIsland_House5/map.json | 41 ++ data/maps/ThreeIsland_Mart/events.inc | 11 - data/maps/ThreeIsland_Mart/header.inc | 8 - data/maps/ThreeIsland_Mart/map.json | 80 +++ data/maps/ThreeIsland_PokemonCenter_1F/events.inc | 12 - data/maps/ThreeIsland_PokemonCenter_1F/header.inc | 8 - data/maps/ThreeIsland_PokemonCenter_1F/map.json | 87 +++ data/maps/ThreeIsland_PokemonCenter_2F/events.inc | 13 - data/maps/ThreeIsland_PokemonCenter_2F/header.inc | 8 - data/maps/ThreeIsland_PokemonCenter_2F/map.json | 94 ++++ data/maps/ThreeIsland_Port/connections.inc | 6 - data/maps/ThreeIsland_Port/events.inc | 12 - data/maps/ThreeIsland_Port/header.inc | 8 - data/maps/ThreeIsland_Port/map.json | 87 +++ data/maps/TwoIsland/connections.inc | 6 - data/maps/TwoIsland/events.inc | 24 - data/maps/TwoIsland/header.inc | 8 - data/maps/TwoIsland/map.json | 194 +++++++ data/maps/TwoIsland_CapeBrink/connections.inc | 6 - data/maps/TwoIsland_CapeBrink/events.inc | 9 - data/maps/TwoIsland_CapeBrink/header.inc | 8 - data/maps/TwoIsland_CapeBrink/map.json | 52 ++ data/maps/TwoIsland_CapeBrink_House/events.inc | 8 - data/maps/TwoIsland_CapeBrink_House/header.inc | 8 - data/maps/TwoIsland_CapeBrink_House/map.json | 41 ++ data/maps/TwoIsland_Harbor/events.inc | 9 - data/maps/TwoIsland_Harbor/header.inc | 8 - data/maps/TwoIsland_Harbor/map.json | 54 ++ data/maps/TwoIsland_House/events.inc | 8 - data/maps/TwoIsland_House/header.inc | 8 - data/maps/TwoIsland_House/map.json | 41 ++ data/maps/TwoIsland_JoyfulGameCorner/events.inc | 15 - data/maps/TwoIsland_JoyfulGameCorner/header.inc | 8 - data/maps/TwoIsland_JoyfulGameCorner/map.json | 95 ++++ data/maps/TwoIsland_PokemonCenter_1F/events.inc | 11 - data/maps/TwoIsland_PokemonCenter_1F/header.inc | 8 - data/maps/TwoIsland_PokemonCenter_1F/map.json | 74 +++ data/maps/TwoIsland_PokemonCenter_2F/events.inc | 13 - data/maps/TwoIsland_PokemonCenter_2F/header.inc | 8 - data/maps/TwoIsland_PokemonCenter_2F/map.json | 94 ++++ data/maps/UndergroundPath_EastEntrance/events.inc | 11 - data/maps/UndergroundPath_EastEntrance/header.inc | 8 - data/maps/UndergroundPath_EastEntrance/map.json | 62 ++ .../maps/UndergroundPath_EastWestTunnel/events.inc | 15 - .../maps/UndergroundPath_EastWestTunnel/header.inc | 8 - data/maps/UndergroundPath_EastWestTunnel/map.json | 98 ++++ data/maps/UndergroundPath_NorthEntrance/events.inc | 11 - data/maps/UndergroundPath_NorthEntrance/header.inc | 8 - data/maps/UndergroundPath_NorthEntrance/map.json | 62 ++ .../UndergroundPath_NorthSouthTunnel/events.inc | 15 - .../UndergroundPath_NorthSouthTunnel/header.inc | 8 - .../maps/UndergroundPath_NorthSouthTunnel/map.json | 98 ++++ data/maps/UndergroundPath_SouthEntrance/events.inc | 11 - data/maps/UndergroundPath_SouthEntrance/header.inc | 8 - data/maps/UndergroundPath_SouthEntrance/map.json | 62 ++ data/maps/UndergroundPath_WestEntrance/events.inc | 11 - data/maps/UndergroundPath_WestEntrance/header.inc | 8 - data/maps/UndergroundPath_WestEntrance/map.json | 62 ++ data/maps/UnknownMap_00_00/events.inc | 13 - data/maps/UnknownMap_00_00/header.inc | 8 - data/maps/UnknownMap_00_00/map.json | 67 +++ data/maps/UnknownMap_00_01/events.inc | 13 - data/maps/UnknownMap_00_01/header.inc | 8 - data/maps/UnknownMap_00_01/map.json | 67 +++ data/maps/UnknownMap_00_02/events.inc | 17 - data/maps/UnknownMap_00_02/header.inc | 8 - data/maps/UnknownMap_00_02/map.json | 99 ++++ data/maps/UnknownMap_00_03/events.inc | 14 - data/maps/UnknownMap_00_03/header.inc | 8 - data/maps/UnknownMap_00_03/map.json | 85 +++ data/maps/UnknownMap_00_04/events.inc | 16 - data/maps/UnknownMap_00_04/header.inc | 8 - data/maps/UnknownMap_00_04/map.json | 145 +++++ data/maps/UnknownMap_03_50/connections.inc | 6 - data/maps/UnknownMap_03_50/events.inc | 2 - data/maps/UnknownMap_03_50/header.inc | 8 - data/maps/UnknownMap_03_50/map.json | 25 + data/maps/UnknownMap_03_51/connections.inc | 6 - data/maps/UnknownMap_03_51/events.inc | 2 - data/maps/UnknownMap_03_51/header.inc | 8 - data/maps/UnknownMap_03_51/map.json | 25 + data/maps/UnknownMap_03_52/events.inc | 2 - data/maps/UnknownMap_03_52/header.inc | 8 - data/maps/UnknownMap_03_52/map.json | 19 + data/maps/UnknownMap_03_53/events.inc | 2 - data/maps/UnknownMap_03_53/header.inc | 8 - data/maps/UnknownMap_03_53/map.json | 19 + data/maps/UnknownMap_18_01/events.inc | 2 - data/maps/UnknownMap_18_01/header.inc | 8 - data/maps/UnknownMap_18_01/map.json | 19 + data/maps/UnusedHouse_27_00/events.inc | 2 - data/maps/UnusedHouse_27_00/header.inc | 8 - data/maps/UnusedHouse_27_00/map.json | 19 + data/maps/UnusedHouse_29_00/events.inc | 2 - data/maps/UnusedHouse_29_00/header.inc | 8 - data/maps/UnusedHouse_29_00/map.json | 19 + data/maps/UnusedHouse_31_05/events.inc | 2 - data/maps/UnusedHouse_31_05/header.inc | 8 - data/maps/UnusedHouse_31_05/map.json | 19 + data/maps/VermilionCity/connections.inc | 7 - data/maps/VermilionCity/events.inc | 38 -- data/maps/VermilionCity/header.inc | 8 - data/maps/VermilionCity/map.json | 288 ++++++++++ data/maps/VermilionCity_Gym/events.inc | 33 -- data/maps/VermilionCity_Gym/header.inc | 8 - data/maps/VermilionCity_Gym/map.json | 227 ++++++++ data/maps/VermilionCity_House1/events.inc | 10 - data/maps/VermilionCity_House1/header.inc | 8 - data/maps/VermilionCity_House1/map.json | 55 ++ data/maps/VermilionCity_House2/events.inc | 10 - data/maps/VermilionCity_House2/header.inc | 8 - data/maps/VermilionCity_House2/map.json | 55 ++ data/maps/VermilionCity_House3/events.inc | 16 - data/maps/VermilionCity_House3/header.inc | 8 - data/maps/VermilionCity_House3/map.json | 102 ++++ data/maps/VermilionCity_Mart/events.inc | 12 - data/maps/VermilionCity_Mart/header.inc | 8 - data/maps/VermilionCity_Mart/map.json | 81 +++ .../maps/VermilionCity_PokemonCenter_1F/events.inc | 17 - .../maps/VermilionCity_PokemonCenter_1F/header.inc | 8 - data/maps/VermilionCity_PokemonCenter_1F/map.json | 140 +++++ .../maps/VermilionCity_PokemonCenter_2F/events.inc | 13 - .../maps/VermilionCity_PokemonCenter_2F/header.inc | 8 - data/maps/VermilionCity_PokemonCenter_2F/map.json | 94 ++++ data/maps/VermilionCity_PokemonFanClub/events.inc | 19 - data/maps/VermilionCity_PokemonFanClub/header.inc | 8 - data/maps/VermilionCity_PokemonFanClub/map.json | 135 +++++ data/maps/VictoryRoad_1F/events.inc | 22 - data/maps/VictoryRoad_1F/header.inc | 8 - data/maps/VictoryRoad_1F/map.json | 155 +++++ data/maps/VictoryRoad_2F/events.inc | 32 -- data/maps/VictoryRoad_2F/header.inc | 8 - data/maps/VictoryRoad_2F/map.json | 272 +++++++++ data/maps/VictoryRoad_3F/events.inc | 26 - data/maps/VictoryRoad_3F/header.inc | 8 - data/maps/VictoryRoad_3F/map.json | 222 ++++++++ data/maps/ViridianCity/connections.inc | 8 - data/maps/ViridianCity/events.inc | 33 -- data/maps/ViridianCity/header.inc | 8 - data/maps/ViridianCity/map.json | 262 +++++++++ data/maps/ViridianCity_Gym/events.inc | 24 - data/maps/ViridianCity_Gym/header.inc | 8 - data/maps/ViridianCity_Gym/map.json | 196 +++++++ data/maps/ViridianCity_House1/events.inc | 15 - data/maps/ViridianCity_House1/header.inc | 8 - data/maps/ViridianCity_House1/map.json | 89 +++ data/maps/ViridianCity_House2/events.inc | 18 - data/maps/ViridianCity_House2/header.inc | 8 - data/maps/ViridianCity_House2/map.json | 104 ++++ data/maps/ViridianCity_Mart/events.inc | 12 - data/maps/ViridianCity_Mart/header.inc | 8 - data/maps/ViridianCity_Mart/map.json | 81 +++ data/maps/ViridianCity_PokemonCenter_1F/events.inc | 14 - data/maps/ViridianCity_PokemonCenter_1F/header.inc | 8 - data/maps/ViridianCity_PokemonCenter_1F/map.json | 101 ++++ data/maps/ViridianCity_PokemonCenter_2F/events.inc | 13 - data/maps/ViridianCity_PokemonCenter_2F/header.inc | 8 - data/maps/ViridianCity_PokemonCenter_2F/map.json | 94 ++++ data/maps/ViridianForest/events.inc | 33 -- data/maps/ViridianForest/header.inc | 8 - data/maps/ViridianForest/map.json | 267 +++++++++ data/maps/connections.inc | 63 --- data/maps/events.inc | 425 -------------- data/maps/groups.inc | 555 ------------------ data/maps/headers.inc | 425 -------------- data/maps/map_groups.json | 623 +++++++++++++++++++++ 1369 files changed, 48764 insertions(+), 12543 deletions(-) create mode 100644 data/maps/.gitignore delete mode 100644 data/maps/BirthIsland_Exterior/events.inc delete mode 100644 data/maps/BirthIsland_Exterior/header.inc create mode 100644 data/maps/BirthIsland_Exterior/map.json delete mode 100644 data/maps/BirthIsland_Harbor/events.inc delete mode 100644 data/maps/BirthIsland_Harbor/header.inc create mode 100644 data/maps/BirthIsland_Harbor/map.json delete mode 100644 data/maps/CeladonCity/connections.inc delete mode 100644 data/maps/CeladonCity/events.inc delete mode 100644 data/maps/CeladonCity/header.inc create mode 100644 data/maps/CeladonCity/map.json delete mode 100644 data/maps/CeladonCity_Condominiums_1F/events.inc delete mode 100644 data/maps/CeladonCity_Condominiums_1F/header.inc create mode 100644 data/maps/CeladonCity_Condominiums_1F/map.json delete mode 100644 data/maps/CeladonCity_Condominiums_2F/events.inc delete mode 100644 data/maps/CeladonCity_Condominiums_2F/header.inc create mode 100644 data/maps/CeladonCity_Condominiums_2F/map.json delete mode 100644 data/maps/CeladonCity_Condominiums_3F/events.inc delete mode 100644 data/maps/CeladonCity_Condominiums_3F/header.inc create mode 100644 data/maps/CeladonCity_Condominiums_3F/map.json delete mode 100644 data/maps/CeladonCity_Condominiums_Roof/events.inc delete mode 100644 data/maps/CeladonCity_Condominiums_Roof/header.inc create mode 100644 data/maps/CeladonCity_Condominiums_Roof/map.json delete mode 100644 data/maps/CeladonCity_Condominiums_RoofRoom/events.inc delete mode 100644 data/maps/CeladonCity_Condominiums_RoofRoom/header.inc create mode 100644 data/maps/CeladonCity_Condominiums_RoofRoom/map.json delete mode 100644 data/maps/CeladonCity_DepartmentStore_1F/events.inc delete mode 100644 data/maps/CeladonCity_DepartmentStore_1F/header.inc create mode 100644 data/maps/CeladonCity_DepartmentStore_1F/map.json delete mode 100644 data/maps/CeladonCity_DepartmentStore_2F/events.inc delete mode 100644 data/maps/CeladonCity_DepartmentStore_2F/header.inc create mode 100644 data/maps/CeladonCity_DepartmentStore_2F/map.json delete mode 100644 data/maps/CeladonCity_DepartmentStore_3F/events.inc delete mode 100644 data/maps/CeladonCity_DepartmentStore_3F/header.inc create mode 100644 data/maps/CeladonCity_DepartmentStore_3F/map.json delete mode 100644 data/maps/CeladonCity_DepartmentStore_4F/events.inc delete mode 100644 data/maps/CeladonCity_DepartmentStore_4F/header.inc create mode 100644 data/maps/CeladonCity_DepartmentStore_4F/map.json delete mode 100644 data/maps/CeladonCity_DepartmentStore_5F/events.inc delete mode 100644 data/maps/CeladonCity_DepartmentStore_5F/header.inc create mode 100644 data/maps/CeladonCity_DepartmentStore_5F/map.json delete mode 100644 data/maps/CeladonCity_DepartmentStore_Elevator/events.inc delete mode 100644 data/maps/CeladonCity_DepartmentStore_Elevator/header.inc create mode 100644 data/maps/CeladonCity_DepartmentStore_Elevator/map.json delete mode 100644 data/maps/CeladonCity_DepartmentStore_Roof/events.inc delete mode 100644 data/maps/CeladonCity_DepartmentStore_Roof/header.inc create mode 100644 data/maps/CeladonCity_DepartmentStore_Roof/map.json delete mode 100644 data/maps/CeladonCity_GameCorner/events.inc delete mode 100644 data/maps/CeladonCity_GameCorner/header.inc create mode 100644 data/maps/CeladonCity_GameCorner/map.json delete mode 100644 data/maps/CeladonCity_GameCorner_PrizeRoom/events.inc delete mode 100644 data/maps/CeladonCity_GameCorner_PrizeRoom/header.inc create mode 100644 data/maps/CeladonCity_GameCorner_PrizeRoom/map.json delete mode 100644 data/maps/CeladonCity_Gym/events.inc delete mode 100644 data/maps/CeladonCity_Gym/header.inc create mode 100644 data/maps/CeladonCity_Gym/map.json delete mode 100644 data/maps/CeladonCity_Hotel/events.inc delete mode 100644 data/maps/CeladonCity_Hotel/header.inc create mode 100644 data/maps/CeladonCity_Hotel/map.json delete mode 100644 data/maps/CeladonCity_House1/events.inc delete mode 100644 data/maps/CeladonCity_House1/header.inc create mode 100644 data/maps/CeladonCity_House1/map.json delete mode 100644 data/maps/CeladonCity_PokemonCenter_1F/events.inc delete mode 100644 data/maps/CeladonCity_PokemonCenter_1F/header.inc create mode 100644 data/maps/CeladonCity_PokemonCenter_1F/map.json delete mode 100644 data/maps/CeladonCity_PokemonCenter_2F/events.inc delete mode 100644 data/maps/CeladonCity_PokemonCenter_2F/header.inc create mode 100644 data/maps/CeladonCity_PokemonCenter_2F/map.json delete mode 100644 data/maps/CeladonCity_Restaurant/events.inc delete mode 100644 data/maps/CeladonCity_Restaurant/header.inc create mode 100644 data/maps/CeladonCity_Restaurant/map.json delete mode 100644 data/maps/CeruleanCave_1F/events.inc delete mode 100644 data/maps/CeruleanCave_1F/header.inc create mode 100644 data/maps/CeruleanCave_1F/map.json delete mode 100644 data/maps/CeruleanCave_2F/events.inc delete mode 100644 data/maps/CeruleanCave_2F/header.inc create mode 100644 data/maps/CeruleanCave_2F/map.json delete mode 100644 data/maps/CeruleanCave_B1F/events.inc delete mode 100644 data/maps/CeruleanCave_B1F/header.inc create mode 100644 data/maps/CeruleanCave_B1F/map.json delete mode 100644 data/maps/CeruleanCity/connections.inc delete mode 100644 data/maps/CeruleanCity/events.inc create mode 100644 data/maps/CeruleanCity/events_bad.inc delete mode 100644 data/maps/CeruleanCity/header.inc create mode 100644 data/maps/CeruleanCity/map.json delete mode 100644 data/maps/CeruleanCity_BikeShop/events.inc delete mode 100644 data/maps/CeruleanCity_BikeShop/header.inc create mode 100644 data/maps/CeruleanCity_BikeShop/map.json delete mode 100644 data/maps/CeruleanCity_Gym/events.inc delete mode 100644 data/maps/CeruleanCity_Gym/header.inc create mode 100644 data/maps/CeruleanCity_Gym/map.json delete mode 100644 data/maps/CeruleanCity_House1/events.inc delete mode 100644 data/maps/CeruleanCity_House1/header.inc create mode 100644 data/maps/CeruleanCity_House1/map.json delete mode 100644 data/maps/CeruleanCity_House2/events.inc delete mode 100644 data/maps/CeruleanCity_House2/header.inc create mode 100644 data/maps/CeruleanCity_House2/map.json delete mode 100644 data/maps/CeruleanCity_House3/events.inc delete mode 100644 data/maps/CeruleanCity_House3/header.inc create mode 100644 data/maps/CeruleanCity_House3/map.json delete mode 100644 data/maps/CeruleanCity_House4/events.inc delete mode 100644 data/maps/CeruleanCity_House4/header.inc create mode 100644 data/maps/CeruleanCity_House4/map.json delete mode 100644 data/maps/CeruleanCity_House5/events.inc delete mode 100644 data/maps/CeruleanCity_House5/header.inc create mode 100644 data/maps/CeruleanCity_House5/map.json delete mode 100644 data/maps/CeruleanCity_Mart/events.inc delete mode 100644 data/maps/CeruleanCity_Mart/header.inc create mode 100644 data/maps/CeruleanCity_Mart/map.json delete mode 100644 data/maps/CeruleanCity_PokemonCenter_1F/events.inc delete mode 100644 data/maps/CeruleanCity_PokemonCenter_1F/header.inc create mode 100644 data/maps/CeruleanCity_PokemonCenter_1F/map.json delete mode 100644 data/maps/CeruleanCity_PokemonCenter_2F/events.inc delete mode 100644 data/maps/CeruleanCity_PokemonCenter_2F/header.inc create mode 100644 data/maps/CeruleanCity_PokemonCenter_2F/map.json delete mode 100644 data/maps/CinnabarIsland/connections.inc delete mode 100644 data/maps/CinnabarIsland/events.inc delete mode 100644 data/maps/CinnabarIsland/header.inc create mode 100644 data/maps/CinnabarIsland/map.json delete mode 100644 data/maps/CinnabarIsland_Gym/events.inc delete mode 100644 data/maps/CinnabarIsland_Gym/header.inc create mode 100644 data/maps/CinnabarIsland_Gym/map.json delete mode 100644 data/maps/CinnabarIsland_Mart/events.inc delete mode 100644 data/maps/CinnabarIsland_Mart/header.inc create mode 100644 data/maps/CinnabarIsland_Mart/map.json delete mode 100644 data/maps/CinnabarIsland_PokemonCenter_1F/events.inc delete mode 100644 data/maps/CinnabarIsland_PokemonCenter_1F/header.inc create mode 100644 data/maps/CinnabarIsland_PokemonCenter_1F/map.json delete mode 100644 data/maps/CinnabarIsland_PokemonCenter_2F/events.inc delete mode 100644 data/maps/CinnabarIsland_PokemonCenter_2F/header.inc create mode 100644 data/maps/CinnabarIsland_PokemonCenter_2F/map.json delete mode 100644 data/maps/CinnabarIsland_PokemonLab_Entrance/events.inc delete mode 100644 data/maps/CinnabarIsland_PokemonLab_Entrance/header.inc create mode 100644 data/maps/CinnabarIsland_PokemonLab_Entrance/map.json delete mode 100644 data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/events.inc delete mode 100644 data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/header.inc create mode 100644 data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json delete mode 100644 data/maps/CinnabarIsland_PokemonLab_Lounge/events.inc delete mode 100644 data/maps/CinnabarIsland_PokemonLab_Lounge/header.inc create mode 100644 data/maps/CinnabarIsland_PokemonLab_Lounge/map.json delete mode 100644 data/maps/CinnabarIsland_PokemonLab_ResearchRoom/events.inc delete mode 100644 data/maps/CinnabarIsland_PokemonLab_ResearchRoom/header.inc create mode 100644 data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json delete mode 100644 data/maps/DiglettsCave_B1F/events.inc delete mode 100644 data/maps/DiglettsCave_B1F/header.inc create mode 100644 data/maps/DiglettsCave_B1F/map.json delete mode 100644 data/maps/DiglettsCave_NorthEntrance/events.inc delete mode 100644 data/maps/DiglettsCave_NorthEntrance/header.inc create mode 100644 data/maps/DiglettsCave_NorthEntrance/map.json delete mode 100644 data/maps/DiglettsCave_SouthEntrance/events.inc delete mode 100644 data/maps/DiglettsCave_SouthEntrance/header.inc create mode 100644 data/maps/DiglettsCave_SouthEntrance/map.json delete mode 100644 data/maps/FiveIsland/connections.inc delete mode 100644 data/maps/FiveIsland/events.inc delete mode 100644 data/maps/FiveIsland/header.inc create mode 100644 data/maps/FiveIsland/map.json delete mode 100644 data/maps/FiveIsland_Harbor/events.inc delete mode 100644 data/maps/FiveIsland_Harbor/header.inc create mode 100644 data/maps/FiveIsland_Harbor/map.json delete mode 100644 data/maps/FiveIsland_House1/events.inc delete mode 100644 data/maps/FiveIsland_House1/header.inc create mode 100644 data/maps/FiveIsland_House1/map.json delete mode 100644 data/maps/FiveIsland_House2/events.inc delete mode 100644 data/maps/FiveIsland_House2/header.inc create mode 100644 data/maps/FiveIsland_House2/map.json delete mode 100644 data/maps/FiveIsland_LostCave_Entrance/events.inc delete mode 100644 data/maps/FiveIsland_LostCave_Entrance/header.inc create mode 100644 data/maps/FiveIsland_LostCave_Entrance/map.json delete mode 100644 data/maps/FiveIsland_LostCave_Room1/events.inc delete mode 100644 data/maps/FiveIsland_LostCave_Room1/header.inc create mode 100644 data/maps/FiveIsland_LostCave_Room1/map.json delete mode 100644 data/maps/FiveIsland_LostCave_Room10/events.inc delete mode 100644 data/maps/FiveIsland_LostCave_Room10/header.inc create mode 100644 data/maps/FiveIsland_LostCave_Room10/map.json delete mode 100644 data/maps/FiveIsland_LostCave_Room11/events.inc delete mode 100644 data/maps/FiveIsland_LostCave_Room11/header.inc create mode 100644 data/maps/FiveIsland_LostCave_Room11/map.json delete mode 100644 data/maps/FiveIsland_LostCave_Room12/events.inc delete mode 100644 data/maps/FiveIsland_LostCave_Room12/header.inc create mode 100644 data/maps/FiveIsland_LostCave_Room12/map.json delete mode 100644 data/maps/FiveIsland_LostCave_Room13/events.inc delete mode 100644 data/maps/FiveIsland_LostCave_Room13/header.inc create mode 100644 data/maps/FiveIsland_LostCave_Room13/map.json delete mode 100644 data/maps/FiveIsland_LostCave_Room14/events.inc delete mode 100644 data/maps/FiveIsland_LostCave_Room14/header.inc create mode 100644 data/maps/FiveIsland_LostCave_Room14/map.json delete mode 100644 data/maps/FiveIsland_LostCave_Room2/events.inc delete mode 100644 data/maps/FiveIsland_LostCave_Room2/header.inc create mode 100644 data/maps/FiveIsland_LostCave_Room2/map.json delete mode 100644 data/maps/FiveIsland_LostCave_Room3/events.inc delete mode 100644 data/maps/FiveIsland_LostCave_Room3/header.inc create mode 100644 data/maps/FiveIsland_LostCave_Room3/map.json delete mode 100644 data/maps/FiveIsland_LostCave_Room4/events.inc delete mode 100644 data/maps/FiveIsland_LostCave_Room4/header.inc create mode 100644 data/maps/FiveIsland_LostCave_Room4/map.json delete mode 100644 data/maps/FiveIsland_LostCave_Room5/events.inc delete mode 100644 data/maps/FiveIsland_LostCave_Room5/header.inc create mode 100644 data/maps/FiveIsland_LostCave_Room5/map.json delete mode 100644 data/maps/FiveIsland_LostCave_Room6/events.inc delete mode 100644 data/maps/FiveIsland_LostCave_Room6/header.inc create mode 100644 data/maps/FiveIsland_LostCave_Room6/map.json delete mode 100644 data/maps/FiveIsland_LostCave_Room7/events.inc delete mode 100644 data/maps/FiveIsland_LostCave_Room7/header.inc create mode 100644 data/maps/FiveIsland_LostCave_Room7/map.json delete mode 100644 data/maps/FiveIsland_LostCave_Room8/events.inc delete mode 100644 data/maps/FiveIsland_LostCave_Room8/header.inc create mode 100644 data/maps/FiveIsland_LostCave_Room8/map.json delete mode 100644 data/maps/FiveIsland_LostCave_Room9/events.inc delete mode 100644 data/maps/FiveIsland_LostCave_Room9/header.inc create mode 100644 data/maps/FiveIsland_LostCave_Room9/map.json delete mode 100644 data/maps/FiveIsland_Meadow/connections.inc delete mode 100644 data/maps/FiveIsland_Meadow/events.inc delete mode 100644 data/maps/FiveIsland_Meadow/header.inc create mode 100644 data/maps/FiveIsland_Meadow/map.json delete mode 100644 data/maps/FiveIsland_MemorialPillar/connections.inc delete mode 100644 data/maps/FiveIsland_MemorialPillar/events.inc delete mode 100644 data/maps/FiveIsland_MemorialPillar/header.inc create mode 100644 data/maps/FiveIsland_MemorialPillar/map.json delete mode 100644 data/maps/FiveIsland_PokemonCenter_1F/events.inc delete mode 100644 data/maps/FiveIsland_PokemonCenter_1F/header.inc create mode 100644 data/maps/FiveIsland_PokemonCenter_1F/map.json delete mode 100644 data/maps/FiveIsland_PokemonCenter_2F/events.inc delete mode 100644 data/maps/FiveIsland_PokemonCenter_2F/header.inc create mode 100644 data/maps/FiveIsland_PokemonCenter_2F/map.json delete mode 100644 data/maps/FiveIsland_ResortGorgeous/connections.inc delete mode 100644 data/maps/FiveIsland_ResortGorgeous/events.inc delete mode 100644 data/maps/FiveIsland_ResortGorgeous/header.inc create mode 100644 data/maps/FiveIsland_ResortGorgeous/map.json delete mode 100644 data/maps/FiveIsland_ResortGorgeous_House/events.inc delete mode 100644 data/maps/FiveIsland_ResortGorgeous_House/header.inc create mode 100644 data/maps/FiveIsland_ResortGorgeous_House/map.json create mode 100644 data/maps/FiveIsland_RocketWarehouse/map.json create mode 100644 data/maps/FiveIsland_RocketWarehouse/scripts.inc delete mode 100644 data/maps/FiveIsland_WaterLabyrinth/connections.inc delete mode 100644 data/maps/FiveIsland_WaterLabyrinth/events.inc delete mode 100644 data/maps/FiveIsland_WaterLabyrinth/header.inc create mode 100644 data/maps/FiveIsland_WaterLabyrinth/map.json delete mode 100644 data/maps/FourIsland/events.inc delete mode 100644 data/maps/FourIsland/header.inc create mode 100644 data/maps/FourIsland/map.json delete mode 100644 data/maps/FourIsland_Harbor/events.inc delete mode 100644 data/maps/FourIsland_Harbor/header.inc create mode 100644 data/maps/FourIsland_Harbor/map.json delete mode 100644 data/maps/FourIsland_House1/events.inc delete mode 100644 data/maps/FourIsland_House1/header.inc create mode 100644 data/maps/FourIsland_House1/map.json delete mode 100644 data/maps/FourIsland_House2/events.inc delete mode 100644 data/maps/FourIsland_House2/header.inc create mode 100644 data/maps/FourIsland_House2/map.json delete mode 100644 data/maps/FourIsland_IcefallCave_1F/events.inc delete mode 100644 data/maps/FourIsland_IcefallCave_1F/header.inc create mode 100644 data/maps/FourIsland_IcefallCave_1F/map.json create mode 100644 data/maps/FourIsland_IcefallCave_B1F/map.json create mode 100644 data/maps/FourIsland_IcefallCave_B1F/scripts.inc create mode 100644 data/maps/FourIsland_IcefallCave_Back/map.json create mode 100644 data/maps/FourIsland_IcefallCave_Back/scripts.inc delete mode 100644 data/maps/FourIsland_IcefallCave_Entrance/events.inc delete mode 100644 data/maps/FourIsland_IcefallCave_Entrance/header.inc create mode 100644 data/maps/FourIsland_IcefallCave_Entrance/map.json delete mode 100644 data/maps/FourIsland_LoreleisHouse/events.inc delete mode 100644 data/maps/FourIsland_LoreleisHouse/header.inc create mode 100644 data/maps/FourIsland_LoreleisHouse/map.json delete mode 100644 data/maps/FourIsland_Mart/events.inc delete mode 100644 data/maps/FourIsland_Mart/header.inc create mode 100644 data/maps/FourIsland_Mart/map.json delete mode 100644 data/maps/FourIsland_PokemonCenter_1F/events.inc delete mode 100644 data/maps/FourIsland_PokemonCenter_1F/header.inc create mode 100644 data/maps/FourIsland_PokemonCenter_1F/map.json delete mode 100644 data/maps/FourIsland_PokemonCenter_2F/events.inc delete mode 100644 data/maps/FourIsland_PokemonCenter_2F/header.inc create mode 100644 data/maps/FourIsland_PokemonCenter_2F/map.json delete mode 100644 data/maps/FourIsland_PokemonDayCare/events.inc delete mode 100644 data/maps/FourIsland_PokemonDayCare/header.inc create mode 100644 data/maps/FourIsland_PokemonDayCare/map.json delete mode 100644 data/maps/FuchsiaCity/connections.inc delete mode 100644 data/maps/FuchsiaCity/events.inc delete mode 100644 data/maps/FuchsiaCity/header.inc create mode 100644 data/maps/FuchsiaCity/map.json delete mode 100644 data/maps/FuchsiaCity_Building1/events.inc delete mode 100644 data/maps/FuchsiaCity_Building1/header.inc create mode 100644 data/maps/FuchsiaCity_Building1/map.json delete mode 100644 data/maps/FuchsiaCity_Gym/events.inc delete mode 100644 data/maps/FuchsiaCity_Gym/header.inc create mode 100644 data/maps/FuchsiaCity_Gym/map.json delete mode 100644 data/maps/FuchsiaCity_House1/events.inc delete mode 100644 data/maps/FuchsiaCity_House1/header.inc create mode 100644 data/maps/FuchsiaCity_House1/map.json delete mode 100644 data/maps/FuchsiaCity_House2/events.inc delete mode 100644 data/maps/FuchsiaCity_House2/header.inc create mode 100644 data/maps/FuchsiaCity_House2/map.json delete mode 100644 data/maps/FuchsiaCity_House3/events.inc delete mode 100644 data/maps/FuchsiaCity_House3/header.inc create mode 100644 data/maps/FuchsiaCity_House3/map.json delete mode 100644 data/maps/FuchsiaCity_Mart/events.inc delete mode 100644 data/maps/FuchsiaCity_Mart/header.inc create mode 100644 data/maps/FuchsiaCity_Mart/map.json delete mode 100644 data/maps/FuchsiaCity_PokemonCenter_1F/events.inc delete mode 100644 data/maps/FuchsiaCity_PokemonCenter_1F/header.inc create mode 100644 data/maps/FuchsiaCity_PokemonCenter_1F/map.json delete mode 100644 data/maps/FuchsiaCity_PokemonCenter_2F/events.inc delete mode 100644 data/maps/FuchsiaCity_PokemonCenter_2F/header.inc create mode 100644 data/maps/FuchsiaCity_PokemonCenter_2F/map.json delete mode 100644 data/maps/FuchsiaCity_SafariZone_Entrance/events.inc delete mode 100644 data/maps/FuchsiaCity_SafariZone_Entrance/header.inc create mode 100644 data/maps/FuchsiaCity_SafariZone_Entrance/map.json delete mode 100644 data/maps/FuchsiaCity_ZooBuilding/events.inc delete mode 100644 data/maps/FuchsiaCity_ZooBuilding/header.inc create mode 100644 data/maps/FuchsiaCity_ZooBuilding/map.json delete mode 100644 data/maps/IndigoPlateau_Exterior/connections.inc delete mode 100644 data/maps/IndigoPlateau_Exterior/events.inc delete mode 100644 data/maps/IndigoPlateau_Exterior/header.inc create mode 100644 data/maps/IndigoPlateau_Exterior/map.json delete mode 100644 data/maps/IndigoPlateau_PokemonCenter_1F/events.inc delete mode 100644 data/maps/IndigoPlateau_PokemonCenter_1F/header.inc create mode 100644 data/maps/IndigoPlateau_PokemonCenter_1F/map.json delete mode 100644 data/maps/IndigoPlateau_PokemonCenter_2F/events.inc delete mode 100644 data/maps/IndigoPlateau_PokemonCenter_2F/header.inc create mode 100644 data/maps/IndigoPlateau_PokemonCenter_2F/map.json delete mode 100644 data/maps/LavenderTown/connections.inc delete mode 100644 data/maps/LavenderTown/events.inc delete mode 100644 data/maps/LavenderTown/header.inc create mode 100644 data/maps/LavenderTown/map.json delete mode 100644 data/maps/LavenderTown_House1/events.inc delete mode 100644 data/maps/LavenderTown_House1/header.inc create mode 100644 data/maps/LavenderTown_House1/map.json delete mode 100644 data/maps/LavenderTown_House2/events.inc delete mode 100644 data/maps/LavenderTown_House2/header.inc create mode 100644 data/maps/LavenderTown_House2/map.json delete mode 100644 data/maps/LavenderTown_Mart/events.inc delete mode 100644 data/maps/LavenderTown_Mart/header.inc create mode 100644 data/maps/LavenderTown_Mart/map.json delete mode 100644 data/maps/LavenderTown_PokemonCenter_1F/events.inc delete mode 100644 data/maps/LavenderTown_PokemonCenter_1F/header.inc create mode 100644 data/maps/LavenderTown_PokemonCenter_1F/map.json delete mode 100644 data/maps/LavenderTown_PokemonCenter_2F/events.inc delete mode 100644 data/maps/LavenderTown_PokemonCenter_2F/header.inc create mode 100644 data/maps/LavenderTown_PokemonCenter_2F/map.json delete mode 100644 data/maps/LavenderTown_VolunteerPokemonHouse/events.inc delete mode 100644 data/maps/LavenderTown_VolunteerPokemonHouse/header.inc create mode 100644 data/maps/LavenderTown_VolunteerPokemonHouse/map.json delete mode 100644 data/maps/MtEmber_Exterior/events.inc delete mode 100644 data/maps/MtEmber_Exterior/header.inc create mode 100644 data/maps/MtEmber_Exterior/map.json create mode 100644 data/maps/MtEmber_RubyPath_1F/map.json create mode 100644 data/maps/MtEmber_RubyPath_1F/scripts.inc delete mode 100644 data/maps/MtEmber_RubyPath_B1F/events.inc delete mode 100644 data/maps/MtEmber_RubyPath_B1F/header.inc create mode 100644 data/maps/MtEmber_RubyPath_B1F/map.json delete mode 100644 data/maps/MtEmber_RubyPath_B1F_Stairs/events.inc delete mode 100644 data/maps/MtEmber_RubyPath_B1F_Stairs/header.inc create mode 100644 data/maps/MtEmber_RubyPath_B1F_Stairs/map.json delete mode 100644 data/maps/MtEmber_RubyPath_B2F/events.inc delete mode 100644 data/maps/MtEmber_RubyPath_B2F/header.inc create mode 100644 data/maps/MtEmber_RubyPath_B2F/map.json delete mode 100644 data/maps/MtEmber_RubyPath_B2F_Stairs/events.inc delete mode 100644 data/maps/MtEmber_RubyPath_B2F_Stairs/header.inc create mode 100644 data/maps/MtEmber_RubyPath_B2F_Stairs/map.json delete mode 100644 data/maps/MtEmber_RubyPath_B3F/events.inc delete mode 100644 data/maps/MtEmber_RubyPath_B3F/header.inc create mode 100644 data/maps/MtEmber_RubyPath_B3F/map.json delete mode 100644 data/maps/MtEmber_RubyPath_B4F/events.inc delete mode 100644 data/maps/MtEmber_RubyPath_B4F/header.inc create mode 100644 data/maps/MtEmber_RubyPath_B4F/map.json delete mode 100644 data/maps/MtEmber_RubyPath_B5F/events.inc delete mode 100644 data/maps/MtEmber_RubyPath_B5F/header.inc create mode 100644 data/maps/MtEmber_RubyPath_B5F/map.json delete mode 100644 data/maps/MtEmber_Summit/events.inc delete mode 100644 data/maps/MtEmber_Summit/header.inc create mode 100644 data/maps/MtEmber_Summit/map.json delete mode 100644 data/maps/MtEmber_SummitPath_1F/events.inc delete mode 100644 data/maps/MtEmber_SummitPath_1F/header.inc create mode 100644 data/maps/MtEmber_SummitPath_1F/map.json delete mode 100644 data/maps/MtEmber_SummitPath_2F/events.inc delete mode 100644 data/maps/MtEmber_SummitPath_2F/header.inc create mode 100644 data/maps/MtEmber_SummitPath_2F/map.json delete mode 100644 data/maps/MtEmber_SummitPath_3F/events.inc delete mode 100644 data/maps/MtEmber_SummitPath_3F/header.inc create mode 100644 data/maps/MtEmber_SummitPath_3F/map.json delete mode 100644 data/maps/MtMoon_1F/events.inc delete mode 100644 data/maps/MtMoon_1F/header.inc create mode 100644 data/maps/MtMoon_1F/map.json delete mode 100644 data/maps/MtMoon_B1F/events.inc delete mode 100644 data/maps/MtMoon_B1F/header.inc create mode 100644 data/maps/MtMoon_B1F/map.json delete mode 100644 data/maps/MtMoon_B2F/events.inc delete mode 100644 data/maps/MtMoon_B2F/header.inc create mode 100644 data/maps/MtMoon_B2F/map.json delete mode 100644 data/maps/NavelRock_1F/events.inc delete mode 100644 data/maps/NavelRock_1F/header.inc create mode 100644 data/maps/NavelRock_1F/map.json delete mode 100644 data/maps/NavelRock_B1F/events.inc delete mode 100644 data/maps/NavelRock_B1F/header.inc create mode 100644 data/maps/NavelRock_B1F/map.json delete mode 100644 data/maps/NavelRock_Base/events.inc delete mode 100644 data/maps/NavelRock_Base/header.inc create mode 100644 data/maps/NavelRock_Base/map.json delete mode 100644 data/maps/NavelRock_BasePath_B10F/events.inc delete mode 100644 data/maps/NavelRock_BasePath_B10F/header.inc create mode 100644 data/maps/NavelRock_BasePath_B10F/map.json delete mode 100644 data/maps/NavelRock_BasePath_B11F/events.inc delete mode 100644 data/maps/NavelRock_BasePath_B11F/header.inc create mode 100644 data/maps/NavelRock_BasePath_B11F/map.json delete mode 100644 data/maps/NavelRock_BasePath_B1F/events.inc delete mode 100644 data/maps/NavelRock_BasePath_B1F/header.inc create mode 100644 data/maps/NavelRock_BasePath_B1F/map.json delete mode 100644 data/maps/NavelRock_BasePath_B2F/events.inc delete mode 100644 data/maps/NavelRock_BasePath_B2F/header.inc create mode 100644 data/maps/NavelRock_BasePath_B2F/map.json delete mode 100644 data/maps/NavelRock_BasePath_B3F/events.inc delete mode 100644 data/maps/NavelRock_BasePath_B3F/header.inc create mode 100644 data/maps/NavelRock_BasePath_B3F/map.json delete mode 100644 data/maps/NavelRock_BasePath_B4F/events.inc delete mode 100644 data/maps/NavelRock_BasePath_B4F/header.inc create mode 100644 data/maps/NavelRock_BasePath_B4F/map.json delete mode 100644 data/maps/NavelRock_BasePath_B5F/events.inc delete mode 100644 data/maps/NavelRock_BasePath_B5F/header.inc create mode 100644 data/maps/NavelRock_BasePath_B5F/map.json delete mode 100644 data/maps/NavelRock_BasePath_B6F/events.inc delete mode 100644 data/maps/NavelRock_BasePath_B6F/header.inc create mode 100644 data/maps/NavelRock_BasePath_B6F/map.json delete mode 100644 data/maps/NavelRock_BasePath_B7F/events.inc delete mode 100644 data/maps/NavelRock_BasePath_B7F/header.inc create mode 100644 data/maps/NavelRock_BasePath_B7F/map.json delete mode 100644 data/maps/NavelRock_BasePath_B8F/events.inc delete mode 100644 data/maps/NavelRock_BasePath_B8F/header.inc create mode 100644 data/maps/NavelRock_BasePath_B8F/map.json delete mode 100644 data/maps/NavelRock_BasePath_B9F/events.inc delete mode 100644 data/maps/NavelRock_BasePath_B9F/header.inc create mode 100644 data/maps/NavelRock_BasePath_B9F/map.json delete mode 100644 data/maps/NavelRock_Exterior/events.inc delete mode 100644 data/maps/NavelRock_Exterior/header.inc create mode 100644 data/maps/NavelRock_Exterior/map.json delete mode 100644 data/maps/NavelRock_Fork/events.inc delete mode 100644 data/maps/NavelRock_Fork/header.inc create mode 100644 data/maps/NavelRock_Fork/map.json delete mode 100644 data/maps/NavelRock_Harbor/events.inc delete mode 100644 data/maps/NavelRock_Harbor/header.inc create mode 100644 data/maps/NavelRock_Harbor/map.json delete mode 100644 data/maps/NavelRock_Summit/events.inc delete mode 100644 data/maps/NavelRock_Summit/header.inc create mode 100644 data/maps/NavelRock_Summit/map.json delete mode 100644 data/maps/NavelRock_SummitPath_2F/events.inc delete mode 100644 data/maps/NavelRock_SummitPath_2F/header.inc create mode 100644 data/maps/NavelRock_SummitPath_2F/map.json delete mode 100644 data/maps/NavelRock_SummitPath_3F/events.inc delete mode 100644 data/maps/NavelRock_SummitPath_3F/header.inc create mode 100644 data/maps/NavelRock_SummitPath_3F/map.json delete mode 100644 data/maps/NavelRock_SummitPath_4F/events.inc delete mode 100644 data/maps/NavelRock_SummitPath_4F/header.inc create mode 100644 data/maps/NavelRock_SummitPath_4F/map.json delete mode 100644 data/maps/NavelRock_SummitPath_5F/events.inc delete mode 100644 data/maps/NavelRock_SummitPath_5F/header.inc create mode 100644 data/maps/NavelRock_SummitPath_5F/map.json delete mode 100644 data/maps/OneIsland/connections.inc delete mode 100644 data/maps/OneIsland/events.inc delete mode 100644 data/maps/OneIsland/header.inc create mode 100644 data/maps/OneIsland/map.json delete mode 100644 data/maps/OneIsland_Harbor/events.inc delete mode 100644 data/maps/OneIsland_Harbor/header.inc create mode 100644 data/maps/OneIsland_Harbor/map.json delete mode 100644 data/maps/OneIsland_House1/events.inc delete mode 100644 data/maps/OneIsland_House1/header.inc create mode 100644 data/maps/OneIsland_House1/map.json delete mode 100644 data/maps/OneIsland_House2/events.inc delete mode 100644 data/maps/OneIsland_House2/header.inc create mode 100644 data/maps/OneIsland_House2/map.json delete mode 100644 data/maps/OneIsland_KindleRoad/connections.inc delete mode 100644 data/maps/OneIsland_KindleRoad/events.inc delete mode 100644 data/maps/OneIsland_KindleRoad/header.inc create mode 100644 data/maps/OneIsland_KindleRoad/map.json delete mode 100644 data/maps/OneIsland_KindleRoad_EmberSpa/events.inc delete mode 100644 data/maps/OneIsland_KindleRoad_EmberSpa/header.inc create mode 100644 data/maps/OneIsland_KindleRoad_EmberSpa/map.json delete mode 100644 data/maps/OneIsland_PokemonCenter_1F/events.inc delete mode 100644 data/maps/OneIsland_PokemonCenter_1F/header.inc create mode 100644 data/maps/OneIsland_PokemonCenter_1F/map.json delete mode 100644 data/maps/OneIsland_PokemonCenter_2F/events.inc delete mode 100644 data/maps/OneIsland_PokemonCenter_2F/header.inc create mode 100644 data/maps/OneIsland_PokemonCenter_2F/map.json delete mode 100644 data/maps/OneIsland_TreasureBeach/connections.inc delete mode 100644 data/maps/OneIsland_TreasureBeach/events.inc delete mode 100644 data/maps/OneIsland_TreasureBeach/header.inc create mode 100644 data/maps/OneIsland_TreasureBeach/map.json delete mode 100644 data/maps/PalletTown/connections.inc delete mode 100644 data/maps/PalletTown/events.inc delete mode 100644 data/maps/PalletTown/header.inc create mode 100644 data/maps/PalletTown/map.json delete mode 100644 data/maps/PalletTown_GarysHouse/events.inc delete mode 100644 data/maps/PalletTown_GarysHouse/header.inc create mode 100644 data/maps/PalletTown_GarysHouse/map.json delete mode 100644 data/maps/PalletTown_PlayersHouse_1F/events.inc delete mode 100644 data/maps/PalletTown_PlayersHouse_1F/header.inc create mode 100644 data/maps/PalletTown_PlayersHouse_1F/map.json delete mode 100644 data/maps/PalletTown_PlayersHouse_2F/events.inc delete mode 100644 data/maps/PalletTown_PlayersHouse_2F/header.inc create mode 100644 data/maps/PalletTown_PlayersHouse_2F/map.json delete mode 100644 data/maps/PalletTown_ProfessorOaksLab/events.inc delete mode 100644 data/maps/PalletTown_ProfessorOaksLab/header.inc create mode 100644 data/maps/PalletTown_ProfessorOaksLab/map.json delete mode 100644 data/maps/PewterCity/connections.inc delete mode 100644 data/maps/PewterCity/events.inc delete mode 100644 data/maps/PewterCity/header.inc create mode 100644 data/maps/PewterCity/map.json delete mode 100644 data/maps/PewterCity_Gym/events.inc delete mode 100644 data/maps/PewterCity_Gym/header.inc create mode 100644 data/maps/PewterCity_Gym/map.json delete mode 100644 data/maps/PewterCity_House1/events.inc delete mode 100644 data/maps/PewterCity_House1/header.inc create mode 100644 data/maps/PewterCity_House1/map.json delete mode 100644 data/maps/PewterCity_House2/events.inc delete mode 100644 data/maps/PewterCity_House2/header.inc create mode 100644 data/maps/PewterCity_House2/map.json delete mode 100644 data/maps/PewterCity_Mart/events.inc delete mode 100644 data/maps/PewterCity_Mart/header.inc create mode 100644 data/maps/PewterCity_Mart/map.json delete mode 100644 data/maps/PewterCity_Museum_1F/events.inc delete mode 100644 data/maps/PewterCity_Museum_1F/header.inc create mode 100644 data/maps/PewterCity_Museum_1F/map.json delete mode 100644 data/maps/PewterCity_Museum_2F/events.inc delete mode 100644 data/maps/PewterCity_Museum_2F/header.inc create mode 100644 data/maps/PewterCity_Museum_2F/map.json delete mode 100644 data/maps/PewterCity_PokemonCenter_1F/events.inc delete mode 100644 data/maps/PewterCity_PokemonCenter_1F/header.inc create mode 100644 data/maps/PewterCity_PokemonCenter_1F/map.json delete mode 100644 data/maps/PewterCity_PokemonCenter_2F/events.inc delete mode 100644 data/maps/PewterCity_PokemonCenter_2F/header.inc create mode 100644 data/maps/PewterCity_PokemonCenter_2F/map.json delete mode 100644 data/maps/PokemonLeague_AgathasRoom/events.inc delete mode 100644 data/maps/PokemonLeague_AgathasRoom/header.inc create mode 100644 data/maps/PokemonLeague_AgathasRoom/map.json delete mode 100644 data/maps/PokemonLeague_BrunosRoom/events.inc delete mode 100644 data/maps/PokemonLeague_BrunosRoom/header.inc create mode 100644 data/maps/PokemonLeague_BrunosRoom/map.json delete mode 100644 data/maps/PokemonLeague_ChampionsRoom/events.inc delete mode 100644 data/maps/PokemonLeague_ChampionsRoom/header.inc create mode 100644 data/maps/PokemonLeague_ChampionsRoom/map.json delete mode 100644 data/maps/PokemonLeague_HallOfFame/events.inc delete mode 100644 data/maps/PokemonLeague_HallOfFame/header.inc create mode 100644 data/maps/PokemonLeague_HallOfFame/map.json delete mode 100644 data/maps/PokemonLeague_LancesRoom/events.inc delete mode 100644 data/maps/PokemonLeague_LancesRoom/header.inc create mode 100644 data/maps/PokemonLeague_LancesRoom/map.json delete mode 100644 data/maps/PokemonLeague_LoreleisRoom/events.inc delete mode 100644 data/maps/PokemonLeague_LoreleisRoom/header.inc create mode 100644 data/maps/PokemonLeague_LoreleisRoom/map.json delete mode 100644 data/maps/PokemonMansion_1F/events.inc delete mode 100644 data/maps/PokemonMansion_1F/header.inc create mode 100644 data/maps/PokemonMansion_1F/map.json delete mode 100644 data/maps/PokemonMansion_2F/events.inc delete mode 100644 data/maps/PokemonMansion_2F/header.inc create mode 100644 data/maps/PokemonMansion_2F/map.json delete mode 100644 data/maps/PokemonMansion_3F/events.inc delete mode 100644 data/maps/PokemonMansion_3F/header.inc create mode 100644 data/maps/PokemonMansion_3F/map.json delete mode 100644 data/maps/PokemonMansion_B1F/events.inc delete mode 100644 data/maps/PokemonMansion_B1F/header.inc create mode 100644 data/maps/PokemonMansion_B1F/map.json delete mode 100644 data/maps/PokemonTower_1F/events.inc delete mode 100644 data/maps/PokemonTower_1F/header.inc create mode 100644 data/maps/PokemonTower_1F/map.json delete mode 100644 data/maps/PokemonTower_2F/events.inc delete mode 100644 data/maps/PokemonTower_2F/header.inc create mode 100644 data/maps/PokemonTower_2F/map.json delete mode 100644 data/maps/PokemonTower_3F/events.inc delete mode 100644 data/maps/PokemonTower_3F/header.inc create mode 100644 data/maps/PokemonTower_3F/map.json delete mode 100644 data/maps/PokemonTower_4F/events.inc delete mode 100644 data/maps/PokemonTower_4F/header.inc create mode 100644 data/maps/PokemonTower_4F/map.json delete mode 100644 data/maps/PokemonTower_5F/events.inc delete mode 100644 data/maps/PokemonTower_5F/header.inc create mode 100644 data/maps/PokemonTower_5F/map.json delete mode 100644 data/maps/PokemonTower_6F/events.inc delete mode 100644 data/maps/PokemonTower_6F/header.inc create mode 100644 data/maps/PokemonTower_6F/map.json delete mode 100644 data/maps/PokemonTower_7F/events.inc delete mode 100644 data/maps/PokemonTower_7F/header.inc create mode 100644 data/maps/PokemonTower_7F/map.json delete mode 100644 data/maps/PowerPlant/events.inc delete mode 100644 data/maps/PowerPlant/header.inc create mode 100644 data/maps/PowerPlant/map.json delete mode 100644 data/maps/RockTunnel_1F/events.inc delete mode 100644 data/maps/RockTunnel_1F/header.inc create mode 100644 data/maps/RockTunnel_1F/map.json delete mode 100644 data/maps/RockTunnel_B1F/events.inc delete mode 100644 data/maps/RockTunnel_B1F/header.inc create mode 100644 data/maps/RockTunnel_B1F/map.json delete mode 100644 data/maps/RocketHideout_B1F/events.inc delete mode 100644 data/maps/RocketHideout_B1F/header.inc create mode 100644 data/maps/RocketHideout_B1F/map.json delete mode 100644 data/maps/RocketHideout_B2F/events.inc delete mode 100644 data/maps/RocketHideout_B2F/header.inc create mode 100644 data/maps/RocketHideout_B2F/map.json delete mode 100644 data/maps/RocketHideout_B3F/events.inc delete mode 100644 data/maps/RocketHideout_B3F/header.inc create mode 100644 data/maps/RocketHideout_B3F/map.json delete mode 100644 data/maps/RocketHideout_B4F/events.inc delete mode 100644 data/maps/RocketHideout_B4F/header.inc create mode 100644 data/maps/RocketHideout_B4F/map.json delete mode 100644 data/maps/RocketHideout_Elevator/events.inc delete mode 100644 data/maps/RocketHideout_Elevator/header.inc create mode 100644 data/maps/RocketHideout_Elevator/map.json delete mode 100644 data/maps/Route1/connections.inc delete mode 100644 data/maps/Route1/events.inc delete mode 100644 data/maps/Route1/header.inc create mode 100644 data/maps/Route1/map.json delete mode 100644 data/maps/Route10/connections.inc delete mode 100644 data/maps/Route10/events.inc delete mode 100644 data/maps/Route10/header.inc create mode 100644 data/maps/Route10/map.json delete mode 100644 data/maps/Route10_PokemonCenter_1F/events.inc delete mode 100644 data/maps/Route10_PokemonCenter_1F/header.inc create mode 100644 data/maps/Route10_PokemonCenter_1F/map.json delete mode 100644 data/maps/Route10_PokemonCenter_2F/events.inc delete mode 100644 data/maps/Route10_PokemonCenter_2F/header.inc create mode 100644 data/maps/Route10_PokemonCenter_2F/map.json delete mode 100644 data/maps/Route11/connections.inc delete mode 100644 data/maps/Route11/events.inc delete mode 100644 data/maps/Route11/header.inc create mode 100644 data/maps/Route11/map.json delete mode 100644 data/maps/Route11_EastEntrance_1F/events.inc delete mode 100644 data/maps/Route11_EastEntrance_1F/header.inc create mode 100644 data/maps/Route11_EastEntrance_1F/map.json delete mode 100644 data/maps/Route11_EastEntrance_2F/events.inc delete mode 100644 data/maps/Route11_EastEntrance_2F/header.inc create mode 100644 data/maps/Route11_EastEntrance_2F/map.json delete mode 100644 data/maps/Route12/connections.inc delete mode 100644 data/maps/Route12/events.inc delete mode 100644 data/maps/Route12/header.inc create mode 100644 data/maps/Route12/map.json delete mode 100644 data/maps/Route12_FishingHouse/events.inc delete mode 100644 data/maps/Route12_FishingHouse/header.inc create mode 100644 data/maps/Route12_FishingHouse/map.json delete mode 100644 data/maps/Route12_NorthEntrance_1F/events.inc delete mode 100644 data/maps/Route12_NorthEntrance_1F/header.inc create mode 100644 data/maps/Route12_NorthEntrance_1F/map.json delete mode 100644 data/maps/Route12_NorthEntrance_2F/events.inc delete mode 100644 data/maps/Route12_NorthEntrance_2F/header.inc create mode 100644 data/maps/Route12_NorthEntrance_2F/map.json delete mode 100644 data/maps/Route13/connections.inc delete mode 100644 data/maps/Route13/events.inc delete mode 100644 data/maps/Route13/header.inc create mode 100644 data/maps/Route13/map.json delete mode 100644 data/maps/Route14/connections.inc delete mode 100644 data/maps/Route14/events.inc delete mode 100644 data/maps/Route14/header.inc create mode 100644 data/maps/Route14/map.json delete mode 100644 data/maps/Route15/connections.inc delete mode 100644 data/maps/Route15/events.inc delete mode 100644 data/maps/Route15/header.inc create mode 100644 data/maps/Route15/map.json delete mode 100644 data/maps/Route15_WestEntrance_1F/events.inc delete mode 100644 data/maps/Route15_WestEntrance_1F/header.inc create mode 100644 data/maps/Route15_WestEntrance_1F/map.json delete mode 100644 data/maps/Route15_WestEntrance_2F/events.inc delete mode 100644 data/maps/Route15_WestEntrance_2F/header.inc create mode 100644 data/maps/Route15_WestEntrance_2F/map.json delete mode 100644 data/maps/Route16/connections.inc delete mode 100644 data/maps/Route16/events.inc delete mode 100644 data/maps/Route16/header.inc create mode 100644 data/maps/Route16/map.json delete mode 100644 data/maps/Route16_House/events.inc delete mode 100644 data/maps/Route16_House/header.inc create mode 100644 data/maps/Route16_House/map.json delete mode 100644 data/maps/Route16_NorthEntrance_1F/events.inc delete mode 100644 data/maps/Route16_NorthEntrance_1F/header.inc create mode 100644 data/maps/Route16_NorthEntrance_1F/map.json delete mode 100644 data/maps/Route16_NorthEntrance_2F/events.inc delete mode 100644 data/maps/Route16_NorthEntrance_2F/header.inc create mode 100644 data/maps/Route16_NorthEntrance_2F/map.json delete mode 100644 data/maps/Route17/connections.inc delete mode 100644 data/maps/Route17/events.inc delete mode 100644 data/maps/Route17/header.inc create mode 100644 data/maps/Route17/map.json delete mode 100644 data/maps/Route18/connections.inc delete mode 100644 data/maps/Route18/events.inc delete mode 100644 data/maps/Route18/header.inc create mode 100644 data/maps/Route18/map.json delete mode 100644 data/maps/Route18_EastEntrance_1F/events.inc delete mode 100644 data/maps/Route18_EastEntrance_1F/header.inc create mode 100644 data/maps/Route18_EastEntrance_1F/map.json delete mode 100644 data/maps/Route18_EastEntrance_2F/events.inc delete mode 100644 data/maps/Route18_EastEntrance_2F/header.inc create mode 100644 data/maps/Route18_EastEntrance_2F/map.json delete mode 100644 data/maps/Route19/connections.inc delete mode 100644 data/maps/Route19/events.inc delete mode 100644 data/maps/Route19/header.inc create mode 100644 data/maps/Route19/map.json delete mode 100644 data/maps/Route2/connections.inc delete mode 100644 data/maps/Route2/events.inc delete mode 100644 data/maps/Route2/header.inc create mode 100644 data/maps/Route2/map.json delete mode 100644 data/maps/Route20/connections.inc delete mode 100644 data/maps/Route20/events.inc delete mode 100644 data/maps/Route20/header.inc create mode 100644 data/maps/Route20/map.json delete mode 100644 data/maps/Route21_North/connections.inc delete mode 100644 data/maps/Route21_North/events.inc delete mode 100644 data/maps/Route21_North/header.inc create mode 100644 data/maps/Route21_North/map.json delete mode 100644 data/maps/Route21_South/connections.inc delete mode 100644 data/maps/Route21_South/events.inc delete mode 100644 data/maps/Route21_South/header.inc create mode 100644 data/maps/Route21_South/map.json delete mode 100644 data/maps/Route22/connections.inc delete mode 100644 data/maps/Route22/events.inc delete mode 100644 data/maps/Route22/header.inc create mode 100644 data/maps/Route22/map.json delete mode 100644 data/maps/Route22_NorthEntrance/events.inc delete mode 100644 data/maps/Route22_NorthEntrance/header.inc create mode 100644 data/maps/Route22_NorthEntrance/map.json delete mode 100644 data/maps/Route23/connections.inc delete mode 100644 data/maps/Route23/events.inc delete mode 100644 data/maps/Route23/header.inc create mode 100644 data/maps/Route23/map.json delete mode 100644 data/maps/Route24/connections.inc delete mode 100644 data/maps/Route24/events.inc delete mode 100644 data/maps/Route24/header.inc create mode 100644 data/maps/Route24/map.json delete mode 100644 data/maps/Route25/connections.inc delete mode 100644 data/maps/Route25/events.inc delete mode 100644 data/maps/Route25/header.inc create mode 100644 data/maps/Route25/map.json delete mode 100644 data/maps/Route25_SeaCottage/events.inc delete mode 100644 data/maps/Route25_SeaCottage/header.inc create mode 100644 data/maps/Route25_SeaCottage/map.json delete mode 100644 data/maps/Route2_EastBuilding/events.inc delete mode 100644 data/maps/Route2_EastBuilding/header.inc create mode 100644 data/maps/Route2_EastBuilding/map.json delete mode 100644 data/maps/Route2_House/events.inc delete mode 100644 data/maps/Route2_House/header.inc create mode 100644 data/maps/Route2_House/map.json delete mode 100644 data/maps/Route2_ViridianForest_NorthEntrance/events.inc delete mode 100644 data/maps/Route2_ViridianForest_NorthEntrance/header.inc create mode 100644 data/maps/Route2_ViridianForest_NorthEntrance/map.json delete mode 100644 data/maps/Route2_ViridianForest_SouthEntrance/events.inc delete mode 100644 data/maps/Route2_ViridianForest_SouthEntrance/header.inc create mode 100644 data/maps/Route2_ViridianForest_SouthEntrance/map.json delete mode 100644 data/maps/Route3/connections.inc delete mode 100644 data/maps/Route3/events.inc delete mode 100644 data/maps/Route3/header.inc create mode 100644 data/maps/Route3/map.json delete mode 100644 data/maps/Route4/connections.inc delete mode 100644 data/maps/Route4/events.inc delete mode 100644 data/maps/Route4/header.inc create mode 100644 data/maps/Route4/map.json delete mode 100644 data/maps/Route4_PokemonCenter_1F/events.inc delete mode 100644 data/maps/Route4_PokemonCenter_1F/header.inc create mode 100644 data/maps/Route4_PokemonCenter_1F/map.json delete mode 100644 data/maps/Route4_PokemonCenter_2F/events.inc delete mode 100644 data/maps/Route4_PokemonCenter_2F/header.inc create mode 100644 data/maps/Route4_PokemonCenter_2F/map.json delete mode 100644 data/maps/Route5/connections.inc delete mode 100644 data/maps/Route5/events.inc delete mode 100644 data/maps/Route5/header.inc create mode 100644 data/maps/Route5/map.json delete mode 100644 data/maps/Route5_PokemonDayCare/events.inc delete mode 100644 data/maps/Route5_PokemonDayCare/header.inc create mode 100644 data/maps/Route5_PokemonDayCare/map.json delete mode 100644 data/maps/Route5_SouthEntrance/events.inc delete mode 100644 data/maps/Route5_SouthEntrance/header.inc create mode 100644 data/maps/Route5_SouthEntrance/map.json delete mode 100644 data/maps/Route6/connections.inc delete mode 100644 data/maps/Route6/events.inc delete mode 100644 data/maps/Route6/header.inc create mode 100644 data/maps/Route6/map.json delete mode 100644 data/maps/Route6_NorthEntrance/events.inc delete mode 100644 data/maps/Route6_NorthEntrance/header.inc create mode 100644 data/maps/Route6_NorthEntrance/map.json delete mode 100644 data/maps/Route7/connections.inc delete mode 100644 data/maps/Route7/events.inc delete mode 100644 data/maps/Route7/header.inc create mode 100644 data/maps/Route7/map.json delete mode 100644 data/maps/Route7_EastEntrance/events.inc delete mode 100644 data/maps/Route7_EastEntrance/header.inc create mode 100644 data/maps/Route7_EastEntrance/map.json delete mode 100644 data/maps/Route8/connections.inc delete mode 100644 data/maps/Route8/events.inc delete mode 100644 data/maps/Route8/header.inc create mode 100644 data/maps/Route8/map.json delete mode 100644 data/maps/Route8_WestEntrance/events.inc delete mode 100644 data/maps/Route8_WestEntrance/header.inc create mode 100644 data/maps/Route8_WestEntrance/map.json delete mode 100644 data/maps/Route9/connections.inc delete mode 100644 data/maps/Route9/events.inc delete mode 100644 data/maps/Route9/header.inc create mode 100644 data/maps/Route9/map.json delete mode 100644 data/maps/SSAnne_1F_Corridor/events.inc delete mode 100644 data/maps/SSAnne_1F_Corridor/header.inc create mode 100644 data/maps/SSAnne_1F_Corridor/map.json delete mode 100644 data/maps/SSAnne_1F_Room1/events.inc delete mode 100644 data/maps/SSAnne_1F_Room1/header.inc create mode 100644 data/maps/SSAnne_1F_Room1/map.json delete mode 100644 data/maps/SSAnne_1F_Room11/events.inc delete mode 100644 data/maps/SSAnne_1F_Room11/header.inc delete mode 100644 data/maps/SSAnne_1F_Room11/scripts.inc delete mode 100644 data/maps/SSAnne_1F_Room12/events.inc delete mode 100644 data/maps/SSAnne_1F_Room12/header.inc delete mode 100644 data/maps/SSAnne_1F_Room12/scripts.inc delete mode 100644 data/maps/SSAnne_1F_Room2/events.inc delete mode 100644 data/maps/SSAnne_1F_Room2/header.inc create mode 100644 data/maps/SSAnne_1F_Room2/map.json delete mode 100644 data/maps/SSAnne_1F_Room3/events.inc delete mode 100644 data/maps/SSAnne_1F_Room3/header.inc create mode 100644 data/maps/SSAnne_1F_Room3/map.json delete mode 100644 data/maps/SSAnne_1F_Room4/events.inc delete mode 100644 data/maps/SSAnne_1F_Room4/header.inc create mode 100644 data/maps/SSAnne_1F_Room4/map.json delete mode 100644 data/maps/SSAnne_1F_Room5/events.inc delete mode 100644 data/maps/SSAnne_1F_Room5/header.inc create mode 100644 data/maps/SSAnne_1F_Room5/map.json delete mode 100644 data/maps/SSAnne_1F_Room6/events.inc delete mode 100644 data/maps/SSAnne_1F_Room6/header.inc create mode 100644 data/maps/SSAnne_1F_Room6/map.json delete mode 100644 data/maps/SSAnne_1F_Room7/events.inc delete mode 100644 data/maps/SSAnne_1F_Room7/header.inc create mode 100644 data/maps/SSAnne_1F_Room7/map.json delete mode 100644 data/maps/SSAnne_2F_Corridor/events.inc delete mode 100644 data/maps/SSAnne_2F_Corridor/header.inc create mode 100644 data/maps/SSAnne_2F_Corridor/map.json delete mode 100644 data/maps/SSAnne_2F_Room1/events.inc delete mode 100644 data/maps/SSAnne_2F_Room1/header.inc create mode 100644 data/maps/SSAnne_2F_Room1/map.json delete mode 100644 data/maps/SSAnne_2F_Room2/events.inc delete mode 100644 data/maps/SSAnne_2F_Room2/header.inc create mode 100644 data/maps/SSAnne_2F_Room2/map.json delete mode 100644 data/maps/SSAnne_2F_Room3/events.inc delete mode 100644 data/maps/SSAnne_2F_Room3/header.inc create mode 100644 data/maps/SSAnne_2F_Room3/map.json delete mode 100644 data/maps/SSAnne_2F_Room4/events.inc delete mode 100644 data/maps/SSAnne_2F_Room4/header.inc create mode 100644 data/maps/SSAnne_2F_Room4/map.json delete mode 100644 data/maps/SSAnne_2F_Room5/events.inc delete mode 100644 data/maps/SSAnne_2F_Room5/header.inc create mode 100644 data/maps/SSAnne_2F_Room5/map.json delete mode 100644 data/maps/SSAnne_2F_Room6/events.inc delete mode 100644 data/maps/SSAnne_2F_Room6/header.inc create mode 100644 data/maps/SSAnne_2F_Room6/map.json delete mode 100644 data/maps/SSAnne_3F_Corridor/events.inc delete mode 100644 data/maps/SSAnne_3F_Corridor/header.inc create mode 100644 data/maps/SSAnne_3F_Corridor/map.json delete mode 100644 data/maps/SSAnne_B1F_Corridor/events.inc delete mode 100644 data/maps/SSAnne_B1F_Corridor/header.inc create mode 100644 data/maps/SSAnne_B1F_Corridor/map.json delete mode 100644 data/maps/SSAnne_B1F_Room1/events.inc delete mode 100644 data/maps/SSAnne_B1F_Room1/header.inc create mode 100644 data/maps/SSAnne_B1F_Room1/map.json delete mode 100644 data/maps/SSAnne_B1F_Room2/events.inc delete mode 100644 data/maps/SSAnne_B1F_Room2/header.inc create mode 100644 data/maps/SSAnne_B1F_Room2/map.json delete mode 100644 data/maps/SSAnne_B1F_Room3/events.inc delete mode 100644 data/maps/SSAnne_B1F_Room3/header.inc create mode 100644 data/maps/SSAnne_B1F_Room3/map.json delete mode 100644 data/maps/SSAnne_B1F_Room4/events.inc delete mode 100644 data/maps/SSAnne_B1F_Room4/header.inc create mode 100644 data/maps/SSAnne_B1F_Room4/map.json delete mode 100644 data/maps/SSAnne_B1F_Room5/events.inc delete mode 100644 data/maps/SSAnne_B1F_Room5/header.inc create mode 100644 data/maps/SSAnne_B1F_Room5/map.json delete mode 100644 data/maps/SSAnne_CaptainsOffice/events.inc delete mode 100644 data/maps/SSAnne_CaptainsOffice/header.inc create mode 100644 data/maps/SSAnne_CaptainsOffice/map.json delete mode 100644 data/maps/SSAnne_CaptainsOffice2/events.inc delete mode 100644 data/maps/SSAnne_CaptainsOffice2/header.inc delete mode 100644 data/maps/SSAnne_CaptainsOffice2/scripts.inc delete mode 100644 data/maps/SSAnne_CaptainsOffice3/events.inc delete mode 100644 data/maps/SSAnne_CaptainsOffice3/header.inc delete mode 100644 data/maps/SSAnne_CaptainsOffice3/scripts.inc delete mode 100644 data/maps/SSAnne_CaptainsOffice4/events.inc delete mode 100644 data/maps/SSAnne_CaptainsOffice4/header.inc delete mode 100644 data/maps/SSAnne_CaptainsOffice4/scripts.inc delete mode 100644 data/maps/SSAnne_CaptainsOffice5/events.inc delete mode 100644 data/maps/SSAnne_CaptainsOffice5/header.inc delete mode 100644 data/maps/SSAnne_CaptainsOffice5/scripts.inc delete mode 100644 data/maps/SSAnne_CaptainsOffice9/events.inc delete mode 100644 data/maps/SSAnne_CaptainsOffice9/header.inc delete mode 100644 data/maps/SSAnne_CaptainsOffice9/scripts.inc delete mode 100644 data/maps/SSAnne_Deck/events.inc delete mode 100644 data/maps/SSAnne_Deck/header.inc create mode 100644 data/maps/SSAnne_Deck/map.json delete mode 100644 data/maps/SSAnne_Exterior/events.inc delete mode 100644 data/maps/SSAnne_Exterior/header.inc create mode 100644 data/maps/SSAnne_Exterior/map.json delete mode 100644 data/maps/SSAnne_Kitchen/events.inc delete mode 100644 data/maps/SSAnne_Kitchen/header.inc create mode 100644 data/maps/SSAnne_Kitchen/map.json delete mode 100644 data/maps/SSAnne_Kitchen3/events.inc delete mode 100644 data/maps/SSAnne_Kitchen3/header.inc delete mode 100644 data/maps/SSAnne_Kitchen3/scripts.inc delete mode 100644 data/maps/SafariZone_Building1/events.inc delete mode 100644 data/maps/SafariZone_Building1/header.inc create mode 100644 data/maps/SafariZone_Building1/map.json delete mode 100644 data/maps/SafariZone_Building2/events.inc delete mode 100644 data/maps/SafariZone_Building2/header.inc create mode 100644 data/maps/SafariZone_Building2/map.json delete mode 100644 data/maps/SafariZone_Building3/events.inc delete mode 100644 data/maps/SafariZone_Building3/header.inc create mode 100644 data/maps/SafariZone_Building3/map.json delete mode 100644 data/maps/SafariZone_Building4/events.inc delete mode 100644 data/maps/SafariZone_Building4/header.inc create mode 100644 data/maps/SafariZone_Building4/map.json delete mode 100644 data/maps/SafariZone_Center/events.inc delete mode 100644 data/maps/SafariZone_Center/header.inc create mode 100644 data/maps/SafariZone_Center/map.json delete mode 100644 data/maps/SafariZone_East/events.inc delete mode 100644 data/maps/SafariZone_East/header.inc create mode 100644 data/maps/SafariZone_East/map.json delete mode 100644 data/maps/SafariZone_North/events.inc delete mode 100644 data/maps/SafariZone_North/header.inc create mode 100644 data/maps/SafariZone_North/map.json delete mode 100644 data/maps/SafariZone_SecretHouse/events.inc delete mode 100644 data/maps/SafariZone_SecretHouse/header.inc create mode 100644 data/maps/SafariZone_SecretHouse/map.json delete mode 100644 data/maps/SafariZone_West/events.inc delete mode 100644 data/maps/SafariZone_West/header.inc create mode 100644 data/maps/SafariZone_West/map.json delete mode 100644 data/maps/SaffronCity/connections.inc delete mode 100644 data/maps/SaffronCity/events.inc delete mode 100644 data/maps/SaffronCity/header.inc create mode 100644 data/maps/SaffronCity/map.json delete mode 100644 data/maps/SaffronCity_Dojo/events.inc delete mode 100644 data/maps/SaffronCity_Dojo/header.inc create mode 100644 data/maps/SaffronCity_Dojo/map.json delete mode 100644 data/maps/SaffronCity_Duplicate/connections.inc delete mode 100644 data/maps/SaffronCity_Duplicate/events.inc delete mode 100644 data/maps/SaffronCity_Duplicate/header.inc create mode 100644 data/maps/SaffronCity_Duplicate/map.json delete mode 100644 data/maps/SaffronCity_Gym/events.inc delete mode 100644 data/maps/SaffronCity_Gym/header.inc create mode 100644 data/maps/SaffronCity_Gym/map.json delete mode 100644 data/maps/SaffronCity_House1_1F/events.inc delete mode 100644 data/maps/SaffronCity_House1_1F/header.inc create mode 100644 data/maps/SaffronCity_House1_1F/map.json delete mode 100644 data/maps/SaffronCity_House1_2F/events.inc delete mode 100644 data/maps/SaffronCity_House1_2F/header.inc create mode 100644 data/maps/SaffronCity_House1_2F/map.json delete mode 100644 data/maps/SaffronCity_House2/events.inc delete mode 100644 data/maps/SaffronCity_House2/header.inc create mode 100644 data/maps/SaffronCity_House2/map.json delete mode 100644 data/maps/SaffronCity_House3/events.inc delete mode 100644 data/maps/SaffronCity_House3/header.inc create mode 100644 data/maps/SaffronCity_House3/map.json delete mode 100644 data/maps/SaffronCity_Mart/events.inc delete mode 100644 data/maps/SaffronCity_Mart/header.inc create mode 100644 data/maps/SaffronCity_Mart/map.json delete mode 100644 data/maps/SaffronCity_PokemonCenter_1F/events.inc delete mode 100644 data/maps/SaffronCity_PokemonCenter_1F/header.inc create mode 100644 data/maps/SaffronCity_PokemonCenter_1F/map.json delete mode 100644 data/maps/SaffronCity_PokemonCenter_2F/events.inc delete mode 100644 data/maps/SaffronCity_PokemonCenter_2F/header.inc create mode 100644 data/maps/SaffronCity_PokemonCenter_2F/map.json delete mode 100644 data/maps/SaffronCity_PokemonTrainerFanClub/events.inc delete mode 100644 data/maps/SaffronCity_PokemonTrainerFanClub/header.inc create mode 100644 data/maps/SaffronCity_PokemonTrainerFanClub/map.json delete mode 100644 data/maps/SeafoamIslands_1F/events.inc delete mode 100644 data/maps/SeafoamIslands_1F/header.inc create mode 100644 data/maps/SeafoamIslands_1F/map.json delete mode 100644 data/maps/SeafoamIslands_B1F/events.inc delete mode 100644 data/maps/SeafoamIslands_B1F/header.inc create mode 100644 data/maps/SeafoamIslands_B1F/map.json delete mode 100644 data/maps/SeafoamIslands_B2F/events.inc delete mode 100644 data/maps/SeafoamIslands_B2F/header.inc create mode 100644 data/maps/SeafoamIslands_B2F/map.json delete mode 100644 data/maps/SeafoamIslands_B3F/events.inc delete mode 100644 data/maps/SeafoamIslands_B3F/header.inc create mode 100644 data/maps/SeafoamIslands_B3F/map.json delete mode 100644 data/maps/SeafoamIslands_B4F/events.inc delete mode 100644 data/maps/SeafoamIslands_B4F/header.inc create mode 100644 data/maps/SeafoamIslands_B4F/map.json delete mode 100644 data/maps/SevenIsland/connections.inc delete mode 100644 data/maps/SevenIsland/events.inc delete mode 100644 data/maps/SevenIsland/header.inc create mode 100644 data/maps/SevenIsland/map.json delete mode 100644 data/maps/SevenIsland_Harbor/events.inc delete mode 100644 data/maps/SevenIsland_Harbor/header.inc create mode 100644 data/maps/SevenIsland_Harbor/map.json delete mode 100644 data/maps/SevenIsland_House_Room1/events.inc delete mode 100644 data/maps/SevenIsland_House_Room1/header.inc create mode 100644 data/maps/SevenIsland_House_Room1/map.json delete mode 100644 data/maps/SevenIsland_House_Room2/events.inc delete mode 100644 data/maps/SevenIsland_House_Room2/header.inc create mode 100644 data/maps/SevenIsland_House_Room2/map.json delete mode 100644 data/maps/SevenIsland_Mart/events.inc delete mode 100644 data/maps/SevenIsland_Mart/header.inc create mode 100644 data/maps/SevenIsland_Mart/map.json delete mode 100644 data/maps/SevenIsland_PokemonCenter_1F/events.inc delete mode 100644 data/maps/SevenIsland_PokemonCenter_1F/header.inc create mode 100644 data/maps/SevenIsland_PokemonCenter_1F/map.json delete mode 100644 data/maps/SevenIsland_PokemonCenter_2F/events.inc delete mode 100644 data/maps/SevenIsland_PokemonCenter_2F/header.inc create mode 100644 data/maps/SevenIsland_PokemonCenter_2F/map.json delete mode 100644 data/maps/SevenIsland_SeavaultCanyon_TanobyKey/events.inc delete mode 100644 data/maps/SevenIsland_SeavaultCanyon_TanobyKey/header.inc create mode 100644 data/maps/SevenIsland_SeavaultCanyon_TanobyKey/map.json delete mode 100644 data/maps/SevenIsland_SevaultCanyon/connections.inc delete mode 100644 data/maps/SevenIsland_SevaultCanyon/events.inc delete mode 100644 data/maps/SevenIsland_SevaultCanyon/header.inc create mode 100644 data/maps/SevenIsland_SevaultCanyon/map.json delete mode 100644 data/maps/SevenIsland_SevaultCanyon_Entrance/connections.inc delete mode 100644 data/maps/SevenIsland_SevaultCanyon_Entrance/events.inc delete mode 100644 data/maps/SevenIsland_SevaultCanyon_Entrance/header.inc create mode 100644 data/maps/SevenIsland_SevaultCanyon_Entrance/map.json delete mode 100644 data/maps/SevenIsland_SevaultCanyon_House/events.inc delete mode 100644 data/maps/SevenIsland_SevaultCanyon_House/header.inc create mode 100644 data/maps/SevenIsland_SevaultCanyon_House/map.json delete mode 100644 data/maps/SevenIsland_TanobyRuins/connections.inc delete mode 100644 data/maps/SevenIsland_TanobyRuins/events.inc delete mode 100644 data/maps/SevenIsland_TanobyRuins/header.inc create mode 100644 data/maps/SevenIsland_TanobyRuins/map.json delete mode 100644 data/maps/SevenIsland_TanobyRuins_DilfordChamber/events.inc delete mode 100644 data/maps/SevenIsland_TanobyRuins_DilfordChamber/header.inc create mode 100644 data/maps/SevenIsland_TanobyRuins_DilfordChamber/map.json delete mode 100644 data/maps/SevenIsland_TanobyRuins_LiptooChamber/events.inc delete mode 100644 data/maps/SevenIsland_TanobyRuins_LiptooChamber/header.inc create mode 100644 data/maps/SevenIsland_TanobyRuins_LiptooChamber/map.json delete mode 100644 data/maps/SevenIsland_TanobyRuins_MoneanChamber/events.inc delete mode 100644 data/maps/SevenIsland_TanobyRuins_MoneanChamber/header.inc create mode 100644 data/maps/SevenIsland_TanobyRuins_MoneanChamber/map.json delete mode 100644 data/maps/SevenIsland_TanobyRuins_RixyChamber/events.inc delete mode 100644 data/maps/SevenIsland_TanobyRuins_RixyChamber/header.inc create mode 100644 data/maps/SevenIsland_TanobyRuins_RixyChamber/map.json delete mode 100644 data/maps/SevenIsland_TanobyRuins_ScufibChamber/events.inc delete mode 100644 data/maps/SevenIsland_TanobyRuins_ScufibChamber/header.inc create mode 100644 data/maps/SevenIsland_TanobyRuins_ScufibChamber/map.json delete mode 100644 data/maps/SevenIsland_TanobyRuins_ViapoisChamber/events.inc delete mode 100644 data/maps/SevenIsland_TanobyRuins_ViapoisChamber/header.inc create mode 100644 data/maps/SevenIsland_TanobyRuins_ViapoisChamber/map.json delete mode 100644 data/maps/SevenIsland_TanobyRuins_WeepthChamber/events.inc delete mode 100644 data/maps/SevenIsland_TanobyRuins_WeepthChamber/header.inc create mode 100644 data/maps/SevenIsland_TanobyRuins_WeepthChamber/map.json delete mode 100644 data/maps/SevenIsland_TrainerTower/connections.inc delete mode 100644 data/maps/SevenIsland_TrainerTower/events.inc delete mode 100644 data/maps/SevenIsland_TrainerTower/header.inc create mode 100644 data/maps/SevenIsland_TrainerTower/map.json delete mode 100644 data/maps/SevenIsland_TrainerTower_1F/events.inc delete mode 100644 data/maps/SevenIsland_TrainerTower_1F/header.inc create mode 100644 data/maps/SevenIsland_TrainerTower_1F/map.json delete mode 100644 data/maps/SevenIsland_TrainerTower_2F/events.inc delete mode 100644 data/maps/SevenIsland_TrainerTower_2F/header.inc create mode 100644 data/maps/SevenIsland_TrainerTower_2F/map.json delete mode 100644 data/maps/SevenIsland_TrainerTower_3F/events.inc delete mode 100644 data/maps/SevenIsland_TrainerTower_3F/header.inc create mode 100644 data/maps/SevenIsland_TrainerTower_3F/map.json delete mode 100644 data/maps/SevenIsland_TrainerTower_4F/events.inc delete mode 100644 data/maps/SevenIsland_TrainerTower_4F/header.inc create mode 100644 data/maps/SevenIsland_TrainerTower_4F/map.json delete mode 100644 data/maps/SevenIsland_TrainerTower_5F/events.inc delete mode 100644 data/maps/SevenIsland_TrainerTower_5F/header.inc create mode 100644 data/maps/SevenIsland_TrainerTower_5F/map.json delete mode 100644 data/maps/SevenIsland_TrainerTower_6F/events.inc delete mode 100644 data/maps/SevenIsland_TrainerTower_6F/header.inc create mode 100644 data/maps/SevenIsland_TrainerTower_6F/map.json delete mode 100644 data/maps/SevenIsland_TrainerTower_7F/events.inc delete mode 100644 data/maps/SevenIsland_TrainerTower_7F/header.inc create mode 100644 data/maps/SevenIsland_TrainerTower_7F/map.json delete mode 100644 data/maps/SevenIsland_TrainerTower_8F/events.inc delete mode 100644 data/maps/SevenIsland_TrainerTower_8F/header.inc create mode 100644 data/maps/SevenIsland_TrainerTower_8F/map.json delete mode 100644 data/maps/SevenIsland_TrainerTower_Elevator/events.inc delete mode 100644 data/maps/SevenIsland_TrainerTower_Elevator/header.inc create mode 100644 data/maps/SevenIsland_TrainerTower_Elevator/map.json delete mode 100644 data/maps/SevenIsland_TrainerTower_Lobby/events.inc delete mode 100644 data/maps/SevenIsland_TrainerTower_Lobby/header.inc create mode 100644 data/maps/SevenIsland_TrainerTower_Lobby/map.json delete mode 100644 data/maps/SevenIsland_TrainerTower_Roof/events.inc delete mode 100644 data/maps/SevenIsland_TrainerTower_Roof/header.inc create mode 100644 data/maps/SevenIsland_TrainerTower_Roof/map.json delete mode 100644 data/maps/SilphCo_10F/events.inc delete mode 100644 data/maps/SilphCo_10F/header.inc create mode 100644 data/maps/SilphCo_10F/map.json delete mode 100644 data/maps/SilphCo_11F/events.inc delete mode 100644 data/maps/SilphCo_11F/header.inc create mode 100644 data/maps/SilphCo_11F/map.json delete mode 100644 data/maps/SilphCo_1F/events.inc delete mode 100644 data/maps/SilphCo_1F/header.inc create mode 100644 data/maps/SilphCo_1F/map.json delete mode 100644 data/maps/SilphCo_2F/events.inc delete mode 100644 data/maps/SilphCo_2F/header.inc create mode 100644 data/maps/SilphCo_2F/map.json delete mode 100644 data/maps/SilphCo_3F/events.inc delete mode 100644 data/maps/SilphCo_3F/header.inc create mode 100644 data/maps/SilphCo_3F/map.json delete mode 100644 data/maps/SilphCo_4F/events.inc delete mode 100644 data/maps/SilphCo_4F/header.inc create mode 100644 data/maps/SilphCo_4F/map.json delete mode 100644 data/maps/SilphCo_5F/events.inc delete mode 100644 data/maps/SilphCo_5F/header.inc create mode 100644 data/maps/SilphCo_5F/map.json delete mode 100644 data/maps/SilphCo_6F/events.inc delete mode 100644 data/maps/SilphCo_6F/header.inc create mode 100644 data/maps/SilphCo_6F/map.json delete mode 100644 data/maps/SilphCo_7F/events.inc delete mode 100644 data/maps/SilphCo_7F/header.inc create mode 100644 data/maps/SilphCo_7F/map.json delete mode 100644 data/maps/SilphCo_8F/events.inc delete mode 100644 data/maps/SilphCo_8F/header.inc create mode 100644 data/maps/SilphCo_8F/map.json delete mode 100644 data/maps/SilphCo_9F/events.inc delete mode 100644 data/maps/SilphCo_9F/header.inc create mode 100644 data/maps/SilphCo_9F/map.json delete mode 100644 data/maps/SilphCo_Elevator/events.inc delete mode 100644 data/maps/SilphCo_Elevator/header.inc create mode 100644 data/maps/SilphCo_Elevator/map.json delete mode 100644 data/maps/SixIsland/connections.inc delete mode 100644 data/maps/SixIsland/events.inc delete mode 100644 data/maps/SixIsland/header.inc create mode 100644 data/maps/SixIsland/map.json create mode 100644 data/maps/SixIsland_AlteringCave/map.json create mode 100644 data/maps/SixIsland_AlteringCave/scripts.inc create mode 100644 data/maps/SixIsland_DottedHole_1F/map.json create mode 100644 data/maps/SixIsland_DottedHole_1F/scripts.inc delete mode 100644 data/maps/SixIsland_DottedHole_B1F/events.inc delete mode 100644 data/maps/SixIsland_DottedHole_B1F/header.inc create mode 100644 data/maps/SixIsland_DottedHole_B1F/map.json delete mode 100644 data/maps/SixIsland_DottedHole_B2F/events.inc delete mode 100644 data/maps/SixIsland_DottedHole_B2F/header.inc create mode 100644 data/maps/SixIsland_DottedHole_B2F/map.json delete mode 100644 data/maps/SixIsland_DottedHole_B3F/events.inc delete mode 100644 data/maps/SixIsland_DottedHole_B3F/header.inc create mode 100644 data/maps/SixIsland_DottedHole_B3F/map.json create mode 100644 data/maps/SixIsland_DottedHole_B4F/map.json create mode 100644 data/maps/SixIsland_DottedHole_B4F/scripts.inc delete mode 100644 data/maps/SixIsland_DottedHole_SapphireRoom/events.inc delete mode 100644 data/maps/SixIsland_DottedHole_SapphireRoom/header.inc create mode 100644 data/maps/SixIsland_DottedHole_SapphireRoom/map.json delete mode 100644 data/maps/SixIsland_GreenPath/connections.inc delete mode 100644 data/maps/SixIsland_GreenPath/events.inc delete mode 100644 data/maps/SixIsland_GreenPath/header.inc create mode 100644 data/maps/SixIsland_GreenPath/map.json delete mode 100644 data/maps/SixIsland_Harbor/events.inc delete mode 100644 data/maps/SixIsland_Harbor/header.inc create mode 100644 data/maps/SixIsland_Harbor/map.json delete mode 100644 data/maps/SixIsland_House/events.inc delete mode 100644 data/maps/SixIsland_House/header.inc create mode 100644 data/maps/SixIsland_House/map.json delete mode 100644 data/maps/SixIsland_Mart/events.inc delete mode 100644 data/maps/SixIsland_Mart/header.inc create mode 100644 data/maps/SixIsland_Mart/map.json delete mode 100644 data/maps/SixIsland_OutcastIsland/connections.inc delete mode 100644 data/maps/SixIsland_OutcastIsland/events.inc delete mode 100644 data/maps/SixIsland_OutcastIsland/header.inc create mode 100644 data/maps/SixIsland_OutcastIsland/map.json create mode 100644 data/maps/SixIsland_PatternBush/map.json create mode 100644 data/maps/SixIsland_PatternBush/scripts.inc delete mode 100644 data/maps/SixIsland_PokemonCenter_1F/events.inc delete mode 100644 data/maps/SixIsland_PokemonCenter_1F/header.inc create mode 100644 data/maps/SixIsland_PokemonCenter_1F/map.json delete mode 100644 data/maps/SixIsland_PokemonCenter_2F/events.inc delete mode 100644 data/maps/SixIsland_PokemonCenter_2F/header.inc create mode 100644 data/maps/SixIsland_PokemonCenter_2F/map.json delete mode 100644 data/maps/SixIsland_RuinValley/connections.inc delete mode 100644 data/maps/SixIsland_RuinValley/events.inc delete mode 100644 data/maps/SixIsland_RuinValley/header.inc create mode 100644 data/maps/SixIsland_RuinValley/map.json delete mode 100644 data/maps/SixIsland_WaterPath/connections.inc delete mode 100644 data/maps/SixIsland_WaterPath/events.inc delete mode 100644 data/maps/SixIsland_WaterPath/header.inc create mode 100644 data/maps/SixIsland_WaterPath/map.json delete mode 100644 data/maps/SixIsland_WaterPath_House1/events.inc delete mode 100644 data/maps/SixIsland_WaterPath_House1/header.inc create mode 100644 data/maps/SixIsland_WaterPath_House1/map.json delete mode 100644 data/maps/SixIsland_WaterPath_House2/events.inc delete mode 100644 data/maps/SixIsland_WaterPath_House2/header.inc create mode 100644 data/maps/SixIsland_WaterPath_House2/map.json delete mode 100644 data/maps/ThreeIsland/connections.inc delete mode 100644 data/maps/ThreeIsland/events.inc delete mode 100644 data/maps/ThreeIsland/header.inc create mode 100644 data/maps/ThreeIsland/map.json delete mode 100644 data/maps/ThreeIsland_BerryForest/events.inc delete mode 100644 data/maps/ThreeIsland_BerryForest/header.inc create mode 100644 data/maps/ThreeIsland_BerryForest/map.json delete mode 100644 data/maps/ThreeIsland_BondBridge/connections.inc delete mode 100644 data/maps/ThreeIsland_BondBridge/events.inc delete mode 100644 data/maps/ThreeIsland_BondBridge/header.inc create mode 100644 data/maps/ThreeIsland_BondBridge/map.json delete mode 100644 data/maps/ThreeIsland_DunsparceTunnel/events.inc delete mode 100644 data/maps/ThreeIsland_DunsparceTunnel/header.inc create mode 100644 data/maps/ThreeIsland_DunsparceTunnel/map.json delete mode 100644 data/maps/ThreeIsland_Harbor/events.inc delete mode 100644 data/maps/ThreeIsland_Harbor/header.inc create mode 100644 data/maps/ThreeIsland_Harbor/map.json delete mode 100644 data/maps/ThreeIsland_House1/events.inc delete mode 100644 data/maps/ThreeIsland_House1/header.inc create mode 100644 data/maps/ThreeIsland_House1/map.json delete mode 100644 data/maps/ThreeIsland_House2/events.inc delete mode 100644 data/maps/ThreeIsland_House2/header.inc create mode 100644 data/maps/ThreeIsland_House2/map.json delete mode 100644 data/maps/ThreeIsland_House3/events.inc delete mode 100644 data/maps/ThreeIsland_House3/header.inc create mode 100644 data/maps/ThreeIsland_House3/map.json delete mode 100644 data/maps/ThreeIsland_House4/events.inc delete mode 100644 data/maps/ThreeIsland_House4/header.inc create mode 100644 data/maps/ThreeIsland_House4/map.json delete mode 100644 data/maps/ThreeIsland_House5/events.inc delete mode 100644 data/maps/ThreeIsland_House5/header.inc create mode 100644 data/maps/ThreeIsland_House5/map.json delete mode 100644 data/maps/ThreeIsland_Mart/events.inc delete mode 100644 data/maps/ThreeIsland_Mart/header.inc create mode 100644 data/maps/ThreeIsland_Mart/map.json delete mode 100644 data/maps/ThreeIsland_PokemonCenter_1F/events.inc delete mode 100644 data/maps/ThreeIsland_PokemonCenter_1F/header.inc create mode 100644 data/maps/ThreeIsland_PokemonCenter_1F/map.json delete mode 100644 data/maps/ThreeIsland_PokemonCenter_2F/events.inc delete mode 100644 data/maps/ThreeIsland_PokemonCenter_2F/header.inc create mode 100644 data/maps/ThreeIsland_PokemonCenter_2F/map.json delete mode 100644 data/maps/ThreeIsland_Port/connections.inc delete mode 100644 data/maps/ThreeIsland_Port/events.inc delete mode 100644 data/maps/ThreeIsland_Port/header.inc create mode 100644 data/maps/ThreeIsland_Port/map.json delete mode 100644 data/maps/TwoIsland/connections.inc delete mode 100644 data/maps/TwoIsland/events.inc delete mode 100644 data/maps/TwoIsland/header.inc create mode 100644 data/maps/TwoIsland/map.json delete mode 100644 data/maps/TwoIsland_CapeBrink/connections.inc delete mode 100644 data/maps/TwoIsland_CapeBrink/events.inc delete mode 100644 data/maps/TwoIsland_CapeBrink/header.inc create mode 100644 data/maps/TwoIsland_CapeBrink/map.json delete mode 100644 data/maps/TwoIsland_CapeBrink_House/events.inc delete mode 100644 data/maps/TwoIsland_CapeBrink_House/header.inc create mode 100644 data/maps/TwoIsland_CapeBrink_House/map.json delete mode 100644 data/maps/TwoIsland_Harbor/events.inc delete mode 100644 data/maps/TwoIsland_Harbor/header.inc create mode 100644 data/maps/TwoIsland_Harbor/map.json delete mode 100644 data/maps/TwoIsland_House/events.inc delete mode 100644 data/maps/TwoIsland_House/header.inc create mode 100644 data/maps/TwoIsland_House/map.json delete mode 100644 data/maps/TwoIsland_JoyfulGameCorner/events.inc delete mode 100644 data/maps/TwoIsland_JoyfulGameCorner/header.inc create mode 100644 data/maps/TwoIsland_JoyfulGameCorner/map.json delete mode 100644 data/maps/TwoIsland_PokemonCenter_1F/events.inc delete mode 100644 data/maps/TwoIsland_PokemonCenter_1F/header.inc create mode 100644 data/maps/TwoIsland_PokemonCenter_1F/map.json delete mode 100644 data/maps/TwoIsland_PokemonCenter_2F/events.inc delete mode 100644 data/maps/TwoIsland_PokemonCenter_2F/header.inc create mode 100644 data/maps/TwoIsland_PokemonCenter_2F/map.json delete mode 100644 data/maps/UndergroundPath_EastEntrance/events.inc delete mode 100644 data/maps/UndergroundPath_EastEntrance/header.inc create mode 100644 data/maps/UndergroundPath_EastEntrance/map.json delete mode 100644 data/maps/UndergroundPath_EastWestTunnel/events.inc delete mode 100644 data/maps/UndergroundPath_EastWestTunnel/header.inc create mode 100644 data/maps/UndergroundPath_EastWestTunnel/map.json delete mode 100644 data/maps/UndergroundPath_NorthEntrance/events.inc delete mode 100644 data/maps/UndergroundPath_NorthEntrance/header.inc create mode 100644 data/maps/UndergroundPath_NorthEntrance/map.json delete mode 100644 data/maps/UndergroundPath_NorthSouthTunnel/events.inc delete mode 100644 data/maps/UndergroundPath_NorthSouthTunnel/header.inc create mode 100644 data/maps/UndergroundPath_NorthSouthTunnel/map.json delete mode 100644 data/maps/UndergroundPath_SouthEntrance/events.inc delete mode 100644 data/maps/UndergroundPath_SouthEntrance/header.inc create mode 100644 data/maps/UndergroundPath_SouthEntrance/map.json delete mode 100644 data/maps/UndergroundPath_WestEntrance/events.inc delete mode 100644 data/maps/UndergroundPath_WestEntrance/header.inc create mode 100644 data/maps/UndergroundPath_WestEntrance/map.json delete mode 100644 data/maps/UnknownMap_00_00/events.inc delete mode 100644 data/maps/UnknownMap_00_00/header.inc create mode 100644 data/maps/UnknownMap_00_00/map.json delete mode 100644 data/maps/UnknownMap_00_01/events.inc delete mode 100644 data/maps/UnknownMap_00_01/header.inc create mode 100644 data/maps/UnknownMap_00_01/map.json delete mode 100644 data/maps/UnknownMap_00_02/events.inc delete mode 100644 data/maps/UnknownMap_00_02/header.inc create mode 100644 data/maps/UnknownMap_00_02/map.json delete mode 100644 data/maps/UnknownMap_00_03/events.inc delete mode 100644 data/maps/UnknownMap_00_03/header.inc create mode 100644 data/maps/UnknownMap_00_03/map.json delete mode 100644 data/maps/UnknownMap_00_04/events.inc delete mode 100644 data/maps/UnknownMap_00_04/header.inc create mode 100644 data/maps/UnknownMap_00_04/map.json delete mode 100644 data/maps/UnknownMap_03_50/connections.inc delete mode 100644 data/maps/UnknownMap_03_50/events.inc delete mode 100644 data/maps/UnknownMap_03_50/header.inc create mode 100644 data/maps/UnknownMap_03_50/map.json delete mode 100644 data/maps/UnknownMap_03_51/connections.inc delete mode 100644 data/maps/UnknownMap_03_51/events.inc delete mode 100644 data/maps/UnknownMap_03_51/header.inc create mode 100644 data/maps/UnknownMap_03_51/map.json delete mode 100644 data/maps/UnknownMap_03_52/events.inc delete mode 100644 data/maps/UnknownMap_03_52/header.inc create mode 100644 data/maps/UnknownMap_03_52/map.json delete mode 100644 data/maps/UnknownMap_03_53/events.inc delete mode 100644 data/maps/UnknownMap_03_53/header.inc create mode 100644 data/maps/UnknownMap_03_53/map.json delete mode 100644 data/maps/UnknownMap_18_01/events.inc delete mode 100644 data/maps/UnknownMap_18_01/header.inc create mode 100644 data/maps/UnknownMap_18_01/map.json delete mode 100644 data/maps/UnusedHouse_27_00/events.inc delete mode 100644 data/maps/UnusedHouse_27_00/header.inc create mode 100644 data/maps/UnusedHouse_27_00/map.json delete mode 100644 data/maps/UnusedHouse_29_00/events.inc delete mode 100644 data/maps/UnusedHouse_29_00/header.inc create mode 100644 data/maps/UnusedHouse_29_00/map.json delete mode 100644 data/maps/UnusedHouse_31_05/events.inc delete mode 100644 data/maps/UnusedHouse_31_05/header.inc create mode 100644 data/maps/UnusedHouse_31_05/map.json delete mode 100644 data/maps/VermilionCity/connections.inc delete mode 100644 data/maps/VermilionCity/events.inc delete mode 100644 data/maps/VermilionCity/header.inc create mode 100644 data/maps/VermilionCity/map.json delete mode 100644 data/maps/VermilionCity_Gym/events.inc delete mode 100644 data/maps/VermilionCity_Gym/header.inc create mode 100644 data/maps/VermilionCity_Gym/map.json delete mode 100644 data/maps/VermilionCity_House1/events.inc delete mode 100644 data/maps/VermilionCity_House1/header.inc create mode 100644 data/maps/VermilionCity_House1/map.json delete mode 100644 data/maps/VermilionCity_House2/events.inc delete mode 100644 data/maps/VermilionCity_House2/header.inc create mode 100644 data/maps/VermilionCity_House2/map.json delete mode 100644 data/maps/VermilionCity_House3/events.inc delete mode 100644 data/maps/VermilionCity_House3/header.inc create mode 100644 data/maps/VermilionCity_House3/map.json delete mode 100644 data/maps/VermilionCity_Mart/events.inc delete mode 100644 data/maps/VermilionCity_Mart/header.inc create mode 100644 data/maps/VermilionCity_Mart/map.json delete mode 100644 data/maps/VermilionCity_PokemonCenter_1F/events.inc delete mode 100644 data/maps/VermilionCity_PokemonCenter_1F/header.inc create mode 100644 data/maps/VermilionCity_PokemonCenter_1F/map.json delete mode 100644 data/maps/VermilionCity_PokemonCenter_2F/events.inc delete mode 100644 data/maps/VermilionCity_PokemonCenter_2F/header.inc create mode 100644 data/maps/VermilionCity_PokemonCenter_2F/map.json delete mode 100644 data/maps/VermilionCity_PokemonFanClub/events.inc delete mode 100644 data/maps/VermilionCity_PokemonFanClub/header.inc create mode 100644 data/maps/VermilionCity_PokemonFanClub/map.json delete mode 100644 data/maps/VictoryRoad_1F/events.inc delete mode 100644 data/maps/VictoryRoad_1F/header.inc create mode 100644 data/maps/VictoryRoad_1F/map.json delete mode 100644 data/maps/VictoryRoad_2F/events.inc delete mode 100644 data/maps/VictoryRoad_2F/header.inc create mode 100644 data/maps/VictoryRoad_2F/map.json delete mode 100644 data/maps/VictoryRoad_3F/events.inc delete mode 100644 data/maps/VictoryRoad_3F/header.inc create mode 100644 data/maps/VictoryRoad_3F/map.json delete mode 100644 data/maps/ViridianCity/connections.inc delete mode 100644 data/maps/ViridianCity/events.inc delete mode 100644 data/maps/ViridianCity/header.inc create mode 100644 data/maps/ViridianCity/map.json delete mode 100644 data/maps/ViridianCity_Gym/events.inc delete mode 100644 data/maps/ViridianCity_Gym/header.inc create mode 100644 data/maps/ViridianCity_Gym/map.json delete mode 100644 data/maps/ViridianCity_House1/events.inc delete mode 100644 data/maps/ViridianCity_House1/header.inc create mode 100644 data/maps/ViridianCity_House1/map.json delete mode 100644 data/maps/ViridianCity_House2/events.inc delete mode 100644 data/maps/ViridianCity_House2/header.inc create mode 100644 data/maps/ViridianCity_House2/map.json delete mode 100644 data/maps/ViridianCity_Mart/events.inc delete mode 100644 data/maps/ViridianCity_Mart/header.inc create mode 100644 data/maps/ViridianCity_Mart/map.json delete mode 100644 data/maps/ViridianCity_PokemonCenter_1F/events.inc delete mode 100644 data/maps/ViridianCity_PokemonCenter_1F/header.inc create mode 100644 data/maps/ViridianCity_PokemonCenter_1F/map.json delete mode 100644 data/maps/ViridianCity_PokemonCenter_2F/events.inc delete mode 100644 data/maps/ViridianCity_PokemonCenter_2F/header.inc create mode 100644 data/maps/ViridianCity_PokemonCenter_2F/map.json delete mode 100644 data/maps/ViridianForest/events.inc delete mode 100644 data/maps/ViridianForest/header.inc create mode 100644 data/maps/ViridianForest/map.json delete mode 100644 data/maps/connections.inc delete mode 100644 data/maps/events.inc delete mode 100644 data/maps/groups.inc delete mode 100644 data/maps/headers.inc create mode 100644 data/maps/map_groups.json (limited to 'data/maps') diff --git a/data/maps/.gitignore b/data/maps/.gitignore new file mode 100644 index 000000000..59405b176 --- /dev/null +++ b/data/maps/.gitignore @@ -0,0 +1,7 @@ +connections.inc +events.inc +groups.inc +headers.inc +**/connections.inc +**/events.inc +**/header.inc diff --git a/data/maps/BirthIsland_Exterior/events.inc b/data/maps/BirthIsland_Exterior/events.inc deleted file mode 100644 index 92489f6ba..000000000 --- a/data/maps/BirthIsland_Exterior/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -BirthIsland_Exterior_EventObjects: - object_event 1, 106, 0, 15, 0, 12, 0, 3, 8, 17, 0, 0, 0, 0, 0, BirthIsland_Exterior_EventScript_165271, 154, 0, 0 - object_event 2, 240, 0, 15, 0, 3, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, 153, 0, 0 - -BirthIsland_Exterior_MapWarps: - warp_def 15, 24, 3, 0, 570 - -BirthIsland_Exterior_MapEvents:: - map_events BirthIsland_Exterior_EventObjects, BirthIsland_Exterior_MapWarps, 0x0, 0x0 diff --git a/data/maps/BirthIsland_Exterior/header.inc b/data/maps/BirthIsland_Exterior/header.inc deleted file mode 100644 index 2634948be..000000000 --- a/data/maps/BirthIsland_Exterior/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -BirthIsland_Exterior:: @ 83505A8 - .4byte BirthIsland_Exterior_Layout @ 0x8348380 - .4byte BirthIsland_Exterior_MapEvents @ 0x83B4C1C - .4byte BirthIsland_Exterior_MapScripts @ 0x8165203 - .4byte NULL - .2byte 0xFFFF - .2byte 342 - .byte 0xbb, 0x00, 0x00, 0x03, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/BirthIsland_Exterior/map.json b/data/maps/BirthIsland_Exterior/map.json new file mode 100644 index 000000000..521d191fa --- /dev/null +++ b/data/maps/BirthIsland_Exterior/map.json @@ -0,0 +1,54 @@ +{ + "id": "MAP_BIRTH_ISLAND_EXTERIOR", + "name": "BirthIsland_Exterior", + "layout": "LAYOUT_BIRTH_ISLAND_EXTERIOR", + "music": "0xFFFF", + "region_map_section": "MAPSEC_BIRTH_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_3", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "106", + "x": 15, + "y": 12, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BirthIsland_Exterior_EventScript_165271", + "flag": "154" + }, + { + "graphics_id": "240", + "x": 15, + "y": 3, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "153" + } + ], + "warp_events": [ + { + "x": 15, + "y": 24, + "elevation": 3, + "dest_map": "MAP_BIRTH_ISLAND_HARBOR", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BirthIsland_Harbor/events.inc b/data/maps/BirthIsland_Harbor/events.inc deleted file mode 100644 index 90ee12799..000000000 --- a/data/maps/BirthIsland_Harbor/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -BirthIsland_Harbor_EventObjects: - object_event 1, 108, 0, 8, 0, 9, 0, 0, 8, 17, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 2, 62, 0, 8, 0, 6, 0, 3, 7, 17, 0, 0, 0, 0, 0, BirthIsland_Harbor_EventScript_1653E7, 0, 0, 0 - -BirthIsland_Harbor_MapWarps: - warp_def 8, 2, 3, 0, 568 - -BirthIsland_Harbor_MapEvents:: - map_events BirthIsland_Harbor_EventObjects, BirthIsland_Harbor_MapWarps, 0x0, 0x0 diff --git a/data/maps/BirthIsland_Harbor/header.inc b/data/maps/BirthIsland_Harbor/header.inc deleted file mode 100644 index 68253d8df..000000000 --- a/data/maps/BirthIsland_Harbor/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -BirthIsland_Harbor:: @ 83505E0 - .4byte Island_Harbor_Layout @ 0x8343FB8 - .4byte BirthIsland_Harbor_MapEvents @ 0x83B4D24 - .4byte BirthIsland_Harbor_MapScripts @ 0x81653E6 - .4byte NULL - .2byte 0xFFFF - .2byte 315 - .byte 0xbb, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/BirthIsland_Harbor/map.json b/data/maps/BirthIsland_Harbor/map.json new file mode 100644 index 000000000..4efbb12a4 --- /dev/null +++ b/data/maps/BirthIsland_Harbor/map.json @@ -0,0 +1,54 @@ +{ + "id": "MAP_BIRTH_ISLAND_HARBOR", + "name": "BirthIsland_Harbor", + "layout": "LAYOUT_ISLAND_HARBOR", + "music": "0xFFFF", + "region_map_section": "MAPSEC_BIRTH_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "108", + "x": 8, + "y": 9, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "62", + "x": 8, + "y": 6, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BirthIsland_Harbor_EventScript_1653E7", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 8, + "y": 2, + "elevation": 3, + "dest_map": "MAP_BIRTH_ISLAND_EXTERIOR", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/CeladonCity/connections.inc b/data/maps/CeladonCity/connections.inc deleted file mode 100644 index 6ed150ca1..000000000 --- a/data/maps/CeladonCity/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -CeladonCity_MapConnectionsList: @ 8352844 - connection left, 10, MAP_ROUTE16 - connection right, 10, MAP_ROUTE7 - -CeladonCity_MapConnections:: @ 835285C - .4byte 2 - .4byte CeladonCity_MapConnectionsList diff --git a/data/maps/CeladonCity/events.inc b/data/maps/CeladonCity/events.inc deleted file mode 100644 index ebf7a29aa..000000000 --- a/data/maps/CeladonCity/events.inc +++ /dev/null @@ -1,45 +0,0 @@ -CeladonCity_EventObjects: - object_event 1, 49, 0, 48, 0, 15, 0, 3, 5, 20, 0, 0, 0, 0, 0, CeladonCity_EventScript_166CFA, 95, 0, 0 - object_event 2, 27, 0, 38, 0, 14, 0, 3, 9, 17, 0, 0, 0, 0, 0, CeladonCity_EventScript_166CC5, 0, 0, 0 - object_event 3, 112, 0, 36, 0, 14, 0, 3, 10, 17, 0, 0, 0, 0, 0, CeladonCity_EventScript_166CDC, 0, 0, 0 - object_event 4, 17, 0, 11, 0, 18, 0, 3, 52, 68, 0, 0, 0, 0, 0, CeladonCity_EventScript_166C99, 0, 0, 0 - object_event 5, 28, 0, 18, 0, 22, 0, 3, 2, 82, 0, 0, 0, 0, 0, CeladonCity_EventScript_166CAD, 0, 0, 0 - object_event 6, 32, 0, 30, 0, 24, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeladonCity_EventScript_166CB6, 0, 0, 0 - object_event 7, 33, 0, 26, 0, 19, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeladonCity_EventScript_166CBF, 0, 0, 0 - object_event 8, 49, 0, 38, 0, 31, 0, 3, 5, 21, 0, 0, 0, 0, 0, CeladonCity_EventScript_166D03, 95, 0, 0 - object_event 9, 32, 0, 9, 0, 30, 0, 3, 7, 17, 0, 0, 0, 0, 0, CeladonCity_EventScript_166CA2, 0, 0, 0 - object_event 10, 95, 0, 52, 0, 22, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeladonCity_EventScript_1BDF13, 20, 0, 0 - object_event 11, 95, 0, 40, 0, 35, 0, 0, 8, 17, 0, 0, 0, 0, 0, CeladonCity_EventScript_1BDF13, 19, 0, 0 - object_event 12, 19, 0, 25, 0, 10, 0, 3, 7, 17, 0, 0, 0, 0, 0, CeladonCity_EventScript_166D0C, 0, 0, 0 - object_event 13, 65375, 0, 249, 255, 21, 0, 7, 0, 0, 0, 34, 0, 3, 0, 0x0, 0, 0, 0 - object_event 14, 92, 0, 5, 0, 3, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeladonCity_EventScript_1BEBC0, 465, 0, 0 - object_event 15, 55, 0, 47, 0, 24, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeladonCity_EventScript_166D15, 95, 0, 0 - -CeladonCity_MapWarps: - warp_def 34, 21, 0, 0, 2574 - warp_def 11, 14, 0, 1, 2560 - warp_def 15, 14, 0, 4, 2560 - warp_def 30, 11, 0, 1, 2567 - warp_def 48, 11, 0, 1, 2572 - warp_def 39, 20, 0, 1, 2575 - warp_def 11, 30, 0, 1, 2576 - warp_def 37, 29, 0, 1, 2577 - warp_def 41, 29, 0, 1, 2578 - warp_def 49, 29, 0, 1, 2579 - warp_def 29, 5, 0, 5, 2567 - warp_def 30, 4, 3, 5, 2567 - warp_def 31, 5, 0, 5, 2567 - -CeladonCity_MapBGEvents: - bg_event 45, 23, 0, 0, 0, CeladonCity_EventScript_166D5A - bg_event 38, 23, 0, 0, 0, CeladonCity_EventScript_166D63 - bg_event 33, 23, 0, 0, 0, CeladonCity_EventScript_166D6C - bg_event 22, 18, 3, 0, 0, CeladonCity_EventScript_166D27 - bg_event 26, 11, 0, 0, 0, CeladonCity_EventScript_166D48 - bg_event 33, 16, 0, 0, 0, CeladonCity_EventScript_166D1E - bg_event 18, 14, 3, 0, 0, CeladonCity_EventScript_166D51 - bg_event 16, 31, 0, 0, 0, CeladonCity_EventScript_166D30 - bg_event 55, 20, 3, 7, 0, 69, 47, 1 - -CeladonCity_MapEvents:: - map_events CeladonCity_EventObjects, CeladonCity_MapWarps, 0x0, CeladonCity_MapBGEvents diff --git a/data/maps/CeladonCity/header.inc b/data/maps/CeladonCity/header.inc deleted file mode 100644 index 2ec3fc62c..000000000 --- a/data/maps/CeladonCity/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CeladonCity:: @ 83506C0 - .4byte CeladonCity_Layout @ 0x82E2818 - .4byte CeladonCity_MapEvents @ 0x83B5898 - .4byte CeladonCity_MapScripts @ 0x8166C8F - .4byte CeladonCity_MapConnections @ 0x835285C - .2byte BGM_FRLG_CELADON_CITY - .2byte 84 - .byte 0x5e, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/CeladonCity/map.json b/data/maps/CeladonCity/map.json new file mode 100644 index 000000000..0bf834686 --- /dev/null +++ b/data/maps/CeladonCity/map.json @@ -0,0 +1,384 @@ +{ + "id": "MAP_CELADON_CITY", + "name": "CeladonCity", + "layout": "LAYOUT_CELADON_CITY", + "music": "BGM_FRLG_CELADON_CITY", + "region_map_section": "MAPSEC_CELADON_CITY", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_1", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_ROUTE16", + "offset": 10, + "direction": "left" + }, + { + "map": "MAP_ROUTE7", + "offset": 10, + "direction": "right" + } + ], + "object_events": [ + { + "graphics_id": "49", + "x": 48, + "y": 15, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 4, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_EventScript_166CFA", + "flag": "95" + }, + { + "graphics_id": "27", + "x": 38, + "y": 14, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_EventScript_166CC5", + "flag": "0" + }, + { + "graphics_id": "112", + "x": 36, + "y": 14, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_EventScript_166CDC", + "flag": "0" + }, + { + "graphics_id": "17", + "x": 11, + "y": 18, + "elevation": 3, + "movement_type": "52", + "movement_range_x": 4, + "movement_range_y": 4, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_EventScript_166C99", + "flag": "0" + }, + { + "graphics_id": "28", + "x": 18, + "y": 22, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 2, + "movement_range_y": 5, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_EventScript_166CAD", + "flag": "0" + }, + { + "graphics_id": "32", + "x": 30, + "y": 24, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_EventScript_166CB6", + "flag": "0" + }, + { + "graphics_id": "33", + "x": 26, + "y": 19, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_EventScript_166CBF", + "flag": "0" + }, + { + "graphics_id": "49", + "x": 38, + "y": 31, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 5, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_EventScript_166D03", + "flag": "95" + }, + { + "graphics_id": "32", + "x": 9, + "y": 30, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_EventScript_166CA2", + "flag": "0" + }, + { + "graphics_id": "95", + "x": 52, + "y": 22, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_EventScript_1BDF13", + "flag": "20" + }, + { + "graphics_id": "95", + "x": 40, + "y": 35, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_EventScript_1BDF13", + "flag": "19" + }, + { + "graphics_id": "19", + "x": 25, + "y": 10, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_EventScript_166D0C", + "flag": "0" + }, + { + "graphics_id": "65375", + "x": 65529, + "y": 21, + "elevation": 7, + "movement_type": "0", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 34, + "trainer_sight_or_berry_tree_id": 3, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "92", + "x": 5, + "y": 3, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_EventScript_1BEBC0", + "flag": "465" + }, + { + "graphics_id": "55", + "x": 47, + "y": 24, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_EventScript_166D15", + "flag": "95" + } + ], + "warp_events": [ + { + "x": 34, + "y": 21, + "elevation": 0, + "dest_map": "MAP_CELADON_CITY_GAME_CORNER", + "dest_warp_id": 0 + }, + { + "x": 11, + "y": 14, + "elevation": 0, + "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_1F", + "dest_warp_id": 1 + }, + { + "x": 15, + "y": 14, + "elevation": 0, + "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_1F", + "dest_warp_id": 4 + }, + { + "x": 30, + "y": 11, + "elevation": 0, + "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_1F", + "dest_warp_id": 1 + }, + { + "x": 48, + "y": 11, + "elevation": 0, + "dest_map": "MAP_CELADON_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 1 + }, + { + "x": 39, + "y": 20, + "elevation": 0, + "dest_map": "MAP_CELADON_CITY_GAME_CORNER_PRIZE_ROOM", + "dest_warp_id": 1 + }, + { + "x": 11, + "y": 30, + "elevation": 0, + "dest_map": "MAP_CELADON_CITY_GYM", + "dest_warp_id": 1 + }, + { + "x": 37, + "y": 29, + "elevation": 0, + "dest_map": "MAP_CELADON_CITY_RESTAURANT", + "dest_warp_id": 1 + }, + { + "x": 41, + "y": 29, + "elevation": 0, + "dest_map": "MAP_CELADON_CITY_HOUSE1", + "dest_warp_id": 1 + }, + { + "x": 49, + "y": 29, + "elevation": 0, + "dest_map": "MAP_CELADON_CITY_HOTEL", + "dest_warp_id": 1 + }, + { + "x": 29, + "y": 5, + "elevation": 0, + "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_1F", + "dest_warp_id": 5 + }, + { + "x": 30, + "y": 4, + "elevation": 3, + "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_1F", + "dest_warp_id": 5 + }, + { + "x": 31, + "y": 5, + "elevation": 0, + "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_1F", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 45, + "y": 23, + "elevation": 0, + "script": "CeladonCity_EventScript_166D5A" + }, + { + "type": "bg_event_type_0", + "x": 38, + "y": 23, + "elevation": 0, + "script": "CeladonCity_EventScript_166D63" + }, + { + "type": "bg_event_type_0", + "x": 33, + "y": 23, + "elevation": 0, + "script": "CeladonCity_EventScript_166D6C" + }, + { + "type": "bg_event_type_0", + "x": 22, + "y": 18, + "elevation": 3, + "script": "CeladonCity_EventScript_166D27" + }, + { + "type": "bg_event_type_0", + "x": 26, + "y": 11, + "elevation": 0, + "script": "CeladonCity_EventScript_166D48" + }, + { + "type": "bg_event_type_0", + "x": 33, + "y": 16, + "elevation": 0, + "script": "CeladonCity_EventScript_166D1E" + }, + { + "type": "bg_event_type_0", + "x": 18, + "y": 14, + "elevation": 3, + "script": "CeladonCity_EventScript_166D51" + }, + { + "type": "bg_event_type_0", + "x": 16, + "y": 31, + "elevation": 0, + "script": "CeladonCity_EventScript_166D30" + }, + { + "type": "hidden_item", + "x": 55, + "y": 20, + "elevation": 3, + "item": "ITEM_PP_UP", + "flag": "47", + "unknown": 1 + } + ] +} \ No newline at end of file diff --git a/data/maps/CeladonCity_Condominiums_1F/events.inc b/data/maps/CeladonCity_Condominiums_1F/events.inc deleted file mode 100644 index d229b29fe..000000000 --- a/data/maps/CeladonCity_Condominiums_1F/events.inc +++ /dev/null @@ -1,20 +0,0 @@ -CeladonCity_Condominiums_1F_EventObjects: - object_event 1, 125, 0, 1, 0, 9, 0, 3, 10, 17, 0, 0, 0, 0, 0, CeladonCity_Condominiums_1F_EventScript_16C38E, 0, 0, 0 - object_event 2, 113, 0, 5, 0, 13, 0, 3, 5, 17, 0, 0, 0, 0, 0, CeladonCity_Condominiums_1F_EventScript_16C3A1, 0, 0, 0 - object_event 3, 122, 0, 5, 0, 8, 0, 3, 2, 18, 0, 0, 0, 0, 0, CeladonCity_Condominiums_1F_EventScript_16C3B4, 0, 0, 0 - object_event 4, 35, 0, 2, 0, 9, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeladonCity_Condominiums_1F_EventScript_16C321, 0, 0, 0 - -CeladonCity_Condominiums_1F_MapWarps: - warp_def 11, 19, 0, 3, 774 - warp_def 12, 18, 3, 3, 774 - warp_def 13, 19, 0, 3, 774 - warp_def 4, 2, 3, 0, 2568 - warp_def 12, 2, 3, 3, 2568 - warp_def 2, 1, 3, 11, 774 - -CeladonCity_Condominiums_1F_MapBGEvents: - bg_event 8, 12, 0, 0, 0, CeladonCity_Condominiums_1F_EventScript_16C3C7 - bg_event 7, 12, 0, 0, 0, CeladonCity_Condominiums_1F_EventScript_16C3C7 - -CeladonCity_Condominiums_1F_MapEvents:: - map_events CeladonCity_Condominiums_1F_EventObjects, CeladonCity_Condominiums_1F_MapWarps, 0x0, CeladonCity_Condominiums_1F_MapBGEvents diff --git a/data/maps/CeladonCity_Condominiums_1F/header.inc b/data/maps/CeladonCity_Condominiums_1F/header.inc deleted file mode 100644 index b059b11fd..000000000 --- a/data/maps/CeladonCity_Condominiums_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CeladonCity_Condominiums_1F:: @ 83512AC - .4byte CeladonCity_Condominiums_1F_Layout @ 0x831A7DC - .4byte CeladonCity_Condominiums_1F_MapEvents @ 0x83BB538 - .4byte CeladonCity_Condominiums_1F_MapScripts @ 0x816C320 - .4byte NULL - .2byte BGM_FRLG_CELADON_CITY - .2byte 184 - .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CeladonCity_Condominiums_1F/map.json b/data/maps/CeladonCity_Condominiums_1F/map.json new file mode 100644 index 000000000..443e9acd6 --- /dev/null +++ b/data/maps/CeladonCity_Condominiums_1F/map.json @@ -0,0 +1,130 @@ +{ + "id": "MAP_CELADON_CITY_CONDOMINIUMS_1F", + "name": "CeladonCity_Condominiums_1F", + "layout": "LAYOUT_CELADON_CITY_CONDOMINIUMS_1F", + "music": "BGM_FRLG_CELADON_CITY", + "region_map_section": "MAPSEC_CELADON_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "125", + "x": 1, + "y": 9, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_Condominiums_1F_EventScript_16C38E", + "flag": "0" + }, + { + "graphics_id": "113", + "x": 5, + "y": 13, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_Condominiums_1F_EventScript_16C3A1", + "flag": "0" + }, + { + "graphics_id": "122", + "x": 5, + "y": 8, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_Condominiums_1F_EventScript_16C3B4", + "flag": "0" + }, + { + "graphics_id": "35", + "x": 2, + "y": 9, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_Condominiums_1F_EventScript_16C321", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 11, + "y": 19, + "elevation": 0, + "dest_map": "MAP_CELADON_CITY", + "dest_warp_id": 3 + }, + { + "x": 12, + "y": 18, + "elevation": 3, + "dest_map": "MAP_CELADON_CITY", + "dest_warp_id": 3 + }, + { + "x": 13, + "y": 19, + "elevation": 0, + "dest_map": "MAP_CELADON_CITY", + "dest_warp_id": 3 + }, + { + "x": 4, + "y": 2, + "elevation": 3, + "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_2F", + "dest_warp_id": 0 + }, + { + "x": 12, + "y": 2, + "elevation": 3, + "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_2F", + "dest_warp_id": 3 + }, + { + "x": 2, + "y": 1, + "elevation": 3, + "dest_map": "MAP_CELADON_CITY", + "dest_warp_id": 11 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 8, + "y": 12, + "elevation": 0, + "script": "CeladonCity_Condominiums_1F_EventScript_16C3C7" + }, + { + "type": "bg_event_type_0", + "x": 7, + "y": 12, + "elevation": 0, + "script": "CeladonCity_Condominiums_1F_EventScript_16C3C7" + } + ] +} \ No newline at end of file diff --git a/data/maps/CeladonCity_Condominiums_2F/events.inc b/data/maps/CeladonCity_Condominiums_2F/events.inc deleted file mode 100644 index 98cf9a52e..000000000 --- a/data/maps/CeladonCity_Condominiums_2F/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -CeladonCity_Condominiums_2F_EventObjects: - object_event 1, 0, 0, 6, 0, 6, 0, 0, 76, 17, 0, 0, 0, 0, 0, CeladonCity_Condominiums_2F_EventScript_1ACE9D, 158, 0, 0 - object_event 2, 0, 0, 5, 0, 6, 0, 0, 76, 17, 0, 0, 0, 0, 0, CeladonCity_Condominiums_2F_EventScript_1ACE9D, 158, 0, 0 - -CeladonCity_Condominiums_2F_MapWarps: - warp_def 4, 2, 3, 3, 2567 - warp_def 2, 2, 3, 0, 2569 - warp_def 11, 2, 3, 3, 2569 - warp_def 12, 2, 3, 4, 2567 - -CeladonCity_Condominiums_2F_MapBGEvents: - bg_event 8, 12, 0, 0, 0, CeladonCity_Condominiums_2F_EventScript_16C3D1 - bg_event 7, 12, 0, 0, 0, CeladonCity_Condominiums_2F_EventScript_16C3D1 - -CeladonCity_Condominiums_2F_MapEvents:: - map_events CeladonCity_Condominiums_2F_EventObjects, CeladonCity_Condominiums_2F_MapWarps, 0x0, CeladonCity_Condominiums_2F_MapBGEvents diff --git a/data/maps/CeladonCity_Condominiums_2F/header.inc b/data/maps/CeladonCity_Condominiums_2F/header.inc deleted file mode 100644 index 2a380d25d..000000000 --- a/data/maps/CeladonCity_Condominiums_2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CeladonCity_Condominiums_2F:: @ 83512C8 - .4byte CeladonCity_Condominiums_2F_Layout @ 0x831AA58 - .4byte CeladonCity_Condominiums_2F_MapEvents @ 0x83BB5B4 - .4byte CeladonCity_Condominiums_2F_MapScripts @ 0x816C3D0 - .4byte NULL - .2byte BGM_FRLG_CELADON_CITY - .2byte 185 - .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CeladonCity_Condominiums_2F/map.json b/data/maps/CeladonCity_Condominiums_2F/map.json new file mode 100644 index 000000000..48559628c --- /dev/null +++ b/data/maps/CeladonCity_Condominiums_2F/map.json @@ -0,0 +1,90 @@ +{ + "id": "MAP_CELADON_CITY_CONDOMINIUMS_2F", + "name": "CeladonCity_Condominiums_2F", + "layout": "LAYOUT_CELADON_CITY_CONDOMINIUMS_2F", + "music": "BGM_FRLG_CELADON_CITY", + "region_map_section": "MAPSEC_CELADON_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "0", + "x": 6, + "y": 6, + "elevation": 0, + "movement_type": "76", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_Condominiums_2F_EventScript_1ACE9D", + "flag": "158" + }, + { + "graphics_id": "0", + "x": 5, + "y": 6, + "elevation": 0, + "movement_type": "76", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_Condominiums_2F_EventScript_1ACE9D", + "flag": "158" + } + ], + "warp_events": [ + { + "x": 4, + "y": 2, + "elevation": 3, + "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_1F", + "dest_warp_id": 3 + }, + { + "x": 2, + "y": 2, + "elevation": 3, + "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_3F", + "dest_warp_id": 0 + }, + { + "x": 11, + "y": 2, + "elevation": 3, + "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_3F", + "dest_warp_id": 3 + }, + { + "x": 12, + "y": 2, + "elevation": 3, + "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_1F", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 8, + "y": 12, + "elevation": 0, + "script": "CeladonCity_Condominiums_2F_EventScript_16C3D1" + }, + { + "type": "bg_event_type_0", + "x": 7, + "y": 12, + "elevation": 0, + "script": "CeladonCity_Condominiums_2F_EventScript_16C3D1" + } + ] +} \ No newline at end of file diff --git a/data/maps/CeladonCity_Condominiums_3F/events.inc b/data/maps/CeladonCity_Condominiums_3F/events.inc deleted file mode 100644 index 1c6d9c947..000000000 --- a/data/maps/CeladonCity_Condominiums_3F/events.inc +++ /dev/null @@ -1,24 +0,0 @@ -CeladonCity_Condominiums_3F_EventObjects: - object_event 1, 26, 0, 0, 0, 10, 0, 3, 7, 17, 0, 0, 0, 0, 0, CeladonCity_Condominiums_3F_EventScript_16C3DB, 0, 0, 0 - object_event 2, 25, 0, 3, 0, 8, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeladonCity_Condominiums_3F_EventScript_16C3F6, 0, 0, 0 - object_event 3, 52, 0, 4, 0, 10, 0, 3, 7, 17, 0, 0, 0, 0, 0, CeladonCity_Condominiums_3F_EventScript_16C3E4, 0, 0, 0 - object_event 4, 27, 0, 0, 0, 13, 0, 3, 10, 17, 0, 0, 0, 0, 0, CeladonCity_Condominiums_3F_EventScript_16C3ED, 0, 0, 0 - -CeladonCity_Condominiums_3F_MapWarps: - warp_def 2, 2, 3, 1, 2568 - warp_def 4, 2, 3, 0, 2570 - warp_def 12, 2, 3, 1, 2570 - warp_def 11, 2, 3, 2, 2568 - -CeladonCity_Condominiums_3F_MapBGEvents: - bg_event 8, 12, 0, 0, 0, CeladonCity_Condominiums_3F_EventScript_16C435 - bg_event 1, 9, 0, 1, 0, CeladonCity_Condominiums_3F_EventScript_16C43E - bg_event 5, 9, 0, 1, 0, CeladonCity_Condominiums_3F_EventScript_16C447 - bg_event 1, 12, 0, 1, 0, CeladonCity_Condominiums_3F_EventScript_16C450 - bg_event 7, 12, 0, 0, 0, CeladonCity_Condominiums_3F_EventScript_16C435 - bg_event 0, 12, 0, 1, 0, CeladonCity_Condominiums_3F_EventScript_16C450 - bg_event 0, 9, 0, 1, 0, CeladonCity_Condominiums_3F_EventScript_16C43E - bg_event 4, 9, 0, 1, 0, CeladonCity_Condominiums_3F_EventScript_16C447 - -CeladonCity_Condominiums_3F_MapEvents:: - map_events CeladonCity_Condominiums_3F_EventObjects, CeladonCity_Condominiums_3F_MapWarps, 0x0, CeladonCity_Condominiums_3F_MapBGEvents diff --git a/data/maps/CeladonCity_Condominiums_3F/header.inc b/data/maps/CeladonCity_Condominiums_3F/header.inc deleted file mode 100644 index e945a6abe..000000000 --- a/data/maps/CeladonCity_Condominiums_3F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CeladonCity_Condominiums_3F:: @ 83512E4 - .4byte CeladonCity_Condominiums_3F_Layout @ 0x831ACD4 - .4byte CeladonCity_Condominiums_3F_MapEvents @ 0x83BB6A8 - .4byte CeladonCity_Condominiums_3F_MapScripts @ 0x816C3DA - .4byte NULL - .2byte BGM_FRLG_CELADON_CITY - .2byte 186 - .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CeladonCity_Condominiums_3F/map.json b/data/maps/CeladonCity_Condominiums_3F/map.json new file mode 100644 index 000000000..c804ec6e7 --- /dev/null +++ b/data/maps/CeladonCity_Condominiums_3F/map.json @@ -0,0 +1,158 @@ +{ + "id": "MAP_CELADON_CITY_CONDOMINIUMS_3F", + "name": "CeladonCity_Condominiums_3F", + "layout": "LAYOUT_CELADON_CITY_CONDOMINIUMS_3F", + "music": "BGM_FRLG_CELADON_CITY", + "region_map_section": "MAPSEC_CELADON_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "26", + "x": 0, + "y": 10, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_Condominiums_3F_EventScript_16C3DB", + "flag": "0" + }, + { + "graphics_id": "25", + "x": 3, + "y": 8, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_Condominiums_3F_EventScript_16C3F6", + "flag": "0" + }, + { + "graphics_id": "52", + "x": 4, + "y": 10, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_Condominiums_3F_EventScript_16C3E4", + "flag": "0" + }, + { + "graphics_id": "27", + "x": 0, + "y": 13, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_Condominiums_3F_EventScript_16C3ED", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 2, + "y": 2, + "elevation": 3, + "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_2F", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 2, + "elevation": 3, + "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_ROOF", + "dest_warp_id": 0 + }, + { + "x": 12, + "y": 2, + "elevation": 3, + "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_ROOF", + "dest_warp_id": 1 + }, + { + "x": 11, + "y": 2, + "elevation": 3, + "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_2F", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 8, + "y": 12, + "elevation": 0, + "script": "CeladonCity_Condominiums_3F_EventScript_16C435" + }, + { + "type": "bg_event_type_1", + "x": 1, + "y": 9, + "elevation": 0, + "script": "CeladonCity_Condominiums_3F_EventScript_16C43E" + }, + { + "type": "bg_event_type_1", + "x": 5, + "y": 9, + "elevation": 0, + "script": "CeladonCity_Condominiums_3F_EventScript_16C447" + }, + { + "type": "bg_event_type_1", + "x": 1, + "y": 12, + "elevation": 0, + "script": "CeladonCity_Condominiums_3F_EventScript_16C450" + }, + { + "type": "bg_event_type_0", + "x": 7, + "y": 12, + "elevation": 0, + "script": "CeladonCity_Condominiums_3F_EventScript_16C435" + }, + { + "type": "bg_event_type_1", + "x": 0, + "y": 12, + "elevation": 0, + "script": "CeladonCity_Condominiums_3F_EventScript_16C450" + }, + { + "type": "bg_event_type_1", + "x": 0, + "y": 9, + "elevation": 0, + "script": "CeladonCity_Condominiums_3F_EventScript_16C43E" + }, + { + "type": "bg_event_type_1", + "x": 4, + "y": 9, + "elevation": 0, + "script": "CeladonCity_Condominiums_3F_EventScript_16C447" + } + ] +} \ No newline at end of file diff --git a/data/maps/CeladonCity_Condominiums_Roof/events.inc b/data/maps/CeladonCity_Condominiums_Roof/events.inc deleted file mode 100644 index b228d7b14..000000000 --- a/data/maps/CeladonCity_Condominiums_Roof/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -CeladonCity_Condominiums_Roof_MapWarps: - warp_def 4, 2, 3, 1, 2569 - warp_def 10, 2, 3, 2, 2569 - warp_def 2, 12, 3, 1, 2571 - -CeladonCity_Condominiums_Roof_MapBGEvents: - bg_event 4, 12, 0, 0, 0, CeladonCity_Condominiums_Roof_EventScript_16C45A - bg_event 3, 12, 0, 0, 0, CeladonCity_Condominiums_Roof_EventScript_16C45A - -CeladonCity_Condominiums_Roof_MapEvents:: - map_events 0x0, CeladonCity_Condominiums_Roof_MapWarps, 0x0, CeladonCity_Condominiums_Roof_MapBGEvents diff --git a/data/maps/CeladonCity_Condominiums_Roof/header.inc b/data/maps/CeladonCity_Condominiums_Roof/header.inc deleted file mode 100644 index e858a73f0..000000000 --- a/data/maps/CeladonCity_Condominiums_Roof/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CeladonCity_Condominiums_Roof:: @ 8351300 - .4byte CeladonCity_Condominiums_Roof_Layout @ 0x831AF7C - .4byte CeladonCity_Condominiums_Roof_MapEvents @ 0x83BB6EC - .4byte CeladonCity_Condominiums_Roof_MapScripts @ 0x816C459 - .4byte NULL - .2byte BGM_FRLG_CELADON_CITY - .2byte 187 - .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CeladonCity_Condominiums_Roof/map.json b/data/maps/CeladonCity_Condominiums_Roof/map.json new file mode 100644 index 000000000..8e3cfdba6 --- /dev/null +++ b/data/maps/CeladonCity_Condominiums_Roof/map.json @@ -0,0 +1,56 @@ +{ + "id": "MAP_CELADON_CITY_CONDOMINIUMS_ROOF", + "name": "CeladonCity_Condominiums_Roof", + "layout": "LAYOUT_CELADON_CITY_CONDOMINIUMS_ROOF", + "music": "BGM_FRLG_CELADON_CITY", + "region_map_section": "MAPSEC_CELADON_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 4, + "y": 2, + "elevation": 3, + "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_3F", + "dest_warp_id": 1 + }, + { + "x": 10, + "y": 2, + "elevation": 3, + "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_3F", + "dest_warp_id": 2 + }, + { + "x": 2, + "y": 12, + "elevation": 3, + "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_ROOF_ROOM", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 4, + "y": 12, + "elevation": 0, + "script": "CeladonCity_Condominiums_Roof_EventScript_16C45A" + }, + { + "type": "bg_event_type_0", + "x": 3, + "y": 12, + "elevation": 0, + "script": "CeladonCity_Condominiums_Roof_EventScript_16C45A" + } + ] +} \ No newline at end of file diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/events.inc b/data/maps/CeladonCity_Condominiums_RoofRoom/events.inc deleted file mode 100644 index 6e72d86d7..000000000 --- a/data/maps/CeladonCity_Condominiums_RoofRoom/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -CeladonCity_Condominiums_RoofRoom_EventObjects: - object_event 1, 54, 0, 3, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeladonCity_Condominiums_RoofRoom_EventScript_16C464, 0, 0, 0 - object_event 2, 92, 0, 7, 0, 3, 0, 0, 8, 17, 0, 0, 0, 0, 0, CeladonCity_Condominiums_RoofRoom_EventScript_16C46D, 87, 0, 0 - -CeladonCity_Condominiums_RoofRoom_MapWarps: - warp_def 3, 8, 0, 2, 2570 - warp_def 4, 7, 3, 2, 2570 - warp_def 5, 8, 0, 2, 2570 - -CeladonCity_Condominiums_RoofRoom_MapBGEvents: - bg_event 4, 1, 0, 0, 0, CeladonCity_Condominiums_RoofRoom_EventScript_16C522 - bg_event 5, 1, 0, 0, 0, CeladonCity_Condominiums_RoofRoom_EventScript_16C522 - bg_event 4, 4, 0, 0, 0, CeladonCity_Condominiums_RoofRoom_EventScript_16C519 - -CeladonCity_Condominiums_RoofRoom_MapEvents:: - map_events CeladonCity_Condominiums_RoofRoom_EventObjects, CeladonCity_Condominiums_RoofRoom_MapWarps, 0x0, CeladonCity_Condominiums_RoofRoom_MapBGEvents diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/header.inc b/data/maps/CeladonCity_Condominiums_RoofRoom/header.inc deleted file mode 100644 index 23c2ed330..000000000 --- a/data/maps/CeladonCity_Condominiums_RoofRoom/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CeladonCity_Condominiums_RoofRoom:: @ 835131C - .4byte CeladonCity_Condominiums_RoofRoom_Layout @ 0x831B054 - .4byte CeladonCity_Condominiums_RoofRoom_MapEvents @ 0x83BB76C - .4byte CeladonCity_Condominiums_RoofRoom_MapScripts @ 0x816C463 - .4byte NULL - .2byte BGM_FRLG_CELADON_CITY - .2byte 188 - .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/map.json b/data/maps/CeladonCity_Condominiums_RoofRoom/map.json new file mode 100644 index 000000000..9b34fffdd --- /dev/null +++ b/data/maps/CeladonCity_Condominiums_RoofRoom/map.json @@ -0,0 +1,90 @@ +{ + "id": "MAP_CELADON_CITY_CONDOMINIUMS_ROOF_ROOM", + "name": "CeladonCity_Condominiums_RoofRoom", + "layout": "LAYOUT_CELADON_CITY_CONDOMINIUMS_ROOF_ROOM", + "music": "BGM_FRLG_CELADON_CITY", + "region_map_section": "MAPSEC_CELADON_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "54", + "x": 3, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_Condominiums_RoofRoom_EventScript_16C464", + "flag": "0" + }, + { + "graphics_id": "92", + "x": 7, + "y": 3, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_Condominiums_RoofRoom_EventScript_16C46D", + "flag": "87" + } + ], + "warp_events": [ + { + "x": 3, + "y": 8, + "elevation": 0, + "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_ROOF", + "dest_warp_id": 2 + }, + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_ROOF", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 8, + "elevation": 0, + "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_ROOF", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 4, + "y": 1, + "elevation": 0, + "script": "CeladonCity_Condominiums_RoofRoom_EventScript_16C522" + }, + { + "type": "bg_event_type_0", + "x": 5, + "y": 1, + "elevation": 0, + "script": "CeladonCity_Condominiums_RoofRoom_EventScript_16C522" + }, + { + "type": "bg_event_type_0", + "x": 4, + "y": 4, + "elevation": 0, + "script": "CeladonCity_Condominiums_RoofRoom_EventScript_16C519" + } + ] +} \ No newline at end of file diff --git a/data/maps/CeladonCity_DepartmentStore_1F/events.inc b/data/maps/CeladonCity_DepartmentStore_1F/events.inc deleted file mode 100644 index d9b549694..000000000 --- a/data/maps/CeladonCity_DepartmentStore_1F/events.inc +++ /dev/null @@ -1,19 +0,0 @@ -CeladonCity_DepartmentStore_1F_EventObjects: - object_event 1, 48, 0, 6, 0, 10, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeladonCity_DepartmentStore_1F_EventScript_16BAD9, 0, 0, 0 - -CeladonCity_DepartmentStore_1F_MapWarps: - warp_def 1, 15, 0, 1, 774 - warp_def 2, 14, 3, 1, 774 - warp_def 3, 15, 0, 1, 774 - warp_def 9, 15, 0, 2, 774 - warp_def 10, 14, 3, 2, 774 - warp_def 11, 15, 0, 2, 774 - warp_def 6, 1, 0, 0, 2566 - warp_def 4, 2, 3, 1, 2561 - -CeladonCity_DepartmentStore_1F_MapBGEvents: - bg_event 9, 11, 0, 0, 0, CeladonCity_DepartmentStore_1F_EventScript_16BAE2 - bg_event 8, 1, 0, 0, 0, CeladonCity_DepartmentStore_1F_EventScript_16BAEB - -CeladonCity_DepartmentStore_1F_MapEvents:: - map_events CeladonCity_DepartmentStore_1F_EventObjects, CeladonCity_DepartmentStore_1F_MapWarps, 0x0, CeladonCity_DepartmentStore_1F_MapBGEvents diff --git a/data/maps/CeladonCity_DepartmentStore_1F/header.inc b/data/maps/CeladonCity_DepartmentStore_1F/header.inc deleted file mode 100644 index 07b027ede..000000000 --- a/data/maps/CeladonCity_DepartmentStore_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CeladonCity_DepartmentStore_1F:: @ 83511E8 - .4byte CeladonCity_DepartmentStore_1F_Layout @ 0x831B5FC - .4byte CeladonCity_DepartmentStore_1F_MapEvents @ 0x83BB0EC - .4byte CeladonCity_DepartmentStore_1F_MapScripts @ 0x816BAD8 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 192 - .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x04, 0x01, 0x00 diff --git a/data/maps/CeladonCity_DepartmentStore_1F/map.json b/data/maps/CeladonCity_DepartmentStore_1F/map.json new file mode 100644 index 000000000..1318f0173 --- /dev/null +++ b/data/maps/CeladonCity_DepartmentStore_1F/map.json @@ -0,0 +1,105 @@ +{ + "id": "MAP_CELADON_CITY_DEPARTMENT_STORE_1F", + "name": "CeladonCity_DepartmentStore_1F", + "layout": "LAYOUT_CELADON_CITY_DEPARTMENT_STORE_1F", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_CELADON_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 4, + "elevator_flag": 1, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "48", + "x": 6, + "y": 10, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_DepartmentStore_1F_EventScript_16BAD9", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 1, + "y": 15, + "elevation": 0, + "dest_map": "MAP_CELADON_CITY", + "dest_warp_id": 1 + }, + { + "x": 2, + "y": 14, + "elevation": 3, + "dest_map": "MAP_CELADON_CITY", + "dest_warp_id": 1 + }, + { + "x": 3, + "y": 15, + "elevation": 0, + "dest_map": "MAP_CELADON_CITY", + "dest_warp_id": 1 + }, + { + "x": 9, + "y": 15, + "elevation": 0, + "dest_map": "MAP_CELADON_CITY", + "dest_warp_id": 2 + }, + { + "x": 10, + "y": 14, + "elevation": 3, + "dest_map": "MAP_CELADON_CITY", + "dest_warp_id": 2 + }, + { + "x": 11, + "y": 15, + "elevation": 0, + "dest_map": "MAP_CELADON_CITY", + "dest_warp_id": 2 + }, + { + "x": 6, + "y": 1, + "elevation": 0, + "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_ELEVATOR", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 2, + "elevation": 3, + "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_2F", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 9, + "y": 11, + "elevation": 0, + "script": "CeladonCity_DepartmentStore_1F_EventScript_16BAE2" + }, + { + "type": "bg_event_type_0", + "x": 8, + "y": 1, + "elevation": 0, + "script": "CeladonCity_DepartmentStore_1F_EventScript_16BAEB" + } + ] +} \ No newline at end of file diff --git a/data/maps/CeladonCity_DepartmentStore_2F/events.inc b/data/maps/CeladonCity_DepartmentStore_2F/events.inc deleted file mode 100644 index b54ec637a..000000000 --- a/data/maps/CeladonCity_DepartmentStore_2F/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -CeladonCity_DepartmentStore_2F_EventObjects: - object_event 1, 22, 0, 5, 0, 10, 0, 3, 3, 18, 0, 0, 0, 0, 0, CeladonCity_DepartmentStore_2F_EventScript_16BAFE, 0, 0, 0 - object_event 2, 68, 0, 1, 0, 8, 0, 0, 8, 19, 0, 0, 0, 0, 0, CeladonCity_DepartmentStore_2F_EventScript_16BB10, 0, 0, 0 - object_event 3, 68, 0, 1, 0, 6, 0, 3, 10, 19, 0, 0, 0, 0, 0, CeladonCity_DepartmentStore_2F_EventScript_16BB4E, 0, 0, 0 - object_event 4, 23, 0, 11, 0, 6, 0, 3, 5, 17, 0, 0, 0, 0, 0, CeladonCity_DepartmentStore_2F_EventScript_1AD053, 157, 0, 0 - -CeladonCity_DepartmentStore_2F_MapWarps: - warp_def 6, 1, 0, 0, 2566 - warp_def 3, 2, 3, 7, 2560 - warp_def 9, 2, 3, 1, 2562 - -CeladonCity_DepartmentStore_2F_MapBGEvents: - bg_event 4, 1, 0, 0, 0, CeladonCity_DepartmentStore_2F_EventScript_16BB07 - -CeladonCity_DepartmentStore_2F_MapEvents:: - map_events CeladonCity_DepartmentStore_2F_EventObjects, CeladonCity_DepartmentStore_2F_MapWarps, 0x0, CeladonCity_DepartmentStore_2F_MapBGEvents diff --git a/data/maps/CeladonCity_DepartmentStore_2F/header.inc b/data/maps/CeladonCity_DepartmentStore_2F/header.inc deleted file mode 100644 index 48afe690e..000000000 --- a/data/maps/CeladonCity_DepartmentStore_2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CeladonCity_DepartmentStore_2F:: @ 8351204 - .4byte CeladonCity_DepartmentStore_2F_Layout @ 0x831B7A8 - .4byte CeladonCity_DepartmentStore_2F_MapEvents @ 0x83BB184 - .4byte CeladonCity_DepartmentStore_2F_MapScripts @ 0x816BAF4 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 193 - .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x04, 0x02, 0x00 diff --git a/data/maps/CeladonCity_DepartmentStore_2F/map.json b/data/maps/CeladonCity_DepartmentStore_2F/map.json new file mode 100644 index 000000000..9765467e4 --- /dev/null +++ b/data/maps/CeladonCity_DepartmentStore_2F/map.json @@ -0,0 +1,102 @@ +{ + "id": "MAP_CELADON_CITY_DEPARTMENT_STORE_2F", + "name": "CeladonCity_DepartmentStore_2F", + "layout": "LAYOUT_CELADON_CITY_DEPARTMENT_STORE_2F", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_CELADON_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 4, + "elevator_flag": 2, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "22", + "x": 5, + "y": 10, + "elevation": 3, + "movement_type": "3", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_DepartmentStore_2F_EventScript_16BAFE", + "flag": "0" + }, + { + "graphics_id": "68", + "x": 1, + "y": 8, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 3, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_DepartmentStore_2F_EventScript_16BB10", + "flag": "0" + }, + { + "graphics_id": "68", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 3, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_DepartmentStore_2F_EventScript_16BB4E", + "flag": "0" + }, + { + "graphics_id": "23", + "x": 11, + "y": 6, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_DepartmentStore_2F_EventScript_1AD053", + "flag": "157" + } + ], + "warp_events": [ + { + "x": 6, + "y": 1, + "elevation": 0, + "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_ELEVATOR", + "dest_warp_id": 0 + }, + { + "x": 3, + "y": 2, + "elevation": 3, + "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_1F", + "dest_warp_id": 7 + }, + { + "x": 9, + "y": 2, + "elevation": 3, + "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_3F", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 4, + "y": 1, + "elevation": 0, + "script": "CeladonCity_DepartmentStore_2F_EventScript_16BB07" + } + ] +} \ No newline at end of file diff --git a/data/maps/CeladonCity_DepartmentStore_3F/events.inc b/data/maps/CeladonCity_DepartmentStore_3F/events.inc deleted file mode 100644 index 6d2b546ab..000000000 --- a/data/maps/CeladonCity_DepartmentStore_3F/events.inc +++ /dev/null @@ -1,27 +0,0 @@ -CeladonCity_DepartmentStore_3F_EventObjects: - object_event 1, 68, 0, 10, 0, 9, 0, 3, 7, 17, 0, 0, 0, 0, 0, CeladonCity_DepartmentStore_3F_EventScript_16BB85, 0, 0, 0 - object_event 2, 51, 0, 11, 0, 6, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeladonCity_DepartmentStore_3F_EventScript_16BB8B, 0, 0, 0 - object_event 3, 51, 0, 4, 0, 9, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeladonCity_DepartmentStore_3F_EventScript_16BB9D, 0, 0, 0 - object_event 4, 51, 0, 1, 0, 9, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeladonCity_DepartmentStore_3F_EventScript_16BB94, 0, 0, 0 - object_event 5, 17, 0, 9, 0, 14, 0, 3, 14, 17, 0, 0, 0, 0, 0, CeladonCity_DepartmentStore_3F_EventScript_16BBA6, 0, 0, 0 - -CeladonCity_DepartmentStore_3F_MapWarps: - warp_def 6, 1, 0, 0, 2566 - warp_def 9, 2, 0, 2, 2561 - warp_def 3, 2, 0, 1, 2563 - -CeladonCity_DepartmentStore_3F_MapBGEvents: - bg_event 8, 1, 0, 0, 0, CeladonCity_DepartmentStore_3F_EventScript_16BBDC - bg_event 2, 8, 0, 1, 0, CeladonCity_DepartmentStore_3F_EventScript_16BBB8 - bg_event 5, 8, 0, 1, 0, CeladonCity_DepartmentStore_3F_EventScript_16BBC1 - bg_event 2, 11, 0, 1, 0, CeladonCity_DepartmentStore_3F_EventScript_16BBCA - bg_event 5, 11, 0, 1, 0, CeladonCity_DepartmentStore_3F_EventScript_16BBD3 - bg_event 1, 8, 0, 0, 0, CeladonCity_DepartmentStore_3F_EventScript_16BBAF - bg_event 1, 11, 0, 0, 0, CeladonCity_DepartmentStore_3F_EventScript_16BBAF - bg_event 4, 8, 0, 0, 0, CeladonCity_DepartmentStore_3F_EventScript_16BBAF - bg_event 4, 11, 0, 0, 0, CeladonCity_DepartmentStore_3F_EventScript_16BBAF - bg_event 2, 4, 0, 1, 0, CeladonCity_DepartmentStore_3F_EventScript_16BBE5 - bg_event 0, 4, 0, 1, 0, CeladonCity_DepartmentStore_3F_EventScript_16BBE5 - -CeladonCity_DepartmentStore_3F_MapEvents:: - map_events CeladonCity_DepartmentStore_3F_EventObjects, CeladonCity_DepartmentStore_3F_MapWarps, 0x0, CeladonCity_DepartmentStore_3F_MapBGEvents diff --git a/data/maps/CeladonCity_DepartmentStore_3F/header.inc b/data/maps/CeladonCity_DepartmentStore_3F/header.inc deleted file mode 100644 index 9bfb8d3c4..000000000 --- a/data/maps/CeladonCity_DepartmentStore_3F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CeladonCity_DepartmentStore_3F:: @ 8351220 - .4byte CeladonCity_DepartmentStore_3F_Layout @ 0x831B954 - .4byte CeladonCity_DepartmentStore_3F_MapEvents @ 0x83BB2AC - .4byte CeladonCity_DepartmentStore_3F_MapScripts @ 0x816BB84 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 194 - .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x04, 0x03, 0x00 diff --git a/data/maps/CeladonCity_DepartmentStore_3F/map.json b/data/maps/CeladonCity_DepartmentStore_3F/map.json new file mode 100644 index 000000000..c6a314cc9 --- /dev/null +++ b/data/maps/CeladonCity_DepartmentStore_3F/map.json @@ -0,0 +1,185 @@ +{ + "id": "MAP_CELADON_CITY_DEPARTMENT_STORE_3F", + "name": "CeladonCity_DepartmentStore_3F", + "layout": "LAYOUT_CELADON_CITY_DEPARTMENT_STORE_3F", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_CELADON_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 4, + "elevator_flag": 3, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "68", + "x": 10, + "y": 9, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_DepartmentStore_3F_EventScript_16BB85", + "flag": "0" + }, + { + "graphics_id": "51", + "x": 11, + "y": 6, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_DepartmentStore_3F_EventScript_16BB8B", + "flag": "0" + }, + { + "graphics_id": "51", + "x": 4, + "y": 9, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_DepartmentStore_3F_EventScript_16BB9D", + "flag": "0" + }, + { + "graphics_id": "51", + "x": 1, + "y": 9, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_DepartmentStore_3F_EventScript_16BB94", + "flag": "0" + }, + { + "graphics_id": "17", + "x": 9, + "y": 14, + "elevation": 3, + "movement_type": "14", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBA6", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 1, + "elevation": 0, + "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_ELEVATOR", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 2, + "elevation": 0, + "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_2F", + "dest_warp_id": 2 + }, + { + "x": 3, + "y": 2, + "elevation": 0, + "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_4F", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 8, + "y": 1, + "elevation": 0, + "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBDC" + }, + { + "type": "bg_event_type_1", + "x": 2, + "y": 8, + "elevation": 0, + "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBB8" + }, + { + "type": "bg_event_type_1", + "x": 5, + "y": 8, + "elevation": 0, + "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBC1" + }, + { + "type": "bg_event_type_1", + "x": 2, + "y": 11, + "elevation": 0, + "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBCA" + }, + { + "type": "bg_event_type_1", + "x": 5, + "y": 11, + "elevation": 0, + "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBD3" + }, + { + "type": "bg_event_type_0", + "x": 1, + "y": 8, + "elevation": 0, + "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBAF" + }, + { + "type": "bg_event_type_0", + "x": 1, + "y": 11, + "elevation": 0, + "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBAF" + }, + { + "type": "bg_event_type_0", + "x": 4, + "y": 8, + "elevation": 0, + "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBAF" + }, + { + "type": "bg_event_type_0", + "x": 4, + "y": 11, + "elevation": 0, + "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBAF" + }, + { + "type": "bg_event_type_1", + "x": 2, + "y": 4, + "elevation": 0, + "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBE5" + }, + { + "type": "bg_event_type_1", + "x": 0, + "y": 4, + "elevation": 0, + "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBE5" + } + ] +} \ No newline at end of file diff --git a/data/maps/CeladonCity_DepartmentStore_4F/events.inc b/data/maps/CeladonCity_DepartmentStore_4F/events.inc deleted file mode 100644 index d38604872..000000000 --- a/data/maps/CeladonCity_DepartmentStore_4F/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -CeladonCity_DepartmentStore_4F_EventObjects: - object_event 1, 25, 0, 6, 0, 6, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeladonCity_DepartmentStore_4F_EventScript_16BBEF, 0, 0, 0 - object_event 2, 18, 0, 10, 0, 11, 0, 3, 2, 17, 0, 0, 0, 0, 0, CeladonCity_DepartmentStore_4F_EventScript_16BBF8, 0, 0, 0 - object_event 3, 68, 0, 3, 0, 13, 0, 0, 7, 19, 0, 0, 0, 0, 0, CeladonCity_DepartmentStore_4F_EventScript_16BC0A, 0, 0, 0 - -CeladonCity_DepartmentStore_4F_MapWarps: - warp_def 6, 1, 0, 0, 2566 - warp_def 3, 2, 0, 2, 2562 - warp_def 9, 2, 0, 1, 2564 - -CeladonCity_DepartmentStore_4F_MapBGEvents: - bg_event 4, 1, 0, 0, 0, CeladonCity_DepartmentStore_4F_EventScript_16BC01 - -CeladonCity_DepartmentStore_4F_MapEvents:: - map_events CeladonCity_DepartmentStore_4F_EventObjects, CeladonCity_DepartmentStore_4F_MapWarps, 0x0, CeladonCity_DepartmentStore_4F_MapBGEvents diff --git a/data/maps/CeladonCity_DepartmentStore_4F/header.inc b/data/maps/CeladonCity_DepartmentStore_4F/header.inc deleted file mode 100644 index e25a983da..000000000 --- a/data/maps/CeladonCity_DepartmentStore_4F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CeladonCity_DepartmentStore_4F:: @ 835123C - .4byte CeladonCity_DepartmentStore_4F_Layout @ 0x831BB00 - .4byte CeladonCity_DepartmentStore_4F_MapEvents @ 0x83BB32C - .4byte CeladonCity_DepartmentStore_4F_MapScripts @ 0x816BBEE - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 195 - .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x04, 0x04, 0x00 diff --git a/data/maps/CeladonCity_DepartmentStore_4F/map.json b/data/maps/CeladonCity_DepartmentStore_4F/map.json new file mode 100644 index 000000000..8fc5e4f09 --- /dev/null +++ b/data/maps/CeladonCity_DepartmentStore_4F/map.json @@ -0,0 +1,89 @@ +{ + "id": "MAP_CELADON_CITY_DEPARTMENT_STORE_4F", + "name": "CeladonCity_DepartmentStore_4F", + "layout": "LAYOUT_CELADON_CITY_DEPARTMENT_STORE_4F", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_CELADON_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 4, + "elevator_flag": 4, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "25", + "x": 6, + "y": 6, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_DepartmentStore_4F_EventScript_16BBEF", + "flag": "0" + }, + { + "graphics_id": "18", + "x": 10, + "y": 11, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_DepartmentStore_4F_EventScript_16BBF8", + "flag": "0" + }, + { + "graphics_id": "68", + "x": 3, + "y": 13, + "elevation": 0, + "movement_type": "7", + "movement_range_x": 3, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_DepartmentStore_4F_EventScript_16BC0A", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 1, + "elevation": 0, + "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_ELEVATOR", + "dest_warp_id": 0 + }, + { + "x": 3, + "y": 2, + "elevation": 0, + "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_3F", + "dest_warp_id": 2 + }, + { + "x": 9, + "y": 2, + "elevation": 0, + "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_5F", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 4, + "y": 1, + "elevation": 0, + "script": "CeladonCity_DepartmentStore_4F_EventScript_16BC01" + } + ] +} \ No newline at end of file diff --git a/data/maps/CeladonCity_DepartmentStore_5F/events.inc b/data/maps/CeladonCity_DepartmentStore_5F/events.inc deleted file mode 100644 index c9c61f94e..000000000 --- a/data/maps/CeladonCity_DepartmentStore_5F/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -CeladonCity_DepartmentStore_5F_EventObjects: - object_event 1, 61, 0, 11, 0, 6, 0, 3, 5, 17, 0, 0, 0, 0, 0, CeladonCity_DepartmentStore_5F_EventScript_16BC41, 0, 0, 0 - object_event 2, 62, 0, 6, 0, 8, 0, 3, 2, 17, 0, 0, 0, 0, 0, CeladonCity_DepartmentStore_5F_EventScript_16BC4A, 0, 0, 0 - object_event 3, 68, 0, 1, 0, 7, 0, 3, 8, 18, 0, 0, 0, 0, 0, CeladonCity_DepartmentStore_5F_EventScript_16BC5C, 0, 0, 0 - object_event 4, 68, 0, 1, 0, 6, 0, 3, 10, 18, 0, 0, 0, 0, 0, CeladonCity_DepartmentStore_5F_EventScript_16BC96, 0, 0, 0 - -CeladonCity_DepartmentStore_5F_MapWarps: - warp_def 6, 1, 0, 0, 2566 - warp_def 9, 2, 3, 2, 2563 - warp_def 3, 2, 3, 0, 2565 - -CeladonCity_DepartmentStore_5F_MapBGEvents: - bg_event 8, 1, 0, 0, 0, CeladonCity_DepartmentStore_5F_EventScript_16BC53 - -CeladonCity_DepartmentStore_5F_MapEvents:: - map_events CeladonCity_DepartmentStore_5F_EventObjects, CeladonCity_DepartmentStore_5F_MapWarps, 0x0, CeladonCity_DepartmentStore_5F_MapBGEvents diff --git a/data/maps/CeladonCity_DepartmentStore_5F/header.inc b/data/maps/CeladonCity_DepartmentStore_5F/header.inc deleted file mode 100644 index 321174026..000000000 --- a/data/maps/CeladonCity_DepartmentStore_5F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CeladonCity_DepartmentStore_5F:: @ 8351258 - .4byte CeladonCity_DepartmentStore_5F_Layout @ 0x831BCAC - .4byte CeladonCity_DepartmentStore_5F_MapEvents @ 0x83BB3C4 - .4byte CeladonCity_DepartmentStore_5F_MapScripts @ 0x816BC40 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 196 - .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x04, 0x05, 0x00 diff --git a/data/maps/CeladonCity_DepartmentStore_5F/map.json b/data/maps/CeladonCity_DepartmentStore_5F/map.json new file mode 100644 index 000000000..063d36602 --- /dev/null +++ b/data/maps/CeladonCity_DepartmentStore_5F/map.json @@ -0,0 +1,102 @@ +{ + "id": "MAP_CELADON_CITY_DEPARTMENT_STORE_5F", + "name": "CeladonCity_DepartmentStore_5F", + "layout": "LAYOUT_CELADON_CITY_DEPARTMENT_STORE_5F", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_CELADON_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 4, + "elevator_flag": 5, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "61", + "x": 11, + "y": 6, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_DepartmentStore_5F_EventScript_16BC41", + "flag": "0" + }, + { + "graphics_id": "62", + "x": 6, + "y": 8, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_DepartmentStore_5F_EventScript_16BC4A", + "flag": "0" + }, + { + "graphics_id": "68", + "x": 1, + "y": 7, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_DepartmentStore_5F_EventScript_16BC5C", + "flag": "0" + }, + { + "graphics_id": "68", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_DepartmentStore_5F_EventScript_16BC96", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 1, + "elevation": 0, + "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_ELEVATOR", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 2, + "elevation": 3, + "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_4F", + "dest_warp_id": 2 + }, + { + "x": 3, + "y": 2, + "elevation": 3, + "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_ROOF", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 8, + "y": 1, + "elevation": 0, + "script": "CeladonCity_DepartmentStore_5F_EventScript_16BC53" + } + ] +} \ No newline at end of file diff --git a/data/maps/CeladonCity_DepartmentStore_Elevator/events.inc b/data/maps/CeladonCity_DepartmentStore_Elevator/events.inc deleted file mode 100644 index 1a7da8ab1..000000000 --- a/data/maps/CeladonCity_DepartmentStore_Elevator/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -CeladonCity_DepartmentStore_Elevator_MapWarps: - warp_def 2, 5, 3, 127, 32639 - warp_def 2, 6, 0, 127, 32639 - -CeladonCity_DepartmentStore_Elevator_MapBGEvents: - bg_event 0, 2, 0, 0, 0, CeladonCity_DepartmentStore_Elevator_EventScript_16C153 - bg_event 4, 1, 0, 0, 0, CeladonCity_DepartmentStore_Elevator_EventScript_16C153 - -CeladonCity_DepartmentStore_Elevator_MapEvents:: - map_events 0x0, CeladonCity_DepartmentStore_Elevator_MapWarps, 0x0, CeladonCity_DepartmentStore_Elevator_MapBGEvents diff --git a/data/maps/CeladonCity_DepartmentStore_Elevator/header.inc b/data/maps/CeladonCity_DepartmentStore_Elevator/header.inc deleted file mode 100644 index e7086ace2..000000000 --- a/data/maps/CeladonCity_DepartmentStore_Elevator/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CeladonCity_DepartmentStore_Elevator:: @ 8351290 - .4byte CeladonCity_DepartmentStore_Elevator_Layout @ 0x8319F70 - .4byte CeladonCity_DepartmentStore_Elevator_MapEvents @ 0x83BB47C - .4byte CeladonCity_DepartmentStore_Elevator_MapScripts @ 0x816C152 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 179 - .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CeladonCity_DepartmentStore_Elevator/map.json b/data/maps/CeladonCity_DepartmentStore_Elevator/map.json new file mode 100644 index 000000000..150bd1605 --- /dev/null +++ b/data/maps/CeladonCity_DepartmentStore_Elevator/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_CELADON_CITY_DEPARTMENT_STORE_ELEVATOR", + "name": "CeladonCity_DepartmentStore_Elevator", + "layout": "LAYOUT_CELADON_CITY_DEPARTMENT_STORE_ELEVATOR", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_CELADON_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 2, + "y": 5, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + }, + { + "x": 2, + "y": 6, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 0, + "y": 2, + "elevation": 0, + "script": "CeladonCity_DepartmentStore_Elevator_EventScript_16C153" + }, + { + "type": "bg_event_type_0", + "x": 4, + "y": 1, + "elevation": 0, + "script": "CeladonCity_DepartmentStore_Elevator_EventScript_16C153" + } + ] +} \ No newline at end of file diff --git a/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc index d682f3d7a..ed342274f 100644 --- a/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc @@ -72,7 +72,7 @@ EventScript_16C1F3:: @ 816C1F3 EventScript_16C246:: @ 816C246 setvar VAR_0x8006, 4 - setdynamicwarp MAP_CELADON_CITY_DEPARTMENTSTORE_1F, 255, 6, 1 + setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_1F, 255, 6, 1 compare_var_to_value VAR_0x403A, 4 goto_if 1, EventScript_16C30E call EventScript_16C313 @@ -82,7 +82,7 @@ EventScript_16C246:: @ 816C246 EventScript_16C26E:: @ 816C26E setvar VAR_0x8006, 5 - setdynamicwarp MAP_CELADON_CITY_DEPARTMENTSTORE_2F, 255, 6, 1 + setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_2F, 255, 6, 1 compare_var_to_value VAR_0x403A, 5 goto_if 1, EventScript_16C30E call EventScript_16C313 @@ -92,7 +92,7 @@ EventScript_16C26E:: @ 816C26E EventScript_16C296:: @ 816C296 setvar VAR_0x8006, 6 - setdynamicwarp MAP_CELADON_CITY_DEPARTMENTSTORE_3F, 255, 6, 1 + setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_3F, 255, 6, 1 compare_var_to_value VAR_0x403A, 6 goto_if 1, EventScript_16C30E call EventScript_16C313 @@ -102,7 +102,7 @@ EventScript_16C296:: @ 816C296 EventScript_16C2BE:: @ 816C2BE setvar VAR_0x8006, 7 - setdynamicwarp MAP_CELADON_CITY_DEPARTMENTSTORE_4F, 255, 6, 1 + setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_4F, 255, 6, 1 compare_var_to_value VAR_0x403A, 7 goto_if 1, EventScript_16C30E call EventScript_16C313 @@ -112,7 +112,7 @@ EventScript_16C2BE:: @ 816C2BE EventScript_16C2E6:: @ 816C2E6 setvar VAR_0x8006, 8 - setdynamicwarp MAP_CELADON_CITY_DEPARTMENTSTORE_5F, 255, 6, 1 + setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_5F, 255, 6, 1 compare_var_to_value VAR_0x403A, 8 goto_if 1, EventScript_16C30E call EventScript_16C313 diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/events.inc b/data/maps/CeladonCity_DepartmentStore_Roof/events.inc deleted file mode 100644 index 6f6fc6da1..000000000 --- a/data/maps/CeladonCity_DepartmentStore_Roof/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -CeladonCity_DepartmentStore_Roof_EventObjects: - object_event 1, 41, 0, 9, 0, 5, 0, 3, 9, 17, 0, 0, 0, 0, 0, CeladonCity_DepartmentStore_Roof_EventScript_16C022, 0, 0, 0 - object_event 2, 17, 0, 5, 0, 4, 0, 3, 2, 18, 0, 0, 0, 0, 0, CeladonCity_DepartmentStore_Roof_EventScript_16BCCD, 0, 0, 0 - -CeladonCity_DepartmentStore_Roof_MapWarps: - warp_def 15, 6, 3, 2, 2564 - -CeladonCity_DepartmentStore_Roof_MapBGEvents: - bg_event 14, 3, 0, 0, 0, CeladonCity_DepartmentStore_Roof_EventScript_16C02B - bg_event 10, 3, 0, 0, 0, CeladonCity_DepartmentStore_Roof_EventScript_16C034 - bg_event 11, 3, 0, 0, 0, CeladonCity_DepartmentStore_Roof_EventScript_16C034 - bg_event 12, 3, 0, 0, 0, CeladonCity_DepartmentStore_Roof_EventScript_16C034 - -CeladonCity_DepartmentStore_Roof_MapEvents:: - map_events CeladonCity_DepartmentStore_Roof_EventObjects, CeladonCity_DepartmentStore_Roof_MapWarps, 0x0, CeladonCity_DepartmentStore_Roof_MapBGEvents diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/header.inc b/data/maps/CeladonCity_DepartmentStore_Roof/header.inc deleted file mode 100644 index bed42ffb5..000000000 --- a/data/maps/CeladonCity_DepartmentStore_Roof/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CeladonCity_DepartmentStore_Roof:: @ 8351274 - .4byte CeladonCity_DepartmentStore_Roof_Layout @ 0x831BEE4 - .4byte CeladonCity_DepartmentStore_Roof_MapEvents @ 0x83BB440 - .4byte CeladonCity_DepartmentStore_Roof_MapScripts @ 0x816BCCC - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 197 - .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x04, 0x7f, 0x00 diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/map.json b/data/maps/CeladonCity_DepartmentStore_Roof/map.json new file mode 100644 index 000000000..461da4fcc --- /dev/null +++ b/data/maps/CeladonCity_DepartmentStore_Roof/map.json @@ -0,0 +1,83 @@ +{ + "id": "MAP_CELADON_CITY_DEPARTMENT_STORE_ROOF", + "name": "CeladonCity_DepartmentStore_Roof", + "layout": "LAYOUT_CELADON_CITY_DEPARTMENT_STORE_ROOF", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_CELADON_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 4, + "elevator_flag": 127, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "41", + "x": 9, + "y": 5, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_DepartmentStore_Roof_EventScript_16C022", + "flag": "0" + }, + { + "graphics_id": "17", + "x": 5, + "y": 4, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_DepartmentStore_Roof_EventScript_16BCCD", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 15, + "y": 6, + "elevation": 3, + "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_5F", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 14, + "y": 3, + "elevation": 0, + "script": "CeladonCity_DepartmentStore_Roof_EventScript_16C02B" + }, + { + "type": "bg_event_type_0", + "x": 10, + "y": 3, + "elevation": 0, + "script": "CeladonCity_DepartmentStore_Roof_EventScript_16C034" + }, + { + "type": "bg_event_type_0", + "x": 11, + "y": 3, + "elevation": 0, + "script": "CeladonCity_DepartmentStore_Roof_EventScript_16C034" + }, + { + "type": "bg_event_type_0", + "x": 12, + "y": 3, + "elevation": 0, + "script": "CeladonCity_DepartmentStore_Roof_EventScript_16C034" + } + ] +} \ No newline at end of file diff --git a/data/maps/CeladonCity_GameCorner/events.inc b/data/maps/CeladonCity_GameCorner/events.inc deleted file mode 100644 index 9a2a1e5c1..000000000 --- a/data/maps/CeladonCity_GameCorner/events.inc +++ /dev/null @@ -1,59 +0,0 @@ -CeladonCity_GameCorner_EventObjects: - object_event 1, 48, 0, 4, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeladonCity_GameCorner_EventScript_16C684, 0, 0, 0 - object_event 2, 47, 0, 6, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeladonCity_GameCorner_EventScript_16C68D, 0, 0, 0 - object_event 3, 30, 0, 1, 0, 6, 0, 3, 9, 17, 0, 0, 0, 0, 0, CeladonCity_GameCorner_EventScript_16C7BA, 0, 0, 0 - object_event 4, 28, 0, 1, 0, 8, 0, 3, 9, 17, 0, 0, 0, 0, 0, CeladonCity_GameCorner_EventScript_16C7D7, 0, 0, 0 - object_event 5, 57, 0, 4, 0, 7, 0, 3, 10, 17, 0, 0, 0, 0, 0, CeladonCity_GameCorner_EventScript_16C7E7, 0, 0, 0 - object_event 6, 91, 0, 7, 0, 10, 0, 3, 9, 17, 0, 0, 0, 0, 0, CeladonCity_GameCorner_EventScript_16C857, 0, 0, 0 - object_event 7, 23, 0, 7, 0, 8, 0, 3, 9, 17, 0, 0, 0, 0, 0, CeladonCity_GameCorner_EventScript_16C87E, 0, 0, 0 - object_event 8, 33, 0, 10, 0, 9, 0, 3, 10, 17, 0, 0, 0, 0, 0, CeladonCity_GameCorner_EventScript_16C88E, 0, 0, 0 - object_event 9, 55, 0, 13, 0, 7, 0, 3, 9, 17, 0, 0, 0, 0, 0, CeladonCity_GameCorner_EventScript_16C89E, 0, 0, 0 - object_event 10, 61, 0, 16, 0, 10, 0, 3, 10, 17, 0, 0, 0, 0, 0, CeladonCity_GameCorner_EventScript_16C8FE, 0, 0, 0 - object_event 11, 49, 0, 11, 0, 2, 0, 3, 7, 17, 0, 1, 0, 0, 0, CeladonCity_GameCorner_EventScript_16CAF5, 91, 0, 0 - -CeladonCity_GameCorner_MapWarps: - warp_def 9, 13, 0, 0, 774 - warp_def 10, 13, 0, 0, 774 - warp_def 11, 13, 0, 0, 774 - warp_def 15, 2, 3, 0, 298 - -CeladonCity_GameCorner_MapBGEvents: - bg_event 2, 4, 3, 7, 0, 0, 51, 10 - bg_event 3, 8, 3, 7, 0, 0, 52, 10 - bg_event 2, 11, 3, 7, 0, 0, 53, 20 - bg_event 6, 12, 3, 7, 0, 0, 54, 10 - bg_event 9, 9, 3, 7, 0, 0, 55, 10 - bg_event 8, 5, 3, 7, 0, 0, 56, 20 - bg_event 10, 4, 3, 7, 0, 0, 57, 10 - bg_event 13, 3, 3, 7, 0, 0, 58, 10 - bg_event 15, 5, 3, 7, 0, 0, 59, 10 - bg_event 17, 5, 3, 7, 0, 0, 60, 40 - bg_event 15, 13, 3, 7, 0, 0, 61, 100 - bg_event 12, 12, 3, 7, 0, 0, 62, 10 - bg_event 0, 7, 0, 4, 0, CeladonCity_GameCorner_EventScript_16C95E - bg_event 0, 9, 0, 4, 0, CeladonCity_GameCorner_EventScript_16C9A4 - bg_event 0, 10, 0, 4, 0, CeladonCity_GameCorner_EventScript_16C9B0 - bg_event 5, 6, 0, 3, 0, CeladonCity_GameCorner_EventScript_16C9BC - bg_event 5, 8, 0, 3, 0, CeladonCity_GameCorner_EventScript_16CB5A - bg_event 5, 9, 0, 3, 0, CeladonCity_GameCorner_EventScript_16C9D4 - bg_event 5, 10, 0, 3, 0, CeladonCity_GameCorner_EventScript_16C9E0 - bg_event 6, 6, 0, 4, 0, CeladonCity_GameCorner_EventScript_16C9EC - bg_event 6, 7, 0, 4, 0, CeladonCity_GameCorner_EventScript_16C9F8 - bg_event 6, 9, 0, 4, 0, CeladonCity_GameCorner_EventScript_16CA04 - bg_event 11, 6, 0, 3, 0, CeladonCity_GameCorner_EventScript_16CA10 - bg_event 11, 7, 0, 3, 0, CeladonCity_GameCorner_EventScript_16CA1C - bg_event 11, 8, 0, 3, 0, CeladonCity_GameCorner_EventScript_16CA28 - bg_event 11, 10, 0, 3, 0, CeladonCity_GameCorner_EventScript_16CA34 - bg_event 12, 6, 0, 4, 0, CeladonCity_GameCorner_EventScript_16CA40 - bg_event 12, 8, 0, 4, 0, CeladonCity_GameCorner_EventScript_16CB63 - bg_event 12, 9, 0, 4, 0, CeladonCity_GameCorner_EventScript_16CA58 - bg_event 12, 10, 0, 4, 0, CeladonCity_GameCorner_EventScript_16CA64 - bg_event 17, 6, 0, 3, 0, CeladonCity_GameCorner_EventScript_16CB6C - bg_event 17, 7, 0, 3, 0, CeladonCity_GameCorner_EventScript_16CA7C - bg_event 17, 8, 0, 3, 0, CeladonCity_GameCorner_EventScript_16CA88 - bg_event 17, 9, 0, 3, 0, CeladonCity_GameCorner_EventScript_16CA94 - bg_event 11, 1, 0, 0, 0, CeladonCity_GameCorner_EventScript_16CAAA - bg_event 17, 13, 0, 3, 0, CeladonCity_GameCorner_EventScript_1B2867 - -CeladonCity_GameCorner_MapEvents:: - map_events CeladonCity_GameCorner_EventObjects, CeladonCity_GameCorner_MapWarps, 0x0, CeladonCity_GameCorner_MapBGEvents diff --git a/data/maps/CeladonCity_GameCorner/header.inc b/data/maps/CeladonCity_GameCorner/header.inc deleted file mode 100644 index dde1f5a6d..000000000 --- a/data/maps/CeladonCity_GameCorner/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CeladonCity_GameCorner:: @ 8351370 - .4byte CeladonCity_GameCorner_Layout @ 0x82D7168 - .4byte CeladonCity_GameCorner_MapEvents @ 0x83BBB78 - .4byte CeladonCity_GameCorner_MapScripts @ 0x816C646 - .4byte NULL - .2byte BGM_FRLG_GAMECORNER - .2byte 27 - .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CeladonCity_GameCorner/map.json b/data/maps/CeladonCity_GameCorner/map.json new file mode 100644 index 000000000..fa2b1186a --- /dev/null +++ b/data/maps/CeladonCity_GameCorner/map.json @@ -0,0 +1,469 @@ +{ + "id": "MAP_CELADON_CITY_GAME_CORNER", + "name": "CeladonCity_GameCorner", + "layout": "LAYOUT_CELADON_CITY_GAME_CORNER", + "music": "BGM_FRLG_GAMECORNER", + "region_map_section": "MAPSEC_CELADON_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "48", + "x": 4, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_GameCorner_EventScript_16C684", + "flag": "0" + }, + { + "graphics_id": "47", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_GameCorner_EventScript_16C68D", + "flag": "0" + }, + { + "graphics_id": "30", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_GameCorner_EventScript_16C7BA", + "flag": "0" + }, + { + "graphics_id": "28", + "x": 1, + "y": 8, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_GameCorner_EventScript_16C7D7", + "flag": "0" + }, + { + "graphics_id": "57", + "x": 4, + "y": 7, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_GameCorner_EventScript_16C7E7", + "flag": "0" + }, + { + "graphics_id": "91", + "x": 7, + "y": 10, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_GameCorner_EventScript_16C857", + "flag": "0" + }, + { + "graphics_id": "23", + "x": 7, + "y": 8, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_GameCorner_EventScript_16C87E", + "flag": "0" + }, + { + "graphics_id": "33", + "x": 10, + "y": 9, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_GameCorner_EventScript_16C88E", + "flag": "0" + }, + { + "graphics_id": "55", + "x": 13, + "y": 7, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_GameCorner_EventScript_16C89E", + "flag": "0" + }, + { + "graphics_id": "61", + "x": 16, + "y": 10, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_GameCorner_EventScript_16C8FE", + "flag": "0" + }, + { + "graphics_id": "49", + "x": 11, + "y": 2, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_GameCorner_EventScript_16CAF5", + "flag": "91" + } + ], + "warp_events": [ + { + "x": 9, + "y": 13, + "elevation": 0, + "dest_map": "MAP_CELADON_CITY", + "dest_warp_id": 0 + }, + { + "x": 10, + "y": 13, + "elevation": 0, + "dest_map": "MAP_CELADON_CITY", + "dest_warp_id": 0 + }, + { + "x": 11, + "y": 13, + "elevation": 0, + "dest_map": "MAP_CELADON_CITY", + "dest_warp_id": 0 + }, + { + "x": 15, + "y": 2, + "elevation": 3, + "dest_map": "MAP_ROCKET_HIDEOUT_B1F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 2, + "y": 4, + "elevation": 3, + "item": "ITEM_NONE", + "flag": "51", + "unknown": 10 + }, + { + "type": "hidden_item", + "x": 3, + "y": 8, + "elevation": 3, + "item": "ITEM_NONE", + "flag": "52", + "unknown": 10 + }, + { + "type": "hidden_item", + "x": 2, + "y": 11, + "elevation": 3, + "item": "ITEM_NONE", + "flag": "53", + "unknown": 20 + }, + { + "type": "hidden_item", + "x": 6, + "y": 12, + "elevation": 3, + "item": "ITEM_NONE", + "flag": "54", + "unknown": 10 + }, + { + "type": "hidden_item", + "x": 9, + "y": 9, + "elevation": 3, + "item": "ITEM_NONE", + "flag": "55", + "unknown": 10 + }, + { + "type": "hidden_item", + "x": 8, + "y": 5, + "elevation": 3, + "item": "ITEM_NONE", + "flag": "56", + "unknown": 20 + }, + { + "type": "hidden_item", + "x": 10, + "y": 4, + "elevation": 3, + "item": "ITEM_NONE", + "flag": "57", + "unknown": 10 + }, + { + "type": "hidden_item", + "x": 13, + "y": 3, + "elevation": 3, + "item": "ITEM_NONE", + "flag": "58", + "unknown": 10 + }, + { + "type": "hidden_item", + "x": 15, + "y": 5, + "elevation": 3, + "item": "ITEM_NONE", + "flag": "59", + "unknown": 10 + }, + { + "type": "hidden_item", + "x": 17, + "y": 5, + "elevation": 3, + "item": "ITEM_NONE", + "flag": "60", + "unknown": 40 + }, + { + "type": "hidden_item", + "x": 15, + "y": 13, + "elevation": 3, + "item": "ITEM_NONE", + "flag": "61", + "unknown": 100 + }, + { + "type": "hidden_item", + "x": 12, + "y": 12, + "elevation": 3, + "item": "ITEM_NONE", + "flag": "62", + "unknown": 10 + }, + { + "type": "bg_event_type_4", + "x": 0, + "y": 7, + "elevation": 0, + "script": "CeladonCity_GameCorner_EventScript_16C95E" + }, + { + "type": "bg_event_type_4", + "x": 0, + "y": 9, + "elevation": 0, + "script": "CeladonCity_GameCorner_EventScript_16C9A4" + }, + { + "type": "bg_event_type_4", + "x": 0, + "y": 10, + "elevation": 0, + "script": "CeladonCity_GameCorner_EventScript_16C9B0" + }, + { + "type": "bg_event_type_3", + "x": 5, + "y": 6, + "elevation": 0, + "script": "CeladonCity_GameCorner_EventScript_16C9BC" + }, + { + "type": "bg_event_type_3", + "x": 5, + "y": 8, + "elevation": 0, + "script": "CeladonCity_GameCorner_EventScript_16CB5A" + }, + { + "type": "bg_event_type_3", + "x": 5, + "y": 9, + "elevation": 0, + "script": "CeladonCity_GameCorner_EventScript_16C9D4" + }, + { + "type": "bg_event_type_3", + "x": 5, + "y": 10, + "elevation": 0, + "script": "CeladonCity_GameCorner_EventScript_16C9E0" + }, + { + "type": "bg_event_type_4", + "x": 6, + "y": 6, + "elevation": 0, + "script": "CeladonCity_GameCorner_EventScript_16C9EC" + }, + { + "type": "bg_event_type_4", + "x": 6, + "y": 7, + "elevation": 0, + "script": "CeladonCity_GameCorner_EventScript_16C9F8" + }, + { + "type": "bg_event_type_4", + "x": 6, + "y": 9, + "elevation": 0, + "script": "CeladonCity_GameCorner_EventScript_16CA04" + }, + { + "type": "bg_event_type_3", + "x": 11, + "y": 6, + "elevation": 0, + "script": "CeladonCity_GameCorner_EventScript_16CA10" + }, + { + "type": "bg_event_type_3", + "x": 11, + "y": 7, + "elevation": 0, + "script": "CeladonCity_GameCorner_EventScript_16CA1C" + }, + { + "type": "bg_event_type_3", + "x": 11, + "y": 8, + "elevation": 0, + "script": "CeladonCity_GameCorner_EventScript_16CA28" + }, + { + "type": "bg_event_type_3", + "x": 11, + "y": 10, + "elevation": 0, + "script": "CeladonCity_GameCorner_EventScript_16CA34" + }, + { + "type": "bg_event_type_4", + "x": 12, + "y": 6, + "elevation": 0, + "script": "CeladonCity_GameCorner_EventScript_16CA40" + }, + { + "type": "bg_event_type_4", + "x": 12, + "y": 8, + "elevation": 0, + "script": "CeladonCity_GameCorner_EventScript_16CB63" + }, + { + "type": "bg_event_type_4", + "x": 12, + "y": 9, + "elevation": 0, + "script": "CeladonCity_GameCorner_EventScript_16CA58" + }, + { + "type": "bg_event_type_4", + "x": 12, + "y": 10, + "elevation": 0, + "script": "CeladonCity_GameCorner_EventScript_16CA64" + }, + { + "type": "bg_event_type_3", + "x": 17, + "y": 6, + "elevation": 0, + "script": "CeladonCity_GameCorner_EventScript_16CB6C" + }, + { + "type": "bg_event_type_3", + "x": 17, + "y": 7, + "elevation": 0, + "script": "CeladonCity_GameCorner_EventScript_16CA7C" + }, + { + "type": "bg_event_type_3", + "x": 17, + "y": 8, + "elevation": 0, + "script": "CeladonCity_GameCorner_EventScript_16CA88" + }, + { + "type": "bg_event_type_3", + "x": 17, + "y": 9, + "elevation": 0, + "script": "CeladonCity_GameCorner_EventScript_16CA94" + }, + { + "type": "bg_event_type_0", + "x": 11, + "y": 1, + "elevation": 0, + "script": "CeladonCity_GameCorner_EventScript_16CAAA" + }, + { + "type": "bg_event_type_3", + "x": 17, + "y": 13, + "elevation": 0, + "script": "CeladonCity_GameCorner_EventScript_1B2867" + } + ] +} \ No newline at end of file diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/events.inc b/data/maps/CeladonCity_GameCorner_PrizeRoom/events.inc deleted file mode 100644 index 21ec1b097..000000000 --- a/data/maps/CeladonCity_GameCorner_PrizeRoom/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -CeladonCity_GameCorner_PrizeRoom_EventObjects: - object_event 1, 30, 0, 2, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, CeladonCity_GameCorner_PrizeRoom_EventScript_16CB76, 0, 0, 0 - object_event 2, 33, 0, 6, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeladonCity_GameCorner_PrizeRoom_EventScript_16CB7F, 0, 0, 0 - object_event 3, 47, 0, 4, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeladonCity_GameCorner_PrizeRoom_EventScript_16CB88, 0, 0, 0 - object_event 4, 47, 0, 6, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeladonCity_GameCorner_PrizeRoom_EventScript_16CE1D, 0, 0, 0 - object_event 5, 47, 0, 2, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeladonCity_GameCorner_PrizeRoom_EventScript_16CF88, 0, 0, 0 - -CeladonCity_GameCorner_PrizeRoom_MapWarps: - warp_def 3, 9, 0, 5, 774 - warp_def 4, 8, 3, 5, 774 - warp_def 5, 9, 0, 5, 774 - -CeladonCity_GameCorner_PrizeRoom_MapEvents:: - map_events CeladonCity_GameCorner_PrizeRoom_EventObjects, CeladonCity_GameCorner_PrizeRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/header.inc b/data/maps/CeladonCity_GameCorner_PrizeRoom/header.inc deleted file mode 100644 index 4db3fedfb..000000000 --- a/data/maps/CeladonCity_GameCorner_PrizeRoom/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CeladonCity_GameCorner_PrizeRoom:: @ 835138C - .4byte CeladonCity_GameCorner_PrizeRoom_Layout @ 0x831B12C - .4byte CeladonCity_GameCorner_PrizeRoom_MapEvents @ 0x83BBC1C - .4byte CeladonCity_GameCorner_PrizeRoom_MapScripts @ 0x816CB75 - .4byte NULL - .2byte BGM_FRLG_CELADON_CITY - .2byte 189 - .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json b/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json new file mode 100644 index 000000000..b9247574a --- /dev/null +++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json @@ -0,0 +1,107 @@ +{ + "id": "MAP_CELADON_CITY_GAME_CORNER_PRIZE_ROOM", + "name": "CeladonCity_GameCorner_PrizeRoom", + "layout": "LAYOUT_CELADON_CITY_GAME_CORNER_PRIZE_ROOM", + "music": "BGM_FRLG_CELADON_CITY", + "region_map_section": "MAPSEC_CELADON_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "30", + "x": 2, + "y": 6, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_GameCorner_PrizeRoom_EventScript_16CB76", + "flag": "0" + }, + { + "graphics_id": "33", + "x": 6, + "y": 7, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_GameCorner_PrizeRoom_EventScript_16CB7F", + "flag": "0" + }, + { + "graphics_id": "47", + "x": 4, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_GameCorner_PrizeRoom_EventScript_16CB88", + "flag": "0" + }, + { + "graphics_id": "47", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_GameCorner_PrizeRoom_EventScript_16CE1D", + "flag": "0" + }, + { + "graphics_id": "47", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_GameCorner_PrizeRoom_EventScript_16CF88", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 9, + "elevation": 0, + "dest_map": "MAP_CELADON_CITY", + "dest_warp_id": 5 + }, + { + "x": 4, + "y": 8, + "elevation": 3, + "dest_map": "MAP_CELADON_CITY", + "dest_warp_id": 5 + }, + { + "x": 5, + "y": 9, + "elevation": 0, + "dest_map": "MAP_CELADON_CITY", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/CeladonCity_Gym/events.inc b/data/maps/CeladonCity_Gym/events.inc deleted file mode 100644 index d0ce2f383..000000000 --- a/data/maps/CeladonCity_Gym/events.inc +++ /dev/null @@ -1,24 +0,0 @@ -CeladonCity_Gym_EventObjects: - object_event 1, 22, 0, 3, 0, 11, 0, 3, 10, 17, 0, 1, 0, 3, 0, CeladonCity_Gym_EventScript_16D111, 0, 0, 0 - object_event 2, 29, 0, 9, 0, 10, 0, 3, 9, 17, 0, 1, 0, 3, 0, CeladonCity_Gym_EventScript_16D163, 0, 0, 0 - object_event 3, 40, 0, 10, 0, 7, 0, 3, 8, 17, 0, 1, 0, 2, 0, CeladonCity_Gym_EventScript_16D14C, 0, 0, 0 - object_event 4, 29, 0, 2, 0, 6, 0, 3, 8, 17, 0, 1, 0, 4, 0, CeladonCity_Gym_EventScript_16D17A, 0, 0, 0 - object_event 5, 29, 0, 5, 0, 4, 0, 3, 8, 17, 0, 1, 0, 3, 0, CeladonCity_Gym_EventScript_16D19E, 0, 0, 0 - object_event 6, 22, 0, 7, 0, 4, 0, 3, 8, 17, 0, 1, 0, 2, 0, CeladonCity_Gym_EventScript_16D128, 0, 0, 0 - object_event 7, 83, 0, 6, 0, 4, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeladonCity_Gym_EventScript_16D061, 0, 0, 0 - object_event 8, 42, 0, 8, 0, 7, 0, 3, 9, 17, 0, 1, 0, 2, 0, CeladonCity_Gym_EventScript_16D1B5, 0, 0, 0 - object_event 9, 95, 0, 6, 0, 8, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeladonCity_Gym_EventScript_1BDF13, 18, 0, 0 - object_event 10, 95, 0, 3, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeladonCity_Gym_EventScript_1BDF13, 19, 0, 0 - object_event 11, 95, 0, 9, 0, 6, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeladonCity_Gym_EventScript_1BDF13, 20, 0, 0 - -CeladonCity_Gym_MapWarps: - warp_def 5, 18, 3, 6, 774 - warp_def 6, 18, 3, 6, 774 - warp_def 7, 18, 3, 6, 774 - -CeladonCity_Gym_MapBGEvents: - bg_event 4, 16, 0, 0, 0, CeladonCity_Gym_EventScript_16D1CC - bg_event 8, 16, 0, 0, 0, CeladonCity_Gym_EventScript_16D1CC - -CeladonCity_Gym_MapEvents:: - map_events CeladonCity_Gym_EventObjects, CeladonCity_Gym_MapWarps, 0x0, CeladonCity_Gym_MapBGEvents diff --git a/data/maps/CeladonCity_Gym/header.inc b/data/maps/CeladonCity_Gym/header.inc deleted file mode 100644 index 59ca7c533..000000000 --- a/data/maps/CeladonCity_Gym/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CeladonCity_Gym:: @ 83513A8 - .4byte CeladonCity_Gym_Layout @ 0x82D6370 - .4byte CeladonCity_Gym_MapEvents @ 0x83BBD68 - .4byte CeladonCity_Gym_MapScripts @ 0x816D060 - .4byte NULL - .2byte BGM_FRLG_GYM - .2byte 15 - .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01 diff --git a/data/maps/CeladonCity_Gym/map.json b/data/maps/CeladonCity_Gym/map.json new file mode 100644 index 000000000..ae83a1571 --- /dev/null +++ b/data/maps/CeladonCity_Gym/map.json @@ -0,0 +1,200 @@ +{ + "id": "MAP_CELADON_CITY_GYM", + "name": "CeladonCity_Gym", + "layout": "LAYOUT_CELADON_CITY_GYM", + "music": "BGM_FRLG_GYM", + "region_map_section": "MAPSEC_CELADON_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_1", + "connections": null, + "object_events": [ + { + "graphics_id": "22", + "x": 3, + "y": 11, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "CeladonCity_Gym_EventScript_16D111", + "flag": "0" + }, + { + "graphics_id": "29", + "x": 9, + "y": 10, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "CeladonCity_Gym_EventScript_16D163", + "flag": "0" + }, + { + "graphics_id": "40", + "x": 10, + "y": 7, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "CeladonCity_Gym_EventScript_16D14C", + "flag": "0" + }, + { + "graphics_id": "29", + "x": 2, + "y": 6, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "CeladonCity_Gym_EventScript_16D17A", + "flag": "0" + }, + { + "graphics_id": "29", + "x": 5, + "y": 4, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "CeladonCity_Gym_EventScript_16D19E", + "flag": "0" + }, + { + "graphics_id": "22", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "CeladonCity_Gym_EventScript_16D128", + "flag": "0" + }, + { + "graphics_id": "83", + "x": 6, + "y": 4, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_Gym_EventScript_16D061", + "flag": "0" + }, + { + "graphics_id": "42", + "x": 8, + "y": 7, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "CeladonCity_Gym_EventScript_16D1B5", + "flag": "0" + }, + { + "graphics_id": "95", + "x": 6, + "y": 8, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_Gym_EventScript_1BDF13", + "flag": "18" + }, + { + "graphics_id": "95", + "x": 3, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_Gym_EventScript_1BDF13", + "flag": "19" + }, + { + "graphics_id": "95", + "x": 9, + "y": 6, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_Gym_EventScript_1BDF13", + "flag": "20" + } + ], + "warp_events": [ + { + "x": 5, + "y": 18, + "elevation": 3, + "dest_map": "MAP_CELADON_CITY", + "dest_warp_id": 6 + }, + { + "x": 6, + "y": 18, + "elevation": 3, + "dest_map": "MAP_CELADON_CITY", + "dest_warp_id": 6 + }, + { + "x": 7, + "y": 18, + "elevation": 3, + "dest_map": "MAP_CELADON_CITY", + "dest_warp_id": 6 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 4, + "y": 16, + "elevation": 0, + "script": "CeladonCity_Gym_EventScript_16D1CC" + }, + { + "type": "bg_event_type_0", + "x": 8, + "y": 16, + "elevation": 0, + "script": "CeladonCity_Gym_EventScript_16D1CC" + } + ] +} \ No newline at end of file diff --git a/data/maps/CeladonCity_Hotel/events.inc b/data/maps/CeladonCity_Hotel/events.inc deleted file mode 100644 index f1b778a97..000000000 --- a/data/maps/CeladonCity_Hotel/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -CeladonCity_Hotel_EventObjects: - object_event 1, 35, 0, 5, 0, 4, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeladonCity_Hotel_EventScript_16D284, 0, 0, 0 - object_event 2, 29, 0, 3, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeladonCity_Hotel_EventScript_16D28D, 0, 0, 0 - object_event 3, 25, 0, 9, 0, 7, 0, 3, 5, 17, 0, 0, 0, 0, 0, CeladonCity_Hotel_EventScript_16D296, 0, 0, 0 - object_event 4, 16, 0, 2, 0, 6, 0, 3, 10, 17, 0, 0, 0, 0, 0, CeladonCity_Hotel_EventScript_16D29F, 0, 0, 0 - -CeladonCity_Hotel_MapWarps: - warp_def 3, 10, 0, 9, 774 - warp_def 4, 9, 0, 9, 774 - warp_def 5, 10, 0, 9, 774 - -CeladonCity_Hotel_MapEvents:: - map_events CeladonCity_Hotel_EventObjects, CeladonCity_Hotel_MapWarps, 0x0, 0x0 diff --git a/data/maps/CeladonCity_Hotel/header.inc b/data/maps/CeladonCity_Hotel/header.inc deleted file mode 100644 index b9aecb9a8..000000000 --- a/data/maps/CeladonCity_Hotel/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CeladonCity_Hotel:: @ 83513FC - .4byte CeladonCity_Hotel_Layout @ 0x831B438 - .4byte CeladonCity_Hotel_MapEvents @ 0x83BBF0C - .4byte CeladonCity_Hotel_MapScripts @ 0x816D283 - .4byte NULL - .2byte BGM_FRLG_CELADON_CITY - .2byte 191 - .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CeladonCity_Hotel/map.json b/data/maps/CeladonCity_Hotel/map.json new file mode 100644 index 000000000..85d79e8bc --- /dev/null +++ b/data/maps/CeladonCity_Hotel/map.json @@ -0,0 +1,94 @@ +{ + "id": "MAP_CELADON_CITY_HOTEL", + "name": "CeladonCity_Hotel", + "layout": "LAYOUT_CELADON_CITY_HOTEL", + "music": "BGM_FRLG_CELADON_CITY", + "region_map_section": "MAPSEC_CELADON_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "35", + "x": 5, + "y": 4, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_Hotel_EventScript_16D284", + "flag": "0" + }, + { + "graphics_id": "29", + "x": 3, + "y": 6, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_Hotel_EventScript_16D28D", + "flag": "0" + }, + { + "graphics_id": "25", + "x": 9, + "y": 7, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_Hotel_EventScript_16D296", + "flag": "0" + }, + { + "graphics_id": "16", + "x": 2, + "y": 6, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_Hotel_EventScript_16D29F", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 10, + "elevation": 0, + "dest_map": "MAP_CELADON_CITY", + "dest_warp_id": 9 + }, + { + "x": 4, + "y": 9, + "elevation": 0, + "dest_map": "MAP_CELADON_CITY", + "dest_warp_id": 9 + }, + { + "x": 5, + "y": 10, + "elevation": 0, + "dest_map": "MAP_CELADON_CITY", + "dest_warp_id": 9 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/CeladonCity_House1/events.inc b/data/maps/CeladonCity_House1/events.inc deleted file mode 100644 index 16b10fbfe..000000000 --- a/data/maps/CeladonCity_House1/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -CeladonCity_House1_EventObjects: - object_event 1, 33, 0, 5, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeladonCity_House1_EventScript_16D268, 0, 0, 0 - object_event 2, 49, 0, 2, 0, 4, 0, 3, 3, 81, 0, 0, 0, 0, 0, CeladonCity_House1_EventScript_16D271, 0, 0, 0 - object_event 3, 49, 0, 8, 0, 4, 0, 3, 3, 81, 0, 0, 0, 0, 0, CeladonCity_House1_EventScript_16D27A, 0, 0, 0 - -CeladonCity_House1_MapWarps: - warp_def 3, 7, 3, 8, 774 - warp_def 4, 7, 3, 8, 774 - warp_def 5, 7, 3, 8, 774 - -CeladonCity_House1_MapEvents:: - map_events CeladonCity_House1_EventObjects, CeladonCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/CeladonCity_House1/header.inc b/data/maps/CeladonCity_House1/header.inc deleted file mode 100644 index 6b0b740f1..000000000 --- a/data/maps/CeladonCity_House1/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CeladonCity_House1:: @ 83513E0 - .4byte House5_Layout @ 0x82D6AF0 - .4byte CeladonCity_House1_MapEvents @ 0x83BBE80 - .4byte CeladonCity_House1_MapScripts @ 0x816D267 - .4byte NULL - .2byte BGM_FRLG_CELADON_CITY - .2byte 21 - .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CeladonCity_House1/map.json b/data/maps/CeladonCity_House1/map.json new file mode 100644 index 000000000..58d6ee590 --- /dev/null +++ b/data/maps/CeladonCity_House1/map.json @@ -0,0 +1,81 @@ +{ + "id": "MAP_CELADON_CITY_HOUSE1", + "name": "CeladonCity_House1", + "layout": "LAYOUT_HOUSE5", + "music": "BGM_FRLG_CELADON_CITY", + "region_map_section": "MAPSEC_CELADON_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "33", + "x": 5, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_House1_EventScript_16D268", + "flag": "0" + }, + { + "graphics_id": "49", + "x": 2, + "y": 4, + "elevation": 3, + "movement_type": "3", + "movement_range_x": 1, + "movement_range_y": 5, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_House1_EventScript_16D271", + "flag": "0" + }, + { + "graphics_id": "49", + "x": 8, + "y": 4, + "elevation": 3, + "movement_type": "3", + "movement_range_x": 1, + "movement_range_y": 5, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_House1_EventScript_16D27A", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 3, + "dest_map": "MAP_CELADON_CITY", + "dest_warp_id": 8 + }, + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_CELADON_CITY", + "dest_warp_id": 8 + }, + { + "x": 5, + "y": 7, + "elevation": 3, + "dest_map": "MAP_CELADON_CITY", + "dest_warp_id": 8 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/CeladonCity_PokemonCenter_1F/events.inc b/data/maps/CeladonCity_PokemonCenter_1F/events.inc deleted file mode 100644 index 5817e704e..000000000 --- a/data/maps/CeladonCity_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -CeladonCity_PokemonCenter_1F_EventObjects: - object_event 1, 64, 0, 7, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeladonCity_PokemonCenter_1F_EventScript_16C5FB, 0, 0, 0 - object_event 2, 61, 0, 4, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeladonCity_PokemonCenter_1F_EventScript_16C604, 0, 0, 0 - object_event 3, 42, 0, 10, 0, 6, 0, 3, 5, 18, 0, 0, 0, 0, 0, CeladonCity_PokemonCenter_1F_EventScript_16C60D, 0, 0, 0 - object_event 4, 18, 0, 12, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeladonCity_PokemonCenter_1F_EventScript_16C616, 0, 0, 0 - -CeladonCity_PokemonCenter_1F_MapWarps: - warp_def 6, 8, 3, 4, 774 - warp_def 7, 8, 3, 4, 774 - warp_def 8, 8, 3, 4, 774 - warp_def 1, 6, 4, 0, 2573 - -CeladonCity_PokemonCenter_1F_MapEvents:: - map_events CeladonCity_PokemonCenter_1F_EventObjects, CeladonCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/CeladonCity_PokemonCenter_1F/header.inc b/data/maps/CeladonCity_PokemonCenter_1F/header.inc deleted file mode 100644 index 5875a816d..000000000 --- a/data/maps/CeladonCity_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CeladonCity_PokemonCenter_1F:: @ 8351338 - .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte CeladonCity_PokemonCenter_1F_MapEvents @ 0x83BB800 - .4byte CeladonCity_PokemonCenter_1F_MapScripts @ 0x816C5EC - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 8 - .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CeladonCity_PokemonCenter_1F/map.json b/data/maps/CeladonCity_PokemonCenter_1F/map.json new file mode 100644 index 000000000..717206847 --- /dev/null +++ b/data/maps/CeladonCity_PokemonCenter_1F/map.json @@ -0,0 +1,101 @@ +{ + "id": "MAP_CELADON_CITY_POKEMON_CENTER_1F", + "name": "CeladonCity_PokemonCenter_1F", + "layout": "LAYOUT_POKEMON_CENTER_1F", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_CELADON_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "64", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_PokemonCenter_1F_EventScript_16C5FB", + "flag": "0" + }, + { + "graphics_id": "61", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_PokemonCenter_1F_EventScript_16C604", + "flag": "0" + }, + { + "graphics_id": "42", + "x": 10, + "y": 6, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_PokemonCenter_1F_EventScript_16C60D", + "flag": "0" + }, + { + "graphics_id": "18", + "x": 12, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_PokemonCenter_1F_EventScript_16C616", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_CELADON_CITY", + "dest_warp_id": 4 + }, + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_CELADON_CITY", + "dest_warp_id": 4 + }, + { + "x": 8, + "y": 8, + "elevation": 3, + "dest_map": "MAP_CELADON_CITY", + "dest_warp_id": 4 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_CELADON_CITY_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/CeladonCity_PokemonCenter_2F/events.inc b/data/maps/CeladonCity_PokemonCenter_2F/events.inc deleted file mode 100644 index 9bed66116..000000000 --- a/data/maps/CeladonCity_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -CeladonCity_PokemonCenter_2F_EventObjects: - object_event 1, 65, 0, 6, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, CeladonCity_PokemonCenter_2F_EventScript_1A8CF6, 0, 0, 0 - object_event 2, 65, 0, 2, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, CeladonCity_PokemonCenter_2F_EventScript_1A8CFC, 0, 0, 0 - object_event 3, 65, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, CeladonCity_PokemonCenter_2F_EventScript_1A8D02, 0, 0, 0 - object_event 4, 69, 0, 1, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeladonCity_PokemonCenter_2F_EventScript_1BB1D2, 112, 0, 0 - -CeladonCity_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 3, 2572 - warp_def 5, 1, 0, 0, 4 - warp_def 9, 1, 0, 0, 1 - -CeladonCity_PokemonCenter_2F_MapEvents:: - map_events CeladonCity_PokemonCenter_2F_EventObjects, CeladonCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/CeladonCity_PokemonCenter_2F/header.inc b/data/maps/CeladonCity_PokemonCenter_2F/header.inc deleted file mode 100644 index 217db66f2..000000000 --- a/data/maps/CeladonCity_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CeladonCity_PokemonCenter_2F:: @ 8351354 - .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte CeladonCity_PokemonCenter_2F_MapEvents @ 0x83BB88C - .4byte CeladonCity_PokemonCenter_2F_MapScripts @ 0x816C61F - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 9 - .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CeladonCity_PokemonCenter_2F/map.json b/data/maps/CeladonCity_PokemonCenter_2F/map.json new file mode 100644 index 000000000..89358eaa6 --- /dev/null +++ b/data/maps/CeladonCity_PokemonCenter_2F/map.json @@ -0,0 +1,94 @@ +{ + "id": "MAP_CELADON_CITY_POKEMON_CENTER_2F", + "name": "CeladonCity_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_CELADON_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "65", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_PokemonCenter_2F_EventScript_1A8CF6", + "flag": "0" + }, + { + "graphics_id": "65", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_PokemonCenter_2F_EventScript_1A8CFC", + "flag": "0" + }, + { + "graphics_id": "65", + "x": 10, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_PokemonCenter_2F_EventScript_1A8D02", + "flag": "0" + }, + { + "graphics_id": "69", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_PokemonCenter_2F_EventScript_1BB1D2", + "flag": "112" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_CELADON_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 3 + }, + { + "x": 5, + "y": 1, + "elevation": 0, + "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 0, + "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/CeladonCity_Restaurant/events.inc b/data/maps/CeladonCity_Restaurant/events.inc deleted file mode 100644 index 02a232d32..000000000 --- a/data/maps/CeladonCity_Restaurant/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -CeladonCity_Restaurant_EventObjects: - object_event 1, 59, 0, 12, 0, 7, 0, 3, 5, 18, 0, 0, 0, 0, 0, CeladonCity_Restaurant_EventScript_16D1EB, 0, 0, 0 - object_event 2, 28, 0, 11, 0, 4, 0, 3, 3, 33, 0, 0, 0, 0, 0, CeladonCity_Restaurant_EventScript_16D1F4, 0, 0, 0 - object_event 3, 27, 0, 9, 0, 4, 0, 3, 10, 17, 0, 0, 0, 0, 0, CeladonCity_Restaurant_EventScript_16D25E, 0, 0, 0 - object_event 4, 30, 0, 1, 0, 2, 0, 0, 8, 17, 0, 0, 0, 0, 0, CeladonCity_Restaurant_EventScript_16D1FD, 0, 0, 0 - object_event 5, 47, 0, 3, 0, 7, 0, 0, 9, 17, 0, 0, 0, 0, 0, CeladonCity_Restaurant_EventScript_16D255, 0, 0, 0 - -CeladonCity_Restaurant_MapWarps: - warp_def 5, 9, 0, 7, 774 - warp_def 6, 9, 0, 7, 774 - warp_def 7, 9, 0, 7, 774 - -CeladonCity_Restaurant_MapEvents:: - map_events CeladonCity_Restaurant_EventObjects, CeladonCity_Restaurant_MapWarps, 0x0, 0x0 diff --git a/data/maps/CeladonCity_Restaurant/header.inc b/data/maps/CeladonCity_Restaurant/header.inc deleted file mode 100644 index 2bd3f3867..000000000 --- a/data/maps/CeladonCity_Restaurant/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CeladonCity_Restaurant:: @ 83513C4 - .4byte CeladonCity_Restaurant_Layout @ 0x831B29C - .4byte CeladonCity_Restaurant_MapEvents @ 0x83BBE0C - .4byte CeladonCity_Restaurant_MapScripts @ 0x816D1EA - .4byte NULL - .2byte BGM_FRLG_CELADON_CITY - .2byte 190 - .byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CeladonCity_Restaurant/map.json b/data/maps/CeladonCity_Restaurant/map.json new file mode 100644 index 000000000..284856350 --- /dev/null +++ b/data/maps/CeladonCity_Restaurant/map.json @@ -0,0 +1,107 @@ +{ + "id": "MAP_CELADON_CITY_RESTAURANT", + "name": "CeladonCity_Restaurant", + "layout": "LAYOUT_CELADON_CITY_RESTAURANT", + "music": "BGM_FRLG_CELADON_CITY", + "region_map_section": "MAPSEC_CELADON_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "59", + "x": 12, + "y": 7, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_Restaurant_EventScript_16D1EB", + "flag": "0" + }, + { + "graphics_id": "28", + "x": 11, + "y": 4, + "elevation": 3, + "movement_type": "3", + "movement_range_x": 1, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_Restaurant_EventScript_16D1F4", + "flag": "0" + }, + { + "graphics_id": "27", + "x": 9, + "y": 4, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_Restaurant_EventScript_16D25E", + "flag": "0" + }, + { + "graphics_id": "30", + "x": 1, + "y": 2, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_Restaurant_EventScript_16D1FD", + "flag": "0" + }, + { + "graphics_id": "47", + "x": 3, + "y": 7, + "elevation": 0, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeladonCity_Restaurant_EventScript_16D255", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 5, + "y": 9, + "elevation": 0, + "dest_map": "MAP_CELADON_CITY", + "dest_warp_id": 7 + }, + { + "x": 6, + "y": 9, + "elevation": 0, + "dest_map": "MAP_CELADON_CITY", + "dest_warp_id": 7 + }, + { + "x": 7, + "y": 9, + "elevation": 0, + "dest_map": "MAP_CELADON_CITY", + "dest_warp_id": 7 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/CeruleanCave_1F/events.inc b/data/maps/CeruleanCave_1F/events.inc deleted file mode 100644 index 82c1c55e7..000000000 --- a/data/maps/CeruleanCave_1F/events.inc +++ /dev/null @@ -1,26 +0,0 @@ -CeruleanCave_1F_EventObjects: - object_event 1, 92, 0, 7, 0, 3, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeruleanCave_1F_EventScript_1BEA47, 434, 0, 0 - object_event 2, 92, 0, 11, 0, 16, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeruleanCave_1F_EventScript_1BEA54, 435, 0, 0 - object_event 3, 92, 0, 25, 0, 5, 0, 4, 8, 17, 0, 0, 0, 0, 0, CeruleanCave_1F_EventScript_1BEA3A, 433, 0, 0 - object_event 4, 96, 0, 7, 0, 21, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeruleanCave_1F_EventScript_1BE00C, 18, 0, 0 - object_event 5, 96, 0, 13, 0, 21, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeruleanCave_1F_EventScript_1BE00C, 19, 0, 0 - object_event 6, 96, 0, 5, 0, 20, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeruleanCave_1F_EventScript_1BE00C, 20, 0, 0 - object_event 7, 96, 0, 14, 0, 20, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeruleanCave_1F_EventScript_1BE00C, 21, 0, 0 - object_event 8, 96, 0, 11, 0, 21, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeruleanCave_1F_EventScript_1BE00C, 22, 0, 0 - object_event 9, 96, 0, 9, 0, 18, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeruleanCave_1F_EventScript_1BE00C, 23, 0, 0 - -CeruleanCave_1F_MapWarps: - warp_def 33, 21, 3, 7, 771 - warp_def 34, 2, 3, 0, 329 - warp_def 1, 7, 3, 0, 330 - warp_def 10, 2, 3, 1, 329 - warp_def 5, 15, 3, 2, 329 - warp_def 30, 10, 4, 3, 329 - warp_def 24, 11, 3, 4, 329 - warp_def 2, 4, 3, 5, 329 - -CeruleanCave_1F_MapBGEvents: - bg_event 12, 2, 3, 7, 0, 2, 39, 1 - -CeruleanCave_1F_MapEvents:: - map_events CeruleanCave_1F_EventObjects, CeruleanCave_1F_MapWarps, 0x0, CeruleanCave_1F_MapBGEvents diff --git a/data/maps/CeruleanCave_1F/header.inc b/data/maps/CeruleanCave_1F/header.inc deleted file mode 100644 index 9bedd6dd6..000000000 --- a/data/maps/CeruleanCave_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CeruleanCave_1F:: @ 834F9F4 - .4byte CeruleanCave_1F_Layout @ 0x8311318 - .4byte CeruleanCave_1F_MapEvents @ 0x83B15BC - .4byte CeruleanCave_1F_MapScripts @ 0x81624B3 - .4byte NULL - .2byte BGM_FRLG_ROCKET_HIDEOUT - .2byte 151 - .byte 0x8d, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/CeruleanCave_1F/map.json b/data/maps/CeruleanCave_1F/map.json new file mode 100644 index 000000000..36bd0b680 --- /dev/null +++ b/data/maps/CeruleanCave_1F/map.json @@ -0,0 +1,204 @@ +{ + "id": "MAP_CERULEAN_CAVE_1F", + "name": "CeruleanCave_1F", + "layout": "LAYOUT_CERULEAN_CAVE_1F", + "music": "BGM_FRLG_ROCKET_HIDEOUT", + "region_map_section": "MAPSEC_CERULEAN_CAVE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "92", + "x": 7, + "y": 3, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCave_1F_EventScript_1BEA47", + "flag": "434" + }, + { + "graphics_id": "92", + "x": 11, + "y": 16, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCave_1F_EventScript_1BEA54", + "flag": "435" + }, + { + "graphics_id": "92", + "x": 25, + "y": 5, + "elevation": 4, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCave_1F_EventScript_1BEA3A", + "flag": "433" + }, + { + "graphics_id": "96", + "x": 7, + "y": 21, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCave_1F_EventScript_1BE00C", + "flag": "18" + }, + { + "graphics_id": "96", + "x": 13, + "y": 21, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCave_1F_EventScript_1BE00C", + "flag": "19" + }, + { + "graphics_id": "96", + "x": 5, + "y": 20, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCave_1F_EventScript_1BE00C", + "flag": "20" + }, + { + "graphics_id": "96", + "x": 14, + "y": 20, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCave_1F_EventScript_1BE00C", + "flag": "21" + }, + { + "graphics_id": "96", + "x": 11, + "y": 21, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCave_1F_EventScript_1BE00C", + "flag": "22" + }, + { + "graphics_id": "96", + "x": 9, + "y": 18, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCave_1F_EventScript_1BE00C", + "flag": "23" + } + ], + "warp_events": [ + { + "x": 33, + "y": 21, + "elevation": 3, + "dest_map": "MAP_CERULEAN_CITY", + "dest_warp_id": 7 + }, + { + "x": 34, + "y": 2, + "elevation": 3, + "dest_map": "MAP_CERULEAN_CAVE_2F", + "dest_warp_id": 0 + }, + { + "x": 1, + "y": 7, + "elevation": 3, + "dest_map": "MAP_CERULEAN_CAVE_B1F", + "dest_warp_id": 0 + }, + { + "x": 10, + "y": 2, + "elevation": 3, + "dest_map": "MAP_CERULEAN_CAVE_2F", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 15, + "elevation": 3, + "dest_map": "MAP_CERULEAN_CAVE_2F", + "dest_warp_id": 2 + }, + { + "x": 30, + "y": 10, + "elevation": 4, + "dest_map": "MAP_CERULEAN_CAVE_2F", + "dest_warp_id": 3 + }, + { + "x": 24, + "y": 11, + "elevation": 3, + "dest_map": "MAP_CERULEAN_CAVE_2F", + "dest_warp_id": 4 + }, + { + "x": 2, + "y": 4, + "elevation": 3, + "dest_map": "MAP_CERULEAN_CAVE_2F", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 12, + "y": 2, + "elevation": 3, + "item": "POCKET_KEY_ITEMS", + "flag": "39", + "unknown": 1 + } + ] +} \ No newline at end of file diff --git a/data/maps/CeruleanCave_2F/events.inc b/data/maps/CeruleanCave_2F/events.inc deleted file mode 100644 index c1218da0a..000000000 --- a/data/maps/CeruleanCave_2F/events.inc +++ /dev/null @@ -1,25 +0,0 @@ -CeruleanCave_2F_EventObjects: - object_event 1, 92, 0, 9, 0, 18, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeruleanCave_2F_EventScript_1BEA6E, 437, 0, 0 - object_event 2, 92, 0, 29, 0, 16, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeruleanCave_2F_EventScript_1BEA7B, 438, 0, 0 - object_event 3, 92, 0, 33, 0, 12, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeruleanCave_2F_EventScript_1BEA61, 436, 0, 0 - object_event 4, 96, 0, 33, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeruleanCave_2F_EventScript_1BE00C, 18, 0, 0 - object_event 5, 96, 0, 33, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeruleanCave_2F_EventScript_1BE00C, 19, 0, 0 - object_event 6, 96, 0, 25, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeruleanCave_2F_EventScript_1BE00C, 20, 0, 0 - object_event 7, 96, 0, 28, 0, 20, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeruleanCave_2F_EventScript_1BE00C, 21, 0, 0 - object_event 8, 96, 0, 30, 0, 20, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeruleanCave_2F_EventScript_1BE00C, 22, 0, 0 - object_event 9, 96, 0, 9, 0, 13, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeruleanCave_2F_EventScript_1BE00C, 23, 0, 0 - object_event 10, 96, 0, 23, 0, 16, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeruleanCave_2F_EventScript_1BE00C, 24, 0, 0 - object_event 11, 96, 0, 13, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeruleanCave_2F_EventScript_1BE00C, 25, 0, 0 - object_event 12, 96, 0, 4, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeruleanCave_2F_EventScript_1BE00C, 26, 0, 0 - object_event 13, 96, 0, 10, 0, 20, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeruleanCave_2F_EventScript_1BE00C, 27, 0, 0 - -CeruleanCave_2F_MapWarps: - warp_def 33, 4, 3, 1, 328 - warp_def 13, 4, 3, 3, 328 - warp_def 7, 14, 3, 4, 328 - warp_def 26, 9, 3, 5, 328 - warp_def 23, 10, 3, 6, 328 - warp_def 5, 6, 3, 7, 328 - -CeruleanCave_2F_MapEvents:: - map_events CeruleanCave_2F_EventObjects, CeruleanCave_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/CeruleanCave_2F/header.inc b/data/maps/CeruleanCave_2F/header.inc deleted file mode 100644 index 37e25ef1b..000000000 --- a/data/maps/CeruleanCave_2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CeruleanCave_2F:: @ 834FA10 - .4byte CeruleanCave_2F_Layout @ 0x8311A6C - .4byte CeruleanCave_2F_MapEvents @ 0x83B1738 - .4byte CeruleanCave_2F_MapScripts @ 0x81624BD - .4byte NULL - .2byte BGM_FRLG_ROCKET_HIDEOUT - .2byte 152 - .byte 0x8d, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/CeruleanCave_2F/map.json b/data/maps/CeruleanCave_2F/map.json new file mode 100644 index 000000000..061e13cc3 --- /dev/null +++ b/data/maps/CeruleanCave_2F/map.json @@ -0,0 +1,232 @@ +{ + "id": "MAP_CERULEAN_CAVE_2F", + "name": "CeruleanCave_2F", + "layout": "LAYOUT_CERULEAN_CAVE_2F", + "music": "BGM_FRLG_ROCKET_HIDEOUT", + "region_map_section": "MAPSEC_CERULEAN_CAVE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "92", + "x": 9, + "y": 18, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCave_2F_EventScript_1BEA6E", + "flag": "437" + }, + { + "graphics_id": "92", + "x": 29, + "y": 16, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCave_2F_EventScript_1BEA7B", + "flag": "438" + }, + { + "graphics_id": "92", + "x": 33, + "y": 12, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCave_2F_EventScript_1BEA61", + "flag": "436" + }, + { + "graphics_id": "96", + "x": 33, + "y": 10, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCave_2F_EventScript_1BE00C", + "flag": "18" + }, + { + "graphics_id": "96", + "x": 33, + "y": 9, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCave_2F_EventScript_1BE00C", + "flag": "19" + }, + { + "graphics_id": "96", + "x": 25, + "y": 11, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCave_2F_EventScript_1BE00C", + "flag": "20" + }, + { + "graphics_id": "96", + "x": 28, + "y": 20, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCave_2F_EventScript_1BE00C", + "flag": "21" + }, + { + "graphics_id": "96", + "x": 30, + "y": 20, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCave_2F_EventScript_1BE00C", + "flag": "22" + }, + { + "graphics_id": "96", + "x": 9, + "y": 13, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCave_2F_EventScript_1BE00C", + "flag": "23" + }, + { + "graphics_id": "96", + "x": 23, + "y": 16, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCave_2F_EventScript_1BE00C", + "flag": "24" + }, + { + "graphics_id": "96", + "x": 13, + "y": 6, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCave_2F_EventScript_1BE00C", + "flag": "25" + }, + { + "graphics_id": "96", + "x": 4, + "y": 12, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCave_2F_EventScript_1BE00C", + "flag": "26" + }, + { + "graphics_id": "96", + "x": 10, + "y": 20, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCave_2F_EventScript_1BE00C", + "flag": "27" + } + ], + "warp_events": [ + { + "x": 33, + "y": 4, + "elevation": 3, + "dest_map": "MAP_CERULEAN_CAVE_1F", + "dest_warp_id": 1 + }, + { + "x": 13, + "y": 4, + "elevation": 3, + "dest_map": "MAP_CERULEAN_CAVE_1F", + "dest_warp_id": 3 + }, + { + "x": 7, + "y": 14, + "elevation": 3, + "dest_map": "MAP_CERULEAN_CAVE_1F", + "dest_warp_id": 4 + }, + { + "x": 26, + "y": 9, + "elevation": 3, + "dest_map": "MAP_CERULEAN_CAVE_1F", + "dest_warp_id": 5 + }, + { + "x": 23, + "y": 10, + "elevation": 3, + "dest_map": "MAP_CERULEAN_CAVE_1F", + "dest_warp_id": 6 + }, + { + "x": 5, + "y": 6, + "elevation": 3, + "dest_map": "MAP_CERULEAN_CAVE_1F", + "dest_warp_id": 7 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/CeruleanCave_B1F/events.inc b/data/maps/CeruleanCave_B1F/events.inc deleted file mode 100644 index 0febe9996..000000000 --- a/data/maps/CeruleanCave_B1F/events.inc +++ /dev/null @@ -1,19 +0,0 @@ -CeruleanCave_B1F_EventObjects: - object_event 1, 92, 0, 31, 0, 9, 0, 4, 8, 17, 0, 0, 0, 0, 0, CeruleanCave_B1F_EventScript_1BEA95, 440, 0, 0 - object_event 2, 92, 0, 32, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeruleanCave_B1F_EventScript_1BEA88, 439, 0, 0 - object_event 3, 139, 0, 7, 0, 12, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeruleanCave_B1F_EventScript_1624F5, 129, 0, 0 - object_event 4, 96, 0, 37, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeruleanCave_B1F_EventScript_1BE00C, 18, 0, 0 - object_event 5, 96, 0, 38, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeruleanCave_B1F_EventScript_1BE00C, 19, 0, 0 - object_event 6, 96, 0, 35, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeruleanCave_B1F_EventScript_1BE00C, 20, 0, 0 - object_event 7, 96, 0, 37, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeruleanCave_B1F_EventScript_1BE00C, 21, 0, 0 - object_event 8, 96, 0, 35, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeruleanCave_B1F_EventScript_1BE00C, 22, 0, 0 - object_event 9, 96, 0, 2, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeruleanCave_B1F_EventScript_1BE00C, 23, 0, 0 - object_event 10, 96, 0, 4, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeruleanCave_B1F_EventScript_1BE00C, 24, 0, 0 - object_event 11, 96, 0, 6, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeruleanCave_B1F_EventScript_1BE00C, 25, 0, 0 - object_event 12, 96, 0, 3, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeruleanCave_B1F_EventScript_1BE00C, 26, 0, 0 - -CeruleanCave_B1F_MapWarps: - warp_def 5, 7, 3, 2, 328 - -CeruleanCave_B1F_MapEvents:: - map_events CeruleanCave_B1F_EventObjects, CeruleanCave_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/CeruleanCave_B1F/header.inc b/data/maps/CeruleanCave_B1F/header.inc deleted file mode 100644 index 88608f654..000000000 --- a/data/maps/CeruleanCave_B1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CeruleanCave_B1F:: @ 834FA2C - .4byte CeruleanCave_B1F_Layout @ 0x83121C0 - .4byte CeruleanCave_B1F_MapEvents @ 0x83B1874 - .4byte CeruleanCave_B1F_MapScripts @ 0x81624BE - .4byte NULL - .2byte BGM_FRLG_ROCKET_HIDEOUT - .2byte 153 - .byte 0x8d, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/CeruleanCave_B1F/map.json b/data/maps/CeruleanCave_B1F/map.json new file mode 100644 index 000000000..44447c387 --- /dev/null +++ b/data/maps/CeruleanCave_B1F/map.json @@ -0,0 +1,184 @@ +{ + "id": "MAP_CERULEAN_CAVE_B1F", + "name": "CeruleanCave_B1F", + "layout": "LAYOUT_CERULEAN_CAVE_B1F", + "music": "BGM_FRLG_ROCKET_HIDEOUT", + "region_map_section": "MAPSEC_CERULEAN_CAVE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "92", + "x": 31, + "y": 9, + "elevation": 4, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCave_B1F_EventScript_1BEA95", + "flag": "440" + }, + { + "graphics_id": "92", + "x": 32, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCave_B1F_EventScript_1BEA88", + "flag": "439" + }, + { + "graphics_id": "139", + "x": 7, + "y": 12, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCave_B1F_EventScript_1624F5", + "flag": "129" + }, + { + "graphics_id": "96", + "x": 37, + "y": 1, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCave_B1F_EventScript_1BE00C", + "flag": "18" + }, + { + "graphics_id": "96", + "x": 38, + "y": 2, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCave_B1F_EventScript_1BE00C", + "flag": "19" + }, + { + "graphics_id": "96", + "x": 35, + "y": 1, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCave_B1F_EventScript_1BE00C", + "flag": "20" + }, + { + "graphics_id": "96", + "x": 37, + "y": 4, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCave_B1F_EventScript_1BE00C", + "flag": "21" + }, + { + "graphics_id": "96", + "x": 35, + "y": 5, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCave_B1F_EventScript_1BE00C", + "flag": "22" + }, + { + "graphics_id": "96", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCave_B1F_EventScript_1BE00C", + "flag": "23" + }, + { + "graphics_id": "96", + "x": 4, + "y": 1, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCave_B1F_EventScript_1BE00C", + "flag": "24" + }, + { + "graphics_id": "96", + "x": 6, + "y": 1, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCave_B1F_EventScript_1BE00C", + "flag": "25" + }, + { + "graphics_id": "96", + "x": 3, + "y": 4, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCave_B1F_EventScript_1BE00C", + "flag": "26" + } + ], + "warp_events": [ + { + "x": 5, + "y": 7, + "elevation": 3, + "dest_map": "MAP_CERULEAN_CAVE_1F", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/CeruleanCity/connections.inc b/data/maps/CeruleanCity/connections.inc deleted file mode 100644 index 2372d32c0..000000000 --- a/data/maps/CeruleanCity/connections.inc +++ /dev/null @@ -1,9 +0,0 @@ -CeruleanCity_MapConnectionsList: @ 83527C0 - connection up, 12, MAP_ROUTE24 - connection down, 0, MAP_ROUTE5 - connection left, 10, MAP_ROUTE4 - connection right, 10, MAP_ROUTE9 - -CeruleanCity_MapConnections:: @ 83527F0 - .4byte 4 - .4byte CeruleanCity_MapConnectionsList diff --git a/data/maps/CeruleanCity/events.inc b/data/maps/CeruleanCity/events.inc deleted file mode 100644 index 276ba2a9b..000000000 --- a/data/maps/CeruleanCity/events.inc +++ /dev/null @@ -1,49 +0,0 @@ -CeruleanCity_EventObjects: - object_event 1, 60, 0, 31, 0, 12, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeruleanCity_EventScript_1666E7, 0, 0, 0 - object_event 2, 49, 0, 33, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeruleanCity_EventScript_166603, 59, 0, 0 - object_event 3, 16, 0, 16, 0, 21, 0, 3, 3, 49, 0, 0, 0, 0, 0, CeruleanCity_EventScript_1666FE, 0, 0, 0 - object_event 4, 30, 0, 9, 0, 23, 0, 3, 2, 17, 0, 0, 0, 0, 0, CeruleanCity_EventScript_16671D, 0, 0, 0 - object_event 5, 129, 0, 32, 0, 29, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeruleanCity_EventScript_1667DD, 0, 0, 0 - object_event 6, 22, 0, 33, 0, 29, 0, 3, 9, 17, 0, 0, 0, 0, 0, CeruleanCity_EventScript_16674F, 0, 0, 0 - object_event 7, 18, 0, 34, 0, 22, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeruleanCity_EventScript_166726, 0, 0, 0 - object_event 8, 72, 0, 22, 0, 0, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, 60, 0, 0 - object_event 9, 95, 0, 26, 0, 32, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeruleanCity_EventScript_1BDF13, 19, 0, 0 - object_event 10, 65375, 0, 50, 0, 18, 0, 10, 0, 0, 0, 27, 0, 3, 0, 0x0, 0, 0, 0 - object_event 11, 23, 0, 12, 0, 30, 0, 3, 7, 17, 0, 0, 0, 0, 0, CeruleanCity_EventScript_166738, 0, 0, 0 - object_event 12, 41, 0, 1, 0, 13, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeruleanCity_EventScript_16672F, 92, 0, 0 - -CeruleanCity_MapWarps: - warp_def 10, 11, 0, 1, 1792 - warp_def 30, 11, 0, 1, 1793 - warp_def 15, 17, 0, 1, 1794 - warp_def 22, 19, 0, 1, 1795 - warp_def 31, 21, 0, 1, 1797 - warp_def 13, 28, 3, 1, 1798 - warp_def 29, 28, 0, 1, 1799 - warp_def 1, 12, 0, 0, 328 - warp_def 10, 8, 3, 3, 1792 - warp_def 31, 8, 3, 3, 1793 - warp_def 31, 9, 3, 3, 1793 - warp_def 14, 28, 3, 1, 1798 - warp_def 23, 28, 0, 0, 1800 - warp_def 17, 11, 0, 0, 1801 - -CeruleanCity_MapCoordEvents: - coord_event 22, 6, 3, 0, 16466, 0, 0, CeruleanCity_EventScript_16649A - coord_event 23, 6, 3, 0, 16466, 0, 0, CeruleanCity_EventScript_1664A6 - coord_event 24, 6, 3, 0, 16466, 0, 0, CeruleanCity_EventScript_1664B9 - coord_event 33, 5, 3, 0, 16509, 0, 0, CeruleanCity_EventScript_166683 - coord_event 33, 7, 3, 0, 16509, 0, 0, CeruleanCity_EventScript_1666A3 - -CeruleanCity_MapBGEvents: - bg_event 20, 25, 0, 0, 0, CeruleanCity_EventScript_166838 - bg_event 27, 21, 0, 0, 0, CeruleanCity_EventScript_166853 - bg_event 11, 28, 0, 0, 0, CeruleanCity_EventScript_16684A - bg_event 19, 32, 0, 0, 0, CeruleanCity_EventScript_166841 - bg_event 18, 7, 3, 7, 0, 68, 49, 1 - bg_event 11, 25, 0, 0, 0, CeruleanCity_EventScript_16AC94 - bg_event 11, 27, 0, 0, 0, CeruleanCity_EventScript_16AC94 - bg_event 11, 26, 0, 0, 0, CeruleanCity_EventScript_16AC94 - -CeruleanCity_MapEvents:: - map_events CeruleanCity_EventObjects, CeruleanCity_MapWarps, CeruleanCity_MapCoordEvents, CeruleanCity_MapBGEvents diff --git a/data/maps/CeruleanCity/events_bad.inc b/data/maps/CeruleanCity/events_bad.inc new file mode 100644 index 000000000..1598a51ff --- /dev/null +++ b/data/maps/CeruleanCity/events_bad.inc @@ -0,0 +1,43 @@ +CeruleanCity_EventObjects: + object_event 1, 60, 0, 31, 0, 12, 0, 3, 8, 17, 0, 0, 0 + object_event 2, 49, 0, 33, 0, 6, 0, 3, 1, 17, 0, 0, 0 + object_event 3, 16, 0, 16, 0, 21, 0, 3, 3, 49, 0, 0, 0 + object_event 4, 30, 0, 9, 0, 23, 0, 3, 2, 17, 0, 0, 0 + object_event 5, 129, 0, 32, 0, 29, 0, 3, 8, 17, 0, 0, 0 + object_event 6, 22, 0, 33, 0, 29, 0, 3, 9, 17, 0, 0, 0 + object_event 7, 18, 0, 34, 0, 22, 0, 3, 8, 17, 0, 0, 0 + object_event 8, 72, 0, 22, 0, 0, 0, 3, 8, 17, 0, 0, 0 + object_event 9, 95, 0, 26, 0, 32, 0, 3, 8, 17, 0, 0, 0 + object_event 10, 65375, 0, 50, 0, 18, 0, 10, 0, 0, 0, 27, 0 + object_event 11, 23, 0, 12, 0, 30, 0, 3, 7, 17, 0, 0, 0 + object_event 12, 41, 0, 1, 0, 13, 0, 3, 8, 17, 0, 0, 0 + +CeruleanCity_MapWarps: + warp_def 10, 11, 0, 1, MAP_CERULEAN_CITY_HOUSE1 + warp_def 30, 11, 0, 1, MAP_CERULEAN_CITY_HOUSE2 + warp_def 15, 17, 0, 1, MAP_CERULEAN_CITY_HOUSE3 + warp_def 22, 19, 0, 1, MAP_CERULEAN_CITY_POKEMONCENTER_1F + warp_def 31, 21, 0, 1, MAP_CERULEAN_CITY_GYM + warp_def 13, 28, 3, 1, MAP_CERULEAN_CITY_BIKESHOP + warp_def 29, 28, 0, 1, MAP_CERULEAN_CITY_MART + warp_def 1, 12, 0, 0, MAP_CERULEAN_CAVE_1F + warp_def 10, 8, 3, 3, MAP_CERULEAN_CITY_HOUSE1 + warp_def 31, 8, 3, 3, MAP_CERULEAN_CITY_HOUSE2 + warp_def 31, 9, 3, 3, MAP_CERULEAN_CITY_HOUSE2 + warp_def 14, 28, 3, 1, MAP_CERULEAN_CITY_BIKESHOP + warp_def 23, 28, 0, 0, MAP_CERULEAN_CITY_HOUSE4 + warp_def 17, 11, 0, 0, MAP_CERULEAN_CITY_HOUSE5 + +CeruleanCity_MapCoordEvents: + coord_event 22, 6, 3, VAR_0x4052, , CeruleanCity_EventScript_16649A + coord_event 23, 6, 3, VAR_0x4052, , CeruleanCity_EventScript_1664A6 + coord_event 24, 6, 3, VAR_0x4052, , CeruleanCity_EventScript_1664B9 + coord_event 33, 5, 3, VAR_0x407D, , CeruleanCity_EventScript_166683 + coord_event 33, 7, 3, VAR_0x407D, , CeruleanCity_EventScript_1666A3 + +CeruleanCity_MapBGEvents: + bg_hidden_item_event 18, 7, 3, ITEM_RARE_CANDY, + +CeruleanCity_MapEvents:: + map_events CeruleanCity_EventObjects, CeruleanCity_MapWarps, CeruleanCity_MapCoordEvents, CeruleanCity_MapBGEvents + diff --git a/data/maps/CeruleanCity/header.inc b/data/maps/CeruleanCity/header.inc deleted file mode 100644 index 720840bf0..000000000 --- a/data/maps/CeruleanCity/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CeruleanCity:: @ 835066C - .4byte CeruleanCity_Layout @ 0x82E022C - .4byte CeruleanCity_MapEvents @ 0x83B53E0 - .4byte CeruleanCity_MapScripts @ 0x8166471 - .4byte CeruleanCity_MapConnections @ 0x83527F0 - .2byte BGM_FRLG_CERULEAN_CITY - .2byte 81 - .byte 0x5b, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/CeruleanCity/map.json b/data/maps/CeruleanCity/map.json new file mode 100644 index 000000000..602f84df8 --- /dev/null +++ b/data/maps/CeruleanCity/map.json @@ -0,0 +1,401 @@ +{ + "id": "MAP_CERULEAN_CITY", + "name": "CeruleanCity", + "layout": "LAYOUT_CERULEAN_CITY", + "music": "BGM_FRLG_CERULEAN_CITY", + "region_map_section": "MAPSEC_CERULEAN_CITY", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_1", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_ROUTE24", + "offset": 12, + "direction": "up" + }, + { + "map": "MAP_ROUTE5", + "offset": 0, + "direction": "down" + }, + { + "map": "MAP_ROUTE4", + "offset": 10, + "direction": "left" + }, + { + "map": "MAP_ROUTE9", + "offset": 10, + "direction": "right" + } + ], + "object_events": [ + { + "graphics_id": "60", + "x": 31, + "y": 12, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCity_EventScript_1666E7", + "flag": "0" + }, + { + "graphics_id": "49", + "x": 33, + "y": 6, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCity_EventScript_166603", + "flag": "59" + }, + { + "graphics_id": "16", + "x": 16, + "y": 21, + "elevation": 3, + "movement_type": "3", + "movement_range_x": 1, + "movement_range_y": 3, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCity_EventScript_1666FE", + "flag": "0" + }, + { + "graphics_id": "30", + "x": 9, + "y": 23, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCity_EventScript_16671D", + "flag": "0" + }, + { + "graphics_id": "129", + "x": 32, + "y": 29, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCity_EventScript_1667DD", + "flag": "0" + }, + { + "graphics_id": "22", + "x": 33, + "y": 29, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCity_EventScript_16674F", + "flag": "0" + }, + { + "graphics_id": "18", + "x": 34, + "y": 22, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCity_EventScript_166726", + "flag": "0" + }, + { + "graphics_id": "72", + "x": 22, + "y": 0, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "60" + }, + { + "graphics_id": "95", + "x": 26, + "y": 32, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCity_EventScript_1BDF13", + "flag": "19" + }, + { + "graphics_id": "65375", + "x": 50, + "y": 18, + "elevation": 10, + "movement_type": "0", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 27, + "trainer_sight_or_berry_tree_id": 3, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "23", + "x": 12, + "y": 30, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCity_EventScript_166738", + "flag": "0" + }, + { + "graphics_id": "41", + "x": 1, + "y": 13, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCity_EventScript_16672F", + "flag": "92" + } + ], + "warp_events": [ + { + "x": 10, + "y": 11, + "elevation": 0, + "dest_map": "MAP_CERULEAN_CITY_HOUSE1", + "dest_warp_id": 1 + }, + { + "x": 30, + "y": 11, + "elevation": 0, + "dest_map": "MAP_CERULEAN_CITY_HOUSE2", + "dest_warp_id": 1 + }, + { + "x": 15, + "y": 17, + "elevation": 0, + "dest_map": "MAP_CERULEAN_CITY_HOUSE3", + "dest_warp_id": 1 + }, + { + "x": 22, + "y": 19, + "elevation": 0, + "dest_map": "MAP_CERULEAN_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 1 + }, + { + "x": 31, + "y": 21, + "elevation": 0, + "dest_map": "MAP_CERULEAN_CITY_GYM", + "dest_warp_id": 1 + }, + { + "x": 13, + "y": 28, + "elevation": 3, + "dest_map": "MAP_CERULEAN_CITY_BIKE_SHOP", + "dest_warp_id": 1 + }, + { + "x": 29, + "y": 28, + "elevation": 0, + "dest_map": "MAP_CERULEAN_CITY_MART", + "dest_warp_id": 1 + }, + { + "x": 1, + "y": 12, + "elevation": 0, + "dest_map": "MAP_CERULEAN_CAVE_1F", + "dest_warp_id": 0 + }, + { + "x": 10, + "y": 8, + "elevation": 3, + "dest_map": "MAP_CERULEAN_CITY_HOUSE1", + "dest_warp_id": 3 + }, + { + "x": 31, + "y": 8, + "elevation": 3, + "dest_map": "MAP_CERULEAN_CITY_HOUSE2", + "dest_warp_id": 3 + }, + { + "x": 31, + "y": 9, + "elevation": 3, + "dest_map": "MAP_CERULEAN_CITY_HOUSE2", + "dest_warp_id": 3 + }, + { + "x": 14, + "y": 28, + "elevation": 3, + "dest_map": "MAP_CERULEAN_CITY_BIKE_SHOP", + "dest_warp_id": 1 + }, + { + "x": 23, + "y": 28, + "elevation": 0, + "dest_map": "MAP_CERULEAN_CITY_HOUSE4", + "dest_warp_id": 0 + }, + { + "x": 17, + "y": 11, + "elevation": 0, + "dest_map": "MAP_CERULEAN_CITY_HOUSE5", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 22, + "y": 6, + "elevation": 3, + "var": "VAR_0x4052", + "var_value": 0, + "script": "CeruleanCity_EventScript_16649A" + }, + { + "type": "trigger", + "x": 23, + "y": 6, + "elevation": 3, + "var": "VAR_0x4052", + "var_value": 0, + "script": "CeruleanCity_EventScript_1664A6" + }, + { + "type": "trigger", + "x": 24, + "y": 6, + "elevation": 3, + "var": "VAR_0x4052", + "var_value": 0, + "script": "CeruleanCity_EventScript_1664B9" + }, + { + "type": "trigger", + "x": 33, + "y": 5, + "elevation": 3, + "var": "VAR_0x407D", + "var_value": 0, + "script": "CeruleanCity_EventScript_166683" + }, + { + "type": "trigger", + "x": 33, + "y": 7, + "elevation": 3, + "var": "VAR_0x407D", + "var_value": 0, + "script": "CeruleanCity_EventScript_1666A3" + } + ], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 20, + "y": 25, + "elevation": 0, + "script": "CeruleanCity_EventScript_166838" + }, + { + "type": "bg_event_type_0", + "x": 27, + "y": 21, + "elevation": 0, + "script": "CeruleanCity_EventScript_166853" + }, + { + "type": "bg_event_type_0", + "x": 11, + "y": 28, + "elevation": 0, + "script": "CeruleanCity_EventScript_16684A" + }, + { + "type": "bg_event_type_0", + "x": 19, + "y": 32, + "elevation": 0, + "script": "CeruleanCity_EventScript_166841" + }, + { + "type": "hidden_item", + "x": 18, + "y": 7, + "elevation": 3, + "item": "ITEM_RARE_CANDY", + "flag": "49", + "unknown": 1 + }, + { + "type": "bg_event_type_0", + "x": 11, + "y": 25, + "elevation": 0, + "script": "CeruleanCity_EventScript_16AC94" + }, + { + "type": "bg_event_type_0", + "x": 11, + "y": 27, + "elevation": 0, + "script": "CeruleanCity_EventScript_16AC94" + }, + { + "type": "bg_event_type_0", + "x": 11, + "y": 26, + "elevation": 0, + "script": "CeruleanCity_EventScript_16AC94" + } + ] +} \ No newline at end of file diff --git a/data/maps/CeruleanCity_BikeShop/events.inc b/data/maps/CeruleanCity_BikeShop/events.inc deleted file mode 100644 index affb34087..000000000 --- a/data/maps/CeruleanCity_BikeShop/events.inc +++ /dev/null @@ -1,22 +0,0 @@ -CeruleanCity_BikeShop_EventObjects: - object_event 1, 25, 0, 9, 0, 3, 0, 3, 9, 17, 0, 0, 0, 0, 0, CeruleanCity_BikeShop_EventScript_16ABBD, 0, 0, 0 - object_event 2, 18, 0, 9, 0, 7, 0, 3, 2, 17, 0, 0, 0, 0, 0, CeruleanCity_BikeShop_EventScript_16AC75, 0, 0, 0 - object_event 3, 28, 0, 5, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, CeruleanCity_BikeShop_EventScript_16AC6C, 0, 0, 0 - -CeruleanCity_BikeShop_MapWarps: - warp_def 4, 9, 0, 5, 771 - warp_def 5, 8, 3, 5, 771 - warp_def 6, 9, 0, 5, 771 - -CeruleanCity_BikeShop_MapBGEvents: - bg_event 4, 3, 0, 0, 0, CeruleanCity_BikeShop_EventScript_16AC94 - bg_event 4, 4, 0, 0, 0, CeruleanCity_BikeShop_EventScript_16AC94 - bg_event 4, 5, 0, 0, 0, CeruleanCity_BikeShop_EventScript_16AC94 - bg_event 2, 3, 0, 0, 0, CeruleanCity_BikeShop_EventScript_16AC94 - bg_event 1, 4, 0, 0, 0, CeruleanCity_BikeShop_EventScript_16AC94 - bg_event 2, 5, 0, 0, 0, CeruleanCity_BikeShop_EventScript_16AC94 - bg_event 2, 7, 0, 0, 0, CeruleanCity_BikeShop_EventScript_16AC94 - bg_event 2, 8, 0, 0, 0, CeruleanCity_BikeShop_EventScript_16AC94 - -CeruleanCity_BikeShop_MapEvents:: - map_events CeruleanCity_BikeShop_EventObjects, CeruleanCity_BikeShop_MapWarps, 0x0, CeruleanCity_BikeShop_MapBGEvents diff --git a/data/maps/CeruleanCity_BikeShop/header.inc b/data/maps/CeruleanCity_BikeShop/header.inc deleted file mode 100644 index 3f2bd4de1..000000000 --- a/data/maps/CeruleanCity_BikeShop/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CeruleanCity_BikeShop:: @ 8350FF0 - .4byte CeruleanCity_BikeShop_Layout @ 0x82D6F28 - .4byte CeruleanCity_BikeShop_MapEvents @ 0x83BA6FC - .4byte CeruleanCity_BikeShop_MapScripts @ 0x816ABBC - .4byte NULL - .2byte BGM_FRLG_CERULEAN_CITY - .2byte 26 - .byte 0x5b, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CeruleanCity_BikeShop/map.json b/data/maps/CeruleanCity_BikeShop/map.json new file mode 100644 index 000000000..f94bc3e7e --- /dev/null +++ b/data/maps/CeruleanCity_BikeShop/map.json @@ -0,0 +1,138 @@ +{ + "id": "MAP_CERULEAN_CITY_BIKE_SHOP", + "name": "CeruleanCity_BikeShop", + "layout": "LAYOUT_CERULEAN_CITY_BIKE_SHOP", + "music": "BGM_FRLG_CERULEAN_CITY", + "region_map_section": "MAPSEC_CERULEAN_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "25", + "x": 9, + "y": 3, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCity_BikeShop_EventScript_16ABBD", + "flag": "0" + }, + { + "graphics_id": "18", + "x": 9, + "y": 7, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCity_BikeShop_EventScript_16AC75", + "flag": "0" + }, + { + "graphics_id": "28", + "x": 5, + "y": 5, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCity_BikeShop_EventScript_16AC6C", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 9, + "elevation": 0, + "dest_map": "MAP_CERULEAN_CITY", + "dest_warp_id": 5 + }, + { + "x": 5, + "y": 8, + "elevation": 3, + "dest_map": "MAP_CERULEAN_CITY", + "dest_warp_id": 5 + }, + { + "x": 6, + "y": 9, + "elevation": 0, + "dest_map": "MAP_CERULEAN_CITY", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 4, + "y": 3, + "elevation": 0, + "script": "CeruleanCity_BikeShop_EventScript_16AC94" + }, + { + "type": "bg_event_type_0", + "x": 4, + "y": 4, + "elevation": 0, + "script": "CeruleanCity_BikeShop_EventScript_16AC94" + }, + { + "type": "bg_event_type_0", + "x": 4, + "y": 5, + "elevation": 0, + "script": "CeruleanCity_BikeShop_EventScript_16AC94" + }, + { + "type": "bg_event_type_0", + "x": 2, + "y": 3, + "elevation": 0, + "script": "CeruleanCity_BikeShop_EventScript_16AC94" + }, + { + "type": "bg_event_type_0", + "x": 1, + "y": 4, + "elevation": 0, + "script": "CeruleanCity_BikeShop_EventScript_16AC94" + }, + { + "type": "bg_event_type_0", + "x": 2, + "y": 5, + "elevation": 0, + "script": "CeruleanCity_BikeShop_EventScript_16AC94" + }, + { + "type": "bg_event_type_0", + "x": 2, + "y": 7, + "elevation": 0, + "script": "CeruleanCity_BikeShop_EventScript_16AC94" + }, + { + "type": "bg_event_type_0", + "x": 2, + "y": 8, + "elevation": 0, + "script": "CeruleanCity_BikeShop_EventScript_16AC94" + } + ] +} \ No newline at end of file diff --git a/data/maps/CeruleanCity_Gym/events.inc b/data/maps/CeruleanCity_Gym/events.inc deleted file mode 100644 index 3c3fae4d3..000000000 --- a/data/maps/CeruleanCity_Gym/events.inc +++ /dev/null @@ -1,17 +0,0 @@ -CeruleanCity_Gym_EventObjects: - object_event 1, 43, 0, 10, 0, 12, 0, 0, 9, 17, 0, 1, 0, 1, 0, CeruleanCity_Gym_EventScript_16AB5B, 0, 0, 0 - object_event 2, 40, 0, 4, 0, 7, 0, 3, 10, 17, 0, 1, 0, 4, 0, CeruleanCity_Gym_EventScript_16AB44, 0, 0, 0 - object_event 3, 81, 0, 8, 0, 6, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeruleanCity_Gym_EventScript_16AAA1, 0, 0, 0 - object_event 4, 91, 0, 7, 0, 16, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeruleanCity_Gym_EventScript_16AB7F, 0, 0, 0 - -CeruleanCity_Gym_MapWarps: - warp_def 7, 18, 3, 4, 771 - warp_def 8, 18, 3, 4, 771 - warp_def 9, 18, 3, 4, 771 - -CeruleanCity_Gym_MapBGEvents: - bg_event 6, 17, 0, 0, 0, CeruleanCity_Gym_EventScript_16AB9E - bg_event 10, 17, 0, 0, 0, CeruleanCity_Gym_EventScript_16AB9E - -CeruleanCity_Gym_MapEvents:: - map_events CeruleanCity_Gym_EventObjects, CeruleanCity_Gym_MapWarps, 0x0, CeruleanCity_Gym_MapBGEvents diff --git a/data/maps/CeruleanCity_Gym/header.inc b/data/maps/CeruleanCity_Gym/header.inc deleted file mode 100644 index 3b3b044e4..000000000 --- a/data/maps/CeruleanCity_Gym/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CeruleanCity_Gym:: @ 8350FD4 - .4byte CeruleanCity_Gym_Layout @ 0x82D5F84 - .4byte CeruleanCity_Gym_MapEvents @ 0x83BA628 - .4byte CeruleanCity_Gym_MapScripts @ 0x816AAA0 - .4byte NULL - .2byte BGM_FRLG_GYM - .2byte 12 - .byte 0x5b, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01 diff --git a/data/maps/CeruleanCity_Gym/map.json b/data/maps/CeruleanCity_Gym/map.json new file mode 100644 index 000000000..715fbd067 --- /dev/null +++ b/data/maps/CeruleanCity_Gym/map.json @@ -0,0 +1,109 @@ +{ + "id": "MAP_CERULEAN_CITY_GYM", + "name": "CeruleanCity_Gym", + "layout": "LAYOUT_CERULEAN_CITY_GYM", + "music": "BGM_FRLG_GYM", + "region_map_section": "MAPSEC_CERULEAN_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_1", + "connections": null, + "object_events": [ + { + "graphics_id": "43", + "x": 10, + "y": 12, + "elevation": 0, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "CeruleanCity_Gym_EventScript_16AB5B", + "flag": "0" + }, + { + "graphics_id": "40", + "x": 4, + "y": 7, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "CeruleanCity_Gym_EventScript_16AB44", + "flag": "0" + }, + { + "graphics_id": "81", + "x": 8, + "y": 6, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCity_Gym_EventScript_16AAA1", + "flag": "0" + }, + { + "graphics_id": "91", + "x": 7, + "y": 16, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCity_Gym_EventScript_16AB7F", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 7, + "y": 18, + "elevation": 3, + "dest_map": "MAP_CERULEAN_CITY", + "dest_warp_id": 4 + }, + { + "x": 8, + "y": 18, + "elevation": 3, + "dest_map": "MAP_CERULEAN_CITY", + "dest_warp_id": 4 + }, + { + "x": 9, + "y": 18, + "elevation": 3, + "dest_map": "MAP_CERULEAN_CITY", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 6, + "y": 17, + "elevation": 0, + "script": "CeruleanCity_Gym_EventScript_16AB9E" + }, + { + "type": "bg_event_type_0", + "x": 10, + "y": 17, + "elevation": 0, + "script": "CeruleanCity_Gym_EventScript_16AB9E" + } + ] +} \ No newline at end of file diff --git a/data/maps/CeruleanCity_House1/events.inc b/data/maps/CeruleanCity_House1/events.inc deleted file mode 100644 index 9771589cf..000000000 --- a/data/maps/CeruleanCity_House1/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -CeruleanCity_House1_EventObjects: - object_event 1, 61, 0, 6, 0, 5, 0, 3, 10, 17, 0, 0, 0, 0, 0, CeruleanCity_House1_EventScript_16A7F0, 0, 0, 0 - -CeruleanCity_House1_MapWarps: - warp_def 2, 9, 0, 0, 771 - warp_def 3, 8, 3, 0, 771 - warp_def 4, 9, 0, 0, 771 - warp_def 3, 1, 3, 8, 771 - -CeruleanCity_House1_MapEvents:: - map_events CeruleanCity_House1_EventObjects, CeruleanCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/CeruleanCity_House1/header.inc b/data/maps/CeruleanCity_House1/header.inc deleted file mode 100644 index 092348c5b..000000000 --- a/data/maps/CeruleanCity_House1/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CeruleanCity_House1:: @ 8350F48 - .4byte CeruleanCity_House1_Layout @ 0x831A560 - .4byte CeruleanCity_House1_MapEvents @ 0x83BA350 - .4byte CeruleanCity_House1_MapScripts @ 0x816A7EF - .4byte NULL - .2byte BGM_FRLG_CERULEAN_CITY - .2byte 183 - .byte 0x5b, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CeruleanCity_House1/map.json b/data/maps/CeruleanCity_House1/map.json new file mode 100644 index 000000000..ad770bb63 --- /dev/null +++ b/data/maps/CeruleanCity_House1/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_CERULEAN_CITY_HOUSE1", + "name": "CeruleanCity_House1", + "layout": "LAYOUT_CERULEAN_CITY_HOUSE1", + "music": "BGM_FRLG_CERULEAN_CITY", + "region_map_section": "MAPSEC_CERULEAN_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "61", + "x": 6, + "y": 5, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCity_House1_EventScript_16A7F0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 2, + "y": 9, + "elevation": 0, + "dest_map": "MAP_CERULEAN_CITY", + "dest_warp_id": 0 + }, + { + "x": 3, + "y": 8, + "elevation": 3, + "dest_map": "MAP_CERULEAN_CITY", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 9, + "elevation": 0, + "dest_map": "MAP_CERULEAN_CITY", + "dest_warp_id": 0 + }, + { + "x": 3, + "y": 1, + "elevation": 3, + "dest_map": "MAP_CERULEAN_CITY", + "dest_warp_id": 8 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/CeruleanCity_House2/events.inc b/data/maps/CeruleanCity_House2/events.inc deleted file mode 100644 index d1e7b71db..000000000 --- a/data/maps/CeruleanCity_House2/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -CeruleanCity_House2_EventObjects: - object_event 1, 56, 0, 1, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeruleanCity_House2_EventScript_16A976, 0, 0, 0 - object_event 2, 22, 0, 7, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, CeruleanCity_House2_EventScript_16A995, 0, 0, 0 - -CeruleanCity_House2_MapWarps: - warp_def 2, 7, 0, 1, 771 - warp_def 3, 7, 0, 1, 771 - warp_def 4, 7, 1, 1, 771 - warp_def 4, 1, 0, 9, 771 - -CeruleanCity_House2_MapBGEvents: - bg_event 4, 1, 0, 0, 0, CeruleanCity_House2_EventScript_16A99E - -CeruleanCity_House2_MapEvents:: - map_events CeruleanCity_House2_EventObjects, CeruleanCity_House2_MapWarps, 0x0, CeruleanCity_House2_MapBGEvents diff --git a/data/maps/CeruleanCity_House2/header.inc b/data/maps/CeruleanCity_House2/header.inc deleted file mode 100644 index 66b02a6a6..000000000 --- a/data/maps/CeruleanCity_House2/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CeruleanCity_House2:: @ 8350F64 - .4byte CeruleanCity_House2_Layout @ 0x831A474 - .4byte CeruleanCity_House2_MapEvents @ 0x83BA3C0 - .4byte CeruleanCity_House2_MapScripts @ 0x816A975 - .4byte NULL - .2byte BGM_FRLG_CERULEAN_CITY - .2byte 182 - .byte 0x5b, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CeruleanCity_House2/map.json b/data/maps/CeruleanCity_House2/map.json new file mode 100644 index 000000000..0c2d2e4cb --- /dev/null +++ b/data/maps/CeruleanCity_House2/map.json @@ -0,0 +1,83 @@ +{ + "id": "MAP_CERULEAN_CITY_HOUSE2", + "name": "CeruleanCity_House2", + "layout": "LAYOUT_CERULEAN_CITY_HOUSE2", + "music": "BGM_FRLG_CERULEAN_CITY", + "region_map_section": "MAPSEC_CERULEAN_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "56", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCity_House2_EventScript_16A976", + "flag": "0" + }, + { + "graphics_id": "22", + "x": 7, + "y": 6, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCity_House2_EventScript_16A995", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 2, + "y": 7, + "elevation": 0, + "dest_map": "MAP_CERULEAN_CITY", + "dest_warp_id": 1 + }, + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_CERULEAN_CITY", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 7, + "elevation": 1, + "dest_map": "MAP_CERULEAN_CITY", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 1, + "elevation": 0, + "dest_map": "MAP_CERULEAN_CITY", + "dest_warp_id": 9 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 4, + "y": 1, + "elevation": 0, + "script": "CeruleanCity_House2_EventScript_16A99E" + } + ] +} \ No newline at end of file diff --git a/data/maps/CeruleanCity_House3/events.inc b/data/maps/CeruleanCity_House3/events.inc deleted file mode 100644 index 7c3b4a954..000000000 --- a/data/maps/CeruleanCity_House3/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -CeruleanCity_House3_EventObjects: - object_event 1, 32, 0, 2, 0, 2, 0, 3, 7, 17, 0, 0, 0, 0, 0, CeruleanCity_House3_EventScript_16A9B1, 0, 0, 0 - object_event 2, 35, 0, 7, 0, 5, 0, 3, 9, 17, 0, 0, 0, 0, 0, CeruleanCity_House3_EventScript_16A9A8, 0, 0, 0 - -CeruleanCity_House3_MapWarps: - warp_def 3, 7, 0, 2, 771 - warp_def 4, 7, 0, 2, 771 - warp_def 5, 7, 0, 2, 771 - -CeruleanCity_House3_MapEvents:: - map_events CeruleanCity_House3_EventObjects, CeruleanCity_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/CeruleanCity_House3/header.inc b/data/maps/CeruleanCity_House3/header.inc deleted file mode 100644 index 6e5885015..000000000 --- a/data/maps/CeruleanCity_House3/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CeruleanCity_House3:: @ 8350F80 - .4byte House1_Layout @ 0x82D5754 - .4byte CeruleanCity_House3_MapEvents @ 0x83BA41C - .4byte CeruleanCity_House3_MapScripts @ 0x816A9A7 - .4byte NULL - .2byte BGM_FRLG_CERULEAN_CITY - .2byte 6 - .byte 0x5b, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CeruleanCity_House3/map.json b/data/maps/CeruleanCity_House3/map.json new file mode 100644 index 000000000..748aac0e2 --- /dev/null +++ b/data/maps/CeruleanCity_House3/map.json @@ -0,0 +1,68 @@ +{ + "id": "MAP_CERULEAN_CITY_HOUSE3", + "name": "CeruleanCity_House3", + "layout": "LAYOUT_HOUSE1", + "music": "BGM_FRLG_CERULEAN_CITY", + "region_map_section": "MAPSEC_CERULEAN_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "32", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCity_House3_EventScript_16A9B1", + "flag": "0" + }, + { + "graphics_id": "35", + "x": 7, + "y": 5, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCity_House3_EventScript_16A9A8", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_CERULEAN_CITY", + "dest_warp_id": 2 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_CERULEAN_CITY", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 7, + "elevation": 0, + "dest_map": "MAP_CERULEAN_CITY", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/CeruleanCity_House4/events.inc b/data/maps/CeruleanCity_House4/events.inc deleted file mode 100644 index 35200dd3c..000000000 --- a/data/maps/CeruleanCity_House4/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -CeruleanCity_House4_EventObjects: - object_event 1, 32, 0, 5, 0, 3, 0, 3, 7, 17, 0, 0, 0, 0, 0, CeruleanCity_House4_EventScript_16ACEF, 0, 0, 0 - -CeruleanCity_House4_MapWarps: - warp_def 4, 7, 3, 12, 771 - -CeruleanCity_House4_MapEvents:: - map_events CeruleanCity_House4_EventObjects, CeruleanCity_House4_MapWarps, 0x0, 0x0 diff --git a/data/maps/CeruleanCity_House4/header.inc b/data/maps/CeruleanCity_House4/header.inc deleted file mode 100644 index 979bc788e..000000000 --- a/data/maps/CeruleanCity_House4/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CeruleanCity_House4:: @ 8351028 - .4byte House1_Layout @ 0x82D5754 - .4byte CeruleanCity_House4_MapEvents @ 0x83BA7A4 - .4byte CeruleanCity_House4_MapScripts @ 0x816ACEE - .4byte NULL - .2byte BGM_FRLG_CERULEAN_CITY - .2byte 6 - .byte 0x5b, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CeruleanCity_House4/map.json b/data/maps/CeruleanCity_House4/map.json new file mode 100644 index 000000000..c07927a27 --- /dev/null +++ b/data/maps/CeruleanCity_House4/map.json @@ -0,0 +1,41 @@ +{ + "id": "MAP_CERULEAN_CITY_HOUSE4", + "name": "CeruleanCity_House4", + "layout": "LAYOUT_HOUSE1", + "music": "BGM_FRLG_CERULEAN_CITY", + "region_map_section": "MAPSEC_CERULEAN_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "32", + "x": 5, + "y": 3, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCity_House4_EventScript_16ACEF", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_CERULEAN_CITY", + "dest_warp_id": 12 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/CeruleanCity_House5/events.inc b/data/maps/CeruleanCity_House5/events.inc deleted file mode 100644 index d494639d8..000000000 --- a/data/maps/CeruleanCity_House5/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -CeruleanCity_House5_EventObjects: - object_event 1, 33, 0, 7, 0, 4, 0, 3, 10, 17, 0, 0, 0, 0, 0, CeruleanCity_House5_EventScript_16AE50, 0, 0, 0 - -CeruleanCity_House5_MapWarps: - warp_def 4, 7, 3, 13, 771 - -CeruleanCity_House5_MapBGEvents: - bg_event 3, 1, 0, 0, 0, CeruleanCity_House5_EventScript_16B0DA - -CeruleanCity_House5_MapEvents:: - map_events CeruleanCity_House5_EventObjects, CeruleanCity_House5_MapWarps, 0x0, CeruleanCity_House5_MapBGEvents diff --git a/data/maps/CeruleanCity_House5/header.inc b/data/maps/CeruleanCity_House5/header.inc deleted file mode 100644 index 1c11eb58a..000000000 --- a/data/maps/CeruleanCity_House5/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CeruleanCity_House5:: @ 8351044 - .4byte CeruleanCity_House5_Layout @ 0x8343540 - .4byte CeruleanCity_House5_MapEvents @ 0x83BA7E4 - .4byte CeruleanCity_House5_MapScripts @ 0x816AE4F - .4byte NULL - .2byte BGM_FRLG_CERULEAN_CITY - .2byte 308 - .byte 0x5b, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CeruleanCity_House5/map.json b/data/maps/CeruleanCity_House5/map.json new file mode 100644 index 000000000..6619a1fb4 --- /dev/null +++ b/data/maps/CeruleanCity_House5/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_CERULEAN_CITY_HOUSE5", + "name": "CeruleanCity_House5", + "layout": "LAYOUT_CERULEAN_CITY_HOUSE5", + "music": "BGM_FRLG_CERULEAN_CITY", + "region_map_section": "MAPSEC_CERULEAN_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "33", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCity_House5_EventScript_16AE50", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_CERULEAN_CITY", + "dest_warp_id": 13 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 3, + "y": 1, + "elevation": 0, + "script": "CeruleanCity_House5_EventScript_16B0DA" + } + ] +} \ No newline at end of file diff --git a/data/maps/CeruleanCity_Mart/events.inc b/data/maps/CeruleanCity_Mart/events.inc deleted file mode 100644 index e38d991fb..000000000 --- a/data/maps/CeruleanCity_Mart/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -CeruleanCity_Mart_EventObjects: - object_event 1, 68, 0, 2, 0, 3, 0, 0, 10, 17, 0, 0, 0, 0, 0, CeruleanCity_Mart_EventScript_16ACB0, 0, 0, 0 - object_event 2, 23, 0, 9, 0, 2, 0, 3, 5, 20, 0, 0, 0, 0, 0, CeruleanCity_Mart_EventScript_16ACA7, 0, 0, 0 - object_event 3, 18, 0, 1, 0, 7, 0, 3, 7, 17, 0, 0, 0, 0, 0, CeruleanCity_Mart_EventScript_16AC9E, 0, 0, 0 - -CeruleanCity_Mart_MapWarps: - warp_def 3, 7, 3, 6, 771 - warp_def 4, 7, 3, 6, 771 - warp_def 5, 7, 3, 6, 771 - -CeruleanCity_Mart_MapEvents:: - map_events CeruleanCity_Mart_EventObjects, CeruleanCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/CeruleanCity_Mart/header.inc b/data/maps/CeruleanCity_Mart/header.inc deleted file mode 100644 index 592847fdf..000000000 --- a/data/maps/CeruleanCity_Mart/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CeruleanCity_Mart:: @ 835100C - .4byte Mart_Layout @ 0x82D5BCC - .4byte CeruleanCity_Mart_MapEvents @ 0x83BA770 - .4byte CeruleanCity_Mart_MapScripts @ 0x816AC9D - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 10 - .byte 0x5b, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CeruleanCity_Mart/map.json b/data/maps/CeruleanCity_Mart/map.json new file mode 100644 index 000000000..f0f95490c --- /dev/null +++ b/data/maps/CeruleanCity_Mart/map.json @@ -0,0 +1,81 @@ +{ + "id": "MAP_CERULEAN_CITY_MART", + "name": "CeruleanCity_Mart", + "layout": "LAYOUT_MART", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_CERULEAN_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "68", + "x": 2, + "y": 3, + "elevation": 0, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCity_Mart_EventScript_16ACB0", + "flag": "0" + }, + { + "graphics_id": "23", + "x": 9, + "y": 2, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 4, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCity_Mart_EventScript_16ACA7", + "flag": "0" + }, + { + "graphics_id": "18", + "x": 1, + "y": 7, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCity_Mart_EventScript_16AC9E", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 3, + "dest_map": "MAP_CERULEAN_CITY", + "dest_warp_id": 6 + }, + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_CERULEAN_CITY", + "dest_warp_id": 6 + }, + { + "x": 5, + "y": 7, + "elevation": 3, + "dest_map": "MAP_CERULEAN_CITY", + "dest_warp_id": 6 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/CeruleanCity_PokemonCenter_1F/events.inc b/data/maps/CeruleanCity_PokemonCenter_1F/events.inc deleted file mode 100644 index 624c743dd..000000000 --- a/data/maps/CeruleanCity_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,17 +0,0 @@ -CeruleanCity_PokemonCenter_1F_EventObjects: - object_event 1, 64, 0, 7, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeruleanCity_PokemonCenter_1F_EventScript_16AA3C, 0, 0, 0 - object_event 2, 61, 0, 12, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeruleanCity_PokemonCenter_1F_EventScript_16AA45, 0, 0, 0 - object_event 3, 26, 0, 5, 0, 4, 0, 3, 5, 17, 0, 0, 0, 0, 0, CeruleanCity_PokemonCenter_1F_EventScript_16AA4E, 0, 0, 0 - object_event 4, 18, 0, 4, 0, 8, 0, 3, 5, 17, 0, 0, 0, 0, 0, CeruleanCity_PokemonCenter_1F_EventScript_16AA57, 0, 0, 0 - object_event 5, 22, 0, 3, 0, 3, 0, 3, 10, 17, 0, 0, 0, 0, 0, CeruleanCity_PokemonCenter_1F_EventScript_16AA70, 0, 0, 0 - object_event 6, 0, 0, 2, 0, 1, 0, 0, 76, 17, 0, 0, 0, 0, 0, CeruleanCity_PokemonCenter_1F_EventScript_1ACE68, 157, 0, 0 - object_event 7, 0, 0, 3, 0, 1, 0, 0, 76, 17, 0, 0, 0, 0, 0, CeruleanCity_PokemonCenter_1F_EventScript_1ACE68, 157, 0, 0 - -CeruleanCity_PokemonCenter_1F_MapWarps: - warp_def 6, 8, 0, 3, 771 - warp_def 7, 8, 0, 3, 771 - warp_def 8, 8, 0, 3, 771 - warp_def 1, 6, 4, 0, 1796 - -CeruleanCity_PokemonCenter_1F_MapEvents:: - map_events CeruleanCity_PokemonCenter_1F_EventObjects, CeruleanCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/CeruleanCity_PokemonCenter_1F/header.inc b/data/maps/CeruleanCity_PokemonCenter_1F/header.inc deleted file mode 100644 index 9978c2508..000000000 --- a/data/maps/CeruleanCity_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CeruleanCity_PokemonCenter_1F:: @ 8350F9C - .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte CeruleanCity_PokemonCenter_1F_MapEvents @ 0x83BA4F8 - .4byte CeruleanCity_PokemonCenter_1F_MapScripts @ 0x816AA2D - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 8 - .byte 0x5b, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CeruleanCity_PokemonCenter_1F/map.json b/data/maps/CeruleanCity_PokemonCenter_1F/map.json new file mode 100644 index 000000000..f85c99a58 --- /dev/null +++ b/data/maps/CeruleanCity_PokemonCenter_1F/map.json @@ -0,0 +1,140 @@ +{ + "id": "MAP_CERULEAN_CITY_POKEMON_CENTER_1F", + "name": "CeruleanCity_PokemonCenter_1F", + "layout": "LAYOUT_POKEMON_CENTER_1F", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_CERULEAN_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "64", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCity_PokemonCenter_1F_EventScript_16AA3C", + "flag": "0" + }, + { + "graphics_id": "61", + "x": 12, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCity_PokemonCenter_1F_EventScript_16AA45", + "flag": "0" + }, + { + "graphics_id": "26", + "x": 5, + "y": 4, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCity_PokemonCenter_1F_EventScript_16AA4E", + "flag": "0" + }, + { + "graphics_id": "18", + "x": 4, + "y": 8, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCity_PokemonCenter_1F_EventScript_16AA57", + "flag": "0" + }, + { + "graphics_id": "22", + "x": 3, + "y": 3, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCity_PokemonCenter_1F_EventScript_16AA70", + "flag": "0" + }, + { + "graphics_id": "0", + "x": 2, + "y": 1, + "elevation": 0, + "movement_type": "76", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCity_PokemonCenter_1F_EventScript_1ACE68", + "flag": "157" + }, + { + "graphics_id": "0", + "x": 3, + "y": 1, + "elevation": 0, + "movement_type": "76", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCity_PokemonCenter_1F_EventScript_1ACE68", + "flag": "157" + } + ], + "warp_events": [ + { + "x": 6, + "y": 8, + "elevation": 0, + "dest_map": "MAP_CERULEAN_CITY", + "dest_warp_id": 3 + }, + { + "x": 7, + "y": 8, + "elevation": 0, + "dest_map": "MAP_CERULEAN_CITY", + "dest_warp_id": 3 + }, + { + "x": 8, + "y": 8, + "elevation": 0, + "dest_map": "MAP_CERULEAN_CITY", + "dest_warp_id": 3 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_CERULEAN_CITY_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/CeruleanCity_PokemonCenter_2F/events.inc b/data/maps/CeruleanCity_PokemonCenter_2F/events.inc deleted file mode 100644 index 6a0aeb560..000000000 --- a/data/maps/CeruleanCity_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -CeruleanCity_PokemonCenter_2F_EventObjects: - object_event 1, 65, 0, 6, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, CeruleanCity_PokemonCenter_2F_EventScript_1A8CF6, 0, 0, 0 - object_event 2, 65, 0, 2, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, CeruleanCity_PokemonCenter_2F_EventScript_1A8CFC, 0, 0, 0 - object_event 3, 65, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, CeruleanCity_PokemonCenter_2F_EventScript_1A8D02, 0, 0, 0 - object_event 4, 69, 0, 1, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, CeruleanCity_PokemonCenter_2F_EventScript_1BB1D2, 112, 0, 0 - -CeruleanCity_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 3, 1795 - warp_def 5, 1, 0, 0, 4 - warp_def 9, 1, 0, 0, 1 - -CeruleanCity_PokemonCenter_2F_MapEvents:: - map_events CeruleanCity_PokemonCenter_2F_EventObjects, CeruleanCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/CeruleanCity_PokemonCenter_2F/header.inc b/data/maps/CeruleanCity_PokemonCenter_2F/header.inc deleted file mode 100644 index 6a650315e..000000000 --- a/data/maps/CeruleanCity_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CeruleanCity_PokemonCenter_2F:: @ 8350FB8 - .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte CeruleanCity_PokemonCenter_2F_MapEvents @ 0x83BA584 - .4byte CeruleanCity_PokemonCenter_2F_MapScripts @ 0x816AA79 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 9 - .byte 0x5b, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CeruleanCity_PokemonCenter_2F/map.json b/data/maps/CeruleanCity_PokemonCenter_2F/map.json new file mode 100644 index 000000000..c231d2b99 --- /dev/null +++ b/data/maps/CeruleanCity_PokemonCenter_2F/map.json @@ -0,0 +1,94 @@ +{ + "id": "MAP_CERULEAN_CITY_POKEMON_CENTER_2F", + "name": "CeruleanCity_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_CERULEAN_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "65", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCity_PokemonCenter_2F_EventScript_1A8CF6", + "flag": "0" + }, + { + "graphics_id": "65", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCity_PokemonCenter_2F_EventScript_1A8CFC", + "flag": "0" + }, + { + "graphics_id": "65", + "x": 10, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCity_PokemonCenter_2F_EventScript_1A8D02", + "flag": "0" + }, + { + "graphics_id": "69", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CeruleanCity_PokemonCenter_2F_EventScript_1BB1D2", + "flag": "112" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_CERULEAN_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 3 + }, + { + "x": 5, + "y": 1, + "elevation": 0, + "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 0, + "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/CinnabarIsland/connections.inc b/data/maps/CinnabarIsland/connections.inc deleted file mode 100644 index e7955f388..000000000 --- a/data/maps/CinnabarIsland/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -CinnabarIsland_MapConnectionsList: @ 8352890 - connection up, 0, MAP_ROUTE21_SOUTH - connection right, 0, MAP_ROUTE20 - -CinnabarIsland_MapConnections:: @ 83528A8 - .4byte 2 - .4byte CinnabarIsland_MapConnectionsList diff --git a/data/maps/CinnabarIsland/events.inc b/data/maps/CinnabarIsland/events.inc deleted file mode 100644 index 6b267cd37..000000000 --- a/data/maps/CinnabarIsland/events.inc +++ /dev/null @@ -1,24 +0,0 @@ -CinnabarIsland_EventObjects: - object_event 1, 28, 0, 14, 0, 6, 0, 3, 5, 17, 0, 0, 0, 0, 0, CinnabarIsland_EventScript_1671EF, 0, 0, 0 - object_event 2, 32, 0, 11, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, CinnabarIsland_EventScript_167208, 0, 0, 0 - object_event 3, 73, 0, 20, 0, 7, 0, 3, 10, 17, 0, 0, 0, 0, 0, 0x0, 98, 0, 0 - object_event 4, 108, 0, 23, 0, 7, 0, 1, 9, 17, 0, 0, 0, 0, 0, 0x0, 107, 0, 0 - -CinnabarIsland_MapWarps: - warp_def 8, 3, 0, 1, 315 - warp_def 20, 4, 0, 1, 3072 - warp_def 8, 9, 0, 1, 3073 - warp_def 14, 11, 0, 0, 3077 - warp_def 19, 11, 0, 1, 3079 - -CinnabarIsland_MapCoordEvents: - coord_event 20, 5, 3, 0, 16385, 0, 0, CinnabarIsland_EventScript_1671CA - -CinnabarIsland_MapBGEvents: - bg_event 12, 3, 0, 0, 0, CinnabarIsland_EventScript_167211 - bg_event 9, 9, 0, 0, 0, CinnabarIsland_EventScript_16721A - bg_event 22, 5, 0, 0, 0, CinnabarIsland_EventScript_167223 - bg_event 10, 9, 0, 0, 0, CinnabarIsland_EventScript_16721A - -CinnabarIsland_MapEvents:: - map_events CinnabarIsland_EventObjects, CinnabarIsland_MapWarps, CinnabarIsland_MapCoordEvents, CinnabarIsland_MapBGEvents diff --git a/data/maps/CinnabarIsland/header.inc b/data/maps/CinnabarIsland/header.inc deleted file mode 100644 index 49ec94a3b..000000000 --- a/data/maps/CinnabarIsland/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CinnabarIsland:: @ 83506F8 - .4byte CinnabarIsland_Layout @ 0x82E3B20 - .4byte CinnabarIsland_MapEvents @ 0x83B5BF0 - .4byte CinnabarIsland_MapScripts @ 0x8166ED6 - .4byte CinnabarIsland_MapConnections @ 0x83528A8 - .2byte BGM_FRLG_CINNABAR_ISLAND - .2byte 86 - .byte 0x60, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/CinnabarIsland/map.json b/data/maps/CinnabarIsland/map.json new file mode 100644 index 000000000..395daeb62 --- /dev/null +++ b/data/maps/CinnabarIsland/map.json @@ -0,0 +1,158 @@ +{ + "id": "MAP_CINNABAR_ISLAND", + "name": "CinnabarIsland", + "layout": "LAYOUT_CINNABAR_ISLAND", + "music": "BGM_FRLG_CINNABAR_ISLAND", + "region_map_section": "MAPSEC_CINNABAR_ISLAND", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_1", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_ROUTE21_SOUTH", + "offset": 0, + "direction": "up" + }, + { + "map": "MAP_ROUTE20", + "offset": 0, + "direction": "right" + } + ], + "object_events": [ + { + "graphics_id": "28", + "x": 14, + "y": 6, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CinnabarIsland_EventScript_1671EF", + "flag": "0" + }, + { + "graphics_id": "32", + "x": 11, + "y": 11, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CinnabarIsland_EventScript_167208", + "flag": "0" + }, + { + "graphics_id": "73", + "x": 20, + "y": 7, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "98" + }, + { + "graphics_id": "108", + "x": 23, + "y": 7, + "elevation": 1, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "107" + } + ], + "warp_events": [ + { + "x": 8, + "y": 3, + "elevation": 0, + "dest_map": "MAP_POKEMON_MANSION_1F", + "dest_warp_id": 1 + }, + { + "x": 20, + "y": 4, + "elevation": 0, + "dest_map": "MAP_CINNABAR_ISLAND_GYM", + "dest_warp_id": 1 + }, + { + "x": 8, + "y": 9, + "elevation": 0, + "dest_map": "MAP_CINNABAR_ISLAND_POKEMON_LAB_ENTRANCE", + "dest_warp_id": 1 + }, + { + "x": 14, + "y": 11, + "elevation": 0, + "dest_map": "MAP_CINNABAR_ISLAND_POKEMON_CENTER_1F", + "dest_warp_id": 0 + }, + { + "x": 19, + "y": 11, + "elevation": 0, + "dest_map": "MAP_CINNABAR_ISLAND_MART", + "dest_warp_id": 1 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 20, + "y": 5, + "elevation": 3, + "var": "VAR_0x4001", + "var_value": 0, + "script": "CinnabarIsland_EventScript_1671CA" + } + ], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 12, + "y": 3, + "elevation": 0, + "script": "CinnabarIsland_EventScript_167211" + }, + { + "type": "bg_event_type_0", + "x": 9, + "y": 9, + "elevation": 0, + "script": "CinnabarIsland_EventScript_16721A" + }, + { + "type": "bg_event_type_0", + "x": 22, + "y": 5, + "elevation": 0, + "script": "CinnabarIsland_EventScript_167223" + }, + { + "type": "bg_event_type_0", + "x": 10, + "y": 9, + "elevation": 0, + "script": "CinnabarIsland_EventScript_16721A" + } + ] +} \ No newline at end of file diff --git a/data/maps/CinnabarIsland_Gym/events.inc b/data/maps/CinnabarIsland_Gym/events.inc deleted file mode 100644 index b5f8e63bf..000000000 --- a/data/maps/CinnabarIsland_Gym/events.inc +++ /dev/null @@ -1,35 +0,0 @@ -CinnabarIsland_Gym_EventObjects: - object_event 1, 52, 0, 25, 0, 11, 0, 3, 8, 17, 0, 1, 0, 0, 0, CinnabarIsland_Gym_EventScript_16DB27, 0, 0, 0 - object_event 2, 55, 0, 25, 0, 4, 0, 3, 8, 17, 0, 1, 0, 0, 0, CinnabarIsland_Gym_EventScript_16DA7F, 0, 0, 0 - object_event 3, 55, 0, 17, 0, 5, 0, 3, 8, 17, 0, 1, 0, 0, 0, CinnabarIsland_Gym_EventScript_16DA96, 0, 0, 0 - object_event 4, 52, 0, 16, 0, 11, 0, 3, 8, 17, 0, 1, 0, 0, 0, CinnabarIsland_Gym_EventScript_16DB53, 0, 0, 0 - object_event 5, 55, 0, 16, 0, 18, 0, 3, 8, 17, 0, 1, 0, 0, 0, CinnabarIsland_Gym_EventScript_16DAC2, 0, 0, 0 - object_event 6, 52, 0, 4, 0, 19, 0, 3, 8, 17, 0, 1, 0, 0, 0, CinnabarIsland_Gym_EventScript_16DB7F, 0, 0, 0 - object_event 7, 55, 0, 4, 0, 11, 0, 3, 8, 17, 0, 1, 0, 0, 0, CinnabarIsland_Gym_EventScript_16DAFB, 0, 0, 0 - object_event 8, 86, 0, 5, 0, 4, 0, 3, 8, 17, 0, 0, 0, 0, 0, CinnabarIsland_Gym_EventScript_16D9D4, 0, 0, 0 - object_event 9, 91, 0, 24, 0, 20, 0, 3, 8, 17, 0, 0, 0, 0, 0, CinnabarIsland_Gym_EventScript_16DBAB, 0, 0, 0 - -CinnabarIsland_Gym_MapWarps: - warp_def 24, 23, 3, 1, 776 - warp_def 25, 23, 3, 1, 776 - warp_def 26, 23, 3, 1, 776 - -CinnabarIsland_Gym_MapBGEvents: - bg_event 23, 20, 0, 0, 0, CinnabarIsland_Gym_EventScript_16DBCA - bg_event 27, 20, 0, 0, 0, CinnabarIsland_Gym_EventScript_16DBCA - bg_event 22, 10, 0, 1, 0, CinnabarIsland_Gym_EventScript_16DBE8 - bg_event 23, 10, 0, 1, 0, CinnabarIsland_Gym_EventScript_16DBF4 - bg_event 15, 2, 0, 1, 0, CinnabarIsland_Gym_EventScript_16DCDD - bg_event 16, 2, 0, 1, 0, CinnabarIsland_Gym_EventScript_16DCE9 - bg_event 13, 10, 0, 1, 0, CinnabarIsland_Gym_EventScript_16DDBB - bg_event 14, 10, 0, 1, 0, CinnabarIsland_Gym_EventScript_16DDC7 - bg_event 13, 17, 0, 1, 0, CinnabarIsland_Gym_EventScript_16DE92 - bg_event 14, 17, 0, 1, 0, CinnabarIsland_Gym_EventScript_16DE9E - bg_event 1, 18, 0, 1, 0, CinnabarIsland_Gym_EventScript_16DF69 - bg_event 2, 18, 0, 1, 0, CinnabarIsland_Gym_EventScript_16DF75 - bg_event 1, 10, 0, 1, 0, CinnabarIsland_Gym_EventScript_16E040 - bg_event 2, 10, 0, 1, 0, CinnabarIsland_Gym_EventScript_16E04C - bg_event 3, 1, 0, 1, 0, CinnabarIsland_Gym_EventScript_1ACF07 - -CinnabarIsland_Gym_MapEvents:: - map_events CinnabarIsland_Gym_EventObjects, CinnabarIsland_Gym_MapWarps, 0x0, CinnabarIsland_Gym_MapBGEvents diff --git a/data/maps/CinnabarIsland_Gym/header.inc b/data/maps/CinnabarIsland_Gym/header.inc deleted file mode 100644 index 902408c88..000000000 --- a/data/maps/CinnabarIsland_Gym/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CinnabarIsland_Gym:: @ 8351530 - .4byte CinnabarIsland_Gym_Layout @ 0x82D82C8 - .4byte CinnabarIsland_Gym_MapEvents @ 0x83BC62C - .4byte CinnabarIsland_Gym_MapScripts @ 0x816D94B - .4byte NULL - .2byte BGM_FRLG_GYM - .2byte 36 - .byte 0x60, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01 diff --git a/data/maps/CinnabarIsland_Gym/map.json b/data/maps/CinnabarIsland_Gym/map.json new file mode 100644 index 000000000..cb22dda7d --- /dev/null +++ b/data/maps/CinnabarIsland_Gym/map.json @@ -0,0 +1,265 @@ +{ + "id": "MAP_CINNABAR_ISLAND_GYM", + "name": "CinnabarIsland_Gym", + "layout": "LAYOUT_CINNABAR_ISLAND_GYM", + "music": "BGM_FRLG_GYM", + "region_map_section": "MAPSEC_CINNABAR_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_1", + "connections": null, + "object_events": [ + { + "graphics_id": "52", + "x": 25, + "y": 11, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "CinnabarIsland_Gym_EventScript_16DB27", + "flag": "0" + }, + { + "graphics_id": "55", + "x": 25, + "y": 4, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "CinnabarIsland_Gym_EventScript_16DA7F", + "flag": "0" + }, + { + "graphics_id": "55", + "x": 17, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "CinnabarIsland_Gym_EventScript_16DA96", + "flag": "0" + }, + { + "graphics_id": "52", + "x": 16, + "y": 11, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "CinnabarIsland_Gym_EventScript_16DB53", + "flag": "0" + }, + { + "graphics_id": "55", + "x": 16, + "y": 18, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "CinnabarIsland_Gym_EventScript_16DAC2", + "flag": "0" + }, + { + "graphics_id": "52", + "x": 4, + "y": 19, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "CinnabarIsland_Gym_EventScript_16DB7F", + "flag": "0" + }, + { + "graphics_id": "55", + "x": 4, + "y": 11, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "CinnabarIsland_Gym_EventScript_16DAFB", + "flag": "0" + }, + { + "graphics_id": "86", + "x": 5, + "y": 4, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CinnabarIsland_Gym_EventScript_16D9D4", + "flag": "0" + }, + { + "graphics_id": "91", + "x": 24, + "y": 20, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CinnabarIsland_Gym_EventScript_16DBAB", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 24, + "y": 23, + "elevation": 3, + "dest_map": "MAP_CINNABAR_ISLAND", + "dest_warp_id": 1 + }, + { + "x": 25, + "y": 23, + "elevation": 3, + "dest_map": "MAP_CINNABAR_ISLAND", + "dest_warp_id": 1 + }, + { + "x": 26, + "y": 23, + "elevation": 3, + "dest_map": "MAP_CINNABAR_ISLAND", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 23, + "y": 20, + "elevation": 0, + "script": "CinnabarIsland_Gym_EventScript_16DBCA" + }, + { + "type": "bg_event_type_0", + "x": 27, + "y": 20, + "elevation": 0, + "script": "CinnabarIsland_Gym_EventScript_16DBCA" + }, + { + "type": "bg_event_type_1", + "x": 22, + "y": 10, + "elevation": 0, + "script": "CinnabarIsland_Gym_EventScript_16DBE8" + }, + { + "type": "bg_event_type_1", + "x": 23, + "y": 10, + "elevation": 0, + "script": "CinnabarIsland_Gym_EventScript_16DBF4" + }, + { + "type": "bg_event_type_1", + "x": 15, + "y": 2, + "elevation": 0, + "script": "CinnabarIsland_Gym_EventScript_16DCDD" + }, + { + "type": "bg_event_type_1", + "x": 16, + "y": 2, + "elevation": 0, + "script": "CinnabarIsland_Gym_EventScript_16DCE9" + }, + { + "type": "bg_event_type_1", + "x": 13, + "y": 10, + "elevation": 0, + "script": "CinnabarIsland_Gym_EventScript_16DDBB" + }, + { + "type": "bg_event_type_1", + "x": 14, + "y": 10, + "elevation": 0, + "script": "CinnabarIsland_Gym_EventScript_16DDC7" + }, + { + "type": "bg_event_type_1", + "x": 13, + "y": 17, + "elevation": 0, + "script": "CinnabarIsland_Gym_EventScript_16DE92" + }, + { + "type": "bg_event_type_1", + "x": 14, + "y": 17, + "elevation": 0, + "script": "CinnabarIsland_Gym_EventScript_16DE9E" + }, + { + "type": "bg_event_type_1", + "x": 1, + "y": 18, + "elevation": 0, + "script": "CinnabarIsland_Gym_EventScript_16DF69" + }, + { + "type": "bg_event_type_1", + "x": 2, + "y": 18, + "elevation": 0, + "script": "CinnabarIsland_Gym_EventScript_16DF75" + }, + { + "type": "bg_event_type_1", + "x": 1, + "y": 10, + "elevation": 0, + "script": "CinnabarIsland_Gym_EventScript_16E040" + }, + { + "type": "bg_event_type_1", + "x": 2, + "y": 10, + "elevation": 0, + "script": "CinnabarIsland_Gym_EventScript_16E04C" + }, + { + "type": "bg_event_type_1", + "x": 3, + "y": 1, + "elevation": 0, + "script": "CinnabarIsland_Gym_EventScript_1ACF07" + } + ] +} \ No newline at end of file diff --git a/data/maps/CinnabarIsland_Mart/events.inc b/data/maps/CinnabarIsland_Mart/events.inc deleted file mode 100644 index 9d582e374..000000000 --- a/data/maps/CinnabarIsland_Mart/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -CinnabarIsland_Mart_EventObjects: - object_event 1, 68, 0, 2, 0, 3, 0, 0, 10, 17, 0, 0, 0, 0, 0, CinnabarIsland_Mart_EventScript_16EA22, 0, 0, 0 - object_event 2, 28, 0, 6, 0, 2, 0, 3, 7, 17, 0, 0, 0, 0, 0, CinnabarIsland_Mart_EventScript_16EA10, 0, 0, 0 - object_event 3, 55, 0, 8, 0, 2, 0, 3, 7, 17, 0, 0, 0, 0, 0, CinnabarIsland_Mart_EventScript_16EA19, 0, 0, 0 - -CinnabarIsland_Mart_MapWarps: - warp_def 3, 7, 3, 4, 776 - warp_def 4, 7, 3, 4, 776 - warp_def 5, 7, 3, 4, 776 - -CinnabarIsland_Mart_MapEvents:: - map_events CinnabarIsland_Mart_EventObjects, CinnabarIsland_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/CinnabarIsland_Mart/header.inc b/data/maps/CinnabarIsland_Mart/header.inc deleted file mode 100644 index db46f06e4..000000000 --- a/data/maps/CinnabarIsland_Mart/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CinnabarIsland_Mart:: @ 83515F4 - .4byte Mart_Layout @ 0x82D5BCC - .4byte CinnabarIsland_Mart_MapEvents @ 0x83BC9A8 - .4byte CinnabarIsland_Mart_MapScripts @ 0x816EA0F - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 10 - .byte 0x60, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CinnabarIsland_Mart/map.json b/data/maps/CinnabarIsland_Mart/map.json new file mode 100644 index 000000000..5904c5e98 --- /dev/null +++ b/data/maps/CinnabarIsland_Mart/map.json @@ -0,0 +1,81 @@ +{ + "id": "MAP_CINNABAR_ISLAND_MART", + "name": "CinnabarIsland_Mart", + "layout": "LAYOUT_MART", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_CINNABAR_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "68", + "x": 2, + "y": 3, + "elevation": 0, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CinnabarIsland_Mart_EventScript_16EA22", + "flag": "0" + }, + { + "graphics_id": "28", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CinnabarIsland_Mart_EventScript_16EA10", + "flag": "0" + }, + { + "graphics_id": "55", + "x": 8, + "y": 2, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CinnabarIsland_Mart_EventScript_16EA19", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 3, + "dest_map": "MAP_CINNABAR_ISLAND", + "dest_warp_id": 4 + }, + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_CINNABAR_ISLAND", + "dest_warp_id": 4 + }, + { + "x": 5, + "y": 7, + "elevation": 3, + "dest_map": "MAP_CINNABAR_ISLAND", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/events.inc b/data/maps/CinnabarIsland_PokemonCenter_1F/events.inc deleted file mode 100644 index 50f4c6566..000000000 --- a/data/maps/CinnabarIsland_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,17 +0,0 @@ -CinnabarIsland_PokemonCenter_1F_EventObjects: - object_event 1, 64, 0, 7, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, CinnabarIsland_PokemonCenter_1F_EventScript_16E8E6, 0, 0, 0 - object_event 2, 42, 0, 2, 0, 4, 0, 3, 5, 17, 0, 0, 0, 0, 0, CinnabarIsland_PokemonCenter_1F_EventScript_16E8F8, 0, 0, 0 - object_event 3, 61, 0, 9, 0, 7, 0, 3, 2, 17, 0, 0, 0, 0, 0, CinnabarIsland_PokemonCenter_1F_EventScript_16E8EF, 0, 0, 0 - object_event 4, 18, 0, 14, 0, 6, 0, 3, 9, 17, 0, 0, 0, 0, 0, CinnabarIsland_PokemonCenter_1F_EventScript_16E901, 0, 0, 0 - object_event 5, 0, 0, 2, 0, 1, 0, 0, 76, 17, 0, 0, 0, 0, 0, CinnabarIsland_PokemonCenter_1F_EventScript_1AD0B9, 157, 0, 0 - object_event 6, 0, 0, 3, 0, 1, 0, 0, 76, 17, 0, 0, 0, 0, 0, CinnabarIsland_PokemonCenter_1F_EventScript_1AD0B9, 157, 0, 0 - object_event 7, 73, 0, 11, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, CinnabarIsland_PokemonCenter_1F_EventScript_16E90A, 162, 0, 0 - -CinnabarIsland_PokemonCenter_1F_MapWarps: - warp_def 7, 8, 0, 3, 776 - warp_def 6, 8, 3, 3, 776 - warp_def 8, 8, 0, 3, 776 - warp_def 1, 6, 4, 0, 3078 - -CinnabarIsland_PokemonCenter_1F_MapEvents:: - map_events CinnabarIsland_PokemonCenter_1F_EventObjects, CinnabarIsland_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/header.inc b/data/maps/CinnabarIsland_PokemonCenter_1F/header.inc deleted file mode 100644 index 61259eee7..000000000 --- a/data/maps/CinnabarIsland_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CinnabarIsland_PokemonCenter_1F:: @ 83515BC - .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte CinnabarIsland_PokemonCenter_1F_MapEvents @ 0x83BC8A8 - .4byte CinnabarIsland_PokemonCenter_1F_MapScripts @ 0x816E8D7 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 8 - .byte 0x60, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/map.json b/data/maps/CinnabarIsland_PokemonCenter_1F/map.json new file mode 100644 index 000000000..b325d8e96 --- /dev/null +++ b/data/maps/CinnabarIsland_PokemonCenter_1F/map.json @@ -0,0 +1,140 @@ +{ + "id": "MAP_CINNABAR_ISLAND_POKEMON_CENTER_1F", + "name": "CinnabarIsland_PokemonCenter_1F", + "layout": "LAYOUT_POKEMON_CENTER_1F", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_CINNABAR_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "64", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CinnabarIsland_PokemonCenter_1F_EventScript_16E8E6", + "flag": "0" + }, + { + "graphics_id": "42", + "x": 2, + "y": 4, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CinnabarIsland_PokemonCenter_1F_EventScript_16E8F8", + "flag": "0" + }, + { + "graphics_id": "61", + "x": 9, + "y": 7, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CinnabarIsland_PokemonCenter_1F_EventScript_16E8EF", + "flag": "0" + }, + { + "graphics_id": "18", + "x": 14, + "y": 6, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CinnabarIsland_PokemonCenter_1F_EventScript_16E901", + "flag": "0" + }, + { + "graphics_id": "0", + "x": 2, + "y": 1, + "elevation": 0, + "movement_type": "76", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CinnabarIsland_PokemonCenter_1F_EventScript_1AD0B9", + "flag": "157" + }, + { + "graphics_id": "0", + "x": 3, + "y": 1, + "elevation": 0, + "movement_type": "76", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CinnabarIsland_PokemonCenter_1F_EventScript_1AD0B9", + "flag": "157" + }, + { + "graphics_id": "73", + "x": 11, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CinnabarIsland_PokemonCenter_1F_EventScript_16E90A", + "flag": "162" + } + ], + "warp_events": [ + { + "x": 7, + "y": 8, + "elevation": 0, + "dest_map": "MAP_CINNABAR_ISLAND", + "dest_warp_id": 3 + }, + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_CINNABAR_ISLAND", + "dest_warp_id": 3 + }, + { + "x": 8, + "y": 8, + "elevation": 0, + "dest_map": "MAP_CINNABAR_ISLAND", + "dest_warp_id": 3 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_CINNABAR_ISLAND_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/CinnabarIsland_PokemonCenter_2F/events.inc b/data/maps/CinnabarIsland_PokemonCenter_2F/events.inc deleted file mode 100644 index 4d375567e..000000000 --- a/data/maps/CinnabarIsland_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -CinnabarIsland_PokemonCenter_2F_EventObjects: - object_event 1, 65, 0, 6, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, CinnabarIsland_PokemonCenter_2F_EventScript_1A8CF6, 0, 0, 0 - object_event 2, 65, 0, 2, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, CinnabarIsland_PokemonCenter_2F_EventScript_1A8CFC, 0, 0, 0 - object_event 3, 65, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, CinnabarIsland_PokemonCenter_2F_EventScript_1A8D02, 0, 0, 0 - object_event 4, 69, 0, 1, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, CinnabarIsland_PokemonCenter_2F_EventScript_1BB1D2, 112, 0, 0 - -CinnabarIsland_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 3, 3077 - warp_def 5, 1, 0, 0, 4 - warp_def 9, 1, 0, 0, 1 - -CinnabarIsland_PokemonCenter_2F_MapEvents:: - map_events CinnabarIsland_PokemonCenter_2F_EventObjects, CinnabarIsland_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/CinnabarIsland_PokemonCenter_2F/header.inc b/data/maps/CinnabarIsland_PokemonCenter_2F/header.inc deleted file mode 100644 index 462076704..000000000 --- a/data/maps/CinnabarIsland_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CinnabarIsland_PokemonCenter_2F:: @ 83515D8 - .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte CinnabarIsland_PokemonCenter_2F_MapEvents @ 0x83BC934 - .4byte CinnabarIsland_PokemonCenter_2F_MapScripts @ 0x816E9E8 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 9 - .byte 0x60, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CinnabarIsland_PokemonCenter_2F/map.json b/data/maps/CinnabarIsland_PokemonCenter_2F/map.json new file mode 100644 index 000000000..8eab88cd1 --- /dev/null +++ b/data/maps/CinnabarIsland_PokemonCenter_2F/map.json @@ -0,0 +1,94 @@ +{ + "id": "MAP_CINNABAR_ISLAND_POKEMON_CENTER_2F", + "name": "CinnabarIsland_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_CINNABAR_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "65", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CinnabarIsland_PokemonCenter_2F_EventScript_1A8CF6", + "flag": "0" + }, + { + "graphics_id": "65", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CinnabarIsland_PokemonCenter_2F_EventScript_1A8CFC", + "flag": "0" + }, + { + "graphics_id": "65", + "x": 10, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CinnabarIsland_PokemonCenter_2F_EventScript_1A8D02", + "flag": "0" + }, + { + "graphics_id": "69", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CinnabarIsland_PokemonCenter_2F_EventScript_1BB1D2", + "flag": "112" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_CINNABAR_ISLAND_POKEMON_CENTER_1F", + "dest_warp_id": 3 + }, + { + "x": 5, + "y": 1, + "elevation": 0, + "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 0, + "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/CinnabarIsland_PokemonLab_Entrance/events.inc b/data/maps/CinnabarIsland_PokemonLab_Entrance/events.inc deleted file mode 100644 index bb6eaa996..000000000 --- a/data/maps/CinnabarIsland_PokemonLab_Entrance/events.inc +++ /dev/null @@ -1,19 +0,0 @@ -CinnabarIsland_PokemonLab_Entrance_EventObjects: - object_event 1, 55, 0, 2, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, CinnabarIsland_PokemonLab_Entrance_EventScript_16E28B, 0, 0, 0 - -CinnabarIsland_PokemonLab_Entrance_MapWarps: - warp_def 3, 9, 3, 2, 776 - warp_def 4, 9, 3, 2, 776 - warp_def 5, 9, 3, 2, 776 - warp_def 13, 5, 0, 0, 3074 - warp_def 19, 5, 0, 0, 3075 - warp_def 25, 5, 0, 0, 3076 - -CinnabarIsland_PokemonLab_Entrance_MapBGEvents: - bg_event 4, 1, 0, 0, 0, CinnabarIsland_PokemonLab_Entrance_EventScript_16E294 - bg_event 12, 5, 0, 0, 0, CinnabarIsland_PokemonLab_Entrance_EventScript_16E29D - bg_event 18, 5, 0, 0, 0, CinnabarIsland_PokemonLab_Entrance_EventScript_16E2A6 - bg_event 24, 5, 0, 0, 0, CinnabarIsland_PokemonLab_Entrance_EventScript_16E2AF - -CinnabarIsland_PokemonLab_Entrance_MapEvents:: - map_events CinnabarIsland_PokemonLab_Entrance_EventObjects, CinnabarIsland_PokemonLab_Entrance_MapWarps, 0x0, CinnabarIsland_PokemonLab_Entrance_MapBGEvents diff --git a/data/maps/CinnabarIsland_PokemonLab_Entrance/header.inc b/data/maps/CinnabarIsland_PokemonLab_Entrance/header.inc deleted file mode 100644 index 8f1b3ce10..000000000 --- a/data/maps/CinnabarIsland_PokemonLab_Entrance/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CinnabarIsland_PokemonLab_Entrance:: @ 835154C - .4byte CinnabarIsland_PokemonLab_Entrance_Layout @ 0x831C804 - .4byte CinnabarIsland_PokemonLab_Entrance_MapEvents @ 0x83BC6B8 - .4byte CinnabarIsland_PokemonLab_Entrance_MapScripts @ 0x816E273 - .4byte NULL - .2byte BGM_FRLG_CINNABAR_ISLAND - .2byte 203 - .byte 0x60, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json b/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json new file mode 100644 index 000000000..51bba9ff3 --- /dev/null +++ b/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json @@ -0,0 +1,105 @@ +{ + "id": "MAP_CINNABAR_ISLAND_POKEMON_LAB_ENTRANCE", + "name": "CinnabarIsland_PokemonLab_Entrance", + "layout": "LAYOUT_CINNABAR_ISLAND_POKEMON_LAB_ENTRANCE", + "music": "BGM_FRLG_CINNABAR_ISLAND", + "region_map_section": "MAPSEC_CINNABAR_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "55", + "x": 2, + "y": 4, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CinnabarIsland_PokemonLab_Entrance_EventScript_16E28B", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 9, + "elevation": 3, + "dest_map": "MAP_CINNABAR_ISLAND", + "dest_warp_id": 2 + }, + { + "x": 4, + "y": 9, + "elevation": 3, + "dest_map": "MAP_CINNABAR_ISLAND", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 9, + "elevation": 3, + "dest_map": "MAP_CINNABAR_ISLAND", + "dest_warp_id": 2 + }, + { + "x": 13, + "y": 5, + "elevation": 0, + "dest_map": "MAP_CINNABAR_ISLAND_POKEMON_LAB_LOUNGE", + "dest_warp_id": 0 + }, + { + "x": 19, + "y": 5, + "elevation": 0, + "dest_map": "MAP_CINNABAR_ISLAND_POKEMON_LAB_RESEARCH_ROOM", + "dest_warp_id": 0 + }, + { + "x": 25, + "y": 5, + "elevation": 0, + "dest_map": "MAP_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 4, + "y": 1, + "elevation": 0, + "script": "CinnabarIsland_PokemonLab_Entrance_EventScript_16E294" + }, + { + "type": "bg_event_type_0", + "x": 12, + "y": 5, + "elevation": 0, + "script": "CinnabarIsland_PokemonLab_Entrance_EventScript_16E29D" + }, + { + "type": "bg_event_type_0", + "x": 18, + "y": 5, + "elevation": 0, + "script": "CinnabarIsland_PokemonLab_Entrance_EventScript_16E2A6" + }, + { + "type": "bg_event_type_0", + "x": 24, + "y": 5, + "elevation": 0, + "script": "CinnabarIsland_PokemonLab_Entrance_EventScript_16E2AF" + } + ] +} \ No newline at end of file diff --git a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/events.inc b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/events.inc deleted file mode 100644 index 75a21aaca..000000000 --- a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -CinnabarIsland_PokemonLab_ExperimentRoom_EventObjects: - object_event 1, 19, 0, 11, 0, 8, 0, 3, 7, 17, 0, 0, 0, 0, 0, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E401, 0, 0, 0 - object_event 2, 55, 0, 12, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E47D, 0, 0, 0 - -CinnabarIsland_PokemonLab_ExperimentRoom_MapWarps: - warp_def 7, 9, 3, 5, 3073 - -CinnabarIsland_PokemonLab_ExperimentRoom_MapEvents:: - map_events CinnabarIsland_PokemonLab_ExperimentRoom_EventObjects, CinnabarIsland_PokemonLab_ExperimentRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/header.inc b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/header.inc deleted file mode 100644 index f3dca36f6..000000000 --- a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CinnabarIsland_PokemonLab_ExperimentRoom:: @ 83515A0 - .4byte CinnabarIsland_PokemonLab_ExperimentRoom_Layout @ 0x831CC54 - .4byte CinnabarIsland_PokemonLab_ExperimentRoom_MapEvents @ 0x83BC7CC - .4byte CinnabarIsland_PokemonLab_ExperimentRoom_MapScripts @ 0x816E400 - .4byte NULL - .2byte BGM_FRLG_CINNABAR_ISLAND - .2byte 206 - .byte 0x60, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json new file mode 100644 index 000000000..8a12c33c7 --- /dev/null +++ b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json @@ -0,0 +1,54 @@ +{ + "id": "MAP_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM", + "name": "CinnabarIsland_PokemonLab_ExperimentRoom", + "layout": "LAYOUT_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM", + "music": "BGM_FRLG_CINNABAR_ISLAND", + "region_map_section": "MAPSEC_CINNABAR_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "19", + "x": 11, + "y": 8, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E401", + "flag": "0" + }, + { + "graphics_id": "55", + "x": 12, + "y": 3, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E47D", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 7, + "y": 9, + "elevation": 3, + "dest_map": "MAP_CINNABAR_ISLAND_POKEMON_LAB_ENTRANCE", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/CinnabarIsland_PokemonLab_Lounge/events.inc b/data/maps/CinnabarIsland_PokemonLab_Lounge/events.inc deleted file mode 100644 index 5a507173c..000000000 --- a/data/maps/CinnabarIsland_PokemonLab_Lounge/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -CinnabarIsland_PokemonLab_Lounge_EventObjects: - object_event 1, 55, 0, 5, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, CinnabarIsland_PokemonLab_Lounge_EventScript_16E2B9, 0, 0, 0 - object_event 2, 33, 0, 4, 0, 6, 0, 3, 8, 17, 0, 0, 0, 0, 0, CinnabarIsland_PokemonLab_Lounge_EventScript_16E2C2, 0, 0, 0 - object_event 3, 28, 0, 10, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, CinnabarIsland_PokemonLab_Lounge_EventScript_16E33E, 0, 0, 0 - -CinnabarIsland_PokemonLab_Lounge_MapWarps: - warp_def 7, 9, 3, 3, 3073 - -CinnabarIsland_PokemonLab_Lounge_MapEvents:: - map_events CinnabarIsland_PokemonLab_Lounge_EventObjects, CinnabarIsland_PokemonLab_Lounge_MapWarps, 0x0, 0x0 diff --git a/data/maps/CinnabarIsland_PokemonLab_Lounge/header.inc b/data/maps/CinnabarIsland_PokemonLab_Lounge/header.inc deleted file mode 100644 index ae3a567d7..000000000 --- a/data/maps/CinnabarIsland_PokemonLab_Lounge/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CinnabarIsland_PokemonLab_Lounge:: @ 8351568 - .4byte CinnabarIsland_PokemonLab_Lounge_Layout @ 0x831C974 - .4byte CinnabarIsland_PokemonLab_Lounge_MapEvents @ 0x83BC71C - .4byte CinnabarIsland_PokemonLab_Lounge_MapScripts @ 0x816E2B8 - .4byte NULL - .2byte BGM_FRLG_CINNABAR_ISLAND - .2byte 204 - .byte 0x60, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json b/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json new file mode 100644 index 000000000..6fb33bc66 --- /dev/null +++ b/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json @@ -0,0 +1,67 @@ +{ + "id": "MAP_CINNABAR_ISLAND_POKEMON_LAB_LOUNGE", + "name": "CinnabarIsland_PokemonLab_Lounge", + "layout": "LAYOUT_CINNABAR_ISLAND_POKEMON_LAB_LOUNGE", + "music": "BGM_FRLG_CINNABAR_ISLAND", + "region_map_section": "MAPSEC_CINNABAR_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "55", + "x": 5, + "y": 3, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CinnabarIsland_PokemonLab_Lounge_EventScript_16E2B9", + "flag": "0" + }, + { + "graphics_id": "33", + "x": 4, + "y": 6, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CinnabarIsland_PokemonLab_Lounge_EventScript_16E2C2", + "flag": "0" + }, + { + "graphics_id": "28", + "x": 10, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CinnabarIsland_PokemonLab_Lounge_EventScript_16E33E", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 7, + "y": 9, + "elevation": 3, + "dest_map": "MAP_CINNABAR_ISLAND_POKEMON_LAB_ENTRANCE", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/events.inc b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/events.inc deleted file mode 100644 index 5d42ba425..000000000 --- a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -CinnabarIsland_PokemonLab_ResearchRoom_EventObjects: - object_event 1, 52, 0, 5, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3DF, 0, 0, 0 - object_event 2, 55, 0, 10, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3E5, 0, 0, 0 - -CinnabarIsland_PokemonLab_ResearchRoom_MapWarps: - warp_def 7, 9, 3, 4, 3073 - -CinnabarIsland_PokemonLab_ResearchRoom_MapBGEvents: - bg_event 6, 1, 0, 0, 0, CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3F7 - bg_event 3, 1, 0, 0, 0, CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3EE - -CinnabarIsland_PokemonLab_ResearchRoom_MapEvents:: - map_events CinnabarIsland_PokemonLab_ResearchRoom_EventObjects, CinnabarIsland_PokemonLab_ResearchRoom_MapWarps, 0x0, CinnabarIsland_PokemonLab_ResearchRoom_MapBGEvents diff --git a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/header.inc b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/header.inc deleted file mode 100644 index 34e60e452..000000000 --- a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -CinnabarIsland_PokemonLab_ResearchRoom:: @ 8351584 - .4byte CinnabarIsland_PokemonLab_ResearchRoom_Layout @ 0x831CAE4 - .4byte CinnabarIsland_PokemonLab_ResearchRoom_MapEvents @ 0x83BC780 - .4byte CinnabarIsland_PokemonLab_ResearchRoom_MapScripts @ 0x816E3DE - .4byte NULL - .2byte BGM_FRLG_CINNABAR_ISLAND - .2byte 205 - .byte 0x60, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json new file mode 100644 index 000000000..f1d049604 --- /dev/null +++ b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json @@ -0,0 +1,69 @@ +{ + "id": "MAP_CINNABAR_ISLAND_POKEMON_LAB_RESEARCH_ROOM", + "name": "CinnabarIsland_PokemonLab_ResearchRoom", + "layout": "LAYOUT_CINNABAR_ISLAND_POKEMON_LAB_RESEARCH_ROOM", + "music": "BGM_FRLG_CINNABAR_ISLAND", + "region_map_section": "MAPSEC_CINNABAR_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "52", + "x": 5, + "y": 4, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3DF", + "flag": "0" + }, + { + "graphics_id": "55", + "x": 10, + "y": 3, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3E5", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 7, + "y": 9, + "elevation": 3, + "dest_map": "MAP_CINNABAR_ISLAND_POKEMON_LAB_ENTRANCE", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 6, + "y": 1, + "elevation": 0, + "script": "CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3F7" + }, + { + "type": "bg_event_type_0", + "x": 3, + "y": 1, + "elevation": 0, + "script": "CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3EE" + } + ] +} \ No newline at end of file diff --git a/data/maps/DiglettsCave_B1F/events.inc b/data/maps/DiglettsCave_B1F/events.inc deleted file mode 100644 index 28fc71f2e..000000000 --- a/data/maps/DiglettsCave_B1F/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -DiglettsCave_B1F_MapWarps: - warp_def 3, 3, 3, 0, 292 - warp_def 82, 71, 3, 1, 294 - -DiglettsCave_B1F_MapEvents:: - map_events 0x0, DiglettsCave_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/DiglettsCave_B1F/header.inc b/data/maps/DiglettsCave_B1F/header.inc deleted file mode 100644 index c72ae342e..000000000 --- a/data/maps/DiglettsCave_B1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -DiglettsCave_B1F:: @ 834F620 - .4byte DiglettsCave_B1F_Layout @ 0x8303B68 - .4byte DiglettsCave_B1F_MapEvents @ 0x83AF490 - .4byte DiglettsCave_B1F_MapScripts @ 0x8160EF1 - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_FOREST - .2byte 124 - .byte 0x83, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/DiglettsCave_B1F/map.json b/data/maps/DiglettsCave_B1F/map.json new file mode 100644 index 000000000..0494960fb --- /dev/null +++ b/data/maps/DiglettsCave_B1F/map.json @@ -0,0 +1,34 @@ +{ + "id": "MAP_DIGLETTS_CAVE_B1F", + "name": "DiglettsCave_B1F", + "layout": "LAYOUT_DIGLETTS_CAVE_B1F", + "music": "BGM_FRLG_VIRIDIAN_FOREST", + "region_map_section": "MAPSEC_DIGLETTS_CAVE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 3, + "y": 3, + "elevation": 3, + "dest_map": "MAP_DIGLETTS_CAVE_NORTH_ENTRANCE", + "dest_warp_id": 0 + }, + { + "x": 82, + "y": 71, + "elevation": 3, + "dest_map": "MAP_DIGLETTS_CAVE_SOUTH_ENTRANCE", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/DiglettsCave_NorthEntrance/events.inc b/data/maps/DiglettsCave_NorthEntrance/events.inc deleted file mode 100644 index 6f209ac58..000000000 --- a/data/maps/DiglettsCave_NorthEntrance/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -DiglettsCave_NorthEntrance_EventObjects: - object_event 1, 56, 0, 4, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, DiglettsCave_NorthEntrance_EventScript_160EE8, 0, 0, 0 - -DiglettsCave_NorthEntrance_MapWarps: - warp_def 6, 4, 3, 0, 293 - warp_def 4, 6, 3, 3, 788 - -DiglettsCave_NorthEntrance_MapEvents:: - map_events DiglettsCave_NorthEntrance_EventObjects, DiglettsCave_NorthEntrance_MapWarps, 0x0, 0x0 diff --git a/data/maps/DiglettsCave_NorthEntrance/header.inc b/data/maps/DiglettsCave_NorthEntrance/header.inc deleted file mode 100644 index ecdeaba44..000000000 --- a/data/maps/DiglettsCave_NorthEntrance/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -DiglettsCave_NorthEntrance:: @ 834F604 - .4byte DiglettsCave_NorthEntrance_Layout @ 0x831EB94 - .4byte DiglettsCave_NorthEntrance_MapEvents @ 0x83AF46C - .4byte DiglettsCave_NorthEntrance_MapScripts @ 0x8160EE7 - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_FOREST - .2byte 210 - .byte 0x83, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/DiglettsCave_NorthEntrance/map.json b/data/maps/DiglettsCave_NorthEntrance/map.json new file mode 100644 index 000000000..77947f6db --- /dev/null +++ b/data/maps/DiglettsCave_NorthEntrance/map.json @@ -0,0 +1,48 @@ +{ + "id": "MAP_DIGLETTS_CAVE_NORTH_ENTRANCE", + "name": "DiglettsCave_NorthEntrance", + "layout": "LAYOUT_DIGLETTS_CAVE_NORTH_ENTRANCE", + "music": "BGM_FRLG_VIRIDIAN_FOREST", + "region_map_section": "MAPSEC_DIGLETTS_CAVE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "56", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DiglettsCave_NorthEntrance_EventScript_160EE8", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 4, + "elevation": 3, + "dest_map": "MAP_DIGLETTS_CAVE_B1F", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 6, + "elevation": 3, + "dest_map": "MAP_ROUTE2", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/DiglettsCave_SouthEntrance/events.inc b/data/maps/DiglettsCave_SouthEntrance/events.inc deleted file mode 100644 index 3fcda108c..000000000 --- a/data/maps/DiglettsCave_SouthEntrance/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -DiglettsCave_SouthEntrance_EventObjects: - object_event 1, 32, 0, 4, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, DiglettsCave_SouthEntrance_EventScript_160EFC, 0, 0, 0 - -DiglettsCave_SouthEntrance_MapWarps: - warp_def 4, 6, 3, 0, 797 - warp_def 6, 4, 3, 1, 293 - -DiglettsCave_SouthEntrance_MapEvents:: - map_events DiglettsCave_SouthEntrance_EventObjects, DiglettsCave_SouthEntrance_MapWarps, 0x0, 0x0 diff --git a/data/maps/DiglettsCave_SouthEntrance/header.inc b/data/maps/DiglettsCave_SouthEntrance/header.inc deleted file mode 100644 index 5c84c5307..000000000 --- a/data/maps/DiglettsCave_SouthEntrance/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -DiglettsCave_SouthEntrance:: @ 834F63C - .4byte DiglettsCave_SouthEntrance_Layout @ 0x831EC58 - .4byte DiglettsCave_SouthEntrance_MapEvents @ 0x83AF4CC - .4byte DiglettsCave_SouthEntrance_MapScripts @ 0x8160EFB - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_FOREST - .2byte 211 - .byte 0x83, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/DiglettsCave_SouthEntrance/map.json b/data/maps/DiglettsCave_SouthEntrance/map.json new file mode 100644 index 000000000..2cbe9c6e0 --- /dev/null +++ b/data/maps/DiglettsCave_SouthEntrance/map.json @@ -0,0 +1,48 @@ +{ + "id": "MAP_DIGLETTS_CAVE_SOUTH_ENTRANCE", + "name": "DiglettsCave_SouthEntrance", + "layout": "LAYOUT_DIGLETTS_CAVE_SOUTH_ENTRANCE", + "music": "BGM_FRLG_VIRIDIAN_FOREST", + "region_map_section": "MAPSEC_DIGLETTS_CAVE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "32", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DiglettsCave_SouthEntrance_EventScript_160EFC", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 6, + "elevation": 3, + "dest_map": "MAP_ROUTE11", + "dest_warp_id": 0 + }, + { + "x": 6, + "y": 4, + "elevation": 3, + "dest_map": "MAP_DIGLETTS_CAVE_B1F", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FiveIsland/connections.inc b/data/maps/FiveIsland/connections.inc deleted file mode 100644 index 358b5e899..000000000 --- a/data/maps/FiveIsland/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -FiveIsland_MapConnectionsList: @ 8352988 - connection up, -48, MAP_FIVE_ISLAND_WATERLABYRINTH - connection right, 0, MAP_FIVE_ISLAND_MEADOW - -FiveIsland_MapConnections:: @ 83529A0 - .4byte 2 - .4byte FiveIsland_MapConnectionsList diff --git a/data/maps/FiveIsland/events.inc b/data/maps/FiveIsland/events.inc deleted file mode 100644 index 251987b17..000000000 --- a/data/maps/FiveIsland/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -FiveIsland_EventObjects: - object_event 1, 57, 0, 8, 0, 5, 0, 3, 9, 17, 0, 0, 0, 0, 0, FiveIsland_EventScript_167EAA, 0, 0, 0 - object_event 2, 20, 0, 16, 0, 10, 0, 3, 2, 17, 0, 0, 0, 0, 0, FiveIsland_EventScript_167EA1, 0, 0, 0 - object_event 3, 65375, 0, 32, 0, 9, 0, 4, 0, 0, 0, 56, 0, 3, 0, 0x0, 0, 0, 0 - -FiveIsland_MapWarps: - warp_def 12, 14, 3, 0, 9218 - warp_def 18, 6, 0, 0, 9216 - warp_def 12, 6, 0, 0, 9219 - warp_def 22, 9, 0, 0, 9220 - -FiveIsland_MapBGEvents: - bg_event 20, 8, 0, 0, 0, FiveIsland_EventScript_167E98 - -FiveIsland_MapEvents:: - map_events FiveIsland_EventObjects, FiveIsland_MapWarps, 0x0, FiveIsland_MapBGEvents diff --git a/data/maps/FiveIsland/header.inc b/data/maps/FiveIsland/header.inc deleted file mode 100644 index b38c6fa44..000000000 --- a/data/maps/FiveIsland/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FiveIsland:: @ 83507D8 - .4byte FiveIsland_Layout @ 0x8323964 - .4byte FiveIsland_MapEvents @ 0x83B64F4 - .4byte FiveIsland_MapScripts @ 0x8167E8E - .4byte FiveIsland_MapConnections @ 0x83529A0 - .2byte BGM_FRLG_ISLAND_FOUR - .2byte 234 - .byte 0x93, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/FiveIsland/map.json b/data/maps/FiveIsland/map.json new file mode 100644 index 000000000..b34f0aaf0 --- /dev/null +++ b/data/maps/FiveIsland/map.json @@ -0,0 +1,107 @@ +{ + "id": "MAP_FIVE_ISLAND", + "name": "FiveIsland", + "layout": "LAYOUT_FIVE_ISLAND", + "music": "BGM_FRLG_ISLAND_FOUR", + "region_map_section": "MAPSEC_FIVE_ISLAND", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_1", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_FIVE_ISLAND_WATER_LABYRINTH", + "offset": -48, + "direction": "up" + }, + { + "map": "MAP_FIVE_ISLAND_MEADOW", + "offset": 0, + "direction": "right" + } + ], + "object_events": [ + { + "graphics_id": "57", + "x": 8, + "y": 5, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FiveIsland_EventScript_167EAA", + "flag": "0" + }, + { + "graphics_id": "20", + "x": 16, + "y": 10, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FiveIsland_EventScript_167EA1", + "flag": "0" + }, + { + "graphics_id": "65375", + "x": 32, + "y": 9, + "elevation": 4, + "movement_type": "0", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 56, + "trainer_sight_or_berry_tree_id": 3, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 12, + "y": 14, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_HARBOR", + "dest_warp_id": 0 + }, + { + "x": 18, + "y": 6, + "elevation": 0, + "dest_map": "MAP_FIVE_ISLAND_POKEMON_CENTER_1F", + "dest_warp_id": 0 + }, + { + "x": 12, + "y": 6, + "elevation": 0, + "dest_map": "MAP_FIVE_ISLAND_HOUSE1", + "dest_warp_id": 0 + }, + { + "x": 22, + "y": 9, + "elevation": 0, + "dest_map": "MAP_FIVE_ISLAND_HOUSE2", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 20, + "y": 8, + "elevation": 0, + "script": "FiveIsland_EventScript_167E98" + } + ] +} \ No newline at end of file diff --git a/data/maps/FiveIsland_Harbor/events.inc b/data/maps/FiveIsland_Harbor/events.inc deleted file mode 100644 index 6417e1ee7..000000000 --- a/data/maps/FiveIsland_Harbor/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -FiveIsland_Harbor_EventObjects: - object_event 1, 108, 0, 8, 0, 9, 0, 0, 8, 17, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 2, 62, 0, 8, 0, 6, 0, 3, 7, 17, 0, 0, 0, 0, 0, FiveIsland_Harbor_EventScript_171D43, 0, 0, 0 - -FiveIsland_Harbor_MapWarps: - warp_def 8, 2, 3, 0, 784 - -FiveIsland_Harbor_MapEvents:: - map_events FiveIsland_Harbor_EventObjects, FiveIsland_Harbor_MapWarps, 0x0, 0x0 diff --git a/data/maps/FiveIsland_Harbor/header.inc b/data/maps/FiveIsland_Harbor/header.inc deleted file mode 100644 index 1f7a96309..000000000 --- a/data/maps/FiveIsland_Harbor/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FiveIsland_Harbor:: @ 8351E7C - .4byte Island_Harbor_Layout @ 0x8343FB8 - .4byte FiveIsland_Harbor_MapEvents @ 0x83BEFB4 - .4byte FiveIsland_Harbor_MapScripts @ 0x8171D42 - .4byte NULL - .2byte BGM_FRLG_ISLAND_FOUR - .2byte 315 - .byte 0x93, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/FiveIsland_Harbor/map.json b/data/maps/FiveIsland_Harbor/map.json new file mode 100644 index 000000000..96b4c12b2 --- /dev/null +++ b/data/maps/FiveIsland_Harbor/map.json @@ -0,0 +1,54 @@ +{ + "id": "MAP_FIVE_ISLAND_HARBOR", + "name": "FiveIsland_Harbor", + "layout": "LAYOUT_ISLAND_HARBOR", + "music": "BGM_FRLG_ISLAND_FOUR", + "region_map_section": "MAPSEC_FIVE_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "108", + "x": 8, + "y": 9, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "62", + "x": 8, + "y": 6, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FiveIsland_Harbor_EventScript_171D43", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 8, + "y": 2, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FiveIsland_House1/events.inc b/data/maps/FiveIsland_House1/events.inc deleted file mode 100644 index 8c965a738..000000000 --- a/data/maps/FiveIsland_House1/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -FiveIsland_House1_EventObjects: - object_event 1, 31, 0, 10, 0, 2, 0, 3, 7, 17, 0, 0, 0, 0, 0, FiveIsland_House1_EventScript_171D57, 0, 0, 0 - -FiveIsland_House1_MapWarps: - warp_def 4, 7, 3, 2, 784 - -FiveIsland_House1_MapEvents:: - map_events FiveIsland_House1_EventObjects, FiveIsland_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/FiveIsland_House1/header.inc b/data/maps/FiveIsland_House1/header.inc deleted file mode 100644 index 11d3865ff..000000000 --- a/data/maps/FiveIsland_House1/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FiveIsland_House1:: @ 8351E98 - .4byte House3_Layout @ 0x82D5CB8 - .4byte FiveIsland_House1_MapEvents @ 0x83BEFE8 - .4byte FiveIsland_House1_MapScripts @ 0x8171D56 - .4byte NULL - .2byte BGM_FRLG_ISLAND_FOUR - .2byte 11 - .byte 0x93, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/FiveIsland_House1/map.json b/data/maps/FiveIsland_House1/map.json new file mode 100644 index 000000000..ffd475b42 --- /dev/null +++ b/data/maps/FiveIsland_House1/map.json @@ -0,0 +1,41 @@ +{ + "id": "MAP_FIVE_ISLAND_HOUSE1", + "name": "FiveIsland_House1", + "layout": "LAYOUT_HOUSE3", + "music": "BGM_FRLG_ISLAND_FOUR", + "region_map_section": "MAPSEC_FIVE_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "31", + "x": 10, + "y": 2, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FiveIsland_House1_EventScript_171D57", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FiveIsland_House2/events.inc b/data/maps/FiveIsland_House2/events.inc deleted file mode 100644 index 6884a009e..000000000 --- a/data/maps/FiveIsland_House2/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -FiveIsland_House2_EventObjects: - object_event 1, 32, 0, 2, 0, 3, 0, 3, 2, 33, 0, 0, 0, 0, 0, FiveIsland_House2_EventScript_171D61, 0, 0, 0 - -FiveIsland_House2_MapWarps: - warp_def 4, 7, 3, 3, 784 - -FiveIsland_House2_MapEvents:: - map_events FiveIsland_House2_EventObjects, FiveIsland_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/FiveIsland_House2/header.inc b/data/maps/FiveIsland_House2/header.inc deleted file mode 100644 index 09a7f015f..000000000 --- a/data/maps/FiveIsland_House2/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FiveIsland_House2:: @ 8351EB4 - .4byte House3_Layout @ 0x82D5CB8 - .4byte FiveIsland_House2_MapEvents @ 0x83BF01C - .4byte FiveIsland_House2_MapScripts @ 0x8171D60 - .4byte NULL - .2byte BGM_FRLG_ISLAND_FOUR - .2byte 11 - .byte 0x93, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/FiveIsland_House2/map.json b/data/maps/FiveIsland_House2/map.json new file mode 100644 index 000000000..bc3d2853c --- /dev/null +++ b/data/maps/FiveIsland_House2/map.json @@ -0,0 +1,41 @@ +{ + "id": "MAP_FIVE_ISLAND_HOUSE2", + "name": "FiveIsland_House2", + "layout": "LAYOUT_HOUSE3", + "music": "BGM_FRLG_ISLAND_FOUR", + "region_map_section": "MAPSEC_FIVE_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "32", + "x": 2, + "y": 3, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FiveIsland_House2_EventScript_171D61", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FiveIsland_LostCave_Entrance/events.inc b/data/maps/FiveIsland_LostCave_Entrance/events.inc deleted file mode 100644 index 663c7163d..000000000 --- a/data/maps/FiveIsland_LostCave_Entrance/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -FiveIsland_LostCave_Entrance_MapWarps: - warp_def 5, 8, 3, 0, 822 - warp_def 5, 5, 3, 0, 525 - -FiveIsland_LostCave_Entrance_MapEvents:: - map_events 0x0, FiveIsland_LostCave_Entrance_MapWarps, 0x0, 0x0 diff --git a/data/maps/FiveIsland_LostCave_Entrance/header.inc b/data/maps/FiveIsland_LostCave_Entrance/header.inc deleted file mode 100644 index 937061b53..000000000 --- a/data/maps/FiveIsland_LostCave_Entrance/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FiveIsland_LostCave_Entrance:: @ 83500D8 - .4byte FiveIsland_LostCave_Entrance_Layout @ 0x83454D8 - .4byte FiveIsland_LostCave_Entrance_MapEvents @ 0x83B4354 - .4byte FiveIsland_LostCave_Entrance_MapScripts @ 0x8164BEC - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 320 - .byte 0xb5, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/FiveIsland_LostCave_Entrance/map.json b/data/maps/FiveIsland_LostCave_Entrance/map.json new file mode 100644 index 000000000..c70a0558f --- /dev/null +++ b/data/maps/FiveIsland_LostCave_Entrance/map.json @@ -0,0 +1,34 @@ +{ + "id": "MAP_FIVE_ISLAND_LOST_CAVE_ENTRANCE", + "name": "FiveIsland_LostCave_Entrance", + "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ENTRANCE", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_LOST_CAVE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 5, + "y": 8, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_RESORT_GORGEOUS", + "dest_warp_id": 0 + }, + { + "x": 5, + "y": 5, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FiveIsland_LostCave_Room1/events.inc b/data/maps/FiveIsland_LostCave_Room1/events.inc deleted file mode 100644 index b9184c4d1..000000000 --- a/data/maps/FiveIsland_LostCave_Room1/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -FiveIsland_LostCave_Room1_EventObjects: - object_event 1, 56, 0, 5, 0, 4, 0, 3, 2, 17, 0, 1, 0, 1, 0, FiveIsland_LostCave_Room1_EventScript_164BF7, 0, 0, 0 - -FiveIsland_LostCave_Room1_MapWarps: - warp_def 8, 2, 3, 1, 524 - warp_def 5, 1, 3, 3, 525 - warp_def 8, 5, 3, 3, 526 - warp_def 5, 8, 3, 1, 525 - warp_def 2, 5, 3, 2, 525 - -FiveIsland_LostCave_Room1_MapEvents:: - map_events FiveIsland_LostCave_Room1_EventObjects, FiveIsland_LostCave_Room1_MapWarps, 0x0, 0x0 diff --git a/data/maps/FiveIsland_LostCave_Room1/header.inc b/data/maps/FiveIsland_LostCave_Room1/header.inc deleted file mode 100644 index c251be2c2..000000000 --- a/data/maps/FiveIsland_LostCave_Room1/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FiveIsland_LostCave_Room1:: @ 83500F4 - .4byte FiveIsland_LostCave_Room1_Layout @ 0x83455F0 - .4byte FiveIsland_LostCave_Room1_MapEvents @ 0x83B43A8 - .4byte FiveIsland_LostCave_Room1_MapScripts @ 0x8164BF6 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 321 - .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/FiveIsland_LostCave_Room1/map.json b/data/maps/FiveIsland_LostCave_Room1/map.json new file mode 100644 index 000000000..195e53dcb --- /dev/null +++ b/data/maps/FiveIsland_LostCave_Room1/map.json @@ -0,0 +1,69 @@ +{ + "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", + "name": "FiveIsland_LostCave_Room1", + "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM1", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_LOST_CAVE", + "requires_flash": false, + "weather": "WEATHER_6", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "56", + "x": 5, + "y": 4, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "FiveIsland_LostCave_Room1_EventScript_164BF7", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 8, + "y": 2, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ENTRANCE", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 1, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", + "dest_warp_id": 3 + }, + { + "x": 8, + "y": 5, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM2", + "dest_warp_id": 3 + }, + { + "x": 5, + "y": 8, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", + "dest_warp_id": 1 + }, + { + "x": 2, + "y": 5, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FiveIsland_LostCave_Room10/events.inc b/data/maps/FiveIsland_LostCave_Room10/events.inc deleted file mode 100644 index 49d050fc3..000000000 --- a/data/maps/FiveIsland_LostCave_Room10/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -FiveIsland_LostCave_Room10_EventObjects: - object_event 1, 28, 0, 5, 0, 5, 0, 3, 7, 17, 0, 0, 0, 0, 0, 0x0, 147, 0, 0 - object_event 2, 92, 0, 5, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, FiveIsland_LostCave_Room10_EventScript_1BEDBB, 504, 0, 0 - -FiveIsland_LostCave_Room10_MapWarps: - warp_def 5, 8, 3, 1, 525 - -FiveIsland_LostCave_Room10_MapEvents:: - map_events FiveIsland_LostCave_Room10_EventObjects, FiveIsland_LostCave_Room10_MapWarps, 0x0, 0x0 diff --git a/data/maps/FiveIsland_LostCave_Room10/header.inc b/data/maps/FiveIsland_LostCave_Room10/header.inc deleted file mode 100644 index e27634f92..000000000 --- a/data/maps/FiveIsland_LostCave_Room10/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FiveIsland_LostCave_Room10:: @ 83501F0 - .4byte FiveIsland_LostCave_Room10_Layout @ 0x8345FC8 - .4byte FiveIsland_LostCave_Room10_MapEvents @ 0x83B45AC - .4byte FiveIsland_LostCave_Room10_MapScripts @ 0x8164C2D - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 330 - .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/FiveIsland_LostCave_Room10/map.json b/data/maps/FiveIsland_LostCave_Room10/map.json new file mode 100644 index 000000000..42e7f0179 --- /dev/null +++ b/data/maps/FiveIsland_LostCave_Room10/map.json @@ -0,0 +1,54 @@ +{ + "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM10", + "name": "FiveIsland_LostCave_Room10", + "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM10", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_LOST_CAVE", + "requires_flash": false, + "weather": "WEATHER_6", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "28", + "x": 5, + "y": 5, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "147" + }, + { + "graphics_id": "92", + "x": 5, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FiveIsland_LostCave_Room10_EventScript_1BEDBB", + "flag": "504" + } + ], + "warp_events": [ + { + "x": 5, + "y": 8, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FiveIsland_LostCave_Room10/scripts.inc b/data/maps/FiveIsland_LostCave_Room10/scripts.inc index f44edc660..4a8283959 100644 --- a/data/maps/FiveIsland_LostCave_Room10/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Room10/scripts.inc @@ -34,7 +34,7 @@ EventScript_164C52:: @ 8164C52 callstd 4 closemessage call EventScript_164CA5 - warp MAP_FIVE_ISLAND_RESORTGORGEOUS, 255, 39, 10 + warp MAP_FIVE_ISLAND_RESORT_GORGEOUS, 255, 39, 10 waitstate releaseall end diff --git a/data/maps/FiveIsland_LostCave_Room11/events.inc b/data/maps/FiveIsland_LostCave_Room11/events.inc deleted file mode 100644 index caa37b4a1..000000000 --- a/data/maps/FiveIsland_LostCave_Room11/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -FiveIsland_LostCave_Room11_EventObjects: - object_event 1, 92, 0, 5, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, FiveIsland_LostCave_Room11_EventScript_1BEDC8, 505, 0, 0 - -FiveIsland_LostCave_Room11_MapWarps: - warp_def 5, 1, 3, 3, 525 - -FiveIsland_LostCave_Room11_MapEvents:: - map_events FiveIsland_LostCave_Room11_EventObjects, FiveIsland_LostCave_Room11_MapWarps, 0x0, 0x0 diff --git a/data/maps/FiveIsland_LostCave_Room11/header.inc b/data/maps/FiveIsland_LostCave_Room11/header.inc deleted file mode 100644 index 56457b055..000000000 --- a/data/maps/FiveIsland_LostCave_Room11/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FiveIsland_LostCave_Room11:: @ 835020C - .4byte FiveIsland_LostCave_Room11_Layout @ 0x83460E0 - .4byte FiveIsland_LostCave_Room11_MapEvents @ 0x83B45E0 - .4byte FiveIsland_LostCave_Room11_MapScripts @ 0x8164CCB - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 331 - .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/FiveIsland_LostCave_Room11/map.json b/data/maps/FiveIsland_LostCave_Room11/map.json new file mode 100644 index 000000000..47155c19d --- /dev/null +++ b/data/maps/FiveIsland_LostCave_Room11/map.json @@ -0,0 +1,41 @@ +{ + "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM11", + "name": "FiveIsland_LostCave_Room11", + "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM11", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_LOST_CAVE", + "requires_flash": false, + "weather": "WEATHER_6", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "92", + "x": 5, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FiveIsland_LostCave_Room11_EventScript_1BEDC8", + "flag": "505" + } + ], + "warp_events": [ + { + "x": 5, + "y": 1, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FiveIsland_LostCave_Room12/events.inc b/data/maps/FiveIsland_LostCave_Room12/events.inc deleted file mode 100644 index fc54c26b6..000000000 --- a/data/maps/FiveIsland_LostCave_Room12/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -FiveIsland_LostCave_Room12_EventObjects: - object_event 1, 92, 0, 5, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, FiveIsland_LostCave_Room12_EventScript_1BEDD5, 506, 0, 0 - -FiveIsland_LostCave_Room12_MapWarps: - warp_def 5, 8, 3, 1, 525 - -FiveIsland_LostCave_Room12_MapEvents:: - map_events FiveIsland_LostCave_Room12_EventObjects, FiveIsland_LostCave_Room12_MapWarps, 0x0, 0x0 diff --git a/data/maps/FiveIsland_LostCave_Room12/header.inc b/data/maps/FiveIsland_LostCave_Room12/header.inc deleted file mode 100644 index 8629a364d..000000000 --- a/data/maps/FiveIsland_LostCave_Room12/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FiveIsland_LostCave_Room12:: @ 8350228 - .4byte FiveIsland_LostCave_Room12_Layout @ 0x83461F8 - .4byte FiveIsland_LostCave_Room12_MapEvents @ 0x83B4614 - .4byte FiveIsland_LostCave_Room12_MapScripts @ 0x8164CCC - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 332 - .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/FiveIsland_LostCave_Room12/map.json b/data/maps/FiveIsland_LostCave_Room12/map.json new file mode 100644 index 000000000..cbe79bf74 --- /dev/null +++ b/data/maps/FiveIsland_LostCave_Room12/map.json @@ -0,0 +1,41 @@ +{ + "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM12", + "name": "FiveIsland_LostCave_Room12", + "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM12", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_LOST_CAVE", + "requires_flash": false, + "weather": "WEATHER_6", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "92", + "x": 5, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FiveIsland_LostCave_Room12_EventScript_1BEDD5", + "flag": "506" + } + ], + "warp_events": [ + { + "x": 5, + "y": 8, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FiveIsland_LostCave_Room13/events.inc b/data/maps/FiveIsland_LostCave_Room13/events.inc deleted file mode 100644 index 0802e023c..000000000 --- a/data/maps/FiveIsland_LostCave_Room13/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -FiveIsland_LostCave_Room13_EventObjects: - object_event 1, 92, 0, 5, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, FiveIsland_LostCave_Room13_EventScript_1BEDE2, 507, 0, 0 - -FiveIsland_LostCave_Room13_MapWarps: - warp_def 2, 5, 3, 2, 525 - -FiveIsland_LostCave_Room13_MapEvents:: - map_events FiveIsland_LostCave_Room13_EventObjects, FiveIsland_LostCave_Room13_MapWarps, 0x0, 0x0 diff --git a/data/maps/FiveIsland_LostCave_Room13/header.inc b/data/maps/FiveIsland_LostCave_Room13/header.inc deleted file mode 100644 index cda5b3670..000000000 --- a/data/maps/FiveIsland_LostCave_Room13/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FiveIsland_LostCave_Room13:: @ 8350244 - .4byte FiveIsland_LostCave_Room13_Layout @ 0x8346310 - .4byte FiveIsland_LostCave_Room13_MapEvents @ 0x83B4648 - .4byte FiveIsland_LostCave_Room13_MapScripts @ 0x8164CCD - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 333 - .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/FiveIsland_LostCave_Room13/map.json b/data/maps/FiveIsland_LostCave_Room13/map.json new file mode 100644 index 000000000..b39a12fd3 --- /dev/null +++ b/data/maps/FiveIsland_LostCave_Room13/map.json @@ -0,0 +1,41 @@ +{ + "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM13", + "name": "FiveIsland_LostCave_Room13", + "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM13", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_LOST_CAVE", + "requires_flash": false, + "weather": "WEATHER_6", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "92", + "x": 5, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FiveIsland_LostCave_Room13_EventScript_1BEDE2", + "flag": "507" + } + ], + "warp_events": [ + { + "x": 2, + "y": 5, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FiveIsland_LostCave_Room14/events.inc b/data/maps/FiveIsland_LostCave_Room14/events.inc deleted file mode 100644 index a591f0c1e..000000000 --- a/data/maps/FiveIsland_LostCave_Room14/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -FiveIsland_LostCave_Room14_EventObjects: - object_event 1, 92, 0, 5, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, FiveIsland_LostCave_Room14_EventScript_1BEDEF, 508, 0, 0 - -FiveIsland_LostCave_Room14_MapWarps: - warp_def 8, 5, 3, 4, 525 - -FiveIsland_LostCave_Room14_MapEvents:: - map_events FiveIsland_LostCave_Room14_EventObjects, FiveIsland_LostCave_Room14_MapWarps, 0x0, 0x0 diff --git a/data/maps/FiveIsland_LostCave_Room14/header.inc b/data/maps/FiveIsland_LostCave_Room14/header.inc deleted file mode 100644 index 6470895b4..000000000 --- a/data/maps/FiveIsland_LostCave_Room14/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FiveIsland_LostCave_Room14:: @ 8350260 - .4byte FiveIsland_LostCave_Room14_Layout @ 0x8346428 - .4byte FiveIsland_LostCave_Room14_MapEvents @ 0x83B467C - .4byte FiveIsland_LostCave_Room14_MapScripts @ 0x8164CCE - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 334 - .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/FiveIsland_LostCave_Room14/map.json b/data/maps/FiveIsland_LostCave_Room14/map.json new file mode 100644 index 000000000..5e4f7aa07 --- /dev/null +++ b/data/maps/FiveIsland_LostCave_Room14/map.json @@ -0,0 +1,41 @@ +{ + "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM14", + "name": "FiveIsland_LostCave_Room14", + "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM14", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_LOST_CAVE", + "requires_flash": false, + "weather": "WEATHER_6", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "92", + "x": 5, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FiveIsland_LostCave_Room14_EventScript_1BEDEF", + "flag": "508" + } + ], + "warp_events": [ + { + "x": 8, + "y": 5, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FiveIsland_LostCave_Room2/events.inc b/data/maps/FiveIsland_LostCave_Room2/events.inc deleted file mode 100644 index 30d44861d..000000000 --- a/data/maps/FiveIsland_LostCave_Room2/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -FiveIsland_LostCave_Room2_MapWarps: - warp_def 5, 1, 3, 2, 527 - warp_def 8, 5, 3, 4, 525 - warp_def 5, 8, 3, 0, 535 - warp_def 2, 5, 3, 2, 525 - -FiveIsland_LostCave_Room2_MapEvents:: - map_events 0x0, FiveIsland_LostCave_Room2_MapWarps, 0x0, 0x0 diff --git a/data/maps/FiveIsland_LostCave_Room2/header.inc b/data/maps/FiveIsland_LostCave_Room2/header.inc deleted file mode 100644 index 2861812a2..000000000 --- a/data/maps/FiveIsland_LostCave_Room2/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FiveIsland_LostCave_Room2:: @ 8350110 - .4byte FiveIsland_LostCave_Room2_Layout @ 0x8345708 - .4byte FiveIsland_LostCave_Room2_MapEvents @ 0x83B43DC - .4byte FiveIsland_LostCave_Room2_MapScripts @ 0x8164C0E - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 322 - .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/FiveIsland_LostCave_Room2/map.json b/data/maps/FiveIsland_LostCave_Room2/map.json new file mode 100644 index 000000000..df991bd96 --- /dev/null +++ b/data/maps/FiveIsland_LostCave_Room2/map.json @@ -0,0 +1,48 @@ +{ + "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM2", + "name": "FiveIsland_LostCave_Room2", + "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM2", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_LOST_CAVE", + "requires_flash": false, + "weather": "WEATHER_6", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 5, + "y": 1, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM3", + "dest_warp_id": 2 + }, + { + "x": 8, + "y": 5, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", + "dest_warp_id": 4 + }, + { + "x": 5, + "y": 8, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM11", + "dest_warp_id": 0 + }, + { + "x": 2, + "y": 5, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FiveIsland_LostCave_Room3/events.inc b/data/maps/FiveIsland_LostCave_Room3/events.inc deleted file mode 100644 index 04e50762a..000000000 --- a/data/maps/FiveIsland_LostCave_Room3/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -FiveIsland_LostCave_Room3_MapWarps: - warp_def 5, 1, 3, 3, 525 - warp_def 8, 5, 3, 4, 525 - warp_def 5, 8, 3, 0, 528 - warp_def 2, 5, 3, 2, 525 - -FiveIsland_LostCave_Room3_MapEvents:: - map_events 0x0, FiveIsland_LostCave_Room3_MapWarps, 0x0, 0x0 diff --git a/data/maps/FiveIsland_LostCave_Room3/header.inc b/data/maps/FiveIsland_LostCave_Room3/header.inc deleted file mode 100644 index 33c5484e0..000000000 --- a/data/maps/FiveIsland_LostCave_Room3/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FiveIsland_LostCave_Room3:: @ 835012C - .4byte FiveIsland_LostCave_Room3_Layout @ 0x8345820 - .4byte FiveIsland_LostCave_Room3_MapEvents @ 0x83B4410 - .4byte FiveIsland_LostCave_Room3_MapScripts @ 0x8164C0F - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 323 - .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/FiveIsland_LostCave_Room3/map.json b/data/maps/FiveIsland_LostCave_Room3/map.json new file mode 100644 index 000000000..0fc5622ff --- /dev/null +++ b/data/maps/FiveIsland_LostCave_Room3/map.json @@ -0,0 +1,48 @@ +{ + "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM3", + "name": "FiveIsland_LostCave_Room3", + "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM3", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_LOST_CAVE", + "requires_flash": false, + "weather": "WEATHER_6", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 5, + "y": 1, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", + "dest_warp_id": 3 + }, + { + "x": 8, + "y": 5, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", + "dest_warp_id": 4 + }, + { + "x": 5, + "y": 8, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM4", + "dest_warp_id": 0 + }, + { + "x": 2, + "y": 5, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FiveIsland_LostCave_Room4/events.inc b/data/maps/FiveIsland_LostCave_Room4/events.inc deleted file mode 100644 index 6c7ec30b0..000000000 --- a/data/maps/FiveIsland_LostCave_Room4/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -FiveIsland_LostCave_Room4_EventObjects: - object_event 1, 23, 0, 6, 0, 4, 0, 3, 8, 17, 0, 1, 0, 1, 0, FiveIsland_LostCave_Room4_EventScript_164C11, 0, 0, 0 - -FiveIsland_LostCave_Room4_MapWarps: - warp_def 5, 1, 3, 0, 536 - warp_def 8, 5, 3, 4, 525 - warp_def 5, 8, 3, 0, 529 - warp_def 2, 5, 3, 2, 525 - -FiveIsland_LostCave_Room4_MapEvents:: - map_events FiveIsland_LostCave_Room4_EventObjects, FiveIsland_LostCave_Room4_MapWarps, 0x0, 0x0 diff --git a/data/maps/FiveIsland_LostCave_Room4/header.inc b/data/maps/FiveIsland_LostCave_Room4/header.inc deleted file mode 100644 index 966532b31..000000000 --- a/data/maps/FiveIsland_LostCave_Room4/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FiveIsland_LostCave_Room4:: @ 8350148 - .4byte FiveIsland_LostCave_Room4_Layout @ 0x8345938 - .4byte FiveIsland_LostCave_Room4_MapEvents @ 0x83B445C - .4byte FiveIsland_LostCave_Room4_MapScripts @ 0x8164C10 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 324 - .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/FiveIsland_LostCave_Room4/map.json b/data/maps/FiveIsland_LostCave_Room4/map.json new file mode 100644 index 000000000..b4d7633ac --- /dev/null +++ b/data/maps/FiveIsland_LostCave_Room4/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM4", + "name": "FiveIsland_LostCave_Room4", + "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM4", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_LOST_CAVE", + "requires_flash": false, + "weather": "WEATHER_6", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "23", + "x": 6, + "y": 4, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "FiveIsland_LostCave_Room4_EventScript_164C11", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 5, + "y": 1, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM12", + "dest_warp_id": 0 + }, + { + "x": 8, + "y": 5, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", + "dest_warp_id": 4 + }, + { + "x": 5, + "y": 8, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM5", + "dest_warp_id": 0 + }, + { + "x": 2, + "y": 5, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FiveIsland_LostCave_Room5/events.inc b/data/maps/FiveIsland_LostCave_Room5/events.inc deleted file mode 100644 index d16df207c..000000000 --- a/data/maps/FiveIsland_LostCave_Room5/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -FiveIsland_LostCave_Room5_MapWarps: - warp_def 5, 1, 3, 3, 525 - warp_def 8, 5, 3, 3, 530 - warp_def 5, 8, 3, 1, 525 - warp_def 2, 5, 3, 2, 525 - -FiveIsland_LostCave_Room5_MapEvents:: - map_events 0x0, FiveIsland_LostCave_Room5_MapWarps, 0x0, 0x0 diff --git a/data/maps/FiveIsland_LostCave_Room5/header.inc b/data/maps/FiveIsland_LostCave_Room5/header.inc deleted file mode 100644 index 6ec15156f..000000000 --- a/data/maps/FiveIsland_LostCave_Room5/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FiveIsland_LostCave_Room5:: @ 8350164 - .4byte FiveIsland_LostCave_Room5_Layout @ 0x8345A50 - .4byte FiveIsland_LostCave_Room5_MapEvents @ 0x83B4490 - .4byte FiveIsland_LostCave_Room5_MapScripts @ 0x8164C28 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 325 - .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/FiveIsland_LostCave_Room5/map.json b/data/maps/FiveIsland_LostCave_Room5/map.json new file mode 100644 index 000000000..dca189071 --- /dev/null +++ b/data/maps/FiveIsland_LostCave_Room5/map.json @@ -0,0 +1,48 @@ +{ + "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM5", + "name": "FiveIsland_LostCave_Room5", + "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM5", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_LOST_CAVE", + "requires_flash": false, + "weather": "WEATHER_6", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 5, + "y": 1, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", + "dest_warp_id": 3 + }, + { + "x": 8, + "y": 5, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM6", + "dest_warp_id": 3 + }, + { + "x": 5, + "y": 8, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", + "dest_warp_id": 1 + }, + { + "x": 2, + "y": 5, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FiveIsland_LostCave_Room6/events.inc b/data/maps/FiveIsland_LostCave_Room6/events.inc deleted file mode 100644 index 675db376a..000000000 --- a/data/maps/FiveIsland_LostCave_Room6/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -FiveIsland_LostCave_Room6_MapWarps: - warp_def 5, 1, 3, 3, 525 - warp_def 8, 5, 3, 0, 537 - warp_def 5, 8, 3, 1, 525 - warp_def 2, 5, 3, 1, 531 - -FiveIsland_LostCave_Room6_MapEvents:: - map_events 0x0, FiveIsland_LostCave_Room6_MapWarps, 0x0, 0x0 diff --git a/data/maps/FiveIsland_LostCave_Room6/header.inc b/data/maps/FiveIsland_LostCave_Room6/header.inc deleted file mode 100644 index c45b08d1e..000000000 --- a/data/maps/FiveIsland_LostCave_Room6/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FiveIsland_LostCave_Room6:: @ 8350180 - .4byte FiveIsland_LostCave_Room6_Layout @ 0x8345B68 - .4byte FiveIsland_LostCave_Room6_MapEvents @ 0x83B44C4 - .4byte FiveIsland_LostCave_Room6_MapScripts @ 0x8164C29 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 326 - .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/FiveIsland_LostCave_Room6/map.json b/data/maps/FiveIsland_LostCave_Room6/map.json new file mode 100644 index 000000000..e70d5d5cb --- /dev/null +++ b/data/maps/FiveIsland_LostCave_Room6/map.json @@ -0,0 +1,48 @@ +{ + "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM6", + "name": "FiveIsland_LostCave_Room6", + "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM6", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_LOST_CAVE", + "requires_flash": false, + "weather": "WEATHER_6", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 5, + "y": 1, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", + "dest_warp_id": 3 + }, + { + "x": 8, + "y": 5, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM13", + "dest_warp_id": 0 + }, + { + "x": 5, + "y": 8, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", + "dest_warp_id": 1 + }, + { + "x": 2, + "y": 5, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM7", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FiveIsland_LostCave_Room7/events.inc b/data/maps/FiveIsland_LostCave_Room7/events.inc deleted file mode 100644 index 72dd3255b..000000000 --- a/data/maps/FiveIsland_LostCave_Room7/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -FiveIsland_LostCave_Room7_MapWarps: - warp_def 5, 1, 3, 3, 525 - warp_def 8, 5, 3, 4, 525 - warp_def 5, 8, 3, 0, 532 - warp_def 2, 5, 3, 2, 525 - -FiveIsland_LostCave_Room7_MapEvents:: - map_events 0x0, FiveIsland_LostCave_Room7_MapWarps, 0x0, 0x0 diff --git a/data/maps/FiveIsland_LostCave_Room7/header.inc b/data/maps/FiveIsland_LostCave_Room7/header.inc deleted file mode 100644 index 17a168e1d..000000000 --- a/data/maps/FiveIsland_LostCave_Room7/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FiveIsland_LostCave_Room7:: @ 835019C - .4byte FiveIsland_LostCave_Room7_Layout @ 0x8345C80 - .4byte FiveIsland_LostCave_Room7_MapEvents @ 0x83B44F8 - .4byte FiveIsland_LostCave_Room7_MapScripts @ 0x8164C2A - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 327 - .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/FiveIsland_LostCave_Room7/map.json b/data/maps/FiveIsland_LostCave_Room7/map.json new file mode 100644 index 000000000..90b129cb9 --- /dev/null +++ b/data/maps/FiveIsland_LostCave_Room7/map.json @@ -0,0 +1,48 @@ +{ + "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM7", + "name": "FiveIsland_LostCave_Room7", + "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM7", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_LOST_CAVE", + "requires_flash": false, + "weather": "WEATHER_6", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 5, + "y": 1, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", + "dest_warp_id": 3 + }, + { + "x": 8, + "y": 5, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", + "dest_warp_id": 4 + }, + { + "x": 5, + "y": 8, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM8", + "dest_warp_id": 0 + }, + { + "x": 2, + "y": 5, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FiveIsland_LostCave_Room8/events.inc b/data/maps/FiveIsland_LostCave_Room8/events.inc deleted file mode 100644 index c7d86e0d8..000000000 --- a/data/maps/FiveIsland_LostCave_Room8/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -FiveIsland_LostCave_Room8_MapWarps: - warp_def 5, 1, 3, 3, 525 - warp_def 8, 5, 3, 3, 533 - warp_def 5, 8, 3, 1, 525 - warp_def 2, 5, 3, 0, 538 - -FiveIsland_LostCave_Room8_MapEvents:: - map_events 0x0, FiveIsland_LostCave_Room8_MapWarps, 0x0, 0x0 diff --git a/data/maps/FiveIsland_LostCave_Room8/header.inc b/data/maps/FiveIsland_LostCave_Room8/header.inc deleted file mode 100644 index 21fa63267..000000000 --- a/data/maps/FiveIsland_LostCave_Room8/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FiveIsland_LostCave_Room8:: @ 83501B8 - .4byte FiveIsland_LostCave_Room8_Layout @ 0x8345D98 - .4byte FiveIsland_LostCave_Room8_MapEvents @ 0x83B452C - .4byte FiveIsland_LostCave_Room8_MapScripts @ 0x8164C2B - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 328 - .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/FiveIsland_LostCave_Room8/map.json b/data/maps/FiveIsland_LostCave_Room8/map.json new file mode 100644 index 000000000..7dd8dc00d --- /dev/null +++ b/data/maps/FiveIsland_LostCave_Room8/map.json @@ -0,0 +1,48 @@ +{ + "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM8", + "name": "FiveIsland_LostCave_Room8", + "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM8", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_LOST_CAVE", + "requires_flash": false, + "weather": "WEATHER_6", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 5, + "y": 1, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", + "dest_warp_id": 3 + }, + { + "x": 8, + "y": 5, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM9", + "dest_warp_id": 3 + }, + { + "x": 5, + "y": 8, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", + "dest_warp_id": 1 + }, + { + "x": 2, + "y": 5, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM14", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FiveIsland_LostCave_Room9/events.inc b/data/maps/FiveIsland_LostCave_Room9/events.inc deleted file mode 100644 index 37bca157c..000000000 --- a/data/maps/FiveIsland_LostCave_Room9/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -FiveIsland_LostCave_Room9_MapWarps: - warp_def 5, 1, 3, 0, 534 - warp_def 8, 5, 3, 4, 525 - warp_def 5, 8, 3, 1, 525 - warp_def 2, 5, 3, 2, 525 - -FiveIsland_LostCave_Room9_MapEvents:: - map_events 0x0, FiveIsland_LostCave_Room9_MapWarps, 0x0, 0x0 diff --git a/data/maps/FiveIsland_LostCave_Room9/header.inc b/data/maps/FiveIsland_LostCave_Room9/header.inc deleted file mode 100644 index 53ef0c34e..000000000 --- a/data/maps/FiveIsland_LostCave_Room9/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FiveIsland_LostCave_Room9:: @ 83501D4 - .4byte FiveIsland_LostCave_Room9_Layout @ 0x8345EB0 - .4byte FiveIsland_LostCave_Room9_MapEvents @ 0x83B4560 - .4byte FiveIsland_LostCave_Room9_MapScripts @ 0x8164C2C - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 329 - .byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/FiveIsland_LostCave_Room9/map.json b/data/maps/FiveIsland_LostCave_Room9/map.json new file mode 100644 index 000000000..857ef6332 --- /dev/null +++ b/data/maps/FiveIsland_LostCave_Room9/map.json @@ -0,0 +1,48 @@ +{ + "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM9", + "name": "FiveIsland_LostCave_Room9", + "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM9", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_LOST_CAVE", + "requires_flash": false, + "weather": "WEATHER_6", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 5, + "y": 1, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM10", + "dest_warp_id": 0 + }, + { + "x": 8, + "y": 5, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", + "dest_warp_id": 4 + }, + { + "x": 5, + "y": 8, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", + "dest_warp_id": 1 + }, + { + "x": 2, + "y": 5, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FiveIsland_Meadow/connections.inc b/data/maps/FiveIsland_Meadow/connections.inc deleted file mode 100644 index e6a63a6e1..000000000 --- a/data/maps/FiveIsland_Meadow/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -FiveIsland_Meadow_MapConnectionsList: @ 8352DDC - connection left, 0, MAP_FIVE_ISLAND - connection right, 20, MAP_FIVE_ISLAND_MEMORIALPILLAR - -FiveIsland_Meadow_MapConnections:: @ 8352DF4 - .4byte 2 - .4byte FiveIsland_Meadow_MapConnectionsList diff --git a/data/maps/FiveIsland_Meadow/events.inc b/data/maps/FiveIsland_Meadow/events.inc deleted file mode 100644 index ec4f57c41..000000000 --- a/data/maps/FiveIsland_Meadow/events.inc +++ /dev/null @@ -1,17 +0,0 @@ -FiveIsland_Meadow_EventObjects: - object_event 1, 50, 0, 18, 0, 18, 0, 3, 2, 17, 0, 1, 0, 1, 0, FiveIsland_Meadow_EventScript_1689BB, 136, 0, 0 - object_event 2, 49, 0, 17, 0, 5, 0, 3, 17, 17, 0, 1, 0, 5, 0, FiveIsland_Meadow_EventScript_16898D, 136, 0, 0 - object_event 3, 49, 0, 11, 0, 27, 0, 3, 10, 17, 0, 1, 0, 3, 0, FiveIsland_Meadow_EventScript_1689A4, 136, 0, 0 - object_event 4, 95, 0, 8, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, FiveIsland_Meadow_EventScript_1BDF13, 18, 0, 0 - object_event 5, 95, 0, 19, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, FiveIsland_Meadow_EventScript_1BDF13, 19, 0, 0 - object_event 6, 92, 0, 12, 0, 11, 0, 3, 8, 17, 0, 0, 0, 0, 0, FiveIsland_Meadow_EventScript_1BEC69, 478, 0, 0 - object_event 7, 92, 0, 3, 0, 22, 0, 3, 8, 17, 0, 0, 0, 0, 0, FiveIsland_Meadow_EventScript_1BEC76, 479, 0, 0 - -FiveIsland_Meadow_MapWarps: - warp_def 12, 21, 0, 0, 370 - -FiveIsland_Meadow_MapBGEvents: - bg_event 12, 21, 0, 0, 0, FiveIsland_Meadow_EventScript_168942 - -FiveIsland_Meadow_MapEvents:: - map_events FiveIsland_Meadow_EventObjects, FiveIsland_Meadow_MapWarps, 0x0, FiveIsland_Meadow_MapBGEvents diff --git a/data/maps/FiveIsland_Meadow/header.inc b/data/maps/FiveIsland_Meadow/header.inc deleted file mode 100644 index 4f30d8ae1..000000000 --- a/data/maps/FiveIsland_Meadow/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FiveIsland_Meadow:: @ 8350C38 - .4byte FiveIsland_Meadow_Layout @ 0x832BAE4 - .4byte FiveIsland_Meadow_MapEvents @ 0x83B8D94 - .4byte FiveIsland_Meadow_MapScripts @ 0x8168932 - .4byte FiveIsland_Meadow_MapConnections @ 0x8352DF4 - .2byte BGM_FRLG_SEVII_ISLANDS - .2byte 248 - .byte 0xa1, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/FiveIsland_Meadow/map.json b/data/maps/FiveIsland_Meadow/map.json new file mode 100644 index 000000000..b2c8232c8 --- /dev/null +++ b/data/maps/FiveIsland_Meadow/map.json @@ -0,0 +1,138 @@ +{ + "id": "MAP_FIVE_ISLAND_MEADOW", + "name": "FiveIsland_Meadow", + "layout": "LAYOUT_FIVE_ISLAND_MEADOW", + "music": "BGM_FRLG_SEVII_ISLANDS", + "region_map_section": "MAPSEC_FIVE_ISLE_MEADOW", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_FIVE_ISLAND", + "offset": 0, + "direction": "left" + }, + { + "map": "MAP_FIVE_ISLAND_MEMORIAL_PILLAR", + "offset": 20, + "direction": "right" + } + ], + "object_events": [ + { + "graphics_id": "50", + "x": 18, + "y": 18, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "FiveIsland_Meadow_EventScript_1689BB", + "flag": "136" + }, + { + "graphics_id": "49", + "x": 17, + "y": 5, + "elevation": 3, + "movement_type": "17", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "FiveIsland_Meadow_EventScript_16898D", + "flag": "136" + }, + { + "graphics_id": "49", + "x": 11, + "y": 27, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "FiveIsland_Meadow_EventScript_1689A4", + "flag": "136" + }, + { + "graphics_id": "95", + "x": 8, + "y": 9, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FiveIsland_Meadow_EventScript_1BDF13", + "flag": "18" + }, + { + "graphics_id": "95", + "x": 19, + "y": 12, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FiveIsland_Meadow_EventScript_1BDF13", + "flag": "19" + }, + { + "graphics_id": "92", + "x": 12, + "y": 11, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FiveIsland_Meadow_EventScript_1BEC69", + "flag": "478" + }, + { + "graphics_id": "92", + "x": 3, + "y": 22, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FiveIsland_Meadow_EventScript_1BEC76", + "flag": "479" + } + ], + "warp_events": [ + { + "x": 12, + "y": 21, + "elevation": 0, + "dest_map": "MAP_FIVE_ISLAND_ROCKET_WAREHOUSE", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 12, + "y": 21, + "elevation": 0, + "script": "FiveIsland_Meadow_EventScript_168942" + } + ] +} \ No newline at end of file diff --git a/data/maps/FiveIsland_MemorialPillar/connections.inc b/data/maps/FiveIsland_MemorialPillar/connections.inc deleted file mode 100644 index 24624b004..000000000 --- a/data/maps/FiveIsland_MemorialPillar/connections.inc +++ /dev/null @@ -1,6 +0,0 @@ -FiveIsland_MemorialPillar_MapConnectionsList: @ 8352DFC - connection left, -20, MAP_FIVE_ISLAND_MEADOW - -FiveIsland_MemorialPillar_MapConnections:: @ 8352E08 - .4byte 1 - .4byte FiveIsland_MemorialPillar_MapConnectionsList diff --git a/data/maps/FiveIsland_MemorialPillar/events.inc b/data/maps/FiveIsland_MemorialPillar/events.inc deleted file mode 100644 index 567b8c789..000000000 --- a/data/maps/FiveIsland_MemorialPillar/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -FiveIsland_MemorialPillar_EventObjects: - object_event 1, 25, 0, 8, 0, 44, 0, 4, 15, 17, 0, 0, 0, 0, 0, FiveIsland_MemorialPillar_EventScript_1689D3, 0, 0, 0 - object_event 2, 26, 0, 12, 0, 6, 0, 3, 21, 17, 0, 1, 0, 3, 0, FiveIsland_MemorialPillar_EventScript_1AC317, 0, 0, 0 - object_event 3, 26, 0, 14, 0, 17, 0, 3, 19, 17, 0, 1, 0, 2, 0, FiveIsland_MemorialPillar_EventScript_1AC355, 0, 0, 0 - object_event 4, 26, 0, 17, 0, 31, 0, 3, 2, 17, 0, 1, 0, 3, 0, FiveIsland_MemorialPillar_EventScript_1AC393, 0, 0, 0 - object_event 5, 92, 0, 4, 0, 47, 0, 3, 8, 17, 0, 0, 0, 0, 0, FiveIsland_MemorialPillar_EventScript_1BEC83, 480, 0, 0 - -FiveIsland_MemorialPillar_MapBGEvents: - bg_event 9, 43, 0, 1, 0, FiveIsland_MemorialPillar_EventScript_168A48 - bg_event 8, 52, 3, 7, 0, 107, 170, 1 - bg_event 15, 7, 3, 7, 0, 148, 171, 1 - bg_event 17, 22, 3, 7, 0, 142, 172, 1 - bg_event 14, 25, 3, 7, 0, 149, 173, 1 - -FiveIsland_MemorialPillar_MapEvents:: - map_events FiveIsland_MemorialPillar_EventObjects, 0x0, 0x0, FiveIsland_MemorialPillar_MapBGEvents diff --git a/data/maps/FiveIsland_MemorialPillar/header.inc b/data/maps/FiveIsland_MemorialPillar/header.inc deleted file mode 100644 index 39944fcdf..000000000 --- a/data/maps/FiveIsland_MemorialPillar/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FiveIsland_MemorialPillar:: @ 8350C54 - .4byte FiveIsland_MemorialPillar_Layout @ 0x832C648 - .4byte FiveIsland_MemorialPillar_MapEvents @ 0x83B8E5C - .4byte FiveIsland_MemorialPillar_MapScripts @ 0x81689D2 - .4byte FiveIsland_MemorialPillar_MapConnections @ 0x8352E08 - .2byte BGM_FRLG_SEVII_ISLANDS - .2byte 249 - .byte 0xa2, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/FiveIsland_MemorialPillar/map.json b/data/maps/FiveIsland_MemorialPillar/map.json new file mode 100644 index 000000000..c8a7325db --- /dev/null +++ b/data/maps/FiveIsland_MemorialPillar/map.json @@ -0,0 +1,135 @@ +{ + "id": "MAP_FIVE_ISLAND_MEMORIAL_PILLAR", + "name": "FiveIsland_MemorialPillar", + "layout": "LAYOUT_FIVE_ISLAND_MEMORIAL_PILLAR", + "music": "BGM_FRLG_SEVII_ISLANDS", + "region_map_section": "MAPSEC_MEMORIAL_PILLAR", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_FIVE_ISLAND_MEADOW", + "offset": -20, + "direction": "left" + } + ], + "object_events": [ + { + "graphics_id": "25", + "x": 8, + "y": 44, + "elevation": 4, + "movement_type": "15", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FiveIsland_MemorialPillar_EventScript_1689D3", + "flag": "0" + }, + { + "graphics_id": "26", + "x": 12, + "y": 6, + "elevation": 3, + "movement_type": "21", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "FiveIsland_MemorialPillar_EventScript_1AC317", + "flag": "0" + }, + { + "graphics_id": "26", + "x": 14, + "y": 17, + "elevation": 3, + "movement_type": "19", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "FiveIsland_MemorialPillar_EventScript_1AC355", + "flag": "0" + }, + { + "graphics_id": "26", + "x": 17, + "y": 31, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "FiveIsland_MemorialPillar_EventScript_1AC393", + "flag": "0" + }, + { + "graphics_id": "92", + "x": 4, + "y": 47, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FiveIsland_MemorialPillar_EventScript_1BEC83", + "flag": "480" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_1", + "x": 9, + "y": 43, + "elevation": 0, + "script": "FiveIsland_MemorialPillar_EventScript_168A48" + }, + { + "type": "hidden_item", + "x": 8, + "y": 52, + "elevation": 3, + "item": "ITEM_BIG_PEARL", + "flag": "170", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 15, + "y": 7, + "elevation": 3, + "item": "ITEM_RAZZ_BERRY", + "flag": "171", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 17, + "y": 22, + "elevation": 3, + "item": "ITEM_SITRUS_BERRY", + "flag": "172", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 14, + "y": 25, + "elevation": 3, + "item": "ITEM_BLUK_BERRY", + "flag": "173", + "unknown": 1 + } + ] +} \ No newline at end of file diff --git a/data/maps/FiveIsland_PokemonCenter_1F/events.inc b/data/maps/FiveIsland_PokemonCenter_1F/events.inc deleted file mode 100644 index 3e7db2299..000000000 --- a/data/maps/FiveIsland_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -FiveIsland_PokemonCenter_1F_EventObjects: - object_event 1, 64, 0, 7, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, FiveIsland_PokemonCenter_1F_EventScript_171D00, 0, 0, 0 - object_event 2, 42, 0, 9, 0, 4, 0, 3, 7, 17, 0, 0, 0, 0, 0, FiveIsland_PokemonCenter_1F_EventScript_171D12, 0, 0, 0 - object_event 3, 59, 0, 4, 0, 8, 0, 3, 5, 17, 0, 0, 0, 0, 0, FiveIsland_PokemonCenter_1F_EventScript_171D09, 0, 0, 0 - object_event 4, 0, 0, 2, 0, 1, 0, 0, 76, 17, 0, 0, 0, 0, 0, FiveIsland_PokemonCenter_1F_EventScript_1ACF5F, 157, 0, 0 - object_event 5, 0, 0, 3, 0, 1, 0, 0, 76, 17, 0, 0, 0, 0, 0, FiveIsland_PokemonCenter_1F_EventScript_1ACF5F, 157, 0, 0 - -FiveIsland_PokemonCenter_1F_MapWarps: - warp_def 7, 8, 3, 1, 784 - warp_def 1, 6, 4, 0, 9217 - -FiveIsland_PokemonCenter_1F_MapEvents:: - map_events FiveIsland_PokemonCenter_1F_EventObjects, FiveIsland_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/FiveIsland_PokemonCenter_1F/header.inc b/data/maps/FiveIsland_PokemonCenter_1F/header.inc deleted file mode 100644 index ed32a33e9..000000000 --- a/data/maps/FiveIsland_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FiveIsland_PokemonCenter_1F:: @ 8351E44 - .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte FiveIsland_PokemonCenter_1F_MapEvents @ 0x83BEEDC - .4byte FiveIsland_PokemonCenter_1F_MapScripts @ 0x8171CF1 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 8 - .byte 0x93, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/FiveIsland_PokemonCenter_1F/map.json b/data/maps/FiveIsland_PokemonCenter_1F/map.json new file mode 100644 index 000000000..d5fffc7a9 --- /dev/null +++ b/data/maps/FiveIsland_PokemonCenter_1F/map.json @@ -0,0 +1,100 @@ +{ + "id": "MAP_FIVE_ISLAND_POKEMON_CENTER_1F", + "name": "FiveIsland_PokemonCenter_1F", + "layout": "LAYOUT_POKEMON_CENTER_1F", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_FIVE_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "64", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FiveIsland_PokemonCenter_1F_EventScript_171D00", + "flag": "0" + }, + { + "graphics_id": "42", + "x": 9, + "y": 4, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FiveIsland_PokemonCenter_1F_EventScript_171D12", + "flag": "0" + }, + { + "graphics_id": "59", + "x": 4, + "y": 8, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FiveIsland_PokemonCenter_1F_EventScript_171D09", + "flag": "0" + }, + { + "graphics_id": "0", + "x": 2, + "y": 1, + "elevation": 0, + "movement_type": "76", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FiveIsland_PokemonCenter_1F_EventScript_1ACF5F", + "flag": "157" + }, + { + "graphics_id": "0", + "x": 3, + "y": 1, + "elevation": 0, + "movement_type": "76", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FiveIsland_PokemonCenter_1F_EventScript_1ACF5F", + "flag": "157" + } + ], + "warp_events": [ + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND", + "dest_warp_id": 1 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_FIVE_ISLAND_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FiveIsland_PokemonCenter_2F/events.inc b/data/maps/FiveIsland_PokemonCenter_2F/events.inc deleted file mode 100644 index 13819a9a9..000000000 --- a/data/maps/FiveIsland_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -FiveIsland_PokemonCenter_2F_EventObjects: - object_event 1, 65, 0, 6, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FiveIsland_PokemonCenter_2F_EventScript_1A8CF6, 0, 0, 0 - object_event 2, 65, 0, 2, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FiveIsland_PokemonCenter_2F_EventScript_1A8CFC, 0, 0, 0 - object_event 3, 65, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FiveIsland_PokemonCenter_2F_EventScript_1A8D02, 0, 0, 0 - object_event 4, 69, 0, 1, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, FiveIsland_PokemonCenter_2F_EventScript_1BB1D2, 112, 0, 0 - -FiveIsland_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 1, 9216 - warp_def 5, 1, 0, 0, 4 - warp_def 9, 1, 0, 0, 1 - -FiveIsland_PokemonCenter_2F_MapEvents:: - map_events FiveIsland_PokemonCenter_2F_EventObjects, FiveIsland_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/FiveIsland_PokemonCenter_2F/header.inc b/data/maps/FiveIsland_PokemonCenter_2F/header.inc deleted file mode 100644 index fd00cabd4..000000000 --- a/data/maps/FiveIsland_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FiveIsland_PokemonCenter_2F:: @ 8351E60 - .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte FiveIsland_PokemonCenter_2F_MapEvents @ 0x83BEF68 - .4byte FiveIsland_PokemonCenter_2F_MapScripts @ 0x8171D1B - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 9 - .byte 0x93, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/FiveIsland_PokemonCenter_2F/map.json b/data/maps/FiveIsland_PokemonCenter_2F/map.json new file mode 100644 index 000000000..2efdd61d5 --- /dev/null +++ b/data/maps/FiveIsland_PokemonCenter_2F/map.json @@ -0,0 +1,94 @@ +{ + "id": "MAP_FIVE_ISLAND_POKEMON_CENTER_2F", + "name": "FiveIsland_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_FIVE_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "65", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FiveIsland_PokemonCenter_2F_EventScript_1A8CF6", + "flag": "0" + }, + { + "graphics_id": "65", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FiveIsland_PokemonCenter_2F_EventScript_1A8CFC", + "flag": "0" + }, + { + "graphics_id": "65", + "x": 10, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FiveIsland_PokemonCenter_2F_EventScript_1A8D02", + "flag": "0" + }, + { + "graphics_id": "69", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FiveIsland_PokemonCenter_2F_EventScript_1BB1D2", + "flag": "112" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_FIVE_ISLAND_POKEMON_CENTER_1F", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 1, + "elevation": 0, + "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 0, + "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FiveIsland_ResortGorgeous/connections.inc b/data/maps/FiveIsland_ResortGorgeous/connections.inc deleted file mode 100644 index a7f2f02dc..000000000 --- a/data/maps/FiveIsland_ResortGorgeous/connections.inc +++ /dev/null @@ -1,6 +0,0 @@ -FiveIsland_ResortGorgeous_MapConnectionsList: @ 8352DA8 - connection down, -48, MAP_FIVE_ISLAND_WATERLABYRINTH - -FiveIsland_ResortGorgeous_MapConnections:: @ 8352DB4 - .4byte 1 - .4byte FiveIsland_ResortGorgeous_MapConnectionsList diff --git a/data/maps/FiveIsland_ResortGorgeous/events.inc b/data/maps/FiveIsland_ResortGorgeous/events.inc deleted file mode 100644 index a9f1df1db..000000000 --- a/data/maps/FiveIsland_ResortGorgeous/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -FiveIsland_ResortGorgeous_EventObjects: - object_event 1, 22, 0, 44, 0, 10, 0, 3, 18, 17, 0, 1, 0, 3, 0, FiveIsland_ResortGorgeous_EventScript_1AC127, 0, 0, 0 - object_event 2, 22, 0, 33, 0, 12, 0, 3, 7, 17, 0, 1, 0, 4, 0, FiveIsland_ResortGorgeous_EventScript_1AC165, 0, 0, 0 - object_event 3, 22, 0, 12, 0, 10, 0, 3, 8, 17, 0, 1, 0, 1, 0, FiveIsland_ResortGorgeous_EventScript_1AC1A3, 0, 0, 0 - object_event 4, 28, 0, 23, 0, 9, 0, 3, 2, 18, 0, 1, 0, 1, 0, FiveIsland_ResortGorgeous_EventScript_1AC1E1, 0, 0, 0 - object_event 5, 28, 0, 33, 0, 8, 0, 3, 8, 17, 0, 1, 0, 1, 0, FiveIsland_ResortGorgeous_EventScript_1AC21F, 0, 0, 0 - object_event 6, 18, 0, 33, 0, 3, 0, 3, 46, 26, 0, 1, 0, 1, 0, FiveIsland_ResortGorgeous_EventScript_1AC25D, 0, 0, 0 - object_event 7, 43, 0, 56, 0, 7, 0, 1, 1, 17, 0, 1, 0, 1, 0, FiveIsland_ResortGorgeous_EventScript_1AC29B, 0, 0, 0 - object_event 8, 28, 0, 39, 0, 9, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, 148, 0, 0 - -FiveIsland_ResortGorgeous_MapWarps: - warp_def 64, 13, 3, 0, 524 - warp_def 39, 8, 0, 0, 9984 - -FiveIsland_ResortGorgeous_MapBGEvents: - bg_event 10, 7, 3, 7, 0, 8, 174, 1 - bg_event 27, 11, 3, 7, 0, 108, 175, 1 - bg_event 40, 12, 3, 7, 0, 109, 176, 1 - bg_event 27, 5, 3, 7, 0, 108, 177, 1 - bg_event 42, 9, 0, 0, 0, FiveIsland_ResortGorgeous_EventScript_168844 - -FiveIsland_ResortGorgeous_MapEvents:: - map_events FiveIsland_ResortGorgeous_EventObjects, FiveIsland_ResortGorgeous_MapWarps, 0x0, FiveIsland_ResortGorgeous_MapBGEvents diff --git a/data/maps/FiveIsland_ResortGorgeous/header.inc b/data/maps/FiveIsland_ResortGorgeous/header.inc deleted file mode 100644 index ecbc20c6d..000000000 --- a/data/maps/FiveIsland_ResortGorgeous/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FiveIsland_ResortGorgeous:: @ 8350C00 - .4byte FiveIsland_ResortGorgeous_Layout @ 0x832A7DC - .4byte FiveIsland_ResortGorgeous_MapEvents @ 0x83B8C80 - .4byte FiveIsland_ResortGorgeous_MapScripts @ 0x81687E4 - .4byte FiveIsland_ResortGorgeous_MapConnections @ 0x8352DB4 - .2byte BGM_FRLG_SEVII_ISLANDS - .2byte 246 - .byte 0x9f, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/FiveIsland_ResortGorgeous/map.json b/data/maps/FiveIsland_ResortGorgeous/map.json new file mode 100644 index 000000000..dfb2407d0 --- /dev/null +++ b/data/maps/FiveIsland_ResortGorgeous/map.json @@ -0,0 +1,189 @@ +{ + "id": "MAP_FIVE_ISLAND_RESORT_GORGEOUS", + "name": "FiveIsland_ResortGorgeous", + "layout": "LAYOUT_FIVE_ISLAND_RESORT_GORGEOUS", + "music": "BGM_FRLG_SEVII_ISLANDS", + "region_map_section": "MAPSEC_RESORT_GORGEOUS", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_FIVE_ISLAND_WATER_LABYRINTH", + "offset": -48, + "direction": "down" + } + ], + "object_events": [ + { + "graphics_id": "22", + "x": 44, + "y": 10, + "elevation": 3, + "movement_type": "18", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "FiveIsland_ResortGorgeous_EventScript_1AC127", + "flag": "0" + }, + { + "graphics_id": "22", + "x": 33, + "y": 12, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "FiveIsland_ResortGorgeous_EventScript_1AC165", + "flag": "0" + }, + { + "graphics_id": "22", + "x": 12, + "y": 10, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "FiveIsland_ResortGorgeous_EventScript_1AC1A3", + "flag": "0" + }, + { + "graphics_id": "28", + "x": 23, + "y": 9, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "FiveIsland_ResortGorgeous_EventScript_1AC1E1", + "flag": "0" + }, + { + "graphics_id": "28", + "x": 33, + "y": 8, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "FiveIsland_ResortGorgeous_EventScript_1AC21F", + "flag": "0" + }, + { + "graphics_id": "18", + "x": 33, + "y": 3, + "elevation": 3, + "movement_type": "46", + "movement_range_x": 10, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "FiveIsland_ResortGorgeous_EventScript_1AC25D", + "flag": "0" + }, + { + "graphics_id": "43", + "x": 56, + "y": 7, + "elevation": 1, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "FiveIsland_ResortGorgeous_EventScript_1AC29B", + "flag": "0" + }, + { + "graphics_id": "28", + "x": 39, + "y": 9, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "148" + } + ], + "warp_events": [ + { + "x": 64, + "y": 13, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ENTRANCE", + "dest_warp_id": 0 + }, + { + "x": 39, + "y": 8, + "elevation": 0, + "dest_map": "MAP_FIVE_ISLAND_RESORT_GORGEOUS_HOUSE", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 10, + "y": 7, + "elevation": 3, + "item": "ITEM_NEST_BALL", + "flag": "174", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 27, + "y": 11, + "elevation": 3, + "item": "ITEM_STARDUST", + "flag": "175", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 40, + "y": 12, + "elevation": 3, + "item": "ITEM_STAR_PIECE", + "flag": "176", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 27, + "y": 5, + "elevation": 3, + "item": "ITEM_STARDUST", + "flag": "177", + "unknown": 1 + }, + { + "type": "bg_event_type_0", + "x": 42, + "y": 9, + "elevation": 0, + "script": "FiveIsland_ResortGorgeous_EventScript_168844" + } + ] +} \ No newline at end of file diff --git a/data/maps/FiveIsland_ResortGorgeous_House/events.inc b/data/maps/FiveIsland_ResortGorgeous_House/events.inc deleted file mode 100644 index ea5ba7114..000000000 --- a/data/maps/FiveIsland_ResortGorgeous_House/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -FiveIsland_ResortGorgeous_House_EventObjects: - object_event 1, 28, 0, 4, 0, 4, 0, 3, 10, 17, 0, 0, 0, 0, 0, FiveIsland_ResortGorgeous_House_EventScript_171EBE, 149, 0, 0 - object_event 2, 61, 0, 6, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, FiveIsland_ResortGorgeous_House_EventScript_172062, 150, 0, 0 - -FiveIsland_ResortGorgeous_House_MapWarps: - warp_def 4, 7, 3, 1, 822 - -FiveIsland_ResortGorgeous_House_MapBGEvents: - bg_event 9, 1, 0, 1, 0, FiveIsland_ResortGorgeous_House_EventScript_1ACF2C - bg_event 8, 1, 0, 1, 0, FiveIsland_ResortGorgeous_House_EventScript_1ACF2C - -FiveIsland_ResortGorgeous_House_MapEvents:: - map_events FiveIsland_ResortGorgeous_House_EventObjects, FiveIsland_ResortGorgeous_House_MapWarps, 0x0, FiveIsland_ResortGorgeous_House_MapBGEvents diff --git a/data/maps/FiveIsland_ResortGorgeous_House/header.inc b/data/maps/FiveIsland_ResortGorgeous_House/header.inc deleted file mode 100644 index 9ef744a47..000000000 --- a/data/maps/FiveIsland_ResortGorgeous_House/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FiveIsland_ResortGorgeous_House:: @ 8351F78 - .4byte FiveIsland_ResortGorgeous_House_Layout @ 0x82D657C - .4byte FiveIsland_ResortGorgeous_House_MapEvents @ 0x83BF2C0 - .4byte FiveIsland_ResortGorgeous_House_MapScripts @ 0x8171EBD - .4byte NULL - .2byte BGM_FRLG_ISLAND_FOUR - .2byte 17 - .byte 0x9f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/FiveIsland_ResortGorgeous_House/map.json b/data/maps/FiveIsland_ResortGorgeous_House/map.json new file mode 100644 index 000000000..ec97e8cf0 --- /dev/null +++ b/data/maps/FiveIsland_ResortGorgeous_House/map.json @@ -0,0 +1,69 @@ +{ + "id": "MAP_FIVE_ISLAND_RESORT_GORGEOUS_HOUSE", + "name": "FiveIsland_ResortGorgeous_House", + "layout": "LAYOUT_FIVE_ISLAND_RESORT_GORGEOUS_HOUSE", + "music": "BGM_FRLG_ISLAND_FOUR", + "region_map_section": "MAPSEC_RESORT_GORGEOUS", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "28", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FiveIsland_ResortGorgeous_House_EventScript_171EBE", + "flag": "149" + }, + { + "graphics_id": "61", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FiveIsland_ResortGorgeous_House_EventScript_172062", + "flag": "150" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_RESORT_GORGEOUS", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_1", + "x": 9, + "y": 1, + "elevation": 0, + "script": "FiveIsland_ResortGorgeous_House_EventScript_1ACF2C" + }, + { + "type": "bg_event_type_1", + "x": 8, + "y": 1, + "elevation": 0, + "script": "FiveIsland_ResortGorgeous_House_EventScript_1ACF2C" + } + ] +} \ No newline at end of file diff --git a/data/maps/FiveIsland_RocketWarehouse/map.json b/data/maps/FiveIsland_RocketWarehouse/map.json new file mode 100644 index 000000000..96b5b0286 --- /dev/null +++ b/data/maps/FiveIsland_RocketWarehouse/map.json @@ -0,0 +1,366 @@ +{ + "id": "MAP_FIVE_ISLAND_ROCKET_WAREHOUSE", + "name": "FiveIsland_RocketWarehouse", + "layout": "LAYOUT_FIVE_ISLAND_ROCKET_WAREHOUSE", + "music": "BGM_FRLG_ROCKET_HIDEOUT", + "region_map_section": "MAPSEC_ROCKET_WAREHOUSE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 5, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_3", + "connections": null, + "object_events": [ + { + "graphics_id": "49", + "x": 15, + "y": 11, + "elevation": 3, + "movement_type": "17", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SSAnne_CaptainsOffice4_EventScript_163FE6", + "flag": "136" + }, + { + "graphics_id": "49", + "x": 17, + "y": 15, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SSAnne_CaptainsOffice4_EventScript_163FFD", + "flag": "136" + }, + { + "graphics_id": "50", + "x": 27, + "y": 16, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SSAnne_CaptainsOffice4_EventScript_164087", + "flag": "136" + }, + { + "graphics_id": "49", + "x": 25, + "y": 11, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SSAnne_CaptainsOffice4_EventScript_164014", + "flag": "136" + }, + { + "graphics_id": "50", + "x": 6, + "y": 6, + "elevation": 3, + "movement_type": "16", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SSAnne_CaptainsOffice4_EventScript_164070", + "flag": "136" + }, + { + "graphics_id": "55", + "x": 27, + "y": 4, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_CaptainsOffice4_EventScript_163F93", + "flag": "0" + }, + { + "graphics_id": "92", + "x": 8, + "y": 25, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_CaptainsOffice4_EventScript_1BED87", + "flag": "500" + }, + { + "graphics_id": "92", + "x": 17, + "y": 3, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_CaptainsOffice4_EventScript_1BED94", + "flag": "501" + }, + { + "graphics_id": "92", + "x": 1, + "y": 16, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_CaptainsOffice4_EventScript_1BEDA1", + "flag": "502" + }, + { + "graphics_id": "92", + "x": 4, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_CaptainsOffice4_EventScript_1BEDAE", + "flag": "503" + } + ], + "warp_events": [ + { + "x": 24, + "y": 25, + "elevation": 3, + "dest_map": "MAP_FIVE_ISLAND_MEADOW", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 22, + "y": 11, + "elevation": 3, + "var": "VAR_0x4088", + "var_value": 0, + "script": "SSAnne_CaptainsOffice4_EventScript_163F81" + }, + { + "type": "trigger", + "x": 23, + "y": 11, + "elevation": 3, + "var": "VAR_0x4088", + "var_value": 0, + "script": "SSAnne_CaptainsOffice4_EventScript_163F81" + }, + { + "type": "trigger", + "x": 24, + "y": 11, + "elevation": 3, + "var": "VAR_0x4088", + "var_value": 0, + "script": "SSAnne_CaptainsOffice4_EventScript_163F81" + } + ], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 11, + "y": 2, + "elevation": 0, + "script": "SSAnne_CaptainsOffice4_EventScript_163F5A" + }, + { + "type": "bg_event_type_3", + "x": 26, + "y": 11, + "elevation": 0, + "script": "SSAnne_CaptainsOffice4_EventScript_163F78" + }, + { + "type": "hidden_item", + "x": 27, + "y": 2, + "elevation": 0, + "item": "ITEM_NEST_BALL", + "flag": "68", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 7, + "y": 16, + "elevation": 0, + "item": "ITEM_NET_BALL", + "flag": "69", + "unknown": 1 + }, + { + "type": "bg_event_type_0", + "x": 12, + "y": 2, + "elevation": 0, + "script": "SSAnne_CaptainsOffice4_EventScript_163F5A" + }, + { + "type": "bg_event_type_0", + "x": 10, + "y": 2, + "elevation": 0, + "script": "SSAnne_CaptainsOffice4_EventScript_163F5A" + }, + { + "type": "bg_event_type_0", + "x": 9, + "y": 2, + "elevation": 0, + "script": "SSAnne_CaptainsOffice4_EventScript_163F5A" + }, + { + "type": "bg_event_type_0", + "x": 8, + "y": 2, + "elevation": 0, + "script": "SSAnne_CaptainsOffice4_EventScript_163F5A" + }, + { + "type": "bg_event_type_0", + "x": 7, + "y": 2, + "elevation": 0, + "script": "SSAnne_CaptainsOffice4_EventScript_163F5A" + }, + { + "type": "bg_event_type_0", + "x": 11, + "y": 5, + "elevation": 0, + "script": "SSAnne_CaptainsOffice4_EventScript_163F5A" + }, + { + "type": "bg_event_type_0", + "x": 10, + "y": 5, + "elevation": 0, + "script": "SSAnne_CaptainsOffice4_EventScript_163F5A" + }, + { + "type": "bg_event_type_0", + "x": 11, + "y": 4, + "elevation": 0, + "script": "SSAnne_CaptainsOffice4_EventScript_163F5A" + }, + { + "type": "bg_event_type_0", + "x": 10, + "y": 4, + "elevation": 0, + "script": "SSAnne_CaptainsOffice4_EventScript_163F5A" + }, + { + "type": "bg_event_type_0", + "x": 8, + "y": 4, + "elevation": 0, + "script": "SSAnne_CaptainsOffice4_EventScript_163F5A" + }, + { + "type": "bg_event_type_0", + "x": 7, + "y": 4, + "elevation": 0, + "script": "SSAnne_CaptainsOffice4_EventScript_163F5A" + }, + { + "type": "bg_event_type_0", + "x": 8, + "y": 5, + "elevation": 0, + "script": "SSAnne_CaptainsOffice4_EventScript_163F5A" + }, + { + "type": "bg_event_type_0", + "x": 7, + "y": 5, + "elevation": 0, + "script": "SSAnne_CaptainsOffice4_EventScript_163F5A" + }, + { + "type": "bg_event_type_0", + "x": 5, + "y": 3, + "elevation": 0, + "script": "SSAnne_CaptainsOffice4_EventScript_163F5A" + }, + { + "type": "bg_event_type_0", + "x": 4, + "y": 3, + "elevation": 0, + "script": "SSAnne_CaptainsOffice4_EventScript_163F5A" + }, + { + "type": "bg_event_type_0", + "x": 5, + "y": 4, + "elevation": 0, + "script": "SSAnne_CaptainsOffice4_EventScript_163F5A" + }, + { + "type": "bg_event_type_0", + "x": 4, + "y": 4, + "elevation": 0, + "script": "SSAnne_CaptainsOffice4_EventScript_163F5A" + }, + { + "type": "bg_event_type_0", + "x": 3, + "y": 4, + "elevation": 0, + "script": "SSAnne_CaptainsOffice4_EventScript_163F5A" + }, + { + "type": "bg_event_type_0", + "x": 2, + "y": 4, + "elevation": 0, + "script": "SSAnne_CaptainsOffice4_EventScript_163F5A" + }, + { + "type": "bg_event_type_0", + "x": 2, + "y": 5, + "elevation": 0, + "script": "SSAnne_CaptainsOffice4_EventScript_163F5A" + }, + { + "type": "bg_event_type_0", + "x": 3, + "y": 5, + "elevation": 0, + "script": "SSAnne_CaptainsOffice4_EventScript_163F5A" + } + ] +} \ No newline at end of file diff --git a/data/maps/FiveIsland_RocketWarehouse/scripts.inc b/data/maps/FiveIsland_RocketWarehouse/scripts.inc new file mode 100644 index 000000000..c90174e86 --- /dev/null +++ b/data/maps/FiveIsland_RocketWarehouse/scripts.inc @@ -0,0 +1,202 @@ +FiveIsland_RocketWarehouse_MapScripts:: @ 8163F2E + map_script 1, SSAnne_CaptainsOffice4_MapScript1_163F3D + map_script 3, SSAnne_CaptainsOffice4_MapScript2_163F39 + .byte 0 + +SSAnne_CaptainsOffice4_MapScript2_163F39:: @ 8163F39 + setworldmapflag 2233 + end + +SSAnne_CaptainsOffice4_MapScript1_163F3D:: @ 8163F3D + checktrainerflag 543 + call_if 1, EventScript_163F47 + end + +EventScript_163F47:: @ 8163F47 + setmetatile 26, 20, 672, 0 + setmetatile 27, 20, 672, 0 + return + +SSAnne_CaptainsOffice4_EventScript_163F5A:: @ 8163F5A + lockall + checkflag FLAG_0x2D5 + goto_if 1, EventScript_163F6E + loadword 0, gUnknown_817B4E3 + callstd 4 + releaseall + end + +EventScript_163F6E:: @ 8163F6E + loadword 0, gUnknown_817B512 + callstd 4 + releaseall + end + +SSAnne_CaptainsOffice4_EventScript_163F78:: @ 8163F78 + loadword 0, gUnknown_817BB15 + callstd 3 + end + +SSAnne_CaptainsOffice4_EventScript_163F81:: @ 8163F81 + lockall + applymovement 4, Movement_1A75E7 + waitmovement 0 + setvar VAR_0x4088, 1 + releaseall + end + +SSAnne_CaptainsOffice4_EventScript_163F93:: @ 8163F93 + trainerbattle 2, 545, 0, Text_17BBAF, Text_17BC55, EventScript_163FCD + checkflag 2116 + goto_if 1, EventScript_163FB7 + loadword 0, gUnknown_817BCA3 + callstd 6 + end + +EventScript_163FB7:: @ 8163FB7 + setvar VAR_0x8004, 15 + setvar VAR_0x8005, 5 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_817BCD7 + callstd 6 + end + +EventScript_163FCD:: @ 8163FCD + loadword 0, gUnknown_817BC6C + callstd 4 + setflag FLAG_0x2DC + setorcopyvar VAR_0x8000, 374 + setorcopyvar VAR_0x8001, 1 + callstd 0 + release + end + +SSAnne_CaptainsOffice4_EventScript_163FE6:: @ 8163FE6 + trainerbattle 0, 541, 0, Text_17B54D, Text_17B585 + loadword 0, gUnknown_817B5A6 + callstd 6 + end + +SSAnne_CaptainsOffice4_EventScript_163FFD:: @ 8163FFD + trainerbattle 0, 542, 0, Text_17B677, Text_17B6D9 + loadword 0, gUnknown_817B6EF + callstd 6 + end + +SSAnne_CaptainsOffice4_EventScript_164014:: @ 8164014 + trainerbattle 2, 544, 0, Text_17B8DA, Text_17B9FB, EventScript_16402F + loadword 0, gUnknown_817BA64 + callstd 6 + end + +EventScript_16402F:: @ 816402F + getplayerxy VAR_0x8004, VAR_0x8005 + compare_var_to_value VAR_0x8004, 24 + call_if 3, EventScript_164065 + loadword 0, gUnknown_817BA64 + callstd 4 + closemessage + fadescreen 1 + removeobject 1 + removeobject 2 + removeobject 4 + removeobject 3 + setflag FLAG_0x088 + fadescreen 0 + setvar VAR_0x4088, 1 + setflag FLAG_0x2D5 + release + end + +EventScript_164065:: @ 8164065 + applymovement 255, Movement_1A75EB + waitmovement 0 + return + +SSAnne_CaptainsOffice4_EventScript_164070:: @ 8164070 + trainerbattle 0, 516, 0, Text_17B5D6, Text_17B62F + loadword 0, gUnknown_817B642 + callstd 6 + end + +SSAnne_CaptainsOffice4_EventScript_164087:: @ 8164087 + trainerbattle 2, 543, 0, Text_17B72D, Text_17B79C, EventScript_1640A2 + loadword 0, gUnknown_817B7FA + callstd 6 + end + +EventScript_1640A2:: @ 81640A2 + getplayerxy VAR_0x8004, VAR_0x8005 + specialvar VAR_RESULT, player_get_direction_lower_nybble + compare_var_to_value VAR_RESULT, 2 + call_if 1, EventScript_16412E + loadword 0, gUnknown_817B7AE + callstd 4 + closemessage + compare_var_to_value VAR_0x8004, 24 + call_if 3, EventScript_164144 + compare_var_to_value VAR_0x8004, 25 + call_if 1, EventScript_16414F + compare_var_to_value VAR_0x8004, 26 + call_if 1, EventScript_16415A + compare_var_to_value VAR_0x8004, 27 + call_if 1, EventScript_16415A + playse SE_PIN + call EventScript_163F47 + special DrawWholeMapView + waitse + compare_var_to_value VAR_0x8004, 24 + call_if 3, EventScript_164165 + compare_var_to_value VAR_0x8004, 25 + call_if 1, EventScript_164165 + compare_var_to_value VAR_0x8004, 26 + call_if 1, EventScript_164165 + compare_var_to_value VAR_0x8004, 27 + call_if 1, EventScript_164170 + loadword 0, gUnknown_817B7FA + callstd 4 + release + end + +EventScript_16412E:: @ 816412E + compare_var_to_value VAR_0x8004, 27 + goto_if 1, EventScript_1A77A9 + applymovement 255, Movement_1A75EB + waitmovement 0 + return + +EventScript_164144:: @ 8164144 + applymovement 3, Movement_16417B + waitmovement 0 + return + +EventScript_16414F:: @ 816414F + applymovement 3, Movement_16417F + waitmovement 0 + return + +EventScript_16415A:: @ 816415A + applymovement 3, Movement_1A75E9 + waitmovement 0 + return + +EventScript_164165:: @ 8164165 + applymovement 3, Movement_1A75E7 + waitmovement 0 + return + +EventScript_164170:: @ 8164170 + applymovement 3, Movement_1A75ED + waitmovement 0 + return + +Movement_16417B:: @ 816417B + step_13 + step_13 + step_2e + step_end + +Movement_16417F:: @ 816417F + step_13 + step_2e + step_end diff --git a/data/maps/FiveIsland_WaterLabyrinth/connections.inc b/data/maps/FiveIsland_WaterLabyrinth/connections.inc deleted file mode 100644 index 8c0351ad5..000000000 --- a/data/maps/FiveIsland_WaterLabyrinth/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -FiveIsland_WaterLabyrinth_MapConnectionsList: @ 8352DBC - connection up, 48, MAP_FIVE_ISLAND_RESORTGORGEOUS - connection down, 48, MAP_FIVE_ISLAND - -FiveIsland_WaterLabyrinth_MapConnections:: @ 8352DD4 - .4byte 2 - .4byte FiveIsland_WaterLabyrinth_MapConnectionsList diff --git a/data/maps/FiveIsland_WaterLabyrinth/events.inc b/data/maps/FiveIsland_WaterLabyrinth/events.inc deleted file mode 100644 index 400b22c61..000000000 --- a/data/maps/FiveIsland_WaterLabyrinth/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -FiveIsland_WaterLabyrinth_EventObjects: - object_event 1, 61, 0, 14, 0, 11, 0, 3, 8, 17, 0, 0, 0, 0, 0, FiveIsland_WaterLabyrinth_EventScript_16884E, 0, 0, 0 - object_event 2, 28, 0, 9, 0, 7, 0, 3, 2, 17, 0, 1, 0, 1, 0, FiveIsland_WaterLabyrinth_EventScript_1AC2D9, 0, 0, 0 - -FiveIsland_WaterLabyrinth_MapEvents:: - map_events FiveIsland_WaterLabyrinth_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/FiveIsland_WaterLabyrinth/header.inc b/data/maps/FiveIsland_WaterLabyrinth/header.inc deleted file mode 100644 index 9516eb6f8..000000000 --- a/data/maps/FiveIsland_WaterLabyrinth/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FiveIsland_WaterLabyrinth:: @ 8350C1C - .4byte FiveIsland_WaterLabyrinth_Layout @ 0x832B340 - .4byte FiveIsland_WaterLabyrinth_MapEvents @ 0x83B8CC4 - .4byte FiveIsland_WaterLabyrinth_MapScripts @ 0x816884D - .4byte FiveIsland_WaterLabyrinth_MapConnections @ 0x8352DD4 - .2byte BGM_FRLG_SEVII_ISLANDS - .2byte 247 - .byte 0xa0, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/FiveIsland_WaterLabyrinth/map.json b/data/maps/FiveIsland_WaterLabyrinth/map.json new file mode 100644 index 000000000..f4ed982f2 --- /dev/null +++ b/data/maps/FiveIsland_WaterLabyrinth/map.json @@ -0,0 +1,57 @@ +{ + "id": "MAP_FIVE_ISLAND_WATER_LABYRINTH", + "name": "FiveIsland_WaterLabyrinth", + "layout": "LAYOUT_FIVE_ISLAND_WATER_LABYRINTH", + "music": "BGM_FRLG_SEVII_ISLANDS", + "region_map_section": "MAPSEC_WATER_LABYRINTH", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_FIVE_ISLAND_RESORT_GORGEOUS", + "offset": 48, + "direction": "up" + }, + { + "map": "MAP_FIVE_ISLAND", + "offset": 48, + "direction": "down" + } + ], + "object_events": [ + { + "graphics_id": "61", + "x": 14, + "y": 11, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FiveIsland_WaterLabyrinth_EventScript_16884E", + "flag": "0" + }, + { + "graphics_id": "28", + "x": 9, + "y": 7, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "FiveIsland_WaterLabyrinth_EventScript_1AC2D9", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FourIsland/events.inc b/data/maps/FourIsland/events.inc deleted file mode 100644 index 5e34db60d..000000000 --- a/data/maps/FourIsland/events.inc +++ /dev/null @@ -1,32 +0,0 @@ -FourIsland_EventObjects: - object_event 1, 32, 0, 16, 0, 13, 0, 3, 8, 17, 0, 0, 0, 0, 0, FourIsland_EventScript_167D55, 0, 0, 0 - object_event 2, 132, 0, 12, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 3, 122, 0, 13, 0, 7, 0, 3, 10, 17, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 4, 123, 0, 14, 0, 7, 0, 3, 9, 17, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 5, 121, 0, 17, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 6, 35, 0, 26, 0, 19, 0, 3, 9, 17, 0, 0, 0, 0, 0, FourIsland_EventScript_167E2E, 0, 0, 0 - object_event 7, 96, 0, 5, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, FourIsland_EventScript_1BE00C, 18, 0, 0 - object_event 8, 92, 0, 5, 0, 6, 0, 3, 8, 17, 0, 0, 0, 0, 0, FourIsland_EventScript_1BEC28, 473, 0, 0 - object_event 9, 92, 0, 32, 0, 19, 0, 3, 8, 17, 0, 0, 0, 0, 0, FourIsland_EventScript_1BEC35, 474, 0, 0 - object_event 10, 72, 0, 8, 0, 25, 0, 3, 9, 17, 0, 0, 0, 0, 0, 0x0, 151, 0, 0 - object_event 11, 27, 0, 36, 0, 13, 0, 3, 8, 17, 0, 0, 0, 0, 0, FourIsland_EventScript_167E73, 0, 0, 0 - object_event 12, 17, 0, 31, 0, 21, 0, 3, 10, 17, 0, 0, 0, 0, 0, FourIsland_EventScript_167E5A, 0, 0, 0 - -FourIsland_MapWarps: - warp_def 18, 20, 0, 0, 8961 - warp_def 12, 13, 0, 0, 8960 - warp_def 25, 14, 0, 0, 8963 - warp_def 38, 12, 0, 0, 366 - warp_def 33, 23, 0, 0, 8964 - warp_def 25, 26, 0, 0, 8966 - warp_def 10, 28, 3, 0, 8965 - warp_def 22, 26, 0, 0, 8967 - -FourIsland_MapBGEvents: - bg_event 13, 19, 0, 0, 0, FourIsland_EventScript_167E7C - bg_event 22, 34, 3, 7, 0, 106, 168, 1 - bg_event 6, 21, 3, 7, 0, 2, 169, 1 - bg_event 31, 23, 0, 0, 0, FourIsland_EventScript_167E85 - -FourIsland_MapEvents:: - map_events FourIsland_EventObjects, FourIsland_MapWarps, 0x0, FourIsland_MapBGEvents diff --git a/data/maps/FourIsland/header.inc b/data/maps/FourIsland/header.inc deleted file mode 100644 index 7efe4469f..000000000 --- a/data/maps/FourIsland/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FourIsland:: @ 83507BC - .4byte FourIsland_Layout @ 0x8323580 - .4byte FourIsland_MapEvents @ 0x83B646C - .4byte FourIsland_MapScripts @ 0x8167CAE - .4byte NULL - .2byte BGM_FRLG_ISLAND_FOUR - .2byte 233 - .byte 0x92, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/FourIsland/map.json b/data/maps/FourIsland/map.json new file mode 100644 index 000000000..fdc2e8607 --- /dev/null +++ b/data/maps/FourIsland/map.json @@ -0,0 +1,266 @@ +{ + "id": "MAP_FOUR_ISLAND", + "name": "FourIsland", + "layout": "LAYOUT_FOUR_ISLAND", + "music": "BGM_FRLG_ISLAND_FOUR", + "region_map_section": "MAPSEC_FOUR_ISLAND", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_1", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "32", + "x": 16, + "y": 13, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FourIsland_EventScript_167D55", + "flag": "0" + }, + { + "graphics_id": "132", + "x": 12, + "y": 9, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "122", + "x": 13, + "y": 7, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "123", + "x": 14, + "y": 7, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "121", + "x": 17, + "y": 9, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "35", + "x": 26, + "y": 19, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FourIsland_EventScript_167E2E", + "flag": "0" + }, + { + "graphics_id": "96", + "x": 5, + "y": 11, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FourIsland_EventScript_1BE00C", + "flag": "18" + }, + { + "graphics_id": "92", + "x": 5, + "y": 6, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FourIsland_EventScript_1BEC28", + "flag": "473" + }, + { + "graphics_id": "92", + "x": 32, + "y": 19, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FourIsland_EventScript_1BEC35", + "flag": "474" + }, + { + "graphics_id": "72", + "x": 8, + "y": 25, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "151" + }, + { + "graphics_id": "27", + "x": 36, + "y": 13, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FourIsland_EventScript_167E73", + "flag": "0" + }, + { + "graphics_id": "17", + "x": 31, + "y": 21, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FourIsland_EventScript_167E5A", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 18, + "y": 20, + "elevation": 0, + "dest_map": "MAP_FOUR_ISLAND_POKEMON_CENTER_1F", + "dest_warp_id": 0 + }, + { + "x": 12, + "y": 13, + "elevation": 0, + "dest_map": "MAP_FOUR_ISLAND_POKEMON_DAY_CARE", + "dest_warp_id": 0 + }, + { + "x": 25, + "y": 14, + "elevation": 0, + "dest_map": "MAP_FOUR_ISLAND_HOUSE1", + "dest_warp_id": 0 + }, + { + "x": 38, + "y": 12, + "elevation": 0, + "dest_map": "MAP_FOUR_ISLAND_ICEFALL_CAVE_ENTRANCE", + "dest_warp_id": 0 + }, + { + "x": 33, + "y": 23, + "elevation": 0, + "dest_map": "MAP_FOUR_ISLAND_LORELEIS_HOUSE", + "dest_warp_id": 0 + }, + { + "x": 25, + "y": 26, + "elevation": 0, + "dest_map": "MAP_FOUR_ISLAND_HOUSE2", + "dest_warp_id": 0 + }, + { + "x": 10, + "y": 28, + "elevation": 3, + "dest_map": "MAP_FOUR_ISLAND_HARBOR", + "dest_warp_id": 0 + }, + { + "x": 22, + "y": 26, + "elevation": 0, + "dest_map": "MAP_FOUR_ISLAND_MART", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 13, + "y": 19, + "elevation": 0, + "script": "FourIsland_EventScript_167E7C" + }, + { + "type": "hidden_item", + "x": 22, + "y": 34, + "elevation": 3, + "item": "ITEM_PEARL", + "flag": "168", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 6, + "y": 21, + "elevation": 3, + "item": "POCKET_KEY_ITEMS", + "flag": "169", + "unknown": 1 + }, + { + "type": "bg_event_type_0", + "x": 31, + "y": 23, + "elevation": 0, + "script": "FourIsland_EventScript_167E85" + } + ] +} \ No newline at end of file diff --git a/data/maps/FourIsland_Harbor/events.inc b/data/maps/FourIsland_Harbor/events.inc deleted file mode 100644 index 34b82cbe5..000000000 --- a/data/maps/FourIsland_Harbor/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -FourIsland_Harbor_EventObjects: - object_event 1, 108, 0, 8, 0, 9, 0, 0, 8, 17, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 2, 62, 0, 8, 0, 6, 0, 3, 7, 17, 0, 0, 0, 0, 0, FourIsland_Harbor_EventScript_171C99, 0, 0, 0 - -FourIsland_Harbor_MapWarps: - warp_def 8, 2, 3, 6, 783 - -FourIsland_Harbor_MapEvents:: - map_events FourIsland_Harbor_EventObjects, FourIsland_Harbor_MapWarps, 0x0, 0x0 diff --git a/data/maps/FourIsland_Harbor/header.inc b/data/maps/FourIsland_Harbor/header.inc deleted file mode 100644 index af0f40483..000000000 --- a/data/maps/FourIsland_Harbor/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FourIsland_Harbor:: @ 8351DF0 - .4byte Island_Harbor_Layout @ 0x8343FB8 - .4byte FourIsland_Harbor_MapEvents @ 0x83BEDA8 - .4byte FourIsland_Harbor_MapScripts @ 0x8171C98 - .4byte NULL - .2byte BGM_FRLG_ISLAND_FOUR - .2byte 315 - .byte 0x92, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/FourIsland_Harbor/map.json b/data/maps/FourIsland_Harbor/map.json new file mode 100644 index 000000000..9786e2b1f --- /dev/null +++ b/data/maps/FourIsland_Harbor/map.json @@ -0,0 +1,54 @@ +{ + "id": "MAP_FOUR_ISLAND_HARBOR", + "name": "FourIsland_Harbor", + "layout": "LAYOUT_ISLAND_HARBOR", + "music": "BGM_FRLG_ISLAND_FOUR", + "region_map_section": "MAPSEC_FOUR_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "108", + "x": 8, + "y": 9, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "62", + "x": 8, + "y": 6, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FourIsland_Harbor_EventScript_171C99", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 8, + "y": 2, + "elevation": 3, + "dest_map": "MAP_FOUR_ISLAND", + "dest_warp_id": 6 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FourIsland_House1/events.inc b/data/maps/FourIsland_House1/events.inc deleted file mode 100644 index 16874c5ca..000000000 --- a/data/maps/FourIsland_House1/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -FourIsland_House1_EventObjects: - object_event 1, 27, 0, 8, 0, 3, 0, 3, 10, 17, 0, 0, 0, 0, 0, FourIsland_House1_EventScript_1C4D84, 0, 0, 0 - object_event 2, 27, 0, 9, 0, 3, 0, 3, 9, 17, 0, 0, 0, 0, 0, FourIsland_House1_EventScript_171C45, 0, 0, 0 - -FourIsland_House1_MapWarps: - warp_def 4, 7, 3, 2, 783 - -FourIsland_House1_MapEvents:: - map_events FourIsland_House1_EventObjects, FourIsland_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/FourIsland_House1/header.inc b/data/maps/FourIsland_House1/header.inc deleted file mode 100644 index 6f2cf1099..000000000 --- a/data/maps/FourIsland_House1/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FourIsland_House1:: @ 8351DB8 - .4byte House3_Layout @ 0x82D5CB8 - .4byte FourIsland_House1_MapEvents @ 0x83BEBD8 - .4byte FourIsland_House1_MapScripts @ 0x8171C44 - .4byte NULL - .2byte BGM_FRLG_ISLAND_FOUR - .2byte 11 - .byte 0x92, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/FourIsland_House1/map.json b/data/maps/FourIsland_House1/map.json new file mode 100644 index 000000000..46c98ee57 --- /dev/null +++ b/data/maps/FourIsland_House1/map.json @@ -0,0 +1,54 @@ +{ + "id": "MAP_FOUR_ISLAND_HOUSE1", + "name": "FourIsland_House1", + "layout": "LAYOUT_HOUSE3", + "music": "BGM_FRLG_ISLAND_FOUR", + "region_map_section": "MAPSEC_FOUR_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "27", + "x": 8, + "y": 3, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FourIsland_House1_EventScript_1C4D84", + "flag": "0" + }, + { + "graphics_id": "27", + "x": 9, + "y": 3, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FourIsland_House1_EventScript_171C45", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_FOUR_ISLAND", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FourIsland_House2/events.inc b/data/maps/FourIsland_House2/events.inc deleted file mode 100644 index 07985cb74..000000000 --- a/data/maps/FourIsland_House2/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -FourIsland_House2_EventObjects: - object_event 1, 25, 0, 4, 0, 4, 0, 3, 8, 17, 0, 0, 0, 0, 0, FourIsland_House2_EventScript_1B2938, 0, 0, 0 - -FourIsland_House2_MapWarps: - warp_def 4, 7, 3, 5, 783 - -FourIsland_House2_MapEvents:: - map_events FourIsland_House2_EventObjects, FourIsland_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/FourIsland_House2/header.inc b/data/maps/FourIsland_House2/header.inc deleted file mode 100644 index 699623002..000000000 --- a/data/maps/FourIsland_House2/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FourIsland_House2:: @ 8351E0C - .4byte House3_Layout @ 0x82D5CB8 - .4byte FourIsland_House2_MapEvents @ 0x83BEDDC - .4byte FourIsland_House2_MapScripts @ 0x8171CAC - .4byte NULL - .2byte BGM_FRLG_ISLAND_FOUR - .2byte 11 - .byte 0x92, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/FourIsland_House2/map.json b/data/maps/FourIsland_House2/map.json new file mode 100644 index 000000000..9419ba2c6 --- /dev/null +++ b/data/maps/FourIsland_House2/map.json @@ -0,0 +1,41 @@ +{ + "id": "MAP_FOUR_ISLAND_HOUSE2", + "name": "FourIsland_House2", + "layout": "LAYOUT_HOUSE3", + "music": "BGM_FRLG_ISLAND_FOUR", + "region_map_section": "MAPSEC_FOUR_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "25", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FourIsland_House2_EventScript_1B2938", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_FOUR_ISLAND", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FourIsland_IcefallCave_1F/events.inc b/data/maps/FourIsland_IcefallCave_1F/events.inc deleted file mode 100644 index f4b81511d..000000000 --- a/data/maps/FourIsland_IcefallCave_1F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -FourIsland_IcefallCave_1F_EventObjects: - object_event 1, 92, 0, 11, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, FourIsland_IcefallCave_1F_EventScript_1BED53, 496, 0, 0 - object_event 2, 92, 0, 12, 0, 16, 0, 3, 8, 17, 0, 0, 0, 0, 0, FourIsland_IcefallCave_1F_EventScript_1BED60, 497, 0, 0 - -FourIsland_IcefallCave_1F_MapWarps: - warp_def 3, 17, 0, 1, 366 - warp_def 2, 8, 3, 2, 366 - warp_def 12, 12, 3, 0, 368 - warp_def 12, 3, 3, 1, 368 - warp_def 15, 16, 3, 2, 368 - warp_def 3, 6, 3, 0, 369 - -FourIsland_IcefallCave_1F_MapEvents:: - map_events FourIsland_IcefallCave_1F_EventObjects, FourIsland_IcefallCave_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/FourIsland_IcefallCave_1F/header.inc b/data/maps/FourIsland_IcefallCave_1F/header.inc deleted file mode 100644 index a77f235f9..000000000 --- a/data/maps/FourIsland_IcefallCave_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FourIsland_IcefallCave_1F:: @ 834FE38 - .4byte FourIsland_IcefallCave_1F_Layout @ 0x834117C - .4byte FourIsland_IcefallCave_1F_MapEvents @ 0x83B34AC - .4byte FourIsland_IcefallCave_1F_MapScripts @ 0x8163D44 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 294 - .byte 0xb1, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/FourIsland_IcefallCave_1F/map.json b/data/maps/FourIsland_IcefallCave_1F/map.json new file mode 100644 index 000000000..57207c4e5 --- /dev/null +++ b/data/maps/FourIsland_IcefallCave_1F/map.json @@ -0,0 +1,89 @@ +{ + "id": "MAP_FOUR_ISLAND_ICEFALL_CAVE_1F", + "name": "FourIsland_IcefallCave_1F", + "layout": "LAYOUT_FOUR_ISLAND_ICEFALL_CAVE_1F", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_ICEFALL_CAVE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "92", + "x": 11, + "y": 7, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FourIsland_IcefallCave_1F_EventScript_1BED53", + "flag": "496" + }, + { + "graphics_id": "92", + "x": 12, + "y": 16, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FourIsland_IcefallCave_1F_EventScript_1BED60", + "flag": "497" + } + ], + "warp_events": [ + { + "x": 3, + "y": 17, + "elevation": 0, + "dest_map": "MAP_FOUR_ISLAND_ICEFALL_CAVE_ENTRANCE", + "dest_warp_id": 1 + }, + { + "x": 2, + "y": 8, + "elevation": 3, + "dest_map": "MAP_FOUR_ISLAND_ICEFALL_CAVE_ENTRANCE", + "dest_warp_id": 2 + }, + { + "x": 12, + "y": 12, + "elevation": 3, + "dest_map": "MAP_FOUR_ISLAND_ICEFALL_CAVE_B1F", + "dest_warp_id": 0 + }, + { + "x": 12, + "y": 3, + "elevation": 3, + "dest_map": "MAP_FOUR_ISLAND_ICEFALL_CAVE_B1F", + "dest_warp_id": 1 + }, + { + "x": 15, + "y": 16, + "elevation": 3, + "dest_map": "MAP_FOUR_ISLAND_ICEFALL_CAVE_B1F", + "dest_warp_id": 2 + }, + { + "x": 3, + "y": 6, + "elevation": 3, + "dest_map": "MAP_FOUR_ISLAND_ICEFALL_CAVE_BACK", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FourIsland_IcefallCave_1F/scripts.inc b/data/maps/FourIsland_IcefallCave_1F/scripts.inc index 0698ff061..c73ec85fd 100644 --- a/data/maps/FourIsland_IcefallCave_1F/scripts.inc +++ b/data/maps/FourIsland_IcefallCave_1F/scripts.inc @@ -23,7 +23,7 @@ EventScript_163D65:: @ 8163D65 waitmovement 0 playse SE_FU_ZAKU delay 60 - warphole MAP_FOUR_ISLAND_ICEFALLCAVE_B1F + warphole MAP_FOUR_ISLAND_ICEFALL_CAVE_B1F waitstate releaseall end diff --git a/data/maps/FourIsland_IcefallCave_B1F/map.json b/data/maps/FourIsland_IcefallCave_B1F/map.json new file mode 100644 index 000000000..976318747 --- /dev/null +++ b/data/maps/FourIsland_IcefallCave_B1F/map.json @@ -0,0 +1,68 @@ +{ + "id": "MAP_FOUR_ISLAND_ICEFALL_CAVE_B1F", + "name": "FourIsland_IcefallCave_B1F", + "layout": "LAYOUT_FOUR_ISLAND_ICEFALL_CAVE_B1F", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_ICEFALL_CAVE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "92", + "x": 10, + "y": 14, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_CaptainsOffice2_EventScript_1BED6D", + "flag": "498" + }, + { + "graphics_id": "92", + "x": 21, + "y": 7, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_CaptainsOffice2_EventScript_1BED7A", + "flag": "499" + } + ], + "warp_events": [ + { + "x": 12, + "y": 12, + "elevation": 3, + "dest_map": "MAP_FOUR_ISLAND_ICEFALL_CAVE_1F", + "dest_warp_id": 2 + }, + { + "x": 12, + "y": 3, + "elevation": 3, + "dest_map": "MAP_FOUR_ISLAND_ICEFALL_CAVE_1F", + "dest_warp_id": 3 + }, + { + "x": 15, + "y": 16, + "elevation": 3, + "dest_map": "MAP_FOUR_ISLAND_ICEFALL_CAVE_1F", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FourIsland_IcefallCave_B1F/scripts.inc b/data/maps/FourIsland_IcefallCave_B1F/scripts.inc new file mode 100644 index 000000000..a3ec3cf54 --- /dev/null +++ b/data/maps/FourIsland_IcefallCave_B1F/scripts.inc @@ -0,0 +1,2 @@ +FourIsland_IcefallCave_B1F_MapScripts:: @ 8163D81 + .byte 0 diff --git a/data/maps/FourIsland_IcefallCave_Back/map.json b/data/maps/FourIsland_IcefallCave_Back/map.json new file mode 100644 index 000000000..2641a3f94 --- /dev/null +++ b/data/maps/FourIsland_IcefallCave_Back/map.json @@ -0,0 +1,108 @@ +{ + "id": "MAP_FOUR_ISLAND_ICEFALL_CAVE_BACK", + "name": "FourIsland_IcefallCave_Back", + "layout": "LAYOUT_FOUR_ISLAND_ICEFALL_CAVE_BACK", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_ICEFALL_CAVE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "49", + "x": 11, + "y": 14, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "141" + }, + { + "graphics_id": "49", + "x": 13, + "y": 14, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "141" + }, + { + "graphics_id": "77", + "x": 12, + "y": 16, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_CaptainsOffice3_EventScript_163F25", + "flag": "139" + }, + { + "graphics_id": "49", + "x": 10, + "y": 15, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "141" + } + ], + "warp_events": [ + { + "x": 12, + "y": 23, + "elevation": 0, + "dest_map": "MAP_FOUR_ISLAND_ICEFALL_CAVE_1F", + "dest_warp_id": 5 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 11, + "y": 18, + "elevation": 3, + "var": "VAR_0x4080", + "var_value": 0, + "script": "SSAnne_CaptainsOffice3_EventScript_163D98" + }, + { + "type": "trigger", + "x": 12, + "y": 18, + "elevation": 3, + "var": "VAR_0x4080", + "var_value": 0, + "script": "SSAnne_CaptainsOffice3_EventScript_163D98" + }, + { + "type": "trigger", + "x": 13, + "y": 18, + "elevation": 3, + "var": "VAR_0x4080", + "var_value": 0, + "script": "SSAnne_CaptainsOffice3_EventScript_163D98" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FourIsland_IcefallCave_Back/scripts.inc b/data/maps/FourIsland_IcefallCave_Back/scripts.inc new file mode 100644 index 000000000..6b762c06b --- /dev/null +++ b/data/maps/FourIsland_IcefallCave_Back/scripts.inc @@ -0,0 +1,201 @@ +FourIsland_IcefallCave_Back_MapScripts:: @ 8163D82 + map_script 3, SSAnne_CaptainsOffice3_MapScript1_163D88 + .byte 0 + +SSAnne_CaptainsOffice3_MapScript1_163D88:: @ 8163D88 + compare_var_to_value VAR_0x4080, 1 + call_if 1, EventScript_163D94 + end + +EventScript_163D94:: @ 8163D94 + setflag FLAG_0x08B + return + +SSAnne_CaptainsOffice3_EventScript_163D98:: @ 8163D98 + lockall + textcolor 1 + loadword 0, gUnknown_817B04F + callstd 4 + applymovement 1, Movement_163EE8 + waitmovement 0 + textcolor 0 + loadword 0, gUnknown_817B0B9 + callstd 4 + closemessage + playse SE_PIN + applymovement 3, Movement_1A75DB + waitmovement 0 + applymovement 3, Movement_1A75ED + waitmovement 0 + applymovement 3, Movement_1A75DD + waitmovement 0 + textcolor 1 + loadword 0, gUnknown_817B109 + callstd 4 + closemessage + applymovement 3, Movement_1A75EB + waitmovement 0 + delay 18 + applymovement 3, Movement_1A75ED + waitmovement 0 + delay 35 + applymovement 4, Movement_163F11 + applymovement 3, Movement_163F18 + applymovement 255, Movement_163EDD + waitmovement 0 + applymovement 2, Movement_163EE8 + waitmovement 0 + playbgm BGM_FRLG_SUSPICIOUS_EYE, 0 + textcolor 0 + loadword 0, gUnknown_817B20B + callstd 4 + setvar VAR_LAST_TALKED, 4 + trainerbattle 3, 539, 0, Text_17B251 + applymovement 3, Movement_163F1B + waitmovement 0 + textcolor 1 + loadword 0, gUnknown_817B269 + callstd 4 + textcolor 0 + loadword 0, gUnknown_817B2EF + callstd 4 + textcolor 1 + message Text_17B313 + waitmessage + waitse + playmoncry SPECIES_LAPRAS, 2 + waitbuttonpress + waitmoncry + applymovement 1, Movement_163EEE + waitmovement 0 + textcolor 0 + loadword 0, gUnknown_817B399 + callstd 4 + closemessage + applymovement 3, Movement_163F1D + applymovement 255, Movement_163EE2 + applymovement 1, Movement_163EF0 + applymovement 2, Movement_163EFA + applymovement 4, Movement_163F05 + waitmovement 0 + removeobject 1 + removeobject 2 + removeobject 4 + delay 50 + applymovement 3, Movement_163F23 + waitmovement 0 + applymovement 255, Movement_1A75E7 + waitmovement 0 + textcolor 1 + loadword 0, gUnknown_817B457 + callstd 4 + setflag FLAG_0x08E + clearflag FLAG_0x08C + setvar VAR_0x4080, 1 + releaseall + end + +Movement_163EDD:: @ 8163EDD + step_11 + step_11 + step_13 + step_11 + step_end + +Movement_163EE2:: @ 8163EE2 + step_1c + step_2f + step_1c + step_1c + step_2d + step_end + +Movement_163EE8:: @ 8163EE8 + step_25 + step_end + +gUnknown_163EEA:: @ 8163EEA + step_4c + step_13 + step_4d + step_end + +Movement_163EEE:: @ 8163EEE + step_29 + step_end + +Movement_163EF0:: @ 8163EF0 + step_13 + step_10 + step_1d + step_1d + step_1d + step_1d + step_1d + step_1d + step_1d + step_end + +Movement_163EFA:: @ 8163EFA + step_1c + step_12 + step_10 + step_1d + step_1d + step_1d + step_1d + step_1d + step_1d + step_1d + step_end + +Movement_163F05:: @ 8163F05 + step_1c + step_10 + step_1c + step_10 + step_20 + step_20 + step_1d + step_1d + step_1d + step_1d + step_1d + step_end + +Movement_163F11:: @ 8163F11 + step_1c + step_1b + step_30 + step_end + +Movement_163F15:: @ 8163F15 + step_12 + step_12 + step_end + +Movement_163F18:: @ 8163F18 + step_12 + step_11 + step_end + +Movement_163F1B:: @ 8163F1B + step_26 + step_end + +Movement_163F1D:: @ 8163F1D + step_1b + step_30 + step_1c + step_1c + step_2d + step_end + +Movement_163F23:: @ 8163F23 + step_13 + step_end + +SSAnne_CaptainsOffice3_EventScript_163F25:: @ 8163F25 + loadword 0, gUnknown_817B457 + callstd 2 + end diff --git a/data/maps/FourIsland_IcefallCave_Entrance/events.inc b/data/maps/FourIsland_IcefallCave_Entrance/events.inc deleted file mode 100644 index fc6ec6e8b..000000000 --- a/data/maps/FourIsland_IcefallCave_Entrance/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -FourIsland_IcefallCave_Entrance_MapWarps: - warp_def 17, 30, 3, 3, 783 - warp_def 10, 21, 3, 0, 367 - warp_def 9, 7, 3, 1, 367 - -FourIsland_IcefallCave_Entrance_MapEvents:: - map_events 0x0, FourIsland_IcefallCave_Entrance_MapWarps, 0x0, 0x0 diff --git a/data/maps/FourIsland_IcefallCave_Entrance/header.inc b/data/maps/FourIsland_IcefallCave_Entrance/header.inc deleted file mode 100644 index 758df55d9..000000000 --- a/data/maps/FourIsland_IcefallCave_Entrance/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FourIsland_IcefallCave_Entrance:: @ 834FE1C - .4byte FourIsland_IcefallCave_Entrance_Layout @ 0x8340E38 - .4byte FourIsland_IcefallCave_Entrance_MapEvents @ 0x83B3438 - .4byte FourIsland_IcefallCave_Entrance_MapScripts @ 0x8163D3A - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 293 - .byte 0xb1, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/FourIsland_IcefallCave_Entrance/map.json b/data/maps/FourIsland_IcefallCave_Entrance/map.json new file mode 100644 index 000000000..4214932de --- /dev/null +++ b/data/maps/FourIsland_IcefallCave_Entrance/map.json @@ -0,0 +1,41 @@ +{ + "id": "MAP_FOUR_ISLAND_ICEFALL_CAVE_ENTRANCE", + "name": "FourIsland_IcefallCave_Entrance", + "layout": "LAYOUT_FOUR_ISLAND_ICEFALL_CAVE_ENTRANCE", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_ICEFALL_CAVE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 17, + "y": 30, + "elevation": 3, + "dest_map": "MAP_FOUR_ISLAND", + "dest_warp_id": 3 + }, + { + "x": 10, + "y": 21, + "elevation": 3, + "dest_map": "MAP_FOUR_ISLAND_ICEFALL_CAVE_1F", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 7, + "elevation": 3, + "dest_map": "MAP_FOUR_ISLAND_ICEFALL_CAVE_1F", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FourIsland_LoreleisHouse/events.inc b/data/maps/FourIsland_LoreleisHouse/events.inc deleted file mode 100644 index 3861ecf62..000000000 --- a/data/maps/FourIsland_LoreleisHouse/events.inc +++ /dev/null @@ -1,22 +0,0 @@ -FourIsland_LoreleisHouse_EventObjects: - object_event 1, 77, 0, 7, 0, 4, 0, 3, 9, 17, 0, 0, 0, 0, 0, FourIsland_LoreleisHouse_EventScript_171C58, 140, 0, 0 - object_event 2, 131, 0, 0, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, FourIsland_LoreleisHouse_EventScript_171C8D, 0, 0, 0 - object_event 3, 126, 0, 10, 0, 3, 0, 0, 8, 17, 0, 0, 0, 0, 0, FourIsland_LoreleisHouse_EventScript_171C8D, 0, 0, 0 - object_event 4, 120, 0, 9, 0, 3, 0, 0, 8, 17, 0, 0, 0, 0, 0, FourIsland_LoreleisHouse_EventScript_171C8D, 0, 0, 0 - object_event 5, 128, 0, 7, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, FourIsland_LoreleisHouse_EventScript_171C8D, 0, 0, 0 - object_event 6, 129, 0, 6, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, FourIsland_LoreleisHouse_EventScript_171C8D, 0, 0, 0 - object_event 7, 121, 0, 6, 0, 4, 0, 0, 8, 17, 0, 0, 0, 0, 0, FourIsland_LoreleisHouse_EventScript_171C8D, 0, 0, 0 - object_event 8, 125, 0, 9, 0, 4, 0, 0, 8, 17, 0, 0, 0, 0, 0, FourIsland_LoreleisHouse_EventScript_171C8D, 165, 0, 0 - object_event 9, 117, 0, 10, 0, 4, 0, 0, 8, 17, 0, 0, 0, 0, 0, FourIsland_LoreleisHouse_EventScript_171C8D, 166, 0, 0 - object_event 10, 115, 0, 0, 0, 3, 0, 3, 8, 17, 0, 0, 0, 0, 0, FourIsland_LoreleisHouse_EventScript_171C8D, 168, 0, 0 - object_event 11, 122, 0, 0, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, FourIsland_LoreleisHouse_EventScript_171C8D, 167, 0, 0 - object_event 12, 123, 0, 1, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, FourIsland_LoreleisHouse_EventScript_171C8D, 169, 0, 0 - object_event 13, 114, 0, 9, 0, 0, 0, 3, 8, 17, 0, 0, 0, 0, 0, FourIsland_LoreleisHouse_EventScript_171C8D, 171, 0, 0 - object_event 14, 133, 0, 10, 0, 0, 0, 3, 8, 17, 0, 0, 0, 0, 0, FourIsland_LoreleisHouse_EventScript_171C8D, 170, 0, 0 - object_event 15, 107, 0, 9, 0, 6, 0, 3, 8, 17, 0, 0, 0, 0, 0, FourIsland_LoreleisHouse_EventScript_171C8D, 172, 0, 0 - -FourIsland_LoreleisHouse_MapWarps: - warp_def 4, 7, 3, 4, 783 - -FourIsland_LoreleisHouse_MapEvents:: - map_events FourIsland_LoreleisHouse_EventObjects, FourIsland_LoreleisHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/FourIsland_LoreleisHouse/header.inc b/data/maps/FourIsland_LoreleisHouse/header.inc deleted file mode 100644 index 70bb32a5d..000000000 --- a/data/maps/FourIsland_LoreleisHouse/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FourIsland_LoreleisHouse:: @ 8351DD4 - .4byte FourIsland_LoreleisHouse_Layout @ 0x82D7418 - .4byte FourIsland_LoreleisHouse_MapEvents @ 0x83BED5C - .4byte FourIsland_LoreleisHouse_MapScripts @ 0x8171C4E - .4byte NULL - .2byte BGM_FRLG_ISLAND_FOUR - .2byte 30 - .byte 0x92, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/FourIsland_LoreleisHouse/map.json b/data/maps/FourIsland_LoreleisHouse/map.json new file mode 100644 index 000000000..ccf6352d0 --- /dev/null +++ b/data/maps/FourIsland_LoreleisHouse/map.json @@ -0,0 +1,223 @@ +{ + "id": "MAP_FOUR_ISLAND_LORELEIS_HOUSE", + "name": "FourIsland_LoreleisHouse", + "layout": "LAYOUT_FOUR_ISLAND_LORELEIS_HOUSE", + "music": "BGM_FRLG_ISLAND_FOUR", + "region_map_section": "MAPSEC_FOUR_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "77", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FourIsland_LoreleisHouse_EventScript_171C58", + "flag": "140" + }, + { + "graphics_id": "131", + "x": 0, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FourIsland_LoreleisHouse_EventScript_171C8D", + "flag": "0" + }, + { + "graphics_id": "126", + "x": 10, + "y": 3, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FourIsland_LoreleisHouse_EventScript_171C8D", + "flag": "0" + }, + { + "graphics_id": "120", + "x": 9, + "y": 3, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FourIsland_LoreleisHouse_EventScript_171C8D", + "flag": "0" + }, + { + "graphics_id": "128", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FourIsland_LoreleisHouse_EventScript_171C8D", + "flag": "0" + }, + { + "graphics_id": "129", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FourIsland_LoreleisHouse_EventScript_171C8D", + "flag": "0" + }, + { + "graphics_id": "121", + "x": 6, + "y": 4, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FourIsland_LoreleisHouse_EventScript_171C8D", + "flag": "0" + }, + { + "graphics_id": "125", + "x": 9, + "y": 4, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FourIsland_LoreleisHouse_EventScript_171C8D", + "flag": "165" + }, + { + "graphics_id": "117", + "x": 10, + "y": 4, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FourIsland_LoreleisHouse_EventScript_171C8D", + "flag": "166" + }, + { + "graphics_id": "115", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FourIsland_LoreleisHouse_EventScript_171C8D", + "flag": "168" + }, + { + "graphics_id": "122", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FourIsland_LoreleisHouse_EventScript_171C8D", + "flag": "167" + }, + { + "graphics_id": "123", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FourIsland_LoreleisHouse_EventScript_171C8D", + "flag": "169" + }, + { + "graphics_id": "114", + "x": 9, + "y": 0, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FourIsland_LoreleisHouse_EventScript_171C8D", + "flag": "171" + }, + { + "graphics_id": "133", + "x": 10, + "y": 0, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FourIsland_LoreleisHouse_EventScript_171C8D", + "flag": "170" + }, + { + "graphics_id": "107", + "x": 9, + "y": 6, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FourIsland_LoreleisHouse_EventScript_171C8D", + "flag": "172" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_FOUR_ISLAND", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FourIsland_Mart/events.inc b/data/maps/FourIsland_Mart/events.inc deleted file mode 100644 index 1a90c86f5..000000000 --- a/data/maps/FourIsland_Mart/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -FourIsland_Mart_EventObjects: - object_event 1, 68, 0, 2, 0, 3, 0, 0, 10, 17, 0, 0, 0, 0, 0, FourIsland_Mart_EventScript_171CAE, 0, 0, 0 - object_event 2, 32, 0, 6, 0, 5, 0, 3, 10, 17, 0, 0, 0, 0, 0, FourIsland_Mart_EventScript_1ACF46, 0, 0, 0 - object_event 3, 39, 0, 8, 0, 3, 0, 3, 2, 18, 0, 0, 0, 0, 0, FourIsland_Mart_EventScript_171CE8, 0, 0, 0 - -FourIsland_Mart_MapWarps: - warp_def 4, 7, 3, 7, 783 - -FourIsland_Mart_MapEvents:: - map_events FourIsland_Mart_EventObjects, FourIsland_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/FourIsland_Mart/header.inc b/data/maps/FourIsland_Mart/header.inc deleted file mode 100644 index 95c316e9a..000000000 --- a/data/maps/FourIsland_Mart/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FourIsland_Mart:: @ 8351E28 - .4byte Mart_Layout @ 0x82D5BCC - .4byte FourIsland_Mart_MapEvents @ 0x83BEE40 - .4byte FourIsland_Mart_MapScripts @ 0x8171CAD - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 10 - .byte 0x92, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/FourIsland_Mart/map.json b/data/maps/FourIsland_Mart/map.json new file mode 100644 index 000000000..999dad6c7 --- /dev/null +++ b/data/maps/FourIsland_Mart/map.json @@ -0,0 +1,67 @@ +{ + "id": "MAP_FOUR_ISLAND_MART", + "name": "FourIsland_Mart", + "layout": "LAYOUT_MART", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_FOUR_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "68", + "x": 2, + "y": 3, + "elevation": 0, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FourIsland_Mart_EventScript_171CAE", + "flag": "0" + }, + { + "graphics_id": "32", + "x": 6, + "y": 5, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FourIsland_Mart_EventScript_1ACF46", + "flag": "0" + }, + { + "graphics_id": "39", + "x": 8, + "y": 3, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FourIsland_Mart_EventScript_171CE8", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_FOUR_ISLAND", + "dest_warp_id": 7 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FourIsland_PokemonCenter_1F/events.inc b/data/maps/FourIsland_PokemonCenter_1F/events.inc deleted file mode 100644 index 4f9608cd0..000000000 --- a/data/maps/FourIsland_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -FourIsland_PokemonCenter_1F_EventObjects: - object_event 1, 64, 0, 7, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, FourIsland_PokemonCenter_1F_EventScript_171BF9, 0, 0, 0 - object_event 2, 25, 0, 10, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, FourIsland_PokemonCenter_1F_EventScript_171C02, 0, 0, 0 - object_event 3, 31, 0, 5, 0, 5, 0, 3, 13, 17, 0, 0, 0, 0, 0, FourIsland_PokemonCenter_1F_EventScript_171C0B, 0, 0, 0 - object_event 4, 61, 0, 2, 0, 2, 0, 3, 7, 17, 0, 0, 0, 0, 0, FourIsland_PokemonCenter_1F_EventScript_171C14, 0, 0, 0 - -FourIsland_PokemonCenter_1F_MapWarps: - warp_def 7, 8, 3, 0, 783 - warp_def 1, 6, 4, 0, 8962 - -FourIsland_PokemonCenter_1F_MapBGEvents: - bg_event 3, 1, 0, 1, 0, FourIsland_PokemonCenter_1F_EventScript_1ACDD0 - bg_event 2, 1, 0, 1, 0, FourIsland_PokemonCenter_1F_EventScript_1ACDD0 - -FourIsland_PokemonCenter_1F_MapEvents:: - map_events FourIsland_PokemonCenter_1F_EventObjects, FourIsland_PokemonCenter_1F_MapWarps, 0x0, FourIsland_PokemonCenter_1F_MapBGEvents diff --git a/data/maps/FourIsland_PokemonCenter_1F/header.inc b/data/maps/FourIsland_PokemonCenter_1F/header.inc deleted file mode 100644 index 917d92aaf..000000000 --- a/data/maps/FourIsland_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FourIsland_PokemonCenter_1F:: @ 8351D80 - .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte FourIsland_PokemonCenter_1F_MapEvents @ 0x83BEB00 - .4byte FourIsland_PokemonCenter_1F_MapScripts @ 0x8171BEA - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 8 - .byte 0x92, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/FourIsland_PokemonCenter_1F/map.json b/data/maps/FourIsland_PokemonCenter_1F/map.json new file mode 100644 index 000000000..1df35b78b --- /dev/null +++ b/data/maps/FourIsland_PokemonCenter_1F/map.json @@ -0,0 +1,102 @@ +{ + "id": "MAP_FOUR_ISLAND_POKEMON_CENTER_1F", + "name": "FourIsland_PokemonCenter_1F", + "layout": "LAYOUT_POKEMON_CENTER_1F", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_FOUR_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "64", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FourIsland_PokemonCenter_1F_EventScript_171BF9", + "flag": "0" + }, + { + "graphics_id": "25", + "x": 10, + "y": 6, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FourIsland_PokemonCenter_1F_EventScript_171C02", + "flag": "0" + }, + { + "graphics_id": "31", + "x": 5, + "y": 5, + "elevation": 3, + "movement_type": "13", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FourIsland_PokemonCenter_1F_EventScript_171C0B", + "flag": "0" + }, + { + "graphics_id": "61", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FourIsland_PokemonCenter_1F_EventScript_171C14", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_FOUR_ISLAND", + "dest_warp_id": 0 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_FOUR_ISLAND_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_1", + "x": 3, + "y": 1, + "elevation": 0, + "script": "FourIsland_PokemonCenter_1F_EventScript_1ACDD0" + }, + { + "type": "bg_event_type_1", + "x": 2, + "y": 1, + "elevation": 0, + "script": "FourIsland_PokemonCenter_1F_EventScript_1ACDD0" + } + ] +} \ No newline at end of file diff --git a/data/maps/FourIsland_PokemonCenter_2F/events.inc b/data/maps/FourIsland_PokemonCenter_2F/events.inc deleted file mode 100644 index 53415e4f7..000000000 --- a/data/maps/FourIsland_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -FourIsland_PokemonCenter_2F_EventObjects: - object_event 1, 65, 0, 6, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FourIsland_PokemonCenter_2F_EventScript_1A8CF6, 0, 0, 0 - object_event 2, 65, 0, 2, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FourIsland_PokemonCenter_2F_EventScript_1A8CFC, 0, 0, 0 - object_event 3, 65, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FourIsland_PokemonCenter_2F_EventScript_1A8D02, 0, 0, 0 - object_event 4, 69, 0, 1, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, FourIsland_PokemonCenter_2F_EventScript_1BB1D2, 112, 0, 0 - -FourIsland_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 1, 8961 - warp_def 5, 1, 0, 0, 4 - warp_def 9, 1, 0, 0, 1 - -FourIsland_PokemonCenter_2F_MapEvents:: - map_events FourIsland_PokemonCenter_2F_EventObjects, FourIsland_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/FourIsland_PokemonCenter_2F/header.inc b/data/maps/FourIsland_PokemonCenter_2F/header.inc deleted file mode 100644 index 839d75196..000000000 --- a/data/maps/FourIsland_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FourIsland_PokemonCenter_2F:: @ 8351D9C - .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte FourIsland_PokemonCenter_2F_MapEvents @ 0x83BEB8C - .4byte FourIsland_PokemonCenter_2F_MapScripts @ 0x8171C1D - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 9 - .byte 0x92, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/FourIsland_PokemonCenter_2F/map.json b/data/maps/FourIsland_PokemonCenter_2F/map.json new file mode 100644 index 000000000..ef54040ea --- /dev/null +++ b/data/maps/FourIsland_PokemonCenter_2F/map.json @@ -0,0 +1,94 @@ +{ + "id": "MAP_FOUR_ISLAND_POKEMON_CENTER_2F", + "name": "FourIsland_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_FOUR_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "65", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FourIsland_PokemonCenter_2F_EventScript_1A8CF6", + "flag": "0" + }, + { + "graphics_id": "65", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FourIsland_PokemonCenter_2F_EventScript_1A8CFC", + "flag": "0" + }, + { + "graphics_id": "65", + "x": 10, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FourIsland_PokemonCenter_2F_EventScript_1A8D02", + "flag": "0" + }, + { + "graphics_id": "69", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FourIsland_PokemonCenter_2F_EventScript_1BB1D2", + "flag": "112" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_FOUR_ISLAND_POKEMON_CENTER_1F", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 1, + "elevation": 0, + "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 0, + "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FourIsland_PokemonDayCare/events.inc b/data/maps/FourIsland_PokemonDayCare/events.inc deleted file mode 100644 index e2022383b..000000000 --- a/data/maps/FourIsland_PokemonDayCare/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -FourIsland_PokemonDayCare_EventObjects: - object_event 1, 35, 0, 2, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, FourIsland_PokemonDayCare_EventScript_171940, 0, 0, 0 - -FourIsland_PokemonDayCare_MapWarps: - warp_def 4, 7, 3, 1, 783 - -FourIsland_PokemonDayCare_MapEvents:: - map_events FourIsland_PokemonDayCare_EventObjects, FourIsland_PokemonDayCare_MapWarps, 0x0, 0x0 diff --git a/data/maps/FourIsland_PokemonDayCare/header.inc b/data/maps/FourIsland_PokemonDayCare/header.inc deleted file mode 100644 index 7cea7eaa5..000000000 --- a/data/maps/FourIsland_PokemonDayCare/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FourIsland_PokemonDayCare:: @ 8351D64 - .4byte FourIsland_PokemonDayCare_Layout @ 0x833AFA8 - .4byte FourIsland_PokemonDayCare_MapEvents @ 0x83BEA64 - .4byte FourIsland_PokemonDayCare_MapScripts @ 0x817193F - .4byte NULL - .2byte BGM_FRLG_ISLAND_FOUR - .2byte 277 - .byte 0x92, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/FourIsland_PokemonDayCare/map.json b/data/maps/FourIsland_PokemonDayCare/map.json new file mode 100644 index 000000000..580fcc1c0 --- /dev/null +++ b/data/maps/FourIsland_PokemonDayCare/map.json @@ -0,0 +1,41 @@ +{ + "id": "MAP_FOUR_ISLAND_POKEMON_DAY_CARE", + "name": "FourIsland_PokemonDayCare", + "layout": "LAYOUT_FOUR_ISLAND_POKEMON_DAY_CARE", + "music": "BGM_FRLG_ISLAND_FOUR", + "region_map_section": "MAPSEC_FOUR_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "35", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FourIsland_PokemonDayCare_EventScript_171940", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_FOUR_ISLAND", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FuchsiaCity/connections.inc b/data/maps/FuchsiaCity/connections.inc deleted file mode 100644 index 58c41fdcc..000000000 --- a/data/maps/FuchsiaCity/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -FuchsiaCity_MapConnectionsList: @ 8352864 - connection down, 12, MAP_ROUTE19 - connection left, 10, MAP_ROUTE18 - connection right, 10, MAP_ROUTE15 - -FuchsiaCity_MapConnections:: @ 8352888 - .4byte 3 - .4byte FuchsiaCity_MapConnectionsList diff --git a/data/maps/FuchsiaCity/events.inc b/data/maps/FuchsiaCity/events.inc deleted file mode 100644 index 29dae023d..000000000 --- a/data/maps/FuchsiaCity/events.inc +++ /dev/null @@ -1,47 +0,0 @@ -FuchsiaCity_EventObjects: - object_event 1, 27, 0, 37, 0, 17, 0, 3, 8, 17, 0, 0, 0, 0, 0, FuchsiaCity_EventScript_166DAF, 0, 0, 0 - object_event 2, 128, 0, 36, 0, 15, 0, 3, 80, 20, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 3, 127, 0, 33, 0, 8, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 4, 18, 0, 33, 0, 11, 0, 3, 7, 17, 0, 0, 0, 0, 0, FuchsiaCity_EventScript_166DB8, 0, 0, 0 - object_event 5, 117, 0, 39, 0, 8, 0, 3, 2, 19, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 6, 16, 0, 14, 0, 15, 0, 3, 5, 19, 0, 0, 0, 0, 0, FuchsiaCity_EventScript_166D9D, 0, 0, 0 - object_event 7, 135, 0, 12, 0, 20, 0, 1, 2, 18, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 8, 32, 0, 36, 0, 20, 0, 3, 5, 20, 0, 0, 0, 0, 0, FuchsiaCity_EventScript_166DA6, 0, 0, 0 - object_event 9, 240, 0, 8, 0, 8, 0, 1, 8, 17, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 10, 119, 0, 16, 0, 9, 0, 3, 2, 20, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 11, 95, 0, 30, 0, 10, 0, 3, 8, 17, 0, 0, 0, 0, 0, FuchsiaCity_EventScript_1BDF13, 18, 0, 0 - object_event 12, 95, 0, 21, 0, 13, 0, 3, 8, 17, 0, 0, 0, 0, 0, FuchsiaCity_EventScript_1BDF13, 19, 0, 0 - object_event 13, 95, 0, 32, 0, 16, 0, 3, 8, 17, 0, 0, 0, 0, 0, FuchsiaCity_EventScript_1BDF13, 20, 0, 0 - object_event 14, 95, 0, 24, 0, 22, 0, 3, 8, 17, 0, 0, 0, 0, 0, FuchsiaCity_EventScript_1BDF13, 21, 0, 0 - object_event 15, 20, 0, 15, 0, 11, 0, 3, 7, 17, 0, 0, 0, 0, 0, FuchsiaCity_EventScript_1C4AEE, 0, 0, 0 - object_event 16, 22, 0, 40, 0, 6, 0, 3, 8, 17, 0, 0, 0, 0, 0, FuchsiaCity_EventScript_166DC1, 157, 0, 0 - -FuchsiaCity_MapWarps: - warp_def 24, 5, 0, 2, 2816 - warp_def 33, 31, 0, 1, 2823 - warp_def 11, 15, 0, 1, 2817 - warp_def 28, 16, 0, 1, 2818 - warp_def 9, 32, 0, 1, 2819 - warp_def 14, 31, 0, 1, 2820 - warp_def 25, 31, 3, 1, 2821 - warp_def 38, 31, 0, 1, 2824 - warp_def 39, 28, 3, 3, 2824 - warp_def 39, 29, 3, 3, 2824 - warp_def 19, 31, 0, 0, 2825 - -FuchsiaCity_MapBGEvents: - bg_event 31, 18, 3, 0, 0, FuchsiaCity_EventScript_166DDA - bg_event 26, 18, 0, 0, 0, FuchsiaCity_EventScript_166DE3 - bg_event 5, 32, 0, 0, 0, FuchsiaCity_EventScript_166E07 - bg_event 31, 31, 0, 0, 0, FuchsiaCity_EventScript_166DF5 - bg_event 35, 10, 0, 0, 0, FuchsiaCity_EventScript_166E38 - bg_event 38, 16, 3, 0, 0, FuchsiaCity_EventScript_166E6A - bg_event 41, 10, 0, 0, 0, FuchsiaCity_EventScript_166E1F - bg_event 17, 10, 0, 0, 0, FuchsiaCity_EventScript_166E51 - bg_event 11, 10, 0, 0, 0, FuchsiaCity_EventScript_166E9C - bg_event 17, 18, 3, 0, 0, FuchsiaCity_EventScript_166E83 - bg_event 22, 7, 0, 0, 0, FuchsiaCity_EventScript_166DEC - bg_event 33, 26, 3, 7, 0, 25, 133, 1 - -FuchsiaCity_MapEvents:: - map_events FuchsiaCity_EventObjects, FuchsiaCity_MapWarps, 0x0, FuchsiaCity_MapBGEvents diff --git a/data/maps/FuchsiaCity/header.inc b/data/maps/FuchsiaCity/header.inc deleted file mode 100644 index b4a33e9c5..000000000 --- a/data/maps/FuchsiaCity/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FuchsiaCity:: @ 83506DC - .4byte FuchsiaCity_Layout @ 0x82E373C - .4byte FuchsiaCity_MapEvents @ 0x83B5B14 - .4byte FuchsiaCity_MapScripts @ 0x8166D75 - .4byte FuchsiaCity_MapConnections @ 0x8352888 - .2byte BGM_FRLG_CERULEAN_CITY - .2byte 85 - .byte 0x5f, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/FuchsiaCity/map.json b/data/maps/FuchsiaCity/map.json new file mode 100644 index 000000000..1bc5c6621 --- /dev/null +++ b/data/maps/FuchsiaCity/map.json @@ -0,0 +1,409 @@ +{ + "id": "MAP_FUCHSIA_CITY", + "name": "FuchsiaCity", + "layout": "LAYOUT_FUCHSIA_CITY", + "music": "BGM_FRLG_CERULEAN_CITY", + "region_map_section": "MAPSEC_FUCHSIA_CITY", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_1", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_ROUTE19", + "offset": 12, + "direction": "down" + }, + { + "map": "MAP_ROUTE18", + "offset": 10, + "direction": "left" + }, + { + "map": "MAP_ROUTE15", + "offset": 10, + "direction": "right" + } + ], + "object_events": [ + { + "graphics_id": "27", + "x": 37, + "y": 17, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FuchsiaCity_EventScript_166DAF", + "flag": "0" + }, + { + "graphics_id": "128", + "x": 36, + "y": 15, + "elevation": 3, + "movement_type": "80", + "movement_range_x": 4, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "127", + "x": 33, + "y": 8, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "18", + "x": 33, + "y": 11, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FuchsiaCity_EventScript_166DB8", + "flag": "0" + }, + { + "graphics_id": "117", + "x": 39, + "y": 8, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 3, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "16", + "x": 14, + "y": 15, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 3, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FuchsiaCity_EventScript_166D9D", + "flag": "0" + }, + { + "graphics_id": "135", + "x": 12, + "y": 20, + "elevation": 1, + "movement_type": "2", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "32", + "x": 36, + "y": 20, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 4, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FuchsiaCity_EventScript_166DA6", + "flag": "0" + }, + { + "graphics_id": "240", + "x": 8, + "y": 8, + "elevation": 1, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "119", + "x": 16, + "y": 9, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 4, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "95", + "x": 30, + "y": 10, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FuchsiaCity_EventScript_1BDF13", + "flag": "18" + }, + { + "graphics_id": "95", + "x": 21, + "y": 13, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FuchsiaCity_EventScript_1BDF13", + "flag": "19" + }, + { + "graphics_id": "95", + "x": 32, + "y": 16, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FuchsiaCity_EventScript_1BDF13", + "flag": "20" + }, + { + "graphics_id": "95", + "x": 24, + "y": 22, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FuchsiaCity_EventScript_1BDF13", + "flag": "21" + }, + { + "graphics_id": "20", + "x": 15, + "y": 11, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FuchsiaCity_EventScript_1C4AEE", + "flag": "0" + }, + { + "graphics_id": "22", + "x": 40, + "y": 6, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FuchsiaCity_EventScript_166DC1", + "flag": "157" + } + ], + "warp_events": [ + { + "x": 24, + "y": 5, + "elevation": 0, + "dest_map": "MAP_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE", + "dest_warp_id": 2 + }, + { + "x": 33, + "y": 31, + "elevation": 0, + "dest_map": "MAP_FUCHSIA_CITY_BUILDING1", + "dest_warp_id": 1 + }, + { + "x": 11, + "y": 15, + "elevation": 0, + "dest_map": "MAP_FUCHSIA_CITY_MART", + "dest_warp_id": 1 + }, + { + "x": 28, + "y": 16, + "elevation": 0, + "dest_map": "MAP_FUCHSIA_CITY_ZOO_BUILDING", + "dest_warp_id": 1 + }, + { + "x": 9, + "y": 32, + "elevation": 0, + "dest_map": "MAP_FUCHSIA_CITY_GYM", + "dest_warp_id": 1 + }, + { + "x": 14, + "y": 31, + "elevation": 0, + "dest_map": "MAP_FUCHSIA_CITY_HOUSE1", + "dest_warp_id": 1 + }, + { + "x": 25, + "y": 31, + "elevation": 3, + "dest_map": "MAP_FUCHSIA_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 1 + }, + { + "x": 38, + "y": 31, + "elevation": 0, + "dest_map": "MAP_FUCHSIA_CITY_HOUSE2", + "dest_warp_id": 1 + }, + { + "x": 39, + "y": 28, + "elevation": 3, + "dest_map": "MAP_FUCHSIA_CITY_HOUSE2", + "dest_warp_id": 3 + }, + { + "x": 39, + "y": 29, + "elevation": 3, + "dest_map": "MAP_FUCHSIA_CITY_HOUSE2", + "dest_warp_id": 3 + }, + { + "x": 19, + "y": 31, + "elevation": 0, + "dest_map": "MAP_FUCHSIA_CITY_HOUSE3", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 31, + "y": 18, + "elevation": 3, + "script": "FuchsiaCity_EventScript_166DDA" + }, + { + "type": "bg_event_type_0", + "x": 26, + "y": 18, + "elevation": 0, + "script": "FuchsiaCity_EventScript_166DE3" + }, + { + "type": "bg_event_type_0", + "x": 5, + "y": 32, + "elevation": 0, + "script": "FuchsiaCity_EventScript_166E07" + }, + { + "type": "bg_event_type_0", + "x": 31, + "y": 31, + "elevation": 0, + "script": "FuchsiaCity_EventScript_166DF5" + }, + { + "type": "bg_event_type_0", + "x": 35, + "y": 10, + "elevation": 0, + "script": "FuchsiaCity_EventScript_166E38" + }, + { + "type": "bg_event_type_0", + "x": 38, + "y": 16, + "elevation": 3, + "script": "FuchsiaCity_EventScript_166E6A" + }, + { + "type": "bg_event_type_0", + "x": 41, + "y": 10, + "elevation": 0, + "script": "FuchsiaCity_EventScript_166E1F" + }, + { + "type": "bg_event_type_0", + "x": 17, + "y": 10, + "elevation": 0, + "script": "FuchsiaCity_EventScript_166E51" + }, + { + "type": "bg_event_type_0", + "x": 11, + "y": 10, + "elevation": 0, + "script": "FuchsiaCity_EventScript_166E9C" + }, + { + "type": "bg_event_type_0", + "x": 17, + "y": 18, + "elevation": 3, + "script": "FuchsiaCity_EventScript_166E83" + }, + { + "type": "bg_event_type_0", + "x": 22, + "y": 7, + "elevation": 0, + "script": "FuchsiaCity_EventScript_166DEC" + }, + { + "type": "hidden_item", + "x": 33, + "y": 26, + "elevation": 3, + "item": "ITEM_MAX_REVIVE", + "flag": "133", + "unknown": 1 + } + ] +} \ No newline at end of file diff --git a/data/maps/FuchsiaCity_Building1/events.inc b/data/maps/FuchsiaCity_Building1/events.inc deleted file mode 100644 index bf912ccb4..000000000 --- a/data/maps/FuchsiaCity_Building1/events.inc +++ /dev/null @@ -1,19 +0,0 @@ -FuchsiaCity_Building1_EventObjects: - object_event 1, 33, 0, 3, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, FuchsiaCity_Building1_EventScript_16D74C, 0, 0, 0 - object_event 2, 97, 0, 11, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, FuchsiaCity_Building1_EventScript_1BE11D, 0, 0, 0 - object_event 3, 92, 0, 11, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, FuchsiaCity_Building1_EventScript_1BEAA2, 441, 0, 0 - object_event 4, 0, 0, 4, 0, 1, 0, 0, 76, 17, 0, 0, 0, 0, 0, FuchsiaCity_Building1_EventScript_1ACEB8, 159, 0, 0 - -FuchsiaCity_Building1_MapWarps: - warp_def 5, 10, 0, 1, 775 - warp_def 6, 9, 3, 1, 775 - warp_def 7, 10, 0, 1, 775 - -FuchsiaCity_Building1_MapBGEvents: - bg_event 7, 4, 0, 0, 0, FuchsiaCity_Building1_EventScript_16D80D - bg_event 4, 4, 0, 0, 0, FuchsiaCity_Building1_EventScript_16D804 - bg_event 5, 4, 0, 0, 0, FuchsiaCity_Building1_EventScript_16D804 - bg_event 6, 4, 0, 0, 0, FuchsiaCity_Building1_EventScript_16D80D - -FuchsiaCity_Building1_MapEvents:: - map_events FuchsiaCity_Building1_EventObjects, FuchsiaCity_Building1_MapWarps, 0x0, FuchsiaCity_Building1_MapBGEvents diff --git a/data/maps/FuchsiaCity_Building1/header.inc b/data/maps/FuchsiaCity_Building1/header.inc deleted file mode 100644 index f598da548..000000000 --- a/data/maps/FuchsiaCity_Building1/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FuchsiaCity_Building1:: @ 83514DC - .4byte FuchsiaCity_Building1_Layout @ 0x831C48C - .4byte FuchsiaCity_Building1_MapEvents @ 0x83BC3F4 - .4byte FuchsiaCity_Building1_MapScripts @ 0x816D74B - .4byte NULL - .2byte BGM_FRLG_CERULEAN_CITY - .2byte 201 - .byte 0x5f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/FuchsiaCity_Building1/map.json b/data/maps/FuchsiaCity_Building1/map.json new file mode 100644 index 000000000..694e7bc51 --- /dev/null +++ b/data/maps/FuchsiaCity_Building1/map.json @@ -0,0 +1,123 @@ +{ + "id": "MAP_FUCHSIA_CITY_BUILDING1", + "name": "FuchsiaCity_Building1", + "layout": "LAYOUT_FUCHSIA_CITY_BUILDING1", + "music": "BGM_FRLG_CERULEAN_CITY", + "region_map_section": "MAPSEC_FUCHSIA_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "33", + "x": 3, + "y": 5, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FuchsiaCity_Building1_EventScript_16D74C", + "flag": "0" + }, + { + "graphics_id": "97", + "x": 11, + "y": 6, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FuchsiaCity_Building1_EventScript_1BE11D", + "flag": "0" + }, + { + "graphics_id": "92", + "x": 11, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FuchsiaCity_Building1_EventScript_1BEAA2", + "flag": "441" + }, + { + "graphics_id": "0", + "x": 4, + "y": 1, + "elevation": 0, + "movement_type": "76", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FuchsiaCity_Building1_EventScript_1ACEB8", + "flag": "159" + } + ], + "warp_events": [ + { + "x": 5, + "y": 10, + "elevation": 0, + "dest_map": "MAP_FUCHSIA_CITY", + "dest_warp_id": 1 + }, + { + "x": 6, + "y": 9, + "elevation": 3, + "dest_map": "MAP_FUCHSIA_CITY", + "dest_warp_id": 1 + }, + { + "x": 7, + "y": 10, + "elevation": 0, + "dest_map": "MAP_FUCHSIA_CITY", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 7, + "y": 4, + "elevation": 0, + "script": "FuchsiaCity_Building1_EventScript_16D80D" + }, + { + "type": "bg_event_type_0", + "x": 4, + "y": 4, + "elevation": 0, + "script": "FuchsiaCity_Building1_EventScript_16D804" + }, + { + "type": "bg_event_type_0", + "x": 5, + "y": 4, + "elevation": 0, + "script": "FuchsiaCity_Building1_EventScript_16D804" + }, + { + "type": "bg_event_type_0", + "x": 6, + "y": 4, + "elevation": 0, + "script": "FuchsiaCity_Building1_EventScript_16D80D" + } + ] +} \ No newline at end of file diff --git a/data/maps/FuchsiaCity_Gym/events.inc b/data/maps/FuchsiaCity_Gym/events.inc deleted file mode 100644 index 96ffb0d3e..000000000 --- a/data/maps/FuchsiaCity_Gym/events.inc +++ /dev/null @@ -1,21 +0,0 @@ -FuchsiaCity_Gym_EventObjects: - object_event 1, 26, 0, 12, 0, 16, 0, 3, 18, 17, 0, 1, 0, 4, 0, FuchsiaCity_Gym_EventScript_16D65A, 0, 0, 0 - object_event 2, 26, 0, 2, 0, 9, 0, 3, 9, 17, 0, 1, 0, 1, 0, FuchsiaCity_Gym_EventScript_16D643, 0, 0, 0 - object_event 3, 26, 0, 11, 0, 11, 0, 3, 10, 17, 0, 1, 0, 3, 0, FuchsiaCity_Gym_EventScript_16D61F, 0, 0, 0 - object_event 4, 25, 0, 13, 0, 4, 0, 3, 1, 17, 0, 1, 0, 2, 0, FuchsiaCity_Gym_EventScript_16D608, 0, 0, 0 - object_event 5, 25, 0, 4, 0, 6, 0, 3, 1, 17, 0, 1, 0, 2, 0, FuchsiaCity_Gym_EventScript_16D5F1, 0, 0, 0 - object_event 6, 26, 0, 2, 0, 16, 0, 3, 8, 17, 0, 1, 0, 4, 0, FuchsiaCity_Gym_EventScript_16D671, 0, 0, 0 - object_event 7, 84, 0, 7, 0, 13, 0, 3, 8, 17, 0, 0, 0, 0, 0, FuchsiaCity_Gym_EventScript_16D54E, 0, 0, 0 - object_event 8, 91, 0, 11, 0, 19, 0, 3, 8, 17, 0, 0, 0, 0, 0, FuchsiaCity_Gym_EventScript_16D688, 0, 0, 0 - -FuchsiaCity_Gym_MapWarps: - warp_def 6, 21, 3, 4, 775 - warp_def 7, 21, 3, 4, 775 - warp_def 8, 21, 3, 4, 775 - -FuchsiaCity_Gym_MapBGEvents: - bg_event 4, 19, 0, 0, 0, FuchsiaCity_Gym_EventScript_16D6A7 - bg_event 10, 19, 0, 0, 0, FuchsiaCity_Gym_EventScript_16D6A7 - -FuchsiaCity_Gym_MapEvents:: - map_events FuchsiaCity_Gym_EventObjects, FuchsiaCity_Gym_MapWarps, 0x0, FuchsiaCity_Gym_MapBGEvents diff --git a/data/maps/FuchsiaCity_Gym/header.inc b/data/maps/FuchsiaCity_Gym/header.inc deleted file mode 100644 index 16aeeb007..000000000 --- a/data/maps/FuchsiaCity_Gym/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FuchsiaCity_Gym:: @ 835146C - .4byte FuchsiaCity_Gym_Layout @ 0x82D6A04 - .4byte FuchsiaCity_Gym_MapEvents @ 0x83BC1A4 - .4byte FuchsiaCity_Gym_MapScripts @ 0x816D54D - .4byte NULL - .2byte BGM_FRLG_GYM - .2byte 20 - .byte 0x5f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01 diff --git a/data/maps/FuchsiaCity_Gym/map.json b/data/maps/FuchsiaCity_Gym/map.json new file mode 100644 index 000000000..775797674 --- /dev/null +++ b/data/maps/FuchsiaCity_Gym/map.json @@ -0,0 +1,161 @@ +{ + "id": "MAP_FUCHSIA_CITY_GYM", + "name": "FuchsiaCity_Gym", + "layout": "LAYOUT_FUCHSIA_CITY_GYM", + "music": "BGM_FRLG_GYM", + "region_map_section": "MAPSEC_FUCHSIA_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_1", + "connections": null, + "object_events": [ + { + "graphics_id": "26", + "x": 12, + "y": 16, + "elevation": 3, + "movement_type": "18", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "FuchsiaCity_Gym_EventScript_16D65A", + "flag": "0" + }, + { + "graphics_id": "26", + "x": 2, + "y": 9, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "FuchsiaCity_Gym_EventScript_16D643", + "flag": "0" + }, + { + "graphics_id": "26", + "x": 11, + "y": 11, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "FuchsiaCity_Gym_EventScript_16D61F", + "flag": "0" + }, + { + "graphics_id": "25", + "x": 13, + "y": 4, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "FuchsiaCity_Gym_EventScript_16D608", + "flag": "0" + }, + { + "graphics_id": "25", + "x": 4, + "y": 6, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "FuchsiaCity_Gym_EventScript_16D5F1", + "flag": "0" + }, + { + "graphics_id": "26", + "x": 2, + "y": 16, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "FuchsiaCity_Gym_EventScript_16D671", + "flag": "0" + }, + { + "graphics_id": "84", + "x": 7, + "y": 13, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FuchsiaCity_Gym_EventScript_16D54E", + "flag": "0" + }, + { + "graphics_id": "91", + "x": 11, + "y": 19, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FuchsiaCity_Gym_EventScript_16D688", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 21, + "elevation": 3, + "dest_map": "MAP_FUCHSIA_CITY", + "dest_warp_id": 4 + }, + { + "x": 7, + "y": 21, + "elevation": 3, + "dest_map": "MAP_FUCHSIA_CITY", + "dest_warp_id": 4 + }, + { + "x": 8, + "y": 21, + "elevation": 3, + "dest_map": "MAP_FUCHSIA_CITY", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 4, + "y": 19, + "elevation": 0, + "script": "FuchsiaCity_Gym_EventScript_16D6A7" + }, + { + "type": "bg_event_type_0", + "x": 10, + "y": 19, + "elevation": 0, + "script": "FuchsiaCity_Gym_EventScript_16D6A7" + } + ] +} \ No newline at end of file diff --git a/data/maps/FuchsiaCity_House1/events.inc b/data/maps/FuchsiaCity_House1/events.inc deleted file mode 100644 index a91390530..000000000 --- a/data/maps/FuchsiaCity_House1/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -FuchsiaCity_House1_EventObjects: - object_event 1, 32, 0, 7, 0, 4, 0, 3, 9, 17, 0, 0, 0, 0, 0, FuchsiaCity_House1_EventScript_16D6CF, 0, 0, 0 - object_event 2, 28, 0, 1, 0, 2, 0, 3, 7, 17, 0, 0, 0, 0, 0, FuchsiaCity_House1_EventScript_16D6C6, 0, 0, 0 - object_event 3, 16, 0, 2, 0, 5, 0, 3, 2, 17, 0, 0, 0, 0, 0, FuchsiaCity_House1_EventScript_16D6E8, 0, 0, 0 - -FuchsiaCity_House1_MapWarps: - warp_def 3, 7, 3, 5, 775 - warp_def 4, 7, 3, 5, 775 - warp_def 5, 7, 3, 5, 775 - -FuchsiaCity_House1_MapEvents:: - map_events FuchsiaCity_House1_EventObjects, FuchsiaCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/FuchsiaCity_House1/header.inc b/data/maps/FuchsiaCity_House1/header.inc deleted file mode 100644 index 018383387..000000000 --- a/data/maps/FuchsiaCity_House1/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FuchsiaCity_House1:: @ 8351488 - .4byte House1_Layout @ 0x82D5754 - .4byte FuchsiaCity_House1_MapEvents @ 0x83BC218 - .4byte FuchsiaCity_House1_MapScripts @ 0x816D6C5 - .4byte NULL - .2byte BGM_FRLG_CERULEAN_CITY - .2byte 6 - .byte 0x5f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/FuchsiaCity_House1/map.json b/data/maps/FuchsiaCity_House1/map.json new file mode 100644 index 000000000..2686c6c25 --- /dev/null +++ b/data/maps/FuchsiaCity_House1/map.json @@ -0,0 +1,81 @@ +{ + "id": "MAP_FUCHSIA_CITY_HOUSE1", + "name": "FuchsiaCity_House1", + "layout": "LAYOUT_HOUSE1", + "music": "BGM_FRLG_CERULEAN_CITY", + "region_map_section": "MAPSEC_FUCHSIA_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "32", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FuchsiaCity_House1_EventScript_16D6CF", + "flag": "0" + }, + { + "graphics_id": "28", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FuchsiaCity_House1_EventScript_16D6C6", + "flag": "0" + }, + { + "graphics_id": "16", + "x": 2, + "y": 5, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FuchsiaCity_House1_EventScript_16D6E8", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 3, + "dest_map": "MAP_FUCHSIA_CITY", + "dest_warp_id": 5 + }, + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_FUCHSIA_CITY", + "dest_warp_id": 5 + }, + { + "x": 5, + "y": 7, + "elevation": 3, + "dest_map": "MAP_FUCHSIA_CITY", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FuchsiaCity_House2/events.inc b/data/maps/FuchsiaCity_House2/events.inc deleted file mode 100644 index 41dfb4f21..000000000 --- a/data/maps/FuchsiaCity_House2/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -FuchsiaCity_House2_EventObjects: - object_event 1, 57, 0, 6, 0, 5, 0, 3, 10, 17, 0, 0, 0, 0, 0, FuchsiaCity_House2_EventScript_16D817, 0, 0, 0 - -FuchsiaCity_House2_MapWarps: - warp_def 2, 9, 0, 7, 775 - warp_def 3, 8, 3, 7, 775 - warp_def 4, 9, 0, 7, 775 - warp_def 3, 1, 3, 8, 775 - -FuchsiaCity_House2_MapEvents:: - map_events FuchsiaCity_House2_EventObjects, FuchsiaCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/FuchsiaCity_House2/header.inc b/data/maps/FuchsiaCity_House2/header.inc deleted file mode 100644 index 6bedf2ac0..000000000 --- a/data/maps/FuchsiaCity_House2/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FuchsiaCity_House2:: @ 83514F8 - .4byte FuchsiaCity_House2_Layout @ 0x831C578 - .4byte FuchsiaCity_House2_MapEvents @ 0x83BC440 - .4byte FuchsiaCity_House2_MapScripts @ 0x816D816 - .4byte NULL - .2byte BGM_FRLG_CERULEAN_CITY - .2byte 202 - .byte 0x5f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/FuchsiaCity_House2/map.json b/data/maps/FuchsiaCity_House2/map.json new file mode 100644 index 000000000..d18088c38 --- /dev/null +++ b/data/maps/FuchsiaCity_House2/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_FUCHSIA_CITY_HOUSE2", + "name": "FuchsiaCity_House2", + "layout": "LAYOUT_FUCHSIA_CITY_HOUSE2", + "music": "BGM_FRLG_CERULEAN_CITY", + "region_map_section": "MAPSEC_FUCHSIA_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "57", + "x": 6, + "y": 5, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FuchsiaCity_House2_EventScript_16D817", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 2, + "y": 9, + "elevation": 0, + "dest_map": "MAP_FUCHSIA_CITY", + "dest_warp_id": 7 + }, + { + "x": 3, + "y": 8, + "elevation": 3, + "dest_map": "MAP_FUCHSIA_CITY", + "dest_warp_id": 7 + }, + { + "x": 4, + "y": 9, + "elevation": 0, + "dest_map": "MAP_FUCHSIA_CITY", + "dest_warp_id": 7 + }, + { + "x": 3, + "y": 1, + "elevation": 3, + "dest_map": "MAP_FUCHSIA_CITY", + "dest_warp_id": 8 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FuchsiaCity_House3/events.inc b/data/maps/FuchsiaCity_House3/events.inc deleted file mode 100644 index e5c0b9550..000000000 --- a/data/maps/FuchsiaCity_House3/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -FuchsiaCity_House3_EventObjects: - object_event 1, 30, 0, 4, 0, 4, 0, 3, 10, 17, 0, 0, 0, 0, 0, FuchsiaCity_House3_EventScript_16D895, 0, 0, 0 - -FuchsiaCity_House3_MapWarps: - warp_def 4, 7, 3, 10, 775 - -FuchsiaCity_House3_MapEvents:: - map_events FuchsiaCity_House3_EventObjects, FuchsiaCity_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/FuchsiaCity_House3/header.inc b/data/maps/FuchsiaCity_House3/header.inc deleted file mode 100644 index 3b4f76d09..000000000 --- a/data/maps/FuchsiaCity_House3/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FuchsiaCity_House3:: @ 8351514 - .4byte House1_Layout @ 0x82D5754 - .4byte FuchsiaCity_House3_MapEvents @ 0x83BC474 - .4byte FuchsiaCity_House3_MapScripts @ 0x816D894 - .4byte NULL - .2byte BGM_FRLG_CERULEAN_CITY - .2byte 6 - .byte 0x5f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/FuchsiaCity_House3/map.json b/data/maps/FuchsiaCity_House3/map.json new file mode 100644 index 000000000..a3445dd83 --- /dev/null +++ b/data/maps/FuchsiaCity_House3/map.json @@ -0,0 +1,41 @@ +{ + "id": "MAP_FUCHSIA_CITY_HOUSE3", + "name": "FuchsiaCity_House3", + "layout": "LAYOUT_HOUSE1", + "music": "BGM_FRLG_CERULEAN_CITY", + "region_map_section": "MAPSEC_FUCHSIA_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "30", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FuchsiaCity_House3_EventScript_16D895", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_FUCHSIA_CITY", + "dest_warp_id": 10 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FuchsiaCity_Mart/events.inc b/data/maps/FuchsiaCity_Mart/events.inc deleted file mode 100644 index d2c3f8a97..000000000 --- a/data/maps/FuchsiaCity_Mart/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -FuchsiaCity_Mart_EventObjects: - object_event 1, 68, 0, 2, 0, 3, 0, 0, 10, 17, 0, 0, 0, 0, 0, FuchsiaCity_Mart_EventScript_16D4F3, 0, 0, 0 - object_event 2, 61, 0, 6, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, FuchsiaCity_Mart_EventScript_16D4EA, 0, 0, 0 - object_event 3, 42, 0, 9, 0, 5, 0, 3, 2, 17, 0, 0, 0, 0, 0, FuchsiaCity_Mart_EventScript_16D4E1, 0, 0, 0 - -FuchsiaCity_Mart_MapWarps: - warp_def 3, 7, 3, 2, 775 - warp_def 4, 7, 3, 2, 775 - warp_def 5, 7, 3, 2, 775 - -FuchsiaCity_Mart_MapEvents:: - map_events FuchsiaCity_Mart_EventObjects, FuchsiaCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/FuchsiaCity_Mart/header.inc b/data/maps/FuchsiaCity_Mart/header.inc deleted file mode 100644 index 705b0f301..000000000 --- a/data/maps/FuchsiaCity_Mart/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FuchsiaCity_Mart:: @ 8351434 - .4byte Mart_Layout @ 0x82D5BCC - .4byte FuchsiaCity_Mart_MapEvents @ 0x83BC014 - .4byte FuchsiaCity_Mart_MapScripts @ 0x816D4E0 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 10 - .byte 0x5f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/FuchsiaCity_Mart/map.json b/data/maps/FuchsiaCity_Mart/map.json new file mode 100644 index 000000000..24dc3ba36 --- /dev/null +++ b/data/maps/FuchsiaCity_Mart/map.json @@ -0,0 +1,81 @@ +{ + "id": "MAP_FUCHSIA_CITY_MART", + "name": "FuchsiaCity_Mart", + "layout": "LAYOUT_MART", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_FUCHSIA_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "68", + "x": 2, + "y": 3, + "elevation": 0, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FuchsiaCity_Mart_EventScript_16D4F3", + "flag": "0" + }, + { + "graphics_id": "61", + "x": 6, + "y": 3, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FuchsiaCity_Mart_EventScript_16D4EA", + "flag": "0" + }, + { + "graphics_id": "42", + "x": 9, + "y": 5, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FuchsiaCity_Mart_EventScript_16D4E1", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 3, + "dest_map": "MAP_FUCHSIA_CITY", + "dest_warp_id": 2 + }, + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_FUCHSIA_CITY", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 7, + "elevation": 3, + "dest_map": "MAP_FUCHSIA_CITY", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FuchsiaCity_PokemonCenter_1F/events.inc b/data/maps/FuchsiaCity_PokemonCenter_1F/events.inc deleted file mode 100644 index 789937055..000000000 --- a/data/maps/FuchsiaCity_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -FuchsiaCity_PokemonCenter_1F_EventObjects: - object_event 1, 64, 0, 7, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, FuchsiaCity_PokemonCenter_1F_EventScript_16D700, 0, 0, 0 - object_event 2, 25, 0, 12, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, FuchsiaCity_PokemonCenter_1F_EventScript_16D709, 0, 0, 0 - object_event 3, 42, 0, 13, 0, 3, 0, 3, 7, 17, 0, 0, 0, 0, 0, FuchsiaCity_PokemonCenter_1F_EventScript_16D712, 0, 0, 0 - object_event 4, 18, 0, 4, 0, 8, 0, 3, 5, 17, 0, 0, 0, 0, 0, FuchsiaCity_PokemonCenter_1F_EventScript_16D71B, 0, 0, 0 - -FuchsiaCity_PokemonCenter_1F_MapWarps: - warp_def 6, 8, 3, 6, 775 - warp_def 7, 8, 3, 6, 775 - warp_def 8, 8, 3, 6, 775 - warp_def 1, 6, 4, 0, 2822 - -FuchsiaCity_PokemonCenter_1F_MapEvents:: - map_events FuchsiaCity_PokemonCenter_1F_EventObjects, FuchsiaCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/FuchsiaCity_PokemonCenter_1F/header.inc b/data/maps/FuchsiaCity_PokemonCenter_1F/header.inc deleted file mode 100644 index 2d88508c4..000000000 --- a/data/maps/FuchsiaCity_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FuchsiaCity_PokemonCenter_1F:: @ 83514A4 - .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte FuchsiaCity_PokemonCenter_1F_MapEvents @ 0x83BC2AC - .4byte FuchsiaCity_PokemonCenter_1F_MapScripts @ 0x816D6F1 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 8 - .byte 0x5f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/FuchsiaCity_PokemonCenter_1F/map.json b/data/maps/FuchsiaCity_PokemonCenter_1F/map.json new file mode 100644 index 000000000..04a1a80b3 --- /dev/null +++ b/data/maps/FuchsiaCity_PokemonCenter_1F/map.json @@ -0,0 +1,101 @@ +{ + "id": "MAP_FUCHSIA_CITY_POKEMON_CENTER_1F", + "name": "FuchsiaCity_PokemonCenter_1F", + "layout": "LAYOUT_POKEMON_CENTER_1F", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_FUCHSIA_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "64", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FuchsiaCity_PokemonCenter_1F_EventScript_16D700", + "flag": "0" + }, + { + "graphics_id": "25", + "x": 12, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FuchsiaCity_PokemonCenter_1F_EventScript_16D709", + "flag": "0" + }, + { + "graphics_id": "42", + "x": 13, + "y": 3, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FuchsiaCity_PokemonCenter_1F_EventScript_16D712", + "flag": "0" + }, + { + "graphics_id": "18", + "x": 4, + "y": 8, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FuchsiaCity_PokemonCenter_1F_EventScript_16D71B", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_FUCHSIA_CITY", + "dest_warp_id": 6 + }, + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_FUCHSIA_CITY", + "dest_warp_id": 6 + }, + { + "x": 8, + "y": 8, + "elevation": 3, + "dest_map": "MAP_FUCHSIA_CITY", + "dest_warp_id": 6 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_FUCHSIA_CITY_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FuchsiaCity_PokemonCenter_2F/events.inc b/data/maps/FuchsiaCity_PokemonCenter_2F/events.inc deleted file mode 100644 index 2baf36957..000000000 --- a/data/maps/FuchsiaCity_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -FuchsiaCity_PokemonCenter_2F_EventObjects: - object_event 1, 65, 0, 6, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FuchsiaCity_PokemonCenter_2F_EventScript_1A8CF6, 0, 0, 0 - object_event 2, 65, 0, 2, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FuchsiaCity_PokemonCenter_2F_EventScript_1A8CFC, 0, 0, 0 - object_event 3, 65, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FuchsiaCity_PokemonCenter_2F_EventScript_1A8D02, 0, 0, 0 - object_event 4, 69, 0, 1, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, FuchsiaCity_PokemonCenter_2F_EventScript_1BB1D2, 112, 0, 0 - -FuchsiaCity_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 3, 2821 - warp_def 5, 1, 0, 0, 4 - warp_def 9, 1, 0, 0, 1 - -FuchsiaCity_PokemonCenter_2F_MapEvents:: - map_events FuchsiaCity_PokemonCenter_2F_EventObjects, FuchsiaCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/FuchsiaCity_PokemonCenter_2F/header.inc b/data/maps/FuchsiaCity_PokemonCenter_2F/header.inc deleted file mode 100644 index 6beffe603..000000000 --- a/data/maps/FuchsiaCity_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FuchsiaCity_PokemonCenter_2F:: @ 83514C0 - .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte FuchsiaCity_PokemonCenter_2F_MapEvents @ 0x83BC338 - .4byte FuchsiaCity_PokemonCenter_2F_MapScripts @ 0x816D724 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 9 - .byte 0x5f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/FuchsiaCity_PokemonCenter_2F/map.json b/data/maps/FuchsiaCity_PokemonCenter_2F/map.json new file mode 100644 index 000000000..ce72c9b33 --- /dev/null +++ b/data/maps/FuchsiaCity_PokemonCenter_2F/map.json @@ -0,0 +1,94 @@ +{ + "id": "MAP_FUCHSIA_CITY_POKEMON_CENTER_2F", + "name": "FuchsiaCity_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_FUCHSIA_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "65", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FuchsiaCity_PokemonCenter_2F_EventScript_1A8CF6", + "flag": "0" + }, + { + "graphics_id": "65", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FuchsiaCity_PokemonCenter_2F_EventScript_1A8CFC", + "flag": "0" + }, + { + "graphics_id": "65", + "x": 10, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FuchsiaCity_PokemonCenter_2F_EventScript_1A8D02", + "flag": "0" + }, + { + "graphics_id": "69", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FuchsiaCity_PokemonCenter_2F_EventScript_1BB1D2", + "flag": "112" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_FUCHSIA_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 3 + }, + { + "x": 5, + "y": 1, + "elevation": 0, + "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 0, + "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/events.inc b/data/maps/FuchsiaCity_SafariZone_Entrance/events.inc deleted file mode 100644 index ab9d88a00..000000000 --- a/data/maps/FuchsiaCity_SafariZone_Entrance/events.inc +++ /dev/null @@ -1,17 +0,0 @@ -FuchsiaCity_SafariZone_Entrance_EventObjects: - object_event 1, 47, 0, 7, 0, 3, 0, 3, 9, 17, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 2, 47, 0, 1, 0, 6, 0, 3, 10, 17, 0, 0, 0, 0, 0, FuchsiaCity_SafariZone_Entrance_EventScript_16D4B7, 0, 0, 0 - -FuchsiaCity_SafariZone_Entrance_MapWarps: - warp_def 4, 1, 3, 1, 319 - warp_def 5, 7, 3, 0, 775 - warp_def 4, 7, 3, 0, 775 - warp_def 3, 7, 3, 0, 775 - -FuchsiaCity_SafariZone_Entrance_MapCoordEvents: - coord_event 4, 3, 3, 0, 16385, 0, 0, FuchsiaCity_SafariZone_Entrance_EventScript_16D36D - coord_event 5, 3, 3, 0, 16385, 0, 0, FuchsiaCity_SafariZone_Entrance_EventScript_16D379 - coord_event 3, 3, 3, 0, 16385, 0, 0, FuchsiaCity_SafariZone_Entrance_EventScript_16D385 - -FuchsiaCity_SafariZone_Entrance_MapEvents:: - map_events FuchsiaCity_SafariZone_Entrance_EventObjects, FuchsiaCity_SafariZone_Entrance_MapWarps, FuchsiaCity_SafariZone_Entrance_MapCoordEvents, 0x0 diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/header.inc b/data/maps/FuchsiaCity_SafariZone_Entrance/header.inc deleted file mode 100644 index 7bfaeb1ec..000000000 --- a/data/maps/FuchsiaCity_SafariZone_Entrance/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FuchsiaCity_SafariZone_Entrance:: @ 8351418 - .4byte FuchsiaCity_SafariZone_Entrance_Layout @ 0x82D8E80 - .4byte FuchsiaCity_SafariZone_Entrance_MapEvents @ 0x83BBFA0 - .4byte FuchsiaCity_SafariZone_Entrance_MapScripts @ 0x816D2A8 - .4byte NULL - .2byte BGM_FRLG_CERULEAN_CITY - .2byte 51 - .byte 0x5f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/map.json b/data/maps/FuchsiaCity_SafariZone_Entrance/map.json new file mode 100644 index 000000000..b6fbd9ec6 --- /dev/null +++ b/data/maps/FuchsiaCity_SafariZone_Entrance/map.json @@ -0,0 +1,103 @@ +{ + "id": "MAP_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE", + "name": "FuchsiaCity_SafariZone_Entrance", + "layout": "LAYOUT_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE", + "music": "BGM_FRLG_CERULEAN_CITY", + "region_map_section": "MAPSEC_FUCHSIA_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "47", + "x": 7, + "y": 3, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "47", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FuchsiaCity_SafariZone_Entrance_EventScript_16D4B7", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 1, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_CENTER", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 7, + "elevation": 3, + "dest_map": "MAP_FUCHSIA_CITY", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_FUCHSIA_CITY", + "dest_warp_id": 0 + }, + { + "x": 3, + "y": 7, + "elevation": 3, + "dest_map": "MAP_FUCHSIA_CITY", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 4, + "y": 3, + "elevation": 3, + "var": "VAR_0x4001", + "var_value": 0, + "script": "FuchsiaCity_SafariZone_Entrance_EventScript_16D36D" + }, + { + "type": "trigger", + "x": 5, + "y": 3, + "elevation": 3, + "var": "VAR_0x4001", + "var_value": 0, + "script": "FuchsiaCity_SafariZone_Entrance_EventScript_16D379" + }, + { + "type": "trigger", + "x": 3, + "y": 3, + "elevation": 3, + "var": "VAR_0x4001", + "var_value": 0, + "script": "FuchsiaCity_SafariZone_Entrance_EventScript_16D385" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FuchsiaCity_ZooBuilding/events.inc b/data/maps/FuchsiaCity_ZooBuilding/events.inc deleted file mode 100644 index 344b95e6f..000000000 --- a/data/maps/FuchsiaCity_ZooBuilding/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -FuchsiaCity_ZooBuilding_EventObjects: - object_event 1, 47, 0, 2, 0, 2, 0, 3, 7, 17, 0, 0, 0, 0, 0, FuchsiaCity_ZooBuilding_EventScript_16D532, 0, 0, 0 - object_event 2, 47, 0, 12, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, FuchsiaCity_ZooBuilding_EventScript_16D53B, 0, 0, 0 - object_event 3, 47, 0, 6, 0, 4, 0, 3, 10, 17, 0, 0, 0, 0, 0, FuchsiaCity_ZooBuilding_EventScript_16D529, 0, 0, 0 - object_event 4, 47, 0, 10, 0, 8, 0, 3, 9, 18, 0, 0, 0, 0, 0, FuchsiaCity_ZooBuilding_EventScript_16D544, 0, 0, 0 - -FuchsiaCity_ZooBuilding_MapWarps: - warp_def 5, 9, 0, 3, 775 - warp_def 6, 9, 0, 3, 775 - warp_def 7, 9, 3, 3, 775 - -FuchsiaCity_ZooBuilding_MapEvents:: - map_events FuchsiaCity_ZooBuilding_EventObjects, FuchsiaCity_ZooBuilding_MapWarps, 0x0, 0x0 diff --git a/data/maps/FuchsiaCity_ZooBuilding/header.inc b/data/maps/FuchsiaCity_ZooBuilding/header.inc deleted file mode 100644 index e5ad3ae0c..000000000 --- a/data/maps/FuchsiaCity_ZooBuilding/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -FuchsiaCity_ZooBuilding:: @ 8351450 - .4byte FuchsiaCity_ZooBuilding_Layout @ 0x831C348 - .4byte FuchsiaCity_ZooBuilding_MapEvents @ 0x83BC0A0 - .4byte FuchsiaCity_ZooBuilding_MapScripts @ 0x816D528 - .4byte NULL - .2byte BGM_FRLG_CERULEAN_CITY - .2byte 200 - .byte 0x5f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/FuchsiaCity_ZooBuilding/map.json b/data/maps/FuchsiaCity_ZooBuilding/map.json new file mode 100644 index 000000000..0448b9984 --- /dev/null +++ b/data/maps/FuchsiaCity_ZooBuilding/map.json @@ -0,0 +1,94 @@ +{ + "id": "MAP_FUCHSIA_CITY_ZOO_BUILDING", + "name": "FuchsiaCity_ZooBuilding", + "layout": "LAYOUT_FUCHSIA_CITY_ZOO_BUILDING", + "music": "BGM_FRLG_CERULEAN_CITY", + "region_map_section": "MAPSEC_FUCHSIA_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "47", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FuchsiaCity_ZooBuilding_EventScript_16D532", + "flag": "0" + }, + { + "graphics_id": "47", + "x": 12, + "y": 3, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FuchsiaCity_ZooBuilding_EventScript_16D53B", + "flag": "0" + }, + { + "graphics_id": "47", + "x": 6, + "y": 4, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FuchsiaCity_ZooBuilding_EventScript_16D529", + "flag": "0" + }, + { + "graphics_id": "47", + "x": 10, + "y": 8, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FuchsiaCity_ZooBuilding_EventScript_16D544", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 5, + "y": 9, + "elevation": 0, + "dest_map": "MAP_FUCHSIA_CITY", + "dest_warp_id": 3 + }, + { + "x": 6, + "y": 9, + "elevation": 0, + "dest_map": "MAP_FUCHSIA_CITY", + "dest_warp_id": 3 + }, + { + "x": 7, + "y": 9, + "elevation": 3, + "dest_map": "MAP_FUCHSIA_CITY", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/IndigoPlateau_Exterior/connections.inc b/data/maps/IndigoPlateau_Exterior/connections.inc deleted file mode 100644 index e218b5480..000000000 --- a/data/maps/IndigoPlateau_Exterior/connections.inc +++ /dev/null @@ -1,6 +0,0 @@ -IndigoPlateau_Exterior_MapConnectionsList: @ 83528B0 - connection down, 0, MAP_ROUTE23 - -IndigoPlateau_Exterior_MapConnections:: @ 83528BC - .4byte 1 - .4byte IndigoPlateau_Exterior_MapConnectionsList diff --git a/data/maps/IndigoPlateau_Exterior/events.inc b/data/maps/IndigoPlateau_Exterior/events.inc deleted file mode 100644 index 1a29fa392..000000000 --- a/data/maps/IndigoPlateau_Exterior/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -IndigoPlateau_Exterior_EventObjects: - object_event 1, 72, 0, 11, 0, 6, 0, 0, 8, 17, 0, 0, 0, 0, 0, 0x0, 163, 0, 0 - object_event 2, 71, 0, 11, 0, 6, 0, 0, 8, 17, 0, 0, 0, 0, 0, 0x0, 164, 0, 0 - -IndigoPlateau_Exterior_MapWarps: - warp_def 11, 6, 0, 0, 3328 - -IndigoPlateau_Exterior_MapEvents:: - map_events IndigoPlateau_Exterior_EventObjects, IndigoPlateau_Exterior_MapWarps, 0x0, 0x0 diff --git a/data/maps/IndigoPlateau_Exterior/header.inc b/data/maps/IndigoPlateau_Exterior/header.inc deleted file mode 100644 index c40993e89..000000000 --- a/data/maps/IndigoPlateau_Exterior/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -IndigoPlateau_Exterior:: @ 8350714 - .4byte IndigoPlateau_Exterior_Layout @ 0x82E3F04 - .4byte IndigoPlateau_Exterior_MapEvents @ 0x83B5C3C - .4byte IndigoPlateau_Exterior_MapScripts @ 0x816723B - .4byte IndigoPlateau_Exterior_MapConnections @ 0x83528BC - .2byte BGM_FRLG_INDIGO_PLATEAU - .2byte 87 - .byte 0x61, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/IndigoPlateau_Exterior/map.json b/data/maps/IndigoPlateau_Exterior/map.json new file mode 100644 index 000000000..29c62a76c --- /dev/null +++ b/data/maps/IndigoPlateau_Exterior/map.json @@ -0,0 +1,60 @@ +{ + "id": "MAP_INDIGO_PLATEAU_EXTERIOR", + "name": "IndigoPlateau_Exterior", + "layout": "LAYOUT_INDIGO_PLATEAU_EXTERIOR", + "music": "BGM_FRLG_INDIGO_PLATEAU", + "region_map_section": "MAPSEC_INDIGO_PLATEAU", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_1", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_ROUTE23", + "offset": 0, + "direction": "down" + } + ], + "object_events": [ + { + "graphics_id": "72", + "x": 11, + "y": 6, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "163" + }, + { + "graphics_id": "71", + "x": 11, + "y": 6, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "164" + } + ], + "warp_events": [ + { + "x": 11, + "y": 6, + "elevation": 0, + "dest_map": "MAP_INDIGO_PLATEAU_POKEMON_CENTER_1F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/events.inc b/data/maps/IndigoPlateau_PokemonCenter_1F/events.inc deleted file mode 100644 index 0f6cfcfb5..000000000 --- a/data/maps/IndigoPlateau_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,17 +0,0 @@ -IndigoPlateau_PokemonCenter_1F_EventObjects: - object_event 1, 68, 0, 0, 0, 7, 0, 3, 10, 17, 0, 0, 0, 0, 0, IndigoPlateau_PokemonCenter_1F_EventScript_16EACC, 0, 0, 0 - object_event 2, 64, 0, 13, 0, 10, 0, 3, 8, 17, 0, 0, 0, 0, 0, IndigoPlateau_PokemonCenter_1F_EventScript_16EB06, 0, 0, 0 - object_event 3, 91, 0, 7, 0, 14, 0, 3, 10, 17, 0, 0, 0, 0, 0, IndigoPlateau_PokemonCenter_1F_EventScript_16EAC3, 0, 0, 0 - object_event 4, 42, 0, 5, 0, 3, 0, 3, 8, 17, 0, 0, 0, 0, 0, IndigoPlateau_PokemonCenter_1F_EventScript_16EA8A, 0, 0, 0 - object_event 5, 54, 0, 23, 0, 13, 0, 3, 10, 17, 0, 0, 0, 0, 0, IndigoPlateau_PokemonCenter_1F_EventScript_1ACFAE, 157, 0, 0 - object_event 6, 0, 0, 22, 0, 9, 0, 0, 76, 17, 0, 0, 0, 0, 0, IndigoPlateau_PokemonCenter_1F_EventScript_1AD06C, 157, 0, 0 - object_event 7, 41, 0, 16, 0, 15, 0, 3, 2, 17, 0, 0, 0, 0, 0, IndigoPlateau_PokemonCenter_1F_EventScript_1AD087, 157, 0, 0 - object_event 8, 0, 0, 23, 0, 9, 0, 0, 76, 17, 0, 0, 0, 0, 0, IndigoPlateau_PokemonCenter_1F_EventScript_1AD06C, 157, 0, 0 - -IndigoPlateau_PokemonCenter_1F_MapWarps: - warp_def 11, 16, 3, 0, 777 - warp_def 4, 1, 3, 0, 331 - warp_def 1, 14, 4, 0, 3329 - -IndigoPlateau_PokemonCenter_1F_MapEvents:: - map_events IndigoPlateau_PokemonCenter_1F_EventObjects, IndigoPlateau_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/header.inc b/data/maps/IndigoPlateau_PokemonCenter_1F/header.inc deleted file mode 100644 index bb16f0475..000000000 --- a/data/maps/IndigoPlateau_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -IndigoPlateau_PokemonCenter_1F:: @ 8351610 - .4byte IndigoPlateau_PokemonCenter_1F_Layout @ 0x831F000 - .4byte IndigoPlateau_PokemonCenter_1F_MapEvents @ 0x83BCA94 - .4byte IndigoPlateau_PokemonCenter_1F_MapScripts @ 0x816EA5A - .4byte NULL - .2byte BGM_FRLG_GYM - .2byte 212 - .byte 0x61, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01 diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/map.json b/data/maps/IndigoPlateau_PokemonCenter_1F/map.json new file mode 100644 index 000000000..89ba4f048 --- /dev/null +++ b/data/maps/IndigoPlateau_PokemonCenter_1F/map.json @@ -0,0 +1,146 @@ +{ + "id": "MAP_INDIGO_PLATEAU_POKEMON_CENTER_1F", + "name": "IndigoPlateau_PokemonCenter_1F", + "layout": "LAYOUT_INDIGO_PLATEAU_POKEMON_CENTER_1F", + "music": "BGM_FRLG_GYM", + "region_map_section": "MAPSEC_INDIGO_PLATEAU", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_1", + "connections": null, + "object_events": [ + { + "graphics_id": "68", + "x": 0, + "y": 7, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "IndigoPlateau_PokemonCenter_1F_EventScript_16EACC", + "flag": "0" + }, + { + "graphics_id": "64", + "x": 13, + "y": 10, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "IndigoPlateau_PokemonCenter_1F_EventScript_16EB06", + "flag": "0" + }, + { + "graphics_id": "91", + "x": 7, + "y": 14, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "IndigoPlateau_PokemonCenter_1F_EventScript_16EAC3", + "flag": "0" + }, + { + "graphics_id": "42", + "x": 5, + "y": 3, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "IndigoPlateau_PokemonCenter_1F_EventScript_16EA8A", + "flag": "0" + }, + { + "graphics_id": "54", + "x": 23, + "y": 13, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "IndigoPlateau_PokemonCenter_1F_EventScript_1ACFAE", + "flag": "157" + }, + { + "graphics_id": "0", + "x": 22, + "y": 9, + "elevation": 0, + "movement_type": "76", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "IndigoPlateau_PokemonCenter_1F_EventScript_1AD06C", + "flag": "157" + }, + { + "graphics_id": "41", + "x": 16, + "y": 15, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "IndigoPlateau_PokemonCenter_1F_EventScript_1AD087", + "flag": "157" + }, + { + "graphics_id": "0", + "x": 23, + "y": 9, + "elevation": 0, + "movement_type": "76", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "IndigoPlateau_PokemonCenter_1F_EventScript_1AD06C", + "flag": "157" + } + ], + "warp_events": [ + { + "x": 11, + "y": 16, + "elevation": 3, + "dest_map": "MAP_INDIGO_PLATEAU_EXTERIOR", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 1, + "elevation": 3, + "dest_map": "MAP_POKEMON_LEAGUE_LORELEIS_ROOM", + "dest_warp_id": 0 + }, + { + "x": 1, + "y": 14, + "elevation": 4, + "dest_map": "MAP_INDIGO_PLATEAU_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/IndigoPlateau_PokemonCenter_2F/events.inc b/data/maps/IndigoPlateau_PokemonCenter_2F/events.inc deleted file mode 100644 index f0061ff98..000000000 --- a/data/maps/IndigoPlateau_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -IndigoPlateau_PokemonCenter_2F_EventObjects: - object_event 1, 65, 0, 6, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, IndigoPlateau_PokemonCenter_2F_EventScript_1A8CF6, 0, 0, 0 - object_event 2, 65, 0, 2, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, IndigoPlateau_PokemonCenter_2F_EventScript_1A8CFC, 0, 0, 0 - object_event 3, 65, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, IndigoPlateau_PokemonCenter_2F_EventScript_1A8D02, 0, 0, 0 - object_event 4, 69, 0, 1, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, IndigoPlateau_PokemonCenter_2F_EventScript_1BB1D2, 112, 0, 0 - -IndigoPlateau_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 2, 3328 - warp_def 5, 1, 0, 0, 4 - warp_def 9, 1, 0, 0, 1 - -IndigoPlateau_PokemonCenter_2F_MapEvents:: - map_events IndigoPlateau_PokemonCenter_2F_EventObjects, IndigoPlateau_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/IndigoPlateau_PokemonCenter_2F/header.inc b/data/maps/IndigoPlateau_PokemonCenter_2F/header.inc deleted file mode 100644 index 604c361d8..000000000 --- a/data/maps/IndigoPlateau_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -IndigoPlateau_PokemonCenter_2F:: @ 835162C - .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte IndigoPlateau_PokemonCenter_2F_MapEvents @ 0x83BCB20 - .4byte IndigoPlateau_PokemonCenter_2F_MapScripts @ 0x816EB0F - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 9 - .byte 0x61, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01 diff --git a/data/maps/IndigoPlateau_PokemonCenter_2F/map.json b/data/maps/IndigoPlateau_PokemonCenter_2F/map.json new file mode 100644 index 000000000..3003616f3 --- /dev/null +++ b/data/maps/IndigoPlateau_PokemonCenter_2F/map.json @@ -0,0 +1,94 @@ +{ + "id": "MAP_INDIGO_PLATEAU_POKEMON_CENTER_2F", + "name": "IndigoPlateau_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_INDIGO_PLATEAU", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_1", + "connections": null, + "object_events": [ + { + "graphics_id": "65", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "IndigoPlateau_PokemonCenter_2F_EventScript_1A8CF6", + "flag": "0" + }, + { + "graphics_id": "65", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "IndigoPlateau_PokemonCenter_2F_EventScript_1A8CFC", + "flag": "0" + }, + { + "graphics_id": "65", + "x": 10, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "IndigoPlateau_PokemonCenter_2F_EventScript_1A8D02", + "flag": "0" + }, + { + "graphics_id": "69", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "IndigoPlateau_PokemonCenter_2F_EventScript_1BB1D2", + "flag": "112" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_INDIGO_PLATEAU_POKEMON_CENTER_1F", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 1, + "elevation": 0, + "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 0, + "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LavenderTown/connections.inc b/data/maps/LavenderTown/connections.inc deleted file mode 100644 index 8b1950468..000000000 --- a/data/maps/LavenderTown/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -LavenderTown_MapConnectionsList: @ 83527F8 - connection up, 0, MAP_ROUTE10 - connection down, 0, MAP_ROUTE12 - connection left, 0, MAP_ROUTE8 - -LavenderTown_MapConnections:: @ 835281C - .4byte 3 - .4byte LavenderTown_MapConnectionsList diff --git a/data/maps/LavenderTown/events.inc b/data/maps/LavenderTown/events.inc deleted file mode 100644 index db3a3cc3e..000000000 --- a/data/maps/LavenderTown/events.inc +++ /dev/null @@ -1,21 +0,0 @@ -LavenderTown_EventObjects: - object_event 1, 17, 0, 19, 0, 10, 0, 3, 2, 18, 0, 0, 0, 0, 0, LavenderTown_EventScript_16687D, 0, 0, 0 - object_event 2, 47, 0, 12, 0, 12, 0, 3, 8, 17, 0, 0, 0, 0, 0, LavenderTown_EventScript_1668A6, 0, 0, 0 - object_event 3, 19, 0, 10, 0, 7, 0, 3, 14, 17, 0, 0, 0, 0, 0, LavenderTown_EventScript_1668AF, 0, 0, 0 - -LavenderTown_MapWarps: - warp_def 18, 6, 0, 1, 344 - warp_def 6, 5, 0, 1, 2048 - warp_def 10, 11, 0, 1, 2050 - warp_def 5, 16, 0, 1, 2051 - warp_def 10, 16, 0, 1, 2052 - warp_def 20, 15, 0, 1, 2053 - -LavenderTown_MapBGEvents: - bg_event 12, 4, 0, 0, 0, LavenderTown_EventScript_1668C1 - bg_event 15, 11, 0, 0, 0, LavenderTown_EventScript_1668B8 - bg_event 21, 7, 0, 0, 0, LavenderTown_EventScript_1668D3 - bg_event 7, 11, 0, 0, 0, LavenderTown_EventScript_1668CA - -LavenderTown_MapEvents:: - map_events LavenderTown_EventObjects, LavenderTown_MapWarps, 0x0, LavenderTown_MapBGEvents diff --git a/data/maps/LavenderTown/header.inc b/data/maps/LavenderTown/header.inc deleted file mode 100644 index 24913dc46..000000000 --- a/data/maps/LavenderTown/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -LavenderTown:: @ 8350688 - .4byte LavenderTown_Layout @ 0x82E0610 - .4byte LavenderTown_MapEvents @ 0x83B549C - .4byte LavenderTown_MapScripts @ 0x816686B - .4byte LavenderTown_MapConnections @ 0x835281C - .2byte BGM_FRLG_LAVENDER_TOWN - .2byte 82 - .byte 0x5c, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/LavenderTown/map.json b/data/maps/LavenderTown/map.json new file mode 100644 index 000000000..6231d9469 --- /dev/null +++ b/data/maps/LavenderTown/map.json @@ -0,0 +1,147 @@ +{ + "id": "MAP_LAVENDER_TOWN", + "name": "LavenderTown", + "layout": "LAYOUT_LAVENDER_TOWN", + "music": "BGM_FRLG_LAVENDER_TOWN", + "region_map_section": "MAPSEC_LAVENDER_TOWN", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_1", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_ROUTE10", + "offset": 0, + "direction": "up" + }, + { + "map": "MAP_ROUTE12", + "offset": 0, + "direction": "down" + }, + { + "map": "MAP_ROUTE8", + "offset": 0, + "direction": "left" + } + ], + "object_events": [ + { + "graphics_id": "17", + "x": 19, + "y": 10, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavenderTown_EventScript_16687D", + "flag": "0" + }, + { + "graphics_id": "47", + "x": 12, + "y": 12, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavenderTown_EventScript_1668A6", + "flag": "0" + }, + { + "graphics_id": "19", + "x": 10, + "y": 7, + "elevation": 3, + "movement_type": "14", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavenderTown_EventScript_1668AF", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 18, + "y": 6, + "elevation": 0, + "dest_map": "MAP_POKEMON_TOWER_1F", + "dest_warp_id": 1 + }, + { + "x": 6, + "y": 5, + "elevation": 0, + "dest_map": "MAP_LAVENDER_TOWN_POKEMON_CENTER_1F", + "dest_warp_id": 1 + }, + { + "x": 10, + "y": 11, + "elevation": 0, + "dest_map": "MAP_LAVENDER_TOWN_VOLUNTEER_POKEMON_HOUSE", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 16, + "elevation": 0, + "dest_map": "MAP_LAVENDER_TOWN_HOUSE1", + "dest_warp_id": 1 + }, + { + "x": 10, + "y": 16, + "elevation": 0, + "dest_map": "MAP_LAVENDER_TOWN_HOUSE2", + "dest_warp_id": 1 + }, + { + "x": 20, + "y": 15, + "elevation": 0, + "dest_map": "MAP_LAVENDER_TOWN_MART", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 12, + "y": 4, + "elevation": 0, + "script": "LavenderTown_EventScript_1668C1" + }, + { + "type": "bg_event_type_0", + "x": 15, + "y": 11, + "elevation": 0, + "script": "LavenderTown_EventScript_1668B8" + }, + { + "type": "bg_event_type_0", + "x": 21, + "y": 7, + "elevation": 0, + "script": "LavenderTown_EventScript_1668D3" + }, + { + "type": "bg_event_type_0", + "x": 7, + "y": 11, + "elevation": 0, + "script": "LavenderTown_EventScript_1668CA" + } + ] +} \ No newline at end of file diff --git a/data/maps/LavenderTown_House1/events.inc b/data/maps/LavenderTown_House1/events.inc deleted file mode 100644 index 6cfc603da..000000000 --- a/data/maps/LavenderTown_House1/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -LavenderTown_House1_EventObjects: - object_event 1, 42, 0, 4, 0, 4, 0, 3, 8, 17, 0, 0, 0, 0, 0, LavenderTown_House1_EventScript_16B233, 0, 0, 0 - object_event 2, 111, 0, 8, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, LavenderTown_House1_EventScript_16B252, 0, 0, 0 - -LavenderTown_House1_MapWarps: - warp_def 3, 7, 3, 3, 772 - warp_def 4, 7, 3, 3, 772 - warp_def 5, 7, 3, 3, 772 - -LavenderTown_House1_MapEvents:: - map_events LavenderTown_House1_EventObjects, LavenderTown_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/LavenderTown_House1/header.inc b/data/maps/LavenderTown_House1/header.inc deleted file mode 100644 index 5c11f9ff5..000000000 --- a/data/maps/LavenderTown_House1/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -LavenderTown_House1:: @ 83510B4 - .4byte House5_Layout @ 0x82D6AF0 - .4byte LavenderTown_House1_MapEvents @ 0x83BAA58 - .4byte LavenderTown_House1_MapScripts @ 0x816B232 - .4byte NULL - .2byte BGM_FRLG_LAVENDER_TOWN - .2byte 21 - .byte 0x5c, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/LavenderTown_House1/map.json b/data/maps/LavenderTown_House1/map.json new file mode 100644 index 000000000..5674da210 --- /dev/null +++ b/data/maps/LavenderTown_House1/map.json @@ -0,0 +1,68 @@ +{ + "id": "MAP_LAVENDER_TOWN_HOUSE1", + "name": "LavenderTown_House1", + "layout": "LAYOUT_HOUSE5", + "music": "BGM_FRLG_LAVENDER_TOWN", + "region_map_section": "MAPSEC_LAVENDER_TOWN", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "42", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavenderTown_House1_EventScript_16B233", + "flag": "0" + }, + { + "graphics_id": "111", + "x": 8, + "y": 6, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavenderTown_House1_EventScript_16B252", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 3, + "dest_map": "MAP_LAVENDER_TOWN", + "dest_warp_id": 3 + }, + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_LAVENDER_TOWN", + "dest_warp_id": 3 + }, + { + "x": 5, + "y": 7, + "elevation": 3, + "dest_map": "MAP_LAVENDER_TOWN", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LavenderTown_House2/events.inc b/data/maps/LavenderTown_House2/events.inc deleted file mode 100644 index df507a60f..000000000 --- a/data/maps/LavenderTown_House2/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -LavenderTown_House2_EventObjects: - object_event 1, 61, 0, 4, 0, 4, 0, 3, 8, 17, 0, 0, 0, 0, 0, LavenderTown_House2_EventScript_16B266, 0, 0, 0 - -LavenderTown_House2_MapWarps: - warp_def 3, 7, 3, 4, 772 - warp_def 4, 7, 3, 4, 772 - warp_def 5, 7, 3, 4, 772 - -LavenderTown_House2_MapEvents:: - map_events LavenderTown_House2_EventObjects, LavenderTown_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/LavenderTown_House2/header.inc b/data/maps/LavenderTown_House2/header.inc deleted file mode 100644 index 30f103a05..000000000 --- a/data/maps/LavenderTown_House2/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -LavenderTown_House2:: @ 83510D0 - .4byte House5_Layout @ 0x82D6AF0 - .4byte LavenderTown_House2_MapEvents @ 0x83BAA9C - .4byte LavenderTown_House2_MapScripts @ 0x816B265 - .4byte NULL - .2byte BGM_FRLG_CERULEAN_CITY - .2byte 21 - .byte 0x5c, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/LavenderTown_House2/map.json b/data/maps/LavenderTown_House2/map.json new file mode 100644 index 000000000..8617d5d03 --- /dev/null +++ b/data/maps/LavenderTown_House2/map.json @@ -0,0 +1,55 @@ +{ + "id": "MAP_LAVENDER_TOWN_HOUSE2", + "name": "LavenderTown_House2", + "layout": "LAYOUT_HOUSE5", + "music": "BGM_FRLG_CERULEAN_CITY", + "region_map_section": "MAPSEC_LAVENDER_TOWN", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "61", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavenderTown_House2_EventScript_16B266", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 3, + "dest_map": "MAP_LAVENDER_TOWN", + "dest_warp_id": 4 + }, + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_LAVENDER_TOWN", + "dest_warp_id": 4 + }, + { + "x": 5, + "y": 7, + "elevation": 3, + "dest_map": "MAP_LAVENDER_TOWN", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LavenderTown_Mart/events.inc b/data/maps/LavenderTown_Mart/events.inc deleted file mode 100644 index 8bd84d44a..000000000 --- a/data/maps/LavenderTown_Mart/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -LavenderTown_Mart_EventObjects: - object_event 1, 68, 0, 2, 0, 3, 0, 0, 10, 17, 0, 0, 0, 0, 0, LavenderTown_Mart_EventScript_16B36B, 0, 0, 0 - object_event 2, 30, 0, 6, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0, 0, LavenderTown_Mart_EventScript_16B350, 0, 0, 0 - object_event 3, 26, 0, 9, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0, 0, LavenderTown_Mart_EventScript_16B359, 0, 0, 0 - object_event 4, 18, 0, 9, 0, 5, 0, 3, 14, 17, 0, 0, 0, 0, 0, LavenderTown_Mart_EventScript_16B362, 0, 0, 0 - -LavenderTown_Mart_MapWarps: - warp_def 3, 7, 3, 5, 772 - warp_def 4, 7, 3, 5, 772 - warp_def 5, 7, 3, 5, 772 - -LavenderTown_Mart_MapEvents:: - map_events LavenderTown_Mart_EventObjects, LavenderTown_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/LavenderTown_Mart/header.inc b/data/maps/LavenderTown_Mart/header.inc deleted file mode 100644 index 848c25d72..000000000 --- a/data/maps/LavenderTown_Mart/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -LavenderTown_Mart:: @ 83510EC - .4byte Mart_Layout @ 0x82D5BCC - .4byte LavenderTown_Mart_MapEvents @ 0x83BAB28 - .4byte LavenderTown_Mart_MapScripts @ 0x816B34F - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 10 - .byte 0x5c, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/LavenderTown_Mart/map.json b/data/maps/LavenderTown_Mart/map.json new file mode 100644 index 000000000..017950cb6 --- /dev/null +++ b/data/maps/LavenderTown_Mart/map.json @@ -0,0 +1,94 @@ +{ + "id": "MAP_LAVENDER_TOWN_MART", + "name": "LavenderTown_Mart", + "layout": "LAYOUT_MART", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_LAVENDER_TOWN", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "68", + "x": 2, + "y": 3, + "elevation": 0, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavenderTown_Mart_EventScript_16B36B", + "flag": "0" + }, + { + "graphics_id": "30", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavenderTown_Mart_EventScript_16B350", + "flag": "0" + }, + { + "graphics_id": "26", + "x": 9, + "y": 2, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavenderTown_Mart_EventScript_16B359", + "flag": "0" + }, + { + "graphics_id": "18", + "x": 9, + "y": 5, + "elevation": 3, + "movement_type": "14", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavenderTown_Mart_EventScript_16B362", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 3, + "dest_map": "MAP_LAVENDER_TOWN", + "dest_warp_id": 5 + }, + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_LAVENDER_TOWN", + "dest_warp_id": 5 + }, + { + "x": 5, + "y": 7, + "elevation": 3, + "dest_map": "MAP_LAVENDER_TOWN", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LavenderTown_PokemonCenter_1F/events.inc b/data/maps/LavenderTown_PokemonCenter_1F/events.inc deleted file mode 100644 index aa5197cd3..000000000 --- a/data/maps/LavenderTown_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -LavenderTown_PokemonCenter_1F_EventObjects: - object_event 1, 64, 0, 7, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, LavenderTown_PokemonCenter_1F_EventScript_16B0FE, 0, 0, 0 - object_event 2, 61, 0, 9, 0, 4, 0, 3, 8, 17, 0, 0, 0, 0, 0, LavenderTown_PokemonCenter_1F_EventScript_16B107, 0, 0, 0 - object_event 3, 22, 0, 5, 0, 6, 0, 3, 3, 33, 0, 0, 0, 0, 0, LavenderTown_PokemonCenter_1F_EventScript_16B110, 0, 0, 0 - object_event 4, 18, 0, 2, 0, 2, 0, 3, 2, 17, 0, 0, 0, 0, 0, LavenderTown_PokemonCenter_1F_EventScript_16B119, 0, 0, 0 - object_event 5, 30, 0, 14, 0, 6, 0, 3, 9, 17, 0, 0, 0, 0, 0, LavenderTown_PokemonCenter_1F_EventScript_1AD0A0, 157, 0, 0 - -LavenderTown_PokemonCenter_1F_MapWarps: - warp_def 6, 8, 3, 1, 772 - warp_def 7, 8, 3, 1, 772 - warp_def 8, 8, 3, 1, 772 - warp_def 1, 6, 4, 0, 2049 - -LavenderTown_PokemonCenter_1F_MapEvents:: - map_events LavenderTown_PokemonCenter_1F_EventObjects, LavenderTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/LavenderTown_PokemonCenter_1F/header.inc b/data/maps/LavenderTown_PokemonCenter_1F/header.inc deleted file mode 100644 index ecf848112..000000000 --- a/data/maps/LavenderTown_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -LavenderTown_PokemonCenter_1F:: @ 8351060 - .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte LavenderTown_PokemonCenter_1F_MapEvents @ 0x83BA890 - .4byte LavenderTown_PokemonCenter_1F_MapScripts @ 0x816B0EF - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 8 - .byte 0x5c, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/LavenderTown_PokemonCenter_1F/map.json b/data/maps/LavenderTown_PokemonCenter_1F/map.json new file mode 100644 index 000000000..db62073d3 --- /dev/null +++ b/data/maps/LavenderTown_PokemonCenter_1F/map.json @@ -0,0 +1,114 @@ +{ + "id": "MAP_LAVENDER_TOWN_POKEMON_CENTER_1F", + "name": "LavenderTown_PokemonCenter_1F", + "layout": "LAYOUT_POKEMON_CENTER_1F", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_LAVENDER_TOWN", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "64", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavenderTown_PokemonCenter_1F_EventScript_16B0FE", + "flag": "0" + }, + { + "graphics_id": "61", + "x": 9, + "y": 4, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavenderTown_PokemonCenter_1F_EventScript_16B107", + "flag": "0" + }, + { + "graphics_id": "22", + "x": 5, + "y": 6, + "elevation": 3, + "movement_type": "3", + "movement_range_x": 1, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavenderTown_PokemonCenter_1F_EventScript_16B110", + "flag": "0" + }, + { + "graphics_id": "18", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavenderTown_PokemonCenter_1F_EventScript_16B119", + "flag": "0" + }, + { + "graphics_id": "30", + "x": 14, + "y": 6, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavenderTown_PokemonCenter_1F_EventScript_1AD0A0", + "flag": "157" + } + ], + "warp_events": [ + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_LAVENDER_TOWN", + "dest_warp_id": 1 + }, + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_LAVENDER_TOWN", + "dest_warp_id": 1 + }, + { + "x": 8, + "y": 8, + "elevation": 3, + "dest_map": "MAP_LAVENDER_TOWN", + "dest_warp_id": 1 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_LAVENDER_TOWN_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LavenderTown_PokemonCenter_2F/events.inc b/data/maps/LavenderTown_PokemonCenter_2F/events.inc deleted file mode 100644 index 69295dbe9..000000000 --- a/data/maps/LavenderTown_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -LavenderTown_PokemonCenter_2F_EventObjects: - object_event 1, 65, 0, 6, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LavenderTown_PokemonCenter_2F_EventScript_1A8CF6, 0, 0, 0 - object_event 2, 65, 0, 2, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LavenderTown_PokemonCenter_2F_EventScript_1A8CFC, 0, 0, 0 - object_event 3, 65, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LavenderTown_PokemonCenter_2F_EventScript_1A8D02, 0, 0, 0 - object_event 4, 69, 0, 1, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, LavenderTown_PokemonCenter_2F_EventScript_1BB1D2, 112, 0, 0 - -LavenderTown_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 3, 2048 - warp_def 5, 1, 0, 0, 4 - warp_def 9, 1, 0, 0, 1 - -LavenderTown_PokemonCenter_2F_MapEvents:: - map_events LavenderTown_PokemonCenter_2F_EventObjects, LavenderTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/LavenderTown_PokemonCenter_2F/header.inc b/data/maps/LavenderTown_PokemonCenter_2F/header.inc deleted file mode 100644 index 99713d4c8..000000000 --- a/data/maps/LavenderTown_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -LavenderTown_PokemonCenter_2F:: @ 835107C - .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte LavenderTown_PokemonCenter_2F_MapEvents @ 0x83BA91C - .4byte LavenderTown_PokemonCenter_2F_MapScripts @ 0x816B122 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 9 - .byte 0x5c, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/LavenderTown_PokemonCenter_2F/map.json b/data/maps/LavenderTown_PokemonCenter_2F/map.json new file mode 100644 index 000000000..8b88b91ce --- /dev/null +++ b/data/maps/LavenderTown_PokemonCenter_2F/map.json @@ -0,0 +1,94 @@ +{ + "id": "MAP_LAVENDER_TOWN_POKEMON_CENTER_2F", + "name": "LavenderTown_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_LAVENDER_TOWN", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "65", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavenderTown_PokemonCenter_2F_EventScript_1A8CF6", + "flag": "0" + }, + { + "graphics_id": "65", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavenderTown_PokemonCenter_2F_EventScript_1A8CFC", + "flag": "0" + }, + { + "graphics_id": "65", + "x": 10, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavenderTown_PokemonCenter_2F_EventScript_1A8D02", + "flag": "0" + }, + { + "graphics_id": "69", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavenderTown_PokemonCenter_2F_EventScript_1BB1D2", + "flag": "112" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_LAVENDER_TOWN_POKEMON_CENTER_1F", + "dest_warp_id": 3 + }, + { + "x": 5, + "y": 1, + "elevation": 0, + "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 0, + "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LavenderTown_VolunteerPokemonHouse/events.inc b/data/maps/LavenderTown_VolunteerPokemonHouse/events.inc deleted file mode 100644 index 8d3a472af..000000000 --- a/data/maps/LavenderTown_VolunteerPokemonHouse/events.inc +++ /dev/null @@ -1,20 +0,0 @@ -LavenderTown_VolunteerPokemonHouse_EventObjects: - object_event 1, 78, 0, 3, 0, 3, 0, 3, 8, 17, 0, 0, 0, 0, 0, LavenderTown_VolunteerPokemonHouse_EventScript_16B14A, 53, 0, 0 - object_event 2, 124, 0, 1, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, LavenderTown_VolunteerPokemonHouse_EventScript_16B1EB, 0, 0, 0 - object_event 3, 121, 0, 9, 0, 6, 0, 3, 7, 17, 0, 0, 0, 0, 0, LavenderTown_VolunteerPokemonHouse_EventScript_16B1FE, 0, 0, 0 - object_event 4, 16, 0, 9, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, LavenderTown_VolunteerPokemonHouse_EventScript_16B1C3, 0, 0, 0 - object_event 5, 18, 0, 3, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, LavenderTown_VolunteerPokemonHouse_EventScript_16B1CC, 0, 0, 0 - object_event 6, 17, 0, 7, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0, 0, LavenderTown_VolunteerPokemonHouse_EventScript_16B1AA, 0, 0, 0 - -LavenderTown_VolunteerPokemonHouse_MapWarps: - warp_def 3, 7, 3, 2, 772 - warp_def 4, 7, 3, 2, 772 - warp_def 5, 7, 3, 2, 772 - -LavenderTown_VolunteerPokemonHouse_MapBGEvents: - bg_event 5, 4, 0, 0, 0, LavenderTown_VolunteerPokemonHouse_EventScript_16B211 - bg_event 3, 1, 0, 0, 0, LavenderTown_VolunteerPokemonHouse_EventScript_16B229 - bg_event 4, 1, 0, 0, 0, LavenderTown_VolunteerPokemonHouse_EventScript_16B229 - -LavenderTown_VolunteerPokemonHouse_MapEvents:: - map_events LavenderTown_VolunteerPokemonHouse_EventObjects, LavenderTown_VolunteerPokemonHouse_MapWarps, 0x0, LavenderTown_VolunteerPokemonHouse_MapBGEvents diff --git a/data/maps/LavenderTown_VolunteerPokemonHouse/header.inc b/data/maps/LavenderTown_VolunteerPokemonHouse/header.inc deleted file mode 100644 index b10a4798f..000000000 --- a/data/maps/LavenderTown_VolunteerPokemonHouse/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -LavenderTown_VolunteerPokemonHouse:: @ 8351098 - .4byte LavenderTown_VolunteerPokemonHouse_Layout @ 0x833ACC4 - .4byte LavenderTown_VolunteerPokemonHouse_MapEvents @ 0x83BA9FC - .4byte LavenderTown_VolunteerPokemonHouse_MapScripts @ 0x816B149 - .4byte NULL - .2byte BGM_FRLG_LAVENDER_TOWN - .2byte 274 - .byte 0x5c, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/LavenderTown_VolunteerPokemonHouse/map.json b/data/maps/LavenderTown_VolunteerPokemonHouse/map.json new file mode 100644 index 000000000..a9646e5e6 --- /dev/null +++ b/data/maps/LavenderTown_VolunteerPokemonHouse/map.json @@ -0,0 +1,142 @@ +{ + "id": "MAP_LAVENDER_TOWN_VOLUNTEER_POKEMON_HOUSE", + "name": "LavenderTown_VolunteerPokemonHouse", + "layout": "LAYOUT_LAVENDER_TOWN_VOLUNTEER_POKEMON_HOUSE", + "music": "BGM_FRLG_LAVENDER_TOWN", + "region_map_section": "MAPSEC_LAVENDER_TOWN", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "78", + "x": 3, + "y": 3, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavenderTown_VolunteerPokemonHouse_EventScript_16B14A", + "flag": "53" + }, + { + "graphics_id": "124", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavenderTown_VolunteerPokemonHouse_EventScript_16B1EB", + "flag": "0" + }, + { + "graphics_id": "121", + "x": 9, + "y": 6, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavenderTown_VolunteerPokemonHouse_EventScript_16B1FE", + "flag": "0" + }, + { + "graphics_id": "16", + "x": 9, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavenderTown_VolunteerPokemonHouse_EventScript_16B1C3", + "flag": "0" + }, + { + "graphics_id": "18", + "x": 3, + "y": 5, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavenderTown_VolunteerPokemonHouse_EventScript_16B1CC", + "flag": "0" + }, + { + "graphics_id": "17", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavenderTown_VolunteerPokemonHouse_EventScript_16B1AA", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 3, + "dest_map": "MAP_LAVENDER_TOWN", + "dest_warp_id": 2 + }, + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_LAVENDER_TOWN", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 7, + "elevation": 3, + "dest_map": "MAP_LAVENDER_TOWN", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 5, + "y": 4, + "elevation": 0, + "script": "LavenderTown_VolunteerPokemonHouse_EventScript_16B211" + }, + { + "type": "bg_event_type_0", + "x": 3, + "y": 1, + "elevation": 0, + "script": "LavenderTown_VolunteerPokemonHouse_EventScript_16B229" + }, + { + "type": "bg_event_type_0", + "x": 4, + "y": 1, + "elevation": 0, + "script": "LavenderTown_VolunteerPokemonHouse_EventScript_16B229" + } + ] +} \ No newline at end of file diff --git a/data/maps/MtEmber_Exterior/events.inc b/data/maps/MtEmber_Exterior/events.inc deleted file mode 100644 index 1e821866e..000000000 --- a/data/maps/MtEmber_Exterior/events.inc +++ /dev/null @@ -1,41 +0,0 @@ -MtEmber_Exterior_EventObjects: - object_event 1, 56, 0, 29, 0, 45, 0, 3, 7, 17, 0, 0, 0, 0, 0, MtEmber_Exterior_EventScript_1C48E6, 0, 0, 0 - object_event 2, 49, 0, 41, 0, 40, 0, 3, 10, 17, 0, 0, 0, 0, 0, MtEmber_Exterior_EventScript_16397F, 137, 0, 0 - object_event 3, 49, 0, 42, 0, 40, 0, 3, 9, 17, 0, 0, 0, 0, 0, MtEmber_Exterior_EventScript_1639F0, 137, 0, 0 - object_event 4, 24, 0, 22, 0, 35, 0, 3, 46, 53, 0, 1, 0, 1, 0, MtEmber_Exterior_EventScript_163AE2, 0, 0, 0 - object_event 5, 39, 0, 15, 0, 28, 0, 3, 8, 17, 0, 1, 0, 5, 0, MtEmber_Exterior_EventScript_163AB4, 0, 0, 0 - object_event 6, 40, 0, 14, 0, 42, 0, 3, 17, 17, 0, 1, 0, 3, 0, MtEmber_Exterior_EventScript_163ACB, 0, 0, 0 - object_event 7, 96, 0, 29, 0, 41, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_Exterior_EventScript_1BE00C, 18, 0, 0 - object_event 8, 96, 0, 30, 0, 42, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_Exterior_EventScript_1BE00C, 19, 0, 0 - object_event 9, 97, 0, 22, 0, 45, 0, 3, 1, 0, 0, 0, 0, 0, 0, MtEmber_Exterior_EventScript_1BE11D, 0, 0, 0 - object_event 10, 97, 0, 17, 0, 46, 0, 3, 1, 0, 0, 0, 0, 0, 0, MtEmber_Exterior_EventScript_1BE11D, 0, 0, 0 - object_event 11, 97, 0, 36, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, MtEmber_Exterior_EventScript_1BE11D, 0, 0, 0 - object_event 12, 96, 0, 34, 0, 14, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_Exterior_EventScript_1BE00C, 20, 0, 0 - object_event 13, 96, 0, 36, 0, 15, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_Exterior_EventScript_1BE00C, 21, 0, 0 - object_event 14, 97, 0, 35, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, MtEmber_Exterior_EventScript_1BE11D, 0, 0, 0 - object_event 15, 97, 0, 35, 0, 17, 0, 3, 1, 0, 0, 0, 0, 0, 0, MtEmber_Exterior_EventScript_1BE11D, 0, 0, 0 - object_event 16, 96, 0, 18, 0, 39, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_Exterior_EventScript_1BE00C, 22, 0, 0 - object_event 17, 96, 0, 19, 0, 40, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_Exterior_EventScript_1BE00C, 23, 0, 0 - object_event 18, 92, 0, 13, 0, 6, 0, 3, 8, 17, 0, 0, 0, 0, 0, MtEmber_Exterior_EventScript_1BED2C, 493, 0, 0 - object_event 19, 92, 0, 38, 0, 10, 0, 3, 8, 17, 0, 0, 0, 0, 0, MtEmber_Exterior_EventScript_1BED39, 494, 0, 0 - object_event 20, 92, 0, 48, 0, 20, 0, 3, 8, 17, 0, 0, 0, 0, 0, MtEmber_Exterior_EventScript_1BED46, 495, 0, 0 - -MtEmber_Exterior_MapWarps: - warp_def 28, 48, 3, 0, 813 - warp_def 29, 48, 3, 1, 813 - warp_def 14, 24, 3, 0, 354 - warp_def 39, 19, 3, 1, 356 - warp_def 29, 7, 3, 0, 357 - warp_def 42, 39, 0, 0, 359 - -MtEmber_Exterior_MapCoordEvents: - coord_event 37, 43, 0, 0, 16511, 1, 0, MtEmber_Exterior_EventScript_163A4E - coord_event 38, 43, 0, 0, 16511, 1, 0, MtEmber_Exterior_EventScript_163A4E - coord_event 39, 43, 0, 0, 16511, 1, 0, MtEmber_Exterior_EventScript_163A4E - -MtEmber_Exterior_MapBGEvents: - bg_event 18, 17, 0, 7, 0, 95, 158, 1 - bg_event 8, 30, 3, 7, 0, 2, 162, 1 - -MtEmber_Exterior_MapEvents:: - map_events MtEmber_Exterior_EventObjects, MtEmber_Exterior_MapWarps, MtEmber_Exterior_MapCoordEvents, MtEmber_Exterior_MapBGEvents diff --git a/data/maps/MtEmber_Exterior/header.inc b/data/maps/MtEmber_Exterior/header.inc deleted file mode 100644 index 8d43c8d97..000000000 --- a/data/maps/MtEmber_Exterior/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -MtEmber_Exterior:: @ 834FCB0 - .4byte MtEmber_Exterior_Layout @ 0x833D660 - .4byte MtEmber_Exterior_MapEvents @ 0x83B2C24 - .4byte MtEmber_Exterior_MapScripts @ 0x8163946 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 280 - .byte 0xaf, 0x00, 0x00, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/MtEmber_Exterior/map.json b/data/maps/MtEmber_Exterior/map.json new file mode 100644 index 000000000..bae55d1c3 --- /dev/null +++ b/data/maps/MtEmber_Exterior/map.json @@ -0,0 +1,370 @@ +{ + "id": "MAP_MT_EMBER_EXTERIOR", + "name": "MtEmber_Exterior", + "layout": "LAYOUT_MT_EMBER_EXTERIOR", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_MT_EMBER", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "56", + "x": 29, + "y": 45, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_Exterior_EventScript_1C48E6", + "flag": "0" + }, + { + "graphics_id": "49", + "x": 41, + "y": 40, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_Exterior_EventScript_16397F", + "flag": "137" + }, + { + "graphics_id": "49", + "x": 42, + "y": 40, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_Exterior_EventScript_1639F0", + "flag": "137" + }, + { + "graphics_id": "24", + "x": 22, + "y": 35, + "elevation": 3, + "movement_type": "46", + "movement_range_x": 5, + "movement_range_y": 3, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "MtEmber_Exterior_EventScript_163AE2", + "flag": "0" + }, + { + "graphics_id": "39", + "x": 15, + "y": 28, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "MtEmber_Exterior_EventScript_163AB4", + "flag": "0" + }, + { + "graphics_id": "40", + "x": 14, + "y": 42, + "elevation": 3, + "movement_type": "17", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "MtEmber_Exterior_EventScript_163ACB", + "flag": "0" + }, + { + "graphics_id": "96", + "x": 29, + "y": 41, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_Exterior_EventScript_1BE00C", + "flag": "18" + }, + { + "graphics_id": "96", + "x": 30, + "y": 42, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_Exterior_EventScript_1BE00C", + "flag": "19" + }, + { + "graphics_id": "97", + "x": 22, + "y": 45, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_Exterior_EventScript_1BE11D", + "flag": "0" + }, + { + "graphics_id": "97", + "x": 17, + "y": 46, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_Exterior_EventScript_1BE11D", + "flag": "0" + }, + { + "graphics_id": "97", + "x": 36, + "y": 14, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_Exterior_EventScript_1BE11D", + "flag": "0" + }, + { + "graphics_id": "96", + "x": 34, + "y": 14, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_Exterior_EventScript_1BE00C", + "flag": "20" + }, + { + "graphics_id": "96", + "x": 36, + "y": 15, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_Exterior_EventScript_1BE00C", + "flag": "21" + }, + { + "graphics_id": "97", + "x": 35, + "y": 14, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_Exterior_EventScript_1BE11D", + "flag": "0" + }, + { + "graphics_id": "97", + "x": 35, + "y": 17, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_Exterior_EventScript_1BE11D", + "flag": "0" + }, + { + "graphics_id": "96", + "x": 18, + "y": 39, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_Exterior_EventScript_1BE00C", + "flag": "22" + }, + { + "graphics_id": "96", + "x": 19, + "y": 40, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_Exterior_EventScript_1BE00C", + "flag": "23" + }, + { + "graphics_id": "92", + "x": 13, + "y": 6, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_Exterior_EventScript_1BED2C", + "flag": "493" + }, + { + "graphics_id": "92", + "x": 38, + "y": 10, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_Exterior_EventScript_1BED39", + "flag": "494" + }, + { + "graphics_id": "92", + "x": 48, + "y": 20, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_Exterior_EventScript_1BED46", + "flag": "495" + } + ], + "warp_events": [ + { + "x": 28, + "y": 48, + "elevation": 3, + "dest_map": "MAP_ONE_ISLAND_KINDLE_ROAD", + "dest_warp_id": 0 + }, + { + "x": 29, + "y": 48, + "elevation": 3, + "dest_map": "MAP_ONE_ISLAND_KINDLE_ROAD", + "dest_warp_id": 1 + }, + { + "x": 14, + "y": 24, + "elevation": 3, + "dest_map": "MAP_MT_EMBER_SUMMIT_PATH_1F", + "dest_warp_id": 0 + }, + { + "x": 39, + "y": 19, + "elevation": 3, + "dest_map": "MAP_MT_EMBER_SUMMIT_PATH_3F", + "dest_warp_id": 1 + }, + { + "x": 29, + "y": 7, + "elevation": 3, + "dest_map": "MAP_MT_EMBER_SUMMIT", + "dest_warp_id": 0 + }, + { + "x": 42, + "y": 39, + "elevation": 0, + "dest_map": "MAP_MT_EMBER_RUBY_PATH_1F", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 37, + "y": 43, + "elevation": 0, + "var": "VAR_0x407F", + "var_value": 1, + "script": "MtEmber_Exterior_EventScript_163A4E" + }, + { + "type": "trigger", + "x": 38, + "y": 43, + "elevation": 0, + "var": "VAR_0x407F", + "var_value": 1, + "script": "MtEmber_Exterior_EventScript_163A4E" + }, + { + "type": "trigger", + "x": 39, + "y": 43, + "elevation": 0, + "var": "VAR_0x407F", + "var_value": 1, + "script": "MtEmber_Exterior_EventScript_163A4E" + } + ], + "bg_events": [ + { + "type": "hidden_item", + "x": 18, + "y": 17, + "elevation": 0, + "item": "ITEM_FIRE_STONE", + "flag": "158", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 8, + "y": 30, + "elevation": 3, + "item": "POCKET_KEY_ITEMS", + "flag": "162", + "unknown": 1 + } + ] +} \ No newline at end of file diff --git a/data/maps/MtEmber_RubyPath_1F/map.json b/data/maps/MtEmber_RubyPath_1F/map.json new file mode 100644 index 000000000..37ac0435c --- /dev/null +++ b/data/maps/MtEmber_RubyPath_1F/map.json @@ -0,0 +1,107 @@ +{ + "id": "MAP_MT_EMBER_RUBY_PATH_1F", + "name": "MtEmber_RubyPath_1F", + "layout": "LAYOUT_MT_EMBER_RUBY_PATH_1F", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_MT_EMBER", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "96", + "x": 18, + "y": 11, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_Kitchen3_EventScript_1BE00C", + "flag": "18" + }, + { + "graphics_id": "96", + "x": 23, + "y": 16, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_Kitchen3_EventScript_1BE00C", + "flag": "19" + }, + { + "graphics_id": "96", + "x": 20, + "y": 12, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_Kitchen3_EventScript_1BE00C", + "flag": "20" + }, + { + "graphics_id": "96", + "x": 19, + "y": 7, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_Kitchen3_EventScript_1BE00C", + "flag": "21" + }, + { + "graphics_id": "96", + "x": 21, + "y": 15, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_Kitchen3_EventScript_1BE00C", + "flag": "22" + } + ], + "warp_events": [ + { + "x": 22, + "y": 17, + "elevation": 3, + "dest_map": "MAP_MT_EMBER_EXTERIOR", + "dest_warp_id": 5 + }, + { + "x": 1, + "y": 1, + "elevation": 0, + "dest_map": "MAP_MT_EMBER_RUBY_PATH_B1F", + "dest_warp_id": 0 + }, + { + "x": 24, + "y": 5, + "elevation": 0, + "dest_map": "MAP_MT_EMBER_RUBY_PATH_B2F_STAIRS", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MtEmber_RubyPath_1F/scripts.inc b/data/maps/MtEmber_RubyPath_1F/scripts.inc new file mode 100644 index 000000000..27cd09df7 --- /dev/null +++ b/data/maps/MtEmber_RubyPath_1F/scripts.inc @@ -0,0 +1,2 @@ +MtEmber_RubyPath_1F_MapScripts:: @ 8163C45 + .byte 0 diff --git a/data/maps/MtEmber_RubyPath_B1F/events.inc b/data/maps/MtEmber_RubyPath_B1F/events.inc deleted file mode 100644 index 73d8954bc..000000000 --- a/data/maps/MtEmber_RubyPath_B1F/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -MtEmber_RubyPath_B1F_EventObjects: - object_event 1, 96, 0, 1, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_RubyPath_B1F_EventScript_1BE00C, 18, 0, 0 - object_event 2, 96, 0, 1, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_RubyPath_B1F_EventScript_1BE00C, 19, 0, 0 - object_event 3, 96, 0, 3, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_RubyPath_B1F_EventScript_1BE00C, 20, 0, 0 - object_event 4, 96, 0, 5, 0, 14, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_RubyPath_B1F_EventScript_1BE00C, 21, 0, 0 - -MtEmber_RubyPath_B1F_MapWarps: - warp_def 9, 21, 0, 1, 359 - warp_def 6, 1, 0, 0, 361 - -MtEmber_RubyPath_B1F_MapEvents:: - map_events MtEmber_RubyPath_B1F_EventObjects, MtEmber_RubyPath_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MtEmber_RubyPath_B1F/header.inc b/data/maps/MtEmber_RubyPath_B1F/header.inc deleted file mode 100644 index 659721b8b..000000000 --- a/data/maps/MtEmber_RubyPath_B1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -MtEmber_RubyPath_B1F:: @ 834FD74 - .4byte MtEmber_RubyPath_B1F_Layout @ 0x833F524 - .4byte MtEmber_RubyPath_B1F_MapEvents @ 0x83B2F64 - .4byte MtEmber_RubyPath_B1F_MapScripts @ 0x8163C46 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 286 - .byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/MtEmber_RubyPath_B1F/map.json b/data/maps/MtEmber_RubyPath_B1F/map.json new file mode 100644 index 000000000..df6b4fcb5 --- /dev/null +++ b/data/maps/MtEmber_RubyPath_B1F/map.json @@ -0,0 +1,87 @@ +{ + "id": "MAP_MT_EMBER_RUBY_PATH_B1F", + "name": "MtEmber_RubyPath_B1F", + "layout": "LAYOUT_MT_EMBER_RUBY_PATH_B1F", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_MT_EMBER", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "96", + "x": 1, + "y": 8, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_RubyPath_B1F_EventScript_1BE00C", + "flag": "18" + }, + { + "graphics_id": "96", + "x": 1, + "y": 11, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_RubyPath_B1F_EventScript_1BE00C", + "flag": "19" + }, + { + "graphics_id": "96", + "x": 3, + "y": 12, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_RubyPath_B1F_EventScript_1BE00C", + "flag": "20" + }, + { + "graphics_id": "96", + "x": 5, + "y": 14, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_RubyPath_B1F_EventScript_1BE00C", + "flag": "21" + } + ], + "warp_events": [ + { + "x": 9, + "y": 21, + "elevation": 0, + "dest_map": "MAP_MT_EMBER_RUBY_PATH_1F", + "dest_warp_id": 1 + }, + { + "x": 6, + "y": 1, + "elevation": 0, + "dest_map": "MAP_MT_EMBER_RUBY_PATH_B2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MtEmber_RubyPath_B1F_Stairs/events.inc b/data/maps/MtEmber_RubyPath_B1F_Stairs/events.inc deleted file mode 100644 index 023110a70..000000000 --- a/data/maps/MtEmber_RubyPath_B1F_Stairs/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -MtEmber_RubyPath_B1F_Stairs_EventObjects: - object_event 1, 96, 0, 4, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_RubyPath_B1F_Stairs_EventScript_1BE00C, 18, 0, 0 - -MtEmber_RubyPath_B1F_Stairs_MapWarps: - warp_def 4, 1, 0, 1, 362 - warp_def 1, 5, 0, 0, 364 - -MtEmber_RubyPath_B1F_Stairs_MapEvents:: - map_events MtEmber_RubyPath_B1F_Stairs_EventObjects, MtEmber_RubyPath_B1F_Stairs_MapWarps, 0x0, 0x0 diff --git a/data/maps/MtEmber_RubyPath_B1F_Stairs/header.inc b/data/maps/MtEmber_RubyPath_B1F_Stairs/header.inc deleted file mode 100644 index 605a4c539..000000000 --- a/data/maps/MtEmber_RubyPath_B1F_Stairs/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -MtEmber_RubyPath_B1F_Stairs:: @ 834FDC8 - .4byte MtEmber_RubyPath_B1F_Stairs_Layout @ 0x833FCD8 - .4byte MtEmber_RubyPath_B1F_Stairs_MapEvents @ 0x83B3188 - .4byte MtEmber_RubyPath_B1F_Stairs_MapScripts @ 0x8163C6F - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 289 - .byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json b/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json new file mode 100644 index 000000000..61c0cae51 --- /dev/null +++ b/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json @@ -0,0 +1,48 @@ +{ + "id": "MAP_MT_EMBER_RUBY_PATH_B1F_STAIRS", + "name": "MtEmber_RubyPath_B1F_Stairs", + "layout": "LAYOUT_MT_EMBER_RUBY_PATH_B1F_STAIRS", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_MT_EMBER", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "96", + "x": 4, + "y": 2, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_RubyPath_B1F_Stairs_EventScript_1BE00C", + "flag": "18" + } + ], + "warp_events": [ + { + "x": 4, + "y": 1, + "elevation": 0, + "dest_map": "MAP_MT_EMBER_RUBY_PATH_B3F", + "dest_warp_id": 1 + }, + { + "x": 1, + "y": 5, + "elevation": 0, + "dest_map": "MAP_MT_EMBER_RUBY_PATH_B2F_STAIRS", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MtEmber_RubyPath_B2F/events.inc b/data/maps/MtEmber_RubyPath_B2F/events.inc deleted file mode 100644 index 2ad1c1b0e..000000000 --- a/data/maps/MtEmber_RubyPath_B2F/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -MtEmber_RubyPath_B2F_EventObjects: - object_event 1, 97, 0, 9, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, MtEmber_RubyPath_B2F_EventScript_1BE11D, 0, 0, 0 - object_event 2, 97, 0, 12, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, MtEmber_RubyPath_B2F_EventScript_1BE11D, 0, 0, 0 - object_event 3, 97, 0, 12, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, MtEmber_RubyPath_B2F_EventScript_1BE11D, 0, 0, 0 - object_event 4, 96, 0, 4, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_RubyPath_B2F_EventScript_1BE00C, 18, 0, 0 - object_event 5, 96, 0, 1, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_RubyPath_B2F_EventScript_1BE00C, 19, 0, 0 - object_event 6, 96, 0, 4, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_RubyPath_B2F_EventScript_1BE00C, 20, 0, 0 - object_event 7, 96, 0, 5, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_RubyPath_B2F_EventScript_1BE00C, 21, 0, 0 - -MtEmber_RubyPath_B2F_MapWarps: - warp_def 1, 7, 3, 1, 360 - warp_def 13, 9, 3, 0, 362 - -MtEmber_RubyPath_B2F_MapEvents:: - map_events MtEmber_RubyPath_B2F_EventObjects, MtEmber_RubyPath_B2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MtEmber_RubyPath_B2F/header.inc b/data/maps/MtEmber_RubyPath_B2F/header.inc deleted file mode 100644 index 817cf2e47..000000000 --- a/data/maps/MtEmber_RubyPath_B2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -MtEmber_RubyPath_B2F:: @ 834FD90 - .4byte MtEmber_RubyPath_B2F_Layout @ 0x833F6A8 - .4byte MtEmber_RubyPath_B2F_MapEvents @ 0x83B3030 - .4byte MtEmber_RubyPath_B2F_MapScripts @ 0x8163C47 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 287 - .byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/MtEmber_RubyPath_B2F/map.json b/data/maps/MtEmber_RubyPath_B2F/map.json new file mode 100644 index 000000000..e10a1762c --- /dev/null +++ b/data/maps/MtEmber_RubyPath_B2F/map.json @@ -0,0 +1,126 @@ +{ + "id": "MAP_MT_EMBER_RUBY_PATH_B2F", + "name": "MtEmber_RubyPath_B2F", + "layout": "LAYOUT_MT_EMBER_RUBY_PATH_B2F", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_MT_EMBER", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "97", + "x": 9, + "y": 3, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_RubyPath_B2F_EventScript_1BE11D", + "flag": "0" + }, + { + "graphics_id": "97", + "x": 12, + "y": 5, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_RubyPath_B2F_EventScript_1BE11D", + "flag": "0" + }, + { + "graphics_id": "97", + "x": 12, + "y": 2, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_RubyPath_B2F_EventScript_1BE11D", + "flag": "0" + }, + { + "graphics_id": "96", + "x": 4, + "y": 8, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_RubyPath_B2F_EventScript_1BE00C", + "flag": "18" + }, + { + "graphics_id": "96", + "x": 1, + "y": 8, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_RubyPath_B2F_EventScript_1BE00C", + "flag": "19" + }, + { + "graphics_id": "96", + "x": 4, + "y": 5, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_RubyPath_B2F_EventScript_1BE00C", + "flag": "20" + }, + { + "graphics_id": "96", + "x": 5, + "y": 5, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_RubyPath_B2F_EventScript_1BE00C", + "flag": "21" + } + ], + "warp_events": [ + { + "x": 1, + "y": 7, + "elevation": 3, + "dest_map": "MAP_MT_EMBER_RUBY_PATH_B1F", + "dest_warp_id": 1 + }, + { + "x": 13, + "y": 9, + "elevation": 3, + "dest_map": "MAP_MT_EMBER_RUBY_PATH_B3F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MtEmber_RubyPath_B2F_Stairs/events.inc b/data/maps/MtEmber_RubyPath_B2F_Stairs/events.inc deleted file mode 100644 index 60013f627..000000000 --- a/data/maps/MtEmber_RubyPath_B2F_Stairs/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -MtEmber_RubyPath_B2F_Stairs_EventObjects: - object_event 1, 96, 0, 4, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_RubyPath_B2F_Stairs_EventScript_1BE00C, 18, 0, 0 - object_event 2, 96, 0, 6, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_RubyPath_B2F_Stairs_EventScript_1BE00C, 19, 0, 0 - -MtEmber_RubyPath_B2F_Stairs_MapWarps: - warp_def 6, 1, 0, 1, 363 - warp_def 1, 4, 0, 2, 359 - -MtEmber_RubyPath_B2F_Stairs_MapEvents:: - map_events MtEmber_RubyPath_B2F_Stairs_EventObjects, MtEmber_RubyPath_B2F_Stairs_MapWarps, 0x0, 0x0 diff --git a/data/maps/MtEmber_RubyPath_B2F_Stairs/header.inc b/data/maps/MtEmber_RubyPath_B2F_Stairs/header.inc deleted file mode 100644 index 875d1f224..000000000 --- a/data/maps/MtEmber_RubyPath_B2F_Stairs/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -MtEmber_RubyPath_B2F_Stairs:: @ 834FDE4 - .4byte MtEmber_RubyPath_B2F_Stairs_Layout @ 0x833FD5C - .4byte MtEmber_RubyPath_B2F_Stairs_MapEvents @ 0x83B31DC - .4byte MtEmber_RubyPath_B2F_Stairs_MapScripts @ 0x8163C70 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 290 - .byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json b/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json new file mode 100644 index 000000000..5d494f5a4 --- /dev/null +++ b/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json @@ -0,0 +1,61 @@ +{ + "id": "MAP_MT_EMBER_RUBY_PATH_B2F_STAIRS", + "name": "MtEmber_RubyPath_B2F_Stairs", + "layout": "LAYOUT_MT_EMBER_RUBY_PATH_B2F_STAIRS", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_MT_EMBER", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "96", + "x": 4, + "y": 3, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_RubyPath_B2F_Stairs_EventScript_1BE00C", + "flag": "18" + }, + { + "graphics_id": "96", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_RubyPath_B2F_Stairs_EventScript_1BE00C", + "flag": "19" + } + ], + "warp_events": [ + { + "x": 6, + "y": 1, + "elevation": 0, + "dest_map": "MAP_MT_EMBER_RUBY_PATH_B1F_STAIRS", + "dest_warp_id": 1 + }, + { + "x": 1, + "y": 4, + "elevation": 0, + "dest_map": "MAP_MT_EMBER_RUBY_PATH_1F", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MtEmber_RubyPath_B3F/events.inc b/data/maps/MtEmber_RubyPath_B3F/events.inc deleted file mode 100644 index 0bab7c507..000000000 --- a/data/maps/MtEmber_RubyPath_B3F/events.inc +++ /dev/null @@ -1,19 +0,0 @@ -MtEmber_RubyPath_B3F_EventObjects: - object_event 1, 97, 0, 10, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, MtEmber_RubyPath_B3F_EventScript_1BE11D, 0, 0, 0 - object_event 2, 97, 0, 26, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, MtEmber_RubyPath_B3F_EventScript_1BE11D, 0, 0, 0 - object_event 3, 97, 0, 28, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, MtEmber_RubyPath_B3F_EventScript_1BE11D, 0, 0, 0 - object_event 4, 96, 0, 7, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_RubyPath_B3F_EventScript_1BE00C, 18, 0, 0 - object_event 5, 96, 0, 4, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_RubyPath_B3F_EventScript_1BE00C, 19, 0, 0 - object_event 6, 96, 0, 6, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_RubyPath_B3F_EventScript_1BE00C, 20, 0, 0 - object_event 7, 96, 0, 7, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_RubyPath_B3F_EventScript_1BE00C, 21, 0, 0 - object_event 8, 96, 0, 4, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_RubyPath_B3F_EventScript_1BE00C, 22, 0, 0 - object_event 9, 96, 0, 5, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_RubyPath_B3F_EventScript_1BE00C, 23, 0, 0 - object_event 10, 97, 0, 15, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, MtEmber_RubyPath_B3F_EventScript_1BE11D, 0, 0, 0 - -MtEmber_RubyPath_B3F_MapWarps: - warp_def 1, 4, 0, 1, 361 - warp_def 19, 19, 3, 0, 363 - warp_def 5, 19, 3, 1, 352 - -MtEmber_RubyPath_B3F_MapEvents:: - map_events MtEmber_RubyPath_B3F_EventObjects, MtEmber_RubyPath_B3F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MtEmber_RubyPath_B3F/header.inc b/data/maps/MtEmber_RubyPath_B3F/header.inc deleted file mode 100644 index bcf17a29f..000000000 --- a/data/maps/MtEmber_RubyPath_B3F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -MtEmber_RubyPath_B3F:: @ 834FDAC - .4byte MtEmber_RubyPath_B3F_Layout @ 0x833FC60 - .4byte MtEmber_RubyPath_B3F_MapEvents @ 0x83B314C - .4byte MtEmber_RubyPath_B3F_MapScripts @ 0x8163C48 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 288 - .byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/MtEmber_RubyPath_B3F/map.json b/data/maps/MtEmber_RubyPath_B3F/map.json new file mode 100644 index 000000000..3b681233c --- /dev/null +++ b/data/maps/MtEmber_RubyPath_B3F/map.json @@ -0,0 +1,172 @@ +{ + "id": "MAP_MT_EMBER_RUBY_PATH_B3F", + "name": "MtEmber_RubyPath_B3F", + "layout": "LAYOUT_MT_EMBER_RUBY_PATH_B3F", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_MT_EMBER", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "97", + "x": 10, + "y": 4, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_RubyPath_B3F_EventScript_1BE11D", + "flag": "0" + }, + { + "graphics_id": "97", + "x": 26, + "y": 12, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_RubyPath_B3F_EventScript_1BE11D", + "flag": "0" + }, + { + "graphics_id": "97", + "x": 28, + "y": 8, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_RubyPath_B3F_EventScript_1BE11D", + "flag": "0" + }, + { + "graphics_id": "96", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_RubyPath_B3F_EventScript_1BE00C", + "flag": "18" + }, + { + "graphics_id": "96", + "x": 4, + "y": 3, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_RubyPath_B3F_EventScript_1BE00C", + "flag": "19" + }, + { + "graphics_id": "96", + "x": 6, + "y": 6, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_RubyPath_B3F_EventScript_1BE00C", + "flag": "20" + }, + { + "graphics_id": "96", + "x": 7, + "y": 6, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_RubyPath_B3F_EventScript_1BE00C", + "flag": "21" + }, + { + "graphics_id": "96", + "x": 4, + "y": 5, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_RubyPath_B3F_EventScript_1BE00C", + "flag": "22" + }, + { + "graphics_id": "96", + "x": 5, + "y": 2, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_RubyPath_B3F_EventScript_1BE00C", + "flag": "23" + }, + { + "graphics_id": "97", + "x": 15, + "y": 13, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_RubyPath_B3F_EventScript_1BE11D", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 1, + "y": 4, + "elevation": 0, + "dest_map": "MAP_MT_EMBER_RUBY_PATH_B2F", + "dest_warp_id": 1 + }, + { + "x": 19, + "y": 19, + "elevation": 3, + "dest_map": "MAP_MT_EMBER_RUBY_PATH_B1F_STAIRS", + "dest_warp_id": 0 + }, + { + "x": 5, + "y": 19, + "elevation": 3, + "dest_map": "MAP_MT_EMBER_RUBY_PATH_B4F", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MtEmber_RubyPath_B4F/events.inc b/data/maps/MtEmber_RubyPath_B4F/events.inc deleted file mode 100644 index f14a83237..000000000 --- a/data/maps/MtEmber_RubyPath_B4F/events.inc +++ /dev/null @@ -1,34 +0,0 @@ -MtEmber_RubyPath_B4F_MapWarps: - warp_def 14, 14, 3, 0, 358 - warp_def 4, 2, 3, 2, 362 - -MtEmber_RubyPath_B4F_MapBGEvents: - bg_event 3, 7, 0, 1, 0, MtEmber_RubyPath_B4F_EventScript_1638EC - bg_event 4, 7, 0, 1, 0, MtEmber_RubyPath_B4F_EventScript_1638EC - bg_event 5, 7, 0, 1, 0, MtEmber_RubyPath_B4F_EventScript_1638EC - bg_event 4, 9, 0, 1, 0, MtEmber_RubyPath_B4F_EventScript_1638F5 - bg_event 3, 9, 0, 1, 0, MtEmber_RubyPath_B4F_EventScript_1638F5 - bg_event 5, 9, 0, 1, 0, MtEmber_RubyPath_B4F_EventScript_1638F5 - bg_event 3, 11, 0, 1, 0, MtEmber_RubyPath_B4F_EventScript_1638FE - bg_event 4, 11, 0, 1, 0, MtEmber_RubyPath_B4F_EventScript_1638FE - bg_event 5, 11, 0, 1, 0, MtEmber_RubyPath_B4F_EventScript_1638FE - bg_event 3, 13, 0, 1, 0, MtEmber_RubyPath_B4F_EventScript_163907 - bg_event 4, 13, 0, 1, 0, MtEmber_RubyPath_B4F_EventScript_163907 - bg_event 5, 13, 0, 1, 0, MtEmber_RubyPath_B4F_EventScript_163907 - bg_event 7, 7, 0, 1, 0, MtEmber_RubyPath_B4F_EventScript_163910 - bg_event 8, 7, 0, 1, 0, MtEmber_RubyPath_B4F_EventScript_163910 - bg_event 9, 7, 0, 1, 0, MtEmber_RubyPath_B4F_EventScript_163910 - bg_event 7, 9, 0, 1, 0, MtEmber_RubyPath_B4F_EventScript_163919 - bg_event 8, 9, 0, 1, 0, MtEmber_RubyPath_B4F_EventScript_163919 - bg_event 9, 9, 0, 1, 0, MtEmber_RubyPath_B4F_EventScript_163919 - bg_event 7, 11, 0, 1, 0, MtEmber_RubyPath_B4F_EventScript_163922 - bg_event 11, 7, 0, 1, 0, MtEmber_RubyPath_B4F_EventScript_163934 - bg_event 11, 9, 0, 1, 0, MtEmber_RubyPath_B4F_EventScript_16393D - bg_event 8, 11, 0, 1, 0, MtEmber_RubyPath_B4F_EventScript_163922 - bg_event 9, 11, 0, 1, 0, MtEmber_RubyPath_B4F_EventScript_163922 - bg_event 7, 13, 0, 1, 0, MtEmber_RubyPath_B4F_EventScript_16392B - bg_event 9, 13, 0, 1, 0, MtEmber_RubyPath_B4F_EventScript_16392B - bg_event 8, 13, 0, 1, 0, MtEmber_RubyPath_B4F_EventScript_16392B - -MtEmber_RubyPath_B4F_MapEvents:: - map_events 0x0, MtEmber_RubyPath_B4F_MapWarps, 0x0, MtEmber_RubyPath_B4F_MapBGEvents diff --git a/data/maps/MtEmber_RubyPath_B4F/header.inc b/data/maps/MtEmber_RubyPath_B4F/header.inc deleted file mode 100644 index e6c316632..000000000 --- a/data/maps/MtEmber_RubyPath_B4F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -MtEmber_RubyPath_B4F:: @ 834FC94 - .4byte MtEmber_RubyPath_B4F_Layout @ 0x8339290 - .4byte MtEmber_RubyPath_B4F_MapEvents @ 0x83B29B8 - .4byte MtEmber_RubyPath_B4F_MapScripts @ 0x81638EB - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 269 - .byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/MtEmber_RubyPath_B4F/map.json b/data/maps/MtEmber_RubyPath_B4F/map.json new file mode 100644 index 000000000..339c5e653 --- /dev/null +++ b/data/maps/MtEmber_RubyPath_B4F/map.json @@ -0,0 +1,217 @@ +{ + "id": "MAP_MT_EMBER_RUBY_PATH_B4F", + "name": "MtEmber_RubyPath_B4F", + "layout": "LAYOUT_MT_EMBER_RUBY_PATH_B4F", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_MT_EMBER", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 14, + "y": 14, + "elevation": 3, + "dest_map": "MAP_MT_EMBER_RUBY_PATH_B5F", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 2, + "elevation": 3, + "dest_map": "MAP_MT_EMBER_RUBY_PATH_B3F", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_1", + "x": 3, + "y": 7, + "elevation": 0, + "script": "MtEmber_RubyPath_B4F_EventScript_1638EC" + }, + { + "type": "bg_event_type_1", + "x": 4, + "y": 7, + "elevation": 0, + "script": "MtEmber_RubyPath_B4F_EventScript_1638EC" + }, + { + "type": "bg_event_type_1", + "x": 5, + "y": 7, + "elevation": 0, + "script": "MtEmber_RubyPath_B4F_EventScript_1638EC" + }, + { + "type": "bg_event_type_1", + "x": 4, + "y": 9, + "elevation": 0, + "script": "MtEmber_RubyPath_B4F_EventScript_1638F5" + }, + { + "type": "bg_event_type_1", + "x": 3, + "y": 9, + "elevation": 0, + "script": "MtEmber_RubyPath_B4F_EventScript_1638F5" + }, + { + "type": "bg_event_type_1", + "x": 5, + "y": 9, + "elevation": 0, + "script": "MtEmber_RubyPath_B4F_EventScript_1638F5" + }, + { + "type": "bg_event_type_1", + "x": 3, + "y": 11, + "elevation": 0, + "script": "MtEmber_RubyPath_B4F_EventScript_1638FE" + }, + { + "type": "bg_event_type_1", + "x": 4, + "y": 11, + "elevation": 0, + "script": "MtEmber_RubyPath_B4F_EventScript_1638FE" + }, + { + "type": "bg_event_type_1", + "x": 5, + "y": 11, + "elevation": 0, + "script": "MtEmber_RubyPath_B4F_EventScript_1638FE" + }, + { + "type": "bg_event_type_1", + "x": 3, + "y": 13, + "elevation": 0, + "script": "MtEmber_RubyPath_B4F_EventScript_163907" + }, + { + "type": "bg_event_type_1", + "x": 4, + "y": 13, + "elevation": 0, + "script": "MtEmber_RubyPath_B4F_EventScript_163907" + }, + { + "type": "bg_event_type_1", + "x": 5, + "y": 13, + "elevation": 0, + "script": "MtEmber_RubyPath_B4F_EventScript_163907" + }, + { + "type": "bg_event_type_1", + "x": 7, + "y": 7, + "elevation": 0, + "script": "MtEmber_RubyPath_B4F_EventScript_163910" + }, + { + "type": "bg_event_type_1", + "x": 8, + "y": 7, + "elevation": 0, + "script": "MtEmber_RubyPath_B4F_EventScript_163910" + }, + { + "type": "bg_event_type_1", + "x": 9, + "y": 7, + "elevation": 0, + "script": "MtEmber_RubyPath_B4F_EventScript_163910" + }, + { + "type": "bg_event_type_1", + "x": 7, + "y": 9, + "elevation": 0, + "script": "MtEmber_RubyPath_B4F_EventScript_163919" + }, + { + "type": "bg_event_type_1", + "x": 8, + "y": 9, + "elevation": 0, + "script": "MtEmber_RubyPath_B4F_EventScript_163919" + }, + { + "type": "bg_event_type_1", + "x": 9, + "y": 9, + "elevation": 0, + "script": "MtEmber_RubyPath_B4F_EventScript_163919" + }, + { + "type": "bg_event_type_1", + "x": 7, + "y": 11, + "elevation": 0, + "script": "MtEmber_RubyPath_B4F_EventScript_163922" + }, + { + "type": "bg_event_type_1", + "x": 11, + "y": 7, + "elevation": 0, + "script": "MtEmber_RubyPath_B4F_EventScript_163934" + }, + { + "type": "bg_event_type_1", + "x": 11, + "y": 9, + "elevation": 0, + "script": "MtEmber_RubyPath_B4F_EventScript_16393D" + }, + { + "type": "bg_event_type_1", + "x": 8, + "y": 11, + "elevation": 0, + "script": "MtEmber_RubyPath_B4F_EventScript_163922" + }, + { + "type": "bg_event_type_1", + "x": 9, + "y": 11, + "elevation": 0, + "script": "MtEmber_RubyPath_B4F_EventScript_163922" + }, + { + "type": "bg_event_type_1", + "x": 7, + "y": 13, + "elevation": 0, + "script": "MtEmber_RubyPath_B4F_EventScript_16392B" + }, + { + "type": "bg_event_type_1", + "x": 9, + "y": 13, + "elevation": 0, + "script": "MtEmber_RubyPath_B4F_EventScript_16392B" + }, + { + "type": "bg_event_type_1", + "x": 8, + "y": 13, + "elevation": 0, + "script": "MtEmber_RubyPath_B4F_EventScript_16392B" + } + ] +} \ No newline at end of file diff --git a/data/maps/MtEmber_RubyPath_B5F/events.inc b/data/maps/MtEmber_RubyPath_B5F/events.inc deleted file mode 100644 index a9f1890eb..000000000 --- a/data/maps/MtEmber_RubyPath_B5F/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -MtEmber_RubyPath_B5F_EventObjects: - object_event 1, 99, 0, 7, 0, 7, 0, 0, 8, 0, 0, 0, 0, 0, 0, MtEmber_RubyPath_B5F_EventScript_163C49, 138, 0, 0 - -MtEmber_RubyPath_B5F_MapWarps: - warp_def 11, 7, 3, 0, 352 - -MtEmber_RubyPath_B5F_MapBGEvents: - bg_event 7, 2, 0, 1, 0, MtEmber_RubyPath_B5F_EventScript_163BAB - -MtEmber_RubyPath_B5F_MapEvents:: - map_events MtEmber_RubyPath_B5F_EventObjects, MtEmber_RubyPath_B5F_MapWarps, 0x0, MtEmber_RubyPath_B5F_MapBGEvents diff --git a/data/maps/MtEmber_RubyPath_B5F/header.inc b/data/maps/MtEmber_RubyPath_B5F/header.inc deleted file mode 100644 index 8fbb65498..000000000 --- a/data/maps/MtEmber_RubyPath_B5F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -MtEmber_RubyPath_B5F:: @ 834FD3C - .4byte MtEmber_RubyPath_B5F_Layout @ 0x833FF60 - .4byte MtEmber_RubyPath_B5F_MapEvents @ 0x83B2E3C - .4byte MtEmber_RubyPath_B5F_MapScripts @ 0x8163BAA - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 291 - .byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/MtEmber_RubyPath_B5F/map.json b/data/maps/MtEmber_RubyPath_B5F/map.json new file mode 100644 index 000000000..320bff06d --- /dev/null +++ b/data/maps/MtEmber_RubyPath_B5F/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_MT_EMBER_RUBY_PATH_B5F", + "name": "MtEmber_RubyPath_B5F", + "layout": "LAYOUT_MT_EMBER_RUBY_PATH_B5F", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_MT_EMBER", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "99", + "x": 7, + "y": 7, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_RubyPath_B5F_EventScript_163C49", + "flag": "138" + } + ], + "warp_events": [ + { + "x": 11, + "y": 7, + "elevation": 3, + "dest_map": "MAP_MT_EMBER_RUBY_PATH_B4F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_1", + "x": 7, + "y": 2, + "elevation": 0, + "script": "MtEmber_RubyPath_B5F_EventScript_163BAB" + } + ] +} \ No newline at end of file diff --git a/data/maps/MtEmber_Summit/events.inc b/data/maps/MtEmber_Summit/events.inc deleted file mode 100644 index c821765e0..000000000 --- a/data/maps/MtEmber_Summit/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -MtEmber_Summit_EventObjects: - object_event 1, 137, 0, 9, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, MtEmber_Summit_EventScript_163B33, 82, 0, 0 - object_event 2, 97, 0, 10, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, MtEmber_Summit_EventScript_1BE11D, 0, 0, 0 - object_event 3, 97, 0, 9, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, MtEmber_Summit_EventScript_1BE11D, 0, 0, 0 - object_event 4, 97, 0, 8, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, MtEmber_Summit_EventScript_1BE11D, 0, 0, 0 - object_event 5, 97, 0, 8, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, MtEmber_Summit_EventScript_1BE11D, 0, 0, 0 - -MtEmber_Summit_MapWarps: - warp_def 9, 15, 0, 4, 353 - -MtEmber_Summit_MapEvents:: - map_events MtEmber_Summit_EventObjects, MtEmber_Summit_MapWarps, 0x0, 0x0 diff --git a/data/maps/MtEmber_Summit/header.inc b/data/maps/MtEmber_Summit/header.inc deleted file mode 100644 index 64c30d948..000000000 --- a/data/maps/MtEmber_Summit/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -MtEmber_Summit:: @ 834FD20 - .4byte MtEmber_Summit_Layout @ 0x833D9C8 - .4byte MtEmber_Summit_MapEvents @ 0x83B2DFC - .4byte MtEmber_Summit_MapScripts @ 0x8163AFC - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 281 - .byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/MtEmber_Summit/map.json b/data/maps/MtEmber_Summit/map.json new file mode 100644 index 000000000..eab46ccae --- /dev/null +++ b/data/maps/MtEmber_Summit/map.json @@ -0,0 +1,93 @@ +{ + "id": "MAP_MT_EMBER_SUMMIT", + "name": "MtEmber_Summit", + "layout": "LAYOUT_MT_EMBER_SUMMIT", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_MT_EMBER", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "137", + "x": 9, + "y": 6, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_Summit_EventScript_163B33", + "flag": "82" + }, + { + "graphics_id": "97", + "x": 10, + "y": 12, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_Summit_EventScript_1BE11D", + "flag": "0" + }, + { + "graphics_id": "97", + "x": 9, + "y": 12, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_Summit_EventScript_1BE11D", + "flag": "0" + }, + { + "graphics_id": "97", + "x": 8, + "y": 11, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_Summit_EventScript_1BE11D", + "flag": "0" + }, + { + "graphics_id": "97", + "x": 8, + "y": 10, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_Summit_EventScript_1BE11D", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 9, + "y": 15, + "elevation": 0, + "dest_map": "MAP_MT_EMBER_EXTERIOR", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MtEmber_SummitPath_1F/events.inc b/data/maps/MtEmber_SummitPath_1F/events.inc deleted file mode 100644 index 715d9ba7a..000000000 --- a/data/maps/MtEmber_SummitPath_1F/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -MtEmber_SummitPath_1F_MapWarps: - warp_def 2, 15, 0, 2, 353 - warp_def 11, 1, 0, 0, 355 - -MtEmber_SummitPath_1F_MapEvents:: - map_events 0x0, MtEmber_SummitPath_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MtEmber_SummitPath_1F/header.inc b/data/maps/MtEmber_SummitPath_1F/header.inc deleted file mode 100644 index 380374d2d..000000000 --- a/data/maps/MtEmber_SummitPath_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -MtEmber_SummitPath_1F:: @ 834FCCC - .4byte MtEmber_SummitPath_1F_Layout @ 0x833DC08 - .4byte MtEmber_SummitPath_1F_MapEvents @ 0x83B2C48 - .4byte MtEmber_SummitPath_1F_MapScripts @ 0x8163AF9 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 282 - .byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/MtEmber_SummitPath_1F/map.json b/data/maps/MtEmber_SummitPath_1F/map.json new file mode 100644 index 000000000..8e7ccc047 --- /dev/null +++ b/data/maps/MtEmber_SummitPath_1F/map.json @@ -0,0 +1,34 @@ +{ + "id": "MAP_MT_EMBER_SUMMIT_PATH_1F", + "name": "MtEmber_SummitPath_1F", + "layout": "LAYOUT_MT_EMBER_SUMMIT_PATH_1F", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_MT_EMBER", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 2, + "y": 15, + "elevation": 0, + "dest_map": "MAP_MT_EMBER_EXTERIOR", + "dest_warp_id": 2 + }, + { + "x": 11, + "y": 1, + "elevation": 0, + "dest_map": "MAP_MT_EMBER_SUMMIT_PATH_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MtEmber_SummitPath_2F/events.inc b/data/maps/MtEmber_SummitPath_2F/events.inc deleted file mode 100644 index 92a3d062f..000000000 --- a/data/maps/MtEmber_SummitPath_2F/events.inc +++ /dev/null @@ -1,17 +0,0 @@ -MtEmber_SummitPath_2F_EventObjects: - object_event 1, 96, 0, 40, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_SummitPath_2F_EventScript_1BE00C, 18, 0, 0 - object_event 2, 96, 0, 33, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_SummitPath_2F_EventScript_1BE00C, 19, 0, 0 - object_event 3, 96, 0, 15, 0, 19, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_SummitPath_2F_EventScript_1BE00C, 20, 0, 0 - object_event 4, 96, 0, 13, 0, 23, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_SummitPath_2F_EventScript_1BE00C, 21, 0, 0 - object_event 5, 96, 0, 13, 0, 21, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_SummitPath_2F_EventScript_1BE00C, 22, 0, 0 - object_event 6, 96, 0, 7, 0, 38, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_SummitPath_2F_EventScript_1BE00C, 23, 0, 0 - object_event 7, 96, 0, 9, 0, 35, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_SummitPath_2F_EventScript_1BE00C, 24, 0, 0 - object_event 8, 96, 0, 7, 0, 34, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_SummitPath_2F_EventScript_1BE00C, 25, 0, 0 - object_event 9, 96, 0, 15, 0, 26, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtEmber_SummitPath_2F_EventScript_1BE00C, 26, 0, 0 - -MtEmber_SummitPath_2F_MapWarps: - warp_def 8, 39, 0, 1, 354 - warp_def 39, 6, 3, 0, 356 - -MtEmber_SummitPath_2F_MapEvents:: - map_events MtEmber_SummitPath_2F_EventObjects, MtEmber_SummitPath_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MtEmber_SummitPath_2F/header.inc b/data/maps/MtEmber_SummitPath_2F/header.inc deleted file mode 100644 index b53170ef8..000000000 --- a/data/maps/MtEmber_SummitPath_2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -MtEmber_SummitPath_2F:: @ 834FCE8 - .4byte MtEmber_SummitPath_2F_Layout @ 0x833ED6C - .4byte MtEmber_SummitPath_2F_MapEvents @ 0x83B2D44 - .4byte MtEmber_SummitPath_2F_MapScripts @ 0x8163AFA - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 283 - .byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/MtEmber_SummitPath_2F/map.json b/data/maps/MtEmber_SummitPath_2F/map.json new file mode 100644 index 000000000..69067bbcc --- /dev/null +++ b/data/maps/MtEmber_SummitPath_2F/map.json @@ -0,0 +1,152 @@ +{ + "id": "MAP_MT_EMBER_SUMMIT_PATH_2F", + "name": "MtEmber_SummitPath_2F", + "layout": "LAYOUT_MT_EMBER_SUMMIT_PATH_2F", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_MT_EMBER", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "96", + "x": 40, + "y": 7, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_SummitPath_2F_EventScript_1BE00C", + "flag": "18" + }, + { + "graphics_id": "96", + "x": 33, + "y": 5, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_SummitPath_2F_EventScript_1BE00C", + "flag": "19" + }, + { + "graphics_id": "96", + "x": 15, + "y": 19, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_SummitPath_2F_EventScript_1BE00C", + "flag": "20" + }, + { + "graphics_id": "96", + "x": 13, + "y": 23, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_SummitPath_2F_EventScript_1BE00C", + "flag": "21" + }, + { + "graphics_id": "96", + "x": 13, + "y": 21, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_SummitPath_2F_EventScript_1BE00C", + "flag": "22" + }, + { + "graphics_id": "96", + "x": 7, + "y": 38, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_SummitPath_2F_EventScript_1BE00C", + "flag": "23" + }, + { + "graphics_id": "96", + "x": 9, + "y": 35, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_SummitPath_2F_EventScript_1BE00C", + "flag": "24" + }, + { + "graphics_id": "96", + "x": 7, + "y": 34, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_SummitPath_2F_EventScript_1BE00C", + "flag": "25" + }, + { + "graphics_id": "96", + "x": 15, + "y": 26, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtEmber_SummitPath_2F_EventScript_1BE00C", + "flag": "26" + } + ], + "warp_events": [ + { + "x": 8, + "y": 39, + "elevation": 0, + "dest_map": "MAP_MT_EMBER_SUMMIT_PATH_1F", + "dest_warp_id": 1 + }, + { + "x": 39, + "y": 6, + "elevation": 3, + "dest_map": "MAP_MT_EMBER_SUMMIT_PATH_3F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MtEmber_SummitPath_3F/events.inc b/data/maps/MtEmber_SummitPath_3F/events.inc deleted file mode 100644 index b05d6e6de..000000000 --- a/data/maps/MtEmber_SummitPath_3F/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -MtEmber_SummitPath_3F_MapWarps: - warp_def 2, 4, 0, 1, 355 - warp_def 11, 8, 0, 3, 353 - -MtEmber_SummitPath_3F_MapEvents:: - map_events 0x0, MtEmber_SummitPath_3F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MtEmber_SummitPath_3F/header.inc b/data/maps/MtEmber_SummitPath_3F/header.inc deleted file mode 100644 index 0d6829bab..000000000 --- a/data/maps/MtEmber_SummitPath_3F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -MtEmber_SummitPath_3F:: @ 834FD04 - .4byte MtEmber_SummitPath_3F_Layout @ 0x833EEDC - .4byte MtEmber_SummitPath_3F_MapEvents @ 0x83B2D68 - .4byte MtEmber_SummitPath_3F_MapScripts @ 0x8163AFB - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 284 - .byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/MtEmber_SummitPath_3F/map.json b/data/maps/MtEmber_SummitPath_3F/map.json new file mode 100644 index 000000000..b30309a12 --- /dev/null +++ b/data/maps/MtEmber_SummitPath_3F/map.json @@ -0,0 +1,34 @@ +{ + "id": "MAP_MT_EMBER_SUMMIT_PATH_3F", + "name": "MtEmber_SummitPath_3F", + "layout": "LAYOUT_MT_EMBER_SUMMIT_PATH_3F", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_MT_EMBER", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 2, + "y": 4, + "elevation": 0, + "dest_map": "MAP_MT_EMBER_SUMMIT_PATH_2F", + "dest_warp_id": 1 + }, + { + "x": 11, + "y": 8, + "elevation": 0, + "dest_map": "MAP_MT_EMBER_EXTERIOR", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MtMoon_1F/events.inc b/data/maps/MtMoon_1F/events.inc deleted file mode 100644 index 9c0ffa77e..000000000 --- a/data/maps/MtMoon_1F/events.inc +++ /dev/null @@ -1,27 +0,0 @@ -MtMoon_1F_EventObjects: - object_event 1, 22, 0, 20, 0, 26, 0, 3, 8, 17, 0, 1, 0, 2, 0, MtMoon_1F_EventScript_16063C, 0, 0, 0 - object_event 2, 20, 0, 36, 0, 30, 0, 3, 10, 17, 0, 1, 0, 2, 0, MtMoon_1F_EventScript_160681, 0, 0, 0 - object_event 3, 55, 0, 30, 0, 35, 0, 3, 1, 17, 0, 1, 0, 4, 0, MtMoon_1F_EventScript_160653, 0, 0, 0 - object_event 4, 22, 0, 33, 0, 4, 0, 3, 47, 53, 0, 1, 0, 2, 0, MtMoon_1F_EventScript_160625, 0, 0, 0 - object_event 5, 20, 0, 7, 0, 26, 0, 3, 8, 17, 0, 1, 0, 4, 0, MtMoon_1F_EventScript_16066A, 0, 0, 0 - object_event 6, 18, 0, 13, 0, 17, 0, 3, 10, 17, 0, 1, 0, 4, 0, MtMoon_1F_EventScript_16060E, 0, 0, 0 - object_event 7, 56, 0, 7, 0, 10, 0, 3, 2, 34, 0, 1, 0, 1, 0, MtMoon_1F_EventScript_1605F7, 0, 0, 0 - object_event 8, 92, 0, 2, 0, 22, 0, 3, 8, 17, 0, 0, 0, 0, 0, MtMoon_1F_EventScript_1BE5CF, 345, 0, 0 - object_event 9, 92, 0, 11, 0, 35, 0, 3, 8, 17, 0, 0, 0, 0, 0, MtMoon_1F_EventScript_1BE5DC, 346, 0, 0 - object_event 10, 92, 0, 26, 0, 32, 0, 3, 8, 17, 0, 0, 0, 0, 0, MtMoon_1F_EventScript_1BE5E9, 347, 0, 0 - object_event 11, 92, 0, 42, 0, 35, 0, 3, 8, 17, 0, 0, 0, 0, 0, MtMoon_1F_EventScript_1BE5F6, 348, 0, 0 - object_event 12, 92, 0, 44, 0, 21, 0, 3, 8, 17, 0, 0, 0, 0, 0, MtMoon_1F_EventScript_1BE603, 349, 0, 0 - object_event 13, 92, 0, 3, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, MtMoon_1F_EventScript_1BE610, 350, 0, 0 - object_event 14, 30, 0, 42, 0, 7, 0, 3, 17, 17, 0, 0, 0, 0, 0, MtMoon_1F_EventScript_1ACE03, 0, 0, 0 - -MtMoon_1F_MapWarps: - warp_def 5, 6, 3, 0, 258 - warp_def 19, 14, 3, 1, 258 - warp_def 31, 16, 3, 2, 258 - warp_def 18, 37, 3, 0, 790 - -MtMoon_1F_MapBGEvents: - bg_event 19, 26, 0, 0, 0, MtMoon_1F_EventScript_1605EE - -MtMoon_1F_MapEvents:: - map_events MtMoon_1F_EventObjects, MtMoon_1F_MapWarps, 0x0, MtMoon_1F_MapBGEvents diff --git a/data/maps/MtMoon_1F/header.inc b/data/maps/MtMoon_1F/header.inc deleted file mode 100644 index 13f9175f3..000000000 --- a/data/maps/MtMoon_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -MtMoon_1F:: @ 834F230 - .4byte MtMoon_1F_Layout @ 0x82FA890 - .4byte MtMoon_1F_MapEvents @ 0x83AE668 - .4byte MtMoon_1F_MapScripts @ 0x81605E4 - .4byte NULL - .2byte BGM_FRLG_MT_MOON - .2byte 114 - .byte 0x7f, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/MtMoon_1F/map.json b/data/maps/MtMoon_1F/map.json new file mode 100644 index 000000000..39138d94e --- /dev/null +++ b/data/maps/MtMoon_1F/map.json @@ -0,0 +1,239 @@ +{ + "id": "MAP_MT_MOON_1F", + "name": "MtMoon_1F", + "layout": "LAYOUT_MT_MOON_1F", + "music": "BGM_FRLG_MT_MOON", + "region_map_section": "MAPSEC_MT_MOON", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "22", + "x": 20, + "y": 26, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "MtMoon_1F_EventScript_16063C", + "flag": "0" + }, + { + "graphics_id": "20", + "x": 36, + "y": 30, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "MtMoon_1F_EventScript_160681", + "flag": "0" + }, + { + "graphics_id": "55", + "x": 30, + "y": 35, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "MtMoon_1F_EventScript_160653", + "flag": "0" + }, + { + "graphics_id": "22", + "x": 33, + "y": 4, + "elevation": 3, + "movement_type": "47", + "movement_range_x": 5, + "movement_range_y": 3, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "MtMoon_1F_EventScript_160625", + "flag": "0" + }, + { + "graphics_id": "20", + "x": 7, + "y": 26, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "MtMoon_1F_EventScript_16066A", + "flag": "0" + }, + { + "graphics_id": "18", + "x": 13, + "y": 17, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "MtMoon_1F_EventScript_16060E", + "flag": "0" + }, + { + "graphics_id": "56", + "x": 7, + "y": 10, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 2, + "movement_range_y": 2, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "MtMoon_1F_EventScript_1605F7", + "flag": "0" + }, + { + "graphics_id": "92", + "x": 2, + "y": 22, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtMoon_1F_EventScript_1BE5CF", + "flag": "345" + }, + { + "graphics_id": "92", + "x": 11, + "y": 35, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtMoon_1F_EventScript_1BE5DC", + "flag": "346" + }, + { + "graphics_id": "92", + "x": 26, + "y": 32, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtMoon_1F_EventScript_1BE5E9", + "flag": "347" + }, + { + "graphics_id": "92", + "x": 42, + "y": 35, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtMoon_1F_EventScript_1BE5F6", + "flag": "348" + }, + { + "graphics_id": "92", + "x": 44, + "y": 21, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtMoon_1F_EventScript_1BE603", + "flag": "349" + }, + { + "graphics_id": "92", + "x": 3, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtMoon_1F_EventScript_1BE610", + "flag": "350" + }, + { + "graphics_id": "30", + "x": 42, + "y": 7, + "elevation": 3, + "movement_type": "17", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtMoon_1F_EventScript_1ACE03", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 5, + "y": 6, + "elevation": 3, + "dest_map": "MAP_MT_MOON_B1F", + "dest_warp_id": 0 + }, + { + "x": 19, + "y": 14, + "elevation": 3, + "dest_map": "MAP_MT_MOON_B1F", + "dest_warp_id": 1 + }, + { + "x": 31, + "y": 16, + "elevation": 3, + "dest_map": "MAP_MT_MOON_B1F", + "dest_warp_id": 2 + }, + { + "x": 18, + "y": 37, + "elevation": 3, + "dest_map": "MAP_ROUTE4", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 19, + "y": 26, + "elevation": 0, + "script": "MtMoon_1F_EventScript_1605EE" + } + ] +} \ No newline at end of file diff --git a/data/maps/MtMoon_B1F/events.inc b/data/maps/MtMoon_B1F/events.inc deleted file mode 100644 index 966f371bc..000000000 --- a/data/maps/MtMoon_B1F/events.inc +++ /dev/null @@ -1,20 +0,0 @@ -MtMoon_B1F_MapWarps: - warp_def 3, 3, 3, 0, 257 - warp_def 25, 4, 3, 1, 257 - warp_def 43, 21, 3, 2, 257 - warp_def 22, 18, 3, 0, 259 - warp_def 17, 5, 3, 1, 259 - warp_def 26, 36, 3, 2, 259 - warp_def 39, 4, 3, 3, 259 - warp_def 45, 4, 3, 1, 790 - -MtMoon_B1F_MapBGEvents: - bg_event 46, 2, 0, 7, 0, 103, 84, 1 - bg_event 26, 2, 0, 7, 0, 103, 85, 1 - bg_event 39, 34, 0, 7, 0, 103, 86, 1 - bg_event 24, 35, 0, 7, 0, 104, 87, 1 - bg_event 6, 12, 0, 7, 0, 104, 88, 1 - bg_event 25, 34, 0, 7, 0, 104, 89, 1 - -MtMoon_B1F_MapEvents:: - map_events 0x0, MtMoon_B1F_MapWarps, 0x0, MtMoon_B1F_MapBGEvents diff --git a/data/maps/MtMoon_B1F/header.inc b/data/maps/MtMoon_B1F/header.inc deleted file mode 100644 index 83f710180..000000000 --- a/data/maps/MtMoon_B1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -MtMoon_B1F:: @ 834F24C - .4byte MtMoon_B1F_Layout @ 0x82FB804 - .4byte MtMoon_B1F_MapEvents @ 0x83AE704 - .4byte MtMoon_B1F_MapScripts @ 0x8160698 - .4byte NULL - .2byte BGM_FRLG_MT_MOON - .2byte 115 - .byte 0x7f, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/MtMoon_B1F/map.json b/data/maps/MtMoon_B1F/map.json new file mode 100644 index 000000000..64e316565 --- /dev/null +++ b/data/maps/MtMoon_B1F/map.json @@ -0,0 +1,131 @@ +{ + "id": "MAP_MT_MOON_B1F", + "name": "MtMoon_B1F", + "layout": "LAYOUT_MT_MOON_B1F", + "music": "BGM_FRLG_MT_MOON", + "region_map_section": "MAPSEC_MT_MOON", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 3, + "y": 3, + "elevation": 3, + "dest_map": "MAP_MT_MOON_1F", + "dest_warp_id": 0 + }, + { + "x": 25, + "y": 4, + "elevation": 3, + "dest_map": "MAP_MT_MOON_1F", + "dest_warp_id": 1 + }, + { + "x": 43, + "y": 21, + "elevation": 3, + "dest_map": "MAP_MT_MOON_1F", + "dest_warp_id": 2 + }, + { + "x": 22, + "y": 18, + "elevation": 3, + "dest_map": "MAP_MT_MOON_B2F", + "dest_warp_id": 0 + }, + { + "x": 17, + "y": 5, + "elevation": 3, + "dest_map": "MAP_MT_MOON_B2F", + "dest_warp_id": 1 + }, + { + "x": 26, + "y": 36, + "elevation": 3, + "dest_map": "MAP_MT_MOON_B2F", + "dest_warp_id": 2 + }, + { + "x": 39, + "y": 4, + "elevation": 3, + "dest_map": "MAP_MT_MOON_B2F", + "dest_warp_id": 3 + }, + { + "x": 45, + "y": 4, + "elevation": 3, + "dest_map": "MAP_ROUTE4", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 46, + "y": 2, + "elevation": 0, + "item": "ITEM_TINY_MUSHROOM", + "flag": "84", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 26, + "y": 2, + "elevation": 0, + "item": "ITEM_TINY_MUSHROOM", + "flag": "85", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 39, + "y": 34, + "elevation": 0, + "item": "ITEM_TINY_MUSHROOM", + "flag": "86", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 24, + "y": 35, + "elevation": 0, + "item": "ITEM_BIG_MUSHROOM", + "flag": "87", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 6, + "y": 12, + "elevation": 0, + "item": "ITEM_BIG_MUSHROOM", + "flag": "88", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 25, + "y": 34, + "elevation": 0, + "item": "ITEM_BIG_MUSHROOM", + "flag": "89", + "unknown": 1 + } + ] +} \ No newline at end of file diff --git a/data/maps/MtMoon_B2F/events.inc b/data/maps/MtMoon_B2F/events.inc deleted file mode 100644 index e2bea66aa..000000000 --- a/data/maps/MtMoon_B2F/events.inc +++ /dev/null @@ -1,28 +0,0 @@ -MtMoon_B2F_EventObjects: - object_event 1, 98, 0, 13, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, MtMoon_B2F_EventScript_16071B, 47, 0, 0 - object_event 2, 98, 0, 14, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, MtMoon_B2F_EventScript_16077F, 48, 0, 0 - object_event 3, 55, 0, 13, 0, 11, 0, 3, 10, 17, 0, 0, 0, 0, 0, MtMoon_B2F_EventScript_1606C2, 0, 0, 0 - object_event 4, 49, 0, 37, 0, 21, 0, 3, 1, 17, 0, 1, 0, 3, 0, MtMoon_B2F_EventScript_160829, 173, 0, 0 - object_event 5, 49, 0, 12, 0, 20, 0, 3, 8, 17, 0, 1, 0, 2, 0, MtMoon_B2F_EventScript_1607E4, 173, 0, 0 - object_event 6, 49, 0, 35, 0, 12, 0, 3, 7, 17, 0, 1, 0, 4, 0, MtMoon_B2F_EventScript_160812, 173, 0, 0 - object_event 7, 49, 0, 18, 0, 27, 0, 3, 8, 17, 0, 1, 0, 4, 0, MtMoon_B2F_EventScript_1607FB, 173, 0, 0 - object_event 8, 92, 0, 30, 0, 26, 0, 3, 8, 17, 0, 0, 0, 0, 0, MtMoon_B2F_EventScript_1BE61D, 351, 0, 0 - object_event 9, 92, 0, 35, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, MtMoon_B2F_EventScript_1BE62A, 352, 0, 0 - object_event 10, 92, 0, 24, 0, 6, 0, 3, 8, 17, 0, 0, 0, 0, 0, MtMoon_B2F_EventScript_1BEAD6, 447, 0, 0 - object_event 11, 92, 0, 3, 0, 11, 0, 3, 8, 17, 0, 0, 0, 0, 0, MtMoon_B2F_EventScript_1BEAE3, 448, 0, 0 - -MtMoon_B2F_MapWarps: - warp_def 25, 21, 3, 3, 258 - warp_def 31, 11, 3, 4, 258 - warp_def 17, 31, 3, 5, 258 - warp_def 5, 10, 3, 6, 258 - -MtMoon_B2F_MapCoordEvents: - coord_event 14, 11, 3, 0, 16523, 0, 0, MtMoon_B2F_EventScript_1606B0 - -MtMoon_B2F_MapBGEvents: - bg_event 20, 16, 3, 7, 0, 94, 2, 1 - bg_event 39, 11, 3, 7, 0, 34, 3, 1 - -MtMoon_B2F_MapEvents:: - map_events MtMoon_B2F_EventObjects, MtMoon_B2F_MapWarps, MtMoon_B2F_MapCoordEvents, MtMoon_B2F_MapBGEvents diff --git a/data/maps/MtMoon_B2F/header.inc b/data/maps/MtMoon_B2F/header.inc deleted file mode 100644 index d84f5a668..000000000 --- a/data/maps/MtMoon_B2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -MtMoon_B2F:: @ 834F268 - .4byte MtMoon_B2F_Layout @ 0x82FC728 - .4byte MtMoon_B2F_MapEvents @ 0x83AE868 - .4byte MtMoon_B2F_MapScripts @ 0x8160699 - .4byte NULL - .2byte BGM_FRLG_MT_MOON - .2byte 116 - .byte 0x7f, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/MtMoon_B2F/map.json b/data/maps/MtMoon_B2F/map.json new file mode 100644 index 000000000..9b3fa3658 --- /dev/null +++ b/data/maps/MtMoon_B2F/map.json @@ -0,0 +1,221 @@ +{ + "id": "MAP_MT_MOON_B2F", + "name": "MtMoon_B2F", + "layout": "LAYOUT_MT_MOON_B2F", + "music": "BGM_FRLG_MT_MOON", + "region_map_section": "MAPSEC_MT_MOON", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "98", + "x": 13, + "y": 7, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtMoon_B2F_EventScript_16071B", + "flag": "47" + }, + { + "graphics_id": "98", + "x": 14, + "y": 7, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtMoon_B2F_EventScript_16077F", + "flag": "48" + }, + { + "graphics_id": "55", + "x": 13, + "y": 11, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtMoon_B2F_EventScript_1606C2", + "flag": "0" + }, + { + "graphics_id": "49", + "x": 37, + "y": 21, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "MtMoon_B2F_EventScript_160829", + "flag": "173" + }, + { + "graphics_id": "49", + "x": 12, + "y": 20, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "MtMoon_B2F_EventScript_1607E4", + "flag": "173" + }, + { + "graphics_id": "49", + "x": 35, + "y": 12, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "MtMoon_B2F_EventScript_160812", + "flag": "173" + }, + { + "graphics_id": "49", + "x": 18, + "y": 27, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "MtMoon_B2F_EventScript_1607FB", + "flag": "173" + }, + { + "graphics_id": "92", + "x": 30, + "y": 26, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtMoon_B2F_EventScript_1BE61D", + "flag": "351" + }, + { + "graphics_id": "92", + "x": 35, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtMoon_B2F_EventScript_1BE62A", + "flag": "352" + }, + { + "graphics_id": "92", + "x": 24, + "y": 6, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtMoon_B2F_EventScript_1BEAD6", + "flag": "447" + }, + { + "graphics_id": "92", + "x": 3, + "y": 11, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtMoon_B2F_EventScript_1BEAE3", + "flag": "448" + } + ], + "warp_events": [ + { + "x": 25, + "y": 21, + "elevation": 3, + "dest_map": "MAP_MT_MOON_B1F", + "dest_warp_id": 3 + }, + { + "x": 31, + "y": 11, + "elevation": 3, + "dest_map": "MAP_MT_MOON_B1F", + "dest_warp_id": 4 + }, + { + "x": 17, + "y": 31, + "elevation": 3, + "dest_map": "MAP_MT_MOON_B1F", + "dest_warp_id": 5 + }, + { + "x": 5, + "y": 10, + "elevation": 3, + "dest_map": "MAP_MT_MOON_B1F", + "dest_warp_id": 6 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 14, + "y": 11, + "elevation": 3, + "var": "VAR_0x408B", + "var_value": 0, + "script": "MtMoon_B2F_EventScript_1606B0" + } + ], + "bg_events": [ + { + "type": "hidden_item", + "x": 20, + "y": 16, + "elevation": 3, + "item": "ITEM_MOON_STONE", + "flag": "2", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 39, + "y": 11, + "elevation": 3, + "item": "ITEM_ETHER", + "flag": "3", + "unknown": 1 + } + ] +} \ No newline at end of file diff --git a/data/maps/NavelRock_1F/events.inc b/data/maps/NavelRock_1F/events.inc deleted file mode 100644 index 935817429..000000000 --- a/data/maps/NavelRock_1F/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -NavelRock_1F_MapWarps: - warp_def 8, 4, 3, 0, 566 - warp_def 8, 23, 3, 0, 512 - -NavelRock_1F_MapEvents:: - map_events 0x0, NavelRock_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_1F/header.inc b/data/maps/NavelRock_1F/header.inc deleted file mode 100644 index 770c47ebc..000000000 --- a/data/maps/NavelRock_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -NavelRock_1F:: @ 8350378 - .4byte NavelRock_1F_Layout @ 0x8348AD4 - .4byte NavelRock_1F_MapEvents @ 0x83B48E0 - .4byte NavelRock_1F_MapScripts @ 0x8164F9E - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 344 - .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/NavelRock_1F/map.json b/data/maps/NavelRock_1F/map.json new file mode 100644 index 000000000..586d2c9b6 --- /dev/null +++ b/data/maps/NavelRock_1F/map.json @@ -0,0 +1,34 @@ +{ + "id": "MAP_NAVEL_ROCK_1F", + "name": "NavelRock_1F", + "layout": "LAYOUT_NAVEL_ROCK_1F", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_NAVEL_ROCK", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 8, + "y": 4, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_B1F", + "dest_warp_id": 0 + }, + { + "x": 8, + "y": 23, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_EXTERIOR", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NavelRock_B1F/events.inc b/data/maps/NavelRock_B1F/events.inc deleted file mode 100644 index bed605cad..000000000 --- a/data/maps/NavelRock_B1F/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -NavelRock_B1F_MapWarps: - warp_def 4, 2, 3, 0, 548 - warp_def 11, 5, 3, 0, 567 - -NavelRock_B1F_MapEvents:: - map_events 0x0, NavelRock_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_B1F/header.inc b/data/maps/NavelRock_B1F/header.inc deleted file mode 100644 index b9d2192a8..000000000 --- a/data/maps/NavelRock_B1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -NavelRock_B1F:: @ 8350570 - .4byte NavelRock_B1F_Layout @ 0x834A210 - .4byte NavelRock_B1F_MapEvents @ 0x83B4BA4 - .4byte NavelRock_B1F_MapScripts @ 0x8165201 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 364 - .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/NavelRock_B1F/map.json b/data/maps/NavelRock_B1F/map.json new file mode 100644 index 000000000..074a3e41f --- /dev/null +++ b/data/maps/NavelRock_B1F/map.json @@ -0,0 +1,34 @@ +{ + "id": "MAP_NAVEL_ROCK_B1F", + "name": "NavelRock_B1F", + "layout": "LAYOUT_NAVEL_ROCK_B1F", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_NAVEL_ROCK", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 4, + "y": 2, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_1F", + "dest_warp_id": 0 + }, + { + "x": 11, + "y": 5, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_FORK", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NavelRock_Base/events.inc b/data/maps/NavelRock_Base/events.inc deleted file mode 100644 index cf94327da..000000000 --- a/data/maps/NavelRock_Base/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -NavelRock_Base_EventObjects: - object_event 1, 144, 0, 10, 0, 15, 0, 3, 8, 17, 0, 0, 0, 0, 0, NavelRock_Base_EventScript_165134, 155, 0, 0 - -NavelRock_Base_MapWarps: - warp_def 13, 20, 3, 1, 565 - -NavelRock_Base_MapEvents:: - map_events NavelRock_Base_EventObjects, NavelRock_Base_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_Base/header.inc b/data/maps/NavelRock_Base/header.inc deleted file mode 100644 index e452edef9..000000000 --- a/data/maps/NavelRock_Base/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -NavelRock_Base:: @ 83503B0 - .4byte NavelRock_Base_Layout @ 0x834929C - .4byte NavelRock_Base_MapEvents @ 0x83B4964 - .4byte NavelRock_Base_MapScripts @ 0x81650E7 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 346 - .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/NavelRock_Base/map.json b/data/maps/NavelRock_Base/map.json new file mode 100644 index 000000000..5e515e7e9 --- /dev/null +++ b/data/maps/NavelRock_Base/map.json @@ -0,0 +1,41 @@ +{ + "id": "MAP_NAVEL_ROCK_BASE", + "name": "NavelRock_Base", + "layout": "LAYOUT_NAVEL_ROCK_BASE", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_NAVEL_ROCK", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "144", + "x": 10, + "y": 15, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "NavelRock_Base_EventScript_165134", + "flag": "155" + } + ], + "warp_events": [ + { + "x": 13, + "y": 20, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B11F", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NavelRock_BasePath_B10F/events.inc b/data/maps/NavelRock_BasePath_B10F/events.inc deleted file mode 100644 index cdbc551a0..000000000 --- a/data/maps/NavelRock_BasePath_B10F/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -NavelRock_BasePath_B10F_MapWarps: - warp_def 4, 4, 3, 1, 563 - warp_def 2, 2, 3, 0, 565 - -NavelRock_BasePath_B10F_MapEvents:: - map_events 0x0, NavelRock_BasePath_B10F_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_BasePath_B10F/header.inc b/data/maps/NavelRock_BasePath_B10F/header.inc deleted file mode 100644 index 5354c6f9f..000000000 --- a/data/maps/NavelRock_BasePath_B10F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -NavelRock_BasePath_B10F:: @ 8350538 - .4byte NavelRock_BasePath_B10F_Layout @ 0x8349A0C - .4byte NavelRock_BasePath_B10F_MapEvents @ 0x83B4B5C - .4byte NavelRock_BasePath_B10F_MapScripts @ 0x81651FF - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 360 - .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/NavelRock_BasePath_B10F/map.json b/data/maps/NavelRock_BasePath_B10F/map.json new file mode 100644 index 000000000..c578caf34 --- /dev/null +++ b/data/maps/NavelRock_BasePath_B10F/map.json @@ -0,0 +1,34 @@ +{ + "id": "MAP_NAVEL_ROCK_BASE_PATH_B10F", + "name": "NavelRock_BasePath_B10F", + "layout": "LAYOUT_NAVEL_ROCK_BASE_PATH_B10F", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_NAVEL_ROCK", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 4, + "y": 4, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B9F", + "dest_warp_id": 1 + }, + { + "x": 2, + "y": 2, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B11F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NavelRock_BasePath_B11F/events.inc b/data/maps/NavelRock_BasePath_B11F/events.inc deleted file mode 100644 index 4d1fe74d7..000000000 --- a/data/maps/NavelRock_BasePath_B11F/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -NavelRock_BasePath_B11F_MapWarps: - warp_def 2, 2, 3, 1, 564 - warp_def 4, 4, 3, 0, 550 - -NavelRock_BasePath_B11F_MapEvents:: - map_events 0x0, NavelRock_BasePath_B11F_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_BasePath_B11F/header.inc b/data/maps/NavelRock_BasePath_B11F/header.inc deleted file mode 100644 index 395f9d82a..000000000 --- a/data/maps/NavelRock_BasePath_B11F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -NavelRock_BasePath_B11F:: @ 8350554 - .4byte NavelRock_BasePath_B11F_Layout @ 0x8349A94 - .4byte NavelRock_BasePath_B11F_MapEvents @ 0x83B4B80 - .4byte NavelRock_BasePath_B11F_MapScripts @ 0x8165200 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 361 - .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/NavelRock_BasePath_B11F/map.json b/data/maps/NavelRock_BasePath_B11F/map.json new file mode 100644 index 000000000..a25f66a8d --- /dev/null +++ b/data/maps/NavelRock_BasePath_B11F/map.json @@ -0,0 +1,34 @@ +{ + "id": "MAP_NAVEL_ROCK_BASE_PATH_B11F", + "name": "NavelRock_BasePath_B11F", + "layout": "LAYOUT_NAVEL_ROCK_BASE_PATH_B11F", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_NAVEL_ROCK", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 2, + "y": 2, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B10F", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 4, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_BASE", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NavelRock_BasePath_B1F/events.inc b/data/maps/NavelRock_BasePath_B1F/events.inc deleted file mode 100644 index a380bde04..000000000 --- a/data/maps/NavelRock_BasePath_B1F/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -NavelRock_BasePath_B1F_MapWarps: - warp_def 2, 2, 3, 2, 567 - warp_def 4, 4, 3, 0, 556 - -NavelRock_BasePath_B1F_MapEvents:: - map_events 0x0, NavelRock_BasePath_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_BasePath_B1F/header.inc b/data/maps/NavelRock_BasePath_B1F/header.inc deleted file mode 100644 index b7f59616a..000000000 --- a/data/maps/NavelRock_BasePath_B1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -NavelRock_BasePath_B1F:: @ 835043C - .4byte NavelRock_BasePath_B1F_Layout @ 0x8349544 - .4byte NavelRock_BasePath_B1F_MapEvents @ 0x83B4A18 - .4byte NavelRock_BasePath_B1F_MapScripts @ 0x81651F6 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 351 - .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/NavelRock_BasePath_B1F/map.json b/data/maps/NavelRock_BasePath_B1F/map.json new file mode 100644 index 000000000..9127135f3 --- /dev/null +++ b/data/maps/NavelRock_BasePath_B1F/map.json @@ -0,0 +1,34 @@ +{ + "id": "MAP_NAVEL_ROCK_BASE_PATH_B1F", + "name": "NavelRock_BasePath_B1F", + "layout": "LAYOUT_NAVEL_ROCK_BASE_PATH_B1F", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_NAVEL_ROCK", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 2, + "y": 2, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_FORK", + "dest_warp_id": 2 + }, + { + "x": 4, + "y": 4, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NavelRock_BasePath_B2F/events.inc b/data/maps/NavelRock_BasePath_B2F/events.inc deleted file mode 100644 index ecd9fb93b..000000000 --- a/data/maps/NavelRock_BasePath_B2F/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -NavelRock_BasePath_B2F_MapWarps: - warp_def 4, 4, 3, 1, 555 - warp_def 2, 2, 3, 0, 557 - -NavelRock_BasePath_B2F_MapEvents:: - map_events 0x0, NavelRock_BasePath_B2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_BasePath_B2F/header.inc b/data/maps/NavelRock_BasePath_B2F/header.inc deleted file mode 100644 index 55a55d2ab..000000000 --- a/data/maps/NavelRock_BasePath_B2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -NavelRock_BasePath_B2F:: @ 8350458 - .4byte NavelRock_BasePath_B2F_Layout @ 0x83495CC - .4byte NavelRock_BasePath_B2F_MapEvents @ 0x83B4A3C - .4byte NavelRock_BasePath_B2F_MapScripts @ 0x81651F7 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 352 - .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/NavelRock_BasePath_B2F/map.json b/data/maps/NavelRock_BasePath_B2F/map.json new file mode 100644 index 000000000..4ec9d4faf --- /dev/null +++ b/data/maps/NavelRock_BasePath_B2F/map.json @@ -0,0 +1,34 @@ +{ + "id": "MAP_NAVEL_ROCK_BASE_PATH_B2F", + "name": "NavelRock_BasePath_B2F", + "layout": "LAYOUT_NAVEL_ROCK_BASE_PATH_B2F", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_NAVEL_ROCK", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 4, + "y": 4, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B1F", + "dest_warp_id": 1 + }, + { + "x": 2, + "y": 2, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B3F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NavelRock_BasePath_B3F/events.inc b/data/maps/NavelRock_BasePath_B3F/events.inc deleted file mode 100644 index 729c045eb..000000000 --- a/data/maps/NavelRock_BasePath_B3F/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -NavelRock_BasePath_B3F_MapWarps: - warp_def 2, 2, 3, 1, 556 - warp_def 4, 4, 3, 0, 558 - -NavelRock_BasePath_B3F_MapEvents:: - map_events 0x0, NavelRock_BasePath_B3F_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_BasePath_B3F/header.inc b/data/maps/NavelRock_BasePath_B3F/header.inc deleted file mode 100644 index a2c0a7871..000000000 --- a/data/maps/NavelRock_BasePath_B3F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -NavelRock_BasePath_B3F:: @ 8350474 - .4byte NavelRock_BasePath_B3F_Layout @ 0x8349654 - .4byte NavelRock_BasePath_B3F_MapEvents @ 0x83B4A60 - .4byte NavelRock_BasePath_B3F_MapScripts @ 0x81651F8 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 353 - .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/NavelRock_BasePath_B3F/map.json b/data/maps/NavelRock_BasePath_B3F/map.json new file mode 100644 index 000000000..c0a482b47 --- /dev/null +++ b/data/maps/NavelRock_BasePath_B3F/map.json @@ -0,0 +1,34 @@ +{ + "id": "MAP_NAVEL_ROCK_BASE_PATH_B3F", + "name": "NavelRock_BasePath_B3F", + "layout": "LAYOUT_NAVEL_ROCK_BASE_PATH_B3F", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_NAVEL_ROCK", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 2, + "y": 2, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B2F", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 4, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B4F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NavelRock_BasePath_B4F/events.inc b/data/maps/NavelRock_BasePath_B4F/events.inc deleted file mode 100644 index 359d4cf56..000000000 --- a/data/maps/NavelRock_BasePath_B4F/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -NavelRock_BasePath_B4F_MapWarps: - warp_def 4, 4, 3, 1, 557 - warp_def 2, 2, 3, 0, 559 - -NavelRock_BasePath_B4F_MapEvents:: - map_events 0x0, NavelRock_BasePath_B4F_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_BasePath_B4F/header.inc b/data/maps/NavelRock_BasePath_B4F/header.inc deleted file mode 100644 index 8ea714e88..000000000 --- a/data/maps/NavelRock_BasePath_B4F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -NavelRock_BasePath_B4F:: @ 8350490 - .4byte NavelRock_BasePath_B4F_Layout @ 0x83496DC - .4byte NavelRock_BasePath_B4F_MapEvents @ 0x83B4A84 - .4byte NavelRock_BasePath_B4F_MapScripts @ 0x81651F9 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 354 - .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/NavelRock_BasePath_B4F/map.json b/data/maps/NavelRock_BasePath_B4F/map.json new file mode 100644 index 000000000..c8ed7aa33 --- /dev/null +++ b/data/maps/NavelRock_BasePath_B4F/map.json @@ -0,0 +1,34 @@ +{ + "id": "MAP_NAVEL_ROCK_BASE_PATH_B4F", + "name": "NavelRock_BasePath_B4F", + "layout": "LAYOUT_NAVEL_ROCK_BASE_PATH_B4F", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_NAVEL_ROCK", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 4, + "y": 4, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B3F", + "dest_warp_id": 1 + }, + { + "x": 2, + "y": 2, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B5F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NavelRock_BasePath_B5F/events.inc b/data/maps/NavelRock_BasePath_B5F/events.inc deleted file mode 100644 index 1dd28d72e..000000000 --- a/data/maps/NavelRock_BasePath_B5F/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -NavelRock_BasePath_B5F_MapWarps: - warp_def 2, 2, 3, 1, 558 - warp_def 4, 4, 3, 0, 560 - -NavelRock_BasePath_B5F_MapEvents:: - map_events 0x0, NavelRock_BasePath_B5F_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_BasePath_B5F/header.inc b/data/maps/NavelRock_BasePath_B5F/header.inc deleted file mode 100644 index cceabefd2..000000000 --- a/data/maps/NavelRock_BasePath_B5F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -NavelRock_BasePath_B5F:: @ 83504AC - .4byte NavelRock_BasePath_B5F_Layout @ 0x8349764 - .4byte NavelRock_BasePath_B5F_MapEvents @ 0x83B4AA8 - .4byte NavelRock_BasePath_B5F_MapScripts @ 0x81651FA - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 355 - .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/NavelRock_BasePath_B5F/map.json b/data/maps/NavelRock_BasePath_B5F/map.json new file mode 100644 index 000000000..55c22da08 --- /dev/null +++ b/data/maps/NavelRock_BasePath_B5F/map.json @@ -0,0 +1,34 @@ +{ + "id": "MAP_NAVEL_ROCK_BASE_PATH_B5F", + "name": "NavelRock_BasePath_B5F", + "layout": "LAYOUT_NAVEL_ROCK_BASE_PATH_B5F", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_NAVEL_ROCK", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 2, + "y": 2, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B4F", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 4, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B6F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NavelRock_BasePath_B6F/events.inc b/data/maps/NavelRock_BasePath_B6F/events.inc deleted file mode 100644 index 310eae42d..000000000 --- a/data/maps/NavelRock_BasePath_B6F/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -NavelRock_BasePath_B6F_MapWarps: - warp_def 4, 4, 3, 1, 559 - warp_def 2, 2, 3, 0, 561 - -NavelRock_BasePath_B6F_MapEvents:: - map_events 0x0, NavelRock_BasePath_B6F_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_BasePath_B6F/header.inc b/data/maps/NavelRock_BasePath_B6F/header.inc deleted file mode 100644 index e2c1d0fa6..000000000 --- a/data/maps/NavelRock_BasePath_B6F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -NavelRock_BasePath_B6F:: @ 83504C8 - .4byte NavelRock_BasePath_B6F_Layout @ 0x83497EC - .4byte NavelRock_BasePath_B6F_MapEvents @ 0x83B4ACC - .4byte NavelRock_BasePath_B6F_MapScripts @ 0x81651FB - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 356 - .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/NavelRock_BasePath_B6F/map.json b/data/maps/NavelRock_BasePath_B6F/map.json new file mode 100644 index 000000000..ad441261b --- /dev/null +++ b/data/maps/NavelRock_BasePath_B6F/map.json @@ -0,0 +1,34 @@ +{ + "id": "MAP_NAVEL_ROCK_BASE_PATH_B6F", + "name": "NavelRock_BasePath_B6F", + "layout": "LAYOUT_NAVEL_ROCK_BASE_PATH_B6F", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_NAVEL_ROCK", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 4, + "y": 4, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B5F", + "dest_warp_id": 1 + }, + { + "x": 2, + "y": 2, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B7F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NavelRock_BasePath_B7F/events.inc b/data/maps/NavelRock_BasePath_B7F/events.inc deleted file mode 100644 index 7d6af60b8..000000000 --- a/data/maps/NavelRock_BasePath_B7F/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -NavelRock_BasePath_B7F_MapWarps: - warp_def 2, 2, 3, 1, 560 - warp_def 4, 4, 3, 0, 562 - -NavelRock_BasePath_B7F_MapEvents:: - map_events 0x0, NavelRock_BasePath_B7F_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_BasePath_B7F/header.inc b/data/maps/NavelRock_BasePath_B7F/header.inc deleted file mode 100644 index cfcafafb7..000000000 --- a/data/maps/NavelRock_BasePath_B7F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -NavelRock_BasePath_B7F:: @ 83504E4 - .4byte NavelRock_BasePath_B7F_Layout @ 0x8349874 - .4byte NavelRock_BasePath_B7F_MapEvents @ 0x83B4AF0 - .4byte NavelRock_BasePath_B7F_MapScripts @ 0x81651FC - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 357 - .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/NavelRock_BasePath_B7F/map.json b/data/maps/NavelRock_BasePath_B7F/map.json new file mode 100644 index 000000000..ea16d9bd0 --- /dev/null +++ b/data/maps/NavelRock_BasePath_B7F/map.json @@ -0,0 +1,34 @@ +{ + "id": "MAP_NAVEL_ROCK_BASE_PATH_B7F", + "name": "NavelRock_BasePath_B7F", + "layout": "LAYOUT_NAVEL_ROCK_BASE_PATH_B7F", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_NAVEL_ROCK", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 2, + "y": 2, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B6F", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 4, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B8F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NavelRock_BasePath_B8F/events.inc b/data/maps/NavelRock_BasePath_B8F/events.inc deleted file mode 100644 index 00004438d..000000000 --- a/data/maps/NavelRock_BasePath_B8F/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -NavelRock_BasePath_B8F_MapWarps: - warp_def 4, 4, 3, 1, 561 - warp_def 2, 2, 3, 0, 563 - -NavelRock_BasePath_B8F_MapEvents:: - map_events 0x0, NavelRock_BasePath_B8F_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_BasePath_B8F/header.inc b/data/maps/NavelRock_BasePath_B8F/header.inc deleted file mode 100644 index 5849c2805..000000000 --- a/data/maps/NavelRock_BasePath_B8F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -NavelRock_BasePath_B8F:: @ 8350500 - .4byte NavelRock_BasePath_B8F_Layout @ 0x83498FC - .4byte NavelRock_BasePath_B8F_MapEvents @ 0x83B4B14 - .4byte NavelRock_BasePath_B8F_MapScripts @ 0x81651FD - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 358 - .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/NavelRock_BasePath_B8F/map.json b/data/maps/NavelRock_BasePath_B8F/map.json new file mode 100644 index 000000000..27d4253f8 --- /dev/null +++ b/data/maps/NavelRock_BasePath_B8F/map.json @@ -0,0 +1,34 @@ +{ + "id": "MAP_NAVEL_ROCK_BASE_PATH_B8F", + "name": "NavelRock_BasePath_B8F", + "layout": "LAYOUT_NAVEL_ROCK_BASE_PATH_B8F", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_NAVEL_ROCK", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 4, + "y": 4, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B7F", + "dest_warp_id": 1 + }, + { + "x": 2, + "y": 2, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B9F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NavelRock_BasePath_B9F/events.inc b/data/maps/NavelRock_BasePath_B9F/events.inc deleted file mode 100644 index a17fa1c9e..000000000 --- a/data/maps/NavelRock_BasePath_B9F/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -NavelRock_BasePath_B9F_MapWarps: - warp_def 2, 2, 3, 1, 562 - warp_def 4, 4, 3, 0, 564 - -NavelRock_BasePath_B9F_MapEvents:: - map_events 0x0, NavelRock_BasePath_B9F_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_BasePath_B9F/header.inc b/data/maps/NavelRock_BasePath_B9F/header.inc deleted file mode 100644 index d8b3d5364..000000000 --- a/data/maps/NavelRock_BasePath_B9F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -NavelRock_BasePath_B9F:: @ 835051C - .4byte NavelRock_BasePath_B9F_Layout @ 0x8349984 - .4byte NavelRock_BasePath_B9F_MapEvents @ 0x83B4B38 - .4byte NavelRock_BasePath_B9F_MapScripts @ 0x81651FE - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 359 - .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/NavelRock_BasePath_B9F/map.json b/data/maps/NavelRock_BasePath_B9F/map.json new file mode 100644 index 000000000..fd4b0e4eb --- /dev/null +++ b/data/maps/NavelRock_BasePath_B9F/map.json @@ -0,0 +1,34 @@ +{ + "id": "MAP_NAVEL_ROCK_BASE_PATH_B9F", + "name": "NavelRock_BasePath_B9F", + "layout": "LAYOUT_NAVEL_ROCK_BASE_PATH_B9F", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_NAVEL_ROCK", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 2, + "y": 2, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B8F", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 4, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B10F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NavelRock_Exterior/events.inc b/data/maps/NavelRock_Exterior/events.inc deleted file mode 100644 index 57f0baacd..000000000 --- a/data/maps/NavelRock_Exterior/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -NavelRock_Exterior_MapWarps: - warp_def 9, 8, 3, 1, 548 - warp_def 9, 16, 3, 0, 571 - -NavelRock_Exterior_MapEvents:: - map_events 0x0, NavelRock_Exterior_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_Exterior/header.inc b/data/maps/NavelRock_Exterior/header.inc deleted file mode 100644 index 0d62b0618..000000000 --- a/data/maps/NavelRock_Exterior/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -NavelRock_Exterior:: @ 834FF88 - .4byte NavelRock_Exterior_Layout @ 0x834873C - .4byte NavelRock_Exterior_MapEvents @ 0x83B3B74 - .4byte NavelRock_Exterior_MapScripts @ 0x81646AE - .4byte NULL - .2byte BGM_FRLG_SEVII_ISLANDS - .2byte 343 - .byte 0xae, 0x00, 0x00, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/NavelRock_Exterior/map.json b/data/maps/NavelRock_Exterior/map.json new file mode 100644 index 000000000..2caf50cac --- /dev/null +++ b/data/maps/NavelRock_Exterior/map.json @@ -0,0 +1,34 @@ +{ + "id": "MAP_NAVEL_ROCK_EXTERIOR", + "name": "NavelRock_Exterior", + "layout": "LAYOUT_NAVEL_ROCK_EXTERIOR", + "music": "BGM_FRLG_SEVII_ISLANDS", + "region_map_section": "MAPSEC_NAVEL_ROCK", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 9, + "y": 8, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_1F", + "dest_warp_id": 1 + }, + { + "x": 9, + "y": 16, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_HARBOR", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NavelRock_Fork/events.inc b/data/maps/NavelRock_Fork/events.inc deleted file mode 100644 index 15b6ad4ab..000000000 --- a/data/maps/NavelRock_Fork/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -NavelRock_Fork_MapWarps: - warp_def 13, 95, 3, 1, 566 - warp_def 3, 1, 3, 0, 551 - warp_def 26, 1, 3, 0, 555 - -NavelRock_Fork_MapEvents:: - map_events 0x0, NavelRock_Fork_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_Fork/header.inc b/data/maps/NavelRock_Fork/header.inc deleted file mode 100644 index 93ab89de4..000000000 --- a/data/maps/NavelRock_Fork/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -NavelRock_Fork:: @ 835058C - .4byte NavelRock_Fork_Layout @ 0x834B9A4 - .4byte NavelRock_Fork_MapEvents @ 0x83B4BD0 - .4byte NavelRock_Fork_MapScripts @ 0x8165202 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 365 - .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/NavelRock_Fork/map.json b/data/maps/NavelRock_Fork/map.json new file mode 100644 index 000000000..8f58e4edc --- /dev/null +++ b/data/maps/NavelRock_Fork/map.json @@ -0,0 +1,41 @@ +{ + "id": "MAP_NAVEL_ROCK_FORK", + "name": "NavelRock_Fork", + "layout": "LAYOUT_NAVEL_ROCK_FORK", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_NAVEL_ROCK", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 13, + "y": 95, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_B1F", + "dest_warp_id": 1 + }, + { + "x": 3, + "y": 1, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_SUMMIT_PATH_2F", + "dest_warp_id": 0 + }, + { + "x": 26, + "y": 1, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B1F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NavelRock_Harbor/events.inc b/data/maps/NavelRock_Harbor/events.inc deleted file mode 100644 index 83b6e9b34..000000000 --- a/data/maps/NavelRock_Harbor/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -NavelRock_Harbor_EventObjects: - object_event 1, 108, 0, 8, 0, 9, 0, 0, 8, 17, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 2, 62, 0, 8, 0, 6, 0, 3, 7, 17, 0, 0, 0, 0, 0, NavelRock_Harbor_EventScript_165421, 0, 0, 0 - -NavelRock_Harbor_MapWarps: - warp_def 8, 2, 3, 1, 512 - -NavelRock_Harbor_MapEvents:: - map_events NavelRock_Harbor_EventObjects, NavelRock_Harbor_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_Harbor/header.inc b/data/maps/NavelRock_Harbor/header.inc deleted file mode 100644 index 39261ab96..000000000 --- a/data/maps/NavelRock_Harbor/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -NavelRock_Harbor:: @ 83505FC - .4byte Island_Harbor_Layout @ 0x8343FB8 - .4byte NavelRock_Harbor_MapEvents @ 0x83B4D70 - .4byte NavelRock_Harbor_MapScripts @ 0x8165420 - .4byte NULL - .2byte BGM_FRLG_SEVII_ISLANDS - .2byte 315 - .byte 0xae, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/NavelRock_Harbor/map.json b/data/maps/NavelRock_Harbor/map.json new file mode 100644 index 000000000..575542128 --- /dev/null +++ b/data/maps/NavelRock_Harbor/map.json @@ -0,0 +1,54 @@ +{ + "id": "MAP_NAVEL_ROCK_HARBOR", + "name": "NavelRock_Harbor", + "layout": "LAYOUT_ISLAND_HARBOR", + "music": "BGM_FRLG_SEVII_ISLANDS", + "region_map_section": "MAPSEC_NAVEL_ROCK", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "108", + "x": 8, + "y": 9, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "62", + "x": 8, + "y": 6, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "NavelRock_Harbor_EventScript_165421", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 8, + "y": 2, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_EXTERIOR", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NavelRock_Summit/events.inc b/data/maps/NavelRock_Summit/events.inc deleted file mode 100644 index c9092ab54..000000000 --- a/data/maps/NavelRock_Summit/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -NavelRock_Summit_EventObjects: - object_event 1, 145, 0, 9, 0, 6, 0, 0, 8, 17, 0, 0, 0, 0, 0, 0x0, 156, 0, 0 - -NavelRock_Summit_MapWarps: - warp_def 10, 18, 3, 1, 554 - -NavelRock_Summit_MapCoordEvents: - coord_event 9, 12, 3, 0, 16385, 0, 0, NavelRock_Summit_EventScript_164FFB - -NavelRock_Summit_MapBGEvents: - bg_event 9, 11, 3, 7, 0, 45, 160, 129 - -NavelRock_Summit_MapEvents:: - map_events NavelRock_Summit_EventObjects, NavelRock_Summit_MapWarps, NavelRock_Summit_MapCoordEvents, NavelRock_Summit_MapBGEvents diff --git a/data/maps/NavelRock_Summit/header.inc b/data/maps/NavelRock_Summit/header.inc deleted file mode 100644 index d49b0dc14..000000000 --- a/data/maps/NavelRock_Summit/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -NavelRock_Summit:: @ 8350394 - .4byte NavelRock_Summit_Layout @ 0x8348EB0 - .4byte NavelRock_Summit_MapEvents @ 0x83B4930 - .4byte NavelRock_Summit_MapScripts @ 0x8164F9F - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 345 - .byte 0xae, 0x00, 0x0b, 0x04, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/NavelRock_Summit/map.json b/data/maps/NavelRock_Summit/map.json new file mode 100644 index 000000000..ec65f3a26 --- /dev/null +++ b/data/maps/NavelRock_Summit/map.json @@ -0,0 +1,61 @@ +{ + "id": "MAP_NAVEL_ROCK_SUMMIT", + "name": "NavelRock_Summit", + "layout": "LAYOUT_NAVEL_ROCK_SUMMIT", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_NAVEL_ROCK", + "requires_flash": false, + "weather": "WEATHER_11", + "map_type": "MAP_TYPE_4", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "145", + "x": 9, + "y": 6, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "156" + } + ], + "warp_events": [ + { + "x": 10, + "y": 18, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_SUMMIT_PATH_5F", + "dest_warp_id": 1 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 9, + "y": 12, + "elevation": 3, + "var": "VAR_0x4001", + "var_value": 0, + "script": "NavelRock_Summit_EventScript_164FFB" + } + ], + "bg_events": [ + { + "type": "hidden_item", + "x": 9, + "y": 11, + "elevation": 3, + "item": "ITEM_SACRED_ASH", + "flag": "160", + "unknown": 129 + } + ] +} \ No newline at end of file diff --git a/data/maps/NavelRock_SummitPath_2F/events.inc b/data/maps/NavelRock_SummitPath_2F/events.inc deleted file mode 100644 index 04d5d4651..000000000 --- a/data/maps/NavelRock_SummitPath_2F/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -NavelRock_SummitPath_2F_MapWarps: - warp_def 4, 4, 3, 1, 567 - warp_def 2, 2, 3, 0, 552 - -NavelRock_SummitPath_2F_MapEvents:: - map_events 0x0, NavelRock_SummitPath_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_SummitPath_2F/header.inc b/data/maps/NavelRock_SummitPath_2F/header.inc deleted file mode 100644 index 9ae52b8ca..000000000 --- a/data/maps/NavelRock_SummitPath_2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -NavelRock_SummitPath_2F:: @ 83503CC - .4byte NavelRock_SummitPath_2F_Layout @ 0x8349324 - .4byte NavelRock_SummitPath_2F_MapEvents @ 0x83B4988 - .4byte NavelRock_SummitPath_2F_MapScripts @ 0x81651F2 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 347 - .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/NavelRock_SummitPath_2F/map.json b/data/maps/NavelRock_SummitPath_2F/map.json new file mode 100644 index 000000000..ac1dfaeee --- /dev/null +++ b/data/maps/NavelRock_SummitPath_2F/map.json @@ -0,0 +1,34 @@ +{ + "id": "MAP_NAVEL_ROCK_SUMMIT_PATH_2F", + "name": "NavelRock_SummitPath_2F", + "layout": "LAYOUT_NAVEL_ROCK_SUMMIT_PATH_2F", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_NAVEL_ROCK", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 4, + "y": 4, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_FORK", + "dest_warp_id": 1 + }, + { + "x": 2, + "y": 2, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_SUMMIT_PATH_3F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NavelRock_SummitPath_3F/events.inc b/data/maps/NavelRock_SummitPath_3F/events.inc deleted file mode 100644 index 7af26c9fa..000000000 --- a/data/maps/NavelRock_SummitPath_3F/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -NavelRock_SummitPath_3F_MapWarps: - warp_def 2, 2, 3, 1, 551 - warp_def 4, 4, 3, 0, 553 - -NavelRock_SummitPath_3F_MapEvents:: - map_events 0x0, NavelRock_SummitPath_3F_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_SummitPath_3F/header.inc b/data/maps/NavelRock_SummitPath_3F/header.inc deleted file mode 100644 index 2eb984a8a..000000000 --- a/data/maps/NavelRock_SummitPath_3F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -NavelRock_SummitPath_3F:: @ 83503E8 - .4byte NavelRock_SummitPath_3F_Layout @ 0x83493AC - .4byte NavelRock_SummitPath_3F_MapEvents @ 0x83B49AC - .4byte NavelRock_SummitPath_3F_MapScripts @ 0x81651F3 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 348 - .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/NavelRock_SummitPath_3F/map.json b/data/maps/NavelRock_SummitPath_3F/map.json new file mode 100644 index 000000000..5964d839a --- /dev/null +++ b/data/maps/NavelRock_SummitPath_3F/map.json @@ -0,0 +1,34 @@ +{ + "id": "MAP_NAVEL_ROCK_SUMMIT_PATH_3F", + "name": "NavelRock_SummitPath_3F", + "layout": "LAYOUT_NAVEL_ROCK_SUMMIT_PATH_3F", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_NAVEL_ROCK", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 2, + "y": 2, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_SUMMIT_PATH_2F", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 4, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_SUMMIT_PATH_4F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NavelRock_SummitPath_4F/events.inc b/data/maps/NavelRock_SummitPath_4F/events.inc deleted file mode 100644 index 7ed7e09f4..000000000 --- a/data/maps/NavelRock_SummitPath_4F/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -NavelRock_SummitPath_4F_MapWarps: - warp_def 4, 4, 3, 1, 552 - warp_def 2, 2, 3, 0, 554 - -NavelRock_SummitPath_4F_MapEvents:: - map_events 0x0, NavelRock_SummitPath_4F_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_SummitPath_4F/header.inc b/data/maps/NavelRock_SummitPath_4F/header.inc deleted file mode 100644 index 37baa8cf6..000000000 --- a/data/maps/NavelRock_SummitPath_4F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -NavelRock_SummitPath_4F:: @ 8350404 - .4byte NavelRock_SummitPath_4F_Layout @ 0x8349434 - .4byte NavelRock_SummitPath_4F_MapEvents @ 0x83B49D0 - .4byte NavelRock_SummitPath_4F_MapScripts @ 0x81651F4 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 349 - .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/NavelRock_SummitPath_4F/map.json b/data/maps/NavelRock_SummitPath_4F/map.json new file mode 100644 index 000000000..525326a31 --- /dev/null +++ b/data/maps/NavelRock_SummitPath_4F/map.json @@ -0,0 +1,34 @@ +{ + "id": "MAP_NAVEL_ROCK_SUMMIT_PATH_4F", + "name": "NavelRock_SummitPath_4F", + "layout": "LAYOUT_NAVEL_ROCK_SUMMIT_PATH_4F", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_NAVEL_ROCK", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 4, + "y": 4, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_SUMMIT_PATH_3F", + "dest_warp_id": 1 + }, + { + "x": 2, + "y": 2, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_SUMMIT_PATH_5F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NavelRock_SummitPath_5F/events.inc b/data/maps/NavelRock_SummitPath_5F/events.inc deleted file mode 100644 index 96882960f..000000000 --- a/data/maps/NavelRock_SummitPath_5F/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -NavelRock_SummitPath_5F_MapWarps: - warp_def 2, 2, 3, 1, 553 - warp_def 4, 4, 3, 0, 549 - -NavelRock_SummitPath_5F_MapEvents:: - map_events 0x0, NavelRock_SummitPath_5F_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_SummitPath_5F/header.inc b/data/maps/NavelRock_SummitPath_5F/header.inc deleted file mode 100644 index 88a1d0a8d..000000000 --- a/data/maps/NavelRock_SummitPath_5F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -NavelRock_SummitPath_5F:: @ 8350420 - .4byte NavelRock_SummitPath_5F_Layout @ 0x83494BC - .4byte NavelRock_SummitPath_5F_MapEvents @ 0x83B49F4 - .4byte NavelRock_SummitPath_5F_MapScripts @ 0x81651F5 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 350 - .byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/NavelRock_SummitPath_5F/map.json b/data/maps/NavelRock_SummitPath_5F/map.json new file mode 100644 index 000000000..5aeb1faa8 --- /dev/null +++ b/data/maps/NavelRock_SummitPath_5F/map.json @@ -0,0 +1,34 @@ +{ + "id": "MAP_NAVEL_ROCK_SUMMIT_PATH_5F", + "name": "NavelRock_SummitPath_5F", + "layout": "LAYOUT_NAVEL_ROCK_SUMMIT_PATH_5F", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_NAVEL_ROCK", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 2, + "y": 2, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_SUMMIT_PATH_4F", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 4, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_SUMMIT", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/OneIsland/connections.inc b/data/maps/OneIsland/connections.inc deleted file mode 100644 index edc8a5047..000000000 --- a/data/maps/OneIsland/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -OneIsland_MapConnectionsList: @ 8352934 - connection down, 0, MAP_ONE_ISLAND_TREASUREBEACH - connection right, -120, MAP_ONE_ISLAND_KINDLEROAD - -OneIsland_MapConnections:: @ 835294C - .4byte 2 - .4byte OneIsland_MapConnectionsList diff --git a/data/maps/OneIsland/events.inc b/data/maps/OneIsland/events.inc deleted file mode 100644 index 802ec6794..000000000 --- a/data/maps/OneIsland/events.inc +++ /dev/null @@ -1,17 +0,0 @@ -OneIsland_EventObjects: - object_event 1, 73, 0, 12, 0, 16, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, 113, 0, 0 - object_event 2, 32, 0, 16, 0, 12, 0, 3, 2, 17, 0, 0, 0, 0, 0, OneIsland_EventScript_167517, 0, 0, 0 - object_event 3, 30, 0, 13, 0, 9, 0, 3, 13, 17, 0, 0, 0, 0, 0, OneIsland_EventScript_167549, 0, 0, 0 - -OneIsland_MapWarps: - warp_def 14, 5, 0, 0, 8192 - warp_def 19, 9, 0, 0, 8194 - warp_def 8, 11, 0, 0, 8195 - warp_def 12, 18, 3, 0, 8196 - -OneIsland_MapBGEvents: - bg_event 14, 13, 0, 0, 0, OneIsland_EventScript_167552 - bg_event 15, 6, 0, 0, 0, OneIsland_EventScript_16755B - -OneIsland_MapEvents:: - map_events OneIsland_EventObjects, OneIsland_MapWarps, 0x0, OneIsland_MapBGEvents diff --git a/data/maps/OneIsland/header.inc b/data/maps/OneIsland/header.inc deleted file mode 100644 index a2d521727..000000000 --- a/data/maps/OneIsland/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -OneIsland:: @ 8350768 - .4byte OneIsland_Layout @ 0x8321714 - .4byte OneIsland_MapEvents @ 0x83B5F44 - .4byte OneIsland_MapScripts @ 0x8167484 - .4byte OneIsland_MapConnections @ 0x835294C - .2byte BGM_FRLG_ISLAND_ONE - .2byte 230 - .byte 0x8f, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/OneIsland/map.json b/data/maps/OneIsland/map.json new file mode 100644 index 000000000..fd8c53409 --- /dev/null +++ b/data/maps/OneIsland/map.json @@ -0,0 +1,114 @@ +{ + "id": "MAP_ONE_ISLAND", + "name": "OneIsland", + "layout": "LAYOUT_ONE_ISLAND", + "music": "BGM_FRLG_ISLAND_ONE", + "region_map_section": "MAPSEC_ONE_ISLAND", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_1", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_ONE_ISLAND_TREASURE_BEACH", + "offset": 0, + "direction": "down" + }, + { + "map": "MAP_ONE_ISLAND_KINDLE_ROAD", + "offset": -120, + "direction": "right" + } + ], + "object_events": [ + { + "graphics_id": "73", + "x": 12, + "y": 16, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "113" + }, + { + "graphics_id": "32", + "x": 16, + "y": 12, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OneIsland_EventScript_167517", + "flag": "0" + }, + { + "graphics_id": "30", + "x": 13, + "y": 9, + "elevation": 3, + "movement_type": "13", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OneIsland_EventScript_167549", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 14, + "y": 5, + "elevation": 0, + "dest_map": "MAP_ONE_ISLAND_POKEMON_CENTER_1F", + "dest_warp_id": 0 + }, + { + "x": 19, + "y": 9, + "elevation": 0, + "dest_map": "MAP_ONE_ISLAND_HOUSE1", + "dest_warp_id": 0 + }, + { + "x": 8, + "y": 11, + "elevation": 0, + "dest_map": "MAP_ONE_ISLAND_HOUSE2", + "dest_warp_id": 0 + }, + { + "x": 12, + "y": 18, + "elevation": 3, + "dest_map": "MAP_ONE_ISLAND_HARBOR", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 14, + "y": 13, + "elevation": 0, + "script": "OneIsland_EventScript_167552" + }, + { + "type": "bg_event_type_0", + "x": 15, + "y": 6, + "elevation": 0, + "script": "OneIsland_EventScript_16755B" + } + ] +} \ No newline at end of file diff --git a/data/maps/OneIsland/scripts.inc b/data/maps/OneIsland/scripts.inc index 2735d7481..70ab4ff03 100644 --- a/data/maps/OneIsland/scripts.inc +++ b/data/maps/OneIsland/scripts.inc @@ -31,7 +31,7 @@ EventScript_16749D:: @ 816749D waitdooranim removeobject 1 setvar VAR_0x4075, 3 - warp MAP_ONE_ISLAND_POKEMONCENTER_1F, 255, 9, 9 + warp MAP_ONE_ISLAND_POKEMON_CENTER_1F, 255, 9, 9 waitstate releaseall end diff --git a/data/maps/OneIsland_Harbor/events.inc b/data/maps/OneIsland_Harbor/events.inc deleted file mode 100644 index 18ac28587..000000000 --- a/data/maps/OneIsland_Harbor/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -OneIsland_Harbor_EventObjects: - object_event 1, 108, 0, 8, 0, 9, 0, 0, 8, 17, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 2, 62, 0, 8, 0, 6, 0, 3, 7, 17, 0, 0, 0, 0, 0, OneIsland_Harbor_EventScript_1713BD, 0, 0, 0 - -OneIsland_Harbor_MapWarps: - warp_def 8, 2, 3, 3, 780 - -OneIsland_Harbor_MapEvents:: - map_events OneIsland_Harbor_EventObjects, OneIsland_Harbor_MapWarps, 0x0, 0x0 diff --git a/data/maps/OneIsland_Harbor/header.inc b/data/maps/OneIsland_Harbor/header.inc deleted file mode 100644 index d98fcca3a..000000000 --- a/data/maps/OneIsland_Harbor/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -OneIsland_Harbor:: @ 8351BDC - .4byte Island_Harbor_Layout @ 0x8343FB8 - .4byte OneIsland_Harbor_MapEvents @ 0x83BE558 - .4byte OneIsland_Harbor_MapScripts @ 0x8171378 - .4byte NULL - .2byte BGM_FRLG_ISLAND_ONE - .2byte 315 - .byte 0x8f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/OneIsland_Harbor/map.json b/data/maps/OneIsland_Harbor/map.json new file mode 100644 index 000000000..3bf9f7876 --- /dev/null +++ b/data/maps/OneIsland_Harbor/map.json @@ -0,0 +1,54 @@ +{ + "id": "MAP_ONE_ISLAND_HARBOR", + "name": "OneIsland_Harbor", + "layout": "LAYOUT_ISLAND_HARBOR", + "music": "BGM_FRLG_ISLAND_ONE", + "region_map_section": "MAPSEC_ONE_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "108", + "x": 8, + "y": 9, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "62", + "x": 8, + "y": 6, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OneIsland_Harbor_EventScript_1713BD", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 8, + "y": 2, + "elevation": 3, + "dest_map": "MAP_ONE_ISLAND", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/OneIsland_House1/events.inc b/data/maps/OneIsland_House1/events.inc deleted file mode 100644 index 070680038..000000000 --- a/data/maps/OneIsland_House1/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -OneIsland_House1_EventObjects: - object_event 1, 32, 0, 4, 0, 5, 0, 3, 10, 17, 0, 0, 0, 0, 0, OneIsland_House1_EventScript_17135C, 0, 0, 0 - object_event 2, 35, 0, 7, 0, 5, 0, 3, 9, 17, 0, 0, 0, 0, 0, OneIsland_House1_EventScript_171365, 0, 0, 0 - -OneIsland_House1_MapWarps: - warp_def 4, 7, 3, 1, 780 - -OneIsland_House1_MapEvents:: - map_events OneIsland_House1_EventObjects, OneIsland_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/OneIsland_House1/header.inc b/data/maps/OneIsland_House1/header.inc deleted file mode 100644 index 7d60ff6d5..000000000 --- a/data/maps/OneIsland_House1/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -OneIsland_House1:: @ 8351BA4 - .4byte House3_Layout @ 0x82D5CB8 - .4byte OneIsland_House1_MapEvents @ 0x83BE4D8 - .4byte OneIsland_House1_MapScripts @ 0x817135B - .4byte NULL - .2byte BGM_FRLG_ISLAND_ONE - .2byte 11 - .byte 0x8f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/OneIsland_House1/map.json b/data/maps/OneIsland_House1/map.json new file mode 100644 index 000000000..dd815fcd5 --- /dev/null +++ b/data/maps/OneIsland_House1/map.json @@ -0,0 +1,54 @@ +{ + "id": "MAP_ONE_ISLAND_HOUSE1", + "name": "OneIsland_House1", + "layout": "LAYOUT_HOUSE3", + "music": "BGM_FRLG_ISLAND_ONE", + "region_map_section": "MAPSEC_ONE_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "32", + "x": 4, + "y": 5, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OneIsland_House1_EventScript_17135C", + "flag": "0" + }, + { + "graphics_id": "35", + "x": 7, + "y": 5, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OneIsland_House1_EventScript_171365", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_ONE_ISLAND", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/OneIsland_House2/events.inc b/data/maps/OneIsland_House2/events.inc deleted file mode 100644 index 948e63339..000000000 --- a/data/maps/OneIsland_House2/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -OneIsland_House2_EventObjects: - object_event 1, 22, 0, 9, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, OneIsland_House2_EventScript_17136F, 0, 0, 0 - -OneIsland_House2_MapWarps: - warp_def 4, 7, 3, 2, 780 - -OneIsland_House2_MapEvents:: - map_events OneIsland_House2_EventObjects, OneIsland_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/OneIsland_House2/header.inc b/data/maps/OneIsland_House2/header.inc deleted file mode 100644 index 0048e308d..000000000 --- a/data/maps/OneIsland_House2/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -OneIsland_House2:: @ 8351BC0 - .4byte House3_Layout @ 0x82D5CB8 - .4byte OneIsland_House2_MapEvents @ 0x83BE50C - .4byte OneIsland_House2_MapScripts @ 0x817136E - .4byte NULL - .2byte BGM_FRLG_ISLAND_ONE - .2byte 11 - .byte 0x8f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/OneIsland_House2/map.json b/data/maps/OneIsland_House2/map.json new file mode 100644 index 000000000..0013b0de3 --- /dev/null +++ b/data/maps/OneIsland_House2/map.json @@ -0,0 +1,41 @@ +{ + "id": "MAP_ONE_ISLAND_HOUSE2", + "name": "OneIsland_House2", + "layout": "LAYOUT_HOUSE3", + "music": "BGM_FRLG_ISLAND_ONE", + "region_map_section": "MAPSEC_ONE_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "22", + "x": 9, + "y": 4, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OneIsland_House2_EventScript_17136F", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_ONE_ISLAND", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/OneIsland_KindleRoad/connections.inc b/data/maps/OneIsland_KindleRoad/connections.inc deleted file mode 100644 index c4f7e4073..000000000 --- a/data/maps/OneIsland_KindleRoad/connections.inc +++ /dev/null @@ -1,6 +0,0 @@ -OneIsland_KindleRoad_MapConnectionsList: @ 8352D1C - connection left, 120, MAP_ONE_ISLAND - -OneIsland_KindleRoad_MapConnections:: @ 8352D28 - .4byte 1 - .4byte OneIsland_KindleRoad_MapConnectionsList diff --git a/data/maps/OneIsland_KindleRoad/events.inc b/data/maps/OneIsland_KindleRoad/events.inc deleted file mode 100644 index e2f7aabea..000000000 --- a/data/maps/OneIsland_KindleRoad/events.inc +++ /dev/null @@ -1,42 +0,0 @@ -OneIsland_KindleRoad_EventObjects: - object_event 1, 44, 0, 11, 0, 32, 0, 1, 14, 17, 0, 1, 0, 4, 0, OneIsland_KindleRoad_EventScript_1ABBF1, 0, 0, 0 - object_event 2, 46, 0, 17, 0, 132, 0, 3, 8, 17, 0, 1, 0, 2, 0, OneIsland_KindleRoad_EventScript_1ABC2F, 0, 0, 0 - object_event 3, 43, 0, 7, 0, 39, 0, 1, 52, 54, 0, 1, 0, 1, 0, OneIsland_KindleRoad_EventScript_1ABC6D, 0, 0, 0 - object_event 4, 45, 0, 19, 0, 79, 0, 3, 8, 17, 0, 1, 0, 1, 0, OneIsland_KindleRoad_EventScript_1ABCAB, 0, 0, 0 - object_event 5, 57, 0, 15, 0, 25, 0, 3, 9, 17, 0, 1, 0, 0, 0, OneIsland_KindleRoad_EventScript_1ABCE9, 0, 0, 0 - object_event 6, 24, 0, 9, 0, 53, 0, 3, 26, 113, 0, 1, 0, 1, 0, OneIsland_KindleRoad_EventScript_1ABD27, 0, 0, 0 - object_event 7, 24, 0, 18, 0, 105, 0, 4, 50, 65, 0, 1, 0, 1, 0, OneIsland_KindleRoad_EventScript_1ABD65, 0, 0, 0 - object_event 8, 54, 0, 16, 0, 64, 0, 3, 27, 18, 0, 1, 0, 1, 0, OneIsland_KindleRoad_EventScript_1ABDA3, 0, 0, 0 - object_event 9, 54, 0, 11, 0, 64, 0, 3, 28, 18, 0, 1, 0, 1, 0, OneIsland_KindleRoad_EventScript_1ABDE1, 0, 0, 0 - object_event 10, 39, 0, 11, 0, 89, 0, 3, 14, 17, 0, 1, 0, 3, 0, OneIsland_KindleRoad_EventScript_1ABE1F, 0, 0, 0 - object_event 11, 40, 0, 9, 0, 108, 0, 3, 1, 17, 0, 1, 0, 1, 0, OneIsland_KindleRoad_EventScript_1ABE5D, 0, 0, 0 - object_event 12, 54, 0, 8, 0, 68, 0, 3, 8, 17, 0, 1, 0, 1, 0, OneIsland_KindleRoad_EventScript_1ABEE1, 0, 0, 0 - object_event 13, 24, 0, 9, 0, 68, 0, 3, 8, 17, 0, 1, 0, 1, 0, OneIsland_KindleRoad_EventScript_1ABE9B, 0, 0, 0 - object_event 14, 96, 0, 8, 0, 104, 0, 3, 1, 17, 0, 0, 0, 0, 0, OneIsland_KindleRoad_EventScript_1BE00C, 19, 0, 0 - object_event 15, 96, 0, 11, 0, 95, 0, 3, 1, 17, 0, 0, 0, 0, 0, OneIsland_KindleRoad_EventScript_1BE00C, 21, 0, 0 - object_event 16, 96, 0, 12, 0, 96, 0, 3, 1, 17, 0, 0, 0, 0, 0, OneIsland_KindleRoad_EventScript_1BE00C, 22, 0, 0 - object_event 17, 96, 0, 10, 0, 95, 0, 3, 1, 17, 0, 0, 0, 0, 0, OneIsland_KindleRoad_EventScript_1BE00C, 23, 0, 0 - object_event 18, 96, 0, 9, 0, 105, 0, 3, 1, 17, 0, 0, 0, 0, 0, OneIsland_KindleRoad_EventScript_1BE00C, 24, 0, 0 - object_event 19, 96, 0, 15, 0, 75, 0, 3, 1, 17, 0, 0, 0, 0, 0, OneIsland_KindleRoad_EventScript_1BE00C, 25, 0, 0 - object_event 20, 96, 0, 9, 0, 84, 0, 3, 1, 17, 0, 0, 0, 0, 0, OneIsland_KindleRoad_EventScript_1BE00C, 26, 0, 0 - object_event 21, 96, 0, 15, 0, 74, 0, 3, 1, 17, 0, 0, 0, 0, 0, OneIsland_KindleRoad_EventScript_1BE00C, 27, 0, 0 - object_event 22, 96, 0, 15, 0, 73, 0, 3, 1, 17, 0, 0, 0, 0, 0, OneIsland_KindleRoad_EventScript_1BE00C, 28, 0, 0 - object_event 23, 96, 0, 18, 0, 111, 0, 4, 1, 17, 0, 0, 0, 0, 0, OneIsland_KindleRoad_EventScript_1BE00C, 29, 0, 0 - object_event 24, 96, 0, 10, 0, 86, 0, 3, 1, 17, 0, 0, 0, 0, 0, OneIsland_KindleRoad_EventScript_1BE00C, 30, 0, 0 - object_event 25, 96, 0, 9, 0, 110, 0, 3, 1, 17, 0, 0, 0, 0, 0, OneIsland_KindleRoad_EventScript_1BE00C, 31, 0, 0 - object_event 26, 96, 0, 18, 0, 112, 0, 4, 1, 17, 0, 0, 0, 0, 0, OneIsland_KindleRoad_EventScript_1BE00C, 17, 0, 0 - object_event 27, 92, 0, 15, 0, 70, 0, 3, 8, 17, 0, 0, 0, 0, 0, OneIsland_KindleRoad_EventScript_1BEC42, 475, 0, 0 - object_event 28, 92, 0, 17, 0, 103, 0, 3, 8, 17, 0, 0, 0, 0, 0, OneIsland_KindleRoad_EventScript_1BEC4F, 476, 0, 0 - object_event 29, 92, 0, 18, 0, 114, 0, 4, 8, 17, 0, 0, 0, 0, 0, OneIsland_KindleRoad_EventScript_1BEC5C, 477, 0, 0 - -OneIsland_KindleRoad_MapWarps: - warp_def 11, 6, 3, 0, 353 - warp_def 12, 6, 3, 1, 353 - warp_def 15, 58, 3, 0, 569 - -OneIsland_KindleRoad_MapBGEvents: - bg_event 13, 59, 0, 0, 0, OneIsland_KindleRoad_EventScript_168762 - bg_event 8, 115, 0, 0, 0, OneIsland_KindleRoad_EventScript_168759 - -OneIsland_KindleRoad_MapEvents:: - map_events OneIsland_KindleRoad_EventObjects, OneIsland_KindleRoad_MapWarps, 0x0, OneIsland_KindleRoad_MapBGEvents diff --git a/data/maps/OneIsland_KindleRoad/header.inc b/data/maps/OneIsland_KindleRoad/header.inc deleted file mode 100644 index 1c540ae87..000000000 --- a/data/maps/OneIsland_KindleRoad/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -OneIsland_KindleRoad:: @ 8350B04 - .4byte OneIsland_KindleRoad_Layout @ 0x8325D70 - .4byte OneIsland_KindleRoad_MapEvents @ 0x83B888C - .4byte OneIsland_KindleRoad_MapScripts @ 0x8168758 - .4byte OneIsland_KindleRoad_MapConnections @ 0x8352D28 - .2byte BGM_FRLG_ROUTE_3 - .2byte 237 - .byte 0x96, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/OneIsland_KindleRoad/map.json b/data/maps/OneIsland_KindleRoad/map.json new file mode 100644 index 000000000..375dabd15 --- /dev/null +++ b/data/maps/OneIsland_KindleRoad/map.json @@ -0,0 +1,440 @@ +{ + "id": "MAP_ONE_ISLAND_KINDLE_ROAD", + "name": "OneIsland_KindleRoad", + "layout": "LAYOUT_ONE_ISLAND_KINDLE_ROAD", + "music": "BGM_FRLG_ROUTE_3", + "region_map_section": "MAPSEC_KINDLE_ROAD", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_ONE_ISLAND", + "offset": 120, + "direction": "left" + } + ], + "object_events": [ + { + "graphics_id": "44", + "x": 11, + "y": 32, + "elevation": 1, + "movement_type": "14", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "OneIsland_KindleRoad_EventScript_1ABBF1", + "flag": "0" + }, + { + "graphics_id": "46", + "x": 17, + "y": 132, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "OneIsland_KindleRoad_EventScript_1ABC2F", + "flag": "0" + }, + { + "graphics_id": "43", + "x": 7, + "y": 39, + "elevation": 1, + "movement_type": "52", + "movement_range_x": 6, + "movement_range_y": 3, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "OneIsland_KindleRoad_EventScript_1ABC6D", + "flag": "0" + }, + { + "graphics_id": "45", + "x": 19, + "y": 79, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "OneIsland_KindleRoad_EventScript_1ABCAB", + "flag": "0" + }, + { + "graphics_id": "57", + "x": 15, + "y": 25, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "OneIsland_KindleRoad_EventScript_1ABCE9", + "flag": "0" + }, + { + "graphics_id": "24", + "x": 9, + "y": 53, + "elevation": 3, + "movement_type": "26", + "movement_range_x": 1, + "movement_range_y": 7, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "OneIsland_KindleRoad_EventScript_1ABD27", + "flag": "0" + }, + { + "graphics_id": "24", + "x": 18, + "y": 105, + "elevation": 4, + "movement_type": "50", + "movement_range_x": 1, + "movement_range_y": 4, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "OneIsland_KindleRoad_EventScript_1ABD65", + "flag": "0" + }, + { + "graphics_id": "54", + "x": 16, + "y": 64, + "elevation": 3, + "movement_type": "27", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "OneIsland_KindleRoad_EventScript_1ABDA3", + "flag": "0" + }, + { + "graphics_id": "54", + "x": 11, + "y": 64, + "elevation": 3, + "movement_type": "28", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "OneIsland_KindleRoad_EventScript_1ABDE1", + "flag": "0" + }, + { + "graphics_id": "39", + "x": 11, + "y": 89, + "elevation": 3, + "movement_type": "14", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "OneIsland_KindleRoad_EventScript_1ABE1F", + "flag": "0" + }, + { + "graphics_id": "40", + "x": 9, + "y": 108, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "OneIsland_KindleRoad_EventScript_1ABE5D", + "flag": "0" + }, + { + "graphics_id": "54", + "x": 8, + "y": 68, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "OneIsland_KindleRoad_EventScript_1ABEE1", + "flag": "0" + }, + { + "graphics_id": "24", + "x": 9, + "y": 68, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "OneIsland_KindleRoad_EventScript_1ABE9B", + "flag": "0" + }, + { + "graphics_id": "96", + "x": 8, + "y": 104, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OneIsland_KindleRoad_EventScript_1BE00C", + "flag": "19" + }, + { + "graphics_id": "96", + "x": 11, + "y": 95, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OneIsland_KindleRoad_EventScript_1BE00C", + "flag": "21" + }, + { + "graphics_id": "96", + "x": 12, + "y": 96, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OneIsland_KindleRoad_EventScript_1BE00C", + "flag": "22" + }, + { + "graphics_id": "96", + "x": 10, + "y": 95, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OneIsland_KindleRoad_EventScript_1BE00C", + "flag": "23" + }, + { + "graphics_id": "96", + "x": 9, + "y": 105, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OneIsland_KindleRoad_EventScript_1BE00C", + "flag": "24" + }, + { + "graphics_id": "96", + "x": 15, + "y": 75, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OneIsland_KindleRoad_EventScript_1BE00C", + "flag": "25" + }, + { + "graphics_id": "96", + "x": 9, + "y": 84, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OneIsland_KindleRoad_EventScript_1BE00C", + "flag": "26" + }, + { + "graphics_id": "96", + "x": 15, + "y": 74, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OneIsland_KindleRoad_EventScript_1BE00C", + "flag": "27" + }, + { + "graphics_id": "96", + "x": 15, + "y": 73, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OneIsland_KindleRoad_EventScript_1BE00C", + "flag": "28" + }, + { + "graphics_id": "96", + "x": 18, + "y": 111, + "elevation": 4, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OneIsland_KindleRoad_EventScript_1BE00C", + "flag": "29" + }, + { + "graphics_id": "96", + "x": 10, + "y": 86, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OneIsland_KindleRoad_EventScript_1BE00C", + "flag": "30" + }, + { + "graphics_id": "96", + "x": 9, + "y": 110, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OneIsland_KindleRoad_EventScript_1BE00C", + "flag": "31" + }, + { + "graphics_id": "96", + "x": 18, + "y": 112, + "elevation": 4, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OneIsland_KindleRoad_EventScript_1BE00C", + "flag": "17" + }, + { + "graphics_id": "92", + "x": 15, + "y": 70, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OneIsland_KindleRoad_EventScript_1BEC42", + "flag": "475" + }, + { + "graphics_id": "92", + "x": 17, + "y": 103, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OneIsland_KindleRoad_EventScript_1BEC4F", + "flag": "476" + }, + { + "graphics_id": "92", + "x": 18, + "y": 114, + "elevation": 4, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OneIsland_KindleRoad_EventScript_1BEC5C", + "flag": "477" + } + ], + "warp_events": [ + { + "x": 11, + "y": 6, + "elevation": 3, + "dest_map": "MAP_MT_EMBER_EXTERIOR", + "dest_warp_id": 0 + }, + { + "x": 12, + "y": 6, + "elevation": 3, + "dest_map": "MAP_MT_EMBER_EXTERIOR", + "dest_warp_id": 1 + }, + { + "x": 15, + "y": 58, + "elevation": 3, + "dest_map": "MAP_ONE_ISLAND_KINDLE_ROAD_EMBER_SPA", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 13, + "y": 59, + "elevation": 0, + "script": "OneIsland_KindleRoad_EventScript_168762" + }, + { + "type": "bg_event_type_0", + "x": 8, + "y": 115, + "elevation": 0, + "script": "OneIsland_KindleRoad_EventScript_168759" + } + ] +} \ No newline at end of file diff --git a/data/maps/OneIsland_KindleRoad_EmberSpa/events.inc b/data/maps/OneIsland_KindleRoad_EmberSpa/events.inc deleted file mode 100644 index 14906a2a9..000000000 --- a/data/maps/OneIsland_KindleRoad_EmberSpa/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -OneIsland_KindleRoad_EmberSpa_EventObjects: - object_event 1, 32, 0, 11, 0, 13, 0, 3, 8, 17, 0, 0, 0, 0, 0, OneIsland_KindleRoad_EmberSpa_EventScript_16535C, 0, 0, 0 - object_event 2, 30, 0, 15, 0, 11, 0, 3, 18, 17, 0, 0, 0, 0, 0, OneIsland_KindleRoad_EmberSpa_EventScript_165365, 0, 0, 0 - object_event 3, 54, 0, 6, 0, 8, 0, 3, 5, 18, 0, 0, 0, 0, 0, OneIsland_KindleRoad_EmberSpa_EventScript_165380, 157, 0, 0 - object_event 4, 35, 0, 20, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, OneIsland_KindleRoad_EmberSpa_EventScript_165377, 0, 0, 0 - object_event 5, 32, 0, 10, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, OneIsland_KindleRoad_EmberSpa_EventScript_165399, 0, 0, 0 - object_event 6, 30, 0, 11, 0, 20, 0, 3, 5, 17, 0, 0, 0, 0, 0, OneIsland_KindleRoad_EmberSpa_EventScript_16536E, 0, 0, 0 - -OneIsland_KindleRoad_EmberSpa_MapWarps: - warp_def 13, 36, 3, 2, 813 - -OneIsland_KindleRoad_EmberSpa_MapCoordEvents: - coord_event 13, 13, 3, 0, 16385, 0, 0, OneIsland_KindleRoad_EmberSpa_EventScript_1653CF - -OneIsland_KindleRoad_EmberSpa_MapEvents:: - map_events OneIsland_KindleRoad_EmberSpa_EventObjects, OneIsland_KindleRoad_EmberSpa_MapWarps, OneIsland_KindleRoad_EmberSpa_MapCoordEvents, 0x0 diff --git a/data/maps/OneIsland_KindleRoad_EmberSpa/header.inc b/data/maps/OneIsland_KindleRoad_EmberSpa/header.inc deleted file mode 100644 index ca4afdec0..000000000 --- a/data/maps/OneIsland_KindleRoad_EmberSpa/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -OneIsland_KindleRoad_EmberSpa:: @ 83505C4 - .4byte OneIsland_KindleRoad_EmberSpa_Layout @ 0x834EB70 - .4byte OneIsland_KindleRoad_EmberSpa_MapEvents @ 0x83B4CD8 - .4byte OneIsland_KindleRoad_EmberSpa_MapScripts @ 0x816535B - .4byte NULL - .2byte BGM_FRLG_CERULEAN_CITY - .2byte 383 - .byte 0xc3, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/OneIsland_KindleRoad_EmberSpa/map.json b/data/maps/OneIsland_KindleRoad_EmberSpa/map.json new file mode 100644 index 000000000..3045795db --- /dev/null +++ b/data/maps/OneIsland_KindleRoad_EmberSpa/map.json @@ -0,0 +1,116 @@ +{ + "id": "MAP_ONE_ISLAND_KINDLE_ROAD_EMBER_SPA", + "name": "OneIsland_KindleRoad_EmberSpa", + "layout": "LAYOUT_ONE_ISLAND_KINDLE_ROAD_EMBER_SPA", + "music": "BGM_FRLG_CERULEAN_CITY", + "region_map_section": "MAPSEC_EMBER_SPA", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "32", + "x": 11, + "y": 13, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OneIsland_KindleRoad_EmberSpa_EventScript_16535C", + "flag": "0" + }, + { + "graphics_id": "30", + "x": 15, + "y": 11, + "elevation": 3, + "movement_type": "18", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OneIsland_KindleRoad_EmberSpa_EventScript_165365", + "flag": "0" + }, + { + "graphics_id": "54", + "x": 6, + "y": 8, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OneIsland_KindleRoad_EmberSpa_EventScript_165380", + "flag": "157" + }, + { + "graphics_id": "35", + "x": 20, + "y": 7, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OneIsland_KindleRoad_EmberSpa_EventScript_165377", + "flag": "0" + }, + { + "graphics_id": "32", + "x": 10, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OneIsland_KindleRoad_EmberSpa_EventScript_165399", + "flag": "0" + }, + { + "graphics_id": "30", + "x": 11, + "y": 20, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OneIsland_KindleRoad_EmberSpa_EventScript_16536E", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 13, + "y": 36, + "elevation": 3, + "dest_map": "MAP_ONE_ISLAND_KINDLE_ROAD", + "dest_warp_id": 2 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 13, + "y": 13, + "elevation": 3, + "var": "VAR_0x4001", + "var_value": 0, + "script": "OneIsland_KindleRoad_EmberSpa_EventScript_1653CF" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/OneIsland_PokemonCenter_1F/events.inc b/data/maps/OneIsland_PokemonCenter_1F/events.inc deleted file mode 100644 index b82526e6f..000000000 --- a/data/maps/OneIsland_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,31 +0,0 @@ -OneIsland_PokemonCenter_1F_EventObjects: - object_event 1, 64, 0, 5, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, OneIsland_PokemonCenter_1F_EventScript_170E94, 0, 0, 0 - object_event 2, 73, 0, 14, 0, 6, 0, 3, 7, 17, 0, 0, 0, 0, 0, OneIsland_PokemonCenter_1F_EventScript_170E9D, 114, 0, 0 - object_event 3, 89, 0, 15, 0, 6, 0, 3, 7, 17, 0, 0, 0, 0, 0, OneIsland_PokemonCenter_1F_EventScript_170EC5, 115, 0, 0 - object_event 4, 16, 0, 6, 0, 8, 0, 3, 2, 17, 0, 0, 0, 0, 0, OneIsland_PokemonCenter_1F_EventScript_171148, 0, 0, 0 - object_event 5, 56, 0, 3, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, OneIsland_PokemonCenter_1F_EventScript_171151, 0, 0, 0 - object_event 6, 24, 0, 7, 0, 4, 0, 3, 10, 17, 0, 0, 0, 0, 0, OneIsland_PokemonCenter_1F_EventScript_17115A, 0, 0, 0 - -OneIsland_PokemonCenter_1F_MapWarps: - warp_def 9, 9, 3, 0, 780 - warp_def 1, 5, 4, 0, 8193 - -OneIsland_PokemonCenter_1F_MapCoordEvents: - coord_event 12, 6, 3, 0, 16502, 2, 0, OneIsland_PokemonCenter_1F_EventScript_1711AA - coord_event 12, 7, 3, 0, 16502, 2, 0, OneIsland_PokemonCenter_1F_EventScript_1711B6 - coord_event 12, 8, 3, 0, 16502, 2, 0, OneIsland_PokemonCenter_1F_EventScript_1711C2 - coord_event 12, 9, 3, 0, 16502, 2, 0, OneIsland_PokemonCenter_1F_EventScript_1711CE - -OneIsland_PokemonCenter_1F_MapBGEvents: - bg_event 12, 2, 0, 0, 0, OneIsland_PokemonCenter_1F_EventScript_171179 - bg_event 12, 3, 0, 0, 0, OneIsland_PokemonCenter_1F_EventScript_171179 - bg_event 12, 4, 0, 0, 0, OneIsland_PokemonCenter_1F_EventScript_171179 - bg_event 12, 5, 0, 0, 0, OneIsland_PokemonCenter_1F_EventScript_171179 - bg_event 13, 5, 0, 0, 0, OneIsland_PokemonCenter_1F_EventScript_171179 - bg_event 15, 5, 0, 0, 0, OneIsland_PokemonCenter_1F_EventScript_171179 - bg_event 14, 5, 0, 0, 0, OneIsland_PokemonCenter_1F_EventScript_171179 - bg_event 16, 5, 0, 0, 0, OneIsland_PokemonCenter_1F_EventScript_171179 - bg_event 17, 5, 0, 0, 0, OneIsland_PokemonCenter_1F_EventScript_171179 - -OneIsland_PokemonCenter_1F_MapEvents:: - map_events OneIsland_PokemonCenter_1F_EventObjects, OneIsland_PokemonCenter_1F_MapWarps, OneIsland_PokemonCenter_1F_MapCoordEvents, OneIsland_PokemonCenter_1F_MapBGEvents diff --git a/data/maps/OneIsland_PokemonCenter_1F/header.inc b/data/maps/OneIsland_PokemonCenter_1F/header.inc deleted file mode 100644 index 815f1fc82..000000000 --- a/data/maps/OneIsland_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -OneIsland_PokemonCenter_1F:: @ 8351B6C - .4byte OneIsland_PokemonCenter_1F_Layout @ 0x833A970 - .4byte OneIsland_PokemonCenter_1F_MapEvents @ 0x83BE400 - .4byte OneIsland_PokemonCenter_1F_MapScripts @ 0x8170BF8 - .4byte NULL - .2byte BGM_FRLG_POKEMON_NETWORK_CENTER - .2byte 271 - .byte 0x8f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/OneIsland_PokemonCenter_1F/map.json b/data/maps/OneIsland_PokemonCenter_1F/map.json new file mode 100644 index 000000000..ec515417d --- /dev/null +++ b/data/maps/OneIsland_PokemonCenter_1F/map.json @@ -0,0 +1,214 @@ +{ + "id": "MAP_ONE_ISLAND_POKEMON_CENTER_1F", + "name": "OneIsland_PokemonCenter_1F", + "layout": "LAYOUT_ONE_ISLAND_POKEMON_CENTER_1F", + "music": "BGM_FRLG_POKEMON_NETWORK_CENTER", + "region_map_section": "MAPSEC_ONE_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "64", + "x": 5, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OneIsland_PokemonCenter_1F_EventScript_170E94", + "flag": "0" + }, + { + "graphics_id": "73", + "x": 14, + "y": 6, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OneIsland_PokemonCenter_1F_EventScript_170E9D", + "flag": "114" + }, + { + "graphics_id": "89", + "x": 15, + "y": 6, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OneIsland_PokemonCenter_1F_EventScript_170EC5", + "flag": "115" + }, + { + "graphics_id": "16", + "x": 6, + "y": 8, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OneIsland_PokemonCenter_1F_EventScript_171148", + "flag": "0" + }, + { + "graphics_id": "56", + "x": 3, + "y": 7, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OneIsland_PokemonCenter_1F_EventScript_171151", + "flag": "0" + }, + { + "graphics_id": "24", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OneIsland_PokemonCenter_1F_EventScript_17115A", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 9, + "y": 9, + "elevation": 3, + "dest_map": "MAP_ONE_ISLAND", + "dest_warp_id": 0 + }, + { + "x": 1, + "y": 5, + "elevation": 4, + "dest_map": "MAP_ONE_ISLAND_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 12, + "y": 6, + "elevation": 3, + "var": "VAR_0x4076", + "var_value": 2, + "script": "OneIsland_PokemonCenter_1F_EventScript_1711AA" + }, + { + "type": "trigger", + "x": 12, + "y": 7, + "elevation": 3, + "var": "VAR_0x4076", + "var_value": 2, + "script": "OneIsland_PokemonCenter_1F_EventScript_1711B6" + }, + { + "type": "trigger", + "x": 12, + "y": 8, + "elevation": 3, + "var": "VAR_0x4076", + "var_value": 2, + "script": "OneIsland_PokemonCenter_1F_EventScript_1711C2" + }, + { + "type": "trigger", + "x": 12, + "y": 9, + "elevation": 3, + "var": "VAR_0x4076", + "var_value": 2, + "script": "OneIsland_PokemonCenter_1F_EventScript_1711CE" + } + ], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 12, + "y": 2, + "elevation": 0, + "script": "OneIsland_PokemonCenter_1F_EventScript_171179" + }, + { + "type": "bg_event_type_0", + "x": 12, + "y": 3, + "elevation": 0, + "script": "OneIsland_PokemonCenter_1F_EventScript_171179" + }, + { + "type": "bg_event_type_0", + "x": 12, + "y": 4, + "elevation": 0, + "script": "OneIsland_PokemonCenter_1F_EventScript_171179" + }, + { + "type": "bg_event_type_0", + "x": 12, + "y": 5, + "elevation": 0, + "script": "OneIsland_PokemonCenter_1F_EventScript_171179" + }, + { + "type": "bg_event_type_0", + "x": 13, + "y": 5, + "elevation": 0, + "script": "OneIsland_PokemonCenter_1F_EventScript_171179" + }, + { + "type": "bg_event_type_0", + "x": 15, + "y": 5, + "elevation": 0, + "script": "OneIsland_PokemonCenter_1F_EventScript_171179" + }, + { + "type": "bg_event_type_0", + "x": 14, + "y": 5, + "elevation": 0, + "script": "OneIsland_PokemonCenter_1F_EventScript_171179" + }, + { + "type": "bg_event_type_0", + "x": 16, + "y": 5, + "elevation": 0, + "script": "OneIsland_PokemonCenter_1F_EventScript_171179" + }, + { + "type": "bg_event_type_0", + "x": 17, + "y": 5, + "elevation": 0, + "script": "OneIsland_PokemonCenter_1F_EventScript_171179" + } + ] +} \ No newline at end of file diff --git a/data/maps/OneIsland_PokemonCenter_2F/events.inc b/data/maps/OneIsland_PokemonCenter_2F/events.inc deleted file mode 100644 index 2e285716f..000000000 --- a/data/maps/OneIsland_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -OneIsland_PokemonCenter_2F_EventObjects: - object_event 1, 65, 0, 6, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, OneIsland_PokemonCenter_2F_EventScript_1A8CF6, 0, 0, 0 - object_event 2, 65, 0, 2, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, OneIsland_PokemonCenter_2F_EventScript_1A8CFC, 0, 0, 0 - object_event 3, 65, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, OneIsland_PokemonCenter_2F_EventScript_1A8D02, 0, 0, 0 - object_event 4, 69, 0, 1, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, OneIsland_PokemonCenter_2F_EventScript_1BB1D2, 112, 0, 0 - -OneIsland_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 1, 8192 - warp_def 5, 1, 0, 0, 4 - warp_def 9, 1, 0, 0, 1 - -OneIsland_PokemonCenter_2F_MapEvents:: - map_events OneIsland_PokemonCenter_2F_EventObjects, OneIsland_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/OneIsland_PokemonCenter_2F/header.inc b/data/maps/OneIsland_PokemonCenter_2F/header.inc deleted file mode 100644 index d0a077901..000000000 --- a/data/maps/OneIsland_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -OneIsland_PokemonCenter_2F:: @ 8351B88 - .4byte OneIsland_PokemonCenter_2F_Layout @ 0x8344108 - .4byte OneIsland_PokemonCenter_2F_MapEvents @ 0x83BE48C - .4byte OneIsland_PokemonCenter_2F_MapScripts @ 0x8171334 - .4byte NULL - .2byte BGM_FRLG_POKEMON_NETWORK_CENTER - .2byte 316 - .byte 0x8f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/OneIsland_PokemonCenter_2F/map.json b/data/maps/OneIsland_PokemonCenter_2F/map.json new file mode 100644 index 000000000..f9f5e5c81 --- /dev/null +++ b/data/maps/OneIsland_PokemonCenter_2F/map.json @@ -0,0 +1,94 @@ +{ + "id": "MAP_ONE_ISLAND_POKEMON_CENTER_2F", + "name": "OneIsland_PokemonCenter_2F", + "layout": "LAYOUT_ONE_ISLAND_POKEMON_CENTER_2F", + "music": "BGM_FRLG_POKEMON_NETWORK_CENTER", + "region_map_section": "MAPSEC_ONE_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "65", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OneIsland_PokemonCenter_2F_EventScript_1A8CF6", + "flag": "0" + }, + { + "graphics_id": "65", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OneIsland_PokemonCenter_2F_EventScript_1A8CFC", + "flag": "0" + }, + { + "graphics_id": "65", + "x": 10, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OneIsland_PokemonCenter_2F_EventScript_1A8D02", + "flag": "0" + }, + { + "graphics_id": "69", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OneIsland_PokemonCenter_2F_EventScript_1BB1D2", + "flag": "112" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_ONE_ISLAND_POKEMON_CENTER_1F", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 1, + "elevation": 0, + "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 0, + "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/OneIsland_TreasureBeach/connections.inc b/data/maps/OneIsland_TreasureBeach/connections.inc deleted file mode 100644 index 606768f6d..000000000 --- a/data/maps/OneIsland_TreasureBeach/connections.inc +++ /dev/null @@ -1,6 +0,0 @@ -OneIsland_TreasureBeach_MapConnectionsList: @ 8352D30 - connection up, 0, MAP_ONE_ISLAND - -OneIsland_TreasureBeach_MapConnections:: @ 8352D3C - .4byte 1 - .4byte OneIsland_TreasureBeach_MapConnectionsList diff --git a/data/maps/OneIsland_TreasureBeach/events.inc b/data/maps/OneIsland_TreasureBeach/events.inc deleted file mode 100644 index 78ca6a94b..000000000 --- a/data/maps/OneIsland_TreasureBeach/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -OneIsland_TreasureBeach_EventObjects: - object_event 1, 44, 0, 8, 0, 11, 0, 1, 2, 18, 0, 1, 0, 1, 0, OneIsland_TreasureBeach_EventScript_1ABF27, 0, 0, 0 - object_event 2, 19, 0, 13, 0, 20, 0, 3, 2, 17, 0, 0, 0, 0, 0, OneIsland_TreasureBeach_EventScript_16876C, 0, 0, 0 - -OneIsland_TreasureBeach_MapBGEvents: - bg_event 8, 20, 3, 7, 0, 108, 103, 1 - bg_event 13, 27, 3, 7, 0, 108, 104, 1 - bg_event 11, 31, 3, 7, 0, 106, 105, 1 - bg_event 9, 34, 3, 7, 0, 106, 106, 1 - bg_event 15, 22, 3, 7, 0, 2, 107, 1 - bg_event 16, 33, 3, 7, 0, 2, 108, 1 - bg_event 15, 29, 3, 7, 0, 109, 109, 1 - bg_event 8, 27, 3, 7, 0, 107, 110, 1 - -OneIsland_TreasureBeach_MapEvents:: - map_events OneIsland_TreasureBeach_EventObjects, 0x0, 0x0, OneIsland_TreasureBeach_MapBGEvents diff --git a/data/maps/OneIsland_TreasureBeach/header.inc b/data/maps/OneIsland_TreasureBeach/header.inc deleted file mode 100644 index 419a99ea7..000000000 --- a/data/maps/OneIsland_TreasureBeach/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -OneIsland_TreasureBeach:: @ 8350B20 - .4byte OneIsland_TreasureBeach_Layout @ 0x8326514 - .4byte OneIsland_TreasureBeach_MapEvents @ 0x83B8930 - .4byte OneIsland_TreasureBeach_MapScripts @ 0x816876B - .4byte OneIsland_TreasureBeach_MapConnections @ 0x8352D3C - .2byte BGM_FRLG_ROUTE_3 - .2byte 238 - .byte 0x97, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/OneIsland_TreasureBeach/map.json b/data/maps/OneIsland_TreasureBeach/map.json new file mode 100644 index 000000000..4dbcb7a74 --- /dev/null +++ b/data/maps/OneIsland_TreasureBeach/map.json @@ -0,0 +1,125 @@ +{ + "id": "MAP_ONE_ISLAND_TREASURE_BEACH", + "name": "OneIsland_TreasureBeach", + "layout": "LAYOUT_ONE_ISLAND_TREASURE_BEACH", + "music": "BGM_FRLG_ROUTE_3", + "region_map_section": "MAPSEC_TREASURE_BEACH", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_ONE_ISLAND", + "offset": 0, + "direction": "up" + } + ], + "object_events": [ + { + "graphics_id": "44", + "x": 8, + "y": 11, + "elevation": 1, + "movement_type": "2", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "OneIsland_TreasureBeach_EventScript_1ABF27", + "flag": "0" + }, + { + "graphics_id": "19", + "x": 13, + "y": 20, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OneIsland_TreasureBeach_EventScript_16876C", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 8, + "y": 20, + "elevation": 3, + "item": "ITEM_STARDUST", + "flag": "103", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 13, + "y": 27, + "elevation": 3, + "item": "ITEM_STARDUST", + "flag": "104", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 11, + "y": 31, + "elevation": 3, + "item": "ITEM_PEARL", + "flag": "105", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 9, + "y": 34, + "elevation": 3, + "item": "ITEM_PEARL", + "flag": "106", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 15, + "y": 22, + "elevation": 3, + "item": "POCKET_KEY_ITEMS", + "flag": "107", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 16, + "y": 33, + "elevation": 3, + "item": "POCKET_KEY_ITEMS", + "flag": "108", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 15, + "y": 29, + "elevation": 3, + "item": "ITEM_STAR_PIECE", + "flag": "109", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 8, + "y": 27, + "elevation": 3, + "item": "ITEM_BIG_PEARL", + "flag": "110", + "unknown": 1 + } + ] +} \ No newline at end of file diff --git a/data/maps/PalletTown/connections.inc b/data/maps/PalletTown/connections.inc deleted file mode 100644 index 2a539818b..000000000 --- a/data/maps/PalletTown/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -PalletTown_MapConnectionsList: @ 8352754 - connection up, 0, MAP_ROUTE1 - connection down, 0, MAP_ROUTE21_NORTH - -PalletTown_MapConnections:: @ 835276C - .4byte 2 - .4byte PalletTown_MapConnectionsList diff --git a/data/maps/PalletTown/events.inc b/data/maps/PalletTown/events.inc deleted file mode 100644 index 9fb85293c..000000000 --- a/data/maps/PalletTown/events.inc +++ /dev/null @@ -1,24 +0,0 @@ -PalletTown_EventObjects: - object_event 1, 23, 0, 3, 0, 10, 0, 3, 2, 65, 0, 0, 0, 0, 0, PalletTown_EventScript_16575C, 0, 0, 0 - object_event 2, 27, 0, 13, 0, 17, 0, 3, 2, 38, 0, 0, 0, 0, 0, PalletTown_EventScript_16582F, 0, 0, 0 - object_event 3, 71, 0, 10, 0, 8, 0, 3, 7, 17, 0, 0, 0, 0, 0, 0x0, 44, 0, 0 - -PalletTown_MapWarps: - warp_def 6, 7, 0, 1, 1024 - warp_def 15, 7, 0, 0, 1026 - warp_def 16, 13, 0, 0, 1027 - -PalletTown_MapCoordEvents: - coord_event 12, 1, 3, 0, 16464, 0, 0, PalletTown_EventScript_1655ED - coord_event 13, 1, 3, 0, 16464, 0, 0, PalletTown_EventScript_1655F9 - coord_event 13, 2, 3, 0, 16386, 1, 0, PalletTown_EventScript_16587B - -PalletTown_MapBGEvents: - bg_event 16, 16, 0, 0, 0, PalletTown_EventScript_165838 - bg_event 4, 7, 0, 0, 0, PalletTown_EventScript_165850 - bg_event 13, 7, 0, 0, 0, PalletTown_EventScript_165859 - bg_event 9, 11, 0, 0, 0, PalletTown_EventScript_165862 - bg_event 5, 14, 0, 0, 0, PalletTown_EventScript_16586B - -PalletTown_MapEvents:: - map_events PalletTown_EventObjects, PalletTown_MapWarps, PalletTown_MapCoordEvents, PalletTown_MapBGEvents diff --git a/data/maps/PalletTown/header.inc b/data/maps/PalletTown/header.inc deleted file mode 100644 index 8d9104896..000000000 --- a/data/maps/PalletTown/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -PalletTown:: @ 8350618 - .4byte PalletTown_Layout @ 0x82DD4C0 - .4byte PalletTown_MapEvents @ 0x83B4E50 - .4byte PalletTown_MapScripts @ 0x816545A - .4byte PalletTown_MapConnections @ 0x835276C - .2byte BGM_FRLG_PALLET_TOWN - .2byte 78 - .byte 0x58, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/PalletTown/map.json b/data/maps/PalletTown/map.json new file mode 100644 index 000000000..076af662f --- /dev/null +++ b/data/maps/PalletTown/map.json @@ -0,0 +1,156 @@ +{ + "id": "MAP_PALLET_TOWN", + "name": "PalletTown", + "layout": "LAYOUT_PALLET_TOWN", + "music": "BGM_FRLG_PALLET_TOWN", + "region_map_section": "MAPSEC_PALLET_TOWN", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_1", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_ROUTE1", + "offset": 0, + "direction": "up" + }, + { + "map": "MAP_ROUTE21_NORTH", + "offset": 0, + "direction": "down" + } + ], + "object_events": [ + { + "graphics_id": "23", + "x": 3, + "y": 10, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 4, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PalletTown_EventScript_16575C", + "flag": "0" + }, + { + "graphics_id": "27", + "x": 13, + "y": 17, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 6, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PalletTown_EventScript_16582F", + "flag": "0" + }, + { + "graphics_id": "71", + "x": 10, + "y": 8, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "44" + } + ], + "warp_events": [ + { + "x": 6, + "y": 7, + "elevation": 0, + "dest_map": "MAP_PALLET_TOWN_PLAYERS_HOUSE_1F", + "dest_warp_id": 1 + }, + { + "x": 15, + "y": 7, + "elevation": 0, + "dest_map": "MAP_PALLET_TOWN_GARYS_HOUSE", + "dest_warp_id": 0 + }, + { + "x": 16, + "y": 13, + "elevation": 0, + "dest_map": "MAP_PALLET_TOWN_PROFESSOR_OAKS_LAB", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 12, + "y": 1, + "elevation": 3, + "var": "VAR_0x4050", + "var_value": 0, + "script": "PalletTown_EventScript_1655ED" + }, + { + "type": "trigger", + "x": 13, + "y": 1, + "elevation": 3, + "var": "VAR_0x4050", + "var_value": 0, + "script": "PalletTown_EventScript_1655F9" + }, + { + "type": "trigger", + "x": 13, + "y": 2, + "elevation": 3, + "var": "VAR_0x4002", + "var_value": 1, + "script": "PalletTown_EventScript_16587B" + } + ], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 16, + "y": 16, + "elevation": 0, + "script": "PalletTown_EventScript_165838" + }, + { + "type": "bg_event_type_0", + "x": 4, + "y": 7, + "elevation": 0, + "script": "PalletTown_EventScript_165850" + }, + { + "type": "bg_event_type_0", + "x": 13, + "y": 7, + "elevation": 0, + "script": "PalletTown_EventScript_165859" + }, + { + "type": "bg_event_type_0", + "x": 9, + "y": 11, + "elevation": 0, + "script": "PalletTown_EventScript_165862" + }, + { + "type": "bg_event_type_0", + "x": 5, + "y": 14, + "elevation": 0, + "script": "PalletTown_EventScript_16586B" + } + ] +} \ No newline at end of file diff --git a/data/maps/PalletTown/scripts.inc b/data/maps/PalletTown/scripts.inc index 31b4208ec..d0d4fc155 100644 --- a/data/maps/PalletTown/scripts.inc +++ b/data/maps/PalletTown/scripts.inc @@ -79,7 +79,7 @@ EventScript_1654D8:: @ 81654D8 setvar VAR_0x4055, 7 setvar VAR_0x4050, 3 setflag FLAG_0x02C - warp MAP_PALLET_TOWN_PROFESSOROAKSLAB, 255, 6, 12 + warp MAP_PALLET_TOWN_PROFESSOR_OAKS_LAB, 255, 6, 12 waitstate releaseall end @@ -230,7 +230,7 @@ EventScript_165605:: @ 8165605 setvar VAR_0x4050, 1 setflag FLAG_0x02C setflag FLAG_SPECIAL_FLAG_0x4001 - warp MAP_PALLET_TOWN_PROFESSOROAKSLAB, 255, 6, 12 + warp MAP_PALLET_TOWN_PROFESSOR_OAKS_LAB, 255, 6, 12 waitstate releaseall end diff --git a/data/maps/PalletTown_GarysHouse/events.inc b/data/maps/PalletTown_GarysHouse/events.inc deleted file mode 100644 index b6f3fdbde..000000000 --- a/data/maps/PalletTown_GarysHouse/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -PalletTown_GarysHouse_EventObjects: - object_event 1, 76, 0, 10, 0, 6, 0, 3, 2, 49, 0, 0, 0, 0, 0, PalletTown_GarysHouse_EventScript_168D56, 0, 0, 0 - object_event 2, 93, 0, 6, 0, 4, 0, 3, 8, 17, 0, 0, 0, 0, 0, PalletTown_GarysHouse_EventScript_168F63, 57, 0, 0 - -PalletTown_GarysHouse_MapWarps: - warp_def 4, 8, 3, 1, 768 - warp_def 5, 8, 3, 1, 768 - warp_def 3, 8, 3, 1, 768 - -PalletTown_GarysHouse_MapBGEvents: - bg_event 12, 1, 0, 0, 0, PalletTown_GarysHouse_EventScript_168F6C - bg_event 11, 1, 0, 0, 0, PalletTown_GarysHouse_EventScript_168F6C - bg_event 9, 1, 0, 0, 0, PalletTown_GarysHouse_EventScript_168F75 - -PalletTown_GarysHouse_MapEvents:: - map_events PalletTown_GarysHouse_EventObjects, PalletTown_GarysHouse_MapWarps, 0x0, PalletTown_GarysHouse_MapBGEvents diff --git a/data/maps/PalletTown_GarysHouse/header.inc b/data/maps/PalletTown_GarysHouse/header.inc deleted file mode 100644 index da1b1bd3e..000000000 --- a/data/maps/PalletTown_GarysHouse/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -PalletTown_GarysHouse:: @ 8350D88 - .4byte PalletTown_GarysHouse_Layout @ 0x82D5424 - .4byte PalletTown_GarysHouse_MapEvents @ 0x83B980C - .4byte PalletTown_GarysHouse_MapScripts @ 0x8168D27 - .4byte NULL - .2byte BGM_FRLG_PALLET_TOWN - .2byte 3 - .byte 0x58, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/PalletTown_GarysHouse/map.json b/data/maps/PalletTown_GarysHouse/map.json new file mode 100644 index 000000000..71b380a90 --- /dev/null +++ b/data/maps/PalletTown_GarysHouse/map.json @@ -0,0 +1,90 @@ +{ + "id": "MAP_PALLET_TOWN_GARYS_HOUSE", + "name": "PalletTown_GarysHouse", + "layout": "LAYOUT_PALLET_TOWN_GARYS_HOUSE", + "music": "BGM_FRLG_PALLET_TOWN", + "region_map_section": "MAPSEC_PALLET_TOWN", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "76", + "x": 10, + "y": 6, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 3, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PalletTown_GarysHouse_EventScript_168D56", + "flag": "0" + }, + { + "graphics_id": "93", + "x": 6, + "y": 4, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PalletTown_GarysHouse_EventScript_168F63", + "flag": "57" + } + ], + "warp_events": [ + { + "x": 4, + "y": 8, + "elevation": 3, + "dest_map": "MAP_PALLET_TOWN", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 8, + "elevation": 3, + "dest_map": "MAP_PALLET_TOWN", + "dest_warp_id": 1 + }, + { + "x": 3, + "y": 8, + "elevation": 3, + "dest_map": "MAP_PALLET_TOWN", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 12, + "y": 1, + "elevation": 0, + "script": "PalletTown_GarysHouse_EventScript_168F6C" + }, + { + "type": "bg_event_type_0", + "x": 11, + "y": 1, + "elevation": 0, + "script": "PalletTown_GarysHouse_EventScript_168F6C" + }, + { + "type": "bg_event_type_0", + "x": 9, + "y": 1, + "elevation": 0, + "script": "PalletTown_GarysHouse_EventScript_168F75" + } + ] +} \ No newline at end of file diff --git a/data/maps/PalletTown_PlayersHouse_1F/events.inc b/data/maps/PalletTown_PlayersHouse_1F/events.inc deleted file mode 100644 index 1b9cc714e..000000000 --- a/data/maps/PalletTown_PlayersHouse_1F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -PalletTown_PlayersHouse_1F_EventObjects: - object_event 1, 88, 0, 8, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, PalletTown_PlayersHouse_1F_EventScript_168C09, 0, 0, 0 - -PalletTown_PlayersHouse_1F_MapWarps: - warp_def 5, 8, 3, 0, 768 - warp_def 4, 8, 3, 0, 768 - warp_def 10, 2, 3, 0, 1025 - warp_def 3, 9, 0, 0, 768 - -PalletTown_PlayersHouse_1F_MapBGEvents: - bg_event 6, 1, 0, 0, 0, PalletTown_PlayersHouse_1F_EventScript_168C62 - -PalletTown_PlayersHouse_1F_MapEvents:: - map_events PalletTown_PlayersHouse_1F_EventObjects, PalletTown_PlayersHouse_1F_MapWarps, 0x0, PalletTown_PlayersHouse_1F_MapBGEvents diff --git a/data/maps/PalletTown_PlayersHouse_1F/header.inc b/data/maps/PalletTown_PlayersHouse_1F/header.inc deleted file mode 100644 index 16a3b2627..000000000 --- a/data/maps/PalletTown_PlayersHouse_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -PalletTown_PlayersHouse_1F:: @ 8350D50 - .4byte PalletTown_PlayersHouse_1F_Layout @ 0x82D5200 - .4byte PalletTown_PlayersHouse_1F_MapEvents @ 0x83B974C - .4byte PalletTown_PlayersHouse_1F_MapScripts @ 0x8168C08 - .4byte NULL - .2byte BGM_FRLG_PALLET_TOWN - .2byte 1 - .byte 0x58, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/PalletTown_PlayersHouse_1F/map.json b/data/maps/PalletTown_PlayersHouse_1F/map.json new file mode 100644 index 000000000..a573f0526 --- /dev/null +++ b/data/maps/PalletTown_PlayersHouse_1F/map.json @@ -0,0 +1,70 @@ +{ + "id": "MAP_PALLET_TOWN_PLAYERS_HOUSE_1F", + "name": "PalletTown_PlayersHouse_1F", + "layout": "LAYOUT_PALLET_TOWN_PLAYERS_HOUSE_1F", + "music": "BGM_FRLG_PALLET_TOWN", + "region_map_section": "MAPSEC_PALLET_TOWN", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "88", + "x": 8, + "y": 4, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PalletTown_PlayersHouse_1F_EventScript_168C09", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 5, + "y": 8, + "elevation": 3, + "dest_map": "MAP_PALLET_TOWN", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 8, + "elevation": 3, + "dest_map": "MAP_PALLET_TOWN", + "dest_warp_id": 0 + }, + { + "x": 10, + "y": 2, + "elevation": 3, + "dest_map": "MAP_PALLET_TOWN_PLAYERS_HOUSE_2F", + "dest_warp_id": 0 + }, + { + "x": 3, + "y": 9, + "elevation": 0, + "dest_map": "MAP_PALLET_TOWN", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 6, + "y": 1, + "elevation": 0, + "script": "PalletTown_PlayersHouse_1F_EventScript_168C62" + } + ] +} \ No newline at end of file diff --git a/data/maps/PalletTown_PlayersHouse_2F/events.inc b/data/maps/PalletTown_PlayersHouse_2F/events.inc deleted file mode 100644 index 7695ec797..000000000 --- a/data/maps/PalletTown_PlayersHouse_2F/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -PalletTown_PlayersHouse_2F_MapWarps: - warp_def 10, 2, 3, 2, 1024 - -PalletTown_PlayersHouse_2F_MapBGEvents: - bg_event 6, 5, 3, 0, 0, PalletTown_PlayersHouse_2F_EventScript_168CD2 - bg_event 1, 1, 0, 0, 0, PalletTown_PlayersHouse_2F_EventScript_168CE4 - bg_event 11, 1, 0, 0, 0, PalletTown_PlayersHouse_2F_EventScript_168CDB - -PalletTown_PlayersHouse_2F_MapEvents:: - map_events 0x0, PalletTown_PlayersHouse_2F_MapWarps, 0x0, PalletTown_PlayersHouse_2F_MapBGEvents diff --git a/data/maps/PalletTown_PlayersHouse_2F/header.inc b/data/maps/PalletTown_PlayersHouse_2F/header.inc deleted file mode 100644 index 8f886a89c..000000000 --- a/data/maps/PalletTown_PlayersHouse_2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -PalletTown_PlayersHouse_2F:: @ 8350D6C - .4byte PalletTown_PlayersHouse_2F_Layout @ 0x82D52FC - .4byte PalletTown_PlayersHouse_2F_MapEvents @ 0x83B978C - .4byte PalletTown_PlayersHouse_2F_MapScripts @ 0x8168CA3 - .4byte NULL - .2byte BGM_FRLG_PALLET_TOWN - .2byte 2 - .byte 0x58, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/PalletTown_PlayersHouse_2F/map.json b/data/maps/PalletTown_PlayersHouse_2F/map.json new file mode 100644 index 000000000..c9c62b631 --- /dev/null +++ b/data/maps/PalletTown_PlayersHouse_2F/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_PALLET_TOWN_PLAYERS_HOUSE_2F", + "name": "PalletTown_PlayersHouse_2F", + "layout": "LAYOUT_PALLET_TOWN_PLAYERS_HOUSE_2F", + "music": "BGM_FRLG_PALLET_TOWN", + "region_map_section": "MAPSEC_PALLET_TOWN", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 10, + "y": 2, + "elevation": 3, + "dest_map": "MAP_PALLET_TOWN_PLAYERS_HOUSE_1F", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 6, + "y": 5, + "elevation": 3, + "script": "PalletTown_PlayersHouse_2F_EventScript_168CD2" + }, + { + "type": "bg_event_type_0", + "x": 1, + "y": 1, + "elevation": 0, + "script": "PalletTown_PlayersHouse_2F_EventScript_168CE4" + }, + { + "type": "bg_event_type_0", + "x": 11, + "y": 1, + "elevation": 0, + "script": "PalletTown_PlayersHouse_2F_EventScript_168CDB" + } + ] +} \ No newline at end of file diff --git a/data/maps/PalletTown_ProfessorOaksLab/events.inc b/data/maps/PalletTown_ProfessorOaksLab/events.inc deleted file mode 100644 index 9941e265f..000000000 --- a/data/maps/PalletTown_ProfessorOaksLab/events.inc +++ /dev/null @@ -1,33 +0,0 @@ -PalletTown_ProfessorOaksLab_EventObjects: - object_event 1, 55, 0, 3, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, PalletTown_ProfessorOaksLab_EventScript_169DEE, 0, 0, 0 - object_event 2, 48, 0, 2, 0, 10, 0, 3, 3, 64, 0, 0, 0, 0, 0, PalletTown_ProfessorOaksLab_EventScript_169E46, 0, 0, 0 - object_event 3, 55, 0, 11, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, PalletTown_ProfessorOaksLab_EventScript_169E1A, 0, 0, 0 - object_event 4, 71, 0, 6, 0, 3, 0, 3, 8, 17, 0, 0, 0, 0, 0, PalletTown_ProfessorOaksLab_EventScript_169595, 43, 0, 0 - object_event 5, 92, 0, 8, 0, 4, 0, 0, 8, 17, 0, 0, 0, 0, 0, PalletTown_ProfessorOaksLab_EventScript_169BAB, 40, 0, 0 - object_event 6, 92, 0, 9, 0, 4, 0, 0, 8, 17, 0, 0, 0, 0, 0, PalletTown_ProfessorOaksLab_EventScript_169D78, 41, 0, 0 - object_event 7, 92, 0, 10, 0, 4, 0, 0, 8, 17, 0, 0, 0, 0, 0, PalletTown_ProfessorOaksLab_EventScript_169DAE, 42, 0, 0 - object_event 8, 72, 0, 5, 0, 4, 0, 3, 8, 17, 0, 0, 0, 0, 0, PalletTown_ProfessorOaksLab_EventScript_16955F, 45, 0, 0 - object_event 9, 94, 0, 4, 0, 1, 0, 0, 8, 17, 0, 0, 0, 0, 0, PalletTown_ProfessorOaksLab_EventScript_169E5F, 58, 0, 0 - object_event 10, 94, 0, 5, 0, 1, 0, 0, 8, 17, 0, 0, 0, 0, 0, PalletTown_ProfessorOaksLab_EventScript_169E5F, 58, 0, 0 - -PalletTown_ProfessorOaksLab_MapWarps: - warp_def 6, 12, 3, 2, 768 - warp_def 7, 12, 3, 2, 768 - warp_def 5, 12, 3, 2, 768 - -PalletTown_ProfessorOaksLab_MapCoordEvents: - coord_event 5, 8, 3, 0, 16469, 2, 0, PalletTown_ProfessorOaksLab_EventScript_1692C3 - coord_event 6, 8, 3, 0, 16469, 2, 0, PalletTown_ProfessorOaksLab_EventScript_1692C3 - coord_event 7, 8, 3, 0, 16469, 2, 0, PalletTown_ProfessorOaksLab_EventScript_1692C3 - coord_event 5, 8, 3, 0, 16469, 3, 0, PalletTown_ProfessorOaksLab_EventScript_1692E7 - coord_event 6, 8, 3, 0, 16469, 3, 0, PalletTown_ProfessorOaksLab_EventScript_1692F3 - coord_event 7, 8, 3, 0, 16469, 3, 0, PalletTown_ProfessorOaksLab_EventScript_1692FF - -PalletTown_ProfessorOaksLab_MapBGEvents: - bg_event 2, 1, 0, 0, 0, PalletTown_ProfessorOaksLab_EventScript_169E68 - bg_event 3, 1, 0, 0, 0, PalletTown_ProfessorOaksLab_EventScript_169E68 - bg_event 6, 1, 0, 0, 0, PalletTown_ProfessorOaksLab_EventScript_169E71 - bg_event 7, 1, 0, 0, 0, PalletTown_ProfessorOaksLab_EventScript_169E7A - -PalletTown_ProfessorOaksLab_MapEvents:: - map_events PalletTown_ProfessorOaksLab_EventObjects, PalletTown_ProfessorOaksLab_MapWarps, PalletTown_ProfessorOaksLab_MapCoordEvents, PalletTown_ProfessorOaksLab_MapBGEvents diff --git a/data/maps/PalletTown_ProfessorOaksLab/header.inc b/data/maps/PalletTown_ProfessorOaksLab/header.inc deleted file mode 100644 index 2d2667998..000000000 --- a/data/maps/PalletTown_ProfessorOaksLab/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -PalletTown_ProfessorOaksLab:: @ 8350DA4 - .4byte PalletTown_ProfessorOaksLab_Layout @ 0x82D5668 - .4byte PalletTown_ProfessorOaksLab_MapEvents @ 0x83B99B8 - .4byte PalletTown_ProfessorOaksLab_MapScripts @ 0x8168F7E - .4byte NULL - .2byte BGM_FRLG_OAK_LAB - .2byte 5 - .byte 0x58, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/PalletTown_ProfessorOaksLab/map.json b/data/maps/PalletTown_ProfessorOaksLab/map.json new file mode 100644 index 000000000..f974f7ac0 --- /dev/null +++ b/data/maps/PalletTown_ProfessorOaksLab/map.json @@ -0,0 +1,256 @@ +{ + "id": "MAP_PALLET_TOWN_PROFESSOR_OAKS_LAB", + "name": "PalletTown_ProfessorOaksLab", + "layout": "LAYOUT_PALLET_TOWN_PROFESSOR_OAKS_LAB", + "music": "BGM_FRLG_OAK_LAB", + "region_map_section": "MAPSEC_PALLET_TOWN", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "55", + "x": 3, + "y": 11, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PalletTown_ProfessorOaksLab_EventScript_169DEE", + "flag": "0" + }, + { + "graphics_id": "48", + "x": 2, + "y": 10, + "elevation": 3, + "movement_type": "3", + "movement_range_x": 0, + "movement_range_y": 4, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PalletTown_ProfessorOaksLab_EventScript_169E46", + "flag": "0" + }, + { + "graphics_id": "55", + "x": 11, + "y": 10, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PalletTown_ProfessorOaksLab_EventScript_169E1A", + "flag": "0" + }, + { + "graphics_id": "71", + "x": 6, + "y": 3, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PalletTown_ProfessorOaksLab_EventScript_169595", + "flag": "43" + }, + { + "graphics_id": "92", + "x": 8, + "y": 4, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PalletTown_ProfessorOaksLab_EventScript_169BAB", + "flag": "40" + }, + { + "graphics_id": "92", + "x": 9, + "y": 4, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PalletTown_ProfessorOaksLab_EventScript_169D78", + "flag": "41" + }, + { + "graphics_id": "92", + "x": 10, + "y": 4, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PalletTown_ProfessorOaksLab_EventScript_169DAE", + "flag": "42" + }, + { + "graphics_id": "72", + "x": 5, + "y": 4, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PalletTown_ProfessorOaksLab_EventScript_16955F", + "flag": "45" + }, + { + "graphics_id": "94", + "x": 4, + "y": 1, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PalletTown_ProfessorOaksLab_EventScript_169E5F", + "flag": "58" + }, + { + "graphics_id": "94", + "x": 5, + "y": 1, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PalletTown_ProfessorOaksLab_EventScript_169E5F", + "flag": "58" + } + ], + "warp_events": [ + { + "x": 6, + "y": 12, + "elevation": 3, + "dest_map": "MAP_PALLET_TOWN", + "dest_warp_id": 2 + }, + { + "x": 7, + "y": 12, + "elevation": 3, + "dest_map": "MAP_PALLET_TOWN", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 12, + "elevation": 3, + "dest_map": "MAP_PALLET_TOWN", + "dest_warp_id": 2 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 5, + "y": 8, + "elevation": 3, + "var": "VAR_0x4055", + "var_value": 2, + "script": "PalletTown_ProfessorOaksLab_EventScript_1692C3" + }, + { + "type": "trigger", + "x": 6, + "y": 8, + "elevation": 3, + "var": "VAR_0x4055", + "var_value": 2, + "script": "PalletTown_ProfessorOaksLab_EventScript_1692C3" + }, + { + "type": "trigger", + "x": 7, + "y": 8, + "elevation": 3, + "var": "VAR_0x4055", + "var_value": 2, + "script": "PalletTown_ProfessorOaksLab_EventScript_1692C3" + }, + { + "type": "trigger", + "x": 5, + "y": 8, + "elevation": 3, + "var": "VAR_0x4055", + "var_value": 3, + "script": "PalletTown_ProfessorOaksLab_EventScript_1692E7" + }, + { + "type": "trigger", + "x": 6, + "y": 8, + "elevation": 3, + "var": "VAR_0x4055", + "var_value": 3, + "script": "PalletTown_ProfessorOaksLab_EventScript_1692F3" + }, + { + "type": "trigger", + "x": 7, + "y": 8, + "elevation": 3, + "var": "VAR_0x4055", + "var_value": 3, + "script": "PalletTown_ProfessorOaksLab_EventScript_1692FF" + } + ], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 2, + "y": 1, + "elevation": 0, + "script": "PalletTown_ProfessorOaksLab_EventScript_169E68" + }, + { + "type": "bg_event_type_0", + "x": 3, + "y": 1, + "elevation": 0, + "script": "PalletTown_ProfessorOaksLab_EventScript_169E68" + }, + { + "type": "bg_event_type_0", + "x": 6, + "y": 1, + "elevation": 0, + "script": "PalletTown_ProfessorOaksLab_EventScript_169E71" + }, + { + "type": "bg_event_type_0", + "x": 7, + "y": 1, + "elevation": 0, + "script": "PalletTown_ProfessorOaksLab_EventScript_169E7A" + } + ] +} \ No newline at end of file diff --git a/data/maps/PewterCity/connections.inc b/data/maps/PewterCity/connections.inc deleted file mode 100644 index 52933c5ff..000000000 --- a/data/maps/PewterCity/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -PewterCity_MapConnectionsList: @ 83527A0 - connection down, 12, MAP_ROUTE2 - connection right, 10, MAP_ROUTE3 - -PewterCity_MapConnections:: @ 83527B8 - .4byte 2 - .4byte PewterCity_MapConnectionsList diff --git a/data/maps/PewterCity/events.inc b/data/maps/PewterCity/events.inc deleted file mode 100644 index c059dc865..000000000 --- a/data/maps/PewterCity/events.inc +++ /dev/null @@ -1,37 +0,0 @@ -PewterCity_EventObjects: - object_event 1, 22, 0, 6, 0, 15, 0, 3, 1, 17, 0, 0, 0, 0, 0, PewterCity_EventScript_166075, 0, 0, 0 - object_event 2, 25, 0, 33, 0, 17, 0, 3, 1, 17, 0, 0, 0, 0, 0, PewterCity_EventScript_16607E, 80, 0, 0 - object_event 3, 27, 0, 21, 0, 28, 0, 3, 8, 17, 0, 0, 0, 0, 0, PewterCity_EventScript_16622B, 0, 0, 0 - object_event 4, 20, 0, 33, 0, 27, 0, 3, 5, 18, 0, 0, 0, 0, 0, PewterCity_EventScript_166244, 0, 0, 0 - object_event 5, 19, 0, 42, 0, 20, 0, 3, 8, 17, 0, 0, 0, 0, 0, PewterCity_EventScript_165B9D, 46, 0, 0 - object_event 6, 95, 0, 30, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, PewterCity_EventScript_1BDF13, 18, 0, 0 - object_event 7, 55, 0, 46, 0, 20, 0, 3, 10, 17, 0, 0, 0, 0, 0, PewterCity_EventScript_1662A9, 146, 0, 0 - -PewterCity_MapWarps: - warp_def 17, 6, 0, 1, 1536 - warp_def 25, 4, 0, 3, 1536 - warp_def 15, 16, 0, 1, 1538 - warp_def 28, 18, 0, 1, 1539 - warp_def 33, 11, 0, 1, 1540 - warp_def 17, 25, 0, 1, 1541 - warp_def 9, 30, 0, 1, 1543 - -PewterCity_MapCoordEvents: - coord_event 42, 21, 3, 0, 16492, 0, 0, PewterCity_EventScript_165D8E - coord_event 42, 22, 3, 0, 16492, 0, 0, PewterCity_EventScript_165D9A - coord_event 42, 23, 3, 0, 16492, 0, 0, PewterCity_EventScript_165DA6 - coord_event 43, 23, 3, 0, 16492, 0, 0, PewterCity_EventScript_165DB2 - coord_event 46, 21, 3, 0, 16492, 1, 0, PewterCity_EventScript_1662B7 - coord_event 46, 22, 3, 0, 16492, 1, 0, PewterCity_EventScript_1662C4 - coord_event 46, 23, 3, 0, 16492, 1, 0, PewterCity_EventScript_1662D1 - -PewterCity_MapBGEvents: - bg_event 19, 7, 0, 0, 0, PewterCity_EventScript_16627F - bg_event 39, 19, 0, 0, 0, PewterCity_EventScript_166276 - bg_event 11, 16, 0, 0, 0, PewterCity_EventScript_166288 - bg_event 20, 30, 0, 0, 0, PewterCity_EventScript_16626D - bg_event 31, 25, 0, 0, 0, PewterCity_EventScript_1662A0 - bg_event 6, 3, 3, 7, 0, 4, 112, 1 - -PewterCity_MapEvents:: - map_events PewterCity_EventObjects, PewterCity_MapWarps, PewterCity_MapCoordEvents, PewterCity_MapBGEvents diff --git a/data/maps/PewterCity/header.inc b/data/maps/PewterCity/header.inc deleted file mode 100644 index f6f16be53..000000000 --- a/data/maps/PewterCity/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -PewterCity:: @ 8350650 - .4byte PewterCity_Layout @ 0x82DF308 - .4byte PewterCity_MapEvents @ 0x83B518C - .4byte PewterCity_MapScripts @ 0x8165B8E - .4byte PewterCity_MapConnections @ 0x83527B8 - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 80 - .byte 0x5a, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/PewterCity/map.json b/data/maps/PewterCity/map.json new file mode 100644 index 000000000..4ac852cdc --- /dev/null +++ b/data/maps/PewterCity/map.json @@ -0,0 +1,281 @@ +{ + "id": "MAP_PEWTER_CITY", + "name": "PewterCity", + "layout": "LAYOUT_PEWTER_CITY", + "music": "BGM_FRLG_VIRIDIAN_CITY", + "region_map_section": "MAPSEC_PEWTER_CITY", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_1", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_ROUTE2", + "offset": 12, + "direction": "down" + }, + { + "map": "MAP_ROUTE3", + "offset": 10, + "direction": "right" + } + ], + "object_events": [ + { + "graphics_id": "22", + "x": 6, + "y": 15, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PewterCity_EventScript_166075", + "flag": "0" + }, + { + "graphics_id": "25", + "x": 33, + "y": 17, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PewterCity_EventScript_16607E", + "flag": "80" + }, + { + "graphics_id": "27", + "x": 21, + "y": 28, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PewterCity_EventScript_16622B", + "flag": "0" + }, + { + "graphics_id": "20", + "x": 33, + "y": 27, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PewterCity_EventScript_166244", + "flag": "0" + }, + { + "graphics_id": "19", + "x": 42, + "y": 20, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PewterCity_EventScript_165B9D", + "flag": "46" + }, + { + "graphics_id": "95", + "x": 30, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PewterCity_EventScript_1BDF13", + "flag": "18" + }, + { + "graphics_id": "55", + "x": 46, + "y": 20, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PewterCity_EventScript_1662A9", + "flag": "146" + } + ], + "warp_events": [ + { + "x": 17, + "y": 6, + "elevation": 0, + "dest_map": "MAP_PEWTER_CITY_MUSEUM_1F", + "dest_warp_id": 1 + }, + { + "x": 25, + "y": 4, + "elevation": 0, + "dest_map": "MAP_PEWTER_CITY_MUSEUM_1F", + "dest_warp_id": 3 + }, + { + "x": 15, + "y": 16, + "elevation": 0, + "dest_map": "MAP_PEWTER_CITY_GYM", + "dest_warp_id": 1 + }, + { + "x": 28, + "y": 18, + "elevation": 0, + "dest_map": "MAP_PEWTER_CITY_MART", + "dest_warp_id": 1 + }, + { + "x": 33, + "y": 11, + "elevation": 0, + "dest_map": "MAP_PEWTER_CITY_HOUSE1", + "dest_warp_id": 1 + }, + { + "x": 17, + "y": 25, + "elevation": 0, + "dest_map": "MAP_PEWTER_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 1 + }, + { + "x": 9, + "y": 30, + "elevation": 0, + "dest_map": "MAP_PEWTER_CITY_HOUSE2", + "dest_warp_id": 1 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 42, + "y": 21, + "elevation": 3, + "var": "VAR_0x406C", + "var_value": 0, + "script": "PewterCity_EventScript_165D8E" + }, + { + "type": "trigger", + "x": 42, + "y": 22, + "elevation": 3, + "var": "VAR_0x406C", + "var_value": 0, + "script": "PewterCity_EventScript_165D9A" + }, + { + "type": "trigger", + "x": 42, + "y": 23, + "elevation": 3, + "var": "VAR_0x406C", + "var_value": 0, + "script": "PewterCity_EventScript_165DA6" + }, + { + "type": "trigger", + "x": 43, + "y": 23, + "elevation": 3, + "var": "VAR_0x406C", + "var_value": 0, + "script": "PewterCity_EventScript_165DB2" + }, + { + "type": "trigger", + "x": 46, + "y": 21, + "elevation": 3, + "var": "VAR_0x406C", + "var_value": 1, + "script": "PewterCity_EventScript_1662B7" + }, + { + "type": "trigger", + "x": 46, + "y": 22, + "elevation": 3, + "var": "VAR_0x406C", + "var_value": 1, + "script": "PewterCity_EventScript_1662C4" + }, + { + "type": "trigger", + "x": 46, + "y": 23, + "elevation": 3, + "var": "VAR_0x406C", + "var_value": 1, + "script": "PewterCity_EventScript_1662D1" + } + ], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 19, + "y": 7, + "elevation": 0, + "script": "PewterCity_EventScript_16627F" + }, + { + "type": "bg_event_type_0", + "x": 39, + "y": 19, + "elevation": 0, + "script": "PewterCity_EventScript_166276" + }, + { + "type": "bg_event_type_0", + "x": 11, + "y": 16, + "elevation": 0, + "script": "PewterCity_EventScript_166288" + }, + { + "type": "bg_event_type_0", + "x": 20, + "y": 30, + "elevation": 0, + "script": "PewterCity_EventScript_16626D" + }, + { + "type": "bg_event_type_0", + "x": 31, + "y": 25, + "elevation": 0, + "script": "PewterCity_EventScript_1662A0" + }, + { + "type": "hidden_item", + "x": 6, + "y": 3, + "elevation": 3, + "item": "POCKET_TM_CASE", + "flag": "112", + "unknown": 1 + } + ] +} \ No newline at end of file diff --git a/data/maps/PewterCity_Gym/events.inc b/data/maps/PewterCity_Gym/events.inc deleted file mode 100644 index 72a587cd1..000000000 --- a/data/maps/PewterCity_Gym/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -PewterCity_Gym_EventObjects: - object_event 1, 80, 0, 6, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, PewterCity_Gym_EventScript_16A593, 0, 0, 0 - object_event 2, 39, 0, 3, 0, 8, 0, 3, 10, 17, 0, 1, 0, 4, 0, PewterCity_Gym_EventScript_16A63E, 0, 0, 0 - object_event 3, 91, 0, 7, 0, 12, 0, 3, 8, 17, 0, 0, 0, 0, 0, PewterCity_Gym_EventScript_16A655, 0, 0, 0 - -PewterCity_Gym_MapWarps: - warp_def 5, 14, 3, 2, 770 - warp_def 6, 14, 3, 2, 770 - warp_def 7, 14, 3, 2, 770 - -PewterCity_Gym_MapBGEvents: - bg_event 4, 12, 0, 0, 0, PewterCity_Gym_EventScript_16A6AF - bg_event 8, 12, 0, 0, 0, PewterCity_Gym_EventScript_16A6AF - -PewterCity_Gym_MapEvents:: - map_events PewterCity_Gym_EventObjects, PewterCity_Gym_MapWarps, 0x0, PewterCity_Gym_MapBGEvents diff --git a/data/maps/PewterCity_Gym/header.inc b/data/maps/PewterCity_Gym/header.inc deleted file mode 100644 index 088aa1ab1..000000000 --- a/data/maps/PewterCity_Gym/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -PewterCity_Gym:: @ 8350EA0 - .4byte PewterCity_Gym_Layout @ 0x82D732C - .4byte PewterCity_Gym_MapEvents @ 0x83BA058 - .4byte PewterCity_Gym_MapScripts @ 0x816A592 - .4byte NULL - .2byte BGM_FRLG_GYM - .2byte 28 - .byte 0x5a, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01 diff --git a/data/maps/PewterCity_Gym/map.json b/data/maps/PewterCity_Gym/map.json new file mode 100644 index 000000000..81a12e91f --- /dev/null +++ b/data/maps/PewterCity_Gym/map.json @@ -0,0 +1,96 @@ +{ + "id": "MAP_PEWTER_CITY_GYM", + "name": "PewterCity_Gym", + "layout": "LAYOUT_PEWTER_CITY_GYM", + "music": "BGM_FRLG_GYM", + "region_map_section": "MAPSEC_PEWTER_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_1", + "connections": null, + "object_events": [ + { + "graphics_id": "80", + "x": 6, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PewterCity_Gym_EventScript_16A593", + "flag": "0" + }, + { + "graphics_id": "39", + "x": 3, + "y": 8, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "PewterCity_Gym_EventScript_16A63E", + "flag": "0" + }, + { + "graphics_id": "91", + "x": 7, + "y": 12, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PewterCity_Gym_EventScript_16A655", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 5, + "y": 14, + "elevation": 3, + "dest_map": "MAP_PEWTER_CITY", + "dest_warp_id": 2 + }, + { + "x": 6, + "y": 14, + "elevation": 3, + "dest_map": "MAP_PEWTER_CITY", + "dest_warp_id": 2 + }, + { + "x": 7, + "y": 14, + "elevation": 3, + "dest_map": "MAP_PEWTER_CITY", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 4, + "y": 12, + "elevation": 0, + "script": "PewterCity_Gym_EventScript_16A6AF" + }, + { + "type": "bg_event_type_0", + "x": 8, + "y": 12, + "elevation": 0, + "script": "PewterCity_Gym_EventScript_16A6AF" + } + ] +} \ No newline at end of file diff --git a/data/maps/PewterCity_House1/events.inc b/data/maps/PewterCity_House1/events.inc deleted file mode 100644 index 04f6bff20..000000000 --- a/data/maps/PewterCity_House1/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -PewterCity_House1_EventObjects: - object_event 1, 30, 0, 1, 0, 2, 0, 3, 7, 17, 0, 0, 0, 0, 0, PewterCity_House1_EventScript_16A71D, 0, 0, 0 - object_event 2, 16, 0, 5, 0, 3, 0, 3, 10, 17, 0, 0, 0, 0, 0, PewterCity_House1_EventScript_16A726, 0, 0, 0 - object_event 3, 123, 0, 6, 0, 3, 0, 3, 9, 17, 0, 0, 0, 0, 0, PewterCity_House1_EventScript_16A736, 0, 0, 0 - -PewterCity_House1_MapWarps: - warp_def 3, 7, 0, 4, 770 - warp_def 4, 7, 0, 4, 770 - warp_def 5, 7, 0, 4, 770 - -PewterCity_House1_MapEvents:: - map_events PewterCity_House1_EventObjects, PewterCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/PewterCity_House1/header.inc b/data/maps/PewterCity_House1/header.inc deleted file mode 100644 index 933c38e45..000000000 --- a/data/maps/PewterCity_House1/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -PewterCity_House1:: @ 8350ED8 - .4byte House2_Layout @ 0x82D5840 - .4byte PewterCity_House1_MapEvents @ 0x83BA140 - .4byte PewterCity_House1_MapScripts @ 0x816A71C - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 7 - .byte 0x5a, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/PewterCity_House1/map.json b/data/maps/PewterCity_House1/map.json new file mode 100644 index 000000000..941fb3805 --- /dev/null +++ b/data/maps/PewterCity_House1/map.json @@ -0,0 +1,81 @@ +{ + "id": "MAP_PEWTER_CITY_HOUSE1", + "name": "PewterCity_House1", + "layout": "LAYOUT_HOUSE2", + "music": "BGM_FRLG_VIRIDIAN_CITY", + "region_map_section": "MAPSEC_PEWTER_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "30", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PewterCity_House1_EventScript_16A71D", + "flag": "0" + }, + { + "graphics_id": "16", + "x": 5, + "y": 3, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PewterCity_House1_EventScript_16A726", + "flag": "0" + }, + { + "graphics_id": "123", + "x": 6, + "y": 3, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PewterCity_House1_EventScript_16A736", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_PEWTER_CITY", + "dest_warp_id": 4 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_PEWTER_CITY", + "dest_warp_id": 4 + }, + { + "x": 5, + "y": 7, + "elevation": 0, + "dest_map": "MAP_PEWTER_CITY", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/PewterCity_House2/events.inc b/data/maps/PewterCity_House2/events.inc deleted file mode 100644 index 1c02eceb8..000000000 --- a/data/maps/PewterCity_House2/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -PewterCity_House2_EventObjects: - object_event 1, 32, 0, 3, 0, 3, 0, 3, 10, 17, 0, 0, 0, 0, 0, PewterCity_House2_EventScript_16A7DD, 0, 0, 0 - object_event 2, 16, 0, 5, 0, 3, 0, 3, 13, 17, 0, 0, 0, 0, 0, PewterCity_House2_EventScript_16A7E6, 0, 0, 0 - -PewterCity_House2_MapWarps: - warp_def 3, 7, 0, 6, 770 - warp_def 4, 7, 0, 6, 770 - warp_def 5, 7, 0, 6, 770 - -PewterCity_House2_MapEvents:: - map_events PewterCity_House2_EventObjects, PewterCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/PewterCity_House2/header.inc b/data/maps/PewterCity_House2/header.inc deleted file mode 100644 index af76d49ff..000000000 --- a/data/maps/PewterCity_House2/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -PewterCity_House2:: @ 8350F2C - .4byte House2_Layout @ 0x82D5840 - .4byte PewterCity_House2_MapEvents @ 0x83BA304 - .4byte PewterCity_House2_MapScripts @ 0x816A7DC - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 7 - .byte 0x5a, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/PewterCity_House2/map.json b/data/maps/PewterCity_House2/map.json new file mode 100644 index 000000000..8b60f9557 --- /dev/null +++ b/data/maps/PewterCity_House2/map.json @@ -0,0 +1,68 @@ +{ + "id": "MAP_PEWTER_CITY_HOUSE2", + "name": "PewterCity_House2", + "layout": "LAYOUT_HOUSE2", + "music": "BGM_FRLG_VIRIDIAN_CITY", + "region_map_section": "MAPSEC_PEWTER_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "32", + "x": 3, + "y": 3, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PewterCity_House2_EventScript_16A7DD", + "flag": "0" + }, + { + "graphics_id": "16", + "x": 5, + "y": 3, + "elevation": 3, + "movement_type": "13", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PewterCity_House2_EventScript_16A7E6", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_PEWTER_CITY", + "dest_warp_id": 6 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_PEWTER_CITY", + "dest_warp_id": 6 + }, + { + "x": 5, + "y": 7, + "elevation": 0, + "dest_map": "MAP_PEWTER_CITY", + "dest_warp_id": 6 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/PewterCity_Mart/events.inc b/data/maps/PewterCity_Mart/events.inc deleted file mode 100644 index 4d39a67d9..000000000 --- a/data/maps/PewterCity_Mart/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -PewterCity_Mart_EventObjects: - object_event 1, 18, 0, 8, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0, 0, PewterCity_Mart_EventScript_16A6CE, 0, 0, 0 - object_event 2, 19, 0, 6, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, PewterCity_Mart_EventScript_16A6D7, 0, 0, 0 - object_event 3, 68, 0, 2, 0, 3, 0, 0, 10, 17, 0, 0, 0, 0, 0, PewterCity_Mart_EventScript_16A6E0, 0, 0, 0 - -PewterCity_Mart_MapWarps: - warp_def 3, 7, 3, 3, 770 - warp_def 4, 7, 3, 3, 770 - warp_def 5, 7, 3, 3, 770 - -PewterCity_Mart_MapEvents:: - map_events PewterCity_Mart_EventObjects, PewterCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/PewterCity_Mart/header.inc b/data/maps/PewterCity_Mart/header.inc deleted file mode 100644 index 2cd4eccad..000000000 --- a/data/maps/PewterCity_Mart/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -PewterCity_Mart:: @ 8350EBC - .4byte Mart_Layout @ 0x82D5BCC - .4byte PewterCity_Mart_MapEvents @ 0x83BA0CC - .4byte PewterCity_Mart_MapScripts @ 0x816A6CD - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 10 - .byte 0x5a, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/PewterCity_Mart/map.json b/data/maps/PewterCity_Mart/map.json new file mode 100644 index 000000000..7c7f2a616 --- /dev/null +++ b/data/maps/PewterCity_Mart/map.json @@ -0,0 +1,81 @@ +{ + "id": "MAP_PEWTER_CITY_MART", + "name": "PewterCity_Mart", + "layout": "LAYOUT_MART", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_PEWTER_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "18", + "x": 8, + "y": 2, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PewterCity_Mart_EventScript_16A6CE", + "flag": "0" + }, + { + "graphics_id": "19", + "x": 6, + "y": 4, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PewterCity_Mart_EventScript_16A6D7", + "flag": "0" + }, + { + "graphics_id": "68", + "x": 2, + "y": 3, + "elevation": 0, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PewterCity_Mart_EventScript_16A6E0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 3, + "dest_map": "MAP_PEWTER_CITY", + "dest_warp_id": 3 + }, + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_PEWTER_CITY", + "dest_warp_id": 3 + }, + { + "x": 5, + "y": 7, + "elevation": 3, + "dest_map": "MAP_PEWTER_CITY", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/PewterCity_Museum_1F/events.inc b/data/maps/PewterCity_Museum_1F/events.inc deleted file mode 100644 index ff58a1c0c..000000000 --- a/data/maps/PewterCity_Museum_1F/events.inc +++ /dev/null @@ -1,29 +0,0 @@ -PewterCity_Museum_1F_EventObjects: - object_event 1, 47, 0, 16, 0, 5, 0, 3, 9, 17, 0, 0, 0, 0, 0, PewterCity_Museum_1F_EventScript_16A31B, 0, 0, 0 - object_event 2, 32, 0, 2, 0, 4, 0, 3, 10, 17, 0, 0, 0, 0, 0, PewterCity_Museum_1F_EventScript_16A4A5, 0, 0, 0 - object_event 3, 55, 0, 21, 0, 3, 0, 3, 8, 17, 0, 0, 0, 0, 0, PewterCity_Museum_1F_EventScript_16A4AE, 0, 0, 0 - object_event 4, 101, 0, 22, 0, 3, 0, 0, 8, 17, 0, 0, 0, 0, 0, PewterCity_Museum_1F_EventScript_16A509, 86, 0, 0 - object_event 5, 55, 0, 26, 0, 4, 0, 3, 10, 17, 0, 0, 0, 0, 0, PewterCity_Museum_1F_EventScript_16A49C, 0, 0, 0 - object_event 6, 55, 0, 26, 0, 7, 0, 3, 10, 17, 0, 0, 0, 0, 0, PewterCity_Museum_1F_EventScript_1C4BBE, 0, 0, 0 - -PewterCity_Museum_1F_MapWarps: - warp_def 13, 9, 3, 0, 770 - warp_def 14, 9, 3, 0, 770 - warp_def 15, 9, 3, 0, 770 - warp_def 21, 9, 3, 1, 770 - warp_def 22, 9, 3, 1, 770 - warp_def 8, 8, 3, 0, 1537 - -PewterCity_Museum_1F_MapCoordEvents: - coord_event 12, 5, 3, 0, 16481, 0, 0, PewterCity_Museum_1F_EventScript_16A38F - coord_event 13, 5, 3, 0, 16481, 0, 0, PewterCity_Museum_1F_EventScript_16A3A5 - coord_event 14, 5, 3, 0, 16481, 0, 0, PewterCity_Museum_1F_EventScript_16A3BB - -PewterCity_Museum_1F_MapBGEvents: - bg_event 4, 4, 0, 0, 0, PewterCity_Museum_1F_EventScript_16A512 - bg_event 4, 7, 0, 0, 0, PewterCity_Museum_1F_EventScript_16A532 - bg_event 27, 1, 0, 1, 0, PewterCity_Museum_1F_EventScript_1ACE1C - bg_event 26, 1, 0, 1, 0, PewterCity_Museum_1F_EventScript_1ACE1C - -PewterCity_Museum_1F_MapEvents:: - map_events PewterCity_Museum_1F_EventObjects, PewterCity_Museum_1F_MapWarps, PewterCity_Museum_1F_MapCoordEvents, PewterCity_Museum_1F_MapBGEvents diff --git a/data/maps/PewterCity_Museum_1F/header.inc b/data/maps/PewterCity_Museum_1F/header.inc deleted file mode 100644 index b2ae946ec..000000000 --- a/data/maps/PewterCity_Museum_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -PewterCity_Museum_1F:: @ 8350E68 - .4byte PewterCity_Museum_1F_Layout @ 0x831A1FC - .4byte PewterCity_Museum_1F_MapEvents @ 0x83B9ED8 - .4byte PewterCity_Museum_1F_MapScripts @ 0x816A31A - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 180 - .byte 0x5a, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/PewterCity_Museum_1F/map.json b/data/maps/PewterCity_Museum_1F/map.json new file mode 100644 index 000000000..bfa941559 --- /dev/null +++ b/data/maps/PewterCity_Museum_1F/map.json @@ -0,0 +1,198 @@ +{ + "id": "MAP_PEWTER_CITY_MUSEUM_1F", + "name": "PewterCity_Museum_1F", + "layout": "LAYOUT_PEWTER_CITY_MUSEUM_1F", + "music": "BGM_FRLG_VIRIDIAN_CITY", + "region_map_section": "MAPSEC_PEWTER_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "47", + "x": 16, + "y": 5, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PewterCity_Museum_1F_EventScript_16A31B", + "flag": "0" + }, + { + "graphics_id": "32", + "x": 2, + "y": 4, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PewterCity_Museum_1F_EventScript_16A4A5", + "flag": "0" + }, + { + "graphics_id": "55", + "x": 21, + "y": 3, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PewterCity_Museum_1F_EventScript_16A4AE", + "flag": "0" + }, + { + "graphics_id": "101", + "x": 22, + "y": 3, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PewterCity_Museum_1F_EventScript_16A509", + "flag": "86" + }, + { + "graphics_id": "55", + "x": 26, + "y": 4, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PewterCity_Museum_1F_EventScript_16A49C", + "flag": "0" + }, + { + "graphics_id": "55", + "x": 26, + "y": 7, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PewterCity_Museum_1F_EventScript_1C4BBE", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 13, + "y": 9, + "elevation": 3, + "dest_map": "MAP_PEWTER_CITY", + "dest_warp_id": 0 + }, + { + "x": 14, + "y": 9, + "elevation": 3, + "dest_map": "MAP_PEWTER_CITY", + "dest_warp_id": 0 + }, + { + "x": 15, + "y": 9, + "elevation": 3, + "dest_map": "MAP_PEWTER_CITY", + "dest_warp_id": 0 + }, + { + "x": 21, + "y": 9, + "elevation": 3, + "dest_map": "MAP_PEWTER_CITY", + "dest_warp_id": 1 + }, + { + "x": 22, + "y": 9, + "elevation": 3, + "dest_map": "MAP_PEWTER_CITY", + "dest_warp_id": 1 + }, + { + "x": 8, + "y": 8, + "elevation": 3, + "dest_map": "MAP_PEWTER_CITY_MUSEUM_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 12, + "y": 5, + "elevation": 3, + "var": "VAR_0x4061", + "var_value": 0, + "script": "PewterCity_Museum_1F_EventScript_16A38F" + }, + { + "type": "trigger", + "x": 13, + "y": 5, + "elevation": 3, + "var": "VAR_0x4061", + "var_value": 0, + "script": "PewterCity_Museum_1F_EventScript_16A3A5" + }, + { + "type": "trigger", + "x": 14, + "y": 5, + "elevation": 3, + "var": "VAR_0x4061", + "var_value": 0, + "script": "PewterCity_Museum_1F_EventScript_16A3BB" + } + ], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 4, + "y": 4, + "elevation": 0, + "script": "PewterCity_Museum_1F_EventScript_16A512" + }, + { + "type": "bg_event_type_0", + "x": 4, + "y": 7, + "elevation": 0, + "script": "PewterCity_Museum_1F_EventScript_16A532" + }, + { + "type": "bg_event_type_1", + "x": 27, + "y": 1, + "elevation": 0, + "script": "PewterCity_Museum_1F_EventScript_1ACE1C" + }, + { + "type": "bg_event_type_1", + "x": 26, + "y": 1, + "elevation": 0, + "script": "PewterCity_Museum_1F_EventScript_1ACE1C" + } + ] +} \ No newline at end of file diff --git a/data/maps/PewterCity_Museum_2F/events.inc b/data/maps/PewterCity_Museum_2F/events.inc deleted file mode 100644 index 45bc62846..000000000 --- a/data/maps/PewterCity_Museum_2F/events.inc +++ /dev/null @@ -1,22 +0,0 @@ -PewterCity_Museum_2F_EventObjects: - object_event 1, 55, 0, 10, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, PewterCity_Museum_2F_EventScript_16A565, 0, 0, 0 - object_event 2, 25, 0, 4, 0, 9, 0, 3, 5, 19, 0, 0, 0, 0, 0, PewterCity_Museum_2F_EventScript_16A553, 0, 0, 0 - object_event 3, 33, 0, 0, 0, 6, 0, 3, 1, 19, 0, 0, 0, 0, 0, PewterCity_Museum_2F_EventScript_16A55C, 0, 0, 0 - object_event 4, 17, 0, 15, 0, 8, 0, 3, 10, 17, 0, 0, 0, 0, 0, PewterCity_Museum_2F_EventScript_16A56E, 0, 0, 0 - object_event 5, 30, 0, 16, 0, 8, 0, 3, 8, 17, 0, 0, 0, 0, 0, PewterCity_Museum_2F_EventScript_16A577, 0, 0, 0 - -PewterCity_Museum_2F_MapWarps: - warp_def 11, 8, 3, 5, 1536 - -PewterCity_Museum_2F_MapBGEvents: - bg_event 3, 6, 0, 0, 0, PewterCity_Museum_2F_EventScript_16A589 - bg_event 15, 5, 0, 0, 0, PewterCity_Museum_2F_EventScript_16A580 - bg_event 14, 5, 0, 0, 0, PewterCity_Museum_2F_EventScript_16A580 - bg_event 16, 5, 0, 0, 0, PewterCity_Museum_2F_EventScript_16A580 - bg_event 14, 4, 0, 0, 0, PewterCity_Museum_2F_EventScript_16A580 - bg_event 15, 4, 0, 0, 0, PewterCity_Museum_2F_EventScript_16A580 - bg_event 16, 4, 0, 0, 0, PewterCity_Museum_2F_EventScript_16A580 - bg_event 3, 5, 0, 0, 0, PewterCity_Museum_2F_EventScript_16A589 - -PewterCity_Museum_2F_MapEvents:: - map_events PewterCity_Museum_2F_EventObjects, PewterCity_Museum_2F_MapWarps, 0x0, PewterCity_Museum_2F_MapBGEvents diff --git a/data/maps/PewterCity_Museum_2F/header.inc b/data/maps/PewterCity_Museum_2F/header.inc deleted file mode 100644 index d62dc30e1..000000000 --- a/data/maps/PewterCity_Museum_2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -PewterCity_Museum_2F:: @ 8350E84 - .4byte PewterCity_Museum_2F_Layout @ 0x831A39C - .4byte PewterCity_Museum_2F_MapEvents @ 0x83B9FCC - .4byte PewterCity_Museum_2F_MapScripts @ 0x816A552 - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 181 - .byte 0x5a, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/PewterCity_Museum_2F/map.json b/data/maps/PewterCity_Museum_2F/map.json new file mode 100644 index 000000000..fc75fdbd7 --- /dev/null +++ b/data/maps/PewterCity_Museum_2F/map.json @@ -0,0 +1,150 @@ +{ + "id": "MAP_PEWTER_CITY_MUSEUM_2F", + "name": "PewterCity_Museum_2F", + "layout": "LAYOUT_PEWTER_CITY_MUSEUM_2F", + "music": "BGM_FRLG_VIRIDIAN_CITY", + "region_map_section": "MAPSEC_PEWTER_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "55", + "x": 10, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PewterCity_Museum_2F_EventScript_16A565", + "flag": "0" + }, + { + "graphics_id": "25", + "x": 4, + "y": 9, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 3, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PewterCity_Museum_2F_EventScript_16A553", + "flag": "0" + }, + { + "graphics_id": "33", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 3, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PewterCity_Museum_2F_EventScript_16A55C", + "flag": "0" + }, + { + "graphics_id": "17", + "x": 15, + "y": 8, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PewterCity_Museum_2F_EventScript_16A56E", + "flag": "0" + }, + { + "graphics_id": "30", + "x": 16, + "y": 8, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PewterCity_Museum_2F_EventScript_16A577", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 11, + "y": 8, + "elevation": 3, + "dest_map": "MAP_PEWTER_CITY_MUSEUM_1F", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 3, + "y": 6, + "elevation": 0, + "script": "PewterCity_Museum_2F_EventScript_16A589" + }, + { + "type": "bg_event_type_0", + "x": 15, + "y": 5, + "elevation": 0, + "script": "PewterCity_Museum_2F_EventScript_16A580" + }, + { + "type": "bg_event_type_0", + "x": 14, + "y": 5, + "elevation": 0, + "script": "PewterCity_Museum_2F_EventScript_16A580" + }, + { + "type": "bg_event_type_0", + "x": 16, + "y": 5, + "elevation": 0, + "script": "PewterCity_Museum_2F_EventScript_16A580" + }, + { + "type": "bg_event_type_0", + "x": 14, + "y": 4, + "elevation": 0, + "script": "PewterCity_Museum_2F_EventScript_16A580" + }, + { + "type": "bg_event_type_0", + "x": 15, + "y": 4, + "elevation": 0, + "script": "PewterCity_Museum_2F_EventScript_16A580" + }, + { + "type": "bg_event_type_0", + "x": 16, + "y": 4, + "elevation": 0, + "script": "PewterCity_Museum_2F_EventScript_16A580" + }, + { + "type": "bg_event_type_0", + "x": 3, + "y": 5, + "elevation": 0, + "script": "PewterCity_Museum_2F_EventScript_16A589" + } + ] +} \ No newline at end of file diff --git a/data/maps/PewterCity_PokemonCenter_1F/events.inc b/data/maps/PewterCity_PokemonCenter_1F/events.inc deleted file mode 100644 index efeff4714..000000000 --- a/data/maps/PewterCity_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,17 +0,0 @@ -PewterCity_PokemonCenter_1F_EventObjects: - object_event 1, 115, 0, 2, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, PewterCity_PokemonCenter_1F_EventScript_16A781, 0, 0, 0 - object_event 2, 61, 0, 4, 0, 8, 0, 3, 14, 17, 0, 0, 0, 0, 0, PewterCity_PokemonCenter_1F_EventScript_16A778, 0, 0, 0 - object_event 3, 64, 0, 7, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, PewterCity_PokemonCenter_1F_EventScript_16A76F, 0, 0, 0 - object_event 4, 18, 0, 1, 0, 2, 0, 3, 10, 17, 0, 0, 0, 0, 0, PewterCity_PokemonCenter_1F_EventScript_16A798, 0, 0, 0 - object_event 5, 23, 0, 13, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, PewterCity_PokemonCenter_1F_EventScript_1BEE16, 0, 0, 0 - object_event 6, 51, 0, 10, 0, 7, 0, 3, 10, 17, 0, 0, 0, 0, 0, PewterCity_PokemonCenter_1F_EventScript_16A7A1, 0, 0, 0 - object_event 7, 51, 0, 14, 0, 6, 0, 3, 9, 17, 0, 0, 0, 0, 0, PewterCity_PokemonCenter_1F_EventScript_16A7AC, 0, 0, 0 - -PewterCity_PokemonCenter_1F_MapWarps: - warp_def 6, 8, 0, 5, 770 - warp_def 7, 8, 3, 5, 770 - warp_def 8, 8, 0, 5, 770 - warp_def 1, 6, 4, 0, 1542 - -PewterCity_PokemonCenter_1F_MapEvents:: - map_events PewterCity_PokemonCenter_1F_EventObjects, PewterCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/PewterCity_PokemonCenter_1F/header.inc b/data/maps/PewterCity_PokemonCenter_1F/header.inc deleted file mode 100644 index 9270308b7..000000000 --- a/data/maps/PewterCity_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -PewterCity_PokemonCenter_1F:: @ 8350EF4 - .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte PewterCity_PokemonCenter_1F_MapEvents @ 0x83BA21C - .4byte PewterCity_PokemonCenter_1F_MapScripts @ 0x816A760 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 8 - .byte 0x5a, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/PewterCity_PokemonCenter_1F/map.json b/data/maps/PewterCity_PokemonCenter_1F/map.json new file mode 100644 index 000000000..fd244b488 --- /dev/null +++ b/data/maps/PewterCity_PokemonCenter_1F/map.json @@ -0,0 +1,140 @@ +{ + "id": "MAP_PEWTER_CITY_POKEMON_CENTER_1F", + "name": "PewterCity_PokemonCenter_1F", + "layout": "LAYOUT_POKEMON_CENTER_1F", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_PEWTER_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "115", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PewterCity_PokemonCenter_1F_EventScript_16A781", + "flag": "0" + }, + { + "graphics_id": "61", + "x": 4, + "y": 8, + "elevation": 3, + "movement_type": "14", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PewterCity_PokemonCenter_1F_EventScript_16A778", + "flag": "0" + }, + { + "graphics_id": "64", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PewterCity_PokemonCenter_1F_EventScript_16A76F", + "flag": "0" + }, + { + "graphics_id": "18", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PewterCity_PokemonCenter_1F_EventScript_16A798", + "flag": "0" + }, + { + "graphics_id": "23", + "x": 13, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PewterCity_PokemonCenter_1F_EventScript_1BEE16", + "flag": "0" + }, + { + "graphics_id": "51", + "x": 10, + "y": 7, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PewterCity_PokemonCenter_1F_EventScript_16A7A1", + "flag": "0" + }, + { + "graphics_id": "51", + "x": 14, + "y": 6, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PewterCity_PokemonCenter_1F_EventScript_16A7AC", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 8, + "elevation": 0, + "dest_map": "MAP_PEWTER_CITY", + "dest_warp_id": 5 + }, + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_PEWTER_CITY", + "dest_warp_id": 5 + }, + { + "x": 8, + "y": 8, + "elevation": 0, + "dest_map": "MAP_PEWTER_CITY", + "dest_warp_id": 5 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_PEWTER_CITY_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/PewterCity_PokemonCenter_2F/events.inc b/data/maps/PewterCity_PokemonCenter_2F/events.inc deleted file mode 100644 index fee2be7d2..000000000 --- a/data/maps/PewterCity_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -PewterCity_PokemonCenter_2F_EventObjects: - object_event 1, 65, 0, 6, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, PewterCity_PokemonCenter_2F_EventScript_1A8CF6, 0, 0, 0 - object_event 2, 65, 0, 2, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, PewterCity_PokemonCenter_2F_EventScript_1A8CFC, 0, 0, 0 - object_event 3, 65, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, PewterCity_PokemonCenter_2F_EventScript_1A8D02, 0, 0, 0 - object_event 4, 69, 0, 1, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, PewterCity_PokemonCenter_2F_EventScript_1BB1D2, 112, 0, 0 - -PewterCity_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 3, 1541 - warp_def 5, 1, 0, 0, 4 - warp_def 9, 1, 0, 0, 1 - -PewterCity_PokemonCenter_2F_MapEvents:: - map_events PewterCity_PokemonCenter_2F_EventObjects, PewterCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/PewterCity_PokemonCenter_2F/header.inc b/data/maps/PewterCity_PokemonCenter_2F/header.inc deleted file mode 100644 index c050eb5fb..000000000 --- a/data/maps/PewterCity_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -PewterCity_PokemonCenter_2F:: @ 8350F10 - .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte PewterCity_PokemonCenter_2F_MapEvents @ 0x83BA2A8 - .4byte PewterCity_PokemonCenter_2F_MapScripts @ 0x816A7B5 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 9 - .byte 0x5a, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/PewterCity_PokemonCenter_2F/map.json b/data/maps/PewterCity_PokemonCenter_2F/map.json new file mode 100644 index 000000000..0b6b59689 --- /dev/null +++ b/data/maps/PewterCity_PokemonCenter_2F/map.json @@ -0,0 +1,94 @@ +{ + "id": "MAP_PEWTER_CITY_POKEMON_CENTER_2F", + "name": "PewterCity_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_PEWTER_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "65", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PewterCity_PokemonCenter_2F_EventScript_1A8CF6", + "flag": "0" + }, + { + "graphics_id": "65", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PewterCity_PokemonCenter_2F_EventScript_1A8CFC", + "flag": "0" + }, + { + "graphics_id": "65", + "x": 10, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PewterCity_PokemonCenter_2F_EventScript_1A8D02", + "flag": "0" + }, + { + "graphics_id": "69", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PewterCity_PokemonCenter_2F_EventScript_1BB1D2", + "flag": "112" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_PEWTER_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 3 + }, + { + "x": 5, + "y": 1, + "elevation": 0, + "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 0, + "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/PokemonLeague_AgathasRoom/events.inc b/data/maps/PokemonLeague_AgathasRoom/events.inc deleted file mode 100644 index 0b6a8136a..000000000 --- a/data/maps/PokemonLeague_AgathasRoom/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -PokemonLeague_AgathasRoom_EventObjects: - object_event 1, 75, 0, 6, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, PokemonLeague_AgathasRoom_EventScript_162877, 0, 0, 0 - -PokemonLeague_AgathasRoom_MapWarps: - warp_def 6, 12, 0, 1, 332 - warp_def 6, 2, 0, 0, 334 - -PokemonLeague_AgathasRoom_MapEvents:: - map_events PokemonLeague_AgathasRoom_EventObjects, PokemonLeague_AgathasRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/PokemonLeague_AgathasRoom/header.inc b/data/maps/PokemonLeague_AgathasRoom/header.inc deleted file mode 100644 index 1e253cb1c..000000000 --- a/data/maps/PokemonLeague_AgathasRoom/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -PokemonLeague_AgathasRoom:: @ 834FA80 - .4byte PokemonLeague_AgathasRoom_Layout @ 0x831F468 - .4byte PokemonLeague_AgathasRoom_MapEvents @ 0x83B1928 - .4byte PokemonLeague_AgathasRoom_MapScripts @ 0x8162810 - .4byte NULL - .2byte BGM_FRLG_POKEMON_TOWER - .2byte 215 - .byte 0x89, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x06 diff --git a/data/maps/PokemonLeague_AgathasRoom/map.json b/data/maps/PokemonLeague_AgathasRoom/map.json new file mode 100644 index 000000000..2f349ed52 --- /dev/null +++ b/data/maps/PokemonLeague_AgathasRoom/map.json @@ -0,0 +1,48 @@ +{ + "id": "MAP_POKEMON_LEAGUE_AGATHAS_ROOM", + "name": "PokemonLeague_AgathasRoom", + "layout": "LAYOUT_POKEMON_LEAGUE_AGATHAS_ROOM", + "music": "BGM_FRLG_POKEMON_TOWER", + "region_map_section": "MAPSEC_POKEMON_LEAGUE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_6", + "connections": null, + "object_events": [ + { + "graphics_id": "75", + "x": 6, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PokemonLeague_AgathasRoom_EventScript_162877", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 12, + "elevation": 0, + "dest_map": "MAP_POKEMON_LEAGUE_BRUNOS_ROOM", + "dest_warp_id": 1 + }, + { + "x": 6, + "y": 2, + "elevation": 0, + "dest_map": "MAP_POKEMON_LEAGUE_LANCES_ROOM", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/PokemonLeague_BrunosRoom/events.inc b/data/maps/PokemonLeague_BrunosRoom/events.inc deleted file mode 100644 index 940c91903..000000000 --- a/data/maps/PokemonLeague_BrunosRoom/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -PokemonLeague_BrunosRoom_EventObjects: - object_event 1, 79, 0, 6, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, PokemonLeague_BrunosRoom_EventScript_1626EC, 0, 0, 0 - -PokemonLeague_BrunosRoom_MapWarps: - warp_def 6, 12, 0, 1, 331 - warp_def 6, 2, 0, 0, 333 - -PokemonLeague_BrunosRoom_MapEvents:: - map_events PokemonLeague_BrunosRoom_EventObjects, PokemonLeague_BrunosRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/PokemonLeague_BrunosRoom/header.inc b/data/maps/PokemonLeague_BrunosRoom/header.inc deleted file mode 100644 index 4a0db477d..000000000 --- a/data/maps/PokemonLeague_BrunosRoom/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -PokemonLeague_BrunosRoom:: @ 834FA64 - .4byte PokemonLeague_BrunosRoom_Layout @ 0x831F2F0 - .4byte PokemonLeague_BrunosRoom_MapEvents @ 0x83B18EC - .4byte PokemonLeague_BrunosRoom_MapScripts @ 0x8162685 - .4byte NULL - .2byte BGM_FRLG_ROCKET_HIDEOUT - .2byte 214 - .byte 0x89, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x05 diff --git a/data/maps/PokemonLeague_BrunosRoom/map.json b/data/maps/PokemonLeague_BrunosRoom/map.json new file mode 100644 index 000000000..c2e0209a5 --- /dev/null +++ b/data/maps/PokemonLeague_BrunosRoom/map.json @@ -0,0 +1,48 @@ +{ + "id": "MAP_POKEMON_LEAGUE_BRUNOS_ROOM", + "name": "PokemonLeague_BrunosRoom", + "layout": "LAYOUT_POKEMON_LEAGUE_BRUNOS_ROOM", + "music": "BGM_FRLG_ROCKET_HIDEOUT", + "region_map_section": "MAPSEC_POKEMON_LEAGUE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_5", + "connections": null, + "object_events": [ + { + "graphics_id": "79", + "x": 6, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PokemonLeague_BrunosRoom_EventScript_1626EC", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 12, + "elevation": 0, + "dest_map": "MAP_POKEMON_LEAGUE_LORELEIS_ROOM", + "dest_warp_id": 1 + }, + { + "x": 6, + "y": 2, + "elevation": 0, + "dest_map": "MAP_POKEMON_LEAGUE_AGATHAS_ROOM", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/PokemonLeague_ChampionsRoom/events.inc b/data/maps/PokemonLeague_ChampionsRoom/events.inc deleted file mode 100644 index bd581b352..000000000 --- a/data/maps/PokemonLeague_ChampionsRoom/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -PokemonLeague_ChampionsRoom_EventObjects: - object_event 1, 72, 0, 6, 0, 8, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 2, 71, 0, 6, 0, 15, 0, 0, 7, 17, 0, 0, 0, 0, 0, 0x0, 90, 0, 0 - -PokemonLeague_ChampionsRoom_MapWarps: - warp_def 6, 19, 3, 1, 334 - warp_def 6, 2, 3, 0, 336 - -PokemonLeague_ChampionsRoom_MapEvents:: - map_events PokemonLeague_ChampionsRoom_EventObjects, PokemonLeague_ChampionsRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/PokemonLeague_ChampionsRoom/header.inc b/data/maps/PokemonLeague_ChampionsRoom/header.inc deleted file mode 100644 index 8dd19508d..000000000 --- a/data/maps/PokemonLeague_ChampionsRoom/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -PokemonLeague_ChampionsRoom:: @ 834FAB8 - .4byte PokemonLeague_ChampionsRoom_Layout @ 0x831FBF8 - .4byte PokemonLeague_ChampionsRoom_MapEvents @ 0x83B19B8 - .4byte PokemonLeague_ChampionsRoom_MapScripts @ 0x8162AE2 - .4byte NULL - .2byte BGM_FRLG_INDIGO_PLATEAU - .2byte 217 - .byte 0x89, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/PokemonLeague_ChampionsRoom/map.json b/data/maps/PokemonLeague_ChampionsRoom/map.json new file mode 100644 index 000000000..5c4da669c --- /dev/null +++ b/data/maps/PokemonLeague_ChampionsRoom/map.json @@ -0,0 +1,61 @@ +{ + "id": "MAP_POKEMON_LEAGUE_CHAMPIONS_ROOM", + "name": "PokemonLeague_ChampionsRoom", + "layout": "LAYOUT_POKEMON_LEAGUE_CHAMPIONS_ROOM", + "music": "BGM_FRLG_INDIGO_PLATEAU", + "region_map_section": "MAPSEC_POKEMON_LEAGUE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "72", + "x": 6, + "y": 8, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "71", + "x": 6, + "y": 15, + "elevation": 0, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "90" + } + ], + "warp_events": [ + { + "x": 6, + "y": 19, + "elevation": 3, + "dest_map": "MAP_POKEMON_LEAGUE_LANCES_ROOM", + "dest_warp_id": 1 + }, + { + "x": 6, + "y": 2, + "elevation": 3, + "dest_map": "MAP_POKEMON_LEAGUE_HALL_OF_FAME", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/PokemonLeague_HallOfFame/events.inc b/data/maps/PokemonLeague_HallOfFame/events.inc deleted file mode 100644 index efc8efd4a..000000000 --- a/data/maps/PokemonLeague_HallOfFame/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -PokemonLeague_HallOfFame_EventObjects: - object_event 1, 71, 0, 6, 0, 4, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 - -PokemonLeague_HallOfFame_MapWarps: - warp_def 5, 12, 3, 1, 335 - -PokemonLeague_HallOfFame_MapEvents:: - map_events PokemonLeague_HallOfFame_EventObjects, PokemonLeague_HallOfFame_MapWarps, 0x0, 0x0 diff --git a/data/maps/PokemonLeague_HallOfFame/header.inc b/data/maps/PokemonLeague_HallOfFame/header.inc deleted file mode 100644 index aa3d6c3b9..000000000 --- a/data/maps/PokemonLeague_HallOfFame/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -PokemonLeague_HallOfFame:: @ 834FAD4 - .4byte PokemonLeague_HallOfFame_Layout @ 0x831FD3C - .4byte PokemonLeague_HallOfFame_MapEvents @ 0x83B19EC - .4byte PokemonLeague_HallOfFame_MapScripts @ 0x8162D4C - .4byte NULL - .2byte BGM_FRLG_HALL_OF_FAME_PALLET_TOWN - .2byte 218 - .byte 0x89, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/PokemonLeague_HallOfFame/map.json b/data/maps/PokemonLeague_HallOfFame/map.json new file mode 100644 index 000000000..c7529d73f --- /dev/null +++ b/data/maps/PokemonLeague_HallOfFame/map.json @@ -0,0 +1,41 @@ +{ + "id": "MAP_POKEMON_LEAGUE_HALL_OF_FAME", + "name": "PokemonLeague_HallOfFame", + "layout": "LAYOUT_POKEMON_LEAGUE_HALL_OF_FAME", + "music": "BGM_FRLG_HALL_OF_FAME_PALLET_TOWN", + "region_map_section": "MAPSEC_POKEMON_LEAGUE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "71", + "x": 6, + "y": 4, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 5, + "y": 12, + "elevation": 3, + "dest_map": "MAP_POKEMON_LEAGUE_CHAMPIONS_ROOM", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/PokemonLeague_LancesRoom/events.inc b/data/maps/PokemonLeague_LancesRoom/events.inc deleted file mode 100644 index 9d5fcca8e..000000000 --- a/data/maps/PokemonLeague_LancesRoom/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -PokemonLeague_LancesRoom_EventObjects: - object_event 1, 74, 0, 6, 0, 8, 0, 3, 8, 17, 0, 0, 0, 0, 0, PokemonLeague_LancesRoom_EventScript_162A14, 0, 0, 0 - -PokemonLeague_LancesRoom_MapWarps: - warp_def 23, 13, 3, 1, 333 - warp_def 6, 5, 0, 0, 335 - -PokemonLeague_LancesRoom_MapEvents:: - map_events PokemonLeague_LancesRoom_EventObjects, PokemonLeague_LancesRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/PokemonLeague_LancesRoom/header.inc b/data/maps/PokemonLeague_LancesRoom/header.inc deleted file mode 100644 index d37a1c254..000000000 --- a/data/maps/PokemonLeague_LancesRoom/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -PokemonLeague_LancesRoom:: @ 834FA9C - .4byte PokemonLeague_LancesRoom_Layout @ 0x831F9CC - .4byte PokemonLeague_LancesRoom_MapEvents @ 0x83B1964 - .4byte PokemonLeague_LancesRoom_MapScripts @ 0x816292D - .4byte NULL - .2byte BGM_FRLG_INDIGO_PLATEAU - .2byte 216 - .byte 0x89, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x07 diff --git a/data/maps/PokemonLeague_LancesRoom/map.json b/data/maps/PokemonLeague_LancesRoom/map.json new file mode 100644 index 000000000..f1f1a4dc8 --- /dev/null +++ b/data/maps/PokemonLeague_LancesRoom/map.json @@ -0,0 +1,48 @@ +{ + "id": "MAP_POKEMON_LEAGUE_LANCES_ROOM", + "name": "PokemonLeague_LancesRoom", + "layout": "LAYOUT_POKEMON_LEAGUE_LANCES_ROOM", + "music": "BGM_FRLG_INDIGO_PLATEAU", + "region_map_section": "MAPSEC_POKEMON_LEAGUE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_7", + "connections": null, + "object_events": [ + { + "graphics_id": "74", + "x": 6, + "y": 8, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PokemonLeague_LancesRoom_EventScript_162A14", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 23, + "y": 13, + "elevation": 3, + "dest_map": "MAP_POKEMON_LEAGUE_AGATHAS_ROOM", + "dest_warp_id": 1 + }, + { + "x": 6, + "y": 5, + "elevation": 0, + "dest_map": "MAP_POKEMON_LEAGUE_CHAMPIONS_ROOM", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/PokemonLeague_LoreleisRoom/events.inc b/data/maps/PokemonLeague_LoreleisRoom/events.inc deleted file mode 100644 index 9f763ac45..000000000 --- a/data/maps/PokemonLeague_LoreleisRoom/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -PokemonLeague_LoreleisRoom_EventObjects: - object_event 1, 77, 0, 6, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, PokemonLeague_LoreleisRoom_EventScript_1625DC, 0, 0, 0 - -PokemonLeague_LoreleisRoom_MapWarps: - warp_def 6, 12, 0, 1, 3328 - warp_def 6, 2, 0, 0, 332 - -PokemonLeague_LoreleisRoom_MapEvents:: - map_events PokemonLeague_LoreleisRoom_EventObjects, PokemonLeague_LoreleisRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/PokemonLeague_LoreleisRoom/header.inc b/data/maps/PokemonLeague_LoreleisRoom/header.inc deleted file mode 100644 index c72d978f6..000000000 --- a/data/maps/PokemonLeague_LoreleisRoom/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -PokemonLeague_LoreleisRoom:: @ 834FA48 - .4byte PokemonLeague_LoreleisRoom_Layout @ 0x831F178 - .4byte PokemonLeague_LoreleisRoom_MapEvents @ 0x83B18B0 - .4byte PokemonLeague_LoreleisRoom_MapScripts @ 0x816256C - .4byte NULL - .2byte BGM_FRLG_GYM - .2byte 213 - .byte 0x89, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x04 diff --git a/data/maps/PokemonLeague_LoreleisRoom/map.json b/data/maps/PokemonLeague_LoreleisRoom/map.json new file mode 100644 index 000000000..f853b99ba --- /dev/null +++ b/data/maps/PokemonLeague_LoreleisRoom/map.json @@ -0,0 +1,48 @@ +{ + "id": "MAP_POKEMON_LEAGUE_LORELEIS_ROOM", + "name": "PokemonLeague_LoreleisRoom", + "layout": "LAYOUT_POKEMON_LEAGUE_LORELEIS_ROOM", + "music": "BGM_FRLG_GYM", + "region_map_section": "MAPSEC_POKEMON_LEAGUE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_4", + "connections": null, + "object_events": [ + { + "graphics_id": "77", + "x": 6, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PokemonLeague_LoreleisRoom_EventScript_1625DC", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 12, + "elevation": 0, + "dest_map": "MAP_INDIGO_PLATEAU_POKEMON_CENTER_1F", + "dest_warp_id": 1 + }, + { + "x": 6, + "y": 2, + "elevation": 0, + "dest_map": "MAP_POKEMON_LEAGUE_BRUNOS_ROOM", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/PokemonMansion_1F/events.inc b/data/maps/PokemonMansion_1F/events.inc deleted file mode 100644 index 88470ec39..000000000 --- a/data/maps/PokemonMansion_1F/events.inc +++ /dev/null @@ -1,25 +0,0 @@ -PokemonMansion_1F_EventObjects: - object_event 1, 55, 0, 22, 0, 24, 0, 3, 9, 17, 0, 1, 0, 4, 0, PokemonMansion_1F_EventScript_162226, 0, 0, 0 - object_event 2, 92, 0, 29, 0, 32, 0, 3, 8, 17, 0, 0, 0, 0, 0, PokemonMansion_1F_EventScript_1BE95D, 415, 0, 0 - object_event 3, 92, 0, 22, 0, 6, 0, 3, 8, 17, 0, 0, 0, 0, 0, PokemonMansion_1F_EventScript_1BE96A, 416, 0, 0 - object_event 4, 92, 0, 27, 0, 15, 0, 3, 8, 17, 0, 0, 0, 0, 0, PokemonMansion_1F_EventScript_1BEB65, 458, 0, 0 - object_event 5, 18, 0, 8, 0, 8, 0, 3, 5, 18, 0, 1, 0, 1, 0, PokemonMansion_1F_EventScript_16223D, 0, 0, 0 - -PokemonMansion_1F_MapWarps: - warp_def 7, 33, 3, 0, 776 - warp_def 8, 33, 3, 0, 776 - warp_def 9, 33, 3, 0, 776 - warp_def 10, 13, 3, 2, 316 - warp_def 25, 27, 3, 0, 318 - warp_def 34, 33, 3, 0, 776 - warp_def 35, 34, 0, 0, 776 - warp_def 19, 22, 3, 3, 317 - warp_def 20, 22, 3, 4, 317 - warp_def 11, 13, 0, 2, 316 - -PokemonMansion_1F_MapBGEvents: - bg_event 5, 5, 0, 1, 0, PokemonMansion_1F_EventScript_162212 - bg_event 2, 21, 0, 7, 0, 94, 31, 1 - -PokemonMansion_1F_MapEvents:: - map_events PokemonMansion_1F_EventObjects, PokemonMansion_1F_MapWarps, 0x0, PokemonMansion_1F_MapBGEvents diff --git a/data/maps/PokemonMansion_1F/header.inc b/data/maps/PokemonMansion_1F/header.inc deleted file mode 100644 index b3e59a63c..000000000 --- a/data/maps/PokemonMansion_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -PokemonMansion_1F:: @ 834F888 - .4byte PokemonMansion_1F_Layout @ 0x830AE3C - .4byte PokemonMansion_1F_MapEvents @ 0x83B0C60 - .4byte PokemonMansion_1F_MapScripts @ 0x81621F9 - .4byte NULL - .2byte BGM_FRLG_POKEMON_MANSION - .2byte 143 - .byte 0x87, 0x00, 0x0b, 0x08, 0x00, 0x07, 0x00, 0x03 diff --git a/data/maps/PokemonMansion_1F/map.json b/data/maps/PokemonMansion_1F/map.json new file mode 100644 index 000000000..a1de1c947 --- /dev/null +++ b/data/maps/PokemonMansion_1F/map.json @@ -0,0 +1,173 @@ +{ + "id": "MAP_POKEMON_MANSION_1F", + "name": "PokemonMansion_1F", + "layout": "LAYOUT_POKEMON_MANSION_1F", + "music": "BGM_FRLG_POKEMON_MANSION", + "region_map_section": "MAPSEC_POKEMON_MANSION", + "requires_flash": false, + "weather": "WEATHER_11", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_3", + "connections": null, + "object_events": [ + { + "graphics_id": "55", + "x": 22, + "y": 24, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "PokemonMansion_1F_EventScript_162226", + "flag": "0" + }, + { + "graphics_id": "92", + "x": 29, + "y": 32, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PokemonMansion_1F_EventScript_1BE95D", + "flag": "415" + }, + { + "graphics_id": "92", + "x": 22, + "y": 6, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PokemonMansion_1F_EventScript_1BE96A", + "flag": "416" + }, + { + "graphics_id": "92", + "x": 27, + "y": 15, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PokemonMansion_1F_EventScript_1BEB65", + "flag": "458" + }, + { + "graphics_id": "18", + "x": 8, + "y": 8, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "PokemonMansion_1F_EventScript_16223D", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 7, + "y": 33, + "elevation": 3, + "dest_map": "MAP_CINNABAR_ISLAND", + "dest_warp_id": 0 + }, + { + "x": 8, + "y": 33, + "elevation": 3, + "dest_map": "MAP_CINNABAR_ISLAND", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 33, + "elevation": 3, + "dest_map": "MAP_CINNABAR_ISLAND", + "dest_warp_id": 0 + }, + { + "x": 10, + "y": 13, + "elevation": 3, + "dest_map": "MAP_POKEMON_MANSION_2F", + "dest_warp_id": 2 + }, + { + "x": 25, + "y": 27, + "elevation": 3, + "dest_map": "MAP_POKEMON_MANSION_B1F", + "dest_warp_id": 0 + }, + { + "x": 34, + "y": 33, + "elevation": 3, + "dest_map": "MAP_CINNABAR_ISLAND", + "dest_warp_id": 0 + }, + { + "x": 35, + "y": 34, + "elevation": 0, + "dest_map": "MAP_CINNABAR_ISLAND", + "dest_warp_id": 0 + }, + { + "x": 19, + "y": 22, + "elevation": 3, + "dest_map": "MAP_POKEMON_MANSION_3F", + "dest_warp_id": 3 + }, + { + "x": 20, + "y": 22, + "elevation": 3, + "dest_map": "MAP_POKEMON_MANSION_3F", + "dest_warp_id": 4 + }, + { + "x": 11, + "y": 13, + "elevation": 0, + "dest_map": "MAP_POKEMON_MANSION_2F", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_1", + "x": 5, + "y": 5, + "elevation": 0, + "script": "PokemonMansion_1F_EventScript_162212" + }, + { + "type": "hidden_item", + "x": 2, + "y": 21, + "elevation": 0, + "item": "ITEM_MOON_STONE", + "flag": "31", + "unknown": 1 + } + ] +} \ No newline at end of file diff --git a/data/maps/PokemonMansion_2F/events.inc b/data/maps/PokemonMansion_2F/events.inc deleted file mode 100644 index e71547b95..000000000 --- a/data/maps/PokemonMansion_2F/events.inc +++ /dev/null @@ -1,20 +0,0 @@ -PokemonMansion_2F_EventObjects: - object_event 1, 52, 0, 5, 0, 23, 0, 3, 1, 17, 0, 1, 0, 1, 0, PokemonMansion_2F_EventScript_16228A, 0, 0, 0 - object_event 2, 92, 0, 36, 0, 8, 0, 3, 8, 17, 0, 0, 0, 0, 0, PokemonMansion_2F_EventScript_1BE977, 417, 0, 0 - object_event 3, 92, 0, 18, 0, 23, 0, 3, 8, 17, 0, 0, 0, 0, 0, PokemonMansion_2F_EventScript_1BEB72, 459, 0, 0 - object_event 4, 92, 0, 35, 0, 17, 0, 3, 8, 17, 0, 0, 0, 0, 0, PokemonMansion_2F_EventScript_1BEB7F, 460, 0, 0 - -PokemonMansion_2F_MapWarps: - warp_def 9, 3, 3, 0, 317 - warp_def 34, 22, 3, 1, 317 - warp_def 6, 14, 3, 3, 315 - warp_def 9, 14, 3, 2, 317 - warp_def 27, 17, 3, 5, 317 - -PokemonMansion_2F_MapBGEvents: - bg_event 2, 16, 0, 1, 0, PokemonMansion_2F_EventScript_162264 - bg_event 6, 31, 0, 0, 0, PokemonMansion_2F_EventScript_162281 - bg_event 25, 4, 0, 0, 0, PokemonMansion_2F_EventScript_162278 - -PokemonMansion_2F_MapEvents:: - map_events PokemonMansion_2F_EventObjects, PokemonMansion_2F_MapWarps, 0x0, PokemonMansion_2F_MapBGEvents diff --git a/data/maps/PokemonMansion_2F/header.inc b/data/maps/PokemonMansion_2F/header.inc deleted file mode 100644 index f3b161fdd..000000000 --- a/data/maps/PokemonMansion_2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -PokemonMansion_2F:: @ 834F8A4 - .4byte PokemonMansion_2F_Layout @ 0x830B9A8 - .4byte PokemonMansion_2F_MapEvents @ 0x83B0D20 - .4byte PokemonMansion_2F_MapScripts @ 0x8162254 - .4byte NULL - .2byte BGM_FRLG_POKEMON_MANSION - .2byte 144 - .byte 0x87, 0x00, 0x0b, 0x08, 0x00, 0x07, 0x00, 0x03 diff --git a/data/maps/PokemonMansion_2F/map.json b/data/maps/PokemonMansion_2F/map.json new file mode 100644 index 000000000..edfc69272 --- /dev/null +++ b/data/maps/PokemonMansion_2F/map.json @@ -0,0 +1,130 @@ +{ + "id": "MAP_POKEMON_MANSION_2F", + "name": "PokemonMansion_2F", + "layout": "LAYOUT_POKEMON_MANSION_2F", + "music": "BGM_FRLG_POKEMON_MANSION", + "region_map_section": "MAPSEC_POKEMON_MANSION", + "requires_flash": false, + "weather": "WEATHER_11", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_3", + "connections": null, + "object_events": [ + { + "graphics_id": "52", + "x": 5, + "y": 23, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "PokemonMansion_2F_EventScript_16228A", + "flag": "0" + }, + { + "graphics_id": "92", + "x": 36, + "y": 8, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PokemonMansion_2F_EventScript_1BE977", + "flag": "417" + }, + { + "graphics_id": "92", + "x": 18, + "y": 23, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PokemonMansion_2F_EventScript_1BEB72", + "flag": "459" + }, + { + "graphics_id": "92", + "x": 35, + "y": 17, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PokemonMansion_2F_EventScript_1BEB7F", + "flag": "460" + } + ], + "warp_events": [ + { + "x": 9, + "y": 3, + "elevation": 3, + "dest_map": "MAP_POKEMON_MANSION_3F", + "dest_warp_id": 0 + }, + { + "x": 34, + "y": 22, + "elevation": 3, + "dest_map": "MAP_POKEMON_MANSION_3F", + "dest_warp_id": 1 + }, + { + "x": 6, + "y": 14, + "elevation": 3, + "dest_map": "MAP_POKEMON_MANSION_1F", + "dest_warp_id": 3 + }, + { + "x": 9, + "y": 14, + "elevation": 3, + "dest_map": "MAP_POKEMON_MANSION_3F", + "dest_warp_id": 2 + }, + { + "x": 27, + "y": 17, + "elevation": 3, + "dest_map": "MAP_POKEMON_MANSION_3F", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_1", + "x": 2, + "y": 16, + "elevation": 0, + "script": "PokemonMansion_2F_EventScript_162264" + }, + { + "type": "bg_event_type_0", + "x": 6, + "y": 31, + "elevation": 0, + "script": "PokemonMansion_2F_EventScript_162281" + }, + { + "type": "bg_event_type_0", + "x": 25, + "y": 4, + "elevation": 0, + "script": "PokemonMansion_2F_EventScript_162278" + } + ] +} \ No newline at end of file diff --git a/data/maps/PokemonMansion_3F/events.inc b/data/maps/PokemonMansion_3F/events.inc deleted file mode 100644 index 8ceb850c8..000000000 --- a/data/maps/PokemonMansion_3F/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -PokemonMansion_3F_EventObjects: - object_event 1, 52, 0, 7, 0, 13, 0, 3, 2, 17, 0, 1, 0, 1, 0, PokemonMansion_3F_EventScript_1622CE, 0, 0, 0 - object_event 2, 55, 0, 22, 0, 13, 0, 3, 8, 17, 0, 1, 0, 1, 0, PokemonMansion_3F_EventScript_1622E5, 0, 0, 0 - object_event 3, 92, 0, 9, 0, 19, 0, 3, 8, 17, 0, 0, 0, 0, 0, PokemonMansion_3F_EventScript_1BE984, 418, 0, 0 - object_event 4, 92, 0, 32, 0, 6, 0, 3, 8, 17, 0, 0, 0, 0, 0, PokemonMansion_3F_EventScript_1BE991, 419, 0, 0 - -PokemonMansion_3F_MapWarps: - warp_def 8, 3, 3, 0, 316 - warp_def 34, 18, 3, 1, 316 - warp_def 11, 11, 3, 3, 316 - warp_def 18, 18, 3, 7, 315 - warp_def 19, 18, 3, 8, 315 - warp_def 23, 18, 3, 4, 316 - warp_def 20, 18, 3, 8, 315 - warp_def 24, 18, 3, 4, 316 - -PokemonMansion_3F_MapBGEvents: - bg_event 8, 16, 0, 0, 0, PokemonMansion_3F_EventScript_1622C5 - bg_event 12, 5, 0, 1, 0, PokemonMansion_3F_EventScript_1622B1 - bg_event 36, 13, 3, 7, 0, 68, 32, 1 - -PokemonMansion_3F_MapEvents:: - map_events PokemonMansion_3F_EventObjects, PokemonMansion_3F_MapWarps, 0x0, PokemonMansion_3F_MapBGEvents diff --git a/data/maps/PokemonMansion_3F/header.inc b/data/maps/PokemonMansion_3F/header.inc deleted file mode 100644 index e86dc4f3b..000000000 --- a/data/maps/PokemonMansion_3F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -PokemonMansion_3F:: @ 834F8C0 - .4byte PokemonMansion_3F_Layout @ 0x830C430 - .4byte PokemonMansion_3F_MapEvents @ 0x83B0DF8 - .4byte PokemonMansion_3F_MapScripts @ 0x81622A1 - .4byte NULL - .2byte BGM_FRLG_POKEMON_MANSION - .2byte 145 - .byte 0x87, 0x00, 0x0b, 0x08, 0x00, 0x07, 0x00, 0x03 diff --git a/data/maps/PokemonMansion_3F/map.json b/data/maps/PokemonMansion_3F/map.json new file mode 100644 index 000000000..cabb1dae5 --- /dev/null +++ b/data/maps/PokemonMansion_3F/map.json @@ -0,0 +1,153 @@ +{ + "id": "MAP_POKEMON_MANSION_3F", + "name": "PokemonMansion_3F", + "layout": "LAYOUT_POKEMON_MANSION_3F", + "music": "BGM_FRLG_POKEMON_MANSION", + "region_map_section": "MAPSEC_POKEMON_MANSION", + "requires_flash": false, + "weather": "WEATHER_11", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_3", + "connections": null, + "object_events": [ + { + "graphics_id": "52", + "x": 7, + "y": 13, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "PokemonMansion_3F_EventScript_1622CE", + "flag": "0" + }, + { + "graphics_id": "55", + "x": 22, + "y": 13, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "PokemonMansion_3F_EventScript_1622E5", + "flag": "0" + }, + { + "graphics_id": "92", + "x": 9, + "y": 19, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PokemonMansion_3F_EventScript_1BE984", + "flag": "418" + }, + { + "graphics_id": "92", + "x": 32, + "y": 6, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PokemonMansion_3F_EventScript_1BE991", + "flag": "419" + } + ], + "warp_events": [ + { + "x": 8, + "y": 3, + "elevation": 3, + "dest_map": "MAP_POKEMON_MANSION_2F", + "dest_warp_id": 0 + }, + { + "x": 34, + "y": 18, + "elevation": 3, + "dest_map": "MAP_POKEMON_MANSION_2F", + "dest_warp_id": 1 + }, + { + "x": 11, + "y": 11, + "elevation": 3, + "dest_map": "MAP_POKEMON_MANSION_2F", + "dest_warp_id": 3 + }, + { + "x": 18, + "y": 18, + "elevation": 3, + "dest_map": "MAP_POKEMON_MANSION_1F", + "dest_warp_id": 7 + }, + { + "x": 19, + "y": 18, + "elevation": 3, + "dest_map": "MAP_POKEMON_MANSION_1F", + "dest_warp_id": 8 + }, + { + "x": 23, + "y": 18, + "elevation": 3, + "dest_map": "MAP_POKEMON_MANSION_2F", + "dest_warp_id": 4 + }, + { + "x": 20, + "y": 18, + "elevation": 3, + "dest_map": "MAP_POKEMON_MANSION_1F", + "dest_warp_id": 8 + }, + { + "x": 24, + "y": 18, + "elevation": 3, + "dest_map": "MAP_POKEMON_MANSION_2F", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 8, + "y": 16, + "elevation": 0, + "script": "PokemonMansion_3F_EventScript_1622C5" + }, + { + "type": "bg_event_type_1", + "x": 12, + "y": 5, + "elevation": 0, + "script": "PokemonMansion_3F_EventScript_1622B1" + }, + { + "type": "hidden_item", + "x": 36, + "y": 13, + "elevation": 3, + "item": "ITEM_RARE_CANDY", + "flag": "32", + "unknown": 1 + } + ] +} \ No newline at end of file diff --git a/data/maps/PokemonMansion_B1F/events.inc b/data/maps/PokemonMansion_B1F/events.inc deleted file mode 100644 index 26dc5dd4f..000000000 --- a/data/maps/PokemonMansion_B1F/events.inc +++ /dev/null @@ -1,19 +0,0 @@ -PokemonMansion_B1F_EventObjects: - object_event 1, 92, 0, 6, 0, 21, 0, 3, 8, 17, 0, 0, 0, 0, 0, PokemonMansion_B1F_EventScript_1BE9B8, 423, 0, 0 - object_event 2, 52, 0, 20, 0, 25, 0, 3, 2, 17, 0, 1, 0, 1, 0, PokemonMansion_B1F_EventScript_162329, 0, 0, 0 - object_event 3, 55, 0, 34, 0, 13, 0, 3, 8, 17, 0, 1, 0, 6, 0, PokemonMansion_B1F_EventScript_162340, 0, 0, 0 - object_event 4, 92, 0, 23, 0, 4, 0, 3, 8, 17, 0, 0, 0, 0, 0, PokemonMansion_B1F_EventScript_1BE99E, 420, 0, 0 - object_event 5, 92, 0, 2, 0, 29, 0, 3, 8, 17, 0, 0, 0, 0, 0, PokemonMansion_B1F_EventScript_1BE9AB, 421, 0, 0 - object_event 6, 92, 0, 5, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, PokemonMansion_B1F_EventScript_1BE9C5, 424, 0, 0 - -PokemonMansion_B1F_MapWarps: - warp_def 34, 29, 3, 4, 315 - -PokemonMansion_B1F_MapBGEvents: - bg_event 21, 27, 0, 0, 0, PokemonMansion_B1F_EventScript_162320 - bg_event 24, 29, 0, 1, 0, PokemonMansion_B1F_EventScript_16230C - bg_event 27, 5, 0, 1, 0, PokemonMansion_B1F_EventScript_16230C - bg_event 35, 5, 3, 7, 0, 36, 33, 1 - -PokemonMansion_B1F_MapEvents:: - map_events PokemonMansion_B1F_EventObjects, PokemonMansion_B1F_MapWarps, 0x0, PokemonMansion_B1F_MapBGEvents diff --git a/data/maps/PokemonMansion_B1F/header.inc b/data/maps/PokemonMansion_B1F/header.inc deleted file mode 100644 index a5d64c3bf..000000000 --- a/data/maps/PokemonMansion_B1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -PokemonMansion_B1F:: @ 834F8DC - .4byte PokemonMansion_B1F_Layout @ 0x830CEB8 - .4byte PokemonMansion_B1F_MapEvents @ 0x83B0ED4 - .4byte PokemonMansion_B1F_MapScripts @ 0x81622FC - .4byte NULL - .2byte BGM_FRLG_POKEMON_MANSION - .2byte 146 - .byte 0x87, 0x00, 0x0b, 0x08, 0x00, 0x07, 0x00, 0x03 diff --git a/data/maps/PokemonMansion_B1F/map.json b/data/maps/PokemonMansion_B1F/map.json new file mode 100644 index 000000000..b12b4fc61 --- /dev/null +++ b/data/maps/PokemonMansion_B1F/map.json @@ -0,0 +1,137 @@ +{ + "id": "MAP_POKEMON_MANSION_B1F", + "name": "PokemonMansion_B1F", + "layout": "LAYOUT_POKEMON_MANSION_B1F", + "music": "BGM_FRLG_POKEMON_MANSION", + "region_map_section": "MAPSEC_POKEMON_MANSION", + "requires_flash": false, + "weather": "WEATHER_11", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_3", + "connections": null, + "object_events": [ + { + "graphics_id": "92", + "x": 6, + "y": 21, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PokemonMansion_B1F_EventScript_1BE9B8", + "flag": "423" + }, + { + "graphics_id": "52", + "x": 20, + "y": 25, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "PokemonMansion_B1F_EventScript_162329", + "flag": "0" + }, + { + "graphics_id": "55", + "x": 34, + "y": 13, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "PokemonMansion_B1F_EventScript_162340", + "flag": "0" + }, + { + "graphics_id": "92", + "x": 23, + "y": 4, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PokemonMansion_B1F_EventScript_1BE99E", + "flag": "420" + }, + { + "graphics_id": "92", + "x": 2, + "y": 29, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PokemonMansion_B1F_EventScript_1BE9AB", + "flag": "421" + }, + { + "graphics_id": "92", + "x": 5, + "y": 7, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PokemonMansion_B1F_EventScript_1BE9C5", + "flag": "424" + } + ], + "warp_events": [ + { + "x": 34, + "y": 29, + "elevation": 3, + "dest_map": "MAP_POKEMON_MANSION_1F", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 21, + "y": 27, + "elevation": 0, + "script": "PokemonMansion_B1F_EventScript_162320" + }, + { + "type": "bg_event_type_1", + "x": 24, + "y": 29, + "elevation": 0, + "script": "PokemonMansion_B1F_EventScript_16230C" + }, + { + "type": "bg_event_type_1", + "x": 27, + "y": 5, + "elevation": 0, + "script": "PokemonMansion_B1F_EventScript_16230C" + }, + { + "type": "hidden_item", + "x": 35, + "y": 5, + "elevation": 3, + "item": "ITEM_ELIXIR", + "flag": "33", + "unknown": 1 + } + ] +} \ No newline at end of file diff --git a/data/maps/PokemonTower_1F/events.inc b/data/maps/PokemonTower_1F/events.inc deleted file mode 100644 index 26c172711..000000000 --- a/data/maps/PokemonTower_1F/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -PokemonTower_1F_EventObjects: - object_event 1, 48, 0, 18, 0, 13, 0, 3, 7, 17, 0, 0, 0, 0, 0, PokemonTower_1F_EventScript_16327C, 0, 0, 0 - object_event 2, 58, 0, 18, 0, 7, 0, 3, 9, 17, 0, 0, 0, 0, 0, PokemonTower_1F_EventScript_16323F, 0, 0, 0 - object_event 3, 28, 0, 15, 0, 6, 0, 3, 7, 17, 0, 0, 0, 0, 0, PokemonTower_1F_EventScript_163248, 0, 0, 0 - object_event 4, 31, 0, 7, 0, 8, 0, 3, 2, 17, 0, 0, 0, 0, 0, PokemonTower_1F_EventScript_16325A, 0, 0, 0 - object_event 5, 30, 0, 8, 0, 12, 0, 3, 2, 34, 0, 0, 0, 0, 0, PokemonTower_1F_EventScript_163251, 0, 0, 0 - -PokemonTower_1F_MapWarps: - warp_def 10, 19, 3, 0, 772 - warp_def 11, 18, 3, 0, 772 - warp_def 12, 19, 3, 0, 772 - warp_def 18, 9, 3, 1, 345 - -PokemonTower_1F_MapEvents:: - map_events PokemonTower_1F_EventObjects, PokemonTower_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/PokemonTower_1F/header.inc b/data/maps/PokemonTower_1F/header.inc deleted file mode 100644 index 61a8cd0fb..000000000 --- a/data/maps/PokemonTower_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -PokemonTower_1F:: @ 834FBB4 - .4byte PokemonTower_1F_Layout @ 0x83167F4 - .4byte PokemonTower_1F_MapEvents @ 0x83B2270 - .4byte PokemonTower_1F_MapScripts @ 0x8163235 - .4byte NULL - .2byte BGM_FRLG_POKEMON_TOWER - .2byte 161 - .byte 0x8c, 0x00, 0x00, 0x08, 0x00, 0x05, 0x00, 0x02 diff --git a/data/maps/PokemonTower_1F/map.json b/data/maps/PokemonTower_1F/map.json new file mode 100644 index 000000000..0a7c0726f --- /dev/null +++ b/data/maps/PokemonTower_1F/map.json @@ -0,0 +1,114 @@ +{ + "id": "MAP_POKEMON_TOWER_1F", + "name": "PokemonTower_1F", + "layout": "LAYOUT_POKEMON_TOWER_1F", + "music": "BGM_FRLG_POKEMON_TOWER", + "region_map_section": "MAPSEC_POKEMON_TOWER", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 5, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_2", + "connections": null, + "object_events": [ + { + "graphics_id": "48", + "x": 18, + "y": 13, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PokemonTower_1F_EventScript_16327C", + "flag": "0" + }, + { + "graphics_id": "58", + "x": 18, + "y": 7, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PokemonTower_1F_EventScript_16323F", + "flag": "0" + }, + { + "graphics_id": "28", + "x": 15, + "y": 6, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PokemonTower_1F_EventScript_163248", + "flag": "0" + }, + { + "graphics_id": "31", + "x": 7, + "y": 8, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PokemonTower_1F_EventScript_16325A", + "flag": "0" + }, + { + "graphics_id": "30", + "x": 8, + "y": 12, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 2, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PokemonTower_1F_EventScript_163251", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 10, + "y": 19, + "elevation": 3, + "dest_map": "MAP_LAVENDER_TOWN", + "dest_warp_id": 0 + }, + { + "x": 11, + "y": 18, + "elevation": 3, + "dest_map": "MAP_LAVENDER_TOWN", + "dest_warp_id": 0 + }, + { + "x": 12, + "y": 19, + "elevation": 3, + "dest_map": "MAP_LAVENDER_TOWN", + "dest_warp_id": 0 + }, + { + "x": 18, + "y": 9, + "elevation": 3, + "dest_map": "MAP_POKEMON_TOWER_2F", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/PokemonTower_2F/events.inc b/data/maps/PokemonTower_2F/events.inc deleted file mode 100644 index 332b2cedc..000000000 --- a/data/maps/PokemonTower_2F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -PokemonTower_2F_EventObjects: - object_event 1, 72, 0, 16, 0, 5, 0, 3, 7, 17, 0, 0, 0, 0, 0, 0x0, 81, 0, 0 - object_event 2, 58, 0, 3, 0, 7, 0, 0, 10, 17, 0, 0, 0, 0, 0, PokemonTower_2F_EventScript_163286, 0, 0, 0 - -PokemonTower_2F_MapWarps: - warp_def 4, 10, 3, 0, 346 - warp_def 18, 10, 3, 3, 344 - -PokemonTower_2F_MapCoordEvents: - coord_event 17, 5, 3, 0, 16477, 0, 0, PokemonTower_2F_EventScript_16328F - coord_event 16, 6, 3, 0, 16477, 0, 0, PokemonTower_2F_EventScript_16329B - -PokemonTower_2F_MapEvents:: - map_events PokemonTower_2F_EventObjects, PokemonTower_2F_MapWarps, PokemonTower_2F_MapCoordEvents, 0x0 diff --git a/data/maps/PokemonTower_2F/header.inc b/data/maps/PokemonTower_2F/header.inc deleted file mode 100644 index ee7c892ce..000000000 --- a/data/maps/PokemonTower_2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -PokemonTower_2F:: @ 834FBD0 - .4byte PokemonTower_2F_Layout @ 0x8316BD8 - .4byte PokemonTower_2F_MapEvents @ 0x83B22E4 - .4byte PokemonTower_2F_MapScripts @ 0x8163285 - .4byte NULL - .2byte BGM_FRLG_POKEMON_TOWER - .2byte 162 - .byte 0x8c, 0x00, 0x00, 0x08, 0x00, 0x05, 0x00, 0x02 diff --git a/data/maps/PokemonTower_2F/map.json b/data/maps/PokemonTower_2F/map.json new file mode 100644 index 000000000..1d83dc368 --- /dev/null +++ b/data/maps/PokemonTower_2F/map.json @@ -0,0 +1,80 @@ +{ + "id": "MAP_POKEMON_TOWER_2F", + "name": "PokemonTower_2F", + "layout": "LAYOUT_POKEMON_TOWER_2F", + "music": "BGM_FRLG_POKEMON_TOWER", + "region_map_section": "MAPSEC_POKEMON_TOWER", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 5, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_2", + "connections": null, + "object_events": [ + { + "graphics_id": "72", + "x": 16, + "y": 5, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "81" + }, + { + "graphics_id": "58", + "x": 3, + "y": 7, + "elevation": 0, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PokemonTower_2F_EventScript_163286", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 10, + "elevation": 3, + "dest_map": "MAP_POKEMON_TOWER_3F", + "dest_warp_id": 0 + }, + { + "x": 18, + "y": 10, + "elevation": 3, + "dest_map": "MAP_POKEMON_TOWER_1F", + "dest_warp_id": 3 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 17, + "y": 5, + "elevation": 3, + "var": "VAR_0x405D", + "var_value": 0, + "script": "PokemonTower_2F_EventScript_16328F" + }, + { + "type": "trigger", + "x": 16, + "y": 6, + "elevation": 3, + "var": "VAR_0x405D", + "var_value": 0, + "script": "PokemonTower_2F_EventScript_16329B" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/PokemonTower_3F/events.inc b/data/maps/PokemonTower_3F/events.inc deleted file mode 100644 index 487e99cc5..000000000 --- a/data/maps/PokemonTower_3F/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -PokemonTower_3F_EventObjects: - object_event 1, 58, 0, 10, 0, 14, 0, 3, 8, 17, 0, 1, 0, 3, 0, PokemonTower_3F_EventScript_1633A7, 0, 0, 0 - object_event 2, 58, 0, 9, 0, 9, 0, 3, 8, 17, 0, 1, 0, 3, 0, PokemonTower_3F_EventScript_1633BE, 0, 0, 0 - object_event 3, 58, 0, 12, 0, 4, 0, 3, 13, 17, 0, 1, 0, 2, 0, PokemonTower_3F_EventScript_1633D5, 0, 0, 0 - object_event 4, 92, 0, 13, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, PokemonTower_3F_EventScript_1BE755, 375, 0, 0 - -PokemonTower_3F_MapWarps: - warp_def 4, 10, 3, 0, 345 - warp_def 18, 10, 3, 1, 347 - -PokemonTower_3F_MapEvents:: - map_events PokemonTower_3F_EventObjects, PokemonTower_3F_MapWarps, 0x0, 0x0 diff --git a/data/maps/PokemonTower_3F/header.inc b/data/maps/PokemonTower_3F/header.inc deleted file mode 100644 index 9d972f0a1..000000000 --- a/data/maps/PokemonTower_3F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -PokemonTower_3F:: @ 834FBEC - .4byte PokemonTower_3F_Layout @ 0x8316FBC - .4byte PokemonTower_3F_MapEvents @ 0x83B2368 - .4byte PokemonTower_3F_MapScripts @ 0x81633A6 - .4byte NULL - .2byte BGM_FRLG_POKEMON_TOWER - .2byte 163 - .byte 0x8c, 0x00, 0x06, 0x08, 0x00, 0x05, 0x00, 0x02 diff --git a/data/maps/PokemonTower_3F/map.json b/data/maps/PokemonTower_3F/map.json new file mode 100644 index 000000000..e4109d22a --- /dev/null +++ b/data/maps/PokemonTower_3F/map.json @@ -0,0 +1,87 @@ +{ + "id": "MAP_POKEMON_TOWER_3F", + "name": "PokemonTower_3F", + "layout": "LAYOUT_POKEMON_TOWER_3F", + "music": "BGM_FRLG_POKEMON_TOWER", + "region_map_section": "MAPSEC_POKEMON_TOWER", + "requires_flash": false, + "weather": "WEATHER_6", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 5, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_2", + "connections": null, + "object_events": [ + { + "graphics_id": "58", + "x": 10, + "y": 14, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "PokemonTower_3F_EventScript_1633A7", + "flag": "0" + }, + { + "graphics_id": "58", + "x": 9, + "y": 9, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "PokemonTower_3F_EventScript_1633BE", + "flag": "0" + }, + { + "graphics_id": "58", + "x": 12, + "y": 4, + "elevation": 3, + "movement_type": "13", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "PokemonTower_3F_EventScript_1633D5", + "flag": "0" + }, + { + "graphics_id": "92", + "x": 13, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PokemonTower_3F_EventScript_1BE755", + "flag": "375" + } + ], + "warp_events": [ + { + "x": 4, + "y": 10, + "elevation": 3, + "dest_map": "MAP_POKEMON_TOWER_2F", + "dest_warp_id": 0 + }, + { + "x": 18, + "y": 10, + "elevation": 3, + "dest_map": "MAP_POKEMON_TOWER_4F", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/PokemonTower_4F/events.inc b/data/maps/PokemonTower_4F/events.inc deleted file mode 100644 index 9dd2cb2aa..000000000 --- a/data/maps/PokemonTower_4F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -PokemonTower_4F_EventObjects: - object_event 1, 58, 0, 17, 0, 7, 0, 3, 8, 17, 0, 1, 0, 3, 0, PokemonTower_4F_EventScript_163404, 0, 0, 0 - object_event 2, 58, 0, 15, 0, 13, 0, 3, 9, 17, 0, 1, 0, 5, 0, PokemonTower_4F_EventScript_16341B, 0, 0, 0 - object_event 3, 58, 0, 4, 0, 12, 0, 3, 10, 17, 0, 1, 0, 2, 0, PokemonTower_4F_EventScript_1633ED, 0, 0, 0 - object_event 4, 92, 0, 12, 0, 11, 0, 3, 8, 17, 0, 0, 0, 0, 0, PokemonTower_4F_EventScript_1BE762, 376, 0, 0 - object_event 5, 92, 0, 8, 0, 11, 0, 3, 8, 17, 0, 0, 0, 0, 0, PokemonTower_4F_EventScript_1BE76F, 377, 0, 0 - object_event 6, 92, 0, 11, 0, 16, 0, 3, 8, 17, 0, 0, 0, 0, 0, PokemonTower_4F_EventScript_1BE77C, 378, 0, 0 - -PokemonTower_4F_MapWarps: - warp_def 4, 10, 3, 0, 348 - warp_def 18, 10, 3, 1, 346 - -PokemonTower_4F_MapEvents:: - map_events PokemonTower_4F_EventObjects, PokemonTower_4F_MapWarps, 0x0, 0x0 diff --git a/data/maps/PokemonTower_4F/header.inc b/data/maps/PokemonTower_4F/header.inc deleted file mode 100644 index fe31ef96b..000000000 --- a/data/maps/PokemonTower_4F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -PokemonTower_4F:: @ 834FC08 - .4byte PokemonTower_4F_Layout @ 0x83173A0 - .4byte PokemonTower_4F_MapEvents @ 0x83B241C - .4byte PokemonTower_4F_MapScripts @ 0x81633EC - .4byte NULL - .2byte BGM_FRLG_POKEMON_TOWER - .2byte 164 - .byte 0x8c, 0x00, 0x06, 0x08, 0x00, 0x05, 0x00, 0x02 diff --git a/data/maps/PokemonTower_4F/map.json b/data/maps/PokemonTower_4F/map.json new file mode 100644 index 000000000..e9262ecba --- /dev/null +++ b/data/maps/PokemonTower_4F/map.json @@ -0,0 +1,113 @@ +{ + "id": "MAP_POKEMON_TOWER_4F", + "name": "PokemonTower_4F", + "layout": "LAYOUT_POKEMON_TOWER_4F", + "music": "BGM_FRLG_POKEMON_TOWER", + "region_map_section": "MAPSEC_POKEMON_TOWER", + "requires_flash": false, + "weather": "WEATHER_6", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 5, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_2", + "connections": null, + "object_events": [ + { + "graphics_id": "58", + "x": 17, + "y": 7, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "PokemonTower_4F_EventScript_163404", + "flag": "0" + }, + { + "graphics_id": "58", + "x": 15, + "y": 13, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "PokemonTower_4F_EventScript_16341B", + "flag": "0" + }, + { + "graphics_id": "58", + "x": 4, + "y": 12, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "PokemonTower_4F_EventScript_1633ED", + "flag": "0" + }, + { + "graphics_id": "92", + "x": 12, + "y": 11, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PokemonTower_4F_EventScript_1BE762", + "flag": "376" + }, + { + "graphics_id": "92", + "x": 8, + "y": 11, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PokemonTower_4F_EventScript_1BE76F", + "flag": "377" + }, + { + "graphics_id": "92", + "x": 11, + "y": 16, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PokemonTower_4F_EventScript_1BE77C", + "flag": "378" + } + ], + "warp_events": [ + { + "x": 4, + "y": 10, + "elevation": 3, + "dest_map": "MAP_POKEMON_TOWER_5F", + "dest_warp_id": 0 + }, + { + "x": 18, + "y": 10, + "elevation": 3, + "dest_map": "MAP_POKEMON_TOWER_3F", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/PokemonTower_5F/events.inc b/data/maps/PokemonTower_5F/events.inc deleted file mode 100644 index 88e67476b..000000000 --- a/data/maps/PokemonTower_5F/events.inc +++ /dev/null @@ -1,37 +0,0 @@ -PokemonTower_5F_EventObjects: - object_event 1, 58, 0, 11, 0, 4, 0, 3, 1, 17, 0, 1, 0, 2, 0, PokemonTower_5F_EventScript_163472, 0, 0, 0 - object_event 2, 58, 0, 19, 0, 7, 0, 3, 9, 17, 0, 1, 0, 3, 0, PokemonTower_5F_EventScript_16345B, 0, 0, 0 - object_event 3, 58, 0, 7, 0, 12, 0, 3, 10, 17, 0, 1, 0, 2, 0, PokemonTower_5F_EventScript_163489, 0, 0, 0 - object_event 4, 58, 0, 11, 0, 16, 0, 3, 1, 17, 0, 1, 0, 2, 0, PokemonTower_5F_EventScript_1634A0, 0, 0, 0 - object_event 5, 58, 0, 12, 0, 8, 0, 3, 10, 17, 0, 0, 0, 0, 0, PokemonTower_5F_EventScript_163433, 0, 0, 0 - object_event 6, 92, 0, 6, 0, 16, 0, 3, 8, 17, 0, 0, 0, 0, 0, PokemonTower_5F_EventScript_1BE789, 379, 0, 0 - object_event 7, 92, 0, 11, 0, 9, 0, 3, 8, 17, 0, 0, 0, 0, 0, PokemonTower_5F_EventScript_1BEBB3, 464, 0, 0 - -PokemonTower_5F_MapWarps: - warp_def 4, 10, 3, 0, 347 - warp_def 18, 10, 3, 1, 349 - -PokemonTower_5F_MapCoordEvents: - coord_event 10, 8, 3, 0, 16385, 0, 0, PokemonTower_5F_EventScript_16343C - coord_event 11, 8, 3, 0, 16385, 0, 0, PokemonTower_5F_EventScript_16343C - coord_event 12, 8, 3, 0, 16385, 0, 0, PokemonTower_5F_EventScript_16343C - coord_event 10, 9, 3, 0, 16385, 0, 0, PokemonTower_5F_EventScript_16343C - coord_event 9, 8, 3, 0, 16385, 1, 0, PokemonTower_5F_EventScript_163453 - coord_event 12, 9, 3, 0, 16385, 0, 0, PokemonTower_5F_EventScript_16343C - coord_event 10, 10, 3, 0, 16385, 0, 0, PokemonTower_5F_EventScript_16343C - coord_event 11, 10, 3, 0, 16385, 0, 0, PokemonTower_5F_EventScript_16343C - coord_event 12, 10, 0, 0, 16385, 0, 0, PokemonTower_5F_EventScript_16343C - coord_event 9, 9, 3, 0, 16385, 1, 0, PokemonTower_5F_EventScript_163453 - coord_event 9, 10, 3, 0, 16385, 1, 0, PokemonTower_5F_EventScript_163453 - coord_event 10, 11, 3, 0, 16385, 1, 0, PokemonTower_5F_EventScript_163453 - coord_event 11, 11, 3, 0, 16385, 1, 0, PokemonTower_5F_EventScript_163453 - coord_event 12, 11, 0, 0, 16385, 1, 0, PokemonTower_5F_EventScript_163453 - coord_event 13, 8, 0, 0, 16385, 1, 0, PokemonTower_5F_EventScript_163453 - coord_event 13, 9, 0, 0, 16385, 1, 0, PokemonTower_5F_EventScript_163453 - coord_event 13, 10, 0, 0, 16385, 1, 0, PokemonTower_5F_EventScript_163453 - -PokemonTower_5F_MapBGEvents: - bg_event 7, 3, 3, 7, 0, 104, 14, 1 - -PokemonTower_5F_MapEvents:: - map_events PokemonTower_5F_EventObjects, PokemonTower_5F_MapWarps, PokemonTower_5F_MapCoordEvents, PokemonTower_5F_MapBGEvents diff --git a/data/maps/PokemonTower_5F/header.inc b/data/maps/PokemonTower_5F/header.inc deleted file mode 100644 index f2e38b1b6..000000000 --- a/data/maps/PokemonTower_5F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -PokemonTower_5F:: @ 834FC24 - .4byte PokemonTower_5F_Layout @ 0x8317784 - .4byte PokemonTower_5F_MapEvents @ 0x83B2604 - .4byte PokemonTower_5F_MapScripts @ 0x8163432 - .4byte NULL - .2byte BGM_FRLG_POKEMON_TOWER - .2byte 165 - .byte 0x8c, 0x00, 0x06, 0x08, 0x00, 0x05, 0x00, 0x02 diff --git a/data/maps/PokemonTower_5F/map.json b/data/maps/PokemonTower_5F/map.json new file mode 100644 index 000000000..e44ded9f5 --- /dev/null +++ b/data/maps/PokemonTower_5F/map.json @@ -0,0 +1,290 @@ +{ + "id": "MAP_POKEMON_TOWER_5F", + "name": "PokemonTower_5F", + "layout": "LAYOUT_POKEMON_TOWER_5F", + "music": "BGM_FRLG_POKEMON_TOWER", + "region_map_section": "MAPSEC_POKEMON_TOWER", + "requires_flash": false, + "weather": "WEATHER_6", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 5, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_2", + "connections": null, + "object_events": [ + { + "graphics_id": "58", + "x": 11, + "y": 4, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "PokemonTower_5F_EventScript_163472", + "flag": "0" + }, + { + "graphics_id": "58", + "x": 19, + "y": 7, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "PokemonTower_5F_EventScript_16345B", + "flag": "0" + }, + { + "graphics_id": "58", + "x": 7, + "y": 12, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "PokemonTower_5F_EventScript_163489", + "flag": "0" + }, + { + "graphics_id": "58", + "x": 11, + "y": 16, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "PokemonTower_5F_EventScript_1634A0", + "flag": "0" + }, + { + "graphics_id": "58", + "x": 12, + "y": 8, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PokemonTower_5F_EventScript_163433", + "flag": "0" + }, + { + "graphics_id": "92", + "x": 6, + "y": 16, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PokemonTower_5F_EventScript_1BE789", + "flag": "379" + }, + { + "graphics_id": "92", + "x": 11, + "y": 9, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PokemonTower_5F_EventScript_1BEBB3", + "flag": "464" + } + ], + "warp_events": [ + { + "x": 4, + "y": 10, + "elevation": 3, + "dest_map": "MAP_POKEMON_TOWER_4F", + "dest_warp_id": 0 + }, + { + "x": 18, + "y": 10, + "elevation": 3, + "dest_map": "MAP_POKEMON_TOWER_6F", + "dest_warp_id": 1 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 10, + "y": 8, + "elevation": 3, + "var": "VAR_0x4001", + "var_value": 0, + "script": "PokemonTower_5F_EventScript_16343C" + }, + { + "type": "trigger", + "x": 11, + "y": 8, + "elevation": 3, + "var": "VAR_0x4001", + "var_value": 0, + "script": "PokemonTower_5F_EventScript_16343C" + }, + { + "type": "trigger", + "x": 12, + "y": 8, + "elevation": 3, + "var": "VAR_0x4001", + "var_value": 0, + "script": "PokemonTower_5F_EventScript_16343C" + }, + { + "type": "trigger", + "x": 10, + "y": 9, + "elevation": 3, + "var": "VAR_0x4001", + "var_value": 0, + "script": "PokemonTower_5F_EventScript_16343C" + }, + { + "type": "trigger", + "x": 9, + "y": 8, + "elevation": 3, + "var": "VAR_0x4001", + "var_value": 1, + "script": "PokemonTower_5F_EventScript_163453" + }, + { + "type": "trigger", + "x": 12, + "y": 9, + "elevation": 3, + "var": "VAR_0x4001", + "var_value": 0, + "script": "PokemonTower_5F_EventScript_16343C" + }, + { + "type": "trigger", + "x": 10, + "y": 10, + "elevation": 3, + "var": "VAR_0x4001", + "var_value": 0, + "script": "PokemonTower_5F_EventScript_16343C" + }, + { + "type": "trigger", + "x": 11, + "y": 10, + "elevation": 3, + "var": "VAR_0x4001", + "var_value": 0, + "script": "PokemonTower_5F_EventScript_16343C" + }, + { + "type": "trigger", + "x": 12, + "y": 10, + "elevation": 0, + "var": "VAR_0x4001", + "var_value": 0, + "script": "PokemonTower_5F_EventScript_16343C" + }, + { + "type": "trigger", + "x": 9, + "y": 9, + "elevation": 3, + "var": "VAR_0x4001", + "var_value": 1, + "script": "PokemonTower_5F_EventScript_163453" + }, + { + "type": "trigger", + "x": 9, + "y": 10, + "elevation": 3, + "var": "VAR_0x4001", + "var_value": 1, + "script": "PokemonTower_5F_EventScript_163453" + }, + { + "type": "trigger", + "x": 10, + "y": 11, + "elevation": 3, + "var": "VAR_0x4001", + "var_value": 1, + "script": "PokemonTower_5F_EventScript_163453" + }, + { + "type": "trigger", + "x": 11, + "y": 11, + "elevation": 3, + "var": "VAR_0x4001", + "var_value": 1, + "script": "PokemonTower_5F_EventScript_163453" + }, + { + "type": "trigger", + "x": 12, + "y": 11, + "elevation": 0, + "var": "VAR_0x4001", + "var_value": 1, + "script": "PokemonTower_5F_EventScript_163453" + }, + { + "type": "trigger", + "x": 13, + "y": 8, + "elevation": 0, + "var": "VAR_0x4001", + "var_value": 1, + "script": "PokemonTower_5F_EventScript_163453" + }, + { + "type": "trigger", + "x": 13, + "y": 9, + "elevation": 0, + "var": "VAR_0x4001", + "var_value": 1, + "script": "PokemonTower_5F_EventScript_163453" + }, + { + "type": "trigger", + "x": 13, + "y": 10, + "elevation": 0, + "var": "VAR_0x4001", + "var_value": 1, + "script": "PokemonTower_5F_EventScript_163453" + } + ], + "bg_events": [ + { + "type": "hidden_item", + "x": 7, + "y": 3, + "elevation": 3, + "item": "ITEM_BIG_MUSHROOM", + "flag": "14", + "unknown": 1 + } + ] +} \ No newline at end of file diff --git a/data/maps/PokemonTower_6F/events.inc b/data/maps/PokemonTower_6F/events.inc deleted file mode 100644 index 71638ab67..000000000 --- a/data/maps/PokemonTower_6F/events.inc +++ /dev/null @@ -1,17 +0,0 @@ -PokemonTower_6F_EventObjects: - object_event 1, 58, 0, 13, 0, 10, 0, 3, 10, 17, 0, 1, 0, 3, 0, PokemonTower_6F_EventScript_163514, 0, 0, 0 - object_event 2, 58, 0, 18, 0, 6, 0, 3, 9, 17, 0, 1, 0, 3, 0, PokemonTower_6F_EventScript_163542, 0, 0, 0 - object_event 3, 58, 0, 9, 0, 6, 0, 3, 8, 17, 0, 1, 0, 3, 0, PokemonTower_6F_EventScript_16352B, 0, 0, 0 - object_event 4, 92, 0, 5, 0, 15, 0, 3, 8, 17, 0, 0, 0, 0, 0, PokemonTower_6F_EventScript_1BE796, 380, 0, 0 - object_event 5, 92, 0, 15, 0, 15, 0, 3, 8, 17, 0, 0, 0, 0, 0, PokemonTower_6F_EventScript_1BE7A3, 381, 0, 0 - -PokemonTower_6F_MapWarps: - warp_def 11, 16, 3, 0, 350 - warp_def 18, 10, 3, 1, 348 - -PokemonTower_6F_MapCoordEvents: - coord_event 11, 15, 3, 0, 16473, 0, 0, PokemonTower_6F_EventScript_1634B8 - coord_event 12, 16, 3, 0, 16473, 0, 0, PokemonTower_6F_EventScript_1634B8 - -PokemonTower_6F_MapEvents:: - map_events PokemonTower_6F_EventObjects, PokemonTower_6F_MapWarps, PokemonTower_6F_MapCoordEvents, 0x0 diff --git a/data/maps/PokemonTower_6F/header.inc b/data/maps/PokemonTower_6F/header.inc deleted file mode 100644 index 6bafef55e..000000000 --- a/data/maps/PokemonTower_6F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -PokemonTower_6F:: @ 834FC40 - .4byte PokemonTower_6F_Layout @ 0x8317B68 - .4byte PokemonTower_6F_MapEvents @ 0x83B26C0 - .4byte PokemonTower_6F_MapScripts @ 0x81634B7 - .4byte NULL - .2byte BGM_FRLG_POKEMON_TOWER - .2byte 166 - .byte 0x8c, 0x00, 0x06, 0x08, 0x00, 0x05, 0x00, 0x02 diff --git a/data/maps/PokemonTower_6F/map.json b/data/maps/PokemonTower_6F/map.json new file mode 100644 index 000000000..8243176bb --- /dev/null +++ b/data/maps/PokemonTower_6F/map.json @@ -0,0 +1,119 @@ +{ + "id": "MAP_POKEMON_TOWER_6F", + "name": "PokemonTower_6F", + "layout": "LAYOUT_POKEMON_TOWER_6F", + "music": "BGM_FRLG_POKEMON_TOWER", + "region_map_section": "MAPSEC_POKEMON_TOWER", + "requires_flash": false, + "weather": "WEATHER_6", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 5, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_2", + "connections": null, + "object_events": [ + { + "graphics_id": "58", + "x": 13, + "y": 10, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "PokemonTower_6F_EventScript_163514", + "flag": "0" + }, + { + "graphics_id": "58", + "x": 18, + "y": 6, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "PokemonTower_6F_EventScript_163542", + "flag": "0" + }, + { + "graphics_id": "58", + "x": 9, + "y": 6, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "PokemonTower_6F_EventScript_16352B", + "flag": "0" + }, + { + "graphics_id": "92", + "x": 5, + "y": 15, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PokemonTower_6F_EventScript_1BE796", + "flag": "380" + }, + { + "graphics_id": "92", + "x": 15, + "y": 15, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PokemonTower_6F_EventScript_1BE7A3", + "flag": "381" + } + ], + "warp_events": [ + { + "x": 11, + "y": 16, + "elevation": 3, + "dest_map": "MAP_POKEMON_TOWER_7F", + "dest_warp_id": 0 + }, + { + "x": 18, + "y": 10, + "elevation": 3, + "dest_map": "MAP_POKEMON_TOWER_5F", + "dest_warp_id": 1 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 11, + "y": 15, + "elevation": 3, + "var": "VAR_0x4059", + "var_value": 0, + "script": "PokemonTower_6F_EventScript_1634B8" + }, + { + "type": "trigger", + "x": 12, + "y": 16, + "elevation": 3, + "var": "VAR_0x4059", + "var_value": 0, + "script": "PokemonTower_6F_EventScript_1634B8" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/PokemonTower_7F/events.inc b/data/maps/PokemonTower_7F/events.inc deleted file mode 100644 index a665515ff..000000000 --- a/data/maps/PokemonTower_7F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -PokemonTower_7F_EventObjects: - object_event 1, 78, 0, 11, 0, 4, 0, 3, 8, 17, 0, 0, 0, 0, 0, PokemonTower_7F_EventScript_16355A, 52, 0, 0 - object_event 2, 49, 0, 9, 0, 10, 0, 3, 10, 17, 0, 1, 0, 4, 0, PokemonTower_7F_EventScript_163586, 94, 0, 0 - object_event 3, 49, 0, 13, 0, 8, 0, 3, 9, 17, 0, 1, 0, 4, 0, PokemonTower_7F_EventScript_16363D, 131, 0, 0 - object_event 4, 49, 0, 9, 0, 6, 0, 3, 10, 17, 0, 1, 0, 4, 0, PokemonTower_7F_EventScript_1636D6, 132, 0, 0 - -PokemonTower_7F_MapWarps: - warp_def 11, 16, 3, 0, 349 - -PokemonTower_7F_MapBGEvents: - bg_event 11, 4, 3, 7, 0, 184, 159, 129 - -PokemonTower_7F_MapEvents:: - map_events PokemonTower_7F_EventObjects, PokemonTower_7F_MapWarps, 0x0, PokemonTower_7F_MapBGEvents diff --git a/data/maps/PokemonTower_7F/header.inc b/data/maps/PokemonTower_7F/header.inc deleted file mode 100644 index 4125a4d9f..000000000 --- a/data/maps/PokemonTower_7F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -PokemonTower_7F:: @ 834FC5C - .4byte PokemonTower_7F_Layout @ 0x8317F4C - .4byte PokemonTower_7F_MapEvents @ 0x83B2748 - .4byte PokemonTower_7F_MapScripts @ 0x8163559 - .4byte NULL - .2byte BGM_FRLG_POKEMON_TOWER - .2byte 167 - .byte 0x8c, 0x00, 0x06, 0x08, 0x00, 0x05, 0x00, 0x02 diff --git a/data/maps/PokemonTower_7F/map.json b/data/maps/PokemonTower_7F/map.json new file mode 100644 index 000000000..71ca0d08e --- /dev/null +++ b/data/maps/PokemonTower_7F/map.json @@ -0,0 +1,90 @@ +{ + "id": "MAP_POKEMON_TOWER_7F", + "name": "PokemonTower_7F", + "layout": "LAYOUT_POKEMON_TOWER_7F", + "music": "BGM_FRLG_POKEMON_TOWER", + "region_map_section": "MAPSEC_POKEMON_TOWER", + "requires_flash": false, + "weather": "WEATHER_6", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 5, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_2", + "connections": null, + "object_events": [ + { + "graphics_id": "78", + "x": 11, + "y": 4, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PokemonTower_7F_EventScript_16355A", + "flag": "52" + }, + { + "graphics_id": "49", + "x": 9, + "y": 10, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "PokemonTower_7F_EventScript_163586", + "flag": "94" + }, + { + "graphics_id": "49", + "x": 13, + "y": 8, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "PokemonTower_7F_EventScript_16363D", + "flag": "131" + }, + { + "graphics_id": "49", + "x": 9, + "y": 6, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "PokemonTower_7F_EventScript_1636D6", + "flag": "132" + } + ], + "warp_events": [ + { + "x": 11, + "y": 16, + "elevation": 3, + "dest_map": "MAP_POKEMON_TOWER_6F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 11, + "y": 4, + "elevation": 3, + "item": "ITEM_SOOTHE_BELL", + "flag": "159", + "unknown": 129 + } + ] +} \ No newline at end of file diff --git a/data/maps/PokemonTower_7F/scripts.inc b/data/maps/PokemonTower_7F/scripts.inc index 963251b49..29b281222 100644 --- a/data/maps/PokemonTower_7F/scripts.inc +++ b/data/maps/PokemonTower_7F/scripts.inc @@ -13,7 +13,7 @@ PokemonTower_7F_EventScript_16355A:: @ 816355A loadword 0, gUnknown_817A529 callstd 4 closemessage - warp MAP_LAVENDER_TOWN_VOLUNTEERPOKEMONHOUSE, 255, 4, 7 + warp MAP_LAVENDER_TOWN_VOLUNTEER_POKEMON_HOUSE, 255, 4, 7 waitstate release end diff --git a/data/maps/PowerPlant/events.inc b/data/maps/PowerPlant/events.inc deleted file mode 100644 index fcdaab532..000000000 --- a/data/maps/PowerPlant/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -PowerPlant_EventObjects: - object_event 1, 92, 0, 7, 0, 27, 0, 3, 8, 17, 0, 0, 0, 0, 0, PowerPlant_EventScript_1BE91C, 410, 0, 0 - object_event 2, 92, 0, 40, 0, 22, 0, 3, 8, 17, 0, 0, 0, 0, 0, PowerPlant_EventScript_1BE929, 411, 0, 0 - object_event 3, 92, 0, 46, 0, 37, 0, 3, 8, 17, 0, 0, 0, 0, 0, PowerPlant_EventScript_1BE936, 412, 0, 0 - object_event 4, 92, 0, 45, 0, 4, 0, 3, 8, 17, 0, 0, 0, 0, 0, PowerPlant_EventScript_1BE943, 413, 0, 0 - object_event 5, 92, 0, 26, 0, 22, 0, 3, 8, 17, 0, 0, 0, 0, 0, PowerPlant_EventScript_1BE950, 414, 0, 0 - object_event 6, 136, 0, 5, 0, 11, 0, 3, 8, 17, 0, 0, 0, 0, 0, PowerPlant_EventScript_1637B8, 93, 0, 0 - object_event 7, 92, 0, 36, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, PowerPlant_EventScript_16388D, 134, 0, 0 - object_event 8, 92, 0, 30, 0, 38, 0, 3, 8, 17, 0, 0, 0, 0, 0, PowerPlant_EventScript_16382F, 133, 0, 0 - -PowerPlant_MapWarps: - warp_def 4, 39, 3, 2, 796 - warp_def 5, 38, 3, 2, 796 - warp_def 6, 39, 3, 2, 796 - warp_def 1, 11, 3, 4, 796 - warp_def 0, 13, 3, 2, 796 - -PowerPlant_MapBGEvents: - bg_event 29, 16, 3, 7, 0, 37, 27, 1 - bg_event 8, 12, 3, 7, 0, 96, 28, 1 - -PowerPlant_MapEvents:: - map_events PowerPlant_EventObjects, PowerPlant_MapWarps, 0x0, PowerPlant_MapBGEvents diff --git a/data/maps/PowerPlant/header.inc b/data/maps/PowerPlant/header.inc deleted file mode 100644 index 530e24a98..000000000 --- a/data/maps/PowerPlant/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -PowerPlant:: @ 834FC78 - .4byte PowerPlant_Layout @ 0x8318EC0 - .4byte PowerPlant_MapEvents @ 0x83B285C - .4byte PowerPlant_MapScripts @ 0x8163764 - .4byte NULL - .2byte BGM_FRLG_POKEMON_MANSION - .2byte 168 - .byte 0x8e, 0x00, 0x00, 0x08, 0x00, 0x07, 0x00, 0x03 diff --git a/data/maps/PowerPlant/map.json b/data/maps/PowerPlant/map.json new file mode 100644 index 000000000..bc65392c2 --- /dev/null +++ b/data/maps/PowerPlant/map.json @@ -0,0 +1,179 @@ +{ + "id": "MAP_POWER_PLANT", + "name": "PowerPlant", + "layout": "LAYOUT_POWER_PLANT", + "music": "BGM_FRLG_POKEMON_MANSION", + "region_map_section": "MAPSEC_POWER_PLANT", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_3", + "connections": null, + "object_events": [ + { + "graphics_id": "92", + "x": 7, + "y": 27, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PowerPlant_EventScript_1BE91C", + "flag": "410" + }, + { + "graphics_id": "92", + "x": 40, + "y": 22, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PowerPlant_EventScript_1BE929", + "flag": "411" + }, + { + "graphics_id": "92", + "x": 46, + "y": 37, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PowerPlant_EventScript_1BE936", + "flag": "412" + }, + { + "graphics_id": "92", + "x": 45, + "y": 4, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PowerPlant_EventScript_1BE943", + "flag": "413" + }, + { + "graphics_id": "92", + "x": 26, + "y": 22, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PowerPlant_EventScript_1BE950", + "flag": "414" + }, + { + "graphics_id": "136", + "x": 5, + "y": 11, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PowerPlant_EventScript_1637B8", + "flag": "93" + }, + { + "graphics_id": "92", + "x": 36, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PowerPlant_EventScript_16388D", + "flag": "134" + }, + { + "graphics_id": "92", + "x": 30, + "y": 38, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PowerPlant_EventScript_16382F", + "flag": "133" + } + ], + "warp_events": [ + { + "x": 4, + "y": 39, + "elevation": 3, + "dest_map": "MAP_ROUTE10", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 38, + "elevation": 3, + "dest_map": "MAP_ROUTE10", + "dest_warp_id": 2 + }, + { + "x": 6, + "y": 39, + "elevation": 3, + "dest_map": "MAP_ROUTE10", + "dest_warp_id": 2 + }, + { + "x": 1, + "y": 11, + "elevation": 3, + "dest_map": "MAP_ROUTE10", + "dest_warp_id": 4 + }, + { + "x": 0, + "y": 13, + "elevation": 3, + "dest_map": "MAP_ROUTE10", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 29, + "y": 16, + "elevation": 3, + "item": "ITEM_MAX_ELIXIR", + "flag": "27", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 8, + "y": 12, + "elevation": 3, + "item": "ITEM_THUNDER_STONE", + "flag": "28", + "unknown": 1 + } + ] +} \ No newline at end of file diff --git a/data/maps/RockTunnel_1F/events.inc b/data/maps/RockTunnel_1F/events.inc deleted file mode 100644 index e9166bed9..000000000 --- a/data/maps/RockTunnel_1F/events.inc +++ /dev/null @@ -1,25 +0,0 @@ -RockTunnel_1F_EventObjects: - object_event 1, 40, 0, 26, 0, 28, 0, 3, 8, 17, 0, 1, 0, 3, 0, RockTunnel_1F_EventScript_162E73, 0, 0, 0 - object_event 2, 40, 0, 39, 0, 27, 0, 3, 10, 17, 0, 1, 0, 4, 0, RockTunnel_1F_EventScript_162E5C, 0, 0, 0 - object_event 3, 40, 0, 45, 0, 24, 0, 3, 9, 17, 0, 1, 0, 5, 0, RockTunnel_1F_EventScript_162E45, 0, 0, 0 - object_event 4, 56, 0, 20, 0, 17, 0, 3, 9, 17, 0, 1, 0, 4, 0, RockTunnel_1F_EventScript_162E17, 0, 0, 0 - object_event 5, 56, 0, 5, 0, 20, 0, 3, 8, 17, 0, 1, 0, 4, 0, RockTunnel_1F_EventScript_162E00, 0, 0, 0 - object_event 6, 56, 0, 7, 0, 5, 0, 3, 8, 17, 0, 1, 0, 4, 0, RockTunnel_1F_EventScript_162DE9, 0, 0, 0 - object_event 7, 52, 0, 27, 0, 10, 0, 3, 9, 17, 0, 1, 0, 3, 0, RockTunnel_1F_EventScript_162E2E, 0, 0, 0 - object_event 8, 92, 0, 37, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, RockTunnel_1F_EventScript_1BEB0A, 451, 0, 0 - object_event 9, 92, 0, 33, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, RockTunnel_1F_EventScript_1BEB17, 452, 0, 0 - object_event 10, 92, 0, 22, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, RockTunnel_1F_EventScript_1BEB24, 453, 0, 0 - -RockTunnel_1F_MapWarps: - warp_def 17, 2, 3, 0, 796 - warp_def 45, 2, 3, 0, 338 - warp_def 4, 2, 3, 1, 338 - warp_def 20, 13, 3, 2, 338 - warp_def 45, 21, 3, 3, 338 - warp_def 18, 37, 3, 1, 796 - -RockTunnel_1F_MapBGEvents: - bg_event 14, 33, 3, 0, 0, RockTunnel_1F_EventScript_162DE0 - -RockTunnel_1F_MapEvents:: - map_events RockTunnel_1F_EventObjects, RockTunnel_1F_MapWarps, 0x0, RockTunnel_1F_MapBGEvents diff --git a/data/maps/RockTunnel_1F/header.inc b/data/maps/RockTunnel_1F/header.inc deleted file mode 100644 index 5a9e6fac6..000000000 --- a/data/maps/RockTunnel_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -RockTunnel_1F:: @ 834FAF0 - .4byte RockTunnel_1F_Layout @ 0x83130E4 - .4byte RockTunnel_1F_MapEvents @ 0x83B1B2C - .4byte RockTunnel_1F_MapScripts @ 0x8162DD6 - .4byte NULL - .2byte BGM_FRLG_MT_MOON - .2byte 154 - .byte 0x8a, 0x01, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/RockTunnel_1F/map.json b/data/maps/RockTunnel_1F/map.json new file mode 100644 index 000000000..d1e0c78f6 --- /dev/null +++ b/data/maps/RockTunnel_1F/map.json @@ -0,0 +1,201 @@ +{ + "id": "MAP_ROCK_TUNNEL_1F", + "name": "RockTunnel_1F", + "layout": "LAYOUT_ROCK_TUNNEL_1F", + "music": "BGM_FRLG_MT_MOON", + "region_map_section": "MAPSEC_ROCK_TUNNEL", + "requires_flash": true, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "40", + "x": 26, + "y": 28, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "RockTunnel_1F_EventScript_162E73", + "flag": "0" + }, + { + "graphics_id": "40", + "x": 39, + "y": 27, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "RockTunnel_1F_EventScript_162E5C", + "flag": "0" + }, + { + "graphics_id": "40", + "x": 45, + "y": 24, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "RockTunnel_1F_EventScript_162E45", + "flag": "0" + }, + { + "graphics_id": "56", + "x": 20, + "y": 17, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "RockTunnel_1F_EventScript_162E17", + "flag": "0" + }, + { + "graphics_id": "56", + "x": 5, + "y": 20, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "RockTunnel_1F_EventScript_162E00", + "flag": "0" + }, + { + "graphics_id": "56", + "x": 7, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "RockTunnel_1F_EventScript_162DE9", + "flag": "0" + }, + { + "graphics_id": "52", + "x": 27, + "y": 10, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "RockTunnel_1F_EventScript_162E2E", + "flag": "0" + }, + { + "graphics_id": "92", + "x": 37, + "y": 5, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RockTunnel_1F_EventScript_1BEB0A", + "flag": "451" + }, + { + "graphics_id": "92", + "x": 33, + "y": 22, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RockTunnel_1F_EventScript_1BEB17", + "flag": "452" + }, + { + "graphics_id": "92", + "x": 22, + "y": 22, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RockTunnel_1F_EventScript_1BEB24", + "flag": "453" + } + ], + "warp_events": [ + { + "x": 17, + "y": 2, + "elevation": 3, + "dest_map": "MAP_ROUTE10", + "dest_warp_id": 0 + }, + { + "x": 45, + "y": 2, + "elevation": 3, + "dest_map": "MAP_ROCK_TUNNEL_B1F", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 2, + "elevation": 3, + "dest_map": "MAP_ROCK_TUNNEL_B1F", + "dest_warp_id": 1 + }, + { + "x": 20, + "y": 13, + "elevation": 3, + "dest_map": "MAP_ROCK_TUNNEL_B1F", + "dest_warp_id": 2 + }, + { + "x": 45, + "y": 21, + "elevation": 3, + "dest_map": "MAP_ROCK_TUNNEL_B1F", + "dest_warp_id": 3 + }, + { + "x": 18, + "y": 37, + "elevation": 3, + "dest_map": "MAP_ROUTE10", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 14, + "y": 33, + "elevation": 3, + "script": "RockTunnel_1F_EventScript_162DE0" + } + ] +} \ No newline at end of file diff --git a/data/maps/RockTunnel_B1F/events.inc b/data/maps/RockTunnel_B1F/events.inc deleted file mode 100644 index f0f2ad914..000000000 --- a/data/maps/RockTunnel_B1F/events.inc +++ /dev/null @@ -1,36 +0,0 @@ -RockTunnel_B1F_EventObjects: - object_event 1, 52, 0, 2, 0, 6, 0, 3, 1, 17, 0, 1, 0, 2, 0, RockTunnel_B1F_EventScript_162EFE, 0, 0, 0 - object_event 2, 56, 0, 5, 0, 11, 0, 3, 8, 17, 0, 1, 0, 4, 0, RockTunnel_B1F_EventScript_162EB9, 0, 0, 0 - object_event 3, 40, 0, 11, 0, 15, 0, 3, 8, 17, 0, 1, 0, 4, 0, RockTunnel_B1F_EventScript_162E8B, 0, 0, 0 - object_event 4, 56, 0, 36, 0, 11, 0, 3, 8, 17, 0, 1, 0, 3, 0, RockTunnel_B1F_EventScript_162ED0, 0, 0, 0 - object_event 5, 56, 0, 41, 0, 5, 0, 3, 10, 17, 0, 1, 0, 3, 0, RockTunnel_B1F_EventScript_162EE7, 0, 0, 0 - object_event 6, 52, 0, 23, 0, 23, 0, 3, 10, 17, 0, 1, 0, 4, 0, RockTunnel_B1F_EventScript_162F15, 0, 0, 0 - object_event 7, 40, 0, 15, 0, 33, 0, 3, 10, 17, 0, 1, 0, 2, 0, RockTunnel_B1F_EventScript_162EA2, 0, 0, 0 - object_event 8, 52, 0, 29, 0, 35, 0, 3, 8, 17, 0, 1, 0, 3, 0, RockTunnel_B1F_EventScript_162F2C, 0, 0, 0 - object_event 9, 18, 0, 2, 0, 29, 0, 3, 10, 17, 0, 0, 0, 0, 0, RockTunnel_B1F_EventScript_1C487E, 0, 0, 0 - object_event 10, 92, 0, 2, 0, 37, 0, 3, 8, 17, 0, 0, 0, 0, 0, RockTunnel_B1F_EventScript_1BEB31, 454, 0, 0 - object_event 11, 92, 0, 9, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, RockTunnel_B1F_EventScript_1BEB3E, 455, 0, 0 - object_event 12, 96, 0, 1, 0, 20, 0, 3, 1, 17, 0, 0, 0, 0, 0, RockTunnel_B1F_EventScript_1BE00C, 18, 0, 0 - object_event 13, 96, 0, 1, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, RockTunnel_B1F_EventScript_1BE00C, 19, 0, 0 - object_event 14, 96, 0, 4, 0, 23, 0, 3, 1, 17, 0, 0, 0, 0, 0, RockTunnel_B1F_EventScript_1BE00C, 20, 0, 0 - object_event 15, 96, 0, 2, 0, 23, 0, 3, 1, 17, 0, 0, 0, 0, 0, RockTunnel_B1F_EventScript_1BE00C, 21, 0, 0 - object_event 16, 96, 0, 39, 0, 26, 0, 3, 1, 17, 0, 0, 0, 0, 0, RockTunnel_B1F_EventScript_1BE00C, 22, 0, 0 - object_event 17, 96, 0, 42, 0, 26, 0, 3, 1, 17, 0, 0, 0, 0, 0, RockTunnel_B1F_EventScript_1BE00C, 23, 0, 0 - object_event 18, 96, 0, 43, 0, 28, 0, 3, 1, 17, 0, 0, 0, 0, 0, RockTunnel_B1F_EventScript_1BE00C, 24, 0, 0 - object_event 19, 96, 0, 45, 0, 30, 0, 3, 1, 17, 0, 0, 0, 0, 0, RockTunnel_B1F_EventScript_1BE00C, 25, 0, 0 - object_event 20, 96, 0, 45, 0, 33, 0, 3, 1, 17, 0, 0, 0, 0, 0, RockTunnel_B1F_EventScript_1BE00C, 26, 0, 0 - object_event 21, 96, 0, 25, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0, 0, RockTunnel_B1F_EventScript_1BE00C, 27, 0, 0 - object_event 22, 96, 0, 27, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, RockTunnel_B1F_EventScript_1BE00C, 28, 0, 0 - object_event 23, 96, 0, 23, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0, 0, RockTunnel_B1F_EventScript_1BE00C, 29, 0, 0 - object_event 24, 96, 0, 26, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0, 0, RockTunnel_B1F_EventScript_1BE00C, 30, 0, 0 - object_event 25, 96, 0, 24, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, RockTunnel_B1F_EventScript_1BE00C, 31, 0, 0 - object_event 26, 96, 0, 27, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, RockTunnel_B1F_EventScript_1BE00C, 17, 0, 0 - -RockTunnel_B1F_MapWarps: - warp_def 38, 28, 3, 1, 337 - warp_def 33, 3, 3, 2, 337 - warp_def 27, 12, 3, 3, 337 - warp_def 2, 3, 3, 4, 337 - -RockTunnel_B1F_MapEvents:: - map_events RockTunnel_B1F_EventObjects, RockTunnel_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/RockTunnel_B1F/header.inc b/data/maps/RockTunnel_B1F/header.inc deleted file mode 100644 index 7ee412e7b..000000000 --- a/data/maps/RockTunnel_B1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -RockTunnel_B1F:: @ 834FB0C - .4byte RockTunnel_B1F_Layout @ 0x8314008 - .4byte RockTunnel_B1F_MapEvents @ 0x83B1DD0 - .4byte RockTunnel_B1F_MapScripts @ 0x8162E8A - .4byte NULL - .2byte BGM_FRLG_MT_MOON - .2byte 155 - .byte 0x8a, 0x01, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/RockTunnel_B1F/map.json b/data/maps/RockTunnel_B1F/map.json new file mode 100644 index 000000000..474efd82f --- /dev/null +++ b/data/maps/RockTunnel_B1F/map.json @@ -0,0 +1,387 @@ +{ + "id": "MAP_ROCK_TUNNEL_B1F", + "name": "RockTunnel_B1F", + "layout": "LAYOUT_ROCK_TUNNEL_B1F", + "music": "BGM_FRLG_MT_MOON", + "region_map_section": "MAPSEC_ROCK_TUNNEL", + "requires_flash": true, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "52", + "x": 2, + "y": 6, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "RockTunnel_B1F_EventScript_162EFE", + "flag": "0" + }, + { + "graphics_id": "56", + "x": 5, + "y": 11, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "RockTunnel_B1F_EventScript_162EB9", + "flag": "0" + }, + { + "graphics_id": "40", + "x": 11, + "y": 15, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "RockTunnel_B1F_EventScript_162E8B", + "flag": "0" + }, + { + "graphics_id": "56", + "x": 36, + "y": 11, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "RockTunnel_B1F_EventScript_162ED0", + "flag": "0" + }, + { + "graphics_id": "56", + "x": 41, + "y": 5, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "RockTunnel_B1F_EventScript_162EE7", + "flag": "0" + }, + { + "graphics_id": "52", + "x": 23, + "y": 23, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "RockTunnel_B1F_EventScript_162F15", + "flag": "0" + }, + { + "graphics_id": "40", + "x": 15, + "y": 33, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "RockTunnel_B1F_EventScript_162EA2", + "flag": "0" + }, + { + "graphics_id": "52", + "x": 29, + "y": 35, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "RockTunnel_B1F_EventScript_162F2C", + "flag": "0" + }, + { + "graphics_id": "18", + "x": 2, + "y": 29, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RockTunnel_B1F_EventScript_1C487E", + "flag": "0" + }, + { + "graphics_id": "92", + "x": 2, + "y": 37, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RockTunnel_B1F_EventScript_1BEB31", + "flag": "454" + }, + { + "graphics_id": "92", + "x": 9, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RockTunnel_B1F_EventScript_1BEB3E", + "flag": "455" + }, + { + "graphics_id": "96", + "x": 1, + "y": 20, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RockTunnel_B1F_EventScript_1BE00C", + "flag": "18" + }, + { + "graphics_id": "96", + "x": 1, + "y": 22, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RockTunnel_B1F_EventScript_1BE00C", + "flag": "19" + }, + { + "graphics_id": "96", + "x": 4, + "y": 23, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RockTunnel_B1F_EventScript_1BE00C", + "flag": "20" + }, + { + "graphics_id": "96", + "x": 2, + "y": 23, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RockTunnel_B1F_EventScript_1BE00C", + "flag": "21" + }, + { + "graphics_id": "96", + "x": 39, + "y": 26, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RockTunnel_B1F_EventScript_1BE00C", + "flag": "22" + }, + { + "graphics_id": "96", + "x": 42, + "y": 26, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RockTunnel_B1F_EventScript_1BE00C", + "flag": "23" + }, + { + "graphics_id": "96", + "x": 43, + "y": 28, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RockTunnel_B1F_EventScript_1BE00C", + "flag": "24" + }, + { + "graphics_id": "96", + "x": 45, + "y": 30, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RockTunnel_B1F_EventScript_1BE00C", + "flag": "25" + }, + { + "graphics_id": "96", + "x": 45, + "y": 33, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RockTunnel_B1F_EventScript_1BE00C", + "flag": "26" + }, + { + "graphics_id": "96", + "x": 25, + "y": 1, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RockTunnel_B1F_EventScript_1BE00C", + "flag": "27" + }, + { + "graphics_id": "96", + "x": 27, + "y": 4, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RockTunnel_B1F_EventScript_1BE00C", + "flag": "28" + }, + { + "graphics_id": "96", + "x": 23, + "y": 2, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RockTunnel_B1F_EventScript_1BE00C", + "flag": "29" + }, + { + "graphics_id": "96", + "x": 26, + "y": 2, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RockTunnel_B1F_EventScript_1BE00C", + "flag": "30" + }, + { + "graphics_id": "96", + "x": 24, + "y": 7, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RockTunnel_B1F_EventScript_1BE00C", + "flag": "31" + }, + { + "graphics_id": "96", + "x": 27, + "y": 6, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RockTunnel_B1F_EventScript_1BE00C", + "flag": "17" + } + ], + "warp_events": [ + { + "x": 38, + "y": 28, + "elevation": 3, + "dest_map": "MAP_ROCK_TUNNEL_1F", + "dest_warp_id": 1 + }, + { + "x": 33, + "y": 3, + "elevation": 3, + "dest_map": "MAP_ROCK_TUNNEL_1F", + "dest_warp_id": 2 + }, + { + "x": 27, + "y": 12, + "elevation": 3, + "dest_map": "MAP_ROCK_TUNNEL_1F", + "dest_warp_id": 3 + }, + { + "x": 2, + "y": 3, + "elevation": 3, + "dest_map": "MAP_ROCK_TUNNEL_1F", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/RocketHideout_B1F/events.inc b/data/maps/RocketHideout_B1F/events.inc deleted file mode 100644 index d70fd2b8a..000000000 --- a/data/maps/RocketHideout_B1F/events.inc +++ /dev/null @@ -1,22 +0,0 @@ -RocketHideout_B1F_EventObjects: - object_event 1, 49, 0, 4, 0, 9, 0, 3, 10, 17, 0, 1, 0, 5, 0, RocketHideout_B1F_EventScript_1611C5, 173, 0, 0 - object_event 2, 49, 0, 24, 0, 12, 0, 3, 9, 17, 0, 1, 0, 2, 0, RocketHideout_B1F_EventScript_1611AE, 173, 0, 0 - object_event 3, 49, 0, 6, 0, 32, 0, 3, 10, 17, 0, 1, 0, 4, 0, RocketHideout_B1F_EventScript_1611F3, 173, 0, 0 - object_event 4, 49, 0, 10, 0, 22, 0, 3, 8, 17, 0, 1, 0, 3, 0, RocketHideout_B1F_EventScript_1611DC, 173, 0, 0 - object_event 5, 49, 0, 21, 0, 27, 0, 3, 16, 17, 0, 1, 0, 3, 0, RocketHideout_B1F_EventScript_16120A, 173, 0, 0 - object_event 6, 92, 0, 5, 0, 16, 0, 0, 8, 17, 0, 0, 0, 0, 0, RocketHideout_B1F_EventScript_1BE6C6, 364, 0, 0 - object_event 7, 92, 0, 1, 0, 22, 0, 3, 8, 17, 0, 0, 0, 0, 0, RocketHideout_B1F_EventScript_1BE6D3, 365, 0, 0 - -RocketHideout_B1F_MapWarps: - warp_def 12, 2, 3, 3, 2574 - warp_def 17, 2, 3, 1, 299 - warp_def 15, 30, 3, 2, 299 - warp_def 23, 25, 0, 1, 302 - warp_def 24, 25, 0, 1, 302 - warp_def 25, 25, 0, 1, 302 - -RocketHideout_B1F_MapBGEvents: - bg_event 16, 17, 0, 7, 0, 69, 11, 1 - -RocketHideout_B1F_MapEvents:: - map_events RocketHideout_B1F_EventObjects, RocketHideout_B1F_MapWarps, 0x0, RocketHideout_B1F_MapBGEvents diff --git a/data/maps/RocketHideout_B1F/header.inc b/data/maps/RocketHideout_B1F/header.inc deleted file mode 100644 index 76da1d708..000000000 --- a/data/maps/RocketHideout_B1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -RocketHideout_B1F:: @ 834F6AC - .4byte RocketHideout_B1F_Layout @ 0x8305C28 - .4byte RocketHideout_B1F_MapEvents @ 0x83AF9D8 - .4byte RocketHideout_B1F_MapScripts @ 0x8161195 - .4byte NULL - .2byte BGM_FRLG_ROCKET_HIDEOUT - .2byte 128 - .byte 0x85, 0x00, 0x00, 0x08, 0x00, 0x07, 0xff, 0x03 diff --git a/data/maps/RocketHideout_B1F/map.json b/data/maps/RocketHideout_B1F/map.json new file mode 100644 index 000000000..6bcfd6dcb --- /dev/null +++ b/data/maps/RocketHideout_B1F/map.json @@ -0,0 +1,164 @@ +{ + "id": "MAP_ROCKET_HIDEOUT_B1F", + "name": "RocketHideout_B1F", + "layout": "LAYOUT_ROCKET_HIDEOUT_B1F", + "music": "BGM_FRLG_ROCKET_HIDEOUT", + "region_map_section": "MAPSEC_ROCKET_HIDEOUT", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 7, + "elevator_flag": -1, + "battle_scene": "BATTLE_SCENE_3", + "connections": null, + "object_events": [ + { + "graphics_id": "49", + "x": 4, + "y": 9, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "RocketHideout_B1F_EventScript_1611C5", + "flag": "173" + }, + { + "graphics_id": "49", + "x": 24, + "y": 12, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "RocketHideout_B1F_EventScript_1611AE", + "flag": "173" + }, + { + "graphics_id": "49", + "x": 6, + "y": 32, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "RocketHideout_B1F_EventScript_1611F3", + "flag": "173" + }, + { + "graphics_id": "49", + "x": 10, + "y": 22, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "RocketHideout_B1F_EventScript_1611DC", + "flag": "173" + }, + { + "graphics_id": "49", + "x": 21, + "y": 27, + "elevation": 3, + "movement_type": "16", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "RocketHideout_B1F_EventScript_16120A", + "flag": "173" + }, + { + "graphics_id": "92", + "x": 5, + "y": 16, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RocketHideout_B1F_EventScript_1BE6C6", + "flag": "364" + }, + { + "graphics_id": "92", + "x": 1, + "y": 22, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RocketHideout_B1F_EventScript_1BE6D3", + "flag": "365" + } + ], + "warp_events": [ + { + "x": 12, + "y": 2, + "elevation": 3, + "dest_map": "MAP_CELADON_CITY_GAME_CORNER", + "dest_warp_id": 3 + }, + { + "x": 17, + "y": 2, + "elevation": 3, + "dest_map": "MAP_ROCKET_HIDEOUT_B2F", + "dest_warp_id": 1 + }, + { + "x": 15, + "y": 30, + "elevation": 3, + "dest_map": "MAP_ROCKET_HIDEOUT_B2F", + "dest_warp_id": 2 + }, + { + "x": 23, + "y": 25, + "elevation": 0, + "dest_map": "MAP_ROCKET_HIDEOUT_ELEVATOR", + "dest_warp_id": 1 + }, + { + "x": 24, + "y": 25, + "elevation": 0, + "dest_map": "MAP_ROCKET_HIDEOUT_ELEVATOR", + "dest_warp_id": 1 + }, + { + "x": 25, + "y": 25, + "elevation": 0, + "dest_map": "MAP_ROCKET_HIDEOUT_ELEVATOR", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 16, + "y": 17, + "elevation": 0, + "item": "ITEM_PP_UP", + "flag": "11", + "unknown": 1 + } + ] +} \ No newline at end of file diff --git a/data/maps/RocketHideout_B2F/events.inc b/data/maps/RocketHideout_B2F/events.inc deleted file mode 100644 index a28f1b8b2..000000000 --- a/data/maps/RocketHideout_B2F/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -RocketHideout_B2F_EventObjects: - object_event 1, 49, 0, 20, 0, 6, 0, 3, 1, 17, 0, 1, 0, 2, 0, RocketHideout_B2F_EventScript_1612A2, 173, 0, 0 - object_event 2, 92, 0, 15, 0, 3, 0, 3, 8, 17, 0, 0, 0, 0, 0, RocketHideout_B2F_EventScript_1BE6E0, 366, 0, 0 - object_event 3, 92, 0, 2, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, RocketHideout_B2F_EventScript_1BE6ED, 367, 0, 0 - object_event 4, 92, 0, 5, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, RocketHideout_B2F_EventScript_1BE6FA, 368, 0, 0 - object_event 5, 92, 0, 0, 0, 14, 0, 3, 8, 17, 0, 0, 0, 0, 0, RocketHideout_B2F_EventScript_1BE707, 369, 0, 0 - -RocketHideout_B2F_MapWarps: - warp_def 21, 2, 3, 0, 300 - warp_def 28, 2, 3, 1, 298 - warp_def 23, 12, 3, 2, 298 - warp_def 28, 16, 0, 1, 302 - warp_def 29, 16, 0, 1, 302 - -RocketHideout_B2F_MapEvents:: - map_events RocketHideout_B2F_EventObjects, RocketHideout_B2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/RocketHideout_B2F/header.inc b/data/maps/RocketHideout_B2F/header.inc deleted file mode 100644 index 6f3624422..000000000 --- a/data/maps/RocketHideout_B2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -RocketHideout_B2F:: @ 834F6C8 - .4byte RocketHideout_B2F_Layout @ 0x83061CC - .4byte RocketHideout_B2F_MapEvents @ 0x83AFA8C - .4byte RocketHideout_B2F_MapScripts @ 0x81612A1 - .4byte NULL - .2byte BGM_FRLG_ROCKET_HIDEOUT - .2byte 129 - .byte 0x85, 0x00, 0x00, 0x08, 0x00, 0x07, 0xfe, 0x03 diff --git a/data/maps/RocketHideout_B2F/map.json b/data/maps/RocketHideout_B2F/map.json new file mode 100644 index 000000000..a5b3bbe4b --- /dev/null +++ b/data/maps/RocketHideout_B2F/map.json @@ -0,0 +1,121 @@ +{ + "id": "MAP_ROCKET_HIDEOUT_B2F", + "name": "RocketHideout_B2F", + "layout": "LAYOUT_ROCKET_HIDEOUT_B2F", + "music": "BGM_FRLG_ROCKET_HIDEOUT", + "region_map_section": "MAPSEC_ROCKET_HIDEOUT", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 7, + "elevator_flag": -2, + "battle_scene": "BATTLE_SCENE_3", + "connections": null, + "object_events": [ + { + "graphics_id": "49", + "x": 20, + "y": 6, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "RocketHideout_B2F_EventScript_1612A2", + "flag": "173" + }, + { + "graphics_id": "92", + "x": 15, + "y": 3, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RocketHideout_B2F_EventScript_1BE6E0", + "flag": "366" + }, + { + "graphics_id": "92", + "x": 2, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RocketHideout_B2F_EventScript_1BE6ED", + "flag": "367" + }, + { + "graphics_id": "92", + "x": 5, + "y": 7, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RocketHideout_B2F_EventScript_1BE6FA", + "flag": "368" + }, + { + "graphics_id": "92", + "x": 0, + "y": 14, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RocketHideout_B2F_EventScript_1BE707", + "flag": "369" + } + ], + "warp_events": [ + { + "x": 21, + "y": 2, + "elevation": 3, + "dest_map": "MAP_ROCKET_HIDEOUT_B3F", + "dest_warp_id": 0 + }, + { + "x": 28, + "y": 2, + "elevation": 3, + "dest_map": "MAP_ROCKET_HIDEOUT_B1F", + "dest_warp_id": 1 + }, + { + "x": 23, + "y": 12, + "elevation": 3, + "dest_map": "MAP_ROCKET_HIDEOUT_B1F", + "dest_warp_id": 2 + }, + { + "x": 28, + "y": 16, + "elevation": 0, + "dest_map": "MAP_ROCKET_HIDEOUT_ELEVATOR", + "dest_warp_id": 1 + }, + { + "x": 29, + "y": 16, + "elevation": 0, + "dest_map": "MAP_ROCKET_HIDEOUT_ELEVATOR", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/RocketHideout_B3F/events.inc b/data/maps/RocketHideout_B3F/events.inc deleted file mode 100644 index a04b9cdc4..000000000 --- a/data/maps/RocketHideout_B3F/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -RocketHideout_B3F_EventObjects: - object_event 1, 49, 0, 19, 0, 9, 0, 3, 7, 17, 0, 1, 0, 4, 0, RocketHideout_B3F_EventScript_1612D1, 173, 0, 0 - object_event 2, 49, 0, 2, 0, 20, 0, 3, 10, 17, 0, 1, 0, 2, 0, RocketHideout_B3F_EventScript_1612BA, 173, 0, 0 - object_event 3, 92, 0, 12, 0, 12, 0, 3, 8, 17, 0, 0, 0, 0, 0, RocketHideout_B3F_EventScript_1BE714, 370, 0, 0 - object_event 4, 92, 0, 19, 0, 14, 0, 3, 8, 17, 0, 0, 0, 0, 0, RocketHideout_B3F_EventScript_1BE721, 371, 0, 0 - object_event 5, 92, 0, 14, 0, 24, 0, 3, 8, 17, 0, 0, 0, 0, 0, RocketHideout_B3F_EventScript_1BEBCD, 466, 0, 0 - -RocketHideout_B3F_MapWarps: - warp_def 18, 2, 3, 0, 299 - warp_def 15, 18, 3, 0, 301 - -RocketHideout_B3F_MapBGEvents: - bg_event 1, 3, 3, 7, 0, 110, 12, 1 - -RocketHideout_B3F_MapEvents:: - map_events RocketHideout_B3F_EventObjects, RocketHideout_B3F_MapWarps, 0x0, RocketHideout_B3F_MapBGEvents diff --git a/data/maps/RocketHideout_B3F/header.inc b/data/maps/RocketHideout_B3F/header.inc deleted file mode 100644 index 82aff9271..000000000 --- a/data/maps/RocketHideout_B3F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -RocketHideout_B3F:: @ 834F6E4 - .4byte RocketHideout_B3F_Layout @ 0x8306694 - .4byte RocketHideout_B3F_MapEvents @ 0x83AFB34 - .4byte RocketHideout_B3F_MapScripts @ 0x81612B9 - .4byte NULL - .2byte BGM_FRLG_ROCKET_HIDEOUT - .2byte 130 - .byte 0x85, 0x00, 0x00, 0x08, 0x00, 0x07, 0xfd, 0x03 diff --git a/data/maps/RocketHideout_B3F/map.json b/data/maps/RocketHideout_B3F/map.json new file mode 100644 index 000000000..46a504ca0 --- /dev/null +++ b/data/maps/RocketHideout_B3F/map.json @@ -0,0 +1,110 @@ +{ + "id": "MAP_ROCKET_HIDEOUT_B3F", + "name": "RocketHideout_B3F", + "layout": "LAYOUT_ROCKET_HIDEOUT_B3F", + "music": "BGM_FRLG_ROCKET_HIDEOUT", + "region_map_section": "MAPSEC_ROCKET_HIDEOUT", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 7, + "elevator_flag": -3, + "battle_scene": "BATTLE_SCENE_3", + "connections": null, + "object_events": [ + { + "graphics_id": "49", + "x": 19, + "y": 9, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "RocketHideout_B3F_EventScript_1612D1", + "flag": "173" + }, + { + "graphics_id": "49", + "x": 2, + "y": 20, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "RocketHideout_B3F_EventScript_1612BA", + "flag": "173" + }, + { + "graphics_id": "92", + "x": 12, + "y": 12, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RocketHideout_B3F_EventScript_1BE714", + "flag": "370" + }, + { + "graphics_id": "92", + "x": 19, + "y": 14, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RocketHideout_B3F_EventScript_1BE721", + "flag": "371" + }, + { + "graphics_id": "92", + "x": 14, + "y": 24, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RocketHideout_B3F_EventScript_1BEBCD", + "flag": "466" + } + ], + "warp_events": [ + { + "x": 18, + "y": 2, + "elevation": 3, + "dest_map": "MAP_ROCKET_HIDEOUT_B2F", + "dest_warp_id": 0 + }, + { + "x": 15, + "y": 18, + "elevation": 3, + "dest_map": "MAP_ROCKET_HIDEOUT_B4F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 1, + "y": 3, + "elevation": 3, + "item": "ITEM_NUGGET", + "flag": "12", + "unknown": 1 + } + ] +} \ No newline at end of file diff --git a/data/maps/RocketHideout_B4F/events.inc b/data/maps/RocketHideout_B4F/events.inc deleted file mode 100644 index 1f2d1013a..000000000 --- a/data/maps/RocketHideout_B4F/events.inc +++ /dev/null @@ -1,22 +0,0 @@ -RocketHideout_B4F_EventObjects: - object_event 1, 87, 0, 19, 0, 4, 0, 3, 8, 17, 0, 0, 0, 0, 0, RocketHideout_B4F_EventScript_161317, 56, 0, 0 - object_event 2, 92, 0, 20, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, RocketHideout_B4F_EventScript_161363, 55, 0, 0 - object_event 3, 49, 0, 4, 0, 2, 0, 3, 8, 17, 0, 1, 0, 1, 0, RocketHideout_B4F_EventScript_161381, 173, 0, 0 - object_event 4, 92, 0, 3, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, RocketHideout_B4F_EventScript_1613AD, 54, 0, 0 - object_event 5, 49, 0, 19, 0, 14, 0, 3, 8, 17, 0, 1, 0, 0, 0, RocketHideout_B4F_EventScript_161418, 173, 0, 0 - object_event 6, 49, 0, 16, 0, 14, 0, 3, 8, 17, 0, 1, 0, 0, 0, RocketHideout_B4F_EventScript_1613CE, 173, 0, 0 - object_event 7, 92, 0, 1, 0, 6, 0, 3, 8, 17, 0, 0, 0, 0, 0, RocketHideout_B4F_EventScript_1BE72E, 372, 0, 0 - object_event 8, 92, 0, 4, 0, 14, 0, 0, 8, 17, 0, 0, 0, 0, 0, RocketHideout_B4F_EventScript_1BE73B, 373, 0, 0 - object_event 9, 92, 0, 6, 0, 23, 0, 0, 8, 17, 0, 0, 0, 0, 0, RocketHideout_B4F_EventScript_1BE748, 374, 0, 0 - -RocketHideout_B4F_MapWarps: - warp_def 11, 15, 3, 1, 300 - warp_def 20, 23, 0, 1, 302 - warp_def 21, 23, 0, 1, 302 - -RocketHideout_B4F_MapBGEvents: - bg_event 22, 6, 3, 7, 0, 8, 13, 1 - bg_event 16, 6, 3, 7, 0, 6, 134, 1 - -RocketHideout_B4F_MapEvents:: - map_events RocketHideout_B4F_EventObjects, RocketHideout_B4F_MapWarps, 0x0, RocketHideout_B4F_MapBGEvents diff --git a/data/maps/RocketHideout_B4F/header.inc b/data/maps/RocketHideout_B4F/header.inc deleted file mode 100644 index 1d37c165d..000000000 --- a/data/maps/RocketHideout_B4F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -RocketHideout_B4F:: @ 834F700 - .4byte RocketHideout_B4F_Layout @ 0x8306B98 - .4byte RocketHideout_B4F_MapEvents @ 0x83AFC50 - .4byte RocketHideout_B4F_MapScripts @ 0x81612E8 - .4byte NULL - .2byte BGM_FRLG_ROCKET_HIDEOUT - .2byte 131 - .byte 0x85, 0x00, 0x00, 0x08, 0x00, 0x07, 0xfc, 0x03 diff --git a/data/maps/RocketHideout_B4F/map.json b/data/maps/RocketHideout_B4F/map.json new file mode 100644 index 000000000..8f28dd94e --- /dev/null +++ b/data/maps/RocketHideout_B4F/map.json @@ -0,0 +1,178 @@ +{ + "id": "MAP_ROCKET_HIDEOUT_B4F", + "name": "RocketHideout_B4F", + "layout": "LAYOUT_ROCKET_HIDEOUT_B4F", + "music": "BGM_FRLG_ROCKET_HIDEOUT", + "region_map_section": "MAPSEC_ROCKET_HIDEOUT", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 7, + "elevator_flag": -4, + "battle_scene": "BATTLE_SCENE_3", + "connections": null, + "object_events": [ + { + "graphics_id": "87", + "x": 19, + "y": 4, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RocketHideout_B4F_EventScript_161317", + "flag": "56" + }, + { + "graphics_id": "92", + "x": 20, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RocketHideout_B4F_EventScript_161363", + "flag": "55" + }, + { + "graphics_id": "49", + "x": 4, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "RocketHideout_B4F_EventScript_161381", + "flag": "173" + }, + { + "graphics_id": "92", + "x": 3, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RocketHideout_B4F_EventScript_1613AD", + "flag": "54" + }, + { + "graphics_id": "49", + "x": 19, + "y": 14, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "RocketHideout_B4F_EventScript_161418", + "flag": "173" + }, + { + "graphics_id": "49", + "x": 16, + "y": 14, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "RocketHideout_B4F_EventScript_1613CE", + "flag": "173" + }, + { + "graphics_id": "92", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RocketHideout_B4F_EventScript_1BE72E", + "flag": "372" + }, + { + "graphics_id": "92", + "x": 4, + "y": 14, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RocketHideout_B4F_EventScript_1BE73B", + "flag": "373" + }, + { + "graphics_id": "92", + "x": 6, + "y": 23, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RocketHideout_B4F_EventScript_1BE748", + "flag": "374" + } + ], + "warp_events": [ + { + "x": 11, + "y": 15, + "elevation": 3, + "dest_map": "MAP_ROCKET_HIDEOUT_B3F", + "dest_warp_id": 1 + }, + { + "x": 20, + "y": 23, + "elevation": 0, + "dest_map": "MAP_ROCKET_HIDEOUT_ELEVATOR", + "dest_warp_id": 1 + }, + { + "x": 21, + "y": 23, + "elevation": 0, + "dest_map": "MAP_ROCKET_HIDEOUT_ELEVATOR", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 22, + "y": 6, + "elevation": 3, + "item": "ITEM_NEST_BALL", + "flag": "13", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 16, + "y": 6, + "elevation": 3, + "item": "ITEM_NET_BALL", + "flag": "134", + "unknown": 1 + } + ] +} \ No newline at end of file diff --git a/data/maps/RocketHideout_Elevator/events.inc b/data/maps/RocketHideout_Elevator/events.inc deleted file mode 100644 index d60afa41d..000000000 --- a/data/maps/RocketHideout_Elevator/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -RocketHideout_Elevator_MapWarps: - warp_def 1, 5, 3, 127, 32639 - warp_def 2, 5, 3, 127, 32639 - -RocketHideout_Elevator_MapBGEvents: - bg_event 0, 2, 0, 0, 0, RocketHideout_Elevator_EventScript_1614D9 - -RocketHideout_Elevator_MapEvents:: - map_events 0x0, RocketHideout_Elevator_MapWarps, 0x0, RocketHideout_Elevator_MapBGEvents diff --git a/data/maps/RocketHideout_Elevator/header.inc b/data/maps/RocketHideout_Elevator/header.inc deleted file mode 100644 index 321b9829d..000000000 --- a/data/maps/RocketHideout_Elevator/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -RocketHideout_Elevator:: @ 834F71C - .4byte RocketHideout_Elevator_Layout @ 0x8320EDC - .4byte RocketHideout_Elevator_MapEvents @ 0x83AFC80 - .4byte RocketHideout_Elevator_MapScripts @ 0x81614D8 - .4byte NULL - .2byte BGM_FRLG_ROCKET_HIDEOUT - .2byte 225 - .byte 0x85, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x03 diff --git a/data/maps/RocketHideout_Elevator/map.json b/data/maps/RocketHideout_Elevator/map.json new file mode 100644 index 000000000..6b16ec8eb --- /dev/null +++ b/data/maps/RocketHideout_Elevator/map.json @@ -0,0 +1,42 @@ +{ + "id": "MAP_ROCKET_HIDEOUT_ELEVATOR", + "name": "RocketHideout_Elevator", + "layout": "LAYOUT_ROCKET_HIDEOUT_ELEVATOR", + "music": "BGM_FRLG_ROCKET_HIDEOUT", + "region_map_section": "MAPSEC_ROCKET_HIDEOUT", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_3", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 1, + "y": 5, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + }, + { + "x": 2, + "y": 5, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 0, + "y": 2, + "elevation": 0, + "script": "RocketHideout_Elevator_EventScript_1614D9" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route1/connections.inc b/data/maps/Route1/connections.inc deleted file mode 100644 index 76b5b6814..000000000 --- a/data/maps/Route1/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -Route1_MapConnectionsList: @ 83529DC - connection up, -12, MAP_VIRIDIAN_CITY - connection down, 0, MAP_PALLET_TOWN - -Route1_MapConnections:: @ 83529F4 - .4byte 2 - .4byte Route1_MapConnectionsList diff --git a/data/maps/Route1/events.inc b/data/maps/Route1/events.inc deleted file mode 100644 index a485d4951..000000000 --- a/data/maps/Route1/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -Route1_EventObjects: - object_event 1, 68, 0, 6, 0, 28, 0, 3, 3, 17, 0, 0, 0, 0, 0, Route1_EventScript_167EFE, 0, 0, 0 - object_event 2, 19, 0, 19, 0, 16, 0, 3, 5, 49, 0, 0, 0, 0, 0, Route1_EventScript_167F52, 0, 0, 0 - -Route1_MapBGEvents: - bg_event 9, 31, 0, 0, 0, Route1_EventScript_167F5B - -Route1_MapEvents:: - map_events Route1_EventObjects, 0x0, 0x0, Route1_MapBGEvents diff --git a/data/maps/Route1/header.inc b/data/maps/Route1/header.inc deleted file mode 100644 index 900563a23..000000000 --- a/data/maps/Route1/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route1:: @ 835082C - .4byte Route1_Layout @ 0x82E55CC - .4byte Route1_MapEvents @ 0x83B6648 - .4byte Route1_MapScripts @ 0x8167EFD - .4byte Route1_MapConnections @ 0x83529F4 - .2byte BGM_FRLG_ROUTE_1 - .2byte 89 - .byte 0x65, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/Route1/map.json b/data/maps/Route1/map.json new file mode 100644 index 000000000..8996e5b45 --- /dev/null +++ b/data/maps/Route1/map.json @@ -0,0 +1,65 @@ +{ + "id": "MAP_ROUTE1", + "name": "Route1", + "layout": "LAYOUT_ROUTE1", + "music": "BGM_FRLG_ROUTE_1", + "region_map_section": "MAPSEC_ROUTE_1", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_VIRIDIAN_CITY", + "offset": -12, + "direction": "up" + }, + { + "map": "MAP_PALLET_TOWN", + "offset": 0, + "direction": "down" + } + ], + "object_events": [ + { + "graphics_id": "68", + "x": 6, + "y": 28, + "elevation": 3, + "movement_type": "3", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route1_EventScript_167EFE", + "flag": "0" + }, + { + "graphics_id": "19", + "x": 19, + "y": 16, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 1, + "movement_range_y": 3, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route1_EventScript_167F52", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 9, + "y": 31, + "elevation": 0, + "script": "Route1_EventScript_167F5B" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route10/connections.inc b/data/maps/Route10/connections.inc deleted file mode 100644 index bd7b4787f..000000000 --- a/data/maps/Route10/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -Route10_MapConnectionsList: @ 8352AFC - connection down, 0, MAP_LAVENDER_TOWN - connection left, 0, MAP_ROUTE9 - -Route10_MapConnections:: @ 8352B14 - .4byte 2 - .4byte Route10_MapConnectionsList diff --git a/data/maps/Route10/events.inc b/data/maps/Route10/events.inc deleted file mode 100644 index 3f1ba88db..000000000 --- a/data/maps/Route10/events.inc +++ /dev/null @@ -1,31 +0,0 @@ -Route10_EventObjects: - object_event 1, 40, 0, 7, 0, 60, 0, 3, 1, 17, 0, 1, 0, 2, 0, Route10_EventScript_1A9FE5, 0, 0, 0 - object_event 2, 56, 0, 4, 0, 62, 0, 3, 1, 17, 0, 1, 0, 1, 0, Route10_EventScript_1AA09F, 0, 0, 0 - object_event 3, 52, 0, 15, 0, 70, 0, 3, 5, 18, 0, 1, 0, 2, 0, Route10_EventScript_1AA061, 0, 0, 0 - object_event 4, 56, 0, 4, 0, 68, 0, 3, 9, 17, 0, 1, 0, 2, 0, Route10_EventScript_1AA0DD, 0, 0, 0 - object_event 5, 52, 0, 13, 0, 44, 0, 3, 9, 17, 0, 1, 0, 5, 0, Route10_EventScript_1AA023, 0, 0, 0 - object_event 6, 40, 0, 9, 0, 27, 0, 3, 8, 17, 0, 1, 0, 2, 0, Route10_EventScript_1A9FA7, 0, 0, 0 - object_event 7, 95, 0, 10, 0, 20, 0, 0, 8, 17, 0, 0, 0, 0, 0, Route10_EventScript_1BDF13, 18, 0, 0 - object_event 8, 95, 0, 10, 0, 22, 0, 0, 8, 17, 0, 0, 0, 0, 0, Route10_EventScript_1BDF13, 19, 0, 0 - object_event 9, 95, 0, 10, 0, 24, 0, 0, 8, 17, 0, 0, 0, 0, 0, Route10_EventScript_1BDF13, 20, 0, 0 - object_event 10, 95, 0, 10, 0, 26, 0, 0, 8, 17, 0, 0, 0, 0, 0, Route10_EventScript_1BDF13, 21, 0, 0 - -Route10_MapWarps: - warp_def 8, 19, 3, 0, 337 - warp_def 8, 57, 3, 5, 337 - warp_def 7, 40, 3, 1, 351 - warp_def 13, 20, 0, 1, 5376 - warp_def 2, 37, 3, 3, 351 - -Route10_MapBGEvents: - bg_event 15, 59, 0, 0, 0, Route10_EventScript_167FE4 - bg_event 6, 42, 0, 0, 0, Route10_EventScript_167FED - bg_event 7, 21, 0, 0, 0, Route10_EventScript_167FDB - bg_event 10, 19, 0, 7, 0, 22, 9, 1 - bg_event 12, 40, 3, 7, 0, 35, 10, 1 - bg_event 6, 26, 3, 7, 0, 133, 126, 1 - bg_event 17, 29, 3, 7, 0, 140, 125, 1 - bg_event 20, 57, 3, 7, 0, 150, 151, 1 - -Route10_MapEvents:: - map_events Route10_EventObjects, Route10_MapWarps, 0x0, Route10_MapBGEvents diff --git a/data/maps/Route10/header.inc b/data/maps/Route10/header.inc deleted file mode 100644 index 3557919fb..000000000 --- a/data/maps/Route10/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route10:: @ 8350928 - .4byte Route10_Layout @ 0x82EC3D0 - .4byte Route10_MapEvents @ 0x83B6FA0 - .4byte Route10_MapScripts @ 0x8167FD9 - .4byte Route10_MapConnections @ 0x8352B14 - .2byte BGM_FRLG_ROUTE_3 - .2byte 98 - .byte 0x6e, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/Route10/map.json b/data/maps/Route10/map.json new file mode 100644 index 000000000..4314e572c --- /dev/null +++ b/data/maps/Route10/map.json @@ -0,0 +1,264 @@ +{ + "id": "MAP_ROUTE10", + "name": "Route10", + "layout": "LAYOUT_ROUTE10", + "music": "BGM_FRLG_ROUTE_3", + "region_map_section": "MAPSEC_ROUTE_10", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_LAVENDER_TOWN", + "offset": 0, + "direction": "down" + }, + { + "map": "MAP_ROUTE9", + "offset": 0, + "direction": "left" + } + ], + "object_events": [ + { + "graphics_id": "40", + "x": 7, + "y": 60, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route10_EventScript_1A9FE5", + "flag": "0" + }, + { + "graphics_id": "56", + "x": 4, + "y": 62, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route10_EventScript_1AA09F", + "flag": "0" + }, + { + "graphics_id": "52", + "x": 15, + "y": 70, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route10_EventScript_1AA061", + "flag": "0" + }, + { + "graphics_id": "56", + "x": 4, + "y": 68, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route10_EventScript_1AA0DD", + "flag": "0" + }, + { + "graphics_id": "52", + "x": 13, + "y": 44, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route10_EventScript_1AA023", + "flag": "0" + }, + { + "graphics_id": "40", + "x": 9, + "y": 27, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route10_EventScript_1A9FA7", + "flag": "0" + }, + { + "graphics_id": "95", + "x": 10, + "y": 20, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route10_EventScript_1BDF13", + "flag": "18" + }, + { + "graphics_id": "95", + "x": 10, + "y": 22, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route10_EventScript_1BDF13", + "flag": "19" + }, + { + "graphics_id": "95", + "x": 10, + "y": 24, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route10_EventScript_1BDF13", + "flag": "20" + }, + { + "graphics_id": "95", + "x": 10, + "y": 26, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route10_EventScript_1BDF13", + "flag": "21" + } + ], + "warp_events": [ + { + "x": 8, + "y": 19, + "elevation": 3, + "dest_map": "MAP_ROCK_TUNNEL_1F", + "dest_warp_id": 0 + }, + { + "x": 8, + "y": 57, + "elevation": 3, + "dest_map": "MAP_ROCK_TUNNEL_1F", + "dest_warp_id": 5 + }, + { + "x": 7, + "y": 40, + "elevation": 3, + "dest_map": "MAP_POWER_PLANT", + "dest_warp_id": 1 + }, + { + "x": 13, + "y": 20, + "elevation": 0, + "dest_map": "MAP_ROUTE10_POKEMON_CENTER_1F", + "dest_warp_id": 1 + }, + { + "x": 2, + "y": 37, + "elevation": 3, + "dest_map": "MAP_POWER_PLANT", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 15, + "y": 59, + "elevation": 0, + "script": "Route10_EventScript_167FE4" + }, + { + "type": "bg_event_type_0", + "x": 6, + "y": 42, + "elevation": 0, + "script": "Route10_EventScript_167FED" + }, + { + "type": "bg_event_type_0", + "x": 7, + "y": 21, + "elevation": 0, + "script": "Route10_EventScript_167FDB" + }, + { + "type": "hidden_item", + "x": 10, + "y": 19, + "elevation": 0, + "item": "ITEM_SUPER_POTION", + "flag": "9", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 12, + "y": 40, + "elevation": 3, + "item": "ITEM_MAX_ETHER", + "flag": "10", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 6, + "y": 26, + "elevation": 3, + "item": "ITEM_CHERI_BERRY", + "flag": "126", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 17, + "y": 29, + "elevation": 3, + "item": "ITEM_PERSIM_BERRY", + "flag": "125", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 20, + "y": 57, + "elevation": 3, + "item": "ITEM_NANAB_BERRY", + "flag": "151", + "unknown": 1 + } + ] +} \ No newline at end of file diff --git a/data/maps/Route10_PokemonCenter_1F/events.inc b/data/maps/Route10_PokemonCenter_1F/events.inc deleted file mode 100644 index bcfe02b9c..000000000 --- a/data/maps/Route10_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route10_PokemonCenter_1F_EventObjects: - object_event 1, 64, 0, 7, 0, 2, 0, 0, 8, 17, 0, 0, 0, 0, 0, Route10_PokemonCenter_1F_EventScript_16FC41, 0, 0, 0 - object_event 2, 61, 0, 9, 0, 4, 0, 3, 5, 17, 0, 0, 0, 0, 0, Route10_PokemonCenter_1F_EventScript_16FC53, 0, 0, 0 - object_event 3, 27, 0, 2, 0, 3, 0, 3, 5, 17, 0, 0, 0, 0, 0, Route10_PokemonCenter_1F_EventScript_16FC4A, 0, 0, 0 - object_event 4, 18, 0, 14, 0, 6, 0, 3, 9, 17, 0, 0, 0, 0, 0, Route10_PokemonCenter_1F_EventScript_16FC5C, 0, 0, 0 - object_event 5, 55, 0, 12, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route10_PokemonCenter_1F_EventScript_16FC65, 0, 0, 0 - -Route10_PokemonCenter_1F_MapWarps: - warp_def 6, 8, 3, 3, 796 - warp_def 7, 8, 3, 3, 796 - warp_def 8, 8, 3, 3, 796 - warp_def 1, 6, 4, 0, 5377 - -Route10_PokemonCenter_1F_MapEvents:: - map_events Route10_PokemonCenter_1F_EventObjects, Route10_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route10_PokemonCenter_1F/header.inc b/data/maps/Route10_PokemonCenter_1F/header.inc deleted file mode 100644 index 2f7bd05cc..000000000 --- a/data/maps/Route10_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route10_PokemonCenter_1F:: @ 83518B0 - .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte Route10_PokemonCenter_1F_MapEvents @ 0x83BD8FC - .4byte Route10_PokemonCenter_1F_MapScripts @ 0x816FC2F - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 8 - .byte 0x6e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/Route10_PokemonCenter_1F/map.json b/data/maps/Route10_PokemonCenter_1F/map.json new file mode 100644 index 000000000..868607faf --- /dev/null +++ b/data/maps/Route10_PokemonCenter_1F/map.json @@ -0,0 +1,114 @@ +{ + "id": "MAP_ROUTE10_POKEMON_CENTER_1F", + "name": "Route10_PokemonCenter_1F", + "layout": "LAYOUT_POKEMON_CENTER_1F", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_ROUTE_10", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "64", + "x": 7, + "y": 2, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route10_PokemonCenter_1F_EventScript_16FC41", + "flag": "0" + }, + { + "graphics_id": "61", + "x": 9, + "y": 4, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route10_PokemonCenter_1F_EventScript_16FC53", + "flag": "0" + }, + { + "graphics_id": "27", + "x": 2, + "y": 3, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route10_PokemonCenter_1F_EventScript_16FC4A", + "flag": "0" + }, + { + "graphics_id": "18", + "x": 14, + "y": 6, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route10_PokemonCenter_1F_EventScript_16FC5C", + "flag": "0" + }, + { + "graphics_id": "55", + "x": 12, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route10_PokemonCenter_1F_EventScript_16FC65", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_ROUTE10", + "dest_warp_id": 3 + }, + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_ROUTE10", + "dest_warp_id": 3 + }, + { + "x": 8, + "y": 8, + "elevation": 3, + "dest_map": "MAP_ROUTE10", + "dest_warp_id": 3 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_ROUTE10_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route10_PokemonCenter_2F/events.inc b/data/maps/Route10_PokemonCenter_2F/events.inc deleted file mode 100644 index b3cdd3e38..000000000 --- a/data/maps/Route10_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -Route10_PokemonCenter_2F_EventObjects: - object_event 1, 65, 0, 6, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route10_PokemonCenter_2F_EventScript_1A8CF6, 0, 0, 0 - object_event 2, 65, 0, 2, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route10_PokemonCenter_2F_EventScript_1A8CFC, 0, 0, 0 - object_event 3, 65, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route10_PokemonCenter_2F_EventScript_1A8D02, 0, 0, 0 - object_event 4, 69, 0, 1, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route10_PokemonCenter_2F_EventScript_1BB1D2, 112, 0, 0 - -Route10_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 3, 5376 - warp_def 5, 1, 0, 0, 4 - warp_def 9, 1, 0, 0, 1 - -Route10_PokemonCenter_2F_MapEvents:: - map_events Route10_PokemonCenter_2F_EventObjects, Route10_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route10_PokemonCenter_2F/header.inc b/data/maps/Route10_PokemonCenter_2F/header.inc deleted file mode 100644 index 5ed083920..000000000 --- a/data/maps/Route10_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route10_PokemonCenter_2F:: @ 83518CC - .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte Route10_PokemonCenter_2F_MapEvents @ 0x83BD988 - .4byte Route10_PokemonCenter_2F_MapScripts @ 0x816FCFA - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 9 - .byte 0x6e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/Route10_PokemonCenter_2F/map.json b/data/maps/Route10_PokemonCenter_2F/map.json new file mode 100644 index 000000000..1f185774b --- /dev/null +++ b/data/maps/Route10_PokemonCenter_2F/map.json @@ -0,0 +1,94 @@ +{ + "id": "MAP_ROUTE10_POKEMON_CENTER_2F", + "name": "Route10_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_ROUTE_10", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "65", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route10_PokemonCenter_2F_EventScript_1A8CF6", + "flag": "0" + }, + { + "graphics_id": "65", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route10_PokemonCenter_2F_EventScript_1A8CFC", + "flag": "0" + }, + { + "graphics_id": "65", + "x": 10, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route10_PokemonCenter_2F_EventScript_1A8D02", + "flag": "0" + }, + { + "graphics_id": "69", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route10_PokemonCenter_2F_EventScript_1BB1D2", + "flag": "112" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_ROUTE10_POKEMON_CENTER_1F", + "dest_warp_id": 3 + }, + { + "x": 5, + "y": 1, + "elevation": 0, + "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 0, + "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route11/connections.inc b/data/maps/Route11/connections.inc deleted file mode 100644 index d250bb844..000000000 --- a/data/maps/Route11/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -Route11_MapConnectionsList: @ 8352B1C - connection left, -10, MAP_VERMILION_CITY - connection right, -60, MAP_ROUTE12 - -Route11_MapConnections:: @ 8352B34 - .4byte 2 - .4byte Route11_MapConnectionsList diff --git a/data/maps/Route11/events.inc b/data/maps/Route11/events.inc deleted file mode 100644 index 4e32954ea..000000000 --- a/data/maps/Route11/events.inc +++ /dev/null @@ -1,26 +0,0 @@ -Route11_EventObjects: - object_event 1, 18, 0, 19, 0, 8, 0, 3, 17, 17, 0, 1, 0, 4, 0, Route11_EventScript_1A9B0D, 0, 0, 0 - object_event 2, 32, 0, 16, 0, 17, 0, 3, 1, 17, 0, 1, 0, 1, 0, Route11_EventScript_1A9C81, 0, 0, 0 - object_event 3, 18, 0, 31, 0, 8, 0, 3, 15, 17, 0, 1, 0, 4, 0, Route11_EventScript_1A9B4B, 0, 0, 0 - object_event 4, 18, 0, 28, 0, 10, 0, 3, 40, 72, 0, 1, 0, 1, 0, Route11_EventScript_1A9BC7, 0, 0, 0 - object_event 5, 32, 0, 38, 0, 15, 0, 3, 1, 17, 0, 1, 0, 1, 0, Route11_EventScript_1A9CBF, 0, 0, 0 - object_event 6, 32, 0, 50, 0, 4, 0, 3, 1, 17, 0, 1, 0, 1, 0, Route11_EventScript_1A9D3B, 0, 0, 0 - object_event 7, 30, 0, 42, 0, 8, 0, 3, 14, 17, 0, 1, 0, 4, 0, Route11_EventScript_1A9C05, 0, 0, 0 - object_event 8, 18, 0, 50, 0, 14, 0, 3, 25, 65, 0, 1, 0, 1, 0, Route11_EventScript_1A9B89, 0, 0, 0 - object_event 9, 32, 0, 57, 0, 16, 0, 3, 1, 17, 0, 1, 0, 1, 0, Route11_EventScript_1A9CFD, 0, 0, 0 - object_event 10, 30, 0, 32, 0, 18, 0, 3, 14, 17, 0, 1, 0, 6, 0, Route11_EventScript_1A9C43, 0, 0, 0 - object_event 11, 92, 0, 42, 0, 12, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route11_EventScript_1BEAF0, 449, 0, 0 - object_event 12, 92, 0, 63, 0, 13, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route11_EventScript_1BEB99, 462, 0, 0 - object_event 13, 92, 0, 13, 0, 3, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route11_EventScript_1BEBA6, 463, 0, 0 - -Route11_MapWarps: - warp_def 6, 7, 0, 0, 294 - warp_def 58, 10, 3, 0, 5632 - warp_def 65, 10, 3, 2, 5632 - -Route11_MapBGEvents: - bg_event 3, 7, 3, 0, 0, Route11_EventScript_167FF7 - bg_event 58, 5, 0, 7, 0, 85, 41, 1 - -Route11_MapEvents:: - map_events Route11_EventObjects, Route11_MapWarps, 0x0, Route11_MapBGEvents diff --git a/data/maps/Route11/header.inc b/data/maps/Route11/header.inc deleted file mode 100644 index 92ea71fdb..000000000 --- a/data/maps/Route11/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route11:: @ 8350944 - .4byte Route11_Layout @ 0x82ECF34 - .4byte Route11_MapEvents @ 0x83B711C - .4byte Route11_MapScripts @ 0x8167FF6 - .4byte Route11_MapConnections @ 0x8352B34 - .2byte BGM_FRLG_ROUTE_11 - .2byte 99 - .byte 0x6f, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/Route11/map.json b/data/maps/Route11/map.json new file mode 100644 index 000000000..6800fad19 --- /dev/null +++ b/data/maps/Route11/map.json @@ -0,0 +1,239 @@ +{ + "id": "MAP_ROUTE11", + "name": "Route11", + "layout": "LAYOUT_ROUTE11", + "music": "BGM_FRLG_ROUTE_11", + "region_map_section": "MAPSEC_ROUTE_11", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_VERMILION_CITY", + "offset": -10, + "direction": "left" + }, + { + "map": "MAP_ROUTE12", + "offset": -60, + "direction": "right" + } + ], + "object_events": [ + { + "graphics_id": "18", + "x": 19, + "y": 8, + "elevation": 3, + "movement_type": "17", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route11_EventScript_1A9B0D", + "flag": "0" + }, + { + "graphics_id": "32", + "x": 16, + "y": 17, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route11_EventScript_1A9C81", + "flag": "0" + }, + { + "graphics_id": "18", + "x": 31, + "y": 8, + "elevation": 3, + "movement_type": "15", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route11_EventScript_1A9B4B", + "flag": "0" + }, + { + "graphics_id": "18", + "x": 28, + "y": 10, + "elevation": 3, + "movement_type": "40", + "movement_range_x": 8, + "movement_range_y": 4, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route11_EventScript_1A9BC7", + "flag": "0" + }, + { + "graphics_id": "32", + "x": 38, + "y": 15, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route11_EventScript_1A9CBF", + "flag": "0" + }, + { + "graphics_id": "32", + "x": 50, + "y": 4, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route11_EventScript_1A9D3B", + "flag": "0" + }, + { + "graphics_id": "30", + "x": 42, + "y": 8, + "elevation": 3, + "movement_type": "14", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route11_EventScript_1A9C05", + "flag": "0" + }, + { + "graphics_id": "18", + "x": 50, + "y": 14, + "elevation": 3, + "movement_type": "25", + "movement_range_x": 1, + "movement_range_y": 4, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route11_EventScript_1A9B89", + "flag": "0" + }, + { + "graphics_id": "32", + "x": 57, + "y": 16, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route11_EventScript_1A9CFD", + "flag": "0" + }, + { + "graphics_id": "30", + "x": 32, + "y": 18, + "elevation": 3, + "movement_type": "14", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "Route11_EventScript_1A9C43", + "flag": "0" + }, + { + "graphics_id": "92", + "x": 42, + "y": 12, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route11_EventScript_1BEAF0", + "flag": "449" + }, + { + "graphics_id": "92", + "x": 63, + "y": 13, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route11_EventScript_1BEB99", + "flag": "462" + }, + { + "graphics_id": "92", + "x": 13, + "y": 3, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route11_EventScript_1BEBA6", + "flag": "463" + } + ], + "warp_events": [ + { + "x": 6, + "y": 7, + "elevation": 0, + "dest_map": "MAP_DIGLETTS_CAVE_SOUTH_ENTRANCE", + "dest_warp_id": 0 + }, + { + "x": 58, + "y": 10, + "elevation": 3, + "dest_map": "MAP_ROUTE11_EAST_ENTRANCE_1F", + "dest_warp_id": 0 + }, + { + "x": 65, + "y": 10, + "elevation": 3, + "dest_map": "MAP_ROUTE11_EAST_ENTRANCE_1F", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 3, + "y": 7, + "elevation": 3, + "script": "Route11_EventScript_167FF7" + }, + { + "type": "hidden_item", + "x": 58, + "y": 5, + "elevation": 0, + "item": "ITEM_ESCAPE_ROPE", + "flag": "41", + "unknown": 1 + } + ] +} \ No newline at end of file diff --git a/data/maps/Route11_EastEntrance_1F/events.inc b/data/maps/Route11_EastEntrance_1F/events.inc deleted file mode 100644 index db740f2b5..000000000 --- a/data/maps/Route11_EastEntrance_1F/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -Route11_EastEntrance_1F_EventObjects: - object_event 1, 60, 0, 6, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route11_EastEntrance_1F_EventScript_16FD22, 0, 0, 0 - object_event 2, 60, 0, 4, 0, 10, 0, 0, 7, 17, 0, 0, 0, 0, 0, Route11_EastEntrance_1F_EventScript_16FD2B, 0, 0, 0 - -Route11_EastEntrance_1F_MapWarps: - warp_def 1, 6, 3, 1, 797 - warp_def 1, 7, 3, 1, 797 - warp_def 11, 6, 3, 2, 797 - warp_def 11, 7, 3, 2, 797 - warp_def 9, 10, 3, 0, 5633 - -Route11_EastEntrance_1F_MapEvents:: - map_events Route11_EastEntrance_1F_EventObjects, Route11_EastEntrance_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route11_EastEntrance_1F/header.inc b/data/maps/Route11_EastEntrance_1F/header.inc deleted file mode 100644 index 8c54bc523..000000000 --- a/data/maps/Route11_EastEntrance_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route11_EastEntrance_1F:: @ 83518E8 - .4byte Entrance_1F_Layout @ 0x8320E70 - .4byte Route11_EastEntrance_1F_MapEvents @ 0x83BD9F4 - .4byte Route11_EastEntrance_1F_MapScripts @ 0x816FD21 - .4byte NULL - .2byte BGM_FRLG_VERMILION_CITY - .2byte 224 - .byte 0x6f, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00 diff --git a/data/maps/Route11_EastEntrance_1F/map.json b/data/maps/Route11_EastEntrance_1F/map.json new file mode 100644 index 000000000..701eef973 --- /dev/null +++ b/data/maps/Route11_EastEntrance_1F/map.json @@ -0,0 +1,82 @@ +{ + "id": "MAP_ROUTE11_EAST_ENTRANCE_1F", + "name": "Route11_EastEntrance_1F", + "layout": "LAYOUT_ENTRANCE_1F", + "music": "BGM_FRLG_VERMILION_CITY", + "region_map_section": "MAPSEC_ROUTE_11", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 1, + "unknown_19": 2, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "60", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route11_EastEntrance_1F_EventScript_16FD22", + "flag": "0" + }, + { + "graphics_id": "60", + "x": 4, + "y": 10, + "elevation": 0, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route11_EastEntrance_1F_EventScript_16FD2B", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 3, + "dest_map": "MAP_ROUTE11", + "dest_warp_id": 1 + }, + { + "x": 1, + "y": 7, + "elevation": 3, + "dest_map": "MAP_ROUTE11", + "dest_warp_id": 1 + }, + { + "x": 11, + "y": 6, + "elevation": 3, + "dest_map": "MAP_ROUTE11", + "dest_warp_id": 2 + }, + { + "x": 11, + "y": 7, + "elevation": 3, + "dest_map": "MAP_ROUTE11", + "dest_warp_id": 2 + }, + { + "x": 9, + "y": 10, + "elevation": 3, + "dest_map": "MAP_ROUTE11_EAST_ENTRANCE_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route11_EastEntrance_2F/events.inc b/data/maps/Route11_EastEntrance_2F/events.inc deleted file mode 100644 index 66cfc6c89..000000000 --- a/data/maps/Route11_EastEntrance_2F/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -Route11_EastEntrance_2F_EventObjects: - object_event 1, 18, 0, 7, 0, 3, 0, 3, 5, 18, 0, 0, 0, 0, 0, Route11_EastEntrance_2F_EventScript_16FD5C, 0, 0, 0 - object_event 2, 55, 0, 2, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route11_EastEntrance_2F_EventScript_16FDD8, 0, 0, 0 - -Route11_EastEntrance_2F_MapWarps: - warp_def 10, 9, 3, 4, 5632 - -Route11_EastEntrance_2F_MapBGEvents: - bg_event 4, 1, 0, 0, 0, Route11_EastEntrance_2F_EventScript_16FD35 - bg_event 8, 1, 0, 0, 0, Route11_EastEntrance_2F_EventScript_16FD53 - -Route11_EastEntrance_2F_MapEvents:: - map_events Route11_EastEntrance_2F_EventObjects, Route11_EastEntrance_2F_MapWarps, 0x0, Route11_EastEntrance_2F_MapBGEvents diff --git a/data/maps/Route11_EastEntrance_2F/header.inc b/data/maps/Route11_EastEntrance_2F/header.inc deleted file mode 100644 index 4b3611c21..000000000 --- a/data/maps/Route11_EastEntrance_2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route11_EastEntrance_2F:: @ 8351904 - .4byte Entrance_2F_Layout @ 0x8320804 - .4byte Route11_EastEntrance_2F_MapEvents @ 0x83BDA58 - .4byte Route11_EastEntrance_2F_MapScripts @ 0x816FD34 - .4byte NULL - .2byte BGM_FRLG_VERMILION_CITY - .2byte 220 - .byte 0x6f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/Route11_EastEntrance_2F/map.json b/data/maps/Route11_EastEntrance_2F/map.json new file mode 100644 index 000000000..d8867ca6b --- /dev/null +++ b/data/maps/Route11_EastEntrance_2F/map.json @@ -0,0 +1,69 @@ +{ + "id": "MAP_ROUTE11_EAST_ENTRANCE_2F", + "name": "Route11_EastEntrance_2F", + "layout": "LAYOUT_ENTRANCE_2F", + "music": "BGM_FRLG_VERMILION_CITY", + "region_map_section": "MAPSEC_ROUTE_11", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "18", + "x": 7, + "y": 3, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route11_EastEntrance_2F_EventScript_16FD5C", + "flag": "0" + }, + { + "graphics_id": "55", + "x": 2, + "y": 6, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route11_EastEntrance_2F_EventScript_16FDD8", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 10, + "y": 9, + "elevation": 3, + "dest_map": "MAP_ROUTE11_EAST_ENTRANCE_1F", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 4, + "y": 1, + "elevation": 0, + "script": "Route11_EastEntrance_2F_EventScript_16FD35" + }, + { + "type": "bg_event_type_0", + "x": 8, + "y": 1, + "elevation": 0, + "script": "Route11_EastEntrance_2F_EventScript_16FD53" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route12/connections.inc b/data/maps/Route12/connections.inc deleted file mode 100644 index ec99ba53b..000000000 --- a/data/maps/Route12/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route12_MapConnectionsList: @ 8352B3C - connection up, 0, MAP_LAVENDER_TOWN - connection down, -48, MAP_ROUTE13 - connection left, 60, MAP_ROUTE11 - -Route12_MapConnections:: @ 8352B60 - .4byte 3 - .4byte Route12_MapConnectionsList diff --git a/data/maps/Route12/events.inc b/data/maps/Route12/events.inc deleted file mode 100644 index bfb2acbbf..000000000 --- a/data/maps/Route12/events.inc +++ /dev/null @@ -1,31 +0,0 @@ -Route12_EventObjects: - object_event 1, 57, 0, 17, 0, 32, 0, 3, 13, 17, 0, 1, 0, 1, 0, Route12_EventScript_1AA451, 0, 0, 0 - object_event 2, 57, 0, 9, 0, 40, 0, 3, 14, 17, 0, 1, 0, 1, 0, Route12_EventScript_1AA48F, 0, 0, 0 - object_event 3, 57, 0, 16, 0, 47, 0, 3, 17, 17, 0, 1, 0, 4, 0, Route12_EventScript_1AA4CD, 0, 0, 0 - object_event 4, 57, 0, 13, 0, 59, 0, 3, 13, 17, 0, 1, 0, 1, 0, Route12_EventScript_1AA50B, 0, 0, 0 - object_event 5, 109, 0, 14, 0, 70, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route12_EventScript_168014, 84, 0, 0 - object_event 6, 26, 0, 13, 0, 92, 0, 3, 37, 68, 0, 1, 0, 1, 0, Route12_EventScript_1AA587, 0, 0, 0 - object_event 7, 39, 0, 10, 0, 99, 0, 3, 8, 17, 0, 1, 0, 1, 0, Route12_EventScript_1AA5C5, 0, 0, 0 - object_event 8, 57, 0, 18, 0, 108, 0, 3, 14, 17, 0, 1, 0, 1, 0, Route12_EventScript_1AA549, 0, 0, 0 - object_event 9, 95, 0, 11, 0, 100, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route12_EventScript_1BDF13, 18, 0, 0 - object_event 10, 92, 0, 18, 0, 36, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route12_EventScript_1BE7B0, 382, 0, 0 - object_event 11, 92, 0, 9, 0, 101, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route12_EventScript_1BE7BD, 383, 0, 0 - object_event 12, 29, 0, 19, 0, 64, 0, 3, 10, 17, 0, 1, 0, 0, 0, Route12_EventScript_1AA649, 0, 0, 0 - object_event 13, 25, 0, 19, 0, 63, 0, 3, 10, 17, 0, 1, 0, 0, 0, Route12_EventScript_1AA603, 0, 0, 0 - object_event 14, 95, 0, 12, 0, 111, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route12_EventScript_1BDF13, 19, 0, 0 - -Route12_MapWarps: - warp_def 12, 86, 0, 1, 5890 - warp_def 14, 15, 3, 0, 5888 - warp_def 15, 15, 3, 1, 5888 - warp_def 14, 21, 3, 2, 5888 - -Route12_MapBGEvents: - bg_event 17, 13, 0, 0, 0, Route12_EventScript_1680A3 - bg_event 15, 69, 0, 0, 0, Route12_EventScript_1680AC - bg_event 18, 57, 3, 7, 0, 21, 42, 1 - bg_event 14, 70, 3, 7, 0, 200, 131, 129 - bg_event 9, 116, 3, 7, 0, 68, 130, 1 - -Route12_MapEvents:: - map_events Route12_EventObjects, Route12_MapWarps, 0x0, Route12_MapBGEvents diff --git a/data/maps/Route12/header.inc b/data/maps/Route12/header.inc deleted file mode 100644 index 882794915..000000000 --- a/data/maps/Route12/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route12:: @ 8350960 - .4byte Route12_Layout @ 0x82EE5D8 - .4byte Route12_MapEvents @ 0x83B72DC - .4byte Route12_MapScripts @ 0x8168000 - .4byte Route12_MapConnections @ 0x8352B60 - .2byte BGM_FRLG_ROUTE_11 - .2byte 100 - .byte 0x70, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/Route12/map.json b/data/maps/Route12/map.json new file mode 100644 index 000000000..2b4da6469 --- /dev/null +++ b/data/maps/Route12/map.json @@ -0,0 +1,289 @@ +{ + "id": "MAP_ROUTE12", + "name": "Route12", + "layout": "LAYOUT_ROUTE12", + "music": "BGM_FRLG_ROUTE_11", + "region_map_section": "MAPSEC_ROUTE_12", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_LAVENDER_TOWN", + "offset": 0, + "direction": "up" + }, + { + "map": "MAP_ROUTE13", + "offset": -48, + "direction": "down" + }, + { + "map": "MAP_ROUTE11", + "offset": 60, + "direction": "left" + } + ], + "object_events": [ + { + "graphics_id": "57", + "x": 17, + "y": 32, + "elevation": 3, + "movement_type": "13", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route12_EventScript_1AA451", + "flag": "0" + }, + { + "graphics_id": "57", + "x": 9, + "y": 40, + "elevation": 3, + "movement_type": "14", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route12_EventScript_1AA48F", + "flag": "0" + }, + { + "graphics_id": "57", + "x": 16, + "y": 47, + "elevation": 3, + "movement_type": "17", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route12_EventScript_1AA4CD", + "flag": "0" + }, + { + "graphics_id": "57", + "x": 13, + "y": 59, + "elevation": 3, + "movement_type": "13", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route12_EventScript_1AA50B", + "flag": "0" + }, + { + "graphics_id": "109", + "x": 14, + "y": 70, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route12_EventScript_168014", + "flag": "84" + }, + { + "graphics_id": "26", + "x": 13, + "y": 92, + "elevation": 3, + "movement_type": "37", + "movement_range_x": 4, + "movement_range_y": 4, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route12_EventScript_1AA587", + "flag": "0" + }, + { + "graphics_id": "39", + "x": 10, + "y": 99, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route12_EventScript_1AA5C5", + "flag": "0" + }, + { + "graphics_id": "57", + "x": 18, + "y": 108, + "elevation": 3, + "movement_type": "14", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route12_EventScript_1AA549", + "flag": "0" + }, + { + "graphics_id": "95", + "x": 11, + "y": 100, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route12_EventScript_1BDF13", + "flag": "18" + }, + { + "graphics_id": "92", + "x": 18, + "y": 36, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route12_EventScript_1BE7B0", + "flag": "382" + }, + { + "graphics_id": "92", + "x": 9, + "y": 101, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route12_EventScript_1BE7BD", + "flag": "383" + }, + { + "graphics_id": "29", + "x": 19, + "y": 64, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route12_EventScript_1AA649", + "flag": "0" + }, + { + "graphics_id": "25", + "x": 19, + "y": 63, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route12_EventScript_1AA603", + "flag": "0" + }, + { + "graphics_id": "95", + "x": 12, + "y": 111, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route12_EventScript_1BDF13", + "flag": "19" + } + ], + "warp_events": [ + { + "x": 12, + "y": 86, + "elevation": 0, + "dest_map": "MAP_ROUTE12_FISHING_HOUSE", + "dest_warp_id": 1 + }, + { + "x": 14, + "y": 15, + "elevation": 3, + "dest_map": "MAP_ROUTE12_NORTH_ENTRANCE_1F", + "dest_warp_id": 0 + }, + { + "x": 15, + "y": 15, + "elevation": 3, + "dest_map": "MAP_ROUTE12_NORTH_ENTRANCE_1F", + "dest_warp_id": 1 + }, + { + "x": 14, + "y": 21, + "elevation": 3, + "dest_map": "MAP_ROUTE12_NORTH_ENTRANCE_1F", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 17, + "y": 13, + "elevation": 0, + "script": "Route12_EventScript_1680A3" + }, + { + "type": "bg_event_type_0", + "x": 15, + "y": 69, + "elevation": 0, + "script": "Route12_EventScript_1680AC" + }, + { + "type": "hidden_item", + "x": 18, + "y": 57, + "elevation": 3, + "item": "ITEM_HYPER_POTION", + "flag": "42", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 14, + "y": 70, + "elevation": 3, + "item": "ITEM_LEFTOVERS", + "flag": "131", + "unknown": 129 + }, + { + "type": "hidden_item", + "x": 9, + "y": 116, + "elevation": 3, + "item": "ITEM_RARE_CANDY", + "flag": "130", + "unknown": 1 + } + ] +} \ No newline at end of file diff --git a/data/maps/Route12_FishingHouse/events.inc b/data/maps/Route12_FishingHouse/events.inc deleted file mode 100644 index 158407b87..000000000 --- a/data/maps/Route12_FishingHouse/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -Route12_FishingHouse_EventObjects: - object_event 1, 57, 0, 4, 0, 4, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route12_FishingHouse_EventScript_16FF0C, 0, 0, 0 - -Route12_FishingHouse_MapWarps: - warp_def 2, 8, 0, 0, 798 - warp_def 3, 7, 3, 0, 798 - warp_def 4, 8, 0, 0, 798 - -Route12_FishingHouse_MapBGEvents: - bg_event 9, 1, 0, 0, 0, Route12_FishingHouse_EventScript_170067 - -Route12_FishingHouse_MapEvents:: - map_events Route12_FishingHouse_EventObjects, Route12_FishingHouse_MapWarps, 0x0, Route12_FishingHouse_MapBGEvents diff --git a/data/maps/Route12_FishingHouse/header.inc b/data/maps/Route12_FishingHouse/header.inc deleted file mode 100644 index 31fa7f94d..000000000 --- a/data/maps/Route12_FishingHouse/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route12_FishingHouse:: @ 8351958 - .4byte House4_Layout @ 0x82D6070 - .4byte Route12_FishingHouse_MapEvents @ 0x83BDB48 - .4byte Route12_FishingHouse_MapScripts @ 0x816FF0B - .4byte NULL - .2byte BGM_FRLG_CELADON_CITY - .2byte 13 - .byte 0x70, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/Route12_FishingHouse/map.json b/data/maps/Route12_FishingHouse/map.json new file mode 100644 index 000000000..016bd3f4f --- /dev/null +++ b/data/maps/Route12_FishingHouse/map.json @@ -0,0 +1,63 @@ +{ + "id": "MAP_ROUTE12_FISHING_HOUSE", + "name": "Route12_FishingHouse", + "layout": "LAYOUT_HOUSE4", + "music": "BGM_FRLG_CELADON_CITY", + "region_map_section": "MAPSEC_ROUTE_12", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "57", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route12_FishingHouse_EventScript_16FF0C", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 2, + "y": 8, + "elevation": 0, + "dest_map": "MAP_ROUTE12", + "dest_warp_id": 0 + }, + { + "x": 3, + "y": 7, + "elevation": 3, + "dest_map": "MAP_ROUTE12", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 8, + "elevation": 0, + "dest_map": "MAP_ROUTE12", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 9, + "y": 1, + "elevation": 0, + "script": "Route12_FishingHouse_EventScript_170067" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route12_NorthEntrance_1F/events.inc b/data/maps/Route12_NorthEntrance_1F/events.inc deleted file mode 100644 index 3fb1b1b13..000000000 --- a/data/maps/Route12_NorthEntrance_1F/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -Route12_NorthEntrance_1F_EventObjects: - object_event 1, 60, 0, 1, 0, 5, 0, 3, 10, 17, 0, 0, 0, 0, 0, Route12_NorthEntrance_1F_EventScript_16FE6E, 0, 0, 0 - -Route12_NorthEntrance_1F_MapWarps: - warp_def 5, 1, 3, 1, 798 - warp_def 6, 1, 0, 2, 798 - warp_def 5, 11, 3, 3, 798 - warp_def 6, 11, 3, 3, 798 - warp_def 8, 10, 3, 0, 5889 - -Route12_NorthEntrance_1F_MapEvents:: - map_events Route12_NorthEntrance_1F_EventObjects, Route12_NorthEntrance_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route12_NorthEntrance_1F/header.inc b/data/maps/Route12_NorthEntrance_1F/header.inc deleted file mode 100644 index 60a2f30e5..000000000 --- a/data/maps/Route12_NorthEntrance_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route12_NorthEntrance_1F:: @ 8351920 - .4byte Route12_NorthEntrance_1F_Layout @ 0x8319DF0 - .4byte Route12_NorthEntrance_1F_MapEvents @ 0x83BDAAC - .4byte Route12_NorthEntrance_1F_MapScripts @ 0x816FE6D - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 176 - .byte 0x70, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00 diff --git a/data/maps/Route12_NorthEntrance_1F/map.json b/data/maps/Route12_NorthEntrance_1F/map.json new file mode 100644 index 000000000..e712f5608 --- /dev/null +++ b/data/maps/Route12_NorthEntrance_1F/map.json @@ -0,0 +1,69 @@ +{ + "id": "MAP_ROUTE12_NORTH_ENTRANCE_1F", + "name": "Route12_NorthEntrance_1F", + "layout": "LAYOUT_ROUTE12_NORTH_ENTRANCE_1F", + "music": "BGM_FRLG_VIRIDIAN_CITY", + "region_map_section": "MAPSEC_ROUTE_12", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 1, + "unknown_19": 2, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "60", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route12_NorthEntrance_1F_EventScript_16FE6E", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 5, + "y": 1, + "elevation": 3, + "dest_map": "MAP_ROUTE12", + "dest_warp_id": 1 + }, + { + "x": 6, + "y": 1, + "elevation": 0, + "dest_map": "MAP_ROUTE12", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 11, + "elevation": 3, + "dest_map": "MAP_ROUTE12", + "dest_warp_id": 3 + }, + { + "x": 6, + "y": 11, + "elevation": 3, + "dest_map": "MAP_ROUTE12", + "dest_warp_id": 3 + }, + { + "x": 8, + "y": 10, + "elevation": 3, + "dest_map": "MAP_ROUTE12_NORTH_ENTRANCE_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route12_NorthEntrance_2F/events.inc b/data/maps/Route12_NorthEntrance_2F/events.inc deleted file mode 100644 index 798f5ac97..000000000 --- a/data/maps/Route12_NorthEntrance_2F/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -Route12_NorthEntrance_2F_EventObjects: - object_event 1, 22, 0, 7, 0, 5, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route12_NorthEntrance_2F_EventScript_16FE8A, 0, 0, 0 - -Route12_NorthEntrance_2F_MapWarps: - warp_def 10, 9, 3, 4, 5888 - -Route12_NorthEntrance_2F_MapBGEvents: - bg_event 4, 1, 0, 0, 0, Route12_NorthEntrance_2F_EventScript_16FE78 - bg_event 8, 1, 0, 0, 0, Route12_NorthEntrance_2F_EventScript_16FE81 - -Route12_NorthEntrance_2F_MapEvents:: - map_events Route12_NorthEntrance_2F_EventObjects, Route12_NorthEntrance_2F_MapWarps, 0x0, Route12_NorthEntrance_2F_MapBGEvents diff --git a/data/maps/Route12_NorthEntrance_2F/header.inc b/data/maps/Route12_NorthEntrance_2F/header.inc deleted file mode 100644 index 00a195bd2..000000000 --- a/data/maps/Route12_NorthEntrance_2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route12_NorthEntrance_2F:: @ 835193C - .4byte Entrance_2F_Layout @ 0x8320804 - .4byte Route12_NorthEntrance_2F_MapEvents @ 0x83BDAF8 - .4byte Route12_NorthEntrance_2F_MapScripts @ 0x816FE77 - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 220 - .byte 0x70, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/Route12_NorthEntrance_2F/map.json b/data/maps/Route12_NorthEntrance_2F/map.json new file mode 100644 index 000000000..8dd3a5404 --- /dev/null +++ b/data/maps/Route12_NorthEntrance_2F/map.json @@ -0,0 +1,56 @@ +{ + "id": "MAP_ROUTE12_NORTH_ENTRANCE_2F", + "name": "Route12_NorthEntrance_2F", + "layout": "LAYOUT_ENTRANCE_2F", + "music": "BGM_FRLG_VIRIDIAN_CITY", + "region_map_section": "MAPSEC_ROUTE_12", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "22", + "x": 7, + "y": 5, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route12_NorthEntrance_2F_EventScript_16FE8A", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 10, + "y": 9, + "elevation": 3, + "dest_map": "MAP_ROUTE12_NORTH_ENTRANCE_1F", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 4, + "y": 1, + "elevation": 0, + "script": "Route12_NorthEntrance_2F_EventScript_16FE78" + }, + { + "type": "bg_event_type_0", + "x": 8, + "y": 1, + "elevation": 0, + "script": "Route12_NorthEntrance_2F_EventScript_16FE81" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route13/connections.inc b/data/maps/Route13/connections.inc deleted file mode 100644 index 2a201358e..000000000 --- a/data/maps/Route13/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -Route13_MapConnectionsList: @ 8352B68 - connection up, 48, MAP_ROUTE12 - connection left, 0, MAP_ROUTE14 - -Route13_MapConnections:: @ 8352B80 - .4byte 2 - .4byte Route13_MapConnectionsList diff --git a/data/maps/Route13/events.inc b/data/maps/Route13/events.inc deleted file mode 100644 index b02655643..000000000 --- a/data/maps/Route13/events.inc +++ /dev/null @@ -1,21 +0,0 @@ -Route13_EventObjects: - object_event 1, 40, 0, 62, 0, 6, 0, 3, 2, 17, 0, 1, 0, 1, 0, Route13_EventScript_1AA803, 0, 0, 0 - object_event 2, 26, 0, 63, 0, 12, 0, 3, 2, 17, 0, 1, 0, 1, 0, Route13_EventScript_1AA749, 0, 0, 0 - object_event 3, 40, 0, 54, 0, 11, 0, 3, 2, 17, 0, 1, 0, 1, 0, Route13_EventScript_1AA841, 0, 0, 0 - object_event 4, 29, 0, 42, 0, 7, 0, 3, 8, 17, 0, 1, 0, 3, 0, Route13_EventScript_1AA70B, 0, 0, 0 - object_event 5, 29, 0, 43, 0, 7, 0, 3, 8, 17, 0, 1, 0, 3, 0, Route13_EventScript_1AA6CD, 0, 0, 0 - object_event 6, 40, 0, 35, 0, 10, 0, 3, 8, 17, 0, 1, 0, 1, 0, Route13_EventScript_1AA87F, 0, 0, 0 - object_event 7, 40, 0, 29, 0, 11, 0, 3, 9, 17, 0, 1, 0, 3, 0, Route13_EventScript_1AA8BD, 0, 0, 0 - object_event 8, 26, 0, 9, 0, 14, 0, 3, 7, 17, 0, 1, 0, 3, 0, Route13_EventScript_1AA7C5, 0, 0, 0 - object_event 9, 26, 0, 16, 0, 5, 0, 3, 10, 17, 0, 1, 0, 3, 0, Route13_EventScript_1AA787, 0, 0, 0 - object_event 10, 53, 0, 14, 0, 8, 0, 3, 1, 17, 0, 1, 0, 1, 0, Route13_EventScript_1AA68F, 0, 0, 0 - object_event 11, 95, 0, 44, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route13_EventScript_1BDF13, 18, 0, 0 - -Route13_MapBGEvents: - bg_event 41, 12, 0, 0, 0, Route13_EventScript_1680C8 - bg_event 37, 6, 0, 0, 0, Route13_EventScript_1680BF - bg_event 21, 14, 0, 0, 0, Route13_EventScript_1680B6 - bg_event 23, 14, 3, 7, 0, 69, 15, 1 - -Route13_MapEvents:: - map_events Route13_EventObjects, 0x0, 0x0, Route13_MapBGEvents diff --git a/data/maps/Route13/header.inc b/data/maps/Route13/header.inc deleted file mode 100644 index 854f41328..000000000 --- a/data/maps/Route13/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route13:: @ 835097C - .4byte Route13_Layout @ 0x82EF13C - .4byte Route13_MapEvents @ 0x83B7428 - .4byte Route13_MapScripts @ 0x81680B5 - .4byte Route13_MapConnections @ 0x8352B80 - .2byte BGM_FRLG_ROUTE_11 - .2byte 101 - .byte 0x71, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/Route13/map.json b/data/maps/Route13/map.json new file mode 100644 index 000000000..0417505f5 --- /dev/null +++ b/data/maps/Route13/map.json @@ -0,0 +1,205 @@ +{ + "id": "MAP_ROUTE13", + "name": "Route13", + "layout": "LAYOUT_ROUTE13", + "music": "BGM_FRLG_ROUTE_11", + "region_map_section": "MAPSEC_ROUTE_13", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_ROUTE12", + "offset": 48, + "direction": "up" + }, + { + "map": "MAP_ROUTE14", + "offset": 0, + "direction": "left" + } + ], + "object_events": [ + { + "graphics_id": "40", + "x": 62, + "y": 6, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route13_EventScript_1AA803", + "flag": "0" + }, + { + "graphics_id": "26", + "x": 63, + "y": 12, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route13_EventScript_1AA749", + "flag": "0" + }, + { + "graphics_id": "40", + "x": 54, + "y": 11, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route13_EventScript_1AA841", + "flag": "0" + }, + { + "graphics_id": "29", + "x": 42, + "y": 7, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route13_EventScript_1AA70B", + "flag": "0" + }, + { + "graphics_id": "29", + "x": 43, + "y": 7, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route13_EventScript_1AA6CD", + "flag": "0" + }, + { + "graphics_id": "40", + "x": 35, + "y": 10, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route13_EventScript_1AA87F", + "flag": "0" + }, + { + "graphics_id": "40", + "x": 29, + "y": 11, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route13_EventScript_1AA8BD", + "flag": "0" + }, + { + "graphics_id": "26", + "x": 9, + "y": 14, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route13_EventScript_1AA7C5", + "flag": "0" + }, + { + "graphics_id": "26", + "x": 16, + "y": 5, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route13_EventScript_1AA787", + "flag": "0" + }, + { + "graphics_id": "53", + "x": 14, + "y": 8, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route13_EventScript_1AA68F", + "flag": "0" + }, + { + "graphics_id": "95", + "x": 44, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route13_EventScript_1BDF13", + "flag": "18" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 41, + "y": 12, + "elevation": 0, + "script": "Route13_EventScript_1680C8" + }, + { + "type": "bg_event_type_0", + "x": 37, + "y": 6, + "elevation": 0, + "script": "Route13_EventScript_1680BF" + }, + { + "type": "bg_event_type_0", + "x": 21, + "y": 14, + "elevation": 0, + "script": "Route13_EventScript_1680B6" + }, + { + "type": "hidden_item", + "x": 23, + "y": 14, + "elevation": 3, + "item": "ITEM_PP_UP", + "flag": "15", + "unknown": 1 + } + ] +} \ No newline at end of file diff --git a/data/maps/Route14/connections.inc b/data/maps/Route14/connections.inc deleted file mode 100644 index f10ba89fd..000000000 --- a/data/maps/Route14/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -Route14_MapConnectionsList: @ 8352B88 - connection left, 40, MAP_ROUTE15 - connection right, 0, MAP_ROUTE13 - -Route14_MapConnections:: @ 8352BA0 - .4byte 2 - .4byte Route14_MapConnectionsList diff --git a/data/maps/Route14/events.inc b/data/maps/Route14/events.inc deleted file mode 100644 index 90606e7d4..000000000 --- a/data/maps/Route14/events.inc +++ /dev/null @@ -1,24 +0,0 @@ -Route14_EventObjects: - object_event 1, 53, 0, 7, 0, 37, 0, 3, 10, 17, 0, 1, 0, 2, 0, Route14_EventScript_1AA9B5, 0, 0, 0 - object_event 2, 26, 0, 18, 0, 35, 0, 3, 2, 34, 0, 1, 0, 1, 0, Route14_EventScript_1AA9F3, 0, 0, 0 - object_event 3, 26, 0, 10, 0, 14, 0, 3, 10, 17, 0, 1, 0, 4, 0, Route14_EventScript_1AAAEB, 0, 0, 0 - object_event 4, 26, 0, 16, 0, 16, 0, 3, 7, 17, 0, 1, 0, 3, 0, Route14_EventScript_1AAB29, 0, 0, 0 - object_event 5, 53, 0, 7, 0, 31, 0, 3, 10, 17, 0, 1, 0, 2, 0, Route14_EventScript_1AA977, 0, 0, 0 - object_event 6, 53, 0, 7, 0, 34, 0, 3, 10, 17, 0, 1, 0, 2, 0, Route14_EventScript_1AA8FB, 0, 0, 0 - object_event 7, 26, 0, 8, 0, 9, 0, 3, 5, 17, 0, 1, 0, 1, 0, Route14_EventScript_1AAAAD, 0, 0, 0 - object_event 8, 26, 0, 7, 0, 6, 0, 3, 10, 17, 0, 1, 0, 1, 0, Route14_EventScript_1AAA6F, 0, 0, 0 - object_event 9, 53, 0, 10, 0, 37, 0, 3, 25, 97, 0, 1, 0, 1, 0, Route14_EventScript_1AA939, 0, 0, 0 - object_event 10, 26, 0, 18, 0, 47, 0, 3, 2, 34, 0, 1, 0, 1, 0, Route14_EventScript_1AAA31, 0, 0, 0 - object_event 11, 95, 0, 7, 0, 26, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route14_EventScript_1BDF13, 18, 0, 0 - object_event 12, 95, 0, 12, 0, 35, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route14_EventScript_1BDF13, 19, 0, 0 - object_event 13, 95, 0, 1, 0, 47, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route14_EventScript_1BDF13, 20, 0, 0 - object_event 14, 17, 0, 13, 0, 51, 0, 3, 8, 17, 0, 1, 0, 1, 0, Route14_EventScript_1AABAD, 0, 0, 0 - object_event 15, 17, 0, 12, 0, 51, 0, 3, 8, 17, 0, 1, 0, 1, 0, Route14_EventScript_1AAB67, 0, 0, 0 - -Route14_MapBGEvents: - bg_event 17, 12, 0, 0, 0, Route14_EventScript_1680D2 - bg_event 9, 20, 3, 7, 0, 70, 149, 1 - bg_event 19, 53, 3, 7, 0, 152, 157, 1 - -Route14_MapEvents:: - map_events Route14_EventObjects, 0x0, 0x0, Route14_MapBGEvents diff --git a/data/maps/Route14/header.inc b/data/maps/Route14/header.inc deleted file mode 100644 index 4dc8ad571..000000000 --- a/data/maps/Route14/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route14:: @ 8350998 - .4byte Route14_Layout @ 0x82EFCA0 - .4byte Route14_MapEvents @ 0x83B75C8 - .4byte Route14_MapScripts @ 0x81680D1 - .4byte Route14_MapConnections @ 0x8352BA0 - .2byte BGM_FRLG_ROUTE_11 - .2byte 102 - .byte 0x72, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/Route14/map.json b/data/maps/Route14/map.json new file mode 100644 index 000000000..cdfb7882e --- /dev/null +++ b/data/maps/Route14/map.json @@ -0,0 +1,252 @@ +{ + "id": "MAP_ROUTE14", + "name": "Route14", + "layout": "LAYOUT_ROUTE14", + "music": "BGM_FRLG_ROUTE_11", + "region_map_section": "MAPSEC_ROUTE_14", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_ROUTE15", + "offset": 40, + "direction": "left" + }, + { + "map": "MAP_ROUTE13", + "offset": 0, + "direction": "right" + } + ], + "object_events": [ + { + "graphics_id": "53", + "x": 7, + "y": 37, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route14_EventScript_1AA9B5", + "flag": "0" + }, + { + "graphics_id": "26", + "x": 18, + "y": 35, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 2, + "movement_range_y": 2, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route14_EventScript_1AA9F3", + "flag": "0" + }, + { + "graphics_id": "26", + "x": 10, + "y": 14, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route14_EventScript_1AAAEB", + "flag": "0" + }, + { + "graphics_id": "26", + "x": 16, + "y": 16, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route14_EventScript_1AAB29", + "flag": "0" + }, + { + "graphics_id": "53", + "x": 7, + "y": 31, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route14_EventScript_1AA977", + "flag": "0" + }, + { + "graphics_id": "53", + "x": 7, + "y": 34, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route14_EventScript_1AA8FB", + "flag": "0" + }, + { + "graphics_id": "26", + "x": 8, + "y": 9, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route14_EventScript_1AAAAD", + "flag": "0" + }, + { + "graphics_id": "26", + "x": 7, + "y": 6, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route14_EventScript_1AAA6F", + "flag": "0" + }, + { + "graphics_id": "53", + "x": 10, + "y": 37, + "elevation": 3, + "movement_type": "25", + "movement_range_x": 1, + "movement_range_y": 6, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route14_EventScript_1AA939", + "flag": "0" + }, + { + "graphics_id": "26", + "x": 18, + "y": 47, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 2, + "movement_range_y": 2, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route14_EventScript_1AAA31", + "flag": "0" + }, + { + "graphics_id": "95", + "x": 7, + "y": 26, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route14_EventScript_1BDF13", + "flag": "18" + }, + { + "graphics_id": "95", + "x": 12, + "y": 35, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route14_EventScript_1BDF13", + "flag": "19" + }, + { + "graphics_id": "95", + "x": 1, + "y": 47, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route14_EventScript_1BDF13", + "flag": "20" + }, + { + "graphics_id": "17", + "x": 13, + "y": 51, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route14_EventScript_1AABAD", + "flag": "0" + }, + { + "graphics_id": "17", + "x": 12, + "y": 51, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route14_EventScript_1AAB67", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 17, + "y": 12, + "elevation": 0, + "script": "Route14_EventScript_1680D2" + }, + { + "type": "hidden_item", + "x": 9, + "y": 20, + "elevation": 3, + "item": "ITEM_ZINC", + "flag": "149", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 19, + "y": 53, + "elevation": 3, + "item": "ITEM_PINAP_BERRY", + "flag": "157", + "unknown": 1 + } + ] +} \ No newline at end of file diff --git a/data/maps/Route15/connections.inc b/data/maps/Route15/connections.inc deleted file mode 100644 index 3706a64ed..000000000 --- a/data/maps/Route15/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -Route15_MapConnectionsList: @ 8352BA8 - connection left, -10, MAP_FUCHSIA_CITY - connection right, -40, MAP_ROUTE14 - -Route15_MapConnections:: @ 8352BC0 - .4byte 2 - .4byte Route15_MapConnectionsList diff --git a/data/maps/Route15/events.inc b/data/maps/Route15/events.inc deleted file mode 100644 index ecb7f3069..000000000 --- a/data/maps/Route15/events.inc +++ /dev/null @@ -1,25 +0,0 @@ -Route15_EventObjects: - object_event 1, 40, 0, 22, 0, 13, 0, 3, 2, 17, 0, 1, 0, 1, 0, Route15_EventScript_1AAD67, 0, 0, 0 - object_event 2, 26, 0, 31, 0, 12, 0, 3, 9, 17, 0, 1, 0, 5, 0, Route15_EventScript_1AACEB, 0, 0, 0 - object_event 3, 26, 0, 37, 0, 14, 0, 3, 7, 17, 0, 1, 0, 2, 0, Route15_EventScript_1AAD29, 0, 0, 0 - object_event 4, 40, 0, 44, 0, 13, 0, 3, 2, 17, 0, 1, 0, 1, 0, Route15_EventScript_1AADA5, 0, 0, 0 - object_event 5, 29, 0, 50, 0, 12, 0, 3, 8, 17, 0, 1, 0, 2, 0, Route15_EventScript_1AACAD, 0, 0, 0 - object_event 6, 53, 0, 59, 0, 12, 0, 3, 18, 17, 0, 1, 0, 2, 0, Route15_EventScript_1AAC31, 0, 0, 0 - object_event 7, 53, 0, 63, 0, 13, 0, 3, 13, 17, 0, 1, 0, 1, 0, Route15_EventScript_1AABF3, 0, 0, 0 - object_event 8, 40, 0, 52, 0, 8, 0, 3, 2, 66, 0, 1, 0, 1, 0, Route15_EventScript_1AADE3, 0, 0, 0 - object_event 9, 29, 0, 54, 0, 12, 0, 3, 8, 17, 0, 1, 0, 2, 0, Route15_EventScript_1AAC6F, 0, 0, 0 - object_event 10, 40, 0, 28, 0, 6, 0, 3, 2, 66, 0, 1, 0, 1, 0, Route15_EventScript_1AAE21, 0, 0, 0 - object_event 11, 92, 0, 20, 0, 6, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route15_EventScript_1BE7CA, 384, 0, 0 - object_event 12, 54, 0, 39, 0, 7, 0, 3, 8, 17, 0, 1, 0, 1, 0, Route15_EventScript_1AAEA5, 0, 0, 0 - object_event 13, 24, 0, 40, 0, 7, 0, 3, 8, 17, 0, 1, 0, 1, 0, Route15_EventScript_1AAE5F, 0, 0, 0 - object_event 14, 65375, 0, 73, 0, 7, 0, 13, 0, 0, 0, 32, 0, 3, 0, 0x0, 0, 0, 0 - -Route15_MapWarps: - warp_def 9, 11, 3, 0, 6144 - warp_def 16, 11, 3, 2, 6144 - -Route15_MapBGEvents: - bg_event 41, 11, 0, 0, 0, Route15_EventScript_1680DC - -Route15_MapEvents:: - map_events Route15_EventObjects, Route15_MapWarps, 0x0, Route15_MapBGEvents diff --git a/data/maps/Route15/header.inc b/data/maps/Route15/header.inc deleted file mode 100644 index c1fc1f9cd..000000000 --- a/data/maps/Route15/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route15:: @ 83509B4 - .4byte Route15_Layout @ 0x82F0804 - .4byte Route15_MapEvents @ 0x83B7748 - .4byte Route15_MapScripts @ 0x81680DB - .4byte Route15_MapConnections @ 0x8352BC0 - .2byte BGM_FRLG_ROUTE_11 - .2byte 103 - .byte 0x73, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/Route15/map.json b/data/maps/Route15/map.json new file mode 100644 index 000000000..213b89fdc --- /dev/null +++ b/data/maps/Route15/map.json @@ -0,0 +1,236 @@ +{ + "id": "MAP_ROUTE15", + "name": "Route15", + "layout": "LAYOUT_ROUTE15", + "music": "BGM_FRLG_ROUTE_11", + "region_map_section": "MAPSEC_ROUTE_15", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_FUCHSIA_CITY", + "offset": -10, + "direction": "left" + }, + { + "map": "MAP_ROUTE14", + "offset": -40, + "direction": "right" + } + ], + "object_events": [ + { + "graphics_id": "40", + "x": 22, + "y": 13, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route15_EventScript_1AAD67", + "flag": "0" + }, + { + "graphics_id": "26", + "x": 31, + "y": 12, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route15_EventScript_1AACEB", + "flag": "0" + }, + { + "graphics_id": "26", + "x": 37, + "y": 14, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route15_EventScript_1AAD29", + "flag": "0" + }, + { + "graphics_id": "40", + "x": 44, + "y": 13, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route15_EventScript_1AADA5", + "flag": "0" + }, + { + "graphics_id": "29", + "x": 50, + "y": 12, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route15_EventScript_1AACAD", + "flag": "0" + }, + { + "graphics_id": "53", + "x": 59, + "y": 12, + "elevation": 3, + "movement_type": "18", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route15_EventScript_1AAC31", + "flag": "0" + }, + { + "graphics_id": "53", + "x": 63, + "y": 13, + "elevation": 3, + "movement_type": "13", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route15_EventScript_1AABF3", + "flag": "0" + }, + { + "graphics_id": "40", + "x": 52, + "y": 8, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 2, + "movement_range_y": 4, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route15_EventScript_1AADE3", + "flag": "0" + }, + { + "graphics_id": "29", + "x": 54, + "y": 12, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route15_EventScript_1AAC6F", + "flag": "0" + }, + { + "graphics_id": "40", + "x": 28, + "y": 6, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 2, + "movement_range_y": 4, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route15_EventScript_1AAE21", + "flag": "0" + }, + { + "graphics_id": "92", + "x": 20, + "y": 6, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route15_EventScript_1BE7CA", + "flag": "384" + }, + { + "graphics_id": "54", + "x": 39, + "y": 7, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route15_EventScript_1AAEA5", + "flag": "0" + }, + { + "graphics_id": "24", + "x": 40, + "y": 7, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route15_EventScript_1AAE5F", + "flag": "0" + }, + { + "graphics_id": "65375", + "x": 73, + "y": 7, + "elevation": 13, + "movement_type": "0", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 32, + "trainer_sight_or_berry_tree_id": 3, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 9, + "y": 11, + "elevation": 3, + "dest_map": "MAP_ROUTE15_WEST_ENTRANCE_1F", + "dest_warp_id": 0 + }, + { + "x": 16, + "y": 11, + "elevation": 3, + "dest_map": "MAP_ROUTE15_WEST_ENTRANCE_1F", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 41, + "y": 11, + "elevation": 0, + "script": "Route15_EventScript_1680DC" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route15_WestEntrance_1F/events.inc b/data/maps/Route15_WestEntrance_1F/events.inc deleted file mode 100644 index 6eed70559..000000000 --- a/data/maps/Route15_WestEntrance_1F/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -Route15_WestEntrance_1F_EventObjects: - object_event 1, 60, 0, 6, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route15_WestEntrance_1F_EventScript_170089, 0, 0, 0 - -Route15_WestEntrance_1F_MapWarps: - warp_def 1, 6, 3, 0, 801 - warp_def 1, 7, 3, 0, 801 - warp_def 11, 6, 3, 1, 801 - warp_def 11, 7, 3, 1, 801 - warp_def 9, 10, 3, 0, 6145 - -Route15_WestEntrance_1F_MapEvents:: - map_events Route15_WestEntrance_1F_EventObjects, Route15_WestEntrance_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route15_WestEntrance_1F/header.inc b/data/maps/Route15_WestEntrance_1F/header.inc deleted file mode 100644 index 7e3573609..000000000 --- a/data/maps/Route15_WestEntrance_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route15_WestEntrance_1F:: @ 8351974 - .4byte Entrance_1F_Layout @ 0x8320E70 - .4byte Route15_WestEntrance_1F_MapEvents @ 0x83BDB9C - .4byte Route15_WestEntrance_1F_MapScripts @ 0x8170088 - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 224 - .byte 0x73, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00 diff --git a/data/maps/Route15_WestEntrance_1F/map.json b/data/maps/Route15_WestEntrance_1F/map.json new file mode 100644 index 000000000..d39ee196e --- /dev/null +++ b/data/maps/Route15_WestEntrance_1F/map.json @@ -0,0 +1,69 @@ +{ + "id": "MAP_ROUTE15_WEST_ENTRANCE_1F", + "name": "Route15_WestEntrance_1F", + "layout": "LAYOUT_ENTRANCE_1F", + "music": "BGM_FRLG_VIRIDIAN_CITY", + "region_map_section": "MAPSEC_ROUTE_15", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 1, + "unknown_19": 2, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "60", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route15_WestEntrance_1F_EventScript_170089", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 3, + "dest_map": "MAP_ROUTE15", + "dest_warp_id": 0 + }, + { + "x": 1, + "y": 7, + "elevation": 3, + "dest_map": "MAP_ROUTE15", + "dest_warp_id": 0 + }, + { + "x": 11, + "y": 6, + "elevation": 3, + "dest_map": "MAP_ROUTE15", + "dest_warp_id": 1 + }, + { + "x": 11, + "y": 7, + "elevation": 3, + "dest_map": "MAP_ROUTE15", + "dest_warp_id": 1 + }, + { + "x": 9, + "y": 10, + "elevation": 3, + "dest_map": "MAP_ROUTE15_WEST_ENTRANCE_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route15_WestEntrance_2F/events.inc b/data/maps/Route15_WestEntrance_2F/events.inc deleted file mode 100644 index 538d744f4..000000000 --- a/data/maps/Route15_WestEntrance_2F/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -Route15_WestEntrance_2F_EventObjects: - object_event 1, 55, 0, 5, 0, 5, 0, 3, 7, 17, 0, 0, 0, 0, 0, Route15_WestEntrance_2F_EventScript_1700B9, 0, 0, 0 - -Route15_WestEntrance_2F_MapWarps: - warp_def 10, 9, 3, 4, 6144 - -Route15_WestEntrance_2F_MapBGEvents: - bg_event 4, 1, 0, 0, 0, Route15_WestEntrance_2F_EventScript_170093 - bg_event 8, 1, 0, 0, 0, Route15_WestEntrance_2F_EventScript_1700B0 - -Route15_WestEntrance_2F_MapEvents:: - map_events Route15_WestEntrance_2F_EventObjects, Route15_WestEntrance_2F_MapWarps, 0x0, Route15_WestEntrance_2F_MapBGEvents diff --git a/data/maps/Route15_WestEntrance_2F/header.inc b/data/maps/Route15_WestEntrance_2F/header.inc deleted file mode 100644 index 7bd72a5b8..000000000 --- a/data/maps/Route15_WestEntrance_2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route15_WestEntrance_2F:: @ 8351990 - .4byte Entrance_2F_Layout @ 0x8320804 - .4byte Route15_WestEntrance_2F_MapEvents @ 0x83BDBE8 - .4byte Route15_WestEntrance_2F_MapScripts @ 0x8170092 - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 220 - .byte 0x73, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/Route15_WestEntrance_2F/map.json b/data/maps/Route15_WestEntrance_2F/map.json new file mode 100644 index 000000000..6be75b750 --- /dev/null +++ b/data/maps/Route15_WestEntrance_2F/map.json @@ -0,0 +1,56 @@ +{ + "id": "MAP_ROUTE15_WEST_ENTRANCE_2F", + "name": "Route15_WestEntrance_2F", + "layout": "LAYOUT_ENTRANCE_2F", + "music": "BGM_FRLG_VIRIDIAN_CITY", + "region_map_section": "MAPSEC_ROUTE_15", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "55", + "x": 5, + "y": 5, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route15_WestEntrance_2F_EventScript_1700B9", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 10, + "y": 9, + "elevation": 3, + "dest_map": "MAP_ROUTE15_WEST_ENTRANCE_1F", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 4, + "y": 1, + "elevation": 0, + "script": "Route15_WestEntrance_2F_EventScript_170093" + }, + { + "type": "bg_event_type_0", + "x": 8, + "y": 1, + "elevation": 0, + "script": "Route15_WestEntrance_2F_EventScript_1700B0" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route16/connections.inc b/data/maps/Route16/connections.inc deleted file mode 100644 index c48d0b461..000000000 --- a/data/maps/Route16/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -Route16_MapConnectionsList: @ 8352BC8 - connection down, 0, MAP_ROUTE17 - connection right, -10, MAP_CELADON_CITY - -Route16_MapConnections:: @ 8352BE0 - .4byte 2 - .4byte Route16_MapConnectionsList diff --git a/data/maps/Route16/events.inc b/data/maps/Route16/events.inc deleted file mode 100644 index 316615eab..000000000 --- a/data/maps/Route16/events.inc +++ /dev/null @@ -1,26 +0,0 @@ -Route16_EventObjects: - object_event 1, 53, 0, 16, 0, 12, 0, 3, 1, 17, 0, 1, 0, 1, 0, Route16_EventScript_1AAEEB, 0, 0, 0 - object_event 2, 53, 0, 14, 0, 14, 0, 3, 1, 17, 0, 1, 0, 1, 0, Route16_EventScript_1AAFA5, 0, 0, 0 - object_event 3, 53, 0, 12, 0, 12, 0, 3, 1, 17, 0, 1, 0, 1, 0, Route16_EventScript_1AAFE3, 0, 0, 0 - object_event 4, 53, 0, 8, 0, 12, 0, 3, 1, 17, 0, 1, 0, 1, 0, Route16_EventScript_1AAF67, 0, 0, 0 - object_event 5, 53, 0, 10, 0, 14, 0, 3, 1, 17, 0, 1, 0, 1, 0, Route16_EventScript_1AAF29, 0, 0, 0 - object_event 6, 53, 0, 6, 0, 14, 0, 3, 1, 17, 0, 1, 0, 1, 0, Route16_EventScript_1AB021, 0, 0, 0 - object_event 7, 95, 0, 41, 0, 11, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route16_EventScript_1BDF13, 18, 0, 0 - object_event 8, 29, 0, 30, 0, 5, 0, 3, 8, 17, 0, 1, 0, 1, 0, Route16_EventScript_1AB0A5, 0, 0, 0 - object_event 9, 25, 0, 31, 0, 5, 0, 3, 8, 17, 0, 1, 0, 1, 0, Route16_EventScript_1AB05F, 0, 0, 0 - object_event 10, 109, 0, 31, 0, 13, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route16_EventScript_168121, 128, 0, 0 - -Route16_MapWarps: - warp_def 10, 5, 0, 1, 6400 - warp_def 20, 6, 3, 0, 6401 - warp_def 27, 6, 3, 1, 6401 - warp_def 20, 13, 3, 2, 6401 - warp_def 27, 13, 3, 3, 6401 - -Route16_MapBGEvents: - bg_event 6, 17, 0, 0, 0, Route16_EventScript_1681B6 - bg_event 33, 11, 0, 0, 0, Route16_EventScript_1681AD - bg_event 31, 13, 3, 7, 0, 200, 132, 129 - -Route16_MapEvents:: - map_events Route16_EventObjects, Route16_MapWarps, 0x0, Route16_MapBGEvents diff --git a/data/maps/Route16/header.inc b/data/maps/Route16/header.inc deleted file mode 100644 index 71785a7a5..000000000 --- a/data/maps/Route16/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route16:: @ 83509D0 - .4byte Route16_Layout @ 0x82F0FA8 - .4byte Route16_MapEvents @ 0x83B7898 - .4byte Route16_MapScripts @ 0x81680E5 - .4byte Route16_MapConnections @ 0x8352BE0 - .2byte BGM_FRLG_ROUTE_3 - .2byte 104 - .byte 0x74, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/Route16/map.json b/data/maps/Route16/map.json new file mode 100644 index 000000000..a8dd02f92 --- /dev/null +++ b/data/maps/Route16/map.json @@ -0,0 +1,221 @@ +{ + "id": "MAP_ROUTE16", + "name": "Route16", + "layout": "LAYOUT_ROUTE16", + "music": "BGM_FRLG_ROUTE_3", + "region_map_section": "MAPSEC_ROUTE_16", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_ROUTE17", + "offset": 0, + "direction": "down" + }, + { + "map": "MAP_CELADON_CITY", + "offset": -10, + "direction": "right" + } + ], + "object_events": [ + { + "graphics_id": "53", + "x": 16, + "y": 12, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route16_EventScript_1AAEEB", + "flag": "0" + }, + { + "graphics_id": "53", + "x": 14, + "y": 14, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route16_EventScript_1AAFA5", + "flag": "0" + }, + { + "graphics_id": "53", + "x": 12, + "y": 12, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route16_EventScript_1AAFE3", + "flag": "0" + }, + { + "graphics_id": "53", + "x": 8, + "y": 12, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route16_EventScript_1AAF67", + "flag": "0" + }, + { + "graphics_id": "53", + "x": 10, + "y": 14, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route16_EventScript_1AAF29", + "flag": "0" + }, + { + "graphics_id": "53", + "x": 6, + "y": 14, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route16_EventScript_1AB021", + "flag": "0" + }, + { + "graphics_id": "95", + "x": 41, + "y": 11, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route16_EventScript_1BDF13", + "flag": "18" + }, + { + "graphics_id": "29", + "x": 30, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route16_EventScript_1AB0A5", + "flag": "0" + }, + { + "graphics_id": "25", + "x": 31, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route16_EventScript_1AB05F", + "flag": "0" + }, + { + "graphics_id": "109", + "x": 31, + "y": 13, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route16_EventScript_168121", + "flag": "128" + } + ], + "warp_events": [ + { + "x": 10, + "y": 5, + "elevation": 0, + "dest_map": "MAP_ROUTE16_HOUSE", + "dest_warp_id": 1 + }, + { + "x": 20, + "y": 6, + "elevation": 3, + "dest_map": "MAP_ROUTE16_NORTH_ENTRANCE_1F", + "dest_warp_id": 0 + }, + { + "x": 27, + "y": 6, + "elevation": 3, + "dest_map": "MAP_ROUTE16_NORTH_ENTRANCE_1F", + "dest_warp_id": 1 + }, + { + "x": 20, + "y": 13, + "elevation": 3, + "dest_map": "MAP_ROUTE16_NORTH_ENTRANCE_1F", + "dest_warp_id": 2 + }, + { + "x": 27, + "y": 13, + "elevation": 3, + "dest_map": "MAP_ROUTE16_NORTH_ENTRANCE_1F", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 6, + "y": 17, + "elevation": 0, + "script": "Route16_EventScript_1681B6" + }, + { + "type": "bg_event_type_0", + "x": 33, + "y": 11, + "elevation": 0, + "script": "Route16_EventScript_1681AD" + }, + { + "type": "hidden_item", + "x": 31, + "y": 13, + "elevation": 3, + "item": "ITEM_LEFTOVERS", + "flag": "132", + "unknown": 129 + } + ] +} \ No newline at end of file diff --git a/data/maps/Route16_House/events.inc b/data/maps/Route16_House/events.inc deleted file mode 100644 index 0983be77b..000000000 --- a/data/maps/Route16_House/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -Route16_House_EventObjects: - object_event 1, 23, 0, 4, 0, 2, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route16_House_EventScript_17014F, 0, 0, 0 - object_event 2, 133, 0, 9, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route16_House_EventScript_1701AF, 0, 0, 0 - -Route16_House_MapWarps: - warp_def 3, 7, 3, 0, 802 - warp_def 4, 7, 3, 0, 802 - warp_def 5, 7, 3, 0, 802 - -Route16_House_MapEvents:: - map_events Route16_House_EventObjects, Route16_House_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route16_House/header.inc b/data/maps/Route16_House/header.inc deleted file mode 100644 index 3fd158b04..000000000 --- a/data/maps/Route16_House/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route16_House:: @ 83519AC - .4byte House1_Layout @ 0x82D5754 - .4byte Route16_House_MapEvents @ 0x83BDC44 - .4byte Route16_House_MapScripts @ 0x817014E - .4byte NULL - .2byte BGM_FRLG_CELADON_CITY - .2byte 6 - .byte 0x74, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/Route16_House/map.json b/data/maps/Route16_House/map.json new file mode 100644 index 000000000..890b5d9f4 --- /dev/null +++ b/data/maps/Route16_House/map.json @@ -0,0 +1,68 @@ +{ + "id": "MAP_ROUTE16_HOUSE", + "name": "Route16_House", + "layout": "LAYOUT_HOUSE1", + "music": "BGM_FRLG_CELADON_CITY", + "region_map_section": "MAPSEC_ROUTE_16", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "23", + "x": 4, + "y": 2, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route16_House_EventScript_17014F", + "flag": "0" + }, + { + "graphics_id": "133", + "x": 9, + "y": 3, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route16_House_EventScript_1701AF", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 3, + "dest_map": "MAP_ROUTE16", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_ROUTE16", + "dest_warp_id": 0 + }, + { + "x": 5, + "y": 7, + "elevation": 3, + "dest_map": "MAP_ROUTE16", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route16_NorthEntrance_1F/events.inc b/data/maps/Route16_NorthEntrance_1F/events.inc deleted file mode 100644 index 151d6a858..000000000 --- a/data/maps/Route16_NorthEntrance_1F/events.inc +++ /dev/null @@ -1,26 +0,0 @@ -Route16_NorthEntrance_1F_EventObjects: - object_event 1, 60, 0, 6, 0, 8, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route16_NorthEntrance_1F_EventScript_1701DB, 0, 0, 0 - object_event 2, 32, 0, 7, 0, 4, 0, 3, 5, 17, 0, 0, 0, 0, 0, Route16_NorthEntrance_1F_EventScript_1702B5, 0, 0, 0 - -Route16_NorthEntrance_1F_MapWarps: - warp_def 1, 3, 3, 1, 802 - warp_def 11, 3, 3, 2, 802 - warp_def 1, 12, 3, 3, 802 - warp_def 11, 12, 3, 4, 802 - warp_def 9, 16, 3, 0, 6402 - -Route16_NorthEntrance_1F_MapCoordEvents: - coord_event 10, 12, 3, 0, 16478, 1, 0, Route16_NorthEntrance_1F_EventScript_1A77B6 - coord_event 2, 12, 3, 0, 16478, 0, 0, Route16_NorthEntrance_1F_EventScript_1A77C1 - coord_event 6, 10, 3, 0, 16385, 0, 0, Route16_NorthEntrance_1F_EventScript_1701E4 - coord_event 6, 11, 3, 0, 16385, 0, 0, Route16_NorthEntrance_1F_EventScript_1701F0 - coord_event 1, 13, 3, 0, 16478, 0, 0, Route16_NorthEntrance_1F_EventScript_1A77C1 - coord_event 1, 11, 3, 0, 16478, 0, 0, Route16_NorthEntrance_1F_EventScript_1A77C1 - coord_event 11, 11, 3, 0, 16478, 1, 0, Route16_NorthEntrance_1F_EventScript_1A77B6 - coord_event 11, 13, 3, 0, 16478, 1, 0, Route16_NorthEntrance_1F_EventScript_1A77B6 - coord_event 6, 12, 3, 0, 16385, 0, 0, Route16_NorthEntrance_1F_EventScript_1701FC - coord_event 6, 13, 3, 0, 16385, 0, 0, Route16_NorthEntrance_1F_EventScript_170208 - coord_event 6, 14, 3, 0, 16385, 0, 0, Route16_NorthEntrance_1F_EventScript_170214 - -Route16_NorthEntrance_1F_MapEvents:: - map_events Route16_NorthEntrance_1F_EventObjects, Route16_NorthEntrance_1F_MapWarps, Route16_NorthEntrance_1F_MapCoordEvents, 0x0 diff --git a/data/maps/Route16_NorthEntrance_1F/header.inc b/data/maps/Route16_NorthEntrance_1F/header.inc deleted file mode 100644 index fffac64b8..000000000 --- a/data/maps/Route16_NorthEntrance_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route16_NorthEntrance_1F:: @ 83519C8 - .4byte Route16_NorthEntrance_1F_Layout @ 0x8320D14 - .4byte Route16_NorthEntrance_1F_MapEvents @ 0x83BDD60 - .4byte Route16_NorthEntrance_1F_MapScripts @ 0x81701C2 - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 223 - .byte 0x74, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00 diff --git a/data/maps/Route16_NorthEntrance_1F/map.json b/data/maps/Route16_NorthEntrance_1F/map.json new file mode 100644 index 000000000..586be196d --- /dev/null +++ b/data/maps/Route16_NorthEntrance_1F/map.json @@ -0,0 +1,182 @@ +{ + "id": "MAP_ROUTE16_NORTH_ENTRANCE_1F", + "name": "Route16_NorthEntrance_1F", + "layout": "LAYOUT_ROUTE16_NORTH_ENTRANCE_1F", + "music": "BGM_FRLG_VIRIDIAN_CITY", + "region_map_section": "MAPSEC_ROUTE_16", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 1, + "unknown_19": 2, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "60", + "x": 6, + "y": 8, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route16_NorthEntrance_1F_EventScript_1701DB", + "flag": "0" + }, + { + "graphics_id": "32", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route16_NorthEntrance_1F_EventScript_1702B5", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 1, + "y": 3, + "elevation": 3, + "dest_map": "MAP_ROUTE16", + "dest_warp_id": 1 + }, + { + "x": 11, + "y": 3, + "elevation": 3, + "dest_map": "MAP_ROUTE16", + "dest_warp_id": 2 + }, + { + "x": 1, + "y": 12, + "elevation": 3, + "dest_map": "MAP_ROUTE16", + "dest_warp_id": 3 + }, + { + "x": 11, + "y": 12, + "elevation": 3, + "dest_map": "MAP_ROUTE16", + "dest_warp_id": 4 + }, + { + "x": 9, + "y": 16, + "elevation": 3, + "dest_map": "MAP_ROUTE16_NORTH_ENTRANCE_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 10, + "y": 12, + "elevation": 3, + "var": "VAR_0x405E", + "var_value": 1, + "script": "Route16_NorthEntrance_1F_EventScript_1A77B6" + }, + { + "type": "trigger", + "x": 2, + "y": 12, + "elevation": 3, + "var": "VAR_0x405E", + "var_value": 0, + "script": "Route16_NorthEntrance_1F_EventScript_1A77C1" + }, + { + "type": "trigger", + "x": 6, + "y": 10, + "elevation": 3, + "var": "VAR_0x4001", + "var_value": 0, + "script": "Route16_NorthEntrance_1F_EventScript_1701E4" + }, + { + "type": "trigger", + "x": 6, + "y": 11, + "elevation": 3, + "var": "VAR_0x4001", + "var_value": 0, + "script": "Route16_NorthEntrance_1F_EventScript_1701F0" + }, + { + "type": "trigger", + "x": 1, + "y": 13, + "elevation": 3, + "var": "VAR_0x405E", + "var_value": 0, + "script": "Route16_NorthEntrance_1F_EventScript_1A77C1" + }, + { + "type": "trigger", + "x": 1, + "y": 11, + "elevation": 3, + "var": "VAR_0x405E", + "var_value": 0, + "script": "Route16_NorthEntrance_1F_EventScript_1A77C1" + }, + { + "type": "trigger", + "x": 11, + "y": 11, + "elevation": 3, + "var": "VAR_0x405E", + "var_value": 1, + "script": "Route16_NorthEntrance_1F_EventScript_1A77B6" + }, + { + "type": "trigger", + "x": 11, + "y": 13, + "elevation": 3, + "var": "VAR_0x405E", + "var_value": 1, + "script": "Route16_NorthEntrance_1F_EventScript_1A77B6" + }, + { + "type": "trigger", + "x": 6, + "y": 12, + "elevation": 3, + "var": "VAR_0x4001", + "var_value": 0, + "script": "Route16_NorthEntrance_1F_EventScript_1701FC" + }, + { + "type": "trigger", + "x": 6, + "y": 13, + "elevation": 3, + "var": "VAR_0x4001", + "var_value": 0, + "script": "Route16_NorthEntrance_1F_EventScript_170208" + }, + { + "type": "trigger", + "x": 6, + "y": 14, + "elevation": 3, + "var": "VAR_0x4001", + "var_value": 0, + "script": "Route16_NorthEntrance_1F_EventScript_170214" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route16_NorthEntrance_2F/events.inc b/data/maps/Route16_NorthEntrance_2F/events.inc deleted file mode 100644 index 5a163e96f..000000000 --- a/data/maps/Route16_NorthEntrance_2F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -Route16_NorthEntrance_2F_EventObjects: - object_event 1, 16, 0, 6, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route16_NorthEntrance_2F_EventScript_1702BF, 0, 0, 0 - object_event 2, 17, 0, 4, 0, 8, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route16_NorthEntrance_2F_EventScript_1702C8, 0, 0, 0 - object_event 3, 55, 0, 10, 0, 6, 0, 0, 9, 17, 0, 0, 0, 0, 0, Route16_NorthEntrance_2F_EventScript_1702E3, 0, 0, 0 - -Route16_NorthEntrance_2F_MapWarps: - warp_def 10, 9, 3, 4, 6401 - -Route16_NorthEntrance_2F_MapBGEvents: - bg_event 4, 1, 0, 0, 0, Route16_NorthEntrance_2F_EventScript_1702D1 - bg_event 8, 1, 0, 0, 0, Route16_NorthEntrance_2F_EventScript_1702DA - -Route16_NorthEntrance_2F_MapEvents:: - map_events Route16_NorthEntrance_2F_EventObjects, Route16_NorthEntrance_2F_MapWarps, 0x0, Route16_NorthEntrance_2F_MapBGEvents diff --git a/data/maps/Route16_NorthEntrance_2F/header.inc b/data/maps/Route16_NorthEntrance_2F/header.inc deleted file mode 100644 index ea494e816..000000000 --- a/data/maps/Route16_NorthEntrance_2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route16_NorthEntrance_2F:: @ 83519E4 - .4byte Entrance_2F_Layout @ 0x8320804 - .4byte Route16_NorthEntrance_2F_MapEvents @ 0x83BDDDC - .4byte Route16_NorthEntrance_2F_MapScripts @ 0x81702BE - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 220 - .byte 0x74, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/Route16_NorthEntrance_2F/map.json b/data/maps/Route16_NorthEntrance_2F/map.json new file mode 100644 index 000000000..e4cdf8626 --- /dev/null +++ b/data/maps/Route16_NorthEntrance_2F/map.json @@ -0,0 +1,82 @@ +{ + "id": "MAP_ROUTE16_NORTH_ENTRANCE_2F", + "name": "Route16_NorthEntrance_2F", + "layout": "LAYOUT_ENTRANCE_2F", + "music": "BGM_FRLG_VIRIDIAN_CITY", + "region_map_section": "MAPSEC_ROUTE_16", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "16", + "x": 6, + "y": 3, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route16_NorthEntrance_2F_EventScript_1702BF", + "flag": "0" + }, + { + "graphics_id": "17", + "x": 4, + "y": 8, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route16_NorthEntrance_2F_EventScript_1702C8", + "flag": "0" + }, + { + "graphics_id": "55", + "x": 10, + "y": 6, + "elevation": 0, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route16_NorthEntrance_2F_EventScript_1702E3", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 10, + "y": 9, + "elevation": 3, + "dest_map": "MAP_ROUTE16_NORTH_ENTRANCE_1F", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 4, + "y": 1, + "elevation": 0, + "script": "Route16_NorthEntrance_2F_EventScript_1702D1" + }, + { + "type": "bg_event_type_0", + "x": 8, + "y": 1, + "elevation": 0, + "script": "Route16_NorthEntrance_2F_EventScript_1702DA" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route17/connections.inc b/data/maps/Route17/connections.inc deleted file mode 100644 index e3db083c2..000000000 --- a/data/maps/Route17/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -Route17_MapConnectionsList: @ 8352BE8 - connection up, 0, MAP_ROUTE16 - connection down, 0, MAP_ROUTE18 - -Route17_MapConnections:: @ 8352C00 - .4byte 2 - .4byte Route17_MapConnectionsList diff --git a/data/maps/Route17/events.inc b/data/maps/Route17/events.inc deleted file mode 100644 index a0fc66d38..000000000 --- a/data/maps/Route17/events.inc +++ /dev/null @@ -1,27 +0,0 @@ -Route17_EventObjects: - object_event 1, 53, 0, 4, 0, 18, 0, 3, 26, 97, 0, 1, 0, 1, 0, Route17_EventScript_1AB319, 0, 0, 0 - object_event 2, 53, 0, 11, 0, 15, 0, 3, 26, 81, 0, 1, 0, 1, 0, Route17_EventScript_1AB221, 0, 0, 0 - object_event 3, 53, 0, 15, 0, 24, 0, 3, 52, 36, 0, 1, 0, 1, 0, Route17_EventScript_1AB1E3, 0, 0, 0 - object_event 4, 53, 0, 18, 0, 41, 0, 3, 26, 81, 0, 1, 0, 1, 0, Route17_EventScript_1AB129, 0, 0, 0 - object_event 5, 53, 0, 7, 0, 38, 0, 3, 14, 17, 0, 1, 0, 5, 0, Route17_EventScript_1AB0EB, 0, 0, 0 - object_event 6, 53, 0, 2, 0, 61, 0, 3, 10, 17, 0, 1, 0, 4, 0, Route17_EventScript_1AB29D, 0, 0, 0 - object_event 7, 53, 0, 21, 0, 61, 0, 3, 9, 17, 0, 1, 0, 3, 0, Route17_EventScript_1AB25F, 0, 0, 0 - object_event 8, 53, 0, 18, 0, 94, 0, 3, 26, 81, 0, 1, 0, 1, 0, Route17_EventScript_1AB2DB, 0, 0, 0 - object_event 9, 53, 0, 16, 0, 134, 0, 3, 47, 24, 0, 1, 0, 1, 0, Route17_EventScript_1AB1A5, 0, 0, 0 - object_event 10, 53, 0, 4, 0, 116, 0, 3, 26, 81, 0, 1, 0, 1, 0, Route17_EventScript_1AB167, 0, 0, 0 - -Route17_MapBGEvents: - bg_event 12, 97, 0, 0, 0, Route17_EventScript_1681DB - bg_event 12, 83, 0, 0, 0, Route17_EventScript_1681D2 - bg_event 12, 68, 0, 0, 0, Route17_EventScript_1681C9 - bg_event 12, 53, 0, 0, 0, Route17_EventScript_1681C0 - bg_event 12, 125, 3, 0, 0, Route17_EventScript_1681E4 - bg_event 11, 157, 0, 0, 0, Route17_EventScript_1681ED - bg_event 18, 83, 3, 7, 0, 68, 17, 1 - bg_event 10, 53, 3, 7, 0, 19, 18, 1 - bg_event 4, 68, 3, 7, 0, 69, 19, 1 - bg_event 4, 125, 3, 7, 0, 25, 20, 1 - bg_event 14, 157, 3, 7, 0, 37, 21, 1 - -Route17_MapEvents:: - map_events Route17_EventObjects, 0x0, 0x0, Route17_MapBGEvents diff --git a/data/maps/Route17/header.inc b/data/maps/Route17/header.inc deleted file mode 100644 index ae76e440e..000000000 --- a/data/maps/Route17/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route17:: @ 83509EC - .4byte Route17_Layout @ 0x82F2DCC - .4byte Route17_MapEvents @ 0x83B7A20 - .4byte Route17_MapScripts @ 0x81681BF - .4byte Route17_MapConnections @ 0x8352C00 - .2byte BGM_FRLG_ROUTE_3 - .2byte 105 - .byte 0x75, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/Route17/map.json b/data/maps/Route17/map.json new file mode 100644 index 000000000..3e2049c31 --- /dev/null +++ b/data/maps/Route17/map.json @@ -0,0 +1,249 @@ +{ + "id": "MAP_ROUTE17", + "name": "Route17", + "layout": "LAYOUT_ROUTE17", + "music": "BGM_FRLG_ROUTE_3", + "region_map_section": "MAPSEC_ROUTE_17", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_ROUTE16", + "offset": 0, + "direction": "up" + }, + { + "map": "MAP_ROUTE18", + "offset": 0, + "direction": "down" + } + ], + "object_events": [ + { + "graphics_id": "53", + "x": 4, + "y": 18, + "elevation": 3, + "movement_type": "26", + "movement_range_x": 1, + "movement_range_y": 6, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route17_EventScript_1AB319", + "flag": "0" + }, + { + "graphics_id": "53", + "x": 11, + "y": 15, + "elevation": 3, + "movement_type": "26", + "movement_range_x": 1, + "movement_range_y": 5, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route17_EventScript_1AB221", + "flag": "0" + }, + { + "graphics_id": "53", + "x": 15, + "y": 24, + "elevation": 3, + "movement_type": "52", + "movement_range_x": 4, + "movement_range_y": 2, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route17_EventScript_1AB1E3", + "flag": "0" + }, + { + "graphics_id": "53", + "x": 18, + "y": 41, + "elevation": 3, + "movement_type": "26", + "movement_range_x": 1, + "movement_range_y": 5, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route17_EventScript_1AB129", + "flag": "0" + }, + { + "graphics_id": "53", + "x": 7, + "y": 38, + "elevation": 3, + "movement_type": "14", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route17_EventScript_1AB0EB", + "flag": "0" + }, + { + "graphics_id": "53", + "x": 2, + "y": 61, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route17_EventScript_1AB29D", + "flag": "0" + }, + { + "graphics_id": "53", + "x": 21, + "y": 61, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route17_EventScript_1AB25F", + "flag": "0" + }, + { + "graphics_id": "53", + "x": 18, + "y": 94, + "elevation": 3, + "movement_type": "26", + "movement_range_x": 1, + "movement_range_y": 5, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route17_EventScript_1AB2DB", + "flag": "0" + }, + { + "graphics_id": "53", + "x": 16, + "y": 134, + "elevation": 3, + "movement_type": "47", + "movement_range_x": 8, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route17_EventScript_1AB1A5", + "flag": "0" + }, + { + "graphics_id": "53", + "x": 4, + "y": 116, + "elevation": 3, + "movement_type": "26", + "movement_range_x": 1, + "movement_range_y": 5, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route17_EventScript_1AB167", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 12, + "y": 97, + "elevation": 0, + "script": "Route17_EventScript_1681DB" + }, + { + "type": "bg_event_type_0", + "x": 12, + "y": 83, + "elevation": 0, + "script": "Route17_EventScript_1681D2" + }, + { + "type": "bg_event_type_0", + "x": 12, + "y": 68, + "elevation": 0, + "script": "Route17_EventScript_1681C9" + }, + { + "type": "bg_event_type_0", + "x": 12, + "y": 53, + "elevation": 0, + "script": "Route17_EventScript_1681C0" + }, + { + "type": "bg_event_type_0", + "x": 12, + "y": 125, + "elevation": 3, + "script": "Route17_EventScript_1681E4" + }, + { + "type": "bg_event_type_0", + "x": 11, + "y": 157, + "elevation": 0, + "script": "Route17_EventScript_1681ED" + }, + { + "type": "hidden_item", + "x": 18, + "y": 83, + "elevation": 3, + "item": "ITEM_RARE_CANDY", + "flag": "17", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 10, + "y": 53, + "elevation": 3, + "item": "ITEM_FULL_RESTORE", + "flag": "18", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 4, + "y": 68, + "elevation": 3, + "item": "ITEM_PP_UP", + "flag": "19", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 4, + "y": 125, + "elevation": 3, + "item": "ITEM_MAX_REVIVE", + "flag": "20", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 14, + "y": 157, + "elevation": 3, + "item": "ITEM_MAX_ELIXIR", + "flag": "21", + "unknown": 1 + } + ] +} \ No newline at end of file diff --git a/data/maps/Route18/connections.inc b/data/maps/Route18/connections.inc deleted file mode 100644 index dd721edac..000000000 --- a/data/maps/Route18/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -Route18_MapConnectionsList: @ 8352C08 - connection up, 0, MAP_ROUTE17 - connection right, -10, MAP_FUCHSIA_CITY - -Route18_MapConnections:: @ 8352C20 - .4byte 2 - .4byte Route18_MapConnectionsList diff --git a/data/maps/Route18/events.inc b/data/maps/Route18/events.inc deleted file mode 100644 index a07028aa1..000000000 --- a/data/maps/Route18/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route18_EventObjects: - object_event 1, 26, 0, 46, 0, 14, 0, 3, 9, 17, 0, 1, 0, 4, 0, Route18_EventScript_1AB3D3, 0, 0, 0 - object_event 2, 26, 0, 41, 0, 15, 0, 3, 1, 17, 0, 1, 0, 1, 0, Route18_EventScript_1AB395, 0, 0, 0 - object_event 3, 26, 0, 39, 0, 12, 0, 3, 10, 17, 0, 1, 0, 6, 0, Route18_EventScript_1AB357, 0, 0, 0 - -Route18_MapWarps: - warp_def 41, 9, 3, 0, 6656 - warp_def 48, 9, 3, 1, 6656 - -Route18_MapBGEvents: - bg_event 37, 7, 0, 0, 0, Route18_EventScript_168228 - bg_event 52, 7, 0, 0, 0, Route18_EventScript_16821F - -Route18_MapEvents:: - map_events Route18_EventObjects, Route18_MapWarps, 0x0, Route18_MapBGEvents diff --git a/data/maps/Route18/header.inc b/data/maps/Route18/header.inc deleted file mode 100644 index b4861fdf1..000000000 --- a/data/maps/Route18/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route18:: @ 8350A08 - .4byte Route18_Layout @ 0x82F3750 - .4byte Route18_MapEvents @ 0x83B7AA4 - .4byte Route18_MapScripts @ 0x81681F6 - .4byte Route18_MapConnections @ 0x8352C20 - .2byte BGM_FRLG_ROUTE_3 - .2byte 106 - .byte 0x76, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/Route18/map.json b/data/maps/Route18/map.json new file mode 100644 index 000000000..760f31bad --- /dev/null +++ b/data/maps/Route18/map.json @@ -0,0 +1,100 @@ +{ + "id": "MAP_ROUTE18", + "name": "Route18", + "layout": "LAYOUT_ROUTE18", + "music": "BGM_FRLG_ROUTE_3", + "region_map_section": "MAPSEC_ROUTE_18", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_ROUTE17", + "offset": 0, + "direction": "up" + }, + { + "map": "MAP_FUCHSIA_CITY", + "offset": -10, + "direction": "right" + } + ], + "object_events": [ + { + "graphics_id": "26", + "x": 46, + "y": 14, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route18_EventScript_1AB3D3", + "flag": "0" + }, + { + "graphics_id": "26", + "x": 41, + "y": 15, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route18_EventScript_1AB395", + "flag": "0" + }, + { + "graphics_id": "26", + "x": 39, + "y": 12, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "Route18_EventScript_1AB357", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 41, + "y": 9, + "elevation": 3, + "dest_map": "MAP_ROUTE18_EAST_ENTRANCE_1F", + "dest_warp_id": 0 + }, + { + "x": 48, + "y": 9, + "elevation": 3, + "dest_map": "MAP_ROUTE18_EAST_ENTRANCE_1F", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 37, + "y": 7, + "elevation": 0, + "script": "Route18_EventScript_168228" + }, + { + "type": "bg_event_type_0", + "x": 52, + "y": 7, + "elevation": 0, + "script": "Route18_EventScript_16821F" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route18_EastEntrance_1F/events.inc b/data/maps/Route18_EastEntrance_1F/events.inc deleted file mode 100644 index 1e7e8795c..000000000 --- a/data/maps/Route18_EastEntrance_1F/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -Route18_EastEntrance_1F_EventObjects: - object_event 1, 60, 0, 6, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route18_EastEntrance_1F_EventScript_170391, 0, 0, 0 - -Route18_EastEntrance_1F_MapWarps: - warp_def 1, 6, 3, 0, 804 - warp_def 11, 6, 3, 1, 804 - warp_def 9, 10, 3, 0, 6657 - -Route18_EastEntrance_1F_MapCoordEvents: - coord_event 2, 6, 3, 0, 16478, 0, 0, Route18_EastEntrance_1F_EventScript_1A77C1 - coord_event 6, 4, 3, 0, 16385, 0, 0, Route18_EastEntrance_1F_EventScript_17039A - coord_event 6, 5, 3, 0, 16385, 0, 0, Route18_EastEntrance_1F_EventScript_1703A6 - coord_event 6, 6, 3, 0, 16385, 0, 0, Route18_EastEntrance_1F_EventScript_1703B2 - coord_event 6, 7, 3, 0, 16385, 0, 0, Route18_EastEntrance_1F_EventScript_1703BE - coord_event 6, 8, 3, 0, 16385, 0, 0, Route18_EastEntrance_1F_EventScript_1703CA - coord_event 10, 6, 3, 0, 16478, 1, 0, Route18_EastEntrance_1F_EventScript_1A77B6 - coord_event 11, 5, 3, 0, 16478, 1, 0, Route18_EastEntrance_1F_EventScript_1A77B6 - coord_event 11, 7, 3, 0, 16478, 1, 0, Route18_EastEntrance_1F_EventScript_1A77B6 - coord_event 1, 5, 3, 0, 16478, 0, 0, Route18_EastEntrance_1F_EventScript_1A77C1 - coord_event 1, 7, 3, 0, 16478, 0, 0, Route18_EastEntrance_1F_EventScript_1A77C1 - -Route18_EastEntrance_1F_MapEvents:: - map_events Route18_EastEntrance_1F_EventObjects, Route18_EastEntrance_1F_MapWarps, Route18_EastEntrance_1F_MapCoordEvents, 0x0 diff --git a/data/maps/Route18_EastEntrance_1F/header.inc b/data/maps/Route18_EastEntrance_1F/header.inc deleted file mode 100644 index 87cf71cf7..000000000 --- a/data/maps/Route18_EastEntrance_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route18_EastEntrance_1F:: @ 8351A00 - .4byte Entrance_1F_Layout @ 0x8320E70 - .4byte Route18_EastEntrance_1F_MapEvents @ 0x83BDED0 - .4byte Route18_EastEntrance_1F_MapScripts @ 0x8170378 - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 224 - .byte 0x76, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00 diff --git a/data/maps/Route18_EastEntrance_1F/map.json b/data/maps/Route18_EastEntrance_1F/map.json new file mode 100644 index 000000000..6e85ecee0 --- /dev/null +++ b/data/maps/Route18_EastEntrance_1F/map.json @@ -0,0 +1,155 @@ +{ + "id": "MAP_ROUTE18_EAST_ENTRANCE_1F", + "name": "Route18_EastEntrance_1F", + "layout": "LAYOUT_ENTRANCE_1F", + "music": "BGM_FRLG_VIRIDIAN_CITY", + "region_map_section": "MAPSEC_ROUTE_18", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 1, + "unknown_19": 2, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "60", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route18_EastEntrance_1F_EventScript_170391", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 3, + "dest_map": "MAP_ROUTE18", + "dest_warp_id": 0 + }, + { + "x": 11, + "y": 6, + "elevation": 3, + "dest_map": "MAP_ROUTE18", + "dest_warp_id": 1 + }, + { + "x": 9, + "y": 10, + "elevation": 3, + "dest_map": "MAP_ROUTE18_EAST_ENTRANCE_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 2, + "y": 6, + "elevation": 3, + "var": "VAR_0x405E", + "var_value": 0, + "script": "Route18_EastEntrance_1F_EventScript_1A77C1" + }, + { + "type": "trigger", + "x": 6, + "y": 4, + "elevation": 3, + "var": "VAR_0x4001", + "var_value": 0, + "script": "Route18_EastEntrance_1F_EventScript_17039A" + }, + { + "type": "trigger", + "x": 6, + "y": 5, + "elevation": 3, + "var": "VAR_0x4001", + "var_value": 0, + "script": "Route18_EastEntrance_1F_EventScript_1703A6" + }, + { + "type": "trigger", + "x": 6, + "y": 6, + "elevation": 3, + "var": "VAR_0x4001", + "var_value": 0, + "script": "Route18_EastEntrance_1F_EventScript_1703B2" + }, + { + "type": "trigger", + "x": 6, + "y": 7, + "elevation": 3, + "var": "VAR_0x4001", + "var_value": 0, + "script": "Route18_EastEntrance_1F_EventScript_1703BE" + }, + { + "type": "trigger", + "x": 6, + "y": 8, + "elevation": 3, + "var": "VAR_0x4001", + "var_value": 0, + "script": "Route18_EastEntrance_1F_EventScript_1703CA" + }, + { + "type": "trigger", + "x": 10, + "y": 6, + "elevation": 3, + "var": "VAR_0x405E", + "var_value": 1, + "script": "Route18_EastEntrance_1F_EventScript_1A77B6" + }, + { + "type": "trigger", + "x": 11, + "y": 5, + "elevation": 3, + "var": "VAR_0x405E", + "var_value": 1, + "script": "Route18_EastEntrance_1F_EventScript_1A77B6" + }, + { + "type": "trigger", + "x": 11, + "y": 7, + "elevation": 3, + "var": "VAR_0x405E", + "var_value": 1, + "script": "Route18_EastEntrance_1F_EventScript_1A77B6" + }, + { + "type": "trigger", + "x": 1, + "y": 5, + "elevation": 3, + "var": "VAR_0x405E", + "var_value": 0, + "script": "Route18_EastEntrance_1F_EventScript_1A77C1" + }, + { + "type": "trigger", + "x": 1, + "y": 7, + "elevation": 3, + "var": "VAR_0x405E", + "var_value": 0, + "script": "Route18_EastEntrance_1F_EventScript_1A77C1" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route18_EastEntrance_2F/events.inc b/data/maps/Route18_EastEntrance_2F/events.inc deleted file mode 100644 index 4b156befa..000000000 --- a/data/maps/Route18_EastEntrance_2F/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -Route18_EastEntrance_2F_EventObjects: - object_event 1, 19, 0, 5, 0, 3, 0, 3, 9, 17, 0, 0, 0, 0, 0, Route18_EastEntrance_2F_EventScript_17047E, 0, 0, 0 - -Route18_EastEntrance_2F_MapWarps: - warp_def 10, 9, 3, 2, 6656 - -Route18_EastEntrance_2F_MapBGEvents: - bg_event 4, 1, 0, 0, 0, Route18_EastEntrance_2F_EventScript_17046C - bg_event 8, 1, 0, 0, 0, Route18_EastEntrance_2F_EventScript_170475 - -Route18_EastEntrance_2F_MapEvents:: - map_events Route18_EastEntrance_2F_EventObjects, Route18_EastEntrance_2F_MapWarps, 0x0, Route18_EastEntrance_2F_MapBGEvents diff --git a/data/maps/Route18_EastEntrance_2F/header.inc b/data/maps/Route18_EastEntrance_2F/header.inc deleted file mode 100644 index 56ed2a2a9..000000000 --- a/data/maps/Route18_EastEntrance_2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route18_EastEntrance_2F:: @ 8351A1C - .4byte Entrance_2F_Layout @ 0x8320804 - .4byte Route18_EastEntrance_2F_MapEvents @ 0x83BDF1C - .4byte Route18_EastEntrance_2F_MapScripts @ 0x817046B - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 220 - .byte 0x76, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/Route18_EastEntrance_2F/map.json b/data/maps/Route18_EastEntrance_2F/map.json new file mode 100644 index 000000000..e304e53f9 --- /dev/null +++ b/data/maps/Route18_EastEntrance_2F/map.json @@ -0,0 +1,56 @@ +{ + "id": "MAP_ROUTE18_EAST_ENTRANCE_2F", + "name": "Route18_EastEntrance_2F", + "layout": "LAYOUT_ENTRANCE_2F", + "music": "BGM_FRLG_VIRIDIAN_CITY", + "region_map_section": "MAPSEC_ROUTE_18", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "19", + "x": 5, + "y": 3, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route18_EastEntrance_2F_EventScript_17047E", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 10, + "y": 9, + "elevation": 3, + "dest_map": "MAP_ROUTE18_EAST_ENTRANCE_1F", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 4, + "y": 1, + "elevation": 0, + "script": "Route18_EastEntrance_2F_EventScript_17046C" + }, + { + "type": "bg_event_type_0", + "x": 8, + "y": 1, + "elevation": 0, + "script": "Route18_EastEntrance_2F_EventScript_170475" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route19/connections.inc b/data/maps/Route19/connections.inc deleted file mode 100644 index c93520d52..000000000 --- a/data/maps/Route19/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -Route19_MapConnectionsList: @ 8352C28 - connection up, -12, MAP_FUCHSIA_CITY - connection left, 40, MAP_ROUTE20 - -Route19_MapConnections:: @ 8352C40 - .4byte 2 - .4byte Route19_MapConnectionsList diff --git a/data/maps/Route19/events.inc b/data/maps/Route19/events.inc deleted file mode 100644 index d1d6dcdeb..000000000 --- a/data/maps/Route19/events.inc +++ /dev/null @@ -1,19 +0,0 @@ -Route19_EventObjects: - object_event 1, 45, 0, 15, 0, 10, 0, 3, 9, 54, 0, 1, 0, 3, 0, Route19_EventScript_1AB44F, 0, 0, 0 - object_event 2, 45, 0, 10, 0, 9, 0, 3, 10, 17, 0, 1, 0, 3, 0, Route19_EventScript_1AB411, 0, 0, 0 - object_event 3, 43, 0, 12, 0, 17, 0, 1, 1, 17, 0, 1, 0, 3, 0, Route19_EventScript_1AB547, 0, 0, 0 - object_event 4, 43, 0, 18, 0, 33, 0, 1, 51, 53, 0, 1, 0, 1, 0, Route19_EventScript_1AB48D, 0, 0, 0 - object_event 5, 43, 0, 8, 0, 27, 0, 1, 2, 34, 0, 1, 0, 1, 0, Route19_EventScript_1AB4CB, 0, 0, 0 - object_event 6, 43, 0, 16, 0, 22, 0, 1, 14, 17, 0, 1, 0, 6, 0, Route19_EventScript_1AB509, 0, 0, 0 - object_event 7, 43, 0, 11, 0, 47, 0, 1, 1, 17, 0, 1, 0, 1, 0, Route19_EventScript_1AB585, 0, 0, 0 - object_event 8, 44, 0, 14, 0, 48, 0, 1, 1, 17, 0, 1, 0, 1, 0, Route19_EventScript_1AB601, 0, 0, 0 - object_event 9, 44, 0, 12, 0, 49, 0, 1, 1, 17, 0, 1, 0, 1, 0, Route19_EventScript_1AB63F, 0, 0, 0 - object_event 10, 44, 0, 9, 0, 48, 0, 1, 1, 17, 0, 1, 0, 1, 0, Route19_EventScript_1AB5C3, 0, 0, 0 - object_event 11, 44, 0, 8, 0, 41, 0, 1, 8, 17, 0, 1, 0, 1, 0, Route19_EventScript_1AB67D, 0, 0, 0 - object_event 12, 36, 0, 9, 0, 41, 0, 1, 8, 17, 0, 1, 0, 1, 0, Route19_EventScript_1AB6C3, 0, 0, 0 - -Route19_MapBGEvents: - bg_event 13, 12, 0, 0, 0, Route19_EventScript_168232 - -Route19_MapEvents:: - map_events Route19_EventObjects, 0x0, 0x0, Route19_MapBGEvents diff --git a/data/maps/Route19/header.inc b/data/maps/Route19/header.inc deleted file mode 100644 index a141f1f92..000000000 --- a/data/maps/Route19/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route19:: @ 8350A24 - .4byte Route19_Layout @ 0x82F42B4 - .4byte Route19_MapEvents @ 0x83B7BE4 - .4byte Route19_MapScripts @ 0x8168231 - .4byte Route19_MapConnections @ 0x8352C40 - .2byte BGM_FRLG_ROUTE_3 - .2byte 107 - .byte 0x77, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/Route19/map.json b/data/maps/Route19/map.json new file mode 100644 index 000000000..055c49371 --- /dev/null +++ b/data/maps/Route19/map.json @@ -0,0 +1,195 @@ +{ + "id": "MAP_ROUTE19", + "name": "Route19", + "layout": "LAYOUT_ROUTE19", + "music": "BGM_FRLG_ROUTE_3", + "region_map_section": "MAPSEC_ROUTE_19", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_FUCHSIA_CITY", + "offset": -12, + "direction": "up" + }, + { + "map": "MAP_ROUTE20", + "offset": 40, + "direction": "left" + } + ], + "object_events": [ + { + "graphics_id": "45", + "x": 15, + "y": 10, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 6, + "movement_range_y": 3, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route19_EventScript_1AB44F", + "flag": "0" + }, + { + "graphics_id": "45", + "x": 10, + "y": 9, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route19_EventScript_1AB411", + "flag": "0" + }, + { + "graphics_id": "43", + "x": 12, + "y": 17, + "elevation": 1, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route19_EventScript_1AB547", + "flag": "0" + }, + { + "graphics_id": "43", + "x": 18, + "y": 33, + "elevation": 1, + "movement_type": "51", + "movement_range_x": 5, + "movement_range_y": 3, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route19_EventScript_1AB48D", + "flag": "0" + }, + { + "graphics_id": "43", + "x": 8, + "y": 27, + "elevation": 1, + "movement_type": "2", + "movement_range_x": 2, + "movement_range_y": 2, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route19_EventScript_1AB4CB", + "flag": "0" + }, + { + "graphics_id": "43", + "x": 16, + "y": 22, + "elevation": 1, + "movement_type": "14", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "Route19_EventScript_1AB509", + "flag": "0" + }, + { + "graphics_id": "43", + "x": 11, + "y": 47, + "elevation": 1, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route19_EventScript_1AB585", + "flag": "0" + }, + { + "graphics_id": "44", + "x": 14, + "y": 48, + "elevation": 1, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route19_EventScript_1AB601", + "flag": "0" + }, + { + "graphics_id": "44", + "x": 12, + "y": 49, + "elevation": 1, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route19_EventScript_1AB63F", + "flag": "0" + }, + { + "graphics_id": "44", + "x": 9, + "y": 48, + "elevation": 1, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route19_EventScript_1AB5C3", + "flag": "0" + }, + { + "graphics_id": "44", + "x": 8, + "y": 41, + "elevation": 1, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route19_EventScript_1AB67D", + "flag": "0" + }, + { + "graphics_id": "36", + "x": 9, + "y": 41, + "elevation": 1, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route19_EventScript_1AB6C3", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 13, + "y": 12, + "elevation": 0, + "script": "Route19_EventScript_168232" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route2/connections.inc b/data/maps/Route2/connections.inc deleted file mode 100644 index d37b77d96..000000000 --- a/data/maps/Route2/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -Route2_MapConnectionsList: @ 83529FC - connection up, -12, MAP_PEWTER_CITY - connection down, -12, MAP_VIRIDIAN_CITY - -Route2_MapConnections:: @ 8352A14 - .4byte 2 - .4byte Route2_MapConnectionsList diff --git a/data/maps/Route2/events.inc b/data/maps/Route2/events.inc deleted file mode 100644 index 316893612..000000000 --- a/data/maps/Route2/events.inc +++ /dev/null @@ -1,27 +0,0 @@ -Route2_EventObjects: - object_event 1, 95, 0, 16, 0, 62, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route2_EventScript_1BDF13, 20, 0, 0 - object_event 2, 95, 0, 15, 0, 69, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route2_EventScript_1BDF13, 19, 0, 0 - object_event 3, 95, 0, 11, 0, 13, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route2_EventScript_1BDF13, 21, 0, 0 - object_event 4, 95, 0, 18, 0, 26, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route2_EventScript_1BDF13, 22, 0, 0 - object_event 5, 92, 0, 17, 0, 54, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route2_EventScript_1BE58E, 340, 0, 0 - object_event 6, 92, 0, 17, 0, 64, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route2_EventScript_1BE59B, 341, 0, 0 - object_event 7, 65375, 0, 6, 0, 85, 0, 8, 0, 0, 0, 1, 0, 3, 0, 0x0, 0, 0, 0 - -Route2_MapWarps: - warp_def 5, 13, 3, 3, 3843 - warp_def 6, 13, 3, 3, 3843 - warp_def 5, 51, 3, 1, 3840 - warp_def 17, 11, 3, 1, 292 - warp_def 17, 22, 0, 1, 3841 - warp_def 18, 46, 3, 1, 3842 - warp_def 18, 41, 3, 3, 3842 - warp_def 19, 41, 3, 3, 3842 - warp_def 19, 46, 3, 1, 3842 - warp_def 6, 51, 3, 1, 3840 - -Route2_MapBGEvents: - bg_event 14, 12, 0, 0, 0, Route2_EventScript_167F6E - bg_event 7, 73, 0, 0, 0, Route2_EventScript_167F65 - -Route2_MapEvents:: - map_events Route2_EventObjects, Route2_MapWarps, 0x0, Route2_MapBGEvents diff --git a/data/maps/Route2/header.inc b/data/maps/Route2/header.inc deleted file mode 100644 index 985fe6d72..000000000 --- a/data/maps/Route2/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route2:: @ 8350848 - .4byte Route2_Layout @ 0x82E64F0 - .4byte Route2_MapEvents @ 0x83B676C - .4byte Route2_MapScripts @ 0x8167F64 - .4byte Route2_MapConnections @ 0x8352A14 - .2byte BGM_FRLG_ROUTE_1 - .2byte 90 - .byte 0x66, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/Route2/map.json b/data/maps/Route2/map.json new file mode 100644 index 000000000..a8fde02a1 --- /dev/null +++ b/data/maps/Route2/map.json @@ -0,0 +1,208 @@ +{ + "id": "MAP_ROUTE2", + "name": "Route2", + "layout": "LAYOUT_ROUTE2", + "music": "BGM_FRLG_ROUTE_1", + "region_map_section": "MAPSEC_ROUTE_2", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_PEWTER_CITY", + "offset": -12, + "direction": "up" + }, + { + "map": "MAP_VIRIDIAN_CITY", + "offset": -12, + "direction": "down" + } + ], + "object_events": [ + { + "graphics_id": "95", + "x": 16, + "y": 62, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route2_EventScript_1BDF13", + "flag": "20" + }, + { + "graphics_id": "95", + "x": 15, + "y": 69, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route2_EventScript_1BDF13", + "flag": "19" + }, + { + "graphics_id": "95", + "x": 11, + "y": 13, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route2_EventScript_1BDF13", + "flag": "21" + }, + { + "graphics_id": "95", + "x": 18, + "y": 26, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route2_EventScript_1BDF13", + "flag": "22" + }, + { + "graphics_id": "92", + "x": 17, + "y": 54, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route2_EventScript_1BE58E", + "flag": "340" + }, + { + "graphics_id": "92", + "x": 17, + "y": 64, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route2_EventScript_1BE59B", + "flag": "341" + }, + { + "graphics_id": "65375", + "x": 6, + "y": 85, + "elevation": 8, + "movement_type": "0", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 5, + "y": 13, + "elevation": 3, + "dest_map": "MAP_ROUTE2_VIRIDIAN_FOREST_NORTH_ENTRANCE", + "dest_warp_id": 3 + }, + { + "x": 6, + "y": 13, + "elevation": 3, + "dest_map": "MAP_ROUTE2_VIRIDIAN_FOREST_NORTH_ENTRANCE", + "dest_warp_id": 3 + }, + { + "x": 5, + "y": 51, + "elevation": 3, + "dest_map": "MAP_ROUTE2_VIRIDIAN_FOREST_SOUTH_ENTRANCE", + "dest_warp_id": 1 + }, + { + "x": 17, + "y": 11, + "elevation": 3, + "dest_map": "MAP_DIGLETTS_CAVE_NORTH_ENTRANCE", + "dest_warp_id": 1 + }, + { + "x": 17, + "y": 22, + "elevation": 0, + "dest_map": "MAP_ROUTE2_HOUSE", + "dest_warp_id": 1 + }, + { + "x": 18, + "y": 46, + "elevation": 3, + "dest_map": "MAP_ROUTE2_EAST_BUILDING", + "dest_warp_id": 1 + }, + { + "x": 18, + "y": 41, + "elevation": 3, + "dest_map": "MAP_ROUTE2_EAST_BUILDING", + "dest_warp_id": 3 + }, + { + "x": 19, + "y": 41, + "elevation": 3, + "dest_map": "MAP_ROUTE2_EAST_BUILDING", + "dest_warp_id": 3 + }, + { + "x": 19, + "y": 46, + "elevation": 3, + "dest_map": "MAP_ROUTE2_EAST_BUILDING", + "dest_warp_id": 1 + }, + { + "x": 6, + "y": 51, + "elevation": 3, + "dest_map": "MAP_ROUTE2_VIRIDIAN_FOREST_SOUTH_ENTRANCE", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 14, + "y": 12, + "elevation": 0, + "script": "Route2_EventScript_167F6E" + }, + { + "type": "bg_event_type_0", + "x": 7, + "y": 73, + "elevation": 0, + "script": "Route2_EventScript_167F65" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route20/connections.inc b/data/maps/Route20/connections.inc deleted file mode 100644 index 36d679ff9..000000000 --- a/data/maps/Route20/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -Route20_MapConnectionsList: @ 8352C48 - connection left, 0, MAP_CINNABAR_ISLAND - connection right, -40, MAP_ROUTE19 - -Route20_MapConnections:: @ 8352C60 - .4byte 2 - .4byte Route20_MapConnectionsList diff --git a/data/maps/Route20/events.inc b/data/maps/Route20/events.inc deleted file mode 100644 index 468c7d951..000000000 --- a/data/maps/Route20/events.inc +++ /dev/null @@ -1,24 +0,0 @@ -Route20_EventObjects: - object_event 1, 44, 0, 8, 0, 11, 0, 1, 13, 17, 0, 1, 0, 3, 0, Route20_EventScript_1AB83F, 0, 0, 0 - object_event 2, 40, 0, 16, 0, 14, 0, 3, 8, 17, 0, 1, 0, 1, 0, Route20_EventScript_1AB8F9, 0, 0, 0 - object_event 3, 44, 0, 34, 0, 7, 0, 1, 8, 17, 0, 1, 0, 4, 0, Route20_EventScript_1AB801, 0, 0, 0 - object_event 4, 26, 0, 43, 0, 9, 0, 3, 2, 17, 0, 1, 0, 1, 0, Route20_EventScript_1AB8BB, 0, 0, 0 - object_event 5, 43, 0, 23, 0, 10, 0, 1, 52, 69, 0, 1, 0, 1, 0, Route20_EventScript_1AB747, 0, 0, 0 - object_event 6, 40, 0, 73, 0, 16, 0, 3, 9, 17, 0, 1, 0, 2, 0, Route20_EventScript_1AB937, 0, 0, 0 - object_event 7, 43, 0, 111, 0, 9, 0, 1, 45, 53, 0, 1, 0, 1, 0, Route20_EventScript_1AB709, 0, 0, 0 - object_event 8, 43, 0, 106, 0, 11, 0, 1, 50, 53, 0, 1, 0, 1, 0, Route20_EventScript_1AB785, 0, 0, 0 - object_event 9, 44, 0, 93, 0, 10, 0, 1, 1, 17, 0, 1, 0, 5, 0, Route20_EventScript_1AB87D, 0, 0, 0 - object_event 10, 44, 0, 54, 0, 11, 0, 1, 1, 17, 0, 1, 0, 1, 0, Route20_EventScript_1AB7C3, 0, 0, 0 - object_event 11, 39, 0, 69, 0, 3, 0, 3, 5, 18, 0, 0, 0, 0, 0, Route20_EventScript_1ACE36, 0, 0, 0 - -Route20_MapWarps: - warp_def 60, 8, 3, 3, 339 - warp_def 72, 14, 3, 4, 339 - -Route20_MapBGEvents: - bg_event 68, 14, 0, 0, 0, Route20_EventScript_168280 - bg_event 64, 8, 0, 0, 0, Route20_EventScript_168280 - bg_event 23, 6, 3, 7, 0, 108, 153, 1 - -Route20_MapEvents:: - map_events Route20_EventObjects, Route20_MapWarps, 0x0, Route20_MapBGEvents diff --git a/data/maps/Route20/header.inc b/data/maps/Route20/header.inc deleted file mode 100644 index 1b832f0cd..000000000 --- a/data/maps/Route20/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route20:: @ 8350A40 - .4byte Route20_Layout @ 0x82F5598 - .4byte Route20_MapEvents @ 0x83B7D34 - .4byte Route20_MapScripts @ 0x816823B - .4byte Route20_MapConnections @ 0x8352C60 - .2byte BGM_FRLG_ROUTE_3 - .2byte 108 - .byte 0x78, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/Route20/map.json b/data/maps/Route20/map.json new file mode 100644 index 000000000..80213fc07 --- /dev/null +++ b/data/maps/Route20/map.json @@ -0,0 +1,213 @@ +{ + "id": "MAP_ROUTE20", + "name": "Route20", + "layout": "LAYOUT_ROUTE20", + "music": "BGM_FRLG_ROUTE_3", + "region_map_section": "MAPSEC_ROUTE_20", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_CINNABAR_ISLAND", + "offset": 0, + "direction": "left" + }, + { + "map": "MAP_ROUTE19", + "offset": -40, + "direction": "right" + } + ], + "object_events": [ + { + "graphics_id": "44", + "x": 8, + "y": 11, + "elevation": 1, + "movement_type": "13", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route20_EventScript_1AB83F", + "flag": "0" + }, + { + "graphics_id": "40", + "x": 16, + "y": 14, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route20_EventScript_1AB8F9", + "flag": "0" + }, + { + "graphics_id": "44", + "x": 34, + "y": 7, + "elevation": 1, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route20_EventScript_1AB801", + "flag": "0" + }, + { + "graphics_id": "26", + "x": 43, + "y": 9, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route20_EventScript_1AB8BB", + "flag": "0" + }, + { + "graphics_id": "43", + "x": 23, + "y": 10, + "elevation": 1, + "movement_type": "52", + "movement_range_x": 5, + "movement_range_y": 4, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route20_EventScript_1AB747", + "flag": "0" + }, + { + "graphics_id": "40", + "x": 73, + "y": 16, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route20_EventScript_1AB937", + "flag": "0" + }, + { + "graphics_id": "43", + "x": 111, + "y": 9, + "elevation": 1, + "movement_type": "45", + "movement_range_x": 5, + "movement_range_y": 3, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route20_EventScript_1AB709", + "flag": "0" + }, + { + "graphics_id": "43", + "x": 106, + "y": 11, + "elevation": 1, + "movement_type": "50", + "movement_range_x": 5, + "movement_range_y": 3, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route20_EventScript_1AB785", + "flag": "0" + }, + { + "graphics_id": "44", + "x": 93, + "y": 10, + "elevation": 1, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route20_EventScript_1AB87D", + "flag": "0" + }, + { + "graphics_id": "44", + "x": 54, + "y": 11, + "elevation": 1, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route20_EventScript_1AB7C3", + "flag": "0" + }, + { + "graphics_id": "39", + "x": 69, + "y": 3, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route20_EventScript_1ACE36", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 60, + "y": 8, + "elevation": 3, + "dest_map": "MAP_SEAFOAM_ISLANDS_1F", + "dest_warp_id": 3 + }, + { + "x": 72, + "y": 14, + "elevation": 3, + "dest_map": "MAP_SEAFOAM_ISLANDS_1F", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 68, + "y": 14, + "elevation": 0, + "script": "Route20_EventScript_168280" + }, + { + "type": "bg_event_type_0", + "x": 64, + "y": 8, + "elevation": 0, + "script": "Route20_EventScript_168280" + }, + { + "type": "hidden_item", + "x": 23, + "y": 6, + "elevation": 3, + "item": "ITEM_STARDUST", + "flag": "153", + "unknown": 1 + } + ] +} \ No newline at end of file diff --git a/data/maps/Route21_North/connections.inc b/data/maps/Route21_North/connections.inc deleted file mode 100644 index b272c4b9a..000000000 --- a/data/maps/Route21_North/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -Route21_North_MapConnectionsList: @ 8352C68 - connection up, 0, MAP_PALLET_TOWN - connection down, 0, MAP_ROUTE21_SOUTH - -Route21_North_MapConnections:: @ 8352C80 - .4byte 2 - .4byte Route21_North_MapConnectionsList diff --git a/data/maps/Route21_North/events.inc b/data/maps/Route21_North/events.inc deleted file mode 100644 index b4ab54566..000000000 --- a/data/maps/Route21_North/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -Route21_North_EventObjects: - object_event 1, 57, 0, 7, 0, 27, 0, 3, 7, 17, 0, 1, 0, 0, 0, Route21_North_EventScript_1AB975, 0, 0, 0 - object_event 2, 57, 0, 16, 0, 26, 0, 3, 8, 17, 0, 1, 0, 0, 0, Route21_North_EventScript_1AB9F1, 0, 0, 0 - object_event 3, 43, 0, 12, 0, 44, 0, 1, 51, 36, 0, 1, 0, 1, 0, Route21_North_EventScript_1ABA6D, 0, 0, 0 - object_event 4, 44, 0, 14, 0, 35, 0, 1, 8, 17, 0, 1, 0, 1, 0, Route21_North_EventScript_1ABB65, 0, 0, 0 - object_event 5, 36, 0, 15, 0, 35, 0, 1, 8, 17, 0, 1, 0, 1, 0, Route21_North_EventScript_1ABBAB, 0, 0, 0 - object_event 6, 65307, 0, 13, 0, 253, 255, 2, 0, 0, 0, 0, 0, 3, 0, 0x0, 0, 0, 0 - -Route21_North_MapBGEvents: - bg_event 17, 42, 3, 7, 0, 106, 154, 1 - -Route21_North_MapEvents:: - map_events Route21_North_EventObjects, 0x0, 0x0, Route21_North_MapBGEvents diff --git a/data/maps/Route21_North/header.inc b/data/maps/Route21_North/header.inc deleted file mode 100644 index cf0397e8a..000000000 --- a/data/maps/Route21_North/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route21_North:: @ 8350A5C - .4byte Route21_North_Layout @ 0x82F5F1C - .4byte Route21_North_MapEvents @ 0x83B7DE4 - .4byte Route21_North_MapScripts @ 0x8168289 - .4byte Route21_North_MapConnections @ 0x8352C80 - .2byte BGM_FRLG_ROUTE_3 - .2byte 109 - .byte 0x79, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/Route21_North/map.json b/data/maps/Route21_North/map.json new file mode 100644 index 000000000..42b87c9bc --- /dev/null +++ b/data/maps/Route21_North/map.json @@ -0,0 +1,119 @@ +{ + "id": "MAP_ROUTE21_NORTH", + "name": "Route21_North", + "layout": "LAYOUT_ROUTE21_NORTH", + "music": "BGM_FRLG_ROUTE_3", + "region_map_section": "MAPSEC_ROUTE_21", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_PALLET_TOWN", + "offset": 0, + "direction": "up" + }, + { + "map": "MAP_ROUTE21_SOUTH", + "offset": 0, + "direction": "down" + } + ], + "object_events": [ + { + "graphics_id": "57", + "x": 7, + "y": 27, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route21_North_EventScript_1AB975", + "flag": "0" + }, + { + "graphics_id": "57", + "x": 16, + "y": 26, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route21_North_EventScript_1AB9F1", + "flag": "0" + }, + { + "graphics_id": "43", + "x": 12, + "y": 44, + "elevation": 1, + "movement_type": "51", + "movement_range_x": 4, + "movement_range_y": 2, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route21_North_EventScript_1ABA6D", + "flag": "0" + }, + { + "graphics_id": "44", + "x": 14, + "y": 35, + "elevation": 1, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route21_North_EventScript_1ABB65", + "flag": "0" + }, + { + "graphics_id": "36", + "x": 15, + "y": 35, + "elevation": 1, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route21_North_EventScript_1ABBAB", + "flag": "0" + }, + { + "graphics_id": "65307", + "x": 13, + "y": 65533, + "elevation": 2, + "movement_type": "0", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 3, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 17, + "y": 42, + "elevation": 3, + "item": "ITEM_PEARL", + "flag": "154", + "unknown": 1 + } + ] +} \ No newline at end of file diff --git a/data/maps/Route21_South/connections.inc b/data/maps/Route21_South/connections.inc deleted file mode 100644 index 13204e356..000000000 --- a/data/maps/Route21_South/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -Route21_South_MapConnectionsList: @ 8352C88 - connection up, 0, MAP_ROUTE21_NORTH - connection down, 0, MAP_CINNABAR_ISLAND - -Route21_South_MapConnections:: @ 8352CA0 - .4byte 2 - .4byte Route21_South_MapConnectionsList diff --git a/data/maps/Route21_South/events.inc b/data/maps/Route21_South/events.inc deleted file mode 100644 index 558743026..000000000 --- a/data/maps/Route21_South/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -Route21_South_EventObjects: - object_event 1, 57, 0, 11, 0, 8, 0, 3, 10, 17, 0, 1, 0, 0, 0, Route21_South_EventScript_1AB9B3, 0, 0, 0 - object_event 2, 57, 0, 14, 0, 15, 0, 3, 9, 17, 0, 1, 0, 0, 0, Route21_South_EventScript_1ABA2F, 0, 0, 0 - object_event 3, 43, 0, 15, 0, 24, 0, 1, 14, 17, 0, 1, 0, 3, 0, Route21_South_EventScript_1ABAAB, 0, 0, 0 - object_event 4, 43, 0, 15, 0, 38, 0, 1, 9, 17, 0, 1, 0, 3, 0, Route21_South_EventScript_1ABAE9, 0, 0, 0 - object_event 5, 43, 0, 10, 0, 29, 0, 1, 2, 34, 0, 1, 0, 4, 0, Route21_South_EventScript_1ABB27, 0, 0, 0 - -Route21_South_MapEvents:: - map_events Route21_South_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/Route21_South/header.inc b/data/maps/Route21_South/header.inc deleted file mode 100644 index b81f0ec6a..000000000 --- a/data/maps/Route21_South/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route21_South:: @ 8350A78 - .4byte Route21_South_Layout @ 0x83206C0 - .4byte Route21_South_MapEvents @ 0x83B7E70 - .4byte Route21_South_MapScripts @ 0x816828A - .4byte Route21_South_MapConnections @ 0x8352CA0 - .2byte BGM_FRLG_ROUTE_3 - .2byte 219 - .byte 0x79, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/Route21_South/map.json b/data/maps/Route21_South/map.json new file mode 100644 index 000000000..125dc88fc --- /dev/null +++ b/data/maps/Route21_South/map.json @@ -0,0 +1,96 @@ +{ + "id": "MAP_ROUTE21_SOUTH", + "name": "Route21_South", + "layout": "LAYOUT_ROUTE21_SOUTH", + "music": "BGM_FRLG_ROUTE_3", + "region_map_section": "MAPSEC_ROUTE_21", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_ROUTE21_NORTH", + "offset": 0, + "direction": "up" + }, + { + "map": "MAP_CINNABAR_ISLAND", + "offset": 0, + "direction": "down" + } + ], + "object_events": [ + { + "graphics_id": "57", + "x": 11, + "y": 8, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route21_South_EventScript_1AB9B3", + "flag": "0" + }, + { + "graphics_id": "57", + "x": 14, + "y": 15, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route21_South_EventScript_1ABA2F", + "flag": "0" + }, + { + "graphics_id": "43", + "x": 15, + "y": 24, + "elevation": 1, + "movement_type": "14", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route21_South_EventScript_1ABAAB", + "flag": "0" + }, + { + "graphics_id": "43", + "x": 15, + "y": 38, + "elevation": 1, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route21_South_EventScript_1ABAE9", + "flag": "0" + }, + { + "graphics_id": "43", + "x": 10, + "y": 29, + "elevation": 1, + "movement_type": "2", + "movement_range_x": 2, + "movement_range_y": 2, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route21_South_EventScript_1ABB27", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route22/connections.inc b/data/maps/Route22/connections.inc deleted file mode 100644 index f9c5a939b..000000000 --- a/data/maps/Route22/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -Route22_MapConnectionsList: @ 8352CA8 - connection up, 0, MAP_ROUTE23 - connection right, -10, MAP_VIRIDIAN_CITY - -Route22_MapConnections:: @ 8352CC0 - .4byte 2 - .4byte Route22_MapConnectionsList diff --git a/data/maps/Route22/events.inc b/data/maps/Route22/events.inc deleted file mode 100644 index 76c259321..000000000 --- a/data/maps/Route22/events.inc +++ /dev/null @@ -1,20 +0,0 @@ -Route22_EventObjects: - object_event 1, 72, 0, 25, 0, 4, 0, 3, 10, 17, 0, 0, 0, 0, 0, 0x0, 79, 0, 0 - -Route22_MapWarps: - warp_def 8, 5, 0, 2, 7168 - warp_def 9, 5, 0, 2, 7168 - -Route22_MapCoordEvents: - coord_event 33, 4, 3, 0, 16468, 1, 0, Route22_EventScript_16828C - coord_event 33, 5, 3, 0, 16468, 1, 0, Route22_EventScript_168298 - coord_event 33, 6, 0, 0, 16468, 1, 0, Route22_EventScript_1682AB - coord_event 33, 4, 3, 0, 16468, 3, 0, Route22_EventScript_1683ED - coord_event 33, 5, 3, 0, 16468, 3, 0, Route22_EventScript_1683F9 - coord_event 33, 6, 0, 0, 16468, 3, 0, Route22_EventScript_16840C - -Route22_MapBGEvents: - bg_event 7, 12, 0, 0, 0, Route22_EventScript_1684E2 - -Route22_MapEvents:: - map_events Route22_EventObjects, Route22_MapWarps, Route22_MapCoordEvents, Route22_MapBGEvents diff --git a/data/maps/Route22/header.inc b/data/maps/Route22/header.inc deleted file mode 100644 index 70942583f..000000000 --- a/data/maps/Route22/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route22:: @ 8350A94 - .4byte Route22_Layout @ 0x82F6840 - .4byte Route22_MapEvents @ 0x83B7F18 - .4byte Route22_MapScripts @ 0x816828B - .4byte Route22_MapConnections @ 0x8352CC0 - .2byte BGM_FRLG_ROUTE_3 - .2byte 110 - .byte 0x7a, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/Route22/map.json b/data/maps/Route22/map.json new file mode 100644 index 000000000..2acb37549 --- /dev/null +++ b/data/maps/Route22/map.json @@ -0,0 +1,122 @@ +{ + "id": "MAP_ROUTE22", + "name": "Route22", + "layout": "LAYOUT_ROUTE22", + "music": "BGM_FRLG_ROUTE_3", + "region_map_section": "MAPSEC_ROUTE_22", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_ROUTE23", + "offset": 0, + "direction": "up" + }, + { + "map": "MAP_VIRIDIAN_CITY", + "offset": -10, + "direction": "right" + } + ], + "object_events": [ + { + "graphics_id": "72", + "x": 25, + "y": 4, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "79" + } + ], + "warp_events": [ + { + "x": 8, + "y": 5, + "elevation": 0, + "dest_map": "MAP_ROUTE22_NORTH_ENTRANCE", + "dest_warp_id": 2 + }, + { + "x": 9, + "y": 5, + "elevation": 0, + "dest_map": "MAP_ROUTE22_NORTH_ENTRANCE", + "dest_warp_id": 2 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 33, + "y": 4, + "elevation": 3, + "var": "VAR_0x4054", + "var_value": 1, + "script": "Route22_EventScript_16828C" + }, + { + "type": "trigger", + "x": 33, + "y": 5, + "elevation": 3, + "var": "VAR_0x4054", + "var_value": 1, + "script": "Route22_EventScript_168298" + }, + { + "type": "trigger", + "x": 33, + "y": 6, + "elevation": 0, + "var": "VAR_0x4054", + "var_value": 1, + "script": "Route22_EventScript_1682AB" + }, + { + "type": "trigger", + "x": 33, + "y": 4, + "elevation": 3, + "var": "VAR_0x4054", + "var_value": 3, + "script": "Route22_EventScript_1683ED" + }, + { + "type": "trigger", + "x": 33, + "y": 5, + "elevation": 3, + "var": "VAR_0x4054", + "var_value": 3, + "script": "Route22_EventScript_1683F9" + }, + { + "type": "trigger", + "x": 33, + "y": 6, + "elevation": 0, + "var": "VAR_0x4054", + "var_value": 3, + "script": "Route22_EventScript_16840C" + } + ], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 7, + "y": 12, + "elevation": 0, + "script": "Route22_EventScript_1684E2" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route22_NorthEntrance/events.inc b/data/maps/Route22_NorthEntrance/events.inc deleted file mode 100644 index 1e37f8e7c..000000000 --- a/data/maps/Route22_NorthEntrance/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -Route22_NorthEntrance_EventObjects: - object_event 1, 60, 0, 8, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route22_NorthEntrance_EventScript_1704FC, 0, 0, 0 - -Route22_NorthEntrance_MapWarps: - warp_def 7, 1, 3, 2, 810 - warp_def 6, 10, 3, 0, 809 - warp_def 7, 10, 3, 0, 809 - warp_def 8, 10, 3, 0, 809 - -Route22_NorthEntrance_MapCoordEvents: - coord_event 7, 2, 3, 0, 16479, 0, 0, Route22_NorthEntrance_EventScript_17050D - -Route22_NorthEntrance_MapEvents:: - map_events Route22_NorthEntrance_EventObjects, Route22_NorthEntrance_MapWarps, Route22_NorthEntrance_MapCoordEvents, 0x0 diff --git a/data/maps/Route22_NorthEntrance/header.inc b/data/maps/Route22_NorthEntrance/header.inc deleted file mode 100644 index 3f7b86142..000000000 --- a/data/maps/Route22_NorthEntrance/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route22_NorthEntrance:: @ 8351A54 - .4byte Route22_NorthEntrance_Layout @ 0x8320B1C - .4byte Route22_NorthEntrance_MapEvents @ 0x83BDF8C - .4byte Route22_NorthEntrance_MapScripts @ 0x81704FB - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_FOREST - .2byte 222 - .byte 0x7a, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/Route22_NorthEntrance/map.json b/data/maps/Route22_NorthEntrance/map.json new file mode 100644 index 000000000..e68b94f7c --- /dev/null +++ b/data/maps/Route22_NorthEntrance/map.json @@ -0,0 +1,72 @@ +{ + "id": "MAP_ROUTE22_NORTH_ENTRANCE", + "name": "Route22_NorthEntrance", + "layout": "LAYOUT_ROUTE22_NORTH_ENTRANCE", + "music": "BGM_FRLG_VIRIDIAN_FOREST", + "region_map_section": "MAPSEC_ROUTE_22", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "60", + "x": 8, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route22_NorthEntrance_EventScript_1704FC", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 7, + "y": 1, + "elevation": 3, + "dest_map": "MAP_ROUTE23", + "dest_warp_id": 2 + }, + { + "x": 6, + "y": 10, + "elevation": 3, + "dest_map": "MAP_ROUTE22", + "dest_warp_id": 0 + }, + { + "x": 7, + "y": 10, + "elevation": 3, + "dest_map": "MAP_ROUTE22", + "dest_warp_id": 0 + }, + { + "x": 8, + "y": 10, + "elevation": 3, + "dest_map": "MAP_ROUTE22", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 7, + "y": 2, + "elevation": 3, + "var": "VAR_0x405F", + "var_value": 0, + "script": "Route22_NorthEntrance_EventScript_17050D" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route23/connections.inc b/data/maps/Route23/connections.inc deleted file mode 100644 index 9b052d1c7..000000000 --- a/data/maps/Route23/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -Route23_MapConnectionsList: @ 8352CC8 - connection up, 0, MAP_INDIGO_PLATEAU_EXTERIOR - connection down, 0, MAP_ROUTE22 - -Route23_MapConnections:: @ 8352CE0 - .4byte 2 - .4byte Route23_MapConnectionsList diff --git a/data/maps/Route23/events.inc b/data/maps/Route23/events.inc deleted file mode 100644 index 1ae156d8f..000000000 --- a/data/maps/Route23/events.inc +++ /dev/null @@ -1,72 +0,0 @@ -Route23_EventObjects: - object_event 1, 60, 0, 15, 0, 149, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route23_EventScript_16850C, 0, 0, 0 - object_event 2, 60, 0, 8, 0, 140, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route23_EventScript_16851D, 0, 0, 0 - object_event 3, 60, 0, 14, 0, 123, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route23_EventScript_16852E, 0, 0, 0 - object_event 4, 60, 0, 16, 0, 112, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route23_EventScript_16853F, 0, 0, 0 - object_event 5, 60, 0, 10, 0, 94, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route23_EventScript_168550, 0, 0, 0 - object_event 6, 60, 0, 14, 0, 61, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route23_EventScript_168561, 0, 0, 0 - object_event 7, 60, 0, 6, 0, 35, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route23_EventScript_168572, 0, 0, 0 - -Route23_MapWarps: - warp_def 5, 28, 3, 1, 295 - warp_def 18, 28, 3, 6, 296 - warp_def 8, 153, 3, 0, 7168 - warp_def 9, 154, 0, 0, 7168 - -Route23_MapCoordEvents: - coord_event 13, 149, 3, 0, 16479, 1, 0, Route23_EventScript_168583 - coord_event 7, 140, 3, 0, 16479, 2, 0, Route23_EventScript_168598 - coord_event 12, 123, 3, 0, 16479, 3, 0, Route23_EventScript_1685AD - coord_event 11, 111, 0, 0, 16479, 4, 0, Route23_EventScript_1685C2 - coord_event 9, 94, 1, 0, 16479, 5, 0, Route23_EventScript_1685D7 - coord_event 12, 61, 3, 0, 16479, 6, 0, Route23_EventScript_1685EC - coord_event 1, 35, 0, 0, 16479, 7, 0, Route23_EventScript_168601 - coord_event 1, 34, 0, 0, 16479, 7, 0, Route23_EventScript_168601 - coord_event 1, 32, 3, 0, 16479, 7, 0, Route23_EventScript_168601 - coord_event 1, 33, 0, 0, 16479, 7, 0, Route23_EventScript_168601 - coord_event 1, 31, 0, 0, 16479, 7, 0, Route23_EventScript_168601 - coord_event 1, 36, 0, 0, 16479, 7, 0, Route23_EventScript_168601 - coord_event 5, 35, 3, 0, 16479, 7, 0, Route23_EventScript_168601 - coord_event 4, 35, 3, 0, 16479, 7, 0, Route23_EventScript_168601 - coord_event 10, 60, 0, 0, 16479, 6, 0, Route23_EventScript_1685EC - coord_event 13, 61, 3, 0, 16479, 6, 0, Route23_EventScript_1685EC - coord_event 11, 60, 0, 0, 16479, 6, 0, Route23_EventScript_1685EC - coord_event 8, 94, 1, 0, 16479, 5, 0, Route23_EventScript_1685D7 - coord_event 5, 92, 1, 0, 16479, 5, 0, Route23_EventScript_1685D7 - coord_event 7, 94, 1, 0, 16479, 5, 0, Route23_EventScript_1685D7 - coord_event 4, 92, 1, 0, 16479, 5, 0, Route23_EventScript_1685D7 - coord_event 3, 92, 1, 0, 16479, 5, 0, Route23_EventScript_1685D7 - coord_event 2, 92, 1, 0, 16479, 5, 0, Route23_EventScript_1685D7 - coord_event 4, 139, 0, 0, 16479, 2, 0, Route23_EventScript_168598 - coord_event 5, 139, 0, 0, 16479, 2, 0, Route23_EventScript_168598 - coord_event 6, 140, 3, 0, 16479, 2, 0, Route23_EventScript_168598 - coord_event 10, 122, 0, 0, 16479, 3, 0, Route23_EventScript_1685AD - coord_event 11, 122, 0, 0, 16479, 3, 0, Route23_EventScript_1685AD - coord_event 13, 123, 3, 0, 16479, 3, 0, Route23_EventScript_1685AD - coord_event 8, 109, 1, 0, 16479, 4, 0, Route23_EventScript_1685C2 - coord_event 9, 109, 1, 0, 16479, 4, 0, Route23_EventScript_1685C2 - coord_event 10, 109, 1, 0, 16479, 4, 0, Route23_EventScript_1685C2 - coord_event 11, 109, 1, 0, 16479, 4, 0, Route23_EventScript_1685C2 - coord_event 12, 109, 1, 0, 16479, 4, 0, Route23_EventScript_1685C2 - coord_event 12, 111, 0, 0, 16479, 4, 0, Route23_EventScript_1685C2 - coord_event 14, 112, 1, 0, 16479, 4, 0, Route23_EventScript_1685C2 - coord_event 13, 112, 1, 0, 16479, 4, 0, Route23_EventScript_1685C2 - coord_event 15, 112, 1, 0, 16479, 4, 0, Route23_EventScript_1685C2 - coord_event 12, 148, 0, 0, 16479, 1, 0, Route23_EventScript_168583 - coord_event 11, 148, 0, 0, 16479, 1, 0, Route23_EventScript_168583 - coord_event 14, 149, 3, 0, 16479, 1, 0, Route23_EventScript_168583 - coord_event 10, 148, 0, 0, 16479, 1, 0, Route23_EventScript_168583 - -Route23_MapBGEvents: - bg_event 19, 42, 0, 7, 0, 19, 34, 1 - bg_event 20, 72, 0, 7, 0, 2, 35, 1 - bg_event 11, 101, 3, 7, 0, 35, 36, 1 - bg_event 3, 18, 3, 7, 0, 141, 145, 1 - bg_event 2, 29, 3, 7, 0, 142, 146, 1 - bg_event 10, 67, 3, 7, 0, 137, 147, 1 - bg_event 3, 128, 3, 7, 0, 138, 148, 1 - bg_event 9, 8, 3, 7, 0, 37, 155, 1 - bg_event 3, 31, 0, 0, 0, Route23_EventScript_168616 - -Route23_MapEvents:: - map_events Route23_EventObjects, Route23_MapWarps, Route23_MapCoordEvents, Route23_MapBGEvents diff --git a/data/maps/Route23/header.inc b/data/maps/Route23/header.inc deleted file mode 100644 index 2a6fa4b27..000000000 --- a/data/maps/Route23/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route23:: @ 8350AB0 - .4byte Route23_Layout @ 0x82F8664 - .4byte Route23_MapEvents @ 0x83B8300 - .4byte Route23_MapScripts @ 0x81684EB - .4byte Route23_MapConnections @ 0x8352CE0 - .2byte BGM_FRLG_INDIGO_PLATEAU - .2byte 111 - .byte 0x7b, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/Route23/map.json b/data/maps/Route23/map.json new file mode 100644 index 000000000..924371f26 --- /dev/null +++ b/data/maps/Route23/map.json @@ -0,0 +1,610 @@ +{ + "id": "MAP_ROUTE23", + "name": "Route23", + "layout": "LAYOUT_ROUTE23", + "music": "BGM_FRLG_INDIGO_PLATEAU", + "region_map_section": "MAPSEC_ROUTE_23", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_INDIGO_PLATEAU_EXTERIOR", + "offset": 0, + "direction": "up" + }, + { + "map": "MAP_ROUTE22", + "offset": 0, + "direction": "down" + } + ], + "object_events": [ + { + "graphics_id": "60", + "x": 15, + "y": 149, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route23_EventScript_16850C", + "flag": "0" + }, + { + "graphics_id": "60", + "x": 8, + "y": 140, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route23_EventScript_16851D", + "flag": "0" + }, + { + "graphics_id": "60", + "x": 14, + "y": 123, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route23_EventScript_16852E", + "flag": "0" + }, + { + "graphics_id": "60", + "x": 16, + "y": 112, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route23_EventScript_16853F", + "flag": "0" + }, + { + "graphics_id": "60", + "x": 10, + "y": 94, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route23_EventScript_168550", + "flag": "0" + }, + { + "graphics_id": "60", + "x": 14, + "y": 61, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route23_EventScript_168561", + "flag": "0" + }, + { + "graphics_id": "60", + "x": 6, + "y": 35, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route23_EventScript_168572", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 5, + "y": 28, + "elevation": 3, + "dest_map": "MAP_VICTORY_ROAD_1F", + "dest_warp_id": 1 + }, + { + "x": 18, + "y": 28, + "elevation": 3, + "dest_map": "MAP_VICTORY_ROAD_2F", + "dest_warp_id": 6 + }, + { + "x": 8, + "y": 153, + "elevation": 3, + "dest_map": "MAP_ROUTE22_NORTH_ENTRANCE", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 154, + "elevation": 0, + "dest_map": "MAP_ROUTE22_NORTH_ENTRANCE", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 13, + "y": 149, + "elevation": 3, + "var": "VAR_0x405F", + "var_value": 1, + "script": "Route23_EventScript_168583" + }, + { + "type": "trigger", + "x": 7, + "y": 140, + "elevation": 3, + "var": "VAR_0x405F", + "var_value": 2, + "script": "Route23_EventScript_168598" + }, + { + "type": "trigger", + "x": 12, + "y": 123, + "elevation": 3, + "var": "VAR_0x405F", + "var_value": 3, + "script": "Route23_EventScript_1685AD" + }, + { + "type": "trigger", + "x": 11, + "y": 111, + "elevation": 0, + "var": "VAR_0x405F", + "var_value": 4, + "script": "Route23_EventScript_1685C2" + }, + { + "type": "trigger", + "x": 9, + "y": 94, + "elevation": 1, + "var": "VAR_0x405F", + "var_value": 5, + "script": "Route23_EventScript_1685D7" + }, + { + "type": "trigger", + "x": 12, + "y": 61, + "elevation": 3, + "var": "VAR_0x405F", + "var_value": 6, + "script": "Route23_EventScript_1685EC" + }, + { + "type": "trigger", + "x": 1, + "y": 35, + "elevation": 0, + "var": "VAR_0x405F", + "var_value": 7, + "script": "Route23_EventScript_168601" + }, + { + "type": "trigger", + "x": 1, + "y": 34, + "elevation": 0, + "var": "VAR_0x405F", + "var_value": 7, + "script": "Route23_EventScript_168601" + }, + { + "type": "trigger", + "x": 1, + "y": 32, + "elevation": 3, + "var": "VAR_0x405F", + "var_value": 7, + "script": "Route23_EventScript_168601" + }, + { + "type": "trigger", + "x": 1, + "y": 33, + "elevation": 0, + "var": "VAR_0x405F", + "var_value": 7, + "script": "Route23_EventScript_168601" + }, + { + "type": "trigger", + "x": 1, + "y": 31, + "elevation": 0, + "var": "VAR_0x405F", + "var_value": 7, + "script": "Route23_EventScript_168601" + }, + { + "type": "trigger", + "x": 1, + "y": 36, + "elevation": 0, + "var": "VAR_0x405F", + "var_value": 7, + "script": "Route23_EventScript_168601" + }, + { + "type": "trigger", + "x": 5, + "y": 35, + "elevation": 3, + "var": "VAR_0x405F", + "var_value": 7, + "script": "Route23_EventScript_168601" + }, + { + "type": "trigger", + "x": 4, + "y": 35, + "elevation": 3, + "var": "VAR_0x405F", + "var_value": 7, + "script": "Route23_EventScript_168601" + }, + { + "type": "trigger", + "x": 10, + "y": 60, + "elevation": 0, + "var": "VAR_0x405F", + "var_value": 6, + "script": "Route23_EventScript_1685EC" + }, + { + "type": "trigger", + "x": 13, + "y": 61, + "elevation": 3, + "var": "VAR_0x405F", + "var_value": 6, + "script": "Route23_EventScript_1685EC" + }, + { + "type": "trigger", + "x": 11, + "y": 60, + "elevation": 0, + "var": "VAR_0x405F", + "var_value": 6, + "script": "Route23_EventScript_1685EC" + }, + { + "type": "trigger", + "x": 8, + "y": 94, + "elevation": 1, + "var": "VAR_0x405F", + "var_value": 5, + "script": "Route23_EventScript_1685D7" + }, + { + "type": "trigger", + "x": 5, + "y": 92, + "elevation": 1, + "var": "VAR_0x405F", + "var_value": 5, + "script": "Route23_EventScript_1685D7" + }, + { + "type": "trigger", + "x": 7, + "y": 94, + "elevation": 1, + "var": "VAR_0x405F", + "var_value": 5, + "script": "Route23_EventScript_1685D7" + }, + { + "type": "trigger", + "x": 4, + "y": 92, + "elevation": 1, + "var": "VAR_0x405F", + "var_value": 5, + "script": "Route23_EventScript_1685D7" + }, + { + "type": "trigger", + "x": 3, + "y": 92, + "elevation": 1, + "var": "VAR_0x405F", + "var_value": 5, + "script": "Route23_EventScript_1685D7" + }, + { + "type": "trigger", + "x": 2, + "y": 92, + "elevation": 1, + "var": "VAR_0x405F", + "var_value": 5, + "script": "Route23_EventScript_1685D7" + }, + { + "type": "trigger", + "x": 4, + "y": 139, + "elevation": 0, + "var": "VAR_0x405F", + "var_value": 2, + "script": "Route23_EventScript_168598" + }, + { + "type": "trigger", + "x": 5, + "y": 139, + "elevation": 0, + "var": "VAR_0x405F", + "var_value": 2, + "script": "Route23_EventScript_168598" + }, + { + "type": "trigger", + "x": 6, + "y": 140, + "elevation": 3, + "var": "VAR_0x405F", + "var_value": 2, + "script": "Route23_EventScript_168598" + }, + { + "type": "trigger", + "x": 10, + "y": 122, + "elevation": 0, + "var": "VAR_0x405F", + "var_value": 3, + "script": "Route23_EventScript_1685AD" + }, + { + "type": "trigger", + "x": 11, + "y": 122, + "elevation": 0, + "var": "VAR_0x405F", + "var_value": 3, + "script": "Route23_EventScript_1685AD" + }, + { + "type": "trigger", + "x": 13, + "y": 123, + "elevation": 3, + "var": "VAR_0x405F", + "var_value": 3, + "script": "Route23_EventScript_1685AD" + }, + { + "type": "trigger", + "x": 8, + "y": 109, + "elevation": 1, + "var": "VAR_0x405F", + "var_value": 4, + "script": "Route23_EventScript_1685C2" + }, + { + "type": "trigger", + "x": 9, + "y": 109, + "elevation": 1, + "var": "VAR_0x405F", + "var_value": 4, + "script": "Route23_EventScript_1685C2" + }, + { + "type": "trigger", + "x": 10, + "y": 109, + "elevation": 1, + "var": "VAR_0x405F", + "var_value": 4, + "script": "Route23_EventScript_1685C2" + }, + { + "type": "trigger", + "x": 11, + "y": 109, + "elevation": 1, + "var": "VAR_0x405F", + "var_value": 4, + "script": "Route23_EventScript_1685C2" + }, + { + "type": "trigger", + "x": 12, + "y": 109, + "elevation": 1, + "var": "VAR_0x405F", + "var_value": 4, + "script": "Route23_EventScript_1685C2" + }, + { + "type": "trigger", + "x": 12, + "y": 111, + "elevation": 0, + "var": "VAR_0x405F", + "var_value": 4, + "script": "Route23_EventScript_1685C2" + }, + { + "type": "trigger", + "x": 14, + "y": 112, + "elevation": 1, + "var": "VAR_0x405F", + "var_value": 4, + "script": "Route23_EventScript_1685C2" + }, + { + "type": "trigger", + "x": 13, + "y": 112, + "elevation": 1, + "var": "VAR_0x405F", + "var_value": 4, + "script": "Route23_EventScript_1685C2" + }, + { + "type": "trigger", + "x": 15, + "y": 112, + "elevation": 1, + "var": "VAR_0x405F", + "var_value": 4, + "script": "Route23_EventScript_1685C2" + }, + { + "type": "trigger", + "x": 12, + "y": 148, + "elevation": 0, + "var": "VAR_0x405F", + "var_value": 1, + "script": "Route23_EventScript_168583" + }, + { + "type": "trigger", + "x": 11, + "y": 148, + "elevation": 0, + "var": "VAR_0x405F", + "var_value": 1, + "script": "Route23_EventScript_168583" + }, + { + "type": "trigger", + "x": 14, + "y": 149, + "elevation": 3, + "var": "VAR_0x405F", + "var_value": 1, + "script": "Route23_EventScript_168583" + }, + { + "type": "trigger", + "x": 10, + "y": 148, + "elevation": 0, + "var": "VAR_0x405F", + "var_value": 1, + "script": "Route23_EventScript_168583" + } + ], + "bg_events": [ + { + "type": "hidden_item", + "x": 19, + "y": 42, + "elevation": 0, + "item": "ITEM_FULL_RESTORE", + "flag": "34", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 20, + "y": 72, + "elevation": 0, + "item": "POCKET_KEY_ITEMS", + "flag": "35", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 11, + "y": 101, + "elevation": 3, + "item": "ITEM_MAX_ETHER", + "flag": "36", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 3, + "y": 18, + "elevation": 3, + "item": "ITEM_LUM_BERRY", + "flag": "145", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 2, + "y": 29, + "elevation": 3, + "item": "ITEM_SITRUS_BERRY", + "flag": "146", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 10, + "y": 67, + "elevation": 3, + "item": "ITEM_ASPEAR_BERRY", + "flag": "147", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 3, + "y": 128, + "elevation": 3, + "item": "ITEM_LEPPA_BERRY", + "flag": "148", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 9, + "y": 8, + "elevation": 3, + "item": "ITEM_MAX_ELIXIR", + "flag": "155", + "unknown": 1 + }, + { + "type": "bg_event_type_0", + "x": 3, + "y": 31, + "elevation": 0, + "script": "Route23_EventScript_168616" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route24/connections.inc b/data/maps/Route24/connections.inc deleted file mode 100644 index a255e904a..000000000 --- a/data/maps/Route24/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -Route24_MapConnectionsList: @ 8352CE8 - connection down, -12, MAP_CERULEAN_CITY - connection right, 0, MAP_ROUTE25 - -Route24_MapConnections:: @ 8352D00 - .4byte 2 - .4byte Route24_MapConnectionsList diff --git a/data/maps/Route24/events.inc b/data/maps/Route24/events.inc deleted file mode 100644 index 701cc2b25..000000000 --- a/data/maps/Route24/events.inc +++ /dev/null @@ -1,19 +0,0 @@ -Route24_EventObjects: - object_event 1, 25, 0, 12, 0, 15, 0, 3, 9, 17, 0, 0, 0, 0, 0, Route24_EventScript_168620, 49, 0, 0 - object_event 2, 39, 0, 12, 0, 19, 0, 3, 9, 17, 0, 1, 0, 2, 0, Route24_EventScript_1A972D, 0, 0, 0 - object_event 3, 22, 0, 10, 0, 22, 0, 3, 10, 17, 0, 1, 0, 2, 0, Route24_EventScript_1A9673, 0, 0, 0 - object_event 4, 18, 0, 12, 0, 25, 0, 3, 9, 17, 0, 1, 0, 2, 0, Route24_EventScript_1A95F7, 0, 0, 0 - object_event 5, 22, 0, 10, 0, 28, 0, 3, 10, 17, 0, 1, 0, 2, 0, Route24_EventScript_1A96B1, 0, 0, 0 - object_event 6, 20, 0, 12, 0, 31, 0, 3, 9, 17, 0, 1, 0, 2, 0, Route24_EventScript_1A9635, 0, 0, 0 - object_event 7, 39, 0, 5, 0, 21, 0, 3, 7, 17, 0, 1, 0, 5, 0, Route24_EventScript_1A96EF, 0, 0, 0 - object_event 8, 92, 0, 11, 0, 4, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route24_EventScript_1BE644, 354, 0, 0 - -Route24_MapCoordEvents: - coord_event 10, 15, 3, 0, 16491, 0, 0, Route24_EventScript_168660 - coord_event 11, 15, 3, 0, 16491, 0, 0, Route24_EventScript_16866C - -Route24_MapBGEvents: - bg_event 19, 4, 3, 7, 0, 135, 115, 1 - -Route24_MapEvents:: - map_events Route24_EventObjects, 0x0, Route24_MapCoordEvents, Route24_MapBGEvents diff --git a/data/maps/Route24/header.inc b/data/maps/Route24/header.inc deleted file mode 100644 index 298826eef..000000000 --- a/data/maps/Route24/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route24:: @ 8350ACC - .4byte Route24_Layout @ 0x82F8E08 - .4byte Route24_MapEvents @ 0x83B8400 - .4byte Route24_MapScripts @ 0x816861F - .4byte Route24_MapConnections @ 0x8352D00 - .2byte BGM_FRLG_ROUTE_24 - .2byte 112 - .byte 0x7c, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/Route24/map.json b/data/maps/Route24/map.json new file mode 100644 index 000000000..edc86edb8 --- /dev/null +++ b/data/maps/Route24/map.json @@ -0,0 +1,164 @@ +{ + "id": "MAP_ROUTE24", + "name": "Route24", + "layout": "LAYOUT_ROUTE24", + "music": "BGM_FRLG_ROUTE_24", + "region_map_section": "MAPSEC_ROUTE_24", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_CERULEAN_CITY", + "offset": -12, + "direction": "down" + }, + { + "map": "MAP_ROUTE25", + "offset": 0, + "direction": "right" + } + ], + "object_events": [ + { + "graphics_id": "25", + "x": 12, + "y": 15, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route24_EventScript_168620", + "flag": "49" + }, + { + "graphics_id": "39", + "x": 12, + "y": 19, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route24_EventScript_1A972D", + "flag": "0" + }, + { + "graphics_id": "22", + "x": 10, + "y": 22, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route24_EventScript_1A9673", + "flag": "0" + }, + { + "graphics_id": "18", + "x": 12, + "y": 25, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route24_EventScript_1A95F7", + "flag": "0" + }, + { + "graphics_id": "22", + "x": 10, + "y": 28, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route24_EventScript_1A96B1", + "flag": "0" + }, + { + "graphics_id": "20", + "x": 12, + "y": 31, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route24_EventScript_1A9635", + "flag": "0" + }, + { + "graphics_id": "39", + "x": 5, + "y": 21, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route24_EventScript_1A96EF", + "flag": "0" + }, + { + "graphics_id": "92", + "x": 11, + "y": 4, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route24_EventScript_1BE644", + "flag": "354" + } + ], + "warp_events": [], + "coord_events": [ + { + "type": "trigger", + "x": 10, + "y": 15, + "elevation": 3, + "var": "VAR_0x406B", + "var_value": 0, + "script": "Route24_EventScript_168660" + }, + { + "type": "trigger", + "x": 11, + "y": 15, + "elevation": 3, + "var": "VAR_0x406B", + "var_value": 0, + "script": "Route24_EventScript_16866C" + } + ], + "bg_events": [ + { + "type": "hidden_item", + "x": 19, + "y": 4, + "elevation": 3, + "item": "ITEM_PECHA_BERRY", + "flag": "115", + "unknown": 1 + } + ] +} \ No newline at end of file diff --git a/data/maps/Route25/connections.inc b/data/maps/Route25/connections.inc deleted file mode 100644 index b7b963790..000000000 --- a/data/maps/Route25/connections.inc +++ /dev/null @@ -1,6 +0,0 @@ -Route25_MapConnectionsList: @ 8352D08 - connection left, 0, MAP_ROUTE24 - -Route25_MapConnections:: @ 8352D14 - .4byte 1 - .4byte Route25_MapConnectionsList diff --git a/data/maps/Route25/events.inc b/data/maps/Route25/events.inc deleted file mode 100644 index e4085c154..000000000 --- a/data/maps/Route25/events.inc +++ /dev/null @@ -1,27 +0,0 @@ -Route25_EventObjects: - object_event 1, 56, 0, 11, 0, 4, 0, 3, 10, 17, 0, 1, 0, 4, 0, Route25_EventScript_1A98A1, 0, 0, 0 - object_event 2, 18, 0, 18, 0, 2, 0, 3, 8, 17, 0, 1, 0, 2, 0, Route25_EventScript_1A976B, 0, 0, 0 - object_event 3, 56, 0, 17, 0, 7, 0, 3, 10, 17, 0, 1, 0, 2, 0, Route25_EventScript_1A991D, 0, 0, 0 - object_event 4, 18, 0, 22, 0, 4, 0, 3, 1, 17, 0, 1, 0, 2, 0, Route25_EventScript_1A97A9, 0, 0, 0 - object_event 5, 40, 0, 22, 0, 8, 0, 3, 10, 17, 0, 1, 0, 2, 0, Route25_EventScript_1A9825, 0, 0, 0 - object_event 6, 56, 0, 27, 0, 9, 0, 3, 7, 17, 0, 1, 0, 3, 0, Route25_EventScript_1A98DF, 0, 0, 0 - object_event 7, 39, 0, 28, 0, 4, 0, 3, 8, 17, 0, 1, 0, 3, 0, Route25_EventScript_1A995B, 0, 0, 0 - object_event 8, 18, 0, 36, 0, 4, 0, 3, 26, 49, 0, 1, 0, 2, 0, Route25_EventScript_1A97E7, 0, 0, 0 - object_event 9, 22, 0, 42, 0, 5, 0, 3, 8, 17, 0, 1, 0, 3, 0, Route25_EventScript_1A9863, 0, 0, 0 - object_event 10, 92, 0, 26, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route25_EventScript_1BE651, 355, 0, 0 - object_event 11, 95, 0, 30, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route25_EventScript_1BDF13, 18, 0, 0 - object_event 12, 29, 0, 49, 0, 10, 0, 3, 9, 17, 0, 0, 0, 0, 0, Route25_EventScript_1ACE4F, 0, 0, 0 - object_event 13, 25, 0, 49, 0, 11, 0, 3, 9, 17, 0, 0, 0, 0, 0, Route25_EventScript_16874F, 0, 0, 0 - -Route25_MapWarps: - warp_def 51, 4, 0, 1, 7680 - -Route25_MapBGEvents: - bg_event 48, 4, 0, 0, 0, Route25_EventScript_168746 - bg_event 14, 2, 3, 7, 0, 36, 4, 1 - bg_event 58, 6, 3, 7, 0, 34, 5, 1 - bg_event 33, 8, 3, 7, 0, 139, 116, 1 - bg_event 40, 3, 3, 7, 0, 149, 117, 1 - -Route25_MapEvents:: - map_events Route25_EventObjects, Route25_MapWarps, 0x0, Route25_MapBGEvents diff --git a/data/maps/Route25/header.inc b/data/maps/Route25/header.inc deleted file mode 100644 index f4525d40e..000000000 --- a/data/maps/Route25/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route25:: @ 8350AE8 - .4byte Route25_Layout @ 0x82F996C - .4byte Route25_MapEvents @ 0x83B8590 - .4byte Route25_MapScripts @ 0x8168745 - .4byte Route25_MapConnections @ 0x8352D14 - .2byte BGM_FRLG_ROUTE_24 - .2byte 113 - .byte 0x7d, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/Route25/map.json b/data/maps/Route25/map.json new file mode 100644 index 000000000..4e6baf2be --- /dev/null +++ b/data/maps/Route25/map.json @@ -0,0 +1,247 @@ +{ + "id": "MAP_ROUTE25", + "name": "Route25", + "layout": "LAYOUT_ROUTE25", + "music": "BGM_FRLG_ROUTE_24", + "region_map_section": "MAPSEC_ROUTE_25", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_ROUTE24", + "offset": 0, + "direction": "left" + } + ], + "object_events": [ + { + "graphics_id": "56", + "x": 11, + "y": 4, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route25_EventScript_1A98A1", + "flag": "0" + }, + { + "graphics_id": "18", + "x": 18, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route25_EventScript_1A976B", + "flag": "0" + }, + { + "graphics_id": "56", + "x": 17, + "y": 7, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route25_EventScript_1A991D", + "flag": "0" + }, + { + "graphics_id": "18", + "x": 22, + "y": 4, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route25_EventScript_1A97A9", + "flag": "0" + }, + { + "graphics_id": "40", + "x": 22, + "y": 8, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route25_EventScript_1A9825", + "flag": "0" + }, + { + "graphics_id": "56", + "x": 27, + "y": 9, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route25_EventScript_1A98DF", + "flag": "0" + }, + { + "graphics_id": "39", + "x": 28, + "y": 4, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route25_EventScript_1A995B", + "flag": "0" + }, + { + "graphics_id": "18", + "x": 36, + "y": 4, + "elevation": 3, + "movement_type": "26", + "movement_range_x": 1, + "movement_range_y": 3, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route25_EventScript_1A97E7", + "flag": "0" + }, + { + "graphics_id": "22", + "x": 42, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route25_EventScript_1A9863", + "flag": "0" + }, + { + "graphics_id": "92", + "x": 26, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route25_EventScript_1BE651", + "flag": "355" + }, + { + "graphics_id": "95", + "x": 30, + "y": 3, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route25_EventScript_1BDF13", + "flag": "18" + }, + { + "graphics_id": "29", + "x": 49, + "y": 10, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route25_EventScript_1ACE4F", + "flag": "0" + }, + { + "graphics_id": "25", + "x": 49, + "y": 11, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route25_EventScript_16874F", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 51, + "y": 4, + "elevation": 0, + "dest_map": "MAP_ROUTE25_SEA_COTTAGE", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 48, + "y": 4, + "elevation": 0, + "script": "Route25_EventScript_168746" + }, + { + "type": "hidden_item", + "x": 14, + "y": 2, + "elevation": 3, + "item": "ITEM_ELIXIR", + "flag": "4", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 58, + "y": 6, + "elevation": 3, + "item": "ITEM_ETHER", + "flag": "5", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 33, + "y": 8, + "elevation": 3, + "item": "ITEM_ORAN_BERRY", + "flag": "116", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 40, + "y": 3, + "elevation": 3, + "item": "ITEM_BLUK_BERRY", + "flag": "117", + "unknown": 1 + } + ] +} \ No newline at end of file diff --git a/data/maps/Route25_SeaCottage/events.inc b/data/maps/Route25_SeaCottage/events.inc deleted file mode 100644 index e7a6f4a9c..000000000 --- a/data/maps/Route25_SeaCottage/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -Route25_SeaCottage_EventObjects: - object_event 1, 73, 0, 7, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route25_SeaCottage_EventScript_17054B, 51, 0, 0 - object_event 2, 113, 0, 10, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route25_SeaCottage_EventScript_17054B, 50, 0, 0 - -Route25_SeaCottage_MapWarps: - warp_def 6, 9, 3, 0, 812 - warp_def 7, 9, 3, 0, 812 - warp_def 8, 9, 3, 0, 812 - -Route25_SeaCottage_MapBGEvents: - bg_event 4, 5, 0, 1, 0, Route25_SeaCottage_EventScript_1706DD - -Route25_SeaCottage_MapEvents:: - map_events Route25_SeaCottage_EventObjects, Route25_SeaCottage_MapWarps, 0x0, Route25_SeaCottage_MapBGEvents diff --git a/data/maps/Route25_SeaCottage/header.inc b/data/maps/Route25_SeaCottage/header.inc deleted file mode 100644 index 268e6e59c..000000000 --- a/data/maps/Route25_SeaCottage/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route25_SeaCottage:: @ 8351A8C - .4byte Route25_SeaCottage_Layout @ 0x8319030 - .4byte Route25_SeaCottage_MapEvents @ 0x83BE008 - .4byte Route25_SeaCottage_MapScripts @ 0x8170523 - .4byte NULL - .2byte BGM_FRLG_CERULEAN_CITY - .2byte 169 - .byte 0x7d, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/Route25_SeaCottage/map.json b/data/maps/Route25_SeaCottage/map.json new file mode 100644 index 000000000..62edc1927 --- /dev/null +++ b/data/maps/Route25_SeaCottage/map.json @@ -0,0 +1,76 @@ +{ + "id": "MAP_ROUTE25_SEA_COTTAGE", + "name": "Route25_SeaCottage", + "layout": "LAYOUT_ROUTE25_SEA_COTTAGE", + "music": "BGM_FRLG_CERULEAN_CITY", + "region_map_section": "MAPSEC_ROUTE_25", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "73", + "x": 7, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route25_SeaCottage_EventScript_17054B", + "flag": "51" + }, + { + "graphics_id": "113", + "x": 10, + "y": 6, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route25_SeaCottage_EventScript_17054B", + "flag": "50" + } + ], + "warp_events": [ + { + "x": 6, + "y": 9, + "elevation": 3, + "dest_map": "MAP_ROUTE25", + "dest_warp_id": 0 + }, + { + "x": 7, + "y": 9, + "elevation": 3, + "dest_map": "MAP_ROUTE25", + "dest_warp_id": 0 + }, + { + "x": 8, + "y": 9, + "elevation": 3, + "dest_map": "MAP_ROUTE25", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_1", + "x": 4, + "y": 5, + "elevation": 0, + "script": "Route25_SeaCottage_EventScript_1706DD" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route2_EastBuilding/events.inc b/data/maps/Route2_EastBuilding/events.inc deleted file mode 100644 index c50a03aad..000000000 --- a/data/maps/Route2_EastBuilding/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -Route2_EastBuilding_EventObjects: - object_event 1, 55, 0, 4, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route2_EastBuilding_EventScript_16F67F, 0, 0, 0 - object_event 2, 26, 0, 10, 0, 3, 0, 3, 5, 18, 0, 0, 0, 0, 0, Route2_EastBuilding_EventScript_16F714, 0, 0, 0 - -Route2_EastBuilding_MapWarps: - warp_def 6, 10, 0, 5, 788 - warp_def 7, 10, 3, 5, 788 - warp_def 8, 10, 3, 5, 788 - warp_def 7, 1, 3, 6, 788 - -Route2_EastBuilding_MapEvents:: - map_events Route2_EastBuilding_EventObjects, Route2_EastBuilding_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route2_EastBuilding/header.inc b/data/maps/Route2_EastBuilding/header.inc deleted file mode 100644 index 02b30b483..000000000 --- a/data/maps/Route2_EastBuilding/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route2_EastBuilding:: @ 8351798 - .4byte Route2_Entrance_Layout @ 0x8320990 - .4byte Route2_EastBuilding_MapEvents @ 0x83BD43C - .4byte Route2_EastBuilding_MapScripts @ 0x816F67E - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 221 - .byte 0x66, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00 diff --git a/data/maps/Route2_EastBuilding/map.json b/data/maps/Route2_EastBuilding/map.json new file mode 100644 index 000000000..97931c051 --- /dev/null +++ b/data/maps/Route2_EastBuilding/map.json @@ -0,0 +1,75 @@ +{ + "id": "MAP_ROUTE2_EAST_BUILDING", + "name": "Route2_EastBuilding", + "layout": "LAYOUT_ROUTE2_ENTRANCE", + "music": "BGM_FRLG_VIRIDIAN_CITY", + "region_map_section": "MAPSEC_ROUTE_2", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 1, + "unknown_19": 2, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "55", + "x": 4, + "y": 6, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route2_EastBuilding_EventScript_16F67F", + "flag": "0" + }, + { + "graphics_id": "26", + "x": 10, + "y": 3, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route2_EastBuilding_EventScript_16F714", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 10, + "elevation": 0, + "dest_map": "MAP_ROUTE2", + "dest_warp_id": 5 + }, + { + "x": 7, + "y": 10, + "elevation": 3, + "dest_map": "MAP_ROUTE2", + "dest_warp_id": 5 + }, + { + "x": 8, + "y": 10, + "elevation": 3, + "dest_map": "MAP_ROUTE2", + "dest_warp_id": 5 + }, + { + "x": 7, + "y": 1, + "elevation": 3, + "dest_map": "MAP_ROUTE2", + "dest_warp_id": 6 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route2_House/events.inc b/data/maps/Route2_House/events.inc deleted file mode 100644 index e6f06bc09..000000000 --- a/data/maps/Route2_House/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -Route2_House_EventObjects: - object_event 1, 55, 0, 4, 0, 5, 0, 3, 10, 17, 0, 0, 0, 0, 0, Route2_House_EventScript_16F5F9, 0, 0, 0 - object_event 2, 51, 0, 7, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route2_House_EventScript_16F602, 0, 0, 0 - -Route2_House_MapWarps: - warp_def 3, 7, 0, 4, 788 - warp_def 4, 7, 0, 4, 788 - warp_def 5, 7, 0, 4, 788 - -Route2_House_MapEvents:: - map_events Route2_House_EventObjects, Route2_House_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route2_House/header.inc b/data/maps/Route2_House/header.inc deleted file mode 100644 index c04a3439c..000000000 --- a/data/maps/Route2_House/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route2_House:: @ 835177C - .4byte House2_Layout @ 0x82D5840 - .4byte Route2_House_MapEvents @ 0x83BD3D8 - .4byte Route2_House_MapScripts @ 0x816F5F8 - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 7 - .byte 0x66, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/Route2_House/map.json b/data/maps/Route2_House/map.json new file mode 100644 index 000000000..cbb0eb947 --- /dev/null +++ b/data/maps/Route2_House/map.json @@ -0,0 +1,68 @@ +{ + "id": "MAP_ROUTE2_HOUSE", + "name": "Route2_House", + "layout": "LAYOUT_HOUSE2", + "music": "BGM_FRLG_VIRIDIAN_CITY", + "region_map_section": "MAPSEC_ROUTE_2", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "55", + "x": 4, + "y": 5, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route2_House_EventScript_16F5F9", + "flag": "0" + }, + { + "graphics_id": "51", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route2_House_EventScript_16F602", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_ROUTE2", + "dest_warp_id": 4 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_ROUTE2", + "dest_warp_id": 4 + }, + { + "x": 5, + "y": 7, + "elevation": 0, + "dest_map": "MAP_ROUTE2", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route2_ViridianForest_NorthEntrance/events.inc b/data/maps/Route2_ViridianForest_NorthEntrance/events.inc deleted file mode 100644 index f7baf4e08..000000000 --- a/data/maps/Route2_ViridianForest_NorthEntrance/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -Route2_ViridianForest_NorthEntrance_EventObjects: - object_event 1, 18, 0, 5, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route2_ViridianForest_NorthEntrance_EventScript_16F71E, 0, 0, 0 - object_event 2, 32, 0, 4, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route2_ViridianForest_NorthEntrance_EventScript_16F727, 0, 0, 0 - object_event 3, 42, 0, 10, 0, 5, 0, 3, 10, 17, 0, 0, 0, 0, 0, Route2_ViridianForest_NorthEntrance_EventScript_16F730, 0, 0, 0 - -Route2_ViridianForest_NorthEntrance_MapWarps: - warp_def 6, 10, 3, 2, 256 - warp_def 7, 10, 3, 2, 256 - warp_def 8, 10, 3, 2, 256 - warp_def 7, 1, 3, 0, 788 - -Route2_ViridianForest_NorthEntrance_MapEvents:: - map_events Route2_ViridianForest_NorthEntrance_EventObjects, Route2_ViridianForest_NorthEntrance_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route2_ViridianForest_NorthEntrance/header.inc b/data/maps/Route2_ViridianForest_NorthEntrance/header.inc deleted file mode 100644 index c460e0cca..000000000 --- a/data/maps/Route2_ViridianForest_NorthEntrance/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route2_ViridianForest_NorthEntrance:: @ 83517B4 - .4byte Route2_Entrance_Layout @ 0x8320990 - .4byte Route2_ViridianForest_NorthEntrance_MapEvents @ 0x83BD4B8 - .4byte Route2_ViridianForest_NorthEntrance_MapScripts @ 0x816F71D - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 221 - .byte 0x66, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00 diff --git a/data/maps/Route2_ViridianForest_NorthEntrance/map.json b/data/maps/Route2_ViridianForest_NorthEntrance/map.json new file mode 100644 index 000000000..271446b94 --- /dev/null +++ b/data/maps/Route2_ViridianForest_NorthEntrance/map.json @@ -0,0 +1,88 @@ +{ + "id": "MAP_ROUTE2_VIRIDIAN_FOREST_NORTH_ENTRANCE", + "name": "Route2_ViridianForest_NorthEntrance", + "layout": "LAYOUT_ROUTE2_ENTRANCE", + "music": "BGM_FRLG_VIRIDIAN_CITY", + "region_map_section": "MAPSEC_ROUTE_2", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 1, + "unknown_19": 2, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "18", + "x": 5, + "y": 4, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route2_ViridianForest_NorthEntrance_EventScript_16F71E", + "flag": "0" + }, + { + "graphics_id": "32", + "x": 4, + "y": 7, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route2_ViridianForest_NorthEntrance_EventScript_16F727", + "flag": "0" + }, + { + "graphics_id": "42", + "x": 10, + "y": 5, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route2_ViridianForest_NorthEntrance_EventScript_16F730", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 10, + "elevation": 3, + "dest_map": "MAP_VIRIDIAN_FOREST", + "dest_warp_id": 2 + }, + { + "x": 7, + "y": 10, + "elevation": 3, + "dest_map": "MAP_VIRIDIAN_FOREST", + "dest_warp_id": 2 + }, + { + "x": 8, + "y": 10, + "elevation": 3, + "dest_map": "MAP_VIRIDIAN_FOREST", + "dest_warp_id": 2 + }, + { + "x": 7, + "y": 1, + "elevation": 3, + "dest_map": "MAP_ROUTE2", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route2_ViridianForest_SouthEntrance/events.inc b/data/maps/Route2_ViridianForest_SouthEntrance/events.inc deleted file mode 100644 index 1011b52a7..000000000 --- a/data/maps/Route2_ViridianForest_SouthEntrance/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -Route2_ViridianForest_SouthEntrance_EventObjects: - object_event 1, 28, 0, 10, 0, 6, 0, 3, 9, 17, 0, 0, 0, 0, 0, Route2_ViridianForest_SouthEntrance_EventScript_16F5E6, 0, 0, 0 - object_event 2, 23, 0, 4, 0, 7, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route2_ViridianForest_SouthEntrance_EventScript_16F5EF, 0, 0, 0 - -Route2_ViridianForest_SouthEntrance_MapWarps: - warp_def 6, 10, 3, 2, 788 - warp_def 7, 10, 3, 2, 788 - warp_def 8, 10, 3, 2, 788 - warp_def 7, 1, 3, 0, 256 - -Route2_ViridianForest_SouthEntrance_MapEvents:: - map_events Route2_ViridianForest_SouthEntrance_EventObjects, Route2_ViridianForest_SouthEntrance_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route2_ViridianForest_SouthEntrance/header.inc b/data/maps/Route2_ViridianForest_SouthEntrance/header.inc deleted file mode 100644 index 936b17158..000000000 --- a/data/maps/Route2_ViridianForest_SouthEntrance/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route2_ViridianForest_SouthEntrance:: @ 8351760 - .4byte Route2_Entrance_Layout @ 0x8320990 - .4byte Route2_ViridianForest_SouthEntrance_MapEvents @ 0x83BD37C - .4byte Route2_ViridianForest_SouthEntrance_MapScripts @ 0x816F5E5 - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 221 - .byte 0x66, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00 diff --git a/data/maps/Route2_ViridianForest_SouthEntrance/map.json b/data/maps/Route2_ViridianForest_SouthEntrance/map.json new file mode 100644 index 000000000..8dc14d62f --- /dev/null +++ b/data/maps/Route2_ViridianForest_SouthEntrance/map.json @@ -0,0 +1,75 @@ +{ + "id": "MAP_ROUTE2_VIRIDIAN_FOREST_SOUTH_ENTRANCE", + "name": "Route2_ViridianForest_SouthEntrance", + "layout": "LAYOUT_ROUTE2_ENTRANCE", + "music": "BGM_FRLG_VIRIDIAN_CITY", + "region_map_section": "MAPSEC_ROUTE_2", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 1, + "unknown_19": 2, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "28", + "x": 10, + "y": 6, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route2_ViridianForest_SouthEntrance_EventScript_16F5E6", + "flag": "0" + }, + { + "graphics_id": "23", + "x": 4, + "y": 7, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route2_ViridianForest_SouthEntrance_EventScript_16F5EF", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 10, + "elevation": 3, + "dest_map": "MAP_ROUTE2", + "dest_warp_id": 2 + }, + { + "x": 7, + "y": 10, + "elevation": 3, + "dest_map": "MAP_ROUTE2", + "dest_warp_id": 2 + }, + { + "x": 8, + "y": 10, + "elevation": 3, + "dest_map": "MAP_ROUTE2", + "dest_warp_id": 2 + }, + { + "x": 7, + "y": 1, + "elevation": 3, + "dest_map": "MAP_VIRIDIAN_FOREST", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route3/connections.inc b/data/maps/Route3/connections.inc deleted file mode 100644 index 77fc58c67..000000000 --- a/data/maps/Route3/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -Route3_MapConnectionsList: @ 8352A1C - connection up, 60, MAP_ROUTE4 - connection left, -10, MAP_PEWTER_CITY - -Route3_MapConnections:: @ 8352A34 - .4byte 2 - .4byte Route3_MapConnectionsList diff --git a/data/maps/Route3/events.inc b/data/maps/Route3/events.inc deleted file mode 100644 index 9328d0926..000000000 --- a/data/maps/Route3/events.inc +++ /dev/null @@ -1,17 +0,0 @@ -Route3_EventObjects: - object_event 1, 18, 0, 70, 0, 13, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route3_EventScript_167F78, 0, 0, 0 - object_event 2, 22, 0, 40, 0, 11, 0, 3, 3, 17, 0, 1, 0, 3, 0, Route3_EventScript_1A957B, 0, 0, 0 - object_event 3, 20, 0, 32, 0, 6, 0, 3, 10, 17, 0, 1, 0, 4, 0, Route3_EventScript_1A94C1, 0, 0, 0 - object_event 4, 22, 0, 30, 0, 3, 0, 3, 9, 17, 0, 1, 0, 5, 0, Route3_EventScript_1A953D, 0, 0, 0 - object_event 5, 20, 0, 25, 0, 4, 0, 3, 8, 17, 0, 1, 0, 2, 0, Route3_EventScript_1A9483, 0, 0, 0 - object_event 6, 18, 0, 29, 0, 10, 0, 3, 9, 17, 0, 1, 0, 5, 0, Route3_EventScript_1A9407, 0, 0, 0 - object_event 7, 22, 0, 19, 0, 9, 0, 3, 9, 17, 0, 1, 0, 5, 0, Route3_EventScript_1A94FF, 0, 0, 0 - object_event 8, 20, 0, 12, 0, 6, 0, 3, 10, 17, 0, 1, 0, 3, 0, Route3_EventScript_1A9445, 0, 0, 0 - object_event 9, 18, 0, 17, 0, 4, 0, 3, 8, 17, 0, 1, 0, 2, 0, Route3_EventScript_1A93C9, 0, 0, 0 - -Route3_MapBGEvents: - bg_event 72, 11, 0, 0, 0, Route3_EventScript_167F81 - bg_event 26, 9, 3, 7, 0, 139, 113, 1 - -Route3_MapEvents:: - map_events Route3_EventObjects, 0x0, 0x0, Route3_MapBGEvents diff --git a/data/maps/Route3/header.inc b/data/maps/Route3/header.inc deleted file mode 100644 index ae86378c2..000000000 --- a/data/maps/Route3/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route3:: @ 8350864 - .4byte Route3_Layout @ 0x82E7234 - .4byte Route3_MapEvents @ 0x83B6870 - .4byte Route3_MapScripts @ 0x8167F77 - .4byte Route3_MapConnections @ 0x8352A34 - .2byte BGM_FRLG_ROUTE_3 - .2byte 91 - .byte 0x67, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/Route3/map.json b/data/maps/Route3/map.json new file mode 100644 index 000000000..01e64cf74 --- /dev/null +++ b/data/maps/Route3/map.json @@ -0,0 +1,165 @@ +{ + "id": "MAP_ROUTE3", + "name": "Route3", + "layout": "LAYOUT_ROUTE3", + "music": "BGM_FRLG_ROUTE_3", + "region_map_section": "MAPSEC_ROUTE_3", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_ROUTE4", + "offset": 60, + "direction": "up" + }, + { + "map": "MAP_PEWTER_CITY", + "offset": -10, + "direction": "left" + } + ], + "object_events": [ + { + "graphics_id": "18", + "x": 70, + "y": 13, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route3_EventScript_167F78", + "flag": "0" + }, + { + "graphics_id": "22", + "x": 40, + "y": 11, + "elevation": 3, + "movement_type": "3", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route3_EventScript_1A957B", + "flag": "0" + }, + { + "graphics_id": "20", + "x": 32, + "y": 6, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route3_EventScript_1A94C1", + "flag": "0" + }, + { + "graphics_id": "22", + "x": 30, + "y": 3, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route3_EventScript_1A953D", + "flag": "0" + }, + { + "graphics_id": "20", + "x": 25, + "y": 4, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route3_EventScript_1A9483", + "flag": "0" + }, + { + "graphics_id": "18", + "x": 29, + "y": 10, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route3_EventScript_1A9407", + "flag": "0" + }, + { + "graphics_id": "22", + "x": 19, + "y": 9, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route3_EventScript_1A94FF", + "flag": "0" + }, + { + "graphics_id": "20", + "x": 12, + "y": 6, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route3_EventScript_1A9445", + "flag": "0" + }, + { + "graphics_id": "18", + "x": 17, + "y": 4, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route3_EventScript_1A93C9", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 72, + "y": 11, + "elevation": 0, + "script": "Route3_EventScript_167F81" + }, + { + "type": "hidden_item", + "x": 26, + "y": 9, + "elevation": 3, + "item": "ITEM_ORAN_BERRY", + "flag": "113", + "unknown": 1 + } + ] +} \ No newline at end of file diff --git a/data/maps/Route4/connections.inc b/data/maps/Route4/connections.inc deleted file mode 100644 index 7886e6c30..000000000 --- a/data/maps/Route4/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -Route4_MapConnectionsList: @ 8352A3C - connection down, -60, MAP_ROUTE3 - connection right, -10, MAP_CERULEAN_CITY - -Route4_MapConnections:: @ 8352A54 - .4byte 2 - .4byte Route4_MapConnectionsList diff --git a/data/maps/Route4/events.inc b/data/maps/Route4/events.inc deleted file mode 100644 index 812193ff7..000000000 --- a/data/maps/Route4/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -Route4_EventObjects: - object_event 1, 23, 0, 9, 0, 8, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route4_EventScript_167F8C, 0, 0, 0 - object_event 2, 22, 0, 75, 0, 3, 0, 3, 10, 17, 0, 1, 0, 4, 0, Route4_EventScript_1A95B9, 0, 0, 0 - object_event 3, 92, 0, 67, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route4_EventScript_1BE637, 353, 0, 0 - object_event 4, 19, 0, 15, 0, 14, 0, 3, 5, 17, 0, 0, 0, 0, 0, Route4_EventScript_1ACDEA, 0, 0, 0 - object_event 5, 54, 0, 47, 0, 3, 0, 3, 10, 17, 0, 0, 0, 0, 0, Route4_EventScript_1C494E, 0, 0, 0 - object_event 6, 54, 0, 50, 0, 3, 0, 3, 9, 17, 0, 0, 0, 0, 0, Route4_EventScript_1C49B6, 0, 0, 0 - object_event 7, 65321, 0, 109, 0, 3, 0, 12, 0, 0, 0, 3, 0, 3, 0, 0x0, 0, 0, 0 - -Route4_MapWarps: - warp_def 19, 5, 3, 3, 257 - warp_def 32, 5, 0, 7, 258 - warp_def 12, 5, 0, 1, 4096 - -Route4_MapBGEvents: - bg_event 18, 7, 0, 0, 0, Route4_EventScript_167F95 - bg_event 34, 7, 0, 0, 0, Route4_EventScript_167F9E - bg_event 43, 2, 3, 7, 0, 3, 50, 1 - bg_event 5, 4, 3, 7, 0, 140, 114, 1 - bg_event 67, 17, 3, 7, 0, 148, 156, 1 - -Route4_MapEvents:: - map_events Route4_EventObjects, Route4_MapWarps, 0x0, Route4_MapBGEvents diff --git a/data/maps/Route4/header.inc b/data/maps/Route4/header.inc deleted file mode 100644 index 7156cf616..000000000 --- a/data/maps/Route4/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route4:: @ 8350880 - .4byte Route4_Layout @ 0x82E8338 - .4byte Route4_MapEvents @ 0x83B6980 - .4byte Route4_MapScripts @ 0x8167F8A - .4byte Route4_MapConnections @ 0x8352A54 - .2byte BGM_FRLG_ROUTE_3 - .2byte 92 - .byte 0x68, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/Route4/map.json b/data/maps/Route4/map.json new file mode 100644 index 000000000..d7c4363a4 --- /dev/null +++ b/data/maps/Route4/map.json @@ -0,0 +1,186 @@ +{ + "id": "MAP_ROUTE4", + "name": "Route4", + "layout": "LAYOUT_ROUTE4", + "music": "BGM_FRLG_ROUTE_3", + "region_map_section": "MAPSEC_ROUTE_4", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_ROUTE3", + "offset": -60, + "direction": "down" + }, + { + "map": "MAP_CERULEAN_CITY", + "offset": -10, + "direction": "right" + } + ], + "object_events": [ + { + "graphics_id": "23", + "x": 9, + "y": 8, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route4_EventScript_167F8C", + "flag": "0" + }, + { + "graphics_id": "22", + "x": 75, + "y": 3, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route4_EventScript_1A95B9", + "flag": "0" + }, + { + "graphics_id": "92", + "x": 67, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route4_EventScript_1BE637", + "flag": "353" + }, + { + "graphics_id": "19", + "x": 15, + "y": 14, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route4_EventScript_1ACDEA", + "flag": "0" + }, + { + "graphics_id": "54", + "x": 47, + "y": 3, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route4_EventScript_1C494E", + "flag": "0" + }, + { + "graphics_id": "54", + "x": 50, + "y": 3, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route4_EventScript_1C49B6", + "flag": "0" + }, + { + "graphics_id": "65321", + "x": 109, + "y": 3, + "elevation": 12, + "movement_type": "0", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 3, + "trainer_sight_or_berry_tree_id": 3, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 19, + "y": 5, + "elevation": 3, + "dest_map": "MAP_MT_MOON_1F", + "dest_warp_id": 3 + }, + { + "x": 32, + "y": 5, + "elevation": 0, + "dest_map": "MAP_MT_MOON_B1F", + "dest_warp_id": 7 + }, + { + "x": 12, + "y": 5, + "elevation": 0, + "dest_map": "MAP_ROUTE4_POKEMON_CENTER_1F", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 18, + "y": 7, + "elevation": 0, + "script": "Route4_EventScript_167F95" + }, + { + "type": "bg_event_type_0", + "x": 34, + "y": 7, + "elevation": 0, + "script": "Route4_EventScript_167F9E" + }, + { + "type": "hidden_item", + "x": 43, + "y": 2, + "elevation": 3, + "item": "POCKET_POKE_BALLS", + "flag": "50", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 5, + "y": 4, + "elevation": 3, + "item": "ITEM_PERSIM_BERRY", + "flag": "114", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 67, + "y": 17, + "elevation": 3, + "item": "ITEM_RAZZ_BERRY", + "flag": "156", + "unknown": 1 + } + ] +} \ No newline at end of file diff --git a/data/maps/Route4_PokemonCenter_1F/events.inc b/data/maps/Route4_PokemonCenter_1F/events.inc deleted file mode 100644 index 8e00de94c..000000000 --- a/data/maps/Route4_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -Route4_PokemonCenter_1F_EventObjects: - object_event 1, 64, 0, 7, 0, 2, 0, 0, 8, 17, 0, 0, 0, 0, 0, Route4_PokemonCenter_1F_EventScript_16F8BB, 0, 0, 0 - object_event 2, 30, 0, 1, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route4_PokemonCenter_1F_EventScript_16F75F, 0, 0, 0 - object_event 3, 61, 0, 12, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route4_PokemonCenter_1F_EventScript_16F754, 0, 0, 0 - object_event 4, 19, 0, 5, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route4_PokemonCenter_1F_EventScript_16F74B, 0, 0, 0 - object_event 5, 18, 0, 14, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route4_PokemonCenter_1F_EventScript_16F8C4, 0, 0, 0 - object_event 6, 105, 0, 12, 0, 6, 0, 0, 8, 17, 0, 0, 0, 0, 0, Route4_PokemonCenter_1F_EventScript_16F8CD, 0, 0, 0 - -Route4_PokemonCenter_1F_MapWarps: - warp_def 6, 8, 3, 2, 790 - warp_def 7, 8, 3, 2, 790 - warp_def 8, 8, 3, 2, 790 - warp_def 1, 6, 4, 0, 4097 - -Route4_PokemonCenter_1F_MapEvents:: - map_events Route4_PokemonCenter_1F_EventObjects, Route4_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route4_PokemonCenter_1F/header.inc b/data/maps/Route4_PokemonCenter_1F/header.inc deleted file mode 100644 index fc36624b4..000000000 --- a/data/maps/Route4_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route4_PokemonCenter_1F:: @ 83517D0 - .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte Route4_PokemonCenter_1F_MapEvents @ 0x83BD57C - .4byte Route4_PokemonCenter_1F_MapScripts @ 0x816F739 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 8 - .byte 0x68, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/Route4_PokemonCenter_1F/map.json b/data/maps/Route4_PokemonCenter_1F/map.json new file mode 100644 index 000000000..51492a5b3 --- /dev/null +++ b/data/maps/Route4_PokemonCenter_1F/map.json @@ -0,0 +1,127 @@ +{ + "id": "MAP_ROUTE4_POKEMON_CENTER_1F", + "name": "Route4_PokemonCenter_1F", + "layout": "LAYOUT_POKEMON_CENTER_1F", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_ROUTE_4", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "64", + "x": 7, + "y": 2, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route4_PokemonCenter_1F_EventScript_16F8BB", + "flag": "0" + }, + { + "graphics_id": "30", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route4_PokemonCenter_1F_EventScript_16F75F", + "flag": "0" + }, + { + "graphics_id": "61", + "x": 12, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route4_PokemonCenter_1F_EventScript_16F754", + "flag": "0" + }, + { + "graphics_id": "19", + "x": 5, + "y": 4, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route4_PokemonCenter_1F_EventScript_16F74B", + "flag": "0" + }, + { + "graphics_id": "18", + "x": 14, + "y": 4, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route4_PokemonCenter_1F_EventScript_16F8C4", + "flag": "0" + }, + { + "graphics_id": "105", + "x": 12, + "y": 6, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route4_PokemonCenter_1F_EventScript_16F8CD", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_ROUTE4", + "dest_warp_id": 2 + }, + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_ROUTE4", + "dest_warp_id": 2 + }, + { + "x": 8, + "y": 8, + "elevation": 3, + "dest_map": "MAP_ROUTE4", + "dest_warp_id": 2 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_ROUTE4_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route4_PokemonCenter_2F/events.inc b/data/maps/Route4_PokemonCenter_2F/events.inc deleted file mode 100644 index 0a78cdf65..000000000 --- a/data/maps/Route4_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -Route4_PokemonCenter_2F_EventObjects: - object_event 1, 65, 0, 6, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route4_PokemonCenter_2F_EventScript_1A8CF6, 0, 0, 0 - object_event 2, 65, 0, 2, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route4_PokemonCenter_2F_EventScript_1A8CFC, 0, 0, 0 - object_event 3, 65, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route4_PokemonCenter_2F_EventScript_1A8D02, 0, 0, 0 - object_event 4, 69, 0, 1, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route4_PokemonCenter_2F_EventScript_1BB1D2, 112, 0, 0 - -Route4_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 3, 4096 - warp_def 5, 1, 0, 0, 4 - warp_def 9, 1, 0, 0, 1 - -Route4_PokemonCenter_2F_MapEvents:: - map_events Route4_PokemonCenter_2F_EventObjects, Route4_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route4_PokemonCenter_2F/header.inc b/data/maps/Route4_PokemonCenter_2F/header.inc deleted file mode 100644 index eb9d2796d..000000000 --- a/data/maps/Route4_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route4_PokemonCenter_2F:: @ 83517EC - .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte Route4_PokemonCenter_2F_MapEvents @ 0x83BD608 - .4byte Route4_PokemonCenter_2F_MapScripts @ 0x816F8D8 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 9 - .byte 0x68, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/Route4_PokemonCenter_2F/map.json b/data/maps/Route4_PokemonCenter_2F/map.json new file mode 100644 index 000000000..a601bf6fc --- /dev/null +++ b/data/maps/Route4_PokemonCenter_2F/map.json @@ -0,0 +1,94 @@ +{ + "id": "MAP_ROUTE4_POKEMON_CENTER_2F", + "name": "Route4_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_ROUTE_4", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "65", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route4_PokemonCenter_2F_EventScript_1A8CF6", + "flag": "0" + }, + { + "graphics_id": "65", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route4_PokemonCenter_2F_EventScript_1A8CFC", + "flag": "0" + }, + { + "graphics_id": "65", + "x": 10, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route4_PokemonCenter_2F_EventScript_1A8D02", + "flag": "0" + }, + { + "graphics_id": "69", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route4_PokemonCenter_2F_EventScript_1BB1D2", + "flag": "112" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_ROUTE4_POKEMON_CENTER_1F", + "dest_warp_id": 3 + }, + { + "x": 5, + "y": 1, + "elevation": 0, + "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 0, + "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route5/connections.inc b/data/maps/Route5/connections.inc deleted file mode 100644 index bf4730e02..000000000 --- a/data/maps/Route5/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -Route5_MapConnectionsList: @ 8352A5C - connection up, 0, MAP_CERULEAN_CITY - connection down, 0, MAP_SAFFRON_CITY - -Route5_MapConnections:: @ 8352A74 - .4byte 2 - .4byte Route5_MapConnectionsList diff --git a/data/maps/Route5/events.inc b/data/maps/Route5/events.inc deleted file mode 100644 index 3b136630c..000000000 --- a/data/maps/Route5/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -Route5_MapWarps: - warp_def 31, 31, 0, 1, 286 - warp_def 23, 25, 0, 1, 4352 - warp_def 24, 32, 3, 1, 4353 - warp_def 25, 32, 3, 1, 4353 - -Route5_MapBGEvents: - bg_event 32, 32, 0, 0, 0, Route5_EventScript_167FA8 - -Route5_MapEvents:: - map_events 0x0, Route5_MapWarps, 0x0, Route5_MapBGEvents diff --git a/data/maps/Route5/header.inc b/data/maps/Route5/header.inc deleted file mode 100644 index 7092ca60b..000000000 --- a/data/maps/Route5/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route5:: @ 835089C - .4byte Route5_Layout @ 0x82E925C - .4byte Route5_MapEvents @ 0x83B69C0 - .4byte Route5_MapScripts @ 0x8167FA7 - .4byte Route5_MapConnections @ 0x8352A74 - .2byte BGM_FRLG_ROUTE_3 - .2byte 93 - .byte 0x69, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/Route5/map.json b/data/maps/Route5/map.json new file mode 100644 index 000000000..b6f8cadef --- /dev/null +++ b/data/maps/Route5/map.json @@ -0,0 +1,67 @@ +{ + "id": "MAP_ROUTE5", + "name": "Route5", + "layout": "LAYOUT_ROUTE5", + "music": "BGM_FRLG_ROUTE_3", + "region_map_section": "MAPSEC_ROUTE_5", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_CERULEAN_CITY", + "offset": 0, + "direction": "up" + }, + { + "map": "MAP_SAFFRON_CITY", + "offset": 0, + "direction": "down" + } + ], + "object_events": [], + "warp_events": [ + { + "x": 31, + "y": 31, + "elevation": 0, + "dest_map": "MAP_UNDERGROUND_PATH_NORTH_ENTRANCE", + "dest_warp_id": 1 + }, + { + "x": 23, + "y": 25, + "elevation": 0, + "dest_map": "MAP_ROUTE5_POKEMON_DAY_CARE", + "dest_warp_id": 1 + }, + { + "x": 24, + "y": 32, + "elevation": 3, + "dest_map": "MAP_ROUTE5_SOUTH_ENTRANCE", + "dest_warp_id": 1 + }, + { + "x": 25, + "y": 32, + "elevation": 3, + "dest_map": "MAP_ROUTE5_SOUTH_ENTRANCE", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 32, + "y": 32, + "elevation": 0, + "script": "Route5_EventScript_167FA8" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route5_PokemonDayCare/events.inc b/data/maps/Route5_PokemonDayCare/events.inc deleted file mode 100644 index ac1bce238..000000000 --- a/data/maps/Route5_PokemonDayCare/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -Route5_PokemonDayCare_EventObjects: - object_event 1, 61, 0, 4, 0, 4, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route5_PokemonDayCare_EventScript_1BF398, 0, 0, 0 - -Route5_PokemonDayCare_MapWarps: - warp_def 3, 7, 0, 1, 791 - warp_def 4, 7, 0, 1, 791 - warp_def 5, 7, 0, 1, 791 - -Route5_PokemonDayCare_MapEvents:: - map_events Route5_PokemonDayCare_EventObjects, Route5_PokemonDayCare_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route5_PokemonDayCare/header.inc b/data/maps/Route5_PokemonDayCare/header.inc deleted file mode 100644 index 3fef23ccb..000000000 --- a/data/maps/Route5_PokemonDayCare/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route5_PokemonDayCare:: @ 8351808 - .4byte Route5_PokemonDayCare_Layout @ 0x833ADC0 - .4byte Route5_PokemonDayCare_MapEvents @ 0x83BD64C - .4byte Route5_PokemonDayCare_MapScripts @ 0x816F8FF - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 275 - .byte 0x69, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/Route5_PokemonDayCare/map.json b/data/maps/Route5_PokemonDayCare/map.json new file mode 100644 index 000000000..6ea473e4f --- /dev/null +++ b/data/maps/Route5_PokemonDayCare/map.json @@ -0,0 +1,55 @@ +{ + "id": "MAP_ROUTE5_POKEMON_DAY_CARE", + "name": "Route5_PokemonDayCare", + "layout": "LAYOUT_ROUTE5_POKEMON_DAY_CARE", + "music": "BGM_FRLG_VIRIDIAN_CITY", + "region_map_section": "MAPSEC_ROUTE_5", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "61", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route5_PokemonDayCare_EventScript_1BF398", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_ROUTE5", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_ROUTE5", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 7, + "elevation": 0, + "dest_map": "MAP_ROUTE5", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route5_SouthEntrance/events.inc b/data/maps/Route5_SouthEntrance/events.inc deleted file mode 100644 index a1ef1e12f..000000000 --- a/data/maps/Route5_SouthEntrance/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -Route5_SouthEntrance_EventObjects: - object_event 1, 60, 0, 1, 0, 5, 0, 3, 10, 17, 0, 0, 0, 0, 0, Route5_SouthEntrance_EventScript_16F901, 0, 0, 0 - -Route5_SouthEntrance_MapWarps: - warp_def 3, 9, 3, 9, 778 - warp_def 4, 1, 3, 2, 791 - warp_def 4, 9, 3, 9, 778 - warp_def 5, 1, 0, 3, 791 - -Route5_SouthEntrance_MapCoordEvents: - coord_event 3, 5, 3, 0, 16482, 0, 0, Route5_SouthEntrance_EventScript_16F90A - coord_event 4, 5, 3, 0, 16482, 0, 0, Route5_SouthEntrance_EventScript_16F916 - coord_event 5, 5, 3, 0, 16482, 0, 0, Route5_SouthEntrance_EventScript_16F922 - -Route5_SouthEntrance_MapEvents:: - map_events Route5_SouthEntrance_EventObjects, Route5_SouthEntrance_MapWarps, Route5_SouthEntrance_MapCoordEvents, 0x0 diff --git a/data/maps/Route5_SouthEntrance/header.inc b/data/maps/Route5_SouthEntrance/header.inc deleted file mode 100644 index c918b3b50..000000000 --- a/data/maps/Route5_SouthEntrance/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route5_SouthEntrance:: @ 8351824 - .4byte SaffronCity_NorthSouthEntrance_Layout @ 0x831E9C0 - .4byte Route5_SouthEntrance_MapEvents @ 0x83BD6C8 - .4byte Route5_SouthEntrance_MapScripts @ 0x816F900 - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 208 - .byte 0x69, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00 diff --git a/data/maps/Route5_SouthEntrance/map.json b/data/maps/Route5_SouthEntrance/map.json new file mode 100644 index 000000000..b153ebe11 --- /dev/null +++ b/data/maps/Route5_SouthEntrance/map.json @@ -0,0 +1,90 @@ +{ + "id": "MAP_ROUTE5_SOUTH_ENTRANCE", + "name": "Route5_SouthEntrance", + "layout": "LAYOUT_SAFFRON_CITY_NORTH_SOUTH_ENTRANCE", + "music": "BGM_FRLG_VIRIDIAN_CITY", + "region_map_section": "MAPSEC_ROUTE_5", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 1, + "unknown_19": 2, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "60", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route5_SouthEntrance_EventScript_16F901", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 9, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_warp_id": 9 + }, + { + "x": 4, + "y": 1, + "elevation": 3, + "dest_map": "MAP_ROUTE5", + "dest_warp_id": 2 + }, + { + "x": 4, + "y": 9, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_warp_id": 9 + }, + { + "x": 5, + "y": 1, + "elevation": 0, + "dest_map": "MAP_ROUTE5", + "dest_warp_id": 3 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 3, + "y": 5, + "elevation": 3, + "var": "VAR_0x4062", + "var_value": 0, + "script": "Route5_SouthEntrance_EventScript_16F90A" + }, + { + "type": "trigger", + "x": 4, + "y": 5, + "elevation": 3, + "var": "VAR_0x4062", + "var_value": 0, + "script": "Route5_SouthEntrance_EventScript_16F916" + }, + { + "type": "trigger", + "x": 5, + "y": 5, + "elevation": 3, + "var": "VAR_0x4062", + "var_value": 0, + "script": "Route5_SouthEntrance_EventScript_16F922" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route6/connections.inc b/data/maps/Route6/connections.inc deleted file mode 100644 index 7f0a3d191..000000000 --- a/data/maps/Route6/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -Route6_MapConnectionsList: @ 8352A7C - connection up, 0, MAP_SAFFRON_CITY - connection down, -12, MAP_VERMILION_CITY - -Route6_MapConnections:: @ 8352A94 - .4byte 2 - .4byte Route6_MapConnectionsList diff --git a/data/maps/Route6/events.inc b/data/maps/Route6/events.inc deleted file mode 100644 index a6ff2b010..000000000 --- a/data/maps/Route6/events.inc +++ /dev/null @@ -1,20 +0,0 @@ -Route6_EventObjects: - object_event 1, 20, 0, 3, 0, 16, 0, 3, 10, 17, 0, 1, 0, 5, 0, Route6_EventScript_1A9999, 0, 0, 0 - object_event 2, 39, 0, 12, 0, 21, 0, 3, 10, 17, 0, 1, 0, 0, 0, Route6_EventScript_1A9A15, 0, 0, 0 - object_event 3, 40, 0, 13, 0, 21, 0, 3, 9, 17, 0, 1, 0, 0, 0, Route6_EventScript_1A9A91, 0, 0, 0 - object_event 4, 20, 0, 20, 0, 25, 0, 3, 9, 17, 0, 1, 0, 3, 0, Route6_EventScript_1A99D7, 0, 0, 0 - object_event 5, 40, 0, 13, 0, 32, 0, 3, 9, 17, 0, 1, 0, 3, 0, Route6_EventScript_1A9ACF, 0, 0, 0 - object_event 6, 39, 0, 13, 0, 33, 0, 3, 9, 17, 0, 1, 0, 3, 0, Route6_EventScript_1A9A53, 0, 0, 0 - -Route6_MapWarps: - warp_def 19, 13, 0, 1, 288 - warp_def 12, 5, 3, 2, 4608 - warp_def 13, 5, 3, 2, 4608 - -Route6_MapBGEvents: - bg_event 21, 15, 0, 0, 0, Route6_EventScript_167FB2 - bg_event 5, 5, 3, 7, 0, 142, 118, 1 - bg_event 19, 5, 3, 7, 0, 68, 119, 1 - -Route6_MapEvents:: - map_events Route6_EventObjects, Route6_MapWarps, 0x0, Route6_MapBGEvents diff --git a/data/maps/Route6/header.inc b/data/maps/Route6/header.inc deleted file mode 100644 index 8e2668411..000000000 --- a/data/maps/Route6/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route6:: @ 83508B8 - .4byte Route6_Layout @ 0x82E9A00 - .4byte Route6_MapEvents @ 0x83B6AA0 - .4byte Route6_MapScripts @ 0x8167FB1 - .4byte Route6_MapConnections @ 0x8352A94 - .2byte BGM_FRLG_ROUTE_3 - .2byte 94 - .byte 0x6a, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/Route6/map.json b/data/maps/Route6/map.json new file mode 100644 index 000000000..13dc779ef --- /dev/null +++ b/data/maps/Route6/map.json @@ -0,0 +1,157 @@ +{ + "id": "MAP_ROUTE6", + "name": "Route6", + "layout": "LAYOUT_ROUTE6", + "music": "BGM_FRLG_ROUTE_3", + "region_map_section": "MAPSEC_ROUTE_6", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_SAFFRON_CITY", + "offset": 0, + "direction": "up" + }, + { + "map": "MAP_VERMILION_CITY", + "offset": -12, + "direction": "down" + } + ], + "object_events": [ + { + "graphics_id": "20", + "x": 3, + "y": 16, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route6_EventScript_1A9999", + "flag": "0" + }, + { + "graphics_id": "39", + "x": 12, + "y": 21, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route6_EventScript_1A9A15", + "flag": "0" + }, + { + "graphics_id": "40", + "x": 13, + "y": 21, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route6_EventScript_1A9A91", + "flag": "0" + }, + { + "graphics_id": "20", + "x": 20, + "y": 25, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route6_EventScript_1A99D7", + "flag": "0" + }, + { + "graphics_id": "40", + "x": 13, + "y": 32, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route6_EventScript_1A9ACF", + "flag": "0" + }, + { + "graphics_id": "39", + "x": 13, + "y": 33, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route6_EventScript_1A9A53", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 19, + "y": 13, + "elevation": 0, + "dest_map": "MAP_UNDERGROUND_PATH_SOUTH_ENTRANCE", + "dest_warp_id": 1 + }, + { + "x": 12, + "y": 5, + "elevation": 3, + "dest_map": "MAP_ROUTE6_NORTH_ENTRANCE", + "dest_warp_id": 2 + }, + { + "x": 13, + "y": 5, + "elevation": 3, + "dest_map": "MAP_ROUTE6_NORTH_ENTRANCE", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 21, + "y": 15, + "elevation": 0, + "script": "Route6_EventScript_167FB2" + }, + { + "type": "hidden_item", + "x": 5, + "y": 5, + "elevation": 3, + "item": "ITEM_SITRUS_BERRY", + "flag": "118", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 19, + "y": 5, + "elevation": 3, + "item": "ITEM_RARE_CANDY", + "flag": "119", + "unknown": 1 + } + ] +} \ No newline at end of file diff --git a/data/maps/Route6_NorthEntrance/events.inc b/data/maps/Route6_NorthEntrance/events.inc deleted file mode 100644 index c6b34841e..000000000 --- a/data/maps/Route6_NorthEntrance/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -Route6_NorthEntrance_EventObjects: - object_event 1, 60, 0, 7, 0, 5, 0, 3, 9, 17, 0, 0, 0, 0, 0, Route6_NorthEntrance_EventScript_16F9C7, 0, 0, 0 - -Route6_NorthEntrance_MapWarps: - warp_def 4, 1, 0, 11, 778 - warp_def 5, 1, 0, 11, 778 - warp_def 4, 9, 3, 1, 792 - warp_def 5, 9, 3, 1, 792 - -Route6_NorthEntrance_MapCoordEvents: - coord_event 3, 5, 3, 0, 16482, 0, 0, Route6_NorthEntrance_EventScript_16F9D0 - coord_event 4, 5, 3, 0, 16482, 0, 0, Route6_NorthEntrance_EventScript_16F9DC - coord_event 5, 5, 3, 0, 16482, 0, 0, Route6_NorthEntrance_EventScript_16F9E8 - -Route6_NorthEntrance_MapEvents:: - map_events Route6_NorthEntrance_EventObjects, Route6_NorthEntrance_MapWarps, Route6_NorthEntrance_MapCoordEvents, 0x0 diff --git a/data/maps/Route6_NorthEntrance/header.inc b/data/maps/Route6_NorthEntrance/header.inc deleted file mode 100644 index 6ef93a401..000000000 --- a/data/maps/Route6_NorthEntrance/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route6_NorthEntrance:: @ 8351840 - .4byte SaffronCity_NorthSouthEntrance_Layout @ 0x831E9C0 - .4byte Route6_NorthEntrance_MapEvents @ 0x83BD744 - .4byte Route6_NorthEntrance_MapScripts @ 0x816F9C6 - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 208 - .byte 0x6a, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00 diff --git a/data/maps/Route6_NorthEntrance/map.json b/data/maps/Route6_NorthEntrance/map.json new file mode 100644 index 000000000..99fb33e28 --- /dev/null +++ b/data/maps/Route6_NorthEntrance/map.json @@ -0,0 +1,90 @@ +{ + "id": "MAP_ROUTE6_NORTH_ENTRANCE", + "name": "Route6_NorthEntrance", + "layout": "LAYOUT_SAFFRON_CITY_NORTH_SOUTH_ENTRANCE", + "music": "BGM_FRLG_VIRIDIAN_CITY", + "region_map_section": "MAPSEC_ROUTE_6", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 1, + "unknown_19": 2, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "60", + "x": 7, + "y": 5, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route6_NorthEntrance_EventScript_16F9C7", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 1, + "elevation": 0, + "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_warp_id": 11 + }, + { + "x": 5, + "y": 1, + "elevation": 0, + "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_warp_id": 11 + }, + { + "x": 4, + "y": 9, + "elevation": 3, + "dest_map": "MAP_ROUTE6", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 9, + "elevation": 3, + "dest_map": "MAP_ROUTE6", + "dest_warp_id": 1 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 3, + "y": 5, + "elevation": 3, + "var": "VAR_0x4062", + "var_value": 0, + "script": "Route6_NorthEntrance_EventScript_16F9D0" + }, + { + "type": "trigger", + "x": 4, + "y": 5, + "elevation": 3, + "var": "VAR_0x4062", + "var_value": 0, + "script": "Route6_NorthEntrance_EventScript_16F9DC" + }, + { + "type": "trigger", + "x": 5, + "y": 5, + "elevation": 3, + "var": "VAR_0x4062", + "var_value": 0, + "script": "Route6_NorthEntrance_EventScript_16F9E8" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route7/connections.inc b/data/maps/Route7/connections.inc deleted file mode 100644 index dec257fa1..000000000 --- a/data/maps/Route7/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -Route7_MapConnectionsList: @ 8352A9C - connection left, -10, MAP_CELADON_CITY - connection right, -10, MAP_SAFFRON_CITY - -Route7_MapConnections:: @ 8352AB4 - .4byte 2 - .4byte Route7_MapConnectionsList diff --git a/data/maps/Route7/events.inc b/data/maps/Route7/events.inc deleted file mode 100644 index a394e8394..000000000 --- a/data/maps/Route7/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -Route7_EventObjects: - object_event 1, 65375, 0, 248, 255, 12, 0, 10, 0, 0, 0, 6, 0, 3, 0, 0x0, 0, 0, 0 - -Route7_MapWarps: - warp_def 7, 14, 0, 1, 289 - warp_def 15, 10, 3, 0, 4864 - -Route7_MapBGEvents: - bg_event 5, 14, 0, 0, 0, Route7_EventScript_167FBC - bg_event 16, 15, 3, 7, 0, 151, 152, 1 - -Route7_MapEvents:: - map_events Route7_EventObjects, Route7_MapWarps, 0x0, Route7_MapBGEvents diff --git a/data/maps/Route7/header.inc b/data/maps/Route7/header.inc deleted file mode 100644 index b7c432750..000000000 --- a/data/maps/Route7/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route7:: @ 83508D4 - .4byte Route7_Layout @ 0x82E9DE4 - .4byte Route7_MapEvents @ 0x83B6AF4 - .4byte Route7_MapScripts @ 0x8167FBB - .4byte Route7_MapConnections @ 0x8352AB4 - .2byte BGM_FRLG_ROUTE_3 - .2byte 95 - .byte 0x6b, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/Route7/map.json b/data/maps/Route7/map.json new file mode 100644 index 000000000..2974e7ba8 --- /dev/null +++ b/data/maps/Route7/map.json @@ -0,0 +1,76 @@ +{ + "id": "MAP_ROUTE7", + "name": "Route7", + "layout": "LAYOUT_ROUTE7", + "music": "BGM_FRLG_ROUTE_3", + "region_map_section": "MAPSEC_ROUTE_7", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_CELADON_CITY", + "offset": -10, + "direction": "left" + }, + { + "map": "MAP_SAFFRON_CITY", + "offset": -10, + "direction": "right" + } + ], + "object_events": [ + { + "graphics_id": "65375", + "x": 65528, + "y": 12, + "elevation": 10, + "movement_type": "0", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 6, + "trainer_sight_or_berry_tree_id": 3, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 7, + "y": 14, + "elevation": 0, + "dest_map": "MAP_UNDERGROUND_PATH_WEST_ENTRANCE", + "dest_warp_id": 1 + }, + { + "x": 15, + "y": 10, + "elevation": 3, + "dest_map": "MAP_ROUTE7_EAST_ENTRANCE", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 5, + "y": 14, + "elevation": 0, + "script": "Route7_EventScript_167FBC" + }, + { + "type": "hidden_item", + "x": 16, + "y": 15, + "elevation": 3, + "item": "ITEM_WEPEAR_BERRY", + "flag": "152", + "unknown": 1 + } + ] +} \ No newline at end of file diff --git a/data/maps/Route7_EastEntrance/events.inc b/data/maps/Route7_EastEntrance/events.inc deleted file mode 100644 index 8c7b7a30f..000000000 --- a/data/maps/Route7_EastEntrance/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -Route7_EastEntrance_EventObjects: - object_event 1, 60, 0, 6, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route7_EastEntrance_EventScript_16FA8E, 0, 0, 0 - -Route7_EastEntrance_MapWarps: - warp_def 1, 5, 3, 1, 793 - warp_def 1, 6, 3, 1, 793 - warp_def 11, 5, 3, 8, 778 - warp_def 11, 6, 3, 8, 778 - -Route7_EastEntrance_MapCoordEvents: - coord_event 6, 4, 3, 0, 16482, 0, 0, Route7_EastEntrance_EventScript_16FA97 - coord_event 6, 5, 3, 0, 16482, 0, 0, Route7_EastEntrance_EventScript_16FAA3 - coord_event 6, 6, 3, 0, 16482, 0, 0, Route7_EastEntrance_EventScript_16FAAF - -Route7_EastEntrance_MapEvents:: - map_events Route7_EastEntrance_EventObjects, Route7_EastEntrance_MapWarps, Route7_EastEntrance_MapCoordEvents, 0x0 diff --git a/data/maps/Route7_EastEntrance/header.inc b/data/maps/Route7_EastEntrance/header.inc deleted file mode 100644 index 6ceaa940e..000000000 --- a/data/maps/Route7_EastEntrance/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route7_EastEntrance:: @ 8351878 - .4byte SaffronCity_EastWestEntrance_Layout @ 0x831EAD0 - .4byte Route7_EastEntrance_MapEvents @ 0x83BD7D4 - .4byte Route7_EastEntrance_MapScripts @ 0x816FA8D - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 209 - .byte 0x6b, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00 diff --git a/data/maps/Route7_EastEntrance/map.json b/data/maps/Route7_EastEntrance/map.json new file mode 100644 index 000000000..618183024 --- /dev/null +++ b/data/maps/Route7_EastEntrance/map.json @@ -0,0 +1,90 @@ +{ + "id": "MAP_ROUTE7_EAST_ENTRANCE", + "name": "Route7_EastEntrance", + "layout": "LAYOUT_SAFFRON_CITY_EAST_WEST_ENTRANCE", + "music": "BGM_FRLG_VIRIDIAN_CITY", + "region_map_section": "MAPSEC_ROUTE_7", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 1, + "unknown_19": 2, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "60", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route7_EastEntrance_EventScript_16FA8E", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 1, + "y": 5, + "elevation": 3, + "dest_map": "MAP_ROUTE7", + "dest_warp_id": 1 + }, + { + "x": 1, + "y": 6, + "elevation": 3, + "dest_map": "MAP_ROUTE7", + "dest_warp_id": 1 + }, + { + "x": 11, + "y": 5, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_warp_id": 8 + }, + { + "x": 11, + "y": 6, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_warp_id": 8 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 6, + "y": 4, + "elevation": 3, + "var": "VAR_0x4062", + "var_value": 0, + "script": "Route7_EastEntrance_EventScript_16FA97" + }, + { + "type": "trigger", + "x": 6, + "y": 5, + "elevation": 3, + "var": "VAR_0x4062", + "var_value": 0, + "script": "Route7_EastEntrance_EventScript_16FAA3" + }, + { + "type": "trigger", + "x": 6, + "y": 6, + "elevation": 3, + "var": "VAR_0x4062", + "var_value": 0, + "script": "Route7_EastEntrance_EventScript_16FAAF" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route8/connections.inc b/data/maps/Route8/connections.inc deleted file mode 100644 index 864cc0831..000000000 --- a/data/maps/Route8/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -Route8_MapConnectionsList: @ 8352ABC - connection left, -10, MAP_SAFFRON_CITY - connection right, 0, MAP_LAVENDER_TOWN - -Route8_MapConnections:: @ 8352AD4 - .4byte 2 - .4byte Route8_MapConnectionsList diff --git a/data/maps/Route8/events.inc b/data/maps/Route8/events.inc deleted file mode 100644 index 7492f0cda..000000000 --- a/data/maps/Route8/events.inc +++ /dev/null @@ -1,29 +0,0 @@ -Route8_EventObjects: - object_event 1, 22, 0, 62, 0, 14, 0, 3, 9, 17, 0, 1, 0, 6, 0, Route8_EventScript_1AA1D5, 0, 0, 0 - object_event 2, 32, 0, 55, 0, 15, 0, 3, 8, 17, 0, 1, 0, 3, 0, Route8_EventScript_1AA30B, 0, 0, 0 - object_event 3, 55, 0, 51, 0, 6, 0, 3, 1, 17, 0, 1, 0, 4, 0, Route8_EventScript_1AA251, 0, 0, 0 - object_event 4, 22, 0, 29, 0, 3, 0, 3, 9, 17, 0, 1, 0, 3, 0, Route8_EventScript_1AA11B, 0, 0, 0 - object_event 5, 55, 0, 29, 0, 4, 0, 3, 10, 17, 0, 1, 0, 6, 0, Route8_EventScript_1AA28F, 0, 0, 0 - object_event 6, 22, 0, 29, 0, 5, 0, 3, 9, 17, 0, 1, 0, 3, 0, Route8_EventScript_1AA159, 0, 0, 0 - object_event 7, 22, 0, 29, 0, 6, 0, 3, 10, 17, 0, 1, 0, 6, 0, Route8_EventScript_1AA197, 0, 0, 0 - object_event 8, 32, 0, 21, 0, 3, 0, 3, 1, 17, 0, 1, 0, 1, 0, Route8_EventScript_1AA2CD, 0, 0, 0 - object_event 9, 55, 0, 9, 0, 6, 0, 3, 10, 17, 0, 1, 0, 4, 0, Route8_EventScript_1AA213, 0, 0, 0 - object_event 10, 95, 0, 33, 0, 15, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route8_EventScript_1BDF13, 18, 0, 0 - object_event 11, 95, 0, 47, 0, 12, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route8_EventScript_1BDF13, 19, 0, 0 - object_event 12, 17, 0, 40, 0, 3, 0, 3, 8, 17, 0, 1, 0, 1, 0, Route8_EventScript_1AA349, 0, 0, 0 - object_event 13, 17, 0, 41, 0, 3, 0, 3, 8, 17, 0, 1, 0, 1, 0, Route8_EventScript_1AA38F, 0, 0, 0 - object_event 14, 53, 0, 14, 0, 16, 0, 3, 52, 37, 0, 1, 0, 1, 0, Route8_EventScript_1AA3D5, 0, 0, 0 - object_event 15, 53, 0, 24, 0, 17, 0, 3, 41, 85, 0, 1, 0, 1, 0, Route8_EventScript_1AA413, 0, 0, 0 - -Route8_MapWarps: - warp_def 13, 4, 0, 1, 291 - warp_def 7, 10, 3, 2, 5120 - -Route8_MapBGEvents: - bg_event 16, 5, 0, 0, 0, Route8_EventScript_167FC6 - bg_event 42, 10, 3, 7, 0, 136, 127, 1 - bg_event 38, 11, 3, 7, 0, 141, 128, 1 - bg_event 42, 15, 3, 7, 0, 138, 129, 1 - -Route8_MapEvents:: - map_events Route8_EventObjects, Route8_MapWarps, 0x0, Route8_MapBGEvents diff --git a/data/maps/Route8/header.inc b/data/maps/Route8/header.inc deleted file mode 100644 index b4b9bec8d..000000000 --- a/data/maps/Route8/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route8:: @ 83508F0 - .4byte Route8_Layout @ 0x82EA948 - .4byte Route8_MapEvents @ 0x83B6CB0 - .4byte Route8_MapScripts @ 0x8167FC5 - .4byte Route8_MapConnections @ 0x8352AD4 - .2byte BGM_FRLG_ROUTE_3 - .2byte 96 - .byte 0x6c, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/Route8/map.json b/data/maps/Route8/map.json new file mode 100644 index 000000000..cec23d53d --- /dev/null +++ b/data/maps/Route8/map.json @@ -0,0 +1,276 @@ +{ + "id": "MAP_ROUTE8", + "name": "Route8", + "layout": "LAYOUT_ROUTE8", + "music": "BGM_FRLG_ROUTE_3", + "region_map_section": "MAPSEC_ROUTE_8", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_SAFFRON_CITY", + "offset": -10, + "direction": "left" + }, + { + "map": "MAP_LAVENDER_TOWN", + "offset": 0, + "direction": "right" + } + ], + "object_events": [ + { + "graphics_id": "22", + "x": 62, + "y": 14, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "Route8_EventScript_1AA1D5", + "flag": "0" + }, + { + "graphics_id": "32", + "x": 55, + "y": 15, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route8_EventScript_1AA30B", + "flag": "0" + }, + { + "graphics_id": "55", + "x": 51, + "y": 6, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route8_EventScript_1AA251", + "flag": "0" + }, + { + "graphics_id": "22", + "x": 29, + "y": 3, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route8_EventScript_1AA11B", + "flag": "0" + }, + { + "graphics_id": "55", + "x": 29, + "y": 4, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "Route8_EventScript_1AA28F", + "flag": "0" + }, + { + "graphics_id": "22", + "x": 29, + "y": 5, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route8_EventScript_1AA159", + "flag": "0" + }, + { + "graphics_id": "22", + "x": 29, + "y": 6, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "Route8_EventScript_1AA197", + "flag": "0" + }, + { + "graphics_id": "32", + "x": 21, + "y": 3, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route8_EventScript_1AA2CD", + "flag": "0" + }, + { + "graphics_id": "55", + "x": 9, + "y": 6, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route8_EventScript_1AA213", + "flag": "0" + }, + { + "graphics_id": "95", + "x": 33, + "y": 15, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route8_EventScript_1BDF13", + "flag": "18" + }, + { + "graphics_id": "95", + "x": 47, + "y": 12, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route8_EventScript_1BDF13", + "flag": "19" + }, + { + "graphics_id": "17", + "x": 40, + "y": 3, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route8_EventScript_1AA349", + "flag": "0" + }, + { + "graphics_id": "17", + "x": 41, + "y": 3, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route8_EventScript_1AA38F", + "flag": "0" + }, + { + "graphics_id": "53", + "x": 14, + "y": 16, + "elevation": 3, + "movement_type": "52", + "movement_range_x": 5, + "movement_range_y": 2, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route8_EventScript_1AA3D5", + "flag": "0" + }, + { + "graphics_id": "53", + "x": 24, + "y": 17, + "elevation": 3, + "movement_type": "41", + "movement_range_x": 5, + "movement_range_y": 5, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route8_EventScript_1AA413", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 13, + "y": 4, + "elevation": 0, + "dest_map": "MAP_UNDERGROUND_PATH_EAST_ENTRANCE", + "dest_warp_id": 1 + }, + { + "x": 7, + "y": 10, + "elevation": 3, + "dest_map": "MAP_ROUTE8_WEST_ENTRANCE", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 16, + "y": 5, + "elevation": 0, + "script": "Route8_EventScript_167FC6" + }, + { + "type": "hidden_item", + "x": 42, + "y": 10, + "elevation": 3, + "item": "ITEM_RAWST_BERRY", + "flag": "127", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 38, + "y": 11, + "elevation": 3, + "item": "ITEM_LUM_BERRY", + "flag": "128", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 42, + "y": 15, + "elevation": 3, + "item": "ITEM_LEPPA_BERRY", + "flag": "129", + "unknown": 1 + } + ] +} \ No newline at end of file diff --git a/data/maps/Route8_WestEntrance/events.inc b/data/maps/Route8_WestEntrance/events.inc deleted file mode 100644 index 1352ddb0c..000000000 --- a/data/maps/Route8_WestEntrance/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -Route8_WestEntrance_EventObjects: - object_event 1, 60, 0, 6, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route8_WestEntrance_EventScript_16FB54, 0, 0, 0 - -Route8_WestEntrance_MapWarps: - warp_def 1, 4, 3, 10, 778 - warp_def 1, 5, 3, 10, 778 - warp_def 11, 5, 3, 1, 794 - warp_def 11, 6, 3, 1, 794 - -Route8_WestEntrance_MapCoordEvents: - coord_event 6, 4, 3, 0, 16482, 0, 0, Route8_WestEntrance_EventScript_16FB5D - coord_event 6, 5, 3, 0, 16482, 0, 0, Route8_WestEntrance_EventScript_16FB69 - coord_event 6, 6, 3, 0, 16482, 0, 0, Route8_WestEntrance_EventScript_16FB75 - -Route8_WestEntrance_MapEvents:: - map_events Route8_WestEntrance_EventObjects, Route8_WestEntrance_MapWarps, Route8_WestEntrance_MapCoordEvents, 0x0 diff --git a/data/maps/Route8_WestEntrance/header.inc b/data/maps/Route8_WestEntrance/header.inc deleted file mode 100644 index 400f52c1c..000000000 --- a/data/maps/Route8_WestEntrance/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route8_WestEntrance:: @ 8351894 - .4byte SaffronCity_EastWestEntrance_Layout @ 0x831EAD0 - .4byte Route8_WestEntrance_MapEvents @ 0x83BD850 - .4byte Route8_WestEntrance_MapScripts @ 0x816FB53 - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 209 - .byte 0x6c, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00 diff --git a/data/maps/Route8_WestEntrance/map.json b/data/maps/Route8_WestEntrance/map.json new file mode 100644 index 000000000..d46acda0f --- /dev/null +++ b/data/maps/Route8_WestEntrance/map.json @@ -0,0 +1,90 @@ +{ + "id": "MAP_ROUTE8_WEST_ENTRANCE", + "name": "Route8_WestEntrance", + "layout": "LAYOUT_SAFFRON_CITY_EAST_WEST_ENTRANCE", + "music": "BGM_FRLG_VIRIDIAN_CITY", + "region_map_section": "MAPSEC_ROUTE_8", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 1, + "unknown_19": 2, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "60", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route8_WestEntrance_EventScript_16FB54", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 1, + "y": 4, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_warp_id": 10 + }, + { + "x": 1, + "y": 5, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_warp_id": 10 + }, + { + "x": 11, + "y": 5, + "elevation": 3, + "dest_map": "MAP_ROUTE8", + "dest_warp_id": 1 + }, + { + "x": 11, + "y": 6, + "elevation": 3, + "dest_map": "MAP_ROUTE8", + "dest_warp_id": 1 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 6, + "y": 4, + "elevation": 3, + "var": "VAR_0x4062", + "var_value": 0, + "script": "Route8_WestEntrance_EventScript_16FB5D" + }, + { + "type": "trigger", + "x": 6, + "y": 5, + "elevation": 3, + "var": "VAR_0x4062", + "var_value": 0, + "script": "Route8_WestEntrance_EventScript_16FB69" + }, + { + "type": "trigger", + "x": 6, + "y": 6, + "elevation": 3, + "var": "VAR_0x4062", + "var_value": 0, + "script": "Route8_WestEntrance_EventScript_16FB75" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route9/connections.inc b/data/maps/Route9/connections.inc deleted file mode 100644 index 6e4cb62e2..000000000 --- a/data/maps/Route9/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -Route9_MapConnectionsList: @ 8352ADC - connection left, -10, MAP_CERULEAN_CITY - connection right, 0, MAP_ROUTE10 - -Route9_MapConnections:: @ 8352AF4 - .4byte 2 - .4byte Route9_MapConnectionsList diff --git a/data/maps/Route9/events.inc b/data/maps/Route9/events.inc deleted file mode 100644 index 3e027e71b..000000000 --- a/data/maps/Route9/events.inc +++ /dev/null @@ -1,22 +0,0 @@ -Route9_EventObjects: - object_event 1, 40, 0, 14, 0, 10, 0, 3, 9, 17, 0, 1, 0, 3, 0, Route9_EventScript_1A9E71, 0, 0, 0 - object_event 2, 56, 0, 20, 0, 17, 0, 3, 15, 17, 0, 1, 0, 4, 0, Route9_EventScript_1A9F69, 0, 0, 0 - object_event 3, 56, 0, 61, 0, 16, 0, 3, 8, 17, 0, 1, 0, 1, 0, Route9_EventScript_1A9EED, 0, 0, 0 - object_event 4, 39, 0, 26, 0, 7, 0, 3, 1, 17, 0, 1, 0, 3, 0, Route9_EventScript_1A9DF5, 0, 0, 0 - object_event 5, 20, 0, 26, 0, 1, 0, 3, 8, 17, 0, 1, 0, 2, 0, Route9_EventScript_1A9D79, 0, 0, 0 - object_event 6, 20, 0, 49, 0, 7, 0, 3, 10, 17, 0, 1, 0, 3, 0, Route9_EventScript_1A9DB7, 0, 0, 0 - object_event 7, 56, 0, 53, 0, 2, 0, 3, 5, 19, 0, 1, 0, 1, 0, Route9_EventScript_1A9F2B, 0, 0, 0 - object_event 8, 40, 0, 60, 0, 9, 0, 3, 10, 17, 0, 1, 0, 4, 0, Route9_EventScript_1A9EAF, 0, 0, 0 - object_event 9, 39, 0, 36, 0, 6, 0, 3, 10, 17, 0, 1, 0, 5, 0, Route9_EventScript_1A9E33, 0, 0, 0 - object_event 10, 95, 0, 2, 0, 8, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route9_EventScript_1BDF13, 18, 0, 0 - object_event 11, 92, 0, 12, 0, 17, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route9_EventScript_1BE6B9, 363, 0, 0 - object_event 12, 92, 0, 65, 0, 17, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route9_EventScript_1BEAFD, 450, 0, 0 - -Route9_MapBGEvents: - bg_event 29, 7, 0, 0, 0, Route9_EventScript_167FD0 - bg_event 15, 7, 0, 7, 0, 34, 6, 1 - bg_event 63, 2, 3, 7, 0, 68, 123, 1 - bg_event 48, 2, 3, 7, 0, 134, 150, 1 - -Route9_MapEvents:: - map_events Route9_EventObjects, 0x0, 0x0, Route9_MapBGEvents diff --git a/data/maps/Route9/header.inc b/data/maps/Route9/header.inc deleted file mode 100644 index 0066c2e2f..000000000 --- a/data/maps/Route9/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route9:: @ 835090C - .4byte Route9_Layout @ 0x82EB4AC - .4byte Route9_MapEvents @ 0x83B6E14 - .4byte Route9_MapScripts @ 0x8167FCF - .4byte Route9_MapConnections @ 0x8352AF4 - .2byte BGM_FRLG_ROUTE_3 - .2byte 97 - .byte 0x6d, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/Route9/map.json b/data/maps/Route9/map.json new file mode 100644 index 000000000..72877fc69 --- /dev/null +++ b/data/maps/Route9/map.json @@ -0,0 +1,222 @@ +{ + "id": "MAP_ROUTE9", + "name": "Route9", + "layout": "LAYOUT_ROUTE9", + "music": "BGM_FRLG_ROUTE_3", + "region_map_section": "MAPSEC_ROUTE_9", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_CERULEAN_CITY", + "offset": -10, + "direction": "left" + }, + { + "map": "MAP_ROUTE10", + "offset": 0, + "direction": "right" + } + ], + "object_events": [ + { + "graphics_id": "40", + "x": 14, + "y": 10, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route9_EventScript_1A9E71", + "flag": "0" + }, + { + "graphics_id": "56", + "x": 20, + "y": 17, + "elevation": 3, + "movement_type": "15", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route9_EventScript_1A9F69", + "flag": "0" + }, + { + "graphics_id": "56", + "x": 61, + "y": 16, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route9_EventScript_1A9EED", + "flag": "0" + }, + { + "graphics_id": "39", + "x": 26, + "y": 7, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route9_EventScript_1A9DF5", + "flag": "0" + }, + { + "graphics_id": "20", + "x": 26, + "y": 1, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route9_EventScript_1A9D79", + "flag": "0" + }, + { + "graphics_id": "20", + "x": 49, + "y": 7, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route9_EventScript_1A9DB7", + "flag": "0" + }, + { + "graphics_id": "56", + "x": 53, + "y": 2, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 3, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route9_EventScript_1A9F2B", + "flag": "0" + }, + { + "graphics_id": "40", + "x": 60, + "y": 9, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route9_EventScript_1A9EAF", + "flag": "0" + }, + { + "graphics_id": "39", + "x": 36, + "y": 6, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route9_EventScript_1A9E33", + "flag": "0" + }, + { + "graphics_id": "95", + "x": 2, + "y": 8, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route9_EventScript_1BDF13", + "flag": "18" + }, + { + "graphics_id": "92", + "x": 12, + "y": 17, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route9_EventScript_1BE6B9", + "flag": "363" + }, + { + "graphics_id": "92", + "x": 65, + "y": 17, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route9_EventScript_1BEAFD", + "flag": "450" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 29, + "y": 7, + "elevation": 0, + "script": "Route9_EventScript_167FD0" + }, + { + "type": "hidden_item", + "x": 15, + "y": 7, + "elevation": 0, + "item": "ITEM_ETHER", + "flag": "6", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 63, + "y": 2, + "elevation": 3, + "item": "ITEM_RARE_CANDY", + "flag": "123", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 48, + "y": 2, + "elevation": 3, + "item": "ITEM_CHESTO_BERRY", + "flag": "150", + "unknown": 1 + } + ] +} \ No newline at end of file diff --git a/data/maps/SSAnne_1F_Corridor/events.inc b/data/maps/SSAnne_1F_Corridor/events.inc deleted file mode 100644 index b14b6eb29..000000000 --- a/data/maps/SSAnne_1F_Corridor/events.inc +++ /dev/null @@ -1,21 +0,0 @@ -SSAnne_1F_Corridor_EventObjects: - object_event 1, 62, 0, 18, 0, 8, 0, 3, 7, 17, 0, 0, 0, 0, 0, SSAnne_1F_Corridor_EventScript_1608D5, 0, 0, 0 - object_event 2, 47, 0, 12, 0, 9, 0, 3, 8, 17, 0, 0, 0, 0, 0, SSAnne_1F_Corridor_EventScript_1608CC, 0, 0, 0 - -SSAnne_1F_Corridor_MapWarps: - warp_def 3, 8, 3, 0, 262 - warp_def 2, 18, 3, 0, 266 - warp_def 19, 1, 3, 2, 260 - warp_def 20, 0, 0, 3, 260 - warp_def 3, 20, 0, 0, 266 - warp_def 28, 17, 3, 0, 264 - warp_def 5, 10, 3, 0, 268 - warp_def 8, 10, 3, 0, 269 - warp_def 11, 10, 3, 0, 270 - warp_def 14, 10, 3, 0, 271 - warp_def 17, 10, 3, 0, 272 - warp_def 23, 10, 3, 0, 273 - warp_def 20, 10, 3, 0, 285 - -SSAnne_1F_Corridor_MapEvents:: - map_events SSAnne_1F_Corridor_EventObjects, SSAnne_1F_Corridor_MapWarps, 0x0, 0x0 diff --git a/data/maps/SSAnne_1F_Corridor/header.inc b/data/maps/SSAnne_1F_Corridor/header.inc deleted file mode 100644 index 120c6e9b0..000000000 --- a/data/maps/SSAnne_1F_Corridor/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne_1F_Corridor:: @ 834F2A0 - .4byte SSAnne_1F_Corridor_Layout @ 0x82FFB4C - .4byte SSAnne_1F_Corridor_MapEvents @ 0x83AE974 - .4byte SSAnne_1F_Corridor_MapScripts @ 0x81608CB - .4byte NULL - .2byte BGM_FRLG_SS_ANNE - .2byte 119 - .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/SSAnne_1F_Corridor/map.json b/data/maps/SSAnne_1F_Corridor/map.json new file mode 100644 index 000000000..864ebe0dd --- /dev/null +++ b/data/maps/SSAnne_1F_Corridor/map.json @@ -0,0 +1,138 @@ +{ + "id": "MAP_SSANNE_1F_CORRIDOR", + "name": "SSAnne_1F_Corridor", + "layout": "LAYOUT_SSANNE_1F_CORRIDOR", + "music": "BGM_FRLG_SS_ANNE", + "region_map_section": "MAPSEC_S_S_ANNE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "62", + "x": 18, + "y": 8, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_1F_Corridor_EventScript_1608D5", + "flag": "0" + }, + { + "graphics_id": "47", + "x": 12, + "y": 9, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_1F_Corridor_EventScript_1608CC", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 8, + "elevation": 3, + "dest_map": "MAP_SSANNE_2F_CORRIDOR", + "dest_warp_id": 0 + }, + { + "x": 2, + "y": 18, + "elevation": 3, + "dest_map": "MAP_SSANNE_KITCHEN", + "dest_warp_id": 0 + }, + { + "x": 19, + "y": 1, + "elevation": 3, + "dest_map": "MAP_SSANNE_EXTERIOR", + "dest_warp_id": 2 + }, + { + "x": 20, + "y": 0, + "elevation": 0, + "dest_map": "MAP_SSANNE_EXTERIOR", + "dest_warp_id": 3 + }, + { + "x": 3, + "y": 20, + "elevation": 0, + "dest_map": "MAP_SSANNE_KITCHEN", + "dest_warp_id": 0 + }, + { + "x": 28, + "y": 17, + "elevation": 3, + "dest_map": "MAP_SSANNE_B1F_CORRIDOR", + "dest_warp_id": 0 + }, + { + "x": 5, + "y": 10, + "elevation": 3, + "dest_map": "MAP_SSANNE_1F_ROOM1", + "dest_warp_id": 0 + }, + { + "x": 8, + "y": 10, + "elevation": 3, + "dest_map": "MAP_SSANNE_1F_ROOM2", + "dest_warp_id": 0 + }, + { + "x": 11, + "y": 10, + "elevation": 3, + "dest_map": "MAP_SSANNE_1F_ROOM3", + "dest_warp_id": 0 + }, + { + "x": 14, + "y": 10, + "elevation": 3, + "dest_map": "MAP_SSANNE_1F_ROOM4", + "dest_warp_id": 0 + }, + { + "x": 17, + "y": 10, + "elevation": 3, + "dest_map": "MAP_SSANNE_1F_ROOM5", + "dest_warp_id": 0 + }, + { + "x": 23, + "y": 10, + "elevation": 3, + "dest_map": "MAP_SSANNE_1F_ROOM7", + "dest_warp_id": 0 + }, + { + "x": 20, + "y": 10, + "elevation": 3, + "dest_map": "MAP_SSANNE_1F_ROOM6", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SSAnne_1F_Room1/events.inc b/data/maps/SSAnne_1F_Room1/events.inc deleted file mode 100644 index d4a52f794..000000000 --- a/data/maps/SSAnne_1F_Room1/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne_1F_Room1_EventObjects: - object_event 1, 61, 0, 2, 0, 5, 0, 3, 5, 18, 0, 0, 0, 0, 0, SSAnne_1F_Room1_EventScript_160BDC, 0, 0, 0 - -SSAnne_1F_Room1_MapWarps: - warp_def 2, 1, 0, 6, 261 - -SSAnne_1F_Room1_MapEvents:: - map_events SSAnne_1F_Room1_EventObjects, SSAnne_1F_Room1_MapWarps, 0x0, 0x0 diff --git a/data/maps/SSAnne_1F_Room1/header.inc b/data/maps/SSAnne_1F_Room1/header.inc deleted file mode 100644 index dfe367802..000000000 --- a/data/maps/SSAnne_1F_Room1/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne_1F_Room1:: @ 834F364 - .4byte SSAnne_Room1_Layout @ 0x8319E74 - .4byte SSAnne_1F_Room1_MapEvents @ 0x83AECEC - .4byte SSAnne_1F_Room1_MapScripts @ 0x8160BDB - .4byte NULL - .2byte BGM_FRLG_SS_ANNE - .2byte 177 - .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/SSAnne_1F_Room1/map.json b/data/maps/SSAnne_1F_Room1/map.json new file mode 100644 index 000000000..e83821225 --- /dev/null +++ b/data/maps/SSAnne_1F_Room1/map.json @@ -0,0 +1,41 @@ +{ + "id": "MAP_SSANNE_1F_ROOM1", + "name": "SSAnne_1F_Room1", + "layout": "LAYOUT_SSANNE_ROOM1", + "music": "BGM_FRLG_SS_ANNE", + "region_map_section": "MAPSEC_S_S_ANNE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "61", + "x": 2, + "y": 5, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_1F_Room1_EventScript_160BDC", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 2, + "y": 1, + "elevation": 0, + "dest_map": "MAP_SSANNE_1F_CORRIDOR", + "dest_warp_id": 6 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SSAnne_1F_Room11/events.inc b/data/maps/SSAnne_1F_Room11/events.inc deleted file mode 100644 index eb4cf4b37..000000000 --- a/data/maps/SSAnne_1F_Room11/events.inc +++ /dev/null @@ -1,24 +0,0 @@ -SSAnne_1F_Room11_EventObjects: - object_event 1, 28, 0, 48, 0, 15, 0, 3, 20, 17, 0, 1, 0, 3, 0, SSAnne_1F_Room11_EventScript_164590, 0, 0, 0 - object_event 2, 28, 0, 10, 0, 5, 0, 3, 18, 17, 0, 1, 0, 2, 0, SSAnne_1F_Room11_EventScript_1645A7, 0, 0, 0 - object_event 3, 20, 0, 51, 0, 6, 0, 3, 8, 17, 0, 1, 0, 2, 0, SSAnne_1F_Room11_EventScript_1645BE, 0, 0, 0 - object_event 4, 20, 0, 12, 0, 13, 0, 3, 2, 33, 0, 1, 0, 2, 0, SSAnne_1F_Room11_EventScript_1645D5, 0, 0, 0 - object_event 5, 20, 0, 37, 0, 23, 0, 3, 51, 82, 0, 1, 0, 1, 0, SSAnne_1F_Room11_EventScript_1645EC, 0, 0, 0 - object_event 6, 18, 0, 32, 0, 5, 0, 3, 8, 17, 0, 1, 0, 2, 0, SSAnne_1F_Room11_EventScript_164603, 0, 0, 0 - object_event 7, 18, 0, 52, 0, 20, 0, 3, 10, 17, 0, 1, 0, 4, 0, SSAnne_1F_Room11_EventScript_16461A, 0, 0, 0 - object_event 8, 22, 0, 8, 0, 21, 0, 3, 17, 17, 0, 1, 0, 5, 0, SSAnne_1F_Room11_EventScript_164631, 0, 0, 0 - object_event 9, 22, 0, 39, 0, 6, 0, 3, 2, 17, 0, 1, 0, 3, 0, SSAnne_1F_Room11_EventScript_164648, 0, 0, 0 - object_event 10, 39, 0, 3, 0, 9, 0, 3, 3, 33, 0, 1, 0, 3, 0, SSAnne_1F_Room11_EventScript_16465F, 0, 0, 0 - object_event 11, 40, 0, 19, 0, 24, 0, 3, 28, 21, 0, 1, 0, 1, 0, SSAnne_1F_Room11_EventScript_164676, 0, 0, 0 - object_event 12, 56, 0, 30, 0, 19, 0, 3, 7, 17, 0, 1, 0, 3, 0, SSAnne_1F_Room11_EventScript_16468D, 0, 0, 0 - -SSAnne_1F_Room11_MapWarps: - warp_def 54, 26, 3, 0, 827 - warp_def 55, 26, 3, 0, 827 - warp_def 56, 26, 3, 1, 827 - warp_def 3, 26, 3, 2, 827 - warp_def 4, 26, 3, 2, 827 - warp_def 5, 26, 3, 3, 827 - -SSAnne_1F_Room11_MapEvents:: - map_events SSAnne_1F_Room11_EventObjects, SSAnne_1F_Room11_MapWarps, 0x0, 0x0 diff --git a/data/maps/SSAnne_1F_Room11/header.inc b/data/maps/SSAnne_1F_Room11/header.inc deleted file mode 100644 index b7daaaf24..000000000 --- a/data/maps/SSAnne_1F_Room11/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne_1F_Room11:: @ 834FF50 - .4byte SSAnne_1F_Room11_Layout @ 0x8345030 - .4byte SSAnne_1F_Room11_MapEvents @ 0x83B3B34 - .4byte SSAnne_1F_Room11_MapScripts @ 0x8164559 - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_FOREST - .2byte 317 - .byte 0xb6, 0x00, 0x00, 0x03, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/SSAnne_1F_Room11/scripts.inc b/data/maps/SSAnne_1F_Room11/scripts.inc deleted file mode 100644 index 35696cb68..000000000 --- a/data/maps/SSAnne_1F_Room11/scripts.inc +++ /dev/null @@ -1,92 +0,0 @@ -SSAnne_1F_Room11_MapScripts:: @ 8164559 - map_script 3, SSAnne_1F_Room11_MapScript1_16455F - .byte 0 - -SSAnne_1F_Room11_MapScript1_16455F:: @ 816455F - setworldmapflag 2237 - getplayerxy VAR_0x4001, VAR_0x4002 - compare_var_to_value VAR_0x4001, 50 - call_if 4, EventScript_16457E - compare_var_to_value VAR_0x4001, 49 - call_if 3, EventScript_164587 - end - -EventScript_16457E:: @ 816457E - setescapewarp MAP_SIX_ISLAND_GREENPATH, 255, 64, 10 - return - -EventScript_164587:: @ 8164587 - setescapewarp MAP_SIX_ISLAND_GREENPATH, 255, 45, 10 - return - -SSAnne_1F_Room11_EventScript_164590:: @ 8164590 - trainerbattle 0, 609, 0, Text_17BF3A, Text_17BF66 - loadword 0, gUnknown_817BF97 - callstd 6 - end - -SSAnne_1F_Room11_EventScript_1645A7:: @ 81645A7 - trainerbattle 0, 610, 0, Text_17BFEB, Text_17C028 - loadword 0, gUnknown_817C056 - callstd 6 - end - -SSAnne_1F_Room11_EventScript_1645BE:: @ 81645BE - trainerbattle 0, 611, 0, Text_17C0BE, Text_17C0F2 - loadword 0, gUnknown_817C113 - callstd 6 - end - -SSAnne_1F_Room11_EventScript_1645D5:: @ 81645D5 - trainerbattle 0, 612, 0, Text_17C155, Text_17C196 - loadword 0, gUnknown_817C1D0 - callstd 6 - end - -SSAnne_1F_Room11_EventScript_1645EC:: @ 81645EC - trainerbattle 0, 613, 0, Text_17C246, Text_17C275 - loadword 0, gUnknown_817C2A4 - callstd 6 - end - -SSAnne_1F_Room11_EventScript_164603:: @ 8164603 - trainerbattle 0, 614, 0, Text_17C2D9, Text_17C30D - loadword 0, gUnknown_817C31C - callstd 6 - end - -SSAnne_1F_Room11_EventScript_16461A:: @ 816461A - trainerbattle 0, 615, 0, Text_17C373, Text_17C3A5 - loadword 0, gUnknown_817C3CE - callstd 6 - end - -SSAnne_1F_Room11_EventScript_164631:: @ 8164631 - trainerbattle 0, 616, 0, Text_17C42B, Text_17C458 - loadword 0, gUnknown_817C490 - callstd 6 - end - -SSAnne_1F_Room11_EventScript_164648:: @ 8164648 - trainerbattle 0, 617, 0, Text_17C4FE, Text_17C552 - loadword 0, gUnknown_817C590 - callstd 6 - end - -SSAnne_1F_Room11_EventScript_16465F:: @ 816465F - trainerbattle 0, 618, 0, Text_17C5DB, Text_17C609 - loadword 0, gUnknown_817C615 - callstd 6 - end - -SSAnne_1F_Room11_EventScript_164676:: @ 8164676 - trainerbattle 0, 619, 0, Text_17C63E, Text_17C660 - loadword 0, gUnknown_817C68E - callstd 6 - end - -SSAnne_1F_Room11_EventScript_16468D:: @ 816468D - trainerbattle 0, 620, 0, Text_17C6C9, Text_17C6FB - loadword 0, gUnknown_817C728 - callstd 6 - end diff --git a/data/maps/SSAnne_1F_Room12/events.inc b/data/maps/SSAnne_1F_Room12/events.inc deleted file mode 100644 index b6bafe7e3..000000000 --- a/data/maps/SSAnne_1F_Room12/events.inc +++ /dev/null @@ -1,5 +0,0 @@ -SSAnne_1F_Room12_MapWarps: - warp_def 18, 22, 3, 0, 826 - -SSAnne_1F_Room12_MapEvents:: - map_events 0x0, SSAnne_1F_Room12_MapWarps, 0x0, 0x0 diff --git a/data/maps/SSAnne_1F_Room12/header.inc b/data/maps/SSAnne_1F_Room12/header.inc deleted file mode 100644 index 067d21360..000000000 --- a/data/maps/SSAnne_1F_Room12/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne_1F_Room12:: @ 834FF6C - .4byte SSAnne_1F_Room12_Layout @ 0x8347A50 - .4byte SSAnne_1F_Room12_MapEvents @ 0x83B3B50 - .4byte SSAnne_1F_Room12_MapScripts @ 0x81646A4 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 340 - .byte 0xb7, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/SSAnne_1F_Room12/scripts.inc b/data/maps/SSAnne_1F_Room12/scripts.inc deleted file mode 100644 index 5f52018d8..000000000 --- a/data/maps/SSAnne_1F_Room12/scripts.inc +++ /dev/null @@ -1,7 +0,0 @@ -SSAnne_1F_Room12_MapScripts:: @ 81646A4 - map_script 3, SSAnne_1F_Room12_MapScript1_1646AA - .byte 0 - -SSAnne_1F_Room12_MapScript1_1646AA:: @ 81646AA - setworldmapflag 2238 - end diff --git a/data/maps/SSAnne_1F_Room2/events.inc b/data/maps/SSAnne_1F_Room2/events.inc deleted file mode 100644 index 72afcb7d2..000000000 --- a/data/maps/SSAnne_1F_Room2/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -SSAnne_1F_Room2_EventObjects: - object_event 1, 22, 0, 5, 0, 3, 0, 3, 17, 17, 0, 1, 0, 2, 0, SSAnne_1F_Room2_EventScript_160BEF, 0, 0, 0 - object_event 2, 18, 0, 0, 0, 4, 0, 3, 10, 17, 0, 1, 0, 3, 0, SSAnne_1F_Room2_EventScript_160C06, 0, 0, 0 - object_event 3, 28, 0, 2, 0, 6, 0, 3, 9, 17, 0, 0, 0, 1, 0, SSAnne_1F_Room2_EventScript_160BE6, 0, 0, 0 - object_event 4, 92, 0, 5, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, SSAnne_1F_Room2_EventScript_1BE65E, 356, 0, 0 - -SSAnne_1F_Room2_MapWarps: - warp_def 2, 1, 0, 7, 261 - -SSAnne_1F_Room2_MapEvents:: - map_events SSAnne_1F_Room2_EventObjects, SSAnne_1F_Room2_MapWarps, 0x0, 0x0 diff --git a/data/maps/SSAnne_1F_Room2/header.inc b/data/maps/SSAnne_1F_Room2/header.inc deleted file mode 100644 index 051f27424..000000000 --- a/data/maps/SSAnne_1F_Room2/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne_1F_Room2:: @ 834F380 - .4byte SSAnne_Room1_Layout @ 0x8319E74 - .4byte SSAnne_1F_Room2_MapEvents @ 0x83AED68 - .4byte SSAnne_1F_Room2_MapScripts @ 0x8160BE5 - .4byte NULL - .2byte BGM_FRLG_SS_ANNE - .2byte 177 - .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/SSAnne_1F_Room2/map.json b/data/maps/SSAnne_1F_Room2/map.json new file mode 100644 index 000000000..4649e12ca --- /dev/null +++ b/data/maps/SSAnne_1F_Room2/map.json @@ -0,0 +1,80 @@ +{ + "id": "MAP_SSANNE_1F_ROOM2", + "name": "SSAnne_1F_Room2", + "layout": "LAYOUT_SSANNE_ROOM1", + "music": "BGM_FRLG_SS_ANNE", + "region_map_section": "MAPSEC_S_S_ANNE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "22", + "x": 5, + "y": 3, + "elevation": 3, + "movement_type": "17", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "SSAnne_1F_Room2_EventScript_160BEF", + "flag": "0" + }, + { + "graphics_id": "18", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SSAnne_1F_Room2_EventScript_160C06", + "flag": "0" + }, + { + "graphics_id": "28", + "x": 2, + "y": 6, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 1, + "script": "SSAnne_1F_Room2_EventScript_160BE6", + "flag": "0" + }, + { + "graphics_id": "92", + "x": 5, + "y": 7, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_1F_Room2_EventScript_1BE65E", + "flag": "356" + } + ], + "warp_events": [ + { + "x": 2, + "y": 1, + "elevation": 0, + "dest_map": "MAP_SSANNE_1F_CORRIDOR", + "dest_warp_id": 7 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SSAnne_1F_Room3/events.inc b/data/maps/SSAnne_1F_Room3/events.inc deleted file mode 100644 index 47565243b..000000000 --- a/data/maps/SSAnne_1F_Room3/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -SSAnne_1F_Room3_EventObjects: - object_event 1, 17, 0, 3, 0, 4, 0, 3, 52, 50, 0, 0, 0, 0, 0, SSAnne_1F_Room3_EventScript_160C1E, 0, 0, 0 - object_event 2, 131, 0, 4, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, SSAnne_1F_Room3_EventScript_160C30, 0, 0, 0 - object_event 3, 30, 0, 0, 0, 4, 0, 3, 10, 17, 0, 0, 0, 0, 0, SSAnne_1F_Room3_EventScript_160C27, 0, 0, 0 - -SSAnne_1F_Room3_MapWarps: - warp_def 2, 1, 0, 8, 261 - -SSAnne_1F_Room3_MapEvents:: - map_events SSAnne_1F_Room3_EventObjects, SSAnne_1F_Room3_MapWarps, 0x0, 0x0 diff --git a/data/maps/SSAnne_1F_Room3/header.inc b/data/maps/SSAnne_1F_Room3/header.inc deleted file mode 100644 index 0240062db..000000000 --- a/data/maps/SSAnne_1F_Room3/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne_1F_Room3:: @ 834F39C - .4byte SSAnne_Room1_Layout @ 0x8319E74 - .4byte SSAnne_1F_Room3_MapEvents @ 0x83AEDCC - .4byte SSAnne_1F_Room3_MapScripts @ 0x8160C1D - .4byte NULL - .2byte BGM_FRLG_SS_ANNE - .2byte 177 - .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/SSAnne_1F_Room3/map.json b/data/maps/SSAnne_1F_Room3/map.json new file mode 100644 index 000000000..b47bf6ddd --- /dev/null +++ b/data/maps/SSAnne_1F_Room3/map.json @@ -0,0 +1,67 @@ +{ + "id": "MAP_SSANNE_1F_ROOM3", + "name": "SSAnne_1F_Room3", + "layout": "LAYOUT_SSANNE_ROOM1", + "music": "BGM_FRLG_SS_ANNE", + "region_map_section": "MAPSEC_S_S_ANNE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "17", + "x": 3, + "y": 4, + "elevation": 3, + "movement_type": "52", + "movement_range_x": 2, + "movement_range_y": 3, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_1F_Room3_EventScript_160C1E", + "flag": "0" + }, + { + "graphics_id": "131", + "x": 4, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_1F_Room3_EventScript_160C30", + "flag": "0" + }, + { + "graphics_id": "30", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_1F_Room3_EventScript_160C27", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 2, + "y": 1, + "elevation": 0, + "dest_map": "MAP_SSANNE_1F_CORRIDOR", + "dest_warp_id": 8 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SSAnne_1F_Room4/events.inc b/data/maps/SSAnne_1F_Room4/events.inc deleted file mode 100644 index 45969a0a8..000000000 --- a/data/maps/SSAnne_1F_Room4/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne_1F_Room4_EventObjects: - object_event 1, 23, 0, 2, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, SSAnne_1F_Room4_EventScript_160C44, 0, 0, 0 - -SSAnne_1F_Room4_MapWarps: - warp_def 2, 1, 0, 9, 261 - -SSAnne_1F_Room4_MapEvents:: - map_events SSAnne_1F_Room4_EventObjects, SSAnne_1F_Room4_MapWarps, 0x0, 0x0 diff --git a/data/maps/SSAnne_1F_Room4/header.inc b/data/maps/SSAnne_1F_Room4/header.inc deleted file mode 100644 index 18b679d2c..000000000 --- a/data/maps/SSAnne_1F_Room4/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne_1F_Room4:: @ 834F3B8 - .4byte SSAnne_Room1_Layout @ 0x8319E74 - .4byte SSAnne_1F_Room4_MapEvents @ 0x83AEE00 - .4byte SSAnne_1F_Room4_MapScripts @ 0x8160C43 - .4byte NULL - .2byte BGM_FRLG_SS_ANNE - .2byte 177 - .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/SSAnne_1F_Room4/map.json b/data/maps/SSAnne_1F_Room4/map.json new file mode 100644 index 000000000..4a4c62769 --- /dev/null +++ b/data/maps/SSAnne_1F_Room4/map.json @@ -0,0 +1,41 @@ +{ + "id": "MAP_SSANNE_1F_ROOM4", + "name": "SSAnne_1F_Room4", + "layout": "LAYOUT_SSANNE_ROOM1", + "music": "BGM_FRLG_SS_ANNE", + "region_map_section": "MAPSEC_S_S_ANNE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "23", + "x": 2, + "y": 4, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_1F_Room4_EventScript_160C44", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 2, + "y": 1, + "elevation": 0, + "dest_map": "MAP_SSANNE_1F_CORRIDOR", + "dest_warp_id": 9 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SSAnne_1F_Room5/events.inc b/data/maps/SSAnne_1F_Room5/events.inc deleted file mode 100644 index 214544b3c..000000000 --- a/data/maps/SSAnne_1F_Room5/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne_1F_Room5_EventObjects: - object_event 1, 61, 0, 2, 0, 6, 0, 3, 7, 17, 0, 1, 0, 4, 0, SSAnne_1F_Room5_EventScript_160C67, 0, 0, 0 - -SSAnne_1F_Room5_MapWarps: - warp_def 2, 1, 0, 10, 261 - -SSAnne_1F_Room5_MapEvents:: - map_events SSAnne_1F_Room5_EventObjects, SSAnne_1F_Room5_MapWarps, 0x0, 0x0 diff --git a/data/maps/SSAnne_1F_Room5/header.inc b/data/maps/SSAnne_1F_Room5/header.inc deleted file mode 100644 index c9e14fcab..000000000 --- a/data/maps/SSAnne_1F_Room5/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne_1F_Room5:: @ 834F3D4 - .4byte SSAnne_Room1_Layout @ 0x8319E74 - .4byte SSAnne_1F_Room5_MapEvents @ 0x83AEE34 - .4byte SSAnne_1F_Room5_MapScripts @ 0x8160C66 - .4byte NULL - .2byte BGM_FRLG_SS_ANNE - .2byte 177 - .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/SSAnne_1F_Room5/map.json b/data/maps/SSAnne_1F_Room5/map.json new file mode 100644 index 000000000..d7d2eb16f --- /dev/null +++ b/data/maps/SSAnne_1F_Room5/map.json @@ -0,0 +1,41 @@ +{ + "id": "MAP_SSANNE_1F_ROOM5", + "name": "SSAnne_1F_Room5", + "layout": "LAYOUT_SSANNE_ROOM1", + "music": "BGM_FRLG_SS_ANNE", + "region_map_section": "MAPSEC_S_S_ANNE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "61", + "x": 2, + "y": 6, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "SSAnne_1F_Room5_EventScript_160C67", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 2, + "y": 1, + "elevation": 0, + "dest_map": "MAP_SSANNE_1F_CORRIDOR", + "dest_warp_id": 10 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SSAnne_1F_Room6/events.inc b/data/maps/SSAnne_1F_Room6/events.inc deleted file mode 100644 index bbbd7b8f8..000000000 --- a/data/maps/SSAnne_1F_Room6/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne_1F_Room6_EventObjects: - object_event 1, 28, 0, 3, 0, 5, 0, 3, 7, 17, 0, 0, 0, 0, 0, SSAnne_1F_Room6_EventScript_160DF3, 0, 0, 0 - -SSAnne_1F_Room6_MapWarps: - warp_def 2, 1, 0, 12, 261 - -SSAnne_1F_Room6_MapEvents:: - map_events SSAnne_1F_Room6_EventObjects, SSAnne_1F_Room6_MapWarps, 0x0, 0x0 diff --git a/data/maps/SSAnne_1F_Room6/header.inc b/data/maps/SSAnne_1F_Room6/header.inc deleted file mode 100644 index 689a053ef..000000000 --- a/data/maps/SSAnne_1F_Room6/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne_1F_Room6:: @ 834F540 - .4byte SSAnne_Room1_Layout @ 0x8319E74 - .4byte SSAnne_1F_Room6_MapEvents @ 0x83AF210 - .4byte SSAnne_1F_Room6_MapScripts @ 0x8160DF2 - .4byte NULL - .2byte BGM_FRLG_SS_ANNE - .2byte 177 - .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/SSAnne_1F_Room6/map.json b/data/maps/SSAnne_1F_Room6/map.json new file mode 100644 index 000000000..75cc7b348 --- /dev/null +++ b/data/maps/SSAnne_1F_Room6/map.json @@ -0,0 +1,41 @@ +{ + "id": "MAP_SSANNE_1F_ROOM6", + "name": "SSAnne_1F_Room6", + "layout": "LAYOUT_SSANNE_ROOM1", + "music": "BGM_FRLG_SS_ANNE", + "region_map_section": "MAPSEC_S_S_ANNE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "28", + "x": 3, + "y": 5, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_1F_Room6_EventScript_160DF3", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 2, + "y": 1, + "elevation": 0, + "dest_map": "MAP_SSANNE_1F_CORRIDOR", + "dest_warp_id": 12 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SSAnne_1F_Room7/events.inc b/data/maps/SSAnne_1F_Room7/events.inc deleted file mode 100644 index e8ea182ed..000000000 --- a/data/maps/SSAnne_1F_Room7/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne_1F_Room7_EventObjects: - object_event 1, 61, 0, 4, 0, 3, 0, 3, 9, 17, 0, 1, 0, 3, 0, SSAnne_1F_Room7_EventScript_160C7F, 0, 0, 0 - -SSAnne_1F_Room7_MapWarps: - warp_def 2, 1, 0, 11, 261 - -SSAnne_1F_Room7_MapEvents:: - map_events SSAnne_1F_Room7_EventObjects, SSAnne_1F_Room7_MapWarps, 0x0, 0x0 diff --git a/data/maps/SSAnne_1F_Room7/header.inc b/data/maps/SSAnne_1F_Room7/header.inc deleted file mode 100644 index 218ed0557..000000000 --- a/data/maps/SSAnne_1F_Room7/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne_1F_Room7:: @ 834F3F0 - .4byte SSAnne_Room1_Layout @ 0x8319E74 - .4byte SSAnne_1F_Room7_MapEvents @ 0x83AEE68 - .4byte SSAnne_1F_Room7_MapScripts @ 0x8160C7E - .4byte NULL - .2byte BGM_FRLG_SS_ANNE - .2byte 177 - .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/SSAnne_1F_Room7/map.json b/data/maps/SSAnne_1F_Room7/map.json new file mode 100644 index 000000000..0dffef5c4 --- /dev/null +++ b/data/maps/SSAnne_1F_Room7/map.json @@ -0,0 +1,41 @@ +{ + "id": "MAP_SSANNE_1F_ROOM7", + "name": "SSAnne_1F_Room7", + "layout": "LAYOUT_SSANNE_ROOM1", + "music": "BGM_FRLG_SS_ANNE", + "region_map_section": "MAPSEC_S_S_ANNE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "61", + "x": 4, + "y": 3, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SSAnne_1F_Room7_EventScript_160C7F", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 2, + "y": 1, + "elevation": 0, + "dest_map": "MAP_SSANNE_1F_CORRIDOR", + "dest_warp_id": 11 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SSAnne_2F_Corridor/events.inc b/data/maps/SSAnne_2F_Corridor/events.inc deleted file mode 100644 index 040240ef5..000000000 --- a/data/maps/SSAnne_2F_Corridor/events.inc +++ /dev/null @@ -1,22 +0,0 @@ -SSAnne_2F_Corridor_EventObjects: - object_event 1, 72, 0, 30, 0, 2, 0, 3, 9, 17, 0, 0, 0, 0, 0, 0x0, 61, 0, 0 - object_event 2, 62, 0, 2, 0, 7, 0, 3, 3, 33, 0, 0, 0, 0, 0, SSAnne_2F_Corridor_EventScript_160A54, 0, 0, 0 - -SSAnne_2F_Corridor_MapWarps: - warp_def 2, 2, 3, 0, 261 - warp_def 3, 12, 3, 1, 263 - warp_def 30, 2, 3, 0, 267 - warp_def 6, 10, 0, 0, 274 - warp_def 10, 10, 0, 0, 275 - warp_def 14, 10, 0, 0, 276 - warp_def 18, 10, 0, 0, 277 - warp_def 22, 10, 0, 0, 278 - warp_def 26, 10, 0, 0, 279 - -SSAnne_2F_Corridor_MapCoordEvents: - coord_event 30, 6, 3, 0, 16475, 0, 0, SSAnne_2F_Corridor_EventScript_1608DF - coord_event 31, 6, 3, 0, 16475, 0, 0, SSAnne_2F_Corridor_EventScript_1608EB - coord_event 32, 6, 3, 0, 16475, 0, 0, SSAnne_2F_Corridor_EventScript_1608F7 - -SSAnne_2F_Corridor_MapEvents:: - map_events SSAnne_2F_Corridor_EventObjects, SSAnne_2F_Corridor_MapWarps, SSAnne_2F_Corridor_MapCoordEvents, 0x0 diff --git a/data/maps/SSAnne_2F_Corridor/header.inc b/data/maps/SSAnne_2F_Corridor/header.inc deleted file mode 100644 index 6321b0246..000000000 --- a/data/maps/SSAnne_2F_Corridor/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne_2F_Corridor:: @ 834F2BC - .4byte SSAnne_2F_Corridor_Layout @ 0x82FFFB0 - .4byte SSAnne_2F_Corridor_MapEvents @ 0x83AEA30 - .4byte SSAnne_2F_Corridor_MapScripts @ 0x81608DE - .4byte NULL - .2byte BGM_FRLG_SS_ANNE - .2byte 120 - .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/SSAnne_2F_Corridor/map.json b/data/maps/SSAnne_2F_Corridor/map.json new file mode 100644 index 000000000..d634f353e --- /dev/null +++ b/data/maps/SSAnne_2F_Corridor/map.json @@ -0,0 +1,138 @@ +{ + "id": "MAP_SSANNE_2F_CORRIDOR", + "name": "SSAnne_2F_Corridor", + "layout": "LAYOUT_SSANNE_2F_CORRIDOR", + "music": "BGM_FRLG_SS_ANNE", + "region_map_section": "MAPSEC_S_S_ANNE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "72", + "x": 30, + "y": 2, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "61" + }, + { + "graphics_id": "62", + "x": 2, + "y": 7, + "elevation": 3, + "movement_type": "3", + "movement_range_x": 1, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_2F_Corridor_EventScript_160A54", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 2, + "y": 2, + "elevation": 3, + "dest_map": "MAP_SSANNE_1F_CORRIDOR", + "dest_warp_id": 0 + }, + { + "x": 3, + "y": 12, + "elevation": 3, + "dest_map": "MAP_SSANNE_3F_CORRIDOR", + "dest_warp_id": 1 + }, + { + "x": 30, + "y": 2, + "elevation": 3, + "dest_map": "MAP_SSANNE_CAPTAINS_OFFICE", + "dest_warp_id": 0 + }, + { + "x": 6, + "y": 10, + "elevation": 0, + "dest_map": "MAP_SSANNE_2F_ROOM1", + "dest_warp_id": 0 + }, + { + "x": 10, + "y": 10, + "elevation": 0, + "dest_map": "MAP_SSANNE_2F_ROOM2", + "dest_warp_id": 0 + }, + { + "x": 14, + "y": 10, + "elevation": 0, + "dest_map": "MAP_SSANNE_2F_ROOM3", + "dest_warp_id": 0 + }, + { + "x": 18, + "y": 10, + "elevation": 0, + "dest_map": "MAP_SSANNE_2F_ROOM4", + "dest_warp_id": 0 + }, + { + "x": 22, + "y": 10, + "elevation": 0, + "dest_map": "MAP_SSANNE_2F_ROOM5", + "dest_warp_id": 0 + }, + { + "x": 26, + "y": 10, + "elevation": 0, + "dest_map": "MAP_SSANNE_2F_ROOM6", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 30, + "y": 6, + "elevation": 3, + "var": "VAR_0x405B", + "var_value": 0, + "script": "SSAnne_2F_Corridor_EventScript_1608DF" + }, + { + "type": "trigger", + "x": 31, + "y": 6, + "elevation": 3, + "var": "VAR_0x405B", + "var_value": 0, + "script": "SSAnne_2F_Corridor_EventScript_1608EB" + }, + { + "type": "trigger", + "x": 32, + "y": 6, + "elevation": 3, + "var": "VAR_0x405B", + "var_value": 0, + "script": "SSAnne_2F_Corridor_EventScript_1608F7" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SSAnne_2F_Room1/events.inc b/data/maps/SSAnne_2F_Room1/events.inc deleted file mode 100644 index 0faf232db..000000000 --- a/data/maps/SSAnne_2F_Room1/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne_2F_Room1_EventObjects: - object_event 1, 61, 0, 1, 0, 4, 0, 3, 9, 17, 0, 0, 0, 0, 0, SSAnne_2F_Room1_EventScript_160C97, 0, 0, 0 - -SSAnne_2F_Room1_MapWarps: - warp_def 4, 7, 3, 3, 262 - -SSAnne_2F_Room1_MapEvents:: - map_events SSAnne_2F_Room1_EventObjects, SSAnne_2F_Room1_MapWarps, 0x0, 0x0 diff --git a/data/maps/SSAnne_2F_Room1/header.inc b/data/maps/SSAnne_2F_Room1/header.inc deleted file mode 100644 index 4960880c9..000000000 --- a/data/maps/SSAnne_2F_Room1/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne_2F_Room1:: @ 834F40C - .4byte SSAnne_Room2_Layout @ 0x8319F04 - .4byte SSAnne_2F_Room1_MapEvents @ 0x83AEE9C - .4byte SSAnne_2F_Room1_MapScripts @ 0x8160C96 - .4byte NULL - .2byte BGM_FRLG_SS_ANNE - .2byte 178 - .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/SSAnne_2F_Room1/map.json b/data/maps/SSAnne_2F_Room1/map.json new file mode 100644 index 000000000..2094f497b --- /dev/null +++ b/data/maps/SSAnne_2F_Room1/map.json @@ -0,0 +1,41 @@ +{ + "id": "MAP_SSANNE_2F_ROOM1", + "name": "SSAnne_2F_Room1", + "layout": "LAYOUT_SSANNE_ROOM2", + "music": "BGM_FRLG_SS_ANNE", + "region_map_section": "MAPSEC_S_S_ANNE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "61", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_2F_Room1_EventScript_160C97", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SSANNE_2F_CORRIDOR", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SSAnne_2F_Room2/events.inc b/data/maps/SSAnne_2F_Room2/events.inc deleted file mode 100644 index a7df1228a..000000000 --- a/data/maps/SSAnne_2F_Room2/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -SSAnne_2F_Room2_EventObjects: - object_event 1, 57, 0, 5, 0, 5, 0, 3, 9, 17, 0, 1, 0, 3, 0, SSAnne_2F_Room2_EventScript_160CB1, 0, 0, 0 - object_event 2, 61, 0, 1, 0, 4, 0, 3, 10, 17, 0, 1, 0, 2, 0, SSAnne_2F_Room2_EventScript_160CC8, 0, 0, 0 - object_event 3, 92, 0, 3, 0, 3, 0, 0, 8, 17, 0, 0, 0, 0, 0, SSAnne_2F_Room2_EventScript_1BE66B, 357, 0, 0 - -SSAnne_2F_Room2_MapWarps: - warp_def 4, 7, 3, 4, 262 - -SSAnne_2F_Room2_MapEvents:: - map_events SSAnne_2F_Room2_EventObjects, SSAnne_2F_Room2_MapWarps, 0x0, 0x0 diff --git a/data/maps/SSAnne_2F_Room2/header.inc b/data/maps/SSAnne_2F_Room2/header.inc deleted file mode 100644 index df8bd334f..000000000 --- a/data/maps/SSAnne_2F_Room2/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne_2F_Room2:: @ 834F428 - .4byte SSAnne_Room2_Layout @ 0x8319F04 - .4byte SSAnne_2F_Room2_MapEvents @ 0x83AEF00 - .4byte SSAnne_2F_Room2_MapScripts @ 0x8160CB0 - .4byte NULL - .2byte BGM_FRLG_SS_ANNE - .2byte 178 - .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/SSAnne_2F_Room2/map.json b/data/maps/SSAnne_2F_Room2/map.json new file mode 100644 index 000000000..c4c95231a --- /dev/null +++ b/data/maps/SSAnne_2F_Room2/map.json @@ -0,0 +1,67 @@ +{ + "id": "MAP_SSANNE_2F_ROOM2", + "name": "SSAnne_2F_Room2", + "layout": "LAYOUT_SSANNE_ROOM2", + "music": "BGM_FRLG_SS_ANNE", + "region_map_section": "MAPSEC_S_S_ANNE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "57", + "x": 5, + "y": 5, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SSAnne_2F_Room2_EventScript_160CB1", + "flag": "0" + }, + { + "graphics_id": "61", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "SSAnne_2F_Room2_EventScript_160CC8", + "flag": "0" + }, + { + "graphics_id": "92", + "x": 3, + "y": 3, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_2F_Room2_EventScript_1BE66B", + "flag": "357" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SSANNE_2F_CORRIDOR", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SSAnne_2F_Room3/events.inc b/data/maps/SSAnne_2F_Room3/events.inc deleted file mode 100644 index 82a89c51f..000000000 --- a/data/maps/SSAnne_2F_Room3/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -SSAnne_2F_Room3_EventObjects: - object_event 1, 61, 0, 2, 0, 5, 0, 3, 5, 17, 0, 0, 0, 0, 0, SSAnne_2F_Room3_EventScript_160CE0, 0, 0, 0 - object_event 2, 32, 0, 3, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, SSAnne_2F_Room3_EventScript_160CE9, 0, 0, 0 - -SSAnne_2F_Room3_MapWarps: - warp_def 4, 7, 3, 5, 262 - -SSAnne_2F_Room3_MapEvents:: - map_events SSAnne_2F_Room3_EventObjects, SSAnne_2F_Room3_MapWarps, 0x0, 0x0 diff --git a/data/maps/SSAnne_2F_Room3/header.inc b/data/maps/SSAnne_2F_Room3/header.inc deleted file mode 100644 index 9d3cb6e63..000000000 --- a/data/maps/SSAnne_2F_Room3/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne_2F_Room3:: @ 834F444 - .4byte SSAnne_Room2_Layout @ 0x8319F04 - .4byte SSAnne_2F_Room3_MapEvents @ 0x83AEF4C - .4byte SSAnne_2F_Room3_MapScripts @ 0x8160CDF - .4byte NULL - .2byte BGM_FRLG_SS_ANNE - .2byte 178 - .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/SSAnne_2F_Room3/map.json b/data/maps/SSAnne_2F_Room3/map.json new file mode 100644 index 000000000..266e87a29 --- /dev/null +++ b/data/maps/SSAnne_2F_Room3/map.json @@ -0,0 +1,54 @@ +{ + "id": "MAP_SSANNE_2F_ROOM3", + "name": "SSAnne_2F_Room3", + "layout": "LAYOUT_SSANNE_ROOM2", + "music": "BGM_FRLG_SS_ANNE", + "region_map_section": "MAPSEC_S_S_ANNE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "61", + "x": 2, + "y": 5, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_2F_Room3_EventScript_160CE0", + "flag": "0" + }, + { + "graphics_id": "32", + "x": 3, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_2F_Room3_EventScript_160CE9", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SSANNE_2F_CORRIDOR", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SSAnne_2F_Room4/events.inc b/data/maps/SSAnne_2F_Room4/events.inc deleted file mode 100644 index 2a9d4f9f5..000000000 --- a/data/maps/SSAnne_2F_Room4/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -SSAnne_2F_Room4_EventObjects: - object_event 1, 61, 0, 0, 0, 5, 0, 3, 10, 17, 0, 1, 0, 3, 0, SSAnne_2F_Room4_EventScript_160CF3, 0, 0, 0 - object_event 2, 22, 0, 3, 0, 3, 0, 3, 8, 17, 0, 1, 0, 3, 0, SSAnne_2F_Room4_EventScript_160D0A, 0, 0, 0 - object_event 3, 92, 0, 2, 0, 4, 0, 3, 8, 17, 0, 0, 0, 0, 0, SSAnne_2F_Room4_EventScript_1BE678, 358, 0, 0 - -SSAnne_2F_Room4_MapWarps: - warp_def 4, 7, 3, 6, 262 - -SSAnne_2F_Room4_MapEvents:: - map_events SSAnne_2F_Room4_EventObjects, SSAnne_2F_Room4_MapWarps, 0x0, 0x0 diff --git a/data/maps/SSAnne_2F_Room4/header.inc b/data/maps/SSAnne_2F_Room4/header.inc deleted file mode 100644 index d71a41336..000000000 --- a/data/maps/SSAnne_2F_Room4/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne_2F_Room4:: @ 834F460 - .4byte SSAnne_Room2_Layout @ 0x8319F04 - .4byte SSAnne_2F_Room4_MapEvents @ 0x83AEFB0 - .4byte SSAnne_2F_Room4_MapScripts @ 0x8160CF2 - .4byte NULL - .2byte BGM_FRLG_SS_ANNE - .2byte 178 - .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/SSAnne_2F_Room4/map.json b/data/maps/SSAnne_2F_Room4/map.json new file mode 100644 index 000000000..9e3a3c62c --- /dev/null +++ b/data/maps/SSAnne_2F_Room4/map.json @@ -0,0 +1,67 @@ +{ + "id": "MAP_SSANNE_2F_ROOM4", + "name": "SSAnne_2F_Room4", + "layout": "LAYOUT_SSANNE_ROOM2", + "music": "BGM_FRLG_SS_ANNE", + "region_map_section": "MAPSEC_S_S_ANNE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "61", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SSAnne_2F_Room4_EventScript_160CF3", + "flag": "0" + }, + { + "graphics_id": "22", + "x": 3, + "y": 3, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SSAnne_2F_Room4_EventScript_160D0A", + "flag": "0" + }, + { + "graphics_id": "92", + "x": 2, + "y": 4, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_2F_Room4_EventScript_1BE678", + "flag": "358" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SSANNE_2F_CORRIDOR", + "dest_warp_id": 6 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SSAnne_2F_Room5/events.inc b/data/maps/SSAnne_2F_Room5/events.inc deleted file mode 100644 index ee7fdaee9..000000000 --- a/data/maps/SSAnne_2F_Room5/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -SSAnne_2F_Room5_EventObjects: - object_event 1, 61, 0, 5, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, SSAnne_2F_Room5_EventScript_160D22, 0, 0, 0 - object_event 2, 16, 0, 3, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, SSAnne_2F_Room5_EventScript_160D2B, 0, 0, 0 - -SSAnne_2F_Room5_MapWarps: - warp_def 4, 7, 3, 7, 262 - -SSAnne_2F_Room5_MapEvents:: - map_events SSAnne_2F_Room5_EventObjects, SSAnne_2F_Room5_MapWarps, 0x0, 0x0 diff --git a/data/maps/SSAnne_2F_Room5/header.inc b/data/maps/SSAnne_2F_Room5/header.inc deleted file mode 100644 index 76b09d983..000000000 --- a/data/maps/SSAnne_2F_Room5/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne_2F_Room5:: @ 834F47C - .4byte SSAnne_Room2_Layout @ 0x8319F04 - .4byte SSAnne_2F_Room5_MapEvents @ 0x83AEFFC - .4byte SSAnne_2F_Room5_MapScripts @ 0x8160D21 - .4byte NULL - .2byte BGM_FRLG_SS_ANNE - .2byte 178 - .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/SSAnne_2F_Room5/map.json b/data/maps/SSAnne_2F_Room5/map.json new file mode 100644 index 000000000..64e5cdac3 --- /dev/null +++ b/data/maps/SSAnne_2F_Room5/map.json @@ -0,0 +1,54 @@ +{ + "id": "MAP_SSANNE_2F_ROOM5", + "name": "SSAnne_2F_Room5", + "layout": "LAYOUT_SSANNE_ROOM2", + "music": "BGM_FRLG_SS_ANNE", + "region_map_section": "MAPSEC_S_S_ANNE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "61", + "x": 5, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_2F_Room5_EventScript_160D22", + "flag": "0" + }, + { + "graphics_id": "16", + "x": 3, + "y": 5, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_2F_Room5_EventScript_160D2B", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SSANNE_2F_CORRIDOR", + "dest_warp_id": 7 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SSAnne_2F_Room6/events.inc b/data/maps/SSAnne_2F_Room6/events.inc deleted file mode 100644 index a531dacaf..000000000 --- a/data/maps/SSAnne_2F_Room6/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -SSAnne_2F_Room6_EventObjects: - object_event 1, 31, 0, 1, 0, 4, 0, 3, 10, 17, 0, 0, 0, 0, 0, SSAnne_2F_Room6_EventScript_160D3E, 0, 0, 0 - object_event 2, 23, 0, 4, 0, 4, 0, 3, 9, 17, 0, 0, 0, 0, 0, SSAnne_2F_Room6_EventScript_160D35, 0, 0, 0 - -SSAnne_2F_Room6_MapWarps: - warp_def 4, 7, 3, 8, 262 - -SSAnne_2F_Room6_MapEvents:: - map_events SSAnne_2F_Room6_EventObjects, SSAnne_2F_Room6_MapWarps, 0x0, 0x0 diff --git a/data/maps/SSAnne_2F_Room6/header.inc b/data/maps/SSAnne_2F_Room6/header.inc deleted file mode 100644 index 29cb434c7..000000000 --- a/data/maps/SSAnne_2F_Room6/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne_2F_Room6:: @ 834F498 - .4byte SSAnne_Room2_Layout @ 0x8319F04 - .4byte SSAnne_2F_Room6_MapEvents @ 0x83AF048 - .4byte SSAnne_2F_Room6_MapScripts @ 0x8160D34 - .4byte NULL - .2byte BGM_FRLG_SS_ANNE - .2byte 178 - .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/SSAnne_2F_Room6/map.json b/data/maps/SSAnne_2F_Room6/map.json new file mode 100644 index 000000000..c64e8a018 --- /dev/null +++ b/data/maps/SSAnne_2F_Room6/map.json @@ -0,0 +1,54 @@ +{ + "id": "MAP_SSANNE_2F_ROOM6", + "name": "SSAnne_2F_Room6", + "layout": "LAYOUT_SSANNE_ROOM2", + "music": "BGM_FRLG_SS_ANNE", + "region_map_section": "MAPSEC_S_S_ANNE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "31", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_2F_Room6_EventScript_160D3E", + "flag": "0" + }, + { + "graphics_id": "23", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_2F_Room6_EventScript_160D35", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SSANNE_2F_CORRIDOR", + "dest_warp_id": 8 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SSAnne_3F_Corridor/events.inc b/data/maps/SSAnne_3F_Corridor/events.inc deleted file mode 100644 index 73c712193..000000000 --- a/data/maps/SSAnne_3F_Corridor/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -SSAnne_3F_Corridor_EventObjects: - object_event 1, 62, 0, 10, 0, 4, 0, 3, 5, 19, 0, 0, 0, 0, 0, SSAnne_3F_Corridor_EventScript_160A5E, 0, 0, 0 - -SSAnne_3F_Corridor_MapWarps: - warp_def 1, 4, 3, 0, 265 - warp_def 18, 2, 3, 1, 262 - warp_def 0, 5, 0, 0, 265 - -SSAnne_3F_Corridor_MapEvents:: - map_events SSAnne_3F_Corridor_EventObjects, SSAnne_3F_Corridor_MapWarps, 0x0, 0x0 diff --git a/data/maps/SSAnne_3F_Corridor/header.inc b/data/maps/SSAnne_3F_Corridor/header.inc deleted file mode 100644 index e5285ffe9..000000000 --- a/data/maps/SSAnne_3F_Corridor/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne_3F_Corridor:: @ 834F2D8 - .4byte SSAnne_3F_Corridor_Layout @ 0x8300108 - .4byte SSAnne_3F_Corridor_MapEvents @ 0x83AEA74 - .4byte SSAnne_3F_Corridor_MapScripts @ 0x8160A5D - .4byte NULL - .2byte BGM_FRLG_SS_ANNE - .2byte 121 - .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/SSAnne_3F_Corridor/map.json b/data/maps/SSAnne_3F_Corridor/map.json new file mode 100644 index 000000000..e60513ea2 --- /dev/null +++ b/data/maps/SSAnne_3F_Corridor/map.json @@ -0,0 +1,55 @@ +{ + "id": "MAP_SSANNE_3F_CORRIDOR", + "name": "SSAnne_3F_Corridor", + "layout": "LAYOUT_SSANNE_3F_CORRIDOR", + "music": "BGM_FRLG_SS_ANNE", + "region_map_section": "MAPSEC_S_S_ANNE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "62", + "x": 10, + "y": 4, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 3, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_3F_Corridor_EventScript_160A5E", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 1, + "y": 4, + "elevation": 3, + "dest_map": "MAP_SSANNE_DECK", + "dest_warp_id": 0 + }, + { + "x": 18, + "y": 2, + "elevation": 3, + "dest_map": "MAP_SSANNE_2F_CORRIDOR", + "dest_warp_id": 1 + }, + { + "x": 0, + "y": 5, + "elevation": 0, + "dest_map": "MAP_SSANNE_DECK", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SSAnne_B1F_Corridor/events.inc b/data/maps/SSAnne_B1F_Corridor/events.inc deleted file mode 100644 index 09ca9c4a3..000000000 --- a/data/maps/SSAnne_B1F_Corridor/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -SSAnne_B1F_Corridor_MapWarps: - warp_def 19, 3, 3, 5, 261 - warp_def 2, 2, 0, 0, 280 - warp_def 6, 2, 0, 0, 281 - warp_def 10, 2, 0, 0, 282 - warp_def 14, 2, 0, 0, 283 - warp_def 18, 2, 0, 0, 284 - -SSAnne_B1F_Corridor_MapBGEvents: - bg_event 21, 5, 3, 7, 0, 21, 8, 1 - -SSAnne_B1F_Corridor_MapEvents:: - map_events 0x0, SSAnne_B1F_Corridor_MapWarps, 0x0, SSAnne_B1F_Corridor_MapBGEvents diff --git a/data/maps/SSAnne_B1F_Corridor/header.inc b/data/maps/SSAnne_B1F_Corridor/header.inc deleted file mode 100644 index 020aa1ad4..000000000 --- a/data/maps/SSAnne_B1F_Corridor/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne_B1F_Corridor:: @ 834F2F4 - .4byte SSAnne_B1F_Corridor_Layout @ 0x8300270 - .4byte SSAnne_B1F_Corridor_MapEvents @ 0x83AEAC4 - .4byte SSAnne_B1F_Corridor_MapScripts @ 0x8160A67 - .4byte NULL - .2byte BGM_FRLG_SS_ANNE - .2byte 122 - .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/SSAnne_B1F_Corridor/map.json b/data/maps/SSAnne_B1F_Corridor/map.json new file mode 100644 index 000000000..a0c76bf1d --- /dev/null +++ b/data/maps/SSAnne_B1F_Corridor/map.json @@ -0,0 +1,72 @@ +{ + "id": "MAP_SSANNE_B1F_CORRIDOR", + "name": "SSAnne_B1F_Corridor", + "layout": "LAYOUT_SSANNE_B1F_CORRIDOR", + "music": "BGM_FRLG_SS_ANNE", + "region_map_section": "MAPSEC_S_S_ANNE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 19, + "y": 3, + "elevation": 3, + "dest_map": "MAP_SSANNE_1F_CORRIDOR", + "dest_warp_id": 5 + }, + { + "x": 2, + "y": 2, + "elevation": 0, + "dest_map": "MAP_SSANNE_B1F_ROOM1", + "dest_warp_id": 0 + }, + { + "x": 6, + "y": 2, + "elevation": 0, + "dest_map": "MAP_SSANNE_B1F_ROOM2", + "dest_warp_id": 0 + }, + { + "x": 10, + "y": 2, + "elevation": 0, + "dest_map": "MAP_SSANNE_B1F_ROOM3", + "dest_warp_id": 0 + }, + { + "x": 14, + "y": 2, + "elevation": 0, + "dest_map": "MAP_SSANNE_B1F_ROOM4", + "dest_warp_id": 0 + }, + { + "x": 18, + "y": 2, + "elevation": 0, + "dest_map": "MAP_SSANNE_B1F_ROOM5", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 21, + "y": 5, + "elevation": 3, + "item": "ITEM_HYPER_POTION", + "flag": "8", + "unknown": 1 + } + ] +} \ No newline at end of file diff --git a/data/maps/SSAnne_B1F_Room1/events.inc b/data/maps/SSAnne_B1F_Room1/events.inc deleted file mode 100644 index ef1e2b945..000000000 --- a/data/maps/SSAnne_B1F_Room1/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -SSAnne_B1F_Room1_EventObjects: - object_event 1, 57, 0, 5, 0, 2, 0, 3, 8, 17, 0, 1, 0, 2, 0, SSAnne_B1F_Room1_EventScript_160D48, 0, 0, 0 - object_event 2, 62, 0, 3, 0, 2, 0, 3, 8, 17, 0, 1, 0, 2, 0, SSAnne_B1F_Room1_EventScript_160D5F, 0, 0, 0 - -SSAnne_B1F_Room1_MapWarps: - warp_def 4, 7, 3, 1, 264 - -SSAnne_B1F_Room1_MapEvents:: - map_events SSAnne_B1F_Room1_EventObjects, SSAnne_B1F_Room1_MapWarps, 0x0, 0x0 diff --git a/data/maps/SSAnne_B1F_Room1/header.inc b/data/maps/SSAnne_B1F_Room1/header.inc deleted file mode 100644 index 609acf59e..000000000 --- a/data/maps/SSAnne_B1F_Room1/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne_B1F_Room1:: @ 834F4B4 - .4byte SSAnne_Room2_Layout @ 0x8319F04 - .4byte SSAnne_B1F_Room1_MapEvents @ 0x83AF094 - .4byte SSAnne_B1F_Room1_MapScripts @ 0x8160D47 - .4byte NULL - .2byte BGM_FRLG_SS_ANNE - .2byte 178 - .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/SSAnne_B1F_Room1/map.json b/data/maps/SSAnne_B1F_Room1/map.json new file mode 100644 index 000000000..673c16c67 --- /dev/null +++ b/data/maps/SSAnne_B1F_Room1/map.json @@ -0,0 +1,54 @@ +{ + "id": "MAP_SSANNE_B1F_ROOM1", + "name": "SSAnne_B1F_Room1", + "layout": "LAYOUT_SSANNE_ROOM2", + "music": "BGM_FRLG_SS_ANNE", + "region_map_section": "MAPSEC_S_S_ANNE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "57", + "x": 5, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "SSAnne_B1F_Room1_EventScript_160D48", + "flag": "0" + }, + { + "graphics_id": "62", + "x": 3, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "SSAnne_B1F_Room1_EventScript_160D5F", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SSANNE_B1F_CORRIDOR", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SSAnne_B1F_Room2/events.inc b/data/maps/SSAnne_B1F_Room2/events.inc deleted file mode 100644 index 21419a175..000000000 --- a/data/maps/SSAnne_B1F_Room2/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -SSAnne_B1F_Room2_EventObjects: - object_event 1, 62, 0, 3, 0, 5, 0, 3, 1, 17, 0, 1, 0, 1, 0, SSAnne_B1F_Room2_EventScript_160D77, 0, 0, 0 - object_event 2, 92, 0, 3, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, SSAnne_B1F_Room2_EventScript_1BE685, 359, 0, 0 - -SSAnne_B1F_Room2_MapWarps: - warp_def 4, 7, 3, 2, 264 - -SSAnne_B1F_Room2_MapEvents:: - map_events SSAnne_B1F_Room2_EventObjects, SSAnne_B1F_Room2_MapWarps, 0x0, 0x0 diff --git a/data/maps/SSAnne_B1F_Room2/header.inc b/data/maps/SSAnne_B1F_Room2/header.inc deleted file mode 100644 index d7a4a9e7f..000000000 --- a/data/maps/SSAnne_B1F_Room2/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne_B1F_Room2:: @ 834F4D0 - .4byte SSAnne_Room2_Layout @ 0x8319F04 - .4byte SSAnne_B1F_Room2_MapEvents @ 0x83AF0E0 - .4byte SSAnne_B1F_Room2_MapScripts @ 0x8160D76 - .4byte NULL - .2byte BGM_FRLG_SS_ANNE - .2byte 178 - .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/SSAnne_B1F_Room2/map.json b/data/maps/SSAnne_B1F_Room2/map.json new file mode 100644 index 000000000..2557bf329 --- /dev/null +++ b/data/maps/SSAnne_B1F_Room2/map.json @@ -0,0 +1,54 @@ +{ + "id": "MAP_SSANNE_B1F_ROOM2", + "name": "SSAnne_B1F_Room2", + "layout": "LAYOUT_SSANNE_ROOM2", + "music": "BGM_FRLG_SS_ANNE", + "region_map_section": "MAPSEC_S_S_ANNE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "62", + "x": 3, + "y": 5, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SSAnne_B1F_Room2_EventScript_160D77", + "flag": "0" + }, + { + "graphics_id": "92", + "x": 3, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_B1F_Room2_EventScript_1BE685", + "flag": "359" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SSANNE_B1F_CORRIDOR", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SSAnne_B1F_Room3/events.inc b/data/maps/SSAnne_B1F_Room3/events.inc deleted file mode 100644 index b2c057b00..000000000 --- a/data/maps/SSAnne_B1F_Room3/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -SSAnne_B1F_Room3_EventObjects: - object_event 1, 62, 0, 4, 0, 4, 0, 3, 8, 17, 0, 1, 0, 3, 0, SSAnne_B1F_Room3_EventScript_160D8F, 0, 0, 0 - object_event 2, 92, 0, 1, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, SSAnne_B1F_Room3_EventScript_1BE692, 360, 0, 0 - -SSAnne_B1F_Room3_MapWarps: - warp_def 4, 7, 3, 3, 264 - -SSAnne_B1F_Room3_MapEvents:: - map_events SSAnne_B1F_Room3_EventObjects, SSAnne_B1F_Room3_MapWarps, 0x0, 0x0 diff --git a/data/maps/SSAnne_B1F_Room3/header.inc b/data/maps/SSAnne_B1F_Room3/header.inc deleted file mode 100644 index 67e43de94..000000000 --- a/data/maps/SSAnne_B1F_Room3/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne_B1F_Room3:: @ 834F4EC - .4byte SSAnne_Room2_Layout @ 0x8319F04 - .4byte SSAnne_B1F_Room3_MapEvents @ 0x83AF12C - .4byte SSAnne_B1F_Room3_MapScripts @ 0x8160D8E - .4byte NULL - .2byte BGM_FRLG_SS_ANNE - .2byte 178 - .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/SSAnne_B1F_Room3/map.json b/data/maps/SSAnne_B1F_Room3/map.json new file mode 100644 index 000000000..9c6634dd1 --- /dev/null +++ b/data/maps/SSAnne_B1F_Room3/map.json @@ -0,0 +1,54 @@ +{ + "id": "MAP_SSANNE_B1F_ROOM3", + "name": "SSAnne_B1F_Room3", + "layout": "LAYOUT_SSANNE_ROOM2", + "music": "BGM_FRLG_SS_ANNE", + "region_map_section": "MAPSEC_S_S_ANNE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "62", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SSAnne_B1F_Room3_EventScript_160D8F", + "flag": "0" + }, + { + "graphics_id": "92", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_B1F_Room3_EventScript_1BE692", + "flag": "360" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SSANNE_B1F_CORRIDOR", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SSAnne_B1F_Room4/events.inc b/data/maps/SSAnne_B1F_Room4/events.inc deleted file mode 100644 index 19eb044d2..000000000 --- a/data/maps/SSAnne_B1F_Room4/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -SSAnne_B1F_Room4_EventObjects: - object_event 1, 62, 0, 3, 0, 3, 0, 3, 8, 17, 0, 1, 0, 3, 0, SSAnne_B1F_Room4_EventScript_160DBE, 0, 0, 0 - object_event 2, 62, 0, 2, 0, 6, 0, 3, 1, 17, 0, 1, 0, 1, 0, SSAnne_B1F_Room4_EventScript_160DA7, 0, 0, 0 - -SSAnne_B1F_Room4_MapWarps: - warp_def 4, 7, 3, 4, 264 - -SSAnne_B1F_Room4_MapEvents:: - map_events SSAnne_B1F_Room4_EventObjects, SSAnne_B1F_Room4_MapWarps, 0x0, 0x0 diff --git a/data/maps/SSAnne_B1F_Room4/header.inc b/data/maps/SSAnne_B1F_Room4/header.inc deleted file mode 100644 index 8a23b71f2..000000000 --- a/data/maps/SSAnne_B1F_Room4/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne_B1F_Room4:: @ 834F508 - .4byte SSAnne_Room2_Layout @ 0x8319F04 - .4byte SSAnne_B1F_Room4_MapEvents @ 0x83AF178 - .4byte SSAnne_B1F_Room4_MapScripts @ 0x8160DA6 - .4byte NULL - .2byte BGM_FRLG_SS_ANNE - .2byte 178 - .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/SSAnne_B1F_Room4/map.json b/data/maps/SSAnne_B1F_Room4/map.json new file mode 100644 index 000000000..f8802f3bb --- /dev/null +++ b/data/maps/SSAnne_B1F_Room4/map.json @@ -0,0 +1,54 @@ +{ + "id": "MAP_SSANNE_B1F_ROOM4", + "name": "SSAnne_B1F_Room4", + "layout": "LAYOUT_SSANNE_ROOM2", + "music": "BGM_FRLG_SS_ANNE", + "region_map_section": "MAPSEC_S_S_ANNE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "62", + "x": 3, + "y": 3, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SSAnne_B1F_Room4_EventScript_160DBE", + "flag": "0" + }, + { + "graphics_id": "62", + "x": 2, + "y": 6, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SSAnne_B1F_Room4_EventScript_160DA7", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SSANNE_B1F_CORRIDOR", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SSAnne_B1F_Room5/events.inc b/data/maps/SSAnne_B1F_Room5/events.inc deleted file mode 100644 index 4f8fe1f69..000000000 --- a/data/maps/SSAnne_B1F_Room5/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -SSAnne_B1F_Room5_EventObjects: - object_event 1, 19, 0, 3, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, SSAnne_B1F_Room5_EventScript_160DD6, 0, 0, 0 - object_event 2, 134, 0, 2, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, SSAnne_B1F_Room5_EventScript_160DDF, 0, 0, 0 - object_event 3, 92, 0, 2, 0, 2, 0, 0, 8, 17, 0, 0, 0, 0, 0, SSAnne_B1F_Room5_EventScript_1BE69F, 361, 0, 0 - -SSAnne_B1F_Room5_MapWarps: - warp_def 4, 7, 3, 5, 264 - -SSAnne_B1F_Room5_MapEvents:: - map_events SSAnne_B1F_Room5_EventObjects, SSAnne_B1F_Room5_MapWarps, 0x0, 0x0 diff --git a/data/maps/SSAnne_B1F_Room5/header.inc b/data/maps/SSAnne_B1F_Room5/header.inc deleted file mode 100644 index 86c82dabe..000000000 --- a/data/maps/SSAnne_B1F_Room5/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne_B1F_Room5:: @ 834F524 - .4byte SSAnne_Room2_Layout @ 0x8319F04 - .4byte SSAnne_B1F_Room5_MapEvents @ 0x83AF1DC - .4byte SSAnne_B1F_Room5_MapScripts @ 0x8160DD5 - .4byte NULL - .2byte BGM_FRLG_SS_ANNE - .2byte 178 - .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/SSAnne_B1F_Room5/map.json b/data/maps/SSAnne_B1F_Room5/map.json new file mode 100644 index 000000000..0d3ad10c8 --- /dev/null +++ b/data/maps/SSAnne_B1F_Room5/map.json @@ -0,0 +1,67 @@ +{ + "id": "MAP_SSANNE_B1F_ROOM5", + "name": "SSAnne_B1F_Room5", + "layout": "LAYOUT_SSANNE_ROOM2", + "music": "BGM_FRLG_SS_ANNE", + "region_map_section": "MAPSEC_S_S_ANNE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "19", + "x": 3, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_B1F_Room5_EventScript_160DD6", + "flag": "0" + }, + { + "graphics_id": "134", + "x": 2, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_B1F_Room5_EventScript_160DDF", + "flag": "0" + }, + { + "graphics_id": "92", + "x": 2, + "y": 2, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_B1F_Room5_EventScript_1BE69F", + "flag": "361" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SSANNE_B1F_CORRIDOR", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SSAnne_CaptainsOffice/events.inc b/data/maps/SSAnne_CaptainsOffice/events.inc deleted file mode 100644 index a8c88a0a7..000000000 --- a/data/maps/SSAnne_CaptainsOffice/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -SSAnne_CaptainsOffice_EventObjects: - object_event 1, 63, 0, 5, 0, 4, 0, 3, 7, 17, 0, 0, 0, 0, 0, SSAnne_CaptainsOffice_EventScript_160B3A, 0, 0, 0 - -SSAnne_CaptainsOffice_MapWarps: - warp_def 3, 7, 3, 2, 262 - -SSAnne_CaptainsOffice_MapBGEvents: - bg_event 2, 4, 0, 0, 0, SSAnne_CaptainsOffice_EventScript_160BD2 - bg_event 5, 3, 0, 0, 0, SSAnne_CaptainsOffice_EventScript_160BC9 - bg_event 2, 3, 0, 0, 0, SSAnne_CaptainsOffice_EventScript_160BD2 - -SSAnne_CaptainsOffice_MapEvents:: - map_events SSAnne_CaptainsOffice_EventObjects, SSAnne_CaptainsOffice_MapWarps, 0x0, SSAnne_CaptainsOffice_MapBGEvents diff --git a/data/maps/SSAnne_CaptainsOffice/header.inc b/data/maps/SSAnne_CaptainsOffice/header.inc deleted file mode 100644 index b9f3fba89..000000000 --- a/data/maps/SSAnne_CaptainsOffice/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne_CaptainsOffice:: @ 834F348 - .4byte SSAnne_CaptainsOffice_Layout @ 0x83192EC - .4byte SSAnne_CaptainsOffice_MapEvents @ 0x83AECB8 - .4byte SSAnne_CaptainsOffice_MapScripts @ 0x8160B39 - .4byte NULL - .2byte BGM_FRLG_SS_ANNE - .2byte 171 - .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/SSAnne_CaptainsOffice/map.json b/data/maps/SSAnne_CaptainsOffice/map.json new file mode 100644 index 000000000..204ab5a18 --- /dev/null +++ b/data/maps/SSAnne_CaptainsOffice/map.json @@ -0,0 +1,63 @@ +{ + "id": "MAP_SSANNE_CAPTAINS_OFFICE", + "name": "SSAnne_CaptainsOffice", + "layout": "LAYOUT_SSANNE_CAPTAINS_OFFICE", + "music": "BGM_FRLG_SS_ANNE", + "region_map_section": "MAPSEC_S_S_ANNE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "63", + "x": 5, + "y": 4, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_CaptainsOffice_EventScript_160B3A", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SSANNE_2F_CORRIDOR", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 2, + "y": 4, + "elevation": 0, + "script": "SSAnne_CaptainsOffice_EventScript_160BD2" + }, + { + "type": "bg_event_type_0", + "x": 5, + "y": 3, + "elevation": 0, + "script": "SSAnne_CaptainsOffice_EventScript_160BC9" + }, + { + "type": "bg_event_type_0", + "x": 2, + "y": 3, + "elevation": 0, + "script": "SSAnne_CaptainsOffice_EventScript_160BD2" + } + ] +} \ No newline at end of file diff --git a/data/maps/SSAnne_CaptainsOffice2/events.inc b/data/maps/SSAnne_CaptainsOffice2/events.inc deleted file mode 100644 index dd11ae294..000000000 --- a/data/maps/SSAnne_CaptainsOffice2/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -SSAnne_CaptainsOffice2_EventObjects: - object_event 1, 92, 0, 10, 0, 14, 0, 3, 8, 17, 0, 0, 0, 0, 0, SSAnne_CaptainsOffice2_EventScript_1BED6D, 498, 0, 0 - object_event 2, 92, 0, 21, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, SSAnne_CaptainsOffice2_EventScript_1BED7A, 499, 0, 0 - -SSAnne_CaptainsOffice2_MapWarps: - warp_def 12, 12, 3, 2, 367 - warp_def 12, 3, 3, 3, 367 - warp_def 15, 16, 3, 4, 367 - -SSAnne_CaptainsOffice2_MapEvents:: - map_events SSAnne_CaptainsOffice2_EventObjects, SSAnne_CaptainsOffice2_MapWarps, 0x0, 0x0 diff --git a/data/maps/SSAnne_CaptainsOffice2/header.inc b/data/maps/SSAnne_CaptainsOffice2/header.inc deleted file mode 100644 index 9d29a439b..000000000 --- a/data/maps/SSAnne_CaptainsOffice2/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne_CaptainsOffice2:: @ 834FE54 - .4byte SSAnne_CaptainsOffice2_Layout @ 0x8341560 - .4byte SSAnne_CaptainsOffice2_MapEvents @ 0x83B3508 - .4byte SSAnne_CaptainsOffice2_MapScripts @ 0x8163D81 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 295 - .byte 0xb1, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/SSAnne_CaptainsOffice2/scripts.inc b/data/maps/SSAnne_CaptainsOffice2/scripts.inc deleted file mode 100644 index fb9065ad4..000000000 --- a/data/maps/SSAnne_CaptainsOffice2/scripts.inc +++ /dev/null @@ -1,2 +0,0 @@ -SSAnne_CaptainsOffice2_MapScripts:: @ 8163D81 - .byte 0 diff --git a/data/maps/SSAnne_CaptainsOffice3/events.inc b/data/maps/SSAnne_CaptainsOffice3/events.inc deleted file mode 100644 index 23f6df9a6..000000000 --- a/data/maps/SSAnne_CaptainsOffice3/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -SSAnne_CaptainsOffice3_EventObjects: - object_event 1, 49, 0, 11, 0, 14, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, 141, 0, 0 - object_event 2, 49, 0, 13, 0, 14, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, 141, 0, 0 - object_event 3, 77, 0, 12, 0, 16, 0, 3, 7, 17, 0, 0, 0, 0, 0, SSAnne_CaptainsOffice3_EventScript_163F25, 139, 0, 0 - object_event 4, 49, 0, 10, 0, 15, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, 141, 0, 0 - -SSAnne_CaptainsOffice3_MapWarps: - warp_def 12, 23, 0, 5, 367 - -SSAnne_CaptainsOffice3_MapCoordEvents: - coord_event 11, 18, 3, 0, 16512, 0, 0, SSAnne_CaptainsOffice3_EventScript_163D98 - coord_event 12, 18, 3, 0, 16512, 0, 0, SSAnne_CaptainsOffice3_EventScript_163D98 - coord_event 13, 18, 3, 0, 16512, 0, 0, SSAnne_CaptainsOffice3_EventScript_163D98 - -SSAnne_CaptainsOffice3_MapEvents:: - map_events SSAnne_CaptainsOffice3_EventObjects, SSAnne_CaptainsOffice3_MapWarps, SSAnne_CaptainsOffice3_MapCoordEvents, 0x0 diff --git a/data/maps/SSAnne_CaptainsOffice3/header.inc b/data/maps/SSAnne_CaptainsOffice3/header.inc deleted file mode 100644 index 47d48f1ec..000000000 --- a/data/maps/SSAnne_CaptainsOffice3/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne_CaptainsOffice3:: @ 834FE70 - .4byte SSAnne_CaptainsOffice3_Layout @ 0x8341A98 - .4byte SSAnne_CaptainsOffice3_MapEvents @ 0x83B35B4 - .4byte SSAnne_CaptainsOffice3_MapScripts @ 0x8163D82 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 296 - .byte 0xb1, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/SSAnne_CaptainsOffice3/scripts.inc b/data/maps/SSAnne_CaptainsOffice3/scripts.inc deleted file mode 100644 index 350845084..000000000 --- a/data/maps/SSAnne_CaptainsOffice3/scripts.inc +++ /dev/null @@ -1,201 +0,0 @@ -SSAnne_CaptainsOffice3_MapScripts:: @ 8163D82 - map_script 3, SSAnne_CaptainsOffice3_MapScript1_163D88 - .byte 0 - -SSAnne_CaptainsOffice3_MapScript1_163D88:: @ 8163D88 - compare_var_to_value VAR_0x4080, 1 - call_if 1, EventScript_163D94 - end - -EventScript_163D94:: @ 8163D94 - setflag FLAG_0x08B - return - -SSAnne_CaptainsOffice3_EventScript_163D98:: @ 8163D98 - lockall - textcolor 1 - loadword 0, gUnknown_817B04F - callstd 4 - applymovement 1, Movement_163EE8 - waitmovement 0 - textcolor 0 - loadword 0, gUnknown_817B0B9 - callstd 4 - closemessage - playse SE_PIN - applymovement 3, Movement_1A75DB - waitmovement 0 - applymovement 3, Movement_1A75ED - waitmovement 0 - applymovement 3, Movement_1A75DD - waitmovement 0 - textcolor 1 - loadword 0, gUnknown_817B109 - callstd 4 - closemessage - applymovement 3, Movement_1A75EB - waitmovement 0 - delay 18 - applymovement 3, Movement_1A75ED - waitmovement 0 - delay 35 - applymovement 4, Movement_163F11 - applymovement 3, Movement_163F18 - applymovement 255, Movement_163EDD - waitmovement 0 - applymovement 2, Movement_163EE8 - waitmovement 0 - playbgm BGM_FRLG_SUSPICIOUS_EYE, 0 - textcolor 0 - loadword 0, gUnknown_817B20B - callstd 4 - setvar VAR_LAST_TALKED, 4 - trainerbattle 3, 539, 0, Text_17B251 - applymovement 3, Movement_163F1B - waitmovement 0 - textcolor 1 - loadword 0, gUnknown_817B269 - callstd 4 - textcolor 0 - loadword 0, gUnknown_817B2EF - callstd 4 - textcolor 1 - message Text_17B313 - waitmessage - waitse - playmoncry SPECIES_LAPRAS, 2 - waitbuttonpress - waitmoncry - applymovement 1, Movement_163EEE - waitmovement 0 - textcolor 0 - loadword 0, gUnknown_817B399 - callstd 4 - closemessage - applymovement 3, Movement_163F1D - applymovement 255, Movement_163EE2 - applymovement 1, Movement_163EF0 - applymovement 2, Movement_163EFA - applymovement 4, Movement_163F05 - waitmovement 0 - removeobject 1 - removeobject 2 - removeobject 4 - delay 50 - applymovement 3, Movement_163F23 - waitmovement 0 - applymovement 255, Movement_1A75E7 - waitmovement 0 - textcolor 1 - loadword 0, gUnknown_817B457 - callstd 4 - setflag FLAG_0x08E - clearflag FLAG_0x08C - setvar VAR_0x4080, 1 - releaseall - end - -Movement_163EDD:: @ 8163EDD - step_11 - step_11 - step_13 - step_11 - step_end - -Movement_163EE2:: @ 8163EE2 - step_1c - step_2f - step_1c - step_1c - step_2d - step_end - -Movement_163EE8:: @ 8163EE8 - step_25 - step_end - -gUnknown_163EEA:: @ 8163EEA - step_4c - step_13 - step_4d - step_end - -Movement_163EEE:: @ 8163EEE - step_29 - step_end - -Movement_163EF0:: @ 8163EF0 - step_13 - step_10 - step_1d - step_1d - step_1d - step_1d - step_1d - step_1d - step_1d - step_end - -Movement_163EFA:: @ 8163EFA - step_1c - step_12 - step_10 - step_1d - step_1d - step_1d - step_1d - step_1d - step_1d - step_1d - step_end - -Movement_163F05:: @ 8163F05 - step_1c - step_10 - step_1c - step_10 - step_20 - step_20 - step_1d - step_1d - step_1d - step_1d - step_1d - step_end - -Movement_163F11:: @ 8163F11 - step_1c - step_1b - step_30 - step_end - -Movement_163F15:: @ 8163F15 - step_12 - step_12 - step_end - -Movement_163F18:: @ 8163F18 - step_12 - step_11 - step_end - -Movement_163F1B:: @ 8163F1B - step_26 - step_end - -Movement_163F1D:: @ 8163F1D - step_1b - step_30 - step_1c - step_1c - step_2d - step_end - -Movement_163F23:: @ 8163F23 - step_13 - step_end - -SSAnne_CaptainsOffice3_EventScript_163F25:: @ 8163F25 - loadword 0, gUnknown_817B457 - callstd 2 - end diff --git a/data/maps/SSAnne_CaptainsOffice4/events.inc b/data/maps/SSAnne_CaptainsOffice4/events.inc deleted file mode 100644 index 6aa2900e4..000000000 --- a/data/maps/SSAnne_CaptainsOffice4/events.inc +++ /dev/null @@ -1,49 +0,0 @@ -SSAnne_CaptainsOffice4_EventObjects: - object_event 1, 49, 0, 15, 0, 11, 0, 3, 17, 17, 0, 1, 0, 1, 0, SSAnne_CaptainsOffice4_EventScript_163FE6, 136, 0, 0 - object_event 2, 49, 0, 17, 0, 15, 0, 3, 10, 17, 0, 1, 0, 1, 0, SSAnne_CaptainsOffice4_EventScript_163FFD, 136, 0, 0 - object_event 3, 50, 0, 27, 0, 16, 0, 3, 9, 17, 0, 1, 0, 3, 0, SSAnne_CaptainsOffice4_EventScript_164087, 136, 0, 0 - object_event 4, 49, 0, 25, 0, 11, 0, 3, 10, 17, 0, 1, 0, 3, 0, SSAnne_CaptainsOffice4_EventScript_164014, 136, 0, 0 - object_event 5, 50, 0, 6, 0, 6, 0, 3, 16, 17, 0, 1, 0, 3, 0, SSAnne_CaptainsOffice4_EventScript_164070, 136, 0, 0 - object_event 6, 55, 0, 27, 0, 4, 0, 3, 9, 17, 0, 1, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_163F93, 0, 0, 0 - object_event 7, 92, 0, 8, 0, 25, 0, 3, 8, 17, 0, 0, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_1BED87, 500, 0, 0 - object_event 8, 92, 0, 17, 0, 3, 0, 0, 8, 17, 0, 0, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_1BED94, 501, 0, 0 - object_event 9, 92, 0, 1, 0, 16, 0, 3, 8, 17, 0, 0, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_1BEDA1, 502, 0, 0 - object_event 10, 92, 0, 4, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_1BEDAE, 503, 0, 0 - -SSAnne_CaptainsOffice4_MapWarps: - warp_def 24, 25, 3, 0, 824 - -SSAnne_CaptainsOffice4_MapCoordEvents: - coord_event 22, 11, 3, 0, 16520, 0, 0, SSAnne_CaptainsOffice4_EventScript_163F81 - coord_event 23, 11, 3, 0, 16520, 0, 0, SSAnne_CaptainsOffice4_EventScript_163F81 - coord_event 24, 11, 3, 0, 16520, 0, 0, SSAnne_CaptainsOffice4_EventScript_163F81 - -SSAnne_CaptainsOffice4_MapBGEvents: - bg_event 11, 2, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_163F5A - bg_event 26, 11, 0, 3, 0, SSAnne_CaptainsOffice4_EventScript_163F78 - bg_event 27, 2, 0, 7, 0, 8, 68, 1 - bg_event 7, 16, 0, 7, 0, 6, 69, 1 - bg_event 12, 2, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_163F5A - bg_event 10, 2, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_163F5A - bg_event 9, 2, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_163F5A - bg_event 8, 2, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_163F5A - bg_event 7, 2, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_163F5A - bg_event 11, 5, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_163F5A - bg_event 10, 5, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_163F5A - bg_event 11, 4, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_163F5A - bg_event 10, 4, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_163F5A - bg_event 8, 4, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_163F5A - bg_event 7, 4, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_163F5A - bg_event 8, 5, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_163F5A - bg_event 7, 5, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_163F5A - bg_event 5, 3, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_163F5A - bg_event 4, 3, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_163F5A - bg_event 5, 4, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_163F5A - bg_event 4, 4, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_163F5A - bg_event 3, 4, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_163F5A - bg_event 2, 4, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_163F5A - bg_event 2, 5, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_163F5A - bg_event 3, 5, 0, 0, 0, SSAnne_CaptainsOffice4_EventScript_163F5A - -SSAnne_CaptainsOffice4_MapEvents:: - map_events SSAnne_CaptainsOffice4_EventObjects, SSAnne_CaptainsOffice4_MapWarps, SSAnne_CaptainsOffice4_MapCoordEvents, SSAnne_CaptainsOffice4_MapBGEvents diff --git a/data/maps/SSAnne_CaptainsOffice4/header.inc b/data/maps/SSAnne_CaptainsOffice4/header.inc deleted file mode 100644 index 933c78555..000000000 --- a/data/maps/SSAnne_CaptainsOffice4/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne_CaptainsOffice4:: @ 834FE8C - .4byte SSAnne_CaptainsOffice4_Layout @ 0x83405A4 - .4byte SSAnne_CaptainsOffice4_MapEvents @ 0x83B381C - .4byte SSAnne_CaptainsOffice4_MapScripts @ 0x8163F2E - .4byte NULL - .2byte BGM_FRLG_ROCKET_HIDEOUT - .2byte 292 - .byte 0xb2, 0x00, 0x00, 0x08, 0x00, 0x05, 0x00, 0x03 diff --git a/data/maps/SSAnne_CaptainsOffice4/scripts.inc b/data/maps/SSAnne_CaptainsOffice4/scripts.inc deleted file mode 100644 index ac4d141be..000000000 --- a/data/maps/SSAnne_CaptainsOffice4/scripts.inc +++ /dev/null @@ -1,202 +0,0 @@ -SSAnne_CaptainsOffice4_MapScripts:: @ 8163F2E - map_script 1, SSAnne_CaptainsOffice4_MapScript1_163F3D - map_script 3, SSAnne_CaptainsOffice4_MapScript2_163F39 - .byte 0 - -SSAnne_CaptainsOffice4_MapScript2_163F39:: @ 8163F39 - setworldmapflag 2233 - end - -SSAnne_CaptainsOffice4_MapScript1_163F3D:: @ 8163F3D - checktrainerflag 543 - call_if 1, EventScript_163F47 - end - -EventScript_163F47:: @ 8163F47 - setmetatile 26, 20, 672, 0 - setmetatile 27, 20, 672, 0 - return - -SSAnne_CaptainsOffice4_EventScript_163F5A:: @ 8163F5A - lockall - checkflag FLAG_0x2D5 - goto_if 1, EventScript_163F6E - loadword 0, gUnknown_817B4E3 - callstd 4 - releaseall - end - -EventScript_163F6E:: @ 8163F6E - loadword 0, gUnknown_817B512 - callstd 4 - releaseall - end - -SSAnne_CaptainsOffice4_EventScript_163F78:: @ 8163F78 - loadword 0, gUnknown_817BB15 - callstd 3 - end - -SSAnne_CaptainsOffice4_EventScript_163F81:: @ 8163F81 - lockall - applymovement 4, Movement_1A75E7 - waitmovement 0 - setvar VAR_0x4088, 1 - releaseall - end - -SSAnne_CaptainsOffice4_EventScript_163F93:: @ 8163F93 - trainerbattle 2, 545, 0, Text_17BBAF, Text_17BC55, EventScript_163FCD - checkflag 2116 - goto_if 1, EventScript_163FB7 - loadword 0, gUnknown_817BCA3 - callstd 6 - end - -EventScript_163FB7:: @ 8163FB7 - setvar VAR_0x8004, 15 - setvar VAR_0x8005, 5 - special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_817BCD7 - callstd 6 - end - -EventScript_163FCD:: @ 8163FCD - loadword 0, gUnknown_817BC6C - callstd 4 - setflag FLAG_0x2DC - setorcopyvar VAR_0x8000, 374 - setorcopyvar VAR_0x8001, 1 - callstd 0 - release - end - -SSAnne_CaptainsOffice4_EventScript_163FE6:: @ 8163FE6 - trainerbattle 0, 541, 0, Text_17B54D, Text_17B585 - loadword 0, gUnknown_817B5A6 - callstd 6 - end - -SSAnne_CaptainsOffice4_EventScript_163FFD:: @ 8163FFD - trainerbattle 0, 542, 0, Text_17B677, Text_17B6D9 - loadword 0, gUnknown_817B6EF - callstd 6 - end - -SSAnne_CaptainsOffice4_EventScript_164014:: @ 8164014 - trainerbattle 2, 544, 0, Text_17B8DA, Text_17B9FB, EventScript_16402F - loadword 0, gUnknown_817BA64 - callstd 6 - end - -EventScript_16402F:: @ 816402F - getplayerxy VAR_0x8004, VAR_0x8005 - compare_var_to_value VAR_0x8004, 24 - call_if 3, EventScript_164065 - loadword 0, gUnknown_817BA64 - callstd 4 - closemessage - fadescreen 1 - removeobject 1 - removeobject 2 - removeobject 4 - removeobject 3 - setflag FLAG_0x088 - fadescreen 0 - setvar VAR_0x4088, 1 - setflag FLAG_0x2D5 - release - end - -EventScript_164065:: @ 8164065 - applymovement 255, Movement_1A75EB - waitmovement 0 - return - -SSAnne_CaptainsOffice4_EventScript_164070:: @ 8164070 - trainerbattle 0, 516, 0, Text_17B5D6, Text_17B62F - loadword 0, gUnknown_817B642 - callstd 6 - end - -SSAnne_CaptainsOffice4_EventScript_164087:: @ 8164087 - trainerbattle 2, 543, 0, Text_17B72D, Text_17B79C, EventScript_1640A2 - loadword 0, gUnknown_817B7FA - callstd 6 - end - -EventScript_1640A2:: @ 81640A2 - getplayerxy VAR_0x8004, VAR_0x8005 - specialvar VAR_RESULT, player_get_direction_lower_nybble - compare_var_to_value VAR_RESULT, 2 - call_if 1, EventScript_16412E - loadword 0, gUnknown_817B7AE - callstd 4 - closemessage - compare_var_to_value VAR_0x8004, 24 - call_if 3, EventScript_164144 - compare_var_to_value VAR_0x8004, 25 - call_if 1, EventScript_16414F - compare_var_to_value VAR_0x8004, 26 - call_if 1, EventScript_16415A - compare_var_to_value VAR_0x8004, 27 - call_if 1, EventScript_16415A - playse SE_PIN - call EventScript_163F47 - special DrawWholeMapView - waitse - compare_var_to_value VAR_0x8004, 24 - call_if 3, EventScript_164165 - compare_var_to_value VAR_0x8004, 25 - call_if 1, EventScript_164165 - compare_var_to_value VAR_0x8004, 26 - call_if 1, EventScript_164165 - compare_var_to_value VAR_0x8004, 27 - call_if 1, EventScript_164170 - loadword 0, gUnknown_817B7FA - callstd 4 - release - end - -EventScript_16412E:: @ 816412E - compare_var_to_value VAR_0x8004, 27 - goto_if 1, EventScript_1A77A9 - applymovement 255, Movement_1A75EB - waitmovement 0 - return - -EventScript_164144:: @ 8164144 - applymovement 3, Movement_16417B - waitmovement 0 - return - -EventScript_16414F:: @ 816414F - applymovement 3, Movement_16417F - waitmovement 0 - return - -EventScript_16415A:: @ 816415A - applymovement 3, Movement_1A75E9 - waitmovement 0 - return - -EventScript_164165:: @ 8164165 - applymovement 3, Movement_1A75E7 - waitmovement 0 - return - -EventScript_164170:: @ 8164170 - applymovement 3, Movement_1A75ED - waitmovement 0 - return - -Movement_16417B:: @ 816417B - step_13 - step_13 - step_2e - step_end - -Movement_16417F:: @ 816417F - step_13 - step_2e - step_end diff --git a/data/maps/SSAnne_CaptainsOffice5/events.inc b/data/maps/SSAnne_CaptainsOffice5/events.inc deleted file mode 100644 index 6939d5902..000000000 --- a/data/maps/SSAnne_CaptainsOffice5/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne_CaptainsOffice5_MapWarps: - warp_def 6, 9, 3, 0, 829 - warp_def 6, 5, 3, 0, 372 - warp_def 13, 5, 3, 0, 376 - warp_def 6, 7, 3, 2, 372 - -SSAnne_CaptainsOffice5_MapEvents:: - map_events 0x0, SSAnne_CaptainsOffice5_MapWarps, 0x0, 0x0 diff --git a/data/maps/SSAnne_CaptainsOffice5/header.inc b/data/maps/SSAnne_CaptainsOffice5/header.inc deleted file mode 100644 index c735393a0..000000000 --- a/data/maps/SSAnne_CaptainsOffice5/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne_CaptainsOffice5:: @ 834FEA8 - .4byte SSAnne_CaptainsOffice5_Layout @ 0x83436C4 - .4byte SSAnne_CaptainsOffice5_MapEvents @ 0x83B3850 - .4byte SSAnne_CaptainsOffice5_MapScripts @ 0x8164182 - .4byte NULL - .2byte BGM_FRLG_TANOBY_RUINS - .2byte 309 - .byte 0xb4, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/SSAnne_CaptainsOffice5/scripts.inc b/data/maps/SSAnne_CaptainsOffice5/scripts.inc deleted file mode 100644 index 7effe1b4a..000000000 --- a/data/maps/SSAnne_CaptainsOffice5/scripts.inc +++ /dev/null @@ -1,35 +0,0 @@ -SSAnne_CaptainsOffice5_MapScripts:: @ 8164182 - map_script 3, SSAnne_CaptainsOffice5_MapScript1_164188 - .byte 0 - -SSAnne_CaptainsOffice5_MapScript1_164188:: @ 8164188 - setworldmapflag 2235 - end - -SixIsland_DottedHole_B1F_EventScript_16418C:: @ 816418C - lockall - braillemessage gUnknown_81A9288 - waitbuttonpress - releaseall - end - -SSAnne_CaptainsOffice9_EventScript_164195:: @ 8164195 - lockall - braillemessage gUnknown_81A928B - waitbuttonpress - releaseall - end - -SixIsland_DottedHole_B3F_EventScript_16419E:: @ 816419E - lockall - braillemessage gUnknown_81A9290 - waitbuttonpress - releaseall - end - -SixIsland_DottedHole_B2F_EventScript_1641A7:: @ 81641A7 - lockall - braillemessage gUnknown_81A9296 - waitbuttonpress - releaseall - end diff --git a/data/maps/SSAnne_CaptainsOffice9/events.inc b/data/maps/SSAnne_CaptainsOffice9/events.inc deleted file mode 100644 index aeaa11fa8..000000000 --- a/data/maps/SSAnne_CaptainsOffice9/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -SSAnne_CaptainsOffice9_MapWarps: - warp_def 6, 7, 3, 2, 374 - warp_def 6, 1, 3, 3, 371 - warp_def 11, 5, 3, 3, 371 - warp_def 6, 9, 3, 1, 376 - warp_def 1, 5, 3, 3, 371 - -SSAnne_CaptainsOffice9_MapBGEvents: - bg_event 6, 5, 0, 1, 0, SSAnne_CaptainsOffice9_EventScript_164195 - -SSAnne_CaptainsOffice9_MapEvents:: - map_events 0x0, SSAnne_CaptainsOffice9_MapWarps, 0x0, SSAnne_CaptainsOffice9_MapBGEvents diff --git a/data/maps/SSAnne_CaptainsOffice9/header.inc b/data/maps/SSAnne_CaptainsOffice9/header.inc deleted file mode 100644 index 5d4aad26b..000000000 --- a/data/maps/SSAnne_CaptainsOffice9/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne_CaptainsOffice9:: @ 834FF18 - .4byte SSAnne_CaptainsOffice9_Layout @ 0x8343BD4 - .4byte SSAnne_CaptainsOffice9_MapEvents @ 0x83B3970 - .4byte SSAnne_CaptainsOffice9_MapScripts @ 0x81641B3 - .4byte NULL - .2byte BGM_FRLG_TANOBY_RUINS - .2byte 313 - .byte 0xb4, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/SSAnne_CaptainsOffice9/scripts.inc b/data/maps/SSAnne_CaptainsOffice9/scripts.inc deleted file mode 100644 index 5ce3448b5..000000000 --- a/data/maps/SSAnne_CaptainsOffice9/scripts.inc +++ /dev/null @@ -1,2 +0,0 @@ -SSAnne_CaptainsOffice9_MapScripts:: @ 81641B3 - .byte 0 diff --git a/data/maps/SSAnne_Deck/events.inc b/data/maps/SSAnne_Deck/events.inc deleted file mode 100644 index 9e18e8087..000000000 --- a/data/maps/SSAnne_Deck/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -SSAnne_Deck_EventObjects: - object_event 1, 62, 0, 12, 0, 10, 0, 3, 7, 17, 0, 1, 0, 2, 0, SSAnne_Deck_EventScript_160A9B, 0, 0, 0 - object_event 2, 30, 0, 14, 0, 11, 0, 3, 8, 17, 0, 0, 0, 0, 0, SSAnne_Deck_EventScript_160A72, 0, 0, 0 - object_event 3, 62, 0, 13, 0, 13, 0, 3, 27, 20, 0, 0, 0, 0, 0, SSAnne_Deck_EventScript_160A7B, 0, 0, 0 - object_event 4, 62, 0, 6, 0, 9, 0, 3, 2, 17, 0, 1, 0, 1, 0, SSAnne_Deck_EventScript_160A84, 0, 0, 0 - object_event 5, 18, 0, 11, 0, 5, 0, 3, 9, 17, 0, 0, 0, 0, 0, SSAnne_Deck_EventScript_160A69, 0, 0, 0 - -SSAnne_Deck_MapWarps: - warp_def 16, 8, 3, 0, 263 - warp_def 16, 9, 3, 0, 263 - -SSAnne_Deck_MapEvents:: - map_events SSAnne_Deck_EventObjects, SSAnne_Deck_MapWarps, 0x0, 0x0 diff --git a/data/maps/SSAnne_Deck/header.inc b/data/maps/SSAnne_Deck/header.inc deleted file mode 100644 index ae12f7727..000000000 --- a/data/maps/SSAnne_Deck/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne_Deck:: @ 834F310 - .4byte SSAnne_Deck_Layout @ 0x8300624 - .4byte SSAnne_Deck_MapEvents @ 0x83AEB60 - .4byte SSAnne_Deck_MapScripts @ 0x8160A68 - .4byte NULL - .2byte BGM_FRLG_SS_ANNE - .2byte 123 - .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/SSAnne_Deck/map.json b/data/maps/SSAnne_Deck/map.json new file mode 100644 index 000000000..1ed41546e --- /dev/null +++ b/data/maps/SSAnne_Deck/map.json @@ -0,0 +1,100 @@ +{ + "id": "MAP_SSANNE_DECK", + "name": "SSAnne_Deck", + "layout": "LAYOUT_SSANNE_DECK", + "music": "BGM_FRLG_SS_ANNE", + "region_map_section": "MAPSEC_S_S_ANNE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "62", + "x": 12, + "y": 10, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "SSAnne_Deck_EventScript_160A9B", + "flag": "0" + }, + { + "graphics_id": "30", + "x": 14, + "y": 11, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_Deck_EventScript_160A72", + "flag": "0" + }, + { + "graphics_id": "62", + "x": 13, + "y": 13, + "elevation": 3, + "movement_type": "27", + "movement_range_x": 4, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_Deck_EventScript_160A7B", + "flag": "0" + }, + { + "graphics_id": "62", + "x": 6, + "y": 9, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SSAnne_Deck_EventScript_160A84", + "flag": "0" + }, + { + "graphics_id": "18", + "x": 11, + "y": 5, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_Deck_EventScript_160A69", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 16, + "y": 8, + "elevation": 3, + "dest_map": "MAP_SSANNE_3F_CORRIDOR", + "dest_warp_id": 0 + }, + { + "x": 16, + "y": 9, + "elevation": 3, + "dest_map": "MAP_SSANNE_3F_CORRIDOR", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SSAnne_Exterior/events.inc b/data/maps/SSAnne_Exterior/events.inc deleted file mode 100644 index 06c219134..000000000 --- a/data/maps/SSAnne_Exterior/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -SSAnne_Exterior_EventObjects: - object_event 1, 151, 0, 30, 0, 16, 0, 1, 8, 17, 0, 0, 0, 0, 0, 0x0, 135, 0, 0 - -SSAnne_Exterior_MapWarps: - warp_def 31, 5, 0, 0, 773 - warp_def 32, 5, 3, 1, 773 - warp_def 32, 14, 3, 2, 261 - warp_def 33, 15, 0, 3, 261 - warp_def 33, 5, 0, 2, 773 - -SSAnne_Exterior_MapBGEvents: - bg_event 58, 28, 3, 7, 0, 38, 190, 1 - -SSAnne_Exterior_MapEvents:: - map_events SSAnne_Exterior_EventObjects, SSAnne_Exterior_MapWarps, 0x0, SSAnne_Exterior_MapBGEvents diff --git a/data/maps/SSAnne_Exterior/header.inc b/data/maps/SSAnne_Exterior/header.inc deleted file mode 100644 index a16473ca7..000000000 --- a/data/maps/SSAnne_Exterior/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne_Exterior:: @ 834F284 - .4byte SSAnne_Exterior_Layout @ 0x82FF610 - .4byte SSAnne_Exterior_MapEvents @ 0x83AE8C8 - .4byte SSAnne_Exterior_MapScripts @ 0x8160840 - .4byte NULL - .2byte BGM_FRLG_SS_ANNE - .2byte 118 - .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/SSAnne_Exterior/map.json b/data/maps/SSAnne_Exterior/map.json new file mode 100644 index 000000000..8ef5cbc5a --- /dev/null +++ b/data/maps/SSAnne_Exterior/map.json @@ -0,0 +1,79 @@ +{ + "id": "MAP_SSANNE_EXTERIOR", + "name": "SSAnne_Exterior", + "layout": "LAYOUT_SSANNE_EXTERIOR", + "music": "BGM_FRLG_SS_ANNE", + "region_map_section": "MAPSEC_S_S_ANNE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "151", + "x": 30, + "y": 16, + "elevation": 1, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "135" + } + ], + "warp_events": [ + { + "x": 31, + "y": 5, + "elevation": 0, + "dest_map": "MAP_VERMILION_CITY", + "dest_warp_id": 0 + }, + { + "x": 32, + "y": 5, + "elevation": 3, + "dest_map": "MAP_VERMILION_CITY", + "dest_warp_id": 1 + }, + { + "x": 32, + "y": 14, + "elevation": 3, + "dest_map": "MAP_SSANNE_1F_CORRIDOR", + "dest_warp_id": 2 + }, + { + "x": 33, + "y": 15, + "elevation": 0, + "dest_map": "MAP_SSANNE_1F_CORRIDOR", + "dest_warp_id": 3 + }, + { + "x": 33, + "y": 5, + "elevation": 0, + "dest_map": "MAP_VERMILION_CITY", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 58, + "y": 28, + "elevation": 3, + "item": "ITEM_LAVA_COOKIE", + "flag": "190", + "unknown": 1 + } + ] +} \ No newline at end of file diff --git a/data/maps/SSAnne_Kitchen/events.inc b/data/maps/SSAnne_Kitchen/events.inc deleted file mode 100644 index d5034af53..000000000 --- a/data/maps/SSAnne_Kitchen/events.inc +++ /dev/null @@ -1,20 +0,0 @@ -SSAnne_Kitchen_EventObjects: - object_event 1, 59, 0, 1, 0, 5, 0, 3, 3, 17, 0, 0, 0, 0, 0, SSAnne_Kitchen_EventScript_160AB3, 0, 0, 0 - object_event 2, 59, 0, 6, 0, 6, 0, 3, 3, 33, 0, 0, 0, 0, 0, SSAnne_Kitchen_EventScript_160ABC, 0, 0, 0 - object_event 3, 59, 0, 10, 0, 4, 0, 3, 18, 17, 0, 0, 0, 0, 0, SSAnne_Kitchen_EventScript_160AC5, 0, 0, 0 - object_event 4, 59, 0, 8, 0, 9, 0, 3, 7, 17, 0, 0, 0, 0, 0, SSAnne_Kitchen_EventScript_160ACE, 0, 0, 0 - object_event 5, 59, 0, 14, 0, 5, 0, 3, 7, 17, 0, 0, 0, 0, 0, SSAnne_Kitchen_EventScript_160B1E, 0, 0, 0 - object_event 6, 59, 0, 14, 0, 7, 0, 3, 9, 17, 0, 0, 0, 0, 0, SSAnne_Kitchen_EventScript_160B27, 0, 0, 0 - object_event 7, 59, 0, 14, 0, 9, 0, 3, 7, 17, 0, 0, 0, 0, 0, SSAnne_Kitchen_EventScript_160B30, 0, 0, 0 - object_event 8, 92, 0, 1, 0, 10, 0, 3, 8, 17, 0, 0, 0, 0, 0, SSAnne_Kitchen_EventScript_1BE6AC, 362, 0, 0 - -SSAnne_Kitchen_MapWarps: - warp_def 7, 1, 0, 1, 261 - -SSAnne_Kitchen_MapBGEvents: - bg_event 14, 8, 0, 7, 0, 134, 122, 1 - bg_event 14, 4, 0, 7, 0, 135, 120, 1 - bg_event 14, 6, 0, 7, 0, 133, 121, 1 - -SSAnne_Kitchen_MapEvents:: - map_events SSAnne_Kitchen_EventObjects, SSAnne_Kitchen_MapWarps, 0x0, SSAnne_Kitchen_MapBGEvents diff --git a/data/maps/SSAnne_Kitchen/header.inc b/data/maps/SSAnne_Kitchen/header.inc deleted file mode 100644 index a2128fe93..000000000 --- a/data/maps/SSAnne_Kitchen/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne_Kitchen:: @ 834F32C - .4byte SSAnne_Kitchen_Layout @ 0x8319214 - .4byte SSAnne_Kitchen_MapEvents @ 0x83AEC60 - .4byte SSAnne_Kitchen_MapScripts @ 0x8160AB2 - .4byte NULL - .2byte BGM_FRLG_SS_ANNE - .2byte 170 - .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/SSAnne_Kitchen/map.json b/data/maps/SSAnne_Kitchen/map.json new file mode 100644 index 000000000..bb094e87c --- /dev/null +++ b/data/maps/SSAnne_Kitchen/map.json @@ -0,0 +1,160 @@ +{ + "id": "MAP_SSANNE_KITCHEN", + "name": "SSAnne_Kitchen", + "layout": "LAYOUT_SSANNE_KITCHEN", + "music": "BGM_FRLG_SS_ANNE", + "region_map_section": "MAPSEC_S_S_ANNE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "59", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "3", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_Kitchen_EventScript_160AB3", + "flag": "0" + }, + { + "graphics_id": "59", + "x": 6, + "y": 6, + "elevation": 3, + "movement_type": "3", + "movement_range_x": 1, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_Kitchen_EventScript_160ABC", + "flag": "0" + }, + { + "graphics_id": "59", + "x": 10, + "y": 4, + "elevation": 3, + "movement_type": "18", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_Kitchen_EventScript_160AC5", + "flag": "0" + }, + { + "graphics_id": "59", + "x": 8, + "y": 9, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_Kitchen_EventScript_160ACE", + "flag": "0" + }, + { + "graphics_id": "59", + "x": 14, + "y": 5, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_Kitchen_EventScript_160B1E", + "flag": "0" + }, + { + "graphics_id": "59", + "x": 14, + "y": 7, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_Kitchen_EventScript_160B27", + "flag": "0" + }, + { + "graphics_id": "59", + "x": 14, + "y": 9, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_Kitchen_EventScript_160B30", + "flag": "0" + }, + { + "graphics_id": "92", + "x": 1, + "y": 10, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSAnne_Kitchen_EventScript_1BE6AC", + "flag": "362" + } + ], + "warp_events": [ + { + "x": 7, + "y": 1, + "elevation": 0, + "dest_map": "MAP_SSANNE_1F_CORRIDOR", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 14, + "y": 8, + "elevation": 0, + "item": "ITEM_CHESTO_BERRY", + "flag": "122", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 14, + "y": 4, + "elevation": 0, + "item": "ITEM_PECHA_BERRY", + "flag": "120", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 14, + "y": 6, + "elevation": 0, + "item": "ITEM_CHERI_BERRY", + "flag": "121", + "unknown": 1 + } + ] +} \ No newline at end of file diff --git a/data/maps/SSAnne_Kitchen3/events.inc b/data/maps/SSAnne_Kitchen3/events.inc deleted file mode 100644 index 0c7152178..000000000 --- a/data/maps/SSAnne_Kitchen3/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -SSAnne_Kitchen3_EventObjects: - object_event 1, 96, 0, 18, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, SSAnne_Kitchen3_EventScript_1BE00C, 18, 0, 0 - object_event 2, 96, 0, 23, 0, 16, 0, 3, 1, 17, 0, 0, 0, 0, 0, SSAnne_Kitchen3_EventScript_1BE00C, 19, 0, 0 - object_event 3, 96, 0, 20, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, SSAnne_Kitchen3_EventScript_1BE00C, 20, 0, 0 - object_event 4, 96, 0, 19, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, SSAnne_Kitchen3_EventScript_1BE00C, 21, 0, 0 - object_event 5, 96, 0, 21, 0, 15, 0, 3, 1, 17, 0, 0, 0, 0, 0, SSAnne_Kitchen3_EventScript_1BE00C, 22, 0, 0 - -SSAnne_Kitchen3_MapWarps: - warp_def 22, 17, 3, 5, 353 - warp_def 1, 1, 0, 0, 360 - warp_def 24, 5, 0, 1, 364 - -SSAnne_Kitchen3_MapEvents:: - map_events SSAnne_Kitchen3_EventObjects, SSAnne_Kitchen3_MapWarps, 0x0, 0x0 diff --git a/data/maps/SSAnne_Kitchen3/header.inc b/data/maps/SSAnne_Kitchen3/header.inc deleted file mode 100644 index de8d49593..000000000 --- a/data/maps/SSAnne_Kitchen3/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne_Kitchen3:: @ 834FD58 - .4byte SSAnne_Kitchen3_Layout @ 0x833F304 - .4byte SSAnne_Kitchen3_MapEvents @ 0x83B2EE0 - .4byte SSAnne_Kitchen3_MapScripts @ 0x8163C45 - .4byte NULL - .2byte BGM_FRLG_MT_EMBER - .2byte 285 - .byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/SSAnne_Kitchen3/scripts.inc b/data/maps/SSAnne_Kitchen3/scripts.inc deleted file mode 100644 index a6a4664e3..000000000 --- a/data/maps/SSAnne_Kitchen3/scripts.inc +++ /dev/null @@ -1,2 +0,0 @@ -SSAnne_Kitchen3_MapScripts:: @ 8163C45 - .byte 0 diff --git a/data/maps/SafariZone_Building1/events.inc b/data/maps/SafariZone_Building1/events.inc deleted file mode 100644 index afd3d4575..000000000 --- a/data/maps/SafariZone_Building1/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -SafariZone_Building1_EventObjects: - object_event 1, 55, 0, 3, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, SafariZone_Building1_EventScript_1623F5, 0, 0, 0 - object_event 2, 23, 0, 7, 0, 3, 0, 3, 8, 17, 0, 0, 0, 0, 0, SafariZone_Building1_EventScript_1623EC, 0, 0, 0 - -SafariZone_Building1_MapWarps: - warp_def 3, 9, 3, 12, 319 - warp_def 4, 9, 3, 12, 319 - warp_def 5, 9, 3, 12, 319 - -SafariZone_Building1_MapEvents:: - map_events SafariZone_Building1_EventObjects, SafariZone_Building1_MapWarps, 0x0, 0x0 diff --git a/data/maps/SafariZone_Building1/header.inc b/data/maps/SafariZone_Building1/header.inc deleted file mode 100644 index e65a0ceb1..000000000 --- a/data/maps/SafariZone_Building1/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SafariZone_Building1:: @ 834F968 - .4byte SafariZone_Building_Layout @ 0x831C028 - .4byte SafariZone_Building1_MapEvents @ 0x83B12CC - .4byte SafariZone_Building1_MapScripts @ 0x81623EB - .4byte NULL - .2byte BGM_FRLG_SAFARI_ZONE - .2byte 198 - .byte 0x88, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/SafariZone_Building1/map.json b/data/maps/SafariZone_Building1/map.json new file mode 100644 index 000000000..09b84bb5b --- /dev/null +++ b/data/maps/SafariZone_Building1/map.json @@ -0,0 +1,68 @@ +{ + "id": "MAP_SAFARI_ZONE_BUILDING1", + "name": "SafariZone_Building1", + "layout": "LAYOUT_SAFARI_ZONE_BUILDING", + "music": "BGM_FRLG_SAFARI_ZONE", + "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "55", + "x": 3, + "y": 4, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_Building1_EventScript_1623F5", + "flag": "0" + }, + { + "graphics_id": "23", + "x": 7, + "y": 3, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_Building1_EventScript_1623EC", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 9, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_CENTER", + "dest_warp_id": 12 + }, + { + "x": 4, + "y": 9, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_CENTER", + "dest_warp_id": 12 + }, + { + "x": 5, + "y": 9, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_CENTER", + "dest_warp_id": 12 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SafariZone_Building2/events.inc b/data/maps/SafariZone_Building2/events.inc deleted file mode 100644 index fadf6acc5..000000000 --- a/data/maps/SafariZone_Building2/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -SafariZone_Building2_EventObjects: - object_event 1, 55, 0, 3, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, SafariZone_Building2_EventScript_162408, 0, 0, 0 - object_event 2, 26, 0, 6, 0, 3, 0, 3, 8, 17, 0, 0, 0, 0, 0, SafariZone_Building2_EventScript_1623FF, 0, 0, 0 - object_event 3, 30, 0, 7, 0, 3, 0, 3, 8, 17, 0, 0, 0, 0, 0, SafariZone_Building2_EventScript_162411, 0, 0, 0 - -SafariZone_Building2_MapWarps: - warp_def 3, 9, 3, 6, 320 - warp_def 4, 9, 3, 6, 320 - warp_def 5, 9, 3, 6, 320 - -SafariZone_Building2_MapEvents:: - map_events SafariZone_Building2_EventObjects, SafariZone_Building2_MapWarps, 0x0, 0x0 diff --git a/data/maps/SafariZone_Building2/header.inc b/data/maps/SafariZone_Building2/header.inc deleted file mode 100644 index 706671bbb..000000000 --- a/data/maps/SafariZone_Building2/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SafariZone_Building2:: @ 834F984 - .4byte SafariZone_Building_Layout @ 0x831C028 - .4byte SafariZone_Building2_MapEvents @ 0x83B1340 - .4byte SafariZone_Building2_MapScripts @ 0x81623FE - .4byte NULL - .2byte BGM_FRLG_SAFARI_ZONE - .2byte 198 - .byte 0x88, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/SafariZone_Building2/map.json b/data/maps/SafariZone_Building2/map.json new file mode 100644 index 000000000..96282855f --- /dev/null +++ b/data/maps/SafariZone_Building2/map.json @@ -0,0 +1,81 @@ +{ + "id": "MAP_SAFARI_ZONE_BUILDING2", + "name": "SafariZone_Building2", + "layout": "LAYOUT_SAFARI_ZONE_BUILDING", + "music": "BGM_FRLG_SAFARI_ZONE", + "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "55", + "x": 3, + "y": 5, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_Building2_EventScript_162408", + "flag": "0" + }, + { + "graphics_id": "26", + "x": 6, + "y": 3, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_Building2_EventScript_1623FF", + "flag": "0" + }, + { + "graphics_id": "30", + "x": 7, + "y": 3, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_Building2_EventScript_162411", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 9, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_EAST", + "dest_warp_id": 6 + }, + { + "x": 4, + "y": 9, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_EAST", + "dest_warp_id": 6 + }, + { + "x": 5, + "y": 9, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_EAST", + "dest_warp_id": 6 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SafariZone_Building3/events.inc b/data/maps/SafariZone_Building3/events.inc deleted file mode 100644 index ec99802bb..000000000 --- a/data/maps/SafariZone_Building3/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -SafariZone_Building3_EventObjects: - object_event 1, 61, 0, 3, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, SafariZone_Building3_EventScript_16242D, 0, 0, 0 - object_event 2, 55, 0, 7, 0, 5, 0, 3, 2, 17, 0, 0, 0, 0, 0, SafariZone_Building3_EventScript_162424, 0, 0, 0 - object_event 3, 57, 0, 6, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0, 0, SafariZone_Building3_EventScript_16241B, 0, 0, 0 - object_event 4, 30, 0, 11, 0, 2, 0, 3, 7, 17, 0, 0, 0, 0, 0, SafariZone_Building3_EventScript_1ACED3, 0, 0, 0 - -SafariZone_Building3_MapWarps: - warp_def 3, 9, 3, 12, 321 - warp_def 4, 9, 3, 12, 321 - warp_def 5, 9, 3, 12, 321 - -SafariZone_Building3_MapEvents:: - map_events SafariZone_Building3_EventObjects, SafariZone_Building3_MapWarps, 0x0, 0x0 diff --git a/data/maps/SafariZone_Building3/header.inc b/data/maps/SafariZone_Building3/header.inc deleted file mode 100644 index 219c3a1a4..000000000 --- a/data/maps/SafariZone_Building3/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SafariZone_Building3:: @ 834F9A0 - .4byte SafariZone_Building_Layout @ 0x831C028 - .4byte SafariZone_Building3_MapEvents @ 0x83B13CC - .4byte SafariZone_Building3_MapScripts @ 0x816241A - .4byte NULL - .2byte BGM_FRLG_SAFARI_ZONE - .2byte 198 - .byte 0x88, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/SafariZone_Building3/map.json b/data/maps/SafariZone_Building3/map.json new file mode 100644 index 000000000..47480065a --- /dev/null +++ b/data/maps/SafariZone_Building3/map.json @@ -0,0 +1,94 @@ +{ + "id": "MAP_SAFARI_ZONE_BUILDING3", + "name": "SafariZone_Building3", + "layout": "LAYOUT_SAFARI_ZONE_BUILDING", + "music": "BGM_FRLG_SAFARI_ZONE", + "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "61", + "x": 3, + "y": 4, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_Building3_EventScript_16242D", + "flag": "0" + }, + { + "graphics_id": "55", + "x": 7, + "y": 5, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_Building3_EventScript_162424", + "flag": "0" + }, + { + "graphics_id": "57", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_Building3_EventScript_16241B", + "flag": "0" + }, + { + "graphics_id": "30", + "x": 11, + "y": 2, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_Building3_EventScript_1ACED3", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 9, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_NORTH", + "dest_warp_id": 12 + }, + { + "x": 4, + "y": 9, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_NORTH", + "dest_warp_id": 12 + }, + { + "x": 5, + "y": 9, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_NORTH", + "dest_warp_id": 12 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SafariZone_Building4/events.inc b/data/maps/SafariZone_Building4/events.inc deleted file mode 100644 index e22f4251e..000000000 --- a/data/maps/SafariZone_Building4/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -SafariZone_Building4_EventObjects: - object_event 1, 55, 0, 3, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, SafariZone_Building4_EventScript_162440, 0, 0, 0 - object_event 2, 25, 0, 2, 0, 2, 0, 0, 1, 17, 0, 0, 0, 0, 0, SafariZone_Building4_EventScript_162437, 0, 0, 0 - object_event 3, 42, 0, 7, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, SafariZone_Building4_EventScript_162449, 0, 0, 0 - -SafariZone_Building4_MapWarps: - warp_def 3, 9, 3, 10, 322 - warp_def 4, 9, 3, 10, 322 - warp_def 5, 9, 3, 10, 322 - -SafariZone_Building4_MapEvents:: - map_events SafariZone_Building4_EventObjects, SafariZone_Building4_MapWarps, 0x0, 0x0 diff --git a/data/maps/SafariZone_Building4/header.inc b/data/maps/SafariZone_Building4/header.inc deleted file mode 100644 index 60fa37573..000000000 --- a/data/maps/SafariZone_Building4/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SafariZone_Building4:: @ 834F9BC - .4byte SafariZone_Building_Layout @ 0x831C028 - .4byte SafariZone_Building4_MapEvents @ 0x83B1440 - .4byte SafariZone_Building4_MapScripts @ 0x8162436 - .4byte NULL - .2byte BGM_FRLG_SAFARI_ZONE - .2byte 198 - .byte 0x88, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/SafariZone_Building4/map.json b/data/maps/SafariZone_Building4/map.json new file mode 100644 index 000000000..2cfc647cd --- /dev/null +++ b/data/maps/SafariZone_Building4/map.json @@ -0,0 +1,81 @@ +{ + "id": "MAP_SAFARI_ZONE_BUILDING4", + "name": "SafariZone_Building4", + "layout": "LAYOUT_SAFARI_ZONE_BUILDING", + "music": "BGM_FRLG_SAFARI_ZONE", + "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "55", + "x": 3, + "y": 4, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_Building4_EventScript_162440", + "flag": "0" + }, + { + "graphics_id": "25", + "x": 2, + "y": 2, + "elevation": 0, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_Building4_EventScript_162437", + "flag": "0" + }, + { + "graphics_id": "42", + "x": 7, + "y": 3, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_Building4_EventScript_162449", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 9, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_WEST", + "dest_warp_id": 10 + }, + { + "x": 4, + "y": 9, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_WEST", + "dest_warp_id": 10 + }, + { + "x": 5, + "y": 9, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_WEST", + "dest_warp_id": 10 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SafariZone_Center/events.inc b/data/maps/SafariZone_Center/events.inc deleted file mode 100644 index d77cae266..000000000 --- a/data/maps/SafariZone_Center/events.inc +++ /dev/null @@ -1,26 +0,0 @@ -SafariZone_Center_EventObjects: - object_event 1, 92, 0, 24, 0, 15, 0, 3, 8, 17, 0, 0, 0, 0, 0, SafariZone_Center_EventScript_1BE7D7, 385, 0, 0 - -SafariZone_Center_MapWarps: - warp_def 25, 30, 3, 0, 2816 - warp_def 26, 30, 3, 0, 2816 - warp_def 27, 30, 3, 0, 2816 - warp_def 25, 5, 3, 9, 321 - warp_def 26, 5, 3, 10, 321 - warp_def 27, 5, 0, 11, 321 - warp_def 8, 17, 3, 6, 322 - warp_def 8, 18, 3, 7, 322 - warp_def 8, 19, 0, 8, 322 - warp_def 43, 15, 3, 3, 320 - warp_def 43, 16, 3, 4, 320 - warp_def 43, 17, 0, 5, 320 - warp_def 29, 25, 0, 1, 323 - -SafariZone_Center_MapBGEvents: - bg_event 30, 26, 0, 0, 0, SafariZone_Center_EventScript_162361 - bg_event 25, 27, 0, 0, 0, SafariZone_Center_EventScript_16236A - bg_event 27, 15, 3, 7, 0, 98, 22, 1 - bg_event 33, 20, 0, 0, 0, SafariZone_Center_EventScript_162373 - -SafariZone_Center_MapEvents:: - map_events SafariZone_Center_EventObjects, SafariZone_Center_MapWarps, 0x0, SafariZone_Center_MapBGEvents diff --git a/data/maps/SafariZone_Center/header.inc b/data/maps/SafariZone_Center/header.inc deleted file mode 100644 index 9a2b3f5cc..000000000 --- a/data/maps/SafariZone_Center/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SafariZone_Center:: @ 834F8F8 - .4byte SafariZone_Center_Layout @ 0x830DD38 - .4byte SafariZone_Center_MapEvents @ 0x83B0F98 - .4byte SafariZone_Center_MapScripts @ 0x8162357 - .4byte NULL - .2byte BGM_FRLG_SAFARI_ZONE - .2byte 147 - .byte 0x88, 0x00, 0x00, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/SafariZone_Center/map.json b/data/maps/SafariZone_Center/map.json new file mode 100644 index 000000000..0ef1fd180 --- /dev/null +++ b/data/maps/SafariZone_Center/map.json @@ -0,0 +1,156 @@ +{ + "id": "MAP_SAFARI_ZONE_CENTER", + "name": "SafariZone_Center", + "layout": "LAYOUT_SAFARI_ZONE_CENTER", + "music": "BGM_FRLG_SAFARI_ZONE", + "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "92", + "x": 24, + "y": 15, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_Center_EventScript_1BE7D7", + "flag": "385" + } + ], + "warp_events": [ + { + "x": 25, + "y": 30, + "elevation": 3, + "dest_map": "MAP_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE", + "dest_warp_id": 0 + }, + { + "x": 26, + "y": 30, + "elevation": 3, + "dest_map": "MAP_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE", + "dest_warp_id": 0 + }, + { + "x": 27, + "y": 30, + "elevation": 3, + "dest_map": "MAP_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE", + "dest_warp_id": 0 + }, + { + "x": 25, + "y": 5, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_NORTH", + "dest_warp_id": 9 + }, + { + "x": 26, + "y": 5, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_NORTH", + "dest_warp_id": 10 + }, + { + "x": 27, + "y": 5, + "elevation": 0, + "dest_map": "MAP_SAFARI_ZONE_NORTH", + "dest_warp_id": 11 + }, + { + "x": 8, + "y": 17, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_WEST", + "dest_warp_id": 6 + }, + { + "x": 8, + "y": 18, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_WEST", + "dest_warp_id": 7 + }, + { + "x": 8, + "y": 19, + "elevation": 0, + "dest_map": "MAP_SAFARI_ZONE_WEST", + "dest_warp_id": 8 + }, + { + "x": 43, + "y": 15, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_EAST", + "dest_warp_id": 3 + }, + { + "x": 43, + "y": 16, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_EAST", + "dest_warp_id": 4 + }, + { + "x": 43, + "y": 17, + "elevation": 0, + "dest_map": "MAP_SAFARI_ZONE_EAST", + "dest_warp_id": 5 + }, + { + "x": 29, + "y": 25, + "elevation": 0, + "dest_map": "MAP_SAFARI_ZONE_BUILDING1", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 30, + "y": 26, + "elevation": 0, + "script": "SafariZone_Center_EventScript_162361" + }, + { + "type": "bg_event_type_0", + "x": 25, + "y": 27, + "elevation": 0, + "script": "SafariZone_Center_EventScript_16236A" + }, + { + "type": "hidden_item", + "x": 27, + "y": 15, + "elevation": 3, + "item": "ITEM_LEAF_STONE", + "flag": "22", + "unknown": 1 + }, + { + "type": "bg_event_type_0", + "x": 33, + "y": 20, + "elevation": 0, + "script": "SafariZone_Center_EventScript_162373" + } + ] +} \ No newline at end of file diff --git a/data/maps/SafariZone_East/events.inc b/data/maps/SafariZone_East/events.inc deleted file mode 100644 index f273e32f9..000000000 --- a/data/maps/SafariZone_East/events.inc +++ /dev/null @@ -1,22 +0,0 @@ -SafariZone_East_EventObjects: - object_event 1, 92, 0, 13, 0, 12, 0, 3, 8, 17, 0, 0, 0, 0, 0, SafariZone_East_EventScript_1BE7E4, 386, 0, 0 - object_event 2, 92, 0, 37, 0, 15, 0, 3, 8, 17, 0, 0, 0, 0, 0, SafariZone_East_EventScript_1BE7F1, 387, 0, 0 - object_event 3, 92, 0, 31, 0, 18, 0, 3, 8, 17, 0, 0, 0, 0, 0, SafariZone_East_EventScript_1BE7FE, 388, 0, 0 - object_event 4, 92, 0, 36, 0, 17, 0, 4, 8, 17, 0, 0, 0, 0, 0, SafariZone_East_EventScript_1BE80B, 389, 0, 0 - -SafariZone_East_MapWarps: - warp_def 8, 9, 3, 6, 321 - warp_def 8, 10, 3, 7, 321 - warp_def 8, 11, 0, 8, 321 - warp_def 8, 26, 3, 9, 319 - warp_def 8, 27, 3, 10, 319 - warp_def 8, 28, 0, 11, 319 - warp_def 40, 14, 0, 1, 324 - -SafariZone_East_MapBGEvents: - bg_event 18, 27, 0, 0, 0, SafariZone_East_EventScript_16238F - bg_event 43, 15, 0, 0, 0, SafariZone_East_EventScript_16237D - bg_event 17, 8, 0, 0, 0, SafariZone_East_EventScript_162386 - -SafariZone_East_MapEvents:: - map_events SafariZone_East_EventObjects, SafariZone_East_MapWarps, 0x0, SafariZone_East_MapBGEvents diff --git a/data/maps/SafariZone_East/header.inc b/data/maps/SafariZone_East/header.inc deleted file mode 100644 index 63835d624..000000000 --- a/data/maps/SafariZone_East/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SafariZone_East:: @ 834F914 - .4byte SafariZone_East_Layout @ 0x830EC24 - .4byte SafariZone_East_MapEvents @ 0x83B1068 - .4byte SafariZone_East_MapScripts @ 0x816237C - .4byte NULL - .2byte BGM_FRLG_SAFARI_ZONE - .2byte 148 - .byte 0x88, 0x00, 0x00, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/SafariZone_East/map.json b/data/maps/SafariZone_East/map.json new file mode 100644 index 000000000..6f7c8eeb7 --- /dev/null +++ b/data/maps/SafariZone_East/map.json @@ -0,0 +1,144 @@ +{ + "id": "MAP_SAFARI_ZONE_EAST", + "name": "SafariZone_East", + "layout": "LAYOUT_SAFARI_ZONE_EAST", + "music": "BGM_FRLG_SAFARI_ZONE", + "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "92", + "x": 13, + "y": 12, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_East_EventScript_1BE7E4", + "flag": "386" + }, + { + "graphics_id": "92", + "x": 37, + "y": 15, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_East_EventScript_1BE7F1", + "flag": "387" + }, + { + "graphics_id": "92", + "x": 31, + "y": 18, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_East_EventScript_1BE7FE", + "flag": "388" + }, + { + "graphics_id": "92", + "x": 36, + "y": 17, + "elevation": 4, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_East_EventScript_1BE80B", + "flag": "389" + } + ], + "warp_events": [ + { + "x": 8, + "y": 9, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_NORTH", + "dest_warp_id": 6 + }, + { + "x": 8, + "y": 10, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_NORTH", + "dest_warp_id": 7 + }, + { + "x": 8, + "y": 11, + "elevation": 0, + "dest_map": "MAP_SAFARI_ZONE_NORTH", + "dest_warp_id": 8 + }, + { + "x": 8, + "y": 26, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_CENTER", + "dest_warp_id": 9 + }, + { + "x": 8, + "y": 27, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_CENTER", + "dest_warp_id": 10 + }, + { + "x": 8, + "y": 28, + "elevation": 0, + "dest_map": "MAP_SAFARI_ZONE_CENTER", + "dest_warp_id": 11 + }, + { + "x": 40, + "y": 14, + "elevation": 0, + "dest_map": "MAP_SAFARI_ZONE_BUILDING2", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 18, + "y": 27, + "elevation": 0, + "script": "SafariZone_East_EventScript_16238F" + }, + { + "type": "bg_event_type_0", + "x": 43, + "y": 15, + "elevation": 0, + "script": "SafariZone_East_EventScript_16237D" + }, + { + "type": "bg_event_type_0", + "x": 17, + "y": 8, + "elevation": 0, + "script": "SafariZone_East_EventScript_162386" + } + ] +} \ No newline at end of file diff --git a/data/maps/SafariZone_North/events.inc b/data/maps/SafariZone_North/events.inc deleted file mode 100644 index 8894652dd..000000000 --- a/data/maps/SafariZone_North/events.inc +++ /dev/null @@ -1,29 +0,0 @@ -SafariZone_North_EventObjects: - object_event 1, 92, 0, 33, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, SafariZone_North_EventScript_1BE818, 390, 0, 0 - object_event 2, 92, 0, 28, 0, 9, 0, 3, 8, 17, 0, 0, 0, 0, 0, SafariZone_North_EventScript_1BE825, 391, 0, 0 - object_event 3, 92, 0, 29, 0, 17, 0, 3, 8, 17, 0, 0, 0, 0, 0, SafariZone_North_EventScript_1BEBDA, 467, 0, 0 - -SafariZone_North_MapWarps: - warp_def 10, 34, 3, 0, 322 - warp_def 11, 34, 3, 1, 322 - warp_def 12, 34, 0, 2, 322 - warp_def 20, 34, 3, 3, 322 - warp_def 21, 34, 3, 4, 322 - warp_def 22, 34, 0, 5, 322 - warp_def 48, 31, 3, 0, 320 - warp_def 48, 32, 3, 1, 320 - warp_def 48, 33, 0, 2, 320 - warp_def 30, 34, 3, 3, 319 - warp_def 31, 34, 3, 4, 319 - warp_def 32, 34, 0, 5, 319 - warp_def 43, 8, 0, 1, 325 - -SafariZone_North_MapBGEvents: - bg_event 13, 27, 0, 0, 0, SafariZone_North_EventScript_1623A2 - bg_event 23, 31, 0, 0, 0, SafariZone_North_EventScript_1623AB - bg_event 29, 32, 0, 0, 0, SafariZone_North_EventScript_1623B4 - bg_event 34, 28, 0, 0, 0, SafariZone_North_EventScript_1623BD - bg_event 44, 9, 0, 0, 0, SafariZone_North_EventScript_162399 - -SafariZone_North_MapEvents:: - map_events SafariZone_North_EventObjects, SafariZone_North_MapWarps, 0x0, SafariZone_North_MapBGEvents diff --git a/data/maps/SafariZone_North/header.inc b/data/maps/SafariZone_North/header.inc deleted file mode 100644 index 35ceb0989..000000000 --- a/data/maps/SafariZone_North/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SafariZone_North:: @ 834F930 - .4byte SafariZone_North_Layout @ 0x830FE1C - .4byte SafariZone_North_MapEvents @ 0x83B1168 - .4byte SafariZone_North_MapScripts @ 0x8162398 - .4byte NULL - .2byte BGM_FRLG_SAFARI_ZONE - .2byte 149 - .byte 0x88, 0x00, 0x00, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/SafariZone_North/map.json b/data/maps/SafariZone_North/map.json new file mode 100644 index 000000000..4462b8485 --- /dev/null +++ b/data/maps/SafariZone_North/map.json @@ -0,0 +1,187 @@ +{ + "id": "MAP_SAFARI_ZONE_NORTH", + "name": "SafariZone_North", + "layout": "LAYOUT_SAFARI_ZONE_NORTH", + "music": "BGM_FRLG_SAFARI_ZONE", + "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "92", + "x": 33, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_North_EventScript_1BE818", + "flag": "390" + }, + { + "graphics_id": "92", + "x": 28, + "y": 9, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_North_EventScript_1BE825", + "flag": "391" + }, + { + "graphics_id": "92", + "x": 29, + "y": 17, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_North_EventScript_1BEBDA", + "flag": "467" + } + ], + "warp_events": [ + { + "x": 10, + "y": 34, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_WEST", + "dest_warp_id": 0 + }, + { + "x": 11, + "y": 34, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_WEST", + "dest_warp_id": 1 + }, + { + "x": 12, + "y": 34, + "elevation": 0, + "dest_map": "MAP_SAFARI_ZONE_WEST", + "dest_warp_id": 2 + }, + { + "x": 20, + "y": 34, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_WEST", + "dest_warp_id": 3 + }, + { + "x": 21, + "y": 34, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_WEST", + "dest_warp_id": 4 + }, + { + "x": 22, + "y": 34, + "elevation": 0, + "dest_map": "MAP_SAFARI_ZONE_WEST", + "dest_warp_id": 5 + }, + { + "x": 48, + "y": 31, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_EAST", + "dest_warp_id": 0 + }, + { + "x": 48, + "y": 32, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_EAST", + "dest_warp_id": 1 + }, + { + "x": 48, + "y": 33, + "elevation": 0, + "dest_map": "MAP_SAFARI_ZONE_EAST", + "dest_warp_id": 2 + }, + { + "x": 30, + "y": 34, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_CENTER", + "dest_warp_id": 3 + }, + { + "x": 31, + "y": 34, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_CENTER", + "dest_warp_id": 4 + }, + { + "x": 32, + "y": 34, + "elevation": 0, + "dest_map": "MAP_SAFARI_ZONE_CENTER", + "dest_warp_id": 5 + }, + { + "x": 43, + "y": 8, + "elevation": 0, + "dest_map": "MAP_SAFARI_ZONE_BUILDING3", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 13, + "y": 27, + "elevation": 0, + "script": "SafariZone_North_EventScript_1623A2" + }, + { + "type": "bg_event_type_0", + "x": 23, + "y": 31, + "elevation": 0, + "script": "SafariZone_North_EventScript_1623AB" + }, + { + "type": "bg_event_type_0", + "x": 29, + "y": 32, + "elevation": 0, + "script": "SafariZone_North_EventScript_1623B4" + }, + { + "type": "bg_event_type_0", + "x": 34, + "y": 28, + "elevation": 0, + "script": "SafariZone_North_EventScript_1623BD" + }, + { + "type": "bg_event_type_0", + "x": 44, + "y": 9, + "elevation": 0, + "script": "SafariZone_North_EventScript_162399" + } + ] +} \ No newline at end of file diff --git a/data/maps/SafariZone_SecretHouse/events.inc b/data/maps/SafariZone_SecretHouse/events.inc deleted file mode 100644 index eb746f4c5..000000000 --- a/data/maps/SafariZone_SecretHouse/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -SafariZone_SecretHouse_EventObjects: - object_event 1, 47, 0, 6, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, SafariZone_SecretHouse_EventScript_162453, 0, 0, 0 - -SafariZone_SecretHouse_MapWarps: - warp_def 3, 9, 3, 9, 322 - warp_def 4, 9, 3, 9, 322 - warp_def 5, 9, 3, 9, 322 - -SafariZone_SecretHouse_MapEvents:: - map_events SafariZone_SecretHouse_EventObjects, SafariZone_SecretHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/SafariZone_SecretHouse/header.inc b/data/maps/SafariZone_SecretHouse/header.inc deleted file mode 100644 index f91bc7a7b..000000000 --- a/data/maps/SafariZone_SecretHouse/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SafariZone_SecretHouse:: @ 834F9D8 - .4byte SafariZone_SecretHouse_Layout @ 0x831C16C - .4byte SafariZone_SecretHouse_MapEvents @ 0x83B1484 - .4byte SafariZone_SecretHouse_MapScripts @ 0x8162452 - .4byte NULL - .2byte BGM_FRLG_SAFARI_ZONE - .2byte 199 - .byte 0x88, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/SafariZone_SecretHouse/map.json b/data/maps/SafariZone_SecretHouse/map.json new file mode 100644 index 000000000..83c1c7c34 --- /dev/null +++ b/data/maps/SafariZone_SecretHouse/map.json @@ -0,0 +1,55 @@ +{ + "id": "MAP_SAFARI_ZONE_SECRET_HOUSE", + "name": "SafariZone_SecretHouse", + "layout": "LAYOUT_SAFARI_ZONE_SECRET_HOUSE", + "music": "BGM_FRLG_SAFARI_ZONE", + "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "47", + "x": 6, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_SecretHouse_EventScript_162453", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 9, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_WEST", + "dest_warp_id": 9 + }, + { + "x": 4, + "y": 9, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_WEST", + "dest_warp_id": 9 + }, + { + "x": 5, + "y": 9, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_WEST", + "dest_warp_id": 9 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SafariZone_West/events.inc b/data/maps/SafariZone_West/events.inc deleted file mode 100644 index a41c7a187..000000000 --- a/data/maps/SafariZone_West/events.inc +++ /dev/null @@ -1,28 +0,0 @@ -SafariZone_West_EventObjects: - object_event 1, 92, 0, 28, 0, 14, 0, 3, 8, 17, 0, 0, 0, 0, 0, SafariZone_West_EventScript_1BE83F, 393, 0, 0 - object_event 2, 92, 0, 17, 0, 13, 0, 3, 8, 17, 0, 0, 0, 0, 0, SafariZone_West_EventScript_1BE832, 392, 0, 0 - object_event 3, 92, 0, 16, 0, 27, 0, 3, 8, 17, 0, 0, 0, 0, 0, SafariZone_West_EventScript_1BE84C, 394, 0, 0 - object_event 4, 92, 0, 27, 0, 24, 0, 3, 8, 17, 0, 0, 0, 0, 0, SafariZone_West_EventScript_1BE859, 395, 0, 0 - -SafariZone_West_MapWarps: - warp_def 30, 5, 3, 0, 321 - warp_def 31, 5, 3, 1, 321 - warp_def 32, 5, 0, 2, 321 - warp_def 37, 5, 3, 3, 321 - warp_def 38, 5, 3, 4, 321 - warp_def 39, 5, 0, 5, 321 - warp_def 40, 26, 3, 6, 319 - warp_def 40, 27, 3, 7, 319 - warp_def 40, 28, 0, 8, 319 - warp_def 12, 7, 0, 1, 327 - warp_def 19, 18, 0, 1, 326 - -SafariZone_West_MapBGEvents: - bg_event 27, 9, 0, 0, 0, SafariZone_West_EventScript_1623D0 - bg_event 36, 10, 0, 0, 0, SafariZone_West_EventScript_1623D9 - bg_event 35, 26, 0, 0, 0, SafariZone_West_EventScript_1623E2 - bg_event 22, 19, 0, 0, 0, SafariZone_West_EventScript_1623C7 - bg_event 13, 11, 3, 7, 0, 24, 23, 1 - -SafariZone_West_MapEvents:: - map_events SafariZone_West_EventObjects, SafariZone_West_MapWarps, 0x0, SafariZone_West_MapBGEvents diff --git a/data/maps/SafariZone_West/header.inc b/data/maps/SafariZone_West/header.inc deleted file mode 100644 index 69547c067..000000000 --- a/data/maps/SafariZone_West/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SafariZone_West:: @ 834F94C - .4byte SafariZone_West_Layout @ 0x8310BC4 - .4byte SafariZone_West_MapEvents @ 0x83B1270 - .4byte SafariZone_West_MapScripts @ 0x81623C6 - .4byte NULL - .2byte BGM_FRLG_SAFARI_ZONE - .2byte 150 - .byte 0x88, 0x00, 0x00, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/SafariZone_West/map.json b/data/maps/SafariZone_West/map.json new file mode 100644 index 000000000..9945f2516 --- /dev/null +++ b/data/maps/SafariZone_West/map.json @@ -0,0 +1,188 @@ +{ + "id": "MAP_SAFARI_ZONE_WEST", + "name": "SafariZone_West", + "layout": "LAYOUT_SAFARI_ZONE_WEST", + "music": "BGM_FRLG_SAFARI_ZONE", + "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "92", + "x": 28, + "y": 14, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_West_EventScript_1BE83F", + "flag": "393" + }, + { + "graphics_id": "92", + "x": 17, + "y": 13, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_West_EventScript_1BE832", + "flag": "392" + }, + { + "graphics_id": "92", + "x": 16, + "y": 27, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_West_EventScript_1BE84C", + "flag": "394" + }, + { + "graphics_id": "92", + "x": 27, + "y": 24, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_West_EventScript_1BE859", + "flag": "395" + } + ], + "warp_events": [ + { + "x": 30, + "y": 5, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_NORTH", + "dest_warp_id": 0 + }, + { + "x": 31, + "y": 5, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_NORTH", + "dest_warp_id": 1 + }, + { + "x": 32, + "y": 5, + "elevation": 0, + "dest_map": "MAP_SAFARI_ZONE_NORTH", + "dest_warp_id": 2 + }, + { + "x": 37, + "y": 5, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_NORTH", + "dest_warp_id": 3 + }, + { + "x": 38, + "y": 5, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_NORTH", + "dest_warp_id": 4 + }, + { + "x": 39, + "y": 5, + "elevation": 0, + "dest_map": "MAP_SAFARI_ZONE_NORTH", + "dest_warp_id": 5 + }, + { + "x": 40, + "y": 26, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_CENTER", + "dest_warp_id": 6 + }, + { + "x": 40, + "y": 27, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_CENTER", + "dest_warp_id": 7 + }, + { + "x": 40, + "y": 28, + "elevation": 0, + "dest_map": "MAP_SAFARI_ZONE_CENTER", + "dest_warp_id": 8 + }, + { + "x": 12, + "y": 7, + "elevation": 0, + "dest_map": "MAP_SAFARI_ZONE_SECRET_HOUSE", + "dest_warp_id": 1 + }, + { + "x": 19, + "y": 18, + "elevation": 0, + "dest_map": "MAP_SAFARI_ZONE_BUILDING4", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 27, + "y": 9, + "elevation": 0, + "script": "SafariZone_West_EventScript_1623D0" + }, + { + "type": "bg_event_type_0", + "x": 36, + "y": 10, + "elevation": 0, + "script": "SafariZone_West_EventScript_1623D9" + }, + { + "type": "bg_event_type_0", + "x": 35, + "y": 26, + "elevation": 0, + "script": "SafariZone_West_EventScript_1623E2" + }, + { + "type": "bg_event_type_0", + "x": 22, + "y": 19, + "elevation": 0, + "script": "SafariZone_West_EventScript_1623C7" + }, + { + "type": "hidden_item", + "x": 13, + "y": 11, + "elevation": 3, + "item": "ITEM_REVIVE", + "flag": "23", + "unknown": 1 + } + ] +} \ No newline at end of file diff --git a/data/maps/SaffronCity/connections.inc b/data/maps/SaffronCity/connections.inc deleted file mode 100644 index 6b2b2b3ff..000000000 --- a/data/maps/SaffronCity/connections.inc +++ /dev/null @@ -1,9 +0,0 @@ -SaffronCity_MapConnectionsList: @ 83528FC - connection up, 0, MAP_ROUTE5 - connection down, 12, MAP_ROUTE6 - connection left, 10, MAP_ROUTE7 - connection right, 10, MAP_ROUTE8 - -SaffronCity_MapConnections:: @ 835292C - .4byte 4 - .4byte SaffronCity_MapConnectionsList diff --git a/data/maps/SaffronCity/events.inc b/data/maps/SaffronCity/events.inc deleted file mode 100644 index 969d5a74f..000000000 --- a/data/maps/SaffronCity/events.inc +++ /dev/null @@ -1,2 +0,0 @@ -SaffronCity_MapEvents:: - map_events 0x0, 0x0, 0x0, 0x0 diff --git a/data/maps/SaffronCity/header.inc b/data/maps/SaffronCity/header.inc deleted file mode 100644 index 79a6bb684..000000000 --- a/data/maps/SaffronCity/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SaffronCity:: @ 835074C - .4byte SaffronCity_Layout @ 0x82E4E28 - .4byte SaffronCity_MapEvents @ 0x83B5EB0 - .4byte SaffronCity_MapScripts @ 0x8167483 - .4byte SaffronCity_MapConnections @ 0x835292C - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 88 - .byte 0x62, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/SaffronCity/map.json b/data/maps/SaffronCity/map.json new file mode 100644 index 000000000..b705126ff --- /dev/null +++ b/data/maps/SaffronCity/map.json @@ -0,0 +1,40 @@ +{ + "id": "MAP_SAFFRON_CITY", + "name": "SaffronCity", + "layout": "LAYOUT_SAFFRON_CITY", + "music": "BGM_FRLG_VIRIDIAN_CITY", + "region_map_section": "MAPSEC_SAFFRON_CITY", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_1", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_ROUTE5", + "offset": 0, + "direction": "up" + }, + { + "map": "MAP_ROUTE6", + "offset": 12, + "direction": "down" + }, + { + "map": "MAP_ROUTE7", + "offset": 10, + "direction": "left" + }, + { + "map": "MAP_ROUTE8", + "offset": 10, + "direction": "right" + } + ], + "object_events": [], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SaffronCity_Dojo/events.inc b/data/maps/SaffronCity_Dojo/events.inc deleted file mode 100644 index fab821072..000000000 --- a/data/maps/SaffronCity_Dojo/events.inc +++ /dev/null @@ -1,26 +0,0 @@ -SaffronCity_Dojo_EventObjects: - object_event 1, 54, 0, 11, 0, 10, 0, 3, 9, 17, 0, 1, 0, 7, 0, SaffronCity_Dojo_EventScript_16ED46, 0, 0, 0 - object_event 2, 54, 0, 1, 0, 10, 0, 3, 10, 17, 0, 1, 0, 7, 0, SaffronCity_Dojo_EventScript_16ED5D, 0, 0, 0 - object_event 3, 54, 0, 11, 0, 8, 0, 3, 9, 17, 0, 1, 0, 7, 0, SaffronCity_Dojo_EventScript_16ED74, 0, 0, 0 - object_event 4, 54, 0, 1, 0, 8, 0, 3, 10, 17, 0, 1, 0, 7, 0, SaffronCity_Dojo_EventScript_16ED8B, 0, 0, 0 - object_event 5, 54, 0, 6, 0, 5, 0, 3, 8, 17, 0, 1, 0, 2, 0, SaffronCity_Dojo_EventScript_16EDA2, 0, 0, 0 - object_event 6, 92, 0, 5, 0, 3, 0, 3, 8, 17, 0, 0, 0, 0, 0, SaffronCity_Dojo_EventScript_16EC00, 96, 0, 0 - object_event 7, 92, 0, 7, 0, 3, 0, 3, 8, 17, 0, 0, 0, 0, 0, SaffronCity_Dojo_EventScript_16EC46, 97, 0, 0 - -SaffronCity_Dojo_MapWarps: - warp_def 5, 14, 3, 2, 778 - warp_def 6, 14, 3, 2, 778 - warp_def 7, 14, 3, 2, 778 - -SaffronCity_Dojo_MapCoordEvents: - coord_event 5, 5, 3, 0, 16513, 0, 0, SaffronCity_Dojo_EventScript_16EBDC - coord_event 7, 5, 3, 0, 16513, 0, 0, SaffronCity_Dojo_EventScript_16EBEE - -SaffronCity_Dojo_MapBGEvents: - bg_event 3, 13, 0, 0, 0, SaffronCity_Dojo_EventScript_16ED2B - bg_event 9, 13, 0, 0, 0, SaffronCity_Dojo_EventScript_16ED2B - bg_event 5, 2, 0, 0, 0, SaffronCity_Dojo_EventScript_16ED34 - bg_event 7, 2, 0, 0, 0, SaffronCity_Dojo_EventScript_16ED3D - -SaffronCity_Dojo_MapEvents:: - map_events SaffronCity_Dojo_EventObjects, SaffronCity_Dojo_MapWarps, SaffronCity_Dojo_MapCoordEvents, SaffronCity_Dojo_MapBGEvents diff --git a/data/maps/SaffronCity_Dojo/header.inc b/data/maps/SaffronCity_Dojo/header.inc deleted file mode 100644 index a56af7e4a..000000000 --- a/data/maps/SaffronCity_Dojo/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SaffronCity_Dojo:: @ 8351680 - .4byte SaffronCity_Dojo_Layout @ 0x83212C4 - .4byte SaffronCity_Dojo_MapEvents @ 0x83BCD60 - .4byte SaffronCity_Dojo_MapScripts @ 0x816EBDB - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 228 - .byte 0x62, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/SaffronCity_Dojo/map.json b/data/maps/SaffronCity_Dojo/map.json new file mode 100644 index 000000000..bbbbcaa96 --- /dev/null +++ b/data/maps/SaffronCity_Dojo/map.json @@ -0,0 +1,181 @@ +{ + "id": "MAP_SAFFRON_CITY_DOJO", + "name": "SaffronCity_Dojo", + "layout": "LAYOUT_SAFFRON_CITY_DOJO", + "music": "BGM_FRLG_VIRIDIAN_CITY", + "region_map_section": "MAPSEC_SAFFRON_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "54", + "x": 11, + "y": 10, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 7, + "script": "SaffronCity_Dojo_EventScript_16ED46", + "flag": "0" + }, + { + "graphics_id": "54", + "x": 1, + "y": 10, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 7, + "script": "SaffronCity_Dojo_EventScript_16ED5D", + "flag": "0" + }, + { + "graphics_id": "54", + "x": 11, + "y": 8, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 7, + "script": "SaffronCity_Dojo_EventScript_16ED74", + "flag": "0" + }, + { + "graphics_id": "54", + "x": 1, + "y": 8, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 7, + "script": "SaffronCity_Dojo_EventScript_16ED8B", + "flag": "0" + }, + { + "graphics_id": "54", + "x": 6, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "SaffronCity_Dojo_EventScript_16EDA2", + "flag": "0" + }, + { + "graphics_id": "92", + "x": 5, + "y": 3, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_Dojo_EventScript_16EC00", + "flag": "96" + }, + { + "graphics_id": "92", + "x": 7, + "y": 3, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_Dojo_EventScript_16EC46", + "flag": "97" + } + ], + "warp_events": [ + { + "x": 5, + "y": 14, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_warp_id": 2 + }, + { + "x": 6, + "y": 14, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_warp_id": 2 + }, + { + "x": 7, + "y": 14, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_warp_id": 2 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 5, + "y": 5, + "elevation": 3, + "var": "VAR_0x4081", + "var_value": 0, + "script": "SaffronCity_Dojo_EventScript_16EBDC" + }, + { + "type": "trigger", + "x": 7, + "y": 5, + "elevation": 3, + "var": "VAR_0x4081", + "var_value": 0, + "script": "SaffronCity_Dojo_EventScript_16EBEE" + } + ], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 3, + "y": 13, + "elevation": 0, + "script": "SaffronCity_Dojo_EventScript_16ED2B" + }, + { + "type": "bg_event_type_0", + "x": 9, + "y": 13, + "elevation": 0, + "script": "SaffronCity_Dojo_EventScript_16ED2B" + }, + { + "type": "bg_event_type_0", + "x": 5, + "y": 2, + "elevation": 0, + "script": "SaffronCity_Dojo_EventScript_16ED34" + }, + { + "type": "bg_event_type_0", + "x": 7, + "y": 2, + "elevation": 0, + "script": "SaffronCity_Dojo_EventScript_16ED3D" + } + ] +} \ No newline at end of file diff --git a/data/maps/SaffronCity_Duplicate/connections.inc b/data/maps/SaffronCity_Duplicate/connections.inc deleted file mode 100644 index 8c6f84d02..000000000 --- a/data/maps/SaffronCity_Duplicate/connections.inc +++ /dev/null @@ -1,9 +0,0 @@ -SaffronCity_Duplicate_MapConnectionsList: @ 83528C4 - connection up, 0, MAP_ROUTE5 - connection down, 12, MAP_ROUTE6 - connection left, 10, MAP_ROUTE7 - connection right, 10, MAP_ROUTE8 - -SaffronCity_Duplicate_MapConnections:: @ 83528F4 - .4byte 4 - .4byte SaffronCity_Duplicate_MapConnectionsList diff --git a/data/maps/SaffronCity_Duplicate/events.inc b/data/maps/SaffronCity_Duplicate/events.inc deleted file mode 100644 index f81e26f92..000000000 --- a/data/maps/SaffronCity_Duplicate/events.inc +++ /dev/null @@ -1,47 +0,0 @@ -SaffronCity_Duplicate_EventObjects: - object_event 1, 49, 0, 22, 0, 15, 0, 3, 8, 17, 0, 0, 0, 0, 0, SaffronCity_Duplicate_EventScript_16737A, 62, 0, 0 - object_event 2, 49, 0, 26, 0, 16, 0, 3, 5, 20, 0, 0, 0, 0, 0, SaffronCity_Duplicate_EventScript_167383, 62, 0, 0 - object_event 3, 49, 0, 46, 0, 13, 0, 3, 8, 17, 0, 0, 0, 0, 0, SaffronCity_Duplicate_EventScript_16738C, 62, 0, 0 - object_event 4, 49, 0, 27, 0, 22, 0, 3, 8, 17, 0, 0, 0, 0, 0, SaffronCity_Duplicate_EventScript_167395, 62, 0, 0 - object_event 5, 49, 0, 25, 0, 33, 0, 3, 5, 23, 0, 0, 0, 0, 0, SaffronCity_Duplicate_EventScript_16739E, 62, 0, 0 - object_event 6, 49, 0, 34, 0, 31, 0, 3, 8, 17, 0, 0, 0, 0, 0, SaffronCity_Duplicate_EventScript_1673B9, 62, 0, 0 - object_event 7, 49, 0, 30, 0, 39, 0, 3, 5, 21, 0, 0, 0, 0, 0, SaffronCity_Duplicate_EventScript_1673B0, 62, 0, 0 - object_event 8, 49, 0, 48, 0, 24, 0, 3, 5, 20, 0, 0, 0, 0, 0, SaffronCity_Duplicate_EventScript_1673A7, 62, 0, 0 - object_event 9, 18, 0, 37, 0, 32, 0, 3, 1, 17, 0, 0, 0, 0, 0, SaffronCity_Duplicate_EventScript_1673EC, 63, 0, 0 - object_event 10, 47, 0, 21, 0, 23, 0, 3, 2, 17, 0, 0, 0, 0, 0, SaffronCity_Duplicate_EventScript_1673E3, 63, 0, 0 - object_event 11, 25, 0, 39, 0, 16, 0, 3, 7, 17, 0, 0, 0, 0, 0, SaffronCity_Duplicate_EventScript_16741A, 63, 0, 0 - object_event 12, 19, 0, 44, 0, 22, 0, 3, 8, 17, 0, 0, 0, 0, 0, SaffronCity_Duplicate_EventScript_1673FE, 63, 0, 0 - object_event 13, 114, 0, 45, 0, 22, 0, 3, 8, 17, 0, 0, 0, 0, 0, SaffronCity_Duplicate_EventScript_167407, 63, 0, 0 - object_event 14, 22, 0, 32, 0, 39, 0, 3, 5, 21, 0, 0, 0, 0, 0, SaffronCity_Duplicate_EventScript_1673F5, 63, 0, 0 - object_event 15, 24, 0, 47, 0, 24, 0, 3, 5, 17, 0, 0, 0, 0, 0, SaffronCity_Duplicate_EventScript_1AD03A, 157, 0, 0 - -SaffronCity_Duplicate_MapWarps: - warp_def 33, 30, 0, 1, 303 - warp_def 22, 14, 0, 1, 3584 - warp_def 40, 12, 0, 1, 3586 - warp_def 46, 12, 0, 1, 3587 - warp_def 27, 21, 0, 1, 3588 - warp_def 40, 21, 0, 1, 3589 - warp_def 24, 38, 0, 1, 3590 - warp_def 43, 38, 0, 1, 3592 - warp_def 8, 27, 3, 2, 4864 - warp_def 34, 5, 3, 2, 4353 - warp_def 58, 27, 3, 1, 5120 - warp_def 34, 46, 3, 0, 4608 - warp_def 35, 46, 3, 0, 4608 - warp_def 35, 5, 3, 2, 4353 - warp_def 47, 21, 0, 0, 3593 - -SaffronCity_Duplicate_MapBGEvents: - bg_event 29, 14, 0, 0, 0, SaffronCity_Duplicate_EventScript_167423 - bg_event 42, 14, 0, 0, 0, SaffronCity_Duplicate_EventScript_16742C - bg_event 13, 25, 0, 0, 0, SaffronCity_Duplicate_EventScript_167471 - bg_event 18, 30, 0, 0, 0, SaffronCity_Duplicate_EventScript_167456 - bg_event 29, 31, 0, 0, 0, SaffronCity_Duplicate_EventScript_16745F - bg_event 54, 25, 0, 0, 0, SaffronCity_Duplicate_EventScript_16744D - bg_event 50, 14, 0, 0, 0, SaffronCity_Duplicate_EventScript_167435 - bg_event 40, 38, 0, 0, 0, SaffronCity_Duplicate_EventScript_167468 - bg_event 49, 22, 0, 0, 0, SaffronCity_Duplicate_EventScript_16747A - -SaffronCity_Duplicate_MapEvents:: - map_events SaffronCity_Duplicate_EventObjects, SaffronCity_Duplicate_MapWarps, 0x0, SaffronCity_Duplicate_MapBGEvents diff --git a/data/maps/SaffronCity_Duplicate/header.inc b/data/maps/SaffronCity_Duplicate/header.inc deleted file mode 100644 index 071683449..000000000 --- a/data/maps/SaffronCity_Duplicate/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SaffronCity_Duplicate:: @ 8350730 - .4byte SaffronCity_Duplicate_Layout @ 0x831E8D4 - .4byte SaffronCity_Duplicate_MapEvents @ 0x83B5E9C - .4byte SaffronCity_Duplicate_MapScripts @ 0x816735F - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 207 - .byte 0x62, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/SaffronCity_Duplicate/map.json b/data/maps/SaffronCity_Duplicate/map.json new file mode 100644 index 000000000..0dc64583f --- /dev/null +++ b/data/maps/SaffronCity_Duplicate/map.json @@ -0,0 +1,407 @@ +{ + "id": "MAP_SAFFRON_CITY_DUPLICATE", + "name": "SaffronCity_Duplicate", + "layout": "LAYOUT_SAFFRON_CITY_DUPLICATE", + "music": "BGM_FRLG_VIRIDIAN_CITY", + "region_map_section": "MAPSEC_SAFFRON_CITY", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_1", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_ROUTE5", + "offset": 0, + "direction": "up" + }, + { + "map": "MAP_ROUTE6", + "offset": 12, + "direction": "down" + }, + { + "map": "MAP_ROUTE7", + "offset": 10, + "direction": "left" + }, + { + "map": "MAP_ROUTE8", + "offset": 10, + "direction": "right" + } + ], + "connections_no_include": true, + "object_events": [ + { + "graphics_id": "49", + "x": 22, + "y": 15, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_Duplicate_EventScript_16737A", + "flag": "62" + }, + { + "graphics_id": "49", + "x": 26, + "y": 16, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 4, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_Duplicate_EventScript_167383", + "flag": "62" + }, + { + "graphics_id": "49", + "x": 46, + "y": 13, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_Duplicate_EventScript_16738C", + "flag": "62" + }, + { + "graphics_id": "49", + "x": 27, + "y": 22, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_Duplicate_EventScript_167395", + "flag": "62" + }, + { + "graphics_id": "49", + "x": 25, + "y": 33, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 7, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_Duplicate_EventScript_16739E", + "flag": "62" + }, + { + "graphics_id": "49", + "x": 34, + "y": 31, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_Duplicate_EventScript_1673B9", + "flag": "62" + }, + { + "graphics_id": "49", + "x": 30, + "y": 39, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 5, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_Duplicate_EventScript_1673B0", + "flag": "62" + }, + { + "graphics_id": "49", + "x": 48, + "y": 24, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 4, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_Duplicate_EventScript_1673A7", + "flag": "62" + }, + { + "graphics_id": "18", + "x": 37, + "y": 32, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_Duplicate_EventScript_1673EC", + "flag": "63" + }, + { + "graphics_id": "47", + "x": 21, + "y": 23, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_Duplicate_EventScript_1673E3", + "flag": "63" + }, + { + "graphics_id": "25", + "x": 39, + "y": 16, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_Duplicate_EventScript_16741A", + "flag": "63" + }, + { + "graphics_id": "19", + "x": 44, + "y": 22, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_Duplicate_EventScript_1673FE", + "flag": "63" + }, + { + "graphics_id": "114", + "x": 45, + "y": 22, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_Duplicate_EventScript_167407", + "flag": "63" + }, + { + "graphics_id": "22", + "x": 32, + "y": 39, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 5, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_Duplicate_EventScript_1673F5", + "flag": "63" + }, + { + "graphics_id": "24", + "x": 47, + "y": 24, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_Duplicate_EventScript_1AD03A", + "flag": "157" + } + ], + "warp_events": [ + { + "x": 33, + "y": 30, + "elevation": 0, + "dest_map": "MAP_SILPH_CO_1F", + "dest_warp_id": 1 + }, + { + "x": 22, + "y": 14, + "elevation": 0, + "dest_map": "MAP_SAFFRON_CITY_HOUSE1_1F", + "dest_warp_id": 1 + }, + { + "x": 40, + "y": 12, + "elevation": 0, + "dest_map": "MAP_SAFFRON_CITY_DOJO", + "dest_warp_id": 1 + }, + { + "x": 46, + "y": 12, + "elevation": 0, + "dest_map": "MAP_SAFFRON_CITY_GYM", + "dest_warp_id": 1 + }, + { + "x": 27, + "y": 21, + "elevation": 0, + "dest_map": "MAP_SAFFRON_CITY_HOUSE2", + "dest_warp_id": 1 + }, + { + "x": 40, + "y": 21, + "elevation": 0, + "dest_map": "MAP_SAFFRON_CITY_MART", + "dest_warp_id": 1 + }, + { + "x": 24, + "y": 38, + "elevation": 0, + "dest_map": "MAP_SAFFRON_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 1 + }, + { + "x": 43, + "y": 38, + "elevation": 0, + "dest_map": "MAP_SAFFRON_CITY_HOUSE3", + "dest_warp_id": 1 + }, + { + "x": 8, + "y": 27, + "elevation": 3, + "dest_map": "MAP_ROUTE7_EAST_ENTRANCE", + "dest_warp_id": 2 + }, + { + "x": 34, + "y": 5, + "elevation": 3, + "dest_map": "MAP_ROUTE5_SOUTH_ENTRANCE", + "dest_warp_id": 2 + }, + { + "x": 58, + "y": 27, + "elevation": 3, + "dest_map": "MAP_ROUTE8_WEST_ENTRANCE", + "dest_warp_id": 1 + }, + { + "x": 34, + "y": 46, + "elevation": 3, + "dest_map": "MAP_ROUTE6_NORTH_ENTRANCE", + "dest_warp_id": 0 + }, + { + "x": 35, + "y": 46, + "elevation": 3, + "dest_map": "MAP_ROUTE6_NORTH_ENTRANCE", + "dest_warp_id": 0 + }, + { + "x": 35, + "y": 5, + "elevation": 3, + "dest_map": "MAP_ROUTE5_SOUTH_ENTRANCE", + "dest_warp_id": 2 + }, + { + "x": 47, + "y": 21, + "elevation": 0, + "dest_map": "MAP_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 29, + "y": 14, + "elevation": 0, + "script": "SaffronCity_Duplicate_EventScript_167423" + }, + { + "type": "bg_event_type_0", + "x": 42, + "y": 14, + "elevation": 0, + "script": "SaffronCity_Duplicate_EventScript_16742C" + }, + { + "type": "bg_event_type_0", + "x": 13, + "y": 25, + "elevation": 0, + "script": "SaffronCity_Duplicate_EventScript_167471" + }, + { + "type": "bg_event_type_0", + "x": 18, + "y": 30, + "elevation": 0, + "script": "SaffronCity_Duplicate_EventScript_167456" + }, + { + "type": "bg_event_type_0", + "x": 29, + "y": 31, + "elevation": 0, + "script": "SaffronCity_Duplicate_EventScript_16745F" + }, + { + "type": "bg_event_type_0", + "x": 54, + "y": 25, + "elevation": 0, + "script": "SaffronCity_Duplicate_EventScript_16744D" + }, + { + "type": "bg_event_type_0", + "x": 50, + "y": 14, + "elevation": 0, + "script": "SaffronCity_Duplicate_EventScript_167435" + }, + { + "type": "bg_event_type_0", + "x": 40, + "y": 38, + "elevation": 0, + "script": "SaffronCity_Duplicate_EventScript_167468" + }, + { + "type": "bg_event_type_0", + "x": 49, + "y": 22, + "elevation": 0, + "script": "SaffronCity_Duplicate_EventScript_16747A" + } + ] +} \ No newline at end of file diff --git a/data/maps/SaffronCity_Gym/events.inc b/data/maps/SaffronCity_Gym/events.inc deleted file mode 100644 index 99ebd74d5..000000000 --- a/data/maps/SaffronCity_Gym/events.inc +++ /dev/null @@ -1,52 +0,0 @@ -SaffronCity_Gym_EventObjects: - object_event 1, 41, 0, 24, 0, 18, 0, 3, 8, 17, 0, 1, 0, 3, 0, SaffronCity_Gym_EventScript_16EEC3, 0, 0, 0 - object_event 2, 41, 0, 24, 0, 2, 0, 3, 8, 17, 0, 1, 0, 3, 0, SaffronCity_Gym_EventScript_16EE88, 0, 0, 0 - object_event 3, 41, 0, 4, 0, 2, 0, 3, 8, 17, 0, 1, 0, 3, 0, SaffronCity_Gym_EventScript_16EEDA, 0, 0, 0 - object_event 4, 58, 0, 14, 0, 2, 0, 3, 8, 17, 0, 1, 0, 3, 0, SaffronCity_Gym_EventScript_16EEF1, 0, 0, 0 - object_event 5, 58, 0, 4, 0, 10, 0, 3, 8, 17, 0, 1, 0, 3, 0, SaffronCity_Gym_EventScript_16EF08, 0, 0, 0 - object_event 6, 58, 0, 4, 0, 18, 0, 3, 8, 17, 0, 1, 0, 3, 0, SaffronCity_Gym_EventScript_16EF1F, 0, 0, 0 - object_event 7, 85, 0, 14, 0, 11, 0, 3, 8, 17, 0, 0, 0, 0, 0, SaffronCity_Gym_EventScript_16EDD8, 0, 0, 0 - object_event 8, 41, 0, 24, 0, 10, 0, 3, 8, 17, 0, 1, 0, 3, 0, SaffronCity_Gym_EventScript_16EE9F, 0, 0, 0 - object_event 9, 91, 0, 15, 0, 20, 0, 3, 8, 17, 0, 0, 0, 0, 0, SaffronCity_Gym_EventScript_16EF36, 0, 0, 0 - -SaffronCity_Gym_MapWarps: - warp_def 13, 23, 3, 3, 778 - warp_def 14, 23, 3, 3, 778 - warp_def 15, 23, 3, 3, 778 - warp_def 18, 20, 3, 32, 3587 - warp_def 0, 4, 3, 22, 3587 - warp_def 0, 7, 3, 20, 3587 - warp_def 0, 12, 3, 30, 3587 - warp_def 0, 15, 3, 11, 3587 - warp_def 0, 20, 3, 28, 3587 - warp_def 0, 23, 3, 19, 3587 - warp_def 8, 4, 3, 18, 3587 - warp_def 8, 7, 3, 7, 3587 - warp_def 8, 12, 3, 17, 3587 - warp_def 8, 15, 3, 15, 3587 - warp_def 8, 20, 3, 26, 3587 - warp_def 8, 23, 3, 13, 3587 - warp_def 12, 4, 3, 24, 3587 - warp_def 12, 7, 3, 12, 3587 - warp_def 16, 4, 3, 10, 3587 - warp_def 16, 7, 3, 9, 3587 - warp_def 18, 15, 3, 5, 3587 - warp_def 20, 4, 3, 23, 3587 - warp_def 20, 7, 3, 4, 3587 - warp_def 20, 12, 3, 21, 3587 - warp_def 20, 15, 3, 16, 3587 - warp_def 20, 20, 3, 27, 3587 - warp_def 20, 23, 3, 14, 3587 - warp_def 28, 4, 3, 25, 3587 - warp_def 28, 7, 3, 8, 3587 - warp_def 28, 12, 3, 31, 3587 - warp_def 28, 15, 3, 6, 3587 - warp_def 28, 20, 3, 29, 3587 - warp_def 28, 23, 3, 3, 3587 - -SaffronCity_Gym_MapBGEvents: - bg_event 12, 20, 0, 0, 0, SaffronCity_Gym_EventScript_16EF55 - bg_event 16, 20, 0, 0, 0, SaffronCity_Gym_EventScript_16EF55 - -SaffronCity_Gym_MapEvents:: - map_events SaffronCity_Gym_EventObjects, SaffronCity_Gym_MapWarps, 0x0, SaffronCity_Gym_MapBGEvents diff --git a/data/maps/SaffronCity_Gym/header.inc b/data/maps/SaffronCity_Gym/header.inc deleted file mode 100644 index 98450bd26..000000000 --- a/data/maps/SaffronCity_Gym/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SaffronCity_Gym:: @ 835169C - .4byte SaffronCity_Gym_Layout @ 0x82D7C44 - .4byte SaffronCity_Gym_MapEvents @ 0x83BCF6C - .4byte SaffronCity_Gym_MapScripts @ 0x816EDD7 - .4byte NULL - .2byte BGM_FRLG_GYM - .2byte 34 - .byte 0x62, 0x00, 0x00, 0x08, 0x00, 0x01, 0x00, 0x01 diff --git a/data/maps/SaffronCity_Gym/map.json b/data/maps/SaffronCity_Gym/map.json new file mode 100644 index 000000000..96f9f5ee3 --- /dev/null +++ b/data/maps/SaffronCity_Gym/map.json @@ -0,0 +1,384 @@ +{ + "id": "MAP_SAFFRON_CITY_GYM", + "name": "SaffronCity_Gym", + "layout": "LAYOUT_SAFFRON_CITY_GYM", + "music": "BGM_FRLG_GYM", + "region_map_section": "MAPSEC_SAFFRON_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 1, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_1", + "connections": null, + "object_events": [ + { + "graphics_id": "41", + "x": 24, + "y": 18, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SaffronCity_Gym_EventScript_16EEC3", + "flag": "0" + }, + { + "graphics_id": "41", + "x": 24, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SaffronCity_Gym_EventScript_16EE88", + "flag": "0" + }, + { + "graphics_id": "41", + "x": 4, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SaffronCity_Gym_EventScript_16EEDA", + "flag": "0" + }, + { + "graphics_id": "58", + "x": 14, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SaffronCity_Gym_EventScript_16EEF1", + "flag": "0" + }, + { + "graphics_id": "58", + "x": 4, + "y": 10, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SaffronCity_Gym_EventScript_16EF08", + "flag": "0" + }, + { + "graphics_id": "58", + "x": 4, + "y": 18, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SaffronCity_Gym_EventScript_16EF1F", + "flag": "0" + }, + { + "graphics_id": "85", + "x": 14, + "y": 11, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_Gym_EventScript_16EDD8", + "flag": "0" + }, + { + "graphics_id": "41", + "x": 24, + "y": 10, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SaffronCity_Gym_EventScript_16EE9F", + "flag": "0" + }, + { + "graphics_id": "91", + "x": 15, + "y": 20, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_Gym_EventScript_16EF36", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 13, + "y": 23, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_warp_id": 3 + }, + { + "x": 14, + "y": 23, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_warp_id": 3 + }, + { + "x": 15, + "y": 23, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_warp_id": 3 + }, + { + "x": 18, + "y": 20, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_GYM", + "dest_warp_id": 32 + }, + { + "x": 0, + "y": 4, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_GYM", + "dest_warp_id": 22 + }, + { + "x": 0, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_GYM", + "dest_warp_id": 20 + }, + { + "x": 0, + "y": 12, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_GYM", + "dest_warp_id": 30 + }, + { + "x": 0, + "y": 15, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_GYM", + "dest_warp_id": 11 + }, + { + "x": 0, + "y": 20, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_GYM", + "dest_warp_id": 28 + }, + { + "x": 0, + "y": 23, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_GYM", + "dest_warp_id": 19 + }, + { + "x": 8, + "y": 4, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_GYM", + "dest_warp_id": 18 + }, + { + "x": 8, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_GYM", + "dest_warp_id": 7 + }, + { + "x": 8, + "y": 12, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_GYM", + "dest_warp_id": 17 + }, + { + "x": 8, + "y": 15, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_GYM", + "dest_warp_id": 15 + }, + { + "x": 8, + "y": 20, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_GYM", + "dest_warp_id": 26 + }, + { + "x": 8, + "y": 23, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_GYM", + "dest_warp_id": 13 + }, + { + "x": 12, + "y": 4, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_GYM", + "dest_warp_id": 24 + }, + { + "x": 12, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_GYM", + "dest_warp_id": 12 + }, + { + "x": 16, + "y": 4, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_GYM", + "dest_warp_id": 10 + }, + { + "x": 16, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_GYM", + "dest_warp_id": 9 + }, + { + "x": 18, + "y": 15, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_GYM", + "dest_warp_id": 5 + }, + { + "x": 20, + "y": 4, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_GYM", + "dest_warp_id": 23 + }, + { + "x": 20, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_GYM", + "dest_warp_id": 4 + }, + { + "x": 20, + "y": 12, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_GYM", + "dest_warp_id": 21 + }, + { + "x": 20, + "y": 15, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_GYM", + "dest_warp_id": 16 + }, + { + "x": 20, + "y": 20, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_GYM", + "dest_warp_id": 27 + }, + { + "x": 20, + "y": 23, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_GYM", + "dest_warp_id": 14 + }, + { + "x": 28, + "y": 4, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_GYM", + "dest_warp_id": 25 + }, + { + "x": 28, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_GYM", + "dest_warp_id": 8 + }, + { + "x": 28, + "y": 12, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_GYM", + "dest_warp_id": 31 + }, + { + "x": 28, + "y": 15, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_GYM", + "dest_warp_id": 6 + }, + { + "x": 28, + "y": 20, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_GYM", + "dest_warp_id": 29 + }, + { + "x": 28, + "y": 23, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_GYM", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 12, + "y": 20, + "elevation": 0, + "script": "SaffronCity_Gym_EventScript_16EF55" + }, + { + "type": "bg_event_type_0", + "x": 16, + "y": 20, + "elevation": 0, + "script": "SaffronCity_Gym_EventScript_16EF55" + } + ] +} \ No newline at end of file diff --git a/data/maps/SaffronCity_House1_1F/events.inc b/data/maps/SaffronCity_House1_1F/events.inc deleted file mode 100644 index 8cf2bd177..000000000 --- a/data/maps/SaffronCity_House1_1F/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -SaffronCity_House1_1F_EventObjects: - object_event 1, 30, 0, 8, 0, 4, 0, 3, 9, 17, 0, 0, 0, 0, 0, SaffronCity_House1_1F_EventScript_16EB40, 0, 0, 0 - object_event 2, 31, 0, 3, 0, 3, 0, 3, 8, 17, 0, 0, 0, 0, 0, SaffronCity_House1_1F_EventScript_16EB37, 0, 0, 0 - object_event 3, 117, 0, 4, 0, 4, 0, 3, 3, 33, 0, 0, 0, 0, 0, SaffronCity_House1_1F_EventScript_16EB49, 0, 0, 0 - -SaffronCity_House1_1F_MapWarps: - warp_def 3, 8, 3, 1, 778 - warp_def 4, 8, 3, 1, 778 - warp_def 5, 8, 3, 1, 778 - warp_def 10, 2, 3, 0, 3585 - -SaffronCity_House1_1F_MapEvents:: - map_events SaffronCity_House1_1F_EventObjects, SaffronCity_House1_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SaffronCity_House1_1F/header.inc b/data/maps/SaffronCity_House1_1F/header.inc deleted file mode 100644 index a2d14cf5d..000000000 --- a/data/maps/SaffronCity_House1_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SaffronCity_House1_1F:: @ 8351648 - .4byte SaffronCity_House1_1F_Layout @ 0x8321004 - .4byte SaffronCity_House1_1F_MapEvents @ 0x83BCB9C - .4byte SaffronCity_House1_1F_MapScripts @ 0x816EB36 - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 226 - .byte 0x62, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/SaffronCity_House1_1F/map.json b/data/maps/SaffronCity_House1_1F/map.json new file mode 100644 index 000000000..b48e123b6 --- /dev/null +++ b/data/maps/SaffronCity_House1_1F/map.json @@ -0,0 +1,88 @@ +{ + "id": "MAP_SAFFRON_CITY_HOUSE1_1F", + "name": "SaffronCity_House1_1F", + "layout": "LAYOUT_SAFFRON_CITY_HOUSE1_1F", + "music": "BGM_FRLG_VIRIDIAN_CITY", + "region_map_section": "MAPSEC_SAFFRON_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "30", + "x": 8, + "y": 4, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_House1_1F_EventScript_16EB40", + "flag": "0" + }, + { + "graphics_id": "31", + "x": 3, + "y": 3, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_House1_1F_EventScript_16EB37", + "flag": "0" + }, + { + "graphics_id": "117", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "3", + "movement_range_x": 1, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_House1_1F_EventScript_16EB49", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 8, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 8, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 8, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_warp_id": 1 + }, + { + "x": 10, + "y": 2, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_HOUSE1_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SaffronCity_House1_2F/events.inc b/data/maps/SaffronCity_House1_2F/events.inc deleted file mode 100644 index 40e137d0f..000000000 --- a/data/maps/SaffronCity_House1_2F/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -SaffronCity_House1_2F_EventObjects: - object_event 1, 132, 0, 6, 0, 8, 0, 3, 2, 17, 0, 0, 0, 0, 0, SaffronCity_House1_2F_EventScript_16EB5D, 0, 0, 0 - object_event 2, 120, 0, 4, 0, 6, 0, 3, 8, 17, 0, 0, 0, 0, 0, SaffronCity_House1_2F_EventScript_16EB70, 0, 0, 0 - object_event 3, 115, 0, 7, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, SaffronCity_House1_2F_EventScript_16EB70, 0, 0, 0 - object_event 4, 17, 0, 9, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, SaffronCity_House1_2F_EventScript_16EB7B, 0, 0, 0 - -SaffronCity_House1_2F_MapWarps: - warp_def 10, 2, 3, 3, 3584 - -SaffronCity_House1_2F_MapBGEvents: - bg_event 1, 1, 0, 0, 0, SaffronCity_House1_2F_EventScript_16EBC9 - bg_event 3, 5, 0, 0, 0, SaffronCity_House1_2F_EventScript_16EBD2 - bg_event 2, 1, 0, 7, 0, 110, 26, 1 - -SaffronCity_House1_2F_MapEvents:: - map_events SaffronCity_House1_2F_EventObjects, SaffronCity_House1_2F_MapWarps, 0x0, SaffronCity_House1_2F_MapBGEvents diff --git a/data/maps/SaffronCity_House1_2F/header.inc b/data/maps/SaffronCity_House1_2F/header.inc deleted file mode 100644 index ceb4cf6c4..000000000 --- a/data/maps/SaffronCity_House1_2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SaffronCity_House1_2F:: @ 8351664 - .4byte SaffronCity_House1_2F_Layout @ 0x8321100 - .4byte SaffronCity_House1_2F_MapEvents @ 0x83BCC3C - .4byte SaffronCity_House1_2F_MapScripts @ 0x816EB5C - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 227 - .byte 0x62, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/SaffronCity_House1_2F/map.json b/data/maps/SaffronCity_House1_2F/map.json new file mode 100644 index 000000000..ab0e164f9 --- /dev/null +++ b/data/maps/SaffronCity_House1_2F/map.json @@ -0,0 +1,104 @@ +{ + "id": "MAP_SAFFRON_CITY_HOUSE1_2F", + "name": "SaffronCity_House1_2F", + "layout": "LAYOUT_SAFFRON_CITY_HOUSE1_2F", + "music": "BGM_FRLG_VIRIDIAN_CITY", + "region_map_section": "MAPSEC_SAFFRON_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "132", + "x": 6, + "y": 8, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_House1_2F_EventScript_16EB5D", + "flag": "0" + }, + { + "graphics_id": "120", + "x": 4, + "y": 6, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_House1_2F_EventScript_16EB70", + "flag": "0" + }, + { + "graphics_id": "115", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_House1_2F_EventScript_16EB70", + "flag": "0" + }, + { + "graphics_id": "17", + "x": 9, + "y": 6, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_House1_2F_EventScript_16EB7B", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 10, + "y": 2, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_HOUSE1_1F", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 1, + "y": 1, + "elevation": 0, + "script": "SaffronCity_House1_2F_EventScript_16EBC9" + }, + { + "type": "bg_event_type_0", + "x": 3, + "y": 5, + "elevation": 0, + "script": "SaffronCity_House1_2F_EventScript_16EBD2" + }, + { + "type": "hidden_item", + "x": 2, + "y": 1, + "elevation": 0, + "item": "ITEM_NUGGET", + "flag": "26", + "unknown": 1 + } + ] +} \ No newline at end of file diff --git a/data/maps/SaffronCity_House2/events.inc b/data/maps/SaffronCity_House2/events.inc deleted file mode 100644 index 6859d12b6..000000000 --- a/data/maps/SaffronCity_House2/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -SaffronCity_House2_EventObjects: - object_event 1, 116, 0, 0, 0, 5, 0, 3, 3, 65, 0, 0, 0, 0, 0, SaffronCity_House2_EventScript_16EF86, 0, 0, 0 - object_event 2, 22, 0, 4, 0, 4, 0, 3, 10, 17, 0, 0, 0, 0, 0, SaffronCity_House2_EventScript_16EF74, 0, 0, 0 - object_event 3, 18, 0, 6, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, SaffronCity_House2_EventScript_16EF7D, 0, 0, 0 - object_event 4, 105, 0, 5, 0, 4, 0, 0, 7, 17, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 - -SaffronCity_House2_MapWarps: - warp_def 3, 7, 3, 4, 778 - warp_def 4, 7, 3, 4, 778 - warp_def 5, 7, 3, 4, 778 - -SaffronCity_House2_MapBGEvents: - bg_event 5, 4, 3, 0, 0, SaffronCity_House2_EventScript_16EF99 - -SaffronCity_House2_MapEvents:: - map_events SaffronCity_House2_EventObjects, SaffronCity_House2_MapWarps, 0x0, SaffronCity_House2_MapBGEvents diff --git a/data/maps/SaffronCity_House2/header.inc b/data/maps/SaffronCity_House2/header.inc deleted file mode 100644 index 06c30be07..000000000 --- a/data/maps/SaffronCity_House2/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SaffronCity_House2:: @ 83516B8 - .4byte House5_Layout @ 0x82D6AF0 - .4byte SaffronCity_House2_MapEvents @ 0x83BD004 - .4byte SaffronCity_House2_MapScripts @ 0x816EF73 - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 21 - .byte 0x62, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/SaffronCity_House2/map.json b/data/maps/SaffronCity_House2/map.json new file mode 100644 index 000000000..de11d7982 --- /dev/null +++ b/data/maps/SaffronCity_House2/map.json @@ -0,0 +1,102 @@ +{ + "id": "MAP_SAFFRON_CITY_HOUSE2", + "name": "SaffronCity_House2", + "layout": "LAYOUT_HOUSE5", + "music": "BGM_FRLG_VIRIDIAN_CITY", + "region_map_section": "MAPSEC_SAFFRON_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "116", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "3", + "movement_range_x": 1, + "movement_range_y": 4, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_House2_EventScript_16EF86", + "flag": "0" + }, + { + "graphics_id": "22", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_House2_EventScript_16EF74", + "flag": "0" + }, + { + "graphics_id": "18", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_House2_EventScript_16EF7D", + "flag": "0" + }, + { + "graphics_id": "105", + "x": 5, + "y": 4, + "elevation": 0, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_warp_id": 4 + }, + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_warp_id": 4 + }, + { + "x": 5, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 5, + "y": 4, + "elevation": 3, + "script": "SaffronCity_House2_EventScript_16EF99" + } + ] +} \ No newline at end of file diff --git a/data/maps/SaffronCity_House3/events.inc b/data/maps/SaffronCity_House3/events.inc deleted file mode 100644 index dea32514e..000000000 --- a/data/maps/SaffronCity_House3/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -SaffronCity_House3_EventObjects: - object_event 1, 30, 0, 7, 0, 4, 0, 3, 9, 17, 0, 0, 0, 0, 0, SaffronCity_House3_EventScript_16F05F, 0, 0, 0 - -SaffronCity_House3_MapWarps: - warp_def 3, 7, 3, 7, 778 - warp_def 4, 7, 3, 7, 778 - warp_def 5, 7, 3, 7, 778 - -SaffronCity_House3_MapEvents:: - map_events SaffronCity_House3_EventObjects, SaffronCity_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/SaffronCity_House3/header.inc b/data/maps/SaffronCity_House3/header.inc deleted file mode 100644 index 94193549c..000000000 --- a/data/maps/SaffronCity_House3/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SaffronCity_House3:: @ 8351728 - .4byte House5_Layout @ 0x82D6AF0 - .4byte SaffronCity_House3_MapEvents @ 0x83BD20C - .4byte SaffronCity_House3_MapScripts @ 0x816F05E - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 21 - .byte 0x62, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/SaffronCity_House3/map.json b/data/maps/SaffronCity_House3/map.json new file mode 100644 index 000000000..eda6fe9fc --- /dev/null +++ b/data/maps/SaffronCity_House3/map.json @@ -0,0 +1,55 @@ +{ + "id": "MAP_SAFFRON_CITY_HOUSE3", + "name": "SaffronCity_House3", + "layout": "LAYOUT_HOUSE5", + "music": "BGM_FRLG_VIRIDIAN_CITY", + "region_map_section": "MAPSEC_SAFFRON_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "30", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_House3_EventScript_16F05F", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_warp_id": 7 + }, + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_warp_id": 7 + }, + { + "x": 5, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_warp_id": 7 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SaffronCity_Mart/events.inc b/data/maps/SaffronCity_Mart/events.inc deleted file mode 100644 index 62dcd60e8..000000000 --- a/data/maps/SaffronCity_Mart/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -SaffronCity_Mart_EventObjects: - object_event 1, 68, 0, 2, 0, 3, 0, 0, 10, 17, 0, 0, 0, 0, 0, SaffronCity_Mart_EventScript_16EFB5, 0, 0, 0 - object_event 2, 18, 0, 1, 0, 7, 0, 3, 10, 17, 0, 0, 0, 0, 0, SaffronCity_Mart_EventScript_16EFAC, 0, 0, 0 - object_event 3, 22, 0, 9, 0, 5, 0, 3, 3, 17, 0, 0, 0, 0, 0, SaffronCity_Mart_EventScript_16EFA3, 0, 0, 0 - -SaffronCity_Mart_MapWarps: - warp_def 3, 7, 3, 5, 778 - warp_def 4, 7, 3, 5, 778 - warp_def 5, 7, 3, 5, 778 - -SaffronCity_Mart_MapEvents:: - map_events SaffronCity_Mart_EventObjects, SaffronCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/SaffronCity_Mart/header.inc b/data/maps/SaffronCity_Mart/header.inc deleted file mode 100644 index 77c8555ec..000000000 --- a/data/maps/SaffronCity_Mart/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SaffronCity_Mart:: @ 83516D4 - .4byte Mart_Layout @ 0x82D5BCC - .4byte SaffronCity_Mart_MapEvents @ 0x83BD078 - .4byte SaffronCity_Mart_MapScripts @ 0x816EFA2 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 10 - .byte 0x62, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/SaffronCity_Mart/map.json b/data/maps/SaffronCity_Mart/map.json new file mode 100644 index 000000000..00e191a94 --- /dev/null +++ b/data/maps/SaffronCity_Mart/map.json @@ -0,0 +1,81 @@ +{ + "id": "MAP_SAFFRON_CITY_MART", + "name": "SaffronCity_Mart", + "layout": "LAYOUT_MART", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_SAFFRON_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "68", + "x": 2, + "y": 3, + "elevation": 0, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_Mart_EventScript_16EFB5", + "flag": "0" + }, + { + "graphics_id": "18", + "x": 1, + "y": 7, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_Mart_EventScript_16EFAC", + "flag": "0" + }, + { + "graphics_id": "22", + "x": 9, + "y": 5, + "elevation": 3, + "movement_type": "3", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_Mart_EventScript_16EFA3", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_warp_id": 5 + }, + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_warp_id": 5 + }, + { + "x": 5, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SaffronCity_PokemonCenter_1F/events.inc b/data/maps/SaffronCity_PokemonCenter_1F/events.inc deleted file mode 100644 index 478989842..000000000 --- a/data/maps/SaffronCity_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -SaffronCity_PokemonCenter_1F_EventObjects: - object_event 1, 64, 0, 7, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, SaffronCity_PokemonCenter_1F_EventScript_16EFFB, 0, 0, 0 - object_event 2, 61, 0, 14, 0, 6, 0, 3, 9, 17, 0, 0, 0, 0, 0, SaffronCity_PokemonCenter_1F_EventScript_16F004, 0, 0, 0 - object_event 3, 31, 0, 4, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, SaffronCity_PokemonCenter_1F_EventScript_16F00D, 0, 0, 0 - object_event 4, 18, 0, 9, 0, 6, 0, 3, 3, 17, 0, 0, 0, 0, 0, SaffronCity_PokemonCenter_1F_EventScript_16F016, 0, 0, 0 - object_event 5, 0, 0, 2, 0, 1, 0, 0, 76, 17, 0, 0, 0, 0, 0, SaffronCity_PokemonCenter_1F_EventScript_1ACEEC, 174, 0, 0 - object_event 6, 0, 0, 3, 0, 1, 0, 0, 76, 17, 0, 0, 0, 0, 0, SaffronCity_PokemonCenter_1F_EventScript_1ACEEC, 174, 0, 0 - -SaffronCity_PokemonCenter_1F_MapWarps: - warp_def 6, 8, 3, 6, 778 - warp_def 7, 8, 3, 6, 778 - warp_def 8, 8, 3, 6, 778 - warp_def 1, 6, 4, 0, 3591 - -SaffronCity_PokemonCenter_1F_MapEvents:: - map_events SaffronCity_PokemonCenter_1F_EventObjects, SaffronCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SaffronCity_PokemonCenter_1F/header.inc b/data/maps/SaffronCity_PokemonCenter_1F/header.inc deleted file mode 100644 index 1e2198879..000000000 --- a/data/maps/SaffronCity_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SaffronCity_PokemonCenter_1F:: @ 83516F0 - .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte SaffronCity_PokemonCenter_1F_MapEvents @ 0x83BD13C - .4byte SaffronCity_PokemonCenter_1F_MapScripts @ 0x816EFEC - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 8 - .byte 0x62, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/SaffronCity_PokemonCenter_1F/map.json b/data/maps/SaffronCity_PokemonCenter_1F/map.json new file mode 100644 index 000000000..46de82e0c --- /dev/null +++ b/data/maps/SaffronCity_PokemonCenter_1F/map.json @@ -0,0 +1,127 @@ +{ + "id": "MAP_SAFFRON_CITY_POKEMON_CENTER_1F", + "name": "SaffronCity_PokemonCenter_1F", + "layout": "LAYOUT_POKEMON_CENTER_1F", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_SAFFRON_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "64", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_PokemonCenter_1F_EventScript_16EFFB", + "flag": "0" + }, + { + "graphics_id": "61", + "x": 14, + "y": 6, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_PokemonCenter_1F_EventScript_16F004", + "flag": "0" + }, + { + "graphics_id": "31", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_PokemonCenter_1F_EventScript_16F00D", + "flag": "0" + }, + { + "graphics_id": "18", + "x": 9, + "y": 6, + "elevation": 3, + "movement_type": "3", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_PokemonCenter_1F_EventScript_16F016", + "flag": "0" + }, + { + "graphics_id": "0", + "x": 2, + "y": 1, + "elevation": 0, + "movement_type": "76", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_PokemonCenter_1F_EventScript_1ACEEC", + "flag": "174" + }, + { + "graphics_id": "0", + "x": 3, + "y": 1, + "elevation": 0, + "movement_type": "76", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_PokemonCenter_1F_EventScript_1ACEEC", + "flag": "174" + } + ], + "warp_events": [ + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_warp_id": 6 + }, + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_warp_id": 6 + }, + { + "x": 8, + "y": 8, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_warp_id": 6 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_SAFFRON_CITY_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SaffronCity_PokemonCenter_2F/events.inc b/data/maps/SaffronCity_PokemonCenter_2F/events.inc deleted file mode 100644 index 9d740b6d7..000000000 --- a/data/maps/SaffronCity_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -SaffronCity_PokemonCenter_2F_EventObjects: - object_event 1, 65, 0, 6, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SaffronCity_PokemonCenter_2F_EventScript_1A8CF6, 0, 0, 0 - object_event 2, 65, 0, 2, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SaffronCity_PokemonCenter_2F_EventScript_1A8CFC, 0, 0, 0 - object_event 3, 65, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SaffronCity_PokemonCenter_2F_EventScript_1A8D02, 0, 0, 0 - object_event 4, 69, 0, 1, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, SaffronCity_PokemonCenter_2F_EventScript_1BB1D2, 112, 0, 0 - -SaffronCity_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 3, 3590 - warp_def 5, 1, 0, 0, 4 - warp_def 9, 1, 0, 0, 1 - -SaffronCity_PokemonCenter_2F_MapEvents:: - map_events SaffronCity_PokemonCenter_2F_EventObjects, SaffronCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SaffronCity_PokemonCenter_2F/header.inc b/data/maps/SaffronCity_PokemonCenter_2F/header.inc deleted file mode 100644 index 8c649319e..000000000 --- a/data/maps/SaffronCity_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SaffronCity_PokemonCenter_2F:: @ 835170C - .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte SaffronCity_PokemonCenter_2F_MapEvents @ 0x83BD1C8 - .4byte SaffronCity_PokemonCenter_2F_MapScripts @ 0x816F037 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 9 - .byte 0x62, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/SaffronCity_PokemonCenter_2F/map.json b/data/maps/SaffronCity_PokemonCenter_2F/map.json new file mode 100644 index 000000000..a79fb8efd --- /dev/null +++ b/data/maps/SaffronCity_PokemonCenter_2F/map.json @@ -0,0 +1,94 @@ +{ + "id": "MAP_SAFFRON_CITY_POKEMON_CENTER_2F", + "name": "SaffronCity_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_SAFFRON_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "65", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_PokemonCenter_2F_EventScript_1A8CF6", + "flag": "0" + }, + { + "graphics_id": "65", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_PokemonCenter_2F_EventScript_1A8CFC", + "flag": "0" + }, + { + "graphics_id": "65", + "x": 10, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_PokemonCenter_2F_EventScript_1A8D02", + "flag": "0" + }, + { + "graphics_id": "69", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_PokemonCenter_2F_EventScript_1BB1D2", + "flag": "112" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_SAFFRON_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 3 + }, + { + "x": 5, + "y": 1, + "elevation": 0, + "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 0, + "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/events.inc b/data/maps/SaffronCity_PokemonTrainerFanClub/events.inc deleted file mode 100644 index a1139c312..000000000 --- a/data/maps/SaffronCity_PokemonTrainerFanClub/events.inc +++ /dev/null @@ -1,17 +0,0 @@ -SaffronCity_PokemonTrainerFanClub_EventObjects: - object_event 1, 24, 0, 7, 0, 13, 0, 3, 9, 17, 0, 0, 0, 0, 0, SaffronCity_PokemonTrainerFanClub_EventScript_16F281, 0, 0, 0 - object_event 2, 17, 0, 6, 0, 11, 0, 3, 8, 17, 0, 0, 0, 0, 0, SaffronCity_PokemonTrainerFanClub_EventScript_16F2F8, 0, 0, 0 - object_event 3, 18, 0, 3, 0, 13, 0, 3, 10, 17, 0, 0, 0, 0, 0, SaffronCity_PokemonTrainerFanClub_EventScript_16F36F, 0, 0, 0 - object_event 4, 61, 0, 3, 0, 12, 0, 3, 10, 17, 0, 0, 0, 0, 0, SaffronCity_PokemonTrainerFanClub_EventScript_16F3E6, 0, 0, 0 - object_event 5, 31, 0, 9, 0, 11, 0, 3, 8, 17, 0, 0, 0, 0, 0, SaffronCity_PokemonTrainerFanClub_EventScript_16F45D, 110, 0, 0 - object_event 6, 26, 0, 7, 0, 12, 0, 3, 9, 17, 0, 0, 0, 0, 0, SaffronCity_PokemonTrainerFanClub_EventScript_16F4BF, 109, 0, 0 - object_event 7, 29, 0, 9, 0, 12, 0, 3, 7, 17, 0, 0, 0, 0, 0, SaffronCity_PokemonTrainerFanClub_EventScript_16F521, 111, 0, 0 - object_event 8, 54, 0, 5, 0, 11, 0, 3, 8, 17, 0, 0, 0, 0, 0, SaffronCity_PokemonTrainerFanClub_EventScript_16F583, 108, 0, 0 - object_event 9, 0, 0, 2, 0, 1, 0, 0, 76, 17, 0, 0, 0, 0, 0, SaffronCity_PokemonTrainerFanClub_EventScript_1ACF7A, 157, 0, 0 - object_event 10, 0, 0, 3, 0, 1, 0, 0, 76, 17, 0, 0, 0, 0, 0, SaffronCity_PokemonTrainerFanClub_EventScript_1ACF7A, 157, 0, 0 - -SaffronCity_PokemonTrainerFanClub_MapWarps: - warp_def 5, 15, 3, 14, 778 - -SaffronCity_PokemonTrainerFanClub_MapEvents:: - map_events SaffronCity_PokemonTrainerFanClub_EventObjects, SaffronCity_PokemonTrainerFanClub_MapWarps, 0x0, 0x0 diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/header.inc b/data/maps/SaffronCity_PokemonTrainerFanClub/header.inc deleted file mode 100644 index 9adb9fbb0..000000000 --- a/data/maps/SaffronCity_PokemonTrainerFanClub/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SaffronCity_PokemonTrainerFanClub:: @ 8351744 - .4byte SaffronCity_PokemonTrainerFanClub_Layout @ 0x8338A60 - .4byte SaffronCity_PokemonTrainerFanClub_MapEvents @ 0x83BD318 - .4byte SaffronCity_PokemonTrainerFanClub_MapScripts @ 0x816F0BF - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 263 - .byte 0x62, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/map.json b/data/maps/SaffronCity_PokemonTrainerFanClub/map.json new file mode 100644 index 000000000..0403a7806 --- /dev/null +++ b/data/maps/SaffronCity_PokemonTrainerFanClub/map.json @@ -0,0 +1,158 @@ +{ + "id": "MAP_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB", + "name": "SaffronCity_PokemonTrainerFanClub", + "layout": "LAYOUT_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB", + "music": "BGM_FRLG_VIRIDIAN_CITY", + "region_map_section": "MAPSEC_SAFFRON_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "24", + "x": 7, + "y": 13, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F281", + "flag": "0" + }, + { + "graphics_id": "17", + "x": 6, + "y": 11, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F2F8", + "flag": "0" + }, + { + "graphics_id": "18", + "x": 3, + "y": 13, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F36F", + "flag": "0" + }, + { + "graphics_id": "61", + "x": 3, + "y": 12, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F3E6", + "flag": "0" + }, + { + "graphics_id": "31", + "x": 9, + "y": 11, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F45D", + "flag": "110" + }, + { + "graphics_id": "26", + "x": 7, + "y": 12, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F4BF", + "flag": "109" + }, + { + "graphics_id": "29", + "x": 9, + "y": 12, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F521", + "flag": "111" + }, + { + "graphics_id": "54", + "x": 5, + "y": 11, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F583", + "flag": "108" + }, + { + "graphics_id": "0", + "x": 2, + "y": 1, + "elevation": 0, + "movement_type": "76", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_PokemonTrainerFanClub_EventScript_1ACF7A", + "flag": "157" + }, + { + "graphics_id": "0", + "x": 3, + "y": 1, + "elevation": 0, + "movement_type": "76", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SaffronCity_PokemonTrainerFanClub_EventScript_1ACF7A", + "flag": "157" + } + ], + "warp_events": [ + { + "x": 5, + "y": 15, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_warp_id": 14 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SeafoamIslands_1F/events.inc b/data/maps/SeafoamIslands_1F/events.inc deleted file mode 100644 index ad0e8a938..000000000 --- a/data/maps/SeafoamIslands_1F/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -SeafoamIslands_1F_EventObjects: - object_event 1, 97, 0, 22, 0, 12, 0, 3, 8, 0, 0, 66, 0, 0, 0, SeafoamIslands_1F_EventScript_1BE11D, 64, 0, 0 - object_event 2, 97, 0, 32, 0, 9, 0, 3, 8, 0, 0, 67, 0, 0, 0, SeafoamIslands_1F_EventScript_1BE11D, 65, 0, 0 - object_event 3, 92, 0, 11, 0, 8, 0, 3, 8, 17, 0, 0, 0, 0, 0, SeafoamIslands_1F_EventScript_1BEBE7, 468, 0, 0 - -SeafoamIslands_1F_MapWarps: - warp_def 10, 6, 3, 0, 340 - warp_def 31, 4, 3, 1, 340 - warp_def 28, 19, 3, 2, 340 - warp_def 6, 21, 3, 0, 806 - warp_def 32, 21, 3, 1, 806 - warp_def 21, 8, 3, 9, 340 - warp_def 30, 8, 3, 10, 340 - -SeafoamIslands_1F_MapEvents:: - map_events SeafoamIslands_1F_EventObjects, SeafoamIslands_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SeafoamIslands_1F/header.inc b/data/maps/SeafoamIslands_1F/header.inc deleted file mode 100644 index f95429a3f..000000000 --- a/data/maps/SeafoamIslands_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SeafoamIslands_1F:: @ 834FB28 - .4byte SeafoamIslands_1F_Layout @ 0x831474C - .4byte SeafoamIslands_1F_MapEvents @ 0x83B1E64 - .4byte SeafoamIslands_1F_MapScripts @ 0x8162F43 - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_FOREST - .2byte 156 - .byte 0x8b, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/SeafoamIslands_1F/map.json b/data/maps/SeafoamIslands_1F/map.json new file mode 100644 index 000000000..cdf4bcd0a --- /dev/null +++ b/data/maps/SeafoamIslands_1F/map.json @@ -0,0 +1,109 @@ +{ + "id": "MAP_SEAFOAM_ISLANDS_1F", + "name": "SeafoamIslands_1F", + "layout": "LAYOUT_SEAFOAM_ISLANDS_1F", + "music": "BGM_FRLG_VIRIDIAN_FOREST", + "region_map_section": "MAPSEC_SEAFOAM_ISLANDS", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "97", + "x": 22, + "y": 12, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 66, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafoamIslands_1F_EventScript_1BE11D", + "flag": "64" + }, + { + "graphics_id": "97", + "x": 32, + "y": 9, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 67, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafoamIslands_1F_EventScript_1BE11D", + "flag": "65" + }, + { + "graphics_id": "92", + "x": 11, + "y": 8, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafoamIslands_1F_EventScript_1BEBE7", + "flag": "468" + } + ], + "warp_events": [ + { + "x": 10, + "y": 6, + "elevation": 3, + "dest_map": "MAP_SEAFOAM_ISLANDS_B1F", + "dest_warp_id": 0 + }, + { + "x": 31, + "y": 4, + "elevation": 3, + "dest_map": "MAP_SEAFOAM_ISLANDS_B1F", + "dest_warp_id": 1 + }, + { + "x": 28, + "y": 19, + "elevation": 3, + "dest_map": "MAP_SEAFOAM_ISLANDS_B1F", + "dest_warp_id": 2 + }, + { + "x": 6, + "y": 21, + "elevation": 3, + "dest_map": "MAP_ROUTE20", + "dest_warp_id": 0 + }, + { + "x": 32, + "y": 21, + "elevation": 3, + "dest_map": "MAP_ROUTE20", + "dest_warp_id": 1 + }, + { + "x": 21, + "y": 8, + "elevation": 3, + "dest_map": "MAP_SEAFOAM_ISLANDS_B1F", + "dest_warp_id": 9 + }, + { + "x": 30, + "y": 8, + "elevation": 3, + "dest_map": "MAP_SEAFOAM_ISLANDS_B1F", + "dest_warp_id": 10 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SeafoamIslands_B1F/events.inc b/data/maps/SeafoamIslands_B1F/events.inc deleted file mode 100644 index b8f166929..000000000 --- a/data/maps/SeafoamIslands_B1F/events.inc +++ /dev/null @@ -1,21 +0,0 @@ -SeafoamIslands_B1F_EventObjects: - object_event 1, 97, 0, 22, 0, 8, 0, 3, 8, 0, 0, 68, 0, 0, 0, SeafoamIslands_B1F_EventScript_1BE11D, 66, 0, 0 - object_event 2, 97, 0, 30, 0, 8, 0, 3, 8, 0, 0, 69, 0, 0, 0, SeafoamIslands_B1F_EventScript_1BE11D, 67, 0, 0 - object_event 3, 92, 0, 19, 0, 18, 0, 3, 8, 17, 0, 0, 0, 0, 0, SeafoamIslands_B1F_EventScript_1BEBF4, 469, 0, 0 - object_event 4, 92, 0, 24, 0, 14, 0, 4, 8, 17, 0, 0, 0, 0, 0, SeafoamIslands_B1F_EventScript_1BEC01, 470, 0, 0 - -SeafoamIslands_B1F_MapWarps: - warp_def 10, 6, 4, 0, 339 - warp_def 31, 4, 3, 1, 339 - warp_def 28, 19, 3, 2, 339 - warp_def 7, 3, 3, 3, 341 - warp_def 17, 9, 4, 4, 341 - warp_def 25, 19, 3, 5, 341 - warp_def 32, 14, 3, 6, 341 - warp_def 23, 8, 3, 7, 341 - warp_def 28, 8, 3, 8, 341 - warp_def 21, 8, 3, 5, 339 - warp_def 29, 8, 3, 6, 339 - -SeafoamIslands_B1F_MapEvents:: - map_events SeafoamIslands_B1F_EventObjects, SeafoamIslands_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SeafoamIslands_B1F/header.inc b/data/maps/SeafoamIslands_B1F/header.inc deleted file mode 100644 index b81544b6f..000000000 --- a/data/maps/SeafoamIslands_B1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SeafoamIslands_B1F:: @ 834FB44 - .4byte SeafoamIslands_B1F_Layout @ 0x8314E44 - .4byte SeafoamIslands_B1F_MapEvents @ 0x83B1F30 - .4byte SeafoamIslands_B1F_MapScripts @ 0x8162F4D - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_FOREST - .2byte 157 - .byte 0x8b, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/SeafoamIslands_B1F/map.json b/data/maps/SeafoamIslands_B1F/map.json new file mode 100644 index 000000000..94c850eb0 --- /dev/null +++ b/data/maps/SeafoamIslands_B1F/map.json @@ -0,0 +1,150 @@ +{ + "id": "MAP_SEAFOAM_ISLANDS_B1F", + "name": "SeafoamIslands_B1F", + "layout": "LAYOUT_SEAFOAM_ISLANDS_B1F", + "music": "BGM_FRLG_VIRIDIAN_FOREST", + "region_map_section": "MAPSEC_SEAFOAM_ISLANDS", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "97", + "x": 22, + "y": 8, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 68, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafoamIslands_B1F_EventScript_1BE11D", + "flag": "66" + }, + { + "graphics_id": "97", + "x": 30, + "y": 8, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 69, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafoamIslands_B1F_EventScript_1BE11D", + "flag": "67" + }, + { + "graphics_id": "92", + "x": 19, + "y": 18, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafoamIslands_B1F_EventScript_1BEBF4", + "flag": "469" + }, + { + "graphics_id": "92", + "x": 24, + "y": 14, + "elevation": 4, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafoamIslands_B1F_EventScript_1BEC01", + "flag": "470" + } + ], + "warp_events": [ + { + "x": 10, + "y": 6, + "elevation": 4, + "dest_map": "MAP_SEAFOAM_ISLANDS_1F", + "dest_warp_id": 0 + }, + { + "x": 31, + "y": 4, + "elevation": 3, + "dest_map": "MAP_SEAFOAM_ISLANDS_1F", + "dest_warp_id": 1 + }, + { + "x": 28, + "y": 19, + "elevation": 3, + "dest_map": "MAP_SEAFOAM_ISLANDS_1F", + "dest_warp_id": 2 + }, + { + "x": 7, + "y": 3, + "elevation": 3, + "dest_map": "MAP_SEAFOAM_ISLANDS_B2F", + "dest_warp_id": 3 + }, + { + "x": 17, + "y": 9, + "elevation": 4, + "dest_map": "MAP_SEAFOAM_ISLANDS_B2F", + "dest_warp_id": 4 + }, + { + "x": 25, + "y": 19, + "elevation": 3, + "dest_map": "MAP_SEAFOAM_ISLANDS_B2F", + "dest_warp_id": 5 + }, + { + "x": 32, + "y": 14, + "elevation": 3, + "dest_map": "MAP_SEAFOAM_ISLANDS_B2F", + "dest_warp_id": 6 + }, + { + "x": 23, + "y": 8, + "elevation": 3, + "dest_map": "MAP_SEAFOAM_ISLANDS_B2F", + "dest_warp_id": 7 + }, + { + "x": 28, + "y": 8, + "elevation": 3, + "dest_map": "MAP_SEAFOAM_ISLANDS_B2F", + "dest_warp_id": 8 + }, + { + "x": 21, + "y": 8, + "elevation": 3, + "dest_map": "MAP_SEAFOAM_ISLANDS_1F", + "dest_warp_id": 5 + }, + { + "x": 29, + "y": 8, + "elevation": 3, + "dest_map": "MAP_SEAFOAM_ISLANDS_1F", + "dest_warp_id": 6 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SeafoamIslands_B2F/events.inc b/data/maps/SeafoamIslands_B2F/events.inc deleted file mode 100644 index 11165d646..000000000 --- a/data/maps/SeafoamIslands_B2F/events.inc +++ /dev/null @@ -1,20 +0,0 @@ -SeafoamIslands_B2F_EventObjects: - object_event 1, 97, 0, 22, 0, 8, 0, 3, 8, 0, 0, 70, 0, 0, 0, SeafoamIslands_B2F_EventScript_1BE11D, 68, 0, 0 - object_event 2, 97, 0, 30, 0, 8, 0, 3, 8, 0, 0, 71, 0, 0, 0, SeafoamIslands_B2F_EventScript_1BE11D, 69, 0, 0 - object_event 3, 92, 0, 18, 0, 15, 0, 3, 8, 17, 0, 0, 0, 0, 0, SeafoamIslands_B2F_EventScript_1BEC0E, 471, 0, 0 - -SeafoamIslands_B2F_MapWarps: - warp_def 7, 17, 3, 0, 342 - warp_def 32, 4, 3, 1, 342 - warp_def 31, 17, 4, 2, 342 - warp_def 7, 4, 3, 3, 340 - warp_def 17, 9, 4, 4, 340 - warp_def 25, 19, 3, 5, 340 - warp_def 32, 14, 4, 6, 340 - warp_def 22, 7, 3, 7, 340 - warp_def 29, 8, 3, 8, 340 - warp_def 24, 8, 3, 5, 342 - warp_def 27, 8, 3, 6, 342 - -SeafoamIslands_B2F_MapEvents:: - map_events SeafoamIslands_B2F_EventObjects, SeafoamIslands_B2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SeafoamIslands_B2F/header.inc b/data/maps/SeafoamIslands_B2F/header.inc deleted file mode 100644 index 320d37873..000000000 --- a/data/maps/SeafoamIslands_B2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SeafoamIslands_B2F:: @ 834FB60 - .4byte SeafoamIslands_B2F_Layout @ 0x8315588 - .4byte SeafoamIslands_B2F_MapEvents @ 0x83B1FE4 - .4byte SeafoamIslands_B2F_MapScripts @ 0x8162F4E - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_FOREST - .2byte 158 - .byte 0x8b, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/SeafoamIslands_B2F/map.json b/data/maps/SeafoamIslands_B2F/map.json new file mode 100644 index 000000000..bb614f803 --- /dev/null +++ b/data/maps/SeafoamIslands_B2F/map.json @@ -0,0 +1,137 @@ +{ + "id": "MAP_SEAFOAM_ISLANDS_B2F", + "name": "SeafoamIslands_B2F", + "layout": "LAYOUT_SEAFOAM_ISLANDS_B2F", + "music": "BGM_FRLG_VIRIDIAN_FOREST", + "region_map_section": "MAPSEC_SEAFOAM_ISLANDS", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "97", + "x": 22, + "y": 8, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 70, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafoamIslands_B2F_EventScript_1BE11D", + "flag": "68" + }, + { + "graphics_id": "97", + "x": 30, + "y": 8, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 71, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafoamIslands_B2F_EventScript_1BE11D", + "flag": "69" + }, + { + "graphics_id": "92", + "x": 18, + "y": 15, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafoamIslands_B2F_EventScript_1BEC0E", + "flag": "471" + } + ], + "warp_events": [ + { + "x": 7, + "y": 17, + "elevation": 3, + "dest_map": "MAP_SEAFOAM_ISLANDS_B3F", + "dest_warp_id": 0 + }, + { + "x": 32, + "y": 4, + "elevation": 3, + "dest_map": "MAP_SEAFOAM_ISLANDS_B3F", + "dest_warp_id": 1 + }, + { + "x": 31, + "y": 17, + "elevation": 4, + "dest_map": "MAP_SEAFOAM_ISLANDS_B3F", + "dest_warp_id": 2 + }, + { + "x": 7, + "y": 4, + "elevation": 3, + "dest_map": "MAP_SEAFOAM_ISLANDS_B1F", + "dest_warp_id": 3 + }, + { + "x": 17, + "y": 9, + "elevation": 4, + "dest_map": "MAP_SEAFOAM_ISLANDS_B1F", + "dest_warp_id": 4 + }, + { + "x": 25, + "y": 19, + "elevation": 3, + "dest_map": "MAP_SEAFOAM_ISLANDS_B1F", + "dest_warp_id": 5 + }, + { + "x": 32, + "y": 14, + "elevation": 4, + "dest_map": "MAP_SEAFOAM_ISLANDS_B1F", + "dest_warp_id": 6 + }, + { + "x": 22, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SEAFOAM_ISLANDS_B1F", + "dest_warp_id": 7 + }, + { + "x": 29, + "y": 8, + "elevation": 3, + "dest_map": "MAP_SEAFOAM_ISLANDS_B1F", + "dest_warp_id": 8 + }, + { + "x": 24, + "y": 8, + "elevation": 3, + "dest_map": "MAP_SEAFOAM_ISLANDS_B3F", + "dest_warp_id": 5 + }, + { + "x": 27, + "y": 8, + "elevation": 3, + "dest_map": "MAP_SEAFOAM_ISLANDS_B3F", + "dest_warp_id": 6 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SeafoamIslands_B3F/events.inc b/data/maps/SeafoamIslands_B3F/events.inc deleted file mode 100644 index 144502290..000000000 --- a/data/maps/SeafoamIslands_B3F/events.inc +++ /dev/null @@ -1,24 +0,0 @@ -SeafoamIslands_B3F_EventObjects: - object_event 1, 97, 0, 23, 0, 8, 0, 1, 8, 17, 0, 0, 0, 0, 0, 0x0, 70, 0, 0 - object_event 2, 97, 0, 24, 0, 8, 0, 1, 8, 17, 0, 0, 0, 0, 0, 0x0, 71, 0, 0 - object_event 3, 97, 0, 12, 0, 16, 0, 3, 8, 0, 0, 77, 0, 0, 0, SeafoamIslands_B3F_EventScript_1BE11D, 74, 0, 0 - object_event 4, 97, 0, 13, 0, 16, 0, 3, 8, 0, 0, 0, 0, 0, 0, SeafoamIslands_B3F_EventScript_1BE11D, 75, 0, 0 - object_event 5, 97, 0, 9, 0, 16, 0, 3, 8, 0, 0, 0, 0, 0, 0, SeafoamIslands_B3F_EventScript_1BE11D, 73, 0, 0 - object_event 6, 97, 0, 6, 0, 17, 0, 3, 8, 0, 0, 76, 0, 0, 0, SeafoamIslands_B3F_EventScript_1BE11D, 72, 0, 0 - -SeafoamIslands_B3F_MapWarps: - warp_def 8, 14, 4, 0, 341 - warp_def 31, 4, 3, 1, 341 - warp_def 31, 16, 4, 2, 341 - warp_def 12, 9, 3, 0, 343 - warp_def 29, 5, 3, 1, 343 - warp_def 23, 9, 1, 7, 341 - warp_def 24, 9, 1, 8, 341 - warp_def 6, 18, 3, 2, 343 - warp_def 9, 18, 3, 3, 343 - -SeafoamIslands_B3F_MapBGEvents: - bg_event 5, 12, 0, 7, 0, 110, 29, 1 - -SeafoamIslands_B3F_MapEvents:: - map_events SeafoamIslands_B3F_EventObjects, SeafoamIslands_B3F_MapWarps, 0x0, SeafoamIslands_B3F_MapBGEvents diff --git a/data/maps/SeafoamIslands_B3F/header.inc b/data/maps/SeafoamIslands_B3F/header.inc deleted file mode 100644 index 9b61d401a..000000000 --- a/data/maps/SeafoamIslands_B3F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SeafoamIslands_B3F:: @ 834FB7C - .4byte SeafoamIslands_B3F_Layout @ 0x8315CCC - .4byte SeafoamIslands_B3F_MapEvents @ 0x83B20DC - .4byte SeafoamIslands_B3F_MapScripts @ 0x8162F4F - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_FOREST - .2byte 159 - .byte 0x8b, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/SeafoamIslands_B3F/map.json b/data/maps/SeafoamIslands_B3F/map.json new file mode 100644 index 000000000..b9e12e16b --- /dev/null +++ b/data/maps/SeafoamIslands_B3F/map.json @@ -0,0 +1,172 @@ +{ + "id": "MAP_SEAFOAM_ISLANDS_B3F", + "name": "SeafoamIslands_B3F", + "layout": "LAYOUT_SEAFOAM_ISLANDS_B3F", + "music": "BGM_FRLG_VIRIDIAN_FOREST", + "region_map_section": "MAPSEC_SEAFOAM_ISLANDS", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "97", + "x": 23, + "y": 8, + "elevation": 1, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "70" + }, + { + "graphics_id": "97", + "x": 24, + "y": 8, + "elevation": 1, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "71" + }, + { + "graphics_id": "97", + "x": 12, + "y": 16, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 77, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafoamIslands_B3F_EventScript_1BE11D", + "flag": "74" + }, + { + "graphics_id": "97", + "x": 13, + "y": 16, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafoamIslands_B3F_EventScript_1BE11D", + "flag": "75" + }, + { + "graphics_id": "97", + "x": 9, + "y": 16, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafoamIslands_B3F_EventScript_1BE11D", + "flag": "73" + }, + { + "graphics_id": "97", + "x": 6, + "y": 17, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 76, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafoamIslands_B3F_EventScript_1BE11D", + "flag": "72" + } + ], + "warp_events": [ + { + "x": 8, + "y": 14, + "elevation": 4, + "dest_map": "MAP_SEAFOAM_ISLANDS_B2F", + "dest_warp_id": 0 + }, + { + "x": 31, + "y": 4, + "elevation": 3, + "dest_map": "MAP_SEAFOAM_ISLANDS_B2F", + "dest_warp_id": 1 + }, + { + "x": 31, + "y": 16, + "elevation": 4, + "dest_map": "MAP_SEAFOAM_ISLANDS_B2F", + "dest_warp_id": 2 + }, + { + "x": 12, + "y": 9, + "elevation": 3, + "dest_map": "MAP_SEAFOAM_ISLANDS_B4F", + "dest_warp_id": 0 + }, + { + "x": 29, + "y": 5, + "elevation": 3, + "dest_map": "MAP_SEAFOAM_ISLANDS_B4F", + "dest_warp_id": 1 + }, + { + "x": 23, + "y": 9, + "elevation": 1, + "dest_map": "MAP_SEAFOAM_ISLANDS_B2F", + "dest_warp_id": 7 + }, + { + "x": 24, + "y": 9, + "elevation": 1, + "dest_map": "MAP_SEAFOAM_ISLANDS_B2F", + "dest_warp_id": 8 + }, + { + "x": 6, + "y": 18, + "elevation": 3, + "dest_map": "MAP_SEAFOAM_ISLANDS_B4F", + "dest_warp_id": 2 + }, + { + "x": 9, + "y": 18, + "elevation": 3, + "dest_map": "MAP_SEAFOAM_ISLANDS_B4F", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 5, + "y": 12, + "elevation": 0, + "item": "ITEM_NUGGET", + "flag": "29", + "unknown": 1 + } + ] +} \ No newline at end of file diff --git a/data/maps/SeafoamIslands_B4F/events.inc b/data/maps/SeafoamIslands_B4F/events.inc deleted file mode 100644 index fc894489e..000000000 --- a/data/maps/SeafoamIslands_B4F/events.inc +++ /dev/null @@ -1,24 +0,0 @@ -SeafoamIslands_B4F_EventObjects: - object_event 1, 97, 0, 8, 0, 18, 0, 1, 8, 17, 0, 0, 0, 0, 0, 0x0, 76, 0, 0 - object_event 2, 97, 0, 9, 0, 18, 0, 1, 8, 17, 0, 0, 0, 0, 0, 0x0, 77, 0, 0 - object_event 3, 138, 0, 9, 0, 2, 0, 4, 8, 17, 0, 0, 0, 0, 0, SeafoamIslands_B4F_EventScript_1631AC, 130, 0, 0 - object_event 4, 92, 0, 22, 0, 19, 0, 4, 8, 17, 0, 0, 0, 0, 0, SeafoamIslands_B4F_EventScript_1BEC1B, 472, 0, 0 - -SeafoamIslands_B4F_MapWarps: - warp_def 15, 9, 4, 3, 342 - warp_def 32, 5, 4, 4, 342 - warp_def 8, 17, 1, 7, 342 - warp_def 9, 17, 1, 8, 342 - -SeafoamIslands_B4F_MapCoordEvents: - coord_event 26, 19, 1, 0, 16483, 0, 0, SeafoamIslands_B4F_EventScript_16319D - coord_event 27, 19, 1, 0, 16483, 0, 0, SeafoamIslands_B4F_EventScript_16319D - coord_event 28, 19, 1, 0, 16483, 0, 0, SeafoamIslands_B4F_EventScript_16319D - -SeafoamIslands_B4F_MapBGEvents: - bg_event 13, 8, 0, 7, 0, 97, 30, 1 - bg_event 30, 2, 0, 0, 0, SeafoamIslands_B4F_EventScript_16322C - bg_event 14, 18, 0, 0, 0, SeafoamIslands_B4F_EventScript_163223 - -SeafoamIslands_B4F_MapEvents:: - map_events SeafoamIslands_B4F_EventObjects, SeafoamIslands_B4F_MapWarps, SeafoamIslands_B4F_MapCoordEvents, SeafoamIslands_B4F_MapBGEvents diff --git a/data/maps/SeafoamIslands_B4F/header.inc b/data/maps/SeafoamIslands_B4F/header.inc deleted file mode 100644 index 67c545838..000000000 --- a/data/maps/SeafoamIslands_B4F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SeafoamIslands_B4F:: @ 834FB98 - .4byte SeafoamIslands_B4F_Layout @ 0x8316410 - .4byte SeafoamIslands_B4F_MapEvents @ 0x83B21C4 - .4byte SeafoamIslands_B4F_MapScripts @ 0x816302E - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_FOREST - .2byte 160 - .byte 0x8b, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/SeafoamIslands_B4F/map.json b/data/maps/SeafoamIslands_B4F/map.json new file mode 100644 index 000000000..283120f81 --- /dev/null +++ b/data/maps/SeafoamIslands_B4F/map.json @@ -0,0 +1,153 @@ +{ + "id": "MAP_SEAFOAM_ISLANDS_B4F", + "name": "SeafoamIslands_B4F", + "layout": "LAYOUT_SEAFOAM_ISLANDS_B4F", + "music": "BGM_FRLG_VIRIDIAN_FOREST", + "region_map_section": "MAPSEC_SEAFOAM_ISLANDS", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "97", + "x": 8, + "y": 18, + "elevation": 1, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "76" + }, + { + "graphics_id": "97", + "x": 9, + "y": 18, + "elevation": 1, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "77" + }, + { + "graphics_id": "138", + "x": 9, + "y": 2, + "elevation": 4, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafoamIslands_B4F_EventScript_1631AC", + "flag": "130" + }, + { + "graphics_id": "92", + "x": 22, + "y": 19, + "elevation": 4, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafoamIslands_B4F_EventScript_1BEC1B", + "flag": "472" + } + ], + "warp_events": [ + { + "x": 15, + "y": 9, + "elevation": 4, + "dest_map": "MAP_SEAFOAM_ISLANDS_B3F", + "dest_warp_id": 3 + }, + { + "x": 32, + "y": 5, + "elevation": 4, + "dest_map": "MAP_SEAFOAM_ISLANDS_B3F", + "dest_warp_id": 4 + }, + { + "x": 8, + "y": 17, + "elevation": 1, + "dest_map": "MAP_SEAFOAM_ISLANDS_B3F", + "dest_warp_id": 7 + }, + { + "x": 9, + "y": 17, + "elevation": 1, + "dest_map": "MAP_SEAFOAM_ISLANDS_B3F", + "dest_warp_id": 8 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 26, + "y": 19, + "elevation": 1, + "var": "VAR_0x4063", + "var_value": 0, + "script": "SeafoamIslands_B4F_EventScript_16319D" + }, + { + "type": "trigger", + "x": 27, + "y": 19, + "elevation": 1, + "var": "VAR_0x4063", + "var_value": 0, + "script": "SeafoamIslands_B4F_EventScript_16319D" + }, + { + "type": "trigger", + "x": 28, + "y": 19, + "elevation": 1, + "var": "VAR_0x4063", + "var_value": 0, + "script": "SeafoamIslands_B4F_EventScript_16319D" + } + ], + "bg_events": [ + { + "type": "hidden_item", + "x": 13, + "y": 8, + "elevation": 0, + "item": "ITEM_WATER_STONE", + "flag": "30", + "unknown": 1 + }, + { + "type": "bg_event_type_0", + "x": 30, + "y": 2, + "elevation": 0, + "script": "SeafoamIslands_B4F_EventScript_16322C" + }, + { + "type": "bg_event_type_0", + "x": 14, + "y": 18, + "elevation": 0, + "script": "SeafoamIslands_B4F_EventScript_163223" + } + ] +} \ No newline at end of file diff --git a/data/maps/SevenIsland/connections.inc b/data/maps/SevenIsland/connections.inc deleted file mode 100644 index 37634bef6..000000000 --- a/data/maps/SevenIsland/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -SevenIsland_MapConnectionsList: @ 83529A8 - connection up, -48, MAP_SEVEN_ISLAND_TRAINERTOWER - connection down, 0, MAP_SEVEN_ISLAND_SEVAULTCANYON_ENTRANCE - -SevenIsland_MapConnections:: @ 83529C0 - .4byte 2 - .4byte SevenIsland_MapConnectionsList diff --git a/data/maps/SevenIsland/events.inc b/data/maps/SevenIsland/events.inc deleted file mode 100644 index ec2915745..000000000 --- a/data/maps/SevenIsland/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -SevenIsland_EventObjects: - object_event 1, 41, 0, 7, 0, 18, 0, 3, 9, 17, 0, 0, 0, 0, 0, SevenIsland_EventScript_1C4B56, 0, 0, 0 - object_event 2, 35, 0, 9, 0, 7, 0, 3, 13, 17, 0, 0, 0, 0, 0, SevenIsland_EventScript_167EC6, 0, 0, 0 - object_event 3, 55, 0, 15, 0, 5, 0, 3, 2, 17, 0, 0, 0, 0, 0, SevenIsland_EventScript_167ECF, 0, 0, 0 - -SevenIsland_MapWarps: - warp_def 11, 9, 0, 0, 7936 - warp_def 5, 9, 0, 0, 7938 - warp_def 12, 3, 0, 0, 7939 - warp_def 16, 13, 3, 0, 7942 - -SevenIsland_MapBGEvents: - bg_event 17, 9, 0, 0, 0, SevenIsland_EventScript_167EBD - -SevenIsland_MapEvents:: - map_events SevenIsland_EventObjects, SevenIsland_MapWarps, 0x0, SevenIsland_MapBGEvents diff --git a/data/maps/SevenIsland/header.inc b/data/maps/SevenIsland/header.inc deleted file mode 100644 index e9e478fd1..000000000 --- a/data/maps/SevenIsland/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SevenIsland:: @ 83507F4 - .4byte SevenIsland_Layout @ 0x8323D48 - .4byte SevenIsland_MapEvents @ 0x83B657C - .4byte SevenIsland_MapScripts @ 0x8167EB3 - .4byte SevenIsland_MapConnections @ 0x83529C0 - .2byte BGM_FRLG_ISLAND_SIX - .2byte 235 - .byte 0x94, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/SevenIsland/map.json b/data/maps/SevenIsland/map.json new file mode 100644 index 000000000..dd9a59fa6 --- /dev/null +++ b/data/maps/SevenIsland/map.json @@ -0,0 +1,107 @@ +{ + "id": "MAP_SEVEN_ISLAND", + "name": "SevenIsland", + "layout": "LAYOUT_SEVEN_ISLAND", + "music": "BGM_FRLG_ISLAND_SIX", + "region_map_section": "MAPSEC_SEVEN_ISLAND", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_1", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_SEVEN_ISLAND_TRAINER_TOWER", + "offset": -48, + "direction": "up" + }, + { + "map": "MAP_SEVEN_ISLAND_SEVAULT_CANYON_ENTRANCE", + "offset": 0, + "direction": "down" + } + ], + "object_events": [ + { + "graphics_id": "41", + "x": 7, + "y": 18, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_EventScript_1C4B56", + "flag": "0" + }, + { + "graphics_id": "35", + "x": 9, + "y": 7, + "elevation": 3, + "movement_type": "13", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_EventScript_167EC6", + "flag": "0" + }, + { + "graphics_id": "55", + "x": 15, + "y": 5, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_EventScript_167ECF", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 11, + "y": 9, + "elevation": 0, + "dest_map": "MAP_SEVEN_ISLAND_HOUSE_ROOM1", + "dest_warp_id": 0 + }, + { + "x": 5, + "y": 9, + "elevation": 0, + "dest_map": "MAP_SEVEN_ISLAND_MART", + "dest_warp_id": 0 + }, + { + "x": 12, + "y": 3, + "elevation": 0, + "dest_map": "MAP_SEVEN_ISLAND_POKEMON_CENTER_1F", + "dest_warp_id": 0 + }, + { + "x": 16, + "y": 13, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND_HARBOR", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 17, + "y": 9, + "elevation": 0, + "script": "SevenIsland_EventScript_167EBD" + } + ] +} \ No newline at end of file diff --git a/data/maps/SevenIsland_Harbor/events.inc b/data/maps/SevenIsland_Harbor/events.inc deleted file mode 100644 index 29a248be5..000000000 --- a/data/maps/SevenIsland_Harbor/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -SevenIsland_Harbor_EventObjects: - object_event 1, 108, 0, 8, 0, 9, 0, 0, 8, 17, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 2, 62, 0, 8, 0, 6, 0, 3, 7, 17, 0, 0, 0, 0, 0, SevenIsland_Harbor_EventScript_170BE5, 0, 0, 0 - -SevenIsland_Harbor_MapWarps: - warp_def 8, 2, 3, 3, 785 - -SevenIsland_Harbor_MapEvents:: - map_events SevenIsland_Harbor_EventObjects, SevenIsland_Harbor_MapWarps, 0x0, 0x0 diff --git a/data/maps/SevenIsland_Harbor/header.inc b/data/maps/SevenIsland_Harbor/header.inc deleted file mode 100644 index fe1165d84..000000000 --- a/data/maps/SevenIsland_Harbor/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SevenIsland_Harbor:: @ 8351B50 - .4byte Island_Harbor_Layout @ 0x8343FB8 - .4byte SevenIsland_Harbor_MapEvents @ 0x83BE2A0 - .4byte SevenIsland_Harbor_MapScripts @ 0x8170BE4 - .4byte NULL - .2byte BGM_FRLG_ISLAND_SIX - .2byte 315 - .byte 0x94, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/SevenIsland_Harbor/map.json b/data/maps/SevenIsland_Harbor/map.json new file mode 100644 index 000000000..af0fce3fb --- /dev/null +++ b/data/maps/SevenIsland_Harbor/map.json @@ -0,0 +1,54 @@ +{ + "id": "MAP_SEVEN_ISLAND_HARBOR", + "name": "SevenIsland_Harbor", + "layout": "LAYOUT_ISLAND_HARBOR", + "music": "BGM_FRLG_ISLAND_SIX", + "region_map_section": "MAPSEC_SEVEN_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "108", + "x": 8, + "y": 9, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "62", + "x": 8, + "y": 6, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_Harbor_EventScript_170BE5", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 8, + "y": 2, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SevenIsland_House_Room1/events.inc b/data/maps/SevenIsland_House_Room1/events.inc deleted file mode 100644 index 7acc86cca..000000000 --- a/data/maps/SevenIsland_House_Room1/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -SevenIsland_House_Room1_EventObjects: - object_event 1, 35, 0, 4, 0, 4, 0, 3, 10, 17, 0, 0, 0, 0, 0, SevenIsland_House_Room1_EventScript_170958, 0, 0, 0 - -SevenIsland_House_Room1_MapWarps: - warp_def 4, 7, 3, 0, 785 - warp_def 4, 1, 0, 0, 7937 - -SevenIsland_House_Room1_MapBGEvents: - bg_event 4, 1, 0, 0, 0, SevenIsland_House_Room1_EventScript_170A75 - -SevenIsland_House_Room1_MapEvents:: - map_events SevenIsland_House_Room1_EventObjects, SevenIsland_House_Room1_MapWarps, 0x0, SevenIsland_House_Room1_MapBGEvents diff --git a/data/maps/SevenIsland_House_Room1/header.inc b/data/maps/SevenIsland_House_Room1/header.inc deleted file mode 100644 index 0eeb9bc0f..000000000 --- a/data/maps/SevenIsland_House_Room1/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SevenIsland_House_Room1:: @ 8351AA8 - .4byte SevenIsland_House_Room1_Layout @ 0x834E310 - .4byte SevenIsland_House_Room1_MapEvents @ 0x83BE050 - .4byte SevenIsland_House_Room1_MapScripts @ 0x817088A - .4byte NULL - .2byte BGM_FRLG_ISLAND_SIX - .2byte 382 - .byte 0x94, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01 diff --git a/data/maps/SevenIsland_House_Room1/map.json b/data/maps/SevenIsland_House_Room1/map.json new file mode 100644 index 000000000..50b67816d --- /dev/null +++ b/data/maps/SevenIsland_House_Room1/map.json @@ -0,0 +1,56 @@ +{ + "id": "MAP_SEVEN_ISLAND_HOUSE_ROOM1", + "name": "SevenIsland_House_Room1", + "layout": "LAYOUT_SEVEN_ISLAND_HOUSE_ROOM1", + "music": "BGM_FRLG_ISLAND_SIX", + "region_map_section": "MAPSEC_SEVEN_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_1", + "connections": null, + "object_events": [ + { + "graphics_id": "35", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_House_Room1_EventScript_170958", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 1, + "elevation": 0, + "dest_map": "MAP_SEVEN_ISLAND_HOUSE_ROOM2", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 4, + "y": 1, + "elevation": 0, + "script": "SevenIsland_House_Room1_EventScript_170A75" + } + ] +} \ No newline at end of file diff --git a/data/maps/SevenIsland_House_Room2/events.inc b/data/maps/SevenIsland_House_Room2/events.inc deleted file mode 100644 index 509ebebeb..000000000 --- a/data/maps/SevenIsland_House_Room2/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -SevenIsland_House_Room2_EventObjects: - object_event 1, 240, 0, 6, 0, 5, 0, 0, 9, 17, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 - -SevenIsland_House_Room2_MapWarps: - warp_def 3, 1, 0, 1, 7936 - -SevenIsland_House_Room2_MapEvents:: - map_events SevenIsland_House_Room2_EventObjects, SevenIsland_House_Room2_MapWarps, 0x0, 0x0 diff --git a/data/maps/SevenIsland_House_Room2/header.inc b/data/maps/SevenIsland_House_Room2/header.inc deleted file mode 100644 index 90d980166..000000000 --- a/data/maps/SevenIsland_House_Room2/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SevenIsland_House_Room2:: @ 8351AC4 - .4byte SevenIsland_House_Room2_Layout @ 0x8338C48 - .4byte SevenIsland_House_Room2_MapEvents @ 0x83BE084 - .4byte SevenIsland_House_Room2_MapScripts @ 0x8170A7E - .4byte NULL - .2byte BGM_FRLG_ISLAND_SIX - .2byte 265 - .byte 0x94, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01 diff --git a/data/maps/SevenIsland_House_Room2/map.json b/data/maps/SevenIsland_House_Room2/map.json new file mode 100644 index 000000000..890afc5e4 --- /dev/null +++ b/data/maps/SevenIsland_House_Room2/map.json @@ -0,0 +1,41 @@ +{ + "id": "MAP_SEVEN_ISLAND_HOUSE_ROOM2", + "name": "SevenIsland_House_Room2", + "layout": "LAYOUT_SEVEN_ISLAND_HOUSE_ROOM2", + "music": "BGM_FRLG_ISLAND_SIX", + "region_map_section": "MAPSEC_SEVEN_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_1", + "connections": null, + "object_events": [ + { + "graphics_id": "240", + "x": 6, + "y": 5, + "elevation": 0, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 1, + "elevation": 0, + "dest_map": "MAP_SEVEN_ISLAND_HOUSE_ROOM1", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SevenIsland_Mart/events.inc b/data/maps/SevenIsland_Mart/events.inc deleted file mode 100644 index 4ab092243..000000000 --- a/data/maps/SevenIsland_Mart/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -SevenIsland_Mart_EventObjects: - object_event 1, 68, 0, 2, 0, 3, 0, 0, 10, 17, 0, 0, 0, 0, 0, SevenIsland_Mart_EventScript_170B31, 0, 0, 0 - object_event 2, 22, 0, 6, 0, 2, 0, 3, 16, 17, 0, 0, 0, 0, 0, SevenIsland_Mart_EventScript_170B6E, 0, 0, 0 - object_event 3, 57, 0, 9, 0, 5, 0, 3, 3, 17, 0, 0, 0, 0, 0, SevenIsland_Mart_EventScript_170B80, 0, 0, 0 - object_event 4, 56, 0, 5, 0, 4, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_Mart_EventScript_170B77, 0, 0, 0 - -SevenIsland_Mart_MapWarps: - warp_def 4, 7, 3, 1, 785 - -SevenIsland_Mart_MapEvents:: - map_events SevenIsland_Mart_EventObjects, SevenIsland_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/SevenIsland_Mart/header.inc b/data/maps/SevenIsland_Mart/header.inc deleted file mode 100644 index 9f2aa5ca1..000000000 --- a/data/maps/SevenIsland_Mart/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SevenIsland_Mart:: @ 8351AE0 - .4byte Mart_Layout @ 0x82D5BCC - .4byte SevenIsland_Mart_MapEvents @ 0x83BE100 - .4byte SevenIsland_Mart_MapScripts @ 0x8170B30 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 10 - .byte 0x94, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/SevenIsland_Mart/map.json b/data/maps/SevenIsland_Mart/map.json new file mode 100644 index 000000000..452e6e8b4 --- /dev/null +++ b/data/maps/SevenIsland_Mart/map.json @@ -0,0 +1,80 @@ +{ + "id": "MAP_SEVEN_ISLAND_MART", + "name": "SevenIsland_Mart", + "layout": "LAYOUT_MART", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_SEVEN_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "68", + "x": 2, + "y": 3, + "elevation": 0, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_Mart_EventScript_170B31", + "flag": "0" + }, + { + "graphics_id": "22", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "16", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_Mart_EventScript_170B6E", + "flag": "0" + }, + { + "graphics_id": "57", + "x": 9, + "y": 5, + "elevation": 3, + "movement_type": "3", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_Mart_EventScript_170B80", + "flag": "0" + }, + { + "graphics_id": "56", + "x": 5, + "y": 4, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_Mart_EventScript_170B77", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SevenIsland_PokemonCenter_1F/events.inc b/data/maps/SevenIsland_PokemonCenter_1F/events.inc deleted file mode 100644 index 59ada2640..000000000 --- a/data/maps/SevenIsland_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -SevenIsland_PokemonCenter_1F_EventObjects: - object_event 1, 64, 0, 7, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_PokemonCenter_1F_EventScript_170B98, 0, 0, 0 - object_event 2, 32, 0, 11, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_PokemonCenter_1F_EventScript_170BA1, 0, 0, 0 - object_event 3, 62, 0, 14, 0, 6, 0, 3, 9, 17, 0, 0, 0, 0, 0, SevenIsland_PokemonCenter_1F_EventScript_170BAA, 0, 0, 0 - object_event 4, 29, 0, 4, 0, 4, 0, 3, 10, 17, 0, 0, 0, 0, 0, SevenIsland_PokemonCenter_1F_EventScript_170BB3, 0, 0, 0 - object_event 5, 0, 0, 3, 0, 1, 0, 0, 76, 17, 0, 0, 0, 0, 0, SevenIsland_PokemonCenter_1F_EventScript_1ACFD4, 157, 0, 0 - object_event 6, 0, 0, 2, 0, 1, 0, 0, 76, 17, 0, 0, 0, 0, 0, SevenIsland_PokemonCenter_1F_EventScript_1ACFD4, 157, 0, 0 - -SevenIsland_PokemonCenter_1F_MapWarps: - warp_def 7, 8, 3, 2, 785 - warp_def 1, 6, 4, 0, 7940 - -SevenIsland_PokemonCenter_1F_MapEvents:: - map_events SevenIsland_PokemonCenter_1F_EventObjects, SevenIsland_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SevenIsland_PokemonCenter_1F/header.inc b/data/maps/SevenIsland_PokemonCenter_1F/header.inc deleted file mode 100644 index feef23d0e..000000000 --- a/data/maps/SevenIsland_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SevenIsland_PokemonCenter_1F:: @ 8351AFC - .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte SevenIsland_PokemonCenter_1F_MapEvents @ 0x83BE1B4 - .4byte SevenIsland_PokemonCenter_1F_MapScripts @ 0x8170B89 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 8 - .byte 0x94, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/SevenIsland_PokemonCenter_1F/map.json b/data/maps/SevenIsland_PokemonCenter_1F/map.json new file mode 100644 index 000000000..4dfee823f --- /dev/null +++ b/data/maps/SevenIsland_PokemonCenter_1F/map.json @@ -0,0 +1,113 @@ +{ + "id": "MAP_SEVEN_ISLAND_POKEMON_CENTER_1F", + "name": "SevenIsland_PokemonCenter_1F", + "layout": "LAYOUT_POKEMON_CENTER_1F", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_SEVEN_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "64", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_PokemonCenter_1F_EventScript_170B98", + "flag": "0" + }, + { + "graphics_id": "32", + "x": 11, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_PokemonCenter_1F_EventScript_170BA1", + "flag": "0" + }, + { + "graphics_id": "62", + "x": 14, + "y": 6, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_PokemonCenter_1F_EventScript_170BAA", + "flag": "0" + }, + { + "graphics_id": "29", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_PokemonCenter_1F_EventScript_170BB3", + "flag": "0" + }, + { + "graphics_id": "0", + "x": 3, + "y": 1, + "elevation": 0, + "movement_type": "76", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_PokemonCenter_1F_EventScript_1ACFD4", + "flag": "157" + }, + { + "graphics_id": "0", + "x": 2, + "y": 1, + "elevation": 0, + "movement_type": "76", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_PokemonCenter_1F_EventScript_1ACFD4", + "flag": "157" + } + ], + "warp_events": [ + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND", + "dest_warp_id": 2 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_SEVEN_ISLAND_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SevenIsland_PokemonCenter_2F/events.inc b/data/maps/SevenIsland_PokemonCenter_2F/events.inc deleted file mode 100644 index e7b0a0dcb..000000000 --- a/data/maps/SevenIsland_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -SevenIsland_PokemonCenter_2F_EventObjects: - object_event 1, 65, 0, 6, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SevenIsland_PokemonCenter_2F_EventScript_1A8CF6, 0, 0, 0 - object_event 2, 65, 0, 2, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SevenIsland_PokemonCenter_2F_EventScript_1A8CFC, 0, 0, 0 - object_event 3, 65, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SevenIsland_PokemonCenter_2F_EventScript_1A8D02, 0, 0, 0 - object_event 4, 69, 0, 1, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_PokemonCenter_2F_EventScript_1BB1D2, 112, 0, 0 - -SevenIsland_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 1, 7939 - warp_def 5, 1, 0, 0, 4 - warp_def 9, 1, 0, 0, 1 - -SevenIsland_PokemonCenter_2F_MapEvents:: - map_events SevenIsland_PokemonCenter_2F_EventObjects, SevenIsland_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SevenIsland_PokemonCenter_2F/header.inc b/data/maps/SevenIsland_PokemonCenter_2F/header.inc deleted file mode 100644 index 523401267..000000000 --- a/data/maps/SevenIsland_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SevenIsland_PokemonCenter_2F:: @ 8351B18 - .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte SevenIsland_PokemonCenter_2F_MapEvents @ 0x83BE240 - .4byte SevenIsland_PokemonCenter_2F_MapScripts @ 0x8170BBC - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 9 - .byte 0x94, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/SevenIsland_PokemonCenter_2F/map.json b/data/maps/SevenIsland_PokemonCenter_2F/map.json new file mode 100644 index 000000000..baca4a4c0 --- /dev/null +++ b/data/maps/SevenIsland_PokemonCenter_2F/map.json @@ -0,0 +1,94 @@ +{ + "id": "MAP_SEVEN_ISLAND_POKEMON_CENTER_2F", + "name": "SevenIsland_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_SEVEN_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "65", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_PokemonCenter_2F_EventScript_1A8CF6", + "flag": "0" + }, + { + "graphics_id": "65", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_PokemonCenter_2F_EventScript_1A8CFC", + "flag": "0" + }, + { + "graphics_id": "65", + "x": 10, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_PokemonCenter_2F_EventScript_1A8D02", + "flag": "0" + }, + { + "graphics_id": "69", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_PokemonCenter_2F_EventScript_1BB1D2", + "flag": "112" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_SEVEN_ISLAND_POKEMON_CENTER_1F", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 1, + "elevation": 0, + "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 0, + "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/events.inc b/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/events.inc deleted file mode 100644 index bf869b229..000000000 --- a/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -SevenIsland_SeavaultCanyon_TanobyKey_EventObjects: - object_event 1, 97, 0, 7, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, SevenIsland_SeavaultCanyon_TanobyKey_EventScript_1BE11D, 0, 0, 0 - object_event 2, 97, 0, 8, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, SevenIsland_SeavaultCanyon_TanobyKey_EventScript_1BE11D, 0, 0, 0 - object_event 3, 97, 0, 8, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, SevenIsland_SeavaultCanyon_TanobyKey_EventScript_1BE11D, 0, 0, 0 - object_event 4, 97, 0, 6, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, SevenIsland_SeavaultCanyon_TanobyKey_EventScript_1BE11D, 0, 0, 0 - object_event 5, 97, 0, 8, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, SevenIsland_SeavaultCanyon_TanobyKey_EventScript_1BE11D, 0, 0, 0 - object_event 6, 97, 0, 6, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, SevenIsland_SeavaultCanyon_TanobyKey_EventScript_1BE11D, 0, 0, 0 - object_event 7, 97, 0, 6, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, SevenIsland_SeavaultCanyon_TanobyKey_EventScript_1BE11D, 0, 0, 0 - -SevenIsland_SeavaultCanyon_TanobyKey_MapWarps: - warp_def 7, 13, 3, 0, 832 - -SevenIsland_SeavaultCanyon_TanobyKey_MapCoordEvents: - coord_event 7, 2, 3, 0, 16385, 99, 0, SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E39 - coord_event 9, 8, 3, 0, 16391, 99, 0, SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164F0B - coord_event 5, 8, 3, 0, 16390, 99, 0, SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EE8 - coord_event 9, 6, 3, 0, 16389, 99, 0, SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EC5 - coord_event 5, 6, 3, 0, 16388, 99, 0, SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EA2 - coord_event 10, 4, 3, 0, 16387, 99, 0, SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E7F - coord_event 4, 4, 3, 0, 16386, 99, 0, SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E5C - -SevenIsland_SeavaultCanyon_TanobyKey_MapEvents:: - map_events SevenIsland_SeavaultCanyon_TanobyKey_EventObjects, SevenIsland_SeavaultCanyon_TanobyKey_MapWarps, SevenIsland_SeavaultCanyon_TanobyKey_MapCoordEvents, 0x0 diff --git a/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/header.inc b/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/header.inc deleted file mode 100644 index dc6bc05ff..000000000 --- a/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SevenIsland_SeavaultCanyon_TanobyKey:: @ 835035C - .4byte SevenIsland_SeavaultCanyon_TanobyKey_Layout @ 0x8347C54 - .4byte SevenIsland_SeavaultCanyon_TanobyKey_MapEvents @ 0x83B48BC - .4byte SevenIsland_SeavaultCanyon_TanobyKey_MapScripts @ 0x8164DCC - .4byte NULL - .2byte BGM_FRLG_TANOBY_RUINS - .2byte 341 - .byte 0xba, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x02 diff --git a/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/map.json b/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/map.json new file mode 100644 index 000000000..ba4e6386b --- /dev/null +++ b/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/map.json @@ -0,0 +1,183 @@ +{ + "id": "MAP_SEVEN_ISLAND_SEAVAULT_CANYON_TANOBY_KEY", + "name": "SevenIsland_SeavaultCanyon_TanobyKey", + "layout": "LAYOUT_SEVEN_ISLAND_SEAVAULT_CANYON_TANOBY_KEY", + "music": "BGM_FRLG_TANOBY_RUINS", + "region_map_section": "MAPSEC_TANOBY_KEY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_2", + "connections": null, + "object_events": [ + { + "graphics_id": "97", + "x": 7, + "y": 6, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_1BE11D", + "flag": "0" + }, + { + "graphics_id": "97", + "x": 8, + "y": 6, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_1BE11D", + "flag": "0" + }, + { + "graphics_id": "97", + "x": 8, + "y": 9, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_1BE11D", + "flag": "0" + }, + { + "graphics_id": "97", + "x": 6, + "y": 10, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_1BE11D", + "flag": "0" + }, + { + "graphics_id": "97", + "x": 8, + "y": 10, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_1BE11D", + "flag": "0" + }, + { + "graphics_id": "97", + "x": 6, + "y": 9, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_1BE11D", + "flag": "0" + }, + { + "graphics_id": "97", + "x": 6, + "y": 6, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_1BE11D", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 7, + "y": 13, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND_SEVAULT_CANYON", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 7, + "y": 2, + "elevation": 3, + "var": "VAR_0x4001", + "var_value": 99, + "script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E39" + }, + { + "type": "trigger", + "x": 9, + "y": 8, + "elevation": 3, + "var": "VAR_0x4007", + "var_value": 99, + "script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164F0B" + }, + { + "type": "trigger", + "x": 5, + "y": 8, + "elevation": 3, + "var": "VAR_0x4006", + "var_value": 99, + "script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EE8" + }, + { + "type": "trigger", + "x": 9, + "y": 6, + "elevation": 3, + "var": "VAR_0x4005", + "var_value": 99, + "script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EC5" + }, + { + "type": "trigger", + "x": 5, + "y": 6, + "elevation": 3, + "var": "VAR_0x4004", + "var_value": 99, + "script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EA2" + }, + { + "type": "trigger", + "x": 10, + "y": 4, + "elevation": 3, + "var": "VAR_0x4003", + "var_value": 99, + "script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E7F" + }, + { + "type": "trigger", + "x": 4, + "y": 4, + "elevation": 3, + "var": "VAR_0x4002", + "var_value": 99, + "script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E5C" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SevenIsland_SevaultCanyon/connections.inc b/data/maps/SevenIsland_SevaultCanyon/connections.inc deleted file mode 100644 index a721d7165..000000000 --- a/data/maps/SevenIsland_SevaultCanyon/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -SevenIsland_SevaultCanyon_MapConnectionsList: @ 8352EB8 - connection down, -48, MAP_SEVEN_ISLAND_TANOBYRUINS - connection left, -20, MAP_SEVEN_ISLAND_SEVAULTCANYON_ENTRANCE - -SevenIsland_SevaultCanyon_MapConnections:: @ 8352ED0 - .4byte 2 - .4byte SevenIsland_SevaultCanyon_MapConnectionsList diff --git a/data/maps/SevenIsland_SevaultCanyon/events.inc b/data/maps/SevenIsland_SevaultCanyon/events.inc deleted file mode 100644 index 02dc62ccb..000000000 --- a/data/maps/SevenIsland_SevaultCanyon/events.inc +++ /dev/null @@ -1,32 +0,0 @@ -SevenIsland_SevaultCanyon_EventObjects: - object_event 1, 24, 0, 13, 0, 43, 0, 3, 7, 17, 0, 1, 0, 2, 0, SevenIsland_SevaultCanyon_EventScript_1ACA4D, 0, 0, 0 - object_event 2, 25, 0, 13, 0, 36, 0, 3, 18, 17, 0, 1, 0, 2, 0, SevenIsland_SevaultCanyon_EventScript_1ACA8B, 0, 0, 0 - object_event 3, 39, 0, 3, 0, 35, 0, 3, 21, 17, 0, 1, 0, 3, 0, SevenIsland_SevaultCanyon_EventScript_1ACAC9, 0, 0, 0 - object_event 4, 40, 0, 3, 0, 36, 0, 3, 22, 17, 0, 1, 0, 3, 0, SevenIsland_SevaultCanyon_EventScript_1ACB07, 0, 0, 0 - object_event 5, 41, 0, 7, 0, 56, 0, 3, 2, 17, 0, 1, 0, 1, 0, SevenIsland_SevaultCanyon_EventScript_1ACB45, 0, 0, 0 - object_event 6, 42, 0, 11, 0, 63, 0, 3, 2, 17, 0, 1, 0, 1, 0, SevenIsland_SevaultCanyon_EventScript_1ACB83, 0, 0, 0 - object_event 7, 41, 0, 14, 0, 13, 0, 3, 10, 17, 0, 1, 0, 1, 0, SevenIsland_SevaultCanyon_EventScript_1ACBC1, 0, 0, 0 - object_event 8, 42, 0, 14, 0, 14, 0, 3, 10, 17, 0, 1, 0, 1, 0, SevenIsland_SevaultCanyon_EventScript_1ACC07, 0, 0, 0 - object_event 9, 96, 0, 3, 0, 41, 0, 3, 1, 17, 0, 0, 0, 0, 0, SevenIsland_SevaultCanyon_EventScript_1BE00C, 18, 0, 0 - object_event 10, 97, 0, 13, 0, 47, 0, 3, 1, 0, 0, 0, 0, 0, 0, SevenIsland_SevaultCanyon_EventScript_1BE11D, 0, 0, 0 - object_event 11, 96, 0, 7, 0, 44, 0, 3, 1, 17, 0, 0, 0, 0, 0, SevenIsland_SevaultCanyon_EventScript_1BE00C, 19, 0, 0 - object_event 12, 96, 0, 12, 0, 47, 0, 3, 1, 17, 0, 0, 0, 0, 0, SevenIsland_SevaultCanyon_EventScript_1BE00C, 21, 0, 0 - object_event 13, 96, 0, 15, 0, 46, 0, 3, 1, 17, 0, 0, 0, 0, 0, SevenIsland_SevaultCanyon_EventScript_1BE00C, 22, 0, 0 - object_event 14, 96, 0, 16, 0, 47, 0, 3, 1, 17, 0, 0, 0, 0, 0, SevenIsland_SevaultCanyon_EventScript_1BE00C, 23, 0, 0 - object_event 15, 97, 0, 17, 0, 47, 0, 3, 1, 0, 0, 0, 0, 0, 0, SevenIsland_SevaultCanyon_EventScript_1BE11D, 0, 0, 0 - object_event 16, 96, 0, 11, 0, 31, 0, 3, 1, 17, 0, 0, 0, 0, 0, SevenIsland_SevaultCanyon_EventScript_1BE00C, 27, 0, 0 - object_event 17, 92, 0, 18, 0, 45, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_SevaultCanyon_EventScript_1BECDE, 487, 0, 0 - object_event 18, 92, 0, 7, 0, 38, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_SevaultCanyon_EventScript_1BECEB, 488, 0, 0 - object_event 19, 92, 0, 17, 0, 23, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_SevaultCanyon_EventScript_1BECF8, 489, 0, 0 - object_event 20, 54, 0, 8, 0, 26, 0, 3, 7, 17, 0, 0, 0, 0, 0, SevenIsland_SevaultCanyon_EventScript_1ACF95, 0, 0, 0 - -SevenIsland_SevaultCanyon_MapWarps: - warp_def 7, 17, 5, 0, 547 - warp_def 14, 61, 0, 0, 10752 - -SevenIsland_SevaultCanyon_MapBGEvents: - bg_event 15, 66, 3, 7, 0, 133, 63, 1 - bg_event 16, 71, 0, 0, 0, SevenIsland_SevaultCanyon_EventScript_168BFE - -SevenIsland_SevaultCanyon_MapEvents:: - map_events SevenIsland_SevaultCanyon_EventObjects, SevenIsland_SevaultCanyon_MapWarps, 0x0, SevenIsland_SevaultCanyon_MapBGEvents diff --git a/data/maps/SevenIsland_SevaultCanyon/header.inc b/data/maps/SevenIsland_SevaultCanyon/header.inc deleted file mode 100644 index 52ca532e5..000000000 --- a/data/maps/SevenIsland_SevaultCanyon/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SevenIsland_SevaultCanyon:: @ 8350D18 - .4byte SevenIsland_SevaultCanyon_Layout @ 0x8333F44 - .4byte SevenIsland_SevaultCanyon_MapEvents @ 0x83B9618 - .4byte SevenIsland_SevaultCanyon_MapScripts @ 0x8168BFD - .4byte SevenIsland_SevaultCanyon_MapConnections @ 0x8352ED0 - .2byte BGM_FRLG_SEVII_ISLANDS - .2byte 256 - .byte 0xa9, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/SevenIsland_SevaultCanyon/map.json b/data/maps/SevenIsland_SevaultCanyon/map.json new file mode 100644 index 000000000..a896d334d --- /dev/null +++ b/data/maps/SevenIsland_SevaultCanyon/map.json @@ -0,0 +1,323 @@ +{ + "id": "MAP_SEVEN_ISLAND_SEVAULT_CANYON", + "name": "SevenIsland_SevaultCanyon", + "layout": "LAYOUT_SEVEN_ISLAND_SEVAULT_CANYON", + "music": "BGM_FRLG_SEVII_ISLANDS", + "region_map_section": "MAPSEC_SEVAULT_CANYON", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_SEVEN_ISLAND_TANOBY_RUINS", + "offset": -48, + "direction": "down" + }, + { + "map": "MAP_SEVEN_ISLAND_SEVAULT_CANYON_ENTRANCE", + "offset": -20, + "direction": "left" + } + ], + "object_events": [ + { + "graphics_id": "24", + "x": 13, + "y": 43, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "SevenIsland_SevaultCanyon_EventScript_1ACA4D", + "flag": "0" + }, + { + "graphics_id": "25", + "x": 13, + "y": 36, + "elevation": 3, + "movement_type": "18", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "SevenIsland_SevaultCanyon_EventScript_1ACA8B", + "flag": "0" + }, + { + "graphics_id": "39", + "x": 3, + "y": 35, + "elevation": 3, + "movement_type": "21", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SevenIsland_SevaultCanyon_EventScript_1ACAC9", + "flag": "0" + }, + { + "graphics_id": "40", + "x": 3, + "y": 36, + "elevation": 3, + "movement_type": "22", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SevenIsland_SevaultCanyon_EventScript_1ACB07", + "flag": "0" + }, + { + "graphics_id": "41", + "x": 7, + "y": 56, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SevenIsland_SevaultCanyon_EventScript_1ACB45", + "flag": "0" + }, + { + "graphics_id": "42", + "x": 11, + "y": 63, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SevenIsland_SevaultCanyon_EventScript_1ACB83", + "flag": "0" + }, + { + "graphics_id": "41", + "x": 14, + "y": 13, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SevenIsland_SevaultCanyon_EventScript_1ACBC1", + "flag": "0" + }, + { + "graphics_id": "42", + "x": 14, + "y": 14, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SevenIsland_SevaultCanyon_EventScript_1ACC07", + "flag": "0" + }, + { + "graphics_id": "96", + "x": 3, + "y": 41, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_SevaultCanyon_EventScript_1BE00C", + "flag": "18" + }, + { + "graphics_id": "97", + "x": 13, + "y": 47, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_SevaultCanyon_EventScript_1BE11D", + "flag": "0" + }, + { + "graphics_id": "96", + "x": 7, + "y": 44, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_SevaultCanyon_EventScript_1BE00C", + "flag": "19" + }, + { + "graphics_id": "96", + "x": 12, + "y": 47, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_SevaultCanyon_EventScript_1BE00C", + "flag": "21" + }, + { + "graphics_id": "96", + "x": 15, + "y": 46, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_SevaultCanyon_EventScript_1BE00C", + "flag": "22" + }, + { + "graphics_id": "96", + "x": 16, + "y": 47, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_SevaultCanyon_EventScript_1BE00C", + "flag": "23" + }, + { + "graphics_id": "97", + "x": 17, + "y": 47, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_SevaultCanyon_EventScript_1BE11D", + "flag": "0" + }, + { + "graphics_id": "96", + "x": 11, + "y": 31, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_SevaultCanyon_EventScript_1BE00C", + "flag": "27" + }, + { + "graphics_id": "92", + "x": 18, + "y": 45, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_SevaultCanyon_EventScript_1BECDE", + "flag": "487" + }, + { + "graphics_id": "92", + "x": 7, + "y": 38, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_SevaultCanyon_EventScript_1BECEB", + "flag": "488" + }, + { + "graphics_id": "92", + "x": 17, + "y": 23, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_SevaultCanyon_EventScript_1BECF8", + "flag": "489" + }, + { + "graphics_id": "54", + "x": 8, + "y": 26, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_SevaultCanyon_EventScript_1ACF95", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 7, + "y": 17, + "elevation": 5, + "dest_map": "MAP_SEVEN_ISLAND_SEAVAULT_CANYON_TANOBY_KEY", + "dest_warp_id": 0 + }, + { + "x": 14, + "y": 61, + "elevation": 0, + "dest_map": "MAP_SEVEN_ISLAND_SEVAULT_CANYON_HOUSE", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 15, + "y": 66, + "elevation": 3, + "item": "ITEM_CHERI_BERRY", + "flag": "63", + "unknown": 1 + }, + { + "type": "bg_event_type_0", + "x": 16, + "y": 71, + "elevation": 0, + "script": "SevenIsland_SevaultCanyon_EventScript_168BFE" + } + ] +} \ No newline at end of file diff --git a/data/maps/SevenIsland_SevaultCanyon_Entrance/connections.inc b/data/maps/SevenIsland_SevaultCanyon_Entrance/connections.inc deleted file mode 100644 index f2f113fcd..000000000 --- a/data/maps/SevenIsland_SevaultCanyon_Entrance/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -SevenIsland_SevaultCanyon_Entrance_MapConnectionsList: @ 8352E98 - connection up, 0, MAP_SEVEN_ISLAND - connection right, 20, MAP_SEVEN_ISLAND_SEVAULTCANYON - -SevenIsland_SevaultCanyon_Entrance_MapConnections:: @ 8352EB0 - .4byte 2 - .4byte SevenIsland_SevaultCanyon_Entrance_MapConnectionsList diff --git a/data/maps/SevenIsland_SevaultCanyon_Entrance/events.inc b/data/maps/SevenIsland_SevaultCanyon_Entrance/events.inc deleted file mode 100644 index 17c105a28..000000000 --- a/data/maps/SevenIsland_SevaultCanyon_Entrance/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -SevenIsland_SevaultCanyon_Entrance_EventObjects: - object_event 1, 28, 0, 12, 0, 6, 0, 3, 9, 17, 0, 1, 0, 5, 0, SevenIsland_SevaultCanyon_Entrance_EventScript_1AC8C9, 0, 0, 0 - object_event 2, 29, 0, 3, 0, 34, 0, 3, 10, 17, 0, 1, 0, 1, 0, SevenIsland_SevaultCanyon_Entrance_EventScript_1AC907, 0, 0, 0 - object_event 3, 25, 0, 4, 0, 34, 0, 3, 9, 17, 0, 1, 0, 1, 0, SevenIsland_SevaultCanyon_Entrance_EventScript_1AC94D, 0, 0, 0 - object_event 4, 39, 0, 11, 0, 26, 0, 3, 20, 17, 0, 1, 0, 2, 0, SevenIsland_SevaultCanyon_Entrance_EventScript_1AC9D1, 0, 0, 0 - object_event 5, 40, 0, 10, 0, 26, 0, 3, 19, 17, 0, 1, 0, 2, 0, SevenIsland_SevaultCanyon_Entrance_EventScript_1ACA0F, 0, 0, 0 - object_event 6, 26, 0, 11, 0, 17, 0, 5, 23, 17, 0, 1, 0, 1, 0, SevenIsland_SevaultCanyon_Entrance_EventScript_1AC993, 0, 0, 0 - object_event 7, 65321, 0, 7, 0, 254, 255, 1, 0, 0, 0, 17, 0, 3, 0, 0x0, 0, 0, 0 - -SevenIsland_SevaultCanyon_Entrance_MapBGEvents: - bg_event 8, 29, 5, 7, 0, 136, 188, 1 - bg_event 14, 26, 0, 0, 0, SevenIsland_SevaultCanyon_Entrance_EventScript_168BF4 - -SevenIsland_SevaultCanyon_Entrance_MapEvents:: - map_events SevenIsland_SevaultCanyon_Entrance_EventObjects, 0x0, 0x0, SevenIsland_SevaultCanyon_Entrance_MapBGEvents diff --git a/data/maps/SevenIsland_SevaultCanyon_Entrance/header.inc b/data/maps/SevenIsland_SevaultCanyon_Entrance/header.inc deleted file mode 100644 index 5564b0943..000000000 --- a/data/maps/SevenIsland_SevaultCanyon_Entrance/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SevenIsland_SevaultCanyon_Entrance:: @ 8350CFC - .4byte SevenIsland_SevaultCanyon_Entrance_Layout @ 0x8333020 - .4byte SevenIsland_SevaultCanyon_Entrance_MapEvents @ 0x83B93FC - .4byte SevenIsland_SevaultCanyon_Entrance_MapScripts @ 0x8168BF3 - .4byte SevenIsland_SevaultCanyon_Entrance_MapConnections @ 0x8352EB0 - .2byte BGM_FRLG_SEVII_ISLANDS - .2byte 255 - .byte 0xa8, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json b/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json new file mode 100644 index 000000000..4975264fe --- /dev/null +++ b/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json @@ -0,0 +1,139 @@ +{ + "id": "MAP_SEVEN_ISLAND_SEVAULT_CANYON_ENTRANCE", + "name": "SevenIsland_SevaultCanyon_Entrance", + "layout": "LAYOUT_SEVEN_ISLAND_SEVAULT_CANYON_ENTRANCE", + "music": "BGM_FRLG_SEVII_ISLANDS", + "region_map_section": "MAPSEC_CANYON_ENTRANCE", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_SEVEN_ISLAND", + "offset": 0, + "direction": "up" + }, + { + "map": "MAP_SEVEN_ISLAND_SEVAULT_CANYON", + "offset": 20, + "direction": "right" + } + ], + "object_events": [ + { + "graphics_id": "28", + "x": 12, + "y": 6, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "SevenIsland_SevaultCanyon_Entrance_EventScript_1AC8C9", + "flag": "0" + }, + { + "graphics_id": "29", + "x": 3, + "y": 34, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SevenIsland_SevaultCanyon_Entrance_EventScript_1AC907", + "flag": "0" + }, + { + "graphics_id": "25", + "x": 4, + "y": 34, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SevenIsland_SevaultCanyon_Entrance_EventScript_1AC94D", + "flag": "0" + }, + { + "graphics_id": "39", + "x": 11, + "y": 26, + "elevation": 3, + "movement_type": "20", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "SevenIsland_SevaultCanyon_Entrance_EventScript_1AC9D1", + "flag": "0" + }, + { + "graphics_id": "40", + "x": 10, + "y": 26, + "elevation": 3, + "movement_type": "19", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "SevenIsland_SevaultCanyon_Entrance_EventScript_1ACA0F", + "flag": "0" + }, + { + "graphics_id": "26", + "x": 11, + "y": 17, + "elevation": 5, + "movement_type": "23", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SevenIsland_SevaultCanyon_Entrance_EventScript_1AC993", + "flag": "0" + }, + { + "graphics_id": "65321", + "x": 7, + "y": 65534, + "elevation": 1, + "movement_type": "0", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 17, + "trainer_sight_or_berry_tree_id": 3, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 8, + "y": 29, + "elevation": 5, + "item": "ITEM_RAWST_BERRY", + "flag": "188", + "unknown": 1 + }, + { + "type": "bg_event_type_0", + "x": 14, + "y": 26, + "elevation": 0, + "script": "SevenIsland_SevaultCanyon_Entrance_EventScript_168BF4" + } + ] +} \ No newline at end of file diff --git a/data/maps/SevenIsland_SevaultCanyon_House/events.inc b/data/maps/SevenIsland_SevaultCanyon_House/events.inc deleted file mode 100644 index 3cc9f5bfc..000000000 --- a/data/maps/SevenIsland_SevaultCanyon_House/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -SevenIsland_SevaultCanyon_House_EventObjects: - object_event 1, 30, 0, 2, 0, 4, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_SevaultCanyon_House_EventScript_172183, 0, 0, 0 - object_event 2, 117, 0, 4, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_SevaultCanyon_House_EventScript_172242, 0, 0, 0 - object_event 3, 92, 0, 6, 0, 4, 0, 0, 8, 17, 0, 0, 0, 0, 0, SevenIsland_SevaultCanyon_House_EventScript_1BEDFC, 509, 0, 0 - -SevenIsland_SevaultCanyon_House_MapWarps: - warp_def 4, 7, 3, 1, 832 - -SevenIsland_SevaultCanyon_House_MapEvents:: - map_events SevenIsland_SevaultCanyon_House_EventObjects, SevenIsland_SevaultCanyon_House_MapWarps, 0x0, 0x0 diff --git a/data/maps/SevenIsland_SevaultCanyon_House/header.inc b/data/maps/SevenIsland_SevaultCanyon_House/header.inc deleted file mode 100644 index 2adfd6a6e..000000000 --- a/data/maps/SevenIsland_SevaultCanyon_House/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SevenIsland_SevaultCanyon_House:: @ 8351FE8 - .4byte House3_Layout @ 0x82D5CB8 - .4byte SevenIsland_SevaultCanyon_House_MapEvents @ 0x83BF3CC - .4byte SevenIsland_SevaultCanyon_House_MapScripts @ 0x8172182 - .4byte NULL - .2byte BGM_FRLG_ISLAND_SIX - .2byte 11 - .byte 0xa9, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/SevenIsland_SevaultCanyon_House/map.json b/data/maps/SevenIsland_SevaultCanyon_House/map.json new file mode 100644 index 000000000..21f0ae7fe --- /dev/null +++ b/data/maps/SevenIsland_SevaultCanyon_House/map.json @@ -0,0 +1,67 @@ +{ + "id": "MAP_SEVEN_ISLAND_SEVAULT_CANYON_HOUSE", + "name": "SevenIsland_SevaultCanyon_House", + "layout": "LAYOUT_HOUSE3", + "music": "BGM_FRLG_ISLAND_SIX", + "region_map_section": "MAPSEC_SEVAULT_CANYON", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "30", + "x": 2, + "y": 4, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_SevaultCanyon_House_EventScript_172183", + "flag": "0" + }, + { + "graphics_id": "117", + "x": 4, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_SevaultCanyon_House_EventScript_172242", + "flag": "0" + }, + { + "graphics_id": "92", + "x": 6, + "y": 4, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_SevaultCanyon_House_EventScript_1BEDFC", + "flag": "509" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND_SEVAULT_CANYON", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SevenIsland_TanobyRuins/connections.inc b/data/maps/SevenIsland_TanobyRuins/connections.inc deleted file mode 100644 index 988852ae9..000000000 --- a/data/maps/SevenIsland_TanobyRuins/connections.inc +++ /dev/null @@ -1,6 +0,0 @@ -SevenIsland_TanobyRuins_MapConnectionsList: @ 8352ED8 - connection up, 48, MAP_SEVEN_ISLAND_SEVAULTCANYON - -SevenIsland_TanobyRuins_MapConnections:: @ 8352EE4 - .4byte 1 - .4byte SevenIsland_TanobyRuins_MapConnectionsList diff --git a/data/maps/SevenIsland_TanobyRuins/events.inc b/data/maps/SevenIsland_TanobyRuins/events.inc deleted file mode 100644 index 32176aeda..000000000 --- a/data/maps/SevenIsland_TanobyRuins/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -SevenIsland_TanobyRuins_EventObjects: - object_event 1, 56, 0, 35, 0, 7, 0, 3, 2, 17, 0, 1, 0, 1, 0, SevenIsland_TanobyRuins_EventScript_1ACC4D, 0, 0, 0 - object_event 2, 56, 0, 121, 0, 11, 0, 3, 1, 17, 0, 1, 0, 1, 0, SevenIsland_TanobyRuins_EventScript_1ACC8B, 0, 0, 0 - object_event 3, 22, 0, 85, 0, 8, 0, 3, 10, 17, 0, 1, 0, 1, 0, SevenIsland_TanobyRuins_EventScript_1ACCC9, 0, 0, 0 - object_event 4, 61, 0, 85, 0, 5, 0, 3, 2, 17, 0, 1, 0, 1, 0, SevenIsland_TanobyRuins_EventScript_1ACD07, 0, 0, 0 - -SevenIsland_TanobyRuins_MapWarps: - warp_def 120, 10, 3, 0, 539 - warp_def 103, 10, 3, 0, 540 - warp_def 88, 8, 3, 0, 541 - warp_def 44, 11, 3, 0, 542 - warp_def 32, 9, 3, 0, 543 - warp_def 12, 15, 3, 0, 544 - warp_def 11, 6, 3, 0, 545 - -SevenIsland_TanobyRuins_MapBGEvents: - bg_event 33, 10, 3, 7, 0, 111, 65, 1 - bg_event 86, 9, 3, 7, 0, 111, 66, 1 - bg_event 125, 5, 3, 7, 0, 111, 67, 1 - bg_event 8, 2, 3, 7, 0, 111, 64, 1 - -SevenIsland_TanobyRuins_MapEvents:: - map_events SevenIsland_TanobyRuins_EventObjects, SevenIsland_TanobyRuins_MapWarps, 0x0, SevenIsland_TanobyRuins_MapBGEvents diff --git a/data/maps/SevenIsland_TanobyRuins/header.inc b/data/maps/SevenIsland_TanobyRuins/header.inc deleted file mode 100644 index 1af4d7470..000000000 --- a/data/maps/SevenIsland_TanobyRuins/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SevenIsland_TanobyRuins:: @ 8350D34 - .4byte SevenIsland_TanobyRuins_Layout @ 0x83355E8 - .4byte SevenIsland_TanobyRuins_MapEvents @ 0x83B96F4 - .4byte SevenIsland_TanobyRuins_MapScripts @ 0x8168C07 - .4byte SevenIsland_TanobyRuins_MapConnections @ 0x8352EE4 - .2byte BGM_FRLG_SEVII_ISLANDS - .2byte 257 - .byte 0xaa, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/SevenIsland_TanobyRuins/map.json b/data/maps/SevenIsland_TanobyRuins/map.json new file mode 100644 index 000000000..33c2fb842 --- /dev/null +++ b/data/maps/SevenIsland_TanobyRuins/map.json @@ -0,0 +1,165 @@ +{ + "id": "MAP_SEVEN_ISLAND_TANOBY_RUINS", + "name": "SevenIsland_TanobyRuins", + "layout": "LAYOUT_SEVEN_ISLAND_TANOBY_RUINS", + "music": "BGM_FRLG_SEVII_ISLANDS", + "region_map_section": "MAPSEC_TANOBY_RUINS", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_SEVEN_ISLAND_SEVAULT_CANYON", + "offset": 48, + "direction": "up" + } + ], + "object_events": [ + { + "graphics_id": "56", + "x": 35, + "y": 7, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SevenIsland_TanobyRuins_EventScript_1ACC4D", + "flag": "0" + }, + { + "graphics_id": "56", + "x": 121, + "y": 11, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SevenIsland_TanobyRuins_EventScript_1ACC8B", + "flag": "0" + }, + { + "graphics_id": "22", + "x": 85, + "y": 8, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SevenIsland_TanobyRuins_EventScript_1ACCC9", + "flag": "0" + }, + { + "graphics_id": "61", + "x": 85, + "y": 5, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SevenIsland_TanobyRuins_EventScript_1ACD07", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 120, + "y": 10, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER", + "dest_warp_id": 0 + }, + { + "x": 103, + "y": 10, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND_TANOBY_RUINS_LIPTOO_CHAMBER", + "dest_warp_id": 0 + }, + { + "x": 88, + "y": 8, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND_TANOBY_RUINS_WEEPTH_CHAMBER", + "dest_warp_id": 0 + }, + { + "x": 44, + "y": 11, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND_TANOBY_RUINS_DILFORD_CHAMBER", + "dest_warp_id": 0 + }, + { + "x": 32, + "y": 9, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND_TANOBY_RUINS_SCUFIB_CHAMBER", + "dest_warp_id": 0 + }, + { + "x": 12, + "y": 15, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND_TANOBY_RUINS_RIXY_CHAMBER", + "dest_warp_id": 0 + }, + { + "x": 11, + "y": 6, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND_TANOBY_RUINS_VIAPOIS_CHAMBER", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 33, + "y": 10, + "elevation": 3, + "item": "ITEM_HEART_SCALE", + "flag": "65", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 86, + "y": 9, + "elevation": 3, + "item": "ITEM_HEART_SCALE", + "flag": "66", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 125, + "y": 5, + "elevation": 3, + "item": "ITEM_HEART_SCALE", + "flag": "67", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 8, + "y": 2, + "elevation": 3, + "item": "ITEM_HEART_SCALE", + "flag": "64", + "unknown": 1 + } + ] +} \ No newline at end of file diff --git a/data/maps/SevenIsland_TanobyRuins_DilfordChamber/events.inc b/data/maps/SevenIsland_TanobyRuins_DilfordChamber/events.inc deleted file mode 100644 index 2d94f2129..000000000 --- a/data/maps/SevenIsland_TanobyRuins_DilfordChamber/events.inc +++ /dev/null @@ -1,5 +0,0 @@ -SevenIsland_TanobyRuins_DilfordChamber_MapWarps: - warp_def 11, 15, 3, 3, 833 - -SevenIsland_TanobyRuins_DilfordChamber_MapEvents:: - map_events 0x0, SevenIsland_TanobyRuins_DilfordChamber_MapWarps, 0x0, 0x0 diff --git a/data/maps/SevenIsland_TanobyRuins_DilfordChamber/header.inc b/data/maps/SevenIsland_TanobyRuins_DilfordChamber/header.inc deleted file mode 100644 index ff5d89664..000000000 --- a/data/maps/SevenIsland_TanobyRuins_DilfordChamber/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SevenIsland_TanobyRuins_DilfordChamber:: @ 83502D0 - .4byte SevenIsland_TanobyRuins_DilfordChamber_Layout @ 0x83470F8 - .4byte SevenIsland_TanobyRuins_DilfordChamber_MapEvents @ 0x83B46EC - .4byte SevenIsland_TanobyRuins_DilfordChamber_MapScripts @ 0x8164CF6 - .4byte NULL - .2byte BGM_FRLG_TANOBY_RUINS - .2byte 338 - .byte 0xbf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x02 diff --git a/data/maps/SevenIsland_TanobyRuins_DilfordChamber/map.json b/data/maps/SevenIsland_TanobyRuins_DilfordChamber/map.json new file mode 100644 index 000000000..3b00c0be4 --- /dev/null +++ b/data/maps/SevenIsland_TanobyRuins_DilfordChamber/map.json @@ -0,0 +1,27 @@ +{ + "id": "MAP_SEVEN_ISLAND_TANOBY_RUINS_DILFORD_CHAMBER", + "name": "SevenIsland_TanobyRuins_DilfordChamber", + "layout": "LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_DILFORD_CHAMBER", + "music": "BGM_FRLG_TANOBY_RUINS", + "region_map_section": "MAPSEC_DILFORD_CHAMBER", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_2", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 11, + "y": 15, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND_TANOBY_RUINS", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SevenIsland_TanobyRuins_LiptooChamber/events.inc b/data/maps/SevenIsland_TanobyRuins_LiptooChamber/events.inc deleted file mode 100644 index 6529a346b..000000000 --- a/data/maps/SevenIsland_TanobyRuins_LiptooChamber/events.inc +++ /dev/null @@ -1,5 +0,0 @@ -SevenIsland_TanobyRuins_LiptooChamber_MapWarps: - warp_def 11, 15, 3, 1, 833 - -SevenIsland_TanobyRuins_LiptooChamber_MapEvents:: - map_events 0x0, SevenIsland_TanobyRuins_LiptooChamber_MapWarps, 0x0, 0x0 diff --git a/data/maps/SevenIsland_TanobyRuins_LiptooChamber/header.inc b/data/maps/SevenIsland_TanobyRuins_LiptooChamber/header.inc deleted file mode 100644 index f25b6c7b4..000000000 --- a/data/maps/SevenIsland_TanobyRuins_LiptooChamber/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SevenIsland_TanobyRuins_LiptooChamber:: @ 8350298 - .4byte SevenIsland_TanobyRuins_LiptooChamber_Layout @ 0x8346A90 - .4byte SevenIsland_TanobyRuins_LiptooChamber_MapEvents @ 0x83B46B4 - .4byte SevenIsland_TanobyRuins_LiptooChamber_MapScripts @ 0x8164CDE - .4byte NULL - .2byte BGM_FRLG_TANOBY_RUINS - .2byte 336 - .byte 0xbd, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x02 diff --git a/data/maps/SevenIsland_TanobyRuins_LiptooChamber/map.json b/data/maps/SevenIsland_TanobyRuins_LiptooChamber/map.json new file mode 100644 index 000000000..9bb534692 --- /dev/null +++ b/data/maps/SevenIsland_TanobyRuins_LiptooChamber/map.json @@ -0,0 +1,27 @@ +{ + "id": "MAP_SEVEN_ISLAND_TANOBY_RUINS_LIPTOO_CHAMBER", + "name": "SevenIsland_TanobyRuins_LiptooChamber", + "layout": "LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_LIPTOO_CHAMBER", + "music": "BGM_FRLG_TANOBY_RUINS", + "region_map_section": "MAPSEC_LIPTOO_CHAMBER", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_2", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 11, + "y": 15, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND_TANOBY_RUINS", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SevenIsland_TanobyRuins_MoneanChamber/events.inc b/data/maps/SevenIsland_TanobyRuins_MoneanChamber/events.inc deleted file mode 100644 index 938602a70..000000000 --- a/data/maps/SevenIsland_TanobyRuins_MoneanChamber/events.inc +++ /dev/null @@ -1,5 +0,0 @@ -SevenIsland_TanobyRuins_MoneanChamber_MapWarps: - warp_def 11, 15, 3, 0, 833 - -SevenIsland_TanobyRuins_MoneanChamber_MapEvents:: - map_events 0x0, SevenIsland_TanobyRuins_MoneanChamber_MapWarps, 0x0, 0x0 diff --git a/data/maps/SevenIsland_TanobyRuins_MoneanChamber/header.inc b/data/maps/SevenIsland_TanobyRuins_MoneanChamber/header.inc deleted file mode 100644 index b193feafc..000000000 --- a/data/maps/SevenIsland_TanobyRuins_MoneanChamber/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SevenIsland_TanobyRuins_MoneanChamber:: @ 835027C - .4byte SevenIsland_TanobyRuins_MoneanChamber_Layout @ 0x834675C - .4byte SevenIsland_TanobyRuins_MoneanChamber_MapEvents @ 0x83B4698 - .4byte SevenIsland_TanobyRuins_MoneanChamber_MapScripts @ 0x8164CCF - .4byte NULL - .2byte BGM_FRLG_TANOBY_RUINS - .2byte 335 - .byte 0xbc, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x02 diff --git a/data/maps/SevenIsland_TanobyRuins_MoneanChamber/map.json b/data/maps/SevenIsland_TanobyRuins_MoneanChamber/map.json new file mode 100644 index 000000000..706cf4907 --- /dev/null +++ b/data/maps/SevenIsland_TanobyRuins_MoneanChamber/map.json @@ -0,0 +1,27 @@ +{ + "id": "MAP_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER", + "name": "SevenIsland_TanobyRuins_MoneanChamber", + "layout": "LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER", + "music": "BGM_FRLG_TANOBY_RUINS", + "region_map_section": "MAPSEC_MONEAN_CHAMBER", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_2", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 11, + "y": 15, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND_TANOBY_RUINS", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SevenIsland_TanobyRuins_RixyChamber/events.inc b/data/maps/SevenIsland_TanobyRuins_RixyChamber/events.inc deleted file mode 100644 index 8becb5f72..000000000 --- a/data/maps/SevenIsland_TanobyRuins_RixyChamber/events.inc +++ /dev/null @@ -1,5 +0,0 @@ -SevenIsland_TanobyRuins_RixyChamber_MapWarps: - warp_def 11, 15, 3, 5, 833 - -SevenIsland_TanobyRuins_RixyChamber_MapEvents:: - map_events 0x0, SevenIsland_TanobyRuins_RixyChamber_MapWarps, 0x0, 0x0 diff --git a/data/maps/SevenIsland_TanobyRuins_RixyChamber/header.inc b/data/maps/SevenIsland_TanobyRuins_RixyChamber/header.inc deleted file mode 100644 index 815c894ee..000000000 --- a/data/maps/SevenIsland_TanobyRuins_RixyChamber/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SevenIsland_TanobyRuins_RixyChamber:: @ 8350308 - .4byte SevenIsland_TanobyRuins_RixyChamber_Layout @ 0x8349DC8 - .4byte SevenIsland_TanobyRuins_RixyChamber_MapEvents @ 0x83B4724 - .4byte SevenIsland_TanobyRuins_RixyChamber_MapScripts @ 0x8164D0E - .4byte NULL - .2byte BGM_FRLG_TANOBY_RUINS - .2byte 362 - .byte 0xc1, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x02 diff --git a/data/maps/SevenIsland_TanobyRuins_RixyChamber/map.json b/data/maps/SevenIsland_TanobyRuins_RixyChamber/map.json new file mode 100644 index 000000000..e92f18cba --- /dev/null +++ b/data/maps/SevenIsland_TanobyRuins_RixyChamber/map.json @@ -0,0 +1,27 @@ +{ + "id": "MAP_SEVEN_ISLAND_TANOBY_RUINS_RIXY_CHAMBER", + "name": "SevenIsland_TanobyRuins_RixyChamber", + "layout": "LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_RIXY_CHAMBER", + "music": "BGM_FRLG_TANOBY_RUINS", + "region_map_section": "MAPSEC_RIXY_CHAMBER", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_2", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 11, + "y": 15, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND_TANOBY_RUINS", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SevenIsland_TanobyRuins_ScufibChamber/events.inc b/data/maps/SevenIsland_TanobyRuins_ScufibChamber/events.inc deleted file mode 100644 index 6a2c9f679..000000000 --- a/data/maps/SevenIsland_TanobyRuins_ScufibChamber/events.inc +++ /dev/null @@ -1,5 +0,0 @@ -SevenIsland_TanobyRuins_ScufibChamber_MapWarps: - warp_def 11, 15, 3, 4, 833 - -SevenIsland_TanobyRuins_ScufibChamber_MapEvents:: - map_events 0x0, SevenIsland_TanobyRuins_ScufibChamber_MapWarps, 0x0, 0x0 diff --git a/data/maps/SevenIsland_TanobyRuins_ScufibChamber/header.inc b/data/maps/SevenIsland_TanobyRuins_ScufibChamber/header.inc deleted file mode 100644 index 66680e148..000000000 --- a/data/maps/SevenIsland_TanobyRuins_ScufibChamber/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SevenIsland_TanobyRuins_ScufibChamber:: @ 83502EC - .4byte SevenIsland_TanobyRuins_ScufibChamber_Layout @ 0x834742C - .4byte SevenIsland_TanobyRuins_ScufibChamber_MapEvents @ 0x83B4708 - .4byte SevenIsland_TanobyRuins_ScufibChamber_MapScripts @ 0x8164D02 - .4byte NULL - .2byte BGM_FRLG_TANOBY_RUINS - .2byte 339 - .byte 0xc0, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x02 diff --git a/data/maps/SevenIsland_TanobyRuins_ScufibChamber/map.json b/data/maps/SevenIsland_TanobyRuins_ScufibChamber/map.json new file mode 100644 index 000000000..03ca8f69a --- /dev/null +++ b/data/maps/SevenIsland_TanobyRuins_ScufibChamber/map.json @@ -0,0 +1,27 @@ +{ + "id": "MAP_SEVEN_ISLAND_TANOBY_RUINS_SCUFIB_CHAMBER", + "name": "SevenIsland_TanobyRuins_ScufibChamber", + "layout": "LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_SCUFIB_CHAMBER", + "music": "BGM_FRLG_TANOBY_RUINS", + "region_map_section": "MAPSEC_SCUFIB_CHAMBER", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_2", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 11, + "y": 15, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND_TANOBY_RUINS", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/events.inc b/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/events.inc deleted file mode 100644 index fa4434348..000000000 --- a/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/events.inc +++ /dev/null @@ -1,5 +0,0 @@ -SevenIsland_TanobyRuins_ViapoisChamber_MapWarps: - warp_def 11, 15, 3, 6, 833 - -SevenIsland_TanobyRuins_ViapoisChamber_MapEvents:: - map_events 0x0, SevenIsland_TanobyRuins_ViapoisChamber_MapWarps, 0x0, 0x0 diff --git a/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/header.inc b/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/header.inc deleted file mode 100644 index 1f29dbb8f..000000000 --- a/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SevenIsland_TanobyRuins_ViapoisChamber:: @ 8350324 - .4byte SevenIsland_TanobyRuins_ViapoisChamber_Layout @ 0x834A0FC - .4byte SevenIsland_TanobyRuins_ViapoisChamber_MapEvents @ 0x83B4740 - .4byte SevenIsland_TanobyRuins_ViapoisChamber_MapScripts @ 0x8164D1A - .4byte NULL - .2byte BGM_FRLG_TANOBY_RUINS - .2byte 363 - .byte 0xc2, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x02 diff --git a/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/map.json b/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/map.json new file mode 100644 index 000000000..9f99b7b99 --- /dev/null +++ b/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/map.json @@ -0,0 +1,27 @@ +{ + "id": "MAP_SEVEN_ISLAND_TANOBY_RUINS_VIAPOIS_CHAMBER", + "name": "SevenIsland_TanobyRuins_ViapoisChamber", + "layout": "LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_VIAPOIS_CHAMBER", + "music": "BGM_FRLG_TANOBY_RUINS", + "region_map_section": "MAPSEC_VIAPOIS_CHAMBER", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_2", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 11, + "y": 15, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND_TANOBY_RUINS", + "dest_warp_id": 6 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SevenIsland_TanobyRuins_WeepthChamber/events.inc b/data/maps/SevenIsland_TanobyRuins_WeepthChamber/events.inc deleted file mode 100644 index 57cea380b..000000000 --- a/data/maps/SevenIsland_TanobyRuins_WeepthChamber/events.inc +++ /dev/null @@ -1,5 +0,0 @@ -SevenIsland_TanobyRuins_WeepthChamber_MapWarps: - warp_def 11, 15, 3, 2, 833 - -SevenIsland_TanobyRuins_WeepthChamber_MapEvents:: - map_events 0x0, SevenIsland_TanobyRuins_WeepthChamber_MapWarps, 0x0, 0x0 diff --git a/data/maps/SevenIsland_TanobyRuins_WeepthChamber/header.inc b/data/maps/SevenIsland_TanobyRuins_WeepthChamber/header.inc deleted file mode 100644 index a6ad1c938..000000000 --- a/data/maps/SevenIsland_TanobyRuins_WeepthChamber/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SevenIsland_TanobyRuins_WeepthChamber:: @ 83502B4 - .4byte SevenIsland_TanobyRuins_WeepthChamber_Layout @ 0x8346DC4 - .4byte SevenIsland_TanobyRuins_WeepthChamber_MapEvents @ 0x83B46D0 - .4byte SevenIsland_TanobyRuins_WeepthChamber_MapScripts @ 0x8164CEA - .4byte NULL - .2byte BGM_FRLG_TANOBY_RUINS - .2byte 337 - .byte 0xbe, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x02 diff --git a/data/maps/SevenIsland_TanobyRuins_WeepthChamber/map.json b/data/maps/SevenIsland_TanobyRuins_WeepthChamber/map.json new file mode 100644 index 000000000..85294ca41 --- /dev/null +++ b/data/maps/SevenIsland_TanobyRuins_WeepthChamber/map.json @@ -0,0 +1,27 @@ +{ + "id": "MAP_SEVEN_ISLAND_TANOBY_RUINS_WEEPTH_CHAMBER", + "name": "SevenIsland_TanobyRuins_WeepthChamber", + "layout": "LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_WEEPTH_CHAMBER", + "music": "BGM_FRLG_TANOBY_RUINS", + "region_map_section": "MAPSEC_WEEPTH_CHAMBER", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_2", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 11, + "y": 15, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND_TANOBY_RUINS", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SevenIsland_TrainerTower/connections.inc b/data/maps/SevenIsland_TrainerTower/connections.inc deleted file mode 100644 index 4c55ced6e..000000000 --- a/data/maps/SevenIsland_TrainerTower/connections.inc +++ /dev/null @@ -1,6 +0,0 @@ -SevenIsland_TrainerTower_MapConnectionsList: @ 8352E84 - connection down, 48, MAP_SEVEN_ISLAND - -SevenIsland_TrainerTower_MapConnections:: @ 8352E90 - .4byte 1 - .4byte SevenIsland_TrainerTower_MapConnectionsList diff --git a/data/maps/SevenIsland_TrainerTower/events.inc b/data/maps/SevenIsland_TrainerTower/events.inc deleted file mode 100644 index 45aa2f532..000000000 --- a/data/maps/SevenIsland_TrainerTower/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -SevenIsland_TrainerTower_EventObjects: - object_event 1, 19, 0, 56, 0, 26, 0, 3, 7, 17, 0, 1, 0, 1, 0, SevenIsland_TrainerTower_EventScript_1AC84D, 0, 0, 0 - object_event 2, 23, 0, 56, 0, 29, 0, 3, 8, 17, 0, 1, 0, 1, 0, SevenIsland_TrainerTower_EventScript_1AC88B, 0, 0, 0 - -SevenIsland_TrainerTower_MapWarps: - warp_def 58, 7, 3, 1, 522 - -SevenIsland_TrainerTower_MapBGEvents: - bg_event 49, 27, 3, 7, 0, 107, 185, 1 - bg_event 47, 30, 3, 7, 0, 106, 186, 1 - bg_event 59, 32, 3, 7, 0, 150, 187, 1 - bg_event 56, 8, 0, 0, 0, SevenIsland_TrainerTower_EventScript_168BE1 - bg_event 50, 30, 0, 0, 0, SevenIsland_TrainerTower_EventScript_168BEA - -SevenIsland_TrainerTower_MapEvents:: - map_events SevenIsland_TrainerTower_EventObjects, SevenIsland_TrainerTower_MapWarps, 0x0, SevenIsland_TrainerTower_MapBGEvents diff --git a/data/maps/SevenIsland_TrainerTower/header.inc b/data/maps/SevenIsland_TrainerTower/header.inc deleted file mode 100644 index 70ebb690e..000000000 --- a/data/maps/SevenIsland_TrainerTower/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SevenIsland_TrainerTower:: @ 8350CE0 - .4byte SevenIsland_TrainerTower_Layout @ 0x833287C - .4byte SevenIsland_TrainerTower_MapEvents @ 0x83B9328 - .4byte SevenIsland_TrainerTower_MapScripts @ 0x8168BD5 - .4byte SevenIsland_TrainerTower_MapConnections @ 0x8352E90 - .2byte BGM_FRLG_SEVII_ISLANDS - .2byte 254 - .byte 0xa7, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/SevenIsland_TrainerTower/map.json b/data/maps/SevenIsland_TrainerTower/map.json new file mode 100644 index 000000000..3b7aa0b8a --- /dev/null +++ b/data/maps/SevenIsland_TrainerTower/map.json @@ -0,0 +1,102 @@ +{ + "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER", + "name": "SevenIsland_TrainerTower", + "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER", + "music": "BGM_FRLG_SEVII_ISLANDS", + "region_map_section": "MAPSEC_TRAINER_TOWER", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_SEVEN_ISLAND", + "offset": 48, + "direction": "down" + } + ], + "object_events": [ + { + "graphics_id": "19", + "x": 56, + "y": 26, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SevenIsland_TrainerTower_EventScript_1AC84D", + "flag": "0" + }, + { + "graphics_id": "23", + "x": 56, + "y": 29, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SevenIsland_TrainerTower_EventScript_1AC88B", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 58, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 49, + "y": 27, + "elevation": 3, + "item": "ITEM_BIG_PEARL", + "flag": "185", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 47, + "y": 30, + "elevation": 3, + "item": "ITEM_PEARL", + "flag": "186", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 59, + "y": 32, + "elevation": 3, + "item": "ITEM_NANAB_BERRY", + "flag": "187", + "unknown": 1 + }, + { + "type": "bg_event_type_0", + "x": 56, + "y": 8, + "elevation": 0, + "script": "SevenIsland_TrainerTower_EventScript_168BE1" + }, + { + "type": "bg_event_type_0", + "x": 50, + "y": 30, + "elevation": 0, + "script": "SevenIsland_TrainerTower_EventScript_168BEA" + } + ] +} \ No newline at end of file diff --git a/data/maps/SevenIsland_TrainerTower_1F/events.inc b/data/maps/SevenIsland_TrainerTower_1F/events.inc deleted file mode 100644 index c46a41bc8..000000000 --- a/data/maps/SevenIsland_TrainerTower_1F/events.inc +++ /dev/null @@ -1,18 +0,0 @@ -SevenIsland_TrainerTower_1F_EventObjects: - object_event 1, 70, 0, 9, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, 6, 0, 0 - object_event 2, 240, 0, 11, 0, 10, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_1F_EventScript_1646C8, 2, 0, 0 - object_event 3, 241, 0, 15, 0, 13, 0, 3, 9, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_1F_EventScript_1646CE, 3, 0, 0 - object_event 4, 242, 0, 10, 0, 16, 0, 3, 7, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_1F_EventScript_1646D4, 4, 0, 0 - object_event 5, 243, 0, 10, 0, 10, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_1F_EventScript_1646DA, 5, 0, 0 - -SevenIsland_TrainerTower_1F_MapWarps: - warp_def 15, 6, 3, 1, 514 - warp_def 4, 6, 3, 0, 522 - -SevenIsland_TrainerTower_1F_MapCoordEvents: - coord_event 10, 13, 3, 0, 16398, 0, 0, SevenIsland_TrainerTower_1F_EventScript_1C54AF - coord_event 9, 12, 0, 0, 16399, 0, 0, SevenIsland_TrainerTower_1F_EventScript_1C54B4 - coord_event 9, 13, 3, 0, 16399, 0, 0, SevenIsland_TrainerTower_1F_EventScript_1C54EA - -SevenIsland_TrainerTower_1F_MapEvents:: - map_events SevenIsland_TrainerTower_1F_EventObjects, SevenIsland_TrainerTower_1F_MapWarps, SevenIsland_TrainerTower_1F_MapCoordEvents, 0x0 diff --git a/data/maps/SevenIsland_TrainerTower_1F/header.inc b/data/maps/SevenIsland_TrainerTower_1F/header.inc deleted file mode 100644 index 5e7e742ab..000000000 --- a/data/maps/SevenIsland_TrainerTower_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SevenIsland_TrainerTower_1F:: @ 834FFA4 - .4byte SevenIsland_TrainerTower_1F_Layout @ 0x8341FCC - .4byte SevenIsland_TrainerTower_1F_MapEvents @ 0x83B3C40 - .4byte SevenIsland_TrainerTower_1F_MapScripts @ 0x81646B8 - .4byte NULL - .2byte BGM_FRLG_TRAINER_TOWER - .2byte 298 - .byte 0xb3, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00 diff --git a/data/maps/SevenIsland_TrainerTower_1F/map.json b/data/maps/SevenIsland_TrainerTower_1F/map.json new file mode 100644 index 000000000..85be6d070 --- /dev/null +++ b/data/maps/SevenIsland_TrainerTower_1F/map.json @@ -0,0 +1,128 @@ +{ + "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_1F", + "name": "SevenIsland_TrainerTower_1F", + "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_1F", + "music": "BGM_FRLG_TRAINER_TOWER", + "region_map_section": "MAPSEC_TRAINER_TOWER_2", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 2, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "70", + "x": 9, + "y": 7, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "6" + }, + { + "graphics_id": "240", + "x": 11, + "y": 10, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_1F_EventScript_1646C8", + "flag": "2" + }, + { + "graphics_id": "241", + "x": 15, + "y": 13, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_1F_EventScript_1646CE", + "flag": "3" + }, + { + "graphics_id": "242", + "x": 10, + "y": 16, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_1F_EventScript_1646D4", + "flag": "4" + }, + { + "graphics_id": "243", + "x": 10, + "y": 10, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_1F_EventScript_1646DA", + "flag": "5" + } + ], + "warp_events": [ + { + "x": 15, + "y": 6, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_2F", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 6, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 10, + "y": 13, + "elevation": 3, + "var": "VAR_0x400E", + "var_value": 0, + "script": "SevenIsland_TrainerTower_1F_EventScript_1C54AF" + }, + { + "type": "trigger", + "x": 9, + "y": 12, + "elevation": 0, + "var": "VAR_0x400F", + "var_value": 0, + "script": "SevenIsland_TrainerTower_1F_EventScript_1C54B4" + }, + { + "type": "trigger", + "x": 9, + "y": 13, + "elevation": 3, + "var": "VAR_0x400F", + "var_value": 0, + "script": "SevenIsland_TrainerTower_1F_EventScript_1C54EA" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SevenIsland_TrainerTower_2F/events.inc b/data/maps/SevenIsland_TrainerTower_2F/events.inc deleted file mode 100644 index e26da5628..000000000 --- a/data/maps/SevenIsland_TrainerTower_2F/events.inc +++ /dev/null @@ -1,19 +0,0 @@ -SevenIsland_TrainerTower_2F_EventObjects: - object_event 1, 70, 0, 9, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_2F_EventScript_1646E0, 6, 0, 0 - object_event 2, 240, 0, 10, 0, 10, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_2F_EventScript_1646C8, 2, 0, 0 - object_event 3, 241, 0, 15, 0, 13, 0, 3, 9, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_2F_EventScript_1646CE, 3, 0, 0 - object_event 4, 242, 0, 10, 0, 16, 0, 3, 7, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_2F_EventScript_1646D4, 4, 0, 0 - object_event 5, 243, 0, 11, 0, 10, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_2F_EventScript_1646DA, 5, 0, 0 - -SevenIsland_TrainerTower_2F_MapWarps: - warp_def 15, 6, 3, 1, 515 - warp_def 4, 6, 3, 0, 513 - warp_def 13, 5, 0, 0, 523 - -SevenIsland_TrainerTower_2F_MapCoordEvents: - coord_event 10, 13, 3, 0, 16398, 0, 0, SevenIsland_TrainerTower_2F_EventScript_1C54AF - coord_event 9, 12, 3, 0, 16399, 0, 0, SevenIsland_TrainerTower_2F_EventScript_1C54B4 - coord_event 9, 13, 3, 0, 16399, 0, 0, SevenIsland_TrainerTower_2F_EventScript_1C54EA - -SevenIsland_TrainerTower_2F_MapEvents:: - map_events SevenIsland_TrainerTower_2F_EventObjects, SevenIsland_TrainerTower_2F_MapWarps, SevenIsland_TrainerTower_2F_MapCoordEvents, 0x0 diff --git a/data/maps/SevenIsland_TrainerTower_2F/header.inc b/data/maps/SevenIsland_TrainerTower_2F/header.inc deleted file mode 100644 index b5289b39a..000000000 --- a/data/maps/SevenIsland_TrainerTower_2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SevenIsland_TrainerTower_2F:: @ 834FFC0 - .4byte SevenIsland_TrainerTower_2F_Layout @ 0x8342254 - .4byte SevenIsland_TrainerTower_2F_MapEvents @ 0x83B3D14 - .4byte SevenIsland_TrainerTower_2F_MapScripts @ 0x81646E6 - .4byte NULL - .2byte BGM_FRLG_TRAINER_TOWER - .2byte 299 - .byte 0xb3, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00 diff --git a/data/maps/SevenIsland_TrainerTower_2F/map.json b/data/maps/SevenIsland_TrainerTower_2F/map.json new file mode 100644 index 000000000..8df192771 --- /dev/null +++ b/data/maps/SevenIsland_TrainerTower_2F/map.json @@ -0,0 +1,135 @@ +{ + "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_2F", + "name": "SevenIsland_TrainerTower_2F", + "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_2F", + "music": "BGM_FRLG_TRAINER_TOWER", + "region_map_section": "MAPSEC_TRAINER_TOWER_2", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 2, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "70", + "x": 9, + "y": 7, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_2F_EventScript_1646E0", + "flag": "6" + }, + { + "graphics_id": "240", + "x": 10, + "y": 10, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_2F_EventScript_1646C8", + "flag": "2" + }, + { + "graphics_id": "241", + "x": 15, + "y": 13, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_2F_EventScript_1646CE", + "flag": "3" + }, + { + "graphics_id": "242", + "x": 10, + "y": 16, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_2F_EventScript_1646D4", + "flag": "4" + }, + { + "graphics_id": "243", + "x": 11, + "y": 10, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_2F_EventScript_1646DA", + "flag": "5" + } + ], + "warp_events": [ + { + "x": 15, + "y": 6, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_3F", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 6, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_1F", + "dest_warp_id": 0 + }, + { + "x": 13, + "y": 5, + "elevation": 0, + "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 10, + "y": 13, + "elevation": 3, + "var": "VAR_0x400E", + "var_value": 0, + "script": "SevenIsland_TrainerTower_2F_EventScript_1C54AF" + }, + { + "type": "trigger", + "x": 9, + "y": 12, + "elevation": 3, + "var": "VAR_0x400F", + "var_value": 0, + "script": "SevenIsland_TrainerTower_2F_EventScript_1C54B4" + }, + { + "type": "trigger", + "x": 9, + "y": 13, + "elevation": 3, + "var": "VAR_0x400F", + "var_value": 0, + "script": "SevenIsland_TrainerTower_2F_EventScript_1C54EA" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SevenIsland_TrainerTower_3F/events.inc b/data/maps/SevenIsland_TrainerTower_3F/events.inc deleted file mode 100644 index 534660edd..000000000 --- a/data/maps/SevenIsland_TrainerTower_3F/events.inc +++ /dev/null @@ -1,19 +0,0 @@ -SevenIsland_TrainerTower_3F_EventObjects: - object_event 1, 70, 0, 9, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_3F_EventScript_1646E0, 6, 0, 0 - object_event 2, 240, 0, 10, 0, 10, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_3F_EventScript_1646C8, 2, 0, 0 - object_event 3, 241, 0, 15, 0, 13, 0, 3, 9, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_3F_EventScript_1646CE, 3, 0, 0 - object_event 4, 242, 0, 10, 0, 16, 0, 3, 7, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_3F_EventScript_1646D4, 4, 0, 0 - object_event 5, 243, 0, 11, 0, 10, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_3F_EventScript_1646DA, 5, 0, 0 - -SevenIsland_TrainerTower_3F_MapWarps: - warp_def 15, 6, 3, 1, 516 - warp_def 4, 6, 3, 0, 514 - warp_def 13, 5, 0, 0, 523 - -SevenIsland_TrainerTower_3F_MapCoordEvents: - coord_event 10, 13, 3, 0, 16398, 0, 0, SevenIsland_TrainerTower_3F_EventScript_1C54AF - coord_event 9, 12, 3, 0, 16399, 0, 0, SevenIsland_TrainerTower_3F_EventScript_1C54B4 - coord_event 9, 13, 3, 0, 16399, 0, 0, SevenIsland_TrainerTower_3F_EventScript_1C54EA - -SevenIsland_TrainerTower_3F_MapEvents:: - map_events SevenIsland_TrainerTower_3F_EventObjects, SevenIsland_TrainerTower_3F_MapWarps, SevenIsland_TrainerTower_3F_MapCoordEvents, 0x0 diff --git a/data/maps/SevenIsland_TrainerTower_3F/header.inc b/data/maps/SevenIsland_TrainerTower_3F/header.inc deleted file mode 100644 index 022a5c1d1..000000000 --- a/data/maps/SevenIsland_TrainerTower_3F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SevenIsland_TrainerTower_3F:: @ 834FFDC - .4byte SevenIsland_TrainerTower_3F_Layout @ 0x83424DC - .4byte SevenIsland_TrainerTower_3F_MapEvents @ 0x83B3DE8 - .4byte SevenIsland_TrainerTower_3F_MapScripts @ 0x8164714 - .4byte NULL - .2byte BGM_FRLG_TRAINER_TOWER - .2byte 300 - .byte 0xb3, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00 diff --git a/data/maps/SevenIsland_TrainerTower_3F/map.json b/data/maps/SevenIsland_TrainerTower_3F/map.json new file mode 100644 index 000000000..4e4b1c06b --- /dev/null +++ b/data/maps/SevenIsland_TrainerTower_3F/map.json @@ -0,0 +1,135 @@ +{ + "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_3F", + "name": "SevenIsland_TrainerTower_3F", + "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_3F", + "music": "BGM_FRLG_TRAINER_TOWER", + "region_map_section": "MAPSEC_TRAINER_TOWER_2", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 2, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "70", + "x": 9, + "y": 7, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_3F_EventScript_1646E0", + "flag": "6" + }, + { + "graphics_id": "240", + "x": 10, + "y": 10, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_3F_EventScript_1646C8", + "flag": "2" + }, + { + "graphics_id": "241", + "x": 15, + "y": 13, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_3F_EventScript_1646CE", + "flag": "3" + }, + { + "graphics_id": "242", + "x": 10, + "y": 16, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_3F_EventScript_1646D4", + "flag": "4" + }, + { + "graphics_id": "243", + "x": 11, + "y": 10, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_3F_EventScript_1646DA", + "flag": "5" + } + ], + "warp_events": [ + { + "x": 15, + "y": 6, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_4F", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 6, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_2F", + "dest_warp_id": 0 + }, + { + "x": 13, + "y": 5, + "elevation": 0, + "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 10, + "y": 13, + "elevation": 3, + "var": "VAR_0x400E", + "var_value": 0, + "script": "SevenIsland_TrainerTower_3F_EventScript_1C54AF" + }, + { + "type": "trigger", + "x": 9, + "y": 12, + "elevation": 3, + "var": "VAR_0x400F", + "var_value": 0, + "script": "SevenIsland_TrainerTower_3F_EventScript_1C54B4" + }, + { + "type": "trigger", + "x": 9, + "y": 13, + "elevation": 3, + "var": "VAR_0x400F", + "var_value": 0, + "script": "SevenIsland_TrainerTower_3F_EventScript_1C54EA" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SevenIsland_TrainerTower_4F/events.inc b/data/maps/SevenIsland_TrainerTower_4F/events.inc deleted file mode 100644 index 90ee6424c..000000000 --- a/data/maps/SevenIsland_TrainerTower_4F/events.inc +++ /dev/null @@ -1,19 +0,0 @@ -SevenIsland_TrainerTower_4F_EventObjects: - object_event 1, 70, 0, 9, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_4F_EventScript_1646E0, 6, 0, 0 - object_event 2, 240, 0, 10, 0, 10, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_4F_EventScript_1646C8, 2, 0, 0 - object_event 3, 241, 0, 15, 0, 13, 0, 3, 9, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_4F_EventScript_1646CE, 3, 0, 0 - object_event 4, 242, 0, 10, 0, 16, 0, 3, 7, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_4F_EventScript_1646D4, 4, 0, 0 - object_event 5, 243, 0, 11, 0, 10, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_4F_EventScript_1646DA, 5, 0, 0 - -SevenIsland_TrainerTower_4F_MapWarps: - warp_def 15, 6, 3, 1, 517 - warp_def 4, 6, 3, 0, 515 - warp_def 13, 5, 0, 0, 523 - -SevenIsland_TrainerTower_4F_MapCoordEvents: - coord_event 10, 13, 3, 0, 16398, 0, 0, SevenIsland_TrainerTower_4F_EventScript_1C54AF - coord_event 9, 12, 3, 0, 16399, 0, 0, SevenIsland_TrainerTower_4F_EventScript_1C54B4 - coord_event 9, 13, 3, 0, 16399, 0, 0, SevenIsland_TrainerTower_4F_EventScript_1C54EA - -SevenIsland_TrainerTower_4F_MapEvents:: - map_events SevenIsland_TrainerTower_4F_EventObjects, SevenIsland_TrainerTower_4F_MapWarps, SevenIsland_TrainerTower_4F_MapCoordEvents, 0x0 diff --git a/data/maps/SevenIsland_TrainerTower_4F/header.inc b/data/maps/SevenIsland_TrainerTower_4F/header.inc deleted file mode 100644 index cdcedee7f..000000000 --- a/data/maps/SevenIsland_TrainerTower_4F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SevenIsland_TrainerTower_4F:: @ 834FFF8 - .4byte SevenIsland_TrainerTower_4F_Layout @ 0x8342764 - .4byte SevenIsland_TrainerTower_4F_MapEvents @ 0x83B3EBC - .4byte SevenIsland_TrainerTower_4F_MapScripts @ 0x8164742 - .4byte NULL - .2byte BGM_FRLG_TRAINER_TOWER - .2byte 301 - .byte 0xb3, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00 diff --git a/data/maps/SevenIsland_TrainerTower_4F/map.json b/data/maps/SevenIsland_TrainerTower_4F/map.json new file mode 100644 index 000000000..59aca5b37 --- /dev/null +++ b/data/maps/SevenIsland_TrainerTower_4F/map.json @@ -0,0 +1,135 @@ +{ + "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_4F", + "name": "SevenIsland_TrainerTower_4F", + "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_4F", + "music": "BGM_FRLG_TRAINER_TOWER", + "region_map_section": "MAPSEC_TRAINER_TOWER_2", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 2, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "70", + "x": 9, + "y": 7, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_4F_EventScript_1646E0", + "flag": "6" + }, + { + "graphics_id": "240", + "x": 10, + "y": 10, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_4F_EventScript_1646C8", + "flag": "2" + }, + { + "graphics_id": "241", + "x": 15, + "y": 13, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_4F_EventScript_1646CE", + "flag": "3" + }, + { + "graphics_id": "242", + "x": 10, + "y": 16, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_4F_EventScript_1646D4", + "flag": "4" + }, + { + "graphics_id": "243", + "x": 11, + "y": 10, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_4F_EventScript_1646DA", + "flag": "5" + } + ], + "warp_events": [ + { + "x": 15, + "y": 6, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_5F", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 6, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_3F", + "dest_warp_id": 0 + }, + { + "x": 13, + "y": 5, + "elevation": 0, + "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 10, + "y": 13, + "elevation": 3, + "var": "VAR_0x400E", + "var_value": 0, + "script": "SevenIsland_TrainerTower_4F_EventScript_1C54AF" + }, + { + "type": "trigger", + "x": 9, + "y": 12, + "elevation": 3, + "var": "VAR_0x400F", + "var_value": 0, + "script": "SevenIsland_TrainerTower_4F_EventScript_1C54B4" + }, + { + "type": "trigger", + "x": 9, + "y": 13, + "elevation": 3, + "var": "VAR_0x400F", + "var_value": 0, + "script": "SevenIsland_TrainerTower_4F_EventScript_1C54EA" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SevenIsland_TrainerTower_5F/events.inc b/data/maps/SevenIsland_TrainerTower_5F/events.inc deleted file mode 100644 index 05f34de05..000000000 --- a/data/maps/SevenIsland_TrainerTower_5F/events.inc +++ /dev/null @@ -1,19 +0,0 @@ -SevenIsland_TrainerTower_5F_EventObjects: - object_event 1, 70, 0, 9, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_5F_EventScript_1646E0, 6, 0, 0 - object_event 2, 240, 0, 10, 0, 10, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_5F_EventScript_1646C8, 2, 0, 0 - object_event 3, 241, 0, 15, 0, 13, 0, 3, 9, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_5F_EventScript_1646CE, 3, 0, 0 - object_event 4, 242, 0, 10, 0, 16, 0, 3, 7, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_5F_EventScript_1646D4, 4, 0, 0 - object_event 5, 243, 0, 11, 0, 10, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_5F_EventScript_1646DA, 5, 0, 0 - -SevenIsland_TrainerTower_5F_MapWarps: - warp_def 15, 6, 3, 1, 518 - warp_def 4, 6, 3, 0, 516 - warp_def 13, 5, 0, 0, 523 - -SevenIsland_TrainerTower_5F_MapCoordEvents: - coord_event 10, 13, 3, 0, 16398, 0, 0, SevenIsland_TrainerTower_5F_EventScript_1C54AF - coord_event 9, 12, 3, 0, 16399, 0, 0, SevenIsland_TrainerTower_5F_EventScript_1C54B4 - coord_event 9, 13, 3, 0, 16399, 0, 0, SevenIsland_TrainerTower_5F_EventScript_1C54EA - -SevenIsland_TrainerTower_5F_MapEvents:: - map_events SevenIsland_TrainerTower_5F_EventObjects, SevenIsland_TrainerTower_5F_MapWarps, SevenIsland_TrainerTower_5F_MapCoordEvents, 0x0 diff --git a/data/maps/SevenIsland_TrainerTower_5F/header.inc b/data/maps/SevenIsland_TrainerTower_5F/header.inc deleted file mode 100644 index 0192b30be..000000000 --- a/data/maps/SevenIsland_TrainerTower_5F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SevenIsland_TrainerTower_5F:: @ 8350014 - .4byte SevenIsland_TrainerTower_5F_Layout @ 0x83429EC - .4byte SevenIsland_TrainerTower_5F_MapEvents @ 0x83B3F90 - .4byte SevenIsland_TrainerTower_5F_MapScripts @ 0x8164770 - .4byte NULL - .2byte BGM_FRLG_TRAINER_TOWER - .2byte 302 - .byte 0xb3, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00 diff --git a/data/maps/SevenIsland_TrainerTower_5F/map.json b/data/maps/SevenIsland_TrainerTower_5F/map.json new file mode 100644 index 000000000..4e08a33b4 --- /dev/null +++ b/data/maps/SevenIsland_TrainerTower_5F/map.json @@ -0,0 +1,135 @@ +{ + "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_5F", + "name": "SevenIsland_TrainerTower_5F", + "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_5F", + "music": "BGM_FRLG_TRAINER_TOWER", + "region_map_section": "MAPSEC_TRAINER_TOWER_2", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 2, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "70", + "x": 9, + "y": 7, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_5F_EventScript_1646E0", + "flag": "6" + }, + { + "graphics_id": "240", + "x": 10, + "y": 10, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_5F_EventScript_1646C8", + "flag": "2" + }, + { + "graphics_id": "241", + "x": 15, + "y": 13, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_5F_EventScript_1646CE", + "flag": "3" + }, + { + "graphics_id": "242", + "x": 10, + "y": 16, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_5F_EventScript_1646D4", + "flag": "4" + }, + { + "graphics_id": "243", + "x": 11, + "y": 10, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_5F_EventScript_1646DA", + "flag": "5" + } + ], + "warp_events": [ + { + "x": 15, + "y": 6, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_6F", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 6, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_4F", + "dest_warp_id": 0 + }, + { + "x": 13, + "y": 5, + "elevation": 0, + "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 10, + "y": 13, + "elevation": 3, + "var": "VAR_0x400E", + "var_value": 0, + "script": "SevenIsland_TrainerTower_5F_EventScript_1C54AF" + }, + { + "type": "trigger", + "x": 9, + "y": 12, + "elevation": 3, + "var": "VAR_0x400F", + "var_value": 0, + "script": "SevenIsland_TrainerTower_5F_EventScript_1C54B4" + }, + { + "type": "trigger", + "x": 9, + "y": 13, + "elevation": 3, + "var": "VAR_0x400F", + "var_value": 0, + "script": "SevenIsland_TrainerTower_5F_EventScript_1C54EA" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SevenIsland_TrainerTower_6F/events.inc b/data/maps/SevenIsland_TrainerTower_6F/events.inc deleted file mode 100644 index 19d7c16d0..000000000 --- a/data/maps/SevenIsland_TrainerTower_6F/events.inc +++ /dev/null @@ -1,19 +0,0 @@ -SevenIsland_TrainerTower_6F_EventObjects: - object_event 1, 70, 0, 9, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_6F_EventScript_1646E0, 6, 0, 0 - object_event 2, 240, 0, 10, 0, 10, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_6F_EventScript_1646C8, 2, 0, 0 - object_event 3, 241, 0, 15, 0, 13, 0, 3, 9, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_6F_EventScript_1646CE, 3, 0, 0 - object_event 4, 242, 0, 10, 0, 16, 0, 3, 7, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_6F_EventScript_1646D4, 4, 0, 0 - object_event 5, 243, 0, 11, 0, 10, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_6F_EventScript_1646DA, 5, 0, 0 - -SevenIsland_TrainerTower_6F_MapWarps: - warp_def 15, 6, 3, 1, 519 - warp_def 4, 6, 3, 0, 517 - warp_def 13, 5, 0, 0, 523 - -SevenIsland_TrainerTower_6F_MapCoordEvents: - coord_event 10, 13, 3, 0, 16398, 0, 0, SevenIsland_TrainerTower_6F_EventScript_1C54AF - coord_event 9, 12, 3, 0, 16399, 0, 0, SevenIsland_TrainerTower_6F_EventScript_1C54B4 - coord_event 9, 13, 3, 0, 16399, 0, 0, SevenIsland_TrainerTower_6F_EventScript_1C54EA - -SevenIsland_TrainerTower_6F_MapEvents:: - map_events SevenIsland_TrainerTower_6F_EventObjects, SevenIsland_TrainerTower_6F_MapWarps, SevenIsland_TrainerTower_6F_MapCoordEvents, 0x0 diff --git a/data/maps/SevenIsland_TrainerTower_6F/header.inc b/data/maps/SevenIsland_TrainerTower_6F/header.inc deleted file mode 100644 index 3835015a0..000000000 --- a/data/maps/SevenIsland_TrainerTower_6F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SevenIsland_TrainerTower_6F:: @ 8350030 - .4byte SevenIsland_TrainerTower_6F_Layout @ 0x8342C74 - .4byte SevenIsland_TrainerTower_6F_MapEvents @ 0x83B4064 - .4byte SevenIsland_TrainerTower_6F_MapScripts @ 0x816479E - .4byte NULL - .2byte BGM_FRLG_TRAINER_TOWER - .2byte 303 - .byte 0xb3, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00 diff --git a/data/maps/SevenIsland_TrainerTower_6F/map.json b/data/maps/SevenIsland_TrainerTower_6F/map.json new file mode 100644 index 000000000..c548fa61a --- /dev/null +++ b/data/maps/SevenIsland_TrainerTower_6F/map.json @@ -0,0 +1,135 @@ +{ + "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_6F", + "name": "SevenIsland_TrainerTower_6F", + "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_6F", + "music": "BGM_FRLG_TRAINER_TOWER", + "region_map_section": "MAPSEC_TRAINER_TOWER_2", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 2, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "70", + "x": 9, + "y": 7, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_6F_EventScript_1646E0", + "flag": "6" + }, + { + "graphics_id": "240", + "x": 10, + "y": 10, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_6F_EventScript_1646C8", + "flag": "2" + }, + { + "graphics_id": "241", + "x": 15, + "y": 13, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_6F_EventScript_1646CE", + "flag": "3" + }, + { + "graphics_id": "242", + "x": 10, + "y": 16, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_6F_EventScript_1646D4", + "flag": "4" + }, + { + "graphics_id": "243", + "x": 11, + "y": 10, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_6F_EventScript_1646DA", + "flag": "5" + } + ], + "warp_events": [ + { + "x": 15, + "y": 6, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_7F", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 6, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_5F", + "dest_warp_id": 0 + }, + { + "x": 13, + "y": 5, + "elevation": 0, + "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 10, + "y": 13, + "elevation": 3, + "var": "VAR_0x400E", + "var_value": 0, + "script": "SevenIsland_TrainerTower_6F_EventScript_1C54AF" + }, + { + "type": "trigger", + "x": 9, + "y": 12, + "elevation": 3, + "var": "VAR_0x400F", + "var_value": 0, + "script": "SevenIsland_TrainerTower_6F_EventScript_1C54B4" + }, + { + "type": "trigger", + "x": 9, + "y": 13, + "elevation": 3, + "var": "VAR_0x400F", + "var_value": 0, + "script": "SevenIsland_TrainerTower_6F_EventScript_1C54EA" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SevenIsland_TrainerTower_7F/events.inc b/data/maps/SevenIsland_TrainerTower_7F/events.inc deleted file mode 100644 index 7a79976e2..000000000 --- a/data/maps/SevenIsland_TrainerTower_7F/events.inc +++ /dev/null @@ -1,19 +0,0 @@ -SevenIsland_TrainerTower_7F_EventObjects: - object_event 1, 70, 0, 9, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_7F_EventScript_1646E0, 6, 0, 0 - object_event 2, 240, 0, 10, 0, 10, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_7F_EventScript_1646C8, 2, 0, 0 - object_event 3, 241, 0, 15, 0, 13, 0, 3, 9, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_7F_EventScript_1646CE, 3, 0, 0 - object_event 4, 242, 0, 10, 0, 16, 0, 3, 7, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_7F_EventScript_1646D4, 4, 0, 0 - object_event 5, 243, 0, 11, 0, 10, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_7F_EventScript_1646DA, 5, 0, 0 - -SevenIsland_TrainerTower_7F_MapWarps: - warp_def 15, 6, 3, 1, 520 - warp_def 4, 6, 3, 0, 518 - warp_def 13, 5, 0, 0, 523 - -SevenIsland_TrainerTower_7F_MapCoordEvents: - coord_event 10, 13, 3, 0, 16398, 0, 0, SevenIsland_TrainerTower_7F_EventScript_1C54AF - coord_event 9, 12, 3, 0, 16399, 0, 0, SevenIsland_TrainerTower_7F_EventScript_1C54B4 - coord_event 9, 13, 3, 0, 16399, 0, 0, SevenIsland_TrainerTower_7F_EventScript_1C54EA - -SevenIsland_TrainerTower_7F_MapEvents:: - map_events SevenIsland_TrainerTower_7F_EventObjects, SevenIsland_TrainerTower_7F_MapWarps, SevenIsland_TrainerTower_7F_MapCoordEvents, 0x0 diff --git a/data/maps/SevenIsland_TrainerTower_7F/header.inc b/data/maps/SevenIsland_TrainerTower_7F/header.inc deleted file mode 100644 index 2c0d405a9..000000000 --- a/data/maps/SevenIsland_TrainerTower_7F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SevenIsland_TrainerTower_7F:: @ 835004C - .4byte SevenIsland_TrainerTower_7F_Layout @ 0x8342EFC - .4byte SevenIsland_TrainerTower_7F_MapEvents @ 0x83B4138 - .4byte SevenIsland_TrainerTower_7F_MapScripts @ 0x81647CC - .4byte NULL - .2byte BGM_FRLG_TRAINER_TOWER - .2byte 304 - .byte 0xb3, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00 diff --git a/data/maps/SevenIsland_TrainerTower_7F/map.json b/data/maps/SevenIsland_TrainerTower_7F/map.json new file mode 100644 index 000000000..90eb22605 --- /dev/null +++ b/data/maps/SevenIsland_TrainerTower_7F/map.json @@ -0,0 +1,135 @@ +{ + "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_7F", + "name": "SevenIsland_TrainerTower_7F", + "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_7F", + "music": "BGM_FRLG_TRAINER_TOWER", + "region_map_section": "MAPSEC_TRAINER_TOWER_2", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 2, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "70", + "x": 9, + "y": 7, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_7F_EventScript_1646E0", + "flag": "6" + }, + { + "graphics_id": "240", + "x": 10, + "y": 10, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_7F_EventScript_1646C8", + "flag": "2" + }, + { + "graphics_id": "241", + "x": 15, + "y": 13, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_7F_EventScript_1646CE", + "flag": "3" + }, + { + "graphics_id": "242", + "x": 10, + "y": 16, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_7F_EventScript_1646D4", + "flag": "4" + }, + { + "graphics_id": "243", + "x": 11, + "y": 10, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_7F_EventScript_1646DA", + "flag": "5" + } + ], + "warp_events": [ + { + "x": 15, + "y": 6, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_8F", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 6, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_6F", + "dest_warp_id": 0 + }, + { + "x": 13, + "y": 5, + "elevation": 0, + "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 10, + "y": 13, + "elevation": 3, + "var": "VAR_0x400E", + "var_value": 0, + "script": "SevenIsland_TrainerTower_7F_EventScript_1C54AF" + }, + { + "type": "trigger", + "x": 9, + "y": 12, + "elevation": 3, + "var": "VAR_0x400F", + "var_value": 0, + "script": "SevenIsland_TrainerTower_7F_EventScript_1C54B4" + }, + { + "type": "trigger", + "x": 9, + "y": 13, + "elevation": 3, + "var": "VAR_0x400F", + "var_value": 0, + "script": "SevenIsland_TrainerTower_7F_EventScript_1C54EA" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SevenIsland_TrainerTower_8F/events.inc b/data/maps/SevenIsland_TrainerTower_8F/events.inc deleted file mode 100644 index 954156501..000000000 --- a/data/maps/SevenIsland_TrainerTower_8F/events.inc +++ /dev/null @@ -1,19 +0,0 @@ -SevenIsland_TrainerTower_8F_EventObjects: - object_event 1, 70, 0, 9, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_8F_EventScript_1646E0, 6, 0, 0 - object_event 2, 240, 0, 10, 0, 10, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_8F_EventScript_1646C8, 2, 0, 0 - object_event 3, 241, 0, 15, 0, 13, 0, 3, 9, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_8F_EventScript_1646CE, 3, 0, 0 - object_event 4, 242, 0, 10, 0, 16, 0, 3, 7, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_8F_EventScript_1646D4, 4, 0, 0 - object_event 5, 243, 0, 11, 0, 10, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_8F_EventScript_1646DA, 5, 0, 0 - -SevenIsland_TrainerTower_8F_MapWarps: - warp_def 15, 6, 3, 1, 521 - warp_def 4, 6, 3, 0, 519 - warp_def 13, 5, 0, 0, 523 - -SevenIsland_TrainerTower_8F_MapCoordEvents: - coord_event 10, 13, 3, 0, 16398, 0, 0, SevenIsland_TrainerTower_8F_EventScript_1C54AF - coord_event 9, 12, 3, 0, 16399, 0, 0, SevenIsland_TrainerTower_8F_EventScript_1C54B4 - coord_event 9, 13, 3, 0, 16399, 0, 0, SevenIsland_TrainerTower_8F_EventScript_1C54EA - -SevenIsland_TrainerTower_8F_MapEvents:: - map_events SevenIsland_TrainerTower_8F_EventObjects, SevenIsland_TrainerTower_8F_MapWarps, SevenIsland_TrainerTower_8F_MapCoordEvents, 0x0 diff --git a/data/maps/SevenIsland_TrainerTower_8F/header.inc b/data/maps/SevenIsland_TrainerTower_8F/header.inc deleted file mode 100644 index 31ff1d39b..000000000 --- a/data/maps/SevenIsland_TrainerTower_8F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SevenIsland_TrainerTower_8F:: @ 8350068 - .4byte SevenIsland_TrainerTower_8F_Layout @ 0x8343184 - .4byte SevenIsland_TrainerTower_8F_MapEvents @ 0x83B420C - .4byte SevenIsland_TrainerTower_8F_MapScripts @ 0x81647FA - .4byte NULL - .2byte BGM_FRLG_TRAINER_TOWER - .2byte 305 - .byte 0xb3, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00 diff --git a/data/maps/SevenIsland_TrainerTower_8F/map.json b/data/maps/SevenIsland_TrainerTower_8F/map.json new file mode 100644 index 000000000..cac6bbb6c --- /dev/null +++ b/data/maps/SevenIsland_TrainerTower_8F/map.json @@ -0,0 +1,135 @@ +{ + "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_8F", + "name": "SevenIsland_TrainerTower_8F", + "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_8F", + "music": "BGM_FRLG_TRAINER_TOWER", + "region_map_section": "MAPSEC_TRAINER_TOWER_2", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 2, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "70", + "x": 9, + "y": 7, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_8F_EventScript_1646E0", + "flag": "6" + }, + { + "graphics_id": "240", + "x": 10, + "y": 10, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_8F_EventScript_1646C8", + "flag": "2" + }, + { + "graphics_id": "241", + "x": 15, + "y": 13, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_8F_EventScript_1646CE", + "flag": "3" + }, + { + "graphics_id": "242", + "x": 10, + "y": 16, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_8F_EventScript_1646D4", + "flag": "4" + }, + { + "graphics_id": "243", + "x": 11, + "y": 10, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_8F_EventScript_1646DA", + "flag": "5" + } + ], + "warp_events": [ + { + "x": 15, + "y": 6, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ROOF", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 6, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_7F", + "dest_warp_id": 0 + }, + { + "x": 13, + "y": 5, + "elevation": 0, + "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 10, + "y": 13, + "elevation": 3, + "var": "VAR_0x400E", + "var_value": 0, + "script": "SevenIsland_TrainerTower_8F_EventScript_1C54AF" + }, + { + "type": "trigger", + "x": 9, + "y": 12, + "elevation": 3, + "var": "VAR_0x400F", + "var_value": 0, + "script": "SevenIsland_TrainerTower_8F_EventScript_1C54B4" + }, + { + "type": "trigger", + "x": 9, + "y": 13, + "elevation": 3, + "var": "VAR_0x400F", + "var_value": 0, + "script": "SevenIsland_TrainerTower_8F_EventScript_1C54EA" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SevenIsland_TrainerTower_Elevator/events.inc b/data/maps/SevenIsland_TrainerTower_Elevator/events.inc deleted file mode 100644 index 4bbf2d788..000000000 --- a/data/maps/SevenIsland_TrainerTower_Elevator/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -SevenIsland_TrainerTower_Elevator_MapWarps: - warp_def 2, 5, 3, 127, 32639 - -SevenIsland_TrainerTower_Elevator_MapBGEvents: - bg_event 0, 2, 0, 0, 0, SevenIsland_TrainerTower_Elevator_EventScript_164B03 - -SevenIsland_TrainerTower_Elevator_MapEvents:: - map_events 0x0, SevenIsland_TrainerTower_Elevator_MapWarps, 0x0, SevenIsland_TrainerTower_Elevator_MapBGEvents diff --git a/data/maps/SevenIsland_TrainerTower_Elevator/header.inc b/data/maps/SevenIsland_TrainerTower_Elevator/header.inc deleted file mode 100644 index 024a3656b..000000000 --- a/data/maps/SevenIsland_TrainerTower_Elevator/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SevenIsland_TrainerTower_Elevator:: @ 83500BC - .4byte SevenIsland_TrainerTower_Elevator_Layout @ 0x8343454 - .4byte SevenIsland_TrainerTower_Elevator_MapEvents @ 0x83B4330 - .4byte SevenIsland_TrainerTower_Elevator_MapScripts @ 0x8164AF8 - .4byte NULL - .2byte BGM_FRLG_TRAINER_TOWER - .2byte 307 - .byte 0xb3, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00 diff --git a/data/maps/SevenIsland_TrainerTower_Elevator/map.json b/data/maps/SevenIsland_TrainerTower_Elevator/map.json new file mode 100644 index 000000000..0525e1da2 --- /dev/null +++ b/data/maps/SevenIsland_TrainerTower_Elevator/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR", + "name": "SevenIsland_TrainerTower_Elevator", + "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR", + "music": "BGM_FRLG_TRAINER_TOWER", + "region_map_section": "MAPSEC_TRAINER_TOWER_2", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 2, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 2, + "y": 5, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 0, + "y": 2, + "elevation": 0, + "script": "SevenIsland_TrainerTower_Elevator_EventScript_164B03" + } + ] +} \ No newline at end of file diff --git a/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc b/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc index 725b043e5..b956d3aca 100644 --- a/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc @@ -45,7 +45,7 @@ EventScript_164B5E:: @ 8164B5E EventScript_164B90:: @ 8164B90 setvar VAR_0x8006, 3 - setdynamicwarp MAP_SEVEN_ISLAND_TRAINERTOWER_LOBBY, 255, 17, 8 + setdynamicwarp MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY, 255, 17, 8 compare_var_to_value VAR_0x403A, 3 goto_if 1, EventScript_164BD3 call EventScript_164BD8 @@ -54,7 +54,7 @@ EventScript_164B90:: @ 8164B90 delay 25 applymovement 255, Movement_164BE5 waitmovement 0 - warp MAP_SEVEN_ISLAND_TRAINERTOWER_LOBBY, 255, 17, 8 + warp MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY, 255, 17, 8 waitstate releaseall end diff --git a/data/maps/SevenIsland_TrainerTower_Lobby/events.inc b/data/maps/SevenIsland_TrainerTower_Lobby/events.inc deleted file mode 100644 index 6a4caa607..000000000 --- a/data/maps/SevenIsland_TrainerTower_Lobby/events.inc +++ /dev/null @@ -1,20 +0,0 @@ -SevenIsland_TrainerTower_Lobby_EventObjects: - object_event 1, 64, 0, 4, 0, 9, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_Lobby_EventScript_16495D, 0, 0, 0 - object_event 2, 66, 0, 14, 0, 9, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_Lobby_EventScript_164992, 0, 0, 0 - object_event 3, 66, 0, 11, 0, 7, 0, 3, 9, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_Lobby_EventScript_164966, 0, 0, 0 - object_event 4, 42, 0, 12, 0, 13, 0, 3, 2, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_Lobby_EventScript_164AE6, 0, 0, 0 - object_event 5, 30, 0, 2, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_Lobby_EventScript_164AEF, 0, 0, 0 - -SevenIsland_TrainerTower_Lobby_MapWarps: - warp_def 9, 2, 3, 1, 513 - warp_def 9, 15, 3, 0, 830 - warp_def 17, 8, 0, 0, 523 - -SevenIsland_TrainerTower_Lobby_MapCoordEvents: - coord_event 9, 7, 3, 0, 16514, 0, 0, SevenIsland_TrainerTower_Lobby_EventScript_1649CE - -SevenIsland_TrainerTower_Lobby_MapBGEvents: - bg_event 8, 10, 0, 1, 0, SevenIsland_TrainerTower_Lobby_EventScript_164AD8 - -SevenIsland_TrainerTower_Lobby_MapEvents:: - map_events SevenIsland_TrainerTower_Lobby_EventObjects, SevenIsland_TrainerTower_Lobby_MapWarps, SevenIsland_TrainerTower_Lobby_MapCoordEvents, SevenIsland_TrainerTower_Lobby_MapBGEvents diff --git a/data/maps/SevenIsland_TrainerTower_Lobby/header.inc b/data/maps/SevenIsland_TrainerTower_Lobby/header.inc deleted file mode 100644 index 243fe1a15..000000000 --- a/data/maps/SevenIsland_TrainerTower_Lobby/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SevenIsland_TrainerTower_Lobby:: @ 83500A0 - .4byte SevenIsland_TrainerTower_Lobby_Layout @ 0x8341D44 - .4byte SevenIsland_TrainerTower_Lobby_MapEvents @ 0x83B4308 - .4byte SevenIsland_TrainerTower_Lobby_MapScripts @ 0x8164839 - .4byte NULL - .2byte BGM_FRLG_TRAINER_TOWER - .2byte 297 - .byte 0xb3, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00 diff --git a/data/maps/SevenIsland_TrainerTower_Lobby/map.json b/data/maps/SevenIsland_TrainerTower_Lobby/map.json new file mode 100644 index 000000000..fcda1fb2e --- /dev/null +++ b/data/maps/SevenIsland_TrainerTower_Lobby/map.json @@ -0,0 +1,125 @@ +{ + "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY", + "name": "SevenIsland_TrainerTower_Lobby", + "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_LOBBY", + "music": "BGM_FRLG_TRAINER_TOWER", + "region_map_section": "MAPSEC_TRAINER_TOWER_2", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 2, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "64", + "x": 4, + "y": 9, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_Lobby_EventScript_16495D", + "flag": "0" + }, + { + "graphics_id": "66", + "x": 14, + "y": 9, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_Lobby_EventScript_164992", + "flag": "0" + }, + { + "graphics_id": "66", + "x": 11, + "y": 7, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_Lobby_EventScript_164966", + "flag": "0" + }, + { + "graphics_id": "42", + "x": 12, + "y": 13, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_Lobby_EventScript_164AE6", + "flag": "0" + }, + { + "graphics_id": "30", + "x": 2, + "y": 12, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_Lobby_EventScript_164AEF", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 9, + "y": 2, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_1F", + "dest_warp_id": 1 + }, + { + "x": 9, + "y": 15, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER", + "dest_warp_id": 0 + }, + { + "x": 17, + "y": 8, + "elevation": 0, + "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 9, + "y": 7, + "elevation": 3, + "var": "VAR_0x4082", + "var_value": 0, + "script": "SevenIsland_TrainerTower_Lobby_EventScript_1649CE" + } + ], + "bg_events": [ + { + "type": "bg_event_type_1", + "x": 8, + "y": 10, + "elevation": 0, + "script": "SevenIsland_TrainerTower_Lobby_EventScript_164AD8" + } + ] +} \ No newline at end of file diff --git a/data/maps/SevenIsland_TrainerTower_Roof/events.inc b/data/maps/SevenIsland_TrainerTower_Roof/events.inc deleted file mode 100644 index c4453519c..000000000 --- a/data/maps/SevenIsland_TrainerTower_Roof/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -SevenIsland_TrainerTower_Roof_EventObjects: - object_event 1, 70, 0, 9, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, SevenIsland_TrainerTower_Roof_EventScript_1646E0, 6, 0, 0 - -SevenIsland_TrainerTower_Roof_MapWarps: - warp_def 13, 5, 0, 0, 523 - warp_def 4, 6, 3, 0, 520 - -SevenIsland_TrainerTower_Roof_MapEvents:: - map_events SevenIsland_TrainerTower_Roof_EventObjects, SevenIsland_TrainerTower_Roof_MapWarps, 0x0, 0x0 diff --git a/data/maps/SevenIsland_TrainerTower_Roof/header.inc b/data/maps/SevenIsland_TrainerTower_Roof/header.inc deleted file mode 100644 index da106ecba..000000000 --- a/data/maps/SevenIsland_TrainerTower_Roof/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SevenIsland_TrainerTower_Roof:: @ 8350084 - .4byte SevenIsland_TrainerTower_Roof_Layout @ 0x83433E8 - .4byte SevenIsland_TrainerTower_Roof_MapEvents @ 0x83B4248 - .4byte SevenIsland_TrainerTower_Roof_MapScripts @ 0x8164828 - .4byte NULL - .2byte BGM_FRLG_TRAINER_TOWER - .2byte 306 - .byte 0xb3, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00 diff --git a/data/maps/SevenIsland_TrainerTower_Roof/map.json b/data/maps/SevenIsland_TrainerTower_Roof/map.json new file mode 100644 index 000000000..23e94c0be --- /dev/null +++ b/data/maps/SevenIsland_TrainerTower_Roof/map.json @@ -0,0 +1,48 @@ +{ + "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ROOF", + "name": "SevenIsland_TrainerTower_Roof", + "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_ROOF", + "music": "BGM_FRLG_TRAINER_TOWER", + "region_map_section": "MAPSEC_TRAINER_TOWER_2", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 2, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "70", + "x": 9, + "y": 7, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SevenIsland_TrainerTower_Roof_EventScript_1646E0", + "flag": "6" + } + ], + "warp_events": [ + { + "x": 13, + "y": 5, + "elevation": 0, + "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 6, + "elevation": 3, + "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_8F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SilphCo_10F/events.inc b/data/maps/SilphCo_10F/events.inc deleted file mode 100644 index fac92e748..000000000 --- a/data/maps/SilphCo_10F/events.inc +++ /dev/null @@ -1,26 +0,0 @@ -SilphCo_10F_EventObjects: - object_event 1, 55, 0, 2, 0, 7, 0, 3, 2, 34, 0, 1, 0, 1, 0, SilphCo_10F_EventScript_161DC0, 83, 0, 0 - object_event 2, 48, 0, 10, 0, 17, 0, 3, 8, 17, 0, 0, 0, 0, 0, SilphCo_10F_EventScript_161D96, 0, 0, 0 - object_event 3, 49, 0, 0, 0, 13, 0, 3, 10, 17, 0, 1, 0, 4, 0, SilphCo_10F_EventScript_161DD7, 83, 0, 0 - object_event 4, 92, 0, 5, 0, 15, 0, 3, 8, 17, 0, 0, 0, 0, 0, SilphCo_10F_EventScript_1BE8F5, 407, 0, 0 - object_event 5, 92, 0, 2, 0, 15, 0, 3, 8, 17, 0, 0, 0, 0, 0, SilphCo_10F_EventScript_1BE902, 408, 0, 0 - object_event 6, 92, 0, 3, 0, 17, 0, 3, 8, 17, 0, 0, 0, 0, 0, SilphCo_10F_EventScript_1BE90F, 409, 0, 0 - -SilphCo_10F_MapWarps: - warp_def 6, 2, 3, 0, 313 - warp_def 10, 14, 3, 3, 306 - warp_def 14, 9, 3, 5, 306 - warp_def 8, 2, 3, 3, 311 - warp_def 14, 17, 3, 4, 306 - warp_def 13, 3, 0, 0, 314 - -SilphCo_10F_MapBGEvents: - bg_event 12, 11, 0, 0, 0, SilphCo_10F_EventScript_1A8AEF - bg_event 13, 11, 0, 0, 0, SilphCo_10F_EventScript_1A8AEF - bg_event 12, 12, 0, 0, 0, SilphCo_10F_EventScript_1A8AEF - bg_event 13, 12, 0, 0, 0, SilphCo_10F_EventScript_1A8AEF - bg_event 9, 9, 0, 7, 0, 63, 143, 1 - bg_event 7, 1, 0, 0, 0, SilphCo_10F_EventScript_161DB7 - -SilphCo_10F_MapEvents:: - map_events SilphCo_10F_EventObjects, SilphCo_10F_MapWarps, 0x0, SilphCo_10F_MapBGEvents diff --git a/data/maps/SilphCo_10F/header.inc b/data/maps/SilphCo_10F/header.inc deleted file mode 100644 index 32d229ed3..000000000 --- a/data/maps/SilphCo_10F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SilphCo_10F:: @ 834F834 - .4byte SilphCo_10F_Layout @ 0x830A0E8 - .4byte SilphCo_10F_MapEvents @ 0x83B0A20 - .4byte SilphCo_10F_MapScripts @ 0x8161D86 - .4byte NULL - .2byte BGM_FRLG_SILPH - .2byte 141 - .byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x07, 0x0a, 0x00 diff --git a/data/maps/SilphCo_10F/map.json b/data/maps/SilphCo_10F/map.json new file mode 100644 index 000000000..d921ece8a --- /dev/null +++ b/data/maps/SilphCo_10F/map.json @@ -0,0 +1,186 @@ +{ + "id": "MAP_SILPH_CO_10F", + "name": "SilphCo_10F", + "layout": "LAYOUT_SILPH_CO_10F", + "music": "BGM_FRLG_SILPH", + "region_map_section": "MAPSEC_SILPH_CO", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 7, + "elevator_flag": 10, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "55", + "x": 2, + "y": 7, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 2, + "movement_range_y": 2, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SilphCo_10F_EventScript_161DC0", + "flag": "83" + }, + { + "graphics_id": "48", + "x": 10, + "y": 17, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SilphCo_10F_EventScript_161D96", + "flag": "0" + }, + { + "graphics_id": "49", + "x": 0, + "y": 13, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "SilphCo_10F_EventScript_161DD7", + "flag": "83" + }, + { + "graphics_id": "92", + "x": 5, + "y": 15, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SilphCo_10F_EventScript_1BE8F5", + "flag": "407" + }, + { + "graphics_id": "92", + "x": 2, + "y": 15, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SilphCo_10F_EventScript_1BE902", + "flag": "408" + }, + { + "graphics_id": "92", + "x": 3, + "y": 17, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SilphCo_10F_EventScript_1BE90F", + "flag": "409" + } + ], + "warp_events": [ + { + "x": 6, + "y": 2, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_11F", + "dest_warp_id": 0 + }, + { + "x": 10, + "y": 14, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_4F", + "dest_warp_id": 3 + }, + { + "x": 14, + "y": 9, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_4F", + "dest_warp_id": 5 + }, + { + "x": 8, + "y": 2, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_9F", + "dest_warp_id": 3 + }, + { + "x": 14, + "y": 17, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_4F", + "dest_warp_id": 4 + }, + { + "x": 13, + "y": 3, + "elevation": 0, + "dest_map": "MAP_SILPH_CO_ELEVATOR", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 12, + "y": 11, + "elevation": 0, + "script": "SilphCo_10F_EventScript_1A8AEF" + }, + { + "type": "bg_event_type_0", + "x": 13, + "y": 11, + "elevation": 0, + "script": "SilphCo_10F_EventScript_1A8AEF" + }, + { + "type": "bg_event_type_0", + "x": 12, + "y": 12, + "elevation": 0, + "script": "SilphCo_10F_EventScript_1A8AEF" + }, + { + "type": "bg_event_type_0", + "x": 13, + "y": 12, + "elevation": 0, + "script": "SilphCo_10F_EventScript_1A8AEF" + }, + { + "type": "hidden_item", + "x": 9, + "y": 9, + "elevation": 0, + "item": "ITEM_HP_UP", + "flag": "143", + "unknown": 1 + }, + { + "type": "bg_event_type_0", + "x": 7, + "y": 1, + "elevation": 0, + "script": "SilphCo_10F_EventScript_161DB7" + } + ] +} \ No newline at end of file diff --git a/data/maps/SilphCo_11F/events.inc b/data/maps/SilphCo_11F/events.inc deleted file mode 100644 index 1621f58ec..000000000 --- a/data/maps/SilphCo_11F/events.inc +++ /dev/null @@ -1,27 +0,0 @@ -SilphCo_11F_EventObjects: - object_event 1, 33, 0, 9, 0, 9, 0, 3, 8, 17, 0, 0, 0, 0, 0, SilphCo_11F_EventScript_161DFE, 0, 0, 0 - object_event 2, 48, 0, 11, 0, 9, 0, 3, 8, 17, 0, 0, 0, 0, 0, SilphCo_11F_EventScript_161E7F, 0, 0, 0 - object_event 3, 87, 0, 6, 0, 11, 0, 3, 10, 17, 0, 0, 0, 0, 0, 0x0, 83, 0, 0 - object_event 4, 49, 0, 16, 0, 12, 0, 3, 7, 17, 0, 1, 0, 5, 0, SilphCo_11F_EventScript_161F40, 83, 0, 0 - object_event 5, 92, 0, 16, 0, 18, 0, 3, 8, 17, 0, 0, 0, 0, 0, SilphCo_11F_EventScript_1BEB58, 457, 0, 0 - object_event 6, 49, 0, 2, 0, 19, 0, 3, 7, 17, 0, 1, 0, 5, 0, SilphCo_11F_EventScript_161F57, 83, 0, 0 - -SilphCo_11F_MapWarps: - warp_def 7, 2, 3, 0, 312 - warp_def 2, 5, 3, 1, 309 - warp_def 13, 3, 0, 0, 314 - -SilphCo_11F_MapCoordEvents: - coord_event 5, 15, 3, 0, 16480, 0, 0, SilphCo_11F_EventScript_161E88 - coord_event 6, 15, 3, 0, 16480, 0, 0, SilphCo_11F_EventScript_161E94 - -SilphCo_11F_MapBGEvents: - bg_event 5, 16, 3, 0, 0, SilphCo_11F_EventScript_1A8B09 - bg_event 5, 17, 3, 0, 0, SilphCo_11F_EventScript_1A8B09 - bg_event 6, 16, 3, 0, 0, SilphCo_11F_EventScript_1A8B09 - bg_event 6, 17, 3, 0, 0, SilphCo_11F_EventScript_1A8B09 - bg_event 10, 18, 0, 7, 0, 24, 144, 1 - bg_event 8, 1, 0, 0, 0, SilphCo_11F_EventScript_161F37 - -SilphCo_11F_MapEvents:: - map_events SilphCo_11F_EventObjects, SilphCo_11F_MapWarps, SilphCo_11F_MapCoordEvents, SilphCo_11F_MapBGEvents diff --git a/data/maps/SilphCo_11F/header.inc b/data/maps/SilphCo_11F/header.inc deleted file mode 100644 index d451aa3bf..000000000 --- a/data/maps/SilphCo_11F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SilphCo_11F:: @ 834F850 - .4byte SilphCo_11F_Layout @ 0x830A3B4 - .4byte SilphCo_11F_MapEvents @ 0x83B0B44 - .4byte SilphCo_11F_MapScripts @ 0x8161DEE - .4byte NULL - .2byte BGM_FRLG_SILPH - .2byte 142 - .byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x07, 0x0b, 0x00 diff --git a/data/maps/SilphCo_11F/map.json b/data/maps/SilphCo_11F/map.json new file mode 100644 index 000000000..5f9090f8b --- /dev/null +++ b/data/maps/SilphCo_11F/map.json @@ -0,0 +1,184 @@ +{ + "id": "MAP_SILPH_CO_11F", + "name": "SilphCo_11F", + "layout": "LAYOUT_SILPH_CO_11F", + "music": "BGM_FRLG_SILPH", + "region_map_section": "MAPSEC_SILPH_CO", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 7, + "elevator_flag": 11, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "33", + "x": 9, + "y": 9, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SilphCo_11F_EventScript_161DFE", + "flag": "0" + }, + { + "graphics_id": "48", + "x": 11, + "y": 9, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SilphCo_11F_EventScript_161E7F", + "flag": "0" + }, + { + "graphics_id": "87", + "x": 6, + "y": 11, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "83" + }, + { + "graphics_id": "49", + "x": 16, + "y": 12, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "SilphCo_11F_EventScript_161F40", + "flag": "83" + }, + { + "graphics_id": "92", + "x": 16, + "y": 18, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SilphCo_11F_EventScript_1BEB58", + "flag": "457" + }, + { + "graphics_id": "49", + "x": 2, + "y": 19, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "SilphCo_11F_EventScript_161F57", + "flag": "83" + } + ], + "warp_events": [ + { + "x": 7, + "y": 2, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_10F", + "dest_warp_id": 0 + }, + { + "x": 2, + "y": 5, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_7F", + "dest_warp_id": 1 + }, + { + "x": 13, + "y": 3, + "elevation": 0, + "dest_map": "MAP_SILPH_CO_ELEVATOR", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 5, + "y": 15, + "elevation": 3, + "var": "VAR_0x4060", + "var_value": 0, + "script": "SilphCo_11F_EventScript_161E88" + }, + { + "type": "trigger", + "x": 6, + "y": 15, + "elevation": 3, + "var": "VAR_0x4060", + "var_value": 0, + "script": "SilphCo_11F_EventScript_161E94" + } + ], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 5, + "y": 16, + "elevation": 3, + "script": "SilphCo_11F_EventScript_1A8B09" + }, + { + "type": "bg_event_type_0", + "x": 5, + "y": 17, + "elevation": 3, + "script": "SilphCo_11F_EventScript_1A8B09" + }, + { + "type": "bg_event_type_0", + "x": 6, + "y": 16, + "elevation": 3, + "script": "SilphCo_11F_EventScript_1A8B09" + }, + { + "type": "bg_event_type_0", + "x": 6, + "y": 17, + "elevation": 3, + "script": "SilphCo_11F_EventScript_1A8B09" + }, + { + "type": "hidden_item", + "x": 10, + "y": 18, + "elevation": 0, + "item": "ITEM_REVIVE", + "flag": "144", + "unknown": 1 + }, + { + "type": "bg_event_type_0", + "x": 8, + "y": 1, + "elevation": 0, + "script": "SilphCo_11F_EventScript_161F37" + } + ] +} \ No newline at end of file diff --git a/data/maps/SilphCo_1F/events.inc b/data/maps/SilphCo_1F/events.inc deleted file mode 100644 index 2b23153f7..000000000 --- a/data/maps/SilphCo_1F/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -SilphCo_1F_EventObjects: - object_event 1, 48, 0, 3, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, SilphCo_1F_EventScript_16162F, 63, 0, 0 - -SilphCo_1F_MapWarps: - warp_def 7, 21, 0, 0, 778 - warp_def 8, 20, 3, 0, 778 - warp_def 9, 20, 3, 0, 778 - warp_def 31, 2, 3, 3, 304 - warp_def 22, 3, 0, 0, 314 - -SilphCo_1F_MapBGEvents: - bg_event 30, 1, 0, 0, 0, SilphCo_1F_EventScript_161638 - -SilphCo_1F_MapEvents:: - map_events SilphCo_1F_EventObjects, SilphCo_1F_MapWarps, 0x0, SilphCo_1F_MapBGEvents diff --git a/data/maps/SilphCo_1F/header.inc b/data/maps/SilphCo_1F/header.inc deleted file mode 100644 index e1dca1251..000000000 --- a/data/maps/SilphCo_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SilphCo_1F:: @ 834F738 - .4byte SilphCo_1F_Layout @ 0x83071EC - .4byte SilphCo_1F_MapEvents @ 0x83AFCE0 - .4byte SilphCo_1F_MapScripts @ 0x8161625 - .4byte NULL - .2byte BGM_FRLG_SILPH - .2byte 132 - .byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x07, 0x01, 0x00 diff --git a/data/maps/SilphCo_1F/map.json b/data/maps/SilphCo_1F/map.json new file mode 100644 index 000000000..5cf3e4082 --- /dev/null +++ b/data/maps/SilphCo_1F/map.json @@ -0,0 +1,77 @@ +{ + "id": "MAP_SILPH_CO_1F", + "name": "SilphCo_1F", + "layout": "LAYOUT_SILPH_CO_1F", + "music": "BGM_FRLG_SILPH", + "region_map_section": "MAPSEC_SILPH_CO", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 7, + "elevator_flag": 1, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "48", + "x": 3, + "y": 7, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SilphCo_1F_EventScript_16162F", + "flag": "63" + } + ], + "warp_events": [ + { + "x": 7, + "y": 21, + "elevation": 0, + "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_warp_id": 0 + }, + { + "x": 8, + "y": 20, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 20, + "elevation": 3, + "dest_map": "MAP_SAFFRON_CITY_DUPLICATE", + "dest_warp_id": 0 + }, + { + "x": 31, + "y": 2, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_2F", + "dest_warp_id": 3 + }, + { + "x": 22, + "y": 3, + "elevation": 0, + "dest_map": "MAP_SILPH_CO_ELEVATOR", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 30, + "y": 1, + "elevation": 0, + "script": "SilphCo_1F_EventScript_161638" + } + ] +} \ No newline at end of file diff --git a/data/maps/SilphCo_2F/events.inc b/data/maps/SilphCo_2F/events.inc deleted file mode 100644 index 166629955..000000000 --- a/data/maps/SilphCo_2F/events.inc +++ /dev/null @@ -1,30 +0,0 @@ -SilphCo_2F_EventObjects: - object_event 1, 49, 0, 29, 0, 12, 0, 3, 7, 17, 0, 1, 0, 5, 0, SilphCo_2F_EventScript_1616AE, 83, 0, 0 - object_event 2, 55, 0, 28, 0, 18, 0, 3, 15, 17, 0, 1, 0, 4, 0, SilphCo_2F_EventScript_161680, 83, 0, 0 - object_event 3, 49, 0, 20, 0, 14, 0, 3, 13, 17, 0, 1, 0, 3, 0, SilphCo_2F_EventScript_161697, 83, 0, 0 - object_event 4, 55, 0, 5, 0, 19, 0, 3, 1, 17, 0, 1, 0, 0, 0, SilphCo_2F_EventScript_161669, 83, 0, 0 - object_event 5, 28, 0, 10, 0, 4, 0, 0, 7, 17, 0, 0, 0, 0, 0, SilphCo_2F_EventScript_16165A, 0, 0, 0 - -SilphCo_2F_MapWarps: - warp_def 28, 2, 3, 0, 305 - warp_def 2, 6, 3, 8, 305 - warp_def 15, 6, 3, 5, 310 - warp_def 30, 2, 3, 3, 303 - warp_def 7, 19, 3, 1, 308 - warp_def 33, 19, 3, 2, 310 - warp_def 22, 3, 0, 0, 314 - -SilphCo_2F_MapBGEvents: - bg_event 5, 8, 0, 0, 0, SilphCo_2F_EventScript_1A891B - bg_event 6, 8, 0, 0, 0, SilphCo_2F_EventScript_1A891B - bg_event 5, 9, 0, 0, 0, SilphCo_2F_EventScript_1A891B - bg_event 6, 9, 0, 0, 0, SilphCo_2F_EventScript_1A891B - bg_event 5, 15, 0, 0, 0, SilphCo_2F_EventScript_1A8935 - bg_event 6, 15, 0, 0, 0, SilphCo_2F_EventScript_1A8935 - bg_event 5, 16, 0, 0, 0, SilphCo_2F_EventScript_1A8935 - bg_event 6, 16, 0, 0, 0, SilphCo_2F_EventScript_1A8935 - bg_event 11, 21, 0, 7, 0, 2, 135, 1 - bg_event 29, 1, 0, 0, 0, SilphCo_2F_EventScript_161660 - -SilphCo_2F_MapEvents:: - map_events SilphCo_2F_EventObjects, SilphCo_2F_MapWarps, 0x0, SilphCo_2F_MapBGEvents diff --git a/data/maps/SilphCo_2F/header.inc b/data/maps/SilphCo_2F/header.inc deleted file mode 100644 index 17274ac84..000000000 --- a/data/maps/SilphCo_2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SilphCo_2F:: @ 834F754 - .4byte SilphCo_2F_Layout @ 0x8307840 - .4byte SilphCo_2F_MapEvents @ 0x83AFE1C - .4byte SilphCo_2F_MapScripts @ 0x8161641 - .4byte NULL - .2byte BGM_FRLG_SILPH - .2byte 133 - .byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x07, 0x02, 0x00 diff --git a/data/maps/SilphCo_2F/map.json b/data/maps/SilphCo_2F/map.json new file mode 100644 index 000000000..5e1d73414 --- /dev/null +++ b/data/maps/SilphCo_2F/map.json @@ -0,0 +1,208 @@ +{ + "id": "MAP_SILPH_CO_2F", + "name": "SilphCo_2F", + "layout": "LAYOUT_SILPH_CO_2F", + "music": "BGM_FRLG_SILPH", + "region_map_section": "MAPSEC_SILPH_CO", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 7, + "elevator_flag": 2, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "49", + "x": 29, + "y": 12, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "SilphCo_2F_EventScript_1616AE", + "flag": "83" + }, + { + "graphics_id": "55", + "x": 28, + "y": 18, + "elevation": 3, + "movement_type": "15", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "SilphCo_2F_EventScript_161680", + "flag": "83" + }, + { + "graphics_id": "49", + "x": 20, + "y": 14, + "elevation": 3, + "movement_type": "13", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SilphCo_2F_EventScript_161697", + "flag": "83" + }, + { + "graphics_id": "55", + "x": 5, + "y": 19, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "SilphCo_2F_EventScript_161669", + "flag": "83" + }, + { + "graphics_id": "28", + "x": 10, + "y": 4, + "elevation": 0, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SilphCo_2F_EventScript_16165A", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 28, + "y": 2, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_3F", + "dest_warp_id": 0 + }, + { + "x": 2, + "y": 6, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_3F", + "dest_warp_id": 8 + }, + { + "x": 15, + "y": 6, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_8F", + "dest_warp_id": 5 + }, + { + "x": 30, + "y": 2, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_1F", + "dest_warp_id": 3 + }, + { + "x": 7, + "y": 19, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_6F", + "dest_warp_id": 1 + }, + { + "x": 33, + "y": 19, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_8F", + "dest_warp_id": 2 + }, + { + "x": 22, + "y": 3, + "elevation": 0, + "dest_map": "MAP_SILPH_CO_ELEVATOR", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 5, + "y": 8, + "elevation": 0, + "script": "SilphCo_2F_EventScript_1A891B" + }, + { + "type": "bg_event_type_0", + "x": 6, + "y": 8, + "elevation": 0, + "script": "SilphCo_2F_EventScript_1A891B" + }, + { + "type": "bg_event_type_0", + "x": 5, + "y": 9, + "elevation": 0, + "script": "SilphCo_2F_EventScript_1A891B" + }, + { + "type": "bg_event_type_0", + "x": 6, + "y": 9, + "elevation": 0, + "script": "SilphCo_2F_EventScript_1A891B" + }, + { + "type": "bg_event_type_0", + "x": 5, + "y": 15, + "elevation": 0, + "script": "SilphCo_2F_EventScript_1A8935" + }, + { + "type": "bg_event_type_0", + "x": 6, + "y": 15, + "elevation": 0, + "script": "SilphCo_2F_EventScript_1A8935" + }, + { + "type": "bg_event_type_0", + "x": 5, + "y": 16, + "elevation": 0, + "script": "SilphCo_2F_EventScript_1A8935" + }, + { + "type": "bg_event_type_0", + "x": 6, + "y": 16, + "elevation": 0, + "script": "SilphCo_2F_EventScript_1A8935" + }, + { + "type": "hidden_item", + "x": 11, + "y": 21, + "elevation": 0, + "item": "POCKET_KEY_ITEMS", + "flag": "135", + "unknown": 1 + }, + { + "type": "bg_event_type_0", + "x": 29, + "y": 1, + "elevation": 0, + "script": "SilphCo_2F_EventScript_161660" + } + ] +} \ No newline at end of file diff --git a/data/maps/SilphCo_3F/events.inc b/data/maps/SilphCo_3F/events.inc deleted file mode 100644 index 7db296662..000000000 --- a/data/maps/SilphCo_3F/events.inc +++ /dev/null @@ -1,32 +0,0 @@ -SilphCo_3F_EventObjects: - object_event 1, 49, 0, 25, 0, 9, 0, 3, 9, 17, 0, 1, 0, 3, 0, SilphCo_3F_EventScript_16171F, 83, 0, 0 - object_event 2, 47, 0, 31, 0, 13, 0, 3, 1, 17, 0, 0, 0, 0, 0, SilphCo_3F_EventScript_1616DE, 0, 0, 0 - object_event 3, 55, 0, 4, 0, 12, 0, 3, 1, 17, 0, 1, 0, 0, 0, SilphCo_3F_EventScript_161708, 83, 0, 0 - object_event 4, 92, 0, 8, 0, 10, 0, 3, 8, 17, 0, 0, 0, 0, 0, SilphCo_3F_EventScript_1BE866, 396, 0, 0 - -SilphCo_3F_MapWarps: - warp_def 28, 2, 3, 0, 304 - warp_def 4, 6, 3, 1, 307 - warp_def 13, 14, 3, 4, 309 - warp_def 30, 2, 3, 2, 306 - warp_def 2, 14, 3, 2, 311 - warp_def 3, 20, 3, 4, 307 - warp_def 29, 14, 3, 7, 305 - warp_def 32, 20, 3, 6, 305 - warp_def 33, 5, 3, 1, 304 - warp_def 22, 3, 0, 0, 314 - -SilphCo_3F_MapBGEvents: - bg_event 10, 12, 3, 0, 0, SilphCo_3F_EventScript_1A894F - bg_event 10, 13, 3, 0, 0, SilphCo_3F_EventScript_1A894F - bg_event 21, 12, 3, 0, 0, SilphCo_3F_EventScript_1A8969 - bg_event 21, 13, 3, 0, 0, SilphCo_3F_EventScript_1A8969 - bg_event 9, 12, 3, 0, 0, SilphCo_3F_EventScript_1A894F - bg_event 9, 13, 3, 0, 0, SilphCo_3F_EventScript_1A894F - bg_event 20, 12, 3, 0, 0, SilphCo_3F_EventScript_1A8969 - bg_event 20, 13, 3, 0, 0, SilphCo_3F_EventScript_1A8969 - bg_event 34, 18, 0, 7, 0, 64, 136, 1 - bg_event 29, 1, 0, 0, 0, SilphCo_3F_EventScript_1616FF - -SilphCo_3F_MapEvents:: - map_events SilphCo_3F_EventObjects, SilphCo_3F_MapWarps, 0x0, SilphCo_3F_MapBGEvents diff --git a/data/maps/SilphCo_3F/header.inc b/data/maps/SilphCo_3F/header.inc deleted file mode 100644 index 823d84c46..000000000 --- a/data/maps/SilphCo_3F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SilphCo_3F:: @ 834F770 - .4byte SilphCo_3F_Layout @ 0x8307E94 - .4byte SilphCo_3F_MapEvents @ 0x83AFF58 - .4byte SilphCo_3F_MapScripts @ 0x81616C5 - .4byte NULL - .2byte BGM_FRLG_SILPH - .2byte 134 - .byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x07, 0x03, 0x00 diff --git a/data/maps/SilphCo_3F/map.json b/data/maps/SilphCo_3F/map.json new file mode 100644 index 000000000..e1466fec7 --- /dev/null +++ b/data/maps/SilphCo_3F/map.json @@ -0,0 +1,216 @@ +{ + "id": "MAP_SILPH_CO_3F", + "name": "SilphCo_3F", + "layout": "LAYOUT_SILPH_CO_3F", + "music": "BGM_FRLG_SILPH", + "region_map_section": "MAPSEC_SILPH_CO", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 7, + "elevator_flag": 3, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "49", + "x": 25, + "y": 9, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SilphCo_3F_EventScript_16171F", + "flag": "83" + }, + { + "graphics_id": "47", + "x": 31, + "y": 13, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SilphCo_3F_EventScript_1616DE", + "flag": "0" + }, + { + "graphics_id": "55", + "x": 4, + "y": 12, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "SilphCo_3F_EventScript_161708", + "flag": "83" + }, + { + "graphics_id": "92", + "x": 8, + "y": 10, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SilphCo_3F_EventScript_1BE866", + "flag": "396" + } + ], + "warp_events": [ + { + "x": 28, + "y": 2, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_2F", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 6, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_5F", + "dest_warp_id": 1 + }, + { + "x": 13, + "y": 14, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_7F", + "dest_warp_id": 4 + }, + { + "x": 30, + "y": 2, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_4F", + "dest_warp_id": 2 + }, + { + "x": 2, + "y": 14, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_9F", + "dest_warp_id": 2 + }, + { + "x": 3, + "y": 20, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_5F", + "dest_warp_id": 4 + }, + { + "x": 29, + "y": 14, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_3F", + "dest_warp_id": 7 + }, + { + "x": 32, + "y": 20, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_3F", + "dest_warp_id": 6 + }, + { + "x": 33, + "y": 5, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_2F", + "dest_warp_id": 1 + }, + { + "x": 22, + "y": 3, + "elevation": 0, + "dest_map": "MAP_SILPH_CO_ELEVATOR", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 10, + "y": 12, + "elevation": 3, + "script": "SilphCo_3F_EventScript_1A894F" + }, + { + "type": "bg_event_type_0", + "x": 10, + "y": 13, + "elevation": 3, + "script": "SilphCo_3F_EventScript_1A894F" + }, + { + "type": "bg_event_type_0", + "x": 21, + "y": 12, + "elevation": 3, + "script": "SilphCo_3F_EventScript_1A8969" + }, + { + "type": "bg_event_type_0", + "x": 21, + "y": 13, + "elevation": 3, + "script": "SilphCo_3F_EventScript_1A8969" + }, + { + "type": "bg_event_type_0", + "x": 9, + "y": 12, + "elevation": 3, + "script": "SilphCo_3F_EventScript_1A894F" + }, + { + "type": "bg_event_type_0", + "x": 9, + "y": 13, + "elevation": 3, + "script": "SilphCo_3F_EventScript_1A894F" + }, + { + "type": "bg_event_type_0", + "x": 20, + "y": 12, + "elevation": 3, + "script": "SilphCo_3F_EventScript_1A8969" + }, + { + "type": "bg_event_type_0", + "x": 20, + "y": 13, + "elevation": 3, + "script": "SilphCo_3F_EventScript_1A8969" + }, + { + "type": "hidden_item", + "x": 34, + "y": 18, + "elevation": 0, + "item": "ITEM_PROTEIN", + "flag": "136", + "unknown": 1 + }, + { + "type": "bg_event_type_0", + "x": 29, + "y": 1, + "elevation": 0, + "script": "SilphCo_3F_EventScript_1616FF" + } + ] +} \ No newline at end of file diff --git a/data/maps/SilphCo_4F/events.inc b/data/maps/SilphCo_4F/events.inc deleted file mode 100644 index 175e147b8..000000000 --- a/data/maps/SilphCo_4F/events.inc +++ /dev/null @@ -1,33 +0,0 @@ -SilphCo_4F_EventObjects: - object_event 1, 49, 0, 33, 0, 16, 0, 3, 2, 17, 0, 1, 0, 1, 0, SilphCo_4F_EventScript_1617A7, 83, 0, 0 - object_event 2, 49, 0, 10, 0, 19, 0, 3, 10, 17, 0, 1, 0, 5, 0, SilphCo_4F_EventScript_161790, 83, 0, 0 - object_event 3, 55, 0, 14, 0, 8, 0, 3, 17, 17, 0, 1, 0, 2, 0, SilphCo_4F_EventScript_161779, 83, 0, 0 - object_event 4, 47, 0, 5, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, SilphCo_4F_EventScript_16174F, 0, 0, 0 - object_event 5, 92, 0, 3, 0, 11, 0, 3, 8, 17, 0, 0, 0, 0, 0, SilphCo_4F_EventScript_1BE873, 397, 0, 0 - object_event 6, 92, 0, 4, 0, 12, 0, 3, 8, 17, 0, 0, 0, 0, 0, SilphCo_4F_EventScript_1BE880, 398, 0, 0 - object_event 7, 92, 0, 2, 0, 13, 0, 3, 8, 17, 0, 0, 0, 0, 0, SilphCo_4F_EventScript_1BE88D, 399, 0, 0 - object_event 8, 92, 0, 30, 0, 18, 0, 0, 8, 17, 0, 0, 0, 0, 0, SilphCo_4F_EventScript_1BEE09, 510, 0, 0 - -SilphCo_4F_MapWarps: - warp_def 28, 2, 3, 0, 307 - warp_def 18, 6, 3, 3, 308 - warp_def 30, 2, 3, 3, 305 - warp_def 12, 9, 3, 1, 312 - warp_def 2, 20, 3, 4, 312 - warp_def 18, 14, 3, 2, 312 - warp_def 22, 3, 0, 0, 314 - -SilphCo_4F_MapBGEvents: - bg_event 3, 16, 0, 0, 0, SilphCo_4F_EventScript_1A8983 - bg_event 4, 16, 0, 0, 0, SilphCo_4F_EventScript_1A8983 - bg_event 3, 17, 0, 0, 0, SilphCo_4F_EventScript_1A8983 - bg_event 4, 17, 0, 0, 0, SilphCo_4F_EventScript_1A8983 - bg_event 15, 11, 0, 0, 0, SilphCo_4F_EventScript_1A899D - bg_event 14, 11, 0, 0, 0, SilphCo_4F_EventScript_1A899D - bg_event 14, 12, 0, 0, 0, SilphCo_4F_EventScript_1A899D - bg_event 15, 12, 0, 0, 0, SilphCo_4F_EventScript_1A899D - bg_event 35, 20, 0, 7, 0, 65, 137, 1 - bg_event 29, 1, 0, 0, 0, SilphCo_4F_EventScript_161770 - -SilphCo_4F_MapEvents:: - map_events SilphCo_4F_EventObjects, SilphCo_4F_MapWarps, 0x0, SilphCo_4F_MapBGEvents diff --git a/data/maps/SilphCo_4F/header.inc b/data/maps/SilphCo_4F/header.inc deleted file mode 100644 index a59872690..000000000 --- a/data/maps/SilphCo_4F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SilphCo_4F:: @ 834F78C - .4byte SilphCo_4F_Layout @ 0x83084E8 - .4byte SilphCo_4F_MapEvents @ 0x83B00DC - .4byte SilphCo_4F_MapScripts @ 0x8161736 - .4byte NULL - .2byte BGM_FRLG_SILPH - .2byte 135 - .byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x07, 0x04, 0x00 diff --git a/data/maps/SilphCo_4F/map.json b/data/maps/SilphCo_4F/map.json new file mode 100644 index 000000000..080c7162a --- /dev/null +++ b/data/maps/SilphCo_4F/map.json @@ -0,0 +1,247 @@ +{ + "id": "MAP_SILPH_CO_4F", + "name": "SilphCo_4F", + "layout": "LAYOUT_SILPH_CO_4F", + "music": "BGM_FRLG_SILPH", + "region_map_section": "MAPSEC_SILPH_CO", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 7, + "elevator_flag": 4, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "49", + "x": 33, + "y": 16, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SilphCo_4F_EventScript_1617A7", + "flag": "83" + }, + { + "graphics_id": "49", + "x": 10, + "y": 19, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "SilphCo_4F_EventScript_161790", + "flag": "83" + }, + { + "graphics_id": "55", + "x": 14, + "y": 8, + "elevation": 3, + "movement_type": "17", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "SilphCo_4F_EventScript_161779", + "flag": "83" + }, + { + "graphics_id": "47", + "x": 5, + "y": 5, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SilphCo_4F_EventScript_16174F", + "flag": "0" + }, + { + "graphics_id": "92", + "x": 3, + "y": 11, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SilphCo_4F_EventScript_1BE873", + "flag": "397" + }, + { + "graphics_id": "92", + "x": 4, + "y": 12, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SilphCo_4F_EventScript_1BE880", + "flag": "398" + }, + { + "graphics_id": "92", + "x": 2, + "y": 13, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SilphCo_4F_EventScript_1BE88D", + "flag": "399" + }, + { + "graphics_id": "92", + "x": 30, + "y": 18, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SilphCo_4F_EventScript_1BEE09", + "flag": "510" + } + ], + "warp_events": [ + { + "x": 28, + "y": 2, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_5F", + "dest_warp_id": 0 + }, + { + "x": 18, + "y": 6, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_6F", + "dest_warp_id": 3 + }, + { + "x": 30, + "y": 2, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_3F", + "dest_warp_id": 3 + }, + { + "x": 12, + "y": 9, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_10F", + "dest_warp_id": 1 + }, + { + "x": 2, + "y": 20, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_10F", + "dest_warp_id": 4 + }, + { + "x": 18, + "y": 14, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_10F", + "dest_warp_id": 2 + }, + { + "x": 22, + "y": 3, + "elevation": 0, + "dest_map": "MAP_SILPH_CO_ELEVATOR", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 3, + "y": 16, + "elevation": 0, + "script": "SilphCo_4F_EventScript_1A8983" + }, + { + "type": "bg_event_type_0", + "x": 4, + "y": 16, + "elevation": 0, + "script": "SilphCo_4F_EventScript_1A8983" + }, + { + "type": "bg_event_type_0", + "x": 3, + "y": 17, + "elevation": 0, + "script": "SilphCo_4F_EventScript_1A8983" + }, + { + "type": "bg_event_type_0", + "x": 4, + "y": 17, + "elevation": 0, + "script": "SilphCo_4F_EventScript_1A8983" + }, + { + "type": "bg_event_type_0", + "x": 15, + "y": 11, + "elevation": 0, + "script": "SilphCo_4F_EventScript_1A899D" + }, + { + "type": "bg_event_type_0", + "x": 14, + "y": 11, + "elevation": 0, + "script": "SilphCo_4F_EventScript_1A899D" + }, + { + "type": "bg_event_type_0", + "x": 14, + "y": 12, + "elevation": 0, + "script": "SilphCo_4F_EventScript_1A899D" + }, + { + "type": "bg_event_type_0", + "x": 15, + "y": 12, + "elevation": 0, + "script": "SilphCo_4F_EventScript_1A899D" + }, + { + "type": "hidden_item", + "x": 35, + "y": 20, + "elevation": 0, + "item": "ITEM_IRON", + "flag": "137", + "unknown": 1 + }, + { + "type": "bg_event_type_0", + "x": 29, + "y": 1, + "elevation": 0, + "script": "SilphCo_4F_EventScript_161770" + } + ] +} \ No newline at end of file diff --git a/data/maps/SilphCo_5F/events.inc b/data/maps/SilphCo_5F/events.inc deleted file mode 100644 index 86c9cc92b..000000000 --- a/data/maps/SilphCo_5F/events.inc +++ /dev/null @@ -1,42 +0,0 @@ -SilphCo_5F_EventObjects: - object_event 1, 49, 0, 35, 0, 7, 0, 3, 7, 17, 0, 1, 0, 2, 0, SilphCo_5F_EventScript_161853, 83, 0, 0 - object_event 2, 26, 0, 23, 0, 13, 0, 3, 13, 17, 0, 1, 0, 4, 0, SilphCo_5F_EventScript_16186A, 83, 0, 0 - object_event 3, 47, 0, 16, 0, 13, 0, 3, 1, 17, 0, 0, 0, 0, 0, SilphCo_5F_EventScript_1617E0, 0, 0, 0 - object_event 4, 55, 0, 11, 0, 6, 0, 3, 2, 17, 0, 1, 0, 1, 0, SilphCo_5F_EventScript_161825, 83, 0, 0 - object_event 5, 49, 0, 9, 0, 21, 0, 3, 16, 17, 0, 1, 0, 3, 0, SilphCo_5F_EventScript_16183C, 83, 0, 0 - object_event 6, 92, 0, 4, 0, 9, 0, 3, 8, 17, 0, 0, 0, 0, 0, SilphCo_5F_EventScript_1BE89A, 400, 0, 0 - object_event 7, 92, 0, 1, 0, 18, 0, 3, 8, 17, 0, 0, 0, 0, 0, SilphCo_5F_EventScript_1BE8A7, 401, 0, 0 - object_event 8, 92, 0, 22, 0, 21, 0, 3, 8, 17, 0, 0, 0, 0, 0, SilphCo_5F_EventScript_1BE8B4, 402, 0, 0 - object_event 9, 55, 0, 2, 0, 7, 0, 3, 28, 18, 0, 0, 0, 0, 0, SilphCo_5F_EventScript_1AD0D4, 0, 0, 0 - -SilphCo_5F_MapWarps: - warp_def 28, 2, 3, 0, 306 - warp_def 15, 7, 3, 1, 305 - warp_def 30, 2, 3, 2, 308 - warp_def 10, 20, 3, 1, 311 - warp_def 2, 20, 3, 5, 305 - warp_def 33, 5, 3, 2, 309 - warp_def 22, 3, 0, 0, 314 - -SilphCo_5F_MapBGEvents: - bg_event 13, 16, 0, 7, 0, 36, 24, 1 - bg_event 8, 9, 0, 0, 0, SilphCo_5F_EventScript_1A89B7 - bg_event 8, 10, 0, 0, 0, SilphCo_5F_EventScript_1A89B7 - bg_event 8, 18, 0, 0, 0, SilphCo_5F_EventScript_1A89D1 - bg_event 8, 19, 0, 0, 0, SilphCo_5F_EventScript_1A89D1 - bg_event 19, 13, 0, 0, 0, SilphCo_5F_EventScript_1A89EB - bg_event 19, 14, 0, 0, 0, SilphCo_5F_EventScript_1A89EB - bg_event 7, 9, 0, 0, 0, SilphCo_5F_EventScript_1A89B7 - bg_event 7, 10, 0, 0, 0, SilphCo_5F_EventScript_1A89B7 - bg_event 7, 19, 0, 0, 0, SilphCo_5F_EventScript_1A89D1 - bg_event 7, 18, 0, 0, 0, SilphCo_5F_EventScript_1A89D1 - bg_event 18, 13, 0, 0, 0, SilphCo_5F_EventScript_1A89EB - bg_event 18, 14, 0, 0, 0, SilphCo_5F_EventScript_1A89EB - bg_event 28, 11, 0, 0, 0, SilphCo_5F_EventScript_161813 - bg_event 30, 13, 0, 0, 0, SilphCo_5F_EventScript_16180A - bg_event 25, 15, 0, 0, 0, SilphCo_5F_EventScript_161801 - bg_event 32, 9, 0, 7, 0, 69, 138, 1 - bg_event 29, 1, 0, 0, 0, SilphCo_5F_EventScript_16181C - -SilphCo_5F_MapEvents:: - map_events SilphCo_5F_EventObjects, SilphCo_5F_MapWarps, 0x0, SilphCo_5F_MapBGEvents diff --git a/data/maps/SilphCo_5F/header.inc b/data/maps/SilphCo_5F/header.inc deleted file mode 100644 index 2c0d61a47..000000000 --- a/data/maps/SilphCo_5F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SilphCo_5F:: @ 834F7A8 - .4byte SilphCo_5F_Layout @ 0x8308B3C - .4byte SilphCo_5F_MapEvents @ 0x83B02D8 - .4byte SilphCo_5F_MapScripts @ 0x81617BE - .4byte NULL - .2byte BGM_FRLG_SILPH - .2byte 136 - .byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x07, 0x05, 0x00 diff --git a/data/maps/SilphCo_5F/map.json b/data/maps/SilphCo_5F/map.json new file mode 100644 index 000000000..3ad8ee8df --- /dev/null +++ b/data/maps/SilphCo_5F/map.json @@ -0,0 +1,318 @@ +{ + "id": "MAP_SILPH_CO_5F", + "name": "SilphCo_5F", + "layout": "LAYOUT_SILPH_CO_5F", + "music": "BGM_FRLG_SILPH", + "region_map_section": "MAPSEC_SILPH_CO", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 7, + "elevator_flag": 5, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "49", + "x": 35, + "y": 7, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "SilphCo_5F_EventScript_161853", + "flag": "83" + }, + { + "graphics_id": "26", + "x": 23, + "y": 13, + "elevation": 3, + "movement_type": "13", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "SilphCo_5F_EventScript_16186A", + "flag": "83" + }, + { + "graphics_id": "47", + "x": 16, + "y": 13, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SilphCo_5F_EventScript_1617E0", + "flag": "0" + }, + { + "graphics_id": "55", + "x": 11, + "y": 6, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SilphCo_5F_EventScript_161825", + "flag": "83" + }, + { + "graphics_id": "49", + "x": 9, + "y": 21, + "elevation": 3, + "movement_type": "16", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SilphCo_5F_EventScript_16183C", + "flag": "83" + }, + { + "graphics_id": "92", + "x": 4, + "y": 9, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SilphCo_5F_EventScript_1BE89A", + "flag": "400" + }, + { + "graphics_id": "92", + "x": 1, + "y": 18, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SilphCo_5F_EventScript_1BE8A7", + "flag": "401" + }, + { + "graphics_id": "92", + "x": 22, + "y": 21, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SilphCo_5F_EventScript_1BE8B4", + "flag": "402" + }, + { + "graphics_id": "55", + "x": 2, + "y": 7, + "elevation": 3, + "movement_type": "28", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SilphCo_5F_EventScript_1AD0D4", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 28, + "y": 2, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_4F", + "dest_warp_id": 0 + }, + { + "x": 15, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_3F", + "dest_warp_id": 1 + }, + { + "x": 30, + "y": 2, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_6F", + "dest_warp_id": 2 + }, + { + "x": 10, + "y": 20, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_9F", + "dest_warp_id": 1 + }, + { + "x": 2, + "y": 20, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_3F", + "dest_warp_id": 5 + }, + { + "x": 33, + "y": 5, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_7F", + "dest_warp_id": 2 + }, + { + "x": 22, + "y": 3, + "elevation": 0, + "dest_map": "MAP_SILPH_CO_ELEVATOR", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 13, + "y": 16, + "elevation": 0, + "item": "ITEM_ELIXIR", + "flag": "24", + "unknown": 1 + }, + { + "type": "bg_event_type_0", + "x": 8, + "y": 9, + "elevation": 0, + "script": "SilphCo_5F_EventScript_1A89B7" + }, + { + "type": "bg_event_type_0", + "x": 8, + "y": 10, + "elevation": 0, + "script": "SilphCo_5F_EventScript_1A89B7" + }, + { + "type": "bg_event_type_0", + "x": 8, + "y": 18, + "elevation": 0, + "script": "SilphCo_5F_EventScript_1A89D1" + }, + { + "type": "bg_event_type_0", + "x": 8, + "y": 19, + "elevation": 0, + "script": "SilphCo_5F_EventScript_1A89D1" + }, + { + "type": "bg_event_type_0", + "x": 19, + "y": 13, + "elevation": 0, + "script": "SilphCo_5F_EventScript_1A89EB" + }, + { + "type": "bg_event_type_0", + "x": 19, + "y": 14, + "elevation": 0, + "script": "SilphCo_5F_EventScript_1A89EB" + }, + { + "type": "bg_event_type_0", + "x": 7, + "y": 9, + "elevation": 0, + "script": "SilphCo_5F_EventScript_1A89B7" + }, + { + "type": "bg_event_type_0", + "x": 7, + "y": 10, + "elevation": 0, + "script": "SilphCo_5F_EventScript_1A89B7" + }, + { + "type": "bg_event_type_0", + "x": 7, + "y": 19, + "elevation": 0, + "script": "SilphCo_5F_EventScript_1A89D1" + }, + { + "type": "bg_event_type_0", + "x": 7, + "y": 18, + "elevation": 0, + "script": "SilphCo_5F_EventScript_1A89D1" + }, + { + "type": "bg_event_type_0", + "x": 18, + "y": 13, + "elevation": 0, + "script": "SilphCo_5F_EventScript_1A89EB" + }, + { + "type": "bg_event_type_0", + "x": 18, + "y": 14, + "elevation": 0, + "script": "SilphCo_5F_EventScript_1A89EB" + }, + { + "type": "bg_event_type_0", + "x": 28, + "y": 11, + "elevation": 0, + "script": "SilphCo_5F_EventScript_161813" + }, + { + "type": "bg_event_type_0", + "x": 30, + "y": 13, + "elevation": 0, + "script": "SilphCo_5F_EventScript_16180A" + }, + { + "type": "bg_event_type_0", + "x": 25, + "y": 15, + "elevation": 0, + "script": "SilphCo_5F_EventScript_161801" + }, + { + "type": "hidden_item", + "x": 32, + "y": 9, + "elevation": 0, + "item": "ITEM_PP_UP", + "flag": "138", + "unknown": 1 + }, + { + "type": "bg_event_type_0", + "x": 29, + "y": 1, + "elevation": 0, + "script": "SilphCo_5F_EventScript_16181C" + } + ] +} \ No newline at end of file diff --git a/data/maps/SilphCo_6F/events.inc b/data/maps/SilphCo_6F/events.inc deleted file mode 100644 index e83088be8..000000000 --- a/data/maps/SilphCo_6F/events.inc +++ /dev/null @@ -1,29 +0,0 @@ -SilphCo_6F_EventObjects: - object_event 1, 49, 0, 21, 0, 5, 0, 3, 10, 17, 0, 1, 0, 2, 0, SilphCo_6F_EventScript_161956, 83, 0, 0 - object_event 2, 47, 0, 23, 0, 9, 0, 3, 8, 17, 0, 0, 0, 0, 0, SilphCo_6F_EventScript_1618D3, 0, 0, 0 - object_event 3, 48, 0, 24, 0, 9, 0, 3, 8, 17, 0, 0, 0, 0, 0, SilphCo_6F_EventScript_1618F4, 0, 0, 0 - object_event 4, 47, 0, 22, 0, 13, 0, 3, 7, 17, 0, 0, 0, 0, 0, SilphCo_6F_EventScript_161891, 0, 0, 0 - object_event 5, 47, 0, 14, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, SilphCo_6F_EventScript_1618B2, 0, 0, 0 - object_event 6, 48, 0, 16, 0, 12, 0, 3, 10, 17, 0, 0, 0, 0, 0, SilphCo_6F_EventScript_161915, 0, 0, 0 - object_event 7, 55, 0, 9, 0, 11, 0, 3, 8, 17, 0, 1, 0, 4, 0, SilphCo_6F_EventScript_16193F, 83, 0, 0 - object_event 8, 92, 0, 2, 0, 14, 0, 3, 8, 17, 0, 0, 0, 0, 0, SilphCo_6F_EventScript_1BE8C1, 403, 0, 0 - object_event 9, 92, 0, 1, 0, 17, 0, 3, 8, 17, 0, 0, 0, 0, 0, SilphCo_6F_EventScript_1BE8CE, 404, 0, 0 - object_event 10, 49, 0, 18, 0, 17, 0, 3, 9, 17, 0, 1, 0, 2, 0, SilphCo_6F_EventScript_16196D, 83, 0, 0 - -SilphCo_6F_MapWarps: - warp_def 14, 2, 3, 0, 309 - warp_def 29, 5, 3, 4, 304 - warp_def 26, 2, 3, 2, 307 - warp_def 2, 6, 3, 1, 306 - warp_def 20, 3, 0, 0, 314 - -SilphCo_6F_MapBGEvents: - bg_event 6, 15, 0, 0, 0, SilphCo_6F_EventScript_1A8A05 - bg_event 6, 16, 0, 0, 0, SilphCo_6F_EventScript_1A8A05 - bg_event 5, 15, 0, 0, 0, SilphCo_6F_EventScript_1A8A05 - bg_event 5, 16, 0, 0, 0, SilphCo_6F_EventScript_1A8A05 - bg_event 1, 8, 0, 7, 0, 66, 139, 1 - bg_event 25, 1, 0, 0, 0, SilphCo_6F_EventScript_161936 - -SilphCo_6F_MapEvents:: - map_events SilphCo_6F_EventObjects, SilphCo_6F_MapWarps, 0x0, SilphCo_6F_MapBGEvents diff --git a/data/maps/SilphCo_6F/header.inc b/data/maps/SilphCo_6F/header.inc deleted file mode 100644 index d9c522f9c..000000000 --- a/data/maps/SilphCo_6F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SilphCo_6F:: @ 834F7C4 - .4byte SilphCo_6F_Layout @ 0x8308FFC - .4byte SilphCo_6F_MapEvents @ 0x83B044C - .4byte SilphCo_6F_MapScripts @ 0x8161881 - .4byte NULL - .2byte BGM_FRLG_SILPH - .2byte 137 - .byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x07, 0x06, 0x00 diff --git a/data/maps/SilphCo_6F/map.json b/data/maps/SilphCo_6F/map.json new file mode 100644 index 000000000..c1db9b3c1 --- /dev/null +++ b/data/maps/SilphCo_6F/map.json @@ -0,0 +1,231 @@ +{ + "id": "MAP_SILPH_CO_6F", + "name": "SilphCo_6F", + "layout": "LAYOUT_SILPH_CO_6F", + "music": "BGM_FRLG_SILPH", + "region_map_section": "MAPSEC_SILPH_CO", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 7, + "elevator_flag": 6, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "49", + "x": 21, + "y": 5, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "SilphCo_6F_EventScript_161956", + "flag": "83" + }, + { + "graphics_id": "47", + "x": 23, + "y": 9, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SilphCo_6F_EventScript_1618D3", + "flag": "0" + }, + { + "graphics_id": "48", + "x": 24, + "y": 9, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SilphCo_6F_EventScript_1618F4", + "flag": "0" + }, + { + "graphics_id": "47", + "x": 22, + "y": 13, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SilphCo_6F_EventScript_161891", + "flag": "0" + }, + { + "graphics_id": "47", + "x": 14, + "y": 9, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SilphCo_6F_EventScript_1618B2", + "flag": "0" + }, + { + "graphics_id": "48", + "x": 16, + "y": 12, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SilphCo_6F_EventScript_161915", + "flag": "0" + }, + { + "graphics_id": "55", + "x": 9, + "y": 11, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "SilphCo_6F_EventScript_16193F", + "flag": "83" + }, + { + "graphics_id": "92", + "x": 2, + "y": 14, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SilphCo_6F_EventScript_1BE8C1", + "flag": "403" + }, + { + "graphics_id": "92", + "x": 1, + "y": 17, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SilphCo_6F_EventScript_1BE8CE", + "flag": "404" + }, + { + "graphics_id": "49", + "x": 18, + "y": 17, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "SilphCo_6F_EventScript_16196D", + "flag": "83" + } + ], + "warp_events": [ + { + "x": 14, + "y": 2, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_7F", + "dest_warp_id": 0 + }, + { + "x": 29, + "y": 5, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_2F", + "dest_warp_id": 4 + }, + { + "x": 26, + "y": 2, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_5F", + "dest_warp_id": 2 + }, + { + "x": 2, + "y": 6, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_4F", + "dest_warp_id": 1 + }, + { + "x": 20, + "y": 3, + "elevation": 0, + "dest_map": "MAP_SILPH_CO_ELEVATOR", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 6, + "y": 15, + "elevation": 0, + "script": "SilphCo_6F_EventScript_1A8A05" + }, + { + "type": "bg_event_type_0", + "x": 6, + "y": 16, + "elevation": 0, + "script": "SilphCo_6F_EventScript_1A8A05" + }, + { + "type": "bg_event_type_0", + "x": 5, + "y": 15, + "elevation": 0, + "script": "SilphCo_6F_EventScript_1A8A05" + }, + { + "type": "bg_event_type_0", + "x": 5, + "y": 16, + "elevation": 0, + "script": "SilphCo_6F_EventScript_1A8A05" + }, + { + "type": "hidden_item", + "x": 1, + "y": 8, + "elevation": 0, + "item": "ITEM_CARBOS", + "flag": "139", + "unknown": 1 + }, + { + "type": "bg_event_type_0", + "x": 25, + "y": 1, + "elevation": 0, + "script": "SilphCo_6F_EventScript_161936" + } + ] +} \ No newline at end of file diff --git a/data/maps/SilphCo_7F/events.inc b/data/maps/SilphCo_7F/events.inc deleted file mode 100644 index 8373b3a57..000000000 --- a/data/maps/SilphCo_7F/events.inc +++ /dev/null @@ -1,43 +0,0 @@ -SilphCo_7F_EventObjects: - object_event 1, 72, 0, 2, 0, 6, 0, 3, 7, 17, 0, 0, 0, 0, 0, 0x0, 78, 0, 0 - object_event 2, 47, 0, 0, 0, 7, 0, 3, 10, 17, 0, 0, 0, 0, 0, SilphCo_7F_EventScript_161AC8, 0, 0, 0 - object_event 3, 49, 0, 24, 0, 5, 0, 3, 9, 17, 0, 1, 0, 4, 0, SilphCo_7F_EventScript_161C1A, 83, 0, 0 - object_event 4, 49, 0, 24, 0, 15, 0, 3, 10, 17, 0, 1, 0, 2, 0, SilphCo_7F_EventScript_161C31, 83, 0, 0 - object_event 5, 49, 0, 13, 0, 4, 0, 3, 8, 17, 0, 1, 0, 3, 0, SilphCo_7F_EventScript_161C48, 83, 0, 0 - object_event 6, 48, 0, 10, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, SilphCo_7F_EventScript_161BD9, 0, 0, 0 - object_event 7, 47, 0, 13, 0, 14, 0, 3, 9, 17, 0, 0, 0, 0, 0, SilphCo_7F_EventScript_161B97, 0, 0, 0 - object_event 8, 47, 0, 9, 0, 14, 0, 3, 27, 17, 0, 0, 0, 0, 0, SilphCo_7F_EventScript_161BB8, 0, 0, 0 - object_event 9, 55, 0, 3, 0, 13, 0, 3, 5, 18, 0, 1, 0, 1, 0, SilphCo_7F_EventScript_161C03, 83, 0, 0 - object_event 10, 92, 0, 0, 0, 12, 0, 3, 8, 17, 0, 0, 0, 0, 0, SilphCo_7F_EventScript_1BE8DB, 405, 0, 0 - object_event 11, 92, 0, 30, 0, 11, 0, 3, 8, 17, 0, 0, 0, 0, 0, SilphCo_7F_EventScript_1BE8E8, 406, 0, 0 - -SilphCo_7F_MapWarps: - warp_def 19, 2, 3, 0, 308 - warp_def 5, 8, 3, 1, 313 - warp_def 25, 17, 3, 5, 307 - warp_def 27, 2, 3, 3, 310 - warp_def 5, 4, 3, 2, 305 - warp_def 23, 3, 0, 0, 314 - -SilphCo_7F_MapCoordEvents: - coord_event 2, 4, 3, 0, 16476, 0, 0, SilphCo_7F_EventScript_1619BC - coord_event 2, 5, 3, 0, 16476, 0, 0, SilphCo_7F_EventScript_1619C8 - -SilphCo_7F_MapBGEvents: - bg_event 11, 8, 0, 0, 0, SilphCo_7F_EventScript_1A8A1F - bg_event 12, 8, 0, 0, 0, SilphCo_7F_EventScript_1A8A1F - bg_event 11, 9, 0, 0, 0, SilphCo_7F_EventScript_1A8A1F - bg_event 12, 9, 0, 0, 0, SilphCo_7F_EventScript_1A8A1F - bg_event 24, 7, 0, 0, 0, SilphCo_7F_EventScript_1A8A39 - bg_event 25, 7, 0, 0, 0, SilphCo_7F_EventScript_1A8A39 - bg_event 25, 8, 0, 0, 0, SilphCo_7F_EventScript_1A8A39 - bg_event 24, 8, 0, 0, 0, SilphCo_7F_EventScript_1A8A39 - bg_event 25, 13, 0, 0, 0, SilphCo_7F_EventScript_1A8A53 - bg_event 26, 13, 0, 0, 0, SilphCo_7F_EventScript_1A8A53 - bg_event 25, 14, 0, 0, 0, SilphCo_7F_EventScript_1A8A53 - bg_event 26, 14, 0, 0, 0, SilphCo_7F_EventScript_1A8A53 - bg_event 22, 11, 0, 7, 0, 70, 140, 1 - bg_event 20, 1, 0, 0, 0, SilphCo_7F_EventScript_161BFA - -SilphCo_7F_MapEvents:: - map_events SilphCo_7F_EventObjects, SilphCo_7F_MapWarps, SilphCo_7F_MapCoordEvents, SilphCo_7F_MapBGEvents diff --git a/data/maps/SilphCo_7F/header.inc b/data/maps/SilphCo_7F/header.inc deleted file mode 100644 index 8208b4ad1..000000000 --- a/data/maps/SilphCo_7F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SilphCo_7F:: @ 834F7E0 - .4byte SilphCo_7F_Layout @ 0x83094BC - .4byte SilphCo_7F_MapEvents @ 0x83B0660 - .4byte SilphCo_7F_MapScripts @ 0x8161984 - .4byte NULL - .2byte BGM_FRLG_SILPH - .2byte 138 - .byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x07, 0x07, 0x00 diff --git a/data/maps/SilphCo_7F/map.json b/data/maps/SilphCo_7F/map.json new file mode 100644 index 000000000..575558327 --- /dev/null +++ b/data/maps/SilphCo_7F/map.json @@ -0,0 +1,326 @@ +{ + "id": "MAP_SILPH_CO_7F", + "name": "SilphCo_7F", + "layout": "LAYOUT_SILPH_CO_7F", + "music": "BGM_FRLG_SILPH", + "region_map_section": "MAPSEC_SILPH_CO", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 7, + "elevator_flag": 7, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "72", + "x": 2, + "y": 6, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "78" + }, + { + "graphics_id": "47", + "x": 0, + "y": 7, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SilphCo_7F_EventScript_161AC8", + "flag": "0" + }, + { + "graphics_id": "49", + "x": 24, + "y": 5, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "SilphCo_7F_EventScript_161C1A", + "flag": "83" + }, + { + "graphics_id": "49", + "x": 24, + "y": 15, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "SilphCo_7F_EventScript_161C31", + "flag": "83" + }, + { + "graphics_id": "49", + "x": 13, + "y": 4, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SilphCo_7F_EventScript_161C48", + "flag": "83" + }, + { + "graphics_id": "48", + "x": 10, + "y": 10, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SilphCo_7F_EventScript_161BD9", + "flag": "0" + }, + { + "graphics_id": "47", + "x": 13, + "y": 14, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SilphCo_7F_EventScript_161B97", + "flag": "0" + }, + { + "graphics_id": "47", + "x": 9, + "y": 14, + "elevation": 3, + "movement_type": "27", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SilphCo_7F_EventScript_161BB8", + "flag": "0" + }, + { + "graphics_id": "55", + "x": 3, + "y": 13, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SilphCo_7F_EventScript_161C03", + "flag": "83" + }, + { + "graphics_id": "92", + "x": 0, + "y": 12, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SilphCo_7F_EventScript_1BE8DB", + "flag": "405" + }, + { + "graphics_id": "92", + "x": 30, + "y": 11, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SilphCo_7F_EventScript_1BE8E8", + "flag": "406" + } + ], + "warp_events": [ + { + "x": 19, + "y": 2, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_6F", + "dest_warp_id": 0 + }, + { + "x": 5, + "y": 8, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_11F", + "dest_warp_id": 1 + }, + { + "x": 25, + "y": 17, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_5F", + "dest_warp_id": 5 + }, + { + "x": 27, + "y": 2, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_8F", + "dest_warp_id": 3 + }, + { + "x": 5, + "y": 4, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_3F", + "dest_warp_id": 2 + }, + { + "x": 23, + "y": 3, + "elevation": 0, + "dest_map": "MAP_SILPH_CO_ELEVATOR", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 2, + "y": 4, + "elevation": 3, + "var": "VAR_0x405C", + "var_value": 0, + "script": "SilphCo_7F_EventScript_1619BC" + }, + { + "type": "trigger", + "x": 2, + "y": 5, + "elevation": 3, + "var": "VAR_0x405C", + "var_value": 0, + "script": "SilphCo_7F_EventScript_1619C8" + } + ], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 11, + "y": 8, + "elevation": 0, + "script": "SilphCo_7F_EventScript_1A8A1F" + }, + { + "type": "bg_event_type_0", + "x": 12, + "y": 8, + "elevation": 0, + "script": "SilphCo_7F_EventScript_1A8A1F" + }, + { + "type": "bg_event_type_0", + "x": 11, + "y": 9, + "elevation": 0, + "script": "SilphCo_7F_EventScript_1A8A1F" + }, + { + "type": "bg_event_type_0", + "x": 12, + "y": 9, + "elevation": 0, + "script": "SilphCo_7F_EventScript_1A8A1F" + }, + { + "type": "bg_event_type_0", + "x": 24, + "y": 7, + "elevation": 0, + "script": "SilphCo_7F_EventScript_1A8A39" + }, + { + "type": "bg_event_type_0", + "x": 25, + "y": 7, + "elevation": 0, + "script": "SilphCo_7F_EventScript_1A8A39" + }, + { + "type": "bg_event_type_0", + "x": 25, + "y": 8, + "elevation": 0, + "script": "SilphCo_7F_EventScript_1A8A39" + }, + { + "type": "bg_event_type_0", + "x": 24, + "y": 8, + "elevation": 0, + "script": "SilphCo_7F_EventScript_1A8A39" + }, + { + "type": "bg_event_type_0", + "x": 25, + "y": 13, + "elevation": 0, + "script": "SilphCo_7F_EventScript_1A8A53" + }, + { + "type": "bg_event_type_0", + "x": 26, + "y": 13, + "elevation": 0, + "script": "SilphCo_7F_EventScript_1A8A53" + }, + { + "type": "bg_event_type_0", + "x": 25, + "y": 14, + "elevation": 0, + "script": "SilphCo_7F_EventScript_1A8A53" + }, + { + "type": "bg_event_type_0", + "x": 26, + "y": 14, + "elevation": 0, + "script": "SilphCo_7F_EventScript_1A8A53" + }, + { + "type": "hidden_item", + "x": 22, + "y": 11, + "elevation": 0, + "item": "ITEM_ZINC", + "flag": "140", + "unknown": 1 + }, + { + "type": "bg_event_type_0", + "x": 20, + "y": 1, + "elevation": 0, + "script": "SilphCo_7F_EventScript_161BFA" + } + ] +} \ No newline at end of file diff --git a/data/maps/SilphCo_8F/events.inc b/data/maps/SilphCo_8F/events.inc deleted file mode 100644 index 31ffa6f67..000000000 --- a/data/maps/SilphCo_8F/events.inc +++ /dev/null @@ -1,27 +0,0 @@ -SilphCo_8F_EventObjects: - object_event 1, 49, 0, 28, 0, 5, 0, 3, 9, 17, 0, 1, 0, 4, 0, SilphCo_8F_EventScript_161CB0, 83, 0, 0 - object_event 2, 49, 0, 10, 0, 17, 0, 3, 10, 17, 0, 1, 0, 5, 0, SilphCo_8F_EventScript_161CC7, 83, 0, 0 - object_event 3, 55, 0, 9, 0, 4, 0, 3, 8, 17, 0, 1, 0, 2, 0, SilphCo_8F_EventScript_161C99, 83, 0, 0 - object_event 4, 47, 0, 2, 0, 5, 0, 3, 5, 17, 0, 0, 0, 0, 0, SilphCo_8F_EventScript_161C6F, 0, 0, 0 - object_event 5, 92, 0, 24, 0, 8, 0, 3, 8, 17, 0, 0, 0, 0, 0, SilphCo_8F_EventScript_1BEB4B, 456, 0, 0 - object_event 6, 55, 0, 29, 0, 9, 0, 3, 8, 17, 0, 0, 0, 0, 0, SilphCo_8F_EventScript_1AD0ED, 0, 0, 0 - -SilphCo_8F_MapWarps: - warp_def 16, 2, 3, 0, 311 - warp_def 11, 10, 3, 4, 310 - warp_def 10, 6, 3, 5, 304 - warp_def 28, 2, 3, 3, 309 - warp_def 2, 12, 3, 1, 310 - warp_def 2, 17, 3, 2, 304 - warp_def 22, 3, 0, 0, 314 - -SilphCo_8F_MapBGEvents: - bg_event 6, 10, 0, 0, 0, SilphCo_8F_EventScript_1A8A6D - bg_event 6, 11, 0, 0, 0, SilphCo_8F_EventScript_1A8A6D - bg_event 5, 11, 0, 0, 0, SilphCo_8F_EventScript_1A8A6D - bg_event 5, 10, 0, 0, 0, SilphCo_8F_EventScript_1A8A6D - bg_event 29, 10, 0, 7, 0, 110, 141, 1 - bg_event 27, 1, 0, 0, 0, SilphCo_8F_EventScript_161C90 - -SilphCo_8F_MapEvents:: - map_events SilphCo_8F_EventObjects, SilphCo_8F_MapWarps, 0x0, SilphCo_8F_MapBGEvents diff --git a/data/maps/SilphCo_8F/header.inc b/data/maps/SilphCo_8F/header.inc deleted file mode 100644 index 5614c0a35..000000000 --- a/data/maps/SilphCo_8F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SilphCo_8F:: @ 834F7FC - .4byte SilphCo_8F_Layout @ 0x830997C - .4byte SilphCo_8F_MapEvents @ 0x83B0784 - .4byte SilphCo_8F_MapScripts @ 0x8161C5F - .4byte NULL - .2byte BGM_FRLG_SILPH - .2byte 139 - .byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x07, 0x08, 0x00 diff --git a/data/maps/SilphCo_8F/map.json b/data/maps/SilphCo_8F/map.json new file mode 100644 index 000000000..763c9284b --- /dev/null +++ b/data/maps/SilphCo_8F/map.json @@ -0,0 +1,193 @@ +{ + "id": "MAP_SILPH_CO_8F", + "name": "SilphCo_8F", + "layout": "LAYOUT_SILPH_CO_8F", + "music": "BGM_FRLG_SILPH", + "region_map_section": "MAPSEC_SILPH_CO", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 7, + "elevator_flag": 8, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "49", + "x": 28, + "y": 5, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "SilphCo_8F_EventScript_161CB0", + "flag": "83" + }, + { + "graphics_id": "49", + "x": 10, + "y": 17, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "SilphCo_8F_EventScript_161CC7", + "flag": "83" + }, + { + "graphics_id": "55", + "x": 9, + "y": 4, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "SilphCo_8F_EventScript_161C99", + "flag": "83" + }, + { + "graphics_id": "47", + "x": 2, + "y": 5, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SilphCo_8F_EventScript_161C6F", + "flag": "0" + }, + { + "graphics_id": "92", + "x": 24, + "y": 8, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SilphCo_8F_EventScript_1BEB4B", + "flag": "456" + }, + { + "graphics_id": "55", + "x": 29, + "y": 9, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SilphCo_8F_EventScript_1AD0ED", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 16, + "y": 2, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_9F", + "dest_warp_id": 0 + }, + { + "x": 11, + "y": 10, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_8F", + "dest_warp_id": 4 + }, + { + "x": 10, + "y": 6, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_2F", + "dest_warp_id": 5 + }, + { + "x": 28, + "y": 2, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_7F", + "dest_warp_id": 3 + }, + { + "x": 2, + "y": 12, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_8F", + "dest_warp_id": 1 + }, + { + "x": 2, + "y": 17, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_2F", + "dest_warp_id": 2 + }, + { + "x": 22, + "y": 3, + "elevation": 0, + "dest_map": "MAP_SILPH_CO_ELEVATOR", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 6, + "y": 10, + "elevation": 0, + "script": "SilphCo_8F_EventScript_1A8A6D" + }, + { + "type": "bg_event_type_0", + "x": 6, + "y": 11, + "elevation": 0, + "script": "SilphCo_8F_EventScript_1A8A6D" + }, + { + "type": "bg_event_type_0", + "x": 5, + "y": 11, + "elevation": 0, + "script": "SilphCo_8F_EventScript_1A8A6D" + }, + { + "type": "bg_event_type_0", + "x": 5, + "y": 10, + "elevation": 0, + "script": "SilphCo_8F_EventScript_1A8A6D" + }, + { + "type": "hidden_item", + "x": 29, + "y": 10, + "elevation": 0, + "item": "ITEM_NUGGET", + "flag": "141", + "unknown": 1 + }, + { + "type": "bg_event_type_0", + "x": 27, + "y": 1, + "elevation": 0, + "script": "SilphCo_8F_EventScript_161C90" + } + ] +} \ No newline at end of file diff --git a/data/maps/SilphCo_9F/events.inc b/data/maps/SilphCo_9F/events.inc deleted file mode 100644 index 0b93cb550..000000000 --- a/data/maps/SilphCo_9F/events.inc +++ /dev/null @@ -1,36 +0,0 @@ -SilphCo_9F_EventObjects: - object_event 1, 55, 0, 26, 0, 16, 0, 3, 3, 17, 0, 1, 0, 2, 0, SilphCo_9F_EventScript_161D41, 83, 0, 0 - object_event 2, 49, 0, 15, 0, 18, 0, 3, 7, 17, 0, 1, 0, 3, 0, SilphCo_9F_EventScript_161D6F, 83, 0, 0 - object_event 3, 28, 0, 2, 0, 16, 0, 0, 8, 17, 0, 0, 0, 0, 0, SilphCo_9F_EventScript_161D09, 0, 0, 0 - object_event 4, 49, 0, 1, 0, 6, 0, 3, 8, 17, 0, 1, 0, 5, 0, SilphCo_9F_EventScript_161D58, 83, 0, 0 - -SilphCo_9F_MapWarps: - warp_def 16, 2, 0, 0, 310 - warp_def 22, 18, 3, 3, 307 - warp_def 9, 4, 3, 4, 305 - warp_def 18, 2, 3, 3, 312 - warp_def 24, 3, 0, 0, 314 - -SilphCo_9F_MapBGEvents: - bg_event 11, 14, 3, 7, 0, 20, 25, 1 - bg_event 3, 10, 0, 0, 0, SilphCo_9F_EventScript_1A8A87 - bg_event 3, 11, 0, 0, 0, SilphCo_9F_EventScript_1A8A87 - bg_event 13, 16, 0, 0, 0, SilphCo_9F_EventScript_1A8AA1 - bg_event 13, 17, 0, 0, 0, SilphCo_9F_EventScript_1A8AA1 - bg_event 21, 6, 0, 0, 0, SilphCo_9F_EventScript_1A8ABB - bg_event 22, 6, 0, 0, 0, SilphCo_9F_EventScript_1A8ABB - bg_event 22, 7, 0, 0, 0, SilphCo_9F_EventScript_1A8ABB - bg_event 21, 7, 0, 0, 0, SilphCo_9F_EventScript_1A8ABB - bg_event 21, 13, 0, 0, 0, SilphCo_9F_EventScript_1A8AD5 - bg_event 21, 12, 0, 0, 0, SilphCo_9F_EventScript_1A8AD5 - bg_event 22, 12, 0, 0, 0, SilphCo_9F_EventScript_1A8AD5 - bg_event 22, 13, 0, 0, 0, SilphCo_9F_EventScript_1A8AD5 - bg_event 2, 11, 0, 0, 0, SilphCo_9F_EventScript_1A8A87 - bg_event 2, 10, 0, 0, 0, SilphCo_9F_EventScript_1A8A87 - bg_event 12, 16, 0, 0, 0, SilphCo_9F_EventScript_1A8AA1 - bg_event 12, 17, 0, 0, 0, SilphCo_9F_EventScript_1A8AA1 - bg_event 5, 8, 0, 7, 0, 67, 142, 1 - bg_event 17, 1, 0, 0, 0, SilphCo_9F_EventScript_161D38 - -SilphCo_9F_MapEvents:: - map_events SilphCo_9F_EventObjects, SilphCo_9F_MapWarps, 0x0, SilphCo_9F_MapBGEvents diff --git a/data/maps/SilphCo_9F/header.inc b/data/maps/SilphCo_9F/header.inc deleted file mode 100644 index a89767234..000000000 --- a/data/maps/SilphCo_9F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SilphCo_9F:: @ 834F818 - .4byte SilphCo_9F_Layout @ 0x8309E3C - .4byte SilphCo_9F_MapEvents @ 0x83B0904 - .4byte SilphCo_9F_MapScripts @ 0x8161CDE - .4byte NULL - .2byte BGM_FRLG_SILPH - .2byte 140 - .byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x07, 0x09, 0x00 diff --git a/data/maps/SilphCo_9F/map.json b/data/maps/SilphCo_9F/map.json new file mode 100644 index 000000000..5e50d24ca --- /dev/null +++ b/data/maps/SilphCo_9F/map.json @@ -0,0 +1,246 @@ +{ + "id": "MAP_SILPH_CO_9F", + "name": "SilphCo_9F", + "layout": "LAYOUT_SILPH_CO_9F", + "music": "BGM_FRLG_SILPH", + "region_map_section": "MAPSEC_SILPH_CO", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 7, + "elevator_flag": 9, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "55", + "x": 26, + "y": 16, + "elevation": 3, + "movement_type": "3", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "SilphCo_9F_EventScript_161D41", + "flag": "83" + }, + { + "graphics_id": "49", + "x": 15, + "y": 18, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SilphCo_9F_EventScript_161D6F", + "flag": "83" + }, + { + "graphics_id": "28", + "x": 2, + "y": 16, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SilphCo_9F_EventScript_161D09", + "flag": "0" + }, + { + "graphics_id": "49", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "SilphCo_9F_EventScript_161D58", + "flag": "83" + } + ], + "warp_events": [ + { + "x": 16, + "y": 2, + "elevation": 0, + "dest_map": "MAP_SILPH_CO_8F", + "dest_warp_id": 0 + }, + { + "x": 22, + "y": 18, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_5F", + "dest_warp_id": 3 + }, + { + "x": 9, + "y": 4, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_3F", + "dest_warp_id": 4 + }, + { + "x": 18, + "y": 2, + "elevation": 3, + "dest_map": "MAP_SILPH_CO_10F", + "dest_warp_id": 3 + }, + { + "x": 24, + "y": 3, + "elevation": 0, + "dest_map": "MAP_SILPH_CO_ELEVATOR", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 11, + "y": 14, + "elevation": 3, + "item": "ITEM_MAX_POTION", + "flag": "25", + "unknown": 1 + }, + { + "type": "bg_event_type_0", + "x": 3, + "y": 10, + "elevation": 0, + "script": "SilphCo_9F_EventScript_1A8A87" + }, + { + "type": "bg_event_type_0", + "x": 3, + "y": 11, + "elevation": 0, + "script": "SilphCo_9F_EventScript_1A8A87" + }, + { + "type": "bg_event_type_0", + "x": 13, + "y": 16, + "elevation": 0, + "script": "SilphCo_9F_EventScript_1A8AA1" + }, + { + "type": "bg_event_type_0", + "x": 13, + "y": 17, + "elevation": 0, + "script": "SilphCo_9F_EventScript_1A8AA1" + }, + { + "type": "bg_event_type_0", + "x": 21, + "y": 6, + "elevation": 0, + "script": "SilphCo_9F_EventScript_1A8ABB" + }, + { + "type": "bg_event_type_0", + "x": 22, + "y": 6, + "elevation": 0, + "script": "SilphCo_9F_EventScript_1A8ABB" + }, + { + "type": "bg_event_type_0", + "x": 22, + "y": 7, + "elevation": 0, + "script": "SilphCo_9F_EventScript_1A8ABB" + }, + { + "type": "bg_event_type_0", + "x": 21, + "y": 7, + "elevation": 0, + "script": "SilphCo_9F_EventScript_1A8ABB" + }, + { + "type": "bg_event_type_0", + "x": 21, + "y": 13, + "elevation": 0, + "script": "SilphCo_9F_EventScript_1A8AD5" + }, + { + "type": "bg_event_type_0", + "x": 21, + "y": 12, + "elevation": 0, + "script": "SilphCo_9F_EventScript_1A8AD5" + }, + { + "type": "bg_event_type_0", + "x": 22, + "y": 12, + "elevation": 0, + "script": "SilphCo_9F_EventScript_1A8AD5" + }, + { + "type": "bg_event_type_0", + "x": 22, + "y": 13, + "elevation": 0, + "script": "SilphCo_9F_EventScript_1A8AD5" + }, + { + "type": "bg_event_type_0", + "x": 2, + "y": 11, + "elevation": 0, + "script": "SilphCo_9F_EventScript_1A8A87" + }, + { + "type": "bg_event_type_0", + "x": 2, + "y": 10, + "elevation": 0, + "script": "SilphCo_9F_EventScript_1A8A87" + }, + { + "type": "bg_event_type_0", + "x": 12, + "y": 16, + "elevation": 0, + "script": "SilphCo_9F_EventScript_1A8AA1" + }, + { + "type": "bg_event_type_0", + "x": 12, + "y": 17, + "elevation": 0, + "script": "SilphCo_9F_EventScript_1A8AA1" + }, + { + "type": "hidden_item", + "x": 5, + "y": 8, + "elevation": 0, + "item": "ITEM_CALCIUM", + "flag": "142", + "unknown": 1 + }, + { + "type": "bg_event_type_0", + "x": 17, + "y": 1, + "elevation": 0, + "script": "SilphCo_9F_EventScript_161D38" + } + ] +} \ No newline at end of file diff --git a/data/maps/SilphCo_Elevator/events.inc b/data/maps/SilphCo_Elevator/events.inc deleted file mode 100644 index 90faa28a2..000000000 --- a/data/maps/SilphCo_Elevator/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -SilphCo_Elevator_MapWarps: - warp_def 2, 5, 3, 127, 32639 - -SilphCo_Elevator_MapBGEvents: - bg_event 0, 2, 3, 0, 0, SilphCo_Elevator_EventScript_161F6F - -SilphCo_Elevator_MapEvents:: - map_events 0x0, SilphCo_Elevator_MapWarps, 0x0, SilphCo_Elevator_MapBGEvents diff --git a/data/maps/SilphCo_Elevator/header.inc b/data/maps/SilphCo_Elevator/header.inc deleted file mode 100644 index abfebcfd4..000000000 --- a/data/maps/SilphCo_Elevator/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SilphCo_Elevator:: @ 834F86C - .4byte SilphCo_Elevator_Layout @ 0x8321330 - .4byte SilphCo_Elevator_MapEvents @ 0x83B0B6C - .4byte SilphCo_Elevator_MapScripts @ 0x8161F6E - .4byte NULL - .2byte BGM_FRLG_SILPH - .2byte 229 - .byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/SilphCo_Elevator/map.json b/data/maps/SilphCo_Elevator/map.json new file mode 100644 index 000000000..a1208a5d8 --- /dev/null +++ b/data/maps/SilphCo_Elevator/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_SILPH_CO_ELEVATOR", + "name": "SilphCo_Elevator", + "layout": "LAYOUT_SILPH_CO_ELEVATOR", + "music": "BGM_FRLG_SILPH", + "region_map_section": "MAPSEC_SILPH_CO", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 2, + "y": 5, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 0, + "y": 2, + "elevation": 3, + "script": "SilphCo_Elevator_EventScript_161F6F" + } + ] +} \ No newline at end of file diff --git a/data/maps/SixIsland/connections.inc b/data/maps/SixIsland/connections.inc deleted file mode 100644 index 712c8e2cf..000000000 --- a/data/maps/SixIsland/connections.inc +++ /dev/null @@ -1,6 +0,0 @@ -SixIsland_MapConnectionsList: @ 83529C8 - connection right, -40, MAP_SIX_ISLAND_WATERPATH - -SixIsland_MapConnections:: @ 83529D4 - .4byte 1 - .4byte SixIsland_MapConnectionsList diff --git a/data/maps/SixIsland/events.inc b/data/maps/SixIsland/events.inc deleted file mode 100644 index 71688d896..000000000 --- a/data/maps/SixIsland/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -SixIsland_EventObjects: - object_event 1, 19, 0, 10, 0, 15, 0, 3, 9, 17, 0, 0, 0, 0, 0, SixIsland_EventScript_167EEB, 0, 0, 0 - object_event 2, 56, 0, 15, 0, 13, 0, 3, 18, 17, 0, 0, 0, 0, 0, SixIsland_EventScript_167EE2, 0, 0, 0 - -SixIsland_MapWarps: - warp_def 11, 23, 3, 0, 9474 - warp_def 11, 11, 0, 0, 9472 - warp_def 16, 17, 0, 0, 9475 - warp_def 20, 11, 0, 0, 9476 - -SixIsland_MapBGEvents: - bg_event 9, 17, 0, 0, 0, SixIsland_EventScript_167EF4 - bg_event 9, 7, 3, 7, 0, 138, 184, 1 - -SixIsland_MapEvents:: - map_events SixIsland_EventObjects, SixIsland_MapWarps, 0x0, SixIsland_MapBGEvents diff --git a/data/maps/SixIsland/header.inc b/data/maps/SixIsland/header.inc deleted file mode 100644 index 3c6a68277..000000000 --- a/data/maps/SixIsland/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SixIsland:: @ 8350810 - .4byte SixIsland_Layout @ 0x832430C - .4byte SixIsland_MapEvents @ 0x83B65F8 - .4byte SixIsland_MapScripts @ 0x8167ED8 - .4byte SixIsland_MapConnections @ 0x83529D4 - .2byte BGM_FRLG_ISLAND_SIX - .2byte 236 - .byte 0x95, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/SixIsland/map.json b/data/maps/SixIsland/map.json new file mode 100644 index 000000000..0f5344713 --- /dev/null +++ b/data/maps/SixIsland/map.json @@ -0,0 +1,98 @@ +{ + "id": "MAP_SIX_ISLAND", + "name": "SixIsland", + "layout": "LAYOUT_SIX_ISLAND", + "music": "BGM_FRLG_ISLAND_SIX", + "region_map_section": "MAPSEC_SIX_ISLAND", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_1", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_SIX_ISLAND_WATER_PATH", + "offset": -40, + "direction": "right" + } + ], + "object_events": [ + { + "graphics_id": "19", + "x": 10, + "y": 15, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SixIsland_EventScript_167EEB", + "flag": "0" + }, + { + "graphics_id": "56", + "x": 15, + "y": 13, + "elevation": 3, + "movement_type": "18", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SixIsland_EventScript_167EE2", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 11, + "y": 23, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_HARBOR", + "dest_warp_id": 0 + }, + { + "x": 11, + "y": 11, + "elevation": 0, + "dest_map": "MAP_SIX_ISLAND_POKEMON_CENTER_1F", + "dest_warp_id": 0 + }, + { + "x": 16, + "y": 17, + "elevation": 0, + "dest_map": "MAP_SIX_ISLAND_HOUSE", + "dest_warp_id": 0 + }, + { + "x": 20, + "y": 11, + "elevation": 0, + "dest_map": "MAP_SIX_ISLAND_MART", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 9, + "y": 17, + "elevation": 0, + "script": "SixIsland_EventScript_167EF4" + }, + { + "type": "hidden_item", + "x": 9, + "y": 7, + "elevation": 3, + "item": "ITEM_LEPPA_BERRY", + "flag": "184", + "unknown": 1 + } + ] +} \ No newline at end of file diff --git a/data/maps/SixIsland_AlteringCave/map.json b/data/maps/SixIsland_AlteringCave/map.json new file mode 100644 index 000000000..123c8e6bb --- /dev/null +++ b/data/maps/SixIsland_AlteringCave/map.json @@ -0,0 +1,27 @@ +{ + "id": "MAP_SIX_ISLAND_ALTERING_CAVE", + "name": "SixIsland_AlteringCave", + "layout": "LAYOUT_SIX_ISLAND_ALTERING_CAVE", + "music": "BGM_FRLG_MT_EMBER", + "region_map_section": "MAPSEC_ALTERING_CAVE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 18, + "y": 22, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_OUTCAST_ISLAND", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SixIsland_AlteringCave/scripts.inc b/data/maps/SixIsland_AlteringCave/scripts.inc new file mode 100644 index 000000000..f88377e5f --- /dev/null +++ b/data/maps/SixIsland_AlteringCave/scripts.inc @@ -0,0 +1,7 @@ +SixIsland_AlteringCave_MapScripts:: @ 81646A4 + map_script 3, SSAnne_1F_Room12_MapScript1_1646AA + .byte 0 + +SSAnne_1F_Room12_MapScript1_1646AA:: @ 81646AA + setworldmapflag 2238 + end diff --git a/data/maps/SixIsland_DottedHole_1F/map.json b/data/maps/SixIsland_DottedHole_1F/map.json new file mode 100644 index 000000000..3edfe625f --- /dev/null +++ b/data/maps/SixIsland_DottedHole_1F/map.json @@ -0,0 +1,48 @@ +{ + "id": "MAP_SIX_ISLAND_DOTTED_HOLE_1F", + "name": "SixIsland_DottedHole_1F", + "layout": "LAYOUT_SIX_ISLAND_DOTTED_HOLE_1F", + "music": "BGM_FRLG_TANOBY_RUINS", + "region_map_section": "MAPSEC_DOTTED_HOLE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 6, + "y": 9, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_RUIN_VALLEY", + "dest_warp_id": 0 + }, + { + "x": 6, + "y": 5, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_B1F", + "dest_warp_id": 0 + }, + { + "x": 13, + "y": 5, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_SAPPHIRE_ROOM", + "dest_warp_id": 0 + }, + { + "x": 6, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_B1F", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SixIsland_DottedHole_1F/scripts.inc b/data/maps/SixIsland_DottedHole_1F/scripts.inc new file mode 100644 index 000000000..df572ad4d --- /dev/null +++ b/data/maps/SixIsland_DottedHole_1F/scripts.inc @@ -0,0 +1,35 @@ +SixIsland_DottedHole_1F_MapScripts:: @ 8164182 + map_script 3, SSAnne_CaptainsOffice5_MapScript1_164188 + .byte 0 + +SSAnne_CaptainsOffice5_MapScript1_164188:: @ 8164188 + setworldmapflag 2235 + end + +SixIsland_DottedHole_B1F_EventScript_16418C:: @ 816418C + lockall + braillemessage gUnknown_81A9288 + waitbuttonpress + releaseall + end + +SSAnne_CaptainsOffice9_EventScript_164195:: @ 8164195 + lockall + braillemessage gUnknown_81A928B + waitbuttonpress + releaseall + end + +SixIsland_DottedHole_B3F_EventScript_16419E:: @ 816419E + lockall + braillemessage gUnknown_81A9290 + waitbuttonpress + releaseall + end + +SixIsland_DottedHole_B2F_EventScript_1641A7:: @ 81641A7 + lockall + braillemessage gUnknown_81A9296 + waitbuttonpress + releaseall + end diff --git a/data/maps/SixIsland_DottedHole_B1F/events.inc b/data/maps/SixIsland_DottedHole_B1F/events.inc deleted file mode 100644 index c871cb9b3..000000000 --- a/data/maps/SixIsland_DottedHole_B1F/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -SixIsland_DottedHole_B1F_MapWarps: - warp_def 6, 7, 3, 1, 371 - warp_def 6, 1, 3, 0, 373 - warp_def 11, 5, 3, 3, 371 - warp_def 6, 9, 3, 3, 371 - warp_def 1, 5, 3, 3, 371 - -SixIsland_DottedHole_B1F_MapBGEvents: - bg_event 6, 5, 0, 1, 0, SixIsland_DottedHole_B1F_EventScript_16418C - -SixIsland_DottedHole_B1F_MapEvents:: - map_events 0x0, SixIsland_DottedHole_B1F_MapWarps, 0x0, SixIsland_DottedHole_B1F_MapBGEvents diff --git a/data/maps/SixIsland_DottedHole_B1F/header.inc b/data/maps/SixIsland_DottedHole_B1F/header.inc deleted file mode 100644 index e6781f0e2..000000000 --- a/data/maps/SixIsland_DottedHole_B1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SixIsland_DottedHole_B1F:: @ 834FEC4 - .4byte SixIsland_DottedHole_B1F_Layout @ 0x8343808 - .4byte SixIsland_DottedHole_B1F_MapEvents @ 0x83B3898 - .4byte SixIsland_DottedHole_B1F_MapScripts @ 0x81641B0 - .4byte NULL - .2byte BGM_FRLG_TANOBY_RUINS - .2byte 310 - .byte 0xb4, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/SixIsland_DottedHole_B1F/map.json b/data/maps/SixIsland_DottedHole_B1F/map.json new file mode 100644 index 000000000..221b7f31a --- /dev/null +++ b/data/maps/SixIsland_DottedHole_B1F/map.json @@ -0,0 +1,63 @@ +{ + "id": "MAP_SIX_ISLAND_DOTTED_HOLE_B1F", + "name": "SixIsland_DottedHole_B1F", + "layout": "LAYOUT_SIX_ISLAND_DOTTED_HOLE_B1F", + "music": "BGM_FRLG_TANOBY_RUINS", + "region_map_section": "MAPSEC_DOTTED_HOLE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 6, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_1F", + "dest_warp_id": 1 + }, + { + "x": 6, + "y": 1, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_B2F", + "dest_warp_id": 0 + }, + { + "x": 11, + "y": 5, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_1F", + "dest_warp_id": 3 + }, + { + "x": 6, + "y": 9, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_1F", + "dest_warp_id": 3 + }, + { + "x": 1, + "y": 5, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_1F", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_1", + "x": 6, + "y": 5, + "elevation": 0, + "script": "SixIsland_DottedHole_B1F_EventScript_16418C" + } + ] +} \ No newline at end of file diff --git a/data/maps/SixIsland_DottedHole_B2F/events.inc b/data/maps/SixIsland_DottedHole_B2F/events.inc deleted file mode 100644 index 14b3b3f1e..000000000 --- a/data/maps/SixIsland_DottedHole_B2F/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -SixIsland_DottedHole_B2F_MapWarps: - warp_def 6, 7, 3, 1, 372 - warp_def 6, 1, 3, 3, 371 - warp_def 11, 5, 3, 3, 371 - warp_def 6, 9, 3, 3, 371 - warp_def 1, 5, 3, 0, 374 - -SixIsland_DottedHole_B2F_MapBGEvents: - bg_event 6, 5, 0, 1, 0, SixIsland_DottedHole_B2F_EventScript_1641A7 - -SixIsland_DottedHole_B2F_MapEvents:: - map_events 0x0, SixIsland_DottedHole_B2F_MapWarps, 0x0, SixIsland_DottedHole_B2F_MapBGEvents diff --git a/data/maps/SixIsland_DottedHole_B2F/header.inc b/data/maps/SixIsland_DottedHole_B2F/header.inc deleted file mode 100644 index 5b02b306b..000000000 --- a/data/maps/SixIsland_DottedHole_B2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SixIsland_DottedHole_B2F:: @ 834FEE0 - .4byte SixIsland_DottedHole_B2F_Layout @ 0x834394C - .4byte SixIsland_DottedHole_B2F_MapEvents @ 0x83B38E0 - .4byte SixIsland_DottedHole_B2F_MapScripts @ 0x81641B1 - .4byte NULL - .2byte BGM_FRLG_TANOBY_RUINS - .2byte 311 - .byte 0xb4, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/SixIsland_DottedHole_B2F/map.json b/data/maps/SixIsland_DottedHole_B2F/map.json new file mode 100644 index 000000000..7c43b1177 --- /dev/null +++ b/data/maps/SixIsland_DottedHole_B2F/map.json @@ -0,0 +1,63 @@ +{ + "id": "MAP_SIX_ISLAND_DOTTED_HOLE_B2F", + "name": "SixIsland_DottedHole_B2F", + "layout": "LAYOUT_SIX_ISLAND_DOTTED_HOLE_B2F", + "music": "BGM_FRLG_TANOBY_RUINS", + "region_map_section": "MAPSEC_DOTTED_HOLE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 6, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_B1F", + "dest_warp_id": 1 + }, + { + "x": 6, + "y": 1, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_1F", + "dest_warp_id": 3 + }, + { + "x": 11, + "y": 5, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_1F", + "dest_warp_id": 3 + }, + { + "x": 6, + "y": 9, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_1F", + "dest_warp_id": 3 + }, + { + "x": 1, + "y": 5, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_B3F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_1", + "x": 6, + "y": 5, + "elevation": 0, + "script": "SixIsland_DottedHole_B2F_EventScript_1641A7" + } + ] +} \ No newline at end of file diff --git a/data/maps/SixIsland_DottedHole_B3F/events.inc b/data/maps/SixIsland_DottedHole_B3F/events.inc deleted file mode 100644 index 684924658..000000000 --- a/data/maps/SixIsland_DottedHole_B3F/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -SixIsland_DottedHole_B3F_MapWarps: - warp_def 6, 7, 3, 4, 373 - warp_def 6, 1, 3, 3, 371 - warp_def 11, 5, 3, 0, 375 - warp_def 6, 9, 3, 3, 371 - warp_def 1, 5, 3, 3, 371 - -SixIsland_DottedHole_B3F_MapBGEvents: - bg_event 6, 5, 0, 1, 0, SixIsland_DottedHole_B3F_EventScript_16419E - -SixIsland_DottedHole_B3F_MapEvents:: - map_events 0x0, SixIsland_DottedHole_B3F_MapWarps, 0x0, SixIsland_DottedHole_B3F_MapBGEvents diff --git a/data/maps/SixIsland_DottedHole_B3F/header.inc b/data/maps/SixIsland_DottedHole_B3F/header.inc deleted file mode 100644 index 0484d6fb4..000000000 --- a/data/maps/SixIsland_DottedHole_B3F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SixIsland_DottedHole_B3F:: @ 834FEFC - .4byte SixIsland_DottedHole_B3F_Layout @ 0x8343A90 - .4byte SixIsland_DottedHole_B3F_MapEvents @ 0x83B3928 - .4byte SixIsland_DottedHole_B3F_MapScripts @ 0x81641B2 - .4byte NULL - .2byte BGM_FRLG_TANOBY_RUINS - .2byte 312 - .byte 0xb4, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/SixIsland_DottedHole_B3F/map.json b/data/maps/SixIsland_DottedHole_B3F/map.json new file mode 100644 index 000000000..dddb7b32c --- /dev/null +++ b/data/maps/SixIsland_DottedHole_B3F/map.json @@ -0,0 +1,63 @@ +{ + "id": "MAP_SIX_ISLAND_DOTTED_HOLE_B3F", + "name": "SixIsland_DottedHole_B3F", + "layout": "LAYOUT_SIX_ISLAND_DOTTED_HOLE_B3F", + "music": "BGM_FRLG_TANOBY_RUINS", + "region_map_section": "MAPSEC_DOTTED_HOLE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 6, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_B2F", + "dest_warp_id": 4 + }, + { + "x": 6, + "y": 1, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_1F", + "dest_warp_id": 3 + }, + { + "x": 11, + "y": 5, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_B4F", + "dest_warp_id": 0 + }, + { + "x": 6, + "y": 9, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_1F", + "dest_warp_id": 3 + }, + { + "x": 1, + "y": 5, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_1F", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_1", + "x": 6, + "y": 5, + "elevation": 0, + "script": "SixIsland_DottedHole_B3F_EventScript_16419E" + } + ] +} \ No newline at end of file diff --git a/data/maps/SixIsland_DottedHole_B4F/map.json b/data/maps/SixIsland_DottedHole_B4F/map.json new file mode 100644 index 000000000..40080b501 --- /dev/null +++ b/data/maps/SixIsland_DottedHole_B4F/map.json @@ -0,0 +1,63 @@ +{ + "id": "MAP_SIX_ISLAND_DOTTED_HOLE_B4F", + "name": "SixIsland_DottedHole_B4F", + "layout": "LAYOUT_SIX_ISLAND_DOTTED_HOLE_B4F", + "music": "BGM_FRLG_TANOBY_RUINS", + "region_map_section": "MAPSEC_DOTTED_HOLE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 6, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_B3F", + "dest_warp_id": 2 + }, + { + "x": 6, + "y": 1, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_1F", + "dest_warp_id": 3 + }, + { + "x": 11, + "y": 5, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_1F", + "dest_warp_id": 3 + }, + { + "x": 6, + "y": 9, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_SAPPHIRE_ROOM", + "dest_warp_id": 1 + }, + { + "x": 1, + "y": 5, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_1F", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_1", + "x": 6, + "y": 5, + "elevation": 0, + "script": "SSAnne_CaptainsOffice9_EventScript_164195" + } + ] +} \ No newline at end of file diff --git a/data/maps/SixIsland_DottedHole_B4F/scripts.inc b/data/maps/SixIsland_DottedHole_B4F/scripts.inc new file mode 100644 index 000000000..d265594c7 --- /dev/null +++ b/data/maps/SixIsland_DottedHole_B4F/scripts.inc @@ -0,0 +1,2 @@ +SixIsland_DottedHole_B4F_MapScripts:: @ 81641B3 + .byte 0 diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/events.inc b/data/maps/SixIsland_DottedHole_SapphireRoom/events.inc deleted file mode 100644 index 2d8531934..000000000 --- a/data/maps/SixIsland_DottedHole_SapphireRoom/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -SixIsland_DottedHole_SapphireRoom_EventObjects: - object_event 1, 100, 0, 7, 0, 7, 0, 0, 8, 17, 0, 0, 0, 0, 0, SixIsland_DottedHole_SapphireRoom_EventScript_1641B5, 143, 0, 0 - object_event 2, 55, 0, 5, 0, 9, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, 144, 0, 0 - -SixIsland_DottedHole_SapphireRoom_MapWarps: - warp_def 11, 7, 3, 2, 371 - warp_def 5, 9, 3, 3, 375 - -SixIsland_DottedHole_SapphireRoom_MapBGEvents: - bg_event 7, 2, 0, 1, 0, SixIsland_DottedHole_SapphireRoom_EventScript_16441F - -SixIsland_DottedHole_SapphireRoom_MapEvents:: - map_events SixIsland_DottedHole_SapphireRoom_EventObjects, SixIsland_DottedHole_SapphireRoom_MapWarps, 0x0, SixIsland_DottedHole_SapphireRoom_MapBGEvents diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/header.inc b/data/maps/SixIsland_DottedHole_SapphireRoom/header.inc deleted file mode 100644 index cb34017a5..000000000 --- a/data/maps/SixIsland_DottedHole_SapphireRoom/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SixIsland_DottedHole_SapphireRoom:: @ 834FF34 - .4byte SixIsland_DottedHole_SapphireRoom_Layout @ 0x8343DD8 - .4byte SixIsland_DottedHole_SapphireRoom_MapEvents @ 0x83B39D0 - .4byte SixIsland_DottedHole_SapphireRoom_MapScripts @ 0x81641B4 - .4byte NULL - .2byte BGM_FRLG_TANOBY_RUINS - .2byte 314 - .byte 0xb4, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/map.json b/data/maps/SixIsland_DottedHole_SapphireRoom/map.json new file mode 100644 index 000000000..08894ae8c --- /dev/null +++ b/data/maps/SixIsland_DottedHole_SapphireRoom/map.json @@ -0,0 +1,69 @@ +{ + "id": "MAP_SIX_ISLAND_DOTTED_HOLE_SAPPHIRE_ROOM", + "name": "SixIsland_DottedHole_SapphireRoom", + "layout": "LAYOUT_SIX_ISLAND_DOTTED_HOLE_SAPPHIRE_ROOM", + "music": "BGM_FRLG_TANOBY_RUINS", + "region_map_section": "MAPSEC_DOTTED_HOLE", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "100", + "x": 7, + "y": 7, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SixIsland_DottedHole_SapphireRoom_EventScript_1641B5", + "flag": "143" + }, + { + "graphics_id": "55", + "x": 5, + "y": 9, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "144" + } + ], + "warp_events": [ + { + "x": 11, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_1F", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 9, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_B4F", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_1", + "x": 7, + "y": 2, + "elevation": 0, + "script": "SixIsland_DottedHole_SapphireRoom_EventScript_16441F" + } + ] +} \ No newline at end of file diff --git a/data/maps/SixIsland_GreenPath/connections.inc b/data/maps/SixIsland_GreenPath/connections.inc deleted file mode 100644 index d79db04f9..000000000 --- a/data/maps/SixIsland_GreenPath/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -SixIsland_GreenPath_MapConnectionsList: @ 8352E24 - connection up, 0, MAP_SIX_ISLAND_OUTCASTISLAND - connection right, 0, MAP_SIX_ISLAND_WATERPATH - -SixIsland_GreenPath_MapConnections:: @ 8352E3C - .4byte 2 - .4byte SixIsland_GreenPath_MapConnectionsList diff --git a/data/maps/SixIsland_GreenPath/events.inc b/data/maps/SixIsland_GreenPath/events.inc deleted file mode 100644 index 025b2dba6..000000000 --- a/data/maps/SixIsland_GreenPath/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -SixIsland_GreenPath_EventObjects: - object_event 1, 23, 0, 11, 0, 8, 0, 3, 20, 17, 0, 1, 0, 2, 0, SixIsland_GreenPath_EventScript_1AC517, 0, 0, 0 - -SixIsland_GreenPath_MapWarps: - warp_def 63, 10, 3, 1, 377 - warp_def 64, 10, 3, 1, 377 - warp_def 45, 10, 3, 4, 377 - warp_def 46, 10, 3, 4, 377 - -SixIsland_GreenPath_MapBGEvents: - bg_event 40, 10, 0, 0, 0, SixIsland_GreenPath_EventScript_168B37 - bg_event 69, 10, 0, 0, 0, SixIsland_GreenPath_EventScript_168B2E - bg_event 12, 9, 3, 7, 0, 2, 180, 1 - -SixIsland_GreenPath_MapEvents:: - map_events SixIsland_GreenPath_EventObjects, SixIsland_GreenPath_MapWarps, 0x0, SixIsland_GreenPath_MapBGEvents diff --git a/data/maps/SixIsland_GreenPath/header.inc b/data/maps/SixIsland_GreenPath/header.inc deleted file mode 100644 index 7e378de71..000000000 --- a/data/maps/SixIsland_GreenPath/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SixIsland_GreenPath:: @ 8350C8C - .4byte SixIsland_GreenPath_Layout @ 0x832E0D0 - .4byte SixIsland_GreenPath_MapEvents @ 0x83B8FA8 - .4byte SixIsland_GreenPath_MapScripts @ 0x8168B2D - .4byte SixIsland_GreenPath_MapConnections @ 0x8352E3C - .2byte BGM_FRLG_SEVII_ISLANDS - .2byte 251 - .byte 0xa4, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/SixIsland_GreenPath/map.json b/data/maps/SixIsland_GreenPath/map.json new file mode 100644 index 000000000..cbc6b6784 --- /dev/null +++ b/data/maps/SixIsland_GreenPath/map.json @@ -0,0 +1,97 @@ +{ + "id": "MAP_SIX_ISLAND_GREEN_PATH", + "name": "SixIsland_GreenPath", + "layout": "LAYOUT_SIX_ISLAND_GREEN_PATH", + "music": "BGM_FRLG_SEVII_ISLANDS", + "region_map_section": "MAPSEC_GREEN_PATH", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_SIX_ISLAND_OUTCAST_ISLAND", + "offset": 0, + "direction": "up" + }, + { + "map": "MAP_SIX_ISLAND_WATER_PATH", + "offset": 0, + "direction": "right" + } + ], + "object_events": [ + { + "graphics_id": "23", + "x": 11, + "y": 8, + "elevation": 3, + "movement_type": "20", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "SixIsland_GreenPath_EventScript_1AC517", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 63, + "y": 10, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_PATTERN_BUSH", + "dest_warp_id": 1 + }, + { + "x": 64, + "y": 10, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_PATTERN_BUSH", + "dest_warp_id": 1 + }, + { + "x": 45, + "y": 10, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_PATTERN_BUSH", + "dest_warp_id": 4 + }, + { + "x": 46, + "y": 10, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_PATTERN_BUSH", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 40, + "y": 10, + "elevation": 0, + "script": "SixIsland_GreenPath_EventScript_168B37" + }, + { + "type": "bg_event_type_0", + "x": 69, + "y": 10, + "elevation": 0, + "script": "SixIsland_GreenPath_EventScript_168B2E" + }, + { + "type": "hidden_item", + "x": 12, + "y": 9, + "elevation": 3, + "item": "POCKET_KEY_ITEMS", + "flag": "180", + "unknown": 1 + } + ] +} \ No newline at end of file diff --git a/data/maps/SixIsland_Harbor/events.inc b/data/maps/SixIsland_Harbor/events.inc deleted file mode 100644 index 7ef15357c..000000000 --- a/data/maps/SixIsland_Harbor/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -SixIsland_Harbor_EventObjects: - object_event 1, 108, 0, 8, 0, 9, 0, 0, 8, 17, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 2, 62, 0, 8, 0, 6, 0, 3, 7, 17, 0, 0, 0, 0, 0, SixIsland_Harbor_EventScript_171E48, 0, 0, 0 - -SixIsland_Harbor_MapWarps: - warp_def 8, 2, 3, 0, 786 - -SixIsland_Harbor_MapEvents:: - map_events SixIsland_Harbor_EventObjects, SixIsland_Harbor_MapWarps, 0x0, 0x0 diff --git a/data/maps/SixIsland_Harbor/header.inc b/data/maps/SixIsland_Harbor/header.inc deleted file mode 100644 index edbb428b0..000000000 --- a/data/maps/SixIsland_Harbor/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SixIsland_Harbor:: @ 8351F08 - .4byte Island_Harbor_Layout @ 0x8343FB8 - .4byte SixIsland_Harbor_MapEvents @ 0x83BF178 - .4byte SixIsland_Harbor_MapScripts @ 0x8171E47 - .4byte NULL - .2byte BGM_FRLG_ISLAND_SIX - .2byte 315 - .byte 0x95, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/SixIsland_Harbor/map.json b/data/maps/SixIsland_Harbor/map.json new file mode 100644 index 000000000..3e5254f71 --- /dev/null +++ b/data/maps/SixIsland_Harbor/map.json @@ -0,0 +1,54 @@ +{ + "id": "MAP_SIX_ISLAND_HARBOR", + "name": "SixIsland_Harbor", + "layout": "LAYOUT_ISLAND_HARBOR", + "music": "BGM_FRLG_ISLAND_SIX", + "region_map_section": "MAPSEC_SIX_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "108", + "x": 8, + "y": 9, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "62", + "x": 8, + "y": 6, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SixIsland_Harbor_EventScript_171E48", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 8, + "y": 2, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SixIsland_House/events.inc b/data/maps/SixIsland_House/events.inc deleted file mode 100644 index 583a8c1e8..000000000 --- a/data/maps/SixIsland_House/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -SixIsland_House_EventObjects: - object_event 1, 32, 0, 7, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, SixIsland_House_EventScript_171E5C, 0, 0, 0 - -SixIsland_House_MapWarps: - warp_def 4, 7, 3, 2, 786 - -SixIsland_House_MapEvents:: - map_events SixIsland_House_EventObjects, SixIsland_House_MapWarps, 0x0, 0x0 diff --git a/data/maps/SixIsland_House/header.inc b/data/maps/SixIsland_House/header.inc deleted file mode 100644 index a98057971..000000000 --- a/data/maps/SixIsland_House/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SixIsland_House:: @ 8351F24 - .4byte House3_Layout @ 0x82D5CB8 - .4byte SixIsland_House_MapEvents @ 0x83BF1AC - .4byte SixIsland_House_MapScripts @ 0x8171E5B - .4byte NULL - .2byte BGM_FRLG_ISLAND_SIX - .2byte 11 - .byte 0x95, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/SixIsland_House/map.json b/data/maps/SixIsland_House/map.json new file mode 100644 index 000000000..3f50160d3 --- /dev/null +++ b/data/maps/SixIsland_House/map.json @@ -0,0 +1,41 @@ +{ + "id": "MAP_SIX_ISLAND_HOUSE", + "name": "SixIsland_House", + "layout": "LAYOUT_HOUSE3", + "music": "BGM_FRLG_ISLAND_SIX", + "region_map_section": "MAPSEC_SIX_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "32", + "x": 7, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SixIsland_House_EventScript_171E5C", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SixIsland_Mart/events.inc b/data/maps/SixIsland_Mart/events.inc deleted file mode 100644 index a2dd4ff20..000000000 --- a/data/maps/SixIsland_Mart/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -SixIsland_Mart_EventObjects: - object_event 1, 68, 0, 2, 0, 3, 0, 0, 10, 17, 0, 0, 0, 0, 0, SixIsland_Mart_EventScript_171E66, 0, 0, 0 - object_event 2, 35, 0, 8, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, SixIsland_Mart_EventScript_1ACFEF, 0, 0, 0 - object_event 3, 40, 0, 7, 0, 7, 0, 3, 2, 17, 0, 0, 0, 0, 0, SixIsland_Mart_EventScript_171EA0, 0, 0, 0 - -SixIsland_Mart_MapWarps: - warp_def 4, 7, 3, 3, 786 - -SixIsland_Mart_MapEvents:: - map_events SixIsland_Mart_EventObjects, SixIsland_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/SixIsland_Mart/header.inc b/data/maps/SixIsland_Mart/header.inc deleted file mode 100644 index d7483ec18..000000000 --- a/data/maps/SixIsland_Mart/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SixIsland_Mart:: @ 8351F40 - .4byte Mart_Layout @ 0x82D5BCC - .4byte SixIsland_Mart_MapEvents @ 0x83BF210 - .4byte SixIsland_Mart_MapScripts @ 0x8171E65 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 10 - .byte 0x95, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/SixIsland_Mart/map.json b/data/maps/SixIsland_Mart/map.json new file mode 100644 index 000000000..a30466efb --- /dev/null +++ b/data/maps/SixIsland_Mart/map.json @@ -0,0 +1,67 @@ +{ + "id": "MAP_SIX_ISLAND_MART", + "name": "SixIsland_Mart", + "layout": "LAYOUT_MART", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_SIX_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "68", + "x": 2, + "y": 3, + "elevation": 0, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SixIsland_Mart_EventScript_171E66", + "flag": "0" + }, + { + "graphics_id": "35", + "x": 8, + "y": 3, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SixIsland_Mart_EventScript_1ACFEF", + "flag": "0" + }, + { + "graphics_id": "40", + "x": 7, + "y": 7, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SixIsland_Mart_EventScript_171EA0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SixIsland_OutcastIsland/connections.inc b/data/maps/SixIsland_OutcastIsland/connections.inc deleted file mode 100644 index 90a67ec97..000000000 --- a/data/maps/SixIsland_OutcastIsland/connections.inc +++ /dev/null @@ -1,6 +0,0 @@ -SixIsland_OutcastIsland_MapConnectionsList: @ 8352E10 - connection down, 0, MAP_SIX_ISLAND_GREENPATH - -SixIsland_OutcastIsland_MapConnections:: @ 8352E1C - .4byte 1 - .4byte SixIsland_OutcastIsland_MapConnectionsList diff --git a/data/maps/SixIsland_OutcastIsland/events.inc b/data/maps/SixIsland_OutcastIsland/events.inc deleted file mode 100644 index 4c7dd1b88..000000000 --- a/data/maps/SixIsland_OutcastIsland/events.inc +++ /dev/null @@ -1,18 +0,0 @@ -SixIsland_OutcastIsland_EventObjects: - object_event 1, 49, 0, 9, 0, 24, 0, 3, 1, 17, 0, 1, 0, 1, 0, SixIsland_OutcastIsland_EventScript_168B16, 136, 0, 0 - object_event 2, 57, 0, 12, 0, 15, 0, 3, 7, 17, 0, 1, 0, 1, 0, SixIsland_OutcastIsland_EventScript_1AC3D1, 0, 0, 0 - object_event 3, 43, 0, 13, 0, 34, 0, 1, 1, 17, 0, 1, 0, 1, 0, SixIsland_OutcastIsland_EventScript_1AC40F, 0, 0, 0 - object_event 4, 44, 0, 14, 0, 61, 0, 1, 50, 66, 0, 1, 0, 1, 0, SixIsland_OutcastIsland_EventScript_1AC44D, 0, 0, 0 - object_event 5, 44, 0, 10, 0, 44, 0, 1, 7, 17, 0, 1, 0, 1, 0, SixIsland_OutcastIsland_EventScript_1AC48B, 0, 0, 0 - object_event 6, 36, 0, 11, 0, 44, 0, 1, 7, 17, 0, 1, 0, 1, 0, SixIsland_OutcastIsland_EventScript_1AC4D1, 0, 0, 0 - object_event 7, 92, 0, 11, 0, 16, 0, 3, 8, 17, 0, 0, 0, 0, 0, SixIsland_OutcastIsland_EventScript_1BEC90, 481, 0, 0 - -SixIsland_OutcastIsland_MapWarps: - warp_def 7, 21, 3, 0, 378 - -SixIsland_OutcastIsland_MapBGEvents: - bg_event 16, 23, 3, 7, 0, 109, 178, 1 - bg_event 6, 24, 3, 7, 0, 6, 179, 1 - -SixIsland_OutcastIsland_MapEvents:: - map_events SixIsland_OutcastIsland_EventObjects, SixIsland_OutcastIsland_MapWarps, 0x0, SixIsland_OutcastIsland_MapBGEvents diff --git a/data/maps/SixIsland_OutcastIsland/header.inc b/data/maps/SixIsland_OutcastIsland/header.inc deleted file mode 100644 index e6cc6186d..000000000 --- a/data/maps/SixIsland_OutcastIsland/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SixIsland_OutcastIsland:: @ 8350C70 - .4byte SixIsland_OutcastIsland_Layout @ 0x832D56C - .4byte SixIsland_OutcastIsland_MapEvents @ 0x83B8F38 - .4byte SixIsland_OutcastIsland_MapScripts @ 0x8168B15 - .4byte SixIsland_OutcastIsland_MapConnections @ 0x8352E1C - .2byte BGM_FRLG_SEVII_ISLANDS - .2byte 250 - .byte 0xa3, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/SixIsland_OutcastIsland/map.json b/data/maps/SixIsland_OutcastIsland/map.json new file mode 100644 index 000000000..dd19cb543 --- /dev/null +++ b/data/maps/SixIsland_OutcastIsland/map.json @@ -0,0 +1,144 @@ +{ + "id": "MAP_SIX_ISLAND_OUTCAST_ISLAND", + "name": "SixIsland_OutcastIsland", + "layout": "LAYOUT_SIX_ISLAND_OUTCAST_ISLAND", + "music": "BGM_FRLG_SEVII_ISLANDS", + "region_map_section": "MAPSEC_OUTCAST_ISLAND", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_SIX_ISLAND_GREEN_PATH", + "offset": 0, + "direction": "down" + } + ], + "object_events": [ + { + "graphics_id": "49", + "x": 9, + "y": 24, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SixIsland_OutcastIsland_EventScript_168B16", + "flag": "136" + }, + { + "graphics_id": "57", + "x": 12, + "y": 15, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SixIsland_OutcastIsland_EventScript_1AC3D1", + "flag": "0" + }, + { + "graphics_id": "43", + "x": 13, + "y": 34, + "elevation": 1, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SixIsland_OutcastIsland_EventScript_1AC40F", + "flag": "0" + }, + { + "graphics_id": "44", + "x": 14, + "y": 61, + "elevation": 1, + "movement_type": "50", + "movement_range_x": 2, + "movement_range_y": 4, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SixIsland_OutcastIsland_EventScript_1AC44D", + "flag": "0" + }, + { + "graphics_id": "44", + "x": 10, + "y": 44, + "elevation": 1, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SixIsland_OutcastIsland_EventScript_1AC48B", + "flag": "0" + }, + { + "graphics_id": "36", + "x": 11, + "y": 44, + "elevation": 1, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SixIsland_OutcastIsland_EventScript_1AC4D1", + "flag": "0" + }, + { + "graphics_id": "92", + "x": 11, + "y": 16, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SixIsland_OutcastIsland_EventScript_1BEC90", + "flag": "481" + } + ], + "warp_events": [ + { + "x": 7, + "y": 21, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_ALTERING_CAVE", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 16, + "y": 23, + "elevation": 3, + "item": "ITEM_STAR_PIECE", + "flag": "178", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 6, + "y": 24, + "elevation": 3, + "item": "ITEM_NET_BALL", + "flag": "179", + "unknown": 1 + } + ] +} \ No newline at end of file diff --git a/data/maps/SixIsland_PatternBush/map.json b/data/maps/SixIsland_PatternBush/map.json new file mode 100644 index 000000000..95f3b63d5 --- /dev/null +++ b/data/maps/SixIsland_PatternBush/map.json @@ -0,0 +1,219 @@ +{ + "id": "MAP_SIX_ISLAND_PATTERN_BUSH", + "name": "SixIsland_PatternBush", + "layout": "LAYOUT_SIX_ISLAND_PATTERN_BUSH", + "music": "BGM_FRLG_VIRIDIAN_FOREST", + "region_map_section": "MAPSEC_PATTERN_BUSH", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "28", + "x": 48, + "y": 15, + "elevation": 3, + "movement_type": "20", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SSAnne_1F_Room11_EventScript_164590", + "flag": "0" + }, + { + "graphics_id": "28", + "x": 10, + "y": 5, + "elevation": 3, + "movement_type": "18", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "SSAnne_1F_Room11_EventScript_1645A7", + "flag": "0" + }, + { + "graphics_id": "20", + "x": 51, + "y": 6, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "SSAnne_1F_Room11_EventScript_1645BE", + "flag": "0" + }, + { + "graphics_id": "20", + "x": 12, + "y": 13, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 2, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "SSAnne_1F_Room11_EventScript_1645D5", + "flag": "0" + }, + { + "graphics_id": "20", + "x": 37, + "y": 23, + "elevation": 3, + "movement_type": "51", + "movement_range_x": 2, + "movement_range_y": 5, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SSAnne_1F_Room11_EventScript_1645EC", + "flag": "0" + }, + { + "graphics_id": "18", + "x": 32, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "SSAnne_1F_Room11_EventScript_164603", + "flag": "0" + }, + { + "graphics_id": "18", + "x": 52, + "y": 20, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "SSAnne_1F_Room11_EventScript_16461A", + "flag": "0" + }, + { + "graphics_id": "22", + "x": 8, + "y": 21, + "elevation": 3, + "movement_type": "17", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "SSAnne_1F_Room11_EventScript_164631", + "flag": "0" + }, + { + "graphics_id": "22", + "x": 39, + "y": 6, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SSAnne_1F_Room11_EventScript_164648", + "flag": "0" + }, + { + "graphics_id": "39", + "x": 3, + "y": 9, + "elevation": 3, + "movement_type": "3", + "movement_range_x": 1, + "movement_range_y": 2, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SSAnne_1F_Room11_EventScript_16465F", + "flag": "0" + }, + { + "graphics_id": "40", + "x": 19, + "y": 24, + "elevation": 3, + "movement_type": "28", + "movement_range_x": 5, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SSAnne_1F_Room11_EventScript_164676", + "flag": "0" + }, + { + "graphics_id": "56", + "x": 30, + "y": 19, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SSAnne_1F_Room11_EventScript_16468D", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 54, + "y": 26, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_GREEN_PATH", + "dest_warp_id": 0 + }, + { + "x": 55, + "y": 26, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_GREEN_PATH", + "dest_warp_id": 0 + }, + { + "x": 56, + "y": 26, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_GREEN_PATH", + "dest_warp_id": 1 + }, + { + "x": 3, + "y": 26, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_GREEN_PATH", + "dest_warp_id": 2 + }, + { + "x": 4, + "y": 26, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_GREEN_PATH", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 26, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_GREEN_PATH", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SixIsland_PatternBush/scripts.inc b/data/maps/SixIsland_PatternBush/scripts.inc new file mode 100644 index 000000000..a4f5e1b85 --- /dev/null +++ b/data/maps/SixIsland_PatternBush/scripts.inc @@ -0,0 +1,92 @@ +SixIsland_PatternBush_MapScripts:: @ 8164559 + map_script 3, SSAnne_1F_Room11_MapScript1_16455F + .byte 0 + +SSAnne_1F_Room11_MapScript1_16455F:: @ 816455F + setworldmapflag 2237 + getplayerxy VAR_0x4001, VAR_0x4002 + compare_var_to_value VAR_0x4001, 50 + call_if 4, EventScript_16457E + compare_var_to_value VAR_0x4001, 49 + call_if 3, EventScript_164587 + end + +EventScript_16457E:: @ 816457E + setescapewarp MAP_SIX_ISLAND_GREEN_PATH, 255, 64, 10 + return + +EventScript_164587:: @ 8164587 + setescapewarp MAP_SIX_ISLAND_GREEN_PATH, 255, 45, 10 + return + +SSAnne_1F_Room11_EventScript_164590:: @ 8164590 + trainerbattle 0, 609, 0, Text_17BF3A, Text_17BF66 + loadword 0, gUnknown_817BF97 + callstd 6 + end + +SSAnne_1F_Room11_EventScript_1645A7:: @ 81645A7 + trainerbattle 0, 610, 0, Text_17BFEB, Text_17C028 + loadword 0, gUnknown_817C056 + callstd 6 + end + +SSAnne_1F_Room11_EventScript_1645BE:: @ 81645BE + trainerbattle 0, 611, 0, Text_17C0BE, Text_17C0F2 + loadword 0, gUnknown_817C113 + callstd 6 + end + +SSAnne_1F_Room11_EventScript_1645D5:: @ 81645D5 + trainerbattle 0, 612, 0, Text_17C155, Text_17C196 + loadword 0, gUnknown_817C1D0 + callstd 6 + end + +SSAnne_1F_Room11_EventScript_1645EC:: @ 81645EC + trainerbattle 0, 613, 0, Text_17C246, Text_17C275 + loadword 0, gUnknown_817C2A4 + callstd 6 + end + +SSAnne_1F_Room11_EventScript_164603:: @ 8164603 + trainerbattle 0, 614, 0, Text_17C2D9, Text_17C30D + loadword 0, gUnknown_817C31C + callstd 6 + end + +SSAnne_1F_Room11_EventScript_16461A:: @ 816461A + trainerbattle 0, 615, 0, Text_17C373, Text_17C3A5 + loadword 0, gUnknown_817C3CE + callstd 6 + end + +SSAnne_1F_Room11_EventScript_164631:: @ 8164631 + trainerbattle 0, 616, 0, Text_17C42B, Text_17C458 + loadword 0, gUnknown_817C490 + callstd 6 + end + +SSAnne_1F_Room11_EventScript_164648:: @ 8164648 + trainerbattle 0, 617, 0, Text_17C4FE, Text_17C552 + loadword 0, gUnknown_817C590 + callstd 6 + end + +SSAnne_1F_Room11_EventScript_16465F:: @ 816465F + trainerbattle 0, 618, 0, Text_17C5DB, Text_17C609 + loadword 0, gUnknown_817C615 + callstd 6 + end + +SSAnne_1F_Room11_EventScript_164676:: @ 8164676 + trainerbattle 0, 619, 0, Text_17C63E, Text_17C660 + loadword 0, gUnknown_817C68E + callstd 6 + end + +SSAnne_1F_Room11_EventScript_16468D:: @ 816468D + trainerbattle 0, 620, 0, Text_17C6C9, Text_17C6FB + loadword 0, gUnknown_817C728 + callstd 6 + end diff --git a/data/maps/SixIsland_PokemonCenter_1F/events.inc b/data/maps/SixIsland_PokemonCenter_1F/events.inc deleted file mode 100644 index ffbd1be14..000000000 --- a/data/maps/SixIsland_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -SixIsland_PokemonCenter_1F_EventObjects: - object_event 1, 64, 0, 7, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, SixIsland_PokemonCenter_1F_EventScript_171E05, 0, 0, 0 - object_event 2, 72, 0, 5, 0, 5, 0, 3, 9, 17, 0, 0, 0, 0, 0, 0x0, 152, 0, 0 - object_event 3, 56, 0, 13, 0, 3, 0, 3, 7, 17, 0, 0, 0, 0, 0, SixIsland_PokemonCenter_1F_EventScript_171E0E, 0, 0, 0 - object_event 4, 33, 0, 12, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, SixIsland_PokemonCenter_1F_EventScript_171E17, 0, 0, 0 - -SixIsland_PokemonCenter_1F_MapWarps: - warp_def 7, 8, 3, 1, 786 - warp_def 1, 6, 4, 0, 9473 - -SixIsland_PokemonCenter_1F_MapEvents:: - map_events SixIsland_PokemonCenter_1F_EventObjects, SixIsland_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SixIsland_PokemonCenter_1F/header.inc b/data/maps/SixIsland_PokemonCenter_1F/header.inc deleted file mode 100644 index e2d7f3aa9..000000000 --- a/data/maps/SixIsland_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SixIsland_PokemonCenter_1F:: @ 8351ED0 - .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte SixIsland_PokemonCenter_1F_MapEvents @ 0x83BF0A0 - .4byte SixIsland_PokemonCenter_1F_MapScripts @ 0x8171D6A - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 8 - .byte 0x95, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/SixIsland_PokemonCenter_1F/map.json b/data/maps/SixIsland_PokemonCenter_1F/map.json new file mode 100644 index 000000000..d58082f97 --- /dev/null +++ b/data/maps/SixIsland_PokemonCenter_1F/map.json @@ -0,0 +1,87 @@ +{ + "id": "MAP_SIX_ISLAND_POKEMON_CENTER_1F", + "name": "SixIsland_PokemonCenter_1F", + "layout": "LAYOUT_POKEMON_CENTER_1F", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_SIX_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "64", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SixIsland_PokemonCenter_1F_EventScript_171E05", + "flag": "0" + }, + { + "graphics_id": "72", + "x": 5, + "y": 5, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "152" + }, + { + "graphics_id": "56", + "x": 13, + "y": 3, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SixIsland_PokemonCenter_1F_EventScript_171E0E", + "flag": "0" + }, + { + "graphics_id": "33", + "x": 12, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SixIsland_PokemonCenter_1F_EventScript_171E17", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND", + "dest_warp_id": 1 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_SIX_ISLAND_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SixIsland_PokemonCenter_2F/events.inc b/data/maps/SixIsland_PokemonCenter_2F/events.inc deleted file mode 100644 index c26511927..000000000 --- a/data/maps/SixIsland_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -SixIsland_PokemonCenter_2F_EventObjects: - object_event 1, 65, 0, 6, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SixIsland_PokemonCenter_2F_EventScript_1A8CF6, 0, 0, 0 - object_event 2, 65, 0, 2, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SixIsland_PokemonCenter_2F_EventScript_1A8CFC, 0, 0, 0 - object_event 3, 65, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SixIsland_PokemonCenter_2F_EventScript_1A8D02, 0, 0, 0 - object_event 4, 69, 0, 1, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, SixIsland_PokemonCenter_2F_EventScript_1BB1D2, 112, 0, 0 - -SixIsland_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 1, 9472 - warp_def 5, 1, 0, 0, 4 - warp_def 9, 1, 0, 0, 1 - -SixIsland_PokemonCenter_2F_MapEvents:: - map_events SixIsland_PokemonCenter_2F_EventObjects, SixIsland_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SixIsland_PokemonCenter_2F/header.inc b/data/maps/SixIsland_PokemonCenter_2F/header.inc deleted file mode 100644 index f11114273..000000000 --- a/data/maps/SixIsland_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SixIsland_PokemonCenter_2F:: @ 8351EEC - .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte SixIsland_PokemonCenter_2F_MapEvents @ 0x83BF12C - .4byte SixIsland_PokemonCenter_2F_MapScripts @ 0x8171E20 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 9 - .byte 0x95, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/SixIsland_PokemonCenter_2F/map.json b/data/maps/SixIsland_PokemonCenter_2F/map.json new file mode 100644 index 000000000..3ba0ff43a --- /dev/null +++ b/data/maps/SixIsland_PokemonCenter_2F/map.json @@ -0,0 +1,94 @@ +{ + "id": "MAP_SIX_ISLAND_POKEMON_CENTER_2F", + "name": "SixIsland_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_SIX_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "65", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SixIsland_PokemonCenter_2F_EventScript_1A8CF6", + "flag": "0" + }, + { + "graphics_id": "65", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SixIsland_PokemonCenter_2F_EventScript_1A8CFC", + "flag": "0" + }, + { + "graphics_id": "65", + "x": 10, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SixIsland_PokemonCenter_2F_EventScript_1A8D02", + "flag": "0" + }, + { + "graphics_id": "69", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SixIsland_PokemonCenter_2F_EventScript_1BB1D2", + "flag": "112" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_SIX_ISLAND_POKEMON_CENTER_1F", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 1, + "elevation": 0, + "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 0, + "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SixIsland_RuinValley/connections.inc b/data/maps/SixIsland_RuinValley/connections.inc deleted file mode 100644 index 0ac741f5e..000000000 --- a/data/maps/SixIsland_RuinValley/connections.inc +++ /dev/null @@ -1,6 +0,0 @@ -SixIsland_RuinValley_MapConnectionsList: @ 8352E70 - connection right, -80, MAP_SIX_ISLAND_WATERPATH - -SixIsland_RuinValley_MapConnections:: @ 8352E7C - .4byte 1 - .4byte SixIsland_RuinValley_MapConnectionsList diff --git a/data/maps/SixIsland_RuinValley/events.inc b/data/maps/SixIsland_RuinValley/events.inc deleted file mode 100644 index 381543e3b..000000000 --- a/data/maps/SixIsland_RuinValley/events.inc +++ /dev/null @@ -1,27 +0,0 @@ -SixIsland_RuinValley_EventObjects: - object_event 1, 55, 0, 24, 0, 25, 0, 3, 7, 17, 0, 0, 0, 0, 0, SixIsland_RuinValley_EventScript_168B6D, 142, 0, 0 - object_event 2, 56, 0, 32, 0, 11, 0, 5, 17, 17, 0, 1, 0, 4, 0, SixIsland_RuinValley_EventScript_1AC717, 0, 0, 0 - object_event 3, 56, 0, 33, 0, 16, 0, 5, 14, 17, 0, 1, 0, 2, 0, SixIsland_RuinValley_EventScript_1AC755, 0, 0, 0 - object_event 4, 56, 0, 31, 0, 24, 0, 5, 9, 17, 0, 1, 0, 1, 0, SixIsland_RuinValley_EventScript_1AC793, 0, 0, 0 - object_event 5, 56, 0, 14, 0, 10, 0, 5, 8, 17, 0, 1, 0, 2, 0, SixIsland_RuinValley_EventScript_1AC7D1, 0, 0, 0 - object_event 6, 52, 0, 21, 0, 29, 0, 5, 2, 50, 0, 1, 0, 1, 0, SixIsland_RuinValley_EventScript_1AC80F, 0, 0, 0 - object_event 7, 97, 0, 17, 0, 10, 0, 5, 1, 0, 0, 0, 0, 0, 0, SixIsland_RuinValley_EventScript_1BE11D, 0, 0, 0 - object_event 8, 97, 0, 17, 0, 12, 0, 5, 1, 0, 0, 0, 0, 0, 0, SixIsland_RuinValley_EventScript_1BE11D, 0, 0, 0 - object_event 9, 97, 0, 18, 0, 11, 0, 5, 1, 0, 0, 0, 0, 0, 0, SixIsland_RuinValley_EventScript_1BE11D, 0, 0, 0 - object_event 10, 97, 0, 6, 0, 33, 0, 3, 1, 0, 0, 0, 0, 0, 0, SixIsland_RuinValley_EventScript_1BE11D, 0, 0, 0 - object_event 11, 97, 0, 6, 0, 34, 0, 3, 1, 0, 0, 0, 0, 0, 0, SixIsland_RuinValley_EventScript_1BE11D, 0, 0, 0 - object_event 12, 97, 0, 41, 0, 32, 0, 3, 1, 0, 0, 0, 0, 0, 0, SixIsland_RuinValley_EventScript_1BE11D, 0, 0, 0 - object_event 13, 97, 0, 41, 0, 33, 0, 3, 1, 0, 0, 0, 0, 0, 0, SixIsland_RuinValley_EventScript_1BE11D, 0, 0, 0 - object_event 14, 97, 0, 42, 0, 33, 0, 3, 1, 0, 0, 0, 0, 0, 0, SixIsland_RuinValley_EventScript_1BE11D, 0, 0, 0 - object_event 15, 92, 0, 5, 0, 33, 0, 3, 8, 17, 0, 0, 0, 0, 0, SixIsland_RuinValley_EventScript_1BECC4, 485, 0, 0 - object_event 16, 92, 0, 19, 0, 11, 0, 5, 8, 17, 0, 0, 0, 0, 0, SixIsland_RuinValley_EventScript_1BECB7, 484, 0, 0 - object_event 17, 92, 0, 43, 0, 32, 0, 3, 8, 17, 0, 0, 0, 0, 0, SixIsland_RuinValley_EventScript_1BECD1, 486, 0, 0 - -SixIsland_RuinValley_MapWarps: - warp_def 24, 24, 3, 0, 371 - -SixIsland_RuinValley_MapBGEvents: - bg_event 24, 24, 3, 0, 0, SixIsland_RuinValley_EventScript_168B94 - -SixIsland_RuinValley_MapEvents:: - map_events SixIsland_RuinValley_EventObjects, SixIsland_RuinValley_MapWarps, 0x0, SixIsland_RuinValley_MapBGEvents diff --git a/data/maps/SixIsland_RuinValley/header.inc b/data/maps/SixIsland_RuinValley/header.inc deleted file mode 100644 index 31ec9bc84..000000000 --- a/data/maps/SixIsland_RuinValley/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SixIsland_RuinValley:: @ 8350CC4 - .4byte SixIsland_RuinValley_Layout @ 0x83302D8 - .4byte SixIsland_RuinValley_MapEvents @ 0x83B92A0 - .4byte SixIsland_RuinValley_MapScripts @ 0x8168B53 - .4byte SixIsland_RuinValley_MapConnections @ 0x8352E7C - .2byte BGM_FRLG_SEVII_ISLANDS - .2byte 253 - .byte 0xa6, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/SixIsland_RuinValley/map.json b/data/maps/SixIsland_RuinValley/map.json new file mode 100644 index 000000000..1262705c6 --- /dev/null +++ b/data/maps/SixIsland_RuinValley/map.json @@ -0,0 +1,263 @@ +{ + "id": "MAP_SIX_ISLAND_RUIN_VALLEY", + "name": "SixIsland_RuinValley", + "layout": "LAYOUT_SIX_ISLAND_RUIN_VALLEY", + "music": "BGM_FRLG_SEVII_ISLANDS", + "region_map_section": "MAPSEC_RUIN_VALLEY", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_SIX_ISLAND_WATER_PATH", + "offset": -80, + "direction": "right" + } + ], + "object_events": [ + { + "graphics_id": "55", + "x": 24, + "y": 25, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SixIsland_RuinValley_EventScript_168B6D", + "flag": "142" + }, + { + "graphics_id": "56", + "x": 32, + "y": 11, + "elevation": 5, + "movement_type": "17", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "SixIsland_RuinValley_EventScript_1AC717", + "flag": "0" + }, + { + "graphics_id": "56", + "x": 33, + "y": 16, + "elevation": 5, + "movement_type": "14", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "SixIsland_RuinValley_EventScript_1AC755", + "flag": "0" + }, + { + "graphics_id": "56", + "x": 31, + "y": 24, + "elevation": 5, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SixIsland_RuinValley_EventScript_1AC793", + "flag": "0" + }, + { + "graphics_id": "56", + "x": 14, + "y": 10, + "elevation": 5, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "SixIsland_RuinValley_EventScript_1AC7D1", + "flag": "0" + }, + { + "graphics_id": "52", + "x": 21, + "y": 29, + "elevation": 5, + "movement_type": "2", + "movement_range_x": 2, + "movement_range_y": 3, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SixIsland_RuinValley_EventScript_1AC80F", + "flag": "0" + }, + { + "graphics_id": "97", + "x": 17, + "y": 10, + "elevation": 5, + "movement_type": "1", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SixIsland_RuinValley_EventScript_1BE11D", + "flag": "0" + }, + { + "graphics_id": "97", + "x": 17, + "y": 12, + "elevation": 5, + "movement_type": "1", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SixIsland_RuinValley_EventScript_1BE11D", + "flag": "0" + }, + { + "graphics_id": "97", + "x": 18, + "y": 11, + "elevation": 5, + "movement_type": "1", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SixIsland_RuinValley_EventScript_1BE11D", + "flag": "0" + }, + { + "graphics_id": "97", + "x": 6, + "y": 33, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SixIsland_RuinValley_EventScript_1BE11D", + "flag": "0" + }, + { + "graphics_id": "97", + "x": 6, + "y": 34, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SixIsland_RuinValley_EventScript_1BE11D", + "flag": "0" + }, + { + "graphics_id": "97", + "x": 41, + "y": 32, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SixIsland_RuinValley_EventScript_1BE11D", + "flag": "0" + }, + { + "graphics_id": "97", + "x": 41, + "y": 33, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SixIsland_RuinValley_EventScript_1BE11D", + "flag": "0" + }, + { + "graphics_id": "97", + "x": 42, + "y": 33, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SixIsland_RuinValley_EventScript_1BE11D", + "flag": "0" + }, + { + "graphics_id": "92", + "x": 5, + "y": 33, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SixIsland_RuinValley_EventScript_1BECC4", + "flag": "485" + }, + { + "graphics_id": "92", + "x": 19, + "y": 11, + "elevation": 5, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SixIsland_RuinValley_EventScript_1BECB7", + "flag": "484" + }, + { + "graphics_id": "92", + "x": 43, + "y": 32, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SixIsland_RuinValley_EventScript_1BECD1", + "flag": "486" + } + ], + "warp_events": [ + { + "x": 24, + "y": 24, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_1F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 24, + "y": 24, + "elevation": 3, + "script": "SixIsland_RuinValley_EventScript_168B94" + } + ] +} \ No newline at end of file diff --git a/data/maps/SixIsland_WaterPath/connections.inc b/data/maps/SixIsland_WaterPath/connections.inc deleted file mode 100644 index d6849fbb2..000000000 --- a/data/maps/SixIsland_WaterPath/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -SixIsland_WaterPath_MapConnectionsList: @ 8352E44 - connection left, 0, MAP_SIX_ISLAND_GREENPATH - connection left, 40, MAP_SIX_ISLAND - connection left, 80, MAP_SIX_ISLAND_RUINVALLEY - -SixIsland_WaterPath_MapConnections:: @ 8352E68 - .4byte 3 - .4byte SixIsland_WaterPath_MapConnectionsList diff --git a/data/maps/SixIsland_WaterPath/events.inc b/data/maps/SixIsland_WaterPath/events.inc deleted file mode 100644 index f40c157b9..000000000 --- a/data/maps/SixIsland_WaterPath/events.inc +++ /dev/null @@ -1,24 +0,0 @@ -SixIsland_WaterPath_EventObjects: - object_event 1, 28, 0, 12, 0, 13, 0, 3, 19, 17, 0, 1, 0, 3, 0, SixIsland_WaterPath_EventScript_1AC555, 0, 0, 0 - object_event 2, 26, 0, 11, 0, 52, 0, 3, 7, 17, 0, 1, 0, 3, 0, SixIsland_WaterPath_EventScript_1AC593, 0, 0, 0 - object_event 3, 43, 0, 13, 0, 35, 0, 1, 1, 17, 0, 1, 0, 4, 0, SixIsland_WaterPath_EventScript_1AC5D1, 0, 0, 0 - object_event 4, 44, 0, 15, 0, 45, 0, 1, 2, 17, 0, 1, 0, 1, 0, SixIsland_WaterPath_EventScript_1AC60F, 0, 0, 0 - object_event 5, 17, 0, 6, 0, 21, 0, 3, 8, 17, 0, 1, 0, 1, 0, SixIsland_WaterPath_EventScript_1AC64D, 0, 0, 0 - object_event 6, 17, 0, 7, 0, 21, 0, 3, 8, 17, 0, 1, 0, 1, 0, SixIsland_WaterPath_EventScript_1AC693, 0, 0, 0 - object_event 7, 56, 0, 11, 0, 76, 0, 3, 15, 17, 0, 1, 0, 4, 0, SixIsland_WaterPath_EventScript_1AC6D9, 0, 0, 0 - object_event 8, 92, 0, 17, 0, 19, 0, 0, 8, 17, 0, 0, 0, 0, 0, SixIsland_WaterPath_EventScript_1BEC9D, 482, 0, 0 - object_event 9, 92, 0, 17, 0, 87, 0, 3, 8, 17, 0, 0, 0, 0, 0, SixIsland_WaterPath_EventScript_1BECAA, 483, 0, 0 - -SixIsland_WaterPath_MapWarps: - warp_def 5, 13, 0, 0, 10496 - warp_def 11, 19, 0, 0, 10497 - -SixIsland_WaterPath_MapBGEvents: - bg_event 8, 14, 0, 0, 0, SixIsland_WaterPath_EventScript_168B41 - bg_event 15, 76, 3, 7, 0, 137, 181, 1 - bg_event 3, 8, 3, 7, 0, 139, 182, 1 - bg_event 13, 63, 3, 7, 0, 152, 183, 1 - bg_event 12, 54, 0, 0, 0, SixIsland_WaterPath_EventScript_168B4A - -SixIsland_WaterPath_MapEvents:: - map_events SixIsland_WaterPath_EventObjects, SixIsland_WaterPath_MapWarps, 0x0, SixIsland_WaterPath_MapBGEvents diff --git a/data/maps/SixIsland_WaterPath/header.inc b/data/maps/SixIsland_WaterPath/header.inc deleted file mode 100644 index 4538a40a2..000000000 --- a/data/maps/SixIsland_WaterPath/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SixIsland_WaterPath:: @ 8350CA8 - .4byte SixIsland_WaterPath_Layout @ 0x832F3B4 - .4byte SixIsland_WaterPath_MapEvents @ 0x83B90E0 - .4byte SixIsland_WaterPath_MapScripts @ 0x8168B40 - .4byte SixIsland_WaterPath_MapConnections @ 0x8352E68 - .2byte BGM_FRLG_SEVII_ISLANDS - .2byte 252 - .byte 0xa5, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/SixIsland_WaterPath/map.json b/data/maps/SixIsland_WaterPath/map.json new file mode 100644 index 000000000..86bbb290b --- /dev/null +++ b/data/maps/SixIsland_WaterPath/map.json @@ -0,0 +1,210 @@ +{ + "id": "MAP_SIX_ISLAND_WATER_PATH", + "name": "SixIsland_WaterPath", + "layout": "LAYOUT_SIX_ISLAND_WATER_PATH", + "music": "BGM_FRLG_SEVII_ISLANDS", + "region_map_section": "MAPSEC_WATER_PATH", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_SIX_ISLAND_GREEN_PATH", + "offset": 0, + "direction": "left" + }, + { + "map": "MAP_SIX_ISLAND", + "offset": 40, + "direction": "left" + }, + { + "map": "MAP_SIX_ISLAND_RUIN_VALLEY", + "offset": 80, + "direction": "left" + } + ], + "object_events": [ + { + "graphics_id": "28", + "x": 12, + "y": 13, + "elevation": 3, + "movement_type": "19", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SixIsland_WaterPath_EventScript_1AC555", + "flag": "0" + }, + { + "graphics_id": "26", + "x": 11, + "y": 52, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SixIsland_WaterPath_EventScript_1AC593", + "flag": "0" + }, + { + "graphics_id": "43", + "x": 13, + "y": 35, + "elevation": 1, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "SixIsland_WaterPath_EventScript_1AC5D1", + "flag": "0" + }, + { + "graphics_id": "44", + "x": 15, + "y": 45, + "elevation": 1, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SixIsland_WaterPath_EventScript_1AC60F", + "flag": "0" + }, + { + "graphics_id": "17", + "x": 6, + "y": 21, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SixIsland_WaterPath_EventScript_1AC64D", + "flag": "0" + }, + { + "graphics_id": "17", + "x": 7, + "y": 21, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SixIsland_WaterPath_EventScript_1AC693", + "flag": "0" + }, + { + "graphics_id": "56", + "x": 11, + "y": 76, + "elevation": 3, + "movement_type": "15", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "SixIsland_WaterPath_EventScript_1AC6D9", + "flag": "0" + }, + { + "graphics_id": "92", + "x": 17, + "y": 19, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SixIsland_WaterPath_EventScript_1BEC9D", + "flag": "482" + }, + { + "graphics_id": "92", + "x": 17, + "y": 87, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SixIsland_WaterPath_EventScript_1BECAA", + "flag": "483" + } + ], + "warp_events": [ + { + "x": 5, + "y": 13, + "elevation": 0, + "dest_map": "MAP_SIX_ISLAND_WATER_PATH_HOUSE1", + "dest_warp_id": 0 + }, + { + "x": 11, + "y": 19, + "elevation": 0, + "dest_map": "MAP_SIX_ISLAND_WATER_PATH_HOUSE2", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 8, + "y": 14, + "elevation": 0, + "script": "SixIsland_WaterPath_EventScript_168B41" + }, + { + "type": "hidden_item", + "x": 15, + "y": 76, + "elevation": 3, + "item": "ITEM_ASPEAR_BERRY", + "flag": "181", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 3, + "y": 8, + "elevation": 3, + "item": "ITEM_ORAN_BERRY", + "flag": "182", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 13, + "y": 63, + "elevation": 3, + "item": "ITEM_PINAP_BERRY", + "flag": "183", + "unknown": 1 + }, + { + "type": "bg_event_type_0", + "x": 12, + "y": 54, + "elevation": 0, + "script": "SixIsland_WaterPath_EventScript_168B4A" + } + ] +} \ No newline at end of file diff --git a/data/maps/SixIsland_WaterPath_House1/events.inc b/data/maps/SixIsland_WaterPath_House1/events.inc deleted file mode 100644 index 72b19c6e5..000000000 --- a/data/maps/SixIsland_WaterPath_House1/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -SixIsland_WaterPath_House1_EventObjects: - object_event 1, 29, 0, 3, 0, 4, 0, 3, 8, 17, 0, 0, 0, 0, 0, SixIsland_WaterPath_House1_EventScript_17206D, 0, 0, 0 - -SixIsland_WaterPath_House1_MapWarps: - warp_def 3, 7, 3, 0, 828 - -SixIsland_WaterPath_House1_MapBGEvents: - bg_event 9, 1, 0, 0, 0, SixIsland_WaterPath_House1_EventScript_172157 - -SixIsland_WaterPath_House1_MapEvents:: - map_events SixIsland_WaterPath_House1_EventObjects, SixIsland_WaterPath_House1_MapWarps, 0x0, SixIsland_WaterPath_House1_MapBGEvents diff --git a/data/maps/SixIsland_WaterPath_House1/header.inc b/data/maps/SixIsland_WaterPath_House1/header.inc deleted file mode 100644 index dbd7e3ece..000000000 --- a/data/maps/SixIsland_WaterPath_House1/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SixIsland_WaterPath_House1:: @ 8351FB0 - .4byte House4_Layout @ 0x82D6070 - .4byte SixIsland_WaterPath_House1_MapEvents @ 0x83BF334 - .4byte SixIsland_WaterPath_House1_MapScripts @ 0x817206C - .4byte NULL - .2byte BGM_FRLG_CERULEAN_CITY - .2byte 13 - .byte 0xa5, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/SixIsland_WaterPath_House1/map.json b/data/maps/SixIsland_WaterPath_House1/map.json new file mode 100644 index 000000000..84b136633 --- /dev/null +++ b/data/maps/SixIsland_WaterPath_House1/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_SIX_ISLAND_WATER_PATH_HOUSE1", + "name": "SixIsland_WaterPath_House1", + "layout": "LAYOUT_HOUSE4", + "music": "BGM_FRLG_CERULEAN_CITY", + "region_map_section": "MAPSEC_WATER_PATH", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "29", + "x": 3, + "y": 4, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SixIsland_WaterPath_House1_EventScript_17206D", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_WATER_PATH", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 9, + "y": 1, + "elevation": 0, + "script": "SixIsland_WaterPath_House1_EventScript_172157" + } + ] +} \ No newline at end of file diff --git a/data/maps/SixIsland_WaterPath_House2/events.inc b/data/maps/SixIsland_WaterPath_House2/events.inc deleted file mode 100644 index 09ee22d31..000000000 --- a/data/maps/SixIsland_WaterPath_House2/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -SixIsland_WaterPath_House2_EventObjects: - object_event 1, 25, 0, 7, 0, 4, 0, 3, 15, 17, 0, 0, 0, 0, 0, SixIsland_WaterPath_House2_EventScript_172179, 0, 0, 0 - -SixIsland_WaterPath_House2_MapWarps: - warp_def 4, 7, 3, 1, 828 - -SixIsland_WaterPath_House2_MapEvents:: - map_events SixIsland_WaterPath_House2_EventObjects, SixIsland_WaterPath_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/SixIsland_WaterPath_House2/header.inc b/data/maps/SixIsland_WaterPath_House2/header.inc deleted file mode 100644 index e0d5408a6..000000000 --- a/data/maps/SixIsland_WaterPath_House2/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -SixIsland_WaterPath_House2:: @ 8351FCC - .4byte House3_Layout @ 0x82D5CB8 - .4byte SixIsland_WaterPath_House2_MapEvents @ 0x83BF368 - .4byte SixIsland_WaterPath_House2_MapScripts @ 0x8172178 - .4byte NULL - .2byte BGM_FRLG_CERULEAN_CITY - .2byte 11 - .byte 0xa5, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/SixIsland_WaterPath_House2/map.json b/data/maps/SixIsland_WaterPath_House2/map.json new file mode 100644 index 000000000..c671d9f29 --- /dev/null +++ b/data/maps/SixIsland_WaterPath_House2/map.json @@ -0,0 +1,41 @@ +{ + "id": "MAP_SIX_ISLAND_WATER_PATH_HOUSE2", + "name": "SixIsland_WaterPath_House2", + "layout": "LAYOUT_HOUSE3", + "music": "BGM_FRLG_CERULEAN_CITY", + "region_map_section": "MAPSEC_WATER_PATH", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "25", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "15", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SixIsland_WaterPath_House2_EventScript_172179", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SIX_ISLAND_WATER_PATH", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/ThreeIsland/connections.inc b/data/maps/ThreeIsland/connections.inc deleted file mode 100644 index 2f2d49e94..000000000 --- a/data/maps/ThreeIsland/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -ThreeIsland_MapConnectionsList: @ 8352968 - connection down, 0, MAP_THREE_ISLAND_PORT - connection left, 0, MAP_THREE_ISLAND_BONDBRIDGE - -ThreeIsland_MapConnections:: @ 8352980 - .4byte 2 - .4byte ThreeIsland_MapConnectionsList diff --git a/data/maps/ThreeIsland/events.inc b/data/maps/ThreeIsland/events.inc deleted file mode 100644 index d72c40b6c..000000000 --- a/data/maps/ThreeIsland/events.inc +++ /dev/null @@ -1,43 +0,0 @@ -ThreeIsland_EventObjects: - object_event 1, 25, 0, 7, 0, 24, 0, 3, 10, 17, 0, 0, 0, 0, 0, ThreeIsland_EventScript_1677E5, 126, 0, 0 - object_event 2, 25, 0, 8, 0, 23, 0, 3, 10, 17, 0, 0, 0, 0, 0, ThreeIsland_EventScript_167989, 126, 0, 0 - object_event 3, 53, 0, 8, 0, 24, 0, 3, 9, 17, 0, 0, 0, 0, 0, ThreeIsland_EventScript_1677D8, 145, 0, 0 - object_event 4, 53, 0, 9, 0, 23, 0, 3, 9, 17, 0, 0, 0, 0, 0, ThreeIsland_EventScript_1677D8, 121, 0, 0 - object_event 5, 53, 0, 9, 0, 24, 0, 3, 9, 17, 0, 0, 0, 0, 0, ThreeIsland_EventScript_1677D8, 121, 0, 0 - object_event 6, 53, 0, 10, 0, 22, 0, 3, 9, 17, 0, 0, 0, 0, 0, ThreeIsland_EventScript_1677D8, 121, 0, 0 - object_event 7, 53, 0, 10, 0, 24, 0, 3, 9, 17, 0, 0, 0, 0, 0, ThreeIsland_EventScript_1677D8, 121, 0, 0 - object_event 8, 53, 0, 11, 0, 23, 0, 3, 9, 17, 0, 0, 0, 0, 0, ThreeIsland_EventScript_1677D8, 121, 0, 0 - object_event 9, 95, 0, 20, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, ThreeIsland_EventScript_1BDF13, 18, 0, 0 - object_event 10, 92, 0, 18, 0, 17, 0, 3, 8, 17, 0, 0, 0, 0, 0, ThreeIsland_EventScript_1BEABC, 443, 0, 0 - object_event 11, 23, 0, 15, 0, 7, 0, 3, 5, 17, 0, 0, 0, 0, 0, ThreeIsland_EventScript_167C77, 0, 0, 0 - object_event 12, 16, 0, 14, 0, 14, 0, 3, 10, 17, 0, 0, 0, 0, 0, ThreeIsland_EventScript_167C80, 0, 0, 0 - object_event 13, 132, 0, 15, 0, 14, 0, 3, 9, 17, 0, 0, 0, 0, 0, ThreeIsland_EventScript_167C89, 0, 0, 0 - object_event 14, 53, 0, 15, 0, 31, 0, 3, 5, 17, 0, 0, 0, 0, 0, ThreeIsland_EventScript_167CA5, 121, 0, 0 - -ThreeIsland_MapWarps: - warp_def 3, 31, 0, 0, 8704 - warp_def 14, 27, 0, 0, 8705 - warp_def 18, 12, 0, 0, 8707 - warp_def 4, 6, 0, 0, 8708 - warp_def 12, 6, 0, 0, 8709 - warp_def 12, 12, 0, 0, 8710 - warp_def 13, 19, 0, 0, 8711 - -ThreeIsland_MapCoordEvents: - coord_event 7, 27, 3, 0, 16507, 2, 0, ThreeIsland_EventScript_1679B5 - coord_event 8, 27, 3, 0, 16507, 2, 0, ThreeIsland_EventScript_1679B5 - coord_event 9, 27, 3, 0, 16507, 2, 0, ThreeIsland_EventScript_1679B5 - coord_event 10, 27, 3, 0, 16507, 2, 0, ThreeIsland_EventScript_1679B5 - coord_event 7, 26, 3, 0, 16507, 3, 0, ThreeIsland_EventScript_167A1D - coord_event 8, 26, 3, 0, 16507, 3, 0, ThreeIsland_EventScript_167A29 - coord_event 9, 26, 3, 0, 16507, 3, 0, ThreeIsland_EventScript_167A35 - coord_event 11, 27, 3, 0, 16507, 2, 0, ThreeIsland_EventScript_1679B5 - coord_event 10, 26, 3, 0, 16507, 3, 0, ThreeIsland_EventScript_167A41 - coord_event 11, 26, 3, 0, 16507, 3, 0, ThreeIsland_EventScript_167A4D - -ThreeIsland_MapBGEvents: - bg_event 12, 31, 0, 0, 0, ThreeIsland_EventScript_167C9C - bg_event 5, 13, 3, 7, 0, 69, 164, 1 - -ThreeIsland_MapEvents:: - map_events ThreeIsland_EventObjects, ThreeIsland_MapWarps, ThreeIsland_MapCoordEvents, ThreeIsland_MapBGEvents diff --git a/data/maps/ThreeIsland/header.inc b/data/maps/ThreeIsland/header.inc deleted file mode 100644 index e49570fa4..000000000 --- a/data/maps/ThreeIsland/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -ThreeIsland:: @ 83507A0 - .4byte ThreeIsland_Layout @ 0x832265C - .4byte ThreeIsland_MapEvents @ 0x83B62C8 - .4byte ThreeIsland_MapScripts @ 0x81677AD - .4byte ThreeIsland_MapConnections @ 0x8352980 - .2byte BGM_FRLG_ISLAND_ONE - .2byte 232 - .byte 0x91, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/ThreeIsland/map.json b/data/maps/ThreeIsland/map.json new file mode 100644 index 000000000..0b11d5bf2 --- /dev/null +++ b/data/maps/ThreeIsland/map.json @@ -0,0 +1,371 @@ +{ + "id": "MAP_THREE_ISLAND", + "name": "ThreeIsland", + "layout": "LAYOUT_THREE_ISLAND", + "music": "BGM_FRLG_ISLAND_ONE", + "region_map_section": "MAPSEC_THREE_ISLAND", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_1", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_THREE_ISLAND_PORT", + "offset": 0, + "direction": "down" + }, + { + "map": "MAP_THREE_ISLAND_BOND_BRIDGE", + "offset": 0, + "direction": "left" + } + ], + "object_events": [ + { + "graphics_id": "25", + "x": 7, + "y": 24, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_EventScript_1677E5", + "flag": "126" + }, + { + "graphics_id": "25", + "x": 8, + "y": 23, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_EventScript_167989", + "flag": "126" + }, + { + "graphics_id": "53", + "x": 8, + "y": 24, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_EventScript_1677D8", + "flag": "145" + }, + { + "graphics_id": "53", + "x": 9, + "y": 23, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_EventScript_1677D8", + "flag": "121" + }, + { + "graphics_id": "53", + "x": 9, + "y": 24, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_EventScript_1677D8", + "flag": "121" + }, + { + "graphics_id": "53", + "x": 10, + "y": 22, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_EventScript_1677D8", + "flag": "121" + }, + { + "graphics_id": "53", + "x": 10, + "y": 24, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_EventScript_1677D8", + "flag": "121" + }, + { + "graphics_id": "53", + "x": 11, + "y": 23, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_EventScript_1677D8", + "flag": "121" + }, + { + "graphics_id": "95", + "x": 20, + "y": 7, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_EventScript_1BDF13", + "flag": "18" + }, + { + "graphics_id": "92", + "x": 18, + "y": 17, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_EventScript_1BEABC", + "flag": "443" + }, + { + "graphics_id": "23", + "x": 15, + "y": 7, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_EventScript_167C77", + "flag": "0" + }, + { + "graphics_id": "16", + "x": 14, + "y": 14, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_EventScript_167C80", + "flag": "0" + }, + { + "graphics_id": "132", + "x": 15, + "y": 14, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_EventScript_167C89", + "flag": "0" + }, + { + "graphics_id": "53", + "x": 15, + "y": 31, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_EventScript_167CA5", + "flag": "121" + } + ], + "warp_events": [ + { + "x": 3, + "y": 31, + "elevation": 0, + "dest_map": "MAP_THREE_ISLAND_HOUSE1", + "dest_warp_id": 0 + }, + { + "x": 14, + "y": 27, + "elevation": 0, + "dest_map": "MAP_THREE_ISLAND_POKEMON_CENTER_1F", + "dest_warp_id": 0 + }, + { + "x": 18, + "y": 12, + "elevation": 0, + "dest_map": "MAP_THREE_ISLAND_MART", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 6, + "elevation": 0, + "dest_map": "MAP_THREE_ISLAND_HOUSE2", + "dest_warp_id": 0 + }, + { + "x": 12, + "y": 6, + "elevation": 0, + "dest_map": "MAP_THREE_ISLAND_HOUSE3", + "dest_warp_id": 0 + }, + { + "x": 12, + "y": 12, + "elevation": 0, + "dest_map": "MAP_THREE_ISLAND_HOUSE4", + "dest_warp_id": 0 + }, + { + "x": 13, + "y": 19, + "elevation": 0, + "dest_map": "MAP_THREE_ISLAND_HOUSE5", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 7, + "y": 27, + "elevation": 3, + "var": "VAR_0x407B", + "var_value": 2, + "script": "ThreeIsland_EventScript_1679B5" + }, + { + "type": "trigger", + "x": 8, + "y": 27, + "elevation": 3, + "var": "VAR_0x407B", + "var_value": 2, + "script": "ThreeIsland_EventScript_1679B5" + }, + { + "type": "trigger", + "x": 9, + "y": 27, + "elevation": 3, + "var": "VAR_0x407B", + "var_value": 2, + "script": "ThreeIsland_EventScript_1679B5" + }, + { + "type": "trigger", + "x": 10, + "y": 27, + "elevation": 3, + "var": "VAR_0x407B", + "var_value": 2, + "script": "ThreeIsland_EventScript_1679B5" + }, + { + "type": "trigger", + "x": 7, + "y": 26, + "elevation": 3, + "var": "VAR_0x407B", + "var_value": 3, + "script": "ThreeIsland_EventScript_167A1D" + }, + { + "type": "trigger", + "x": 8, + "y": 26, + "elevation": 3, + "var": "VAR_0x407B", + "var_value": 3, + "script": "ThreeIsland_EventScript_167A29" + }, + { + "type": "trigger", + "x": 9, + "y": 26, + "elevation": 3, + "var": "VAR_0x407B", + "var_value": 3, + "script": "ThreeIsland_EventScript_167A35" + }, + { + "type": "trigger", + "x": 11, + "y": 27, + "elevation": 3, + "var": "VAR_0x407B", + "var_value": 2, + "script": "ThreeIsland_EventScript_1679B5" + }, + { + "type": "trigger", + "x": 10, + "y": 26, + "elevation": 3, + "var": "VAR_0x407B", + "var_value": 3, + "script": "ThreeIsland_EventScript_167A41" + }, + { + "type": "trigger", + "x": 11, + "y": 26, + "elevation": 3, + "var": "VAR_0x407B", + "var_value": 3, + "script": "ThreeIsland_EventScript_167A4D" + } + ], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 12, + "y": 31, + "elevation": 0, + "script": "ThreeIsland_EventScript_167C9C" + }, + { + "type": "hidden_item", + "x": 5, + "y": 13, + "elevation": 3, + "item": "ITEM_PP_UP", + "flag": "164", + "unknown": 1 + } + ] +} \ No newline at end of file diff --git a/data/maps/ThreeIsland_BerryForest/events.inc b/data/maps/ThreeIsland_BerryForest/events.inc deleted file mode 100644 index 0ae949e3f..000000000 --- a/data/maps/ThreeIsland_BerryForest/events.inc +++ /dev/null @@ -1,40 +0,0 @@ -ThreeIsland_BerryForest_EventObjects: - object_event 1, 17, 0, 4, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, ThreeIsland_BerryForest_EventScript_163C83, 122, 0, 0 - object_event 2, 95, 0, 12, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, ThreeIsland_BerryForest_EventScript_1BDF13, 18, 0, 0 - object_event 3, 95, 0, 19, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, ThreeIsland_BerryForest_EventScript_1BDF13, 19, 0, 0 - object_event 4, 95, 0, 23, 0, 17, 0, 3, 1, 17, 0, 0, 0, 0, 0, ThreeIsland_BerryForest_EventScript_1BDF13, 20, 0, 0 - object_event 5, 95, 0, 38, 0, 23, 0, 3, 1, 17, 0, 0, 0, 0, 0, ThreeIsland_BerryForest_EventScript_1BDF13, 21, 0, 0 - object_event 6, 95, 0, 44, 0, 23, 0, 3, 1, 17, 0, 0, 0, 0, 0, ThreeIsland_BerryForest_EventScript_1BDF13, 22, 0, 0 - object_event 7, 95, 0, 44, 0, 29, 0, 3, 1, 17, 0, 0, 0, 0, 0, ThreeIsland_BerryForest_EventScript_1BDF13, 23, 0, 0 - object_event 8, 95, 0, 16, 0, 43, 0, 3, 1, 17, 0, 0, 0, 0, 0, ThreeIsland_BerryForest_EventScript_1BDF13, 24, 0, 0 - object_event 9, 95, 0, 17, 0, 39, 0, 3, 1, 17, 0, 0, 0, 0, 0, ThreeIsland_BerryForest_EventScript_1BDF13, 25, 0, 0 - object_event 10, 95, 0, 14, 0, 39, 0, 3, 1, 17, 0, 0, 0, 0, 0, ThreeIsland_BerryForest_EventScript_1BDF13, 26, 0, 0 - object_event 11, 95, 0, 11, 0, 39, 0, 3, 1, 17, 0, 0, 0, 0, 0, ThreeIsland_BerryForest_EventScript_1BDF13, 27, 0, 0 - object_event 12, 92, 0, 12, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, ThreeIsland_BerryForest_EventScript_1BED05, 490, 0, 0 - object_event 13, 92, 0, 27, 0, 11, 0, 3, 8, 17, 0, 0, 0, 0, 0, ThreeIsland_BerryForest_EventScript_1BED12, 491, 0, 0 - object_event 14, 92, 0, 12, 0, 43, 0, 3, 8, 17, 0, 0, 0, 0, 0, ThreeIsland_BerryForest_EventScript_1BED1F, 492, 0, 0 - -ThreeIsland_BerryForest_MapWarps: - warp_def 43, 41, 3, 0, 816 - warp_def 42, 41, 3, 0, 816 - warp_def 44, 41, 3, 1, 816 - -ThreeIsland_BerryForest_MapBGEvents: - bg_event 7, 27, 0, 0, 0, ThreeIsland_BerryForest_EventScript_163D31 - bg_event 39, 35, 0, 0, 0, ThreeIsland_BerryForest_EventScript_163D28 - bg_event 31, 25, 3, 7, 0, 148, 90, 1 - bg_event 15, 15, 3, 7, 0, 149, 91, 1 - bg_event 25, 24, 3, 7, 0, 150, 92, 1 - bg_event 11, 24, 3, 7, 0, 151, 93, 1 - bg_event 37, 18, 3, 7, 0, 139, 94, 1 - bg_event 14, 23, 3, 7, 0, 133, 95, 1 - bg_event 47, 5, 3, 7, 0, 134, 96, 1 - bg_event 7, 30, 3, 7, 0, 135, 97, 1 - bg_event 16, 5, 3, 7, 0, 136, 98, 1 - bg_event 25, 6, 3, 7, 0, 137, 99, 1 - bg_event 46, 32, 3, 7, 0, 140, 100, 1 - bg_event 43, 16, 3, 7, 0, 152, 101, 1 - bg_event 8, 5, 3, 7, 0, 141, 102, 1 - -ThreeIsland_BerryForest_MapEvents:: - map_events ThreeIsland_BerryForest_EventObjects, ThreeIsland_BerryForest_MapWarps, 0x0, ThreeIsland_BerryForest_MapBGEvents diff --git a/data/maps/ThreeIsland_BerryForest/header.inc b/data/maps/ThreeIsland_BerryForest/header.inc deleted file mode 100644 index 928ba8d4a..000000000 --- a/data/maps/ThreeIsland_BerryForest/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -ThreeIsland_BerryForest:: @ 834FE00 - .4byte ThreeIsland_BerryForest_Layout @ 0x833A7A8 - .4byte ThreeIsland_BerryForest_MapEvents @ 0x83B340C - .4byte ThreeIsland_BerryForest_MapScripts @ 0x8163C71 - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_FOREST - .2byte 270 - .byte 0xb0, 0x00, 0x0b, 0x03, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/ThreeIsland_BerryForest/map.json b/data/maps/ThreeIsland_BerryForest/map.json new file mode 100644 index 000000000..542a70dc9 --- /dev/null +++ b/data/maps/ThreeIsland_BerryForest/map.json @@ -0,0 +1,356 @@ +{ + "id": "MAP_THREE_ISLAND_BERRY_FOREST", + "name": "ThreeIsland_BerryForest", + "layout": "LAYOUT_THREE_ISLAND_BERRY_FOREST", + "music": "BGM_FRLG_VIRIDIAN_FOREST", + "region_map_section": "MAPSEC_BERRY_FOREST", + "requires_flash": false, + "weather": "WEATHER_11", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "17", + "x": 4, + "y": 8, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_BerryForest_EventScript_163C83", + "flag": "122" + }, + { + "graphics_id": "95", + "x": 12, + "y": 11, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_BerryForest_EventScript_1BDF13", + "flag": "18" + }, + { + "graphics_id": "95", + "x": 19, + "y": 7, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_BerryForest_EventScript_1BDF13", + "flag": "19" + }, + { + "graphics_id": "95", + "x": 23, + "y": 17, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_BerryForest_EventScript_1BDF13", + "flag": "20" + }, + { + "graphics_id": "95", + "x": 38, + "y": 23, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_BerryForest_EventScript_1BDF13", + "flag": "21" + }, + { + "graphics_id": "95", + "x": 44, + "y": 23, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_BerryForest_EventScript_1BDF13", + "flag": "22" + }, + { + "graphics_id": "95", + "x": 44, + "y": 29, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_BerryForest_EventScript_1BDF13", + "flag": "23" + }, + { + "graphics_id": "95", + "x": 16, + "y": 43, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_BerryForest_EventScript_1BDF13", + "flag": "24" + }, + { + "graphics_id": "95", + "x": 17, + "y": 39, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_BerryForest_EventScript_1BDF13", + "flag": "25" + }, + { + "graphics_id": "95", + "x": 14, + "y": 39, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_BerryForest_EventScript_1BDF13", + "flag": "26" + }, + { + "graphics_id": "95", + "x": 11, + "y": 39, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_BerryForest_EventScript_1BDF13", + "flag": "27" + }, + { + "graphics_id": "92", + "x": 12, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_BerryForest_EventScript_1BED05", + "flag": "490" + }, + { + "graphics_id": "92", + "x": 27, + "y": 11, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_BerryForest_EventScript_1BED12", + "flag": "491" + }, + { + "graphics_id": "92", + "x": 12, + "y": 43, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_BerryForest_EventScript_1BED1F", + "flag": "492" + } + ], + "warp_events": [ + { + "x": 43, + "y": 41, + "elevation": 3, + "dest_map": "MAP_THREE_ISLAND_BOND_BRIDGE", + "dest_warp_id": 0 + }, + { + "x": 42, + "y": 41, + "elevation": 3, + "dest_map": "MAP_THREE_ISLAND_BOND_BRIDGE", + "dest_warp_id": 0 + }, + { + "x": 44, + "y": 41, + "elevation": 3, + "dest_map": "MAP_THREE_ISLAND_BOND_BRIDGE", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 7, + "y": 27, + "elevation": 0, + "script": "ThreeIsland_BerryForest_EventScript_163D31" + }, + { + "type": "bg_event_type_0", + "x": 39, + "y": 35, + "elevation": 0, + "script": "ThreeIsland_BerryForest_EventScript_163D28" + }, + { + "type": "hidden_item", + "x": 31, + "y": 25, + "elevation": 3, + "item": "ITEM_RAZZ_BERRY", + "flag": "90", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 15, + "y": 15, + "elevation": 3, + "item": "ITEM_BLUK_BERRY", + "flag": "91", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 25, + "y": 24, + "elevation": 3, + "item": "ITEM_NANAB_BERRY", + "flag": "92", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 11, + "y": 24, + "elevation": 3, + "item": "ITEM_WEPEAR_BERRY", + "flag": "93", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 37, + "y": 18, + "elevation": 3, + "item": "ITEM_ORAN_BERRY", + "flag": "94", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 14, + "y": 23, + "elevation": 3, + "item": "ITEM_CHERI_BERRY", + "flag": "95", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 47, + "y": 5, + "elevation": 3, + "item": "ITEM_CHESTO_BERRY", + "flag": "96", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 7, + "y": 30, + "elevation": 3, + "item": "ITEM_PECHA_BERRY", + "flag": "97", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 16, + "y": 5, + "elevation": 3, + "item": "ITEM_RAWST_BERRY", + "flag": "98", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 25, + "y": 6, + "elevation": 3, + "item": "ITEM_ASPEAR_BERRY", + "flag": "99", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 46, + "y": 32, + "elevation": 3, + "item": "ITEM_PERSIM_BERRY", + "flag": "100", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 43, + "y": 16, + "elevation": 3, + "item": "ITEM_PINAP_BERRY", + "flag": "101", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 8, + "y": 5, + "elevation": 3, + "item": "ITEM_LUM_BERRY", + "flag": "102", + "unknown": 1 + } + ] +} \ No newline at end of file diff --git a/data/maps/ThreeIsland_BerryForest/scripts.inc b/data/maps/ThreeIsland_BerryForest/scripts.inc index 84eb22b43..42446a6d7 100644 --- a/data/maps/ThreeIsland_BerryForest/scripts.inc +++ b/data/maps/ThreeIsland_BerryForest/scripts.inc @@ -4,7 +4,7 @@ ThreeIsland_BerryForest_MapScripts:: @ 8163C71 ThreeIsland_BerryForest_MapScript1_163C77:: @ 8163C77 setworldmapflag 2231 - setescapewarp MAP_THREE_ISLAND_BONDBRIDGE, 255, 12, 6 + setescapewarp MAP_THREE_ISLAND_BOND_BRIDGE, 255, 12, 6 end ThreeIsland_BerryForest_EventScript_163C83:: @ 8163C83 @@ -45,7 +45,7 @@ ThreeIsland_BerryForest_EventScript_163C83:: @ 8163C83 setflag FLAG_0x07A setvar VAR_0x4079, 2 clearflag FLAG_0x075 - warp MAP_TWO_ISLAND_JOYFULGAMECORNER, 255, 6, 6 + warp MAP_TWO_ISLAND_JOYFUL_GAME_CORNER, 255, 6, 6 waitstate release end diff --git a/data/maps/ThreeIsland_BondBridge/connections.inc b/data/maps/ThreeIsland_BondBridge/connections.inc deleted file mode 100644 index ccbb788ec..000000000 --- a/data/maps/ThreeIsland_BondBridge/connections.inc +++ /dev/null @@ -1,6 +0,0 @@ -ThreeIsland_BondBridge_MapConnectionsList: @ 8352D58 - connection right, 0, MAP_THREE_ISLAND - -ThreeIsland_BondBridge_MapConnections:: @ 8352D64 - .4byte 1 - .4byte ThreeIsland_BondBridge_MapConnectionsList diff --git a/data/maps/ThreeIsland_BondBridge/events.inc b/data/maps/ThreeIsland_BondBridge/events.inc deleted file mode 100644 index 015d463ac..000000000 --- a/data/maps/ThreeIsland_BondBridge/events.inc +++ /dev/null @@ -1,24 +0,0 @@ -ThreeIsland_BondBridge_EventObjects: - object_event 1, 28, 0, 27, 0, 10, 0, 3, 2, 17, 0, 1, 0, 5, 0, ThreeIsland_BondBridge_EventScript_1ABF65, 0, 0, 0 - object_event 2, 28, 0, 68, 0, 10, 0, 3, 9, 17, 0, 1, 0, 2, 0, ThreeIsland_BondBridge_EventScript_1ABFA3, 0, 0, 0 - object_event 3, 37, 0, 33, 0, 13, 0, 3, 10, 17, 0, 1, 0, 1, 0, ThreeIsland_BondBridge_EventScript_1ABFE1, 0, 0, 0 - object_event 4, 37, 0, 50, 0, 11, 0, 3, 27, 18, 0, 1, 0, 1, 0, ThreeIsland_BondBridge_EventScript_1AC01F, 0, 0, 0 - object_event 5, 44, 0, 36, 0, 4, 0, 1, 1, 17, 0, 1, 0, 1, 0, ThreeIsland_BondBridge_EventScript_1AC05D, 0, 0, 0 - object_event 6, 17, 0, 77, 0, 5, 0, 3, 8, 17, 0, 1, 0, 1, 0, ThreeIsland_BondBridge_EventScript_1AC09B, 0, 0, 0 - object_event 7, 17, 0, 78, 0, 5, 0, 3, 8, 17, 0, 1, 0, 1, 0, ThreeIsland_BondBridge_EventScript_1AC0E1, 0, 0, 0 - object_event 8, 95, 0, 72, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, ThreeIsland_BondBridge_EventScript_1BDF13, 18, 0, 0 - object_event 9, 95, 0, 86, 0, 13, 0, 3, 1, 17, 0, 0, 0, 0, 0, ThreeIsland_BondBridge_EventScript_1BDF13, 19, 0, 0 - -ThreeIsland_BondBridge_MapWarps: - warp_def 12, 6, 3, 0, 365 - warp_def 13, 6, 3, 0, 365 - -ThreeIsland_BondBridge_MapBGEvents: - bg_event 14, 7, 0, 0, 0, ThreeIsland_BondBridge_EventScript_168777 - bg_event 61, 5, 0, 7, 0, 84, 165, 1 - bg_event 44, 12, 3, 7, 0, 106, 166, 1 - bg_event 33, 7, 3, 7, 0, 108, 167, 1 - bg_event 91, 9, 0, 0, 0, ThreeIsland_BondBridge_EventScript_168780 - -ThreeIsland_BondBridge_MapEvents:: - map_events ThreeIsland_BondBridge_EventObjects, ThreeIsland_BondBridge_MapWarps, 0x0, ThreeIsland_BondBridge_MapBGEvents diff --git a/data/maps/ThreeIsland_BondBridge/header.inc b/data/maps/ThreeIsland_BondBridge/header.inc deleted file mode 100644 index 43c5f0c30..000000000 --- a/data/maps/ThreeIsland_BondBridge/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -ThreeIsland_BondBridge:: @ 8350B58 - .4byte ThreeIsland_BondBridge_Layout @ 0x8327BDC - .4byte ThreeIsland_BondBridge_MapEvents @ 0x83B8A9C - .4byte ThreeIsland_BondBridge_MapScripts @ 0x8168776 - .4byte ThreeIsland_BondBridge_MapConnections @ 0x8352D64 - .2byte BGM_FRLG_ROUTE_3 - .2byte 240 - .byte 0x99, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/ThreeIsland_BondBridge/map.json b/data/maps/ThreeIsland_BondBridge/map.json new file mode 100644 index 000000000..2afa51258 --- /dev/null +++ b/data/maps/ThreeIsland_BondBridge/map.json @@ -0,0 +1,200 @@ +{ + "id": "MAP_THREE_ISLAND_BOND_BRIDGE", + "name": "ThreeIsland_BondBridge", + "layout": "LAYOUT_THREE_ISLAND_BOND_BRIDGE", + "music": "BGM_FRLG_ROUTE_3", + "region_map_section": "MAPSEC_BOND_BRIDGE", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_THREE_ISLAND", + "offset": 0, + "direction": "right" + } + ], + "object_events": [ + { + "graphics_id": "28", + "x": 27, + "y": 10, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "ThreeIsland_BondBridge_EventScript_1ABF65", + "flag": "0" + }, + { + "graphics_id": "28", + "x": 68, + "y": 10, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "ThreeIsland_BondBridge_EventScript_1ABFA3", + "flag": "0" + }, + { + "graphics_id": "37", + "x": 33, + "y": 13, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "ThreeIsland_BondBridge_EventScript_1ABFE1", + "flag": "0" + }, + { + "graphics_id": "37", + "x": 50, + "y": 11, + "elevation": 3, + "movement_type": "27", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "ThreeIsland_BondBridge_EventScript_1AC01F", + "flag": "0" + }, + { + "graphics_id": "44", + "x": 36, + "y": 4, + "elevation": 1, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "ThreeIsland_BondBridge_EventScript_1AC05D", + "flag": "0" + }, + { + "graphics_id": "17", + "x": 77, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "ThreeIsland_BondBridge_EventScript_1AC09B", + "flag": "0" + }, + { + "graphics_id": "17", + "x": 78, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "ThreeIsland_BondBridge_EventScript_1AC0E1", + "flag": "0" + }, + { + "graphics_id": "95", + "x": 72, + "y": 8, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_BondBridge_EventScript_1BDF13", + "flag": "18" + }, + { + "graphics_id": "95", + "x": 86, + "y": 13, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_BondBridge_EventScript_1BDF13", + "flag": "19" + } + ], + "warp_events": [ + { + "x": 12, + "y": 6, + "elevation": 3, + "dest_map": "MAP_THREE_ISLAND_BERRY_FOREST", + "dest_warp_id": 0 + }, + { + "x": 13, + "y": 6, + "elevation": 3, + "dest_map": "MAP_THREE_ISLAND_BERRY_FOREST", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 14, + "y": 7, + "elevation": 0, + "script": "ThreeIsland_BondBridge_EventScript_168777" + }, + { + "type": "hidden_item", + "x": 61, + "y": 5, + "elevation": 0, + "item": "ITEM_MAX_REPEL", + "flag": "165", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 44, + "y": 12, + "elevation": 3, + "item": "ITEM_PEARL", + "flag": "166", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 33, + "y": 7, + "elevation": 3, + "item": "ITEM_STARDUST", + "flag": "167", + "unknown": 1 + }, + { + "type": "bg_event_type_0", + "x": 91, + "y": 9, + "elevation": 0, + "script": "ThreeIsland_BondBridge_EventScript_168780" + } + ] +} \ No newline at end of file diff --git a/data/maps/ThreeIsland_DunsparceTunnel/events.inc b/data/maps/ThreeIsland_DunsparceTunnel/events.inc deleted file mode 100644 index ed3dd51d8..000000000 --- a/data/maps/ThreeIsland_DunsparceTunnel/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -ThreeIsland_DunsparceTunnel_EventObjects: - object_event 1, 27, 0, 23, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, ThreeIsland_DunsparceTunnel_EventScript_164D60, 0, 0, 0 - -ThreeIsland_DunsparceTunnel_MapWarps: - warp_def 3, 4, 3, 0, 817 - warp_def 25, 5, 3, 1, 817 - -ThreeIsland_DunsparceTunnel_MapBGEvents: - bg_event 21, 3, 0, 7, 0, 110, 163, 1 - -ThreeIsland_DunsparceTunnel_MapEvents:: - map_events ThreeIsland_DunsparceTunnel_EventObjects, ThreeIsland_DunsparceTunnel_MapWarps, 0x0, ThreeIsland_DunsparceTunnel_MapBGEvents diff --git a/data/maps/ThreeIsland_DunsparceTunnel/header.inc b/data/maps/ThreeIsland_DunsparceTunnel/header.inc deleted file mode 100644 index 4f870e33d..000000000 --- a/data/maps/ThreeIsland_DunsparceTunnel/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -ThreeIsland_DunsparceTunnel:: @ 8350340 - .4byte ThreeIsland_DunsparceTunnel_Layout @ 0x83451F8 - .4byte ThreeIsland_DunsparceTunnel_MapEvents @ 0x83B4788 - .4byte ThreeIsland_DunsparceTunnel_MapScripts @ 0x8164D26 - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_FOREST - .2byte 318 - .byte 0xb9, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/ThreeIsland_DunsparceTunnel/map.json b/data/maps/ThreeIsland_DunsparceTunnel/map.json new file mode 100644 index 000000000..624dd99f2 --- /dev/null +++ b/data/maps/ThreeIsland_DunsparceTunnel/map.json @@ -0,0 +1,58 @@ +{ + "id": "MAP_THREE_ISLAND_DUNSPARCE_TUNNEL", + "name": "ThreeIsland_DunsparceTunnel", + "layout": "LAYOUT_THREE_ISLAND_DUNSPARCE_TUNNEL", + "music": "BGM_FRLG_VIRIDIAN_FOREST", + "region_map_section": "MAPSEC_THREE_ISLE_PATH", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "27", + "x": 23, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_DunsparceTunnel_EventScript_164D60", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 4, + "elevation": 3, + "dest_map": "MAP_THREE_ISLAND_PORT", + "dest_warp_id": 0 + }, + { + "x": 25, + "y": 5, + "elevation": 3, + "dest_map": "MAP_THREE_ISLAND_PORT", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 21, + "y": 3, + "elevation": 0, + "item": "ITEM_NUGGET", + "flag": "163", + "unknown": 1 + } + ] +} \ No newline at end of file diff --git a/data/maps/ThreeIsland_Harbor/events.inc b/data/maps/ThreeIsland_Harbor/events.inc deleted file mode 100644 index be18b4dc7..000000000 --- a/data/maps/ThreeIsland_Harbor/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -ThreeIsland_Harbor_EventObjects: - object_event 1, 108, 0, 8, 0, 9, 0, 0, 8, 17, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 2, 62, 0, 8, 0, 6, 0, 3, 7, 17, 0, 0, 0, 0, 0, ThreeIsland_Harbor_EventScript_171EAA, 0, 0, 0 - -ThreeIsland_Harbor_MapWarps: - warp_def 8, 2, 3, 2, 817 - -ThreeIsland_Harbor_MapEvents:: - map_events ThreeIsland_Harbor_EventObjects, ThreeIsland_Harbor_MapWarps, 0x0, 0x0 diff --git a/data/maps/ThreeIsland_Harbor/header.inc b/data/maps/ThreeIsland_Harbor/header.inc deleted file mode 100644 index 296d4889a..000000000 --- a/data/maps/ThreeIsland_Harbor/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -ThreeIsland_Harbor:: @ 8351F5C - .4byte Island_Harbor_Layout @ 0x8343FB8 - .4byte ThreeIsland_Harbor_MapEvents @ 0x83BF25C - .4byte ThreeIsland_Harbor_MapScripts @ 0x8171EA9 - .4byte NULL - .2byte BGM_FRLG_ISLAND_ONE - .2byte 315 - .byte 0x9a, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/ThreeIsland_Harbor/map.json b/data/maps/ThreeIsland_Harbor/map.json new file mode 100644 index 000000000..4348bde2f --- /dev/null +++ b/data/maps/ThreeIsland_Harbor/map.json @@ -0,0 +1,54 @@ +{ + "id": "MAP_THREE_ISLAND_HARBOR", + "name": "ThreeIsland_Harbor", + "layout": "LAYOUT_ISLAND_HARBOR", + "music": "BGM_FRLG_ISLAND_ONE", + "region_map_section": "MAPSEC_THREE_ISLE_PORT", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "108", + "x": 8, + "y": 9, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "62", + "x": 8, + "y": 6, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_Harbor_EventScript_171EAA", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 8, + "y": 2, + "elevation": 3, + "dest_map": "MAP_THREE_ISLAND_PORT", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/ThreeIsland_House1/events.inc b/data/maps/ThreeIsland_House1/events.inc deleted file mode 100644 index 1b252b532..000000000 --- a/data/maps/ThreeIsland_House1/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -ThreeIsland_House1_EventObjects: - object_event 1, 17, 0, 3, 0, 4, 0, 0, 10, 17, 0, 0, 0, 0, 0, ThreeIsland_House1_EventScript_17181A, 118, 0, 0 - -ThreeIsland_House1_MapWarps: - warp_def 4, 7, 3, 0, 782 - -ThreeIsland_House1_MapBGEvents: - bg_event 2, 1, 0, 0, 0, ThreeIsland_House1_EventScript_171829 - -ThreeIsland_House1_MapEvents:: - map_events ThreeIsland_House1_EventObjects, ThreeIsland_House1_MapWarps, 0x0, ThreeIsland_House1_MapBGEvents diff --git a/data/maps/ThreeIsland_House1/header.inc b/data/maps/ThreeIsland_House1/header.inc deleted file mode 100644 index 1be2f87cf..000000000 --- a/data/maps/ThreeIsland_House1/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -ThreeIsland_House1:: @ 8351C84 - .4byte ThreeIsland_House1_Layout @ 0x82D7504 - .4byte ThreeIsland_House1_MapEvents @ 0x83BE7A4 - .4byte ThreeIsland_House1_MapScripts @ 0x8171819 - .4byte NULL - .2byte BGM_FRLG_ISLAND_ONE - .2byte 31 - .byte 0x91, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/ThreeIsland_House1/map.json b/data/maps/ThreeIsland_House1/map.json new file mode 100644 index 000000000..b7d96db3c --- /dev/null +++ b/data/maps/ThreeIsland_House1/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_THREE_ISLAND_HOUSE1", + "name": "ThreeIsland_House1", + "layout": "LAYOUT_THREE_ISLAND_HOUSE1", + "music": "BGM_FRLG_ISLAND_ONE", + "region_map_section": "MAPSEC_THREE_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "17", + "x": 3, + "y": 4, + "elevation": 0, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_House1_EventScript_17181A", + "flag": "118" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_THREE_ISLAND", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 2, + "y": 1, + "elevation": 0, + "script": "ThreeIsland_House1_EventScript_171829" + } + ] +} \ No newline at end of file diff --git a/data/maps/ThreeIsland_House2/events.inc b/data/maps/ThreeIsland_House2/events.inc deleted file mode 100644 index 911e78290..000000000 --- a/data/maps/ThreeIsland_House2/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -ThreeIsland_House2_EventObjects: - object_event 1, 26, 0, 4, 0, 4, 0, 3, 10, 17, 0, 0, 0, 0, 0, ThreeIsland_House2_EventScript_1718F9, 0, 0, 0 - object_event 2, 25, 0, 7, 0, 4, 0, 3, 9, 17, 0, 0, 0, 0, 0, ThreeIsland_House2_EventScript_1718E0, 0, 0, 0 - -ThreeIsland_House2_MapWarps: - warp_def 4, 7, 3, 3, 782 - -ThreeIsland_House2_MapEvents:: - map_events ThreeIsland_House2_EventObjects, ThreeIsland_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/ThreeIsland_House2/header.inc b/data/maps/ThreeIsland_House2/header.inc deleted file mode 100644 index e0f113fff..000000000 --- a/data/maps/ThreeIsland_House2/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -ThreeIsland_House2:: @ 8351CF4 - .4byte House3_Layout @ 0x82D5CB8 - .4byte ThreeIsland_House2_MapEvents @ 0x83BE97C - .4byte ThreeIsland_House2_MapScripts @ 0x81718DF - .4byte NULL - .2byte BGM_FRLG_ISLAND_ONE - .2byte 11 - .byte 0x91, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/ThreeIsland_House2/map.json b/data/maps/ThreeIsland_House2/map.json new file mode 100644 index 000000000..ca21bcb96 --- /dev/null +++ b/data/maps/ThreeIsland_House2/map.json @@ -0,0 +1,54 @@ +{ + "id": "MAP_THREE_ISLAND_HOUSE2", + "name": "ThreeIsland_House2", + "layout": "LAYOUT_HOUSE3", + "music": "BGM_FRLG_ISLAND_ONE", + "region_map_section": "MAPSEC_THREE_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "26", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_House2_EventScript_1718F9", + "flag": "0" + }, + { + "graphics_id": "25", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_House2_EventScript_1718E0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_THREE_ISLAND", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/ThreeIsland_House3/events.inc b/data/maps/ThreeIsland_House3/events.inc deleted file mode 100644 index 5635e1472..000000000 --- a/data/maps/ThreeIsland_House3/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -ThreeIsland_House3_EventObjects: - object_event 1, 29, 0, 8, 0, 2, 0, 3, 7, 17, 0, 0, 0, 0, 0, ThreeIsland_House3_EventScript_171903, 0, 0, 0 - -ThreeIsland_House3_MapWarps: - warp_def 4, 7, 3, 4, 782 - -ThreeIsland_House3_MapEvents:: - map_events ThreeIsland_House3_EventObjects, ThreeIsland_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/ThreeIsland_House3/header.inc b/data/maps/ThreeIsland_House3/header.inc deleted file mode 100644 index 63799a6dc..000000000 --- a/data/maps/ThreeIsland_House3/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -ThreeIsland_House3:: @ 8351D10 - .4byte House3_Layout @ 0x82D5CB8 - .4byte ThreeIsland_House3_MapEvents @ 0x83BE9B0 - .4byte ThreeIsland_House3_MapScripts @ 0x8171902 - .4byte NULL - .2byte BGM_FRLG_ISLAND_ONE - .2byte 11 - .byte 0x91, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/ThreeIsland_House3/map.json b/data/maps/ThreeIsland_House3/map.json new file mode 100644 index 000000000..87b46b302 --- /dev/null +++ b/data/maps/ThreeIsland_House3/map.json @@ -0,0 +1,41 @@ +{ + "id": "MAP_THREE_ISLAND_HOUSE3", + "name": "ThreeIsland_House3", + "layout": "LAYOUT_HOUSE3", + "music": "BGM_FRLG_ISLAND_ONE", + "region_map_section": "MAPSEC_THREE_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "29", + "x": 8, + "y": 2, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_House3_EventScript_171903", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_THREE_ISLAND", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/ThreeIsland_House4/events.inc b/data/maps/ThreeIsland_House4/events.inc deleted file mode 100644 index 650f0d0ad..000000000 --- a/data/maps/ThreeIsland_House4/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -ThreeIsland_House4_EventObjects: - object_event 1, 30, 0, 7, 0, 4, 0, 3, 9, 17, 0, 0, 0, 0, 0, ThreeIsland_House4_EventScript_17190D, 0, 0, 0 - object_event 2, 16, 0, 6, 0, 3, 0, 3, 2, 18, 0, 0, 0, 0, 0, ThreeIsland_House4_EventScript_171916, 0, 0, 0 - -ThreeIsland_House4_MapWarps: - warp_def 4, 7, 3, 5, 782 - -ThreeIsland_House4_MapEvents:: - map_events ThreeIsland_House4_EventObjects, ThreeIsland_House4_MapWarps, 0x0, 0x0 diff --git a/data/maps/ThreeIsland_House4/header.inc b/data/maps/ThreeIsland_House4/header.inc deleted file mode 100644 index 9a270c499..000000000 --- a/data/maps/ThreeIsland_House4/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -ThreeIsland_House4:: @ 8351D2C - .4byte House3_Layout @ 0x82D5CB8 - .4byte ThreeIsland_House4_MapEvents @ 0x83BE9FC - .4byte ThreeIsland_House4_MapScripts @ 0x817190C - .4byte NULL - .2byte BGM_FRLG_ISLAND_ONE - .2byte 11 - .byte 0x91, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/ThreeIsland_House4/map.json b/data/maps/ThreeIsland_House4/map.json new file mode 100644 index 000000000..42e328dbc --- /dev/null +++ b/data/maps/ThreeIsland_House4/map.json @@ -0,0 +1,54 @@ +{ + "id": "MAP_THREE_ISLAND_HOUSE4", + "name": "ThreeIsland_House4", + "layout": "LAYOUT_HOUSE3", + "music": "BGM_FRLG_ISLAND_ONE", + "region_map_section": "MAPSEC_THREE_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "30", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_House4_EventScript_17190D", + "flag": "0" + }, + { + "graphics_id": "16", + "x": 6, + "y": 3, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_House4_EventScript_171916", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_THREE_ISLAND", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/ThreeIsland_House5/events.inc b/data/maps/ThreeIsland_House5/events.inc deleted file mode 100644 index 2c7fe7072..000000000 --- a/data/maps/ThreeIsland_House5/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -ThreeIsland_House5_EventObjects: - object_event 1, 17, 0, 2, 0, 5, 0, 3, 2, 17, 0, 0, 0, 0, 0, ThreeIsland_House5_EventScript_171920, 0, 0, 0 - -ThreeIsland_House5_MapWarps: - warp_def 4, 7, 3, 6, 782 - -ThreeIsland_House5_MapEvents:: - map_events ThreeIsland_House5_EventObjects, ThreeIsland_House5_MapWarps, 0x0, 0x0 diff --git a/data/maps/ThreeIsland_House5/header.inc b/data/maps/ThreeIsland_House5/header.inc deleted file mode 100644 index 0579cbe99..000000000 --- a/data/maps/ThreeIsland_House5/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -ThreeIsland_House5:: @ 8351D48 - .4byte House3_Layout @ 0x82D5CB8 - .4byte ThreeIsland_House5_MapEvents @ 0x83BEA30 - .4byte ThreeIsland_House5_MapScripts @ 0x817191F - .4byte NULL - .2byte BGM_FRLG_ISLAND_ONE - .2byte 11 - .byte 0x91, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/ThreeIsland_House5/map.json b/data/maps/ThreeIsland_House5/map.json new file mode 100644 index 000000000..ccc509b37 --- /dev/null +++ b/data/maps/ThreeIsland_House5/map.json @@ -0,0 +1,41 @@ +{ + "id": "MAP_THREE_ISLAND_HOUSE5", + "name": "ThreeIsland_House5", + "layout": "LAYOUT_HOUSE3", + "music": "BGM_FRLG_ISLAND_ONE", + "region_map_section": "MAPSEC_THREE_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "17", + "x": 2, + "y": 5, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_House5_EventScript_171920", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_THREE_ISLAND", + "dest_warp_id": 6 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/ThreeIsland_Mart/events.inc b/data/maps/ThreeIsland_Mart/events.inc deleted file mode 100644 index 1bbd353ad..000000000 --- a/data/maps/ThreeIsland_Mart/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -ThreeIsland_Mart_EventObjects: - object_event 1, 68, 0, 2, 0, 3, 0, 0, 10, 17, 0, 0, 0, 0, 0, ThreeIsland_Mart_EventScript_17188D, 0, 0, 0 - object_event 2, 40, 0, 2, 0, 7, 0, 3, 7, 17, 0, 0, 0, 0, 0, ThreeIsland_Mart_EventScript_1718C4, 0, 0, 0 - object_event 3, 20, 0, 7, 0, 2, 0, 3, 7, 17, 0, 0, 0, 0, 0, ThreeIsland_Mart_EventScript_1718CD, 0, 0, 0 - object_event 4, 18, 0, 6, 0, 5, 0, 3, 2, 17, 0, 0, 0, 0, 0, ThreeIsland_Mart_EventScript_1718D6, 0, 0, 0 - -ThreeIsland_Mart_MapWarps: - warp_def 4, 7, 3, 2, 782 - -ThreeIsland_Mart_MapEvents:: - map_events ThreeIsland_Mart_EventObjects, ThreeIsland_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/ThreeIsland_Mart/header.inc b/data/maps/ThreeIsland_Mart/header.inc deleted file mode 100644 index 1bf63765e..000000000 --- a/data/maps/ThreeIsland_Mart/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -ThreeIsland_Mart:: @ 8351CD8 - .4byte Mart_Layout @ 0x82D5BCC - .4byte ThreeIsland_Mart_MapEvents @ 0x83BE930 - .4byte ThreeIsland_Mart_MapScripts @ 0x817188C - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 10 - .byte 0x91, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/ThreeIsland_Mart/map.json b/data/maps/ThreeIsland_Mart/map.json new file mode 100644 index 000000000..ed3bb6395 --- /dev/null +++ b/data/maps/ThreeIsland_Mart/map.json @@ -0,0 +1,80 @@ +{ + "id": "MAP_THREE_ISLAND_MART", + "name": "ThreeIsland_Mart", + "layout": "LAYOUT_MART", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_THREE_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "68", + "x": 2, + "y": 3, + "elevation": 0, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_Mart_EventScript_17188D", + "flag": "0" + }, + { + "graphics_id": "40", + "x": 2, + "y": 7, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_Mart_EventScript_1718C4", + "flag": "0" + }, + { + "graphics_id": "20", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_Mart_EventScript_1718CD", + "flag": "0" + }, + { + "graphics_id": "18", + "x": 6, + "y": 5, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_Mart_EventScript_1718D6", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_THREE_ISLAND", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/ThreeIsland_PokemonCenter_1F/events.inc b/data/maps/ThreeIsland_PokemonCenter_1F/events.inc deleted file mode 100644 index 2e48a021b..000000000 --- a/data/maps/ThreeIsland_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -ThreeIsland_PokemonCenter_1F_EventObjects: - object_event 1, 64, 0, 7, 0, 2, 0, 0, 8, 17, 0, 0, 0, 0, 0, ThreeIsland_PokemonCenter_1F_EventScript_171841, 0, 0, 0 - object_event 2, 26, 0, 12, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, ThreeIsland_PokemonCenter_1F_EventScript_17185C, 0, 0, 0 - object_event 3, 22, 0, 3, 0, 4, 0, 3, 5, 17, 0, 0, 0, 0, 0, ThreeIsland_PokemonCenter_1F_EventScript_171853, 0, 0, 0 - object_event 4, 62, 0, 11, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, ThreeIsland_PokemonCenter_1F_EventScript_17184A, 0, 0, 0 - -ThreeIsland_PokemonCenter_1F_MapWarps: - warp_def 7, 8, 3, 1, 782 - warp_def 1, 6, 4, 0, 8706 - -ThreeIsland_PokemonCenter_1F_MapEvents:: - map_events ThreeIsland_PokemonCenter_1F_EventObjects, ThreeIsland_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/ThreeIsland_PokemonCenter_1F/header.inc b/data/maps/ThreeIsland_PokemonCenter_1F/header.inc deleted file mode 100644 index d65a7ef6a..000000000 --- a/data/maps/ThreeIsland_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -ThreeIsland_PokemonCenter_1F:: @ 8351CA0 - .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte ThreeIsland_PokemonCenter_1F_MapEvents @ 0x83BE828 - .4byte ThreeIsland_PokemonCenter_1F_MapScripts @ 0x8171832 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 8 - .byte 0x91, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/ThreeIsland_PokemonCenter_1F/map.json b/data/maps/ThreeIsland_PokemonCenter_1F/map.json new file mode 100644 index 000000000..3292e5409 --- /dev/null +++ b/data/maps/ThreeIsland_PokemonCenter_1F/map.json @@ -0,0 +1,87 @@ +{ + "id": "MAP_THREE_ISLAND_POKEMON_CENTER_1F", + "name": "ThreeIsland_PokemonCenter_1F", + "layout": "LAYOUT_POKEMON_CENTER_1F", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_THREE_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "64", + "x": 7, + "y": 2, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_PokemonCenter_1F_EventScript_171841", + "flag": "0" + }, + { + "graphics_id": "26", + "x": 12, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_PokemonCenter_1F_EventScript_17185C", + "flag": "0" + }, + { + "graphics_id": "22", + "x": 3, + "y": 4, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_PokemonCenter_1F_EventScript_171853", + "flag": "0" + }, + { + "graphics_id": "62", + "x": 11, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_PokemonCenter_1F_EventScript_17184A", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_THREE_ISLAND", + "dest_warp_id": 1 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_THREE_ISLAND_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/ThreeIsland_PokemonCenter_2F/events.inc b/data/maps/ThreeIsland_PokemonCenter_2F/events.inc deleted file mode 100644 index 1498826df..000000000 --- a/data/maps/ThreeIsland_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -ThreeIsland_PokemonCenter_2F_EventObjects: - object_event 1, 65, 0, 6, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, ThreeIsland_PokemonCenter_2F_EventScript_1A8CF6, 0, 0, 0 - object_event 2, 65, 0, 2, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, ThreeIsland_PokemonCenter_2F_EventScript_1A8CFC, 0, 0, 0 - object_event 3, 65, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, ThreeIsland_PokemonCenter_2F_EventScript_1A8D02, 0, 0, 0 - object_event 4, 69, 0, 1, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, ThreeIsland_PokemonCenter_2F_EventScript_1BB1D2, 112, 0, 0 - -ThreeIsland_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 1, 8705 - warp_def 5, 1, 0, 0, 4 - warp_def 9, 1, 0, 0, 1 - -ThreeIsland_PokemonCenter_2F_MapEvents:: - map_events ThreeIsland_PokemonCenter_2F_EventObjects, ThreeIsland_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/ThreeIsland_PokemonCenter_2F/header.inc b/data/maps/ThreeIsland_PokemonCenter_2F/header.inc deleted file mode 100644 index 83ab3678c..000000000 --- a/data/maps/ThreeIsland_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -ThreeIsland_PokemonCenter_2F:: @ 8351CBC - .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte ThreeIsland_PokemonCenter_2F_MapEvents @ 0x83BE8B4 - .4byte ThreeIsland_PokemonCenter_2F_MapScripts @ 0x8171865 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 9 - .byte 0x91, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/ThreeIsland_PokemonCenter_2F/map.json b/data/maps/ThreeIsland_PokemonCenter_2F/map.json new file mode 100644 index 000000000..b396f5897 --- /dev/null +++ b/data/maps/ThreeIsland_PokemonCenter_2F/map.json @@ -0,0 +1,94 @@ +{ + "id": "MAP_THREE_ISLAND_POKEMON_CENTER_2F", + "name": "ThreeIsland_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_THREE_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "65", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_PokemonCenter_2F_EventScript_1A8CF6", + "flag": "0" + }, + { + "graphics_id": "65", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_PokemonCenter_2F_EventScript_1A8CFC", + "flag": "0" + }, + { + "graphics_id": "65", + "x": 10, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_PokemonCenter_2F_EventScript_1A8D02", + "flag": "0" + }, + { + "graphics_id": "69", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_PokemonCenter_2F_EventScript_1BB1D2", + "flag": "112" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_THREE_ISLAND_POKEMON_CENTER_1F", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 1, + "elevation": 0, + "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 0, + "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/ThreeIsland_Port/connections.inc b/data/maps/ThreeIsland_Port/connections.inc deleted file mode 100644 index 0c166e50d..000000000 --- a/data/maps/ThreeIsland_Port/connections.inc +++ /dev/null @@ -1,6 +0,0 @@ -ThreeIsland_Port_MapConnectionsList: @ 8352D6C - connection up, 0, MAP_THREE_ISLAND - -ThreeIsland_Port_MapConnections:: @ 8352D78 - .4byte 1 - .4byte ThreeIsland_Port_MapConnectionsList diff --git a/data/maps/ThreeIsland_Port/events.inc b/data/maps/ThreeIsland_Port/events.inc deleted file mode 100644 index 8a6894ed1..000000000 --- a/data/maps/ThreeIsland_Port/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -ThreeIsland_Port_EventObjects: - object_event 1, 31, 0, 14, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, ThreeIsland_Port_EventScript_168796, 0, 0, 0 - object_event 2, 53, 0, 8, 0, 8, 0, 3, 28, 19, 0, 0, 0, 0, 0, ThreeIsland_Port_EventScript_1687CC, 121, 0, 0 - object_event 3, 53, 0, 13, 0, 10, 0, 3, 49, 34, 0, 0, 0, 0, 0, ThreeIsland_Port_EventScript_1687D5, 121, 0, 0 - -ThreeIsland_Port_MapWarps: - warp_def 16, 4, 0, 0, 546 - warp_def 38, 5, 3, 1, 546 - warp_def 12, 13, 3, 0, 9728 - -ThreeIsland_Port_MapEvents:: - map_events ThreeIsland_Port_EventObjects, ThreeIsland_Port_MapWarps, 0x0, 0x0 diff --git a/data/maps/ThreeIsland_Port/header.inc b/data/maps/ThreeIsland_Port/header.inc deleted file mode 100644 index 7fac5fe54..000000000 --- a/data/maps/ThreeIsland_Port/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -ThreeIsland_Port:: @ 8350B74 - .4byte ThreeIsland_Port_Layout @ 0x8328380 - .4byte ThreeIsland_Port_MapEvents @ 0x83B8B10 - .4byte ThreeIsland_Port_MapScripts @ 0x8168789 - .4byte ThreeIsland_Port_MapConnections @ 0x8352D78 - .2byte BGM_FRLG_ROUTE_3 - .2byte 241 - .byte 0x9a, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/ThreeIsland_Port/map.json b/data/maps/ThreeIsland_Port/map.json new file mode 100644 index 000000000..dcc447fbb --- /dev/null +++ b/data/maps/ThreeIsland_Port/map.json @@ -0,0 +1,87 @@ +{ + "id": "MAP_THREE_ISLAND_PORT", + "name": "ThreeIsland_Port", + "layout": "LAYOUT_THREE_ISLAND_PORT", + "music": "BGM_FRLG_ROUTE_3", + "region_map_section": "MAPSEC_THREE_ISLE_PORT", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_THREE_ISLAND", + "offset": 0, + "direction": "up" + } + ], + "object_events": [ + { + "graphics_id": "31", + "x": 14, + "y": 9, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_Port_EventScript_168796", + "flag": "0" + }, + { + "graphics_id": "53", + "x": 8, + "y": 8, + "elevation": 3, + "movement_type": "28", + "movement_range_x": 3, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_Port_EventScript_1687CC", + "flag": "121" + }, + { + "graphics_id": "53", + "x": 13, + "y": 10, + "elevation": 3, + "movement_type": "49", + "movement_range_x": 2, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ThreeIsland_Port_EventScript_1687D5", + "flag": "121" + } + ], + "warp_events": [ + { + "x": 16, + "y": 4, + "elevation": 0, + "dest_map": "MAP_THREE_ISLAND_DUNSPARCE_TUNNEL", + "dest_warp_id": 0 + }, + { + "x": 38, + "y": 5, + "elevation": 3, + "dest_map": "MAP_THREE_ISLAND_DUNSPARCE_TUNNEL", + "dest_warp_id": 1 + }, + { + "x": 12, + "y": 13, + "elevation": 3, + "dest_map": "MAP_THREE_ISLAND_HARBOR", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/TwoIsland/connections.inc b/data/maps/TwoIsland/connections.inc deleted file mode 100644 index 3cd53b58f..000000000 --- a/data/maps/TwoIsland/connections.inc +++ /dev/null @@ -1,6 +0,0 @@ -TwoIsland_MapConnectionsList: @ 8352954 - connection up, 24, MAP_TWO_ISLAND_CAPEBRINK - -TwoIsland_MapConnections:: @ 8352960 - .4byte 1 - .4byte TwoIsland_MapConnectionsList diff --git a/data/maps/TwoIsland/events.inc b/data/maps/TwoIsland/events.inc deleted file mode 100644 index 5ae72f9ed..000000000 --- a/data/maps/TwoIsland/events.inc +++ /dev/null @@ -1,24 +0,0 @@ -TwoIsland_EventObjects: - object_event 1, 68, 0, 28, 0, 4, 0, 3, 8, 33, 0, 0, 0, 0, 0, TwoIsland_EventScript_16760F, 0, 0, 0 - object_event 2, 23, 0, 31, 0, 6, 0, 3, 7, 17, 0, 0, 0, 0, 0, TwoIsland_EventScript_167755, 123, 0, 0 - object_event 3, 29, 0, 30, 0, 11, 0, 3, 7, 17, 0, 0, 0, 0, 0, TwoIsland_EventScript_16775E, 124, 0, 0 - object_event 4, 62, 0, 26, 0, 5, 0, 3, 10, 17, 0, 0, 0, 0, 0, TwoIsland_EventScript_16774C, 0, 0, 0 - object_event 5, 52, 0, 27, 0, 6, 0, 3, 10, 17, 0, 0, 0, 0, 0, TwoIsland_EventScript_167777, 125, 0, 0 - object_event 6, 95, 0, 30, 0, 16, 0, 3, 1, 17, 0, 0, 0, 0, 0, TwoIsland_EventScript_1BDF13, 18, 0, 0 - object_event 7, 92, 0, 39, 0, 16, 0, 3, 8, 17, 0, 0, 0, 0, 0, TwoIsland_EventScript_1BEAAF, 442, 0, 0 - object_event 8, 16, 0, 37, 0, 12, 0, 3, 8, 17, 0, 0, 0, 0, 0, TwoIsland_EventScript_167789, 0, 0, 0 - object_event 9, 19, 0, 24, 0, 12, 0, 3, 2, 17, 0, 0, 0, 0, 0, TwoIsland_EventScript_167780, 0, 0, 0 - -TwoIsland_MapWarps: - warp_def 39, 9, 0, 0, 8448 - warp_def 33, 9, 0, 0, 8449 - warp_def 21, 7, 0, 0, 8450 - warp_def 10, 8, 3, 0, 8452 - -TwoIsland_MapBGEvents: - bg_event 29, 8, 0, 0, 0, TwoIsland_EventScript_167792 - bg_event 40, 10, 0, 0, 0, TwoIsland_EventScript_16779B - bg_event 8, 3, 0, 0, 0, TwoIsland_EventScript_1677A4 - -TwoIsland_MapEvents:: - map_events TwoIsland_EventObjects, TwoIsland_MapWarps, 0x0, TwoIsland_MapBGEvents diff --git a/data/maps/TwoIsland/header.inc b/data/maps/TwoIsland/header.inc deleted file mode 100644 index 698e7544b..000000000 --- a/data/maps/TwoIsland/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -TwoIsland:: @ 8350784 - .4byte TwoIsland_Layout @ 0x8321EB8 - .4byte TwoIsland_MapEvents @ 0x83B6074 - .4byte TwoIsland_MapScripts @ 0x8167564 - .4byte TwoIsland_MapConnections @ 0x8352960 - .2byte BGM_FRLG_ISLAND_ONE - .2byte 231 - .byte 0x90, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/TwoIsland/map.json b/data/maps/TwoIsland/map.json new file mode 100644 index 000000000..42e6a428e --- /dev/null +++ b/data/maps/TwoIsland/map.json @@ -0,0 +1,194 @@ +{ + "id": "MAP_TWO_ISLAND", + "name": "TwoIsland", + "layout": "LAYOUT_TWO_ISLAND", + "music": "BGM_FRLG_ISLAND_ONE", + "region_map_section": "MAPSEC_TWO_ISLAND", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_1", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_TWO_ISLAND_CAPE_BRINK", + "offset": 24, + "direction": "up" + } + ], + "object_events": [ + { + "graphics_id": "68", + "x": 28, + "y": 4, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TwoIsland_EventScript_16760F", + "flag": "0" + }, + { + "graphics_id": "23", + "x": 31, + "y": 6, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TwoIsland_EventScript_167755", + "flag": "123" + }, + { + "graphics_id": "29", + "x": 30, + "y": 11, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TwoIsland_EventScript_16775E", + "flag": "124" + }, + { + "graphics_id": "62", + "x": 26, + "y": 5, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TwoIsland_EventScript_16774C", + "flag": "0" + }, + { + "graphics_id": "52", + "x": 27, + "y": 6, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TwoIsland_EventScript_167777", + "flag": "125" + }, + { + "graphics_id": "95", + "x": 30, + "y": 16, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TwoIsland_EventScript_1BDF13", + "flag": "18" + }, + { + "graphics_id": "92", + "x": 39, + "y": 16, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TwoIsland_EventScript_1BEAAF", + "flag": "442" + }, + { + "graphics_id": "16", + "x": 37, + "y": 12, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TwoIsland_EventScript_167789", + "flag": "0" + }, + { + "graphics_id": "19", + "x": 24, + "y": 12, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TwoIsland_EventScript_167780", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 39, + "y": 9, + "elevation": 0, + "dest_map": "MAP_TWO_ISLAND_JOYFUL_GAME_CORNER", + "dest_warp_id": 0 + }, + { + "x": 33, + "y": 9, + "elevation": 0, + "dest_map": "MAP_TWO_ISLAND_HOUSE", + "dest_warp_id": 0 + }, + { + "x": 21, + "y": 7, + "elevation": 0, + "dest_map": "MAP_TWO_ISLAND_POKEMON_CENTER_1F", + "dest_warp_id": 0 + }, + { + "x": 10, + "y": 8, + "elevation": 3, + "dest_map": "MAP_TWO_ISLAND_HARBOR", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 29, + "y": 8, + "elevation": 0, + "script": "TwoIsland_EventScript_167792" + }, + { + "type": "bg_event_type_0", + "x": 40, + "y": 10, + "elevation": 0, + "script": "TwoIsland_EventScript_16779B" + }, + { + "type": "bg_event_type_0", + "x": 8, + "y": 3, + "elevation": 0, + "script": "TwoIsland_EventScript_1677A4" + } + ] +} \ No newline at end of file diff --git a/data/maps/TwoIsland_CapeBrink/connections.inc b/data/maps/TwoIsland_CapeBrink/connections.inc deleted file mode 100644 index 0257526a9..000000000 --- a/data/maps/TwoIsland_CapeBrink/connections.inc +++ /dev/null @@ -1,6 +0,0 @@ -TwoIsland_CapeBrink_MapConnectionsList: @ 8352D44 - connection down, -24, MAP_TWO_ISLAND - -TwoIsland_CapeBrink_MapConnections:: @ 8352D50 - .4byte 1 - .4byte TwoIsland_CapeBrink_MapConnectionsList diff --git a/data/maps/TwoIsland_CapeBrink/events.inc b/data/maps/TwoIsland_CapeBrink/events.inc deleted file mode 100644 index 6892de68a..000000000 --- a/data/maps/TwoIsland_CapeBrink/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -TwoIsland_CapeBrink_MapWarps: - warp_def 12, 16, 0, 0, 10240 - -TwoIsland_CapeBrink_MapBGEvents: - bg_event 16, 28, 3, 7, 0, 71, 161, 129 - bg_event 15, 13, 3, 7, 0, 68, 111, 1 - -TwoIsland_CapeBrink_MapEvents:: - map_events 0x0, TwoIsland_CapeBrink_MapWarps, 0x0, TwoIsland_CapeBrink_MapBGEvents diff --git a/data/maps/TwoIsland_CapeBrink/header.inc b/data/maps/TwoIsland_CapeBrink/header.inc deleted file mode 100644 index d97cc38a1..000000000 --- a/data/maps/TwoIsland_CapeBrink/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -TwoIsland_CapeBrink:: @ 8350B3C - .4byte TwoIsland_CapeBrink_Layout @ 0x8326CB8 - .4byte TwoIsland_CapeBrink_MapEvents @ 0x83B8964 - .4byte TwoIsland_CapeBrink_MapScripts @ 0x8168775 - .4byte TwoIsland_CapeBrink_MapConnections @ 0x8352D50 - .2byte BGM_FRLG_ROUTE_3 - .2byte 239 - .byte 0x98, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/TwoIsland_CapeBrink/map.json b/data/maps/TwoIsland_CapeBrink/map.json new file mode 100644 index 000000000..b5981e934 --- /dev/null +++ b/data/maps/TwoIsland_CapeBrink/map.json @@ -0,0 +1,52 @@ +{ + "id": "MAP_TWO_ISLAND_CAPE_BRINK", + "name": "TwoIsland_CapeBrink", + "layout": "LAYOUT_TWO_ISLAND_CAPE_BRINK", + "music": "BGM_FRLG_ROUTE_3", + "region_map_section": "MAPSEC_CAPE_BRINK", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_TWO_ISLAND", + "offset": -24, + "direction": "down" + } + ], + "object_events": [], + "warp_events": [ + { + "x": 12, + "y": 16, + "elevation": 0, + "dest_map": "MAP_TWO_ISLAND_CAPE_BRINK_HOUSE", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 16, + "y": 28, + "elevation": 3, + "item": "ITEM_PP_MAX", + "flag": "161", + "unknown": 129 + }, + { + "type": "hidden_item", + "x": 15, + "y": 13, + "elevation": 3, + "item": "ITEM_RARE_CANDY", + "flag": "111", + "unknown": 1 + } + ] +} \ No newline at end of file diff --git a/data/maps/TwoIsland_CapeBrink_House/events.inc b/data/maps/TwoIsland_CapeBrink_House/events.inc deleted file mode 100644 index 0c656e121..000000000 --- a/data/maps/TwoIsland_CapeBrink_House/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -TwoIsland_CapeBrink_House_EventObjects: - object_event 1, 58, 0, 4, 0, 4, 0, 3, 8, 17, 0, 0, 0, 0, 0, TwoIsland_CapeBrink_House_EventScript_1C4DEC, 0, 0, 0 - -TwoIsland_CapeBrink_House_MapWarps: - warp_def 4, 7, 3, 0, 815 - -TwoIsland_CapeBrink_House_MapEvents:: - map_events TwoIsland_CapeBrink_House_EventObjects, TwoIsland_CapeBrink_House_MapWarps, 0x0, 0x0 diff --git a/data/maps/TwoIsland_CapeBrink_House/header.inc b/data/maps/TwoIsland_CapeBrink_House/header.inc deleted file mode 100644 index a5cb71beb..000000000 --- a/data/maps/TwoIsland_CapeBrink_House/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -TwoIsland_CapeBrink_House:: @ 8351F94 - .4byte House3_Layout @ 0x82D5CB8 - .4byte TwoIsland_CapeBrink_House_MapEvents @ 0x83BF2F4 - .4byte TwoIsland_CapeBrink_House_MapScripts @ 0x817206B - .4byte NULL - .2byte BGM_FRLG_ISLAND_ONE - .2byte 11 - .byte 0x98, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/TwoIsland_CapeBrink_House/map.json b/data/maps/TwoIsland_CapeBrink_House/map.json new file mode 100644 index 000000000..e974ef1f0 --- /dev/null +++ b/data/maps/TwoIsland_CapeBrink_House/map.json @@ -0,0 +1,41 @@ +{ + "id": "MAP_TWO_ISLAND_CAPE_BRINK_HOUSE", + "name": "TwoIsland_CapeBrink_House", + "layout": "LAYOUT_HOUSE3", + "music": "BGM_FRLG_ISLAND_ONE", + "region_map_section": "MAPSEC_CAPE_BRINK", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "58", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TwoIsland_CapeBrink_House_EventScript_1C4DEC", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_TWO_ISLAND_CAPE_BRINK", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/TwoIsland_Harbor/events.inc b/data/maps/TwoIsland_Harbor/events.inc deleted file mode 100644 index bcc123c41..000000000 --- a/data/maps/TwoIsland_Harbor/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -TwoIsland_Harbor_EventObjects: - object_event 1, 108, 0, 8, 0, 9, 0, 0, 8, 17, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 2, 62, 0, 8, 0, 6, 0, 3, 7, 17, 0, 0, 0, 0, 0, TwoIsland_Harbor_EventScript_171806, 0, 0, 0 - -TwoIsland_Harbor_MapWarps: - warp_def 8, 2, 3, 3, 781 - -TwoIsland_Harbor_MapEvents:: - map_events TwoIsland_Harbor_EventObjects, TwoIsland_Harbor_MapWarps, 0x0, 0x0 diff --git a/data/maps/TwoIsland_Harbor/header.inc b/data/maps/TwoIsland_Harbor/header.inc deleted file mode 100644 index a7f4b3c97..000000000 --- a/data/maps/TwoIsland_Harbor/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -TwoIsland_Harbor:: @ 8351C68 - .4byte Island_Harbor_Layout @ 0x8343FB8 - .4byte TwoIsland_Harbor_MapEvents @ 0x83BE764 - .4byte TwoIsland_Harbor_MapScripts @ 0x8171805 - .4byte NULL - .2byte BGM_FRLG_ISLAND_ONE - .2byte 315 - .byte 0x90, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/TwoIsland_Harbor/map.json b/data/maps/TwoIsland_Harbor/map.json new file mode 100644 index 000000000..9a715d4b0 --- /dev/null +++ b/data/maps/TwoIsland_Harbor/map.json @@ -0,0 +1,54 @@ +{ + "id": "MAP_TWO_ISLAND_HARBOR", + "name": "TwoIsland_Harbor", + "layout": "LAYOUT_ISLAND_HARBOR", + "music": "BGM_FRLG_ISLAND_ONE", + "region_map_section": "MAPSEC_TWO_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "108", + "x": 8, + "y": 9, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "62", + "x": 8, + "y": 6, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TwoIsland_Harbor_EventScript_171806", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 8, + "y": 2, + "elevation": 3, + "dest_map": "MAP_TWO_ISLAND", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/TwoIsland_House/events.inc b/data/maps/TwoIsland_House/events.inc deleted file mode 100644 index 44f34a69b..000000000 --- a/data/maps/TwoIsland_House/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -TwoIsland_House_EventObjects: - object_event 1, 27, 0, 7, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, TwoIsland_House_EventScript_171619, 0, 0, 0 - -TwoIsland_House_MapWarps: - warp_def 4, 7, 3, 1, 781 - -TwoIsland_House_MapEvents:: - map_events TwoIsland_House_EventObjects, TwoIsland_House_MapWarps, 0x0, 0x0 diff --git a/data/maps/TwoIsland_House/header.inc b/data/maps/TwoIsland_House/header.inc deleted file mode 100644 index ef308156d..000000000 --- a/data/maps/TwoIsland_House/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -TwoIsland_House:: @ 8351C14 - .4byte House3_Layout @ 0x82D5CB8 - .4byte TwoIsland_House_MapEvents @ 0x83BE620 - .4byte TwoIsland_House_MapScripts @ 0x8171618 - .4byte NULL - .2byte BGM_FRLG_ISLAND_ONE - .2byte 11 - .byte 0x90, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/TwoIsland_House/map.json b/data/maps/TwoIsland_House/map.json new file mode 100644 index 000000000..04a3d1b43 --- /dev/null +++ b/data/maps/TwoIsland_House/map.json @@ -0,0 +1,41 @@ +{ + "id": "MAP_TWO_ISLAND_HOUSE", + "name": "TwoIsland_House", + "layout": "LAYOUT_HOUSE3", + "music": "BGM_FRLG_ISLAND_ONE", + "region_map_section": "MAPSEC_TWO_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "27", + "x": 7, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TwoIsland_House_EventScript_171619", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_TWO_ISLAND", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/TwoIsland_JoyfulGameCorner/events.inc b/data/maps/TwoIsland_JoyfulGameCorner/events.inc deleted file mode 100644 index 152c9e001..000000000 --- a/data/maps/TwoIsland_JoyfulGameCorner/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -TwoIsland_JoyfulGameCorner_EventObjects: - object_event 1, 30, 0, 5, 0, 5, 0, 1, 10, 17, 0, 0, 0, 0, 0, TwoIsland_JoyfulGameCorner_EventScript_17155F, 0, 0, 0 - object_event 2, 53, 0, 5, 0, 8, 0, 3, 7, 17, 0, 0, 0, 0, 0, 0x0, 116, 0, 0 - object_event 3, 17, 0, 6, 0, 5, 0, 1, 9, 17, 0, 0, 0, 0, 0, TwoIsland_JoyfulGameCorner_EventScript_17160C, 117, 0, 0 - object_event 4, 25, 0, 4, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, TwoIsland_JoyfulGameCorner_EventScript_171535, 0, 0, 0 - -TwoIsland_JoyfulGameCorner_MapWarps: - warp_def 5, 8, 3, 0, 781 - -TwoIsland_JoyfulGameCorner_MapBGEvents: - bg_event 1, 1, 0, 0, 0, TwoIsland_JoyfulGameCorner_EventScript_1BC2E7 - bg_event 0, 1, 0, 0, 0, TwoIsland_JoyfulGameCorner_EventScript_1BC2FC - -TwoIsland_JoyfulGameCorner_MapEvents:: - map_events TwoIsland_JoyfulGameCorner_EventObjects, TwoIsland_JoyfulGameCorner_MapWarps, 0x0, TwoIsland_JoyfulGameCorner_MapBGEvents diff --git a/data/maps/TwoIsland_JoyfulGameCorner/header.inc b/data/maps/TwoIsland_JoyfulGameCorner/header.inc deleted file mode 100644 index 35934a5f6..000000000 --- a/data/maps/TwoIsland_JoyfulGameCorner/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -TwoIsland_JoyfulGameCorner:: @ 8351BF8 - .4byte TwoIsland_JoyfulGameCorner_Layout @ 0x833AA84 - .4byte TwoIsland_JoyfulGameCorner_MapEvents @ 0x83BE5EC - .4byte TwoIsland_JoyfulGameCorner_MapScripts @ 0x81713D0 - .4byte NULL - .2byte BGM_FRLG_GAMECORNER - .2byte 272 - .byte 0x90, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/TwoIsland_JoyfulGameCorner/map.json b/data/maps/TwoIsland_JoyfulGameCorner/map.json new file mode 100644 index 000000000..40015e536 --- /dev/null +++ b/data/maps/TwoIsland_JoyfulGameCorner/map.json @@ -0,0 +1,95 @@ +{ + "id": "MAP_TWO_ISLAND_JOYFUL_GAME_CORNER", + "name": "TwoIsland_JoyfulGameCorner", + "layout": "LAYOUT_TWO_ISLAND_JOYFUL_GAME_CORNER", + "music": "BGM_FRLG_GAMECORNER", + "region_map_section": "MAPSEC_TWO_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "30", + "x": 5, + "y": 5, + "elevation": 1, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TwoIsland_JoyfulGameCorner_EventScript_17155F", + "flag": "0" + }, + { + "graphics_id": "53", + "x": 5, + "y": 8, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "116" + }, + { + "graphics_id": "17", + "x": 6, + "y": 5, + "elevation": 1, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TwoIsland_JoyfulGameCorner_EventScript_17160C", + "flag": "117" + }, + { + "graphics_id": "25", + "x": 4, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TwoIsland_JoyfulGameCorner_EventScript_171535", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 5, + "y": 8, + "elevation": 3, + "dest_map": "MAP_TWO_ISLAND", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 1, + "y": 1, + "elevation": 0, + "script": "TwoIsland_JoyfulGameCorner_EventScript_1BC2E7" + }, + { + "type": "bg_event_type_0", + "x": 0, + "y": 1, + "elevation": 0, + "script": "TwoIsland_JoyfulGameCorner_EventScript_1BC2FC" + } + ] +} \ No newline at end of file diff --git a/data/maps/TwoIsland_PokemonCenter_1F/events.inc b/data/maps/TwoIsland_PokemonCenter_1F/events.inc deleted file mode 100644 index 01d9c8105..000000000 --- a/data/maps/TwoIsland_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -TwoIsland_PokemonCenter_1F_EventObjects: - object_event 1, 64, 0, 7, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, TwoIsland_PokemonCenter_1F_EventScript_1717C3, 0, 0, 0 - object_event 2, 51, 0, 11, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, TwoIsland_PokemonCenter_1F_EventScript_1717CC, 0, 0, 0 - object_event 3, 20, 0, 4, 0, 4, 0, 3, 5, 17, 0, 0, 0, 0, 0, TwoIsland_PokemonCenter_1F_EventScript_1717D5, 0, 0, 0 - -TwoIsland_PokemonCenter_1F_MapWarps: - warp_def 7, 8, 3, 2, 781 - warp_def 1, 6, 4, 0, 8451 - -TwoIsland_PokemonCenter_1F_MapEvents:: - map_events TwoIsland_PokemonCenter_1F_EventObjects, TwoIsland_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/TwoIsland_PokemonCenter_1F/header.inc b/data/maps/TwoIsland_PokemonCenter_1F/header.inc deleted file mode 100644 index 8999f1fae..000000000 --- a/data/maps/TwoIsland_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -TwoIsland_PokemonCenter_1F:: @ 8351C30 - .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte TwoIsland_PokemonCenter_1F_MapEvents @ 0x83BE68C - .4byte TwoIsland_PokemonCenter_1F_MapScripts @ 0x81717B4 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 8 - .byte 0x90, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/TwoIsland_PokemonCenter_1F/map.json b/data/maps/TwoIsland_PokemonCenter_1F/map.json new file mode 100644 index 000000000..b1987bbd4 --- /dev/null +++ b/data/maps/TwoIsland_PokemonCenter_1F/map.json @@ -0,0 +1,74 @@ +{ + "id": "MAP_TWO_ISLAND_POKEMON_CENTER_1F", + "name": "TwoIsland_PokemonCenter_1F", + "layout": "LAYOUT_POKEMON_CENTER_1F", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_TWO_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "64", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TwoIsland_PokemonCenter_1F_EventScript_1717C3", + "flag": "0" + }, + { + "graphics_id": "51", + "x": 11, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TwoIsland_PokemonCenter_1F_EventScript_1717CC", + "flag": "0" + }, + { + "graphics_id": "20", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TwoIsland_PokemonCenter_1F_EventScript_1717D5", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_TWO_ISLAND", + "dest_warp_id": 2 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_TWO_ISLAND_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/TwoIsland_PokemonCenter_2F/events.inc b/data/maps/TwoIsland_PokemonCenter_2F/events.inc deleted file mode 100644 index f8aff41d4..000000000 --- a/data/maps/TwoIsland_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -TwoIsland_PokemonCenter_2F_EventObjects: - object_event 1, 65, 0, 6, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, TwoIsland_PokemonCenter_2F_EventScript_1A8CF6, 0, 0, 0 - object_event 2, 65, 0, 2, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, TwoIsland_PokemonCenter_2F_EventScript_1A8CFC, 0, 0, 0 - object_event 3, 65, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, TwoIsland_PokemonCenter_2F_EventScript_1A8D02, 0, 0, 0 - object_event 4, 69, 0, 1, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, TwoIsland_PokemonCenter_2F_EventScript_1BB1D2, 112, 0, 0 - -TwoIsland_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 1, 8450 - warp_def 5, 1, 0, 0, 4 - warp_def 9, 1, 0, 0, 1 - -TwoIsland_PokemonCenter_2F_MapEvents:: - map_events TwoIsland_PokemonCenter_2F_EventObjects, TwoIsland_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/TwoIsland_PokemonCenter_2F/header.inc b/data/maps/TwoIsland_PokemonCenter_2F/header.inc deleted file mode 100644 index 4c690b5ac..000000000 --- a/data/maps/TwoIsland_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -TwoIsland_PokemonCenter_2F:: @ 8351C4C - .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte TwoIsland_PokemonCenter_2F_MapEvents @ 0x83BE718 - .4byte TwoIsland_PokemonCenter_2F_MapScripts @ 0x81717DE - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 9 - .byte 0x90, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/TwoIsland_PokemonCenter_2F/map.json b/data/maps/TwoIsland_PokemonCenter_2F/map.json new file mode 100644 index 000000000..acb0edbd2 --- /dev/null +++ b/data/maps/TwoIsland_PokemonCenter_2F/map.json @@ -0,0 +1,94 @@ +{ + "id": "MAP_TWO_ISLAND_POKEMON_CENTER_2F", + "name": "TwoIsland_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_TWO_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "65", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TwoIsland_PokemonCenter_2F_EventScript_1A8CF6", + "flag": "0" + }, + { + "graphics_id": "65", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TwoIsland_PokemonCenter_2F_EventScript_1A8CFC", + "flag": "0" + }, + { + "graphics_id": "65", + "x": 10, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TwoIsland_PokemonCenter_2F_EventScript_1A8D02", + "flag": "0" + }, + { + "graphics_id": "69", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TwoIsland_PokemonCenter_2F_EventScript_1BB1D2", + "flag": "112" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_TWO_ISLAND_POKEMON_CENTER_1F", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 1, + "elevation": 0, + "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 0, + "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/UndergroundPath_EastEntrance/events.inc b/data/maps/UndergroundPath_EastEntrance/events.inc deleted file mode 100644 index d94ffd53f..000000000 --- a/data/maps/UndergroundPath_EastEntrance/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -UndergroundPath_EastEntrance_EventObjects: - object_event 1, 28, 0, 5, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, UndergroundPath_EastEntrance_EventScript_160EDE, 0, 0, 0 - -UndergroundPath_EastEntrance_MapWarps: - warp_def 5, 8, 3, 0, 794 - warp_def 6, 8, 3, 0, 794 - warp_def 7, 8, 3, 0, 794 - warp_def 7, 4, 3, 0, 290 - -UndergroundPath_EastEntrance_MapEvents:: - map_events UndergroundPath_EastEntrance_EventObjects, UndergroundPath_EastEntrance_MapWarps, 0x0, 0x0 diff --git a/data/maps/UndergroundPath_EastEntrance/header.inc b/data/maps/UndergroundPath_EastEntrance/header.inc deleted file mode 100644 index 298cbfe9d..000000000 --- a/data/maps/UndergroundPath_EastEntrance/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -UndergroundPath_EastEntrance:: @ 834F5E8 - .4byte UndergroundPath_Entrance_Layout @ 0x8319414 - .4byte UndergroundPath_EastEntrance_MapEvents @ 0x83AF430 - .4byte UndergroundPath_EastEntrance_MapScripts @ 0x8160EDD - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 172 - .byte 0x82, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/UndergroundPath_EastEntrance/map.json b/data/maps/UndergroundPath_EastEntrance/map.json new file mode 100644 index 000000000..f443b0f6f --- /dev/null +++ b/data/maps/UndergroundPath_EastEntrance/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_UNDERGROUND_PATH_EAST_ENTRANCE", + "name": "UndergroundPath_EastEntrance", + "layout": "LAYOUT_UNDERGROUND_PATH_ENTRANCE", + "music": "BGM_FRLG_VIRIDIAN_CITY", + "region_map_section": "MAPSEC_UNDERGROUND_PATH_2", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "28", + "x": 5, + "y": 6, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "UndergroundPath_EastEntrance_EventScript_160EDE", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 5, + "y": 8, + "elevation": 3, + "dest_map": "MAP_ROUTE8", + "dest_warp_id": 0 + }, + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_ROUTE8", + "dest_warp_id": 0 + }, + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_ROUTE8", + "dest_warp_id": 0 + }, + { + "x": 7, + "y": 4, + "elevation": 3, + "dest_map": "MAP_UNDERGROUND_PATH_EAST_WEST_TUNNEL", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/UndergroundPath_EastWestTunnel/events.inc b/data/maps/UndergroundPath_EastWestTunnel/events.inc deleted file mode 100644 index acbabe99f..000000000 --- a/data/maps/UndergroundPath_EastWestTunnel/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -UndergroundPath_EastWestTunnel_MapWarps: - warp_def 76, 3, 3, 3, 291 - warp_def 3, 4, 3, 3, 289 - -UndergroundPath_EastWestTunnel_MapBGEvents: - bg_event 7, 3, 3, 7, 0, 13, 77, 1 - bg_event 17, 5, 3, 7, 0, 18, 79, 1 - bg_event 31, 4, 3, 7, 0, 17, 80, 1 - bg_event 45, 3, 3, 7, 0, 15, 81, 1 - bg_event 70, 3, 3, 7, 0, 16, 82, 1 - bg_event 55, 2, 3, 7, 0, 34, 83, 1 - bg_event 62, 5, 3, 7, 0, 14, 78, 1 - -UndergroundPath_EastWestTunnel_MapEvents:: - map_events 0x0, UndergroundPath_EastWestTunnel_MapWarps, 0x0, UndergroundPath_EastWestTunnel_MapBGEvents diff --git a/data/maps/UndergroundPath_EastWestTunnel/header.inc b/data/maps/UndergroundPath_EastWestTunnel/header.inc deleted file mode 100644 index bd5afdf6d..000000000 --- a/data/maps/UndergroundPath_EastWestTunnel/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -UndergroundPath_EastWestTunnel:: @ 834F5CC - .4byte UndergroundPath_EastWestTunnel_Layout @ 0x8319898 - .4byte UndergroundPath_EastWestTunnel_MapEvents @ 0x83AF3E4 - .4byte UndergroundPath_EastWestTunnel_MapScripts @ 0x8160ED3 - .4byte NULL - .2byte BGM_FRLG_ROUTE_1 - .2byte 173 - .byte 0x82, 0x00, 0x00, 0x08, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/UndergroundPath_EastWestTunnel/map.json b/data/maps/UndergroundPath_EastWestTunnel/map.json new file mode 100644 index 000000000..1a015a69f --- /dev/null +++ b/data/maps/UndergroundPath_EastWestTunnel/map.json @@ -0,0 +1,98 @@ +{ + "id": "MAP_UNDERGROUND_PATH_EAST_WEST_TUNNEL", + "name": "UndergroundPath_EastWestTunnel", + "layout": "LAYOUT_UNDERGROUND_PATH_EAST_WEST_TUNNEL", + "music": "BGM_FRLG_ROUTE_1", + "region_map_section": "MAPSEC_UNDERGROUND_PATH_2", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 76, + "y": 3, + "elevation": 3, + "dest_map": "MAP_UNDERGROUND_PATH_EAST_ENTRANCE", + "dest_warp_id": 3 + }, + { + "x": 3, + "y": 4, + "elevation": 3, + "dest_map": "MAP_UNDERGROUND_PATH_WEST_ENTRANCE", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 7, + "y": 3, + "elevation": 3, + "item": "ITEM_POTION", + "flag": "77", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 17, + "y": 5, + "elevation": 3, + "item": "ITEM_PARALYZE_HEAL", + "flag": "79", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 31, + "y": 4, + "elevation": 3, + "item": "ITEM_AWAKENING", + "flag": "80", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 45, + "y": 3, + "elevation": 3, + "item": "ITEM_BURN_HEAL", + "flag": "81", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 70, + "y": 3, + "elevation": 3, + "item": "ITEM_ICE_HEAL", + "flag": "82", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 55, + "y": 2, + "elevation": 3, + "item": "ITEM_ETHER", + "flag": "83", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 62, + "y": 5, + "elevation": 3, + "item": "ITEM_ANTIDOTE", + "flag": "78", + "unknown": 1 + } + ] +} \ No newline at end of file diff --git a/data/maps/UndergroundPath_NorthEntrance/events.inc b/data/maps/UndergroundPath_NorthEntrance/events.inc deleted file mode 100644 index ae884375b..000000000 --- a/data/maps/UndergroundPath_NorthEntrance/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -UndergroundPath_NorthEntrance_EventObjects: - object_event 1, 17, 0, 5, 0, 6, 0, 3, 8, 17, 0, 0, 0, 0, 0, UndergroundPath_NorthEntrance_EventScript_160E39, 0, 0, 0 - -UndergroundPath_NorthEntrance_MapWarps: - warp_def 5, 8, 3, 0, 791 - warp_def 6, 8, 3, 0, 791 - warp_def 7, 8, 3, 0, 791 - warp_def 7, 4, 3, 0, 287 - -UndergroundPath_NorthEntrance_MapEvents:: - map_events UndergroundPath_NorthEntrance_EventObjects, UndergroundPath_NorthEntrance_MapWarps, 0x0, 0x0 diff --git a/data/maps/UndergroundPath_NorthEntrance/header.inc b/data/maps/UndergroundPath_NorthEntrance/header.inc deleted file mode 100644 index 242d5ece9..000000000 --- a/data/maps/UndergroundPath_NorthEntrance/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -UndergroundPath_NorthEntrance:: @ 834F55C - .4byte UndergroundPath_Entrance_Layout @ 0x8319414 - .4byte UndergroundPath_NorthEntrance_MapEvents @ 0x83AF25C - .4byte UndergroundPath_NorthEntrance_MapScripts @ 0x8160E38 - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 172 - .byte 0x81, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/UndergroundPath_NorthEntrance/map.json b/data/maps/UndergroundPath_NorthEntrance/map.json new file mode 100644 index 000000000..7ef24dda9 --- /dev/null +++ b/data/maps/UndergroundPath_NorthEntrance/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_UNDERGROUND_PATH_NORTH_ENTRANCE", + "name": "UndergroundPath_NorthEntrance", + "layout": "LAYOUT_UNDERGROUND_PATH_ENTRANCE", + "music": "BGM_FRLG_VIRIDIAN_CITY", + "region_map_section": "MAPSEC_UNDERGROUND_PATH", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "17", + "x": 5, + "y": 6, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "UndergroundPath_NorthEntrance_EventScript_160E39", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 5, + "y": 8, + "elevation": 3, + "dest_map": "MAP_ROUTE5", + "dest_warp_id": 0 + }, + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_ROUTE5", + "dest_warp_id": 0 + }, + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_ROUTE5", + "dest_warp_id": 0 + }, + { + "x": 7, + "y": 4, + "elevation": 3, + "dest_map": "MAP_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/UndergroundPath_NorthSouthTunnel/events.inc b/data/maps/UndergroundPath_NorthSouthTunnel/events.inc deleted file mode 100644 index 488c80de0..000000000 --- a/data/maps/UndergroundPath_NorthSouthTunnel/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -UndergroundPath_NorthSouthTunnel_MapWarps: - warp_def 4, 3, 3, 3, 286 - warp_def 3, 60, 3, 3, 288 - -UndergroundPath_NorthSouthTunnel_MapBGEvents: - bg_event 5, 30, 3, 7, 0, 13, 70, 1 - bg_event 5, 6, 3, 7, 0, 14, 71, 1 - bg_event 2, 57, 3, 7, 0, 15, 74, 1 - bg_event 1, 24, 3, 7, 0, 17, 73, 1 - bg_event 6, 53, 3, 7, 0, 16, 75, 1 - bg_event 3, 15, 3, 7, 0, 18, 72, 1 - bg_event 3, 39, 3, 7, 0, 34, 76, 1 - -UndergroundPath_NorthSouthTunnel_MapEvents:: - map_events 0x0, UndergroundPath_NorthSouthTunnel_MapWarps, 0x0, UndergroundPath_NorthSouthTunnel_MapBGEvents diff --git a/data/maps/UndergroundPath_NorthSouthTunnel/header.inc b/data/maps/UndergroundPath_NorthSouthTunnel/header.inc deleted file mode 100644 index 9ffc1d01b..000000000 --- a/data/maps/UndergroundPath_NorthSouthTunnel/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -UndergroundPath_NorthSouthTunnel:: @ 834F578 - .4byte UndergroundPath_NorthSouthTunnel_Layout @ 0x8319CAC - .4byte UndergroundPath_NorthSouthTunnel_MapEvents @ 0x83AF2D4 - .4byte UndergroundPath_NorthSouthTunnel_MapScripts @ 0x8160EB5 - .4byte NULL - .2byte BGM_FRLG_ROUTE_1 - .2byte 174 - .byte 0x81, 0x00, 0x00, 0x08, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/UndergroundPath_NorthSouthTunnel/map.json b/data/maps/UndergroundPath_NorthSouthTunnel/map.json new file mode 100644 index 000000000..2d049212a --- /dev/null +++ b/data/maps/UndergroundPath_NorthSouthTunnel/map.json @@ -0,0 +1,98 @@ +{ + "id": "MAP_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL", + "name": "UndergroundPath_NorthSouthTunnel", + "layout": "LAYOUT_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL", + "music": "BGM_FRLG_ROUTE_1", + "region_map_section": "MAPSEC_UNDERGROUND_PATH", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 4, + "y": 3, + "elevation": 3, + "dest_map": "MAP_UNDERGROUND_PATH_NORTH_ENTRANCE", + "dest_warp_id": 3 + }, + { + "x": 3, + "y": 60, + "elevation": 3, + "dest_map": "MAP_UNDERGROUND_PATH_SOUTH_ENTRANCE", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 5, + "y": 30, + "elevation": 3, + "item": "ITEM_POTION", + "flag": "70", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 5, + "y": 6, + "elevation": 3, + "item": "ITEM_ANTIDOTE", + "flag": "71", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 2, + "y": 57, + "elevation": 3, + "item": "ITEM_BURN_HEAL", + "flag": "74", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 1, + "y": 24, + "elevation": 3, + "item": "ITEM_AWAKENING", + "flag": "73", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 6, + "y": 53, + "elevation": 3, + "item": "ITEM_ICE_HEAL", + "flag": "75", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 3, + "y": 15, + "elevation": 3, + "item": "ITEM_PARALYZE_HEAL", + "flag": "72", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 3, + "y": 39, + "elevation": 3, + "item": "ITEM_ETHER", + "flag": "76", + "unknown": 1 + } + ] +} \ No newline at end of file diff --git a/data/maps/UndergroundPath_SouthEntrance/events.inc b/data/maps/UndergroundPath_SouthEntrance/events.inc deleted file mode 100644 index 19020f601..000000000 --- a/data/maps/UndergroundPath_SouthEntrance/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -UndergroundPath_SouthEntrance_EventObjects: - object_event 1, 28, 0, 5, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, UndergroundPath_SouthEntrance_EventScript_160EC0, 0, 0, 0 - -UndergroundPath_SouthEntrance_MapWarps: - warp_def 5, 8, 3, 0, 792 - warp_def 6, 8, 3, 0, 792 - warp_def 7, 8, 3, 0, 792 - warp_def 7, 4, 3, 1, 287 - -UndergroundPath_SouthEntrance_MapEvents:: - map_events UndergroundPath_SouthEntrance_EventObjects, UndergroundPath_SouthEntrance_MapWarps, 0x0, 0x0 diff --git a/data/maps/UndergroundPath_SouthEntrance/header.inc b/data/maps/UndergroundPath_SouthEntrance/header.inc deleted file mode 100644 index 4e0ef3d33..000000000 --- a/data/maps/UndergroundPath_SouthEntrance/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -UndergroundPath_SouthEntrance:: @ 834F594 - .4byte UndergroundPath_Entrance_Layout @ 0x8319414 - .4byte UndergroundPath_SouthEntrance_MapEvents @ 0x83AF320 - .4byte UndergroundPath_SouthEntrance_MapScripts @ 0x8160EBF - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 172 - .byte 0x81, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/UndergroundPath_SouthEntrance/map.json b/data/maps/UndergroundPath_SouthEntrance/map.json new file mode 100644 index 000000000..e6e3ee5f3 --- /dev/null +++ b/data/maps/UndergroundPath_SouthEntrance/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_UNDERGROUND_PATH_SOUTH_ENTRANCE", + "name": "UndergroundPath_SouthEntrance", + "layout": "LAYOUT_UNDERGROUND_PATH_ENTRANCE", + "music": "BGM_FRLG_VIRIDIAN_CITY", + "region_map_section": "MAPSEC_UNDERGROUND_PATH", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "28", + "x": 5, + "y": 6, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "UndergroundPath_SouthEntrance_EventScript_160EC0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 5, + "y": 8, + "elevation": 3, + "dest_map": "MAP_ROUTE6", + "dest_warp_id": 0 + }, + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_ROUTE6", + "dest_warp_id": 0 + }, + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_ROUTE6", + "dest_warp_id": 0 + }, + { + "x": 7, + "y": 4, + "elevation": 3, + "dest_map": "MAP_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/UndergroundPath_WestEntrance/events.inc b/data/maps/UndergroundPath_WestEntrance/events.inc deleted file mode 100644 index a5797c577..000000000 --- a/data/maps/UndergroundPath_WestEntrance/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -UndergroundPath_WestEntrance_EventObjects: - object_event 1, 30, 0, 5, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, UndergroundPath_WestEntrance_EventScript_160ECA, 0, 0, 0 - -UndergroundPath_WestEntrance_MapWarps: - warp_def 5, 8, 3, 0, 793 - warp_def 6, 8, 3, 0, 793 - warp_def 7, 8, 3, 0, 793 - warp_def 7, 4, 3, 1, 290 - -UndergroundPath_WestEntrance_MapEvents:: - map_events UndergroundPath_WestEntrance_EventObjects, UndergroundPath_WestEntrance_MapWarps, 0x0, 0x0 diff --git a/data/maps/UndergroundPath_WestEntrance/header.inc b/data/maps/UndergroundPath_WestEntrance/header.inc deleted file mode 100644 index 9ebfd9946..000000000 --- a/data/maps/UndergroundPath_WestEntrance/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -UndergroundPath_WestEntrance:: @ 834F5B0 - .4byte UndergroundPath_Entrance_Layout @ 0x8319414 - .4byte UndergroundPath_WestEntrance_MapEvents @ 0x83AF36C - .4byte UndergroundPath_WestEntrance_MapScripts @ 0x8160EC9 - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 172 - .byte 0x82, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00 diff --git a/data/maps/UndergroundPath_WestEntrance/map.json b/data/maps/UndergroundPath_WestEntrance/map.json new file mode 100644 index 000000000..e824381d4 --- /dev/null +++ b/data/maps/UndergroundPath_WestEntrance/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_UNDERGROUND_PATH_WEST_ENTRANCE", + "name": "UndergroundPath_WestEntrance", + "layout": "LAYOUT_UNDERGROUND_PATH_ENTRANCE", + "music": "BGM_FRLG_VIRIDIAN_CITY", + "region_map_section": "MAPSEC_UNDERGROUND_PATH_2", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "30", + "x": 5, + "y": 6, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "UndergroundPath_WestEntrance_EventScript_160ECA", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 5, + "y": 8, + "elevation": 3, + "dest_map": "MAP_ROUTE7", + "dest_warp_id": 0 + }, + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_ROUTE7", + "dest_warp_id": 0 + }, + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_ROUTE7", + "dest_warp_id": 0 + }, + { + "x": 7, + "y": 4, + "elevation": 3, + "dest_map": "MAP_UNDERGROUND_PATH_EAST_WEST_TUNNEL", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/UnknownMap_00_00/events.inc b/data/maps/UnknownMap_00_00/events.inc deleted file mode 100644 index 4781c2e87..000000000 --- a/data/maps/UnknownMap_00_00/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -UnknownMap_00_00_EventObjects: - object_event 1, 66, 0, 9, 0, 3, 0, 3, 9, 0, 0, 0, 0, 0, 0, UnknownMap_00_00_EventScript_1BB9AF, 0, 0, 0 - -UnknownMap_00_00_MapWarps: - warp_def 6, 8, 3, 127, 32639 - warp_def 7, 8, 3, 127, 32639 - -UnknownMap_00_00_MapCoordEvents: - coord_event 3, 5, 3, 0, 16384, 0, 0, UnknownMap_00_00_EventScript_1BB8C3 - coord_event 10, 5, 3, 0, 16384, 0, 0, UnknownMap_00_00_EventScript_1BB8CF - -UnknownMap_00_00_MapEvents:: - map_events UnknownMap_00_00_EventObjects, UnknownMap_00_00_MapWarps, UnknownMap_00_00_MapCoordEvents, 0x0 diff --git a/data/maps/UnknownMap_00_00/header.inc b/data/maps/UnknownMap_00_00/header.inc deleted file mode 100644 index a43fc1ec3..000000000 --- a/data/maps/UnknownMap_00_00/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -UnknownMap_00_00:: @ 834F188 - .4byte UnknownMap_00_00_Layout @ 0x82D89E8 - .4byte UnknownMap_00_00_MapEvents @ 0x83AE0DC - .4byte UnknownMap_00_00_MapScripts @ 0x8160478 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 47 - .byte 0xc4, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08 diff --git a/data/maps/UnknownMap_00_00/map.json b/data/maps/UnknownMap_00_00/map.json new file mode 100644 index 000000000..74edf8a09 --- /dev/null +++ b/data/maps/UnknownMap_00_00/map.json @@ -0,0 +1,67 @@ +{ + "id": "MAP_UNKNOWN_MAP_00_00", + "name": "UnknownMap_00_00", + "layout": "LAYOUT_UNKNOWN_MAP_00_00", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_SPECIAL_AREA", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_8", + "connections": null, + "object_events": [ + { + "graphics_id": "66", + "x": 9, + "y": 3, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "UnknownMap_00_00_EventScript_1BB9AF", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + }, + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 3, + "y": 5, + "elevation": 3, + "var": "VAR_0x4000", + "var_value": 0, + "script": "UnknownMap_00_00_EventScript_1BB8C3" + }, + { + "type": "trigger", + "x": 10, + "y": 5, + "elevation": 3, + "var": "VAR_0x4000", + "var_value": 0, + "script": "UnknownMap_00_00_EventScript_1BB8CF" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/UnknownMap_00_01/events.inc b/data/maps/UnknownMap_00_01/events.inc deleted file mode 100644 index 023a95c07..000000000 --- a/data/maps/UnknownMap_00_01/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -UnknownMap_00_01_EventObjects: - object_event 1, 66, 0, 9, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, UnknownMap_00_01_EventScript_1BB9C1, 0, 0, 0 - -UnknownMap_00_01_MapWarps: - warp_def 5, 8, 3, 127, 32639 - warp_def 6, 8, 3, 127, 32639 - -UnknownMap_00_01_MapCoordEvents: - coord_event 4, 5, 3, 0, 16384, 0, 0, UnknownMap_00_01_EventScript_1BB950 - coord_event 7, 5, 3, 0, 16384, 0, 0, UnknownMap_00_01_EventScript_1BB95C - -UnknownMap_00_01_MapEvents:: - map_events UnknownMap_00_01_EventObjects, UnknownMap_00_01_MapWarps, UnknownMap_00_01_MapCoordEvents, 0x0 diff --git a/data/maps/UnknownMap_00_01/header.inc b/data/maps/UnknownMap_00_01/header.inc deleted file mode 100644 index 2e012f5d3..000000000 --- a/data/maps/UnknownMap_00_01/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -UnknownMap_00_01:: @ 834F1A4 - .4byte UnknownMap_00_01_Layout @ 0x82D8AE4 - .4byte UnknownMap_00_01_MapEvents @ 0x83AE138 - .4byte UnknownMap_00_01_MapScripts @ 0x8160479 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 48 - .byte 0xc4, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/UnknownMap_00_01/map.json b/data/maps/UnknownMap_00_01/map.json new file mode 100644 index 000000000..a8136a755 --- /dev/null +++ b/data/maps/UnknownMap_00_01/map.json @@ -0,0 +1,67 @@ +{ + "id": "MAP_UNKNOWN_MAP_00_01", + "name": "UnknownMap_00_01", + "layout": "LAYOUT_UNKNOWN_MAP_00_01", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_SPECIAL_AREA", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "66", + "x": 9, + "y": 6, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "UnknownMap_00_01_EventScript_1BB9C1", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 5, + "y": 8, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + }, + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 4, + "y": 5, + "elevation": 3, + "var": "VAR_0x4000", + "var_value": 0, + "script": "UnknownMap_00_01_EventScript_1BB950" + }, + { + "type": "trigger", + "x": 7, + "y": 5, + "elevation": 3, + "var": "VAR_0x4000", + "var_value": 0, + "script": "UnknownMap_00_01_EventScript_1BB95C" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/UnknownMap_00_02/events.inc b/data/maps/UnknownMap_00_02/events.inc deleted file mode 100644 index 26a2fcee1..000000000 --- a/data/maps/UnknownMap_00_02/events.inc +++ /dev/null @@ -1,17 +0,0 @@ -UnknownMap_00_02_EventObjects: - object_event 1, 66, 0, 10, 0, 5, 0, 0, 8, 0, 0, 0, 0, 0, 0, UnknownMap_00_02_EventScript_1BB9D3, 0, 0, 0 - -UnknownMap_00_02_MapWarps: - warp_def 8, 9, 3, 127, 32639 - warp_def 9, 9, 3, 127, 32639 - warp_def 11, 9, 3, 127, 32639 - warp_def 10, 9, 3, 127, 32639 - -UnknownMap_00_02_MapCoordEvents: - coord_event 6, 4, 3, 0, 16384, 0, 0, UnknownMap_00_02_EventScript_1BB980 - coord_event 6, 6, 3, 0, 16384, 0, 0, UnknownMap_00_02_EventScript_1BB980 - coord_event 13, 4, 3, 0, 16384, 0, 0, UnknownMap_00_02_EventScript_1BB980 - coord_event 13, 6, 3, 0, 16384, 0, 0, UnknownMap_00_02_EventScript_1BB980 - -UnknownMap_00_02_MapEvents:: - map_events UnknownMap_00_02_EventObjects, UnknownMap_00_02_MapWarps, UnknownMap_00_02_MapCoordEvents, 0x0 diff --git a/data/maps/UnknownMap_00_02/header.inc b/data/maps/UnknownMap_00_02/header.inc deleted file mode 100644 index 39a06131d..000000000 --- a/data/maps/UnknownMap_00_02/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -UnknownMap_00_02:: @ 834F1C0 - .4byte UnknownMap_00_02_Layout @ 0x82D8C98 - .4byte UnknownMap_00_02_MapEvents @ 0x83AE1C4 - .4byte UnknownMap_00_02_MapScripts @ 0x816047A - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 49 - .byte 0xc4, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/UnknownMap_00_02/map.json b/data/maps/UnknownMap_00_02/map.json new file mode 100644 index 000000000..8a90d86ff --- /dev/null +++ b/data/maps/UnknownMap_00_02/map.json @@ -0,0 +1,99 @@ +{ + "id": "MAP_UNKNOWN_MAP_00_02", + "name": "UnknownMap_00_02", + "layout": "LAYOUT_UNKNOWN_MAP_00_02", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_SPECIAL_AREA", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "66", + "x": 10, + "y": 5, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "UnknownMap_00_02_EventScript_1BB9D3", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 8, + "y": 9, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + }, + { + "x": 9, + "y": 9, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + }, + { + "x": 11, + "y": 9, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + }, + { + "x": 10, + "y": 9, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 6, + "y": 4, + "elevation": 3, + "var": "VAR_0x4000", + "var_value": 0, + "script": "UnknownMap_00_02_EventScript_1BB980" + }, + { + "type": "trigger", + "x": 6, + "y": 6, + "elevation": 3, + "var": "VAR_0x4000", + "var_value": 0, + "script": "UnknownMap_00_02_EventScript_1BB980" + }, + { + "type": "trigger", + "x": 13, + "y": 4, + "elevation": 3, + "var": "VAR_0x4000", + "var_value": 0, + "script": "UnknownMap_00_02_EventScript_1BB980" + }, + { + "type": "trigger", + "x": 13, + "y": 6, + "elevation": 3, + "var": "VAR_0x4000", + "var_value": 0, + "script": "UnknownMap_00_02_EventScript_1BB980" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/UnknownMap_00_03/events.inc b/data/maps/UnknownMap_00_03/events.inc deleted file mode 100644 index c8e9b630a..000000000 --- a/data/maps/UnknownMap_00_03/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -UnknownMap_00_03_MapWarps: - warp_def 5, 8, 3, 127, 32639 - warp_def 6, 8, 3, 127, 32639 - warp_def 7, 8, 3, 127, 32639 - warp_def 8, 8, 3, 127, 32639 - -UnknownMap_00_03_MapCoordEvents: - coord_event 3, 4, 3, 0, 16384, 0, 0, UnknownMap_00_03_EventScript_1BB8DB - coord_event 3, 6, 3, 0, 16384, 0, 0, UnknownMap_00_03_EventScript_1BB915 - coord_event 10, 4, 3, 0, 16384, 0, 0, UnknownMap_00_03_EventScript_1BB8F8 - coord_event 10, 6, 3, 0, 16384, 0, 0, UnknownMap_00_03_EventScript_1BB932 - -UnknownMap_00_03_MapEvents:: - map_events 0x0, UnknownMap_00_03_MapWarps, UnknownMap_00_03_MapCoordEvents, 0x0 diff --git a/data/maps/UnknownMap_00_03/header.inc b/data/maps/UnknownMap_00_03/header.inc deleted file mode 100644 index df701c238..000000000 --- a/data/maps/UnknownMap_00_03/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -UnknownMap_00_03:: @ 834F1DC - .4byte UnknownMap_00_03_Layout @ 0x82D8DB8 - .4byte UnknownMap_00_03_MapEvents @ 0x83AE238 - .4byte UnknownMap_00_03_MapScripts @ 0x816047B - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 50 - .byte 0xc4, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08 diff --git a/data/maps/UnknownMap_00_03/map.json b/data/maps/UnknownMap_00_03/map.json new file mode 100644 index 000000000..6ef7c2d04 --- /dev/null +++ b/data/maps/UnknownMap_00_03/map.json @@ -0,0 +1,85 @@ +{ + "id": "MAP_UNKNOWN_MAP_00_03", + "name": "UnknownMap_00_03", + "layout": "LAYOUT_UNKNOWN_MAP_00_03", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_SPECIAL_AREA", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_8", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 5, + "y": 8, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + }, + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + }, + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + }, + { + "x": 8, + "y": 8, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 3, + "y": 4, + "elevation": 3, + "var": "VAR_0x4000", + "var_value": 0, + "script": "UnknownMap_00_03_EventScript_1BB8DB" + }, + { + "type": "trigger", + "x": 3, + "y": 6, + "elevation": 3, + "var": "VAR_0x4000", + "var_value": 0, + "script": "UnknownMap_00_03_EventScript_1BB915" + }, + { + "type": "trigger", + "x": 10, + "y": 4, + "elevation": 3, + "var": "VAR_0x4000", + "var_value": 0, + "script": "UnknownMap_00_03_EventScript_1BB8F8" + }, + { + "type": "trigger", + "x": 10, + "y": 6, + "elevation": 3, + "var": "VAR_0x4000", + "var_value": 0, + "script": "UnknownMap_00_03_EventScript_1BB932" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/UnknownMap_00_04/events.inc b/data/maps/UnknownMap_00_04/events.inc deleted file mode 100644 index b456138b1..000000000 --- a/data/maps/UnknownMap_00_04/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -UnknownMap_00_04_EventObjects: - object_event 1, 66, 0, 3, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, UnknownMap_00_04_EventScript_16050C, 0, 0, 0 - object_event 2, 243, 0, 1, 0, 8, 0, 3, 2, 17, 0, 0, 0, 0, 0, UnknownMap_00_04_EventScript_1604DA, 102, 0, 0 - object_event 3, 247, 0, 7, 0, 8, 0, 3, 2, 17, 0, 0, 0, 0, 0, UnknownMap_00_04_EventScript_160502, 106, 0, 0 - object_event 4, 246, 0, 1, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, UnknownMap_00_04_EventScript_1604F8, 105, 0, 0 - object_event 5, 245, 0, 7, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, UnknownMap_00_04_EventScript_1604EE, 104, 0, 0 - object_event 6, 244, 0, 13, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, UnknownMap_00_04_EventScript_1604E4, 103, 0, 0 - object_event 7, 242, 0, 10, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, UnknownMap_00_04_EventScript_1604D0, 101, 0, 0 - object_event 8, 241, 0, 13, 0, 8, 0, 3, 2, 17, 0, 0, 0, 0, 0, UnknownMap_00_04_EventScript_1604C6, 100, 0, 0 - object_event 9, 240, 0, 4, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, UnknownMap_00_04_EventScript_1604BC, 99, 0, 0 - -UnknownMap_00_04_MapWarps: - warp_def 7, 11, 3, 127, 32639 - -UnknownMap_00_04_MapEvents:: - map_events UnknownMap_00_04_EventObjects, UnknownMap_00_04_MapWarps, 0x0, 0x0 diff --git a/data/maps/UnknownMap_00_04/header.inc b/data/maps/UnknownMap_00_04/header.inc deleted file mode 100644 index 585175a4d..000000000 --- a/data/maps/UnknownMap_00_04/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -UnknownMap_00_04:: @ 834F1F8 - .4byte UnknownMap_00_04_Layout @ 0x83388C4 - .4byte UnknownMap_00_04_MapEvents @ 0x83AE32C - .4byte UnknownMap_00_04_MapScripts @ 0x816047C - .4byte NULL - .2byte BGM_FRLG_UNION_ROOM - .2byte 262 - .byte 0xc4, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08 diff --git a/data/maps/UnknownMap_00_04/map.json b/data/maps/UnknownMap_00_04/map.json new file mode 100644 index 000000000..10edd9838 --- /dev/null +++ b/data/maps/UnknownMap_00_04/map.json @@ -0,0 +1,145 @@ +{ + "id": "MAP_UNKNOWN_MAP_00_04", + "name": "UnknownMap_00_04", + "layout": "LAYOUT_UNKNOWN_MAP_00_04", + "music": "BGM_FRLG_UNION_ROOM", + "region_map_section": "MAPSEC_SPECIAL_AREA", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_8", + "connections": null, + "object_events": [ + { + "graphics_id": "66", + "x": 3, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "UnknownMap_00_04_EventScript_16050C", + "flag": "0" + }, + { + "graphics_id": "243", + "x": 1, + "y": 8, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "UnknownMap_00_04_EventScript_1604DA", + "flag": "102" + }, + { + "graphics_id": "247", + "x": 7, + "y": 8, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "UnknownMap_00_04_EventScript_160502", + "flag": "106" + }, + { + "graphics_id": "246", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "UnknownMap_00_04_EventScript_1604F8", + "flag": "105" + }, + { + "graphics_id": "245", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "UnknownMap_00_04_EventScript_1604EE", + "flag": "104" + }, + { + "graphics_id": "244", + "x": 13, + "y": 4, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "UnknownMap_00_04_EventScript_1604E4", + "flag": "103" + }, + { + "graphics_id": "242", + "x": 10, + "y": 6, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "UnknownMap_00_04_EventScript_1604D0", + "flag": "101" + }, + { + "graphics_id": "241", + "x": 13, + "y": 8, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "UnknownMap_00_04_EventScript_1604C6", + "flag": "100" + }, + { + "graphics_id": "240", + "x": 4, + "y": 6, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "UnknownMap_00_04_EventScript_1604BC", + "flag": "99" + } + ], + "warp_events": [ + { + "x": 7, + "y": 11, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/UnknownMap_03_50/connections.inc b/data/maps/UnknownMap_03_50/connections.inc deleted file mode 100644 index e975befbc..000000000 --- a/data/maps/UnknownMap_03_50/connections.inc +++ /dev/null @@ -1,6 +0,0 @@ -UnknownMap_03_50_MapConnectionsList: @ 8352D80 - connection up, 0, MAP_THREE_ISLAND - -UnknownMap_03_50_MapConnections:: @ 8352D8C - .4byte 1 - .4byte UnknownMap_03_50_MapConnectionsList diff --git a/data/maps/UnknownMap_03_50/events.inc b/data/maps/UnknownMap_03_50/events.inc deleted file mode 100644 index 6cc1b9f0c..000000000 --- a/data/maps/UnknownMap_03_50/events.inc +++ /dev/null @@ -1,2 +0,0 @@ -UnknownMap_03_50_MapEvents:: - map_events 0x0, 0x0, 0x0, 0x0 diff --git a/data/maps/UnknownMap_03_50/header.inc b/data/maps/UnknownMap_03_50/header.inc deleted file mode 100644 index f58894d13..000000000 --- a/data/maps/UnknownMap_03_50/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -UnknownMap_03_50:: @ 8350B90 - .4byte UnknownMap_03_50_Layout @ 0x83283A8 - .4byte UnknownMap_03_50_MapEvents @ 0x83B8B24 - .4byte UnknownMap_03_50_MapScripts @ 0x81687E0 - .4byte UnknownMap_03_50_MapConnections @ 0x8352D8C - .2byte BGM_FRLG_SEVII_ISLANDS - .2byte 242 - .byte 0x9b, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/UnknownMap_03_50/map.json b/data/maps/UnknownMap_03_50/map.json new file mode 100644 index 000000000..1a166cfc8 --- /dev/null +++ b/data/maps/UnknownMap_03_50/map.json @@ -0,0 +1,25 @@ +{ + "id": "MAP_UNKNOWN_MAP_03_50", + "name": "UnknownMap_03_50", + "layout": "LAYOUT_UNKNOWN_MAP_03_50", + "music": "BGM_FRLG_SEVII_ISLANDS", + "region_map_section": "MAPSEC_SEVII_ISLE_6", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_THREE_ISLAND", + "offset": 0, + "direction": "up" + } + ], + "object_events": [], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/UnknownMap_03_51/connections.inc b/data/maps/UnknownMap_03_51/connections.inc deleted file mode 100644 index a742682c4..000000000 --- a/data/maps/UnknownMap_03_51/connections.inc +++ /dev/null @@ -1,6 +0,0 @@ -UnknownMap_03_51_MapConnectionsList: @ 8352D94 - connection up, 0, MAP_THREE_ISLAND - -UnknownMap_03_51_MapConnections:: @ 8352DA0 - .4byte 1 - .4byte UnknownMap_03_51_MapConnectionsList diff --git a/data/maps/UnknownMap_03_51/events.inc b/data/maps/UnknownMap_03_51/events.inc deleted file mode 100644 index 7da7d5a75..000000000 --- a/data/maps/UnknownMap_03_51/events.inc +++ /dev/null @@ -1,2 +0,0 @@ -UnknownMap_03_51_MapEvents:: - map_events 0x0, 0x0, 0x0, 0x0 diff --git a/data/maps/UnknownMap_03_51/header.inc b/data/maps/UnknownMap_03_51/header.inc deleted file mode 100644 index e7defa615..000000000 --- a/data/maps/UnknownMap_03_51/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -UnknownMap_03_51:: @ 8350BAC - .4byte UnknownMap_03_51_Layout @ 0x83283D0 - .4byte UnknownMap_03_51_MapEvents @ 0x83B8B38 - .4byte UnknownMap_03_51_MapScripts @ 0x81687E1 - .4byte UnknownMap_03_51_MapConnections @ 0x8352DA0 - .2byte BGM_FRLG_SEVII_ISLANDS - .2byte 243 - .byte 0x9c, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/UnknownMap_03_51/map.json b/data/maps/UnknownMap_03_51/map.json new file mode 100644 index 000000000..c96dcbb8a --- /dev/null +++ b/data/maps/UnknownMap_03_51/map.json @@ -0,0 +1,25 @@ +{ + "id": "MAP_UNKNOWN_MAP_03_51", + "name": "UnknownMap_03_51", + "layout": "LAYOUT_UNKNOWN_MAP_03_51", + "music": "BGM_FRLG_SEVII_ISLANDS", + "region_map_section": "MAPSEC_SEVII_ISLE_7", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_THREE_ISLAND", + "offset": 0, + "direction": "up" + } + ], + "object_events": [], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/UnknownMap_03_52/events.inc b/data/maps/UnknownMap_03_52/events.inc deleted file mode 100644 index afded324a..000000000 --- a/data/maps/UnknownMap_03_52/events.inc +++ /dev/null @@ -1,2 +0,0 @@ -UnknownMap_03_52_MapEvents:: - map_events 0x0, 0x0, 0x0, 0x0 diff --git a/data/maps/UnknownMap_03_52/header.inc b/data/maps/UnknownMap_03_52/header.inc deleted file mode 100644 index 097de23cb..000000000 --- a/data/maps/UnknownMap_03_52/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -UnknownMap_03_52:: @ 8350BC8 - .4byte UnknownMap_03_52_Layout @ 0x8329114 - .4byte UnknownMap_03_52_MapEvents @ 0x83B8B4C - .4byte UnknownMap_03_52_MapScripts @ 0x81687E2 - .4byte NULL - .2byte BGM_FRLG_SEVII_ISLANDS - .2byte 244 - .byte 0x9d, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/UnknownMap_03_52/map.json b/data/maps/UnknownMap_03_52/map.json new file mode 100644 index 000000000..5141b16dc --- /dev/null +++ b/data/maps/UnknownMap_03_52/map.json @@ -0,0 +1,19 @@ +{ + "id": "MAP_UNKNOWN_MAP_03_52", + "name": "UnknownMap_03_52", + "layout": "LAYOUT_UNKNOWN_MAP_03_52", + "music": "BGM_FRLG_SEVII_ISLANDS", + "region_map_section": "MAPSEC_SEVII_ISLE_8", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/UnknownMap_03_53/events.inc b/data/maps/UnknownMap_03_53/events.inc deleted file mode 100644 index b3f4c34f1..000000000 --- a/data/maps/UnknownMap_03_53/events.inc +++ /dev/null @@ -1,2 +0,0 @@ -UnknownMap_03_53_MapEvents:: - map_events 0x0, 0x0, 0x0, 0x0 diff --git a/data/maps/UnknownMap_03_53/header.inc b/data/maps/UnknownMap_03_53/header.inc deleted file mode 100644 index 22e8c0e98..000000000 --- a/data/maps/UnknownMap_03_53/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -UnknownMap_03_53:: @ 8350BE4 - .4byte UnknownMap_03_53_Layout @ 0x8329C78 - .4byte UnknownMap_03_53_MapEvents @ 0x83B8B60 - .4byte UnknownMap_03_53_MapScripts @ 0x81687E3 - .4byte NULL - .2byte BGM_FRLG_SEVII_ISLANDS - .2byte 245 - .byte 0x9e, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/UnknownMap_03_53/map.json b/data/maps/UnknownMap_03_53/map.json new file mode 100644 index 000000000..6c57c230e --- /dev/null +++ b/data/maps/UnknownMap_03_53/map.json @@ -0,0 +1,19 @@ +{ + "id": "MAP_UNKNOWN_MAP_03_53", + "name": "UnknownMap_03_53", + "layout": "LAYOUT_UNKNOWN_MAP_03_53", + "music": "BGM_FRLG_SEVII_ISLANDS", + "region_map_section": "MAPSEC_SEVII_ISLE_9", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/UnknownMap_18_01/events.inc b/data/maps/UnknownMap_18_01/events.inc deleted file mode 100644 index 95c4daa1c..000000000 --- a/data/maps/UnknownMap_18_01/events.inc +++ /dev/null @@ -1,2 +0,0 @@ -UnknownMap_18_01_MapEvents:: - map_events 0x0, 0x0, 0x0, 0x0 diff --git a/data/maps/UnknownMap_18_01/header.inc b/data/maps/UnknownMap_18_01/header.inc deleted file mode 100644 index 02fb72d6f..000000000 --- a/data/maps/UnknownMap_18_01/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -UnknownMap_18_01:: @ 835185C - .4byte House2_Layout @ 0x82D5840 - .4byte UnknownMap_18_01_MapEvents @ 0x83BD758 - .4byte UnknownMap_18_01_MapScripts @ 0x816FA8C - .4byte NULL - .2byte BGM_FRLG_ROUTE_3 - .2byte 7 - .byte 0x6a, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/UnknownMap_18_01/map.json b/data/maps/UnknownMap_18_01/map.json new file mode 100644 index 000000000..5a592a7e0 --- /dev/null +++ b/data/maps/UnknownMap_18_01/map.json @@ -0,0 +1,19 @@ +{ + "id": "MAP_UNKNOWN_MAP_18_01", + "name": "UnknownMap_18_01", + "layout": "LAYOUT_HOUSE2", + "music": "BGM_FRLG_ROUTE_3", + "region_map_section": "MAPSEC_ROUTE_6", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/UnusedHouse_27_00/events.inc b/data/maps/UnusedHouse_27_00/events.inc deleted file mode 100644 index 086aa89d7..000000000 --- a/data/maps/UnusedHouse_27_00/events.inc +++ /dev/null @@ -1,2 +0,0 @@ -UnusedHouse_27_00_MapEvents:: - map_events 0x0, 0x0, 0x0, 0x0 diff --git a/data/maps/UnusedHouse_27_00/header.inc b/data/maps/UnusedHouse_27_00/header.inc deleted file mode 100644 index 27571a106..000000000 --- a/data/maps/UnusedHouse_27_00/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -UnusedHouse_27_00:: @ 8351A38 - .4byte House2_Layout @ 0x82D5840 - .4byte UnusedHouse_27_00_MapEvents @ 0x83BDF30 - .4byte UnusedHouse_27_00_MapScripts @ 0x81704FA - .4byte NULL - .2byte BGM_FRLG_ROUTE_3 - .2byte 7 - .byte 0x77, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/UnusedHouse_27_00/map.json b/data/maps/UnusedHouse_27_00/map.json new file mode 100644 index 000000000..a1b37a7f0 --- /dev/null +++ b/data/maps/UnusedHouse_27_00/map.json @@ -0,0 +1,19 @@ +{ + "id": "MAP_UNUSED_HOUSE_27_00", + "name": "UnusedHouse_27_00", + "layout": "LAYOUT_HOUSE2", + "music": "BGM_FRLG_ROUTE_3", + "region_map_section": "MAPSEC_ROUTE_19", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/UnusedHouse_29_00/events.inc b/data/maps/UnusedHouse_29_00/events.inc deleted file mode 100644 index be21c75df..000000000 --- a/data/maps/UnusedHouse_29_00/events.inc +++ /dev/null @@ -1,2 +0,0 @@ -UnusedHouse_29_00_MapEvents:: - map_events 0x0, 0x0, 0x0, 0x0 diff --git a/data/maps/UnusedHouse_29_00/header.inc b/data/maps/UnusedHouse_29_00/header.inc deleted file mode 100644 index 79c745105..000000000 --- a/data/maps/UnusedHouse_29_00/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -UnusedHouse_29_00:: @ 8351A70 - .4byte House2_Layout @ 0x82D5840 - .4byte UnusedHouse_29_00_MapEvents @ 0x83BDFA0 - .4byte UnusedHouse_29_00_MapScripts @ 0x8170522 - .4byte NULL - .2byte BGM_FRLG_INDIGO_PLATEAU - .2byte 7 - .byte 0x7b, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/UnusedHouse_29_00/map.json b/data/maps/UnusedHouse_29_00/map.json new file mode 100644 index 000000000..685feaa61 --- /dev/null +++ b/data/maps/UnusedHouse_29_00/map.json @@ -0,0 +1,19 @@ +{ + "id": "MAP_UNUSED_HOUSE_29_00", + "name": "UnusedHouse_29_00", + "layout": "LAYOUT_HOUSE2", + "music": "BGM_FRLG_INDIGO_PLATEAU", + "region_map_section": "MAPSEC_ROUTE_23", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/UnusedHouse_31_05/events.inc b/data/maps/UnusedHouse_31_05/events.inc deleted file mode 100644 index f367b0911..000000000 --- a/data/maps/UnusedHouse_31_05/events.inc +++ /dev/null @@ -1,2 +0,0 @@ -UnusedHouse_31_05_MapEvents:: - map_events 0x0, 0x0, 0x0, 0x0 diff --git a/data/maps/UnusedHouse_31_05/header.inc b/data/maps/UnusedHouse_31_05/header.inc deleted file mode 100644 index ad4098e09..000000000 --- a/data/maps/UnusedHouse_31_05/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -UnusedHouse_31_05:: @ 8351B34 - .4byte House4_Layout @ 0x82D6070 - .4byte UnusedHouse_31_05_MapEvents @ 0x83BE254 - .4byte UnusedHouse_31_05_MapScripts @ 0x8170BE3 - .4byte NULL - .2byte BGM_FRLG_ISLAND_SIX - .2byte 13 - .byte 0x94, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/UnusedHouse_31_05/map.json b/data/maps/UnusedHouse_31_05/map.json new file mode 100644 index 000000000..97996c85d --- /dev/null +++ b/data/maps/UnusedHouse_31_05/map.json @@ -0,0 +1,19 @@ +{ + "id": "MAP_UNUSED_HOUSE_31_05", + "name": "UnusedHouse_31_05", + "layout": "LAYOUT_HOUSE4", + "music": "BGM_FRLG_ISLAND_SIX", + "region_map_section": "MAPSEC_SEVEN_ISLAND", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/VermilionCity/connections.inc b/data/maps/VermilionCity/connections.inc deleted file mode 100644 index b90cfc5a9..000000000 --- a/data/maps/VermilionCity/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -VermilionCity_MapConnectionsList: @ 8352824 - connection up, 12, MAP_ROUTE6 - connection right, 10, MAP_ROUTE11 - -VermilionCity_MapConnections:: @ 835283C - .4byte 2 - .4byte VermilionCity_MapConnectionsList diff --git a/data/maps/VermilionCity/events.inc b/data/maps/VermilionCity/events.inc deleted file mode 100644 index 2178a9d13..000000000 --- a/data/maps/VermilionCity/events.inc +++ /dev/null @@ -1,38 +0,0 @@ -VermilionCity_EventObjects: - object_event 1, 23, 0, 22, 0, 11, 0, 3, 5, 20, 0, 0, 0, 0, 0, VermilionCity_EventScript_166917, 0, 0, 0 - object_event 2, 32, 0, 17, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, VermilionCity_EventScript_166920, 0, 0, 0 - object_event 3, 33, 0, 36, 0, 10, 0, 0, 17, 17, 0, 0, 0, 0, 0, VermilionCity_EventScript_166C2F, 0, 0, 0 - object_event 4, 130, 0, 35, 0, 11, 0, 3, 2, 34, 0, 0, 0, 0, 0, VermilionCity_EventScript_166C38, 0, 0, 0 - object_event 5, 62, 0, 31, 0, 30, 0, 3, 5, 20, 0, 0, 0, 0, 0, VermilionCity_EventScript_166C17, 0, 0, 0 - object_event 6, 62, 0, 24, 0, 33, 0, 3, 7, 17, 0, 0, 0, 0, 0, VermilionCity_EventScript_166941, 0, 0, 0 - object_event 7, 95, 0, 19, 0, 24, 0, 3, 8, 17, 0, 0, 0, 0, 0, VermilionCity_EventScript_1BDF13, 18, 0, 0 - object_event 8, 55, 0, 25, 0, 7, 0, 3, 1, 20, 0, 0, 0, 0, 0, VermilionCity_EventScript_166C20, 161, 0, 0 - -VermilionCity_MapWarps: - warp_def 22, 34, 3, 1, 260 - warp_def 23, 34, 3, 1, 260 - warp_def 24, 34, 3, 1, 260 - warp_def 9, 6, 0, 1, 2304 - warp_def 15, 6, 3, 1, 2305 - warp_def 12, 17, 0, 1, 2307 - warp_def 19, 17, 0, 1, 2308 - warp_def 29, 17, 0, 1, 2309 - warp_def 28, 24, 0, 1, 2311 - warp_def 14, 25, 0, 1, 2310 - -VermilionCity_MapCoordEvents: - coord_event 22, 33, 0, 0, 16467, 0, 0, VermilionCity_EventScript_166B8A - coord_event 23, 33, 0, 0, 16467, 0, 0, VermilionCity_EventScript_166B91 - coord_event 22, 32, 0, 0, 16385, 0, 0, VermilionCity_EventScript_166B98 - coord_event 23, 32, 0, 0, 16385, 0, 0, VermilionCity_EventScript_166B98 - -VermilionCity_MapBGEvents: - bg_event 33, 6, 0, 0, 0, VermilionCity_EventScript_166C53 - bg_event 10, 17, 3, 0, 0, VermilionCity_EventScript_166C65 - bg_event 10, 24, 0, 0, 0, VermilionCity_EventScript_166C6E - bg_event 34, 18, 0, 0, 0, VermilionCity_EventScript_166C86 - bg_event 45, 17, 3, 0, 0, VermilionCity_EventScript_166C5C - bg_event 14, 11, 3, 7, 0, 35, 48, 1 - -VermilionCity_MapEvents:: - map_events VermilionCity_EventObjects, VermilionCity_MapWarps, VermilionCity_MapCoordEvents, VermilionCity_MapBGEvents diff --git a/data/maps/VermilionCity/header.inc b/data/maps/VermilionCity/header.inc deleted file mode 100644 index efc42750d..000000000 --- a/data/maps/VermilionCity/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -VermilionCity:: @ 83506A4 - .4byte VermilionCity_Layout @ 0x82E1534 - .4byte VermilionCity_MapEvents @ 0x83B5648 - .4byte VermilionCity_MapScripts @ 0x81668DC - .4byte VermilionCity_MapConnections @ 0x835283C - .2byte BGM_FRLG_VERMILION_CITY - .2byte 83 - .byte 0x5d, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/VermilionCity/map.json b/data/maps/VermilionCity/map.json new file mode 100644 index 000000000..eb3112c5c --- /dev/null +++ b/data/maps/VermilionCity/map.json @@ -0,0 +1,288 @@ +{ + "id": "MAP_VERMILION_CITY", + "name": "VermilionCity", + "layout": "LAYOUT_VERMILION_CITY", + "music": "BGM_FRLG_VERMILION_CITY", + "region_map_section": "MAPSEC_VERMILION_CITY", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_1", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_ROUTE6", + "offset": 12, + "direction": "up" + }, + { + "map": "MAP_ROUTE11", + "offset": 10, + "direction": "right" + } + ], + "object_events": [ + { + "graphics_id": "23", + "x": 22, + "y": 11, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 4, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VermilionCity_EventScript_166917", + "flag": "0" + }, + { + "graphics_id": "32", + "x": 17, + "y": 9, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VermilionCity_EventScript_166920", + "flag": "0" + }, + { + "graphics_id": "33", + "x": 36, + "y": 10, + "elevation": 0, + "movement_type": "17", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VermilionCity_EventScript_166C2F", + "flag": "0" + }, + { + "graphics_id": "130", + "x": 35, + "y": 11, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 2, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VermilionCity_EventScript_166C38", + "flag": "0" + }, + { + "graphics_id": "62", + "x": 31, + "y": 30, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 4, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VermilionCity_EventScript_166C17", + "flag": "0" + }, + { + "graphics_id": "62", + "x": 24, + "y": 33, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VermilionCity_EventScript_166941", + "flag": "0" + }, + { + "graphics_id": "95", + "x": 19, + "y": 24, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VermilionCity_EventScript_1BDF13", + "flag": "18" + }, + { + "graphics_id": "55", + "x": 25, + "y": 7, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 4, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VermilionCity_EventScript_166C20", + "flag": "161" + } + ], + "warp_events": [ + { + "x": 22, + "y": 34, + "elevation": 3, + "dest_map": "MAP_SSANNE_EXTERIOR", + "dest_warp_id": 1 + }, + { + "x": 23, + "y": 34, + "elevation": 3, + "dest_map": "MAP_SSANNE_EXTERIOR", + "dest_warp_id": 1 + }, + { + "x": 24, + "y": 34, + "elevation": 3, + "dest_map": "MAP_SSANNE_EXTERIOR", + "dest_warp_id": 1 + }, + { + "x": 9, + "y": 6, + "elevation": 0, + "dest_map": "MAP_VERMILION_CITY_HOUSE1", + "dest_warp_id": 1 + }, + { + "x": 15, + "y": 6, + "elevation": 3, + "dest_map": "MAP_VERMILION_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 1 + }, + { + "x": 12, + "y": 17, + "elevation": 0, + "dest_map": "MAP_VERMILION_CITY_POKEMON_FAN_CLUB", + "dest_warp_id": 1 + }, + { + "x": 19, + "y": 17, + "elevation": 0, + "dest_map": "MAP_VERMILION_CITY_HOUSE2", + "dest_warp_id": 1 + }, + { + "x": 29, + "y": 17, + "elevation": 0, + "dest_map": "MAP_VERMILION_CITY_MART", + "dest_warp_id": 1 + }, + { + "x": 28, + "y": 24, + "elevation": 0, + "dest_map": "MAP_VERMILION_CITY_HOUSE3", + "dest_warp_id": 1 + }, + { + "x": 14, + "y": 25, + "elevation": 0, + "dest_map": "MAP_VERMILION_CITY_GYM", + "dest_warp_id": 1 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 22, + "y": 33, + "elevation": 0, + "var": "VAR_0x4053", + "var_value": 0, + "script": "VermilionCity_EventScript_166B8A" + }, + { + "type": "trigger", + "x": 23, + "y": 33, + "elevation": 0, + "var": "VAR_0x4053", + "var_value": 0, + "script": "VermilionCity_EventScript_166B91" + }, + { + "type": "trigger", + "x": 22, + "y": 32, + "elevation": 0, + "var": "VAR_0x4001", + "var_value": 0, + "script": "VermilionCity_EventScript_166B98" + }, + { + "type": "trigger", + "x": 23, + "y": 32, + "elevation": 0, + "var": "VAR_0x4001", + "var_value": 0, + "script": "VermilionCity_EventScript_166B98" + } + ], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 33, + "y": 6, + "elevation": 0, + "script": "VermilionCity_EventScript_166C53" + }, + { + "type": "bg_event_type_0", + "x": 10, + "y": 17, + "elevation": 3, + "script": "VermilionCity_EventScript_166C65" + }, + { + "type": "bg_event_type_0", + "x": 10, + "y": 24, + "elevation": 0, + "script": "VermilionCity_EventScript_166C6E" + }, + { + "type": "bg_event_type_0", + "x": 34, + "y": 18, + "elevation": 0, + "script": "VermilionCity_EventScript_166C86" + }, + { + "type": "bg_event_type_0", + "x": 45, + "y": 17, + "elevation": 3, + "script": "VermilionCity_EventScript_166C5C" + }, + { + "type": "hidden_item", + "x": 14, + "y": 11, + "elevation": 3, + "item": "ITEM_MAX_ETHER", + "flag": "48", + "unknown": 1 + } + ] +} \ No newline at end of file diff --git a/data/maps/VermilionCity_Gym/events.inc b/data/maps/VermilionCity_Gym/events.inc deleted file mode 100644 index 94ce9dbdb..000000000 --- a/data/maps/VermilionCity_Gym/events.inc +++ /dev/null @@ -1,33 +0,0 @@ -VermilionCity_Gym_EventObjects: - object_event 1, 82, 0, 5, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, VermilionCity_Gym_EventScript_16B94A, 0, 0, 0 - object_event 2, 30, 0, 2, 0, 11, 0, 3, 1, 17, 0, 1, 0, 3, 0, VermilionCity_Gym_EventScript_16BA1E, 0, 0, 0 - object_event 3, 62, 0, 8, 0, 13, 0, 3, 1, 17, 0, 1, 0, 3, 0, VermilionCity_Gym_EventScript_16B9FA, 0, 0, 0 - object_event 4, 91, 0, 4, 0, 17, 0, 3, 8, 17, 0, 0, 0, 0, 0, VermilionCity_Gym_EventScript_16BA6C, 0, 0, 0 - object_event 5, 61, 0, 7, 0, 8, 0, 3, 9, 17, 0, 1, 0, 3, 0, VermilionCity_Gym_EventScript_16BA35, 0, 0, 0 - -VermilionCity_Gym_MapWarps: - warp_def 4, 19, 3, 9, 773 - warp_def 5, 19, 3, 9, 773 - warp_def 6, 19, 3, 9, 773 - -VermilionCity_Gym_MapBGEvents: - bg_event 3, 17, 0, 0, 0, VermilionCity_Gym_EventScript_16BA8B - bg_event 7, 17, 0, 0, 0, VermilionCity_Gym_EventScript_16BA8B - bg_event 1, 10, 0, 0, 0, VermilionCity_Gym_EventScript_16B78F - bg_event 3, 10, 0, 0, 0, VermilionCity_Gym_EventScript_16B79B - bg_event 5, 10, 0, 0, 0, VermilionCity_Gym_EventScript_16B7A7 - bg_event 7, 10, 0, 0, 0, VermilionCity_Gym_EventScript_16B7B3 - bg_event 9, 10, 0, 0, 0, VermilionCity_Gym_EventScript_16B7BF - bg_event 1, 12, 0, 0, 0, VermilionCity_Gym_EventScript_16B7CB - bg_event 3, 12, 0, 0, 0, VermilionCity_Gym_EventScript_16B7D7 - bg_event 5, 12, 0, 0, 0, VermilionCity_Gym_EventScript_16B7E3 - bg_event 7, 12, 0, 0, 0, VermilionCity_Gym_EventScript_16B7EF - bg_event 9, 12, 0, 0, 0, VermilionCity_Gym_EventScript_16B7FB - bg_event 1, 14, 0, 0, 0, VermilionCity_Gym_EventScript_16B807 - bg_event 3, 14, 0, 0, 0, VermilionCity_Gym_EventScript_16B813 - bg_event 5, 14, 0, 0, 0, VermilionCity_Gym_EventScript_16B81F - bg_event 7, 14, 0, 0, 0, VermilionCity_Gym_EventScript_16B82B - bg_event 9, 14, 0, 0, 0, VermilionCity_Gym_EventScript_16B837 - -VermilionCity_Gym_MapEvents:: - map_events VermilionCity_Gym_EventObjects, VermilionCity_Gym_MapWarps, 0x0, VermilionCity_Gym_MapBGEvents diff --git a/data/maps/VermilionCity_Gym/header.inc b/data/maps/VermilionCity_Gym/header.inc deleted file mode 100644 index d80a1d2f1..000000000 --- a/data/maps/VermilionCity_Gym/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -VermilionCity_Gym:: @ 83511B0 - .4byte VermilionCity_Gym_Layout @ 0x82D6E28 - .4byte VermilionCity_Gym_MapEvents @ 0x83BAFD0 - .4byte VermilionCity_Gym_MapScripts @ 0x816B69E - .4byte NULL - .2byte BGM_FRLG_GYM - .2byte 25 - .byte 0x5d, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01 diff --git a/data/maps/VermilionCity_Gym/map.json b/data/maps/VermilionCity_Gym/map.json new file mode 100644 index 000000000..cc98e944b --- /dev/null +++ b/data/maps/VermilionCity_Gym/map.json @@ -0,0 +1,227 @@ +{ + "id": "MAP_VERMILION_CITY_GYM", + "name": "VermilionCity_Gym", + "layout": "LAYOUT_VERMILION_CITY_GYM", + "music": "BGM_FRLG_GYM", + "region_map_section": "MAPSEC_VERMILION_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_1", + "connections": null, + "object_events": [ + { + "graphics_id": "82", + "x": 5, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VermilionCity_Gym_EventScript_16B94A", + "flag": "0" + }, + { + "graphics_id": "30", + "x": 2, + "y": 11, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "VermilionCity_Gym_EventScript_16BA1E", + "flag": "0" + }, + { + "graphics_id": "62", + "x": 8, + "y": 13, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "VermilionCity_Gym_EventScript_16B9FA", + "flag": "0" + }, + { + "graphics_id": "91", + "x": 4, + "y": 17, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VermilionCity_Gym_EventScript_16BA6C", + "flag": "0" + }, + { + "graphics_id": "61", + "x": 7, + "y": 8, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "VermilionCity_Gym_EventScript_16BA35", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 19, + "elevation": 3, + "dest_map": "MAP_VERMILION_CITY", + "dest_warp_id": 9 + }, + { + "x": 5, + "y": 19, + "elevation": 3, + "dest_map": "MAP_VERMILION_CITY", + "dest_warp_id": 9 + }, + { + "x": 6, + "y": 19, + "elevation": 3, + "dest_map": "MAP_VERMILION_CITY", + "dest_warp_id": 9 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 3, + "y": 17, + "elevation": 0, + "script": "VermilionCity_Gym_EventScript_16BA8B" + }, + { + "type": "bg_event_type_0", + "x": 7, + "y": 17, + "elevation": 0, + "script": "VermilionCity_Gym_EventScript_16BA8B" + }, + { + "type": "bg_event_type_0", + "x": 1, + "y": 10, + "elevation": 0, + "script": "VermilionCity_Gym_EventScript_16B78F" + }, + { + "type": "bg_event_type_0", + "x": 3, + "y": 10, + "elevation": 0, + "script": "VermilionCity_Gym_EventScript_16B79B" + }, + { + "type": "bg_event_type_0", + "x": 5, + "y": 10, + "elevation": 0, + "script": "VermilionCity_Gym_EventScript_16B7A7" + }, + { + "type": "bg_event_type_0", + "x": 7, + "y": 10, + "elevation": 0, + "script": "VermilionCity_Gym_EventScript_16B7B3" + }, + { + "type": "bg_event_type_0", + "x": 9, + "y": 10, + "elevation": 0, + "script": "VermilionCity_Gym_EventScript_16B7BF" + }, + { + "type": "bg_event_type_0", + "x": 1, + "y": 12, + "elevation": 0, + "script": "VermilionCity_Gym_EventScript_16B7CB" + }, + { + "type": "bg_event_type_0", + "x": 3, + "y": 12, + "elevation": 0, + "script": "VermilionCity_Gym_EventScript_16B7D7" + }, + { + "type": "bg_event_type_0", + "x": 5, + "y": 12, + "elevation": 0, + "script": "VermilionCity_Gym_EventScript_16B7E3" + }, + { + "type": "bg_event_type_0", + "x": 7, + "y": 12, + "elevation": 0, + "script": "VermilionCity_Gym_EventScript_16B7EF" + }, + { + "type": "bg_event_type_0", + "x": 9, + "y": 12, + "elevation": 0, + "script": "VermilionCity_Gym_EventScript_16B7FB" + }, + { + "type": "bg_event_type_0", + "x": 1, + "y": 14, + "elevation": 0, + "script": "VermilionCity_Gym_EventScript_16B807" + }, + { + "type": "bg_event_type_0", + "x": 3, + "y": 14, + "elevation": 0, + "script": "VermilionCity_Gym_EventScript_16B813" + }, + { + "type": "bg_event_type_0", + "x": 5, + "y": 14, + "elevation": 0, + "script": "VermilionCity_Gym_EventScript_16B81F" + }, + { + "type": "bg_event_type_0", + "x": 7, + "y": 14, + "elevation": 0, + "script": "VermilionCity_Gym_EventScript_16B82B" + }, + { + "type": "bg_event_type_0", + "x": 9, + "y": 14, + "elevation": 0, + "script": "VermilionCity_Gym_EventScript_16B837" + } + ] +} \ No newline at end of file diff --git a/data/maps/VermilionCity_House1/events.inc b/data/maps/VermilionCity_House1/events.inc deleted file mode 100644 index e5f44384b..000000000 --- a/data/maps/VermilionCity_House1/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -VermilionCity_House1_EventObjects: - object_event 1, 57, 0, 4, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, VermilionCity_House1_EventScript_16B3A7, 0, 0, 0 - -VermilionCity_House1_MapWarps: - warp_def 3, 7, 3, 3, 773 - warp_def 4, 7, 3, 3, 773 - warp_def 5, 7, 3, 3, 773 - -VermilionCity_House1_MapEvents:: - map_events VermilionCity_House1_EventObjects, VermilionCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/VermilionCity_House1/header.inc b/data/maps/VermilionCity_House1/header.inc deleted file mode 100644 index 789b28501..000000000 --- a/data/maps/VermilionCity_House1/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -VermilionCity_House1:: @ 8351108 - .4byte House1_Layout @ 0x82D5754 - .4byte VermilionCity_House1_MapEvents @ 0x83BAB6C - .4byte VermilionCity_House1_MapScripts @ 0x816B3A6 - .4byte NULL - .2byte BGM_FRLG_CERULEAN_CITY - .2byte 6 - .byte 0x5d, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/VermilionCity_House1/map.json b/data/maps/VermilionCity_House1/map.json new file mode 100644 index 000000000..8195bf6ac --- /dev/null +++ b/data/maps/VermilionCity_House1/map.json @@ -0,0 +1,55 @@ +{ + "id": "MAP_VERMILION_CITY_HOUSE1", + "name": "VermilionCity_House1", + "layout": "LAYOUT_HOUSE1", + "music": "BGM_FRLG_CERULEAN_CITY", + "region_map_section": "MAPSEC_VERMILION_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "57", + "x": 4, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VermilionCity_House1_EventScript_16B3A7", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 3, + "dest_map": "MAP_VERMILION_CITY", + "dest_warp_id": 3 + }, + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_VERMILION_CITY", + "dest_warp_id": 3 + }, + { + "x": 5, + "y": 7, + "elevation": 3, + "dest_map": "MAP_VERMILION_CITY", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/VermilionCity_House2/events.inc b/data/maps/VermilionCity_House2/events.inc deleted file mode 100644 index 8e8eb781c..000000000 --- a/data/maps/VermilionCity_House2/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -VermilionCity_House2_EventObjects: - object_event 1, 17, 0, 4, 0, 4, 0, 3, 7, 17, 0, 0, 0, 0, 0, VermilionCity_House2_EventScript_16B5D7, 0, 0, 0 - -VermilionCity_House2_MapWarps: - warp_def 3, 7, 3, 6, 773 - warp_def 4, 7, 3, 6, 773 - warp_def 5, 7, 3, 6, 773 - -VermilionCity_House2_MapEvents:: - map_events VermilionCity_House2_EventObjects, VermilionCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/VermilionCity_House2/header.inc b/data/maps/VermilionCity_House2/header.inc deleted file mode 100644 index a536abeb6..000000000 --- a/data/maps/VermilionCity_House2/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -VermilionCity_House2:: @ 8351178 - .4byte House1_Layout @ 0x82D5754 - .4byte VermilionCity_House2_MapEvents @ 0x83BADEC - .4byte VermilionCity_House2_MapScripts @ 0x816B5D6 - .4byte NULL - .2byte BGM_FRLG_VERMILION_CITY - .2byte 6 - .byte 0x5d, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/VermilionCity_House2/map.json b/data/maps/VermilionCity_House2/map.json new file mode 100644 index 000000000..0e218b3d1 --- /dev/null +++ b/data/maps/VermilionCity_House2/map.json @@ -0,0 +1,55 @@ +{ + "id": "MAP_VERMILION_CITY_HOUSE2", + "name": "VermilionCity_House2", + "layout": "LAYOUT_HOUSE1", + "music": "BGM_FRLG_VERMILION_CITY", + "region_map_section": "MAPSEC_VERMILION_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "17", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VermilionCity_House2_EventScript_16B5D7", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 3, + "dest_map": "MAP_VERMILION_CITY", + "dest_warp_id": 6 + }, + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_VERMILION_CITY", + "dest_warp_id": 6 + }, + { + "x": 5, + "y": 7, + "elevation": 3, + "dest_map": "MAP_VERMILION_CITY", + "dest_warp_id": 6 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/VermilionCity_House3/events.inc b/data/maps/VermilionCity_House3/events.inc deleted file mode 100644 index 746a1b637..000000000 --- a/data/maps/VermilionCity_House3/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -VermilionCity_House3_EventObjects: - object_event 1, 19, 0, 7, 0, 4, 0, 3, 9, 17, 0, 0, 0, 0, 0, VermilionCity_House3_EventScript_16BAAA, 0, 0, 0 - object_event 2, 116, 0, 2, 0, 5, 0, 3, 5, 18, 0, 0, 0, 0, 0, VermilionCity_House3_EventScript_16BABC, 0, 0, 0 - object_event 3, 105, 0, 6, 0, 4, 0, 0, 1, 17, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 4, 22, 0, 2, 0, 4, 0, 3, 8, 17, 0, 0, 0, 0, 0, VermilionCity_House3_EventScript_16BAB3, 0, 0, 0 - -VermilionCity_House3_MapWarps: - warp_def 3, 7, 3, 8, 773 - warp_def 4, 7, 3, 8, 773 - warp_def 5, 7, 3, 8, 773 - -VermilionCity_House3_MapBGEvents: - bg_event 6, 4, 3, 0, 0, VermilionCity_House3_EventScript_16BACF - -VermilionCity_House3_MapEvents:: - map_events VermilionCity_House3_EventObjects, VermilionCity_House3_MapWarps, 0x0, VermilionCity_House3_MapBGEvents diff --git a/data/maps/VermilionCity_House3/header.inc b/data/maps/VermilionCity_House3/header.inc deleted file mode 100644 index 2ab2f1ee8..000000000 --- a/data/maps/VermilionCity_House3/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -VermilionCity_House3:: @ 83511CC - .4byte House1_Layout @ 0x82D5754 - .4byte VermilionCity_House3_MapEvents @ 0x83BB068 - .4byte VermilionCity_House3_MapScripts @ 0x816BAA9 - .4byte NULL - .2byte BGM_FRLG_VERMILION_CITY - .2byte 6 - .byte 0x5d, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/VermilionCity_House3/map.json b/data/maps/VermilionCity_House3/map.json new file mode 100644 index 000000000..2108ec768 --- /dev/null +++ b/data/maps/VermilionCity_House3/map.json @@ -0,0 +1,102 @@ +{ + "id": "MAP_VERMILION_CITY_HOUSE3", + "name": "VermilionCity_House3", + "layout": "LAYOUT_HOUSE1", + "music": "BGM_FRLG_VERMILION_CITY", + "region_map_section": "MAPSEC_VERMILION_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "19", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VermilionCity_House3_EventScript_16BAAA", + "flag": "0" + }, + { + "graphics_id": "116", + "x": 2, + "y": 5, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VermilionCity_House3_EventScript_16BABC", + "flag": "0" + }, + { + "graphics_id": "105", + "x": 6, + "y": 4, + "elevation": 0, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "22", + "x": 2, + "y": 4, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VermilionCity_House3_EventScript_16BAB3", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 3, + "dest_map": "MAP_VERMILION_CITY", + "dest_warp_id": 8 + }, + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_VERMILION_CITY", + "dest_warp_id": 8 + }, + { + "x": 5, + "y": 7, + "elevation": 3, + "dest_map": "MAP_VERMILION_CITY", + "dest_warp_id": 8 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 6, + "y": 4, + "elevation": 3, + "script": "VermilionCity_House3_EventScript_16BACF" + } + ] +} \ No newline at end of file diff --git a/data/maps/VermilionCity_Mart/events.inc b/data/maps/VermilionCity_Mart/events.inc deleted file mode 100644 index 2a659bf50..000000000 --- a/data/maps/VermilionCity_Mart/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -VermilionCity_Mart_EventObjects: - object_event 1, 68, 0, 2, 0, 3, 0, 0, 10, 17, 0, 0, 0, 0, 0, VermilionCity_Mart_EventScript_16B666, 0, 0, 0 - object_event 2, 42, 0, 4, 0, 2, 0, 3, 9, 17, 0, 0, 0, 0, 0, VermilionCity_Mart_EventScript_16B654, 0, 0, 0 - object_event 3, 30, 0, 9, 0, 4, 0, 3, 2, 33, 0, 0, 0, 0, 0, VermilionCity_Mart_EventScript_16B65D, 0, 0, 0 - -VermilionCity_Mart_MapWarps: - warp_def 3, 7, 3, 7, 773 - warp_def 4, 7, 3, 7, 773 - warp_def 5, 7, 3, 7, 773 - -VermilionCity_Mart_MapEvents:: - map_events VermilionCity_Mart_EventObjects, VermilionCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/VermilionCity_Mart/header.inc b/data/maps/VermilionCity_Mart/header.inc deleted file mode 100644 index d82ee87a5..000000000 --- a/data/maps/VermilionCity_Mart/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -VermilionCity_Mart:: @ 8351194 - .4byte Mart_Layout @ 0x82D5BCC - .4byte VermilionCity_Mart_MapEvents @ 0x83BAE60 - .4byte VermilionCity_Mart_MapScripts @ 0x816B653 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 10 - .byte 0x5d, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/VermilionCity_Mart/map.json b/data/maps/VermilionCity_Mart/map.json new file mode 100644 index 000000000..9b014e0de --- /dev/null +++ b/data/maps/VermilionCity_Mart/map.json @@ -0,0 +1,81 @@ +{ + "id": "MAP_VERMILION_CITY_MART", + "name": "VermilionCity_Mart", + "layout": "LAYOUT_MART", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_VERMILION_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "68", + "x": 2, + "y": 3, + "elevation": 0, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VermilionCity_Mart_EventScript_16B666", + "flag": "0" + }, + { + "graphics_id": "42", + "x": 4, + "y": 2, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VermilionCity_Mart_EventScript_16B654", + "flag": "0" + }, + { + "graphics_id": "30", + "x": 9, + "y": 4, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VermilionCity_Mart_EventScript_16B65D", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 3, + "dest_map": "MAP_VERMILION_CITY", + "dest_warp_id": 7 + }, + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_VERMILION_CITY", + "dest_warp_id": 7 + }, + { + "x": 5, + "y": 7, + "elevation": 3, + "dest_map": "MAP_VERMILION_CITY", + "dest_warp_id": 7 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/VermilionCity_PokemonCenter_1F/events.inc b/data/maps/VermilionCity_PokemonCenter_1F/events.inc deleted file mode 100644 index 6db98e763..000000000 --- a/data/maps/VermilionCity_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,17 +0,0 @@ -VermilionCity_PokemonCenter_1F_EventObjects: - object_event 1, 64, 0, 7, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, VermilionCity_PokemonCenter_1F_EventScript_16B433, 0, 0, 0 - object_event 2, 25, 0, 4, 0, 8, 0, 3, 5, 17, 0, 0, 0, 0, 0, VermilionCity_PokemonCenter_1F_EventScript_16B43C, 0, 0, 0 - object_event 3, 56, 0, 12, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, VermilionCity_PokemonCenter_1F_EventScript_16B445, 0, 0, 0 - object_event 4, 18, 0, 14, 0, 4, 0, 3, 3, 17, 0, 0, 0, 0, 0, VermilionCity_PokemonCenter_1F_EventScript_16B44E, 0, 0, 0 - object_event 5, 42, 0, 6, 0, 4, 0, 3, 8, 17, 0, 0, 0, 0, 0, VermilionCity_PokemonCenter_1F_EventScript_1A8D08, 0, 0, 0 - object_event 6, 0, 0, 2, 0, 1, 0, 0, 76, 17, 0, 0, 0, 0, 0, VermilionCity_PokemonCenter_1F_EventScript_1ACE83, 160, 0, 0 - object_event 7, 0, 0, 3, 0, 1, 0, 0, 76, 17, 0, 0, 0, 0, 0, VermilionCity_PokemonCenter_1F_EventScript_1ACE83, 160, 0, 0 - -VermilionCity_PokemonCenter_1F_MapWarps: - warp_def 6, 8, 3, 4, 773 - warp_def 7, 8, 3, 4, 773 - warp_def 8, 8, 3, 4, 773 - warp_def 1, 6, 4, 0, 2306 - -VermilionCity_PokemonCenter_1F_MapEvents:: - map_events VermilionCity_PokemonCenter_1F_EventObjects, VermilionCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/VermilionCity_PokemonCenter_1F/header.inc b/data/maps/VermilionCity_PokemonCenter_1F/header.inc deleted file mode 100644 index 4f6333c60..000000000 --- a/data/maps/VermilionCity_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -VermilionCity_PokemonCenter_1F:: @ 8351124 - .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte VermilionCity_PokemonCenter_1F_MapEvents @ 0x83BAC48 - .4byte VermilionCity_PokemonCenter_1F_MapScripts @ 0x816B424 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 8 - .byte 0x5d, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/VermilionCity_PokemonCenter_1F/map.json b/data/maps/VermilionCity_PokemonCenter_1F/map.json new file mode 100644 index 000000000..c1f76237e --- /dev/null +++ b/data/maps/VermilionCity_PokemonCenter_1F/map.json @@ -0,0 +1,140 @@ +{ + "id": "MAP_VERMILION_CITY_POKEMON_CENTER_1F", + "name": "VermilionCity_PokemonCenter_1F", + "layout": "LAYOUT_POKEMON_CENTER_1F", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_VERMILION_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "64", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VermilionCity_PokemonCenter_1F_EventScript_16B433", + "flag": "0" + }, + { + "graphics_id": "25", + "x": 4, + "y": 8, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VermilionCity_PokemonCenter_1F_EventScript_16B43C", + "flag": "0" + }, + { + "graphics_id": "56", + "x": 12, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VermilionCity_PokemonCenter_1F_EventScript_16B445", + "flag": "0" + }, + { + "graphics_id": "18", + "x": 14, + "y": 4, + "elevation": 3, + "movement_type": "3", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VermilionCity_PokemonCenter_1F_EventScript_16B44E", + "flag": "0" + }, + { + "graphics_id": "42", + "x": 6, + "y": 4, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VermilionCity_PokemonCenter_1F_EventScript_1A8D08", + "flag": "0" + }, + { + "graphics_id": "0", + "x": 2, + "y": 1, + "elevation": 0, + "movement_type": "76", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VermilionCity_PokemonCenter_1F_EventScript_1ACE83", + "flag": "160" + }, + { + "graphics_id": "0", + "x": 3, + "y": 1, + "elevation": 0, + "movement_type": "76", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VermilionCity_PokemonCenter_1F_EventScript_1ACE83", + "flag": "160" + } + ], + "warp_events": [ + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_VERMILION_CITY", + "dest_warp_id": 4 + }, + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_VERMILION_CITY", + "dest_warp_id": 4 + }, + { + "x": 8, + "y": 8, + "elevation": 3, + "dest_map": "MAP_VERMILION_CITY", + "dest_warp_id": 4 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_VERMILION_CITY_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/VermilionCity_PokemonCenter_2F/events.inc b/data/maps/VermilionCity_PokemonCenter_2F/events.inc deleted file mode 100644 index eca0aaf89..000000000 --- a/data/maps/VermilionCity_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -VermilionCity_PokemonCenter_2F_EventObjects: - object_event 1, 65, 0, 6, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, VermilionCity_PokemonCenter_2F_EventScript_1A8CF6, 0, 0, 0 - object_event 2, 65, 0, 2, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, VermilionCity_PokemonCenter_2F_EventScript_1A8CFC, 0, 0, 0 - object_event 3, 65, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, VermilionCity_PokemonCenter_2F_EventScript_1A8D02, 0, 0, 0 - object_event 4, 69, 0, 1, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, VermilionCity_PokemonCenter_2F_EventScript_1BB1D2, 112, 0, 0 - -VermilionCity_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 3, 2305 - warp_def 5, 1, 0, 0, 4 - warp_def 9, 1, 0, 0, 1 - -VermilionCity_PokemonCenter_2F_MapEvents:: - map_events VermilionCity_PokemonCenter_2F_EventObjects, VermilionCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/VermilionCity_PokemonCenter_2F/header.inc b/data/maps/VermilionCity_PokemonCenter_2F/header.inc deleted file mode 100644 index 7cb7acc59..000000000 --- a/data/maps/VermilionCity_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -VermilionCity_PokemonCenter_2F:: @ 8351140 - .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte VermilionCity_PokemonCenter_2F_MapEvents @ 0x83BACD4 - .4byte VermilionCity_PokemonCenter_2F_MapScripts @ 0x816B457 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 9 - .byte 0x5d, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/VermilionCity_PokemonCenter_2F/map.json b/data/maps/VermilionCity_PokemonCenter_2F/map.json new file mode 100644 index 000000000..942ef3885 --- /dev/null +++ b/data/maps/VermilionCity_PokemonCenter_2F/map.json @@ -0,0 +1,94 @@ +{ + "id": "MAP_VERMILION_CITY_POKEMON_CENTER_2F", + "name": "VermilionCity_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_VERMILION_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "65", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VermilionCity_PokemonCenter_2F_EventScript_1A8CF6", + "flag": "0" + }, + { + "graphics_id": "65", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VermilionCity_PokemonCenter_2F_EventScript_1A8CFC", + "flag": "0" + }, + { + "graphics_id": "65", + "x": 10, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VermilionCity_PokemonCenter_2F_EventScript_1A8D02", + "flag": "0" + }, + { + "graphics_id": "69", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VermilionCity_PokemonCenter_2F_EventScript_1BB1D2", + "flag": "112" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_VERMILION_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 3 + }, + { + "x": 5, + "y": 1, + "elevation": 0, + "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 0, + "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/VermilionCity_PokemonFanClub/events.inc b/data/maps/VermilionCity_PokemonFanClub/events.inc deleted file mode 100644 index 6f4a7f4b1..000000000 --- a/data/maps/VermilionCity_PokemonFanClub/events.inc +++ /dev/null @@ -1,19 +0,0 @@ -VermilionCity_PokemonFanClub_EventObjects: - object_event 1, 61, 0, 5, 0, 4, 0, 4, 8, 17, 0, 0, 0, 0, 0, VermilionCity_PokemonFanClub_EventScript_16B47F, 0, 0, 0 - object_event 2, 48, 0, 6, 0, 4, 0, 4, 8, 17, 0, 0, 0, 0, 0, VermilionCity_PokemonFanClub_EventScript_16B4FC, 0, 0, 0 - object_event 3, 120, 0, 7, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, VermilionCity_PokemonFanClub_EventScript_16B59E, 0, 0, 0 - object_event 4, 126, 0, 4, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, VermilionCity_PokemonFanClub_EventScript_16B5B1, 0, 0, 0 - object_event 5, 23, 0, 4, 0, 5, 0, 0, 8, 17, 0, 0, 0, 0, 0, VermilionCity_PokemonFanClub_EventScript_16B528, 0, 0, 0 - object_event 6, 27, 0, 7, 0, 5, 0, 0, 8, 17, 0, 0, 0, 0, 0, VermilionCity_PokemonFanClub_EventScript_16B563, 0, 0, 0 - -VermilionCity_PokemonFanClub_MapWarps: - warp_def 4, 10, 3, 5, 773 - warp_def 5, 10, 3, 5, 773 - warp_def 6, 10, 3, 5, 773 - -VermilionCity_PokemonFanClub_MapBGEvents: - bg_event 2, 1, 0, 0, 0, VermilionCity_PokemonFanClub_EventScript_16B5C4 - bg_event 9, 1, 0, 0, 0, VermilionCity_PokemonFanClub_EventScript_16B5CD - -VermilionCity_PokemonFanClub_MapEvents:: - map_events VermilionCity_PokemonFanClub_EventObjects, VermilionCity_PokemonFanClub_MapWarps, 0x0, VermilionCity_PokemonFanClub_MapBGEvents diff --git a/data/maps/VermilionCity_PokemonFanClub/header.inc b/data/maps/VermilionCity_PokemonFanClub/header.inc deleted file mode 100644 index 930f0d08f..000000000 --- a/data/maps/VermilionCity_PokemonFanClub/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -VermilionCity_PokemonFanClub:: @ 835115C - .4byte VermilionCity_PokemonFanClub_Layout @ 0x833ABC8 - .4byte VermilionCity_PokemonFanClub_MapEvents @ 0x83BADA8 - .4byte VermilionCity_PokemonFanClub_MapScripts @ 0x816B47E - .4byte NULL - .2byte BGM_FRLG_VERMILION_CITY - .2byte 273 - .byte 0x5d, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/VermilionCity_PokemonFanClub/map.json b/data/maps/VermilionCity_PokemonFanClub/map.json new file mode 100644 index 000000000..4be1c66f0 --- /dev/null +++ b/data/maps/VermilionCity_PokemonFanClub/map.json @@ -0,0 +1,135 @@ +{ + "id": "MAP_VERMILION_CITY_POKEMON_FAN_CLUB", + "name": "VermilionCity_PokemonFanClub", + "layout": "LAYOUT_VERMILION_CITY_POKEMON_FAN_CLUB", + "music": "BGM_FRLG_VERMILION_CITY", + "region_map_section": "MAPSEC_VERMILION_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "61", + "x": 5, + "y": 4, + "elevation": 4, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VermilionCity_PokemonFanClub_EventScript_16B47F", + "flag": "0" + }, + { + "graphics_id": "48", + "x": 6, + "y": 4, + "elevation": 4, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VermilionCity_PokemonFanClub_EventScript_16B4FC", + "flag": "0" + }, + { + "graphics_id": "120", + "x": 7, + "y": 6, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VermilionCity_PokemonFanClub_EventScript_16B59E", + "flag": "0" + }, + { + "graphics_id": "126", + "x": 4, + "y": 6, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VermilionCity_PokemonFanClub_EventScript_16B5B1", + "flag": "0" + }, + { + "graphics_id": "23", + "x": 4, + "y": 5, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VermilionCity_PokemonFanClub_EventScript_16B528", + "flag": "0" + }, + { + "graphics_id": "27", + "x": 7, + "y": 5, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VermilionCity_PokemonFanClub_EventScript_16B563", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 10, + "elevation": 3, + "dest_map": "MAP_VERMILION_CITY", + "dest_warp_id": 5 + }, + { + "x": 5, + "y": 10, + "elevation": 3, + "dest_map": "MAP_VERMILION_CITY", + "dest_warp_id": 5 + }, + { + "x": 6, + "y": 10, + "elevation": 3, + "dest_map": "MAP_VERMILION_CITY", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 2, + "y": 1, + "elevation": 0, + "script": "VermilionCity_PokemonFanClub_EventScript_16B5C4" + }, + { + "type": "bg_event_type_0", + "x": 9, + "y": 1, + "elevation": 0, + "script": "VermilionCity_PokemonFanClub_EventScript_16B5CD" + } + ] +} \ No newline at end of file diff --git a/data/maps/VictoryRoad_1F/events.inc b/data/maps/VictoryRoad_1F/events.inc deleted file mode 100644 index 1c5c17cb1..000000000 --- a/data/maps/VictoryRoad_1F/events.inc +++ /dev/null @@ -1,22 +0,0 @@ -VictoryRoad_1F_EventObjects: - object_event 1, 41, 0, 5, 0, 2, 0, 3, 8, 17, 0, 1, 0, 4, 0, VictoryRoad_1F_EventScript_160F7B, 0, 0, 0 - object_event 2, 42, 0, 14, 0, 6, 0, 4, 8, 17, 0, 1, 0, 4, 0, VictoryRoad_1F_EventScript_160F64, 0, 0, 0 - object_event 3, 92, 0, 12, 0, 3, 0, 3, 8, 17, 0, 0, 0, 0, 0, VictoryRoad_1F_EventScript_1BE9D2, 425, 0, 0 - object_event 4, 92, 0, 14, 0, 1, 0, 3, 8, 17, 0, 0, 0, 0, 0, VictoryRoad_1F_EventScript_1BE9DF, 426, 0, 0 - object_event 5, 97, 0, 7, 0, 18, 0, 3, 8, 0, 0, 0, 0, 0, 0, VictoryRoad_1F_EventScript_1BE11D, 0, 0, 0 - object_event 6, 97, 0, 4, 0, 12, 0, 3, 8, 0, 0, 0, 0, 0, 0, VictoryRoad_1F_EventScript_1BE11D, 0, 0, 0 - object_event 7, 97, 0, 16, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, VictoryRoad_1F_EventScript_1BE11D, 0, 0, 0 - -VictoryRoad_1F_MapWarps: - warp_def 3, 2, 3, 0, 296 - warp_def 11, 20, 3, 0, 810 - -VictoryRoad_1F_MapCoordEvents: - coord_event 20, 16, 3, 0, 16484, 99, 0, VictoryRoad_1F_EventScript_160F33 - -VictoryRoad_1F_MapBGEvents: - bg_event 12, 12, 0, 7, 0, 2, 37, 1 - bg_event 16, 1, 0, 7, 0, 19, 38, 1 - -VictoryRoad_1F_MapEvents:: - map_events VictoryRoad_1F_EventObjects, VictoryRoad_1F_MapWarps, VictoryRoad_1F_MapCoordEvents, VictoryRoad_1F_MapBGEvents diff --git a/data/maps/VictoryRoad_1F/header.inc b/data/maps/VictoryRoad_1F/header.inc deleted file mode 100644 index 8c6c1c85c..000000000 --- a/data/maps/VictoryRoad_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -VictoryRoad_1F:: @ 834F658 - .4byte VictoryRoad_1F_Layout @ 0x83043CC - .4byte VictoryRoad_1F_MapEvents @ 0x83AF5C0 - .4byte VictoryRoad_1F_MapScripts @ 0x8160F05 - .4byte NULL - .2byte BGM_FRLG_MT_MOON - .2byte 125 - .byte 0x84, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/VictoryRoad_1F/map.json b/data/maps/VictoryRoad_1F/map.json new file mode 100644 index 000000000..fae861a3e --- /dev/null +++ b/data/maps/VictoryRoad_1F/map.json @@ -0,0 +1,155 @@ +{ + "id": "MAP_VICTORY_ROAD_1F", + "name": "VictoryRoad_1F", + "layout": "LAYOUT_VICTORY_ROAD_1F", + "music": "BGM_FRLG_MT_MOON", + "region_map_section": "MAPSEC_KANTO_VICTORY_ROAD", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "41", + "x": 5, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "VictoryRoad_1F_EventScript_160F7B", + "flag": "0" + }, + { + "graphics_id": "42", + "x": 14, + "y": 6, + "elevation": 4, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "VictoryRoad_1F_EventScript_160F64", + "flag": "0" + }, + { + "graphics_id": "92", + "x": 12, + "y": 3, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_1F_EventScript_1BE9D2", + "flag": "425" + }, + { + "graphics_id": "92", + "x": 14, + "y": 1, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_1F_EventScript_1BE9DF", + "flag": "426" + }, + { + "graphics_id": "97", + "x": 7, + "y": 18, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_1F_EventScript_1BE11D", + "flag": "0" + }, + { + "graphics_id": "97", + "x": 4, + "y": 12, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_1F_EventScript_1BE11D", + "flag": "0" + }, + { + "graphics_id": "97", + "x": 16, + "y": 3, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_1F_EventScript_1BE11D", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 2, + "elevation": 3, + "dest_map": "MAP_VICTORY_ROAD_2F", + "dest_warp_id": 0 + }, + { + "x": 11, + "y": 20, + "elevation": 3, + "dest_map": "MAP_ROUTE23", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 20, + "y": 16, + "elevation": 3, + "var": "VAR_0x4064", + "var_value": 99, + "script": "VictoryRoad_1F_EventScript_160F33" + } + ], + "bg_events": [ + { + "type": "hidden_item", + "x": 12, + "y": 12, + "elevation": 0, + "item": "POCKET_KEY_ITEMS", + "flag": "37", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 16, + "y": 1, + "elevation": 0, + "item": "ITEM_FULL_RESTORE", + "flag": "38", + "unknown": 1 + } + ] +} \ No newline at end of file diff --git a/data/maps/VictoryRoad_2F/events.inc b/data/maps/VictoryRoad_2F/events.inc deleted file mode 100644 index 67e5fa5f5..000000000 --- a/data/maps/VictoryRoad_2F/events.inc +++ /dev/null @@ -1,32 +0,0 @@ -VictoryRoad_2F_EventObjects: - object_event 1, 52, 0, 7, 0, 4, 0, 3, 8, 17, 0, 1, 0, 1, 0, VictoryRoad_2F_EventScript_161037, 0, 0, 0 - object_event 2, 54, 0, 20, 0, 11, 0, 4, 17, 17, 0, 1, 0, 4, 0, VictoryRoad_2F_EventScript_16104E, 0, 0, 0 - object_event 3, 26, 0, 31, 0, 16, 0, 4, 9, 17, 0, 1, 0, 4, 0, VictoryRoad_2F_EventScript_161065, 0, 0, 0 - object_event 4, 25, 0, 26, 0, 6, 0, 3, 40, 68, 0, 1, 0, 1, 0, VictoryRoad_2F_EventScript_161093, 0, 0, 0 - object_event 5, 26, 0, 36, 0, 5, 0, 3, 7, 17, 0, 1, 0, 3, 0, VictoryRoad_2F_EventScript_16107C, 0, 0, 0 - object_event 6, 92, 0, 17, 0, 6, 0, 3, 8, 17, 0, 0, 0, 0, 0, VictoryRoad_2F_EventScript_1BE9EC, 427, 0, 0 - object_event 7, 92, 0, 40, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, VictoryRoad_2F_EventScript_1BE9F9, 428, 0, 0 - object_event 8, 92, 0, 25, 0, 13, 0, 3, 8, 17, 0, 0, 0, 0, 0, VictoryRoad_2F_EventScript_1BEA06, 429, 0, 0 - object_event 9, 92, 0, 14, 0, 13, 0, 3, 8, 17, 0, 0, 0, 0, 0, VictoryRoad_2F_EventScript_1BEA13, 430, 0, 0 - object_event 10, 97, 0, 8, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, VictoryRoad_2F_EventScript_1BE11D, 0, 0, 0 - object_event 11, 97, 0, 6, 0, 17, 0, 3, 8, 0, 0, 0, 0, 0, 0, VictoryRoad_2F_EventScript_1BE11D, 0, 0, 0 - object_event 12, 97, 0, 33, 0, 19, 0, 3, 8, 0, 0, 0, 0, 0, 0, VictoryRoad_2F_EventScript_1BE11D, 88, 0, 0 - object_event 13, 41, 0, 40, 0, 9, 0, 3, 8, 17, 0, 0, 0, 0, 0, VictoryRoad_2F_EventScript_1C47AE, 0, 0, 0 - -VictoryRoad_2F_MapWarps: - warp_def 1, 9, 3, 0, 295 - warp_def 3, 3, 3, 0, 297 - warp_def 34, 9, 3, 1, 297 - warp_def 38, 9, 3, 2, 297 - warp_def 36, 17, 4, 3, 297 - warp_def 49, 13, 0, 1, 810 - warp_def 48, 12, 3, 1, 810 - warp_def 47, 13, 0, 1, 810 - warp_def 34, 19, 3, 4, 297 - -VictoryRoad_2F_MapCoordEvents: - coord_event 2, 19, 3, 0, 16485, 99, 0, VictoryRoad_2F_EventScript_160FD5 - coord_event 14, 19, 3, 0, 16486, 99, 0, VictoryRoad_2F_EventScript_161006 - -VictoryRoad_2F_MapEvents:: - map_events VictoryRoad_2F_EventObjects, VictoryRoad_2F_MapWarps, VictoryRoad_2F_MapCoordEvents, 0x0 diff --git a/data/maps/VictoryRoad_2F/header.inc b/data/maps/VictoryRoad_2F/header.inc deleted file mode 100644 index 5c1c06256..000000000 --- a/data/maps/VictoryRoad_2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -VictoryRoad_2F:: @ 834F674 - .4byte VictoryRoad_2F_Layout @ 0x8304CB4 - .4byte VictoryRoad_2F_MapEvents @ 0x83AF774 - .4byte VictoryRoad_2F_MapScripts @ 0x8160F92 - .4byte NULL - .2byte BGM_FRLG_MT_MOON - .2byte 126 - .byte 0x84, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/VictoryRoad_2F/map.json b/data/maps/VictoryRoad_2F/map.json new file mode 100644 index 000000000..6a0ba1819 --- /dev/null +++ b/data/maps/VictoryRoad_2F/map.json @@ -0,0 +1,272 @@ +{ + "id": "MAP_VICTORY_ROAD_2F", + "name": "VictoryRoad_2F", + "layout": "LAYOUT_VICTORY_ROAD_2F", + "music": "BGM_FRLG_MT_MOON", + "region_map_section": "MAPSEC_KANTO_VICTORY_ROAD", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "52", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "VictoryRoad_2F_EventScript_161037", + "flag": "0" + }, + { + "graphics_id": "54", + "x": 20, + "y": 11, + "elevation": 4, + "movement_type": "17", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "VictoryRoad_2F_EventScript_16104E", + "flag": "0" + }, + { + "graphics_id": "26", + "x": 31, + "y": 16, + "elevation": 4, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "VictoryRoad_2F_EventScript_161065", + "flag": "0" + }, + { + "graphics_id": "25", + "x": 26, + "y": 6, + "elevation": 3, + "movement_type": "40", + "movement_range_x": 4, + "movement_range_y": 4, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "VictoryRoad_2F_EventScript_161093", + "flag": "0" + }, + { + "graphics_id": "26", + "x": 36, + "y": 5, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "VictoryRoad_2F_EventScript_16107C", + "flag": "0" + }, + { + "graphics_id": "92", + "x": 17, + "y": 6, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_2F_EventScript_1BE9EC", + "flag": "427" + }, + { + "graphics_id": "92", + "x": 40, + "y": 7, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_2F_EventScript_1BE9F9", + "flag": "428" + }, + { + "graphics_id": "92", + "x": 25, + "y": 13, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_2F_EventScript_1BEA06", + "flag": "429" + }, + { + "graphics_id": "92", + "x": 14, + "y": 13, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_2F_EventScript_1BEA13", + "flag": "430" + }, + { + "graphics_id": "97", + "x": 8, + "y": 7, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_2F_EventScript_1BE11D", + "flag": "0" + }, + { + "graphics_id": "97", + "x": 6, + "y": 17, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_2F_EventScript_1BE11D", + "flag": "0" + }, + { + "graphics_id": "97", + "x": 33, + "y": 19, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_2F_EventScript_1BE11D", + "flag": "88" + }, + { + "graphics_id": "41", + "x": 40, + "y": 9, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_2F_EventScript_1C47AE", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 1, + "y": 9, + "elevation": 3, + "dest_map": "MAP_VICTORY_ROAD_1F", + "dest_warp_id": 0 + }, + { + "x": 3, + "y": 3, + "elevation": 3, + "dest_map": "MAP_VICTORY_ROAD_3F", + "dest_warp_id": 0 + }, + { + "x": 34, + "y": 9, + "elevation": 3, + "dest_map": "MAP_VICTORY_ROAD_3F", + "dest_warp_id": 1 + }, + { + "x": 38, + "y": 9, + "elevation": 3, + "dest_map": "MAP_VICTORY_ROAD_3F", + "dest_warp_id": 2 + }, + { + "x": 36, + "y": 17, + "elevation": 4, + "dest_map": "MAP_VICTORY_ROAD_3F", + "dest_warp_id": 3 + }, + { + "x": 49, + "y": 13, + "elevation": 0, + "dest_map": "MAP_ROUTE23", + "dest_warp_id": 1 + }, + { + "x": 48, + "y": 12, + "elevation": 3, + "dest_map": "MAP_ROUTE23", + "dest_warp_id": 1 + }, + { + "x": 47, + "y": 13, + "elevation": 0, + "dest_map": "MAP_ROUTE23", + "dest_warp_id": 1 + }, + { + "x": 34, + "y": 19, + "elevation": 3, + "dest_map": "MAP_VICTORY_ROAD_3F", + "dest_warp_id": 4 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 2, + "y": 19, + "elevation": 3, + "var": "VAR_0x4065", + "var_value": 99, + "script": "VictoryRoad_2F_EventScript_160FD5" + }, + { + "type": "trigger", + "x": 14, + "y": 19, + "elevation": 3, + "var": "VAR_0x4066", + "var_value": 99, + "script": "VictoryRoad_2F_EventScript_161006" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/VictoryRoad_3F/events.inc b/data/maps/VictoryRoad_3F/events.inc deleted file mode 100644 index dfac9f3ce..000000000 --- a/data/maps/VictoryRoad_3F/events.inc +++ /dev/null @@ -1,26 +0,0 @@ -VictoryRoad_3F_EventObjects: - object_event 1, 41, 0, 40, 0, 7, 0, 3, 9, 17, 0, 1, 0, 1, 0, VictoryRoad_3F_EventScript_161103, 0, 0, 0 - object_event 2, 42, 0, 21, 0, 5, 0, 4, 10, 17, 0, 1, 0, 4, 0, VictoryRoad_3F_EventScript_161148, 0, 0, 0 - object_event 3, 41, 0, 10, 0, 17, 0, 3, 9, 17, 0, 1, 0, 5, 0, VictoryRoad_3F_EventScript_16111A, 0, 0, 0 - object_event 4, 42, 0, 11, 0, 16, 0, 3, 10, 17, 0, 1, 0, 5, 0, VictoryRoad_3F_EventScript_161131, 0, 0, 0 - object_event 5, 92, 0, 38, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, VictoryRoad_3F_EventScript_1BEA20, 431, 0, 0 - object_event 6, 92, 0, 12, 0, 9, 0, 3, 8, 17, 0, 0, 0, 0, 0, VictoryRoad_3F_EventScript_1BEA2D, 432, 0, 0 - object_event 7, 97, 0, 19, 0, 15, 0, 3, 8, 0, 0, 0, 0, 0, 0, VictoryRoad_3F_EventScript_1BE11D, 0, 0, 0 - object_event 8, 97, 0, 33, 0, 18, 0, 0, 8, 0, 0, 88, 0, 0, 0, VictoryRoad_3F_EventScript_1BE11D, 89, 0, 0 - object_event 9, 97, 0, 35, 0, 13, 0, 3, 8, 0, 0, 0, 0, 0, 0, VictoryRoad_3F_EventScript_1BE11D, 0, 0, 0 - object_event 10, 97, 0, 32, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, VictoryRoad_3F_EventScript_1BE11D, 0, 0, 0 - object_event 11, 41, 0, 38, 0, 13, 0, 3, 8, 17, 0, 1, 0, 1, 0, VictoryRoad_3F_EventScript_16115F, 0, 0, 0 - object_event 12, 42, 0, 39, 0, 13, 0, 3, 8, 17, 0, 1, 0, 1, 0, VictoryRoad_3F_EventScript_16117A, 0, 0, 0 - -VictoryRoad_3F_MapWarps: - warp_def 5, 2, 3, 1, 296 - warp_def 34, 9, 3, 2, 296 - warp_def 37, 10, 3, 3, 296 - warp_def 39, 17, 3, 4, 296 - warp_def 34, 18, 3, 8, 296 - -VictoryRoad_3F_MapCoordEvents: - coord_event 7, 7, 3, 0, 16487, 99, 0, VictoryRoad_3F_EventScript_1610CF - -VictoryRoad_3F_MapEvents:: - map_events VictoryRoad_3F_EventObjects, VictoryRoad_3F_MapWarps, VictoryRoad_3F_MapCoordEvents, 0x0 diff --git a/data/maps/VictoryRoad_3F/header.inc b/data/maps/VictoryRoad_3F/header.inc deleted file mode 100644 index 85fb25b59..000000000 --- a/data/maps/VictoryRoad_3F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -VictoryRoad_3F:: @ 834F690 - .4byte VictoryRoad_3F_Layout @ 0x8305494 - .4byte VictoryRoad_3F_MapEvents @ 0x83AF8E0 - .4byte VictoryRoad_3F_MapScripts @ 0x81610AA - .4byte NULL - .2byte BGM_FRLG_MT_MOON - .2byte 127 - .byte 0x84, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/VictoryRoad_3F/map.json b/data/maps/VictoryRoad_3F/map.json new file mode 100644 index 000000000..78a5c1b4e --- /dev/null +++ b/data/maps/VictoryRoad_3F/map.json @@ -0,0 +1,222 @@ +{ + "id": "MAP_VICTORY_ROAD_3F", + "name": "VictoryRoad_3F", + "layout": "LAYOUT_VICTORY_ROAD_3F", + "music": "BGM_FRLG_MT_MOON", + "region_map_section": "MAPSEC_KANTO_VICTORY_ROAD", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_4", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "41", + "x": 40, + "y": 7, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "VictoryRoad_3F_EventScript_161103", + "flag": "0" + }, + { + "graphics_id": "42", + "x": 21, + "y": 5, + "elevation": 4, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "VictoryRoad_3F_EventScript_161148", + "flag": "0" + }, + { + "graphics_id": "41", + "x": 10, + "y": 17, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "VictoryRoad_3F_EventScript_16111A", + "flag": "0" + }, + { + "graphics_id": "42", + "x": 11, + "y": 16, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "VictoryRoad_3F_EventScript_161131", + "flag": "0" + }, + { + "graphics_id": "92", + "x": 38, + "y": 7, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_3F_EventScript_1BEA20", + "flag": "431" + }, + { + "graphics_id": "92", + "x": 12, + "y": 9, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_3F_EventScript_1BEA2D", + "flag": "432" + }, + { + "graphics_id": "97", + "x": 19, + "y": 15, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_3F_EventScript_1BE11D", + "flag": "0" + }, + { + "graphics_id": "97", + "x": 33, + "y": 18, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 88, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_3F_EventScript_1BE11D", + "flag": "89" + }, + { + "graphics_id": "97", + "x": 35, + "y": 13, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_3F_EventScript_1BE11D", + "flag": "0" + }, + { + "graphics_id": "97", + "x": 32, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_3F_EventScript_1BE11D", + "flag": "0" + }, + { + "graphics_id": "41", + "x": 38, + "y": 13, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "VictoryRoad_3F_EventScript_16115F", + "flag": "0" + }, + { + "graphics_id": "42", + "x": 39, + "y": 13, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "VictoryRoad_3F_EventScript_16117A", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 5, + "y": 2, + "elevation": 3, + "dest_map": "MAP_VICTORY_ROAD_2F", + "dest_warp_id": 1 + }, + { + "x": 34, + "y": 9, + "elevation": 3, + "dest_map": "MAP_VICTORY_ROAD_2F", + "dest_warp_id": 2 + }, + { + "x": 37, + "y": 10, + "elevation": 3, + "dest_map": "MAP_VICTORY_ROAD_2F", + "dest_warp_id": 3 + }, + { + "x": 39, + "y": 17, + "elevation": 3, + "dest_map": "MAP_VICTORY_ROAD_2F", + "dest_warp_id": 4 + }, + { + "x": 34, + "y": 18, + "elevation": 3, + "dest_map": "MAP_VICTORY_ROAD_2F", + "dest_warp_id": 8 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 7, + "y": 7, + "elevation": 3, + "var": "VAR_0x4067", + "var_value": 99, + "script": "VictoryRoad_3F_EventScript_1610CF" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/ViridianCity/connections.inc b/data/maps/ViridianCity/connections.inc deleted file mode 100644 index 580e6a4bd..000000000 --- a/data/maps/ViridianCity/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -ViridianCity_MapConnectionsList: @ 8352774 - connection up, 12, MAP_ROUTE2 - connection down, 12, MAP_ROUTE1 - connection left, 10, MAP_ROUTE22 - -ViridianCity_MapConnections:: @ 8352798 - .4byte 3 - .4byte ViridianCity_MapConnectionsList diff --git a/data/maps/ViridianCity/events.inc b/data/maps/ViridianCity/events.inc deleted file mode 100644 index ec87ad511..000000000 --- a/data/maps/ViridianCity/events.inc +++ /dev/null @@ -1,33 +0,0 @@ -ViridianCity_EventObjects: - object_event 1, 27, 0, 8, 0, 26, 0, 3, 8, 0, 0, 0, 0, 0, 0, ViridianCity_EventScript_165AF0, 0, 0, 0 - object_event 2, 95, 0, 11, 0, 24, 0, 3, 8, 17, 0, 0, 0, 0, 0, ViridianCity_EventScript_1BDF13, 17, 0, 0 - object_event 3, 32, 0, 34, 0, 11, 0, 3, 7, 0, 0, 0, 0, 0, 0, ViridianCity_EventScript_1659CA, 0, 0, 0 - object_event 4, 240, 0, 21, 0, 6, 0, 3, 1, 50, 0, 0, 0, 0, 0, ViridianCity_EventScript_1659F6, 0, 0, 0 - object_event 5, 31, 0, 20, 0, 12, 0, 3, 7, 49, 0, 0, 0, 0, 0, ViridianCity_EventScript_165AC4, 0, 0, 0 - object_event 6, 18, 0, 33, 0, 26, 0, 3, 3, 32, 0, 0, 0, 0, 0, ViridianCity_EventScript_165A8F, 0, 0, 0 - object_event 7, 19, 0, 16, 0, 22, 0, 3, 2, 33, 0, 0, 0, 0, 0, ViridianCity_EventScript_1659C1, 0, 0, 0 - object_event 8, 95, 0, 18, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, ViridianCity_EventScript_1BDF13, 18, 0, 0 - object_event 9, 92, 0, 17, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, ViridianCity_EventScript_1BEB8C, 461, 0, 0 - -ViridianCity_MapWarps: - warp_def 26, 26, 0, 1, 1284 - warp_def 25, 11, 3, 1, 1280 - warp_def 36, 10, 0, 1, 1281 - warp_def 25, 18, 0, 1, 1282 - warp_def 36, 19, 0, 1, 1283 - -ViridianCity_MapCoordEvents: - coord_event 22, 11, 3, 0, 16465, 0, 0, ViridianCity_EventScript_165AF6 - coord_event 36, 11, 3, 0, 16474, 0, 0, ViridianCity_EventScript_16596D - coord_event 20, 8, 3, 0, 16465, 1, 0, ViridianCity_EventScript_165B10 - coord_event 22, 8, 3, 0, 16465, 1, 0, ViridianCity_EventScript_165B2E - -ViridianCity_MapBGEvents: - bg_event 23, 1, 3, 0, 0, ViridianCity_EventScript_16599D - bg_event 32, 10, 0, 0, 0, ViridianCity_EventScript_1659AF - bg_event 20, 31, 0, 0, 0, ViridianCity_EventScript_1659A6 - bg_event 20, 16, 0, 0, 0, ViridianCity_EventScript_165994 - bg_event 36, 10, 0, 0, 0, ViridianCity_EventScript_1659B8 - -ViridianCity_MapEvents:: - map_events ViridianCity_EventObjects, ViridianCity_MapWarps, ViridianCity_MapCoordEvents, ViridianCity_MapBGEvents diff --git a/data/maps/ViridianCity/header.inc b/data/maps/ViridianCity/header.inc deleted file mode 100644 index 6c027f11f..000000000 --- a/data/maps/ViridianCity/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -ViridianCity:: @ 8350634 - .4byte ViridianCity_Layout @ 0x82DE3E4 - .4byte ViridianCity_MapEvents @ 0x83B4FE0 - .4byte ViridianCity_MapScripts @ 0x81658D3 - .4byte ViridianCity_MapConnections @ 0x8352798 - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 79 - .byte 0x59, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00 diff --git a/data/maps/ViridianCity/map.json b/data/maps/ViridianCity/map.json new file mode 100644 index 000000000..5c15a8364 --- /dev/null +++ b/data/maps/ViridianCity/map.json @@ -0,0 +1,262 @@ +{ + "id": "MAP_VIRIDIAN_CITY", + "name": "ViridianCity", + "layout": "LAYOUT_VIRIDIAN_CITY", + "music": "BGM_FRLG_VIRIDIAN_CITY", + "region_map_section": "MAPSEC_VIRIDIAN_CITY", + "requires_flash": false, + "weather": "WEATHER_2", + "map_type": "MAP_TYPE_1", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_ROUTE2", + "offset": 12, + "direction": "up" + }, + { + "map": "MAP_ROUTE1", + "offset": 12, + "direction": "down" + }, + { + "map": "MAP_ROUTE22", + "offset": 10, + "direction": "left" + } + ], + "object_events": [ + { + "graphics_id": "27", + "x": 8, + "y": 26, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ViridianCity_EventScript_165AF0", + "flag": "0" + }, + { + "graphics_id": "95", + "x": 11, + "y": 24, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ViridianCity_EventScript_1BDF13", + "flag": "17" + }, + { + "graphics_id": "32", + "x": 34, + "y": 11, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ViridianCity_EventScript_1659CA", + "flag": "0" + }, + { + "graphics_id": "240", + "x": 21, + "y": 6, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 2, + "movement_range_y": 3, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ViridianCity_EventScript_1659F6", + "flag": "0" + }, + { + "graphics_id": "31", + "x": 20, + "y": 12, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 3, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ViridianCity_EventScript_165AC4", + "flag": "0" + }, + { + "graphics_id": "18", + "x": 33, + "y": 26, + "elevation": 3, + "movement_type": "3", + "movement_range_x": 0, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ViridianCity_EventScript_165A8F", + "flag": "0" + }, + { + "graphics_id": "19", + "x": 16, + "y": 22, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ViridianCity_EventScript_1659C1", + "flag": "0" + }, + { + "graphics_id": "95", + "x": 18, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ViridianCity_EventScript_1BDF13", + "flag": "18" + }, + { + "graphics_id": "92", + "x": 17, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ViridianCity_EventScript_1BEB8C", + "flag": "461" + } + ], + "warp_events": [ + { + "x": 26, + "y": 26, + "elevation": 0, + "dest_map": "MAP_VIRIDIAN_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 1 + }, + { + "x": 25, + "y": 11, + "elevation": 3, + "dest_map": "MAP_VIRIDIAN_CITY_HOUSE1", + "dest_warp_id": 1 + }, + { + "x": 36, + "y": 10, + "elevation": 0, + "dest_map": "MAP_VIRIDIAN_CITY_GYM", + "dest_warp_id": 1 + }, + { + "x": 25, + "y": 18, + "elevation": 0, + "dest_map": "MAP_VIRIDIAN_CITY_HOUSE2", + "dest_warp_id": 1 + }, + { + "x": 36, + "y": 19, + "elevation": 0, + "dest_map": "MAP_VIRIDIAN_CITY_MART", + "dest_warp_id": 1 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 22, + "y": 11, + "elevation": 3, + "var": "VAR_0x4051", + "var_value": 0, + "script": "ViridianCity_EventScript_165AF6" + }, + { + "type": "trigger", + "x": 36, + "y": 11, + "elevation": 3, + "var": "VAR_0x405A", + "var_value": 0, + "script": "ViridianCity_EventScript_16596D" + }, + { + "type": "trigger", + "x": 20, + "y": 8, + "elevation": 3, + "var": "VAR_0x4051", + "var_value": 1, + "script": "ViridianCity_EventScript_165B10" + }, + { + "type": "trigger", + "x": 22, + "y": 8, + "elevation": 3, + "var": "VAR_0x4051", + "var_value": 1, + "script": "ViridianCity_EventScript_165B2E" + } + ], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 23, + "y": 1, + "elevation": 3, + "script": "ViridianCity_EventScript_16599D" + }, + { + "type": "bg_event_type_0", + "x": 32, + "y": 10, + "elevation": 0, + "script": "ViridianCity_EventScript_1659AF" + }, + { + "type": "bg_event_type_0", + "x": 20, + "y": 31, + "elevation": 0, + "script": "ViridianCity_EventScript_1659A6" + }, + { + "type": "bg_event_type_0", + "x": 20, + "y": 16, + "elevation": 0, + "script": "ViridianCity_EventScript_165994" + }, + { + "type": "bg_event_type_0", + "x": 36, + "y": 10, + "elevation": 0, + "script": "ViridianCity_EventScript_1659B8" + } + ] +} \ No newline at end of file diff --git a/data/maps/ViridianCity_Gym/events.inc b/data/maps/ViridianCity_Gym/events.inc deleted file mode 100644 index b2469c9b7..000000000 --- a/data/maps/ViridianCity_Gym/events.inc +++ /dev/null @@ -1,24 +0,0 @@ -ViridianCity_Gym_EventObjects: - object_event 1, 54, 0, 10, 0, 2, 0, 3, 8, 17, 0, 1, 0, 3, 0, ViridianCity_Gym_EventScript_169FD6, 0, 0, 0 - object_event 2, 41, 0, 12, 0, 10, 0, 3, 8, 17, 0, 1, 0, 3, 0, ViridianCity_Gym_EventScript_16A004, 0, 0, 0 - object_event 3, 54, 0, 11, 0, 14, 0, 3, 7, 17, 0, 1, 0, 3, 0, ViridianCity_Gym_EventScript_169FA8, 0, 0, 0 - object_event 4, 25, 0, 10, 0, 10, 0, 3, 8, 17, 0, 1, 0, 3, 0, ViridianCity_Gym_EventScript_169F7A, 0, 0, 0 - object_event 5, 25, 0, 2, 0, 21, 0, 3, 10, 17, 0, 1, 0, 2, 0, ViridianCity_Gym_EventScript_169F91, 0, 0, 0 - object_event 6, 54, 0, 3, 0, 11, 0, 3, 9, 17, 0, 1, 0, 2, 0, ViridianCity_Gym_EventScript_169FBF, 0, 0, 0 - object_event 7, 41, 0, 6, 0, 8, 0, 3, 8, 17, 0, 1, 0, 3, 0, ViridianCity_Gym_EventScript_169FED, 0, 0, 0 - object_event 8, 87, 0, 2, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, ViridianCity_Gym_EventScript_169ECA, 85, 0, 0 - object_event 9, 41, 0, 13, 0, 7, 0, 3, 10, 17, 0, 1, 0, 3, 0, ViridianCity_Gym_EventScript_16A01B, 0, 0, 0 - object_event 10, 91, 0, 16, 0, 20, 0, 3, 8, 17, 0, 0, 0, 0, 0, ViridianCity_Gym_EventScript_16A032, 0, 0, 0 - -ViridianCity_Gym_MapWarps: - warp_def 16, 22, 3, 2, 769 - warp_def 17, 22, 3, 2, 769 - warp_def 18, 22, 3, 2, 769 - -ViridianCity_Gym_MapBGEvents: - bg_event 15, 20, 0, 0, 0, ViridianCity_Gym_EventScript_16A05E - bg_event 19, 20, 0, 0, 0, ViridianCity_Gym_EventScript_16A05E - bg_event 2, 2, 3, 7, 0, 181, 189, 129 - -ViridianCity_Gym_MapEvents:: - map_events ViridianCity_Gym_EventObjects, ViridianCity_Gym_MapWarps, 0x0, ViridianCity_Gym_MapBGEvents diff --git a/data/maps/ViridianCity_Gym/header.inc b/data/maps/ViridianCity_Gym/header.inc deleted file mode 100644 index 5edc31d15..000000000 --- a/data/maps/ViridianCity_Gym/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -ViridianCity_Gym:: @ 8350DDC - .4byte ViridianCity_Gym_Layout @ 0x82D86AC - .4byte ViridianCity_Gym_MapEvents @ 0x83B9B78 - .4byte ViridianCity_Gym_MapScripts @ 0x8169EC9 - .4byte NULL - .2byte BGM_FRLG_GYM - .2byte 37 - .byte 0x59, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01 diff --git a/data/maps/ViridianCity_Gym/map.json b/data/maps/ViridianCity_Gym/map.json new file mode 100644 index 000000000..accf4290d --- /dev/null +++ b/data/maps/ViridianCity_Gym/map.json @@ -0,0 +1,196 @@ +{ + "id": "MAP_VIRIDIAN_CITY_GYM", + "name": "ViridianCity_Gym", + "layout": "LAYOUT_VIRIDIAN_CITY_GYM", + "music": "BGM_FRLG_GYM", + "region_map_section": "MAPSEC_VIRIDIAN_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_1", + "connections": null, + "object_events": [ + { + "graphics_id": "54", + "x": 10, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "ViridianCity_Gym_EventScript_169FD6", + "flag": "0" + }, + { + "graphics_id": "41", + "x": 12, + "y": 10, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "ViridianCity_Gym_EventScript_16A004", + "flag": "0" + }, + { + "graphics_id": "54", + "x": 11, + "y": 14, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "ViridianCity_Gym_EventScript_169FA8", + "flag": "0" + }, + { + "graphics_id": "25", + "x": 10, + "y": 10, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "ViridianCity_Gym_EventScript_169F7A", + "flag": "0" + }, + { + "graphics_id": "25", + "x": 2, + "y": 21, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "ViridianCity_Gym_EventScript_169F91", + "flag": "0" + }, + { + "graphics_id": "54", + "x": 3, + "y": 11, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "ViridianCity_Gym_EventScript_169FBF", + "flag": "0" + }, + { + "graphics_id": "41", + "x": 6, + "y": 8, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "ViridianCity_Gym_EventScript_169FED", + "flag": "0" + }, + { + "graphics_id": "87", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ViridianCity_Gym_EventScript_169ECA", + "flag": "85" + }, + { + "graphics_id": "41", + "x": 13, + "y": 7, + "elevation": 3, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "ViridianCity_Gym_EventScript_16A01B", + "flag": "0" + }, + { + "graphics_id": "91", + "x": 16, + "y": 20, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ViridianCity_Gym_EventScript_16A032", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 16, + "y": 22, + "elevation": 3, + "dest_map": "MAP_VIRIDIAN_CITY", + "dest_warp_id": 2 + }, + { + "x": 17, + "y": 22, + "elevation": 3, + "dest_map": "MAP_VIRIDIAN_CITY", + "dest_warp_id": 2 + }, + { + "x": 18, + "y": 22, + "elevation": 3, + "dest_map": "MAP_VIRIDIAN_CITY", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 15, + "y": 20, + "elevation": 0, + "script": "ViridianCity_Gym_EventScript_16A05E" + }, + { + "type": "bg_event_type_0", + "x": 19, + "y": 20, + "elevation": 0, + "script": "ViridianCity_Gym_EventScript_16A05E" + }, + { + "type": "hidden_item", + "x": 2, + "y": 2, + "elevation": 3, + "item": "ITEM_MACHO_BRACE", + "flag": "189", + "unknown": 129 + } + ] +} \ No newline at end of file diff --git a/data/maps/ViridianCity_House1/events.inc b/data/maps/ViridianCity_House1/events.inc deleted file mode 100644 index 138574c82..000000000 --- a/data/maps/ViridianCity_House1/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -ViridianCity_House1_EventObjects: - object_event 1, 30, 0, 7, 0, 4, 0, 3, 9, 17, 0, 0, 0, 0, 0, ViridianCity_House1_EventScript_169E9B, 0, 0, 0 - object_event 2, 17, 0, 2, 0, 5, 0, 3, 3, 33, 0, 0, 0, 0, 0, ViridianCity_House1_EventScript_169EA4, 0, 0, 0 - object_event 3, 110, 0, 6, 0, 6, 0, 3, 5, 20, 0, 0, 0, 0, 0, ViridianCity_House1_EventScript_169EAD, 0, 0, 0 - -ViridianCity_House1_MapWarps: - warp_def 3, 7, 0, 1, 769 - warp_def 4, 7, 0, 1, 769 - warp_def 5, 7, 3, 1, 769 - -ViridianCity_House1_MapBGEvents: - bg_event 7, 1, 0, 0, 0, ViridianCity_House1_EventScript_169EC0 - -ViridianCity_House1_MapEvents:: - map_events ViridianCity_House1_EventObjects, ViridianCity_House1_MapWarps, 0x0, ViridianCity_House1_MapBGEvents diff --git a/data/maps/ViridianCity_House1/header.inc b/data/maps/ViridianCity_House1/header.inc deleted file mode 100644 index e29f218c9..000000000 --- a/data/maps/ViridianCity_House1/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -ViridianCity_House1:: @ 8350DC0 - .4byte ViridianCity_House1_Layout @ 0x833AEAC - .4byte ViridianCity_House1_MapEvents @ 0x83B9A38 - .4byte ViridianCity_House1_MapScripts @ 0x8169E9A - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 276 - .byte 0x59, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/ViridianCity_House1/map.json b/data/maps/ViridianCity_House1/map.json new file mode 100644 index 000000000..bbb006933 --- /dev/null +++ b/data/maps/ViridianCity_House1/map.json @@ -0,0 +1,89 @@ +{ + "id": "MAP_VIRIDIAN_CITY_HOUSE1", + "name": "ViridianCity_House1", + "layout": "LAYOUT_VIRIDIAN_CITY_HOUSE1", + "music": "BGM_FRLG_VIRIDIAN_CITY", + "region_map_section": "MAPSEC_VIRIDIAN_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "30", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ViridianCity_House1_EventScript_169E9B", + "flag": "0" + }, + { + "graphics_id": "17", + "x": 2, + "y": 5, + "elevation": 3, + "movement_type": "3", + "movement_range_x": 1, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ViridianCity_House1_EventScript_169EA4", + "flag": "0" + }, + { + "graphics_id": "110", + "x": 6, + "y": 6, + "elevation": 3, + "movement_type": "5", + "movement_range_x": 4, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ViridianCity_House1_EventScript_169EAD", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_VIRIDIAN_CITY", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_VIRIDIAN_CITY", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 7, + "elevation": 3, + "dest_map": "MAP_VIRIDIAN_CITY", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 7, + "y": 1, + "elevation": 0, + "script": "ViridianCity_House1_EventScript_169EC0" + } + ] +} \ No newline at end of file diff --git a/data/maps/ViridianCity_House2/events.inc b/data/maps/ViridianCity_House2/events.inc deleted file mode 100644 index 4d2ac979a..000000000 --- a/data/maps/ViridianCity_House2/events.inc +++ /dev/null @@ -1,18 +0,0 @@ -ViridianCity_House2_EventObjects: - object_event 1, 28, 0, 6, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, ViridianCity_House2_EventScript_16A094, 0, 0, 0 - object_event 2, 22, 0, 4, 0, 5, 0, 3, 7, 17, 0, 0, 0, 0, 0, ViridianCity_House2_EventScript_16A07D, 0, 0, 0 - -ViridianCity_House2_MapWarps: - warp_def 3, 7, 0, 3, 769 - warp_def 4, 7, 0, 3, 769 - warp_def 5, 7, 3, 3, 769 - -ViridianCity_House2_MapBGEvents: - bg_event 4, 4, 0, 0, 0, ViridianCity_House2_EventScript_16A0AB - bg_event 5, 1, 0, 0, 0, ViridianCity_House2_EventScript_16A11D - bg_event 4, 1, 0, 0, 0, ViridianCity_House2_EventScript_16A11D - bg_event 9, 2, 0, 1, 0, ViridianCity_House2_EventScript_1ACD65 - bg_event 8, 2, 0, 1, 0, ViridianCity_House2_EventScript_1ACD65 - -ViridianCity_House2_MapEvents:: - map_events ViridianCity_House2_EventObjects, ViridianCity_House2_MapWarps, 0x0, ViridianCity_House2_MapBGEvents diff --git a/data/maps/ViridianCity_House2/header.inc b/data/maps/ViridianCity_House2/header.inc deleted file mode 100644 index c45bfff14..000000000 --- a/data/maps/ViridianCity_House2/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -ViridianCity_House2:: @ 8350DF8 - .4byte ViridianCity_House2_Layout @ 0x8338D20 - .4byte ViridianCity_House2_MapEvents @ 0x83B9C10 - .4byte ViridianCity_House2_MapScripts @ 0x816A07C - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_CITY - .2byte 266 - .byte 0x59, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/ViridianCity_House2/map.json b/data/maps/ViridianCity_House2/map.json new file mode 100644 index 000000000..021a26f6a --- /dev/null +++ b/data/maps/ViridianCity_House2/map.json @@ -0,0 +1,104 @@ +{ + "id": "MAP_VIRIDIAN_CITY_HOUSE2", + "name": "ViridianCity_House2", + "layout": "LAYOUT_VIRIDIAN_CITY_HOUSE2", + "music": "BGM_FRLG_VIRIDIAN_CITY", + "region_map_section": "MAPSEC_VIRIDIAN_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "28", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ViridianCity_House2_EventScript_16A094", + "flag": "0" + }, + { + "graphics_id": "22", + "x": 4, + "y": 5, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ViridianCity_House2_EventScript_16A07D", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_VIRIDIAN_CITY", + "dest_warp_id": 3 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_VIRIDIAN_CITY", + "dest_warp_id": 3 + }, + { + "x": 5, + "y": 7, + "elevation": 3, + "dest_map": "MAP_VIRIDIAN_CITY", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 4, + "y": 4, + "elevation": 0, + "script": "ViridianCity_House2_EventScript_16A0AB" + }, + { + "type": "bg_event_type_0", + "x": 5, + "y": 1, + "elevation": 0, + "script": "ViridianCity_House2_EventScript_16A11D" + }, + { + "type": "bg_event_type_0", + "x": 4, + "y": 1, + "elevation": 0, + "script": "ViridianCity_House2_EventScript_16A11D" + }, + { + "type": "bg_event_type_1", + "x": 9, + "y": 2, + "elevation": 0, + "script": "ViridianCity_House2_EventScript_1ACD65" + }, + { + "type": "bg_event_type_1", + "x": 8, + "y": 2, + "elevation": 0, + "script": "ViridianCity_House2_EventScript_1ACD65" + } + ] +} \ No newline at end of file diff --git a/data/maps/ViridianCity_Mart/events.inc b/data/maps/ViridianCity_Mart/events.inc deleted file mode 100644 index 5900a7f39..000000000 --- a/data/maps/ViridianCity_Mart/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -ViridianCity_Mart_EventObjects: - object_event 1, 68, 0, 2, 0, 3, 0, 0, 10, 17, 0, 0, 0, 0, 0, ViridianCity_Mart_EventScript_16A268, 0, 0, 0 - object_event 2, 18, 0, 6, 0, 2, 0, 3, 2, 17, 0, 0, 0, 0, 0, ViridianCity_Mart_EventScript_16A2B7, 0, 0, 0 - object_event 3, 23, 0, 9, 0, 5, 0, 3, 3, 17, 0, 0, 0, 0, 0, ViridianCity_Mart_EventScript_16A2AE, 0, 0, 0 - -ViridianCity_Mart_MapWarps: - warp_def 3, 7, 3, 4, 769 - warp_def 4, 7, 3, 4, 769 - warp_def 5, 7, 3, 4, 769 - -ViridianCity_Mart_MapEvents:: - map_events ViridianCity_Mart_EventObjects, ViridianCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/ViridianCity_Mart/header.inc b/data/maps/ViridianCity_Mart/header.inc deleted file mode 100644 index 29cfbf0d0..000000000 --- a/data/maps/ViridianCity_Mart/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -ViridianCity_Mart:: @ 8350E14 - .4byte Mart_Layout @ 0x82D5BCC - .4byte ViridianCity_Mart_MapEvents @ 0x83B9C84 - .4byte ViridianCity_Mart_MapScripts @ 0x816A1D3 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 10 - .byte 0x59, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/ViridianCity_Mart/map.json b/data/maps/ViridianCity_Mart/map.json new file mode 100644 index 000000000..3b0216fde --- /dev/null +++ b/data/maps/ViridianCity_Mart/map.json @@ -0,0 +1,81 @@ +{ + "id": "MAP_VIRIDIAN_CITY_MART", + "name": "ViridianCity_Mart", + "layout": "LAYOUT_MART", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_VIRIDIAN_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "68", + "x": 2, + "y": 3, + "elevation": 0, + "movement_type": "10", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ViridianCity_Mart_EventScript_16A268", + "flag": "0" + }, + { + "graphics_id": "18", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ViridianCity_Mart_EventScript_16A2B7", + "flag": "0" + }, + { + "graphics_id": "23", + "x": 9, + "y": 5, + "elevation": 3, + "movement_type": "3", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ViridianCity_Mart_EventScript_16A2AE", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 3, + "dest_map": "MAP_VIRIDIAN_CITY", + "dest_warp_id": 4 + }, + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_VIRIDIAN_CITY", + "dest_warp_id": 4 + }, + { + "x": 5, + "y": 7, + "elevation": 3, + "dest_map": "MAP_VIRIDIAN_CITY", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/ViridianCity_PokemonCenter_1F/events.inc b/data/maps/ViridianCity_PokemonCenter_1F/events.inc deleted file mode 100644 index 1e2b40a28..000000000 --- a/data/maps/ViridianCity_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -ViridianCity_PokemonCenter_1F_EventObjects: - object_event 1, 64, 0, 7, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, ViridianCity_PokemonCenter_1F_EventScript_16A2CF, 0, 0, 0 - object_event 2, 61, 0, 12, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, ViridianCity_PokemonCenter_1F_EventScript_16A2E1, 0, 0, 0 - object_event 3, 19, 0, 4, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, ViridianCity_PokemonCenter_1F_EventScript_16A2D8, 0, 0, 0 - object_event 4, 18, 0, 2, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, ViridianCity_PokemonCenter_1F_EventScript_16A2EA, 0, 0, 0 - -ViridianCity_PokemonCenter_1F_MapWarps: - warp_def 6, 8, 3, 0, 769 - warp_def 7, 8, 3, 0, 769 - warp_def 8, 8, 3, 0, 769 - warp_def 1, 6, 4, 0, 1285 - -ViridianCity_PokemonCenter_1F_MapEvents:: - map_events ViridianCity_PokemonCenter_1F_EventObjects, ViridianCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/ViridianCity_PokemonCenter_1F/header.inc b/data/maps/ViridianCity_PokemonCenter_1F/header.inc deleted file mode 100644 index 6e26020eb..000000000 --- a/data/maps/ViridianCity_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -ViridianCity_PokemonCenter_1F:: @ 8350E30 - .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte ViridianCity_PokemonCenter_1F_MapEvents @ 0x83B9D18 - .4byte ViridianCity_PokemonCenter_1F_MapScripts @ 0x816A2C0 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 8 - .byte 0x59, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/ViridianCity_PokemonCenter_1F/map.json b/data/maps/ViridianCity_PokemonCenter_1F/map.json new file mode 100644 index 000000000..bed78482f --- /dev/null +++ b/data/maps/ViridianCity_PokemonCenter_1F/map.json @@ -0,0 +1,101 @@ +{ + "id": "MAP_VIRIDIAN_CITY_POKEMON_CENTER_1F", + "name": "ViridianCity_PokemonCenter_1F", + "layout": "LAYOUT_POKEMON_CENTER_1F", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_VIRIDIAN_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "64", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ViridianCity_PokemonCenter_1F_EventScript_16A2CF", + "flag": "0" + }, + { + "graphics_id": "61", + "x": 12, + "y": 5, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ViridianCity_PokemonCenter_1F_EventScript_16A2E1", + "flag": "0" + }, + { + "graphics_id": "19", + "x": 4, + "y": 7, + "elevation": 3, + "movement_type": "1", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ViridianCity_PokemonCenter_1F_EventScript_16A2D8", + "flag": "0" + }, + { + "graphics_id": "18", + "x": 2, + "y": 3, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ViridianCity_PokemonCenter_1F_EventScript_16A2EA", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_VIRIDIAN_CITY", + "dest_warp_id": 0 + }, + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_VIRIDIAN_CITY", + "dest_warp_id": 0 + }, + { + "x": 8, + "y": 8, + "elevation": 3, + "dest_map": "MAP_VIRIDIAN_CITY", + "dest_warp_id": 0 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_VIRIDIAN_CITY_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/ViridianCity_PokemonCenter_2F/events.inc b/data/maps/ViridianCity_PokemonCenter_2F/events.inc deleted file mode 100644 index d30b58656..000000000 --- a/data/maps/ViridianCity_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -ViridianCity_PokemonCenter_2F_EventObjects: - object_event 1, 65, 0, 6, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, ViridianCity_PokemonCenter_2F_EventScript_1A8CF6, 0, 0, 0 - object_event 2, 65, 0, 2, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, ViridianCity_PokemonCenter_2F_EventScript_1A8CFC, 0, 0, 0 - object_event 3, 65, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, ViridianCity_PokemonCenter_2F_EventScript_1A8D02, 0, 0, 0 - object_event 4, 69, 0, 1, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, ViridianCity_PokemonCenter_2F_EventScript_1BB1D2, 112, 0, 0 - -ViridianCity_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 3, 1284 - warp_def 5, 1, 0, 0, 4 - warp_def 9, 1, 0, 0, 1 - -ViridianCity_PokemonCenter_2F_MapEvents:: - map_events ViridianCity_PokemonCenter_2F_EventObjects, ViridianCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/ViridianCity_PokemonCenter_2F/header.inc b/data/maps/ViridianCity_PokemonCenter_2F/header.inc deleted file mode 100644 index 0b1cdbcf7..000000000 --- a/data/maps/ViridianCity_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -ViridianCity_PokemonCenter_2F:: @ 8350E4C - .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte ViridianCity_PokemonCenter_2F_MapEvents @ 0x83B9DA4 - .4byte ViridianCity_PokemonCenter_2F_MapScripts @ 0x816A2F3 - .4byte NULL - .2byte BGM_FRLG_POKEMON_CENTER - .2byte 9 - .byte 0x59, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 diff --git a/data/maps/ViridianCity_PokemonCenter_2F/map.json b/data/maps/ViridianCity_PokemonCenter_2F/map.json new file mode 100644 index 000000000..20f2abea7 --- /dev/null +++ b/data/maps/ViridianCity_PokemonCenter_2F/map.json @@ -0,0 +1,94 @@ +{ + "id": "MAP_VIRIDIAN_CITY_POKEMON_CENTER_2F", + "name": "ViridianCity_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "BGM_FRLG_POKEMON_CENTER", + "region_map_section": "MAPSEC_VIRIDIAN_CITY", + "requires_flash": false, + "weather": "WEATHER_0", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "65", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ViridianCity_PokemonCenter_2F_EventScript_1A8CF6", + "flag": "0" + }, + { + "graphics_id": "65", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ViridianCity_PokemonCenter_2F_EventScript_1A8CFC", + "flag": "0" + }, + { + "graphics_id": "65", + "x": 10, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ViridianCity_PokemonCenter_2F_EventScript_1A8D02", + "flag": "0" + }, + { + "graphics_id": "69", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ViridianCity_PokemonCenter_2F_EventScript_1BB1D2", + "flag": "112" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_VIRIDIAN_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 3 + }, + { + "x": 5, + "y": 1, + "elevation": 0, + "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 0, + "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/ViridianForest/events.inc b/data/maps/ViridianForest/events.inc deleted file mode 100644 index f0f5b8855..000000000 --- a/data/maps/ViridianForest/events.inc +++ /dev/null @@ -1,33 +0,0 @@ -ViridianForest_EventObjects: - object_event 1, 18, 0, 29, 0, 58, 0, 3, 7, 17, 0, 0, 0, 0, 0, ViridianForest_EventScript_160529, 0, 0, 0 - object_event 2, 19, 0, 45, 0, 58, 0, 3, 9, 17, 0, 0, 0, 0, 0, ViridianForest_EventScript_160532, 0, 0, 0 - object_event 3, 20, 0, 47, 0, 45, 0, 3, 9, 17, 0, 1, 0, 5, 0, ViridianForest_EventScript_160571, 0, 0, 0 - object_event 4, 20, 0, 47, 0, 29, 0, 3, 9, 17, 0, 1, 0, 4, 0, ViridianForest_EventScript_160588, 0, 0, 0 - object_event 5, 20, 0, 7, 0, 22, 0, 3, 9, 17, 0, 1, 0, 4, 0, ViridianForest_EventScript_16059F, 0, 0, 0 - object_event 6, 92, 0, 5, 0, 41, 0, 3, 8, 17, 0, 0, 0, 0, 0, ViridianForest_EventScript_1BE5A8, 342, 0, 0 - object_event 7, 92, 0, 40, 0, 21, 0, 3, 8, 17, 0, 0, 0, 0, 0, ViridianForest_EventScript_1BE5B5, 343, 0, 0 - object_event 8, 92, 0, 21, 0, 34, 0, 3, 8, 17, 0, 0, 0, 0, 0, ViridianForest_EventScript_1BE5C2, 344, 0, 0 - object_event 9, 20, 0, 43, 0, 6, 0, 3, 13, 17, 0, 1, 0, 1, 0, ViridianForest_EventScript_1605B6, 0, 0, 0 - object_event 10, 20, 0, 16, 0, 5, 0, 3, 7, 17, 0, 1, 0, 1, 0, ViridianForest_EventScript_1605CD, 0, 0, 0 - object_event 11, 92, 0, 49, 0, 60, 0, 3, 8, 17, 0, 0, 0, 0, 0, ViridianForest_EventScript_1BEAC9, 446, 0, 0 - -ViridianForest_MapWarps: - warp_def 29, 62, 3, 3, 3840 - warp_def 28, 62, 3, 3, 3840 - warp_def 5, 9, 3, 1, 3843 - warp_def 6, 9, 3, 1, 3843 - warp_def 30, 62, 3, 3, 3840 - warp_def 4, 9, 3, 1, 3843 - -ViridianForest_MapBGEvents: - bg_event 39, 59, 3, 0, 0, ViridianForest_EventScript_16053B - bg_event 43, 26, 0, 0, 0, ViridianForest_EventScript_16054D - bg_event 9, 29, 0, 0, 0, ViridianForest_EventScript_160556 - bg_event 6, 12, 0, 0, 0, ViridianForest_EventScript_160568 - bg_event 28, 44, 0, 0, 0, ViridianForest_EventScript_160544 - bg_event 31, 60, 0, 0, 0, ViridianForest_EventScript_16055F - bg_event 3, 22, 3, 7, 0, 13, 0, 1 - bg_event 28, 57, 0, 7, 0, 14, 1, 1 - -ViridianForest_MapEvents:: - map_events ViridianForest_EventObjects, ViridianForest_MapWarps, 0x0, ViridianForest_MapBGEvents diff --git a/data/maps/ViridianForest/header.inc b/data/maps/ViridianForest/header.inc deleted file mode 100644 index db9e41ad1..000000000 --- a/data/maps/ViridianForest/header.inc +++ /dev/null @@ -1,8 +0,0 @@ -ViridianForest:: @ 834F214 - .4byte ViridianForest_Layout @ 0x82FE46C - .4byte ViridianForest_MapEvents @ 0x83AE4D8 - .4byte ViridianForest_MapScripts @ 0x816051F - .4byte NULL - .2byte BGM_FRLG_VIRIDIAN_FOREST - .2byte 117 - .byte 0x7e, 0x00, 0x0b, 0x03, 0x01, 0x07, 0x00, 0x00 diff --git a/data/maps/ViridianForest/map.json b/data/maps/ViridianForest/map.json new file mode 100644 index 000000000..5034e3afa --- /dev/null +++ b/data/maps/ViridianForest/map.json @@ -0,0 +1,267 @@ +{ + "id": "MAP_VIRIDIAN_FOREST", + "name": "ViridianForest", + "layout": "LAYOUT_VIRIDIAN_FOREST", + "music": "BGM_FRLG_VIRIDIAN_FOREST", + "region_map_section": "MAPSEC_VIRIDIAN_FOREST", + "requires_flash": false, + "weather": "WEATHER_11", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 7, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "18", + "x": 29, + "y": 58, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ViridianForest_EventScript_160529", + "flag": "0" + }, + { + "graphics_id": "19", + "x": 45, + "y": 58, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ViridianForest_EventScript_160532", + "flag": "0" + }, + { + "graphics_id": "20", + "x": 47, + "y": 45, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "ViridianForest_EventScript_160571", + "flag": "0" + }, + { + "graphics_id": "20", + "x": 47, + "y": 29, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "ViridianForest_EventScript_160588", + "flag": "0" + }, + { + "graphics_id": "20", + "x": 7, + "y": 22, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "ViridianForest_EventScript_16059F", + "flag": "0" + }, + { + "graphics_id": "92", + "x": 5, + "y": 41, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ViridianForest_EventScript_1BE5A8", + "flag": "342" + }, + { + "graphics_id": "92", + "x": 40, + "y": 21, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ViridianForest_EventScript_1BE5B5", + "flag": "343" + }, + { + "graphics_id": "92", + "x": 21, + "y": 34, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ViridianForest_EventScript_1BE5C2", + "flag": "344" + }, + { + "graphics_id": "20", + "x": 43, + "y": 6, + "elevation": 3, + "movement_type": "13", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "ViridianForest_EventScript_1605B6", + "flag": "0" + }, + { + "graphics_id": "20", + "x": 16, + "y": 5, + "elevation": 3, + "movement_type": "7", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "ViridianForest_EventScript_1605CD", + "flag": "0" + }, + { + "graphics_id": "92", + "x": 49, + "y": 60, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ViridianForest_EventScript_1BEAC9", + "flag": "446" + } + ], + "warp_events": [ + { + "x": 29, + "y": 62, + "elevation": 3, + "dest_map": "MAP_ROUTE2_VIRIDIAN_FOREST_SOUTH_ENTRANCE", + "dest_warp_id": 3 + }, + { + "x": 28, + "y": 62, + "elevation": 3, + "dest_map": "MAP_ROUTE2_VIRIDIAN_FOREST_SOUTH_ENTRANCE", + "dest_warp_id": 3 + }, + { + "x": 5, + "y": 9, + "elevation": 3, + "dest_map": "MAP_ROUTE2_VIRIDIAN_FOREST_NORTH_ENTRANCE", + "dest_warp_id": 1 + }, + { + "x": 6, + "y": 9, + "elevation": 3, + "dest_map": "MAP_ROUTE2_VIRIDIAN_FOREST_NORTH_ENTRANCE", + "dest_warp_id": 1 + }, + { + "x": 30, + "y": 62, + "elevation": 3, + "dest_map": "MAP_ROUTE2_VIRIDIAN_FOREST_SOUTH_ENTRANCE", + "dest_warp_id": 3 + }, + { + "x": 4, + "y": 9, + "elevation": 3, + "dest_map": "MAP_ROUTE2_VIRIDIAN_FOREST_NORTH_ENTRANCE", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "bg_event_type_0", + "x": 39, + "y": 59, + "elevation": 3, + "script": "ViridianForest_EventScript_16053B" + }, + { + "type": "bg_event_type_0", + "x": 43, + "y": 26, + "elevation": 0, + "script": "ViridianForest_EventScript_16054D" + }, + { + "type": "bg_event_type_0", + "x": 9, + "y": 29, + "elevation": 0, + "script": "ViridianForest_EventScript_160556" + }, + { + "type": "bg_event_type_0", + "x": 6, + "y": 12, + "elevation": 0, + "script": "ViridianForest_EventScript_160568" + }, + { + "type": "bg_event_type_0", + "x": 28, + "y": 44, + "elevation": 0, + "script": "ViridianForest_EventScript_160544" + }, + { + "type": "bg_event_type_0", + "x": 31, + "y": 60, + "elevation": 0, + "script": "ViridianForest_EventScript_16055F" + }, + { + "type": "hidden_item", + "x": 3, + "y": 22, + "elevation": 3, + "item": "ITEM_POTION", + "flag": "0", + "unknown": 1 + }, + { + "type": "hidden_item", + "x": 28, + "y": 57, + "elevation": 0, + "item": "ITEM_ANTIDOTE", + "flag": "1", + "unknown": 1 + } + ] +} \ No newline at end of file diff --git a/data/maps/connections.inc b/data/maps/connections.inc deleted file mode 100644 index ac4608002..000000000 --- a/data/maps/connections.inc +++ /dev/null @@ -1,63 +0,0 @@ - .include "data/maps/PalletTown/connections.inc" - .include "data/maps/ViridianCity/connections.inc" - .include "data/maps/PewterCity/connections.inc" - .include "data/maps/CeruleanCity/connections.inc" - .include "data/maps/LavenderTown/connections.inc" - .include "data/maps/VermilionCity/connections.inc" - .include "data/maps/CeladonCity/connections.inc" - .include "data/maps/FuchsiaCity/connections.inc" - .include "data/maps/CinnabarIsland/connections.inc" - .include "data/maps/IndigoPlateau_Exterior/connections.inc" - .include "data/maps/SaffronCity_Duplicate/connections.inc" - .include "data/maps/SaffronCity/connections.inc" - .include "data/maps/OneIsland/connections.inc" - .include "data/maps/TwoIsland/connections.inc" - .include "data/maps/ThreeIsland/connections.inc" - .include "data/maps/FiveIsland/connections.inc" - .include "data/maps/SevenIsland/connections.inc" - .include "data/maps/SixIsland/connections.inc" - .include "data/maps/Route1/connections.inc" - .include "data/maps/Route2/connections.inc" - .include "data/maps/Route3/connections.inc" - .include "data/maps/Route4/connections.inc" - .include "data/maps/Route5/connections.inc" - .include "data/maps/Route6/connections.inc" - .include "data/maps/Route7/connections.inc" - .include "data/maps/Route8/connections.inc" - .include "data/maps/Route9/connections.inc" - .include "data/maps/Route10/connections.inc" - .include "data/maps/Route11/connections.inc" - .include "data/maps/Route12/connections.inc" - .include "data/maps/Route13/connections.inc" - .include "data/maps/Route14/connections.inc" - .include "data/maps/Route15/connections.inc" - .include "data/maps/Route16/connections.inc" - .include "data/maps/Route17/connections.inc" - .include "data/maps/Route18/connections.inc" - .include "data/maps/Route19/connections.inc" - .include "data/maps/Route20/connections.inc" - .include "data/maps/Route21_North/connections.inc" - .include "data/maps/Route21_South/connections.inc" - .include "data/maps/Route22/connections.inc" - .include "data/maps/Route23/connections.inc" - .include "data/maps/Route24/connections.inc" - .include "data/maps/Route25/connections.inc" - .include "data/maps/OneIsland_KindleRoad/connections.inc" - .include "data/maps/OneIsland_TreasureBeach/connections.inc" - .include "data/maps/TwoIsland_CapeBrink/connections.inc" - .include "data/maps/ThreeIsland_BondBridge/connections.inc" - .include "data/maps/ThreeIsland_Port/connections.inc" - .include "data/maps/UnknownMap_03_50/connections.inc" - .include "data/maps/UnknownMap_03_51/connections.inc" - .include "data/maps/FiveIsland_ResortGorgeous/connections.inc" - .include "data/maps/FiveIsland_WaterLabyrinth/connections.inc" - .include "data/maps/FiveIsland_Meadow/connections.inc" - .include "data/maps/FiveIsland_MemorialPillar/connections.inc" - .include "data/maps/SixIsland_OutcastIsland/connections.inc" - .include "data/maps/SixIsland_GreenPath/connections.inc" - .include "data/maps/SixIsland_WaterPath/connections.inc" - .include "data/maps/SixIsland_RuinValley/connections.inc" - .include "data/maps/SevenIsland_TrainerTower/connections.inc" - .include "data/maps/SevenIsland_SevaultCanyon_Entrance/connections.inc" - .include "data/maps/SevenIsland_SevaultCanyon/connections.inc" - .include "data/maps/SevenIsland_TanobyRuins/connections.inc" diff --git a/data/maps/events.inc b/data/maps/events.inc deleted file mode 100644 index 56619a28f..000000000 --- a/data/maps/events.inc +++ /dev/null @@ -1,425 +0,0 @@ - .include "data/maps/UnknownMap_00_00/events.inc" - .include "data/maps/UnknownMap_00_01/events.inc" - .include "data/maps/UnknownMap_00_02/events.inc" - .include "data/maps/UnknownMap_00_03/events.inc" - .include "data/maps/UnknownMap_00_04/events.inc" - .include "data/maps/ViridianForest/events.inc" - .include "data/maps/MtMoon_1F/events.inc" - .include "data/maps/MtMoon_B1F/events.inc" - .include "data/maps/MtMoon_B2F/events.inc" - .include "data/maps/SSAnne_Exterior/events.inc" - .include "data/maps/SSAnne_1F_Corridor/events.inc" - .include "data/maps/SSAnne_2F_Corridor/events.inc" - .include "data/maps/SSAnne_3F_Corridor/events.inc" - .include "data/maps/SSAnne_B1F_Corridor/events.inc" - .include "data/maps/SSAnne_Deck/events.inc" - .include "data/maps/SSAnne_Kitchen/events.inc" - .include "data/maps/SSAnne_CaptainsOffice/events.inc" - .include "data/maps/SSAnne_1F_Room1/events.inc" - .include "data/maps/SSAnne_1F_Room2/events.inc" - .include "data/maps/SSAnne_1F_Room3/events.inc" - .include "data/maps/SSAnne_1F_Room4/events.inc" - .include "data/maps/SSAnne_1F_Room5/events.inc" - .include "data/maps/SSAnne_1F_Room7/events.inc" - .include "data/maps/SSAnne_2F_Room1/events.inc" - .include "data/maps/SSAnne_2F_Room2/events.inc" - .include "data/maps/SSAnne_2F_Room3/events.inc" - .include "data/maps/SSAnne_2F_Room4/events.inc" - .include "data/maps/SSAnne_2F_Room5/events.inc" - .include "data/maps/SSAnne_2F_Room6/events.inc" - .include "data/maps/SSAnne_B1F_Room1/events.inc" - .include "data/maps/SSAnne_B1F_Room2/events.inc" - .include "data/maps/SSAnne_B1F_Room3/events.inc" - .include "data/maps/SSAnne_B1F_Room4/events.inc" - .include "data/maps/SSAnne_B1F_Room5/events.inc" - .include "data/maps/SSAnne_1F_Room6/events.inc" - .include "data/maps/UndergroundPath_NorthEntrance/events.inc" - .include "data/maps/UndergroundPath_NorthSouthTunnel/events.inc" - .include "data/maps/UndergroundPath_SouthEntrance/events.inc" - .include "data/maps/UndergroundPath_WestEntrance/events.inc" - .include "data/maps/UndergroundPath_EastWestTunnel/events.inc" - .include "data/maps/UndergroundPath_EastEntrance/events.inc" - .include "data/maps/DiglettsCave_NorthEntrance/events.inc" - .include "data/maps/DiglettsCave_B1F/events.inc" - .include "data/maps/DiglettsCave_SouthEntrance/events.inc" - .include "data/maps/VictoryRoad_1F/events.inc" - .include "data/maps/VictoryRoad_2F/events.inc" - .include "data/maps/VictoryRoad_3F/events.inc" - .include "data/maps/RocketHideout_B1F/events.inc" - .include "data/maps/RocketHideout_B2F/events.inc" - .include "data/maps/RocketHideout_B3F/events.inc" - .include "data/maps/RocketHideout_B4F/events.inc" - .include "data/maps/RocketHideout_Elevator/events.inc" - .include "data/maps/SilphCo_1F/events.inc" - .include "data/maps/SilphCo_2F/events.inc" - .include "data/maps/SilphCo_3F/events.inc" - .include "data/maps/SilphCo_4F/events.inc" - .include "data/maps/SilphCo_5F/events.inc" - .include "data/maps/SilphCo_6F/events.inc" - .include "data/maps/SilphCo_7F/events.inc" - .include "data/maps/SilphCo_8F/events.inc" - .include "data/maps/SilphCo_9F/events.inc" - .include "data/maps/SilphCo_10F/events.inc" - .include "data/maps/SilphCo_11F/events.inc" - .include "data/maps/SilphCo_Elevator/events.inc" - .include "data/maps/PokemonMansion_1F/events.inc" - .include "data/maps/PokemonMansion_2F/events.inc" - .include "data/maps/PokemonMansion_3F/events.inc" - .include "data/maps/PokemonMansion_B1F/events.inc" - .include "data/maps/SafariZone_Center/events.inc" - .include "data/maps/SafariZone_East/events.inc" - .include "data/maps/SafariZone_North/events.inc" - .include "data/maps/SafariZone_West/events.inc" - .include "data/maps/SafariZone_Building1/events.inc" - .include "data/maps/SafariZone_Building2/events.inc" - .include "data/maps/SafariZone_Building3/events.inc" - .include "data/maps/SafariZone_Building4/events.inc" - .include "data/maps/SafariZone_SecretHouse/events.inc" - .include "data/maps/CeruleanCave_1F/events.inc" - .include "data/maps/CeruleanCave_2F/events.inc" - .include "data/maps/CeruleanCave_B1F/events.inc" - .include "data/maps/PokemonLeague_LoreleisRoom/events.inc" - .include "data/maps/PokemonLeague_BrunosRoom/events.inc" - .include "data/maps/PokemonLeague_AgathasRoom/events.inc" - .include "data/maps/PokemonLeague_LancesRoom/events.inc" - .include "data/maps/PokemonLeague_ChampionsRoom/events.inc" - .include "data/maps/PokemonLeague_HallOfFame/events.inc" - .include "data/maps/RockTunnel_1F/events.inc" - .include "data/maps/RockTunnel_B1F/events.inc" - .include "data/maps/SeafoamIslands_1F/events.inc" - .include "data/maps/SeafoamIslands_B1F/events.inc" - .include "data/maps/SeafoamIslands_B2F/events.inc" - .include "data/maps/SeafoamIslands_B3F/events.inc" - .include "data/maps/SeafoamIslands_B4F/events.inc" - .include "data/maps/PokemonTower_1F/events.inc" - .include "data/maps/PokemonTower_2F/events.inc" - .include "data/maps/PokemonTower_3F/events.inc" - .include "data/maps/PokemonTower_4F/events.inc" - .include "data/maps/PokemonTower_5F/events.inc" - .include "data/maps/PokemonTower_6F/events.inc" - .include "data/maps/PokemonTower_7F/events.inc" - .include "data/maps/PowerPlant/events.inc" - .include "data/maps/MtEmber_RubyPath_B4F/events.inc" - .include "data/maps/MtEmber_Exterior/events.inc" - .include "data/maps/MtEmber_SummitPath_1F/events.inc" - .include "data/maps/MtEmber_SummitPath_2F/events.inc" - .include "data/maps/MtEmber_SummitPath_3F/events.inc" - .include "data/maps/MtEmber_Summit/events.inc" - .include "data/maps/MtEmber_RubyPath_B5F/events.inc" - .include "data/maps/SSAnne_Kitchen3/events.inc" - .include "data/maps/MtEmber_RubyPath_B1F/events.inc" - .include "data/maps/MtEmber_RubyPath_B2F/events.inc" - .include "data/maps/MtEmber_RubyPath_B3F/events.inc" - .include "data/maps/MtEmber_RubyPath_B1F_Stairs/events.inc" - .include "data/maps/MtEmber_RubyPath_B2F_Stairs/events.inc" - .include "data/maps/ThreeIsland_BerryForest/events.inc" - .include "data/maps/FourIsland_IcefallCave_Entrance/events.inc" - .include "data/maps/FourIsland_IcefallCave_1F/events.inc" - .include "data/maps/SSAnne_CaptainsOffice2/events.inc" - .include "data/maps/SSAnne_CaptainsOffice3/events.inc" - .include "data/maps/SSAnne_CaptainsOffice4/events.inc" - .include "data/maps/SSAnne_CaptainsOffice5/events.inc" - .include "data/maps/SixIsland_DottedHole_B1F/events.inc" - .include "data/maps/SixIsland_DottedHole_B2F/events.inc" - .include "data/maps/SixIsland_DottedHole_B3F/events.inc" - .include "data/maps/SSAnne_CaptainsOffice9/events.inc" - .include "data/maps/SixIsland_DottedHole_SapphireRoom/events.inc" - .include "data/maps/SSAnne_1F_Room11/events.inc" - .include "data/maps/SSAnne_1F_Room12/events.inc" - .include "data/maps/NavelRock_Exterior/events.inc" - .include "data/maps/SevenIsland_TrainerTower_1F/events.inc" - .include "data/maps/SevenIsland_TrainerTower_2F/events.inc" - .include "data/maps/SevenIsland_TrainerTower_3F/events.inc" - .include "data/maps/SevenIsland_TrainerTower_4F/events.inc" - .include "data/maps/SevenIsland_TrainerTower_5F/events.inc" - .include "data/maps/SevenIsland_TrainerTower_6F/events.inc" - .include "data/maps/SevenIsland_TrainerTower_7F/events.inc" - .include "data/maps/SevenIsland_TrainerTower_8F/events.inc" - .include "data/maps/SevenIsland_TrainerTower_Roof/events.inc" - .include "data/maps/SevenIsland_TrainerTower_Lobby/events.inc" - .include "data/maps/SevenIsland_TrainerTower_Elevator/events.inc" - .include "data/maps/FiveIsland_LostCave_Entrance/events.inc" - .include "data/maps/FiveIsland_LostCave_Room1/events.inc" - .include "data/maps/FiveIsland_LostCave_Room2/events.inc" - .include "data/maps/FiveIsland_LostCave_Room3/events.inc" - .include "data/maps/FiveIsland_LostCave_Room4/events.inc" - .include "data/maps/FiveIsland_LostCave_Room5/events.inc" - .include "data/maps/FiveIsland_LostCave_Room6/events.inc" - .include "data/maps/FiveIsland_LostCave_Room7/events.inc" - .include "data/maps/FiveIsland_LostCave_Room8/events.inc" - .include "data/maps/FiveIsland_LostCave_Room9/events.inc" - .include "data/maps/FiveIsland_LostCave_Room10/events.inc" - .include "data/maps/FiveIsland_LostCave_Room11/events.inc" - .include "data/maps/FiveIsland_LostCave_Room12/events.inc" - .include "data/maps/FiveIsland_LostCave_Room13/events.inc" - .include "data/maps/FiveIsland_LostCave_Room14/events.inc" - .include "data/maps/SevenIsland_TanobyRuins_MoneanChamber/events.inc" - .include "data/maps/SevenIsland_TanobyRuins_LiptooChamber/events.inc" - .include "data/maps/SevenIsland_TanobyRuins_WeepthChamber/events.inc" - .include "data/maps/SevenIsland_TanobyRuins_DilfordChamber/events.inc" - .include "data/maps/SevenIsland_TanobyRuins_ScufibChamber/events.inc" - .include "data/maps/SevenIsland_TanobyRuins_RixyChamber/events.inc" - .include "data/maps/SevenIsland_TanobyRuins_ViapoisChamber/events.inc" - .include "data/maps/ThreeIsland_DunsparceTunnel/events.inc" - .include "data/maps/SevenIsland_SeavaultCanyon_TanobyKey/events.inc" - .include "data/maps/NavelRock_1F/events.inc" - .include "data/maps/NavelRock_Summit/events.inc" - .include "data/maps/NavelRock_Base/events.inc" - .include "data/maps/NavelRock_SummitPath_2F/events.inc" - .include "data/maps/NavelRock_SummitPath_3F/events.inc" - .include "data/maps/NavelRock_SummitPath_4F/events.inc" - .include "data/maps/NavelRock_SummitPath_5F/events.inc" - .include "data/maps/NavelRock_BasePath_B1F/events.inc" - .include "data/maps/NavelRock_BasePath_B2F/events.inc" - .include "data/maps/NavelRock_BasePath_B3F/events.inc" - .include "data/maps/NavelRock_BasePath_B4F/events.inc" - .include "data/maps/NavelRock_BasePath_B5F/events.inc" - .include "data/maps/NavelRock_BasePath_B6F/events.inc" - .include "data/maps/NavelRock_BasePath_B7F/events.inc" - .include "data/maps/NavelRock_BasePath_B8F/events.inc" - .include "data/maps/NavelRock_BasePath_B9F/events.inc" - .include "data/maps/NavelRock_BasePath_B10F/events.inc" - .include "data/maps/NavelRock_BasePath_B11F/events.inc" - .include "data/maps/NavelRock_B1F/events.inc" - .include "data/maps/NavelRock_Fork/events.inc" - .include "data/maps/BirthIsland_Exterior/events.inc" - .include "data/maps/OneIsland_KindleRoad_EmberSpa/events.inc" - .include "data/maps/BirthIsland_Harbor/events.inc" - .include "data/maps/NavelRock_Harbor/events.inc" - .include "data/maps/PalletTown/events.inc" - .include "data/maps/ViridianCity/events.inc" - .include "data/maps/PewterCity/events.inc" - .include "data/maps/CeruleanCity/events.inc" - .include "data/maps/LavenderTown/events.inc" - .include "data/maps/VermilionCity/events.inc" - .include "data/maps/CeladonCity/events.inc" - .include "data/maps/FuchsiaCity/events.inc" - .include "data/maps/CinnabarIsland/events.inc" - .include "data/maps/IndigoPlateau_Exterior/events.inc" - .include "data/maps/SaffronCity_Duplicate/events.inc" - .include "data/maps/SaffronCity/events.inc" - .include "data/maps/OneIsland/events.inc" - .include "data/maps/TwoIsland/events.inc" - .include "data/maps/ThreeIsland/events.inc" - .include "data/maps/FourIsland/events.inc" - .include "data/maps/FiveIsland/events.inc" - .include "data/maps/SevenIsland/events.inc" - .include "data/maps/SixIsland/events.inc" - .include "data/maps/Route1/events.inc" - .include "data/maps/Route2/events.inc" - .include "data/maps/Route3/events.inc" - .include "data/maps/Route4/events.inc" - .include "data/maps/Route5/events.inc" - .include "data/maps/Route6/events.inc" - .include "data/maps/Route7/events.inc" - .include "data/maps/Route8/events.inc" - .include "data/maps/Route9/events.inc" - .include "data/maps/Route10/events.inc" - .include "data/maps/Route11/events.inc" - .include "data/maps/Route12/events.inc" - .include "data/maps/Route13/events.inc" - .include "data/maps/Route14/events.inc" - .include "data/maps/Route15/events.inc" - .include "data/maps/Route16/events.inc" - .include "data/maps/Route17/events.inc" - .include "data/maps/Route18/events.inc" - .include "data/maps/Route19/events.inc" - .include "data/maps/Route20/events.inc" - .include "data/maps/Route21_North/events.inc" - .include "data/maps/Route21_South/events.inc" - .include "data/maps/Route22/events.inc" - .include "data/maps/Route23/events.inc" - .include "data/maps/Route24/events.inc" - .include "data/maps/Route25/events.inc" - .include "data/maps/OneIsland_KindleRoad/events.inc" - .include "data/maps/OneIsland_TreasureBeach/events.inc" - .include "data/maps/TwoIsland_CapeBrink/events.inc" - .include "data/maps/ThreeIsland_BondBridge/events.inc" - .include "data/maps/ThreeIsland_Port/events.inc" - .include "data/maps/UnknownMap_03_50/events.inc" - .include "data/maps/UnknownMap_03_51/events.inc" - .include "data/maps/UnknownMap_03_52/events.inc" - .include "data/maps/UnknownMap_03_53/events.inc" - .include "data/maps/FiveIsland_ResortGorgeous/events.inc" - .include "data/maps/FiveIsland_WaterLabyrinth/events.inc" - .include "data/maps/FiveIsland_Meadow/events.inc" - .include "data/maps/FiveIsland_MemorialPillar/events.inc" - .include "data/maps/SixIsland_OutcastIsland/events.inc" - .include "data/maps/SixIsland_GreenPath/events.inc" - .include "data/maps/SixIsland_WaterPath/events.inc" - .include "data/maps/SixIsland_RuinValley/events.inc" - .include "data/maps/SevenIsland_TrainerTower/events.inc" - .include "data/maps/SevenIsland_SevaultCanyon_Entrance/events.inc" - .include "data/maps/SevenIsland_SevaultCanyon/events.inc" - .include "data/maps/SevenIsland_TanobyRuins/events.inc" - .include "data/maps/PalletTown_PlayersHouse_1F/events.inc" - .include "data/maps/PalletTown_PlayersHouse_2F/events.inc" - .include "data/maps/PalletTown_GarysHouse/events.inc" - .include "data/maps/PalletTown_ProfessorOaksLab/events.inc" - .include "data/maps/ViridianCity_House1/events.inc" - .include "data/maps/ViridianCity_Gym/events.inc" - .include "data/maps/ViridianCity_House2/events.inc" - .include "data/maps/ViridianCity_Mart/events.inc" - .include "data/maps/ViridianCity_PokemonCenter_1F/events.inc" - .include "data/maps/ViridianCity_PokemonCenter_2F/events.inc" - .include "data/maps/PewterCity_Museum_1F/events.inc" - .include "data/maps/PewterCity_Museum_2F/events.inc" - .include "data/maps/PewterCity_Gym/events.inc" - .include "data/maps/PewterCity_Mart/events.inc" - .include "data/maps/PewterCity_House1/events.inc" - .include "data/maps/PewterCity_PokemonCenter_1F/events.inc" - .include "data/maps/PewterCity_PokemonCenter_2F/events.inc" - .include "data/maps/PewterCity_House2/events.inc" - .include "data/maps/CeruleanCity_House1/events.inc" - .include "data/maps/CeruleanCity_House2/events.inc" - .include "data/maps/CeruleanCity_House3/events.inc" - .include "data/maps/CeruleanCity_PokemonCenter_1F/events.inc" - .include "data/maps/CeruleanCity_PokemonCenter_2F/events.inc" - .include "data/maps/CeruleanCity_Gym/events.inc" - .include "data/maps/CeruleanCity_BikeShop/events.inc" - .include "data/maps/CeruleanCity_Mart/events.inc" - .include "data/maps/CeruleanCity_House4/events.inc" - .include "data/maps/CeruleanCity_House5/events.inc" - .include "data/maps/LavenderTown_PokemonCenter_1F/events.inc" - .include "data/maps/LavenderTown_PokemonCenter_2F/events.inc" - .include "data/maps/LavenderTown_VolunteerPokemonHouse/events.inc" - .include "data/maps/LavenderTown_House1/events.inc" - .include "data/maps/LavenderTown_House2/events.inc" - .include "data/maps/LavenderTown_Mart/events.inc" - .include "data/maps/VermilionCity_House1/events.inc" - .include "data/maps/VermilionCity_PokemonCenter_1F/events.inc" - .include "data/maps/VermilionCity_PokemonCenter_2F/events.inc" - .include "data/maps/VermilionCity_PokemonFanClub/events.inc" - .include "data/maps/VermilionCity_House2/events.inc" - .include "data/maps/VermilionCity_Mart/events.inc" - .include "data/maps/VermilionCity_Gym/events.inc" - .include "data/maps/VermilionCity_House3/events.inc" - .include "data/maps/CeladonCity_DepartmentStore_1F/events.inc" - .include "data/maps/CeladonCity_DepartmentStore_2F/events.inc" - .include "data/maps/CeladonCity_DepartmentStore_3F/events.inc" - .include "data/maps/CeladonCity_DepartmentStore_4F/events.inc" - .include "data/maps/CeladonCity_DepartmentStore_5F/events.inc" - .include "data/maps/CeladonCity_DepartmentStore_Roof/events.inc" - .include "data/maps/CeladonCity_DepartmentStore_Elevator/events.inc" - .include "data/maps/CeladonCity_Condominiums_1F/events.inc" - .include "data/maps/CeladonCity_Condominiums_2F/events.inc" - .include "data/maps/CeladonCity_Condominiums_3F/events.inc" - .include "data/maps/CeladonCity_Condominiums_Roof/events.inc" - .include "data/maps/CeladonCity_Condominiums_RoofRoom/events.inc" - .include "data/maps/CeladonCity_PokemonCenter_1F/events.inc" - .include "data/maps/CeladonCity_PokemonCenter_2F/events.inc" - .include "data/maps/CeladonCity_GameCorner/events.inc" - .include "data/maps/CeladonCity_GameCorner_PrizeRoom/events.inc" - .include "data/maps/CeladonCity_Gym/events.inc" - .include "data/maps/CeladonCity_Restaurant/events.inc" - .include "data/maps/CeladonCity_House1/events.inc" - .include "data/maps/CeladonCity_Hotel/events.inc" - .include "data/maps/FuchsiaCity_SafariZone_Entrance/events.inc" - .include "data/maps/FuchsiaCity_Mart/events.inc" - .include "data/maps/FuchsiaCity_ZooBuilding/events.inc" - .include "data/maps/FuchsiaCity_Gym/events.inc" - .include "data/maps/FuchsiaCity_House1/events.inc" - .include "data/maps/FuchsiaCity_PokemonCenter_1F/events.inc" - .include "data/maps/FuchsiaCity_PokemonCenter_2F/events.inc" - .include "data/maps/FuchsiaCity_Building1/events.inc" - .include "data/maps/FuchsiaCity_House2/events.inc" - .include "data/maps/FuchsiaCity_House3/events.inc" - .include "data/maps/CinnabarIsland_Gym/events.inc" - .include "data/maps/CinnabarIsland_PokemonLab_Entrance/events.inc" - .include "data/maps/CinnabarIsland_PokemonLab_Lounge/events.inc" - .include "data/maps/CinnabarIsland_PokemonLab_ResearchRoom/events.inc" - .include "data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/events.inc" - .include "data/maps/CinnabarIsland_PokemonCenter_1F/events.inc" - .include "data/maps/CinnabarIsland_PokemonCenter_2F/events.inc" - .include "data/maps/CinnabarIsland_Mart/events.inc" - .include "data/maps/IndigoPlateau_PokemonCenter_1F/events.inc" - .include "data/maps/IndigoPlateau_PokemonCenter_2F/events.inc" - .include "data/maps/SaffronCity_House1_1F/events.inc" - .include "data/maps/SaffronCity_House1_2F/events.inc" - .include "data/maps/SaffronCity_Dojo/events.inc" - .include "data/maps/SaffronCity_Gym/events.inc" - .include "data/maps/SaffronCity_House2/events.inc" - .include "data/maps/SaffronCity_Mart/events.inc" - .include "data/maps/SaffronCity_PokemonCenter_1F/events.inc" - .include "data/maps/SaffronCity_PokemonCenter_2F/events.inc" - .include "data/maps/SaffronCity_House3/events.inc" - .include "data/maps/SaffronCity_PokemonTrainerFanClub/events.inc" - .include "data/maps/Route2_ViridianForest_SouthEntrance/events.inc" - .include "data/maps/Route2_House/events.inc" - .include "data/maps/Route2_EastBuilding/events.inc" - .include "data/maps/Route2_ViridianForest_NorthEntrance/events.inc" - .include "data/maps/Route4_PokemonCenter_1F/events.inc" - .include "data/maps/Route4_PokemonCenter_2F/events.inc" - .include "data/maps/Route5_PokemonDayCare/events.inc" - .include "data/maps/Route5_SouthEntrance/events.inc" - .include "data/maps/Route6_NorthEntrance/events.inc" - .include "data/maps/UnknownMap_18_01/events.inc" - .include "data/maps/Route7_EastEntrance/events.inc" - .include "data/maps/Route8_WestEntrance/events.inc" - .include "data/maps/Route10_PokemonCenter_1F/events.inc" - .include "data/maps/Route10_PokemonCenter_2F/events.inc" - .include "data/maps/Route11_EastEntrance_1F/events.inc" - .include "data/maps/Route11_EastEntrance_2F/events.inc" - .include "data/maps/Route12_NorthEntrance_1F/events.inc" - .include "data/maps/Route12_NorthEntrance_2F/events.inc" - .include "data/maps/Route12_FishingHouse/events.inc" - .include "data/maps/Route15_WestEntrance_1F/events.inc" - .include "data/maps/Route15_WestEntrance_2F/events.inc" - .include "data/maps/Route16_House/events.inc" - .include "data/maps/Route16_NorthEntrance_1F/events.inc" - .include "data/maps/Route16_NorthEntrance_2F/events.inc" - .include "data/maps/Route18_EastEntrance_1F/events.inc" - .include "data/maps/Route18_EastEntrance_2F/events.inc" - .include "data/maps/UnusedHouse_27_00/events.inc" - .include "data/maps/Route22_NorthEntrance/events.inc" - .include "data/maps/UnusedHouse_29_00/events.inc" - .include "data/maps/Route25_SeaCottage/events.inc" - .include "data/maps/SevenIsland_House_Room1/events.inc" - .include "data/maps/SevenIsland_House_Room2/events.inc" - .include "data/maps/SevenIsland_Mart/events.inc" - .include "data/maps/SevenIsland_PokemonCenter_1F/events.inc" - .include "data/maps/SevenIsland_PokemonCenter_2F/events.inc" - .include "data/maps/UnusedHouse_31_05/events.inc" - .include "data/maps/SevenIsland_Harbor/events.inc" - .include "data/maps/OneIsland_PokemonCenter_1F/events.inc" - .include "data/maps/OneIsland_PokemonCenter_2F/events.inc" - .include "data/maps/OneIsland_House1/events.inc" - .include "data/maps/OneIsland_House2/events.inc" - .include "data/maps/OneIsland_Harbor/events.inc" - .include "data/maps/TwoIsland_JoyfulGameCorner/events.inc" - .include "data/maps/TwoIsland_House/events.inc" - .include "data/maps/TwoIsland_PokemonCenter_1F/events.inc" - .include "data/maps/TwoIsland_PokemonCenter_2F/events.inc" - .include "data/maps/TwoIsland_Harbor/events.inc" - .include "data/maps/ThreeIsland_House1/events.inc" - .include "data/maps/ThreeIsland_PokemonCenter_1F/events.inc" - .include "data/maps/ThreeIsland_PokemonCenter_2F/events.inc" - .include "data/maps/ThreeIsland_Mart/events.inc" - .include "data/maps/ThreeIsland_House2/events.inc" - .include "data/maps/ThreeIsland_House3/events.inc" - .include "data/maps/ThreeIsland_House4/events.inc" - .include "data/maps/ThreeIsland_House5/events.inc" - .include "data/maps/FourIsland_PokemonDayCare/events.inc" - .include "data/maps/FourIsland_PokemonCenter_1F/events.inc" - .include "data/maps/FourIsland_PokemonCenter_2F/events.inc" - .include "data/maps/FourIsland_House1/events.inc" - .include "data/maps/FourIsland_LoreleisHouse/events.inc" - .include "data/maps/FourIsland_Harbor/events.inc" - .include "data/maps/FourIsland_House2/events.inc" - .include "data/maps/FourIsland_Mart/events.inc" - .include "data/maps/FiveIsland_PokemonCenter_1F/events.inc" - .include "data/maps/FiveIsland_PokemonCenter_2F/events.inc" - .include "data/maps/FiveIsland_Harbor/events.inc" - .include "data/maps/FiveIsland_House1/events.inc" - .include "data/maps/FiveIsland_House2/events.inc" - .include "data/maps/SixIsland_PokemonCenter_1F/events.inc" - .include "data/maps/SixIsland_PokemonCenter_2F/events.inc" - .include "data/maps/SixIsland_Harbor/events.inc" - .include "data/maps/SixIsland_House/events.inc" - .include "data/maps/SixIsland_Mart/events.inc" - .include "data/maps/ThreeIsland_Harbor/events.inc" - .include "data/maps/FiveIsland_ResortGorgeous_House/events.inc" - .include "data/maps/TwoIsland_CapeBrink_House/events.inc" - .include "data/maps/SixIsland_WaterPath_House1/events.inc" - .include "data/maps/SixIsland_WaterPath_House2/events.inc" - .include "data/maps/SevenIsland_SevaultCanyon_House/events.inc" diff --git a/data/maps/groups.inc b/data/maps/groups.inc deleted file mode 100644 index 8e180eafd..000000000 --- a/data/maps/groups.inc +++ /dev/null @@ -1,555 +0,0 @@ -gMapGroup_00:: @ 8352004 - .4byte UnknownMap_00_00 - .4byte UnknownMap_00_01 - .4byte UnknownMap_00_02 - .4byte UnknownMap_00_03 - .4byte UnknownMap_00_04 - -gMapGroup_01:: @ 8352018 - .4byte ViridianForest - .4byte MtMoon_1F - .4byte MtMoon_B1F - .4byte MtMoon_B2F - .4byte SSAnne_Exterior - .4byte SSAnne_1F_Corridor - .4byte SSAnne_2F_Corridor - .4byte SSAnne_3F_Corridor - .4byte SSAnne_B1F_Corridor - .4byte SSAnne_Deck - .4byte SSAnne_Kitchen - .4byte SSAnne_CaptainsOffice - .4byte SSAnne_1F_Room1 - .4byte SSAnne_1F_Room2 - .4byte SSAnne_1F_Room3 - .4byte SSAnne_1F_Room4 - .4byte SSAnne_1F_Room5 - .4byte SSAnne_1F_Room7 - .4byte SSAnne_2F_Room1 - .4byte SSAnne_2F_Room2 - .4byte SSAnne_2F_Room3 - .4byte SSAnne_2F_Room4 - .4byte SSAnne_2F_Room5 - .4byte SSAnne_2F_Room6 - .4byte SSAnne_B1F_Room1 - .4byte SSAnne_B1F_Room2 - .4byte SSAnne_B1F_Room3 - .4byte SSAnne_B1F_Room4 - .4byte SSAnne_B1F_Room5 - .4byte SSAnne_1F_Room6 - .4byte UndergroundPath_NorthEntrance - .4byte UndergroundPath_NorthSouthTunnel - .4byte UndergroundPath_SouthEntrance - .4byte UndergroundPath_WestEntrance - .4byte UndergroundPath_EastWestTunnel - .4byte UndergroundPath_EastEntrance - .4byte DiglettsCave_NorthEntrance - .4byte DiglettsCave_B1F - .4byte DiglettsCave_SouthEntrance - .4byte VictoryRoad_1F - .4byte VictoryRoad_2F - .4byte VictoryRoad_3F - .4byte RocketHideout_B1F - .4byte RocketHideout_B2F - .4byte RocketHideout_B3F - .4byte RocketHideout_B4F - .4byte RocketHideout_Elevator - .4byte SilphCo_1F - .4byte SilphCo_2F - .4byte SilphCo_3F - .4byte SilphCo_4F - .4byte SilphCo_5F - .4byte SilphCo_6F - .4byte SilphCo_7F - .4byte SilphCo_8F - .4byte SilphCo_9F - .4byte SilphCo_10F - .4byte SilphCo_11F - .4byte SilphCo_Elevator - .4byte PokemonMansion_1F - .4byte PokemonMansion_2F - .4byte PokemonMansion_3F - .4byte PokemonMansion_B1F - .4byte SafariZone_Center - .4byte SafariZone_East - .4byte SafariZone_North - .4byte SafariZone_West - .4byte SafariZone_Building1 - .4byte SafariZone_Building2 - .4byte SafariZone_Building3 - .4byte SafariZone_Building4 - .4byte SafariZone_SecretHouse - .4byte CeruleanCave_1F - .4byte CeruleanCave_2F - .4byte CeruleanCave_B1F - .4byte PokemonLeague_LoreleisRoom - .4byte PokemonLeague_BrunosRoom - .4byte PokemonLeague_AgathasRoom - .4byte PokemonLeague_LancesRoom - .4byte PokemonLeague_ChampionsRoom - .4byte PokemonLeague_HallOfFame - .4byte RockTunnel_1F - .4byte RockTunnel_B1F - .4byte SeafoamIslands_1F - .4byte SeafoamIslands_B1F - .4byte SeafoamIslands_B2F - .4byte SeafoamIslands_B3F - .4byte SeafoamIslands_B4F - .4byte PokemonTower_1F - .4byte PokemonTower_2F - .4byte PokemonTower_3F - .4byte PokemonTower_4F - .4byte PokemonTower_5F - .4byte PokemonTower_6F - .4byte PokemonTower_7F - .4byte PowerPlant - .4byte MtEmber_RubyPath_B4F - .4byte MtEmber_Exterior - .4byte MtEmber_SummitPath_1F - .4byte MtEmber_SummitPath_2F - .4byte MtEmber_SummitPath_3F - .4byte MtEmber_Summit - .4byte MtEmber_RubyPath_B5F - .4byte SSAnne_Kitchen3 - .4byte MtEmber_RubyPath_B1F - .4byte MtEmber_RubyPath_B2F - .4byte MtEmber_RubyPath_B3F - .4byte MtEmber_RubyPath_B1F_Stairs - .4byte MtEmber_RubyPath_B2F_Stairs - .4byte ThreeIsland_BerryForest - .4byte FourIsland_IcefallCave_Entrance - .4byte FourIsland_IcefallCave_1F - .4byte SSAnne_CaptainsOffice2 - .4byte SSAnne_CaptainsOffice3 - .4byte SSAnne_CaptainsOffice4 - .4byte SSAnne_CaptainsOffice5 - .4byte SixIsland_DottedHole_B1F - .4byte SixIsland_DottedHole_B2F - .4byte SixIsland_DottedHole_B3F - .4byte SSAnne_CaptainsOffice9 - .4byte SixIsland_DottedHole_SapphireRoom - .4byte SSAnne_1F_Room11 - .4byte SSAnne_1F_Room12 - -gMapGroup_02:: @ 8352204 - .4byte NavelRock_Exterior - .4byte SevenIsland_TrainerTower_1F - .4byte SevenIsland_TrainerTower_2F - .4byte SevenIsland_TrainerTower_3F - .4byte SevenIsland_TrainerTower_4F - .4byte SevenIsland_TrainerTower_5F - .4byte SevenIsland_TrainerTower_6F - .4byte SevenIsland_TrainerTower_7F - .4byte SevenIsland_TrainerTower_8F - .4byte SevenIsland_TrainerTower_Roof - .4byte SevenIsland_TrainerTower_Lobby - .4byte SevenIsland_TrainerTower_Elevator - .4byte FiveIsland_LostCave_Entrance - .4byte FiveIsland_LostCave_Room1 - .4byte FiveIsland_LostCave_Room2 - .4byte FiveIsland_LostCave_Room3 - .4byte FiveIsland_LostCave_Room4 - .4byte FiveIsland_LostCave_Room5 - .4byte FiveIsland_LostCave_Room6 - .4byte FiveIsland_LostCave_Room7 - .4byte FiveIsland_LostCave_Room8 - .4byte FiveIsland_LostCave_Room9 - .4byte FiveIsland_LostCave_Room10 - .4byte FiveIsland_LostCave_Room11 - .4byte FiveIsland_LostCave_Room12 - .4byte FiveIsland_LostCave_Room13 - .4byte FiveIsland_LostCave_Room14 - .4byte SevenIsland_TanobyRuins_MoneanChamber - .4byte SevenIsland_TanobyRuins_LiptooChamber - .4byte SevenIsland_TanobyRuins_WeepthChamber - .4byte SevenIsland_TanobyRuins_DilfordChamber - .4byte SevenIsland_TanobyRuins_ScufibChamber - .4byte SevenIsland_TanobyRuins_RixyChamber - .4byte SevenIsland_TanobyRuins_ViapoisChamber - .4byte ThreeIsland_DunsparceTunnel - .4byte SevenIsland_SeavaultCanyon_TanobyKey - .4byte NavelRock_1F - .4byte NavelRock_Summit - .4byte NavelRock_Base - .4byte NavelRock_SummitPath_2F - .4byte NavelRock_SummitPath_3F - .4byte NavelRock_SummitPath_4F - .4byte NavelRock_SummitPath_5F - .4byte NavelRock_BasePath_B1F - .4byte NavelRock_BasePath_B2F - .4byte NavelRock_BasePath_B3F - .4byte NavelRock_BasePath_B4F - .4byte NavelRock_BasePath_B5F - .4byte NavelRock_BasePath_B6F - .4byte NavelRock_BasePath_B7F - .4byte NavelRock_BasePath_B8F - .4byte NavelRock_BasePath_B9F - .4byte NavelRock_BasePath_B10F - .4byte NavelRock_BasePath_B11F - .4byte NavelRock_B1F - .4byte NavelRock_Fork - .4byte BirthIsland_Exterior - .4byte OneIsland_KindleRoad_EmberSpa - .4byte BirthIsland_Harbor - .4byte NavelRock_Harbor - -gMapGroup_03:: @ 83522F4 - .4byte PalletTown - .4byte ViridianCity - .4byte PewterCity - .4byte CeruleanCity - .4byte LavenderTown - .4byte VermilionCity - .4byte CeladonCity - .4byte FuchsiaCity - .4byte CinnabarIsland - .4byte IndigoPlateau_Exterior - .4byte SaffronCity_Duplicate - .4byte SaffronCity - .4byte OneIsland - .4byte TwoIsland - .4byte ThreeIsland - .4byte FourIsland - .4byte FiveIsland - .4byte SevenIsland - .4byte SixIsland - .4byte Route1 - .4byte Route2 - .4byte Route3 - .4byte Route4 - .4byte Route5 - .4byte Route6 - .4byte Route7 - .4byte Route8 - .4byte Route9 - .4byte Route10 - .4byte Route11 - .4byte Route12 - .4byte Route13 - .4byte Route14 - .4byte Route15 - .4byte Route16 - .4byte Route17 - .4byte Route18 - .4byte Route19 - .4byte Route20 - .4byte Route21_North - .4byte Route21_South - .4byte Route22 - .4byte Route23 - .4byte Route24 - .4byte Route25 - .4byte OneIsland_KindleRoad - .4byte OneIsland_TreasureBeach - .4byte TwoIsland_CapeBrink - .4byte ThreeIsland_BondBridge - .4byte ThreeIsland_Port - .4byte UnknownMap_03_50 - .4byte UnknownMap_03_51 - .4byte UnknownMap_03_52 - .4byte UnknownMap_03_53 - .4byte FiveIsland_ResortGorgeous - .4byte FiveIsland_WaterLabyrinth - .4byte FiveIsland_Meadow - .4byte FiveIsland_MemorialPillar - .4byte SixIsland_OutcastIsland - .4byte SixIsland_GreenPath - .4byte SixIsland_WaterPath - .4byte SixIsland_RuinValley - .4byte SevenIsland_TrainerTower - .4byte SevenIsland_SevaultCanyon_Entrance - .4byte SevenIsland_SevaultCanyon - .4byte SevenIsland_TanobyRuins - -gMapGroup_04:: @ 83523FC - .4byte PalletTown_PlayersHouse_1F - .4byte PalletTown_PlayersHouse_2F - .4byte PalletTown_GarysHouse - .4byte PalletTown_ProfessorOaksLab - -gMapGroup_05:: @ 835240C - .4byte ViridianCity_House1 - .4byte ViridianCity_Gym - .4byte ViridianCity_House2 - .4byte ViridianCity_Mart - .4byte ViridianCity_PokemonCenter_1F - .4byte ViridianCity_PokemonCenter_2F - -gMapGroup_06:: @ 8352424 - .4byte PewterCity_Museum_1F - .4byte PewterCity_Museum_2F - .4byte PewterCity_Gym - .4byte PewterCity_Mart - .4byte PewterCity_House1 - .4byte PewterCity_PokemonCenter_1F - .4byte PewterCity_PokemonCenter_2F - .4byte PewterCity_House2 - -gMapGroup_07:: @ 8352444 - .4byte CeruleanCity_House1 - .4byte CeruleanCity_House2 - .4byte CeruleanCity_House3 - .4byte CeruleanCity_PokemonCenter_1F - .4byte CeruleanCity_PokemonCenter_2F - .4byte CeruleanCity_Gym - .4byte CeruleanCity_BikeShop - .4byte CeruleanCity_Mart - .4byte CeruleanCity_House4 - .4byte CeruleanCity_House5 - -gMapGroup_08:: @ 835246C - .4byte LavenderTown_PokemonCenter_1F - .4byte LavenderTown_PokemonCenter_2F - .4byte LavenderTown_VolunteerPokemonHouse - .4byte LavenderTown_House1 - .4byte LavenderTown_House2 - .4byte LavenderTown_Mart - -gMapGroup_09:: @ 8352484 - .4byte VermilionCity_House1 - .4byte VermilionCity_PokemonCenter_1F - .4byte VermilionCity_PokemonCenter_2F - .4byte VermilionCity_PokemonFanClub - .4byte VermilionCity_House2 - .4byte VermilionCity_Mart - .4byte VermilionCity_Gym - .4byte VermilionCity_House3 - -gMapGroup_10:: @ 83524A4 - .4byte CeladonCity_DepartmentStore_1F - .4byte CeladonCity_DepartmentStore_2F - .4byte CeladonCity_DepartmentStore_3F - .4byte CeladonCity_DepartmentStore_4F - .4byte CeladonCity_DepartmentStore_5F - .4byte CeladonCity_DepartmentStore_Roof - .4byte CeladonCity_DepartmentStore_Elevator - .4byte CeladonCity_Condominiums_1F - .4byte CeladonCity_Condominiums_2F - .4byte CeladonCity_Condominiums_3F - .4byte CeladonCity_Condominiums_Roof - .4byte CeladonCity_Condominiums_RoofRoom - .4byte CeladonCity_PokemonCenter_1F - .4byte CeladonCity_PokemonCenter_2F - .4byte CeladonCity_GameCorner - .4byte CeladonCity_GameCorner_PrizeRoom - .4byte CeladonCity_Gym - .4byte CeladonCity_Restaurant - .4byte CeladonCity_House1 - .4byte CeladonCity_Hotel - -gMapGroup_11:: @ 83524F4 - .4byte FuchsiaCity_SafariZone_Entrance - .4byte FuchsiaCity_Mart - .4byte FuchsiaCity_ZooBuilding - .4byte FuchsiaCity_Gym - .4byte FuchsiaCity_House1 - .4byte FuchsiaCity_PokemonCenter_1F - .4byte FuchsiaCity_PokemonCenter_2F - .4byte FuchsiaCity_Building1 - .4byte FuchsiaCity_House2 - .4byte FuchsiaCity_House3 - -gMapGroup_12:: @ 835251C - .4byte CinnabarIsland_Gym - .4byte CinnabarIsland_PokemonLab_Entrance - .4byte CinnabarIsland_PokemonLab_Lounge - .4byte CinnabarIsland_PokemonLab_ResearchRoom - .4byte CinnabarIsland_PokemonLab_ExperimentRoom - .4byte CinnabarIsland_PokemonCenter_1F - .4byte CinnabarIsland_PokemonCenter_2F - .4byte CinnabarIsland_Mart - -gMapGroup_13:: @ 835253C - .4byte IndigoPlateau_PokemonCenter_1F - .4byte IndigoPlateau_PokemonCenter_2F - -gMapGroup_14:: @ 8352544 - .4byte SaffronCity_House1_1F - .4byte SaffronCity_House1_2F - .4byte SaffronCity_Dojo - .4byte SaffronCity_Gym - .4byte SaffronCity_House2 - .4byte SaffronCity_Mart - .4byte SaffronCity_PokemonCenter_1F - .4byte SaffronCity_PokemonCenter_2F - .4byte SaffronCity_House3 - .4byte SaffronCity_PokemonTrainerFanClub - -gMapGroup_15:: @ 835256C - .4byte Route2_ViridianForest_SouthEntrance - .4byte Route2_House - .4byte Route2_EastBuilding - .4byte Route2_ViridianForest_NorthEntrance - -gMapGroup_16:: @ 835257C - .4byte Route4_PokemonCenter_1F - .4byte Route4_PokemonCenter_2F - -gMapGroup_17:: @ 8352584 - .4byte Route5_PokemonDayCare - .4byte Route5_SouthEntrance - -gMapGroup_18:: @ 835258C - .4byte Route6_NorthEntrance - .4byte UnknownMap_18_01 - -gMapGroup_19:: @ 8352594 - .4byte Route7_EastEntrance - -gMapGroup_20:: @ 8352598 - .4byte Route8_WestEntrance - -gMapGroup_21:: @ 835259C - .4byte Route10_PokemonCenter_1F - .4byte Route10_PokemonCenter_2F - -gMapGroup_22:: @ 83525A4 - .4byte Route11_EastEntrance_1F - .4byte Route11_EastEntrance_2F - -gMapGroup_23:: @ 83525AC - .4byte Route12_NorthEntrance_1F - .4byte Route12_NorthEntrance_2F - .4byte Route12_FishingHouse - -gMapGroup_24:: @ 83525B8 - .4byte Route15_WestEntrance_1F - .4byte Route15_WestEntrance_2F - -gMapGroup_25:: @ 83525C0 - .4byte Route16_House - .4byte Route16_NorthEntrance_1F - .4byte Route16_NorthEntrance_2F - -gMapGroup_26:: @ 83525CC - .4byte Route18_EastEntrance_1F - .4byte Route18_EastEntrance_2F - -gMapGroup_27:: @ 83525D4 - .4byte UnusedHouse_27_00 - -gMapGroup_28:: @ 83525D8 - .4byte Route22_NorthEntrance - -gMapGroup_29:: @ 83525DC - .4byte UnusedHouse_29_00 - -gMapGroup_30:: @ 83525E0 - .4byte Route25_SeaCottage - -gMapGroup_31:: @ 83525E4 - .4byte SevenIsland_House_Room1 - .4byte SevenIsland_House_Room2 - .4byte SevenIsland_Mart - .4byte SevenIsland_PokemonCenter_1F - .4byte SevenIsland_PokemonCenter_2F - .4byte UnusedHouse_31_05 - .4byte SevenIsland_Harbor - -gMapGroup_32:: @ 8352600 - .4byte OneIsland_PokemonCenter_1F - .4byte OneIsland_PokemonCenter_2F - .4byte OneIsland_House1 - .4byte OneIsland_House2 - .4byte OneIsland_Harbor - -gMapGroup_33:: @ 8352614 - .4byte TwoIsland_JoyfulGameCorner - .4byte TwoIsland_House - .4byte TwoIsland_PokemonCenter_1F - .4byte TwoIsland_PokemonCenter_2F - .4byte TwoIsland_Harbor - -gMapGroup_34:: @ 8352628 - .4byte ThreeIsland_House1 - .4byte ThreeIsland_PokemonCenter_1F - .4byte ThreeIsland_PokemonCenter_2F - .4byte ThreeIsland_Mart - .4byte ThreeIsland_House2 - .4byte ThreeIsland_House3 - .4byte ThreeIsland_House4 - .4byte ThreeIsland_House5 - -gMapGroup_35:: @ 8352648 - .4byte FourIsland_PokemonDayCare - .4byte FourIsland_PokemonCenter_1F - .4byte FourIsland_PokemonCenter_2F - .4byte FourIsland_House1 - .4byte FourIsland_LoreleisHouse - .4byte FourIsland_Harbor - .4byte FourIsland_House2 - .4byte FourIsland_Mart - -gMapGroup_36:: @ 8352668 - .4byte FiveIsland_PokemonCenter_1F - .4byte FiveIsland_PokemonCenter_2F - .4byte FiveIsland_Harbor - .4byte FiveIsland_House1 - .4byte FiveIsland_House2 - -gMapGroup_37:: @ 835267C - .4byte SixIsland_PokemonCenter_1F - .4byte SixIsland_PokemonCenter_2F - .4byte SixIsland_Harbor - .4byte SixIsland_House - .4byte SixIsland_Mart - -gMapGroup_38:: @ 8352690 - .4byte ThreeIsland_Harbor - -gMapGroup_39:: @ 8352694 - .4byte FiveIsland_ResortGorgeous_House - -gMapGroup_40:: @ 8352698 - .4byte TwoIsland_CapeBrink_House - -gMapGroup_41:: @ 835269C - .4byte SixIsland_WaterPath_House1 - .4byte SixIsland_WaterPath_House2 - -gMapGroup_42:: @ 83526A4 - .4byte SevenIsland_SevaultCanyon_House - -gMapGroups:: @ 0x83526A8 - .4byte gMapGroup_00 - .4byte gMapGroup_01 - .4byte gMapGroup_02 - .4byte gMapGroup_03 - .4byte gMapGroup_04 - .4byte gMapGroup_05 - .4byte gMapGroup_06 - .4byte gMapGroup_07 - .4byte gMapGroup_08 - .4byte gMapGroup_09 - .4byte gMapGroup_10 - .4byte gMapGroup_11 - .4byte gMapGroup_12 - .4byte gMapGroup_13 - .4byte gMapGroup_14 - .4byte gMapGroup_15 - .4byte gMapGroup_16 - .4byte gMapGroup_17 - .4byte gMapGroup_18 - .4byte gMapGroup_19 - .4byte gMapGroup_20 - .4byte gMapGroup_21 - .4byte gMapGroup_22 - .4byte gMapGroup_23 - .4byte gMapGroup_24 - .4byte gMapGroup_25 - .4byte gMapGroup_26 - .4byte gMapGroup_27 - .4byte gMapGroup_28 - .4byte gMapGroup_29 - .4byte gMapGroup_30 - .4byte gMapGroup_31 - .4byte gMapGroup_32 - .4byte gMapGroup_33 - .4byte gMapGroup_34 - .4byte gMapGroup_35 - .4byte gMapGroup_36 - .4byte gMapGroup_37 - .4byte gMapGroup_38 - .4byte gMapGroup_39 - .4byte gMapGroup_40 - .4byte gMapGroup_41 - .4byte gMapGroup_42 diff --git a/data/maps/headers.inc b/data/maps/headers.inc deleted file mode 100644 index 7edb2d4d5..000000000 --- a/data/maps/headers.inc +++ /dev/null @@ -1,425 +0,0 @@ - .include "data/maps/UnknownMap_00_00/header.inc" - .include "data/maps/UnknownMap_00_01/header.inc" - .include "data/maps/UnknownMap_00_02/header.inc" - .include "data/maps/UnknownMap_00_03/header.inc" - .include "data/maps/UnknownMap_00_04/header.inc" - .include "data/maps/ViridianForest/header.inc" - .include "data/maps/MtMoon_1F/header.inc" - .include "data/maps/MtMoon_B1F/header.inc" - .include "data/maps/MtMoon_B2F/header.inc" - .include "data/maps/SSAnne_Exterior/header.inc" - .include "data/maps/SSAnne_1F_Corridor/header.inc" - .include "data/maps/SSAnne_2F_Corridor/header.inc" - .include "data/maps/SSAnne_3F_Corridor/header.inc" - .include "data/maps/SSAnne_B1F_Corridor/header.inc" - .include "data/maps/SSAnne_Deck/header.inc" - .include "data/maps/SSAnne_Kitchen/header.inc" - .include "data/maps/SSAnne_CaptainsOffice/header.inc" - .include "data/maps/SSAnne_1F_Room1/header.inc" - .include "data/maps/SSAnne_1F_Room2/header.inc" - .include "data/maps/SSAnne_1F_Room3/header.inc" - .include "data/maps/SSAnne_1F_Room4/header.inc" - .include "data/maps/SSAnne_1F_Room5/header.inc" - .include "data/maps/SSAnne_1F_Room7/header.inc" - .include "data/maps/SSAnne_2F_Room1/header.inc" - .include "data/maps/SSAnne_2F_Room2/header.inc" - .include "data/maps/SSAnne_2F_Room3/header.inc" - .include "data/maps/SSAnne_2F_Room4/header.inc" - .include "data/maps/SSAnne_2F_Room5/header.inc" - .include "data/maps/SSAnne_2F_Room6/header.inc" - .include "data/maps/SSAnne_B1F_Room1/header.inc" - .include "data/maps/SSAnne_B1F_Room2/header.inc" - .include "data/maps/SSAnne_B1F_Room3/header.inc" - .include "data/maps/SSAnne_B1F_Room4/header.inc" - .include "data/maps/SSAnne_B1F_Room5/header.inc" - .include "data/maps/SSAnne_1F_Room6/header.inc" - .include "data/maps/UndergroundPath_NorthEntrance/header.inc" - .include "data/maps/UndergroundPath_NorthSouthTunnel/header.inc" - .include "data/maps/UndergroundPath_SouthEntrance/header.inc" - .include "data/maps/UndergroundPath_WestEntrance/header.inc" - .include "data/maps/UndergroundPath_EastWestTunnel/header.inc" - .include "data/maps/UndergroundPath_EastEntrance/header.inc" - .include "data/maps/DiglettsCave_NorthEntrance/header.inc" - .include "data/maps/DiglettsCave_B1F/header.inc" - .include "data/maps/DiglettsCave_SouthEntrance/header.inc" - .include "data/maps/VictoryRoad_1F/header.inc" - .include "data/maps/VictoryRoad_2F/header.inc" - .include "data/maps/VictoryRoad_3F/header.inc" - .include "data/maps/RocketHideout_B1F/header.inc" - .include "data/maps/RocketHideout_B2F/header.inc" - .include "data/maps/RocketHideout_B3F/header.inc" - .include "data/maps/RocketHideout_B4F/header.inc" - .include "data/maps/RocketHideout_Elevator/header.inc" - .include "data/maps/SilphCo_1F/header.inc" - .include "data/maps/SilphCo_2F/header.inc" - .include "data/maps/SilphCo_3F/header.inc" - .include "data/maps/SilphCo_4F/header.inc" - .include "data/maps/SilphCo_5F/header.inc" - .include "data/maps/SilphCo_6F/header.inc" - .include "data/maps/SilphCo_7F/header.inc" - .include "data/maps/SilphCo_8F/header.inc" - .include "data/maps/SilphCo_9F/header.inc" - .include "data/maps/SilphCo_10F/header.inc" - .include "data/maps/SilphCo_11F/header.inc" - .include "data/maps/SilphCo_Elevator/header.inc" - .include "data/maps/PokemonMansion_1F/header.inc" - .include "data/maps/PokemonMansion_2F/header.inc" - .include "data/maps/PokemonMansion_3F/header.inc" - .include "data/maps/PokemonMansion_B1F/header.inc" - .include "data/maps/SafariZone_Center/header.inc" - .include "data/maps/SafariZone_East/header.inc" - .include "data/maps/SafariZone_North/header.inc" - .include "data/maps/SafariZone_West/header.inc" - .include "data/maps/SafariZone_Building1/header.inc" - .include "data/maps/SafariZone_Building2/header.inc" - .include "data/maps/SafariZone_Building3/header.inc" - .include "data/maps/SafariZone_Building4/header.inc" - .include "data/maps/SafariZone_SecretHouse/header.inc" - .include "data/maps/CeruleanCave_1F/header.inc" - .include "data/maps/CeruleanCave_2F/header.inc" - .include "data/maps/CeruleanCave_B1F/header.inc" - .include "data/maps/PokemonLeague_LoreleisRoom/header.inc" - .include "data/maps/PokemonLeague_BrunosRoom/header.inc" - .include "data/maps/PokemonLeague_AgathasRoom/header.inc" - .include "data/maps/PokemonLeague_LancesRoom/header.inc" - .include "data/maps/PokemonLeague_ChampionsRoom/header.inc" - .include "data/maps/PokemonLeague_HallOfFame/header.inc" - .include "data/maps/RockTunnel_1F/header.inc" - .include "data/maps/RockTunnel_B1F/header.inc" - .include "data/maps/SeafoamIslands_1F/header.inc" - .include "data/maps/SeafoamIslands_B1F/header.inc" - .include "data/maps/SeafoamIslands_B2F/header.inc" - .include "data/maps/SeafoamIslands_B3F/header.inc" - .include "data/maps/SeafoamIslands_B4F/header.inc" - .include "data/maps/PokemonTower_1F/header.inc" - .include "data/maps/PokemonTower_2F/header.inc" - .include "data/maps/PokemonTower_3F/header.inc" - .include "data/maps/PokemonTower_4F/header.inc" - .include "data/maps/PokemonTower_5F/header.inc" - .include "data/maps/PokemonTower_6F/header.inc" - .include "data/maps/PokemonTower_7F/header.inc" - .include "data/maps/PowerPlant/header.inc" - .include "data/maps/MtEmber_RubyPath_B4F/header.inc" - .include "data/maps/MtEmber_Exterior/header.inc" - .include "data/maps/MtEmber_SummitPath_1F/header.inc" - .include "data/maps/MtEmber_SummitPath_2F/header.inc" - .include "data/maps/MtEmber_SummitPath_3F/header.inc" - .include "data/maps/MtEmber_Summit/header.inc" - .include "data/maps/MtEmber_RubyPath_B5F/header.inc" - .include "data/maps/SSAnne_Kitchen3/header.inc" - .include "data/maps/MtEmber_RubyPath_B1F/header.inc" - .include "data/maps/MtEmber_RubyPath_B2F/header.inc" - .include "data/maps/MtEmber_RubyPath_B3F/header.inc" - .include "data/maps/MtEmber_RubyPath_B1F_Stairs/header.inc" - .include "data/maps/MtEmber_RubyPath_B2F_Stairs/header.inc" - .include "data/maps/ThreeIsland_BerryForest/header.inc" - .include "data/maps/FourIsland_IcefallCave_Entrance/header.inc" - .include "data/maps/FourIsland_IcefallCave_1F/header.inc" - .include "data/maps/SSAnne_CaptainsOffice2/header.inc" - .include "data/maps/SSAnne_CaptainsOffice3/header.inc" - .include "data/maps/SSAnne_CaptainsOffice4/header.inc" - .include "data/maps/SSAnne_CaptainsOffice5/header.inc" - .include "data/maps/SixIsland_DottedHole_B1F/header.inc" - .include "data/maps/SixIsland_DottedHole_B2F/header.inc" - .include "data/maps/SixIsland_DottedHole_B3F/header.inc" - .include "data/maps/SSAnne_CaptainsOffice9/header.inc" - .include "data/maps/SixIsland_DottedHole_SapphireRoom/header.inc" - .include "data/maps/SSAnne_1F_Room11/header.inc" - .include "data/maps/SSAnne_1F_Room12/header.inc" - .include "data/maps/NavelRock_Exterior/header.inc" - .include "data/maps/SevenIsland_TrainerTower_1F/header.inc" - .include "data/maps/SevenIsland_TrainerTower_2F/header.inc" - .include "data/maps/SevenIsland_TrainerTower_3F/header.inc" - .include "data/maps/SevenIsland_TrainerTower_4F/header.inc" - .include "data/maps/SevenIsland_TrainerTower_5F/header.inc" - .include "data/maps/SevenIsland_TrainerTower_6F/header.inc" - .include "data/maps/SevenIsland_TrainerTower_7F/header.inc" - .include "data/maps/SevenIsland_TrainerTower_8F/header.inc" - .include "data/maps/SevenIsland_TrainerTower_Roof/header.inc" - .include "data/maps/SevenIsland_TrainerTower_Lobby/header.inc" - .include "data/maps/SevenIsland_TrainerTower_Elevator/header.inc" - .include "data/maps/FiveIsland_LostCave_Entrance/header.inc" - .include "data/maps/FiveIsland_LostCave_Room1/header.inc" - .include "data/maps/FiveIsland_LostCave_Room2/header.inc" - .include "data/maps/FiveIsland_LostCave_Room3/header.inc" - .include "data/maps/FiveIsland_LostCave_Room4/header.inc" - .include "data/maps/FiveIsland_LostCave_Room5/header.inc" - .include "data/maps/FiveIsland_LostCave_Room6/header.inc" - .include "data/maps/FiveIsland_LostCave_Room7/header.inc" - .include "data/maps/FiveIsland_LostCave_Room8/header.inc" - .include "data/maps/FiveIsland_LostCave_Room9/header.inc" - .include "data/maps/FiveIsland_LostCave_Room10/header.inc" - .include "data/maps/FiveIsland_LostCave_Room11/header.inc" - .include "data/maps/FiveIsland_LostCave_Room12/header.inc" - .include "data/maps/FiveIsland_LostCave_Room13/header.inc" - .include "data/maps/FiveIsland_LostCave_Room14/header.inc" - .include "data/maps/SevenIsland_TanobyRuins_MoneanChamber/header.inc" - .include "data/maps/SevenIsland_TanobyRuins_LiptooChamber/header.inc" - .include "data/maps/SevenIsland_TanobyRuins_WeepthChamber/header.inc" - .include "data/maps/SevenIsland_TanobyRuins_DilfordChamber/header.inc" - .include "data/maps/SevenIsland_TanobyRuins_ScufibChamber/header.inc" - .include "data/maps/SevenIsland_TanobyRuins_RixyChamber/header.inc" - .include "data/maps/SevenIsland_TanobyRuins_ViapoisChamber/header.inc" - .include "data/maps/ThreeIsland_DunsparceTunnel/header.inc" - .include "data/maps/SevenIsland_SeavaultCanyon_TanobyKey/header.inc" - .include "data/maps/NavelRock_1F/header.inc" - .include "data/maps/NavelRock_Summit/header.inc" - .include "data/maps/NavelRock_Base/header.inc" - .include "data/maps/NavelRock_SummitPath_2F/header.inc" - .include "data/maps/NavelRock_SummitPath_3F/header.inc" - .include "data/maps/NavelRock_SummitPath_4F/header.inc" - .include "data/maps/NavelRock_SummitPath_5F/header.inc" - .include "data/maps/NavelRock_BasePath_B1F/header.inc" - .include "data/maps/NavelRock_BasePath_B2F/header.inc" - .include "data/maps/NavelRock_BasePath_B3F/header.inc" - .include "data/maps/NavelRock_BasePath_B4F/header.inc" - .include "data/maps/NavelRock_BasePath_B5F/header.inc" - .include "data/maps/NavelRock_BasePath_B6F/header.inc" - .include "data/maps/NavelRock_BasePath_B7F/header.inc" - .include "data/maps/NavelRock_BasePath_B8F/header.inc" - .include "data/maps/NavelRock_BasePath_B9F/header.inc" - .include "data/maps/NavelRock_BasePath_B10F/header.inc" - .include "data/maps/NavelRock_BasePath_B11F/header.inc" - .include "data/maps/NavelRock_B1F/header.inc" - .include "data/maps/NavelRock_Fork/header.inc" - .include "data/maps/BirthIsland_Exterior/header.inc" - .include "data/maps/OneIsland_KindleRoad_EmberSpa/header.inc" - .include "data/maps/BirthIsland_Harbor/header.inc" - .include "data/maps/NavelRock_Harbor/header.inc" - .include "data/maps/PalletTown/header.inc" - .include "data/maps/ViridianCity/header.inc" - .include "data/maps/PewterCity/header.inc" - .include "data/maps/CeruleanCity/header.inc" - .include "data/maps/LavenderTown/header.inc" - .include "data/maps/VermilionCity/header.inc" - .include "data/maps/CeladonCity/header.inc" - .include "data/maps/FuchsiaCity/header.inc" - .include "data/maps/CinnabarIsland/header.inc" - .include "data/maps/IndigoPlateau_Exterior/header.inc" - .include "data/maps/SaffronCity_Duplicate/header.inc" - .include "data/maps/SaffronCity/header.inc" - .include "data/maps/OneIsland/header.inc" - .include "data/maps/TwoIsland/header.inc" - .include "data/maps/ThreeIsland/header.inc" - .include "data/maps/FourIsland/header.inc" - .include "data/maps/FiveIsland/header.inc" - .include "data/maps/SevenIsland/header.inc" - .include "data/maps/SixIsland/header.inc" - .include "data/maps/Route1/header.inc" - .include "data/maps/Route2/header.inc" - .include "data/maps/Route3/header.inc" - .include "data/maps/Route4/header.inc" - .include "data/maps/Route5/header.inc" - .include "data/maps/Route6/header.inc" - .include "data/maps/Route7/header.inc" - .include "data/maps/Route8/header.inc" - .include "data/maps/Route9/header.inc" - .include "data/maps/Route10/header.inc" - .include "data/maps/Route11/header.inc" - .include "data/maps/Route12/header.inc" - .include "data/maps/Route13/header.inc" - .include "data/maps/Route14/header.inc" - .include "data/maps/Route15/header.inc" - .include "data/maps/Route16/header.inc" - .include "data/maps/Route17/header.inc" - .include "data/maps/Route18/header.inc" - .include "data/maps/Route19/header.inc" - .include "data/maps/Route20/header.inc" - .include "data/maps/Route21_North/header.inc" - .include "data/maps/Route21_South/header.inc" - .include "data/maps/Route22/header.inc" - .include "data/maps/Route23/header.inc" - .include "data/maps/Route24/header.inc" - .include "data/maps/Route25/header.inc" - .include "data/maps/OneIsland_KindleRoad/header.inc" - .include "data/maps/OneIsland_TreasureBeach/header.inc" - .include "data/maps/TwoIsland_CapeBrink/header.inc" - .include "data/maps/ThreeIsland_BondBridge/header.inc" - .include "data/maps/ThreeIsland_Port/header.inc" - .include "data/maps/UnknownMap_03_50/header.inc" - .include "data/maps/UnknownMap_03_51/header.inc" - .include "data/maps/UnknownMap_03_52/header.inc" - .include "data/maps/UnknownMap_03_53/header.inc" - .include "data/maps/FiveIsland_ResortGorgeous/header.inc" - .include "data/maps/FiveIsland_WaterLabyrinth/header.inc" - .include "data/maps/FiveIsland_Meadow/header.inc" - .include "data/maps/FiveIsland_MemorialPillar/header.inc" - .include "data/maps/SixIsland_OutcastIsland/header.inc" - .include "data/maps/SixIsland_GreenPath/header.inc" - .include "data/maps/SixIsland_WaterPath/header.inc" - .include "data/maps/SixIsland_RuinValley/header.inc" - .include "data/maps/SevenIsland_TrainerTower/header.inc" - .include "data/maps/SevenIsland_SevaultCanyon_Entrance/header.inc" - .include "data/maps/SevenIsland_SevaultCanyon/header.inc" - .include "data/maps/SevenIsland_TanobyRuins/header.inc" - .include "data/maps/PalletTown_PlayersHouse_1F/header.inc" - .include "data/maps/PalletTown_PlayersHouse_2F/header.inc" - .include "data/maps/PalletTown_GarysHouse/header.inc" - .include "data/maps/PalletTown_ProfessorOaksLab/header.inc" - .include "data/maps/ViridianCity_House1/header.inc" - .include "data/maps/ViridianCity_Gym/header.inc" - .include "data/maps/ViridianCity_House2/header.inc" - .include "data/maps/ViridianCity_Mart/header.inc" - .include "data/maps/ViridianCity_PokemonCenter_1F/header.inc" - .include "data/maps/ViridianCity_PokemonCenter_2F/header.inc" - .include "data/maps/PewterCity_Museum_1F/header.inc" - .include "data/maps/PewterCity_Museum_2F/header.inc" - .include "data/maps/PewterCity_Gym/header.inc" - .include "data/maps/PewterCity_Mart/header.inc" - .include "data/maps/PewterCity_House1/header.inc" - .include "data/maps/PewterCity_PokemonCenter_1F/header.inc" - .include "data/maps/PewterCity_PokemonCenter_2F/header.inc" - .include "data/maps/PewterCity_House2/header.inc" - .include "data/maps/CeruleanCity_House1/header.inc" - .include "data/maps/CeruleanCity_House2/header.inc" - .include "data/maps/CeruleanCity_House3/header.inc" - .include "data/maps/CeruleanCity_PokemonCenter_1F/header.inc" - .include "data/maps/CeruleanCity_PokemonCenter_2F/header.inc" - .include "data/maps/CeruleanCity_Gym/header.inc" - .include "data/maps/CeruleanCity_BikeShop/header.inc" - .include "data/maps/CeruleanCity_Mart/header.inc" - .include "data/maps/CeruleanCity_House4/header.inc" - .include "data/maps/CeruleanCity_House5/header.inc" - .include "data/maps/LavenderTown_PokemonCenter_1F/header.inc" - .include "data/maps/LavenderTown_PokemonCenter_2F/header.inc" - .include "data/maps/LavenderTown_VolunteerPokemonHouse/header.inc" - .include "data/maps/LavenderTown_House1/header.inc" - .include "data/maps/LavenderTown_House2/header.inc" - .include "data/maps/LavenderTown_Mart/header.inc" - .include "data/maps/VermilionCity_House1/header.inc" - .include "data/maps/VermilionCity_PokemonCenter_1F/header.inc" - .include "data/maps/VermilionCity_PokemonCenter_2F/header.inc" - .include "data/maps/VermilionCity_PokemonFanClub/header.inc" - .include "data/maps/VermilionCity_House2/header.inc" - .include "data/maps/VermilionCity_Mart/header.inc" - .include "data/maps/VermilionCity_Gym/header.inc" - .include "data/maps/VermilionCity_House3/header.inc" - .include "data/maps/CeladonCity_DepartmentStore_1F/header.inc" - .include "data/maps/CeladonCity_DepartmentStore_2F/header.inc" - .include "data/maps/CeladonCity_DepartmentStore_3F/header.inc" - .include "data/maps/CeladonCity_DepartmentStore_4F/header.inc" - .include "data/maps/CeladonCity_DepartmentStore_5F/header.inc" - .include "data/maps/CeladonCity_DepartmentStore_Roof/header.inc" - .include "data/maps/CeladonCity_DepartmentStore_Elevator/header.inc" - .include "data/maps/CeladonCity_Condominiums_1F/header.inc" - .include "data/maps/CeladonCity_Condominiums_2F/header.inc" - .include "data/maps/CeladonCity_Condominiums_3F/header.inc" - .include "data/maps/CeladonCity_Condominiums_Roof/header.inc" - .include "data/maps/CeladonCity_Condominiums_RoofRoom/header.inc" - .include "data/maps/CeladonCity_PokemonCenter_1F/header.inc" - .include "data/maps/CeladonCity_PokemonCenter_2F/header.inc" - .include "data/maps/CeladonCity_GameCorner/header.inc" - .include "data/maps/CeladonCity_GameCorner_PrizeRoom/header.inc" - .include "data/maps/CeladonCity_Gym/header.inc" - .include "data/maps/CeladonCity_Restaurant/header.inc" - .include "data/maps/CeladonCity_House1/header.inc" - .include "data/maps/CeladonCity_Hotel/header.inc" - .include "data/maps/FuchsiaCity_SafariZone_Entrance/header.inc" - .include "data/maps/FuchsiaCity_Mart/header.inc" - .include "data/maps/FuchsiaCity_ZooBuilding/header.inc" - .include "data/maps/FuchsiaCity_Gym/header.inc" - .include "data/maps/FuchsiaCity_House1/header.inc" - .include "data/maps/FuchsiaCity_PokemonCenter_1F/header.inc" - .include "data/maps/FuchsiaCity_PokemonCenter_2F/header.inc" - .include "data/maps/FuchsiaCity_Building1/header.inc" - .include "data/maps/FuchsiaCity_House2/header.inc" - .include "data/maps/FuchsiaCity_House3/header.inc" - .include "data/maps/CinnabarIsland_Gym/header.inc" - .include "data/maps/CinnabarIsland_PokemonLab_Entrance/header.inc" - .include "data/maps/CinnabarIsland_PokemonLab_Lounge/header.inc" - .include "data/maps/CinnabarIsland_PokemonLab_ResearchRoom/header.inc" - .include "data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/header.inc" - .include "data/maps/CinnabarIsland_PokemonCenter_1F/header.inc" - .include "data/maps/CinnabarIsland_PokemonCenter_2F/header.inc" - .include "data/maps/CinnabarIsland_Mart/header.inc" - .include "data/maps/IndigoPlateau_PokemonCenter_1F/header.inc" - .include "data/maps/IndigoPlateau_PokemonCenter_2F/header.inc" - .include "data/maps/SaffronCity_House1_1F/header.inc" - .include "data/maps/SaffronCity_House1_2F/header.inc" - .include "data/maps/SaffronCity_Dojo/header.inc" - .include "data/maps/SaffronCity_Gym/header.inc" - .include "data/maps/SaffronCity_House2/header.inc" - .include "data/maps/SaffronCity_Mart/header.inc" - .include "data/maps/SaffronCity_PokemonCenter_1F/header.inc" - .include "data/maps/SaffronCity_PokemonCenter_2F/header.inc" - .include "data/maps/SaffronCity_House3/header.inc" - .include "data/maps/SaffronCity_PokemonTrainerFanClub/header.inc" - .include "data/maps/Route2_ViridianForest_SouthEntrance/header.inc" - .include "data/maps/Route2_House/header.inc" - .include "data/maps/Route2_EastBuilding/header.inc" - .include "data/maps/Route2_ViridianForest_NorthEntrance/header.inc" - .include "data/maps/Route4_PokemonCenter_1F/header.inc" - .include "data/maps/Route4_PokemonCenter_2F/header.inc" - .include "data/maps/Route5_PokemonDayCare/header.inc" - .include "data/maps/Route5_SouthEntrance/header.inc" - .include "data/maps/Route6_NorthEntrance/header.inc" - .include "data/maps/UnknownMap_18_01/header.inc" - .include "data/maps/Route7_EastEntrance/header.inc" - .include "data/maps/Route8_WestEntrance/header.inc" - .include "data/maps/Route10_PokemonCenter_1F/header.inc" - .include "data/maps/Route10_PokemonCenter_2F/header.inc" - .include "data/maps/Route11_EastEntrance_1F/header.inc" - .include "data/maps/Route11_EastEntrance_2F/header.inc" - .include "data/maps/Route12_NorthEntrance_1F/header.inc" - .include "data/maps/Route12_NorthEntrance_2F/header.inc" - .include "data/maps/Route12_FishingHouse/header.inc" - .include "data/maps/Route15_WestEntrance_1F/header.inc" - .include "data/maps/Route15_WestEntrance_2F/header.inc" - .include "data/maps/Route16_House/header.inc" - .include "data/maps/Route16_NorthEntrance_1F/header.inc" - .include "data/maps/Route16_NorthEntrance_2F/header.inc" - .include "data/maps/Route18_EastEntrance_1F/header.inc" - .include "data/maps/Route18_EastEntrance_2F/header.inc" - .include "data/maps/UnusedHouse_27_00/header.inc" - .include "data/maps/Route22_NorthEntrance/header.inc" - .include "data/maps/UnusedHouse_29_00/header.inc" - .include "data/maps/Route25_SeaCottage/header.inc" - .include "data/maps/SevenIsland_House_Room1/header.inc" - .include "data/maps/SevenIsland_House_Room2/header.inc" - .include "data/maps/SevenIsland_Mart/header.inc" - .include "data/maps/SevenIsland_PokemonCenter_1F/header.inc" - .include "data/maps/SevenIsland_PokemonCenter_2F/header.inc" - .include "data/maps/UnusedHouse_31_05/header.inc" - .include "data/maps/SevenIsland_Harbor/header.inc" - .include "data/maps/OneIsland_PokemonCenter_1F/header.inc" - .include "data/maps/OneIsland_PokemonCenter_2F/header.inc" - .include "data/maps/OneIsland_House1/header.inc" - .include "data/maps/OneIsland_House2/header.inc" - .include "data/maps/OneIsland_Harbor/header.inc" - .include "data/maps/TwoIsland_JoyfulGameCorner/header.inc" - .include "data/maps/TwoIsland_House/header.inc" - .include "data/maps/TwoIsland_PokemonCenter_1F/header.inc" - .include "data/maps/TwoIsland_PokemonCenter_2F/header.inc" - .include "data/maps/TwoIsland_Harbor/header.inc" - .include "data/maps/ThreeIsland_House1/header.inc" - .include "data/maps/ThreeIsland_PokemonCenter_1F/header.inc" - .include "data/maps/ThreeIsland_PokemonCenter_2F/header.inc" - .include "data/maps/ThreeIsland_Mart/header.inc" - .include "data/maps/ThreeIsland_House2/header.inc" - .include "data/maps/ThreeIsland_House3/header.inc" - .include "data/maps/ThreeIsland_House4/header.inc" - .include "data/maps/ThreeIsland_House5/header.inc" - .include "data/maps/FourIsland_PokemonDayCare/header.inc" - .include "data/maps/FourIsland_PokemonCenter_1F/header.inc" - .include "data/maps/FourIsland_PokemonCenter_2F/header.inc" - .include "data/maps/FourIsland_House1/header.inc" - .include "data/maps/FourIsland_LoreleisHouse/header.inc" - .include "data/maps/FourIsland_Harbor/header.inc" - .include "data/maps/FourIsland_House2/header.inc" - .include "data/maps/FourIsland_Mart/header.inc" - .include "data/maps/FiveIsland_PokemonCenter_1F/header.inc" - .include "data/maps/FiveIsland_PokemonCenter_2F/header.inc" - .include "data/maps/FiveIsland_Harbor/header.inc" - .include "data/maps/FiveIsland_House1/header.inc" - .include "data/maps/FiveIsland_House2/header.inc" - .include "data/maps/SixIsland_PokemonCenter_1F/header.inc" - .include "data/maps/SixIsland_PokemonCenter_2F/header.inc" - .include "data/maps/SixIsland_Harbor/header.inc" - .include "data/maps/SixIsland_House/header.inc" - .include "data/maps/SixIsland_Mart/header.inc" - .include "data/maps/ThreeIsland_Harbor/header.inc" - .include "data/maps/FiveIsland_ResortGorgeous_House/header.inc" - .include "data/maps/TwoIsland_CapeBrink_House/header.inc" - .include "data/maps/SixIsland_WaterPath_House1/header.inc" - .include "data/maps/SixIsland_WaterPath_House2/header.inc" - .include "data/maps/SevenIsland_SevaultCanyon_House/header.inc" diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json new file mode 100644 index 000000000..3f4e458ca --- /dev/null +++ b/data/maps/map_groups.json @@ -0,0 +1,623 @@ +{ + "group_order": [ + "gMapGroup0", + "gMapGroup1", + "gMapGroup2", + "gMapGroup3", + "gMapGroup4", + "gMapGroup5", + "gMapGroup6", + "gMapGroup7", + "gMapGroup8", + "gMapGroup9", + "gMapGroup10", + "gMapGroup11", + "gMapGroup12", + "gMapGroup13", + "gMapGroup14", + "gMapGroup15", + "gMapGroup16", + "gMapGroup17", + "gMapGroup18", + "gMapGroup19", + "gMapGroup20", + "gMapGroup21", + "gMapGroup22", + "gMapGroup23", + "gMapGroup24", + "gMapGroup25", + "gMapGroup26", + "gMapGroup27", + "gMapGroup28", + "gMapGroup29", + "gMapGroup30", + "gMapGroup31", + "gMapGroup32", + "gMapGroup33", + "gMapGroup34", + "gMapGroup35", + "gMapGroup36", + "gMapGroup37", + "gMapGroup38", + "gMapGroup39", + "gMapGroup40", + "gMapGroup41", + "gMapGroup42" + ], + "gMapGroup0": [ + "UnknownMap_00_00", + "UnknownMap_00_01", + "UnknownMap_00_02", + "UnknownMap_00_03", + "UnknownMap_00_04" + ], + "gMapGroup1": [ + "ViridianForest", + "MtMoon_1F", + "MtMoon_B1F", + "MtMoon_B2F", + "SSAnne_Exterior", + "SSAnne_1F_Corridor", + "SSAnne_2F_Corridor", + "SSAnne_3F_Corridor", + "SSAnne_B1F_Corridor", + "SSAnne_Deck", + "SSAnne_Kitchen", + "SSAnne_CaptainsOffice", + "SSAnne_1F_Room1", + "SSAnne_1F_Room2", + "SSAnne_1F_Room3", + "SSAnne_1F_Room4", + "SSAnne_1F_Room5", + "SSAnne_1F_Room7", + "SSAnne_2F_Room1", + "SSAnne_2F_Room2", + "SSAnne_2F_Room3", + "SSAnne_2F_Room4", + "SSAnne_2F_Room5", + "SSAnne_2F_Room6", + "SSAnne_B1F_Room1", + "SSAnne_B1F_Room2", + "SSAnne_B1F_Room3", + "SSAnne_B1F_Room4", + "SSAnne_B1F_Room5", + "SSAnne_1F_Room6", + "UndergroundPath_NorthEntrance", + "UndergroundPath_NorthSouthTunnel", + "UndergroundPath_SouthEntrance", + "UndergroundPath_WestEntrance", + "UndergroundPath_EastWestTunnel", + "UndergroundPath_EastEntrance", + "DiglettsCave_NorthEntrance", + "DiglettsCave_B1F", + "DiglettsCave_SouthEntrance", + "VictoryRoad_1F", + "VictoryRoad_2F", + "VictoryRoad_3F", + "RocketHideout_B1F", + "RocketHideout_B2F", + "RocketHideout_B3F", + "RocketHideout_B4F", + "RocketHideout_Elevator", + "SilphCo_1F", + "SilphCo_2F", + "SilphCo_3F", + "SilphCo_4F", + "SilphCo_5F", + "SilphCo_6F", + "SilphCo_7F", + "SilphCo_8F", + "SilphCo_9F", + "SilphCo_10F", + "SilphCo_11F", + "SilphCo_Elevator", + "PokemonMansion_1F", + "PokemonMansion_2F", + "PokemonMansion_3F", + "PokemonMansion_B1F", + "SafariZone_Center", + "SafariZone_East", + "SafariZone_North", + "SafariZone_West", + "SafariZone_Building1", + "SafariZone_Building2", + "SafariZone_Building3", + "SafariZone_Building4", + "SafariZone_SecretHouse", + "CeruleanCave_1F", + "CeruleanCave_2F", + "CeruleanCave_B1F", + "PokemonLeague_LoreleisRoom", + "PokemonLeague_BrunosRoom", + "PokemonLeague_AgathasRoom", + "PokemonLeague_LancesRoom", + "PokemonLeague_ChampionsRoom", + "PokemonLeague_HallOfFame", + "RockTunnel_1F", + "RockTunnel_B1F", + "SeafoamIslands_1F", + "SeafoamIslands_B1F", + "SeafoamIslands_B2F", + "SeafoamIslands_B3F", + "SeafoamIslands_B4F", + "PokemonTower_1F", + "PokemonTower_2F", + "PokemonTower_3F", + "PokemonTower_4F", + "PokemonTower_5F", + "PokemonTower_6F", + "PokemonTower_7F", + "PowerPlant", + "MtEmber_RubyPath_B4F", + "MtEmber_Exterior", + "MtEmber_SummitPath_1F", + "MtEmber_SummitPath_2F", + "MtEmber_SummitPath_3F", + "MtEmber_Summit", + "MtEmber_RubyPath_B5F", + "MtEmber_RubyPath_1F", + "MtEmber_RubyPath_B1F", + "MtEmber_RubyPath_B2F", + "MtEmber_RubyPath_B3F", + "MtEmber_RubyPath_B1F_Stairs", + "MtEmber_RubyPath_B2F_Stairs", + "ThreeIsland_BerryForest", + "FourIsland_IcefallCave_Entrance", + "FourIsland_IcefallCave_1F", + "FourIsland_IcefallCave_B1F", + "FourIsland_IcefallCave_Back", + "FiveIsland_RocketWarehouse", + "SixIsland_DottedHole_1F", + "SixIsland_DottedHole_B1F", + "SixIsland_DottedHole_B2F", + "SixIsland_DottedHole_B3F", + "SixIsland_DottedHole_B4F", + "SixIsland_DottedHole_SapphireRoom", + "SixIsland_PatternBush", + "SixIsland_AlteringCave" + ], + "gMapGroup2": [ + "NavelRock_Exterior", + "SevenIsland_TrainerTower_1F", + "SevenIsland_TrainerTower_2F", + "SevenIsland_TrainerTower_3F", + "SevenIsland_TrainerTower_4F", + "SevenIsland_TrainerTower_5F", + "SevenIsland_TrainerTower_6F", + "SevenIsland_TrainerTower_7F", + "SevenIsland_TrainerTower_8F", + "SevenIsland_TrainerTower_Roof", + "SevenIsland_TrainerTower_Lobby", + "SevenIsland_TrainerTower_Elevator", + "FiveIsland_LostCave_Entrance", + "FiveIsland_LostCave_Room1", + "FiveIsland_LostCave_Room2", + "FiveIsland_LostCave_Room3", + "FiveIsland_LostCave_Room4", + "FiveIsland_LostCave_Room5", + "FiveIsland_LostCave_Room6", + "FiveIsland_LostCave_Room7", + "FiveIsland_LostCave_Room8", + "FiveIsland_LostCave_Room9", + "FiveIsland_LostCave_Room10", + "FiveIsland_LostCave_Room11", + "FiveIsland_LostCave_Room12", + "FiveIsland_LostCave_Room13", + "FiveIsland_LostCave_Room14", + "SevenIsland_TanobyRuins_MoneanChamber", + "SevenIsland_TanobyRuins_LiptooChamber", + "SevenIsland_TanobyRuins_WeepthChamber", + "SevenIsland_TanobyRuins_DilfordChamber", + "SevenIsland_TanobyRuins_ScufibChamber", + "SevenIsland_TanobyRuins_RixyChamber", + "SevenIsland_TanobyRuins_ViapoisChamber", + "ThreeIsland_DunsparceTunnel", + "SevenIsland_SeavaultCanyon_TanobyKey", + "NavelRock_1F", + "NavelRock_Summit", + "NavelRock_Base", + "NavelRock_SummitPath_2F", + "NavelRock_SummitPath_3F", + "NavelRock_SummitPath_4F", + "NavelRock_SummitPath_5F", + "NavelRock_BasePath_B1F", + "NavelRock_BasePath_B2F", + "NavelRock_BasePath_B3F", + "NavelRock_BasePath_B4F", + "NavelRock_BasePath_B5F", + "NavelRock_BasePath_B6F", + "NavelRock_BasePath_B7F", + "NavelRock_BasePath_B8F", + "NavelRock_BasePath_B9F", + "NavelRock_BasePath_B10F", + "NavelRock_BasePath_B11F", + "NavelRock_B1F", + "NavelRock_Fork", + "BirthIsland_Exterior", + "OneIsland_KindleRoad_EmberSpa", + "BirthIsland_Harbor", + "NavelRock_Harbor" + ], + "gMapGroup3": [ + "PalletTown", + "ViridianCity", + "PewterCity", + "CeruleanCity", + "LavenderTown", + "VermilionCity", + "CeladonCity", + "FuchsiaCity", + "CinnabarIsland", + "IndigoPlateau_Exterior", + "SaffronCity_Duplicate", + "SaffronCity", + "OneIsland", + "TwoIsland", + "ThreeIsland", + "FourIsland", + "FiveIsland", + "SevenIsland", + "SixIsland", + "Route1", + "Route2", + "Route3", + "Route4", + "Route5", + "Route6", + "Route7", + "Route8", + "Route9", + "Route10", + "Route11", + "Route12", + "Route13", + "Route14", + "Route15", + "Route16", + "Route17", + "Route18", + "Route19", + "Route20", + "Route21_North", + "Route21_South", + "Route22", + "Route23", + "Route24", + "Route25", + "OneIsland_KindleRoad", + "OneIsland_TreasureBeach", + "TwoIsland_CapeBrink", + "ThreeIsland_BondBridge", + "ThreeIsland_Port", + "UnknownMap_03_50", + "UnknownMap_03_51", + "UnknownMap_03_52", + "UnknownMap_03_53", + "FiveIsland_ResortGorgeous", + "FiveIsland_WaterLabyrinth", + "FiveIsland_Meadow", + "FiveIsland_MemorialPillar", + "SixIsland_OutcastIsland", + "SixIsland_GreenPath", + "SixIsland_WaterPath", + "SixIsland_RuinValley", + "SevenIsland_TrainerTower", + "SevenIsland_SevaultCanyon_Entrance", + "SevenIsland_SevaultCanyon", + "SevenIsland_TanobyRuins" + ], + "gMapGroup4": [ + "PalletTown_PlayersHouse_1F", + "PalletTown_PlayersHouse_2F", + "PalletTown_GarysHouse", + "PalletTown_ProfessorOaksLab" + ], + "gMapGroup5": [ + "ViridianCity_House1", + "ViridianCity_Gym", + "ViridianCity_House2", + "ViridianCity_Mart", + "ViridianCity_PokemonCenter_1F", + "ViridianCity_PokemonCenter_2F" + ], + "gMapGroup6": [ + "PewterCity_Museum_1F", + "PewterCity_Museum_2F", + "PewterCity_Gym", + "PewterCity_Mart", + "PewterCity_House1", + "PewterCity_PokemonCenter_1F", + "PewterCity_PokemonCenter_2F", + "PewterCity_House2" + ], + "gMapGroup7": [ + "CeruleanCity_House1", + "CeruleanCity_House2", + "CeruleanCity_House3", + "CeruleanCity_PokemonCenter_1F", + "CeruleanCity_PokemonCenter_2F", + "CeruleanCity_Gym", + "CeruleanCity_BikeShop", + "CeruleanCity_Mart", + "CeruleanCity_House4", + "CeruleanCity_House5" + ], + "gMapGroup8": [ + "LavenderTown_PokemonCenter_1F", + "LavenderTown_PokemonCenter_2F", + "LavenderTown_VolunteerPokemonHouse", + "LavenderTown_House1", + "LavenderTown_House2", + "LavenderTown_Mart" + ], + "gMapGroup9": [ + "VermilionCity_House1", + "VermilionCity_PokemonCenter_1F", + "VermilionCity_PokemonCenter_2F", + "VermilionCity_PokemonFanClub", + "VermilionCity_House2", + "VermilionCity_Mart", + "VermilionCity_Gym", + "VermilionCity_House3" + ], + "gMapGroup10": [ + "CeladonCity_DepartmentStore_1F", + "CeladonCity_DepartmentStore_2F", + "CeladonCity_DepartmentStore_3F", + "CeladonCity_DepartmentStore_4F", + "CeladonCity_DepartmentStore_5F", + "CeladonCity_DepartmentStore_Roof", + "CeladonCity_DepartmentStore_Elevator", + "CeladonCity_Condominiums_1F", + "CeladonCity_Condominiums_2F", + "CeladonCity_Condominiums_3F", + "CeladonCity_Condominiums_Roof", + "CeladonCity_Condominiums_RoofRoom", + "CeladonCity_PokemonCenter_1F", + "CeladonCity_PokemonCenter_2F", + "CeladonCity_GameCorner", + "CeladonCity_GameCorner_PrizeRoom", + "CeladonCity_Gym", + "CeladonCity_Restaurant", + "CeladonCity_House1", + "CeladonCity_Hotel" + ], + "gMapGroup11": [ + "FuchsiaCity_SafariZone_Entrance", + "FuchsiaCity_Mart", + "FuchsiaCity_ZooBuilding", + "FuchsiaCity_Gym", + "FuchsiaCity_House1", + "FuchsiaCity_PokemonCenter_1F", + "FuchsiaCity_PokemonCenter_2F", + "FuchsiaCity_Building1", + "FuchsiaCity_House2", + "FuchsiaCity_House3" + ], + "gMapGroup12": [ + "CinnabarIsland_Gym", + "CinnabarIsland_PokemonLab_Entrance", + "CinnabarIsland_PokemonLab_Lounge", + "CinnabarIsland_PokemonLab_ResearchRoom", + "CinnabarIsland_PokemonLab_ExperimentRoom", + "CinnabarIsland_PokemonCenter_1F", + "CinnabarIsland_PokemonCenter_2F", + "CinnabarIsland_Mart" + ], + "gMapGroup13": [ + "IndigoPlateau_PokemonCenter_1F", + "IndigoPlateau_PokemonCenter_2F" + ], + "gMapGroup14": [ + "SaffronCity_House1_1F", + "SaffronCity_House1_2F", + "SaffronCity_Dojo", + "SaffronCity_Gym", + "SaffronCity_House2", + "SaffronCity_Mart", + "SaffronCity_PokemonCenter_1F", + "SaffronCity_PokemonCenter_2F", + "SaffronCity_House3", + "SaffronCity_PokemonTrainerFanClub" + ], + "gMapGroup15": [ + "Route2_ViridianForest_SouthEntrance", + "Route2_House", + "Route2_EastBuilding", + "Route2_ViridianForest_NorthEntrance" + ], + "gMapGroup16": [ + "Route4_PokemonCenter_1F", + "Route4_PokemonCenter_2F" + ], + "gMapGroup17": [ + "Route5_PokemonDayCare", + "Route5_SouthEntrance" + ], + "gMapGroup18": [ + "Route6_NorthEntrance", + "UnknownMap_18_01" + ], + "gMapGroup19": [ + "Route7_EastEntrance" + ], + "gMapGroup20": [ + "Route8_WestEntrance" + ], + "gMapGroup21": [ + "Route10_PokemonCenter_1F", + "Route10_PokemonCenter_2F" + ], + "gMapGroup22": [ + "Route11_EastEntrance_1F", + "Route11_EastEntrance_2F" + ], + "gMapGroup23": [ + "Route12_NorthEntrance_1F", + "Route12_NorthEntrance_2F", + "Route12_FishingHouse" + ], + "gMapGroup24": [ + "Route15_WestEntrance_1F", + "Route15_WestEntrance_2F" + ], + "gMapGroup25": [ + "Route16_House", + "Route16_NorthEntrance_1F", + "Route16_NorthEntrance_2F" + ], + "gMapGroup26": [ + "Route18_EastEntrance_1F", + "Route18_EastEntrance_2F" + ], + "gMapGroup27": [ + "UnusedHouse_27_00" + ], + "gMapGroup28": [ + "Route22_NorthEntrance" + ], + "gMapGroup29": [ + "UnusedHouse_29_00" + ], + "gMapGroup30": [ + "Route25_SeaCottage" + ], + "gMapGroup31": [ + "SevenIsland_House_Room1", + "SevenIsland_House_Room2", + "SevenIsland_Mart", + "SevenIsland_PokemonCenter_1F", + "SevenIsland_PokemonCenter_2F", + "UnusedHouse_31_05", + "SevenIsland_Harbor" + ], + "gMapGroup32": [ + "OneIsland_PokemonCenter_1F", + "OneIsland_PokemonCenter_2F", + "OneIsland_House1", + "OneIsland_House2", + "OneIsland_Harbor" + ], + "gMapGroup33": [ + "TwoIsland_JoyfulGameCorner", + "TwoIsland_House", + "TwoIsland_PokemonCenter_1F", + "TwoIsland_PokemonCenter_2F", + "TwoIsland_Harbor" + ], + "gMapGroup34": [ + "ThreeIsland_House1", + "ThreeIsland_PokemonCenter_1F", + "ThreeIsland_PokemonCenter_2F", + "ThreeIsland_Mart", + "ThreeIsland_House2", + "ThreeIsland_House3", + "ThreeIsland_House4", + "ThreeIsland_House5" + ], + "gMapGroup35": [ + "FourIsland_PokemonDayCare", + "FourIsland_PokemonCenter_1F", + "FourIsland_PokemonCenter_2F", + "FourIsland_House1", + "FourIsland_LoreleisHouse", + "FourIsland_Harbor", + "FourIsland_House2", + "FourIsland_Mart" + ], + "gMapGroup36": [ + "FiveIsland_PokemonCenter_1F", + "FiveIsland_PokemonCenter_2F", + "FiveIsland_Harbor", + "FiveIsland_House1", + "FiveIsland_House2" + ], + "gMapGroup37": [ + "SixIsland_PokemonCenter_1F", + "SixIsland_PokemonCenter_2F", + "SixIsland_Harbor", + "SixIsland_House", + "SixIsland_Mart" + ], + "gMapGroup38": [ + "ThreeIsland_Harbor" + ], + "gMapGroup39": [ + "FiveIsland_ResortGorgeous_House" + ], + "gMapGroup40": [ + "TwoIsland_CapeBrink_House" + ], + "gMapGroup41": [ + "SixIsland_WaterPath_House1", + "SixIsland_WaterPath_House2" + ], + "gMapGroup42": [ + "SevenIsland_SevaultCanyon_House" + ], + "connections_include_order": [ + "PalletTown", + "ViridianCity", + "PewterCity", + "CeruleanCity", + "LavenderTown", + "VermilionCity", + "CeladonCity", + "FuchsiaCity", + "CinnabarIsland", + "IndigoPlateau_Exterior", + "SaffronCity_Duplicate", + "SaffronCity", + "OneIsland", + "TwoIsland", + "ThreeIsland", + "FiveIsland", + "SevenIsland", + "SixIsland", + "Route1", + "Route2", + "Route3", + "Route4", + "Route5", + "Route6", + "Route7", + "Route8", + "Route9", + "Route10", + "Route11", + "Route12", + "Route13", + "Route14", + "Route15", + "Route16", + "Route17", + "Route18", + "Route19", + "Route20", + "Route21_North", + "Route21_South", + "Route22", + "Route23", + "Route24", + "Route25", + "OneIsland_KindleRoad", + "OneIsland_TreasureBeach", + "TwoIsland_CapeBrink", + "ThreeIsland_BondBridge", + "ThreeIsland_Port", + "UnknownMap_03_50", + "UnknownMap_03_51", + "FiveIsland_ResortGorgeous", + "FiveIsland_WaterLabyrinth", + "FiveIsland_Meadow", + "FiveIsland_MemorialPillar", + "SixIsland_OutcastIsland", + "SixIsland_GreenPath", + "SixIsland_WaterPath", + "SixIsland_RuinValley", + "SevenIsland_TrainerTower", + "SevenIsland_SevaultCanyon_Entrance", + "SevenIsland_SevaultCanyon", + "SevenIsland_TanobyRuins" + ] +} \ No newline at end of file -- cgit v1.2.3 From 2e9d8a61e0882d6606e72185e830a4abc623c21d Mon Sep 17 00:00:00 2001 From: garak Date: Mon, 13 May 2019 21:21:01 -0400 Subject: clean some code in the map dump --- data/maps/FiveIsland_RocketWarehouse/map.json | 72 +++++++++++------------ data/maps/FiveIsland_RocketWarehouse/scripts.inc | 26 ++++---- data/maps/FourIsland_IcefallCave_B1F/map.json | 4 +- data/maps/FourIsland_IcefallCave_Back/map.json | 8 +-- data/maps/FourIsland_IcefallCave_Back/scripts.inc | 8 +-- data/maps/MtEmber_RubyPath_1F/map.json | 10 ++-- data/maps/SixIsland_AlteringCave/scripts.inc | 4 +- data/maps/SixIsland_DottedHole_1F/scripts.inc | 6 +- data/maps/SixIsland_DottedHole_B4F/map.json | 2 +- data/maps/SixIsland_PatternBush/map.json | 24 ++++---- data/maps/SixIsland_PatternBush/scripts.inc | 28 ++++----- 11 files changed, 96 insertions(+), 96 deletions(-) (limited to 'data/maps') diff --git a/data/maps/FiveIsland_RocketWarehouse/map.json b/data/maps/FiveIsland_RocketWarehouse/map.json index 96b5b0286..f545a0d38 100644 --- a/data/maps/FiveIsland_RocketWarehouse/map.json +++ b/data/maps/FiveIsland_RocketWarehouse/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "SSAnne_CaptainsOffice4_EventScript_163FE6", + "script": "FiveIsland_RocketWarehouse_EventScript_163FE6", "flag": "136" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "SSAnne_CaptainsOffice4_EventScript_163FFD", + "script": "FiveIsland_RocketWarehouse_EventScript_163FFD", "flag": "136" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "SSAnne_CaptainsOffice4_EventScript_164087", + "script": "FiveIsland_RocketWarehouse_EventScript_164087", "flag": "136" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "SSAnne_CaptainsOffice4_EventScript_164014", + "script": "FiveIsland_RocketWarehouse_EventScript_164014", "flag": "136" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "SSAnne_CaptainsOffice4_EventScript_164070", + "script": "FiveIsland_RocketWarehouse_EventScript_164070", "flag": "136" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 0, - "script": "SSAnne_CaptainsOffice4_EventScript_163F93", + "script": "FiveIsland_RocketWarehouse_EventScript_163F93", "flag": "0" }, { @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SSAnne_CaptainsOffice4_EventScript_1BED87", + "script": "FiveIsland_RocketWarehouse_EventScript_1BED87", "flag": "500" }, { @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SSAnne_CaptainsOffice4_EventScript_1BED94", + "script": "FiveIsland_RocketWarehouse_EventScript_1BED94", "flag": "501" }, { @@ -127,7 +127,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SSAnne_CaptainsOffice4_EventScript_1BEDA1", + "script": "FiveIsland_RocketWarehouse_EventScript_1BEDA1", "flag": "502" }, { @@ -140,7 +140,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SSAnne_CaptainsOffice4_EventScript_1BEDAE", + "script": "FiveIsland_RocketWarehouse_EventScript_1BEDAE", "flag": "503" } ], @@ -161,7 +161,7 @@ "elevation": 3, "var": "VAR_0x4088", "var_value": 0, - "script": "SSAnne_CaptainsOffice4_EventScript_163F81" + "script": "FiveIsland_RocketWarehouse_EventScript_163F81" }, { "type": "trigger", @@ -170,7 +170,7 @@ "elevation": 3, "var": "VAR_0x4088", "var_value": 0, - "script": "SSAnne_CaptainsOffice4_EventScript_163F81" + "script": "FiveIsland_RocketWarehouse_EventScript_163F81" }, { "type": "trigger", @@ -179,7 +179,7 @@ "elevation": 3, "var": "VAR_0x4088", "var_value": 0, - "script": "SSAnne_CaptainsOffice4_EventScript_163F81" + "script": "FiveIsland_RocketWarehouse_EventScript_163F81" } ], "bg_events": [ @@ -188,14 +188,14 @@ "x": 11, "y": 2, "elevation": 0, - "script": "SSAnne_CaptainsOffice4_EventScript_163F5A" + "script": "FiveIsland_RocketWarehouse_EventScript_163F5A" }, { "type": "bg_event_type_3", "x": 26, "y": 11, "elevation": 0, - "script": "SSAnne_CaptainsOffice4_EventScript_163F78" + "script": "FiveIsland_RocketWarehouse_EventScript_163F78" }, { "type": "hidden_item", @@ -220,147 +220,147 @@ "x": 12, "y": 2, "elevation": 0, - "script": "SSAnne_CaptainsOffice4_EventScript_163F5A" + "script": "FiveIsland_RocketWarehouse_EventScript_163F5A" }, { "type": "bg_event_type_0", "x": 10, "y": 2, "elevation": 0, - "script": "SSAnne_CaptainsOffice4_EventScript_163F5A" + "script": "FiveIsland_RocketWarehouse_EventScript_163F5A" }, { "type": "bg_event_type_0", "x": 9, "y": 2, "elevation": 0, - "script": "SSAnne_CaptainsOffice4_EventScript_163F5A" + "script": "FiveIsland_RocketWarehouse_EventScript_163F5A" }, { "type": "bg_event_type_0", "x": 8, "y": 2, "elevation": 0, - "script": "SSAnne_CaptainsOffice4_EventScript_163F5A" + "script": "FiveIsland_RocketWarehouse_EventScript_163F5A" }, { "type": "bg_event_type_0", "x": 7, "y": 2, "elevation": 0, - "script": "SSAnne_CaptainsOffice4_EventScript_163F5A" + "script": "FiveIsland_RocketWarehouse_EventScript_163F5A" }, { "type": "bg_event_type_0", "x": 11, "y": 5, "elevation": 0, - "script": "SSAnne_CaptainsOffice4_EventScript_163F5A" + "script": "FiveIsland_RocketWarehouse_EventScript_163F5A" }, { "type": "bg_event_type_0", "x": 10, "y": 5, "elevation": 0, - "script": "SSAnne_CaptainsOffice4_EventScript_163F5A" + "script": "FiveIsland_RocketWarehouse_EventScript_163F5A" }, { "type": "bg_event_type_0", "x": 11, "y": 4, "elevation": 0, - "script": "SSAnne_CaptainsOffice4_EventScript_163F5A" + "script": "FiveIsland_RocketWarehouse_EventScript_163F5A" }, { "type": "bg_event_type_0", "x": 10, "y": 4, "elevation": 0, - "script": "SSAnne_CaptainsOffice4_EventScript_163F5A" + "script": "FiveIsland_RocketWarehouse_EventScript_163F5A" }, { "type": "bg_event_type_0", "x": 8, "y": 4, "elevation": 0, - "script": "SSAnne_CaptainsOffice4_EventScript_163F5A" + "script": "FiveIsland_RocketWarehouse_EventScript_163F5A" }, { "type": "bg_event_type_0", "x": 7, "y": 4, "elevation": 0, - "script": "SSAnne_CaptainsOffice4_EventScript_163F5A" + "script": "FiveIsland_RocketWarehouse_EventScript_163F5A" }, { "type": "bg_event_type_0", "x": 8, "y": 5, "elevation": 0, - "script": "SSAnne_CaptainsOffice4_EventScript_163F5A" + "script": "FiveIsland_RocketWarehouse_EventScript_163F5A" }, { "type": "bg_event_type_0", "x": 7, "y": 5, "elevation": 0, - "script": "SSAnne_CaptainsOffice4_EventScript_163F5A" + "script": "FiveIsland_RocketWarehouse_EventScript_163F5A" }, { "type": "bg_event_type_0", "x": 5, "y": 3, "elevation": 0, - "script": "SSAnne_CaptainsOffice4_EventScript_163F5A" + "script": "FiveIsland_RocketWarehouse_EventScript_163F5A" }, { "type": "bg_event_type_0", "x": 4, "y": 3, "elevation": 0, - "script": "SSAnne_CaptainsOffice4_EventScript_163F5A" + "script": "FiveIsland_RocketWarehouse_EventScript_163F5A" }, { "type": "bg_event_type_0", "x": 5, "y": 4, "elevation": 0, - "script": "SSAnne_CaptainsOffice4_EventScript_163F5A" + "script": "FiveIsland_RocketWarehouse_EventScript_163F5A" }, { "type": "bg_event_type_0", "x": 4, "y": 4, "elevation": 0, - "script": "SSAnne_CaptainsOffice4_EventScript_163F5A" + "script": "FiveIsland_RocketWarehouse_EventScript_163F5A" }, { "type": "bg_event_type_0", "x": 3, "y": 4, "elevation": 0, - "script": "SSAnne_CaptainsOffice4_EventScript_163F5A" + "script": "FiveIsland_RocketWarehouse_EventScript_163F5A" }, { "type": "bg_event_type_0", "x": 2, "y": 4, "elevation": 0, - "script": "SSAnne_CaptainsOffice4_EventScript_163F5A" + "script": "FiveIsland_RocketWarehouse_EventScript_163F5A" }, { "type": "bg_event_type_0", "x": 2, "y": 5, "elevation": 0, - "script": "SSAnne_CaptainsOffice4_EventScript_163F5A" + "script": "FiveIsland_RocketWarehouse_EventScript_163F5A" }, { "type": "bg_event_type_0", "x": 3, "y": 5, "elevation": 0, - "script": "SSAnne_CaptainsOffice4_EventScript_163F5A" + "script": "FiveIsland_RocketWarehouse_EventScript_163F5A" } ] } \ No newline at end of file diff --git a/data/maps/FiveIsland_RocketWarehouse/scripts.inc b/data/maps/FiveIsland_RocketWarehouse/scripts.inc index c90174e86..24eb7b8fa 100644 --- a/data/maps/FiveIsland_RocketWarehouse/scripts.inc +++ b/data/maps/FiveIsland_RocketWarehouse/scripts.inc @@ -1,13 +1,13 @@ FiveIsland_RocketWarehouse_MapScripts:: @ 8163F2E - map_script 1, SSAnne_CaptainsOffice4_MapScript1_163F3D - map_script 3, SSAnne_CaptainsOffice4_MapScript2_163F39 + map_script 1, FiveIsland_RocketWarehouse_MapScript1_163F3D + map_script 3, FiveIsland_RocketWarehouse_MapScript2_163F39 .byte 0 -SSAnne_CaptainsOffice4_MapScript2_163F39:: @ 8163F39 +FiveIsland_RocketWarehouse_MapScript2_163F39:: @ 8163F39 setworldmapflag 2233 end -SSAnne_CaptainsOffice4_MapScript1_163F3D:: @ 8163F3D +FiveIsland_RocketWarehouse_MapScript1_163F3D:: @ 8163F3D checktrainerflag 543 call_if 1, EventScript_163F47 end @@ -17,7 +17,7 @@ EventScript_163F47:: @ 8163F47 setmetatile 27, 20, 672, 0 return -SSAnne_CaptainsOffice4_EventScript_163F5A:: @ 8163F5A +FiveIsland_RocketWarehouse_EventScript_163F5A:: @ 8163F5A lockall checkflag FLAG_0x2D5 goto_if 1, EventScript_163F6E @@ -32,12 +32,12 @@ EventScript_163F6E:: @ 8163F6E releaseall end -SSAnne_CaptainsOffice4_EventScript_163F78:: @ 8163F78 +FiveIsland_RocketWarehouse_EventScript_163F78:: @ 8163F78 loadword 0, gUnknown_817BB15 callstd 3 end -SSAnne_CaptainsOffice4_EventScript_163F81:: @ 8163F81 +FiveIsland_RocketWarehouse_EventScript_163F81:: @ 8163F81 lockall applymovement 4, Movement_1A75E7 waitmovement 0 @@ -45,7 +45,7 @@ SSAnne_CaptainsOffice4_EventScript_163F81:: @ 8163F81 releaseall end -SSAnne_CaptainsOffice4_EventScript_163F93:: @ 8163F93 +FiveIsland_RocketWarehouse_EventScript_163F93:: @ 8163F93 trainerbattle 2, 545, 0, Text_17BBAF, Text_17BC55, EventScript_163FCD checkflag 2116 goto_if 1, EventScript_163FB7 @@ -71,19 +71,19 @@ EventScript_163FCD:: @ 8163FCD release end -SSAnne_CaptainsOffice4_EventScript_163FE6:: @ 8163FE6 +FiveIsland_RocketWarehouse_EventScript_163FE6:: @ 8163FE6 trainerbattle 0, 541, 0, Text_17B54D, Text_17B585 loadword 0, gUnknown_817B5A6 callstd 6 end -SSAnne_CaptainsOffice4_EventScript_163FFD:: @ 8163FFD +FiveIsland_RocketWarehouse_EventScript_163FFD:: @ 8163FFD trainerbattle 0, 542, 0, Text_17B677, Text_17B6D9 loadword 0, gUnknown_817B6EF callstd 6 end -SSAnne_CaptainsOffice4_EventScript_164014:: @ 8164014 +FiveIsland_RocketWarehouse_EventScript_164014:: @ 8164014 trainerbattle 2, 544, 0, Text_17B8DA, Text_17B9FB, EventScript_16402F loadword 0, gUnknown_817BA64 callstd 6 @@ -113,13 +113,13 @@ EventScript_164065:: @ 8164065 waitmovement 0 return -SSAnne_CaptainsOffice4_EventScript_164070:: @ 8164070 +FiveIsland_RocketWarehouse_EventScript_164070:: @ 8164070 trainerbattle 0, 516, 0, Text_17B5D6, Text_17B62F loadword 0, gUnknown_817B642 callstd 6 end -SSAnne_CaptainsOffice4_EventScript_164087:: @ 8164087 +FiveIsland_RocketWarehouse_EventScript_164087:: @ 8164087 trainerbattle 2, 543, 0, Text_17B72D, Text_17B79C, EventScript_1640A2 loadword 0, gUnknown_817B7FA callstd 6 diff --git a/data/maps/FourIsland_IcefallCave_B1F/map.json b/data/maps/FourIsland_IcefallCave_B1F/map.json index 976318747..20aa98d20 100644 --- a/data/maps/FourIsland_IcefallCave_B1F/map.json +++ b/data/maps/FourIsland_IcefallCave_B1F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SSAnne_CaptainsOffice2_EventScript_1BED6D", + "script": "FourIsland_IcefallCave_B1F_EventScript_1BED6D", "flag": "498" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SSAnne_CaptainsOffice2_EventScript_1BED7A", + "script": "FourIsland_IcefallCave_B1F_EventScript_1BED7A", "flag": "499" } ], diff --git a/data/maps/FourIsland_IcefallCave_Back/map.json b/data/maps/FourIsland_IcefallCave_Back/map.json index 2641a3f94..9c26325bd 100644 --- a/data/maps/FourIsland_IcefallCave_Back/map.json +++ b/data/maps/FourIsland_IcefallCave_Back/map.json @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SSAnne_CaptainsOffice3_EventScript_163F25", + "script": "FourIsland_IcefallCave_Back_EventScript_163F25", "flag": "139" }, { @@ -83,7 +83,7 @@ "elevation": 3, "var": "VAR_0x4080", "var_value": 0, - "script": "SSAnne_CaptainsOffice3_EventScript_163D98" + "script": "FourIsland_IcefallCave_Back_EventScript_163D98" }, { "type": "trigger", @@ -92,7 +92,7 @@ "elevation": 3, "var": "VAR_0x4080", "var_value": 0, - "script": "SSAnne_CaptainsOffice3_EventScript_163D98" + "script": "FourIsland_IcefallCave_Back_EventScript_163D98" }, { "type": "trigger", @@ -101,7 +101,7 @@ "elevation": 3, "var": "VAR_0x4080", "var_value": 0, - "script": "SSAnne_CaptainsOffice3_EventScript_163D98" + "script": "FourIsland_IcefallCave_Back_EventScript_163D98" } ], "bg_events": [] diff --git a/data/maps/FourIsland_IcefallCave_Back/scripts.inc b/data/maps/FourIsland_IcefallCave_Back/scripts.inc index 6b762c06b..5b3641ad5 100644 --- a/data/maps/FourIsland_IcefallCave_Back/scripts.inc +++ b/data/maps/FourIsland_IcefallCave_Back/scripts.inc @@ -1,8 +1,8 @@ FourIsland_IcefallCave_Back_MapScripts:: @ 8163D82 - map_script 3, SSAnne_CaptainsOffice3_MapScript1_163D88 + map_script 3, FourIsland_IcefallCave_Back_MapScript1_163D88 .byte 0 -SSAnne_CaptainsOffice3_MapScript1_163D88:: @ 8163D88 +FourIsland_IcefallCave_Back_MapScript1_163D88:: @ 8163D88 compare_var_to_value VAR_0x4080, 1 call_if 1, EventScript_163D94 end @@ -11,7 +11,7 @@ EventScript_163D94:: @ 8163D94 setflag FLAG_0x08B return -SSAnne_CaptainsOffice3_EventScript_163D98:: @ 8163D98 +FourIsland_IcefallCave_Back_EventScript_163D98:: @ 8163D98 lockall textcolor 1 loadword 0, gUnknown_817B04F @@ -195,7 +195,7 @@ Movement_163F23:: @ 8163F23 step_13 step_end -SSAnne_CaptainsOffice3_EventScript_163F25:: @ 8163F25 +FourIsland_IcefallCave_Back_EventScript_163F25:: @ 8163F25 loadword 0, gUnknown_817B457 callstd 2 end diff --git a/data/maps/MtEmber_RubyPath_1F/map.json b/data/maps/MtEmber_RubyPath_1F/map.json index 37ac0435c..b3c9ad2aa 100644 --- a/data/maps/MtEmber_RubyPath_1F/map.json +++ b/data/maps/MtEmber_RubyPath_1F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SSAnne_Kitchen3_EventScript_1BE00C", + "script": "MtEmber_RubyPath_1F_EventScript_1BE00C", "flag": "18" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SSAnne_Kitchen3_EventScript_1BE00C", + "script": "MtEmber_RubyPath_1F_EventScript_1BE00C", "flag": "19" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SSAnne_Kitchen3_EventScript_1BE00C", + "script": "MtEmber_RubyPath_1F_EventScript_1BE00C", "flag": "20" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SSAnne_Kitchen3_EventScript_1BE00C", + "script": "MtEmber_RubyPath_1F_EventScript_1BE00C", "flag": "21" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SSAnne_Kitchen3_EventScript_1BE00C", + "script": "MtEmber_RubyPath_1F_EventScript_1BE00C", "flag": "22" } ], diff --git a/data/maps/SixIsland_AlteringCave/scripts.inc b/data/maps/SixIsland_AlteringCave/scripts.inc index f88377e5f..7fd338642 100644 --- a/data/maps/SixIsland_AlteringCave/scripts.inc +++ b/data/maps/SixIsland_AlteringCave/scripts.inc @@ -1,7 +1,7 @@ SixIsland_AlteringCave_MapScripts:: @ 81646A4 - map_script 3, SSAnne_1F_Room12_MapScript1_1646AA + map_script 3, SixIsland_AlteringCave_MapScript1_1646AA .byte 0 -SSAnne_1F_Room12_MapScript1_1646AA:: @ 81646AA +SixIsland_AlteringCave_MapScript1_1646AA:: @ 81646AA setworldmapflag 2238 end diff --git a/data/maps/SixIsland_DottedHole_1F/scripts.inc b/data/maps/SixIsland_DottedHole_1F/scripts.inc index df572ad4d..6ac2bab50 100644 --- a/data/maps/SixIsland_DottedHole_1F/scripts.inc +++ b/data/maps/SixIsland_DottedHole_1F/scripts.inc @@ -1,8 +1,8 @@ SixIsland_DottedHole_1F_MapScripts:: @ 8164182 - map_script 3, SSAnne_CaptainsOffice5_MapScript1_164188 + map_script 3, SixIsland_DottedHole_1F_MapScript1_164188 .byte 0 -SSAnne_CaptainsOffice5_MapScript1_164188:: @ 8164188 +SixIsland_DottedHole_1F_MapScript1_164188:: @ 8164188 setworldmapflag 2235 end @@ -13,7 +13,7 @@ SixIsland_DottedHole_B1F_EventScript_16418C:: @ 816418C releaseall end -SSAnne_CaptainsOffice9_EventScript_164195:: @ 8164195 +SixIsland_DottedHole_B4F_EventScript_164195:: @ 8164195 lockall braillemessage gUnknown_81A928B waitbuttonpress diff --git a/data/maps/SixIsland_DottedHole_B4F/map.json b/data/maps/SixIsland_DottedHole_B4F/map.json index 40080b501..5d187df80 100644 --- a/data/maps/SixIsland_DottedHole_B4F/map.json +++ b/data/maps/SixIsland_DottedHole_B4F/map.json @@ -57,7 +57,7 @@ "x": 6, "y": 5, "elevation": 0, - "script": "SSAnne_CaptainsOffice9_EventScript_164195" + "script": "SixIsland_DottedHole_B4F_EventScript_164195" } ] } \ No newline at end of file diff --git a/data/maps/SixIsland_PatternBush/map.json b/data/maps/SixIsland_PatternBush/map.json index 95f3b63d5..a72372cc5 100644 --- a/data/maps/SixIsland_PatternBush/map.json +++ b/data/maps/SixIsland_PatternBush/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "SSAnne_1F_Room11_EventScript_164590", + "script": "SixIsland_PatternBush_EventScript_164590", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "SSAnne_1F_Room11_EventScript_1645A7", + "script": "SixIsland_PatternBush_EventScript_1645A7", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "SSAnne_1F_Room11_EventScript_1645BE", + "script": "SixIsland_PatternBush_EventScript_1645BE", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 2, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "SSAnne_1F_Room11_EventScript_1645D5", + "script": "SixIsland_PatternBush_EventScript_1645D5", "flag": "0" }, { @@ -75,7 +75,7 @@ "movement_range_y": 5, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "SSAnne_1F_Room11_EventScript_1645EC", + "script": "SixIsland_PatternBush_EventScript_1645EC", "flag": "0" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "SSAnne_1F_Room11_EventScript_164603", + "script": "SixIsland_PatternBush_EventScript_164603", "flag": "0" }, { @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "SSAnne_1F_Room11_EventScript_16461A", + "script": "SixIsland_PatternBush_EventScript_16461A", "flag": "0" }, { @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, - "script": "SSAnne_1F_Room11_EventScript_164631", + "script": "SixIsland_PatternBush_EventScript_164631", "flag": "0" }, { @@ -127,7 +127,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "SSAnne_1F_Room11_EventScript_164648", + "script": "SixIsland_PatternBush_EventScript_164648", "flag": "0" }, { @@ -140,7 +140,7 @@ "movement_range_y": 2, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "SSAnne_1F_Room11_EventScript_16465F", + "script": "SixIsland_PatternBush_EventScript_16465F", "flag": "0" }, { @@ -153,7 +153,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "SSAnne_1F_Room11_EventScript_164676", + "script": "SixIsland_PatternBush_EventScript_164676", "flag": "0" }, { @@ -166,7 +166,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "SSAnne_1F_Room11_EventScript_16468D", + "script": "SixIsland_PatternBush_EventScript_16468D", "flag": "0" } ], diff --git a/data/maps/SixIsland_PatternBush/scripts.inc b/data/maps/SixIsland_PatternBush/scripts.inc index a4f5e1b85..69a35163d 100644 --- a/data/maps/SixIsland_PatternBush/scripts.inc +++ b/data/maps/SixIsland_PatternBush/scripts.inc @@ -1,8 +1,8 @@ SixIsland_PatternBush_MapScripts:: @ 8164559 - map_script 3, SSAnne_1F_Room11_MapScript1_16455F + map_script 3, SixIsland_PatternBush_MapScript1_16455F .byte 0 -SSAnne_1F_Room11_MapScript1_16455F:: @ 816455F +SixIsland_PatternBush_MapScript1_16455F:: @ 816455F setworldmapflag 2237 getplayerxy VAR_0x4001, VAR_0x4002 compare_var_to_value VAR_0x4001, 50 @@ -19,73 +19,73 @@ EventScript_164587:: @ 8164587 setescapewarp MAP_SIX_ISLAND_GREEN_PATH, 255, 45, 10 return -SSAnne_1F_Room11_EventScript_164590:: @ 8164590 +SixIsland_PatternBush_EventScript_164590:: @ 8164590 trainerbattle 0, 609, 0, Text_17BF3A, Text_17BF66 loadword 0, gUnknown_817BF97 callstd 6 end -SSAnne_1F_Room11_EventScript_1645A7:: @ 81645A7 +SixIsland_PatternBush_EventScript_1645A7:: @ 81645A7 trainerbattle 0, 610, 0, Text_17BFEB, Text_17C028 loadword 0, gUnknown_817C056 callstd 6 end -SSAnne_1F_Room11_EventScript_1645BE:: @ 81645BE +SixIsland_PatternBush_EventScript_1645BE:: @ 81645BE trainerbattle 0, 611, 0, Text_17C0BE, Text_17C0F2 loadword 0, gUnknown_817C113 callstd 6 end -SSAnne_1F_Room11_EventScript_1645D5:: @ 81645D5 +SixIsland_PatternBush_EventScript_1645D5:: @ 81645D5 trainerbattle 0, 612, 0, Text_17C155, Text_17C196 loadword 0, gUnknown_817C1D0 callstd 6 end -SSAnne_1F_Room11_EventScript_1645EC:: @ 81645EC +SixIsland_PatternBush_EventScript_1645EC:: @ 81645EC trainerbattle 0, 613, 0, Text_17C246, Text_17C275 loadword 0, gUnknown_817C2A4 callstd 6 end -SSAnne_1F_Room11_EventScript_164603:: @ 8164603 +SixIsland_PatternBush_EventScript_164603:: @ 8164603 trainerbattle 0, 614, 0, Text_17C2D9, Text_17C30D loadword 0, gUnknown_817C31C callstd 6 end -SSAnne_1F_Room11_EventScript_16461A:: @ 816461A +SixIsland_PatternBush_EventScript_16461A:: @ 816461A trainerbattle 0, 615, 0, Text_17C373, Text_17C3A5 loadword 0, gUnknown_817C3CE callstd 6 end -SSAnne_1F_Room11_EventScript_164631:: @ 8164631 +SixIsland_PatternBush_EventScript_164631:: @ 8164631 trainerbattle 0, 616, 0, Text_17C42B, Text_17C458 loadword 0, gUnknown_817C490 callstd 6 end -SSAnne_1F_Room11_EventScript_164648:: @ 8164648 +SixIsland_PatternBush_EventScript_164648:: @ 8164648 trainerbattle 0, 617, 0, Text_17C4FE, Text_17C552 loadword 0, gUnknown_817C590 callstd 6 end -SSAnne_1F_Room11_EventScript_16465F:: @ 816465F +SixIsland_PatternBush_EventScript_16465F:: @ 816465F trainerbattle 0, 618, 0, Text_17C5DB, Text_17C609 loadword 0, gUnknown_817C615 callstd 6 end -SSAnne_1F_Room11_EventScript_164676:: @ 8164676 +SixIsland_PatternBush_EventScript_164676:: @ 8164676 trainerbattle 0, 619, 0, Text_17C63E, Text_17C660 loadword 0, gUnknown_817C68E callstd 6 end -SSAnne_1F_Room11_EventScript_16468D:: @ 816468D +SixIsland_PatternBush_EventScript_16468D:: @ 816468D trainerbattle 0, 620, 0, Text_17C6C9, Text_17C6FB loadword 0, gUnknown_817C728 callstd 6 -- cgit v1.2.3 From 7dca612936fda9254239e0e350a45c56a766053a Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 14 May 2019 16:47:07 -0400 Subject: Fix indentation in .inc files --- data/maps/BirthIsland_Exterior/scripts.inc | 206 +- data/maps/BirthIsland_Harbor/scripts.inc | 60 +- data/maps/CeladonCity/scripts.inc | 164 +- data/maps/CeladonCity_Condominiums_1F/scripts.inc | 126 +- data/maps/CeladonCity_Condominiums_2F/scripts.inc | 8 +- data/maps/CeladonCity_Condominiums_3F/scripts.inc | 86 +- .../maps/CeladonCity_Condominiums_Roof/scripts.inc | 8 +- .../CeladonCity_Condominiums_RoofRoom/scripts.inc | 200 +- .../CeladonCity_DepartmentStore_1F/scripts.inc | 20 +- .../CeladonCity_DepartmentStore_2F/scripts.inc | 114 +- .../CeladonCity_DepartmentStore_3F/scripts.inc | 72 +- .../CeladonCity_DepartmentStore_4F/scripts.inc | 64 +- .../CeladonCity_DepartmentStore_5F/scripts.inc | 110 +- .../scripts.inc | 208 +- .../CeladonCity_DepartmentStore_Roof/scripts.inc | 558 ++-- data/maps/CeladonCity_GameCorner/scripts.inc | 782 +++--- .../CeladonCity_GameCorner_PrizeRoom/scripts.inc | 600 ++-- data/maps/CeladonCity_Gym/scripts.inc | 178 +- data/maps/CeladonCity_Hotel/scripts.inc | 26 +- data/maps/CeladonCity_House1/scripts.inc | 20 +- data/maps/CeladonCity_PokemonCenter_1F/scripts.inc | 38 +- data/maps/CeladonCity_PokemonCenter_2F/scripts.inc | 22 +- data/maps/CeladonCity_Restaurant/scripts.inc | 78 +- data/maps/CeruleanCave_1F/scripts.inc | 8 +- data/maps/CeruleanCave_2F/scripts.inc | 2 +- data/maps/CeruleanCave_B1F/scripts.inc | 102 +- data/maps/CeruleanCity/events_bad.inc | 66 +- data/maps/CeruleanCity/scripts.inc | 644 ++--- data/maps/CeruleanCity_BikeShop/scripts.inc | 140 +- data/maps/CeruleanCity_Gym/scripts.inc | 150 +- data/maps/CeruleanCity_House1/scripts.inc | 188 +- data/maps/CeruleanCity_House2/scripts.inc | 38 +- data/maps/CeruleanCity_House3/scripts.inc | 78 +- data/maps/CeruleanCity_House4/scripts.inc | 182 +- data/maps/CeruleanCity_House5/scripts.inc | 342 +-- data/maps/CeruleanCity_Mart/scripts.inc | 64 +- .../maps/CeruleanCity_PokemonCenter_1F/scripts.inc | 56 +- .../maps/CeruleanCity_PokemonCenter_2F/scripts.inc | 22 +- data/maps/CinnabarIsland/scripts.inc | 582 ++-- data/maps/CinnabarIsland_Gym/scripts.inc | 1186 ++++---- data/maps/CinnabarIsland_Mart/scripts.inc | 60 +- .../CinnabarIsland_PokemonCenter_1F/scripts.inc | 238 +- .../CinnabarIsland_PokemonCenter_2F/scripts.inc | 22 +- .../CinnabarIsland_PokemonLab_Entrance/scripts.inc | 44 +- .../scripts.inc | 594 ++-- .../CinnabarIsland_PokemonLab_Lounge/scripts.inc | 168 +- .../scripts.inc | 24 +- data/maps/DiglettsCave_B1F/scripts.inc | 8 +- data/maps/DiglettsCave_NorthEntrance/scripts.inc | 8 +- data/maps/DiglettsCave_SouthEntrance/scripts.inc | 8 +- data/maps/FiveIsland/scripts.inc | 26 +- data/maps/FiveIsland_Harbor/scripts.inc | 16 +- data/maps/FiveIsland_House1/scripts.inc | 8 +- data/maps/FiveIsland_House2/scripts.inc | 8 +- data/maps/FiveIsland_LostCave_Entrance/scripts.inc | 8 +- data/maps/FiveIsland_LostCave_Room1/scripts.inc | 10 +- data/maps/FiveIsland_LostCave_Room10/scripts.inc | 102 +- data/maps/FiveIsland_LostCave_Room11/scripts.inc | 2 +- data/maps/FiveIsland_LostCave_Room12/scripts.inc | 2 +- data/maps/FiveIsland_LostCave_Room13/scripts.inc | 2 +- data/maps/FiveIsland_LostCave_Room14/scripts.inc | 2 +- data/maps/FiveIsland_LostCave_Room2/scripts.inc | 2 +- data/maps/FiveIsland_LostCave_Room3/scripts.inc | 2 +- data/maps/FiveIsland_LostCave_Room4/scripts.inc | 10 +- data/maps/FiveIsland_LostCave_Room5/scripts.inc | 2 +- data/maps/FiveIsland_LostCave_Room6/scripts.inc | 2 +- data/maps/FiveIsland_LostCave_Room7/scripts.inc | 2 +- data/maps/FiveIsland_LostCave_Room8/scripts.inc | 2 +- data/maps/FiveIsland_LostCave_Room9/scripts.inc | 2 +- data/maps/FiveIsland_Meadow/scripts.inc | 84 +- data/maps/FiveIsland_MemorialPillar/scripts.inc | 182 +- data/maps/FiveIsland_PokemonCenter_1F/scripts.inc | 32 +- data/maps/FiveIsland_PokemonCenter_2F/scripts.inc | 22 +- data/maps/FiveIsland_ResortGorgeous/scripts.inc | 66 +- .../FiveIsland_ResortGorgeous_House/scripts.inc | 256 +- data/maps/FiveIsland_RocketWarehouse/scripts.inc | 298 +- data/maps/FiveIsland_WaterLabyrinth/scripts.inc | 130 +- data/maps/FourIsland/scripts.inc | 302 +- data/maps/FourIsland_Harbor/scripts.inc | 16 +- data/maps/FourIsland_House1/scripts.inc | 8 +- data/maps/FourIsland_House2/scripts.inc | 2 +- data/maps/FourIsland_IcefallCave_1F/scripts.inc | 44 +- data/maps/FourIsland_IcefallCave_Back/scripts.inc | 328 +-- .../FourIsland_IcefallCave_Entrance/scripts.inc | 8 +- data/maps/FourIsland_LoreleisHouse/scripts.inc | 56 +- data/maps/FourIsland_Mart/scripts.inc | 56 +- data/maps/FourIsland_PokemonCenter_1F/scripts.inc | 38 +- data/maps/FourIsland_PokemonCenter_2F/scripts.inc | 22 +- data/maps/FourIsland_PokemonDayCare/scripts.inc | 388 +-- data/maps/FuchsiaCity/scripts.inc | 240 +- data/maps/FuchsiaCity_Building1/scripts.inc | 120 +- data/maps/FuchsiaCity_Gym/scripts.inc | 182 +- data/maps/FuchsiaCity_House1/scripts.inc | 32 +- data/maps/FuchsiaCity_House2/scripts.inc | 74 +- data/maps/FuchsiaCity_House3/scripts.inc | 110 +- data/maps/FuchsiaCity_Mart/scripts.inc | 58 +- data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc | 38 +- data/maps/FuchsiaCity_PokemonCenter_2F/scripts.inc | 22 +- .../FuchsiaCity_SafariZone_Entrance/scripts.inc | 356 +-- data/maps/FuchsiaCity_ZooBuilding/scripts.inc | 26 +- data/maps/IndigoPlateau_Exterior/scripts.inc | 268 +- .../IndigoPlateau_PokemonCenter_1F/scripts.inc | 124 +- .../IndigoPlateau_PokemonCenter_2F/scripts.inc | 22 +- data/maps/LavenderTown/scripts.inc | 2 +- data/maps/LavenderTown_House1/scripts.inc | 44 +- data/maps/LavenderTown_House2/scripts.inc | 128 +- data/maps/LavenderTown_Mart/scripts.inc | 70 +- .../maps/LavenderTown_PokemonCenter_1F/scripts.inc | 38 +- .../maps/LavenderTown_PokemonCenter_2F/scripts.inc | 22 +- .../LavenderTown_VolunteerPokemonHouse/scripts.inc | 164 +- data/maps/MtEmber_Exterior/scripts.inc | 230 +- data/maps/MtEmber_RubyPath_1F/scripts.inc | 2 +- data/maps/MtEmber_RubyPath_B1F/scripts.inc | 2 +- data/maps/MtEmber_RubyPath_B1F_Stairs/scripts.inc | 2 +- data/maps/MtEmber_RubyPath_B2F/scripts.inc | 2 +- data/maps/MtEmber_RubyPath_B2F_Stairs/scripts.inc | 2 +- data/maps/MtEmber_RubyPath_B3F/scripts.inc | 26 +- data/maps/MtEmber_RubyPath_B4F/scripts.inc | 102 +- data/maps/MtEmber_RubyPath_B5F/scripts.inc | 70 +- data/maps/MtEmber_Summit/scripts.inc | 102 +- data/maps/MtEmber_SummitPath_1F/scripts.inc | 2 +- data/maps/MtEmber_SummitPath_2F/scripts.inc | 2 +- data/maps/MtEmber_SummitPath_3F/scripts.inc | 2 +- data/maps/MtMoon_1F/scripts.inc | 70 +- data/maps/MtMoon_B1F/scripts.inc | 2 +- data/maps/MtMoon_B2F/scripts.inc | 254 +- data/maps/NavelRock_1F/scripts.inc | 2 +- data/maps/NavelRock_B1F/scripts.inc | 2 +- data/maps/NavelRock_Base/scripts.inc | 148 +- data/maps/NavelRock_BasePath_B10F/scripts.inc | 2 +- data/maps/NavelRock_BasePath_B11F/scripts.inc | 2 +- data/maps/NavelRock_BasePath_B1F/scripts.inc | 2 +- data/maps/NavelRock_BasePath_B2F/scripts.inc | 2 +- data/maps/NavelRock_BasePath_B3F/scripts.inc | 2 +- data/maps/NavelRock_BasePath_B4F/scripts.inc | 2 +- data/maps/NavelRock_BasePath_B5F/scripts.inc | 2 +- data/maps/NavelRock_BasePath_B6F/scripts.inc | 2 +- data/maps/NavelRock_BasePath_B7F/scripts.inc | 2 +- data/maps/NavelRock_BasePath_B8F/scripts.inc | 2 +- data/maps/NavelRock_BasePath_B9F/scripts.inc | 2 +- data/maps/NavelRock_Exterior/scripts.inc | 8 +- data/maps/NavelRock_Fork/scripts.inc | 2 +- data/maps/NavelRock_Summit/scripts.inc | 210 +- data/maps/NavelRock_SummitPath_2F/scripts.inc | 2 +- data/maps/NavelRock_SummitPath_3F/scripts.inc | 2 +- data/maps/NavelRock_SummitPath_4F/scripts.inc | 2 +- data/maps/NavelRock_SummitPath_5F/scripts.inc | 2 +- data/maps/OneIsland/scripts.inc | 184 +- data/maps/OneIsland_Harbor/scripts.inc | 58 +- data/maps/OneIsland_House1/scripts.inc | 14 +- data/maps/OneIsland_House2/scripts.inc | 8 +- data/maps/OneIsland_KindleRoad/scripts.inc | 14 +- .../maps/OneIsland_KindleRoad_EmberSpa/scripts.inc | 98 +- data/maps/OneIsland_PokemonCenter_1F/scripts.inc | 1074 ++++---- data/maps/OneIsland_PokemonCenter_2F/scripts.inc | 22 +- data/maps/OneIsland_TreasureBeach/scripts.inc | 8 +- data/maps/PalletTown/scripts.inc | 868 +++--- data/maps/PalletTown_GarysHouse/scripts.inc | 340 +-- data/maps/PalletTown_PlayersHouse_1F/scripts.inc | 98 +- data/maps/PalletTown_PlayersHouse_2F/scripts.inc | 82 +- data/maps/PalletTown_ProfessorOaksLab/scripts.inc | 2334 ++++++++-------- data/maps/PewterCity/scripts.inc | 2890 ++++++++++---------- data/maps/PewterCity_Gym/scripts.inc | 170 +- data/maps/PewterCity_House1/scripts.inc | 50 +- data/maps/PewterCity_House2/scripts.inc | 14 +- data/maps/PewterCity_Mart/scripts.inc | 62 +- data/maps/PewterCity_Museum_1F/scripts.inc | 354 +-- data/maps/PewterCity_Museum_2F/scripts.inc | 44 +- data/maps/PewterCity_PokemonCenter_1F/scripts.inc | 68 +- data/maps/PewterCity_PokemonCenter_2F/scripts.inc | 22 +- data/maps/PokemonLeague_AgathasRoom/scripts.inc | 154 +- data/maps/PokemonLeague_BrunosRoom/scripts.inc | 202 +- data/maps/PokemonLeague_ChampionsRoom/scripts.inc | 402 +-- data/maps/PokemonLeague_HallOfFame/scripts.inc | 88 +- data/maps/PokemonLeague_LancesRoom/scripts.inc | 278 +- data/maps/PokemonLeague_LoreleisRoom/scripts.inc | 154 +- data/maps/PokemonMansion_1F/scripts.inc | 48 +- data/maps/PokemonMansion_2F/scripts.inc | 46 +- data/maps/PokemonMansion_3F/scripts.inc | 48 +- data/maps/PokemonMansion_B1F/scripts.inc | 48 +- data/maps/PokemonTower_1F/scripts.inc | 58 +- data/maps/PokemonTower_2F/scripts.inc | 168 +- data/maps/PokemonTower_3F/scripts.inc | 26 +- data/maps/PokemonTower_4F/scripts.inc | 26 +- data/maps/PokemonTower_5F/scripts.inc | 66 +- data/maps/PokemonTower_6F/scripts.inc | 86 +- data/maps/PokemonTower_7F/scripts.inc | 384 +-- data/maps/PowerPlant/scripts.inc | 228 +- data/maps/RockTunnel_1F/scripts.inc | 70 +- data/maps/RockTunnel_B1F/scripts.inc | 66 +- data/maps/RocketHideout_B1F/scripts.inc | 96 +- data/maps/RocketHideout_B2F/scripts.inc | 10 +- data/maps/RocketHideout_B3F/scripts.inc | 18 +- data/maps/RocketHideout_B4F/scripts.inc | 232 +- data/maps/RocketHideout_Elevator/scripts.inc | 160 +- data/maps/Route1/scripts.inc | 66 +- data/maps/Route10/scripts.inc | 22 +- data/maps/Route10_PokemonCenter_1F/scripts.inc | 116 +- data/maps/Route10_PokemonCenter_2F/scripts.inc | 22 +- data/maps/Route11/scripts.inc | 8 +- data/maps/Route11_EastEntrance_1F/scripts.inc | 14 +- data/maps/Route11_EastEntrance_2F/scripts.inc | 176 +- data/maps/Route12/scripts.inc | 110 +- data/maps/Route12_FishingHouse/scripts.inc | 220 +- data/maps/Route12_NorthEntrance_1F/scripts.inc | 8 +- data/maps/Route12_NorthEntrance_2F/scripts.inc | 88 +- data/maps/Route13/scripts.inc | 20 +- data/maps/Route14/scripts.inc | 8 +- data/maps/Route15/scripts.inc | 8 +- data/maps/Route15_WestEntrance_1F/scripts.inc | 8 +- data/maps/Route15_WestEntrance_2F/scripts.inc | 106 +- data/maps/Route16/scripts.inc | 130 +- data/maps/Route16_House/scripts.inc | 76 +- data/maps/Route16_NorthEntrance_1F/scripts.inc | 168 +- data/maps/Route16_NorthEntrance_2F/scripts.inc | 102 +- data/maps/Route17/scripts.inc | 38 +- data/maps/Route18/scripts.inc | 36 +- data/maps/Route18_EastEntrance_1F/scripts.inc | 162 +- data/maps/Route18_EastEntrance_2F/scripts.inc | 84 +- data/maps/Route19/scripts.inc | 8 +- data/maps/Route2/scripts.inc | 14 +- data/maps/Route20/scripts.inc | 52 +- data/maps/Route21_North/scripts.inc | 2 +- data/maps/Route21_South/scripts.inc | 2 +- data/maps/Route22/scripts.inc | 394 +-- data/maps/Route22_NorthEntrance/scripts.inc | 26 +- data/maps/Route23/scripts.inc | 192 +- data/maps/Route24/scripts.inc | 170 +- data/maps/Route25/scripts.inc | 14 +- data/maps/Route25_SeaCottage/scripts.inc | 532 ++-- data/maps/Route2_EastBuilding/scripts.inc | 84 +- data/maps/Route2_House/scripts.inc | 78 +- .../scripts.inc | 20 +- .../scripts.inc | 14 +- data/maps/Route3/scripts.inc | 14 +- data/maps/Route4/scripts.inc | 22 +- data/maps/Route4_PokemonCenter_1F/scripts.inc | 276 +- data/maps/Route4_PokemonCenter_2F/scripts.inc | 22 +- data/maps/Route5/scripts.inc | 8 +- data/maps/Route5_PokemonDayCare/scripts.inc | 2 +- data/maps/Route5_SouthEntrance/scripts.inc | 126 +- data/maps/Route6/scripts.inc | 8 +- data/maps/Route6_NorthEntrance/scripts.inc | 126 +- data/maps/Route7/scripts.inc | 8 +- data/maps/Route7_EastEntrance/scripts.inc | 126 +- data/maps/Route8/scripts.inc | 8 +- data/maps/Route8_WestEntrance/scripts.inc | 138 +- data/maps/Route9/scripts.inc | 8 +- data/maps/SSAnne_1F_Corridor/scripts.inc | 14 +- data/maps/SSAnne_1F_Room1/scripts.inc | 8 +- data/maps/SSAnne_1F_Room2/scripts.inc | 24 +- data/maps/SSAnne_1F_Room3/scripts.inc | 32 +- data/maps/SSAnne_1F_Room4/scripts.inc | 28 +- data/maps/SSAnne_1F_Room5/scripts.inc | 10 +- data/maps/SSAnne_1F_Room6/scripts.inc | 48 +- data/maps/SSAnne_1F_Room7/scripts.inc | 10 +- data/maps/SSAnne_2F_Corridor/scripts.inc | 272 +- data/maps/SSAnne_2F_Room1/scripts.inc | 24 +- data/maps/SSAnne_2F_Room2/scripts.inc | 18 +- data/maps/SSAnne_2F_Room3/scripts.inc | 14 +- data/maps/SSAnne_2F_Room4/scripts.inc | 18 +- data/maps/SSAnne_2F_Room5/scripts.inc | 14 +- data/maps/SSAnne_2F_Room6/scripts.inc | 14 +- data/maps/SSAnne_3F_Corridor/scripts.inc | 8 +- data/maps/SSAnne_B1F_Corridor/scripts.inc | 2 +- data/maps/SSAnne_B1F_Room1/scripts.inc | 18 +- data/maps/SSAnne_B1F_Room2/scripts.inc | 10 +- data/maps/SSAnne_B1F_Room3/scripts.inc | 10 +- data/maps/SSAnne_B1F_Room4/scripts.inc | 18 +- data/maps/SSAnne_B1F_Room5/scripts.inc | 26 +- data/maps/SSAnne_CaptainsOffice/scripts.inc | 96 +- data/maps/SSAnne_Deck/scripts.inc | 36 +- data/maps/SSAnne_Exterior/scripts.inc | 104 +- data/maps/SSAnne_Kitchen/scripts.inc | 84 +- data/maps/SafariZone_Building1/scripts.inc | 14 +- data/maps/SafariZone_Building2/scripts.inc | 20 +- data/maps/SafariZone_Building3/scripts.inc | 20 +- data/maps/SafariZone_Building4/scripts.inc | 20 +- data/maps/SafariZone_Center/scripts.inc | 26 +- data/maps/SafariZone_East/scripts.inc | 20 +- data/maps/SafariZone_North/scripts.inc | 32 +- data/maps/SafariZone_SecretHouse/scripts.inc | 58 +- data/maps/SafariZone_West/scripts.inc | 26 +- data/maps/SaffronCity/scripts.inc | 2 +- data/maps/SaffronCity_Dojo/scripts.inc | 266 +- data/maps/SaffronCity_Duplicate/scripts.inc | 198 +- data/maps/SaffronCity_Gym/scripts.inc | 196 +- data/maps/SaffronCity_House1_1F/scripts.inc | 32 +- data/maps/SaffronCity_House1_2F/scripts.inc | 86 +- data/maps/SaffronCity_House2/scripts.inc | 38 +- data/maps/SaffronCity_House3/scripts.inc | 58 +- data/maps/SaffronCity_Mart/scripts.inc | 58 +- data/maps/SaffronCity_PokemonCenter_1F/scripts.inc | 56 +- data/maps/SaffronCity_PokemonCenter_2F/scripts.inc | 22 +- .../SaffronCity_PokemonTrainerFanClub/scripts.inc | 766 +++--- data/maps/SeafoamIslands_1F/scripts.inc | 8 +- data/maps/SeafoamIslands_B1F/scripts.inc | 2 +- data/maps/SeafoamIslands_B2F/scripts.inc | 2 +- data/maps/SeafoamIslands_B3F/scripts.inc | 156 +- data/maps/SeafoamIslands_B4F/scripts.inc | 314 +-- data/maps/SevenIsland/scripts.inc | 26 +- data/maps/SevenIsland_Harbor/scripts.inc | 16 +- data/maps/SevenIsland_House_Room1/scripts.inc | 290 +- data/maps/SevenIsland_House_Room2/scripts.inc | 124 +- data/maps/SevenIsland_Mart/scripts.inc | 70 +- data/maps/SevenIsland_PokemonCenter_1F/scripts.inc | 38 +- data/maps/SevenIsland_PokemonCenter_2F/scripts.inc | 22 +- .../scripts.inc | 234 +- data/maps/SevenIsland_SevaultCanyon/scripts.inc | 8 +- .../SevenIsland_SevaultCanyon_Entrance/scripts.inc | 8 +- .../SevenIsland_SevaultCanyon_House/scripts.inc | 152 +- data/maps/SevenIsland_TanobyRuins/scripts.inc | 2 +- .../scripts.inc | 8 +- .../scripts.inc | 8 +- .../scripts.inc | 10 +- .../scripts.inc | 8 +- .../scripts.inc | 8 +- .../scripts.inc | 8 +- .../scripts.inc | 8 +- data/maps/SevenIsland_TrainerTower/scripts.inc | 20 +- data/maps/SevenIsland_TrainerTower_1F/scripts.inc | 28 +- data/maps/SevenIsland_TrainerTower_2F/scripts.inc | 28 +- data/maps/SevenIsland_TrainerTower_3F/scripts.inc | 28 +- data/maps/SevenIsland_TrainerTower_4F/scripts.inc | 28 +- data/maps/SevenIsland_TrainerTower_5F/scripts.inc | 28 +- data/maps/SevenIsland_TrainerTower_6F/scripts.inc | 28 +- data/maps/SevenIsland_TrainerTower_7F/scripts.inc | 28 +- data/maps/SevenIsland_TrainerTower_8F/scripts.inc | 28 +- .../SevenIsland_TrainerTower_Elevator/scripts.inc | 136 +- .../SevenIsland_TrainerTower_Lobby/scripts.inc | 398 +-- .../maps/SevenIsland_TrainerTower_Roof/scripts.inc | 10 +- data/maps/SilphCo_10F/scripts.inc | 56 +- data/maps/SilphCo_11F/scripts.inc | 234 +- data/maps/SilphCo_1F/scripts.inc | 20 +- data/maps/SilphCo_2F/scripts.inc | 56 +- data/maps/SilphCo_3F/scripts.inc | 60 +- data/maps/SilphCo_4F/scripts.inc | 68 +- data/maps/SilphCo_5F/scripts.inc | 98 +- data/maps/SilphCo_6F/scripts.inc | 160 +- data/maps/SilphCo_7F/scripts.inc | 410 +-- data/maps/SilphCo_8F/scripts.inc | 64 +- data/maps/SilphCo_9F/scripts.inc | 84 +- data/maps/SilphCo_Elevator/scripts.inc | 278 +- data/maps/SixIsland/scripts.inc | 26 +- data/maps/SixIsland_AlteringCave/scripts.inc | 8 +- data/maps/SixIsland_DottedHole_1F/scripts.inc | 48 +- data/maps/SixIsland_DottedHole_B1F/scripts.inc | 2 +- data/maps/SixIsland_DottedHole_B2F/scripts.inc | 2 +- data/maps/SixIsland_DottedHole_B3F/scripts.inc | 2 +- data/maps/SixIsland_DottedHole_B4F/scripts.inc | 2 +- .../SixIsland_DottedHole_SapphireRoom/scripts.inc | 502 ++-- data/maps/SixIsland_GreenPath/scripts.inc | 14 +- data/maps/SixIsland_Harbor/scripts.inc | 16 +- data/maps/SixIsland_House/scripts.inc | 8 +- data/maps/SixIsland_Mart/scripts.inc | 56 +- data/maps/SixIsland_OutcastIsland/scripts.inc | 10 +- data/maps/SixIsland_PatternBush/scripts.inc | 122 +- data/maps/SixIsland_PokemonCenter_1F/scripts.inc | 122 +- data/maps/SixIsland_PokemonCenter_2F/scripts.inc | 22 +- data/maps/SixIsland_RuinValley/scripts.inc | 78 +- data/maps/SixIsland_WaterPath/scripts.inc | 14 +- data/maps/SixIsland_WaterPath_House1/scripts.inc | 160 +- data/maps/SixIsland_WaterPath_House2/scripts.inc | 8 +- data/maps/ThreeIsland/scripts.inc | 696 ++--- data/maps/ThreeIsland_BerryForest/scripts.inc | 122 +- data/maps/ThreeIsland_BondBridge/scripts.inc | 14 +- data/maps/ThreeIsland_DunsparceTunnel/scripts.inc | 94 +- data/maps/ThreeIsland_Harbor/scripts.inc | 16 +- data/maps/ThreeIsland_House1/scripts.inc | 22 +- data/maps/ThreeIsland_House2/scripts.inc | 26 +- data/maps/ThreeIsland_House3/scripts.inc | 8 +- data/maps/ThreeIsland_House4/scripts.inc | 14 +- data/maps/ThreeIsland_House5/scripts.inc | 26 +- data/maps/ThreeIsland_Mart/scripts.inc | 64 +- data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc | 38 +- data/maps/ThreeIsland_PokemonCenter_2F/scripts.inc | 22 +- data/maps/ThreeIsland_Port/scripts.inc | 62 +- data/maps/TwoIsland/scripts.inc | 374 +-- data/maps/TwoIsland_CapeBrink/scripts.inc | 2 +- data/maps/TwoIsland_CapeBrink_House/scripts.inc | 2 +- data/maps/TwoIsland_Harbor/scripts.inc | 16 +- data/maps/TwoIsland_House/scripts.inc | 220 +- data/maps/TwoIsland_JoyfulGameCorner/scripts.inc | 354 +-- data/maps/TwoIsland_PokemonCenter_1F/scripts.inc | 32 +- data/maps/TwoIsland_PokemonCenter_2F/scripts.inc | 22 +- data/maps/UndergroundPath_EastEntrance/scripts.inc | 8 +- .../UndergroundPath_EastWestTunnel/scripts.inc | 8 +- .../maps/UndergroundPath_NorthEntrance/scripts.inc | 72 +- .../UndergroundPath_NorthSouthTunnel/scripts.inc | 8 +- .../maps/UndergroundPath_SouthEntrance/scripts.inc | 8 +- data/maps/UndergroundPath_WestEntrance/scripts.inc | 8 +- data/maps/UnknownMap_00_00/scripts.inc | 2 +- data/maps/UnknownMap_00_01/scripts.inc | 2 +- data/maps/UnknownMap_00_02/scripts.inc | 2 +- data/maps/UnknownMap_00_03/scripts.inc | 2 +- data/maps/UnknownMap_00_04/scripts.inc | 162 +- data/maps/UnknownMap_03_50/scripts.inc | 2 +- data/maps/UnknownMap_03_51/scripts.inc | 2 +- data/maps/UnknownMap_03_52/scripts.inc | 2 +- data/maps/UnknownMap_03_53/scripts.inc | 2 +- data/maps/UnknownMap_18_01/scripts.inc | 2 +- data/maps/UnusedHouse_27_00/scripts.inc | 2 +- data/maps/UnusedHouse_29_00/scripts.inc | 2 +- data/maps/UnusedHouse_31_05/scripts.inc | 2 +- data/maps/VermilionCity/scripts.inc | 510 ++-- data/maps/VermilionCity_Gym/scripts.inc | 500 ++-- data/maps/VermilionCity_House1/scripts.inc | 74 +- data/maps/VermilionCity_House3/scripts.inc | 38 +- data/maps/VermilionCity_Mart/scripts.inc | 60 +- .../VermilionCity_PokemonCenter_1F/scripts.inc | 38 +- .../VermilionCity_PokemonCenter_2F/scripts.inc | 22 +- data/maps/VermilionCity_PokemonFanClub/scripts.inc | 304 +- data/maps/VictoryRoad_1F/scripts.inc | 66 +- data/maps/VictoryRoad_2F/scripts.inc | 122 +- data/maps/VictoryRoad_3F/scripts.inc | 94 +- data/maps/ViridianCity/scripts.inc | 2 +- data/maps/ViridianCity_Gym/scripts.inc | 208 +- data/maps/ViridianCity_House1/scripts.inc | 38 +- data/maps/ViridianCity_House2/scripts.inc | 190 +- data/maps/ViridianCity_Mart/scripts.inc | 154 +- .../maps/ViridianCity_PokemonCenter_1F/scripts.inc | 38 +- .../maps/ViridianCity_PokemonCenter_2F/scripts.inc | 22 +- data/maps/ViridianForest/scripts.inc | 96 +- 423 files changed, 22142 insertions(+), 22142 deletions(-) (limited to 'data/maps') diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc index 93618c138..02ac130e2 100644 --- a/data/maps/BirthIsland_Exterior/scripts.inc +++ b/data/maps/BirthIsland_Exterior/scripts.inc @@ -1,132 +1,132 @@ BirthIsland_Exterior_MapScripts:: @ 8165203 - map_script 3, BirthIsland_Exterior_MapScript1_165217 - map_script 5, BirthIsland_Exterior_MapScript2_165253 - map_script 7, BirthIsland_Exterior_MapScript3_165213 - .byte 0 + map_script 3, BirthIsland_Exterior_MapScript1_165217 + map_script 5, BirthIsland_Exterior_MapScript2_165253 + map_script 7, BirthIsland_Exterior_MapScript3_165213 + .byte 0 BirthIsland_Exterior_MapScript3_165213:: @ 8165213 - special sub_80CD008 - end + special sub_80CD008 + end BirthIsland_Exterior_MapScript1_165217:: @ 8165217 - setworldmapflag 2242 - setvar VAR_0x4010, 150 - setvar VAR_SECRET_BASE_MAP, 0 - setvar VAR_ALTERING_CAVE_WILD_SET, 0 - checkflag FLAG_0x2E4 - call_if 1, EventScript_16523C - checkflag FLAG_0x2E4 - call_if 0, EventScript_165243 - end + setworldmapflag 2242 + setvar VAR_0x4010, 150 + setvar VAR_SECRET_BASE_MAP, 0 + setvar VAR_ALTERING_CAVE_WILD_SET, 0 + checkflag FLAG_0x2E4 + call_if 1, EventScript_16523C + checkflag FLAG_0x2E4 + call_if 0, EventScript_165243 + end EventScript_16523C:: @ 816523C - setflag FLAG_0x099 - setflag FLAG_0x09A - return + setflag FLAG_0x099 + setflag FLAG_0x09A + return EventScript_165243:: @ 8165243 - checkflag FLAG_0x2F7 - goto_if 1, EventScript_1A77A9 - clearflag FLAG_0x09A - clearflag 2120 - return + checkflag FLAG_0x2F7 + goto_if 1, EventScript_1A77A9 + clearflag FLAG_0x09A + clearflag 2120 + return BirthIsland_Exterior_MapScript2_165253:: @ 8165253 - checkflag 2055 - call_if 1, EventScript_16525D - end + checkflag 2055 + call_if 1, EventScript_16525D + end EventScript_16525D:: @ 816525D - specialvar VAR_RESULT, sub_80CA74C - compare_var_to_value VAR_RESULT, 7 - goto_if 5, EventScript_1A77A9 - removeobject 2 - return + specialvar VAR_RESULT, sub_80CA74C + compare_var_to_value VAR_RESULT, 7 + goto_if 5, EventScript_1A77A9 + removeobject 2 + return BirthIsland_Exterior_EventScript_165271:: @ 8165271 - lock - faceplayer - special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 - special sub_8112364 - special sub_80CCDFC - waitstate - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1652BA - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1652BC - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1652C0 - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_1652BE - end + lock + faceplayer + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + special sub_8112364 + special sub_80CCDFC + waitstate + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_1652BA + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_1652BC + compare_var_to_value VAR_0x8000, 2 + goto_if 1, EventScript_1652C0 + compare_var_to_value VAR_0x8000, 3 + goto_if 1, EventScript_1652BE + end EventScript_1652BA:: @ 81652BA - release - end + release + end EventScript_1652BC:: @ 81652BC - release - end + release + end EventScript_1652BE:: @ 81652BE - release - end + release + end EventScript_1652C0:: @ 81652C0 - addobject 2 - waitse - setfieldeffectarg 0, 1 - setfieldeffectarg 1, 56 - setfieldeffectarg 2, 2 - dofieldeffect 68 - playbgm BGM_FRLG_DEOXYS_EYE, 0 - waitfieldeffect 68 - applymovement 2, Movement_165353 - waitmovement 0 - waitse - playmoncry SPECIES_DEOXYS, 2 - delay 40 - waitmoncry - setvar VAR_LAST_TALKED, 2 - setvar VAR_0x8004, 410 - setvar VAR_0x8005, 30 - setvar VAR_0x8006, 0 - special sub_8044838 - setflag 2055 - special sub_807F9D8 - waitstate - clearflag 2055 - specialvar VAR_RESULT, sub_80CA74C - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16533A - compare_var_to_value VAR_RESULT, 4 - goto_if 1, EventScript_165348 - compare_var_to_value VAR_RESULT, 5 - goto_if 1, EventScript_165348 - setflag FLAG_0x2E4 - release - end + addobject 2 + waitse + setfieldeffectarg 0, 1 + setfieldeffectarg 1, 56 + setfieldeffectarg 2, 2 + dofieldeffect 68 + playbgm BGM_FRLG_DEOXYS_EYE, 0 + waitfieldeffect 68 + applymovement 2, Movement_165353 + waitmovement 0 + waitse + playmoncry SPECIES_DEOXYS, 2 + delay 40 + waitmoncry + setvar VAR_LAST_TALKED, 2 + setvar VAR_0x8004, 410 + setvar VAR_0x8005, 30 + setvar VAR_0x8006, 0 + special sub_8044838 + setflag 2055 + special sub_807F9D8 + waitstate + clearflag 2055 + specialvar VAR_RESULT, sub_80CA74C + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16533A + compare_var_to_value VAR_RESULT, 4 + goto_if 1, EventScript_165348 + compare_var_to_value VAR_RESULT, 5 + goto_if 1, EventScript_165348 + setflag FLAG_0x2E4 + release + end EventScript_16533A:: @ 816533A - setflag FLAG_0x2F7 - setvar VAR_0x8004, 410 - goto EventScript_1A9236 - end + setflag FLAG_0x2F7 + setvar VAR_0x8004, 410 + goto EventScript_1A9236 + end EventScript_165348:: @ 8165348 - setvar VAR_0x8004, 410 - goto EventScript_1A9236 - end + setvar VAR_0x8004, 410 + goto EventScript_1A9236 + end Movement_165353:: @ 8165353 - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_end + step_down + step_down + step_down + step_down + step_down + step_down + step_down + step_end diff --git a/data/maps/BirthIsland_Harbor/scripts.inc b/data/maps/BirthIsland_Harbor/scripts.inc index d92a62d8e..70b91e3d9 100644 --- a/data/maps/BirthIsland_Harbor/scripts.inc +++ b/data/maps/BirthIsland_Harbor/scripts.inc @@ -1,37 +1,37 @@ BirthIsland_Harbor_MapScripts:: @ 81653E6 - .byte 0 + .byte 0 BirthIsland_Harbor_EventScript_1653E7:: @ 81653E7 - lock - faceplayer - message Text_181726 - waitmessage - setvar VAR_0x8004, 10 - multichoice 20, 8, 61, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1A91D5 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1A90F6 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_1A90F6 - end + lock + faceplayer + message Text_181726 + waitmessage + setvar VAR_0x8004, 10 + multichoice 20, 8, 61, 0 + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_1A91D5 + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_1A90F6 + compare_var_to_value VAR_0x8000, 127 + goto_if 1, EventScript_1A90F6 + end NavelRock_Harbor_MapScripts:: @ 8165420 - .byte 0 + .byte 0 NavelRock_Harbor_EventScript_165421:: @ 8165421 - lock - faceplayer - message Text_181726 - waitmessage - setvar VAR_0x8004, 9 - multichoice 20, 8, 61, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1A91D5 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1A90F6 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_1A90F6 - end + lock + faceplayer + message Text_181726 + waitmessage + setvar VAR_0x8004, 9 + multichoice 20, 8, 61, 0 + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_1A91D5 + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_1A90F6 + compare_var_to_value VAR_0x8000, 127 + goto_if 1, EventScript_1A90F6 + end diff --git a/data/maps/CeladonCity/scripts.inc b/data/maps/CeladonCity/scripts.inc index 54579baae..8e3ffe308 100644 --- a/data/maps/CeladonCity/scripts.inc +++ b/data/maps/CeladonCity/scripts.inc @@ -1,123 +1,123 @@ CeladonCity_MapScripts:: @ 8166C8F - map_script 3, CeladonCity_MapScript1_166C95 - .byte 0 + map_script 3, CeladonCity_MapScript1_166C95 + .byte 0 CeladonCity_MapScript1_166C95:: @ 8166C95 - setworldmapflag 2198 - end + setworldmapflag 2198 + end CeladonCity_EventScript_166C99:: @ 8166C99 - loadword 0, gUnknown_817FEC3 - callstd 2 - end + loadword 0, gUnknown_817FEC3 + callstd 2 + end CeladonCity_EventScript_166CA2:: @ 8166CA2 - lock - loadword 0, gUnknown_817FF1C - callstd 4 - release - end + lock + loadword 0, gUnknown_817FF1C + callstd 4 + release + end CeladonCity_EventScript_166CAD:: @ 8166CAD - loadword 0, gUnknown_817FF4A - callstd 2 - end + loadword 0, gUnknown_817FF4A + callstd 2 + end CeladonCity_EventScript_166CB6:: @ 8166CB6 - loadword 0, gUnknown_817FFC5 - callstd 2 - end + loadword 0, gUnknown_817FFC5 + callstd 2 + end CeladonCity_EventScript_166CBF:: @ 8166CBF - goto EventScript_1C4A86 - end + goto EventScript_1C4A86 + end CeladonCity_EventScript_166CC5:: @ 8166CC5 - lock - faceplayer - loadword 0, gUnknown_818001B - callstd 4 - closemessage - applymovement 2, Movement_1A75E5 - waitmovement 0 - release - end + lock + faceplayer + loadword 0, gUnknown_818001B + callstd 4 + closemessage + applymovement 2, Movement_1A75E5 + waitmovement 0 + release + end CeladonCity_EventScript_166CDC:: @ 8166CDC - lock - faceplayer - waitse - playmoncry SPECIES_POLIWRATH, 0 - loadword 0, gUnknown_8180075 - callstd 4 - closemessage - waitmoncry - applymovement 3, Movement_1A75E5 - waitmovement 0 - release - end + lock + faceplayer + waitse + playmoncry SPECIES_POLIWRATH, 0 + loadword 0, gUnknown_8180075 + callstd 4 + closemessage + waitmoncry + applymovement 3, Movement_1A75E5 + waitmovement 0 + release + end CeladonCity_EventScript_166CFA:: @ 8166CFA - loadword 0, gUnknown_81800C2 - callstd 2 - end + loadword 0, gUnknown_81800C2 + callstd 2 + end CeladonCity_EventScript_166D03:: @ 8166D03 - loadword 0, gUnknown_818008C - callstd 2 - end + loadword 0, gUnknown_818008C + callstd 2 + end CeladonCity_EventScript_166D0C:: @ 8166D0C - loadword 0, gUnknown_8180300 - callstd 2 - end + loadword 0, gUnknown_8180300 + callstd 2 + end CeladonCity_EventScript_166D15:: @ 8166D15 - loadword 0, gUnknown_81804E1 - callstd 2 - end + loadword 0, gUnknown_81804E1 + callstd 2 + end CeladonCity_EventScript_166D1E:: @ 8166D1E - loadword 0, gUnknown_81800E1 - callstd 3 - end + loadword 0, gUnknown_81800E1 + callstd 3 + end CeladonCity_EventScript_166D27:: @ 8166D27 - loadword 0, gUnknown_818017A - callstd 3 - end + loadword 0, gUnknown_818017A + callstd 3 + end CeladonCity_EventScript_166D30:: @ 8166D30 - lockall - setvar VAR_0x8004, 5 - setvar VAR_0x8005, 0 - special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_81801A2 - callstd 4 - releaseall - end + lockall + setvar VAR_0x8004, 5 + setvar VAR_0x8005, 0 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_81801A2 + callstd 4 + releaseall + end CeladonCity_EventScript_166D48:: @ 8166D48 - loadword 0, gUnknown_81801E5 - callstd 3 - end + loadword 0, gUnknown_81801E5 + callstd 3 + end CeladonCity_EventScript_166D51:: @ 8166D51 - loadword 0, gUnknown_81801F5 - callstd 3 - end + loadword 0, gUnknown_81801F5 + callstd 3 + end CeladonCity_EventScript_166D5A:: @ 8166D5A - loadword 0, gUnknown_8180224 - callstd 3 - end + loadword 0, gUnknown_8180224 + callstd 3 + end CeladonCity_EventScript_166D63:: @ 8166D63 - loadword 0, gUnknown_81802A4 - callstd 3 - end + loadword 0, gUnknown_81802A4 + callstd 3 + end CeladonCity_EventScript_166D6C:: @ 8166D6C - loadword 0, gUnknown_81802CF - callstd 3 - end + loadword 0, gUnknown_81802CF + callstd 3 + end diff --git a/data/maps/CeladonCity_Condominiums_1F/scripts.inc b/data/maps/CeladonCity_Condominiums_1F/scripts.inc index 868c58812..e30e70186 100644 --- a/data/maps/CeladonCity_Condominiums_1F/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_1F/scripts.inc @@ -1,78 +1,78 @@ CeladonCity_Condominiums_1F_MapScripts:: @ 816C320 - .byte 0 + .byte 0 CeladonCity_Condominiums_1F_EventScript_16C321:: @ 816C321 - lock - faceplayer - checkflag FLAG_0x2F8 - goto_if 1, EventScript_16C36A - checkflag 2092 - goto_if 1, EventScript_16C374 - checkflag FLAG_0x2A6 - goto_if 1, EventScript_16C36A - loadword 0, gUnknown_81960C9 - callstd 4 - setflag FLAG_0x2A6 - setorcopyvar VAR_0x8000, 369 - setorcopyvar VAR_0x8001, 1 - callstd 0 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1A6BF9 - loadword 0, gUnknown_8196109 - callstd 4 - release - end + lock + faceplayer + checkflag FLAG_0x2F8 + goto_if 1, EventScript_16C36A + checkflag 2092 + goto_if 1, EventScript_16C374 + checkflag FLAG_0x2A6 + goto_if 1, EventScript_16C36A + loadword 0, gUnknown_81960C9 + callstd 4 + setflag FLAG_0x2A6 + setorcopyvar VAR_0x8000, 369 + setorcopyvar VAR_0x8001, 1 + callstd 0 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_1A6BF9 + loadword 0, gUnknown_8196109 + callstd 4 + release + end EventScript_16C36A:: @ 816C36A - loadword 0, gUnknown_8196148 - callstd 4 - release - end + loadword 0, gUnknown_8196148 + callstd 4 + release + end EventScript_16C374:: @ 816C374 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 4 - special SetFlavorTextFlagFromSpecialVars - setflag FLAG_0x2F8 - loadword 0, gUnknown_8196188 - callstd 4 - release - end + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 4 + special SetFlavorTextFlagFromSpecialVars + setflag FLAG_0x2F8 + loadword 0, gUnknown_8196188 + callstd 4 + release + end CeladonCity_Condominiums_1F_EventScript_16C38E:: @ 816C38E - lock - faceplayer - waitse - playmoncry SPECIES_MEOWTH, 0 - loadword 0, gUnknown_81960BB - callstd 4 - waitmoncry - release - end + lock + faceplayer + waitse + playmoncry SPECIES_MEOWTH, 0 + loadword 0, gUnknown_81960BB + callstd 4 + waitmoncry + release + end CeladonCity_Condominiums_1F_EventScript_16C3A1:: @ 816C3A1 - lock - faceplayer - waitse - playmoncry SPECIES_CLEFAIRY, 0 - loadword 0, gUnknown_819625B - callstd 4 - waitmoncry - release - end + lock + faceplayer + waitse + playmoncry SPECIES_CLEFAIRY, 0 + loadword 0, gUnknown_819625B + callstd 4 + waitmoncry + release + end CeladonCity_Condominiums_1F_EventScript_16C3B4:: @ 816C3B4 - lock - faceplayer - waitse - playmoncry SPECIES_NIDORAN_F, 0 - loadword 0, gUnknown_8196272 - callstd 4 - waitmoncry - release - end + lock + faceplayer + waitse + playmoncry SPECIES_NIDORAN_F, 0 + loadword 0, gUnknown_8196272 + callstd 4 + waitmoncry + release + end CeladonCity_Condominiums_1F_EventScript_16C3C7:: @ 816C3C7 - loadword 0, gUnknown_8196287 - callstd 3 - end + loadword 0, gUnknown_8196287 + callstd 3 + end diff --git a/data/maps/CeladonCity_Condominiums_2F/scripts.inc b/data/maps/CeladonCity_Condominiums_2F/scripts.inc index f7c6fa8d7..bcd991d64 100644 --- a/data/maps/CeladonCity_Condominiums_2F/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_2F/scripts.inc @@ -1,7 +1,7 @@ CeladonCity_Condominiums_2F_MapScripts:: @ 816C3D0 - .byte 0 + .byte 0 CeladonCity_Condominiums_2F_EventScript_16C3D1:: @ 816C3D1 - loadword 0, gUnknown_81962A7 - callstd 3 - end + loadword 0, gUnknown_81962A7 + callstd 3 + end diff --git a/data/maps/CeladonCity_Condominiums_3F/scripts.inc b/data/maps/CeladonCity_Condominiums_3F/scripts.inc index fe18ab649..c34a44589 100644 --- a/data/maps/CeladonCity_Condominiums_3F/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_3F/scripts.inc @@ -1,64 +1,64 @@ CeladonCity_Condominiums_3F_MapScripts:: @ 816C3DA - .byte 0 + .byte 0 CeladonCity_Condominiums_3F_EventScript_16C3DB:: @ 816C3DB - loadword 0, gUnknown_81962BF - callstd 2 - end + loadword 0, gUnknown_81962BF + callstd 2 + end CeladonCity_Condominiums_3F_EventScript_16C3E4:: @ 816C3E4 - loadword 0, gUnknown_81962D7 - callstd 2 - end + loadword 0, gUnknown_81962D7 + callstd 2 + end CeladonCity_Condominiums_3F_EventScript_16C3ED:: @ 816C3ED - loadword 0, gUnknown_81962FB - callstd 2 - end + loadword 0, gUnknown_81962FB + callstd 2 + end CeladonCity_Condominiums_3F_EventScript_16C3F6:: @ 816C3F6 - lock - faceplayer - specialvar VAR_RESULT, sub_8088F58 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16C412 - loadword 0, gUnknown_8196356 - callstd 4 - release - end + lock + faceplayer + specialvar VAR_RESULT, sub_8088F58 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16C412 + loadword 0, gUnknown_8196356 + callstd 4 + release + end EventScript_16C412:: @ 816C412 - goto EventScript_16C418 - end + goto EventScript_16C418 + end EventScript_16C418:: @ 816C418 - message Text_1963CD - waitmessage - delay 60 - special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 - special sub_80CA618 - waitstate - release - end + message Text_1963CD + waitmessage + delay 60 + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + special sub_80CA618 + waitstate + release + end CeladonCity_Condominiums_3F_EventScript_16C435:: @ 816C435 - loadword 0, gUnknown_81964A8 - callstd 3 - end + loadword 0, gUnknown_81964A8 + callstd 3 + end CeladonCity_Condominiums_3F_EventScript_16C43E:: @ 816C43E - loadword 0, gUnknown_819640C - callstd 3 - end + loadword 0, gUnknown_819640C + callstd 3 + end CeladonCity_Condominiums_3F_EventScript_16C447:: @ 816C447 - loadword 0, gUnknown_819644B - callstd 3 - end + loadword 0, gUnknown_819644B + callstd 3 + end CeladonCity_Condominiums_3F_EventScript_16C450:: @ 816C450 - loadword 0, gUnknown_8196478 - callstd 3 - end + loadword 0, gUnknown_8196478 + callstd 3 + end diff --git a/data/maps/CeladonCity_Condominiums_Roof/scripts.inc b/data/maps/CeladonCity_Condominiums_Roof/scripts.inc index dd3d686c0..4a6b0552c 100644 --- a/data/maps/CeladonCity_Condominiums_Roof/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_Roof/scripts.inc @@ -1,7 +1,7 @@ CeladonCity_Condominiums_Roof_MapScripts:: @ 816C459 - .byte 0 + .byte 0 CeladonCity_Condominiums_Roof_EventScript_16C45A:: @ 816C45A - loadword 0, gUnknown_81964C4 - callstd 3 - end + loadword 0, gUnknown_81964C4 + callstd 3 + end diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc b/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc index ee5cf4777..f456adcc3 100644 --- a/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc @@ -1,127 +1,127 @@ CeladonCity_Condominiums_RoofRoom_MapScripts:: @ 816C463 - .byte 0 + .byte 0 CeladonCity_Condominiums_RoofRoom_EventScript_16C464:: @ 816C464 - loadword 0, gUnknown_81964D7 - callstd 2 - end + loadword 0, gUnknown_81964D7 + callstd 2 + end CeladonCity_Condominiums_RoofRoom_EventScript_16C46D:: @ 816C46D - lock - faceplayer - setvar VAR_0x4001, 133 - givemon SPECIES_EEVEE, 25, ITEM_NONE, 0, 0, 0 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16C4A6 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16C4DA - compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A927C - release - end + lock + faceplayer + setvar VAR_0x4001, 133 + givemon SPECIES_EEVEE, 25, ITEM_NONE, 0, 0, 0 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16C4A6 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16C4DA + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A927C + release + end EventScript_16C4A6:: @ 816C4A6 - removeobject 2 - playfanfare MUS_FANFA1 - message Text_196591 - waitmessage - waitfanfare - getspeciesname 0, SPECIES_EEVEE - loadword 0, gUnknown_81A56A7 - callstd 5 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16C514 - call EventScript_1A8C27 - call EventScript_1A74EB - goto EventScript_16C514 - end + removeobject 2 + playfanfare MUS_FANFA1 + message Text_196591 + waitmessage + waitfanfare + getspeciesname 0, SPECIES_EEVEE + loadword 0, gUnknown_81A56A7 + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16C514 + call EventScript_1A8C27 + call EventScript_1A74EB + goto EventScript_16C514 + end EventScript_16C4DA:: @ 816C4DA - removeobject 2 - playfanfare MUS_FANFA1 - message Text_196591 - waitmessage - waitfanfare - getspeciesname 0, SPECIES_EEVEE - loadword 0, gUnknown_81A56A7 - callstd 5 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16C509 - call EventScript_1A8C33 - goto EventScript_16C509 - end + removeobject 2 + playfanfare MUS_FANFA1 + message Text_196591 + waitmessage + waitfanfare + getspeciesname 0, SPECIES_EEVEE + loadword 0, gUnknown_81A56A7 + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16C509 + call EventScript_1A8C33 + goto EventScript_16C509 + end EventScript_16C509:: @ 816C509 - call EventScript_1A8C3C - goto EventScript_16C514 - end + call EventScript_1A8C3C + goto EventScript_16C514 + end EventScript_16C514:: @ 816C514 - setflag FLAG_0x263 - release - end + setflag FLAG_0x263 + release + end CeladonCity_Condominiums_RoofRoom_EventScript_16C519:: @ 816C519 - loadword 0, gUnknown_81967E3 - callstd 3 - end + loadword 0, gUnknown_81967E3 + callstd 3 + end CeladonCity_Condominiums_RoofRoom_EventScript_16C522:: @ 816C522 - lockall - loadword 0, gUnknown_81965C2 - callstd 4 - message Text_1965F4 - waitmessage - setvar VAR_0x8004, 4 - multichoice 0, 0, 43, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_16C5C0 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16C5CE - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_16C5DC - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_16C5EA - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_16C5EA - end + lockall + loadword 0, gUnknown_81965C2 + callstd 4 + message Text_1965F4 + waitmessage + setvar VAR_0x8004, 4 + multichoice 0, 0, 43, 0 + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_16C5C0 + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_16C5CE + compare_var_to_value VAR_0x8000, 2 + goto_if 1, EventScript_16C5DC + compare_var_to_value VAR_0x8000, 3 + goto_if 1, EventScript_16C5EA + compare_var_to_value VAR_0x8000, 127 + goto_if 1, EventScript_16C5EA + end EventScript_16C578:: @ 816C578 - message Text_1965F4 - waitmessage - multichoice 0, 0, 43, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_16C5C0 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16C5CE - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_16C5DC - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_16C5EA - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_16C5EA - end + message Text_1965F4 + waitmessage + multichoice 0, 0, 43, 0 + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_16C5C0 + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_16C5CE + compare_var_to_value VAR_0x8000, 2 + goto_if 1, EventScript_16C5DC + compare_var_to_value VAR_0x8000, 3 + goto_if 1, EventScript_16C5EA + compare_var_to_value VAR_0x8000, 127 + goto_if 1, EventScript_16C5EA + end EventScript_16C5C0:: @ 816C5C0 - loadword 0, gUnknown_8196617 - callstd 4 - goto EventScript_16C578 - end + loadword 0, gUnknown_8196617 + callstd 4 + goto EventScript_16C578 + end EventScript_16C5CE:: @ 816C5CE - loadword 0, gUnknown_8196695 - callstd 4 - goto EventScript_16C578 - end + loadword 0, gUnknown_8196695 + callstd 4 + goto EventScript_16C578 + end EventScript_16C5DC:: @ 816C5DC - loadword 0, gUnknown_819673C - callstd 4 - goto EventScript_16C578 - end + loadword 0, gUnknown_819673C + callstd 4 + goto EventScript_16C578 + end EventScript_16C5EA:: @ 816C5EA - releaseall - end + releaseall + end diff --git a/data/maps/CeladonCity_DepartmentStore_1F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_1F/scripts.inc index c17ca3c25..0ad7d6c7c 100644 --- a/data/maps/CeladonCity_DepartmentStore_1F/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_1F/scripts.inc @@ -1,17 +1,17 @@ CeladonCity_DepartmentStore_1F_MapScripts:: @ 816BAD8 - .byte 0 + .byte 0 CeladonCity_DepartmentStore_1F_EventScript_16BAD9:: @ 816BAD9 - loadword 0, gUnknown_81954DD - callstd 2 - end + loadword 0, gUnknown_81954DD + callstd 2 + end CeladonCity_DepartmentStore_1F_EventScript_16BAE2:: @ 816BAE2 - loadword 0, gUnknown_8195537 - callstd 3 - end + loadword 0, gUnknown_8195537 + callstd 3 + end CeladonCity_DepartmentStore_1F_EventScript_16BAEB:: @ 816BAEB - loadword 0, gUnknown_81955B3 - callstd 3 - end + loadword 0, gUnknown_81955B3 + callstd 3 + end diff --git a/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc index 1c1e0ab95..bb6bdaa6a 100644 --- a/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc @@ -1,72 +1,72 @@ CeladonCity_DepartmentStore_2F_MapScripts:: @ 816BAF4 - .byte 0 + .byte 0 CeladonCity_DepartmentStore_2F_EventScript_16BAF5:: @ 816BAF5 - loadword 0, gUnknown_81955C7 - callstd 2 - end + loadword 0, gUnknown_81955C7 + callstd 2 + end CeladonCity_DepartmentStore_2F_EventScript_16BAFE:: @ 816BAFE - loadword 0, gUnknown_819560F - callstd 2 - end + loadword 0, gUnknown_819560F + callstd 2 + end CeladonCity_DepartmentStore_2F_EventScript_16BB07:: @ 816BB07 - loadword 0, gUnknown_8195638 - callstd 3 - end + loadword 0, gUnknown_8195638 + callstd 3 + end CeladonCity_DepartmentStore_2F_EventScript_16BB10:: @ 816BB10 - special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 - lock - faceplayer - message Text_1A6211 - waitmessage - pokemart Items_16BB38 - loadword 0, gUnknown_81A5190 - callstd 4 - release - end + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + lock + faceplayer + message Text_1A6211 + waitmessage + pokemart Items_16BB38 + loadword 0, gUnknown_81A5190 + callstd 4 + release + end - .align 2 + .align 2 Items_16BB38:: @ 816BB38 - .2byte ITEM_GREAT_BALL - .2byte ITEM_SUPER_POTION - .2byte ITEM_REVIVE - .2byte ITEM_ANTIDOTE - .2byte ITEM_PARALYZE_HEAL - .2byte ITEM_AWAKENING - .2byte ITEM_BURN_HEAL - .2byte ITEM_ICE_HEAL - .2byte ITEM_SUPER_REPEL - .2byte ITEM_NONE - release - end + .2byte ITEM_GREAT_BALL + .2byte ITEM_SUPER_POTION + .2byte ITEM_REVIVE + .2byte ITEM_ANTIDOTE + .2byte ITEM_PARALYZE_HEAL + .2byte ITEM_AWAKENING + .2byte ITEM_BURN_HEAL + .2byte ITEM_ICE_HEAL + .2byte ITEM_SUPER_REPEL + .2byte ITEM_NONE + release + end CeladonCity_DepartmentStore_2F_EventScript_16BB4E:: @ 816BB4E - special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 - lock - faceplayer - message Text_1A6211 - waitmessage - pokemart Items_16BB74 - loadword 0, gUnknown_81A5190 - callstd 4 - release - end + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + lock + faceplayer + message Text_1A6211 + waitmessage + pokemart Items_16BB74 + loadword 0, gUnknown_81A5190 + callstd 4 + release + end - .align 2 + .align 2 Items_16BB74:: @ 816BB74 - .2byte ITEM_TM05 - .2byte ITEM_TM15 - .2byte ITEM_TM28 - .2byte ITEM_TM31 - .2byte ITEM_TM43 - .2byte ITEM_TM45 - .2byte ITEM_NONE - release - end + .2byte ITEM_TM05 + .2byte ITEM_TM15 + .2byte ITEM_TM28 + .2byte ITEM_TM31 + .2byte ITEM_TM43 + .2byte ITEM_TM45 + .2byte ITEM_NONE + release + end diff --git a/data/maps/CeladonCity_DepartmentStore_3F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_3F/scripts.inc index b615859f3..e8be3e079 100644 --- a/data/maps/CeladonCity_DepartmentStore_3F/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_3F/scripts.inc @@ -1,61 +1,61 @@ CeladonCity_DepartmentStore_3F_MapScripts:: @ 816BB84 - .byte 0 + .byte 0 CeladonCity_DepartmentStore_3F_EventScript_16BB85:: @ 816BB85 - goto EventScript_1C4C26 - end + goto EventScript_1C4C26 + end CeladonCity_DepartmentStore_3F_EventScript_16BB8B:: @ 816BB8B - loadword 0, gUnknown_81956E9 - callstd 2 - end + loadword 0, gUnknown_81956E9 + callstd 2 + end CeladonCity_DepartmentStore_3F_EventScript_16BB94:: @ 816BB94 - loadword 0, gUnknown_8195769 - callstd 2 - end + loadword 0, gUnknown_8195769 + callstd 2 + end CeladonCity_DepartmentStore_3F_EventScript_16BB9D:: @ 816BB9D - loadword 0, gUnknown_81957B0 - callstd 2 - end + loadword 0, gUnknown_81957B0 + callstd 2 + end CeladonCity_DepartmentStore_3F_EventScript_16BBA6:: @ 816BBA6 - loadword 0, gUnknown_8195823 - callstd 2 - end + loadword 0, gUnknown_8195823 + callstd 2 + end CeladonCity_DepartmentStore_3F_EventScript_16BBAF:: @ 816BBAF - loadword 0, gUnknown_8195863 - callstd 3 - end + loadword 0, gUnknown_8195863 + callstd 3 + end CeladonCity_DepartmentStore_3F_EventScript_16BBB8:: @ 816BBB8 - loadword 0, gUnknown_8195875 - callstd 3 - end + loadword 0, gUnknown_8195875 + callstd 3 + end CeladonCity_DepartmentStore_3F_EventScript_16BBC1:: @ 816BBC1 - loadword 0, gUnknown_8195897 - callstd 3 - end + loadword 0, gUnknown_8195897 + callstd 3 + end CeladonCity_DepartmentStore_3F_EventScript_16BBCA:: @ 816BBCA - loadword 0, gUnknown_81958B8 - callstd 3 - end + loadword 0, gUnknown_81958B8 + callstd 3 + end CeladonCity_DepartmentStore_3F_EventScript_16BBD3:: @ 816BBD3 - loadword 0, gUnknown_81958D8 - callstd 3 - end + loadword 0, gUnknown_81958D8 + callstd 3 + end CeladonCity_DepartmentStore_3F_EventScript_16BBDC:: @ 816BBDC - loadword 0, gUnknown_81958F6 - callstd 3 - end + loadword 0, gUnknown_81958F6 + callstd 3 + end CeladonCity_DepartmentStore_3F_EventScript_16BBE5:: @ 816BBE5 - loadword 0, gUnknown_8195907 - callstd 3 - end + loadword 0, gUnknown_8195907 + callstd 3 + end diff --git a/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc index ac1acefa0..5822aa1ea 100644 --- a/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc @@ -1,43 +1,43 @@ CeladonCity_DepartmentStore_4F_MapScripts:: @ 816BBEE - .byte 0 + .byte 0 CeladonCity_DepartmentStore_4F_EventScript_16BBEF:: @ 816BBEF - loadword 0, gUnknown_8195A68 - callstd 2 - end + loadword 0, gUnknown_8195A68 + callstd 2 + end CeladonCity_DepartmentStore_4F_EventScript_16BBF8:: @ 816BBF8 - loadword 0, gUnknown_8195AC9 - callstd 2 - end + loadword 0, gUnknown_8195AC9 + callstd 2 + end CeladonCity_DepartmentStore_4F_EventScript_16BC01:: @ 816BC01 - loadword 0, gUnknown_8195B5B - callstd 3 - end + loadword 0, gUnknown_8195B5B + callstd 3 + end CeladonCity_DepartmentStore_4F_EventScript_16BC0A:: @ 816BC0A - special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 - lock - faceplayer - message Text_1A6211 - waitmessage - pokemart Items_16BC30 - loadword 0, gUnknown_81A5190 - callstd 4 - release - end + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + lock + faceplayer + message Text_1A6211 + waitmessage + pokemart Items_16BC30 + loadword 0, gUnknown_81A5190 + callstd 4 + release + end - .align 2 + .align 2 Items_16BC30:: @ 816BC30 - .2byte ITEM_POKE_DOLL - .2byte ITEM_RETRO_MAIL - .2byte ITEM_FIRE_STONE - .2byte ITEM_THUNDER_STONE - .2byte ITEM_WATER_STONE - .2byte ITEM_LEAF_STONE - .2byte ITEM_NONE - release - end + .2byte ITEM_POKE_DOLL + .2byte ITEM_RETRO_MAIL + .2byte ITEM_FIRE_STONE + .2byte ITEM_THUNDER_STONE + .2byte ITEM_WATER_STONE + .2byte ITEM_LEAF_STONE + .2byte ITEM_NONE + release + end diff --git a/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc index 5562858c0..a8c808e1f 100644 --- a/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc @@ -1,70 +1,70 @@ CeladonCity_DepartmentStore_5F_MapScripts:: @ 816BC40 - .byte 0 + .byte 0 CeladonCity_DepartmentStore_5F_EventScript_16BC41:: @ 816BC41 - loadword 0, gUnknown_8195BBA - callstd 2 - end + loadword 0, gUnknown_8195BBA + callstd 2 + end CeladonCity_DepartmentStore_5F_EventScript_16BC4A:: @ 816BC4A - loadword 0, gUnknown_8195CA0 - callstd 2 - end + loadword 0, gUnknown_8195CA0 + callstd 2 + end CeladonCity_DepartmentStore_5F_EventScript_16BC53:: @ 816BC53 - loadword 0, gUnknown_8195D14 - callstd 3 - end + loadword 0, gUnknown_8195D14 + callstd 3 + end CeladonCity_DepartmentStore_5F_EventScript_16BC5C:: @ 816BC5C - special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 - lock - faceplayer - message Text_1A6211 - waitmessage - pokemart Items_16BC84 - loadword 0, gUnknown_81A5190 - callstd 4 - release - end + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + lock + faceplayer + message Text_1A6211 + waitmessage + pokemart Items_16BC84 + loadword 0, gUnknown_81A5190 + callstd 4 + release + end - .align 2 + .align 2 Items_16BC84:: @ 816BC84 - .2byte ITEM_X_ATTACK - .2byte ITEM_X_DEFEND - .2byte ITEM_X_SPEED - .2byte ITEM_X_SPECIAL - .2byte ITEM_X_ACCURACY - .2byte ITEM_GUARD_SPEC - .2byte ITEM_DIRE_HIT - .2byte ITEM_NONE - release - end + .2byte ITEM_X_ATTACK + .2byte ITEM_X_DEFEND + .2byte ITEM_X_SPEED + .2byte ITEM_X_SPECIAL + .2byte ITEM_X_ACCURACY + .2byte ITEM_GUARD_SPEC + .2byte ITEM_DIRE_HIT + .2byte ITEM_NONE + release + end CeladonCity_DepartmentStore_5F_EventScript_16BC96:: @ 816BC96 - special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 - lock - faceplayer - message Text_1A6211 - waitmessage - pokemart Items_16BCBC - loadword 0, gUnknown_81A5190 - callstd 4 - release - end + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + lock + faceplayer + message Text_1A6211 + waitmessage + pokemart Items_16BCBC + loadword 0, gUnknown_81A5190 + callstd 4 + release + end - .align 2 + .align 2 Items_16BCBC:: @ 816BCBC - .2byte ITEM_HP_UP - .2byte ITEM_PROTEIN - .2byte ITEM_IRON - .2byte ITEM_CALCIUM - .2byte ITEM_ZINC - .2byte ITEM_CARBOS - .2byte ITEM_NONE - release - end + .2byte ITEM_HP_UP + .2byte ITEM_PROTEIN + .2byte ITEM_IRON + .2byte ITEM_CALCIUM + .2byte ITEM_ZINC + .2byte ITEM_CARBOS + .2byte ITEM_NONE + release + end diff --git a/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc index ed342274f..2252f511c 100644 --- a/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc @@ -1,135 +1,135 @@ CeladonCity_DepartmentStore_Elevator_MapScripts:: @ 816C152 - .byte 0 + .byte 0 CeladonCity_DepartmentStore_Elevator_EventScript_16C153:: @ 816C153 - lockall - setvar VAR_0x8004, 3 - checkflag FLAG_0x002 - call_if 0, EventScript_1A7AB9 - copyvar VAR_0x8005, VAR_0x403A - special sub_80CB580 - message Text_1A535C - waitmessage - setvar VAR_0x8004, 3 - specialvar VAR_RESULT, sub_80CB328 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_16C1B7 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16C1C3 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_16C1CF - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_16C1DB - compare_var_to_value VAR_0x8000, 4 - goto_if 1, EventScript_16C1E7 - end + lockall + setvar VAR_0x8004, 3 + checkflag FLAG_0x002 + call_if 0, EventScript_1A7AB9 + copyvar VAR_0x8005, VAR_0x403A + special sub_80CB580 + message Text_1A535C + waitmessage + setvar VAR_0x8004, 3 + specialvar VAR_RESULT, sub_80CB328 + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_16C1B7 + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_16C1C3 + compare_var_to_value VAR_0x8000, 2 + goto_if 1, EventScript_16C1CF + compare_var_to_value VAR_0x8000, 3 + goto_if 1, EventScript_16C1DB + compare_var_to_value VAR_0x8000, 4 + goto_if 1, EventScript_16C1E7 + end EventScript_16C1B7:: @ 816C1B7 - multichoicedefault 0, 0, 31, 0, 0 - goto EventScript_16C1F3 + multichoicedefault 0, 0, 31, 0, 0 + goto EventScript_16C1F3 EventScript_16C1C2:: @ 816C1C2 - end + end EventScript_16C1C3:: @ 816C1C3 - multichoicedefault 0, 0, 31, 1, 0 - goto EventScript_16C1F3 - end + multichoicedefault 0, 0, 31, 1, 0 + goto EventScript_16C1F3 + end EventScript_16C1CF:: @ 816C1CF - multichoicedefault 0, 0, 31, 2, 0 - goto EventScript_16C1F3 - end + multichoicedefault 0, 0, 31, 2, 0 + goto EventScript_16C1F3 + end EventScript_16C1DB:: @ 816C1DB - multichoicedefault 0, 0, 31, 3, 0 - goto EventScript_16C1F3 - end + multichoicedefault 0, 0, 31, 3, 0 + goto EventScript_16C1F3 + end EventScript_16C1E7:: @ 816C1E7 - multichoicedefault 0, 0, 31, 4, 0 - goto EventScript_16C1F3 - end + multichoicedefault 0, 0, 31, 4, 0 + goto EventScript_16C1F3 + end EventScript_16C1F3:: @ 816C1F3 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_16C2E6 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16C2BE - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_16C296 - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_16C26E - compare_var_to_value VAR_0x8000, 4 - goto_if 1, EventScript_16C246 - compare_var_to_value VAR_0x8000, 5 - goto_if 1, EventScript_16C30E - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_16C30E - end + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_16C2E6 + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_16C2BE + compare_var_to_value VAR_0x8000, 2 + goto_if 1, EventScript_16C296 + compare_var_to_value VAR_0x8000, 3 + goto_if 1, EventScript_16C26E + compare_var_to_value VAR_0x8000, 4 + goto_if 1, EventScript_16C246 + compare_var_to_value VAR_0x8000, 5 + goto_if 1, EventScript_16C30E + compare_var_to_value VAR_0x8000, 127 + goto_if 1, EventScript_16C30E + end EventScript_16C246:: @ 816C246 - setvar VAR_0x8006, 4 - setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_1F, 255, 6, 1 - compare_var_to_value VAR_0x403A, 4 - goto_if 1, EventScript_16C30E - call EventScript_16C313 - setvar VAR_0x403A, 4 - goto EventScript_16C30E - end + setvar VAR_0x8006, 4 + setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_1F, 255, 6, 1 + compare_var_to_value VAR_0x403A, 4 + goto_if 1, EventScript_16C30E + call EventScript_16C313 + setvar VAR_0x403A, 4 + goto EventScript_16C30E + end EventScript_16C26E:: @ 816C26E - setvar VAR_0x8006, 5 - setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_2F, 255, 6, 1 - compare_var_to_value VAR_0x403A, 5 - goto_if 1, EventScript_16C30E - call EventScript_16C313 - setvar VAR_0x403A, 5 - goto EventScript_16C30E - end + setvar VAR_0x8006, 5 + setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_2F, 255, 6, 1 + compare_var_to_value VAR_0x403A, 5 + goto_if 1, EventScript_16C30E + call EventScript_16C313 + setvar VAR_0x403A, 5 + goto EventScript_16C30E + end EventScript_16C296:: @ 816C296 - setvar VAR_0x8006, 6 - setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_3F, 255, 6, 1 - compare_var_to_value VAR_0x403A, 6 - goto_if 1, EventScript_16C30E - call EventScript_16C313 - setvar VAR_0x403A, 6 - goto EventScript_16C30E - end + setvar VAR_0x8006, 6 + setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_3F, 255, 6, 1 + compare_var_to_value VAR_0x403A, 6 + goto_if 1, EventScript_16C30E + call EventScript_16C313 + setvar VAR_0x403A, 6 + goto EventScript_16C30E + end EventScript_16C2BE:: @ 816C2BE - setvar VAR_0x8006, 7 - setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_4F, 255, 6, 1 - compare_var_to_value VAR_0x403A, 7 - goto_if 1, EventScript_16C30E - call EventScript_16C313 - setvar VAR_0x403A, 7 - goto EventScript_16C30E - end + setvar VAR_0x8006, 7 + setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_4F, 255, 6, 1 + compare_var_to_value VAR_0x403A, 7 + goto_if 1, EventScript_16C30E + call EventScript_16C313 + setvar VAR_0x403A, 7 + goto EventScript_16C30E + end EventScript_16C2E6:: @ 816C2E6 - setvar VAR_0x8006, 8 - setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_5F, 255, 6, 1 - compare_var_to_value VAR_0x403A, 8 - goto_if 1, EventScript_16C30E - call EventScript_16C313 - setvar VAR_0x403A, 8 - goto EventScript_16C30E - end + setvar VAR_0x8006, 8 + setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_5F, 255, 6, 1 + compare_var_to_value VAR_0x403A, 8 + goto_if 1, EventScript_16C30E + call EventScript_16C313 + setvar VAR_0x403A, 8 + goto EventScript_16C30E + end EventScript_16C30E:: @ 816C30E - special sub_80CB63C - releaseall - end + special sub_80CB63C + releaseall + end EventScript_16C313:: @ 816C313 - special sub_80CB63C - closemessage - waitse - special sub_80CB498 - waitstate - setflag FLAG_0x002 - return + special sub_80CB63C + closemessage + waitse + special sub_80CB498 + waitstate + setflag FLAG_0x002 + return diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc index 165942ca3..0798f3d0c 100644 --- a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc @@ -1,358 +1,358 @@ CeladonCity_DepartmentStore_Roof_MapScripts:: @ 816BCCC - .byte 0 + .byte 0 CeladonCity_DepartmentStore_Roof_EventScript_16BCCD:: @ 816BCCD - special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 - special sub_8112364 - lock - faceplayer - call EventScript_16BCF6 - compare_var_to_value VAR_0x4001, 0 - goto_if 1, EventScript_16C00E - goto EventScript_16BD3E - end + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + special sub_8112364 + lock + faceplayer + call EventScript_16BCF6 + compare_var_to_value VAR_0x4001, 0 + goto_if 1, EventScript_16C00E + goto EventScript_16BD3E + end EventScript_16BCF6:: @ 816BCF6 - setvar VAR_0x4001, 0 - checkitem ITEM_FRESH_WATER, 1 - compare_var_to_value VAR_RESULT, 1 - call_if 1, EventScript_16BD2C - checkitem ITEM_SODA_POP, 1 - compare_var_to_value VAR_RESULT, 1 - call_if 1, EventScript_16BD32 - checkitem ITEM_LEMONADE, 1 - compare_var_to_value VAR_RESULT, 1 - call_if 1, EventScript_16BD38 - return + setvar VAR_0x4001, 0 + checkitem ITEM_FRESH_WATER, 1 + compare_var_to_value VAR_RESULT, 1 + call_if 1, EventScript_16BD2C + checkitem ITEM_SODA_POP, 1 + compare_var_to_value VAR_RESULT, 1 + call_if 1, EventScript_16BD32 + checkitem ITEM_LEMONADE, 1 + compare_var_to_value VAR_RESULT, 1 + call_if 1, EventScript_16BD38 + return EventScript_16BD2C:: @ 816BD2C - addvar VAR_0x4001, 1 - return + addvar VAR_0x4001, 1 + return EventScript_16BD32:: @ 816BD32 - addvar VAR_0x4001, 2 - return + addvar VAR_0x4001, 2 + return EventScript_16BD38:: @ 816BD38 - addvar VAR_0x4001, 4 - return + addvar VAR_0x4001, 4 + return EventScript_16BD3E:: @ 816BD3E - loadword 0, gUnknown_8195D22 - callstd 5 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16C00C - textcolor 3 - message Text_195D5F - waitmessage - textcolor 1 - copyvar VAR_0x8000, VAR_0x4001 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16BDAE - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_16BDDA - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_16BE06 - compare_var_to_value VAR_0x8000, 4 - goto_if 1, EventScript_16BE3D - compare_var_to_value VAR_0x8000, 5 - goto_if 1, EventScript_16BE69 - compare_var_to_value VAR_0x8000, 6 - goto_if 1, EventScript_16BEA0 - compare_var_to_value VAR_0x8000, 7 - goto_if 1, EventScript_16BED7 - end + loadword 0, gUnknown_8195D22 + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16C00C + textcolor 3 + message Text_195D5F + waitmessage + textcolor 1 + copyvar VAR_0x8000, VAR_0x4001 + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_16BDAE + compare_var_to_value VAR_0x8000, 2 + goto_if 1, EventScript_16BDDA + compare_var_to_value VAR_0x8000, 3 + goto_if 1, EventScript_16BE06 + compare_var_to_value VAR_0x8000, 4 + goto_if 1, EventScript_16BE3D + compare_var_to_value VAR_0x8000, 5 + goto_if 1, EventScript_16BE69 + compare_var_to_value VAR_0x8000, 6 + goto_if 1, EventScript_16BEA0 + compare_var_to_value VAR_0x8000, 7 + goto_if 1, EventScript_16BED7 + end EventScript_16BDAE:: @ 816BDAE - multichoice 0, 0, 32, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_16BF19 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16C00C - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_16C00C - end + multichoice 0, 0, 32, 0 + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_16BF19 + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_16C00C + compare_var_to_value VAR_0x8000, 127 + goto_if 1, EventScript_16C00C + end EventScript_16BDDA:: @ 816BDDA - multichoice 0, 0, 33, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_16BF3A - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16C00C - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_16C00C - end + multichoice 0, 0, 33, 0 + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_16BF3A + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_16C00C + compare_var_to_value VAR_0x8000, 127 + goto_if 1, EventScript_16C00C + end EventScript_16BE06:: @ 816BE06 - multichoice 0, 0, 34, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_16BF19 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16BF3A - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_16C00C - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_16C00C - end + multichoice 0, 0, 34, 0 + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_16BF19 + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_16BF3A + compare_var_to_value VAR_0x8000, 2 + goto_if 1, EventScript_16C00C + compare_var_to_value VAR_0x8000, 127 + goto_if 1, EventScript_16C00C + end EventScript_16BE3D:: @ 816BE3D - multichoice 0, 0, 35, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_16BF5B - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16C00C - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_16C00C - end + multichoice 0, 0, 35, 0 + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_16BF5B + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_16C00C + compare_var_to_value VAR_0x8000, 127 + goto_if 1, EventScript_16C00C + end EventScript_16BE69:: @ 816BE69 - multichoice 0, 0, 36, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_16BF19 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16BF5B - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_16C00C - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_16C00C - end + multichoice 0, 0, 36, 0 + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_16BF19 + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_16BF5B + compare_var_to_value VAR_0x8000, 2 + goto_if 1, EventScript_16C00C + compare_var_to_value VAR_0x8000, 127 + goto_if 1, EventScript_16C00C + end EventScript_16BEA0:: @ 816BEA0 - multichoice 0, 0, 37, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_16BF3A - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16BF5B - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_16C00C - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_16C00C - end + multichoice 0, 0, 37, 0 + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_16BF3A + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_16BF5B + compare_var_to_value VAR_0x8000, 2 + goto_if 1, EventScript_16C00C + compare_var_to_value VAR_0x8000, 127 + goto_if 1, EventScript_16C00C + end EventScript_16BED7:: @ 816BED7 - multichoice 0, 0, 38, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_16BF19 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16BF3A - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_16BF5B - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_16C00C - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_16C00C - end + multichoice 0, 0, 38, 0 + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_16BF19 + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_16BF3A + compare_var_to_value VAR_0x8000, 2 + goto_if 1, EventScript_16BF5B + compare_var_to_value VAR_0x8000, 3 + goto_if 1, EventScript_16C00C + compare_var_to_value VAR_0x8000, 127 + goto_if 1, EventScript_16C00C + end EventScript_16BF19:: @ 816BF19 - setvar VAR_0x8008, 26 - setvar VAR_0x8009, 304 - checkflag FLAG_0x296 - goto_if 1, EventScript_16C018 - loadword 0, gUnknown_8195D75 - callstd 4 - goto EventScript_16BF7C - end + setvar VAR_0x8008, 26 + setvar VAR_0x8009, 304 + checkflag FLAG_0x296 + goto_if 1, EventScript_16C018 + loadword 0, gUnknown_8195D75 + callstd 4 + goto EventScript_16BF7C + end EventScript_16BF3A:: @ 816BF3A - setvar VAR_0x8008, 27 - setvar VAR_0x8009, 308 - checkflag FLAG_0x295 - goto_if 1, EventScript_16C018 - loadword 0, gUnknown_8195E33 - callstd 4 - goto EventScript_16BF7C - end + setvar VAR_0x8008, 27 + setvar VAR_0x8009, 308 + checkflag FLAG_0x295 + goto_if 1, EventScript_16C018 + loadword 0, gUnknown_8195E33 + callstd 4 + goto EventScript_16BF7C + end EventScript_16BF5B:: @ 816BF5B - setvar VAR_0x8008, 28 - setvar VAR_0x8009, 321 - checkflag FLAG_0x294 - goto_if 1, EventScript_16C018 - loadword 0, gUnknown_8195EBF - callstd 4 - goto EventScript_16BF7C - end + setvar VAR_0x8008, 28 + setvar VAR_0x8009, 321 + checkflag FLAG_0x294 + goto_if 1, EventScript_16C018 + loadword 0, gUnknown_8195EBF + callstd 4 + goto EventScript_16BF7C + end EventScript_16BF7C:: @ 816BF7C - getitemname 0, 32776 - getitemname 1, 32777 - removeitem 32776, 1 - checkitemspace 32777, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16C002 - additem 32777, 1 - textcolor 3 - playfanfare MUS_FANFA1 - message Text_195DAD - waitmessage - waitfanfare - setorcopyvar VAR_0x8000, VAR_0x8009 - setorcopyvar VAR_0x8001, 1 - callstd 8 - call EventScript_1A6675 - compare_var_to_value VAR_0x8008, 26 - call_if 1, EventScript_16BFDE - compare_var_to_value VAR_0x8008, 27 - call_if 1, EventScript_16BFEA - compare_var_to_value VAR_0x8008, 28 - call_if 1, EventScript_16BFF6 - release - end + getitemname 0, 32776 + getitemname 1, 32777 + removeitem 32776, 1 + checkitemspace 32777, 1 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16C002 + additem 32777, 1 + textcolor 3 + playfanfare MUS_FANFA1 + message Text_195DAD + waitmessage + waitfanfare + setorcopyvar VAR_0x8000, VAR_0x8009 + setorcopyvar VAR_0x8001, 1 + callstd 8 + call EventScript_1A6675 + compare_var_to_value VAR_0x8008, 26 + call_if 1, EventScript_16BFDE + compare_var_to_value VAR_0x8008, 27 + call_if 1, EventScript_16BFEA + compare_var_to_value VAR_0x8008, 28 + call_if 1, EventScript_16BFF6 + release + end EventScript_16BFDE:: @ 816BFDE - setflag FLAG_0x296 - loadword 0, gUnknown_8195DD4 - callstd 4 - return + setflag FLAG_0x296 + loadword 0, gUnknown_8195DD4 + callstd 4 + return EventScript_16BFEA:: @ 816BFEA - setflag FLAG_0x295 - loadword 0, gUnknown_8195E68 - callstd 4 - return + setflag FLAG_0x295 + loadword 0, gUnknown_8195E68 + callstd 4 + return EventScript_16BFF6:: @ 816BFF6 - setflag FLAG_0x294 - loadword 0, gUnknown_8195EF4 - callstd 4 - return + setflag FLAG_0x294 + loadword 0, gUnknown_8195EF4 + callstd 4 + return EventScript_16C002:: @ 816C002 - loadword 0, gUnknown_8195F4F - callstd 4 - release - end + loadword 0, gUnknown_8195F4F + callstd 4 + release + end EventScript_16C00C:: @ 816C00C - release - end + release + end EventScript_16C00E:: @ 816C00E - loadword 0, gUnknown_8195FEF - callstd 4 - release - end + loadword 0, gUnknown_8195FEF + callstd 4 + release + end EventScript_16C018:: @ 816C018 - loadword 0, gUnknown_8195F6E - callstd 4 - release - end + loadword 0, gUnknown_8195F6E + callstd 4 + release + end CeladonCity_DepartmentStore_Roof_EventScript_16C022:: @ 816C022 - loadword 0, gUnknown_8195F98 - callstd 2 - end + loadword 0, gUnknown_8195F98 + callstd 2 + end CeladonCity_DepartmentStore_Roof_EventScript_16C02B:: @ 816C02B - loadword 0, gUnknown_8196017 - callstd 3 - end + loadword 0, gUnknown_8196017 + callstd 3 + end CeladonCity_DepartmentStore_Roof_EventScript_16C034:: @ 816C034 - lockall - message Text_196038 - waitmessage - showmoneybox 0, 0, 0 - goto EventScript_16C045 - end + lockall + message Text_196038 + waitmessage + showmoneybox 0, 0, 0 + goto EventScript_16C045 + end EventScript_16C045:: @ 816C045 - multichoice 12, 0, 26, 0 - copyvar VAR_0x4001, VAR_RESULT - copyvar VAR_0x8000, VAR_0x4001 - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_16C083 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16C094 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_16C0A5 - loadword 0, gUnknown_81960AE - callstd 4 - goto EventScript_16C14D - end + multichoice 12, 0, 26, 0 + copyvar VAR_0x4001, VAR_RESULT + copyvar VAR_0x8000, VAR_0x4001 + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_16C083 + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_16C094 + compare_var_to_value VAR_0x8000, 2 + goto_if 1, EventScript_16C0A5 + loadword 0, gUnknown_81960AE + callstd 4 + goto EventScript_16C14D + end EventScript_16C083:: @ 816C083 - setvar VAR_0x4000, 26 - checkmoney 200, 0 - goto EventScript_16C0CB - end + setvar VAR_0x4000, 26 + checkmoney 200, 0 + goto EventScript_16C0CB + end EventScript_16C094:: @ 816C094 - setvar VAR_0x4000, 27 - checkmoney 300, 0 - goto EventScript_16C0CB - end + setvar VAR_0x4000, 27 + checkmoney 300, 0 + goto EventScript_16C0CB + end EventScript_16C0A5:: @ 816C0A5 - setvar VAR_0x4000, 28 - checkmoney 350, 0 - goto EventScript_16C0CB - end + setvar VAR_0x4000, 28 + checkmoney 350, 0 + goto EventScript_16C0CB + end EventScript_16C0B6:: @ 816C0B6 - takemoney 200, 0 - return + takemoney 200, 0 + return EventScript_16C0BD:: @ 816C0BD - takemoney 300, 0 - return + takemoney 300, 0 + return EventScript_16C0C4:: @ 816C0C4 - takemoney 350, 0 - return + takemoney 350, 0 + return EventScript_16C0CB:: @ 816C0CB - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16C131 - checkitemspace 16384, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16C13F - compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_16C0B6 - compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_16C0BD - compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_16C0C4 - updatemoneybox 0, 0, 0 - getitemname 0, 16384 - playse SE_C_PASI - loadword 0, gUnknown_8196076 - callstd 4 - additem 16384, 1 - goto EventScript_16C125 - end + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16C131 + checkitemspace 16384, 1 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16C13F + compare_var_to_value VAR_0x4001, 0 + call_if 1, EventScript_16C0B6 + compare_var_to_value VAR_0x4001, 1 + call_if 1, EventScript_16C0BD + compare_var_to_value VAR_0x4001, 2 + call_if 1, EventScript_16C0C4 + updatemoneybox 0, 0, 0 + getitemname 0, 16384 + playse SE_C_PASI + loadword 0, gUnknown_8196076 + callstd 4 + additem 16384, 1 + goto EventScript_16C125 + end EventScript_16C125:: @ 816C125 - message Text_196038 - waitmessage - goto EventScript_16C045 - end + message Text_196038 + waitmessage + goto EventScript_16C045 + end EventScript_16C131:: @ 816C131 - loadword 0, gUnknown_819605E - callstd 4 - goto EventScript_16C14D - end + loadword 0, gUnknown_819605E + callstd 4 + goto EventScript_16C14D + end EventScript_16C13F:: @ 816C13F - loadword 0, gUnknown_819608E - callstd 4 - goto EventScript_16C14D - end + loadword 0, gUnknown_819608E + callstd 4 + goto EventScript_16C14D + end EventScript_16C14D:: @ 816C14D - hidemoneybox - .byte 0 - .byte 0 - releaseall - end + hidemoneybox + .byte 0 + .byte 0 + releaseall + end diff --git a/data/maps/CeladonCity_GameCorner/scripts.inc b/data/maps/CeladonCity_GameCorner/scripts.inc index d32aa8afd..aa6a469fe 100644 --- a/data/maps/CeladonCity_GameCorner/scripts.inc +++ b/data/maps/CeladonCity_GameCorner/scripts.inc @@ -1,524 +1,524 @@ CeladonCity_GameCorner_MapScripts:: @ 816C646 - map_script 1, CeladonCity_GameCorner_MapScript1_16C64C - .byte 0 + map_script 1, CeladonCity_GameCorner_MapScript1_16C64C + .byte 0 CeladonCity_GameCorner_MapScript1_16C64C:: @ 816C64C - checkflag FLAG_0x26D - call_if 0, EventScript_16C656 - end + checkflag FLAG_0x26D + call_if 0, EventScript_16C656 + end EventScript_16C656:: @ 816C656 - setmetatile 15, 2, 658, 0 - setmetatile 16, 2, 658, 0 - setmetatile 17, 2, 658, 0 - setmetatile 16, 3, 719, 1 - setmetatile 17, 3, 719, 1 - return + setmetatile 15, 2, 658, 0 + setmetatile 16, 2, 658, 0 + setmetatile 17, 2, 658, 0 + setmetatile 16, 3, 719, 1 + setmetatile 17, 3, 719, 1 + return CeladonCity_GameCorner_EventScript_16C684:: @ 816C684 - loadword 0, gUnknown_8196940 - callstd 2 - end + loadword 0, gUnknown_8196940 + callstd 2 + end CeladonCity_GameCorner_EventScript_16C68D:: @ 816C68D - special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 - lock - faceplayer - showmoneybox 0, 0, 0 - showcoinsbox 0, 5 - message Text_196984 - waitmessage - multichoice 13, 0, 27, 0 - copyvar VAR_0x8009, VAR_RESULT - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_16C6E6 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16C6E6 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_16C782 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_16C782 - end + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + lock + faceplayer + showmoneybox 0, 0, 0 + showcoinsbox 0, 5 + message Text_196984 + waitmessage + multichoice 13, 0, 27, 0 + copyvar VAR_0x8009, VAR_RESULT + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_16C6E6 + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_16C6E6 + compare_var_to_value VAR_0x8000, 2 + goto_if 1, EventScript_16C782 + compare_var_to_value VAR_0x8000, 127 + goto_if 1, EventScript_16C782 + end EventScript_16C6E6:: @ 816C6E6 - checkflag FLAG_0x243 - goto_if 0, EventScript_16C790 - compare_var_to_value VAR_0x8009, 0 - goto_if 1, EventScript_16C734 - compare_var_to_value VAR_0x8009, 1 - goto_if 1, EventScript_16C706 - end + checkflag FLAG_0x243 + goto_if 0, EventScript_16C790 + compare_var_to_value VAR_0x8009, 0 + goto_if 1, EventScript_16C734 + compare_var_to_value VAR_0x8009, 1 + goto_if 1, EventScript_16C706 + end EventScript_16C706:: @ 816C706 - checkcoins VAR_0x4001 - compare_var_to_value VAR_0x4001, 9500 - goto_if 4, EventScript_16C79E - checkmoney 10000, 0 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16C7AC - givecoins 500 - takemoney 10000, 0 - goto EventScript_16C762 - end + checkcoins VAR_0x4001 + compare_var_to_value VAR_0x4001, 9500 + goto_if 4, EventScript_16C79E + checkmoney 10000, 0 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16C7AC + givecoins 500 + takemoney 10000, 0 + goto EventScript_16C762 + end EventScript_16C734:: @ 816C734 - checkcoins VAR_0x4001 - compare_var_to_value VAR_0x4001, 9950 - goto_if 4, EventScript_16C79E - checkmoney 1000, 0 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16C7AC - givecoins 50 - takemoney 1000, 0 - goto EventScript_16C762 - end + checkcoins VAR_0x4001 + compare_var_to_value VAR_0x4001, 9950 + goto_if 4, EventScript_16C79E + checkmoney 1000, 0 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16C7AC + givecoins 50 + takemoney 1000, 0 + goto EventScript_16C762 + end EventScript_16C762:: @ 816C762 - updatemoneybox 0, 0, 0 - updatecoinsbox 0, 5 - playse 248 - loadword 0, gUnknown_8196A62 - callstd 4 - goto EventScript_16C77A - end + updatemoneybox 0, 0, 0 + updatecoinsbox 0, 5 + playse 248 + loadword 0, gUnknown_8196A62 + callstd 4 + goto EventScript_16C77A + end EventScript_16C77A:: @ 816C77A - hidemoneybox - .byte 0 - .byte 0 - hidecoinsbox 0, 5 - release - end + hidemoneybox + .byte 0 + .byte 0 + hidecoinsbox 0, 5 + release + end EventScript_16C782:: @ 816C782 - loadword 0, gUnknown_81969DC - callstd 4 - goto EventScript_16C77A - end + loadword 0, gUnknown_81969DC + callstd 4 + goto EventScript_16C77A + end EventScript_16C790:: @ 816C790 - loadword 0, gUnknown_81969FB - callstd 4 - goto EventScript_16C77A - end + loadword 0, gUnknown_81969FB + callstd 4 + goto EventScript_16C77A + end EventScript_16C79E:: @ 816C79E - loadword 0, gUnknown_8196A26 - callstd 4 - goto EventScript_16C77A - end + loadword 0, gUnknown_8196A26 + callstd 4 + goto EventScript_16C77A + end EventScript_16C7AC:: @ 816C7AC - loadword 0, gUnknown_8196A46 - callstd 4 - goto EventScript_16C77A - end + loadword 0, gUnknown_8196A46 + callstd 4 + goto EventScript_16C77A + end CeladonCity_GameCorner_EventScript_16C7BA:: @ 816C7BA - lock - faceplayer - loadword 0, gUnknown_8196A82 - callstd 4 - goto EventScript_16C7CA - end + lock + faceplayer + loadword 0, gUnknown_8196A82 + callstd 4 + goto EventScript_16C7CA + end EventScript_16C7CA:: @ 816C7CA - closemessage - applymovement VAR_LAST_TALKED, Movement_1A75E5 - waitmovement 0 - release - end + closemessage + applymovement VAR_LAST_TALKED, Movement_1A75E5 + waitmovement 0 + release + end CeladonCity_GameCorner_EventScript_16C7D7:: @ 816C7D7 - lock - faceplayer - loadword 0, gUnknown_8196AC7 - callstd 4 - goto EventScript_16C7CA - end + lock + faceplayer + loadword 0, gUnknown_8196AC7 + callstd 4 + goto EventScript_16C7CA + end CeladonCity_GameCorner_EventScript_16C7E7:: @ 816C7E7 - lock - faceplayer - checkflag FLAG_0x26E - goto_if 1, EventScript_16C849 - loadword 0, gUnknown_8196AF3 - callstd 4 - checkflag FLAG_0x243 - goto_if 0, EventScript_16C839 - checkcoins VAR_0x4001 - compare_var_to_value VAR_0x4001, 9990 - goto_if 4, EventScript_16C82B - givecoins 10 - textcolor 3 - loadword 0, gUnknown_8196B0D - callstd 4 - playse 248 - waitse - setflag FLAG_0x26E - goto EventScript_16C7CA - end + lock + faceplayer + checkflag FLAG_0x26E + goto_if 1, EventScript_16C849 + loadword 0, gUnknown_8196AF3 + callstd 4 + checkflag FLAG_0x243 + goto_if 0, EventScript_16C839 + checkcoins VAR_0x4001 + compare_var_to_value VAR_0x4001, 9990 + goto_if 4, EventScript_16C82B + givecoins 10 + textcolor 3 + loadword 0, gUnknown_8196B0D + callstd 4 + playse 248 + waitse + setflag FLAG_0x26E + goto EventScript_16C7CA + end EventScript_16C82B:: @ 816C82B - loadword 0, gUnknown_8196B30 - callstd 4 - goto EventScript_16C7CA - end + loadword 0, gUnknown_8196B30 + callstd 4 + goto EventScript_16C7CA + end EventScript_16C839:: @ 816C839 - textcolor 3 - loadword 0, gUnknown_8196F26 - callstd 4 - goto EventScript_16C7CA - end + textcolor 3 + loadword 0, gUnknown_8196F26 + callstd 4 + goto EventScript_16C7CA + end EventScript_16C849:: @ 816C849 - loadword 0, gUnknown_8196B49 - callstd 4 - goto EventScript_16C7CA - end + loadword 0, gUnknown_8196B49 + callstd 4 + goto EventScript_16C7CA + end CeladonCity_GameCorner_EventScript_16C857:: @ 816C857 - lock - faceplayer - checkflag FLAG_0x4B3 - goto_if 1, EventScript_16C870 - loadword 0, gUnknown_8196BAD - callstd 4 - goto EventScript_16C7CA - end + lock + faceplayer + checkflag FLAG_0x4B3 + goto_if 1, EventScript_16C870 + loadword 0, gUnknown_8196BAD + callstd 4 + goto EventScript_16C7CA + end EventScript_16C870:: @ 816C870 - loadword 0, gUnknown_8196CA1 - callstd 4 - goto EventScript_16C7CA - end + loadword 0, gUnknown_8196CA1 + callstd 4 + goto EventScript_16C7CA + end CeladonCity_GameCorner_EventScript_16C87E:: @ 816C87E - lock - faceplayer - loadword 0, gUnknown_8196B7B - callstd 4 - goto EventScript_16C7CA - end + lock + faceplayer + loadword 0, gUnknown_8196B7B + callstd 4 + goto EventScript_16C7CA + end CeladonCity_GameCorner_EventScript_16C88E:: @ 816C88E - lock - faceplayer - loadword 0, gUnknown_8196CFE - callstd 4 - goto EventScript_16C7CA - end + lock + faceplayer + loadword 0, gUnknown_8196CFE + callstd 4 + goto EventScript_16C7CA + end CeladonCity_GameCorner_EventScript_16C89E:: @ 816C89E - lock - faceplayer - checkflag FLAG_0x26F - goto_if 1, EventScript_16C8F0 - loadword 0, gUnknown_8196D2B - callstd 4 - checkflag FLAG_0x243 - goto_if 0, EventScript_16C839 - checkcoins VAR_0x4001 - compare_var_to_value VAR_0x4001, 9980 - goto_if 4, EventScript_16C8E2 - givecoins 20 - textcolor 3 - loadword 0, gUnknown_8196D47 - callstd 4 - playse 248 - waitse - setflag FLAG_0x26F - goto EventScript_16C7CA - end + lock + faceplayer + checkflag FLAG_0x26F + goto_if 1, EventScript_16C8F0 + loadword 0, gUnknown_8196D2B + callstd 4 + checkflag FLAG_0x243 + goto_if 0, EventScript_16C839 + checkcoins VAR_0x4001 + compare_var_to_value VAR_0x4001, 9980 + goto_if 4, EventScript_16C8E2 + givecoins 20 + textcolor 3 + loadword 0, gUnknown_8196D47 + callstd 4 + playse 248 + waitse + setflag FLAG_0x26F + goto EventScript_16C7CA + end EventScript_16C8E2:: @ 816C8E2 - loadword 0, gUnknown_8196D6F - callstd 4 - goto EventScript_16C7CA - end + loadword 0, gUnknown_8196D6F + callstd 4 + goto EventScript_16C7CA + end EventScript_16C8F0:: @ 816C8F0 - loadword 0, gUnknown_8196D87 - callstd 4 - goto EventScript_16C7CA - end + loadword 0, gUnknown_8196D87 + callstd 4 + goto EventScript_16C7CA + end CeladonCity_GameCorner_EventScript_16C8FE:: @ 816C8FE - lock - faceplayer - checkflag FLAG_0x270 - goto_if 1, EventScript_16C950 - loadword 0, gUnknown_8196DB7 - callstd 4 - checkflag FLAG_0x243 - goto_if 0, EventScript_16C839 - checkcoins VAR_0x4001 - compare_var_to_value VAR_0x4001, 9980 - goto_if 4, EventScript_16C942 - givecoins 20 - textcolor 3 - loadword 0, gUnknown_8196DF8 - callstd 4 - playse 248 - waitse - setflag FLAG_0x270 - goto EventScript_16C7CA - end + lock + faceplayer + checkflag FLAG_0x270 + goto_if 1, EventScript_16C950 + loadword 0, gUnknown_8196DB7 + callstd 4 + checkflag FLAG_0x243 + goto_if 0, EventScript_16C839 + checkcoins VAR_0x4001 + compare_var_to_value VAR_0x4001, 9980 + goto_if 4, EventScript_16C942 + givecoins 20 + textcolor 3 + loadword 0, gUnknown_8196DF8 + callstd 4 + playse 248 + waitse + setflag FLAG_0x270 + goto EventScript_16C7CA + end EventScript_16C942:: @ 816C942 - loadword 0, gUnknown_8196E1B - callstd 4 - goto EventScript_16C7CA - end + loadword 0, gUnknown_8196E1B + callstd 4 + goto EventScript_16C7CA + end EventScript_16C950:: @ 816C950 - loadword 0, gUnknown_8196E40 - callstd 4 - goto EventScript_16C7CA - end + loadword 0, gUnknown_8196E40 + callstd 4 + goto EventScript_16C7CA + end CeladonCity_GameCorner_EventScript_16C95E:: @ 816C95E - lockall - setvar VAR_0x8004, 0 - goto EventScript_16C96C - end + lockall + setvar VAR_0x8004, 0 + goto EventScript_16C96C + end EventScript_16C96A:: @ 816C96A - releaseall - end + releaseall + end EventScript_16C96C:: @ 816C96C - checkflag FLAG_0x243 - goto_if 0, EventScript_16CAA0 - loadword 0, gUnknown_8196F46 - callstd 5 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16C96A - setfieldeffectarg 0, 255 - setfieldeffectarg 1, 10 - setfieldeffectarg 2, 14 - dofieldeffect 64 - waitfieldeffect 64 - specialvar VAR_RESULT, sub_80CAABC - playslotmachine VAR_RESULT - releaseall - end + checkflag FLAG_0x243 + goto_if 0, EventScript_16CAA0 + loadword 0, gUnknown_8196F46 + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16C96A + setfieldeffectarg 0, 255 + setfieldeffectarg 1, 10 + setfieldeffectarg 2, 14 + dofieldeffect 64 + waitfieldeffect 64 + specialvar VAR_RESULT, sub_80CAABC + playslotmachine VAR_RESULT + releaseall + end CeladonCity_GameCorner_EventScript_16C9A4:: @ 816C9A4 - lockall - setvar VAR_0x8004, 1 - goto EventScript_16C96C - end + lockall + setvar VAR_0x8004, 1 + goto EventScript_16C96C + end CeladonCity_GameCorner_EventScript_16C9B0:: @ 816C9B0 - lockall - setvar VAR_0x8004, 2 - goto EventScript_16C96C - end + lockall + setvar VAR_0x8004, 2 + goto EventScript_16C96C + end CeladonCity_GameCorner_EventScript_16C9BC:: @ 816C9BC - lockall - setvar VAR_0x8004, 3 - goto EventScript_16C96C - end + lockall + setvar VAR_0x8004, 3 + goto EventScript_16C96C + end EventScript_16C9C8:: @ 816C9C8 - lockall - setvar VAR_0x8004, 4 - goto EventScript_16C96C - end + lockall + setvar VAR_0x8004, 4 + goto EventScript_16C96C + end CeladonCity_GameCorner_EventScript_16C9D4:: @ 816C9D4 - lockall - setvar VAR_0x8004, 5 - goto EventScript_16C96C - end + lockall + setvar VAR_0x8004, 5 + goto EventScript_16C96C + end CeladonCity_GameCorner_EventScript_16C9E0:: @ 816C9E0 - lockall - setvar VAR_0x8004, 6 - goto EventScript_16C96C - end + lockall + setvar VAR_0x8004, 6 + goto EventScript_16C96C + end CeladonCity_GameCorner_EventScript_16C9EC:: @ 816C9EC - lockall - setvar VAR_0x8004, 7 - goto EventScript_16C96C - end + lockall + setvar VAR_0x8004, 7 + goto EventScript_16C96C + end CeladonCity_GameCorner_EventScript_16C9F8:: @ 816C9F8 - lockall - setvar VAR_0x8004, 8 - goto EventScript_16C96C - end + lockall + setvar VAR_0x8004, 8 + goto EventScript_16C96C + end CeladonCity_GameCorner_EventScript_16CA04:: @ 816CA04 - lockall - setvar VAR_0x8004, 9 - goto EventScript_16C96C - end + lockall + setvar VAR_0x8004, 9 + goto EventScript_16C96C + end CeladonCity_GameCorner_EventScript_16CA10:: @ 816CA10 - lockall - setvar VAR_0x8004, 10 - goto EventScript_16C96C - end + lockall + setvar VAR_0x8004, 10 + goto EventScript_16C96C + end CeladonCity_GameCorner_EventScript_16CA1C:: @ 816CA1C - lockall - setvar VAR_0x8004, 11 - goto EventScript_16C96C - end + lockall + setvar VAR_0x8004, 11 + goto EventScript_16C96C + end CeladonCity_GameCorner_EventScript_16CA28:: @ 816CA28 - lockall - setvar VAR_0x8004, 12 - goto EventScript_16C96C - end + lockall + setvar VAR_0x8004, 12 + goto EventScript_16C96C + end CeladonCity_GameCorner_EventScript_16CA34:: @ 816CA34 - lockall - setvar VAR_0x8004, 13 - goto EventScript_16C96C - end + lockall + setvar VAR_0x8004, 13 + goto EventScript_16C96C + end CeladonCity_GameCorner_EventScript_16CA40:: @ 816CA40 - lockall - setvar VAR_0x8004, 14 - goto EventScript_16C96C - end + lockall + setvar VAR_0x8004, 14 + goto EventScript_16C96C + end EventScript_16CA4C:: @ 816CA4C - lockall - setvar VAR_0x8004, 15 - goto EventScript_16C96C - end + lockall + setvar VAR_0x8004, 15 + goto EventScript_16C96C + end CeladonCity_GameCorner_EventScript_16CA58:: @ 816CA58 - lockall - setvar VAR_0x8004, 16 - goto EventScript_16C96C - end + lockall + setvar VAR_0x8004, 16 + goto EventScript_16C96C + end CeladonCity_GameCorner_EventScript_16CA64:: @ 816CA64 - lockall - setvar VAR_0x8004, 17 - goto EventScript_16C96C - end + lockall + setvar VAR_0x8004, 17 + goto EventScript_16C96C + end EventScript_16CA70:: @ 816CA70 - lockall - setvar VAR_0x8004, 18 - goto EventScript_16C96C - end + lockall + setvar VAR_0x8004, 18 + goto EventScript_16C96C + end CeladonCity_GameCorner_EventScript_16CA7C:: @ 816CA7C - lockall - setvar VAR_0x8004, 19 - goto EventScript_16C96C - end + lockall + setvar VAR_0x8004, 19 + goto EventScript_16C96C + end CeladonCity_GameCorner_EventScript_16CA88:: @ 816CA88 - lockall - setvar VAR_0x8004, 20 - goto EventScript_16C96C - end + lockall + setvar VAR_0x8004, 20 + goto EventScript_16C96C + end CeladonCity_GameCorner_EventScript_16CA94:: @ 816CA94 - lockall - setvar VAR_0x8004, 21 - goto EventScript_16C96C - end + lockall + setvar VAR_0x8004, 21 + goto EventScript_16C96C + end EventScript_16CAA0:: @ 816CAA0 - loadword 0, gUnknown_8196F0D - callstd 4 - releaseall - end + loadword 0, gUnknown_8196F0D + callstd 4 + releaseall + end CeladonCity_GameCorner_EventScript_16CAAA:: @ 816CAAA - lockall - loadword 0, gUnknown_8196EDC - callstd 4 - checkflag FLAG_0x26D - call_if 0, EventScript_16CABE - releaseall - end + lockall + loadword 0, gUnknown_8196EDC + callstd 4 + checkflag FLAG_0x26D + call_if 0, EventScript_16CABE + releaseall + end EventScript_16CABE:: @ 816CABE - playse SE_FU_ZAKU2 - setmetatile 15, 2, 669, 0 - setmetatile 16, 2, 670, 1 - setmetatile 17, 2, 671, 1 - setmetatile 16, 3, 678, 1 - setmetatile 17, 3, 679, 1 - special DrawWholeMapView - setflag FLAG_0x26D - return + playse SE_FU_ZAKU2 + setmetatile 15, 2, 669, 0 + setmetatile 16, 2, 670, 1 + setmetatile 17, 2, 671, 1 + setmetatile 16, 3, 678, 1 + setmetatile 17, 3, 679, 1 + special DrawWholeMapView + setflag FLAG_0x26D + return CeladonCity_GameCorner_EventScript_16CAF5:: @ 816CAF5 - trainerbattle 2, 357, 0, Text_196E69, Text_196E95, EventScript_16CB10 - loadword 0, gUnknown_8196E9B - callstd 6 - end + trainerbattle 2, 357, 0, Text_196E69, Text_196E95, EventScript_16CB10 + loadword 0, gUnknown_8196E9B + callstd 6 + end EventScript_16CB10:: @ 816CB10 - loadword 0, gUnknown_8196E9B - callstd 4 - closemessage - compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_16CB34 - compare_var_to_value VAR_FACING, 3 - call_if 5, EventScript_16CB3F - removeobject 11 - release - end + loadword 0, gUnknown_8196E9B + callstd 4 + closemessage + compare_var_to_value VAR_FACING, 3 + call_if 1, EventScript_16CB34 + compare_var_to_value VAR_FACING, 3 + call_if 5, EventScript_16CB3F + removeobject 11 + release + end EventScript_16CB34:: @ 816CB34 - applymovement 11, Movement_16CB4A - waitmovement 0 - return + applymovement 11, Movement_16CB4A + waitmovement 0 + return EventScript_16CB3F:: @ 816CB3F - applymovement 11, Movement_16CB53 - waitmovement 0 - return + applymovement 11, Movement_16CB53 + waitmovement 0 + return Movement_16CB4A:: @ 816CB4A - step_10 - step_13 - step_13 - step_11 - step_13 - step_13 - step_13 - step_13 - step_end + step_10 + step_13 + step_13 + step_11 + step_13 + step_13 + step_13 + step_13 + step_end Movement_16CB53:: @ 816CB53 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_end + step_13 + step_13 + step_13 + step_13 + step_13 + step_13 + step_end CeladonCity_GameCorner_EventScript_16CB5A:: @ 816CB5A - loadword 0, gUnknown_8196F64 - callstd 3 - end + loadword 0, gUnknown_8196F64 + callstd 3 + end CeladonCity_GameCorner_EventScript_16CB63:: @ 816CB63 - loadword 0, gUnknown_8196F81 - callstd 3 - end + loadword 0, gUnknown_8196F81 + callstd 3 + end CeladonCity_GameCorner_EventScript_16CB6C:: @ 816CB6C - loadword 0, gUnknown_8196FA0 - callstd 3 - end + loadword 0, gUnknown_8196FA0 + callstd 3 + end diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc index 8b71e03c2..e6973ddf3 100644 --- a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc +++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc @@ -1,387 +1,387 @@ CeladonCity_GameCorner_PrizeRoom_MapScripts:: @ 816CB75 - .byte 0 + .byte 0 CeladonCity_GameCorner_PrizeRoom_EventScript_16CB76:: @ 816CB76 - loadword 0, gUnknown_8196FC1 - callstd 2 - end + loadword 0, gUnknown_8196FC1 + callstd 2 + end CeladonCity_GameCorner_PrizeRoom_EventScript_16CB7F:: @ 816CB7F - loadword 0, gUnknown_8196FFF - callstd 2 - end + loadword 0, gUnknown_8196FFF + callstd 2 + end CeladonCity_GameCorner_PrizeRoom_EventScript_16CB88:: @ 816CB88 - lock - faceplayer - checkflag FLAG_0x243 - goto_if 0, EventScript_16CD99 - special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 - showcoinsbox 0, 0 - loadword 0, gUnknown_8197057 - callstd 4 - goto EventScript_16CBB2 - end + lock + faceplayer + checkflag FLAG_0x243 + goto_if 0, EventScript_16CD99 + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + showcoinsbox 0, 0 + loadword 0, gUnknown_8197057 + callstd 4 + goto EventScript_16CBB2 + end EventScript_16CBB2:: @ 816CBB2 - message Text_19707A - waitmessage - multichoice 11, 0, 14, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_16CC15 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16CC25 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_16CC35 - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_16CC45 - compare_var_to_value VAR_0x8000, 4 - goto_if 1, EventScript_16CC55 - compare_var_to_value VAR_0x8000, 5 - goto_if 1, EventScript_16CC10 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_16CC10 - end + message Text_19707A + waitmessage + multichoice 11, 0, 14, 0 + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_16CC15 + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_16CC25 + compare_var_to_value VAR_0x8000, 2 + goto_if 1, EventScript_16CC35 + compare_var_to_value VAR_0x8000, 3 + goto_if 1, EventScript_16CC45 + compare_var_to_value VAR_0x8000, 4 + goto_if 1, EventScript_16CC55 + compare_var_to_value VAR_0x8000, 5 + goto_if 1, EventScript_16CC10 + compare_var_to_value VAR_0x8000, 127 + goto_if 1, EventScript_16CC10 + end EventScript_16CC10:: @ 816CC10 - hidecoinsbox 0, 0 - release - end + hidecoinsbox 0, 0 + release + end EventScript_16CC15:: @ 816CC15 - setvar VAR_0x4001, 63 - setvar VAR_0x4002, 180 - goto EventScript_16CC65 - end + setvar VAR_0x4001, 63 + setvar VAR_0x4002, 180 + goto EventScript_16CC65 + end EventScript_16CC25:: @ 816CC25 - setvar VAR_0x4001, 35 - setvar VAR_0x4002, 500 - goto EventScript_16CC65 - end + setvar VAR_0x4001, 35 + setvar VAR_0x4002, 500 + goto EventScript_16CC65 + end EventScript_16CC35:: @ 816CC35 - setvar VAR_0x4001, 147 - setvar VAR_0x4002, 2800 - goto EventScript_16CC65 - end + setvar VAR_0x4001, 147 + setvar VAR_0x4002, 2800 + goto EventScript_16CC65 + end EventScript_16CC45:: @ 816CC45 - setvar VAR_0x4001, 123 - setvar VAR_0x4002, 5500 - goto EventScript_16CC65 - end + setvar VAR_0x4001, 123 + setvar VAR_0x4002, 5500 + goto EventScript_16CC65 + end EventScript_16CC55:: @ 816CC55 - setvar VAR_0x4001, 137 - setvar VAR_0x4002, 9999 - goto EventScript_16CC65 - end + setvar VAR_0x4001, 137 + setvar VAR_0x4002, 9999 + goto EventScript_16CC65 + end EventScript_16CC65:: @ 816CC65 - getspeciesname 0, 16385 - loadword 0, gUnknown_819709D - callstd 5 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16CC10 - checkcoins VAR_RESULT - compare_var_to_var VAR_RESULT, VAR_0x4002 - goto_if 0, EventScript_16CDA5 - textcolor 3 - copyvar VAR_0x8000, VAR_0x4001 - compare_var_to_value VAR_0x8000, 63 - goto_if 1, EventScript_16CCD4 - compare_var_to_value VAR_0x8000, 35 - goto_if 1, EventScript_16CCE9 - compare_var_to_value VAR_0x8000, 147 - goto_if 1, EventScript_16CCFE - compare_var_to_value VAR_0x8000, 123 - goto_if 1, EventScript_16CD13 - compare_var_to_value VAR_0x8000, 137 - goto_if 1, EventScript_16CD28 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_16CD3D - end + getspeciesname 0, 16385 + loadword 0, gUnknown_819709D + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16CC10 + checkcoins VAR_RESULT + compare_var_to_var VAR_RESULT, VAR_0x4002 + goto_if 0, EventScript_16CDA5 + textcolor 3 + copyvar VAR_0x8000, VAR_0x4001 + compare_var_to_value VAR_0x8000, 63 + goto_if 1, EventScript_16CCD4 + compare_var_to_value VAR_0x8000, 35 + goto_if 1, EventScript_16CCE9 + compare_var_to_value VAR_0x8000, 147 + goto_if 1, EventScript_16CCFE + compare_var_to_value VAR_0x8000, 123 + goto_if 1, EventScript_16CD13 + compare_var_to_value VAR_0x8000, 137 + goto_if 1, EventScript_16CD28 + compare_var_to_value VAR_0x8000, 127 + goto_if 1, EventScript_16CD3D + end EventScript_16CCD4:: @ 816CCD4 - givemon 16385, 9, ITEM_NONE, 0, 0, 0 - goto EventScript_16CD52 - end + givemon 16385, 9, ITEM_NONE, 0, 0, 0 + goto EventScript_16CD52 + end EventScript_16CCE9:: @ 816CCE9 - givemon 16385, 8, ITEM_NONE, 0, 0, 0 - goto EventScript_16CD52 - end + givemon 16385, 8, ITEM_NONE, 0, 0, 0 + goto EventScript_16CD52 + end EventScript_16CCFE:: @ 816CCFE - givemon 16385, 18, ITEM_NONE, 0, 0, 0 - goto EventScript_16CD52 - end + givemon 16385, 18, ITEM_NONE, 0, 0, 0 + goto EventScript_16CD52 + end EventScript_16CD13:: @ 816CD13 - givemon 16385, 25, ITEM_NONE, 0, 0, 0 - goto EventScript_16CD52 - end + givemon 16385, 25, ITEM_NONE, 0, 0, 0 + goto EventScript_16CD52 + end EventScript_16CD28:: @ 816CD28 - givemon 16385, 26, ITEM_NONE, 0, 0, 0 - goto EventScript_16CD52 - end + givemon 16385, 26, ITEM_NONE, 0, 0, 0 + goto EventScript_16CD52 + end EventScript_16CD3D:: @ 816CD3D - givemon 16385, 18, ITEM_NONE, 0, 0, 0 - goto EventScript_16CD52 - end + givemon 16385, 18, ITEM_NONE, 0, 0, 0 + goto EventScript_16CD52 + end EventScript_16CD52:: @ 816CD52 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16CDB3 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16CDE0 - compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_16CD74 - end + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16CDB3 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16CDE0 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_16CD74 + end EventScript_16CD74:: @ 816CD74 - textcolor 3 - loadword 0, gUnknown_81A5E31 - callstd 4 - hidecoinsbox 0, 0 - release - end + textcolor 3 + loadword 0, gUnknown_81A5E31 + callstd 4 + hidecoinsbox 0, 0 + release + end EventScript_16CD83:: @ 816CD83 - countpokemon - subvar VAR_RESULT, 1 - copyvar VAR_0x8004, VAR_RESULT - call EventScript_1A74EB - goto EventScript_16CC10 - end + countpokemon + subvar VAR_RESULT, 1 + copyvar VAR_0x8004, VAR_RESULT + call EventScript_1A74EB + goto EventScript_16CC10 + end EventScript_16CD99:: @ 816CD99 - textcolor 3 - loadword 0, gUnknown_819703E - callstd 4 - release - end + textcolor 3 + loadword 0, gUnknown_819703E + callstd 4 + release + end EventScript_16CDA5:: @ 816CDA5 - loadword 0, gUnknown_81970D5 - callstd 4 - goto EventScript_16CC10 - end + loadword 0, gUnknown_81970D5 + callstd 4 + goto EventScript_16CC10 + end EventScript_16CDB3:: @ 816CDB3 - takecoins VAR_0x4002 - updatecoinsbox 0, 5 - getspeciesname 0, 16385 - playfanfare MUS_FANFA1 - message Text_1A5DF1 - waitmessage - waitfanfare - loadword 0, gUnknown_81A56A7 - callstd 5 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16CD83 - goto EventScript_16CC10 - end + takecoins VAR_0x4002 + updatecoinsbox 0, 5 + getspeciesname 0, 16385 + playfanfare MUS_FANFA1 + message Text_1A5DF1 + waitmessage + waitfanfare + loadword 0, gUnknown_81A56A7 + callstd 5 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16CD83 + goto EventScript_16CC10 + end EventScript_16CDE0:: @ 816CDE0 - takecoins VAR_0x4002 - updatecoinsbox 0, 5 - getspeciesname 0, 16385 - playfanfare MUS_FANFA1 - message Text_1A5DF1 - waitmessage - waitfanfare - loadword 0, gUnknown_81A56A7 - callstd 5 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16CE12 - call EventScript_1A8C33 - goto EventScript_16CE12 - end + takecoins VAR_0x4002 + updatecoinsbox 0, 5 + getspeciesname 0, 16385 + playfanfare MUS_FANFA1 + message Text_1A5DF1 + waitmessage + waitfanfare + loadword 0, gUnknown_81A56A7 + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16CE12 + call EventScript_1A8C33 + goto EventScript_16CE12 + end EventScript_16CE12:: @ 816CE12 - call EventScript_1A8C3C - goto EventScript_16CC10 - end + call EventScript_1A8C3C + goto EventScript_16CC10 + end CeladonCity_GameCorner_PrizeRoom_EventScript_16CE1D:: @ 816CE1D - lock - faceplayer - checkflag FLAG_0x243 - goto_if 0, EventScript_16CD99 - special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 - showcoinsbox 0, 0 - loadword 0, gUnknown_8197057 - callstd 4 - goto EventScript_16CE47 - end + lock + faceplayer + checkflag FLAG_0x243 + goto_if 0, EventScript_16CD99 + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + showcoinsbox 0, 0 + loadword 0, gUnknown_8197057 + callstd 4 + goto EventScript_16CE47 + end EventScript_16CE47:: @ 816CE47 - message Text_19707A - waitmessage - multichoice 11, 0, 30, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_16CEA5 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16CEB9 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_16CECD - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_16CEE1 - compare_var_to_value VAR_0x8000, 4 - goto_if 1, EventScript_16CEF5 - compare_var_to_value VAR_0x8000, 5 - goto_if 1, EventScript_16CC10 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_16CC10 - end + message Text_19707A + waitmessage + multichoice 11, 0, 30, 0 + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_16CEA5 + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_16CEB9 + compare_var_to_value VAR_0x8000, 2 + goto_if 1, EventScript_16CECD + compare_var_to_value VAR_0x8000, 3 + goto_if 1, EventScript_16CEE1 + compare_var_to_value VAR_0x8000, 4 + goto_if 1, EventScript_16CEF5 + compare_var_to_value VAR_0x8000, 5 + goto_if 1, EventScript_16CC10 + compare_var_to_value VAR_0x8000, 127 + goto_if 1, EventScript_16CC10 + end EventScript_16CEA5:: @ 816CEA5 - setvar VAR_0x4001, 301 - setvar VAR_0x4002, 4000 - getmovename 1, MOVE_ICE_BEAM - goto EventScript_16CF09 - end + setvar VAR_0x4001, 301 + setvar VAR_0x4002, 4000 + getmovename 1, MOVE_ICE_BEAM + goto EventScript_16CF09 + end EventScript_16CEB9:: @ 816CEB9 - setvar VAR_0x4001, 311 - setvar VAR_0x4002, 3500 - getmovename 1, MOVE_IRON_TAIL - goto EventScript_16CF09 - end + setvar VAR_0x4001, 311 + setvar VAR_0x4002, 3500 + getmovename 1, MOVE_IRON_TAIL + goto EventScript_16CF09 + end EventScript_16CECD:: @ 816CECD - setvar VAR_0x4001, 312 - setvar VAR_0x4002, 4000 - getmovename 1, MOVE_THUNDERBOLT - goto EventScript_16CF09 - end + setvar VAR_0x4001, 312 + setvar VAR_0x4002, 4000 + getmovename 1, MOVE_THUNDERBOLT + goto EventScript_16CF09 + end EventScript_16CEE1:: @ 816CEE1 - setvar VAR_0x4001, 318 - setvar VAR_0x4002, 4500 - getmovename 1, MOVE_SHADOW_BALL - goto EventScript_16CF09 - end + setvar VAR_0x4001, 318 + setvar VAR_0x4002, 4500 + getmovename 1, MOVE_SHADOW_BALL + goto EventScript_16CF09 + end EventScript_16CEF5:: @ 816CEF5 - setvar VAR_0x4001, 323 - setvar VAR_0x4002, 4000 - getmovename 1, MOVE_FLAMETHROWER - goto EventScript_16CF09 - end + setvar VAR_0x4001, 323 + setvar VAR_0x4002, 4000 + getmovename 1, MOVE_FLAMETHROWER + goto EventScript_16CF09 + end EventScript_16CF09:: @ 816CF09 - loadword 0, gUnknown_81970B2 - callstd 5 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16CC10 - goto EventScript_16CF3F - end + loadword 0, gUnknown_81970B2 + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16CC10 + goto EventScript_16CF3F + end EventScript_16CF22:: @ 816CF22 - getitemname 0, 16385 - loadword 0, gUnknown_819709D - callstd 5 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16CC10 - goto EventScript_16CF3F - end + getitemname 0, 16385 + loadword 0, gUnknown_819709D + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16CC10 + goto EventScript_16CF3F + end EventScript_16CF3F:: @ 816CF3F - getitemname 0, 16385 - checkcoins VAR_RESULT - compare_var_to_var VAR_RESULT, VAR_0x4002 - goto_if 0, EventScript_16CDA5 - checkitemspace 16385, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16CF79 - takecoins VAR_0x4002 - updatecoinsbox 0, 5 - setorcopyvar VAR_0x8000, VAR_0x4001 - setorcopyvar VAR_0x8001, 1 - callstd 0 - goto EventScript_16CC10 - end + getitemname 0, 16385 + checkcoins VAR_RESULT + compare_var_to_var VAR_RESULT, VAR_0x4002 + goto_if 0, EventScript_16CDA5 + checkitemspace 16385, 1 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16CF79 + takecoins VAR_0x4002 + updatecoinsbox 0, 5 + setorcopyvar VAR_0x8000, VAR_0x4001 + setorcopyvar VAR_0x8001, 1 + callstd 0 + goto EventScript_16CC10 + end EventScript_16CF79:: @ 816CF79 - textcolor 3 - loadword 0, gUnknown_81A5242 - callstd 4 - hidecoinsbox 0, 0 - release - end + textcolor 3 + loadword 0, gUnknown_81A5242 + callstd 4 + hidecoinsbox 0, 0 + release + end CeladonCity_GameCorner_PrizeRoom_EventScript_16CF88:: @ 816CF88 - lock - faceplayer - checkflag FLAG_0x243 - goto_if 0, EventScript_16CD99 - special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 - showcoinsbox 0, 0 - loadword 0, gUnknown_8197057 - callstd 4 - goto EventScript_16CFB2 - end + lock + faceplayer + checkflag FLAG_0x243 + goto_if 0, EventScript_16CD99 + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + showcoinsbox 0, 0 + loadword 0, gUnknown_8197057 + callstd 4 + goto EventScript_16CFB2 + end EventScript_16CFB2:: @ 816CFB2 - message Text_19707A - waitmessage - multichoice 10, 0, 41, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_16D010 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16D020 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_16D030 - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_16D040 - compare_var_to_value VAR_0x8000, 4 - goto_if 1, EventScript_16D050 - compare_var_to_value VAR_0x8000, 5 - goto_if 1, EventScript_16CC10 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_16CC10 - end + message Text_19707A + waitmessage + multichoice 10, 0, 41, 0 + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_16D010 + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_16D020 + compare_var_to_value VAR_0x8000, 2 + goto_if 1, EventScript_16D030 + compare_var_to_value VAR_0x8000, 3 + goto_if 1, EventScript_16D040 + compare_var_to_value VAR_0x8000, 4 + goto_if 1, EventScript_16D050 + compare_var_to_value VAR_0x8000, 5 + goto_if 1, EventScript_16CC10 + compare_var_to_value VAR_0x8000, 127 + goto_if 1, EventScript_16CC10 + end EventScript_16D010:: @ 816D010 - setvar VAR_0x4001, 194 - setvar VAR_0x4002, 800 - goto EventScript_16CF22 - end + setvar VAR_0x4001, 194 + setvar VAR_0x4002, 800 + goto EventScript_16CF22 + end EventScript_16D020:: @ 816D020 - setvar VAR_0x4001, 205 - setvar VAR_0x4002, 1000 - goto EventScript_16CF22 - end + setvar VAR_0x4001, 205 + setvar VAR_0x4002, 1000 + goto EventScript_16CF22 + end EventScript_16D030:: @ 816D030 - setvar VAR_0x4001, 215 - setvar VAR_0x4002, 1000 - goto EventScript_16CF22 - end + setvar VAR_0x4001, 215 + setvar VAR_0x4002, 1000 + goto EventScript_16CF22 + end EventScript_16D040:: @ 816D040 - setvar VAR_0x4001, 209 - setvar VAR_0x4002, 1000 - goto EventScript_16CF22 - end + setvar VAR_0x4001, 209 + setvar VAR_0x4002, 1000 + goto EventScript_16CF22 + end EventScript_16D050:: @ 816D050 - setvar VAR_0x4001, 40 - setvar VAR_0x4002, 1600 - goto EventScript_16CF22 - end + setvar VAR_0x4001, 40 + setvar VAR_0x4002, 1600 + goto EventScript_16CF22 + end diff --git a/data/maps/CeladonCity_Gym/scripts.inc b/data/maps/CeladonCity_Gym/scripts.inc index 298c4a7da..5b8d3ec3c 100644 --- a/data/maps/CeladonCity_Gym/scripts.inc +++ b/data/maps/CeladonCity_Gym/scripts.inc @@ -1,116 +1,116 @@ CeladonCity_Gym_MapScripts:: @ 816D060 - .byte 0 + .byte 0 CeladonCity_Gym_EventScript_16D061:: @ 816D061 - setvar VAR_0x8004, 5 - setvar VAR_0x8005, 2 - special UpdatePickStateFromSpecialVar8005 - trainerbattle 1, 417, 0, Text_197114, Text_197260, EventScript_16D0A0 - checkflag FLAG_0x293 - goto_if 0, EventScript_16D0C6 - setvar VAR_0x8004, 5 - setvar VAR_0x8005, 4 - special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_81972B8 - callstd 4 - release - end + setvar VAR_0x8004, 5 + setvar VAR_0x8005, 2 + special UpdatePickStateFromSpecialVar8005 + trainerbattle 1, 417, 0, Text_197114, Text_197260, EventScript_16D0A0 + checkflag FLAG_0x293 + goto_if 0, EventScript_16D0C6 + setvar VAR_0x8004, 5 + setvar VAR_0x8005, 4 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_81972B8 + callstd 4 + release + end EventScript_16D0A0:: @ 816D0A0 - setvar VAR_0x8004, 5 - setvar VAR_0x8005, 1 - special SetFlavorTextFlagFromSpecialVars - clearflag FLAG_0x09E - setflag FLAG_0x4B3 - setflag 2083 - setvar VAR_0x8008, 4 - call EventScript_1A6B18 - goto EventScript_16D0C6 - end + setvar VAR_0x8004, 5 + setvar VAR_0x8005, 1 + special SetFlavorTextFlagFromSpecialVars + clearflag FLAG_0x09E + setflag FLAG_0x4B3 + setflag 2083 + setvar VAR_0x8008, 4 + call EventScript_1A6B18 + goto EventScript_16D0C6 + end EventScript_16D0C6:: @ 816D0C6 - loadword 0, gUnknown_8197327 - callstd 4 - checkitemspace ITEM_TM19, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16D107 - additem ITEM_TM19, 1 - loadword 0, gUnknown_81973BA - setorcopyvar VAR_0x8000, 307 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 257 - callstd 9 - setflag FLAG_0x293 - loadword 0, gUnknown_81973D7 - callstd 4 - release - end + loadword 0, gUnknown_8197327 + callstd 4 + checkitemspace ITEM_TM19, 1 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16D107 + additem ITEM_TM19, 1 + loadword 0, gUnknown_81973BA + setorcopyvar VAR_0x8000, 307 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 257 + callstd 9 + setflag FLAG_0x293 + loadword 0, gUnknown_81973D7 + callstd 4 + release + end EventScript_16D107:: @ 816D107 - loadword 0, gUnknown_819745D - callstd 4 - release - end + loadword 0, gUnknown_819745D + callstd 4 + release + end CeladonCity_Gym_EventScript_16D111:: @ 816D111 - trainerbattle 0, 132, 0, Text_19747C, Text_1974C4 - loadword 0, gUnknown_81974D6 - callstd 6 - end + trainerbattle 0, 132, 0, Text_19747C, Text_1974C4 + loadword 0, gUnknown_81974D6 + callstd 6 + end CeladonCity_Gym_EventScript_16D128:: @ 816D128 - trainerbattle 0, 133, 0, Text_1976C5, Text_1976FF - setvar VAR_0x8004, 5 - setvar VAR_0x8005, 2 - special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_8197708 - callstd 6 - end + trainerbattle 0, 133, 0, Text_1976C5, Text_1976FF + setvar VAR_0x8004, 5 + setvar VAR_0x8005, 2 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_8197708 + callstd 6 + end CeladonCity_Gym_EventScript_16D14C:: @ 816D14C - trainerbattle 0, 160, 0, Text_197595, Text_1975BB - loadword 0, gUnknown_81975D1 - callstd 6 - end + trainerbattle 0, 160, 0, Text_197595, Text_1975BB + loadword 0, gUnknown_81975D1 + callstd 6 + end CeladonCity_Gym_EventScript_16D163:: @ 816D163 - trainerbattle 0, 265, 0, Text_1974FA, Text_19751C - loadword 0, gUnknown_8197527 - callstd 6 - end + trainerbattle 0, 265, 0, Text_1974FA, Text_19751C + loadword 0, gUnknown_8197527 + callstd 6 + end CeladonCity_Gym_EventScript_16D17A:: @ 816D17A - trainerbattle 0, 266, 0, Text_19760B, Text_197660 - setvar VAR_0x8004, 5 - setvar VAR_0x8005, 3 - special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_8197664 - callstd 6 - end + trainerbattle 0, 266, 0, Text_19760B, Text_197660 + setvar VAR_0x8004, 5 + setvar VAR_0x8005, 3 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_8197664 + callstd 6 + end CeladonCity_Gym_EventScript_16D19E:: @ 816D19E - trainerbattle 0, 267, 0, Text_197747, Text_19777A - loadword 0, gUnknown_8197788 - callstd 6 - end + trainerbattle 0, 267, 0, Text_197747, Text_19777A + loadword 0, gUnknown_8197788 + callstd 6 + end CeladonCity_Gym_EventScript_16D1B5:: @ 816D1B5 - trainerbattle 0, 402, 0, Text_1977E5, Text_197832 - loadword 0, gUnknown_819783E - callstd 6 - end + trainerbattle 0, 402, 0, Text_1977E5, Text_197832 + loadword 0, gUnknown_819783E + callstd 6 + end CeladonCity_Gym_EventScript_16D1CC:: @ 816D1CC - lockall - checkflag 2083 - goto_if 1, EventScript_16D1E0 - loadword 0, gUnknown_8197874 - callstd 4 - releaseall - end + lockall + checkflag 2083 + goto_if 1, EventScript_16D1E0 + loadword 0, gUnknown_8197874 + callstd 4 + releaseall + end EventScript_16D1E0:: @ 816D1E0 - loadword 0, gUnknown_81978AB - callstd 4 - releaseall - end + loadword 0, gUnknown_81978AB + callstd 4 + releaseall + end diff --git a/data/maps/CeladonCity_Hotel/scripts.inc b/data/maps/CeladonCity_Hotel/scripts.inc index 51a5ba906..570509191 100644 --- a/data/maps/CeladonCity_Hotel/scripts.inc +++ b/data/maps/CeladonCity_Hotel/scripts.inc @@ -1,22 +1,22 @@ CeladonCity_Hotel_MapScripts:: @ 816D283 - .byte 0 + .byte 0 CeladonCity_Hotel_EventScript_16D284:: @ 816D284 - loadword 0, gUnknown_8197B77 - callstd 2 - end + loadword 0, gUnknown_8197B77 + callstd 2 + end CeladonCity_Hotel_EventScript_16D28D:: @ 816D28D - loadword 0, gUnknown_8197BBE - callstd 2 - end + loadword 0, gUnknown_8197BBE + callstd 2 + end CeladonCity_Hotel_EventScript_16D296:: @ 816D296 - loadword 0, gUnknown_8197C0C - callstd 2 - end + loadword 0, gUnknown_8197C0C + callstd 2 + end CeladonCity_Hotel_EventScript_16D29F:: @ 816D29F - loadword 0, gUnknown_8197C30 - callstd 2 - end + loadword 0, gUnknown_8197C30 + callstd 2 + end diff --git a/data/maps/CeladonCity_House1/scripts.inc b/data/maps/CeladonCity_House1/scripts.inc index 22d98478b..a30072527 100644 --- a/data/maps/CeladonCity_House1/scripts.inc +++ b/data/maps/CeladonCity_House1/scripts.inc @@ -1,17 +1,17 @@ CeladonCity_House1_MapScripts:: @ 816D267 - .byte 0 + .byte 0 CeladonCity_House1_EventScript_16D268:: @ 816D268 - loadword 0, gUnknown_8197A9F - callstd 2 - end + loadword 0, gUnknown_8197A9F + callstd 2 + end CeladonCity_House1_EventScript_16D271:: @ 816D271 - loadword 0, gUnknown_8197AD3 - callstd 2 - end + loadword 0, gUnknown_8197AD3 + callstd 2 + end CeladonCity_House1_EventScript_16D27A:: @ 816D27A - loadword 0, gUnknown_8197B20 - callstd 2 - end + loadword 0, gUnknown_8197B20 + callstd 2 + end diff --git a/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc b/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc index adb65d7d3..8fffeef2f 100644 --- a/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc @@ -1,30 +1,30 @@ CeladonCity_PokemonCenter_1F_MapScripts:: @ 816C5EC - map_script 3, CeladonCity_PokemonCenter_1F_MapScript1_16C5F7 - map_script 5, CeladonCity_PokemonCenter_1F_MapScript2_1BC05C - .byte 0 + map_script 3, CeladonCity_PokemonCenter_1F_MapScript1_16C5F7 + map_script 5, CeladonCity_PokemonCenter_1F_MapScript2_1BC05C + .byte 0 CeladonCity_PokemonCenter_1F_MapScript1_16C5F7:: @ 816C5F7 - setrespawn 7 - end + setrespawn 7 + end CeladonCity_PokemonCenter_1F_EventScript_16C5FB:: @ 816C5FB - lock - faceplayer - call EventScript_1A6578 - release - end + lock + faceplayer + call EventScript_1A6578 + release + end CeladonCity_PokemonCenter_1F_EventScript_16C604:: @ 816C604 - loadword 0, gUnknown_819685B - callstd 2 - end + loadword 0, gUnknown_819685B + callstd 2 + end CeladonCity_PokemonCenter_1F_EventScript_16C60D:: @ 816C60D - loadword 0, gUnknown_81968C2 - callstd 2 - end + loadword 0, gUnknown_81968C2 + callstd 2 + end CeladonCity_PokemonCenter_1F_EventScript_16C616:: @ 816C616 - loadword 0, gUnknown_8196913 - callstd 2 - end + loadword 0, gUnknown_8196913 + callstd 2 + end diff --git a/data/maps/CeladonCity_PokemonCenter_2F/scripts.inc b/data/maps/CeladonCity_PokemonCenter_2F/scripts.inc index 08ce23ad1..1b07679eb 100644 --- a/data/maps/CeladonCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/CeladonCity_PokemonCenter_2F/scripts.inc @@ -1,18 +1,18 @@ CeladonCity_PokemonCenter_2F_MapScripts:: @ 816C61F - map_script 2, CeladonCity_PokemonCenter_2F_MapScript1_1BB2A3 - map_script 4, CeladonCity_PokemonCenter_2F_MapScript2_1BB1ED - map_script 1, CeladonCity_PokemonCenter_2F_MapScript3_1BB237 - map_script 3, CeladonCity_PokemonCenter_2F_MapScript4_1BB1B4 - .byte 0 + map_script 2, CeladonCity_PokemonCenter_2F_MapScript1_1BB2A3 + map_script 4, CeladonCity_PokemonCenter_2F_MapScript2_1BB1ED + map_script 1, CeladonCity_PokemonCenter_2F_MapScript3_1BB237 + map_script 3, CeladonCity_PokemonCenter_2F_MapScript4_1BB1B4 + .byte 0 CeladonCity_PokemonCenter_2F_EventScript_16C634:: @ 816C634 - call EventScript_1BB4A3 - end + call EventScript_1BB4A3 + end EventScript_16C63A:: @ 816C63A - call EventScript_1BB6AB - end + call EventScript_1BB6AB + end EventScript_16C640:: @ 816C640 - call EventScript_1BB7DE - end + call EventScript_1BB7DE + end diff --git a/data/maps/CeladonCity_Restaurant/scripts.inc b/data/maps/CeladonCity_Restaurant/scripts.inc index 2b84f09f0..347eb7008 100644 --- a/data/maps/CeladonCity_Restaurant/scripts.inc +++ b/data/maps/CeladonCity_Restaurant/scripts.inc @@ -1,54 +1,54 @@ CeladonCity_Restaurant_MapScripts:: @ 816D1EA - .byte 0 + .byte 0 CeladonCity_Restaurant_EventScript_16D1EB:: @ 816D1EB - loadword 0, gUnknown_81978E6 - callstd 2 - end + loadword 0, gUnknown_81978E6 + callstd 2 + end CeladonCity_Restaurant_EventScript_16D1F4:: @ 816D1F4 - loadword 0, gUnknown_8197915 - callstd 2 - end + loadword 0, gUnknown_8197915 + callstd 2 + end CeladonCity_Restaurant_EventScript_16D1FD:: @ 816D1FD - lock - faceplayer - checkflag FLAG_0x243 - goto_if 1, EventScript_16D24B - loadword 0, gUnknown_81979C1 - callstd 4 - checkitemspace ITEM_COIN_CASE, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16D241 - additem ITEM_COIN_CASE, 1 - loadword 0, gUnknown_8197A38 - setorcopyvar VAR_0x8000, 260 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 257 - callstd 9 - setflag FLAG_0x243 - release - end + lock + faceplayer + checkflag FLAG_0x243 + goto_if 1, EventScript_16D24B + loadword 0, gUnknown_81979C1 + callstd 4 + checkitemspace ITEM_COIN_CASE, 1 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16D241 + additem ITEM_COIN_CASE, 1 + loadword 0, gUnknown_8197A38 + setorcopyvar VAR_0x8000, 260 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 257 + callstd 9 + setflag FLAG_0x243 + release + end EventScript_16D241:: @ 816D241 - loadword 0, gUnknown_8197A5E - callstd 4 - release - end + loadword 0, gUnknown_8197A5E + callstd 4 + release + end EventScript_16D24B:: @ 816D24B - loadword 0, gUnknown_8197A72 - callstd 4 - release - end + loadword 0, gUnknown_8197A72 + callstd 4 + release + end CeladonCity_Restaurant_EventScript_16D255:: @ 816D255 - loadword 0, gUnknown_8197952 - callstd 2 - end + loadword 0, gUnknown_8197952 + callstd 2 + end CeladonCity_Restaurant_EventScript_16D25E:: @ 816D25E - loadword 0, gUnknown_819798A - callstd 2 - end + loadword 0, gUnknown_819798A + callstd 2 + end diff --git a/data/maps/CeruleanCave_1F/scripts.inc b/data/maps/CeruleanCave_1F/scripts.inc index be15e9b22..6b4e93d9f 100644 --- a/data/maps/CeruleanCave_1F/scripts.inc +++ b/data/maps/CeruleanCave_1F/scripts.inc @@ -1,7 +1,7 @@ CeruleanCave_1F_MapScripts:: @ 81624B3 - map_script 3, CeruleanCave_1F_MapScript1_1624B9 - .byte 0 + map_script 3, CeruleanCave_1F_MapScript1_1624B9 + .byte 0 CeruleanCave_1F_MapScript1_1624B9:: @ 81624B9 - setworldmapflag 2227 - end + setworldmapflag 2227 + end diff --git a/data/maps/CeruleanCave_2F/scripts.inc b/data/maps/CeruleanCave_2F/scripts.inc index a950a3854..d80aaeca5 100644 --- a/data/maps/CeruleanCave_2F/scripts.inc +++ b/data/maps/CeruleanCave_2F/scripts.inc @@ -1,2 +1,2 @@ CeruleanCave_2F_MapScripts:: @ 81624BD - .byte 0 + .byte 0 diff --git a/data/maps/CeruleanCave_B1F/scripts.inc b/data/maps/CeruleanCave_B1F/scripts.inc index 983fea617..433266be7 100644 --- a/data/maps/CeruleanCave_B1F/scripts.inc +++ b/data/maps/CeruleanCave_B1F/scripts.inc @@ -1,70 +1,70 @@ CeruleanCave_B1F_MapScripts:: @ 81624BE - map_script 5, CeruleanCave_B1F_MapScript1_1624C9 - map_script 3, CeruleanCave_B1F_MapScript2_1624E7 - .byte 0 + map_script 5, CeruleanCave_B1F_MapScript1_1624C9 + map_script 3, CeruleanCave_B1F_MapScript2_1624E7 + .byte 0 CeruleanCave_B1F_MapScript1_1624C9:: @ 81624C9 - checkflag 2055 - call_if 1, EventScript_1624D3 - end + checkflag 2055 + call_if 1, EventScript_1624D3 + end EventScript_1624D3:: @ 81624D3 - specialvar VAR_RESULT, sub_80CA74C - compare_var_to_value VAR_RESULT, 7 - goto_if 5, EventScript_1A77A9 - removeobject VAR_LAST_TALKED - return + specialvar VAR_RESULT, sub_80CA74C + compare_var_to_value VAR_RESULT, 7 + goto_if 5, EventScript_1A77A9 + removeobject VAR_LAST_TALKED + return CeruleanCave_B1F_MapScript2_1624E7:: @ 81624E7 - checkflag FLAG_0x2BC - call_if 0, EventScript_1624F1 - end + checkflag FLAG_0x2BC + call_if 0, EventScript_1624F1 + end EventScript_1624F1:: @ 81624F1 - clearflag FLAG_0x081 - return + clearflag FLAG_0x081 + return CeruleanCave_B1F_EventScript_1624F5:: @ 81624F5 - special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 - special sub_8112364 - lock - faceplayer - waitse - playmoncry SPECIES_MEWTWO, 2 - message Text_177F9F - waitmessage - waitmoncry - delay 20 - playbgm BGM_FRLG_LEADER_EYE, 0 - waitbuttonpress - setwildbattle SPECIES_MEWTWO, 70, ITEM_NONE - setflag 2055 - special sub_807F9D8 - waitstate - clearflag 2055 - specialvar VAR_RESULT, sub_80CA74C - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_162558 - compare_var_to_value VAR_RESULT, 4 - goto_if 1, EventScript_162561 - compare_var_to_value VAR_RESULT, 5 - goto_if 1, EventScript_162561 - setflag FLAG_0x2BC - release - end + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + special sub_8112364 + lock + faceplayer + waitse + playmoncry SPECIES_MEWTWO, 2 + message Text_177F9F + waitmessage + waitmoncry + delay 20 + playbgm BGM_FRLG_LEADER_EYE, 0 + waitbuttonpress + setwildbattle SPECIES_MEWTWO, 70, ITEM_NONE + setflag 2055 + special sub_807F9D8 + waitstate + clearflag 2055 + specialvar VAR_RESULT, sub_80CA74C + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_162558 + compare_var_to_value VAR_RESULT, 4 + goto_if 1, EventScript_162561 + compare_var_to_value VAR_RESULT, 5 + goto_if 1, EventScript_162561 + setflag FLAG_0x2BC + release + end EventScript_162558:: @ 8162558 - setflag FLAG_0x2BC - goto EventScript_1A922D + setflag FLAG_0x2BC + goto EventScript_1A922D EventScript_162560:: @ 8162560 - end + end EventScript_162561:: @ 8162561 - setvar VAR_0x8004, 150 - goto EventScript_1A9236 + setvar VAR_0x8004, 150 + goto EventScript_1A9236 EventScript_16256B:: @ 816256B - end + end diff --git a/data/maps/CeruleanCity/events_bad.inc b/data/maps/CeruleanCity/events_bad.inc index 1598a51ff..f523a18d5 100644 --- a/data/maps/CeruleanCity/events_bad.inc +++ b/data/maps/CeruleanCity/events_bad.inc @@ -1,43 +1,43 @@ CeruleanCity_EventObjects: - object_event 1, 60, 0, 31, 0, 12, 0, 3, 8, 17, 0, 0, 0 - object_event 2, 49, 0, 33, 0, 6, 0, 3, 1, 17, 0, 0, 0 - object_event 3, 16, 0, 16, 0, 21, 0, 3, 3, 49, 0, 0, 0 - object_event 4, 30, 0, 9, 0, 23, 0, 3, 2, 17, 0, 0, 0 - object_event 5, 129, 0, 32, 0, 29, 0, 3, 8, 17, 0, 0, 0 - object_event 6, 22, 0, 33, 0, 29, 0, 3, 9, 17, 0, 0, 0 - object_event 7, 18, 0, 34, 0, 22, 0, 3, 8, 17, 0, 0, 0 - object_event 8, 72, 0, 22, 0, 0, 0, 3, 8, 17, 0, 0, 0 - object_event 9, 95, 0, 26, 0, 32, 0, 3, 8, 17, 0, 0, 0 - object_event 10, 65375, 0, 50, 0, 18, 0, 10, 0, 0, 0, 27, 0 - object_event 11, 23, 0, 12, 0, 30, 0, 3, 7, 17, 0, 0, 0 - object_event 12, 41, 0, 1, 0, 13, 0, 3, 8, 17, 0, 0, 0 + object_event 1, 60, 0, 31, 0, 12, 0, 3, 8, 17, 0, 0, 0 + object_event 2, 49, 0, 33, 0, 6, 0, 3, 1, 17, 0, 0, 0 + object_event 3, 16, 0, 16, 0, 21, 0, 3, 3, 49, 0, 0, 0 + object_event 4, 30, 0, 9, 0, 23, 0, 3, 2, 17, 0, 0, 0 + object_event 5, 129, 0, 32, 0, 29, 0, 3, 8, 17, 0, 0, 0 + object_event 6, 22, 0, 33, 0, 29, 0, 3, 9, 17, 0, 0, 0 + object_event 7, 18, 0, 34, 0, 22, 0, 3, 8, 17, 0, 0, 0 + object_event 8, 72, 0, 22, 0, 0, 0, 3, 8, 17, 0, 0, 0 + object_event 9, 95, 0, 26, 0, 32, 0, 3, 8, 17, 0, 0, 0 + object_event 10, 65375, 0, 50, 0, 18, 0, 10, 0, 0, 0, 27, 0 + object_event 11, 23, 0, 12, 0, 30, 0, 3, 7, 17, 0, 0, 0 + object_event 12, 41, 0, 1, 0, 13, 0, 3, 8, 17, 0, 0, 0 CeruleanCity_MapWarps: - warp_def 10, 11, 0, 1, MAP_CERULEAN_CITY_HOUSE1 - warp_def 30, 11, 0, 1, MAP_CERULEAN_CITY_HOUSE2 - warp_def 15, 17, 0, 1, MAP_CERULEAN_CITY_HOUSE3 - warp_def 22, 19, 0, 1, MAP_CERULEAN_CITY_POKEMONCENTER_1F - warp_def 31, 21, 0, 1, MAP_CERULEAN_CITY_GYM - warp_def 13, 28, 3, 1, MAP_CERULEAN_CITY_BIKESHOP - warp_def 29, 28, 0, 1, MAP_CERULEAN_CITY_MART - warp_def 1, 12, 0, 0, MAP_CERULEAN_CAVE_1F - warp_def 10, 8, 3, 3, MAP_CERULEAN_CITY_HOUSE1 - warp_def 31, 8, 3, 3, MAP_CERULEAN_CITY_HOUSE2 - warp_def 31, 9, 3, 3, MAP_CERULEAN_CITY_HOUSE2 - warp_def 14, 28, 3, 1, MAP_CERULEAN_CITY_BIKESHOP - warp_def 23, 28, 0, 0, MAP_CERULEAN_CITY_HOUSE4 - warp_def 17, 11, 0, 0, MAP_CERULEAN_CITY_HOUSE5 + warp_def 10, 11, 0, 1, MAP_CERULEAN_CITY_HOUSE1 + warp_def 30, 11, 0, 1, MAP_CERULEAN_CITY_HOUSE2 + warp_def 15, 17, 0, 1, MAP_CERULEAN_CITY_HOUSE3 + warp_def 22, 19, 0, 1, MAP_CERULEAN_CITY_POKEMONCENTER_1F + warp_def 31, 21, 0, 1, MAP_CERULEAN_CITY_GYM + warp_def 13, 28, 3, 1, MAP_CERULEAN_CITY_BIKESHOP + warp_def 29, 28, 0, 1, MAP_CERULEAN_CITY_MART + warp_def 1, 12, 0, 0, MAP_CERULEAN_CAVE_1F + warp_def 10, 8, 3, 3, MAP_CERULEAN_CITY_HOUSE1 + warp_def 31, 8, 3, 3, MAP_CERULEAN_CITY_HOUSE2 + warp_def 31, 9, 3, 3, MAP_CERULEAN_CITY_HOUSE2 + warp_def 14, 28, 3, 1, MAP_CERULEAN_CITY_BIKESHOP + warp_def 23, 28, 0, 0, MAP_CERULEAN_CITY_HOUSE4 + warp_def 17, 11, 0, 0, MAP_CERULEAN_CITY_HOUSE5 CeruleanCity_MapCoordEvents: - coord_event 22, 6, 3, VAR_0x4052, , CeruleanCity_EventScript_16649A - coord_event 23, 6, 3, VAR_0x4052, , CeruleanCity_EventScript_1664A6 - coord_event 24, 6, 3, VAR_0x4052, , CeruleanCity_EventScript_1664B9 - coord_event 33, 5, 3, VAR_0x407D, , CeruleanCity_EventScript_166683 - coord_event 33, 7, 3, VAR_0x407D, , CeruleanCity_EventScript_1666A3 + coord_event 22, 6, 3, VAR_0x4052, , CeruleanCity_EventScript_16649A + coord_event 23, 6, 3, VAR_0x4052, , CeruleanCity_EventScript_1664A6 + coord_event 24, 6, 3, VAR_0x4052, , CeruleanCity_EventScript_1664B9 + coord_event 33, 5, 3, VAR_0x407D, , CeruleanCity_EventScript_166683 + coord_event 33, 7, 3, VAR_0x407D, , CeruleanCity_EventScript_1666A3 CeruleanCity_MapBGEvents: - bg_hidden_item_event 18, 7, 3, ITEM_RARE_CANDY, + bg_hidden_item_event 18, 7, 3, ITEM_RARE_CANDY, CeruleanCity_MapEvents:: - map_events CeruleanCity_EventObjects, CeruleanCity_MapWarps, CeruleanCity_MapCoordEvents, CeruleanCity_MapBGEvents + map_events CeruleanCity_EventObjects, CeruleanCity_MapWarps, CeruleanCity_MapCoordEvents, CeruleanCity_MapBGEvents diff --git a/data/maps/CeruleanCity/scripts.inc b/data/maps/CeruleanCity/scripts.inc index 7f8e62f5b..8677c23f0 100644 --- a/data/maps/CeruleanCity/scripts.inc +++ b/data/maps/CeruleanCity/scripts.inc @@ -1,415 +1,415 @@ CeruleanCity_MapScripts:: @ 8166471 - map_script 3, CeruleanCity_MapScript1_166477 - .byte 0 + map_script 3, CeruleanCity_MapScript1_166477 + .byte 0 CeruleanCity_MapScript1_166477:: @ 8166477 - setworldmapflag 2195 - checkflag FLAG_0x234 - call_if 0, EventScript_166484 - end + setworldmapflag 2195 + checkflag FLAG_0x234 + call_if 0, EventScript_166484 + end EventScript_166484:: @ 8166484 - setobjectxyperm 1, 30, 12 - setobjectxyperm 5, 26, 31 - setobjectxyperm 6, 27, 31 - return + setobjectxyperm 1, 30, 12 + setobjectxyperm 5, 26, 31 + setobjectxyperm 6, 27, 31 + return CeruleanCity_EventScript_16649A:: @ 816649A - lockall - setvar VAR_0x4001, 0 - goto EventScript_1664CC - end + lockall + setvar VAR_0x4001, 0 + goto EventScript_1664CC + end CeruleanCity_EventScript_1664A6:: @ 81664A6 - lockall - setvar VAR_0x4001, 1 - setobjectxyperm 8, 23, 0 - goto EventScript_1664CC - end + lockall + setvar VAR_0x4001, 1 + setobjectxyperm 8, 23, 0 + goto EventScript_1664CC + end CeruleanCity_EventScript_1664B9:: @ 81664B9 - lockall - setvar VAR_0x4001, 2 - setobjectxyperm 8, 24, 0 - goto EventScript_1664CC - end + lockall + setvar VAR_0x4001, 2 + setobjectxyperm 8, 24, 0 + goto EventScript_1664CC + end EventScript_1664CC:: @ 81664CC - textcolor 0 - setvar VAR_0x4054, 2 - playbgm BGM_FRLG_RIVAL, 0 - addobject 8 - applymovement 8, Movement_1665D3 - waitmovement 0 - loadword 0, gUnknown_817EAD7 - callstd 4 - setvar VAR_LAST_TALKED, 8 - compare_var_to_value VAR_STARTER_MON, 2 - call_if 1, EventScript_166582 - compare_var_to_value VAR_STARTER_MON, 1 - call_if 1, EventScript_16658D - compare_var_to_value VAR_STARTER_MON, 0 - call_if 1, EventScript_166598 - setvar VAR_0x8004, 13 - setvar VAR_0x8005, 0 - special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_817EB95 - callstd 4 - closemessage - playbgm BGM_FRLG_RIVAL_POSTBATTLE, 0 - compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_1665A3 - compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_1665A3 - compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_1665B5 - loadword 0, gUnknown_817ECD4 - callstd 4 - setvar VAR_0x4052, 1 - setflag FLAG_0x29B - setorcopyvar VAR_0x8000, 363 - setorcopyvar VAR_0x8001, 1 - callstd 0 - loadword 0, gUnknown_817ED5D - callstd 4 - closemessage - applymovement 8, Movement_1665FB - waitmovement 0 - fadedefaultbgm - removeobject 8 - releaseall - end + textcolor 0 + setvar VAR_0x4054, 2 + playbgm BGM_FRLG_RIVAL, 0 + addobject 8 + applymovement 8, Movement_1665D3 + waitmovement 0 + loadword 0, gUnknown_817EAD7 + callstd 4 + setvar VAR_LAST_TALKED, 8 + compare_var_to_value VAR_STARTER_MON, 2 + call_if 1, EventScript_166582 + compare_var_to_value VAR_STARTER_MON, 1 + call_if 1, EventScript_16658D + compare_var_to_value VAR_STARTER_MON, 0 + call_if 1, EventScript_166598 + setvar VAR_0x8004, 13 + setvar VAR_0x8005, 0 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_817EB95 + callstd 4 + closemessage + playbgm BGM_FRLG_RIVAL_POSTBATTLE, 0 + compare_var_to_value VAR_0x4001, 0 + call_if 1, EventScript_1665A3 + compare_var_to_value VAR_0x4001, 1 + call_if 1, EventScript_1665A3 + compare_var_to_value VAR_0x4001, 2 + call_if 1, EventScript_1665B5 + loadword 0, gUnknown_817ECD4 + callstd 4 + setvar VAR_0x4052, 1 + setflag FLAG_0x29B + setorcopyvar VAR_0x8000, 363 + setorcopyvar VAR_0x8001, 1 + callstd 0 + loadword 0, gUnknown_817ED5D + callstd 4 + closemessage + applymovement 8, Movement_1665FB + waitmovement 0 + fadedefaultbgm + removeobject 8 + releaseall + end EventScript_166582:: @ 8166582 - trainerbattle 3, 332, 0, Text_17EB71 - return + trainerbattle 3, 332, 0, Text_17EB71 + return EventScript_16658D:: @ 816658D - trainerbattle 3, 333, 0, Text_17EB71 - return + trainerbattle 3, 333, 0, Text_17EB71 + return EventScript_166598:: @ 8166598 - trainerbattle 3, 334, 0, Text_17EB71 - return + trainerbattle 3, 334, 0, Text_17EB71 + return EventScript_1665A3:: @ 81665A3 - applymovement 255, Movement_1665C7 - applymovement 8, Movement_1665D9 - waitmovement 0 - return + applymovement 255, Movement_1665C7 + applymovement 8, Movement_1665D9 + waitmovement 0 + return EventScript_1665B5:: @ 81665B5 - applymovement 255, Movement_1665CD - applymovement 8, Movement_1665EA - waitmovement 0 - return + applymovement 255, Movement_1665CD + applymovement 8, Movement_1665EA + waitmovement 0 + return Movement_1665C7:: @ 81665C7 - step_1c - step_1b - step_30 - step_1c - step_2d - step_end + step_1c + step_1b + step_30 + step_1c + step_2d + step_end Movement_1665CD:: @ 81665CD - step_1c - step_1b - step_2f - step_1c - step_2d - step_end + step_1c + step_1b + step_2f + step_1c + step_2d + step_end Movement_1665D3:: @ 81665D3 - step_10 - step_10 - step_10 - step_10 - step_10 - step_end + step_10 + step_10 + step_10 + step_10 + step_10 + step_end Movement_1665D9:: @ 81665D9 - step_13 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_1c - step_1c - step_12 - step_11 - step_11 - step_11 - step_11 - step_11 - step_end + step_13 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_1c + step_1c + step_12 + step_11 + step_11 + step_11 + step_11 + step_11 + step_end Movement_1665EA:: @ 81665EA - step_12 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_1c - step_1c - step_13 - step_11 - step_11 - step_11 - step_11 - step_11 - step_end + step_12 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_1c + step_1c + step_13 + step_11 + step_11 + step_11 + step_11 + step_11 + step_end Movement_1665FB:: @ 81665FB - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_end + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_end CeruleanCity_EventScript_166603:: @ 8166603 - lock - faceplayer - checktrainerflag 355 - goto_if 1, EventScript_16662E - message Text_17EE0E - waitmessage - playbgm BGM_FRLG_SUSPICIOUS_EYE, 0 - waitbuttonpress - trainerbattle 3, 355, 0, Text_17EE70 - setvar VAR_0x407D, 1 - goto EventScript_16662E - end + lock + faceplayer + checktrainerflag 355 + goto_if 1, EventScript_16662E + message Text_17EE0E + waitmessage + playbgm BGM_FRLG_SUSPICIOUS_EYE, 0 + waitbuttonpress + trainerbattle 3, 355, 0, Text_17EE70 + setvar VAR_0x407D, 1 + goto EventScript_16662E + end EventScript_16662E:: @ 816662E - loadword 0, gUnknown_817EE9C - callstd 4 - checkitemspace ITEM_TM28, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_166677 - additem ITEM_TM28, 1 - loadword 0, gUnknown_817EEBF - setorcopyvar VAR_0x8000, 316 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 257 - callstd 9 - loadword 0, gUnknown_817EEED - callstd 4 - closemessage - fadescreen 1 - removeobject 2 - fadescreen 0 - setflag FLAG_0x23F - release - end + loadword 0, gUnknown_817EE9C + callstd 4 + checkitemspace ITEM_TM28, 1 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_166677 + additem ITEM_TM28, 1 + loadword 0, gUnknown_817EEBF + setorcopyvar VAR_0x8000, 316 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 257 + callstd 9 + loadword 0, gUnknown_817EEED + callstd 4 + closemessage + fadescreen 1 + removeobject 2 + fadescreen 0 + setflag FLAG_0x23F + release + end EventScript_166677:: @ 8166677 - textcolor 0 - loadword 0, gUnknown_817EF07 - callstd 4 - release - end + textcolor 0 + loadword 0, gUnknown_817EF07 + callstd 4 + release + end CeruleanCity_EventScript_166683:: @ 8166683 - lockall - setvar VAR_0x4001, 0 - applymovement 2, Movement_1A75E9 - waitmovement 0 - applymovement 255, Movement_1A75ED - waitmovement 0 - goto EventScript_1666C3 - end + lockall + setvar VAR_0x4001, 0 + applymovement 2, Movement_1A75E9 + waitmovement 0 + applymovement 255, Movement_1A75ED + waitmovement 0 + goto EventScript_1666C3 + end CeruleanCity_EventScript_1666A3:: @ 81666A3 - lockall - setvar VAR_0x4001, 1 - applymovement 2, Movement_1A75ED - waitmovement 0 - applymovement 255, Movement_1A75E9 - waitmovement 0 - goto EventScript_1666C3 - end + lockall + setvar VAR_0x4001, 1 + applymovement 2, Movement_1A75ED + waitmovement 0 + applymovement 255, Movement_1A75E9 + waitmovement 0 + goto EventScript_1666C3 + end EventScript_1666C3:: @ 81666C3 - textcolor 0 - loadword 0, Text_17EE0E - callstd 4 - setvar VAR_LAST_TALKED, 2 - trainerbattle 3, 355, 0, Text_17EE70 - setvar VAR_0x407D, 1 - goto EventScript_16662E - end + textcolor 0 + loadword 0, Text_17EE0E + callstd 4 + setvar VAR_LAST_TALKED, 2 + trainerbattle 3, 355, 0, Text_17EE70 + setvar VAR_0x407D, 1 + goto EventScript_16662E + end CeruleanCity_EventScript_1666E7:: @ 81666E7 - lock - faceplayer - loadword 0, gUnknown_817F0F1 - callstd 4 - closemessage - applymovement 1, Movement_1A75E5 - waitmovement 0 - release - end + lock + faceplayer + loadword 0, gUnknown_817F0F1 + callstd 4 + closemessage + applymovement 1, Movement_1A75E5 + waitmovement 0 + release + end CeruleanCity_EventScript_1666FE:: @ 81666FE - lock - faceplayer - checkflag FLAG_0x234 - goto_if 1, EventScript_166713 - loadword 0, gUnknown_817F01D - callstd 4 - release - end + lock + faceplayer + checkflag FLAG_0x234 + goto_if 1, EventScript_166713 + loadword 0, gUnknown_817F01D + callstd 4 + release + end EventScript_166713:: @ 8166713 - loadword 0, gUnknown_817EF89 - callstd 4 - release - end + loadword 0, gUnknown_817EF89 + callstd 4 + release + end CeruleanCity_EventScript_16671D:: @ 816671D - loadword 0, gUnknown_817F0B2 - callstd 2 - end + loadword 0, gUnknown_817F0B2 + callstd 2 + end CeruleanCity_EventScript_166726:: @ 8166726 - loadword 0, gUnknown_817EF3F - callstd 2 - end + loadword 0, gUnknown_817EF3F + callstd 2 + end CeruleanCity_EventScript_16672F:: @ 816672F - loadword 0, gUnknown_817F319 - callstd 2 - end + loadword 0, gUnknown_817F319 + callstd 2 + end CeruleanCity_EventScript_166738:: @ 8166738 - lock - faceplayer - loadword 0, gUnknown_817F2CF - callstd 4 - closemessage - applymovement 11, Movement_1A75E5 - waitmovement 0 - release - end + lock + faceplayer + loadword 0, gUnknown_817F2CF + callstd 4 + closemessage + applymovement 11, Movement_1A75E5 + waitmovement 0 + release + end CeruleanCity_EventScript_16674F:: @ 816674F - lock - random 3 - copyvar VAR_0x8008, VAR_RESULT - compare_var_to_value VAR_0x8008, 0 - call_if 1, EventScript_1667B0 - compare_var_to_value VAR_0x8008, 1 - call_if 1, EventScript_1667B6 - compare_var_to_value VAR_0x8008, 2 - call_if 1, EventScript_1667BC - waitmessage - delay 40 - playse SE_PIN - applymovement 5, Movement_1A75D9 - waitmovement 0 - delay 30 - compare_var_to_value VAR_0x8008, 0 - call_if 1, EventScript_1667C2 - compare_var_to_value VAR_0x8008, 1 - call_if 1, EventScript_1667CB - compare_var_to_value VAR_0x8008, 2 - call_if 1, EventScript_1667D4 - release - end + lock + random 3 + copyvar VAR_0x8008, VAR_RESULT + compare_var_to_value VAR_0x8008, 0 + call_if 1, EventScript_1667B0 + compare_var_to_value VAR_0x8008, 1 + call_if 1, EventScript_1667B6 + compare_var_to_value VAR_0x8008, 2 + call_if 1, EventScript_1667BC + waitmessage + delay 40 + playse SE_PIN + applymovement 5, Movement_1A75D9 + waitmovement 0 + delay 30 + compare_var_to_value VAR_0x8008, 0 + call_if 1, EventScript_1667C2 + compare_var_to_value VAR_0x8008, 1 + call_if 1, EventScript_1667CB + compare_var_to_value VAR_0x8008, 2 + call_if 1, EventScript_1667D4 + release + end EventScript_1667B0:: @ 81667B0 - message Text_17F183 - return + message Text_17F183 + return EventScript_1667B6:: @ 81667B6 - message Text_17F1C2 - return + message Text_17F1C2 + return EventScript_1667BC:: @ 81667BC - message Text_17F1E9 - return + message Text_17F1E9 + return EventScript_1667C2:: @ 81667C2 - loadword 0, gUnknown_817F1A1 - callstd 4 - return + loadword 0, gUnknown_817F1A1 + callstd 4 + return EventScript_1667CB:: @ 81667CB - loadword 0, gUnknown_817F1D2 - callstd 4 - return + loadword 0, gUnknown_817F1D2 + callstd 4 + return EventScript_1667D4:: @ 81667D4 - loadword 0, gUnknown_817F1FC - callstd 4 - return + loadword 0, gUnknown_817F1FC + callstd 4 + return CeruleanCity_EventScript_1667DD:: @ 81667DD - lock - random 4 - copyvar VAR_0x8008, VAR_RESULT - compare_var_to_value VAR_0x8008, 0 - call_if 1, EventScript_166814 - compare_var_to_value VAR_0x8008, 1 - call_if 1, EventScript_16681D - compare_var_to_value VAR_0x8008, 2 - call_if 1, EventScript_166826 - compare_var_to_value VAR_0x8008, 3 - call_if 1, EventScript_16682F - release - end + lock + random 4 + copyvar VAR_0x8008, VAR_RESULT + compare_var_to_value VAR_0x8008, 0 + call_if 1, EventScript_166814 + compare_var_to_value VAR_0x8008, 1 + call_if 1, EventScript_16681D + compare_var_to_value VAR_0x8008, 2 + call_if 1, EventScript_166826 + compare_var_to_value VAR_0x8008, 3 + call_if 1, EventScript_16682F + release + end EventScript_166814:: @ 8166814 - loadword 0, gUnknown_817F270 - callstd 4 - return + loadword 0, gUnknown_817F270 + callstd 4 + return EventScript_16681D:: @ 816681D - loadword 0, gUnknown_817F287 - callstd 4 - return + loadword 0, gUnknown_817F287 + callstd 4 + return EventScript_166826:: @ 8166826 - loadword 0, gUnknown_817F2A2 - callstd 4 - return + loadword 0, gUnknown_817F2A2 + callstd 4 + return EventScript_16682F:: @ 816682F - loadword 0, gUnknown_817F2B7 - callstd 4 - return + loadword 0, gUnknown_817F2B7 + callstd 4 + return CeruleanCity_EventScript_166838:: @ 8166838 - loadword 0, gUnknown_817F420 - callstd 3 - end + loadword 0, gUnknown_817F420 + callstd 3 + end CeruleanCity_EventScript_166841:: @ 8166841 - loadword 0, gUnknown_817F453 - callstd 3 - end + loadword 0, gUnknown_817F453 + callstd 3 + end CeruleanCity_EventScript_16684A:: @ 816684A - loadword 0, gUnknown_817F4C5 - callstd 3 - end + loadword 0, gUnknown_817F4C5 + callstd 3 + end CeruleanCity_EventScript_166853:: @ 8166853 - lockall - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 0 - special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_817F4EF - callstd 4 - releaseall - end + lockall + setvar VAR_0x8004, 3 + setvar VAR_0x8005, 0 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_817F4EF + callstd 4 + releaseall + end diff --git a/data/maps/CeruleanCity_BikeShop/scripts.inc b/data/maps/CeruleanCity_BikeShop/scripts.inc index 7999511ef..80a25d69e 100644 --- a/data/maps/CeruleanCity_BikeShop/scripts.inc +++ b/data/maps/CeruleanCity_BikeShop/scripts.inc @@ -1,92 +1,92 @@ CeruleanCity_BikeShop_MapScripts:: @ 816ABBC - .byte 0 + .byte 0 CeruleanCity_BikeShop_EventScript_16ABBD:: @ 816ABBD - lock - faceplayer - checkflag FLAG_0x271 - goto_if 1, EventScript_16AC58 - checkflag FLAG_0x241 - goto_if 1, EventScript_16AC22 - showmoneybox 0, 0, 0 - message Text_192755 - waitmessage - multichoice 11, 0, 13, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_16AC07 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16AC15 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_16AC15 - end + lock + faceplayer + checkflag FLAG_0x271 + goto_if 1, EventScript_16AC58 + checkflag FLAG_0x241 + goto_if 1, EventScript_16AC22 + showmoneybox 0, 0, 0 + message Text_192755 + waitmessage + multichoice 11, 0, 13, 0 + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_16AC07 + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_16AC15 + compare_var_to_value VAR_0x8000, 127 + goto_if 1, EventScript_16AC15 + end EventScript_16AC07:: @ 816AC07 - loadword 0, gUnknown_8192796 - callstd 4 - goto EventScript_16AC15 - end + loadword 0, gUnknown_8192796 + callstd 4 + goto EventScript_16AC15 + end EventScript_16AC15:: @ 816AC15 - loadword 0, gUnknown_819280E - callstd 4 - hidemoneybox - .byte 0 - .byte 0 - release - end + loadword 0, gUnknown_819280E + callstd 4 + hidemoneybox + .byte 0 + .byte 0 + release + end EventScript_16AC22:: @ 816AC22 - loadword 0, gUnknown_81927B2 - callstd 4 - loadword 0, gUnknown_81927E1 - setorcopyvar VAR_0x8000, 360 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 318 - callstd 9 - setflag FLAG_0x271 - additem ITEM_BICYCLE, 1 - removeitem ITEM_BIKE_VOUCHER, 1 - loadword 0, gUnknown_819280E - callstd 4 - release - end + loadword 0, gUnknown_81927B2 + callstd 4 + loadword 0, gUnknown_81927E1 + setorcopyvar VAR_0x8000, 360 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 318 + callstd 9 + setflag FLAG_0x271 + additem ITEM_BICYCLE, 1 + removeitem ITEM_BIKE_VOUCHER, 1 + loadword 0, gUnknown_819280E + callstd 4 + release + end EventScript_16AC58:: @ 816AC58 - loadword 0, gUnknown_8192833 - callstd 4 - release - end + loadword 0, gUnknown_8192833 + callstd 4 + release + end EventScript_16AC62:: @ 816AC62 - loadword 0, gUnknown_81928A8 - callstd 4 - release - end + loadword 0, gUnknown_81928A8 + callstd 4 + release + end CeruleanCity_BikeShop_EventScript_16AC6C:: @ 816AC6C - loadword 0, gUnknown_81928CF - callstd 2 - end + loadword 0, gUnknown_81928CF + callstd 2 + end CeruleanCity_BikeShop_EventScript_16AC75:: @ 816AC75 - lock - faceplayer - checkflag FLAG_0x271 - goto_if 1, EventScript_16AC8A - loadword 0, gUnknown_8192937 - callstd 4 - release - end + lock + faceplayer + checkflag FLAG_0x271 + goto_if 1, EventScript_16AC8A + loadword 0, gUnknown_8192937 + callstd 4 + release + end EventScript_16AC8A:: @ 816AC8A - loadword 0, gUnknown_8192968 - callstd 4 - release - end + loadword 0, gUnknown_8192968 + callstd 4 + release + end CeruleanCity_BikeShop_EventScript_16AC94:: @ 816AC94 CeruleanCity_EventScript_16AC94:: @ 816AC94 - loadword 0, gUnknown_81929AD - callstd 3 - end + loadword 0, gUnknown_81929AD + callstd 3 + end diff --git a/data/maps/CeruleanCity_Gym/scripts.inc b/data/maps/CeruleanCity_Gym/scripts.inc index 850e8b23d..46a11bc54 100644 --- a/data/maps/CeruleanCity_Gym/scripts.inc +++ b/data/maps/CeruleanCity_Gym/scripts.inc @@ -1,96 +1,96 @@ CeruleanCity_Gym_MapScripts:: @ 816AAA0 - .byte 0 + .byte 0 CeruleanCity_Gym_EventScript_16AAA1:: @ 816AAA1 - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 2 - special UpdatePickStateFromSpecialVar8005 - trainerbattle 1, 415, 0, Text_1921EF, Text_19242D, EventScript_16AAD3 - checkflag FLAG_0x297 - goto_if 0, EventScript_16AAF9 - loadword 0, gUnknown_81922BF - callstd 4 - release - end + setvar VAR_0x8004, 3 + setvar VAR_0x8005, 2 + special UpdatePickStateFromSpecialVar8005 + trainerbattle 1, 415, 0, Text_1921EF, Text_19242D, EventScript_16AAD3 + checkflag FLAG_0x297 + goto_if 0, EventScript_16AAF9 + loadword 0, gUnknown_81922BF + callstd 4 + release + end EventScript_16AAD3:: @ 816AAD3 - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 1 - special SetFlavorTextFlagFromSpecialVars - setflag FLAG_0x4B1 - setflag 2081 - setrespawn 4 - setvar VAR_0x8008, 2 - call EventScript_1A6B18 - goto EventScript_16AAF9 - end + setvar VAR_0x8004, 3 + setvar VAR_0x8005, 1 + special SetFlavorTextFlagFromSpecialVars + setflag FLAG_0x4B1 + setflag 2081 + setrespawn 4 + setvar VAR_0x8008, 2 + call EventScript_1A6B18 + goto EventScript_16AAF9 + end EventScript_16AAF9:: @ 816AAF9 - loadword 0, gUnknown_81922F7 - callstd 4 - checkitemspace ITEM_TM03, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16AB3A - additem ITEM_TM03, 1 - loadword 0, gUnknown_81923F1 - setorcopyvar VAR_0x8000, 291 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 257 - callstd 9 - setflag FLAG_0x297 - loadword 0, gUnknown_81922BF - callstd 4 - release - end + loadword 0, gUnknown_81922F7 + callstd 4 + checkitemspace ITEM_TM03, 1 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16AB3A + additem ITEM_TM03, 1 + loadword 0, gUnknown_81923F1 + setorcopyvar VAR_0x8000, 291 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 257 + callstd 9 + setflag FLAG_0x297 + loadword 0, gUnknown_81922BF + callstd 4 + release + end EventScript_16AB3A:: @ 816AB3A - loadword 0, gUnknown_819240E - callstd 4 - release - end + loadword 0, gUnknown_819240E + callstd 4 + release + end CeruleanCity_Gym_EventScript_16AB44:: @ 816AB44 - trainerbattle 0, 150, 0, Text_192481, Text_1924D0 - loadword 0, gUnknown_81924E4 - callstd 6 - end + trainerbattle 0, 150, 0, Text_192481, Text_1924D0 + loadword 0, gUnknown_81924E4 + callstd 6 + end CeruleanCity_Gym_EventScript_16AB5B:: @ 816AB5B - trainerbattle 0, 234, 0, Text_192524, Text_192547 - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 2 - special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_8192556 - callstd 6 - end + trainerbattle 0, 234, 0, Text_192524, Text_192547 + setvar VAR_0x8004, 3 + setvar VAR_0x8005, 2 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_8192556 + callstd 6 + end CeruleanCity_Gym_EventScript_16AB7F:: @ 816AB7F - lock - faceplayer - checkflag FLAG_0x4B1 - goto_if 1, EventScript_16AB94 - loadword 0, gUnknown_81925AC - callstd 4 - release - end + lock + faceplayer + checkflag FLAG_0x4B1 + goto_if 1, EventScript_16AB94 + loadword 0, gUnknown_81925AC + callstd 4 + release + end EventScript_16AB94:: @ 816AB94 - loadword 0, gUnknown_8192688 - callstd 4 - release - end + loadword 0, gUnknown_8192688 + callstd 4 + release + end CeruleanCity_Gym_EventScript_16AB9E:: @ 816AB9E - lockall - checkflag 2081 - goto_if 1, EventScript_16ABB2 - loadword 0, gUnknown_81926E1 - callstd 4 - releaseall - end + lockall + checkflag 2081 + goto_if 1, EventScript_16ABB2 + loadword 0, gUnknown_81926E1 + callstd 4 + releaseall + end EventScript_16ABB2:: @ 816ABB2 - loadword 0, gUnknown_8192719 - callstd 4 - releaseall - end + loadword 0, gUnknown_8192719 + callstd 4 + releaseall + end diff --git a/data/maps/CeruleanCity_House1/scripts.inc b/data/maps/CeruleanCity_House1/scripts.inc index 1e42bbe80..28be7121e 100644 --- a/data/maps/CeruleanCity_House1/scripts.inc +++ b/data/maps/CeruleanCity_House1/scripts.inc @@ -1,121 +1,121 @@ CeruleanCity_House1_MapScripts:: @ 816A7EF - .byte 0 + .byte 0 CeruleanCity_House1_EventScript_16A7F0:: @ 816A7F0 - lock - faceplayer - loadword 0, gUnknown_81918E7 - callstd 4 - message Text_191967 - waitmessage - setvar VAR_0x8004, 0 - special sub_80CB7C4 - waitstate - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_16A8FB - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16A909 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_16A917 - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_16A925 - compare_var_to_value VAR_0x8000, 4 - goto_if 1, EventScript_16A933 - compare_var_to_value VAR_0x8000, 5 - goto_if 1, EventScript_16A941 - compare_var_to_value VAR_0x8000, 6 - goto_if 1, EventScript_16A94F - compare_var_to_value VAR_0x8000, 7 - goto_if 1, EventScript_16A95D - compare_var_to_value VAR_0x8000, 8 - goto_if 1, EventScript_16A96B - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_16A96B - end + lock + faceplayer + loadword 0, gUnknown_81918E7 + callstd 4 + message Text_191967 + waitmessage + setvar VAR_0x8004, 0 + special sub_80CB7C4 + waitstate + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_16A8FB + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_16A909 + compare_var_to_value VAR_0x8000, 2 + goto_if 1, EventScript_16A917 + compare_var_to_value VAR_0x8000, 3 + goto_if 1, EventScript_16A925 + compare_var_to_value VAR_0x8000, 4 + goto_if 1, EventScript_16A933 + compare_var_to_value VAR_0x8000, 5 + goto_if 1, EventScript_16A941 + compare_var_to_value VAR_0x8000, 6 + goto_if 1, EventScript_16A94F + compare_var_to_value VAR_0x8000, 7 + goto_if 1, EventScript_16A95D + compare_var_to_value VAR_0x8000, 8 + goto_if 1, EventScript_16A96B + compare_var_to_value VAR_0x8000, 127 + goto_if 1, EventScript_16A96B + end EventScript_16A87D:: @ 816A87D - message Text_191967 - waitmessage - special sub_80CBC5C - waitstate - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_16A8FB - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16A909 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_16A917 - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_16A925 - compare_var_to_value VAR_0x8000, 4 - goto_if 1, EventScript_16A933 - compare_var_to_value VAR_0x8000, 5 - goto_if 1, EventScript_16A941 - compare_var_to_value VAR_0x8000, 6 - goto_if 1, EventScript_16A94F - compare_var_to_value VAR_0x8000, 7 - goto_if 1, EventScript_16A95D - compare_var_to_value VAR_0x8000, 8 - goto_if 1, EventScript_16A96B - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_16A96B - end + message Text_191967 + waitmessage + special sub_80CBC5C + waitstate + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_16A8FB + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_16A909 + compare_var_to_value VAR_0x8000, 2 + goto_if 1, EventScript_16A917 + compare_var_to_value VAR_0x8000, 3 + goto_if 1, EventScript_16A925 + compare_var_to_value VAR_0x8000, 4 + goto_if 1, EventScript_16A933 + compare_var_to_value VAR_0x8000, 5 + goto_if 1, EventScript_16A941 + compare_var_to_value VAR_0x8000, 6 + goto_if 1, EventScript_16A94F + compare_var_to_value VAR_0x8000, 7 + goto_if 1, EventScript_16A95D + compare_var_to_value VAR_0x8000, 8 + goto_if 1, EventScript_16A96B + compare_var_to_value VAR_0x8000, 127 + goto_if 1, EventScript_16A96B + end EventScript_16A8FB:: @ 816A8FB - loadword 0, gUnknown_81919BE - callstd 4 - goto EventScript_16A87D - end + loadword 0, gUnknown_81919BE + callstd 4 + goto EventScript_16A87D + end EventScript_16A909:: @ 816A909 - loadword 0, gUnknown_8191A31 - callstd 4 - goto EventScript_16A87D - end + loadword 0, gUnknown_8191A31 + callstd 4 + goto EventScript_16A87D + end EventScript_16A917:: @ 816A917 - loadword 0, gUnknown_8191AF9 - callstd 4 - goto EventScript_16A87D - end + loadword 0, gUnknown_8191AF9 + callstd 4 + goto EventScript_16A87D + end EventScript_16A925:: @ 816A925 - loadword 0, gUnknown_8191B69 - callstd 4 - goto EventScript_16A87D - end + loadword 0, gUnknown_8191B69 + callstd 4 + goto EventScript_16A87D + end EventScript_16A933:: @ 816A933 - loadword 0, gUnknown_8191C36 - callstd 4 - goto EventScript_16A87D - end + loadword 0, gUnknown_8191C36 + callstd 4 + goto EventScript_16A87D + end EventScript_16A941:: @ 816A941 - loadword 0, gUnknown_8191CA9 - callstd 4 - goto EventScript_16A87D - end + loadword 0, gUnknown_8191CA9 + callstd 4 + goto EventScript_16A87D + end EventScript_16A94F:: @ 816A94F - loadword 0, gUnknown_8191D78 - callstd 4 - goto EventScript_16A87D + loadword 0, gUnknown_8191D78 + callstd 4 + goto EventScript_16A87D EventScript_16A95C:: @ 816A95C - end + end EventScript_16A95D:: @ 816A95D - loadword 0, gUnknown_8191DF8 - callstd 4 - goto EventScript_16A87D + loadword 0, gUnknown_8191DF8 + callstd 4 + goto EventScript_16A87D EventScript_16A96A:: @ 816A96A - end + end EventScript_16A96B:: @ 816A96B - loadword 0, gUnknown_819199E - callstd 4 - release - end + loadword 0, gUnknown_819199E + callstd 4 + release + end diff --git a/data/maps/CeruleanCity_House2/scripts.inc b/data/maps/CeruleanCity_House2/scripts.inc index 3d098c13a..555b048dc 100644 --- a/data/maps/CeruleanCity_House2/scripts.inc +++ b/data/maps/CeruleanCity_House2/scripts.inc @@ -1,28 +1,28 @@ CeruleanCity_House2_MapScripts:: @ 816A975 - .byte 0 + .byte 0 CeruleanCity_House2_EventScript_16A976:: @ 816A976 - lock - faceplayer - checkflag FLAG_0x23F - goto_if 1, EventScript_16A98B - loadword 0, gUnknown_8191E13 - callstd 4 - release - end + lock + faceplayer + checkflag FLAG_0x23F + goto_if 1, EventScript_16A98B + loadword 0, gUnknown_8191E13 + callstd 4 + release + end EventScript_16A98B:: @ 816A98B - loadword 0, gUnknown_8191ED8 - callstd 4 - release - end + loadword 0, gUnknown_8191ED8 + callstd 4 + release + end CeruleanCity_House2_EventScript_16A995:: @ 816A995 - loadword 0, gUnknown_8191F2A - callstd 2 - end + loadword 0, gUnknown_8191F2A + callstd 2 + end CeruleanCity_House2_EventScript_16A99E:: @ 816A99E - loadword 0, gUnknown_8191F64 - callstd 3 - end + loadword 0, gUnknown_8191F64 + callstd 3 + end diff --git a/data/maps/CeruleanCity_House3/scripts.inc b/data/maps/CeruleanCity_House3/scripts.inc index 91037b14c..efa46f2a4 100644 --- a/data/maps/CeruleanCity_House3/scripts.inc +++ b/data/maps/CeruleanCity_House3/scripts.inc @@ -1,50 +1,50 @@ CeruleanCity_House3_MapScripts:: @ 816A9A7 - .byte 0 + .byte 0 CeruleanCity_House3_EventScript_16A9A8:: @ 816A9A8 - loadword 0, gUnknown_8191F80 - callstd 2 - end + loadword 0, gUnknown_8191F80 + callstd 2 + end CeruleanCity_House3_EventScript_16A9B1:: @ 816A9B1 - lock - faceplayer - setvar VAR_0x8008, 1 - call EventScript_1A8CAD - checkflag FLAG_0x24A - goto_if 1, EventScript_16AA23 - loadword 0, gUnknown_81A59FE - callstd 5 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16AA0B - call EventScript_1A8CBD - compare_var_to_value VAR_0x8004, 6 - goto_if 4, EventScript_16AA0B - call EventScript_1A8CC9 - compare_var_to_var VAR_RESULT, VAR_0x8009 - goto_if 5, EventScript_16AA15 - call EventScript_1A8CD9 - loadword 0, gUnknown_81A5A9D - callstd 4 - setflag FLAG_0x24A - release - end + lock + faceplayer + setvar VAR_0x8008, 1 + call EventScript_1A8CAD + checkflag FLAG_0x24A + goto_if 1, EventScript_16AA23 + loadword 0, gUnknown_81A59FE + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16AA0B + call EventScript_1A8CBD + compare_var_to_value VAR_0x8004, 6 + goto_if 4, EventScript_16AA0B + call EventScript_1A8CC9 + compare_var_to_var VAR_RESULT, VAR_0x8009 + goto_if 5, EventScript_16AA15 + call EventScript_1A8CD9 + loadword 0, gUnknown_81A5A9D + callstd 4 + setflag FLAG_0x24A + release + end EventScript_16AA0B:: @ 816AA0B - loadword 0, gUnknown_81A5A4E - callstd 4 - release - end + loadword 0, gUnknown_81A5A4E + callstd 4 + release + end EventScript_16AA15:: @ 816AA15 - getspeciesname 0, 32777 - loadword 0, gUnknown_81A5A6A - callstd 4 - release - end + getspeciesname 0, 32777 + loadword 0, gUnknown_81A5A6A + callstd 4 + release + end EventScript_16AA23:: @ 816AA23 - loadword 0, gUnknown_81A5AA5 - callstd 4 - release - end + loadword 0, gUnknown_81A5AA5 + callstd 4 + release + end diff --git a/data/maps/CeruleanCity_House4/scripts.inc b/data/maps/CeruleanCity_House4/scripts.inc index ffda63cab..4e53e091f 100644 --- a/data/maps/CeruleanCity_House4/scripts.inc +++ b/data/maps/CeruleanCity_House4/scripts.inc @@ -1,112 +1,112 @@ CeruleanCity_House4_MapScripts:: @ 816ACEE - .byte 0 + .byte 0 CeruleanCity_House4_EventScript_16ACEF:: @ 816ACEF - special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 - special sub_8112364 - lock - specialvar VAR_0x8004, sub_8146CE8 - copyvar VAR_0x8008, VAR_RESULT - compare_var_to_value VAR_0x8004, 0 - goto_if 1, EventScript_16AD59 - compare_var_to_value VAR_0x8004, 1 - goto_if 1, EventScript_16AD63 - compare_var_to_value VAR_0x8004, 2 - goto_if 1, EventScript_16AD89 - compare_var_to_value VAR_0x8004, 3 - goto_if 1, EventScript_16ADAF - compare_var_to_value VAR_0x8004, 4 - goto_if 1, EventScript_16ADC3 - compare_var_to_value VAR_0x8004, 5 - goto_if 1, EventScript_16ADE9 - compare_var_to_value VAR_0x8004, 6 - goto_if 1, EventScript_16AE0F - end + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + special sub_8112364 + lock + specialvar VAR_0x8004, sub_8146CE8 + copyvar VAR_0x8008, VAR_RESULT + compare_var_to_value VAR_0x8004, 0 + goto_if 1, EventScript_16AD59 + compare_var_to_value VAR_0x8004, 1 + goto_if 1, EventScript_16AD63 + compare_var_to_value VAR_0x8004, 2 + goto_if 1, EventScript_16AD89 + compare_var_to_value VAR_0x8004, 3 + goto_if 1, EventScript_16ADAF + compare_var_to_value VAR_0x8004, 4 + goto_if 1, EventScript_16ADC3 + compare_var_to_value VAR_0x8004, 5 + goto_if 1, EventScript_16ADE9 + compare_var_to_value VAR_0x8004, 6 + goto_if 1, EventScript_16AE0F + end EventScript_16AD59:: @ 816AD59 - loadword 0, gUnknown_8192AF0 - callstd 4 - release - end + loadword 0, gUnknown_8192AF0 + callstd 4 + release + end EventScript_16AD63:: @ 816AD63 - call EventScript_16AE23 - loadword 0, gUnknown_8192B43 - callstd 4 - setorcopyvar VAR_0x8000, VAR_0x8008 - setorcopyvar VAR_0x8001, 1 - callstd 0 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16AE45 - release - end + call EventScript_16AE23 + loadword 0, gUnknown_8192B43 + callstd 4 + setorcopyvar VAR_0x8000, VAR_0x8008 + setorcopyvar VAR_0x8001, 1 + callstd 0 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16AE45 + release + end EventScript_16AD89:: @ 816AD89 - call EventScript_16AE23 - loadword 0, gUnknown_8192C07 - callstd 4 - setorcopyvar VAR_0x8000, VAR_0x8008 - setorcopyvar VAR_0x8001, 4 - callstd 0 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16AE45 - release - end + call EventScript_16AE23 + loadword 0, gUnknown_8192C07 + callstd 4 + setorcopyvar VAR_0x8000, VAR_0x8008 + setorcopyvar VAR_0x8001, 4 + callstd 0 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16AE45 + release + end EventScript_16ADAF:: @ 816ADAF - applymovement 1, Movement_1A75E1 - waitmovement 0 - loadword 0, gUnknown_8192CD5 - callstd 4 - release - end + applymovement 1, Movement_1A75E1 + waitmovement 0 + loadword 0, gUnknown_8192CD5 + callstd 4 + release + end EventScript_16ADC3:: @ 816ADC3 - call EventScript_16AE23 - loadword 0, gUnknown_8192D4B - callstd 4 - setorcopyvar VAR_0x8000, VAR_0x8008 - setorcopyvar VAR_0x8001, 1 - callstd 0 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16AE45 - release - end + call EventScript_16AE23 + loadword 0, gUnknown_8192D4B + callstd 4 + setorcopyvar VAR_0x8000, VAR_0x8008 + setorcopyvar VAR_0x8001, 1 + callstd 0 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16AE45 + release + end EventScript_16ADE9:: @ 816ADE9 - call EventScript_16AE23 - loadword 0, gUnknown_8192DE3 - callstd 4 - setorcopyvar VAR_0x8000, VAR_0x8008 - setorcopyvar VAR_0x8001, 4 - callstd 0 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16AE45 - release - end + call EventScript_16AE23 + loadword 0, gUnknown_8192DE3 + callstd 4 + setorcopyvar VAR_0x8000, VAR_0x8008 + setorcopyvar VAR_0x8001, 4 + callstd 0 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16AE45 + release + end EventScript_16AE0F:: @ 816AE0F - applymovement 1, Movement_1A75E1 - waitmovement 0 - loadword 0, gUnknown_8192EC5 - callstd 4 - release - end + applymovement 1, Movement_1A75E1 + waitmovement 0 + loadword 0, gUnknown_8192EC5 + callstd 4 + release + end EventScript_16AE23:: @ 816AE23 - playse SE_PIN - applymovement 1, Movement_1A75DB - waitmovement 0 - applymovement 1, Movement_1A75E1 - waitmovement 0 - applymovement 1, Movement_1A75DD - waitmovement 0 - return + playse SE_PIN + applymovement 1, Movement_1A75DB + waitmovement 0 + applymovement 1, Movement_1A75E1 + waitmovement 0 + applymovement 1, Movement_1A75DD + waitmovement 0 + return EventScript_16AE45:: @ 816AE45 - loadword 0, gUnknown_8192F2A - callstd 4 - release - end + loadword 0, gUnknown_8192F2A + callstd 4 + release + end diff --git a/data/maps/CeruleanCity_House5/scripts.inc b/data/maps/CeruleanCity_House5/scripts.inc index 081499778..438ee6859 100644 --- a/data/maps/CeruleanCity_House5/scripts.inc +++ b/data/maps/CeruleanCity_House5/scripts.inc @@ -1,214 +1,214 @@ CeruleanCity_House5_MapScripts:: @ 816AE4F - .byte 0 + .byte 0 CeruleanCity_House5_EventScript_16AE50:: @ 816AE50 - lock - faceplayer - checkflag FLAG_0x2BB - goto_if 1, EventScript_16AEB7 - loadword 0, gUnknown_8192F67 - callstd 5 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16AEAD - checkflag 2119 - goto_if 0, EventScript_16AEA3 - loadword 0, gUnknown_8193003 - callstd 4 - setflag FLAG_0x2BB - setorcopyvar VAR_0x8000, 372 - setorcopyvar VAR_0x8001, 1 - callstd 0 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1A6BF9 - loadword 0, gUnknown_8193033 - callstd 4 - release - end + lock + faceplayer + checkflag FLAG_0x2BB + goto_if 1, EventScript_16AEB7 + loadword 0, gUnknown_8192F67 + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16AEAD + checkflag 2119 + goto_if 0, EventScript_16AEA3 + loadword 0, gUnknown_8193003 + callstd 4 + setflag FLAG_0x2BB + setorcopyvar VAR_0x8000, 372 + setorcopyvar VAR_0x8001, 1 + callstd 0 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_1A6BF9 + loadword 0, gUnknown_8193033 + callstd 4 + release + end EventScript_16AEA3:: @ 816AEA3 - loadword 0, gUnknown_819321D - callstd 4 - release - end + loadword 0, gUnknown_819321D + callstd 4 + release + end EventScript_16AEAD:: @ 816AEAD - loadword 0, gUnknown_819325E - callstd 4 - release - end + loadword 0, gUnknown_819325E + callstd 4 + release + end EventScript_16AEB7:: @ 816AEB7 - special sub_815F094 - loadword 0, gUnknown_81932C5 - callstd 4 - goto EventScript_16AEC8 - end + special sub_815F094 + loadword 0, gUnknown_81932C5 + callstd 4 + goto EventScript_16AEC8 + end EventScript_16AEC8:: @ 816AEC8 - message Text_1932F4 - waitmessage - setvar VAR_0x8004, 5 - special sub_80CB7C4 - waitstate - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_16AF6C - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16AF80 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_16AF94 - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_16AFA8 - compare_var_to_value VAR_0x8000, 4 - goto_if 1, EventScript_16AFBC - compare_var_to_value VAR_0x8000, 5 - goto_if 1, EventScript_16AFD0 - compare_var_to_value VAR_0x8000, 6 - goto_if 1, EventScript_16AFE4 - compare_var_to_value VAR_0x8000, 7 - goto_if 1, EventScript_16AFF8 - compare_var_to_value VAR_0x8000, 8 - goto_if 1, EventScript_16B00C - compare_var_to_value VAR_0x8000, 9 - goto_if 1, EventScript_16B020 - compare_var_to_value VAR_0x8000, 10 - goto_if 1, EventScript_16B034 - compare_var_to_value VAR_0x8000, 11 - goto_if 1, EventScript_16B048 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_16B048 - end + message Text_1932F4 + waitmessage + setvar VAR_0x8004, 5 + special sub_80CB7C4 + waitstate + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_16AF6C + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_16AF80 + compare_var_to_value VAR_0x8000, 2 + goto_if 1, EventScript_16AF94 + compare_var_to_value VAR_0x8000, 3 + goto_if 1, EventScript_16AFA8 + compare_var_to_value VAR_0x8000, 4 + goto_if 1, EventScript_16AFBC + compare_var_to_value VAR_0x8000, 5 + goto_if 1, EventScript_16AFD0 + compare_var_to_value VAR_0x8000, 6 + goto_if 1, EventScript_16AFE4 + compare_var_to_value VAR_0x8000, 7 + goto_if 1, EventScript_16AFF8 + compare_var_to_value VAR_0x8000, 8 + goto_if 1, EventScript_16B00C + compare_var_to_value VAR_0x8000, 9 + goto_if 1, EventScript_16B020 + compare_var_to_value VAR_0x8000, 10 + goto_if 1, EventScript_16B034 + compare_var_to_value VAR_0x8000, 11 + goto_if 1, EventScript_16B048 + compare_var_to_value VAR_0x8000, 127 + goto_if 1, EventScript_16B048 + end EventScript_16AF6C:: @ 816AF6C - getitemname 0, ITEM_ENERGY_POWDER - setvar VAR_0x8008, 30 - setvar VAR_0x8009, 50 - goto EventScript_16B055 - end + getitemname 0, ITEM_ENERGY_POWDER + setvar VAR_0x8008, 30 + setvar VAR_0x8009, 50 + goto EventScript_16B055 + end EventScript_16AF80:: @ 816AF80 - getitemname 0, ITEM_ENERGY_ROOT - setvar VAR_0x8008, 31 - setvar VAR_0x8009, 80 - goto EventScript_16B055 - end + getitemname 0, ITEM_ENERGY_ROOT + setvar VAR_0x8008, 31 + setvar VAR_0x8009, 80 + goto EventScript_16B055 + end EventScript_16AF94:: @ 816AF94 - getitemname 0, ITEM_HEAL_POWDER - setvar VAR_0x8008, 32 - setvar VAR_0x8009, 50 - goto EventScript_16B055 - end + getitemname 0, ITEM_HEAL_POWDER + setvar VAR_0x8008, 32 + setvar VAR_0x8009, 50 + goto EventScript_16B055 + end EventScript_16AFA8:: @ 816AFA8 - getitemname 0, ITEM_REVIVAL_HERB - setvar VAR_0x8008, 33 - setvar VAR_0x8009, 300 - goto EventScript_16B055 - end + getitemname 0, ITEM_REVIVAL_HERB + setvar VAR_0x8008, 33 + setvar VAR_0x8009, 300 + goto EventScript_16B055 + end EventScript_16AFBC:: @ 816AFBC - getitemname 0, ITEM_PROTEIN - setvar VAR_0x8008, 64 - setvar VAR_0x8009, 1000 - goto EventScript_16B055 - end + getitemname 0, ITEM_PROTEIN + setvar VAR_0x8008, 64 + setvar VAR_0x8009, 1000 + goto EventScript_16B055 + end EventScript_16AFD0:: @ 816AFD0 - getitemname 0, ITEM_IRON - setvar VAR_0x8008, 65 - setvar VAR_0x8009, 1000 - goto EventScript_16B055 - end + getitemname 0, ITEM_IRON + setvar VAR_0x8008, 65 + setvar VAR_0x8009, 1000 + goto EventScript_16B055 + end EventScript_16AFE4:: @ 816AFE4 - getitemname 0, ITEM_CARBOS - setvar VAR_0x8008, 66 - setvar VAR_0x8009, 1000 - goto EventScript_16B055 - end + getitemname 0, ITEM_CARBOS + setvar VAR_0x8008, 66 + setvar VAR_0x8009, 1000 + goto EventScript_16B055 + end EventScript_16AFF8:: @ 816AFF8 - getitemname 0, ITEM_CALCIUM - setvar VAR_0x8008, 67 - setvar VAR_0x8009, 1000 - goto EventScript_16B055 - end + getitemname 0, ITEM_CALCIUM + setvar VAR_0x8008, 67 + setvar VAR_0x8009, 1000 + goto EventScript_16B055 + end EventScript_16B00C:: @ 816B00C - getitemname 0, ITEM_ZINC - setvar VAR_0x8008, 70 - setvar VAR_0x8009, 1000 - goto EventScript_16B055 - end + getitemname 0, ITEM_ZINC + setvar VAR_0x8008, 70 + setvar VAR_0x8009, 1000 + goto EventScript_16B055 + end EventScript_16B020:: @ 816B020 - getitemname 0, ITEM_HP_UP - setvar VAR_0x8008, 63 - setvar VAR_0x8009, 1000 - goto EventScript_16B055 - end + getitemname 0, ITEM_HP_UP + setvar VAR_0x8008, 63 + setvar VAR_0x8009, 1000 + goto EventScript_16B055 + end EventScript_16B034:: @ 816B034 - getitemname 0, ITEM_PP_UP - setvar VAR_0x8008, 69 - setvar VAR_0x8009, 3000 - goto EventScript_16B055 - end + getitemname 0, ITEM_PP_UP + setvar VAR_0x8008, 69 + setvar VAR_0x8009, 3000 + goto EventScript_16B055 + end EventScript_16B048:: @ 816B048 - loadword 0, gUnknown_819342F - callstd 4 - special sub_815F114 - release - end + loadword 0, gUnknown_819342F + callstd 4 + special sub_815F114 + release + end EventScript_16B055:: @ 816B055 - loadword 0, gUnknown_819331E - callstd 5 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16AEC8 - copyvar VAR_0x8004, VAR_0x8009 - specialvar VAR_RESULT, sub_815EEB0 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16B0CC - setorcopyvar VAR_0x8000, VAR_0x8008 - setorcopyvar VAR_0x8001, 1 - callstd 0 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16B0BF - copyvar VAR_0x8004, VAR_0x8009 - special sub_815EF5C - special sub_815F070 - loadword 0, gUnknown_819337A - callstd 5 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16AEC8 - loadword 0, gUnknown_81933FB - callstd 4 - special sub_815F114 - release - end + loadword 0, gUnknown_819331E + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16AEC8 + copyvar VAR_0x8004, VAR_0x8009 + specialvar VAR_RESULT, sub_815EEB0 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16B0CC + setorcopyvar VAR_0x8000, VAR_0x8008 + setorcopyvar VAR_0x8001, 1 + callstd 0 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16B0BF + copyvar VAR_0x8004, VAR_0x8009 + special sub_815EF5C + special sub_815F070 + loadword 0, gUnknown_819337A + callstd 5 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16AEC8 + loadword 0, gUnknown_81933FB + callstd 4 + special sub_815F114 + release + end EventScript_16B0BF:: @ 816B0BF - loadword 0, gUnknown_81A5207 - callstd 4 - special sub_815F114 - release - end + loadword 0, gUnknown_81A5207 + callstd 4 + special sub_815F114 + release + end EventScript_16B0CC:: @ 816B0CC - loadword 0, gUnknown_8193352 - callstd 4 - goto EventScript_16AEC8 - end + loadword 0, gUnknown_8193352 + callstd 4 + goto EventScript_16AEC8 + end CeruleanCity_House5_EventScript_16B0DA:: @ 816B0DA - lockall - special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 - special sub_814EA7C - waitstate - releaseall - end + lockall + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + special sub_814EA7C + waitstate + releaseall + end diff --git a/data/maps/CeruleanCity_Mart/scripts.inc b/data/maps/CeruleanCity_Mart/scripts.inc index e9fc440c4..f4466d856 100644 --- a/data/maps/CeruleanCity_Mart/scripts.inc +++ b/data/maps/CeruleanCity_Mart/scripts.inc @@ -1,41 +1,41 @@ CeruleanCity_Mart_MapScripts:: @ 816AC9D - .byte 0 + .byte 0 CeruleanCity_Mart_EventScript_16AC9E:: @ 816AC9E - loadword 0, gUnknown_81929C2 - callstd 2 - end + loadword 0, gUnknown_81929C2 + callstd 2 + end CeruleanCity_Mart_EventScript_16ACA7:: @ 816ACA7 - loadword 0, gUnknown_8192A79 - callstd 2 - end + loadword 0, gUnknown_8192A79 + callstd 2 + end CeruleanCity_Mart_EventScript_16ACB0:: @ 816ACB0 - special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 - lock - faceplayer - message Text_1A6211 - waitmessage - pokemart Items_16ACD8 - loadword 0, gUnknown_81A5190 - callstd 4 - release - end + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + lock + faceplayer + message Text_1A6211 + waitmessage + pokemart Items_16ACD8 + loadword 0, gUnknown_81A5190 + callstd 4 + release + end - .align 2 + .align 2 Items_16ACD8:: @ 816ACD8 - .2byte ITEM_POKE_BALL - .2byte ITEM_SUPER_POTION - .2byte ITEM_POTION - .2byte ITEM_ANTIDOTE - .2byte ITEM_PARALYZE_HEAL - .2byte ITEM_AWAKENING - .2byte ITEM_BURN_HEAL - .2byte ITEM_ESCAPE_ROPE - .2byte ITEM_REPEL - .2byte ITEM_NONE - release - end + .2byte ITEM_POKE_BALL + .2byte ITEM_SUPER_POTION + .2byte ITEM_POTION + .2byte ITEM_ANTIDOTE + .2byte ITEM_PARALYZE_HEAL + .2byte ITEM_AWAKENING + .2byte ITEM_BURN_HEAL + .2byte ITEM_ESCAPE_ROPE + .2byte ITEM_REPEL + .2byte ITEM_NONE + release + end diff --git a/data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc b/data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc index f9d2b2c9a..259e397a5 100644 --- a/data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc @@ -1,41 +1,41 @@ CeruleanCity_PokemonCenter_1F_MapScripts:: @ 816AA2D - map_script 3, CeruleanCity_PokemonCenter_1F_MapScript1_16AA38 - map_script 5, CeruleanCity_PokemonCenter_1F_MapScript2_1BC05C - .byte 0 + map_script 3, CeruleanCity_PokemonCenter_1F_MapScript1_16AA38 + map_script 5, CeruleanCity_PokemonCenter_1F_MapScript2_1BC05C + .byte 0 CeruleanCity_PokemonCenter_1F_MapScript1_16AA38:: @ 816AA38 - setrespawn 4 - end + setrespawn 4 + end CeruleanCity_PokemonCenter_1F_EventScript_16AA3C:: @ 816AA3C - lock - faceplayer - call EventScript_1A6578 - release - end + lock + faceplayer + call EventScript_1A6578 + release + end CeruleanCity_PokemonCenter_1F_EventScript_16AA45:: @ 816AA45 - loadword 0, gUnknown_8192079 - callstd 2 - end + loadword 0, gUnknown_8192079 + callstd 2 + end CeruleanCity_PokemonCenter_1F_EventScript_16AA4E:: @ 816AA4E - loadword 0, gUnknown_8191FFB - callstd 2 - end + loadword 0, gUnknown_8191FFB + callstd 2 + end CeruleanCity_PokemonCenter_1F_EventScript_16AA57:: @ 816AA57 - lock - faceplayer - setvar VAR_0x8004, 13 - setvar VAR_0x8005, 1 - special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_8192116 - callstd 4 - release - end + lock + faceplayer + setvar VAR_0x8004, 13 + setvar VAR_0x8005, 1 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_8192116 + callstd 4 + release + end CeruleanCity_PokemonCenter_1F_EventScript_16AA70:: @ 816AA70 - loadword 0, gUnknown_819214C - callstd 2 - end + loadword 0, gUnknown_819214C + callstd 2 + end diff --git a/data/maps/CeruleanCity_PokemonCenter_2F/scripts.inc b/data/maps/CeruleanCity_PokemonCenter_2F/scripts.inc index 6abf8a484..3778c494d 100644 --- a/data/maps/CeruleanCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/CeruleanCity_PokemonCenter_2F/scripts.inc @@ -1,18 +1,18 @@ CeruleanCity_PokemonCenter_2F_MapScripts:: @ 816AA79 - map_script 2, CeruleanCity_PokemonCenter_2F_MapScript1_1BB2A3 - map_script 4, CeruleanCity_PokemonCenter_2F_MapScript2_1BB1ED - map_script 1, CeruleanCity_PokemonCenter_2F_MapScript3_1BB237 - map_script 3, CeruleanCity_PokemonCenter_2F_MapScript4_1BB1B4 - .byte 0 + map_script 2, CeruleanCity_PokemonCenter_2F_MapScript1_1BB2A3 + map_script 4, CeruleanCity_PokemonCenter_2F_MapScript2_1BB1ED + map_script 1, CeruleanCity_PokemonCenter_2F_MapScript3_1BB237 + map_script 3, CeruleanCity_PokemonCenter_2F_MapScript4_1BB1B4 + .byte 0 CeruleanCity_PokemonCenter_2F_EventScript_16AA8E:: @ 816AA8E - call EventScript_1BB4A3 - end + call EventScript_1BB4A3 + end EventScript_16AA94:: @ 816AA94 - call EventScript_1BB6AB - end + call EventScript_1BB6AB + end EventScript_16AA9A:: @ 816AA9A - call EventScript_1BB7DE - end + call EventScript_1BB7DE + end diff --git a/data/maps/CinnabarIsland/scripts.inc b/data/maps/CinnabarIsland/scripts.inc index 10a075b72..314f97296 100644 --- a/data/maps/CinnabarIsland/scripts.inc +++ b/data/maps/CinnabarIsland/scripts.inc @@ -1,384 +1,384 @@ CinnabarIsland_MapScripts:: @ 8166ED6 - map_script 3, CinnabarIsland_MapScript1_166EE1 - map_script 2, CinnabarIsland_MapScript2_166F6E - .byte 0 + map_script 3, CinnabarIsland_MapScript1_166EE1 + map_script 2, CinnabarIsland_MapScript2_166F6E + .byte 0 CinnabarIsland_MapScript1_166EE1:: @ 8166EE1 - setworldmapflag 2200 - call EventScript_166F5E - compare_var_to_value VAR_0x4071, 1 - call_if 1, EventScript_166F24 - compare_var_to_value VAR_0x4071, 3 - call_if 1, EventScript_166F52 - compare_var_to_value VAR_0x408A, 1 - call_if 1, EventScript_166F0B - end + setworldmapflag 2200 + call EventScript_166F5E + compare_var_to_value VAR_0x4071, 1 + call_if 1, EventScript_166F24 + compare_var_to_value VAR_0x4071, 3 + call_if 1, EventScript_166F52 + compare_var_to_value VAR_0x408A, 1 + call_if 1, EventScript_166F0B + end EventScript_166F0B:: @ 8166F0B - savebgm BGM_FRLG_FOLLOW_ME - setflag FLAG_0x002 - setobjectxyperm 3, 15, 12 - setobjectmovementtype 3, 9 - setobjectxyperm 4, 30, 12 - return + savebgm BGM_FRLG_FOLLOW_ME + setflag FLAG_0x002 + setobjectxyperm 3, 15, 12 + setobjectmovementtype 3, 9 + setobjectxyperm 4, 30, 12 + return EventScript_166F24:: @ 8166F24 - getplayerxy VAR_0x8004, VAR_0x8005 - compare_var_to_value VAR_0x8004, 18 - goto_if 4, EventScript_166F4A - setflag FLAG_0x002 - setobjectxyperm 3, 18, 12 - setobjectmovementtype 3, 7 - setobjectxyperm 4, 30, 12 - return + getplayerxy VAR_0x8004, VAR_0x8005 + compare_var_to_value VAR_0x8004, 18 + goto_if 4, EventScript_166F4A + setflag FLAG_0x002 + setobjectxyperm 3, 18, 12 + setobjectmovementtype 3, 7 + setobjectxyperm 4, 30, 12 + return EventScript_166F4A:: @ 8166F4A - setobjectxyperm 4, 30, 8 - return + setobjectxyperm 4, 30, 8 + return EventScript_166F52:: @ 8166F52 - setobjectxyperm 3, 21, 8 - setobjectmovementtype 3, 7 - return + setobjectxyperm 3, 21, 8 + setobjectmovementtype 3, 7 + return EventScript_166F5E:: @ 8166F5E - checkflag FLAG_0x1A8 - goto_if 1, EventScript_166F68 - return + checkflag FLAG_0x1A8 + goto_if 1, EventScript_166F68 + return EventScript_166F68:: @ 8166F68 - setvar VAR_0x4001, 1 - return + setvar VAR_0x4001, 1 + return CinnabarIsland_MapScript2_166F6E:: @ 8166F6E - map_script_2 VAR_0x408A, 1, EventScript_166F88 - map_script_2 VAR_0x4071, 1, EventScript_166FCD - map_script_2 VAR_0x4071, 3, EventScript_166FA0 - .2byte 0 + map_script_2 VAR_0x408A, 1, EventScript_166F88 + map_script_2 VAR_0x4071, 1, EventScript_166FCD + map_script_2 VAR_0x4071, 3, EventScript_166FA0 + .2byte 0 EventScript_166F88:: @ 8166F88 - lockall - clearflag FLAG_SPECIAL_FLAG_0x4001 - savebgm MUS_DUMMY - textcolor 0 - setvar VAR_0x408A, 2 - delay 20 - call EventScript_1670E6 - releaseall - end + lockall + clearflag FLAG_SPECIAL_FLAG_0x4001 + savebgm MUS_DUMMY + textcolor 0 + setvar VAR_0x408A, 2 + delay 20 + call EventScript_1670E6 + releaseall + end EventScript_166FA0:: @ 8166FA0 - lockall - textcolor 0 - loadword 0, gUnknown_8180F09 - callstd 4 - closemessage - applymovement 3, Movement_166FC6 - waitmovement 0 - removeobject 3 - setvar VAR_0x4071, 4 - setflag FLAG_0x075 - clearflag FLAG_0x076 - releaseall - end + lockall + textcolor 0 + loadword 0, gUnknown_8180F09 + callstd 4 + closemessage + applymovement 3, Movement_166FC6 + waitmovement 0 + removeobject 3 + setvar VAR_0x4071, 4 + setflag FLAG_0x075 + clearflag FLAG_0x076 + releaseall + end Movement_166FC6:: @ 8166FC6 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_end + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_end EventScript_166FCD:: @ 8166FCD - lockall - textcolor 0 - checkflag FLAG_0x002 - call_if 0, EventScript_167032 - checkflag FLAG_0x002 - call_if 1, EventScript_16703D - playse SE_PIN - applymovement 3, Movement_1A75DB - waitmovement 0 - applymovement 3, Movement_1A75DD - waitmovement 0 - checkflag FLAG_0x002 - call_if 0, EventScript_167048 - checkflag FLAG_0x002 - call_if 1, EventScript_167053 - loadword 0, gUnknown_8180C90 - callstd 4 - loadword 0, gUnknown_8180CAA - callstd 5 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_167068 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_167078 - end + lockall + textcolor 0 + checkflag FLAG_0x002 + call_if 0, EventScript_167032 + checkflag FLAG_0x002 + call_if 1, EventScript_16703D + playse SE_PIN + applymovement 3, Movement_1A75DB + waitmovement 0 + applymovement 3, Movement_1A75DD + waitmovement 0 + checkflag FLAG_0x002 + call_if 0, EventScript_167048 + checkflag FLAG_0x002 + call_if 1, EventScript_167053 + loadword 0, gUnknown_8180C90 + callstd 4 + loadword 0, gUnknown_8180CAA + callstd 5 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_167068 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_167078 + end EventScript_167032:: @ 8167032 - applymovement 3, Movement_1A75E9 - waitmovement 0 - return + applymovement 3, Movement_1A75E9 + waitmovement 0 + return EventScript_16703D:: @ 816703D - applymovement 3, Movement_1A75E7 - waitmovement 0 - return + applymovement 3, Movement_1A75E7 + waitmovement 0 + return EventScript_167048:: @ 8167048 - applymovement 3, Movement_1671A4 - waitmovement 0 - return + applymovement 3, Movement_1671A4 + waitmovement 0 + return EventScript_167053:: @ 8167053 - applymovement 3, Movement_1671A6 - waitmovement 0 - applymovement 255, Movement_1A75EB - waitmovement 0 - return + applymovement 3, Movement_1671A6 + waitmovement 0 + applymovement 255, Movement_1A75EB + waitmovement 0 + return EventScript_167068:: @ 8167068 - loadword 0, gUnknown_8180DDD - callstd 4 - closemessage - call EventScript_1670E6 - releaseall - end + loadword 0, gUnknown_8180DDD + callstd 4 + closemessage + call EventScript_1670E6 + releaseall + end EventScript_167078:: @ 8167078 - loadword 0, gUnknown_8180DF8 - callstd 4 - closemessage - checkflag FLAG_0x002 - call_if 0, EventScript_1670A0 - checkflag FLAG_0x002 - call_if 1, EventScript_1670B3 - removeobject 3 - setvar VAR_0x4071, 2 - clearflag FLAG_0x0A2 - releaseall - end + loadword 0, gUnknown_8180DF8 + callstd 4 + closemessage + checkflag FLAG_0x002 + call_if 0, EventScript_1670A0 + checkflag FLAG_0x002 + call_if 1, EventScript_1670B3 + removeobject 3 + setvar VAR_0x4071, 2 + clearflag FLAG_0x0A2 + releaseall + end EventScript_1670A0:: @ 81670A0 - applymovement 3, Movement_1670AB - waitmovement 0 - return + applymovement 3, Movement_1670AB + waitmovement 0 + return Movement_1670AB:: @ 81670AB - step_13 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_end + step_13 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_end EventScript_1670B3:: @ 81670B3 - applymovement 255, Movement_1670DB - applymovement 3, Movement_1670DE - waitmovement 0 - opendoor 14, 11 - waitdooranim - applymovement 3, Movement_1670E2 - waitmovement 0 - closedoor 14, 11 - waitdooranim - return + applymovement 255, Movement_1670DB + applymovement 3, Movement_1670DE + waitmovement 0 + opendoor 14, 11 + waitdooranim + applymovement 3, Movement_1670E2 + waitmovement 0 + closedoor 14, 11 + waitdooranim + return Movement_1670DB:: @ 81670DB - step_12 - step_30 - step_end + step_12 + step_30 + step_end Movement_1670DE:: @ 81670DE - step_1c - step_12 - step_2e - step_end + step_1c + step_12 + step_2e + step_end Movement_1670E2:: @ 81670E2 - step_11 - step_1a - step_60 - step_end + step_11 + step_1a + step_60 + step_end EventScript_1670E6:: @ 81670E6 - checkflag FLAG_0x002 - call_if 1, EventScript_167142 - addobject 4 - checkflag FLAG_0x002 - call_if 0, EventScript_167154 - checkflag FLAG_0x002 - call_if 1, EventScript_167166 - loadword 0, gUnknown_8180EAD - callstd 4 - closemessage - checkflag FLAG_0x002 - call_if 0, EventScript_167171 - checkflag FLAG_0x002 - call_if 1, EventScript_167183 - setvar VAR_0x4071, 2 - removeobject 3 - delay 40 - setflag FLAG_0x06B - setvar VAR_0x4075, 1 - setvar VAR_0x8004, 8 - setvar VAR_0x8006, 1 - goto EventScript_1A90DA - end + checkflag FLAG_0x002 + call_if 1, EventScript_167142 + addobject 4 + checkflag FLAG_0x002 + call_if 0, EventScript_167154 + checkflag FLAG_0x002 + call_if 1, EventScript_167166 + loadword 0, gUnknown_8180EAD + callstd 4 + closemessage + checkflag FLAG_0x002 + call_if 0, EventScript_167171 + checkflag FLAG_0x002 + call_if 1, EventScript_167183 + setvar VAR_0x4071, 2 + removeobject 3 + delay 40 + setflag FLAG_0x06B + setvar VAR_0x4075, 1 + setvar VAR_0x8004, 8 + setvar VAR_0x8006, 1 + goto EventScript_1A90DA + end EventScript_167142:: @ 8167142 - applymovement 3, Movement_1671AF - applymovement 255, Movement_1671AF - waitmovement 0 - return + applymovement 3, Movement_1671AF + applymovement 255, Movement_1671AF + waitmovement 0 + return EventScript_167154:: @ 8167154 - applymovement 3, Movement_1671AA - applymovement 4, Movement_167195 - waitmovement 0 - return + applymovement 3, Movement_1671AA + applymovement 4, Movement_167195 + waitmovement 0 + return EventScript_167166:: @ 8167166 - applymovement 4, Movement_167195 - waitmovement 0 - return + applymovement 4, Movement_167195 + waitmovement 0 + return EventScript_167171:: @ 8167171 - applymovement 3, Movement_16719D - applymovement 255, Movement_1671BA - waitmovement 0 - return + applymovement 3, Movement_16719D + applymovement 255, Movement_1671BA + waitmovement 0 + return EventScript_167183:: @ 8167183 - applymovement 3, Movement_1671B6 - applymovement 255, Movement_1671C4 - waitmovement 0 - return + applymovement 3, Movement_1671B6 + applymovement 255, Movement_1671C4 + waitmovement 0 + return Movement_167195:: @ 8167195 - step_1c - step_1c - step_1f - step_1f - step_12 - step_left - step_left - step_end + step_1c + step_1c + step_1f + step_1f + step_12 + step_left + step_left + step_end Movement_16719D:: @ 816719D - step_13 - step_10 - step_10 - step_13 - step_1a - step_60 - step_end + step_13 + step_10 + step_10 + step_13 + step_1a + step_60 + step_end Movement_1671A4:: @ 81671A4 - step_11 - step_end + step_11 + step_end Movement_1671A6:: @ 81671A6 - step_12 - step_12 - step_12 - step_end + step_12 + step_12 + step_12 + step_end Movement_1671AA:: @ 81671AA - step_1c - step_1c - step_1b - step_30 - step_end + step_1c + step_1c + step_1b + step_30 + step_end Movement_1671AF:: @ 81671AF - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_end + step_13 + step_13 + step_13 + step_13 + step_13 + step_13 + step_end Movement_1671B6:: @ 81671B6 - step_13 - step_1a - step_60 - step_end + step_13 + step_1a + step_60 + step_end Movement_1671BA:: @ 81671BA - step_10 - step_13 - step_10 - step_10 - step_30 - step_1a - step_13 - step_1a - step_60 - step_end + step_10 + step_13 + step_10 + step_10 + step_30 + step_1a + step_13 + step_1a + step_60 + step_end Movement_1671C4:: @ 81671C4 - step_13 - step_1a - step_13 - step_1a - step_60 - step_end + step_13 + step_1a + step_13 + step_1a + step_60 + step_end CinnabarIsland_EventScript_1671CA:: @ 81671CA - lockall - applymovement 255, Movement_1A75E9 - waitmovement 0 - delay 20 - loadword 0, gUnknown_8180B20 - callstd 4 - closemessage - applymovement 255, Movement_1671ED - waitmovement 0 - releaseall - end + lockall + applymovement 255, Movement_1A75E9 + waitmovement 0 + delay 20 + loadword 0, gUnknown_8180B20 + callstd 4 + closemessage + applymovement 255, Movement_1671ED + waitmovement 0 + releaseall + end Movement_1671ED:: @ 81671ED - step_10 - step_end + step_10 + step_end CinnabarIsland_EventScript_1671EF:: @ 81671EF - lock - faceplayer - setvar VAR_0x8004, 8 - setvar VAR_0x8005, 3 - special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_8180B34 - callstd 4 - release - end + lock + faceplayer + setvar VAR_0x8004, 8 + setvar VAR_0x8005, 3 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_8180B34 + callstd 4 + release + end CinnabarIsland_EventScript_167208:: @ 8167208 - loadword 0, gUnknown_8180BA0 - callstd 2 - end + loadword 0, gUnknown_8180BA0 + callstd 2 + end CinnabarIsland_EventScript_167211:: @ 8167211 - loadword 0, gUnknown_8180C0D - callstd 3 - end + loadword 0, gUnknown_8180C0D + callstd 3 + end CinnabarIsland_EventScript_16721A:: @ 816721A - loadword 0, gUnknown_8180C3E - callstd 3 - end + loadword 0, gUnknown_8180C3E + callstd 3 + end CinnabarIsland_EventScript_167223:: @ 8167223 - lockall - setvar VAR_0x8004, 8 - setvar VAR_0x8005, 0 - special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_8180C4A - callstd 4 - releaseall - end + lockall + setvar VAR_0x8004, 8 + setvar VAR_0x8005, 0 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_8180C4A + callstd 4 + releaseall + end diff --git a/data/maps/CinnabarIsland_Gym/scripts.inc b/data/maps/CinnabarIsland_Gym/scripts.inc index afe1f7a7b..7b22015d0 100644 --- a/data/maps/CinnabarIsland_Gym/scripts.inc +++ b/data/maps/CinnabarIsland_Gym/scripts.inc @@ -1,816 +1,816 @@ CinnabarIsland_Gym_MapScripts:: @ 816D94B - map_script 1, CinnabarIsland_Gym_MapScript1_16D951 - .byte 0 + map_script 1, CinnabarIsland_Gym_MapScript1_16D951 + .byte 0 CinnabarIsland_Gym_MapScript1_16D951:: @ 816D951 - checkflag FLAG_0x4B6 - goto_if 1, EventScript_16D991 - checkflag FLAG_0x265 - call_if 1, EventScript_16D9B0 - checkflag FLAG_0x267 - call_if 1, EventScript_16D9B6 - checkflag FLAG_0x268 - call_if 1, EventScript_16D9BC - checkflag FLAG_0x269 - call_if 1, EventScript_16D9C2 - checkflag FLAG_0x26A - call_if 1, EventScript_16D9C8 - checkflag FLAG_0x26B - call_if 1, EventScript_16D9CE - end + checkflag FLAG_0x4B6 + goto_if 1, EventScript_16D991 + checkflag FLAG_0x265 + call_if 1, EventScript_16D9B0 + checkflag FLAG_0x267 + call_if 1, EventScript_16D9B6 + checkflag FLAG_0x268 + call_if 1, EventScript_16D9BC + checkflag FLAG_0x269 + call_if 1, EventScript_16D9C2 + checkflag FLAG_0x26A + call_if 1, EventScript_16D9C8 + checkflag FLAG_0x26B + call_if 1, EventScript_16D9CE + end EventScript_16D991:: @ 816D991 - call EventScript_16E117 - call EventScript_16E157 - call EventScript_16E197 - call EventScript_16E1D7 - call EventScript_16E1F3 - call EventScript_16E233 - end + call EventScript_16E117 + call EventScript_16E157 + call EventScript_16E197 + call EventScript_16E1D7 + call EventScript_16E1F3 + call EventScript_16E233 + end EventScript_16D9B0:: @ 816D9B0 - call EventScript_16E117 - return + call EventScript_16E117 + return EventScript_16D9B6:: @ 816D9B6 - call EventScript_16E157 - return + call EventScript_16E157 + return EventScript_16D9BC:: @ 816D9BC - call EventScript_16E197 - return + call EventScript_16E197 + return EventScript_16D9C2:: @ 816D9C2 - call EventScript_16E1D7 - return + call EventScript_16E1D7 + return EventScript_16D9C8:: @ 816D9C8 - call EventScript_16E1F3 - return + call EventScript_16E1F3 + return EventScript_16D9CE:: @ 816D9CE - call EventScript_16E233 - return + call EventScript_16E233 + return CinnabarIsland_Gym_EventScript_16D9D4:: @ 816D9D4 - setvar VAR_0x8004, 8 - setvar VAR_0x8005, 2 - special UpdatePickStateFromSpecialVar8005 - trainerbattle 1, 419, 0, Text_199543, Text_1995FA, EventScript_16DA06 - checkflag FLAG_0x24E - goto_if 0, EventScript_16DA34 - loadword 0, gUnknown_819971D - callstd 4 - release - end + setvar VAR_0x8004, 8 + setvar VAR_0x8005, 2 + special UpdatePickStateFromSpecialVar8005 + trainerbattle 1, 419, 0, Text_199543, Text_1995FA, EventScript_16DA06 + checkflag FLAG_0x24E + goto_if 0, EventScript_16DA34 + loadword 0, gUnknown_819971D + callstd 4 + release + end EventScript_16DA06:: @ 816DA06 - setvar VAR_0x8004, 8 - setvar VAR_0x8005, 1 - special SetFlavorTextFlagFromSpecialVars - setflag FLAG_0x4B6 - setflag FLAG_UNK826 - setrespawn 9 - setvar VAR_0x4071, 1 - clearflag FLAG_0x062 - setvar VAR_0x8008, 7 - call EventScript_1A6B18 - goto EventScript_16DA34 - end + setvar VAR_0x8004, 8 + setvar VAR_0x8005, 1 + special SetFlavorTextFlagFromSpecialVars + setflag FLAG_0x4B6 + setflag FLAG_UNK826 + setrespawn 9 + setvar VAR_0x4071, 1 + clearflag FLAG_0x062 + setvar VAR_0x8008, 7 + call EventScript_1A6B18 + goto EventScript_16DA34 + end EventScript_16DA34:: @ 816DA34 - loadword 0, gUnknown_819969E - callstd 4 - checkitemspace ITEM_TM38, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16DA75 - additem ITEM_TM38, 1 - loadword 0, gUnknown_81996FF - setorcopyvar VAR_0x8000, 326 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 257 - callstd 9 - setflag FLAG_0x24E - loadword 0, gUnknown_8199652 - callstd 4 - release - end + loadword 0, gUnknown_819969E + callstd 4 + checkitemspace ITEM_TM38, 1 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16DA75 + additem ITEM_TM38, 1 + loadword 0, gUnknown_81996FF + setorcopyvar VAR_0x8000, 326 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 257 + callstd 9 + setflag FLAG_0x24E + loadword 0, gUnknown_8199652 + callstd 4 + release + end EventScript_16DA75:: @ 816DA75 - loadword 0, gUnknown_8199789 - callstd 4 - release - end + loadword 0, gUnknown_8199789 + callstd 4 + release + end CinnabarIsland_Gym_EventScript_16DA7F:: @ 816DA7F - trainerbattle 0, 177, 0, Text_1997A5, Text_1997D6 - loadword 0, gUnknown_81997EA - callstd 6 - end + trainerbattle 0, 177, 0, Text_1997A5, Text_1997D6 + loadword 0, gUnknown_81997EA + callstd 6 + end CinnabarIsland_Gym_EventScript_16DA96:: @ 816DA96 - trainerbattle 2, 178, 0, Text_1998BD, Text_1998ED, EventScript_16DAB1 - loadword 0, gUnknown_8199911 - callstd 6 - end + trainerbattle 2, 178, 0, Text_1998BD, Text_1998ED, EventScript_16DAB1 + loadword 0, gUnknown_8199911 + callstd 6 + end EventScript_16DAB1:: @ 816DAB1 - checkflag FLAG_0x267 - call_if 0, EventScript_16DABC - release - end + checkflag FLAG_0x267 + call_if 0, EventScript_16DABC + release + end EventScript_16DABC:: @ 816DABC - call EventScript_16DD31 - return + call EventScript_16DD31 + return CinnabarIsland_Gym_EventScript_16DAC2:: @ 816DAC2 - trainerbattle 2, 179, 0, Text_1999B7, Text_1999DB, EventScript_16DAEA - setvar VAR_0x8004, 8 - setvar VAR_0x8005, 2 - special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_81999DF - callstd 6 - end + trainerbattle 2, 179, 0, Text_1999B7, Text_1999DB, EventScript_16DAEA + setvar VAR_0x8004, 8 + setvar VAR_0x8005, 2 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_81999DF + callstd 6 + end EventScript_16DAEA:: @ 816DAEA - checkflag FLAG_0x269 - call_if 0, EventScript_16DAF5 - release - end + checkflag FLAG_0x269 + call_if 0, EventScript_16DAF5 + release + end EventScript_16DAF5:: @ 816DAF5 - call EventScript_16DEE6 - return + call EventScript_16DEE6 + return CinnabarIsland_Gym_EventScript_16DAFB:: @ 816DAFB - trainerbattle 2, 180, 0, Text_199AFC, Text_199B16, EventScript_16DB16 - loadword 0, gUnknown_8199B27 - callstd 6 - end + trainerbattle 2, 180, 0, Text_199AFC, Text_199B16, EventScript_16DB16 + loadword 0, gUnknown_8199B27 + callstd 6 + end EventScript_16DB16:: @ 816DB16 - checkflag FLAG_0x26B - call_if 0, EventScript_16DB21 - release - end + checkflag FLAG_0x26B + call_if 0, EventScript_16DB21 + release + end EventScript_16DB21:: @ 816DB21 - call EventScript_16E094 - return + call EventScript_16E094 + return CinnabarIsland_Gym_EventScript_16DB27:: @ 816DB27 - trainerbattle 2, 213, 0, Text_19983F, Text_199870, EventScript_16DB42 - loadword 0, gUnknown_819987D - callstd 6 - end + trainerbattle 2, 213, 0, Text_19983F, Text_199870, EventScript_16DB42 + loadword 0, gUnknown_819987D + callstd 6 + end EventScript_16DB42:: @ 816DB42 - checkflag FLAG_0x265 - call_if 0, EventScript_16DB4D - release - end + checkflag FLAG_0x265 + call_if 0, EventScript_16DB4D + release + end EventScript_16DB4D:: @ 816DB4D - call EventScript_16DC58 - return + call EventScript_16DC58 + return CinnabarIsland_Gym_EventScript_16DB53:: @ 816DB53 - trainerbattle 2, 214, 0, Text_199948, Text_199973, EventScript_16DB6E - loadword 0, gUnknown_8199986 - callstd 6 - end + trainerbattle 2, 214, 0, Text_199948, Text_199973, EventScript_16DB6E + loadword 0, gUnknown_8199986 + callstd 6 + end EventScript_16DB6E:: @ 816DB6E - checkflag FLAG_0x268 - call_if 0, EventScript_16DB79 - release - end + checkflag FLAG_0x268 + call_if 0, EventScript_16DB79 + release + end EventScript_16DB79:: @ 816DB79 - call EventScript_16DE0F - return + call EventScript_16DE0F + return CinnabarIsland_Gym_EventScript_16DB7F:: @ 816DB7F - trainerbattle 2, 215, 0, Text_199A7F, Text_199AB9, EventScript_16DB9A - loadword 0, gUnknown_8199AC9 - callstd 6 - end + trainerbattle 2, 215, 0, Text_199A7F, Text_199AB9, EventScript_16DB9A + loadword 0, gUnknown_8199AC9 + callstd 6 + end EventScript_16DB9A:: @ 816DB9A - checkflag FLAG_0x26A - call_if 0, EventScript_16DBA5 - release - end + checkflag FLAG_0x26A + call_if 0, EventScript_16DBA5 + release + end EventScript_16DBA5:: @ 816DBA5 - call EventScript_16DFBD - return + call EventScript_16DFBD + return CinnabarIsland_Gym_EventScript_16DBAB:: @ 816DBAB - lock - faceplayer - checkflag FLAG_0x4B6 - goto_if 1, EventScript_16DBC0 - loadword 0, gUnknown_8199B81 - callstd 4 - release - end + lock + faceplayer + checkflag FLAG_0x4B6 + goto_if 1, EventScript_16DBC0 + loadword 0, gUnknown_8199B81 + callstd 4 + release + end EventScript_16DBC0:: @ 816DBC0 - loadword 0, gUnknown_8199C0C - callstd 4 - release - end + loadword 0, gUnknown_8199C0C + callstd 4 + release + end CinnabarIsland_Gym_EventScript_16DBCA:: @ 816DBCA - lockall - checkflag FLAG_UNK826 - goto_if 1, EventScript_16DBDE - loadword 0, gUnknown_8199C29 - callstd 4 - releaseall - end + lockall + checkflag FLAG_UNK826 + goto_if 1, EventScript_16DBDE + loadword 0, gUnknown_8199C29 + callstd 4 + releaseall + end EventScript_16DBDE:: @ 816DBDE - loadword 0, gUnknown_8199C62 - callstd 4 - releaseall - end + loadword 0, gUnknown_8199C62 + callstd 4 + releaseall + end CinnabarIsland_Gym_EventScript_16DBE8:: @ 816DBE8 - lockall - setvar VAR_0x4001, 0 - goto EventScript_16DC00 - end + lockall + setvar VAR_0x4001, 0 + goto EventScript_16DC00 + end CinnabarIsland_Gym_EventScript_16DBF4:: @ 816DBF4 - lockall - setvar VAR_0x4001, 1 - goto EventScript_16DC00 - end + lockall + setvar VAR_0x4001, 1 + goto EventScript_16DC00 + end EventScript_16DC00:: @ 816DC00 - loadword 0, gUnknown_8199C9F - callstd 4 - loadword 0, gUnknown_8199D5A - callstd 5 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16DC43 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16DC6A - end + loadword 0, gUnknown_8199C9F + callstd 4 + loadword 0, gUnknown_8199D5A + callstd 5 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16DC43 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16DC6A + end EventScript_16DC27:: @ 816DC27 - playfanfare MUS_FANFA1 - waitfanfare - loadword 0, gUnknown_8199E4F - callstd 4 - return + playfanfare MUS_FANFA1 + waitfanfare + loadword 0, gUnknown_8199E4F + callstd 4 + return EventScript_16DC34:: @ 816DC34 - waitse - playse SE_BOO - waitse - loadword 0, gUnknown_8199E79 - callstd 4 - closemessage - return + waitse + playse SE_BOO + waitse + loadword 0, gUnknown_8199E79 + callstd 4 + closemessage + return EventScript_16DC43:: @ 816DC43 - call EventScript_16DC27 - checkflag FLAG_0x265 - goto_if 1, EventScript_16DC68 - call EventScript_16DC58 - releaseall - end + call EventScript_16DC27 + checkflag FLAG_0x265 + goto_if 1, EventScript_16DC68 + call EventScript_16DC58 + releaseall + end EventScript_16DC58:: @ 816DC58 - playse SE_FU_ZAKU2 - waitse - call EventScript_16E117 - special DrawWholeMapView - setflag FLAG_0x265 - return + playse SE_FU_ZAKU2 + waitse + call EventScript_16E117 + special DrawWholeMapView + setflag FLAG_0x265 + return EventScript_16DC68:: @ 816DC68 - releaseall - end + releaseall + end EventScript_16DC6A:: @ 816DC6A - call EventScript_16DC34 - checktrainerflag 213 - goto_if 0, EventScript_16DC7A - releaseall - end + call EventScript_16DC34 + checktrainerflag 213 + goto_if 0, EventScript_16DC7A + releaseall + end EventScript_16DC7A:: @ 816DC7A - compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_16DCB4 - compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_16DCC6 - textcolor 0 - loadword 0, gUnknown_819983F - callstd 4 - trainerbattle 3, 213, 0, Text_199870 - checkflag FLAG_0x265 - goto_if 1, EventScript_16DC68 - call EventScript_16DC58 - releaseall - end + compare_var_to_value VAR_0x4001, 0 + call_if 1, EventScript_16DCB4 + compare_var_to_value VAR_0x4001, 1 + call_if 1, EventScript_16DCC6 + textcolor 0 + loadword 0, gUnknown_819983F + callstd 4 + trainerbattle 3, 213, 0, Text_199870 + checkflag FLAG_0x265 + goto_if 1, EventScript_16DC68 + call EventScript_16DC58 + releaseall + end EventScript_16DCB4:: @ 816DCB4 - applymovement 255, Movement_1A75EB - applymovement 1, Movement_16DCD8 - waitmovement 0 - return + applymovement 255, Movement_1A75EB + applymovement 1, Movement_16DCD8 + waitmovement 0 + return EventScript_16DCC6:: @ 816DCC6 - applymovement 255, Movement_1A75EB - applymovement 1, Movement_16DCDB - waitmovement 0 - return + applymovement 255, Movement_1A75EB + applymovement 1, Movement_16DCDB + waitmovement 0 + return Movement_16DCD8:: @ 816DCD8 - step_12 - step_12 - step_end + step_12 + step_12 + step_end Movement_16DCDB:: @ 816DCDB - step_12 - step_end + step_12 + step_end CinnabarIsland_Gym_EventScript_16DCDD:: @ 816DCDD - lockall - setvar VAR_0x4001, 0 - goto EventScript_16DCF5 - end + lockall + setvar VAR_0x4001, 0 + goto EventScript_16DCF5 + end CinnabarIsland_Gym_EventScript_16DCE9:: @ 816DCE9 - lockall - setvar VAR_0x4001, 1 - goto EventScript_16DCF5 - end + lockall + setvar VAR_0x4001, 1 + goto EventScript_16DCF5 + end EventScript_16DCF5:: @ 816DCF5 - loadword 0, gUnknown_8199C9F - callstd 4 - loadword 0, gUnknown_8199D79 - callstd 5 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16DD41 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16DD1C - end + loadword 0, gUnknown_8199C9F + callstd 4 + loadword 0, gUnknown_8199D79 + callstd 5 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16DD41 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16DD1C + end EventScript_16DD1C:: @ 816DD1C - call EventScript_16DC27 - checkflag FLAG_0x267 - goto_if 1, EventScript_16DC68 - call EventScript_16DD31 - releaseall - end + call EventScript_16DC27 + checkflag FLAG_0x267 + goto_if 1, EventScript_16DC68 + call EventScript_16DD31 + releaseall + end EventScript_16DD31:: @ 816DD31 - playse SE_FU_ZAKU2 - waitse - call EventScript_16E157 - special DrawWholeMapView - setflag FLAG_0x267 - return + playse SE_FU_ZAKU2 + waitse + call EventScript_16E157 + special DrawWholeMapView + setflag FLAG_0x267 + return EventScript_16DD41:: @ 816DD41 - call EventScript_16DC34 - checktrainerflag 178 - goto_if 0, EventScript_16DD51 - releaseall - end + call EventScript_16DC34 + checktrainerflag 178 + goto_if 0, EventScript_16DD51 + releaseall + end EventScript_16DD51:: @ 816DD51 - compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_16DD8B - compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_16DD9D - textcolor 0 - loadword 0, gUnknown_81998BD - callstd 4 - trainerbattle 3, 178, 0, Text_1998ED - checkflag FLAG_0x267 - goto_if 1, EventScript_16DC68 - call EventScript_16DD31 - releaseall - end + compare_var_to_value VAR_0x4001, 0 + call_if 1, EventScript_16DD8B + compare_var_to_value VAR_0x4001, 1 + call_if 1, EventScript_16DD9D + textcolor 0 + loadword 0, gUnknown_81998BD + callstd 4 + trainerbattle 3, 178, 0, Text_1998ED + checkflag FLAG_0x267 + goto_if 1, EventScript_16DC68 + call EventScript_16DD31 + releaseall + end EventScript_16DD8B:: @ 816DD8B - applymovement 255, Movement_16DDB7 - applymovement 3, Movement_16DDAF - waitmovement 0 - return + applymovement 255, Movement_16DDB7 + applymovement 3, Movement_16DDAF + waitmovement 0 + return EventScript_16DD9D:: @ 816DD9D - applymovement 255, Movement_16DDB7 - applymovement 3, Movement_16DDB3 - waitmovement 0 - return + applymovement 255, Movement_16DDB7 + applymovement 3, Movement_16DDB3 + waitmovement 0 + return Movement_16DDAF:: @ 816DDAF - step_11 - step_11 - step_12 - step_end + step_11 + step_11 + step_12 + step_end Movement_16DDB3:: @ 816DDB3 - step_11 - step_11 - step_2f - step_end + step_11 + step_11 + step_2f + step_end Movement_16DDB7:: @ 816DDB7 - step_1c - step_1c - step_30 - step_end + step_1c + step_1c + step_30 + step_end CinnabarIsland_Gym_EventScript_16DDBB:: @ 816DDBB - lockall - setvar VAR_0x4001, 0 - goto EventScript_16DDD3 - end + lockall + setvar VAR_0x4001, 0 + goto EventScript_16DDD3 + end CinnabarIsland_Gym_EventScript_16DDC7:: @ 816DDC7 - lockall - setvar VAR_0x4001, 1 - goto EventScript_16DDD3 - end + lockall + setvar VAR_0x4001, 1 + goto EventScript_16DDD3 + end EventScript_16DDD3:: @ 816DDD3 - loadword 0, gUnknown_8199C9F - callstd 4 - loadword 0, gUnknown_8199DA9 - callstd 5 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16DE1F - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16DDFA - end + loadword 0, gUnknown_8199C9F + callstd 4 + loadword 0, gUnknown_8199DA9 + callstd 5 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16DE1F + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16DDFA + end EventScript_16DDFA:: @ 816DDFA - call EventScript_16DC27 - checkflag FLAG_0x268 - goto_if 1, EventScript_16DC68 - call EventScript_16DE0F - releaseall - end + call EventScript_16DC27 + checkflag FLAG_0x268 + goto_if 1, EventScript_16DC68 + call EventScript_16DE0F + releaseall + end EventScript_16DE0F:: @ 816DE0F - playse SE_FU_ZAKU2 - waitse - call EventScript_16E197 - special DrawWholeMapView - setflag FLAG_0x268 - return + playse SE_FU_ZAKU2 + waitse + call EventScript_16E197 + special DrawWholeMapView + setflag FLAG_0x268 + return EventScript_16DE1F:: @ 816DE1F - call EventScript_16DC34 - checktrainerflag 214 - goto_if 0, EventScript_16DE2F - releaseall - end + call EventScript_16DC34 + checktrainerflag 214 + goto_if 0, EventScript_16DE2F + releaseall + end EventScript_16DE2F:: @ 816DE2F - compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_16DE69 - compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_16DE7B - textcolor 0 - loadword 0, gUnknown_8199948 - callstd 4 - trainerbattle 3, 214, 0, Text_199973 - checkflag FLAG_0x268 - goto_if 1, EventScript_16DC68 - call EventScript_16DE0F - releaseall - end + compare_var_to_value VAR_0x4001, 0 + call_if 1, EventScript_16DE69 + compare_var_to_value VAR_0x4001, 1 + call_if 1, EventScript_16DE7B + textcolor 0 + loadword 0, gUnknown_8199948 + callstd 4 + trainerbattle 3, 214, 0, Text_199973 + checkflag FLAG_0x268 + goto_if 1, EventScript_16DC68 + call EventScript_16DE0F + releaseall + end EventScript_16DE69:: @ 816DE69 - applymovement 255, Movement_1A75EB - applymovement 4, Movement_16DE8D - waitmovement 0 - return + applymovement 255, Movement_1A75EB + applymovement 4, Movement_16DE8D + waitmovement 0 + return EventScript_16DE7B:: @ 816DE7B - applymovement 255, Movement_1A75EB - applymovement 4, Movement_16DE90 - waitmovement 0 - return + applymovement 255, Movement_1A75EB + applymovement 4, Movement_16DE90 + waitmovement 0 + return Movement_16DE8D:: @ 816DE8D - step_12 - step_12 - step_end + step_12 + step_12 + step_end Movement_16DE90:: @ 816DE90 - step_12 - step_end + step_12 + step_end CinnabarIsland_Gym_EventScript_16DE92:: @ 816DE92 - lockall - setvar VAR_0x4001, 0 - goto EventScript_16DEAA - end + lockall + setvar VAR_0x4001, 0 + goto EventScript_16DEAA + end CinnabarIsland_Gym_EventScript_16DE9E:: @ 816DE9E - lockall - setvar VAR_0x4001, 1 - goto EventScript_16DEAA - end + lockall + setvar VAR_0x4001, 1 + goto EventScript_16DEAA + end EventScript_16DEAA:: @ 816DEAA - loadword 0, gUnknown_8199C9F - callstd 4 - loadword 0, gUnknown_8199DC6 - callstd 5 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16DEF6 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16DED1 - end + loadword 0, gUnknown_8199C9F + callstd 4 + loadword 0, gUnknown_8199DC6 + callstd 5 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16DEF6 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16DED1 + end EventScript_16DED1:: @ 816DED1 - call EventScript_16DC27 - checkflag FLAG_0x269 - goto_if 1, EventScript_16DC68 - call EventScript_16DEE6 - releaseall - end + call EventScript_16DC27 + checkflag FLAG_0x269 + goto_if 1, EventScript_16DC68 + call EventScript_16DEE6 + releaseall + end EventScript_16DEE6:: @ 816DEE6 - playse SE_FU_ZAKU2 - waitse - call EventScript_16E1D7 - special DrawWholeMapView - setflag FLAG_0x269 - return + playse SE_FU_ZAKU2 + waitse + call EventScript_16E1D7 + special DrawWholeMapView + setflag FLAG_0x269 + return EventScript_16DEF6:: @ 816DEF6 - call EventScript_16DC34 - checktrainerflag 179 - goto_if 0, EventScript_16DF06 - releaseall - end + call EventScript_16DC34 + checktrainerflag 179 + goto_if 0, EventScript_16DF06 + releaseall + end EventScript_16DF06:: @ 816DF06 - compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_16DF40 - compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_16DF52 - textcolor 0 - loadword 0, gUnknown_81999B7 - callstd 4 - trainerbattle 3, 179, 0, Text_1999DB - checkflag FLAG_0x269 - goto_if 1, EventScript_16DC68 - call EventScript_16DEE6 - releaseall - end + compare_var_to_value VAR_0x4001, 0 + call_if 1, EventScript_16DF40 + compare_var_to_value VAR_0x4001, 1 + call_if 1, EventScript_16DF52 + textcolor 0 + loadword 0, gUnknown_81999B7 + callstd 4 + trainerbattle 3, 179, 0, Text_1999DB + checkflag FLAG_0x269 + goto_if 1, EventScript_16DC68 + call EventScript_16DEE6 + releaseall + end EventScript_16DF40:: @ 816DF40 - applymovement 255, Movement_1A75EB - applymovement 5, Movement_16DF64 - waitmovement 0 - return + applymovement 255, Movement_1A75EB + applymovement 5, Movement_16DF64 + waitmovement 0 + return EventScript_16DF52:: @ 816DF52 - applymovement 255, Movement_1A75EB - applymovement 5, Movement_16DF67 - waitmovement 0 - return + applymovement 255, Movement_1A75EB + applymovement 5, Movement_16DF67 + waitmovement 0 + return Movement_16DF64:: @ 816DF64 - step_12 - step_12 - step_end + step_12 + step_12 + step_end Movement_16DF67:: @ 816DF67 - step_12 - step_end + step_12 + step_end CinnabarIsland_Gym_EventScript_16DF69:: @ 816DF69 - lockall - setvar VAR_0x4001, 0 - goto EventScript_16DF81 - end + lockall + setvar VAR_0x4001, 0 + goto EventScript_16DF81 + end CinnabarIsland_Gym_EventScript_16DF75:: @ 816DF75 - lockall - setvar VAR_0x4001, 1 - goto EventScript_16DF81 - end + lockall + setvar VAR_0x4001, 1 + goto EventScript_16DF81 + end EventScript_16DF81:: @ 816DF81 - loadword 0, gUnknown_8199C9F - callstd 4 - loadword 0, gUnknown_8199E00 - callstd 5 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16DFA8 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16DFCD - end + loadword 0, gUnknown_8199C9F + callstd 4 + loadword 0, gUnknown_8199E00 + callstd 5 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16DFA8 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16DFCD + end EventScript_16DFA8:: @ 816DFA8 - call EventScript_16DC27 - checkflag FLAG_0x26A - goto_if 1, EventScript_16DC68 - call EventScript_16DFBD - releaseall - end + call EventScript_16DC27 + checkflag FLAG_0x26A + goto_if 1, EventScript_16DC68 + call EventScript_16DFBD + releaseall + end EventScript_16DFBD:: @ 816DFBD - playse SE_FU_ZAKU2 - waitse - call EventScript_16E1F3 - special DrawWholeMapView - setflag FLAG_0x26A - return + playse SE_FU_ZAKU2 + waitse + call EventScript_16E1F3 + special DrawWholeMapView + setflag FLAG_0x26A + return EventScript_16DFCD:: @ 816DFCD - call EventScript_16DC34 - checktrainerflag 215 - goto_if 0, EventScript_16DFDD - releaseall - end + call EventScript_16DC34 + checktrainerflag 215 + goto_if 0, EventScript_16DFDD + releaseall + end EventScript_16DFDD:: @ 816DFDD - compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_16E017 - compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_16E029 - textcolor 0 - loadword 0, gUnknown_8199A7F - callstd 4 - trainerbattle 3, 215, 0, Text_199AB9 - checkflag FLAG_0x26A - goto_if 1, EventScript_16DC68 - call EventScript_16DFBD - releaseall - end + compare_var_to_value VAR_0x4001, 0 + call_if 1, EventScript_16E017 + compare_var_to_value VAR_0x4001, 1 + call_if 1, EventScript_16E029 + textcolor 0 + loadword 0, gUnknown_8199A7F + callstd 4 + trainerbattle 3, 215, 0, Text_199AB9 + checkflag FLAG_0x26A + goto_if 1, EventScript_16DC68 + call EventScript_16DFBD + releaseall + end EventScript_16E017:: @ 816E017 - applymovement 255, Movement_1A75EB - applymovement 6, Movement_16E03B - waitmovement 0 - return + applymovement 255, Movement_1A75EB + applymovement 6, Movement_16E03B + waitmovement 0 + return EventScript_16E029:: @ 816E029 - applymovement 255, Movement_1A75EB - applymovement 6, Movement_16E03E - waitmovement 0 - return + applymovement 255, Movement_1A75EB + applymovement 6, Movement_16E03E + waitmovement 0 + return Movement_16E03B:: @ 816E03B - step_12 - step_12 - step_end + step_12 + step_12 + step_end Movement_16E03E:: @ 816E03E - step_12 - step_end + step_12 + step_end CinnabarIsland_Gym_EventScript_16E040:: @ 816E040 - lockall - setvar VAR_0x4001, 0 - goto EventScript_16E058 - end + lockall + setvar VAR_0x4001, 0 + goto EventScript_16E058 + end CinnabarIsland_Gym_EventScript_16E04C:: @ 816E04C - lockall - setvar VAR_0x4001, 1 - goto EventScript_16E058 - end + lockall + setvar VAR_0x4001, 1 + goto EventScript_16E058 + end EventScript_16E058:: @ 816E058 - loadword 0, gUnknown_8199C9F - callstd 4 - loadword 0, gUnknown_8199E36 - callstd 5 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16E0A4 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16E07F - end + loadword 0, gUnknown_8199C9F + callstd 4 + loadword 0, gUnknown_8199E36 + callstd 5 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16E0A4 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16E07F + end EventScript_16E07F:: @ 816E07F - call EventScript_16DC27 - checkflag FLAG_0x26B - goto_if 1, EventScript_16DC68 - call EventScript_16E094 - releaseall - end + call EventScript_16DC27 + checkflag FLAG_0x26B + goto_if 1, EventScript_16DC68 + call EventScript_16E094 + releaseall + end EventScript_16E094:: @ 816E094 - playse SE_FU_ZAKU2 - waitse - call EventScript_16E233 - special DrawWholeMapView - setflag FLAG_0x26B - return + playse SE_FU_ZAKU2 + waitse + call EventScript_16E233 + special DrawWholeMapView + setflag FLAG_0x26B + return EventScript_16E0A4:: @ 816E0A4 - call EventScript_16DC34 - checktrainerflag 180 - goto_if 0, EventScript_16E0B4 - releaseall - end + call EventScript_16DC34 + checktrainerflag 180 + goto_if 0, EventScript_16E0B4 + releaseall + end EventScript_16E0B4:: @ 816E0B4 - compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_16E0EE - compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_16E100 - textcolor 0 - loadword 0, gUnknown_8199AFC - callstd 4 - trainerbattle 3, 180, 0, Text_199B16 - checkflag FLAG_0x26B - goto_if 1, EventScript_16DC68 - call EventScript_16E094 - releaseall - end + compare_var_to_value VAR_0x4001, 0 + call_if 1, EventScript_16E0EE + compare_var_to_value VAR_0x4001, 1 + call_if 1, EventScript_16E100 + textcolor 0 + loadword 0, gUnknown_8199AFC + callstd 4 + trainerbattle 3, 180, 0, Text_199B16 + checkflag FLAG_0x26B + goto_if 1, EventScript_16DC68 + call EventScript_16E094 + releaseall + end EventScript_16E0EE:: @ 816E0EE - applymovement 255, Movement_1A75EB - applymovement 7, Movement_16E112 - waitmovement 0 - return + applymovement 255, Movement_1A75EB + applymovement 7, Movement_16E112 + waitmovement 0 + return EventScript_16E100:: @ 816E100 - applymovement 255, Movement_1A75EB - applymovement 7, Movement_16E115 - waitmovement 0 - return + applymovement 255, Movement_1A75EB + applymovement 7, Movement_16E115 + waitmovement 0 + return Movement_16E112:: @ 816E112 - step_12 - step_12 - step_end + step_12 + step_12 + step_end Movement_16E115:: @ 816E115 - step_12 - step_end + step_12 + step_end EventScript_16E117:: @ 816E117 - setmetatile 26, 8, 711, 0 - setmetatile 27, 8, 710, 0 - setmetatile 26, 9, 719, 0 - setmetatile 27, 9, 718, 0 - setmetatile 26, 10, 649, 0 - setmetatile 27, 10, 641, 0 - setmetatile 28, 10, 642, 0 - return + setmetatile 26, 8, 711, 0 + setmetatile 27, 8, 710, 0 + setmetatile 26, 9, 719, 0 + setmetatile 27, 9, 718, 0 + setmetatile 26, 10, 649, 0 + setmetatile 27, 10, 641, 0 + setmetatile 28, 10, 642, 0 + return EventScript_16E157:: @ 816E157 - setmetatile 17, 8, 711, 0 - setmetatile 18, 8, 710, 0 - setmetatile 17, 9, 719, 0 - setmetatile 18, 9, 718, 0 - setmetatile 17, 10, 649, 0 - setmetatile 18, 10, 641, 0 - setmetatile 19, 10, 642, 0 - return + setmetatile 17, 8, 711, 0 + setmetatile 18, 8, 710, 0 + setmetatile 17, 9, 719, 0 + setmetatile 18, 9, 718, 0 + setmetatile 17, 10, 649, 0 + setmetatile 18, 10, 641, 0 + setmetatile 19, 10, 642, 0 + return EventScript_16E197:: @ 816E197 - setmetatile 17, 15, 711, 0 - setmetatile 18, 15, 710, 0 - setmetatile 17, 16, 719, 0 - setmetatile 18, 16, 718, 0 - setmetatile 17, 17, 649, 0 - setmetatile 18, 17, 641, 0 - setmetatile 19, 17, 642, 0 - return + setmetatile 17, 15, 711, 0 + setmetatile 18, 15, 710, 0 + setmetatile 17, 16, 719, 0 + setmetatile 18, 16, 718, 0 + setmetatile 17, 17, 649, 0 + setmetatile 18, 17, 641, 0 + setmetatile 19, 17, 642, 0 + return EventScript_16E1D7:: @ 816E1D7 - setmetatile 11, 21, 721, 1 - setmetatile 11, 22, 649, 0 - setmetatile 11, 23, 641, 0 - return + setmetatile 11, 21, 721, 1 + setmetatile 11, 22, 649, 0 + setmetatile 11, 23, 641, 0 + return EventScript_16E1F3:: @ 816E1F3 - setmetatile 5, 16, 711, 0 - setmetatile 6, 16, 710, 0 - setmetatile 5, 17, 719, 0 - setmetatile 6, 17, 718, 0 - setmetatile 5, 18, 649, 0 - setmetatile 6, 18, 641, 0 - setmetatile 7, 18, 642, 0 - return + setmetatile 5, 16, 711, 0 + setmetatile 6, 16, 710, 0 + setmetatile 5, 17, 719, 0 + setmetatile 6, 17, 718, 0 + setmetatile 5, 18, 649, 0 + setmetatile 6, 18, 641, 0 + setmetatile 7, 18, 642, 0 + return EventScript_16E233:: @ 816E233 - setmetatile 5, 8, 711, 0 - setmetatile 6, 8, 710, 0 - setmetatile 5, 9, 719, 0 - setmetatile 6, 9, 718, 0 - setmetatile 5, 10, 649, 0 - setmetatile 6, 10, 641, 0 - setmetatile 7, 10, 642, 0 - return + setmetatile 5, 8, 711, 0 + setmetatile 6, 8, 710, 0 + setmetatile 5, 9, 719, 0 + setmetatile 6, 9, 718, 0 + setmetatile 5, 10, 649, 0 + setmetatile 6, 10, 641, 0 + setmetatile 7, 10, 642, 0 + return diff --git a/data/maps/CinnabarIsland_Mart/scripts.inc b/data/maps/CinnabarIsland_Mart/scripts.inc index f9808d872..70bae8915 100644 --- a/data/maps/CinnabarIsland_Mart/scripts.inc +++ b/data/maps/CinnabarIsland_Mart/scripts.inc @@ -1,39 +1,39 @@ CinnabarIsland_Mart_MapScripts:: @ 816EA0F - .byte 0 + .byte 0 CinnabarIsland_Mart_EventScript_16EA10:: @ 816EA10 - loadword 0, gUnknown_819A7A0 - callstd 2 - end + loadword 0, gUnknown_819A7A0 + callstd 2 + end CinnabarIsland_Mart_EventScript_16EA19:: @ 816EA19 - loadword 0, gUnknown_819A7F1 - callstd 2 - end + loadword 0, gUnknown_819A7F1 + callstd 2 + end CinnabarIsland_Mart_EventScript_16EA22:: @ 816EA22 - special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 - lock - faceplayer - message Text_1A6211 - waitmessage - pokemart Items_16EA48 - loadword 0, gUnknown_81A5190 - callstd 4 - release - end + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + lock + faceplayer + message Text_1A6211 + waitmessage + pokemart Items_16EA48 + loadword 0, gUnknown_81A5190 + callstd 4 + release + end - .align 2 + .align 2 Items_16EA48:: @ 816EA48 - .2byte ITEM_ULTRA_BALL - .2byte ITEM_GREAT_BALL - .2byte ITEM_HYPER_POTION - .2byte ITEM_REVIVE - .2byte ITEM_FULL_HEAL - .2byte ITEM_ESCAPE_ROPE - .2byte ITEM_MAX_REPEL - .2byte ITEM_NONE - release - end + .2byte ITEM_ULTRA_BALL + .2byte ITEM_GREAT_BALL + .2byte ITEM_HYPER_POTION + .2byte ITEM_REVIVE + .2byte ITEM_FULL_HEAL + .2byte ITEM_ESCAPE_ROPE + .2byte ITEM_MAX_REPEL + .2byte ITEM_NONE + release + end diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc index 3c15dfb23..0e162f512 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc @@ -1,150 +1,150 @@ CinnabarIsland_PokemonCenter_1F_MapScripts:: @ 816E8D7 - map_script 3, CinnabarIsland_PokemonCenter_1F_MapScript1_16E8E2 - map_script 5, CinnabarIsland_PokemonCenter_1F_MapScript2_1BC05C - .byte 0 + map_script 3, CinnabarIsland_PokemonCenter_1F_MapScript1_16E8E2 + map_script 5, CinnabarIsland_PokemonCenter_1F_MapScript2_1BC05C + .byte 0 CinnabarIsland_PokemonCenter_1F_MapScript1_16E8E2:: @ 816E8E2 - setrespawn 9 - end + setrespawn 9 + end CinnabarIsland_PokemonCenter_1F_EventScript_16E8E6:: @ 816E8E6 - lock - faceplayer - call EventScript_1A6578 - release - end + lock + faceplayer + call EventScript_1A6578 + release + end CinnabarIsland_PokemonCenter_1F_EventScript_16E8EF:: @ 816E8EF - loadword 0, gUnknown_819A5BE - callstd 2 - end + loadword 0, gUnknown_819A5BE + callstd 2 + end CinnabarIsland_PokemonCenter_1F_EventScript_16E8F8:: @ 816E8F8 - loadword 0, gUnknown_819A4F8 - callstd 2 - end + loadword 0, gUnknown_819A4F8 + callstd 2 + end CinnabarIsland_PokemonCenter_1F_EventScript_16E901:: @ 816E901 - loadword 0, gUnknown_819A6B1 - callstd 2 - end + loadword 0, gUnknown_819A6B1 + callstd 2 + end CinnabarIsland_PokemonCenter_1F_EventScript_16E90A:: @ 816E90A - lock - faceplayer - loadword 0, gUnknown_819A725 - callstd 5 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16E9A5 - loadword 0, gUnknown_819A785 - callstd 4 - closemessage - playbgm BGM_FRLG_FOLLOW_ME, 1 - savebgm BGM_FRLG_FOLLOW_ME - setflag FLAG_SPECIAL_FLAG_0x4001 - setflag FLAG_0x0A2 - delay 20 - compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_16E96F - compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_16E981 - compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_16E993 - removeobject 7 - setvar VAR_0x408A, 1 - clearflag FLAG_0x062 - warp MAP_CINNABAR_ISLAND, 255, 14, 11 - waitstate - release - end + lock + faceplayer + loadword 0, gUnknown_819A725 + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16E9A5 + loadword 0, gUnknown_819A785 + callstd 4 + closemessage + playbgm BGM_FRLG_FOLLOW_ME, 1 + savebgm BGM_FRLG_FOLLOW_ME + setflag FLAG_SPECIAL_FLAG_0x4001 + setflag FLAG_0x0A2 + delay 20 + compare_var_to_value VAR_FACING, 1 + call_if 1, EventScript_16E96F + compare_var_to_value VAR_FACING, 4 + call_if 1, EventScript_16E981 + compare_var_to_value VAR_FACING, 3 + call_if 1, EventScript_16E993 + removeobject 7 + setvar VAR_0x408A, 1 + clearflag FLAG_0x062 + warp MAP_CINNABAR_ISLAND, 255, 14, 11 + waitstate + release + end EventScript_16E96F:: @ 816E96F - applymovement 7, Movement_16E9AF - applymovement 255, Movement_16E9B9 - waitmovement 0 - return + applymovement 7, Movement_16E9AF + applymovement 255, Movement_16E9B9 + waitmovement 0 + return EventScript_16E981:: @ 816E981 - applymovement 7, Movement_16E9C3 - applymovement 255, Movement_16E9CF - waitmovement 0 - return + applymovement 7, Movement_16E9C3 + applymovement 255, Movement_16E9CF + waitmovement 0 + return EventScript_16E993:: @ 816E993 - applymovement 7, Movement_16E9AF - applymovement 255, Movement_16E9DE - waitmovement 0 - return + applymovement 7, Movement_16E9AF + applymovement 255, Movement_16E9DE + waitmovement 0 + return EventScript_16E9A5:: @ 816E9A5 - loadword 0, gUnknown_819A766 - callstd 4 - release - end + loadword 0, gUnknown_819A766 + callstd 4 + release + end Movement_16E9AF:: @ 816E9AF - step_12 - step_12 - step_12 - step_12 - step_10 - step_10 - step_10 - step_1b - step_60 - step_end + step_12 + step_12 + step_12 + step_12 + step_10 + step_10 + step_10 + step_1b + step_60 + step_end Movement_16E9B9:: @ 816E9B9 - step_10 - step_12 - step_12 - step_12 - step_12 - step_10 - step_10 - step_1c - step_10 - step_end + step_10 + step_12 + step_12 + step_12 + step_12 + step_10 + step_10 + step_1c + step_10 + step_end Movement_16E9C3:: @ 816E9C3 - step_11 - step_12 - step_12 - step_10 - step_12 - step_12 - step_10 - step_10 - step_10 - step_1b - step_60 - step_end + step_11 + step_12 + step_12 + step_10 + step_12 + step_12 + step_10 + step_10 + step_10 + step_1b + step_60 + step_end Movement_16E9CF:: @ 816E9CF - step_1c - step_1c - step_1c - step_02 - step_1c - step_12 - step_12 - step_12 - step_10 - step_10 - step_1b - step_10 - step_1b - step_60 - step_end + step_1c + step_1c + step_1c + step_02 + step_1c + step_12 + step_12 + step_12 + step_10 + step_10 + step_1b + step_10 + step_1b + step_60 + step_end Movement_16E9DE:: @ 816E9DE - step_12 - step_12 - step_12 - step_12 - step_12 - step_10 - step_10 - step_1c - step_10 - step_end + step_12 + step_12 + step_12 + step_12 + step_12 + step_10 + step_10 + step_1c + step_10 + step_end diff --git a/data/maps/CinnabarIsland_PokemonCenter_2F/scripts.inc b/data/maps/CinnabarIsland_PokemonCenter_2F/scripts.inc index 90969f46d..828f9296a 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_2F/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonCenter_2F/scripts.inc @@ -1,18 +1,18 @@ CinnabarIsland_PokemonCenter_2F_MapScripts:: @ 816E9E8 - map_script 2, CinnabarIsland_PokemonCenter_2F_MapScript1_1BB2A3 - map_script 4, CinnabarIsland_PokemonCenter_2F_MapScript2_1BB1ED - map_script 1, CinnabarIsland_PokemonCenter_2F_MapScript3_1BB237 - map_script 3, CinnabarIsland_PokemonCenter_2F_MapScript4_1BB1B4 - .byte 0 + map_script 2, CinnabarIsland_PokemonCenter_2F_MapScript1_1BB2A3 + map_script 4, CinnabarIsland_PokemonCenter_2F_MapScript2_1BB1ED + map_script 1, CinnabarIsland_PokemonCenter_2F_MapScript3_1BB237 + map_script 3, CinnabarIsland_PokemonCenter_2F_MapScript4_1BB1B4 + .byte 0 CinnabarIsland_PokemonCenter_2F_EventScript_16E9FD:: @ 816E9FD - call EventScript_1BB4A3 - end + call EventScript_1BB4A3 + end EventScript_16EA03:: @ 816EA03 - call EventScript_1BB6AB - end + call EventScript_1BB6AB + end EventScript_16EA09:: @ 816EA09 - call EventScript_1BB7DE - end + call EventScript_1BB7DE + end diff --git a/data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc index e32112ffc..b0035df63 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc @@ -1,37 +1,37 @@ CinnabarIsland_PokemonLab_Entrance_MapScripts:: @ 816E273 - map_script 3, CinnabarIsland_PokemonLab_Entrance_MapScript1_16E279 - .byte 0 + map_script 3, CinnabarIsland_PokemonLab_Entrance_MapScript1_16E279 + .byte 0 CinnabarIsland_PokemonLab_Entrance_MapScript1_16E279:: @ 816E279 - compare_var_to_value VAR_0x406A, 1 - call_if 1, EventScript_16E285 - end + compare_var_to_value VAR_0x406A, 1 + call_if 1, EventScript_16E285 + end EventScript_16E285:: @ 816E285 - setvar VAR_0x406A, 2 - return + setvar VAR_0x406A, 2 + return CinnabarIsland_PokemonLab_Entrance_EventScript_16E28B:: @ 816E28B - loadword 0, gUnknown_8199EE5 - callstd 2 - end + loadword 0, gUnknown_8199EE5 + callstd 2 + end CinnabarIsland_PokemonLab_Entrance_EventScript_16E294:: @ 816E294 - loadword 0, gUnknown_8199F41 - callstd 3 - end + loadword 0, gUnknown_8199F41 + callstd 3 + end CinnabarIsland_PokemonLab_Entrance_EventScript_16E29D:: @ 816E29D - loadword 0, gUnknown_8199F6A - callstd 3 - end + loadword 0, gUnknown_8199F6A + callstd 3 + end CinnabarIsland_PokemonLab_Entrance_EventScript_16E2A6:: @ 816E2A6 - loadword 0, gUnknown_8199F83 - callstd 3 - end + loadword 0, gUnknown_8199F83 + callstd 3 + end CinnabarIsland_PokemonLab_Entrance_EventScript_16E2AF:: @ 816E2AF - loadword 0, gUnknown_8199F9A - callstd 3 - end + loadword 0, gUnknown_8199F9A + callstd 3 + end diff --git a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc index 3b0168728..733c6be41 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc @@ -1,362 +1,362 @@ CinnabarIsland_PokemonLab_ExperimentRoom_MapScripts:: @ 816E400 - .byte 0 + .byte 0 CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E401:: @ 816E401 - lock - faceplayer - setvar VAR_0x8008, 8 - call EventScript_1A8CAD - checkflag FLAG_0x276 - goto_if 1, EventScript_16E473 - loadword 0, gUnknown_81A597B - callstd 5 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16E45B - call EventScript_1A8CBD - compare_var_to_value VAR_0x8004, 6 - goto_if 4, EventScript_16E45B - call EventScript_1A8CC9 - compare_var_to_var VAR_RESULT, VAR_0x8009 - goto_if 5, EventScript_16E465 - call EventScript_1A8CD9 - loadword 0, gUnknown_81A59DA - callstd 4 - setflag FLAG_0x276 - release - end + lock + faceplayer + setvar VAR_0x8008, 8 + call EventScript_1A8CAD + checkflag FLAG_0x276 + goto_if 1, EventScript_16E473 + loadword 0, gUnknown_81A597B + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16E45B + call EventScript_1A8CBD + compare_var_to_value VAR_0x8004, 6 + goto_if 4, EventScript_16E45B + call EventScript_1A8CC9 + compare_var_to_var VAR_RESULT, VAR_0x8009 + goto_if 5, EventScript_16E465 + call EventScript_1A8CD9 + loadword 0, gUnknown_81A59DA + callstd 4 + setflag FLAG_0x276 + release + end EventScript_16E45B:: @ 816E45B - loadword 0, gUnknown_81A59B6 - callstd 4 - release - end + loadword 0, gUnknown_81A59B6 + callstd 4 + release + end EventScript_16E465:: @ 816E465 - getspeciesname 0, 32777 - loadword 0, gUnknown_81A59C6 - callstd 4 - release - end + getspeciesname 0, 32777 + loadword 0, gUnknown_81A59C6 + callstd 4 + release + end EventScript_16E473:: @ 816E473 - loadword 0, gUnknown_81A59E7 - callstd 4 - release - end + loadword 0, gUnknown_81A59E7 + callstd 4 + release + end CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E47D:: @ 816E47D - lock - faceplayer - setvar VAR_RESULT, 0 - checkflag FLAG_0x2EE - call_if 1, EventScript_16E8A1 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16E897 - compare_var_to_value VAR_0x406A, 2 - goto_if 1, EventScript_16E736 - compare_var_to_value VAR_0x406A, 1 - goto_if 1, EventScript_16E72C - call EventScript_16E4EC - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16E544 - call EventScript_16E504 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16E586 - call EventScript_16E51C - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16E5C8 - loadword 0, gUnknown_819A282 - callstd 4 - goto EventScript_16E53A - end + lock + faceplayer + setvar VAR_RESULT, 0 + checkflag FLAG_0x2EE + call_if 1, EventScript_16E8A1 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16E897 + compare_var_to_value VAR_0x406A, 2 + goto_if 1, EventScript_16E736 + compare_var_to_value VAR_0x406A, 1 + goto_if 1, EventScript_16E72C + call EventScript_16E4EC + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16E544 + call EventScript_16E504 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16E586 + call EventScript_16E51C + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16E5C8 + loadword 0, gUnknown_819A282 + callstd 4 + goto EventScript_16E53A + end EventScript_16E4EC:: @ 816E4EC - checkflag FLAG_0x273 - goto_if 0, EventScript_16E534 - checkflag FLAG_0x2ED - goto_if 1, EventScript_16E534 - setvar VAR_RESULT, 1 - return + checkflag FLAG_0x273 + goto_if 0, EventScript_16E534 + checkflag FLAG_0x2ED + goto_if 1, EventScript_16E534 + setvar VAR_RESULT, 1 + return EventScript_16E504:: @ 816E504 - checkflag FLAG_0x272 - goto_if 0, EventScript_16E534 - checkflag FLAG_0x2EC - goto_if 1, EventScript_16E534 - setvar VAR_RESULT, 1 - return + checkflag FLAG_0x272 + goto_if 0, EventScript_16E534 + checkflag FLAG_0x2EC + goto_if 1, EventScript_16E534 + setvar VAR_RESULT, 1 + return EventScript_16E51C:: @ 816E51C - checkflag FLAG_0x25E - goto_if 0, EventScript_16E534 - checkflag FLAG_0x2EE - goto_if 1, EventScript_16E534 - setvar VAR_RESULT, 1 - return + checkflag FLAG_0x25E + goto_if 0, EventScript_16E534 + checkflag FLAG_0x2EE + goto_if 1, EventScript_16E534 + setvar VAR_RESULT, 1 + return EventScript_16E534:: @ 816E534 - setvar VAR_RESULT, 0 - return + setvar VAR_RESULT, 0 + return EventScript_16E53A:: @ 816E53A - loadword 0, gUnknown_819A314 - callstd 4 - release - end + loadword 0, gUnknown_819A314 + callstd 4 + release + end EventScript_16E544:: @ 816E544 - message Text_19A282 - waitmessage - call EventScript_16E51C - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16E5FA - multichoice 0, 0, 21, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_16E668 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16E53A - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_16E53A - end + message Text_19A282 + waitmessage + call EventScript_16E51C + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16E5FA + multichoice 0, 0, 21, 0 + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_16E668 + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_16E53A + compare_var_to_value VAR_0x8000, 127 + goto_if 1, EventScript_16E53A + end EventScript_16E586:: @ 816E586 - message Text_19A282 - waitmessage - call EventScript_16E51C - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16E631 - multichoice 0, 0, 22, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_16E6A6 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16E53A - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_16E53A - end + message Text_19A282 + waitmessage + call EventScript_16E51C + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16E631 + multichoice 0, 0, 22, 0 + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_16E6A6 + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_16E53A + compare_var_to_value VAR_0x8000, 127 + goto_if 1, EventScript_16E53A + end EventScript_16E5C8:: @ 816E5C8 - message Text_19A282 - waitmessage - multichoice 0, 0, 23, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_16E6E4 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16E53A - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_16E53A - end + message Text_19A282 + waitmessage + multichoice 0, 0, 23, 0 + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_16E6E4 + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_16E53A + compare_var_to_value VAR_0x8000, 127 + goto_if 1, EventScript_16E53A + end EventScript_16E5FA:: @ 816E5FA - multichoice 0, 0, 24, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_16E668 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16E6E4 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_16E53A - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_16E53A - end + multichoice 0, 0, 24, 0 + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_16E668 + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_16E6E4 + compare_var_to_value VAR_0x8000, 2 + goto_if 1, EventScript_16E53A + compare_var_to_value VAR_0x8000, 127 + goto_if 1, EventScript_16E53A + end EventScript_16E631:: @ 816E631 - multichoice 0, 0, 25, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_16E6A6 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16E6E4 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_16E53A - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_16E53A - end + multichoice 0, 0, 25, 0 + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_16E6A6 + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_16E6E4 + compare_var_to_value VAR_0x8000, 2 + goto_if 1, EventScript_16E53A + compare_var_to_value VAR_0x8000, 127 + goto_if 1, EventScript_16E53A + end EventScript_16E668:: @ 816E668 - getspeciesname 0, SPECIES_OMANYTE - getitemname 1, ITEM_HELIX_FOSSIL - loadword 0, gUnknown_819A3D4 - callstd 5 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16E722 - loadword 0, gUnknown_819A45D - callstd 4 - textcolor 0 - removeitem ITEM_HELIX_FOSSIL, 1 - loadword 0, gUnknown_819A4AB - callstd 4 - setvar VAR_0x406A, 1 - setvar VAR_0x4069, 1 - release - end + getspeciesname 0, SPECIES_OMANYTE + getitemname 1, ITEM_HELIX_FOSSIL + loadword 0, gUnknown_819A3D4 + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16E722 + loadword 0, gUnknown_819A45D + callstd 4 + textcolor 0 + removeitem ITEM_HELIX_FOSSIL, 1 + loadword 0, gUnknown_819A4AB + callstd 4 + setvar VAR_0x406A, 1 + setvar VAR_0x4069, 1 + release + end EventScript_16E6A6:: @ 816E6A6 - getspeciesname 0, SPECIES_KABUTO - getitemname 1, ITEM_DOME_FOSSIL - loadword 0, gUnknown_819A3D4 - callstd 5 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16E722 - loadword 0, gUnknown_819A45D - callstd 4 - textcolor 0 - removeitem ITEM_DOME_FOSSIL, 1 - loadword 0, gUnknown_819A4AB - callstd 4 - setvar VAR_0x406A, 1 - setvar VAR_0x4069, 2 - release - end + getspeciesname 0, SPECIES_KABUTO + getitemname 1, ITEM_DOME_FOSSIL + loadword 0, gUnknown_819A3D4 + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16E722 + loadword 0, gUnknown_819A45D + callstd 4 + textcolor 0 + removeitem ITEM_DOME_FOSSIL, 1 + loadword 0, gUnknown_819A4AB + callstd 4 + setvar VAR_0x406A, 1 + setvar VAR_0x4069, 2 + release + end EventScript_16E6E4:: @ 816E6E4 - getspeciesname 0, SPECIES_AERODACTYL - getitemname 1, ITEM_OLD_AMBER - loadword 0, gUnknown_819A3D4 - callstd 5 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16E722 - loadword 0, gUnknown_819A45D - callstd 4 - textcolor 0 - removeitem ITEM_OLD_AMBER, 1 - loadword 0, gUnknown_819A4AB - callstd 4 - setvar VAR_0x406A, 1 - setvar VAR_0x4069, 3 - release - end + getspeciesname 0, SPECIES_AERODACTYL + getitemname 1, ITEM_OLD_AMBER + loadword 0, gUnknown_819A3D4 + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16E722 + loadword 0, gUnknown_819A45D + callstd 4 + textcolor 0 + removeitem ITEM_OLD_AMBER, 1 + loadword 0, gUnknown_819A4AB + callstd 4 + setvar VAR_0x406A, 1 + setvar VAR_0x4069, 3 + release + end EventScript_16E722:: @ 816E722 - loadword 0, gUnknown_819A4E1 - callstd 4 - release - end + loadword 0, gUnknown_819A4E1 + callstd 4 + release + end EventScript_16E72C:: @ 816E72C - loadword 0, gUnknown_819A4AB - callstd 4 - release - end + loadword 0, gUnknown_819A4AB + callstd 4 + release + end EventScript_16E736:: @ 816E736 - compare_var_to_value VAR_0x4069, 1 - goto_if 1, EventScript_16E758 - compare_var_to_value VAR_0x4069, 2 - goto_if 1, EventScript_16E79D - compare_var_to_value VAR_0x4069, 3 - goto_if 1, EventScript_16E7E2 - end + compare_var_to_value VAR_0x4069, 1 + goto_if 1, EventScript_16E758 + compare_var_to_value VAR_0x4069, 2 + goto_if 1, EventScript_16E79D + compare_var_to_value VAR_0x4069, 3 + goto_if 1, EventScript_16E7E2 + end EventScript_16E758:: @ 816E758 - setvar VAR_0x4001, 138 - getspeciesname 0, SPECIES_OMANYTE - loadword 0, gUnknown_819A34F - callstd 4 - givemon SPECIES_OMANYTE, 5, ITEM_NONE, 0, 0, 0 - compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A927C - setflag FLAG_0x2ED - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16E827 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16E85B - end + setvar VAR_0x4001, 138 + getspeciesname 0, SPECIES_OMANYTE + loadword 0, gUnknown_819A34F + callstd 4 + givemon SPECIES_OMANYTE, 5, ITEM_NONE, 0, 0, 0 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A927C + setflag FLAG_0x2ED + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16E827 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16E85B + end EventScript_16E79D:: @ 816E79D - setvar VAR_0x4001, 140 - getspeciesname 0, SPECIES_KABUTO - loadword 0, gUnknown_819A34F - callstd 4 - givemon SPECIES_KABUTO, 5, ITEM_NONE, 0, 0, 0 - compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A927C - setflag FLAG_0x2EC - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16E827 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16E85B - end + setvar VAR_0x4001, 140 + getspeciesname 0, SPECIES_KABUTO + loadword 0, gUnknown_819A34F + callstd 4 + givemon SPECIES_KABUTO, 5, ITEM_NONE, 0, 0, 0 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A927C + setflag FLAG_0x2EC + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16E827 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16E85B + end EventScript_16E7E2:: @ 816E7E2 - setvar VAR_0x4001, 142 - getspeciesname 0, SPECIES_AERODACTYL - loadword 0, gUnknown_819A34F - callstd 4 - givemon SPECIES_AERODACTYL, 5, ITEM_NONE, 0, 0, 0 - compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A927C - setflag FLAG_0x2EE - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16E827 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16E85B - end + setvar VAR_0x4001, 142 + getspeciesname 0, SPECIES_AERODACTYL + loadword 0, gUnknown_819A34F + callstd 4 + givemon SPECIES_AERODACTYL, 5, ITEM_NONE, 0, 0, 0 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A927C + setflag FLAG_0x2EE + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16E827 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16E85B + end EventScript_16E827:: @ 816E827 - textcolor 3 - playfanfare MUS_FANFA1 - message Text_19A39E - waitmessage - waitfanfare - setvar VAR_0x406A, 0 - loadword 0, gUnknown_81A56A7 - callstd 5 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16E895 - call EventScript_1A8C27 - call EventScript_1A74EB - goto EventScript_16E895 - end + textcolor 3 + playfanfare MUS_FANFA1 + message Text_19A39E + waitmessage + waitfanfare + setvar VAR_0x406A, 0 + loadword 0, gUnknown_81A56A7 + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16E895 + call EventScript_1A8C27 + call EventScript_1A74EB + goto EventScript_16E895 + end EventScript_16E85B:: @ 816E85B - textcolor 3 - playfanfare MUS_FANFA1 - message Text_19A39E - waitmessage - waitfanfare - setvar VAR_0x406A, 0 - loadword 0, gUnknown_81A56A7 - callstd 5 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16E88A - call EventScript_1A8C33 - goto EventScript_16E88A - end + textcolor 3 + playfanfare MUS_FANFA1 + message Text_19A39E + waitmessage + waitfanfare + setvar VAR_0x406A, 0 + loadword 0, gUnknown_81A56A7 + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16E88A + call EventScript_1A8C33 + goto EventScript_16E88A + end EventScript_16E88A:: @ 816E88A - call EventScript_1A8C3C - goto EventScript_16E895 - end + call EventScript_1A8C3C + goto EventScript_16E895 + end EventScript_16E895:: @ 816E895 - release - end + release + end EventScript_16E897:: @ 816E897 - loadword 0, gUnknown_819A4E1 - callstd 4 - release - end + loadword 0, gUnknown_819A4E1 + callstd 4 + release + end EventScript_16E8A1:: @ 816E8A1 - checkflag FLAG_0x273 - goto_if 1, EventScript_16E8B9 - checkflag FLAG_0x272 - goto_if 1, EventScript_16E8C8 - goto EventScript_16E534 - end + checkflag FLAG_0x273 + goto_if 1, EventScript_16E8B9 + checkflag FLAG_0x272 + goto_if 1, EventScript_16E8C8 + goto EventScript_16E534 + end EventScript_16E8B9:: @ 816E8B9 - checkflag FLAG_0x2ED - goto_if 0, EventScript_16E534 - setvar VAR_RESULT, 1 - return + checkflag FLAG_0x2ED + goto_if 0, EventScript_16E534 + setvar VAR_RESULT, 1 + return EventScript_16E8C8:: @ 816E8C8 - checkflag FLAG_0x2EC - goto_if 0, EventScript_16E534 - setvar VAR_RESULT, 1 - return + checkflag FLAG_0x2EC + goto_if 0, EventScript_16E534 + setvar VAR_RESULT, 1 + return diff --git a/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc index cf6b63139..1e026f8f2 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc @@ -1,103 +1,103 @@ CinnabarIsland_PokemonLab_Lounge_MapScripts:: @ 816E2B8 - .byte 0 + .byte 0 CinnabarIsland_PokemonLab_Lounge_EventScript_16E2B9:: @ 816E2B9 - loadword 0, gUnknown_8199FB3 - callstd 2 - end + loadword 0, gUnknown_8199FB3 + callstd 2 + end CinnabarIsland_PokemonLab_Lounge_EventScript_16E2C2:: @ 816E2C2 - lock - faceplayer - setvar VAR_0x8008, 6 - call EventScript_1A8CAD - checkflag FLAG_0x274 - goto_if 1, EventScript_16E334 - loadword 0, gUnknown_81A59FE - callstd 5 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16E31C - call EventScript_1A8CBD - compare_var_to_value VAR_0x8004, 6 - goto_if 4, EventScript_16E31C - call EventScript_1A8CC9 - compare_var_to_var VAR_RESULT, VAR_0x8009 - goto_if 5, EventScript_16E326 - call EventScript_1A8CD9 - loadword 0, gUnknown_81A5A9D - callstd 4 - setflag FLAG_0x274 - release - end + lock + faceplayer + setvar VAR_0x8008, 6 + call EventScript_1A8CAD + checkflag FLAG_0x274 + goto_if 1, EventScript_16E334 + loadword 0, gUnknown_81A59FE + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16E31C + call EventScript_1A8CBD + compare_var_to_value VAR_0x8004, 6 + goto_if 4, EventScript_16E31C + call EventScript_1A8CC9 + compare_var_to_var VAR_RESULT, VAR_0x8009 + goto_if 5, EventScript_16E326 + call EventScript_1A8CD9 + loadword 0, gUnknown_81A5A9D + callstd 4 + setflag FLAG_0x274 + release + end EventScript_16E31C:: @ 816E31C - loadword 0, gUnknown_81A5A4E - callstd 4 - release - end + loadword 0, gUnknown_81A5A4E + callstd 4 + release + end EventScript_16E326:: @ 816E326 - getspeciesname 0, 32777 - loadword 0, gUnknown_81A5A6A - callstd 4 - release - end + getspeciesname 0, 32777 + loadword 0, gUnknown_81A5A6A + callstd 4 + release + end EventScript_16E334:: @ 816E334 - loadword 0, gUnknown_81A5AA5 - callstd 4 - release - end + loadword 0, gUnknown_81A5AA5 + callstd 4 + release + end CinnabarIsland_PokemonLab_Lounge_EventScript_16E33E:: @ 816E33E - lock - faceplayer - setvar VAR_0x8008, 7 - copyvar VAR_0x8004, VAR_0x8008 - specialvar VAR_RESULT, sub_8053A9C - copyvar VAR_0x8009, VAR_RESULT - checkflag FLAG_0x275 - goto_if 1, EventScript_16E3D4 - loadword 0, gUnknown_81A5AD6 - callstd 5 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16E3BC - special sub_80BF8FC - waitstate - copyvar VAR_0x800A, VAR_0x8004 - compare_var_to_value VAR_0x8004, 6 - goto_if 4, EventScript_16E3BC - copyvar VAR_0x8005, VAR_0x800A - specialvar VAR_RESULT, sub_8053D2C - copyvar VAR_0x800B, VAR_RESULT - compare_var_to_var VAR_RESULT, VAR_0x8009 - goto_if 5, EventScript_16E3C6 - copyvar VAR_0x8004, VAR_0x8008 - copyvar VAR_0x8005, VAR_0x800A - special sub_8053D68 - special sub_8054440 - waitstate - loadword 0, gUnknown_81A5B4A - callstd 4 - setflag FLAG_0x275 - release - end + lock + faceplayer + setvar VAR_0x8008, 7 + copyvar VAR_0x8004, VAR_0x8008 + specialvar VAR_RESULT, sub_8053A9C + copyvar VAR_0x8009, VAR_RESULT + checkflag FLAG_0x275 + goto_if 1, EventScript_16E3D4 + loadword 0, gUnknown_81A5AD6 + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16E3BC + special sub_80BF8FC + waitstate + copyvar VAR_0x800A, VAR_0x8004 + compare_var_to_value VAR_0x8004, 6 + goto_if 4, EventScript_16E3BC + copyvar VAR_0x8005, VAR_0x800A + specialvar VAR_RESULT, sub_8053D2C + copyvar VAR_0x800B, VAR_RESULT + compare_var_to_var VAR_RESULT, VAR_0x8009 + goto_if 5, EventScript_16E3C6 + copyvar VAR_0x8004, VAR_0x8008 + copyvar VAR_0x8005, VAR_0x800A + special sub_8053D68 + special sub_8054440 + waitstate + loadword 0, gUnknown_81A5B4A + callstd 4 + setflag FLAG_0x275 + release + end EventScript_16E3BC:: @ 816E3BC - loadword 0, gUnknown_81A5B08 - callstd 4 - release - end + loadword 0, gUnknown_81A5B08 + callstd 4 + release + end EventScript_16E3C6:: @ 816E3C6 - getspeciesname 0, 32777 - loadword 0, gUnknown_81A5B18 - callstd 4 - release - end + getspeciesname 0, 32777 + loadword 0, gUnknown_81A5B18 + callstd 4 + release + end EventScript_16E3D4:: @ 816E3D4 - loadword 0, gUnknown_81A5B60 - callstd 4 - release - end + loadword 0, gUnknown_81A5B60 + callstd 4 + release + end diff --git a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/scripts.inc index 00fe86925..b331e96e8 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/scripts.inc @@ -1,21 +1,21 @@ CinnabarIsland_PokemonLab_ResearchRoom_MapScripts:: @ 816E3DE - .byte 0 + .byte 0 CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3DF:: @ 816E3DF - goto EventScript_1C4C8E - end + goto EventScript_1C4C8E + end CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3E5:: @ 816E3E5 - loadword 0, gUnknown_819A015 - callstd 2 - end + loadword 0, gUnknown_819A015 + callstd 2 + end CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3EE:: @ 816E3EE - loadword 0, gUnknown_819A04A - callstd 3 - end + loadword 0, gUnknown_819A04A + callstd 3 + end CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3F7:: @ 816E3F7 - loadword 0, gUnknown_819A128 - callstd 3 - end + loadword 0, gUnknown_819A128 + callstd 3 + end diff --git a/data/maps/DiglettsCave_B1F/scripts.inc b/data/maps/DiglettsCave_B1F/scripts.inc index cda6522cc..fd5e75f3d 100644 --- a/data/maps/DiglettsCave_B1F/scripts.inc +++ b/data/maps/DiglettsCave_B1F/scripts.inc @@ -1,7 +1,7 @@ DiglettsCave_B1F_MapScripts:: @ 8160EF1 - map_script 3, DiglettsCave_B1F_MapScript1_160EF7 - .byte 0 + map_script 3, DiglettsCave_B1F_MapScript1_160EF7 + .byte 0 DiglettsCave_B1F_MapScript1_160EF7:: @ 8160EF7 - setworldmapflag 2217 - end + setworldmapflag 2217 + end diff --git a/data/maps/DiglettsCave_NorthEntrance/scripts.inc b/data/maps/DiglettsCave_NorthEntrance/scripts.inc index d5361b81a..ec49e53d3 100644 --- a/data/maps/DiglettsCave_NorthEntrance/scripts.inc +++ b/data/maps/DiglettsCave_NorthEntrance/scripts.inc @@ -1,7 +1,7 @@ DiglettsCave_NorthEntrance_MapScripts:: @ 8160EE7 - .byte 0 + .byte 0 DiglettsCave_NorthEntrance_EventScript_160EE8:: @ 8160EE8 - loadword 0, gUnknown_817462C - callstd 2 - end + loadword 0, gUnknown_817462C + callstd 2 + end diff --git a/data/maps/DiglettsCave_SouthEntrance/scripts.inc b/data/maps/DiglettsCave_SouthEntrance/scripts.inc index 78db82fe7..ebdb29ecd 100644 --- a/data/maps/DiglettsCave_SouthEntrance/scripts.inc +++ b/data/maps/DiglettsCave_SouthEntrance/scripts.inc @@ -1,7 +1,7 @@ DiglettsCave_SouthEntrance_MapScripts:: @ 8160EFB - .byte 0 + .byte 0 DiglettsCave_SouthEntrance_EventScript_160EFC:: @ 8160EFC - loadword 0, gUnknown_81746A7 - callstd 2 - end + loadword 0, gUnknown_81746A7 + callstd 2 + end diff --git a/data/maps/FiveIsland/scripts.inc b/data/maps/FiveIsland/scripts.inc index 43db0e050..273749e3b 100644 --- a/data/maps/FiveIsland/scripts.inc +++ b/data/maps/FiveIsland/scripts.inc @@ -1,22 +1,22 @@ FiveIsland_MapScripts:: @ 8167E8E - map_script 3, FiveIsland_MapScript1_167E94 - .byte 0 + map_script 3, FiveIsland_MapScript1_167E94 + .byte 0 FiveIsland_MapScript1_167E94:: @ 8167E94 - setworldmapflag 2207 - end + setworldmapflag 2207 + end FiveIsland_EventScript_167E98:: @ 8167E98 - loadword 0, gUnknown_8182DFB - callstd 3 - end + loadword 0, gUnknown_8182DFB + callstd 3 + end FiveIsland_EventScript_167EA1:: @ 8167EA1 - loadword 0, gUnknown_8182E26 - callstd 2 - end + loadword 0, gUnknown_8182E26 + callstd 2 + end FiveIsland_EventScript_167EAA:: @ 8167EAA - loadword 0, gUnknown_8182E96 - callstd 2 - end + loadword 0, gUnknown_8182E96 + callstd 2 + end diff --git a/data/maps/FiveIsland_Harbor/scripts.inc b/data/maps/FiveIsland_Harbor/scripts.inc index a88a2f3fd..f5d12f8a4 100644 --- a/data/maps/FiveIsland_Harbor/scripts.inc +++ b/data/maps/FiveIsland_Harbor/scripts.inc @@ -1,11 +1,11 @@ FiveIsland_Harbor_MapScripts:: @ 8171D42 - .byte 0 + .byte 0 FiveIsland_Harbor_EventScript_171D43:: @ 8171D43 - lock - faceplayer - message Text_181726 - waitmessage - setvar VAR_0x8004, 5 - goto EventScript_1A900F - end + lock + faceplayer + message Text_181726 + waitmessage + setvar VAR_0x8004, 5 + goto EventScript_1A900F + end diff --git a/data/maps/FiveIsland_House1/scripts.inc b/data/maps/FiveIsland_House1/scripts.inc index ca38f9944..3fc45b489 100644 --- a/data/maps/FiveIsland_House1/scripts.inc +++ b/data/maps/FiveIsland_House1/scripts.inc @@ -1,7 +1,7 @@ FiveIsland_House1_MapScripts:: @ 8171D56 - .byte 0 + .byte 0 FiveIsland_House1_EventScript_171D57:: @ 8171D57 - loadword 0, gUnknown_81A3CAC - callstd 2 - end + loadword 0, gUnknown_81A3CAC + callstd 2 + end diff --git a/data/maps/FiveIsland_House2/scripts.inc b/data/maps/FiveIsland_House2/scripts.inc index 313e27a92..7197ed54b 100644 --- a/data/maps/FiveIsland_House2/scripts.inc +++ b/data/maps/FiveIsland_House2/scripts.inc @@ -1,7 +1,7 @@ FiveIsland_House2_MapScripts:: @ 8171D60 - .byte 0 + .byte 0 FiveIsland_House2_EventScript_171D61:: @ 8171D61 - loadword 0, gUnknown_81A3D5E - callstd 2 - end + loadword 0, gUnknown_81A3D5E + callstd 2 + end diff --git a/data/maps/FiveIsland_LostCave_Entrance/scripts.inc b/data/maps/FiveIsland_LostCave_Entrance/scripts.inc index a6dc91f63..83b8eca06 100644 --- a/data/maps/FiveIsland_LostCave_Entrance/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Entrance/scripts.inc @@ -1,7 +1,7 @@ FiveIsland_LostCave_Entrance_MapScripts:: @ 8164BEC - map_script 3, FiveIsland_LostCave_Entrance_MapScript1_164BF2 - .byte 0 + map_script 3, FiveIsland_LostCave_Entrance_MapScript1_164BF2 + .byte 0 FiveIsland_LostCave_Entrance_MapScript1_164BF2:: @ 8164BF2 - setworldmapflag 2236 - end + setworldmapflag 2236 + end diff --git a/data/maps/FiveIsland_LostCave_Room1/scripts.inc b/data/maps/FiveIsland_LostCave_Room1/scripts.inc index 2225c0315..45f90afca 100644 --- a/data/maps/FiveIsland_LostCave_Room1/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Room1/scripts.inc @@ -1,8 +1,8 @@ FiveIsland_LostCave_Room1_MapScripts:: @ 8164BF6 - .byte 0 + .byte 0 FiveIsland_LostCave_Room1_EventScript_164BF7:: @ 8164BF7 - trainerbattle 0, 607, 0, Text_17CEF5, Text_17CF42 - loadword 0, gUnknown_817CF54 - callstd 6 - end + trainerbattle 0, 607, 0, Text_17CEF5, Text_17CF42 + loadword 0, gUnknown_817CF54 + callstd 6 + end diff --git a/data/maps/FiveIsland_LostCave_Room10/scripts.inc b/data/maps/FiveIsland_LostCave_Room10/scripts.inc index 4a8283959..e187fbacc 100644 --- a/data/maps/FiveIsland_LostCave_Room10/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Room10/scripts.inc @@ -1,68 +1,68 @@ FiveIsland_LostCave_Room10_MapScripts:: @ 8164C2D - map_script 5, FiveIsland_LostCave_Room10_MapScript1_164C38 - map_script 2, FiveIsland_LostCave_Room10_MapScript2_164C48 - .byte 0 + map_script 5, FiveIsland_LostCave_Room10_MapScript1_164C38 + map_script 2, FiveIsland_LostCave_Room10_MapScript2_164C48 + .byte 0 FiveIsland_LostCave_Room10_MapScript1_164C38:: @ 8164C38 - checktrainerflag 606 - call_if 1, EventScript_164C42 - end + checktrainerflag 606 + call_if 1, EventScript_164C42 + end EventScript_164C42:: @ 8164C42 - setvar VAR_0x4083, 1 - return + setvar VAR_0x4083, 1 + return FiveIsland_LostCave_Room10_MapScript2_164C48:: @ 8164C48 - map_script_2 VAR_0x4083, 0, EventScript_164C52 - .2byte 0 + map_script_2 VAR_0x4083, 0, EventScript_164C52 + .2byte 0 EventScript_164C52:: @ 8164C52 - lockall - textcolor 1 - applymovement 1, Movement_164CC0 - waitmovement 0 - delay 100 - applymovement 1, Movement_164CC8 - waitmovement 0 - loadword 0, gUnknown_817D062 - callstd 4 - special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_164CB6 - trainerbattle 3, 606, 0, Text_17D086 - loadword 0, gUnknown_817D0B2 - callstd 4 - closemessage - call EventScript_164CA5 - warp MAP_FIVE_ISLAND_RESORT_GORGEOUS, 255, 39, 10 - waitstate - releaseall - end + lockall + textcolor 1 + applymovement 1, Movement_164CC0 + waitmovement 0 + delay 100 + applymovement 1, Movement_164CC8 + waitmovement 0 + loadword 0, gUnknown_817D062 + callstd 4 + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_164CB6 + trainerbattle 3, 606, 0, Text_17D086 + loadword 0, gUnknown_817D0B2 + callstd 4 + closemessage + call EventScript_164CA5 + warp MAP_FIVE_ISLAND_RESORT_GORGEOUS, 255, 39, 10 + waitstate + releaseall + end EventScript_164CA5:: @ 8164CA5 - setflag FLAG_0x093 - clearflag FLAG_0x094 - setvar VAR_0x4083, 1 - setvar VAR_0x4084, 1 - return + setflag FLAG_0x093 + clearflag FLAG_0x094 + setvar VAR_0x4083, 1 + setvar VAR_0x4084, 1 + return EventScript_164CB6:: @ 8164CB6 - settrainerflag 606 - call EventScript_164CA5 - releaseall - end + settrainerflag 606 + call EventScript_164CA5 + releaseall + end Movement_164CC0:: @ 8164CC0 - step_12 - step_1c - step_13 - step_1c - step_2e - step_1c - step_2d - step_end + step_12 + step_1c + step_13 + step_1c + step_2e + step_1c + step_2d + step_end Movement_164CC8:: @ 8164CC8 - step_10 - step_10 - step_end + step_10 + step_10 + step_end diff --git a/data/maps/FiveIsland_LostCave_Room11/scripts.inc b/data/maps/FiveIsland_LostCave_Room11/scripts.inc index be5962481..abc87678f 100644 --- a/data/maps/FiveIsland_LostCave_Room11/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Room11/scripts.inc @@ -1,2 +1,2 @@ FiveIsland_LostCave_Room11_MapScripts:: @ 8164CCB - .byte 0 + .byte 0 diff --git a/data/maps/FiveIsland_LostCave_Room12/scripts.inc b/data/maps/FiveIsland_LostCave_Room12/scripts.inc index 388153884..2a8500927 100644 --- a/data/maps/FiveIsland_LostCave_Room12/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Room12/scripts.inc @@ -1,2 +1,2 @@ FiveIsland_LostCave_Room12_MapScripts:: @ 8164CCC - .byte 0 + .byte 0 diff --git a/data/maps/FiveIsland_LostCave_Room13/scripts.inc b/data/maps/FiveIsland_LostCave_Room13/scripts.inc index 9ee934a90..23ef2d129 100644 --- a/data/maps/FiveIsland_LostCave_Room13/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Room13/scripts.inc @@ -1,2 +1,2 @@ FiveIsland_LostCave_Room13_MapScripts:: @ 8164CCD - .byte 0 + .byte 0 diff --git a/data/maps/FiveIsland_LostCave_Room14/scripts.inc b/data/maps/FiveIsland_LostCave_Room14/scripts.inc index b7e59feaa..ec2260f6e 100644 --- a/data/maps/FiveIsland_LostCave_Room14/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Room14/scripts.inc @@ -1,2 +1,2 @@ FiveIsland_LostCave_Room14_MapScripts:: @ 8164CCE - .byte 0 + .byte 0 diff --git a/data/maps/FiveIsland_LostCave_Room2/scripts.inc b/data/maps/FiveIsland_LostCave_Room2/scripts.inc index 29aab8eeb..98e4cae7f 100644 --- a/data/maps/FiveIsland_LostCave_Room2/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Room2/scripts.inc @@ -1,2 +1,2 @@ FiveIsland_LostCave_Room2_MapScripts:: @ 8164C0E - .byte 0 + .byte 0 diff --git a/data/maps/FiveIsland_LostCave_Room3/scripts.inc b/data/maps/FiveIsland_LostCave_Room3/scripts.inc index e14779342..c77557a4a 100644 --- a/data/maps/FiveIsland_LostCave_Room3/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Room3/scripts.inc @@ -1,2 +1,2 @@ FiveIsland_LostCave_Room3_MapScripts:: @ 8164C0F - .byte 0 + .byte 0 diff --git a/data/maps/FiveIsland_LostCave_Room4/scripts.inc b/data/maps/FiveIsland_LostCave_Room4/scripts.inc index 9d2aa1f6a..970e572d2 100644 --- a/data/maps/FiveIsland_LostCave_Room4/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Room4/scripts.inc @@ -1,8 +1,8 @@ FiveIsland_LostCave_Room4_MapScripts:: @ 8164C10 - .byte 0 + .byte 0 FiveIsland_LostCave_Room4_EventScript_164C11:: @ 8164C11 - trainerbattle 0, 608, 0, Text_17CFC1, Text_17CFFB - loadword 0, gUnknown_817D037 - callstd 6 - end + trainerbattle 0, 608, 0, Text_17CFC1, Text_17CFFB + loadword 0, gUnknown_817D037 + callstd 6 + end diff --git a/data/maps/FiveIsland_LostCave_Room5/scripts.inc b/data/maps/FiveIsland_LostCave_Room5/scripts.inc index 3bdbbcc3b..47e9771de 100644 --- a/data/maps/FiveIsland_LostCave_Room5/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Room5/scripts.inc @@ -1,2 +1,2 @@ FiveIsland_LostCave_Room5_MapScripts:: @ 8164C28 - .byte 0 + .byte 0 diff --git a/data/maps/FiveIsland_LostCave_Room6/scripts.inc b/data/maps/FiveIsland_LostCave_Room6/scripts.inc index 1de5fc8ca..1956ee70b 100644 --- a/data/maps/FiveIsland_LostCave_Room6/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Room6/scripts.inc @@ -1,2 +1,2 @@ FiveIsland_LostCave_Room6_MapScripts:: @ 8164C29 - .byte 0 + .byte 0 diff --git a/data/maps/FiveIsland_LostCave_Room7/scripts.inc b/data/maps/FiveIsland_LostCave_Room7/scripts.inc index 229bae05b..f8a8afc5f 100644 --- a/data/maps/FiveIsland_LostCave_Room7/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Room7/scripts.inc @@ -1,2 +1,2 @@ FiveIsland_LostCave_Room7_MapScripts:: @ 8164C2A - .byte 0 + .byte 0 diff --git a/data/maps/FiveIsland_LostCave_Room8/scripts.inc b/data/maps/FiveIsland_LostCave_Room8/scripts.inc index 833603106..89fc85c34 100644 --- a/data/maps/FiveIsland_LostCave_Room8/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Room8/scripts.inc @@ -1,2 +1,2 @@ FiveIsland_LostCave_Room8_MapScripts:: @ 8164C2B - .byte 0 + .byte 0 diff --git a/data/maps/FiveIsland_LostCave_Room9/scripts.inc b/data/maps/FiveIsland_LostCave_Room9/scripts.inc index 73a4425f9..771427153 100644 --- a/data/maps/FiveIsland_LostCave_Room9/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Room9/scripts.inc @@ -1,2 +1,2 @@ FiveIsland_LostCave_Room9_MapScripts:: @ 8164C2C - .byte 0 + .byte 0 diff --git a/data/maps/FiveIsland_Meadow/scripts.inc b/data/maps/FiveIsland_Meadow/scripts.inc index e4636cb65..c7b031158 100644 --- a/data/maps/FiveIsland_Meadow/scripts.inc +++ b/data/maps/FiveIsland_Meadow/scripts.inc @@ -1,59 +1,59 @@ FiveIsland_Meadow_MapScripts:: @ 8168932 - map_script 1, FiveIsland_Meadow_MapScript1_168938 - .byte 0 + map_script 1, FiveIsland_Meadow_MapScript1_168938 + .byte 0 FiveIsland_Meadow_MapScript1_168938:: @ 8168938 - checkflag FLAG_0x2D6 - call_if 1, EventScript_168983 - end + checkflag FLAG_0x2D6 + call_if 1, EventScript_168983 + end FiveIsland_Meadow_EventScript_168942:: @ 8168942 - lockall - checkflag FLAG_0x2D6 - goto_if 1, EventScript_168979 - checkflag FLAG_0x2D8 - goto_if 1, EventScript_16895F - loadword 0, gUnknown_818AB8E - callstd 4 - releaseall - end + lockall + checkflag FLAG_0x2D6 + goto_if 1, EventScript_168979 + checkflag FLAG_0x2D8 + goto_if 1, EventScript_16895F + loadword 0, gUnknown_818AB8E + callstd 4 + releaseall + end EventScript_16895F:: @ 816895F - setflag FLAG_0x2D6 - message Text_18ABF4 - waitmessage - delay 60 - call EventScript_168983 - special DrawWholeMapView - playse SE_PIN - waitse - releaseall - end + setflag FLAG_0x2D6 + message Text_18ABF4 + waitmessage + delay 60 + call EventScript_168983 + special DrawWholeMapView + playse SE_PIN + waitse + releaseall + end EventScript_168979:: @ 8168979 - loadword 0, gUnknown_818AC62 - callstd 4 - releaseall - end + loadword 0, gUnknown_818AC62 + callstd 4 + releaseall + end EventScript_168983:: @ 8168983 - setmetatile 12, 21, 687, 1 - return + setmetatile 12, 21, 687, 1 + return FiveIsland_Meadow_EventScript_16898D:: @ 816898D - trainerbattle 0, 567, 0, Text_18AC88, Text_18ACB3 - loadword 0, gUnknown_818ACC5 - callstd 6 - end + trainerbattle 0, 567, 0, Text_18AC88, Text_18ACB3 + loadword 0, gUnknown_818ACC5 + callstd 6 + end FiveIsland_Meadow_EventScript_1689A4:: @ 81689A4 - trainerbattle 0, 568, 0, Text_18ACF0, Text_18AD39 - loadword 0, gUnknown_818AD59 - callstd 6 - end + trainerbattle 0, 568, 0, Text_18ACF0, Text_18AD39 + loadword 0, gUnknown_818AD59 + callstd 6 + end FiveIsland_Meadow_EventScript_1689BB:: @ 81689BB - trainerbattle 0, 569, 0, Text_18ADC6, Text_18ADFB - loadword 0, gUnknown_818AE16 - callstd 6 - end + trainerbattle 0, 569, 0, Text_18ADC6, Text_18ADFB + loadword 0, gUnknown_818AE16 + callstd 6 + end diff --git a/data/maps/FiveIsland_MemorialPillar/scripts.inc b/data/maps/FiveIsland_MemorialPillar/scripts.inc index 8337e9d6f..31751dff4 100644 --- a/data/maps/FiveIsland_MemorialPillar/scripts.inc +++ b/data/maps/FiveIsland_MemorialPillar/scripts.inc @@ -1,110 +1,110 @@ FiveIsland_MemorialPillar_MapScripts:: @ 81689D2 - .byte 0 + .byte 0 FiveIsland_MemorialPillar_EventScript_1689D3:: @ 81689D3 - lock - checkflag FLAG_0x236 - goto_if 1, EventScript_168A18 - checkflag FLAG_0x2D7 - goto_if 1, EventScript_168A22 - loadword 0, gUnknown_818B02E - callstd 4 - closemessage - applymovement 1, Movement_1A75E1 - waitmovement 0 - delay 45 - loadword 0, gUnknown_818B03C - callstd 4 - applymovement 1, Movement_1A75E9 - waitmovement 0 - loadword 0, gUnknown_818B05E - callstd 4 - release - end + lock + checkflag FLAG_0x236 + goto_if 1, EventScript_168A18 + checkflag FLAG_0x2D7 + goto_if 1, EventScript_168A22 + loadword 0, gUnknown_818B02E + callstd 4 + closemessage + applymovement 1, Movement_1A75E1 + waitmovement 0 + delay 45 + loadword 0, gUnknown_818B03C + callstd 4 + applymovement 1, Movement_1A75E9 + waitmovement 0 + loadword 0, gUnknown_818B05E + callstd 4 + release + end EventScript_168A18:: @ 8168A18 - loadword 0, gUnknown_818B2DA - callstd 4 - release - end + loadword 0, gUnknown_818B2DA + callstd 4 + release + end EventScript_168A22:: @ 8168A22 - loadword 0, gUnknown_818B282 - callstd 4 - setorcopyvar VAR_0x8000, 330 - setorcopyvar VAR_0x8001, 1 - callstd 0 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_168AFE - call EventScript_168AE8 - release - end + loadword 0, gUnknown_818B282 + callstd 4 + setorcopyvar VAR_0x8000, 330 + setorcopyvar VAR_0x8001, 1 + callstd 0 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_168AFE + call EventScript_168AE8 + release + end FiveIsland_MemorialPillar_EventScript_168A48:: @ 8168A48 - special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 - special sub_8112364 - lockall - checkflag FLAG_0x236 - goto_if 1, EventScript_168B0B - checkflag FLAG_0x2D7 - goto_if 1, EventScript_168B0B - loadword 0, gUnknown_818B095 - callstd 4 - checkitem ITEM_LEMONADE, 1 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_168A86 - releaseall - end + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + special sub_8112364 + lockall + checkflag FLAG_0x236 + goto_if 1, EventScript_168B0B + checkflag FLAG_0x2D7 + goto_if 1, EventScript_168B0B + loadword 0, gUnknown_818B095 + callstd 4 + checkitem ITEM_LEMONADE, 1 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_168A86 + releaseall + end EventScript_168A86:: @ 8168A86 - loadword 0, gUnknown_818B105 - callstd 5 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_168A9B - releaseall - end + loadword 0, gUnknown_818B105 + callstd 5 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_168A9B + releaseall + end EventScript_168A9B:: @ 8168A9B - removeitem ITEM_LEMONADE, 1 - loadword 0, gUnknown_818B13E - callstd 4 - closemessage - applymovement 1, Movement_1A75EB - waitmovement 0 - delay 45 - applymovement 255, Movement_1A75E7 - waitmovement 0 - textcolor 0 - loadword 0, gUnknown_818B171 - callstd 4 - setorcopyvar VAR_0x8000, 330 - setorcopyvar VAR_0x8001, 1 - callstd 0 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_168AFE - call EventScript_168AE8 - releaseall - end + removeitem ITEM_LEMONADE, 1 + loadword 0, gUnknown_818B13E + callstd 4 + closemessage + applymovement 1, Movement_1A75EB + waitmovement 0 + delay 45 + applymovement 255, Movement_1A75E7 + waitmovement 0 + textcolor 0 + loadword 0, gUnknown_818B171 + callstd 4 + setorcopyvar VAR_0x8000, 330 + setorcopyvar VAR_0x8001, 1 + callstd 0 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_168AFE + call EventScript_168AE8 + releaseall + end EventScript_168AE8:: @ 8168AE8 - loadword 0, gUnknown_818B219 - callstd 4 - applymovement 1, Movement_1A75E9 - waitmovement 0 - setflag FLAG_0x236 - return + loadword 0, gUnknown_818B219 + callstd 4 + applymovement 1, Movement_1A75E9 + waitmovement 0 + setflag FLAG_0x236 + return EventScript_168AFE:: @ 8168AFE - setflag FLAG_0x2D7 - loadword 0, gUnknown_818B23E - callstd 4 - releaseall - end + setflag FLAG_0x2D7 + loadword 0, gUnknown_818B23E + callstd 4 + releaseall + end EventScript_168B0B:: @ 8168B0B - loadword 0, gUnknown_818B2F8 - callstd 4 - releaseall - end + loadword 0, gUnknown_818B2F8 + callstd 4 + releaseall + end diff --git a/data/maps/FiveIsland_PokemonCenter_1F/scripts.inc b/data/maps/FiveIsland_PokemonCenter_1F/scripts.inc index a9944ee18..dd2883022 100644 --- a/data/maps/FiveIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/FiveIsland_PokemonCenter_1F/scripts.inc @@ -1,25 +1,25 @@ FiveIsland_PokemonCenter_1F_MapScripts:: @ 8171CF1 - map_script 3, FiveIsland_PokemonCenter_1F_MapScript1_171CFC - map_script 5, FiveIsland_PokemonCenter_1F_MapScript2_1BC05C - .byte 0 + map_script 3, FiveIsland_PokemonCenter_1F_MapScript1_171CFC + map_script 5, FiveIsland_PokemonCenter_1F_MapScript2_1BC05C + .byte 0 FiveIsland_PokemonCenter_1F_MapScript1_171CFC:: @ 8171CFC - setrespawn 18 - end + setrespawn 18 + end FiveIsland_PokemonCenter_1F_EventScript_171D00:: @ 8171D00 - lock - faceplayer - call EventScript_1A6578 - release - end + lock + faceplayer + call EventScript_1A6578 + release + end FiveIsland_PokemonCenter_1F_EventScript_171D09:: @ 8171D09 - loadword 0, gUnknown_81A3BBA - callstd 2 - end + loadword 0, gUnknown_81A3BBA + callstd 2 + end FiveIsland_PokemonCenter_1F_EventScript_171D12:: @ 8171D12 - loadword 0, gUnknown_81A3BFD - callstd 2 - end + loadword 0, gUnknown_81A3BFD + callstd 2 + end diff --git a/data/maps/FiveIsland_PokemonCenter_2F/scripts.inc b/data/maps/FiveIsland_PokemonCenter_2F/scripts.inc index 51682056c..5c50a6092 100644 --- a/data/maps/FiveIsland_PokemonCenter_2F/scripts.inc +++ b/data/maps/FiveIsland_PokemonCenter_2F/scripts.inc @@ -1,18 +1,18 @@ FiveIsland_PokemonCenter_2F_MapScripts:: @ 8171D1B - map_script 2, FiveIsland_PokemonCenter_2F_MapScript1_1BB2A3 - map_script 4, FiveIsland_PokemonCenter_2F_MapScript2_1BB1ED - map_script 1, FiveIsland_PokemonCenter_2F_MapScript3_1BB237 - map_script 3, FiveIsland_PokemonCenter_2F_MapScript4_1BB1B4 - .byte 0 + map_script 2, FiveIsland_PokemonCenter_2F_MapScript1_1BB2A3 + map_script 4, FiveIsland_PokemonCenter_2F_MapScript2_1BB1ED + map_script 1, FiveIsland_PokemonCenter_2F_MapScript3_1BB237 + map_script 3, FiveIsland_PokemonCenter_2F_MapScript4_1BB1B4 + .byte 0 FiveIsland_PokemonCenter_2F_EventScript_171D30:: @ 8171D30 - call EventScript_1BB4A3 - end + call EventScript_1BB4A3 + end EventScript_171D36:: @ 8171D36 - call EventScript_1BB6AB - end + call EventScript_1BB6AB + end EventScript_171D3C:: @ 8171D3C - call EventScript_1BB7DE - end + call EventScript_1BB7DE + end diff --git a/data/maps/FiveIsland_ResortGorgeous/scripts.inc b/data/maps/FiveIsland_ResortGorgeous/scripts.inc index 997a27bb8..a65ea5490 100644 --- a/data/maps/FiveIsland_ResortGorgeous/scripts.inc +++ b/data/maps/FiveIsland_ResortGorgeous/scripts.inc @@ -1,46 +1,46 @@ FiveIsland_ResortGorgeous_MapScripts:: @ 81687E4 - map_script 4, FiveIsland_ResortGorgeous_MapScript1_1687EF - map_script 2, FiveIsland_ResortGorgeous_MapScript2_1687FE - .byte 0 + map_script 4, FiveIsland_ResortGorgeous_MapScript1_1687EF + map_script 2, FiveIsland_ResortGorgeous_MapScript2_1687FE + .byte 0 FiveIsland_ResortGorgeous_MapScript1_1687EF:: @ 81687EF - map_script_2 VAR_0x4084, 1, EventScript_1687F9 - .2byte 0 + map_script_2 VAR_0x4084, 1, EventScript_1687F9 + .2byte 0 EventScript_1687F9:: @ 81687F9 - turnobject 255, 2 - end + turnobject 255, 2 + end FiveIsland_ResortGorgeous_MapScript2_1687FE:: @ 81687FE - map_script_2 VAR_0x4084, 1, EventScript_168808 - .2byte 0 + map_script_2 VAR_0x4084, 1, EventScript_168808 + .2byte 0 EventScript_168808:: @ 8168808 - lockall - textcolor 1 - loadword 0, gUnknown_818A7DB - callstd 4 - closemessage - applymovement 8, Movement_1A75E9 - waitmovement 0 - opendoor 39, 8 - waitdooranim - applymovement 8, Movement_168841 - waitmovement 0 - closedoor 39, 8 - waitdooranim - removeobject 8 - clearflag FLAG_0x095 - setvar VAR_0x4084, 2 - releaseall - end + lockall + textcolor 1 + loadword 0, gUnknown_818A7DB + callstd 4 + closemessage + applymovement 8, Movement_1A75E9 + waitmovement 0 + opendoor 39, 8 + waitdooranim + applymovement 8, Movement_168841 + waitmovement 0 + closedoor 39, 8 + waitdooranim + removeobject 8 + clearflag FLAG_0x095 + setvar VAR_0x4084, 2 + releaseall + end Movement_168841:: @ 8168841 - step_11 - step_60 - step_end + step_11 + step_60 + step_end FiveIsland_ResortGorgeous_EventScript_168844:: @ 8168844 - loadword 0, gUnknown_818A7FE - callstd 3 - end + loadword 0, gUnknown_818A7FE + callstd 3 + end diff --git a/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc b/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc index 5dd91f845..63e2e0a1b 100644 --- a/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc +++ b/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc @@ -1,163 +1,163 @@ FiveIsland_ResortGorgeous_House_MapScripts:: @ 8171EBD - .byte 0 + .byte 0 FiveIsland_ResortGorgeous_House_EventScript_171EBE:: @ 8171EBE - special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 - special sub_8112364 - lock - faceplayer - checkflag FLAG_0x002 - goto_if 1, EventScript_172043 - compare_var_to_value VAR_STORAGE_UNKNOWN, 65535 - goto_if 1, EventScript_171F0B - compare_var_to_value VAR_STORAGE_UNKNOWN, 0 - goto_if 5, EventScript_171F19 - loadword 0, gUnknown_81A42A0 - callstd 4 - goto EventScript_171EFE - end + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + special sub_8112364 + lock + faceplayer + checkflag FLAG_0x002 + goto_if 1, EventScript_172043 + compare_var_to_value VAR_STORAGE_UNKNOWN, 65535 + goto_if 1, EventScript_171F0B + compare_var_to_value VAR_STORAGE_UNKNOWN, 0 + goto_if 5, EventScript_171F19 + loadword 0, gUnknown_81A42A0 + callstd 4 + goto EventScript_171EFE + end EventScript_171EFE:: @ 8171EFE - special sub_80CB0A8 - loadword 0, gUnknown_81A4315 - callstd 4 - release - end + special sub_80CB0A8 + loadword 0, gUnknown_81A4315 + callstd 4 + release + end EventScript_171F0B:: @ 8171F0B - loadword 0, gUnknown_81A437A - callstd 4 - goto EventScript_171EFE - end + loadword 0, gUnknown_81A437A + callstd 4 + goto EventScript_171EFE + end EventScript_171F19:: @ 8171F19 - copyvar VAR_0x8004, VAR_STORAGE_UNKNOWN - specialvar VAR_RESULT, sub_80CC48C - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_171F34 - goto EventScript_171EFE - end + copyvar VAR_0x8004, VAR_STORAGE_UNKNOWN + specialvar VAR_RESULT, sub_80CC48C + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_171F34 + goto EventScript_171EFE + end EventScript_171F34:: @ 8171F34 - special sub_80CB0A8 - loadword 0, gUnknown_81A43F7 - callstd 4 - addobject 2 - applymovement 2, Movement_172060 - waitmovement 0 - textcolor 0 - loadword 0, gUnknown_81A450B - callstd 4 - applymovement 1, Movement_1A75E9 - waitmovement 0 - textcolor 1 - loadword 0, gUnknown_81A4521 - callstd 4 - textcolor 0 - loadword 0, gUnknown_81A4566 - callstd 4 - closemessage - compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_171FCD - compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_171FE9 - compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_171FFE - compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_17201A - moveobjectoffscreen 2 - loadword 0, gUnknown_81A458E - callstd 4 - setorcopyvar VAR_0x8000, VAR_0x403B - setorcopyvar VAR_0x8001, 1 - callstd 0 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_172025 - setflag FLAG_0x002 - setvar VAR_STORAGE_UNKNOWN, 0 - release - end + special sub_80CB0A8 + loadword 0, gUnknown_81A43F7 + callstd 4 + addobject 2 + applymovement 2, Movement_172060 + waitmovement 0 + textcolor 0 + loadword 0, gUnknown_81A450B + callstd 4 + applymovement 1, Movement_1A75E9 + waitmovement 0 + textcolor 1 + loadword 0, gUnknown_81A4521 + callstd 4 + textcolor 0 + loadword 0, gUnknown_81A4566 + callstd 4 + closemessage + compare_var_to_value VAR_FACING, 2 + call_if 1, EventScript_171FCD + compare_var_to_value VAR_FACING, 1 + call_if 1, EventScript_171FE9 + compare_var_to_value VAR_FACING, 4 + call_if 1, EventScript_171FFE + compare_var_to_value VAR_FACING, 3 + call_if 1, EventScript_17201A + moveobjectoffscreen 2 + loadword 0, gUnknown_81A458E + callstd 4 + setorcopyvar VAR_0x8000, VAR_0x403B + setorcopyvar VAR_0x8001, 1 + callstd 0 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_172025 + setflag FLAG_0x002 + setvar VAR_STORAGE_UNKNOWN, 0 + release + end EventScript_171FCD:: @ 8171FCD - applymovement 1, Movement_1A75ED - applymovement 2, Movement_17204D - waitmovement 0 - applymovement 255, Movement_1A75E7 - waitmovement 0 - return + applymovement 1, Movement_1A75ED + applymovement 2, Movement_17204D + waitmovement 0 + applymovement 255, Movement_1A75E7 + waitmovement 0 + return EventScript_171FE9:: @ 8171FE9 - applymovement 2, Movement_172055 - waitmovement 0 - applymovement 255, Movement_1A75E9 - waitmovement 0 - return + applymovement 2, Movement_172055 + waitmovement 0 + applymovement 255, Movement_1A75E9 + waitmovement 0 + return EventScript_171FFE:: @ 8171FFE - applymovement 1, Movement_1A75E7 - applymovement 2, Movement_172059 - waitmovement 0 - applymovement 255, Movement_1A75E9 - waitmovement 0 - return + applymovement 1, Movement_1A75E7 + applymovement 2, Movement_172059 + waitmovement 0 + applymovement 255, Movement_1A75E9 + waitmovement 0 + return EventScript_17201A:: @ 817201A - applymovement 2, Movement_17205E - waitmovement 0 - return + applymovement 2, Movement_17205E + waitmovement 0 + return EventScript_172025:: @ 8172025 - textcolor 0 - loadword 0, gUnknown_81A45E8 - callstd 4 - textcolor 1 - loadword 0, gUnknown_81A461B - callstd 4 - setflag FLAG_0x002 - setvar VAR_STORAGE_UNKNOWN, 0 - release - end + textcolor 0 + loadword 0, gUnknown_81A45E8 + callstd 4 + textcolor 1 + loadword 0, gUnknown_81A461B + callstd 4 + setflag FLAG_0x002 + setvar VAR_STORAGE_UNKNOWN, 0 + release + end EventScript_172043:: @ 8172043 - loadword 0, gUnknown_81A4632 - callstd 4 - release - end + loadword 0, gUnknown_81A4632 + callstd 4 + release + end Movement_17204D:: @ 817204D - step_12 - step_12 - step_12 - step_10 - step_10 - step_10 - step_30 - step_end + step_12 + step_12 + step_12 + step_10 + step_10 + step_10 + step_30 + step_end Movement_172055:: @ 8172055 - step_12 - step_12 - step_2d - step_end + step_12 + step_12 + step_2d + step_end Movement_172059:: @ 8172059 - step_12 - step_12 - step_12 - step_10 - step_end + step_12 + step_12 + step_12 + step_10 + step_end Movement_17205E:: @ 817205E - step_11 - step_end + step_11 + step_end Movement_172060:: @ 8172060 - step_25 - step_end + step_25 + step_end FiveIsland_ResortGorgeous_House_EventScript_172062:: @ 8172062 - loadword 0, gUnknown_81A4657 - callstd 2 - end + loadword 0, gUnknown_81A4657 + callstd 2 + end diff --git a/data/maps/FiveIsland_RocketWarehouse/scripts.inc b/data/maps/FiveIsland_RocketWarehouse/scripts.inc index 24eb7b8fa..34c141ec9 100644 --- a/data/maps/FiveIsland_RocketWarehouse/scripts.inc +++ b/data/maps/FiveIsland_RocketWarehouse/scripts.inc @@ -1,202 +1,202 @@ FiveIsland_RocketWarehouse_MapScripts:: @ 8163F2E - map_script 1, FiveIsland_RocketWarehouse_MapScript1_163F3D - map_script 3, FiveIsland_RocketWarehouse_MapScript2_163F39 - .byte 0 + map_script 1, FiveIsland_RocketWarehouse_MapScript1_163F3D + map_script 3, FiveIsland_RocketWarehouse_MapScript2_163F39 + .byte 0 FiveIsland_RocketWarehouse_MapScript2_163F39:: @ 8163F39 - setworldmapflag 2233 - end + setworldmapflag 2233 + end FiveIsland_RocketWarehouse_MapScript1_163F3D:: @ 8163F3D - checktrainerflag 543 - call_if 1, EventScript_163F47 - end + checktrainerflag 543 + call_if 1, EventScript_163F47 + end EventScript_163F47:: @ 8163F47 - setmetatile 26, 20, 672, 0 - setmetatile 27, 20, 672, 0 - return + setmetatile 26, 20, 672, 0 + setmetatile 27, 20, 672, 0 + return FiveIsland_RocketWarehouse_EventScript_163F5A:: @ 8163F5A - lockall - checkflag FLAG_0x2D5 - goto_if 1, EventScript_163F6E - loadword 0, gUnknown_817B4E3 - callstd 4 - releaseall - end + lockall + checkflag FLAG_0x2D5 + goto_if 1, EventScript_163F6E + loadword 0, gUnknown_817B4E3 + callstd 4 + releaseall + end EventScript_163F6E:: @ 8163F6E - loadword 0, gUnknown_817B512 - callstd 4 - releaseall - end + loadword 0, gUnknown_817B512 + callstd 4 + releaseall + end FiveIsland_RocketWarehouse_EventScript_163F78:: @ 8163F78 - loadword 0, gUnknown_817BB15 - callstd 3 - end + loadword 0, gUnknown_817BB15 + callstd 3 + end FiveIsland_RocketWarehouse_EventScript_163F81:: @ 8163F81 - lockall - applymovement 4, Movement_1A75E7 - waitmovement 0 - setvar VAR_0x4088, 1 - releaseall - end + lockall + applymovement 4, Movement_1A75E7 + waitmovement 0 + setvar VAR_0x4088, 1 + releaseall + end FiveIsland_RocketWarehouse_EventScript_163F93:: @ 8163F93 - trainerbattle 2, 545, 0, Text_17BBAF, Text_17BC55, EventScript_163FCD - checkflag 2116 - goto_if 1, EventScript_163FB7 - loadword 0, gUnknown_817BCA3 - callstd 6 - end + trainerbattle 2, 545, 0, Text_17BBAF, Text_17BC55, EventScript_163FCD + checkflag 2116 + goto_if 1, EventScript_163FB7 + loadword 0, gUnknown_817BCA3 + callstd 6 + end EventScript_163FB7:: @ 8163FB7 - setvar VAR_0x8004, 15 - setvar VAR_0x8005, 5 - special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_817BCD7 - callstd 6 - end + setvar VAR_0x8004, 15 + setvar VAR_0x8005, 5 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_817BCD7 + callstd 6 + end EventScript_163FCD:: @ 8163FCD - loadword 0, gUnknown_817BC6C - callstd 4 - setflag FLAG_0x2DC - setorcopyvar VAR_0x8000, 374 - setorcopyvar VAR_0x8001, 1 - callstd 0 - release - end + loadword 0, gUnknown_817BC6C + callstd 4 + setflag FLAG_0x2DC + setorcopyvar VAR_0x8000, 374 + setorcopyvar VAR_0x8001, 1 + callstd 0 + release + end FiveIsland_RocketWarehouse_EventScript_163FE6:: @ 8163FE6 - trainerbattle 0, 541, 0, Text_17B54D, Text_17B585 - loadword 0, gUnknown_817B5A6 - callstd 6 - end + trainerbattle 0, 541, 0, Text_17B54D, Text_17B585 + loadword 0, gUnknown_817B5A6 + callstd 6 + end FiveIsland_RocketWarehouse_EventScript_163FFD:: @ 8163FFD - trainerbattle 0, 542, 0, Text_17B677, Text_17B6D9 - loadword 0, gUnknown_817B6EF - callstd 6 - end + trainerbattle 0, 542, 0, Text_17B677, Text_17B6D9 + loadword 0, gUnknown_817B6EF + callstd 6 + end FiveIsland_RocketWarehouse_EventScript_164014:: @ 8164014 - trainerbattle 2, 544, 0, Text_17B8DA, Text_17B9FB, EventScript_16402F - loadword 0, gUnknown_817BA64 - callstd 6 - end + trainerbattle 2, 544, 0, Text_17B8DA, Text_17B9FB, EventScript_16402F + loadword 0, gUnknown_817BA64 + callstd 6 + end EventScript_16402F:: @ 816402F - getplayerxy VAR_0x8004, VAR_0x8005 - compare_var_to_value VAR_0x8004, 24 - call_if 3, EventScript_164065 - loadword 0, gUnknown_817BA64 - callstd 4 - closemessage - fadescreen 1 - removeobject 1 - removeobject 2 - removeobject 4 - removeobject 3 - setflag FLAG_0x088 - fadescreen 0 - setvar VAR_0x4088, 1 - setflag FLAG_0x2D5 - release - end + getplayerxy VAR_0x8004, VAR_0x8005 + compare_var_to_value VAR_0x8004, 24 + call_if 3, EventScript_164065 + loadword 0, gUnknown_817BA64 + callstd 4 + closemessage + fadescreen 1 + removeobject 1 + removeobject 2 + removeobject 4 + removeobject 3 + setflag FLAG_0x088 + fadescreen 0 + setvar VAR_0x4088, 1 + setflag FLAG_0x2D5 + release + end EventScript_164065:: @ 8164065 - applymovement 255, Movement_1A75EB - waitmovement 0 - return + applymovement 255, Movement_1A75EB + waitmovement 0 + return FiveIsland_RocketWarehouse_EventScript_164070:: @ 8164070 - trainerbattle 0, 516, 0, Text_17B5D6, Text_17B62F - loadword 0, gUnknown_817B642 - callstd 6 - end + trainerbattle 0, 516, 0, Text_17B5D6, Text_17B62F + loadword 0, gUnknown_817B642 + callstd 6 + end FiveIsland_RocketWarehouse_EventScript_164087:: @ 8164087 - trainerbattle 2, 543, 0, Text_17B72D, Text_17B79C, EventScript_1640A2 - loadword 0, gUnknown_817B7FA - callstd 6 - end + trainerbattle 2, 543, 0, Text_17B72D, Text_17B79C, EventScript_1640A2 + loadword 0, gUnknown_817B7FA + callstd 6 + end EventScript_1640A2:: @ 81640A2 - getplayerxy VAR_0x8004, VAR_0x8005 - specialvar VAR_RESULT, player_get_direction_lower_nybble - compare_var_to_value VAR_RESULT, 2 - call_if 1, EventScript_16412E - loadword 0, gUnknown_817B7AE - callstd 4 - closemessage - compare_var_to_value VAR_0x8004, 24 - call_if 3, EventScript_164144 - compare_var_to_value VAR_0x8004, 25 - call_if 1, EventScript_16414F - compare_var_to_value VAR_0x8004, 26 - call_if 1, EventScript_16415A - compare_var_to_value VAR_0x8004, 27 - call_if 1, EventScript_16415A - playse SE_PIN - call EventScript_163F47 - special DrawWholeMapView - waitse - compare_var_to_value VAR_0x8004, 24 - call_if 3, EventScript_164165 - compare_var_to_value VAR_0x8004, 25 - call_if 1, EventScript_164165 - compare_var_to_value VAR_0x8004, 26 - call_if 1, EventScript_164165 - compare_var_to_value VAR_0x8004, 27 - call_if 1, EventScript_164170 - loadword 0, gUnknown_817B7FA - callstd 4 - release - end + getplayerxy VAR_0x8004, VAR_0x8005 + specialvar VAR_RESULT, player_get_direction_lower_nybble + compare_var_to_value VAR_RESULT, 2 + call_if 1, EventScript_16412E + loadword 0, gUnknown_817B7AE + callstd 4 + closemessage + compare_var_to_value VAR_0x8004, 24 + call_if 3, EventScript_164144 + compare_var_to_value VAR_0x8004, 25 + call_if 1, EventScript_16414F + compare_var_to_value VAR_0x8004, 26 + call_if 1, EventScript_16415A + compare_var_to_value VAR_0x8004, 27 + call_if 1, EventScript_16415A + playse SE_PIN + call EventScript_163F47 + special DrawWholeMapView + waitse + compare_var_to_value VAR_0x8004, 24 + call_if 3, EventScript_164165 + compare_var_to_value VAR_0x8004, 25 + call_if 1, EventScript_164165 + compare_var_to_value VAR_0x8004, 26 + call_if 1, EventScript_164165 + compare_var_to_value VAR_0x8004, 27 + call_if 1, EventScript_164170 + loadword 0, gUnknown_817B7FA + callstd 4 + release + end EventScript_16412E:: @ 816412E - compare_var_to_value VAR_0x8004, 27 - goto_if 1, EventScript_1A77A9 - applymovement 255, Movement_1A75EB - waitmovement 0 - return + compare_var_to_value VAR_0x8004, 27 + goto_if 1, EventScript_1A77A9 + applymovement 255, Movement_1A75EB + waitmovement 0 + return EventScript_164144:: @ 8164144 - applymovement 3, Movement_16417B - waitmovement 0 - return + applymovement 3, Movement_16417B + waitmovement 0 + return EventScript_16414F:: @ 816414F - applymovement 3, Movement_16417F - waitmovement 0 - return + applymovement 3, Movement_16417F + waitmovement 0 + return EventScript_16415A:: @ 816415A - applymovement 3, Movement_1A75E9 - waitmovement 0 - return + applymovement 3, Movement_1A75E9 + waitmovement 0 + return EventScript_164165:: @ 8164165 - applymovement 3, Movement_1A75E7 - waitmovement 0 - return + applymovement 3, Movement_1A75E7 + waitmovement 0 + return EventScript_164170:: @ 8164170 - applymovement 3, Movement_1A75ED - waitmovement 0 - return + applymovement 3, Movement_1A75ED + waitmovement 0 + return Movement_16417B:: @ 816417B - step_13 - step_13 - step_2e - step_end + step_13 + step_13 + step_2e + step_end Movement_16417F:: @ 816417F - step_13 - step_2e - step_end + step_13 + step_2e + step_end diff --git a/data/maps/FiveIsland_WaterLabyrinth/scripts.inc b/data/maps/FiveIsland_WaterLabyrinth/scripts.inc index 0c0eebf58..0d387a3f1 100644 --- a/data/maps/FiveIsland_WaterLabyrinth/scripts.inc +++ b/data/maps/FiveIsland_WaterLabyrinth/scripts.inc @@ -1,80 +1,80 @@ FiveIsland_WaterLabyrinth_MapScripts:: @ 816884D - .byte 0 + .byte 0 FiveIsland_WaterLabyrinth_EventScript_16884E:: @ 816884E - special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 - special sub_8112364 - lock - faceplayer - checkflag FLAG_0x2DA - goto_if 1, EventScript_1688E3 - checkflag FLAG_0x2DB - goto_if 1, EventScript_16892C - loadword 0, gUnknown_818A80D - callstd 4 - specialvar VAR_RESULT, sub_80CA76C - compare_var_to_value VAR_RESULT, 6 - goto_if 1, EventScript_1688AC - loadword 0, gUnknown_818A88F - callstd 4 - release - end + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + special sub_8112364 + lock + faceplayer + checkflag FLAG_0x2DA + goto_if 1, EventScript_1688E3 + checkflag FLAG_0x2DB + goto_if 1, EventScript_16892C + loadword 0, gUnknown_818A80D + callstd 4 + specialvar VAR_RESULT, sub_80CA76C + compare_var_to_value VAR_RESULT, 6 + goto_if 1, EventScript_1688AC + loadword 0, gUnknown_818A88F + callstd 4 + release + end EventScript_168895:: @ 8168895 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 2 - special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_818AA0C - callstd 4 - release - end + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 2 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_818AA0C + callstd 4 + release + end EventScript_1688AC:: @ 81688AC - loadword 0, gUnknown_818A8A6 - callstd 4 - goto EventScript_1688BA - end + loadword 0, gUnknown_818A8A6 + callstd 4 + goto EventScript_1688BA + end EventScript_1688BA:: @ 81688BA - countpokemon - compare_var_to_value VAR_RESULT, 6 - goto_if 1, EventScript_16891F - setflag FLAG_0x2DA - giveegg SPECIES_TOGEPI - textcolor 3 - playfanfare MUS_FANFA1 - message Text_18A91F - waitfanfare - waitmessage - call EventScript_1A6675 - goto EventScript_1688E3 - end + countpokemon + compare_var_to_value VAR_RESULT, 6 + goto_if 1, EventScript_16891F + setflag FLAG_0x2DA + giveegg SPECIES_TOGEPI + textcolor 3 + playfanfare MUS_FANFA1 + message Text_18A91F + waitfanfare + waitmessage + call EventScript_1A6675 + goto EventScript_1688E3 + end EventScript_1688E3:: @ 81688E3 - getspeciesname 1, SPECIES_TOGEPI - setvar VAR_0x8004, 175 - specialvar VAR_RESULT, sub_80CD0F4 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_168895 - getspeciesname 1, SPECIES_TOGETIC - setvar VAR_0x8004, 176 - specialvar VAR_RESULT, sub_80CD0F4 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_168895 - loadword 0, gUnknown_818A9C0 - callstd 4 - release - end + getspeciesname 1, SPECIES_TOGEPI + setvar VAR_0x8004, 175 + specialvar VAR_RESULT, sub_80CD0F4 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_168895 + getspeciesname 1, SPECIES_TOGETIC + setvar VAR_0x8004, 176 + specialvar VAR_RESULT, sub_80CD0F4 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_168895 + loadword 0, gUnknown_818A9C0 + callstd 4 + release + end EventScript_16891F:: @ 816891F - setflag FLAG_0x2DB - loadword 0, gUnknown_818A940 - callstd 4 - release - end + setflag FLAG_0x2DB + loadword 0, gUnknown_818A940 + callstd 4 + release + end EventScript_16892C:: @ 816892C - goto EventScript_1688BA - end + goto EventScript_1688BA + end diff --git a/data/maps/FourIsland/scripts.inc b/data/maps/FourIsland/scripts.inc index 1568056b2..73c0d6175 100644 --- a/data/maps/FourIsland/scripts.inc +++ b/data/maps/FourIsland/scripts.inc @@ -1,194 +1,194 @@ FourIsland_MapScripts:: @ 8167CAE - map_script 3, FourIsland_MapScript1_167CB9 - map_script 2, FourIsland_MapScript2_167CE2 - .byte 0 + map_script 3, FourIsland_MapScript1_167CB9 + map_script 2, FourIsland_MapScript2_167CE2 + .byte 0 FourIsland_MapScript1_167CB9:: @ 8167CB9 - setworldmapflag 2206 - compare_var_to_value VAR_0x4086, 0 - call_if 1, EventScript_167CCD - call EventScript_167CD1 - end + setworldmapflag 2206 + compare_var_to_value VAR_0x4086, 0 + call_if 1, EventScript_167CCD + call EventScript_167CD1 + end EventScript_167CCD:: @ 8167CCD - clearflag FLAG_0x097 - return + clearflag FLAG_0x097 + return EventScript_167CD1:: @ 8167CD1 - checkflag FLAG_PENDING_DAYCARE_EGG - goto_if 0, EventScript_167CE1 - setobjectxyperm 1, 16, 14 + checkflag FLAG_PENDING_DAYCARE_EGG + goto_if 0, EventScript_167CE1 + setobjectxyperm 1, 16, 14 EventScript_167CE1:: @ 8167CE1 - return + return FourIsland_MapScript2_167CE2:: @ 8167CE2 - map_script_2 VAR_0x4086, 0, EventScript_167CEC - .2byte 0 + map_script_2 VAR_0x4086, 0, EventScript_167CEC + .2byte 0 EventScript_167CEC:: @ 8167CEC - lockall - textcolor 0 - applymovement 10, Movement_1A75ED - waitmovement 0 - playbgm BGM_FRLG_RIVAL, 0 - applymovement 10, Movement_1A75DB - waitmovement 0 - applymovement 10, Movement_1A75DD - waitmovement 0 - delay 25 - applymovement 10, Movement_167D49 - waitmovement 0 - loadword 0, gUnknown_8182B37 - callstd 4 - closemessage - applymovement 255, Movement_167D52 - applymovement 10, Movement_167D4E - waitmovement 0 - fadedefaultbgm - playse SE_KAIDAN - delay 35 - removeobject 10 - setvar VAR_0x4086, 1 - releaseall - end + lockall + textcolor 0 + applymovement 10, Movement_1A75ED + waitmovement 0 + playbgm BGM_FRLG_RIVAL, 0 + applymovement 10, Movement_1A75DB + waitmovement 0 + applymovement 10, Movement_1A75DD + waitmovement 0 + delay 25 + applymovement 10, Movement_167D49 + waitmovement 0 + loadword 0, gUnknown_8182B37 + callstd 4 + closemessage + applymovement 255, Movement_167D52 + applymovement 10, Movement_167D4E + waitmovement 0 + fadedefaultbgm + playse SE_KAIDAN + delay 35 + removeobject 10 + setvar VAR_0x4086, 1 + releaseall + end Movement_167D49:: @ 8167D49 - step_13 - step_13 - step_10 - step_10 - step_end + step_13 + step_13 + step_10 + step_10 + step_end Movement_167D4E:: @ 8167D4E - step_1c - step_1a - step_10 - step_end + step_1c + step_1a + step_10 + step_end Movement_167D52:: @ 8167D52 - step_12 - step_30 - step_end + step_12 + step_30 + step_end FourIsland_EventScript_167D55:: @ 8167D55 - special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 - special sub_8112364 - lock - faceplayer - special GetDaycareMonNicknames - specialvar VAR_RESULT, GetDaycareState - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_167D9B - compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_167E0C - compare_var_to_value VAR_RESULT, 3 - goto_if 1, EventScript_167E19 - loadword 0, gUnknown_81BF555 - callstd 4 - release - end + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + special sub_8112364 + lock + faceplayer + special GetDaycareMonNicknames + specialvar VAR_RESULT, GetDaycareState + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_167D9B + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_167E0C + compare_var_to_value VAR_RESULT, 3 + goto_if 1, EventScript_167E19 + loadword 0, gUnknown_81BF555 + callstd 4 + release + end EventScript_167D9B:: @ 8167D9B - loadword 0, gUnknown_81BF5E3 - callstd 5 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_167DD1 - loadword 0, gUnknown_81BF7B6 - callstd 5 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_167DD1 - loadword 0, gUnknown_81BF6CF - callstd 4 - clearflag FLAG_PENDING_DAYCARE_EGG - special RejectEggFromDayCare - release - end + loadword 0, gUnknown_81BF5E3 + callstd 5 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_167DD1 + loadword 0, gUnknown_81BF7B6 + callstd 5 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_167DD1 + loadword 0, gUnknown_81BF6CF + callstd 4 + clearflag FLAG_PENDING_DAYCARE_EGG + special RejectEggFromDayCare + release + end EventScript_167DD1:: @ 8167DD1 - specialvar VAR_RESULT, CalculatePlayerPartyCount - compare_var_to_value VAR_RESULT, 6 - goto_if 5, EventScript_167DEB - loadword 0, gUnknown_81BF6F0 - callstd 4 - release - end + specialvar VAR_RESULT, CalculatePlayerPartyCount + compare_var_to_value VAR_RESULT, 6 + goto_if 5, EventScript_167DEB + loadword 0, gUnknown_81BF6F0 + callstd 4 + release + end EventScript_167DEB:: @ 8167DEB - textcolor 3 - message Text_1BF72A - call EventScript_1A6675 - playfanfare MUS_FANFA1 - waitfanfare - waitbuttonpress - loadword 0, gUnknown_81BF755 - callstd 4 - special GiveEggFromDaycare - clearflag FLAG_PENDING_DAYCARE_EGG - release - end + textcolor 3 + message Text_1BF72A + call EventScript_1A6675 + playfanfare MUS_FANFA1 + waitfanfare + waitbuttonpress + loadword 0, gUnknown_81BF755 + callstd 4 + special GiveEggFromDaycare + clearflag FLAG_PENDING_DAYCARE_EGG + release + end EventScript_167E0C:: @ 8167E0C - special GetDaycareMonNicknames - loadword 0, gUnknown_81BF69A - callstd 4 - release - end + special GetDaycareMonNicknames + loadword 0, gUnknown_81BF69A + callstd 4 + release + end EventScript_167E19:: @ 8167E19 - special GetDaycareMonNicknames - loadword 0, gUnknown_81BF789 - callstd 4 - special SetDaycareCompatibilityString - special sub_80CA68C - waitmessage - waitbuttonpress - release - end + special GetDaycareMonNicknames + loadword 0, gUnknown_81BF789 + callstd 4 + special SetDaycareCompatibilityString + special sub_80CA68C + waitmessage + waitbuttonpress + release + end FourIsland_EventScript_167E2E:: @ 8167E2E - lock - faceplayer - checkflag 2116 - goto_if 1, EventScript_167E43 - loadword 0, gUnknown_8182A2B - callstd 4 - release - end + lock + faceplayer + checkflag 2116 + goto_if 1, EventScript_167E43 + loadword 0, gUnknown_8182A2B + callstd 4 + release + end EventScript_167E43:: @ 8167E43 - setvar VAR_0x8004, 9 - setvar VAR_0x8005, 5 - special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_8182A75 - callstd 4 - release - end + setvar VAR_0x8004, 9 + setvar VAR_0x8005, 5 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_8182A75 + callstd 4 + release + end FourIsland_EventScript_167E5A:: @ 8167E5A - lock - faceplayer - setvar VAR_0x8004, 9 - setvar VAR_0x8005, 4 - special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_8182CE3 - callstd 4 - release - end + lock + faceplayer + setvar VAR_0x8004, 9 + setvar VAR_0x8005, 4 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_8182CE3 + callstd 4 + release + end FourIsland_EventScript_167E73:: @ 8167E73 - loadword 0, gUnknown_8182D8E - callstd 2 - end + loadword 0, gUnknown_8182D8E + callstd 2 + end FourIsland_EventScript_167E7C:: @ 8167E7C - loadword 0, gUnknown_8182A03 - callstd 3 - end + loadword 0, gUnknown_8182A03 + callstd 3 + end FourIsland_EventScript_167E85:: @ 8167E85 - loadword 0, gUnknown_8182DEB - callstd 3 - end + loadword 0, gUnknown_8182DEB + callstd 3 + end diff --git a/data/maps/FourIsland_Harbor/scripts.inc b/data/maps/FourIsland_Harbor/scripts.inc index 0daa45d88..2c7fce02f 100644 --- a/data/maps/FourIsland_Harbor/scripts.inc +++ b/data/maps/FourIsland_Harbor/scripts.inc @@ -1,11 +1,11 @@ FourIsland_Harbor_MapScripts:: @ 8171C98 - .byte 0 + .byte 0 FourIsland_Harbor_EventScript_171C99:: @ 8171C99 - lock - faceplayer - message Text_181726 - waitmessage - setvar VAR_0x8004, 4 - goto EventScript_1A900F - end + lock + faceplayer + message Text_181726 + waitmessage + setvar VAR_0x8004, 4 + goto EventScript_1A900F + end diff --git a/data/maps/FourIsland_House1/scripts.inc b/data/maps/FourIsland_House1/scripts.inc index aff7f2230..f3e4e1425 100644 --- a/data/maps/FourIsland_House1/scripts.inc +++ b/data/maps/FourIsland_House1/scripts.inc @@ -1,7 +1,7 @@ FourIsland_House1_MapScripts:: @ 8171C44 - .byte 0 + .byte 0 FourIsland_House1_EventScript_171C45:: @ 8171C45 - loadword 0, gUnknown_81A3802 - callstd 2 - end + loadword 0, gUnknown_81A3802 + callstd 2 + end diff --git a/data/maps/FourIsland_House2/scripts.inc b/data/maps/FourIsland_House2/scripts.inc index 407bad4cb..e74407be5 100644 --- a/data/maps/FourIsland_House2/scripts.inc +++ b/data/maps/FourIsland_House2/scripts.inc @@ -1,2 +1,2 @@ FourIsland_House2_MapScripts:: @ 8171CAC - .byte 0 + .byte 0 diff --git a/data/maps/FourIsland_IcefallCave_1F/scripts.inc b/data/maps/FourIsland_IcefallCave_1F/scripts.inc index c73ec85fd..866c0c578 100644 --- a/data/maps/FourIsland_IcefallCave_1F/scripts.inc +++ b/data/maps/FourIsland_IcefallCave_1F/scripts.inc @@ -1,33 +1,33 @@ FourIsland_IcefallCave_1F_MapScripts:: @ 8163D44 - map_script 5, FourIsland_IcefallCave_1F_MapScript1_163D54 - map_script 1, FourIsland_IcefallCave_1F_MapScript2_163D57 - map_script 2, FourIsland_IcefallCave_1F_MapScript3_163D5B - .byte 0 + map_script 5, FourIsland_IcefallCave_1F_MapScript1_163D54 + map_script 1, FourIsland_IcefallCave_1F_MapScript2_163D57 + map_script 2, FourIsland_IcefallCave_1F_MapScript3_163D5B + .byte 0 FourIsland_IcefallCave_1F_MapScript1_163D54:: @ 8163D54 - setstepcallback 4 - end + setstepcallback 4 + end FourIsland_IcefallCave_1F_MapScript2_163D57:: @ 8163D57 - special sub_806E99C - end + special sub_806E99C + end FourIsland_IcefallCave_1F_MapScript3_163D5B:: @ 8163D5B - map_script_2 VAR_0x4001, 1, EventScript_163D65 - .2byte 0 + map_script_2 VAR_0x4001, 1, EventScript_163D65 + .2byte 0 EventScript_163D65:: @ 8163D65 - lockall - delay 20 - applymovement 255, Movement_163D7F - waitmovement 0 - playse SE_FU_ZAKU - delay 60 - warphole MAP_FOUR_ISLAND_ICEFALL_CAVE_B1F - waitstate - releaseall - end + lockall + delay 20 + applymovement 255, Movement_163D7F + waitmovement 0 + playse SE_FU_ZAKU + delay 60 + warphole MAP_FOUR_ISLAND_ICEFALL_CAVE_B1F + waitstate + releaseall + end Movement_163D7F:: @ 8163D7F - step_60 - step_end + step_60 + step_end diff --git a/data/maps/FourIsland_IcefallCave_Back/scripts.inc b/data/maps/FourIsland_IcefallCave_Back/scripts.inc index 5b3641ad5..92be2f38f 100644 --- a/data/maps/FourIsland_IcefallCave_Back/scripts.inc +++ b/data/maps/FourIsland_IcefallCave_Back/scripts.inc @@ -1,201 +1,201 @@ FourIsland_IcefallCave_Back_MapScripts:: @ 8163D82 - map_script 3, FourIsland_IcefallCave_Back_MapScript1_163D88 - .byte 0 + map_script 3, FourIsland_IcefallCave_Back_MapScript1_163D88 + .byte 0 FourIsland_IcefallCave_Back_MapScript1_163D88:: @ 8163D88 - compare_var_to_value VAR_0x4080, 1 - call_if 1, EventScript_163D94 - end + compare_var_to_value VAR_0x4080, 1 + call_if 1, EventScript_163D94 + end EventScript_163D94:: @ 8163D94 - setflag FLAG_0x08B - return + setflag FLAG_0x08B + return FourIsland_IcefallCave_Back_EventScript_163D98:: @ 8163D98 - lockall - textcolor 1 - loadword 0, gUnknown_817B04F - callstd 4 - applymovement 1, Movement_163EE8 - waitmovement 0 - textcolor 0 - loadword 0, gUnknown_817B0B9 - callstd 4 - closemessage - playse SE_PIN - applymovement 3, Movement_1A75DB - waitmovement 0 - applymovement 3, Movement_1A75ED - waitmovement 0 - applymovement 3, Movement_1A75DD - waitmovement 0 - textcolor 1 - loadword 0, gUnknown_817B109 - callstd 4 - closemessage - applymovement 3, Movement_1A75EB - waitmovement 0 - delay 18 - applymovement 3, Movement_1A75ED - waitmovement 0 - delay 35 - applymovement 4, Movement_163F11 - applymovement 3, Movement_163F18 - applymovement 255, Movement_163EDD - waitmovement 0 - applymovement 2, Movement_163EE8 - waitmovement 0 - playbgm BGM_FRLG_SUSPICIOUS_EYE, 0 - textcolor 0 - loadword 0, gUnknown_817B20B - callstd 4 - setvar VAR_LAST_TALKED, 4 - trainerbattle 3, 539, 0, Text_17B251 - applymovement 3, Movement_163F1B - waitmovement 0 - textcolor 1 - loadword 0, gUnknown_817B269 - callstd 4 - textcolor 0 - loadword 0, gUnknown_817B2EF - callstd 4 - textcolor 1 - message Text_17B313 - waitmessage - waitse - playmoncry SPECIES_LAPRAS, 2 - waitbuttonpress - waitmoncry - applymovement 1, Movement_163EEE - waitmovement 0 - textcolor 0 - loadword 0, gUnknown_817B399 - callstd 4 - closemessage - applymovement 3, Movement_163F1D - applymovement 255, Movement_163EE2 - applymovement 1, Movement_163EF0 - applymovement 2, Movement_163EFA - applymovement 4, Movement_163F05 - waitmovement 0 - removeobject 1 - removeobject 2 - removeobject 4 - delay 50 - applymovement 3, Movement_163F23 - waitmovement 0 - applymovement 255, Movement_1A75E7 - waitmovement 0 - textcolor 1 - loadword 0, gUnknown_817B457 - callstd 4 - setflag FLAG_0x08E - clearflag FLAG_0x08C - setvar VAR_0x4080, 1 - releaseall - end + lockall + textcolor 1 + loadword 0, gUnknown_817B04F + callstd 4 + applymovement 1, Movement_163EE8 + waitmovement 0 + textcolor 0 + loadword 0, gUnknown_817B0B9 + callstd 4 + closemessage + playse SE_PIN + applymovement 3, Movement_1A75DB + waitmovement 0 + applymovement 3, Movement_1A75ED + waitmovement 0 + applymovement 3, Movement_1A75DD + waitmovement 0 + textcolor 1 + loadword 0, gUnknown_817B109 + callstd 4 + closemessage + applymovement 3, Movement_1A75EB + waitmovement 0 + delay 18 + applymovement 3, Movement_1A75ED + waitmovement 0 + delay 35 + applymovement 4, Movement_163F11 + applymovement 3, Movement_163F18 + applymovement 255, Movement_163EDD + waitmovement 0 + applymovement 2, Movement_163EE8 + waitmovement 0 + playbgm BGM_FRLG_SUSPICIOUS_EYE, 0 + textcolor 0 + loadword 0, gUnknown_817B20B + callstd 4 + setvar VAR_LAST_TALKED, 4 + trainerbattle 3, 539, 0, Text_17B251 + applymovement 3, Movement_163F1B + waitmovement 0 + textcolor 1 + loadword 0, gUnknown_817B269 + callstd 4 + textcolor 0 + loadword 0, gUnknown_817B2EF + callstd 4 + textcolor 1 + message Text_17B313 + waitmessage + waitse + playmoncry SPECIES_LAPRAS, 2 + waitbuttonpress + waitmoncry + applymovement 1, Movement_163EEE + waitmovement 0 + textcolor 0 + loadword 0, gUnknown_817B399 + callstd 4 + closemessage + applymovement 3, Movement_163F1D + applymovement 255, Movement_163EE2 + applymovement 1, Movement_163EF0 + applymovement 2, Movement_163EFA + applymovement 4, Movement_163F05 + waitmovement 0 + removeobject 1 + removeobject 2 + removeobject 4 + delay 50 + applymovement 3, Movement_163F23 + waitmovement 0 + applymovement 255, Movement_1A75E7 + waitmovement 0 + textcolor 1 + loadword 0, gUnknown_817B457 + callstd 4 + setflag FLAG_0x08E + clearflag FLAG_0x08C + setvar VAR_0x4080, 1 + releaseall + end Movement_163EDD:: @ 8163EDD - step_11 - step_11 - step_13 - step_11 - step_end + step_11 + step_11 + step_13 + step_11 + step_end Movement_163EE2:: @ 8163EE2 - step_1c - step_2f - step_1c - step_1c - step_2d - step_end + step_1c + step_2f + step_1c + step_1c + step_2d + step_end Movement_163EE8:: @ 8163EE8 - step_25 - step_end + step_25 + step_end gUnknown_163EEA:: @ 8163EEA - step_4c - step_13 - step_4d - step_end + step_4c + step_13 + step_4d + step_end Movement_163EEE:: @ 8163EEE - step_29 - step_end + step_29 + step_end Movement_163EF0:: @ 8163EF0 - step_13 - step_10 - step_1d - step_1d - step_1d - step_1d - step_1d - step_1d - step_1d - step_end + step_13 + step_10 + step_1d + step_1d + step_1d + step_1d + step_1d + step_1d + step_1d + step_end Movement_163EFA:: @ 8163EFA - step_1c - step_12 - step_10 - step_1d - step_1d - step_1d - step_1d - step_1d - step_1d - step_1d - step_end + step_1c + step_12 + step_10 + step_1d + step_1d + step_1d + step_1d + step_1d + step_1d + step_1d + step_end Movement_163F05:: @ 8163F05 - step_1c - step_10 - step_1c - step_10 - step_20 - step_20 - step_1d - step_1d - step_1d - step_1d - step_1d - step_end + step_1c + step_10 + step_1c + step_10 + step_20 + step_20 + step_1d + step_1d + step_1d + step_1d + step_1d + step_end Movement_163F11:: @ 8163F11 - step_1c - step_1b - step_30 - step_end + step_1c + step_1b + step_30 + step_end Movement_163F15:: @ 8163F15 - step_12 - step_12 - step_end + step_12 + step_12 + step_end Movement_163F18:: @ 8163F18 - step_12 - step_11 - step_end + step_12 + step_11 + step_end Movement_163F1B:: @ 8163F1B - step_26 - step_end + step_26 + step_end Movement_163F1D:: @ 8163F1D - step_1b - step_30 - step_1c - step_1c - step_2d - step_end + step_1b + step_30 + step_1c + step_1c + step_2d + step_end Movement_163F23:: @ 8163F23 - step_13 - step_end + step_13 + step_end FourIsland_IcefallCave_Back_EventScript_163F25:: @ 8163F25 - loadword 0, gUnknown_817B457 - callstd 2 - end + loadword 0, gUnknown_817B457 + callstd 2 + end diff --git a/data/maps/FourIsland_IcefallCave_Entrance/scripts.inc b/data/maps/FourIsland_IcefallCave_Entrance/scripts.inc index 5fef54ab9..1bef95ec1 100644 --- a/data/maps/FourIsland_IcefallCave_Entrance/scripts.inc +++ b/data/maps/FourIsland_IcefallCave_Entrance/scripts.inc @@ -1,7 +1,7 @@ FourIsland_IcefallCave_Entrance_MapScripts:: @ 8163D3A - map_script 3, FourIsland_IcefallCave_Entrance_MapScript1_163D40 - .byte 0 + map_script 3, FourIsland_IcefallCave_Entrance_MapScript1_163D40 + .byte 0 FourIsland_IcefallCave_Entrance_MapScript1_163D40:: @ 8163D40 - setworldmapflag 2232 - end + setworldmapflag 2232 + end diff --git a/data/maps/FourIsland_LoreleisHouse/scripts.inc b/data/maps/FourIsland_LoreleisHouse/scripts.inc index e475b11a7..1241dca8c 100644 --- a/data/maps/FourIsland_LoreleisHouse/scripts.inc +++ b/data/maps/FourIsland_LoreleisHouse/scripts.inc @@ -1,39 +1,39 @@ FourIsland_LoreleisHouse_MapScripts:: @ 8171C4E - map_script 3, FourIsland_LoreleisHouse_MapScript1_171C54 - .byte 0 + map_script 3, FourIsland_LoreleisHouse_MapScript1_171C54 + .byte 0 FourIsland_LoreleisHouse_MapScript1_171C54:: @ 8171C54 - special sub_80CD154 - end + special sub_80CD154 + end FourIsland_LoreleisHouse_EventScript_171C58:: @ 8171C58 - lock - faceplayer - checkflag FLAG_0x2D4 - goto_if 1, EventScript_171C83 - checkflag FLAG_0x2D5 - goto_if 1, EventScript_171C76 - loadword 0, gUnknown_81A3826 - callstd 4 - release - end + lock + faceplayer + checkflag FLAG_0x2D4 + goto_if 1, EventScript_171C83 + checkflag FLAG_0x2D5 + goto_if 1, EventScript_171C76 + loadword 0, gUnknown_81A3826 + callstd 4 + release + end EventScript_171C76:: @ 8171C76 - setflag FLAG_0x2D4 - loadword 0, gUnknown_81A390C - callstd 4 - release - end + setflag FLAG_0x2D4 + loadword 0, gUnknown_81A390C + callstd 4 + release + end EventScript_171C83:: @ 8171C83 - loadword 0, gUnknown_81A39D8 - callstd 4 - release - end + loadword 0, gUnknown_81A39D8 + callstd 4 + release + end FourIsland_LoreleisHouse_EventScript_171C8D:: @ 8171C8D - lock - loadword 0, gUnknown_81A3A42 - callstd 4 - release - end + lock + loadword 0, gUnknown_81A3A42 + callstd 4 + release + end diff --git a/data/maps/FourIsland_Mart/scripts.inc b/data/maps/FourIsland_Mart/scripts.inc index e146a0b25..a99909c14 100644 --- a/data/maps/FourIsland_Mart/scripts.inc +++ b/data/maps/FourIsland_Mart/scripts.inc @@ -1,35 +1,35 @@ FourIsland_Mart_MapScripts:: @ 8171CAD - .byte 0 + .byte 0 FourIsland_Mart_EventScript_171CAE:: @ 8171CAE - special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 - lock - faceplayer - message Text_1A6211 - waitmessage - pokemart Items_171CD4 - loadword 0, gUnknown_81A5190 - callstd 4 - release - end + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + lock + faceplayer + message Text_1A6211 + waitmessage + pokemart Items_171CD4 + loadword 0, gUnknown_81A5190 + callstd 4 + release + end - .align 2 + .align 2 Items_171CD4:: @ 8171CD4 - .2byte ITEM_ULTRA_BALL - .2byte ITEM_FULL_RESTORE - .2byte ITEM_MAX_POTION - .2byte ITEM_REVIVE - .2byte ITEM_ICE_HEAL - .2byte ITEM_FULL_HEAL - .2byte ITEM_ESCAPE_ROPE - .2byte ITEM_MAX_REPEL - .2byte ITEM_NONE - release - end + .2byte ITEM_ULTRA_BALL + .2byte ITEM_FULL_RESTORE + .2byte ITEM_MAX_POTION + .2byte ITEM_REVIVE + .2byte ITEM_ICE_HEAL + .2byte ITEM_FULL_HEAL + .2byte ITEM_ESCAPE_ROPE + .2byte ITEM_MAX_REPEL + .2byte ITEM_NONE + release + end FourIsland_Mart_EventScript_171CE8:: @ 8171CE8 - loadword 0, gUnknown_81A3B14 - callstd 2 - end + loadword 0, gUnknown_81A3B14 + callstd 2 + end diff --git a/data/maps/FourIsland_PokemonCenter_1F/scripts.inc b/data/maps/FourIsland_PokemonCenter_1F/scripts.inc index 334b32304..c1f9ba768 100644 --- a/data/maps/FourIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/FourIsland_PokemonCenter_1F/scripts.inc @@ -1,30 +1,30 @@ FourIsland_PokemonCenter_1F_MapScripts:: @ 8171BEA - map_script 3, FourIsland_PokemonCenter_1F_MapScript1_171BF5 - map_script 5, FourIsland_PokemonCenter_1F_MapScript2_1BC05C - .byte 0 + map_script 3, FourIsland_PokemonCenter_1F_MapScript1_171BF5 + map_script 5, FourIsland_PokemonCenter_1F_MapScript2_1BC05C + .byte 0 FourIsland_PokemonCenter_1F_MapScript1_171BF5:: @ 8171BF5 - setrespawn 17 - end + setrespawn 17 + end FourIsland_PokemonCenter_1F_EventScript_171BF9:: @ 8171BF9 - lock - faceplayer - call EventScript_1A6578 - release - end + lock + faceplayer + call EventScript_1A6578 + release + end FourIsland_PokemonCenter_1F_EventScript_171C02:: @ 8171C02 - loadword 0, gUnknown_81A3627 - callstd 2 - end + loadword 0, gUnknown_81A3627 + callstd 2 + end FourIsland_PokemonCenter_1F_EventScript_171C0B:: @ 8171C0B - loadword 0, gUnknown_81A3697 - callstd 2 - end + loadword 0, gUnknown_81A3697 + callstd 2 + end FourIsland_PokemonCenter_1F_EventScript_171C14:: @ 8171C14 - loadword 0, gUnknown_81A3734 - callstd 2 - end + loadword 0, gUnknown_81A3734 + callstd 2 + end diff --git a/data/maps/FourIsland_PokemonCenter_2F/scripts.inc b/data/maps/FourIsland_PokemonCenter_2F/scripts.inc index 37d21446e..08482ec27 100644 --- a/data/maps/FourIsland_PokemonCenter_2F/scripts.inc +++ b/data/maps/FourIsland_PokemonCenter_2F/scripts.inc @@ -1,18 +1,18 @@ FourIsland_PokemonCenter_2F_MapScripts:: @ 8171C1D - map_script 2, FourIsland_PokemonCenter_2F_MapScript1_1BB2A3 - map_script 4, FourIsland_PokemonCenter_2F_MapScript2_1BB1ED - map_script 1, FourIsland_PokemonCenter_2F_MapScript3_1BB237 - map_script 3, FourIsland_PokemonCenter_2F_MapScript4_1BB1B4 - .byte 0 + map_script 2, FourIsland_PokemonCenter_2F_MapScript1_1BB2A3 + map_script 4, FourIsland_PokemonCenter_2F_MapScript2_1BB1ED + map_script 1, FourIsland_PokemonCenter_2F_MapScript3_1BB237 + map_script 3, FourIsland_PokemonCenter_2F_MapScript4_1BB1B4 + .byte 0 FourIsland_PokemonCenter_2F_EventScript_171C32:: @ 8171C32 - call EventScript_1BB4A3 - end + call EventScript_1BB4A3 + end EventScript_171C38:: @ 8171C38 - call EventScript_1BB6AB - end + call EventScript_1BB6AB + end EventScript_171C3E:: @ 8171C3E - call EventScript_1BB7DE - end + call EventScript_1BB7DE + end diff --git a/data/maps/FourIsland_PokemonDayCare/scripts.inc b/data/maps/FourIsland_PokemonDayCare/scripts.inc index 1b0011054..7b21a7ee2 100644 --- a/data/maps/FourIsland_PokemonDayCare/scripts.inc +++ b/data/maps/FourIsland_PokemonDayCare/scripts.inc @@ -1,235 +1,235 @@ FourIsland_PokemonDayCare_MapScripts:: @ 817193F - .byte 0 + .byte 0 FourIsland_PokemonDayCare_EventScript_171940:: @ 8171940 - special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 - lock - faceplayer - specialvar VAR_RESULT, GetDaycareState - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_171A2E - compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_171A52 - compare_var_to_value VAR_RESULT, 3 - goto_if 1, EventScript_171B86 - loadword 0, gUnknown_81BF7E4 - callstd 5 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_171993 - loadword 0, gUnknown_81BF916 - callstd 4 - release - end + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + lock + faceplayer + specialvar VAR_RESULT, GetDaycareState + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_171A2E + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_171A52 + compare_var_to_value VAR_RESULT, 3 + goto_if 1, EventScript_171B86 + loadword 0, gUnknown_81BF7E4 + callstd 5 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_171993 + loadword 0, gUnknown_81BF916 + callstd 4 + release + end EventScript_171993:: @ 8171993 - specialvar VAR_RESULT, CountPartyNonEggMons - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_171A1A - loadword 0, gUnknown_81BF839 - callstd 4 - fadescreen 1 - special ChooseSendDaycareMon - waitstate - compare_var_to_value VAR_0x8004, 6 - goto_if 4, EventScript_1719F7 - specialvar VAR_RESULT, CountPartyAliveNonEggMons_IgnoreVar0x8004Slot - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_171A24 - specialvar VAR_0x8005, GetSelectedMonNickAndSpecies - waitse - playmoncry 32773, 0 - loadword 0, gUnknown_81BF860 - callstd 4 - waitmoncry - special StoreSelectedPokemonInDaycare - incrementgamestat 47 - specialvar VAR_RESULT, GetDaycareState - compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_171A01 - release - end + specialvar VAR_RESULT, CountPartyNonEggMons + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_171A1A + loadword 0, gUnknown_81BF839 + callstd 4 + fadescreen 1 + special ChooseSendDaycareMon + waitstate + compare_var_to_value VAR_0x8004, 6 + goto_if 4, EventScript_1719F7 + specialvar VAR_RESULT, CountPartyAliveNonEggMons_IgnoreVar0x8004Slot + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_171A24 + specialvar VAR_0x8005, GetSelectedMonNickAndSpecies + waitse + playmoncry 32773, 0 + loadword 0, gUnknown_81BF860 + callstd 4 + waitmoncry + special StoreSelectedPokemonInDaycare + incrementgamestat 47 + specialvar VAR_RESULT, GetDaycareState + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_171A01 + release + end EventScript_1719F7:: @ 81719F7 - loadword 0, gUnknown_81BF976 - callstd 4 - release - end + loadword 0, gUnknown_81BF976 + callstd 4 + release + end EventScript_171A01:: @ 8171A01 - loadword 0, gUnknown_81BF89F - callstd 5 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_171993 - goto EventScript_1719F7 - end + loadword 0, gUnknown_81BF89F + callstd 5 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_171993 + goto EventScript_1719F7 + end EventScript_171A1A:: @ 8171A1A - loadword 0, gUnknown_81BFAAD - callstd 4 - release - end + loadword 0, gUnknown_81BFAAD + callstd 4 + release + end EventScript_171A24:: @ 8171A24 - loadword 0, gUnknown_81BFB09 - callstd 4 - release - end + loadword 0, gUnknown_81BFB09 + callstd 4 + release + end EventScript_171A2E:: @ 8171A2E - loadword 0, gUnknown_81BF8F6 - callstd 4 - release - end + loadword 0, gUnknown_81BF8F6 + callstd 4 + release + end EventScript_171A38:: @ 8171A38 - loadword 0, gUnknown_81BF9CC - callstd 4 - return + loadword 0, gUnknown_81BF9CC + callstd 4 + return EventScript_171A41:: @ 8171A41 - specialvar VAR_RESULT, GetNumLevelsGainedFromDaycare - compare_var_to_value VAR_RESULT, 0 - call_if 5, EventScript_171A38 - return + specialvar VAR_RESULT, GetNumLevelsGainedFromDaycare + compare_var_to_value VAR_RESULT, 0 + call_if 5, EventScript_171A38 + return EventScript_171A52:: @ 8171A52 - loadword 0, gUnknown_81BF988 - callstd 4 - setvar VAR_0x8004, 0 - call EventScript_171A41 - loadword 0, gUnknown_81BF89F - callstd 5 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_171993 - loadword 0, gUnknown_81BFAE8 - callstd 5 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_171A90 - goto EventScript_1719F7 - end + loadword 0, gUnknown_81BF988 + callstd 4 + setvar VAR_0x8004, 0 + call EventScript_171A41 + loadword 0, gUnknown_81BF89F + callstd 5 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_171993 + loadword 0, gUnknown_81BFAE8 + callstd 5 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_171A90 + goto EventScript_1719F7 + end EventScript_171A90:: @ 8171A90 - specialvar VAR_RESULT, CalculatePlayerPartyCount - compare_var_to_value VAR_RESULT, 6 - goto_if 1, EventScript_171B67 - specialvar VAR_RESULT, GetDaycareState - setvar VAR_0x8004, 0 - compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_171ACF - special ShowDaycareLevelMenu - waitstate - copyvar VAR_0x8004, VAR_RESULT - compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1719F7 - goto EventScript_171ACF - end + specialvar VAR_RESULT, CalculatePlayerPartyCount + compare_var_to_value VAR_RESULT, 6 + goto_if 1, EventScript_171B67 + specialvar VAR_RESULT, GetDaycareState + setvar VAR_0x8004, 0 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_171ACF + special ShowDaycareLevelMenu + waitstate + copyvar VAR_0x8004, VAR_RESULT + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1719F7 + goto EventScript_171ACF + end EventScript_171ACF:: @ 8171ACF - special GetDaycareCost - loadword 0, gUnknown_81BFA3B - callstd 5 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_171AEB - goto EventScript_1719F7 - end + special GetDaycareCost + loadword 0, gUnknown_81BFA3B + callstd 5 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_171AEB + goto EventScript_1719F7 + end EventScript_171AEB:: @ 8171AEB - specialvar VAR_RESULT, IsEnoughForCostInVar0x8005 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_171B05 - loadword 0, gUnknown_81BF932 - callstd 4 - release - end + specialvar VAR_RESULT, IsEnoughForCostInVar0x8005 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_171B05 + loadword 0, gUnknown_81BF932 + callstd 4 + release + end EventScript_171B05:: @ 8171B05 - applymovement 1, Movement_171B71 - waitmovement 0 - specialvar VAR_RESULT, TakePokemonFromDaycare - special SubtractMoneyFromVar0x8005 - playse SE_T_KAMI2 - loadword 0, gUnknown_81BFA67 - callstd 4 - waitse - playmoncry 32781, 0 - textcolor 3 - loadword 0, gUnknown_81BFA85 - callstd 4 - call EventScript_1A6675 - waitmoncry - specialvar VAR_RESULT, GetDaycareState - compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_171B4E - goto EventScript_1719F7 - end + applymovement 1, Movement_171B71 + waitmovement 0 + specialvar VAR_RESULT, TakePokemonFromDaycare + special SubtractMoneyFromVar0x8005 + playse SE_T_KAMI2 + loadword 0, gUnknown_81BFA67 + callstd 4 + waitse + playmoncry 32781, 0 + textcolor 3 + loadword 0, gUnknown_81BFA85 + callstd 4 + call EventScript_1A6675 + waitmoncry + specialvar VAR_RESULT, GetDaycareState + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_171B4E + goto EventScript_1719F7 + end EventScript_171B4E:: @ 8171B4E - loadword 0, gUnknown_81BF94F - callstd 5 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_171A90 - goto EventScript_1719F7 - end + loadword 0, gUnknown_81BF94F + callstd 5 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_171A90 + goto EventScript_1719F7 + end EventScript_171B67:: @ 8171B67 - loadword 0, gUnknown_81BF9EF - callstd 4 - release - end + loadword 0, gUnknown_81BF9EF + callstd 4 + release + end Movement_171B71:: @ 8171B71 - step_1c - step_1c - step_03 - step_1c - step_1c - step_02 - step_1c - step_1c - step_01 - step_up - step_60 - step_1c - step_1c - step_1c - step_1c - step_1c - step_00 - step_61 - step_down - step_end + step_1c + step_1c + step_03 + step_1c + step_1c + step_02 + step_1c + step_1c + step_01 + step_up + step_60 + step_1c + step_1c + step_1c + step_1c + step_1c + step_00 + step_61 + step_down + step_end EventScript_171B85:: @ 8171B85 - end + end EventScript_171B86:: @ 8171B86 - loadword 0, gUnknown_81BF988 - callstd 4 - setvar VAR_0x8004, 0 - call EventScript_171A41 - setvar VAR_0x8004, 1 - call EventScript_171A41 - loadword 0, gUnknown_81BFAE8 - callstd 5 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_171A90 - loadword 0, gUnknown_81BF976 - callstd 4 - release - end + loadword 0, gUnknown_81BF988 + callstd 4 + setvar VAR_0x8004, 0 + call EventScript_171A41 + setvar VAR_0x8004, 1 + call EventScript_171A41 + loadword 0, gUnknown_81BFAE8 + callstd 5 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_171A90 + loadword 0, gUnknown_81BF976 + callstd 4 + release + end EventScript_171BBF:: @ 8171BBF - special ShowDaycareLevelMenu - waitstate - compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1719F7 - copyvar VAR_0x8004, VAR_RESULT - specialvar VAR_RESULT, TakePokemonFromDaycare - loadword 0, gUnknown_81BFA67 - callstd 4 - loadword 0, gUnknown_81BF976 - callstd 4 - release - end + special ShowDaycareLevelMenu + waitstate + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1719F7 + copyvar VAR_0x8004, VAR_RESULT + specialvar VAR_RESULT, TakePokemonFromDaycare + loadword 0, gUnknown_81BFA67 + callstd 4 + loadword 0, gUnknown_81BF976 + callstd 4 + release + end diff --git a/data/maps/FuchsiaCity/scripts.inc b/data/maps/FuchsiaCity/scripts.inc index 39624941c..2d0a6a32a 100644 --- a/data/maps/FuchsiaCity/scripts.inc +++ b/data/maps/FuchsiaCity/scripts.inc @@ -1,163 +1,163 @@ FuchsiaCity_MapScripts:: @ 8166D75 - map_script 3, FuchsiaCity_MapScript1_166D7B - .byte 0 + map_script 3, FuchsiaCity_MapScript1_166D7B + .byte 0 FuchsiaCity_MapScript1_166D7B:: @ 8166D7B - setworldmapflag 2199 - checkflag FLAG_0x272 - call_if 1, EventScript_166D91 - checkflag FLAG_0x272 - call_if 0, EventScript_166D97 - end + setworldmapflag 2199 + checkflag FLAG_0x272 + call_if 1, EventScript_166D91 + checkflag FLAG_0x272 + call_if 0, EventScript_166D97 + end EventScript_166D91:: @ 8166D91 - setvar VAR_0x4010, 118 - return + setvar VAR_0x4010, 118 + return EventScript_166D97:: @ 8166D97 - setvar VAR_0x4010, 147 - return + setvar VAR_0x4010, 147 + return FuchsiaCity_EventScript_166D9D:: @ 8166D9D - loadword 0, gUnknown_818056E - callstd 2 - end + loadword 0, gUnknown_818056E + callstd 2 + end FuchsiaCity_EventScript_166DA6:: @ 8166DA6 - loadword 0, gUnknown_81805C6 - callstd 2 - end + loadword 0, gUnknown_81805C6 + callstd 2 + end FuchsiaCity_EventScript_166DAF:: @ 8166DAF - loadword 0, gUnknown_818062C - callstd 2 - end + loadword 0, gUnknown_818062C + callstd 2 + end FuchsiaCity_EventScript_166DB8:: @ 8166DB8 - loadword 0, gUnknown_818065A - callstd 2 - end + loadword 0, gUnknown_818065A + callstd 2 + end FuchsiaCity_EventScript_166DC1:: @ 8166DC1 - lock - faceplayer - setvar VAR_0x8004, 6 - setvar VAR_0x8005, 3 - special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_8180ABD - callstd 4 - release - end + lock + faceplayer + setvar VAR_0x8004, 6 + setvar VAR_0x8005, 3 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_8180ABD + callstd 4 + release + end FuchsiaCity_EventScript_166DDA:: @ 8166DDA - loadword 0, gUnknown_81806AB - callstd 3 - end + loadword 0, gUnknown_81806AB + callstd 3 + end FuchsiaCity_EventScript_166DE3:: @ 8166DE3 - loadword 0, gUnknown_81806D3 - callstd 3 - end + loadword 0, gUnknown_81806D3 + callstd 3 + end FuchsiaCity_EventScript_166DEC:: @ 8166DEC - loadword 0, gUnknown_81806F0 - callstd 3 - end + loadword 0, gUnknown_81806F0 + callstd 3 + end FuchsiaCity_EventScript_166DF5:: @ 8166DF5 - loadword 0, gUnknown_818070D - callstd 3 - end + loadword 0, gUnknown_818070D + callstd 3 + end EventScript_166DFE:: @ 8166DFE - loadword 0, gUnknown_8180727 - callstd 3 - end + loadword 0, gUnknown_8180727 + callstd 3 + end FuchsiaCity_EventScript_166E07:: @ 8166E07 - lockall - setvar VAR_0x8004, 6 - setvar VAR_0x8005, 0 - special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_8180768 - callstd 4 - releaseall - end + lockall + setvar VAR_0x8004, 6 + setvar VAR_0x8005, 0 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_8180768 + callstd 4 + releaseall + end FuchsiaCity_EventScript_166E1F:: @ 8166E1F - lockall - setvar VAR_0x8004, 113 - special sub_80CBDCC - drawmonpic SPECIES_CHANSEY, 10, 3 - loadword 0, gUnknown_81807A9 - callstd 4 - erasemonpic - releaseall - end + lockall + setvar VAR_0x8004, 113 + special sub_80CBDCC + drawmonpic SPECIES_CHANSEY, 10, 3 + loadword 0, gUnknown_81807A9 + callstd 4 + erasemonpic + releaseall + end FuchsiaCity_EventScript_166E38:: @ 8166E38 - lockall - setvar VAR_0x8004, 100 - special sub_80CBDCC - drawmonpic SPECIES_VOLTORB, 10, 3 - loadword 0, gUnknown_81807D9 - callstd 4 - erasemonpic - releaseall - end + lockall + setvar VAR_0x8004, 100 + special sub_80CBDCC + drawmonpic SPECIES_VOLTORB, 10, 3 + loadword 0, gUnknown_81807D9 + callstd 4 + erasemonpic + releaseall + end FuchsiaCity_EventScript_166E51:: @ 8166E51 - lockall - setvar VAR_0x8004, 115 - special sub_80CBDCC - drawmonpic SPECIES_KANGASKHAN, 10, 3 - loadword 0, gUnknown_8180806 - callstd 4 - erasemonpic - releaseall - end + lockall + setvar VAR_0x8004, 115 + special sub_80CBDCC + drawmonpic SPECIES_KANGASKHAN, 10, 3 + loadword 0, gUnknown_8180806 + callstd 4 + erasemonpic + releaseall + end FuchsiaCity_EventScript_166E6A:: @ 8166E6A - lockall - setvar VAR_0x8004, 79 - special sub_80CBDCC - drawmonpic SPECIES_SLOWPOKE, 10, 3 - loadword 0, gUnknown_8180859 - callstd 4 - erasemonpic - releaseall - end + lockall + setvar VAR_0x8004, 79 + special sub_80CBDCC + drawmonpic SPECIES_SLOWPOKE, 10, 3 + loadword 0, gUnknown_8180859 + callstd 4 + erasemonpic + releaseall + end FuchsiaCity_EventScript_166E83:: @ 8166E83 - lockall - setvar VAR_0x8004, 131 - special sub_80CBDCC - drawmonpic SPECIES_LAPRAS, 10, 3 - loadword 0, gUnknown_8180887 - callstd 4 - erasemonpic - releaseall - end + lockall + setvar VAR_0x8004, 131 + special sub_80CBDCC + drawmonpic SPECIES_LAPRAS, 10, 3 + loadword 0, gUnknown_8180887 + callstd 4 + erasemonpic + releaseall + end FuchsiaCity_EventScript_166E9C:: @ 8166E9C - lockall - checkflag FLAG_0x272 - goto_if 1, EventScript_166EBE - setvar VAR_0x8004, 140 - special sub_80CBDCC - drawmonpic SPECIES_KABUTO, 10, 3 - loadword 0, gUnknown_81808FA - callstd 4 - erasemonpic - releaseall - end + lockall + checkflag FLAG_0x272 + goto_if 1, EventScript_166EBE + setvar VAR_0x8004, 140 + special sub_80CBDCC + drawmonpic SPECIES_KABUTO, 10, 3 + loadword 0, gUnknown_81808FA + callstd 4 + erasemonpic + releaseall + end EventScript_166EBE:: @ 8166EBE - setvar VAR_0x8004, 138 - special sub_80CBDCC - drawmonpic SPECIES_OMANYTE, 10, 3 - loadword 0, gUnknown_81808AE - callstd 4 - erasemonpic - releaseall - end + setvar VAR_0x8004, 138 + special sub_80CBDCC + drawmonpic SPECIES_OMANYTE, 10, 3 + loadword 0, gUnknown_81808AE + callstd 4 + erasemonpic + releaseall + end diff --git a/data/maps/FuchsiaCity_Building1/scripts.inc b/data/maps/FuchsiaCity_Building1/scripts.inc index 6b4c7a583..ebec8f693 100644 --- a/data/maps/FuchsiaCity_Building1/scripts.inc +++ b/data/maps/FuchsiaCity_Building1/scripts.inc @@ -1,79 +1,79 @@ FuchsiaCity_Building1_MapScripts:: @ 816D74B - .byte 0 + .byte 0 FuchsiaCity_Building1_EventScript_16D74C:: @ 816D74C - lock - faceplayer - checkflag FLAG_0x23A - goto_if 1, EventScript_16D7FA - checkflag FLAG_0x189 - goto_if 1, EventScript_16D780 - loadword 0, gUnknown_8198DF9 - callstd 5 - compare_var_to_value VAR_RESULT, 1 - call_if 1, EventScript_16D7E8 - compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_16D7F1 - release - end + lock + faceplayer + checkflag FLAG_0x23A + goto_if 1, EventScript_16D7FA + checkflag FLAG_0x189 + goto_if 1, EventScript_16D780 + loadword 0, gUnknown_8198DF9 + callstd 5 + compare_var_to_value VAR_RESULT, 1 + call_if 1, EventScript_16D7E8 + compare_var_to_value VAR_RESULT, 0 + call_if 1, EventScript_16D7F1 + release + end EventScript_16D780:: @ 816D780 - textcolor 3 - playfanfare MUS_ME_WAZA - message Text_198E84 - waitmessage - waitfanfare - loadword 0, gUnknown_8198EAA - callstd 4 - call EventScript_1A6675 - checkplayergender - compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_16D7D6 - compare_var_to_value VAR_RESULT, 1 - call_if 1, EventScript_16D7DF - additem ITEM_HM04, 1 - loadword 0, gUnknown_8199068 - setorcopyvar VAR_0x8000, 342 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 257 - callstd 9 - setflag FLAG_0x23A - removeitem ITEM_GOLD_TEETH, 1 - release - end + textcolor 3 + playfanfare MUS_ME_WAZA + message Text_198E84 + waitmessage + waitfanfare + loadword 0, gUnknown_8198EAA + callstd 4 + call EventScript_1A6675 + checkplayergender + compare_var_to_value VAR_RESULT, 0 + call_if 1, EventScript_16D7D6 + compare_var_to_value VAR_RESULT, 1 + call_if 1, EventScript_16D7DF + additem ITEM_HM04, 1 + loadword 0, gUnknown_8199068 + setorcopyvar VAR_0x8000, 342 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 257 + callstd 9 + setflag FLAG_0x23A + removeitem ITEM_GOLD_TEETH, 1 + release + end EventScript_16D7D6:: @ 816D7D6 - loadword 0, gUnknown_8198ECA - callstd 4 - return + loadword 0, gUnknown_8198ECA + callstd 4 + return EventScript_16D7DF:: @ 816D7DF - loadword 0, gUnknown_8198F96 - callstd 4 - return + loadword 0, gUnknown_8198F96 + callstd 4 + return EventScript_16D7E8:: @ 816D7E8 - loadword 0, gUnknown_8198E3F - callstd 4 - return + loadword 0, gUnknown_8198E3F + callstd 4 + return EventScript_16D7F1:: @ 816D7F1 - loadword 0, gUnknown_8198E63 - callstd 4 - return + loadword 0, gUnknown_8198E63 + callstd 4 + return EventScript_16D7FA:: @ 816D7FA - loadword 0, gUnknown_819908A - callstd 4 - release - end + loadword 0, gUnknown_819908A + callstd 4 + release + end FuchsiaCity_Building1_EventScript_16D804:: @ 816D804 - loadword 0, gUnknown_819913C - callstd 3 - end + loadword 0, gUnknown_819913C + callstd 3 + end FuchsiaCity_Building1_EventScript_16D80D:: @ 816D80D - loadword 0, gUnknown_8199167 - callstd 3 - end + loadword 0, gUnknown_8199167 + callstd 3 + end diff --git a/data/maps/FuchsiaCity_Gym/scripts.inc b/data/maps/FuchsiaCity_Gym/scripts.inc index fee370e20..0333627db 100644 --- a/data/maps/FuchsiaCity_Gym/scripts.inc +++ b/data/maps/FuchsiaCity_Gym/scripts.inc @@ -1,120 +1,120 @@ FuchsiaCity_Gym_MapScripts:: @ 816D54D - .byte 0 + .byte 0 FuchsiaCity_Gym_EventScript_16D54E:: @ 816D54E - setvar VAR_0x8004, 6 - setvar VAR_0x8005, 2 - special UpdatePickStateFromSpecialVar8005 - trainerbattle 1, 418, 0, Text_19832E, Text_198444, EventScript_16D580 - checkflag FLAG_0x259 - goto_if 0, EventScript_16D5A6 - loadword 0, gUnknown_8198481 - callstd 4 - release - end + setvar VAR_0x8004, 6 + setvar VAR_0x8005, 2 + special UpdatePickStateFromSpecialVar8005 + trainerbattle 1, 418, 0, Text_19832E, Text_198444, EventScript_16D580 + checkflag FLAG_0x259 + goto_if 0, EventScript_16D5A6 + loadword 0, gUnknown_8198481 + callstd 4 + release + end EventScript_16D580:: @ 816D580 - setvar VAR_0x8004, 6 - setvar VAR_0x8005, 1 - special SetFlavorTextFlagFromSpecialVars - clearflag FLAG_0x09F - setflag FLAG_0x4B4 - setflag FLAG_UNK824 - setvar VAR_0x8008, 5 - call EventScript_1A6B18 - goto EventScript_16D5A6 - end + setvar VAR_0x8004, 6 + setvar VAR_0x8005, 1 + special SetFlavorTextFlagFromSpecialVars + clearflag FLAG_0x09F + setflag FLAG_0x4B4 + setflag FLAG_UNK824 + setvar VAR_0x8008, 5 + call EventScript_1A6B18 + goto EventScript_16D5A6 + end EventScript_16D5A6:: @ 816D5A6 - loadword 0, gUnknown_819850E - callstd 4 - checkitemspace ITEM_TM06, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16D5E7 - additem ITEM_TM06, 1 - loadword 0, gUnknown_819858F - setorcopyvar VAR_0x8000, 294 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 257 - callstd 9 - setflag FLAG_0x259 - loadword 0, gUnknown_81985AB - callstd 4 - release - end + loadword 0, gUnknown_819850E + callstd 4 + checkitemspace ITEM_TM06, 1 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16D5E7 + additem ITEM_TM06, 1 + loadword 0, gUnknown_819858F + setorcopyvar VAR_0x8000, 294 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 257 + callstd 9 + setflag FLAG_0x259 + loadword 0, gUnknown_81985AB + callstd 4 + release + end EventScript_16D5E7:: @ 816D5E7 - loadword 0, gUnknown_819860D - callstd 4 - release - end + loadword 0, gUnknown_819860D + callstd 4 + release + end FuchsiaCity_Gym_EventScript_16D5F1:: @ 816D5F1 - trainerbattle 0, 294, 0, Text_198866, Text_1988B6 - loadword 0, gUnknown_81988CB - callstd 6 - end + trainerbattle 0, 294, 0, Text_198866, Text_1988B6 + loadword 0, gUnknown_81988CB + callstd 6 + end FuchsiaCity_Gym_EventScript_16D608:: @ 816D608 - trainerbattle 0, 295, 0, Text_19891F, Text_19897F - loadword 0, gUnknown_8198985 - callstd 6 - end + trainerbattle 0, 295, 0, Text_19891F, Text_19897F + loadword 0, gUnknown_8198985 + callstd 6 + end FuchsiaCity_Gym_EventScript_16D61F:: @ 816D61F - trainerbattle 0, 288, 0, Text_19871E, Text_198779 - setvar VAR_0x8004, 6 - setvar VAR_0x8005, 2 - special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_8198787 - callstd 6 - end + trainerbattle 0, 288, 0, Text_19871E, Text_198779 + setvar VAR_0x8004, 6 + setvar VAR_0x8005, 2 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_8198787 + callstd 6 + end FuchsiaCity_Gym_EventScript_16D643:: @ 816D643 - trainerbattle 0, 289, 0, Text_1989A1, Text_1989EA - loadword 0, gUnknown_8198A10 - callstd 6 - end + trainerbattle 0, 289, 0, Text_1989A1, Text_1989EA + loadword 0, gUnknown_8198A10 + callstd 6 + end FuchsiaCity_Gym_EventScript_16D65A:: @ 816D65A - trainerbattle 0, 292, 0, Text_198629, Text_1986B4 - loadword 0, gUnknown_81986C9 - callstd 6 - end + trainerbattle 0, 292, 0, Text_198629, Text_1986B4 + loadword 0, gUnknown_81986C9 + callstd 6 + end FuchsiaCity_Gym_EventScript_16D671:: @ 816D671 - trainerbattle 0, 293, 0, Text_1987E8, Text_198812 - loadword 0, gUnknown_8198825 - callstd 6 - end + trainerbattle 0, 293, 0, Text_1987E8, Text_198812 + loadword 0, gUnknown_8198825 + callstd 6 + end FuchsiaCity_Gym_EventScript_16D688:: @ 816D688 - lock - faceplayer - checkflag FLAG_0x4B4 - goto_if 1, EventScript_16D69D - loadword 0, gUnknown_8198A5E - callstd 4 - release - end + lock + faceplayer + checkflag FLAG_0x4B4 + goto_if 1, EventScript_16D69D + loadword 0, gUnknown_8198A5E + callstd 4 + release + end EventScript_16D69D:: @ 816D69D - loadword 0, gUnknown_8198B1D - callstd 4 - release - end + loadword 0, gUnknown_8198B1D + callstd 4 + release + end FuchsiaCity_Gym_EventScript_16D6A7:: @ 816D6A7 - lockall - checkflag FLAG_UNK824 - goto_if 1, EventScript_16D6BB - loadword 0, gUnknown_8198B4B - callstd 4 - releaseall - end + lockall + checkflag FLAG_UNK824 + goto_if 1, EventScript_16D6BB + loadword 0, gUnknown_8198B4B + callstd 4 + releaseall + end EventScript_16D6BB:: @ 816D6BB - loadword 0, gUnknown_8198B81 - callstd 4 - releaseall - end + loadword 0, gUnknown_8198B81 + callstd 4 + releaseall + end diff --git a/data/maps/FuchsiaCity_House1/scripts.inc b/data/maps/FuchsiaCity_House1/scripts.inc index 7f3f29d91..2e36ba0ee 100644 --- a/data/maps/FuchsiaCity_House1/scripts.inc +++ b/data/maps/FuchsiaCity_House1/scripts.inc @@ -1,23 +1,23 @@ FuchsiaCity_House1_MapScripts:: @ 816D6C5 - .byte 0 + .byte 0 FuchsiaCity_House1_EventScript_16D6C6:: @ 816D6C6 - loadword 0, gUnknown_8198BBB - callstd 2 - end + loadword 0, gUnknown_8198BBB + callstd 2 + end FuchsiaCity_House1_EventScript_16D6CF:: @ 816D6CF - lock - faceplayer - setvar VAR_0x8004, 13 - setvar VAR_0x8005, 2 - special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_8198C1F - callstd 4 - release - end + lock + faceplayer + setvar VAR_0x8004, 13 + setvar VAR_0x8005, 2 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_8198C1F + callstd 4 + release + end FuchsiaCity_House1_EventScript_16D6E8:: @ 816D6E8 - loadword 0, gUnknown_8198C7B - callstd 2 - end + loadword 0, gUnknown_8198C7B + callstd 2 + end diff --git a/data/maps/FuchsiaCity_House2/scripts.inc b/data/maps/FuchsiaCity_House2/scripts.inc index 82d9cf932..135c68a77 100644 --- a/data/maps/FuchsiaCity_House2/scripts.inc +++ b/data/maps/FuchsiaCity_House2/scripts.inc @@ -1,46 +1,46 @@ FuchsiaCity_House2_MapScripts:: @ 816D816 - .byte 0 + .byte 0 FuchsiaCity_House2_EventScript_16D817:: @ 816D817 - lock - faceplayer - checkflag FLAG_0x244 - goto_if 1, EventScript_16D83F - loadword 0, gUnknown_819918E - callstd 5 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16D849 - loadword 0, gUnknown_8199337 - callstd 4 - release - end + lock + faceplayer + checkflag FLAG_0x244 + goto_if 1, EventScript_16D83F + loadword 0, gUnknown_819918E + callstd 5 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16D849 + loadword 0, gUnknown_8199337 + callstd 4 + release + end EventScript_16D83F:: @ 816D83F - loadword 0, gUnknown_8199354 - callstd 4 - release - end + loadword 0, gUnknown_8199354 + callstd 4 + release + end EventScript_16D849:: @ 816D849 - loadword 0, gUnknown_8199207 - callstd 4 - checkitemspace ITEM_GOOD_ROD, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16D88A - additem ITEM_GOOD_ROD, 1 - loadword 0, gUnknown_819925E - setorcopyvar VAR_0x8000, 263 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 257 - callstd 9 - loadword 0, gUnknown_8199296 - callstd 4 - setflag FLAG_0x244 - release - end + loadword 0, gUnknown_8199207 + callstd 4 + checkitemspace ITEM_GOOD_ROD, 1 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16D88A + additem ITEM_GOOD_ROD, 1 + loadword 0, gUnknown_819925E + setorcopyvar VAR_0x8000, 263 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 257 + callstd 9 + loadword 0, gUnknown_8199296 + callstd 4 + setflag FLAG_0x244 + release + end EventScript_16D88A:: @ 816D88A - loadword 0, gUnknown_819937E - callstd 4 - release - end + loadword 0, gUnknown_819937E + callstd 4 + release + end diff --git a/data/maps/FuchsiaCity_House3/scripts.inc b/data/maps/FuchsiaCity_House3/scripts.inc index c7a7f60bb..31632f029 100644 --- a/data/maps/FuchsiaCity_House3/scripts.inc +++ b/data/maps/FuchsiaCity_House3/scripts.inc @@ -1,68 +1,68 @@ FuchsiaCity_House3_MapScripts:: @ 816D894 - .byte 0 + .byte 0 FuchsiaCity_House3_EventScript_16D895:: @ 816D895 - lock - faceplayer - loadword 0, gUnknown_81993B9 - callstd 5 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16D8B0 - goto EventScript_16D941 - end + lock + faceplayer + loadword 0, gUnknown_81993B9 + callstd 5 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16D8B0 + goto EventScript_16D941 + end EventScript_16D8B0:: @ 816D8B0 - loadword 0, gUnknown_8199421 - callstd 4 - special sub_80BF8FC - waitstate - compare_var_to_value VAR_0x8004, 6 - goto_if 4, EventScript_16D941 - special sub_80BFC14 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16D937 - special ScrSpecial_CountPokemonMoves - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16D92A - loadword 0, gUnknown_8199445 - callstd 4 - fadescreen 1 - special sub_80BF9BC - fadescreen 0 - compare_var_to_value VAR_0x8005, 4 - goto_if 1, EventScript_16D8B0 - special ScrSpecial_GetPokemonNicknameAndMoveName - loadword 0, gUnknown_8199485 - callstd 5 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16D919 - goto EventScript_16D941 - end + loadword 0, gUnknown_8199421 + callstd 4 + special sub_80BF8FC + waitstate + compare_var_to_value VAR_0x8004, 6 + goto_if 4, EventScript_16D941 + special sub_80BFC14 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16D937 + special ScrSpecial_CountPokemonMoves + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16D92A + loadword 0, gUnknown_8199445 + callstd 4 + fadescreen 1 + special sub_80BF9BC + fadescreen 0 + compare_var_to_value VAR_0x8005, 4 + goto_if 1, EventScript_16D8B0 + special ScrSpecial_GetPokemonNicknameAndMoveName + loadword 0, gUnknown_8199485 + callstd 5 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16D919 + goto EventScript_16D941 + end EventScript_16D919:: @ 816D919 - special sub_80BFBA8 - playfanfare MUS_ME_WASURE - waitfanfare - loadword 0, gUnknown_81994B1 - callstd 4 - release - end + special sub_80BFBA8 + playfanfare MUS_ME_WASURE + waitfanfare + loadword 0, gUnknown_81994B1 + callstd 4 + release + end EventScript_16D92A:: @ 816D92A - special ScrSpecial_GetPokemonNicknameAndMoveName - loadword 0, gUnknown_8199465 - callstd 4 - release - end + special ScrSpecial_GetPokemonNicknameAndMoveName + loadword 0, gUnknown_8199465 + callstd 4 + release + end EventScript_16D937:: @ 816D937 - loadword 0, gUnknown_819951F - callstd 4 - release - end + loadword 0, gUnknown_819951F + callstd 4 + release + end EventScript_16D941:: @ 816D941 - loadword 0, gUnknown_81994EA - callstd 4 - release - end + loadword 0, gUnknown_81994EA + callstd 4 + release + end diff --git a/data/maps/FuchsiaCity_Mart/scripts.inc b/data/maps/FuchsiaCity_Mart/scripts.inc index b87c05ce7..a4110387f 100644 --- a/data/maps/FuchsiaCity_Mart/scripts.inc +++ b/data/maps/FuchsiaCity_Mart/scripts.inc @@ -1,38 +1,38 @@ FuchsiaCity_Mart_MapScripts:: @ 816D4E0 - .byte 0 + .byte 0 FuchsiaCity_Mart_EventScript_16D4E1:: @ 816D4E1 - loadword 0, gUnknown_8198134 - callstd 2 - end + loadword 0, gUnknown_8198134 + callstd 2 + end FuchsiaCity_Mart_EventScript_16D4EA:: @ 816D4EA - loadword 0, gUnknown_81980BC - callstd 2 - end + loadword 0, gUnknown_81980BC + callstd 2 + end FuchsiaCity_Mart_EventScript_16D4F3:: @ 816D4F3 - special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 - lock - faceplayer - message Text_1A6211 - waitmessage - pokemart Items_16D518 - loadword 0, gUnknown_81A5190 - callstd 4 - release - end + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + lock + faceplayer + message Text_1A6211 + waitmessage + pokemart Items_16D518 + loadword 0, gUnknown_81A5190 + callstd 4 + release + end - .align 2 + .align 2 Items_16D518:: @ 816D518 - .2byte ITEM_ULTRA_BALL - .2byte ITEM_GREAT_BALL - .2byte ITEM_SUPER_POTION - .2byte ITEM_REVIVE - .2byte ITEM_FULL_HEAL - .2byte ITEM_MAX_REPEL - .2byte ITEM_NONE - release - end + .2byte ITEM_ULTRA_BALL + .2byte ITEM_GREAT_BALL + .2byte ITEM_SUPER_POTION + .2byte ITEM_REVIVE + .2byte ITEM_FULL_HEAL + .2byte ITEM_MAX_REPEL + .2byte ITEM_NONE + release + end diff --git a/data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc b/data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc index c52bf9f88..86d44722c 100644 --- a/data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc @@ -1,30 +1,30 @@ FuchsiaCity_PokemonCenter_1F_MapScripts:: @ 816D6F1 - map_script 3, FuchsiaCity_PokemonCenter_1F_MapScript1_16D6FC - map_script 5, FuchsiaCity_PokemonCenter_1F_MapScript2_1BC05C - .byte 0 + map_script 3, FuchsiaCity_PokemonCenter_1F_MapScript1_16D6FC + map_script 5, FuchsiaCity_PokemonCenter_1F_MapScript2_1BC05C + .byte 0 FuchsiaCity_PokemonCenter_1F_MapScript1_16D6FC:: @ 816D6FC - setrespawn 8 - end + setrespawn 8 + end FuchsiaCity_PokemonCenter_1F_EventScript_16D700:: @ 816D700 - lock - faceplayer - call EventScript_1A6578 - release - end + lock + faceplayer + call EventScript_1A6578 + release + end FuchsiaCity_PokemonCenter_1F_EventScript_16D709:: @ 816D709 - loadword 0, gUnknown_8198CB7 - callstd 2 - end + loadword 0, gUnknown_8198CB7 + callstd 2 + end FuchsiaCity_PokemonCenter_1F_EventScript_16D712:: @ 816D712 - loadword 0, gUnknown_8198D2E - callstd 2 - end + loadword 0, gUnknown_8198D2E + callstd 2 + end FuchsiaCity_PokemonCenter_1F_EventScript_16D71B:: @ 816D71B - loadword 0, gUnknown_8198D9B - callstd 2 - end + loadword 0, gUnknown_8198D9B + callstd 2 + end diff --git a/data/maps/FuchsiaCity_PokemonCenter_2F/scripts.inc b/data/maps/FuchsiaCity_PokemonCenter_2F/scripts.inc index 2f62e3591..322dd3930 100644 --- a/data/maps/FuchsiaCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/FuchsiaCity_PokemonCenter_2F/scripts.inc @@ -1,18 +1,18 @@ FuchsiaCity_PokemonCenter_2F_MapScripts:: @ 816D724 - map_script 2, FuchsiaCity_PokemonCenter_2F_MapScript1_1BB2A3 - map_script 4, FuchsiaCity_PokemonCenter_2F_MapScript2_1BB1ED - map_script 1, FuchsiaCity_PokemonCenter_2F_MapScript3_1BB237 - map_script 3, FuchsiaCity_PokemonCenter_2F_MapScript4_1BB1B4 - .byte 0 + map_script 2, FuchsiaCity_PokemonCenter_2F_MapScript1_1BB2A3 + map_script 4, FuchsiaCity_PokemonCenter_2F_MapScript2_1BB1ED + map_script 1, FuchsiaCity_PokemonCenter_2F_MapScript3_1BB237 + map_script 3, FuchsiaCity_PokemonCenter_2F_MapScript4_1BB1B4 + .byte 0 FuchsiaCity_PokemonCenter_2F_EventScript_16D739:: @ 816D739 - call EventScript_1BB4A3 - end + call EventScript_1BB4A3 + end EventScript_16D73F:: @ 816D73F - call EventScript_1BB6AB - end + call EventScript_1BB6AB + end EventScript_16D745:: @ 816D745 - call EventScript_1BB7DE - end + call EventScript_1BB7DE + end diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc index 157b1dbdb..313a47da7 100644 --- a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc +++ b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc @@ -1,231 +1,231 @@ FuchsiaCity_SafariZone_Entrance_MapScripts:: @ 816D2A8 - map_script 2, FuchsiaCity_SafariZone_Entrance_MapScript1_16D2AE - .byte 0 + map_script 2, FuchsiaCity_SafariZone_Entrance_MapScript1_16D2AE + .byte 0 FuchsiaCity_SafariZone_Entrance_MapScript1_16D2AE:: @ 816D2AE - map_script_2 VAR_0x406E, 1, EventScript_16D2F2 - map_script_2 VAR_0x406E, 2, EventScript_16D312 - map_script_2 VAR_0x406E, 3, EventScript_16D2C8 - .2byte 0 + map_script_2 VAR_0x406E, 1, EventScript_16D2F2 + map_script_2 VAR_0x406E, 2, EventScript_16D312 + map_script_2 VAR_0x406E, 3, EventScript_16D2C8 + .2byte 0 EventScript_16D2C8:: @ 816D2C8 - lockall - textcolor 0 - applymovement 255, Movement_16D36A - waitmovement 0 - loadword 0, gUnknown_8197E85 - callstd 4 - closemessage - applymovement 255, Movement_16D367 - waitmovement 0 - special sub_80A0EEC - setvar VAR_0x406E, 0 - releaseall - end + lockall + textcolor 0 + applymovement 255, Movement_16D36A + waitmovement 0 + loadword 0, gUnknown_8197E85 + callstd 4 + closemessage + applymovement 255, Movement_16D367 + waitmovement 0 + special sub_80A0EEC + setvar VAR_0x406E, 0 + releaseall + end EventScript_16D2F2:: @ 816D2F2 - lockall - textcolor 0 - loadword 0, gUnknown_8197E85 - callstd 4 - closemessage - applymovement 255, Movement_16D362 - waitmovement 0 - special sub_80A0EEC - setvar VAR_0x406E, 0 - releaseall - end + lockall + textcolor 0 + loadword 0, gUnknown_8197E85 + callstd 4 + closemessage + applymovement 255, Movement_16D362 + waitmovement 0 + special sub_80A0EEC + setvar VAR_0x406E, 0 + releaseall + end EventScript_16D312:: @ 816D312 - lockall - textcolor 0 - loadword 0, gUnknown_8197E1A - callstd 5 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16D345 - loadword 0, gUnknown_8197E48 - callstd 4 - closemessage - applymovement 255, Movement_16D362 - waitmovement 0 - special sub_80A0EEC - setvar VAR_0x406E, 0 - releaseall - end + lockall + textcolor 0 + loadword 0, gUnknown_8197E1A + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16D345 + loadword 0, gUnknown_8197E48 + callstd 4 + closemessage + applymovement 255, Movement_16D362 + waitmovement 0 + special sub_80A0EEC + setvar VAR_0x406E, 0 + releaseall + end EventScript_16D345:: @ 816D345 - loadword 0, gUnknown_8197E7A - callstd 4 - closemessage - applymovement 255, Movement_16D365 - waitmovement 0 - warp MAP_SAFARI_ZONE_CENTER, 255, 26, 30 - waitstate - end + loadword 0, gUnknown_8197E7A + callstd 4 + closemessage + applymovement 255, Movement_16D365 + waitmovement 0 + warp MAP_SAFARI_ZONE_CENTER, 255, 26, 30 + waitstate + end Movement_16D362:: @ 816D362 - step_10 - step_10 - step_end + step_10 + step_10 + step_end Movement_16D365:: @ 816D365 - step_11 - step_end + step_11 + step_end Movement_16D367:: @ 816D367 - step_10 - step_10 - step_end + step_10 + step_10 + step_end Movement_16D36A:: @ 816D36A - step_10 - step_1b - step_end + step_10 + step_1b + step_end FuchsiaCity_SafariZone_Entrance_EventScript_16D36D:: @ 816D36D - lockall - setvar VAR_0x4002, 0 - goto EventScript_16D391 - end + lockall + setvar VAR_0x4002, 0 + goto EventScript_16D391 + end FuchsiaCity_SafariZone_Entrance_EventScript_16D379:: @ 816D379 - lockall - setvar VAR_0x4002, 1 - goto EventScript_16D391 - end + lockall + setvar VAR_0x4002, 1 + goto EventScript_16D391 + end FuchsiaCity_SafariZone_Entrance_EventScript_16D385:: @ 816D385 - lockall - setvar VAR_0x4002, 2 - goto EventScript_16D391 - end + lockall + setvar VAR_0x4002, 2 + goto EventScript_16D391 + end EventScript_16D391:: @ 816D391 - textcolor 0 - loadword 0, gUnknown_8197C6B - callstd 4 - applymovement 255, Movement_1A75EB - waitmovement 0 - showmoneybox 0, 0, 0 - loadword 0, gUnknown_8197C87 - callstd 5 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16D3CA - loadword 0, gUnknown_8197DE9 - callstd 4 - goto EventScript_16D49A - end + textcolor 0 + loadword 0, gUnknown_8197C6B + callstd 4 + applymovement 255, Movement_1A75EB + waitmovement 0 + showmoneybox 0, 0, 0 + loadword 0, gUnknown_8197C87 + callstd 5 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16D3CA + loadword 0, gUnknown_8197DE9 + callstd 4 + goto EventScript_16D49A + end EventScript_16D3CA:: @ 816D3CA - call EventScript_16D462 - checkmoney 500, 0 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16D48C - takemoney 500, 0 - updatemoneybox 0, 0, 0 - loadword 0, gUnknown_8197D07 - callstd 4 - textcolor 3 - playfanfare MUS_FANFA1 - message Text_197D50 - waitfanfare - call EventScript_1A6675 - loadword 0, gUnknown_8197D80 - callstd 4 - closemessage - hidemoneybox - .byte 0 - .byte 0 - compare_var_to_value VAR_0x4002, 0 - call_if 1, EventScript_16D44C - compare_var_to_value VAR_0x4002, 1 - call_if 1, EventScript_16D441 - compare_var_to_value VAR_0x4002, 2 - call_if 1, EventScript_16D457 - special sub_80A0EC4 - setvar VAR_0x406E, 2 - warp MAP_SAFARI_ZONE_CENTER, 255, 26, 30 - waitstate - end + call EventScript_16D462 + checkmoney 500, 0 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16D48C + takemoney 500, 0 + updatemoneybox 0, 0, 0 + loadword 0, gUnknown_8197D07 + callstd 4 + textcolor 3 + playfanfare MUS_FANFA1 + message Text_197D50 + waitfanfare + call EventScript_1A6675 + loadword 0, gUnknown_8197D80 + callstd 4 + closemessage + hidemoneybox + .byte 0 + .byte 0 + compare_var_to_value VAR_0x4002, 0 + call_if 1, EventScript_16D44C + compare_var_to_value VAR_0x4002, 1 + call_if 1, EventScript_16D441 + compare_var_to_value VAR_0x4002, 2 + call_if 1, EventScript_16D457 + special sub_80A0EC4 + setvar VAR_0x406E, 2 + warp MAP_SAFARI_ZONE_CENTER, 255, 26, 30 + waitstate + end EventScript_16D441:: @ 816D441 - applymovement 255, Movement_16D4AF - waitmovement 0 - return + applymovement 255, Movement_16D4AF + waitmovement 0 + return EventScript_16D44C:: @ 816D44C - applymovement 255, Movement_16D4AC - waitmovement 0 - return + applymovement 255, Movement_16D4AC + waitmovement 0 + return EventScript_16D457:: @ 816D457 - applymovement 255, Movement_16D4B3 - waitmovement 0 - return + applymovement 255, Movement_16D4B3 + waitmovement 0 + return EventScript_16D462:: @ 816D462 - countpokemon - compare_var_to_value VAR_RESULT, 6 - goto_if 5, EventScript_1A77A9 - specialvar VAR_RESULT, sub_80CABD0 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A77A9 - loadword 0, gUnknown_81BFEAC - callstd 4 - goto EventScript_16D49A - end + countpokemon + compare_var_to_value VAR_RESULT, 6 + goto_if 5, EventScript_1A77A9 + specialvar VAR_RESULT, sub_80CABD0 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_1A77A9 + loadword 0, gUnknown_81BFEAC + callstd 4 + goto EventScript_16D49A + end EventScript_16D48C:: @ 816D48C - loadword 0, gUnknown_8197E02 - callstd 4 - goto EventScript_16D49A - end + loadword 0, gUnknown_8197E02 + callstd 4 + goto EventScript_16D49A + end EventScript_16D49A:: @ 816D49A - closemessage - hidemoneybox - .byte 0 - .byte 0 - applymovement 255, Movement_16D4AA - waitmovement 0 - releaseall - end + closemessage + hidemoneybox + .byte 0 + .byte 0 + applymovement 255, Movement_16D4AA + waitmovement 0 + releaseall + end Movement_16D4AA:: @ 816D4AA - step_10 - step_end + step_10 + step_end Movement_16D4AC:: @ 816D4AC - step_11 - step_11 - step_end + step_11 + step_11 + step_end Movement_16D4AF:: @ 816D4AF - step_11 - step_12 - step_11 - step_end + step_11 + step_12 + step_11 + step_end Movement_16D4B3:: @ 816D4B3 - step_11 - step_13 - step_11 - step_end + step_11 + step_13 + step_11 + step_end FuchsiaCity_SafariZone_Entrance_EventScript_16D4B7:: @ 816D4B7 - lock - faceplayer - loadword 0, gUnknown_8197EB0 - callstd 5 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16D4D6 - loadword 0, gUnknown_819809E - callstd 4 - release - end + lock + faceplayer + loadword 0, gUnknown_8197EB0 + callstd 5 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16D4D6 + loadword 0, gUnknown_819809E + callstd 4 + release + end EventScript_16D4D6:: @ 816D4D6 - loadword 0, gUnknown_8197EE3 - callstd 4 - release - end + loadword 0, gUnknown_8197EE3 + callstd 4 + release + end diff --git a/data/maps/FuchsiaCity_ZooBuilding/scripts.inc b/data/maps/FuchsiaCity_ZooBuilding/scripts.inc index 80c385909..f5cdd37a6 100644 --- a/data/maps/FuchsiaCity_ZooBuilding/scripts.inc +++ b/data/maps/FuchsiaCity_ZooBuilding/scripts.inc @@ -1,22 +1,22 @@ FuchsiaCity_ZooBuilding_MapScripts:: @ 816D528 - .byte 0 + .byte 0 FuchsiaCity_ZooBuilding_EventScript_16D529:: @ 816D529 - loadword 0, gUnknown_819816B - callstd 2 - end + loadword 0, gUnknown_819816B + callstd 2 + end FuchsiaCity_ZooBuilding_EventScript_16D532:: @ 816D532 - loadword 0, gUnknown_81981C2 - callstd 2 - end + loadword 0, gUnknown_81981C2 + callstd 2 + end FuchsiaCity_ZooBuilding_EventScript_16D53B:: @ 816D53B - loadword 0, gUnknown_819822A - callstd 2 - end + loadword 0, gUnknown_819822A + callstd 2 + end FuchsiaCity_ZooBuilding_EventScript_16D544:: @ 816D544 - loadword 0, gUnknown_8198285 - callstd 2 - end + loadword 0, gUnknown_8198285 + callstd 2 + end diff --git a/data/maps/IndigoPlateau_Exterior/scripts.inc b/data/maps/IndigoPlateau_Exterior/scripts.inc index 101993c19..fd45d3fd4 100644 --- a/data/maps/IndigoPlateau_Exterior/scripts.inc +++ b/data/maps/IndigoPlateau_Exterior/scripts.inc @@ -1,167 +1,167 @@ IndigoPlateau_Exterior_MapScripts:: @ 816723B - map_script 3, IndigoPlateau_Exterior_MapScript1_167246 - map_script 2, IndigoPlateau_Exterior_MapScript2_16725A - .byte 0 + map_script 3, IndigoPlateau_Exterior_MapScript1_167246 + map_script 2, IndigoPlateau_Exterior_MapScript2_16725A + .byte 0 IndigoPlateau_Exterior_MapScript1_167246:: @ 8167246 - setworldmapflag 2201 - compare_var_to_value VAR_0x4085, 1 - call_if 1, EventScript_167255 - end + setworldmapflag 2201 + compare_var_to_value VAR_0x4085, 1 + call_if 1, EventScript_167255 + end EventScript_167255:: @ 8167255 - playbgm BGM_FRLG_CREDITS, 0 - return + playbgm BGM_FRLG_CREDITS, 0 + return IndigoPlateau_Exterior_MapScript2_16725A:: @ 816725A - map_script_2 VAR_0x4085, 1, EventScript_167264 - .2byte 0 + map_script_2 VAR_0x4085, 1, EventScript_167264 + .2byte 0 EventScript_167264:: @ 8167264 - lockall - delay 105 - opendoor 11, 6 - waitdooranim - special SpawnScriptFieldObject - addobject 1 - applymovement 1, Movement_167346 - applymovement 255, Movement_167337 - waitmovement 0 - closedoor 11, 6 - waitdooranim - applymovement 255, Movement_16731B - applymovement 1, Movement_16733E - waitmovement 0 - delay 100 - opendoor 11, 6 - waitdooranim - addobject 2 - applymovement 2, Movement_16735D - waitmovement 0 - closedoor 11, 6 - waitdooranim - delay 160 - applymovement 255, Movement_16731F - applymovement 2, Movement_167348 - waitmovement 0 - delay 100 - applymovement 255, Movement_16732E - waitmovement 0 - delay 155 - applymovement 255, Movement_16733C - waitmovement 0 - delay 90 - applymovement 255, Movement_167335 - waitmovement 0 - applymovement 255, Movement_167311 - waitmovement 0 - special RemoveScriptFieldObject - setvar VAR_0x4085, 0 - removeobject 1 - removeobject 2 - special sub_80F39B4 - waitstate - releaseall - end + lockall + delay 105 + opendoor 11, 6 + waitdooranim + special SpawnScriptFieldObject + addobject 1 + applymovement 1, Movement_167346 + applymovement 255, Movement_167337 + waitmovement 0 + closedoor 11, 6 + waitdooranim + applymovement 255, Movement_16731B + applymovement 1, Movement_16733E + waitmovement 0 + delay 100 + opendoor 11, 6 + waitdooranim + addobject 2 + applymovement 2, Movement_16735D + waitmovement 0 + closedoor 11, 6 + waitdooranim + delay 160 + applymovement 255, Movement_16731F + applymovement 2, Movement_167348 + waitmovement 0 + delay 100 + applymovement 255, Movement_16732E + waitmovement 0 + delay 155 + applymovement 255, Movement_16733C + waitmovement 0 + delay 90 + applymovement 255, Movement_167335 + waitmovement 0 + applymovement 255, Movement_167311 + waitmovement 0 + special RemoveScriptFieldObject + setvar VAR_0x4085, 0 + removeobject 1 + removeobject 2 + special sub_80F39B4 + waitstate + releaseall + end Movement_167311:: @ 8167311 - step_3d - step_3d - step_3d - step_3d - step_3d - step_3d - step_end + step_3d + step_3d + step_3d + step_3d + step_3d + step_3d + step_end Movement_167318:: @ 8167318 - step_10 - step_10 - step_end + step_10 + step_10 + step_end Movement_16731B:: @ 816731B - step_1c - step_1a - step_2d - step_end + step_1c + step_1a + step_2d + step_end Movement_16731F:: @ 816731F - step_1b - step_30 - step_1c - step_1c - step_1c - step_1c - step_1c - step_1c - step_1c - step_1c - step_1c - step_1c - step_1c - step_2d - step_end + step_1b + step_30 + step_1c + step_1c + step_1c + step_1c + step_1c + step_1c + step_1c + step_1c + step_1c + step_1c + step_1c + step_2d + step_end Movement_16732E:: @ 816732E - step_13 - step_1c - step_10 - step_10 - step_1c - step_1c - step_end + step_13 + step_1c + step_10 + step_10 + step_1c + step_1c + step_end Movement_167335:: @ 8167335 - step_2d - step_end + step_2d + step_end Movement_167337:: @ 8167337 - step_03 - step_4c - step_12 - step_4d - step_end + step_03 + step_4c + step_12 + step_4d + step_end Movement_16733C:: @ 816733C - step_2e - step_end + step_2e + step_end Movement_16733E:: @ 816733E - step_1d - step_1d - step_1d - step_1d - step_1d - step_1d - step_1d - step_end + step_1d + step_1d + step_1d + step_1d + step_1d + step_1d + step_1d + step_end Movement_167346:: @ 8167346 - step_1d - step_end + step_1d + step_end Movement_167348:: @ 8167348 - step_2f - step_1c - step_1c - step_1c - step_1c - step_1c - step_1c - step_1c - step_1c - step_1c - step_1c - step_2d - step_1c - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_end + step_2f + step_1c + step_1c + step_1c + step_1c + step_1c + step_1c + step_1c + step_1c + step_1c + step_1c + step_2d + step_1c + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_end Movement_16735D:: @ 816735D - step_10 - step_end + step_10 + step_end diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc index 42a3280a2..91257ef5a 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc +++ b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc @@ -1,81 +1,81 @@ IndigoPlateau_PokemonCenter_1F_MapScripts:: @ 816EA5A - map_script 3, IndigoPlateau_PokemonCenter_1F_MapScript1_16EA65 - map_script 5, IndigoPlateau_PokemonCenter_1F_MapScript2_1BC05C - .byte 0 + map_script 3, IndigoPlateau_PokemonCenter_1F_MapScript1_16EA65 + map_script 5, IndigoPlateau_PokemonCenter_1F_MapScript2_1BC05C + .byte 0 IndigoPlateau_PokemonCenter_1F_MapScript1_16EA65:: @ 816EA65 - setrespawn 10 - specialvar VAR_RESULT, sub_806E25C - compare_var_to_value VAR_RESULT, 1 - call_if 1, EventScript_16EA79 - end + setrespawn 10 + specialvar VAR_RESULT, sub_806E25C + compare_var_to_value VAR_RESULT, 1 + call_if 1, EventScript_16EA79 + end EventScript_16EA79:: @ 816EA79 - checkflag 2116 - goto_if 1, EventScript_1A77A9 - setobjectxyperm 4, 4, 2 - return + checkflag 2116 + goto_if 1, EventScript_1A77A9 + setobjectxyperm 4, 4, 2 + return IndigoPlateau_PokemonCenter_1F_EventScript_16EA8A:: @ 816EA8A - lock - faceplayer - specialvar VAR_RESULT, sub_806E25C - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16EAA6 - loadword 0, gUnknown_819A8D8 - callstd 4 - release - end + lock + faceplayer + specialvar VAR_RESULT, sub_806E25C + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16EAA6 + loadword 0, gUnknown_819A8D8 + callstd 4 + release + end EventScript_16EAA6:: @ 816EAA6 - checkflag 2116 - goto_if 1, EventScript_16EAB9 - loadword 0, gUnknown_819A943 - callstd 4 - release - end + checkflag 2116 + goto_if 1, EventScript_16EAB9 + loadword 0, gUnknown_819A943 + callstd 4 + release + end EventScript_16EAB9:: @ 816EAB9 - loadword 0, gUnknown_819A8D8 - callstd 4 - release - end + loadword 0, gUnknown_819A8D8 + callstd 4 + release + end IndigoPlateau_PokemonCenter_1F_EventScript_16EAC3:: @ 816EAC3 - loadword 0, gUnknown_819A837 - callstd 2 - end + loadword 0, gUnknown_819A837 + callstd 2 + end IndigoPlateau_PokemonCenter_1F_EventScript_16EACC:: @ 816EACC - special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 - lock - faceplayer - message Text_1A6211 - waitmessage - pokemart Items_16EAF4 - loadword 0, gUnknown_81A5190 - callstd 4 - release - end + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + lock + faceplayer + message Text_1A6211 + waitmessage + pokemart Items_16EAF4 + loadword 0, gUnknown_81A5190 + callstd 4 + release + end - .align 2 + .align 2 Items_16EAF4:: @ 816EAF4 - .2byte ITEM_ULTRA_BALL - .2byte ITEM_GREAT_BALL - .2byte ITEM_FULL_RESTORE - .2byte ITEM_MAX_POTION - .2byte ITEM_REVIVE - .2byte ITEM_FULL_HEAL - .2byte ITEM_MAX_REPEL - .2byte ITEM_NONE - release - end + .2byte ITEM_ULTRA_BALL + .2byte ITEM_GREAT_BALL + .2byte ITEM_FULL_RESTORE + .2byte ITEM_MAX_POTION + .2byte ITEM_REVIVE + .2byte ITEM_FULL_HEAL + .2byte ITEM_MAX_REPEL + .2byte ITEM_NONE + release + end IndigoPlateau_PokemonCenter_1F_EventScript_16EB06:: @ 816EB06 - lock - faceplayer - call EventScript_1A6578 - release - end + lock + faceplayer + call EventScript_1A6578 + release + end diff --git a/data/maps/IndigoPlateau_PokemonCenter_2F/scripts.inc b/data/maps/IndigoPlateau_PokemonCenter_2F/scripts.inc index 152e39da9..6c2955435 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_2F/scripts.inc +++ b/data/maps/IndigoPlateau_PokemonCenter_2F/scripts.inc @@ -1,18 +1,18 @@ IndigoPlateau_PokemonCenter_2F_MapScripts:: @ 816EB0F - map_script 2, IndigoPlateau_PokemonCenter_2F_MapScript1_1BB2A3 - map_script 4, IndigoPlateau_PokemonCenter_2F_MapScript2_1BB1ED - map_script 1, IndigoPlateau_PokemonCenter_2F_MapScript3_1BB237 - map_script 3, IndigoPlateau_PokemonCenter_2F_MapScript4_1BB1B4 - .byte 0 + map_script 2, IndigoPlateau_PokemonCenter_2F_MapScript1_1BB2A3 + map_script 4, IndigoPlateau_PokemonCenter_2F_MapScript2_1BB1ED + map_script 1, IndigoPlateau_PokemonCenter_2F_MapScript3_1BB237 + map_script 3, IndigoPlateau_PokemonCenter_2F_MapScript4_1BB1B4 + .byte 0 IndigoPlateau_PokemonCenter_2F_EventScript_16EB24:: @ 816EB24 - call EventScript_1BB4A3 - end + call EventScript_1BB4A3 + end EventScript_16EB2A:: @ 816EB2A - call EventScript_1BB6AB - end + call EventScript_1BB6AB + end EventScript_16EB30:: @ 816EB30 - call EventScript_1BB7DE - end + call EventScript_1BB7DE + end diff --git a/data/maps/LavenderTown/scripts.inc b/data/maps/LavenderTown/scripts.inc index 1f1c178e5..ca396d10d 100644 --- a/data/maps/LavenderTown/scripts.inc +++ b/data/maps/LavenderTown/scripts.inc @@ -3,7 +3,7 @@ LavenderTown_MapScripts:: @ 816686B .byte 0 LavenderTown_MapScript1_166871:: @ 8166871 - setworldmapflag 2196 + setworldmapflag FLAG_WORLD_MAP_LAVENDER_TOWN setvar VAR_0x405B, 1 setflag FLAG_0x03D end diff --git a/data/maps/LavenderTown_House1/scripts.inc b/data/maps/LavenderTown_House1/scripts.inc index d29217628..7e415b380 100644 --- a/data/maps/LavenderTown_House1/scripts.inc +++ b/data/maps/LavenderTown_House1/scripts.inc @@ -1,29 +1,29 @@ LavenderTown_House1_MapScripts:: @ 816B232 - .byte 0 + .byte 0 LavenderTown_House1_EventScript_16B233:: @ 816B233 - lock - faceplayer - checkflag FLAG_0x23C - goto_if 1, EventScript_16B248 - loadword 0, gUnknown_819397D - callstd 4 - release - end + lock + faceplayer + checkflag FLAG_0x23C + goto_if 1, EventScript_16B248 + loadword 0, gUnknown_819397D + callstd 4 + release + end EventScript_16B248:: @ 816B248 - loadword 0, gUnknown_81939F8 - callstd 4 - release - end + loadword 0, gUnknown_81939F8 + callstd 4 + release + end LavenderTown_House1_EventScript_16B252:: @ 816B252 - lock - faceplayer - waitse - playmoncry SPECIES_CUBONE, 0 - loadword 0, gUnknown_819396B - callstd 4 - waitmoncry - release - end + lock + faceplayer + waitse + playmoncry SPECIES_CUBONE, 0 + loadword 0, gUnknown_819396B + callstd 4 + waitmoncry + release + end diff --git a/data/maps/LavenderTown_House2/scripts.inc b/data/maps/LavenderTown_House2/scripts.inc index a48d89db0..05198eccc 100644 --- a/data/maps/LavenderTown_House2/scripts.inc +++ b/data/maps/LavenderTown_House2/scripts.inc @@ -1,81 +1,81 @@ LavenderTown_House2_MapScripts:: @ 816B265 - .byte 0 + .byte 0 LavenderTown_House2_EventScript_16B266:: @ 816B266 - lock - faceplayer - loadword 0, gUnknown_8193A4B - callstd 5 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16B287 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16B2AA - end + lock + faceplayer + loadword 0, gUnknown_8193A4B + callstd 5 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16B287 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16B2AA + end EventScript_16B287:: @ 816B287 - loadword 0, gUnknown_8193AA6 - callstd 4 - special sub_80BF8FC - waitstate - compare_var_to_value VAR_0x8004, 6 - goto_if 0, EventScript_16B2B4 - compare_var_to_value VAR_0x8004, 6 - goto_if 4, EventScript_16B2AA - end + loadword 0, gUnknown_8193AA6 + callstd 4 + special sub_80BF8FC + waitstate + compare_var_to_value VAR_0x8004, 6 + goto_if 0, EventScript_16B2B4 + compare_var_to_value VAR_0x8004, 6 + goto_if 4, EventScript_16B2AA + end EventScript_16B2AA:: @ 816B2AA - loadword 0, gUnknown_8193BD4 - callstd 4 - release - end + loadword 0, gUnknown_8193BD4 + callstd 4 + release + end EventScript_16B2B4:: @ 816B2B4 - specialvar VAR_RESULT, sub_80CAD54 - compare_var_to_value VAR_RESULT, 412 - goto_if 1, EventScript_16B307 - special TV_CopyNicknameToStringVar1AndEnsureTerminated - special TV_CheckMonOTIDEqualsPlayerID - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16B311 - specialvar VAR_RESULT, sub_80CAD7C - special TV_CopyNicknameToStringVar1AndEnsureTerminated - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16B311 - loadword 0, gUnknown_8193AD2 - callstd 5 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16B31B - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16B2AA - end + specialvar VAR_RESULT, sub_80CAD54 + compare_var_to_value VAR_RESULT, 412 + goto_if 1, EventScript_16B307 + special TV_CopyNicknameToStringVar1AndEnsureTerminated + special TV_CheckMonOTIDEqualsPlayerID + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16B311 + specialvar VAR_RESULT, sub_80CAD7C + special TV_CopyNicknameToStringVar1AndEnsureTerminated + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16B311 + loadword 0, gUnknown_8193AD2 + callstd 5 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16B31B + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16B2AA + end EventScript_16B307:: @ 816B307 - loadword 0, gUnknown_8193CC4 - callstd 4 - release - end + loadword 0, gUnknown_8193CC4 + callstd 4 + release + end EventScript_16B311:: @ 816B311 - loadword 0, gUnknown_8193C82 - callstd 4 - release - end + loadword 0, gUnknown_8193C82 + callstd 4 + release + end EventScript_16B31B:: @ 816B31B - loadword 0, gUnknown_8193B36 - callstd 4 - call EventScript_1A74EB - specialvar VAR_RESULT, sub_80CBFA0 - special TV_CopyNicknameToStringVar1AndEnsureTerminated - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16B345 - loadword 0, gUnknown_8193BF0 - callstd 4 - release - end + loadword 0, gUnknown_8193B36 + callstd 4 + call EventScript_1A74EB + specialvar VAR_RESULT, sub_80CBFA0 + special TV_CopyNicknameToStringVar1AndEnsureTerminated + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16B345 + loadword 0, gUnknown_8193BF0 + callstd 4 + release + end EventScript_16B345:: @ 816B345 - loadword 0, gUnknown_8193B66 - callstd 4 - release - end + loadword 0, gUnknown_8193B66 + callstd 4 + release + end diff --git a/data/maps/LavenderTown_Mart/scripts.inc b/data/maps/LavenderTown_Mart/scripts.inc index 217c3a883..4ac7d68de 100644 --- a/data/maps/LavenderTown_Mart/scripts.inc +++ b/data/maps/LavenderTown_Mart/scripts.inc @@ -1,46 +1,46 @@ LavenderTown_Mart_MapScripts:: @ 816B34F - .byte 0 + .byte 0 LavenderTown_Mart_EventScript_16B350:: @ 816B350 - loadword 0, gUnknown_8193CE5 - callstd 2 - end + loadword 0, gUnknown_8193CE5 + callstd 2 + end LavenderTown_Mart_EventScript_16B359:: @ 816B359 - loadword 0, gUnknown_8193DB6 - callstd 2 - end + loadword 0, gUnknown_8193DB6 + callstd 2 + end LavenderTown_Mart_EventScript_16B362:: @ 816B362 - loadword 0, gUnknown_8193DF1 - callstd 2 - end + loadword 0, gUnknown_8193DF1 + callstd 2 + end LavenderTown_Mart_EventScript_16B36B:: @ 816B36B - special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 - lock - faceplayer - message Text_1A6211 - waitmessage - pokemart Items_16B390 - loadword 0, gUnknown_81A5190 - callstd 4 - release - end + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + lock + faceplayer + message Text_1A6211 + waitmessage + pokemart Items_16B390 + loadword 0, gUnknown_81A5190 + callstd 4 + release + end - .align 2 + .align 2 Items_16B390:: @ 816B390 - .2byte ITEM_GREAT_BALL - .2byte ITEM_SUPER_POTION - .2byte ITEM_REVIVE - .2byte ITEM_ANTIDOTE - .2byte ITEM_PARALYZE_HEAL - .2byte ITEM_BURN_HEAL - .2byte ITEM_ICE_HEAL - .2byte ITEM_ESCAPE_ROPE - .2byte ITEM_SUPER_REPEL - .2byte ITEM_NONE - release - end + .2byte ITEM_GREAT_BALL + .2byte ITEM_SUPER_POTION + .2byte ITEM_REVIVE + .2byte ITEM_ANTIDOTE + .2byte ITEM_PARALYZE_HEAL + .2byte ITEM_BURN_HEAL + .2byte ITEM_ICE_HEAL + .2byte ITEM_ESCAPE_ROPE + .2byte ITEM_SUPER_REPEL + .2byte ITEM_NONE + release + end diff --git a/data/maps/LavenderTown_PokemonCenter_1F/scripts.inc b/data/maps/LavenderTown_PokemonCenter_1F/scripts.inc index db03c1f85..a9795f7a2 100644 --- a/data/maps/LavenderTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/LavenderTown_PokemonCenter_1F/scripts.inc @@ -1,30 +1,30 @@ LavenderTown_PokemonCenter_1F_MapScripts:: @ 816B0EF - map_script 3, LavenderTown_PokemonCenter_1F_MapScript1_16B0FA - map_script 5, LavenderTown_PokemonCenter_1F_MapScript2_1BC05C - .byte 0 + map_script 3, LavenderTown_PokemonCenter_1F_MapScript1_16B0FA + map_script 5, LavenderTown_PokemonCenter_1F_MapScript2_1BC05C + .byte 0 LavenderTown_PokemonCenter_1F_MapScript1_16B0FA:: @ 816B0FA - setrespawn 5 - end + setrespawn 5 + end LavenderTown_PokemonCenter_1F_EventScript_16B0FE:: @ 816B0FE - lock - faceplayer - call EventScript_1A6578 - release - end + lock + faceplayer + call EventScript_1A6578 + release + end LavenderTown_PokemonCenter_1F_EventScript_16B107:: @ 816B107 - loadword 0, gUnknown_8193465 - callstd 2 - end + loadword 0, gUnknown_8193465 + callstd 2 + end LavenderTown_PokemonCenter_1F_EventScript_16B110:: @ 816B110 - loadword 0, gUnknown_81934DE - callstd 2 - end + loadword 0, gUnknown_81934DE + callstd 2 + end LavenderTown_PokemonCenter_1F_EventScript_16B119:: @ 816B119 - loadword 0, gUnknown_819353A - callstd 2 - end + loadword 0, gUnknown_819353A + callstd 2 + end diff --git a/data/maps/LavenderTown_PokemonCenter_2F/scripts.inc b/data/maps/LavenderTown_PokemonCenter_2F/scripts.inc index 16d54651b..7042c66c8 100644 --- a/data/maps/LavenderTown_PokemonCenter_2F/scripts.inc +++ b/data/maps/LavenderTown_PokemonCenter_2F/scripts.inc @@ -1,18 +1,18 @@ LavenderTown_PokemonCenter_2F_MapScripts:: @ 816B122 - map_script 2, LavenderTown_PokemonCenter_2F_MapScript1_1BB2A3 - map_script 4, LavenderTown_PokemonCenter_2F_MapScript2_1BB1ED - map_script 1, LavenderTown_PokemonCenter_2F_MapScript3_1BB237 - map_script 3, LavenderTown_PokemonCenter_2F_MapScript4_1BB1B4 - .byte 0 + map_script 2, LavenderTown_PokemonCenter_2F_MapScript1_1BB2A3 + map_script 4, LavenderTown_PokemonCenter_2F_MapScript2_1BB1ED + map_script 1, LavenderTown_PokemonCenter_2F_MapScript3_1BB237 + map_script 3, LavenderTown_PokemonCenter_2F_MapScript4_1BB1B4 + .byte 0 LavenderTown_PokemonCenter_2F_EventScript_16B137:: @ 816B137 - call EventScript_1BB4A3 - end + call EventScript_1BB4A3 + end EventScript_16B13D:: @ 816B13D - call EventScript_1BB6AB - end + call EventScript_1BB6AB + end EventScript_16B143:: @ 816B143 - call EventScript_1BB7DE - end + call EventScript_1BB7DE + end diff --git a/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc b/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc index 4671f0bfe..d8ade4c2a 100644 --- a/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc +++ b/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc @@ -1,105 +1,105 @@ LavenderTown_VolunteerPokemonHouse_MapScripts:: @ 816B149 - .byte 0 + .byte 0 LavenderTown_VolunteerPokemonHouse_EventScript_16B14A:: @ 816B14A - lock - faceplayer - checkflag FLAG_0x23D - goto_if 1, EventScript_16B196 - loadword 0, gUnknown_81936FF - callstd 4 - checkitemspace ITEM_POKE_FLUTE, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16B1A0 - setflag FLAG_0x23D - additem ITEM_POKE_FLUTE, 1 - loadword 0, gUnknown_81937BD - setorcopyvar VAR_0x8000, 350 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 318 - callstd 9 - loadword 0, gUnknown_81937E5 - callstd 4 - release - end + lock + faceplayer + checkflag FLAG_0x23D + goto_if 1, EventScript_16B196 + loadword 0, gUnknown_81936FF + callstd 4 + checkitemspace ITEM_POKE_FLUTE, 1 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16B1A0 + setflag FLAG_0x23D + additem ITEM_POKE_FLUTE, 1 + loadword 0, gUnknown_81937BD + setorcopyvar VAR_0x8000, 350 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 318 + callstd 9 + loadword 0, gUnknown_81937E5 + callstd 4 + release + end EventScript_16B196:: @ 816B196 - loadword 0, gUnknown_8193878 - callstd 4 - release - end + loadword 0, gUnknown_8193878 + callstd 4 + release + end EventScript_16B1A0:: @ 816B1A0 - loadword 0, gUnknown_819385B - callstd 4 - release - end + loadword 0, gUnknown_819385B + callstd 4 + release + end LavenderTown_VolunteerPokemonHouse_EventScript_16B1AA:: @ 816B1AA - lock - faceplayer - setvar VAR_0x8004, 14 - setvar VAR_0x8005, 0 - special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_8193652 - callstd 4 - release - end + lock + faceplayer + setvar VAR_0x8004, 14 + setvar VAR_0x8005, 0 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_8193652 + callstd 4 + release + end LavenderTown_VolunteerPokemonHouse_EventScript_16B1C3:: @ 816B1C3 - loadword 0, gUnknown_81936B4 - callstd 2 - end + loadword 0, gUnknown_81936B4 + callstd 2 + end LavenderTown_VolunteerPokemonHouse_EventScript_16B1CC:: @ 816B1CC - lock - faceplayer - checkflag FLAG_0x23C - goto_if 1, EventScript_16B1E1 - loadword 0, gUnknown_81935ED - callstd 4 - release - end + lock + faceplayer + checkflag FLAG_0x23C + goto_if 1, EventScript_16B1E1 + loadword 0, gUnknown_81935ED + callstd 4 + release + end EventScript_16B1E1:: @ 816B1E1 - loadword 0, gUnknown_819361D - callstd 4 - release - end + loadword 0, gUnknown_819361D + callstd 4 + release + end LavenderTown_VolunteerPokemonHouse_EventScript_16B1EB:: @ 816B1EB - lock - faceplayer - waitse - playmoncry SPECIES_NIDORINO, 0 - loadword 0, gUnknown_81936DE - callstd 4 - waitmoncry - release - end + lock + faceplayer + waitse + playmoncry SPECIES_NIDORINO, 0 + loadword 0, gUnknown_81936DE + callstd 4 + waitmoncry + release + end LavenderTown_VolunteerPokemonHouse_EventScript_16B1FE:: @ 816B1FE - lock - faceplayer - waitse - playmoncry SPECIES_PSYDUCK, 0 - loadword 0, gUnknown_81936EE - callstd 4 - waitmoncry - release - end + lock + faceplayer + waitse + playmoncry SPECIES_PSYDUCK, 0 + loadword 0, gUnknown_81936EE + callstd 4 + waitmoncry + release + end LavenderTown_VolunteerPokemonHouse_EventScript_16B211:: @ 816B211 - lockall - setvar VAR_0x8004, 14 - setvar VAR_0x8005, 2 - special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_81938A0 - callstd 4 - releaseall - end + lockall + setvar VAR_0x8004, 14 + setvar VAR_0x8005, 2 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_81938A0 + callstd 4 + releaseall + end LavenderTown_VolunteerPokemonHouse_EventScript_16B229:: @ 816B229 - loadword 0, gUnknown_819392B - callstd 3 - end + loadword 0, gUnknown_819392B + callstd 3 + end diff --git a/data/maps/MtEmber_Exterior/scripts.inc b/data/maps/MtEmber_Exterior/scripts.inc index 4ddae76ad..d6c93ae72 100644 --- a/data/maps/MtEmber_Exterior/scripts.inc +++ b/data/maps/MtEmber_Exterior/scripts.inc @@ -1,146 +1,146 @@ MtEmber_Exterior_MapScripts:: @ 8163946 - map_script 3, MtEmber_Exterior_MapScript1_163951 - map_script 1, MtEmber_Exterior_MapScript2_163969 - .byte 0 + map_script 3, MtEmber_Exterior_MapScript1_163951 + map_script 1, MtEmber_Exterior_MapScript2_163969 + .byte 0 MtEmber_Exterior_MapScript1_163951:: @ 8163951 - setworldmapflag 2230 - compare_var_to_value VAR_0x407F, 2 - call_if 1, EventScript_163960 - end + setworldmapflag 2230 + compare_var_to_value VAR_0x407F, 2 + call_if 1, EventScript_163960 + end EventScript_163960:: @ 8163960 - setobjectmovementtype 2, 8 - setobjectmovementtype 3, 8 - return + setobjectmovementtype 2, 8 + setobjectmovementtype 3, 8 + return MtEmber_Exterior_MapScript2_163969:: @ 8163969 - compare_var_to_value VAR_0x4076, 4 - call_if 4, EventScript_163975 - end + compare_var_to_value VAR_0x4076, 4 + call_if 4, EventScript_163975 + end EventScript_163975:: @ 8163975 - setmetatile 42, 39, 838, 0 - return + setmetatile 42, 39, 838, 0 + return MtEmber_Exterior_EventScript_16397F:: @ 816397F - lock - checktrainerflag 537 - goto_if 1, EventScript_16399E - compare_var_to_value VAR_0x4076, 4 - goto_if 1, EventScript_1639A8 - loadword 0, gUnknown_817A82A - callstd 4 - release - end + lock + checktrainerflag 537 + goto_if 1, EventScript_16399E + compare_var_to_value VAR_0x4076, 4 + goto_if 1, EventScript_1639A8 + loadword 0, gUnknown_817A82A + callstd 4 + release + end EventScript_16399E:: @ 816399E - loadword 0, gUnknown_817AA3F - callstd 4 - release - end + loadword 0, gUnknown_817AA3F + callstd 4 + release + end EventScript_1639A8:: @ 81639A8 - applymovement 2, Movement_1A75E1 - waitmovement 0 - playbgm BGM_FRLG_SUSPICIOUS_EYE, 0 - loadword 0, gUnknown_817AA06 - callstd 4 - trainerbattle 3, 537, 0, Text_17AA34 - loadword 0, gUnknown_817AA3F - callstd 4 - checktrainerflag 538 - goto_if 1, EventScript_1639DB - release - end + applymovement 2, Movement_1A75E1 + waitmovement 0 + playbgm BGM_FRLG_SUSPICIOUS_EYE, 0 + loadword 0, gUnknown_817AA06 + callstd 4 + trainerbattle 3, 537, 0, Text_17AA34 + loadword 0, gUnknown_817AA3F + callstd 4 + checktrainerflag 538 + goto_if 1, EventScript_1639DB + release + end EventScript_1639DB:: @ 81639DB - loadword 0, gUnknown_817AAD7 - callstd 4 - closemessage - fadescreen 1 - removeobject 2 - removeobject 3 - fadescreen 0 - release - end + loadword 0, gUnknown_817AAD7 + callstd 4 + closemessage + fadescreen 1 + removeobject 2 + removeobject 3 + fadescreen 0 + release + end MtEmber_Exterior_EventScript_1639F0:: @ 81639F0 - lock - faceplayer - checktrainerflag 538 - goto_if 1, EventScript_163A1B - compare_var_to_value VAR_0x4076, 4 - goto_if 1, EventScript_163A25 - loadword 0, gUnknown_817A88C - callstd 4 - closemessage - applymovement 3, Movement_1A75E5 - waitmovement 0 - release - end + lock + faceplayer + checktrainerflag 538 + goto_if 1, EventScript_163A1B + compare_var_to_value VAR_0x4076, 4 + goto_if 1, EventScript_163A25 + loadword 0, gUnknown_817A88C + callstd 4 + closemessage + applymovement 3, Movement_1A75E5 + waitmovement 0 + release + end EventScript_163A1B:: @ 8163A1B - loadword 0, gUnknown_817AA99 - callstd 4 - release - end + loadword 0, gUnknown_817AA99 + callstd 4 + release + end EventScript_163A25:: @ 8163A25 - playbgm BGM_FRLG_SUSPICIOUS_EYE, 0 - loadword 0, gUnknown_817AA56 - callstd 4 - trainerbattle 3, 538, 0, Text_17AA8A - loadword 0, gUnknown_817AA99 - callstd 4 - checktrainerflag 537 - goto_if 1, EventScript_1639DB - release - end + playbgm BGM_FRLG_SUSPICIOUS_EYE, 0 + loadword 0, gUnknown_817AA56 + callstd 4 + trainerbattle 3, 538, 0, Text_17AA8A + loadword 0, gUnknown_817AA99 + callstd 4 + checktrainerflag 537 + goto_if 1, EventScript_1639DB + release + end MtEmber_Exterior_EventScript_163A4E:: @ 8163A4E - lockall - textcolor 0 - loadword 0, gUnknown_817A8B4 - callstd 4 - message Text_17A8EE - waitmessage - playse SE_PIN - applymovement 3, Movement_1A75D9 - waitmovement 0 - waitbuttonpress - loadword 0, gUnknown_817A970 - callstd 4 - applymovement 2, Movement_1A75ED - waitmovement 0 - playse SE_PIN - applymovement 2, Movement_1A75DB - waitmovement 0 - applymovement 2, Movement_1A75DD - waitmovement 0 - applymovement 3, Movement_1A75ED - waitmovement 0 - call EventScript_163960 - loadword 0, gUnknown_817A9E1 - callstd 4 - setvar VAR_0x407F, 2 - releaseall - end + lockall + textcolor 0 + loadword 0, gUnknown_817A8B4 + callstd 4 + message Text_17A8EE + waitmessage + playse SE_PIN + applymovement 3, Movement_1A75D9 + waitmovement 0 + waitbuttonpress + loadword 0, gUnknown_817A970 + callstd 4 + applymovement 2, Movement_1A75ED + waitmovement 0 + playse SE_PIN + applymovement 2, Movement_1A75DB + waitmovement 0 + applymovement 2, Movement_1A75DD + waitmovement 0 + applymovement 3, Movement_1A75ED + waitmovement 0 + call EventScript_163960 + loadword 0, gUnknown_817A9E1 + callstd 4 + setvar VAR_0x407F, 2 + releaseall + end MtEmber_Exterior_EventScript_163AB4:: @ 8163AB4 - trainerbattle 0, 595, 0, Text_17AB73, Text_17ABAA - loadword 0, gUnknown_817ABD8 - callstd 6 - end + trainerbattle 0, 595, 0, Text_17AB73, Text_17ABAA + loadword 0, gUnknown_817ABD8 + callstd 6 + end MtEmber_Exterior_EventScript_163ACB:: @ 8163ACB - trainerbattle 0, 597, 0, Text_17AC55, Text_17AC82 - loadword 0, gUnknown_817ACA2 - callstd 6 - end + trainerbattle 0, 597, 0, Text_17AC55, Text_17AC82 + loadword 0, gUnknown_817ACA2 + callstd 6 + end MtEmber_Exterior_EventScript_163AE2:: @ 8163AE2 - trainerbattle 0, 592, 0, Text_17AD06, Text_17AD6B - loadword 0, gUnknown_817AD89 - callstd 6 - end + trainerbattle 0, 592, 0, Text_17AD06, Text_17AD6B + loadword 0, gUnknown_817AD89 + callstd 6 + end diff --git a/data/maps/MtEmber_RubyPath_1F/scripts.inc b/data/maps/MtEmber_RubyPath_1F/scripts.inc index 27cd09df7..46d4be447 100644 --- a/data/maps/MtEmber_RubyPath_1F/scripts.inc +++ b/data/maps/MtEmber_RubyPath_1F/scripts.inc @@ -1,2 +1,2 @@ MtEmber_RubyPath_1F_MapScripts:: @ 8163C45 - .byte 0 + .byte 0 diff --git a/data/maps/MtEmber_RubyPath_B1F/scripts.inc b/data/maps/MtEmber_RubyPath_B1F/scripts.inc index f0b3378d4..6a5f9cefb 100644 --- a/data/maps/MtEmber_RubyPath_B1F/scripts.inc +++ b/data/maps/MtEmber_RubyPath_B1F/scripts.inc @@ -1,2 +1,2 @@ MtEmber_RubyPath_B1F_MapScripts:: @ 8163C46 - .byte 0 + .byte 0 diff --git a/data/maps/MtEmber_RubyPath_B1F_Stairs/scripts.inc b/data/maps/MtEmber_RubyPath_B1F_Stairs/scripts.inc index 39df5df91..204b555a1 100644 --- a/data/maps/MtEmber_RubyPath_B1F_Stairs/scripts.inc +++ b/data/maps/MtEmber_RubyPath_B1F_Stairs/scripts.inc @@ -1,2 +1,2 @@ MtEmber_RubyPath_B1F_Stairs_MapScripts:: @ 8163C6F - .byte 0 + .byte 0 diff --git a/data/maps/MtEmber_RubyPath_B2F/scripts.inc b/data/maps/MtEmber_RubyPath_B2F/scripts.inc index 8fec3c4d7..dc4d85ab6 100644 --- a/data/maps/MtEmber_RubyPath_B2F/scripts.inc +++ b/data/maps/MtEmber_RubyPath_B2F/scripts.inc @@ -1,2 +1,2 @@ MtEmber_RubyPath_B2F_MapScripts:: @ 8163C47 - .byte 0 + .byte 0 diff --git a/data/maps/MtEmber_RubyPath_B2F_Stairs/scripts.inc b/data/maps/MtEmber_RubyPath_B2F_Stairs/scripts.inc index 50c8f8334..3646547b1 100644 --- a/data/maps/MtEmber_RubyPath_B2F_Stairs/scripts.inc +++ b/data/maps/MtEmber_RubyPath_B2F_Stairs/scripts.inc @@ -1,2 +1,2 @@ MtEmber_RubyPath_B2F_Stairs_MapScripts:: @ 8163C70 - .byte 0 + .byte 0 diff --git a/data/maps/MtEmber_RubyPath_B3F/scripts.inc b/data/maps/MtEmber_RubyPath_B3F/scripts.inc index 52191ba85..520b3ba31 100644 --- a/data/maps/MtEmber_RubyPath_B3F/scripts.inc +++ b/data/maps/MtEmber_RubyPath_B3F/scripts.inc @@ -1,17 +1,17 @@ MtEmber_RubyPath_B3F_MapScripts:: @ 8163C48 - .byte 0 + .byte 0 MtEmber_RubyPath_B3F_EventScript_163C49:: @ 8163C49 MtEmber_RubyPath_B5F_EventScript_163C49:: @ 8163C49 - lock - faceplayer - setflag FLAG_0x2DD - removeobject 1 - additem ITEM_RUBY, 1 - loadword 0, gUnknown_817ADC5 - setorcopyvar VAR_0x8000, 373 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 318 - callstd 9 - release - end + lock + faceplayer + setflag FLAG_0x2DD + removeobject 1 + additem ITEM_RUBY, 1 + loadword 0, gUnknown_817ADC5 + setorcopyvar VAR_0x8000, 373 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 318 + callstd 9 + release + end diff --git a/data/maps/MtEmber_RubyPath_B4F/scripts.inc b/data/maps/MtEmber_RubyPath_B4F/scripts.inc index 537aa71fe..18249a49a 100644 --- a/data/maps/MtEmber_RubyPath_B4F/scripts.inc +++ b/data/maps/MtEmber_RubyPath_B4F/scripts.inc @@ -1,72 +1,72 @@ MtEmber_RubyPath_B4F_MapScripts:: @ 81638EB - .byte 0 + .byte 0 MtEmber_RubyPath_B4F_EventScript_1638EC:: @ 81638EC - lockall - braillemessage gUnknown_81A929F - waitbuttonpress - releaseall - end + lockall + braillemessage gUnknown_81A929F + waitbuttonpress + releaseall + end MtEmber_RubyPath_B4F_EventScript_1638F5:: @ 81638F5 - lockall - braillemessage gUnknown_81A92A3 - waitbuttonpress - releaseall - end + lockall + braillemessage gUnknown_81A92A3 + waitbuttonpress + releaseall + end MtEmber_RubyPath_B4F_EventScript_1638FE:: @ 81638FE - lockall - braillemessage gUnknown_81A92A7 - waitbuttonpress - releaseall - end + lockall + braillemessage gUnknown_81A92A7 + waitbuttonpress + releaseall + end MtEmber_RubyPath_B4F_EventScript_163907:: @ 8163907 - lockall - braillemessage gUnknown_81A92AB - waitbuttonpress - releaseall - end + lockall + braillemessage gUnknown_81A92AB + waitbuttonpress + releaseall + end MtEmber_RubyPath_B4F_EventScript_163910:: @ 8163910 - lockall - braillemessage gUnknown_81A92AF - waitbuttonpress - releaseall - end + lockall + braillemessage gUnknown_81A92AF + waitbuttonpress + releaseall + end MtEmber_RubyPath_B4F_EventScript_163919:: @ 8163919 - lockall - braillemessage gUnknown_81A92B3 - waitbuttonpress - releaseall - end + lockall + braillemessage gUnknown_81A92B3 + waitbuttonpress + releaseall + end MtEmber_RubyPath_B4F_EventScript_163922:: @ 8163922 - lockall - braillemessage gUnknown_81A92B7 - waitbuttonpress - releaseall - end + lockall + braillemessage gUnknown_81A92B7 + waitbuttonpress + releaseall + end MtEmber_RubyPath_B4F_EventScript_16392B:: @ 816392B - lockall - braillemessage gUnknown_81A92BC - waitbuttonpress - releaseall - end + lockall + braillemessage gUnknown_81A92BC + waitbuttonpress + releaseall + end MtEmber_RubyPath_B4F_EventScript_163934:: @ 8163934 - lockall - braillemessage gUnknown_81A92C1 - waitbuttonpress - releaseall - end + lockall + braillemessage gUnknown_81A92C1 + waitbuttonpress + releaseall + end MtEmber_RubyPath_B4F_EventScript_16393D:: @ 816393D - lockall - braillemessage gUnknown_81A92C3 - waitbuttonpress - releaseall - end + lockall + braillemessage gUnknown_81A92C3 + waitbuttonpress + releaseall + end diff --git a/data/maps/MtEmber_RubyPath_B5F/scripts.inc b/data/maps/MtEmber_RubyPath_B5F/scripts.inc index 91b69cf5b..c3d8b7320 100644 --- a/data/maps/MtEmber_RubyPath_B5F/scripts.inc +++ b/data/maps/MtEmber_RubyPath_B5F/scripts.inc @@ -1,38 +1,38 @@ MtEmber_RubyPath_B5F_MapScripts:: @ 8163BAA - .byte 0 + .byte 0 MtEmber_RubyPath_B5F_EventScript_163BAB:: @ 8163BAB - lockall - setvar VAR_0x8005, 130 - setvar VAR_0x8006, 0 - braillemessage gUnknown_81A92C5 - getbraillestringwidth gUnknown_81A92C5 - call EventScript_1A926C - setvar VAR_0x8006, 0 - braillemessage gUnknown_81A92D0 - getbraillestringwidth gUnknown_81A92D0 - call EventScript_1A926C - setvar VAR_0x8006, 0 - braillemessage gUnknown_81A92DC - getbraillestringwidth gUnknown_81A92DC - call EventScript_1A926C - setvar VAR_0x8006, 0 - braillemessage gUnknown_81A92E6 - getbraillestringwidth gUnknown_81A92E6 - call EventScript_1A926C - setvar VAR_0x8006, 0 - braillemessage gUnknown_81A92F2 - getbraillestringwidth gUnknown_81A92F2 - call EventScript_1A926C - setvar VAR_0x8006, 0 - braillemessage gUnknown_81A92FE - getbraillestringwidth gUnknown_81A92FE - call EventScript_1A926C - setvar VAR_0x8006, 0 - braillemessage gUnknown_81A930A - getbraillestringwidth gUnknown_81A930A - call EventScript_1A926C - braillemessage gUnknown_81A9316 - waitbuttonpress - releaseall - end + lockall + setvar VAR_0x8005, 130 + setvar VAR_0x8006, 0 + braillemessage gUnknown_81A92C5 + getbraillestringwidth gUnknown_81A92C5 + call EventScript_1A926C + setvar VAR_0x8006, 0 + braillemessage gUnknown_81A92D0 + getbraillestringwidth gUnknown_81A92D0 + call EventScript_1A926C + setvar VAR_0x8006, 0 + braillemessage gUnknown_81A92DC + getbraillestringwidth gUnknown_81A92DC + call EventScript_1A926C + setvar VAR_0x8006, 0 + braillemessage gUnknown_81A92E6 + getbraillestringwidth gUnknown_81A92E6 + call EventScript_1A926C + setvar VAR_0x8006, 0 + braillemessage gUnknown_81A92F2 + getbraillestringwidth gUnknown_81A92F2 + call EventScript_1A926C + setvar VAR_0x8006, 0 + braillemessage gUnknown_81A92FE + getbraillestringwidth gUnknown_81A92FE + call EventScript_1A926C + setvar VAR_0x8006, 0 + braillemessage gUnknown_81A930A + getbraillestringwidth gUnknown_81A930A + call EventScript_1A926C + braillemessage gUnknown_81A9316 + waitbuttonpress + releaseall + end diff --git a/data/maps/MtEmber_Summit/scripts.inc b/data/maps/MtEmber_Summit/scripts.inc index 85f60fd1d..4b78fd317 100644 --- a/data/maps/MtEmber_Summit/scripts.inc +++ b/data/maps/MtEmber_Summit/scripts.inc @@ -1,66 +1,66 @@ MtEmber_Summit_MapScripts:: @ 8163AFC - map_script 3, MtEmber_Summit_MapScript1_163B25 - map_script 5, MtEmber_Summit_MapScript2_163B07 - .byte 0 + map_script 3, MtEmber_Summit_MapScript1_163B25 + map_script 5, MtEmber_Summit_MapScript2_163B07 + .byte 0 MtEmber_Summit_MapScript2_163B07:: @ 8163B07 - checkflag 2055 - call_if 1, EventScript_163B11 - end + checkflag 2055 + call_if 1, EventScript_163B11 + end EventScript_163B11:: @ 8163B11 - specialvar VAR_RESULT, sub_80CA74C - compare_var_to_value VAR_RESULT, 7 - goto_if 5, EventScript_1A77A9 - removeobject VAR_LAST_TALKED - return + specialvar VAR_RESULT, sub_80CA74C + compare_var_to_value VAR_RESULT, 7 + goto_if 5, EventScript_1A77A9 + removeobject VAR_LAST_TALKED + return MtEmber_Summit_MapScript1_163B25:: @ 8163B25 - checkflag FLAG_0x2BD - call_if 0, EventScript_163B2F - end + checkflag FLAG_0x2BD + call_if 0, EventScript_163B2F + end EventScript_163B2F:: @ 8163B2F - clearflag FLAG_0x052 - return + clearflag FLAG_0x052 + return MtEmber_Summit_EventScript_163B33:: @ 8163B33 - special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 - special sub_8112364 - lock - faceplayer - setwildbattle SPECIES_MOLTRES, 50, ITEM_NONE - waitse - playmoncry SPECIES_MOLTRES, 2 - message Text_1A6448 - waitmessage - waitmoncry - delay 10 - playbgm BGM_FRLG_LEADER_EYE, 0 - waitbuttonpress - setflag 2055 - special sub_807F9D8 - waitstate - clearflag 2055 - specialvar VAR_RESULT, sub_80CA74C - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_163B96 - compare_var_to_value VAR_RESULT, 4 - goto_if 1, EventScript_163B9F - compare_var_to_value VAR_RESULT, 5 - goto_if 1, EventScript_163B9F - setflag FLAG_0x2BD - release - end + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + special sub_8112364 + lock + faceplayer + setwildbattle SPECIES_MOLTRES, 50, ITEM_NONE + waitse + playmoncry SPECIES_MOLTRES, 2 + message Text_1A6448 + waitmessage + waitmoncry + delay 10 + playbgm BGM_FRLG_LEADER_EYE, 0 + waitbuttonpress + setflag 2055 + special sub_807F9D8 + waitstate + clearflag 2055 + specialvar VAR_RESULT, sub_80CA74C + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_163B96 + compare_var_to_value VAR_RESULT, 4 + goto_if 1, EventScript_163B9F + compare_var_to_value VAR_RESULT, 5 + goto_if 1, EventScript_163B9F + setflag FLAG_0x2BD + release + end EventScript_163B96:: @ 8163B96 - setflag FLAG_0x2BD - goto EventScript_1A922D - end + setflag FLAG_0x2BD + goto EventScript_1A922D + end EventScript_163B9F:: @ 8163B9F - setvar VAR_0x8004, 146 - goto EventScript_1A9236 - end + setvar VAR_0x8004, 146 + goto EventScript_1A9236 + end diff --git a/data/maps/MtEmber_SummitPath_1F/scripts.inc b/data/maps/MtEmber_SummitPath_1F/scripts.inc index 945430a19..22143d713 100644 --- a/data/maps/MtEmber_SummitPath_1F/scripts.inc +++ b/data/maps/MtEmber_SummitPath_1F/scripts.inc @@ -1,2 +1,2 @@ MtEmber_SummitPath_1F_MapScripts:: @ 8163AF9 - .byte 0 + .byte 0 diff --git a/data/maps/MtEmber_SummitPath_2F/scripts.inc b/data/maps/MtEmber_SummitPath_2F/scripts.inc index ca843116e..d8b43df39 100644 --- a/data/maps/MtEmber_SummitPath_2F/scripts.inc +++ b/data/maps/MtEmber_SummitPath_2F/scripts.inc @@ -1,2 +1,2 @@ MtEmber_SummitPath_2F_MapScripts:: @ 8163AFA - .byte 0 + .byte 0 diff --git a/data/maps/MtEmber_SummitPath_3F/scripts.inc b/data/maps/MtEmber_SummitPath_3F/scripts.inc index 5f44d2863..e576b321c 100644 --- a/data/maps/MtEmber_SummitPath_3F/scripts.inc +++ b/data/maps/MtEmber_SummitPath_3F/scripts.inc @@ -1,2 +1,2 @@ MtEmber_SummitPath_3F_MapScripts:: @ 8163AFB - .byte 0 + .byte 0 diff --git a/data/maps/MtMoon_1F/scripts.inc b/data/maps/MtMoon_1F/scripts.inc index 8303d88bf..1c6af7902 100644 --- a/data/maps/MtMoon_1F/scripts.inc +++ b/data/maps/MtMoon_1F/scripts.inc @@ -1,54 +1,54 @@ MtMoon_1F_MapScripts:: @ 81605E4 - map_script 3, MtMoon_1F_MapScript1_1605EA - .byte 0 + map_script 3, MtMoon_1F_MapScript1_1605EA + .byte 0 MtMoon_1F_MapScript1_1605EA:: @ 81605EA - setworldmapflag 2213 - end + setworldmapflag 2213 + end MtMoon_1F_EventScript_1605EE:: @ 81605EE - loadword 0, gUnknown_8172AE0 - callstd 3 - end + loadword 0, gUnknown_8172AE0 + callstd 3 + end MtMoon_1F_EventScript_1605F7:: @ 81605F7 - trainerbattle 0, 181, 0, Text_17279D, Text_1727CB - loadword 0, gUnknown_81727DF - callstd 6 - end + trainerbattle 0, 181, 0, Text_17279D, Text_1727CB + loadword 0, gUnknown_81727DF + callstd 6 + end MtMoon_1F_EventScript_16060E:: @ 816060E - trainerbattle 0, 91, 0, Text_17281D, Text_172844 - loadword 0, gUnknown_8172863 - callstd 6 - end + trainerbattle 0, 91, 0, Text_17281D, Text_172844 + loadword 0, gUnknown_8172863 + callstd 6 + end MtMoon_1F_EventScript_160625:: @ 8160625 - trainerbattle 0, 120, 0, Text_172896, Text_1728C3 - loadword 0, gUnknown_81728D2 - callstd 6 - end + trainerbattle 0, 120, 0, Text_172896, Text_1728C3 + loadword 0, gUnknown_81728D2 + callstd 6 + end MtMoon_1F_EventScript_16063C:: @ 816063C - trainerbattle 0, 121, 0, Text_172972, Text_1729A4 - loadword 0, gUnknown_81729AC - callstd 6 - end + trainerbattle 0, 121, 0, Text_172972, Text_1729A4 + loadword 0, gUnknown_81729AC + callstd 6 + end MtMoon_1F_EventScript_160653:: @ 8160653 - trainerbattle 0, 169, 0, Text_17290B, Text_172927 - loadword 0, gUnknown_817293C - callstd 6 - end + trainerbattle 0, 169, 0, Text_17290B, Text_172927 + loadword 0, gUnknown_817293C + callstd 6 + end MtMoon_1F_EventScript_16066A:: @ 816066A - trainerbattle 0, 108, 0, Text_1729EA, Text_172A1A - loadword 0, gUnknown_8172A26 - callstd 6 - end + trainerbattle 0, 108, 0, Text_1729EA, Text_172A1A + loadword 0, gUnknown_8172A26 + callstd 6 + end MtMoon_1F_EventScript_160681:: @ 8160681 - trainerbattle 0, 109, 0, Text_172A55, Text_172A8F - loadword 0, gUnknown_8172A97 - callstd 6 - end + trainerbattle 0, 109, 0, Text_172A55, Text_172A8F + loadword 0, gUnknown_8172A97 + callstd 6 + end diff --git a/data/maps/MtMoon_B1F/scripts.inc b/data/maps/MtMoon_B1F/scripts.inc index 17e91f4d0..ecc7676e0 100644 --- a/data/maps/MtMoon_B1F/scripts.inc +++ b/data/maps/MtMoon_B1F/scripts.inc @@ -1,2 +1,2 @@ MtMoon_B1F_MapScripts:: @ 8160698 - .byte 0 + .byte 0 diff --git a/data/maps/MtMoon_B2F/scripts.inc b/data/maps/MtMoon_B2F/scripts.inc index 14e47d472..399f12386 100644 --- a/data/maps/MtMoon_B2F/scripts.inc +++ b/data/maps/MtMoon_B2F/scripts.inc @@ -1,160 +1,160 @@ MtMoon_B2F_MapScripts:: @ 8160699 - map_script 3, MtMoon_B2F_MapScript1_16069F - .byte 0 + map_script 3, MtMoon_B2F_MapScript1_16069F + .byte 0 MtMoon_B2F_MapScript1_16069F:: @ 816069F - checkflag FLAG_0x232 - call_if 0, EventScript_1606A9 - end + checkflag FLAG_0x232 + call_if 0, EventScript_1606A9 + end EventScript_1606A9:: @ 81606A9 - clearflag FLAG_0x02F - clearflag FLAG_0x030 - return + clearflag FLAG_0x02F + clearflag FLAG_0x030 + return MtMoon_B2F_EventScript_1606B0:: @ 81606B0 - lockall - applymovement 3, Movement_1A75EB - waitmovement 0 - call EventScript_1606DD - releaseall - end + lockall + applymovement 3, Movement_1A75EB + waitmovement 0 + call EventScript_1606DD + releaseall + end MtMoon_B2F_EventScript_1606C2:: @ 81606C2 - lock - faceplayer - checkflag FLAG_0x232 - goto_if 1, EventScript_160707 - checktrainerflag 170 - goto_if 1, EventScript_160711 - call EventScript_1606DD - release - end + lock + faceplayer + checkflag FLAG_0x232 + goto_if 1, EventScript_160707 + checktrainerflag 170 + goto_if 1, EventScript_160711 + call EventScript_1606DD + release + end EventScript_1606DD:: @ 81606DD - textcolor 0 - message Text_172B64 - waitmessage - playbgm BGM_FRLG_LEADER_EYE, 0 - waitbuttonpress - setvar VAR_LAST_TALKED, 3 - trainerbattle 3, 170, 0, Text_172B99 - setvar VAR_0x408B, 1 - loadword 0, gUnknown_8172BAB - callstd 4 - return + textcolor 0 + message Text_172B64 + waitmessage + playbgm BGM_FRLG_LEADER_EYE, 0 + waitbuttonpress + setvar VAR_LAST_TALKED, 3 + trainerbattle 3, 170, 0, Text_172B99 + setvar VAR_0x408B, 1 + loadword 0, gUnknown_8172BAB + callstd 4 + return EventScript_160707:: @ 8160707 - loadword 0, gUnknown_8172BFB - callstd 4 - release - end + loadword 0, gUnknown_8172BFB + callstd 4 + release + end EventScript_160711:: @ 8160711 - loadword 0, gUnknown_8172BAB - callstd 4 - release - end + loadword 0, gUnknown_8172BAB + callstd 4 + release + end MtMoon_B2F_EventScript_16071B:: @ 816071B - lock - faceplayer - loadword 0, gUnknown_8172E77 - callstd 5 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1607DE - removeobject 1 - additem ITEM_DOME_FOSSIL, 1 - loadword 0, gUnknown_8172ECD - setorcopyvar VAR_0x8000, 358 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 318 - callstd 9 - closemessage - special sub_8112364 - delay 10 - applymovement 3, Movement_16077A - waitmovement 0 - moveobjectoffscreen 3 - textcolor 0 - playfanfare BGM_FRLG_ME_KEYITEM - message Text_172BD6 - waitmessage - waitfanfare - removeobject 2 - setflag FLAG_0x272 - setflag FLAG_0x232 - release - end + lock + faceplayer + loadword 0, gUnknown_8172E77 + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_1607DE + removeobject 1 + additem ITEM_DOME_FOSSIL, 1 + loadword 0, gUnknown_8172ECD + setorcopyvar VAR_0x8000, 358 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 318 + callstd 9 + closemessage + special sub_8112364 + delay 10 + applymovement 3, Movement_16077A + waitmovement 0 + moveobjectoffscreen 3 + textcolor 0 + playfanfare BGM_FRLG_ME_KEYITEM + message Text_172BD6 + waitmessage + waitfanfare + removeobject 2 + setflag FLAG_0x272 + setflag FLAG_0x232 + release + end Movement_16077A:: @ 816077A - step_13 - step_11 - step_11 - step_11 - step_end + step_13 + step_11 + step_11 + step_11 + step_end MtMoon_B2F_EventScript_16077F:: @ 816077F - lock - faceplayer - loadword 0, gUnknown_8172E94 - callstd 5 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1607DE - removeobject 2 - additem ITEM_HELIX_FOSSIL, 1 - loadword 0, gUnknown_8172EB2 - setorcopyvar VAR_0x8000, 357 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 318 - callstd 9 - closemessage - special sub_8112364 - delay 10 - applymovement 3, Movement_1607E0 - waitmovement 0 - moveobjectoffscreen 3 - textcolor 0 - playfanfare BGM_FRLG_ME_KEYITEM - message Text_172BD6 - waitmessage - waitfanfare - removeobject 1 - setflag FLAG_0x273 - setflag FLAG_0x232 - release - end + lock + faceplayer + loadword 0, gUnknown_8172E94 + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_1607DE + removeobject 2 + additem ITEM_HELIX_FOSSIL, 1 + loadword 0, gUnknown_8172EB2 + setorcopyvar VAR_0x8000, 357 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 318 + callstd 9 + closemessage + special sub_8112364 + delay 10 + applymovement 3, Movement_1607E0 + waitmovement 0 + moveobjectoffscreen 3 + textcolor 0 + playfanfare BGM_FRLG_ME_KEYITEM + message Text_172BD6 + waitmessage + waitfanfare + removeobject 1 + setflag FLAG_0x273 + setflag FLAG_0x232 + release + end EventScript_1607DE:: @ 81607DE - release - end + release + end Movement_1607E0:: @ 81607E0 - step_11 - step_11 - step_11 - step_end + step_11 + step_11 + step_11 + step_end MtMoon_B2F_EventScript_1607E4:: @ 81607E4 - trainerbattle 0, 351, 0, Text_172C5A, Text_172CB8 - loadword 0, gUnknown_8172CCB - callstd 6 - end + trainerbattle 0, 351, 0, Text_172C5A, Text_172CB8 + loadword 0, gUnknown_8172CCB + callstd 6 + end MtMoon_B2F_EventScript_1607FB:: @ 81607FB - trainerbattle 0, 352, 0, Text_172CFC, Text_172D46 - loadword 0, gUnknown_8172D51 - callstd 6 - end + trainerbattle 0, 352, 0, Text_172CFC, Text_172D46 + loadword 0, gUnknown_8172D51 + callstd 6 + end MtMoon_B2F_EventScript_160812:: @ 8160812 - trainerbattle 0, 353, 0, Text_172D82, Text_172DAF - loadword 0, gUnknown_8172DC1 - callstd 6 - end + trainerbattle 0, 353, 0, Text_172D82, Text_172DAF + loadword 0, gUnknown_8172DC1 + callstd 6 + end MtMoon_B2F_EventScript_160829:: @ 8160829 - trainerbattle 0, 354, 0, Text_172DF0, Text_172E3E - loadword 0, gUnknown_8172E4B - callstd 6 - end + trainerbattle 0, 354, 0, Text_172DF0, Text_172E3E + loadword 0, gUnknown_8172E4B + callstd 6 + end diff --git a/data/maps/NavelRock_1F/scripts.inc b/data/maps/NavelRock_1F/scripts.inc index 97852f3d4..2cf06ab2e 100644 --- a/data/maps/NavelRock_1F/scripts.inc +++ b/data/maps/NavelRock_1F/scripts.inc @@ -1,2 +1,2 @@ NavelRock_1F_MapScripts:: @ 8164F9E - .byte 0 + .byte 0 diff --git a/data/maps/NavelRock_B1F/scripts.inc b/data/maps/NavelRock_B1F/scripts.inc index d940f8d12..b25c20c1e 100644 --- a/data/maps/NavelRock_B1F/scripts.inc +++ b/data/maps/NavelRock_B1F/scripts.inc @@ -1,2 +1,2 @@ NavelRock_B1F_MapScripts:: @ 8165201 - .byte 0 + .byte 0 diff --git a/data/maps/NavelRock_Base/scripts.inc b/data/maps/NavelRock_Base/scripts.inc index cf31f50f2..fe051092b 100644 --- a/data/maps/NavelRock_Base/scripts.inc +++ b/data/maps/NavelRock_Base/scripts.inc @@ -1,91 +1,91 @@ NavelRock_Base_MapScripts:: @ 81650E7 - map_script 3, NavelRock_Base_MapScript1_1650F2 - map_script 5, NavelRock_Base_MapScript2_165116 - .byte 0 + map_script 3, NavelRock_Base_MapScript1_1650F2 + map_script 5, NavelRock_Base_MapScript2_165116 + .byte 0 NavelRock_Base_MapScript1_1650F2:: @ 81650F2 - checkflag FLAG_0x2F2 - call_if 1, EventScript_165105 - checkflag FLAG_0x2F2 - call_if 0, EventScript_165109 - end + checkflag FLAG_0x2F2 + call_if 1, EventScript_165105 + checkflag FLAG_0x2F2 + call_if 0, EventScript_165109 + end EventScript_165105:: @ 8165105 - setflag FLAG_0x09B - return + setflag FLAG_0x09B + return EventScript_165109:: @ 8165109 - checkflag FLAG_0x2F5 - goto_if 1, EventScript_1A77A9 - clearflag FLAG_0x09B - return + checkflag FLAG_0x2F5 + goto_if 1, EventScript_1A77A9 + clearflag FLAG_0x09B + return NavelRock_Base_MapScript2_165116:: @ 8165116 - checkflag 2055 - call_if 1, EventScript_165120 - end + checkflag 2055 + call_if 1, EventScript_165120 + end EventScript_165120:: @ 8165120 - specialvar VAR_RESULT, sub_80CA74C - compare_var_to_value VAR_RESULT, 7 - goto_if 5, EventScript_1A77A9 - removeobject 1 - return + specialvar VAR_RESULT, sub_80CA74C + compare_var_to_value VAR_RESULT, 7 + goto_if 5, EventScript_1A77A9 + removeobject 1 + return NavelRock_Base_EventScript_165134:: @ 8165134 - special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 - special sub_8112364 - lock - faceplayer - waitse - delay 20 - playse SE_FUUSEN2 - setvar VAR_0x8004, 0 - setvar VAR_0x8005, 3 - setvar VAR_0x8006, 4 - setvar VAR_0x8007, 2 - special sub_80CAC28 - delay 30 - playse SE_FUUSEN2 - setvar VAR_0x8004, 0 - setvar VAR_0x8005, 3 - setvar VAR_0x8006, 4 - setvar VAR_0x8007, 2 - special sub_80CAC28 - delay 30 - delay 50 - waitse - playmoncry SPECIES_LUGIA, 2 - waitmoncry - delay 20 - setvar VAR_0x8004, 249 - setvar VAR_0x8005, 70 - setvar VAR_0x8006, 0 - special sub_8044838 - setflag 2055 - special sub_807F9D8 - waitstate - clearflag 2055 - specialvar VAR_RESULT, sub_80CA74C - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1651D9 - compare_var_to_value VAR_RESULT, 4 - goto_if 1, EventScript_1651E7 - compare_var_to_value VAR_RESULT, 5 - goto_if 1, EventScript_1651E7 - setflag FLAG_0x2F2 - release - end + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + special sub_8112364 + lock + faceplayer + waitse + delay 20 + playse SE_FUUSEN2 + setvar VAR_0x8004, 0 + setvar VAR_0x8005, 3 + setvar VAR_0x8006, 4 + setvar VAR_0x8007, 2 + special sub_80CAC28 + delay 30 + playse SE_FUUSEN2 + setvar VAR_0x8004, 0 + setvar VAR_0x8005, 3 + setvar VAR_0x8006, 4 + setvar VAR_0x8007, 2 + special sub_80CAC28 + delay 30 + delay 50 + waitse + playmoncry SPECIES_LUGIA, 2 + waitmoncry + delay 20 + setvar VAR_0x8004, 249 + setvar VAR_0x8005, 70 + setvar VAR_0x8006, 0 + special sub_8044838 + setflag 2055 + special sub_807F9D8 + waitstate + clearflag 2055 + specialvar VAR_RESULT, sub_80CA74C + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_1651D9 + compare_var_to_value VAR_RESULT, 4 + goto_if 1, EventScript_1651E7 + compare_var_to_value VAR_RESULT, 5 + goto_if 1, EventScript_1651E7 + setflag FLAG_0x2F2 + release + end EventScript_1651D9:: @ 81651D9 - setflag FLAG_0x2F5 - setvar VAR_0x8004, 249 - goto EventScript_1A9236 - end + setflag FLAG_0x2F5 + setvar VAR_0x8004, 249 + goto EventScript_1A9236 + end EventScript_1651E7:: @ 81651E7 - setvar VAR_0x8004, 249 - goto EventScript_1A9236 - end + setvar VAR_0x8004, 249 + goto EventScript_1A9236 + end diff --git a/data/maps/NavelRock_BasePath_B10F/scripts.inc b/data/maps/NavelRock_BasePath_B10F/scripts.inc index 367d219c5..472814198 100644 --- a/data/maps/NavelRock_BasePath_B10F/scripts.inc +++ b/data/maps/NavelRock_BasePath_B10F/scripts.inc @@ -1,2 +1,2 @@ NavelRock_BasePath_B10F_MapScripts:: @ 81651FF - .byte 0 + .byte 0 diff --git a/data/maps/NavelRock_BasePath_B11F/scripts.inc b/data/maps/NavelRock_BasePath_B11F/scripts.inc index ee20f32f5..9157991d1 100644 --- a/data/maps/NavelRock_BasePath_B11F/scripts.inc +++ b/data/maps/NavelRock_BasePath_B11F/scripts.inc @@ -1,2 +1,2 @@ NavelRock_BasePath_B11F_MapScripts:: @ 8165200 - .byte 0 + .byte 0 diff --git a/data/maps/NavelRock_BasePath_B1F/scripts.inc b/data/maps/NavelRock_BasePath_B1F/scripts.inc index d15e43a46..141ec01a0 100644 --- a/data/maps/NavelRock_BasePath_B1F/scripts.inc +++ b/data/maps/NavelRock_BasePath_B1F/scripts.inc @@ -1,2 +1,2 @@ NavelRock_BasePath_B1F_MapScripts:: @ 81651F6 - .byte 0 + .byte 0 diff --git a/data/maps/NavelRock_BasePath_B2F/scripts.inc b/data/maps/NavelRock_BasePath_B2F/scripts.inc index 9e41c37a4..75d2fa066 100644 --- a/data/maps/NavelRock_BasePath_B2F/scripts.inc +++ b/data/maps/NavelRock_BasePath_B2F/scripts.inc @@ -1,2 +1,2 @@ NavelRock_BasePath_B2F_MapScripts:: @ 81651F7 - .byte 0 + .byte 0 diff --git a/data/maps/NavelRock_BasePath_B3F/scripts.inc b/data/maps/NavelRock_BasePath_B3F/scripts.inc index 4a306fb7c..4cf947ebc 100644 --- a/data/maps/NavelRock_BasePath_B3F/scripts.inc +++ b/data/maps/NavelRock_BasePath_B3F/scripts.inc @@ -1,2 +1,2 @@ NavelRock_BasePath_B3F_MapScripts:: @ 81651F8 - .byte 0 + .byte 0 diff --git a/data/maps/NavelRock_BasePath_B4F/scripts.inc b/data/maps/NavelRock_BasePath_B4F/scripts.inc index 80c442795..9e7f60f9d 100644 --- a/data/maps/NavelRock_BasePath_B4F/scripts.inc +++ b/data/maps/NavelRock_BasePath_B4F/scripts.inc @@ -1,2 +1,2 @@ NavelRock_BasePath_B4F_MapScripts:: @ 81651F9 - .byte 0 + .byte 0 diff --git a/data/maps/NavelRock_BasePath_B5F/scripts.inc b/data/maps/NavelRock_BasePath_B5F/scripts.inc index 9bc4d0e8c..43a17fabe 100644 --- a/data/maps/NavelRock_BasePath_B5F/scripts.inc +++ b/data/maps/NavelRock_BasePath_B5F/scripts.inc @@ -1,2 +1,2 @@ NavelRock_BasePath_B5F_MapScripts:: @ 81651FA - .byte 0 + .byte 0 diff --git a/data/maps/NavelRock_BasePath_B6F/scripts.inc b/data/maps/NavelRock_BasePath_B6F/scripts.inc index 718afdcdc..9711ad6a4 100644 --- a/data/maps/NavelRock_BasePath_B6F/scripts.inc +++ b/data/maps/NavelRock_BasePath_B6F/scripts.inc @@ -1,2 +1,2 @@ NavelRock_BasePath_B6F_MapScripts:: @ 81651FB - .byte 0 + .byte 0 diff --git a/data/maps/NavelRock_BasePath_B7F/scripts.inc b/data/maps/NavelRock_BasePath_B7F/scripts.inc index 6942439e7..276556621 100644 --- a/data/maps/NavelRock_BasePath_B7F/scripts.inc +++ b/data/maps/NavelRock_BasePath_B7F/scripts.inc @@ -1,2 +1,2 @@ NavelRock_BasePath_B7F_MapScripts:: @ 81651FC - .byte 0 + .byte 0 diff --git a/data/maps/NavelRock_BasePath_B8F/scripts.inc b/data/maps/NavelRock_BasePath_B8F/scripts.inc index 8c6e1284d..03458eabf 100644 --- a/data/maps/NavelRock_BasePath_B8F/scripts.inc +++ b/data/maps/NavelRock_BasePath_B8F/scripts.inc @@ -1,2 +1,2 @@ NavelRock_BasePath_B8F_MapScripts:: @ 81651FD - .byte 0 + .byte 0 diff --git a/data/maps/NavelRock_BasePath_B9F/scripts.inc b/data/maps/NavelRock_BasePath_B9F/scripts.inc index 0aa96b407..b1039fa40 100644 --- a/data/maps/NavelRock_BasePath_B9F/scripts.inc +++ b/data/maps/NavelRock_BasePath_B9F/scripts.inc @@ -1,2 +1,2 @@ NavelRock_BasePath_B9F_MapScripts:: @ 81651FE - .byte 0 + .byte 0 diff --git a/data/maps/NavelRock_Exterior/scripts.inc b/data/maps/NavelRock_Exterior/scripts.inc index 31013ff5d..32b86d7d6 100644 --- a/data/maps/NavelRock_Exterior/scripts.inc +++ b/data/maps/NavelRock_Exterior/scripts.inc @@ -1,7 +1,7 @@ NavelRock_Exterior_MapScripts:: @ 81646AE - map_script 3, NavelRock_Exterior_MapScript1_1646B4 - .byte 0 + map_script 3, NavelRock_Exterior_MapScript1_1646B4 + .byte 0 NavelRock_Exterior_MapScript1_1646B4:: @ 81646B4 - setworldmapflag 2229 - end + setworldmapflag 2229 + end diff --git a/data/maps/NavelRock_Fork/scripts.inc b/data/maps/NavelRock_Fork/scripts.inc index 1a202fae9..5a98404f8 100644 --- a/data/maps/NavelRock_Fork/scripts.inc +++ b/data/maps/NavelRock_Fork/scripts.inc @@ -1,2 +1,2 @@ NavelRock_Fork_MapScripts:: @ 8165202 - .byte 0 + .byte 0 diff --git a/data/maps/NavelRock_Summit/scripts.inc b/data/maps/NavelRock_Summit/scripts.inc index eeb47f007..d1c48d99b 100644 --- a/data/maps/NavelRock_Summit/scripts.inc +++ b/data/maps/NavelRock_Summit/scripts.inc @@ -1,130 +1,130 @@ NavelRock_Summit_MapScripts:: @ 8164F9F - map_script 3, NavelRock_Summit_MapScript1_164FAA - map_script 5, NavelRock_Summit_MapScript2_164FDD - .byte 0 + map_script 3, NavelRock_Summit_MapScript1_164FAA + map_script 5, NavelRock_Summit_MapScript2_164FDD + .byte 0 NavelRock_Summit_MapScript1_164FAA:: @ 8164FAA - checkflag FLAG_0x2F3 - call_if 1, EventScript_164FBD - checkflag FLAG_0x2F3 - call_if 0, EventScript_164FC6 - end + checkflag FLAG_0x2F3 + call_if 1, EventScript_164FBD + checkflag FLAG_0x2F3 + call_if 0, EventScript_164FC6 + end EventScript_164FBD:: @ 8164FBD - setvar VAR_0x4001, 1 - setflag FLAG_0x09C - return + setvar VAR_0x4001, 1 + setflag FLAG_0x09C + return EventScript_164FC6:: @ 8164FC6 - setvar VAR_0x4001, 1 - checkflag FLAG_0x2F6 - goto_if 1, EventScript_1A77A9 - setvar VAR_0x4001, 0 - clearflag FLAG_0x09C - return + setvar VAR_0x4001, 1 + checkflag FLAG_0x2F6 + goto_if 1, EventScript_1A77A9 + setvar VAR_0x4001, 0 + clearflag FLAG_0x09C + return NavelRock_Summit_MapScript2_164FDD:: @ 8164FDD - checkflag 2055 - call_if 1, EventScript_164FE7 - end + checkflag 2055 + call_if 1, EventScript_164FE7 + end EventScript_164FE7:: @ 8164FE7 - specialvar VAR_RESULT, sub_80CA74C - compare_var_to_value VAR_RESULT, 7 - goto_if 5, EventScript_1A77A9 - removeobject 1 - return + specialvar VAR_RESULT, sub_80CA74C + compare_var_to_value VAR_RESULT, 7 + goto_if 5, EventScript_1A77A9 + removeobject 1 + return NavelRock_Summit_EventScript_164FFB:: @ 8164FFB - special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 - special sub_8112364 - lockall - setvar VAR_0x4001, 1 - special SpawnScriptFieldObject - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 35 - special sub_80CD1B4 - applymovement 1, Movement_1650E0 - applymovement 127, Movement_1650CD - waitmovement 0 - delay 50 - setweather 0 - doweather - waitse - playmoncry SPECIES_HO_OH, 2 - delay 30 - waitmoncry - delay 60 - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 35 - special sub_80CD1B4 - applymovement 127, Movement_1650D1 - applymovement 1, Movement_1650D7 - waitmovement 0 - special RemoveScriptFieldObject - setvar VAR_0x8004, 250 - setvar VAR_0x8005, 70 - setvar VAR_0x8006, 0 - special sub_8044838 - setflag 2055 - special sub_807F9D8 - waitstate - clearflag 2055 - setvar VAR_LAST_TALKED, 1 - specialvar VAR_RESULT, sub_80CA74C - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1650B4 - compare_var_to_value VAR_RESULT, 4 - goto_if 1, EventScript_1650C2 - compare_var_to_value VAR_RESULT, 5 - goto_if 1, EventScript_1650C2 - setflag FLAG_0x2F3 - releaseall - end + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + special sub_8112364 + lockall + setvar VAR_0x4001, 1 + special SpawnScriptFieldObject + setvar VAR_0x8004, 3 + setvar VAR_0x8005, 35 + special sub_80CD1B4 + applymovement 1, Movement_1650E0 + applymovement 127, Movement_1650CD + waitmovement 0 + delay 50 + setweather 0 + doweather + waitse + playmoncry SPECIES_HO_OH, 2 + delay 30 + waitmoncry + delay 60 + setvar VAR_0x8004, 3 + setvar VAR_0x8005, 35 + special sub_80CD1B4 + applymovement 127, Movement_1650D1 + applymovement 1, Movement_1650D7 + waitmovement 0 + special RemoveScriptFieldObject + setvar VAR_0x8004, 250 + setvar VAR_0x8005, 70 + setvar VAR_0x8006, 0 + special sub_8044838 + setflag 2055 + special sub_807F9D8 + waitstate + clearflag 2055 + setvar VAR_LAST_TALKED, 1 + specialvar VAR_RESULT, sub_80CA74C + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_1650B4 + compare_var_to_value VAR_RESULT, 4 + goto_if 1, EventScript_1650C2 + compare_var_to_value VAR_RESULT, 5 + goto_if 1, EventScript_1650C2 + setflag FLAG_0x2F3 + releaseall + end EventScript_1650B4:: @ 81650B4 - setflag FLAG_0x2F6 - setvar VAR_0x8004, 250 - goto EventScript_1A9236 - end + setflag FLAG_0x2F6 + setvar VAR_0x8004, 250 + goto EventScript_1A9236 + end EventScript_1650C2:: @ 81650C2 - setvar VAR_0x8004, 250 - goto EventScript_1A9236 - end + setvar VAR_0x8004, 250 + goto EventScript_1A9236 + end Movement_1650CD:: @ 81650CD - step_11 - step_11 - step_11 - step_end + step_11 + step_11 + step_11 + step_end Movement_1650D1:: @ 81650D1 - step_1c - step_1c - step_10 - step_10 - step_10 - step_end + step_1c + step_1c + step_10 + step_10 + step_10 + step_end Movement_1650D7:: @ 81650D7 - step_10 - step_10 - step_10 - step_10 - step_10 - step_25 - step_1c - step_1c - step_end + step_10 + step_10 + step_10 + step_10 + step_10 + step_25 + step_1c + step_1c + step_end Movement_1650E0:: @ 81650E0 - step_1c - step_1c - step_25 - step_25 - step_25 - step_25 - step_end + step_1c + step_1c + step_25 + step_25 + step_25 + step_25 + step_end diff --git a/data/maps/NavelRock_SummitPath_2F/scripts.inc b/data/maps/NavelRock_SummitPath_2F/scripts.inc index 1311becf7..c37b5a750 100644 --- a/data/maps/NavelRock_SummitPath_2F/scripts.inc +++ b/data/maps/NavelRock_SummitPath_2F/scripts.inc @@ -1,2 +1,2 @@ NavelRock_SummitPath_2F_MapScripts:: @ 81651F2 - .byte 0 + .byte 0 diff --git a/data/maps/NavelRock_SummitPath_3F/scripts.inc b/data/maps/NavelRock_SummitPath_3F/scripts.inc index 1ca5fc782..f98f50cb3 100644 --- a/data/maps/NavelRock_SummitPath_3F/scripts.inc +++ b/data/maps/NavelRock_SummitPath_3F/scripts.inc @@ -1,2 +1,2 @@ NavelRock_SummitPath_3F_MapScripts:: @ 81651F3 - .byte 0 + .byte 0 diff --git a/data/maps/NavelRock_SummitPath_4F/scripts.inc b/data/maps/NavelRock_SummitPath_4F/scripts.inc index 79371b1c5..8cc10b870 100644 --- a/data/maps/NavelRock_SummitPath_4F/scripts.inc +++ b/data/maps/NavelRock_SummitPath_4F/scripts.inc @@ -1,2 +1,2 @@ NavelRock_SummitPath_4F_MapScripts:: @ 81651F4 - .byte 0 + .byte 0 diff --git a/data/maps/NavelRock_SummitPath_5F/scripts.inc b/data/maps/NavelRock_SummitPath_5F/scripts.inc index d8aa65052..e159cf2e6 100644 --- a/data/maps/NavelRock_SummitPath_5F/scripts.inc +++ b/data/maps/NavelRock_SummitPath_5F/scripts.inc @@ -1,2 +1,2 @@ NavelRock_SummitPath_5F_MapScripts:: @ 81651F5 - .byte 0 + .byte 0 diff --git a/data/maps/OneIsland/scripts.inc b/data/maps/OneIsland/scripts.inc index 70ab4ff03..f1d1fa7af 100644 --- a/data/maps/OneIsland/scripts.inc +++ b/data/maps/OneIsland/scripts.inc @@ -1,121 +1,121 @@ OneIsland_MapScripts:: @ 8167484 - map_script 3, OneIsland_MapScript1_16748F - map_script 2, OneIsland_MapScript2_167493 - .byte 0 + map_script 3, OneIsland_MapScript1_16748F + map_script 2, OneIsland_MapScript2_167493 + .byte 0 OneIsland_MapScript1_16748F:: @ 816748F - setworldmapflag 2203 - end + setworldmapflag 2203 + end OneIsland_MapScript2_167493:: @ 8167493 - map_script_2 VAR_0x4075, 2, EventScript_16749D - .2byte 0 + map_script_2 VAR_0x4075, 2, EventScript_16749D + .2byte 0 EventScript_16749D:: @ 816749D - lockall - textcolor 0 - applymovement 255, Movement_167505 - waitmovement 0 - loadword 0, gUnknown_818161B - callstd 4 - closemessage - applymovement 1, Movement_167507 - applymovement 255, Movement_1674F4 - waitmovement 0 - opendoor 14, 5 - waitdooranim - applymovement 1, Movement_167514 - applymovement 255, Movement_167501 - waitmovement 0 - closedoor 14, 5 - waitdooranim - removeobject 1 - setvar VAR_0x4075, 3 - warp MAP_ONE_ISLAND_POKEMON_CENTER_1F, 255, 9, 9 - waitstate - releaseall - end + lockall + textcolor 0 + applymovement 255, Movement_167505 + waitmovement 0 + loadword 0, gUnknown_818161B + callstd 4 + closemessage + applymovement 1, Movement_167507 + applymovement 255, Movement_1674F4 + waitmovement 0 + opendoor 14, 5 + waitdooranim + applymovement 1, Movement_167514 + applymovement 255, Movement_167501 + waitmovement 0 + closedoor 14, 5 + waitdooranim + removeobject 1 + setvar VAR_0x4075, 3 + warp MAP_ONE_ISLAND_POKEMON_CENTER_1F, 255, 9, 9 + waitstate + releaseall + end Movement_1674F4:: @ 81674F4 - step_11 - step_11 - step_11 - step_11 - step_11 - step_13 - step_13 - step_11 - step_11 - step_11 - step_11 - step_11 - step_end + step_11 + step_11 + step_11 + step_11 + step_11 + step_13 + step_13 + step_11 + step_11 + step_11 + step_11 + step_11 + step_end Movement_167501:: @ 8167501 - step_11 - step_11 - step_60 - step_end + step_11 + step_11 + step_60 + step_end Movement_167505:: @ 8167505 - step_11 - step_end + step_11 + step_end Movement_167507:: @ 8167507 - step_11 - step_11 - step_11 - step_11 - step_13 - step_13 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_end + step_11 + step_11 + step_11 + step_11 + step_13 + step_13 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_end Movement_167514:: @ 8167514 - step_11 - step_60 - step_end + step_11 + step_60 + step_end OneIsland_EventScript_167517:: @ 8167517 - lock - faceplayer - checkflag 2116 - goto_if 1, EventScript_16753F - checkflag FLAG_0x2A1 - goto_if 1, EventScript_167535 - loadword 0, gUnknown_818174E - callstd 4 - release - end + lock + faceplayer + checkflag 2116 + goto_if 1, EventScript_16753F + checkflag FLAG_0x2A1 + goto_if 1, EventScript_167535 + loadword 0, gUnknown_818174E + callstd 4 + release + end EventScript_167535:: @ 8167535 - loadword 0, gUnknown_8181858 - callstd 4 - release - end + loadword 0, gUnknown_8181858 + callstd 4 + release + end EventScript_16753F:: @ 816753F - loadword 0, gUnknown_8181901 - callstd 4 - release - end + loadword 0, gUnknown_8181901 + callstd 4 + release + end OneIsland_EventScript_167549:: @ 8167549 - loadword 0, gUnknown_8181A4A - callstd 2 - end + loadword 0, gUnknown_8181A4A + callstd 2 + end OneIsland_EventScript_167552:: @ 8167552 - loadword 0, gUnknown_81819E1 - callstd 3 - end + loadword 0, gUnknown_81819E1 + callstd 3 + end OneIsland_EventScript_16755B:: @ 816755B - loadword 0, gUnknown_8181A0A - callstd 3 - end + loadword 0, gUnknown_8181A0A + callstd 3 + end diff --git a/data/maps/OneIsland_Harbor/scripts.inc b/data/maps/OneIsland_Harbor/scripts.inc index 60a82c17e..81c7dc54b 100644 --- a/data/maps/OneIsland_Harbor/scripts.inc +++ b/data/maps/OneIsland_Harbor/scripts.inc @@ -1,42 +1,42 @@ OneIsland_Harbor_MapScripts:: @ 8171378 - map_script 4, OneIsland_Harbor_MapScript1_171383 - map_script 2, OneIsland_Harbor_MapScript2_171392 - .byte 0 + map_script 4, OneIsland_Harbor_MapScript1_171383 + map_script 2, OneIsland_Harbor_MapScript2_171392 + .byte 0 OneIsland_Harbor_MapScript1_171383:: @ 8171383 - map_script_2 VAR_0x4075, 1, EventScript_17138D - .2byte 0 + map_script_2 VAR_0x4075, 1, EventScript_17138D + .2byte 0 EventScript_17138D:: @ 817138D - turnobject 255, 2 - end + turnobject 255, 2 + end OneIsland_Harbor_MapScript2_171392:: @ 8171392 - map_script_2 VAR_0x4075, 1, EventScript_17139C - .2byte 0 + map_script_2 VAR_0x4075, 1, EventScript_17139C + .2byte 0 EventScript_17139C:: @ 817139C - lockall - textcolor 0 - applymovement 255, Movement_1713B9 - waitmovement 0 - setvar VAR_0x4075, 2 - warp MAP_ONE_ISLAND, 255, 12, 18 - waitstate - releaseall - end + lockall + textcolor 0 + applymovement 255, Movement_1713B9 + waitmovement 0 + setvar VAR_0x4075, 2 + warp MAP_ONE_ISLAND, 255, 12, 18 + waitstate + releaseall + end Movement_1713B9:: @ 81713B9 - step_11 - step_11 - step_11 - step_end + step_11 + step_11 + step_11 + step_end OneIsland_Harbor_EventScript_1713BD:: @ 81713BD - lock - faceplayer - message Text_181726 - waitmessage - setvar VAR_0x8004, 1 - goto EventScript_1A8EC5 - end + lock + faceplayer + message Text_181726 + waitmessage + setvar VAR_0x8004, 1 + goto EventScript_1A8EC5 + end diff --git a/data/maps/OneIsland_House1/scripts.inc b/data/maps/OneIsland_House1/scripts.inc index 24823bec8..00dc7780b 100644 --- a/data/maps/OneIsland_House1/scripts.inc +++ b/data/maps/OneIsland_House1/scripts.inc @@ -1,12 +1,12 @@ OneIsland_House1_MapScripts:: @ 817135B - .byte 0 + .byte 0 OneIsland_House1_EventScript_17135C:: @ 817135C - loadword 0, gUnknown_81A2332 - callstd 2 - end + loadword 0, gUnknown_81A2332 + callstd 2 + end OneIsland_House1_EventScript_171365:: @ 8171365 - loadword 0, gUnknown_81A2380 - callstd 2 - end + loadword 0, gUnknown_81A2380 + callstd 2 + end diff --git a/data/maps/OneIsland_House2/scripts.inc b/data/maps/OneIsland_House2/scripts.inc index a9c79e1c6..fafdfd79c 100644 --- a/data/maps/OneIsland_House2/scripts.inc +++ b/data/maps/OneIsland_House2/scripts.inc @@ -1,7 +1,7 @@ OneIsland_House2_MapScripts:: @ 817136E - .byte 0 + .byte 0 OneIsland_House2_EventScript_17136F:: @ 817136F - loadword 0, gUnknown_81A23B8 - callstd 2 - end + loadword 0, gUnknown_81A23B8 + callstd 2 + end diff --git a/data/maps/OneIsland_KindleRoad/scripts.inc b/data/maps/OneIsland_KindleRoad/scripts.inc index 4a6d76ae1..c7999b783 100644 --- a/data/maps/OneIsland_KindleRoad/scripts.inc +++ b/data/maps/OneIsland_KindleRoad/scripts.inc @@ -1,12 +1,12 @@ OneIsland_KindleRoad_MapScripts:: @ 8168758 - .byte 0 + .byte 0 OneIsland_KindleRoad_EventScript_168759:: @ 8168759 - loadword 0, gUnknown_8189D02 - callstd 3 - end + loadword 0, gUnknown_8189D02 + callstd 3 + end OneIsland_KindleRoad_EventScript_168762:: @ 8168762 - loadword 0, gUnknown_8189D32 - callstd 3 - end + loadword 0, gUnknown_8189D32 + callstd 3 + end diff --git a/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc b/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc index 8e2409168..bf5ae163c 100644 --- a/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc +++ b/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc @@ -1,66 +1,66 @@ OneIsland_KindleRoad_EmberSpa_MapScripts:: @ 816535B - .byte 0 + .byte 0 OneIsland_KindleRoad_EmberSpa_EventScript_16535C:: @ 816535C - loadword 0, gUnknown_817D34A - callstd 2 - end + loadword 0, gUnknown_817D34A + callstd 2 + end OneIsland_KindleRoad_EmberSpa_EventScript_165365:: @ 8165365 - loadword 0, gUnknown_817D3DE - callstd 2 - end + loadword 0, gUnknown_817D3DE + callstd 2 + end OneIsland_KindleRoad_EmberSpa_EventScript_16536E:: @ 816536E - loadword 0, gUnknown_817D4AA - callstd 2 - end + loadword 0, gUnknown_817D4AA + callstd 2 + end OneIsland_KindleRoad_EmberSpa_EventScript_165377:: @ 8165377 - loadword 0, gUnknown_817D4E3 - callstd 2 - end + loadword 0, gUnknown_817D4E3 + callstd 2 + end OneIsland_KindleRoad_EmberSpa_EventScript_165380:: @ 8165380 - lock - faceplayer - setvar VAR_0x8004, 10 - setvar VAR_0x8005, 3 - special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_817D550 - callstd 4 - release - end + lock + faceplayer + setvar VAR_0x8004, 10 + setvar VAR_0x8005, 3 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_817D550 + callstd 4 + release + end OneIsland_KindleRoad_EmberSpa_EventScript_165399:: @ 8165399 - lock - faceplayer - checkflag FLAG_0x2EF - goto_if 1, EventScript_1653C5 - loadword 0, gUnknown_817D622 - callstd 4 - setorcopyvar VAR_0x8000, 344 - setorcopyvar VAR_0x8001, 1 - callstd 0 - setflag FLAG_0x2EF - loadword 0, gUnknown_817D6F3 - callstd 4 - release - end + lock + faceplayer + checkflag FLAG_0x2EF + goto_if 1, EventScript_1653C5 + loadword 0, gUnknown_817D622 + callstd 4 + setorcopyvar VAR_0x8000, 344 + setorcopyvar VAR_0x8001, 1 + callstd 0 + setflag FLAG_0x2EF + loadword 0, gUnknown_817D6F3 + callstd 4 + release + end EventScript_1653C5:: @ 81653C5 - loadword 0, gUnknown_817D6F3 - callstd 4 - release - end + loadword 0, gUnknown_817D6F3 + callstd 4 + release + end OneIsland_KindleRoad_EmberSpa_EventScript_1653CF:: @ 81653CF - lockall - fadescreen 3 - special sp000_heal_pokemon - fadescreen 2 - loadword 0, gUnknown_817D450 - callstd 4 - setvar VAR_0x4001, 1 - releaseall - end + lockall + fadescreen 3 + special sp000_heal_pokemon + fadescreen 2 + loadword 0, gUnknown_817D450 + callstd 4 + setvar VAR_0x4001, 1 + releaseall + end diff --git a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc index 4419b669e..e09b5d380 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc @@ -1,658 +1,658 @@ OneIsland_PokemonCenter_1F_MapScripts:: @ 8170BF8 - map_script 3, OneIsland_PokemonCenter_1F_MapScript1_170C4E - map_script 5, OneIsland_PokemonCenter_1F_MapScript2_1BC05C - map_script 1, OneIsland_PokemonCenter_1F_MapScript3_170C0D - map_script 2, OneIsland_PokemonCenter_1F_MapScript4_170CA7 - .byte 0 + map_script 3, OneIsland_PokemonCenter_1F_MapScript1_170C4E + map_script 5, OneIsland_PokemonCenter_1F_MapScript2_1BC05C + map_script 1, OneIsland_PokemonCenter_1F_MapScript3_170C0D + map_script 2, OneIsland_PokemonCenter_1F_MapScript4_170CA7 + .byte 0 OneIsland_PokemonCenter_1F_MapScript3_170C0D:: @ 8170C0D - compare_var_to_value VAR_0x4076, 5 - call_if 4, EventScript_170C22 - checkflag 2116 - call_if 1, EventScript_170C36 - end + compare_var_to_value VAR_0x4076, 5 + call_if 4, EventScript_170C22 + checkflag 2116 + call_if 1, EventScript_170C36 + end EventScript_170C22:: @ 8170C22 - setmetatile 13, 4, 861, 1 - return + setmetatile 13, 4, 861, 1 + return EventScript_170C2C:: @ 8170C2C - setmetatile 16, 4, 863, 1 - return + setmetatile 16, 4, 863, 1 + return EventScript_170C36:: @ 8170C36 - call EventScript_170C2C - setmetatile 14, 4, 858, 1 - setmetatile 15, 4, 859, 1 - return + call EventScript_170C2C + setmetatile 14, 4, 858, 1 + setmetatile 15, 4, 859, 1 + return OneIsland_PokemonCenter_1F_MapScript1_170C4E:: @ 8170C4E - setrespawn 14 - compare_var_to_value VAR_0x4076, 6 - call_if 1, EventScript_170C73 - compare_var_to_value VAR_0x4076, 0 - call_if 1, EventScript_170C79 - compare_var_to_value VAR_0x4076, 2 - call_if 1, EventScript_170C90 - end + setrespawn 14 + compare_var_to_value VAR_0x4076, 6 + call_if 1, EventScript_170C73 + compare_var_to_value VAR_0x4076, 0 + call_if 1, EventScript_170C79 + compare_var_to_value VAR_0x4076, 2 + call_if 1, EventScript_170C90 + end EventScript_170C73:: @ 8170C73 - setvar VAR_0x4076, 7 - return + setvar VAR_0x4076, 7 + return EventScript_170C79:: @ 8170C79 - setobjectxyperm 2, 9, 8 - setobjectmovementtype 2, 7 - setobjectxyperm 3, 15, 6 - setobjectmovementtype 3, 7 - return + setobjectxyperm 2, 9, 8 + setobjectmovementtype 2, 7 + setobjectxyperm 3, 15, 6 + setobjectmovementtype 3, 7 + return EventScript_170C90:: @ 8170C90 - setobjectxyperm 2, 14, 7 - setobjectmovementtype 2, 9 - setobjectxyperm 3, 14, 8 - setobjectmovementtype 3, 9 - return + setobjectxyperm 2, 14, 7 + setobjectmovementtype 2, 9 + setobjectxyperm 3, 14, 8 + setobjectmovementtype 3, 9 + return OneIsland_PokemonCenter_1F_MapScript4_170CA7:: @ 8170CA7 - map_script_2 VAR_0x4076, 0, EventScript_170CB1 - .2byte 0 + map_script_2 VAR_0x4076, 0, EventScript_170CB1 + .2byte 0 EventScript_170CB1:: @ 8170CB1 - lockall - textcolor 0 - applymovement 255, Movement_170E7D - applymovement 2, Movement_170E86 - waitmovement 0 - loadword 0, gUnknown_81A0CDE - callstd 4 - applymovement 255, Movement_1A75EB - waitmovement 0 - playse SE_PIN - applymovement 3, Movement_1A75DB - waitmovement 0 - applymovement 3, Movement_1A75E7 - waitmovement 0 - applymovement 3, Movement_1A75DD - waitmovement 0 - loadword 0, gUnknown_81A0CF7 - callstd 4 - loadword 0, gUnknown_81A0D27 - callstd 4 - applymovement 2, Movement_1A75ED - applymovement 255, Movement_1A75E9 - waitmovement 0 - loadword 0, gUnknown_81A0D72 - callstd 4 - applymovement 2, Movement_1A75EB - waitmovement 0 - applymovement 255, Movement_1A75EB - waitmovement 0 - checkflag 2092 - call_if 1, EventScript_170E34 - checkflag 2092 - call_if 0, EventScript_170E3D - applymovement 3, Movement_1A75ED - waitmovement 0 - loadword 0, gUnknown_81A0E17 - callstd 4 - loadword 0, gUnknown_81A0E90 - callstd 4 - applymovement 3, Movement_1A75E7 - waitmovement 0 - loadword 0, gUnknown_81A0ECC - callstd 4 - closemessage - applymovement 2, Movement_1A75E9 - waitmovement 0 - loadword 0, gUnknown_81A0F40 - callstd 4 - applymovement 2, Movement_1A75ED - waitmovement 0 - applymovement 255, Movement_1A75E9 - waitmovement 0 - loadword 0, gUnknown_81A0FB1 - callstd 4 - loadword 0, gUnknown_81A10EE - setorcopyvar VAR_0x8000, 280 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 318 - callstd 9 - additem ITEM_METEORITE, 1 - applymovement 3, Movement_1A75ED - waitmovement 0 - loadword 0, gUnknown_81A1113 - callstd 4 - additem ITEM_TRI_PASS, 1 - loadword 0, gUnknown_81A231B - setorcopyvar VAR_0x8000, 367 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 318 - callstd 9 - loadword 0, gUnknown_81A1150 - callstd 4 - compare_var_to_value VAR_0x4058, 2 - call_if 4, EventScript_170E46 - compare_var_to_value VAR_0x4058, 2 - call_if 0, EventScript_170E58 - setflag 2117 - loadword 0, gUnknown_81A1230 - callstd 4 - closemessage - applymovement 2, Movement_1A75E9 - waitmovement 0 - applymovement 3, Movement_1A75E9 - waitmovement 0 - setflag 2113 - setvar VAR_0x4076, 1 - releaseall - end + lockall + textcolor 0 + applymovement 255, Movement_170E7D + applymovement 2, Movement_170E86 + waitmovement 0 + loadword 0, gUnknown_81A0CDE + callstd 4 + applymovement 255, Movement_1A75EB + waitmovement 0 + playse SE_PIN + applymovement 3, Movement_1A75DB + waitmovement 0 + applymovement 3, Movement_1A75E7 + waitmovement 0 + applymovement 3, Movement_1A75DD + waitmovement 0 + loadword 0, gUnknown_81A0CF7 + callstd 4 + loadword 0, gUnknown_81A0D27 + callstd 4 + applymovement 2, Movement_1A75ED + applymovement 255, Movement_1A75E9 + waitmovement 0 + loadword 0, gUnknown_81A0D72 + callstd 4 + applymovement 2, Movement_1A75EB + waitmovement 0 + applymovement 255, Movement_1A75EB + waitmovement 0 + checkflag 2092 + call_if 1, EventScript_170E34 + checkflag 2092 + call_if 0, EventScript_170E3D + applymovement 3, Movement_1A75ED + waitmovement 0 + loadword 0, gUnknown_81A0E17 + callstd 4 + loadword 0, gUnknown_81A0E90 + callstd 4 + applymovement 3, Movement_1A75E7 + waitmovement 0 + loadword 0, gUnknown_81A0ECC + callstd 4 + closemessage + applymovement 2, Movement_1A75E9 + waitmovement 0 + loadword 0, gUnknown_81A0F40 + callstd 4 + applymovement 2, Movement_1A75ED + waitmovement 0 + applymovement 255, Movement_1A75E9 + waitmovement 0 + loadword 0, gUnknown_81A0FB1 + callstd 4 + loadword 0, gUnknown_81A10EE + setorcopyvar VAR_0x8000, 280 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 318 + callstd 9 + additem ITEM_METEORITE, 1 + applymovement 3, Movement_1A75ED + waitmovement 0 + loadword 0, gUnknown_81A1113 + callstd 4 + additem ITEM_TRI_PASS, 1 + loadword 0, gUnknown_81A231B + setorcopyvar VAR_0x8000, 367 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 318 + callstd 9 + loadword 0, gUnknown_81A1150 + callstd 4 + compare_var_to_value VAR_0x4058, 2 + call_if 4, EventScript_170E46 + compare_var_to_value VAR_0x4058, 2 + call_if 0, EventScript_170E58 + setflag 2117 + loadword 0, gUnknown_81A1230 + callstd 4 + closemessage + applymovement 2, Movement_1A75E9 + waitmovement 0 + applymovement 3, Movement_1A75E9 + waitmovement 0 + setflag 2113 + setvar VAR_0x4076, 1 + releaseall + end EventScript_170E34:: @ 8170E34 - loadword 0, gUnknown_81A0DE8 - callstd 4 - return + loadword 0, gUnknown_81A0DE8 + callstd 4 + return EventScript_170E3D:: @ 8170E3D - loadword 0, gUnknown_81A0DAC - callstd 4 - return + loadword 0, gUnknown_81A0DAC + callstd 4 + return EventScript_170E46:: @ 8170E46 - textcolor 3 - playfanfare BGM_FRLG_ME_KEYITEM - message Text_1A11EC - waitmessage - waitfanfare - call EventScript_1A6675 - return + textcolor 3 + playfanfare BGM_FRLG_ME_KEYITEM + message Text_1A11EC + waitmessage + waitfanfare + call EventScript_1A6675 + return EventScript_170E58:: @ 8170E58 - setflag FLAG_0x039 - setvar VAR_0x4058, 2 - additem ITEM_TOWN_MAP, 1 - loadword 0, gUnknown_81A1218 - setorcopyvar VAR_0x8000, 361 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 318 - callstd 9 - return + setflag FLAG_0x039 + setvar VAR_0x4058, 2 + additem ITEM_TOWN_MAP, 1 + loadword 0, gUnknown_81A1218 + setorcopyvar VAR_0x8000, 361 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 318 + callstd 9 + return Movement_170E7D:: @ 8170E7D - step_11 - step_11 - step_13 - step_13 - step_13 - step_13 - step_13 - step_2e - step_end + step_11 + step_11 + step_13 + step_13 + step_13 + step_13 + step_13 + step_2e + step_end Movement_170E86:: @ 8170E86 - step_11 - step_13 - step_13 - step_13 - step_13 - step_13 - step_11 - step_30 - step_end + step_11 + step_13 + step_13 + step_13 + step_13 + step_13 + step_11 + step_30 + step_end Movement_170E8F:: @ 8170E8F - step_11 - step_end + step_11 + step_end Movement_170E91:: @ 8170E91 - step_12 - step_30 - step_end + step_12 + step_30 + step_end OneIsland_PokemonCenter_1F_EventScript_170E94:: @ 8170E94 - lock - faceplayer - call EventScript_1A6578 - release - end + lock + faceplayer + call EventScript_1A6578 + release + end OneIsland_PokemonCenter_1F_EventScript_170E9D:: @ 8170E9D - lock - checkflag FLAG_0x2A1 - goto_if 1, EventScript_170EB1 - loadword 0, gUnknown_81A1266 - callstd 4 - release - end + lock + checkflag FLAG_0x2A1 + goto_if 1, EventScript_170EB1 + loadword 0, gUnknown_81A1266 + callstd 4 + release + end EventScript_170EB1:: @ 8170EB1 - applymovement 2, Movement_1A75E1 - waitmovement 0 - loadword 0, gUnknown_81A128C - callstd 4 - release - end + applymovement 2, Movement_1A75E1 + waitmovement 0 + loadword 0, gUnknown_81A128C + callstd 4 + release + end OneIsland_PokemonCenter_1F_EventScript_170EC5:: @ 8170EC5 - lock - faceplayer - compare_var_to_value VAR_0x4076, 7 - goto_if 1, EventScript_170F35 - compare_var_to_value VAR_0x4076, 6 - goto_if 1, EventScript_170F9B - checkflag FLAG_0x2DC - goto_if 1, EventScript_170FA5 - compare_var_to_value VAR_0x4076, 5 - goto_if 1, EventScript_17103A - checkflag FLAG_0x2DD - goto_if 1, EventScript_171044 - compare_var_to_value VAR_0x4076, 4 - goto_if 1, EventScript_1710F2 - specialvar VAR_RESULT, sub_806E25C - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1710FC - compare_var_to_value VAR_0x4076, 3 - goto_if 1, EventScript_171134 - loadword 0, gUnknown_81A1321 - callstd 4 - closemessage - applymovement 3, Movement_1A75E5 - waitmovement 0 - release - end + lock + faceplayer + compare_var_to_value VAR_0x4076, 7 + goto_if 1, EventScript_170F35 + compare_var_to_value VAR_0x4076, 6 + goto_if 1, EventScript_170F9B + checkflag FLAG_0x2DC + goto_if 1, EventScript_170FA5 + compare_var_to_value VAR_0x4076, 5 + goto_if 1, EventScript_17103A + checkflag FLAG_0x2DD + goto_if 1, EventScript_171044 + compare_var_to_value VAR_0x4076, 4 + goto_if 1, EventScript_1710F2 + specialvar VAR_RESULT, sub_806E25C + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_1710FC + compare_var_to_value VAR_0x4076, 3 + goto_if 1, EventScript_171134 + loadword 0, gUnknown_81A1321 + callstd 4 + closemessage + applymovement 3, Movement_1A75E5 + waitmovement 0 + release + end EventScript_170F35:: @ 8170F35 - loadword 0, gUnknown_81A1EBD - callstd 4 - random 3 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_170F6D - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_170F84 - setvar VAR_0x8004, 13 - setvar VAR_0x8005, 5 - special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_81A2076 - callstd 4 - release - end + loadword 0, gUnknown_81A1EBD + callstd 4 + random 3 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_170F6D + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_170F84 + setvar VAR_0x8004, 13 + setvar VAR_0x8005, 5 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_81A2076 + callstd 4 + release + end EventScript_170F6D:: @ 8170F6D - setvar VAR_0x8004, 13 - setvar VAR_0x8005, 3 - special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_81A1EF3 - callstd 4 - release - end + setvar VAR_0x8004, 13 + setvar VAR_0x8005, 3 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_81A1EF3 + callstd 4 + release + end EventScript_170F84:: @ 8170F84 - setvar VAR_0x8004, 13 - setvar VAR_0x8005, 4 - special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_81A1F7C - callstd 4 - release - end + setvar VAR_0x8004, 13 + setvar VAR_0x8005, 4 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_81A1F7C + callstd 4 + release + end EventScript_170F9B:: @ 8170F9B - loadword 0, gUnknown_81A1E39 - callstd 4 - release - end + loadword 0, gUnknown_81A1E39 + callstd 4 + release + end EventScript_170FA5:: @ 8170FA5 - textcolor 3 - playfanfare MUS_ME_WAZA - message Text_1A1C2D - waitmessage - waitfanfare - call EventScript_1A6675 - removeitem ITEM_SAPPHIRE, 1 - loadword 0, gUnknown_81A1C4E - callstd 4 - closemessage - applymovement 3, Movement_171142 - waitmovement 0 - playse SE_N - call EventScript_170C2C - special DrawWholeMapView - loadword 0, gUnknown_81A1D45 - callstd 4 - closemessage - delay 60 - applymovement 3, Movement_17113E - waitmovement 0 - delay 30 - applymovement 3, Movement_17113E - waitmovement 0 - delay 40 - playse SE_PC_ON - call EventScript_170C36 - special DrawWholeMapView - loadword 0, gUnknown_81A1D59 - callstd 4 - applymovement 3, Movement_1A75E1 - waitmovement 0 - loadword 0, gUnknown_81A1D7D - callstd 4 - special sub_810B82C - setflag 2116 - setflag FLAG_0x05C - setflag FLAG_0x08C - setvar VAR_0x4076, 6 - special InitRoamer - release - end + textcolor 3 + playfanfare MUS_ME_WAZA + message Text_1A1C2D + waitmessage + waitfanfare + call EventScript_1A6675 + removeitem ITEM_SAPPHIRE, 1 + loadword 0, gUnknown_81A1C4E + callstd 4 + closemessage + applymovement 3, Movement_171142 + waitmovement 0 + playse SE_N + call EventScript_170C2C + special DrawWholeMapView + loadword 0, gUnknown_81A1D45 + callstd 4 + closemessage + delay 60 + applymovement 3, Movement_17113E + waitmovement 0 + delay 30 + applymovement 3, Movement_17113E + waitmovement 0 + delay 40 + playse SE_PC_ON + call EventScript_170C36 + special DrawWholeMapView + loadword 0, gUnknown_81A1D59 + callstd 4 + applymovement 3, Movement_1A75E1 + waitmovement 0 + loadword 0, gUnknown_81A1D7D + callstd 4 + special sub_810B82C + setflag 2116 + setflag FLAG_0x05C + setflag FLAG_0x08C + setvar VAR_0x4076, 6 + special InitRoamer + release + end EventScript_17103A:: @ 817103A - loadword 0, gUnknown_81A1BB7 - callstd 4 - release - end + loadword 0, gUnknown_81A1BB7 + callstd 4 + release + end EventScript_171044:: @ 8171044 - loadword 0, gUnknown_81A197E - callstd 4 - textcolor 3 - playfanfare MUS_ME_WAZA - message Text_1A198D - waitmessage - waitfanfare - call EventScript_1A6675 - closemessage - applymovement 3, Movement_171142 - waitmovement 0 - playse SE_N - call EventScript_170C22 - special DrawWholeMapView - delay 30 - applymovement 3, Movement_1A75E1 - waitmovement 0 - loadword 0, gUnknown_81A19AA - callstd 5 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_171099 - goto EventScript_1710B2 - end + loadword 0, gUnknown_81A197E + callstd 4 + textcolor 3 + playfanfare MUS_ME_WAZA + message Text_1A198D + waitmessage + waitfanfare + call EventScript_1A6675 + closemessage + applymovement 3, Movement_171142 + waitmovement 0 + playse SE_N + call EventScript_170C22 + special DrawWholeMapView + delay 30 + applymovement 3, Movement_1A75E1 + waitmovement 0 + loadword 0, gUnknown_81A19AA + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_171099 + goto EventScript_1710B2 + end EventScript_171099:: @ 8171099 - loadword 0, gUnknown_81A1A08 - callstd 5 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_171099 - goto EventScript_1710B2 - end + loadword 0, gUnknown_81A1A08 + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_171099 + goto EventScript_1710B2 + end EventScript_1710B2:: @ 81710B2 - loadword 0, gUnknown_81A1A3F - callstd 4 - removeitem ITEM_RUBY, 1 - removeitem ITEM_TRI_PASS, 1 - setvar VAR_0x4076, 5 - additem ITEM_RAINBOW_PASS, 1 - setflag 2118 - textcolor 3 - playfanfare BGM_FRLG_ME_KEYITEM - message Text_1A1B56 - waitmessage - waitfanfare - playfanfare BGM_FRLG_ME_KEYITEM - message Text_1A1B8E - waitmessage - waitfanfare - call EventScript_1A6675 - goto EventScript_17103A - end + loadword 0, gUnknown_81A1A3F + callstd 4 + removeitem ITEM_RUBY, 1 + removeitem ITEM_TRI_PASS, 1 + setvar VAR_0x4076, 5 + additem ITEM_RAINBOW_PASS, 1 + setflag 2118 + textcolor 3 + playfanfare BGM_FRLG_ME_KEYITEM + message Text_1A1B56 + waitmessage + waitfanfare + playfanfare BGM_FRLG_ME_KEYITEM + message Text_1A1B8E + waitmessage + waitfanfare + call EventScript_1A6675 + goto EventScript_17103A + end EventScript_1710F2:: @ 81710F2 - loadword 0, gUnknown_81A1896 - callstd 4 - release - end + loadword 0, gUnknown_81A1896 + callstd 4 + release + end EventScript_1710FC:: @ 81710FC - loadword 0, gUnknown_81A169B - callstd 4 - applymovement 3, Movement_1A75E9 - waitmovement 0 - loadword 0, gUnknown_81A1723 - callstd 4 - applymovement 3, Movement_1A75E1 - waitmovement 0 - loadword 0, gUnknown_81A17DF - callstd 4 - setvar VAR_0x407F, 1 - setvar VAR_0x4076, 4 - release - end + loadword 0, gUnknown_81A169B + callstd 4 + applymovement 3, Movement_1A75E9 + waitmovement 0 + loadword 0, gUnknown_81A1723 + callstd 4 + applymovement 3, Movement_1A75E1 + waitmovement 0 + loadword 0, gUnknown_81A17DF + callstd 4 + setvar VAR_0x407F, 1 + setvar VAR_0x4076, 4 + release + end EventScript_171134:: @ 8171134 - loadword 0, gUnknown_81A15EC - callstd 4 - release - end + loadword 0, gUnknown_81A15EC + callstd 4 + release + end Movement_17113E:: @ 817113E - step_26 - step_1b - step_26 - step_end + step_26 + step_1b + step_26 + step_end Movement_171142:: @ 8171142 - step_2e - step_26 - step_1c - step_26 - step_26 - step_end + step_2e + step_26 + step_1c + step_26 + step_26 + step_end OneIsland_PokemonCenter_1F_EventScript_171148:: @ 8171148 - loadword 0, gUnknown_81A20D5 - callstd 2 - end + loadword 0, gUnknown_81A20D5 + callstd 2 + end OneIsland_PokemonCenter_1F_EventScript_171151:: @ 8171151 - loadword 0, gUnknown_81A212D - callstd 2 - end + loadword 0, gUnknown_81A212D + callstd 2 + end OneIsland_PokemonCenter_1F_EventScript_17115A:: @ 817115A - lock - faceplayer - checkflag 2116 - goto_if 1, EventScript_17116F - loadword 0, gUnknown_81A218D - callstd 4 - release - end + lock + faceplayer + checkflag 2116 + goto_if 1, EventScript_17116F + loadword 0, gUnknown_81A218D + callstd 4 + release + end EventScript_17116F:: @ 817116F - loadword 0, gUnknown_81A21D0 - callstd 4 - release - end + loadword 0, gUnknown_81A21D0 + callstd 4 + release + end OneIsland_PokemonCenter_1F_EventScript_171179:: @ 8171179 - lockall - checkflag 2116 - goto_if 1, EventScript_1711A0 - checkflag FLAG_0x2A1 - goto_if 1, EventScript_171196 - loadword 0, gUnknown_81A223F - callstd 4 - releaseall - end + lockall + checkflag 2116 + goto_if 1, EventScript_1711A0 + checkflag FLAG_0x2A1 + goto_if 1, EventScript_171196 + loadword 0, gUnknown_81A223F + callstd 4 + releaseall + end EventScript_171196:: @ 8171196 - loadword 0, gUnknown_81A2286 - callstd 4 - releaseall - end + loadword 0, gUnknown_81A2286 + callstd 4 + releaseall + end EventScript_1711A0:: @ 81711A0 - loadword 0, gUnknown_81A22CB - callstd 4 - releaseall - end + loadword 0, gUnknown_81A22CB + callstd 4 + releaseall + end OneIsland_PokemonCenter_1F_EventScript_1711AA:: @ 81711AA - lockall - setvar VAR_0x4001, 1 - goto EventScript_1711DA - end + lockall + setvar VAR_0x4001, 1 + goto EventScript_1711DA + end OneIsland_PokemonCenter_1F_EventScript_1711B6:: @ 81711B6 - lockall - setvar VAR_0x4001, 2 - goto EventScript_1711DA - end + lockall + setvar VAR_0x4001, 2 + goto EventScript_1711DA + end OneIsland_PokemonCenter_1F_EventScript_1711C2:: @ 81711C2 - lockall - setvar VAR_0x4001, 3 - goto EventScript_1711DA - end + lockall + setvar VAR_0x4001, 3 + goto EventScript_1711DA + end OneIsland_PokemonCenter_1F_EventScript_1711CE:: @ 81711CE - lockall - setvar VAR_0x4001, 4 - goto EventScript_1711DA - end + lockall + setvar VAR_0x4001, 4 + goto EventScript_1711DA + end EventScript_1711DA:: @ 81711DA - textcolor 0 - playse SE_PIN - applymovement 2, Movement_1A75DB - waitmovement 0 - loadword 0, gUnknown_81A13B8 - callstd 4 - closemessage - compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_1712E4 - compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_1712EF - compare_var_to_value VAR_0x4001, 3 - call_if 1, EventScript_1712FA - compare_var_to_value VAR_0x4001, 4 - call_if 1, EventScript_171305 - delay 10 - loadword 0, gUnknown_81A13CB - callstd 4 - applymovement 255, Movement_1A75ED - waitmovement 0 - loadword 0, gUnknown_81A1431 - callstd 4 - applymovement 2, Movement_1A75ED - waitmovement 0 - applymovement 3, Movement_1A75E9 - waitmovement 0 - loadword 0, gUnknown_81A1470 - callstd 4 - loadword 0, gUnknown_81A14E1 - callstd 4 - closemessage - applymovement 2, Movement_1A75E7 - waitmovement 0 - delay 10 - applymovement 255, Movement_1A75EB - waitmovement 0 - delay 15 - loadword 0, gUnknown_81A14FB - callstd 4 - closemessage - applymovement 2, Movement_1A75ED - waitmovement 0 - delay 15 - applymovement 3, Movement_1A75E7 - waitmovement 0 - applymovement 255, Movement_1A75ED - waitmovement 0 - loadword 0, gUnknown_81A1574 - callstd 4 - closemessage - delay 25 - applymovement 255, Movement_171326 - applymovement 2, Movement_17132D - waitmovement 0 - playse SE_KAIDAN - setflag FLAG_0x072 - setvar VAR_0x4076, 3 - clearflag FLAG_0x062 - setvar VAR_0x4071, 3 - setvar VAR_0x8004, 1 - setvar VAR_0x8006, 8 - goto EventScript_1A90DA - end + textcolor 0 + playse SE_PIN + applymovement 2, Movement_1A75DB + waitmovement 0 + loadword 0, gUnknown_81A13B8 + callstd 4 + closemessage + compare_var_to_value VAR_0x4001, 1 + call_if 1, EventScript_1712E4 + compare_var_to_value VAR_0x4001, 2 + call_if 1, EventScript_1712EF + compare_var_to_value VAR_0x4001, 3 + call_if 1, EventScript_1712FA + compare_var_to_value VAR_0x4001, 4 + call_if 1, EventScript_171305 + delay 10 + loadword 0, gUnknown_81A13CB + callstd 4 + applymovement 255, Movement_1A75ED + waitmovement 0 + loadword 0, gUnknown_81A1431 + callstd 4 + applymovement 2, Movement_1A75ED + waitmovement 0 + applymovement 3, Movement_1A75E9 + waitmovement 0 + loadword 0, gUnknown_81A1470 + callstd 4 + loadword 0, gUnknown_81A14E1 + callstd 4 + closemessage + applymovement 2, Movement_1A75E7 + waitmovement 0 + delay 10 + applymovement 255, Movement_1A75EB + waitmovement 0 + delay 15 + loadword 0, gUnknown_81A14FB + callstd 4 + closemessage + applymovement 2, Movement_1A75ED + waitmovement 0 + delay 15 + applymovement 3, Movement_1A75E7 + waitmovement 0 + applymovement 255, Movement_1A75ED + waitmovement 0 + loadword 0, gUnknown_81A1574 + callstd 4 + closemessage + delay 25 + applymovement 255, Movement_171326 + applymovement 2, Movement_17132D + waitmovement 0 + playse SE_KAIDAN + setflag FLAG_0x072 + setvar VAR_0x4076, 3 + clearflag FLAG_0x062 + setvar VAR_0x4071, 3 + setvar VAR_0x8004, 1 + setvar VAR_0x8006, 8 + goto EventScript_1A90DA + end EventScript_1712E4:: @ 81712E4 - applymovement 255, Movement_171310 - waitmovement 0 - return + applymovement 255, Movement_171310 + waitmovement 0 + return EventScript_1712EF:: @ 81712EF - applymovement 255, Movement_171314 - waitmovement 0 - return + applymovement 255, Movement_171314 + waitmovement 0 + return EventScript_1712FA:: @ 81712FA - applymovement 255, Movement_171316 - waitmovement 0 - return + applymovement 255, Movement_171316 + waitmovement 0 + return EventScript_171305:: @ 8171305 - applymovement 255, Movement_17131A - waitmovement 0 - return + applymovement 255, Movement_17131A + waitmovement 0 + return Movement_171310:: @ 8171310 - step_13 - step_10 - step_30 - step_end + step_13 + step_10 + step_30 + step_end Movement_171314:: @ 8171314 - step_13 - step_end + step_13 + step_end Movement_171316:: @ 8171316 - step_13 - step_11 - step_30 - step_end + step_13 + step_11 + step_30 + step_end Movement_17131A:: @ 817131A - step_13 - step_11 - step_11 - step_30 - step_end + step_13 + step_11 + step_11 + step_30 + step_end Movement_17131F:: @ 817131F - step_1c - step_1c - step_1a - step_2f - step_end + step_1c + step_1c + step_1a + step_2f + step_end Movement_171324:: @ 8171324 - step_29 - step_end + step_29 + step_end Movement_171326:: @ 8171326 - step_12 - step_12 - step_12 - step_12 - step_10 - step_10 - step_end + step_12 + step_12 + step_12 + step_12 + step_10 + step_10 + step_end Movement_17132D:: @ 817132D - step_12 - step_12 - step_12 - step_12 - step_12 - step_10 - step_end + step_12 + step_12 + step_12 + step_12 + step_12 + step_10 + step_end diff --git a/data/maps/OneIsland_PokemonCenter_2F/scripts.inc b/data/maps/OneIsland_PokemonCenter_2F/scripts.inc index 255a1693d..0948f1cee 100644 --- a/data/maps/OneIsland_PokemonCenter_2F/scripts.inc +++ b/data/maps/OneIsland_PokemonCenter_2F/scripts.inc @@ -1,18 +1,18 @@ OneIsland_PokemonCenter_2F_MapScripts:: @ 8171334 - map_script 2, OneIsland_PokemonCenter_2F_MapScript1_1BB2A3 - map_script 4, OneIsland_PokemonCenter_2F_MapScript2_1BB1ED - map_script 1, OneIsland_PokemonCenter_2F_MapScript3_1BB237 - map_script 3, OneIsland_PokemonCenter_2F_MapScript4_1BB1B4 - .byte 0 + map_script 2, OneIsland_PokemonCenter_2F_MapScript1_1BB2A3 + map_script 4, OneIsland_PokemonCenter_2F_MapScript2_1BB1ED + map_script 1, OneIsland_PokemonCenter_2F_MapScript3_1BB237 + map_script 3, OneIsland_PokemonCenter_2F_MapScript4_1BB1B4 + .byte 0 OneIsland_PokemonCenter_2F_EventScript_171349:: @ 8171349 - call EventScript_1BB4A3 - end + call EventScript_1BB4A3 + end EventScript_17134F:: @ 817134F - call EventScript_1BB6AB - end + call EventScript_1BB6AB + end EventScript_171355:: @ 8171355 - call EventScript_1BB7DE - end + call EventScript_1BB7DE + end diff --git a/data/maps/OneIsland_TreasureBeach/scripts.inc b/data/maps/OneIsland_TreasureBeach/scripts.inc index 7c6fb47cd..d6055235f 100644 --- a/data/maps/OneIsland_TreasureBeach/scripts.inc +++ b/data/maps/OneIsland_TreasureBeach/scripts.inc @@ -1,7 +1,7 @@ OneIsland_TreasureBeach_MapScripts:: @ 816876B - .byte 0 + .byte 0 OneIsland_TreasureBeach_EventScript_16876C:: @ 816876C - loadword 0, gUnknown_8189DCE - callstd 2 - end + loadword 0, gUnknown_8189DCE + callstd 2 + end diff --git a/data/maps/PalletTown/scripts.inc b/data/maps/PalletTown/scripts.inc index d0d4fc155..1ea484a62 100644 --- a/data/maps/PalletTown/scripts.inc +++ b/data/maps/PalletTown/scripts.inc @@ -1,527 +1,527 @@ PalletTown_MapScripts:: @ 816545A - map_script 3, PalletTown_MapScript1_165465 - map_script 2, PalletTown_MapScript2_1654CE - .byte 0 + map_script 3, PalletTown_MapScript1_165465 + map_script 2, PalletTown_MapScript2_1654CE + .byte 0 PalletTown_MapScript1_165465:: @ 8165465 - setworldmapflag 2192 - checkflag FLAG_0x291 - call_if 1, EventScript_165488 - compare_var_to_value VAR_0x4070, 0 - call_if 1, EventScript_1654A8 - compare_var_to_value VAR_0x4070, 1 - call_if 1, EventScript_1654A2 - end + setworldmapflag 2192 + checkflag FLAG_0x291 + call_if 1, EventScript_165488 + compare_var_to_value VAR_0x4070, 0 + call_if 1, EventScript_1654A8 + compare_var_to_value VAR_0x4070, 1 + call_if 1, EventScript_1654A2 + end EventScript_165488:: @ 8165488 - checkflag 2110 - goto_if 0, EventScript_1A77A9 - compare_var_to_value VAR_0x4070, 1 - goto_if 4, EventScript_1A77A9 - setvar VAR_0x4070, 1 - return + checkflag 2110 + goto_if 0, EventScript_1A77A9 + compare_var_to_value VAR_0x4070, 1 + goto_if 4, EventScript_1A77A9 + setvar VAR_0x4070, 1 + return EventScript_1654A2:: @ 81654A2 - setvar VAR_0x4070, 2 - return + setvar VAR_0x4070, 2 + return EventScript_1654A8:: @ 81654A8 - checkflag FLAG_0x291 - goto_if 1, EventScript_1654BD - setobjectxyperm 1, 5, 15 - setobjectmovementtype 1, 7 - return + checkflag FLAG_0x291 + goto_if 1, EventScript_1654BD + setobjectxyperm 1, 5, 15 + setobjectmovementtype 1, 7 + return EventScript_1654BD:: @ 81654BD - setobjectxyperm 1, 12, 2 - setobjectmovementtype 1, 8 - setvar VAR_0x4002, 1 - return + setobjectxyperm 1, 12, 2 + setobjectmovementtype 1, 8 + setvar VAR_0x4002, 1 + return PalletTown_MapScript2_1654CE:: @ 81654CE - map_script_2 VAR_0x4050, 2, EventScript_1654D8 - .2byte 0 + map_script_2 VAR_0x4050, 2, EventScript_1654D8 + .2byte 0 EventScript_1654D8:: @ 81654D8 - lockall - textcolor 0 - setobjectxyperm 3, 14, 14 - setobjectmovementtype 3, 9 - addobject 3 - applymovement 3, Movement_1655AF - waitmovement 0 - checkflag FLAG_SYS_RIBBON_GET - goto_if 0, EventScript_1655A1 - loadword 0, gUnknown_817D8BF - callstd 4 - setvar VAR_0x8004, 0 - specialvar VAR_RESULT, sub_80CA3D8 - copyvar VAR_0x8008, VAR_0x8005 - copyvar VAR_0x8009, VAR_0x8006 - getnumberstring 0, VAR_0x8008 - getnumberstring 1, VAR_0x8009 - compare_var_to_value VAR_0x8009, 60 - goto_if 0, EventScript_165593 - loadword 0, gUnknown_817D9AA - callstd 4 - closemessage - playbgm BGM_FRLG_FOLLOW_ME, 0 - applymovement 255, Movement_1655DD - applymovement 3, Movement_1655CC - waitmovement 0 - opendoor 16, 13 - waitdooranim - applymovement 3, Movement_16572E - applymovement 255, Movement_165758 - waitmovement 0 - closedoor 16, 13 - waitdooranim - setvar VAR_0x4055, 7 - setvar VAR_0x4050, 3 - setflag FLAG_0x02C - warp MAP_PALLET_TOWN_PROFESSOR_OAKS_LAB, 255, 6, 12 - waitstate - releaseall - end + lockall + textcolor 0 + setobjectxyperm 3, 14, 14 + setobjectmovementtype 3, 9 + addobject 3 + applymovement 3, Movement_1655AF + waitmovement 0 + checkflag FLAG_SYS_RIBBON_GET + goto_if 0, EventScript_1655A1 + loadword 0, gUnknown_817D8BF + callstd 4 + setvar VAR_0x8004, 0 + specialvar VAR_RESULT, sub_80CA3D8 + copyvar VAR_0x8008, VAR_0x8005 + copyvar VAR_0x8009, VAR_0x8006 + getnumberstring 0, VAR_0x8008 + getnumberstring 1, VAR_0x8009 + compare_var_to_value VAR_0x8009, 60 + goto_if 0, EventScript_165593 + loadword 0, gUnknown_817D9AA + callstd 4 + closemessage + playbgm BGM_FRLG_FOLLOW_ME, 0 + applymovement 255, Movement_1655DD + applymovement 3, Movement_1655CC + waitmovement 0 + opendoor 16, 13 + waitdooranim + applymovement 3, Movement_16572E + applymovement 255, Movement_165758 + waitmovement 0 + closedoor 16, 13 + waitdooranim + setvar VAR_0x4055, 7 + setvar VAR_0x4050, 3 + setflag FLAG_0x02C + warp MAP_PALLET_TOWN_PROFESSOR_OAKS_LAB, 255, 6, 12 + waitstate + releaseall + end EventScript_16557E:: @ 816557E - closemessage - applymovement 3, Movement_1655BE - waitmovement 0 - removeobject 3 - setvar VAR_0x4050, 3 - releaseall - end + closemessage + applymovement 3, Movement_1655BE + waitmovement 0 + removeobject 3 + setvar VAR_0x4050, 3 + releaseall + end EventScript_165593:: @ 8165593 - loadword 0, gUnknown_817D925 - callstd 4 - goto EventScript_16557E - end + loadword 0, gUnknown_817D925 + callstd 4 + goto EventScript_16557E + end EventScript_1655A1:: @ 81655A1 - loadword 0, gUnknown_817DA16 - callstd 4 - goto EventScript_16557E - end + loadword 0, gUnknown_817DA16 + callstd 4 + goto EventScript_16557E + end Movement_1655AF:: @ 81655AF - step_12 - step_12 - step_12 - step_11 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_2e - step_end + step_12 + step_12 + step_12 + step_11 + step_11 + step_11 + step_11 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_2e + step_end Movement_1655BE:: @ 81655BE - step_13 - step_13 - step_13 - step_13 - step_13 - step_10 - step_10 - step_10 - step_10 - step_10 - step_13 - step_13 - step_13 - step_end + step_13 + step_13 + step_13 + step_13 + step_13 + step_10 + step_10 + step_10 + step_10 + step_10 + step_13 + step_13 + step_13 + step_end Movement_1655CC:: @ 81655CC - step_13 - step_13 - step_13 - step_13 - step_13 - step_10 - step_10 - step_10 - step_10 - step_10 - step_13 - step_13 - step_13 - step_13 - step_13 - step_2e - step_end + step_13 + step_13 + step_13 + step_13 + step_13 + step_10 + step_10 + step_10 + step_10 + step_10 + step_13 + step_13 + step_13 + step_13 + step_13 + step_2e + step_end Movement_1655DD:: @ 81655DD - step_10 - step_13 - step_13 - step_13 - step_13 - step_13 - step_10 - step_10 - step_10 - step_10 - step_10 - step_13 - step_13 - step_13 - step_13 - step_end + step_10 + step_13 + step_13 + step_13 + step_13 + step_13 + step_10 + step_10 + step_10 + step_10 + step_10 + step_13 + step_13 + step_13 + step_13 + step_end PalletTown_EventScript_1655ED:: @ 81655ED - lockall - setvar VAR_0x4001, 0 - goto EventScript_165605 - end + lockall + setvar VAR_0x4001, 0 + goto EventScript_165605 + end PalletTown_EventScript_1655F9:: @ 81655F9 - lockall - setvar VAR_0x4001, 1 - goto EventScript_165605 - end + lockall + setvar VAR_0x4001, 1 + goto EventScript_165605 + end EventScript_165605:: @ 8165605 - setvar VAR_0x8004, 0 - setvar VAR_0x8005, 2 - special UpdatePickStateFromSpecialVar8005 - textcolor 0 - delay 30 - playbgm BGM_FRLG_PROF_OAK, 0 - message Text_17D72C - waitmessage - delay 85 - closemessage - applymovement 255, Movement_1A75ED - waitmovement 0 - playse SE_PIN - applymovement 255, Movement_1A75DB - waitmovement 0 - delay 30 - addobject 3 - compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_1656B8 - compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_1656C3 - delay 30 - loadword 0, gUnknown_817D74A - callstd 4 - closemessage - delay 30 - compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_1656CE - compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_1656E0 - opendoor 16, 13 - waitdooranim - applymovement 3, Movement_16572E - applymovement 255, Movement_165758 - waitmovement 0 - closedoor 16, 13 - waitdooranim - setvar VAR_0x4055, 1 - clearflag FLAG_0x02B - setvar VAR_0x4050, 1 - setflag FLAG_0x02C - setflag FLAG_SPECIAL_FLAG_0x4001 - warp MAP_PALLET_TOWN_PROFESSOR_OAKS_LAB, 255, 6, 12 - waitstate - releaseall - end + setvar VAR_0x8004, 0 + setvar VAR_0x8005, 2 + special UpdatePickStateFromSpecialVar8005 + textcolor 0 + delay 30 + playbgm BGM_FRLG_PROF_OAK, 0 + message Text_17D72C + waitmessage + delay 85 + closemessage + applymovement 255, Movement_1A75ED + waitmovement 0 + playse SE_PIN + applymovement 255, Movement_1A75DB + waitmovement 0 + delay 30 + addobject 3 + compare_var_to_value VAR_0x4001, 0 + call_if 1, EventScript_1656B8 + compare_var_to_value VAR_0x4001, 1 + call_if 1, EventScript_1656C3 + delay 30 + loadword 0, gUnknown_817D74A + callstd 4 + closemessage + delay 30 + compare_var_to_value VAR_0x4001, 0 + call_if 1, EventScript_1656CE + compare_var_to_value VAR_0x4001, 1 + call_if 1, EventScript_1656E0 + opendoor 16, 13 + waitdooranim + applymovement 3, Movement_16572E + applymovement 255, Movement_165758 + waitmovement 0 + closedoor 16, 13 + waitdooranim + setvar VAR_0x4055, 1 + clearflag FLAG_0x02B + setvar VAR_0x4050, 1 + setflag FLAG_0x02C + setflag FLAG_SPECIAL_FLAG_0x4001 + warp MAP_PALLET_TOWN_PROFESSOR_OAKS_LAB, 255, 6, 12 + waitstate + releaseall + end EventScript_1656B8:: @ 81656B8 - applymovement 3, Movement_1656F2 - waitmovement 0 - return + applymovement 3, Movement_1656F2 + waitmovement 0 + return EventScript_1656C3:: @ 81656C3 - applymovement 3, Movement_1656FB - waitmovement 0 - return + applymovement 3, Movement_1656FB + waitmovement 0 + return EventScript_1656CE:: @ 81656CE - applymovement 3, Movement_165705 - applymovement 255, Movement_165731 - waitmovement 0 - return + applymovement 3, Movement_165705 + applymovement 255, Movement_165731 + waitmovement 0 + return EventScript_1656E0:: @ 81656E0 - applymovement 3, Movement_165719 - applymovement 255, Movement_165744 - waitmovement 0 - return + applymovement 3, Movement_165719 + applymovement 255, Movement_165744 + waitmovement 0 + return Movement_1656F2:: @ 81656F2 - step_11 - step_11 - step_13 - step_11 - step_11 - step_13 - step_11 - step_11 - step_end + step_11 + step_11 + step_13 + step_11 + step_11 + step_13 + step_11 + step_11 + step_end Movement_1656FB:: @ 81656FB - step_13 - step_11 - step_11 - step_13 - step_11 - step_11 - step_13 - step_11 - step_11 - step_end + step_13 + step_11 + step_11 + step_13 + step_11 + step_11 + step_13 + step_11 + step_11 + step_end Movement_165705:: @ 8165705 - step_10 - step_12 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_13 - step_13 - step_13 - step_13 - step_13 - step_2e - step_end + step_10 + step_12 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_13 + step_13 + step_13 + step_13 + step_13 + step_2e + step_end Movement_165719:: @ 8165719 - step_10 - step_12 - step_12 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_13 - step_13 - step_13 - step_13 - step_13 - step_2e - step_end + step_10 + step_12 + step_12 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_13 + step_13 + step_13 + step_13 + step_13 + step_2e + step_end Movement_16572E:: @ 816572E - step_11 - step_60 - step_end + step_11 + step_60 + step_end Movement_165731:: @ 8165731 - step_10 - step_10 - step_12 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_13 - step_13 - step_13 - step_13 - step_end + step_10 + step_10 + step_12 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_13 + step_13 + step_13 + step_13 + step_end Movement_165744:: @ 8165744 - step_10 - step_10 - step_12 - step_12 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_13 - step_13 - step_13 - step_13 - step_end + step_10 + step_10 + step_12 + step_12 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_13 + step_13 + step_13 + step_13 + step_end Movement_165758:: @ 8165758 - step_13 - step_11 - step_60 - step_end + step_13 + step_11 + step_60 + step_end PalletTown_EventScript_16575C:: @ 816575C - lock - compare_var_to_value VAR_0x4070, 2 - goto_if 1, EventScript_1657ED - compare_var_to_value VAR_0x4070, 1 - goto_if 1, EventScript_165815 - compare_var_to_value VAR_0x4002, 1 - goto_if 1, EventScript_1658C2 - checkflag FLAG_0x002 - goto_if 1, EventScript_165801 - loadword 0, gUnknown_81B1C8B - callstd 4 - applymovement 1, Movement_1A75E1 - waitmovement 0 - playse SE_PIN - applymovement 1, Movement_1A75DB - waitmovement 0 - applymovement 1, Movement_1A75DD - waitmovement 0 - loadword 0, gUnknown_81B1C9F - callstd 4 - closemessage - compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_1657D7 - compare_var_to_value VAR_FACING, 4 - call_if 5, EventScript_1657E2 - moveobjectoffscreen 1 - setflag FLAG_0x002 - release - end + lock + compare_var_to_value VAR_0x4070, 2 + goto_if 1, EventScript_1657ED + compare_var_to_value VAR_0x4070, 1 + goto_if 1, EventScript_165815 + compare_var_to_value VAR_0x4002, 1 + goto_if 1, EventScript_1658C2 + checkflag FLAG_0x002 + goto_if 1, EventScript_165801 + loadword 0, gUnknown_81B1C8B + callstd 4 + applymovement 1, Movement_1A75E1 + waitmovement 0 + playse SE_PIN + applymovement 1, Movement_1A75DB + waitmovement 0 + applymovement 1, Movement_1A75DD + waitmovement 0 + loadword 0, gUnknown_81B1C9F + callstd 4 + closemessage + compare_var_to_value VAR_FACING, 4 + call_if 1, EventScript_1657D7 + compare_var_to_value VAR_FACING, 4 + call_if 5, EventScript_1657E2 + moveobjectoffscreen 1 + setflag FLAG_0x002 + release + end EventScript_1657D7:: @ 81657D7 - applymovement 1, Movement_165829 - waitmovement 0 - return + applymovement 1, Movement_165829 + waitmovement 0 + return EventScript_1657E2:: @ 81657E2 - applymovement 1, Movement_16582C - waitmovement 0 - return + applymovement 1, Movement_16582C + waitmovement 0 + return EventScript_1657ED:: @ 81657ED - applymovement 1, Movement_1A75E1 - waitmovement 0 - loadword 0, gUnknown_817D7C8 - callstd 4 - release - end + applymovement 1, Movement_1A75E1 + waitmovement 0 + loadword 0, gUnknown_817D7C8 + callstd 4 + release + end EventScript_165801:: @ 8165801 - applymovement 1, Movement_1A75E1 - waitmovement 0 - loadword 0, gUnknown_81B1CAF - callstd 4 - release - end + applymovement 1, Movement_1A75E1 + waitmovement 0 + loadword 0, gUnknown_81B1CAF + callstd 4 + release + end EventScript_165815:: @ 8165815 - applymovement 1, Movement_1A75E1 - waitmovement 0 - loadword 0, gUnknown_81B1CEC - callstd 4 - release - end + applymovement 1, Movement_1A75E1 + waitmovement 0 + loadword 0, gUnknown_81B1CEC + callstd 4 + release + end Movement_165829:: @ 8165829 - step_13 - step_2f - step_end + step_13 + step_2f + step_end Movement_16582C:: @ 816582C - step_12 - step_30 - step_end + step_12 + step_30 + step_end PalletTown_EventScript_16582F:: @ 816582F - loadword 0, gUnknown_817D80D - callstd 2 - end + loadword 0, gUnknown_817D80D + callstd 2 + end PalletTown_EventScript_165838:: @ 8165838 - lockall - setvar VAR_0x8004, 0 - setvar VAR_0x8005, 0 - special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_817D866 - callstd 4 - releaseall - end + lockall + setvar VAR_0x8004, 0 + setvar VAR_0x8005, 0 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_817D866 + callstd 4 + releaseall + end PalletTown_EventScript_165850:: @ 8165850 - loadword 0, gUnknown_817D87F - callstd 3 - end + loadword 0, gUnknown_817D87F + callstd 3 + end PalletTown_EventScript_165859:: @ 8165859 - loadword 0, gUnknown_817D88A - callstd 3 - end + loadword 0, gUnknown_817D88A + callstd 3 + end PalletTown_EventScript_165862:: @ 8165862 - loadword 0, gUnknown_817D895 - callstd 3 - end + loadword 0, gUnknown_817D895 + callstd 3 + end PalletTown_EventScript_16586B:: @ 816586B - lockall - loadword 0, gUnknown_81B1CC1 - callstd 4 - setvar VAR_0x4070, 1 - releaseall - end + lockall + loadword 0, gUnknown_81B1CC1 + callstd 4 + setvar VAR_0x4070, 1 + releaseall + end PalletTown_EventScript_16587B:: @ 816587B - lockall - applymovement 1, Movement_1A75EB - applymovement 255, Movement_1A75E7 - waitmovement 0 - call EventScript_165894 - releaseall - end + lockall + applymovement 1, Movement_1A75EB + applymovement 255, Movement_1A75E7 + waitmovement 0 + call EventScript_165894 + releaseall + end EventScript_165894:: @ 8165894 - textcolor 1 - loadword 0, gUnknown_81B1D0B - callstd 4 - closemessage - delay 20 - textcolor 3 - setflag 2110 - setvar VAR_0x4070, 1 - setvar VAR_0x4002, 0 - special sub_80699E0 - special sub_80699BC - signmsg - loadword 0, gUnknown_81B1D51 - callstd 4 - normalmsg - return + textcolor 1 + loadword 0, gUnknown_81B1D0B + callstd 4 + closemessage + delay 20 + textcolor 3 + setflag 2110 + setvar VAR_0x4070, 1 + setvar VAR_0x4002, 0 + special sub_80699E0 + special sub_80699BC + signmsg + loadword 0, gUnknown_81B1D51 + callstd 4 + normalmsg + return EventScript_1658C2:: @ 81658C2 - applymovement 1, Movement_1A75E1 - waitmovement 0 - call EventScript_165894 - release - end + applymovement 1, Movement_1A75E1 + waitmovement 0 + call EventScript_165894 + release + end diff --git a/data/maps/PalletTown_GarysHouse/scripts.inc b/data/maps/PalletTown_GarysHouse/scripts.inc index 668990b4a..e1adae4c1 100644 --- a/data/maps/PalletTown_GarysHouse/scripts.inc +++ b/data/maps/PalletTown_GarysHouse/scripts.inc @@ -1,217 +1,217 @@ PalletTown_GarysHouse_MapScripts:: @ 8168D27 - map_script 3, PalletTown_GarysHouse_MapScript1_168D2D - .byte 0 + map_script 3, PalletTown_GarysHouse_MapScript1_168D2D + .byte 0 PalletTown_GarysHouse_MapScript1_168D2D:: @ 8168D2D - compare_var_to_value VAR_0x4058, 2 - call_if 0, EventScript_168D44 - compare_var_to_value VAR_0x4058, 2 - call_if 4, EventScript_168D50 - end + compare_var_to_value VAR_0x4058, 2 + call_if 0, EventScript_168D44 + compare_var_to_value VAR_0x4058, 2 + call_if 4, EventScript_168D50 + end EventScript_168D44:: @ 8168D44 - setobjectmovementtype 1, 10 - setobjectxyperm 1, 5, 4 - return + setobjectmovementtype 1, 10 + setobjectxyperm 1, 5, 4 + return EventScript_168D50:: @ 8168D50 - setvar VAR_0x4001, 1 - return + setvar VAR_0x4001, 1 + return PalletTown_GarysHouse_EventScript_168D56:: @ 8168D56 - lock - faceplayer - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 2 - special UpdatePickStateFromSpecialVar8005 - checkflag 2092 - goto_if 1, EventScript_168DB9 - compare_var_to_value VAR_0x4001, 1 - goto_if 1, EventScript_168EEC - compare_var_to_value VAR_0x4058, 2 - goto_if 1, EventScript_168F59 - compare_var_to_value VAR_0x4058, 1 - goto_if 1, EventScript_168EF6 - compare_var_to_value VAR_0x4055, 1 - goto_if 4, EventScript_168DAF - loadword 0, gUnknown_818D58C - callstd 4 - closemessage - applymovement 1, Movement_1A75E5 - waitmovement 0 - release - end + lock + faceplayer + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 2 + special UpdatePickStateFromSpecialVar8005 + checkflag 2092 + goto_if 1, EventScript_168DB9 + compare_var_to_value VAR_0x4001, 1 + goto_if 1, EventScript_168EEC + compare_var_to_value VAR_0x4058, 2 + goto_if 1, EventScript_168F59 + compare_var_to_value VAR_0x4058, 1 + goto_if 1, EventScript_168EF6 + compare_var_to_value VAR_0x4055, 1 + goto_if 4, EventScript_168DAF + loadword 0, gUnknown_818D58C + callstd 4 + closemessage + applymovement 1, Movement_1A75E5 + waitmovement 0 + release + end EventScript_168DAF:: @ 8168DAF - loadword 0, gUnknown_818D5C4 - callstd 4 - release - end + loadword 0, gUnknown_818D5C4 + callstd 4 + release + end EventScript_168DB9:: @ 8168DB9 - special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 - special sub_8112364 - compare_var_to_value VAR_MIRAGE_RND_L, 500 - goto_if 0, EventScript_168E46 - loadword 0, gUnknown_818D7D3 - callstd 5 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_168E3C - loadword 0, gUnknown_818D8B2 - callstd 4 - special sub_80BF8FC - waitstate - lock - faceplayer - compare_var_to_value VAR_0x8004, 6 - goto_if 4, EventScript_168E3C - specialvar VAR_RESULT, sub_80CAD54 - compare_var_to_value VAR_RESULT, 412 - goto_if 1, EventScript_168E32 - loadword 0, gUnknown_818D8CC - callstd 4 - closemessage - fadescreen 1 - playfanfare MUS_ME_ASA - waitfanfare - special sub_80CC948 - fadescreen 0 - special TV_CopyNicknameToStringVar1AndEnsureTerminated - loadword 0, gUnknown_818D8FE - callstd 4 - release - end + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + special sub_8112364 + compare_var_to_value VAR_MIRAGE_RND_L, 500 + goto_if 0, EventScript_168E46 + loadword 0, gUnknown_818D7D3 + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_168E3C + loadword 0, gUnknown_818D8B2 + callstd 4 + special sub_80BF8FC + waitstate + lock + faceplayer + compare_var_to_value VAR_0x8004, 6 + goto_if 4, EventScript_168E3C + specialvar VAR_RESULT, sub_80CAD54 + compare_var_to_value VAR_RESULT, 412 + goto_if 1, EventScript_168E32 + loadword 0, gUnknown_818D8CC + callstd 4 + closemessage + fadescreen 1 + playfanfare MUS_ME_ASA + waitfanfare + special sub_80CC948 + fadescreen 0 + special TV_CopyNicknameToStringVar1AndEnsureTerminated + loadword 0, gUnknown_818D8FE + callstd 4 + release + end EventScript_168E32:: @ 8168E32 - loadword 0, gUnknown_818D97B - callstd 4 - release - end + loadword 0, gUnknown_818D97B + callstd 4 + release + end EventScript_168E3C:: @ 8168E3C - loadword 0, gUnknown_818D875 - callstd 4 - release - end + loadword 0, gUnknown_818D875 + callstd 4 + release + end EventScript_168E46:: @ 8168E46 - loadword 0, gUnknown_818D9A5 - callstd 4 - specialvar VAR_RESULT, sub_80CA76C - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_168EA6 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_168EB0 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_168EBA - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_168EC4 - compare_var_to_value VAR_0x8000, 4 - goto_if 1, EventScript_168ECE - compare_var_to_value VAR_0x8000, 5 - goto_if 1, EventScript_168ED8 - compare_var_to_value VAR_0x8000, 6 - goto_if 1, EventScript_168EE2 - end + loadword 0, gUnknown_818D9A5 + callstd 4 + specialvar VAR_RESULT, sub_80CA76C + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_168EA6 + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_168EB0 + compare_var_to_value VAR_0x8000, 2 + goto_if 1, EventScript_168EBA + compare_var_to_value VAR_0x8000, 3 + goto_if 1, EventScript_168EC4 + compare_var_to_value VAR_0x8000, 4 + goto_if 1, EventScript_168ECE + compare_var_to_value VAR_0x8000, 5 + goto_if 1, EventScript_168ED8 + compare_var_to_value VAR_0x8000, 6 + goto_if 1, EventScript_168EE2 + end EventScript_168EA6:: @ 8168EA6 - loadword 0, gUnknown_818DBDD - callstd 4 - release - end + loadword 0, gUnknown_818DBDD + callstd 4 + release + end EventScript_168EB0:: @ 8168EB0 - loadword 0, gUnknown_818DB88 - callstd 4 - release - end + loadword 0, gUnknown_818DB88 + callstd 4 + release + end EventScript_168EBA:: @ 8168EBA - loadword 0, gUnknown_818DB2E - callstd 4 - release - end + loadword 0, gUnknown_818DB2E + callstd 4 + release + end EventScript_168EC4:: @ 8168EC4 - loadword 0, gUnknown_818DAF3 - callstd 4 - release - end + loadword 0, gUnknown_818DAF3 + callstd 4 + release + end EventScript_168ECE:: @ 8168ECE - loadword 0, gUnknown_818DABE - callstd 4 - release - end + loadword 0, gUnknown_818DABE + callstd 4 + release + end EventScript_168ED8:: @ 8168ED8 - loadword 0, gUnknown_818DA73 - callstd 4 - release - end + loadword 0, gUnknown_818DA73 + callstd 4 + release + end EventScript_168EE2:: @ 8168EE2 - loadword 0, gUnknown_818DA16 - callstd 4 - release - end + loadword 0, gUnknown_818DA16 + callstd 4 + release + end EventScript_168EEC:: @ 8168EEC - loadword 0, gUnknown_818D701 - callstd 4 - release - end + loadword 0, gUnknown_818D701 + callstd 4 + release + end EventScript_168EF6:: @ 8168EF6 - loadword 0, gUnknown_818D60A - callstd 4 - closemessage - checkitemspace ITEM_TOWN_MAP, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_168F4F - applymovement 1, Movement_1A75EB - waitmovement 0 - removeobject 2 - setvar VAR_0x4058, 2 - delay 15 - applymovement 1, Movement_1A75E1 - waitmovement 0 - delay 12 - additem ITEM_TOWN_MAP, 1 - loadword 0, gUnknown_818D661 - setorcopyvar VAR_0x8000, 361 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 318 - callstd 9 - release - end + loadword 0, gUnknown_818D60A + callstd 4 + closemessage + checkitemspace ITEM_TOWN_MAP, 1 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_168F4F + applymovement 1, Movement_1A75EB + waitmovement 0 + removeobject 2 + setvar VAR_0x4058, 2 + delay 15 + applymovement 1, Movement_1A75E1 + waitmovement 0 + delay 12 + additem ITEM_TOWN_MAP, 1 + loadword 0, gUnknown_818D661 + setorcopyvar VAR_0x8000, 361 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 318 + callstd 9 + release + end EventScript_168F4F:: @ 8168F4F - loadword 0, gUnknown_818D684 - callstd 4 - release - end + loadword 0, gUnknown_818D684 + callstd 4 + release + end EventScript_168F59:: @ 8168F59 - loadword 0, gUnknown_818D6AF - callstd 4 - release - end + loadword 0, gUnknown_818D6AF + callstd 4 + release + end PalletTown_GarysHouse_EventScript_168F63:: @ 8168F63 - loadword 0, gUnknown_818D763 - callstd 2 - end + loadword 0, gUnknown_818D763 + callstd 2 + end PalletTown_GarysHouse_EventScript_168F6C:: @ 8168F6C - loadword 0, gUnknown_818D7A1 - callstd 3 - end + loadword 0, gUnknown_818D7A1 + callstd 3 + end PalletTown_GarysHouse_EventScript_168F75:: @ 8168F75 - loadword 0, gUnknown_818DC47 - callstd 3 - end + loadword 0, gUnknown_818DC47 + callstd 3 + end diff --git a/data/maps/PalletTown_PlayersHouse_1F/scripts.inc b/data/maps/PalletTown_PlayersHouse_1F/scripts.inc index c0a266344..3b50c5dad 100644 --- a/data/maps/PalletTown_PlayersHouse_1F/scripts.inc +++ b/data/maps/PalletTown_PlayersHouse_1F/scripts.inc @@ -1,66 +1,66 @@ PalletTown_PlayersHouse_1F_MapScripts:: @ 8168C08 - .byte 0 + .byte 0 PalletTown_PlayersHouse_1F_EventScript_168C09:: @ 8168C09 - lock - faceplayer - checkflag FLAG_0x258 - goto_if 1, EventScript_168C4A - checkplayergender - compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_168C38 - compare_var_to_value VAR_RESULT, 1 - call_if 1, EventScript_168C41 - closemessage - applymovement 1, Movement_1A75E5 - waitmovement 0 - release - end + lock + faceplayer + checkflag FLAG_0x258 + goto_if 1, EventScript_168C4A + checkplayergender + compare_var_to_value VAR_RESULT, 0 + call_if 1, EventScript_168C38 + compare_var_to_value VAR_RESULT, 1 + call_if 1, EventScript_168C41 + closemessage + applymovement 1, Movement_1A75E5 + waitmovement 0 + release + end EventScript_168C38:: @ 8168C38 - loadword 0, gUnknown_818D2F0 - callstd 4 - return + loadword 0, gUnknown_818D2F0 + callstd 4 + return EventScript_168C41:: @ 8168C41 - loadword 0, gUnknown_818D360 - callstd 4 - return + loadword 0, gUnknown_818D360 + callstd 4 + return EventScript_168C4A:: @ 8168C4A - loadword 0, gUnknown_818D3D1 - callstd 4 - closemessage - call EventScript_1A6C26 - loadword 0, gUnknown_818D3F8 - callstd 4 - release - end + loadword 0, gUnknown_818D3D1 + callstd 4 + closemessage + call EventScript_1A6C26 + loadword 0, gUnknown_818D3F8 + callstd 4 + release + end PalletTown_PlayersHouse_1F_EventScript_168C62:: @ 8168C62 - lockall - compare_var_to_value VAR_FACING, 2 - goto_if 1, EventScript_168C78 - loadword 0, gUnknown_818D4F9 - callstd 4 - releaseall - end + lockall + compare_var_to_value VAR_FACING, 2 + goto_if 1, EventScript_168C78 + loadword 0, gUnknown_818D4F9 + callstd 4 + releaseall + end EventScript_168C78:: @ 8168C78 - checkplayergender - compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_168C91 - compare_var_to_value VAR_RESULT, 1 - call_if 1, EventScript_168C9A - releaseall - end + checkplayergender + compare_var_to_value VAR_RESULT, 0 + call_if 1, EventScript_168C91 + compare_var_to_value VAR_RESULT, 1 + call_if 1, EventScript_168C9A + releaseall + end EventScript_168C91:: @ 8168C91 - loadword 0, gUnknown_818D43E - callstd 4 - return + loadword 0, gUnknown_818D43E + callstd 4 + return EventScript_168C9A:: @ 8168C9A - loadword 0, gUnknown_818D492 - callstd 4 - return + loadword 0, gUnknown_818D492 + callstd 4 + return diff --git a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc index b9e02166c..1e89902c6 100644 --- a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc +++ b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc @@ -1,59 +1,59 @@ PalletTown_PlayersHouse_2F_MapScripts:: @ 8168CA3 - map_script 3, PalletTown_PlayersHouse_2F_MapScript1_168CAE - map_script 4, PalletTown_PlayersHouse_2F_MapScript2_168CBE - .byte 0 + map_script 3, PalletTown_PlayersHouse_2F_MapScript1_168CAE + map_script 4, PalletTown_PlayersHouse_2F_MapScript2_168CBE + .byte 0 PalletTown_PlayersHouse_2F_MapScript1_168CAE:: @ 8168CAE - compare_var_to_value VAR_0x4056, 0 - call_if 1, EventScript_168CBA - end + compare_var_to_value VAR_0x4056, 0 + call_if 1, EventScript_168CBA + end EventScript_168CBA:: @ 8168CBA - setrespawn 1 - return + setrespawn 1 + return PalletTown_PlayersHouse_2F_MapScript2_168CBE:: @ 8168CBE - map_script_2 VAR_0x4056, 0, EventScript_168CC8 - .2byte 0 + map_script_2 VAR_0x4056, 0, EventScript_168CC8 + .2byte 0 EventScript_168CC8:: @ 8168CC8 - turnobject 255, 2 - setvar VAR_0x4056, 1 - end + turnobject 255, 2 + setvar VAR_0x4056, 1 + end PalletTown_PlayersHouse_2F_EventScript_168CD2:: @ 8168CD2 - loadword 0, gUnknown_818D50B - callstd 3 - end + loadword 0, gUnknown_818D50B + callstd 3 + end PalletTown_PlayersHouse_2F_EventScript_168CDB:: @ 8168CDB - loadword 0, gUnknown_818D53B - callstd 3 - end + loadword 0, gUnknown_818D53B + callstd 3 + end gUnknown_8168CE4:: @ 8168CE4 PalletTown_PlayersHouse_2F_EventScript_168CE4:: @ 8168CE4 - special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 - lockall - setvar VAR_0x8004, 32 - special sub_812B220 - setvar VAR_0x8004, 1 - special sub_80CA86C - playse SE_PC_ON - loadword 0, gUnknown_81A5420 - callstd 4 - special sub_80EB6AC - waitstate - special sub_812B35C - releaseall - end + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + lockall + setvar VAR_0x8004, 32 + special sub_812B220 + setvar VAR_0x8004, 1 + special sub_80CA86C + playse SE_PC_ON + loadword 0, gUnknown_81A5420 + callstd 4 + special sub_80EB6AC + waitstate + special sub_812B35C + releaseall + end gUnknown_8168D17:: @ 8168D17 - setvar VAR_0x8004, 1 - playse SE_PC_OFF - special sub_80CA9A8 - special sub_812B35C - releaseall - end + setvar VAR_0x8004, 1 + playse SE_PC_OFF + special sub_80CA9A8 + special sub_812B35C + releaseall + end diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc index 2308b32d2..084ad2491 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc +++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc @@ -1,1474 +1,1474 @@ PalletTown_ProfessorOaksLab_MapScripts:: @ 8168F7E - map_script 3, PalletTown_ProfessorOaksLab_MapScript1_168F8E - map_script 4, PalletTown_ProfessorOaksLab_MapScript2_168FE1 - map_script 2, PalletTown_ProfessorOaksLab_MapScript3_168FF0 - .byte 0 + map_script 3, PalletTown_ProfessorOaksLab_MapScript1_168F8E + map_script 4, PalletTown_ProfessorOaksLab_MapScript2_168FE1 + map_script 2, PalletTown_ProfessorOaksLab_MapScript3_168FF0 + .byte 0 PalletTown_ProfessorOaksLab_MapScript1_168F8E:: @ 8168F8E - setflag FLAG_0x2CF - compare_var_to_value VAR_0x4055, 1 - call_if 1, EventScript_168FC6 - compare_var_to_value VAR_0x4055, 7 - call_if 1, EventScript_168FD5 - compare_var_to_value VAR_0x4055, 8 - call_if 1, EventScript_168FC0 - checkflag FLAG_0x247 - call_if 1, EventScript_168FBC - end + setflag FLAG_0x2CF + compare_var_to_value VAR_0x4055, 1 + call_if 1, EventScript_168FC6 + compare_var_to_value VAR_0x4055, 7 + call_if 1, EventScript_168FD5 + compare_var_to_value VAR_0x4055, 8 + call_if 1, EventScript_168FC0 + checkflag FLAG_0x247 + call_if 1, EventScript_168FBC + end EventScript_168FBC:: @ 8168FBC - setflag FLAG_0x24F - return + setflag FLAG_0x24F + return EventScript_168FC0:: @ 8168FC0 - setvar VAR_0x4055, 9 - return + setvar VAR_0x4055, 9 + return EventScript_168FC6:: @ 8168FC6 - setobjectxyperm 4, 6, 11 - setobjectmovementtype 4, 7 - savebgm BGM_FRLG_PROF_OAK - return + setobjectxyperm 4, 6, 11 + setobjectmovementtype 4, 7 + savebgm BGM_FRLG_PROF_OAK + return EventScript_168FD5:: @ 8168FD5 - setobjectxyperm 4, 6, 11 - setobjectmovementtype 4, 7 - return + setobjectxyperm 4, 6, 11 + setobjectmovementtype 4, 7 + return PalletTown_ProfessorOaksLab_MapScript2_168FE1:: @ 8168FE1 - map_script_2 VAR_0x4055, 1, EventScript_168FEB - .2byte 0 + map_script_2 VAR_0x4055, 1, EventScript_168FEB + .2byte 0 EventScript_168FEB:: @ 8168FEB - turnobject 255, 2 - end + turnobject 255, 2 + end PalletTown_ProfessorOaksLab_MapScript3_168FF0:: @ 8168FF0 - map_script_2 VAR_0x4055, 1, EventScript_16923E - map_script_2 VAR_0x4055, 7, EventScript_169002 - .2byte 0 + map_script_2 VAR_0x4055, 1, EventScript_16923E + map_script_2 VAR_0x4055, 7, EventScript_169002 + .2byte 0 EventScript_169002:: @ 8169002 - lockall - setvar VAR_FACING, 2 - textcolor 0 - applymovement 4, Movement_1692B0 - waitmovement 0 - removeobject 4 - setobjectxyperm 4, 6, 3 - setobjectmovementtype 4, 8 - clearflag FLAG_0x02B - applymovement 255, Movement_1692B7 - waitmovement 0 - goto EventScript_169035 - end + lockall + setvar VAR_FACING, 2 + textcolor 0 + applymovement 4, Movement_1692B0 + waitmovement 0 + removeobject 4 + setobjectxyperm 4, 6, 3 + setobjectmovementtype 4, 8 + clearflag FLAG_0x02B + applymovement 255, Movement_1692B7 + waitmovement 0 + goto EventScript_169035 + end EventScript_169035:: @ 8169035 - loadword 0, gUnknown_818EE60 - callstd 4 - closemessage - compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_169174 - compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_1691BB - compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_169194 - compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_169194 - loadword 0, gUnknown_818EF59 - callstd 4 - fadedefaultbgm - loadword 0, gUnknown_818F004 - callstd 4 - compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_1691DB - compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_1691E6 - textcolor 3 - loadword 0, gUnknown_818F062 - callstd 4 - closemessage - call EventScript_1A6675 - compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_1691F1 - compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_1691FC - compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_169215 - compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_169227 - addobject 9 - addobject 10 - delay 30 - loadword 0, gUnknown_818F085 - callstd 4 - closemessage - removeobject 9 - removeobject 10 - delay 30 - compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_169845 - compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_169850 - compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_16985B - compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_16986D - textcolor 3 - playfanfare BGM_FRLG_ME_KEYITEM - message Text_18F0E8 - waitmessage - waitfanfare - call EventScript_1A6675 - special EnableNationalPokedex - loadword 0, gUnknown_818F103 - callstd 4 - loadword 0, gUnknown_818F1DB - callstd 4 - closemessage - playbgm BGM_FRLG_RIVAL_POSTBATTLE, 0 - compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_169B69 - compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_169B7B - compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_169B7B - compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_169B7B - removeobject 8 - fadedefaultbgm - setvar VAR_0x4055, 8 - releaseall - end + loadword 0, gUnknown_818EE60 + callstd 4 + closemessage + compare_var_to_value VAR_FACING, 2 + call_if 1, EventScript_169174 + compare_var_to_value VAR_FACING, 1 + call_if 1, EventScript_1691BB + compare_var_to_value VAR_FACING, 4 + call_if 1, EventScript_169194 + compare_var_to_value VAR_FACING, 3 + call_if 1, EventScript_169194 + loadword 0, gUnknown_818EF59 + callstd 4 + fadedefaultbgm + loadword 0, gUnknown_818F004 + callstd 4 + compare_var_to_value VAR_FACING, 2 + call_if 1, EventScript_1691DB + compare_var_to_value VAR_FACING, 3 + call_if 1, EventScript_1691E6 + textcolor 3 + loadword 0, gUnknown_818F062 + callstd 4 + closemessage + call EventScript_1A6675 + compare_var_to_value VAR_FACING, 2 + call_if 1, EventScript_1691F1 + compare_var_to_value VAR_FACING, 1 + call_if 1, EventScript_1691FC + compare_var_to_value VAR_FACING, 4 + call_if 1, EventScript_169215 + compare_var_to_value VAR_FACING, 3 + call_if 1, EventScript_169227 + addobject 9 + addobject 10 + delay 30 + loadword 0, gUnknown_818F085 + callstd 4 + closemessage + removeobject 9 + removeobject 10 + delay 30 + compare_var_to_value VAR_FACING, 2 + call_if 1, EventScript_169845 + compare_var_to_value VAR_FACING, 1 + call_if 1, EventScript_169850 + compare_var_to_value VAR_FACING, 4 + call_if 1, EventScript_16985B + compare_var_to_value VAR_FACING, 3 + call_if 1, EventScript_16986D + textcolor 3 + playfanfare BGM_FRLG_ME_KEYITEM + message Text_18F0E8 + waitmessage + waitfanfare + call EventScript_1A6675 + special EnableNationalPokedex + loadword 0, gUnknown_818F103 + callstd 4 + loadword 0, gUnknown_818F1DB + callstd 4 + closemessage + playbgm BGM_FRLG_RIVAL_POSTBATTLE, 0 + compare_var_to_value VAR_FACING, 2 + call_if 1, EventScript_169B69 + compare_var_to_value VAR_FACING, 1 + call_if 1, EventScript_169B7B + compare_var_to_value VAR_FACING, 4 + call_if 1, EventScript_169B7B + compare_var_to_value VAR_FACING, 3 + call_if 1, EventScript_169B7B + removeobject 8 + fadedefaultbgm + setvar VAR_0x4055, 8 + releaseall + end EventScript_169174:: @ 8169174 - setobjectxyperm 8, 5, 10 - addobject 8 - playbgm BGM_FRLG_RIVAL, 0 - applymovement 255, Movement_169B94 - applymovement 8, Movement_169B9D - waitmovement 0 - return + setobjectxyperm 8, 5, 10 + addobject 8 + playbgm BGM_FRLG_RIVAL, 0 + applymovement 255, Movement_169B94 + applymovement 8, Movement_169B9D + waitmovement 0 + return EventScript_169194:: @ 8169194 - setobjectxyperm 8, 6, 10 - addobject 8 - playbgm BGM_FRLG_RIVAL, 0 - applymovement 4, Movement_1A75ED - applymovement 255, Movement_169B91 - applymovement 8, Movement_169B9D - waitmovement 0 - return + setobjectxyperm 8, 6, 10 + addobject 8 + playbgm BGM_FRLG_RIVAL, 0 + applymovement 4, Movement_1A75ED + applymovement 255, Movement_169B91 + applymovement 8, Movement_169B9D + waitmovement 0 + return EventScript_1691BB:: @ 81691BB - setobjectxyperm 8, 6, 10 - addobject 8 - playbgm BGM_FRLG_RIVAL, 0 - applymovement 4, Movement_1A75ED - applymovement 8, Movement_169B9D - waitmovement 0 - return + setobjectxyperm 8, 6, 10 + addobject 8 + playbgm BGM_FRLG_RIVAL, 0 + applymovement 4, Movement_1A75ED + applymovement 8, Movement_169B9D + waitmovement 0 + return EventScript_1691DB:: @ 81691DB - applymovement 255, Movement_1A75E9 - waitmovement 0 - return + applymovement 255, Movement_1A75E9 + waitmovement 0 + return EventScript_1691E6:: @ 81691E6 - applymovement 255, Movement_1A75E7 - waitmovement 0 - return + applymovement 255, Movement_1A75E7 + waitmovement 0 + return EventScript_1691F1:: @ 81691F1 - applymovement 4, Movement_169232 - waitmovement 0 - return + applymovement 4, Movement_169232 + waitmovement 0 + return EventScript_1691FC:: @ 81691FC - applymovement 4, Movement_169238 - applymovement 255, Movement_1698C7 - applymovement 8, Movement_1698C7 - waitmovement 4 - return + applymovement 4, Movement_169238 + applymovement 255, Movement_1698C7 + applymovement 8, Movement_1698C7 + waitmovement 4 + return EventScript_169215:: @ 8169215 - applymovement 4, Movement_169232 - applymovement 255, Movement_1698C3 - waitmovement 4 - return + applymovement 4, Movement_169232 + applymovement 255, Movement_1698C3 + waitmovement 4 + return EventScript_169227:: @ 8169227 - applymovement 4, Movement_169232 - waitmovement 0 - return + applymovement 4, Movement_169232 + waitmovement 0 + return Movement_169232:: @ 8169232 - step_11 - step_12 - step_2e - step_1c - step_1a - step_end + step_11 + step_12 + step_2e + step_1c + step_1a + step_end Movement_169238:: @ 8169238 - step_12 - step_12 - step_11 - step_1c - step_1a - step_end + step_12 + step_12 + step_11 + step_1c + step_1a + step_end EventScript_16923E:: @ 816923E - lockall - textcolor 0 - applymovement 4, Movement_1692B0 - waitmovement 0 - removeobject 4 - setobjectxyperm 4, 6, 3 - setobjectmovementtype 4, 8 - clearflag FLAG_0x02B - applymovement 255, Movement_1692B7 - waitmovement 0 - applymovement 8, Movement_1A75E9 - waitmovement 0 - clearflag FLAG_SPECIAL_FLAG_0x4001 - savebgm SE_STOP - fadedefaultbgm - loadword 0, gUnknown_818DC94 - callstd 4 - closemessage - delay 60 - loadword 0, gUnknown_818DFBC - callstd 4 - closemessage - delay 30 - applymovement 8, Movement_1692C0 - waitmovement 0 - loadword 0, gUnknown_818DCB9 - callstd 4 - loadword 0, gUnknown_818E0EA - callstd 4 - setvar VAR_0x4055, 2 - releaseall - end + lockall + textcolor 0 + applymovement 4, Movement_1692B0 + waitmovement 0 + removeobject 4 + setobjectxyperm 4, 6, 3 + setobjectmovementtype 4, 8 + clearflag FLAG_0x02B + applymovement 255, Movement_1692B7 + waitmovement 0 + applymovement 8, Movement_1A75E9 + waitmovement 0 + clearflag FLAG_SPECIAL_FLAG_0x4001 + savebgm SE_STOP + fadedefaultbgm + loadword 0, gUnknown_818DC94 + callstd 4 + closemessage + delay 60 + loadword 0, gUnknown_818DFBC + callstd 4 + closemessage + delay 30 + applymovement 8, Movement_1692C0 + waitmovement 0 + loadword 0, gUnknown_818DCB9 + callstd 4 + loadword 0, gUnknown_818E0EA + callstd 4 + setvar VAR_0x4055, 2 + releaseall + end Movement_1692B0:: @ 81692B0 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_end + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_end Movement_1692B7:: @ 81692B7 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_end + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_end Movement_1692C0:: @ 81692C0 - step_26 - step_26 - step_end + step_26 + step_26 + step_end PalletTown_ProfessorOaksLab_EventScript_1692C3:: @ 81692C3 - lockall - textcolor 0 - applymovement 4, Movement_1A75F1 - waitmovement 0 - loadword 0, gUnknown_818E177 - callstd 4 - closemessage - applymovement 255, Movement_1692E5 - waitmovement 0 - releaseall - end + lockall + textcolor 0 + applymovement 4, Movement_1A75F1 + waitmovement 0 + loadword 0, gUnknown_818E177 + callstd 4 + closemessage + applymovement 255, Movement_1692E5 + waitmovement 0 + releaseall + end Movement_1692E5:: @ 81692E5 - step_11 - step_end + step_11 + step_end PalletTown_ProfessorOaksLab_EventScript_1692E7:: @ 81692E7 - lockall - setvar VAR_0x4002, 1 - goto EventScript_16930B - end + lockall + setvar VAR_0x4002, 1 + goto EventScript_16930B + end PalletTown_ProfessorOaksLab_EventScript_1692F3:: @ 81692F3 - lockall - setvar VAR_0x4002, 2 - goto EventScript_16930B - end + lockall + setvar VAR_0x4002, 2 + goto EventScript_16930B + end PalletTown_ProfessorOaksLab_EventScript_1692FF:: @ 81692FF - lockall - setvar VAR_0x4002, 3 - goto EventScript_16930B - end + lockall + setvar VAR_0x4002, 3 + goto EventScript_16930B + end EventScript_16930B:: @ 816930B - textcolor 0 - playbgm BGM_FRLG_RIVAL, 0 - applymovement 8, Movement_1A75ED - waitmovement 0 - applymovement 255, Movement_1A75E9 - waitmovement 0 - loadword 0, gUnknown_818DDA4 - callstd 4 - closemessage - applymovement 4, Movement_1A75F1 - waitmovement 0 - compare_var_to_value VAR_STARTER_MON, 0 - goto_if 1, EventScript_1693D2 - compare_var_to_value VAR_STARTER_MON, 1 - goto_if 1, EventScript_16944D - compare_var_to_value VAR_STARTER_MON, 2 - goto_if 1, EventScript_16935A - end + textcolor 0 + playbgm BGM_FRLG_RIVAL, 0 + applymovement 8, Movement_1A75ED + waitmovement 0 + applymovement 255, Movement_1A75E9 + waitmovement 0 + loadword 0, gUnknown_818DDA4 + callstd 4 + closemessage + applymovement 4, Movement_1A75F1 + waitmovement 0 + compare_var_to_value VAR_STARTER_MON, 0 + goto_if 1, EventScript_1693D2 + compare_var_to_value VAR_STARTER_MON, 1 + goto_if 1, EventScript_16944D + compare_var_to_value VAR_STARTER_MON, 2 + goto_if 1, EventScript_16935A + end EventScript_16935A:: @ 816935A - compare_var_to_value VAR_0x4002, 1 - goto_if 1, EventScript_16937C - compare_var_to_value VAR_0x4002, 2 - goto_if 1, EventScript_16938C - compare_var_to_value VAR_0x4002, 3 - goto_if 1, EventScript_16939C - end + compare_var_to_value VAR_0x4002, 1 + goto_if 1, EventScript_16937C + compare_var_to_value VAR_0x4002, 2 + goto_if 1, EventScript_16938C + compare_var_to_value VAR_0x4002, 3 + goto_if 1, EventScript_16939C + end EventScript_16937C:: @ 816937C - applymovement 8, Movement_1693C0 - waitmovement 0 - goto EventScript_1693AC - end + applymovement 8, Movement_1693C0 + waitmovement 0 + goto EventScript_1693AC + end EventScript_16938C:: @ 816938C - applymovement 8, Movement_1693C7 - waitmovement 0 - goto EventScript_1693AC - end + applymovement 8, Movement_1693C7 + waitmovement 0 + goto EventScript_1693AC + end EventScript_16939C:: @ 816939C - applymovement 8, Movement_1693CD - waitmovement 0 - goto EventScript_1693AC - end + applymovement 8, Movement_1693CD + waitmovement 0 + goto EventScript_1693AC + end EventScript_1693AC:: @ 81693AC - trainerbattle 9, 326, 3, Text_18DDEA, Text_18DE1A - goto EventScript_1694C2 - end + trainerbattle 9, 326, 3, Text_18DDEA, Text_18DE1A + goto EventScript_1694C2 + end Movement_1693C0:: @ 81693C0 - step_12 - step_12 - step_12 - step_12 - step_10 - step_10 - step_end + step_12 + step_12 + step_12 + step_12 + step_10 + step_10 + step_end Movement_1693C7:: @ 81693C7 - step_12 - step_12 - step_12 - step_10 - step_10 - step_end + step_12 + step_12 + step_12 + step_10 + step_10 + step_end Movement_1693CD:: @ 81693CD - step_12 - step_12 - step_10 - step_10 - step_end + step_12 + step_12 + step_10 + step_10 + step_end EventScript_1693D2:: @ 81693D2 - compare_var_to_value VAR_0x4002, 1 - goto_if 1, EventScript_1693F4 - compare_var_to_value VAR_0x4002, 2 - goto_if 1, EventScript_169404 - compare_var_to_value VAR_0x4002, 3 - goto_if 1, EventScript_169414 - end + compare_var_to_value VAR_0x4002, 1 + goto_if 1, EventScript_1693F4 + compare_var_to_value VAR_0x4002, 2 + goto_if 1, EventScript_169404 + compare_var_to_value VAR_0x4002, 3 + goto_if 1, EventScript_169414 + end EventScript_1693F4:: @ 81693F4 - applymovement 8, Movement_169438 - waitmovement 0 - goto EventScript_169424 - end + applymovement 8, Movement_169438 + waitmovement 0 + goto EventScript_169424 + end EventScript_169404:: @ 8169404 - applymovement 8, Movement_169440 - waitmovement 0 - goto EventScript_169424 - end + applymovement 8, Movement_169440 + waitmovement 0 + goto EventScript_169424 + end EventScript_169414:: @ 8169414 - applymovement 8, Movement_169447 - waitmovement 0 - goto EventScript_169424 - end + applymovement 8, Movement_169447 + waitmovement 0 + goto EventScript_169424 + end EventScript_169424:: @ 8169424 - trainerbattle 9, 328, 3, Text_18DDEA, Text_18DE1A - goto EventScript_1694C2 - end + trainerbattle 9, 328, 3, Text_18DDEA, Text_18DE1A + goto EventScript_1694C2 + end Movement_169438:: @ 8169438 - step_12 - step_12 - step_12 - step_12 - step_12 - step_10 - step_10 - step_end + step_12 + step_12 + step_12 + step_12 + step_12 + step_10 + step_10 + step_end Movement_169440:: @ 8169440 - step_12 - step_12 - step_12 - step_12 - step_10 - step_10 - step_end + step_12 + step_12 + step_12 + step_12 + step_10 + step_10 + step_end Movement_169447:: @ 8169447 - step_12 - step_12 - step_12 - step_10 - step_10 - step_end + step_12 + step_12 + step_12 + step_10 + step_10 + step_end EventScript_16944D:: @ 816944D - compare_var_to_value VAR_0x4002, 1 - goto_if 1, EventScript_16946F - compare_var_to_value VAR_0x4002, 2 - goto_if 1, EventScript_16947F - compare_var_to_value VAR_0x4002, 3 - goto_if 1, EventScript_16948F - end + compare_var_to_value VAR_0x4002, 1 + goto_if 1, EventScript_16946F + compare_var_to_value VAR_0x4002, 2 + goto_if 1, EventScript_16947F + compare_var_to_value VAR_0x4002, 3 + goto_if 1, EventScript_16948F + end EventScript_16946F:: @ 816946F - applymovement 8, Movement_1694B3 - waitmovement 0 - goto EventScript_16949F - end + applymovement 8, Movement_1694B3 + waitmovement 0 + goto EventScript_16949F + end EventScript_16947F:: @ 816947F - applymovement 8, Movement_1694B9 - waitmovement 0 - goto EventScript_16949F - end + applymovement 8, Movement_1694B9 + waitmovement 0 + goto EventScript_16949F + end EventScript_16948F:: @ 816948F - applymovement 8, Movement_1694BE - waitmovement 0 - goto EventScript_16949F - end + applymovement 8, Movement_1694BE + waitmovement 0 + goto EventScript_16949F + end EventScript_16949F:: @ 816949F - trainerbattle 9, 327, 3, Text_18DDEA, Text_18DE1A - goto EventScript_1694C2 - end + trainerbattle 9, 327, 3, Text_18DDEA, Text_18DE1A + goto EventScript_1694C2 + end Movement_1694B3:: @ 81694B3 - step_12 - step_12 - step_12 - step_10 - step_10 - step_end + step_12 + step_12 + step_12 + step_10 + step_10 + step_end Movement_1694B9:: @ 81694B9 - step_12 - step_12 - step_10 - step_10 - step_end + step_12 + step_12 + step_10 + step_10 + step_end Movement_1694BE:: @ 81694BE - step_12 - step_10 - step_10 - step_end + step_12 + step_10 + step_10 + step_end EventScript_1694C2:: @ 81694C2 - special sp000_heal_pokemon - loadword 0, gUnknown_818DE38 - callstd 4 - closemessage - playbgm BGM_FRLG_RIVAL_POSTBATTLE, 0 - compare_var_to_value VAR_0x4002, 1 - call_if 1, EventScript_169504 - compare_var_to_value VAR_0x4002, 2 - call_if 1, EventScript_169516 - compare_var_to_value VAR_0x4002, 3 - call_if 1, EventScript_169528 - removeobject 8 - playse SE_KAIDAN - fadedefaultbgm - setvar VAR_0x4055, 4 - setflag FLAG_0x258 - releaseall - end + special sp000_heal_pokemon + loadword 0, gUnknown_818DE38 + callstd 4 + closemessage + playbgm BGM_FRLG_RIVAL_POSTBATTLE, 0 + compare_var_to_value VAR_0x4002, 1 + call_if 1, EventScript_169504 + compare_var_to_value VAR_0x4002, 2 + call_if 1, EventScript_169516 + compare_var_to_value VAR_0x4002, 3 + call_if 1, EventScript_169528 + removeobject 8 + playse SE_KAIDAN + fadedefaultbgm + setvar VAR_0x4055, 4 + setflag FLAG_0x258 + releaseall + end EventScript_169504:: @ 8169504 - applymovement 8, Movement_16953A - applymovement 255, Movement_169553 - waitmovement 8 - return + applymovement 8, Movement_16953A + applymovement 255, Movement_169553 + waitmovement 8 + return EventScript_169516:: @ 8169516 - applymovement 8, Movement_16954A - applymovement 255, Movement_169553 - waitmovement 8 - return + applymovement 8, Movement_16954A + applymovement 255, Movement_169553 + waitmovement 8 + return EventScript_169528:: @ 8169528 - applymovement 8, Movement_169542 - applymovement 255, Movement_169559 - waitmovement 8 - return + applymovement 8, Movement_169542 + applymovement 255, Movement_169559 + waitmovement 8 + return Movement_16953A:: @ 816953A - step_13 - step_10 - step_10 - step_10 - step_10 - step_10 - step_1b - step_end + step_13 + step_10 + step_10 + step_10 + step_10 + step_10 + step_1b + step_end Movement_169542:: @ 8169542 - step_12 - step_10 - step_10 - step_10 - step_10 - step_10 - step_1b - step_end + step_12 + step_10 + step_10 + step_10 + step_10 + step_10 + step_1b + step_end Movement_16954A:: @ 816954A - step_13 - step_10 - step_10 - step_10 - step_12 - step_10 - step_10 - step_1b - step_end + step_13 + step_10 + step_10 + step_10 + step_12 + step_10 + step_10 + step_1b + step_end Movement_169553:: @ 8169553 - step_1c - step_1b - step_30 - step_1c - step_2d - step_end + step_1c + step_1b + step_30 + step_1c + step_2d + step_end Movement_169559:: @ 8169559 - step_1c - step_1b - step_2f - step_1c - step_2d - step_end + step_1c + step_1b + step_2f + step_1c + step_2d + step_end PalletTown_ProfessorOaksLab_EventScript_16955F:: @ 816955F - lock - faceplayer - compare_var_to_value VAR_0x4055, 3 - goto_if 1, EventScript_16958B - compare_var_to_value VAR_0x4055, 2 - goto_if 1, EventScript_169581 - loadword 0, gUnknown_818DC67 - callstd 4 - release - end + lock + faceplayer + compare_var_to_value VAR_0x4055, 3 + goto_if 1, EventScript_16958B + compare_var_to_value VAR_0x4055, 2 + goto_if 1, EventScript_169581 + loadword 0, gUnknown_818DC67 + callstd 4 + release + end EventScript_169581:: @ 8169581 - loadword 0, gUnknown_818DCE2 - callstd 4 - release - end + loadword 0, gUnknown_818DCE2 + callstd 4 + release + end EventScript_16958B:: @ 816958B - loadword 0, gUnknown_818DD75 - callstd 4 - release - end + loadword 0, gUnknown_818DD75 + callstd 4 + release + end PalletTown_ProfessorOaksLab_EventScript_169595:: @ 8169595 - lock - faceplayer - checkflag FLAG_0x002 - goto_if 1, EventScript_169600 - compare_var_to_value VAR_0x4055, 9 - goto_if 1, EventScript_169903 - compare_var_to_value VAR_0x4055, 8 - goto_if 1, EventScript_169A6E - checkflag 2092 - goto_if 1, EventScript_1699CE - compare_var_to_value VAR_0x4052, 1 - goto_if 1, EventScript_169903 - compare_var_to_value VAR_0x4055, 6 - goto_if 1, EventScript_1698D6 - compare_var_to_value VAR_0x4057, 1 - goto_if 4, EventScript_16961E - compare_var_to_value VAR_0x4055, 4 - goto_if 1, EventScript_169614 - compare_var_to_value VAR_0x4055, 3 - goto_if 1, EventScript_16960A - loadword 0, gUnknown_818E116 - callstd 4 - release - end + lock + faceplayer + checkflag FLAG_0x002 + goto_if 1, EventScript_169600 + compare_var_to_value VAR_0x4055, 9 + goto_if 1, EventScript_169903 + compare_var_to_value VAR_0x4055, 8 + goto_if 1, EventScript_169A6E + checkflag 2092 + goto_if 1, EventScript_1699CE + compare_var_to_value VAR_0x4052, 1 + goto_if 1, EventScript_169903 + compare_var_to_value VAR_0x4055, 6 + goto_if 1, EventScript_1698D6 + compare_var_to_value VAR_0x4057, 1 + goto_if 4, EventScript_16961E + compare_var_to_value VAR_0x4055, 4 + goto_if 1, EventScript_169614 + compare_var_to_value VAR_0x4055, 3 + goto_if 1, EventScript_16960A + loadword 0, gUnknown_818E116 + callstd 4 + release + end EventScript_169600:: @ 8169600 - loadword 0, gUnknown_81A72AD - callstd 4 - release - end + loadword 0, gUnknown_81A72AD + callstd 4 + release + end EventScript_16960A:: @ 816960A - loadword 0, gUnknown_818E330 - callstd 4 - release - end + loadword 0, gUnknown_818E330 + callstd 4 + release + end EventScript_169614:: @ 8169614 - loadword 0, gUnknown_818E3AD - callstd 4 - release - end + loadword 0, gUnknown_818E3AD + callstd 4 + release + end EventScript_16961E:: @ 816961E - loadword 0, gUnknown_818E405 - callstd 4 - textcolor 3 - playfanfare MUS_ME_WAZA - message Text_18E4AF - waitmessage - waitfanfare - call EventScript_1A6675 - removeitem ITEM_OAKS_PARCEL, 1 - loadword 0, gUnknown_818E4CA - callstd 4 - playbgm BGM_FRLG_RIVAL, 0 - loadword 0, gUnknown_818DE8D - callstd 4 - closemessage - compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_169A82 - compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_169AC1 - compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_169A9E - compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_169A9E - fadedefaultbgm - loadword 0, gUnknown_818DE99 - callstd 4 - closemessage - delay 30 - playse SE_PIN - applymovement 4, Movement_1A75DB - waitmovement 0 - applymovement 4, Movement_1A75DD - waitmovement 0 - compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_169ADD - compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_169B14 - compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_169AF5 - compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_169B86 - loadword 0, gUnknown_818E508 - callstd 4 - closemessage - compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_169882 - compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_16988D - compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_1698A6 - compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_1698B8 - loadword 0, gUnknown_818E536 - callstd 4 - closemessage - delay 40 - loadword 0, gUnknown_818E5C5 - callstd 4 - closemessage - applymovement 4, Movement_1A75E9 - waitmovement 0 - removeobject 9 - delay 10 - removeobject 10 - delay 25 - compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_169845 - compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_169850 - compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_16985B - compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_16986D - delay 10 - textcolor 3 - playfanfare BGM_FRLG_ME_KEYITEM - message Text_18E5EA - waitmessage - waitfanfare - call EventScript_1A6675 - setflag 2089 - special sub_810B810 - setvar VAR_0x407C, 1 - loadword 0, gUnknown_818E612 - callstd 4 - additem ITEM_POKE_BALL, 5 - loadword 0, gUnknown_818E6B3 - setorcopyvar VAR_0x8000, 4 - setorcopyvar VAR_0x8001, 5 - setorcopyvar VAR_0x8002, 257 - callstd 9 - loadword 0, gUnknown_818E6D0 - callstd 4 - setvar VAR_0x8004, 0 - setvar VAR_0x8005, 1 - special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_818E784 - callstd 4 - loadword 0, gUnknown_818DEC8 - callstd 4 - compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_169B33 - compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_169B45 - compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_169B57 - compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_169B57 - loadword 0, gUnknown_818DEF3 - callstd 4 - closemessage - playbgm BGM_FRLG_RIVAL_POSTBATTLE, 0 - compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_169B69 - compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_169B7B - compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_169B7B - compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_169B7B - removeobject 8 - fadedefaultbgm - setvar VAR_0x4055, 6 - setvar VAR_0x4057, 2 - setvar VAR_0x4051, 1 - setvar VAR_0x4058, 1 - setvar VAR_0x4054, 1 - release - end + loadword 0, gUnknown_818E405 + callstd 4 + textcolor 3 + playfanfare MUS_ME_WAZA + message Text_18E4AF + waitmessage + waitfanfare + call EventScript_1A6675 + removeitem ITEM_OAKS_PARCEL, 1 + loadword 0, gUnknown_818E4CA + callstd 4 + playbgm BGM_FRLG_RIVAL, 0 + loadword 0, gUnknown_818DE8D + callstd 4 + closemessage + compare_var_to_value VAR_FACING, 2 + call_if 1, EventScript_169A82 + compare_var_to_value VAR_FACING, 1 + call_if 1, EventScript_169AC1 + compare_var_to_value VAR_FACING, 4 + call_if 1, EventScript_169A9E + compare_var_to_value VAR_FACING, 3 + call_if 1, EventScript_169A9E + fadedefaultbgm + loadword 0, gUnknown_818DE99 + callstd 4 + closemessage + delay 30 + playse SE_PIN + applymovement 4, Movement_1A75DB + waitmovement 0 + applymovement 4, Movement_1A75DD + waitmovement 0 + compare_var_to_value VAR_FACING, 1 + call_if 1, EventScript_169ADD + compare_var_to_value VAR_FACING, 4 + call_if 1, EventScript_169B14 + compare_var_to_value VAR_FACING, 3 + call_if 1, EventScript_169AF5 + compare_var_to_value VAR_FACING, 2 + call_if 1, EventScript_169B86 + loadword 0, gUnknown_818E508 + callstd 4 + closemessage + compare_var_to_value VAR_FACING, 2 + call_if 1, EventScript_169882 + compare_var_to_value VAR_FACING, 1 + call_if 1, EventScript_16988D + compare_var_to_value VAR_FACING, 4 + call_if 1, EventScript_1698A6 + compare_var_to_value VAR_FACING, 3 + call_if 1, EventScript_1698B8 + loadword 0, gUnknown_818E536 + callstd 4 + closemessage + delay 40 + loadword 0, gUnknown_818E5C5 + callstd 4 + closemessage + applymovement 4, Movement_1A75E9 + waitmovement 0 + removeobject 9 + delay 10 + removeobject 10 + delay 25 + compare_var_to_value VAR_FACING, 2 + call_if 1, EventScript_169845 + compare_var_to_value VAR_FACING, 1 + call_if 1, EventScript_169850 + compare_var_to_value VAR_FACING, 4 + call_if 1, EventScript_16985B + compare_var_to_value VAR_FACING, 3 + call_if 1, EventScript_16986D + delay 10 + textcolor 3 + playfanfare BGM_FRLG_ME_KEYITEM + message Text_18E5EA + waitmessage + waitfanfare + call EventScript_1A6675 + setflag 2089 + special sub_810B810 + setvar VAR_0x407C, 1 + loadword 0, gUnknown_818E612 + callstd 4 + additem ITEM_POKE_BALL, 5 + loadword 0, gUnknown_818E6B3 + setorcopyvar VAR_0x8000, 4 + setorcopyvar VAR_0x8001, 5 + setorcopyvar VAR_0x8002, 257 + callstd 9 + loadword 0, gUnknown_818E6D0 + callstd 4 + setvar VAR_0x8004, 0 + setvar VAR_0x8005, 1 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_818E784 + callstd 4 + loadword 0, gUnknown_818DEC8 + callstd 4 + compare_var_to_value VAR_FACING, 2 + call_if 1, EventScript_169B33 + compare_var_to_value VAR_FACING, 1 + call_if 1, EventScript_169B45 + compare_var_to_value VAR_FACING, 4 + call_if 1, EventScript_169B57 + compare_var_to_value VAR_FACING, 3 + call_if 1, EventScript_169B57 + loadword 0, gUnknown_818DEF3 + callstd 4 + closemessage + playbgm BGM_FRLG_RIVAL_POSTBATTLE, 0 + compare_var_to_value VAR_FACING, 2 + call_if 1, EventScript_169B69 + compare_var_to_value VAR_FACING, 1 + call_if 1, EventScript_169B7B + compare_var_to_value VAR_FACING, 4 + call_if 1, EventScript_169B7B + compare_var_to_value VAR_FACING, 3 + call_if 1, EventScript_169B7B + removeobject 8 + fadedefaultbgm + setvar VAR_0x4055, 6 + setvar VAR_0x4057, 2 + setvar VAR_0x4051, 1 + setvar VAR_0x4058, 1 + setvar VAR_0x4054, 1 + release + end EventScript_169845:: @ 8169845 - applymovement 4, Movement_16987C - waitmovement 0 - return + applymovement 4, Movement_16987C + waitmovement 0 + return EventScript_169850:: @ 8169850 - applymovement 4, Movement_16987F - waitmovement 0 - return + applymovement 4, Movement_16987F + waitmovement 0 + return EventScript_16985B:: @ 816985B - applymovement 4, Movement_16987C - applymovement 255, Movement_169878 - waitmovement 0 - return + applymovement 4, Movement_16987C + applymovement 255, Movement_169878 + waitmovement 0 + return EventScript_16986D:: @ 816986D - applymovement 4, Movement_16987C - waitmovement 0 - return + applymovement 4, Movement_16987C + waitmovement 0 + return Movement_169878:: @ 8169878 - step_1c - step_1b - step_30 - step_end + step_1c + step_1b + step_30 + step_end Movement_16987C:: @ 816987C - step_13 - step_10 - step_end + step_13 + step_10 + step_end Movement_16987F:: @ 816987F - step_10 - step_13 - step_end + step_10 + step_13 + step_end EventScript_169882:: @ 8169882 - applymovement 4, Movement_1698CB - waitmovement 0 - return + applymovement 4, Movement_1698CB + waitmovement 0 + return EventScript_16988D:: @ 816988D - applymovement 4, Movement_1698D0 - applymovement 255, Movement_1698C7 - applymovement 8, Movement_1698C7 - waitmovement 4 - return + applymovement 4, Movement_1698D0 + applymovement 255, Movement_1698C7 + applymovement 8, Movement_1698C7 + waitmovement 4 + return EventScript_1698A6:: @ 81698A6 - applymovement 4, Movement_1698CB - applymovement 255, Movement_1698C3 - waitmovement 4 - return + applymovement 4, Movement_1698CB + applymovement 255, Movement_1698C3 + waitmovement 4 + return EventScript_1698B8:: @ 81698B8 - applymovement 4, Movement_1698CB - waitmovement 0 - return + applymovement 4, Movement_1698CB + waitmovement 0 + return Movement_1698C3:: @ 81698C3 - step_1c - step_1b - step_2e - step_end + step_1c + step_1b + step_2e + step_end Movement_1698C7:: @ 81698C7 - step_1c - step_1b - step_2f - step_end + step_1c + step_1b + step_2f + step_end Movement_1698CB:: @ 81698CB - step_11 - step_12 - step_1c - step_2d - step_end + step_11 + step_12 + step_1c + step_2d + step_end Movement_1698D0:: @ 81698D0 - step_12 - step_12 - step_11 - step_1c - step_30 - step_end + step_12 + step_12 + step_11 + step_1c + step_30 + step_end EventScript_1698D6:: @ 81698D6 - setvar VAR_0x8004, 0 - specialvar VAR_RESULT, sub_80CA3D8 - copyvar VAR_0x8008, VAR_0x8005 - copyvar VAR_0x8009, VAR_0x8006 - getnumberstring 0, VAR_0x8008 - getnumberstring 1, VAR_0x8009 - compare_var_to_value VAR_0x8009, 1 - goto_if 1, EventScript_1699FB - goto EventScript_169903 - end + setvar VAR_0x8004, 0 + specialvar VAR_RESULT, sub_80CA3D8 + copyvar VAR_0x8008, VAR_0x8005 + copyvar VAR_0x8009, VAR_0x8006 + getnumberstring 0, VAR_0x8008 + getnumberstring 1, VAR_0x8009 + compare_var_to_value VAR_0x8009, 1 + goto_if 1, EventScript_1699FB + goto EventScript_169903 + end EventScript_169903:: @ 8169903 - call EventScript_1A737B - checkflag FLAG_0x2F4 - goto_if 1, EventScript_169913 - release - end + call EventScript_1A737B + checkflag FLAG_0x2F4 + goto_if 1, EventScript_169913 + release + end EventScript_169913:: @ 8169913 - closemessage - delay 40 - message Text_1A7291 - waitmessage - compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_169964 - compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_16996F - compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_16997A - compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_169985 - applymovement 4, Movement_1A75E1 - waitmovement 0 - closemessage - delay 70 - loadword 0, gUnknown_81A72AD - callstd 4 - setflag FLAG_0x002 - release - end + closemessage + delay 40 + message Text_1A7291 + waitmessage + compare_var_to_value VAR_FACING, 2 + call_if 1, EventScript_169964 + compare_var_to_value VAR_FACING, 1 + call_if 1, EventScript_16996F + compare_var_to_value VAR_FACING, 4 + call_if 1, EventScript_16997A + compare_var_to_value VAR_FACING, 3 + call_if 1, EventScript_169985 + applymovement 4, Movement_1A75E1 + waitmovement 0 + closemessage + delay 70 + loadword 0, gUnknown_81A72AD + callstd 4 + setflag FLAG_0x002 + release + end EventScript_169964:: @ 8169964 - applymovement 4, Movement_169990 - waitmovement 0 - return + applymovement 4, Movement_169990 + waitmovement 0 + return EventScript_16996F:: @ 816996F - applymovement 4, Movement_169997 - waitmovement 0 - return + applymovement 4, Movement_169997 + waitmovement 0 + return EventScript_16997A:: @ 816997A - applymovement 4, Movement_16999E - waitmovement 0 - return + applymovement 4, Movement_16999E + waitmovement 0 + return EventScript_169985:: @ 8169985 - applymovement 4, Movement_1699A5 - waitmovement 0 - return + applymovement 4, Movement_1699A5 + waitmovement 0 + return Movement_169990:: @ 8169990 - step_25 - step_29 - step_25 - step_25 - step_29 - step_25 - step_end + step_25 + step_29 + step_25 + step_25 + step_29 + step_25 + step_end Movement_169997:: @ 8169997 - step_26 - step_2a - step_26 - step_26 - step_2a - step_26 - step_end + step_26 + step_2a + step_26 + step_26 + step_2a + step_26 + step_end Movement_16999E:: @ 816999E - step_27 - step_2b - step_27 - step_27 - step_2b - step_27 - step_end + step_27 + step_2b + step_27 + step_27 + step_2b + step_27 + step_end Movement_1699A5:: @ 81699A5 - step_28 - step_2c - step_28 - step_28 - step_2c - step_28 - step_end + step_28 + step_2c + step_28 + step_28 + step_2c + step_28 + step_end Movement_1699AC:: @ 81699AC - step_12 - step_2d - step_1b - step_30 - step_1b - step_2e - step_1b - step_2f - step_1b - step_2d - step_1b - step_13 - step_13 - step_2e - step_1b - step_2f - step_1b - step_2d - step_1b - step_30 - step_1b - step_2e - step_1b - step_12 - step_end + step_12 + step_2d + step_1b + step_30 + step_1b + step_2e + step_1b + step_2f + step_1b + step_2d + step_1b + step_13 + step_13 + step_2e + step_1b + step_2f + step_1b + step_2d + step_1b + step_30 + step_1b + step_2e + step_1b + step_12 + step_end Movement_1699C5: - step_11 - step_10 - step_10 - step_25 - step_11 - step_1c - step_1c - step_1c - step_end + step_11 + step_10 + step_10 + step_25 + step_11 + step_1c + step_1c + step_1c + step_end EventScript_1699CE:: @ 81699CE - call EventScript_1A737B - closemessage - compare_var_to_value VAR_0x8009, 60 - goto_if 0, EventScript_1699F9 - checkflag FLAG_SYS_RIBBON_GET - goto_if 0, EventScript_1699F9 - delay 30 - loadword 0, gUnknown_818EDF5 - callstd 4 - goto EventScript_169035 - end + call EventScript_1A737B + closemessage + compare_var_to_value VAR_0x8009, 60 + goto_if 0, EventScript_1699F9 + checkflag FLAG_SYS_RIBBON_GET + goto_if 0, EventScript_1699F9 + delay 30 + loadword 0, gUnknown_818EDF5 + callstd 4 + goto EventScript_169035 + end EventScript_1699F9:: @ 81699F9 - release - end + release + end EventScript_1699FB:: @ 81699FB - special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 - special sub_8112364 - checkflag FLAG_0x24F - goto_if 1, EventScript_169A6E - checkflag FLAG_0x247 - goto_if 1, EventScript_169A78 - checkitem ITEM_POKE_BALL, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_169A34 - goto EventScript_169A6E - end + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + special sub_8112364 + checkflag FLAG_0x24F + goto_if 1, EventScript_169A6E + checkflag FLAG_0x247 + goto_if 1, EventScript_169A78 + checkitem ITEM_POKE_BALL, 1 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_169A34 + goto EventScript_169A6E + end EventScript_169A34:: @ 8169A34 - compare_var_to_value VAR_0x4054, 2 - goto_if 4, EventScript_169A45 - goto EventScript_169A6E - end + compare_var_to_value VAR_0x4054, 2 + goto_if 4, EventScript_169A45 + goto EventScript_169A6E + end EventScript_169A45:: @ 8169A45 - loadword 0, gUnknown_818E89C - callstd 4 - additem ITEM_POKE_BALL, 5 - loadword 0, gUnknown_818E6B3 - setorcopyvar VAR_0x8000, 4 - setorcopyvar VAR_0x8001, 5 - setorcopyvar VAR_0x8002, 257 - callstd 9 - setflag FLAG_0x247 - release - end + loadword 0, gUnknown_818E89C + callstd 4 + additem ITEM_POKE_BALL, 5 + loadword 0, gUnknown_818E6B3 + setorcopyvar VAR_0x8000, 4 + setorcopyvar VAR_0x8001, 5 + setorcopyvar VAR_0x8002, 257 + callstd 9 + setflag FLAG_0x247 + release + end EventScript_169A6E:: @ 8169A6E - loadword 0, gUnknown_818E871 - callstd 4 - release - end + loadword 0, gUnknown_818E871 + callstd 4 + release + end EventScript_169A78:: @ 8169A78 - loadword 0, gUnknown_818E98E - callstd 4 - release - end + loadword 0, gUnknown_818E98E + callstd 4 + release + end EventScript_169A82:: @ 8169A82 - setobjectxyperm 8, 5, 10 - addobject 8 - applymovement 255, Movement_169B94 - applymovement 8, Movement_169B9D - waitmovement 0 - return + setobjectxyperm 8, 5, 10 + addobject 8 + applymovement 255, Movement_169B94 + applymovement 8, Movement_169B9D + waitmovement 0 + return EventScript_169A9E:: @ 8169A9E - setobjectxyperm 8, 6, 10 - addobject 8 - applymovement 4, Movement_1A75ED - applymovement 255, Movement_169B91 - applymovement 8, Movement_169B9D - waitmovement 0 - return + setobjectxyperm 8, 6, 10 + addobject 8 + applymovement 4, Movement_1A75ED + applymovement 255, Movement_169B91 + applymovement 8, Movement_169B9D + waitmovement 0 + return EventScript_169AC1:: @ 8169AC1 - setobjectxyperm 8, 6, 10 - addobject 8 - applymovement 4, Movement_1A75ED - applymovement 8, Movement_169B9D - waitmovement 0 - return + setobjectxyperm 8, 6, 10 + addobject 8 + applymovement 4, Movement_1A75ED + applymovement 8, Movement_169B9D + waitmovement 0 + return EventScript_169ADD:: @ 8169ADD - applymovement 4, Movement_1A75E1 - waitmovement 0 - delay 15 - applymovement 4, Movement_1A75ED - waitmovement 0 - return + applymovement 4, Movement_1A75E1 + waitmovement 0 + delay 15 + applymovement 4, Movement_1A75ED + waitmovement 0 + return EventScript_169AF5:: @ 8169AF5 - applymovement 4, Movement_1A75E1 - waitmovement 0 - delay 15 - applymovement 255, Movement_1A75E7 - applymovement 4, Movement_1A75ED - waitmovement 0 - return + applymovement 4, Movement_1A75E1 + waitmovement 0 + delay 15 + applymovement 255, Movement_1A75E7 + applymovement 4, Movement_1A75ED + waitmovement 0 + return EventScript_169B14:: @ 8169B14 - applymovement 4, Movement_1A75E1 - waitmovement 0 - delay 15 - applymovement 255, Movement_1A75EB - applymovement 4, Movement_1A75ED - waitmovement 0 - return + applymovement 4, Movement_1A75E1 + waitmovement 0 + delay 15 + applymovement 255, Movement_1A75EB + applymovement 4, Movement_1A75ED + waitmovement 0 + return EventScript_169B33:: @ 8169B33 - applymovement 8, Movement_1A75E1 - applymovement 255, Movement_1A75E7 - waitmovement 0 - return + applymovement 8, Movement_1A75E1 + applymovement 255, Movement_1A75E7 + waitmovement 0 + return EventScript_169B45:: @ 8169B45 - applymovement 8, Movement_1A75E9 - applymovement 255, Movement_1A75ED - waitmovement 0 - return + applymovement 8, Movement_1A75E9 + applymovement 255, Movement_1A75ED + waitmovement 0 + return EventScript_169B57:: @ 8169B57 - applymovement 8, Movement_1A75E1 - applymovement 255, Movement_1A75ED - waitmovement 0 - return + applymovement 8, Movement_1A75E1 + applymovement 255, Movement_1A75ED + waitmovement 0 + return EventScript_169B69:: @ 8169B69 - applymovement 255, Movement_169B91 - applymovement 8, Movement_169BA4 - waitmovement 0 - return + applymovement 255, Movement_169B91 + applymovement 8, Movement_169BA4 + waitmovement 0 + return EventScript_169B7B:: @ 8169B7B - applymovement 8, Movement_169BA4 - waitmovement 0 - return + applymovement 8, Movement_169BA4 + waitmovement 0 + return EventScript_169B86:: @ 8169B86 - applymovement 255, Movement_1A75E9 - waitmovement 0 - return + applymovement 255, Movement_1A75E9 + waitmovement 0 + return Movement_169B91:: @ 8169B91 - step_1a - step_2d - step_end + step_1a + step_2d + step_end Movement_169B94:: @ 8169B94 - step_2d - step_1c - step_1c - step_1c - step_1c - step_1c - step_1b - step_2f - step_end + step_2d + step_1c + step_1c + step_1c + step_1c + step_1c + step_1b + step_2f + step_end Movement_169B9D:: @ 8169B9D - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_end + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_end Movement_169BA4:: @ 8169BA4 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_end + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_end PalletTown_ProfessorOaksLab_EventScript_169BAB:: @ 8169BAB - lock - faceplayer - setvar VAR_0x4001, 0 - setvar VAR_0x4002, 1 - setvar VAR_0x4003, 4 - setvar VAR_0x4004, 7 - compare_var_to_value VAR_0x4055, 3 - goto_if 4, EventScript_169DE4 - compare_var_to_value VAR_0x4055, 2 - goto_if 1, EventScript_169BE1 - loadword 0, gUnknown_818EA19 - callstd 4 - release - end + lock + faceplayer + setvar VAR_0x4001, 0 + setvar VAR_0x4002, 1 + setvar VAR_0x4003, 4 + setvar VAR_0x4004, 7 + compare_var_to_value VAR_0x4055, 3 + goto_if 4, EventScript_169DE4 + compare_var_to_value VAR_0x4055, 2 + goto_if 1, EventScript_169BE1 + loadword 0, gUnknown_818EA19 + callstd 4 + release + end EventScript_169BE1:: @ 8169BE1 - applymovement 4, Movement_1A75EF - waitmovement 0 - drawmonpic 16386, 10, 3 - textcolor 0 - compare_var_to_value VAR_0x4001, 0 - goto_if 1, EventScript_169C14 - compare_var_to_value VAR_0x4001, 1 - goto_if 1, EventScript_169C33 - compare_var_to_value VAR_0x4001, 2 - goto_if 1, EventScript_169C52 - end + applymovement 4, Movement_1A75EF + waitmovement 0 + drawmonpic 16386, 10, 3 + textcolor 0 + compare_var_to_value VAR_0x4001, 0 + goto_if 1, EventScript_169C14 + compare_var_to_value VAR_0x4001, 1 + goto_if 1, EventScript_169C33 + compare_var_to_value VAR_0x4001, 2 + goto_if 1, EventScript_169C52 + end EventScript_169C14:: @ 8169C14 - loadword 0, gUnknown_818E272 - callstd 5 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_169C74 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_169C71 - end + loadword 0, gUnknown_818E272 + callstd 5 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_169C74 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_169C71 + end EventScript_169C33:: @ 8169C33 - loadword 0, gUnknown_818E207 - callstd 5 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_169C74 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_169C71 - end + loadword 0, gUnknown_818E207 + callstd 5 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_169C74 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_169C71 + end EventScript_169C52:: @ 8169C52 - loadword 0, gUnknown_818E194 - callstd 5 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_169C74 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_169C71 - end + loadword 0, gUnknown_818E194 + callstd 5 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_169C74 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_169C71 + end EventScript_169C71:: @ 8169C71 - erasemonpic - release - end + erasemonpic + release + end EventScript_169C74:: @ 8169C74 - erasemonpic - removeobject VAR_LAST_TALKED - loadword 0, gUnknown_818E2E5 - callstd 4 - call EventScript_1A6675 - setflag 2088 - setflag FLAG_0x291 - givemon 16386, 5, ITEM_NONE, 0, 0, 0 - copyvar VAR_STARTER_MON, VAR_0x4001 - getspeciesname 0, 16386 - message Text_18E30D - waitmessage - playfanfare BGM_FRLG_ME_KEYITEM - waitfanfare - loadword 0, gUnknown_81A56A7 - callstd 5 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_169CCC - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_169CDC - end + erasemonpic + removeobject VAR_LAST_TALKED + loadword 0, gUnknown_818E2E5 + callstd 4 + call EventScript_1A6675 + setflag 2088 + setflag FLAG_0x291 + givemon 16386, 5, ITEM_NONE, 0, 0, 0 + copyvar VAR_STARTER_MON, VAR_0x4001 + getspeciesname 0, 16386 + message Text_18E30D + waitmessage + playfanfare BGM_FRLG_ME_KEYITEM + waitfanfare + loadword 0, gUnknown_81A56A7 + callstd 5 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_169CCC + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_169CDC + end EventScript_169CCC:: @ 8169CCC - setvar VAR_0x8004, 0 - call EventScript_1A74EB - goto EventScript_169CDC - end + setvar VAR_0x8004, 0 + call EventScript_1A74EB + goto EventScript_169CDC + end EventScript_169CDC:: @ 8169CDC - closemessage - compare_var_to_value VAR_0x4001, 0 - goto_if 1, EventScript_169CFF - compare_var_to_value VAR_0x4001, 1 - goto_if 1, EventScript_169D1F - compare_var_to_value VAR_0x4001, 2 - goto_if 1, EventScript_169D0F - end + closemessage + compare_var_to_value VAR_0x4001, 0 + goto_if 1, EventScript_169CFF + compare_var_to_value VAR_0x4001, 1 + goto_if 1, EventScript_169D1F + compare_var_to_value VAR_0x4001, 2 + goto_if 1, EventScript_169D0F + end EventScript_169CFF:: @ 8169CFF - applymovement 8, Movement_169D62 - waitmovement 0 - goto EventScript_169D2F - end + applymovement 8, Movement_169D62 + waitmovement 0 + goto EventScript_169D2F + end EventScript_169D0F:: @ 8169D0F - applymovement 8, Movement_169D6B - waitmovement 0 - goto EventScript_169D2F - end + applymovement 8, Movement_169D6B + waitmovement 0 + goto EventScript_169D2F + end EventScript_169D1F:: @ 8169D1F - applymovement 8, Movement_169D72 - waitmovement 0 - goto EventScript_169D2F - end + applymovement 8, Movement_169D72 + waitmovement 0 + goto EventScript_169D2F + end EventScript_169D2F:: @ 8169D2F - textcolor 0 - loadword 0, gUnknown_818DD34 - callstd 4 - removeobject VAR_0x4004 - textcolor 3 - getspeciesname 0, 16387 - message Text_18DD52 - waitmessage - playfanfare BGM_FRLG_ME_KEYITEM - waitfanfare - setvar VAR_0x4055, 3 - checkflag 2110 - call_if 1, EventScript_169D5C - release - end + textcolor 0 + loadword 0, gUnknown_818DD34 + callstd 4 + removeobject VAR_0x4004 + textcolor 3 + getspeciesname 0, 16387 + message Text_18DD52 + waitmessage + playfanfare BGM_FRLG_ME_KEYITEM + waitfanfare + setvar VAR_0x4055, 3 + checkflag 2110 + call_if 1, EventScript_169D5C + release + end EventScript_169D5C:: @ 8169D5C - setvar VAR_0x4070, 1 - return + setvar VAR_0x4070, 1 + return Movement_169D62:: @ 8169D62 - step_10 - step_10 - step_13 - step_13 - step_13 - step_13 - step_13 - step_11 - step_end + step_10 + step_10 + step_13 + step_13 + step_13 + step_13 + step_13 + step_11 + step_end Movement_169D6B:: @ 8169D6B - step_10 - step_13 - step_13 - step_13 - step_13 - step_2e - step_end + step_10 + step_13 + step_13 + step_13 + step_13 + step_2e + step_end Movement_169D72:: @ 8169D72 - step_10 - step_13 - step_13 - step_13 - step_2e - step_end + step_10 + step_13 + step_13 + step_13 + step_2e + step_end PalletTown_ProfessorOaksLab_EventScript_169D78:: @ 8169D78 - lock - faceplayer - setvar VAR_0x4001, 1 - setvar VAR_0x4002, 7 - setvar VAR_0x4003, 1 - setvar VAR_0x4004, 5 - compare_var_to_value VAR_0x4055, 3 - goto_if 4, EventScript_169DE4 - compare_var_to_value VAR_0x4055, 2 - goto_if 1, EventScript_169BE1 - loadword 0, gUnknown_818EA19 - callstd 4 - release - end + lock + faceplayer + setvar VAR_0x4001, 1 + setvar VAR_0x4002, 7 + setvar VAR_0x4003, 1 + setvar VAR_0x4004, 5 + compare_var_to_value VAR_0x4055, 3 + goto_if 4, EventScript_169DE4 + compare_var_to_value VAR_0x4055, 2 + goto_if 1, EventScript_169BE1 + loadword 0, gUnknown_818EA19 + callstd 4 + release + end PalletTown_ProfessorOaksLab_EventScript_169DAE:: @ 8169DAE - lock - faceplayer - setvar VAR_0x4001, 2 - setvar VAR_0x4002, 4 - setvar VAR_0x4003, 7 - setvar VAR_0x4004, 6 - compare_var_to_value VAR_0x4055, 3 - goto_if 4, EventScript_169DE4 - compare_var_to_value VAR_0x4055, 2 - goto_if 1, EventScript_169BE1 - loadword 0, gUnknown_818EA19 - callstd 4 - release - end + lock + faceplayer + setvar VAR_0x4001, 2 + setvar VAR_0x4002, 4 + setvar VAR_0x4003, 7 + setvar VAR_0x4004, 6 + compare_var_to_value VAR_0x4055, 3 + goto_if 4, EventScript_169DE4 + compare_var_to_value VAR_0x4055, 2 + goto_if 1, EventScript_169BE1 + loadword 0, gUnknown_818EA19 + callstd 4 + release + end EventScript_169DE4:: @ 8169DE4 - loadword 0, gUnknown_818EA45 - callstd 4 - release - end + loadword 0, gUnknown_818EA45 + callstd 4 + release + end PalletTown_ProfessorOaksLab_EventScript_169DEE:: @ 8169DEE - lock - faceplayer - checkflag 2092 - goto_if 1, EventScript_169E03 - loadword 0, gUnknown_818EBE6 - callstd 4 - release - end + lock + faceplayer + checkflag 2092 + goto_if 1, EventScript_169E03 + loadword 0, gUnknown_818EBE6 + callstd 4 + release + end EventScript_169E03:: @ 8169E03 - setvar VAR_0x8004, 0 - setvar VAR_0x8005, 5 - special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_818ED15 - callstd 4 - release - end + setvar VAR_0x8004, 0 + setvar VAR_0x8005, 5 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_818ED15 + callstd 4 + release + end PalletTown_ProfessorOaksLab_EventScript_169E1A:: @ 8169E1A - lock - faceplayer - checkflag 2092 - goto_if 1, EventScript_169E2F - loadword 0, gUnknown_818EBE6 - callstd 4 - release - end + lock + faceplayer + checkflag 2092 + goto_if 1, EventScript_169E2F + loadword 0, gUnknown_818EBE6 + callstd 4 + release + end EventScript_169E2F:: @ 8169E2F - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 0 - special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_818EC0B - callstd 4 - release - end + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 0 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_818EC0B + callstd 4 + release + end PalletTown_ProfessorOaksLab_EventScript_169E46:: @ 8169E46 - lock - faceplayer - setvar VAR_0x8004, 0 - setvar VAR_0x8005, 2 - special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_818ED81 - callstd 4 - release - end + lock + faceplayer + setvar VAR_0x8004, 0 + setvar VAR_0x8005, 2 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_818ED81 + callstd 4 + release + end PalletTown_ProfessorOaksLab_EventScript_169E5F:: @ 8169E5F - loadword 0, gUnknown_818E9E5 - callstd 2 - end + loadword 0, gUnknown_818E9E5 + callstd 2 + end PalletTown_ProfessorOaksLab_EventScript_169E68:: @ 8169E68 - loadword 0, gUnknown_818EAF4 - callstd 3 - end + loadword 0, gUnknown_818EAF4 + callstd 3 + end PalletTown_ProfessorOaksLab_EventScript_169E71:: @ 8169E71 - loadword 0, gUnknown_818EA66 - callstd 3 - end + loadword 0, gUnknown_818EA66 + callstd 3 + end PalletTown_ProfessorOaksLab_EventScript_169E7A:: @ 8169E7A - lockall - compare_var_to_value VAR_0x4055, 6 - goto_if 4, EventScript_169E90 - loadword 0, gUnknown_818EA84 - callstd 4 - releaseall - end + lockall + compare_var_to_value VAR_0x4055, 6 + goto_if 4, EventScript_169E90 + loadword 0, gUnknown_818EA84 + callstd 4 + releaseall + end EventScript_169E90:: @ 8169E90 - loadword 0, gUnknown_818EAB6 - callstd 4 - releaseall - end + loadword 0, gUnknown_818EAB6 + callstd 4 + releaseall + end diff --git a/data/maps/PewterCity/scripts.inc b/data/maps/PewterCity/scripts.inc index 25d32949d..e3afcec0f 100644 --- a/data/maps/PewterCity/scripts.inc +++ b/data/maps/PewterCity/scripts.inc @@ -1,1614 +1,1614 @@ PewterCity_MapScripts:: @ 8165B8E - map_script 3, PewterCity_MapScript1_165B94 - .byte 0 + map_script 3, PewterCity_MapScript1_165B94 + .byte 0 PewterCity_MapScript1_165B94:: @ 8165B94 - setworldmapflag 2194 - setvar VAR_0x4061, 0 - end + setworldmapflag 2194 + setvar VAR_0x4061, 0 + end PewterCity_EventScript_165B9D:: @ 8165B9D - lock - faceplayer - loadword 0, gUnknown_817E67E - callstd 4 - closemessage - playbgm BGM_FRLG_FOLLOW_ME, 0 - compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_165BD3 - loadword 0, gUnknown_817E6C7 - callstd 4 - closemessage - applymovement 5, Movement_165D83 - waitmovement 0 - fadedefaultbgm - removeobject 5 - clearflag FLAG_0x02E - release - end + lock + faceplayer + loadword 0, gUnknown_817E67E + callstd 4 + closemessage + playbgm BGM_FRLG_FOLLOW_ME, 0 + compare_var_to_value VAR_FACING, 4 + call_if 1, EventScript_165BD3 + loadword 0, gUnknown_817E6C7 + callstd 4 + closemessage + applymovement 5, Movement_165D83 + waitmovement 0 + fadedefaultbgm + removeobject 5 + clearflag FLAG_0x02E + release + end EventScript_165BD3:: @ 8165BD3 - applymovement 255, Movement_165C3C - applymovement 5, Movement_165CDE - waitmovement 0 - applymovement 255, Movement_165C41 - applymovement 5, Movement_165CE3 - waitmovement 0 - return + applymovement 255, Movement_165C3C + applymovement 5, Movement_165CDE + waitmovement 0 + applymovement 255, Movement_165C41 + applymovement 5, Movement_165CE3 + waitmovement 0 + return EventScript_165BF6:: @ 8165BF6 - applymovement 255, Movement_165C80 - applymovement 5, Movement_165D23 - waitmovement 0 - applymovement 255, Movement_165C82 - applymovement 5, Movement_165D25 - waitmovement 0 - return + applymovement 255, Movement_165C80 + applymovement 5, Movement_165D23 + waitmovement 0 + applymovement 255, Movement_165C82 + applymovement 5, Movement_165D25 + waitmovement 0 + return EventScript_165C19:: @ 8165C19 - applymovement 255, Movement_165CAF - applymovement 5, Movement_165D53 - waitmovement 0 - applymovement 255, Movement_165CB1 - applymovement 5, Movement_165D55 - waitmovement 0 - return + applymovement 255, Movement_165CAF + applymovement 5, Movement_165D53 + waitmovement 0 + applymovement 255, Movement_165CB1 + applymovement 5, Movement_165D55 + waitmovement 0 + return Movement_165C3C:: @ 8165C3C - step_1c - step_1c - step_1a - step_2d - step_end + step_1c + step_1c + step_1a + step_2d + step_end Movement_165C41:: @ 8165C41 - step_10 - step_12 - step_12 - step_12 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_end + step_10 + step_12 + step_12 + step_12 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_13 + step_13 + step_13 + step_13 + step_13 + step_13 + step_13 + step_13 + step_end Movement_165C80:: @ 8165C80 - step_1c - step_end + step_1c + step_end Movement_165C82:: @ 8165C82 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_13 - step_end + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_13 + step_end Movement_165CAF:: @ 8165CAF - step_1c - step_end + step_1c + step_end Movement_165CB1:: @ 8165CB1 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_13 - step_end + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_13 + step_end Movement_165CDE:: @ 8165CDE - step_10 - step_12 - step_2e - step_26 - step_end + step_10 + step_12 + step_2e + step_26 + step_end Movement_165CE3:: @ 8165CE3 - step_12 - step_12 - step_12 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_2f - step_end + step_12 + step_12 + step_12 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_13 + step_13 + step_13 + step_13 + step_13 + step_13 + step_13 + step_13 + step_13 + step_2f + step_end Movement_165D23:: @ 8165D23 - step_28 - step_end + step_28 + step_end Movement_165D25:: @ 8165D25 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_13 - step_13 - step_2f - step_end + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_13 + step_13 + step_2f + step_end Movement_165D53:: @ 8165D53 - step_25 - step_end + step_25 + step_end Movement_165D55:: @ 8165D55 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_13 - step_13 - step_2f - step_end + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_13 + step_13 + step_2f + step_end Movement_165D83:: @ 8165D83 - step_10 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_end + step_10 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_end PewterCity_EventScript_165D8E:: @ 8165D8E - lockall - setvar VAR_0x4001, 0 - goto EventScript_165DBE - end + lockall + setvar VAR_0x4001, 0 + goto EventScript_165DBE + end PewterCity_EventScript_165D9A:: @ 8165D9A - lockall - setvar VAR_0x4001, 1 - goto EventScript_165DBE - end + lockall + setvar VAR_0x4001, 1 + goto EventScript_165DBE + end PewterCity_EventScript_165DA6:: @ 8165DA6 - lockall - setvar VAR_0x4001, 2 - goto EventScript_165DBE - end + lockall + setvar VAR_0x4001, 2 + goto EventScript_165DBE + end PewterCity_EventScript_165DB2:: @ 8165DB2 - lockall - setvar VAR_0x4001, 3 - goto EventScript_165DBE - end + lockall + setvar VAR_0x4001, 3 + goto EventScript_165DBE + end EventScript_165DBE:: @ 8165DBE - textcolor 0 - loadword 0, gUnknown_817E67E - callstd 4 - closemessage - playbgm BGM_FRLG_FOLLOW_ME, 0 - compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_165E0A - compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_165E26 - compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_165E42 - loadword 0, gUnknown_817E6C7 - callstd 4 - closemessage - applymovement 5, Movement_165D83 - waitmovement 0 - fadedefaultbgm - removeobject 5 - clearflag FLAG_0x02E - releaseall - end + textcolor 0 + loadword 0, gUnknown_817E67E + callstd 4 + closemessage + playbgm BGM_FRLG_FOLLOW_ME, 0 + compare_var_to_value VAR_0x4001, 0 + call_if 1, EventScript_165E0A + compare_var_to_value VAR_0x4001, 1 + call_if 1, EventScript_165E26 + compare_var_to_value VAR_0x4001, 2 + call_if 1, EventScript_165E42 + loadword 0, gUnknown_817E6C7 + callstd 4 + closemessage + applymovement 5, Movement_165D83 + waitmovement 0 + fadedefaultbgm + removeobject 5 + clearflag FLAG_0x02E + releaseall + end EventScript_165E0A:: @ 8165E0A - applymovement 5, Movement_165F6C - waitmovement 0 - applymovement 255, Movement_165E7A - applymovement 5, Movement_165F7F - waitmovement 0 - return + applymovement 5, Movement_165F6C + waitmovement 0 + applymovement 255, Movement_165E7A + applymovement 5, Movement_165F7F + waitmovement 0 + return EventScript_165E26:: @ 8165E26 - applymovement 5, Movement_165F71 - waitmovement 0 - applymovement 255, Movement_165EB9 - applymovement 5, Movement_165FBF - waitmovement 0 - return + applymovement 5, Movement_165F71 + waitmovement 0 + applymovement 255, Movement_165EB9 + applymovement 5, Movement_165FBF + waitmovement 0 + return EventScript_165E42:: @ 8165E42 - applymovement 5, Movement_165F74 - waitmovement 0 - applymovement 255, Movement_165EF9 - applymovement 5, Movement_166000 - waitmovement 0 - return + applymovement 5, Movement_165F74 + waitmovement 0 + applymovement 255, Movement_165EF9 + applymovement 5, Movement_166000 + waitmovement 0 + return EventScript_165E5E:: @ 8165E5E - applymovement 5, Movement_165F78 - waitmovement 0 - applymovement 255, Movement_165F3A - applymovement 5, Movement_166042 - waitmovement 0 - return + applymovement 5, Movement_165F78 + waitmovement 0 + applymovement 255, Movement_165F3A + applymovement 5, Movement_166042 + waitmovement 0 + return Movement_165E7A:: @ 8165E7A - step_12 - step_12 - step_12 - step_12 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_end + step_12 + step_12 + step_12 + step_12 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_13 + step_13 + step_13 + step_13 + step_13 + step_13 + step_13 + step_13 + step_end Movement_165EB9:: @ 8165EB9 - step_11 - step_12 - step_12 - step_12 - step_12 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_end + step_11 + step_12 + step_12 + step_12 + step_12 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_13 + step_13 + step_13 + step_13 + step_13 + step_13 + step_13 + step_13 + step_end Movement_165EF9:: @ 8165EF9 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_end + step_11 + step_11 + step_12 + step_12 + step_12 + step_12 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_13 + step_13 + step_13 + step_13 + step_13 + step_13 + step_13 + step_13 + step_end Movement_165F3A:: @ 8165F3A - step_12 - step_12 - step_12 - step_12 - step_11 - step_12 - step_12 - step_12 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_13 - step_end + step_12 + step_12 + step_12 + step_12 + step_11 + step_12 + step_12 + step_12 + step_11 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_13 + step_end Movement_165F6C:: @ 8165F6C - step_12 - step_10 - step_30 - step_28 - step_end + step_12 + step_10 + step_30 + step_28 + step_end Movement_165F71:: @ 8165F71 - step_10 - step_25 - step_end + step_10 + step_25 + step_end Movement_165F74:: @ 8165F74 - step_10 - step_10 - step_25 - step_end + step_10 + step_10 + step_25 + step_end Movement_165F78:: @ 8165F78 - step_10 - step_10 - step_13 - step_10 - step_13 - step_28 - step_end + step_10 + step_10 + step_13 + step_10 + step_13 + step_28 + step_end Movement_165F7F:: @ 8165F7F - step_12 - step_12 - step_12 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_2f - step_end + step_12 + step_12 + step_12 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_13 + step_13 + step_13 + step_13 + step_13 + step_13 + step_13 + step_13 + step_13 + step_2f + step_end Movement_165FBF:: @ 8165FBF - step_12 - step_12 - step_12 - step_12 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_2f - step_end + step_12 + step_12 + step_12 + step_12 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_13 + step_13 + step_13 + step_13 + step_13 + step_13 + step_13 + step_13 + step_13 + step_2f + step_end Movement_166000:: @ 8166000 - step_11 - step_12 - step_12 - step_12 - step_12 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_2f - step_end + step_11 + step_12 + step_12 + step_12 + step_12 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_13 + step_13 + step_13 + step_13 + step_13 + step_13 + step_13 + step_13 + step_13 + step_2f + step_end Movement_166042:: @ 8166042 - step_12 - step_12 - step_12 - step_11 - step_12 - step_12 - step_12 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_13 - step_13 - step_2f - step_end + step_12 + step_12 + step_12 + step_11 + step_12 + step_12 + step_12 + step_11 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_13 + step_13 + step_2f + step_end PewterCity_EventScript_166075:: @ 8166075 - loadword 0, gUnknown_817E436 - callstd 2 - end + loadword 0, gUnknown_817E436 + callstd 2 + end PewterCity_EventScript_16607E:: @ 816607E - lock - faceplayer - loadword 0, gUnknown_817E53E - callstd 5 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_166136 - loadword 0, gUnknown_817E589 - callstd 4 - closemessage - delay 10 - playbgm BGM_FRLG_FOLLOW_ME, 0 - compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_1660EE - compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_166100 - compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_166112 - compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_166124 - loadword 0, gUnknown_817E5AC - callstd 4 - closemessage - delay 10 - applymovement 2, Movement_16621C - waitmovement 0 - fadedefaultbgm - removeobject 2 - clearflag FLAG_0x050 - release - end + lock + faceplayer + loadword 0, gUnknown_817E53E + callstd 5 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_166136 + loadword 0, gUnknown_817E589 + callstd 4 + closemessage + delay 10 + playbgm BGM_FRLG_FOLLOW_ME, 0 + compare_var_to_value VAR_FACING, 2 + call_if 1, EventScript_1660EE + compare_var_to_value VAR_FACING, 1 + call_if 1, EventScript_166100 + compare_var_to_value VAR_FACING, 3 + call_if 1, EventScript_166112 + compare_var_to_value VAR_FACING, 4 + call_if 1, EventScript_166124 + loadword 0, gUnknown_817E5AC + callstd 4 + closemessage + delay 10 + applymovement 2, Movement_16621C + waitmovement 0 + fadedefaultbgm + removeobject 2 + clearflag FLAG_0x050 + release + end EventScript_1660EE:: @ 81660EE - applymovement 2, Movement_16615C - applymovement 255, Movement_166140 - waitmovement 0 - return + applymovement 2, Movement_16615C + applymovement 255, Movement_166140 + waitmovement 0 + return EventScript_166100:: @ 8166100 - applymovement 2, Movement_166193 - applymovement 255, Movement_166177 - waitmovement 0 - return + applymovement 2, Movement_166193 + applymovement 255, Movement_166177 + waitmovement 0 + return EventScript_166112:: @ 8166112 - applymovement 2, Movement_1661CA - applymovement 255, Movement_1661AE - waitmovement 0 - return + applymovement 2, Movement_1661CA + applymovement 255, Movement_1661AE + waitmovement 0 + return EventScript_166124:: @ 8166124 - applymovement 2, Movement_166201 - applymovement 255, Movement_1661E5 - waitmovement 0 - return + applymovement 2, Movement_166201 + applymovement 255, Movement_1661E5 + waitmovement 0 + return EventScript_166136:: @ 8166136 - loadword 0, gUnknown_817E55C - callstd 4 - release - end + loadword 0, gUnknown_817E55C + callstd 4 + release + end Movement_166140:: @ 8166140 - step_11 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_1b - step_2e - step_end + step_11 + step_11 + step_11 + step_11 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_11 + step_11 + step_11 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_1b + step_2e + step_end Movement_16615C:: @ 816615C - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_2e - step_end + step_11 + step_11 + step_11 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_11 + step_11 + step_11 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_2e + step_end Movement_166177:: @ 8166177 - step_1c - step_1c - step_12 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_1b - step_2e - step_end + step_1c + step_1c + step_12 + step_11 + step_11 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_11 + step_11 + step_11 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_1b + step_2e + step_end Movement_166193:: @ 8166193 - step_12 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_2e - step_end + step_12 + step_11 + step_11 + step_11 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_11 + step_11 + step_11 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_2e + step_end Movement_1661AE:: @ 81661AE - step_12 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_1b - step_2e - step_end + step_12 + step_11 + step_11 + step_11 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_11 + step_11 + step_11 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_1b + step_2e + step_end Movement_1661CA:: @ 81661CA - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_2e - step_end + step_11 + step_11 + step_11 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_11 + step_11 + step_11 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_2e + step_end Movement_1661E5:: @ 81661E5 - step_13 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_1b - step_2e - step_end + step_13 + step_11 + step_11 + step_11 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_11 + step_11 + step_11 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_1b + step_2e + step_end Movement_166201:: @ 8166201 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_2e - step_end + step_11 + step_11 + step_11 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_11 + step_11 + step_11 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_2e + step_end Movement_16621C:: @ 816621C - step_10 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_10 - step_10 - step_10 - step_13 - step_13 - step_13 - step_end + step_10 + step_13 + step_13 + step_13 + step_13 + step_13 + step_13 + step_13 + step_10 + step_10 + step_10 + step_13 + step_13 + step_13 + step_end PewterCity_EventScript_16622B:: @ 816622B - lock - faceplayer - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 2 - special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_817E49F - callstd 4 - release - end + lock + faceplayer + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 2 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_817E49F + callstd 4 + release + end PewterCity_EventScript_166244:: @ 8166244 - lock - faceplayer - loadword 0, gUnknown_817E602 - callstd 5 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_166263 - loadword 0, gUnknown_817E644 - callstd 4 - release - end + lock + faceplayer + loadword 0, gUnknown_817E602 + callstd 5 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_166263 + loadword 0, gUnknown_817E644 + callstd 4 + release + end EventScript_166263:: @ 8166263 - loadword 0, gUnknown_817E626 - callstd 4 - release - end + loadword 0, gUnknown_817E626 + callstd 4 + release + end PewterCity_EventScript_16626D:: @ 816626D - loadword 0, gUnknown_817E6F6 - callstd 3 - end + loadword 0, gUnknown_817E6F6 + callstd 3 + end PewterCity_EventScript_166276:: @ 8166276 - loadword 0, gUnknown_817E748 - callstd 3 - end + loadword 0, gUnknown_817E748 + callstd 3 + end PewterCity_EventScript_16627F:: @ 816627F - loadword 0, gUnknown_817E7C5 - callstd 3 - end + loadword 0, gUnknown_817E7C5 + callstd 3 + end PewterCity_EventScript_166288:: @ 8166288 - lockall - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 0 - special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_817E7DE - callstd 4 - releaseall - end + lockall + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 0 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_817E7DE + callstd 4 + releaseall + end PewterCity_EventScript_1662A0:: @ 81662A0 - loadword 0, gUnknown_817E824 - callstd 3 - end + loadword 0, gUnknown_817E824 + callstd 3 + end PewterCity_EventScript_1662A9:: @ 81662A9 - lock - faceplayer - setvar VAR_0x4001, 0 - call EventScript_1662DE - release - end + lock + faceplayer + setvar VAR_0x4001, 0 + call EventScript_1662DE + release + end PewterCity_EventScript_1662B7:: @ 81662B7 - lockall - setvar VAR_0x4001, 1 - call EventScript_1662DE - releaseall - end + lockall + setvar VAR_0x4001, 1 + call EventScript_1662DE + releaseall + end PewterCity_EventScript_1662C4:: @ 81662C4 - lockall - setvar VAR_0x4001, 2 - call EventScript_1662DE - releaseall - end + lockall + setvar VAR_0x4001, 2 + call EventScript_1662DE + releaseall + end PewterCity_EventScript_1662D1:: @ 81662D1 - lockall - setvar VAR_0x4001, 3 - call EventScript_1662DE - releaseall - end + lockall + setvar VAR_0x4001, 3 + call EventScript_1662DE + releaseall + end EventScript_1662DE:: @ 81662DE - textcolor 0 - compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_1663CA - compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_1663CA - compare_var_to_value VAR_0x4001, 3 - call_if 1, EventScript_1663CA - waitse - playse SE_PIN - applymovement 7, Movement_1A75DB - waitmovement 0 - applymovement 7, Movement_1A75DD - waitmovement 0 - loadword 0, gUnknown_817E902 - callstd 4 - compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_1663D5 - compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_1663DA - compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_1663E6 - compare_var_to_value VAR_0x4001, 3 - call_if 1, EventScript_1663FC - loadword 0, gUnknown_817E90C - callstd 4 - textcolor 3 - playfanfare BGM_FRLG_ME_KEYITEM - message Text_17E970 - waitmessage - waitfanfare - loadword 0, gUnknown_817E99D - callstd 4 - special sub_80699BC - signmsg - loadword 0, gUnknown_817E9C7 - callstd 4 - normalmsg - call EventScript_1A6675 - loadword 0, gUnknown_817EA06 - callstd 4 - closemessage - compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_166412 - compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_16641D - compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_166428 - compare_var_to_value VAR_0x4001, 3 - call_if 1, EventScript_166433 - delay 30 - textcolor 3 - loadword 0, gUnknown_817EA36 - callstd 4 - closemessage - removeobject 7 - setflag 2095 - setvar VAR_0x406C, 2 - return + textcolor 0 + compare_var_to_value VAR_0x4001, 1 + call_if 1, EventScript_1663CA + compare_var_to_value VAR_0x4001, 2 + call_if 1, EventScript_1663CA + compare_var_to_value VAR_0x4001, 3 + call_if 1, EventScript_1663CA + waitse + playse SE_PIN + applymovement 7, Movement_1A75DB + waitmovement 0 + applymovement 7, Movement_1A75DD + waitmovement 0 + loadword 0, gUnknown_817E902 + callstd 4 + compare_var_to_value VAR_0x4001, 0 + call_if 1, EventScript_1663D5 + compare_var_to_value VAR_0x4001, 1 + call_if 1, EventScript_1663DA + compare_var_to_value VAR_0x4001, 2 + call_if 1, EventScript_1663E6 + compare_var_to_value VAR_0x4001, 3 + call_if 1, EventScript_1663FC + loadword 0, gUnknown_817E90C + callstd 4 + textcolor 3 + playfanfare BGM_FRLG_ME_KEYITEM + message Text_17E970 + waitmessage + waitfanfare + loadword 0, gUnknown_817E99D + callstd 4 + special sub_80699BC + signmsg + loadword 0, gUnknown_817E9C7 + callstd 4 + normalmsg + call EventScript_1A6675 + loadword 0, gUnknown_817EA06 + callstd 4 + closemessage + compare_var_to_value VAR_0x4001, 0 + call_if 1, EventScript_166412 + compare_var_to_value VAR_0x4001, 1 + call_if 1, EventScript_16641D + compare_var_to_value VAR_0x4001, 2 + call_if 1, EventScript_166428 + compare_var_to_value VAR_0x4001, 3 + call_if 1, EventScript_166433 + delay 30 + textcolor 3 + loadword 0, gUnknown_817EA36 + callstd 4 + closemessage + removeobject 7 + setflag 2095 + setvar VAR_0x406C, 2 + return EventScript_1663CA:: @ 81663CA - applymovement 7, Movement_1A75ED - waitmovement 0 - return + applymovement 7, Movement_1A75ED + waitmovement 0 + return EventScript_1663D5:: @ 81663D5 - closemessage - delay 20 - return + closemessage + delay 20 + return EventScript_1663DA:: @ 81663DA - closemessage - applymovement 255, Movement_1A75E9 - waitmovement 0 - return + closemessage + applymovement 255, Movement_1A75E9 + waitmovement 0 + return EventScript_1663E6:: @ 81663E6 - closemessage - applymovement 7, Movement_16643E - waitmovement 0 - applymovement 255, Movement_1A75E9 - waitmovement 0 - return + closemessage + applymovement 7, Movement_16643E + waitmovement 0 + applymovement 255, Movement_1A75E9 + waitmovement 0 + return EventScript_1663FC:: @ 81663FC - closemessage - applymovement 7, Movement_166441 - waitmovement 0 - applymovement 255, Movement_1A75E9 - waitmovement 0 - return + closemessage + applymovement 7, Movement_166441 + waitmovement 0 + applymovement 255, Movement_1A75E9 + waitmovement 0 + return EventScript_166412:: @ 8166412 - applymovement 7, Movement_166445 - waitmovement 0 - return + applymovement 7, Movement_166445 + waitmovement 0 + return EventScript_16641D:: @ 816641D - applymovement 7, Movement_166450 - waitmovement 0 - return + applymovement 7, Movement_166450 + waitmovement 0 + return EventScript_166428:: @ 8166428 - applymovement 7, Movement_16645B - waitmovement 0 - return + applymovement 7, Movement_16645B + waitmovement 0 + return EventScript_166433:: @ 8166433 - applymovement 7, Movement_166465 - waitmovement 0 - return + applymovement 7, Movement_166465 + waitmovement 0 + return Movement_16643E:: @ 816643E - step_1a - step_10 - step_end + step_1a + step_10 + step_end Movement_166441:: @ 8166441 - step_1a - step_10 - step_10 - step_end + step_1a + step_10 + step_10 + step_end Movement_166445:: @ 8166445 - step_10 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_end + step_10 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_end Movement_166450:: @ 8166450 - step_12 - step_10 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_end + step_12 + step_10 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_end Movement_16645B:: @ 816645B - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_end + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_end Movement_166465:: @ 8166465 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_end + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_end Movement_16646F:: @ 816646F - step_27 - step_end + step_27 + step_end diff --git a/data/maps/PewterCity_Gym/scripts.inc b/data/maps/PewterCity_Gym/scripts.inc index 0ba35e23a..73cfc41bf 100644 --- a/data/maps/PewterCity_Gym/scripts.inc +++ b/data/maps/PewterCity_Gym/scripts.inc @@ -1,110 +1,110 @@ PewterCity_Gym_MapScripts:: @ 816A592 - .byte 0 + .byte 0 PewterCity_Gym_EventScript_16A593:: @ 816A593 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 2 - special UpdatePickStateFromSpecialVar8005 - trainerbattle 1, 414, 0, Text_190CD4, Text_190E4F, EventScript_16A5C5 - checkflag FLAG_0x254 - goto_if 0, EventScript_16A5F3 - loadword 0, gUnknown_819110F - callstd 4 - release - end + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 2 + special UpdatePickStateFromSpecialVar8005 + trainerbattle 1, 414, 0, Text_190CD4, Text_190E4F, EventScript_16A5C5 + checkflag FLAG_0x254 + goto_if 0, EventScript_16A5F3 + loadword 0, gUnknown_819110F + callstd 4 + release + end EventScript_16A5C5:: @ 816A5C5 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 1 - special SetFlavorTextFlagFromSpecialVars - setflag FLAG_0x4B0 - setflag FLAG_UNK820 - setvar VAR_0x406C, 1 - setflag FLAG_0x02E - clearflag FLAG_0x092 - setvar VAR_0x8008, 1 - call EventScript_1A6B18 - goto EventScript_16A5F3 - end + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 1 + special SetFlavorTextFlagFromSpecialVars + setflag FLAG_0x4B0 + setflag FLAG_UNK820 + setvar VAR_0x406C, 1 + setflag FLAG_0x02E + clearflag FLAG_0x092 + setvar VAR_0x8008, 1 + call EventScript_1A6B18 + goto EventScript_16A5F3 + end EventScript_16A5F3:: @ 816A5F3 - loadword 0, gUnknown_8190FC1 - callstd 4 - checkitemspace ITEM_TM39, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16A634 - additem ITEM_TM39, 1 - loadword 0, gUnknown_8190FDB - setorcopyvar VAR_0x8000, 327 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 257 - callstd 9 - setflag FLAG_0x254 - loadword 0, gUnknown_8190FF8 - callstd 4 - release - end + loadword 0, gUnknown_8190FC1 + callstd 4 + checkitemspace ITEM_TM39, 1 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16A634 + additem ITEM_TM39, 1 + loadword 0, gUnknown_8190FDB + setorcopyvar VAR_0x8000, 327 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 257 + callstd 9 + setflag FLAG_0x254 + loadword 0, gUnknown_8190FF8 + callstd 4 + release + end EventScript_16A634:: @ 816A634 - loadword 0, gUnknown_81911CE - callstd 4 - release - end + loadword 0, gUnknown_81911CE + callstd 4 + release + end PewterCity_Gym_EventScript_16A63E:: @ 816A63E - trainerbattle 0, 142, 0, Text_1911EC, Text_191237 - loadword 0, gUnknown_819126B - callstd 6 - end + trainerbattle 0, 142, 0, Text_1911EC, Text_191237 + loadword 0, gUnknown_819126B + callstd 6 + end PewterCity_Gym_EventScript_16A655:: @ 816A655 - lock - faceplayer - checkflag FLAG_0x4B0 - goto_if 1, EventScript_16A67F - loadword 0, gUnknown_8191298 - callstd 5 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16A689 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16A697 - end + lock + faceplayer + checkflag FLAG_0x4B0 + goto_if 1, EventScript_16A67F + loadword 0, gUnknown_8191298 + callstd 5 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16A689 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16A697 + end EventScript_16A67F:: @ 816A67F - loadword 0, gUnknown_819143C - callstd 4 - release - end + loadword 0, gUnknown_819143C + callstd 4 + release + end EventScript_16A689:: @ 816A689 - loadword 0, gUnknown_819133C - callstd 4 - goto EventScript_16A6A5 - end + loadword 0, gUnknown_819133C + callstd 4 + goto EventScript_16A6A5 + end EventScript_16A697:: @ 816A697 - loadword 0, gUnknown_8191412 - callstd 4 - goto EventScript_16A6A5 - end + loadword 0, gUnknown_8191412 + callstd 4 + goto EventScript_16A6A5 + end EventScript_16A6A5:: @ 816A6A5 - loadword 0, gUnknown_819135C - callstd 4 - release - end + loadword 0, gUnknown_819135C + callstd 4 + release + end PewterCity_Gym_EventScript_16A6AF:: @ 816A6AF - lockall - checkflag FLAG_UNK820 - goto_if 1, EventScript_16A6C3 - loadword 0, gUnknown_819146E - callstd 4 - releaseall - end + lockall + checkflag FLAG_UNK820 + goto_if 1, EventScript_16A6C3 + loadword 0, gUnknown_819146E + callstd 4 + releaseall + end EventScript_16A6C3:: @ 816A6C3 - loadword 0, gUnknown_81914A4 - callstd 4 - releaseall - end + loadword 0, gUnknown_81914A4 + callstd 4 + releaseall + end diff --git a/data/maps/PewterCity_House1/scripts.inc b/data/maps/PewterCity_House1/scripts.inc index b051c7c2d..2b91b526c 100644 --- a/data/maps/PewterCity_House1/scripts.inc +++ b/data/maps/PewterCity_House1/scripts.inc @@ -1,34 +1,34 @@ PewterCity_House1_MapScripts:: @ 816A71C - .byte 0 + .byte 0 PewterCity_House1_EventScript_16A71D:: @ 816A71D - loadword 0, gUnknown_81915DB - callstd 2 - end + loadword 0, gUnknown_81915DB + callstd 2 + end PewterCity_House1_EventScript_16A726:: @ 816A726 - lock - loadword 0, gUnknown_81915CD - callstd 4 - call EventScript_16A749 - release - end + lock + loadword 0, gUnknown_81915CD + callstd 4 + call EventScript_16A749 + release + end PewterCity_House1_EventScript_16A736:: @ 816A736 - lock - faceplayer - call EventScript_16A749 - applymovement 3, Movement_1A75E5 - waitmovement 0 - release - end + lock + faceplayer + call EventScript_16A749 + applymovement 3, Movement_1A75E5 + waitmovement 0 + release + end EventScript_16A749:: @ 816A749 - textcolor 3 - waitse - playmoncry SPECIES_NIDORAN_M, 0 - loadword 0, gUnknown_81915BB - callstd 4 - waitmoncry - call EventScript_1A6675 - return + textcolor 3 + waitse + playmoncry SPECIES_NIDORAN_M, 0 + loadword 0, gUnknown_81915BB + callstd 4 + waitmoncry + call EventScript_1A6675 + return diff --git a/data/maps/PewterCity_House2/scripts.inc b/data/maps/PewterCity_House2/scripts.inc index 8b706eeac..924d132b7 100644 --- a/data/maps/PewterCity_House2/scripts.inc +++ b/data/maps/PewterCity_House2/scripts.inc @@ -1,12 +1,12 @@ PewterCity_House2_MapScripts:: @ 816A7DC - .byte 0 + .byte 0 PewterCity_House2_EventScript_16A7DD:: @ 816A7DD - loadword 0, gUnknown_81917E4 - callstd 2 - end + loadword 0, gUnknown_81917E4 + callstd 2 + end PewterCity_House2_EventScript_16A7E6:: @ 816A7E6 - loadword 0, gUnknown_8191840 - callstd 2 - end + loadword 0, gUnknown_8191840 + callstd 2 + end diff --git a/data/maps/PewterCity_Mart/scripts.inc b/data/maps/PewterCity_Mart/scripts.inc index ea0a47028..01bc843cd 100644 --- a/data/maps/PewterCity_Mart/scripts.inc +++ b/data/maps/PewterCity_Mart/scripts.inc @@ -1,40 +1,40 @@ PewterCity_Mart_MapScripts:: @ 816A6CD - .byte 0 + .byte 0 PewterCity_Mart_EventScript_16A6CE:: @ 816A6CE - loadword 0, gUnknown_81914DE - callstd 2 - end + loadword 0, gUnknown_81914DE + callstd 2 + end PewterCity_Mart_EventScript_16A6D7:: @ 816A6D7 - loadword 0, gUnknown_8191541 - callstd 2 - end + loadword 0, gUnknown_8191541 + callstd 2 + end PewterCity_Mart_EventScript_16A6E0:: @ 816A6E0 - special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 - lock - faceplayer - message Text_1A6211 - waitmessage - pokemart Items_16A708 - loadword 0, gUnknown_81A5190 - callstd 4 - release - end + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + lock + faceplayer + message Text_1A6211 + waitmessage + pokemart Items_16A708 + loadword 0, gUnknown_81A5190 + callstd 4 + release + end - .align 2 + .align 2 Items_16A708:: @ 816A708 - .2byte ITEM_POKE_BALL - .2byte ITEM_POTION - .2byte ITEM_ANTIDOTE - .2byte ITEM_PARALYZE_HEAL - .2byte ITEM_AWAKENING - .2byte ITEM_BURN_HEAL - .2byte ITEM_ESCAPE_ROPE - .2byte ITEM_REPEL - .2byte ITEM_NONE - release - end + .2byte ITEM_POKE_BALL + .2byte ITEM_POTION + .2byte ITEM_ANTIDOTE + .2byte ITEM_PARALYZE_HEAL + .2byte ITEM_AWAKENING + .2byte ITEM_BURN_HEAL + .2byte ITEM_ESCAPE_ROPE + .2byte ITEM_REPEL + .2byte ITEM_NONE + release + end diff --git a/data/maps/PewterCity_Museum_1F/scripts.inc b/data/maps/PewterCity_Museum_1F/scripts.inc index f597dd916..5b981a5c4 100644 --- a/data/maps/PewterCity_Museum_1F/scripts.inc +++ b/data/maps/PewterCity_Museum_1F/scripts.inc @@ -1,228 +1,228 @@ PewterCity_Museum_1F_MapScripts:: @ 816A31A - .byte 0 + .byte 0 PewterCity_Museum_1F_EventScript_16A31B:: @ 816A31B - lock - faceplayer - compare_var_to_value VAR_FACING, 3 - goto_if 1, EventScript_16A348 - compare_var_to_value VAR_FACING, 1 - goto_if 1, EventScript_16A348 - compare_var_to_value VAR_FACING, 2 - goto_if 1, EventScript_16A348 - loadword 0, gUnknown_8190539 - callstd 4 - release - end + lock + faceplayer + compare_var_to_value VAR_FACING, 3 + goto_if 1, EventScript_16A348 + compare_var_to_value VAR_FACING, 1 + goto_if 1, EventScript_16A348 + compare_var_to_value VAR_FACING, 2 + goto_if 1, EventScript_16A348 + loadword 0, gUnknown_8190539 + callstd 4 + release + end EventScript_16A348:: @ 816A348 - loadword 0, gUnknown_8190550 - callstd 5 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16A367 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16A37B - end + loadword 0, gUnknown_8190550 + callstd 5 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16A367 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16A37B + end EventScript_16A367:: @ 816A367 - loadword 0, gUnknown_81905B1 - callstd 4 - applymovement 1, Movement_1A75E5 - waitmovement 0 - release - end + loadword 0, gUnknown_81905B1 + callstd 4 + applymovement 1, Movement_1A75E5 + waitmovement 0 + release + end EventScript_16A37B:: @ 816A37B - loadword 0, gUnknown_8190627 - callstd 4 - applymovement 1, Movement_1A75E5 - waitmovement 0 - release - end + loadword 0, gUnknown_8190627 + callstd 4 + applymovement 1, Movement_1A75E5 + waitmovement 0 + release + end PewterCity_Museum_1F_EventScript_16A38F:: @ 816A38F - lockall - setvar VAR_0x4001, 0 - applymovement 255, Movement_1A75EB - waitmovement 0 - goto EventScript_16A3D1 - end + lockall + setvar VAR_0x4001, 0 + applymovement 255, Movement_1A75EB + waitmovement 0 + goto EventScript_16A3D1 + end PewterCity_Museum_1F_EventScript_16A3A5:: @ 816A3A5 - lockall - setvar VAR_0x4001, 1 - applymovement 255, Movement_1A75EB - waitmovement 0 - goto EventScript_16A3D1 - end + lockall + setvar VAR_0x4001, 1 + applymovement 255, Movement_1A75EB + waitmovement 0 + goto EventScript_16A3D1 + end PewterCity_Museum_1F_EventScript_16A3BB:: @ 816A3BB - lockall - setvar VAR_0x4001, 2 - applymovement 255, Movement_1A75EB - waitmovement 0 - goto EventScript_16A3D1 - end + lockall + setvar VAR_0x4001, 2 + applymovement 255, Movement_1A75EB + waitmovement 0 + goto EventScript_16A3D1 + end EventScript_16A3D1:: @ 816A3D1 - textcolor 0 - showmoneybox 0, 0, 0 - loadword 0, gUnknown_81904B5 - callstd 5 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16A402 - loadword 0, gUnknown_81904F9 - callstd 4 - closemessage - hidemoneybox - .byte 0 - .byte 0 - applymovement 255, Movement_16A48E - waitmovement 0 - releaseall - end + textcolor 0 + showmoneybox 0, 0, 0 + loadword 0, gUnknown_81904B5 + callstd 5 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16A402 + loadword 0, gUnknown_81904F9 + callstd 4 + closemessage + hidemoneybox + .byte 0 + .byte 0 + applymovement 255, Movement_16A48E + waitmovement 0 + releaseall + end EventScript_16A402:: @ 816A402 - checkmoney 50, 0 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16A476 - closemessage - compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_16A455 - compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_16A460 - compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_16A46B - playse 248 - takemoney 50, 0 - updatemoneybox 0, 0, 0 - waitse - loadword 0, gUnknown_8190505 - callstd 4 - setvar VAR_0x4061, 1 - hidemoneybox - .byte 0 - .byte 0 - releaseall - end + checkmoney 50, 0 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16A476 + closemessage + compare_var_to_value VAR_0x4001, 0 + call_if 1, EventScript_16A455 + compare_var_to_value VAR_0x4001, 1 + call_if 1, EventScript_16A460 + compare_var_to_value VAR_0x4001, 2 + call_if 1, EventScript_16A46B + playse 248 + takemoney 50, 0 + updatemoneybox 0, 0, 0 + waitse + loadword 0, gUnknown_8190505 + callstd 4 + setvar VAR_0x4061, 1 + hidemoneybox + .byte 0 + .byte 0 + releaseall + end EventScript_16A455:: @ 816A455 - applymovement 255, Movement_16A490 - waitmovement 0 - return + applymovement 255, Movement_16A490 + waitmovement 0 + return EventScript_16A460:: @ 816A460 - applymovement 255, Movement_16A495 - waitmovement 0 - return + applymovement 255, Movement_16A495 + waitmovement 0 + return EventScript_16A46B:: @ 816A46B - applymovement 255, Movement_16A499 - waitmovement 0 - return + applymovement 255, Movement_16A499 + waitmovement 0 + return EventScript_16A476:: @ 816A476 - loadword 0, gUnknown_819051C - callstd 4 - closemessage - hidemoneybox - .byte 0 - .byte 0 - applymovement 255, Movement_16A48E - waitmovement 0 - releaseall - end + loadword 0, gUnknown_819051C + callstd 4 + closemessage + hidemoneybox + .byte 0 + .byte 0 + applymovement 255, Movement_16A48E + waitmovement 0 + releaseall + end Movement_16A48E:: @ 816A48E - step_10 - step_end + step_10 + step_end Movement_16A490:: @ 816A490 - step_13 - step_13 - step_1b - step_28 - step_end + step_13 + step_13 + step_1b + step_28 + step_end Movement_16A495:: @ 816A495 - step_13 - step_1b - step_28 - step_end + step_13 + step_1b + step_28 + step_end Movement_16A499:: @ 816A499 - step_1b - step_28 - step_end + step_1b + step_28 + step_end PewterCity_Museum_1F_EventScript_16A49C:: @ 816A49C - loadword 0, gUnknown_81908CD - callstd 2 - end + loadword 0, gUnknown_81908CD + callstd 2 + end PewterCity_Museum_1F_EventScript_16A4A5:: @ 816A4A5 - loadword 0, gUnknown_81906B4 - callstd 2 - end + loadword 0, gUnknown_81906B4 + callstd 2 + end PewterCity_Museum_1F_EventScript_16A4AE:: @ 816A4AE - lock - faceplayer - checkflag FLAG_0x25E - goto_if 1, EventScript_16A4FF - loadword 0, gUnknown_8190717 - callstd 4 - checkitemspace ITEM_OLD_AMBER, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16A4F5 - setflag FLAG_0x25E - removeobject 4 - additem ITEM_OLD_AMBER, 1 - loadword 0, gUnknown_8190866 - setorcopyvar VAR_0x8000, 354 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 318 - callstd 9 - release - end + lock + faceplayer + checkflag FLAG_0x25E + goto_if 1, EventScript_16A4FF + loadword 0, gUnknown_8190717 + callstd 4 + checkitemspace ITEM_OLD_AMBER, 1 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16A4F5 + setflag FLAG_0x25E + removeobject 4 + additem ITEM_OLD_AMBER, 1 + loadword 0, gUnknown_8190866 + setorcopyvar VAR_0x8000, 354 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 318 + callstd 9 + release + end EventScript_16A4F5:: @ 816A4F5 - loadword 0, gUnknown_81908AE - callstd 4 - release - end + loadword 0, gUnknown_81908AE + callstd 4 + release + end EventScript_16A4FF:: @ 816A4FF - loadword 0, gUnknown_819088E - callstd 4 - release - end + loadword 0, gUnknown_819088E + callstd 4 + release + end PewterCity_Museum_1F_EventScript_16A509:: @ 816A509 - loadword 0, gUnknown_819090A - callstd 2 - end + loadword 0, gUnknown_819090A + callstd 2 + end PewterCity_Museum_1F_EventScript_16A512:: @ 816A512 - lockall - setvar VAR_0x8004, 142 - setvar VAR_0x8005, 10 - setvar VAR_0x8006, 3 - special sub_809D504 - loadword 0, gUnknown_8190945 - callstd 4 - special sub_809D620 - releaseall - end + lockall + setvar VAR_0x8004, 142 + setvar VAR_0x8005, 10 + setvar VAR_0x8006, 3 + special sub_809D504 + loadword 0, gUnknown_8190945 + callstd 4 + special sub_809D620 + releaseall + end PewterCity_Museum_1F_EventScript_16A532:: @ 816A532 - lockall - setvar VAR_0x8004, 141 - setvar VAR_0x8005, 10 - setvar VAR_0x8006, 3 - special sub_809D504 - loadword 0, gUnknown_8190975 - callstd 4 - special sub_809D620 - releaseall - end + lockall + setvar VAR_0x8004, 141 + setvar VAR_0x8005, 10 + setvar VAR_0x8006, 3 + special sub_809D504 + loadword 0, gUnknown_8190975 + callstd 4 + special sub_809D620 + releaseall + end diff --git a/data/maps/PewterCity_Museum_2F/scripts.inc b/data/maps/PewterCity_Museum_2F/scripts.inc index e41268793..a891dd04c 100644 --- a/data/maps/PewterCity_Museum_2F/scripts.inc +++ b/data/maps/PewterCity_Museum_2F/scripts.inc @@ -1,37 +1,37 @@ PewterCity_Museum_2F_MapScripts:: @ 816A552 - .byte 0 + .byte 0 PewterCity_Museum_2F_EventScript_16A553:: @ 816A553 - loadword 0, gUnknown_8190B30 - callstd 2 - end + loadword 0, gUnknown_8190B30 + callstd 2 + end PewterCity_Museum_2F_EventScript_16A55C:: @ 816A55C - loadword 0, gUnknown_8190B80 - callstd 2 - end + loadword 0, gUnknown_8190B80 + callstd 2 + end PewterCity_Museum_2F_EventScript_16A565:: @ 816A565 - loadword 0, gUnknown_8190BF3 - callstd 2 - end + loadword 0, gUnknown_8190BF3 + callstd 2 + end PewterCity_Museum_2F_EventScript_16A56E:: @ 816A56E - loadword 0, gUnknown_8190C1E - callstd 2 - end + loadword 0, gUnknown_8190C1E + callstd 2 + end PewterCity_Museum_2F_EventScript_16A577:: @ 816A577 - loadword 0, gUnknown_8190C60 - callstd 2 - end + loadword 0, gUnknown_8190C60 + callstd 2 + end PewterCity_Museum_2F_EventScript_16A580:: @ 816A580 - loadword 0, gUnknown_8190C81 - callstd 3 - end + loadword 0, gUnknown_8190C81 + callstd 3 + end PewterCity_Museum_2F_EventScript_16A589:: @ 816A589 - loadword 0, gUnknown_8190C8F - callstd 3 - end + loadword 0, gUnknown_8190C8F + callstd 3 + end diff --git a/data/maps/PewterCity_PokemonCenter_1F/scripts.inc b/data/maps/PewterCity_PokemonCenter_1F/scripts.inc index ffdccea77..0a3683479 100644 --- a/data/maps/PewterCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/PewterCity_PokemonCenter_1F/scripts.inc @@ -1,49 +1,49 @@ PewterCity_PokemonCenter_1F_MapScripts:: @ 816A760 - map_script 3, PewterCity_PokemonCenter_1F_MapScript1_16A76B - map_script 5, PewterCity_PokemonCenter_1F_MapScript2_1BC05C - .byte 0 + map_script 3, PewterCity_PokemonCenter_1F_MapScript1_16A76B + map_script 5, PewterCity_PokemonCenter_1F_MapScript2_1BC05C + .byte 0 PewterCity_PokemonCenter_1F_MapScript1_16A76B:: @ 816A76B - setrespawn 3 - end + setrespawn 3 + end PewterCity_PokemonCenter_1F_EventScript_16A76F:: @ 816A76F - lock - faceplayer - call EventScript_1A6578 - release - end + lock + faceplayer + call EventScript_1A6578 + release + end PewterCity_PokemonCenter_1F_EventScript_16A778:: @ 816A778 - loadword 0, gUnknown_81916A9 - callstd 2 - end + loadword 0, gUnknown_81916A9 + callstd 2 + end PewterCity_PokemonCenter_1F_EventScript_16A781:: @ 816A781 - lock - faceplayer - fadeoutbgm 0 - playbgm BGM_FRLG_JIGGLYPUFF, 0 - message Text_1916EA - waitmessage - delay 455 - playbgm BGM_FRLG_POKEMON_CENTER, 1 - release - end + lock + faceplayer + fadeoutbgm 0 + playbgm BGM_FRLG_JIGGLYPUFF, 0 + message Text_1916EA + waitmessage + delay 455 + playbgm BGM_FRLG_POKEMON_CENTER, 1 + release + end PewterCity_PokemonCenter_1F_EventScript_16A798:: @ 816A798 - loadword 0, gUnknown_8191701 - callstd 2 - end + loadword 0, gUnknown_8191701 + callstd 2 + end PewterCity_PokemonCenter_1F_EventScript_16A7A1:: @ 816A7A1 - lock - loadword 0, gUnknown_8191743 - callstd 4 - release - end + lock + loadword 0, gUnknown_8191743 + callstd 4 + release + end PewterCity_PokemonCenter_1F_EventScript_16A7AC:: @ 816A7AC - loadword 0, gUnknown_8191780 - callstd 2 - end + loadword 0, gUnknown_8191780 + callstd 2 + end diff --git a/data/maps/PewterCity_PokemonCenter_2F/scripts.inc b/data/maps/PewterCity_PokemonCenter_2F/scripts.inc index 7f019d782..6fce8dda2 100644 --- a/data/maps/PewterCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/PewterCity_PokemonCenter_2F/scripts.inc @@ -1,18 +1,18 @@ PewterCity_PokemonCenter_2F_MapScripts:: @ 816A7B5 - map_script 2, PewterCity_PokemonCenter_2F_MapScript1_1BB2A3 - map_script 4, PewterCity_PokemonCenter_2F_MapScript2_1BB1ED - map_script 1, PewterCity_PokemonCenter_2F_MapScript3_1BB237 - map_script 3, PewterCity_PokemonCenter_2F_MapScript4_1BB1B4 - .byte 0 + map_script 2, PewterCity_PokemonCenter_2F_MapScript1_1BB2A3 + map_script 4, PewterCity_PokemonCenter_2F_MapScript2_1BB1ED + map_script 1, PewterCity_PokemonCenter_2F_MapScript3_1BB237 + map_script 3, PewterCity_PokemonCenter_2F_MapScript4_1BB1B4 + .byte 0 PewterCity_PokemonCenter_2F_EventScript_16A7CA:: @ 816A7CA - call EventScript_1BB4A3 - end + call EventScript_1BB4A3 + end EventScript_16A7D0:: @ 816A7D0 - call EventScript_1BB6AB - end + call EventScript_1BB6AB + end EventScript_16A7D6:: @ 816A7D6 - call EventScript_1BB7DE - end + call EventScript_1BB7DE + end diff --git a/data/maps/PokemonLeague_AgathasRoom/scripts.inc b/data/maps/PokemonLeague_AgathasRoom/scripts.inc index 6fce65046..9507276fe 100644 --- a/data/maps/PokemonLeague_AgathasRoom/scripts.inc +++ b/data/maps/PokemonLeague_AgathasRoom/scripts.inc @@ -1,110 +1,110 @@ PokemonLeague_AgathasRoom_MapScripts:: @ 8162810 - map_script 5, PokemonLeague_AgathasRoom_MapScript1_162825 - map_script 1, PokemonLeague_AgathasRoom_MapScript2_162830 - map_script 4, PokemonLeague_AgathasRoom_MapScript3_162851 - map_script 2, PokemonLeague_AgathasRoom_MapScript4_162860 - .byte 0 + map_script 5, PokemonLeague_AgathasRoom_MapScript1_162825 + map_script 1, PokemonLeague_AgathasRoom_MapScript2_162830 + map_script 4, PokemonLeague_AgathasRoom_MapScript3_162851 + map_script 2, PokemonLeague_AgathasRoom_MapScript4_162860 + .byte 0 PokemonLeague_AgathasRoom_MapScript1_162825:: @ 8162825 - setvar VAR_0x8004, 2 - call EventScript_1A75D5 - end + setvar VAR_0x8004, 2 + call EventScript_1A75D5 + end PokemonLeague_AgathasRoom_MapScript2_162830:: @ 8162830 - checkflag FLAG_0x4BA - call_if 1, EventScript_16284B - compare_var_to_value VAR_0x4068, 3 - call_if 1, EventScript_162845 - end + checkflag FLAG_0x4BA + call_if 1, EventScript_16284B + compare_var_to_value VAR_0x4068, 3 + call_if 1, EventScript_162845 + end EventScript_162845:: @ 8162845 - call EventScript_1A759C - return + call EventScript_1A759C + return EventScript_16284B:: @ 816284B - call EventScript_1A7538 - return + call EventScript_1A7538 + return PokemonLeague_AgathasRoom_MapScript3_162851:: @ 8162851 - map_script_2 VAR_0x4001, 0, EventScript_16285B - .2byte 0 + map_script_2 VAR_0x4001, 0, EventScript_16285B + .2byte 0 EventScript_16285B:: @ 816285B - turnobject 255, 2 - end + turnobject 255, 2 + end PokemonLeague_AgathasRoom_MapScript4_162860:: @ 8162860 - map_script_2 VAR_0x4068, 2, EventScript_16286A - .2byte 0 + map_script_2 VAR_0x4068, 2, EventScript_16286A + .2byte 0 EventScript_16286A:: @ 816286A - lockall - call EventScript_1A751F - setvar VAR_0x4068, 3 - releaseall - end + lockall + call EventScript_1A751F + setvar VAR_0x4068, 3 + releaseall + end PokemonLeague_AgathasRoom_EventScript_162877:: @ 8162877 - lock - faceplayer - setvar VAR_0x8004, 11 - setvar VAR_0x8005, 2 - special UpdatePickStateFromSpecialVar8005 - checkflag FLAG_0x4BA - goto_if 1, EventScript_162911 - setvar VAR_0x8004, 11 - setvar VAR_0x8005, 0 - special SetFlavorTextFlagFromSpecialVars - setvar VAR_0x8004, 11 - setvar VAR_0x8005, 4 - special SetFlavorTextFlagFromSpecialVars - setvar VAR_0x8004, 0 - setvar VAR_0x8005, 4 - special SetFlavorTextFlagFromSpecialVars - checkflag 2092 - call_if 0, EventScript_1628E9 - checkflag 2092 - call_if 1, EventScript_1628F2 - setflag FLAG_0x003 - setflag FLAG_0x005 - checkflag 2116 - call_if 0, EventScript_1628FB - checkflag 2116 - call_if 1, EventScript_162906 - clearflag FLAG_0x005 - goto EventScript_16291B + lock + faceplayer + setvar VAR_0x8004, 11 + setvar VAR_0x8005, 2 + special UpdatePickStateFromSpecialVar8005 + checkflag FLAG_0x4BA + goto_if 1, EventScript_162911 + setvar VAR_0x8004, 11 + setvar VAR_0x8005, 0 + special SetFlavorTextFlagFromSpecialVars + setvar VAR_0x8004, 11 + setvar VAR_0x8005, 4 + special SetFlavorTextFlagFromSpecialVars + setvar VAR_0x8004, 0 + setvar VAR_0x8005, 4 + special SetFlavorTextFlagFromSpecialVars + checkflag 2092 + call_if 0, EventScript_1628E9 + checkflag 2092 + call_if 1, EventScript_1628F2 + setflag FLAG_0x003 + setflag FLAG_0x005 + checkflag 2116 + call_if 0, EventScript_1628FB + checkflag 2116 + call_if 1, EventScript_162906 + clearflag FLAG_0x005 + goto EventScript_16291B EventScript_1628E8:: @ 81628E8 - end + end EventScript_1628E9:: @ 81628E9 - loadword 0, gUnknown_817844D - callstd 4 - return + loadword 0, gUnknown_817844D + callstd 4 + return EventScript_1628F2:: @ 81628F2 - loadword 0, gUnknown_817858D - callstd 4 - return + loadword 0, gUnknown_817858D + callstd 4 + return EventScript_1628FB:: @ 81628FB - trainerbattle 3, 412, 0, Text_1786D7 - return + trainerbattle 3, 412, 0, Text_1786D7 + return EventScript_162906:: @ 8162906 - trainerbattle 3, 737, 0, Text_1786D7 - return + trainerbattle 3, 737, 0, Text_1786D7 + return EventScript_162911:: @ 8162911 - loadword 0, gUnknown_8178700 - callstd 4 - release - end + loadword 0, gUnknown_8178700 + callstd 4 + release + end EventScript_16291B:: @ 816291B - setflag FLAG_0x4BA - call EventScript_1A7506 - loadword 0, gUnknown_8178700 - callstd 4 - release - end + setflag FLAG_0x4BA + call EventScript_1A7506 + loadword 0, gUnknown_8178700 + callstd 4 + release + end diff --git a/data/maps/PokemonLeague_BrunosRoom/scripts.inc b/data/maps/PokemonLeague_BrunosRoom/scripts.inc index 41116d4cd..4553cfa0c 100644 --- a/data/maps/PokemonLeague_BrunosRoom/scripts.inc +++ b/data/maps/PokemonLeague_BrunosRoom/scripts.inc @@ -1,140 +1,140 @@ PokemonLeague_BrunosRoom_MapScripts:: @ 8162685 - map_script 5, PokemonLeague_BrunosRoom_MapScript1_16269A - map_script 1, PokemonLeague_BrunosRoom_MapScript2_1626A5 - map_script 4, PokemonLeague_BrunosRoom_MapScript3_1626C6 - map_script 2, PokemonLeague_BrunosRoom_MapScript4_1626D5 - .byte 0 + map_script 5, PokemonLeague_BrunosRoom_MapScript1_16269A + map_script 1, PokemonLeague_BrunosRoom_MapScript2_1626A5 + map_script 4, PokemonLeague_BrunosRoom_MapScript3_1626C6 + map_script 2, PokemonLeague_BrunosRoom_MapScript4_1626D5 + .byte 0 PokemonLeague_BrunosRoom_MapScript1_16269A:: @ 816269A - setvar VAR_0x8004, 1 - call EventScript_1A75D5 - end + setvar VAR_0x8004, 1 + call EventScript_1A75D5 + end PokemonLeague_BrunosRoom_MapScript2_1626A5:: @ 81626A5 - checkflag FLAG_0x4B9 - call_if 1, EventScript_1626C0 - compare_var_to_value VAR_0x4068, 2 - call_if 1, EventScript_1626BA - end + checkflag FLAG_0x4B9 + call_if 1, EventScript_1626C0 + compare_var_to_value VAR_0x4068, 2 + call_if 1, EventScript_1626BA + end EventScript_1626BA:: @ 81626BA - call EventScript_1A759C - return + call EventScript_1A759C + return EventScript_1626C0:: @ 81626C0 - call EventScript_1A7538 - return + call EventScript_1A7538 + return PokemonLeague_BrunosRoom_MapScript3_1626C6:: @ 81626C6 - map_script_2 VAR_0x4001, 0, EventScript_1626D0 - .2byte 0 + map_script_2 VAR_0x4001, 0, EventScript_1626D0 + .2byte 0 EventScript_1626D0:: @ 81626D0 - turnobject 255, 2 - end + turnobject 255, 2 + end PokemonLeague_BrunosRoom_MapScript4_1626D5:: @ 81626D5 - map_script_2 VAR_0x4068, 1, EventScript_1626DF - .2byte 0 + map_script_2 VAR_0x4068, 1, EventScript_1626DF + .2byte 0 EventScript_1626DF:: @ 81626DF - lockall - call EventScript_1A751F - setvar VAR_0x4068, 2 - releaseall - end + lockall + call EventScript_1A751F + setvar VAR_0x4068, 2 + releaseall + end PokemonLeague_BrunosRoom_EventScript_1626EC:: @ 81626EC - lock - faceplayer - setvar VAR_0x8004, 10 - setvar VAR_0x8005, 2 - special UpdatePickStateFromSpecialVar8005 - checkflag FLAG_0x4B9 - goto_if 1, EventScript_162779 - setvar VAR_0x8004, 10 - setvar VAR_0x8005, 0 - special SetFlavorTextFlagFromSpecialVars - setvar VAR_0x8004, 10 - setvar VAR_0x8005, 1 - special SetFlavorTextFlagFromSpecialVars - checkflag 2092 - call_if 0, EventScript_162751 - checkflag 2092 - call_if 1, EventScript_16275A - setflag FLAG_0x003 - setflag FLAG_0x005 - checkflag 2116 - call_if 0, EventScript_162763 - checkflag 2116 - call_if 1, EventScript_16276E - clearflag FLAG_0x005 - goto EventScript_1627B0 + lock + faceplayer + setvar VAR_0x8004, 10 + setvar VAR_0x8005, 2 + special UpdatePickStateFromSpecialVar8005 + checkflag FLAG_0x4B9 + goto_if 1, EventScript_162779 + setvar VAR_0x8004, 10 + setvar VAR_0x8005, 0 + special SetFlavorTextFlagFromSpecialVars + setvar VAR_0x8004, 10 + setvar VAR_0x8005, 1 + special SetFlavorTextFlagFromSpecialVars + checkflag 2092 + call_if 0, EventScript_162751 + checkflag 2092 + call_if 1, EventScript_16275A + setflag FLAG_0x003 + setflag FLAG_0x005 + checkflag 2116 + call_if 0, EventScript_162763 + checkflag 2116 + call_if 1, EventScript_16276E + clearflag FLAG_0x005 + goto EventScript_1627B0 EventScript_162750:: @ 8162750 - end + end EventScript_162751:: @ 8162751 - loadword 0, gUnknown_817820F - callstd 4 - return + loadword 0, gUnknown_817820F + callstd 4 + return EventScript_16275A:: @ 816275A - loadword 0, gUnknown_817830C - callstd 4 - return + loadword 0, gUnknown_817830C + callstd 4 + return EventScript_162763:: @ 8162763 - trainerbattle 3, 411, 0, Text_178409 - return + trainerbattle 3, 411, 0, Text_178409 + return EventScript_16276E:: @ 816276E - trainerbattle 3, 736, 0, Text_178409 - return + trainerbattle 3, 736, 0, Text_178409 + return EventScript_162779:: @ 8162779 - loadword 0, gUnknown_8178420 - callstd 4 - closemessage - compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_1627FA - compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_1627EF - compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_162805 - compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_162805 - release - end + loadword 0, gUnknown_8178420 + callstd 4 + closemessage + compare_var_to_value VAR_FACING, 2 + call_if 1, EventScript_1627FA + compare_var_to_value VAR_FACING, 1 + call_if 1, EventScript_1627EF + compare_var_to_value VAR_FACING, 3 + call_if 1, EventScript_162805 + compare_var_to_value VAR_FACING, 4 + call_if 1, EventScript_162805 + release + end EventScript_1627B0:: @ 81627B0 - setflag FLAG_0x4B9 - call EventScript_1A7506 - loadword 0, gUnknown_8178420 - callstd 4 - closemessage - compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_1627FA - compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_1627EF - compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_162805 - compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_162805 - release - end + setflag FLAG_0x4B9 + call EventScript_1A7506 + loadword 0, gUnknown_8178420 + callstd 4 + closemessage + compare_var_to_value VAR_FACING, 2 + call_if 1, EventScript_1627FA + compare_var_to_value VAR_FACING, 1 + call_if 1, EventScript_1627EF + compare_var_to_value VAR_FACING, 3 + call_if 1, EventScript_162805 + compare_var_to_value VAR_FACING, 4 + call_if 1, EventScript_162805 + release + end EventScript_1627EF:: @ 81627EF - applymovement 1, Movement_1A75E7 - waitmovement 0 - return + applymovement 1, Movement_1A75E7 + waitmovement 0 + return EventScript_1627FA:: @ 81627FA - applymovement 1, Movement_1A75EB - waitmovement 0 - return + applymovement 1, Movement_1A75EB + waitmovement 0 + return EventScript_162805:: @ 8162805 - applymovement 1, Movement_1A75ED - waitmovement 0 - return + applymovement 1, Movement_1A75ED + waitmovement 0 + return diff --git a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc index 81d3ae0fa..8c499fc32 100644 --- a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc +++ b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc @@ -1,254 +1,254 @@ PokemonLeague_ChampionsRoom_MapScripts:: @ 8162AE2 - map_script 4, PokemonLeague_ChampionsRoom_MapScript1_162B5D - map_script 5, PokemonLeague_ChampionsRoom_MapScript2_162AF2 - map_script 2, PokemonLeague_ChampionsRoom_MapScript3_162B6C - .byte 0 + map_script 4, PokemonLeague_ChampionsRoom_MapScript1_162B5D + map_script 5, PokemonLeague_ChampionsRoom_MapScript2_162AF2 + map_script 2, PokemonLeague_ChampionsRoom_MapScript3_162B6C + .byte 0 PokemonLeague_ChampionsRoom_MapScript2_162AF2:: @ 8162AF2 - setvar VAR_0x8004, 4 - call EventScript_1A75D5 - compare_var_to_value VAR_STARTER_MON, 2 - call_if 1, EventScript_162B1E - compare_var_to_value VAR_STARTER_MON, 1 - call_if 1, EventScript_162B31 - compare_var_to_value VAR_STARTER_MON, 0 - call_if 1, EventScript_162B44 - end + setvar VAR_0x8004, 4 + call EventScript_1A75D5 + compare_var_to_value VAR_STARTER_MON, 2 + call_if 1, EventScript_162B1E + compare_var_to_value VAR_STARTER_MON, 1 + call_if 1, EventScript_162B31 + compare_var_to_value VAR_STARTER_MON, 0 + call_if 1, EventScript_162B44 + end EventScript_162B1E:: @ 8162B1E - checktrainerflag 438 - goto_if 1, EventScript_162B57 - checktrainerflag 739 - goto_if 1, EventScript_162B57 - return + checktrainerflag 438 + goto_if 1, EventScript_162B57 + checktrainerflag 739 + goto_if 1, EventScript_162B57 + return EventScript_162B31:: @ 8162B31 - checktrainerflag 439 - goto_if 1, EventScript_162B57 - checktrainerflag 740 - goto_if 1, EventScript_162B57 - return + checktrainerflag 439 + goto_if 1, EventScript_162B57 + checktrainerflag 740 + goto_if 1, EventScript_162B57 + return EventScript_162B44:: @ 8162B44 - checktrainerflag 440 - goto_if 1, EventScript_162B57 - checktrainerflag 741 - goto_if 1, EventScript_162B57 - return + checktrainerflag 440 + goto_if 1, EventScript_162B57 + checktrainerflag 741 + goto_if 1, EventScript_162B57 + return EventScript_162B57:: @ 8162B57 - setvar VAR_0x4001, 1 - return + setvar VAR_0x4001, 1 + return PokemonLeague_ChampionsRoom_MapScript1_162B5D:: @ 8162B5D - map_script_2 VAR_0x4001, 0, EventScript_162B67 - .2byte 0 + map_script_2 VAR_0x4001, 0, EventScript_162B67 + .2byte 0 EventScript_162B67:: @ 8162B67 - turnobject 255, 2 - end + turnobject 255, 2 + end PokemonLeague_ChampionsRoom_MapScript3_162B6C:: @ 8162B6C - map_script_2 VAR_0x4001, 0, EventScript_162B76 - .2byte 0 + map_script_2 VAR_0x4001, 0, EventScript_162B76 + .2byte 0 EventScript_162B76:: @ 8162B76 - lockall - textcolor 0 - setflag FLAG_0x002 - applymovement 255, Movement_162D07 - waitmovement 0 - delay 20 - checkflag 2092 - call_if 0, EventScript_162CB3 - checkflag 2092 - call_if 1, EventScript_162CBC - special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_162C68 - setflag FLAG_0x003 - setflag FLAG_0x005 - savebgm BGM_FRLG_KACHI_LEADER - checkflag 2116 - call_if 0, EventScript_162C6F - checkflag 2116 - call_if 1, EventScript_162C91 - setflag FLAG_0x004 - clearflag FLAG_0x005 - setflag FLAG_0x4BC - setflag FLAG_0x004 - loadword 0, gUnknown_8178F2F - callstd 4 - playbgm BGM_FRLG_HALL_OF_FAME_PALLET_TOWN, 0 - addobject 2 - loadword 0, gUnknown_8178FC6 - callstd 4 - closemessage - applymovement 255, Movement_162D1F - applymovement 1, Movement_162D41 - applymovement 2, Movement_162D2A - waitmovement 0 - delay 25 - specialvar VAR_RESULT, ScrSpecial_GetStarter - getspeciesname 0, 32781 - loadword 0, gUnknown_8178FCF - callstd 4 - applymovement 2, Movement_1A75EB - applymovement 1, Movement_1A75E7 - waitmovement 0 - loadword 0, gUnknown_817908F - callstd 4 - closemessage - applymovement 2, Movement_1A75ED - waitmovement 0 - delay 20 - loadword 0, gUnknown_81791A3 - callstd 4 - closemessage - delay 13 - applymovement 2, Movement_162D37 - applymovement 255, Movement_162D12 - waitmovement 0 - setvar VAR_0x4001, 1 - warp MAP_POKEMON_LEAGUE_HALL_OF_FAME, 255, 5, 12 - waitstate - releaseall - end + lockall + textcolor 0 + setflag FLAG_0x002 + applymovement 255, Movement_162D07 + waitmovement 0 + delay 20 + checkflag 2092 + call_if 0, EventScript_162CB3 + checkflag 2092 + call_if 1, EventScript_162CBC + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_162C68 + setflag FLAG_0x003 + setflag FLAG_0x005 + savebgm BGM_FRLG_KACHI_LEADER + checkflag 2116 + call_if 0, EventScript_162C6F + checkflag 2116 + call_if 1, EventScript_162C91 + setflag FLAG_0x004 + clearflag FLAG_0x005 + setflag FLAG_0x4BC + setflag FLAG_0x004 + loadword 0, gUnknown_8178F2F + callstd 4 + playbgm BGM_FRLG_HALL_OF_FAME_PALLET_TOWN, 0 + addobject 2 + loadword 0, gUnknown_8178FC6 + callstd 4 + closemessage + applymovement 255, Movement_162D1F + applymovement 1, Movement_162D41 + applymovement 2, Movement_162D2A + waitmovement 0 + delay 25 + specialvar VAR_RESULT, ScrSpecial_GetStarter + getspeciesname 0, 32781 + loadword 0, gUnknown_8178FCF + callstd 4 + applymovement 2, Movement_1A75EB + applymovement 1, Movement_1A75E7 + waitmovement 0 + loadword 0, gUnknown_817908F + callstd 4 + closemessage + applymovement 2, Movement_1A75ED + waitmovement 0 + delay 20 + loadword 0, gUnknown_81791A3 + callstd 4 + closemessage + delay 13 + applymovement 2, Movement_162D37 + applymovement 255, Movement_162D12 + waitmovement 0 + setvar VAR_0x4001, 1 + warp MAP_POKEMON_LEAGUE_HALL_OF_FAME, 255, 5, 12 + waitstate + releaseall + end EventScript_162C68:: @ 8162C68 - call EventScript_162B57 - releaseall - end + call EventScript_162B57 + releaseall + end EventScript_162C6F:: @ 8162C6F - compare_var_to_value VAR_STARTER_MON, 2 - call_if 1, EventScript_162CC5 - compare_var_to_value VAR_STARTER_MON, 1 - call_if 1, EventScript_162CD0 - compare_var_to_value VAR_STARTER_MON, 0 - call_if 1, EventScript_162CDB - return + compare_var_to_value VAR_STARTER_MON, 2 + call_if 1, EventScript_162CC5 + compare_var_to_value VAR_STARTER_MON, 1 + call_if 1, EventScript_162CD0 + compare_var_to_value VAR_STARTER_MON, 0 + call_if 1, EventScript_162CDB + return EventScript_162C91:: @ 8162C91 - compare_var_to_value VAR_STARTER_MON, 2 - call_if 1, EventScript_162CE6 - compare_var_to_value VAR_STARTER_MON, 1 - call_if 1, EventScript_162CF1 - compare_var_to_value VAR_STARTER_MON, 0 - call_if 1, EventScript_162CFC - return + compare_var_to_value VAR_STARTER_MON, 2 + call_if 1, EventScript_162CE6 + compare_var_to_value VAR_STARTER_MON, 1 + call_if 1, EventScript_162CF1 + compare_var_to_value VAR_STARTER_MON, 0 + call_if 1, EventScript_162CFC + return EventScript_162CB3:: @ 8162CB3 - loadword 0, gUnknown_8178B6C - callstd 4 - return + loadword 0, gUnknown_8178B6C + callstd 4 + return EventScript_162CBC:: @ 8162CBC - loadword 0, gUnknown_8178CD4 - callstd 4 - return + loadword 0, gUnknown_8178CD4 + callstd 4 + return EventScript_162CC5:: @ 8162CC5 - trainerbattle 3, 438, 0, Text_178E3F - return + trainerbattle 3, 438, 0, Text_178E3F + return EventScript_162CD0:: @ 8162CD0 - trainerbattle 3, 439, 0, Text_178E3F - return + trainerbattle 3, 439, 0, Text_178E3F + return EventScript_162CDB:: @ 8162CDB - trainerbattle 3, 440, 0, Text_178E3F - return + trainerbattle 3, 440, 0, Text_178E3F + return EventScript_162CE6:: @ 8162CE6 - trainerbattle 3, 739, 0, Text_178E3F - return + trainerbattle 3, 739, 0, Text_178E3F + return EventScript_162CF1:: @ 8162CF1 - trainerbattle 3, 740, 0, Text_178E3F - return + trainerbattle 3, 740, 0, Text_178E3F + return EventScript_162CFC:: @ 8162CFC - trainerbattle 3, 741, 0, Text_178E3F - return + trainerbattle 3, 741, 0, Text_178E3F + return Movement_162D07:: @ 8162D07 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_end + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_end Movement_162D12:: @ 8162D12 - step_1c - step_12 - step_11 - step_11 - step_11 - step_13 - step_11 - step_11 - step_11 - step_11 - step_1b - step_60 - step_end + step_1c + step_12 + step_11 + step_11 + step_11 + step_13 + step_11 + step_11 + step_11 + step_11 + step_1b + step_60 + step_end Movement_162D1F:: @ 8162D1F - step_1b - step_2d - step_1c - step_1c - step_1c - step_1c - step_1c - step_1c - step_1c - step_2f - step_end + step_1b + step_2d + step_1c + step_1c + step_1c + step_1c + step_1c + step_1c + step_1c + step_2f + step_end Movement_162D2A:: @ 8162D2A - step_1c - step_1c - step_11 - step_11 - step_11 - step_11 - step_11 - step_12 - step_11 - step_11 - step_2d - step_1c - step_end + step_1c + step_1c + step_11 + step_11 + step_11 + step_11 + step_11 + step_12 + step_11 + step_11 + step_2d + step_1c + step_end Movement_162D37:: @ 8162D37 - step_11 - step_11 - step_13 - step_11 - step_11 - step_11 - step_11 - step_1b - step_60 - step_end + step_11 + step_11 + step_13 + step_11 + step_11 + step_11 + step_11 + step_1b + step_60 + step_end Movement_162D41:: @ 8162D41 - step_1c - step_1c - step_1c - step_1c - step_1c - step_1c - step_1c - step_1c - step_1c - step_2f - step_end + step_1c + step_1c + step_1c + step_1c + step_1c + step_1c + step_1c + step_1c + step_1c + step_2f + step_end diff --git a/data/maps/PokemonLeague_HallOfFame/scripts.inc b/data/maps/PokemonLeague_HallOfFame/scripts.inc index 2fd41e840..04a6cdd8e 100644 --- a/data/maps/PokemonLeague_HallOfFame/scripts.inc +++ b/data/maps/PokemonLeague_HallOfFame/scripts.inc @@ -1,55 +1,55 @@ PokemonLeague_HallOfFame_MapScripts:: @ 8162D4C - map_script 2, PokemonLeague_HallOfFame_MapScript1_162D66 - map_script 4, PokemonLeague_HallOfFame_MapScript2_162D57 - .byte 0 + map_script 2, PokemonLeague_HallOfFame_MapScript1_162D66 + map_script 4, PokemonLeague_HallOfFame_MapScript2_162D57 + .byte 0 PokemonLeague_HallOfFame_MapScript2_162D57:: @ 8162D57 - map_script_2 VAR_0x4001, 0, EventScript_162D61 - .2byte 0 + map_script_2 VAR_0x4001, 0, EventScript_162D61 + .2byte 0 EventScript_162D61:: @ 8162D61 - turnobject 255, 2 - end + turnobject 255, 2 + end PokemonLeague_HallOfFame_MapScript1_162D66:: @ 8162D66 - map_script_2 VAR_0x4001, 0, EventScript_162D70 - .2byte 0 + map_script_2 VAR_0x4001, 0, EventScript_162D70 + .2byte 0 EventScript_162D70:: @ 8162D70 - lockall - textcolor 0 - applymovement 255, Movement_162DCD - waitmovement 0 - applymovement 1, Movement_1A75E7 - applymovement 255, Movement_1A75EB - waitmovement 0 - delay 18 - loadword 0, gUnknown_817922F - callstd 4 - closemessage - applymovement 1, Movement_1A75E9 - applymovement 255, Movement_1A75E9 - waitmovement 0 - delay 20 - dofieldeffect 62 - waitfieldeffect 62 - delay 40 - setvar VAR_0x4001, 1 - call EventScript_1A651A - setrespawn 1 - fadescreenspeed 1, 24 - special sub_80CA2E4 - waitstate - releaseall - end + lockall + textcolor 0 + applymovement 255, Movement_162DCD + waitmovement 0 + applymovement 1, Movement_1A75E7 + applymovement 255, Movement_1A75EB + waitmovement 0 + delay 18 + loadword 0, gUnknown_817922F + callstd 4 + closemessage + applymovement 1, Movement_1A75E9 + applymovement 255, Movement_1A75E9 + waitmovement 0 + delay 20 + dofieldeffect 62 + waitfieldeffect 62 + delay 40 + setvar VAR_0x4001, 1 + call EventScript_1A651A + setrespawn 1 + fadescreenspeed 1, 24 + special sub_80CA2E4 + waitstate + releaseall + end Movement_162DCD:: @ 8162DCD - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_end + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_end diff --git a/data/maps/PokemonLeague_LancesRoom/scripts.inc b/data/maps/PokemonLeague_LancesRoom/scripts.inc index f3a181319..883441628 100644 --- a/data/maps/PokemonLeague_LancesRoom/scripts.inc +++ b/data/maps/PokemonLeague_LancesRoom/scripts.inc @@ -1,184 +1,184 @@ PokemonLeague_LancesRoom_MapScripts:: @ 816292D - map_script 5, PokemonLeague_LancesRoom_MapScript1_162942 - map_script 1, PokemonLeague_LancesRoom_MapScript2_16294D - map_script 4, PokemonLeague_LancesRoom_MapScript3_16296E - map_script 2, PokemonLeague_LancesRoom_MapScript4_16297D - .byte 0 + map_script 5, PokemonLeague_LancesRoom_MapScript1_162942 + map_script 1, PokemonLeague_LancesRoom_MapScript2_16294D + map_script 4, PokemonLeague_LancesRoom_MapScript3_16296E + map_script 2, PokemonLeague_LancesRoom_MapScript4_16297D + .byte 0 PokemonLeague_LancesRoom_MapScript1_162942:: @ 8162942 - setvar VAR_0x8004, 3 - call EventScript_1A75D5 - end + setvar VAR_0x8004, 3 + call EventScript_1A75D5 + end PokemonLeague_LancesRoom_MapScript2_16294D:: @ 816294D - compare_var_to_value VAR_0x4068, 4 - call_if 1, EventScript_162962 - checkflag FLAG_0x4BB - call_if 1, EventScript_162968 - end + compare_var_to_value VAR_0x4068, 4 + call_if 1, EventScript_162962 + checkflag FLAG_0x4BB + call_if 1, EventScript_162968 + end EventScript_162962:: @ 8162962 - call EventScript_1629A8 - return + call EventScript_1629A8 + return EventScript_162968:: @ 8162968 - call EventScript_1A7589 - return + call EventScript_1A7589 + return PokemonLeague_LancesRoom_MapScript3_16296E:: @ 816296E - map_script_2 VAR_0x4001, 0, EventScript_162978 - .2byte 0 + map_script_2 VAR_0x4001, 0, EventScript_162978 + .2byte 0 EventScript_162978:: @ 8162978 - turnobject 255, 2 - end + turnobject 255, 2 + end PokemonLeague_LancesRoom_MapScript4_16297D:: @ 816297D - map_script_2 VAR_0x4068, 3, EventScript_162987 - .2byte 0 + map_script_2 VAR_0x4068, 3, EventScript_162987 + .2byte 0 EventScript_162987:: @ 8162987 - lockall - applymovement 255, Movement_1629F1 - waitmovement 0 - setflag FLAG_0x002 - call EventScript_1629A8 - playse SE_FU_ZAKU2 - special DrawWholeMapView - waitse - setvar VAR_0x4068, 4 - releaseall - end + lockall + applymovement 255, Movement_1629F1 + waitmovement 0 + setflag FLAG_0x002 + call EventScript_1629A8 + playse SE_FU_ZAKU2 + special DrawWholeMapView + waitse + setvar VAR_0x4068, 4 + releaseall + end EventScript_1629A8:: @ 81629A8 - setmetatile 5, 14, 669, 1 - setmetatile 6, 14, 670, 1 - setmetatile 7, 14, 671, 1 - setmetatile 5, 15, 677, 1 - setmetatile 6, 15, 678, 1 - setmetatile 7, 15, 679, 1 - setmetatile 6, 16, 785, 0 - setmetatile 7, 16, 785, 0 - return + setmetatile 5, 14, 669, 1 + setmetatile 6, 14, 670, 1 + setmetatile 7, 14, 671, 1 + setmetatile 5, 15, 677, 1 + setmetatile 6, 15, 678, 1 + setmetatile 7, 15, 679, 1 + setmetatile 6, 16, 785, 0 + setmetatile 7, 16, 785, 0 + return Movement_1629F1:: @ 81629F1 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_end + step_11 + step_11 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_end PokemonLeague_LancesRoom_EventScript_162A14:: @ 8162A14 - lock - faceplayer - setvar VAR_0x8004, 12 - setvar VAR_0x8005, 2 - special UpdatePickStateFromSpecialVar8005 - checkflag FLAG_0x4BB - goto_if 1, EventScript_162AA1 - setvar VAR_0x8004, 12 - setvar VAR_0x8005, 0 - special SetFlavorTextFlagFromSpecialVars - setvar VAR_0x8004, 12 - setvar VAR_0x8005, 1 - special SetFlavorTextFlagFromSpecialVars - checkflag 2092 - call_if 0, EventScript_162A79 - checkflag 2092 - call_if 1, EventScript_162A82 - setflag FLAG_0x003 - setflag FLAG_0x005 - checkflag 2116 - call_if 0, EventScript_162A8B - checkflag 2116 - call_if 1, EventScript_162A96 - clearflag FLAG_0x005 - goto EventScript_162AAB + lock + faceplayer + setvar VAR_0x8004, 12 + setvar VAR_0x8005, 2 + special UpdatePickStateFromSpecialVar8005 + checkflag FLAG_0x4BB + goto_if 1, EventScript_162AA1 + setvar VAR_0x8004, 12 + setvar VAR_0x8005, 0 + special SetFlavorTextFlagFromSpecialVars + setvar VAR_0x8004, 12 + setvar VAR_0x8005, 1 + special SetFlavorTextFlagFromSpecialVars + checkflag 2092 + call_if 0, EventScript_162A79 + checkflag 2092 + call_if 1, EventScript_162A82 + setflag FLAG_0x003 + setflag FLAG_0x005 + checkflag 2116 + call_if 0, EventScript_162A8B + checkflag 2116 + call_if 1, EventScript_162A96 + clearflag FLAG_0x005 + goto EventScript_162AAB EventScript_162A78:: @ 8162A78 - end + end EventScript_162A79:: @ 8162A79 - loadword 0, gUnknown_8178764 - callstd 4 - return + loadword 0, gUnknown_8178764 + callstd 4 + return EventScript_162A82:: @ 8162A82 - loadword 0, gUnknown_81788BD - callstd 4 - return + loadword 0, gUnknown_81788BD + callstd 4 + return EventScript_162A8B:: @ 8162A8B - trainerbattle 3, 413, 0, Text_178A15 - return + trainerbattle 3, 413, 0, Text_178A15 + return EventScript_162A96:: @ 8162A96 - trainerbattle 3, 738, 0, Text_178A15 - return + trainerbattle 3, 738, 0, Text_178A15 + return EventScript_162AA1:: @ 8162AA1 - loadword 0, gUnknown_8178A52 - callstd 4 - release - end + loadword 0, gUnknown_8178A52 + callstd 4 + release + end EventScript_162AAB:: @ 8162AAB - setvar VAR_0x8004, 0 - special sub_8113530 - setflag FLAG_0x4BB - call EventScript_1A7563 - loadword 0, gUnknown_8178A52 - callstd 4 - closemessage - release - end + setvar VAR_0x8004, 0 + special sub_8113530 + setflag FLAG_0x4BB + call EventScript_1A7563 + loadword 0, gUnknown_8178A52 + callstd 4 + closemessage + release + end EventScript_162AC6:: @ 8162AC6 - applymovement 1, Movement_162ADC - waitmovement 0 - return + applymovement 1, Movement_162ADC + waitmovement 0 + return EventScript_162AD1:: @ 8162AD1 - applymovement 1, Movement_162ADF - waitmovement 0 - return + applymovement 1, Movement_162ADF + waitmovement 0 + return Movement_162ADC:: @ 8162ADC - step_12 - step_30 - step_end + step_12 + step_30 + step_end Movement_162ADF:: @ 8162ADF - step_13 - step_2f - step_end + step_13 + step_2f + step_end diff --git a/data/maps/PokemonLeague_LoreleisRoom/scripts.inc b/data/maps/PokemonLeague_LoreleisRoom/scripts.inc index 9455e97ed..a44edbd86 100644 --- a/data/maps/PokemonLeague_LoreleisRoom/scripts.inc +++ b/data/maps/PokemonLeague_LoreleisRoom/scripts.inc @@ -1,112 +1,112 @@ PokemonLeague_LoreleisRoom_MapScripts:: @ 816256C - map_script 5, PokemonLeague_LoreleisRoom_MapScript1_162586 - map_script 1, PokemonLeague_LoreleisRoom_MapScript2_162591 - map_script 3, PokemonLeague_LoreleisRoom_MapScript3_1625B2 - map_script 4, PokemonLeague_LoreleisRoom_MapScript4_1625B6 - map_script 2, PokemonLeague_LoreleisRoom_MapScript5_1625C5 - .byte 0 + map_script 5, PokemonLeague_LoreleisRoom_MapScript1_162586 + map_script 1, PokemonLeague_LoreleisRoom_MapScript2_162591 + map_script 3, PokemonLeague_LoreleisRoom_MapScript3_1625B2 + map_script 4, PokemonLeague_LoreleisRoom_MapScript4_1625B6 + map_script 2, PokemonLeague_LoreleisRoom_MapScript5_1625C5 + .byte 0 PokemonLeague_LoreleisRoom_MapScript1_162586:: @ 8162586 - setvar VAR_0x8004, 0 - call EventScript_1A75D5 - end + setvar VAR_0x8004, 0 + call EventScript_1A75D5 + end PokemonLeague_LoreleisRoom_MapScript2_162591:: @ 8162591 - checkflag FLAG_0x4B8 - call_if 1, EventScript_1625AC - compare_var_to_value VAR_0x4068, 1 - call_if 1, EventScript_1625A6 - end + checkflag FLAG_0x4B8 + call_if 1, EventScript_1625AC + compare_var_to_value VAR_0x4068, 1 + call_if 1, EventScript_1625A6 + end EventScript_1625A6:: @ 81625A6 - call EventScript_1A759C - return + call EventScript_1A759C + return EventScript_1625AC:: @ 81625AC - call EventScript_1A7538 - return + call EventScript_1A7538 + return PokemonLeague_LoreleisRoom_MapScript3_1625B2:: @ 81625B2 - setworldmapflag 2223 - end + setworldmapflag 2223 + end PokemonLeague_LoreleisRoom_MapScript4_1625B6:: @ 81625B6 - map_script_2 VAR_0x4001, 0, EventScript_1625C0 - .2byte 0 + map_script_2 VAR_0x4001, 0, EventScript_1625C0 + .2byte 0 EventScript_1625C0:: @ 81625C0 - turnobject 255, 2 - end + turnobject 255, 2 + end PokemonLeague_LoreleisRoom_MapScript5_1625C5:: @ 81625C5 - map_script_2 VAR_0x4068, 0, EventScript_1625CF - .2byte 0 + map_script_2 VAR_0x4068, 0, EventScript_1625CF + .2byte 0 EventScript_1625CF:: @ 81625CF - lockall - call EventScript_1A751F - setvar VAR_0x4068, 1 - releaseall - end + lockall + call EventScript_1A751F + setvar VAR_0x4068, 1 + releaseall + end PokemonLeague_LoreleisRoom_EventScript_1625DC:: @ 81625DC - lock - faceplayer - setvar VAR_0x8004, 9 - setvar VAR_0x8005, 2 - special UpdatePickStateFromSpecialVar8005 - checkflag FLAG_0x4B8 - goto_if 1, EventScript_162669 - setvar VAR_0x8004, 9 - setvar VAR_0x8005, 0 - special SetFlavorTextFlagFromSpecialVars - setvar VAR_0x8004, 9 - setvar VAR_0x8005, 1 - special SetFlavorTextFlagFromSpecialVars - checkflag 2116 - call_if 0, EventScript_162641 - checkflag 2116 - call_if 1, EventScript_16264A - setflag FLAG_0x003 - setflag FLAG_0x005 - checkflag 2116 - call_if 0, EventScript_162653 - checkflag 2116 - call_if 1, EventScript_16265E - clearflag FLAG_0x005 - goto EventScript_162673 + lock + faceplayer + setvar VAR_0x8004, 9 + setvar VAR_0x8005, 2 + special UpdatePickStateFromSpecialVar8005 + checkflag FLAG_0x4B8 + goto_if 1, EventScript_162669 + setvar VAR_0x8004, 9 + setvar VAR_0x8005, 0 + special SetFlavorTextFlagFromSpecialVars + setvar VAR_0x8004, 9 + setvar VAR_0x8005, 1 + special SetFlavorTextFlagFromSpecialVars + checkflag 2116 + call_if 0, EventScript_162641 + checkflag 2116 + call_if 1, EventScript_16264A + setflag FLAG_0x003 + setflag FLAG_0x005 + checkflag 2116 + call_if 0, EventScript_162653 + checkflag 2116 + call_if 1, EventScript_16265E + clearflag FLAG_0x005 + goto EventScript_162673 EventScript_162640:: @ 8162640 - end + end EventScript_162641:: @ 8162641 - loadword 0, gUnknown_8177FA4 - callstd 4 - return + loadword 0, gUnknown_8177FA4 + callstd 4 + return EventScript_16264A:: @ 816264A - loadword 0, gUnknown_8178089 - callstd 4 - return + loadword 0, gUnknown_8178089 + callstd 4 + return EventScript_162653:: @ 8162653 - trainerbattle 3, 410, 0, Text_178191 - return + trainerbattle 3, 410, 0, Text_178191 + return EventScript_16265E:: @ 816265E - trainerbattle 3, 735, 0, Text_178191 - return + trainerbattle 3, 735, 0, Text_178191 + return EventScript_162669:: @ 8162669 - loadword 0, gUnknown_81781B0 - callstd 4 - release - end + loadword 0, gUnknown_81781B0 + callstd 4 + release + end EventScript_162673:: @ 8162673 - setflag FLAG_0x4B8 - call EventScript_1A7506 - loadword 0, gUnknown_81781B0 - callstd 4 - release - end + setflag FLAG_0x4B8 + call EventScript_1A7506 + loadword 0, gUnknown_81781B0 + callstd 4 + release + end diff --git a/data/maps/PokemonMansion_1F/scripts.inc b/data/maps/PokemonMansion_1F/scripts.inc index d56f4ed71..ddd356f46 100644 --- a/data/maps/PokemonMansion_1F/scripts.inc +++ b/data/maps/PokemonMansion_1F/scripts.inc @@ -1,35 +1,35 @@ PokemonMansion_1F_MapScripts:: @ 81621F9 - map_script 1, PokemonMansion_1F_MapScript1_162204 - map_script 3, PokemonMansion_1F_MapScript2_16220E - .byte 0 + map_script 1, PokemonMansion_1F_MapScript1_162204 + map_script 3, PokemonMansion_1F_MapScript2_16220E + .byte 0 PokemonMansion_1F_MapScript1_162204:: @ 8162204 - checkflag FLAG_0x26C - call_if 1, EventScript_1A7B7A - end + checkflag FLAG_0x26C + call_if 1, EventScript_1A7B7A + end PokemonMansion_1F_MapScript2_16220E:: @ 816220E - setworldmapflag 2221 - end + setworldmapflag 2221 + end PokemonMansion_1F_EventScript_162212:: @ 8162212 - lockall - setvar VAR_0x8004, 0 - call EventScript_1A7AE2 - playse SE_FU_ZAKU2 - special DrawWholeMapView - waitse - releaseall - end + lockall + setvar VAR_0x8004, 0 + call EventScript_1A7AE2 + playse SE_FU_ZAKU2 + special DrawWholeMapView + waitse + releaseall + end PokemonMansion_1F_EventScript_162226:: @ 8162226 - trainerbattle 0, 335, 0, Text_177364, Text_177391 - loadword 0, gUnknown_8177397 - callstd 6 - end + trainerbattle 0, 335, 0, Text_177364, Text_177391 + loadword 0, gUnknown_8177397 + callstd 6 + end PokemonMansion_1F_EventScript_16223D:: @ 816223D - trainerbattle 0, 534, 0, Text_1773C6, Text_1773FD - loadword 0, gUnknown_8177418 - callstd 6 - end + trainerbattle 0, 534, 0, Text_1773C6, Text_1773FD + loadword 0, gUnknown_8177418 + callstd 6 + end diff --git a/data/maps/PokemonMansion_2F/scripts.inc b/data/maps/PokemonMansion_2F/scripts.inc index 1181e8c86..4c6430678 100644 --- a/data/maps/PokemonMansion_2F/scripts.inc +++ b/data/maps/PokemonMansion_2F/scripts.inc @@ -1,34 +1,34 @@ PokemonMansion_2F_MapScripts:: @ 8162254 - map_script 1, PokemonMansion_2F_MapScript1_16225A - .byte 0 + map_script 1, PokemonMansion_2F_MapScript1_16225A + .byte 0 PokemonMansion_2F_MapScript1_16225A:: @ 816225A - checkflag FLAG_0x26C - call_if 1, EventScript_1A7D3E - end + checkflag FLAG_0x26C + call_if 1, EventScript_1A7D3E + end PokemonMansion_2F_EventScript_162264:: @ 8162264 - lockall - setvar VAR_0x8004, 1 - call EventScript_1A7AE2 - playse SE_FU_ZAKU2 - special DrawWholeMapView - waitse - releaseall - end + lockall + setvar VAR_0x8004, 1 + call EventScript_1A7AE2 + playse SE_FU_ZAKU2 + special DrawWholeMapView + waitse + releaseall + end PokemonMansion_2F_EventScript_162278:: @ 8162278 - loadword 0, gUnknown_817751F - callstd 3 - end + loadword 0, gUnknown_817751F + callstd 3 + end PokemonMansion_2F_EventScript_162281:: @ 8162281 - loadword 0, gUnknown_8177574 - callstd 3 - end + loadword 0, gUnknown_8177574 + callstd 3 + end PokemonMansion_2F_EventScript_16228A:: @ 816228A - trainerbattle 0, 216, 0, Text_177498, Text_1774CB - loadword 0, gUnknown_81774E3 - callstd 6 - end + trainerbattle 0, 216, 0, Text_177498, Text_1774CB + loadword 0, gUnknown_81774E3 + callstd 6 + end diff --git a/data/maps/PokemonMansion_3F/scripts.inc b/data/maps/PokemonMansion_3F/scripts.inc index 291dd4649..d87d5a14f 100644 --- a/data/maps/PokemonMansion_3F/scripts.inc +++ b/data/maps/PokemonMansion_3F/scripts.inc @@ -1,35 +1,35 @@ PokemonMansion_3F_MapScripts:: @ 81622A1 - map_script 1, PokemonMansion_3F_MapScript1_1622A7 - .byte 0 + map_script 1, PokemonMansion_3F_MapScript1_1622A7 + .byte 0 PokemonMansion_3F_MapScript1_1622A7:: @ 81622A7 - checkflag FLAG_0x26C - call_if 1, EventScript_1A7E72 - end + checkflag FLAG_0x26C + call_if 1, EventScript_1A7E72 + end PokemonMansion_3F_EventScript_1622B1:: @ 81622B1 - lockall - setvar VAR_0x8004, 2 - call EventScript_1A7AE2 - playse SE_FU_ZAKU2 - special DrawWholeMapView - waitse - releaseall - end + lockall + setvar VAR_0x8004, 2 + call EventScript_1A7AE2 + playse SE_FU_ZAKU2 + special DrawWholeMapView + waitse + releaseall + end PokemonMansion_3F_EventScript_1622C5:: @ 81622C5 - loadword 0, gUnknown_8177685 - callstd 3 - end + loadword 0, gUnknown_8177685 + callstd 3 + end PokemonMansion_3F_EventScript_1622CE:: @ 81622CE - trainerbattle 0, 218, 0, Text_1775E7, Text_177602 - loadword 0, gUnknown_8177608 - callstd 6 - end + trainerbattle 0, 218, 0, Text_1775E7, Text_177602 + loadword 0, gUnknown_8177608 + callstd 6 + end PokemonMansion_3F_EventScript_1622E5:: @ 81622E5 - trainerbattle 0, 346, 0, Text_177628, Text_177643 - loadword 0, gUnknown_8177657 - callstd 6 - end + trainerbattle 0, 346, 0, Text_177628, Text_177643 + loadword 0, gUnknown_8177657 + callstd 6 + end diff --git a/data/maps/PokemonMansion_B1F/scripts.inc b/data/maps/PokemonMansion_B1F/scripts.inc index 3a5b974bd..82081b405 100644 --- a/data/maps/PokemonMansion_B1F/scripts.inc +++ b/data/maps/PokemonMansion_B1F/scripts.inc @@ -1,35 +1,35 @@ PokemonMansion_B1F_MapScripts:: @ 81622FC - map_script 1, PokemonMansion_B1F_MapScript1_162302 - .byte 0 + map_script 1, PokemonMansion_B1F_MapScript1_162302 + .byte 0 PokemonMansion_B1F_MapScript1_162302:: @ 8162302 - checkflag FLAG_0x26C - call_if 1, EventScript_1A7F4C - end + checkflag FLAG_0x26C + call_if 1, EventScript_1A7F4C + end PokemonMansion_B1F_EventScript_16230C:: @ 816230C - lockall - setvar VAR_0x8004, 3 - call EventScript_1A7AE2 - playse SE_FU_ZAKU2 - special DrawWholeMapView - waitse - releaseall - end + lockall + setvar VAR_0x8004, 3 + call EventScript_1A7AE2 + playse SE_FU_ZAKU2 + special DrawWholeMapView + waitse + releaseall + end PokemonMansion_B1F_EventScript_162320:: @ 8162320 - loadword 0, gUnknown_8177798 - callstd 3 - end + loadword 0, gUnknown_8177798 + callstd 3 + end PokemonMansion_B1F_EventScript_162329:: @ 8162329 - trainerbattle 0, 219, 0, Text_1776C0, Text_1776D7 - loadword 0, gUnknown_81776DE - callstd 6 - end + trainerbattle 0, 219, 0, Text_1776C0, Text_1776D7 + loadword 0, gUnknown_81776DE + callstd 6 + end PokemonMansion_B1F_EventScript_162340:: @ 8162340 - trainerbattle 0, 347, 0, Text_177720, Text_177757 - loadword 0, gUnknown_817776A - callstd 6 - end + trainerbattle 0, 347, 0, Text_177720, Text_177757 + loadword 0, gUnknown_817776A + callstd 6 + end diff --git a/data/maps/PokemonTower_1F/scripts.inc b/data/maps/PokemonTower_1F/scripts.inc index 534901cf6..1e764e397 100644 --- a/data/maps/PokemonTower_1F/scripts.inc +++ b/data/maps/PokemonTower_1F/scripts.inc @@ -1,44 +1,44 @@ PokemonTower_1F_MapScripts:: @ 8163235 - map_script 3, PokemonTower_1F_MapScript1_16323B - .byte 0 + map_script 3, PokemonTower_1F_MapScript1_16323B + .byte 0 PokemonTower_1F_MapScript1_16323B:: @ 816323B - setworldmapflag 2226 - end + setworldmapflag 2226 + end PokemonTower_1F_EventScript_16323F:: @ 816323F - loadword 0, gUnknown_8179CAB - callstd 2 - end + loadword 0, gUnknown_8179CAB + callstd 2 + end PokemonTower_1F_EventScript_163248:: @ 8163248 - loadword 0, gUnknown_8179C8C - callstd 2 - end + loadword 0, gUnknown_8179C8C + callstd 2 + end PokemonTower_1F_EventScript_163251:: @ 8163251 - loadword 0, gUnknown_8179C41 - callstd 2 - end + loadword 0, gUnknown_8179C41 + callstd 2 + end PokemonTower_1F_EventScript_16325A:: @ 816325A - lock - faceplayer - checkplayergender - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_163272 - loadword 0, gUnknown_8179BFC - callstd 4 - release - end + lock + faceplayer + checkplayergender + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_163272 + loadword 0, gUnknown_8179BFC + callstd 4 + release + end EventScript_163272:: @ 8163272 - loadword 0, gUnknown_8179BB8 - callstd 4 - release - end + loadword 0, gUnknown_8179BB8 + callstd 4 + release + end PokemonTower_1F_EventScript_16327C:: @ 816327C - loadword 0, gUnknown_8179B7A - callstd 2 - end + loadword 0, gUnknown_8179B7A + callstd 2 + end diff --git a/data/maps/PokemonTower_2F/scripts.inc b/data/maps/PokemonTower_2F/scripts.inc index 68c3be0c0..d281aef8b 100644 --- a/data/maps/PokemonTower_2F/scripts.inc +++ b/data/maps/PokemonTower_2F/scripts.inc @@ -1,111 +1,111 @@ PokemonTower_2F_MapScripts:: @ 8163285 - .byte 0 + .byte 0 PokemonTower_2F_EventScript_163286:: @ 8163286 - loadword 0, gUnknown_8179EAE - callstd 2 - end + loadword 0, gUnknown_8179EAE + callstd 2 + end PokemonTower_2F_EventScript_16328F:: @ 816328F - lockall - setvar VAR_0x4001, 0 - goto EventScript_1632A7 - end + lockall + setvar VAR_0x4001, 0 + goto EventScript_1632A7 + end PokemonTower_2F_EventScript_16329B:: @ 816329B - lockall - setvar VAR_0x4001, 1 - goto EventScript_1632A7 - end + lockall + setvar VAR_0x4001, 1 + goto EventScript_1632A7 + end EventScript_1632A7:: @ 81632A7 - textcolor 0 - playbgm BGM_FRLG_RIVAL, 0 - compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_163339 - compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_16334B - applymovement 1, Movement_1A75DB - waitmovement 0 - applymovement 1, Movement_1A75DD - waitmovement 0 - loadword 0, gUnknown_8179CFF - callstd 4 - setvar VAR_LAST_TALKED, 1 - compare_var_to_value VAR_STARTER_MON, 2 - call_if 1, EventScript_16335D - compare_var_to_value VAR_STARTER_MON, 1 - call_if 1, EventScript_163368 - compare_var_to_value VAR_STARTER_MON, 0 - call_if 1, EventScript_163373 - loadword 0, gUnknown_8179DD4 - callstd 4 - closemessage - playbgm BGM_FRLG_RIVAL_POSTBATTLE, 0 - compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_16337E - compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_163389 - playse SE_KAIDAN - delay 25 - fadedefaultbgm - removeobject 1 - setvar VAR_0x405D, 1 - releaseall - end + textcolor 0 + playbgm BGM_FRLG_RIVAL, 0 + compare_var_to_value VAR_0x4001, 0 + call_if 1, EventScript_163339 + compare_var_to_value VAR_0x4001, 1 + call_if 1, EventScript_16334B + applymovement 1, Movement_1A75DB + waitmovement 0 + applymovement 1, Movement_1A75DD + waitmovement 0 + loadword 0, gUnknown_8179CFF + callstd 4 + setvar VAR_LAST_TALKED, 1 + compare_var_to_value VAR_STARTER_MON, 2 + call_if 1, EventScript_16335D + compare_var_to_value VAR_STARTER_MON, 1 + call_if 1, EventScript_163368 + compare_var_to_value VAR_STARTER_MON, 0 + call_if 1, EventScript_163373 + loadword 0, gUnknown_8179DD4 + callstd 4 + closemessage + playbgm BGM_FRLG_RIVAL_POSTBATTLE, 0 + compare_var_to_value VAR_0x4001, 0 + call_if 1, EventScript_16337E + compare_var_to_value VAR_0x4001, 1 + call_if 1, EventScript_163389 + playse SE_KAIDAN + delay 25 + fadedefaultbgm + removeobject 1 + setvar VAR_0x405D, 1 + releaseall + end EventScript_163339:: @ 8163339 - applymovement 1, Movement_1A75EB - applymovement 255, Movement_1A75E7 - waitmovement 0 - return + applymovement 1, Movement_1A75EB + applymovement 255, Movement_1A75E7 + waitmovement 0 + return EventScript_16334B:: @ 816334B - applymovement 1, Movement_1A75ED - applymovement 255, Movement_1A75E9 - waitmovement 0 - return + applymovement 1, Movement_1A75ED + applymovement 255, Movement_1A75E9 + waitmovement 0 + return EventScript_16335D:: @ 816335D - trainerbattle 3, 429, 0, Text_179D73 - return + trainerbattle 3, 429, 0, Text_179D73 + return EventScript_163368:: @ 8163368 - trainerbattle 3, 430, 0, Text_179D73 - return + trainerbattle 3, 430, 0, Text_179D73 + return EventScript_163373:: @ 8163373 - trainerbattle 3, 431, 0, Text_179D73 - return + trainerbattle 3, 431, 0, Text_179D73 + return EventScript_16337E:: @ 816337E - applymovement 1, Movement_163394 - waitmovement 0 - return + applymovement 1, Movement_163394 + waitmovement 0 + return EventScript_163389:: @ 8163389 - applymovement 1, Movement_16339D - waitmovement 0 - return + applymovement 1, Movement_16339D + waitmovement 0 + return Movement_163394:: @ 8163394 - step_10 - step_13 - step_13 - step_10 - step_10 - step_10 - step_10 - step_30 - step_end + step_10 + step_13 + step_13 + step_10 + step_10 + step_10 + step_10 + step_30 + step_end Movement_16339D:: @ 816339D - step_13 - step_13 - step_10 - step_10 - step_10 - step_10 - step_10 - step_30 - step_end + step_13 + step_13 + step_10 + step_10 + step_10 + step_10 + step_10 + step_30 + step_end diff --git a/data/maps/PokemonTower_3F/scripts.inc b/data/maps/PokemonTower_3F/scripts.inc index 69ad8edac..7cf39e467 100644 --- a/data/maps/PokemonTower_3F/scripts.inc +++ b/data/maps/PokemonTower_3F/scripts.inc @@ -1,20 +1,20 @@ PokemonTower_3F_MapScripts:: @ 81633A6 - .byte 0 + .byte 0 PokemonTower_3F_EventScript_1633A7:: @ 81633A7 - trainerbattle 0, 441, 0, Text_179FA0, Text_179FBC - loadword 0, gUnknown_8179FD3 - callstd 6 - end + trainerbattle 0, 441, 0, Text_179FA0, Text_179FBC + loadword 0, gUnknown_8179FD3 + callstd 6 + end PokemonTower_3F_EventScript_1633BE:: @ 81633BE - trainerbattle 0, 442, 0, Text_179F62, Text_179F72 - loadword 0, gUnknown_8179F88 - callstd 6 - end + trainerbattle 0, 442, 0, Text_179F62, Text_179F72 + loadword 0, gUnknown_8179F88 + callstd 6 + end PokemonTower_3F_EventScript_1633D5:: @ 81633D5 - trainerbattle 0, 443, 0, Text_179F09, Text_179F21 - loadword 0, gUnknown_8179F31 - callstd 6 - end + trainerbattle 0, 443, 0, Text_179F09, Text_179F21 + loadword 0, gUnknown_8179F31 + callstd 6 + end diff --git a/data/maps/PokemonTower_4F/scripts.inc b/data/maps/PokemonTower_4F/scripts.inc index ada885b73..1baffb2f6 100644 --- a/data/maps/PokemonTower_4F/scripts.inc +++ b/data/maps/PokemonTower_4F/scripts.inc @@ -1,20 +1,20 @@ PokemonTower_4F_MapScripts:: @ 81633EC - .byte 0 + .byte 0 PokemonTower_4F_EventScript_1633ED:: @ 81633ED - trainerbattle 0, 444, 0, Text_17A004, Text_17A017 - loadword 0, gUnknown_817A02B - callstd 6 - end + trainerbattle 0, 444, 0, Text_17A004, Text_17A017 + loadword 0, gUnknown_817A02B + callstd 6 + end PokemonTower_4F_EventScript_163404:: @ 8163404 - trainerbattle 0, 445, 0, Text_17A046, Text_17A061 - loadword 0, gUnknown_817A067 - callstd 6 - end + trainerbattle 0, 445, 0, Text_17A046, Text_17A061 + loadword 0, gUnknown_817A067 + callstd 6 + end PokemonTower_4F_EventScript_16341B:: @ 816341B - trainerbattle 0, 446, 0, Text_17A096, Text_17A0AB - loadword 0, gUnknown_817A0BB - callstd 6 - end + trainerbattle 0, 446, 0, Text_17A096, Text_17A0AB + loadword 0, gUnknown_817A0BB + callstd 6 + end diff --git a/data/maps/PokemonTower_5F/scripts.inc b/data/maps/PokemonTower_5F/scripts.inc index c7a7e7512..a703646cc 100644 --- a/data/maps/PokemonTower_5F/scripts.inc +++ b/data/maps/PokemonTower_5F/scripts.inc @@ -1,48 +1,48 @@ PokemonTower_5F_MapScripts:: @ 8163432 - .byte 0 + .byte 0 PokemonTower_5F_EventScript_163433:: @ 8163433 - loadword 0, gUnknown_817A0E3 - callstd 2 - end + loadword 0, gUnknown_817A0E3 + callstd 2 + end PokemonTower_5F_EventScript_16343C:: @ 816343C - lockall - fadescreen 3 - special sp000_heal_pokemon - fadescreen 2 - loadword 0, gUnknown_817A1FA - callstd 4 - setvar VAR_0x4001, 1 - releaseall - end + lockall + fadescreen 3 + special sp000_heal_pokemon + fadescreen 2 + loadword 0, gUnknown_817A1FA + callstd 4 + setvar VAR_0x4001, 1 + releaseall + end PokemonTower_5F_EventScript_163453:: @ 8163453 - lockall - setvar VAR_0x4001, 0 - releaseall - end + lockall + setvar VAR_0x4001, 0 + releaseall + end PokemonTower_5F_EventScript_16345B:: @ 816345B - trainerbattle 0, 447, 0, Text_17A11F, Text_17A132 - loadword 0, gUnknown_817A138 - callstd 6 - end + trainerbattle 0, 447, 0, Text_17A11F, Text_17A132 + loadword 0, gUnknown_817A138 + callstd 6 + end PokemonTower_5F_EventScript_163472:: @ 8163472 - trainerbattle 0, 448, 0, Text_17A150, Text_17A164 - loadword 0, gUnknown_817A176 - callstd 6 - end + trainerbattle 0, 448, 0, Text_17A150, Text_17A164 + loadword 0, gUnknown_817A176 + callstd 6 + end PokemonTower_5F_EventScript_163489:: @ 8163489 - trainerbattle 0, 449, 0, Text_17A187, Text_17A190 - loadword 0, gUnknown_817A194 - callstd 6 - end + trainerbattle 0, 449, 0, Text_17A187, Text_17A190 + loadword 0, gUnknown_817A194 + callstd 6 + end PokemonTower_5F_EventScript_1634A0:: @ 81634A0 - trainerbattle 0, 450, 0, Text_17A1AA, Text_17A1B7 - loadword 0, gUnknown_817A1BD - callstd 6 - end + trainerbattle 0, 450, 0, Text_17A1AA, Text_17A1B7 + loadword 0, gUnknown_817A1BD + callstd 6 + end diff --git a/data/maps/PokemonTower_6F/scripts.inc b/data/maps/PokemonTower_6F/scripts.inc index 17e67b0fa..352a8b6b2 100644 --- a/data/maps/PokemonTower_6F/scripts.inc +++ b/data/maps/PokemonTower_6F/scripts.inc @@ -1,56 +1,56 @@ PokemonTower_6F_MapScripts:: @ 81634B7 - .byte 0 + .byte 0 PokemonTower_6F_EventScript_1634B8:: @ 81634B8 - lockall - textcolor 2 - loadword 0, gUnknown_817A2F8 - callstd 4 - special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 - setwildbattle SPECIES_MAROWAK, 30, ITEM_NONE - special sub_807F904 - waitstate - special sub_8112364 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1634F5 - applymovement 255, Movement_163512 - waitmovement 0 - releaseall - end + lockall + textcolor 2 + loadword 0, gUnknown_817A2F8 + callstd 4 + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + setwildbattle SPECIES_MAROWAK, 30, ITEM_NONE + special sub_807F904 + waitstate + special sub_8112364 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_1634F5 + applymovement 255, Movement_163512 + waitmovement 0 + releaseall + end EventScript_1634F5:: @ 81634F5 - message Text_17A30C - waitmessage - waitse - playmoncry SPECIES_MAROWAK, 0 - waitbuttonpress - waitmoncry - loadword 0, gUnknown_817A342 - callstd 4 - setvar VAR_0x4059, 1 - releaseall - end + message Text_17A30C + waitmessage + waitse + playmoncry SPECIES_MAROWAK, 0 + waitbuttonpress + waitmoncry + loadword 0, gUnknown_817A342 + callstd 4 + setvar VAR_0x4059, 1 + releaseall + end Movement_163512:: @ 8163512 - step_11 - step_end + step_11 + step_end PokemonTower_6F_EventScript_163514:: @ 8163514 - trainerbattle 0, 451, 0, Text_17A243, Text_17A253 - loadword 0, gUnknown_817A25A - callstd 6 - end + trainerbattle 0, 451, 0, Text_17A243, Text_17A253 + loadword 0, gUnknown_817A25A + callstd 6 + end PokemonTower_6F_EventScript_16352B:: @ 816352B - trainerbattle 0, 452, 0, Text_17A272, Text_17A27F - loadword 0, gUnknown_817A293 - callstd 6 - end + trainerbattle 0, 452, 0, Text_17A272, Text_17A27F + loadword 0, gUnknown_817A293 + callstd 6 + end PokemonTower_6F_EventScript_163542:: @ 8163542 - trainerbattle 0, 453, 0, Text_17A2C8, Text_17A2DC - loadword 0, gUnknown_817A2E2 - callstd 6 - end + trainerbattle 0, 453, 0, Text_17A2C8, Text_17A2DC + loadword 0, gUnknown_817A2E2 + callstd 6 + end diff --git a/data/maps/PokemonTower_7F/scripts.inc b/data/maps/PokemonTower_7F/scripts.inc index 29b281222..331b2db07 100644 --- a/data/maps/PokemonTower_7F/scripts.inc +++ b/data/maps/PokemonTower_7F/scripts.inc @@ -1,249 +1,249 @@ PokemonTower_7F_MapScripts:: @ 8163559 - .byte 0 + .byte 0 PokemonTower_7F_EventScript_16355A:: @ 816355A - lock - faceplayer - setvar VAR_0x8004, 14 - setvar VAR_0x8005, 2 - special UpdatePickStateFromSpecialVar8005 - setflag FLAG_0x034 - clearflag FLAG_0x035 - setflag FLAG_0x23C - loadword 0, gUnknown_817A529 - callstd 4 - closemessage - warp MAP_LAVENDER_TOWN_VOLUNTEER_POKEMON_HOUSE, 255, 4, 7 - waitstate - release - end + lock + faceplayer + setvar VAR_0x8004, 14 + setvar VAR_0x8005, 2 + special UpdatePickStateFromSpecialVar8005 + setflag FLAG_0x034 + clearflag FLAG_0x035 + setflag FLAG_0x23C + loadword 0, gUnknown_817A529 + callstd 4 + closemessage + warp MAP_LAVENDER_TOWN_VOLUNTEER_POKEMON_HOUSE, 255, 4, 7 + waitstate + release + end PokemonTower_7F_EventScript_163586:: @ 8163586 - trainerbattle 2, 369, 0, Text_17A380, Text_17A3A4, EventScript_1635A1 - loadword 0, gUnknown_817A3AF - callstd 6 - end + trainerbattle 2, 369, 0, Text_17A380, Text_17A3A4, EventScript_1635A1 + loadword 0, gUnknown_817A3AF + callstd 6 + end EventScript_1635A1:: @ 81635A1 - loadword 0, gUnknown_817A3AF - callstd 4 - closemessage - getplayerxy VAR_0x8004, VAR_0x8005 - compare_var_to_value VAR_0x8004, 10 - goto_if 1, EventScript_1635E0 - compare_var_to_value VAR_0x8004, 11 - goto_if 1, EventScript_1635F0 - compare_var_to_value VAR_0x8004, 9 - goto_if 1, EventScript_163600 - applymovement 2, Movement_16362C - waitmovement 0 - goto EventScript_163616 - end + loadword 0, gUnknown_817A3AF + callstd 4 + closemessage + getplayerxy VAR_0x8004, VAR_0x8005 + compare_var_to_value VAR_0x8004, 10 + goto_if 1, EventScript_1635E0 + compare_var_to_value VAR_0x8004, 11 + goto_if 1, EventScript_1635F0 + compare_var_to_value VAR_0x8004, 9 + goto_if 1, EventScript_163600 + applymovement 2, Movement_16362C + waitmovement 0 + goto EventScript_163616 + end EventScript_1635E0:: @ 81635E0 - applymovement 2, Movement_16361B - waitmovement 0 - goto EventScript_163616 - end + applymovement 2, Movement_16361B + waitmovement 0 + goto EventScript_163616 + end EventScript_1635F0:: @ 81635F0 - applymovement 2, Movement_163624 - waitmovement 0 - goto EventScript_163616 - end + applymovement 2, Movement_163624 + waitmovement 0 + goto EventScript_163616 + end EventScript_163600:: @ 8163600 - applymovement 2, Movement_163633 - waitmovement 0 - playse SE_KAIDAN - delay 25 - goto EventScript_163616 - end + applymovement 2, Movement_163633 + waitmovement 0 + playse SE_KAIDAN + delay 25 + goto EventScript_163616 + end EventScript_163616:: @ 8163616 - removeobject 2 - release - end + removeobject 2 + release + end Movement_16361B:: @ 816361B - step_10 - step_13 - step_10 - step_10 - step_10 - step_13 - step_10 - step_10 - step_end + step_10 + step_13 + step_10 + step_10 + step_10 + step_13 + step_10 + step_10 + step_end Movement_163624:: @ 8163624 - step_10 - step_10 - step_10 - step_10 - step_13 - step_10 - step_10 - step_end + step_10 + step_10 + step_10 + step_10 + step_13 + step_10 + step_10 + step_end Movement_16362C:: @ 816362C - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_end + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_end Movement_163633:: @ 8163633 - step_13 - step_10 - step_10 - step_10 - step_10 - step_13 - step_10 - step_10 - step_2f - step_end + step_13 + step_10 + step_10 + step_10 + step_10 + step_13 + step_10 + step_10 + step_2f + step_end PokemonTower_7F_EventScript_16363D:: @ 816363D - trainerbattle 2, 370, 0, Text_17A3CD, Text_17A466, EventScript_163658 - loadword 0, gUnknown_817A477 - callstd 6 - end + trainerbattle 2, 370, 0, Text_17A3CD, Text_17A466, EventScript_163658 + loadword 0, gUnknown_817A477 + callstd 6 + end EventScript_163658:: @ 8163658 - setvar VAR_0x8004, 14 - setvar VAR_0x8005, 1 - special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_817A477 - callstd 4 - closemessage - getplayerxy VAR_0x8004, VAR_0x8005 - compare_var_to_value VAR_0x8004, 12 - goto_if 1, EventScript_163699 - compare_var_to_value VAR_0x8004, 13 - goto_if 1, EventScript_1636A9 - applymovement 3, Movement_1636C6 - waitmovement 0 - goto EventScript_1636B9 - end + setvar VAR_0x8004, 14 + setvar VAR_0x8005, 1 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_817A477 + callstd 4 + closemessage + getplayerxy VAR_0x8004, VAR_0x8005 + compare_var_to_value VAR_0x8004, 12 + goto_if 1, EventScript_163699 + compare_var_to_value VAR_0x8004, 13 + goto_if 1, EventScript_1636A9 + applymovement 3, Movement_1636C6 + waitmovement 0 + goto EventScript_1636B9 + end EventScript_163699:: @ 8163699 - applymovement 3, Movement_1636BE - waitmovement 0 - goto EventScript_1636B9 - end + applymovement 3, Movement_1636BE + waitmovement 0 + goto EventScript_1636B9 + end EventScript_1636A9:: @ 81636A9 - applymovement 3, Movement_1636CD - waitmovement 0 - goto EventScript_1636B9 - end + applymovement 3, Movement_1636CD + waitmovement 0 + goto EventScript_1636B9 + end EventScript_1636B9:: @ 81636B9 - removeobject 3 - release - end + removeobject 3 + release + end Movement_1636BE:: @ 81636BE - step_10 - step_10 - step_10 - step_12 - step_10 - step_10 - step_10 - step_end + step_10 + step_10 + step_10 + step_12 + step_10 + step_10 + step_10 + step_end Movement_1636C6:: @ 81636C6 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_end + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_end Movement_1636CD:: @ 81636CD - step_12 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_end + step_12 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_end PokemonTower_7F_EventScript_1636D6:: @ 81636D6 - trainerbattle 2, 371, 0, Text_17A4CF, Text_17A4EE, EventScript_1636F1 - loadword 0, gUnknown_817A506 - callstd 6 - end + trainerbattle 2, 371, 0, Text_17A4CF, Text_17A4EE, EventScript_1636F1 + loadword 0, gUnknown_817A506 + callstd 6 + end EventScript_1636F1:: @ 81636F1 - loadword 0, gUnknown_817A506 - callstd 4 - closemessage - getplayerxy VAR_0x8004, VAR_0x8005 - compare_var_to_value VAR_0x8004, 10 - goto_if 1, EventScript_163725 - compare_var_to_value VAR_0x8004, 9 - goto_if 1, EventScript_163735 - applymovement 4, Movement_163754 - waitmovement 0 - goto EventScript_163745 - end + loadword 0, gUnknown_817A506 + callstd 4 + closemessage + getplayerxy VAR_0x8004, VAR_0x8005 + compare_var_to_value VAR_0x8004, 10 + goto_if 1, EventScript_163725 + compare_var_to_value VAR_0x8004, 9 + goto_if 1, EventScript_163735 + applymovement 4, Movement_163754 + waitmovement 0 + goto EventScript_163745 + end EventScript_163725:: @ 8163725 - applymovement 4, Movement_16374C - waitmovement 0 - goto EventScript_163745 - end + applymovement 4, Movement_16374C + waitmovement 0 + goto EventScript_163745 + end EventScript_163735:: @ 8163735 - applymovement 4, Movement_16375B - waitmovement 0 - goto EventScript_163745 - end + applymovement 4, Movement_16375B + waitmovement 0 + goto EventScript_163745 + end EventScript_163745:: @ 8163745 - removeobject 4 - release - end + removeobject 4 + release + end EventScript_16374A:: @ 816374A - release - end + release + end Movement_16374C:: @ 816374C - step_10 - step_10 - step_10 - step_10 - step_10 - step_13 - step_10 - step_end + step_10 + step_10 + step_10 + step_10 + step_10 + step_13 + step_10 + step_end Movement_163754:: @ 8163754 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_end + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_end Movement_16375B:: @ 816375B - step_13 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_end + step_13 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_end diff --git a/data/maps/PowerPlant/scripts.inc b/data/maps/PowerPlant/scripts.inc index 78878b456..8f7f15d54 100644 --- a/data/maps/PowerPlant/scripts.inc +++ b/data/maps/PowerPlant/scripts.inc @@ -1,141 +1,141 @@ PowerPlant_MapScripts:: @ 8163764 - map_script 5, PowerPlant_MapScript1_16376F - map_script 3, PowerPlant_MapScript2_16378D - .byte 0 + map_script 5, PowerPlant_MapScript1_16376F + map_script 3, PowerPlant_MapScript2_16378D + .byte 0 PowerPlant_MapScript1_16376F:: @ 816376F - checkflag 2055 - call_if 1, EventScript_163779 - end + checkflag 2055 + call_if 1, EventScript_163779 + end EventScript_163779:: @ 8163779 - specialvar VAR_RESULT, sub_80CA74C - compare_var_to_value VAR_RESULT, 7 - goto_if 5, EventScript_1A77A9 - removeobject VAR_LAST_TALKED - return + specialvar VAR_RESULT, sub_80CA74C + compare_var_to_value VAR_RESULT, 7 + goto_if 5, EventScript_1A77A9 + removeobject VAR_LAST_TALKED + return PowerPlant_MapScript2_16378D:: @ 816378D - setworldmapflag 2228 - checkflag FLAG_0x2BF - call_if 0, EventScript_1637AC - checkflag FLAG_0x2D0 - call_if 0, EventScript_1637B0 - checkflag FLAG_0x2D1 - call_if 0, EventScript_1637B4 - end + setworldmapflag 2228 + checkflag FLAG_0x2BF + call_if 0, EventScript_1637AC + checkflag FLAG_0x2D0 + call_if 0, EventScript_1637B0 + checkflag FLAG_0x2D1 + call_if 0, EventScript_1637B4 + end EventScript_1637AC:: @ 81637AC - clearflag FLAG_0x05D - return + clearflag FLAG_0x05D + return EventScript_1637B0:: @ 81637B0 - clearflag FLAG_0x085 - return + clearflag FLAG_0x085 + return EventScript_1637B4:: @ 81637B4 - clearflag FLAG_0x086 - return + clearflag FLAG_0x086 + return PowerPlant_EventScript_1637B8:: @ 81637B8 - special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 - special sub_8112364 - lock - faceplayer - setwildbattle SPECIES_ZAPDOS, 50, ITEM_NONE - waitse - playmoncry SPECIES_ZAPDOS, 2 - message Text_1A6448 - waitmessage - waitmoncry - delay 10 - playbgm BGM_FRLG_LEADER_EYE, 0 - waitbuttonpress - setflag 2055 - special sub_807F9D8 - waitstate - clearflag 2055 - specialvar VAR_RESULT, sub_80CA74C - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16381B - compare_var_to_value VAR_RESULT, 4 - goto_if 1, EventScript_163824 - compare_var_to_value VAR_RESULT, 5 - goto_if 1, EventScript_163824 - setflag FLAG_0x2BF - release - end + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + special sub_8112364 + lock + faceplayer + setwildbattle SPECIES_ZAPDOS, 50, ITEM_NONE + waitse + playmoncry SPECIES_ZAPDOS, 2 + message Text_1A6448 + waitmessage + waitmoncry + delay 10 + playbgm BGM_FRLG_LEADER_EYE, 0 + waitbuttonpress + setflag 2055 + special sub_807F9D8 + waitstate + clearflag 2055 + specialvar VAR_RESULT, sub_80CA74C + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16381B + compare_var_to_value VAR_RESULT, 4 + goto_if 1, EventScript_163824 + compare_var_to_value VAR_RESULT, 5 + goto_if 1, EventScript_163824 + setflag FLAG_0x2BF + release + end EventScript_16381B:: @ 816381B - setflag FLAG_0x2BF - goto EventScript_1A922D - end + setflag FLAG_0x2BF + goto EventScript_1A922D + end EventScript_163824:: @ 8163824 - setvar VAR_0x8004, 145 - goto EventScript_1A9236 - end + setvar VAR_0x8004, 145 + goto EventScript_1A9236 + end PowerPlant_EventScript_16382F:: @ 816382F - special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 - lock - faceplayer - setwildbattle SPECIES_ELECTRODE, 34, ITEM_NONE - waitse - playmoncry SPECIES_ELECTRODE, 2 - delay 40 - waitmoncry - setflag 2055 - dowildbattle - clearflag 2055 - special sub_8112364 - specialvar VAR_RESULT, sub_80CA74C - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_163884 - compare_var_to_value VAR_RESULT, 4 - goto_if 1, EventScript_163884 - compare_var_to_value VAR_RESULT, 5 - goto_if 1, EventScript_163884 - setflag FLAG_0x2D0 - release - end + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + lock + faceplayer + setwildbattle SPECIES_ELECTRODE, 34, ITEM_NONE + waitse + playmoncry SPECIES_ELECTRODE, 2 + delay 40 + waitmoncry + setflag 2055 + dowildbattle + clearflag 2055 + special sub_8112364 + specialvar VAR_RESULT, sub_80CA74C + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_163884 + compare_var_to_value VAR_RESULT, 4 + goto_if 1, EventScript_163884 + compare_var_to_value VAR_RESULT, 5 + goto_if 1, EventScript_163884 + setflag FLAG_0x2D0 + release + end EventScript_163884:: @ 8163884 - setflag FLAG_0x2D0 - goto EventScript_1A922D - end + setflag FLAG_0x2D0 + goto EventScript_1A922D + end PowerPlant_EventScript_16388D:: @ 816388D - special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 - lock - faceplayer - setwildbattle SPECIES_ELECTRODE, 34, ITEM_NONE - waitse - playmoncry SPECIES_ELECTRODE, 2 - delay 40 - waitmoncry - setflag 2055 - dowildbattle - clearflag 2055 - special sub_8112364 - specialvar VAR_RESULT, sub_80CA74C - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1638E2 - compare_var_to_value VAR_RESULT, 4 - goto_if 1, EventScript_1638E2 - compare_var_to_value VAR_RESULT, 5 - goto_if 1, EventScript_1638E2 - setflag FLAG_0x2D1 - release - end + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + lock + faceplayer + setwildbattle SPECIES_ELECTRODE, 34, ITEM_NONE + waitse + playmoncry SPECIES_ELECTRODE, 2 + delay 40 + waitmoncry + setflag 2055 + dowildbattle + clearflag 2055 + special sub_8112364 + specialvar VAR_RESULT, sub_80CA74C + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_1638E2 + compare_var_to_value VAR_RESULT, 4 + goto_if 1, EventScript_1638E2 + compare_var_to_value VAR_RESULT, 5 + goto_if 1, EventScript_1638E2 + setflag FLAG_0x2D1 + release + end EventScript_1638E2:: @ 81638E2 - setflag FLAG_0x2D1 - goto EventScript_1A922D - end + setflag FLAG_0x2D1 + goto EventScript_1A922D + end diff --git a/data/maps/RockTunnel_1F/scripts.inc b/data/maps/RockTunnel_1F/scripts.inc index f45f6d1f0..22ba4d7ac 100644 --- a/data/maps/RockTunnel_1F/scripts.inc +++ b/data/maps/RockTunnel_1F/scripts.inc @@ -1,54 +1,54 @@ RockTunnel_1F_MapScripts:: @ 8162DD6 - map_script 3, RockTunnel_1F_MapScript1_162DDC - .byte 0 + map_script 3, RockTunnel_1F_MapScript1_162DDC + .byte 0 RockTunnel_1F_MapScript1_162DDC:: @ 8162DDC - setworldmapflag 2224 - end + setworldmapflag 2224 + end RockTunnel_1F_EventScript_162DE0:: @ 8162DE0 - loadword 0, gUnknown_817962D - callstd 3 - end + loadword 0, gUnknown_817962D + callstd 3 + end RockTunnel_1F_EventScript_162DE9:: @ 8162DE9 - trainerbattle 0, 192, 0, Text_179366, Text_179388 - loadword 0, gUnknown_8179396 - callstd 6 - end + trainerbattle 0, 192, 0, Text_179366, Text_179388 + loadword 0, gUnknown_8179396 + callstd 6 + end RockTunnel_1F_EventScript_162E00:: @ 8162E00 - trainerbattle 0, 193, 0, Text_1793F1, Text_17940E - loadword 0, gUnknown_817943A - callstd 6 - end + trainerbattle 0, 193, 0, Text_1793F1, Text_17940E + loadword 0, gUnknown_817943A + callstd 6 + end RockTunnel_1F_EventScript_162E17:: @ 8162E17 - trainerbattle 0, 194, 0, Text_17947B, Text_1794AC - loadword 0, gUnknown_81794B4 - callstd 6 - end + trainerbattle 0, 194, 0, Text_17947B, Text_1794AC + loadword 0, gUnknown_81794B4 + callstd 6 + end RockTunnel_1F_EventScript_162E2E:: @ 8162E2E - trainerbattle 0, 168, 0, Text_1794D4, Text_1794EE - loadword 0, gUnknown_81794F9 - callstd 6 - end + trainerbattle 0, 168, 0, Text_1794D4, Text_1794EE + loadword 0, gUnknown_81794F9 + callstd 6 + end RockTunnel_1F_EventScript_162E45:: @ 8162E45 - trainerbattle 0, 476, 0, Text_17951C, Text_179547 - loadword 0, gUnknown_8179558 - callstd 6 - end + trainerbattle 0, 476, 0, Text_17951C, Text_179547 + loadword 0, gUnknown_8179558 + callstd 6 + end RockTunnel_1F_EventScript_162E5C:: @ 8162E5C - trainerbattle 0, 475, 0, Text_1795E5, Text_179604 - loadword 0, gUnknown_8179613 - callstd 6 - end + trainerbattle 0, 475, 0, Text_1795E5, Text_179604 + loadword 0, gUnknown_8179613 + callstd 6 + end RockTunnel_1F_EventScript_162E73:: @ 8162E73 - trainerbattle 0, 474, 0, Text_179577, Text_1795A1 - loadword 0, gUnknown_81795B5 - callstd 6 - end + trainerbattle 0, 474, 0, Text_179577, Text_1795A1 + loadword 0, gUnknown_81795B5 + callstd 6 + end diff --git a/data/maps/RockTunnel_B1F/scripts.inc b/data/maps/RockTunnel_B1F/scripts.inc index 40cf188f3..2d9a015b7 100644 --- a/data/maps/RockTunnel_B1F/scripts.inc +++ b/data/maps/RockTunnel_B1F/scripts.inc @@ -1,50 +1,50 @@ RockTunnel_B1F_MapScripts:: @ 8162E8A - .byte 0 + .byte 0 RockTunnel_B1F_EventScript_162E8B:: @ 8162E8B - trainerbattle 0, 158, 0, Text_179657, Text_1796B9 - loadword 0, gUnknown_81796CE - callstd 6 - end + trainerbattle 0, 158, 0, Text_179657, Text_1796B9 + loadword 0, gUnknown_81796CE + callstd 6 + end RockTunnel_B1F_EventScript_162EA2:: @ 8162EA2 - trainerbattle 0, 159, 0, Text_1798AD, Text_1798DD - loadword 0, gUnknown_81798E9 - callstd 6 - end + trainerbattle 0, 159, 0, Text_1798AD, Text_1798DD + loadword 0, gUnknown_81798E9 + callstd 6 + end RockTunnel_B1F_EventScript_162EB9:: @ 8162EB9 - trainerbattle 0, 189, 0, Text_1796E1, Text_179700 - loadword 0, gUnknown_8179712 - callstd 6 - end + trainerbattle 0, 189, 0, Text_1796E1, Text_179700 + loadword 0, gUnknown_8179712 + callstd 6 + end RockTunnel_B1F_EventScript_162ED0:: @ 8162ED0 - trainerbattle 0, 190, 0, Text_179829, Text_179856 - loadword 0, gUnknown_817987A - callstd 6 - end + trainerbattle 0, 190, 0, Text_179829, Text_179856 + loadword 0, gUnknown_817987A + callstd 6 + end RockTunnel_B1F_EventScript_162EE7:: @ 8162EE7 - trainerbattle 0, 191, 0, Text_179916, Text_179932 - loadword 0, gUnknown_817993E - callstd 6 - end + trainerbattle 0, 191, 0, Text_179916, Text_179932 + loadword 0, gUnknown_817993E + callstd 6 + end RockTunnel_B1F_EventScript_162EFE:: @ 8162EFE - trainerbattle 0, 164, 0, Text_17973A, Text_17975F - loadword 0, gUnknown_8179777 - callstd 6 - end + trainerbattle 0, 164, 0, Text_17973A, Text_17975F + loadword 0, gUnknown_8179777 + callstd 6 + end RockTunnel_B1F_EventScript_162F15:: @ 8162F15 - trainerbattle 0, 165, 0, Text_1797A4, Text_1797CB - loadword 0, gUnknown_81797DE - callstd 6 - end + trainerbattle 0, 165, 0, Text_1797A4, Text_1797CB + loadword 0, gUnknown_81797DE + callstd 6 + end RockTunnel_B1F_EventScript_162F2C:: @ 8162F2C - trainerbattle 0, 166, 0, Text_179968, Text_179997 - loadword 0, gUnknown_81799AC - callstd 6 - end + trainerbattle 0, 166, 0, Text_179968, Text_179997 + loadword 0, gUnknown_81799AC + callstd 6 + end diff --git a/data/maps/RocketHideout_B1F/scripts.inc b/data/maps/RocketHideout_B1F/scripts.inc index 2704c6b79..a9a6d2c35 100644 --- a/data/maps/RocketHideout_B1F/scripts.inc +++ b/data/maps/RocketHideout_B1F/scripts.inc @@ -1,69 +1,69 @@ RocketHideout_B1F_MapScripts:: @ 8161195 - map_script 1, RocketHideout_B1F_MapScript1_1611A0 - map_script 3, RocketHideout_B1F_MapScript2_1611AA - .byte 0 + map_script 1, RocketHideout_B1F_MapScript1_1611A0 + map_script 3, RocketHideout_B1F_MapScript2_1611AA + .byte 0 RocketHideout_B1F_MapScript1_1611A0:: @ 81611A0 - checktrainerflag 362 - call_if 0, EventScript_161233 - end + checktrainerflag 362 + call_if 0, EventScript_161233 + end RocketHideout_B1F_MapScript2_1611AA:: @ 81611AA - setworldmapflag 2219 - end + setworldmapflag 2219 + end RocketHideout_B1F_EventScript_1611AE:: @ 81611AE - trainerbattle 0, 358, 0, Text_174ECA, Text_174EED - loadword 0, gUnknown_8174EFA - callstd 6 - end + trainerbattle 0, 358, 0, Text_174ECA, Text_174EED + loadword 0, gUnknown_8174EFA + callstd 6 + end RocketHideout_B1F_EventScript_1611C5:: @ 81611C5 - trainerbattle 0, 359, 0, Text_174F2C, Text_174F60 - loadword 0, gUnknown_8174F66 - callstd 6 - end + trainerbattle 0, 359, 0, Text_174F2C, Text_174F60 + loadword 0, gUnknown_8174F66 + callstd 6 + end RocketHideout_B1F_EventScript_1611DC:: @ 81611DC - trainerbattle 0, 360, 0, Text_174F94, Text_174FA4 - loadword 0, gUnknown_8174FB3 - callstd 6 - end + trainerbattle 0, 360, 0, Text_174F94, Text_174FA4 + loadword 0, gUnknown_8174FB3 + callstd 6 + end RocketHideout_B1F_EventScript_1611F3:: @ 81611F3 - trainerbattle 0, 361, 0, Text_174FE1, Text_174FF8 - loadword 0, gUnknown_8175007 - callstd 6 - end + trainerbattle 0, 361, 0, Text_174FE1, Text_174FF8 + loadword 0, gUnknown_8175007 + callstd 6 + end RocketHideout_B1F_EventScript_16120A:: @ 816120A - trainerbattle 2, 362, 0, Text_17503A, Text_17505A, EventScript_161225 - loadword 0, gUnknown_8175060 - callstd 6 - end + trainerbattle 2, 362, 0, Text_17503A, Text_17505A, EventScript_161225 + loadword 0, gUnknown_8175060 + callstd 6 + end EventScript_161225:: @ 8161225 - call EventScript_16126A - playse SE_FU_ZAKU2 - special DrawWholeMapView - waitse - release - end + call EventScript_16126A + playse SE_FU_ZAKU2 + special DrawWholeMapView + waitse + release + end EventScript_161233:: @ 8161233 - setmetatile 20, 19, 718, 1 - setmetatile 21, 19, 719, 1 - setmetatile 20, 20, 726, 1 - setmetatile 21, 20, 727, 1 - setmetatile 20, 21, 642, 0 - setmetatile 21, 21, 642, 0 - return + setmetatile 20, 19, 718, 1 + setmetatile 21, 19, 719, 1 + setmetatile 20, 20, 726, 1 + setmetatile 21, 20, 727, 1 + setmetatile 20, 21, 642, 0 + setmetatile 21, 21, 642, 0 + return EventScript_16126A:: @ 816126A - setmetatile 20, 19, 642, 0 - setmetatile 21, 19, 641, 0 - setmetatile 20, 20, 642, 0 - setmetatile 21, 20, 641, 0 - setmetatile 20, 21, 642, 0 - setmetatile 21, 21, 641, 0 - return + setmetatile 20, 19, 642, 0 + setmetatile 21, 19, 641, 0 + setmetatile 20, 20, 642, 0 + setmetatile 21, 20, 641, 0 + setmetatile 20, 21, 642, 0 + setmetatile 21, 21, 641, 0 + return diff --git a/data/maps/RocketHideout_B2F/scripts.inc b/data/maps/RocketHideout_B2F/scripts.inc index e1f54c7ef..945a6de5a 100644 --- a/data/maps/RocketHideout_B2F/scripts.inc +++ b/data/maps/RocketHideout_B2F/scripts.inc @@ -1,8 +1,8 @@ RocketHideout_B2F_MapScripts:: @ 81612A1 - .byte 0 + .byte 0 RocketHideout_B2F_EventScript_1612A2:: @ 81612A2 - trainerbattle 0, 363, 0, Text_17508C, Text_1750BF - loadword 0, gUnknown_81750CC - callstd 6 - end + trainerbattle 0, 363, 0, Text_17508C, Text_1750BF + loadword 0, gUnknown_81750CC + callstd 6 + end diff --git a/data/maps/RocketHideout_B3F/scripts.inc b/data/maps/RocketHideout_B3F/scripts.inc index b60e71b39..3325ad50d 100644 --- a/data/maps/RocketHideout_B3F/scripts.inc +++ b/data/maps/RocketHideout_B3F/scripts.inc @@ -1,14 +1,14 @@ RocketHideout_B3F_MapScripts:: @ 81612B9 - .byte 0 + .byte 0 RocketHideout_B3F_EventScript_1612BA:: @ 81612BA - trainerbattle 0, 364, 0, Text_17511A, Text_17514A - loadword 0, gUnknown_817515B - callstd 6 - end + trainerbattle 0, 364, 0, Text_17511A, Text_17514A + loadword 0, gUnknown_817515B + callstd 6 + end RocketHideout_B3F_EventScript_1612D1:: @ 81612D1 - trainerbattle 0, 365, 0, Text_17519E, Text_1751CE - loadword 0, gUnknown_81751E0 - callstd 6 - end + trainerbattle 0, 365, 0, Text_17519E, Text_1751CE + loadword 0, gUnknown_81751E0 + callstd 6 + end diff --git a/data/maps/RocketHideout_B4F/scripts.inc b/data/maps/RocketHideout_B4F/scripts.inc index c61e0144c..f6227cd82 100644 --- a/data/maps/RocketHideout_B4F/scripts.inc +++ b/data/maps/RocketHideout_B4F/scripts.inc @@ -1,145 +1,145 @@ RocketHideout_B4F_MapScripts:: @ 81612E8 - map_script 1, RocketHideout_B4F_MapScript1_1612EE - .byte 0 + map_script 1, RocketHideout_B4F_MapScript1_1612EE + .byte 0 RocketHideout_B4F_MapScript1_1612EE:: @ 81612EE - setvar VAR_0x4001, 0 - checktrainerflag 366 - call_if 1, EventScript_161311 - checktrainerflag 367 - call_if 1, EventScript_161311 - compare_var_to_value VAR_0x4001, 2 - call_if 5, EventScript_16146A - end + setvar VAR_0x4001, 0 + checktrainerflag 366 + call_if 1, EventScript_161311 + checktrainerflag 367 + call_if 1, EventScript_161311 + compare_var_to_value VAR_0x4001, 2 + call_if 5, EventScript_16146A + end EventScript_161311:: @ 8161311 - addvar VAR_0x4001, 1 - return + addvar VAR_0x4001, 1 + return RocketHideout_B4F_EventScript_161317:: @ 8161317 - lock - faceplayer - setvar VAR_0x8004, 15 - setvar VAR_0x8005, 0 - special SetFlavorTextFlagFromSpecialVars - message Text_175226 - waitmessage - playbgm BGM_FRLG_SUSPICIOUS_EYE, 0 - waitbuttonpress - trainerbattle 3, 348, 0, Text_175318 - loadword 0, gUnknown_817532D - callstd 4 - fadescreen 1 - closemessage - removeobject 1 - addobject 2 - clearflag FLAG_0x037 - setflag FLAG_0x05F - setvar VAR_0x8004, 15 - setvar VAR_0x8005, 2 - special UpdatePickStateFromSpecialVar8005 - fadescreen 0 - release - end + lock + faceplayer + setvar VAR_0x8004, 15 + setvar VAR_0x8005, 0 + special SetFlavorTextFlagFromSpecialVars + message Text_175226 + waitmessage + playbgm BGM_FRLG_SUSPICIOUS_EYE, 0 + waitbuttonpress + trainerbattle 3, 348, 0, Text_175318 + loadword 0, gUnknown_817532D + callstd 4 + fadescreen 1 + closemessage + removeobject 1 + addobject 2 + clearflag FLAG_0x037 + setflag FLAG_0x05F + setvar VAR_0x8004, 15 + setvar VAR_0x8005, 2 + special UpdatePickStateFromSpecialVar8005 + fadescreen 0 + release + end RocketHideout_B4F_EventScript_161363:: @ 8161363 - lock - faceplayer - removeobject 2 - setorcopyvar VAR_0x8000, 359 - setorcopyvar VAR_0x8001, 1 - callstd 0 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1A6BF9 - release - end + lock + faceplayer + removeobject 2 + setorcopyvar VAR_0x8000, 359 + setorcopyvar VAR_0x8001, 1 + callstd 0 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_1A6BF9 + release + end RocketHideout_B4F_EventScript_161381:: @ 8161381 - trainerbattle 2, 368, 0, Text_175488, Text_1754B9, EventScript_16139D - loadword 0, gUnknown_81754BD - callstd 4 - release - end + trainerbattle 2, 368, 0, Text_175488, Text_1754B9, EventScript_16139D + loadword 0, gUnknown_81754BD + callstd 4 + release + end EventScript_16139D:: @ 816139D - loadword 0, gUnknown_81754BD - callstd 4 - addobject 4 - clearflag FLAG_0x036 - release - end + loadword 0, gUnknown_81754BD + callstd 4 + addobject 4 + clearflag FLAG_0x036 + release + end RocketHideout_B4F_EventScript_1613AD:: @ 81613AD - lock - faceplayer - setflag FLAG_0x2A5 - removeobject 4 - setorcopyvar VAR_0x8000, 356 - setorcopyvar VAR_0x8001, 1 - callstd 0 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1A6BF9 - release - end + lock + faceplayer + setflag FLAG_0x2A5 + removeobject 4 + setorcopyvar VAR_0x8000, 356 + setorcopyvar VAR_0x8001, 1 + callstd 0 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_1A6BF9 + release + end RocketHideout_B4F_EventScript_1613CE:: @ 81613CE - trainerbattle 2, 366, 0, Text_1753D0, Text_1753FE, EventScript_1613E9 - loadword 0, gUnknown_817540C - callstd 6 - end + trainerbattle 2, 366, 0, Text_1753D0, Text_1753FE, EventScript_1613E9 + loadword 0, gUnknown_817540C + callstd 6 + end EventScript_1613E9:: @ 81613E9 - setvar VAR_0x4001, 0 - checktrainerflag 366 - call_if 1, EventScript_161311 - checktrainerflag 367 - call_if 1, EventScript_161311 - compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_1614A1 - compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_161462 - release - end + setvar VAR_0x4001, 0 + checktrainerflag 366 + call_if 1, EventScript_161311 + checktrainerflag 367 + call_if 1, EventScript_161311 + compare_var_to_value VAR_0x4001, 2 + call_if 1, EventScript_1614A1 + compare_var_to_value VAR_0x4001, 2 + call_if 1, EventScript_161462 + release + end RocketHideout_B4F_EventScript_161418:: @ 8161418 - trainerbattle 2, 367, 0, Text_175437, Text_175463, EventScript_161433 - loadword 0, gUnknown_817546A - callstd 6 - end + trainerbattle 2, 367, 0, Text_175437, Text_175463, EventScript_161433 + loadword 0, gUnknown_817546A + callstd 6 + end EventScript_161433:: @ 8161433 - setvar VAR_0x4001, 0 - checktrainerflag 366 - call_if 1, EventScript_161311 - checktrainerflag 367 - call_if 1, EventScript_161311 - compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_1614A1 - compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_161462 - release - end + setvar VAR_0x4001, 0 + checktrainerflag 366 + call_if 1, EventScript_161311 + checktrainerflag 367 + call_if 1, EventScript_161311 + compare_var_to_value VAR_0x4001, 2 + call_if 1, EventScript_1614A1 + compare_var_to_value VAR_0x4001, 2 + call_if 1, EventScript_161462 + release + end EventScript_161462:: @ 8161462 - playse SE_FU_ZAKU2 - special DrawWholeMapView - waitse - return + playse SE_FU_ZAKU2 + special DrawWholeMapView + waitse + return EventScript_16146A:: @ 816146A - setmetatile 17, 12, 718, 1 - setmetatile 18, 12, 719, 1 - setmetatile 17, 13, 726, 1 - setmetatile 18, 13, 727, 1 - setmetatile 17, 14, 642, 0 - setmetatile 18, 14, 642, 0 - return + setmetatile 17, 12, 718, 1 + setmetatile 18, 12, 719, 1 + setmetatile 17, 13, 726, 1 + setmetatile 18, 13, 727, 1 + setmetatile 17, 14, 642, 0 + setmetatile 18, 14, 642, 0 + return EventScript_1614A1:: @ 81614A1 - setmetatile 17, 12, 642, 0 - setmetatile 18, 12, 641, 0 - setmetatile 17, 13, 642, 0 - setmetatile 18, 13, 641, 0 - setmetatile 17, 14, 642, 0 - setmetatile 18, 14, 641, 0 - return + setmetatile 17, 12, 642, 0 + setmetatile 18, 12, 641, 0 + setmetatile 17, 13, 642, 0 + setmetatile 18, 13, 641, 0 + setmetatile 17, 14, 642, 0 + setmetatile 18, 14, 641, 0 + return diff --git a/data/maps/RocketHideout_Elevator/scripts.inc b/data/maps/RocketHideout_Elevator/scripts.inc index 9b504ac68..cd442aba6 100644 --- a/data/maps/RocketHideout_Elevator/scripts.inc +++ b/data/maps/RocketHideout_Elevator/scripts.inc @@ -1,115 +1,115 @@ RocketHideout_Elevator_MapScripts:: @ 81614D8 - .byte 0 + .byte 0 RocketHideout_Elevator_EventScript_1614D9:: @ 81614D9 - lockall - checkflag FLAG_0x2A5 - goto_if 0, EventScript_16161B - setvar VAR_0x8004, 2 - checkflag FLAG_0x002 - call_if 0, EventScript_1A7AB9 - copyvar VAR_0x8005, VAR_0x403A - special sub_80CB580 - message Text_1A535C - waitmessage - setvar VAR_0x8004, 2 - specialvar VAR_RESULT, sub_80CB328 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_161530 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16153C - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_161548 - end + lockall + checkflag FLAG_0x2A5 + goto_if 0, EventScript_16161B + setvar VAR_0x8004, 2 + checkflag FLAG_0x002 + call_if 0, EventScript_1A7AB9 + copyvar VAR_0x8005, VAR_0x403A + special sub_80CB580 + message Text_1A535C + waitmessage + setvar VAR_0x8004, 2 + specialvar VAR_RESULT, sub_80CB328 + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_161530 + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_16153C + compare_var_to_value VAR_0x8000, 2 + goto_if 1, EventScript_161548 + end EventScript_161530:: @ 8161530 - multichoicedefault 0, 0, 42, 0, 0 - goto EventScript_161554 + multichoicedefault 0, 0, 42, 0, 0 + goto EventScript_161554 EventScript_16153B:: @ 816153B - end + end EventScript_16153C:: @ 816153C - multichoicedefault 0, 0, 42, 1, 0 - goto EventScript_161554 + multichoicedefault 0, 0, 42, 1, 0 + goto EventScript_161554 EventScript_161547:: @ 8161547 - end + end EventScript_161548:: @ 8161548 - multichoicedefault 0, 0, 42, 2, 0 - goto EventScript_161554 + multichoicedefault 0, 0, 42, 2, 0 + goto EventScript_161554 EventScript_161553:: @ 8161553 - end + end EventScript_161554:: @ 8161554 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_161591 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1615B9 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1615E1 - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_161609 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_161609 - end + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_161591 + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_1615B9 + compare_var_to_value VAR_0x8000, 2 + goto_if 1, EventScript_1615E1 + compare_var_to_value VAR_0x8000, 3 + goto_if 1, EventScript_161609 + compare_var_to_value VAR_0x8000, 127 + goto_if 1, EventScript_161609 + end EventScript_161591:: @ 8161591 - setvar VAR_0x8006, 3 - setdynamicwarp MAP_ROCKET_HIDEOUT_B1F, 255, 24, 25 - compare_var_to_value VAR_0x403A, 3 - goto_if 1, EventScript_161609 - call EventScript_16160E - setvar VAR_0x403A, 3 - goto EventScript_161609 + setvar VAR_0x8006, 3 + setdynamicwarp MAP_ROCKET_HIDEOUT_B1F, 255, 24, 25 + compare_var_to_value VAR_0x403A, 3 + goto_if 1, EventScript_161609 + call EventScript_16160E + setvar VAR_0x403A, 3 + goto EventScript_161609 EventScript_1615B8:: @ 81615B8 - end + end EventScript_1615B9:: @ 81615B9 - setvar VAR_0x8006, 2 - setdynamicwarp MAP_ROCKET_HIDEOUT_B2F, 255, 28, 16 - compare_var_to_value VAR_0x403A, 2 - goto_if 1, EventScript_161609 - call EventScript_16160E - setvar VAR_0x403A, 2 - goto EventScript_161609 + setvar VAR_0x8006, 2 + setdynamicwarp MAP_ROCKET_HIDEOUT_B2F, 255, 28, 16 + compare_var_to_value VAR_0x403A, 2 + goto_if 1, EventScript_161609 + call EventScript_16160E + setvar VAR_0x403A, 2 + goto EventScript_161609 EventScript_1615E0:: @ 81615E0 - end + end EventScript_1615E1:: @ 81615E1 - setvar VAR_0x8006, 0 - setdynamicwarp MAP_ROCKET_HIDEOUT_B4F, 255, 20, 23 - compare_var_to_value VAR_0x403A, 0 - goto_if 1, EventScript_161609 - call EventScript_16160E - setvar VAR_0x403A, 0 - goto EventScript_161609 + setvar VAR_0x8006, 0 + setdynamicwarp MAP_ROCKET_HIDEOUT_B4F, 255, 20, 23 + compare_var_to_value VAR_0x403A, 0 + goto_if 1, EventScript_161609 + call EventScript_16160E + setvar VAR_0x403A, 0 + goto EventScript_161609 EventScript_161608:: @ 8161608 - end + end EventScript_161609:: @ 8161609 - special sub_80CB63C - releaseall - end + special sub_80CB63C + releaseall + end EventScript_16160E:: @ 816160E - special sub_80CB63C - closemessage - waitse - special sub_80CB498 - waitstate - setflag FLAG_0x002 - return + special sub_80CB63C + closemessage + waitse + special sub_80CB498 + waitstate + setflag FLAG_0x002 + return EventScript_16161B:: @ 816161B - loadword 0, gUnknown_81754DD - callstd 4 - releaseall - end + loadword 0, gUnknown_81754DD + callstd 4 + releaseall + end diff --git a/data/maps/Route1/scripts.inc b/data/maps/Route1/scripts.inc index 00cca1d96..d2aeb0224 100644 --- a/data/maps/Route1/scripts.inc +++ b/data/maps/Route1/scripts.inc @@ -1,42 +1,42 @@ Route1_MapScripts:: @ 8167EFD - .byte 0 + .byte 0 Route1_EventScript_167EFE:: @ 8167EFE - lock - faceplayer - checkflag FLAG_0x230 - goto_if 1, EventScript_167F48 - loadword 0, gUnknown_818329D - callstd 4 - textcolor 3 - checkitemspace ITEM_POTION, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1A6BF9 - getitemname 1, ITEM_POTION - playfanfare MUS_FANFA1 - message Text_1A51F6 - waitmessage - waitfanfare - additem ITEM_POTION, 1 - loadword 0, gUnknown_8183387 - callstd 4 - call EventScript_1A6675 - setflag FLAG_0x230 - release - end + lock + faceplayer + checkflag FLAG_0x230 + goto_if 1, EventScript_167F48 + loadword 0, gUnknown_818329D + callstd 4 + textcolor 3 + checkitemspace ITEM_POTION, 1 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_1A6BF9 + getitemname 1, ITEM_POTION + playfanfare MUS_FANFA1 + message Text_1A51F6 + waitmessage + waitfanfare + additem ITEM_POTION, 1 + loadword 0, gUnknown_8183387 + callstd 4 + call EventScript_1A6675 + setflag FLAG_0x230 + release + end EventScript_167F48:: @ 8167F48 - loadword 0, gUnknown_8183347 - callstd 4 - release - end + loadword 0, gUnknown_8183347 + callstd 4 + release + end Route1_EventScript_167F52:: @ 8167F52 - loadword 0, gUnknown_81833B9 - callstd 2 - end + loadword 0, gUnknown_81833B9 + callstd 2 + end Route1_EventScript_167F5B:: @ 8167F5B - loadword 0, gUnknown_818343A - callstd 3 - end + loadword 0, gUnknown_818343A + callstd 3 + end diff --git a/data/maps/Route10/scripts.inc b/data/maps/Route10/scripts.inc index b714312a2..78b962dc7 100644 --- a/data/maps/Route10/scripts.inc +++ b/data/maps/Route10/scripts.inc @@ -1,20 +1,20 @@ Route10_MapScripts:: @ 8167FD9 - .byte 0 + .byte 0 Route10_EventScript_167FDA:: @ 8167FDA - end + end Route10_EventScript_167FDB:: @ 8167FDB - loadword 0, gUnknown_8184EC5 - callstd 3 - end + loadword 0, gUnknown_8184EC5 + callstd 3 + end Route10_EventScript_167FE4:: @ 8167FE4 - loadword 0, gUnknown_8184EE9 - callstd 3 - end + loadword 0, gUnknown_8184EE9 + callstd 3 + end Route10_EventScript_167FED:: @ 8167FED - loadword 0, gUnknown_8184EF5 - callstd 3 - end + loadword 0, gUnknown_8184EF5 + callstd 3 + end diff --git a/data/maps/Route10_PokemonCenter_1F/scripts.inc b/data/maps/Route10_PokemonCenter_1F/scripts.inc index b9fbf2cde..663938fc7 100644 --- a/data/maps/Route10_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route10_PokemonCenter_1F/scripts.inc @@ -1,75 +1,75 @@ Route10_PokemonCenter_1F_MapScripts:: @ 816FC2F - map_script 3, Route10_PokemonCenter_1F_MapScript1_16FC3A - map_script 5, Route10_PokemonCenter_1F_MapScript2_1BC05C - .byte 0 + map_script 3, Route10_PokemonCenter_1F_MapScript1_16FC3A + map_script 5, Route10_PokemonCenter_1F_MapScript2_1BC05C + .byte 0 Route10_PokemonCenter_1F_MapScript1_16FC3A:: @ 816FC3A - setworldmapflag 2211 - setrespawn 13 - end + setworldmapflag 2211 + setrespawn 13 + end Route10_PokemonCenter_1F_EventScript_16FC41:: @ 816FC41 - lock - faceplayer - call EventScript_1A6578 - release - end + lock + faceplayer + call EventScript_1A6578 + release + end Route10_PokemonCenter_1F_EventScript_16FC4A:: @ 816FC4A - loadword 0, gUnknown_819E59D - callstd 2 - end + loadword 0, gUnknown_819E59D + callstd 2 + end Route10_PokemonCenter_1F_EventScript_16FC53:: @ 816FC53 - loadword 0, gUnknown_819E523 - callstd 2 - end + loadword 0, gUnknown_819E523 + callstd 2 + end Route10_PokemonCenter_1F_EventScript_16FC5C:: @ 816FC5C - loadword 0, gUnknown_819E5D2 - callstd 2 - end + loadword 0, gUnknown_819E5D2 + callstd 2 + end Route10_PokemonCenter_1F_EventScript_16FC65:: @ 816FC65 - lock - faceplayer - call EventScript_16FCF1 - checkflag FLAG_0x2FA - goto_if 1, EventScript_16FCE7 - loadword 0, gUnknown_819E5FB - callstd 5 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1A7AD1 - setvar VAR_0x8004, 0 - specialvar VAR_RESULT, sub_80CA3D8 - getnumberstring 2, VAR_0x8006 - call EventScript_16FCF1 - compare_var_to_value VAR_0x8006, 20 - goto_if 0, EventScript_1A7ABD - loadword 0, gUnknown_819E733 - callstd 4 - checkitemspace ITEM_EVERSTONE, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1A7AC7 - additem ITEM_EVERSTONE, 1 - loadword 0, gUnknown_819E786 - setorcopyvar VAR_0x8000, 195 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 257 - callstd 9 - setflag FLAG_0x2FA - loadword 0, gUnknown_819E7AF - callstd 4 - release - end + lock + faceplayer + call EventScript_16FCF1 + checkflag FLAG_0x2FA + goto_if 1, EventScript_16FCE7 + loadword 0, gUnknown_819E5FB + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_1A7AD1 + setvar VAR_0x8004, 0 + specialvar VAR_RESULT, sub_80CA3D8 + getnumberstring 2, VAR_0x8006 + call EventScript_16FCF1 + compare_var_to_value VAR_0x8006, 20 + goto_if 0, EventScript_1A7ABD + loadword 0, gUnknown_819E733 + callstd 4 + checkitemspace ITEM_EVERSTONE, 1 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_1A7AC7 + additem ITEM_EVERSTONE, 1 + loadword 0, gUnknown_819E786 + setorcopyvar VAR_0x8000, 195 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 257 + callstd 9 + setflag FLAG_0x2FA + loadword 0, gUnknown_819E7AF + callstd 4 + release + end EventScript_16FCE7:: @ 816FCE7 - loadword 0, gUnknown_819E7AF - callstd 4 - release - end + loadword 0, gUnknown_819E7AF + callstd 4 + release + end EventScript_16FCF1:: @ 816FCF1 - getnumberstring 0, 20 - getitemname 1, ITEM_EVERSTONE - return + getnumberstring 0, 20 + getitemname 1, ITEM_EVERSTONE + return diff --git a/data/maps/Route10_PokemonCenter_2F/scripts.inc b/data/maps/Route10_PokemonCenter_2F/scripts.inc index 26e646ed0..54b5d0036 100644 --- a/data/maps/Route10_PokemonCenter_2F/scripts.inc +++ b/data/maps/Route10_PokemonCenter_2F/scripts.inc @@ -1,18 +1,18 @@ Route10_PokemonCenter_2F_MapScripts:: @ 816FCFA - map_script 2, Route10_PokemonCenter_2F_MapScript1_1BB2A3 - map_script 4, Route10_PokemonCenter_2F_MapScript2_1BB1ED - map_script 1, Route10_PokemonCenter_2F_MapScript3_1BB237 - map_script 3, Route10_PokemonCenter_2F_MapScript4_1BB1B4 - .byte 0 + map_script 2, Route10_PokemonCenter_2F_MapScript1_1BB2A3 + map_script 4, Route10_PokemonCenter_2F_MapScript2_1BB1ED + map_script 1, Route10_PokemonCenter_2F_MapScript3_1BB237 + map_script 3, Route10_PokemonCenter_2F_MapScript4_1BB1B4 + .byte 0 Route10_PokemonCenter_2F_EventScript_16FD0F:: @ 816FD0F - call EventScript_1BB4A3 - end + call EventScript_1BB4A3 + end EventScript_16FD15:: @ 816FD15 - call EventScript_1BB6AB - end + call EventScript_1BB6AB + end EventScript_16FD1B:: @ 816FD1B - call EventScript_1BB7DE - end + call EventScript_1BB7DE + end diff --git a/data/maps/Route11/scripts.inc b/data/maps/Route11/scripts.inc index 5a369712e..8f5145a05 100644 --- a/data/maps/Route11/scripts.inc +++ b/data/maps/Route11/scripts.inc @@ -1,7 +1,7 @@ Route11_MapScripts:: @ 8167FF6 - .byte 0 + .byte 0 Route11_EventScript_167FF7:: @ 8167FF7 - loadword 0, gUnknown_8185308 - callstd 3 - end + loadword 0, gUnknown_8185308 + callstd 3 + end diff --git a/data/maps/Route11_EastEntrance_1F/scripts.inc b/data/maps/Route11_EastEntrance_1F/scripts.inc index af3166665..1806b5d11 100644 --- a/data/maps/Route11_EastEntrance_1F/scripts.inc +++ b/data/maps/Route11_EastEntrance_1F/scripts.inc @@ -1,12 +1,12 @@ Route11_EastEntrance_1F_MapScripts:: @ 816FD21 - .byte 0 + .byte 0 Route11_EastEntrance_1F_EventScript_16FD22:: @ 816FD22 - loadword 0, gUnknown_819E8A6 - callstd 2 - end + loadword 0, gUnknown_819E8A6 + callstd 2 + end Route11_EastEntrance_1F_EventScript_16FD2B:: @ 816FD2B - loadword 0, gUnknown_819E97B - callstd 2 - end + loadword 0, gUnknown_819E97B + callstd 2 + end diff --git a/data/maps/Route11_EastEntrance_2F/scripts.inc b/data/maps/Route11_EastEntrance_2F/scripts.inc index 9b4451b23..ceb2901d6 100644 --- a/data/maps/Route11_EastEntrance_2F/scripts.inc +++ b/data/maps/Route11_EastEntrance_2F/scripts.inc @@ -1,109 +1,109 @@ Route11_EastEntrance_2F_MapScripts:: @ 816FD34 - .byte 0 + .byte 0 Route11_EastEntrance_2F_EventScript_16FD35:: @ 816FD35 - lockall - checkflag FLAG_0x253 - goto_if 1, EventScript_16FD49 - loadword 0, gUnknown_819EC8A - callstd 4 - releaseall - end + lockall + checkflag FLAG_0x253 + goto_if 1, EventScript_16FD49 + loadword 0, gUnknown_819EC8A + callstd 4 + releaseall + end EventScript_16FD49:: @ 816FD49 - loadword 0, gUnknown_819ECD9 - callstd 4 - releaseall - end + loadword 0, gUnknown_819ECD9 + callstd 4 + releaseall + end Route11_EastEntrance_2F_EventScript_16FD53:: @ 816FD53 - loadword 0, gUnknown_819ED1F - callstd 3 - end + loadword 0, gUnknown_819ED1F + callstd 3 + end Route11_EastEntrance_2F_EventScript_16FD5C:: @ 816FD5C - lock - faceplayer - setvar VAR_0x8008, 4 - call EventScript_1A8CAD - checkflag FLAG_0x251 - goto_if 1, EventScript_16FDCE - loadword 0, gUnknown_81A597B - callstd 5 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16FDB6 - call EventScript_1A8CBD - compare_var_to_value VAR_0x8004, 6 - goto_if 4, EventScript_16FDB6 - call EventScript_1A8CC9 - compare_var_to_var VAR_RESULT, VAR_0x8009 - goto_if 5, EventScript_16FDC0 - call EventScript_1A8CD9 - loadword 0, gUnknown_81A59DA - callstd 4 - setflag FLAG_0x251 - release - end + lock + faceplayer + setvar VAR_0x8008, 4 + call EventScript_1A8CAD + checkflag FLAG_0x251 + goto_if 1, EventScript_16FDCE + loadword 0, gUnknown_81A597B + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16FDB6 + call EventScript_1A8CBD + compare_var_to_value VAR_0x8004, 6 + goto_if 4, EventScript_16FDB6 + call EventScript_1A8CC9 + compare_var_to_var VAR_RESULT, VAR_0x8009 + goto_if 5, EventScript_16FDC0 + call EventScript_1A8CD9 + loadword 0, gUnknown_81A59DA + callstd 4 + setflag FLAG_0x251 + release + end EventScript_16FDB6:: @ 816FDB6 - loadword 0, gUnknown_81A59B6 - callstd 4 - release - end + loadword 0, gUnknown_81A59B6 + callstd 4 + release + end EventScript_16FDC0:: @ 816FDC0 - getspeciesname 0, 32777 - loadword 0, gUnknown_81A59C6 - callstd 4 - release - end + getspeciesname 0, 32777 + loadword 0, gUnknown_81A59C6 + callstd 4 + release + end EventScript_16FDCE:: @ 816FDCE - loadword 0, gUnknown_81A59E7 - callstd 4 - release - end + loadword 0, gUnknown_81A59E7 + callstd 4 + release + end Route11_EastEntrance_2F_EventScript_16FDD8:: @ 816FDD8 - lock - faceplayer - call EventScript_16FE64 - checkflag FLAG_0x252 - goto_if 1, EventScript_16FE5A - loadword 0, gUnknown_819E9E5 - callstd 5 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1A7AD1 - setvar VAR_0x8004, 0 - specialvar VAR_RESULT, sub_80CA3D8 - getnumberstring 2, VAR_0x8006 - call EventScript_16FE64 - compare_var_to_value VAR_0x8006, 30 - goto_if 0, EventScript_1A7ABD - loadword 0, gUnknown_819EAE4 - callstd 4 - checkitemspace ITEM_ITEMFINDER, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1A7AC7 - additem ITEM_ITEMFINDER, 1 - loadword 0, gUnknown_819EB37 - setorcopyvar VAR_0x8000, 261 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 257 - callstd 9 - setflag FLAG_0x252 - loadword 0, gUnknown_819EB59 - callstd 4 - release - end + lock + faceplayer + call EventScript_16FE64 + checkflag FLAG_0x252 + goto_if 1, EventScript_16FE5A + loadword 0, gUnknown_819E9E5 + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_1A7AD1 + setvar VAR_0x8004, 0 + specialvar VAR_RESULT, sub_80CA3D8 + getnumberstring 2, VAR_0x8006 + call EventScript_16FE64 + compare_var_to_value VAR_0x8006, 30 + goto_if 0, EventScript_1A7ABD + loadword 0, gUnknown_819EAE4 + callstd 4 + checkitemspace ITEM_ITEMFINDER, 1 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_1A7AC7 + additem ITEM_ITEMFINDER, 1 + loadword 0, gUnknown_819EB37 + setorcopyvar VAR_0x8000, 261 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 257 + callstd 9 + setflag FLAG_0x252 + loadword 0, gUnknown_819EB59 + callstd 4 + release + end EventScript_16FE5A:: @ 816FE5A - loadword 0, gUnknown_819EB59 - callstd 4 - release - end + loadword 0, gUnknown_819EB59 + callstd 4 + release + end EventScript_16FE64:: @ 816FE64 - getnumberstring 0, 30 - getitemname 1, ITEM_ITEMFINDER - return + getnumberstring 0, 30 + getitemname 1, ITEM_ITEMFINDER + return diff --git a/data/maps/Route12/scripts.inc b/data/maps/Route12/scripts.inc index 4f587cdd5..dbe51fb9d 100644 --- a/data/maps/Route12/scripts.inc +++ b/data/maps/Route12/scripts.inc @@ -1,72 +1,72 @@ Route12_MapScripts:: @ 8168000 - map_script 5, Route12_MapScript1_168006 - .byte 0 + map_script 5, Route12_MapScript1_168006 + .byte 0 Route12_MapScript1_168006:: @ 8168006 - checkflag 2055 - call_if 1, EventScript_168010 - end + checkflag 2055 + call_if 1, EventScript_168010 + end EventScript_168010:: @ 8168010 - removeobject VAR_LAST_TALKED - return + removeobject VAR_LAST_TALKED + return Route12_EventScript_168014:: @ 8168014 - lock - faceplayer - checkflag FLAG_0x23D - goto_if 0, EventScript_168099 - special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 - special sub_8112364 - loadword 0, gUnknown_81853CC - callstd 5 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16808D - call EventScript_1A924B - setwildbattle SPECIES_SNORLAX, 30, ITEM_NONE - waitse - playmoncry SPECIES_SNORLAX, 2 - delay 40 - waitmoncry - setflag FLAG_0x054 - setflag 2055 - setflag FLAG_0x253 - dowildbattle - clearflag 2055 - specialvar VAR_RESULT, sub_80CA74C - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16808F - compare_var_to_value VAR_RESULT, 4 - goto_if 1, EventScript_16808F - compare_var_to_value VAR_RESULT, 5 - goto_if 1, EventScript_16808F - release - end + lock + faceplayer + checkflag FLAG_0x23D + goto_if 0, EventScript_168099 + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + special sub_8112364 + loadword 0, gUnknown_81853CC + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16808D + call EventScript_1A924B + setwildbattle SPECIES_SNORLAX, 30, ITEM_NONE + waitse + playmoncry SPECIES_SNORLAX, 2 + delay 40 + waitmoncry + setflag FLAG_0x054 + setflag 2055 + setflag FLAG_0x253 + dowildbattle + clearflag 2055 + specialvar VAR_RESULT, sub_80CA74C + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16808F + compare_var_to_value VAR_RESULT, 4 + goto_if 1, EventScript_16808F + compare_var_to_value VAR_RESULT, 5 + goto_if 1, EventScript_16808F + release + end EventScript_16808D:: @ 816808D - release - end + release + end EventScript_16808F:: @ 816808F - loadword 0, gUnknown_8185383 - callstd 4 - release - end + loadword 0, gUnknown_8185383 + callstd 4 + release + end EventScript_168099:: @ 8168099 - loadword 0, gUnknown_8185317 - callstd 4 - release - end + loadword 0, gUnknown_8185317 + callstd 4 + release + end Route12_EventScript_1680A3:: @ 81680A3 - loadword 0, gUnknown_8185797 - callstd 3 - end + loadword 0, gUnknown_8185797 + callstd 3 + end Route12_EventScript_1680AC:: @ 81680AC - loadword 0, gUnknown_81857B3 - callstd 3 - end + loadword 0, gUnknown_81857B3 + callstd 3 + end diff --git a/data/maps/Route12_FishingHouse/scripts.inc b/data/maps/Route12_FishingHouse/scripts.inc index b1da71b49..51f6ace07 100644 --- a/data/maps/Route12_FishingHouse/scripts.inc +++ b/data/maps/Route12_FishingHouse/scripts.inc @@ -1,137 +1,137 @@ Route12_FishingHouse_MapScripts:: @ 816FF0B - .byte 0 + .byte 0 Route12_FishingHouse_EventScript_16FF0C:: @ 816FF0C - lock - faceplayer - checkflag FLAG_0x255 - goto_if 1, EventScript_16FF7F - loadword 0, gUnknown_819EFE0 - callstd 5 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16FF34 - loadword 0, gUnknown_819F1FA - callstd 4 - release - end + lock + faceplayer + checkflag FLAG_0x255 + goto_if 1, EventScript_16FF7F + loadword 0, gUnknown_819EFE0 + callstd 5 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16FF34 + loadword 0, gUnknown_819F1FA + callstd 4 + release + end EventScript_16FF34:: @ 816FF34 - checkitemspace ITEM_SUPER_ROD, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16FF75 - additem ITEM_SUPER_ROD, 1 - loadword 0, gUnknown_819F05B - callstd 4 - loadword 0, gUnknown_819F0B2 - setorcopyvar VAR_0x8000, 264 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 257 - callstd 9 - setflag FLAG_0x255 - loadword 0, gUnknown_819F0EB - callstd 4 - release - end + checkitemspace ITEM_SUPER_ROD, 1 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16FF75 + additem ITEM_SUPER_ROD, 1 + loadword 0, gUnknown_819F05B + callstd 4 + loadword 0, gUnknown_819F0B2 + setorcopyvar VAR_0x8000, 264 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 257 + callstd 9 + setflag FLAG_0x255 + loadword 0, gUnknown_819F0EB + callstd 4 + release + end EventScript_16FF75:: @ 816FF75 - loadword 0, gUnknown_819F494 - callstd 4 - release - end + loadword 0, gUnknown_819F494 + callstd 4 + release + end EventScript_16FF7F:: @ 816FF7F - special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 - special sub_8112364 - setvar VAR_0x8004, 129 - specialvar VAR_RESULT, sub_80CC48C - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16FFF5 - special sub_80A096C - loadword 0, gUnknown_819F2DB - callstd 4 - special sub_80BF8FC - waitstate - copyvar VAR_RESULT, VAR_0x8004 - compare_var_to_value VAR_RESULT, 6 - goto_if 4, EventScript_16FFFF - special sub_80A0984 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_170001 - compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_17000B - compare_var_to_value VAR_RESULT, 3 - goto_if 1, EventScript_170031 - compare_var_to_value VAR_RESULT, 4 - goto_if 1, EventScript_17001E - release - end + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + special sub_8112364 + setvar VAR_0x8004, 129 + specialvar VAR_RESULT, sub_80CC48C + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16FFF5 + special sub_80A096C + loadword 0, gUnknown_819F2DB + callstd 4 + special sub_80BF8FC + waitstate + copyvar VAR_RESULT, VAR_0x8004 + compare_var_to_value VAR_RESULT, 6 + goto_if 4, EventScript_16FFFF + special sub_80A0984 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_170001 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_17000B + compare_var_to_value VAR_RESULT, 3 + goto_if 1, EventScript_170031 + compare_var_to_value VAR_RESULT, 4 + goto_if 1, EventScript_17001E + release + end EventScript_16FFF5:: @ 816FFF5 - loadword 0, gUnknown_819F217 - callstd 4 - release - end + loadword 0, gUnknown_819F217 + callstd 4 + release + end EventScript_16FFFF:: @ 816FFFF - release - end + release + end EventScript_170001:: @ 8170001 - loadword 0, gUnknown_819F468 - callstd 4 - release - end + loadword 0, gUnknown_819F468 + callstd 4 + release + end EventScript_17000B:: @ 817000B - checkflag FLAG_0x29C - goto_if 0, EventScript_170031 - loadword 0, gUnknown_819F40A - callstd 4 - release - end + checkflag FLAG_0x29C + goto_if 0, EventScript_170031 + loadword 0, gUnknown_819F40A + callstd 4 + release + end EventScript_17001E:: @ 817001E - checkflag FLAG_0x29C - goto_if 0, EventScript_170031 - loadword 0, gUnknown_819F3CB - callstd 4 - release - end + checkflag FLAG_0x29C + goto_if 0, EventScript_170031 + loadword 0, gUnknown_819F3CB + callstd 4 + release + end EventScript_170031:: @ 8170031 - setflag FLAG_0x29C - loadword 0, gUnknown_819F31B - callstd 4 - setorcopyvar VAR_0x8000, 6 - setorcopyvar VAR_0x8001, 1 - callstd 0 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_17005D - loadword 0, gUnknown_819F395 - callstd 4 - release - end + setflag FLAG_0x29C + loadword 0, gUnknown_819F31B + callstd 4 + setorcopyvar VAR_0x8000, 6 + setorcopyvar VAR_0x8001, 1 + callstd 0 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_17005D + loadword 0, gUnknown_819F395 + callstd 4 + release + end EventScript_17005D:: @ 817005D - loadword 0, gUnknown_819F494 - callstd 4 - release - end + loadword 0, gUnknown_819F494 + callstd 4 + release + end Route12_FishingHouse_EventScript_170067:: @ 8170067 - lockall - checkflag FLAG_0x29C - goto_if 1, EventScript_17007B - loadword 0, gUnknown_819F50C - callstd 4 - releaseall - end + lockall + checkflag FLAG_0x29C + goto_if 1, EventScript_17007B + loadword 0, gUnknown_819F50C + callstd 4 + releaseall + end EventScript_17007B:: @ 817007B - special sub_80A096C - loadword 0, gUnknown_819F4CF - callstd 4 - releaseall - end + special sub_80A096C + loadword 0, gUnknown_819F4CF + callstd 4 + releaseall + end diff --git a/data/maps/Route12_NorthEntrance_1F/scripts.inc b/data/maps/Route12_NorthEntrance_1F/scripts.inc index 19b7315df..4a5b02abe 100644 --- a/data/maps/Route12_NorthEntrance_1F/scripts.inc +++ b/data/maps/Route12_NorthEntrance_1F/scripts.inc @@ -1,7 +1,7 @@ Route12_NorthEntrance_1F_MapScripts:: @ 816FE6D - .byte 0 + .byte 0 Route12_NorthEntrance_1F_EventScript_16FE6E:: @ 816FE6E - loadword 0, gUnknown_819EDA7 - callstd 2 - end + loadword 0, gUnknown_819EDA7 + callstd 2 + end diff --git a/data/maps/Route12_NorthEntrance_2F/scripts.inc b/data/maps/Route12_NorthEntrance_2F/scripts.inc index 822f721f5..a4b08a4dd 100644 --- a/data/maps/Route12_NorthEntrance_2F/scripts.inc +++ b/data/maps/Route12_NorthEntrance_2F/scripts.inc @@ -1,59 +1,59 @@ Route12_NorthEntrance_2F_MapScripts:: @ 816FE77 - .byte 0 + .byte 0 Route12_NorthEntrance_2F_EventScript_16FE78:: @ 816FE78 - loadword 0, gUnknown_819EF5D - callstd 3 - end + loadword 0, gUnknown_819EF5D + callstd 3 + end Route12_NorthEntrance_2F_EventScript_16FE81:: @ 816FE81 - loadword 0, gUnknown_819EFA0 - callstd 3 - end + loadword 0, gUnknown_819EFA0 + callstd 3 + end Route12_NorthEntrance_2F_EventScript_16FE8A:: @ 816FE8A - lock - faceplayer - checkflag FLAG_0x25B - goto_if 1, EventScript_16FF01 - checkplayergender - compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_16FEE5 - compare_var_to_value VAR_RESULT, 1 - call_if 1, EventScript_16FEEE - checkitemspace ITEM_TM27, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16FEF7 - additem ITEM_TM27, 1 - loadword 0, gUnknown_819EE9F - setorcopyvar VAR_0x8000, 315 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 257 - callstd 9 - loadword 0, gUnknown_819EEC6 - callstd 4 - setflag FLAG_0x25B - release - end + lock + faceplayer + checkflag FLAG_0x25B + goto_if 1, EventScript_16FF01 + checkplayergender + compare_var_to_value VAR_RESULT, 0 + call_if 1, EventScript_16FEE5 + compare_var_to_value VAR_RESULT, 1 + call_if 1, EventScript_16FEEE + checkitemspace ITEM_TM27, 1 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16FEF7 + additem ITEM_TM27, 1 + loadword 0, gUnknown_819EE9F + setorcopyvar VAR_0x8000, 315 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 257 + callstd 9 + loadword 0, gUnknown_819EEC6 + callstd 4 + setflag FLAG_0x25B + release + end EventScript_16FEE5:: @ 816FEE5 - loadword 0, gUnknown_819EDE1 - callstd 4 - return + loadword 0, gUnknown_819EDE1 + callstd 4 + return EventScript_16FEEE:: @ 816FEEE - loadword 0, gUnknown_819EE40 - callstd 4 - return + loadword 0, gUnknown_819EE40 + callstd 4 + return EventScript_16FEF7:: @ 816FEF7 - loadword 0, gUnknown_819EF3F - callstd 4 - release - end + loadword 0, gUnknown_819EF3F + callstd 4 + release + end EventScript_16FF01:: @ 816FF01 - loadword 0, gUnknown_819EEC6 - callstd 4 - release - end + loadword 0, gUnknown_819EEC6 + callstd 4 + release + end diff --git a/data/maps/Route13/scripts.inc b/data/maps/Route13/scripts.inc index a2c8ca7c9..37d91913f 100644 --- a/data/maps/Route13/scripts.inc +++ b/data/maps/Route13/scripts.inc @@ -1,17 +1,17 @@ Route13_MapScripts:: @ 81680B5 - .byte 0 + .byte 0 Route13_EventScript_1680B6:: @ 81680B6 - loadword 0, gUnknown_8185DB7 - callstd 3 - end + loadword 0, gUnknown_8185DB7 + callstd 3 + end Route13_EventScript_1680BF:: @ 81680BF - loadword 0, gUnknown_8185DEF - callstd 3 - end + loadword 0, gUnknown_8185DEF + callstd 3 + end Route13_EventScript_1680C8:: @ 81680C8 - loadword 0, gUnknown_8185E2C - callstd 3 - end + loadword 0, gUnknown_8185E2C + callstd 3 + end diff --git a/data/maps/Route14/scripts.inc b/data/maps/Route14/scripts.inc index 20cc90520..350c7ed21 100644 --- a/data/maps/Route14/scripts.inc +++ b/data/maps/Route14/scripts.inc @@ -1,7 +1,7 @@ Route14_MapScripts:: @ 81680D1 - .byte 0 + .byte 0 Route14_EventScript_1680D2:: @ 81680D2 - loadword 0, gUnknown_8186399 - callstd 3 - end + loadword 0, gUnknown_8186399 + callstd 3 + end diff --git a/data/maps/Route15/scripts.inc b/data/maps/Route15/scripts.inc index 2f19dbbcc..d4e6e4cd3 100644 --- a/data/maps/Route15/scripts.inc +++ b/data/maps/Route15/scripts.inc @@ -1,7 +1,7 @@ Route15_MapScripts:: @ 81680DB - .byte 0 + .byte 0 Route15_EventScript_1680DC:: @ 81680DC - loadword 0, gUnknown_8186A77 - callstd 3 - end + loadword 0, gUnknown_8186A77 + callstd 3 + end diff --git a/data/maps/Route15_WestEntrance_1F/scripts.inc b/data/maps/Route15_WestEntrance_1F/scripts.inc index 32085e1e7..b665864d1 100644 --- a/data/maps/Route15_WestEntrance_1F/scripts.inc +++ b/data/maps/Route15_WestEntrance_1F/scripts.inc @@ -1,7 +1,7 @@ Route15_WestEntrance_1F_MapScripts:: @ 8170088 - .byte 0 + .byte 0 Route15_WestEntrance_1F_EventScript_170089:: @ 8170089 - loadword 0, gUnknown_819F560 - callstd 2 - end + loadword 0, gUnknown_819F560 + callstd 2 + end diff --git a/data/maps/Route15_WestEntrance_2F/scripts.inc b/data/maps/Route15_WestEntrance_2F/scripts.inc index 67ccc5214..5de7395c9 100644 --- a/data/maps/Route15_WestEntrance_2F/scripts.inc +++ b/data/maps/Route15_WestEntrance_2F/scripts.inc @@ -1,64 +1,64 @@ Route15_WestEntrance_2F_MapScripts:: @ 8170092 - .byte 0 + .byte 0 Route15_WestEntrance_2F_EventScript_170093:: @ 8170093 - lockall - loadword 0, gUnknown_819F79C - callstd 4 - drawmonpic SPECIES_ARTICUNO, 10, 3 - delay 20 - waitbuttonpress - erasemonpic - setvar VAR_0x8004, 144 - special sub_80CBDCC - releaseall - end + lockall + loadword 0, gUnknown_819F79C + callstd 4 + drawmonpic SPECIES_ARTICUNO, 10, 3 + delay 20 + waitbuttonpress + erasemonpic + setvar VAR_0x8004, 144 + special sub_80CBDCC + releaseall + end Route15_WestEntrance_2F_EventScript_1700B0:: @ 81700B0 - loadword 0, gUnknown_819F7F8 - callstd 3 - end + loadword 0, gUnknown_819F7F8 + callstd 3 + end Route15_WestEntrance_2F_EventScript_1700B9:: @ 81700B9 - lock - faceplayer - call EventScript_170145 - checkflag FLAG_0x256 - goto_if 1, EventScript_17013B - loadword 0, gUnknown_819F5AB - callstd 5 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1A7AD1 - setvar VAR_0x8004, 0 - specialvar VAR_RESULT, sub_80CA3D8 - getnumberstring 2, VAR_0x8006 - call EventScript_170145 - compare_var_to_value VAR_0x8006, 50 - goto_if 0, EventScript_1A7ABD - loadword 0, gUnknown_819F6AA - callstd 4 - checkitemspace ITEM_EXP_SHARE, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1A7AC7 - additem ITEM_EXP_SHARE, 1 - loadword 0, gUnknown_819F6FD - setorcopyvar VAR_0x8000, 182 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 257 - callstd 9 - setflag FLAG_0x256 - loadword 0, gUnknown_819F71F - callstd 4 - release - end + lock + faceplayer + call EventScript_170145 + checkflag FLAG_0x256 + goto_if 1, EventScript_17013B + loadword 0, gUnknown_819F5AB + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_1A7AD1 + setvar VAR_0x8004, 0 + specialvar VAR_RESULT, sub_80CA3D8 + getnumberstring 2, VAR_0x8006 + call EventScript_170145 + compare_var_to_value VAR_0x8006, 50 + goto_if 0, EventScript_1A7ABD + loadword 0, gUnknown_819F6AA + callstd 4 + checkitemspace ITEM_EXP_SHARE, 1 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_1A7AC7 + additem ITEM_EXP_SHARE, 1 + loadword 0, gUnknown_819F6FD + setorcopyvar VAR_0x8000, 182 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 257 + callstd 9 + setflag FLAG_0x256 + loadword 0, gUnknown_819F71F + callstd 4 + release + end EventScript_17013B:: @ 817013B - loadword 0, gUnknown_819F71F - callstd 4 - release - end + loadword 0, gUnknown_819F71F + callstd 4 + release + end EventScript_170145:: @ 8170145 - getnumberstring 0, 50 - getitemname 1, ITEM_EXP_SHARE - return + getnumberstring 0, 50 + getitemname 1, ITEM_EXP_SHARE + return diff --git a/data/maps/Route16/scripts.inc b/data/maps/Route16/scripts.inc index e06522f56..7b3b035a1 100644 --- a/data/maps/Route16/scripts.inc +++ b/data/maps/Route16/scripts.inc @@ -1,90 +1,90 @@ Route16_MapScripts:: @ 81680E5 - map_script 5, Route16_MapScript1_1680F5 - map_script 3, Route16_MapScript2_168103 - map_script 4, Route16_MapScript3_168113 - .byte 0 + map_script 5, Route16_MapScript1_1680F5 + map_script 3, Route16_MapScript2_168103 + map_script 4, Route16_MapScript3_168113 + .byte 0 Route16_MapScript1_1680F5:: @ 81680F5 - checkflag 2055 - call_if 1, EventScript_1680FF - end + checkflag 2055 + call_if 1, EventScript_1680FF + end EventScript_1680FF:: @ 81680FF - removeobject VAR_LAST_TALKED - return + removeobject VAR_LAST_TALKED + return Route16_MapScript2_168103:: @ 8168103 - compare_var_to_value VAR_0x405E, 1 - call_if 1, EventScript_16810F - end + compare_var_to_value VAR_0x405E, 1 + call_if 1, EventScript_16810F + end EventScript_16810F:: @ 816810F - setflag 2096 - return + setflag 2096 + return Route16_MapScript3_168113:: @ 8168113 - map_script_2 VAR_0x405E, 1, EventScript_16811D - .2byte 0 + map_script_2 VAR_0x405E, 1, EventScript_16811D + .2byte 0 EventScript_16811D:: @ 816811D - special sub_80CA630 - end + special sub_80CA630 + end Route16_EventScript_168121:: @ 8168121 - lock - faceplayer - checkflag FLAG_0x23D - goto_if 0, EventScript_1681A3 - special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 - special sub_8112364 - loadword 0, gUnknown_81853CC - callstd 5 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_168197 - call EventScript_1A924B - setwildbattle SPECIES_SNORLAX, 30, ITEM_NONE - waitse - playmoncry SPECIES_SNORLAX, 2 - delay 40 - waitmoncry - setflag FLAG_0x080 - setflag 2055 - dowildbattle - clearflag 2055 - specialvar VAR_RESULT, sub_80CA74C - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_168199 - compare_var_to_value VAR_RESULT, 4 - goto_if 1, EventScript_168199 - compare_var_to_value VAR_RESULT, 5 - goto_if 1, EventScript_168199 - release - end + lock + faceplayer + checkflag FLAG_0x23D + goto_if 0, EventScript_1681A3 + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + special sub_8112364 + loadword 0, gUnknown_81853CC + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_168197 + call EventScript_1A924B + setwildbattle SPECIES_SNORLAX, 30, ITEM_NONE + waitse + playmoncry SPECIES_SNORLAX, 2 + delay 40 + waitmoncry + setflag FLAG_0x080 + setflag 2055 + dowildbattle + clearflag 2055 + specialvar VAR_RESULT, sub_80CA74C + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_168199 + compare_var_to_value VAR_RESULT, 4 + goto_if 1, EventScript_168199 + compare_var_to_value VAR_RESULT, 5 + goto_if 1, EventScript_168199 + release + end EventScript_168197:: @ 8168197 - release - end + release + end EventScript_168199:: @ 8168199 - loadword 0, gUnknown_8185383 - callstd 4 - release - end + loadword 0, gUnknown_8185383 + callstd 4 + release + end EventScript_1681A3:: @ 81681A3 - loadword 0, gUnknown_8186F3D - callstd 4 - release - end + loadword 0, gUnknown_8186F3D + callstd 4 + release + end Route16_EventScript_1681AD:: @ 81681AD - loadword 0, gUnknown_8186F7A - callstd 3 - end + loadword 0, gUnknown_8186F7A + callstd 3 + end Route16_EventScript_1681B6:: @ 81681B6 - loadword 0, gUnknown_8186F98 - callstd 3 - end + loadword 0, gUnknown_8186F98 + callstd 3 + end diff --git a/data/maps/Route16_House/scripts.inc b/data/maps/Route16_House/scripts.inc index 12a4251d8..95b86aca1 100644 --- a/data/maps/Route16_House/scripts.inc +++ b/data/maps/Route16_House/scripts.inc @@ -1,47 +1,47 @@ Route16_House_MapScripts:: @ 817014E - .byte 0 + .byte 0 Route16_House_EventScript_17014F:: @ 817014F - lock - faceplayer - checkflag FLAG_0x238 - goto_if 1, EventScript_1701A5 - loadword 0, gUnknown_819F851 - callstd 4 - checkitemspace ITEM_HM02, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_17019B - additem ITEM_HM02, 1 - loadword 0, gUnknown_819F8C0 - setorcopyvar VAR_0x8000, 340 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 257 - callstd 9 - loadword 0, gUnknown_819F8E0 - callstd 4 - setflag FLAG_0x238 - release - end + lock + faceplayer + checkflag FLAG_0x238 + goto_if 1, EventScript_1701A5 + loadword 0, gUnknown_819F851 + callstd 4 + checkitemspace ITEM_HM02, 1 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_17019B + additem ITEM_HM02, 1 + loadword 0, gUnknown_819F8C0 + setorcopyvar VAR_0x8000, 340 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 257 + callstd 9 + loadword 0, gUnknown_819F8E0 + callstd 4 + setflag FLAG_0x238 + release + end EventScript_17019B:: @ 817019B - loadword 0, gUnknown_819F92D - callstd 4 - release - end + loadword 0, gUnknown_819F92D + callstd 4 + release + end EventScript_1701A5:: @ 81701A5 - loadword 0, gUnknown_819F8E0 - callstd 4 - release - end + loadword 0, gUnknown_819F8E0 + callstd 4 + release + end Route16_House_EventScript_1701AF:: @ 81701AF - lock - faceplayer - waitse - playmoncry SPECIES_FEAROW, 0 - loadword 0, gUnknown_819F94F - callstd 4 - waitmoncry - release - end + lock + faceplayer + waitse + playmoncry SPECIES_FEAROW, 0 + loadword 0, gUnknown_819F94F + callstd 4 + waitmoncry + release + end diff --git a/data/maps/Route16_NorthEntrance_1F/scripts.inc b/data/maps/Route16_NorthEntrance_1F/scripts.inc index b288d45ce..3e5bd6921 100644 --- a/data/maps/Route16_NorthEntrance_1F/scripts.inc +++ b/data/maps/Route16_NorthEntrance_1F/scripts.inc @@ -1,123 +1,123 @@ Route16_NorthEntrance_1F_MapScripts:: @ 81701C2 - map_script 3, Route16_NorthEntrance_1F_MapScript1_1701C8 - .byte 0 + map_script 3, Route16_NorthEntrance_1F_MapScript1_1701C8 + .byte 0 Route16_NorthEntrance_1F_MapScript1_1701C8:: @ 81701C8 - clearflag 2096 - checkflag FLAG_0x271 - call_if 1, EventScript_1701D5 - end + clearflag 2096 + checkflag FLAG_0x271 + call_if 1, EventScript_1701D5 + end EventScript_1701D5:: @ 81701D5 - setvar VAR_0x4001, 1 - return + setvar VAR_0x4001, 1 + return Route16_NorthEntrance_1F_EventScript_1701DB:: @ 81701DB - loadword 0, gUnknown_819F98B - callstd 2 - end + loadword 0, gUnknown_819F98B + callstd 2 + end Route16_NorthEntrance_1F_EventScript_1701E4:: @ 81701E4 - lockall - setvar VAR_0x8008, 0 - goto EventScript_170220 - end + lockall + setvar VAR_0x8008, 0 + goto EventScript_170220 + end Route16_NorthEntrance_1F_EventScript_1701F0:: @ 81701F0 - lockall - setvar VAR_0x8008, 1 - goto EventScript_170220 - end + lockall + setvar VAR_0x8008, 1 + goto EventScript_170220 + end Route16_NorthEntrance_1F_EventScript_1701FC:: @ 81701FC - lockall - setvar VAR_0x8008, 2 - goto EventScript_170220 - end + lockall + setvar VAR_0x8008, 2 + goto EventScript_170220 + end Route16_NorthEntrance_1F_EventScript_170208:: @ 8170208 - lockall - setvar VAR_0x8008, 3 - goto EventScript_170220 - end + lockall + setvar VAR_0x8008, 3 + goto EventScript_170220 + end Route16_NorthEntrance_1F_EventScript_170214:: @ 8170214 - lockall - setvar VAR_0x8008, 4 - goto EventScript_170220 - end + lockall + setvar VAR_0x8008, 4 + goto EventScript_170220 + end EventScript_170220:: @ 8170220 - textcolor 0 - loadword 0, gUnknown_819F9CC - callstd 4 - closemessage - applymovement 255, Movement_1A75E9 - waitmovement 0 - delay 20 - compare_var_to_value VAR_0x8008, 1 - call_if 1, EventScript_170279 - compare_var_to_value VAR_0x8008, 2 - call_if 1, EventScript_170284 - compare_var_to_value VAR_0x8008, 3 - call_if 1, EventScript_17028F - compare_var_to_value VAR_0x8008, 4 - call_if 1, EventScript_17029A - loadword 0, gUnknown_819F95F - callstd 4 - closemessage - applymovement 255, Movement_1702B3 - waitmovement 0 - releaseall - end + textcolor 0 + loadword 0, gUnknown_819F9CC + callstd 4 + closemessage + applymovement 255, Movement_1A75E9 + waitmovement 0 + delay 20 + compare_var_to_value VAR_0x8008, 1 + call_if 1, EventScript_170279 + compare_var_to_value VAR_0x8008, 2 + call_if 1, EventScript_170284 + compare_var_to_value VAR_0x8008, 3 + call_if 1, EventScript_17028F + compare_var_to_value VAR_0x8008, 4 + call_if 1, EventScript_17029A + loadword 0, gUnknown_819F95F + callstd 4 + closemessage + applymovement 255, Movement_1702B3 + waitmovement 0 + releaseall + end EventScript_170279:: @ 8170279 - applymovement 255, Movement_1702A5 - waitmovement 0 - return + applymovement 255, Movement_1702A5 + waitmovement 0 + return EventScript_170284:: @ 8170284 - applymovement 255, Movement_1702A7 - waitmovement 0 - return + applymovement 255, Movement_1702A7 + waitmovement 0 + return EventScript_17028F:: @ 817028F - applymovement 255, Movement_1702AA - waitmovement 0 - return + applymovement 255, Movement_1702AA + waitmovement 0 + return EventScript_17029A:: @ 817029A - applymovement 255, Movement_1702AE - waitmovement 0 - return + applymovement 255, Movement_1702AE + waitmovement 0 + return Movement_1702A5:: @ 81702A5 - step_11 - step_end + step_11 + step_end Movement_1702A7:: @ 81702A7 - step_11 - step_11 - step_end + step_11 + step_11 + step_end Movement_1702AA:: @ 81702AA - step_11 - step_11 - step_11 - step_end + step_11 + step_11 + step_11 + step_end Movement_1702AE:: @ 81702AE - step_11 - step_11 - step_11 - step_11 - step_end + step_11 + step_11 + step_11 + step_11 + step_end Movement_1702B3:: @ 81702B3 - step_13 - step_end + step_13 + step_end Route16_NorthEntrance_1F_EventScript_1702B5:: @ 81702B5 - loadword 0, gUnknown_819F9E8 - callstd 2 - end + loadword 0, gUnknown_819F9E8 + callstd 2 + end diff --git a/data/maps/Route16_NorthEntrance_2F/scripts.inc b/data/maps/Route16_NorthEntrance_2F/scripts.inc index 3a5a2a48b..979bcc3f5 100644 --- a/data/maps/Route16_NorthEntrance_2F/scripts.inc +++ b/data/maps/Route16_NorthEntrance_2F/scripts.inc @@ -1,66 +1,66 @@ Route16_NorthEntrance_2F_MapScripts:: @ 81702BE - .byte 0 + .byte 0 Route16_NorthEntrance_2F_EventScript_1702BF:: @ 81702BF - loadword 0, gUnknown_819FA07 - callstd 2 - end + loadword 0, gUnknown_819FA07 + callstd 2 + end Route16_NorthEntrance_2F_EventScript_1702C8:: @ 81702C8 - loadword 0, gUnknown_819FA41 - callstd 2 - end + loadword 0, gUnknown_819FA41 + callstd 2 + end Route16_NorthEntrance_2F_EventScript_1702D1:: @ 81702D1 - loadword 0, gUnknown_819FA6F - callstd 3 - end + loadword 0, gUnknown_819FA6F + callstd 3 + end Route16_NorthEntrance_2F_EventScript_1702DA:: @ 81702DA - loadword 0, gUnknown_819FAB9 - callstd 3 - end + loadword 0, gUnknown_819FAB9 + callstd 3 + end Route16_NorthEntrance_2F_EventScript_1702E3:: @ 81702E3 - lock - faceplayer - call EventScript_17036F - checkflag FLAG_0x2FD - goto_if 1, EventScript_170365 - loadword 0, gUnknown_819FB0E - callstd 5 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1A7AD1 - setvar VAR_0x8004, 0 - specialvar VAR_RESULT, sub_80CA3D8 - getnumberstring 2, VAR_0x8006 - call EventScript_17036F - compare_var_to_value VAR_0x8006, 40 - goto_if 0, EventScript_1A7ABD - loadword 0, gUnknown_819FC15 - callstd 4 - checkitemspace ITEM_AMULET_COIN, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1A7AC7 - additem ITEM_AMULET_COIN, 1 - loadword 0, gUnknown_819FC68 - setorcopyvar VAR_0x8000, 189 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 257 - callstd 9 - setflag FLAG_0x2FD - loadword 0, gUnknown_819FC93 - callstd 4 - release - end + lock + faceplayer + call EventScript_17036F + checkflag FLAG_0x2FD + goto_if 1, EventScript_170365 + loadword 0, gUnknown_819FB0E + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_1A7AD1 + setvar VAR_0x8004, 0 + specialvar VAR_RESULT, sub_80CA3D8 + getnumberstring 2, VAR_0x8006 + call EventScript_17036F + compare_var_to_value VAR_0x8006, 40 + goto_if 0, EventScript_1A7ABD + loadword 0, gUnknown_819FC15 + callstd 4 + checkitemspace ITEM_AMULET_COIN, 1 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_1A7AC7 + additem ITEM_AMULET_COIN, 1 + loadword 0, gUnknown_819FC68 + setorcopyvar VAR_0x8000, 189 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 257 + callstd 9 + setflag FLAG_0x2FD + loadword 0, gUnknown_819FC93 + callstd 4 + release + end EventScript_170365:: @ 8170365 - loadword 0, gUnknown_819FC93 - callstd 4 - release - end + loadword 0, gUnknown_819FC93 + callstd 4 + release + end EventScript_17036F:: @ 817036F - getnumberstring 0, 40 - getitemname 1, ITEM_AMULET_COIN - return + getnumberstring 0, 40 + getitemname 1, ITEM_AMULET_COIN + return diff --git a/data/maps/Route17/scripts.inc b/data/maps/Route17/scripts.inc index 8278392d0..97e3fdb77 100644 --- a/data/maps/Route17/scripts.inc +++ b/data/maps/Route17/scripts.inc @@ -1,32 +1,32 @@ Route17_MapScripts:: @ 81681BF - .byte 0 + .byte 0 Route17_EventScript_1681C0:: @ 81681C0 - loadword 0, gUnknown_81874E4 - callstd 3 - end + loadword 0, gUnknown_81874E4 + callstd 3 + end Route17_EventScript_1681C9:: @ 81681C9 - loadword 0, gUnknown_8187512 - callstd 3 - end + loadword 0, gUnknown_8187512 + callstd 3 + end Route17_EventScript_1681D2:: @ 81681D2 - loadword 0, gUnknown_818757B - callstd 3 - end + loadword 0, gUnknown_818757B + callstd 3 + end Route17_EventScript_1681DB:: @ 81681DB - loadword 0, gUnknown_81875BE - callstd 3 - end + loadword 0, gUnknown_81875BE + callstd 3 + end Route17_EventScript_1681E4:: @ 81681E4 - loadword 0, gUnknown_81875E3 - callstd 3 - end + loadword 0, gUnknown_81875E3 + callstd 3 + end Route17_EventScript_1681ED:: @ 81681ED - loadword 0, gUnknown_8187622 - callstd 3 - end + loadword 0, gUnknown_8187622 + callstd 3 + end diff --git a/data/maps/Route18/scripts.inc b/data/maps/Route18/scripts.inc index b7fcc41ab..130e3d43c 100644 --- a/data/maps/Route18/scripts.inc +++ b/data/maps/Route18/scripts.inc @@ -1,31 +1,31 @@ Route18_MapScripts:: @ 81681F6 - map_script 3, Route18_MapScript1_168201 - map_script 4, Route18_MapScript2_168211 - .byte 0 + map_script 3, Route18_MapScript1_168201 + map_script 4, Route18_MapScript2_168211 + .byte 0 Route18_MapScript1_168201:: @ 8168201 - compare_var_to_value VAR_0x405E, 1 - call_if 1, EventScript_16820D - end + compare_var_to_value VAR_0x405E, 1 + call_if 1, EventScript_16820D + end EventScript_16820D:: @ 816820D - setflag 2096 - return + setflag 2096 + return Route18_MapScript2_168211:: @ 8168211 - map_script_2 VAR_0x405E, 1, EventScript_16821B - .2byte 0 + map_script_2 VAR_0x405E, 1, EventScript_16821B + .2byte 0 EventScript_16821B:: @ 816821B - special sub_80CA630 - end + special sub_80CA630 + end Route18_EventScript_16821F:: @ 816821F - loadword 0, gUnknown_8187757 - callstd 3 - end + loadword 0, gUnknown_8187757 + callstd 3 + end Route18_EventScript_168228:: @ 8168228 - loadword 0, gUnknown_818777C - callstd 3 - end + loadword 0, gUnknown_818777C + callstd 3 + end diff --git a/data/maps/Route18_EastEntrance_1F/scripts.inc b/data/maps/Route18_EastEntrance_1F/scripts.inc index 0a55befaa..be12d62b0 100644 --- a/data/maps/Route18_EastEntrance_1F/scripts.inc +++ b/data/maps/Route18_EastEntrance_1F/scripts.inc @@ -1,118 +1,118 @@ Route18_EastEntrance_1F_MapScripts:: @ 8170378 - map_script 3, Route18_EastEntrance_1F_MapScript1_17037E - .byte 0 + map_script 3, Route18_EastEntrance_1F_MapScript1_17037E + .byte 0 Route18_EastEntrance_1F_MapScript1_17037E:: @ 817037E - clearflag 2096 - checkflag FLAG_0x271 - call_if 1, EventScript_17038B - end + clearflag 2096 + checkflag FLAG_0x271 + call_if 1, EventScript_17038B + end EventScript_17038B:: @ 817038B - setvar VAR_0x4001, 1 - return + setvar VAR_0x4001, 1 + return Route18_EastEntrance_1F_EventScript_170391:: @ 8170391 - loadword 0, gUnknown_819FD3A - callstd 2 - end + loadword 0, gUnknown_819FD3A + callstd 2 + end Route18_EastEntrance_1F_EventScript_17039A:: @ 817039A - lockall - setvar VAR_0x8008, 0 - goto EventScript_1703D6 - end + lockall + setvar VAR_0x8008, 0 + goto EventScript_1703D6 + end Route18_EastEntrance_1F_EventScript_1703A6:: @ 81703A6 - lockall - setvar VAR_0x8008, 1 - goto EventScript_1703D6 - end + lockall + setvar VAR_0x8008, 1 + goto EventScript_1703D6 + end Route18_EastEntrance_1F_EventScript_1703B2:: @ 81703B2 - lockall - setvar VAR_0x8008, 2 - goto EventScript_1703D6 - end + lockall + setvar VAR_0x8008, 2 + goto EventScript_1703D6 + end Route18_EastEntrance_1F_EventScript_1703BE:: @ 81703BE - lockall - setvar VAR_0x8008, 3 - goto EventScript_1703D6 - end + lockall + setvar VAR_0x8008, 3 + goto EventScript_1703D6 + end Route18_EastEntrance_1F_EventScript_1703CA:: @ 81703CA - lockall - setvar VAR_0x8008, 4 - goto EventScript_1703D6 - end + lockall + setvar VAR_0x8008, 4 + goto EventScript_1703D6 + end EventScript_1703D6:: @ 81703D6 - textcolor 0 - loadword 0, gUnknown_819FD60 - callstd 4 - closemessage - applymovement 255, Movement_1A75E9 - waitmovement 0 - delay 20 - compare_var_to_value VAR_0x8008, 1 - call_if 1, EventScript_17042F - compare_var_to_value VAR_0x8008, 2 - call_if 1, EventScript_17043A - compare_var_to_value VAR_0x8008, 3 - call_if 1, EventScript_170445 - compare_var_to_value VAR_0x8008, 4 - call_if 1, EventScript_170450 - loadword 0, gUnknown_819FD0C - callstd 4 - closemessage - applymovement 255, Movement_170469 - waitmovement 0 - releaseall - end + textcolor 0 + loadword 0, gUnknown_819FD60 + callstd 4 + closemessage + applymovement 255, Movement_1A75E9 + waitmovement 0 + delay 20 + compare_var_to_value VAR_0x8008, 1 + call_if 1, EventScript_17042F + compare_var_to_value VAR_0x8008, 2 + call_if 1, EventScript_17043A + compare_var_to_value VAR_0x8008, 3 + call_if 1, EventScript_170445 + compare_var_to_value VAR_0x8008, 4 + call_if 1, EventScript_170450 + loadword 0, gUnknown_819FD0C + callstd 4 + closemessage + applymovement 255, Movement_170469 + waitmovement 0 + releaseall + end EventScript_17042F:: @ 817042F - applymovement 255, Movement_17045B - waitmovement 0 - return + applymovement 255, Movement_17045B + waitmovement 0 + return EventScript_17043A:: @ 817043A - applymovement 255, Movement_17045D - waitmovement 0 - return + applymovement 255, Movement_17045D + waitmovement 0 + return EventScript_170445:: @ 8170445 - applymovement 255, Movement_170460 - waitmovement 0 - return + applymovement 255, Movement_170460 + waitmovement 0 + return EventScript_170450:: @ 8170450 - applymovement 255, Movement_170464 - waitmovement 0 - return + applymovement 255, Movement_170464 + waitmovement 0 + return Movement_17045B:: @ 817045B - step_11 - step_end + step_11 + step_end Movement_17045D:: @ 817045D - step_11 - step_11 - step_end + step_11 + step_11 + step_end Movement_170460:: @ 8170460 - step_11 - step_11 - step_11 - step_end + step_11 + step_11 + step_11 + step_end Movement_170464:: @ 8170464 - step_11 - step_11 - step_11 - step_11 - step_end + step_11 + step_11 + step_11 + step_11 + step_end Movement_170469:: @ 8170469 - step_13 - step_end + step_13 + step_end diff --git a/data/maps/Route18_EastEntrance_2F/scripts.inc b/data/maps/Route18_EastEntrance_2F/scripts.inc index 84bcd23b3..5c809fefc 100644 --- a/data/maps/Route18_EastEntrance_2F/scripts.inc +++ b/data/maps/Route18_EastEntrance_2F/scripts.inc @@ -1,55 +1,55 @@ Route18_EastEntrance_2F_MapScripts:: @ 817046B - .byte 0 + .byte 0 Route18_EastEntrance_2F_EventScript_17046C:: @ 817046C - loadword 0, gUnknown_819FD6B - callstd 3 - end + loadword 0, gUnknown_819FD6B + callstd 3 + end Route18_EastEntrance_2F_EventScript_170475:: @ 8170475 - loadword 0, gUnknown_819FDB3 - callstd 3 - end + loadword 0, gUnknown_819FDB3 + callstd 3 + end Route18_EastEntrance_2F_EventScript_17047E:: @ 817047E - lock - faceplayer - setvar VAR_0x8008, 5 - call EventScript_1A8CAD - checkflag FLAG_0x257 - goto_if 1, EventScript_1704F0 - loadword 0, gUnknown_81A597B - callstd 5 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1704D8 - call EventScript_1A8CBD - compare_var_to_value VAR_0x8004, 6 - goto_if 4, EventScript_1704D8 - call EventScript_1A8CC9 - compare_var_to_var VAR_RESULT, VAR_0x8009 - goto_if 5, EventScript_1704E2 - call EventScript_1A8CD9 - loadword 0, gUnknown_81A59DA - callstd 4 - setflag FLAG_0x257 - release - end + lock + faceplayer + setvar VAR_0x8008, 5 + call EventScript_1A8CAD + checkflag FLAG_0x257 + goto_if 1, EventScript_1704F0 + loadword 0, gUnknown_81A597B + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_1704D8 + call EventScript_1A8CBD + compare_var_to_value VAR_0x8004, 6 + goto_if 4, EventScript_1704D8 + call EventScript_1A8CC9 + compare_var_to_var VAR_RESULT, VAR_0x8009 + goto_if 5, EventScript_1704E2 + call EventScript_1A8CD9 + loadword 0, gUnknown_81A59DA + callstd 4 + setflag FLAG_0x257 + release + end EventScript_1704D8:: @ 81704D8 - loadword 0, gUnknown_81A59B6 - callstd 4 - release - end + loadword 0, gUnknown_81A59B6 + callstd 4 + release + end EventScript_1704E2:: @ 81704E2 - getspeciesname 0, 32777 - loadword 0, gUnknown_81A59C6 - callstd 4 - release - end + getspeciesname 0, 32777 + loadword 0, gUnknown_81A59C6 + callstd 4 + release + end EventScript_1704F0:: @ 81704F0 - loadword 0, gUnknown_81A59E7 - callstd 4 - release - end + loadword 0, gUnknown_81A59E7 + callstd 4 + release + end diff --git a/data/maps/Route19/scripts.inc b/data/maps/Route19/scripts.inc index 19af9f870..bc7af0745 100644 --- a/data/maps/Route19/scripts.inc +++ b/data/maps/Route19/scripts.inc @@ -1,7 +1,7 @@ Route19_MapScripts:: @ 8168231 - .byte 0 + .byte 0 Route19_EventScript_168232:: @ 8168232 - loadword 0, gUnknown_8187C06 - callstd 3 - end + loadword 0, gUnknown_8187C06 + callstd 3 + end diff --git a/data/maps/Route2/scripts.inc b/data/maps/Route2/scripts.inc index 8623b3622..fbcf581e4 100644 --- a/data/maps/Route2/scripts.inc +++ b/data/maps/Route2/scripts.inc @@ -1,12 +1,12 @@ Route2_MapScripts:: @ 8167F64 - .byte 0 + .byte 0 Route2_EventScript_167F65:: @ 8167F65 - loadword 0, gUnknown_818345E - callstd 3 - end + loadword 0, gUnknown_818345E + callstd 3 + end Route2_EventScript_167F6E:: @ 8167F6E - loadword 0, gUnknown_8183482 - callstd 3 - end + loadword 0, gUnknown_8183482 + callstd 3 + end diff --git a/data/maps/Route20/scripts.inc b/data/maps/Route20/scripts.inc index e611d1f73..a1e894cb2 100644 --- a/data/maps/Route20/scripts.inc +++ b/data/maps/Route20/scripts.inc @@ -1,35 +1,35 @@ Route20_MapScripts:: @ 816823B - map_script 3, Route20_MapScript1_168241 - .byte 0 + map_script 3, Route20_MapScript1_168241 + .byte 0 Route20_MapScript1_168241:: @ 8168241 - checkflag FLAG_0x2D2 - call_if 0, EventScript_168254 - checkflag FLAG_0x2D3 - call_if 0, EventScript_16826D - end + checkflag FLAG_0x2D2 + call_if 0, EventScript_168254 + checkflag FLAG_0x2D3 + call_if 0, EventScript_16826D + end EventScript_168254:: @ 8168254 - clearflag FLAG_0x040 - clearflag FLAG_0x041 - setflag FLAG_0x042 - setflag FLAG_0x043 - setflag FLAG_0x044 - setflag FLAG_0x045 - setflag FLAG_0x046 - setflag FLAG_0x047 - return + clearflag FLAG_0x040 + clearflag FLAG_0x041 + setflag FLAG_0x042 + setflag FLAG_0x043 + setflag FLAG_0x044 + setflag FLAG_0x045 + setflag FLAG_0x046 + setflag FLAG_0x047 + return EventScript_16826D:: @ 816826D - clearflag FLAG_0x048 - clearflag FLAG_0x049 - clearflag FLAG_0x04A - clearflag FLAG_0x04B - setflag FLAG_0x04C - setflag FLAG_0x04D - return + clearflag FLAG_0x048 + clearflag FLAG_0x049 + clearflag FLAG_0x04A + clearflag FLAG_0x04B + setflag FLAG_0x04C + setflag FLAG_0x04D + return Route20_EventScript_168280:: @ 8168280 - loadword 0, gUnknown_81882D1 - callstd 3 - end + loadword 0, gUnknown_81882D1 + callstd 3 + end diff --git a/data/maps/Route21_North/scripts.inc b/data/maps/Route21_North/scripts.inc index a7436e8ec..473a8ac59 100644 --- a/data/maps/Route21_North/scripts.inc +++ b/data/maps/Route21_North/scripts.inc @@ -1,2 +1,2 @@ Route21_North_MapScripts:: @ 8168289 - .byte 0 + .byte 0 diff --git a/data/maps/Route21_South/scripts.inc b/data/maps/Route21_South/scripts.inc index ea3478a2b..caab96b6a 100644 --- a/data/maps/Route21_South/scripts.inc +++ b/data/maps/Route21_South/scripts.inc @@ -1,2 +1,2 @@ Route21_South_MapScripts:: @ 816828A - .byte 0 + .byte 0 diff --git a/data/maps/Route22/scripts.inc b/data/maps/Route22/scripts.inc index 30dbed8a1..54723a44e 100644 --- a/data/maps/Route22/scripts.inc +++ b/data/maps/Route22/scripts.inc @@ -1,266 +1,266 @@ Route22_MapScripts:: @ 816828B - .byte 0 + .byte 0 Route22_EventScript_16828C:: @ 816828C - lockall - setvar VAR_0x4001, 0 - goto EventScript_1682BE + lockall + setvar VAR_0x4001, 0 + goto EventScript_1682BE EventScript_168297:: @ 8168297 - end + end Route22_EventScript_168298:: @ 8168298 - lockall - setvar VAR_0x4001, 1 - setobjectxyperm 1, 25, 5 - goto EventScript_1682BE + lockall + setvar VAR_0x4001, 1 + setobjectxyperm 1, 25, 5 + goto EventScript_1682BE EventScript_1682AA:: @ 81682AA - end + end Route22_EventScript_1682AB:: @ 81682AB - lockall - setvar VAR_0x4001, 2 - setobjectxyperm 1, 25, 5 - goto EventScript_1682BE + lockall + setvar VAR_0x4001, 2 + setobjectxyperm 1, 25, 5 + goto EventScript_1682BE EventScript_1682BD:: @ 81682BD - end + end EventScript_1682BE:: @ 81682BE - textcolor 0 - playbgm BGM_FRLG_RIVAL, 0 - addobject 1 - compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_168350 - compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_168350 - compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_16835B - delay 6 - loadword 0, gUnknown_8188890 - callstd 4 - compare_var_to_value VAR_STARTER_MON, 2 - call_if 1, EventScript_16836D - compare_var_to_value VAR_STARTER_MON, 1 - call_if 1, EventScript_16837C - compare_var_to_value VAR_STARTER_MON, 0 - call_if 1, EventScript_16838B - loadword 0, gUnknown_8188974 - callstd 4 - closemessage - delay 10 - playbgm BGM_FRLG_RIVAL_POSTBATTLE, 0 - compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_16839A - compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_16839A - compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_1683A5 - fadedefaultbgm - removeobject 1 - setvar VAR_0x4054, 2 - releaseall - end + textcolor 0 + playbgm BGM_FRLG_RIVAL, 0 + addobject 1 + compare_var_to_value VAR_0x4001, 0 + call_if 1, EventScript_168350 + compare_var_to_value VAR_0x4001, 1 + call_if 1, EventScript_168350 + compare_var_to_value VAR_0x4001, 2 + call_if 1, EventScript_16835B + delay 6 + loadword 0, gUnknown_8188890 + callstd 4 + compare_var_to_value VAR_STARTER_MON, 2 + call_if 1, EventScript_16836D + compare_var_to_value VAR_STARTER_MON, 1 + call_if 1, EventScript_16837C + compare_var_to_value VAR_STARTER_MON, 0 + call_if 1, EventScript_16838B + loadword 0, gUnknown_8188974 + callstd 4 + closemessage + delay 10 + playbgm BGM_FRLG_RIVAL_POSTBATTLE, 0 + compare_var_to_value VAR_0x4001, 0 + call_if 1, EventScript_16839A + compare_var_to_value VAR_0x4001, 1 + call_if 1, EventScript_16839A + compare_var_to_value VAR_0x4001, 2 + call_if 1, EventScript_1683A5 + fadedefaultbgm + removeobject 1 + setvar VAR_0x4054, 2 + releaseall + end EventScript_168350:: @ 8168350 - applymovement 1, Movement_1683D1 - waitmovement 0 - return + applymovement 1, Movement_1683D1 + waitmovement 0 + return EventScript_16835B:: @ 816835B - applymovement 1, Movement_1683D9 - applymovement 255, Movement_1683E3 - waitmovement 0 - return + applymovement 1, Movement_1683D9 + applymovement 255, Movement_1683E3 + waitmovement 0 + return EventScript_16836D:: @ 816836D - trainerbattle 9, 329, 0, Text_188959, Text_18DE1A - return + trainerbattle 9, 329, 0, Text_188959, Text_18DE1A + return EventScript_16837C:: @ 816837C - trainerbattle 9, 330, 0, Text_188959, Text_18DE1A - return + trainerbattle 9, 330, 0, Text_188959, Text_18DE1A + return EventScript_16838B:: @ 816838B - trainerbattle 9, 331, 0, Text_188959, Text_18DE1A - return + trainerbattle 9, 331, 0, Text_188959, Text_18DE1A + return EventScript_16839A:: @ 816839A - applymovement 1, Movement_1683B8 - waitmovement 0 - return + applymovement 1, Movement_1683B8 + waitmovement 0 + return EventScript_1683A5:: @ 81683A5 - applymovement 1, Movement_1683C5 - waitmovement 0 - return + applymovement 1, Movement_1683C5 + waitmovement 0 + return Movement_1683B0:: @ 8 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_end + step_13 + step_13 + step_13 + step_13 + step_13 + step_13 + step_13 + step_end Movement_1683B8:: @ 81683B8 - step_10 - step_13 - step_13 - step_13 - step_13 - step_13 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_end + step_10 + step_13 + step_13 + step_13 + step_13 + step_13 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_end Movement_1683C5:: @ 81683C5 - step_13 - step_13 - step_13 - step_13 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_end + step_13 + step_13 + step_13 + step_13 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_end Movement_1683D1:: @ 81683D1 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_end + step_13 + step_13 + step_13 + step_13 + step_13 + step_13 + step_13 + step_end Movement_1683D9:: @ 81683D9 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_2d - step_end + step_13 + step_13 + step_13 + step_13 + step_13 + step_13 + step_13 + step_13 + step_2d + step_end Movement_1683E3:: @ 81683E3 - step_1c - step_1c - step_1c - step_1c - step_1c - step_1c - step_1c - step_1b - step_2e - step_end + step_1c + step_1c + step_1c + step_1c + step_1c + step_1c + step_1c + step_1b + step_2e + step_end Route22_EventScript_1683ED:: @ 81683ED - lockall - setvar VAR_0x4001, 0 - goto EventScript_16841F + lockall + setvar VAR_0x4001, 0 + goto EventScript_16841F EventScript_1683F8:: @ 81683F8 - end + end Route22_EventScript_1683F9:: @ 81683F9 - lockall - setvar VAR_0x4001, 1 - setobjectxyperm 1, 25, 5 - goto EventScript_16841F + lockall + setvar VAR_0x4001, 1 + setobjectxyperm 1, 25, 5 + goto EventScript_16841F EventScript_16840B:: @ 816840B - end + end Route22_EventScript_16840C:: @ 816840C - lockall - setvar VAR_0x4001, 2 - setobjectxyperm 1, 25, 5 - goto EventScript_16841F + lockall + setvar VAR_0x4001, 2 + setobjectxyperm 1, 25, 5 + goto EventScript_16841F EventScript_16841E:: @ 816841E - end + end EventScript_16841F:: @ 816841F - textcolor 0 - playbgm BGM_FRLG_RIVAL, 0 - addobject 1 - compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_16849C - compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_16849C - compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_1684A7 - loadword 0, gUnknown_8188A3C - callstd 4 - setvar VAR_LAST_TALKED, 1 - compare_var_to_value VAR_STARTER_MON, 2 - call_if 1, EventScript_1684B9 - compare_var_to_value VAR_STARTER_MON, 1 - call_if 1, EventScript_1684C4 - compare_var_to_value VAR_STARTER_MON, 0 - call_if 1, EventScript_1684CF - loadword 0, gUnknown_8188B29 - callstd 4 - closemessage - delay 10 - playbgm BGM_FRLG_RIVAL_POSTBATTLE, 0 - applymovement 1, Movement_1684DA - waitmovement 0 - fadedefaultbgm - removeobject 1 - setvar VAR_0x4054, 4 - releaseall - end + textcolor 0 + playbgm BGM_FRLG_RIVAL, 0 + addobject 1 + compare_var_to_value VAR_0x4001, 0 + call_if 1, EventScript_16849C + compare_var_to_value VAR_0x4001, 1 + call_if 1, EventScript_16849C + compare_var_to_value VAR_0x4001, 2 + call_if 1, EventScript_1684A7 + loadword 0, gUnknown_8188A3C + callstd 4 + setvar VAR_LAST_TALKED, 1 + compare_var_to_value VAR_STARTER_MON, 2 + call_if 1, EventScript_1684B9 + compare_var_to_value VAR_STARTER_MON, 1 + call_if 1, EventScript_1684C4 + compare_var_to_value VAR_STARTER_MON, 0 + call_if 1, EventScript_1684CF + loadword 0, gUnknown_8188B29 + callstd 4 + closemessage + delay 10 + playbgm BGM_FRLG_RIVAL_POSTBATTLE, 0 + applymovement 1, Movement_1684DA + waitmovement 0 + fadedefaultbgm + removeobject 1 + setvar VAR_0x4054, 4 + releaseall + end EventScript_16849C:: @ 816849C - applymovement 1, Movement_1683D1 - waitmovement 0 - return + applymovement 1, Movement_1683D1 + waitmovement 0 + return EventScript_1684A7:: @ 81684A7 - applymovement 1, Movement_1683D9 - applymovement 255, Movement_1683E3 - waitmovement 0 - return + applymovement 1, Movement_1683D9 + applymovement 255, Movement_1683E3 + waitmovement 0 + return EventScript_1684B9:: @ 81684B9 - trainerbattle 3, 435, 0, Text_188B08 - return + trainerbattle 3, 435, 0, Text_188B08 + return EventScript_1684C4:: @ 81684C4 - trainerbattle 3, 436, 0, Text_188B08 - return + trainerbattle 3, 436, 0, Text_188B08 + return EventScript_1684CF:: @ 81684CF - trainerbattle 3, 437, 0, Text_188B08 - return + trainerbattle 3, 437, 0, Text_188B08 + return Movement_1684DA:: @ 81684DA - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_end + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_12 + step_end Route22_EventScript_1684E2:: @ 81684E2 - loadword 0, gUnknown_8188BFF - callstd 3 - end + loadword 0, gUnknown_8188BFF + callstd 3 + end diff --git a/data/maps/Route22_NorthEntrance/scripts.inc b/data/maps/Route22_NorthEntrance/scripts.inc index d7d7c61da..49fba6173 100644 --- a/data/maps/Route22_NorthEntrance/scripts.inc +++ b/data/maps/Route22_NorthEntrance/scripts.inc @@ -1,18 +1,18 @@ Route22_NorthEntrance_MapScripts:: @ 81704FB - .byte 0 + .byte 0 Route22_NorthEntrance_EventScript_1704FC:: @ 81704FC - lock - faceplayer - setvar VAR_0x4001, 1 - getstdstring 0, 15 - goto EventScript_1A7803 - end + lock + faceplayer + setvar VAR_0x4001, 1 + getstdstring 0, 15 + goto EventScript_1A7803 + end Route22_NorthEntrance_EventScript_17050D:: @ 817050D - lockall - setvar VAR_0x4001, 1 - setvar VAR_0x8009, 1 - getstdstring 0, 15 - goto EventScript_1A796E - end + lockall + setvar VAR_0x4001, 1 + setvar VAR_0x8009, 1 + getstdstring 0, 15 + goto EventScript_1A796E + end diff --git a/data/maps/Route23/scripts.inc b/data/maps/Route23/scripts.inc index 3154a6f0e..63e29da7e 100644 --- a/data/maps/Route23/scripts.inc +++ b/data/maps/Route23/scripts.inc @@ -1,129 +1,129 @@ Route23_MapScripts:: @ 81684EB - map_script 3, Route23_MapScript1_1684F1 - .byte 0 + map_script 3, Route23_MapScript1_1684F1 + .byte 0 Route23_MapScript1_1684F1:: @ 81684F1 - clearflag FLAG_0x059 - setflag FLAG_0x058 - setvar VAR_0x4064, 0 - setvar VAR_0x4065, 0 - setvar VAR_0x4066, 0 - setvar VAR_0x4067, 0 - end + clearflag FLAG_0x059 + setflag FLAG_0x058 + setvar VAR_0x4064, 0 + setvar VAR_0x4065, 0 + setvar VAR_0x4066, 0 + setvar VAR_0x4067, 0 + end Route23_EventScript_16850C:: @ 816850C - lock - faceplayer - setvar VAR_0x4001, 2 - getstdstring 0, 16 - goto EventScript_1A786C - end + lock + faceplayer + setvar VAR_0x4001, 2 + getstdstring 0, 16 + goto EventScript_1A786C + end Route23_EventScript_16851D:: @ 816851D - lock - faceplayer - setvar VAR_0x4001, 3 - getstdstring 0, 17 - goto EventScript_1A786C - end + lock + faceplayer + setvar VAR_0x4001, 3 + getstdstring 0, 17 + goto EventScript_1A786C + end Route23_EventScript_16852E:: @ 816852E - lock - faceplayer - setvar VAR_0x4001, 4 - getstdstring 0, 18 - goto EventScript_1A786C - end + lock + faceplayer + setvar VAR_0x4001, 4 + getstdstring 0, 18 + goto EventScript_1A786C + end Route23_EventScript_16853F:: @ 816853F - lock - faceplayer - setvar VAR_0x4001, 5 - getstdstring 0, 19 - goto EventScript_1A786C - end + lock + faceplayer + setvar VAR_0x4001, 5 + getstdstring 0, 19 + goto EventScript_1A786C + end Route23_EventScript_168550:: @ 8168550 - lock - faceplayer - setvar VAR_0x4001, 6 - getstdstring 0, 20 - goto EventScript_1A786C - end + lock + faceplayer + setvar VAR_0x4001, 6 + getstdstring 0, 20 + goto EventScript_1A786C + end Route23_EventScript_168561:: @ 8168561 - lock - faceplayer - setvar VAR_0x4001, 7 - getstdstring 0, 21 - goto EventScript_1A786C - end + lock + faceplayer + setvar VAR_0x4001, 7 + getstdstring 0, 21 + goto EventScript_1A786C + end Route23_EventScript_168572:: @ 8168572 - lock - faceplayer - setvar VAR_0x4001, 8 - getstdstring 0, 22 - goto EventScript_1A786C - end + lock + faceplayer + setvar VAR_0x4001, 8 + getstdstring 0, 22 + goto EventScript_1A786C + end Route23_EventScript_168583:: @ 8168583 - lockall - setvar VAR_0x4001, 2 - setvar VAR_0x8009, 1 - getstdstring 0, 16 - goto EventScript_1A796E - end + lockall + setvar VAR_0x4001, 2 + setvar VAR_0x8009, 1 + getstdstring 0, 16 + goto EventScript_1A796E + end Route23_EventScript_168598:: @ 8168598 - lockall - setvar VAR_0x4001, 3 - setvar VAR_0x8009, 2 - getstdstring 0, 17 - goto EventScript_1A796E - end + lockall + setvar VAR_0x4001, 3 + setvar VAR_0x8009, 2 + getstdstring 0, 17 + goto EventScript_1A796E + end Route23_EventScript_1685AD:: @ 81685AD - lockall - setvar VAR_0x4001, 4 - setvar VAR_0x8009, 3 - getstdstring 0, 18 - goto EventScript_1A796E - end + lockall + setvar VAR_0x4001, 4 + setvar VAR_0x8009, 3 + getstdstring 0, 18 + goto EventScript_1A796E + end Route23_EventScript_1685C2:: @ 81685C2 - lockall - setvar VAR_0x4001, 5 - setvar VAR_0x8009, 4 - getstdstring 0, 19 - goto EventScript_1A796E - end + lockall + setvar VAR_0x4001, 5 + setvar VAR_0x8009, 4 + getstdstring 0, 19 + goto EventScript_1A796E + end Route23_EventScript_1685D7:: @ 81685D7 - lockall - setvar VAR_0x4001, 6 - setvar VAR_0x8009, 5 - getstdstring 0, 20 - goto EventScript_1A796E - end + lockall + setvar VAR_0x4001, 6 + setvar VAR_0x8009, 5 + getstdstring 0, 20 + goto EventScript_1A796E + end Route23_EventScript_1685EC:: @ 81685EC - lockall - setvar VAR_0x4001, 7 - setvar VAR_0x8009, 6 - getstdstring 0, 21 - goto EventScript_1A796E - end + lockall + setvar VAR_0x4001, 7 + setvar VAR_0x8009, 6 + getstdstring 0, 21 + goto EventScript_1A796E + end Route23_EventScript_168601:: @ 8168601 - lockall - setvar VAR_0x4001, 8 - setvar VAR_0x8009, 7 - getstdstring 0, 22 - goto EventScript_1A796E - end + lockall + setvar VAR_0x4001, 8 + setvar VAR_0x8009, 7 + getstdstring 0, 22 + goto EventScript_1A796E + end Route23_EventScript_168616:: @ 8168616 - loadword 0, gUnknown_8188C19 - callstd 3 - end + loadword 0, gUnknown_8188C19 + callstd 3 + end diff --git a/data/maps/Route24/scripts.inc b/data/maps/Route24/scripts.inc index 811f194a2..f9025fde0 100644 --- a/data/maps/Route24/scripts.inc +++ b/data/maps/Route24/scripts.inc @@ -1,114 +1,114 @@ Route24_MapScripts:: @ 816861F - .byte 0 + .byte 0 Route24_EventScript_168620:: @ 8168620 - lock - faceplayer - compare_var_to_value VAR_0x406B, 1 - goto_if 1, EventScript_168656 - loadword 0, gUnknown_8188C3C - callstd 4 - checkitemspace ITEM_NUGGET, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16864C - call EventScript_1686B9 - release - end + lock + faceplayer + compare_var_to_value VAR_0x406B, 1 + goto_if 1, EventScript_168656 + loadword 0, gUnknown_8188C3C + callstd 4 + checkitemspace ITEM_NUGGET, 1 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16864C + call EventScript_1686B9 + release + end EventScript_16864C:: @ 816864C - loadword 0, gUnknown_8188CC2 - callstd 4 - release - end + loadword 0, gUnknown_8188CC2 + callstd 4 + release + end EventScript_168656:: @ 8168656 - loadword 0, gUnknown_8188DF1 - callstd 4 - release - end + loadword 0, gUnknown_8188DF1 + callstd 4 + release + end Route24_EventScript_168660:: @ 8168660 - lockall - setvar VAR_0x4001, 0 - goto EventScript_168678 - end + lockall + setvar VAR_0x4001, 0 + goto EventScript_168678 + end Route24_EventScript_16866C:: @ 816866C - lockall - setvar VAR_0x4001, 1 - goto EventScript_168678 - end + lockall + setvar VAR_0x4001, 1 + goto EventScript_168678 + end EventScript_168678:: @ 8168678 - textcolor 0 - compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_1686FD - compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_168708 - applymovement 255, Movement_1A75EB - waitmovement 0 - loadword 0, gUnknown_8188C3C - callstd 4 - checkitemspace ITEM_NUGGET, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_168713 - call EventScript_1686B9 - releaseall - end + textcolor 0 + compare_var_to_value VAR_0x4001, 0 + call_if 1, EventScript_1686FD + compare_var_to_value VAR_0x4001, 1 + call_if 1, EventScript_168708 + applymovement 255, Movement_1A75EB + waitmovement 0 + loadword 0, gUnknown_8188C3C + callstd 4 + checkitemspace ITEM_NUGGET, 1 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_168713 + call EventScript_1686B9 + releaseall + end EventScript_1686B9:: @ 81686B9 - additem ITEM_NUGGET, 1 - loadword 0, gUnknown_8188C93 - setorcopyvar VAR_0x8000, 110 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 257 - callstd 9 - message Text_188CDB - waitmessage - playbgm BGM_FRLG_SUSPICIOUS_EYE, 0 - waitbuttonpress - setvar VAR_LAST_TALKED, 1 - trainerbattle 3, 356, 0, Text_188DDC - loadword 0, gUnknown_8188DF1 - callstd 4 - setvar VAR_0x406B, 1 - return + additem ITEM_NUGGET, 1 + loadword 0, gUnknown_8188C93 + setorcopyvar VAR_0x8000, 110 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 257 + callstd 9 + message Text_188CDB + waitmessage + playbgm BGM_FRLG_SUSPICIOUS_EYE, 0 + waitbuttonpress + setvar VAR_LAST_TALKED, 1 + trainerbattle 3, 356, 0, Text_188DDC + loadword 0, gUnknown_8188DF1 + callstd 4 + setvar VAR_0x406B, 1 + return EventScript_1686FD:: @ 81686FD - applymovement 1, Movement_16873E - waitmovement 0 - return + applymovement 1, Movement_16873E + waitmovement 0 + return EventScript_168708:: @ 8168708 - applymovement 1, Movement_1A75E7 - waitmovement 0 - return + applymovement 1, Movement_1A75E7 + waitmovement 0 + return EventScript_168713:: @ 8168713 - loadword 0, gUnknown_8188CC2 - callstd 4 - closemessage - applymovement 255, Movement_168743 - waitmovement 0 - compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_168733 - release - end + loadword 0, gUnknown_8188CC2 + callstd 4 + closemessage + applymovement 255, Movement_168743 + waitmovement 0 + compare_var_to_value VAR_0x4001, 0 + call_if 1, EventScript_168733 + release + end EventScript_168733:: @ 8168733 - applymovement 1, Movement_168740 - waitmovement 0 - return + applymovement 1, Movement_168740 + waitmovement 0 + return Movement_16873E:: @ 816873E - step_12 - step_end + step_12 + step_end Movement_168740:: @ 8168740 - step_13 - step_2f - step_end + step_13 + step_2f + step_end Movement_168743:: @ 8168743 - step_10 - step_end + step_10 + step_end diff --git a/data/maps/Route25/scripts.inc b/data/maps/Route25/scripts.inc index 88bbc1efa..1b8dfc2a4 100644 --- a/data/maps/Route25/scripts.inc +++ b/data/maps/Route25/scripts.inc @@ -1,12 +1,12 @@ Route25_MapScripts:: @ 8168745 - .byte 0 + .byte 0 Route25_EventScript_168746:: @ 8168746 - loadword 0, gUnknown_818954C - callstd 3 - end + loadword 0, gUnknown_818954C + callstd 3 + end Route25_EventScript_16874F:: @ 816874F - loadword 0, gUnknown_81895C2 - callstd 2 - end + loadword 0, gUnknown_81895C2 + callstd 2 + end diff --git a/data/maps/Route25_SeaCottage/scripts.inc b/data/maps/Route25_SeaCottage/scripts.inc index c88ed3054..5b830385c 100644 --- a/data/maps/Route25_SeaCottage/scripts.inc +++ b/data/maps/Route25_SeaCottage/scripts.inc @@ -1,337 +1,337 @@ Route25_SeaCottage_MapScripts:: @ 8170523 - map_script 3, Route25_SeaCottage_MapScript1_170529 - .byte 0 + map_script 3, Route25_SeaCottage_MapScript1_170529 + .byte 0 Route25_SeaCottage_MapScript1_170529:: @ 8170529 - checkflag FLAG_0x233 - call_if 0, EventScript_17053C - checkflag FLAG_0x234 - call_if 1, EventScript_170547 - end + checkflag FLAG_0x233 + call_if 0, EventScript_17053C + checkflag FLAG_0x234 + call_if 1, EventScript_170547 + end EventScript_17053C:: @ 817053C - clearflag FLAG_0x032 - setobjectxyperm 1, 3, 3 - return + clearflag FLAG_0x032 + setobjectxyperm 1, 3, 3 + return EventScript_170547:: @ 8170547 - setflag FLAG_0x003 - return + setflag FLAG_0x003 + return Route25_SeaCottage_EventScript_17054B:: @ 817054B - lock - faceplayer - checkflag FLAG_0x003 - goto_if 1, EventScript_1706C8 - checkflag FLAG_0x234 - goto_if 1, EventScript_170640 - checkflag FLAG_0x233 - goto_if 1, EventScript_17064A - checkplayergender - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_170580 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_17058E - end + lock + faceplayer + checkflag FLAG_0x003 + goto_if 1, EventScript_1706C8 + checkflag FLAG_0x234 + goto_if 1, EventScript_170640 + checkflag FLAG_0x233 + goto_if 1, EventScript_17064A + checkplayergender + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_170580 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_17058E + end EventScript_170580:: @ 8170580 - loadword 0, gUnknown_819FDFA - callstd 5 - goto EventScript_17059C - end + loadword 0, gUnknown_819FDFA + callstd 5 + goto EventScript_17059C + end EventScript_17058E:: @ 817058E - loadword 0, gUnknown_819FEE6 - callstd 5 - goto EventScript_17059C - end + loadword 0, gUnknown_819FEE6 + callstd 5 + goto EventScript_17059C + end EventScript_17059C:: @ 817059C - compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_170600 - loadword 0, gUnknown_819FFD3 - callstd 4 - closemessage - delay 10 - compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_17062A - compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_170635 - compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_170635 - compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_170635 - opendoor 10, 3 - waitdooranim - applymovement 2, Movement_1706DB - waitmovement 0 - removeobject 2 - playse SE_EXPMAX - closedoor 10, 3 - waitdooranim - setflag FLAG_0x002 - release - end + compare_var_to_value VAR_RESULT, 0 + call_if 1, EventScript_170600 + loadword 0, gUnknown_819FFD3 + callstd 4 + closemessage + delay 10 + compare_var_to_value VAR_FACING, 1 + call_if 1, EventScript_17062A + compare_var_to_value VAR_FACING, 2 + call_if 1, EventScript_170635 + compare_var_to_value VAR_FACING, 3 + call_if 1, EventScript_170635 + compare_var_to_value VAR_FACING, 4 + call_if 1, EventScript_170635 + opendoor 10, 3 + waitdooranim + applymovement 2, Movement_1706DB + waitmovement 0 + removeobject 2 + playse SE_EXPMAX + closedoor 10, 3 + waitdooranim + setflag FLAG_0x002 + release + end EventScript_170600:: @ 8170600 - checkplayergender - compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_170618 - compare_var_to_value VAR_RESULT, 1 - call_if 1, EventScript_170621 - return + checkplayergender + compare_var_to_value VAR_RESULT, 0 + call_if 1, EventScript_170618 + compare_var_to_value VAR_RESULT, 1 + call_if 1, EventScript_170621 + return EventScript_170618:: @ 8170618 - loadword 0, gUnknown_81A0035 - callstd 4 - return + loadword 0, gUnknown_81A0035 + callstd 4 + return EventScript_170621:: @ 8170621 - loadword 0, gUnknown_81A00B6 - callstd 4 - return + loadword 0, gUnknown_81A00B6 + callstd 4 + return EventScript_17062A:: @ 817062A - applymovement 2, Movement_1706D5 - waitmovement 0 - return + applymovement 2, Movement_1706D5 + waitmovement 0 + return EventScript_170635:: @ 8170635 - applymovement 2, Movement_1706D2 - waitmovement 0 - return + applymovement 2, Movement_1706D2 + waitmovement 0 + return EventScript_170640:: @ 8170640 - loadword 0, gUnknown_81A02CF - callstd 4 - release - end + loadword 0, gUnknown_81A02CF + callstd 4 + release + end EventScript_17064A:: @ 817064A - setvar VAR_0x8004, 13 - setvar VAR_0x8005, 2 - special UpdatePickStateFromSpecialVar8005 - checkplayergender - compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_1706AC - compare_var_to_value VAR_RESULT, 1 - call_if 1, EventScript_1706B5 - checkitemspace ITEM_SS_TICKET, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1706BE - additem ITEM_SS_TICKET, 1 - loadword 0, gUnknown_81A028E - setorcopyvar VAR_0x8000, 265 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 318 - callstd 9 - setflag FLAG_0x235 - setflag FLAG_0x031 - setflag FLAG_0x234 - setflag 2100 - goto EventScript_170640 - end + setvar VAR_0x8004, 13 + setvar VAR_0x8005, 2 + special UpdatePickStateFromSpecialVar8005 + checkplayergender + compare_var_to_value VAR_RESULT, 0 + call_if 1, EventScript_1706AC + compare_var_to_value VAR_RESULT, 1 + call_if 1, EventScript_1706B5 + checkitemspace ITEM_SS_TICKET, 1 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_1706BE + additem ITEM_SS_TICKET, 1 + loadword 0, gUnknown_81A028E + setorcopyvar VAR_0x8000, 265 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 318 + callstd 9 + setflag FLAG_0x235 + setflag FLAG_0x031 + setflag FLAG_0x234 + setflag 2100 + goto EventScript_170640 + end EventScript_1706AC:: @ 81706AC - loadword 0, gUnknown_81A013B - callstd 4 - return + loadword 0, gUnknown_81A013B + callstd 4 + return EventScript_1706B5:: @ 81706B5 - loadword 0, gUnknown_81A01E4 - callstd 4 - return + loadword 0, gUnknown_81A01E4 + callstd 4 + return EventScript_1706BE:: @ 81706BE - loadword 0, gUnknown_81A02B4 - callstd 4 - release - end + loadword 0, gUnknown_81A02B4 + callstd 4 + release + end EventScript_1706C8:: @ 81706C8 - loadword 0, gUnknown_81A03AB - callstd 4 - release - end + loadword 0, gUnknown_81A03AB + callstd 4 + release + end Movement_1706D2:: @ 81706D2 - step_11 - step_11 - step_end + step_11 + step_11 + step_end Movement_1706D5:: @ 81706D5 - step_13 - step_11 - step_11 - step_12 - step_2e - step_end + step_13 + step_11 + step_11 + step_12 + step_2e + step_end Movement_1706DB:: @ 81706DB - step_11 - step_end + step_11 + step_end Route25_SeaCottage_EventScript_1706DD:: @ 81706DD - lockall - checkflag FLAG_0x003 - goto_if 1, EventScript_1707CA - checkflag FLAG_0x002 - goto_if 1, EventScript_1706FA - loadword 0, gUnknown_81A0402 - callstd 4 - releaseall - end + lockall + checkflag FLAG_0x003 + goto_if 1, EventScript_1707CA + checkflag FLAG_0x002 + goto_if 1, EventScript_1706FA + loadword 0, gUnknown_81A0402 + callstd 4 + releaseall + end EventScript_1706FA:: @ 81706FA - fadeoutbgm 0 - loadword 0, gUnknown_81A042D - callstd 4 - closemessage - clearflag FLAG_0x002 - setflag FLAG_0x233 - special SpawnScriptFieldObject - applymovement 127, Movement_1707BE - waitmovement 0 - delay 35 - playse SE_PIN - waitse - setvar VAR_0x8004, 0 - special sub_809C4A8 - delay 10 - call EventScript_1707B6 - call EventScript_1707B6 - call EventScript_1707B6 - call EventScript_1707B6 - call EventScript_1707B6 - call EventScript_1707B6 - call EventScript_1707B6 - setvar VAR_0x8004, 1 - special sub_809C4A8 - playse SE_FU_ZUZUZU - special sub_809C5FC - waitse - call EventScript_1707B6 - call EventScript_1707B6 - call EventScript_1707B6 - call EventScript_1707B6 - call EventScript_1707B6 - opendoor 3, 3 - waitdooranim - fadeinbgm 0 - addobject 1 - clearflag FLAG_0x033 - delay 50 - playfanfare MUS_FANFA1 - applymovement 1, Movement_170888 - waitmovement 0 - waitfanfare - applymovement 127, Movement_1707C3 - waitmovement 0 - playse SE_EXPMAX - closedoor 3, 3 - waitdooranim - applymovement 1, Movement_170881 - waitmovement 0 - special RemoveScriptFieldObject - releaseall - end + fadeoutbgm 0 + loadword 0, gUnknown_81A042D + callstd 4 + closemessage + clearflag FLAG_0x002 + setflag FLAG_0x233 + special SpawnScriptFieldObject + applymovement 127, Movement_1707BE + waitmovement 0 + delay 35 + playse SE_PIN + waitse + setvar VAR_0x8004, 0 + special sub_809C4A8 + delay 10 + call EventScript_1707B6 + call EventScript_1707B6 + call EventScript_1707B6 + call EventScript_1707B6 + call EventScript_1707B6 + call EventScript_1707B6 + call EventScript_1707B6 + setvar VAR_0x8004, 1 + special sub_809C4A8 + playse SE_FU_ZUZUZU + special sub_809C5FC + waitse + call EventScript_1707B6 + call EventScript_1707B6 + call EventScript_1707B6 + call EventScript_1707B6 + call EventScript_1707B6 + opendoor 3, 3 + waitdooranim + fadeinbgm 0 + addobject 1 + clearflag FLAG_0x033 + delay 50 + playfanfare MUS_FANFA1 + applymovement 1, Movement_170888 + waitmovement 0 + waitfanfare + applymovement 127, Movement_1707C3 + waitmovement 0 + playse SE_EXPMAX + closedoor 3, 3 + waitdooranim + applymovement 1, Movement_170881 + waitmovement 0 + special RemoveScriptFieldObject + releaseall + end EventScript_1707B6:: @ 81707B6 - playse SE_BOWA - waitse - delay 20 - return + playse SE_BOWA + waitse + delay 20 + return Movement_1707BE:: @ 81707BE - step_11 - step_11 - step_13 - step_13 - step_end + step_11 + step_11 + step_13 + step_13 + step_end Movement_1707C3:: @ 81707C3 - step_1c - step_1c - step_10 - step_10 - step_12 - step_12 - step_end + step_1c + step_1c + step_10 + step_10 + step_12 + step_12 + step_end EventScript_1707CA:: @ 81707CA - loadword 0, gUnknown_81A045B - callstd 4 - goto EventScript_1707D8 - end + loadword 0, gUnknown_81A045B + callstd 4 + goto EventScript_1707D8 + end EventScript_1707D8:: @ 81707D8 - message Text_1A0479 - waitmessage - multichoice 0, 0, 1, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_17082B - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_170840 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_170855 - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_17086A - compare_var_to_value VAR_0x8000, 4 - goto_if 1, EventScript_17087F - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_17087F - end + message Text_1A0479 + waitmessage + multichoice 0, 0, 1, 0 + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_17082B + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_170840 + compare_var_to_value VAR_0x8000, 2 + goto_if 1, EventScript_170855 + compare_var_to_value VAR_0x8000, 3 + goto_if 1, EventScript_17086A + compare_var_to_value VAR_0x8000, 4 + goto_if 1, EventScript_17087F + compare_var_to_value VAR_0x8000, 127 + goto_if 1, EventScript_17087F + end EventScript_17082B:: @ 817082B - drawmonpic SPECIES_EEVEE, 10, 3 - waitbuttonpress - erasemonpic - setvar VAR_0x8004, 133 - special sub_80CBDCC - goto EventScript_1707D8 - end + drawmonpic SPECIES_EEVEE, 10, 3 + waitbuttonpress + erasemonpic + setvar VAR_0x8004, 133 + special sub_80CBDCC + goto EventScript_1707D8 + end EventScript_170840:: @ 8170840 - drawmonpic SPECIES_FLAREON, 10, 3 - waitbuttonpress - erasemonpic - setvar VAR_0x8004, 136 - special sub_80CBDCC - goto EventScript_1707D8 - end + drawmonpic SPECIES_FLAREON, 10, 3 + waitbuttonpress + erasemonpic + setvar VAR_0x8004, 136 + special sub_80CBDCC + goto EventScript_1707D8 + end EventScript_170855:: @ 8170855 - drawmonpic SPECIES_JOLTEON, 10, 3 - waitbuttonpress - erasemonpic - setvar VAR_0x8004, 135 - special sub_80CBDCC - goto EventScript_1707D8 - end + drawmonpic SPECIES_JOLTEON, 10, 3 + waitbuttonpress + erasemonpic + setvar VAR_0x8004, 135 + special sub_80CBDCC + goto EventScript_1707D8 + end EventScript_17086A:: @ 817086A - drawmonpic SPECIES_VAPOREON, 10, 3 - waitbuttonpress - erasemonpic - setvar VAR_0x8004, 134 - special sub_80CBDCC - goto EventScript_1707D8 - end + drawmonpic SPECIES_VAPOREON, 10, 3 + waitbuttonpress + erasemonpic + setvar VAR_0x8004, 134 + special sub_80CBDCC + goto EventScript_1707D8 + end EventScript_17087F:: @ 817087F - releaseall - end + releaseall + end Movement_170881:: @ 8170881 - step_13 - step_13 - step_13 - step_13 - step_10 - step_10 - step_end + step_13 + step_13 + step_13 + step_13 + step_10 + step_10 + step_end Movement_170888:: @ 8170888 - step_10 - step_end + step_10 + step_end diff --git a/data/maps/Route2_EastBuilding/scripts.inc b/data/maps/Route2_EastBuilding/scripts.inc index ac1fcb6bb..c11cc3309 100644 --- a/data/maps/Route2_EastBuilding/scripts.inc +++ b/data/maps/Route2_EastBuilding/scripts.inc @@ -1,51 +1,51 @@ Route2_EastBuilding_MapScripts:: @ 816F67E - .byte 0 + .byte 0 Route2_EastBuilding_EventScript_16F67F:: @ 816F67F - lock - faceplayer - call EventScript_16F70B - checkflag FLAG_0x23B - goto_if 1, EventScript_16F701 - loadword 0, gUnknown_819D64F - callstd 5 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1A7AD1 - setvar VAR_0x8004, 0 - specialvar VAR_RESULT, sub_80CA3D8 - getnumberstring 2, VAR_0x8006 - call EventScript_16F70B - compare_var_to_value VAR_0x8006, 10 - goto_if 0, EventScript_1A7ABD - loadword 0, gUnknown_819D74E - callstd 4 - checkitemspace ITEM_HM05, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1A7AC7 - additem ITEM_HM05, 1 - loadword 0, gUnknown_819D7A1 - setorcopyvar VAR_0x8000, 343 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 257 - callstd 9 - setflag FLAG_0x23B - loadword 0, gUnknown_819D7C1 - callstd 4 - release - end + lock + faceplayer + call EventScript_16F70B + checkflag FLAG_0x23B + goto_if 1, EventScript_16F701 + loadword 0, gUnknown_819D64F + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_1A7AD1 + setvar VAR_0x8004, 0 + specialvar VAR_RESULT, sub_80CA3D8 + getnumberstring 2, VAR_0x8006 + call EventScript_16F70B + compare_var_to_value VAR_0x8006, 10 + goto_if 0, EventScript_1A7ABD + loadword 0, gUnknown_819D74E + callstd 4 + checkitemspace ITEM_HM05, 1 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_1A7AC7 + additem ITEM_HM05, 1 + loadword 0, gUnknown_819D7A1 + setorcopyvar VAR_0x8000, 343 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 257 + callstd 9 + setflag FLAG_0x23B + loadword 0, gUnknown_819D7C1 + callstd 4 + release + end EventScript_16F701:: @ 816F701 - loadword 0, gUnknown_819D7C1 - callstd 4 - release - end + loadword 0, gUnknown_819D7C1 + callstd 4 + release + end EventScript_16F70B:: @ 816F70B - getnumberstring 0, 10 - getitemname 1, ITEM_HM05 - return + getnumberstring 0, 10 + getitemname 1, ITEM_HM05 + return Route2_EastBuilding_EventScript_16F714:: @ 816F714 - loadword 0, gUnknown_819D81E - callstd 2 - end + loadword 0, gUnknown_819D81E + callstd 2 + end diff --git a/data/maps/Route2_House/scripts.inc b/data/maps/Route2_House/scripts.inc index 8f7305c29..a68521270 100644 --- a/data/maps/Route2_House/scripts.inc +++ b/data/maps/Route2_House/scripts.inc @@ -1,50 +1,50 @@ Route2_House_MapScripts:: @ 816F5F8 - .byte 0 + .byte 0 Route2_House_EventScript_16F5F9:: @ 816F5F9 - loadword 0, gUnknown_819D5E7 - callstd 2 - end + loadword 0, gUnknown_819D5E7 + callstd 2 + end Route2_House_EventScript_16F602:: @ 816F602 - lock - faceplayer - setvar VAR_0x8008, 0 - call EventScript_1A8CAD - checkflag FLAG_0x248 - goto_if 1, EventScript_16F674 - loadword 0, gUnknown_81A597B - callstd 5 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16F65C - call EventScript_1A8CBD - compare_var_to_value VAR_0x8004, 6 - goto_if 4, EventScript_16F65C - call EventScript_1A8CC9 - compare_var_to_var VAR_RESULT, VAR_0x8009 - goto_if 5, EventScript_16F666 - call EventScript_1A8CD9 - loadword 0, gUnknown_81A59DA - callstd 4 - setflag FLAG_0x248 - release - end + lock + faceplayer + setvar VAR_0x8008, 0 + call EventScript_1A8CAD + checkflag FLAG_0x248 + goto_if 1, EventScript_16F674 + loadword 0, gUnknown_81A597B + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16F65C + call EventScript_1A8CBD + compare_var_to_value VAR_0x8004, 6 + goto_if 4, EventScript_16F65C + call EventScript_1A8CC9 + compare_var_to_var VAR_RESULT, VAR_0x8009 + goto_if 5, EventScript_16F666 + call EventScript_1A8CD9 + loadword 0, gUnknown_81A59DA + callstd 4 + setflag FLAG_0x248 + release + end EventScript_16F65C:: @ 816F65C - loadword 0, gUnknown_81A59B6 - callstd 4 - release - end + loadword 0, gUnknown_81A59B6 + callstd 4 + release + end EventScript_16F666:: @ 816F666 - getspeciesname 0, 32777 - loadword 0, gUnknown_81A59C6 - callstd 4 - release - end + getspeciesname 0, 32777 + loadword 0, gUnknown_81A59C6 + callstd 4 + release + end EventScript_16F674:: @ 816F674 - loadword 0, gUnknown_81A59E7 - callstd 4 - release - end + loadword 0, gUnknown_81A59E7 + callstd 4 + release + end diff --git a/data/maps/Route2_ViridianForest_NorthEntrance/scripts.inc b/data/maps/Route2_ViridianForest_NorthEntrance/scripts.inc index d84ef1b6e..d1696f7d0 100644 --- a/data/maps/Route2_ViridianForest_NorthEntrance/scripts.inc +++ b/data/maps/Route2_ViridianForest_NorthEntrance/scripts.inc @@ -1,17 +1,17 @@ Route2_ViridianForest_NorthEntrance_MapScripts:: @ 816F71D - .byte 0 + .byte 0 Route2_ViridianForest_NorthEntrance_EventScript_16F71E:: @ 816F71E - loadword 0, gUnknown_819D85C - callstd 2 - end + loadword 0, gUnknown_819D85C + callstd 2 + end Route2_ViridianForest_NorthEntrance_EventScript_16F727:: @ 816F727 - loadword 0, gUnknown_819D8D0 - callstd 2 - end + loadword 0, gUnknown_819D8D0 + callstd 2 + end Route2_ViridianForest_NorthEntrance_EventScript_16F730:: @ 816F730 - loadword 0, gUnknown_819D93B - callstd 2 - end + loadword 0, gUnknown_819D93B + callstd 2 + end diff --git a/data/maps/Route2_ViridianForest_SouthEntrance/scripts.inc b/data/maps/Route2_ViridianForest_SouthEntrance/scripts.inc index f81d39f8c..6406f21d0 100644 --- a/data/maps/Route2_ViridianForest_SouthEntrance/scripts.inc +++ b/data/maps/Route2_ViridianForest_SouthEntrance/scripts.inc @@ -1,12 +1,12 @@ Route2_ViridianForest_SouthEntrance_MapScripts:: @ 816F5E5 - .byte 0 + .byte 0 Route2_ViridianForest_SouthEntrance_EventScript_16F5E6:: @ 816F5E6 - loadword 0, gUnknown_819D52C - callstd 2 - end + loadword 0, gUnknown_819D52C + callstd 2 + end Route2_ViridianForest_SouthEntrance_EventScript_16F5EF:: @ 816F5EF - loadword 0, gUnknown_819D58B - callstd 2 - end + loadword 0, gUnknown_819D58B + callstd 2 + end diff --git a/data/maps/Route3/scripts.inc b/data/maps/Route3/scripts.inc index c74a4401a..748f6060f 100644 --- a/data/maps/Route3/scripts.inc +++ b/data/maps/Route3/scripts.inc @@ -1,12 +1,12 @@ Route3_MapScripts:: @ 8167F77 - .byte 0 + .byte 0 Route3_EventScript_167F78:: @ 8167F78 - loadword 0, gUnknown_8183491 - callstd 2 - end + loadword 0, gUnknown_8183491 + callstd 2 + end Route3_EventScript_167F81:: @ 8167F81 - loadword 0, gUnknown_81838C0 - callstd 3 - end + loadword 0, gUnknown_81838C0 + callstd 3 + end diff --git a/data/maps/Route4/scripts.inc b/data/maps/Route4/scripts.inc index 51f60f02f..054f686bd 100644 --- a/data/maps/Route4/scripts.inc +++ b/data/maps/Route4/scripts.inc @@ -1,20 +1,20 @@ Route4_MapScripts:: @ 8167F8A - .byte 0 + .byte 0 Route4_EventScript_167F8B:: @ 8167F8B - end + end Route4_EventScript_167F8C:: @ 8167F8C - loadword 0, gUnknown_81838D7 - callstd 2 - end + loadword 0, gUnknown_81838D7 + callstd 2 + end Route4_EventScript_167F95:: @ 8167F95 - loadword 0, gUnknown_818399B - callstd 3 - end + loadword 0, gUnknown_818399B + callstd 3 + end Route4_EventScript_167F9E:: @ 8167F9E - loadword 0, gUnknown_81839B4 - callstd 3 - end + loadword 0, gUnknown_81839B4 + callstd 3 + end diff --git a/data/maps/Route4_PokemonCenter_1F/scripts.inc b/data/maps/Route4_PokemonCenter_1F/scripts.inc index e488082c2..e943780de 100644 --- a/data/maps/Route4_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route4_PokemonCenter_1F/scripts.inc @@ -1,181 +1,181 @@ Route4_PokemonCenter_1F_MapScripts:: @ 816F739 - map_script 3, Route4_PokemonCenter_1F_MapScript1_16F744 - map_script 5, Route4_PokemonCenter_1F_MapScript2_1BC05C - .byte 0 + map_script 3, Route4_PokemonCenter_1F_MapScript1_16F744 + map_script 5, Route4_PokemonCenter_1F_MapScript2_1BC05C + .byte 0 Route4_PokemonCenter_1F_MapScript1_16F744:: @ 816F744 - setworldmapflag 2210 - setrespawn 12 - end + setworldmapflag 2210 + setrespawn 12 + end Route4_PokemonCenter_1F_EventScript_16F74B:: @ 816F74B - loadword 0, gUnknown_819D9D4 - callstd 2 - end + loadword 0, gUnknown_819D9D4 + callstd 2 + end Route4_PokemonCenter_1F_EventScript_16F754:: @ 816F754 - lock - loadword 0, gUnknown_819DA3A - callstd 4 - release - end + lock + loadword 0, gUnknown_819DA3A + callstd 4 + release + end Route4_PokemonCenter_1F_EventScript_16F75F:: @ 816F75F - lock - faceplayer - checkflag FLAG_0x249 - goto_if 1, EventScript_16F8A2 - showmoneybox 0, 0, 0 - checkplayergender - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16F786 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16F794 - end + lock + faceplayer + checkflag FLAG_0x249 + goto_if 1, EventScript_16F8A2 + showmoneybox 0, 0, 0 + checkplayergender + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16F786 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16F794 + end EventScript_16F786:: @ 816F786 - loadword 0, gUnknown_819DA9A - callstd 5 - goto EventScript_16F7A2 - end + loadword 0, gUnknown_819DA9A + callstd 5 + goto EventScript_16F7A2 + end EventScript_16F794:: @ 816F794 - loadword 0, gUnknown_819DB34 - callstd 5 - goto EventScript_16F7A2 - end + loadword 0, gUnknown_819DB34 + callstd 5 + goto EventScript_16F7A2 + end EventScript_16F7A2:: @ 816F7A2 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16F888 - checkmoney 500, 0 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16F895 - textcolor 3 - setvar VAR_0x4001, 129 - givemon SPECIES_MAGIKARP, 5, ITEM_NONE, 0, 0, 0 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16F7F6 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16F822 - compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_16F8AC - end + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16F888 + checkmoney 500, 0 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16F895 + textcolor 3 + setvar VAR_0x4001, 129 + givemon SPECIES_MAGIKARP, 5, ITEM_NONE, 0, 0, 0 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16F7F6 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16F822 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_16F8AC + end EventScript_16F7F6:: @ 816F7F6 - call EventScript_16F86F - loadword 0, gUnknown_81A56A7 - callstd 5 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16F861 - call EventScript_1A8C27 - fadescreen 1 - hidemoneybox - .byte 0 - .byte 0 - special ChangePokemonNickname - waitstate - goto EventScript_16F86A - end + call EventScript_16F86F + loadword 0, gUnknown_81A56A7 + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16F861 + call EventScript_1A8C27 + fadescreen 1 + hidemoneybox + .byte 0 + .byte 0 + special ChangePokemonNickname + waitstate + goto EventScript_16F86A + end EventScript_16F822:: @ 816F822 - call EventScript_16F86F - loadword 0, gUnknown_81A56A7 - callstd 5 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16F84B - fadescreen 1 - hidemoneybox - .byte 0 - .byte 0 - special ChangeBoxPokemonNickname - waitstate - lock - faceplayer - goto EventScript_16F856 - end + call EventScript_16F86F + loadword 0, gUnknown_81A56A7 + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16F84B + fadescreen 1 + hidemoneybox + .byte 0 + .byte 0 + special ChangeBoxPokemonNickname + waitstate + lock + faceplayer + goto EventScript_16F856 + end EventScript_16F84B:: @ 816F84B - call EventScript_1A8C3C - goto EventScript_16F861 - end + call EventScript_1A8C3C + goto EventScript_16F861 + end EventScript_16F856:: @ 816F856 - call EventScript_1A8C3C - goto EventScript_16F86A - end + call EventScript_1A8C3C + goto EventScript_16F86A + end EventScript_16F861:: @ 816F861 - hidemoneybox - .byte 0 - .byte 0 - goto EventScript_16F86A - end + hidemoneybox + .byte 0 + .byte 0 + goto EventScript_16F86A + end EventScript_16F86A:: @ 816F86A - setflag FLAG_0x249 - release - end + setflag FLAG_0x249 + release + end EventScript_16F86F:: @ 816F86F - takemoney 500, 0 - updatemoneybox 0, 0, 0 - playfanfare MUS_FANFA1 - message Text_19DBD3 - waitmessage - waitfanfare - getspeciesname 0, SPECIES_MAGIKARP - return + takemoney 500, 0 + updatemoneybox 0, 0, 0 + playfanfare MUS_FANFA1 + message Text_19DBD3 + waitmessage + waitfanfare + getspeciesname 0, SPECIES_MAGIKARP + return EventScript_16F888:: @ 816F888 - loadword 0, gUnknown_819DC07 - callstd 4 - hidemoneybox - .byte 0 - .byte 0 - release - end + loadword 0, gUnknown_819DC07 + callstd 4 + hidemoneybox + .byte 0 + .byte 0 + release + end EventScript_16F895:: @ 816F895 - loadword 0, gUnknown_819DC78 - callstd 4 - hidemoneybox - .byte 0 - .byte 0 - release - end + loadword 0, gUnknown_819DC78 + callstd 4 + hidemoneybox + .byte 0 + .byte 0 + release + end EventScript_16F8A2:: @ 816F8A2 - loadword 0, gUnknown_819DC9A - callstd 4 - release - end + loadword 0, gUnknown_819DC9A + callstd 4 + release + end EventScript_16F8AC:: @ 816F8AC - textcolor 0 - loadword 0, gUnknown_819DC3E - callstd 4 - hidemoneybox - .byte 0 - .byte 0 - release - end + textcolor 0 + loadword 0, gUnknown_819DC3E + callstd 4 + hidemoneybox + .byte 0 + .byte 0 + release + end Route4_PokemonCenter_1F_EventScript_16F8BB:: @ 816F8BB - lock - faceplayer - call EventScript_1A6578 - release - end + lock + faceplayer + call EventScript_1A6578 + release + end Route4_PokemonCenter_1F_EventScript_16F8C4:: @ 816F8C4 - loadword 0, gUnknown_819DCDB - callstd 2 - end + loadword 0, gUnknown_819DCDB + callstd 2 + end Route4_PokemonCenter_1F_EventScript_16F8CD:: @ 816F8CD - lock - loadword 0, gUnknown_819DD54 - callstd 4 - release - end + lock + loadword 0, gUnknown_819DD54 + callstd 4 + release + end diff --git a/data/maps/Route4_PokemonCenter_2F/scripts.inc b/data/maps/Route4_PokemonCenter_2F/scripts.inc index 172b29972..bff6832da 100644 --- a/data/maps/Route4_PokemonCenter_2F/scripts.inc +++ b/data/maps/Route4_PokemonCenter_2F/scripts.inc @@ -1,18 +1,18 @@ Route4_PokemonCenter_2F_MapScripts:: @ 816F8D8 - map_script 2, Route4_PokemonCenter_2F_MapScript1_1BB2A3 - map_script 4, Route4_PokemonCenter_2F_MapScript2_1BB1ED - map_script 1, Route4_PokemonCenter_2F_MapScript3_1BB237 - map_script 3, Route4_PokemonCenter_2F_MapScript4_1BB1B4 - .byte 0 + map_script 2, Route4_PokemonCenter_2F_MapScript1_1BB2A3 + map_script 4, Route4_PokemonCenter_2F_MapScript2_1BB1ED + map_script 1, Route4_PokemonCenter_2F_MapScript3_1BB237 + map_script 3, Route4_PokemonCenter_2F_MapScript4_1BB1B4 + .byte 0 Route4_PokemonCenter_2F_EventScript_16F8ED:: @ 816F8ED - call EventScript_1BB4A3 - end + call EventScript_1BB4A3 + end EventScript_16F8F3:: @ 816F8F3 - call EventScript_1BB6AB - end + call EventScript_1BB6AB + end EventScript_16F8F9:: @ 816F8F9 - call EventScript_1BB7DE - end + call EventScript_1BB7DE + end diff --git a/data/maps/Route5/scripts.inc b/data/maps/Route5/scripts.inc index a5fde8a87..572bd6248 100644 --- a/data/maps/Route5/scripts.inc +++ b/data/maps/Route5/scripts.inc @@ -1,7 +1,7 @@ Route5_MapScripts:: @ 8167FA7 - .byte 0 + .byte 0 Route5_EventScript_167FA8:: @ 8167FA8 - loadword 0, gUnknown_8183DD4 - callstd 3 - end + loadword 0, gUnknown_8183DD4 + callstd 3 + end diff --git a/data/maps/Route5_PokemonDayCare/scripts.inc b/data/maps/Route5_PokemonDayCare/scripts.inc index 3946ef43b..ebe6a8386 100644 --- a/data/maps/Route5_PokemonDayCare/scripts.inc +++ b/data/maps/Route5_PokemonDayCare/scripts.inc @@ -1,2 +1,2 @@ Route5_PokemonDayCare_MapScripts:: @ 816F8FF - .byte 0 + .byte 0 diff --git a/data/maps/Route5_SouthEntrance/scripts.inc b/data/maps/Route5_SouthEntrance/scripts.inc index 9e4b41a51..7214c0f52 100644 --- a/data/maps/Route5_SouthEntrance/scripts.inc +++ b/data/maps/Route5_SouthEntrance/scripts.inc @@ -1,92 +1,92 @@ Route5_SouthEntrance_MapScripts:: @ 816F900 - .byte 0 + .byte 0 Route5_SouthEntrance_EventScript_16F901:: @ 816F901 - loadword 0, gUnknown_819E16D - callstd 2 - end + loadword 0, gUnknown_819E16D + callstd 2 + end Route5_SouthEntrance_EventScript_16F90A:: @ 816F90A - lockall - setvar VAR_0x4001, 0 - goto EventScript_16F92E - end + lockall + setvar VAR_0x4001, 0 + goto EventScript_16F92E + end Route5_SouthEntrance_EventScript_16F916:: @ 816F916 - lockall - setvar VAR_0x4001, 1 - goto EventScript_16F92E - end + lockall + setvar VAR_0x4001, 1 + goto EventScript_16F92E + end Route5_SouthEntrance_EventScript_16F922:: @ 816F922 - lockall - setvar VAR_0x4001, 2 - goto EventScript_16F92E - end + lockall + setvar VAR_0x4001, 2 + goto EventScript_16F92E + end EventScript_16F92E:: @ 816F92E - textcolor 0 - applymovement 255, Movement_1A75E7 - waitmovement 0 - checkflag FLAG_0x2A6 - goto_if 1, EventScript_16F958 - loadword 0, gUnknown_819E04B - callstd 4 - closemessage - applymovement 255, Movement_16F9C4 - waitmovement 0 - releaseall - end + textcolor 0 + applymovement 255, Movement_1A75E7 + waitmovement 0 + checkflag FLAG_0x2A6 + goto_if 1, EventScript_16F958 + loadword 0, gUnknown_819E04B + callstd 4 + closemessage + applymovement 255, Movement_16F9C4 + waitmovement 0 + releaseall + end EventScript_16F958:: @ 816F958 - removeitem ITEM_TEA, 1 - goto EventScript_16F963 - end + removeitem ITEM_TEA, 1 + goto EventScript_16F963 + end EventScript_16F963:: @ 816F963 - loadword 0, gUnknown_819E09B - callstd 4 - closemessage - compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_16F99C - compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_16F9A7 - compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_16F9B2 - loadword 0, gUnknown_819E0C1 - callstd 4 - setvar VAR_0x4062, 1 - releaseall - end + loadword 0, gUnknown_819E09B + callstd 4 + closemessage + compare_var_to_value VAR_0x4001, 0 + call_if 1, EventScript_16F99C + compare_var_to_value VAR_0x4001, 1 + call_if 1, EventScript_16F9A7 + compare_var_to_value VAR_0x4001, 2 + call_if 1, EventScript_16F9B2 + loadword 0, gUnknown_819E0C1 + callstd 4 + setvar VAR_0x4062, 1 + releaseall + end EventScript_16F99C:: @ 816F99C - applymovement 255, Movement_16F9C2 - waitmovement 0 - return + applymovement 255, Movement_16F9C2 + waitmovement 0 + return EventScript_16F9A7:: @ 816F9A7 - applymovement 255, Movement_16F9BD - waitmovement 0 - return + applymovement 255, Movement_16F9BD + waitmovement 0 + return EventScript_16F9B2:: @ 816F9B2 - applymovement 255, Movement_16F9BF - waitmovement 0 - return + applymovement 255, Movement_16F9BF + waitmovement 0 + return Movement_16F9BD:: @ 816F9BD - step_12 - step_end + step_12 + step_end Movement_16F9BF:: @ 816F9BF - step_12 - step_12 - step_end + step_12 + step_12 + step_end Movement_16F9C2:: @ 816F9C2 - step_27 - step_end + step_27 + step_end Movement_16F9C4:: @ 816F9C4 - step_11 - step_end + step_11 + step_end diff --git a/data/maps/Route6/scripts.inc b/data/maps/Route6/scripts.inc index 8cbe2db5a..1a88669a4 100644 --- a/data/maps/Route6/scripts.inc +++ b/data/maps/Route6/scripts.inc @@ -1,7 +1,7 @@ Route6_MapScripts:: @ 8167FB1 - .byte 0 + .byte 0 Route6_EventScript_167FB2:: @ 8167FB2 - loadword 0, gUnknown_8184067 - callstd 3 - end + loadword 0, gUnknown_8184067 + callstd 3 + end diff --git a/data/maps/Route6_NorthEntrance/scripts.inc b/data/maps/Route6_NorthEntrance/scripts.inc index 836396d94..109d259ad 100644 --- a/data/maps/Route6_NorthEntrance/scripts.inc +++ b/data/maps/Route6_NorthEntrance/scripts.inc @@ -1,92 +1,92 @@ Route6_NorthEntrance_MapScripts:: @ 816F9C6 - .byte 0 + .byte 0 Route6_NorthEntrance_EventScript_16F9C7:: @ 816F9C7 - loadword 0, gUnknown_819E2A3 - callstd 2 - end + loadword 0, gUnknown_819E2A3 + callstd 2 + end Route6_NorthEntrance_EventScript_16F9D0:: @ 816F9D0 - lockall - setvar VAR_0x4001, 0 - goto EventScript_16F9F4 - end + lockall + setvar VAR_0x4001, 0 + goto EventScript_16F9F4 + end Route6_NorthEntrance_EventScript_16F9DC:: @ 816F9DC - lockall - setvar VAR_0x4001, 1 - goto EventScript_16F9F4 - end + lockall + setvar VAR_0x4001, 1 + goto EventScript_16F9F4 + end Route6_NorthEntrance_EventScript_16F9E8:: @ 816F9E8 - lockall - setvar VAR_0x4001, 2 - goto EventScript_16F9F4 - end + lockall + setvar VAR_0x4001, 2 + goto EventScript_16F9F4 + end EventScript_16F9F4:: @ 816F9F4 - textcolor 0 - applymovement 255, Movement_1A75EB - waitmovement 0 - checkflag FLAG_0x2A6 - goto_if 1, EventScript_16FA1E - loadword 0, gUnknown_819E181 - callstd 4 - closemessage - applymovement 255, Movement_16FA8A - waitmovement 0 - releaseall - end + textcolor 0 + applymovement 255, Movement_1A75EB + waitmovement 0 + checkflag FLAG_0x2A6 + goto_if 1, EventScript_16FA1E + loadword 0, gUnknown_819E181 + callstd 4 + closemessage + applymovement 255, Movement_16FA8A + waitmovement 0 + releaseall + end EventScript_16FA1E:: @ 816FA1E - removeitem ITEM_TEA, 1 - goto EventScript_16FA29 - end + removeitem ITEM_TEA, 1 + goto EventScript_16FA29 + end EventScript_16FA29:: @ 816FA29 - loadword 0, gUnknown_819E1D1 - callstd 4 - closemessage - compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_16FA62 - compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_16FA6D - compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_16FA78 - loadword 0, gUnknown_819E1F7 - callstd 4 - setvar VAR_0x4062, 1 - releaseall - end + loadword 0, gUnknown_819E1D1 + callstd 4 + closemessage + compare_var_to_value VAR_0x4001, 0 + call_if 1, EventScript_16FA62 + compare_var_to_value VAR_0x4001, 1 + call_if 1, EventScript_16FA6D + compare_var_to_value VAR_0x4001, 2 + call_if 1, EventScript_16FA78 + loadword 0, gUnknown_819E1F7 + callstd 4 + setvar VAR_0x4062, 1 + releaseall + end EventScript_16FA62:: @ 816FA62 - applymovement 255, Movement_16FA83 - waitmovement 0 - return + applymovement 255, Movement_16FA83 + waitmovement 0 + return EventScript_16FA6D:: @ 816FA6D - applymovement 255, Movement_16FA86 - waitmovement 0 - return + applymovement 255, Movement_16FA86 + waitmovement 0 + return EventScript_16FA78:: @ 816FA78 - applymovement 255, Movement_16FA88 - waitmovement 0 - return + applymovement 255, Movement_16FA88 + waitmovement 0 + return Movement_16FA83:: @ 816FA83 - step_13 - step_13 - step_end + step_13 + step_13 + step_end Movement_16FA86:: @ 816FA86 - step_13 - step_end + step_13 + step_end Movement_16FA88:: @ 816FA88 - step_28 - step_end + step_28 + step_end Movement_16FA8A:: @ 816FA8A - step_10 - step_end + step_10 + step_end diff --git a/data/maps/Route7/scripts.inc b/data/maps/Route7/scripts.inc index 7ec9bd6a0..3a4a78567 100644 --- a/data/maps/Route7/scripts.inc +++ b/data/maps/Route7/scripts.inc @@ -1,7 +1,7 @@ Route7_MapScripts:: @ 8167FBB - .byte 0 + .byte 0 Route7_EventScript_167FBC:: @ 8167FBC - loadword 0, gUnknown_8184097 - callstd 3 - end + loadword 0, gUnknown_8184097 + callstd 3 + end diff --git a/data/maps/Route7_EastEntrance/scripts.inc b/data/maps/Route7_EastEntrance/scripts.inc index 242081916..c6edbcc33 100644 --- a/data/maps/Route7_EastEntrance/scripts.inc +++ b/data/maps/Route7_EastEntrance/scripts.inc @@ -1,92 +1,92 @@ Route7_EastEntrance_MapScripts:: @ 816FA8D - .byte 0 + .byte 0 Route7_EastEntrance_EventScript_16FA8E:: @ 816FA8E - loadword 0, gUnknown_819E3D9 - callstd 2 - end + loadword 0, gUnknown_819E3D9 + callstd 2 + end Route7_EastEntrance_EventScript_16FA97:: @ 816FA97 - lockall - setvar VAR_0x4001, 0 - goto EventScript_16FABB - end + lockall + setvar VAR_0x4001, 0 + goto EventScript_16FABB + end Route7_EastEntrance_EventScript_16FAA3:: @ 816FAA3 - lockall - setvar VAR_0x4001, 1 - goto EventScript_16FABB - end + lockall + setvar VAR_0x4001, 1 + goto EventScript_16FABB + end Route7_EastEntrance_EventScript_16FAAF:: @ 816FAAF - lockall - setvar VAR_0x4001, 2 - goto EventScript_16FABB - end + lockall + setvar VAR_0x4001, 2 + goto EventScript_16FABB + end EventScript_16FABB:: @ 816FABB - textcolor 0 - applymovement 255, Movement_1A75E9 - waitmovement 0 - checkflag FLAG_0x2A6 - goto_if 1, EventScript_16FAE5 - loadword 0, gUnknown_819E2B7 - callstd 4 - closemessage - applymovement 255, Movement_16FB51 - waitmovement 0 - releaseall - end + textcolor 0 + applymovement 255, Movement_1A75E9 + waitmovement 0 + checkflag FLAG_0x2A6 + goto_if 1, EventScript_16FAE5 + loadword 0, gUnknown_819E2B7 + callstd 4 + closemessage + applymovement 255, Movement_16FB51 + waitmovement 0 + releaseall + end EventScript_16FAE5:: @ 816FAE5 - removeitem ITEM_TEA, 1 - goto EventScript_16FAF0 - end + removeitem ITEM_TEA, 1 + goto EventScript_16FAF0 + end EventScript_16FAF0:: @ 816FAF0 - loadword 0, gUnknown_819E307 - callstd 4 - closemessage - compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_16FB29 - compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_16FB34 - compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_16FB3F - loadword 0, gUnknown_819E32D - callstd 4 - setvar VAR_0x4062, 1 - releaseall - end + loadword 0, gUnknown_819E307 + callstd 4 + closemessage + compare_var_to_value VAR_0x4001, 0 + call_if 1, EventScript_16FB29 + compare_var_to_value VAR_0x4001, 1 + call_if 1, EventScript_16FB34 + compare_var_to_value VAR_0x4001, 2 + call_if 1, EventScript_16FB3F + loadword 0, gUnknown_819E32D + callstd 4 + setvar VAR_0x4062, 1 + releaseall + end EventScript_16FB29:: @ 816FB29 - applymovement 255, Movement_16FB4F - waitmovement 0 - return + applymovement 255, Movement_16FB4F + waitmovement 0 + return EventScript_16FB34:: @ 816FB34 - applymovement 255, Movement_16FB4A - waitmovement 0 - return + applymovement 255, Movement_16FB4A + waitmovement 0 + return EventScript_16FB3F:: @ 816FB3F - applymovement 255, Movement_16FB4C - waitmovement 0 - return + applymovement 255, Movement_16FB4C + waitmovement 0 + return Movement_16FB4A:: @ 816FB4A - step_11 - step_end + step_11 + step_end Movement_16FB4C:: @ 816FB4C - step_11 - step_11 - step_end + step_11 + step_11 + step_end Movement_16FB4F:: @ 816FB4F - step_26 - step_end + step_26 + step_end Movement_16FB51:: @ 816FB51 - step_12 - step_end + step_12 + step_end diff --git a/data/maps/Route8/scripts.inc b/data/maps/Route8/scripts.inc index d789a05d6..48e262dd1 100644 --- a/data/maps/Route8/scripts.inc +++ b/data/maps/Route8/scripts.inc @@ -1,7 +1,7 @@ Route8_MapScripts:: @ 8167FC5 - .byte 0 + .byte 0 Route8_EventScript_167FC6:: @ 8167FC6 - loadword 0, gUnknown_8184576 - callstd 3 - end + loadword 0, gUnknown_8184576 + callstd 3 + end diff --git a/data/maps/Route8_WestEntrance/scripts.inc b/data/maps/Route8_WestEntrance/scripts.inc index 472bb5b8f..df720aa57 100644 --- a/data/maps/Route8_WestEntrance/scripts.inc +++ b/data/maps/Route8_WestEntrance/scripts.inc @@ -1,102 +1,102 @@ Route8_WestEntrance_MapScripts:: @ 816FB53 - .byte 0 + .byte 0 Route8_WestEntrance_EventScript_16FB54:: @ 816FB54 - loadword 0, gUnknown_819E50F - callstd 2 - end + loadword 0, gUnknown_819E50F + callstd 2 + end Route8_WestEntrance_EventScript_16FB5D:: @ 816FB5D - lockall - setvar VAR_0x4001, 0 - goto EventScript_16FB81 - end + lockall + setvar VAR_0x4001, 0 + goto EventScript_16FB81 + end Route8_WestEntrance_EventScript_16FB69:: @ 816FB69 - lockall - setvar VAR_0x4001, 1 - goto EventScript_16FB81 - end + lockall + setvar VAR_0x4001, 1 + goto EventScript_16FB81 + end Route8_WestEntrance_EventScript_16FB75:: @ 816FB75 - lockall - setvar VAR_0x4001, 2 - goto EventScript_16FB81 - end + lockall + setvar VAR_0x4001, 2 + goto EventScript_16FB81 + end EventScript_16FB81:: @ 816FB81 - textcolor 0 - applymovement 255, Movement_1A75E9 - waitmovement 0 - checkflag FLAG_0x2A6 - goto_if 1, EventScript_16FBAB - loadword 0, gUnknown_819E3ED - callstd 4 - closemessage - applymovement 255, Movement_16FC2D - waitmovement 0 - releaseall - end + textcolor 0 + applymovement 255, Movement_1A75E9 + waitmovement 0 + checkflag FLAG_0x2A6 + goto_if 1, EventScript_16FBAB + loadword 0, gUnknown_819E3ED + callstd 4 + closemessage + applymovement 255, Movement_16FC2D + waitmovement 0 + releaseall + end EventScript_16FBAB:: @ 816FBAB - removeitem ITEM_TEA, 1 - goto EventScript_16FBCC - end + removeitem ITEM_TEA, 1 + goto EventScript_16FBCC + end EventScript_16FBB6:: @ 816FBB6 - removeitem ITEM_SODA_POP, 1 - goto EventScript_16FBCC - end + removeitem ITEM_SODA_POP, 1 + goto EventScript_16FBCC + end EventScript_16FBC1:: @ 816FBC1 - removeitem ITEM_LEMONADE, 1 - goto EventScript_16FBCC - end + removeitem ITEM_LEMONADE, 1 + goto EventScript_16FBCC + end EventScript_16FBCC:: @ 816FBCC - loadword 0, gUnknown_819E43D - callstd 4 - closemessage - compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_16FC05 - compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_16FC10 - compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_16FC1B - loadword 0, gUnknown_819E463 - callstd 4 - setvar VAR_0x4062, 1 - releaseall - end + loadword 0, gUnknown_819E43D + callstd 4 + closemessage + compare_var_to_value VAR_0x4001, 0 + call_if 1, EventScript_16FC05 + compare_var_to_value VAR_0x4001, 1 + call_if 1, EventScript_16FC10 + compare_var_to_value VAR_0x4001, 2 + call_if 1, EventScript_16FC1B + loadword 0, gUnknown_819E463 + callstd 4 + setvar VAR_0x4062, 1 + releaseall + end EventScript_16FC05:: @ 816FC05 - applymovement 255, Movement_16FC2B - waitmovement 0 - return + applymovement 255, Movement_16FC2B + waitmovement 0 + return EventScript_16FC10:: @ 816FC10 - applymovement 255, Movement_16FC26 - waitmovement 0 - return + applymovement 255, Movement_16FC26 + waitmovement 0 + return EventScript_16FC1B:: @ 816FC1B - applymovement 255, Movement_16FC28 - waitmovement 0 - return + applymovement 255, Movement_16FC28 + waitmovement 0 + return Movement_16FC26:: @ 816FC26 - step_11 - step_end + step_11 + step_end Movement_16FC28:: @ 816FC28 - step_11 - step_11 - step_end + step_11 + step_11 + step_end Movement_16FC2B:: @ 816FC2B - step_26 - step_end + step_26 + step_end Movement_16FC2D:: @ 816FC2D - step_13 - step_end + step_13 + step_end diff --git a/data/maps/Route9/scripts.inc b/data/maps/Route9/scripts.inc index a6492a3e1..d722c2e01 100644 --- a/data/maps/Route9/scripts.inc +++ b/data/maps/Route9/scripts.inc @@ -1,7 +1,7 @@ Route9_MapScripts:: @ 8167FCF - .byte 0 + .byte 0 Route9_EventScript_167FD0:: @ 8167FD0 - loadword 0, gUnknown_8184B66 - callstd 3 - end + loadword 0, gUnknown_8184B66 + callstd 3 + end diff --git a/data/maps/SSAnne_1F_Corridor/scripts.inc b/data/maps/SSAnne_1F_Corridor/scripts.inc index 0d84f7851..a087d4ea9 100644 --- a/data/maps/SSAnne_1F_Corridor/scripts.inc +++ b/data/maps/SSAnne_1F_Corridor/scripts.inc @@ -1,12 +1,12 @@ SSAnne_1F_Corridor_MapScripts:: @ 81608CB - .byte 0 + .byte 0 SSAnne_1F_Corridor_EventScript_1608CC:: @ 81608CC - loadword 0, gUnknown_8172EE7 - callstd 2 - end + loadword 0, gUnknown_8172EE7 + callstd 2 + end SSAnne_1F_Corridor_EventScript_1608D5:: @ 81608D5 - loadword 0, gUnknown_8172F60 - callstd 2 - end + loadword 0, gUnknown_8172F60 + callstd 2 + end diff --git a/data/maps/SSAnne_1F_Room1/scripts.inc b/data/maps/SSAnne_1F_Room1/scripts.inc index 578278550..76e6a74da 100644 --- a/data/maps/SSAnne_1F_Room1/scripts.inc +++ b/data/maps/SSAnne_1F_Room1/scripts.inc @@ -1,7 +1,7 @@ SSAnne_1F_Room1_MapScripts:: @ 8160BDB - .byte 0 + .byte 0 SSAnne_1F_Room1_EventScript_160BDC:: @ 8160BDC - loadword 0, gUnknown_817393B - callstd 2 - end + loadword 0, gUnknown_817393B + callstd 2 + end diff --git a/data/maps/SSAnne_1F_Room2/scripts.inc b/data/maps/SSAnne_1F_Room2/scripts.inc index f0670a7e6..269a5ca17 100644 --- a/data/maps/SSAnne_1F_Room2/scripts.inc +++ b/data/maps/SSAnne_1F_Room2/scripts.inc @@ -1,19 +1,19 @@ SSAnne_1F_Room2_MapScripts:: @ 8160BE5 - .byte 0 + .byte 0 SSAnne_1F_Room2_EventScript_160BE6:: @ 8160BE6 - loadword 0, gUnknown_8173AC5 - callstd 2 - end + loadword 0, gUnknown_8173AC5 + callstd 2 + end SSAnne_1F_Room2_EventScript_160BEF:: @ 8160BEF - trainerbattle 0, 126, 0, Text_173A1A, Text_173A4F - loadword 0, gUnknown_8173A7A - callstd 6 - end + trainerbattle 0, 126, 0, Text_173A1A, Text_173A4F + loadword 0, gUnknown_8173A7A + callstd 6 + end SSAnne_1F_Room2_EventScript_160C06:: @ 8160C06 - trainerbattle 0, 96, 0, Text_173999, Text_1739B1 - loadword 0, gUnknown_81739C5 - callstd 6 - end + trainerbattle 0, 96, 0, Text_173999, Text_1739B1 + loadword 0, gUnknown_81739C5 + callstd 6 + end diff --git a/data/maps/SSAnne_1F_Room3/scripts.inc b/data/maps/SSAnne_1F_Room3/scripts.inc index a1f69d1da..192e8e4f8 100644 --- a/data/maps/SSAnne_1F_Room3/scripts.inc +++ b/data/maps/SSAnne_1F_Room3/scripts.inc @@ -1,23 +1,23 @@ SSAnne_1F_Room3_MapScripts:: @ 8160C1D - .byte 0 + .byte 0 SSAnne_1F_Room3_EventScript_160C1E:: @ 8160C1E - loadword 0, gUnknown_8173B21 - callstd 2 - end + loadword 0, gUnknown_8173B21 + callstd 2 + end SSAnne_1F_Room3_EventScript_160C27:: @ 8160C27 - loadword 0, gUnknown_8173AFA - callstd 2 - end + loadword 0, gUnknown_8173AFA + callstd 2 + end SSAnne_1F_Room3_EventScript_160C30:: @ 8160C30 - lock - faceplayer - waitse - playmoncry SPECIES_WIGGLYTUFF, 0 - loadword 0, gUnknown_8173B61 - callstd 4 - waitmoncry - release - end + lock + faceplayer + waitse + playmoncry SPECIES_WIGGLYTUFF, 0 + loadword 0, gUnknown_8173B61 + callstd 4 + waitmoncry + release + end diff --git a/data/maps/SSAnne_1F_Room4/scripts.inc b/data/maps/SSAnne_1F_Room4/scripts.inc index 224bd98fd..688a558bd 100644 --- a/data/maps/SSAnne_1F_Room4/scripts.inc +++ b/data/maps/SSAnne_1F_Room4/scripts.inc @@ -1,19 +1,19 @@ SSAnne_1F_Room4_MapScripts:: @ 8160C43 - .byte 0 + .byte 0 SSAnne_1F_Room4_EventScript_160C44:: @ 8160C44 - lock - faceplayer - checkplayergender - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_160C5C - loadword 0, gUnknown_8173BA4 - callstd 4 - release - end + lock + faceplayer + checkplayergender + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_160C5C + loadword 0, gUnknown_8173BA4 + callstd 4 + release + end EventScript_160C5C:: @ 8160C5C - loadword 0, gUnknown_8173B79 - callstd 4 - release - end + loadword 0, gUnknown_8173B79 + callstd 4 + release + end diff --git a/data/maps/SSAnne_1F_Room5/scripts.inc b/data/maps/SSAnne_1F_Room5/scripts.inc index e56b3d1fc..8c0b40f37 100644 --- a/data/maps/SSAnne_1F_Room5/scripts.inc +++ b/data/maps/SSAnne_1F_Room5/scripts.inc @@ -1,8 +1,8 @@ SSAnne_1F_Room5_MapScripts:: @ 8160C66 - .byte 0 + .byte 0 SSAnne_1F_Room5_EventScript_160C67:: @ 8160C67 - trainerbattle 0, 422, 0, Text_173BD1, Text_173BFA - loadword 0, gUnknown_8173C30 - callstd 6 - end + trainerbattle 0, 422, 0, Text_173BD1, Text_173BFA + loadword 0, gUnknown_8173C30 + callstd 6 + end diff --git a/data/maps/SSAnne_1F_Room6/scripts.inc b/data/maps/SSAnne_1F_Room6/scripts.inc index 9ebb100d8..6c413ad8f 100644 --- a/data/maps/SSAnne_1F_Room6/scripts.inc +++ b/data/maps/SSAnne_1F_Room6/scripts.inc @@ -1,31 +1,31 @@ SSAnne_1F_Room6_MapScripts:: @ 8160DF2 - .byte 0 + .byte 0 SSAnne_1F_Room6_EventScript_160DF3:: @ 8160DF3 - lock - faceplayer - loadword 0, gUnknown_817445B - callstd 5 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_160E18 - closemessage - call EventScript_1A6C26 - loadword 0, gUnknown_8174490 - callstd 4 - release - end + lock + faceplayer + loadword 0, gUnknown_817445B + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_160E18 + closemessage + call EventScript_1A6C26 + loadword 0, gUnknown_8174490 + callstd 4 + release + end EventScript_160E18:: @ 8160E18 - checkplayergender - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_160E2E - loadword 0, gUnknown_8174515 - callstd 4 - release - end + checkplayergender + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_160E2E + loadword 0, gUnknown_8174515 + callstd 4 + release + end EventScript_160E2E:: @ 8160E2E - loadword 0, gUnknown_81744D0 - callstd 4 - release - end + loadword 0, gUnknown_81744D0 + callstd 4 + release + end diff --git a/data/maps/SSAnne_1F_Room7/scripts.inc b/data/maps/SSAnne_1F_Room7/scripts.inc index 7e5387084..eaa7d1890 100644 --- a/data/maps/SSAnne_1F_Room7/scripts.inc +++ b/data/maps/SSAnne_1F_Room7/scripts.inc @@ -1,8 +1,8 @@ SSAnne_1F_Room7_MapScripts:: @ 8160C7E - .byte 0 + .byte 0 SSAnne_1F_Room7_EventScript_160C7F:: @ 8160C7F - trainerbattle 0, 421, 0, Text_173C52, Text_173CB4 - loadword 0, gUnknown_8173CC4 - callstd 6 - end + trainerbattle 0, 421, 0, Text_173C52, Text_173CB4 + loadword 0, gUnknown_8173CC4 + callstd 6 + end diff --git a/data/maps/SSAnne_2F_Corridor/scripts.inc b/data/maps/SSAnne_2F_Corridor/scripts.inc index 0cecaff2e..0702c3048 100644 --- a/data/maps/SSAnne_2F_Corridor/scripts.inc +++ b/data/maps/SSAnne_2F_Corridor/scripts.inc @@ -1,187 +1,187 @@ SSAnne_2F_Corridor_MapScripts:: @ 81608DE - .byte 0 + .byte 0 SSAnne_2F_Corridor_EventScript_1608DF:: @ 81608DF - lockall - setvar VAR_0x4001, 0 - goto EventScript_160903 + lockall + setvar VAR_0x4001, 0 + goto EventScript_160903 EventScript_1608EA:: @ 81608EA - end + end SSAnne_2F_Corridor_EventScript_1608EB:: @ 81608EB - lockall - setvar VAR_0x4001, 1 - goto EventScript_160903 + lockall + setvar VAR_0x4001, 1 + goto EventScript_160903 EventScript_1608F6:: @ 81608F6 - end + end SSAnne_2F_Corridor_EventScript_1608F7:: @ 81608F7 - lockall - setvar VAR_0x4001, 2 - goto EventScript_160903 + lockall + setvar VAR_0x4001, 2 + goto EventScript_160903 EventScript_160902:: @ 8160902 - end + end EventScript_160903:: @ 8160903 - textcolor 0 - playse SE_KAIDAN - delay 5 - playbgm BGM_FRLG_RIVAL, 0 - addobject 1 - delay 10 - applymovement 1, Movement_1A75ED - waitmovement 0 - delay 20 - compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_1609AD - compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_1609B8 - compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_1609CA - loadword 0, gUnknown_8173035 - callstd 4 - setvar VAR_LAST_TALKED, 1 - compare_var_to_value VAR_STARTER_MON, 2 - call_if 1, EventScript_1609DC - compare_var_to_value VAR_STARTER_MON, 1 - call_if 1, EventScript_1609E7 - compare_var_to_value VAR_STARTER_MON, 0 - call_if 1, EventScript_1609F2 - loadword 0, gUnknown_8173164 - callstd 4 - closemessage - delay 10 - playbgm BGM_FRLG_RIVAL_POSTBATTLE, 0 - compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_1609FD - compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_160A08 - compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_160A13 - fadedefaultbgm - removeobject 1 - setvar VAR_0x405B, 1 - releaseall - end + textcolor 0 + playse SE_KAIDAN + delay 5 + playbgm BGM_FRLG_RIVAL, 0 + addobject 1 + delay 10 + applymovement 1, Movement_1A75ED + waitmovement 0 + delay 20 + compare_var_to_value VAR_0x4001, 0 + call_if 1, EventScript_1609AD + compare_var_to_value VAR_0x4001, 1 + call_if 1, EventScript_1609B8 + compare_var_to_value VAR_0x4001, 2 + call_if 1, EventScript_1609CA + loadword 0, gUnknown_8173035 + callstd 4 + setvar VAR_LAST_TALKED, 1 + compare_var_to_value VAR_STARTER_MON, 2 + call_if 1, EventScript_1609DC + compare_var_to_value VAR_STARTER_MON, 1 + call_if 1, EventScript_1609E7 + compare_var_to_value VAR_STARTER_MON, 0 + call_if 1, EventScript_1609F2 + loadword 0, gUnknown_8173164 + callstd 4 + closemessage + delay 10 + playbgm BGM_FRLG_RIVAL_POSTBATTLE, 0 + compare_var_to_value VAR_0x4001, 0 + call_if 1, EventScript_1609FD + compare_var_to_value VAR_0x4001, 1 + call_if 1, EventScript_160A08 + compare_var_to_value VAR_0x4001, 2 + call_if 1, EventScript_160A13 + fadedefaultbgm + removeobject 1 + setvar VAR_0x405B, 1 + releaseall + end EventScript_1609AD:: @ 81609AD - applymovement 1, Movement_160A2A - waitmovement 0 - return + applymovement 1, Movement_160A2A + waitmovement 0 + return EventScript_1609B8:: @ 81609B8 - applymovement 1, Movement_160A2E - applymovement 255, Movement_160A24 - waitmovement 0 - return + applymovement 1, Movement_160A2E + applymovement 255, Movement_160A24 + waitmovement 0 + return EventScript_1609CA:: @ 81609CA - applymovement 255, Movement_160A1E - applymovement 1, Movement_160A34 - waitmovement 0 - return + applymovement 255, Movement_160A1E + applymovement 1, Movement_160A34 + waitmovement 0 + return EventScript_1609DC:: @ 81609DC - trainerbattle 3, 426, 0, Text_173110 - return + trainerbattle 3, 426, 0, Text_173110 + return EventScript_1609E7:: @ 81609E7 - trainerbattle 3, 427, 0, Text_173110 - return + trainerbattle 3, 427, 0, Text_173110 + return EventScript_1609F2:: @ 81609F2 - trainerbattle 3, 428, 0, Text_173110 - return + trainerbattle 3, 428, 0, Text_173110 + return EventScript_1609FD:: @ 81609FD - applymovement 1, Movement_160A3B - waitmovement 0 - return + applymovement 1, Movement_160A3B + waitmovement 0 + return EventScript_160A08:: @ 8160A08 - applymovement 1, Movement_160A44 - waitmovement 0 - return + applymovement 1, Movement_160A44 + waitmovement 0 + return EventScript_160A13:: @ 8160A13 - applymovement 1, Movement_160A4C - waitmovement 0 - return + applymovement 1, Movement_160A4C + waitmovement 0 + return Movement_160A1E:: @ 8160A1E - step_1c - step_1c - step_1c - step_1c - step_2f - step_end + step_1c + step_1c + step_1c + step_1c + step_2f + step_end Movement_160A24:: @ 8160A24 - step_1c - step_1c - step_1c - step_1c - step_2f - step_end + step_1c + step_1c + step_1c + step_1c + step_2f + step_end Movement_160A2A:: @ 8160A2A - step_10 - step_10 - step_10 - step_end + step_10 + step_10 + step_10 + step_end Movement_160A2E:: @ 8160A2E - step_10 - step_10 - step_10 - step_10 - step_30 - step_end + step_10 + step_10 + step_10 + step_10 + step_30 + step_end Movement_160A34:: @ 8160A34 - step_10 - step_10 - step_10 - step_10 - step_13 - step_1a - step_end + step_10 + step_10 + step_10 + step_10 + step_13 + step_1a + step_end Movement_160A3B:: @ 8160A3B - step_13 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_end + step_13 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_end Movement_160A44:: @ 8160A44 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_end + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_end Movement_160A4C:: @ 8160A4C - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_end + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_end SSAnne_2F_Corridor_EventScript_160A54:: @ 8160A54 - loadword 0, gUnknown_8172FC3 - callstd 2 - end + loadword 0, gUnknown_8172FC3 + callstd 2 + end diff --git a/data/maps/SSAnne_2F_Room1/scripts.inc b/data/maps/SSAnne_2F_Room1/scripts.inc index 65f373a77..e2257e22a 100644 --- a/data/maps/SSAnne_2F_Room1/scripts.inc +++ b/data/maps/SSAnne_2F_Room1/scripts.inc @@ -1,15 +1,15 @@ SSAnne_2F_Room1_MapScripts:: @ 8160C96 - .byte 0 + .byte 0 SSAnne_2F_Room1_EventScript_160C97:: @ 8160C97 - lock - faceplayer - message Text_173CE3 - waitmessage - setvar VAR_0x8004, 143 - special sub_80CBDCC - drawmonpic SPECIES_SNORLAX, 10, 3 - waitbuttonpress - erasemonpic - release - end + lock + faceplayer + message Text_173CE3 + waitmessage + setvar VAR_0x8004, 143 + special sub_80CBDCC + drawmonpic SPECIES_SNORLAX, 10, 3 + waitbuttonpress + erasemonpic + release + end diff --git a/data/maps/SSAnne_2F_Room2/scripts.inc b/data/maps/SSAnne_2F_Room2/scripts.inc index 0adab213c..5762975fc 100644 --- a/data/maps/SSAnne_2F_Room2/scripts.inc +++ b/data/maps/SSAnne_2F_Room2/scripts.inc @@ -1,14 +1,14 @@ SSAnne_2F_Room2_MapScripts:: @ 8160CB0 - .byte 0 + .byte 0 SSAnne_2F_Room2_EventScript_160CB1:: @ 8160CB1 - trainerbattle 0, 223, 0, Text_173DDB, Text_173DF7 - loadword 0, gUnknown_8173E04 - callstd 6 - end + trainerbattle 0, 223, 0, Text_173DDB, Text_173DF7 + loadword 0, gUnknown_8173E04 + callstd 6 + end SSAnne_2F_Room2_EventScript_160CC8:: @ 8160CC8 - trainerbattle 0, 482, 0, Text_173D63, Text_173D92 - loadword 0, gUnknown_8173DB6 - callstd 6 - end + trainerbattle 0, 482, 0, Text_173D63, Text_173D92 + loadword 0, gUnknown_8173DB6 + callstd 6 + end diff --git a/data/maps/SSAnne_2F_Room3/scripts.inc b/data/maps/SSAnne_2F_Room3/scripts.inc index e2acc4ccd..fefb080fc 100644 --- a/data/maps/SSAnne_2F_Room3/scripts.inc +++ b/data/maps/SSAnne_2F_Room3/scripts.inc @@ -1,12 +1,12 @@ SSAnne_2F_Room3_MapScripts:: @ 8160CDF - .byte 0 + .byte 0 SSAnne_2F_Room3_EventScript_160CE0:: @ 8160CE0 - loadword 0, gUnknown_8173E3A - callstd 2 - end + loadword 0, gUnknown_8173E3A + callstd 2 + end SSAnne_2F_Room3_EventScript_160CE9:: @ 8160CE9 - loadword 0, gUnknown_8173E7B - callstd 2 - end + loadword 0, gUnknown_8173E7B + callstd 2 + end diff --git a/data/maps/SSAnne_2F_Room4/scripts.inc b/data/maps/SSAnne_2F_Room4/scripts.inc index d9ffc8a55..fc9f91ede 100644 --- a/data/maps/SSAnne_2F_Room4/scripts.inc +++ b/data/maps/SSAnne_2F_Room4/scripts.inc @@ -1,14 +1,14 @@ SSAnne_2F_Room4_MapScripts:: @ 8160CF2 - .byte 0 + .byte 0 SSAnne_2F_Room4_EventScript_160CF3:: @ 8160CF3 - trainerbattle 0, 483, 0, Text_173F07, Text_173F42 - loadword 0, gUnknown_8173F55 - callstd 6 - end + trainerbattle 0, 483, 0, Text_173F07, Text_173F42 + loadword 0, gUnknown_8173F55 + callstd 6 + end SSAnne_2F_Room4_EventScript_160D0A:: @ 8160D0A - trainerbattle 0, 127, 0, Text_173F83, Text_173FAB - loadword 0, gUnknown_8173FB9 - callstd 6 - end + trainerbattle 0, 127, 0, Text_173F83, Text_173FAB + loadword 0, gUnknown_8173FB9 + callstd 6 + end diff --git a/data/maps/SSAnne_2F_Room5/scripts.inc b/data/maps/SSAnne_2F_Room5/scripts.inc index e3d94ecff..3407bebc2 100644 --- a/data/maps/SSAnne_2F_Room5/scripts.inc +++ b/data/maps/SSAnne_2F_Room5/scripts.inc @@ -1,12 +1,12 @@ SSAnne_2F_Room5_MapScripts:: @ 8160D21 - .byte 0 + .byte 0 SSAnne_2F_Room5_EventScript_160D22:: @ 8160D22 - loadword 0, gUnknown_8173FF7 - callstd 2 - end + loadword 0, gUnknown_8173FF7 + callstd 2 + end SSAnne_2F_Room5_EventScript_160D2B:: @ 8160D2B - loadword 0, gUnknown_817404F - callstd 2 - end + loadword 0, gUnknown_817404F + callstd 2 + end diff --git a/data/maps/SSAnne_2F_Room6/scripts.inc b/data/maps/SSAnne_2F_Room6/scripts.inc index 3c43d9243..d8e68cbe9 100644 --- a/data/maps/SSAnne_2F_Room6/scripts.inc +++ b/data/maps/SSAnne_2F_Room6/scripts.inc @@ -1,12 +1,12 @@ SSAnne_2F_Room6_MapScripts:: @ 8160D34 - .byte 0 + .byte 0 SSAnne_2F_Room6_EventScript_160D35:: @ 8160D35 - loadword 0, gUnknown_81740A1 - callstd 2 - end + loadword 0, gUnknown_81740A1 + callstd 2 + end SSAnne_2F_Room6_EventScript_160D3E:: @ 8160D3E - loadword 0, gUnknown_81740D6 - callstd 2 - end + loadword 0, gUnknown_81740D6 + callstd 2 + end diff --git a/data/maps/SSAnne_3F_Corridor/scripts.inc b/data/maps/SSAnne_3F_Corridor/scripts.inc index 21017b2a2..7fee476cf 100644 --- a/data/maps/SSAnne_3F_Corridor/scripts.inc +++ b/data/maps/SSAnne_3F_Corridor/scripts.inc @@ -1,7 +1,7 @@ SSAnne_3F_Corridor_MapScripts:: @ 8160A5D - .byte 0 + .byte 0 SSAnne_3F_Corridor_EventScript_160A5E:: @ 8160A5E - loadword 0, gUnknown_817320C - callstd 2 - end + loadword 0, gUnknown_817320C + callstd 2 + end diff --git a/data/maps/SSAnne_B1F_Corridor/scripts.inc b/data/maps/SSAnne_B1F_Corridor/scripts.inc index 3e4641593..be04386e6 100644 --- a/data/maps/SSAnne_B1F_Corridor/scripts.inc +++ b/data/maps/SSAnne_B1F_Corridor/scripts.inc @@ -1,2 +1,2 @@ SSAnne_B1F_Corridor_MapScripts:: @ 8160A67 - .byte 0 + .byte 0 diff --git a/data/maps/SSAnne_B1F_Room1/scripts.inc b/data/maps/SSAnne_B1F_Room1/scripts.inc index 4bbfb167a..f2bcadc33 100644 --- a/data/maps/SSAnne_B1F_Room1/scripts.inc +++ b/data/maps/SSAnne_B1F_Room1/scripts.inc @@ -1,14 +1,14 @@ SSAnne_B1F_Room1_MapScripts:: @ 8160D47 - .byte 0 + .byte 0 SSAnne_B1F_Room1_EventScript_160D48:: @ 8160D48 - trainerbattle 0, 224, 0, Text_174177, Text_1741EF - loadword 0, gUnknown_817420E - callstd 6 - end + trainerbattle 0, 224, 0, Text_174177, Text_1741EF + loadword 0, gUnknown_817420E + callstd 6 + end SSAnne_B1F_Room1_EventScript_160D5F:: @ 8160D5F - trainerbattle 0, 140, 0, Text_1740F6, Text_174123 - loadword 0, gUnknown_817413A - callstd 6 - end + trainerbattle 0, 140, 0, Text_1740F6, Text_174123 + loadword 0, gUnknown_817413A + callstd 6 + end diff --git a/data/maps/SSAnne_B1F_Room2/scripts.inc b/data/maps/SSAnne_B1F_Room2/scripts.inc index d982818bc..e84b8d68e 100644 --- a/data/maps/SSAnne_B1F_Room2/scripts.inc +++ b/data/maps/SSAnne_B1F_Room2/scripts.inc @@ -1,8 +1,8 @@ SSAnne_B1F_Room2_MapScripts:: @ 8160D76 - .byte 0 + .byte 0 SSAnne_B1F_Room2_EventScript_160D77:: @ 8160D77 - trainerbattle 0, 138, 0, Text_174239, Text_17425C - loadword 0, gUnknown_8174272 - callstd 6 - end + trainerbattle 0, 138, 0, Text_174239, Text_17425C + loadword 0, gUnknown_8174272 + callstd 6 + end diff --git a/data/maps/SSAnne_B1F_Room3/scripts.inc b/data/maps/SSAnne_B1F_Room3/scripts.inc index b61516005..55b1c3227 100644 --- a/data/maps/SSAnne_B1F_Room3/scripts.inc +++ b/data/maps/SSAnne_B1F_Room3/scripts.inc @@ -1,8 +1,8 @@ SSAnne_B1F_Room3_MapScripts:: @ 8160D8E - .byte 0 + .byte 0 SSAnne_B1F_Room3_EventScript_160D8F:: @ 8160D8F - trainerbattle 0, 139, 0, Text_1742A6, Text_1742C3 - loadword 0, gUnknown_81742D2 - callstd 6 - end + trainerbattle 0, 139, 0, Text_1742A6, Text_1742C3 + loadword 0, gUnknown_81742D2 + callstd 6 + end diff --git a/data/maps/SSAnne_B1F_Room4/scripts.inc b/data/maps/SSAnne_B1F_Room4/scripts.inc index c81c58192..2f7fb16e6 100644 --- a/data/maps/SSAnne_B1F_Room4/scripts.inc +++ b/data/maps/SSAnne_B1F_Room4/scripts.inc @@ -1,14 +1,14 @@ SSAnne_B1F_Room4_MapScripts:: @ 8160DA6 - .byte 0 + .byte 0 SSAnne_B1F_Room4_EventScript_160DA7:: @ 8160DA7 - trainerbattle 0, 136, 0, Text_174315, Text_174348 - loadword 0, gUnknown_8174362 - callstd 6 - end + trainerbattle 0, 136, 0, Text_174315, Text_174348 + loadword 0, gUnknown_8174362 + callstd 6 + end SSAnne_B1F_Room4_EventScript_160DBE:: @ 8160DBE - trainerbattle 0, 137, 0, Text_174385, Text_1743B3 - loadword 0, gUnknown_81743C8 - callstd 6 - end + trainerbattle 0, 137, 0, Text_174385, Text_1743B3 + loadword 0, gUnknown_81743C8 + callstd 6 + end diff --git a/data/maps/SSAnne_B1F_Room5/scripts.inc b/data/maps/SSAnne_B1F_Room5/scripts.inc index b38ab6265..df7cbb5a5 100644 --- a/data/maps/SSAnne_B1F_Room5/scripts.inc +++ b/data/maps/SSAnne_B1F_Room5/scripts.inc @@ -1,18 +1,18 @@ SSAnne_B1F_Room5_MapScripts:: @ 8160DD5 - .byte 0 + .byte 0 SSAnne_B1F_Room5_EventScript_160DD6:: @ 8160DD6 - loadword 0, gUnknown_81743F8 - callstd 2 - end + loadword 0, gUnknown_81743F8 + callstd 2 + end SSAnne_B1F_Room5_EventScript_160DDF:: @ 8160DDF - lock - faceplayer - waitse - playmoncry SPECIES_MACHOKE, 0 - loadword 0, gUnknown_8174444 - callstd 4 - waitmoncry - release - end + lock + faceplayer + waitse + playmoncry SPECIES_MACHOKE, 0 + loadword 0, gUnknown_8174444 + callstd 4 + waitmoncry + release + end diff --git a/data/maps/SSAnne_CaptainsOffice/scripts.inc b/data/maps/SSAnne_CaptainsOffice/scripts.inc index 98b9c8b42..5583646e3 100644 --- a/data/maps/SSAnne_CaptainsOffice/scripts.inc +++ b/data/maps/SSAnne_CaptainsOffice/scripts.inc @@ -1,59 +1,59 @@ SSAnne_CaptainsOffice_MapScripts:: @ 8160B39 - .byte 0 + .byte 0 SSAnne_CaptainsOffice_EventScript_160B3A:: @ 8160B3A - lock - checkflag FLAG_0x237 - goto_if 1, EventScript_160BB5 - loadword 0, gUnknown_8173646 - callstd 4 - textcolor 3 - message Text_173676 - waitmessage - playfanfare MUS_ME_ASA - waitfanfare - call EventScript_1A6675 - delay 50 - applymovement 1, Movement_1A75E1 - waitmovement 0 - loadword 0, gUnknown_81736A6 - callstd 4 - additem ITEM_HM01, 1 - loadword 0, gUnknown_81737AF - setorcopyvar VAR_0x8000, 339 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 318 - callstd 9 - loadword 0, gUnknown_81737D2 - callstd 4 - setflag FLAG_0x237 - setvar VAR_0x407E, 1 - release - end + lock + checkflag FLAG_0x237 + goto_if 1, EventScript_160BB5 + loadword 0, gUnknown_8173646 + callstd 4 + textcolor 3 + message Text_173676 + waitmessage + playfanfare MUS_ME_ASA + waitfanfare + call EventScript_1A6675 + delay 50 + applymovement 1, Movement_1A75E1 + waitmovement 0 + loadword 0, gUnknown_81736A6 + callstd 4 + additem ITEM_HM01, 1 + loadword 0, gUnknown_81737AF + setorcopyvar VAR_0x8000, 339 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 318 + callstd 9 + loadword 0, gUnknown_81737D2 + callstd 4 + setflag FLAG_0x237 + setvar VAR_0x407E, 1 + release + end EventScript_160BA0:: @ 8160BA0 - loadword 0, gUnknown_81738C3 - callstd 4 - closemessage - applymovement 1, Movement_1A75E5 - waitmovement 0 - release - end + loadword 0, gUnknown_81738C3 + callstd 4 + closemessage + applymovement 1, Movement_1A75E5 + waitmovement 0 + release + end EventScript_160BB5:: @ 8160BB5 - applymovement 1, Movement_1A75E1 - waitmovement 0 - loadword 0, gUnknown_8173831 - callstd 4 - release - end + applymovement 1, Movement_1A75E1 + waitmovement 0 + loadword 0, gUnknown_8173831 + callstd 4 + release + end SSAnne_CaptainsOffice_EventScript_160BC9:: @ 8160BC9 - loadword 0, gUnknown_81738E6 - callstd 3 - end + loadword 0, gUnknown_81738E6 + callstd 3 + end SSAnne_CaptainsOffice_EventScript_160BD2:: @ 8160BD2 - loadword 0, gUnknown_8173903 - callstd 3 - end + loadword 0, gUnknown_8173903 + callstd 3 + end diff --git a/data/maps/SSAnne_Deck/scripts.inc b/data/maps/SSAnne_Deck/scripts.inc index 204f994e9..e113c5e04 100644 --- a/data/maps/SSAnne_Deck/scripts.inc +++ b/data/maps/SSAnne_Deck/scripts.inc @@ -1,29 +1,29 @@ SSAnne_Deck_MapScripts:: @ 8160A68 - .byte 0 + .byte 0 SSAnne_Deck_EventScript_160A69:: @ 8160A69 - loadword 0, gUnknown_817326F - callstd 2 - end + loadword 0, gUnknown_817326F + callstd 2 + end SSAnne_Deck_EventScript_160A72:: @ 8160A72 - loadword 0, gUnknown_81732C6 - callstd 2 - end + loadword 0, gUnknown_81732C6 + callstd 2 + end SSAnne_Deck_EventScript_160A7B:: @ 8160A7B - loadword 0, gUnknown_81732A2 - callstd 2 - end + loadword 0, gUnknown_81732A2 + callstd 2 + end SSAnne_Deck_EventScript_160A84:: @ 8160A84 - trainerbattle 0, 134, 0, Text_173308, Text_17332B - loadword 0, gUnknown_817333E - callstd 6 - end + trainerbattle 0, 134, 0, Text_173308, Text_17332B + loadword 0, gUnknown_817333E + callstd 6 + end SSAnne_Deck_EventScript_160A9B:: @ 8160A9B - trainerbattle 0, 135, 0, Text_173382, Text_1733A0 - loadword 0, gUnknown_81733B5 - callstd 6 - end + trainerbattle 0, 135, 0, Text_173382, Text_1733A0 + loadword 0, gUnknown_81733B5 + callstd 6 + end diff --git a/data/maps/SSAnne_Exterior/scripts.inc b/data/maps/SSAnne_Exterior/scripts.inc index 6a4e14a50..e3064f061 100644 --- a/data/maps/SSAnne_Exterior/scripts.inc +++ b/data/maps/SSAnne_Exterior/scripts.inc @@ -1,67 +1,67 @@ SSAnne_Exterior_MapScripts:: @ 8160840 - map_script 3, SSAnne_Exterior_MapScript1_16084B - map_script 2, SSAnne_Exterior_MapScript2_16084F - .byte 0 + map_script 3, SSAnne_Exterior_MapScript1_16084B + map_script 2, SSAnne_Exterior_MapScript2_16084F + .byte 0 SSAnne_Exterior_MapScript1_16084B:: @ 816084B - setworldmapflag 2214 - end + setworldmapflag 2214 + end SSAnne_Exterior_MapScript2_16084F:: @ 816084F - map_script_2 VAR_0x407E, 1, SSAnne_Exterior_160859 - .2byte 0 + map_script_2 VAR_0x407E, 1, SSAnne_Exterior_160859 + .2byte 0 SSAnne_Exterior_160859:: @ 8160859 - lockall - getplayerxy VAR_0x8004, VAR_0x8005 - compare_var_to_value VAR_0x8005, 6 - call_if 3, EventScript_1608A1 - compare_var_to_value VAR_0x8005, 7 - call_if 4, EventScript_1608AC - fadenewbgm BGM_FRLG_SURF - delay 50 - special sub_815D334 - waitstate - removeobject 1 - applymovement 255, Movement_1608B7 - waitmovement 0 - setvar VAR_0x407E, 2 - setvar VAR_0x4053, 0 - warp MAP_VERMILION_CITY, 255, 23, 34 - waitstate - releaseall - end + lockall + getplayerxy VAR_0x8004, VAR_0x8005 + compare_var_to_value VAR_0x8005, 6 + call_if 3, EventScript_1608A1 + compare_var_to_value VAR_0x8005, 7 + call_if 4, EventScript_1608AC + fadenewbgm BGM_FRLG_SURF + delay 50 + special sub_815D334 + waitstate + removeobject 1 + applymovement 255, Movement_1608B7 + waitmovement 0 + setvar VAR_0x407E, 2 + setvar VAR_0x4053, 0 + warp MAP_VERMILION_CITY, 255, 23, 34 + waitstate + releaseall + end EventScript_1608A1:: @ 81608A1 - applymovement 255, Movement_1608C1 - waitmovement 0 - return + applymovement 255, Movement_1608C1 + waitmovement 0 + return EventScript_1608AC:: @ 81608AC - applymovement 255, Movement_1A75ED - waitmovement 0 - return + applymovement 255, Movement_1A75ED + waitmovement 0 + return Movement_1608B7:: @ 81608B7 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_end + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_11 + step_end Movement_1608C1:: @ 81608C1 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_end + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_10 + step_end diff --git a/data/maps/SSAnne_Kitchen/scripts.inc b/data/maps/SSAnne_Kitchen/scripts.inc index 79aa88852..727531dfa 100644 --- a/data/maps/SSAnne_Kitchen/scripts.inc +++ b/data/maps/SSAnne_Kitchen/scripts.inc @@ -1,63 +1,63 @@ SSAnne_Kitchen_MapScripts:: @ 8160AB2 - .byte 0 + .byte 0 SSAnne_Kitchen_EventScript_160AB3:: @ 8160AB3 - loadword 0, gUnknown_81733F8 - callstd 2 - end + loadword 0, gUnknown_81733F8 + callstd 2 + end SSAnne_Kitchen_EventScript_160ABC:: @ 8160ABC - loadword 0, gUnknown_8173429 - callstd 2 - end + loadword 0, gUnknown_8173429 + callstd 2 + end SSAnne_Kitchen_EventScript_160AC5:: @ 8160AC5 - loadword 0, gUnknown_8173462 - callstd 2 - end + loadword 0, gUnknown_8173462 + callstd 2 + end SSAnne_Kitchen_EventScript_160ACE:: @ 8160ACE - lock - faceplayer - loadword 0, gUnknown_8173570 - callstd 4 - random 3 - copyvar VAR_0x8008, VAR_RESULT - compare_var_to_value VAR_0x8008, 0 - call_if 1, EventScript_160B03 - compare_var_to_value VAR_0x8008, 1 - call_if 1, EventScript_160B0C - compare_var_to_value VAR_0x8008, 2 - call_if 1, EventScript_160B15 - release - end + lock + faceplayer + loadword 0, gUnknown_8173570 + callstd 4 + random 3 + copyvar VAR_0x8008, VAR_RESULT + compare_var_to_value VAR_0x8008, 0 + call_if 1, EventScript_160B03 + compare_var_to_value VAR_0x8008, 1 + call_if 1, EventScript_160B0C + compare_var_to_value VAR_0x8008, 2 + call_if 1, EventScript_160B15 + release + end EventScript_160B03:: @ 8160B03 - loadword 0, gUnknown_817359F - callstd 4 - return + loadword 0, gUnknown_817359F + callstd 4 + return EventScript_160B0C:: @ 8160B0C - loadword 0, gUnknown_81735DF - callstd 4 - return + loadword 0, gUnknown_81735DF + callstd 4 + return EventScript_160B15:: @ 8160B15 - loadword 0, gUnknown_8173611 - callstd 4 - return + loadword 0, gUnknown_8173611 + callstd 4 + return SSAnne_Kitchen_EventScript_160B1E:: @ 8160B1E - loadword 0, gUnknown_81734A0 - callstd 2 - end + loadword 0, gUnknown_81734A0 + callstd 2 + end SSAnne_Kitchen_EventScript_160B27:: @ 8160B27 - loadword 0, gUnknown_81734D3 - callstd 2 - end + loadword 0, gUnknown_81734D3 + callstd 2 + end SSAnne_Kitchen_EventScript_160B30:: @ 8160B30 - loadword 0, gUnknown_817353E - callstd 2 - end + loadword 0, gUnknown_817353E + callstd 2 + end diff --git a/data/maps/SafariZone_Building1/scripts.inc b/data/maps/SafariZone_Building1/scripts.inc index 03f5b8b68..3baad36cb 100644 --- a/data/maps/SafariZone_Building1/scripts.inc +++ b/data/maps/SafariZone_Building1/scripts.inc @@ -1,12 +1,12 @@ SafariZone_Building1_MapScripts:: @ 81623EB - .byte 0 + .byte 0 SafariZone_Building1_EventScript_1623EC:: @ 81623EC - loadword 0, gUnknown_8177A5A - callstd 2 - end + loadword 0, gUnknown_8177A5A + callstd 2 + end SafariZone_Building1_EventScript_1623F5:: @ 81623F5 - loadword 0, gUnknown_8177A82 - callstd 2 - end + loadword 0, gUnknown_8177A82 + callstd 2 + end diff --git a/data/maps/SafariZone_Building2/scripts.inc b/data/maps/SafariZone_Building2/scripts.inc index 55e12e864..37246f3c3 100644 --- a/data/maps/SafariZone_Building2/scripts.inc +++ b/data/maps/SafariZone_Building2/scripts.inc @@ -1,17 +1,17 @@ SafariZone_Building2_MapScripts:: @ 81623FE - .byte 0 + .byte 0 SafariZone_Building2_EventScript_1623FF:: @ 81623FF - loadword 0, gUnknown_8177AE2 - callstd 2 - end + loadword 0, gUnknown_8177AE2 + callstd 2 + end SafariZone_Building2_EventScript_162408:: @ 8162408 - loadword 0, gUnknown_8177AAE - callstd 2 - end + loadword 0, gUnknown_8177AAE + callstd 2 + end SafariZone_Building2_EventScript_162411:: @ 8162411 - loadword 0, gUnknown_8177B16 - callstd 2 - end + loadword 0, gUnknown_8177B16 + callstd 2 + end diff --git a/data/maps/SafariZone_Building3/scripts.inc b/data/maps/SafariZone_Building3/scripts.inc index 1a3832fd4..a4805b1ca 100644 --- a/data/maps/SafariZone_Building3/scripts.inc +++ b/data/maps/SafariZone_Building3/scripts.inc @@ -1,17 +1,17 @@ SafariZone_Building3_MapScripts:: @ 816241A - .byte 0 + .byte 0 SafariZone_Building3_EventScript_16241B:: @ 816241B - loadword 0, gUnknown_8177BAB - callstd 2 - end + loadword 0, gUnknown_8177BAB + callstd 2 + end SafariZone_Building3_EventScript_162424:: @ 8162424 - loadword 0, gUnknown_8177B38 - callstd 2 - end + loadword 0, gUnknown_8177B38 + callstd 2 + end SafariZone_Building3_EventScript_16242D:: @ 816242D - loadword 0, gUnknown_8177BEC - callstd 2 - end + loadword 0, gUnknown_8177BEC + callstd 2 + end diff --git a/data/maps/SafariZone_Building4/scripts.inc b/data/maps/SafariZone_Building4/scripts.inc index 2b6aec4b6..ac81fffed 100644 --- a/data/maps/SafariZone_Building4/scripts.inc +++ b/data/maps/SafariZone_Building4/scripts.inc @@ -1,17 +1,17 @@ SafariZone_Building4_MapScripts:: @ 8162436 - .byte 0 + .byte 0 SafariZone_Building4_EventScript_162437:: @ 8162437 - loadword 0, gUnknown_8177D39 - callstd 2 - end + loadword 0, gUnknown_8177D39 + callstd 2 + end SafariZone_Building4_EventScript_162440:: @ 8162440 - loadword 0, gUnknown_8177CEB - callstd 2 - end + loadword 0, gUnknown_8177CEB + callstd 2 + end SafariZone_Building4_EventScript_162449:: @ 8162449 - loadword 0, gUnknown_8177D8B - callstd 2 - end + loadword 0, gUnknown_8177D8B + callstd 2 + end diff --git a/data/maps/SafariZone_Center/scripts.inc b/data/maps/SafariZone_Center/scripts.inc index 9a869247c..81a43a227 100644 --- a/data/maps/SafariZone_Center/scripts.inc +++ b/data/maps/SafariZone_Center/scripts.inc @@ -1,22 +1,22 @@ SafariZone_Center_MapScripts:: @ 8162357 - map_script 3, SafariZone_Center_MapScript1_16235D - .byte 0 + map_script 3, SafariZone_Center_MapScript1_16235D + .byte 0 SafariZone_Center_MapScript1_16235D:: @ 816235D - setworldmapflag 2222 - end + setworldmapflag 2222 + end SafariZone_Center_EventScript_162361:: @ 8162361 - loadword 0, gUnknown_81777F2 - callstd 3 - end + loadword 0, gUnknown_81777F2 + callstd 3 + end SafariZone_Center_EventScript_16236A:: @ 816236A - loadword 0, gUnknown_81777FD - callstd 3 - end + loadword 0, gUnknown_81777FD + callstd 3 + end SafariZone_Center_EventScript_162373:: @ 8162373 - loadword 0, gUnknown_817782F - callstd 3 - end + loadword 0, gUnknown_817782F + callstd 3 + end diff --git a/data/maps/SafariZone_East/scripts.inc b/data/maps/SafariZone_East/scripts.inc index 8c4edfe07..a53570491 100644 --- a/data/maps/SafariZone_East/scripts.inc +++ b/data/maps/SafariZone_East/scripts.inc @@ -1,17 +1,17 @@ SafariZone_East_MapScripts:: @ 816237C - .byte 0 + .byte 0 SafariZone_East_EventScript_16237D:: @ 816237D - loadword 0, gUnknown_817783B - callstd 3 - end + loadword 0, gUnknown_817783B + callstd 3 + end SafariZone_East_EventScript_162386:: @ 8162386 - loadword 0, gUnknown_8177846 - callstd 3 - end + loadword 0, gUnknown_8177846 + callstd 3 + end SafariZone_East_EventScript_16238F:: @ 816238F - loadword 0, gUnknown_8177884 - callstd 3 - end + loadword 0, gUnknown_8177884 + callstd 3 + end diff --git a/data/maps/SafariZone_North/scripts.inc b/data/maps/SafariZone_North/scripts.inc index d507c330b..8db400bed 100644 --- a/data/maps/SafariZone_North/scripts.inc +++ b/data/maps/SafariZone_North/scripts.inc @@ -1,27 +1,27 @@ SafariZone_North_MapScripts:: @ 8162398 - .byte 0 + .byte 0 SafariZone_North_EventScript_162399:: @ 8162399 - loadword 0, gUnknown_817789D - callstd 3 - end + loadword 0, gUnknown_817789D + callstd 3 + end SafariZone_North_EventScript_1623A2:: @ 81623A2 - loadword 0, gUnknown_81778A8 - callstd 3 - end + loadword 0, gUnknown_81778A8 + callstd 3 + end SafariZone_North_EventScript_1623AB:: @ 81623AB - loadword 0, gUnknown_81778D6 - callstd 3 - end + loadword 0, gUnknown_81778D6 + callstd 3 + end SafariZone_North_EventScript_1623B4:: @ 81623B4 - loadword 0, gUnknown_81778DD - callstd 3 - end + loadword 0, gUnknown_81778DD + callstd 3 + end SafariZone_North_EventScript_1623BD:: @ 81623BD - loadword 0, gUnknown_8177935 - callstd 3 - end + loadword 0, gUnknown_8177935 + callstd 3 + end diff --git a/data/maps/SafariZone_SecretHouse/scripts.inc b/data/maps/SafariZone_SecretHouse/scripts.inc index 3be84b145..5421aa298 100644 --- a/data/maps/SafariZone_SecretHouse/scripts.inc +++ b/data/maps/SafariZone_SecretHouse/scripts.inc @@ -1,36 +1,36 @@ SafariZone_SecretHouse_MapScripts:: @ 8162452 - .byte 0 + .byte 0 SafariZone_SecretHouse_EventScript_162453:: @ 8162453 - lock - faceplayer - checkflag FLAG_0x239 - goto_if 1, EventScript_1624A9 - loadword 0, gUnknown_8177DC1 - callstd 4 - checkitemspace ITEM_HM03, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16249F - additem ITEM_HM03, 1 - loadword 0, gUnknown_8177E92 - setorcopyvar VAR_0x8000, 341 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 257 - callstd 9 - loadword 0, gUnknown_8177EB7 - callstd 4 - setflag FLAG_0x239 - release - end + lock + faceplayer + checkflag FLAG_0x239 + goto_if 1, EventScript_1624A9 + loadword 0, gUnknown_8177DC1 + callstd 4 + checkitemspace ITEM_HM03, 1 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16249F + additem ITEM_HM03, 1 + loadword 0, gUnknown_8177E92 + setorcopyvar VAR_0x8000, 341 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 257 + callstd 9 + loadword 0, gUnknown_8177EB7 + callstd 4 + setflag FLAG_0x239 + release + end EventScript_16249F:: @ 816249F - loadword 0, gUnknown_8177F72 - callstd 4 - release - end + loadword 0, gUnknown_8177F72 + callstd 4 + release + end EventScript_1624A9:: @ 81624A9 - loadword 0, gUnknown_8177EB7 - callstd 4 - release - end + loadword 0, gUnknown_8177EB7 + callstd 4 + release + end diff --git a/data/maps/SafariZone_West/scripts.inc b/data/maps/SafariZone_West/scripts.inc index c4a42268c..fd8696508 100644 --- a/data/maps/SafariZone_West/scripts.inc +++ b/data/maps/SafariZone_West/scripts.inc @@ -1,22 +1,22 @@ SafariZone_West_MapScripts:: @ 81623C6 - .byte 0 + .byte 0 SafariZone_West_EventScript_1623C7:: @ 81623C7 - loadword 0, gUnknown_817796E - callstd 3 - end + loadword 0, gUnknown_817796E + callstd 3 + end SafariZone_West_EventScript_1623D0:: @ 81623D0 - loadword 0, gUnknown_8177979 - callstd 3 - end + loadword 0, gUnknown_8177979 + callstd 3 + end SafariZone_West_EventScript_1623D9:: @ 81623D9 - loadword 0, gUnknown_81779F8 - callstd 3 - end + loadword 0, gUnknown_81779F8 + callstd 3 + end SafariZone_West_EventScript_1623E2:: @ 81623E2 - loadword 0, gUnknown_8177A41 - callstd 3 - end + loadword 0, gUnknown_8177A41 + callstd 3 + end diff --git a/data/maps/SaffronCity/scripts.inc b/data/maps/SaffronCity/scripts.inc index 4b90fa5b3..0b3469775 100644 --- a/data/maps/SaffronCity/scripts.inc +++ b/data/maps/SaffronCity/scripts.inc @@ -1,2 +1,2 @@ SaffronCity_MapScripts:: @ 8167483 - .byte 0 + .byte 0 diff --git a/data/maps/SaffronCity_Dojo/scripts.inc b/data/maps/SaffronCity_Dojo/scripts.inc index f9a91069d..a84a444af 100644 --- a/data/maps/SaffronCity_Dojo/scripts.inc +++ b/data/maps/SaffronCity_Dojo/scripts.inc @@ -1,174 +1,174 @@ SaffronCity_Dojo_MapScripts:: @ 816EBDB - .byte 0 + .byte 0 SaffronCity_Dojo_EventScript_16EBDC:: @ 816EBDC - lockall - setvar VAR_0x4081, 1 - applymovement 5, Movement_1A75E7 - waitmovement 0 - releaseall - end + lockall + setvar VAR_0x4081, 1 + applymovement 5, Movement_1A75E7 + waitmovement 0 + releaseall + end SaffronCity_Dojo_EventScript_16EBEE:: @ 816EBEE - lockall - setvar VAR_0x4081, 1 - applymovement 5, Movement_1A75EB - waitmovement 0 - releaseall - end + lockall + setvar VAR_0x4081, 1 + applymovement 5, Movement_1A75EB + waitmovement 0 + releaseall + end SaffronCity_Dojo_EventScript_16EC00:: @ 816EC00 - lock - faceplayer - checkflag FLAG_0x278 - goto_if 1, EventScript_16EC3C - drawmonpic SPECIES_HITMONLEE, 10, 3 - setvar VAR_0x4001, 106 - applymovement 5, Movement_1A75E9 - waitmovement 0 - textcolor 0 - loadword 0, gUnknown_819B44E - callstd 5 - call EventScript_1A6675 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16EC82 - erasemonpic - release - end + lock + faceplayer + checkflag FLAG_0x278 + goto_if 1, EventScript_16EC3C + drawmonpic SPECIES_HITMONLEE, 10, 3 + setvar VAR_0x4001, 106 + applymovement 5, Movement_1A75E9 + waitmovement 0 + textcolor 0 + loadword 0, gUnknown_819B44E + callstd 5 + call EventScript_1A6675 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16EC82 + erasemonpic + release + end EventScript_16EC3C:: @ 816EC3C - loadword 0, gUnknown_819B4E1 - callstd 4 - release - end + loadword 0, gUnknown_819B4E1 + callstd 4 + release + end SaffronCity_Dojo_EventScript_16EC46:: @ 816EC46 - lock - faceplayer - checkflag FLAG_0x278 - goto_if 1, EventScript_16EC3C - drawmonpic SPECIES_HITMONCHAN, 10, 3 - setvar VAR_0x4001, 107 - applymovement 5, Movement_1A75E9 - waitmovement 0 - textcolor 0 - loadword 0, gUnknown_819B49E - callstd 5 - call EventScript_1A6675 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16EC82 - erasemonpic - release - end + lock + faceplayer + checkflag FLAG_0x278 + goto_if 1, EventScript_16EC3C + drawmonpic SPECIES_HITMONCHAN, 10, 3 + setvar VAR_0x4001, 107 + applymovement 5, Movement_1A75E9 + waitmovement 0 + textcolor 0 + loadword 0, gUnknown_819B49E + callstd 5 + call EventScript_1A6675 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16EC82 + erasemonpic + release + end EventScript_16EC82:: @ 816EC82 - erasemonpic - givemon 16385, 25, ITEM_NONE, 0, 0, 0 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16ECB5 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16ECEC - compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A927C - release - end + erasemonpic + givemon 16385, 25, ITEM_NONE, 0, 0, 0 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16ECB5 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16ECEC + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A927C + release + end EventScript_16ECB5:: @ 816ECB5 - removeobject VAR_LAST_TALKED - getspeciesname 0, 16385 - playfanfare MUS_FANFA1 - message Text_19B473 - waitmessage - waitfanfare - setflag FLAG_0x278 - loadword 0, gUnknown_81A56A7 - callstd 5 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16ED29 - call EventScript_1A8C27 - call EventScript_1A74EB - goto EventScript_16ED29 - end + removeobject VAR_LAST_TALKED + getspeciesname 0, 16385 + playfanfare MUS_FANFA1 + message Text_19B473 + waitmessage + waitfanfare + setflag FLAG_0x278 + loadword 0, gUnknown_81A56A7 + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16ED29 + call EventScript_1A8C27 + call EventScript_1A74EB + goto EventScript_16ED29 + end EventScript_16ECEC:: @ 816ECEC - removeobject VAR_LAST_TALKED - getspeciesname 0, 16385 - playfanfare MUS_FANFA1 - message Text_19B473 - waitmessage - waitfanfare - setflag FLAG_0x278 - loadword 0, gUnknown_81A56A7 - callstd 5 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16ED1E - call EventScript_1A8C33 - goto EventScript_16ED1E - end + removeobject VAR_LAST_TALKED + getspeciesname 0, 16385 + playfanfare MUS_FANFA1 + message Text_19B473 + waitmessage + waitfanfare + setflag FLAG_0x278 + loadword 0, gUnknown_81A56A7 + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16ED1E + call EventScript_1A8C33 + goto EventScript_16ED1E + end EventScript_16ED1E:: @ 816ED1E - call EventScript_1A8C3C - goto EventScript_16ED29 - end + call EventScript_1A8C3C + goto EventScript_16ED29 + end EventScript_16ED29:: @ 816ED29 - release - end + release + end SaffronCity_Dojo_EventScript_16ED2B:: @ 816ED2B - loadword 0, gUnknown_819B52E - callstd 3 - end + loadword 0, gUnknown_819B52E + callstd 3 + end SaffronCity_Dojo_EventScript_16ED34:: @ 816ED34 - loadword 0, gUnknown_819B4F8 - callstd 3 - end + loadword 0, gUnknown_819B4F8 + callstd 3 + end SaffronCity_Dojo_EventScript_16ED3D:: @ 816ED3D - loadword 0, gUnknown_819B50F - callstd 3 - end + loadword 0, gUnknown_819B50F + callstd 3 + end SaffronCity_Dojo_EventScript_16ED46:: @ 816ED46 - trainerbattle 0, 321, 0, Text_19B3DF, Text_19B40F - loadword 0, gUnknown_819B41F - callstd 6 - end + trainerbattle 0, 321, 0, Text_19B3DF, Text_19B40F + loadword 0, gUnknown_819B41F + callstd 6 + end SaffronCity_Dojo_EventScript_16ED5D:: @ 816ED5D - trainerbattle 0, 319, 0, Text_19B2E0, Text_19B2FD - loadword 0, gUnknown_819B30F - callstd 6 - end + trainerbattle 0, 319, 0, Text_19B2E0, Text_19B2FD + loadword 0, gUnknown_819B30F + callstd 6 + end SaffronCity_Dojo_EventScript_16ED74:: @ 816ED74 - trainerbattle 0, 320, 0, Text_19B341, Text_19B396 - loadword 0, gUnknown_819B3AC - callstd 6 - end + trainerbattle 0, 320, 0, Text_19B341, Text_19B396 + loadword 0, gUnknown_819B3AC + callstd 6 + end SaffronCity_Dojo_EventScript_16ED8B:: @ 816ED8B - trainerbattle 0, 318, 0, Text_19B275, Text_19B292 - loadword 0, gUnknown_819B29D - callstd 6 - end + trainerbattle 0, 318, 0, Text_19B275, Text_19B292 + loadword 0, gUnknown_819B29D + callstd 6 + end SaffronCity_Dojo_EventScript_16EDA2:: @ 816EDA2 - trainerbattle 2, 317, 0, Text_19B12C, Text_19B193, EventScript_16EDD0 - checkflag FLAG_0x278 - goto_if 1, EventScript_16EDC6 - loadword 0, gUnknown_819B1A7 - callstd 6 - end + trainerbattle 2, 317, 0, Text_19B12C, Text_19B193, EventScript_16EDD0 + checkflag FLAG_0x278 + goto_if 1, EventScript_16EDC6 + loadword 0, gUnknown_819B1A7 + callstd 6 + end EventScript_16EDC6:: @ 816EDC6 - loadword 0, gUnknown_819B24C - callstd 4 - release - end + loadword 0, gUnknown_819B24C + callstd 4 + release + end EventScript_16EDD0:: @ 816EDD0 - setvar VAR_0x4081, 1 - release - end + setvar VAR_0x4081, 1 + release + end diff --git a/data/maps/SaffronCity_Duplicate/scripts.inc b/data/maps/SaffronCity_Duplicate/scripts.inc index 70dface9b..cba838bed 100644 --- a/data/maps/SaffronCity_Duplicate/scripts.inc +++ b/data/maps/SaffronCity_Duplicate/scripts.inc @@ -1,152 +1,152 @@ SaffronCity_Duplicate_MapScripts:: @ 816735F - map_script 3, SaffronCity_Duplicate_MapScript1_167365 - .byte 0 + map_script 3, SaffronCity_Duplicate_MapScript1_167365 + .byte 0 SaffronCity_Duplicate_MapScript1_167365:: @ 8167365 - setworldmapflag 2202 - checkflag FLAG_0x23C - call_if 0, EventScript_167372 - end + setworldmapflag 2202 + checkflag FLAG_0x23C + call_if 0, EventScript_167372 + end EventScript_167372:: @ 8167372 - setobjectxyperm 6, 33, 31 - return + setobjectxyperm 6, 33, 31 + return SaffronCity_Duplicate_EventScript_16737A:: @ 816737A - loadword 0, gUnknown_8181003 - callstd 2 - end + loadword 0, gUnknown_8181003 + callstd 2 + end SaffronCity_Duplicate_EventScript_167383:: @ 8167383 - loadword 0, gUnknown_818101F - callstd 2 - end + loadword 0, gUnknown_818101F + callstd 2 + end SaffronCity_Duplicate_EventScript_16738C:: @ 816738C - loadword 0, gUnknown_818105A - callstd 2 - end + loadword 0, gUnknown_818105A + callstd 2 + end SaffronCity_Duplicate_EventScript_167395:: @ 8167395 - loadword 0, gUnknown_8181087 - callstd 2 - end + loadword 0, gUnknown_8181087 + callstd 2 + end SaffronCity_Duplicate_EventScript_16739E:: @ 816739E - loadword 0, gUnknown_81810A7 - callstd 2 - end + loadword 0, gUnknown_81810A7 + callstd 2 + end SaffronCity_Duplicate_EventScript_1673A7:: @ 81673A7 - loadword 0, gUnknown_81810D5 - callstd 2 - end + loadword 0, gUnknown_81810D5 + callstd 2 + end SaffronCity_Duplicate_EventScript_1673B0:: @ 81673B0 - loadword 0, gUnknown_81810F5 - callstd 2 - end + loadword 0, gUnknown_81810F5 + callstd 2 + end SaffronCity_Duplicate_EventScript_1673B9:: @ 81673B9 - lock - checkflag FLAG_0x23C - goto_if 1, EventScript_1673D7 - applymovement 6, Movement_1A75E1 - waitmovement 0 - loadword 0, gUnknown_81812CA - callstd 4 - release - end + lock + checkflag FLAG_0x23C + goto_if 1, EventScript_1673D7 + applymovement 6, Movement_1A75E1 + waitmovement 0 + loadword 0, gUnknown_81812CA + callstd 4 + release + end EventScript_1673D7:: @ 81673D7 - textcolor 3 - loadword 0, gUnknown_8181302 - callstd 4 - release - end + textcolor 3 + loadword 0, gUnknown_8181302 + callstd 4 + release + end SaffronCity_Duplicate_EventScript_1673E3:: @ 81673E3 - loadword 0, gUnknown_8181159 - callstd 2 - end + loadword 0, gUnknown_8181159 + callstd 2 + end SaffronCity_Duplicate_EventScript_1673EC:: @ 81673EC - loadword 0, gUnknown_8181189 - callstd 2 - end + loadword 0, gUnknown_8181189 + callstd 2 + end SaffronCity_Duplicate_EventScript_1673F5:: @ 81673F5 - loadword 0, gUnknown_81811BF - callstd 2 - end + loadword 0, gUnknown_81811BF + callstd 2 + end SaffronCity_Duplicate_EventScript_1673FE:: @ 81673FE - loadword 0, gUnknown_8181225 - callstd 2 - end + loadword 0, gUnknown_8181225 + callstd 2 + end SaffronCity_Duplicate_EventScript_167407:: @ 8167407 - lock - faceplayer - waitse - playmoncry SPECIES_PIDGEOT, 0 - loadword 0, gUnknown_8181286 - callstd 4 - waitmoncry - release - end + lock + faceplayer + waitse + playmoncry SPECIES_PIDGEOT, 0 + loadword 0, gUnknown_8181286 + callstd 4 + waitmoncry + release + end SaffronCity_Duplicate_EventScript_16741A:: @ 816741A - loadword 0, gUnknown_8181299 - callstd 2 - end + loadword 0, gUnknown_8181299 + callstd 2 + end SaffronCity_Duplicate_EventScript_167423:: @ 8167423 - loadword 0, gUnknown_8181326 - callstd 3 - end + loadword 0, gUnknown_8181326 + callstd 3 + end SaffronCity_Duplicate_EventScript_16742C:: @ 816742C - loadword 0, gUnknown_8181354 - callstd 3 - end + loadword 0, gUnknown_8181354 + callstd 3 + end SaffronCity_Duplicate_EventScript_167435:: @ 8167435 - lockall - setvar VAR_0x8004, 7 - setvar VAR_0x8005, 0 - special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_8181362 - callstd 4 - releaseall - end + lockall + setvar VAR_0x8004, 7 + setvar VAR_0x8005, 0 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_8181362 + callstd 4 + releaseall + end SaffronCity_Duplicate_EventScript_16744D:: @ 816744D - loadword 0, gUnknown_81813AA - callstd 3 - end + loadword 0, gUnknown_81813AA + callstd 3 + end SaffronCity_Duplicate_EventScript_167456:: @ 8167456 - loadword 0, gUnknown_8181452 - callstd 3 - end + loadword 0, gUnknown_8181452 + callstd 3 + end SaffronCity_Duplicate_EventScript_16745F:: @ 816745F - loadword 0, gUnknown_81814B9 - callstd 3 - end + loadword 0, gUnknown_81814B9 + callstd 3 + end SaffronCity_Duplicate_EventScript_167468:: @ 8167468 - loadword 0, gUnknown_81814D3 - callstd 3 - end + loadword 0, gUnknown_81814D3 + callstd 3 + end SaffronCity_Duplicate_EventScript_167471:: @ 8167471 - loadword 0, gUnknown_81814E7 - callstd 3 - end + loadword 0, gUnknown_81814E7 + callstd 3 + end SaffronCity_Duplicate_EventScript_16747A:: @ 816747A - loadword 0, gUnknown_8181519 - callstd 3 - end + loadword 0, gUnknown_8181519 + callstd 3 + end diff --git a/data/maps/SaffronCity_Gym/scripts.inc b/data/maps/SaffronCity_Gym/scripts.inc index bb101e266..3fefa622e 100644 --- a/data/maps/SaffronCity_Gym/scripts.inc +++ b/data/maps/SaffronCity_Gym/scripts.inc @@ -1,129 +1,129 @@ SaffronCity_Gym_MapScripts:: @ 816EDD7 - .byte 0 + .byte 0 SaffronCity_Gym_EventScript_16EDD8:: @ 816EDD8 - setvar VAR_0x8004, 7 - setvar VAR_0x8005, 2 - special UpdatePickStateFromSpecialVar8005 - trainerbattle 1, 420, 0, Text_19B53C, Text_19B602, EventScript_16EE0A - checkflag FLAG_0x29A - goto_if 0, EventScript_16EE3D - loadword 0, gUnknown_819B7F2 - callstd 4 - release - end + setvar VAR_0x8004, 7 + setvar VAR_0x8005, 2 + special UpdatePickStateFromSpecialVar8005 + trainerbattle 1, 420, 0, Text_19B53C, Text_19B602, EventScript_16EE0A + checkflag FLAG_0x29A + goto_if 0, EventScript_16EE3D + loadword 0, gUnknown_819B7F2 + callstd 4 + release + end EventScript_16EE0A:: @ 816EE0A - setvar VAR_0x8004, 7 - setvar VAR_0x8005, 2 - special SetFlavorTextFlagFromSpecialVars - setvar VAR_0x8004, 7 - setvar VAR_0x8005, 3 - special SetFlavorTextFlagFromSpecialVars - clearflag FLAG_0x0AE - setflag FLAG_0x4B5 - setflag 2085 - setvar VAR_0x8008, 6 - call EventScript_1A6B18 - goto EventScript_16EE3D - end + setvar VAR_0x8004, 7 + setvar VAR_0x8005, 2 + special SetFlavorTextFlagFromSpecialVars + setvar VAR_0x8004, 7 + setvar VAR_0x8005, 3 + special SetFlavorTextFlagFromSpecialVars + clearflag FLAG_0x0AE + setflag FLAG_0x4B5 + setflag 2085 + setvar VAR_0x8008, 6 + call EventScript_1A6B18 + goto EventScript_16EE3D + end EventScript_16EE3D:: @ 816EE3D - loadword 0, gUnknown_819B6FA - callstd 4 - checkitemspace ITEM_TM04, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16EE7E - additem ITEM_TM04, 1 - loadword 0, gUnknown_819B7D3 - setorcopyvar VAR_0x8000, 292 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 257 - callstd 9 - setflag FLAG_0x29A - loadword 0, gUnknown_819B685 - callstd 4 - release - end + loadword 0, gUnknown_819B6FA + callstd 4 + checkitemspace ITEM_TM04, 1 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16EE7E + additem ITEM_TM04, 1 + loadword 0, gUnknown_819B7D3 + setorcopyvar VAR_0x8000, 292 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 257 + callstd 9 + setflag FLAG_0x29A + loadword 0, gUnknown_819B685 + callstd 4 + release + end EventScript_16EE7E:: @ 816EE7E - loadword 0, gUnknown_819B849 - callstd 4 - release - end + loadword 0, gUnknown_819B849 + callstd 4 + release + end SaffronCity_Gym_EventScript_16EE88:: @ 816EE88 - trainerbattle 0, 280, 0, Text_19B936, Text_19B957 - loadword 0, gUnknown_819B96D - callstd 6 - end + trainerbattle 0, 280, 0, Text_19B936, Text_19B957 + loadword 0, gUnknown_819B96D + callstd 6 + end SaffronCity_Gym_EventScript_16EE9F:: @ 816EE9F - trainerbattle 0, 281, 0, Text_19BA45, Text_19BA9E - setvar VAR_0x8004, 7 - setvar VAR_0x8005, 5 - special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_819BAB4 - callstd 6 - end + trainerbattle 0, 281, 0, Text_19BA45, Text_19BA9E + setvar VAR_0x8004, 7 + setvar VAR_0x8005, 5 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_819BAB4 + callstd 6 + end SaffronCity_Gym_EventScript_16EEC3:: @ 816EEC3 - trainerbattle 0, 282, 0, Text_19BB49, Text_19BBA1 - loadword 0, gUnknown_819BBB3 - callstd 6 - end + trainerbattle 0, 282, 0, Text_19BB49, Text_19BBA1 + loadword 0, gUnknown_819BBB3 + callstd 6 + end SaffronCity_Gym_EventScript_16EEDA:: @ 816EEDA - trainerbattle 0, 283, 0, Text_19BC57, Text_19BCBC - loadword 0, gUnknown_819BCC4 - callstd 6 - end + trainerbattle 0, 283, 0, Text_19BC57, Text_19BCBC + loadword 0, gUnknown_819BCC4 + callstd 6 + end SaffronCity_Gym_EventScript_16EEF1:: @ 816EEF1 - trainerbattle 0, 462, 0, Text_19B86A, Text_19B8A8 - loadword 0, gUnknown_819B8B9 - callstd 6 - end + trainerbattle 0, 462, 0, Text_19B86A, Text_19B8A8 + loadword 0, gUnknown_819B8B9 + callstd 6 + end SaffronCity_Gym_EventScript_16EF08:: @ 816EF08 - trainerbattle 0, 463, 0, Text_19B998, Text_19B9EC - loadword 0, gUnknown_819B9F7 - callstd 6 - end + trainerbattle 0, 463, 0, Text_19B998, Text_19B9EC + loadword 0, gUnknown_819B9F7 + callstd 6 + end SaffronCity_Gym_EventScript_16EF1F:: @ 816EF1F - trainerbattle 0, 464, 0, Text_19BAE8, Text_19BB0D - loadword 0, gUnknown_819BB1F - callstd 6 - end + trainerbattle 0, 464, 0, Text_19BAE8, Text_19BB0D + loadword 0, gUnknown_819BB1F + callstd 6 + end SaffronCity_Gym_EventScript_16EF36:: @ 816EF36 - lock - faceplayer - checkflag FLAG_0x4B5 - goto_if 1, EventScript_16EF4B - loadword 0, gUnknown_819BCF6 - callstd 4 - release - end + lock + faceplayer + checkflag FLAG_0x4B5 + goto_if 1, EventScript_16EF4B + loadword 0, gUnknown_819BCF6 + callstd 4 + release + end EventScript_16EF4B:: @ 816EF4B - loadword 0, gUnknown_819BDBB - callstd 4 - release - end + loadword 0, gUnknown_819BDBB + callstd 4 + release + end SaffronCity_Gym_EventScript_16EF55:: @ 816EF55 - lockall - checkflag 2085 - goto_if 1, EventScript_16EF69 - loadword 0, gUnknown_819BDFE - callstd 4 - releaseall - end + lockall + checkflag 2085 + goto_if 1, EventScript_16EF69 + loadword 0, gUnknown_819BDFE + callstd 4 + releaseall + end EventScript_16EF69:: @ 816EF69 - loadword 0, gUnknown_819BE37 - callstd 4 - releaseall - end + loadword 0, gUnknown_819BE37 + callstd 4 + releaseall + end diff --git a/data/maps/SaffronCity_House1_1F/scripts.inc b/data/maps/SaffronCity_House1_1F/scripts.inc index 2f788d241..a09d221ab 100644 --- a/data/maps/SaffronCity_House1_1F/scripts.inc +++ b/data/maps/SaffronCity_House1_1F/scripts.inc @@ -1,23 +1,23 @@ SaffronCity_House1_1F_MapScripts:: @ 816EB36 - .byte 0 + .byte 0 SaffronCity_House1_1F_EventScript_16EB37:: @ 816EB37 - loadword 0, gUnknown_819AB9B - callstd 2 - end + loadword 0, gUnknown_819AB9B + callstd 2 + end SaffronCity_House1_1F_EventScript_16EB40:: @ 816EB40 - loadword 0, gUnknown_819ABD7 - callstd 2 - end + loadword 0, gUnknown_819ABD7 + callstd 2 + end SaffronCity_House1_1F_EventScript_16EB49:: @ 816EB49 - lock - faceplayer - waitse - playmoncry SPECIES_CHANSEY, 0 - loadword 0, gUnknown_819AC4B - callstd 4 - waitmoncry - release - end + lock + faceplayer + waitse + playmoncry SPECIES_CHANSEY, 0 + loadword 0, gUnknown_819AC4B + callstd 4 + waitmoncry + release + end diff --git a/data/maps/SaffronCity_House1_2F/scripts.inc b/data/maps/SaffronCity_House1_2F/scripts.inc index 5923bd693..cdf94c6f9 100644 --- a/data/maps/SaffronCity_House1_2F/scripts.inc +++ b/data/maps/SaffronCity_House1_2F/scripts.inc @@ -1,58 +1,58 @@ SaffronCity_House1_2F_MapScripts:: @ 816EB5C - .byte 0 + .byte 0 SaffronCity_House1_2F_EventScript_16EB5D:: @ 816EB5D - lock - faceplayer - waitse - playmoncry SPECIES_DODUO, 0 - loadword 0, gUnknown_819B030 - callstd 4 - waitmoncry - release - end + lock + faceplayer + waitse + playmoncry SPECIES_DODUO, 0 + loadword 0, gUnknown_819B030 + callstd 4 + waitmoncry + release + end SaffronCity_House1_2F_EventScript_16EB70:: @ 816EB70 - lock - loadword 0, gUnknown_819B071 - callstd 4 - release - end + lock + loadword 0, gUnknown_819B071 + callstd 4 + release + end SaffronCity_House1_2F_EventScript_16EB7B:: @ 816EB7B - special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 - special sub_8112364 - lock - faceplayer - checkitem ITEM_POKE_DOLL, 1 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1C4CF6 - checkplayergender - compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_16EBB7 - compare_var_to_value VAR_RESULT, 1 - call_if 1, EventScript_16EBC0 - release - end + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + special sub_8112364 + lock + faceplayer + checkitem ITEM_POKE_DOLL, 1 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_1C4CF6 + checkplayergender + compare_var_to_value VAR_RESULT, 0 + call_if 1, EventScript_16EBB7 + compare_var_to_value VAR_RESULT, 1 + call_if 1, EventScript_16EBC0 + release + end EventScript_16EBB7:: @ 816EBB7 - loadword 0, gUnknown_819AC60 - callstd 4 - return + loadword 0, gUnknown_819AC60 + callstd 4 + return EventScript_16EBC0:: @ 816EBC0 - loadword 0, gUnknown_819ACF1 - callstd 4 - return + loadword 0, gUnknown_819ACF1 + callstd 4 + return SaffronCity_House1_2F_EventScript_16EBC9:: @ 816EBC9 - loadword 0, gUnknown_819B0D0 - callstd 3 - end + loadword 0, gUnknown_819B0D0 + callstd 3 + end SaffronCity_House1_2F_EventScript_16EBD2:: @ 816EBD2 - loadword 0, gUnknown_819B0A0 - callstd 3 - end + loadword 0, gUnknown_819B0A0 + callstd 3 + end diff --git a/data/maps/SaffronCity_House2/scripts.inc b/data/maps/SaffronCity_House2/scripts.inc index ed38659ee..d9a06746e 100644 --- a/data/maps/SaffronCity_House2/scripts.inc +++ b/data/maps/SaffronCity_House2/scripts.inc @@ -1,28 +1,28 @@ SaffronCity_House2_MapScripts:: @ 816EF73 - .byte 0 + .byte 0 SaffronCity_House2_EventScript_16EF74:: @ 816EF74 - loadword 0, gUnknown_819BE74 - callstd 2 - end + loadword 0, gUnknown_819BE74 + callstd 2 + end SaffronCity_House2_EventScript_16EF7D:: @ 816EF7D - loadword 0, gUnknown_819BED5 - callstd 2 - end + loadword 0, gUnknown_819BED5 + callstd 2 + end SaffronCity_House2_EventScript_16EF86:: @ 816EF86 - lock - faceplayer - waitse - playmoncry SPECIES_PIDGEY, 0 - loadword 0, gUnknown_819BEC3 - callstd 4 - waitmoncry - release - end + lock + faceplayer + waitse + playmoncry SPECIES_PIDGEY, 0 + loadword 0, gUnknown_819BEC3 + callstd 4 + waitmoncry + release + end SaffronCity_House2_EventScript_16EF99:: @ 816EF99 - loadword 0, gUnknown_819BF07 - callstd 3 - end + loadword 0, gUnknown_819BF07 + callstd 3 + end diff --git a/data/maps/SaffronCity_House3/scripts.inc b/data/maps/SaffronCity_House3/scripts.inc index 2ce0781fc..fd0628823 100644 --- a/data/maps/SaffronCity_House3/scripts.inc +++ b/data/maps/SaffronCity_House3/scripts.inc @@ -1,36 +1,36 @@ SaffronCity_House3_MapScripts:: @ 816F05E - .byte 0 + .byte 0 SaffronCity_House3_EventScript_16F05F:: @ 816F05F - lock - faceplayer - checkflag FLAG_0x245 - goto_if 1, EventScript_16F0B5 - loadword 0, gUnknown_819C142 - callstd 4 - checkitemspace ITEM_TM29, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16F0AB - additem ITEM_TM29, 1 - loadword 0, gUnknown_819C16C - setorcopyvar VAR_0x8000, 317 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 257 - callstd 9 - loadword 0, gUnknown_819C18F - callstd 4 - setflag FLAG_0x245 - release - end + lock + faceplayer + checkflag FLAG_0x245 + goto_if 1, EventScript_16F0B5 + loadword 0, gUnknown_819C142 + callstd 4 + checkitemspace ITEM_TM29, 1 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16F0AB + additem ITEM_TM29, 1 + loadword 0, gUnknown_819C16C + setorcopyvar VAR_0x8000, 317 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 257 + callstd 9 + loadword 0, gUnknown_819C18F + callstd 4 + setflag FLAG_0x245 + release + end EventScript_16F0AB:: @ 816F0AB - loadword 0, gUnknown_819C1FC - callstd 4 - release - end + loadword 0, gUnknown_819C1FC + callstd 4 + release + end EventScript_16F0B5:: @ 816F0B5 - loadword 0, gUnknown_819C18F - callstd 4 - release - end + loadword 0, gUnknown_819C18F + callstd 4 + release + end diff --git a/data/maps/SaffronCity_Mart/scripts.inc b/data/maps/SaffronCity_Mart/scripts.inc index c72f5237b..c01665708 100644 --- a/data/maps/SaffronCity_Mart/scripts.inc +++ b/data/maps/SaffronCity_Mart/scripts.inc @@ -1,38 +1,38 @@ SaffronCity_Mart_MapScripts:: @ 816EFA2 - .byte 0 + .byte 0 SaffronCity_Mart_EventScript_16EFA3:: @ 816EFA3 - loadword 0, gUnknown_819BFF1 - callstd 2 - end + loadword 0, gUnknown_819BFF1 + callstd 2 + end SaffronCity_Mart_EventScript_16EFAC:: @ 816EFAC - loadword 0, gUnknown_819BF8F - callstd 2 - end + loadword 0, gUnknown_819BF8F + callstd 2 + end SaffronCity_Mart_EventScript_16EFB5:: @ 816EFB5 - special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 - lock - faceplayer - message Text_1A6211 - waitmessage - pokemart Items_16EFDC - loadword 0, gUnknown_81A5190 - callstd 4 - release - end + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + lock + faceplayer + message Text_1A6211 + waitmessage + pokemart Items_16EFDC + loadword 0, gUnknown_81A5190 + callstd 4 + release + end - .align 2 + .align 2 Items_16EFDC:: @ 816EFDC - .2byte ITEM_GREAT_BALL - .2byte ITEM_HYPER_POTION - .2byte ITEM_REVIVE - .2byte ITEM_FULL_HEAL - .2byte ITEM_ESCAPE_ROPE - .2byte ITEM_MAX_REPEL - .2byte ITEM_NONE - release - end + .2byte ITEM_GREAT_BALL + .2byte ITEM_HYPER_POTION + .2byte ITEM_REVIVE + .2byte ITEM_FULL_HEAL + .2byte ITEM_ESCAPE_ROPE + .2byte ITEM_MAX_REPEL + .2byte ITEM_NONE + release + end diff --git a/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc b/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc index 6eb760d16..f673b2c82 100644 --- a/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc @@ -1,41 +1,41 @@ SaffronCity_PokemonCenter_1F_MapScripts:: @ 816EFEC - map_script 3, SaffronCity_PokemonCenter_1F_MapScript1_16EFF7 - map_script 5, SaffronCity_PokemonCenter_1F_MapScript2_1BC05C - .byte 0 + map_script 3, SaffronCity_PokemonCenter_1F_MapScript1_16EFF7 + map_script 5, SaffronCity_PokemonCenter_1F_MapScript2_1BC05C + .byte 0 SaffronCity_PokemonCenter_1F_MapScript1_16EFF7:: @ 816EFF7 - setrespawn 11 - end + setrespawn 11 + end SaffronCity_PokemonCenter_1F_EventScript_16EFFB:: @ 816EFFB - lock - faceplayer - call EventScript_1A6578 - release - end + lock + faceplayer + call EventScript_1A6578 + release + end SaffronCity_PokemonCenter_1F_EventScript_16F004:: @ 816F004 - loadword 0, gUnknown_819C058 - callstd 2 - end + loadword 0, gUnknown_819C058 + callstd 2 + end SaffronCity_PokemonCenter_1F_EventScript_16F00D:: @ 816F00D - loadword 0, gUnknown_819C023 - callstd 2 - end + loadword 0, gUnknown_819C023 + callstd 2 + end SaffronCity_PokemonCenter_1F_EventScript_16F016:: @ 816F016 - lock - faceplayer - compare_var_to_value VAR_0x4060, 1 - goto_if 1, EventScript_16F02D - loadword 0, gUnknown_819C0B4 - callstd 4 - release - end + lock + faceplayer + compare_var_to_value VAR_0x4060, 1 + goto_if 1, EventScript_16F02D + loadword 0, gUnknown_819C0B4 + callstd 4 + release + end EventScript_16F02D:: @ 816F02D - loadword 0, gUnknown_819C102 - callstd 4 - release - end + loadword 0, gUnknown_819C102 + callstd 4 + release + end diff --git a/data/maps/SaffronCity_PokemonCenter_2F/scripts.inc b/data/maps/SaffronCity_PokemonCenter_2F/scripts.inc index c6f69cc82..7ebc68fb5 100644 --- a/data/maps/SaffronCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/SaffronCity_PokemonCenter_2F/scripts.inc @@ -1,18 +1,18 @@ SaffronCity_PokemonCenter_2F_MapScripts:: @ 816F037 - map_script 2, SaffronCity_PokemonCenter_2F_MapScript1_1BB2A3 - map_script 4, SaffronCity_PokemonCenter_2F_MapScript2_1BB1ED - map_script 1, SaffronCity_PokemonCenter_2F_MapScript3_1BB237 - map_script 3, SaffronCity_PokemonCenter_2F_MapScript4_1BB1B4 - .byte 0 + map_script 2, SaffronCity_PokemonCenter_2F_MapScript1_1BB2A3 + map_script 4, SaffronCity_PokemonCenter_2F_MapScript2_1BB1ED + map_script 1, SaffronCity_PokemonCenter_2F_MapScript3_1BB237 + map_script 3, SaffronCity_PokemonCenter_2F_MapScript4_1BB1B4 + .byte 0 SaffronCity_PokemonCenter_2F_EventScript_16F04C:: @ 816F04C - call EventScript_1BB4A3 - end + call EventScript_1BB4A3 + end EventScript_16F052:: @ 816F052 - call EventScript_1BB6AB - end + call EventScript_1BB6AB + end EventScript_16F058:: @ 816F058 - call EventScript_1BB7DE - end + call EventScript_1BB7DE + end diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc b/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc index debc83be8..4d1217282 100644 --- a/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc +++ b/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc @@ -1,492 +1,492 @@ SaffronCity_PokemonTrainerFanClub_MapScripts:: @ 816F0BF - map_script 2, SaffronCity_PokemonTrainerFanClub_MapScript1_16F0CA - map_script 3, SaffronCity_PokemonTrainerFanClub_MapScript2_16F144 - .byte 0 + map_script 2, SaffronCity_PokemonTrainerFanClub_MapScript1_16F0CA + map_script 3, SaffronCity_PokemonTrainerFanClub_MapScript2_16F144 + .byte 0 SaffronCity_PokemonTrainerFanClub_MapScript1_16F0CA:: @ 816F0CA - map_script_2 VAR_0x4073, 1, EventScript_16F0D4 - .2byte 0 + map_script_2 VAR_0x4073, 1, EventScript_16F0D4 + .2byte 0 EventScript_16F0D4:: @ 816F0D4 - lockall - textcolor 1 - applymovement 1, Movement_1A75ED - waitmovement 0 - playse SE_PIN - applymovement 1, Movement_1A75DB - waitmovement 0 - applymovement 1, Movement_1A75DD - waitmovement 0 - loadword 0, gUnknown_819C22B - callstd 4 - closemessage - applymovement 1, Movement_16F124 - waitmovement 0 - applymovement 255, Movement_1A75EB - waitmovement 0 - loadword 0, gUnknown_819C235 - callstd 4 - setvar VAR_0x4073, 2 - releaseall - end + lockall + textcolor 1 + applymovement 1, Movement_1A75ED + waitmovement 0 + playse SE_PIN + applymovement 1, Movement_1A75DB + waitmovement 0 + applymovement 1, Movement_1A75DD + waitmovement 0 + loadword 0, gUnknown_819C22B + callstd 4 + closemessage + applymovement 1, Movement_16F124 + waitmovement 0 + applymovement 255, Movement_1A75EB + waitmovement 0 + loadword 0, gUnknown_819C235 + callstd 4 + setvar VAR_0x4073, 2 + releaseall + end Movement_16F124:: @ 816F124 - step_1c - step_1b - step_10 - step_1c - step_10 - step_1b - step_12 - step_end + step_1c + step_1b + step_10 + step_1c + step_10 + step_1b + step_12 + step_end Movement_16F12C:: @ 816F12C - step_1b - step_2d - step_10 - step_10 - step_10 - step_12 - step_12 - step_end + step_1b + step_2d + step_10 + step_10 + step_10 + step_12 + step_12 + step_end Movement_16F134:: @ 816F134 - step_1f - step_1f - step_1d - step_1d - step_1f - step_1d - step_end + step_1f + step_1f + step_1d + step_1d + step_1f + step_1d + step_end Movement_16F13B:: @ 816F13B - step_10 - step_30 - step_end + step_10 + step_30 + step_end Movement_16F13E:: @ 816F13E - step_55 - step_1e - step_1e - step_20 - step_2d - step_end + step_55 + step_1e + step_1e + step_20 + step_2d + step_end SaffronCity_PokemonTrainerFanClub_MapScript2_16F144:: @ 816F144 - compare_var_to_value VAR_0x4073, 1 - goto_if 1, EventScript_16F267 - compare_var_to_value VAR_0x4073, 2 - goto_if 1, EventScript_16F15B - end + compare_var_to_value VAR_0x4073, 1 + goto_if 1, EventScript_16F267 + compare_var_to_value VAR_0x4073, 2 + goto_if 1, EventScript_16F15B + end EventScript_16F15B:: @ 816F15B - special sub_81132CC - setvar VAR_0x8004, 0 - specialvar VAR_RESULT, sub_8113364 - compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_16F207 - setvar VAR_0x8004, 1 - specialvar VAR_RESULT, sub_8113364 - compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_16F213 - setvar VAR_0x8004, 2 - specialvar VAR_RESULT, sub_8113364 - compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_16F21F - setvar VAR_0x8004, 3 - specialvar VAR_RESULT, sub_8113364 - compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_16F22B - setvar VAR_0x8004, 4 - specialvar VAR_RESULT, sub_8113364 - compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_16F237 - setvar VAR_0x8004, 5 - specialvar VAR_RESULT, sub_8113364 - compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_16F243 - setvar VAR_0x8004, 6 - specialvar VAR_RESULT, sub_8113364 - compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_16F24F - setvar VAR_0x8004, 7 - specialvar VAR_RESULT, sub_8113364 - compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_16F25B - end + special sub_81132CC + setvar VAR_0x8004, 0 + specialvar VAR_RESULT, sub_8113364 + compare_var_to_value VAR_RESULT, 0 + call_if 1, EventScript_16F207 + setvar VAR_0x8004, 1 + specialvar VAR_RESULT, sub_8113364 + compare_var_to_value VAR_RESULT, 0 + call_if 1, EventScript_16F213 + setvar VAR_0x8004, 2 + specialvar VAR_RESULT, sub_8113364 + compare_var_to_value VAR_RESULT, 0 + call_if 1, EventScript_16F21F + setvar VAR_0x8004, 3 + specialvar VAR_RESULT, sub_8113364 + compare_var_to_value VAR_RESULT, 0 + call_if 1, EventScript_16F22B + setvar VAR_0x8004, 4 + specialvar VAR_RESULT, sub_8113364 + compare_var_to_value VAR_RESULT, 0 + call_if 1, EventScript_16F237 + setvar VAR_0x8004, 5 + specialvar VAR_RESULT, sub_8113364 + compare_var_to_value VAR_RESULT, 0 + call_if 1, EventScript_16F243 + setvar VAR_0x8004, 6 + specialvar VAR_RESULT, sub_8113364 + compare_var_to_value VAR_RESULT, 0 + call_if 1, EventScript_16F24F + setvar VAR_0x8004, 7 + specialvar VAR_RESULT, sub_8113364 + compare_var_to_value VAR_RESULT, 0 + call_if 1, EventScript_16F25B + end EventScript_16F207:: @ 816F207 - setobjectxyperm 1, 5, 2 - setobjectmovementtype 1, 7 - return + setobjectxyperm 1, 5, 2 + setobjectmovementtype 1, 7 + return EventScript_16F213:: @ 816F213 - setobjectxyperm 3, 7, 4 - setobjectmovementtype 3, 9 - return + setobjectxyperm 3, 7, 4 + setobjectmovementtype 3, 9 + return EventScript_16F21F:: @ 816F21F - setobjectxyperm 4, 2, 2 - setobjectmovementtype 4, 7 - return + setobjectxyperm 4, 2, 2 + setobjectmovementtype 4, 7 + return EventScript_16F22B:: @ 816F22B - setobjectxyperm 2, 3, 4 - setobjectmovementtype 2, 10 - return + setobjectxyperm 2, 3, 4 + setobjectmovementtype 2, 10 + return EventScript_16F237:: @ 816F237 - setobjectxyperm 6, 4, 6 - setobjectmovementtype 6, 7 - return + setobjectxyperm 6, 4, 6 + setobjectmovementtype 6, 7 + return EventScript_16F243:: @ 816F243 - setobjectxyperm 5, 10, 3 - setobjectmovementtype 5, 7 - return + setobjectxyperm 5, 10, 3 + setobjectmovementtype 5, 7 + return EventScript_16F24F:: @ 816F24F - setobjectxyperm 7, 7, 5 - setobjectmovementtype 7, 9 - return + setobjectxyperm 7, 7, 5 + setobjectmovementtype 7, 9 + return EventScript_16F25B:: @ 816F25B - setobjectxyperm 8, 9, 6 - setobjectmovementtype 8, 9 - return + setobjectxyperm 8, 9, 6 + setobjectmovementtype 8, 9 + return EventScript_16F267:: @ 816F267 - call EventScript_16F22B - call EventScript_16F237 - call EventScript_16F243 - call EventScript_16F24F - call EventScript_16F25B - end + call EventScript_16F22B + call EventScript_16F237 + call EventScript_16F243 + call EventScript_16F24F + call EventScript_16F25B + end SaffronCity_PokemonTrainerFanClub_EventScript_16F281:: @ 816F281 - lock - faceplayer - setvar VAR_0x8004, 0 - special sub_81133A4 - compare_var_to_value VAR_0x4073, 0 - goto_if 1, EventScript_16F2EE - specialvar VAR_RESULT, sub_8113364 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16F2C0 - specialvar VAR_RESULT, sub_8113288 - compare_var_to_value VAR_RESULT, 7 - goto_if 1, EventScript_16F2E4 - loadword 0, gUnknown_819C420 - callstd 4 - release - end + lock + faceplayer + setvar VAR_0x8004, 0 + special sub_81133A4 + compare_var_to_value VAR_0x4073, 0 + goto_if 1, EventScript_16F2EE + specialvar VAR_RESULT, sub_8113364 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16F2C0 + specialvar VAR_RESULT, sub_8113288 + compare_var_to_value VAR_RESULT, 7 + goto_if 1, EventScript_16F2E4 + loadword 0, gUnknown_819C420 + callstd 4 + release + end EventScript_16F2C0:: @ 816F2C0 - specialvar VAR_RESULT, sub_8113288 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16F2DA - loadword 0, gUnknown_819C390 - callstd 4 - release - end + specialvar VAR_RESULT, sub_8113288 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16F2DA + loadword 0, gUnknown_819C390 + callstd 4 + release + end EventScript_16F2DA:: @ 816F2DA - loadword 0, gUnknown_819C3BD - callstd 4 - release - end + loadword 0, gUnknown_819C3BD + callstd 4 + release + end EventScript_16F2E4:: @ 816F2E4 - loadword 0, gUnknown_819C4A5 - callstd 4 - release - end + loadword 0, gUnknown_819C4A5 + callstd 4 + release + end EventScript_16F2EE:: @ 816F2EE - loadword 0, gUnknown_819C55C - callstd 4 - release - end + loadword 0, gUnknown_819C55C + callstd 4 + release + end SaffronCity_PokemonTrainerFanClub_EventScript_16F2F8:: @ 816F2F8 - lock - faceplayer - setvar VAR_0x8004, 3 - special sub_81133A4 - compare_var_to_value VAR_0x4073, 0 - goto_if 1, EventScript_16F365 - specialvar VAR_RESULT, sub_8113364 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16F337 - specialvar VAR_RESULT, sub_8113288 - compare_var_to_value VAR_RESULT, 7 - goto_if 1, EventScript_16F35B - loadword 0, gUnknown_819CBD3 - callstd 4 - release - end + lock + faceplayer + setvar VAR_0x8004, 3 + special sub_81133A4 + compare_var_to_value VAR_0x4073, 0 + goto_if 1, EventScript_16F365 + specialvar VAR_RESULT, sub_8113364 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16F337 + specialvar VAR_RESULT, sub_8113288 + compare_var_to_value VAR_RESULT, 7 + goto_if 1, EventScript_16F35B + loadword 0, gUnknown_819CBD3 + callstd 4 + release + end EventScript_16F337:: @ 816F337 - specialvar VAR_RESULT, sub_8113288 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16F351 - loadword 0, gUnknown_819CB32 - callstd 4 - release - end + specialvar VAR_RESULT, sub_8113288 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16F351 + loadword 0, gUnknown_819CB32 + callstd 4 + release + end EventScript_16F351:: @ 816F351 - loadword 0, gUnknown_819CB62 - callstd 4 - release - end + loadword 0, gUnknown_819CB62 + callstd 4 + release + end EventScript_16F35B:: @ 816F35B - loadword 0, gUnknown_819CC2B - callstd 4 - release - end + loadword 0, gUnknown_819CC2B + callstd 4 + release + end EventScript_16F365:: @ 816F365 - loadword 0, gUnknown_819CCC2 - callstd 4 - release - end + loadword 0, gUnknown_819CCC2 + callstd 4 + release + end SaffronCity_PokemonTrainerFanClub_EventScript_16F36F:: @ 816F36F - lock - faceplayer - setvar VAR_0x8004, 1 - special sub_81133A4 - compare_var_to_value VAR_0x4073, 0 - goto_if 1, EventScript_16F3DC - specialvar VAR_RESULT, sub_8113364 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16F3AE - specialvar VAR_RESULT, sub_8113288 - compare_var_to_value VAR_RESULT, 7 - goto_if 1, EventScript_16F3D2 - loadword 0, gUnknown_819C6BA - callstd 4 - release - end + lock + faceplayer + setvar VAR_0x8004, 1 + special sub_81133A4 + compare_var_to_value VAR_0x4073, 0 + goto_if 1, EventScript_16F3DC + specialvar VAR_RESULT, sub_8113364 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16F3AE + specialvar VAR_RESULT, sub_8113288 + compare_var_to_value VAR_RESULT, 7 + goto_if 1, EventScript_16F3D2 + loadword 0, gUnknown_819C6BA + callstd 4 + release + end EventScript_16F3AE:: @ 816F3AE - specialvar VAR_RESULT, sub_8113288 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16F3C8 - loadword 0, gUnknown_819C5A9 - callstd 4 - release - end + specialvar VAR_RESULT, sub_8113288 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16F3C8 + loadword 0, gUnknown_819C5A9 + callstd 4 + release + end EventScript_16F3C8:: @ 816F3C8 - loadword 0, gUnknown_819C600 - callstd 4 - release - end + loadword 0, gUnknown_819C600 + callstd 4 + release + end EventScript_16F3D2:: @ 816F3D2 - loadword 0, gUnknown_819C73A - callstd 4 - release - end + loadword 0, gUnknown_819C73A + callstd 4 + release + end EventScript_16F3DC:: @ 816F3DC - loadword 0, gUnknown_819C7C8 - callstd 4 - release - end + loadword 0, gUnknown_819C7C8 + callstd 4 + release + end SaffronCity_PokemonTrainerFanClub_EventScript_16F3E6:: @ 816F3E6 - lock - faceplayer - setvar VAR_0x8004, 2 - special sub_81133A4 - compare_var_to_value VAR_0x4073, 0 - goto_if 1, EventScript_16F453 - specialvar VAR_RESULT, sub_8113364 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16F425 - specialvar VAR_RESULT, sub_8113288 - compare_var_to_value VAR_RESULT, 7 - goto_if 1, EventScript_16F449 - loadword 0, gUnknown_819C986 - callstd 4 - release - end + lock + faceplayer + setvar VAR_0x8004, 2 + special sub_81133A4 + compare_var_to_value VAR_0x4073, 0 + goto_if 1, EventScript_16F453 + specialvar VAR_RESULT, sub_8113364 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16F425 + specialvar VAR_RESULT, sub_8113288 + compare_var_to_value VAR_RESULT, 7 + goto_if 1, EventScript_16F449 + loadword 0, gUnknown_819C986 + callstd 4 + release + end EventScript_16F425:: @ 816F425 - specialvar VAR_RESULT, sub_8113288 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16F43F - loadword 0, gUnknown_819C81E - callstd 4 - release - end + specialvar VAR_RESULT, sub_8113288 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16F43F + loadword 0, gUnknown_819C81E + callstd 4 + release + end EventScript_16F43F:: @ 816F43F - loadword 0, gUnknown_819C8C1 - callstd 4 - release - end + loadword 0, gUnknown_819C8C1 + callstd 4 + release + end EventScript_16F449:: @ 816F449 - loadword 0, gUnknown_819C9D5 - callstd 4 - release - end + loadword 0, gUnknown_819C9D5 + callstd 4 + release + end EventScript_16F453:: @ 816F453 - loadword 0, gUnknown_819CA7C - callstd 4 - release - end + loadword 0, gUnknown_819CA7C + callstd 4 + release + end SaffronCity_PokemonTrainerFanClub_EventScript_16F45D:: @ 816F45D - lock - faceplayer - setvar VAR_0x8004, 5 - special sub_81133A4 - specialvar VAR_RESULT, sub_8113364 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16F491 - specialvar VAR_RESULT, sub_8113288 - compare_var_to_value VAR_RESULT, 7 - goto_if 1, EventScript_16F4B5 - loadword 0, gUnknown_819D01F - callstd 4 - release - end + lock + faceplayer + setvar VAR_0x8004, 5 + special sub_81133A4 + specialvar VAR_RESULT, sub_8113364 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16F491 + specialvar VAR_RESULT, sub_8113288 + compare_var_to_value VAR_RESULT, 7 + goto_if 1, EventScript_16F4B5 + loadword 0, gUnknown_819D01F + callstd 4 + release + end EventScript_16F491:: @ 816F491 - specialvar VAR_RESULT, sub_8113288 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16F4AB - loadword 0, gUnknown_819CEDF - callstd 4 - release - end + specialvar VAR_RESULT, sub_8113288 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16F4AB + loadword 0, gUnknown_819CEDF + callstd 4 + release + end EventScript_16F4AB:: @ 816F4AB - loadword 0, gUnknown_819CF6D - callstd 4 - release - end + loadword 0, gUnknown_819CF6D + callstd 4 + release + end EventScript_16F4B5:: @ 816F4B5 - loadword 0, gUnknown_819D075 - callstd 4 - release - end + loadword 0, gUnknown_819D075 + callstd 4 + release + end SaffronCity_PokemonTrainerFanClub_EventScript_16F4BF:: @ 816F4BF - lock - faceplayer - setvar VAR_0x8004, 4 - special sub_81133A4 - specialvar VAR_RESULT, sub_8113364 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16F4F3 - specialvar VAR_RESULT, sub_8113288 - compare_var_to_value VAR_RESULT, 7 - goto_if 1, EventScript_16F517 - loadword 0, gUnknown_819CDDA - callstd 4 - release - end + lock + faceplayer + setvar VAR_0x8004, 4 + special sub_81133A4 + specialvar VAR_RESULT, sub_8113364 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16F4F3 + specialvar VAR_RESULT, sub_8113288 + compare_var_to_value VAR_RESULT, 7 + goto_if 1, EventScript_16F517 + loadword 0, gUnknown_819CDDA + callstd 4 + release + end EventScript_16F4F3:: @ 816F4F3 - specialvar VAR_RESULT, sub_8113288 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16F50D - loadword 0, gUnknown_819CCF3 - callstd 4 - release - end + specialvar VAR_RESULT, sub_8113288 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16F50D + loadword 0, gUnknown_819CCF3 + callstd 4 + release + end EventScript_16F50D:: @ 816F50D - loadword 0, gUnknown_819CD4E - callstd 4 - release - end + loadword 0, gUnknown_819CD4E + callstd 4 + release + end EventScript_16F517:: @ 816F517 - loadword 0, gUnknown_819CE3A - callstd 4 - release - end + loadword 0, gUnknown_819CE3A + callstd 4 + release + end SaffronCity_PokemonTrainerFanClub_EventScript_16F521:: @ 816F521 - lock - faceplayer - setvar VAR_0x8004, 6 - special sub_81133A4 - specialvar VAR_RESULT, sub_8113364 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16F555 - specialvar VAR_RESULT, sub_8113288 - compare_var_to_value VAR_RESULT, 7 - goto_if 1, EventScript_16F579 - loadword 0, gUnknown_819D1AE - callstd 4 - release - end + lock + faceplayer + setvar VAR_0x8004, 6 + special sub_81133A4 + specialvar VAR_RESULT, sub_8113364 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16F555 + specialvar VAR_RESULT, sub_8113288 + compare_var_to_value VAR_RESULT, 7 + goto_if 1, EventScript_16F579 + loadword 0, gUnknown_819D1AE + callstd 4 + release + end EventScript_16F555:: @ 816F555 - specialvar VAR_RESULT, sub_8113288 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16F56F - loadword 0, gUnknown_819D0E3 - callstd 4 - release - end + specialvar VAR_RESULT, sub_8113288 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16F56F + loadword 0, gUnknown_819D0E3 + callstd 4 + release + end EventScript_16F56F:: @ 816F56F - loadword 0, gUnknown_819D148 - callstd 4 - release - end + loadword 0, gUnknown_819D148 + callstd 4 + release + end EventScript_16F579:: @ 816F579 - loadword 0, gUnknown_819D211 - callstd 4 - release - end + loadword 0, gUnknown_819D211 + callstd 4 + release + end SaffronCity_PokemonTrainerFanClub_EventScript_16F583:: @ 816F583 - lock - faceplayer - setvar VAR_0x8004, 7 - special sub_81133A4 - specialvar VAR_RESULT, sub_8113364 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16F5B7 - specialvar VAR_RESULT, sub_8113288 - compare_var_to_value VAR_RESULT, 7 - goto_if 1, EventScript_16F5DB - loadword 0, gUnknown_819D3D2 - callstd 4 - release - end + lock + faceplayer + setvar VAR_0x8004, 7 + special sub_81133A4 + specialvar VAR_RESULT, sub_8113364 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16F5B7 + specialvar VAR_RESULT, sub_8113288 + compare_var_to_value VAR_RESULT, 7 + goto_if 1, EventScript_16F5DB + loadword 0, gUnknown_819D3D2 + callstd 4 + release + end EventScript_16F5B7:: @ 816F5B7 - specialvar VAR_RESULT, sub_8113288 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16F5D1 - loadword 0, gUnknown_819D2B4 - callstd 4 - release - end + specialvar VAR_RESULT, sub_8113288 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16F5D1 + loadword 0, gUnknown_819D2B4 + callstd 4 + release + end EventScript_16F5D1:: @ 816F5D1 - loadword 0, gUnknown_819D31F - callstd 4 - release - end + loadword 0, gUnknown_819D31F + callstd 4 + release + end EventScript_16F5DB:: @ 816F5DB - loadword 0, gUnknown_819D477 - callstd 4 - release - end + loadword 0, gUnknown_819D477 + callstd 4 + release + end diff --git a/data/maps/SeafoamIslands_1F/scripts.inc b/data/maps/SeafoamIslands_1F/scripts.inc index 8306f6f4c..afb8a3e3e 100644 --- a/data/maps/SeafoamIslands_1F/scripts.inc +++ b/data/maps/SeafoamIslands_1F/scripts.inc @@ -1,7 +1,7 @@ SeafoamIslands_1F_MapScripts:: @ 8162F43 - map_script 3, SeafoamIslands_1F_MapScript1_162F49 - .byte 0 + map_script 3, SeafoamIslands_1F_MapScript1_162F49 + .byte 0 SeafoamIslands_1F_MapScript1_162F49:: @ 8162F49 - setworldmapflag 2225 - end + setworldmapflag 2225 + end diff --git a/data/maps/SeafoamIslands_B1F/scripts.inc b/data/maps/SeafoamIslands_B1F/scripts.inc index a3cb050ee..25fc3de3c 100644 --- a/data/maps/SeafoamIslands_B1F/scripts.inc +++ b/data/maps/SeafoamIslands_B1F/scripts.inc @@ -1,2 +1,2 @@ SeafoamIslands_B1F_MapScripts:: @ 8162F4D - .byte 0 + .byte 0 diff --git a/data/maps/SeafoamIslands_B2F/scripts.inc b/data/maps/SeafoamIslands_B2F/scripts.inc index 21a4cd8fb..e719cc327 100644 --- a/data/maps/SeafoamIslands_B2F/scripts.inc +++ b/data/maps/SeafoamIslands_B2F/scripts.inc @@ -1,2 +1,2 @@ SeafoamIslands_B2F_MapScripts:: @ 8162F4E - .byte 0 + .byte 0 diff --git a/data/maps/SeafoamIslands_B3F/scripts.inc b/data/maps/SeafoamIslands_B3F/scripts.inc index ee619cb70..a5ac9bbf7 100644 --- a/data/maps/SeafoamIslands_B3F/scripts.inc +++ b/data/maps/SeafoamIslands_B3F/scripts.inc @@ -1,103 +1,103 @@ SeafoamIslands_B3F_MapScripts:: @ 8162F4F - map_script 3, SeafoamIslands_B3F_MapScript1_162F5A - map_script 2, SeafoamIslands_B3F_MapScript2_162F98 - .byte 0 + map_script 3, SeafoamIslands_B3F_MapScript1_162F5A + map_script 2, SeafoamIslands_B3F_MapScript2_162F98 + .byte 0 SeafoamIslands_B3F_MapScript1_162F5A:: @ 8162F5A - checkflag FLAG_0x2D2 - call_if 0, EventScript_162F6D - checkflag FLAG_0x2D2 - call_if 1, EventScript_162F94 - end + checkflag FLAG_0x2D2 + call_if 0, EventScript_162F6D + checkflag FLAG_0x2D2 + call_if 1, EventScript_162F94 + end EventScript_162F6D:: @ 8162F6D - setvar VAR_0x4002, 0 - checkflag FLAG_0x046 - call_if 0, EventScript_162FF0 - checkflag FLAG_0x047 - call_if 0, EventScript_162FF0 - compare_var_to_value VAR_0x4002, 2 - call_if 1, EventScript_162F90 - return + setvar VAR_0x4002, 0 + checkflag FLAG_0x046 + call_if 0, EventScript_162FF0 + checkflag FLAG_0x047 + call_if 0, EventScript_162FF0 + compare_var_to_value VAR_0x4002, 2 + call_if 1, EventScript_162F90 + return EventScript_162F90:: @ 8162F90 - setflag FLAG_0x2D2 - return + setflag FLAG_0x2D2 + return EventScript_162F94:: @ 8162F94 - setmaplayoutindex LAYOUT_UNUSED_LAYOUT_833B6EC - return + setmaplayoutindex LAYOUT_UNUSED_LAYOUT_833B6EC + return SeafoamIslands_B3F_MapScript2_162F98:: @ 8162F98 - map_script_2 VAR_0x4001, 1, EventScript_162FA2 - .2byte 0 + map_script_2 VAR_0x4001, 1, EventScript_162FA2 + .2byte 0 EventScript_162FA2:: @ 8162FA2 - lockall - setvar VAR_0x4002, 0 - checkflag FLAG_0x046 - call_if 0, EventScript_162FF0 - checkflag FLAG_0x047 - call_if 0, EventScript_162FF0 - compare_var_to_value VAR_0x4002, 2 - goto_if 1, EventScript_16300C - getplayerxy VAR_0x8008, VAR_0x8009 - compare_var_to_value VAR_0x8008, 24 - call_if 0, EventScript_162FF6 - compare_var_to_value VAR_0x8008, 24 - call_if 4, EventScript_163001 - setvar VAR_0x4063, 1 - warp MAP_SEAFOAM_ISLANDS_B4F, 255, 27, 21 - waitstate - releaseall - end + lockall + setvar VAR_0x4002, 0 + checkflag FLAG_0x046 + call_if 0, EventScript_162FF0 + checkflag FLAG_0x047 + call_if 0, EventScript_162FF0 + compare_var_to_value VAR_0x4002, 2 + goto_if 1, EventScript_16300C + getplayerxy VAR_0x8008, VAR_0x8009 + compare_var_to_value VAR_0x8008, 24 + call_if 0, EventScript_162FF6 + compare_var_to_value VAR_0x8008, 24 + call_if 4, EventScript_163001 + setvar VAR_0x4063, 1 + warp MAP_SEAFOAM_ISLANDS_B4F, 255, 27, 21 + waitstate + releaseall + end EventScript_162FF0:: @ 8162FF0 - addvar VAR_0x4002, 1 - return + addvar VAR_0x4002, 1 + return EventScript_162FF6:: @ 8162FF6 - applymovement 255, Movement_163013 - waitmovement 0 - return + applymovement 255, Movement_163013 + waitmovement 0 + return EventScript_163001:: @ 8163001 - applymovement 255, Movement_163021 - waitmovement 0 - return + applymovement 255, Movement_163021 + waitmovement 0 + return EventScript_16300C:: @ 816300C - setvar VAR_0x4001, 0 - releaseall - end + setvar VAR_0x4001, 0 + releaseall + end Movement_163013:: @ 8163013 - step_1d - step_1d - step_1d - step_1d - step_20 - step_20 - step_20 - step_1d - step_1d - step_1d - step_1d - step_1d - step_1d - step_end + step_1d + step_1d + step_1d + step_1d + step_20 + step_20 + step_20 + step_1d + step_1d + step_1d + step_1d + step_1d + step_1d + step_end Movement_163021:: @ 8163021 - step_1d - step_1d - step_1d - step_1d - step_20 - step_20 - step_1d - step_1d - step_1d - step_1d - step_1d - step_1d - step_end + step_1d + step_1d + step_1d + step_1d + step_20 + step_20 + step_1d + step_1d + step_1d + step_1d + step_1d + step_1d + step_end diff --git a/data/maps/SeafoamIslands_B4F/scripts.inc b/data/maps/SeafoamIslands_B4F/scripts.inc index 47d6deec2..a2d2189b4 100644 --- a/data/maps/SeafoamIslands_B4F/scripts.inc +++ b/data/maps/SeafoamIslands_B4F/scripts.inc @@ -1,218 +1,218 @@ SeafoamIslands_B4F_MapScripts:: @ 816302E - map_script 3, SeafoamIslands_B4F_MapScript1_163066 - map_script 5, SeafoamIslands_B4F_MapScript2_163048 - map_script 1, SeafoamIslands_B4F_MapScript3_1630B1 - map_script 4, SeafoamIslands_B4F_MapScript4_1630E7 - map_script 2, SeafoamIslands_B4F_MapScript5_1630F9 - .byte 0 + map_script 3, SeafoamIslands_B4F_MapScript1_163066 + map_script 5, SeafoamIslands_B4F_MapScript2_163048 + map_script 1, SeafoamIslands_B4F_MapScript3_1630B1 + map_script 4, SeafoamIslands_B4F_MapScript4_1630E7 + map_script 2, SeafoamIslands_B4F_MapScript5_1630F9 + .byte 0 SeafoamIslands_B4F_MapScript2_163048:: @ 8163048 - checkflag 2055 - call_if 1, EventScript_163052 - end + checkflag 2055 + call_if 1, EventScript_163052 + end EventScript_163052:: @ 8163052 - specialvar VAR_RESULT, sub_80CA74C - compare_var_to_value VAR_RESULT, 7 - goto_if 5, EventScript_1A77A9 - removeobject VAR_LAST_TALKED - return + specialvar VAR_RESULT, sub_80CA74C + compare_var_to_value VAR_RESULT, 7 + goto_if 5, EventScript_1A77A9 + removeobject VAR_LAST_TALKED + return SeafoamIslands_B4F_MapScript1_163066:: @ 8163066 - checkflag FLAG_0x2BE - call_if 0, EventScript_1630AD - checkflag FLAG_0x2D3 - call_if 0, EventScript_163082 - checkflag FLAG_0x2D3 - call_if 1, EventScript_1630A9 - end + checkflag FLAG_0x2BE + call_if 0, EventScript_1630AD + checkflag FLAG_0x2D3 + call_if 0, EventScript_163082 + checkflag FLAG_0x2D3 + call_if 1, EventScript_1630A9 + end EventScript_163082:: @ 8163082 - setvar VAR_0x4002, 0 - checkflag FLAG_0x04C - call_if 0, EventScript_163169 - checkflag FLAG_0x04D - call_if 0, EventScript_163169 - compare_var_to_value VAR_0x4002, 2 - call_if 1, EventScript_1630A5 - return + setvar VAR_0x4002, 0 + checkflag FLAG_0x04C + call_if 0, EventScript_163169 + checkflag FLAG_0x04D + call_if 0, EventScript_163169 + compare_var_to_value VAR_0x4002, 2 + call_if 1, EventScript_1630A5 + return EventScript_1630A5:: @ 81630A5 - setflag FLAG_0x2D3 - return + setflag FLAG_0x2D3 + return EventScript_1630A9:: @ 81630A9 - setmaplayoutindex LAYOUT_UNUSED_LAYOUT_833BE30 - return + setmaplayoutindex LAYOUT_UNUSED_LAYOUT_833BE30 + return EventScript_1630AD:: @ 81630AD - clearflag FLAG_0x082 - return + clearflag FLAG_0x082 + return SeafoamIslands_B4F_MapScript3_1630B1:: @ 81630B1 - setvar VAR_0x4002, 0 - checkflag FLAG_0x04C - call_if 0, EventScript_163169 - checkflag FLAG_0x04D - call_if 0, EventScript_163169 - compare_var_to_value VAR_0x4002, 2 - goto_if 1, EventScript_1630D4 - end + setvar VAR_0x4002, 0 + checkflag FLAG_0x04C + call_if 0, EventScript_163169 + checkflag FLAG_0x04D + call_if 0, EventScript_163169 + compare_var_to_value VAR_0x4002, 2 + goto_if 1, EventScript_1630D4 + end EventScript_1630D4:: @ 81630D4 - setmetatile 12, 14, 299, 0 - setmetatile 13, 14, 299, 0 - end + setmetatile 12, 14, 299, 0 + setmetatile 13, 14, 299, 0 + end SeafoamIslands_B4F_MapScript4_1630E7:: @ 81630E7 - map_script_2 VAR_0x4063, 1, EventScript_1630F1 - .2byte 0 + map_script_2 VAR_0x4063, 1, EventScript_1630F1 + .2byte 0 EventScript_1630F1:: @ 81630F1 - turnobject 255, 2 - special sub_80CBD80 - end + turnobject 255, 2 + special sub_80CBD80 + end SeafoamIslands_B4F_MapScript5_1630F9:: @ 81630F9 - map_script_2 VAR_0x4063, 1, EventScript_16310B - map_script_2 VAR_0x4001, 1, EventScript_163121 - .2byte 0 + map_script_2 VAR_0x4063, 1, EventScript_16310B + map_script_2 VAR_0x4001, 1, EventScript_163121 + .2byte 0 EventScript_16310B:: @ 816310B - lockall - applymovement 255, Movement_16311D - waitmovement 0 - setvar VAR_0x4063, 0 - releaseall - end + lockall + applymovement 255, Movement_16311D + waitmovement 0 + setvar VAR_0x4063, 0 + releaseall + end Movement_16311D:: @ 816311D - step_1e - step_1e - step_1e - step_end + step_1e + step_1e + step_1e + step_end EventScript_163121:: @ 8163121 - lockall - setvar VAR_0x4002, 0 - checkflag FLAG_0x04C - call_if 0, EventScript_163169 - checkflag FLAG_0x04D - call_if 0, EventScript_163169 - compare_var_to_value VAR_0x4002, 2 - goto_if 1, EventScript_163185 - getplayerxy VAR_0x8008, VAR_0x8009 - compare_var_to_value VAR_0x8008, 9 - call_if 0, EventScript_16316F - compare_var_to_value VAR_0x8008, 9 - call_if 4, EventScript_16317A - special sub_805D1A8 - setvar VAR_0x4001, 0 - releaseall - end + lockall + setvar VAR_0x4002, 0 + checkflag FLAG_0x04C + call_if 0, EventScript_163169 + checkflag FLAG_0x04D + call_if 0, EventScript_163169 + compare_var_to_value VAR_0x4002, 2 + goto_if 1, EventScript_163185 + getplayerxy VAR_0x8008, VAR_0x8009 + compare_var_to_value VAR_0x8008, 9 + call_if 0, EventScript_16316F + compare_var_to_value VAR_0x8008, 9 + call_if 4, EventScript_16317A + special sub_805D1A8 + setvar VAR_0x4001, 0 + releaseall + end EventScript_163169:: @ 8163169 - addvar VAR_0x4002, 1 - return + addvar VAR_0x4002, 1 + return EventScript_16316F:: @ 816316F - applymovement 255, Movement_16318C - waitmovement 0 - return + applymovement 255, Movement_16318C + waitmovement 0 + return EventScript_16317A:: @ 816317A - applymovement 255, Movement_163195 - waitmovement 0 - return + applymovement 255, Movement_163195 + waitmovement 0 + return EventScript_163185:: @ 8163185 - setvar VAR_0x4001, 0 - releaseall - end + setvar VAR_0x4001, 0 + releaseall + end Movement_16318C:: @ 816318C - step_11 - step_11 - step_11 - step_13 - step_13 - step_13 - step_13 - step_11 - step_end + step_11 + step_11 + step_11 + step_13 + step_13 + step_13 + step_13 + step_11 + step_end Movement_163195:: @ 8163195 - step_11 - step_11 - step_11 - step_13 - step_13 - step_13 - step_11 - step_end + step_11 + step_11 + step_11 + step_13 + step_13 + step_13 + step_11 + step_end SeafoamIslands_B4F_EventScript_16319D:: @ 816319D - lockall - applymovement 255, Movement_1631AA - waitmovement 0 - releaseall - end + lockall + applymovement 255, Movement_1631AA + waitmovement 0 + releaseall + end Movement_1631AA:: @ 81631AA - step_11 - step_end + step_11 + step_end SeafoamIslands_B4F_EventScript_1631AC:: @ 81631AC - special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 - special sub_8112364 - lock - faceplayer - setwildbattle SPECIES_ARTICUNO, 50, ITEM_NONE - waitse - playmoncry SPECIES_ARTICUNO, 2 - message Text_1A6448 - waitmessage - waitmoncry - delay 10 - playbgm BGM_FRLG_LEADER_EYE, 0 - waitbuttonpress - setflag 2055 - special sub_807F9D8 - waitstate - clearflag 2055 - specialvar VAR_RESULT, sub_80CA74C - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16320F - compare_var_to_value VAR_RESULT, 4 - goto_if 1, EventScript_163218 - compare_var_to_value VAR_RESULT, 5 - goto_if 1, EventScript_163218 - setflag FLAG_0x2BE - release - end + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + special sub_8112364 + lock + faceplayer + setwildbattle SPECIES_ARTICUNO, 50, ITEM_NONE + waitse + playmoncry SPECIES_ARTICUNO, 2 + message Text_1A6448 + waitmessage + waitmoncry + delay 10 + playbgm BGM_FRLG_LEADER_EYE, 0 + waitbuttonpress + setflag 2055 + special sub_807F9D8 + waitstate + clearflag 2055 + specialvar VAR_RESULT, sub_80CA74C + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16320F + compare_var_to_value VAR_RESULT, 4 + goto_if 1, EventScript_163218 + compare_var_to_value VAR_RESULT, 5 + goto_if 1, EventScript_163218 + setflag FLAG_0x2BE + release + end EventScript_16320F:: @ 816320F - setflag FLAG_0x2BE - goto EventScript_1A922D + setflag FLAG_0x2BE + goto EventScript_1A922D EventScript_163217:: @ 8163217 - end + end EventScript_163218:: @ 8163218 - setvar VAR_0x8004, 144 - goto EventScript_1A9236 + setvar VAR_0x8004, 144 + goto EventScript_1A9236 EventScript_163222:: @ 8163222 - end + end SeafoamIslands_B4F_EventScript_163223:: @ 8163223 - loadword 0, gUnknown_8179B36 - callstd 3 - end + loadword 0, gUnknown_8179B36 + callstd 3 + end SeafoamIslands_B4F_EventScript_16322C:: @ 816322C - loadword 0, gUnknown_8179B65 - callstd 3 - end + loadword 0, gUnknown_8179B65 + callstd 3 + end diff --git a/data/maps/SevenIsland/scripts.inc b/data/maps/SevenIsland/scripts.inc index 5b932458c..8517d7d2d 100644 --- a/data/maps/SevenIsland/scripts.inc +++ b/data/maps/SevenIsland/scripts.inc @@ -1,22 +1,22 @@ SevenIsland_MapScripts:: @ 8167EB3 - map_script 3, SevenIsland_MapScript1_167EB9 - .byte 0 + map_script 3, SevenIsland_MapScript1_167EB9 + .byte 0 SevenIsland_MapScript1_167EB9:: @ 8167EB9 - setworldmapflag 2208 - end + setworldmapflag 2208 + end SevenIsland_EventScript_167EBD:: @ 8167EBD - loadword 0, gUnknown_8183046 - callstd 3 - end + loadword 0, gUnknown_8183046 + callstd 3 + end SevenIsland_EventScript_167EC6:: @ 8167EC6 - loadword 0, gUnknown_818306C - callstd 2 - end + loadword 0, gUnknown_818306C + callstd 2 + end SevenIsland_EventScript_167ECF:: @ 8167ECF - loadword 0, gUnknown_8183143 - callstd 2 - end + loadword 0, gUnknown_8183143 + callstd 2 + end diff --git a/data/maps/SevenIsland_Harbor/scripts.inc b/data/maps/SevenIsland_Harbor/scripts.inc index 565aa55ee..c4777e1ac 100644 --- a/data/maps/SevenIsland_Harbor/scripts.inc +++ b/data/maps/SevenIsland_Harbor/scripts.inc @@ -1,11 +1,11 @@ SevenIsland_Harbor_MapScripts:: @ 8170BE4 - .byte 0 + .byte 0 SevenIsland_Harbor_EventScript_170BE5:: @ 8170BE5 - lock - faceplayer - message Text_181726 - waitmessage - setvar VAR_0x8004, 7 - goto EventScript_1A900F - end + lock + faceplayer + message Text_181726 + waitmessage + setvar VAR_0x8004, 7 + goto EventScript_1A900F + end diff --git a/data/maps/SevenIsland_House_Room1/scripts.inc b/data/maps/SevenIsland_House_Room1/scripts.inc index 6b7b8acd4..fa023efd4 100644 --- a/data/maps/SevenIsland_House_Room1/scripts.inc +++ b/data/maps/SevenIsland_House_Room1/scripts.inc @@ -1,194 +1,194 @@ SevenIsland_House_Room1_MapScripts:: @ 817088A - map_script 3, SevenIsland_House_Room1_MapScript1_170895 - map_script 2, SevenIsland_House_Room1_MapScript2_1708CF - .byte 0 + map_script 3, SevenIsland_House_Room1_MapScript1_170895 + map_script 2, SevenIsland_House_Room1_MapScript2_1708CF + .byte 0 SevenIsland_House_Room1_MapScript1_170895:: @ 8170895 - special ValidateEReaderTrainer - compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_1708AF - compare_var_to_value VAR_0x4074, 0 - call_if 5, EventScript_1708C3 - end + special ValidateEReaderTrainer + compare_var_to_value VAR_RESULT, 0 + call_if 1, EventScript_1708AF + compare_var_to_value VAR_0x4074, 0 + call_if 5, EventScript_1708C3 + end EventScript_1708AF:: @ 81708AF - setvar VAR_0x4001, 1 - setobjectxyperm 1, 4, 2 - setobjectmovementtype 1, 8 - setmaplayoutindex LAYOUT_UNUSED_LAYOUT_8338B4C - return + setvar VAR_0x4001, 1 + setobjectxyperm 1, 4, 2 + setobjectmovementtype 1, 8 + setmaplayoutindex LAYOUT_UNUSED_LAYOUT_8338B4C + return EventScript_1708C3:: @ 81708C3 - setobjectxyperm 1, 3, 2 - setobjectmovementtype 1, 10 - return + setobjectxyperm 1, 3, 2 + setobjectmovementtype 1, 10 + return SevenIsland_House_Room1_MapScript2_1708CF:: @ 81708CF - map_script_2 VAR_0x4074, 1, EventScript_1708E9 - map_script_2 VAR_0x4074, 2, EventScript_1708E9 - map_script_2 VAR_0x4074, 3, EventScript_1708E9 - .2byte 0 + map_script_2 VAR_0x4074, 1, EventScript_1708E9 + map_script_2 VAR_0x4074, 2, EventScript_1708E9 + map_script_2 VAR_0x4074, 3, EventScript_1708E9 + .2byte 0 EventScript_1708E9:: @ 1708E9 - lockall - textcolor 1 - applymovement 255, Movement_170953 - waitmovement 0 - applymovement 1, Movement_170955 - waitmovement 0 - moveobjectoffscreen 1 - applymovement 255, Movement_1A75E9 - waitmovement 0 - compare_var_to_value VAR_0x4074, 1 - call_if 1, EventScript_170938 - compare_var_to_value VAR_0x4074, 2 - call_if 1, EventScript_170941 - compare_var_to_value VAR_0x4074, 3 - call_if 1, EventScript_17094A - special LoadPlayerParty - setvar VAR_0x4074, 0 - releaseall - end + lockall + textcolor 1 + applymovement 255, Movement_170953 + waitmovement 0 + applymovement 1, Movement_170955 + waitmovement 0 + moveobjectoffscreen 1 + applymovement 255, Movement_1A75E9 + waitmovement 0 + compare_var_to_value VAR_0x4074, 1 + call_if 1, EventScript_170938 + compare_var_to_value VAR_0x4074, 2 + call_if 1, EventScript_170941 + compare_var_to_value VAR_0x4074, 3 + call_if 1, EventScript_17094A + special LoadPlayerParty + setvar VAR_0x4074, 0 + releaseall + end EventScript_170938:: @ 8170938 - loadword 0, gUnknown_81A088C - callstd 4 - return + loadword 0, gUnknown_81A088C + callstd 4 + return EventScript_170941:: @ 8170941 - loadword 0, gUnknown_81A0971 - callstd 4 - return + loadword 0, gUnknown_81A0971 + callstd 4 + return EventScript_17094A:: @ 817094A - loadword 0, gUnknown_81A0807 - callstd 4 - return + loadword 0, gUnknown_81A0807 + callstd 4 + return Movement_170953:: @ 8170953 - step_10 - step_end + step_10 + step_end Movement_170955:: @ 8170955 - step_13 - step_2d - step_end + step_13 + step_2d + step_end SevenIsland_House_Room1_EventScript_170958:: @ 8170958 - lock - faceplayer - special ValidateEReaderTrainer - compare_var_to_value VAR_RESULT, 1 - call_if 1, EventScript_17097D - compare_var_to_value VAR_0x4001, 1 - goto_if 1, EventScript_170987 - loadword 0, gUnknown_81A049B - callstd 4 - release - end + lock + faceplayer + special ValidateEReaderTrainer + compare_var_to_value VAR_RESULT, 1 + call_if 1, EventScript_17097D + compare_var_to_value VAR_0x4001, 1 + goto_if 1, EventScript_170987 + loadword 0, gUnknown_81A049B + callstd 4 + release + end EventScript_17097D:: @ 817097D - loadword 0, gUnknown_81A049B - callstd 4 - release - end + loadword 0, gUnknown_81A049B + callstd 4 + release + end EventScript_170987:: @ 8170987 - special SavePlayerParty - special sub_80CAAAC - loadword 0, gUnknown_81A0598 - callstd 5 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_170A11 - call EventScript_170A1E - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_170A11 - loadword 0, gUnknown_81A0788 - callstd 5 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_170A11 - special LoadPlayerParty - call EventScript_1A4EAF - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_170A11 - special SavePlayerParty - special sub_80A03D8 - loadword 0, gUnknown_81A07C4 - callstd 4 - closemessage - compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_170A2D - compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_170A3F - compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_170A51 - warp MAP_SEVEN_ISLAND_HOUSE_ROOM2, 255, 3, 1 - waitstate - release - end + special SavePlayerParty + special sub_80CAAAC + loadword 0, gUnknown_81A0598 + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_170A11 + call EventScript_170A1E + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_170A11 + loadword 0, gUnknown_81A0788 + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_170A11 + special LoadPlayerParty + call EventScript_1A4EAF + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_170A11 + special SavePlayerParty + special sub_80A03D8 + loadword 0, gUnknown_81A07C4 + callstd 4 + closemessage + compare_var_to_value VAR_FACING, 2 + call_if 1, EventScript_170A2D + compare_var_to_value VAR_FACING, 4 + call_if 1, EventScript_170A3F + compare_var_to_value VAR_FACING, 3 + call_if 1, EventScript_170A51 + warp MAP_SEVEN_ISLAND_HOUSE_ROOM2, 255, 3, 1 + waitstate + release + end EventScript_170A11:: @ 8170A11 - special LoadPlayerParty - loadword 0, gUnknown_81A064E - callstd 4 - release - end + special LoadPlayerParty + loadword 0, gUnknown_81A064E + callstd 4 + release + end EventScript_170A1E:: @ 8170A1E - loadword 0, gUnknown_81A06AB - callstd 4 - fadescreen 1 - special sub_80A0334 - waitstate - return + loadword 0, gUnknown_81A06AB + callstd 4 + fadescreen 1 + special sub_80A0334 + waitstate + return EventScript_170A2D:: @ 8170A2D - applymovement VAR_LAST_TALKED, Movement_170A6F - applymovement 255, Movement_170A63 - waitmovement 0 - return + applymovement VAR_LAST_TALKED, Movement_170A6F + applymovement 255, Movement_170A63 + waitmovement 0 + return EventScript_170A3F:: @ 8170A3F - applymovement VAR_LAST_TALKED, Movement_170A72 - applymovement 255, Movement_170A67 - waitmovement 0 - return + applymovement VAR_LAST_TALKED, Movement_170A72 + applymovement 255, Movement_170A67 + waitmovement 0 + return EventScript_170A51:: @ 8170A51 - applymovement VAR_LAST_TALKED, Movement_170A6F - applymovement 255, Movement_170A6B - waitmovement 0 - return + applymovement VAR_LAST_TALKED, Movement_170A6F + applymovement 255, Movement_170A6B + waitmovement 0 + return Movement_170A63:: @ 8170A63 - step_1c - step_11 - step_11 - step_end + step_1c + step_11 + step_11 + step_end Movement_170A67:: @ 8170A67 - step_1c - step_13 - step_11 - step_end + step_1c + step_13 + step_11 + step_end Movement_170A6B:: @ 8170A6B - step_1c - step_12 - step_11 - step_end + step_1c + step_12 + step_11 + step_end Movement_170A6F:: @ 8170A6F - step_12 - step_30 - step_end + step_12 + step_30 + step_end Movement_170A72:: @ 8170A72 - step_13 - step_2f - step_end + step_13 + step_2f + step_end SevenIsland_House_Room1_EventScript_170A75:: @ 8170A75 - loadword 0, gUnknown_81A0567 - callstd 3 - end + loadword 0, gUnknown_81A0567 + callstd 3 + end diff --git a/data/maps/SevenIsland_House_Room2/scripts.inc b/data/maps/SevenIsland_House_Room2/scripts.inc index 0d10a3bec..57bfa131c 100644 --- a/data/maps/SevenIsland_House_Room2/scripts.inc +++ b/data/maps/SevenIsland_House_Room2/scripts.inc @@ -1,79 +1,79 @@ SevenIsland_House_Room2_MapScripts:: @ 8170A7E - map_script 3, SevenIsland_House_Room2_MapScript1_170A89 - map_script 2, SevenIsland_House_Room2_MapScript2_170A8D - .byte 0 + map_script 3, SevenIsland_House_Room2_MapScript1_170A89 + map_script 2, SevenIsland_House_Room2_MapScript2_170A8D + .byte 0 SevenIsland_House_Room2_MapScript1_170A89:: @ 8170A89 - special sub_80E5E70 - end + special sub_80E5E70 + end SevenIsland_House_Room2_MapScript2_170A8D:: @ 8170A8D - map_script_2 VAR_0x4001, 0, EventScript_170A97 - .2byte 0 + map_script_2 VAR_0x4001, 0, EventScript_170A97 + .2byte 0 EventScript_170A97:: @ 8170A97 - lockall - applymovement 255, Movement_170B22 - waitmovement 0 - special sub_80E7538 - loadword 0, gStringVar4 @ 2021D18 - callstd 4 - closemessage - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 0 - special sub_80E6900 - waitstate - compare_var_to_value VAR_RESULT, 3 - call_if 1, EventScript_170AFE - compare_var_to_value VAR_RESULT, 1 - call_if 1, EventScript_170B0C - compare_var_to_value VAR_RESULT, 2 - call_if 1, EventScript_170B17 - closemessage - special sp000_heal_pokemon - applymovement 255, Movement_170B28 - waitmovement 0 - special LoadPlayerParty - setvar VAR_0x4001, 1 - warp MAP_SEVEN_ISLAND_HOUSE_ROOM1, 255, 4, 1 - waitstate - releaseall - end + lockall + applymovement 255, Movement_170B22 + waitmovement 0 + special sub_80E7538 + loadword 0, gStringVar4 @ 2021D18 + callstd 4 + closemessage + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 0 + special sub_80E6900 + waitstate + compare_var_to_value VAR_RESULT, 3 + call_if 1, EventScript_170AFE + compare_var_to_value VAR_RESULT, 1 + call_if 1, EventScript_170B0C + compare_var_to_value VAR_RESULT, 2 + call_if 1, EventScript_170B17 + closemessage + special sp000_heal_pokemon + applymovement 255, Movement_170B28 + waitmovement 0 + special LoadPlayerParty + setvar VAR_0x4001, 1 + warp MAP_SEVEN_ISLAND_HOUSE_ROOM1, 255, 4, 1 + waitstate + releaseall + end EventScript_170AFE:: @ 8170AFE - setvar VAR_0x4074, 3 - loadword 0, gUnknown_81A07EC - callstd 4 - return + setvar VAR_0x4074, 3 + loadword 0, gUnknown_81A07EC + callstd 4 + return EventScript_170B0C:: @ 8170B0C - setvar VAR_0x4074, 1 - special sub_80CA68C - waitmessage - waitbuttonpress - return + setvar VAR_0x4074, 1 + special sub_80CA68C + waitmessage + waitbuttonpress + return EventScript_170B17:: @ 8170B17 - setvar VAR_0x4074, 2 - special sub_80CA68C - waitmessage - waitbuttonpress - return + setvar VAR_0x4074, 2 + special sub_80CA68C + waitmessage + waitbuttonpress + return Movement_170B22:: @ 8170B22 - step_10 - step_10 - step_10 - step_13 - step_13 - step_end + step_10 + step_10 + step_10 + step_13 + step_13 + step_end Movement_170B28:: @ 8170B28 - step_12 - step_12 - step_11 - step_11 - step_11 - step_11 - step_1b - step_end + step_12 + step_12 + step_11 + step_11 + step_11 + step_11 + step_1b + step_end diff --git a/data/maps/SevenIsland_Mart/scripts.inc b/data/maps/SevenIsland_Mart/scripts.inc index c93fb13cb..6fcb10461 100644 --- a/data/maps/SevenIsland_Mart/scripts.inc +++ b/data/maps/SevenIsland_Mart/scripts.inc @@ -1,46 +1,46 @@ SevenIsland_Mart_MapScripts:: @ 8170B30 - .byte 0 + .byte 0 SevenIsland_Mart_EventScript_170B31:: @ 8170B31 - special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 - lock - faceplayer - message Text_1A6211 - waitmessage - pokemart Items_170B58 - loadword 0, gUnknown_81A5190 - callstd 4 - release - end + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + lock + faceplayer + message Text_1A6211 + waitmessage + pokemart Items_170B58 + loadword 0, gUnknown_81A5190 + callstd 4 + release + end - .align 2 + .align 2 Items_170B58:: @ 8170B58 - .2byte ITEM_ULTRA_BALL - .2byte ITEM_GREAT_BALL - .2byte ITEM_FULL_RESTORE - .2byte ITEM_MAX_POTION - .2byte ITEM_HYPER_POTION - .2byte ITEM_REVIVE - .2byte ITEM_FULL_HEAL - .2byte ITEM_ESCAPE_ROPE - .2byte ITEM_MAX_REPEL - .2byte ITEM_NONE - release - end + .2byte ITEM_ULTRA_BALL + .2byte ITEM_GREAT_BALL + .2byte ITEM_FULL_RESTORE + .2byte ITEM_MAX_POTION + .2byte ITEM_HYPER_POTION + .2byte ITEM_REVIVE + .2byte ITEM_FULL_HEAL + .2byte ITEM_ESCAPE_ROPE + .2byte ITEM_MAX_REPEL + .2byte ITEM_NONE + release + end SevenIsland_Mart_EventScript_170B6E:: @ 8170B6E - loadword 0, gUnknown_81A0A4F - callstd 2 - end + loadword 0, gUnknown_81A0A4F + callstd 2 + end SevenIsland_Mart_EventScript_170B77:: @ 8170B77 - loadword 0, gUnknown_81A0ACC - callstd 2 - end + loadword 0, gUnknown_81A0ACC + callstd 2 + end SevenIsland_Mart_EventScript_170B80:: @ 8170B80 - loadword 0, gUnknown_81A0B09 - callstd 2 - end + loadword 0, gUnknown_81A0B09 + callstd 2 + end diff --git a/data/maps/SevenIsland_PokemonCenter_1F/scripts.inc b/data/maps/SevenIsland_PokemonCenter_1F/scripts.inc index 41a994d4e..3a9681d64 100644 --- a/data/maps/SevenIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/SevenIsland_PokemonCenter_1F/scripts.inc @@ -1,30 +1,30 @@ SevenIsland_PokemonCenter_1F_MapScripts:: @ 8170B89 - map_script 3, SevenIsland_PokemonCenter_1F_MapScript1_170B94 - map_script 5, SevenIsland_PokemonCenter_1F_MapScript2_1BC05C - .byte 0 + map_script 3, SevenIsland_PokemonCenter_1F_MapScript1_170B94 + map_script 5, SevenIsland_PokemonCenter_1F_MapScript2_1BC05C + .byte 0 SevenIsland_PokemonCenter_1F_MapScript1_170B94:: @ 8170B94 - setrespawn 19 - end + setrespawn 19 + end SevenIsland_PokemonCenter_1F_EventScript_170B98:: @ 8170B98 - lock - faceplayer - call EventScript_1A6578 - release - end + lock + faceplayer + call EventScript_1A6578 + release + end SevenIsland_PokemonCenter_1F_EventScript_170BA1:: @ 8170BA1 - loadword 0, gUnknown_81A0B98 - callstd 2 - end + loadword 0, gUnknown_81A0B98 + callstd 2 + end SevenIsland_PokemonCenter_1F_EventScript_170BAA:: @ 8170BAA - loadword 0, gUnknown_81A0C1F - callstd 2 - end + loadword 0, gUnknown_81A0C1F + callstd 2 + end SevenIsland_PokemonCenter_1F_EventScript_170BB3:: @ 8170BB3 - loadword 0, gUnknown_81A0CA5 - callstd 2 - end + loadword 0, gUnknown_81A0CA5 + callstd 2 + end diff --git a/data/maps/SevenIsland_PokemonCenter_2F/scripts.inc b/data/maps/SevenIsland_PokemonCenter_2F/scripts.inc index 31cc13d6c..89d97e0db 100644 --- a/data/maps/SevenIsland_PokemonCenter_2F/scripts.inc +++ b/data/maps/SevenIsland_PokemonCenter_2F/scripts.inc @@ -1,18 +1,18 @@ SevenIsland_PokemonCenter_2F_MapScripts:: @ 8170BBC - map_script 2, SevenIsland_PokemonCenter_2F_MapScript1_1BB2A3 - map_script 4, SevenIsland_PokemonCenter_2F_MapScript2_1BB1ED - map_script 1, SevenIsland_PokemonCenter_2F_MapScript3_1BB237 - map_script 3, SevenIsland_PokemonCenter_2F_MapScript4_1BB1B4 - .byte 0 + map_script 2, SevenIsland_PokemonCenter_2F_MapScript1_1BB2A3 + map_script 4, SevenIsland_PokemonCenter_2F_MapScript2_1BB1ED + map_script 1, SevenIsland_PokemonCenter_2F_MapScript3_1BB237 + map_script 3, SevenIsland_PokemonCenter_2F_MapScript4_1BB1B4 + .byte 0 SevenIsland_PokemonCenter_2F_EventScript_170BD1:: @ 8170BD1 - call EventScript_1BB4A3 - end + call EventScript_1BB4A3 + end EventScript_170BD7:: @ 8170BD7 - call EventScript_1BB6AB - end + call EventScript_1BB6AB + end EventScript_170BDD:: @ 8170BDD - call EventScript_1BB7DE - end + call EventScript_1BB7DE + end diff --git a/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/scripts.inc b/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/scripts.inc index 2ed7255f0..c1eda69bd 100644 --- a/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/scripts.inc +++ b/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/scripts.inc @@ -1,144 +1,144 @@ SevenIsland_SeavaultCanyon_TanobyKey_MapScripts:: @ 8164DCC - map_script 3, SevenIsland_SeavaultCanyon_TanobyKey_MapScript1_164DD2 - .byte 0 + map_script 3, SevenIsland_SeavaultCanyon_TanobyKey_MapScript1_164DD2 + .byte 0 SevenIsland_SeavaultCanyon_TanobyKey_MapScript1_164DD2:: @ 8164DD2 - setworldmapflag 2241 - checkflag 2121 - call_if 1, EventScript_164E07 - setvar VAR_0x4001, 0 - setvar VAR_0x4002, 0 - setvar VAR_0x4003, 0 - setvar VAR_0x4004, 0 - setvar VAR_0x4005, 0 - setvar VAR_0x4006, 0 - setvar VAR_0x4007, 0 - setvar VAR_0x4008, 0 - end + setworldmapflag 2241 + checkflag 2121 + call_if 1, EventScript_164E07 + setvar VAR_0x4001, 0 + setvar VAR_0x4002, 0 + setvar VAR_0x4003, 0 + setvar VAR_0x4004, 0 + setvar VAR_0x4005, 0 + setvar VAR_0x4006, 0 + setvar VAR_0x4007, 0 + setvar VAR_0x4008, 0 + end EventScript_164E07:: @ 8164E07 - setobjectxyperm 1, 7, 2 - setobjectxyperm 2, 4, 4 - setobjectxyperm 3, 10, 4 - setobjectxyperm 4, 5, 6 - setobjectxyperm 5, 9, 6 - setobjectxyperm 6, 5, 8 - setobjectxyperm 7, 9, 8 - return + setobjectxyperm 1, 7, 2 + setobjectxyperm 2, 4, 4 + setobjectxyperm 3, 10, 4 + setobjectxyperm 4, 5, 6 + setobjectxyperm 5, 9, 6 + setobjectxyperm 6, 5, 8 + setobjectxyperm 7, 9, 8 + return SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E39:: @ 8164E39 - lockall - compare_var_to_value VAR_0x4001, 100 - goto_if 1, EventScript_164F8A - call EventScript_164F2E - setvar VAR_0x4001, 100 - compare_var_to_value VAR_0x4008, 7 - goto_if 1, EventScript_164F8C - releaseall - end + lockall + compare_var_to_value VAR_0x4001, 100 + goto_if 1, EventScript_164F8A + call EventScript_164F2E + setvar VAR_0x4001, 100 + compare_var_to_value VAR_0x4008, 7 + goto_if 1, EventScript_164F8C + releaseall + end SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E5C:: @ 8164E5C - lockall - compare_var_to_value VAR_0x4002, 100 - goto_if 1, EventScript_164F8A - call EventScript_164F2E - setvar VAR_0x4002, 100 - compare_var_to_value VAR_0x4008, 7 - goto_if 1, EventScript_164F8C - releaseall - end + lockall + compare_var_to_value VAR_0x4002, 100 + goto_if 1, EventScript_164F8A + call EventScript_164F2E + setvar VAR_0x4002, 100 + compare_var_to_value VAR_0x4008, 7 + goto_if 1, EventScript_164F8C + releaseall + end SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E7F:: @ 8164E7F - lockall - compare_var_to_value VAR_0x4003, 100 - goto_if 1, EventScript_164F8A - call EventScript_164F2E - setvar VAR_0x4003, 100 - compare_var_to_value VAR_0x4008, 7 - goto_if 1, EventScript_164F8C - releaseall - end + lockall + compare_var_to_value VAR_0x4003, 100 + goto_if 1, EventScript_164F8A + call EventScript_164F2E + setvar VAR_0x4003, 100 + compare_var_to_value VAR_0x4008, 7 + goto_if 1, EventScript_164F8C + releaseall + end SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EA2:: @ 8164EA2 - lockall - compare_var_to_value VAR_0x4004, 100 - goto_if 1, EventScript_164F8A - call EventScript_164F2E - setvar VAR_0x4004, 100 - compare_var_to_value VAR_0x4008, 7 - goto_if 1, EventScript_164F8C - releaseall - end + lockall + compare_var_to_value VAR_0x4004, 100 + goto_if 1, EventScript_164F8A + call EventScript_164F2E + setvar VAR_0x4004, 100 + compare_var_to_value VAR_0x4008, 7 + goto_if 1, EventScript_164F8C + releaseall + end SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EC5:: @ 8164EC5 - lockall - compare_var_to_value VAR_0x4005, 100 - goto_if 1, EventScript_164F8A - call EventScript_164F2E - setvar VAR_0x4005, 100 - compare_var_to_value VAR_0x4008, 7 - goto_if 1, EventScript_164F8C - releaseall - end + lockall + compare_var_to_value VAR_0x4005, 100 + goto_if 1, EventScript_164F8A + call EventScript_164F2E + setvar VAR_0x4005, 100 + compare_var_to_value VAR_0x4008, 7 + goto_if 1, EventScript_164F8C + releaseall + end SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EE8:: @ 8164EE8 - lockall - compare_var_to_value VAR_0x4006, 100 - goto_if 1, EventScript_164F8A - call EventScript_164F2E - setvar VAR_0x4006, 100 - compare_var_to_value VAR_0x4008, 7 - goto_if 1, EventScript_164F8C - releaseall - end + lockall + compare_var_to_value VAR_0x4006, 100 + goto_if 1, EventScript_164F8A + call EventScript_164F2E + setvar VAR_0x4006, 100 + compare_var_to_value VAR_0x4008, 7 + goto_if 1, EventScript_164F8C + releaseall + end SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164F0B:: @ 8164F0B - lockall - compare_var_to_value VAR_0x4007, 100 - goto_if 1, EventScript_164F8A - call EventScript_164F2E - setvar VAR_0x4007, 100 - compare_var_to_value VAR_0x4008, 7 - goto_if 1, EventScript_164F8C - releaseall - end + lockall + compare_var_to_value VAR_0x4007, 100 + goto_if 1, EventScript_164F8A + call EventScript_164F2E + setvar VAR_0x4007, 100 + compare_var_to_value VAR_0x4008, 7 + goto_if 1, EventScript_164F8C + releaseall + end EventScript_164F2E:: @ 8164F2E - addvar VAR_0x4008, 1 - playse SE_RU_HYUU - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 1 - setvar VAR_0x8006, 8 - setvar VAR_0x8007, 3 - special sub_80CAC28 - delay 60 - return + addvar VAR_0x4008, 1 + playse SE_RU_HYUU + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 1 + setvar VAR_0x8006, 8 + setvar VAR_0x8007, 3 + special sub_80CAC28 + delay 60 + return EventScript_164F51:: @ 8164F51 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 2 - setvar VAR_0x8006, 10 - setvar VAR_0x8007, 3 - special sub_80CAC28 - delay 60 - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 3 - setvar VAR_0x8006, 12 - setvar VAR_0x8007, 2 - special sub_80CAC28 - delay 60 - playse SE_EXP - waitse - return + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 2 + setvar VAR_0x8006, 10 + setvar VAR_0x8007, 3 + special sub_80CAC28 + delay 60 + setvar VAR_0x8004, 3 + setvar VAR_0x8005, 3 + setvar VAR_0x8006, 12 + setvar VAR_0x8007, 2 + special sub_80CAC28 + delay 60 + playse SE_EXP + waitse + return EventScript_164F8A:: @ 8164F8A - releaseall - end + releaseall + end EventScript_164F8C:: @ 8164F8C - call EventScript_164F51 - loadword 0, gUnknown_817D31B - callstd 4 - setflag 2121 - releaseall - end + call EventScript_164F51 + loadword 0, gUnknown_817D31B + callstd 4 + setflag 2121 + releaseall + end diff --git a/data/maps/SevenIsland_SevaultCanyon/scripts.inc b/data/maps/SevenIsland_SevaultCanyon/scripts.inc index 862439936..68f380f54 100644 --- a/data/maps/SevenIsland_SevaultCanyon/scripts.inc +++ b/data/maps/SevenIsland_SevaultCanyon/scripts.inc @@ -1,7 +1,7 @@ SevenIsland_SevaultCanyon_MapScripts:: @ 8168BFD - .byte 0 + .byte 0 SevenIsland_SevaultCanyon_EventScript_168BFE:: @ 8168BFE - loadword 0, gUnknown_818CF2B - callstd 3 - end + loadword 0, gUnknown_818CF2B + callstd 3 + end diff --git a/data/maps/SevenIsland_SevaultCanyon_Entrance/scripts.inc b/data/maps/SevenIsland_SevaultCanyon_Entrance/scripts.inc index 696ed9483..1a1e6867b 100644 --- a/data/maps/SevenIsland_SevaultCanyon_Entrance/scripts.inc +++ b/data/maps/SevenIsland_SevaultCanyon_Entrance/scripts.inc @@ -1,7 +1,7 @@ SevenIsland_SevaultCanyon_Entrance_MapScripts:: @ 8168BF3 - .byte 0 + .byte 0 SevenIsland_SevaultCanyon_Entrance_EventScript_168BF4:: @ 8168BF4 - loadword 0, gUnknown_818C82D - callstd 3 - end + loadword 0, gUnknown_818C82D + callstd 3 + end diff --git a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc index 31df02ba3..d51aeea0b 100644 --- a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc +++ b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc @@ -1,89 +1,89 @@ SevenIsland_SevaultCanyon_House_MapScripts:: @ 8172182 - .byte 0 + .byte 0 SevenIsland_SevaultCanyon_House_EventScript_172183:: @ 8172183 - lock - checkflag FLAG_0x002 - goto_if 1, EventScript_172211 - playbgm 267, 0 - applymovement 1, Movement_172231 - waitmovement 0 - fadedefaultbgm - delay 30 - applymovement 1, Movement_1A75E1 - waitmovement 0 - loadword 0, gUnknown_81A4D72 - callstd 4 - textcolor 3 - loadword 0, gUnknown_81A4DAF - callstd 5 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_172225 - loadword 0, gUnknown_81A4DD8 - callstd 4 - closemessage - call EventScript_1A6675 - compare_var_to_value VAR_FACING, 1 - call_if 5, EventScript_172206 - delay 30 - playbgm 267, 0 - applymovement 255, Movement_172231 - waitmovement 0 - fadedefaultbgm - delay 30 - call EventScript_1A6C26 - loadword 0, gUnknown_81A4DF5 - callstd 4 - setflag FLAG_0x002 - release - end + lock + checkflag FLAG_0x002 + goto_if 1, EventScript_172211 + playbgm 267, 0 + applymovement 1, Movement_172231 + waitmovement 0 + fadedefaultbgm + delay 30 + applymovement 1, Movement_1A75E1 + waitmovement 0 + loadword 0, gUnknown_81A4D72 + callstd 4 + textcolor 3 + loadword 0, gUnknown_81A4DAF + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_172225 + loadword 0, gUnknown_81A4DD8 + callstd 4 + closemessage + call EventScript_1A6675 + compare_var_to_value VAR_FACING, 1 + call_if 5, EventScript_172206 + delay 30 + playbgm 267, 0 + applymovement 255, Movement_172231 + waitmovement 0 + fadedefaultbgm + delay 30 + call EventScript_1A6C26 + loadword 0, gUnknown_81A4DF5 + callstd 4 + setflag FLAG_0x002 + release + end EventScript_172206:: @ 8172206 - applymovement 255, Movement_1A75ED - waitmovement 0 - return + applymovement 255, Movement_1A75ED + waitmovement 0 + return EventScript_172211:: @ 8172211 - applymovement 1, Movement_1A75E1 - waitmovement 0 - loadword 0, gUnknown_81A4D72 - callstd 4 - release - end + applymovement 1, Movement_1A75E1 + waitmovement 0 + loadword 0, gUnknown_81A4D72 + callstd 4 + release + end EventScript_172225:: @ 8172225 - textcolor 0 - loadword 0, gUnknown_81A4DC8 - callstd 4 - release - end + textcolor 0 + loadword 0, gUnknown_81A4DC8 + callstd 4 + release + end Movement_172231:: @ 8172231 - step_25 - step_1c - step_25 - step_1c - step_25 - step_1c - step_25 - step_1c - step_30 - step_1a - step_2e - step_1a - step_2f - step_1a - step_2d - step_1a - step_end + step_25 + step_1c + step_25 + step_1c + step_25 + step_1c + step_25 + step_1c + step_30 + step_1a + step_2e + step_1a + step_2f + step_1a + step_2d + step_1a + step_end SevenIsland_SevaultCanyon_House_EventScript_172242:: @ 8172242 - lock - faceplayer - waitse - playmoncry SPECIES_CHANSEY, 0 - loadword 0, gUnknown_81A4E26 - callstd 4 - waitmoncry - release - end + lock + faceplayer + waitse + playmoncry SPECIES_CHANSEY, 0 + loadword 0, gUnknown_81A4E26 + callstd 4 + waitmoncry + release + end diff --git a/data/maps/SevenIsland_TanobyRuins/scripts.inc b/data/maps/SevenIsland_TanobyRuins/scripts.inc index 57a3462f1..7bb8054e3 100644 --- a/data/maps/SevenIsland_TanobyRuins/scripts.inc +++ b/data/maps/SevenIsland_TanobyRuins/scripts.inc @@ -1,2 +1,2 @@ SevenIsland_TanobyRuins_MapScripts:: @ 8168C07 - .byte 0 + .byte 0 diff --git a/data/maps/SevenIsland_TanobyRuins_DilfordChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_DilfordChamber/scripts.inc index 421d3c72b..f0b8a602e 100644 --- a/data/maps/SevenIsland_TanobyRuins_DilfordChamber/scripts.inc +++ b/data/maps/SevenIsland_TanobyRuins_DilfordChamber/scripts.inc @@ -1,7 +1,7 @@ SevenIsland_TanobyRuins_DilfordChamber_MapScripts:: @ 8164CF6 - map_script 3, SevenIsland_TanobyRuins_DilfordChamber_MapScript1_164CFC - .byte 0 + map_script 3, SevenIsland_TanobyRuins_DilfordChamber_MapScript1_164CFC + .byte 0 SevenIsland_TanobyRuins_DilfordChamber_MapScript1_164CFC:: @ 8164CFC - call EventScript_1A925E - end + call EventScript_1A925E + end diff --git a/data/maps/SevenIsland_TanobyRuins_LiptooChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_LiptooChamber/scripts.inc index 084d58658..2a9d64e42 100644 --- a/data/maps/SevenIsland_TanobyRuins_LiptooChamber/scripts.inc +++ b/data/maps/SevenIsland_TanobyRuins_LiptooChamber/scripts.inc @@ -1,7 +1,7 @@ SevenIsland_TanobyRuins_LiptooChamber_MapScripts:: @ 8164CDE - map_script 3, SevenIsland_TanobyRuins_LiptooChamber_MapScript1_164CE4 - .byte 0 + map_script 3, SevenIsland_TanobyRuins_LiptooChamber_MapScript1_164CE4 + .byte 0 SevenIsland_TanobyRuins_LiptooChamber_MapScript1_164CE4:: @ 8164CE4 - call EventScript_1A925E - end + call EventScript_1A925E + end diff --git a/data/maps/SevenIsland_TanobyRuins_MoneanChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_MoneanChamber/scripts.inc index 776299736..e67f50d40 100644 --- a/data/maps/SevenIsland_TanobyRuins_MoneanChamber/scripts.inc +++ b/data/maps/SevenIsland_TanobyRuins_MoneanChamber/scripts.inc @@ -1,8 +1,8 @@ SevenIsland_TanobyRuins_MoneanChamber_MapScripts:: @ 8164CCF - map_script 3, SevenIsland_TanobyRuins_MoneanChamber_MapScript1_164CD5 - .byte 0 + map_script 3, SevenIsland_TanobyRuins_MoneanChamber_MapScript1_164CD5 + .byte 0 SevenIsland_TanobyRuins_MoneanChamber_MapScript1_164CD5:: @ 8164CD5 - setworldmapflag 2239 - call EventScript_1A925E - end + setworldmapflag 2239 + call EventScript_1A925E + end diff --git a/data/maps/SevenIsland_TanobyRuins_RixyChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_RixyChamber/scripts.inc index cb97039f3..de1c0cd97 100644 --- a/data/maps/SevenIsland_TanobyRuins_RixyChamber/scripts.inc +++ b/data/maps/SevenIsland_TanobyRuins_RixyChamber/scripts.inc @@ -1,7 +1,7 @@ SevenIsland_TanobyRuins_RixyChamber_MapScripts:: @ 8164D0E - map_script 3, SevenIsland_TanobyRuins_RixyChamber_MapScript1_164D14 - .byte 0 + map_script 3, SevenIsland_TanobyRuins_RixyChamber_MapScript1_164D14 + .byte 0 SevenIsland_TanobyRuins_RixyChamber_MapScript1_164D14:: @ 8164D14 - call EventScript_1A925E - end + call EventScript_1A925E + end diff --git a/data/maps/SevenIsland_TanobyRuins_ScufibChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_ScufibChamber/scripts.inc index 4c825e5c3..2cbb2d08d 100644 --- a/data/maps/SevenIsland_TanobyRuins_ScufibChamber/scripts.inc +++ b/data/maps/SevenIsland_TanobyRuins_ScufibChamber/scripts.inc @@ -1,7 +1,7 @@ SevenIsland_TanobyRuins_ScufibChamber_MapScripts:: @ 8164D02 - map_script 3, SevenIsland_TanobyRuins_ScufibChamber_MapScript1_164D08 - .byte 0 + map_script 3, SevenIsland_TanobyRuins_ScufibChamber_MapScript1_164D08 + .byte 0 SevenIsland_TanobyRuins_ScufibChamber_MapScript1_164D08:: @ 8164D08 - call EventScript_1A925E - end + call EventScript_1A925E + end diff --git a/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/scripts.inc index 8a6d8d90d..ea63fa0ea 100644 --- a/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/scripts.inc +++ b/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/scripts.inc @@ -1,7 +1,7 @@ SevenIsland_TanobyRuins_ViapoisChamber_MapScripts:: @ 8164D1A - map_script 3, SevenIsland_TanobyRuins_ViapoisChamber_MapScript1_164D20 - .byte 0 + map_script 3, SevenIsland_TanobyRuins_ViapoisChamber_MapScript1_164D20 + .byte 0 SevenIsland_TanobyRuins_ViapoisChamber_MapScript1_164D20:: @ 8164D20 - call EventScript_1A925E - end + call EventScript_1A925E + end diff --git a/data/maps/SevenIsland_TanobyRuins_WeepthChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_WeepthChamber/scripts.inc index facb265c2..ae8294f89 100644 --- a/data/maps/SevenIsland_TanobyRuins_WeepthChamber/scripts.inc +++ b/data/maps/SevenIsland_TanobyRuins_WeepthChamber/scripts.inc @@ -1,7 +1,7 @@ SevenIsland_TanobyRuins_WeepthChamber_MapScripts:: @ 8164CEA - map_script 3, SevenIsland_TanobyRuins_WeepthChamber_MapScript1_164CF0 - .byte 0 + map_script 3, SevenIsland_TanobyRuins_WeepthChamber_MapScript1_164CF0 + .byte 0 SevenIsland_TanobyRuins_WeepthChamber_MapScript1_164CF0:: @ 8164CF0 - call EventScript_1A925E - end + call EventScript_1A925E + end diff --git a/data/maps/SevenIsland_TrainerTower/scripts.inc b/data/maps/SevenIsland_TrainerTower/scripts.inc index db1321f48..003bc4ee9 100644 --- a/data/maps/SevenIsland_TrainerTower/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower/scripts.inc @@ -1,17 +1,17 @@ SevenIsland_TrainerTower_MapScripts:: @ 8168BD5 - map_script 3, SevenIsland_TrainerTower_MapScript1_168BDB - .byte 0 + map_script 3, SevenIsland_TrainerTower_MapScript1_168BDB + .byte 0 SevenIsland_TrainerTower_MapScript1_168BDB:: @ 8168BDB - setvar VAR_0x4082, 0 - end + setvar VAR_0x4082, 0 + end SevenIsland_TrainerTower_EventScript_168BE1:: @ 8168BE1 - loadword 0, gUnknown_818C338 - callstd 3 - end + loadword 0, gUnknown_818C338 + callstd 3 + end SevenIsland_TrainerTower_EventScript_168BEA:: @ 8168BEA - loadword 0, gUnknown_818C370 - callstd 3 - end + loadword 0, gUnknown_818C370 + callstd 3 + end diff --git a/data/maps/SevenIsland_TrainerTower_1F/scripts.inc b/data/maps/SevenIsland_TrainerTower_1F/scripts.inc index 8ff1c438f..eb9475260 100644 --- a/data/maps/SevenIsland_TrainerTower_1F/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_1F/scripts.inc @@ -1,8 +1,8 @@ SevenIsland_TrainerTower_1F_MapScripts:: @ 81646B8 - map_script 5, SevenIsland_TrainerTower_1F_MapScript1_1C4F54 - map_script 3, SevenIsland_TrainerTower_1F_MapScript2_1C4F62 - map_script 2, SevenIsland_TrainerTower_1F_MapScript3_1C5046 - .byte 0 + map_script 5, SevenIsland_TrainerTower_1F_MapScript1_1C4F54 + map_script 3, SevenIsland_TrainerTower_1F_MapScript2_1C4F62 + map_script 2, SevenIsland_TrainerTower_1F_MapScript3_1C5046 + .byte 0 SevenIsland_TrainerTower_2F_EventScript_1646C8:: @ 81646C8 SevenIsland_TrainerTower_4F_EventScript_1646C8:: @ 81646C8 @@ -12,8 +12,8 @@ SevenIsland_TrainerTower_5F_EventScript_1646C8:: @ 81646C8 SevenIsland_TrainerTower_7F_EventScript_1646C8:: @ 81646C8 SevenIsland_TrainerTower_3F_EventScript_1646C8:: @ 81646C8 SevenIsland_TrainerTower_1F_EventScript_1646C8:: @ 81646C8 - call EventScript_1C52F4 - end + call EventScript_1C52F4 + end SevenIsland_TrainerTower_2F_EventScript_1646CE:: @ 81646CE SevenIsland_TrainerTower_4F_EventScript_1646CE:: @ 81646CE @@ -23,8 +23,8 @@ SevenIsland_TrainerTower_5F_EventScript_1646CE:: @ 81646CE SevenIsland_TrainerTower_7F_EventScript_1646CE:: @ 81646CE SevenIsland_TrainerTower_3F_EventScript_1646CE:: @ 81646CE SevenIsland_TrainerTower_1F_EventScript_1646CE:: @ 81646CE - call EventScript_1C533B - end + call EventScript_1C533B + end SevenIsland_TrainerTower_2F_EventScript_1646D4:: @ 81646D4 SevenIsland_TrainerTower_4F_EventScript_1646D4:: @ 81646D4 @@ -34,8 +34,8 @@ SevenIsland_TrainerTower_5F_EventScript_1646D4:: @ 81646D4 SevenIsland_TrainerTower_7F_EventScript_1646D4:: @ 81646D4 SevenIsland_TrainerTower_3F_EventScript_1646D4:: @ 81646D4 SevenIsland_TrainerTower_1F_EventScript_1646D4:: @ 81646D4 - call EventScript_1C5382 - end + call EventScript_1C5382 + end SevenIsland_TrainerTower_2F_EventScript_1646DA:: @ 81646DA SevenIsland_TrainerTower_4F_EventScript_1646DA:: @ 81646DA @@ -45,8 +45,8 @@ SevenIsland_TrainerTower_5F_EventScript_1646DA:: @ 81646DA SevenIsland_TrainerTower_7F_EventScript_1646DA:: @ 81646DA SevenIsland_TrainerTower_3F_EventScript_1646DA:: @ 81646DA SevenIsland_TrainerTower_1F_EventScript_1646DA:: @ 81646DA - call EventScript_1C538C - end + call EventScript_1C538C + end SevenIsland_TrainerTower_2F_EventScript_1646E0:: @ 81646E0 SevenIsland_TrainerTower_4F_EventScript_1646E0:: @ 81646E0 @@ -56,5 +56,5 @@ SevenIsland_TrainerTower_7F_EventScript_1646E0:: @ 81646E0 SevenIsland_TrainerTower_Roof_EventScript_1646E0:: @ 81646E0 SevenIsland_TrainerTower_5F_EventScript_1646E0:: @ 81646E0 SevenIsland_TrainerTower_3F_EventScript_1646E0:: @ 81646E0 - call EventScript_1C53AA - end + call EventScript_1C53AA + end diff --git a/data/maps/SevenIsland_TrainerTower_2F/scripts.inc b/data/maps/SevenIsland_TrainerTower_2F/scripts.inc index c62250bb9..91107975b 100644 --- a/data/maps/SevenIsland_TrainerTower_2F/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_2F/scripts.inc @@ -1,25 +1,25 @@ SevenIsland_TrainerTower_2F_MapScripts:: @ 81646E6 - map_script 5, SevenIsland_TrainerTower_2F_MapScript1_1C4F54 - map_script 3, SevenIsland_TrainerTower_2F_MapScript2_1C4F62 - map_script 2, SevenIsland_TrainerTower_2F_MapScript3_1C5046 - .byte 0 + map_script 5, SevenIsland_TrainerTower_2F_MapScript1_1C4F54 + map_script 3, SevenIsland_TrainerTower_2F_MapScript2_1C4F62 + map_script 2, SevenIsland_TrainerTower_2F_MapScript3_1C5046 + .byte 0 SevenIsland_TrainerTower_2F_EventScript_1646F6:: @ 81646F6 - call EventScript_1C52F4 - end + call EventScript_1C52F4 + end EventScript_1646FC:: @ 81646FC - call EventScript_1C533B - end + call EventScript_1C533B + end EventScript_164702:: @ 8164702 - call EventScript_1C5382 - end + call EventScript_1C5382 + end EventScript_164708:: @ 8164708 - call EventScript_1C538C - end + call EventScript_1C538C + end EventScript_16470E:: @ 816470E - call EventScript_1C53AA - end + call EventScript_1C53AA + end diff --git a/data/maps/SevenIsland_TrainerTower_3F/scripts.inc b/data/maps/SevenIsland_TrainerTower_3F/scripts.inc index c2dcd426f..c4ecde9a0 100644 --- a/data/maps/SevenIsland_TrainerTower_3F/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_3F/scripts.inc @@ -1,25 +1,25 @@ SevenIsland_TrainerTower_3F_MapScripts:: @ 8164714 - map_script 5, SevenIsland_TrainerTower_3F_MapScript1_1C4F54 - map_script 3, SevenIsland_TrainerTower_3F_MapScript2_1C4F62 - map_script 2, SevenIsland_TrainerTower_3F_MapScript3_1C5046 - .byte 0 + map_script 5, SevenIsland_TrainerTower_3F_MapScript1_1C4F54 + map_script 3, SevenIsland_TrainerTower_3F_MapScript2_1C4F62 + map_script 2, SevenIsland_TrainerTower_3F_MapScript3_1C5046 + .byte 0 SevenIsland_TrainerTower_3F_EventScript_164724:: @ 8164724 - call EventScript_1C52F4 - end + call EventScript_1C52F4 + end EventScript_16472A:: @ 816472A - call EventScript_1C533B - end + call EventScript_1C533B + end EventScript_164730:: @ 8164730 - call EventScript_1C5382 - end + call EventScript_1C5382 + end EventScript_164736:: @ 8164736 - call EventScript_1C538C - end + call EventScript_1C538C + end EventScript_16473C:: @ 816473C - call EventScript_1C53AA - end + call EventScript_1C53AA + end diff --git a/data/maps/SevenIsland_TrainerTower_4F/scripts.inc b/data/maps/SevenIsland_TrainerTower_4F/scripts.inc index d1cf8a2fc..32d17a844 100644 --- a/data/maps/SevenIsland_TrainerTower_4F/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_4F/scripts.inc @@ -1,25 +1,25 @@ SevenIsland_TrainerTower_4F_MapScripts:: @ 8164742 - map_script 5, SevenIsland_TrainerTower_4F_MapScript1_1C4F54 - map_script 3, SevenIsland_TrainerTower_4F_MapScript2_1C4F62 - map_script 2, SevenIsland_TrainerTower_4F_MapScript3_1C5046 - .byte 0 + map_script 5, SevenIsland_TrainerTower_4F_MapScript1_1C4F54 + map_script 3, SevenIsland_TrainerTower_4F_MapScript2_1C4F62 + map_script 2, SevenIsland_TrainerTower_4F_MapScript3_1C5046 + .byte 0 SevenIsland_TrainerTower_4F_EventScript_164752:: @ 8164752 - call EventScript_1C52F4 - end + call EventScript_1C52F4 + end EventScript_164758:: @ 8164758 - call EventScript_1C533B - end + call EventScript_1C533B + end EventScript_16475E:: @ 816475E - call EventScript_1C5382 - end + call EventScript_1C5382 + end EventScript_164764:: @ 8164764 - call EventScript_1C538C - end + call EventScript_1C538C + end EventScript_16476A:: @ 816476A - call EventScript_1C53AA - end + call EventScript_1C53AA + end diff --git a/data/maps/SevenIsland_TrainerTower_5F/scripts.inc b/data/maps/SevenIsland_TrainerTower_5F/scripts.inc index de118c6ca..5c461c0e8 100644 --- a/data/maps/SevenIsland_TrainerTower_5F/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_5F/scripts.inc @@ -1,25 +1,25 @@ SevenIsland_TrainerTower_5F_MapScripts:: @ 8164770 - map_script 5, SevenIsland_TrainerTower_5F_MapScript1_1C4F54 - map_script 3, SevenIsland_TrainerTower_5F_MapScript2_1C4F62 - map_script 2, SevenIsland_TrainerTower_5F_MapScript3_1C5046 - .byte 0 + map_script 5, SevenIsland_TrainerTower_5F_MapScript1_1C4F54 + map_script 3, SevenIsland_TrainerTower_5F_MapScript2_1C4F62 + map_script 2, SevenIsland_TrainerTower_5F_MapScript3_1C5046 + .byte 0 SevenIsland_TrainerTower_5F_EventScript_164780:: @ 8164780 - call EventScript_1C52F4 - end + call EventScript_1C52F4 + end EventScript_164786:: @ 8164786 - call EventScript_1C533B - end + call EventScript_1C533B + end EventScript_16478C:: @ 816478C - call EventScript_1C5382 - end + call EventScript_1C5382 + end EventScript_164792:: @ 8164792 - call EventScript_1C538C - end + call EventScript_1C538C + end EventScript_164798:: @ 8164798 - call EventScript_1C53AA - end + call EventScript_1C53AA + end diff --git a/data/maps/SevenIsland_TrainerTower_6F/scripts.inc b/data/maps/SevenIsland_TrainerTower_6F/scripts.inc index d3b558300..5dd711203 100644 --- a/data/maps/SevenIsland_TrainerTower_6F/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_6F/scripts.inc @@ -1,25 +1,25 @@ SevenIsland_TrainerTower_6F_MapScripts:: @ 816479E - map_script 5, SevenIsland_TrainerTower_6F_MapScript1_1C4F54 - map_script 3, SevenIsland_TrainerTower_6F_MapScript2_1C4F62 - map_script 2, SevenIsland_TrainerTower_6F_MapScript3_1C5046 - .byte 0 + map_script 5, SevenIsland_TrainerTower_6F_MapScript1_1C4F54 + map_script 3, SevenIsland_TrainerTower_6F_MapScript2_1C4F62 + map_script 2, SevenIsland_TrainerTower_6F_MapScript3_1C5046 + .byte 0 SevenIsland_TrainerTower_6F_EventScript_1647AE:: @ 81647AE - call EventScript_1C52F4 - end + call EventScript_1C52F4 + end EventScript_1647B4:: @ 81647B4 - call EventScript_1C533B - end + call EventScript_1C533B + end EventScript_1647BA:: @ 81647BA - call EventScript_1C5382 - end + call EventScript_1C5382 + end EventScript_1647C0:: @ 81647C0 - call EventScript_1C538C - end + call EventScript_1C538C + end EventScript_1647C6:: @ 81647C6 - call EventScript_1C53AA - end + call EventScript_1C53AA + end diff --git a/data/maps/SevenIsland_TrainerTower_7F/scripts.inc b/data/maps/SevenIsland_TrainerTower_7F/scripts.inc index e59cc0166..2a74cfb91 100644 --- a/data/maps/SevenIsland_TrainerTower_7F/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_7F/scripts.inc @@ -1,25 +1,25 @@ SevenIsland_TrainerTower_7F_MapScripts:: @ 81647CC - map_script 5, SevenIsland_TrainerTower_7F_MapScript1_1C4F54 - map_script 3, SevenIsland_TrainerTower_7F_MapScript2_1C4F62 - map_script 2, SevenIsland_TrainerTower_7F_MapScript3_1C5046 - .byte 0 + map_script 5, SevenIsland_TrainerTower_7F_MapScript1_1C4F54 + map_script 3, SevenIsland_TrainerTower_7F_MapScript2_1C4F62 + map_script 2, SevenIsland_TrainerTower_7F_MapScript3_1C5046 + .byte 0 SevenIsland_TrainerTower_7F_EventScript_1647DC:: @ 81647DC - call EventScript_1C52F4 - end + call EventScript_1C52F4 + end EventScript_1647E2:: @ 81647E2 - call EventScript_1C533B - end + call EventScript_1C533B + end EventScript_1647E8:: @ 81647E8 - call EventScript_1C5382 - end + call EventScript_1C5382 + end EventScript_1647EE:: @ 81647EE - call EventScript_1C538C - end + call EventScript_1C538C + end EventScript_1647F4:: @ 81647F4 - call EventScript_1C53AA - end + call EventScript_1C53AA + end diff --git a/data/maps/SevenIsland_TrainerTower_8F/scripts.inc b/data/maps/SevenIsland_TrainerTower_8F/scripts.inc index 1907ddebc..1219425d0 100644 --- a/data/maps/SevenIsland_TrainerTower_8F/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_8F/scripts.inc @@ -1,25 +1,25 @@ SevenIsland_TrainerTower_8F_MapScripts:: @ 81647FA - map_script 5, SevenIsland_TrainerTower_8F_MapScript1_1C4F54 - map_script 3, SevenIsland_TrainerTower_8F_MapScript2_1C4F62 - map_script 2, SevenIsland_TrainerTower_8F_MapScript3_1C5046 - .byte 0 + map_script 5, SevenIsland_TrainerTower_8F_MapScript1_1C4F54 + map_script 3, SevenIsland_TrainerTower_8F_MapScript2_1C4F62 + map_script 2, SevenIsland_TrainerTower_8F_MapScript3_1C5046 + .byte 0 SevenIsland_TrainerTower_8F_EventScript_16480A:: @ 816480A - call EventScript_1C52F4 - end + call EventScript_1C52F4 + end EventScript_164810:: @ 8164810 - call EventScript_1C533B - end + call EventScript_1C533B + end EventScript_164816:: @ 8164816 - call EventScript_1C5382 - end + call EventScript_1C5382 + end EventScript_16481C:: @ 816481C - call EventScript_1C538C - end + call EventScript_1C538C + end EventScript_164822:: @ 8164822 - call EventScript_1C53AA - end + call EventScript_1C53AA + end diff --git a/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc b/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc index b956d3aca..736a2aa40 100644 --- a/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc @@ -1,87 +1,87 @@ SevenIsland_TrainerTower_Elevator_MapScripts:: @ 8164AF8 - map_script 5, SevenIsland_TrainerTower_Elevator_MapScript1_1C4F54 - map_script 2, SevenIsland_TrainerTower_Elevator_MapScript2_1C5046 - .byte 0 + map_script 5, SevenIsland_TrainerTower_Elevator_MapScript1_1C4F54 + map_script 2, SevenIsland_TrainerTower_Elevator_MapScript2_1C5046 + .byte 0 SevenIsland_TrainerTower_Elevator_EventScript_164B03:: @ 8164B03 - lockall - setvar VAR_0x8004, 6 - checkflag FLAG_0x002 - call_if 0, EventScript_1A7AB9 - copyvar VAR_0x8005, VAR_0x403A - special sub_80CB580 - message Text_1A535C - waitmessage - setvar VAR_0x8004, 6 - specialvar VAR_RESULT, sub_80CB328 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_164B46 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_164B52 - end + lockall + setvar VAR_0x8004, 6 + checkflag FLAG_0x002 + call_if 0, EventScript_1A7AB9 + copyvar VAR_0x8005, VAR_0x403A + special sub_80CB580 + message Text_1A535C + waitmessage + setvar VAR_0x8004, 6 + specialvar VAR_RESULT, sub_80CB328 + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_164B46 + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_164B52 + end EventScript_164B46:: @ 8164B46 - multichoicedefault 0, 0, 20, 0, 0 - goto EventScript_164B5E - end + multichoicedefault 0, 0, 20, 0, 0 + goto EventScript_164B5E + end EventScript_164B52:: @ 8164B52 - multichoicedefault 0, 0, 20, 1, 0 - goto EventScript_164B5E - end + multichoicedefault 0, 0, 20, 1, 0 + goto EventScript_164B5E + end EventScript_164B5E:: @ 8164B5E - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_164BCD - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_164B90 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_164BD3 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_164BD3 - end + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_164BCD + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_164B90 + compare_var_to_value VAR_0x8000, 2 + goto_if 1, EventScript_164BD3 + compare_var_to_value VAR_0x8000, 127 + goto_if 1, EventScript_164BD3 + end EventScript_164B90:: @ 8164B90 - setvar VAR_0x8006, 3 - setdynamicwarp MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY, 255, 17, 8 - compare_var_to_value VAR_0x403A, 3 - goto_if 1, EventScript_164BD3 - call EventScript_164BD8 - setvar VAR_0x403A, 3 - special sub_80CB63C - delay 25 - applymovement 255, Movement_164BE5 - waitmovement 0 - warp MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY, 255, 17, 8 - waitstate - releaseall - end + setvar VAR_0x8006, 3 + setdynamicwarp MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY, 255, 17, 8 + compare_var_to_value VAR_0x403A, 3 + goto_if 1, EventScript_164BD3 + call EventScript_164BD8 + setvar VAR_0x403A, 3 + special sub_80CB63C + delay 25 + applymovement 255, Movement_164BE5 + waitmovement 0 + warp MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY, 255, 17, 8 + waitstate + releaseall + end EventScript_164BCD:: @ 8164BCD - goto EventScript_164BD3 - end + goto EventScript_164BD3 + end EventScript_164BD3:: @ 8164BD3 - special sub_80CB63C - releaseall - end + special sub_80CB63C + releaseall + end EventScript_164BD8:: @ 8164BD8 - special sub_80CB63C - closemessage - waitse - special sub_80CB498 - waitstate - setflag FLAG_0x002 - return + special sub_80CB63C + closemessage + waitse + special sub_80CB498 + waitstate + setflag FLAG_0x002 + return Movement_164BE5:: @ 8164BE5 - step_2d - step_1c - step_10 - step_13 - step_13 - step_10 - step_end + step_2d + step_1c + step_10 + step_13 + step_13 + step_10 + step_end diff --git a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc index 060847ef0..2f1ebc267 100644 --- a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc @@ -1,263 +1,263 @@ SevenIsland_TrainerTower_Lobby_MapScripts:: @ 8164839 - map_script 5, SevenIsland_TrainerTower_Lobby_MapScript1_164853 - map_script 7, SevenIsland_TrainerTower_Lobby_MapScript2_164887 - map_script 3, SevenIsland_TrainerTower_Lobby_MapScript3_1648AD - map_script 1, SevenIsland_TrainerTower_Lobby_MapScript4_164897 - map_script 2, SevenIsland_TrainerTower_Lobby_MapScript5_1648B6 - .byte 0 + map_script 5, SevenIsland_TrainerTower_Lobby_MapScript1_164853 + map_script 7, SevenIsland_TrainerTower_Lobby_MapScript2_164887 + map_script 3, SevenIsland_TrainerTower_Lobby_MapScript3_1648AD + map_script 1, SevenIsland_TrainerTower_Lobby_MapScript4_164897 + map_script 2, SevenIsland_TrainerTower_Lobby_MapScript5_1648B6 + .byte 0 SevenIsland_TrainerTower_Lobby_MapScript1_164853:: @ 8164853 - setvar VAR_0x4002, 0 - setvar VAR_0x8004, 10 - special sub_815D9E8 - setvar VAR_0x8004, 18 - special sub_815D9E8 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_164886 - setvar VAR_0x4000, 0 - setobjectxy 255, 9, 7 - applymovement 255, Movement_164AD4 + setvar VAR_0x4002, 0 + setvar VAR_0x8004, 10 + special sub_815D9E8 + setvar VAR_0x8004, 18 + special sub_815D9E8 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_164886 + setvar VAR_0x4000, 0 + setobjectxy 255, 9, 7 + applymovement 255, Movement_164AD4 EventScript_164886:: @ 8164886 - end + end SevenIsland_TrainerTower_Lobby_MapScript2_164887:: @ 8164887 - addobject 1 - addobject 2 - addobject 3 - addobject 4 - addobject 5 - end + addobject 1 + addobject 2 + addobject 3 + addobject 4 + addobject 5 + end SevenIsland_TrainerTower_Lobby_MapScript4_164897:: @ 8164897 - compare_var_to_value VAR_0x400D, 17 - call_if 1, EventScript_1648A3 - end + compare_var_to_value VAR_0x400D, 17 + call_if 1, EventScript_1648A3 + end EventScript_1648A3:: @ 81648A3 - setmetatile 17, 10, 647, 0 - return + setmetatile 17, 10, 647, 0 + return SevenIsland_TrainerTower_Lobby_MapScript3_1648AD:: @ 81648AD - setworldmapflag 2234 - getplayerxy VAR_0x400D, VAR_RESULT - end + setworldmapflag 2234 + getplayerxy VAR_0x400D, VAR_RESULT + end SevenIsland_TrainerTower_Lobby_MapScript5_1648B6:: @ 81648B6 - map_script_2 VAR_0x4000, 0, EventScript_1648ED - map_script_2 VAR_0x400D, 0x11, EventScript_1648C8 - .2byte 0 + map_script_2 VAR_0x4000, 0, EventScript_1648ED + map_script_2 VAR_0x400D, 0x11, EventScript_1648C8 + .2byte 0 EventScript_1648C8:: @ 81648C8 - lockall - applymovement 255, Movement_1648EA - waitmovement 0 - setmetatile 17, 10, 692, 1 - special DrawWholeMapView - playse SE_N - waitse - setvar VAR_0x400D, 0 - releaseall - end + lockall + applymovement 255, Movement_1648EA + waitmovement 0 + setmetatile 17, 10, 692, 1 + special DrawWholeMapView + playse SE_N + waitse + setvar VAR_0x400D, 0 + releaseall + end Movement_1648EA:: @ 81648EA - step_10 - step_10 - step_end + step_10 + step_10 + step_end EventScript_1648ED:: @ 81648ED - setvar VAR_0x4000, 1 - setvar VAR_0x8004, 12 - special sub_815D9E8 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_164920 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_164938 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_16495C + setvar VAR_0x4000, 1 + setvar VAR_0x8004, 12 + special sub_815D9E8 + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_164920 + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_164938 + compare_var_to_value VAR_0x8000, 2 + goto_if 1, EventScript_16495C EventScript_164920:: @ 8164920 - lock - faceplayer - applymovement 255, Movement_164AD4 - textcolor 1 - loadword 0, gUnknown_817C937 - callstd 4 - goto EventScript_16494B + lock + faceplayer + applymovement 255, Movement_164AD4 + textcolor 1 + loadword 0, gUnknown_817C937 + callstd 4 + goto EventScript_16494B EventScript_164938:: @ 8164938 - lock - faceplayer - applymovement 255, Movement_164AD4 - textcolor 1 - loadword 0, gUnknown_817C9C0 - callstd 4 + lock + faceplayer + applymovement 255, Movement_164AD4 + textcolor 1 + loadword 0, gUnknown_817C9C0 + callstd 4 EventScript_16494B:: @ 816494B - closemessage - applymovement 255, Movement_164AD6 - waitmovement 0 - setvar VAR_0x4082, 0 - release + closemessage + applymovement 255, Movement_164AD6 + waitmovement 0 + setvar VAR_0x4082, 0 + release EventScript_16495C:: @ 816495C - end + end SevenIsland_TrainerTower_Lobby_EventScript_16495D:: @ 816495D - lock - faceplayer - call EventScript_1A6578 - release - end + lock + faceplayer + call EventScript_1A6578 + release + end SevenIsland_TrainerTower_Lobby_EventScript_164966:: @ 8164966 - lock - faceplayer - setvar VAR_0x8004, 20 - special sub_815D9E8 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_164988 - loadword 0, gUnknown_817C9A2 - callstd 4 - goto EventScript_164990 + lock + faceplayer + setvar VAR_0x8004, 20 + special sub_815D9E8 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_164988 + loadword 0, gUnknown_817C9A2 + callstd 4 + goto EventScript_164990 EventScript_164988:: @ 8164988 - loadword 0, gUnknown_817CE1F - callstd 4 + loadword 0, gUnknown_817CE1F + callstd 4 EventScript_164990:: @ 8164990 - release - end + release + end SevenIsland_TrainerTower_Lobby_EventScript_164992:: @ 8164992 - special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 - lock - faceplayer - message Text_1A6211 - waitmessage - pokemart Items_1649B8 - loadword 0, gUnknown_81A5190 - callstd 4 - release - end - - .align 2 + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + lock + faceplayer + message Text_1A6211 + waitmessage + pokemart Items_1649B8 + loadword 0, gUnknown_81A5190 + callstd 4 + release + end + + .align 2 Items_1649B8:: @ 81649B8 - .2byte ITEM_ULTRA_BALL - .2byte ITEM_GREAT_BALL - .2byte ITEM_FULL_RESTORE - .2byte ITEM_MAX_POTION - .2byte ITEM_HYPER_POTION - .2byte ITEM_REVIVE - .2byte ITEM_FULL_HEAL - .2byte ITEM_ESCAPE_ROPE - .2byte ITEM_MAX_REPEL - .2byte ITEM_NONE - release - end + .2byte ITEM_ULTRA_BALL + .2byte ITEM_GREAT_BALL + .2byte ITEM_FULL_RESTORE + .2byte ITEM_MAX_POTION + .2byte ITEM_HYPER_POTION + .2byte ITEM_REVIVE + .2byte ITEM_FULL_HEAL + .2byte ITEM_ESCAPE_ROPE + .2byte ITEM_MAX_REPEL + .2byte ITEM_NONE + release + end SevenIsland_TrainerTower_Lobby_EventScript_1649CE:: @ 81649CE - lockall - applymovement 255, Movement_164AD4 - textcolor 1 - loadword 0, gUnknown_817C794 - callstd 4 - setvar VAR_0x8004, 17 - special sub_815D9E8 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_164A00 - loadword 0, gUnknown_817C7D9 - callstd 4 - goto EventScript_164A08 + lockall + applymovement 255, Movement_164AD4 + textcolor 1 + loadword 0, gUnknown_817C794 + callstd 4 + setvar VAR_0x8004, 17 + special sub_815D9E8 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_164A00 + loadword 0, gUnknown_817C7D9 + callstd 4 + goto EventScript_164A08 EventScript_164A00:: @ 8164A00 - loadword 0, gUnknown_817C850 - callstd 4 + loadword 0, gUnknown_817C850 + callstd 4 EventScript_164A08:: @ 8164A08 - message Text_17C88D - waitmessage - multichoice 18, 6, 16, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_164A53 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_164ABF - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_164A45 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_164ABF - end + message Text_17C88D + waitmessage + multichoice 18, 6, 16, 0 + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_164A53 + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_164ABF + compare_var_to_value VAR_0x8000, 2 + goto_if 1, EventScript_164A45 + compare_var_to_value VAR_0x8000, 127 + goto_if 1, EventScript_164ABF + end EventScript_164A45:: @ 8164A45 - loadword 0, gUnknown_817CCC9 - callstd 4 - goto EventScript_164A08 - end + loadword 0, gUnknown_817CCC9 + callstd 4 + goto EventScript_164A08 + end EventScript_164A53:: @ 8164A53 - multichoice 13, 3, 64, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_164AA0 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_164AA0 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_164AA0 - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_164AA0 - compare_var_to_value VAR_0x8000, 4 - goto_if 1, EventScript_164ABF - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_164ABF - end + multichoice 13, 3, 64, 0 + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_164AA0 + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_164AA0 + compare_var_to_value VAR_0x8000, 2 + goto_if 1, EventScript_164AA0 + compare_var_to_value VAR_0x8000, 3 + goto_if 1, EventScript_164AA0 + compare_var_to_value VAR_0x8000, 4 + goto_if 1, EventScript_164ABF + compare_var_to_value VAR_0x8000, 127 + goto_if 1, EventScript_164ABF + end EventScript_164AA0:: @ 8164AA0 - copyvar VAR_0x8005, VAR_RESULT - setvar VAR_0x4082, 1 - special sp000_heal_pokemon - loadword 0, gUnknown_817C8BF - callstd 4 - setvar VAR_0x8004, 6 - special sub_815D9E8 - releaseall - end + copyvar VAR_0x8005, VAR_RESULT + setvar VAR_0x4082, 1 + special sp000_heal_pokemon + loadword 0, gUnknown_817C8BF + callstd 4 + setvar VAR_0x8004, 6 + special sub_815D9E8 + releaseall + end EventScript_164ABF:: @ 8164ABF - loadword 0, gUnknown_817C91D - callstd 4 - closemessage - applymovement 255, Movement_164AD6 - waitmovement 0 - releaseall - end + loadword 0, gUnknown_817C91D + callstd 4 + closemessage + applymovement 255, Movement_164AD6 + waitmovement 0 + releaseall + end Movement_164AD4:: @ 8164AD4 - step_03 - step_end + step_03 + step_end Movement_164AD6:: @ 8164AD6 - step_10 - step_end + step_10 + step_end SevenIsland_TrainerTower_Lobby_EventScript_164AD8:: @ 8164AD8 - lockall - fadescreen 1 - setvar VAR_0x8004, 1 - special sub_80CD228 - waitstate - releaseall - end + lockall + fadescreen 1 + setvar VAR_0x8004, 1 + special sub_80CD228 + waitstate + releaseall + end SevenIsland_TrainerTower_Lobby_EventScript_164AE6:: @ 8164AE6 - loadword 0, gUnknown_817CE38 - callstd 2 - end + loadword 0, gUnknown_817CE38 + callstd 2 + end SevenIsland_TrainerTower_Lobby_EventScript_164AEF:: @ 8164AEF - loadword 0, gUnknown_817CE9F - callstd 2 - end + loadword 0, gUnknown_817CE9F + callstd 2 + end diff --git a/data/maps/SevenIsland_TrainerTower_Roof/scripts.inc b/data/maps/SevenIsland_TrainerTower_Roof/scripts.inc index 731f6ab97..af451e565 100644 --- a/data/maps/SevenIsland_TrainerTower_Roof/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_Roof/scripts.inc @@ -1,8 +1,8 @@ SevenIsland_TrainerTower_Roof_MapScripts:: @ 8164828 - map_script 5, SevenIsland_TrainerTower_Roof_MapScript1_1C4F54 - map_script 2, SevenIsland_TrainerTower_Roof_MapScript2_1C5046 - .byte 0 + map_script 5, SevenIsland_TrainerTower_Roof_MapScript1_1C4F54 + map_script 2, SevenIsland_TrainerTower_Roof_MapScript2_1C5046 + .byte 0 SevenIsland_TrainerTower_Roof_EventScript_164833:: @ 8164833 - call EventScript_1C53AA - end + call EventScript_1C53AA + end diff --git a/data/maps/SilphCo_10F/scripts.inc b/data/maps/SilphCo_10F/scripts.inc index 01ad0175d..36597983f 100644 --- a/data/maps/SilphCo_10F/scripts.inc +++ b/data/maps/SilphCo_10F/scripts.inc @@ -1,41 +1,41 @@ SilphCo_10F_MapScripts:: @ 8161D86 - map_script 1, SilphCo_10F_MapScript1_161D8C - .byte 0 + map_script 1, SilphCo_10F_MapScript1_161D8C + .byte 0 SilphCo_10F_MapScript1_161D8C:: @ 8161D8C - checkflag FLAG_0x28C - call_if 0, EventScript_1A84D6 - end + checkflag FLAG_0x28C + call_if 0, EventScript_1A84D6 + end SilphCo_10F_EventScript_161D96:: @ 8161D96 - lock - faceplayer - compare_var_to_value VAR_0x4060, 1 - goto_if 4, EventScript_161DAD - loadword 0, gUnknown_8176DBA - callstd 4 - release - end + lock + faceplayer + compare_var_to_value VAR_0x4060, 1 + goto_if 4, EventScript_161DAD + loadword 0, gUnknown_8176DBA + callstd 4 + release + end EventScript_161DAD:: @ 8161DAD - loadword 0, gUnknown_8176DCE - callstd 4 - release - end + loadword 0, gUnknown_8176DCE + callstd 4 + release + end SilphCo_10F_EventScript_161DB7:: @ 8161DB7 - loadword 0, gUnknown_8176DF8 - callstd 3 - end + loadword 0, gUnknown_8176DF8 + callstd 3 + end SilphCo_10F_EventScript_161DC0:: @ 8161DC0 - trainerbattle 0, 345, 0, Text_176D57, Text_176D73 - loadword 0, gUnknown_8176D86 - callstd 6 - end + trainerbattle 0, 345, 0, Text_176D57, Text_176D73 + loadword 0, gUnknown_8176D86 + callstd 6 + end SilphCo_10F_EventScript_161DD7:: @ 8161DD7 - trainerbattle 0, 389, 0, Text_176CED, Text_176D18 - loadword 0, gUnknown_8176D25 - callstd 6 - end + trainerbattle 0, 389, 0, Text_176CED, Text_176D18 + loadword 0, gUnknown_8176D25 + callstd 6 + end diff --git a/data/maps/SilphCo_11F/scripts.inc b/data/maps/SilphCo_11F/scripts.inc index 0167964bb..c3f864c14 100644 --- a/data/maps/SilphCo_11F/scripts.inc +++ b/data/maps/SilphCo_11F/scripts.inc @@ -1,160 +1,160 @@ SilphCo_11F_MapScripts:: @ 8161DEE - map_script 1, SilphCo_11F_MapScript1_161DF4 - .byte 0 + map_script 1, SilphCo_11F_MapScript1_161DF4 + .byte 0 SilphCo_11F_MapScript1_161DF4:: @ 8161DF4 - checkflag FLAG_0x28D - call_if 0, EventScript_1A8504 - end + checkflag FLAG_0x28D + call_if 0, EventScript_1A8504 + end SilphCo_11F_EventScript_161DFE:: @ 8161DFE - lock - faceplayer - checkflag FLAG_0x250 - goto_if 1, EventScript_161E75 - checkplayergender - compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_161E59 - compare_var_to_value VAR_RESULT, 1 - call_if 1, EventScript_161E62 - checkitemspace ITEM_MASTER_BALL, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_161E6B - additem ITEM_MASTER_BALL, 1 - loadword 0, gUnknown_8176FBD - setorcopyvar VAR_0x8000, 1 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 318 - callstd 9 - loadword 0, gUnknown_8176FEB - callstd 4 - setflag FLAG_0x250 - release - end + lock + faceplayer + checkflag FLAG_0x250 + goto_if 1, EventScript_161E75 + checkplayergender + compare_var_to_value VAR_RESULT, 0 + call_if 1, EventScript_161E59 + compare_var_to_value VAR_RESULT, 1 + call_if 1, EventScript_161E62 + checkitemspace ITEM_MASTER_BALL, 1 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_161E6B + additem ITEM_MASTER_BALL, 1 + loadword 0, gUnknown_8176FBD + setorcopyvar VAR_0x8000, 1 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 318 + callstd 9 + loadword 0, gUnknown_8176FEB + callstd 4 + setflag FLAG_0x250 + release + end EventScript_161E59:: @ 8161E59 - loadword 0, gUnknown_8176E12 - callstd 4 - return + loadword 0, gUnknown_8176E12 + callstd 4 + return EventScript_161E62:: @ 8161E62 - loadword 0, gUnknown_8176EE7 - callstd 4 - return + loadword 0, gUnknown_8176EE7 + callstd 4 + return EventScript_161E6B:: @ 8161E6B - loadword 0, gUnknown_817708E - callstd 4 - release - end + loadword 0, gUnknown_817708E + callstd 4 + release + end EventScript_161E75:: @ 8161E75 - loadword 0, gUnknown_8176FEB - callstd 4 - release - end + loadword 0, gUnknown_8176FEB + callstd 4 + release + end SilphCo_11F_EventScript_161E7F:: @ 8161E7F - loadword 0, gUnknown_81770A9 - callstd 2 - end + loadword 0, gUnknown_81770A9 + callstd 2 + end SilphCo_11F_EventScript_161E88:: @ 8161E88 - lockall - setvar VAR_0x4001, 0 - goto EventScript_161EA0 + lockall + setvar VAR_0x4001, 0 + goto EventScript_161EA0 EventScript_161E93:: @ 8161E93 - end + end SilphCo_11F_EventScript_161E94:: @ 8161E94 - lockall - setvar VAR_0x4001, 1 - goto EventScript_161EA0 + lockall + setvar VAR_0x4001, 1 + goto EventScript_161EA0 EventScript_161E9F:: @ 8161E9F - end + end EventScript_161EA0:: @ 8161EA0 - textcolor 0 - applymovement 3, Movement_1A75ED - waitmovement 0 - delay 25 - loadword 0, gUnknown_8177108 - callstd 4 - closemessage - compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_161F00 - compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_161F12 - setvar VAR_LAST_TALKED, 3 - trainerbattle 3, 349, 0, Text_1771AB - loadword 0, gUnknown_81771C2 - callstd 4 - closemessage - fadescreen 1 - removeobject 3 - removeobject 4 - removeobject 6 - fadescreen 0 - setvar VAR_0x4060, 1 - setflag FLAG_0x03E - clearflag FLAG_0x03F - releaseall - end + textcolor 0 + applymovement 3, Movement_1A75ED + waitmovement 0 + delay 25 + loadword 0, gUnknown_8177108 + callstd 4 + closemessage + compare_var_to_value VAR_0x4001, 0 + call_if 1, EventScript_161F00 + compare_var_to_value VAR_0x4001, 1 + call_if 1, EventScript_161F12 + setvar VAR_LAST_TALKED, 3 + trainerbattle 3, 349, 0, Text_1771AB + loadword 0, gUnknown_81771C2 + callstd 4 + closemessage + fadescreen 1 + removeobject 3 + removeobject 4 + removeobject 6 + fadescreen 0 + setvar VAR_0x4060, 1 + setflag FLAG_0x03E + clearflag FLAG_0x03F + releaseall + end EventScript_161F00:: @ 8161F00 - applymovement 3, Movement_161F1D - applymovement 255, Movement_161F27 - waitmovement 0 - return + applymovement 3, Movement_161F1D + applymovement 255, Movement_161F27 + waitmovement 0 + return EventScript_161F12:: @ 8161F12 - applymovement 3, Movement_161F23 - waitmovement 0 - return + applymovement 3, Movement_161F23 + waitmovement 0 + return Movement_161F1D:: @ 8161F1D - step_10 - step_10 - step_10 - step_10 - step_2f - step_end + step_10 + step_10 + step_10 + step_10 + step_2f + step_end Movement_161F23:: @ 8161F23 - step_10 - step_10 - step_10 - step_end + step_10 + step_10 + step_10 + step_end Movement_161F27:: @ 8161F27 - step_1c - step_1c - step_1c - step_1b - step_1a - step_30 - step_end + step_1c + step_1c + step_1c + step_1b + step_1a + step_30 + step_end EventScript_161F2E:: @ 8161F2E - loadword 0, gUnknown_817732B - callstd 3 - end + loadword 0, gUnknown_817732B + callstd 3 + end SilphCo_11F_EventScript_161F37:: @ 8161F37 - loadword 0, gUnknown_817734A - callstd 3 - end + loadword 0, gUnknown_817734A + callstd 3 + end SilphCo_11F_EventScript_161F40:: @ 8161F40 - trainerbattle 0, 390, 0, Text_1772B8, Text_1772E7 - loadword 0, gUnknown_81772F9 - callstd 6 - end + trainerbattle 0, 390, 0, Text_1772B8, Text_1772E7 + loadword 0, gUnknown_81772F9 + callstd 6 + end SilphCo_11F_EventScript_161F57:: @ 8161F57 - trainerbattle 0, 391, 0, Text_17726A, Text_17728C - loadword 0, gUnknown_817729B - callstd 6 - end + trainerbattle 0, 391, 0, Text_17726A, Text_17728C + loadword 0, gUnknown_817729B + callstd 6 + end diff --git a/data/maps/SilphCo_1F/scripts.inc b/data/maps/SilphCo_1F/scripts.inc index 2fffdc782..f9e44a12b 100644 --- a/data/maps/SilphCo_1F/scripts.inc +++ b/data/maps/SilphCo_1F/scripts.inc @@ -1,17 +1,17 @@ SilphCo_1F_MapScripts:: @ 8161625 - map_script 3, SilphCo_1F_MapScript1_16162B - .byte 0 + map_script 3, SilphCo_1F_MapScript1_16162B + .byte 0 SilphCo_1F_MapScript1_16162B:: @ 816162B - setworldmapflag 2220 - end + setworldmapflag 2220 + end SilphCo_1F_EventScript_16162F:: @ 816162F - loadword 0, gUnknown_81754F7 - callstd 2 - end + loadword 0, gUnknown_81754F7 + callstd 2 + end SilphCo_1F_EventScript_161638:: @ 8161638 - loadword 0, gUnknown_8175549 - callstd 3 - end + loadword 0, gUnknown_8175549 + callstd 3 + end diff --git a/data/maps/SilphCo_2F/scripts.inc b/data/maps/SilphCo_2F/scripts.inc index 1c9046768..51a8c4572 100644 --- a/data/maps/SilphCo_2F/scripts.inc +++ b/data/maps/SilphCo_2F/scripts.inc @@ -1,45 +1,45 @@ SilphCo_2F_MapScripts:: @ 8161641 - map_script 1, SilphCo_2F_MapScript1_161647 - .byte 0 + map_script 1, SilphCo_2F_MapScript1_161647 + .byte 0 SilphCo_2F_MapScript1_161647:: @ 8161647 - checkflag FLAG_0x27A - call_if 0, EventScript_1A8149 - checkflag FLAG_0x27B - call_if 0, EventScript_1A8177 - end + checkflag FLAG_0x27A + call_if 0, EventScript_1A8149 + checkflag FLAG_0x27B + call_if 0, EventScript_1A8177 + end SilphCo_2F_EventScript_16165A:: @ 816165A - goto EventScript_1C4816 + goto EventScript_1C4816 EventScript_16165F:: @ 816165F - end + end SilphCo_2F_EventScript_161660:: @ 8161660 - loadword 0, gUnknown_8175894 - callstd 3 - end + loadword 0, gUnknown_8175894 + callstd 3 + end SilphCo_2F_EventScript_161669:: @ 8161669 - trainerbattle 0, 336, 0, Text_175562, Text_17557E - loadword 0, gUnknown_817559F - callstd 6 - end + trainerbattle 0, 336, 0, Text_175562, Text_17557E + loadword 0, gUnknown_817559F + callstd 6 + end SilphCo_2F_EventScript_161680:: @ 8161680 - trainerbattle 0, 337, 0, Text_1755C6, Text_1755E5 - loadword 0, gUnknown_81755F2 - callstd 6 - end + trainerbattle 0, 337, 0, Text_1755C6, Text_1755E5 + loadword 0, gUnknown_81755F2 + callstd 6 + end SilphCo_2F_EventScript_161697:: @ 8161697 - trainerbattle 0, 373, 0, Text_17562D, Text_17564A - loadword 0, gUnknown_8175651 - callstd 6 - end + trainerbattle 0, 373, 0, Text_17562D, Text_17564A + loadword 0, gUnknown_8175651 + callstd 6 + end SilphCo_2F_EventScript_1616AE:: @ 81616AE - trainerbattle 0, 374, 0, Text_1756AD, Text_1756D8 - loadword 0, gUnknown_81756E2 - callstd 6 - end + trainerbattle 0, 374, 0, Text_1756AD, Text_1756D8 + loadword 0, gUnknown_81756E2 + callstd 6 + end diff --git a/data/maps/SilphCo_3F/scripts.inc b/data/maps/SilphCo_3F/scripts.inc index 3575a73f9..77614744d 100644 --- a/data/maps/SilphCo_3F/scripts.inc +++ b/data/maps/SilphCo_3F/scripts.inc @@ -1,43 +1,43 @@ SilphCo_3F_MapScripts:: @ 81616C5 - map_script 1, SilphCo_3F_MapScript1_1616CB - .byte 0 + map_script 1, SilphCo_3F_MapScript1_1616CB + .byte 0 SilphCo_3F_MapScript1_1616CB:: @ 81616CB - checkflag FLAG_0x27C - call_if 0, EventScript_1A81A5 - checkflag FLAG_0x27D - call_if 0, EventScript_1A81DC - end + checkflag FLAG_0x27C + call_if 0, EventScript_1A81A5 + checkflag FLAG_0x27D + call_if 0, EventScript_1A81DC + end SilphCo_3F_EventScript_1616DE:: @ 81616DE - lock - faceplayer - compare_var_to_value VAR_0x4060, 1 - goto_if 4, EventScript_1616F5 - loadword 0, gUnknown_81758AD - callstd 4 - release - end + lock + faceplayer + compare_var_to_value VAR_0x4060, 1 + goto_if 4, EventScript_1616F5 + loadword 0, gUnknown_81758AD + callstd 4 + release + end EventScript_1616F5:: @ 81616F5 - loadword 0, gUnknown_81758D3 - callstd 4 - release - end + loadword 0, gUnknown_81758D3 + callstd 4 + release + end SilphCo_3F_EventScript_1616FF:: @ 81616FF - loadword 0, gUnknown_81759DC - callstd 3 - end + loadword 0, gUnknown_81759DC + callstd 3 + end SilphCo_3F_EventScript_161708:: @ 8161708 - trainerbattle 0, 338, 0, Text_175948, Text_17597D - loadword 0, gUnknown_8175990 - callstd 6 - end + trainerbattle 0, 338, 0, Text_175948, Text_17597D + loadword 0, gUnknown_8175990 + callstd 6 + end SilphCo_3F_EventScript_16171F:: @ 816171F - trainerbattle 0, 375, 0, Text_1758F6, Text_175911 - loadword 0, gUnknown_817591C - callstd 6 - end + trainerbattle 0, 375, 0, Text_1758F6, Text_175911 + loadword 0, gUnknown_817591C + callstd 6 + end diff --git a/data/maps/SilphCo_4F/scripts.inc b/data/maps/SilphCo_4F/scripts.inc index ce3ecaa70..76b85f6a6 100644 --- a/data/maps/SilphCo_4F/scripts.inc +++ b/data/maps/SilphCo_4F/scripts.inc @@ -1,49 +1,49 @@ SilphCo_4F_MapScripts:: @ 8161736 - map_script 1, SilphCo_4F_MapScript1_16173C - .byte 0 + map_script 1, SilphCo_4F_MapScript1_16173C + .byte 0 SilphCo_4F_MapScript1_16173C:: @ 816173C - checkflag FLAG_0x27E - call_if 0, EventScript_1A8213 - checkflag FLAG_0x27F - call_if 0, EventScript_1A8241 - end + checkflag FLAG_0x27E + call_if 0, EventScript_1A8213 + checkflag FLAG_0x27F + call_if 0, EventScript_1A8241 + end SilphCo_4F_EventScript_16174F:: @ 816174F - lock - faceplayer - compare_var_to_value VAR_0x4060, 1 - goto_if 4, EventScript_161766 - loadword 0, gUnknown_81759F5 - callstd 4 - release - end + lock + faceplayer + compare_var_to_value VAR_0x4060, 1 + goto_if 4, EventScript_161766 + loadword 0, gUnknown_81759F5 + callstd 4 + release + end EventScript_161766:: @ 8161766 - loadword 0, gUnknown_8175A15 - callstd 4 - release - end + loadword 0, gUnknown_8175A15 + callstd 4 + release + end SilphCo_4F_EventScript_161770:: @ 8161770 - loadword 0, gUnknown_8175B57 - callstd 3 - end + loadword 0, gUnknown_8175B57 + callstd 3 + end SilphCo_4F_EventScript_161779:: @ 8161779 - trainerbattle 0, 339, 0, Text_175A90, Text_175AB0 - loadword 0, gUnknown_8175AC8 - callstd 6 - end + trainerbattle 0, 339, 0, Text_175A90, Text_175AB0 + loadword 0, gUnknown_8175AC8 + callstd 6 + end SilphCo_4F_EventScript_161790:: @ 8161790 - trainerbattle 0, 376, 0, Text_175A2F, Text_175A5B - loadword 0, gUnknown_8175A62 - callstd 6 - end + trainerbattle 0, 376, 0, Text_175A2F, Text_175A5B + loadword 0, gUnknown_8175A62 + callstd 6 + end SilphCo_4F_EventScript_1617A7:: @ 81617A7 - trainerbattle 0, 377, 0, Text_175B19, Text_175B2B - loadword 0, gUnknown_8175B38 - callstd 6 - end + trainerbattle 0, 377, 0, Text_175B19, Text_175B2B + loadword 0, gUnknown_8175B38 + callstd 6 + end diff --git a/data/maps/SilphCo_5F/scripts.inc b/data/maps/SilphCo_5F/scripts.inc index df816db5e..485b44c31 100644 --- a/data/maps/SilphCo_5F/scripts.inc +++ b/data/maps/SilphCo_5F/scripts.inc @@ -1,72 +1,72 @@ SilphCo_5F_MapScripts:: @ 81617BE - map_script 1, SilphCo_5F_MapScript1_1617C4 - .byte 0 + map_script 1, SilphCo_5F_MapScript1_1617C4 + .byte 0 SilphCo_5F_MapScript1_1617C4:: @ 81617C4 - checkflag FLAG_0x280 - call_if 0, EventScript_1A826F - checkflag FLAG_0x281 - call_if 0, EventScript_1A82A6 - checkflag FLAG_0x282 - call_if 0, EventScript_1A82DD - end + checkflag FLAG_0x280 + call_if 0, EventScript_1A826F + checkflag FLAG_0x281 + call_if 0, EventScript_1A82A6 + checkflag FLAG_0x282 + call_if 0, EventScript_1A82DD + end SilphCo_5F_EventScript_1617E0:: @ 81617E0 - lock - faceplayer - compare_var_to_value VAR_0x4060, 1 - goto_if 4, EventScript_1617F7 - loadword 0, gUnknown_8175B70 - callstd 4 - release - end + lock + faceplayer + compare_var_to_value VAR_0x4060, 1 + goto_if 4, EventScript_1617F7 + loadword 0, gUnknown_8175B70 + callstd 4 + release + end EventScript_1617F7:: @ 81617F7 - loadword 0, gUnknown_8175BB3 - callstd 4 - release - end + loadword 0, gUnknown_8175BB3 + callstd 4 + release + end SilphCo_5F_EventScript_161801:: @ 8161801 - loadword 0, gUnknown_8175D89 - callstd 3 - end + loadword 0, gUnknown_8175D89 + callstd 3 + end SilphCo_5F_EventScript_16180A:: @ 816180A - loadword 0, gUnknown_8175DE0 - callstd 3 - end + loadword 0, gUnknown_8175DE0 + callstd 3 + end SilphCo_5F_EventScript_161813:: @ 8161813 - loadword 0, gUnknown_8175E28 - callstd 3 - end + loadword 0, gUnknown_8175E28 + callstd 3 + end SilphCo_5F_EventScript_16181C:: @ 816181C - loadword 0, gUnknown_8175E80 - callstd 3 - end + loadword 0, gUnknown_8175E80 + callstd 3 + end SilphCo_5F_EventScript_161825:: @ 8161825 - trainerbattle 0, 340, 0, Text_175C40, Text_175C6D - loadword 0, gUnknown_8175C7D - callstd 6 - end + trainerbattle 0, 340, 0, Text_175C40, Text_175C6D + loadword 0, gUnknown_8175C7D + callstd 6 + end SilphCo_5F_EventScript_16183C:: @ 816183C - trainerbattle 0, 378, 0, Text_175BE5, Text_175C09 - loadword 0, gUnknown_8175C0F - callstd 6 - end + trainerbattle 0, 378, 0, Text_175BE5, Text_175C09 + loadword 0, gUnknown_8175C0F + callstd 6 + end SilphCo_5F_EventScript_161853:: @ 8161853 - trainerbattle 0, 379, 0, Text_175D28, Text_175D4B - loadword 0, gUnknown_8175D59 - callstd 6 - end + trainerbattle 0, 379, 0, Text_175D28, Text_175D4B + loadword 0, gUnknown_8175D59 + callstd 6 + end SilphCo_5F_EventScript_16186A:: @ 816186A - trainerbattle 0, 286, 0, Text_175CBD, Text_175CEB - loadword 0, gUnknown_8175CF9 - callstd 6 - end + trainerbattle 0, 286, 0, Text_175CBD, Text_175CEB + loadword 0, gUnknown_8175CF9 + callstd 6 + end diff --git a/data/maps/SilphCo_6F/scripts.inc b/data/maps/SilphCo_6F/scripts.inc index 013d2e129..2cb30c65c 100644 --- a/data/maps/SilphCo_6F/scripts.inc +++ b/data/maps/SilphCo_6F/scripts.inc @@ -1,111 +1,111 @@ SilphCo_6F_MapScripts:: @ 8161881 - map_script 1, SilphCo_6F_MapScript1_161887 - .byte 0 + map_script 1, SilphCo_6F_MapScript1_161887 + .byte 0 SilphCo_6F_MapScript1_161887:: @ 8161887 - checkflag FLAG_0x283 - call_if 0, EventScript_1A8314 - end + checkflag FLAG_0x283 + call_if 0, EventScript_1A8314 + end SilphCo_6F_EventScript_161891:: @ 8161891 - lock - faceplayer - compare_var_to_value VAR_0x4060, 1 - goto_if 4, EventScript_1618A8 - loadword 0, gUnknown_817607E - callstd 4 - release - end + lock + faceplayer + compare_var_to_value VAR_0x4060, 1 + goto_if 4, EventScript_1618A8 + loadword 0, gUnknown_817607E + callstd 4 + release + end EventScript_1618A8:: @ 81618A8 - loadword 0, gUnknown_81760B6 - callstd 4 - release - end + loadword 0, gUnknown_81760B6 + callstd 4 + release + end SilphCo_6F_EventScript_1618B2:: @ 81618B2 - lock - faceplayer - compare_var_to_value VAR_0x4060, 1 - goto_if 4, EventScript_1618C9 - loadword 0, gUnknown_8175F24 - callstd 4 - release - end + lock + faceplayer + compare_var_to_value VAR_0x4060, 1 + goto_if 4, EventScript_1618C9 + loadword 0, gUnknown_8175F24 + callstd 4 + release + end EventScript_1618C9:: @ 81618C9 - loadword 0, gUnknown_8175F51 - callstd 4 - release - end + loadword 0, gUnknown_8175F51 + callstd 4 + release + end SilphCo_6F_EventScript_1618D3:: @ 81618D3 - lock - faceplayer - compare_var_to_value VAR_0x4060, 1 - goto_if 4, EventScript_1618EA - loadword 0, gUnknown_8175F70 - callstd 4 - release - end + lock + faceplayer + compare_var_to_value VAR_0x4060, 1 + goto_if 4, EventScript_1618EA + loadword 0, gUnknown_8175F70 + callstd 4 + release + end EventScript_1618EA:: @ 81618EA - loadword 0, gUnknown_8175F93 - callstd 4 - release - end + loadword 0, gUnknown_8175F93 + callstd 4 + release + end SilphCo_6F_EventScript_1618F4:: @ 81618F4 - lock - faceplayer - compare_var_to_value VAR_0x4060, 1 - goto_if 4, EventScript_16190B - loadword 0, gUnknown_8175FAA - callstd 4 - release - end + lock + faceplayer + compare_var_to_value VAR_0x4060, 1 + goto_if 4, EventScript_16190B + loadword 0, gUnknown_8175FAA + callstd 4 + release + end EventScript_16190B:: @ 816190B - loadword 0, gUnknown_8175FD3 - callstd 4 - release - end + loadword 0, gUnknown_8175FD3 + callstd 4 + release + end SilphCo_6F_EventScript_161915:: @ 8161915 - lock - faceplayer - compare_var_to_value VAR_0x4060, 1 - goto_if 4, EventScript_16192C - loadword 0, gUnknown_8176012 - callstd 4 - release - end + lock + faceplayer + compare_var_to_value VAR_0x4060, 1 + goto_if 4, EventScript_16192C + loadword 0, gUnknown_8176012 + callstd 4 + release + end EventScript_16192C:: @ 816192C - loadword 0, gUnknown_817604B - callstd 4 - release - end + loadword 0, gUnknown_817604B + callstd 4 + release + end SilphCo_6F_EventScript_161936:: @ 8161936 - loadword 0, gUnknown_817624D - callstd 3 - end + loadword 0, gUnknown_817624D + callstd 3 + end SilphCo_6F_EventScript_16193F:: @ 816193F - trainerbattle 0, 341, 0, Text_176136, Text_1761BD - loadword 0, gUnknown_81761C4 - callstd 6 - end + trainerbattle 0, 341, 0, Text_176136, Text_1761BD + loadword 0, gUnknown_81761C4 + callstd 6 + end SilphCo_6F_EventScript_161956:: @ 8161956 - trainerbattle 0, 380, 0, Text_1760DE, Text_176104 - loadword 0, gUnknown_817610F - callstd 6 - end + trainerbattle 0, 380, 0, Text_1760DE, Text_176104 + loadword 0, gUnknown_817610F + callstd 6 + end SilphCo_6F_EventScript_16196D:: @ 816196D - trainerbattle 0, 381, 0, Text_1761F1, Text_17620E - loadword 0, gUnknown_817621B - callstd 6 - end + trainerbattle 0, 381, 0, Text_1761F1, Text_17620E + loadword 0, gUnknown_817621B + callstd 6 + end diff --git a/data/maps/SilphCo_7F/scripts.inc b/data/maps/SilphCo_7F/scripts.inc index b1ec6b6b6..318a80390 100644 --- a/data/maps/SilphCo_7F/scripts.inc +++ b/data/maps/SilphCo_7F/scripts.inc @@ -1,282 +1,282 @@ SilphCo_7F_MapScripts:: @ 8161984 - map_script 1, SilphCo_7F_MapScript1_16198F - map_script 3, SilphCo_7F_MapScript2_1619AB - .byte 0 + map_script 1, SilphCo_7F_MapScript1_16198F + map_script 3, SilphCo_7F_MapScript2_1619AB + .byte 0 SilphCo_7F_MapScript1_16198F:: @ 816198F - checkflag FLAG_0x284 - call_if 0, EventScript_1A834B - checkflag FLAG_0x285 - call_if 0, EventScript_1A8379 - checkflag FLAG_0x286 - call_if 0, EventScript_1A83A7 - end + checkflag FLAG_0x284 + call_if 0, EventScript_1A834B + checkflag FLAG_0x285 + call_if 0, EventScript_1A8379 + checkflag FLAG_0x286 + call_if 0, EventScript_1A83A7 + end SilphCo_7F_MapScript2_1619AB:: @ 81619AB - compare_var_to_value VAR_0x4060, 1 - call_if 4, EventScript_1619B7 - end + compare_var_to_value VAR_0x4060, 1 + call_if 4, EventScript_1619B7 + end EventScript_1619B7:: @ 81619B7 - setobjectmovementtype 8, 7 - return + setobjectmovementtype 8, 7 + return SilphCo_7F_EventScript_1619BC:: @ 81619BC - lockall - setvar VAR_0x4001, 0 - goto EventScript_1619D4 + lockall + setvar VAR_0x4001, 0 + goto EventScript_1619D4 EventScript_1619C7:: @ 81619C7 - end + end SilphCo_7F_EventScript_1619C8:: @ 81619C8 - lockall - setvar VAR_0x4001, 1 - goto EventScript_1619D4 + lockall + setvar VAR_0x4001, 1 + goto EventScript_1619D4 EventScript_1619D3:: @ 81619D3 - end + end EventScript_1619D4:: @ 81619D4 - textcolor 0 - playbgm BGM_FRLG_RIVAL, 0 - applymovement 1, Movement_1A75DB - waitmovement 0 - applymovement 255, Movement_1A75ED - applymovement 1, Movement_1A75DD - waitmovement 0 - loadword 0, gUnknown_8176710 - callstd 4 - compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_161A73 - compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_161A7F - loadword 0, gUnknown_8176727 - callstd 4 - setvar VAR_LAST_TALKED, 1 - compare_var_to_value VAR_STARTER_MON, 2 - call_if 1, EventScript_161A80 - compare_var_to_value VAR_STARTER_MON, 1 - call_if 1, EventScript_161A8B - compare_var_to_value VAR_STARTER_MON, 0 - call_if 1, EventScript_161A96 - loadword 0, gUnknown_8176827 - callstd 4 - closemessage - playbgm BGM_FRLG_RIVAL_POSTBATTLE, 0 - compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_161AA1 - compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_161AAC - playse SE_FU_ZUZUZU - fadedefaultbgm - removeobject 1 - waitse - setvar VAR_0x405C, 1 - releaseall - end + textcolor 0 + playbgm BGM_FRLG_RIVAL, 0 + applymovement 1, Movement_1A75DB + waitmovement 0 + applymovement 255, Movement_1A75ED + applymovement 1, Movement_1A75DD + waitmovement 0 + loadword 0, gUnknown_8176710 + callstd 4 + compare_var_to_value VAR_0x4001, 0 + call_if 1, EventScript_161A73 + compare_var_to_value VAR_0x4001, 1 + call_if 1, EventScript_161A7F + loadword 0, gUnknown_8176727 + callstd 4 + setvar VAR_LAST_TALKED, 1 + compare_var_to_value VAR_STARTER_MON, 2 + call_if 1, EventScript_161A80 + compare_var_to_value VAR_STARTER_MON, 1 + call_if 1, EventScript_161A8B + compare_var_to_value VAR_STARTER_MON, 0 + call_if 1, EventScript_161A96 + loadword 0, gUnknown_8176827 + callstd 4 + closemessage + playbgm BGM_FRLG_RIVAL_POSTBATTLE, 0 + compare_var_to_value VAR_0x4001, 0 + call_if 1, EventScript_161AA1 + compare_var_to_value VAR_0x4001, 1 + call_if 1, EventScript_161AAC + playse SE_FU_ZUZUZU + fadedefaultbgm + removeobject 1 + waitse + setvar VAR_0x405C, 1 + releaseall + end EventScript_161A73:: @ 8161A73 - closemessage - applymovement 1, Movement_161AB7 - waitmovement 0 - return + closemessage + applymovement 1, Movement_161AB7 + waitmovement 0 + return EventScript_161A7F:: @ 8161A7F - return + return EventScript_161A80:: @ 8161A80 - trainerbattle 3, 432, 0, Text_1767D0 - return + trainerbattle 3, 432, 0, Text_1767D0 + return EventScript_161A8B:: @ 8161A8B - trainerbattle 3, 433, 0, Text_1767D0 - return + trainerbattle 3, 433, 0, Text_1767D0 + return EventScript_161A96:: @ 8161A96 - trainerbattle 3, 434, 0, Text_1767D0 - return + trainerbattle 3, 434, 0, Text_1767D0 + return EventScript_161AA1:: @ 8161AA1 - applymovement 1, Movement_161AB9 - waitmovement 0 - return + applymovement 1, Movement_161AB9 + waitmovement 0 + return EventScript_161AAC:: @ 8161AAC - applymovement 1, Movement_161ABF - waitmovement 0 - return + applymovement 1, Movement_161ABF + waitmovement 0 + return Movement_161AB7:: @ 8161AB7 - step_11 - step_end + step_11 + step_end Movement_161AB9:: @ 8161AB9 - step_13 - step_13 - step_13 - step_11 - step_1c - step_end + step_13 + step_13 + step_13 + step_11 + step_1c + step_end Movement_161ABF:: @ 8161ABF - step_12 - step_11 - step_11 - step_13 - step_13 - step_13 - step_13 - step_1c - step_end + step_12 + step_11 + step_11 + step_13 + step_13 + step_13 + step_13 + step_1c + step_end SilphCo_7F_EventScript_161AC8:: @ 8161AC8 - lock - faceplayer - checkflag FLAG_0x246 - goto_if 1, EventScript_161B8D - loadword 0, gUnknown_8176266 - callstd 4 - setvar VAR_0x4001, 131 - givemon SPECIES_LAPRAS, 25, ITEM_NONE, 0, 0, 0 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_161B12 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_161B45 - compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A927C - release - end + lock + faceplayer + checkflag FLAG_0x246 + goto_if 1, EventScript_161B8D + loadword 0, gUnknown_8176266 + callstd 4 + setvar VAR_0x4001, 131 + givemon SPECIES_LAPRAS, 25, ITEM_NONE, 0, 0, 0 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_161B12 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_161B45 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A927C + release + end EventScript_161B12:: @ 8161B12 - textcolor 3 - playfanfare MUS_FANFA1 - message Text_1762D7 - waitmessage - waitfanfare - getspeciesname 0, SPECIES_LAPRAS - loadword 0, gUnknown_81A56A7 - callstd 5 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_161B7E - call EventScript_1A8C27 - call EventScript_1A74EB - goto EventScript_161B7E + textcolor 3 + playfanfare MUS_FANFA1 + message Text_1762D7 + waitmessage + waitfanfare + getspeciesname 0, SPECIES_LAPRAS + loadword 0, gUnknown_81A56A7 + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_161B7E + call EventScript_1A8C27 + call EventScript_1A74EB + goto EventScript_161B7E EventScript_161B44:: @ 8161B44 - end + end EventScript_161B45:: @ 8161B45 - textcolor 3 - playfanfare MUS_FANFA1 - message Text_1762D7 - waitmessage - waitfanfare - getspeciesname 0, SPECIES_LAPRAS - loadword 0, gUnknown_81A56A7 - callstd 5 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_161B73 - call EventScript_1A8C33 - goto EventScript_161B73 + textcolor 3 + playfanfare MUS_FANFA1 + message Text_1762D7 + waitmessage + waitfanfare + getspeciesname 0, SPECIES_LAPRAS + loadword 0, gUnknown_81A56A7 + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_161B73 + call EventScript_1A8C33 + goto EventScript_161B73 EventScript_161B72:: @ 8161B72 - end + end EventScript_161B73:: @ 8161B73 - call EventScript_1A8C3C - goto EventScript_161B7E + call EventScript_1A8C3C + goto EventScript_161B7E EventScript_161B7D:: @ 8161B7D - end + end EventScript_161B7E:: @ 8161B7E - textcolor 0 - loadword 0, gUnknown_8176305 - callstd 4 - setflag FLAG_0x246 - release - end + textcolor 0 + loadword 0, gUnknown_8176305 + callstd 4 + setflag FLAG_0x246 + release + end EventScript_161B8D:: @ 8161B8D - loadword 0, gUnknown_81763DD - callstd 4 - release - end + loadword 0, gUnknown_81763DD + callstd 4 + release + end SilphCo_7F_EventScript_161B97:: @ 8161B97 - lock - faceplayer - compare_var_to_value VAR_0x4060, 1 - goto_if 4, EventScript_161BAE - loadword 0, gUnknown_8176444 - callstd 4 - release - end + lock + faceplayer + compare_var_to_value VAR_0x4060, 1 + goto_if 4, EventScript_161BAE + loadword 0, gUnknown_8176444 + callstd 4 + release + end EventScript_161BAE:: @ 8161BAE - loadword 0, gUnknown_8176486 - callstd 4 - release - end + loadword 0, gUnknown_8176486 + callstd 4 + release + end SilphCo_7F_EventScript_161BB8:: @ 8161BB8 - lock - faceplayer - compare_var_to_value VAR_0x4060, 1 - goto_if 4, EventScript_161BCF - loadword 0, gUnknown_81764C2 - callstd 4 - release - end + lock + faceplayer + compare_var_to_value VAR_0x4060, 1 + goto_if 4, EventScript_161BCF + loadword 0, gUnknown_81764C2 + callstd 4 + release + end EventScript_161BCF:: @ 8161BCF - loadword 0, gUnknown_8176501 - callstd 4 - release - end + loadword 0, gUnknown_8176501 + callstd 4 + release + end SilphCo_7F_EventScript_161BD9:: @ 8161BD9 - lock - faceplayer - compare_var_to_value VAR_0x4060, 1 - goto_if 4, EventScript_161BF0 - loadword 0, gUnknown_8176532 - callstd 4 - release - end + lock + faceplayer + compare_var_to_value VAR_0x4060, 1 + goto_if 4, EventScript_161BF0 + loadword 0, gUnknown_8176532 + callstd 4 + release + end EventScript_161BF0:: @ 8161BF0 - loadword 0, gUnknown_8176573 - callstd 4 - release - end + loadword 0, gUnknown_8176573 + callstd 4 + release + end SilphCo_7F_EventScript_161BFA:: @ 8161BFA - loadword 0, gUnknown_8176954 - callstd 3 - end + loadword 0, gUnknown_8176954 + callstd 3 + end SilphCo_7F_EventScript_161C03:: @ 8161C03 - trainerbattle 0, 342, 0, Text_1765E2, Text_17660C - loadword 0, gUnknown_8176616 - callstd 6 - end + trainerbattle 0, 342, 0, Text_1765E2, Text_17660C + loadword 0, gUnknown_8176616 + callstd 6 + end SilphCo_7F_EventScript_161C1A:: @ 8161C1A - trainerbattle 0, 383, 0, Text_176643, Text_176669 - loadword 0, gUnknown_8176681 - callstd 6 - end + trainerbattle 0, 383, 0, Text_176643, Text_176669 + loadword 0, gUnknown_8176681 + callstd 6 + end SilphCo_7F_EventScript_161C31:: @ 8161C31 - trainerbattle 0, 384, 0, Text_1766B3, Text_1766D7 - loadword 0, gUnknown_81766E5 - callstd 6 - end + trainerbattle 0, 384, 0, Text_1766B3, Text_1766D7 + loadword 0, gUnknown_81766E5 + callstd 6 + end SilphCo_7F_EventScript_161C48:: @ 8161C48 - trainerbattle 0, 385, 0, Text_176586, Text_1765A5 - loadword 0, gUnknown_81765B1 - callstd 6 - end + trainerbattle 0, 385, 0, Text_176586, Text_1765A5 + loadword 0, gUnknown_81765B1 + callstd 6 + end diff --git a/data/maps/SilphCo_8F/scripts.inc b/data/maps/SilphCo_8F/scripts.inc index d8e3f18b6..6cf5dff36 100644 --- a/data/maps/SilphCo_8F/scripts.inc +++ b/data/maps/SilphCo_8F/scripts.inc @@ -1,47 +1,47 @@ SilphCo_8F_MapScripts:: @ 8161C5F - map_script 1, SilphCo_8F_MapScript1_161C65 - .byte 0 + map_script 1, SilphCo_8F_MapScript1_161C65 + .byte 0 SilphCo_8F_MapScript1_161C65:: @ 8161C65 - checkflag FLAG_0x287 - call_if 0, EventScript_1A83D5 - end + checkflag FLAG_0x287 + call_if 0, EventScript_1A83D5 + end SilphCo_8F_EventScript_161C6F:: @ 8161C6F - lock - faceplayer - compare_var_to_value VAR_0x4060, 1 - goto_if 4, EventScript_161C86 - loadword 0, gUnknown_817696D - callstd 4 - release - end + lock + faceplayer + compare_var_to_value VAR_0x4060, 1 + goto_if 4, EventScript_161C86 + loadword 0, gUnknown_817696D + callstd 4 + release + end EventScript_161C86:: @ 8161C86 - loadword 0, gUnknown_817698C - callstd 4 - release - end + loadword 0, gUnknown_817698C + callstd 4 + release + end SilphCo_8F_EventScript_161C90:: @ 8161C90 - loadword 0, gUnknown_8176AB2 - callstd 3 - end + loadword 0, gUnknown_8176AB2 + callstd 3 + end SilphCo_8F_EventScript_161C99:: @ 8161C99 - trainerbattle 0, 343, 0, Text_1769FD, Text_176A19 - loadword 0, gUnknown_8176A26 - callstd 6 - end + trainerbattle 0, 343, 0, Text_1769FD, Text_176A19 + loadword 0, gUnknown_8176A26 + callstd 6 + end SilphCo_8F_EventScript_161CB0:: @ 8161CB0 - trainerbattle 0, 382, 0, Text_1769A2, Text_1769BE - loadword 0, gUnknown_81769CF - callstd 6 - end + trainerbattle 0, 382, 0, Text_1769A2, Text_1769BE + loadword 0, gUnknown_81769CF + callstd 6 + end SilphCo_8F_EventScript_161CC7:: @ 8161CC7 - trainerbattle 0, 386, 0, Text_176A56, Text_176A7C - loadword 0, gUnknown_8176A90 - callstd 6 - end + trainerbattle 0, 386, 0, Text_176A56, Text_176A7C + loadword 0, gUnknown_8176A90 + callstd 6 + end diff --git a/data/maps/SilphCo_9F/scripts.inc b/data/maps/SilphCo_9F/scripts.inc index cf234a1b0..a8d1dab60 100644 --- a/data/maps/SilphCo_9F/scripts.inc +++ b/data/maps/SilphCo_9F/scripts.inc @@ -1,57 +1,57 @@ SilphCo_9F_MapScripts:: @ 8161CDE - map_script 1, SilphCo_9F_MapScript1_161CE4 - .byte 0 + map_script 1, SilphCo_9F_MapScript1_161CE4 + .byte 0 SilphCo_9F_MapScript1_161CE4:: @ 8161CE4 - checkflag FLAG_0x288 - call_if 0, EventScript_1A840C - checkflag FLAG_0x289 - call_if 0, EventScript_1A8443 - checkflag FLAG_0x28A - call_if 0, EventScript_1A847A - checkflag FLAG_0x28B - call_if 0, EventScript_1A84A8 - end + checkflag FLAG_0x288 + call_if 0, EventScript_1A840C + checkflag FLAG_0x289 + call_if 0, EventScript_1A8443 + checkflag FLAG_0x28A + call_if 0, EventScript_1A847A + checkflag FLAG_0x28B + call_if 0, EventScript_1A84A8 + end SilphCo_9F_EventScript_161D09:: @ 8161D09 - lock - faceplayer - compare_var_to_value VAR_0x4060, 1 - goto_if 4, EventScript_161D2E - loadword 0, gUnknown_8176B54 - callstd 4 - closemessage - call EventScript_1A6C26 - loadword 0, gUnknown_8176B81 - callstd 4 - release - end + lock + faceplayer + compare_var_to_value VAR_0x4060, 1 + goto_if 4, EventScript_161D2E + loadword 0, gUnknown_8176B54 + callstd 4 + closemessage + call EventScript_1A6C26 + loadword 0, gUnknown_8176B81 + callstd 4 + release + end EventScript_161D2E:: @ 8161D2E - loadword 0, gUnknown_8176B90 - callstd 4 - release - end + loadword 0, gUnknown_8176B90 + callstd 4 + release + end SilphCo_9F_EventScript_161D38:: @ 8161D38 - loadword 0, gUnknown_8176CD4 - callstd 3 - end + loadword 0, gUnknown_8176CD4 + callstd 3 + end SilphCo_9F_EventScript_161D41:: @ 8161D41 - trainerbattle 0, 344, 0, Text_176BFB, Text_176C2B - loadword 0, gUnknown_8176C3C - callstd 6 - end + trainerbattle 0, 344, 0, Text_176BFB, Text_176C2B + loadword 0, gUnknown_8176C3C + callstd 6 + end SilphCo_9F_EventScript_161D58:: @ 8161D58 - trainerbattle 0, 387, 0, Text_176BA3, Text_176BC8 - loadword 0, gUnknown_8176BD0 - callstd 6 - end + trainerbattle 0, 387, 0, Text_176BA3, Text_176BC8 + loadword 0, gUnknown_8176BD0 + callstd 6 + end SilphCo_9F_EventScript_161D6F:: @ 8161D6F - trainerbattle 0, 388, 0, Text_176C7A, Text_176CA0 - loadword 0, gUnknown_8176CB8 - callstd 6 - end + trainerbattle 0, 388, 0, Text_176C7A, Text_176CA0 + loadword 0, gUnknown_8176CB8 + callstd 6 + end diff --git a/data/maps/SilphCo_Elevator/scripts.inc b/data/maps/SilphCo_Elevator/scripts.inc index 118d5efd4..795a6dc93 100644 --- a/data/maps/SilphCo_Elevator/scripts.inc +++ b/data/maps/SilphCo_Elevator/scripts.inc @@ -1,190 +1,190 @@ SilphCo_Elevator_MapScripts:: @ 8161F6E - .byte 0 + .byte 0 SilphCo_Elevator_EventScript_161F6F:: @ 8161F6F - lockall - setvar VAR_0x8004, 1 - checkflag FLAG_0x002 - call_if 0, EventScript_1A7AB9 - copyvar VAR_0x8005, VAR_0x403A - special sub_80CB580 - message Text_1A535C - waitmessage - setvar VAR_0x8004, 1 - specialvar VAR_RESULT, sub_80CB328 - special sub_80CB7C4 - waitstate - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1621BF - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_162197 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_16216F - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_162147 - compare_var_to_value VAR_0x8000, 4 - goto_if 1, EventScript_16211F - compare_var_to_value VAR_0x8000, 5 - goto_if 1, EventScript_1620F7 - compare_var_to_value VAR_0x8000, 6 - goto_if 1, EventScript_1620CF - compare_var_to_value VAR_0x8000, 7 - goto_if 1, EventScript_1620A7 - compare_var_to_value VAR_0x8000, 8 - goto_if 1, EventScript_16207F - compare_var_to_value VAR_0x8000, 9 - goto_if 1, EventScript_162057 - compare_var_to_value VAR_0x8000, 10 - goto_if 1, EventScript_16202F - compare_var_to_value VAR_0x8000, 11 - goto_if 1, EventScript_1621E7 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_1621E7 - end + lockall + setvar VAR_0x8004, 1 + checkflag FLAG_0x002 + call_if 0, EventScript_1A7AB9 + copyvar VAR_0x8005, VAR_0x403A + special sub_80CB580 + message Text_1A535C + waitmessage + setvar VAR_0x8004, 1 + specialvar VAR_RESULT, sub_80CB328 + special sub_80CB7C4 + waitstate + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_1621BF + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_162197 + compare_var_to_value VAR_0x8000, 2 + goto_if 1, EventScript_16216F + compare_var_to_value VAR_0x8000, 3 + goto_if 1, EventScript_162147 + compare_var_to_value VAR_0x8000, 4 + goto_if 1, EventScript_16211F + compare_var_to_value VAR_0x8000, 5 + goto_if 1, EventScript_1620F7 + compare_var_to_value VAR_0x8000, 6 + goto_if 1, EventScript_1620CF + compare_var_to_value VAR_0x8000, 7 + goto_if 1, EventScript_1620A7 + compare_var_to_value VAR_0x8000, 8 + goto_if 1, EventScript_16207F + compare_var_to_value VAR_0x8000, 9 + goto_if 1, EventScript_162057 + compare_var_to_value VAR_0x8000, 10 + goto_if 1, EventScript_16202F + compare_var_to_value VAR_0x8000, 11 + goto_if 1, EventScript_1621E7 + compare_var_to_value VAR_0x8000, 127 + goto_if 1, EventScript_1621E7 + end EventScript_16202F:: @ 816202F - setvar VAR_0x8006, 4 - setdynamicwarp MAP_SILPH_CO_1F, 255, 22, 3 - compare_var_to_value VAR_0x403A, 4 - goto_if 1, EventScript_1621E7 - call EventScript_1621EC - setvar VAR_0x403A, 4 - goto EventScript_1621E7 + setvar VAR_0x8006, 4 + setdynamicwarp MAP_SILPH_CO_1F, 255, 22, 3 + compare_var_to_value VAR_0x403A, 4 + goto_if 1, EventScript_1621E7 + call EventScript_1621EC + setvar VAR_0x403A, 4 + goto EventScript_1621E7 EventScript_162056:: @ 8162056 - end + end EventScript_162057:: @ 8162057 - setvar VAR_0x8006, 5 - setdynamicwarp MAP_SILPH_CO_2F, 255, 22, 3 - compare_var_to_value VAR_0x403A, 5 - goto_if 1, EventScript_1621E7 - call EventScript_1621EC - setvar VAR_0x403A, 5 - goto EventScript_1621E7 + setvar VAR_0x8006, 5 + setdynamicwarp MAP_SILPH_CO_2F, 255, 22, 3 + compare_var_to_value VAR_0x403A, 5 + goto_if 1, EventScript_1621E7 + call EventScript_1621EC + setvar VAR_0x403A, 5 + goto EventScript_1621E7 EventScript_16207E:: @ 816207E - end + end EventScript_16207F:: @ 816207F - setvar VAR_0x8006, 6 - setdynamicwarp MAP_SILPH_CO_3F, 255, 22, 3 - compare_var_to_value VAR_0x403A, 6 - goto_if 1, EventScript_1621E7 - call EventScript_1621EC - setvar VAR_0x403A, 6 - goto EventScript_1621E7 + setvar VAR_0x8006, 6 + setdynamicwarp MAP_SILPH_CO_3F, 255, 22, 3 + compare_var_to_value VAR_0x403A, 6 + goto_if 1, EventScript_1621E7 + call EventScript_1621EC + setvar VAR_0x403A, 6 + goto EventScript_1621E7 EventScript_1620A6:: @ 81620A6 - end + end EventScript_1620A7:: @ 81620A7 - setvar VAR_0x8006, 7 - setdynamicwarp MAP_SILPH_CO_4F, 255, 22, 3 - compare_var_to_value VAR_0x403A, 7 - goto_if 1, EventScript_1621E7 - call EventScript_1621EC - setvar VAR_0x403A, 7 - goto EventScript_1621E7 + setvar VAR_0x8006, 7 + setdynamicwarp MAP_SILPH_CO_4F, 255, 22, 3 + compare_var_to_value VAR_0x403A, 7 + goto_if 1, EventScript_1621E7 + call EventScript_1621EC + setvar VAR_0x403A, 7 + goto EventScript_1621E7 EventScript_1620CE:: @ 81620CE - end + end EventScript_1620CF:: @ 81620CF - setvar VAR_0x8006, 8 - setdynamicwarp MAP_SILPH_CO_5F, 255, 22, 3 - compare_var_to_value VAR_0x403A, 8 - goto_if 1, EventScript_1621E7 - call EventScript_1621EC - setvar VAR_0x403A, 8 - goto EventScript_1621E7 + setvar VAR_0x8006, 8 + setdynamicwarp MAP_SILPH_CO_5F, 255, 22, 3 + compare_var_to_value VAR_0x403A, 8 + goto_if 1, EventScript_1621E7 + call EventScript_1621EC + setvar VAR_0x403A, 8 + goto EventScript_1621E7 EventScript_1620F6:: @ 81620F6 - end + end EventScript_1620F7:: @ 81620F7 - setvar VAR_0x8006, 9 - setdynamicwarp MAP_SILPH_CO_6F, 255, 20, 3 - compare_var_to_value VAR_0x403A, 9 - goto_if 1, EventScript_1621E7 - call EventScript_1621EC - setvar VAR_0x403A, 9 - goto EventScript_1621E7 + setvar VAR_0x8006, 9 + setdynamicwarp MAP_SILPH_CO_6F, 255, 20, 3 + compare_var_to_value VAR_0x403A, 9 + goto_if 1, EventScript_1621E7 + call EventScript_1621EC + setvar VAR_0x403A, 9 + goto EventScript_1621E7 EventScript_16211E:: @ 816211E - end + end EventScript_16211F:: @ 816211F - setvar VAR_0x8006, 10 - setdynamicwarp MAP_SILPH_CO_7F, 255, 23, 3 - compare_var_to_value VAR_0x403A, 10 - goto_if 1, EventScript_1621E7 - call EventScript_1621EC - setvar VAR_0x403A, 10 - goto EventScript_1621E7 + setvar VAR_0x8006, 10 + setdynamicwarp MAP_SILPH_CO_7F, 255, 23, 3 + compare_var_to_value VAR_0x403A, 10 + goto_if 1, EventScript_1621E7 + call EventScript_1621EC + setvar VAR_0x403A, 10 + goto EventScript_1621E7 EventScript_162146:: @ 8162146 - end + end EventScript_162147:: @ 8162147 - setvar VAR_0x8006, 11 - setdynamicwarp MAP_SILPH_CO_8F, 255, 22, 3 - compare_var_to_value VAR_0x403A, 11 - goto_if 1, EventScript_1621E7 - call EventScript_1621EC - setvar VAR_0x403A, 11 - goto EventScript_1621E7 + setvar VAR_0x8006, 11 + setdynamicwarp MAP_SILPH_CO_8F, 255, 22, 3 + compare_var_to_value VAR_0x403A, 11 + goto_if 1, EventScript_1621E7 + call EventScript_1621EC + setvar VAR_0x403A, 11 + goto EventScript_1621E7 EventScript_16216E:: @ 816216E - end + end EventScript_16216F:: @ 816216F - setvar VAR_0x8006, 12 - setdynamicwarp MAP_SILPH_CO_9F, 255, 24, 3 - compare_var_to_value VAR_0x403A, 12 - goto_if 1, EventScript_1621E7 - call EventScript_1621EC - setvar VAR_0x403A, 12 - goto EventScript_1621E7 + setvar VAR_0x8006, 12 + setdynamicwarp MAP_SILPH_CO_9F, 255, 24, 3 + compare_var_to_value VAR_0x403A, 12 + goto_if 1, EventScript_1621E7 + call EventScript_1621EC + setvar VAR_0x403A, 12 + goto EventScript_1621E7 EventScript_162196:: @ 8162196 - end + end EventScript_162197:: @ 8162197 - setvar VAR_0x8006, 13 - setdynamicwarp MAP_SILPH_CO_10F, 255, 13, 3 - compare_var_to_value VAR_0x403A, 13 - goto_if 1, EventScript_1621E7 - call EventScript_1621EC - setvar VAR_0x403A, 13 - goto EventScript_1621E7 + setvar VAR_0x8006, 13 + setdynamicwarp MAP_SILPH_CO_10F, 255, 13, 3 + compare_var_to_value VAR_0x403A, 13 + goto_if 1, EventScript_1621E7 + call EventScript_1621EC + setvar VAR_0x403A, 13 + goto EventScript_1621E7 EventScript_1621BE:: @ 81621BE - end + end EventScript_1621BF:: @ 81621BF - setvar VAR_0x8006, 14 - setdynamicwarp MAP_SILPH_CO_11F, 255, 13, 3 - compare_var_to_value VAR_0x403A, 14 - goto_if 1, EventScript_1621E7 - call EventScript_1621EC - setvar VAR_0x403A, 14 - goto EventScript_1621E7 + setvar VAR_0x8006, 14 + setdynamicwarp MAP_SILPH_CO_11F, 255, 13, 3 + compare_var_to_value VAR_0x403A, 14 + goto_if 1, EventScript_1621E7 + call EventScript_1621EC + setvar VAR_0x403A, 14 + goto EventScript_1621E7 EventScript_1621E6:: @ 81621E6 - end + end EventScript_1621E7:: @ 81621E7 - special sub_80CB63C - releaseall - end + special sub_80CB63C + releaseall + end EventScript_1621EC:: @ 81621EC - special sub_80CB63C - closemessage - waitse - special sub_80CB498 - waitstate - setflag FLAG_0x002 - return + special sub_80CB63C + closemessage + waitse + special sub_80CB498 + waitstate + setflag FLAG_0x002 + return diff --git a/data/maps/SixIsland/scripts.inc b/data/maps/SixIsland/scripts.inc index 17e350a3d..bac71a468 100644 --- a/data/maps/SixIsland/scripts.inc +++ b/data/maps/SixIsland/scripts.inc @@ -1,22 +1,22 @@ SixIsland_MapScripts:: @ 8167ED8 - map_script 3, SixIsland_MapScript1_167EDE - .byte 0 + map_script 3, SixIsland_MapScript1_167EDE + .byte 0 SixIsland_MapScript1_167EDE:: @ 8167EDE - setworldmapflag 2209 - end + setworldmapflag 2209 + end SixIsland_EventScript_167EE2:: @ 8167EE2 - loadword 0, gUnknown_81831EF - callstd 2 - end + loadword 0, gUnknown_81831EF + callstd 2 + end SixIsland_EventScript_167EEB:: @ 8167EEB - loadword 0, gUnknown_8183255 - callstd 2 - end + loadword 0, gUnknown_8183255 + callstd 2 + end SixIsland_EventScript_167EF4:: @ 8167EF4 - loadword 0, gUnknown_81831C6 - callstd 3 - end + loadword 0, gUnknown_81831C6 + callstd 3 + end diff --git a/data/maps/SixIsland_AlteringCave/scripts.inc b/data/maps/SixIsland_AlteringCave/scripts.inc index 7fd338642..7c53187c3 100644 --- a/data/maps/SixIsland_AlteringCave/scripts.inc +++ b/data/maps/SixIsland_AlteringCave/scripts.inc @@ -1,7 +1,7 @@ SixIsland_AlteringCave_MapScripts:: @ 81646A4 - map_script 3, SixIsland_AlteringCave_MapScript1_1646AA - .byte 0 + map_script 3, SixIsland_AlteringCave_MapScript1_1646AA + .byte 0 SixIsland_AlteringCave_MapScript1_1646AA:: @ 81646AA - setworldmapflag 2238 - end + setworldmapflag 2238 + end diff --git a/data/maps/SixIsland_DottedHole_1F/scripts.inc b/data/maps/SixIsland_DottedHole_1F/scripts.inc index 6ac2bab50..bcb9a72ca 100644 --- a/data/maps/SixIsland_DottedHole_1F/scripts.inc +++ b/data/maps/SixIsland_DottedHole_1F/scripts.inc @@ -1,35 +1,35 @@ SixIsland_DottedHole_1F_MapScripts:: @ 8164182 - map_script 3, SixIsland_DottedHole_1F_MapScript1_164188 - .byte 0 + map_script 3, SixIsland_DottedHole_1F_MapScript1_164188 + .byte 0 SixIsland_DottedHole_1F_MapScript1_164188:: @ 8164188 - setworldmapflag 2235 - end + setworldmapflag 2235 + end SixIsland_DottedHole_B1F_EventScript_16418C:: @ 816418C - lockall - braillemessage gUnknown_81A9288 - waitbuttonpress - releaseall - end + lockall + braillemessage gUnknown_81A9288 + waitbuttonpress + releaseall + end SixIsland_DottedHole_B4F_EventScript_164195:: @ 8164195 - lockall - braillemessage gUnknown_81A928B - waitbuttonpress - releaseall - end + lockall + braillemessage gUnknown_81A928B + waitbuttonpress + releaseall + end SixIsland_DottedHole_B3F_EventScript_16419E:: @ 816419E - lockall - braillemessage gUnknown_81A9290 - waitbuttonpress - releaseall - end + lockall + braillemessage gUnknown_81A9290 + waitbuttonpress + releaseall + end SixIsland_DottedHole_B2F_EventScript_1641A7:: @ 81641A7 - lockall - braillemessage gUnknown_81A9296 - waitbuttonpress - releaseall - end + lockall + braillemessage gUnknown_81A9296 + waitbuttonpress + releaseall + end diff --git a/data/maps/SixIsland_DottedHole_B1F/scripts.inc b/data/maps/SixIsland_DottedHole_B1F/scripts.inc index 09fe57766..ee0b34abc 100644 --- a/data/maps/SixIsland_DottedHole_B1F/scripts.inc +++ b/data/maps/SixIsland_DottedHole_B1F/scripts.inc @@ -1,2 +1,2 @@ SixIsland_DottedHole_B1F_MapScripts:: @ 81641B0 - .byte 0 + .byte 0 diff --git a/data/maps/SixIsland_DottedHole_B2F/scripts.inc b/data/maps/SixIsland_DottedHole_B2F/scripts.inc index 2647365cc..8517edd5a 100644 --- a/data/maps/SixIsland_DottedHole_B2F/scripts.inc +++ b/data/maps/SixIsland_DottedHole_B2F/scripts.inc @@ -1,2 +1,2 @@ SixIsland_DottedHole_B2F_MapScripts:: @ 81641B1 - .byte 0 + .byte 0 diff --git a/data/maps/SixIsland_DottedHole_B3F/scripts.inc b/data/maps/SixIsland_DottedHole_B3F/scripts.inc index 68690d897..2810ad0b3 100644 --- a/data/maps/SixIsland_DottedHole_B3F/scripts.inc +++ b/data/maps/SixIsland_DottedHole_B3F/scripts.inc @@ -1,2 +1,2 @@ SixIsland_DottedHole_B3F_MapScripts:: @ 81641B2 - .byte 0 + .byte 0 diff --git a/data/maps/SixIsland_DottedHole_B4F/scripts.inc b/data/maps/SixIsland_DottedHole_B4F/scripts.inc index d265594c7..acde6c019 100644 --- a/data/maps/SixIsland_DottedHole_B4F/scripts.inc +++ b/data/maps/SixIsland_DottedHole_B4F/scripts.inc @@ -1,2 +1,2 @@ SixIsland_DottedHole_B4F_MapScripts:: @ 81641B3 - .byte 0 + .byte 0 diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc b/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc index f4143ca78..c0094f3c2 100644 --- a/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc +++ b/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc @@ -1,306 +1,306 @@ SixIsland_DottedHole_SapphireRoom_MapScripts:: @ 81641B4 - .byte 0 + .byte 0 SixIsland_DottedHole_SapphireRoom_EventScript_1641B5:: @ 81641B5 - lock - faceplayer - textcolor 3 - playfanfare BGM_FRLG_ME_KEYITEM - message Text_17BD82 - waitmessage - waitfanfare - closemessage - setobjectxyperm 2, 5, 0 - addobject 2 - playse SE_FU_ZAKU - applymovement 2, Movement_16440F - waitmovement 0 - playse SE_W115 - compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_16430F - compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_16430F - compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_16431A - compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_16431A - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 12 - setvar VAR_0x8007, 3 - special sub_80CAC28 - delay 60 - compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_164325 - compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_164330 - compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_16433B - compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_164346 - textcolor 0 - loadword 0, gUnknown_817BD97 - callstd 4 - closemessage - compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_164351 - compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_164366 - compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_16437B - compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_164390 - removeobject 1 - compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_1642F9 - compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_1642F9 - compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_164304 - compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_164304 - loadword 0, gUnknown_817BDD4 - callstd 4 - closemessage - compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_1643A5 - compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_1643B7 - compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_1643C9 - compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_1643DB - playse SE_KAIDAN - delay 35 - removeobject 2 - setflag FLAG_0x2D8 - release - end + lock + faceplayer + textcolor 3 + playfanfare BGM_FRLG_ME_KEYITEM + message Text_17BD82 + waitmessage + waitfanfare + closemessage + setobjectxyperm 2, 5, 0 + addobject 2 + playse SE_FU_ZAKU + applymovement 2, Movement_16440F + waitmovement 0 + playse SE_W115 + compare_var_to_value VAR_FACING, 2 + call_if 1, EventScript_16430F + compare_var_to_value VAR_FACING, 1 + call_if 1, EventScript_16430F + compare_var_to_value VAR_FACING, 4 + call_if 1, EventScript_16431A + compare_var_to_value VAR_FACING, 3 + call_if 1, EventScript_16431A + setvar VAR_0x8004, 3 + setvar VAR_0x8005, 0 + setvar VAR_0x8006, 12 + setvar VAR_0x8007, 3 + special sub_80CAC28 + delay 60 + compare_var_to_value VAR_FACING, 2 + call_if 1, EventScript_164325 + compare_var_to_value VAR_FACING, 1 + call_if 1, EventScript_164330 + compare_var_to_value VAR_FACING, 4 + call_if 1, EventScript_16433B + compare_var_to_value VAR_FACING, 3 + call_if 1, EventScript_164346 + textcolor 0 + loadword 0, gUnknown_817BD97 + callstd 4 + closemessage + compare_var_to_value VAR_FACING, 2 + call_if 1, EventScript_164351 + compare_var_to_value VAR_FACING, 1 + call_if 1, EventScript_164366 + compare_var_to_value VAR_FACING, 4 + call_if 1, EventScript_16437B + compare_var_to_value VAR_FACING, 3 + call_if 1, EventScript_164390 + removeobject 1 + compare_var_to_value VAR_FACING, 2 + call_if 1, EventScript_1642F9 + compare_var_to_value VAR_FACING, 1 + call_if 1, EventScript_1642F9 + compare_var_to_value VAR_FACING, 4 + call_if 1, EventScript_164304 + compare_var_to_value VAR_FACING, 3 + call_if 1, EventScript_164304 + loadword 0, gUnknown_817BDD4 + callstd 4 + closemessage + compare_var_to_value VAR_FACING, 2 + call_if 1, EventScript_1643A5 + compare_var_to_value VAR_FACING, 1 + call_if 1, EventScript_1643B7 + compare_var_to_value VAR_FACING, 4 + call_if 1, EventScript_1643C9 + compare_var_to_value VAR_FACING, 3 + call_if 1, EventScript_1643DB + playse SE_KAIDAN + delay 35 + removeobject 2 + setflag FLAG_0x2D8 + release + end EventScript_1642F9:: @ 81642F9 - applymovement 255, Movement_1A75E7 - waitmovement 0 - return + applymovement 255, Movement_1A75E7 + waitmovement 0 + return EventScript_164304:: @ 8164304 - applymovement 255, Movement_1A75ED - waitmovement 0 - return + applymovement 255, Movement_1A75ED + waitmovement 0 + return EventScript_16430F:: @ 816430F - applymovement 255, Movement_1A75E7 - waitmovement 0 - return + applymovement 255, Movement_1A75E7 + waitmovement 0 + return EventScript_16431A:: @ 816431A - applymovement 255, Movement_1A75ED - waitmovement 0 - return + applymovement 255, Movement_1A75ED + waitmovement 0 + return EventScript_164325:: @ 8164325 - applymovement 2, Movement_1643ED - waitmovement 0 - return + applymovement 2, Movement_1643ED + waitmovement 0 + return EventScript_164330:: @ 8164330 - applymovement 2, Movement_1643ED - waitmovement 0 - return + applymovement 2, Movement_1643ED + waitmovement 0 + return EventScript_16433B:: @ 816433B - applymovement 2, Movement_1643F1 - waitmovement 0 - return + applymovement 2, Movement_1643F1 + waitmovement 0 + return EventScript_164346:: @ 8164346 - applymovement 2, Movement_1643F1 - waitmovement 0 - return + applymovement 2, Movement_1643F1 + waitmovement 0 + return EventScript_164351:: @ 8164351 - applymovement 2, Movement_1643F5 - waitmovement 0 - applymovement 255, Movement_1A75E9 - waitmovement 0 - return + applymovement 2, Movement_1643F5 + waitmovement 0 + applymovement 255, Movement_1A75E9 + waitmovement 0 + return EventScript_164366:: @ 8164366 - applymovement 2, Movement_1643F5 - waitmovement 0 - applymovement 255, Movement_1A75ED - waitmovement 0 - return + applymovement 2, Movement_1643F5 + waitmovement 0 + applymovement 255, Movement_1A75ED + waitmovement 0 + return EventScript_16437B:: @ 816437B - applymovement 2, Movement_1643F7 - waitmovement 0 - applymovement 255, Movement_1A75EB - waitmovement 0 - return + applymovement 2, Movement_1643F7 + waitmovement 0 + applymovement 255, Movement_1A75EB + waitmovement 0 + return EventScript_164390:: @ 8164390 - applymovement 2, Movement_1643F7 - waitmovement 0 - applymovement 255, Movement_1A75E7 - waitmovement 0 - return + applymovement 2, Movement_1643F7 + waitmovement 0 + applymovement 255, Movement_1A75E7 + waitmovement 0 + return EventScript_1643A5:: @ 81643A5 - applymovement 255, Movement_16441C - applymovement 2, Movement_1643F9 - waitmovement 0 - return + applymovement 255, Movement_16441C + applymovement 2, Movement_1643F9 + waitmovement 0 + return EventScript_1643B7:: @ 81643B7 - applymovement 255, Movement_16441C - applymovement 2, Movement_164401 - waitmovement 0 - return + applymovement 255, Movement_16441C + applymovement 2, Movement_164401 + waitmovement 0 + return EventScript_1643C9:: @ 81643C9 - applymovement 255, Movement_16441C - applymovement 2, Movement_164409 - waitmovement 0 - return + applymovement 255, Movement_16441C + applymovement 2, Movement_164409 + waitmovement 0 + return EventScript_1643DB:: @ 81643DB - applymovement 255, Movement_16441C - applymovement 2, Movement_164409 - waitmovement 0 - return + applymovement 255, Movement_16441C + applymovement 2, Movement_164409 + waitmovement 0 + return Movement_1643ED:: @ 81643ED - step_11 - step_11 - step_30 - step_end + step_11 + step_11 + step_30 + step_end Movement_1643F1:: @ 81643F1 - step_13 - step_13 - step_2e - step_end + step_13 + step_13 + step_2e + step_end Movement_1643F5:: @ 81643F5 - step_13 - step_end + step_13 + step_end Movement_1643F7:: @ 81643F7 - step_11 - step_end + step_11 + step_end Movement_1643F9:: @ 81643F9 - step_1e - step_20 - step_20 - step_20 - step_1d - step_20 - step_20 - step_end + step_1e + step_20 + step_20 + step_20 + step_1d + step_20 + step_20 + step_end Movement_164401:: @ 8164401 - step_1d - step_20 - step_20 - step_20 - step_1e - step_20 - step_20 - step_end + step_1d + step_20 + step_20 + step_20 + step_1e + step_20 + step_20 + step_end Movement_164409:: @ 8164409 - step_20 - step_20 - step_20 - step_20 - step_1e - step_end + step_20 + step_20 + step_20 + step_20 + step_1e + step_end Movement_16440F:: @ 816440F - step_00 - step_5e - step_39 - step_39 - step_39 - step_39 - step_39 - step_39 - step_39 - step_39 - step_39 - step_5f - step_end + step_00 + step_5e + step_39 + step_39 + step_39 + step_39 + step_39 + step_39 + step_39 + step_39 + step_39 + step_5f + step_end Movement_16441C:: @ 816441C - step_1c - step_30 - step_end + step_1c + step_30 + step_end SixIsland_DottedHole_SapphireRoom_EventScript_16441F:: @ 816441F - lockall - setvar VAR_0x8005, 130 - setvar VAR_0x8006, 0 - braillemessage gUnknown_81A9321 - getbraillestringwidth gUnknown_81A9321 - call EventScript_1A926C - setvar VAR_0x8006, 0 - braillemessage gUnknown_81A932D - getbraillestringwidth gUnknown_81A932D - call EventScript_1A926C - setvar VAR_0x8006, 0 - braillemessage gUnknown_81A9338 - getbraillestringwidth gUnknown_81A9338 - call EventScript_1A926C - setvar VAR_0x8006, 0 - braillemessage gUnknown_81A933F - getbraillestringwidth gUnknown_81A933F - call EventScript_1A926C - setvar VAR_0x8006, 0 - braillemessage gUnknown_81A934A - getbraillestringwidth gUnknown_81A934A - call EventScript_1A926C - setvar VAR_0x8006, 0 - braillemessage gUnknown_81A9356 - getbraillestringwidth gUnknown_81A9356 - call EventScript_1A926C - setvar VAR_0x8006, 0 - braillemessage gUnknown_81A9362 - getbraillestringwidth gUnknown_81A9362 - call EventScript_1A926C - setvar VAR_0x8006, 0 - braillemessage gUnknown_81A9368 - getbraillestringwidth gUnknown_81A9368 - call EventScript_1A926C - setvar VAR_0x8006, 0 - braillemessage gUnknown_81A9374 - getbraillestringwidth gUnknown_81A9374 - call EventScript_1A926C - setvar VAR_0x8006, 0 - braillemessage gUnknown_81A937C - getbraillestringwidth gUnknown_81A937C - call EventScript_1A926C - setvar VAR_0x8006, 0 - braillemessage gUnknown_81A9387 - getbraillestringwidth gUnknown_81A9387 - call EventScript_1A926C - setvar VAR_0x8006, 0 - braillemessage gUnknown_81A9393 - getbraillestringwidth gUnknown_81A9393 - call EventScript_1A926C - setvar VAR_0x8006, 0 - braillemessage gUnknown_81A939F - getbraillestringwidth gUnknown_81A939F - call EventScript_1A926C - setvar VAR_0x8006, 0 - braillemessage gUnknown_81A93AB - getbraillestringwidth gUnknown_81A93AB - call EventScript_1A926C - setvar VAR_0x8006, 0 - braillemessage gUnknown_81A93B4 - getbraillestringwidth gUnknown_81A93B4 - call EventScript_1A926C - braillemessage gUnknown_81A93C0 - waitbuttonpress - releaseall - end + lockall + setvar VAR_0x8005, 130 + setvar VAR_0x8006, 0 + braillemessage gUnknown_81A9321 + getbraillestringwidth gUnknown_81A9321 + call EventScript_1A926C + setvar VAR_0x8006, 0 + braillemessage gUnknown_81A932D + getbraillestringwidth gUnknown_81A932D + call EventScript_1A926C + setvar VAR_0x8006, 0 + braillemessage gUnknown_81A9338 + getbraillestringwidth gUnknown_81A9338 + call EventScript_1A926C + setvar VAR_0x8006, 0 + braillemessage gUnknown_81A933F + getbraillestringwidth gUnknown_81A933F + call EventScript_1A926C + setvar VAR_0x8006, 0 + braillemessage gUnknown_81A934A + getbraillestringwidth gUnknown_81A934A + call EventScript_1A926C + setvar VAR_0x8006, 0 + braillemessage gUnknown_81A9356 + getbraillestringwidth gUnknown_81A9356 + call EventScript_1A926C + setvar VAR_0x8006, 0 + braillemessage gUnknown_81A9362 + getbraillestringwidth gUnknown_81A9362 + call EventScript_1A926C + setvar VAR_0x8006, 0 + braillemessage gUnknown_81A9368 + getbraillestringwidth gUnknown_81A9368 + call EventScript_1A926C + setvar VAR_0x8006, 0 + braillemessage gUnknown_81A9374 + getbraillestringwidth gUnknown_81A9374 + call EventScript_1A926C + setvar VAR_0x8006, 0 + braillemessage gUnknown_81A937C + getbraillestringwidth gUnknown_81A937C + call EventScript_1A926C + setvar VAR_0x8006, 0 + braillemessage gUnknown_81A9387 + getbraillestringwidth gUnknown_81A9387 + call EventScript_1A926C + setvar VAR_0x8006, 0 + braillemessage gUnknown_81A9393 + getbraillestringwidth gUnknown_81A9393 + call EventScript_1A926C + setvar VAR_0x8006, 0 + braillemessage gUnknown_81A939F + getbraillestringwidth gUnknown_81A939F + call EventScript_1A926C + setvar VAR_0x8006, 0 + braillemessage gUnknown_81A93AB + getbraillestringwidth gUnknown_81A93AB + call EventScript_1A926C + setvar VAR_0x8006, 0 + braillemessage gUnknown_81A93B4 + getbraillestringwidth gUnknown_81A93B4 + call EventScript_1A926C + braillemessage gUnknown_81A93C0 + waitbuttonpress + releaseall + end diff --git a/data/maps/SixIsland_GreenPath/scripts.inc b/data/maps/SixIsland_GreenPath/scripts.inc index 860d1a964..3506af2f6 100644 --- a/data/maps/SixIsland_GreenPath/scripts.inc +++ b/data/maps/SixIsland_GreenPath/scripts.inc @@ -1,12 +1,12 @@ SixIsland_GreenPath_MapScripts:: @ 8168B2D - .byte 0 + .byte 0 SixIsland_GreenPath_EventScript_168B2E:: @ 8168B2E - loadword 0, gUnknown_818B84D - callstd 3 - end + loadword 0, gUnknown_818B84D + callstd 3 + end SixIsland_GreenPath_EventScript_168B37:: @ 8168B37 - loadword 0, gUnknown_818B86B - callstd 3 - end + loadword 0, gUnknown_818B86B + callstd 3 + end diff --git a/data/maps/SixIsland_Harbor/scripts.inc b/data/maps/SixIsland_Harbor/scripts.inc index 575746338..1e4e34a16 100644 --- a/data/maps/SixIsland_Harbor/scripts.inc +++ b/data/maps/SixIsland_Harbor/scripts.inc @@ -1,11 +1,11 @@ SixIsland_Harbor_MapScripts:: @ 8171E47 - .byte 0 + .byte 0 SixIsland_Harbor_EventScript_171E48:: @ 8171E48 - lock - faceplayer - message Text_181726 - waitmessage - setvar VAR_0x8004, 6 - goto EventScript_1A900F - end + lock + faceplayer + message Text_181726 + waitmessage + setvar VAR_0x8004, 6 + goto EventScript_1A900F + end diff --git a/data/maps/SixIsland_House/scripts.inc b/data/maps/SixIsland_House/scripts.inc index d1f6d2c78..46d554c10 100644 --- a/data/maps/SixIsland_House/scripts.inc +++ b/data/maps/SixIsland_House/scripts.inc @@ -1,7 +1,7 @@ SixIsland_House_MapScripts:: @ 8171E5B - .byte 0 + .byte 0 SixIsland_House_EventScript_171E5C:: @ 8171E5C - loadword 0, gUnknown_81A412E - callstd 2 - end + loadword 0, gUnknown_81A412E + callstd 2 + end diff --git a/data/maps/SixIsland_Mart/scripts.inc b/data/maps/SixIsland_Mart/scripts.inc index ea29b5359..6fca2c7a6 100644 --- a/data/maps/SixIsland_Mart/scripts.inc +++ b/data/maps/SixIsland_Mart/scripts.inc @@ -1,35 +1,35 @@ SixIsland_Mart_MapScripts:: @ 8171E65 - .byte 0 + .byte 0 SixIsland_Mart_EventScript_171E66:: @ 8171E66 - special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 - lock - faceplayer - message Text_1A6211 - waitmessage - pokemart Items_171E8C - loadword 0, gUnknown_81A5190 - callstd 4 - release - end + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + lock + faceplayer + message Text_1A6211 + waitmessage + pokemart Items_171E8C + loadword 0, gUnknown_81A5190 + callstd 4 + release + end - .align 2 + .align 2 Items_171E8C:: @ 8171E8C - .2byte ITEM_ULTRA_BALL - .2byte ITEM_FULL_RESTORE - .2byte ITEM_MAX_POTION - .2byte ITEM_REVIVE - .2byte ITEM_FULL_HEAL - .2byte ITEM_ESCAPE_ROPE - .2byte ITEM_MAX_REPEL - .2byte ITEM_DREAM_MAIL - .2byte ITEM_NONE - release - end + .2byte ITEM_ULTRA_BALL + .2byte ITEM_FULL_RESTORE + .2byte ITEM_MAX_POTION + .2byte ITEM_REVIVE + .2byte ITEM_FULL_HEAL + .2byte ITEM_ESCAPE_ROPE + .2byte ITEM_MAX_REPEL + .2byte ITEM_DREAM_MAIL + .2byte ITEM_NONE + release + end SixIsland_Mart_EventScript_171EA0:: @ 8171EA0 - loadword 0, gUnknown_81A4271 - callstd 2 - end + loadword 0, gUnknown_81A4271 + callstd 2 + end diff --git a/data/maps/SixIsland_OutcastIsland/scripts.inc b/data/maps/SixIsland_OutcastIsland/scripts.inc index 68a9dd535..4c2eeb67e 100644 --- a/data/maps/SixIsland_OutcastIsland/scripts.inc +++ b/data/maps/SixIsland_OutcastIsland/scripts.inc @@ -1,8 +1,8 @@ SixIsland_OutcastIsland_MapScripts:: @ 8168B15 - .byte 0 + .byte 0 SixIsland_OutcastIsland_EventScript_168B16:: @ 8168B16 - trainerbattle 0, 540, 0, Text_18B35A, Text_18B3C2 - loadword 0, gUnknown_818B3C8 - callstd 6 - end + trainerbattle 0, 540, 0, Text_18B35A, Text_18B3C2 + loadword 0, gUnknown_818B3C8 + callstd 6 + end diff --git a/data/maps/SixIsland_PatternBush/scripts.inc b/data/maps/SixIsland_PatternBush/scripts.inc index 69a35163d..fd72430ea 100644 --- a/data/maps/SixIsland_PatternBush/scripts.inc +++ b/data/maps/SixIsland_PatternBush/scripts.inc @@ -1,92 +1,92 @@ SixIsland_PatternBush_MapScripts:: @ 8164559 - map_script 3, SixIsland_PatternBush_MapScript1_16455F - .byte 0 + map_script 3, SixIsland_PatternBush_MapScript1_16455F + .byte 0 SixIsland_PatternBush_MapScript1_16455F:: @ 816455F - setworldmapflag 2237 - getplayerxy VAR_0x4001, VAR_0x4002 - compare_var_to_value VAR_0x4001, 50 - call_if 4, EventScript_16457E - compare_var_to_value VAR_0x4001, 49 - call_if 3, EventScript_164587 - end + setworldmapflag 2237 + getplayerxy VAR_0x4001, VAR_0x4002 + compare_var_to_value VAR_0x4001, 50 + call_if 4, EventScript_16457E + compare_var_to_value VAR_0x4001, 49 + call_if 3, EventScript_164587 + end EventScript_16457E:: @ 816457E - setescapewarp MAP_SIX_ISLAND_GREEN_PATH, 255, 64, 10 - return + setescapewarp MAP_SIX_ISLAND_GREEN_PATH, 255, 64, 10 + return EventScript_164587:: @ 8164587 - setescapewarp MAP_SIX_ISLAND_GREEN_PATH, 255, 45, 10 - return + setescapewarp MAP_SIX_ISLAND_GREEN_PATH, 255, 45, 10 + return SixIsland_PatternBush_EventScript_164590:: @ 8164590 - trainerbattle 0, 609, 0, Text_17BF3A, Text_17BF66 - loadword 0, gUnknown_817BF97 - callstd 6 - end + trainerbattle 0, 609, 0, Text_17BF3A, Text_17BF66 + loadword 0, gUnknown_817BF97 + callstd 6 + end SixIsland_PatternBush_EventScript_1645A7:: @ 81645A7 - trainerbattle 0, 610, 0, Text_17BFEB, Text_17C028 - loadword 0, gUnknown_817C056 - callstd 6 - end + trainerbattle 0, 610, 0, Text_17BFEB, Text_17C028 + loadword 0, gUnknown_817C056 + callstd 6 + end SixIsland_PatternBush_EventScript_1645BE:: @ 81645BE - trainerbattle 0, 611, 0, Text_17C0BE, Text_17C0F2 - loadword 0, gUnknown_817C113 - callstd 6 - end + trainerbattle 0, 611, 0, Text_17C0BE, Text_17C0F2 + loadword 0, gUnknown_817C113 + callstd 6 + end SixIsland_PatternBush_EventScript_1645D5:: @ 81645D5 - trainerbattle 0, 612, 0, Text_17C155, Text_17C196 - loadword 0, gUnknown_817C1D0 - callstd 6 - end + trainerbattle 0, 612, 0, Text_17C155, Text_17C196 + loadword 0, gUnknown_817C1D0 + callstd 6 + end SixIsland_PatternBush_EventScript_1645EC:: @ 81645EC - trainerbattle 0, 613, 0, Text_17C246, Text_17C275 - loadword 0, gUnknown_817C2A4 - callstd 6 - end + trainerbattle 0, 613, 0, Text_17C246, Text_17C275 + loadword 0, gUnknown_817C2A4 + callstd 6 + end SixIsland_PatternBush_EventScript_164603:: @ 8164603 - trainerbattle 0, 614, 0, Text_17C2D9, Text_17C30D - loadword 0, gUnknown_817C31C - callstd 6 - end + trainerbattle 0, 614, 0, Text_17C2D9, Text_17C30D + loadword 0, gUnknown_817C31C + callstd 6 + end SixIsland_PatternBush_EventScript_16461A:: @ 816461A - trainerbattle 0, 615, 0, Text_17C373, Text_17C3A5 - loadword 0, gUnknown_817C3CE - callstd 6 - end + trainerbattle 0, 615, 0, Text_17C373, Text_17C3A5 + loadword 0, gUnknown_817C3CE + callstd 6 + end SixIsland_PatternBush_EventScript_164631:: @ 8164631 - trainerbattle 0, 616, 0, Text_17C42B, Text_17C458 - loadword 0, gUnknown_817C490 - callstd 6 - end + trainerbattle 0, 616, 0, Text_17C42B, Text_17C458 + loadword 0, gUnknown_817C490 + callstd 6 + end SixIsland_PatternBush_EventScript_164648:: @ 8164648 - trainerbattle 0, 617, 0, Text_17C4FE, Text_17C552 - loadword 0, gUnknown_817C590 - callstd 6 - end + trainerbattle 0, 617, 0, Text_17C4FE, Text_17C552 + loadword 0, gUnknown_817C590 + callstd 6 + end SixIsland_PatternBush_EventScript_16465F:: @ 816465F - trainerbattle 0, 618, 0, Text_17C5DB, Text_17C609 - loadword 0, gUnknown_817C615 - callstd 6 - end + trainerbattle 0, 618, 0, Text_17C5DB, Text_17C609 + loadword 0, gUnknown_817C615 + callstd 6 + end SixIsland_PatternBush_EventScript_164676:: @ 8164676 - trainerbattle 0, 619, 0, Text_17C63E, Text_17C660 - loadword 0, gUnknown_817C68E - callstd 6 - end + trainerbattle 0, 619, 0, Text_17C63E, Text_17C660 + loadword 0, gUnknown_817C68E + callstd 6 + end SixIsland_PatternBush_EventScript_16468D:: @ 816468D - trainerbattle 0, 620, 0, Text_17C6C9, Text_17C6FB - loadword 0, gUnknown_817C728 - callstd 6 - end + trainerbattle 0, 620, 0, Text_17C6C9, Text_17C6FB + loadword 0, gUnknown_817C728 + callstd 6 + end diff --git a/data/maps/SixIsland_PokemonCenter_1F/scripts.inc b/data/maps/SixIsland_PokemonCenter_1F/scripts.inc index e578c36b7..2eb0554e4 100644 --- a/data/maps/SixIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/SixIsland_PokemonCenter_1F/scripts.inc @@ -1,82 +1,82 @@ SixIsland_PokemonCenter_1F_MapScripts:: @ 8171D6A - map_script 3, SixIsland_PokemonCenter_1F_MapScript1_171D7A - map_script 5, SixIsland_PokemonCenter_1F_MapScript2_1BC05C - map_script 2, SixIsland_PokemonCenter_1F_MapScript3_171D8D - .byte 0 + map_script 3, SixIsland_PokemonCenter_1F_MapScript1_171D7A + map_script 5, SixIsland_PokemonCenter_1F_MapScript2_1BC05C + map_script 2, SixIsland_PokemonCenter_1F_MapScript3_171D8D + .byte 0 SixIsland_PokemonCenter_1F_MapScript1_171D7A:: @ 8171D7A - setrespawn 20 - compare_var_to_value VAR_0x4089, 0 - call_if 1, EventScript_171D89 - end + setrespawn 20 + compare_var_to_value VAR_0x4089, 0 + call_if 1, EventScript_171D89 + end EventScript_171D89:: @ 8171D89 - clearflag FLAG_0x098 - return + clearflag FLAG_0x098 + return SixIsland_PokemonCenter_1F_MapScript3_171D8D:: @ 8171D8D - map_script_2 VAR_0x4089, 0, EventScript_171D97 - .2byte 0 + map_script_2 VAR_0x4089, 0, EventScript_171D97 + .2byte 0 EventScript_171D97:: @ 8171D97 - lockall - textcolor 0 - applymovement 2, Movement_1A75ED - waitmovement 0 - playbgm BGM_FRLG_RIVAL, 0 - applymovement 2, Movement_1A75DB - waitmovement 0 - applymovement 2, Movement_1A75DD - waitmovement 0 - delay 25 - applymovement 2, Movement_171DF9 - waitmovement 0 - loadword 0, gUnknown_81A3F30 - callstd 4 - closemessage - applymovement 255, Movement_171E02 - applymovement 2, Movement_171DFE - waitmovement 0 - fadedefaultbgm - playse SE_KAIDAN - delay 35 - removeobject 2 - setvar VAR_0x4089, 1 - setvar VAR_0x4086, 1 - releaseall - end + lockall + textcolor 0 + applymovement 2, Movement_1A75ED + waitmovement 0 + playbgm BGM_FRLG_RIVAL, 0 + applymovement 2, Movement_1A75DB + waitmovement 0 + applymovement 2, Movement_1A75DD + waitmovement 0 + delay 25 + applymovement 2, Movement_171DF9 + waitmovement 0 + loadword 0, gUnknown_81A3F30 + callstd 4 + closemessage + applymovement 255, Movement_171E02 + applymovement 2, Movement_171DFE + waitmovement 0 + fadedefaultbgm + playse SE_KAIDAN + delay 35 + removeobject 2 + setvar VAR_0x4089, 1 + setvar VAR_0x4086, 1 + releaseall + end Movement_171DF9:: @ 8171DF9 - step_13 - step_13 - step_10 - step_10 - step_end + step_13 + step_13 + step_10 + step_10 + step_end Movement_171DFE:: @ 8171DFE - step_1c - step_1a - step_10 - step_end + step_1c + step_1a + step_10 + step_end Movement_171E02:: @ 8171E02 - step_12 - step_30 - step_end + step_12 + step_30 + step_end SixIsland_PokemonCenter_1F_EventScript_171E05:: @ 8171E05 - lock - faceplayer - call EventScript_1A6578 - release - end + lock + faceplayer + call EventScript_1A6578 + release + end SixIsland_PokemonCenter_1F_EventScript_171E0E:: @ 8171E0E - loadword 0, gUnknown_81A3E02 - callstd 2 - end + loadword 0, gUnknown_81A3E02 + callstd 2 + end SixIsland_PokemonCenter_1F_EventScript_171E17:: @ 8171E17 - loadword 0, gUnknown_81A3E87 - callstd 2 - end + loadword 0, gUnknown_81A3E87 + callstd 2 + end diff --git a/data/maps/SixIsland_PokemonCenter_2F/scripts.inc b/data/maps/SixIsland_PokemonCenter_2F/scripts.inc index 652c22240..a261c9269 100644 --- a/data/maps/SixIsland_PokemonCenter_2F/scripts.inc +++ b/data/maps/SixIsland_PokemonCenter_2F/scripts.inc @@ -1,18 +1,18 @@ SixIsland_PokemonCenter_2F_MapScripts:: @ 8171E20 - map_script 2, SixIsland_PokemonCenter_2F_MapScript1_1BB2A3 - map_script 4, SixIsland_PokemonCenter_2F_MapScript2_1BB1ED - map_script 1, SixIsland_PokemonCenter_2F_MapScript3_1BB237 - map_script 3, SixIsland_PokemonCenter_2F_MapScript4_1BB1B4 - .byte 0 + map_script 2, SixIsland_PokemonCenter_2F_MapScript1_1BB2A3 + map_script 4, SixIsland_PokemonCenter_2F_MapScript2_1BB1ED + map_script 1, SixIsland_PokemonCenter_2F_MapScript3_1BB237 + map_script 3, SixIsland_PokemonCenter_2F_MapScript4_1BB1B4 + .byte 0 SixIsland_PokemonCenter_2F_EventScript_171E35:: @ 8171E35 - call EventScript_1BB4A3 - end + call EventScript_1BB4A3 + end EventScript_171E3B:: @ 8171E3B - call EventScript_1BB6AB - end + call EventScript_1BB6AB + end EventScript_171E41:: @ 8171E41 - call EventScript_1BB7DE - end + call EventScript_1BB7DE + end diff --git a/data/maps/SixIsland_RuinValley/scripts.inc b/data/maps/SixIsland_RuinValley/scripts.inc index 825822e1a..22a482782 100644 --- a/data/maps/SixIsland_RuinValley/scripts.inc +++ b/data/maps/SixIsland_RuinValley/scripts.inc @@ -1,52 +1,52 @@ SixIsland_RuinValley_MapScripts:: @ 8168B53 - map_script 1, SixIsland_RuinValley_MapScript1_168B59 - .byte 0 + map_script 1, SixIsland_RuinValley_MapScript1_168B59 + .byte 0 SixIsland_RuinValley_MapScript1_168B59:: @ 8168B59 - checkflag FLAG_0x2E3 - call_if 1, EventScript_168B63 - end + checkflag FLAG_0x2E3 + call_if 1, EventScript_168B63 + end EventScript_168B63:: @ 8168B63 - setmetatile 24, 24, 856, 0 - return + setmetatile 24, 24, 856, 0 + return SixIsland_RuinValley_EventScript_168B6D:: @ 8168B6D - lock - loadword 0, gUnknown_818BD47 - callstd 4 - applymovement 1, Movement_1A75E1 - waitmovement 0 - loadword 0, gUnknown_818BD7A - callstd 4 - applymovement 1, Movement_1A75E5 - waitmovement 0 - release - end + lock + loadword 0, gUnknown_818BD47 + callstd 4 + applymovement 1, Movement_1A75E1 + waitmovement 0 + loadword 0, gUnknown_818BD7A + callstd 4 + applymovement 1, Movement_1A75E5 + waitmovement 0 + release + end SixIsland_RuinValley_EventScript_168B94:: @ 8168B94 - lockall - checkflag FLAG_0x2E3 - goto_if 1, EventScript_168BC1 - loadword 0, gUnknown_818BDC0 - callstd 5 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_168BCB - loadword 0, gUnknown_818BE11 - callstd 4 - braillemessage gUnknown_81A929B - waitbuttonpress - releaseall - end + lockall + checkflag FLAG_0x2E3 + goto_if 1, EventScript_168BC1 + loadword 0, gUnknown_818BDC0 + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_168BCB + loadword 0, gUnknown_818BE11 + callstd 4 + braillemessage gUnknown_81A929B + waitbuttonpress + releaseall + end EventScript_168BC1:: @ 8168BC1 - loadword 0, gUnknown_818BE4B - callstd 4 - releaseall - end + loadword 0, gUnknown_818BE4B + callstd 4 + releaseall + end EventScript_168BCB:: @ 8168BCB - loadword 0, gUnknown_818BDF9 - callstd 4 - releaseall - end + loadword 0, gUnknown_818BDF9 + callstd 4 + releaseall + end diff --git a/data/maps/SixIsland_WaterPath/scripts.inc b/data/maps/SixIsland_WaterPath/scripts.inc index 5d8c10058..dba612142 100644 --- a/data/maps/SixIsland_WaterPath/scripts.inc +++ b/data/maps/SixIsland_WaterPath/scripts.inc @@ -1,12 +1,12 @@ SixIsland_WaterPath_MapScripts:: @ 8168B40 - .byte 0 + .byte 0 SixIsland_WaterPath_EventScript_168B41:: @ 8168B41 - loadword 0, gUnknown_818BD0C - callstd 3 - end + loadword 0, gUnknown_818BD0C + callstd 3 + end SixIsland_WaterPath_EventScript_168B4A:: @ 8168B4A - loadword 0, gUnknown_818BD27 - callstd 3 - end + loadword 0, gUnknown_818BD27 + callstd 3 + end diff --git a/data/maps/SixIsland_WaterPath_House1/scripts.inc b/data/maps/SixIsland_WaterPath_House1/scripts.inc index d93d01435..ea48e90da 100644 --- a/data/maps/SixIsland_WaterPath_House1/scripts.inc +++ b/data/maps/SixIsland_WaterPath_House1/scripts.inc @@ -1,101 +1,101 @@ SixIsland_WaterPath_House1_MapScripts:: @ 817206C - .byte 0 + .byte 0 SixIsland_WaterPath_House1_EventScript_17206D:: @ 817206D - lock - faceplayer - special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 - special sub_8112364 - setvar VAR_0x8004, 214 - specialvar VAR_RESULT, sub_80CC48C - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1720E5 - special sub_80A0918 - loadword 0, gUnknown_81A4A3F - callstd 4 - special sub_80BF8FC - waitstate - copyvar VAR_RESULT, VAR_0x8004 - compare_var_to_value VAR_RESULT, 6 - goto_if 4, EventScript_1720EF - special sub_80A0930 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1720F1 - compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1720FB - compare_var_to_value VAR_RESULT, 3 - goto_if 1, EventScript_172121 - compare_var_to_value VAR_RESULT, 4 - goto_if 1, EventScript_17210E - release - end + lock + faceplayer + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + special sub_8112364 + setvar VAR_0x8004, 214 + specialvar VAR_RESULT, sub_80CC48C + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_1720E5 + special sub_80A0918 + loadword 0, gUnknown_81A4A3F + callstd 4 + special sub_80BF8FC + waitstate + copyvar VAR_RESULT, VAR_0x8004 + compare_var_to_value VAR_RESULT, 6 + goto_if 4, EventScript_1720EF + special sub_80A0930 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_1720F1 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1720FB + compare_var_to_value VAR_RESULT, 3 + goto_if 1, EventScript_172121 + compare_var_to_value VAR_RESULT, 4 + goto_if 1, EventScript_17210E + release + end EventScript_1720E5:: @ 81720E5 - loadword 0, gUnknown_81A49E9 - callstd 4 - release - end + loadword 0, gUnknown_81A49E9 + callstd 4 + release + end EventScript_1720EF:: @ 81720EF - release - end + release + end EventScript_1720F1:: @ 81720F1 - loadword 0, gUnknown_81A4BEF - callstd 4 - release - end + loadword 0, gUnknown_81A4BEF + callstd 4 + release + end EventScript_1720FB:: @ 81720FB - checkflag FLAG_0x2D9 - goto_if 0, EventScript_172121 - loadword 0, gUnknown_81A4B7A - callstd 4 - release - end + checkflag FLAG_0x2D9 + goto_if 0, EventScript_172121 + loadword 0, gUnknown_81A4B7A + callstd 4 + release + end EventScript_17210E:: @ 817210E - checkflag FLAG_0x2D9 - goto_if 0, EventScript_172121 - loadword 0, gUnknown_81A4B39 - callstd 4 - release - end + checkflag FLAG_0x2D9 + goto_if 0, EventScript_172121 + loadword 0, gUnknown_81A4B39 + callstd 4 + release + end EventScript_172121:: @ 8172121 - setflag FLAG_0x2D9 - loadword 0, gUnknown_81A4A88 - callstd 4 - setorcopyvar VAR_0x8000, 8 - setorcopyvar VAR_0x8001, 1 - callstd 0 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_17214D - loadword 0, gUnknown_81A4AD9 - callstd 4 - release - end + setflag FLAG_0x2D9 + loadword 0, gUnknown_81A4A88 + callstd 4 + setorcopyvar VAR_0x8000, 8 + setorcopyvar VAR_0x8001, 1 + callstd 0 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_17214D + loadword 0, gUnknown_81A4AD9 + callstd 4 + release + end EventScript_17214D:: @ 817214D - loadword 0, gUnknown_81A4C47 - callstd 4 - release - end + loadword 0, gUnknown_81A4C47 + callstd 4 + release + end SixIsland_WaterPath_House1_EventScript_172157:: @ 8172157 - lockall - checkflag FLAG_0x2D9 - goto_if 1, EventScript_17216B - loadword 0, gUnknown_81A4CB9 - callstd 4 - releaseall - end + lockall + checkflag FLAG_0x2D9 + goto_if 1, EventScript_17216B + loadword 0, gUnknown_81A4CB9 + callstd 4 + releaseall + end EventScript_17216B:: @ 817216B - special sub_80A0918 - loadword 0, gUnknown_81A4C6E - callstd 4 - releaseall - end + special sub_80A0918 + loadword 0, gUnknown_81A4C6E + callstd 4 + releaseall + end diff --git a/data/maps/SixIsland_WaterPath_House2/scripts.inc b/data/maps/SixIsland_WaterPath_House2/scripts.inc index 916bf5fbd..476f222a0 100644 --- a/data/maps/SixIsland_WaterPath_House2/scripts.inc +++ b/data/maps/SixIsland_WaterPath_House2/scripts.inc @@ -1,7 +1,7 @@ SixIsland_WaterPath_House2_MapScripts:: @ 8172178 - .byte 0 + .byte 0 SixIsland_WaterPath_House2_EventScript_172179:: @ 8172179 - loadword 0, gUnknown_81A4D0D - callstd 2 - end + loadword 0, gUnknown_81A4D0D + callstd 2 + end diff --git a/data/maps/ThreeIsland/scripts.inc b/data/maps/ThreeIsland/scripts.inc index 76813e4ad..a142aa51f 100644 --- a/data/maps/ThreeIsland/scripts.inc +++ b/data/maps/ThreeIsland/scripts.inc @@ -1,443 +1,443 @@ ThreeIsland_MapScripts:: @ 81677AD - map_script 3, ThreeIsland_MapScript1_1677B3 - .byte 0 + map_script 3, ThreeIsland_MapScript1_1677B3 + .byte 0 ThreeIsland_MapScript1_1677B3:: @ 81677B3 - setworldmapflag 2205 - checkflag FLAG_0x2A3 - call_if 1, EventScript_1677CB - compare_var_to_value VAR_0x407B, 4 - call_if 1, EventScript_1677CF - end + setworldmapflag 2205 + checkflag FLAG_0x2A3 + call_if 1, EventScript_1677CB + compare_var_to_value VAR_0x407B, 4 + call_if 1, EventScript_1677CF + end EventScript_1677CB:: @ 81677CB - setflag FLAG_0x07E - return + setflag FLAG_0x07E + return EventScript_1677CF:: @ 81677CF - setobjectmovementtype 1, 1 - setobjectmovementtype 2, 1 - return + setobjectmovementtype 1, 1 + setobjectmovementtype 2, 1 + return ThreeIsland_EventScript_1677D8:: @ 81677D8 - lock - setvar VAR_0x4001, 2 - call EventScript_16786F - release - end + lock + setvar VAR_0x4001, 2 + call EventScript_16786F + release + end ThreeIsland_EventScript_1677E5:: @ 81677E5 - lock - checkflag FLAG_0x2FC - goto_if 1, EventScript_167806 - compare_var_to_value VAR_0x407B, 4 - goto_if 1, EventScript_16781A - setvar VAR_0x4001, 0 - call EventScript_16786F - release - end + lock + checkflag FLAG_0x2FC + goto_if 1, EventScript_167806 + compare_var_to_value VAR_0x407B, 4 + goto_if 1, EventScript_16781A + setvar VAR_0x4001, 0 + call EventScript_16786F + release + end EventScript_167806:: @ 8167806 - applymovement 1, Movement_1A75E1 - waitmovement 0 - loadword 0, gUnknown_81827F1 - callstd 4 - release - end + applymovement 1, Movement_1A75E1 + waitmovement 0 + loadword 0, gUnknown_81827F1 + callstd 4 + release + end EventScript_16781A:: @ 816781A - applymovement 1, Movement_1A75E1 - waitmovement 0 - loadword 0, gUnknown_818275A - callstd 4 - checkitemspace ITEM_FULL_RESTORE, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_167865 - loadword 0, gUnknown_81827BE - setorcopyvar VAR_0x8000, 19 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 257 - callstd 9 - additem ITEM_FULL_RESTORE, 1 - setflag FLAG_0x2FC - loadword 0, gUnknown_81827F1 - callstd 4 - release - end + applymovement 1, Movement_1A75E1 + waitmovement 0 + loadword 0, gUnknown_818275A + callstd 4 + checkitemspace ITEM_FULL_RESTORE, 1 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_167865 + loadword 0, gUnknown_81827BE + setorcopyvar VAR_0x8000, 19 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 257 + callstd 9 + additem ITEM_FULL_RESTORE, 1 + setflag FLAG_0x2FC + loadword 0, gUnknown_81827F1 + callstd 4 + release + end EventScript_167865:: @ 8167865 - loadword 0, gUnknown_81827DB - callstd 4 - release - end + loadword 0, gUnknown_81827DB + callstd 4 + release + end EventScript_16786F:: @ 816786F - compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_167947 - compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_167947 - applymovement 1, Movement_167A1B - waitmovement 0 - loadword 0, gUnknown_81820C0 - callstd 4 - compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_167952 - compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_167952 - compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_16795D - applymovement 5, Movement_167A19 - waitmovement 0 - loadword 0, gUnknown_8182125 - callstd 4 - compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_167931 - compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_167931 - compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_167973 - applymovement 2, Movement_167A1B - waitmovement 0 - loadword 0, gUnknown_81821A9 - callstd 4 - compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_167952 - compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_167952 - compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_16795D - applymovement 4, Movement_167A19 - waitmovement 0 - loadword 0, gUnknown_81821DC - callstd 4 - return + compare_var_to_value VAR_0x4001, 1 + call_if 1, EventScript_167947 + compare_var_to_value VAR_0x4001, 2 + call_if 1, EventScript_167947 + applymovement 1, Movement_167A1B + waitmovement 0 + loadword 0, gUnknown_81820C0 + callstd 4 + compare_var_to_value VAR_0x4001, 0 + call_if 1, EventScript_167952 + compare_var_to_value VAR_0x4001, 1 + call_if 1, EventScript_167952 + compare_var_to_value VAR_0x4001, 2 + call_if 1, EventScript_16795D + applymovement 5, Movement_167A19 + waitmovement 0 + loadword 0, gUnknown_8182125 + callstd 4 + compare_var_to_value VAR_0x4001, 0 + call_if 1, EventScript_167931 + compare_var_to_value VAR_0x4001, 1 + call_if 1, EventScript_167931 + compare_var_to_value VAR_0x4001, 2 + call_if 1, EventScript_167973 + applymovement 2, Movement_167A1B + waitmovement 0 + loadword 0, gUnknown_81821A9 + callstd 4 + compare_var_to_value VAR_0x4001, 0 + call_if 1, EventScript_167952 + compare_var_to_value VAR_0x4001, 1 + call_if 1, EventScript_167952 + compare_var_to_value VAR_0x4001, 2 + call_if 1, EventScript_16795D + applymovement 4, Movement_167A19 + waitmovement 0 + loadword 0, gUnknown_81821DC + callstd 4 + return EventScript_167931:: @ 8167931 - applymovement 255, Movement_1A75E9 - waitmovement 0 - return + applymovement 255, Movement_1A75E9 + waitmovement 0 + return EventScript_16793C:: @ 816793C - applymovement 255, Movement_1A75ED - waitmovement 0 - return + applymovement 255, Movement_1A75ED + waitmovement 0 + return EventScript_167947:: @ 8167947 - applymovement 255, Movement_1A75E7 - waitmovement 0 - return + applymovement 255, Movement_1A75E7 + waitmovement 0 + return EventScript_167952:: @ 8167952 - applymovement 255, Movement_1A75EB - waitmovement 0 - return + applymovement 255, Movement_1A75EB + waitmovement 0 + return EventScript_16795D:: @ 816795D - getplayerxy VAR_0x8004, VAR_0x8005 - compare_var_to_value VAR_0x8004, 9 - goto_if 4, EventScript_167931 - goto EventScript_167952 - end + getplayerxy VAR_0x8004, VAR_0x8005 + compare_var_to_value VAR_0x8004, 9 + goto_if 4, EventScript_167931 + goto EventScript_167952 + end EventScript_167973:: @ 8167973 - getplayerxy VAR_0x8004, VAR_0x8005 - compare_var_to_value VAR_0x8004, 9 - goto_if 4, EventScript_167947 - goto EventScript_167931 - end + getplayerxy VAR_0x8004, VAR_0x8005 + compare_var_to_value VAR_0x8004, 9 + goto_if 4, EventScript_167947 + goto EventScript_167931 + end ThreeIsland_EventScript_167989:: @ 8167989 - lock - compare_var_to_value VAR_0x407B, 4 - goto_if 1, EventScript_1679A1 - setvar VAR_0x4001, 1 - call EventScript_16786F - release - end + lock + compare_var_to_value VAR_0x407B, 4 + goto_if 1, EventScript_1679A1 + setvar VAR_0x4001, 1 + call EventScript_16786F + release + end EventScript_1679A1:: @ 81679A1 - applymovement 2, Movement_1A75E1 - waitmovement 0 - loadword 0, gUnknown_8182823 - callstd 4 - release - end + applymovement 2, Movement_1A75E1 + waitmovement 0 + loadword 0, gUnknown_8182823 + callstd 4 + release + end ThreeIsland_EventScript_1679B5:: @ 81679B5 - lockall - textcolor 0 - applymovement 1, Movement_167A1B - waitmovement 0 - loadword 0, gUnknown_81821F1 - callstd 4 - applymovement 3, Movement_167A19 - waitmovement 0 - loadword 0, gUnknown_818221F - callstd 4 - applymovement 1, Movement_167A1B - waitmovement 0 - loadword 0, gUnknown_8182275 - callstd 4 - applymovement 3, Movement_167A19 - waitmovement 0 - loadword 0, gUnknown_81822FB - callstd 4 - applymovement 1, Movement_167A1B - waitmovement 0 - loadword 0, gUnknown_81823C7 - callstd 4 - setvar VAR_0x407B, 3 - releaseall - end + lockall + textcolor 0 + applymovement 1, Movement_167A1B + waitmovement 0 + loadword 0, gUnknown_81821F1 + callstd 4 + applymovement 3, Movement_167A19 + waitmovement 0 + loadword 0, gUnknown_818221F + callstd 4 + applymovement 1, Movement_167A1B + waitmovement 0 + loadword 0, gUnknown_8182275 + callstd 4 + applymovement 3, Movement_167A19 + waitmovement 0 + loadword 0, gUnknown_81822FB + callstd 4 + applymovement 1, Movement_167A1B + waitmovement 0 + loadword 0, gUnknown_81823C7 + callstd 4 + setvar VAR_0x407B, 3 + releaseall + end Movement_167A19:: @ 8167A19 - step_27 - step_end + step_27 + step_end Movement_167A1B:: @ 8167A1B - step_28 - step_end + step_28 + step_end ThreeIsland_EventScript_167A1D:: @ 8167A1D - lockall - setvar VAR_0x4001, 0 - goto EventScript_167A59 - end + lockall + setvar VAR_0x4001, 0 + goto EventScript_167A59 + end ThreeIsland_EventScript_167A29:: @ 8167A29 - lockall - setvar VAR_0x4001, 1 - goto EventScript_167A59 - end + lockall + setvar VAR_0x4001, 1 + goto EventScript_167A59 + end ThreeIsland_EventScript_167A35:: @ 8167A35 - lockall - setvar VAR_0x4001, 2 - goto EventScript_167A59 - end + lockall + setvar VAR_0x4001, 2 + goto EventScript_167A59 + end ThreeIsland_EventScript_167A41:: @ 8167A41 - lockall - setvar VAR_0x4001, 3 - goto EventScript_167A59 - end + lockall + setvar VAR_0x4001, 3 + goto EventScript_167A59 + end ThreeIsland_EventScript_167A4D:: @ 8167A4D - lockall - setvar VAR_0x4001, 4 - goto EventScript_167A59 - end + lockall + setvar VAR_0x4001, 4 + goto EventScript_167A59 + end EventScript_167A59:: @ 8167A59 - textcolor 0 - applymovement 5, Movement_1A75ED - waitmovement 0 - playse SE_PIN - applymovement 5, Movement_1A75DB - waitmovement 0 - applymovement 5, Movement_1A75DD - waitmovement 0 - applymovement 5, Movement_167C57 - waitmovement 0 - playbgm BGM_FRLG_BOY_EYE, 0 - loadword 0, gUnknown_81823ED - callstd 5 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_167C35 - loadword 0, gUnknown_818247D - callstd 4 - setvar VAR_LAST_TALKED, 5 - trainerbattle 3, 527, 0, Text_1824B7 - applymovement 5, Movement_167C5C - waitmovement 0 - loadword 0, gUnknown_81824CF - callstd 4 - closemessage - applymovement 7, Movement_167C57 - waitmovement 0 - playbgm BGM_FRLG_BOY_EYE, 0 - loadword 0, gUnknown_81824EF - callstd 4 - setvar VAR_LAST_TALKED, 7 - trainerbattle 3, 528, 0, Text_182521 - applymovement 7, Movement_167C5C - waitmovement 0 - loadword 0, gUnknown_8182536 - callstd 4 - closemessage - applymovement 4, Movement_167C57 - waitmovement 0 - playbgm BGM_FRLG_BOY_EYE, 0 - loadword 0, gUnknown_8182582 - callstd 4 - setvar VAR_LAST_TALKED, 4 - trainerbattle 3, 529, 0, Text_1825D4 - applymovement 4, Movement_1A75E7 - waitmovement 0 - applymovement 6, Movement_1A75ED - applymovement 8, Movement_1A75ED - waitmovement 0 - loadword 0, gUnknown_81825E2 - callstd 4 - closemessage - delay 45 - compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_167BC6 - compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_167BD8 - compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_167BEA - compare_var_to_value VAR_0x4001, 3 - call_if 1, EventScript_167C03 - compare_var_to_value VAR_0x4001, 4 - call_if 1, EventScript_167C1C - playbgm BGM_FRLG_BOY_EYE, 0 - loadword 0, gUnknown_8182623 - callstd 4 - setvar VAR_LAST_TALKED, 3 - trainerbattle 3, 742, 0, Text_1826B7 - loadword 0, gUnknown_818271D - callstd 4 - closemessage - fadescreen 1 - removeobject 3 - removeobject 5 - removeobject 7 - removeobject 4 - removeobject 6 - removeobject 8 - removeobject 14 - fadescreen 0 - setvar VAR_0x407B, 4 - releaseall - end + textcolor 0 + applymovement 5, Movement_1A75ED + waitmovement 0 + playse SE_PIN + applymovement 5, Movement_1A75DB + waitmovement 0 + applymovement 5, Movement_1A75DD + waitmovement 0 + applymovement 5, Movement_167C57 + waitmovement 0 + playbgm BGM_FRLG_BOY_EYE, 0 + loadword 0, gUnknown_81823ED + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_167C35 + loadword 0, gUnknown_818247D + callstd 4 + setvar VAR_LAST_TALKED, 5 + trainerbattle 3, 527, 0, Text_1824B7 + applymovement 5, Movement_167C5C + waitmovement 0 + loadword 0, gUnknown_81824CF + callstd 4 + closemessage + applymovement 7, Movement_167C57 + waitmovement 0 + playbgm BGM_FRLG_BOY_EYE, 0 + loadword 0, gUnknown_81824EF + callstd 4 + setvar VAR_LAST_TALKED, 7 + trainerbattle 3, 528, 0, Text_182521 + applymovement 7, Movement_167C5C + waitmovement 0 + loadword 0, gUnknown_8182536 + callstd 4 + closemessage + applymovement 4, Movement_167C57 + waitmovement 0 + playbgm BGM_FRLG_BOY_EYE, 0 + loadword 0, gUnknown_8182582 + callstd 4 + setvar VAR_LAST_TALKED, 4 + trainerbattle 3, 529, 0, Text_1825D4 + applymovement 4, Movement_1A75E7 + waitmovement 0 + applymovement 6, Movement_1A75ED + applymovement 8, Movement_1A75ED + waitmovement 0 + loadword 0, gUnknown_81825E2 + callstd 4 + closemessage + delay 45 + compare_var_to_value VAR_0x4001, 0 + call_if 1, EventScript_167BC6 + compare_var_to_value VAR_0x4001, 1 + call_if 1, EventScript_167BD8 + compare_var_to_value VAR_0x4001, 2 + call_if 1, EventScript_167BEA + compare_var_to_value VAR_0x4001, 3 + call_if 1, EventScript_167C03 + compare_var_to_value VAR_0x4001, 4 + call_if 1, EventScript_167C1C + playbgm BGM_FRLG_BOY_EYE, 0 + loadword 0, gUnknown_8182623 + callstd 4 + setvar VAR_LAST_TALKED, 3 + trainerbattle 3, 742, 0, Text_1826B7 + loadword 0, gUnknown_818271D + callstd 4 + closemessage + fadescreen 1 + removeobject 3 + removeobject 5 + removeobject 7 + removeobject 4 + removeobject 6 + removeobject 8 + removeobject 14 + fadescreen 0 + setvar VAR_0x407B, 4 + releaseall + end EventScript_167BC6:: @ 8167BC6 - applymovement 4, Movement_1A75ED - applymovement 3, Movement_167C5E - waitmovement 0 - return + applymovement 4, Movement_1A75ED + applymovement 3, Movement_167C5E + waitmovement 0 + return EventScript_167BD8:: @ 8167BD8 - applymovement 4, Movement_1A75ED - applymovement 3, Movement_167C62 - waitmovement 0 - return + applymovement 4, Movement_1A75ED + applymovement 3, Movement_167C62 + waitmovement 0 + return EventScript_167BEA:: @ 8167BEA - applymovement 4, Movement_1A75ED - applymovement 3, Movement_167C64 - applymovement 255, Movement_167C68 - waitmovement 0 - return + applymovement 4, Movement_1A75ED + applymovement 3, Movement_167C64 + applymovement 255, Movement_167C68 + waitmovement 0 + return EventScript_167C03:: @ 8167C03 - applymovement 4, Movement_1A75ED - applymovement 255, Movement_167C68 - applymovement 3, Movement_167C6C - waitmovement 0 - return + applymovement 4, Movement_1A75ED + applymovement 255, Movement_167C68 + applymovement 3, Movement_167C6C + waitmovement 0 + return EventScript_167C1C:: @ 8167C1C - applymovement 4, Movement_1A75ED - applymovement 255, Movement_167C68 - applymovement 3, Movement_167C71 - waitmovement 0 - return + applymovement 4, Movement_1A75ED + applymovement 255, Movement_167C68 + applymovement 3, Movement_167C71 + waitmovement 0 + return EventScript_167C35:: @ 8167C35 - loadword 0, gUnknown_8182453 - callstd 4 - closemessage - applymovement 255, Movement_167C55 - waitmovement 0 - applymovement 5, Movement_167C59 - waitmovement 0 - fadedefaultbgm - releaseall - end + loadword 0, gUnknown_8182453 + callstd 4 + closemessage + applymovement 255, Movement_167C55 + waitmovement 0 + applymovement 5, Movement_167C59 + waitmovement 0 + fadedefaultbgm + releaseall + end Movement_167C55:: @ 8167C55 - step_10 - step_end + step_10 + step_end Movement_167C57:: @ 8167C57 - step_10 - step_end + step_10 + step_end Movement_167C59:: @ 8167C59 - step_11 - step_2f - step_end + step_11 + step_2f + step_end Movement_167C5C:: @ 8167C5C - step_25 - step_end + step_25 + step_end Movement_167C5E:: @ 8167C5E - step_10 - step_12 - step_2d - step_end + step_10 + step_12 + step_2d + step_end Movement_167C62:: @ 8167C62 - step_10 - step_end + step_10 + step_end Movement_167C64:: @ 8167C64 - step_10 - step_10 - step_30 - step_end + step_10 + step_10 + step_30 + step_end Movement_167C68:: @ 8167C68 - step_1c - step_1c - step_2f - step_end + step_1c + step_1c + step_2f + step_end Movement_167C6C:: @ 8167C6C - step_10 - step_10 - step_13 - step_30 - step_end + step_10 + step_10 + step_13 + step_30 + step_end Movement_167C71:: @ 8167C71 - step_10 - step_10 - step_13 - step_13 - step_30 - step_end + step_10 + step_10 + step_13 + step_13 + step_30 + step_end ThreeIsland_EventScript_167C77:: @ 8167C77 - loadword 0, gUnknown_81828EB - callstd 2 - end + loadword 0, gUnknown_81828EB + callstd 2 + end ThreeIsland_EventScript_167C80:: @ 8167C80 - loadword 0, gUnknown_818298A - callstd 2 - end + loadword 0, gUnknown_818298A + callstd 2 + end ThreeIsland_EventScript_167C89:: @ 8167C89 - lock - faceplayer - waitse - playmoncry SPECIES_DODUO, 0 - loadword 0, gUnknown_81829F4 - callstd 4 - waitmoncry - release - end + lock + faceplayer + waitse + playmoncry SPECIES_DODUO, 0 + loadword 0, gUnknown_81829F4 + callstd 4 + waitmoncry + release + end ThreeIsland_EventScript_167C9C:: @ 8167C9C - loadword 0, gUnknown_8182061 - callstd 3 - end + loadword 0, gUnknown_8182061 + callstd 3 + end ThreeIsland_EventScript_167CA5:: @ 8167CA5 - loadword 0, gUnknown_818208B - callstd 2 - end + loadword 0, gUnknown_818208B + callstd 2 + end diff --git a/data/maps/ThreeIsland_BerryForest/scripts.inc b/data/maps/ThreeIsland_BerryForest/scripts.inc index 42446a6d7..bb6795580 100644 --- a/data/maps/ThreeIsland_BerryForest/scripts.inc +++ b/data/maps/ThreeIsland_BerryForest/scripts.inc @@ -1,74 +1,74 @@ ThreeIsland_BerryForest_MapScripts:: @ 8163C71 - map_script 3, ThreeIsland_BerryForest_MapScript1_163C77 - .byte 0 + map_script 3, ThreeIsland_BerryForest_MapScript1_163C77 + .byte 0 ThreeIsland_BerryForest_MapScript1_163C77:: @ 8163C77 - setworldmapflag 2231 - setescapewarp MAP_THREE_ISLAND_BOND_BRIDGE, 255, 12, 6 - end + setworldmapflag 2231 + setescapewarp MAP_THREE_ISLAND_BOND_BRIDGE, 255, 12, 6 + end ThreeIsland_BerryForest_EventScript_163C83:: @ 8163C83 - lock - faceplayer - loadword 0, gUnknown_817ADD6 - callstd 4 - playse SE_PIN - applymovement 1, Movement_1A75DB - waitmovement 0 - applymovement 1, Movement_163D22 - waitmovement 0 - loadword 0, gUnknown_817AE8E - callstd 4 - special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 - waitse - playmoncry SPECIES_HYPNO, 2 - waitmoncry - setwildbattle SPECIES_HYPNO, 30, ITEM_NONE - dowildbattle - special sub_8112364 - applymovement 1, Movement_1A75E1 - waitmovement 0 - loadword 0, gUnknown_817AEE1 - callstd 4 - setorcopyvar VAR_0x8000, 147 - setorcopyvar VAR_0x8001, 1 - callstd 0 - compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_163D19 - special sub_80CA6DC - loadword 0, gUnknown_817AF3B - callstd 4 - closemessage - setflag FLAG_0x2A3 - setflag FLAG_0x07A - setvar VAR_0x4079, 2 - clearflag FLAG_0x075 - warp MAP_TWO_ISLAND_JOYFUL_GAME_CORNER, 255, 6, 6 - waitstate - release - end + lock + faceplayer + loadword 0, gUnknown_817ADD6 + callstd 4 + playse SE_PIN + applymovement 1, Movement_1A75DB + waitmovement 0 + applymovement 1, Movement_163D22 + waitmovement 0 + loadword 0, gUnknown_817AE8E + callstd 4 + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + waitse + playmoncry SPECIES_HYPNO, 2 + waitmoncry + setwildbattle SPECIES_HYPNO, 30, ITEM_NONE + dowildbattle + special sub_8112364 + applymovement 1, Movement_1A75E1 + waitmovement 0 + loadword 0, gUnknown_817AEE1 + callstd 4 + setorcopyvar VAR_0x8000, 147 + setorcopyvar VAR_0x8001, 1 + callstd 0 + compare_var_to_value VAR_RESULT, 0 + call_if 1, EventScript_163D19 + special sub_80CA6DC + loadword 0, gUnknown_817AF3B + callstd 4 + closemessage + setflag FLAG_0x2A3 + setflag FLAG_0x07A + setvar VAR_0x4079, 2 + clearflag FLAG_0x075 + warp MAP_TWO_ISLAND_JOYFUL_GAME_CORNER, 255, 6, 6 + waitstate + release + end EventScript_163D19:: @ 8163D19 - loadword 0, gUnknown_817AF9F - callstd 4 - return + loadword 0, gUnknown_817AF9F + callstd 4 + return Movement_163D22:: @ 8163D22 - step_2f - step_1c - step_30 - step_1b - step_2f - step_end + step_2f + step_1c + step_30 + step_1b + step_2f + step_end ThreeIsland_BerryForest_EventScript_163D28:: @ 8163D28 - loadword 0, gUnknown_817AFD6 - callstd 3 - end + loadword 0, gUnknown_817AFD6 + callstd 3 + end ThreeIsland_BerryForest_EventScript_163D31:: @ 8163D31 - loadword 0, gUnknown_817B029 - callstd 3 - end + loadword 0, gUnknown_817B029 + callstd 3 + end diff --git a/data/maps/ThreeIsland_BondBridge/scripts.inc b/data/maps/ThreeIsland_BondBridge/scripts.inc index 567cbfcb8..4988c3d34 100644 --- a/data/maps/ThreeIsland_BondBridge/scripts.inc +++ b/data/maps/ThreeIsland_BondBridge/scripts.inc @@ -1,12 +1,12 @@ ThreeIsland_BondBridge_MapScripts:: @ 8168776 - .byte 0 + .byte 0 ThreeIsland_BondBridge_EventScript_168777:: @ 8168777 - loadword 0, gUnknown_818A210 - callstd 3 - end + loadword 0, gUnknown_818A210 + callstd 3 + end ThreeIsland_BondBridge_EventScript_168780:: @ 8168780 - loadword 0, gUnknown_818A223 - callstd 3 - end + loadword 0, gUnknown_818A223 + callstd 3 + end diff --git a/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc b/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc index dcc142a8d..053ff6433 100644 --- a/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc +++ b/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc @@ -1,62 +1,62 @@ ThreeIsland_DunsparceTunnel_MapScripts:: @ 8164D26 - map_script 3, ThreeIsland_DunsparceTunnel_MapScript1_164D2C - .byte 0 + map_script 3, ThreeIsland_DunsparceTunnel_MapScript1_164D2C + .byte 0 ThreeIsland_DunsparceTunnel_MapScript1_164D2C:: @ 8164D2C - setworldmapflag 2240 - specialvar VAR_RESULT, sub_806E25C - copyvar VAR_0x8008, VAR_RESULT - compare_var_to_value VAR_0x8008, 1 - call_if 1, EventScript_164D50 - compare_var_to_value VAR_0x8008, 0 - call_if 1, EventScript_164D54 - end + setworldmapflag 2240 + specialvar VAR_RESULT, sub_806E25C + copyvar VAR_0x8008, VAR_RESULT + compare_var_to_value VAR_0x8008, 1 + call_if 1, EventScript_164D50 + compare_var_to_value VAR_0x8008, 0 + call_if 1, EventScript_164D54 + end EventScript_164D50:: @ 8164D50 - setmaplayoutindex LAYOUT_UNUSED_LAYOUT_83453C0 - return + setmaplayoutindex LAYOUT_UNUSED_LAYOUT_83453C0 + return EventScript_164D54:: @ 8164D54 - setobjectxyperm 1, 6, 3 - setobjectmovementtype 1, 10 - return + setobjectxyperm 1, 6, 3 + setobjectmovementtype 1, 10 + return ThreeIsland_DunsparceTunnel_EventScript_164D60:: @ 8164D60 - lock - faceplayer - checkflag FLAG_0x2E2 - goto_if 1, EventScript_164DC2 - specialvar VAR_RESULT, sub_806E25C - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_164D90 - loadword 0, gUnknown_817D13B - callstd 4 - closemessage - applymovement 1, Movement_1A75E5 - waitmovement 0 - release - end + lock + faceplayer + checkflag FLAG_0x2E2 + goto_if 1, EventScript_164DC2 + specialvar VAR_RESULT, sub_806E25C + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_164D90 + loadword 0, gUnknown_817D13B + callstd 4 + closemessage + applymovement 1, Movement_1A75E5 + waitmovement 0 + release + end EventScript_164D90:: @ 8164D90 - loadword 0, gUnknown_817D1C9 - callstd 4 - setorcopyvar VAR_0x8000, 110 - setorcopyvar VAR_0x8001, 1 - callstd 0 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_164DB8 - setflag FLAG_0x2E2 - goto EventScript_164DC2 - end + loadword 0, gUnknown_817D1C9 + callstd 4 + setorcopyvar VAR_0x8000, 110 + setorcopyvar VAR_0x8001, 1 + callstd 0 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_164DB8 + setflag FLAG_0x2E2 + goto EventScript_164DC2 + end EventScript_164DB8:: @ 8164DB8 - loadword 0, gUnknown_817D2DC - callstd 4 - release - end + loadword 0, gUnknown_817D2DC + callstd 4 + release + end EventScript_164DC2:: @ 8164DC2 - loadword 0, gUnknown_817D28C - callstd 4 - release - end + loadword 0, gUnknown_817D28C + callstd 4 + release + end diff --git a/data/maps/ThreeIsland_Harbor/scripts.inc b/data/maps/ThreeIsland_Harbor/scripts.inc index da8f083b2..3678385c0 100644 --- a/data/maps/ThreeIsland_Harbor/scripts.inc +++ b/data/maps/ThreeIsland_Harbor/scripts.inc @@ -1,11 +1,11 @@ ThreeIsland_Harbor_MapScripts:: @ 8171EA9 - .byte 0 + .byte 0 ThreeIsland_Harbor_EventScript_171EAA:: @ 8171EAA - lock - faceplayer - message Text_181726 - waitmessage - setvar VAR_0x8004, 3 - goto EventScript_1A900F - end + lock + faceplayer + message Text_181726 + waitmessage + setvar VAR_0x8004, 3 + goto EventScript_1A900F + end diff --git a/data/maps/ThreeIsland_House1/scripts.inc b/data/maps/ThreeIsland_House1/scripts.inc index 62eb26709..bdcc5d6fc 100644 --- a/data/maps/ThreeIsland_House1/scripts.inc +++ b/data/maps/ThreeIsland_House1/scripts.inc @@ -1,16 +1,16 @@ ThreeIsland_House1_MapScripts:: @ 8171819 - .byte 0 + .byte 0 ThreeIsland_House1_EventScript_17181A:: @ 817181A - lock - faceplayer - special sub_80CA6DC - loadword 0, gUnknown_81A2F3E - callstd 4 - release - end + lock + faceplayer + special sub_80CA6DC + loadword 0, gUnknown_81A2F3E + callstd 4 + release + end ThreeIsland_House1_EventScript_171829:: @ 8171829 - loadword 0, gUnknown_81A2F92 - callstd 3 - end + loadword 0, gUnknown_81A2F92 + callstd 3 + end diff --git a/data/maps/ThreeIsland_House2/scripts.inc b/data/maps/ThreeIsland_House2/scripts.inc index 21e85b131..449f6056b 100644 --- a/data/maps/ThreeIsland_House2/scripts.inc +++ b/data/maps/ThreeIsland_House2/scripts.inc @@ -1,18 +1,18 @@ ThreeIsland_House2_MapScripts:: @ 81718DF - .byte 0 + .byte 0 ThreeIsland_House2_EventScript_1718E0:: @ 81718E0 - lock - faceplayer - setvar VAR_0x8004, 7 - setvar VAR_0x8005, 1 - special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_81A32CA - callstd 4 - release - end + lock + faceplayer + setvar VAR_0x8004, 7 + setvar VAR_0x8005, 1 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_81A32CA + callstd 4 + release + end ThreeIsland_House2_EventScript_1718F9:: @ 81718F9 - loadword 0, gUnknown_81A3245 - callstd 2 - end + loadword 0, gUnknown_81A3245 + callstd 2 + end diff --git a/data/maps/ThreeIsland_House3/scripts.inc b/data/maps/ThreeIsland_House3/scripts.inc index 370290b0d..5ba4483c3 100644 --- a/data/maps/ThreeIsland_House3/scripts.inc +++ b/data/maps/ThreeIsland_House3/scripts.inc @@ -1,7 +1,7 @@ ThreeIsland_House3_MapScripts:: @ 8171902 - .byte 0 + .byte 0 ThreeIsland_House3_EventScript_171903:: @ 8171903 - loadword 0, gUnknown_81A3379 - callstd 2 - end + loadword 0, gUnknown_81A3379 + callstd 2 + end diff --git a/data/maps/ThreeIsland_House4/scripts.inc b/data/maps/ThreeIsland_House4/scripts.inc index 27ec90e70..8a8abe57a 100644 --- a/data/maps/ThreeIsland_House4/scripts.inc +++ b/data/maps/ThreeIsland_House4/scripts.inc @@ -1,12 +1,12 @@ ThreeIsland_House4_MapScripts:: @ 817190C - .byte 0 + .byte 0 ThreeIsland_House4_EventScript_17190D:: @ 817190D - loadword 0, gUnknown_81A33DB - callstd 2 - end + loadword 0, gUnknown_81A33DB + callstd 2 + end ThreeIsland_House4_EventScript_171916:: @ 8171916 - loadword 0, gUnknown_81A342F - callstd 2 - end + loadword 0, gUnknown_81A342F + callstd 2 + end diff --git a/data/maps/ThreeIsland_House5/scripts.inc b/data/maps/ThreeIsland_House5/scripts.inc index 9559b9a23..e1d7dd473 100644 --- a/data/maps/ThreeIsland_House5/scripts.inc +++ b/data/maps/ThreeIsland_House5/scripts.inc @@ -1,18 +1,18 @@ ThreeIsland_House5_MapScripts:: @ 817191F - .byte 0 + .byte 0 ThreeIsland_House5_EventScript_171920:: @ 8171920 - lock - faceplayer - checkflag FLAG_0x2A3 - goto_if 1, EventScript_171935 - loadword 0, gUnknown_81A3469 - callstd 4 - release - end + lock + faceplayer + checkflag FLAG_0x2A3 + goto_if 1, EventScript_171935 + loadword 0, gUnknown_81A3469 + callstd 4 + release + end EventScript_171935:: @ 8171935 - loadword 0, gUnknown_81A34DB - callstd 4 - release - end + loadword 0, gUnknown_81A34DB + callstd 4 + release + end diff --git a/data/maps/ThreeIsland_Mart/scripts.inc b/data/maps/ThreeIsland_Mart/scripts.inc index 4060673a9..5ce07d975 100644 --- a/data/maps/ThreeIsland_Mart/scripts.inc +++ b/data/maps/ThreeIsland_Mart/scripts.inc @@ -1,43 +1,43 @@ ThreeIsland_Mart_MapScripts:: @ 817188C - .byte 0 + .byte 0 ThreeIsland_Mart_EventScript_17188D:: @ 817188D - special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 - lock - faceplayer - message Text_1A6211 - waitmessage - pokemart Items_1718B4 - loadword 0, gUnknown_81A5190 - callstd 4 - release - end + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + lock + faceplayer + message Text_1A6211 + waitmessage + pokemart Items_1718B4 + loadword 0, gUnknown_81A5190 + callstd 4 + release + end - .align 2 + .align 2 Items_1718B4:: @ 81718B4 - .2byte ITEM_ULTRA_BALL - .2byte ITEM_HYPER_POTION - .2byte ITEM_REVIVE - .2byte ITEM_FULL_HEAL - .2byte ITEM_ESCAPE_ROPE - .2byte ITEM_MAX_REPEL - .2byte ITEM_NONE - release - end + .2byte ITEM_ULTRA_BALL + .2byte ITEM_HYPER_POTION + .2byte ITEM_REVIVE + .2byte ITEM_FULL_HEAL + .2byte ITEM_ESCAPE_ROPE + .2byte ITEM_MAX_REPEL + .2byte ITEM_NONE + release + end ThreeIsland_Mart_EventScript_1718C4:: @ 81718C4 - loadword 0, gUnknown_81A3114 - callstd 2 - end + loadword 0, gUnknown_81A3114 + callstd 2 + end ThreeIsland_Mart_EventScript_1718CD:: @ 81718CD - loadword 0, gUnknown_81A315C - callstd 2 - end + loadword 0, gUnknown_81A315C + callstd 2 + end ThreeIsland_Mart_EventScript_1718D6:: @ 81718D6 - loadword 0, gUnknown_81A31F0 - callstd 2 - end + loadword 0, gUnknown_81A31F0 + callstd 2 + end diff --git a/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc b/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc index 711e63498..d2002af7c 100644 --- a/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc @@ -1,30 +1,30 @@ ThreeIsland_PokemonCenter_1F_MapScripts:: @ 8171832 - map_script 3, ThreeIsland_PokemonCenter_1F_MapScript1_17183D - map_script 5, ThreeIsland_PokemonCenter_1F_MapScript2_1BC05C - .byte 0 + map_script 3, ThreeIsland_PokemonCenter_1F_MapScript1_17183D + map_script 5, ThreeIsland_PokemonCenter_1F_MapScript2_1BC05C + .byte 0 ThreeIsland_PokemonCenter_1F_MapScript1_17183D:: @ 817183D - setrespawn 16 - end + setrespawn 16 + end ThreeIsland_PokemonCenter_1F_EventScript_171841:: @ 8171841 - lock - faceplayer - call EventScript_1A6578 - release - end + lock + faceplayer + call EventScript_1A6578 + release + end ThreeIsland_PokemonCenter_1F_EventScript_17184A:: @ 817184A - loadword 0, gUnknown_81A303B - callstd 2 - end + loadword 0, gUnknown_81A303B + callstd 2 + end ThreeIsland_PokemonCenter_1F_EventScript_171853:: @ 8171853 - loadword 0, gUnknown_81A30A3 - callstd 2 - end + loadword 0, gUnknown_81A30A3 + callstd 2 + end ThreeIsland_PokemonCenter_1F_EventScript_17185C:: @ 817185C - loadword 0, gUnknown_81A2FB5 - callstd 2 - end + loadword 0, gUnknown_81A2FB5 + callstd 2 + end diff --git a/data/maps/ThreeIsland_PokemonCenter_2F/scripts.inc b/data/maps/ThreeIsland_PokemonCenter_2F/scripts.inc index a87ceda5a..dfb7db871 100644 --- a/data/maps/ThreeIsland_PokemonCenter_2F/scripts.inc +++ b/data/maps/ThreeIsland_PokemonCenter_2F/scripts.inc @@ -1,18 +1,18 @@ ThreeIsland_PokemonCenter_2F_MapScripts:: @ 8171865 - map_script 2, ThreeIsland_PokemonCenter_2F_MapScript1_1BB2A3 - map_script 4, ThreeIsland_PokemonCenter_2F_MapScript2_1BB1ED - map_script 1, ThreeIsland_PokemonCenter_2F_MapScript3_1BB237 - map_script 3, ThreeIsland_PokemonCenter_2F_MapScript4_1BB1B4 - .byte 0 + map_script 2, ThreeIsland_PokemonCenter_2F_MapScript1_1BB2A3 + map_script 4, ThreeIsland_PokemonCenter_2F_MapScript2_1BB1ED + map_script 1, ThreeIsland_PokemonCenter_2F_MapScript3_1BB237 + map_script 3, ThreeIsland_PokemonCenter_2F_MapScript4_1BB1B4 + .byte 0 ThreeIsland_PokemonCenter_2F_EventScript_17187A:: @ 817187A - call EventScript_1BB4A3 - end + call EventScript_1BB4A3 + end EventScript_171880:: @ 8171880 - call EventScript_1BB6AB - end + call EventScript_1BB6AB + end EventScript_171886:: @ 8171886 - call EventScript_1BB7DE - end + call EventScript_1BB7DE + end diff --git a/data/maps/ThreeIsland_Port/scripts.inc b/data/maps/ThreeIsland_Port/scripts.inc index 876acaaac..8ea267722 100644 --- a/data/maps/ThreeIsland_Port/scripts.inc +++ b/data/maps/ThreeIsland_Port/scripts.inc @@ -1,44 +1,44 @@ ThreeIsland_Port_MapScripts:: @ 8168789 - map_script 3, ThreeIsland_Port_MapScript1_16878F - .byte 0 + map_script 3, ThreeIsland_Port_MapScript1_16878F + .byte 0 ThreeIsland_Port_MapScript1_16878F:: @ 816878F - clearflag 2113 - setflag FLAG_0x2A1 - end + clearflag 2113 + setflag FLAG_0x2A1 + end ThreeIsland_Port_EventScript_168796:: @ 8168796 - lock - faceplayer - compare_var_to_value VAR_0x4079, 2 - goto_if 4, EventScript_1687B8 - compare_var_to_value VAR_0x407B, 4 - goto_if 4, EventScript_1687C2 - loadword 0, gUnknown_818A307 - callstd 4 - release - end + lock + faceplayer + compare_var_to_value VAR_0x4079, 2 + goto_if 4, EventScript_1687B8 + compare_var_to_value VAR_0x407B, 4 + goto_if 4, EventScript_1687C2 + loadword 0, gUnknown_818A307 + callstd 4 + release + end EventScript_1687B8:: @ 81687B8 - loadword 0, gUnknown_818A38B - callstd 4 - release - end + loadword 0, gUnknown_818A38B + callstd 4 + release + end EventScript_1687C2:: @ 81687C2 - loadword 0, gUnknown_818A339 - callstd 4 - release - end + loadword 0, gUnknown_818A339 + callstd 4 + release + end ThreeIsland_Port_EventScript_1687CC:: @ 81687CC - loadword 0, gUnknown_818A261 - callstd 2 - end + loadword 0, gUnknown_818A261 + callstd 2 + end ThreeIsland_Port_EventScript_1687D5:: @ 81687D5 - lock - loadword 0, gUnknown_818A2D8 - callstd 4 - release - end + lock + loadword 0, gUnknown_818A2D8 + callstd 4 + release + end diff --git a/data/maps/TwoIsland/scripts.inc b/data/maps/TwoIsland/scripts.inc index 3cec3aad1..06ded8984 100644 --- a/data/maps/TwoIsland/scripts.inc +++ b/data/maps/TwoIsland/scripts.inc @@ -1,254 +1,254 @@ TwoIsland_MapScripts:: @ 8167564 - map_script 3, TwoIsland_MapScript1_16756A - .byte 0 + map_script 3, TwoIsland_MapScript1_16756A + .byte 0 TwoIsland_MapScript1_16756A:: @ 816756A - setworldmapflag 2204 - setflag FLAG_0x2A2 - call EventScript_167576 - end + setworldmapflag 2204 + setflag FLAG_0x2A2 + call EventScript_167576 + end EventScript_167576:: @ 8167576 - checkflag 2116 - goto_if 1, EventScript_167597 - checkflag 2092 - goto_if 1, EventScript_1675B8 - checkflag FLAG_0x2A3 - goto_if 1, EventScript_1675D9 - goto EventScript_1675E8 - end + checkflag 2116 + goto_if 1, EventScript_167597 + checkflag 2092 + goto_if 1, EventScript_1675B8 + checkflag FLAG_0x2A3 + goto_if 1, EventScript_1675D9 + goto EventScript_1675E8 + end EventScript_167597:: @ 8167597 - checkflag FLAG_0x29D - goto_if 0, EventScript_1675EE - checkflag FLAG_0x29E - goto_if 0, EventScript_1675F4 - checkflag FLAG_0x29F - goto_if 0, EventScript_1675FD - goto EventScript_167606 - end + checkflag FLAG_0x29D + goto_if 0, EventScript_1675EE + checkflag FLAG_0x29E + goto_if 0, EventScript_1675F4 + checkflag FLAG_0x29F + goto_if 0, EventScript_1675FD + goto EventScript_167606 + end EventScript_1675B8:: @ 81675B8 - checkflag FLAG_0x29D - goto_if 0, EventScript_1675EE - checkflag FLAG_0x2A3 - goto_if 0, EventScript_1675EE - checkflag FLAG_0x29E - goto_if 0, EventScript_1675F4 - goto EventScript_1675FD - end + checkflag FLAG_0x29D + goto_if 0, EventScript_1675EE + checkflag FLAG_0x2A3 + goto_if 0, EventScript_1675EE + checkflag FLAG_0x29E + goto_if 0, EventScript_1675F4 + goto EventScript_1675FD + end EventScript_1675D9:: @ 81675D9 - checkflag FLAG_0x29D - goto_if 0, EventScript_1675EE - goto EventScript_1675F4 - end + checkflag FLAG_0x29D + goto_if 0, EventScript_1675EE + goto EventScript_1675F4 + end EventScript_1675E8:: @ 81675E8 - goto EventScript_1675EE - end + goto EventScript_1675EE + end EventScript_1675EE:: @ 81675EE - setvar VAR_0x4078, 1 - return + setvar VAR_0x4078, 1 + return EventScript_1675F4:: @ 81675F4 - setvar VAR_0x4078, 2 - clearflag FLAG_0x07B - return + setvar VAR_0x4078, 2 + clearflag FLAG_0x07B + return EventScript_1675FD:: @ 81675FD - setvar VAR_0x4078, 3 - clearflag FLAG_0x07C - return + setvar VAR_0x4078, 3 + clearflag FLAG_0x07C + return EventScript_167606:: @ 8167606 - setvar VAR_0x4078, 4 - clearflag FLAG_0x07D - return + setvar VAR_0x4078, 4 + clearflag FLAG_0x07D + return TwoIsland_EventScript_16760F:: @ 816760F - special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 - lock - faceplayer - compare_var_to_value VAR_0x4078, 4 - goto_if 1, EventScript_167646 - compare_var_to_value VAR_0x4078, 3 - goto_if 1, EventScript_16765E - compare_var_to_value VAR_0x4078, 2 - goto_if 1, EventScript_167676 - goto EventScript_16768E - end + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + lock + faceplayer + compare_var_to_value VAR_0x4078, 4 + goto_if 1, EventScript_167646 + compare_var_to_value VAR_0x4078, 3 + goto_if 1, EventScript_16765E + compare_var_to_value VAR_0x4078, 2 + goto_if 1, EventScript_167676 + goto EventScript_16768E + end EventScript_167646:: @ 8167646 - checkflag FLAG_0x2A0 - goto_if 1, EventScript_1676A6 - setflag FLAG_0x2A0 - message Text_181CAE - waitmessage - goto EventScript_167728 - end + checkflag FLAG_0x2A0 + goto_if 1, EventScript_1676A6 + setflag FLAG_0x2A0 + message Text_181CAE + waitmessage + goto EventScript_167728 + end EventScript_16765E:: @ 816765E - checkflag FLAG_0x29F - goto_if 1, EventScript_1676A6 - setflag FLAG_0x29F - message Text_181C77 - waitmessage - goto EventScript_167708 - end + checkflag FLAG_0x29F + goto_if 1, EventScript_1676A6 + setflag FLAG_0x29F + message Text_181C77 + waitmessage + goto EventScript_167708 + end EventScript_167676:: @ 8167676 - checkflag FLAG_0x29E - goto_if 1, EventScript_1676A6 - setflag FLAG_0x29E - message Text_181B7C - waitmessage - goto EventScript_1676EC - end + checkflag FLAG_0x29E + goto_if 1, EventScript_1676A6 + setflag FLAG_0x29E + message Text_181B7C + waitmessage + goto EventScript_1676EC + end EventScript_16768E:: @ 816768E - checkflag FLAG_0x29D - goto_if 1, EventScript_1676A6 - setflag FLAG_0x29D - message Text_181AFE - waitmessage - goto EventScript_1676D3 - end + checkflag FLAG_0x29D + goto_if 1, EventScript_1676A6 + setflag FLAG_0x29D + message Text_181AFE + waitmessage + goto EventScript_1676D3 + end EventScript_1676A6:: @ 81676A6 - message Text_1A6211 - waitmessage - compare_var_to_value VAR_0x4078, 4 - goto_if 1, EventScript_167728 - compare_var_to_value VAR_0x4078, 3 - goto_if 1, EventScript_167708 - compare_var_to_value VAR_0x4078, 2 - goto_if 1, EventScript_1676EC - goto EventScript_1676D3 - end + message Text_1A6211 + waitmessage + compare_var_to_value VAR_0x4078, 4 + goto_if 1, EventScript_167728 + compare_var_to_value VAR_0x4078, 3 + goto_if 1, EventScript_167708 + compare_var_to_value VAR_0x4078, 2 + goto_if 1, EventScript_1676EC + goto EventScript_1676D3 + end EventScript_1676D3:: @ 81676D3 - pokemart Items_1676E4 - loadword 0, gUnknown_81A5190 - callstd 4 - release - end + pokemart Items_1676E4 + loadword 0, gUnknown_81A5190 + callstd 4 + release + end - .align 2 + .align 2 Items_1676E4:: @ 81676E4 - .2byte ITEM_GREAT_BALL - .2byte ITEM_FRESH_WATER - .2byte ITEM_NONE - release - end + .2byte ITEM_GREAT_BALL + .2byte ITEM_FRESH_WATER + .2byte ITEM_NONE + release + end EventScript_1676EC:: @ 81676EC - pokemart Items_1676FC - loadword 0, gUnknown_81A5190 - callstd 4 - release - end + pokemart Items_1676FC + loadword 0, gUnknown_81A5190 + callstd 4 + release + end - .align 2 + .align 2 Items_1676FC:: @ 81676FC - .2byte ITEM_ULTRA_BALL - .2byte ITEM_GREAT_BALL - .2byte ITEM_SODA_POP - .2byte ITEM_FRESH_WATER - .2byte ITEM_NONE - release - end + .2byte ITEM_ULTRA_BALL + .2byte ITEM_GREAT_BALL + .2byte ITEM_SODA_POP + .2byte ITEM_FRESH_WATER + .2byte ITEM_NONE + release + end EventScript_167708:: @ 8167708 - pokemart Items_167718 - loadword 0, gUnknown_81A5190 - callstd 4 - release - end + pokemart Items_167718 + loadword 0, gUnknown_81A5190 + callstd 4 + release + end - .align 2 + .align 2 Items_167718:: @ 8167718 - .2byte ITEM_ULTRA_BALL - .2byte ITEM_GREAT_BALL - .2byte ITEM_LEMONADE - .2byte ITEM_SODA_POP - .2byte ITEM_FRESH_WATER - .2byte ITEM_MOOMOO_MILK - .2byte ITEM_NONE - release - end + .2byte ITEM_ULTRA_BALL + .2byte ITEM_GREAT_BALL + .2byte ITEM_LEMONADE + .2byte ITEM_SODA_POP + .2byte ITEM_FRESH_WATER + .2byte ITEM_MOOMOO_MILK + .2byte ITEM_NONE + release + end EventScript_167728:: @ 8167728 - pokemart Items_167738 - loadword 0, gUnknown_81A5190 - callstd 4 - release - end + pokemart Items_167738 + loadword 0, gUnknown_81A5190 + callstd 4 + release + end - .align 2 + .align 2 Items_167738:: @ 8167738 - .2byte ITEM_ULTRA_BALL - .2byte ITEM_REPEAT_BALL - .2byte ITEM_TIMER_BALL - .2byte ITEM_LEMONADE - .2byte ITEM_SODA_POP - .2byte ITEM_FRESH_WATER - .2byte ITEM_MOOMOO_MILK - .2byte ITEM_LAVA_COOKIE - .2byte ITEM_NONE - release - end + .2byte ITEM_ULTRA_BALL + .2byte ITEM_REPEAT_BALL + .2byte ITEM_TIMER_BALL + .2byte ITEM_LEMONADE + .2byte ITEM_SODA_POP + .2byte ITEM_FRESH_WATER + .2byte ITEM_MOOMOO_MILK + .2byte ITEM_LAVA_COOKIE + .2byte ITEM_NONE + release + end TwoIsland_EventScript_16774C:: @ 816774C - loadword 0, gUnknown_8181D2F - callstd 2 - end + loadword 0, gUnknown_8181D2F + callstd 2 + end TwoIsland_EventScript_167755:: @ 8167755 - loadword 0, gUnknown_8181DCA - callstd 2 - end + loadword 0, gUnknown_8181DCA + callstd 2 + end TwoIsland_EventScript_16775E:: @ 816775E - lock - faceplayer - setvar VAR_0x8004, 10 - setvar VAR_0x8005, 4 - special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_8181E47 - callstd 4 - release - end + lock + faceplayer + setvar VAR_0x8004, 10 + setvar VAR_0x8005, 4 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_8181E47 + callstd 4 + release + end TwoIsland_EventScript_167777:: @ 8167777 - loadword 0, gUnknown_8181F28 - callstd 2 - end + loadword 0, gUnknown_8181F28 + callstd 2 + end TwoIsland_EventScript_167780:: @ 8167780 - loadword 0, gUnknown_8181F5D - callstd 2 - end + loadword 0, gUnknown_8181F5D + callstd 2 + end TwoIsland_EventScript_167789:: @ 8167789 - loadword 0, gUnknown_8181FCE - callstd 2 - end + loadword 0, gUnknown_8181FCE + callstd 2 + end TwoIsland_EventScript_167792:: @ 8167792 - loadword 0, gUnknown_8181A88 - callstd 3 - end + loadword 0, gUnknown_8181A88 + callstd 3 + end TwoIsland_EventScript_16779B:: @ 816779B - loadword 0, gUnknown_8181AA7 - callstd 3 - end + loadword 0, gUnknown_8181AA7 + callstd 3 + end TwoIsland_EventScript_1677A4:: @ 81677A4 - loadword 0, gUnknown_8181AC8 - callstd 3 - end + loadword 0, gUnknown_8181AC8 + callstd 3 + end diff --git a/data/maps/TwoIsland_CapeBrink/scripts.inc b/data/maps/TwoIsland_CapeBrink/scripts.inc index f3bfb9df1..243c440da 100644 --- a/data/maps/TwoIsland_CapeBrink/scripts.inc +++ b/data/maps/TwoIsland_CapeBrink/scripts.inc @@ -1,2 +1,2 @@ TwoIsland_CapeBrink_MapScripts:: @ 8168775 - .byte 0 + .byte 0 diff --git a/data/maps/TwoIsland_CapeBrink_House/scripts.inc b/data/maps/TwoIsland_CapeBrink_House/scripts.inc index 77b08f93d..efba30945 100644 --- a/data/maps/TwoIsland_CapeBrink_House/scripts.inc +++ b/data/maps/TwoIsland_CapeBrink_House/scripts.inc @@ -1,2 +1,2 @@ TwoIsland_CapeBrink_House_MapScripts:: @ 817206B - .byte 0 + .byte 0 diff --git a/data/maps/TwoIsland_Harbor/scripts.inc b/data/maps/TwoIsland_Harbor/scripts.inc index 0fdd3694d..0fd4e9789 100644 --- a/data/maps/TwoIsland_Harbor/scripts.inc +++ b/data/maps/TwoIsland_Harbor/scripts.inc @@ -1,11 +1,11 @@ TwoIsland_Harbor_MapScripts:: @ 8171805 - .byte 0 + .byte 0 TwoIsland_Harbor_EventScript_171806:: @ 8171806 - lock - faceplayer - message Text_181726 - waitmessage - setvar VAR_0x8004, 2 - goto EventScript_1A8F54 - end + lock + faceplayer + message Text_181726 + waitmessage + setvar VAR_0x8004, 2 + goto EventScript_1A8F54 + end diff --git a/data/maps/TwoIsland_House/scripts.inc b/data/maps/TwoIsland_House/scripts.inc index 907c02348..9fc9b96c8 100644 --- a/data/maps/TwoIsland_House/scripts.inc +++ b/data/maps/TwoIsland_House/scripts.inc @@ -1,143 +1,143 @@ TwoIsland_House_MapScripts:: @ 8171618 - .byte 0 + .byte 0 TwoIsland_House_EventScript_171619:: @ 8171619 - special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 - special sub_8112364 - lock - faceplayer - clearflag FLAG_0x002 - clearflag FLAG_0x003 - clearflag FLAG_0x004 - checkflag FLAG_0x001 - goto_if 1, EventScript_17164F - loadword 0, gUnknown_81A2B88 - callstd 4 - setflag FLAG_0x001 - goto EventScript_17164F - end + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + special sub_8112364 + lock + faceplayer + clearflag FLAG_0x002 + clearflag FLAG_0x003 + clearflag FLAG_0x004 + checkflag FLAG_0x001 + goto_if 1, EventScript_17164F + loadword 0, gUnknown_81A2B88 + callstd 4 + setflag FLAG_0x001 + goto EventScript_17164F + end EventScript_17164F:: @ 817164F - checkitem ITEM_BIG_MUSHROOM, 1 - compare_var_to_value VAR_RESULT, 1 - call_if 1, EventScript_1717A8 - checkitem ITEM_TINY_MUSHROOM, 2 - compare_var_to_value VAR_RESULT, 1 - call_if 1, EventScript_1717AC - checkflag FLAG_0x002 - goto_if 1, EventScript_171687 - checkflag FLAG_0x003 - goto_if 1, EventScript_171696 - goto EventScript_17179E - end + checkitem ITEM_BIG_MUSHROOM, 1 + compare_var_to_value VAR_RESULT, 1 + call_if 1, EventScript_1717A8 + checkitem ITEM_TINY_MUSHROOM, 2 + compare_var_to_value VAR_RESULT, 1 + call_if 1, EventScript_1717AC + checkflag FLAG_0x002 + goto_if 1, EventScript_171687 + checkflag FLAG_0x003 + goto_if 1, EventScript_171696 + goto EventScript_17179E + end EventScript_171687:: @ 8171687 - checkflag FLAG_0x003 - call_if 1, EventScript_1717B0 - goto EventScript_1716A5 - end + checkflag FLAG_0x003 + call_if 1, EventScript_1717B0 + goto EventScript_1716A5 + end EventScript_171696:: @ 8171696 - checkflag FLAG_0x002 - call_if 1, EventScript_1717B0 - goto EventScript_1716A5 - end + checkflag FLAG_0x002 + call_if 1, EventScript_1717B0 + goto EventScript_1716A5 + end EventScript_1716A5:: @ 81716A5 - loadword 0, gUnknown_81A2C63 - callstd 5 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_17179E - goto EventScript_1716BE - end + loadword 0, gUnknown_81A2C63 + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_17179E + goto EventScript_1716BE + end EventScript_1716BE:: @ 81716BE - loadword 0, gUnknown_81A2CC3 - callstd 4 - special sub_80BF93C - waitstate - compare_var_to_value VAR_0x8004, 6 - goto_if 4, EventScript_17179E - special sub_80BFC14 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_171790 - compare_var_to_value VAR_0x8005, 0 - goto_if 1, EventScript_171782 - goto EventScript_1716F4 - end + loadword 0, gUnknown_81A2CC3 + callstd 4 + special sub_80BF93C + waitstate + compare_var_to_value VAR_0x8004, 6 + goto_if 4, EventScript_17179E + special sub_80BFC14 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_171790 + compare_var_to_value VAR_0x8005, 0 + goto_if 1, EventScript_171782 + goto EventScript_1716F4 + end EventScript_1716F4:: @ 81716F4 - loadword 0, gUnknown_81A2CE1 - callstd 4 - special sub_80E4634 - waitstate - compare_var_to_value VAR_0x8004, 0 - goto_if 1, EventScript_1716BE - checkflag FLAG_0x004 - goto_if 1, EventScript_17175B - checkflag FLAG_0x002 - goto_if 1, EventScript_171727 - checkflag FLAG_0x003 - goto_if 1, EventScript_171741 - end + loadword 0, gUnknown_81A2CE1 + callstd 4 + special sub_80E4634 + waitstate + compare_var_to_value VAR_0x8004, 0 + goto_if 1, EventScript_1716BE + checkflag FLAG_0x004 + goto_if 1, EventScript_17175B + checkflag FLAG_0x002 + goto_if 1, EventScript_171727 + checkflag FLAG_0x003 + goto_if 1, EventScript_171741 + end EventScript_171727:: @ 8171727 - removeitem ITEM_BIG_MUSHROOM, 1 - textcolor 3 - loadword 0, gUnknown_81A2DB3 - callstd 4 - call EventScript_1A6675 - goto EventScript_17179E - end + removeitem ITEM_BIG_MUSHROOM, 1 + textcolor 3 + loadword 0, gUnknown_81A2DB3 + callstd 4 + call EventScript_1A6675 + goto EventScript_17179E + end EventScript_171741:: @ 8171741 - removeitem ITEM_TINY_MUSHROOM, 2 - textcolor 3 - loadword 0, gUnknown_81A2D85 - callstd 4 - call EventScript_1A6675 - goto EventScript_17179E - end + removeitem ITEM_TINY_MUSHROOM, 2 + textcolor 3 + loadword 0, gUnknown_81A2D85 + callstd 4 + call EventScript_1A6675 + goto EventScript_17179E + end EventScript_17175B:: @ 817175B - message Text_1A2D43 - waitmessage - multichoice 0, 0, 51, 1 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_171741 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_171727 - end + message Text_1A2D43 + waitmessage + multichoice 0, 0, 51, 1 + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_171741 + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_171727 + end EventScript_171782:: @ 8171782 - loadword 0, gUnknown_81A2CFC - callstd 4 - goto EventScript_1716BE - end + loadword 0, gUnknown_81A2CFC + callstd 4 + goto EventScript_1716BE + end EventScript_171790:: @ 8171790 - loadword 0, gUnknown_81A2E20 - callstd 4 - goto EventScript_1716BE - end + loadword 0, gUnknown_81A2E20 + callstd 4 + goto EventScript_1716BE + end EventScript_17179E:: @ 817179E - loadword 0, gUnknown_81A2DE0 - callstd 4 - release - end + loadword 0, gUnknown_81A2DE0 + callstd 4 + release + end EventScript_1717A8:: @ 81717A8 - setflag FLAG_0x002 - return + setflag FLAG_0x002 + return EventScript_1717AC:: @ 81717AC - setflag FLAG_0x003 - return + setflag FLAG_0x003 + return EventScript_1717B0:: @ 81717B0 - setflag FLAG_0x004 - return + setflag FLAG_0x004 + return diff --git a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc index 2d6b06c70..496c0fa3d 100644 --- a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc +++ b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc @@ -1,216 +1,216 @@ TwoIsland_JoyfulGameCorner_MapScripts:: @ 81713D0 - map_script 3, TwoIsland_JoyfulGameCorner_MapScript1_1713E5 - map_script 4, TwoIsland_JoyfulGameCorner_MapScript2_171404 - map_script 2, TwoIsland_JoyfulGameCorner_MapScript3_17141B - map_script 1, TwoIsland_JoyfulGameCorner_MapScript4_1BB237 - .byte 0 + map_script 3, TwoIsland_JoyfulGameCorner_MapScript1_1713E5 + map_script 4, TwoIsland_JoyfulGameCorner_MapScript2_171404 + map_script 2, TwoIsland_JoyfulGameCorner_MapScript3_17141B + map_script 1, TwoIsland_JoyfulGameCorner_MapScript4_1BB237 + .byte 0 TwoIsland_JoyfulGameCorner_MapScript1_1713E5:: @ 81713E5 - checkflag FLAG_0x2FB - call_if 1, EventScript_1713EF - end + checkflag FLAG_0x2FB + call_if 1, EventScript_1713EF + end EventScript_1713EF:: @ 81713EF - setobjectxyperm 1, 6, 2 - setobjectmovementtype 1, 8 - setobjectmovementtype 3, 1 - setvar VAR_0x4079, 4 - return + setobjectxyperm 1, 6, 2 + setobjectmovementtype 1, 8 + setobjectmovementtype 3, 1 + setvar VAR_0x4079, 4 + return TwoIsland_JoyfulGameCorner_MapScript2_171404:: @ 8171404 - map_script_2 VAR_0x4079, 2, EventScript_171416 - map_script_2 VAR_0x406F, 8, EventScript_1BB227 - .2byte 0 + map_script_2 VAR_0x4079, 2, EventScript_171416 + map_script_2 VAR_0x406F, 8, EventScript_1BB227 + .2byte 0 EventScript_171416:: @ 8171416 - turnobject 255, 2 - end + turnobject 255, 2 + end TwoIsland_JoyfulGameCorner_MapScript3_17141B:: @ 817141B - map_script_2 VAR_0x4079, 0, EventScript_17145F - map_script_2 VAR_0x4079, 2, EventScript_171435 - map_script_2 VAR_0x406F, 8, EventScript_1BB2FD - .2byte 0 + map_script_2 VAR_0x4079, 0, EventScript_17145F + map_script_2 VAR_0x4079, 2, EventScript_171435 + map_script_2 VAR_0x406F, 8, EventScript_1BB2FD + .2byte 0 EventScript_171435:: @ 8171435 - lockall - textcolor 0 - loadword 0, gUnknown_81A28B2 - callstd 4 - textcolor 1 - special sub_80CA6DC - loadword 0, gUnknown_81A2931 - callstd 4 - closemessage - applymovement 3, Movement_1A75ED - waitmovement 0 - setvar VAR_0x4079, 3 - releaseall - end + lockall + textcolor 0 + loadword 0, gUnknown_81A28B2 + callstd 4 + textcolor 1 + special sub_80CA6DC + loadword 0, gUnknown_81A2931 + callstd 4 + closemessage + applymovement 3, Movement_1A75ED + waitmovement 0 + setvar VAR_0x4079, 3 + releaseall + end EventScript_17145F:: @ 817145F - lockall - textcolor 0 - applymovement 1, Movement_171520 - waitmovement 0 - loadword 0, gUnknown_81A2408 - callstd 4 - closemessage - applymovement 1, Movement_1A75ED - waitmovement 0 - playse SE_PIN - applymovement 1, Movement_1A75DB - waitmovement 0 - applymovement 1, Movement_1A75DD - waitmovement 0 - applymovement 1, Movement_171527 - waitmovement 0 - applymovement 255, Movement_1A75EB - waitmovement 0 - loadword 0, gUnknown_81A2465 - callstd 4 - closemessage - playse SE_DOOR - waitse - applymovement 255, Movement_17152C - waitmovement 0 - playbgm BGM_FRLG_BOY_EYE, 0 - addobject 2 - applymovement 2, Movement_17152F - waitmovement 0 - loadword 0, gUnknown_81A259A - callstd 4 - applymovement 2, Movement_1A75EB - waitmovement 0 - loadword 0, gUnknown_81A2658 - callstd 4 - loadword 0, gUnknown_81A26D5 - callstd 4 - closemessage - applymovement 2, Movement_1A75ED - waitmovement 0 - playse SE_KAIDAN - removeobject 2 - fadedefaultbgm - delay 60 - loadword 0, gUnknown_81A270C - callstd 4 - clearflag FLAG_0x091 - setvar VAR_0x407B, 2 - setvar VAR_0x4079, 1 - releaseall - end + lockall + textcolor 0 + applymovement 1, Movement_171520 + waitmovement 0 + loadword 0, gUnknown_81A2408 + callstd 4 + closemessage + applymovement 1, Movement_1A75ED + waitmovement 0 + playse SE_PIN + applymovement 1, Movement_1A75DB + waitmovement 0 + applymovement 1, Movement_1A75DD + waitmovement 0 + applymovement 1, Movement_171527 + waitmovement 0 + applymovement 255, Movement_1A75EB + waitmovement 0 + loadword 0, gUnknown_81A2465 + callstd 4 + closemessage + playse SE_DOOR + waitse + applymovement 255, Movement_17152C + waitmovement 0 + playbgm BGM_FRLG_BOY_EYE, 0 + addobject 2 + applymovement 2, Movement_17152F + waitmovement 0 + loadword 0, gUnknown_81A259A + callstd 4 + applymovement 2, Movement_1A75EB + waitmovement 0 + loadword 0, gUnknown_81A2658 + callstd 4 + loadword 0, gUnknown_81A26D5 + callstd 4 + closemessage + applymovement 2, Movement_1A75ED + waitmovement 0 + playse SE_KAIDAN + removeobject 2 + fadedefaultbgm + delay 60 + loadword 0, gUnknown_81A270C + callstd 4 + clearflag FLAG_0x091 + setvar VAR_0x407B, 2 + setvar VAR_0x4079, 1 + releaseall + end Movement_171520:: @ 8171520 - step_12 - step_13 - step_13 - step_1b - step_2e - step_1c - step_end + step_12 + step_13 + step_13 + step_1b + step_2e + step_1c + step_end Movement_171527:: @ 8171527 - step_10 - step_10 - step_10 - step_2f - step_end + step_10 + step_10 + step_10 + step_2f + step_end Movement_17152C:: @ 817152C - step_12 - step_30 - step_end + step_12 + step_30 + step_end Movement_17152F:: @ 817152F - step_2f - step_1b - step_30 - step_1b - step_2e - step_end + step_2f + step_1b + step_30 + step_1b + step_2e + step_end TwoIsland_JoyfulGameCorner_EventScript_171535:: @ 8171535 - lock - faceplayer - compare_var_to_value VAR_0x4079, 4 - goto_if 1, EventScript_1BC060 - checkflag FLAG_0x2A3 - goto_if 1, EventScript_171555 - loadword 0, gUnknown_81A285C - callstd 4 - release - end + lock + faceplayer + compare_var_to_value VAR_0x4079, 4 + goto_if 1, EventScript_1BC060 + checkflag FLAG_0x2A3 + goto_if 1, EventScript_171555 + loadword 0, gUnknown_81A285C + callstd 4 + release + end EventScript_171555:: @ 8171555 - loadword 0, gUnknown_81A288A - callstd 4 - release - end + loadword 0, gUnknown_81A288A + callstd 4 + release + end TwoIsland_JoyfulGameCorner_EventScript_17155F:: @ 817155F - lock - faceplayer - compare_var_to_value VAR_0x4079, 4 - goto_if 1, EventScript_1BC0CE - checkflag FLAG_0x2FB - goto_if 1, EventScript_1715F5 - compare_var_to_value VAR_0x4079, 3 - goto_if 1, EventScript_17158A - loadword 0, gUnknown_81A2743 - callstd 4 - release - end + lock + faceplayer + compare_var_to_value VAR_0x4079, 4 + goto_if 1, EventScript_1BC0CE + checkflag FLAG_0x2FB + goto_if 1, EventScript_1715F5 + compare_var_to_value VAR_0x4079, 3 + goto_if 1, EventScript_17158A + loadword 0, gUnknown_81A2743 + callstd 4 + release + end EventScript_17158A:: @ 817158A - checkflag FLAG_0x2FE - goto_if 1, EventScript_1715C4 - loadword 0, gUnknown_81A296A - callstd 4 - setvar VAR_0x4076, 2 - textcolor 3 - playfanfare MUS_ME_WAZA - message Text_1A29F7 - waitmessage - waitfanfare - call EventScript_1A6675 - removeitem ITEM_METEORITE, 1 - loadword 0, gUnknown_81A2A24 - callstd 4 - goto EventScript_1715C4 - end + checkflag FLAG_0x2FE + goto_if 1, EventScript_1715C4 + loadword 0, gUnknown_81A296A + callstd 4 + setvar VAR_0x4076, 2 + textcolor 3 + playfanfare MUS_ME_WAZA + message Text_1A29F7 + waitmessage + waitfanfare + call EventScript_1A6675 + removeitem ITEM_METEORITE, 1 + loadword 0, gUnknown_81A2A24 + callstd 4 + goto EventScript_1715C4 + end EventScript_1715C4:: @ 81715C4 - checkitemspace ITEM_MOON_STONE, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1715FF - additem ITEM_MOON_STONE, 1 - setflag FLAG_0x2FB - loadword 0, gUnknown_81A2A9A - setorcopyvar VAR_0x8000, 94 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 257 - callstd 9 - release - end + checkitemspace ITEM_MOON_STONE, 1 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_1715FF + additem ITEM_MOON_STONE, 1 + setflag FLAG_0x2FB + loadword 0, gUnknown_81A2A9A + setorcopyvar VAR_0x8000, 94 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 257 + callstd 9 + release + end EventScript_1715F5:: @ 81715F5 - loadword 0, gUnknown_81A2AF5 - callstd 4 - release - end + loadword 0, gUnknown_81A2AF5 + callstd 4 + release + end EventScript_1715FF:: @ 81715FF - setflag FLAG_0x2FE - loadword 0, gUnknown_81A2ACA - callstd 4 - release - end + setflag FLAG_0x2FE + loadword 0, gUnknown_81A2ACA + callstd 4 + release + end TwoIsland_JoyfulGameCorner_EventScript_17160C:: @ 817160C - lock - faceplayer - loadword 0, gUnknown_81A2B53 - callstd 4 - release - end + lock + faceplayer + loadword 0, gUnknown_81A2B53 + callstd 4 + release + end diff --git a/data/maps/TwoIsland_PokemonCenter_1F/scripts.inc b/data/maps/TwoIsland_PokemonCenter_1F/scripts.inc index 3f4196829..21687e467 100644 --- a/data/maps/TwoIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/TwoIsland_PokemonCenter_1F/scripts.inc @@ -1,25 +1,25 @@ TwoIsland_PokemonCenter_1F_MapScripts:: @ 81717B4 - map_script 3, TwoIsland_PokemonCenter_1F_MapScript1_1717BF - map_script 5, TwoIsland_PokemonCenter_1F_MapScript2_1BC05C - .byte 0 + map_script 3, TwoIsland_PokemonCenter_1F_MapScript1_1717BF + map_script 5, TwoIsland_PokemonCenter_1F_MapScript2_1BC05C + .byte 0 TwoIsland_PokemonCenter_1F_MapScript1_1717BF:: @ 81717BF - setrespawn 15 - end + setrespawn 15 + end TwoIsland_PokemonCenter_1F_EventScript_1717C3:: @ 81717C3 - lock - faceplayer - call EventScript_1A6578 - release - end + lock + faceplayer + call EventScript_1A6578 + release + end TwoIsland_PokemonCenter_1F_EventScript_1717CC:: @ 81717CC - loadword 0, gUnknown_81A2E59 - callstd 2 - end + loadword 0, gUnknown_81A2E59 + callstd 2 + end TwoIsland_PokemonCenter_1F_EventScript_1717D5:: @ 81717D5 - loadword 0, gUnknown_81A2EBE - callstd 2 - end + loadword 0, gUnknown_81A2EBE + callstd 2 + end diff --git a/data/maps/TwoIsland_PokemonCenter_2F/scripts.inc b/data/maps/TwoIsland_PokemonCenter_2F/scripts.inc index b96339801..01954808c 100644 --- a/data/maps/TwoIsland_PokemonCenter_2F/scripts.inc +++ b/data/maps/TwoIsland_PokemonCenter_2F/scripts.inc @@ -1,18 +1,18 @@ TwoIsland_PokemonCenter_2F_MapScripts:: @ 81717DE - map_script 2, TwoIsland_PokemonCenter_2F_MapScript1_1BB2A3 - map_script 4, TwoIsland_PokemonCenter_2F_MapScript2_1BB1ED - map_script 1, TwoIsland_PokemonCenter_2F_MapScript3_1BB237 - map_script 3, TwoIsland_PokemonCenter_2F_MapScript4_1BB1B4 - .byte 0 + map_script 2, TwoIsland_PokemonCenter_2F_MapScript1_1BB2A3 + map_script 4, TwoIsland_PokemonCenter_2F_MapScript2_1BB1ED + map_script 1, TwoIsland_PokemonCenter_2F_MapScript3_1BB237 + map_script 3, TwoIsland_PokemonCenter_2F_MapScript4_1BB1B4 + .byte 0 TwoIsland_PokemonCenter_2F_EventScript_1717F3:: @ 81717F3 - call EventScript_1BB4A3 - end + call EventScript_1BB4A3 + end EventScript_1717F9:: @ 81717F9 - call EventScript_1BB6AB - end + call EventScript_1BB6AB + end EventScript_1717FF:: @ 81717FF - call EventScript_1BB7DE - end + call EventScript_1BB7DE + end diff --git a/data/maps/UndergroundPath_EastEntrance/scripts.inc b/data/maps/UndergroundPath_EastEntrance/scripts.inc index bb7b47f87..185d2244a 100644 --- a/data/maps/UndergroundPath_EastEntrance/scripts.inc +++ b/data/maps/UndergroundPath_EastEntrance/scripts.inc @@ -1,7 +1,7 @@ UndergroundPath_EastEntrance_MapScripts:: @ 8160EDD - .byte 0 + .byte 0 UndergroundPath_EastEntrance_EventScript_160EDE:: @ 8160EDE - loadword 0, gUnknown_81745D9 - callstd 2 - end + loadword 0, gUnknown_81745D9 + callstd 2 + end diff --git a/data/maps/UndergroundPath_EastWestTunnel/scripts.inc b/data/maps/UndergroundPath_EastWestTunnel/scripts.inc index 14132bc0d..887137dc9 100644 --- a/data/maps/UndergroundPath_EastWestTunnel/scripts.inc +++ b/data/maps/UndergroundPath_EastWestTunnel/scripts.inc @@ -1,7 +1,7 @@ UndergroundPath_EastWestTunnel_MapScripts:: @ 8160ED3 - map_script 3, UndergroundPath_EastWestTunnel_MapScript1_160ED9 - .byte 0 + map_script 3, UndergroundPath_EastWestTunnel_MapScript1_160ED9 + .byte 0 UndergroundPath_EastWestTunnel_MapScript1_160ED9:: @ 8160ED9 - setworldmapflag 2216 - end + setworldmapflag 2216 + end diff --git a/data/maps/UndergroundPath_NorthEntrance/scripts.inc b/data/maps/UndergroundPath_NorthEntrance/scripts.inc index 38531be14..8236d08fd 100644 --- a/data/maps/UndergroundPath_NorthEntrance/scripts.inc +++ b/data/maps/UndergroundPath_NorthEntrance/scripts.inc @@ -1,45 +1,45 @@ UndergroundPath_NorthEntrance_MapScripts:: @ 8160E38 - .byte 0 + .byte 0 UndergroundPath_NorthEntrance_EventScript_160E39:: @ 8160E39 - lock - faceplayer - setvar VAR_0x8008, 2 - call EventScript_1A8CAD - checkflag FLAG_0x24B - goto_if 1, EventScript_160EAB - loadword 0, gUnknown_81A5AD6 - callstd 5 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_160E93 - call EventScript_1A8CBD - compare_var_to_value VAR_0x8004, 6 - goto_if 4, EventScript_160E93 - call EventScript_1A8CC9 - compare_var_to_var VAR_RESULT, VAR_0x8009 - goto_if 5, EventScript_160E9D - call EventScript_1A8CD9 - loadword 0, gUnknown_81A5B4A - callstd 4 - setflag FLAG_0x24B - release - end + lock + faceplayer + setvar VAR_0x8008, 2 + call EventScript_1A8CAD + checkflag FLAG_0x24B + goto_if 1, EventScript_160EAB + loadword 0, gUnknown_81A5AD6 + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_160E93 + call EventScript_1A8CBD + compare_var_to_value VAR_0x8004, 6 + goto_if 4, EventScript_160E93 + call EventScript_1A8CC9 + compare_var_to_var VAR_RESULT, VAR_0x8009 + goto_if 5, EventScript_160E9D + call EventScript_1A8CD9 + loadword 0, gUnknown_81A5B4A + callstd 4 + setflag FLAG_0x24B + release + end EventScript_160E93:: @ 8160E93 - loadword 0, gUnknown_81A5B08 - callstd 4 - release - end + loadword 0, gUnknown_81A5B08 + callstd 4 + release + end EventScript_160E9D:: @ 8160E9D - getspeciesname 0, 32777 - loadword 0, gUnknown_81A5B18 - callstd 4 - release - end + getspeciesname 0, 32777 + loadword 0, gUnknown_81A5B18 + callstd 4 + release + end EventScript_160EAB:: @ 8160EAB - loadword 0, gUnknown_81A5B60 - callstd 4 - release - end + loadword 0, gUnknown_81A5B60 + callstd 4 + release + end diff --git a/data/maps/UndergroundPath_NorthSouthTunnel/scripts.inc b/data/maps/UndergroundPath_NorthSouthTunnel/scripts.inc index 237373dc8..ff3274fdf 100644 --- a/data/maps/UndergroundPath_NorthSouthTunnel/scripts.inc +++ b/data/maps/UndergroundPath_NorthSouthTunnel/scripts.inc @@ -1,7 +1,7 @@ UndergroundPath_NorthSouthTunnel_MapScripts:: @ 8160EB5 - map_script 3, UndergroundPath_NorthSouthTunnel_MapScript1_160EBB - .byte 0 + map_script 3, UndergroundPath_NorthSouthTunnel_MapScript1_160EBB + .byte 0 UndergroundPath_NorthSouthTunnel_MapScript1_160EBB:: @ 8160EBB - setworldmapflag 2215 - end + setworldmapflag 2215 + end diff --git a/data/maps/UndergroundPath_SouthEntrance/scripts.inc b/data/maps/UndergroundPath_SouthEntrance/scripts.inc index c425e67d4..141ea84ed 100644 --- a/data/maps/UndergroundPath_SouthEntrance/scripts.inc +++ b/data/maps/UndergroundPath_SouthEntrance/scripts.inc @@ -1,7 +1,7 @@ UndergroundPath_SouthEntrance_MapScripts:: @ 8160EBF - .byte 0 + .byte 0 UndergroundPath_SouthEntrance_EventScript_160EC0:: @ 8160EC0 - loadword 0, gUnknown_8174559 - callstd 2 - end + loadword 0, gUnknown_8174559 + callstd 2 + end diff --git a/data/maps/UndergroundPath_WestEntrance/scripts.inc b/data/maps/UndergroundPath_WestEntrance/scripts.inc index 77a20cf4b..898c14fe2 100644 --- a/data/maps/UndergroundPath_WestEntrance/scripts.inc +++ b/data/maps/UndergroundPath_WestEntrance/scripts.inc @@ -1,7 +1,7 @@ UndergroundPath_WestEntrance_MapScripts:: @ 8160EC9 - .byte 0 + .byte 0 UndergroundPath_WestEntrance_EventScript_160ECA:: @ 8160ECA - loadword 0, gUnknown_817459B - callstd 2 - end + loadword 0, gUnknown_817459B + callstd 2 + end diff --git a/data/maps/UnknownMap_00_00/scripts.inc b/data/maps/UnknownMap_00_00/scripts.inc index 73507301f..bd155a889 100644 --- a/data/maps/UnknownMap_00_00/scripts.inc +++ b/data/maps/UnknownMap_00_00/scripts.inc @@ -1,2 +1,2 @@ UnknownMap_00_00_MapScripts:: @ 8160478 - .byte 0 + .byte 0 diff --git a/data/maps/UnknownMap_00_01/scripts.inc b/data/maps/UnknownMap_00_01/scripts.inc index c419b60c7..0c05ea80d 100644 --- a/data/maps/UnknownMap_00_01/scripts.inc +++ b/data/maps/UnknownMap_00_01/scripts.inc @@ -1,2 +1,2 @@ UnknownMap_00_01_MapScripts:: @ 8160479 - .byte 0 + .byte 0 diff --git a/data/maps/UnknownMap_00_02/scripts.inc b/data/maps/UnknownMap_00_02/scripts.inc index ab36a21eb..d12ac4304 100644 --- a/data/maps/UnknownMap_00_02/scripts.inc +++ b/data/maps/UnknownMap_00_02/scripts.inc @@ -1,2 +1,2 @@ UnknownMap_00_02_MapScripts:: @ 816047A - .byte 0 + .byte 0 diff --git a/data/maps/UnknownMap_00_03/scripts.inc b/data/maps/UnknownMap_00_03/scripts.inc index feca41b0f..60c25bf54 100644 --- a/data/maps/UnknownMap_00_03/scripts.inc +++ b/data/maps/UnknownMap_00_03/scripts.inc @@ -1,2 +1,2 @@ UnknownMap_00_03_MapScripts:: @ 816047B - .byte 0 + .byte 0 diff --git a/data/maps/UnknownMap_00_04/scripts.inc b/data/maps/UnknownMap_00_04/scripts.inc index 739bdee00..94056b155 100644 --- a/data/maps/UnknownMap_00_04/scripts.inc +++ b/data/maps/UnknownMap_00_04/scripts.inc @@ -1,106 +1,106 @@ UnknownMap_00_04_MapScripts:: @ 816047C - map_script 5, UnknownMap_00_04_MapScript1_160487 - map_script 3, UnknownMap_00_04_MapScript2_1604BB - .byte 0 + map_script 5, UnknownMap_00_04_MapScript1_160487 + map_script 3, UnknownMap_00_04_MapScript2_1604BB + .byte 0 UnknownMap_00_04_MapScript1_160487:: @ 8160487 - setflag FLAG_0x063 - setflag FLAG_0x064 - setflag FLAG_0x065 - setflag FLAG_0x066 - setflag FLAG_0x067 - setflag FLAG_0x068 - setflag FLAG_0x069 - setflag FLAG_0x06A - removeobject 9 - removeobject 8 - removeobject 7 - removeobject 2 - removeobject 6 - removeobject 5 - removeobject 4 - removeobject 3 - special UnionRoomSpecial - end + setflag FLAG_0x063 + setflag FLAG_0x064 + setflag FLAG_0x065 + setflag FLAG_0x066 + setflag FLAG_0x067 + setflag FLAG_0x068 + setflag FLAG_0x069 + setflag FLAG_0x06A + removeobject 9 + removeobject 8 + removeobject 7 + removeobject 2 + removeobject 6 + removeobject 5 + removeobject 4 + removeobject 3 + special UnionRoomSpecial + end UnknownMap_00_04_MapScript2_1604BB:: @ 81604BB - end + end UnknownMap_00_04_EventScript_1604BC:: @ 81604BC - lock - faceplayer - setvar VAR_RESULT, 1 - waitstate - release - end + lock + faceplayer + setvar VAR_RESULT, 1 + waitstate + release + end UnknownMap_00_04_EventScript_1604C6:: @ 81604C6 - lock - faceplayer - setvar VAR_RESULT, 2 - waitstate - release - end + lock + faceplayer + setvar VAR_RESULT, 2 + waitstate + release + end UnknownMap_00_04_EventScript_1604D0:: @ 81604D0 - lock - faceplayer - setvar VAR_RESULT, 3 - waitstate - release - end + lock + faceplayer + setvar VAR_RESULT, 3 + waitstate + release + end UnknownMap_00_04_EventScript_1604DA:: @ 81604DA - lock - faceplayer - setvar VAR_RESULT, 4 - waitstate - release - end + lock + faceplayer + setvar VAR_RESULT, 4 + waitstate + release + end UnknownMap_00_04_EventScript_1604E4:: @ 81604E4 - lock - faceplayer - setvar VAR_RESULT, 5 - waitstate - release - end + lock + faceplayer + setvar VAR_RESULT, 5 + waitstate + release + end UnknownMap_00_04_EventScript_1604EE:: @ 81604EE - lock - faceplayer - setvar VAR_RESULT, 6 - waitstate - release - end + lock + faceplayer + setvar VAR_RESULT, 6 + waitstate + release + end UnknownMap_00_04_EventScript_1604F8:: @ 81604F8 - lock - faceplayer - setvar VAR_RESULT, 7 - waitstate - release - end + lock + faceplayer + setvar VAR_RESULT, 7 + waitstate + release + end UnknownMap_00_04_EventScript_160502:: @ 8160502 - lock - faceplayer - setvar VAR_RESULT, 8 - waitstate - release - end + lock + faceplayer + setvar VAR_RESULT, 8 + waitstate + release + end UnknownMap_00_04_EventScript_16050C:: @ 816050C - lock - faceplayer - setvar VAR_RESULT, 9 - waitstate - release - end + lock + faceplayer + setvar VAR_RESULT, 9 + waitstate + release + end UnknownMap_00_04_EventScript_160516:: @ 8160516 - lockall - setvar VAR_RESULT, 10 - waitstate - releaseall - end + lockall + setvar VAR_RESULT, 10 + waitstate + releaseall + end diff --git a/data/maps/UnknownMap_03_50/scripts.inc b/data/maps/UnknownMap_03_50/scripts.inc index c18211933..4e136faae 100644 --- a/data/maps/UnknownMap_03_50/scripts.inc +++ b/data/maps/UnknownMap_03_50/scripts.inc @@ -1,2 +1,2 @@ UnknownMap_03_50_MapScripts:: @ 81687E0 - .byte 0 + .byte 0 diff --git a/data/maps/UnknownMap_03_51/scripts.inc b/data/maps/UnknownMap_03_51/scripts.inc index 09f9ef2d4..7398062d8 100644 --- a/data/maps/UnknownMap_03_51/scripts.inc +++ b/data/maps/UnknownMap_03_51/scripts.inc @@ -1,2 +1,2 @@ UnknownMap_03_51_MapScripts:: @ 81687E1 - .byte 0 + .byte 0 diff --git a/data/maps/UnknownMap_03_52/scripts.inc b/data/maps/UnknownMap_03_52/scripts.inc index 15fc8b160..2e48ca113 100644 --- a/data/maps/UnknownMap_03_52/scripts.inc +++ b/data/maps/UnknownMap_03_52/scripts.inc @@ -1,2 +1,2 @@ UnknownMap_03_52_MapScripts:: @ 81687E2 - .byte 0 + .byte 0 diff --git a/data/maps/UnknownMap_03_53/scripts.inc b/data/maps/UnknownMap_03_53/scripts.inc index 2ef4453ea..2dec9650e 100644 --- a/data/maps/UnknownMap_03_53/scripts.inc +++ b/data/maps/UnknownMap_03_53/scripts.inc @@ -1,2 +1,2 @@ UnknownMap_03_53_MapScripts:: @ 81687E3 - .byte 0 + .byte 0 diff --git a/data/maps/UnknownMap_18_01/scripts.inc b/data/maps/UnknownMap_18_01/scripts.inc index 461deaf9b..15459c3a9 100644 --- a/data/maps/UnknownMap_18_01/scripts.inc +++ b/data/maps/UnknownMap_18_01/scripts.inc @@ -1,2 +1,2 @@ UnknownMap_18_01_MapScripts:: @ 816FA8C - .byte 0 + .byte 0 diff --git a/data/maps/UnusedHouse_27_00/scripts.inc b/data/maps/UnusedHouse_27_00/scripts.inc index 02c992573..973665fa1 100644 --- a/data/maps/UnusedHouse_27_00/scripts.inc +++ b/data/maps/UnusedHouse_27_00/scripts.inc @@ -1,2 +1,2 @@ UnusedHouse_27_00_MapScripts:: @ 81704FA - .byte 0 + .byte 0 diff --git a/data/maps/UnusedHouse_29_00/scripts.inc b/data/maps/UnusedHouse_29_00/scripts.inc index 7e984394b..d0a4cc1a8 100644 --- a/data/maps/UnusedHouse_29_00/scripts.inc +++ b/data/maps/UnusedHouse_29_00/scripts.inc @@ -1,2 +1,2 @@ UnusedHouse_29_00_MapScripts:: @ 8170522 - .byte 0 + .byte 0 diff --git a/data/maps/UnusedHouse_31_05/scripts.inc b/data/maps/UnusedHouse_31_05/scripts.inc index 11dae233d..ee5cfa2cb 100644 --- a/data/maps/UnusedHouse_31_05/scripts.inc +++ b/data/maps/UnusedHouse_31_05/scripts.inc @@ -1,2 +1,2 @@ UnusedHouse_31_05_MapScripts:: @ 8170BE3 - .byte 0 + .byte 0 diff --git a/data/maps/VermilionCity/scripts.inc b/data/maps/VermilionCity/scripts.inc index b516e0939..3bd6fb07c 100644 --- a/data/maps/VermilionCity/scripts.inc +++ b/data/maps/VermilionCity/scripts.inc @@ -1,330 +1,330 @@ VermilionCity_MapScripts:: @ 81668DC - map_script 3, VermilionCity_MapScript1_166906 - map_script 2, VermilionCity_MapScript2_1668E7 - .byte 0 + map_script 3, VermilionCity_MapScript1_166906 + map_script 2, VermilionCity_MapScript2_1668E7 + .byte 0 VermilionCity_MapScript2_1668E7:: @ 81668E7 - map_script_2 VAR_0x407E, 2, EventScript_1668F1 - .2byte 0 + map_script_2 VAR_0x407E, 2, EventScript_1668F1 + .2byte 0 EventScript_1668F1:: @ 81668F1 - lockall - applymovement 255, Movement_166903 - waitmovement 0 - setvar VAR_0x407E, 3 - releaseall - end + lockall + applymovement 255, Movement_166903 + waitmovement 0 + setvar VAR_0x407E, 3 + releaseall + end Movement_166903:: @ 8166903 - step_11 - step_11 - step_end + step_11 + step_11 + step_end VermilionCity_MapScript1_166906:: @ 8166906 - setworldmapflag 2197 - checkflag FLAG_0x2F9 - call_if 1, EventScript_166913 - end + setworldmapflag 2197 + checkflag FLAG_0x2F9 + call_if 1, EventScript_166913 + end EventScript_166913:: @ 8166913 - setflag FLAG_0x0A1 - return + setflag FLAG_0x0A1 + return VermilionCity_EventScript_166917:: @ 8166917 - loadword 0, gUnknown_817F723 - callstd 2 - end + loadword 0, gUnknown_817F723 + callstd 2 + end VermilionCity_EventScript_166920:: @ 8166920 - lock - faceplayer - compare_var_to_value VAR_0x407E, 3 - goto_if 1, EventScript_166937 - loadword 0, gUnknown_817F776 - callstd 4 - release - end + lock + faceplayer + compare_var_to_value VAR_0x407E, 3 + goto_if 1, EventScript_166937 + loadword 0, gUnknown_817F776 + callstd 4 + release + end EventScript_166937:: @ 8166937 - loadword 0, gUnknown_817F7A6 - callstd 4 - release - end + loadword 0, gUnknown_817F7A6 + callstd 4 + release + end VermilionCity_EventScript_166941:: @ 8166941 - lock - faceplayer - compare_var_to_value VAR_0x407E, 3 - goto_if 1, EventScript_166996 - loadword 0, gUnknown_817FA22 - callstd 4 - release - end + lock + faceplayer + compare_var_to_value VAR_0x407E, 3 + goto_if 1, EventScript_166996 + loadword 0, gUnknown_817FA22 + callstd 4 + release + end EventScript_166958:: @ 8166958 - checkflag 2122 - goto_if 0, EventScript_1A77B0 - checkitem ITEM_MYSTIC_TICKET, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1A77B0 - goto EventScript_1A77AA - end + checkflag 2122 + goto_if 0, EventScript_1A77B0 + checkitem ITEM_MYSTIC_TICKET, 1 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_1A77B0 + goto EventScript_1A77AA + end EventScript_166977:: @ 8166977 - checkflag 2123 - goto_if 0, EventScript_1A77B0 - checkitem ITEM_AURORA_TICKET, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1A77B0 - goto EventScript_1A77AA - end + checkflag 2123 + goto_if 0, EventScript_1A77B0 + checkitem ITEM_AURORA_TICKET, 1 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_1A77B0 + goto EventScript_1A77AA + end EventScript_166996:: @ 8166996 - setvar VAR_0x8004, 0 - compare_var_to_value VAR_0x4076, 5 - goto_if 4, EventScript_1669BB - compare_var_to_value VAR_0x4076, 1 - goto_if 4, EventScript_166B3B - loadword 0, gUnknown_817FB10 - callstd 4 - release - end + setvar VAR_0x8004, 0 + compare_var_to_value VAR_0x4076, 5 + goto_if 4, EventScript_1669BB + compare_var_to_value VAR_0x4076, 1 + goto_if 4, EventScript_166B3B + loadword 0, gUnknown_817FB10 + callstd 4 + release + end EventScript_1669BB:: @ 81669BB - special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 - special sub_8112364 - call EventScript_166958 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1669FD - call EventScript_166977 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_166A5F - setvar VAR_0x8004, 0 - message Text_17FBB8 - waitmessage - goto EventScript_1A911E - end + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + special sub_8112364 + call EventScript_166958 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_1669FD + call EventScript_166977 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_166A5F + setvar VAR_0x8004, 0 + message Text_17FBB8 + waitmessage + goto EventScript_1A911E + end EventScript_1669FD:: @ 81669FD - call EventScript_166977 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_166AB1 - checkflag FLAG_0x2F0 - call_if 0, EventScript_166A53 - message Text_17FCC1 - waitmessage - multichoice 17, 6, 54, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1A911E - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_166B0B - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1A90F6 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_1A90F6 - end + call EventScript_166977 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_166AB1 + checkflag FLAG_0x2F0 + call_if 0, EventScript_166A53 + message Text_17FCC1 + waitmessage + multichoice 17, 6, 54, 0 + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_1A911E + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_166B0B + compare_var_to_value VAR_0x8000, 2 + goto_if 1, EventScript_1A90F6 + compare_var_to_value VAR_0x8000, 127 + goto_if 1, EventScript_1A90F6 + end EventScript_166A53:: @ 8166A53 - setflag FLAG_0x2F0 - loadword 0, gUnknown_817FC00 - callstd 4 - return + setflag FLAG_0x2F0 + loadword 0, gUnknown_817FC00 + callstd 4 + return EventScript_166A5F:: @ 8166A5F - checkflag FLAG_0x2F1 - call_if 0, EventScript_166AA5 - message Text_17FCC1 - waitmessage - multichoice 13, 6, 55, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1A911E - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_166B23 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1A90F6 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_1A90F6 - end + checkflag FLAG_0x2F1 + call_if 0, EventScript_166AA5 + message Text_17FCC1 + waitmessage + multichoice 13, 6, 55, 0 + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_1A911E + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_166B23 + compare_var_to_value VAR_0x8000, 2 + goto_if 1, EventScript_1A90F6 + compare_var_to_value VAR_0x8000, 127 + goto_if 1, EventScript_1A90F6 + end EventScript_166AA5:: @ 8166AA5 - setflag FLAG_0x2F1 - loadword 0, gUnknown_817FC5F - callstd 4 - return + setflag FLAG_0x2F1 + loadword 0, gUnknown_817FC5F + callstd 4 + return EventScript_166AB1:: @ 8166AB1 - checkflag FLAG_0x2F0 - call_if 0, EventScript_166A53 - checkflag FLAG_0x2F1 - call_if 0, EventScript_166AA5 - message Text_17FCC1 - waitmessage - multichoice 13, 5, 56, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1A911E - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_166B0B - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_166B23 - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_1A90F6 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_1A90F6 - end + checkflag FLAG_0x2F0 + call_if 0, EventScript_166A53 + checkflag FLAG_0x2F1 + call_if 0, EventScript_166AA5 + message Text_17FCC1 + waitmessage + multichoice 13, 5, 56, 0 + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_1A911E + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_166B0B + compare_var_to_value VAR_0x8000, 2 + goto_if 1, EventScript_166B23 + compare_var_to_value VAR_0x8000, 3 + goto_if 1, EventScript_1A90F6 + compare_var_to_value VAR_0x8000, 127 + goto_if 1, EventScript_1A90F6 + end EventScript_166B0B:: @ 8166B0B - loadword 0, gUnknown_817FCEC - callstd 4 - setvar VAR_0x8004, 0 - setvar VAR_0x8006, 9 - goto EventScript_1A90DA - end + loadword 0, gUnknown_817FCEC + callstd 4 + setvar VAR_0x8004, 0 + setvar VAR_0x8006, 9 + goto EventScript_1A90DA + end EventScript_166B23:: @ 8166B23 - loadword 0, gUnknown_817FD5F - callstd 4 - setvar VAR_0x8004, 0 - setvar VAR_0x8006, 10 - goto EventScript_1A90DA - end + loadword 0, gUnknown_817FD5F + callstd 4 + setvar VAR_0x8004, 0 + setvar VAR_0x8006, 10 + goto EventScript_1A90DA + end EventScript_166B3B:: @ 8166B3B - message Text_17FB23 - waitmessage - setvar VAR_0x8004, 0 - multichoice 19, 5, 57, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1A8FEE - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1A8FF9 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1A9004 - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_1A90F6 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_1A90F6 - end + message Text_17FB23 + waitmessage + setvar VAR_0x8004, 0 + multichoice 19, 5, 57, 0 + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_1A8FEE + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_1A8FF9 + compare_var_to_value VAR_0x8000, 2 + goto_if 1, EventScript_1A9004 + compare_var_to_value VAR_0x8000, 3 + goto_if 1, EventScript_1A90F6 + compare_var_to_value VAR_0x8000, 127 + goto_if 1, EventScript_1A90F6 + end EventScript_166B88:: @ 8166B88 - release - end + release + end VermilionCity_EventScript_166B8A:: @ 8166B8A - lockall - goto EventScript_166BA0 - end + lockall + goto EventScript_166BA0 + end VermilionCity_EventScript_166B91:: @ 8166B91 - lockall - goto EventScript_166BA0 - end + lockall + goto EventScript_166BA0 + end VermilionCity_EventScript_166B98:: @ 8166B98 - lockall - setvar VAR_0x4053, 0 - releaseall - end + lockall + setvar VAR_0x4053, 0 + releaseall + end EventScript_166BA0:: @ 8166BA0 - textcolor 0 - applymovement 6, Movement_1A75E7 - applymovement 255, Movement_1A75EB - waitmovement 0 - compare_var_to_value VAR_0x407E, 3 - goto_if 1, EventScript_166BED - loadword 0, gUnknown_817FA3C - callstd 4 - checkflag FLAG_0x234 - goto_if 0, EventScript_166BDE - loadword 0, gUnknown_817FA77 - callstd 4 - setvar VAR_0x4053, 1 - releaseall - end + textcolor 0 + applymovement 6, Movement_1A75E7 + applymovement 255, Movement_1A75EB + waitmovement 0 + compare_var_to_value VAR_0x407E, 3 + goto_if 1, EventScript_166BED + loadword 0, gUnknown_817FA3C + callstd 4 + checkflag FLAG_0x234 + goto_if 0, EventScript_166BDE + loadword 0, gUnknown_817FA77 + callstd 4 + setvar VAR_0x4053, 1 + releaseall + end EventScript_166BDE:: @ 8166BDE - loadword 0, gUnknown_817FABA - callstd 4 - closemessage - goto EventScript_1A9108 - end + loadword 0, gUnknown_817FABA + callstd 4 + closemessage + goto EventScript_1A9108 + end EventScript_166BED:: @ 8166BED - setvar VAR_0x8004, 0 - compare_var_to_value VAR_0x4076, 5 - goto_if 4, EventScript_1669BB - compare_var_to_value VAR_0x4076, 1 - goto_if 4, EventScript_166B3B - loadword 0, gUnknown_817FB10 - callstd 4 - closemessage - goto EventScript_1A9108 - end + setvar VAR_0x8004, 0 + compare_var_to_value VAR_0x4076, 5 + goto_if 4, EventScript_1669BB + compare_var_to_value VAR_0x4076, 1 + goto_if 4, EventScript_166B3B + loadword 0, gUnknown_817FB10 + callstd 4 + closemessage + goto EventScript_1A9108 + end VermilionCity_EventScript_166C17:: @ 8166C17 - loadword 0, gUnknown_817F8AC - callstd 2 - end + loadword 0, gUnknown_817F8AC + callstd 2 + end VermilionCity_EventScript_166C20:: @ 8166C20 - lock - faceplayer - setflag FLAG_0x2F9 - loadword 0, gUnknown_817FDD2 - callstd 4 - release - end + lock + faceplayer + setflag FLAG_0x2F9 + loadword 0, gUnknown_817FDD2 + callstd 4 + release + end VermilionCity_EventScript_166C2F:: @ 8166C2F - loadword 0, gUnknown_817F7FD - callstd 2 - end + loadword 0, gUnknown_817F7FD + callstd 2 + end VermilionCity_EventScript_166C38:: @ 8166C38 - lock - faceplayer - waitse - playmoncry SPECIES_MACHOP, 0 - loadword 0, gUnknown_817F871 - callstd 4 - waitmoncry - loadword 0, gUnknown_817F888 - callstd 4 - release - end + lock + faceplayer + waitse + playmoncry SPECIES_MACHOP, 0 + loadword 0, gUnknown_817F871 + callstd 4 + waitmoncry + loadword 0, gUnknown_817F888 + callstd 4 + release + end VermilionCity_EventScript_166C53:: @ 8166C53 - loadword 0, gUnknown_817F8FB - callstd 3 - end + loadword 0, gUnknown_817F8FB + callstd 3 + end VermilionCity_EventScript_166C5C:: @ 8166C5C - loadword 0, gUnknown_817F928 - callstd 3 - end + loadword 0, gUnknown_817F928 + callstd 3 + end VermilionCity_EventScript_166C65:: @ 8166C65 - loadword 0, gUnknown_817F9A1 - callstd 3 - end + loadword 0, gUnknown_817F9A1 + callstd 3 + end VermilionCity_EventScript_166C6E:: @ 8166C6E - lockall - setvar VAR_0x8004, 4 - setvar VAR_0x8005, 0 - special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_817F9CC - callstd 4 - releaseall - end + lockall + setvar VAR_0x8004, 4 + setvar VAR_0x8005, 0 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_817F9CC + callstd 4 + releaseall + end VermilionCity_EventScript_166C86:: @ 8166C86 - loadword 0, gUnknown_817FA11 - callstd 3 - end + loadword 0, gUnknown_817FA11 + callstd 3 + end diff --git a/data/maps/VermilionCity_Gym/scripts.inc b/data/maps/VermilionCity_Gym/scripts.inc index 3d8cd6a52..d11f43e4c 100644 --- a/data/maps/VermilionCity_Gym/scripts.inc +++ b/data/maps/VermilionCity_Gym/scripts.inc @@ -1,329 +1,329 @@ VermilionCity_Gym_MapScripts:: @ 816B69E - map_script 1, VermilionCity_Gym_MapScript1_16B6A9 - map_script 3, VermilionCity_Gym_MapScript2_16B772 - .byte 0 + map_script 1, VermilionCity_Gym_MapScript1_16B6A9 + map_script 3, VermilionCity_Gym_MapScript2_16B772 + .byte 0 VermilionCity_Gym_MapScript1_16B6A9:: @ 816B6A9 - checkflag FLAG_0x001 - call_if 1, EventScript_16B6BC - checkflag FLAG_0x264 - call_if 1, EventScript_16B717 - end + checkflag FLAG_0x001 + call_if 1, EventScript_16B6BC + checkflag FLAG_0x264 + call_if 1, EventScript_16B717 + end EventScript_16B6BC:: @ 816B6BC - setmetatile 3, 6, 699, 1 - setmetatile 4, 6, 700, 1 - setmetatile 5, 6, 701, 1 - setmetatile 6, 6, 702, 1 - setmetatile 7, 6, 703, 1 - setmetatile 3, 7, 707, 1 - setmetatile 4, 7, 708, 1 - setmetatile 5, 7, 709, 1 - setmetatile 6, 7, 710, 1 - setmetatile 7, 7, 711, 1 - return + setmetatile 3, 6, 699, 1 + setmetatile 4, 6, 700, 1 + setmetatile 5, 6, 701, 1 + setmetatile 6, 6, 702, 1 + setmetatile 7, 6, 703, 1 + setmetatile 3, 7, 707, 1 + setmetatile 4, 7, 708, 1 + setmetatile 5, 7, 709, 1 + setmetatile 6, 7, 710, 1 + setmetatile 7, 7, 711, 1 + return EventScript_16B717:: @ 816B717 - setmetatile 3, 6, 659, 1 - setmetatile 4, 6, 660, 0 - setmetatile 5, 6, 641, 0 - setmetatile 6, 6, 661, 0 - setmetatile 7, 6, 662, 1 - setmetatile 3, 7, 667, 1 - setmetatile 4, 7, 668, 0 - setmetatile 5, 7, 641, 0 - setmetatile 6, 7, 669, 0 - setmetatile 7, 7, 670, 1 - return + setmetatile 3, 6, 659, 1 + setmetatile 4, 6, 660, 0 + setmetatile 5, 6, 641, 0 + setmetatile 6, 6, 661, 0 + setmetatile 7, 6, 662, 1 + setmetatile 3, 7, 667, 1 + setmetatile 4, 7, 668, 0 + setmetatile 5, 7, 641, 0 + setmetatile 6, 7, 669, 0 + setmetatile 7, 7, 670, 1 + return VermilionCity_Gym_MapScript2_16B772:: @ 816B772 - call EventScript_16B778 - end + call EventScript_16B778 + end EventScript_16B778:: @ 816B778 - checkflag FLAG_0x264 - goto_if 1, EventScript_1A77A9 - special sub_80CADEC - copyvar VAR_0x4000, VAR_0x8004 - copyvar VAR_0x4001, VAR_0x8005 - return + checkflag FLAG_0x264 + goto_if 1, EventScript_1A77A9 + special sub_80CADEC + copyvar VAR_0x4000, VAR_0x8004 + copyvar VAR_0x4001, VAR_0x8005 + return VermilionCity_Gym_EventScript_16B78F:: @ 816B78F - lockall - setvar VAR_0x8008, 1 - goto EventScript_16B843 - end + lockall + setvar VAR_0x8008, 1 + goto EventScript_16B843 + end VermilionCity_Gym_EventScript_16B79B:: @ 816B79B - lockall - setvar VAR_0x8008, 2 - goto EventScript_16B843 - end + lockall + setvar VAR_0x8008, 2 + goto EventScript_16B843 + end VermilionCity_Gym_EventScript_16B7A7:: @ 816B7A7 - lockall - setvar VAR_0x8008, 3 - goto EventScript_16B843 - end + lockall + setvar VAR_0x8008, 3 + goto EventScript_16B843 + end VermilionCity_Gym_EventScript_16B7B3:: @ 816B7B3 - lockall - setvar VAR_0x8008, 4 - goto EventScript_16B843 - end + lockall + setvar VAR_0x8008, 4 + goto EventScript_16B843 + end VermilionCity_Gym_EventScript_16B7BF:: @ 816B7BF - lockall - setvar VAR_0x8008, 5 - goto EventScript_16B843 - end + lockall + setvar VAR_0x8008, 5 + goto EventScript_16B843 + end VermilionCity_Gym_EventScript_16B7CB:: @ 816B7CB - lockall - setvar VAR_0x8008, 6 - goto EventScript_16B843 - end + lockall + setvar VAR_0x8008, 6 + goto EventScript_16B843 + end VermilionCity_Gym_EventScript_16B7D7:: @ 816B7D7 - lockall - setvar VAR_0x8008, 7 - goto EventScript_16B843 - end + lockall + setvar VAR_0x8008, 7 + goto EventScript_16B843 + end VermilionCity_Gym_EventScript_16B7E3:: @ 816B7E3 - lockall - setvar VAR_0x8008, 8 - goto EventScript_16B843 - end + lockall + setvar VAR_0x8008, 8 + goto EventScript_16B843 + end VermilionCity_Gym_EventScript_16B7EF:: @ 816B7EF - lockall - setvar VAR_0x8008, 9 - goto EventScript_16B843 - end + lockall + setvar VAR_0x8008, 9 + goto EventScript_16B843 + end VermilionCity_Gym_EventScript_16B7FB:: @ 816B7FB - lockall - setvar VAR_0x8008, 10 - goto EventScript_16B843 - end + lockall + setvar VAR_0x8008, 10 + goto EventScript_16B843 + end VermilionCity_Gym_EventScript_16B807:: @ 816B807 - lockall - setvar VAR_0x8008, 11 - goto EventScript_16B843 - end + lockall + setvar VAR_0x8008, 11 + goto EventScript_16B843 + end VermilionCity_Gym_EventScript_16B813:: @ 816B813 - lockall - setvar VAR_0x8008, 12 - goto EventScript_16B843 - end + lockall + setvar VAR_0x8008, 12 + goto EventScript_16B843 + end VermilionCity_Gym_EventScript_16B81F:: @ 816B81F - lockall - setvar VAR_0x8008, 13 - goto EventScript_16B843 - end + lockall + setvar VAR_0x8008, 13 + goto EventScript_16B843 + end VermilionCity_Gym_EventScript_16B82B:: @ 816B82B - lockall - setvar VAR_0x8008, 14 - goto EventScript_16B843 - end + lockall + setvar VAR_0x8008, 14 + goto EventScript_16B843 + end VermilionCity_Gym_EventScript_16B837:: @ 816B837 - lockall - setvar VAR_0x8008, 15 - goto EventScript_16B843 - end + lockall + setvar VAR_0x8008, 15 + goto EventScript_16B843 + end EventScript_16B843:: @ 816B843 - special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 - special sub_8112364 - copyvar VAR_0x8004, VAR_0x4000 - copyvar VAR_0x8005, VAR_0x4001 - checkflag FLAG_0x264 - goto_if 1, EventScript_16B8E5 - checkflag FLAG_0x001 - goto_if 1, EventScript_16B89E - compare_var_to_var VAR_0x8004, VAR_0x8008 - goto_if 1, EventScript_16B885 - loadword 0, gUnknown_8195289 - callstd 4 - releaseall - end + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + special sub_8112364 + copyvar VAR_0x8004, VAR_0x4000 + copyvar VAR_0x8005, VAR_0x4001 + checkflag FLAG_0x264 + goto_if 1, EventScript_16B8E5 + checkflag FLAG_0x001 + goto_if 1, EventScript_16B89E + compare_var_to_var VAR_0x8004, VAR_0x8008 + goto_if 1, EventScript_16B885 + loadword 0, gUnknown_8195289 + callstd 4 + releaseall + end EventScript_16B885:: @ 816B885 - loadword 0, gUnknown_81952A8 - callstd 4 - playse SE_PIN - waitse - call EventScript_16B6BC - special DrawWholeMapView - setflag FLAG_0x001 - releaseall - end + loadword 0, gUnknown_81952A8 + callstd 4 + playse SE_PIN + waitse + call EventScript_16B6BC + special DrawWholeMapView + setflag FLAG_0x001 + releaseall + end EventScript_16B89E:: @ 816B89E - compare_var_to_var VAR_0x8005, VAR_0x8008 - goto_if 1, EventScript_16B8CB - loadword 0, gUnknown_819536C - callstd 4 - clearflag FLAG_0x001 - special sub_80CADEC - copyvar VAR_0x4000, VAR_0x8004 - copyvar VAR_0x4001, VAR_0x8005 - call EventScript_16B8EF - special DrawWholeMapView - releaseall - end + compare_var_to_var VAR_0x8005, VAR_0x8008 + goto_if 1, EventScript_16B8CB + loadword 0, gUnknown_819536C + callstd 4 + clearflag FLAG_0x001 + special sub_80CADEC + copyvar VAR_0x4000, VAR_0x8004 + copyvar VAR_0x4001, VAR_0x8005 + call EventScript_16B8EF + special DrawWholeMapView + releaseall + end EventScript_16B8CB:: @ 816B8CB - loadword 0, gUnknown_8195330 - callstd 4 - closemessage - call EventScript_16B717 - special DrawWholeMapView - playse SE_FU_ZAKU2 - waitse - setflag FLAG_0x264 - releaseall - end + loadword 0, gUnknown_8195330 + callstd 4 + closemessage + call EventScript_16B717 + special DrawWholeMapView + playse SE_FU_ZAKU2 + waitse + setflag FLAG_0x264 + releaseall + end EventScript_16B8E5:: @ 816B8E5 - loadword 0, gUnknown_8195289 - callstd 4 - releaseall - end + loadword 0, gUnknown_8195289 + callstd 4 + releaseall + end EventScript_16B8EF:: @ 816B8EF - setmetatile 3, 6, 681, 1 - setmetatile 4, 6, 682, 1 - setmetatile 5, 6, 645, 1 - setmetatile 6, 6, 683, 1 - setmetatile 7, 6, 684, 1 - setmetatile 3, 7, 689, 1 - setmetatile 4, 7, 690, 1 - setmetatile 5, 7, 653, 1 - setmetatile 6, 7, 691, 1 - setmetatile 7, 7, 692, 1 - return + setmetatile 3, 6, 681, 1 + setmetatile 4, 6, 682, 1 + setmetatile 5, 6, 645, 1 + setmetatile 6, 6, 683, 1 + setmetatile 7, 6, 684, 1 + setmetatile 3, 7, 689, 1 + setmetatile 4, 7, 690, 1 + setmetatile 5, 7, 653, 1 + setmetatile 6, 7, 691, 1 + setmetatile 7, 7, 692, 1 + return VermilionCity_Gym_EventScript_16B94A:: @ 816B94A - setvar VAR_0x8004, 4 - setvar VAR_0x8005, 2 - special UpdatePickStateFromSpecialVar8005 - trainerbattle 1, 416, 0, Text_194BA4, Text_194E03, EventScript_16B97C - checkflag FLAG_0x231 - goto_if 0, EventScript_16B9AF - loadword 0, gUnknown_8194C8E - callstd 4 - release - end + setvar VAR_0x8004, 4 + setvar VAR_0x8005, 2 + special UpdatePickStateFromSpecialVar8005 + trainerbattle 1, 416, 0, Text_194BA4, Text_194E03, EventScript_16B97C + checkflag FLAG_0x231 + goto_if 0, EventScript_16B9AF + loadword 0, gUnknown_8194C8E + callstd 4 + release + end EventScript_16B97C:: @ 816B97C - setvar VAR_0x8004, 4 - setvar VAR_0x8005, 1 - special SetFlavorTextFlagFromSpecialVars - checkflag FLAG_0x23B - call_if 0, EventScript_16B9AB - clearflag FLAG_0x0A0 - setflag FLAG_0x4B2 - setflag 2082 - setvar VAR_0x8008, 3 - call EventScript_1A6B18 - goto EventScript_16B9AF - end + setvar VAR_0x8004, 4 + setvar VAR_0x8005, 1 + special SetFlavorTextFlagFromSpecialVars + checkflag FLAG_0x23B + call_if 0, EventScript_16B9AB + clearflag FLAG_0x0A0 + setflag FLAG_0x4B2 + setflag 2082 + setvar VAR_0x8008, 3 + call EventScript_1A6B18 + goto EventScript_16B9AF + end EventScript_16B9AB:: @ 816B9AB - clearflag FLAG_0x0A1 - return + clearflag FLAG_0x0A1 + return EventScript_16B9AF:: @ 816B9AF - loadword 0, gUnknown_8194CFA - callstd 4 - checkitemspace ITEM_TM34, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16B9F0 - additem ITEM_TM34, 1 - loadword 0, gUnknown_8194D87 - setorcopyvar VAR_0x8000, 322 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 257 - callstd 9 - setflag FLAG_0x231 - loadword 0, gUnknown_8194DA8 - callstd 4 - release - end + loadword 0, gUnknown_8194CFA + callstd 4 + checkitemspace ITEM_TM34, 1 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16B9F0 + additem ITEM_TM34, 1 + loadword 0, gUnknown_8194D87 + setorcopyvar VAR_0x8000, 322 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 257 + callstd 9 + setflag FLAG_0x231 + loadword 0, gUnknown_8194DA8 + callstd 4 + release + end EventScript_16B9F0:: @ 816B9F0 - loadword 0, gUnknown_8194DE3 - callstd 4 - release - end + loadword 0, gUnknown_8194DE3 + callstd 4 + release + end VermilionCity_Gym_EventScript_16B9FA:: @ 816B9FA - trainerbattle 0, 141, 0, Text_194FBD, Text_194FF1 - setvar VAR_0x8004, 4 - setvar VAR_0x8005, 4 - special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_8195004 - callstd 6 - end + trainerbattle 0, 141, 0, Text_194FBD, Text_194FF1 + setvar VAR_0x8004, 4 + setvar VAR_0x8005, 4 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_8195004 + callstd 6 + end VermilionCity_Gym_EventScript_16BA1E:: @ 816BA1E - trainerbattle 0, 220, 0, Text_194F1F, Text_194F6F - loadword 0, gUnknown_8194F76 - callstd 6 - end + trainerbattle 0, 220, 0, Text_194F1F, Text_194F6F + loadword 0, gUnknown_8194F76 + callstd 6 + end VermilionCity_Gym_EventScript_16BA35:: @ 816BA35 - trainerbattle 2, 423, 0, Text_194E57, Text_194EA5, EventScript_16BA5D - setvar VAR_0x8004, 4 - setvar VAR_0x8005, 3 - special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_8194EBD - callstd 6 - end + trainerbattle 2, 423, 0, Text_194E57, Text_194EA5, EventScript_16BA5D + setvar VAR_0x8004, 4 + setvar VAR_0x8005, 3 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_8194EBD + callstd 6 + end EventScript_16BA5D:: @ 816BA5D - setvar VAR_0x8004, 4 - setvar VAR_0x8005, 2 - special SetFlavorTextFlagFromSpecialVars - release - end + setvar VAR_0x8004, 4 + setvar VAR_0x8005, 2 + special SetFlavorTextFlagFromSpecialVars + release + end VermilionCity_Gym_EventScript_16BA6C:: @ 816BA6C - lock - faceplayer - checkflag FLAG_0x4B2 - goto_if 1, EventScript_16BA81 - loadword 0, gUnknown_81950B4 - callstd 4 - release - end + lock + faceplayer + checkflag FLAG_0x4B2 + goto_if 1, EventScript_16BA81 + loadword 0, gUnknown_81950B4 + callstd 4 + release + end EventScript_16BA81:: @ 816BA81 - loadword 0, gUnknown_81951EC - callstd 4 - release - end + loadword 0, gUnknown_81951EC + callstd 4 + release + end VermilionCity_Gym_EventScript_16BA8B:: @ 816BA8B - lockall - checkflag 2082 - goto_if 1, EventScript_16BA9F - loadword 0, gUnknown_819520B - callstd 4 - releaseall - end + lockall + checkflag 2082 + goto_if 1, EventScript_16BA9F + loadword 0, gUnknown_819520B + callstd 4 + releaseall + end EventScript_16BA9F:: @ 816BA9F - loadword 0, gUnknown_8195248 - callstd 4 - releaseall - end + loadword 0, gUnknown_8195248 + callstd 4 + releaseall + end diff --git a/data/maps/VermilionCity_House1/scripts.inc b/data/maps/VermilionCity_House1/scripts.inc index 984961c29..870b24620 100644 --- a/data/maps/VermilionCity_House1/scripts.inc +++ b/data/maps/VermilionCity_House1/scripts.inc @@ -1,46 +1,46 @@ VermilionCity_House1_MapScripts:: @ 816B3A6 - .byte 0 + .byte 0 VermilionCity_House1_EventScript_16B3A7:: @ 816B3A7 - lock - faceplayer - checkflag FLAG_0x240 - goto_if 1, EventScript_16B3CF - loadword 0, gUnknown_8193EC1 - callstd 5 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16B3D9 - loadword 0, gUnknown_8194028 - callstd 4 - release - end + lock + faceplayer + checkflag FLAG_0x240 + goto_if 1, EventScript_16B3CF + loadword 0, gUnknown_8193EC1 + callstd 5 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16B3D9 + loadword 0, gUnknown_8194028 + callstd 4 + release + end EventScript_16B3CF:: @ 816B3CF - loadword 0, gUnknown_8194045 - callstd 4 - release - end + loadword 0, gUnknown_8194045 + callstd 4 + release + end EventScript_16B3D9:: @ 816B3D9 - checkitemspace ITEM_OLD_ROD, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16B41A - additem ITEM_OLD_ROD, 1 - loadword 0, gUnknown_8193F2A - callstd 4 - loadword 0, gUnknown_8193F81 - setorcopyvar VAR_0x8000, 262 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 257 - callstd 9 - setflag FLAG_0x240 - loadword 0, gUnknown_8193FAF - callstd 4 - release - end + checkitemspace ITEM_OLD_ROD, 1 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16B41A + additem ITEM_OLD_ROD, 1 + loadword 0, gUnknown_8193F2A + callstd 4 + loadword 0, gUnknown_8193F81 + setorcopyvar VAR_0x8000, 262 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 257 + callstd 9 + setflag FLAG_0x240 + loadword 0, gUnknown_8193FAF + callstd 4 + release + end EventScript_16B41A:: @ 816B41A - loadword 0, gUnknown_819406F - callstd 4 - release - end + loadword 0, gUnknown_819406F + callstd 4 + release + end diff --git a/data/maps/VermilionCity_House3/scripts.inc b/data/maps/VermilionCity_House3/scripts.inc index 0624992be..19ca4c1d6 100644 --- a/data/maps/VermilionCity_House3/scripts.inc +++ b/data/maps/VermilionCity_House3/scripts.inc @@ -1,28 +1,28 @@ VermilionCity_House3_MapScripts:: @ 816BAA9 - .byte 0 + .byte 0 VermilionCity_House3_EventScript_16BAAA:: @ 816BAAA - loadword 0, gUnknown_81953AF - callstd 2 - end + loadword 0, gUnknown_81953AF + callstd 2 + end VermilionCity_House3_EventScript_16BAB3:: @ 816BAB3 - loadword 0, gUnknown_8195471 - callstd 2 - end + loadword 0, gUnknown_8195471 + callstd 2 + end VermilionCity_House3_EventScript_16BABC:: @ 816BABC - lock - faceplayer - waitse - playmoncry SPECIES_PIDGEY, 0 - loadword 0, gUnknown_81953EE - callstd 4 - waitmoncry - release - end + lock + faceplayer + waitse + playmoncry SPECIES_PIDGEY, 0 + loadword 0, gUnknown_81953EE + callstd 4 + waitmoncry + release + end VermilionCity_House3_EventScript_16BACF:: @ 816BACF - loadword 0, gUnknown_8195400 - callstd 3 - end + loadword 0, gUnknown_8195400 + callstd 3 + end diff --git a/data/maps/VermilionCity_Mart/scripts.inc b/data/maps/VermilionCity_Mart/scripts.inc index 712e0c6df..7b24e8785 100644 --- a/data/maps/VermilionCity_Mart/scripts.inc +++ b/data/maps/VermilionCity_Mart/scripts.inc @@ -1,39 +1,39 @@ VermilionCity_Mart_MapScripts:: @ 816B653 - .byte 0 + .byte 0 VermilionCity_Mart_EventScript_16B654:: @ 816B654 - loadword 0, gUnknown_8194B65 - callstd 2 - end + loadword 0, gUnknown_8194B65 + callstd 2 + end VermilionCity_Mart_EventScript_16B65D:: @ 816B65D - loadword 0, gUnknown_8194A77 - callstd 2 - end + loadword 0, gUnknown_8194A77 + callstd 2 + end VermilionCity_Mart_EventScript_16B666:: @ 816B666 - special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 - lock - faceplayer - message Text_1A6211 - waitmessage - pokemart Items_16B68C - loadword 0, gUnknown_81A5190 - callstd 4 - release - end + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + lock + faceplayer + message Text_1A6211 + waitmessage + pokemart Items_16B68C + loadword 0, gUnknown_81A5190 + callstd 4 + release + end - .align 2 + .align 2 Items_16B68C:: @ 816B68C - .2byte ITEM_POKE_BALL - .2byte ITEM_SUPER_POTION - .2byte ITEM_ANTIDOTE - .2byte ITEM_PARALYZE_HEAL - .2byte ITEM_AWAKENING - .2byte ITEM_ICE_HEAL - .2byte ITEM_REPEL - .2byte ITEM_NONE - release - end + .2byte ITEM_POKE_BALL + .2byte ITEM_SUPER_POTION + .2byte ITEM_ANTIDOTE + .2byte ITEM_PARALYZE_HEAL + .2byte ITEM_AWAKENING + .2byte ITEM_ICE_HEAL + .2byte ITEM_REPEL + .2byte ITEM_NONE + release + end diff --git a/data/maps/VermilionCity_PokemonCenter_1F/scripts.inc b/data/maps/VermilionCity_PokemonCenter_1F/scripts.inc index d6a5c01f2..0cf7739da 100644 --- a/data/maps/VermilionCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/VermilionCity_PokemonCenter_1F/scripts.inc @@ -1,30 +1,30 @@ VermilionCity_PokemonCenter_1F_MapScripts:: @ 816B424 - map_script 3, VermilionCity_PokemonCenter_1F_MapScript1_16B42F - map_script 5, VermilionCity_PokemonCenter_1F_MapScript2_1BC05C - .byte 0 + map_script 3, VermilionCity_PokemonCenter_1F_MapScript1_16B42F + map_script 5, VermilionCity_PokemonCenter_1F_MapScript2_1BC05C + .byte 0 VermilionCity_PokemonCenter_1F_MapScript1_16B42F:: @ 816B42F - setrespawn 6 - end + setrespawn 6 + end VermilionCity_PokemonCenter_1F_EventScript_16B433:: @ 816B433 - lock - faceplayer - call EventScript_1A6578 - release - end + lock + faceplayer + call EventScript_1A6578 + release + end VermilionCity_PokemonCenter_1F_EventScript_16B43C:: @ 816B43C - loadword 0, gUnknown_8194145 - callstd 2 - end + loadword 0, gUnknown_8194145 + callstd 2 + end VermilionCity_PokemonCenter_1F_EventScript_16B445:: @ 816B445 - loadword 0, gUnknown_81940AF - callstd 2 - end + loadword 0, gUnknown_81940AF + callstd 2 + end VermilionCity_PokemonCenter_1F_EventScript_16B44E:: @ 816B44E - loadword 0, gUnknown_8194180 - callstd 2 - end + loadword 0, gUnknown_8194180 + callstd 2 + end diff --git a/data/maps/VermilionCity_PokemonCenter_2F/scripts.inc b/data/maps/VermilionCity_PokemonCenter_2F/scripts.inc index d6ddecd4a..b64ac0660 100644 --- a/data/maps/VermilionCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/VermilionCity_PokemonCenter_2F/scripts.inc @@ -1,18 +1,18 @@ VermilionCity_PokemonCenter_2F_MapScripts:: @ 816B457 - map_script 2, VermilionCity_PokemonCenter_2F_MapScript1_1BB2A3 - map_script 4, VermilionCity_PokemonCenter_2F_MapScript2_1BB1ED - map_script 1, VermilionCity_PokemonCenter_2F_MapScript3_1BB237 - map_script 3, VermilionCity_PokemonCenter_2F_MapScript4_1BB1B4 - .byte 0 + map_script 2, VermilionCity_PokemonCenter_2F_MapScript1_1BB2A3 + map_script 4, VermilionCity_PokemonCenter_2F_MapScript2_1BB1ED + map_script 1, VermilionCity_PokemonCenter_2F_MapScript3_1BB237 + map_script 3, VermilionCity_PokemonCenter_2F_MapScript4_1BB1B4 + .byte 0 VermilionCity_PokemonCenter_2F_EventScript_16B46C:: @ 816B46C - call EventScript_1BB4A3 - end + call EventScript_1BB4A3 + end EventScript_16B472:: @ 816B472 - call EventScript_1BB6AB - end + call EventScript_1BB6AB + end EventScript_16B478:: @ 816B478 - call EventScript_1BB7DE - end + call EventScript_1BB7DE + end diff --git a/data/maps/VermilionCity_PokemonFanClub/scripts.inc b/data/maps/VermilionCity_PokemonFanClub/scripts.inc index d963b6ef3..43d82659b 100644 --- a/data/maps/VermilionCity_PokemonFanClub/scripts.inc +++ b/data/maps/VermilionCity_PokemonFanClub/scripts.inc @@ -1,191 +1,191 @@ VermilionCity_PokemonFanClub_MapScripts:: @ 816B47E - .byte 0 + .byte 0 VermilionCity_PokemonFanClub_EventScript_16B47F:: @ 816B47F - lock - faceplayer - checkflag FLAG_0x241 - goto_if 1, EventScript_16B4A7 - loadword 0, gUnknown_819457E - callstd 5 - compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16B4B1 - loadword 0, gUnknown_8194860 - callstd 4 - release - end + lock + faceplayer + checkflag FLAG_0x241 + goto_if 1, EventScript_16B4A7 + loadword 0, gUnknown_819457E + callstd 5 + compare_var_to_value VAR_RESULT, 1 + goto_if 1, EventScript_16B4B1 + loadword 0, gUnknown_8194860 + callstd 4 + release + end EventScript_16B4A7:: @ 816B4A7 - loadword 0, gUnknown_819488E - callstd 4 - release - end + loadword 0, gUnknown_819488E + callstd 4 + release + end EventScript_16B4B1:: @ 816B4B1 - loadword 0, gUnknown_8194628 - callstd 4 - checkitemspace ITEM_BIKE_VOUCHER, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16B4F2 - setflag FLAG_0x241 - additem ITEM_BIKE_VOUCHER, 1 - loadword 0, gUnknown_819474E - setorcopyvar VAR_0x8000, 352 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 318 - callstd 9 - loadword 0, gUnknown_819477C - callstd 4 - release - end + loadword 0, gUnknown_8194628 + callstd 4 + checkitemspace ITEM_BIKE_VOUCHER, 1 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16B4F2 + setflag FLAG_0x241 + additem ITEM_BIKE_VOUCHER, 1 + loadword 0, gUnknown_819474E + setorcopyvar VAR_0x8000, 352 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 318 + callstd 9 + loadword 0, gUnknown_819477C + callstd 4 + release + end EventScript_16B4F2:: @ 816B4F2 - loadword 0, gUnknown_81948D2 - callstd 4 - release - end + loadword 0, gUnknown_81948D2 + callstd 4 + release + end VermilionCity_PokemonFanClub_EventScript_16B4FC:: @ 816B4FC - lock - faceplayer - checkflag 2092 - goto_if 1, EventScript_16B511 - loadword 0, gUnknown_81948E6 - callstd 4 - release - end + lock + faceplayer + checkflag 2092 + goto_if 1, EventScript_16B511 + loadword 0, gUnknown_81948E6 + callstd 4 + release + end EventScript_16B511:: @ 816B511 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 1 - special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_8194960 - callstd 4 - release - end + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 1 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_8194960 + callstd 4 + release + end VermilionCity_PokemonFanClub_EventScript_16B528:: @ 816B528 - lock - faceplayer - checkflag FLAG_0x003 - goto_if 1, EventScript_16B54B - loadword 0, gUnknown_81944CC - callstd 4 - closemessage - applymovement 5, Movement_1A75E5 - waitmovement 0 - setflag FLAG_0x002 - release - end + lock + faceplayer + checkflag FLAG_0x003 + goto_if 1, EventScript_16B54B + loadword 0, gUnknown_81944CC + callstd 4 + closemessage + applymovement 5, Movement_1A75E5 + waitmovement 0 + setflag FLAG_0x002 + release + end EventScript_16B54B:: @ 816B54B - loadword 0, gUnknown_8194518 - callstd 4 - closemessage - applymovement 5, Movement_1A75E5 - waitmovement 0 - clearflag FLAG_0x003 - release - end + loadword 0, gUnknown_8194518 + callstd 4 + closemessage + applymovement 5, Movement_1A75E5 + waitmovement 0 + clearflag FLAG_0x003 + release + end VermilionCity_PokemonFanClub_EventScript_16B563:: @ 816B563 - lock - faceplayer - checkflag FLAG_0x002 - goto_if 1, EventScript_16B586 - loadword 0, gUnknown_819446F - callstd 4 - closemessage - applymovement 6, Movement_1A75E5 - waitmovement 0 - setflag FLAG_0x003 - release - end + lock + faceplayer + checkflag FLAG_0x002 + goto_if 1, EventScript_16B586 + loadword 0, gUnknown_819446F + callstd 4 + closemessage + applymovement 6, Movement_1A75E5 + waitmovement 0 + setflag FLAG_0x003 + release + end EventScript_16B586:: @ 816B586 - loadword 0, gUnknown_819449C - callstd 4 - closemessage - applymovement 6, Movement_1A75E5 - waitmovement 0 - clearflag FLAG_0x002 - release - end + loadword 0, gUnknown_819449C + callstd 4 + closemessage + applymovement 6, Movement_1A75E5 + waitmovement 0 + clearflag FLAG_0x002 + release + end VermilionCity_PokemonFanClub_EventScript_16B59E:: @ 816B59E - lock - faceplayer - waitse - playmoncry SPECIES_PIKACHU, 0 - loadword 0, gUnknown_819455A - callstd 4 - waitmoncry - release - end + lock + faceplayer + waitse + playmoncry SPECIES_PIKACHU, 0 + loadword 0, gUnknown_819455A + callstd 4 + waitmoncry + release + end VermilionCity_PokemonFanClub_EventScript_16B5B1:: @ 816B5B1 - lock - faceplayer - waitse - playmoncry SPECIES_SEEL, 0 - loadword 0, gUnknown_8194571 - callstd 4 - waitmoncry - release - end + lock + faceplayer + waitse + playmoncry SPECIES_SEEL, 0 + loadword 0, gUnknown_8194571 + callstd 4 + waitmoncry + release + end VermilionCity_PokemonFanClub_EventScript_16B5C4:: @ 816B5C4 - loadword 0, gUnknown_8194910 - callstd 3 - end + loadword 0, gUnknown_8194910 + callstd 3 + end VermilionCity_PokemonFanClub_EventScript_16B5CD:: @ 816B5CD - loadword 0, gUnknown_819493D - callstd 3 - end + loadword 0, gUnknown_819493D + callstd 3 + end VermilionCity_House2_MapScripts:: @ 816B5D6 - .byte 0 + .byte 0 VermilionCity_House2_EventScript_16B5D7:: @ 816B5D7 - lock - faceplayer - setvar VAR_0x8008, 3 - call EventScript_1A8CAD - checkflag FLAG_0x24D - goto_if 1, EventScript_16B649 - loadword 0, gUnknown_81949CB - callstd 5 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16B631 - call EventScript_1A8CBD - compare_var_to_value VAR_0x8004, 6 - goto_if 4, EventScript_16B631 - call EventScript_1A8CC9 - compare_var_to_var VAR_RESULT, VAR_0x8009 - goto_if 5, EventScript_16B63B - call EventScript_1A8CD9 - loadword 0, gUnknown_8194A44 - callstd 4 - setflag FLAG_0x24D - release - end + lock + faceplayer + setvar VAR_0x8008, 3 + call EventScript_1A8CAD + checkflag FLAG_0x24D + goto_if 1, EventScript_16B649 + loadword 0, gUnknown_81949CB + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16B631 + call EventScript_1A8CBD + compare_var_to_value VAR_0x8004, 6 + goto_if 4, EventScript_16B631 + call EventScript_1A8CC9 + compare_var_to_var VAR_RESULT, VAR_0x8009 + goto_if 5, EventScript_16B63B + call EventScript_1A8CD9 + loadword 0, gUnknown_8194A44 + callstd 4 + setflag FLAG_0x24D + release + end EventScript_16B631:: @ 816B631 - loadword 0, gUnknown_81949FD - callstd 4 - release - end + loadword 0, gUnknown_81949FD + callstd 4 + release + end EventScript_16B63B:: @ 816B63B - getspeciesname 0, 32777 - loadword 0, gUnknown_8194A0D - callstd 4 - release - end + getspeciesname 0, 32777 + loadword 0, gUnknown_8194A0D + callstd 4 + release + end EventScript_16B649:: @ 816B649 - loadword 0, gUnknown_8194A4F - callstd 4 - release - end + loadword 0, gUnknown_8194A4F + callstd 4 + release + end diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc index fbd89857b..e5afd3e26 100644 --- a/data/maps/VictoryRoad_1F/scripts.inc +++ b/data/maps/VictoryRoad_1F/scripts.inc @@ -1,48 +1,48 @@ VictoryRoad_1F_MapScripts:: @ 8160F05 - map_script 1, VictoryRoad_1F_MapScript1_160F10 - map_script 3, VictoryRoad_1F_MapScript2_160F2F - .byte 0 + map_script 1, VictoryRoad_1F_MapScript1_160F10 + map_script 3, VictoryRoad_1F_MapScript2_160F2F + .byte 0 VictoryRoad_1F_MapScript1_160F10:: @ 8160F10 - compare_var_to_value VAR_0x4064, 100 - call_if 5, EventScript_160F1C - end + compare_var_to_value VAR_0x4064, 100 + call_if 5, EventScript_160F1C + end EventScript_160F1C:: @ 8160F1C - setmetatile 12, 14, 775, 1 - setmetatile 12, 15, 791, 1 - return + setmetatile 12, 14, 775, 1 + setmetatile 12, 15, 791, 1 + return VictoryRoad_1F_MapScript2_160F2F:: @ 8160F2F - setworldmapflag 2218 - end + setworldmapflag 2218 + end VictoryRoad_1F_EventScript_160F33:: @ 8160F33 - lockall - compare_var_to_value VAR_0x4064, 100 - goto_if 1, EventScript_160F62 - setmetatile 12, 14, 721, 0 - setmetatile 12, 15, 737, 0 - playse SE_MU_PACHI - special DrawWholeMapView - waitse - moveobjectoffscreen 5 - setvar VAR_0x4064, 100 - releaseall - end + lockall + compare_var_to_value VAR_0x4064, 100 + goto_if 1, EventScript_160F62 + setmetatile 12, 14, 721, 0 + setmetatile 12, 15, 737, 0 + playse SE_MU_PACHI + special DrawWholeMapView + waitse + moveobjectoffscreen 5 + setvar VAR_0x4064, 100 + releaseall + end EventScript_160F62:: @ 8160F62 - releaseall - end + releaseall + end VictoryRoad_1F_EventScript_160F64:: @ 8160F64 - trainerbattle 0, 406, 0, Text_174710, Text_174738 - loadword 0, gUnknown_8174744 - callstd 6 - end + trainerbattle 0, 406, 0, Text_174710, Text_174738 + loadword 0, gUnknown_8174744 + callstd 6 + end VictoryRoad_1F_EventScript_160F7B:: @ 8160F7B - trainerbattle 0, 396, 0, Text_174784, Text_1747B8 - loadword 0, gUnknown_81747C8 - callstd 6 - end + trainerbattle 0, 396, 0, Text_174784, Text_1747B8 + loadword 0, gUnknown_81747C8 + callstd 6 + end diff --git a/data/maps/VictoryRoad_2F/scripts.inc b/data/maps/VictoryRoad_2F/scripts.inc index 20476dac4..14e8f60d8 100644 --- a/data/maps/VictoryRoad_2F/scripts.inc +++ b/data/maps/VictoryRoad_2F/scripts.inc @@ -1,86 +1,86 @@ VictoryRoad_2F_MapScripts:: @ 8160F92 - map_script 1, VictoryRoad_2F_MapScript1_160F98 - .byte 0 + map_script 1, VictoryRoad_2F_MapScript1_160F98 + .byte 0 VictoryRoad_2F_MapScript1_160F98:: @ 8160F98 - compare_var_to_value VAR_0x4065, 100 - call_if 5, EventScript_160FAF - compare_var_to_value VAR_0x4066, 100 - call_if 5, EventScript_160FC2 - end + compare_var_to_value VAR_0x4065, 100 + call_if 5, EventScript_160FAF + compare_var_to_value VAR_0x4066, 100 + call_if 5, EventScript_160FC2 + end EventScript_160FAF:: @ 8160FAF - setmetatile 13, 10, 775, 1 - setmetatile 13, 11, 791, 1 - return + setmetatile 13, 10, 775, 1 + setmetatile 13, 11, 791, 1 + return EventScript_160FC2:: @ 8160FC2 - setmetatile 33, 16, 775, 1 - setmetatile 33, 17, 791, 1 - return + setmetatile 33, 16, 775, 1 + setmetatile 33, 17, 791, 1 + return VictoryRoad_2F_EventScript_160FD5:: @ 8160FD5 - lockall - compare_var_to_value VAR_0x4065, 100 - goto_if 1, EventScript_161004 - setmetatile 13, 10, 721, 0 - setmetatile 13, 11, 737, 0 - playse SE_MU_PACHI - special DrawWholeMapView - waitse - moveobjectoffscreen 11 - setvar VAR_0x4065, 100 - releaseall - end + lockall + compare_var_to_value VAR_0x4065, 100 + goto_if 1, EventScript_161004 + setmetatile 13, 10, 721, 0 + setmetatile 13, 11, 737, 0 + playse SE_MU_PACHI + special DrawWholeMapView + waitse + moveobjectoffscreen 11 + setvar VAR_0x4065, 100 + releaseall + end EventScript_161004:: @ 8161004 - releaseall - end + releaseall + end VictoryRoad_2F_EventScript_161006:: @ 8161006 - lockall - compare_var_to_value VAR_0x4066, 100 - goto_if 1, EventScript_161035 - setmetatile 33, 16, 721, 0 - setmetatile 33, 17, 737, 0 - playse SE_MU_PACHI - special DrawWholeMapView - waitse - moveobjectoffscreen 12 - setvar VAR_0x4066, 100 - releaseall - end + lockall + compare_var_to_value VAR_0x4066, 100 + goto_if 1, EventScript_161035 + setmetatile 33, 16, 721, 0 + setmetatile 33, 17, 737, 0 + playse SE_MU_PACHI + special DrawWholeMapView + waitse + moveobjectoffscreen 12 + setvar VAR_0x4066, 100 + releaseall + end EventScript_161035:: @ 8161035 - releaseall - end + releaseall + end VictoryRoad_2F_EventScript_161037:: @ 8161037 - trainerbattle 0, 167, 0, Text_1747EF, Text_17482C - loadword 0, gUnknown_817483E - callstd 6 - end + trainerbattle 0, 167, 0, Text_1747EF, Text_17482C + loadword 0, gUnknown_817483E + callstd 6 + end VictoryRoad_2F_EventScript_16104E:: @ 816104E - trainerbattle 0, 325, 0, Text_174877, Text_1748B4 - loadword 0, gUnknown_81748BB - callstd 6 - end + trainerbattle 0, 325, 0, Text_174877, Text_1748B4 + loadword 0, gUnknown_81748BB + callstd 6 + end VictoryRoad_2F_EventScript_161065:: @ 8161065 - trainerbattle 0, 287, 0, Text_1748EE, Text_17491B - loadword 0, gUnknown_8174927 - callstd 6 - end + trainerbattle 0, 287, 0, Text_1748EE, Text_17491B + loadword 0, gUnknown_8174927 + callstd 6 + end VictoryRoad_2F_EventScript_16107C:: @ 816107C - trainerbattle 0, 290, 0, Text_174995, Text_1749B0 - loadword 0, gUnknown_81749BB - callstd 6 - end + trainerbattle 0, 290, 0, Text_174995, Text_1749B0 + loadword 0, gUnknown_81749BB + callstd 6 + end VictoryRoad_2F_EventScript_161093:: @ 8161093 - trainerbattle 0, 298, 0, Text_174942, Text_17495A - loadword 0, gUnknown_8174969 - callstd 6 - end + trainerbattle 0, 298, 0, Text_174942, Text_17495A + loadword 0, gUnknown_8174969 + callstd 6 + end diff --git a/data/maps/VictoryRoad_3F/scripts.inc b/data/maps/VictoryRoad_3F/scripts.inc index 5172cbba9..eadeb1632 100644 --- a/data/maps/VictoryRoad_3F/scripts.inc +++ b/data/maps/VictoryRoad_3F/scripts.inc @@ -1,68 +1,68 @@ VictoryRoad_3F_MapScripts:: @ 81610AA - map_script 1, VictoryRoad_3F_MapScript1_1610B0 - .byte 0 + map_script 1, VictoryRoad_3F_MapScript1_1610B0 + .byte 0 VictoryRoad_3F_MapScript1_1610B0:: @ 81610B0 - compare_var_to_value VAR_0x4067, 100 - call_if 5, EventScript_1610BC - end + compare_var_to_value VAR_0x4067, 100 + call_if 5, EventScript_1610BC + end EventScript_1610BC:: @ 81610BC - setmetatile 12, 12, 775, 1 - setmetatile 12, 13, 791, 1 - return + setmetatile 12, 12, 775, 1 + setmetatile 12, 13, 791, 1 + return VictoryRoad_3F_EventScript_1610CF:: @ 81610CF - lockall - compare_var_to_value VAR_0x4067, 100 - goto_if 1, EventScript_161101 - setmetatile 12, 12, 721, 0 - setmetatile 12, 13, 737, 0 - playse SE_MU_PACHI - special DrawWholeMapView - waitse - moveobjectoffscreen 7 - moveobjectoffscreen 10 - setvar VAR_0x4067, 100 - releaseall - end + lockall + compare_var_to_value VAR_0x4067, 100 + goto_if 1, EventScript_161101 + setmetatile 12, 12, 721, 0 + setmetatile 12, 13, 737, 0 + playse SE_MU_PACHI + special DrawWholeMapView + waitse + moveobjectoffscreen 7 + moveobjectoffscreen 10 + setvar VAR_0x4067, 100 + releaseall + end EventScript_161101:: @ 8161101 - releaseall - end + releaseall + end VictoryRoad_3F_EventScript_161103:: @ 8161103 - trainerbattle 0, 393, 0, Text_174B60, Text_174B83 - loadword 0, gUnknown_8174B99 - callstd 6 - end + trainerbattle 0, 393, 0, Text_174B60, Text_174B83 + loadword 0, gUnknown_8174B99 + callstd 6 + end VictoryRoad_3F_EventScript_16111A:: @ 816111A - trainerbattle 0, 394, 0, Text_174C8A, Text_174CA9 - loadword 0, gUnknown_8174CBD - callstd 6 - end + trainerbattle 0, 394, 0, Text_174C8A, Text_174CA9 + loadword 0, gUnknown_8174CBD + callstd 6 + end VictoryRoad_3F_EventScript_161131:: @ 8161131 - trainerbattle 0, 403, 0, Text_174C30, Text_174C5A - loadword 0, gUnknown_8174C67 - callstd 6 - end + trainerbattle 0, 403, 0, Text_174C30, Text_174C5A + loadword 0, gUnknown_8174C67 + callstd 6 + end VictoryRoad_3F_EventScript_161148:: @ 8161148 - trainerbattle 0, 404, 0, Text_174BCA, Text_174BF4 - loadword 0, gUnknown_8174C03 - callstd 6 - end + trainerbattle 0, 404, 0, Text_174BCA, Text_174BF4 + loadword 0, gUnknown_8174C03 + callstd 6 + end VictoryRoad_3F_EventScript_16115F:: @ 816115F - trainerbattle 4, 485, 0, Text_174D0C, Text_174D45, Text_174D96 - loadword 0, gUnknown_8174D64 - callstd 6 - end + trainerbattle 4, 485, 0, Text_174D0C, Text_174D45, Text_174D96 + loadword 0, gUnknown_8174D64 + callstd 6 + end VictoryRoad_3F_EventScript_16117A:: @ 816117A - trainerbattle 4, 485, 0, Text_174E08, Text_174E39, Text_174E8D - loadword 0, gUnknown_8174E48 - callstd 6 - end + trainerbattle 4, 485, 0, Text_174E08, Text_174E39, Text_174E8D + loadword 0, gUnknown_8174E48 + callstd 6 + end diff --git a/data/maps/ViridianCity/scripts.inc b/data/maps/ViridianCity/scripts.inc index 2f8f28b74..07f567ccf 100644 --- a/data/maps/ViridianCity/scripts.inc +++ b/data/maps/ViridianCity/scripts.inc @@ -3,7 +3,7 @@ ViridianCity_MapScripts:: @ 81658D3 .byte 0 ViridianCity_MapScript1_1658D9:: @ 81658D9 - setworldmapflag 2193 + setworldmapflag FLAG_WORLD_MAP_VIRIDIAN_CITY compare_var_to_value VAR_0x4051, 0 call_if 1, EventScript_165920 compare_var_to_value VAR_0x4051, 1 diff --git a/data/maps/ViridianCity_Gym/scripts.inc b/data/maps/ViridianCity_Gym/scripts.inc index bd65c80e5..2ff6b010b 100644 --- a/data/maps/ViridianCity_Gym/scripts.inc +++ b/data/maps/ViridianCity_Gym/scripts.inc @@ -1,137 +1,137 @@ ViridianCity_Gym_MapScripts:: @ 8169EC9 - .byte 0 + .byte 0 ViridianCity_Gym_EventScript_169ECA:: @ 8169ECA - setvar VAR_0x8004, 15 - setvar VAR_0x8005, 2 - special UpdatePickStateFromSpecialVar8005 - trainerbattle 1, 350, 0, Text_18F352, Text_18F43F, EventScript_169F04 - checkflag FLAG_0x298 - goto_if 0, EventScript_169F2F - loadword 0, gUnknown_818F4A2 - callstd 4 - closemessage - fadescreen 1 - removeobject 8 - fadescreen 0 - release - end + setvar VAR_0x8004, 15 + setvar VAR_0x8005, 2 + special UpdatePickStateFromSpecialVar8005 + trainerbattle 1, 350, 0, Text_18F352, Text_18F43F, EventScript_169F04 + checkflag FLAG_0x298 + goto_if 0, EventScript_169F2F + loadword 0, gUnknown_818F4A2 + callstd 4 + closemessage + fadescreen 1 + removeobject 8 + fadescreen 0 + release + end EventScript_169F04:: @ 8169F04 - setvar VAR_0x8004, 15 - setvar VAR_0x8005, 3 - special SetFlavorTextFlagFromSpecialVars - setflag FLAG_0x0AD - setflag FLAG_0x4B7 - setflag 2087 - setvar VAR_0x4054, 3 - setvar VAR_0x8008, 8 - call EventScript_1A6B18 - goto EventScript_169F2F - end + setvar VAR_0x8004, 15 + setvar VAR_0x8005, 3 + special SetFlavorTextFlagFromSpecialVars + setflag FLAG_0x0AD + setflag FLAG_0x4B7 + setflag 2087 + setvar VAR_0x4054, 3 + setvar VAR_0x8008, 8 + call EventScript_1A6B18 + goto EventScript_169F2F + end EventScript_169F2F:: @ 8169F2F - loadword 0, gUnknown_818F586 - callstd 4 - checkitemspace ITEM_TM26, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_169F70 - additem ITEM_TM26, 1 - loadword 0, gUnknown_818F675 - setorcopyvar VAR_0x8000, 314 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 257 - callstd 9 - setflag FLAG_0x298 - loadword 0, gUnknown_818F695 - callstd 4 - release - end + loadword 0, gUnknown_818F586 + callstd 4 + checkitemspace ITEM_TM26, 1 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_169F70 + additem ITEM_TM26, 1 + loadword 0, gUnknown_818F675 + setorcopyvar VAR_0x8000, 314 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 257 + callstd 9 + setflag FLAG_0x298 + loadword 0, gUnknown_818F695 + callstd 4 + release + end EventScript_169F70:: @ 8169F70 - loadword 0, gUnknown_818F71B - callstd 4 - release - end + loadword 0, gUnknown_818F71B + callstd 4 + release + end ViridianCity_Gym_EventScript_169F7A:: @ 8169F7A - trainerbattle 0, 296, 0, Text_18F7F3, Text_18F824 - loadword 0, gUnknown_818F840 - callstd 6 - end + trainerbattle 0, 296, 0, Text_18F7F3, Text_18F824 + loadword 0, gUnknown_818F840 + callstd 6 + end ViridianCity_Gym_EventScript_169F91:: @ 8169F91 - trainerbattle 0, 297, 0, Text_18F98A, Text_18F9BB - loadword 0, gUnknown_818F9CC - callstd 6 - end + trainerbattle 0, 297, 0, Text_18F98A, Text_18F9BB + loadword 0, gUnknown_818F9CC + callstd 6 + end ViridianCity_Gym_EventScript_169FA8:: @ 8169FA8 - trainerbattle 0, 322, 0, Text_18F7AD, Text_18F7D6 - loadword 0, gUnknown_818F7DD - callstd 6 - end + trainerbattle 0, 322, 0, Text_18F7AD, Text_18F7D6 + loadword 0, gUnknown_818F7DD + callstd 6 + end ViridianCity_Gym_EventScript_169FBF:: @ 8169FBF - trainerbattle 0, 323, 0, Text_18F86C, Text_18F899 - loadword 0, gUnknown_818F8A0 - callstd 6 - end + trainerbattle 0, 323, 0, Text_18F86C, Text_18F899 + loadword 0, gUnknown_818F8A0 + callstd 6 + end ViridianCity_Gym_EventScript_169FD6:: @ 8169FD6 - trainerbattle 0, 324, 0, Text_18F92C, Text_18F95A - loadword 0, gUnknown_818F960 - callstd 6 - end + trainerbattle 0, 324, 0, Text_18F92C, Text_18F95A + loadword 0, gUnknown_818F960 + callstd 6 + end ViridianCity_Gym_EventScript_169FED:: @ 8169FED - trainerbattle 0, 392, 0, Text_18F9E7, Text_18FA2D - loadword 0, gUnknown_818FA3B - callstd 6 - end + trainerbattle 0, 392, 0, Text_18F9E7, Text_18FA2D + loadword 0, gUnknown_818FA3B + callstd 6 + end ViridianCity_Gym_EventScript_16A004:: @ 816A004 - trainerbattle 0, 400, 0, Text_18F73B, Text_18F769 - loadword 0, gUnknown_818F77B - callstd 6 - end + trainerbattle 0, 400, 0, Text_18F73B, Text_18F769 + loadword 0, gUnknown_818F77B + callstd 6 + end ViridianCity_Gym_EventScript_16A01B:: @ 816A01B - trainerbattle 0, 401, 0, Text_18F8CB, Text_18F8EE - loadword 0, gUnknown_818F8FE - callstd 6 - end + trainerbattle 0, 401, 0, Text_18F8CB, Text_18F8EE + loadword 0, gUnknown_818F8FE + callstd 6 + end ViridianCity_Gym_EventScript_16A032:: @ 816A032 - lock - faceplayer - checkflag FLAG_0x4B7 - goto_if 1, EventScript_16A047 - loadword 0, gUnknown_818FA81 - callstd 4 - release - end + lock + faceplayer + checkflag FLAG_0x4B7 + goto_if 1, EventScript_16A047 + loadword 0, gUnknown_818FA81 + callstd 4 + release + end EventScript_16A047:: @ 816A047 - setvar VAR_0x8004, 15 - setvar VAR_0x8005, 4 - special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_818FB56 - callstd 4 - release - end + setvar VAR_0x8004, 15 + setvar VAR_0x8005, 4 + special SetFlavorTextFlagFromSpecialVars + loadword 0, gUnknown_818FB56 + callstd 4 + release + end ViridianCity_Gym_EventScript_16A05E:: @ 816A05E - lockall - checkflag 2087 - goto_if 1, EventScript_16A072 - loadword 0, gUnknown_818FB8D - callstd 4 - releaseall - end + lockall + checkflag 2087 + goto_if 1, EventScript_16A072 + loadword 0, gUnknown_818FB8D + callstd 4 + releaseall + end EventScript_16A072:: @ 816A072 - loadword 0, gUnknown_818FBC1 - callstd 4 - releaseall - end + loadword 0, gUnknown_818FBC1 + callstd 4 + releaseall + end diff --git a/data/maps/ViridianCity_House1/scripts.inc b/data/maps/ViridianCity_House1/scripts.inc index 3ea1f8cd0..1b8e860d0 100644 --- a/data/maps/ViridianCity_House1/scripts.inc +++ b/data/maps/ViridianCity_House1/scripts.inc @@ -1,28 +1,28 @@ ViridianCity_House1_MapScripts:: @ 8169E9A - .byte 0 + .byte 0 ViridianCity_House1_EventScript_169E9B:: @ 8169E9B - loadword 0, gUnknown_818F292 - callstd 2 - end + loadword 0, gUnknown_818F292 + callstd 2 + end ViridianCity_House1_EventScript_169EA4:: @ 8169EA4 - loadword 0, gUnknown_818F30F - callstd 2 - end + loadword 0, gUnknown_818F30F + callstd 2 + end ViridianCity_House1_EventScript_169EAD:: @ 8169EAD - lock - faceplayer - waitse - playmoncry SPECIES_SPEAROW, 0 - loadword 0, gUnknown_818F32C - callstd 4 - waitmoncry - release - end + lock + faceplayer + waitse + playmoncry SPECIES_SPEAROW, 0 + loadword 0, gUnknown_818F32C + callstd 4 + waitmoncry + release + end ViridianCity_House1_EventScript_169EC0:: @ 8169EC0 - loadword 0, gUnknown_818F33D - callstd 3 - end + loadword 0, gUnknown_818F33D + callstd 3 + end diff --git a/data/maps/ViridianCity_House2/scripts.inc b/data/maps/ViridianCity_House2/scripts.inc index da2dec8d2..4f22b42eb 100644 --- a/data/maps/ViridianCity_House2/scripts.inc +++ b/data/maps/ViridianCity_House2/scripts.inc @@ -1,120 +1,120 @@ ViridianCity_House2_MapScripts:: @ 816A07C - .byte 0 + .byte 0 ViridianCity_House2_EventScript_16A07D:: @ 816A07D - lock - faceplayer - loadword 0, gUnknown_818FC00 - callstd 4 - closemessage - applymovement 2, Movement_1A75E9 - waitmovement 0 - release - end + lock + faceplayer + loadword 0, gUnknown_818FC00 + callstd 4 + closemessage + applymovement 2, Movement_1A75E9 + waitmovement 0 + release + end ViridianCity_House2_EventScript_16A094:: @ 816A094 - lock - faceplayer - loadword 0, gUnknown_818FC2B - callstd 4 - closemessage - applymovement 1, Movement_1A75E5 - waitmovement 0 - release - end + lock + faceplayer + loadword 0, gUnknown_818FC2B + callstd 4 + closemessage + applymovement 1, Movement_1A75E5 + waitmovement 0 + release + end ViridianCity_House2_EventScript_16A0AB:: @ 816A0AB - lockall - loadword 0, gUnknown_818FC65 - callstd 4 - loadword 0, gUnknown_818FF19 - callstd 5 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16A11B - loadword 0, gUnknown_818FD23 - callstd 4 - loadword 0, gUnknown_818FF19 - callstd 5 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16A11B - loadword 0, gUnknown_818FDA8 - callstd 4 - loadword 0, gUnknown_818FF19 - callstd 5 - compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16A11B - loadword 0, gUnknown_818FE5C - callstd 4 - applymovement 2, Movement_1A75E9 - waitmovement 0 - textcolor 1 - loadword 0, gUnknown_818FF28 - callstd 4 - releaseall - end + lockall + loadword 0, gUnknown_818FC65 + callstd 4 + loadword 0, gUnknown_818FF19 + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16A11B + loadword 0, gUnknown_818FD23 + callstd 4 + loadword 0, gUnknown_818FF19 + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16A11B + loadword 0, gUnknown_818FDA8 + callstd 4 + loadword 0, gUnknown_818FF19 + callstd 5 + compare_var_to_value VAR_RESULT, 0 + goto_if 1, EventScript_16A11B + loadword 0, gUnknown_818FE5C + callstd 4 + applymovement 2, Movement_1A75E9 + waitmovement 0 + textcolor 1 + loadword 0, gUnknown_818FF28 + callstd 4 + releaseall + end EventScript_16A11B:: @ 816A11B - releaseall - end + releaseall + end ViridianCity_House2_EventScript_16A11D:: @ 816A11D - lockall - loadword 0, gUnknown_818FF4B - callstd 4 - goto EventScript_16A12C - end + lockall + loadword 0, gUnknown_818FF4B + callstd 4 + goto EventScript_16A12C + end EventScript_16A12C:: @ 816A12C - message Text_18FF88 - waitmessage - multichoicegrid 7, 1, 15, 3, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_16A18B - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16A1A7 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_16A1C3 - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_16A199 - compare_var_to_value VAR_0x8000, 4 - goto_if 1, EventScript_16A1B5 - compare_var_to_value VAR_0x8000, 5 - goto_if 1, EventScript_16A1D1 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_16A1D1 - end + message Text_18FF88 + waitmessage + multichoicegrid 7, 1, 15, 3, 0 + copyvar VAR_0x8000, VAR_RESULT + compare_var_to_value VAR_0x8000, 0 + goto_if 1, EventScript_16A18B + compare_var_to_value VAR_0x8000, 1 + goto_if 1, EventScript_16A1A7 + compare_var_to_value VAR_0x8000, 2 + goto_if 1, EventScript_16A1C3 + compare_var_to_value VAR_0x8000, 3 + goto_if 1, EventScript_16A199 + compare_var_to_value VAR_0x8000, 4 + goto_if 1, EventScript_16A1B5 + compare_var_to_value VAR_0x8000, 5 + goto_if 1, EventScript_16A1D1 + compare_var_to_value VAR_0x8000, 127 + goto_if 1, EventScript_16A1D1 + end EventScript_16A18B:: @ 816A18B - loadword 0, gUnknown_818FFA9 - callstd 4 - goto EventScript_16A12C - end + loadword 0, gUnknown_818FFA9 + callstd 4 + goto EventScript_16A12C + end EventScript_16A199:: @ 816A199 - loadword 0, gUnknown_8190025 - callstd 4 - goto EventScript_16A12C - end + loadword 0, gUnknown_8190025 + callstd 4 + goto EventScript_16A12C + end EventScript_16A1A7:: @ 816A1A7 - loadword 0, gUnknown_819009F - callstd 4 - goto EventScript_16A12C - end + loadword 0, gUnknown_819009F + callstd 4 + goto EventScript_16A12C + end EventScript_16A1B5:: @ 816A1B5 - loadword 0, gUnknown_819010F - callstd 4 - goto EventScript_16A12C - end + loadword 0, gUnknown_819010F + callstd 4 + goto EventScript_16A12C + end EventScript_16A1C3:: @ 816A1C3 - loadword 0, gUnknown_8190199 - callstd 4 - goto EventScript_16A12C - end + loadword 0, gUnknown_8190199 + callstd 4 + goto EventScript_16A12C + end EventScript_16A1D1:: @ 816A1D1 - releaseall - end + releaseall + end diff --git a/data/maps/ViridianCity_Mart/scripts.inc b/data/maps/ViridianCity_Mart/scripts.inc index 9d36cb183..0f5bb19c8 100644 --- a/data/maps/ViridianCity_Mart/scripts.inc +++ b/data/maps/ViridianCity_Mart/scripts.inc @@ -1,100 +1,100 @@ ViridianCity_Mart_MapScripts:: @ 816A1D3 - map_script 1, ViridianCity_Mart_MapScript1_16A1DE - map_script 2, ViridianCity_Mart_MapScript2_16A1FB - .byte 0 + map_script 1, ViridianCity_Mart_MapScript1_16A1DE + map_script 2, ViridianCity_Mart_MapScript2_16A1FB + .byte 0 ViridianCity_Mart_MapScript1_16A1DE:: @ 816A1DE - checkflag 2089 - goto_if 0, EventScript_16A1E8 - end + checkflag 2089 + goto_if 0, EventScript_16A1E8 + end EventScript_16A1E8:: @ 816A1E8 - setmetatile 1, 3, 703, 1 - setmetatile 1, 4, 704, 1 - end + setmetatile 1, 3, 703, 1 + setmetatile 1, 4, 704, 1 + end ViridianCity_Mart_MapScript2_16A1FB:: @ 816A1FB - map_script_2 VAR_0x4057, 0, EventScript_16A205 - .2byte 0 + map_script_2 VAR_0x4057, 0, EventScript_16A205 + .2byte 0 EventScript_16A205:: @ 816A205 - lockall - textcolor 0 - applymovement 1, Movement_1A75ED - waitmovement 0 - loadword 0, gUnknown_819021A - callstd 4 - closemessage - applymovement 1, Movement_16A262 - applymovement 255, Movement_16A25C - waitmovement 0 - loadword 0, gUnknown_819023A - callstd 4 - setvar VAR_0x4057, 1 - additem ITEM_OAKS_PARCEL, 1 - loadword 0, gUnknown_8190289 - setorcopyvar VAR_0x8000, 349 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 318 - callstd 9 - setvar VAR_0x4055, 5 - releaseall - end + lockall + textcolor 0 + applymovement 1, Movement_1A75ED + waitmovement 0 + loadword 0, gUnknown_819021A + callstd 4 + closemessage + applymovement 1, Movement_16A262 + applymovement 255, Movement_16A25C + waitmovement 0 + loadword 0, gUnknown_819023A + callstd 4 + setvar VAR_0x4057, 1 + additem ITEM_OAKS_PARCEL, 1 + loadword 0, gUnknown_8190289 + setorcopyvar VAR_0x8000, 349 + setorcopyvar VAR_0x8001, 1 + setorcopyvar VAR_0x8002, 318 + callstd 9 + setvar VAR_0x4055, 5 + releaseall + end Movement_16A25C:: @ 816A25C - step_11 - step_11 - step_11 - step_11 - step_2f - step_end + step_11 + step_11 + step_11 + step_11 + step_2f + step_end Movement_16A262:: @ 816A262 - step_1c - step_1c - step_1c - step_1c - step_30 - step_end + step_1c + step_1c + step_1c + step_1c + step_30 + step_end ViridianCity_Mart_EventScript_16A268:: @ 816A268 - lock - faceplayer - compare_var_to_value VAR_0x4057, 1 - goto_if 1, EventScript_16A2A4 - special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 - message Text_1A6211 - waitmessage - pokemart Items_16A298 - loadword 0, gUnknown_81A5190 - callstd 4 - release - end + lock + faceplayer + compare_var_to_value VAR_0x4057, 1 + goto_if 1, EventScript_16A2A4 + special sub_8110AB4 + compare_var_to_value VAR_RESULT, 2 + goto_if 1, EventScript_1A7AE0 + message Text_1A6211 + waitmessage + pokemart Items_16A298 + loadword 0, gUnknown_81A5190 + callstd 4 + release + end - .align 2 + .align 2 Items_16A298:: @ 816A298 - .2byte ITEM_POKE_BALL - .2byte ITEM_POTION - .2byte ITEM_ANTIDOTE - .2byte ITEM_PARALYZE_HEAL - .2byte ITEM_NONE - release - end + .2byte ITEM_POKE_BALL + .2byte ITEM_POTION + .2byte ITEM_ANTIDOTE + .2byte ITEM_PARALYZE_HEAL + .2byte ITEM_NONE + release + end EventScript_16A2A4:: @ 816A2A4 - loadword 0, Text_1902BF - callstd 4 - release - end + loadword 0, Text_1902BF + callstd 4 + release + end ViridianCity_Mart_EventScript_16A2AE:: @ 816A2AE - loadword 0, gUnknown_81902F5 - callstd 2 - end + loadword 0, gUnknown_81902F5 + callstd 2 + end ViridianCity_Mart_EventScript_16A2B7:: @ 816A2B7 - loadword 0, gUnknown_819032C - callstd 2 - end + loadword 0, gUnknown_819032C + callstd 2 + end diff --git a/data/maps/ViridianCity_PokemonCenter_1F/scripts.inc b/data/maps/ViridianCity_PokemonCenter_1F/scripts.inc index da39670a3..34fbab8d2 100644 --- a/data/maps/ViridianCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/ViridianCity_PokemonCenter_1F/scripts.inc @@ -1,30 +1,30 @@ ViridianCity_PokemonCenter_1F_MapScripts:: @ 816A2C0 - map_script 3, ViridianCity_PokemonCenter_1F_MapScript1_16A2CB - map_script 5, ViridianCity_PokemonCenter_1F_MapScript2_1BC05C - .byte 0 + map_script 3, ViridianCity_PokemonCenter_1F_MapScript1_16A2CB + map_script 5, ViridianCity_PokemonCenter_1F_MapScript2_1BC05C + .byte 0 ViridianCity_PokemonCenter_1F_MapScript1_16A2CB:: @ 816A2CB - setrespawn 2 - end + setrespawn 2 + end ViridianCity_PokemonCenter_1F_EventScript_16A2CF:: @ 816A2CF - lock - faceplayer - call EventScript_1A6578 - release - end + lock + faceplayer + call EventScript_1A6578 + release + end ViridianCity_PokemonCenter_1F_EventScript_16A2D8:: @ 816A2D8 - loadword 0, gUnknown_81903E5 - callstd 2 - end + loadword 0, gUnknown_81903E5 + callstd 2 + end ViridianCity_PokemonCenter_1F_EventScript_16A2E1:: @ 816A2E1 - loadword 0, gUnknown_8190384 - callstd 2 - end + loadword 0, gUnknown_8190384 + callstd 2 + end ViridianCity_PokemonCenter_1F_EventScript_16A2EA:: @ 816A2EA - loadword 0, gUnknown_8190450 - callstd 2 - end + loadword 0, gUnknown_8190450 + callstd 2 + end diff --git a/data/maps/ViridianCity_PokemonCenter_2F/scripts.inc b/data/maps/ViridianCity_PokemonCenter_2F/scripts.inc index 79df14869..18e0018ba 100644 --- a/data/maps/ViridianCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/ViridianCity_PokemonCenter_2F/scripts.inc @@ -1,18 +1,18 @@ ViridianCity_PokemonCenter_2F_MapScripts:: @ 816A2F3 - map_script 2, ViridianCity_PokemonCenter_2F_MapScript1_1BB2A3 - map_script 4, ViridianCity_PokemonCenter_2F_MapScript2_1BB1ED - map_script 1, ViridianCity_PokemonCenter_2F_MapScript3_1BB237 - map_script 3, ViridianCity_PokemonCenter_2F_MapScript4_1BB1B4 - .byte 0 + map_script 2, ViridianCity_PokemonCenter_2F_MapScript1_1BB2A3 + map_script 4, ViridianCity_PokemonCenter_2F_MapScript2_1BB1ED + map_script 1, ViridianCity_PokemonCenter_2F_MapScript3_1BB237 + map_script 3, ViridianCity_PokemonCenter_2F_MapScript4_1BB1B4 + .byte 0 ViridianCity_PokemonCenter_2F_EventScript_16A308:: @ 816A308 - call EventScript_1BB4A3 - end + call EventScript_1BB4A3 + end EventScript_16A30E:: @ 816A30E - call EventScript_1BB6AB - end + call EventScript_1BB6AB + end EventScript_16A314:: @ 816A314 - call EventScript_1BB7DE - end + call EventScript_1BB7DE + end diff --git a/data/maps/ViridianForest/scripts.inc b/data/maps/ViridianForest/scripts.inc index f5d7b956f..ca8e1dce9 100644 --- a/data/maps/ViridianForest/scripts.inc +++ b/data/maps/ViridianForest/scripts.inc @@ -1,77 +1,77 @@ ViridianForest_MapScripts:: @ 816051F - map_script 3, ViridianForest_MapScript1_160525 - .byte 0 + map_script 3, ViridianForest_MapScript1_160525 + .byte 0 ViridianForest_MapScript1_160525:: @ 8160525 - setworldmapflag 2212 - end + setworldmapflag 2212 + end ViridianForest_EventScript_160529:: @ 8160529 - loadword 0, gUnknown_8172255 - callstd 2 - end + loadword 0, gUnknown_8172255 + callstd 2 + end ViridianForest_EventScript_160532:: @ 8160532 - loadword 0, gUnknown_8172559 - callstd 2 - end + loadword 0, gUnknown_8172559 + callstd 2 + end ViridianForest_EventScript_16053B:: @ 816053B - loadword 0, gUnknown_81725C7 - callstd 3 - end + loadword 0, gUnknown_81725C7 + callstd 3 + end ViridianForest_EventScript_160544:: @ 8160544 - loadword 0, gUnknown_8172629 - callstd 3 - end + loadword 0, gUnknown_8172629 + callstd 3 + end ViridianForest_EventScript_16054D:: @ 816054D - loadword 0, gUnknown_817265C - callstd 3 - end + loadword 0, gUnknown_817265C + callstd 3 + end ViridianForest_EventScript_160556:: @ 8160556 - loadword 0, gUnknown_81726A3 - callstd 3 - end + loadword 0, gUnknown_81726A3 + callstd 3 + end ViridianForest_EventScript_16055F:: @ 816055F - loadword 0, gUnknown_817271D - callstd 3 - end + loadword 0, gUnknown_817271D + callstd 3 + end ViridianForest_EventScript_160568:: @ 8160568 - loadword 0, gUnknown_8172773 - callstd 3 - end + loadword 0, gUnknown_8172773 + callstd 3 + end ViridianForest_EventScript_160571:: @ 8160571 - trainerbattle 0, 102, 0, Text_1722C7, Text_1722F9 - loadword 0, gUnknown_8172315 - callstd 6 - end + trainerbattle 0, 102, 0, Text_1722C7, Text_1722F9 + loadword 0, gUnknown_8172315 + callstd 6 + end ViridianForest_EventScript_160588:: @ 8160588 - trainerbattle 0, 103, 0, Text_17234A, Text_17237D - loadword 0, gUnknown_8172398 - callstd 6 - end + trainerbattle 0, 103, 0, Text_17234A, Text_17237D + loadword 0, gUnknown_8172398 + callstd 6 + end ViridianForest_EventScript_16059F:: @ 816059F - trainerbattle 0, 104, 0, Text_1723D4, Text_172402 - loadword 0, gUnknown_817241F - callstd 6 - end + trainerbattle 0, 104, 0, Text_1723D4, Text_172402 + loadword 0, gUnknown_817241F + callstd 6 + end ViridianForest_EventScript_1605B6:: @ 81605B6 - trainerbattle 0, 531, 0, Text_172482, Text_1724BF - loadword 0, gUnknown_81724DC - callstd 6 - end + trainerbattle 0, 531, 0, Text_172482, Text_1724BF + loadword 0, gUnknown_81724DC + callstd 6 + end ViridianForest_EventScript_1605CD:: @ 81605CD - trainerbattle 0, 532, 0, Text_1724F9, Text_17251B - loadword 0, gUnknown_8172527 - callstd 6 - end + trainerbattle 0, 532, 0, Text_1724F9, Text_17251B + loadword 0, gUnknown_8172527 + callstd 6 + end -- cgit v1.2.3 From 2c20a3214efe5211425a735167070eda2f28f496 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 14 May 2019 16:47:38 -0400 Subject: Document world map flags --- data/maps/BirthIsland_Exterior/scripts.inc | 2 +- data/maps/CeladonCity/scripts.inc | 2 +- data/maps/CeruleanCave_1F/scripts.inc | 2 +- data/maps/CeruleanCity/scripts.inc | 2 +- data/maps/CinnabarIsland/scripts.inc | 2 +- data/maps/DiglettsCave_B1F/scripts.inc | 2 +- data/maps/FiveIsland/scripts.inc | 2 +- data/maps/FiveIsland_LostCave_Entrance/scripts.inc | 2 +- data/maps/FiveIsland_RocketWarehouse/scripts.inc | 2 +- data/maps/FourIsland/scripts.inc | 2 +- data/maps/FourIsland_IcefallCave_Entrance/scripts.inc | 2 +- data/maps/FuchsiaCity/scripts.inc | 2 +- data/maps/IndigoPlateau_Exterior/scripts.inc | 2 +- data/maps/MtEmber_Exterior/scripts.inc | 2 +- data/maps/MtMoon_1F/scripts.inc | 2 +- data/maps/NavelRock_Exterior/scripts.inc | 2 +- data/maps/OneIsland/scripts.inc | 2 +- data/maps/PalletTown/scripts.inc | 2 +- data/maps/PewterCity/scripts.inc | 2 +- data/maps/PokemonLeague_LoreleisRoom/scripts.inc | 2 +- data/maps/PokemonMansion_1F/scripts.inc | 2 +- data/maps/PokemonTower_1F/scripts.inc | 2 +- data/maps/PowerPlant/scripts.inc | 2 +- data/maps/RockTunnel_1F/scripts.inc | 2 +- data/maps/RocketHideout_B1F/scripts.inc | 2 +- data/maps/Route10_PokemonCenter_1F/scripts.inc | 2 +- data/maps/Route4_PokemonCenter_1F/scripts.inc | 2 +- data/maps/SSAnne_Exterior/scripts.inc | 2 +- data/maps/SafariZone_Center/scripts.inc | 2 +- data/maps/SaffronCity_Duplicate/scripts.inc | 2 +- data/maps/SeafoamIslands_1F/scripts.inc | 2 +- data/maps/SevenIsland/scripts.inc | 2 +- data/maps/SevenIsland_SeavaultCanyon_TanobyKey/scripts.inc | 2 +- data/maps/SevenIsland_TanobyRuins_MoneanChamber/scripts.inc | 2 +- data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc | 2 +- data/maps/SilphCo_1F/scripts.inc | 2 +- data/maps/SixIsland/scripts.inc | 2 +- data/maps/SixIsland_AlteringCave/scripts.inc | 2 +- data/maps/SixIsland_DottedHole_1F/scripts.inc | 2 +- data/maps/SixIsland_PatternBush/scripts.inc | 2 +- data/maps/ThreeIsland/scripts.inc | 2 +- data/maps/ThreeIsland_BerryForest/scripts.inc | 2 +- data/maps/ThreeIsland_DunsparceTunnel/scripts.inc | 2 +- data/maps/TwoIsland/scripts.inc | 2 +- data/maps/UndergroundPath_EastWestTunnel/scripts.inc | 2 +- data/maps/UndergroundPath_NorthSouthTunnel/scripts.inc | 2 +- data/maps/VermilionCity/scripts.inc | 2 +- data/maps/VictoryRoad_1F/scripts.inc | 2 +- data/maps/ViridianForest/scripts.inc | 2 +- 49 files changed, 49 insertions(+), 49 deletions(-) (limited to 'data/maps') diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc index 02ac130e2..269dbea5b 100644 --- a/data/maps/BirthIsland_Exterior/scripts.inc +++ b/data/maps/BirthIsland_Exterior/scripts.inc @@ -9,7 +9,7 @@ BirthIsland_Exterior_MapScript3_165213:: @ 8165213 end BirthIsland_Exterior_MapScript1_165217:: @ 8165217 - setworldmapflag 2242 + setworldmapflag FLAG_WORLD_MAP_BIRTH_ISLAND_EXTERIOR setvar VAR_0x4010, 150 setvar VAR_SECRET_BASE_MAP, 0 setvar VAR_ALTERING_CAVE_WILD_SET, 0 diff --git a/data/maps/CeladonCity/scripts.inc b/data/maps/CeladonCity/scripts.inc index 8e3ffe308..08c160cd9 100644 --- a/data/maps/CeladonCity/scripts.inc +++ b/data/maps/CeladonCity/scripts.inc @@ -3,7 +3,7 @@ CeladonCity_MapScripts:: @ 8166C8F .byte 0 CeladonCity_MapScript1_166C95:: @ 8166C95 - setworldmapflag 2198 + setworldmapflag FLAG_WORLD_MAP_CELADON_CITY end CeladonCity_EventScript_166C99:: @ 8166C99 diff --git a/data/maps/CeruleanCave_1F/scripts.inc b/data/maps/CeruleanCave_1F/scripts.inc index 6b4e93d9f..db76ddfd7 100644 --- a/data/maps/CeruleanCave_1F/scripts.inc +++ b/data/maps/CeruleanCave_1F/scripts.inc @@ -3,5 +3,5 @@ CeruleanCave_1F_MapScripts:: @ 81624B3 .byte 0 CeruleanCave_1F_MapScript1_1624B9:: @ 81624B9 - setworldmapflag 2227 + setworldmapflag FLAG_WORLD_MAP_CERULEAN_CAVE_1F end diff --git a/data/maps/CeruleanCity/scripts.inc b/data/maps/CeruleanCity/scripts.inc index 8677c23f0..dd13a913d 100644 --- a/data/maps/CeruleanCity/scripts.inc +++ b/data/maps/CeruleanCity/scripts.inc @@ -3,7 +3,7 @@ CeruleanCity_MapScripts:: @ 8166471 .byte 0 CeruleanCity_MapScript1_166477:: @ 8166477 - setworldmapflag 2195 + setworldmapflag FLAG_WORLD_MAP_CERULEAN_CITY checkflag FLAG_0x234 call_if 0, EventScript_166484 end diff --git a/data/maps/CinnabarIsland/scripts.inc b/data/maps/CinnabarIsland/scripts.inc index 314f97296..63d8e8f0f 100644 --- a/data/maps/CinnabarIsland/scripts.inc +++ b/data/maps/CinnabarIsland/scripts.inc @@ -4,7 +4,7 @@ CinnabarIsland_MapScripts:: @ 8166ED6 .byte 0 CinnabarIsland_MapScript1_166EE1:: @ 8166EE1 - setworldmapflag 2200 + setworldmapflag FLAG_WORLD_MAP_CINNABAR_ISLAND call EventScript_166F5E compare_var_to_value VAR_0x4071, 1 call_if 1, EventScript_166F24 diff --git a/data/maps/DiglettsCave_B1F/scripts.inc b/data/maps/DiglettsCave_B1F/scripts.inc index fd5e75f3d..28bd063ac 100644 --- a/data/maps/DiglettsCave_B1F/scripts.inc +++ b/data/maps/DiglettsCave_B1F/scripts.inc @@ -3,5 +3,5 @@ DiglettsCave_B1F_MapScripts:: @ 8160EF1 .byte 0 DiglettsCave_B1F_MapScript1_160EF7:: @ 8160EF7 - setworldmapflag 2217 + setworldmapflag FLAG_WORLD_MAP_DIGLETTS_CAVE_B1F end diff --git a/data/maps/FiveIsland/scripts.inc b/data/maps/FiveIsland/scripts.inc index 273749e3b..bfc0af50b 100644 --- a/data/maps/FiveIsland/scripts.inc +++ b/data/maps/FiveIsland/scripts.inc @@ -3,7 +3,7 @@ FiveIsland_MapScripts:: @ 8167E8E .byte 0 FiveIsland_MapScript1_167E94:: @ 8167E94 - setworldmapflag 2207 + setworldmapflag FLAG_WORLD_MAP_FIVE_ISLAND end FiveIsland_EventScript_167E98:: @ 8167E98 diff --git a/data/maps/FiveIsland_LostCave_Entrance/scripts.inc b/data/maps/FiveIsland_LostCave_Entrance/scripts.inc index 83b8eca06..e288ceff6 100644 --- a/data/maps/FiveIsland_LostCave_Entrance/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Entrance/scripts.inc @@ -3,5 +3,5 @@ FiveIsland_LostCave_Entrance_MapScripts:: @ 8164BEC .byte 0 FiveIsland_LostCave_Entrance_MapScript1_164BF2:: @ 8164BF2 - setworldmapflag 2236 + setworldmapflag FLAG_WORLD_MAP_FIVE_ISLAND_LOST_CAVE_ENTRANCE end diff --git a/data/maps/FiveIsland_RocketWarehouse/scripts.inc b/data/maps/FiveIsland_RocketWarehouse/scripts.inc index 34c141ec9..fc1753562 100644 --- a/data/maps/FiveIsland_RocketWarehouse/scripts.inc +++ b/data/maps/FiveIsland_RocketWarehouse/scripts.inc @@ -4,7 +4,7 @@ FiveIsland_RocketWarehouse_MapScripts:: @ 8163F2E .byte 0 FiveIsland_RocketWarehouse_MapScript2_163F39:: @ 8163F39 - setworldmapflag 2233 + setworldmapflag FLAG_WORLD_MAP_FIVE_ISLAND_ROCKET_WAREHOUSE end FiveIsland_RocketWarehouse_MapScript1_163F3D:: @ 8163F3D diff --git a/data/maps/FourIsland/scripts.inc b/data/maps/FourIsland/scripts.inc index 73c0d6175..887b9ca4e 100644 --- a/data/maps/FourIsland/scripts.inc +++ b/data/maps/FourIsland/scripts.inc @@ -4,7 +4,7 @@ FourIsland_MapScripts:: @ 8167CAE .byte 0 FourIsland_MapScript1_167CB9:: @ 8167CB9 - setworldmapflag 2206 + setworldmapflag FLAG_WORLD_MAP_FOUR_ISLAND compare_var_to_value VAR_0x4086, 0 call_if 1, EventScript_167CCD call EventScript_167CD1 diff --git a/data/maps/FourIsland_IcefallCave_Entrance/scripts.inc b/data/maps/FourIsland_IcefallCave_Entrance/scripts.inc index 1bef95ec1..a3c4ea616 100644 --- a/data/maps/FourIsland_IcefallCave_Entrance/scripts.inc +++ b/data/maps/FourIsland_IcefallCave_Entrance/scripts.inc @@ -3,5 +3,5 @@ FourIsland_IcefallCave_Entrance_MapScripts:: @ 8163D3A .byte 0 FourIsland_IcefallCave_Entrance_MapScript1_163D40:: @ 8163D40 - setworldmapflag 2232 + setworldmapflag FLAG_WORLD_MAP_FOUR_ISLAND_ICEFALL_CAVE_ENTRANCE end diff --git a/data/maps/FuchsiaCity/scripts.inc b/data/maps/FuchsiaCity/scripts.inc index 2d0a6a32a..4a6245159 100644 --- a/data/maps/FuchsiaCity/scripts.inc +++ b/data/maps/FuchsiaCity/scripts.inc @@ -3,7 +3,7 @@ FuchsiaCity_MapScripts:: @ 8166D75 .byte 0 FuchsiaCity_MapScript1_166D7B:: @ 8166D7B - setworldmapflag 2199 + setworldmapflag FLAG_WORLD_MAP_FUCHSIA_CITY checkflag FLAG_0x272 call_if 1, EventScript_166D91 checkflag FLAG_0x272 diff --git a/data/maps/IndigoPlateau_Exterior/scripts.inc b/data/maps/IndigoPlateau_Exterior/scripts.inc index fd45d3fd4..656e7045c 100644 --- a/data/maps/IndigoPlateau_Exterior/scripts.inc +++ b/data/maps/IndigoPlateau_Exterior/scripts.inc @@ -4,7 +4,7 @@ IndigoPlateau_Exterior_MapScripts:: @ 816723B .byte 0 IndigoPlateau_Exterior_MapScript1_167246:: @ 8167246 - setworldmapflag 2201 + setworldmapflag FLAG_WORLD_MAP_INDIGO_PLATEAU_EXTERIOR compare_var_to_value VAR_0x4085, 1 call_if 1, EventScript_167255 end diff --git a/data/maps/MtEmber_Exterior/scripts.inc b/data/maps/MtEmber_Exterior/scripts.inc index d6c93ae72..020c334f6 100644 --- a/data/maps/MtEmber_Exterior/scripts.inc +++ b/data/maps/MtEmber_Exterior/scripts.inc @@ -4,7 +4,7 @@ MtEmber_Exterior_MapScripts:: @ 8163946 .byte 0 MtEmber_Exterior_MapScript1_163951:: @ 8163951 - setworldmapflag 2230 + setworldmapflag FLAG_WORLD_MAP_MT_EMBER_EXTERIOR compare_var_to_value VAR_0x407F, 2 call_if 1, EventScript_163960 end diff --git a/data/maps/MtMoon_1F/scripts.inc b/data/maps/MtMoon_1F/scripts.inc index 1c6af7902..3a8e8b5ce 100644 --- a/data/maps/MtMoon_1F/scripts.inc +++ b/data/maps/MtMoon_1F/scripts.inc @@ -3,7 +3,7 @@ MtMoon_1F_MapScripts:: @ 81605E4 .byte 0 MtMoon_1F_MapScript1_1605EA:: @ 81605EA - setworldmapflag 2213 + setworldmapflag FLAG_WORLD_MAP_MT_MOON_1F end MtMoon_1F_EventScript_1605EE:: @ 81605EE diff --git a/data/maps/NavelRock_Exterior/scripts.inc b/data/maps/NavelRock_Exterior/scripts.inc index 32b86d7d6..26ef2885c 100644 --- a/data/maps/NavelRock_Exterior/scripts.inc +++ b/data/maps/NavelRock_Exterior/scripts.inc @@ -3,5 +3,5 @@ NavelRock_Exterior_MapScripts:: @ 81646AE .byte 0 NavelRock_Exterior_MapScript1_1646B4:: @ 81646B4 - setworldmapflag 2229 + setworldmapflag FLAG_WORLD_MAP_NAVEL_ROCK_EXTERIOR end diff --git a/data/maps/OneIsland/scripts.inc b/data/maps/OneIsland/scripts.inc index f1d1fa7af..b0a4ac263 100644 --- a/data/maps/OneIsland/scripts.inc +++ b/data/maps/OneIsland/scripts.inc @@ -4,7 +4,7 @@ OneIsland_MapScripts:: @ 8167484 .byte 0 OneIsland_MapScript1_16748F:: @ 816748F - setworldmapflag 2203 + setworldmapflag FLAG_WORLD_MAP_ONE_ISLAND end OneIsland_MapScript2_167493:: @ 8167493 diff --git a/data/maps/PalletTown/scripts.inc b/data/maps/PalletTown/scripts.inc index 1ea484a62..bafeced89 100644 --- a/data/maps/PalletTown/scripts.inc +++ b/data/maps/PalletTown/scripts.inc @@ -4,7 +4,7 @@ PalletTown_MapScripts:: @ 816545A .byte 0 PalletTown_MapScript1_165465:: @ 8165465 - setworldmapflag 2192 + setworldmapflag FLAG_WORLD_MAP_PALLET_TOWN checkflag FLAG_0x291 call_if 1, EventScript_165488 compare_var_to_value VAR_0x4070, 0 diff --git a/data/maps/PewterCity/scripts.inc b/data/maps/PewterCity/scripts.inc index e3afcec0f..ee311aab2 100644 --- a/data/maps/PewterCity/scripts.inc +++ b/data/maps/PewterCity/scripts.inc @@ -3,7 +3,7 @@ PewterCity_MapScripts:: @ 8165B8E .byte 0 PewterCity_MapScript1_165B94:: @ 8165B94 - setworldmapflag 2194 + setworldmapflag FLAG_WORLD_MAP_PEWTER_CITY setvar VAR_0x4061, 0 end diff --git a/data/maps/PokemonLeague_LoreleisRoom/scripts.inc b/data/maps/PokemonLeague_LoreleisRoom/scripts.inc index a44edbd86..519278fff 100644 --- a/data/maps/PokemonLeague_LoreleisRoom/scripts.inc +++ b/data/maps/PokemonLeague_LoreleisRoom/scripts.inc @@ -27,7 +27,7 @@ EventScript_1625AC:: @ 81625AC return PokemonLeague_LoreleisRoom_MapScript3_1625B2:: @ 81625B2 - setworldmapflag 2223 + setworldmapflag FLAG_WORLD_MAP_POKEMON_LEAGUE_LORELEIS_ROOM end PokemonLeague_LoreleisRoom_MapScript4_1625B6:: @ 81625B6 diff --git a/data/maps/PokemonMansion_1F/scripts.inc b/data/maps/PokemonMansion_1F/scripts.inc index ddd356f46..9e3f50832 100644 --- a/data/maps/PokemonMansion_1F/scripts.inc +++ b/data/maps/PokemonMansion_1F/scripts.inc @@ -9,7 +9,7 @@ PokemonMansion_1F_MapScript1_162204:: @ 8162204 end PokemonMansion_1F_MapScript2_16220E:: @ 816220E - setworldmapflag 2221 + setworldmapflag FLAG_WORLD_MAP_POKEMON_MANSION_1F end PokemonMansion_1F_EventScript_162212:: @ 8162212 diff --git a/data/maps/PokemonTower_1F/scripts.inc b/data/maps/PokemonTower_1F/scripts.inc index 1e764e397..bbfee991c 100644 --- a/data/maps/PokemonTower_1F/scripts.inc +++ b/data/maps/PokemonTower_1F/scripts.inc @@ -3,7 +3,7 @@ PokemonTower_1F_MapScripts:: @ 8163235 .byte 0 PokemonTower_1F_MapScript1_16323B:: @ 816323B - setworldmapflag 2226 + setworldmapflag FLAG_WORLD_MAP_POKEMON_TOWER_1F end PokemonTower_1F_EventScript_16323F:: @ 816323F diff --git a/data/maps/PowerPlant/scripts.inc b/data/maps/PowerPlant/scripts.inc index 8f7f15d54..988c84fa0 100644 --- a/data/maps/PowerPlant/scripts.inc +++ b/data/maps/PowerPlant/scripts.inc @@ -16,7 +16,7 @@ EventScript_163779:: @ 8163779 return PowerPlant_MapScript2_16378D:: @ 816378D - setworldmapflag 2228 + setworldmapflag FLAG_WORLD_MAP_POWER_PLANT checkflag FLAG_0x2BF call_if 0, EventScript_1637AC checkflag FLAG_0x2D0 diff --git a/data/maps/RockTunnel_1F/scripts.inc b/data/maps/RockTunnel_1F/scripts.inc index 22ba4d7ac..ff8d3216b 100644 --- a/data/maps/RockTunnel_1F/scripts.inc +++ b/data/maps/RockTunnel_1F/scripts.inc @@ -3,7 +3,7 @@ RockTunnel_1F_MapScripts:: @ 8162DD6 .byte 0 RockTunnel_1F_MapScript1_162DDC:: @ 8162DDC - setworldmapflag 2224 + setworldmapflag FLAG_WORLD_MAP_ROCK_TUNNEL_1F end RockTunnel_1F_EventScript_162DE0:: @ 8162DE0 diff --git a/data/maps/RocketHideout_B1F/scripts.inc b/data/maps/RocketHideout_B1F/scripts.inc index a9a6d2c35..f7b2e0515 100644 --- a/data/maps/RocketHideout_B1F/scripts.inc +++ b/data/maps/RocketHideout_B1F/scripts.inc @@ -9,7 +9,7 @@ RocketHideout_B1F_MapScript1_1611A0:: @ 81611A0 end RocketHideout_B1F_MapScript2_1611AA:: @ 81611AA - setworldmapflag 2219 + setworldmapflag FLAG_WORLD_MAP_ROCKET_HIDEOUT_B1F end RocketHideout_B1F_EventScript_1611AE:: @ 81611AE diff --git a/data/maps/Route10_PokemonCenter_1F/scripts.inc b/data/maps/Route10_PokemonCenter_1F/scripts.inc index 663938fc7..44c859362 100644 --- a/data/maps/Route10_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route10_PokemonCenter_1F/scripts.inc @@ -4,7 +4,7 @@ Route10_PokemonCenter_1F_MapScripts:: @ 816FC2F .byte 0 Route10_PokemonCenter_1F_MapScript1_16FC3A:: @ 816FC3A - setworldmapflag 2211 + setworldmapflag FLAG_WORLD_MAP_ROUTE10_POKEMON_CENTER_1F setrespawn 13 end diff --git a/data/maps/Route4_PokemonCenter_1F/scripts.inc b/data/maps/Route4_PokemonCenter_1F/scripts.inc index e943780de..d4904e476 100644 --- a/data/maps/Route4_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route4_PokemonCenter_1F/scripts.inc @@ -4,7 +4,7 @@ Route4_PokemonCenter_1F_MapScripts:: @ 816F739 .byte 0 Route4_PokemonCenter_1F_MapScript1_16F744:: @ 816F744 - setworldmapflag 2210 + setworldmapflag FLAG_WORLD_MAP_ROUTE4_POKEMON_CENTER_1F setrespawn 12 end diff --git a/data/maps/SSAnne_Exterior/scripts.inc b/data/maps/SSAnne_Exterior/scripts.inc index e3064f061..3d7a41b35 100644 --- a/data/maps/SSAnne_Exterior/scripts.inc +++ b/data/maps/SSAnne_Exterior/scripts.inc @@ -4,7 +4,7 @@ SSAnne_Exterior_MapScripts:: @ 8160840 .byte 0 SSAnne_Exterior_MapScript1_16084B:: @ 816084B - setworldmapflag 2214 + setworldmapflag FLAG_WORLD_MAP_SSANNE_EXTERIOR end SSAnne_Exterior_MapScript2_16084F:: @ 816084F diff --git a/data/maps/SafariZone_Center/scripts.inc b/data/maps/SafariZone_Center/scripts.inc index 81a43a227..90ab60e6d 100644 --- a/data/maps/SafariZone_Center/scripts.inc +++ b/data/maps/SafariZone_Center/scripts.inc @@ -3,7 +3,7 @@ SafariZone_Center_MapScripts:: @ 8162357 .byte 0 SafariZone_Center_MapScript1_16235D:: @ 816235D - setworldmapflag 2222 + setworldmapflag FLAG_WORLD_MAP_SAFARI_ZONE_CENTER end SafariZone_Center_EventScript_162361:: @ 8162361 diff --git a/data/maps/SaffronCity_Duplicate/scripts.inc b/data/maps/SaffronCity_Duplicate/scripts.inc index cba838bed..fa5d031b3 100644 --- a/data/maps/SaffronCity_Duplicate/scripts.inc +++ b/data/maps/SaffronCity_Duplicate/scripts.inc @@ -3,7 +3,7 @@ SaffronCity_Duplicate_MapScripts:: @ 816735F .byte 0 SaffronCity_Duplicate_MapScript1_167365:: @ 8167365 - setworldmapflag 2202 + setworldmapflag FLAG_WORLD_MAP_SAFFRON_CITY_DUPLICATE checkflag FLAG_0x23C call_if 0, EventScript_167372 end diff --git a/data/maps/SeafoamIslands_1F/scripts.inc b/data/maps/SeafoamIslands_1F/scripts.inc index afb8a3e3e..336c75f9f 100644 --- a/data/maps/SeafoamIslands_1F/scripts.inc +++ b/data/maps/SeafoamIslands_1F/scripts.inc @@ -3,5 +3,5 @@ SeafoamIslands_1F_MapScripts:: @ 8162F43 .byte 0 SeafoamIslands_1F_MapScript1_162F49:: @ 8162F49 - setworldmapflag 2225 + setworldmapflag FLAG_WORLD_MAP_SEAFOAM_ISLANDS_1F end diff --git a/data/maps/SevenIsland/scripts.inc b/data/maps/SevenIsland/scripts.inc index 8517d7d2d..1c8b3c10b 100644 --- a/data/maps/SevenIsland/scripts.inc +++ b/data/maps/SevenIsland/scripts.inc @@ -3,7 +3,7 @@ SevenIsland_MapScripts:: @ 8167EB3 .byte 0 SevenIsland_MapScript1_167EB9:: @ 8167EB9 - setworldmapflag 2208 + setworldmapflag FLAG_WORLD_MAP_SEVEN_ISLAND end SevenIsland_EventScript_167EBD:: @ 8167EBD diff --git a/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/scripts.inc b/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/scripts.inc index c1eda69bd..45637c673 100644 --- a/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/scripts.inc +++ b/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/scripts.inc @@ -3,7 +3,7 @@ SevenIsland_SeavaultCanyon_TanobyKey_MapScripts:: @ 8164DCC .byte 0 SevenIsland_SeavaultCanyon_TanobyKey_MapScript1_164DD2:: @ 8164DD2 - setworldmapflag 2241 + setworldmapflag FLAG_WORLD_MAP_SEVEN_ISLAND_SEAVAULT_CANYON_TANOBY_KEY checkflag 2121 call_if 1, EventScript_164E07 setvar VAR_0x4001, 0 diff --git a/data/maps/SevenIsland_TanobyRuins_MoneanChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_MoneanChamber/scripts.inc index e67f50d40..391a45a95 100644 --- a/data/maps/SevenIsland_TanobyRuins_MoneanChamber/scripts.inc +++ b/data/maps/SevenIsland_TanobyRuins_MoneanChamber/scripts.inc @@ -3,6 +3,6 @@ SevenIsland_TanobyRuins_MoneanChamber_MapScripts:: @ 8164CCF .byte 0 SevenIsland_TanobyRuins_MoneanChamber_MapScript1_164CD5:: @ 8164CD5 - setworldmapflag 2239 + setworldmapflag FLAG_WORLD_MAP_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER call EventScript_1A925E end diff --git a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc index 2f1ebc267..d763b76a9 100644 --- a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc @@ -39,7 +39,7 @@ EventScript_1648A3:: @ 81648A3 return SevenIsland_TrainerTower_Lobby_MapScript3_1648AD:: @ 81648AD - setworldmapflag 2234 + setworldmapflag FLAG_WORLD_MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY getplayerxy VAR_0x400D, VAR_RESULT end diff --git a/data/maps/SilphCo_1F/scripts.inc b/data/maps/SilphCo_1F/scripts.inc index f9e44a12b..42a0e0d00 100644 --- a/data/maps/SilphCo_1F/scripts.inc +++ b/data/maps/SilphCo_1F/scripts.inc @@ -3,7 +3,7 @@ SilphCo_1F_MapScripts:: @ 8161625 .byte 0 SilphCo_1F_MapScript1_16162B:: @ 816162B - setworldmapflag 2220 + setworldmapflag FLAG_WORLD_MAP_SILPH_CO_1F end SilphCo_1F_EventScript_16162F:: @ 816162F diff --git a/data/maps/SixIsland/scripts.inc b/data/maps/SixIsland/scripts.inc index bac71a468..3b3392afb 100644 --- a/data/maps/SixIsland/scripts.inc +++ b/data/maps/SixIsland/scripts.inc @@ -3,7 +3,7 @@ SixIsland_MapScripts:: @ 8167ED8 .byte 0 SixIsland_MapScript1_167EDE:: @ 8167EDE - setworldmapflag 2209 + setworldmapflag FLAG_WORLD_MAP_SIX_ISLAND end SixIsland_EventScript_167EE2:: @ 8167EE2 diff --git a/data/maps/SixIsland_AlteringCave/scripts.inc b/data/maps/SixIsland_AlteringCave/scripts.inc index 7c53187c3..6733f94b3 100644 --- a/data/maps/SixIsland_AlteringCave/scripts.inc +++ b/data/maps/SixIsland_AlteringCave/scripts.inc @@ -3,5 +3,5 @@ SixIsland_AlteringCave_MapScripts:: @ 81646A4 .byte 0 SixIsland_AlteringCave_MapScript1_1646AA:: @ 81646AA - setworldmapflag 2238 + setworldmapflag FLAG_WORLD_MAP_SIX_ISLAND_ALTERING_CAVE end diff --git a/data/maps/SixIsland_DottedHole_1F/scripts.inc b/data/maps/SixIsland_DottedHole_1F/scripts.inc index bcb9a72ca..2d9e52209 100644 --- a/data/maps/SixIsland_DottedHole_1F/scripts.inc +++ b/data/maps/SixIsland_DottedHole_1F/scripts.inc @@ -3,7 +3,7 @@ SixIsland_DottedHole_1F_MapScripts:: @ 8164182 .byte 0 SixIsland_DottedHole_1F_MapScript1_164188:: @ 8164188 - setworldmapflag 2235 + setworldmapflag FLAG_WORLD_MAP_SIX_ISLAND_DOTTED_HOLE_1F end SixIsland_DottedHole_B1F_EventScript_16418C:: @ 816418C diff --git a/data/maps/SixIsland_PatternBush/scripts.inc b/data/maps/SixIsland_PatternBush/scripts.inc index fd72430ea..f7debc297 100644 --- a/data/maps/SixIsland_PatternBush/scripts.inc +++ b/data/maps/SixIsland_PatternBush/scripts.inc @@ -3,7 +3,7 @@ SixIsland_PatternBush_MapScripts:: @ 8164559 .byte 0 SixIsland_PatternBush_MapScript1_16455F:: @ 816455F - setworldmapflag 2237 + setworldmapflag FLAG_WORLD_MAP_SIX_ISLAND_PATTERN_BUSH getplayerxy VAR_0x4001, VAR_0x4002 compare_var_to_value VAR_0x4001, 50 call_if 4, EventScript_16457E diff --git a/data/maps/ThreeIsland/scripts.inc b/data/maps/ThreeIsland/scripts.inc index a142aa51f..cfb5507b8 100644 --- a/data/maps/ThreeIsland/scripts.inc +++ b/data/maps/ThreeIsland/scripts.inc @@ -3,7 +3,7 @@ ThreeIsland_MapScripts:: @ 81677AD .byte 0 ThreeIsland_MapScript1_1677B3:: @ 81677B3 - setworldmapflag 2205 + setworldmapflag FLAG_WORLD_MAP_THREE_ISLAND checkflag FLAG_0x2A3 call_if 1, EventScript_1677CB compare_var_to_value VAR_0x407B, 4 diff --git a/data/maps/ThreeIsland_BerryForest/scripts.inc b/data/maps/ThreeIsland_BerryForest/scripts.inc index bb6795580..5acd5a6d3 100644 --- a/data/maps/ThreeIsland_BerryForest/scripts.inc +++ b/data/maps/ThreeIsland_BerryForest/scripts.inc @@ -3,7 +3,7 @@ ThreeIsland_BerryForest_MapScripts:: @ 8163C71 .byte 0 ThreeIsland_BerryForest_MapScript1_163C77:: @ 8163C77 - setworldmapflag 2231 + setworldmapflag FLAG_WORLD_MAP_THREE_ISLAND_BERRY_FOREST setescapewarp MAP_THREE_ISLAND_BOND_BRIDGE, 255, 12, 6 end diff --git a/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc b/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc index 053ff6433..60a51f456 100644 --- a/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc +++ b/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc @@ -3,7 +3,7 @@ ThreeIsland_DunsparceTunnel_MapScripts:: @ 8164D26 .byte 0 ThreeIsland_DunsparceTunnel_MapScript1_164D2C:: @ 8164D2C - setworldmapflag 2240 + setworldmapflag FLAG_WORLD_MAP_THREE_ISLAND_DUNSPARCE_TUNNEL specialvar VAR_RESULT, sub_806E25C copyvar VAR_0x8008, VAR_RESULT compare_var_to_value VAR_0x8008, 1 diff --git a/data/maps/TwoIsland/scripts.inc b/data/maps/TwoIsland/scripts.inc index 06ded8984..950cfbf84 100644 --- a/data/maps/TwoIsland/scripts.inc +++ b/data/maps/TwoIsland/scripts.inc @@ -3,7 +3,7 @@ TwoIsland_MapScripts:: @ 8167564 .byte 0 TwoIsland_MapScript1_16756A:: @ 816756A - setworldmapflag 2204 + setworldmapflag FLAG_WORLD_MAP_TWO_ISLAND setflag FLAG_0x2A2 call EventScript_167576 end diff --git a/data/maps/UndergroundPath_EastWestTunnel/scripts.inc b/data/maps/UndergroundPath_EastWestTunnel/scripts.inc index 887137dc9..9137a8ad1 100644 --- a/data/maps/UndergroundPath_EastWestTunnel/scripts.inc +++ b/data/maps/UndergroundPath_EastWestTunnel/scripts.inc @@ -3,5 +3,5 @@ UndergroundPath_EastWestTunnel_MapScripts:: @ 8160ED3 .byte 0 UndergroundPath_EastWestTunnel_MapScript1_160ED9:: @ 8160ED9 - setworldmapflag 2216 + setworldmapflag FLAG_WORLD_MAP_UNDERGROUND_PATH_EAST_WEST_TUNNEL end diff --git a/data/maps/UndergroundPath_NorthSouthTunnel/scripts.inc b/data/maps/UndergroundPath_NorthSouthTunnel/scripts.inc index ff3274fdf..408a60fee 100644 --- a/data/maps/UndergroundPath_NorthSouthTunnel/scripts.inc +++ b/data/maps/UndergroundPath_NorthSouthTunnel/scripts.inc @@ -3,5 +3,5 @@ UndergroundPath_NorthSouthTunnel_MapScripts:: @ 8160EB5 .byte 0 UndergroundPath_NorthSouthTunnel_MapScript1_160EBB:: @ 8160EBB - setworldmapflag 2215 + setworldmapflag FLAG_WORLD_MAP_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL end diff --git a/data/maps/VermilionCity/scripts.inc b/data/maps/VermilionCity/scripts.inc index 3bd6fb07c..8c0b7a1de 100644 --- a/data/maps/VermilionCity/scripts.inc +++ b/data/maps/VermilionCity/scripts.inc @@ -21,7 +21,7 @@ Movement_166903:: @ 8166903 step_end VermilionCity_MapScript1_166906:: @ 8166906 - setworldmapflag 2197 + setworldmapflag FLAG_WORLD_MAP_VERMILION_CITY checkflag FLAG_0x2F9 call_if 1, EventScript_166913 end diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc index e5afd3e26..2849015d2 100644 --- a/data/maps/VictoryRoad_1F/scripts.inc +++ b/data/maps/VictoryRoad_1F/scripts.inc @@ -14,7 +14,7 @@ EventScript_160F1C:: @ 8160F1C return VictoryRoad_1F_MapScript2_160F2F:: @ 8160F2F - setworldmapflag 2218 + setworldmapflag FLAG_WORLD_MAP_VICTORY_ROAD_1F end VictoryRoad_1F_EventScript_160F33:: @ 8160F33 diff --git a/data/maps/ViridianForest/scripts.inc b/data/maps/ViridianForest/scripts.inc index ca8e1dce9..68c5da06a 100644 --- a/data/maps/ViridianForest/scripts.inc +++ b/data/maps/ViridianForest/scripts.inc @@ -3,7 +3,7 @@ ViridianForest_MapScripts:: @ 816051F .byte 0 ViridianForest_MapScript1_160525:: @ 8160525 - setworldmapflag 2212 + setworldmapflag FLAG_WORLD_MAP_VIRIDIAN_FOREST end ViridianForest_EventScript_160529:: @ 8160529 -- cgit v1.2.3 From 15c153273b5e643bf049a941c0ec0ceb5a9b54d6 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 14 May 2019 17:14:47 -0400 Subject: Define map scene vars --- data/maps/CinnabarIsland/scripts.inc | 8 ++-- .../CinnabarIsland_PokemonCenter_1F/scripts.inc | 2 +- data/maps/FiveIsland_LostCave_Room10/scripts.inc | 8 ++-- data/maps/FiveIsland_ResortGorgeous/scripts.inc | 6 +-- data/maps/FourIsland/scripts.inc | 6 +-- .../FuchsiaCity_SafariZone_Entrance/scripts.inc | 14 +++--- data/maps/IndigoPlateau_Exterior/scripts.inc | 6 +-- data/maps/MtEmber_Exterior/scripts.inc | 6 +-- data/maps/OneIsland/scripts.inc | 4 +- data/maps/OneIsland_Harbor/scripts.inc | 6 +-- data/maps/OneIsland_PokemonCenter_1F/map.json | 8 ++-- data/maps/OneIsland_PokemonCenter_1F/scripts.inc | 32 ++++++------- data/maps/PalletTown/map.json | 4 +- data/maps/PalletTown/scripts.inc | 12 ++--- data/maps/PalletTown_GarysHouse/scripts.inc | 2 +- data/maps/PalletTown_PlayersHouse_2F/scripts.inc | 6 +-- data/maps/PalletTown_ProfessorOaksLab/map.json | 12 ++--- data/maps/PalletTown_ProfessorOaksLab/scripts.inc | 56 +++++++++++----------- data/maps/Route16/scripts.inc | 4 +- data/maps/Route16_NorthEntrance_1F/map.json | 12 ++--- data/maps/Route18/scripts.inc | 4 +- data/maps/Route18_EastEntrance_1F/map.json | 12 ++--- data/maps/SSAnne_CaptainsOffice/scripts.inc | 2 +- data/maps/SSAnne_Exterior/scripts.inc | 4 +- .../SaffronCity_PokemonTrainerFanClub/scripts.inc | 16 +++---- data/maps/SeafoamIslands_B3F/scripts.inc | 2 +- data/maps/SeafoamIslands_B4F/map.json | 6 +-- data/maps/SeafoamIslands_B4F/scripts.inc | 6 +-- data/maps/SevenIsland_House_Room1/scripts.inc | 16 +++---- data/maps/SevenIsland_House_Room2/scripts.inc | 6 +-- data/maps/SixIsland_PokemonCenter_1F/scripts.inc | 8 ++-- data/maps/ThreeIsland_BerryForest/scripts.inc | 2 +- data/maps/ThreeIsland_Port/scripts.inc | 2 +- data/maps/TwoIsland_JoyfulGameCorner/scripts.inc | 20 ++++---- data/maps/VermilionCity/scripts.inc | 18 +++---- data/maps/ViridianCity_Mart/scripts.inc | 8 ++-- 36 files changed, 173 insertions(+), 173 deletions(-) (limited to 'data/maps') diff --git a/data/maps/CinnabarIsland/scripts.inc b/data/maps/CinnabarIsland/scripts.inc index 63d8e8f0f..aa31cd1ca 100644 --- a/data/maps/CinnabarIsland/scripts.inc +++ b/data/maps/CinnabarIsland/scripts.inc @@ -10,7 +10,7 @@ CinnabarIsland_MapScript1_166EE1:: @ 8166EE1 call_if 1, EventScript_166F24 compare_var_to_value VAR_0x4071, 3 call_if 1, EventScript_166F52 - compare_var_to_value VAR_0x408A, 1 + compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND, 1 call_if 1, EventScript_166F0B end @@ -51,7 +51,7 @@ EventScript_166F68:: @ 8166F68 return CinnabarIsland_MapScript2_166F6E:: @ 8166F6E - map_script_2 VAR_0x408A, 1, EventScript_166F88 + map_script_2 VAR_MAP_SCENE_CINNABAR_ISLAND, 1, EventScript_166F88 map_script_2 VAR_0x4071, 1, EventScript_166FCD map_script_2 VAR_0x4071, 3, EventScript_166FA0 .2byte 0 @@ -61,7 +61,7 @@ EventScript_166F88:: @ 8166F88 clearflag FLAG_SPECIAL_FLAG_0x4001 savebgm MUS_DUMMY textcolor 0 - setvar VAR_0x408A, 2 + setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 2 delay 20 call EventScript_1670E6 releaseall @@ -224,7 +224,7 @@ EventScript_1670E6:: @ 81670E6 removeobject 3 delay 40 setflag FLAG_0x06B - setvar VAR_0x4075, 1 + setvar VAR_MAP_SCENE_ONE_ISLAND_HARBOR, 1 setvar VAR_0x8004, 8 setvar VAR_0x8006, 1 goto EventScript_1A90DA diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc index 0e162f512..00d3afb78 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc @@ -51,7 +51,7 @@ CinnabarIsland_PokemonCenter_1F_EventScript_16E90A:: @ 816E90A compare_var_to_value VAR_FACING, 3 call_if 1, EventScript_16E993 removeobject 7 - setvar VAR_0x408A, 1 + setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 1 clearflag FLAG_0x062 warp MAP_CINNABAR_ISLAND, 255, 14, 11 waitstate diff --git a/data/maps/FiveIsland_LostCave_Room10/scripts.inc b/data/maps/FiveIsland_LostCave_Room10/scripts.inc index e187fbacc..14622ea67 100644 --- a/data/maps/FiveIsland_LostCave_Room10/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Room10/scripts.inc @@ -9,11 +9,11 @@ FiveIsland_LostCave_Room10_MapScript1_164C38:: @ 8164C38 end EventScript_164C42:: @ 8164C42 - setvar VAR_0x4083, 1 + setvar VAR_MAP_SCENE_FIVE_ISLAND_LOST_CAVE_ROOM10, 1 return FiveIsland_LostCave_Room10_MapScript2_164C48:: @ 8164C48 - map_script_2 VAR_0x4083, 0, EventScript_164C52 + map_script_2 VAR_MAP_SCENE_FIVE_ISLAND_LOST_CAVE_ROOM10, 0, EventScript_164C52 .2byte 0 EventScript_164C52:: @ 8164C52 @@ -42,8 +42,8 @@ EventScript_164C52:: @ 8164C52 EventScript_164CA5:: @ 8164CA5 setflag FLAG_0x093 clearflag FLAG_0x094 - setvar VAR_0x4083, 1 - setvar VAR_0x4084, 1 + setvar VAR_MAP_SCENE_FIVE_ISLAND_LOST_CAVE_ROOM10, 1 + setvar VAR_MAP_SCENE_FIVE_ISLAND_RESORT_GORGEOUS, 1 return EventScript_164CB6:: @ 8164CB6 diff --git a/data/maps/FiveIsland_ResortGorgeous/scripts.inc b/data/maps/FiveIsland_ResortGorgeous/scripts.inc index a65ea5490..ec8cea449 100644 --- a/data/maps/FiveIsland_ResortGorgeous/scripts.inc +++ b/data/maps/FiveIsland_ResortGorgeous/scripts.inc @@ -4,7 +4,7 @@ FiveIsland_ResortGorgeous_MapScripts:: @ 81687E4 .byte 0 FiveIsland_ResortGorgeous_MapScript1_1687EF:: @ 81687EF - map_script_2 VAR_0x4084, 1, EventScript_1687F9 + map_script_2 VAR_MAP_SCENE_FIVE_ISLAND_RESORT_GORGEOUS, 1, EventScript_1687F9 .2byte 0 EventScript_1687F9:: @ 81687F9 @@ -12,7 +12,7 @@ EventScript_1687F9:: @ 81687F9 end FiveIsland_ResortGorgeous_MapScript2_1687FE:: @ 81687FE - map_script_2 VAR_0x4084, 1, EventScript_168808 + map_script_2 VAR_MAP_SCENE_FIVE_ISLAND_RESORT_GORGEOUS, 1, EventScript_168808 .2byte 0 EventScript_168808:: @ 8168808 @@ -31,7 +31,7 @@ EventScript_168808:: @ 8168808 waitdooranim removeobject 8 clearflag FLAG_0x095 - setvar VAR_0x4084, 2 + setvar VAR_MAP_SCENE_FIVE_ISLAND_RESORT_GORGEOUS, 2 releaseall end diff --git a/data/maps/FourIsland/scripts.inc b/data/maps/FourIsland/scripts.inc index 887b9ca4e..97ebe39ec 100644 --- a/data/maps/FourIsland/scripts.inc +++ b/data/maps/FourIsland/scripts.inc @@ -5,7 +5,7 @@ FourIsland_MapScripts:: @ 8167CAE FourIsland_MapScript1_167CB9:: @ 8167CB9 setworldmapflag FLAG_WORLD_MAP_FOUR_ISLAND - compare_var_to_value VAR_0x4086, 0 + compare_var_to_value VAR_MAP_SCENE_FOUR_ISLAND, 0 call_if 1, EventScript_167CCD call EventScript_167CD1 end @@ -23,7 +23,7 @@ EventScript_167CE1:: @ 8167CE1 return FourIsland_MapScript2_167CE2:: @ 8167CE2 - map_script_2 VAR_0x4086, 0, EventScript_167CEC + map_script_2 VAR_MAP_SCENE_FOUR_ISLAND, 0, EventScript_167CEC .2byte 0 EventScript_167CEC:: @ 8167CEC @@ -49,7 +49,7 @@ EventScript_167CEC:: @ 8167CEC playse SE_KAIDAN delay 35 removeobject 10 - setvar VAR_0x4086, 1 + setvar VAR_MAP_SCENE_FOUR_ISLAND, 1 releaseall end diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc index 313a47da7..a32bc6042 100644 --- a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc +++ b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc @@ -3,9 +3,9 @@ FuchsiaCity_SafariZone_Entrance_MapScripts:: @ 816D2A8 .byte 0 FuchsiaCity_SafariZone_Entrance_MapScript1_16D2AE:: @ 816D2AE - map_script_2 VAR_0x406E, 1, EventScript_16D2F2 - map_script_2 VAR_0x406E, 2, EventScript_16D312 - map_script_2 VAR_0x406E, 3, EventScript_16D2C8 + map_script_2 VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 1, EventScript_16D2F2 + map_script_2 VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 2, EventScript_16D312 + map_script_2 VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 3, EventScript_16D2C8 .2byte 0 EventScript_16D2C8:: @ 816D2C8 @@ -19,7 +19,7 @@ EventScript_16D2C8:: @ 816D2C8 applymovement 255, Movement_16D367 waitmovement 0 special sub_80A0EEC - setvar VAR_0x406E, 0 + setvar VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 0 releaseall end @@ -32,7 +32,7 @@ EventScript_16D2F2:: @ 816D2F2 applymovement 255, Movement_16D362 waitmovement 0 special sub_80A0EEC - setvar VAR_0x406E, 0 + setvar VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 0 releaseall end @@ -49,7 +49,7 @@ EventScript_16D312:: @ 816D312 applymovement 255, Movement_16D362 waitmovement 0 special sub_80A0EEC - setvar VAR_0x406E, 0 + setvar VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 0 releaseall end @@ -143,7 +143,7 @@ EventScript_16D3CA:: @ 816D3CA compare_var_to_value VAR_0x4002, 2 call_if 1, EventScript_16D457 special sub_80A0EC4 - setvar VAR_0x406E, 2 + setvar VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 2 warp MAP_SAFARI_ZONE_CENTER, 255, 26, 30 waitstate end diff --git a/data/maps/IndigoPlateau_Exterior/scripts.inc b/data/maps/IndigoPlateau_Exterior/scripts.inc index 656e7045c..873224926 100644 --- a/data/maps/IndigoPlateau_Exterior/scripts.inc +++ b/data/maps/IndigoPlateau_Exterior/scripts.inc @@ -5,7 +5,7 @@ IndigoPlateau_Exterior_MapScripts:: @ 816723B IndigoPlateau_Exterior_MapScript1_167246:: @ 8167246 setworldmapflag FLAG_WORLD_MAP_INDIGO_PLATEAU_EXTERIOR - compare_var_to_value VAR_0x4085, 1 + compare_var_to_value VAR_MAP_SCENE_INDIGO_PLATEAU_EXTERIOR, 1 call_if 1, EventScript_167255 end @@ -14,7 +14,7 @@ EventScript_167255:: @ 8167255 return IndigoPlateau_Exterior_MapScript2_16725A:: @ 816725A - map_script_2 VAR_0x4085, 1, EventScript_167264 + map_script_2 VAR_MAP_SCENE_INDIGO_PLATEAU_EXTERIOR, 1, EventScript_167264 .2byte 0 EventScript_167264:: @ 8167264 @@ -56,7 +56,7 @@ EventScript_167264:: @ 8167264 applymovement 255, Movement_167311 waitmovement 0 special RemoveScriptFieldObject - setvar VAR_0x4085, 0 + setvar VAR_MAP_SCENE_INDIGO_PLATEAU_EXTERIOR, 0 removeobject 1 removeobject 2 special sub_80F39B4 diff --git a/data/maps/MtEmber_Exterior/scripts.inc b/data/maps/MtEmber_Exterior/scripts.inc index 020c334f6..829dfd8a2 100644 --- a/data/maps/MtEmber_Exterior/scripts.inc +++ b/data/maps/MtEmber_Exterior/scripts.inc @@ -15,7 +15,7 @@ EventScript_163960:: @ 8163960 return MtEmber_Exterior_MapScript2_163969:: @ 8163969 - compare_var_to_value VAR_0x4076, 4 + compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4 call_if 4, EventScript_163975 end @@ -27,7 +27,7 @@ MtEmber_Exterior_EventScript_16397F:: @ 816397F lock checktrainerflag 537 goto_if 1, EventScript_16399E - compare_var_to_value VAR_0x4076, 4 + compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4 goto_if 1, EventScript_1639A8 loadword 0, gUnknown_817A82A callstd 4 @@ -70,7 +70,7 @@ MtEmber_Exterior_EventScript_1639F0:: @ 81639F0 faceplayer checktrainerflag 538 goto_if 1, EventScript_163A1B - compare_var_to_value VAR_0x4076, 4 + compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4 goto_if 1, EventScript_163A25 loadword 0, gUnknown_817A88C callstd 4 diff --git a/data/maps/OneIsland/scripts.inc b/data/maps/OneIsland/scripts.inc index b0a4ac263..8b9d0845a 100644 --- a/data/maps/OneIsland/scripts.inc +++ b/data/maps/OneIsland/scripts.inc @@ -8,7 +8,7 @@ OneIsland_MapScript1_16748F:: @ 816748F end OneIsland_MapScript2_167493:: @ 8167493 - map_script_2 VAR_0x4075, 2, EventScript_16749D + map_script_2 VAR_MAP_SCENE_ONE_ISLAND_HARBOR, 2, EventScript_16749D .2byte 0 EventScript_16749D:: @ 816749D @@ -30,7 +30,7 @@ EventScript_16749D:: @ 816749D closedoor 14, 5 waitdooranim removeobject 1 - setvar VAR_0x4075, 3 + setvar VAR_MAP_SCENE_ONE_ISLAND_HARBOR, 3 warp MAP_ONE_ISLAND_POKEMON_CENTER_1F, 255, 9, 9 waitstate releaseall diff --git a/data/maps/OneIsland_Harbor/scripts.inc b/data/maps/OneIsland_Harbor/scripts.inc index 81c7dc54b..44c18ff60 100644 --- a/data/maps/OneIsland_Harbor/scripts.inc +++ b/data/maps/OneIsland_Harbor/scripts.inc @@ -4,7 +4,7 @@ OneIsland_Harbor_MapScripts:: @ 8171378 .byte 0 OneIsland_Harbor_MapScript1_171383:: @ 8171383 - map_script_2 VAR_0x4075, 1, EventScript_17138D + map_script_2 VAR_MAP_SCENE_ONE_ISLAND_HARBOR, 1, EventScript_17138D .2byte 0 EventScript_17138D:: @ 817138D @@ -12,7 +12,7 @@ EventScript_17138D:: @ 817138D end OneIsland_Harbor_MapScript2_171392:: @ 8171392 - map_script_2 VAR_0x4075, 1, EventScript_17139C + map_script_2 VAR_MAP_SCENE_ONE_ISLAND_HARBOR, 1, EventScript_17139C .2byte 0 EventScript_17139C:: @ 817139C @@ -20,7 +20,7 @@ EventScript_17139C:: @ 817139C textcolor 0 applymovement 255, Movement_1713B9 waitmovement 0 - setvar VAR_0x4075, 2 + setvar VAR_MAP_SCENE_ONE_ISLAND_HARBOR, 2 warp MAP_ONE_ISLAND, 255, 12, 18 waitstate releaseall diff --git a/data/maps/OneIsland_PokemonCenter_1F/map.json b/data/maps/OneIsland_PokemonCenter_1F/map.json index ec515417d..381d1f9d4 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/map.json +++ b/data/maps/OneIsland_PokemonCenter_1F/map.json @@ -114,7 +114,7 @@ "x": 12, "y": 6, "elevation": 3, - "var": "VAR_0x4076", + "var": "VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F", "var_value": 2, "script": "OneIsland_PokemonCenter_1F_EventScript_1711AA" }, @@ -123,7 +123,7 @@ "x": 12, "y": 7, "elevation": 3, - "var": "VAR_0x4076", + "var": "VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F", "var_value": 2, "script": "OneIsland_PokemonCenter_1F_EventScript_1711B6" }, @@ -132,7 +132,7 @@ "x": 12, "y": 8, "elevation": 3, - "var": "VAR_0x4076", + "var": "VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F", "var_value": 2, "script": "OneIsland_PokemonCenter_1F_EventScript_1711C2" }, @@ -141,7 +141,7 @@ "x": 12, "y": 9, "elevation": 3, - "var": "VAR_0x4076", + "var": "VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F", "var_value": 2, "script": "OneIsland_PokemonCenter_1F_EventScript_1711CE" } diff --git a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc index e09b5d380..76f8b8c5d 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc @@ -6,7 +6,7 @@ OneIsland_PokemonCenter_1F_MapScripts:: @ 8170BF8 .byte 0 OneIsland_PokemonCenter_1F_MapScript3_170C0D:: @ 8170C0D - compare_var_to_value VAR_0x4076, 5 + compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 call_if 4, EventScript_170C22 checkflag 2116 call_if 1, EventScript_170C36 @@ -28,16 +28,16 @@ EventScript_170C36:: @ 8170C36 OneIsland_PokemonCenter_1F_MapScript1_170C4E:: @ 8170C4E setrespawn 14 - compare_var_to_value VAR_0x4076, 6 + compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 6 call_if 1, EventScript_170C73 - compare_var_to_value VAR_0x4076, 0 + compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 0 call_if 1, EventScript_170C79 - compare_var_to_value VAR_0x4076, 2 + compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 2 call_if 1, EventScript_170C90 end EventScript_170C73:: @ 8170C73 - setvar VAR_0x4076, 7 + setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 7 return EventScript_170C79:: @ 8170C79 @@ -55,7 +55,7 @@ EventScript_170C90:: @ 8170C90 return OneIsland_PokemonCenter_1F_MapScript4_170CA7:: @ 8170CA7 - map_script_2 VAR_0x4076, 0, EventScript_170CB1 + map_script_2 VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 0, EventScript_170CB1 .2byte 0 EventScript_170CB1:: @ 8170CB1 @@ -144,7 +144,7 @@ EventScript_170CB1:: @ 8170CB1 applymovement 3, Movement_1A75E9 waitmovement 0 setflag 2113 - setvar VAR_0x4076, 1 + setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 1 releaseall end @@ -236,22 +236,22 @@ EventScript_170EB1:: @ 8170EB1 OneIsland_PokemonCenter_1F_EventScript_170EC5:: @ 8170EC5 lock faceplayer - compare_var_to_value VAR_0x4076, 7 + compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 7 goto_if 1, EventScript_170F35 - compare_var_to_value VAR_0x4076, 6 + compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 6 goto_if 1, EventScript_170F9B checkflag FLAG_0x2DC goto_if 1, EventScript_170FA5 - compare_var_to_value VAR_0x4076, 5 + compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 goto_if 1, EventScript_17103A checkflag FLAG_0x2DD goto_if 1, EventScript_171044 - compare_var_to_value VAR_0x4076, 4 + compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4 goto_if 1, EventScript_1710F2 specialvar VAR_RESULT, sub_806E25C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1710FC - compare_var_to_value VAR_0x4076, 3 + compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 3 goto_if 1, EventScript_171134 loadword 0, gUnknown_81A1321 callstd 4 @@ -340,7 +340,7 @@ EventScript_170FA5:: @ 8170FA5 setflag 2116 setflag FLAG_0x05C setflag FLAG_0x08C - setvar VAR_0x4076, 6 + setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 6 special InitRoamer release end @@ -389,7 +389,7 @@ EventScript_1710B2:: @ 81710B2 callstd 4 removeitem ITEM_RUBY, 1 removeitem ITEM_TRI_PASS, 1 - setvar VAR_0x4076, 5 + setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 additem ITEM_RAINBOW_PASS, 1 setflag 2118 textcolor 3 @@ -423,7 +423,7 @@ EventScript_1710FC:: @ 81710FC loadword 0, gUnknown_81A17DF callstd 4 setvar VAR_0x407F, 1 - setvar VAR_0x4076, 4 + setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4 release end @@ -577,7 +577,7 @@ EventScript_1711DA:: @ 81711DA waitmovement 0 playse SE_KAIDAN setflag FLAG_0x072 - setvar VAR_0x4076, 3 + setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 3 clearflag FLAG_0x062 setvar VAR_0x4071, 3 setvar VAR_0x8004, 1 diff --git a/data/maps/PalletTown/map.json b/data/maps/PalletTown/map.json index 076af662f..38e88b144 100644 --- a/data/maps/PalletTown/map.json +++ b/data/maps/PalletTown/map.json @@ -93,7 +93,7 @@ "x": 12, "y": 1, "elevation": 3, - "var": "VAR_0x4050", + "var": "VAR_MAP_SCENE_PALLET_TOWN", "var_value": 0, "script": "PalletTown_EventScript_1655ED" }, @@ -102,7 +102,7 @@ "x": 13, "y": 1, "elevation": 3, - "var": "VAR_0x4050", + "var": "VAR_MAP_SCENE_PALLET_TOWN", "var_value": 0, "script": "PalletTown_EventScript_1655F9" }, diff --git a/data/maps/PalletTown/scripts.inc b/data/maps/PalletTown/scripts.inc index bafeced89..202258462 100644 --- a/data/maps/PalletTown/scripts.inc +++ b/data/maps/PalletTown/scripts.inc @@ -39,7 +39,7 @@ EventScript_1654BD:: @ 81654BD return PalletTown_MapScript2_1654CE:: @ 81654CE - map_script_2 VAR_0x4050, 2, EventScript_1654D8 + map_script_2 VAR_MAP_SCENE_PALLET_TOWN, 2, EventScript_1654D8 .2byte 0 EventScript_1654D8:: @ 81654D8 @@ -76,8 +76,8 @@ EventScript_1654D8:: @ 81654D8 waitmovement 0 closedoor 16, 13 waitdooranim - setvar VAR_0x4055, 7 - setvar VAR_0x4050, 3 + setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 7 + setvar VAR_MAP_SCENE_PALLET_TOWN, 3 setflag FLAG_0x02C warp MAP_PALLET_TOWN_PROFESSOR_OAKS_LAB, 255, 6, 12 waitstate @@ -89,7 +89,7 @@ EventScript_16557E:: @ 816557E applymovement 3, Movement_1655BE waitmovement 0 removeobject 3 - setvar VAR_0x4050, 3 + setvar VAR_MAP_SCENE_PALLET_TOWN, 3 releaseall end @@ -225,9 +225,9 @@ EventScript_165605:: @ 8165605 waitmovement 0 closedoor 16, 13 waitdooranim - setvar VAR_0x4055, 1 + setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1 clearflag FLAG_0x02B - setvar VAR_0x4050, 1 + setvar VAR_MAP_SCENE_PALLET_TOWN, 1 setflag FLAG_0x02C setflag FLAG_SPECIAL_FLAG_0x4001 warp MAP_PALLET_TOWN_PROFESSOR_OAKS_LAB, 255, 6, 12 diff --git a/data/maps/PalletTown_GarysHouse/scripts.inc b/data/maps/PalletTown_GarysHouse/scripts.inc index e1adae4c1..56d49fb90 100644 --- a/data/maps/PalletTown_GarysHouse/scripts.inc +++ b/data/maps/PalletTown_GarysHouse/scripts.inc @@ -32,7 +32,7 @@ PalletTown_GarysHouse_EventScript_168D56:: @ 8168D56 goto_if 1, EventScript_168F59 compare_var_to_value VAR_0x4058, 1 goto_if 1, EventScript_168EF6 - compare_var_to_value VAR_0x4055, 1 + compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1 goto_if 4, EventScript_168DAF loadword 0, gUnknown_818D58C callstd 4 diff --git a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc index 1e89902c6..d36443b37 100644 --- a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc +++ b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc @@ -4,7 +4,7 @@ PalletTown_PlayersHouse_2F_MapScripts:: @ 8168CA3 .byte 0 PalletTown_PlayersHouse_2F_MapScript1_168CAE:: @ 8168CAE - compare_var_to_value VAR_0x4056, 0 + compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PLAYERS_HOUSE_2F, 0 call_if 1, EventScript_168CBA end @@ -13,12 +13,12 @@ EventScript_168CBA:: @ 8168CBA return PalletTown_PlayersHouse_2F_MapScript2_168CBE:: @ 8168CBE - map_script_2 VAR_0x4056, 0, EventScript_168CC8 + map_script_2 VAR_MAP_SCENE_PALLET_TOWN_PLAYERS_HOUSE_2F, 0, EventScript_168CC8 .2byte 0 EventScript_168CC8:: @ 8168CC8 turnobject 255, 2 - setvar VAR_0x4056, 1 + setvar VAR_MAP_SCENE_PALLET_TOWN_PLAYERS_HOUSE_2F, 1 end PalletTown_PlayersHouse_2F_EventScript_168CD2:: @ 8168CD2 diff --git a/data/maps/PalletTown_ProfessorOaksLab/map.json b/data/maps/PalletTown_ProfessorOaksLab/map.json index f974f7ac0..8e651c9d8 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/map.json +++ b/data/maps/PalletTown_ProfessorOaksLab/map.json @@ -173,7 +173,7 @@ "x": 5, "y": 8, "elevation": 3, - "var": "VAR_0x4055", + "var": "VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB", "var_value": 2, "script": "PalletTown_ProfessorOaksLab_EventScript_1692C3" }, @@ -182,7 +182,7 @@ "x": 6, "y": 8, "elevation": 3, - "var": "VAR_0x4055", + "var": "VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB", "var_value": 2, "script": "PalletTown_ProfessorOaksLab_EventScript_1692C3" }, @@ -191,7 +191,7 @@ "x": 7, "y": 8, "elevation": 3, - "var": "VAR_0x4055", + "var": "VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB", "var_value": 2, "script": "PalletTown_ProfessorOaksLab_EventScript_1692C3" }, @@ -200,7 +200,7 @@ "x": 5, "y": 8, "elevation": 3, - "var": "VAR_0x4055", + "var": "VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB", "var_value": 3, "script": "PalletTown_ProfessorOaksLab_EventScript_1692E7" }, @@ -209,7 +209,7 @@ "x": 6, "y": 8, "elevation": 3, - "var": "VAR_0x4055", + "var": "VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB", "var_value": 3, "script": "PalletTown_ProfessorOaksLab_EventScript_1692F3" }, @@ -218,7 +218,7 @@ "x": 7, "y": 8, "elevation": 3, - "var": "VAR_0x4055", + "var": "VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB", "var_value": 3, "script": "PalletTown_ProfessorOaksLab_EventScript_1692FF" } diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc index 084ad2491..73a88153c 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc +++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc @@ -6,11 +6,11 @@ PalletTown_ProfessorOaksLab_MapScripts:: @ 8168F7E PalletTown_ProfessorOaksLab_MapScript1_168F8E:: @ 8168F8E setflag FLAG_0x2CF - compare_var_to_value VAR_0x4055, 1 + compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1 call_if 1, EventScript_168FC6 - compare_var_to_value VAR_0x4055, 7 + compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 7 call_if 1, EventScript_168FD5 - compare_var_to_value VAR_0x4055, 8 + compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 8 call_if 1, EventScript_168FC0 checkflag FLAG_0x247 call_if 1, EventScript_168FBC @@ -21,7 +21,7 @@ EventScript_168FBC:: @ 8168FBC return EventScript_168FC0:: @ 8168FC0 - setvar VAR_0x4055, 9 + setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 9 return EventScript_168FC6:: @ 8168FC6 @@ -36,7 +36,7 @@ EventScript_168FD5:: @ 8168FD5 return PalletTown_ProfessorOaksLab_MapScript2_168FE1:: @ 8168FE1 - map_script_2 VAR_0x4055, 1, EventScript_168FEB + map_script_2 VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1, EventScript_168FEB .2byte 0 EventScript_168FEB:: @ 8168FEB @@ -44,8 +44,8 @@ EventScript_168FEB:: @ 8168FEB end PalletTown_ProfessorOaksLab_MapScript3_168FF0:: @ 8168FF0 - map_script_2 VAR_0x4055, 1, EventScript_16923E - map_script_2 VAR_0x4055, 7, EventScript_169002 + map_script_2 VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1, EventScript_16923E + map_script_2 VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 7, EventScript_169002 .2byte 0 EventScript_169002:: @ 8169002 @@ -137,7 +137,7 @@ EventScript_169035:: @ 8169035 call_if 1, EventScript_169B7B removeobject 8 fadedefaultbgm - setvar VAR_0x4055, 8 + setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 8 releaseall end @@ -248,7 +248,7 @@ EventScript_16923E:: @ 816923E callstd 4 loadword 0, gUnknown_818E0EA callstd 4 - setvar VAR_0x4055, 2 + setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2 releaseall end @@ -515,7 +515,7 @@ EventScript_1694C2:: @ 81694C2 removeobject 8 playse SE_KAIDAN fadedefaultbgm - setvar VAR_0x4055, 4 + setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 4 setflag FLAG_0x258 releaseall end @@ -588,9 +588,9 @@ Movement_169559:: @ 8169559 PalletTown_ProfessorOaksLab_EventScript_16955F:: @ 816955F lock faceplayer - compare_var_to_value VAR_0x4055, 3 + compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 goto_if 1, EventScript_16958B - compare_var_to_value VAR_0x4055, 2 + compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2 goto_if 1, EventScript_169581 loadword 0, gUnknown_818DC67 callstd 4 @@ -614,21 +614,21 @@ PalletTown_ProfessorOaksLab_EventScript_169595:: @ 8169595 faceplayer checkflag FLAG_0x002 goto_if 1, EventScript_169600 - compare_var_to_value VAR_0x4055, 9 + compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 9 goto_if 1, EventScript_169903 - compare_var_to_value VAR_0x4055, 8 + compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 8 goto_if 1, EventScript_169A6E checkflag 2092 goto_if 1, EventScript_1699CE compare_var_to_value VAR_0x4052, 1 goto_if 1, EventScript_169903 - compare_var_to_value VAR_0x4055, 6 + compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 6 goto_if 1, EventScript_1698D6 - compare_var_to_value VAR_0x4057, 1 + compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 1 goto_if 4, EventScript_16961E - compare_var_to_value VAR_0x4055, 4 + compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 4 goto_if 1, EventScript_169614 - compare_var_to_value VAR_0x4055, 3 + compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 goto_if 1, EventScript_16960A loadword 0, gUnknown_818E116 callstd 4 @@ -776,8 +776,8 @@ EventScript_16961E:: @ 816961E call_if 1, EventScript_169B7B removeobject 8 fadedefaultbgm - setvar VAR_0x4055, 6 - setvar VAR_0x4057, 2 + setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 6 + setvar VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 2 setvar VAR_0x4051, 1 setvar VAR_0x4058, 1 setvar VAR_0x4054, 1 @@ -1196,9 +1196,9 @@ PalletTown_ProfessorOaksLab_EventScript_169BAB:: @ 8169BAB setvar VAR_0x4002, 1 setvar VAR_0x4003, 4 setvar VAR_0x4004, 7 - compare_var_to_value VAR_0x4055, 3 + compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 goto_if 4, EventScript_169DE4 - compare_var_to_value VAR_0x4055, 2 + compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2 goto_if 1, EventScript_169BE1 loadword 0, gUnknown_818EA19 callstd 4 @@ -1318,7 +1318,7 @@ EventScript_169D2F:: @ 8169D2F waitmessage playfanfare BGM_FRLG_ME_KEYITEM waitfanfare - setvar VAR_0x4055, 3 + setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 checkflag 2110 call_if 1, EventScript_169D5C release @@ -1363,9 +1363,9 @@ PalletTown_ProfessorOaksLab_EventScript_169D78:: @ 8169D78 setvar VAR_0x4002, 7 setvar VAR_0x4003, 1 setvar VAR_0x4004, 5 - compare_var_to_value VAR_0x4055, 3 + compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 goto_if 4, EventScript_169DE4 - compare_var_to_value VAR_0x4055, 2 + compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2 goto_if 1, EventScript_169BE1 loadword 0, gUnknown_818EA19 callstd 4 @@ -1379,9 +1379,9 @@ PalletTown_ProfessorOaksLab_EventScript_169DAE:: @ 8169DAE setvar VAR_0x4002, 4 setvar VAR_0x4003, 7 setvar VAR_0x4004, 6 - compare_var_to_value VAR_0x4055, 3 + compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 goto_if 4, EventScript_169DE4 - compare_var_to_value VAR_0x4055, 2 + compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2 goto_if 1, EventScript_169BE1 loadword 0, gUnknown_818EA19 callstd 4 @@ -1460,7 +1460,7 @@ PalletTown_ProfessorOaksLab_EventScript_169E71:: @ 8169E71 PalletTown_ProfessorOaksLab_EventScript_169E7A:: @ 8169E7A lockall - compare_var_to_value VAR_0x4055, 6 + compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 6 goto_if 4, EventScript_169E90 loadword 0, gUnknown_818EA84 callstd 4 diff --git a/data/maps/Route16/scripts.inc b/data/maps/Route16/scripts.inc index 7b3b035a1..3bccccb50 100644 --- a/data/maps/Route16/scripts.inc +++ b/data/maps/Route16/scripts.inc @@ -14,7 +14,7 @@ EventScript_1680FF:: @ 81680FF return Route16_MapScript2_168103:: @ 8168103 - compare_var_to_value VAR_0x405E, 1 + compare_var_to_value VAR_MAP_SCENE_ROUTE16, 1 call_if 1, EventScript_16810F end @@ -23,7 +23,7 @@ EventScript_16810F:: @ 816810F return Route16_MapScript3_168113:: @ 8168113 - map_script_2 VAR_0x405E, 1, EventScript_16811D + map_script_2 VAR_MAP_SCENE_ROUTE16, 1, EventScript_16811D .2byte 0 EventScript_16811D:: @ 816811D diff --git a/data/maps/Route16_NorthEntrance_1F/map.json b/data/maps/Route16_NorthEntrance_1F/map.json index 586be196d..1216fc987 100644 --- a/data/maps/Route16_NorthEntrance_1F/map.json +++ b/data/maps/Route16_NorthEntrance_1F/map.json @@ -83,7 +83,7 @@ "x": 10, "y": 12, "elevation": 3, - "var": "VAR_0x405E", + "var": "VAR_MAP_SCENE_ROUTE16", "var_value": 1, "script": "Route16_NorthEntrance_1F_EventScript_1A77B6" }, @@ -92,7 +92,7 @@ "x": 2, "y": 12, "elevation": 3, - "var": "VAR_0x405E", + "var": "VAR_MAP_SCENE_ROUTE16", "var_value": 0, "script": "Route16_NorthEntrance_1F_EventScript_1A77C1" }, @@ -119,7 +119,7 @@ "x": 1, "y": 13, "elevation": 3, - "var": "VAR_0x405E", + "var": "VAR_MAP_SCENE_ROUTE16", "var_value": 0, "script": "Route16_NorthEntrance_1F_EventScript_1A77C1" }, @@ -128,7 +128,7 @@ "x": 1, "y": 11, "elevation": 3, - "var": "VAR_0x405E", + "var": "VAR_MAP_SCENE_ROUTE16", "var_value": 0, "script": "Route16_NorthEntrance_1F_EventScript_1A77C1" }, @@ -137,7 +137,7 @@ "x": 11, "y": 11, "elevation": 3, - "var": "VAR_0x405E", + "var": "VAR_MAP_SCENE_ROUTE16", "var_value": 1, "script": "Route16_NorthEntrance_1F_EventScript_1A77B6" }, @@ -146,7 +146,7 @@ "x": 11, "y": 13, "elevation": 3, - "var": "VAR_0x405E", + "var": "VAR_MAP_SCENE_ROUTE16", "var_value": 1, "script": "Route16_NorthEntrance_1F_EventScript_1A77B6" }, diff --git a/data/maps/Route18/scripts.inc b/data/maps/Route18/scripts.inc index 130e3d43c..97f574984 100644 --- a/data/maps/Route18/scripts.inc +++ b/data/maps/Route18/scripts.inc @@ -4,7 +4,7 @@ Route18_MapScripts:: @ 81681F6 .byte 0 Route18_MapScript1_168201:: @ 8168201 - compare_var_to_value VAR_0x405E, 1 + compare_var_to_value VAR_MAP_SCENE_ROUTE16, 1 call_if 1, EventScript_16820D end @@ -13,7 +13,7 @@ EventScript_16820D:: @ 816820D return Route18_MapScript2_168211:: @ 8168211 - map_script_2 VAR_0x405E, 1, EventScript_16821B + map_script_2 VAR_MAP_SCENE_ROUTE16, 1, EventScript_16821B .2byte 0 EventScript_16821B:: @ 816821B diff --git a/data/maps/Route18_EastEntrance_1F/map.json b/data/maps/Route18_EastEntrance_1F/map.json index 6e85ecee0..16286a240 100644 --- a/data/maps/Route18_EastEntrance_1F/map.json +++ b/data/maps/Route18_EastEntrance_1F/map.json @@ -56,7 +56,7 @@ "x": 2, "y": 6, "elevation": 3, - "var": "VAR_0x405E", + "var": "VAR_MAP_SCENE_ROUTE16", "var_value": 0, "script": "Route18_EastEntrance_1F_EventScript_1A77C1" }, @@ -110,7 +110,7 @@ "x": 10, "y": 6, "elevation": 3, - "var": "VAR_0x405E", + "var": "VAR_MAP_SCENE_ROUTE16", "var_value": 1, "script": "Route18_EastEntrance_1F_EventScript_1A77B6" }, @@ -119,7 +119,7 @@ "x": 11, "y": 5, "elevation": 3, - "var": "VAR_0x405E", + "var": "VAR_MAP_SCENE_ROUTE16", "var_value": 1, "script": "Route18_EastEntrance_1F_EventScript_1A77B6" }, @@ -128,7 +128,7 @@ "x": 11, "y": 7, "elevation": 3, - "var": "VAR_0x405E", + "var": "VAR_MAP_SCENE_ROUTE16", "var_value": 1, "script": "Route18_EastEntrance_1F_EventScript_1A77B6" }, @@ -137,7 +137,7 @@ "x": 1, "y": 5, "elevation": 3, - "var": "VAR_0x405E", + "var": "VAR_MAP_SCENE_ROUTE16", "var_value": 0, "script": "Route18_EastEntrance_1F_EventScript_1A77C1" }, @@ -146,7 +146,7 @@ "x": 1, "y": 7, "elevation": 3, - "var": "VAR_0x405E", + "var": "VAR_MAP_SCENE_ROUTE16", "var_value": 0, "script": "Route18_EastEntrance_1F_EventScript_1A77C1" } diff --git a/data/maps/SSAnne_CaptainsOffice/scripts.inc b/data/maps/SSAnne_CaptainsOffice/scripts.inc index 5583646e3..56e5b2fec 100644 --- a/data/maps/SSAnne_CaptainsOffice/scripts.inc +++ b/data/maps/SSAnne_CaptainsOffice/scripts.inc @@ -27,7 +27,7 @@ SSAnne_CaptainsOffice_EventScript_160B3A:: @ 8160B3A loadword 0, gUnknown_81737D2 callstd 4 setflag FLAG_0x237 - setvar VAR_0x407E, 1 + setvar VAR_MAP_SCENE_VERMILION_CITY, 1 release end diff --git a/data/maps/SSAnne_Exterior/scripts.inc b/data/maps/SSAnne_Exterior/scripts.inc index 3d7a41b35..0d08a0152 100644 --- a/data/maps/SSAnne_Exterior/scripts.inc +++ b/data/maps/SSAnne_Exterior/scripts.inc @@ -8,7 +8,7 @@ SSAnne_Exterior_MapScript1_16084B:: @ 816084B end SSAnne_Exterior_MapScript2_16084F:: @ 816084F - map_script_2 VAR_0x407E, 1, SSAnne_Exterior_160859 + map_script_2 VAR_MAP_SCENE_VERMILION_CITY, 1, SSAnne_Exterior_160859 .2byte 0 SSAnne_Exterior_160859:: @ 8160859 @@ -25,7 +25,7 @@ SSAnne_Exterior_160859:: @ 8160859 removeobject 1 applymovement 255, Movement_1608B7 waitmovement 0 - setvar VAR_0x407E, 2 + setvar VAR_MAP_SCENE_VERMILION_CITY, 2 setvar VAR_0x4053, 0 warp MAP_VERMILION_CITY, 255, 23, 34 waitstate diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc b/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc index 4d1217282..1c0809ce3 100644 --- a/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc +++ b/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc @@ -4,7 +4,7 @@ SaffronCity_PokemonTrainerFanClub_MapScripts:: @ 816F0BF .byte 0 SaffronCity_PokemonTrainerFanClub_MapScript1_16F0CA:: @ 816F0CA - map_script_2 VAR_0x4073, 1, EventScript_16F0D4 + map_script_2 VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 1, EventScript_16F0D4 .2byte 0 EventScript_16F0D4:: @ 816F0D4 @@ -26,7 +26,7 @@ EventScript_16F0D4:: @ 816F0D4 waitmovement 0 loadword 0, gUnknown_819C235 callstd 4 - setvar VAR_0x4073, 2 + setvar VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 2 releaseall end @@ -73,9 +73,9 @@ Movement_16F13E:: @ 816F13E step_end SaffronCity_PokemonTrainerFanClub_MapScript2_16F144:: @ 816F144 - compare_var_to_value VAR_0x4073, 1 + compare_var_to_value VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 1 goto_if 1, EventScript_16F267 - compare_var_to_value VAR_0x4073, 2 + compare_var_to_value VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 2 goto_if 1, EventScript_16F15B end @@ -168,7 +168,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F281:: @ 816F281 faceplayer setvar VAR_0x8004, 0 special sub_81133A4 - compare_var_to_value VAR_0x4073, 0 + compare_var_to_value VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 goto_if 1, EventScript_16F2EE specialvar VAR_RESULT, sub_8113364 compare_var_to_value VAR_RESULT, 1 @@ -213,7 +213,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F2F8:: @ 816F2F8 faceplayer setvar VAR_0x8004, 3 special sub_81133A4 - compare_var_to_value VAR_0x4073, 0 + compare_var_to_value VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 goto_if 1, EventScript_16F365 specialvar VAR_RESULT, sub_8113364 compare_var_to_value VAR_RESULT, 1 @@ -258,7 +258,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F36F:: @ 816F36F faceplayer setvar VAR_0x8004, 1 special sub_81133A4 - compare_var_to_value VAR_0x4073, 0 + compare_var_to_value VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 goto_if 1, EventScript_16F3DC specialvar VAR_RESULT, sub_8113364 compare_var_to_value VAR_RESULT, 1 @@ -303,7 +303,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F3E6:: @ 816F3E6 faceplayer setvar VAR_0x8004, 2 special sub_81133A4 - compare_var_to_value VAR_0x4073, 0 + compare_var_to_value VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 goto_if 1, EventScript_16F453 specialvar VAR_RESULT, sub_8113364 compare_var_to_value VAR_RESULT, 1 diff --git a/data/maps/SeafoamIslands_B3F/scripts.inc b/data/maps/SeafoamIslands_B3F/scripts.inc index a5ac9bbf7..8f43bfec1 100644 --- a/data/maps/SeafoamIslands_B3F/scripts.inc +++ b/data/maps/SeafoamIslands_B3F/scripts.inc @@ -46,7 +46,7 @@ EventScript_162FA2:: @ 8162FA2 call_if 0, EventScript_162FF6 compare_var_to_value VAR_0x8008, 24 call_if 4, EventScript_163001 - setvar VAR_0x4063, 1 + setvar VAR_MAP_SCENE_SEAFOAM_ISLANDS_B4F, 1 warp MAP_SEAFOAM_ISLANDS_B4F, 255, 27, 21 waitstate releaseall diff --git a/data/maps/SeafoamIslands_B4F/map.json b/data/maps/SeafoamIslands_B4F/map.json index 283120f81..64a6719d7 100644 --- a/data/maps/SeafoamIslands_B4F/map.json +++ b/data/maps/SeafoamIslands_B4F/map.json @@ -102,7 +102,7 @@ "x": 26, "y": 19, "elevation": 1, - "var": "VAR_0x4063", + "var": "VAR_MAP_SCENE_SEAFOAM_ISLANDS_B4F", "var_value": 0, "script": "SeafoamIslands_B4F_EventScript_16319D" }, @@ -111,7 +111,7 @@ "x": 27, "y": 19, "elevation": 1, - "var": "VAR_0x4063", + "var": "VAR_MAP_SCENE_SEAFOAM_ISLANDS_B4F", "var_value": 0, "script": "SeafoamIslands_B4F_EventScript_16319D" }, @@ -120,7 +120,7 @@ "x": 28, "y": 19, "elevation": 1, - "var": "VAR_0x4063", + "var": "VAR_MAP_SCENE_SEAFOAM_ISLANDS_B4F", "var_value": 0, "script": "SeafoamIslands_B4F_EventScript_16319D" } diff --git a/data/maps/SeafoamIslands_B4F/scripts.inc b/data/maps/SeafoamIslands_B4F/scripts.inc index a2d2189b4..b9d1ca5ba 100644 --- a/data/maps/SeafoamIslands_B4F/scripts.inc +++ b/data/maps/SeafoamIslands_B4F/scripts.inc @@ -65,7 +65,7 @@ EventScript_1630D4:: @ 81630D4 end SeafoamIslands_B4F_MapScript4_1630E7:: @ 81630E7 - map_script_2 VAR_0x4063, 1, EventScript_1630F1 + map_script_2 VAR_MAP_SCENE_SEAFOAM_ISLANDS_B4F, 1, EventScript_1630F1 .2byte 0 EventScript_1630F1:: @ 81630F1 @@ -74,7 +74,7 @@ EventScript_1630F1:: @ 81630F1 end SeafoamIslands_B4F_MapScript5_1630F9:: @ 81630F9 - map_script_2 VAR_0x4063, 1, EventScript_16310B + map_script_2 VAR_MAP_SCENE_SEAFOAM_ISLANDS_B4F, 1, EventScript_16310B map_script_2 VAR_0x4001, 1, EventScript_163121 .2byte 0 @@ -82,7 +82,7 @@ EventScript_16310B:: @ 816310B lockall applymovement 255, Movement_16311D waitmovement 0 - setvar VAR_0x4063, 0 + setvar VAR_MAP_SCENE_SEAFOAM_ISLANDS_B4F, 0 releaseall end diff --git a/data/maps/SevenIsland_House_Room1/scripts.inc b/data/maps/SevenIsland_House_Room1/scripts.inc index fa023efd4..03f21af78 100644 --- a/data/maps/SevenIsland_House_Room1/scripts.inc +++ b/data/maps/SevenIsland_House_Room1/scripts.inc @@ -7,7 +7,7 @@ SevenIsland_House_Room1_MapScript1_170895:: @ 8170895 special ValidateEReaderTrainer compare_var_to_value VAR_RESULT, 0 call_if 1, EventScript_1708AF - compare_var_to_value VAR_0x4074, 0 + compare_var_to_value VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 0 call_if 5, EventScript_1708C3 end @@ -24,9 +24,9 @@ EventScript_1708C3:: @ 81708C3 return SevenIsland_House_Room1_MapScript2_1708CF:: @ 81708CF - map_script_2 VAR_0x4074, 1, EventScript_1708E9 - map_script_2 VAR_0x4074, 2, EventScript_1708E9 - map_script_2 VAR_0x4074, 3, EventScript_1708E9 + map_script_2 VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 1, EventScript_1708E9 + map_script_2 VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 2, EventScript_1708E9 + map_script_2 VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 3, EventScript_1708E9 .2byte 0 EventScript_1708E9:: @ 1708E9 @@ -39,14 +39,14 @@ EventScript_1708E9:: @ 1708E9 moveobjectoffscreen 1 applymovement 255, Movement_1A75E9 waitmovement 0 - compare_var_to_value VAR_0x4074, 1 + compare_var_to_value VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 1 call_if 1, EventScript_170938 - compare_var_to_value VAR_0x4074, 2 + compare_var_to_value VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 2 call_if 1, EventScript_170941 - compare_var_to_value VAR_0x4074, 3 + compare_var_to_value VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 3 call_if 1, EventScript_17094A special LoadPlayerParty - setvar VAR_0x4074, 0 + setvar VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 0 releaseall end diff --git a/data/maps/SevenIsland_House_Room2/scripts.inc b/data/maps/SevenIsland_House_Room2/scripts.inc index 57bfa131c..a0f3f6f20 100644 --- a/data/maps/SevenIsland_House_Room2/scripts.inc +++ b/data/maps/SevenIsland_House_Room2/scripts.inc @@ -41,20 +41,20 @@ EventScript_170A97:: @ 8170A97 end EventScript_170AFE:: @ 8170AFE - setvar VAR_0x4074, 3 + setvar VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 3 loadword 0, gUnknown_81A07EC callstd 4 return EventScript_170B0C:: @ 8170B0C - setvar VAR_0x4074, 1 + setvar VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 1 special sub_80CA68C waitmessage waitbuttonpress return EventScript_170B17:: @ 8170B17 - setvar VAR_0x4074, 2 + setvar VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 2 special sub_80CA68C waitmessage waitbuttonpress diff --git a/data/maps/SixIsland_PokemonCenter_1F/scripts.inc b/data/maps/SixIsland_PokemonCenter_1F/scripts.inc index 2eb0554e4..c9335f853 100644 --- a/data/maps/SixIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/SixIsland_PokemonCenter_1F/scripts.inc @@ -6,7 +6,7 @@ SixIsland_PokemonCenter_1F_MapScripts:: @ 8171D6A SixIsland_PokemonCenter_1F_MapScript1_171D7A:: @ 8171D7A setrespawn 20 - compare_var_to_value VAR_0x4089, 0 + compare_var_to_value VAR_MAP_SCENE_SIX_ISLAND_POKEMON_CENTER_1F, 0 call_if 1, EventScript_171D89 end @@ -15,7 +15,7 @@ EventScript_171D89:: @ 8171D89 return SixIsland_PokemonCenter_1F_MapScript3_171D8D:: @ 8171D8D - map_script_2 VAR_0x4089, 0, EventScript_171D97 + map_script_2 VAR_MAP_SCENE_SIX_ISLAND_POKEMON_CENTER_1F, 0, EventScript_171D97 .2byte 0 EventScript_171D97:: @ 8171D97 @@ -41,8 +41,8 @@ EventScript_171D97:: @ 8171D97 playse SE_KAIDAN delay 35 removeobject 2 - setvar VAR_0x4089, 1 - setvar VAR_0x4086, 1 + setvar VAR_MAP_SCENE_SIX_ISLAND_POKEMON_CENTER_1F, 1 + setvar VAR_MAP_SCENE_FOUR_ISLAND, 1 releaseall end diff --git a/data/maps/ThreeIsland_BerryForest/scripts.inc b/data/maps/ThreeIsland_BerryForest/scripts.inc index 5acd5a6d3..d7413edd5 100644 --- a/data/maps/ThreeIsland_BerryForest/scripts.inc +++ b/data/maps/ThreeIsland_BerryForest/scripts.inc @@ -43,7 +43,7 @@ ThreeIsland_BerryForest_EventScript_163C83:: @ 8163C83 closemessage setflag FLAG_0x2A3 setflag FLAG_0x07A - setvar VAR_0x4079, 2 + setvar VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 2 clearflag FLAG_0x075 warp MAP_TWO_ISLAND_JOYFUL_GAME_CORNER, 255, 6, 6 waitstate diff --git a/data/maps/ThreeIsland_Port/scripts.inc b/data/maps/ThreeIsland_Port/scripts.inc index 8ea267722..0e0760109 100644 --- a/data/maps/ThreeIsland_Port/scripts.inc +++ b/data/maps/ThreeIsland_Port/scripts.inc @@ -10,7 +10,7 @@ ThreeIsland_Port_MapScript1_16878F:: @ 816878F ThreeIsland_Port_EventScript_168796:: @ 8168796 lock faceplayer - compare_var_to_value VAR_0x4079, 2 + compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 2 goto_if 4, EventScript_1687B8 compare_var_to_value VAR_0x407B, 4 goto_if 4, EventScript_1687C2 diff --git a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc index 496c0fa3d..58b6052f2 100644 --- a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc +++ b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc @@ -14,11 +14,11 @@ EventScript_1713EF:: @ 81713EF setobjectxyperm 1, 6, 2 setobjectmovementtype 1, 8 setobjectmovementtype 3, 1 - setvar VAR_0x4079, 4 + setvar VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 4 return TwoIsland_JoyfulGameCorner_MapScript2_171404:: @ 8171404 - map_script_2 VAR_0x4079, 2, EventScript_171416 + map_script_2 VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 2, EventScript_171416 map_script_2 VAR_0x406F, 8, EventScript_1BB227 .2byte 0 @@ -27,8 +27,8 @@ EventScript_171416:: @ 8171416 end TwoIsland_JoyfulGameCorner_MapScript3_17141B:: @ 817141B - map_script_2 VAR_0x4079, 0, EventScript_17145F - map_script_2 VAR_0x4079, 2, EventScript_171435 + map_script_2 VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 0, EventScript_17145F + map_script_2 VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 2, EventScript_171435 map_script_2 VAR_0x406F, 8, EventScript_1BB2FD .2byte 0 @@ -44,7 +44,7 @@ EventScript_171435:: @ 8171435 closemessage applymovement 3, Movement_1A75ED waitmovement 0 - setvar VAR_0x4079, 3 + setvar VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 3 releaseall end @@ -97,7 +97,7 @@ EventScript_17145F:: @ 817145F callstd 4 clearflag FLAG_0x091 setvar VAR_0x407B, 2 - setvar VAR_0x4079, 1 + setvar VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 1 releaseall end @@ -133,7 +133,7 @@ Movement_17152F:: @ 817152F TwoIsland_JoyfulGameCorner_EventScript_171535:: @ 8171535 lock faceplayer - compare_var_to_value VAR_0x4079, 4 + compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 4 goto_if 1, EventScript_1BC060 checkflag FLAG_0x2A3 goto_if 1, EventScript_171555 @@ -151,11 +151,11 @@ EventScript_171555:: @ 8171555 TwoIsland_JoyfulGameCorner_EventScript_17155F:: @ 817155F lock faceplayer - compare_var_to_value VAR_0x4079, 4 + compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 4 goto_if 1, EventScript_1BC0CE checkflag FLAG_0x2FB goto_if 1, EventScript_1715F5 - compare_var_to_value VAR_0x4079, 3 + compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 3 goto_if 1, EventScript_17158A loadword 0, gUnknown_81A2743 callstd 4 @@ -167,7 +167,7 @@ EventScript_17158A:: @ 817158A goto_if 1, EventScript_1715C4 loadword 0, gUnknown_81A296A callstd 4 - setvar VAR_0x4076, 2 + setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 2 textcolor 3 playfanfare MUS_ME_WAZA message Text_1A29F7 diff --git a/data/maps/VermilionCity/scripts.inc b/data/maps/VermilionCity/scripts.inc index 8c0b7a1de..f1b10e1d2 100644 --- a/data/maps/VermilionCity/scripts.inc +++ b/data/maps/VermilionCity/scripts.inc @@ -4,14 +4,14 @@ VermilionCity_MapScripts:: @ 81668DC .byte 0 VermilionCity_MapScript2_1668E7:: @ 81668E7 - map_script_2 VAR_0x407E, 2, EventScript_1668F1 + map_script_2 VAR_MAP_SCENE_VERMILION_CITY, 2, EventScript_1668F1 .2byte 0 EventScript_1668F1:: @ 81668F1 lockall applymovement 255, Movement_166903 waitmovement 0 - setvar VAR_0x407E, 3 + setvar VAR_MAP_SCENE_VERMILION_CITY, 3 releaseall end @@ -38,7 +38,7 @@ VermilionCity_EventScript_166917:: @ 8166917 VermilionCity_EventScript_166920:: @ 8166920 lock faceplayer - compare_var_to_value VAR_0x407E, 3 + compare_var_to_value VAR_MAP_SCENE_VERMILION_CITY, 3 goto_if 1, EventScript_166937 loadword 0, gUnknown_817F776 callstd 4 @@ -54,7 +54,7 @@ EventScript_166937:: @ 8166937 VermilionCity_EventScript_166941:: @ 8166941 lock faceplayer - compare_var_to_value VAR_0x407E, 3 + compare_var_to_value VAR_MAP_SCENE_VERMILION_CITY, 3 goto_if 1, EventScript_166996 loadword 0, gUnknown_817FA22 callstd 4 @@ -81,9 +81,9 @@ EventScript_166977:: @ 8166977 EventScript_166996:: @ 8166996 setvar VAR_0x8004, 0 - compare_var_to_value VAR_0x4076, 5 + compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 goto_if 4, EventScript_1669BB - compare_var_to_value VAR_0x4076, 1 + compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 1 goto_if 4, EventScript_166B3B loadword 0, gUnknown_817FB10 callstd 4 @@ -236,7 +236,7 @@ EventScript_166BA0:: @ 8166BA0 applymovement 6, Movement_1A75E7 applymovement 255, Movement_1A75EB waitmovement 0 - compare_var_to_value VAR_0x407E, 3 + compare_var_to_value VAR_MAP_SCENE_VERMILION_CITY, 3 goto_if 1, EventScript_166BED loadword 0, gUnknown_817FA3C callstd 4 @@ -257,9 +257,9 @@ EventScript_166BDE:: @ 8166BDE EventScript_166BED:: @ 8166BED setvar VAR_0x8004, 0 - compare_var_to_value VAR_0x4076, 5 + compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 goto_if 4, EventScript_1669BB - compare_var_to_value VAR_0x4076, 1 + compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 1 goto_if 4, EventScript_166B3B loadword 0, gUnknown_817FB10 callstd 4 diff --git a/data/maps/ViridianCity_Mart/scripts.inc b/data/maps/ViridianCity_Mart/scripts.inc index 0f5bb19c8..383960ddc 100644 --- a/data/maps/ViridianCity_Mart/scripts.inc +++ b/data/maps/ViridianCity_Mart/scripts.inc @@ -14,7 +14,7 @@ EventScript_16A1E8:: @ 816A1E8 end ViridianCity_Mart_MapScript2_16A1FB:: @ 816A1FB - map_script_2 VAR_0x4057, 0, EventScript_16A205 + map_script_2 VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 0, EventScript_16A205 .2byte 0 EventScript_16A205:: @ 816A205 @@ -30,14 +30,14 @@ EventScript_16A205:: @ 816A205 waitmovement 0 loadword 0, gUnknown_819023A callstd 4 - setvar VAR_0x4057, 1 + setvar VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 1 additem ITEM_OAKS_PARCEL, 1 loadword 0, gUnknown_8190289 setorcopyvar VAR_0x8000, 349 setorcopyvar VAR_0x8001, 1 setorcopyvar VAR_0x8002, 318 callstd 9 - setvar VAR_0x4055, 5 + setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 5 releaseall end @@ -60,7 +60,7 @@ Movement_16A262:: @ 816A262 ViridianCity_Mart_EventScript_16A268:: @ 816A268 lock faceplayer - compare_var_to_value VAR_0x4057, 1 + compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 1 goto_if 1, EventScript_16A2A4 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 -- cgit v1.2.3 From 9a464931d207da83d3fb582e35821ba50ced6afc Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 14 May 2019 17:35:04 -0400 Subject: Replace some hardcoded flags/vars --- data/maps/BirthIsland_Exterior/scripts.inc | 8 ++++---- data/maps/CeladonCity_Condominiums_1F/scripts.inc | 2 +- .../CeladonCity_GameCorner_PrizeRoom/scripts.inc | 24 +++++++++++----------- data/maps/CeladonCity_Gym/scripts.inc | 4 ++-- data/maps/CeruleanCave_B1F/scripts.inc | 6 +++--- data/maps/CeruleanCity/scripts.inc | 2 +- data/maps/CeruleanCity_Gym/scripts.inc | 4 ++-- data/maps/CeruleanCity_House5/scripts.inc | 2 +- data/maps/CinnabarIsland_Gym/scripts.inc | 12 +++++------ data/maps/FiveIsland_LostCave_Room10/scripts.inc | 4 ++-- data/maps/FiveIsland_RocketWarehouse/scripts.inc | 4 ++-- data/maps/FourIsland/scripts.inc | 2 +- .../IndigoPlateau_PokemonCenter_1F/scripts.inc | 4 ++-- data/maps/MtEmber_Exterior/scripts.inc | 8 ++++---- data/maps/MtEmber_Summit/scripts.inc | 6 +++--- data/maps/MtMoon_B2F/scripts.inc | 2 +- data/maps/NavelRock_Base/scripts.inc | 6 +++--- data/maps/NavelRock_Summit/scripts.inc | 6 +++--- data/maps/OneIsland/scripts.inc | 2 +- data/maps/OneIsland_PokemonCenter_1F/scripts.inc | 18 ++++++++-------- data/maps/PalletTown/scripts.inc | 4 ++-- data/maps/PalletTown_GarysHouse/scripts.inc | 2 +- data/maps/PalletTown_ProfessorOaksLab/scripts.inc | 18 ++++++++-------- data/maps/PewterCity/scripts.inc | 2 +- data/maps/PokemonLeague_AgathasRoom/scripts.inc | 8 ++++---- data/maps/PokemonLeague_BrunosRoom/scripts.inc | 8 ++++---- data/maps/PokemonLeague_ChampionsRoom/scripts.inc | 20 +++++++++--------- data/maps/PokemonLeague_LancesRoom/scripts.inc | 8 ++++---- data/maps/PokemonLeague_LoreleisRoom/scripts.inc | 8 ++++---- data/maps/PowerPlant/scripts.inc | 14 ++++++------- data/maps/RocketHideout_B1F/scripts.inc | 2 +- data/maps/RocketHideout_B4F/scripts.inc | 12 +++++------ data/maps/Route12/scripts.inc | 6 +++--- data/maps/Route16/scripts.inc | 8 ++++---- data/maps/Route16_NorthEntrance_1F/scripts.inc | 2 +- data/maps/Route18/scripts.inc | 2 +- data/maps/Route18_EastEntrance_1F/scripts.inc | 2 +- data/maps/Route25_SeaCottage/scripts.inc | 2 +- data/maps/SaffronCity_Dojo/scripts.inc | 6 +++--- data/maps/SaffronCity_Gym/scripts.inc | 4 ++-- data/maps/SeafoamIslands_B4F/scripts.inc | 6 +++--- .../scripts.inc | 4 ++-- data/maps/ThreeIsland_Port/scripts.inc | 2 +- data/maps/TwoIsland/scripts.inc | 4 ++-- data/maps/VermilionCity/scripts.inc | 4 ++-- data/maps/VermilionCity_Gym/scripts.inc | 4 ++-- data/maps/VermilionCity_PokemonFanClub/scripts.inc | 2 +- data/maps/ViridianCity/scripts.inc | 8 ++++---- data/maps/ViridianCity_Gym/scripts.inc | 4 ++-- data/maps/ViridianCity_Mart/scripts.inc | 2 +- 50 files changed, 152 insertions(+), 152 deletions(-) (limited to 'data/maps') diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc index 269dbea5b..5c5460119 100644 --- a/data/maps/BirthIsland_Exterior/scripts.inc +++ b/data/maps/BirthIsland_Exterior/scripts.inc @@ -28,11 +28,11 @@ EventScript_165243:: @ 8165243 checkflag FLAG_0x2F7 goto_if 1, EventScript_1A77A9 clearflag FLAG_0x09A - clearflag 2120 + clearflag FLAG_0x848 return BirthIsland_Exterior_MapScript2_165253:: @ 8165253 - checkflag 2055 + checkflag FLAG_0x807 call_if 1, EventScript_16525D end @@ -95,10 +95,10 @@ EventScript_1652C0:: @ 81652C0 setvar VAR_0x8005, 30 setvar VAR_0x8006, 0 special sub_8044838 - setflag 2055 + setflag FLAG_0x807 special sub_807F9D8 waitstate - clearflag 2055 + clearflag FLAG_0x807 specialvar VAR_RESULT, sub_80CA74C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_16533A diff --git a/data/maps/CeladonCity_Condominiums_1F/scripts.inc b/data/maps/CeladonCity_Condominiums_1F/scripts.inc index e30e70186..0e1708b0d 100644 --- a/data/maps/CeladonCity_Condominiums_1F/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_1F/scripts.inc @@ -6,7 +6,7 @@ CeladonCity_Condominiums_1F_EventScript_16C321:: @ 816C321 faceplayer checkflag FLAG_0x2F8 goto_if 1, EventScript_16C36A - checkflag 2092 + checkflag FLAG_0x82C goto_if 1, EventScript_16C374 checkflag FLAG_0x2A6 goto_if 1, EventScript_16C36A diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc index e6973ddf3..60570bbbf 100644 --- a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc +++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc @@ -82,7 +82,7 @@ EventScript_16CC55:: @ 816CC55 end EventScript_16CC65:: @ 816CC65 - getspeciesname 0, 16385 + getspeciesname 0, VAR_0x4001 loadword 0, gUnknown_819709D callstd 5 compare_var_to_value VAR_RESULT, 0 @@ -107,32 +107,32 @@ EventScript_16CC65:: @ 816CC65 end EventScript_16CCD4:: @ 816CCD4 - givemon 16385, 9, ITEM_NONE, 0, 0, 0 + givemon VAR_0x4001, 9, ITEM_NONE, 0, 0, 0 goto EventScript_16CD52 end EventScript_16CCE9:: @ 816CCE9 - givemon 16385, 8, ITEM_NONE, 0, 0, 0 + givemon VAR_0x4001, 8, ITEM_NONE, 0, 0, 0 goto EventScript_16CD52 end EventScript_16CCFE:: @ 816CCFE - givemon 16385, 18, ITEM_NONE, 0, 0, 0 + givemon VAR_0x4001, 18, ITEM_NONE, 0, 0, 0 goto EventScript_16CD52 end EventScript_16CD13:: @ 816CD13 - givemon 16385, 25, ITEM_NONE, 0, 0, 0 + givemon VAR_0x4001, 25, ITEM_NONE, 0, 0, 0 goto EventScript_16CD52 end EventScript_16CD28:: @ 816CD28 - givemon 16385, 26, ITEM_NONE, 0, 0, 0 + givemon VAR_0x4001, 26, ITEM_NONE, 0, 0, 0 goto EventScript_16CD52 end EventScript_16CD3D:: @ 816CD3D - givemon 16385, 18, ITEM_NONE, 0, 0, 0 + givemon VAR_0x4001, 18, ITEM_NONE, 0, 0, 0 goto EventScript_16CD52 end @@ -177,7 +177,7 @@ EventScript_16CDA5:: @ 816CDA5 EventScript_16CDB3:: @ 816CDB3 takecoins VAR_0x4002 updatecoinsbox 0, 5 - getspeciesname 0, 16385 + getspeciesname 0, VAR_0x4001 playfanfare MUS_FANFA1 message Text_1A5DF1 waitmessage @@ -192,7 +192,7 @@ EventScript_16CDB3:: @ 816CDB3 EventScript_16CDE0:: @ 816CDE0 takecoins VAR_0x4002 updatecoinsbox 0, 5 - getspeciesname 0, 16385 + getspeciesname 0, VAR_0x4001 playfanfare MUS_FANFA1 message Text_1A5DF1 waitmessage @@ -289,7 +289,7 @@ EventScript_16CF09:: @ 816CF09 end EventScript_16CF22:: @ 816CF22 - getitemname 0, 16385 + getitemname 0, VAR_0x4001 loadword 0, gUnknown_819709D callstd 5 compare_var_to_value VAR_RESULT, 0 @@ -298,11 +298,11 @@ EventScript_16CF22:: @ 816CF22 end EventScript_16CF3F:: @ 816CF3F - getitemname 0, 16385 + getitemname 0, VAR_0x4001 checkcoins VAR_RESULT compare_var_to_var VAR_RESULT, VAR_0x4002 goto_if 0, EventScript_16CDA5 - checkitemspace 16385, 1 + checkitemspace VAR_0x4001, 1 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16CF79 takecoins VAR_0x4002 diff --git a/data/maps/CeladonCity_Gym/scripts.inc b/data/maps/CeladonCity_Gym/scripts.inc index 5b8d3ec3c..de2ed3f54 100644 --- a/data/maps/CeladonCity_Gym/scripts.inc +++ b/data/maps/CeladonCity_Gym/scripts.inc @@ -22,7 +22,7 @@ EventScript_16D0A0:: @ 816D0A0 special SetFlavorTextFlagFromSpecialVars clearflag FLAG_0x09E setflag FLAG_0x4B3 - setflag 2083 + setflag FLAG_0x823 setvar VAR_0x8008, 4 call EventScript_1A6B18 goto EventScript_16D0C6 @@ -102,7 +102,7 @@ CeladonCity_Gym_EventScript_16D1B5:: @ 816D1B5 CeladonCity_Gym_EventScript_16D1CC:: @ 816D1CC lockall - checkflag 2083 + checkflag FLAG_0x823 goto_if 1, EventScript_16D1E0 loadword 0, gUnknown_8197874 callstd 4 diff --git a/data/maps/CeruleanCave_B1F/scripts.inc b/data/maps/CeruleanCave_B1F/scripts.inc index 433266be7..5f80fe18f 100644 --- a/data/maps/CeruleanCave_B1F/scripts.inc +++ b/data/maps/CeruleanCave_B1F/scripts.inc @@ -4,7 +4,7 @@ CeruleanCave_B1F_MapScripts:: @ 81624BE .byte 0 CeruleanCave_B1F_MapScript1_1624C9:: @ 81624C9 - checkflag 2055 + checkflag FLAG_0x807 call_if 1, EventScript_1624D3 end @@ -40,10 +40,10 @@ CeruleanCave_B1F_EventScript_1624F5:: @ 81624F5 playbgm BGM_FRLG_LEADER_EYE, 0 waitbuttonpress setwildbattle SPECIES_MEWTWO, 70, ITEM_NONE - setflag 2055 + setflag FLAG_0x807 special sub_807F9D8 waitstate - clearflag 2055 + clearflag FLAG_0x807 specialvar VAR_RESULT, sub_80CA74C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_162558 diff --git a/data/maps/CeruleanCity/scripts.inc b/data/maps/CeruleanCity/scripts.inc index dd13a913d..f2f773d22 100644 --- a/data/maps/CeruleanCity/scripts.inc +++ b/data/maps/CeruleanCity/scripts.inc @@ -179,7 +179,7 @@ Movement_1665FB:: @ 81665FB CeruleanCity_EventScript_166603:: @ 8166603 lock faceplayer - checktrainerflag 355 + checktrainerflag FLAG_0x163 goto_if 1, EventScript_16662E message Text_17EE0E waitmessage diff --git a/data/maps/CeruleanCity_Gym/scripts.inc b/data/maps/CeruleanCity_Gym/scripts.inc index 46a11bc54..7dec220b6 100644 --- a/data/maps/CeruleanCity_Gym/scripts.inc +++ b/data/maps/CeruleanCity_Gym/scripts.inc @@ -18,7 +18,7 @@ EventScript_16AAD3:: @ 816AAD3 setvar VAR_0x8005, 1 special SetFlavorTextFlagFromSpecialVars setflag FLAG_0x4B1 - setflag 2081 + setflag FLAG_0x821 setrespawn 4 setvar VAR_0x8008, 2 call EventScript_1A6B18 @@ -82,7 +82,7 @@ EventScript_16AB94:: @ 816AB94 CeruleanCity_Gym_EventScript_16AB9E:: @ 816AB9E lockall - checkflag 2081 + checkflag FLAG_0x821 goto_if 1, EventScript_16ABB2 loadword 0, gUnknown_81926E1 callstd 4 diff --git a/data/maps/CeruleanCity_House5/scripts.inc b/data/maps/CeruleanCity_House5/scripts.inc index 438ee6859..fdbe6956a 100644 --- a/data/maps/CeruleanCity_House5/scripts.inc +++ b/data/maps/CeruleanCity_House5/scripts.inc @@ -10,7 +10,7 @@ CeruleanCity_House5_EventScript_16AE50:: @ 816AE50 callstd 5 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16AEAD - checkflag 2119 + checkflag FLAG_0x847 goto_if 0, EventScript_16AEA3 loadword 0, gUnknown_8193003 callstd 4 diff --git a/data/maps/CinnabarIsland_Gym/scripts.inc b/data/maps/CinnabarIsland_Gym/scripts.inc index 7b22015d0..a5397c97a 100644 --- a/data/maps/CinnabarIsland_Gym/scripts.inc +++ b/data/maps/CinnabarIsland_Gym/scripts.inc @@ -299,7 +299,7 @@ EventScript_16DC68:: @ 816DC68 EventScript_16DC6A:: @ 816DC6A call EventScript_16DC34 - checktrainerflag 213 + checktrainerflag FLAG_0x0D5 goto_if 0, EventScript_16DC7A releaseall end @@ -381,7 +381,7 @@ EventScript_16DD31:: @ 816DD31 EventScript_16DD41:: @ 816DD41 call EventScript_16DC34 - checktrainerflag 178 + checktrainerflag FLAG_0x0B2 goto_if 0, EventScript_16DD51 releaseall end @@ -472,7 +472,7 @@ EventScript_16DE0F:: @ 816DE0F EventScript_16DE1F:: @ 816DE1F call EventScript_16DC34 - checktrainerflag 214 + checktrainerflag FLAG_0x0D6 goto_if 0, EventScript_16DE2F releaseall end @@ -554,7 +554,7 @@ EventScript_16DEE6:: @ 816DEE6 EventScript_16DEF6:: @ 816DEF6 call EventScript_16DC34 - checktrainerflag 179 + checktrainerflag FLAG_0x0B3 goto_if 0, EventScript_16DF06 releaseall end @@ -636,7 +636,7 @@ EventScript_16DFBD:: @ 816DFBD EventScript_16DFCD:: @ 816DFCD call EventScript_16DC34 - checktrainerflag 215 + checktrainerflag FLAG_0x0D7 goto_if 0, EventScript_16DFDD releaseall end @@ -718,7 +718,7 @@ EventScript_16E094:: @ 816E094 EventScript_16E0A4:: @ 816E0A4 call EventScript_16DC34 - checktrainerflag 180 + checktrainerflag FLAG_0x0B4 goto_if 0, EventScript_16E0B4 releaseall end diff --git a/data/maps/FiveIsland_LostCave_Room10/scripts.inc b/data/maps/FiveIsland_LostCave_Room10/scripts.inc index 14622ea67..c13f2f97e 100644 --- a/data/maps/FiveIsland_LostCave_Room10/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Room10/scripts.inc @@ -4,7 +4,7 @@ FiveIsland_LostCave_Room10_MapScripts:: @ 8164C2D .byte 0 FiveIsland_LostCave_Room10_MapScript1_164C38:: @ 8164C38 - checktrainerflag 606 + checktrainerflag FLAG_0x25E call_if 1, EventScript_164C42 end @@ -47,7 +47,7 @@ EventScript_164CA5:: @ 8164CA5 return EventScript_164CB6:: @ 8164CB6 - settrainerflag 606 + settrainerflag FLAG_0x25E call EventScript_164CA5 releaseall end diff --git a/data/maps/FiveIsland_RocketWarehouse/scripts.inc b/data/maps/FiveIsland_RocketWarehouse/scripts.inc index fc1753562..9b6492471 100644 --- a/data/maps/FiveIsland_RocketWarehouse/scripts.inc +++ b/data/maps/FiveIsland_RocketWarehouse/scripts.inc @@ -8,7 +8,7 @@ FiveIsland_RocketWarehouse_MapScript2_163F39:: @ 8163F39 end FiveIsland_RocketWarehouse_MapScript1_163F3D:: @ 8163F3D - checktrainerflag 543 + checktrainerflag FLAG_0x21F call_if 1, EventScript_163F47 end @@ -47,7 +47,7 @@ FiveIsland_RocketWarehouse_EventScript_163F81:: @ 8163F81 FiveIsland_RocketWarehouse_EventScript_163F93:: @ 8163F93 trainerbattle 2, 545, 0, Text_17BBAF, Text_17BC55, EventScript_163FCD - checkflag 2116 + checkflag FLAG_0x844 goto_if 1, EventScript_163FB7 loadword 0, gUnknown_817BCA3 callstd 6 diff --git a/data/maps/FourIsland/scripts.inc b/data/maps/FourIsland/scripts.inc index 97ebe39ec..8e425a1bc 100644 --- a/data/maps/FourIsland/scripts.inc +++ b/data/maps/FourIsland/scripts.inc @@ -151,7 +151,7 @@ EventScript_167E19:: @ 8167E19 FourIsland_EventScript_167E2E:: @ 8167E2E lock faceplayer - checkflag 2116 + checkflag FLAG_0x844 goto_if 1, EventScript_167E43 loadword 0, gUnknown_8182A2B callstd 4 diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc index 91257ef5a..a8db66421 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc +++ b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc @@ -11,7 +11,7 @@ IndigoPlateau_PokemonCenter_1F_MapScript1_16EA65:: @ 816EA65 end EventScript_16EA79:: @ 816EA79 - checkflag 2116 + checkflag FLAG_0x844 goto_if 1, EventScript_1A77A9 setobjectxyperm 4, 4, 2 return @@ -28,7 +28,7 @@ IndigoPlateau_PokemonCenter_1F_EventScript_16EA8A:: @ 816EA8A end EventScript_16EAA6:: @ 816EAA6 - checkflag 2116 + checkflag FLAG_0x844 goto_if 1, EventScript_16EAB9 loadword 0, gUnknown_819A943 callstd 4 diff --git a/data/maps/MtEmber_Exterior/scripts.inc b/data/maps/MtEmber_Exterior/scripts.inc index 829dfd8a2..8b7cecce8 100644 --- a/data/maps/MtEmber_Exterior/scripts.inc +++ b/data/maps/MtEmber_Exterior/scripts.inc @@ -25,7 +25,7 @@ EventScript_163975:: @ 8163975 MtEmber_Exterior_EventScript_16397F:: @ 816397F lock - checktrainerflag 537 + checktrainerflag FLAG_0x219 goto_if 1, EventScript_16399E compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4 goto_if 1, EventScript_1639A8 @@ -49,7 +49,7 @@ EventScript_1639A8:: @ 81639A8 trainerbattle 3, 537, 0, Text_17AA34 loadword 0, gUnknown_817AA3F callstd 4 - checktrainerflag 538 + checktrainerflag FLAG_0x21A goto_if 1, EventScript_1639DB release end @@ -68,7 +68,7 @@ EventScript_1639DB:: @ 81639DB MtEmber_Exterior_EventScript_1639F0:: @ 81639F0 lock faceplayer - checktrainerflag 538 + checktrainerflag FLAG_0x21A goto_if 1, EventScript_163A1B compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4 goto_if 1, EventScript_163A25 @@ -93,7 +93,7 @@ EventScript_163A25:: @ 8163A25 trainerbattle 3, 538, 0, Text_17AA8A loadword 0, gUnknown_817AA99 callstd 4 - checktrainerflag 537 + checktrainerflag FLAG_0x219 goto_if 1, EventScript_1639DB release end diff --git a/data/maps/MtEmber_Summit/scripts.inc b/data/maps/MtEmber_Summit/scripts.inc index 4b78fd317..eae1f5d13 100644 --- a/data/maps/MtEmber_Summit/scripts.inc +++ b/data/maps/MtEmber_Summit/scripts.inc @@ -4,7 +4,7 @@ MtEmber_Summit_MapScripts:: @ 8163AFC .byte 0 MtEmber_Summit_MapScript2_163B07:: @ 8163B07 - checkflag 2055 + checkflag FLAG_0x807 call_if 1, EventScript_163B11 end @@ -40,10 +40,10 @@ MtEmber_Summit_EventScript_163B33:: @ 8163B33 delay 10 playbgm BGM_FRLG_LEADER_EYE, 0 waitbuttonpress - setflag 2055 + setflag FLAG_0x807 special sub_807F9D8 waitstate - clearflag 2055 + clearflag FLAG_0x807 specialvar VAR_RESULT, sub_80CA74C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_163B96 diff --git a/data/maps/MtMoon_B2F/scripts.inc b/data/maps/MtMoon_B2F/scripts.inc index 399f12386..99a5c392e 100644 --- a/data/maps/MtMoon_B2F/scripts.inc +++ b/data/maps/MtMoon_B2F/scripts.inc @@ -25,7 +25,7 @@ MtMoon_B2F_EventScript_1606C2:: @ 81606C2 faceplayer checkflag FLAG_0x232 goto_if 1, EventScript_160707 - checktrainerflag 170 + checktrainerflag FLAG_0x0AA goto_if 1, EventScript_160711 call EventScript_1606DD release diff --git a/data/maps/NavelRock_Base/scripts.inc b/data/maps/NavelRock_Base/scripts.inc index fe051092b..649451b13 100644 --- a/data/maps/NavelRock_Base/scripts.inc +++ b/data/maps/NavelRock_Base/scripts.inc @@ -21,7 +21,7 @@ EventScript_165109:: @ 8165109 return NavelRock_Base_MapScript2_165116:: @ 8165116 - checkflag 2055 + checkflag FLAG_0x807 call_if 1, EventScript_165120 end @@ -64,10 +64,10 @@ NavelRock_Base_EventScript_165134:: @ 8165134 setvar VAR_0x8005, 70 setvar VAR_0x8006, 0 special sub_8044838 - setflag 2055 + setflag FLAG_0x807 special sub_807F9D8 waitstate - clearflag 2055 + clearflag FLAG_0x807 specialvar VAR_RESULT, sub_80CA74C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1651D9 diff --git a/data/maps/NavelRock_Summit/scripts.inc b/data/maps/NavelRock_Summit/scripts.inc index d1c48d99b..24fb2e0ce 100644 --- a/data/maps/NavelRock_Summit/scripts.inc +++ b/data/maps/NavelRock_Summit/scripts.inc @@ -24,7 +24,7 @@ EventScript_164FC6:: @ 8164FC6 return NavelRock_Summit_MapScript2_164FDD:: @ 8164FDD - checkflag 2055 + checkflag FLAG_0x807 call_if 1, EventScript_164FE7 end @@ -68,10 +68,10 @@ NavelRock_Summit_EventScript_164FFB:: @ 8164FFB setvar VAR_0x8005, 70 setvar VAR_0x8006, 0 special sub_8044838 - setflag 2055 + setflag FLAG_0x807 special sub_807F9D8 waitstate - clearflag 2055 + clearflag FLAG_0x807 setvar VAR_LAST_TALKED, 1 specialvar VAR_RESULT, sub_80CA74C compare_var_to_value VAR_RESULT, 1 diff --git a/data/maps/OneIsland/scripts.inc b/data/maps/OneIsland/scripts.inc index 8b9d0845a..f73187fc3 100644 --- a/data/maps/OneIsland/scripts.inc +++ b/data/maps/OneIsland/scripts.inc @@ -84,7 +84,7 @@ Movement_167514:: @ 8167514 OneIsland_EventScript_167517:: @ 8167517 lock faceplayer - checkflag 2116 + checkflag FLAG_0x844 goto_if 1, EventScript_16753F checkflag FLAG_0x2A1 goto_if 1, EventScript_167535 diff --git a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc index 76f8b8c5d..df9064d78 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc @@ -8,7 +8,7 @@ OneIsland_PokemonCenter_1F_MapScripts:: @ 8170BF8 OneIsland_PokemonCenter_1F_MapScript3_170C0D:: @ 8170C0D compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 call_if 4, EventScript_170C22 - checkflag 2116 + checkflag FLAG_0x844 call_if 1, EventScript_170C36 end @@ -88,9 +88,9 @@ EventScript_170CB1:: @ 8170CB1 waitmovement 0 applymovement 255, Movement_1A75EB waitmovement 0 - checkflag 2092 + checkflag FLAG_0x82C call_if 1, EventScript_170E34 - checkflag 2092 + checkflag FLAG_0x82C call_if 0, EventScript_170E3D applymovement 3, Movement_1A75ED waitmovement 0 @@ -135,7 +135,7 @@ EventScript_170CB1:: @ 8170CB1 call_if 4, EventScript_170E46 compare_var_to_value VAR_0x4058, 2 call_if 0, EventScript_170E58 - setflag 2117 + setflag FLAG_0x845 loadword 0, gUnknown_81A1230 callstd 4 closemessage @@ -143,7 +143,7 @@ EventScript_170CB1:: @ 8170CB1 waitmovement 0 applymovement 3, Movement_1A75E9 waitmovement 0 - setflag 2113 + setflag FLAG_0x841 setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 1 releaseall end @@ -337,7 +337,7 @@ EventScript_170FA5:: @ 8170FA5 loadword 0, gUnknown_81A1D7D callstd 4 special sub_810B82C - setflag 2116 + setflag FLAG_0x844 setflag FLAG_0x05C setflag FLAG_0x08C setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 6 @@ -391,7 +391,7 @@ EventScript_1710B2:: @ 81710B2 removeitem ITEM_TRI_PASS, 1 setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 additem ITEM_RAINBOW_PASS, 1 - setflag 2118 + setflag FLAG_0x846 textcolor 3 playfanfare BGM_FRLG_ME_KEYITEM message Text_1A1B56 @@ -460,7 +460,7 @@ OneIsland_PokemonCenter_1F_EventScript_171151:: @ 8171151 OneIsland_PokemonCenter_1F_EventScript_17115A:: @ 817115A lock faceplayer - checkflag 2116 + checkflag FLAG_0x844 goto_if 1, EventScript_17116F loadword 0, gUnknown_81A218D callstd 4 @@ -475,7 +475,7 @@ EventScript_17116F:: @ 817116F OneIsland_PokemonCenter_1F_EventScript_171179:: @ 8171179 lockall - checkflag 2116 + checkflag FLAG_0x844 goto_if 1, EventScript_1711A0 checkflag FLAG_0x2A1 goto_if 1, EventScript_171196 diff --git a/data/maps/PalletTown/scripts.inc b/data/maps/PalletTown/scripts.inc index 202258462..26f0708c0 100644 --- a/data/maps/PalletTown/scripts.inc +++ b/data/maps/PalletTown/scripts.inc @@ -14,7 +14,7 @@ PalletTown_MapScript1_165465:: @ 8165465 end EventScript_165488:: @ 8165488 - checkflag 2110 + checkflag FLAG_0x83E goto_if 0, EventScript_1A77A9 compare_var_to_value VAR_0x4070, 1 goto_if 4, EventScript_1A77A9 @@ -508,7 +508,7 @@ EventScript_165894:: @ 8165894 closemessage delay 20 textcolor 3 - setflag 2110 + setflag FLAG_0x83E setvar VAR_0x4070, 1 setvar VAR_0x4002, 0 special sub_80699E0 diff --git a/data/maps/PalletTown_GarysHouse/scripts.inc b/data/maps/PalletTown_GarysHouse/scripts.inc index 56d49fb90..80a77835a 100644 --- a/data/maps/PalletTown_GarysHouse/scripts.inc +++ b/data/maps/PalletTown_GarysHouse/scripts.inc @@ -24,7 +24,7 @@ PalletTown_GarysHouse_EventScript_168D56:: @ 8168D56 setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 special UpdatePickStateFromSpecialVar8005 - checkflag 2092 + checkflag FLAG_0x82C goto_if 1, EventScript_168DB9 compare_var_to_value VAR_0x4001, 1 goto_if 1, EventScript_168EEC diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc index 73a88153c..9f6b65822 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc +++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc @@ -618,7 +618,7 @@ PalletTown_ProfessorOaksLab_EventScript_169595:: @ 8169595 goto_if 1, EventScript_169903 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 8 goto_if 1, EventScript_169A6E - checkflag 2092 + checkflag FLAG_0x82C goto_if 1, EventScript_1699CE compare_var_to_value VAR_0x4052, 1 goto_if 1, EventScript_169903 @@ -734,7 +734,7 @@ EventScript_16961E:: @ 816961E waitmessage waitfanfare call EventScript_1A6675 - setflag 2089 + setflag FLAG_0x829 special sub_810B810 setvar VAR_0x407C, 1 loadword 0, gUnknown_818E612 @@ -1208,7 +1208,7 @@ PalletTown_ProfessorOaksLab_EventScript_169BAB:: @ 8169BAB EventScript_169BE1:: @ 8169BE1 applymovement 4, Movement_1A75EF waitmovement 0 - drawmonpic 16386, 10, 3 + drawmonpic VAR_0x4002, 10, 3 textcolor 0 compare_var_to_value VAR_0x4001, 0 goto_if 1, EventScript_169C14 @@ -1256,11 +1256,11 @@ EventScript_169C74:: @ 8169C74 loadword 0, gUnknown_818E2E5 callstd 4 call EventScript_1A6675 - setflag 2088 + setflag FLAG_0x828 setflag FLAG_0x291 - givemon 16386, 5, ITEM_NONE, 0, 0, 0 + givemon VAR_0x4002, 5, ITEM_NONE, 0, 0, 0 copyvar VAR_STARTER_MON, VAR_0x4001 - getspeciesname 0, 16386 + getspeciesname 0, VAR_0x4002 message Text_18E30D waitmessage playfanfare BGM_FRLG_ME_KEYITEM @@ -1319,7 +1319,7 @@ EventScript_169D2F:: @ 8169D2F playfanfare BGM_FRLG_ME_KEYITEM waitfanfare setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 - checkflag 2110 + checkflag FLAG_0x83E call_if 1, EventScript_169D5C release end @@ -1397,7 +1397,7 @@ EventScript_169DE4:: @ 8169DE4 PalletTown_ProfessorOaksLab_EventScript_169DEE:: @ 8169DEE lock faceplayer - checkflag 2092 + checkflag FLAG_0x82C goto_if 1, EventScript_169E03 loadword 0, gUnknown_818EBE6 callstd 4 @@ -1416,7 +1416,7 @@ EventScript_169E03:: @ 8169E03 PalletTown_ProfessorOaksLab_EventScript_169E1A:: @ 8169E1A lock faceplayer - checkflag 2092 + checkflag FLAG_0x82C goto_if 1, EventScript_169E2F loadword 0, gUnknown_818EBE6 callstd 4 diff --git a/data/maps/PewterCity/scripts.inc b/data/maps/PewterCity/scripts.inc index ee311aab2..61b542ae3 100644 --- a/data/maps/PewterCity/scripts.inc +++ b/data/maps/PewterCity/scripts.inc @@ -1492,7 +1492,7 @@ EventScript_1662DE:: @ 81662DE callstd 4 closemessage removeobject 7 - setflag 2095 + setflag FLAG_0x82F setvar VAR_0x406C, 2 return diff --git a/data/maps/PokemonLeague_AgathasRoom/scripts.inc b/data/maps/PokemonLeague_AgathasRoom/scripts.inc index 9507276fe..072fb633d 100644 --- a/data/maps/PokemonLeague_AgathasRoom/scripts.inc +++ b/data/maps/PokemonLeague_AgathasRoom/scripts.inc @@ -61,15 +61,15 @@ PokemonLeague_AgathasRoom_EventScript_162877:: @ 8162877 setvar VAR_0x8004, 0 setvar VAR_0x8005, 4 special SetFlavorTextFlagFromSpecialVars - checkflag 2092 + checkflag FLAG_0x82C call_if 0, EventScript_1628E9 - checkflag 2092 + checkflag FLAG_0x82C call_if 1, EventScript_1628F2 setflag FLAG_0x003 setflag FLAG_0x005 - checkflag 2116 + checkflag FLAG_0x844 call_if 0, EventScript_1628FB - checkflag 2116 + checkflag FLAG_0x844 call_if 1, EventScript_162906 clearflag FLAG_0x005 goto EventScript_16291B diff --git a/data/maps/PokemonLeague_BrunosRoom/scripts.inc b/data/maps/PokemonLeague_BrunosRoom/scripts.inc index 4553cfa0c..9f97097ca 100644 --- a/data/maps/PokemonLeague_BrunosRoom/scripts.inc +++ b/data/maps/PokemonLeague_BrunosRoom/scripts.inc @@ -58,15 +58,15 @@ PokemonLeague_BrunosRoom_EventScript_1626EC:: @ 81626EC setvar VAR_0x8004, 10 setvar VAR_0x8005, 1 special SetFlavorTextFlagFromSpecialVars - checkflag 2092 + checkflag FLAG_0x82C call_if 0, EventScript_162751 - checkflag 2092 + checkflag FLAG_0x82C call_if 1, EventScript_16275A setflag FLAG_0x003 setflag FLAG_0x005 - checkflag 2116 + checkflag FLAG_0x844 call_if 0, EventScript_162763 - checkflag 2116 + checkflag FLAG_0x844 call_if 1, EventScript_16276E clearflag FLAG_0x005 goto EventScript_1627B0 diff --git a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc index 8c499fc32..bc445f685 100644 --- a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc +++ b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc @@ -16,23 +16,23 @@ PokemonLeague_ChampionsRoom_MapScript2_162AF2:: @ 8162AF2 end EventScript_162B1E:: @ 8162B1E - checktrainerflag 438 + checktrainerflag FLAG_0x1B6 goto_if 1, EventScript_162B57 - checktrainerflag 739 + checktrainerflag FLAG_0x2E3 goto_if 1, EventScript_162B57 return EventScript_162B31:: @ 8162B31 - checktrainerflag 439 + checktrainerflag FLAG_0x1B7 goto_if 1, EventScript_162B57 - checktrainerflag 740 + checktrainerflag FLAG_0x2E4 goto_if 1, EventScript_162B57 return EventScript_162B44:: @ 8162B44 - checktrainerflag 440 + checktrainerflag FLAG_0x1B8 goto_if 1, EventScript_162B57 - checktrainerflag 741 + checktrainerflag FLAG_0x2E5 goto_if 1, EventScript_162B57 return @@ -59,9 +59,9 @@ EventScript_162B76:: @ 8162B76 applymovement 255, Movement_162D07 waitmovement 0 delay 20 - checkflag 2092 + checkflag FLAG_0x82C call_if 0, EventScript_162CB3 - checkflag 2092 + checkflag FLAG_0x82C call_if 1, EventScript_162CBC special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 @@ -69,9 +69,9 @@ EventScript_162B76:: @ 8162B76 setflag FLAG_0x003 setflag FLAG_0x005 savebgm BGM_FRLG_KACHI_LEADER - checkflag 2116 + checkflag FLAG_0x844 call_if 0, EventScript_162C6F - checkflag 2116 + checkflag FLAG_0x844 call_if 1, EventScript_162C91 setflag FLAG_0x004 clearflag FLAG_0x005 diff --git a/data/maps/PokemonLeague_LancesRoom/scripts.inc b/data/maps/PokemonLeague_LancesRoom/scripts.inc index 883441628..77d9fb158 100644 --- a/data/maps/PokemonLeague_LancesRoom/scripts.inc +++ b/data/maps/PokemonLeague_LancesRoom/scripts.inc @@ -112,15 +112,15 @@ PokemonLeague_LancesRoom_EventScript_162A14:: @ 8162A14 setvar VAR_0x8004, 12 setvar VAR_0x8005, 1 special SetFlavorTextFlagFromSpecialVars - checkflag 2092 + checkflag FLAG_0x82C call_if 0, EventScript_162A79 - checkflag 2092 + checkflag FLAG_0x82C call_if 1, EventScript_162A82 setflag FLAG_0x003 setflag FLAG_0x005 - checkflag 2116 + checkflag FLAG_0x844 call_if 0, EventScript_162A8B - checkflag 2116 + checkflag FLAG_0x844 call_if 1, EventScript_162A96 clearflag FLAG_0x005 goto EventScript_162AAB diff --git a/data/maps/PokemonLeague_LoreleisRoom/scripts.inc b/data/maps/PokemonLeague_LoreleisRoom/scripts.inc index 519278fff..f50f9a1e4 100644 --- a/data/maps/PokemonLeague_LoreleisRoom/scripts.inc +++ b/data/maps/PokemonLeague_LoreleisRoom/scripts.inc @@ -63,15 +63,15 @@ PokemonLeague_LoreleisRoom_EventScript_1625DC:: @ 81625DC setvar VAR_0x8004, 9 setvar VAR_0x8005, 1 special SetFlavorTextFlagFromSpecialVars - checkflag 2116 + checkflag FLAG_0x844 call_if 0, EventScript_162641 - checkflag 2116 + checkflag FLAG_0x844 call_if 1, EventScript_16264A setflag FLAG_0x003 setflag FLAG_0x005 - checkflag 2116 + checkflag FLAG_0x844 call_if 0, EventScript_162653 - checkflag 2116 + checkflag FLAG_0x844 call_if 1, EventScript_16265E clearflag FLAG_0x005 goto EventScript_162673 diff --git a/data/maps/PowerPlant/scripts.inc b/data/maps/PowerPlant/scripts.inc index 988c84fa0..5567d8ec8 100644 --- a/data/maps/PowerPlant/scripts.inc +++ b/data/maps/PowerPlant/scripts.inc @@ -4,7 +4,7 @@ PowerPlant_MapScripts:: @ 8163764 .byte 0 PowerPlant_MapScript1_16376F:: @ 816376F - checkflag 2055 + checkflag FLAG_0x807 call_if 1, EventScript_163779 end @@ -53,10 +53,10 @@ PowerPlant_EventScript_1637B8:: @ 81637B8 delay 10 playbgm BGM_FRLG_LEADER_EYE, 0 waitbuttonpress - setflag 2055 + setflag FLAG_0x807 special sub_807F9D8 waitstate - clearflag 2055 + clearflag FLAG_0x807 specialvar VAR_RESULT, sub_80CA74C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_16381B @@ -89,9 +89,9 @@ PowerPlant_EventScript_16382F:: @ 816382F playmoncry SPECIES_ELECTRODE, 2 delay 40 waitmoncry - setflag 2055 + setflag FLAG_0x807 dowildbattle - clearflag 2055 + clearflag FLAG_0x807 special sub_8112364 specialvar VAR_RESULT, sub_80CA74C compare_var_to_value VAR_RESULT, 1 @@ -120,9 +120,9 @@ PowerPlant_EventScript_16388D:: @ 816388D playmoncry SPECIES_ELECTRODE, 2 delay 40 waitmoncry - setflag 2055 + setflag FLAG_0x807 dowildbattle - clearflag 2055 + clearflag FLAG_0x807 special sub_8112364 specialvar VAR_RESULT, sub_80CA74C compare_var_to_value VAR_RESULT, 1 diff --git a/data/maps/RocketHideout_B1F/scripts.inc b/data/maps/RocketHideout_B1F/scripts.inc index f7b2e0515..0d4fcd1bd 100644 --- a/data/maps/RocketHideout_B1F/scripts.inc +++ b/data/maps/RocketHideout_B1F/scripts.inc @@ -4,7 +4,7 @@ RocketHideout_B1F_MapScripts:: @ 8161195 .byte 0 RocketHideout_B1F_MapScript1_1611A0:: @ 81611A0 - checktrainerflag 362 + checktrainerflag FLAG_0x16A call_if 0, EventScript_161233 end diff --git a/data/maps/RocketHideout_B4F/scripts.inc b/data/maps/RocketHideout_B4F/scripts.inc index f6227cd82..06eb3b4e9 100644 --- a/data/maps/RocketHideout_B4F/scripts.inc +++ b/data/maps/RocketHideout_B4F/scripts.inc @@ -4,9 +4,9 @@ RocketHideout_B4F_MapScripts:: @ 81612E8 RocketHideout_B4F_MapScript1_1612EE:: @ 81612EE setvar VAR_0x4001, 0 - checktrainerflag 366 + checktrainerflag FLAG_0x16E call_if 1, EventScript_161311 - checktrainerflag 367 + checktrainerflag FLAG_0x16F call_if 1, EventScript_161311 compare_var_to_value VAR_0x4001, 2 call_if 5, EventScript_16146A @@ -90,9 +90,9 @@ RocketHideout_B4F_EventScript_1613CE:: @ 81613CE EventScript_1613E9:: @ 81613E9 setvar VAR_0x4001, 0 - checktrainerflag 366 + checktrainerflag FLAG_0x16E call_if 1, EventScript_161311 - checktrainerflag 367 + checktrainerflag FLAG_0x16F call_if 1, EventScript_161311 compare_var_to_value VAR_0x4001, 2 call_if 1, EventScript_1614A1 @@ -109,9 +109,9 @@ RocketHideout_B4F_EventScript_161418:: @ 8161418 EventScript_161433:: @ 8161433 setvar VAR_0x4001, 0 - checktrainerflag 366 + checktrainerflag FLAG_0x16E call_if 1, EventScript_161311 - checktrainerflag 367 + checktrainerflag FLAG_0x16F call_if 1, EventScript_161311 compare_var_to_value VAR_0x4001, 2 call_if 1, EventScript_1614A1 diff --git a/data/maps/Route12/scripts.inc b/data/maps/Route12/scripts.inc index dbe51fb9d..3fdc41c2a 100644 --- a/data/maps/Route12/scripts.inc +++ b/data/maps/Route12/scripts.inc @@ -3,7 +3,7 @@ Route12_MapScripts:: @ 8168000 .byte 0 Route12_MapScript1_168006:: @ 8168006 - checkflag 2055 + checkflag FLAG_0x807 call_if 1, EventScript_168010 end @@ -31,10 +31,10 @@ Route12_EventScript_168014:: @ 8168014 delay 40 waitmoncry setflag FLAG_0x054 - setflag 2055 + setflag FLAG_0x807 setflag FLAG_0x253 dowildbattle - clearflag 2055 + clearflag FLAG_0x807 specialvar VAR_RESULT, sub_80CA74C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_16808F diff --git a/data/maps/Route16/scripts.inc b/data/maps/Route16/scripts.inc index 3bccccb50..9d2d1d621 100644 --- a/data/maps/Route16/scripts.inc +++ b/data/maps/Route16/scripts.inc @@ -5,7 +5,7 @@ Route16_MapScripts:: @ 81680E5 .byte 0 Route16_MapScript1_1680F5:: @ 81680F5 - checkflag 2055 + checkflag FLAG_0x807 call_if 1, EventScript_1680FF end @@ -19,7 +19,7 @@ Route16_MapScript2_168103:: @ 8168103 end EventScript_16810F:: @ 816810F - setflag 2096 + setflag FLAG_0x830 return Route16_MapScript3_168113:: @ 8168113 @@ -50,9 +50,9 @@ Route16_EventScript_168121:: @ 8168121 delay 40 waitmoncry setflag FLAG_0x080 - setflag 2055 + setflag FLAG_0x807 dowildbattle - clearflag 2055 + clearflag FLAG_0x807 specialvar VAR_RESULT, sub_80CA74C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_168199 diff --git a/data/maps/Route16_NorthEntrance_1F/scripts.inc b/data/maps/Route16_NorthEntrance_1F/scripts.inc index 3e5bd6921..792f604cd 100644 --- a/data/maps/Route16_NorthEntrance_1F/scripts.inc +++ b/data/maps/Route16_NorthEntrance_1F/scripts.inc @@ -3,7 +3,7 @@ Route16_NorthEntrance_1F_MapScripts:: @ 81701C2 .byte 0 Route16_NorthEntrance_1F_MapScript1_1701C8:: @ 81701C8 - clearflag 2096 + clearflag FLAG_0x830 checkflag FLAG_0x271 call_if 1, EventScript_1701D5 end diff --git a/data/maps/Route18/scripts.inc b/data/maps/Route18/scripts.inc index 97f574984..d4471a3be 100644 --- a/data/maps/Route18/scripts.inc +++ b/data/maps/Route18/scripts.inc @@ -9,7 +9,7 @@ Route18_MapScript1_168201:: @ 8168201 end EventScript_16820D:: @ 816820D - setflag 2096 + setflag FLAG_0x830 return Route18_MapScript2_168211:: @ 8168211 diff --git a/data/maps/Route18_EastEntrance_1F/scripts.inc b/data/maps/Route18_EastEntrance_1F/scripts.inc index be12d62b0..840a35ec5 100644 --- a/data/maps/Route18_EastEntrance_1F/scripts.inc +++ b/data/maps/Route18_EastEntrance_1F/scripts.inc @@ -3,7 +3,7 @@ Route18_EastEntrance_1F_MapScripts:: @ 8170378 .byte 0 Route18_EastEntrance_1F_MapScript1_17037E:: @ 817037E - clearflag 2096 + clearflag FLAG_0x830 checkflag FLAG_0x271 call_if 1, EventScript_17038B end diff --git a/data/maps/Route25_SeaCottage/scripts.inc b/data/maps/Route25_SeaCottage/scripts.inc index 5b830385c..841bb5159 100644 --- a/data/maps/Route25_SeaCottage/scripts.inc +++ b/data/maps/Route25_SeaCottage/scripts.inc @@ -128,7 +128,7 @@ EventScript_17064A:: @ 817064A setflag FLAG_0x235 setflag FLAG_0x031 setflag FLAG_0x234 - setflag 2100 + setflag FLAG_0x834 goto EventScript_170640 end diff --git a/data/maps/SaffronCity_Dojo/scripts.inc b/data/maps/SaffronCity_Dojo/scripts.inc index a84a444af..53b26e09a 100644 --- a/data/maps/SaffronCity_Dojo/scripts.inc +++ b/data/maps/SaffronCity_Dojo/scripts.inc @@ -63,7 +63,7 @@ SaffronCity_Dojo_EventScript_16EC46:: @ 816EC46 EventScript_16EC82:: @ 816EC82 erasemonpic - givemon 16385, 25, ITEM_NONE, 0, 0, 0 + givemon VAR_0x4001, 25, ITEM_NONE, 0, 0, 0 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16ECB5 compare_var_to_value VAR_RESULT, 1 @@ -75,7 +75,7 @@ EventScript_16EC82:: @ 816EC82 EventScript_16ECB5:: @ 816ECB5 removeobject VAR_LAST_TALKED - getspeciesname 0, 16385 + getspeciesname 0, VAR_0x4001 playfanfare MUS_FANFA1 message Text_19B473 waitmessage @@ -92,7 +92,7 @@ EventScript_16ECB5:: @ 816ECB5 EventScript_16ECEC:: @ 816ECEC removeobject VAR_LAST_TALKED - getspeciesname 0, 16385 + getspeciesname 0, VAR_0x4001 playfanfare MUS_FANFA1 message Text_19B473 waitmessage diff --git a/data/maps/SaffronCity_Gym/scripts.inc b/data/maps/SaffronCity_Gym/scripts.inc index 3fefa622e..4924a6c2c 100644 --- a/data/maps/SaffronCity_Gym/scripts.inc +++ b/data/maps/SaffronCity_Gym/scripts.inc @@ -22,7 +22,7 @@ EventScript_16EE0A:: @ 816EE0A special SetFlavorTextFlagFromSpecialVars clearflag FLAG_0x0AE setflag FLAG_0x4B5 - setflag 2085 + setflag FLAG_0x825 setvar VAR_0x8008, 6 call EventScript_1A6B18 goto EventScript_16EE3D @@ -115,7 +115,7 @@ EventScript_16EF4B:: @ 816EF4B SaffronCity_Gym_EventScript_16EF55:: @ 816EF55 lockall - checkflag 2085 + checkflag FLAG_0x825 goto_if 1, EventScript_16EF69 loadword 0, gUnknown_819BDFE callstd 4 diff --git a/data/maps/SeafoamIslands_B4F/scripts.inc b/data/maps/SeafoamIslands_B4F/scripts.inc index b9d1ca5ba..6d459ef93 100644 --- a/data/maps/SeafoamIslands_B4F/scripts.inc +++ b/data/maps/SeafoamIslands_B4F/scripts.inc @@ -7,7 +7,7 @@ SeafoamIslands_B4F_MapScripts:: @ 816302E .byte 0 SeafoamIslands_B4F_MapScript2_163048:: @ 8163048 - checkflag 2055 + checkflag FLAG_0x807 call_if 1, EventScript_163052 end @@ -178,10 +178,10 @@ SeafoamIslands_B4F_EventScript_1631AC:: @ 81631AC delay 10 playbgm BGM_FRLG_LEADER_EYE, 0 waitbuttonpress - setflag 2055 + setflag FLAG_0x807 special sub_807F9D8 waitstate - clearflag 2055 + clearflag FLAG_0x807 specialvar VAR_RESULT, sub_80CA74C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_16320F diff --git a/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/scripts.inc b/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/scripts.inc index 45637c673..1b0db15d2 100644 --- a/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/scripts.inc +++ b/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/scripts.inc @@ -4,7 +4,7 @@ SevenIsland_SeavaultCanyon_TanobyKey_MapScripts:: @ 8164DCC SevenIsland_SeavaultCanyon_TanobyKey_MapScript1_164DD2:: @ 8164DD2 setworldmapflag FLAG_WORLD_MAP_SEVEN_ISLAND_SEAVAULT_CANYON_TANOBY_KEY - checkflag 2121 + checkflag FLAG_0x849 call_if 1, EventScript_164E07 setvar VAR_0x4001, 0 setvar VAR_0x4002, 0 @@ -139,6 +139,6 @@ EventScript_164F8C:: @ 8164F8C call EventScript_164F51 loadword 0, gUnknown_817D31B callstd 4 - setflag 2121 + setflag FLAG_0x849 releaseall end diff --git a/data/maps/ThreeIsland_Port/scripts.inc b/data/maps/ThreeIsland_Port/scripts.inc index 0e0760109..ae3ed949e 100644 --- a/data/maps/ThreeIsland_Port/scripts.inc +++ b/data/maps/ThreeIsland_Port/scripts.inc @@ -3,7 +3,7 @@ ThreeIsland_Port_MapScripts:: @ 8168789 .byte 0 ThreeIsland_Port_MapScript1_16878F:: @ 816878F - clearflag 2113 + clearflag FLAG_0x841 setflag FLAG_0x2A1 end diff --git a/data/maps/TwoIsland/scripts.inc b/data/maps/TwoIsland/scripts.inc index 950cfbf84..6feebdb9c 100644 --- a/data/maps/TwoIsland/scripts.inc +++ b/data/maps/TwoIsland/scripts.inc @@ -9,9 +9,9 @@ TwoIsland_MapScript1_16756A:: @ 816756A end EventScript_167576:: @ 8167576 - checkflag 2116 + checkflag FLAG_0x844 goto_if 1, EventScript_167597 - checkflag 2092 + checkflag FLAG_0x82C goto_if 1, EventScript_1675B8 checkflag FLAG_0x2A3 goto_if 1, EventScript_1675D9 diff --git a/data/maps/VermilionCity/scripts.inc b/data/maps/VermilionCity/scripts.inc index f1b10e1d2..838408344 100644 --- a/data/maps/VermilionCity/scripts.inc +++ b/data/maps/VermilionCity/scripts.inc @@ -62,7 +62,7 @@ VermilionCity_EventScript_166941:: @ 8166941 end EventScript_166958:: @ 8166958 - checkflag 2122 + checkflag FLAG_0x84A goto_if 0, EventScript_1A77B0 checkitem ITEM_MYSTIC_TICKET, 1 compare_var_to_value VAR_RESULT, 0 @@ -71,7 +71,7 @@ EventScript_166958:: @ 8166958 end EventScript_166977:: @ 8166977 - checkflag 2123 + checkflag FLAG_0x84B goto_if 0, EventScript_1A77B0 checkitem ITEM_AURORA_TICKET, 1 compare_var_to_value VAR_RESULT, 0 diff --git a/data/maps/VermilionCity_Gym/scripts.inc b/data/maps/VermilionCity_Gym/scripts.inc index d11f43e4c..b2a2fa8b1 100644 --- a/data/maps/VermilionCity_Gym/scripts.inc +++ b/data/maps/VermilionCity_Gym/scripts.inc @@ -232,7 +232,7 @@ EventScript_16B97C:: @ 816B97C call_if 0, EventScript_16B9AB clearflag FLAG_0x0A0 setflag FLAG_0x4B2 - setflag 2082 + setflag FLAG_0x822 setvar VAR_0x8008, 3 call EventScript_1A6B18 goto EventScript_16B9AF @@ -315,7 +315,7 @@ EventScript_16BA81:: @ 816BA81 VermilionCity_Gym_EventScript_16BA8B:: @ 816BA8B lockall - checkflag 2082 + checkflag FLAG_0x822 goto_if 1, EventScript_16BA9F loadword 0, gUnknown_819520B callstd 4 diff --git a/data/maps/VermilionCity_PokemonFanClub/scripts.inc b/data/maps/VermilionCity_PokemonFanClub/scripts.inc index 43d82659b..58c03b78b 100644 --- a/data/maps/VermilionCity_PokemonFanClub/scripts.inc +++ b/data/maps/VermilionCity_PokemonFanClub/scripts.inc @@ -48,7 +48,7 @@ EventScript_16B4F2:: @ 816B4F2 VermilionCity_PokemonFanClub_EventScript_16B4FC:: @ 816B4FC lock faceplayer - checkflag 2092 + checkflag FLAG_0x82C goto_if 1, EventScript_16B511 loadword 0, gUnknown_81948E6 callstd 4 diff --git a/data/maps/ViridianCity/scripts.inc b/data/maps/ViridianCity/scripts.inc index 07f567ccf..876219174 100644 --- a/data/maps/ViridianCity/scripts.inc +++ b/data/maps/ViridianCity/scripts.inc @@ -31,15 +31,15 @@ EventScript_165920:: @ 8165920 return EventScript_165931:: @ 8165931 - checkflag 2081 + checkflag FLAG_0x821 goto_if 0, EventScript_1A77A9 - checkflag 2082 + checkflag FLAG_0x822 goto_if 0, EventScript_1A77A9 - checkflag 2083 + checkflag FLAG_0x823 goto_if 0, EventScript_1A77A9 checkflag FLAG_UNK824 goto_if 0, EventScript_1A77A9 - checkflag 2085 + checkflag FLAG_0x825 goto_if 0, EventScript_1A77A9 checkflag FLAG_UNK826 goto_if 0, EventScript_1A77A9 diff --git a/data/maps/ViridianCity_Gym/scripts.inc b/data/maps/ViridianCity_Gym/scripts.inc index 2ff6b010b..d714546da 100644 --- a/data/maps/ViridianCity_Gym/scripts.inc +++ b/data/maps/ViridianCity_Gym/scripts.inc @@ -23,7 +23,7 @@ EventScript_169F04:: @ 8169F04 special SetFlavorTextFlagFromSpecialVars setflag FLAG_0x0AD setflag FLAG_0x4B7 - setflag 2087 + setflag FLAG_0x827 setvar VAR_0x4054, 3 setvar VAR_0x8008, 8 call EventScript_1A6B18 @@ -123,7 +123,7 @@ EventScript_16A047:: @ 816A047 ViridianCity_Gym_EventScript_16A05E:: @ 816A05E lockall - checkflag 2087 + checkflag FLAG_0x827 goto_if 1, EventScript_16A072 loadword 0, gUnknown_818FB8D callstd 4 diff --git a/data/maps/ViridianCity_Mart/scripts.inc b/data/maps/ViridianCity_Mart/scripts.inc index 383960ddc..c1a07d1e0 100644 --- a/data/maps/ViridianCity_Mart/scripts.inc +++ b/data/maps/ViridianCity_Mart/scripts.inc @@ -4,7 +4,7 @@ ViridianCity_Mart_MapScripts:: @ 816A1D3 .byte 0 ViridianCity_Mart_MapScript1_16A1DE:: @ 816A1DE - checkflag 2089 + checkflag FLAG_0x829 goto_if 0, EventScript_16A1E8 end -- cgit v1.2.3 From 32bb74b61936ba5e007eda113a60c6baa18950ad Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 15 May 2019 09:58:43 -0400 Subject: Name some std scripts, dism some Celadon text --- data/maps/CeladonCity_Gym/scripts.inc | 6 +++--- data/maps/CeladonCity_Restaurant/scripts.inc | 2 +- data/maps/CeruleanCity/scripts.inc | 2 +- data/maps/CeruleanCity_BikeShop/scripts.inc | 2 +- data/maps/CeruleanCity_Gym/scripts.inc | 2 +- data/maps/CinnabarIsland_Gym/scripts.inc | 2 +- data/maps/FuchsiaCity_Building1/scripts.inc | 2 +- data/maps/FuchsiaCity_Gym/scripts.inc | 2 +- data/maps/FuchsiaCity_House2/scripts.inc | 2 +- data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc | 2 +- data/maps/MtEmber_RubyPath_B3F/scripts.inc | 2 +- data/maps/MtMoon_B2F/scripts.inc | 4 ++-- data/maps/OneIsland_PokemonCenter_1F/scripts.inc | 6 +++--- data/maps/PalletTown_GarysHouse/scripts.inc | 2 +- data/maps/PalletTown_ProfessorOaksLab/scripts.inc | 4 ++-- data/maps/PewterCity_Gym/scripts.inc | 2 +- data/maps/PewterCity_Museum_1F/scripts.inc | 2 +- data/maps/Route10_PokemonCenter_1F/scripts.inc | 2 +- data/maps/Route11_EastEntrance_2F/scripts.inc | 2 +- data/maps/Route12_FishingHouse/scripts.inc | 2 +- data/maps/Route12_NorthEntrance_2F/scripts.inc | 2 +- data/maps/Route15_WestEntrance_2F/scripts.inc | 2 +- data/maps/Route16_House/scripts.inc | 2 +- data/maps/Route16_NorthEntrance_2F/scripts.inc | 2 +- data/maps/Route24/scripts.inc | 2 +- data/maps/Route25_SeaCottage/scripts.inc | 2 +- data/maps/Route2_EastBuilding/scripts.inc | 2 +- data/maps/SSAnne_CaptainsOffice/scripts.inc | 2 +- data/maps/SafariZone_SecretHouse/scripts.inc | 2 +- data/maps/SaffronCity_Gym/scripts.inc | 2 +- data/maps/SaffronCity_House3/scripts.inc | 2 +- data/maps/SilphCo_11F/scripts.inc | 2 +- data/maps/ThreeIsland/scripts.inc | 2 +- data/maps/TwoIsland_JoyfulGameCorner/scripts.inc | 2 +- data/maps/VermilionCity_Gym/scripts.inc | 2 +- data/maps/VermilionCity_House1/scripts.inc | 2 +- data/maps/VermilionCity_PokemonFanClub/scripts.inc | 2 +- data/maps/ViridianCity_Gym/scripts.inc | 2 +- data/maps/ViridianCity_Mart/scripts.inc | 2 +- 39 files changed, 45 insertions(+), 45 deletions(-) (limited to 'data/maps') diff --git a/data/maps/CeladonCity_Gym/scripts.inc b/data/maps/CeladonCity_Gym/scripts.inc index de2ed3f54..30e71939c 100644 --- a/data/maps/CeladonCity_Gym/scripts.inc +++ b/data/maps/CeladonCity_Gym/scripts.inc @@ -36,10 +36,10 @@ EventScript_16D0C6:: @ 816D0C6 goto_if 1, EventScript_16D107 additem ITEM_TM19, 1 loadword 0, gUnknown_81973BA - setorcopyvar VAR_0x8000, 307 + setorcopyvar VAR_0x8000, ITEM_TM19 setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 257 - callstd 9 + setorcopyvar VAR_0x8002, MUS_FANFA1 + callstd 9 @ gStdScript_ItemMessageAndFanfare setflag FLAG_0x293 loadword 0, gUnknown_81973D7 callstd 4 diff --git a/data/maps/CeladonCity_Restaurant/scripts.inc b/data/maps/CeladonCity_Restaurant/scripts.inc index 347eb7008..54cb0417a 100644 --- a/data/maps/CeladonCity_Restaurant/scripts.inc +++ b/data/maps/CeladonCity_Restaurant/scripts.inc @@ -26,7 +26,7 @@ CeladonCity_Restaurant_EventScript_16D1FD:: @ 816D1FD setorcopyvar VAR_0x8000, 260 setorcopyvar VAR_0x8001, 1 setorcopyvar VAR_0x8002, 257 - callstd 9 + callstd 9 @ gStdScript_ItemMessageAndFanfare setflag FLAG_0x243 release end diff --git a/data/maps/CeruleanCity/scripts.inc b/data/maps/CeruleanCity/scripts.inc index f2f773d22..98c2f4756 100644 --- a/data/maps/CeruleanCity/scripts.inc +++ b/data/maps/CeruleanCity/scripts.inc @@ -201,7 +201,7 @@ EventScript_16662E:: @ 816662E setorcopyvar VAR_0x8000, 316 setorcopyvar VAR_0x8001, 1 setorcopyvar VAR_0x8002, 257 - callstd 9 + callstd 9 @ gStdScript_ItemMessageAndFanfare loadword 0, gUnknown_817EEED callstd 4 closemessage diff --git a/data/maps/CeruleanCity_BikeShop/scripts.inc b/data/maps/CeruleanCity_BikeShop/scripts.inc index 80a25d69e..6fb4bfdfc 100644 --- a/data/maps/CeruleanCity_BikeShop/scripts.inc +++ b/data/maps/CeruleanCity_BikeShop/scripts.inc @@ -43,7 +43,7 @@ EventScript_16AC22:: @ 816AC22 setorcopyvar VAR_0x8000, 360 setorcopyvar VAR_0x8001, 1 setorcopyvar VAR_0x8002, 318 - callstd 9 + callstd 9 @ gStdScript_ItemMessageAndFanfare setflag FLAG_0x271 additem ITEM_BICYCLE, 1 removeitem ITEM_BIKE_VOUCHER, 1 diff --git a/data/maps/CeruleanCity_Gym/scripts.inc b/data/maps/CeruleanCity_Gym/scripts.inc index 7dec220b6..0c696ca64 100644 --- a/data/maps/CeruleanCity_Gym/scripts.inc +++ b/data/maps/CeruleanCity_Gym/scripts.inc @@ -36,7 +36,7 @@ EventScript_16AAF9:: @ 816AAF9 setorcopyvar VAR_0x8000, 291 setorcopyvar VAR_0x8001, 1 setorcopyvar VAR_0x8002, 257 - callstd 9 + callstd 9 @ gStdScript_ItemMessageAndFanfare setflag FLAG_0x297 loadword 0, gUnknown_81922BF callstd 4 diff --git a/data/maps/CinnabarIsland_Gym/scripts.inc b/data/maps/CinnabarIsland_Gym/scripts.inc index a5397c97a..97ce3d7f0 100644 --- a/data/maps/CinnabarIsland_Gym/scripts.inc +++ b/data/maps/CinnabarIsland_Gym/scripts.inc @@ -89,7 +89,7 @@ EventScript_16DA34:: @ 816DA34 setorcopyvar VAR_0x8000, 326 setorcopyvar VAR_0x8001, 1 setorcopyvar VAR_0x8002, 257 - callstd 9 + callstd 9 @ gStdScript_ItemMessageAndFanfare setflag FLAG_0x24E loadword 0, gUnknown_8199652 callstd 4 diff --git a/data/maps/FuchsiaCity_Building1/scripts.inc b/data/maps/FuchsiaCity_Building1/scripts.inc index ebec8f693..40edfa858 100644 --- a/data/maps/FuchsiaCity_Building1/scripts.inc +++ b/data/maps/FuchsiaCity_Building1/scripts.inc @@ -36,7 +36,7 @@ EventScript_16D780:: @ 816D780 setorcopyvar VAR_0x8000, 342 setorcopyvar VAR_0x8001, 1 setorcopyvar VAR_0x8002, 257 - callstd 9 + callstd 9 @ gStdScript_ItemMessageAndFanfare setflag FLAG_0x23A removeitem ITEM_GOLD_TEETH, 1 release diff --git a/data/maps/FuchsiaCity_Gym/scripts.inc b/data/maps/FuchsiaCity_Gym/scripts.inc index 0333627db..41ea7a40d 100644 --- a/data/maps/FuchsiaCity_Gym/scripts.inc +++ b/data/maps/FuchsiaCity_Gym/scripts.inc @@ -36,7 +36,7 @@ EventScript_16D5A6:: @ 816D5A6 setorcopyvar VAR_0x8000, 294 setorcopyvar VAR_0x8001, 1 setorcopyvar VAR_0x8002, 257 - callstd 9 + callstd 9 @ gStdScript_ItemMessageAndFanfare setflag FLAG_0x259 loadword 0, gUnknown_81985AB callstd 4 diff --git a/data/maps/FuchsiaCity_House2/scripts.inc b/data/maps/FuchsiaCity_House2/scripts.inc index 135c68a77..f14e1bb32 100644 --- a/data/maps/FuchsiaCity_House2/scripts.inc +++ b/data/maps/FuchsiaCity_House2/scripts.inc @@ -32,7 +32,7 @@ EventScript_16D849:: @ 816D849 setorcopyvar VAR_0x8000, 263 setorcopyvar VAR_0x8001, 1 setorcopyvar VAR_0x8002, 257 - callstd 9 + callstd 9 @ gStdScript_ItemMessageAndFanfare loadword 0, gUnknown_8199296 callstd 4 setflag FLAG_0x244 diff --git a/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc b/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc index d8ade4c2a..f5000c69d 100644 --- a/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc +++ b/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc @@ -17,7 +17,7 @@ LavenderTown_VolunteerPokemonHouse_EventScript_16B14A:: @ 816B14A setorcopyvar VAR_0x8000, 350 setorcopyvar VAR_0x8001, 1 setorcopyvar VAR_0x8002, 318 - callstd 9 + callstd 9 @ gStdScript_ItemMessageAndFanfare loadword 0, gUnknown_81937E5 callstd 4 release diff --git a/data/maps/MtEmber_RubyPath_B3F/scripts.inc b/data/maps/MtEmber_RubyPath_B3F/scripts.inc index 520b3ba31..23e8a361e 100644 --- a/data/maps/MtEmber_RubyPath_B3F/scripts.inc +++ b/data/maps/MtEmber_RubyPath_B3F/scripts.inc @@ -12,6 +12,6 @@ MtEmber_RubyPath_B5F_EventScript_163C49:: @ 8163C49 setorcopyvar VAR_0x8000, 373 setorcopyvar VAR_0x8001, 1 setorcopyvar VAR_0x8002, 318 - callstd 9 + callstd 9 @ gStdScript_ItemMessageAndFanfare release end diff --git a/data/maps/MtMoon_B2F/scripts.inc b/data/maps/MtMoon_B2F/scripts.inc index 99a5c392e..923635aa3 100644 --- a/data/maps/MtMoon_B2F/scripts.inc +++ b/data/maps/MtMoon_B2F/scripts.inc @@ -69,7 +69,7 @@ MtMoon_B2F_EventScript_16071B:: @ 816071B setorcopyvar VAR_0x8000, 358 setorcopyvar VAR_0x8001, 1 setorcopyvar VAR_0x8002, 318 - callstd 9 + callstd 9 @ gStdScript_ItemMessageAndFanfare closemessage special sub_8112364 delay 10 @@ -107,7 +107,7 @@ MtMoon_B2F_EventScript_16077F:: @ 816077F setorcopyvar VAR_0x8000, 357 setorcopyvar VAR_0x8001, 1 setorcopyvar VAR_0x8002, 318 - callstd 9 + callstd 9 @ gStdScript_ItemMessageAndFanfare closemessage special sub_8112364 delay 10 diff --git a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc index df9064d78..e63a08d64 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc @@ -117,7 +117,7 @@ EventScript_170CB1:: @ 8170CB1 setorcopyvar VAR_0x8000, 280 setorcopyvar VAR_0x8001, 1 setorcopyvar VAR_0x8002, 318 - callstd 9 + callstd 9 @ gStdScript_ItemMessageAndFanfare additem ITEM_METEORITE, 1 applymovement 3, Movement_1A75ED waitmovement 0 @@ -128,7 +128,7 @@ EventScript_170CB1:: @ 8170CB1 setorcopyvar VAR_0x8000, 367 setorcopyvar VAR_0x8001, 1 setorcopyvar VAR_0x8002, 318 - callstd 9 + callstd 9 @ gStdScript_ItemMessageAndFanfare loadword 0, gUnknown_81A1150 callstd 4 compare_var_to_value VAR_0x4058, 2 @@ -175,7 +175,7 @@ EventScript_170E58:: @ 8170E58 setorcopyvar VAR_0x8000, 361 setorcopyvar VAR_0x8001, 1 setorcopyvar VAR_0x8002, 318 - callstd 9 + callstd 9 @ gStdScript_ItemMessageAndFanfare return Movement_170E7D:: @ 8170E7D diff --git a/data/maps/PalletTown_GarysHouse/scripts.inc b/data/maps/PalletTown_GarysHouse/scripts.inc index 80a77835a..88a265589 100644 --- a/data/maps/PalletTown_GarysHouse/scripts.inc +++ b/data/maps/PalletTown_GarysHouse/scripts.inc @@ -185,7 +185,7 @@ EventScript_168EF6:: @ 8168EF6 setorcopyvar VAR_0x8000, 361 setorcopyvar VAR_0x8001, 1 setorcopyvar VAR_0x8002, 318 - callstd 9 + callstd 9 @ gStdScript_ItemMessageAndFanfare release end diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc index 9f6b65822..6af16d8d5 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc +++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc @@ -744,7 +744,7 @@ EventScript_16961E:: @ 816961E setorcopyvar VAR_0x8000, 4 setorcopyvar VAR_0x8001, 5 setorcopyvar VAR_0x8002, 257 - callstd 9 + callstd 9 @ gStdScript_ItemMessageAndFanfare loadword 0, gUnknown_818E6D0 callstd 4 setvar VAR_0x8004, 0 @@ -1053,7 +1053,7 @@ EventScript_169A45:: @ 8169A45 setorcopyvar VAR_0x8000, 4 setorcopyvar VAR_0x8001, 5 setorcopyvar VAR_0x8002, 257 - callstd 9 + callstd 9 @ gStdScript_ItemMessageAndFanfare setflag FLAG_0x247 release end diff --git a/data/maps/PewterCity_Gym/scripts.inc b/data/maps/PewterCity_Gym/scripts.inc index 73cfc41bf..c517f90a7 100644 --- a/data/maps/PewterCity_Gym/scripts.inc +++ b/data/maps/PewterCity_Gym/scripts.inc @@ -38,7 +38,7 @@ EventScript_16A5F3:: @ 816A5F3 setorcopyvar VAR_0x8000, 327 setorcopyvar VAR_0x8001, 1 setorcopyvar VAR_0x8002, 257 - callstd 9 + callstd 9 @ gStdScript_ItemMessageAndFanfare setflag FLAG_0x254 loadword 0, gUnknown_8190FF8 callstd 4 diff --git a/data/maps/PewterCity_Museum_1F/scripts.inc b/data/maps/PewterCity_Museum_1F/scripts.inc index 5b981a5c4..0b33be6c8 100644 --- a/data/maps/PewterCity_Museum_1F/scripts.inc +++ b/data/maps/PewterCity_Museum_1F/scripts.inc @@ -182,7 +182,7 @@ PewterCity_Museum_1F_EventScript_16A4AE:: @ 816A4AE setorcopyvar VAR_0x8000, 354 setorcopyvar VAR_0x8001, 1 setorcopyvar VAR_0x8002, 318 - callstd 9 + callstd 9 @ gStdScript_ItemMessageAndFanfare release end diff --git a/data/maps/Route10_PokemonCenter_1F/scripts.inc b/data/maps/Route10_PokemonCenter_1F/scripts.inc index 44c859362..353fac943 100644 --- a/data/maps/Route10_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route10_PokemonCenter_1F/scripts.inc @@ -56,7 +56,7 @@ Route10_PokemonCenter_1F_EventScript_16FC65:: @ 816FC65 setorcopyvar VAR_0x8000, 195 setorcopyvar VAR_0x8001, 1 setorcopyvar VAR_0x8002, 257 - callstd 9 + callstd 9 @ gStdScript_ItemMessageAndFanfare setflag FLAG_0x2FA loadword 0, gUnknown_819E7AF callstd 4 diff --git a/data/maps/Route11_EastEntrance_2F/scripts.inc b/data/maps/Route11_EastEntrance_2F/scripts.inc index ceb2901d6..54a98787e 100644 --- a/data/maps/Route11_EastEntrance_2F/scripts.inc +++ b/data/maps/Route11_EastEntrance_2F/scripts.inc @@ -90,7 +90,7 @@ Route11_EastEntrance_2F_EventScript_16FDD8:: @ 816FDD8 setorcopyvar VAR_0x8000, 261 setorcopyvar VAR_0x8001, 1 setorcopyvar VAR_0x8002, 257 - callstd 9 + callstd 9 @ gStdScript_ItemMessageAndFanfare setflag FLAG_0x252 loadword 0, gUnknown_819EB59 callstd 4 diff --git a/data/maps/Route12_FishingHouse/scripts.inc b/data/maps/Route12_FishingHouse/scripts.inc index 51f6ace07..ec7b5e0a9 100644 --- a/data/maps/Route12_FishingHouse/scripts.inc +++ b/data/maps/Route12_FishingHouse/scripts.inc @@ -26,7 +26,7 @@ EventScript_16FF34:: @ 816FF34 setorcopyvar VAR_0x8000, 264 setorcopyvar VAR_0x8001, 1 setorcopyvar VAR_0x8002, 257 - callstd 9 + callstd 9 @ gStdScript_ItemMessageAndFanfare setflag FLAG_0x255 loadword 0, gUnknown_819F0EB callstd 4 diff --git a/data/maps/Route12_NorthEntrance_2F/scripts.inc b/data/maps/Route12_NorthEntrance_2F/scripts.inc index a4b08a4dd..393b191f5 100644 --- a/data/maps/Route12_NorthEntrance_2F/scripts.inc +++ b/data/maps/Route12_NorthEntrance_2F/scripts.inc @@ -29,7 +29,7 @@ Route12_NorthEntrance_2F_EventScript_16FE8A:: @ 816FE8A setorcopyvar VAR_0x8000, 315 setorcopyvar VAR_0x8001, 1 setorcopyvar VAR_0x8002, 257 - callstd 9 + callstd 9 @ gStdScript_ItemMessageAndFanfare loadword 0, gUnknown_819EEC6 callstd 4 setflag FLAG_0x25B diff --git a/data/maps/Route15_WestEntrance_2F/scripts.inc b/data/maps/Route15_WestEntrance_2F/scripts.inc index 5de7395c9..5c25559c3 100644 --- a/data/maps/Route15_WestEntrance_2F/scripts.inc +++ b/data/maps/Route15_WestEntrance_2F/scripts.inc @@ -45,7 +45,7 @@ Route15_WestEntrance_2F_EventScript_1700B9:: @ 81700B9 setorcopyvar VAR_0x8000, 182 setorcopyvar VAR_0x8001, 1 setorcopyvar VAR_0x8002, 257 - callstd 9 + callstd 9 @ gStdScript_ItemMessageAndFanfare setflag FLAG_0x256 loadword 0, gUnknown_819F71F callstd 4 diff --git a/data/maps/Route16_House/scripts.inc b/data/maps/Route16_House/scripts.inc index 95b86aca1..3b5c5868e 100644 --- a/data/maps/Route16_House/scripts.inc +++ b/data/maps/Route16_House/scripts.inc @@ -16,7 +16,7 @@ Route16_House_EventScript_17014F:: @ 817014F setorcopyvar VAR_0x8000, 340 setorcopyvar VAR_0x8001, 1 setorcopyvar VAR_0x8002, 257 - callstd 9 + callstd 9 @ gStdScript_ItemMessageAndFanfare loadword 0, gUnknown_819F8E0 callstd 4 setflag FLAG_0x238 diff --git a/data/maps/Route16_NorthEntrance_2F/scripts.inc b/data/maps/Route16_NorthEntrance_2F/scripts.inc index 979bcc3f5..60644f527 100644 --- a/data/maps/Route16_NorthEntrance_2F/scripts.inc +++ b/data/maps/Route16_NorthEntrance_2F/scripts.inc @@ -47,7 +47,7 @@ Route16_NorthEntrance_2F_EventScript_1702E3:: @ 81702E3 setorcopyvar VAR_0x8000, 189 setorcopyvar VAR_0x8001, 1 setorcopyvar VAR_0x8002, 257 - callstd 9 + callstd 9 @ gStdScript_ItemMessageAndFanfare setflag FLAG_0x2FD loadword 0, gUnknown_819FC93 callstd 4 diff --git a/data/maps/Route24/scripts.inc b/data/maps/Route24/scripts.inc index f9025fde0..8b27df5f5 100644 --- a/data/maps/Route24/scripts.inc +++ b/data/maps/Route24/scripts.inc @@ -62,7 +62,7 @@ EventScript_1686B9:: @ 81686B9 setorcopyvar VAR_0x8000, 110 setorcopyvar VAR_0x8001, 1 setorcopyvar VAR_0x8002, 257 - callstd 9 + callstd 9 @ gStdScript_ItemMessageAndFanfare message Text_188CDB waitmessage playbgm BGM_FRLG_SUSPICIOUS_EYE, 0 diff --git a/data/maps/Route25_SeaCottage/scripts.inc b/data/maps/Route25_SeaCottage/scripts.inc index 841bb5159..d609226bf 100644 --- a/data/maps/Route25_SeaCottage/scripts.inc +++ b/data/maps/Route25_SeaCottage/scripts.inc @@ -124,7 +124,7 @@ EventScript_17064A:: @ 817064A setorcopyvar VAR_0x8000, 265 setorcopyvar VAR_0x8001, 1 setorcopyvar VAR_0x8002, 318 - callstd 9 + callstd 9 @ gStdScript_ItemMessageAndFanfare setflag FLAG_0x235 setflag FLAG_0x031 setflag FLAG_0x234 diff --git a/data/maps/Route2_EastBuilding/scripts.inc b/data/maps/Route2_EastBuilding/scripts.inc index c11cc3309..2e8c9101c 100644 --- a/data/maps/Route2_EastBuilding/scripts.inc +++ b/data/maps/Route2_EastBuilding/scripts.inc @@ -27,7 +27,7 @@ Route2_EastBuilding_EventScript_16F67F:: @ 816F67F setorcopyvar VAR_0x8000, 343 setorcopyvar VAR_0x8001, 1 setorcopyvar VAR_0x8002, 257 - callstd 9 + callstd 9 @ gStdScript_ItemMessageAndFanfare setflag FLAG_0x23B loadword 0, gUnknown_819D7C1 callstd 4 diff --git a/data/maps/SSAnne_CaptainsOffice/scripts.inc b/data/maps/SSAnne_CaptainsOffice/scripts.inc index 56e5b2fec..aa693b700 100644 --- a/data/maps/SSAnne_CaptainsOffice/scripts.inc +++ b/data/maps/SSAnne_CaptainsOffice/scripts.inc @@ -23,7 +23,7 @@ SSAnne_CaptainsOffice_EventScript_160B3A:: @ 8160B3A setorcopyvar VAR_0x8000, 339 setorcopyvar VAR_0x8001, 1 setorcopyvar VAR_0x8002, 318 - callstd 9 + callstd 9 @ gStdScript_ItemMessageAndFanfare loadword 0, gUnknown_81737D2 callstd 4 setflag FLAG_0x237 diff --git a/data/maps/SafariZone_SecretHouse/scripts.inc b/data/maps/SafariZone_SecretHouse/scripts.inc index 5421aa298..3f5fe1e38 100644 --- a/data/maps/SafariZone_SecretHouse/scripts.inc +++ b/data/maps/SafariZone_SecretHouse/scripts.inc @@ -16,7 +16,7 @@ SafariZone_SecretHouse_EventScript_162453:: @ 8162453 setorcopyvar VAR_0x8000, 341 setorcopyvar VAR_0x8001, 1 setorcopyvar VAR_0x8002, 257 - callstd 9 + callstd 9 @ gStdScript_ItemMessageAndFanfare loadword 0, gUnknown_8177EB7 callstd 4 setflag FLAG_0x239 diff --git a/data/maps/SaffronCity_Gym/scripts.inc b/data/maps/SaffronCity_Gym/scripts.inc index 4924a6c2c..83ef16597 100644 --- a/data/maps/SaffronCity_Gym/scripts.inc +++ b/data/maps/SaffronCity_Gym/scripts.inc @@ -39,7 +39,7 @@ EventScript_16EE3D:: @ 816EE3D setorcopyvar VAR_0x8000, 292 setorcopyvar VAR_0x8001, 1 setorcopyvar VAR_0x8002, 257 - callstd 9 + callstd 9 @ gStdScript_ItemMessageAndFanfare setflag FLAG_0x29A loadword 0, gUnknown_819B685 callstd 4 diff --git a/data/maps/SaffronCity_House3/scripts.inc b/data/maps/SaffronCity_House3/scripts.inc index fd0628823..d1b3ad033 100644 --- a/data/maps/SaffronCity_House3/scripts.inc +++ b/data/maps/SaffronCity_House3/scripts.inc @@ -16,7 +16,7 @@ SaffronCity_House3_EventScript_16F05F:: @ 816F05F setorcopyvar VAR_0x8000, 317 setorcopyvar VAR_0x8001, 1 setorcopyvar VAR_0x8002, 257 - callstd 9 + callstd 9 @ gStdScript_ItemMessageAndFanfare loadword 0, gUnknown_819C18F callstd 4 setflag FLAG_0x245 diff --git a/data/maps/SilphCo_11F/scripts.inc b/data/maps/SilphCo_11F/scripts.inc index c3f864c14..01f9254d5 100644 --- a/data/maps/SilphCo_11F/scripts.inc +++ b/data/maps/SilphCo_11F/scripts.inc @@ -25,7 +25,7 @@ SilphCo_11F_EventScript_161DFE:: @ 8161DFE setorcopyvar VAR_0x8000, 1 setorcopyvar VAR_0x8001, 1 setorcopyvar VAR_0x8002, 318 - callstd 9 + callstd 9 @ gStdScript_ItemMessageAndFanfare loadword 0, gUnknown_8176FEB callstd 4 setflag FLAG_0x250 diff --git a/data/maps/ThreeIsland/scripts.inc b/data/maps/ThreeIsland/scripts.inc index cfb5507b8..cf1dded03 100644 --- a/data/maps/ThreeIsland/scripts.inc +++ b/data/maps/ThreeIsland/scripts.inc @@ -57,7 +57,7 @@ EventScript_16781A:: @ 816781A setorcopyvar VAR_0x8000, 19 setorcopyvar VAR_0x8001, 1 setorcopyvar VAR_0x8002, 257 - callstd 9 + callstd 9 @ gStdScript_ItemMessageAndFanfare additem ITEM_FULL_RESTORE, 1 setflag FLAG_0x2FC loadword 0, gUnknown_81827F1 diff --git a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc index 58b6052f2..e027a97fe 100644 --- a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc +++ b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc @@ -190,7 +190,7 @@ EventScript_1715C4:: @ 81715C4 setorcopyvar VAR_0x8000, 94 setorcopyvar VAR_0x8001, 1 setorcopyvar VAR_0x8002, 257 - callstd 9 + callstd 9 @ gStdScript_ItemMessageAndFanfare release end diff --git a/data/maps/VermilionCity_Gym/scripts.inc b/data/maps/VermilionCity_Gym/scripts.inc index b2a2fa8b1..f3229a4e1 100644 --- a/data/maps/VermilionCity_Gym/scripts.inc +++ b/data/maps/VermilionCity_Gym/scripts.inc @@ -253,7 +253,7 @@ EventScript_16B9AF:: @ 816B9AF setorcopyvar VAR_0x8000, 322 setorcopyvar VAR_0x8001, 1 setorcopyvar VAR_0x8002, 257 - callstd 9 + callstd 9 @ gStdScript_ItemMessageAndFanfare setflag FLAG_0x231 loadword 0, gUnknown_8194DA8 callstd 4 diff --git a/data/maps/VermilionCity_House1/scripts.inc b/data/maps/VermilionCity_House1/scripts.inc index 870b24620..b4b9d1126 100644 --- a/data/maps/VermilionCity_House1/scripts.inc +++ b/data/maps/VermilionCity_House1/scripts.inc @@ -32,7 +32,7 @@ EventScript_16B3D9:: @ 816B3D9 setorcopyvar VAR_0x8000, 262 setorcopyvar VAR_0x8001, 1 setorcopyvar VAR_0x8002, 257 - callstd 9 + callstd 9 @ gStdScript_ItemMessageAndFanfare setflag FLAG_0x240 loadword 0, gUnknown_8193FAF callstd 4 diff --git a/data/maps/VermilionCity_PokemonFanClub/scripts.inc b/data/maps/VermilionCity_PokemonFanClub/scripts.inc index 58c03b78b..30f31c6f5 100644 --- a/data/maps/VermilionCity_PokemonFanClub/scripts.inc +++ b/data/maps/VermilionCity_PokemonFanClub/scripts.inc @@ -33,7 +33,7 @@ EventScript_16B4B1:: @ 816B4B1 setorcopyvar VAR_0x8000, 352 setorcopyvar VAR_0x8001, 1 setorcopyvar VAR_0x8002, 318 - callstd 9 + callstd 9 @ gStdScript_ItemMessageAndFanfare loadword 0, gUnknown_819477C callstd 4 release diff --git a/data/maps/ViridianCity_Gym/scripts.inc b/data/maps/ViridianCity_Gym/scripts.inc index d714546da..c06fa00cc 100644 --- a/data/maps/ViridianCity_Gym/scripts.inc +++ b/data/maps/ViridianCity_Gym/scripts.inc @@ -41,7 +41,7 @@ EventScript_169F2F:: @ 8169F2F setorcopyvar VAR_0x8000, 314 setorcopyvar VAR_0x8001, 1 setorcopyvar VAR_0x8002, 257 - callstd 9 + callstd 9 @ gStdScript_ItemMessageAndFanfare setflag FLAG_0x298 loadword 0, gUnknown_818F695 callstd 4 diff --git a/data/maps/ViridianCity_Mart/scripts.inc b/data/maps/ViridianCity_Mart/scripts.inc index c1a07d1e0..66ed9683d 100644 --- a/data/maps/ViridianCity_Mart/scripts.inc +++ b/data/maps/ViridianCity_Mart/scripts.inc @@ -36,7 +36,7 @@ EventScript_16A205:: @ 816A205 setorcopyvar VAR_0x8000, 349 setorcopyvar VAR_0x8001, 1 setorcopyvar VAR_0x8002, 318 - callstd 9 + callstd 9 @ gStdScript_ItemMessageAndFanfare setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 5 releaseall end -- cgit v1.2.3 From d4710d9ab81ff29277ba244767c55652d58016a5 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 16 May 2019 08:53:17 -0400 Subject: giveitemfanfaremsg --- data/maps/CeladonCity_Restaurant/scripts.inc | 6 +----- data/maps/CeruleanCity/scripts.inc | 6 +----- data/maps/CeruleanCity_BikeShop/scripts.inc | 6 +----- data/maps/CeruleanCity_Gym/scripts.inc | 6 +----- data/maps/CinnabarIsland_Gym/scripts.inc | 6 +----- data/maps/FuchsiaCity_Building1/scripts.inc | 6 +----- data/maps/FuchsiaCity_Gym/scripts.inc | 6 +----- data/maps/FuchsiaCity_House2/scripts.inc | 6 +----- .../LavenderTown_VolunteerPokemonHouse/scripts.inc | 6 +----- data/maps/MtEmber_RubyPath_B3F/scripts.inc | 6 +----- data/maps/MtMoon_B2F/scripts.inc | 12 ++---------- data/maps/OneIsland_PokemonCenter_1F/scripts.inc | 18 +++--------------- data/maps/PalletTown_GarysHouse/scripts.inc | 6 +----- data/maps/PalletTown_ProfessorOaksLab/scripts.inc | 12 ++---------- data/maps/PewterCity_Gym/scripts.inc | 6 +----- data/maps/PewterCity_Museum_1F/scripts.inc | 6 +----- data/maps/Route10_PokemonCenter_1F/scripts.inc | 6 +----- data/maps/Route11_EastEntrance_2F/scripts.inc | 6 +----- data/maps/Route12_FishingHouse/scripts.inc | 6 +----- data/maps/Route12_NorthEntrance_2F/scripts.inc | 6 +----- data/maps/Route15_WestEntrance_2F/scripts.inc | 6 +----- data/maps/Route16_House/scripts.inc | 6 +----- data/maps/Route16_NorthEntrance_2F/scripts.inc | 6 +----- data/maps/Route24/scripts.inc | 6 +----- data/maps/Route25_SeaCottage/scripts.inc | 6 +----- data/maps/Route2_EastBuilding/scripts.inc | 6 +----- data/maps/SSAnne_CaptainsOffice/scripts.inc | 6 +----- data/maps/SafariZone_SecretHouse/scripts.inc | 6 +----- data/maps/SaffronCity_Gym/scripts.inc | 6 +----- data/maps/SaffronCity_House3/scripts.inc | 6 +----- data/maps/SilphCo_11F/scripts.inc | 6 +----- data/maps/ThreeIsland/scripts.inc | 6 +----- data/maps/TwoIsland_JoyfulGameCorner/scripts.inc | 6 +----- data/maps/VermilionCity_Gym/scripts.inc | 6 +----- data/maps/VermilionCity_House1/scripts.inc | 6 +----- data/maps/VermilionCity_PokemonFanClub/scripts.inc | 6 +----- data/maps/ViridianCity_Gym/scripts.inc | 6 +----- data/maps/ViridianCity_Mart/scripts.inc | 6 +----- 38 files changed, 42 insertions(+), 210 deletions(-) (limited to 'data/maps') diff --git a/data/maps/CeladonCity_Restaurant/scripts.inc b/data/maps/CeladonCity_Restaurant/scripts.inc index 54cb0417a..e8ff33eee 100644 --- a/data/maps/CeladonCity_Restaurant/scripts.inc +++ b/data/maps/CeladonCity_Restaurant/scripts.inc @@ -22,11 +22,7 @@ CeladonCity_Restaurant_EventScript_16D1FD:: @ 816D1FD compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16D241 additem ITEM_COIN_CASE, 1 - loadword 0, gUnknown_8197A38 - setorcopyvar VAR_0x8000, 260 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 257 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_8197A38, ITEM_COIN_CASE setflag FLAG_0x243 release end diff --git a/data/maps/CeruleanCity/scripts.inc b/data/maps/CeruleanCity/scripts.inc index 98c2f4756..f13e36eea 100644 --- a/data/maps/CeruleanCity/scripts.inc +++ b/data/maps/CeruleanCity/scripts.inc @@ -197,11 +197,7 @@ EventScript_16662E:: @ 816662E compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_166677 additem ITEM_TM28, 1 - loadword 0, gUnknown_817EEBF - setorcopyvar VAR_0x8000, 316 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 257 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_817EEBF, ITEM_TM28 loadword 0, gUnknown_817EEED callstd 4 closemessage diff --git a/data/maps/CeruleanCity_BikeShop/scripts.inc b/data/maps/CeruleanCity_BikeShop/scripts.inc index 6fb4bfdfc..4a3271ed1 100644 --- a/data/maps/CeruleanCity_BikeShop/scripts.inc +++ b/data/maps/CeruleanCity_BikeShop/scripts.inc @@ -39,11 +39,7 @@ EventScript_16AC15:: @ 816AC15 EventScript_16AC22:: @ 816AC22 loadword 0, gUnknown_81927B2 callstd 4 - loadword 0, gUnknown_81927E1 - setorcopyvar VAR_0x8000, 360 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 318 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_81927E1, ITEM_BICYCLE, 1, BGM_FRLG_ME_KEYITEM setflag FLAG_0x271 additem ITEM_BICYCLE, 1 removeitem ITEM_BIKE_VOUCHER, 1 diff --git a/data/maps/CeruleanCity_Gym/scripts.inc b/data/maps/CeruleanCity_Gym/scripts.inc index 0c696ca64..e57532979 100644 --- a/data/maps/CeruleanCity_Gym/scripts.inc +++ b/data/maps/CeruleanCity_Gym/scripts.inc @@ -32,11 +32,7 @@ EventScript_16AAF9:: @ 816AAF9 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16AB3A additem ITEM_TM03, 1 - loadword 0, gUnknown_81923F1 - setorcopyvar VAR_0x8000, 291 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 257 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_81923F1, ITEM_TM03 setflag FLAG_0x297 loadword 0, gUnknown_81922BF callstd 4 diff --git a/data/maps/CinnabarIsland_Gym/scripts.inc b/data/maps/CinnabarIsland_Gym/scripts.inc index 97ce3d7f0..e206f46db 100644 --- a/data/maps/CinnabarIsland_Gym/scripts.inc +++ b/data/maps/CinnabarIsland_Gym/scripts.inc @@ -85,11 +85,7 @@ EventScript_16DA34:: @ 816DA34 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16DA75 additem ITEM_TM38, 1 - loadword 0, gUnknown_81996FF - setorcopyvar VAR_0x8000, 326 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 257 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_81996FF, ITEM_TM38 setflag FLAG_0x24E loadword 0, gUnknown_8199652 callstd 4 diff --git a/data/maps/FuchsiaCity_Building1/scripts.inc b/data/maps/FuchsiaCity_Building1/scripts.inc index 40edfa858..df15b2d46 100644 --- a/data/maps/FuchsiaCity_Building1/scripts.inc +++ b/data/maps/FuchsiaCity_Building1/scripts.inc @@ -32,11 +32,7 @@ EventScript_16D780:: @ 816D780 compare_var_to_value VAR_RESULT, 1 call_if 1, EventScript_16D7DF additem ITEM_HM04, 1 - loadword 0, gUnknown_8199068 - setorcopyvar VAR_0x8000, 342 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 257 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_8199068, ITEM_HM04 setflag FLAG_0x23A removeitem ITEM_GOLD_TEETH, 1 release diff --git a/data/maps/FuchsiaCity_Gym/scripts.inc b/data/maps/FuchsiaCity_Gym/scripts.inc index 41ea7a40d..ff59fdb4b 100644 --- a/data/maps/FuchsiaCity_Gym/scripts.inc +++ b/data/maps/FuchsiaCity_Gym/scripts.inc @@ -32,11 +32,7 @@ EventScript_16D5A6:: @ 816D5A6 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16D5E7 additem ITEM_TM06, 1 - loadword 0, gUnknown_819858F - setorcopyvar VAR_0x8000, 294 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 257 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_819858F, ITEM_TM06 setflag FLAG_0x259 loadword 0, gUnknown_81985AB callstd 4 diff --git a/data/maps/FuchsiaCity_House2/scripts.inc b/data/maps/FuchsiaCity_House2/scripts.inc index f14e1bb32..e9470babb 100644 --- a/data/maps/FuchsiaCity_House2/scripts.inc +++ b/data/maps/FuchsiaCity_House2/scripts.inc @@ -28,11 +28,7 @@ EventScript_16D849:: @ 816D849 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16D88A additem ITEM_GOOD_ROD, 1 - loadword 0, gUnknown_819925E - setorcopyvar VAR_0x8000, 263 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 257 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_819925E, ITEM_GOOD_ROD loadword 0, gUnknown_8199296 callstd 4 setflag FLAG_0x244 diff --git a/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc b/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc index f5000c69d..1070e8850 100644 --- a/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc +++ b/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc @@ -13,11 +13,7 @@ LavenderTown_VolunteerPokemonHouse_EventScript_16B14A:: @ 816B14A goto_if 1, EventScript_16B1A0 setflag FLAG_0x23D additem ITEM_POKE_FLUTE, 1 - loadword 0, gUnknown_81937BD - setorcopyvar VAR_0x8000, 350 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 318 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_81937BD, ITEM_POKE_FLUTE, 1, BGM_FRLG_ME_KEYITEM loadword 0, gUnknown_81937E5 callstd 4 release diff --git a/data/maps/MtEmber_RubyPath_B3F/scripts.inc b/data/maps/MtEmber_RubyPath_B3F/scripts.inc index 23e8a361e..bc9266e8b 100644 --- a/data/maps/MtEmber_RubyPath_B3F/scripts.inc +++ b/data/maps/MtEmber_RubyPath_B3F/scripts.inc @@ -8,10 +8,6 @@ MtEmber_RubyPath_B5F_EventScript_163C49:: @ 8163C49 setflag FLAG_0x2DD removeobject 1 additem ITEM_RUBY, 1 - loadword 0, gUnknown_817ADC5 - setorcopyvar VAR_0x8000, 373 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 318 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_817ADC5, ITEM_RUBY, 1, BGM_FRLG_ME_KEYITEM release end diff --git a/data/maps/MtMoon_B2F/scripts.inc b/data/maps/MtMoon_B2F/scripts.inc index 923635aa3..721af3880 100644 --- a/data/maps/MtMoon_B2F/scripts.inc +++ b/data/maps/MtMoon_B2F/scripts.inc @@ -65,11 +65,7 @@ MtMoon_B2F_EventScript_16071B:: @ 816071B goto_if 1, EventScript_1607DE removeobject 1 additem ITEM_DOME_FOSSIL, 1 - loadword 0, gUnknown_8172ECD - setorcopyvar VAR_0x8000, 358 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 318 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_8172ECD, ITEM_DOME_FOSSIL, 1, BGM_FRLG_ME_KEYITEM closemessage special sub_8112364 delay 10 @@ -103,11 +99,7 @@ MtMoon_B2F_EventScript_16077F:: @ 816077F goto_if 1, EventScript_1607DE removeobject 2 additem ITEM_HELIX_FOSSIL, 1 - loadword 0, gUnknown_8172EB2 - setorcopyvar VAR_0x8000, 357 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 318 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_8172EB2, ITEM_HELIX_FOSSIL, 1, BGM_FRLG_ME_KEYITEM closemessage special sub_8112364 delay 10 diff --git a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc index e63a08d64..e52bdad8d 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc @@ -113,22 +113,14 @@ EventScript_170CB1:: @ 8170CB1 waitmovement 0 loadword 0, gUnknown_81A0FB1 callstd 4 - loadword 0, gUnknown_81A10EE - setorcopyvar VAR_0x8000, 280 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 318 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_81A10EE, ITEM_METEORITE, 1, BGM_FRLG_ME_KEYITEM additem ITEM_METEORITE, 1 applymovement 3, Movement_1A75ED waitmovement 0 loadword 0, gUnknown_81A1113 callstd 4 additem ITEM_TRI_PASS, 1 - loadword 0, gUnknown_81A231B - setorcopyvar VAR_0x8000, 367 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 318 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_81A231B, ITEM_TRI_PASS, 1, BGM_FRLG_ME_KEYITEM loadword 0, gUnknown_81A1150 callstd 4 compare_var_to_value VAR_0x4058, 2 @@ -171,11 +163,7 @@ EventScript_170E58:: @ 8170E58 setflag FLAG_0x039 setvar VAR_0x4058, 2 additem ITEM_TOWN_MAP, 1 - loadword 0, gUnknown_81A1218 - setorcopyvar VAR_0x8000, 361 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 318 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_81A1218, ITEM_TOWN_MAP, 1, BGM_FRLG_ME_KEYITEM return Movement_170E7D:: @ 8170E7D diff --git a/data/maps/PalletTown_GarysHouse/scripts.inc b/data/maps/PalletTown_GarysHouse/scripts.inc index 88a265589..1d7959229 100644 --- a/data/maps/PalletTown_GarysHouse/scripts.inc +++ b/data/maps/PalletTown_GarysHouse/scripts.inc @@ -181,11 +181,7 @@ EventScript_168EF6:: @ 8168EF6 waitmovement 0 delay 12 additem ITEM_TOWN_MAP, 1 - loadword 0, gUnknown_818D661 - setorcopyvar VAR_0x8000, 361 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 318 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_818D661, ITEM_TOWN_MAP, 1, BGM_FRLG_ME_KEYITEM release end diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc index 6af16d8d5..2d310234e 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc +++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc @@ -740,11 +740,7 @@ EventScript_16961E:: @ 816961E loadword 0, gUnknown_818E612 callstd 4 additem ITEM_POKE_BALL, 5 - loadword 0, gUnknown_818E6B3 - setorcopyvar VAR_0x8000, 4 - setorcopyvar VAR_0x8001, 5 - setorcopyvar VAR_0x8002, 257 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_818E6B3, ITEM_POKE_BALL, 5 loadword 0, gUnknown_818E6D0 callstd 4 setvar VAR_0x8004, 0 @@ -1049,11 +1045,7 @@ EventScript_169A45:: @ 8169A45 loadword 0, gUnknown_818E89C callstd 4 additem ITEM_POKE_BALL, 5 - loadword 0, gUnknown_818E6B3 - setorcopyvar VAR_0x8000, 4 - setorcopyvar VAR_0x8001, 5 - setorcopyvar VAR_0x8002, 257 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_818E6B3, ITEM_POKE_BALL, 5 setflag FLAG_0x247 release end diff --git a/data/maps/PewterCity_Gym/scripts.inc b/data/maps/PewterCity_Gym/scripts.inc index c517f90a7..3d9ee1d2f 100644 --- a/data/maps/PewterCity_Gym/scripts.inc +++ b/data/maps/PewterCity_Gym/scripts.inc @@ -34,11 +34,7 @@ EventScript_16A5F3:: @ 816A5F3 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16A634 additem ITEM_TM39, 1 - loadword 0, gUnknown_8190FDB - setorcopyvar VAR_0x8000, 327 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 257 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_8190FDB, ITEM_TM39 setflag FLAG_0x254 loadword 0, gUnknown_8190FF8 callstd 4 diff --git a/data/maps/PewterCity_Museum_1F/scripts.inc b/data/maps/PewterCity_Museum_1F/scripts.inc index 0b33be6c8..94b04c528 100644 --- a/data/maps/PewterCity_Museum_1F/scripts.inc +++ b/data/maps/PewterCity_Museum_1F/scripts.inc @@ -178,11 +178,7 @@ PewterCity_Museum_1F_EventScript_16A4AE:: @ 816A4AE setflag FLAG_0x25E removeobject 4 additem ITEM_OLD_AMBER, 1 - loadword 0, gUnknown_8190866 - setorcopyvar VAR_0x8000, 354 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 318 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_8190866, ITEM_OLD_AMBER, 1, BGM_FRLG_ME_KEYITEM release end diff --git a/data/maps/Route10_PokemonCenter_1F/scripts.inc b/data/maps/Route10_PokemonCenter_1F/scripts.inc index 353fac943..791cab192 100644 --- a/data/maps/Route10_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route10_PokemonCenter_1F/scripts.inc @@ -52,11 +52,7 @@ Route10_PokemonCenter_1F_EventScript_16FC65:: @ 816FC65 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_1A7AC7 additem ITEM_EVERSTONE, 1 - loadword 0, gUnknown_819E786 - setorcopyvar VAR_0x8000, 195 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 257 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_819E786, ITEM_EVERSTONE setflag FLAG_0x2FA loadword 0, gUnknown_819E7AF callstd 4 diff --git a/data/maps/Route11_EastEntrance_2F/scripts.inc b/data/maps/Route11_EastEntrance_2F/scripts.inc index 54a98787e..10f9539b5 100644 --- a/data/maps/Route11_EastEntrance_2F/scripts.inc +++ b/data/maps/Route11_EastEntrance_2F/scripts.inc @@ -86,11 +86,7 @@ Route11_EastEntrance_2F_EventScript_16FDD8:: @ 816FDD8 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_1A7AC7 additem ITEM_ITEMFINDER, 1 - loadword 0, gUnknown_819EB37 - setorcopyvar VAR_0x8000, 261 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 257 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_819EB37, ITEM_ITEMFINDER setflag FLAG_0x252 loadword 0, gUnknown_819EB59 callstd 4 diff --git a/data/maps/Route12_FishingHouse/scripts.inc b/data/maps/Route12_FishingHouse/scripts.inc index ec7b5e0a9..1973de14c 100644 --- a/data/maps/Route12_FishingHouse/scripts.inc +++ b/data/maps/Route12_FishingHouse/scripts.inc @@ -22,11 +22,7 @@ EventScript_16FF34:: @ 816FF34 additem ITEM_SUPER_ROD, 1 loadword 0, gUnknown_819F05B callstd 4 - loadword 0, gUnknown_819F0B2 - setorcopyvar VAR_0x8000, 264 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 257 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_819F0B2, ITEM_SUPER_ROD setflag FLAG_0x255 loadword 0, gUnknown_819F0EB callstd 4 diff --git a/data/maps/Route12_NorthEntrance_2F/scripts.inc b/data/maps/Route12_NorthEntrance_2F/scripts.inc index 393b191f5..adf7f0040 100644 --- a/data/maps/Route12_NorthEntrance_2F/scripts.inc +++ b/data/maps/Route12_NorthEntrance_2F/scripts.inc @@ -25,11 +25,7 @@ Route12_NorthEntrance_2F_EventScript_16FE8A:: @ 816FE8A compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16FEF7 additem ITEM_TM27, 1 - loadword 0, gUnknown_819EE9F - setorcopyvar VAR_0x8000, 315 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 257 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_819EE9F, ITEM_TM27 loadword 0, gUnknown_819EEC6 callstd 4 setflag FLAG_0x25B diff --git a/data/maps/Route15_WestEntrance_2F/scripts.inc b/data/maps/Route15_WestEntrance_2F/scripts.inc index 5c25559c3..8685b0528 100644 --- a/data/maps/Route15_WestEntrance_2F/scripts.inc +++ b/data/maps/Route15_WestEntrance_2F/scripts.inc @@ -41,11 +41,7 @@ Route15_WestEntrance_2F_EventScript_1700B9:: @ 81700B9 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_1A7AC7 additem ITEM_EXP_SHARE, 1 - loadword 0, gUnknown_819F6FD - setorcopyvar VAR_0x8000, 182 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 257 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_819F6FD, ITEM_EXP_SHARE setflag FLAG_0x256 loadword 0, gUnknown_819F71F callstd 4 diff --git a/data/maps/Route16_House/scripts.inc b/data/maps/Route16_House/scripts.inc index 3b5c5868e..d48a944dc 100644 --- a/data/maps/Route16_House/scripts.inc +++ b/data/maps/Route16_House/scripts.inc @@ -12,11 +12,7 @@ Route16_House_EventScript_17014F:: @ 817014F compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_17019B additem ITEM_HM02, 1 - loadword 0, gUnknown_819F8C0 - setorcopyvar VAR_0x8000, 340 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 257 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_819F8C0, ITEM_HM02 loadword 0, gUnknown_819F8E0 callstd 4 setflag FLAG_0x238 diff --git a/data/maps/Route16_NorthEntrance_2F/scripts.inc b/data/maps/Route16_NorthEntrance_2F/scripts.inc index 60644f527..f72336971 100644 --- a/data/maps/Route16_NorthEntrance_2F/scripts.inc +++ b/data/maps/Route16_NorthEntrance_2F/scripts.inc @@ -43,11 +43,7 @@ Route16_NorthEntrance_2F_EventScript_1702E3:: @ 81702E3 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_1A7AC7 additem ITEM_AMULET_COIN, 1 - loadword 0, gUnknown_819FC68 - setorcopyvar VAR_0x8000, 189 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 257 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_819FC68, ITEM_AMULET_COIN setflag FLAG_0x2FD loadword 0, gUnknown_819FC93 callstd 4 diff --git a/data/maps/Route24/scripts.inc b/data/maps/Route24/scripts.inc index 8b27df5f5..a083019e1 100644 --- a/data/maps/Route24/scripts.inc +++ b/data/maps/Route24/scripts.inc @@ -58,11 +58,7 @@ EventScript_168678:: @ 8168678 EventScript_1686B9:: @ 81686B9 additem ITEM_NUGGET, 1 - loadword 0, gUnknown_8188C93 - setorcopyvar VAR_0x8000, 110 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 257 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_8188C93, ITEM_NUGGET message Text_188CDB waitmessage playbgm BGM_FRLG_SUSPICIOUS_EYE, 0 diff --git a/data/maps/Route25_SeaCottage/scripts.inc b/data/maps/Route25_SeaCottage/scripts.inc index d609226bf..3c412fb75 100644 --- a/data/maps/Route25_SeaCottage/scripts.inc +++ b/data/maps/Route25_SeaCottage/scripts.inc @@ -120,11 +120,7 @@ EventScript_17064A:: @ 817064A compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_1706BE additem ITEM_SS_TICKET, 1 - loadword 0, gUnknown_81A028E - setorcopyvar VAR_0x8000, 265 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 318 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_81A028E, ITEM_SS_TICKET, 1, BGM_FRLG_ME_KEYITEM setflag FLAG_0x235 setflag FLAG_0x031 setflag FLAG_0x234 diff --git a/data/maps/Route2_EastBuilding/scripts.inc b/data/maps/Route2_EastBuilding/scripts.inc index 2e8c9101c..513ac758b 100644 --- a/data/maps/Route2_EastBuilding/scripts.inc +++ b/data/maps/Route2_EastBuilding/scripts.inc @@ -23,11 +23,7 @@ Route2_EastBuilding_EventScript_16F67F:: @ 816F67F compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_1A7AC7 additem ITEM_HM05, 1 - loadword 0, gUnknown_819D7A1 - setorcopyvar VAR_0x8000, 343 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 257 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_819D7A1, ITEM_HM05 setflag FLAG_0x23B loadword 0, gUnknown_819D7C1 callstd 4 diff --git a/data/maps/SSAnne_CaptainsOffice/scripts.inc b/data/maps/SSAnne_CaptainsOffice/scripts.inc index aa693b700..23e1d6b36 100644 --- a/data/maps/SSAnne_CaptainsOffice/scripts.inc +++ b/data/maps/SSAnne_CaptainsOffice/scripts.inc @@ -19,11 +19,7 @@ SSAnne_CaptainsOffice_EventScript_160B3A:: @ 8160B3A loadword 0, gUnknown_81736A6 callstd 4 additem ITEM_HM01, 1 - loadword 0, gUnknown_81737AF - setorcopyvar VAR_0x8000, 339 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 318 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_81737AF, ITEM_HM01, 1, BGM_FRLG_ME_KEYITEM loadword 0, gUnknown_81737D2 callstd 4 setflag FLAG_0x237 diff --git a/data/maps/SafariZone_SecretHouse/scripts.inc b/data/maps/SafariZone_SecretHouse/scripts.inc index 3f5fe1e38..6e9e27f70 100644 --- a/data/maps/SafariZone_SecretHouse/scripts.inc +++ b/data/maps/SafariZone_SecretHouse/scripts.inc @@ -12,11 +12,7 @@ SafariZone_SecretHouse_EventScript_162453:: @ 8162453 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16249F additem ITEM_HM03, 1 - loadword 0, gUnknown_8177E92 - setorcopyvar VAR_0x8000, 341 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 257 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_8177E92, ITEM_HM03 loadword 0, gUnknown_8177EB7 callstd 4 setflag FLAG_0x239 diff --git a/data/maps/SaffronCity_Gym/scripts.inc b/data/maps/SaffronCity_Gym/scripts.inc index 83ef16597..343379bbd 100644 --- a/data/maps/SaffronCity_Gym/scripts.inc +++ b/data/maps/SaffronCity_Gym/scripts.inc @@ -35,11 +35,7 @@ EventScript_16EE3D:: @ 816EE3D compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16EE7E additem ITEM_TM04, 1 - loadword 0, gUnknown_819B7D3 - setorcopyvar VAR_0x8000, 292 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 257 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_819B7D3, ITEM_TM04 setflag FLAG_0x29A loadword 0, gUnknown_819B685 callstd 4 diff --git a/data/maps/SaffronCity_House3/scripts.inc b/data/maps/SaffronCity_House3/scripts.inc index d1b3ad033..8d45865f0 100644 --- a/data/maps/SaffronCity_House3/scripts.inc +++ b/data/maps/SaffronCity_House3/scripts.inc @@ -12,11 +12,7 @@ SaffronCity_House3_EventScript_16F05F:: @ 816F05F compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16F0AB additem ITEM_TM29, 1 - loadword 0, gUnknown_819C16C - setorcopyvar VAR_0x8000, 317 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 257 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_819C16C, ITEM_TM29 loadword 0, gUnknown_819C18F callstd 4 setflag FLAG_0x245 diff --git a/data/maps/SilphCo_11F/scripts.inc b/data/maps/SilphCo_11F/scripts.inc index 01f9254d5..ac317f89c 100644 --- a/data/maps/SilphCo_11F/scripts.inc +++ b/data/maps/SilphCo_11F/scripts.inc @@ -21,11 +21,7 @@ SilphCo_11F_EventScript_161DFE:: @ 8161DFE compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_161E6B additem ITEM_MASTER_BALL, 1 - loadword 0, gUnknown_8176FBD - setorcopyvar VAR_0x8000, 1 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 318 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_8176FBD, ITEM_MASTER_BALL, 1, BGM_FRLG_ME_KEYITEM loadword 0, gUnknown_8176FEB callstd 4 setflag FLAG_0x250 diff --git a/data/maps/ThreeIsland/scripts.inc b/data/maps/ThreeIsland/scripts.inc index cf1dded03..94101ba9b 100644 --- a/data/maps/ThreeIsland/scripts.inc +++ b/data/maps/ThreeIsland/scripts.inc @@ -53,11 +53,7 @@ EventScript_16781A:: @ 816781A checkitemspace ITEM_FULL_RESTORE, 1 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_167865 - loadword 0, gUnknown_81827BE - setorcopyvar VAR_0x8000, 19 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 257 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_81827BE, ITEM_FULL_RESTORE additem ITEM_FULL_RESTORE, 1 setflag FLAG_0x2FC loadword 0, gUnknown_81827F1 diff --git a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc index e027a97fe..bb39c4f80 100644 --- a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc +++ b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc @@ -186,11 +186,7 @@ EventScript_1715C4:: @ 81715C4 goto_if 1, EventScript_1715FF additem ITEM_MOON_STONE, 1 setflag FLAG_0x2FB - loadword 0, gUnknown_81A2A9A - setorcopyvar VAR_0x8000, 94 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 257 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_81A2A9A, ITEM_MOON_STONE release end diff --git a/data/maps/VermilionCity_Gym/scripts.inc b/data/maps/VermilionCity_Gym/scripts.inc index f3229a4e1..22dc7f6a9 100644 --- a/data/maps/VermilionCity_Gym/scripts.inc +++ b/data/maps/VermilionCity_Gym/scripts.inc @@ -249,11 +249,7 @@ EventScript_16B9AF:: @ 816B9AF compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16B9F0 additem ITEM_TM34, 1 - loadword 0, gUnknown_8194D87 - setorcopyvar VAR_0x8000, 322 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 257 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_8194D87, ITEM_TM34 setflag FLAG_0x231 loadword 0, gUnknown_8194DA8 callstd 4 diff --git a/data/maps/VermilionCity_House1/scripts.inc b/data/maps/VermilionCity_House1/scripts.inc index b4b9d1126..3e07e1143 100644 --- a/data/maps/VermilionCity_House1/scripts.inc +++ b/data/maps/VermilionCity_House1/scripts.inc @@ -28,11 +28,7 @@ EventScript_16B3D9:: @ 816B3D9 additem ITEM_OLD_ROD, 1 loadword 0, gUnknown_8193F2A callstd 4 - loadword 0, gUnknown_8193F81 - setorcopyvar VAR_0x8000, 262 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 257 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_8193F81, ITEM_OLD_ROD setflag FLAG_0x240 loadword 0, gUnknown_8193FAF callstd 4 diff --git a/data/maps/VermilionCity_PokemonFanClub/scripts.inc b/data/maps/VermilionCity_PokemonFanClub/scripts.inc index 30f31c6f5..4fc8d5b25 100644 --- a/data/maps/VermilionCity_PokemonFanClub/scripts.inc +++ b/data/maps/VermilionCity_PokemonFanClub/scripts.inc @@ -29,11 +29,7 @@ EventScript_16B4B1:: @ 816B4B1 goto_if 1, EventScript_16B4F2 setflag FLAG_0x241 additem ITEM_BIKE_VOUCHER, 1 - loadword 0, gUnknown_819474E - setorcopyvar VAR_0x8000, 352 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 318 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_819474E, ITEM_BIKE_VOUCHER, 1, BGM_FRLG_ME_KEYITEM loadword 0, gUnknown_819477C callstd 4 release diff --git a/data/maps/ViridianCity_Gym/scripts.inc b/data/maps/ViridianCity_Gym/scripts.inc index c06fa00cc..283b4e15b 100644 --- a/data/maps/ViridianCity_Gym/scripts.inc +++ b/data/maps/ViridianCity_Gym/scripts.inc @@ -37,11 +37,7 @@ EventScript_169F2F:: @ 8169F2F compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_169F70 additem ITEM_TM26, 1 - loadword 0, gUnknown_818F675 - setorcopyvar VAR_0x8000, 314 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 257 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_818F675, ITEM_TM26 setflag FLAG_0x298 loadword 0, gUnknown_818F695 callstd 4 diff --git a/data/maps/ViridianCity_Mart/scripts.inc b/data/maps/ViridianCity_Mart/scripts.inc index 66ed9683d..250538d21 100644 --- a/data/maps/ViridianCity_Mart/scripts.inc +++ b/data/maps/ViridianCity_Mart/scripts.inc @@ -32,11 +32,7 @@ EventScript_16A205:: @ 816A205 callstd 4 setvar VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 1 additem ITEM_OAKS_PARCEL, 1 - loadword 0, gUnknown_8190289 - setorcopyvar VAR_0x8000, 349 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, 318 - callstd 9 @ gStdScript_ItemMessageAndFanfare + giveitemfanfaremsg gUnknown_8190289, ITEM_OAKS_PARCEL, 1, BGM_FRLG_ME_KEYITEM setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 5 releaseall end -- cgit v1.2.3 From 119693e1816563b66b19eef216f08cab65a644ba Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 16 May 2019 09:38:19 -0400 Subject: propagate msgbox macro --- data/maps/CeladonCity/scripts.inc | 54 +++---- data/maps/CeladonCity_Condominiums_1F/scripts.inc | 24 +-- data/maps/CeladonCity_Condominiums_2F/scripts.inc | 3 +- data/maps/CeladonCity_Condominiums_3F/scripts.inc | 24 +-- .../maps/CeladonCity_Condominiums_Roof/scripts.inc | 3 +- .../CeladonCity_Condominiums_RoofRoom/scripts.inc | 24 +-- .../CeladonCity_DepartmentStore_1F/scripts.inc | 9 +- .../CeladonCity_DepartmentStore_2F/scripts.inc | 15 +- .../CeladonCity_DepartmentStore_3F/scripts.inc | 33 ++-- .../CeladonCity_DepartmentStore_4F/scripts.inc | 12 +- .../CeladonCity_DepartmentStore_5F/scripts.inc | 15 +- .../CeladonCity_DepartmentStore_Roof/scripts.inc | 48 ++---- data/maps/CeladonCity_GameCorner/scripts.inc | 99 ++++-------- .../CeladonCity_GameCorner_PrizeRoom/scripts.inc | 42 ++--- data/maps/CeladonCity_Gym/scripts.inc | 39 ++--- data/maps/CeladonCity_Hotel/scripts.inc | 12 +- data/maps/CeladonCity_House1/scripts.inc | 9 +- data/maps/CeladonCity_PokemonCenter_1F/scripts.inc | 9 +- data/maps/CeladonCity_Restaurant/scripts.inc | 21 +-- data/maps/CeruleanCity/scripts.inc | 78 +++------ data/maps/CeruleanCity_BikeShop/scripts.inc | 30 ++-- data/maps/CeruleanCity_Gym/scripts.inc | 30 ++-- data/maps/CeruleanCity_House1/scripts.inc | 30 ++-- data/maps/CeruleanCity_House2/scripts.inc | 12 +- data/maps/CeruleanCity_House3/scripts.inc | 18 +-- data/maps/CeruleanCity_House4/scripts.inc | 24 +-- data/maps/CeruleanCity_House5/scripts.inc | 36 ++--- data/maps/CeruleanCity_Mart/scripts.inc | 9 +- .../maps/CeruleanCity_PokemonCenter_1F/scripts.inc | 12 +- data/maps/CinnabarIsland/scripts.inc | 36 ++--- data/maps/CinnabarIsland_Gym/scripts.inc | 105 +++++-------- data/maps/CinnabarIsland_Mart/scripts.inc | 9 +- .../CinnabarIsland_PokemonCenter_1F/scripts.inc | 18 +-- .../CinnabarIsland_PokemonLab_Entrance/scripts.inc | 15 +- .../scripts.inc | 72 +++------ .../CinnabarIsland_PokemonLab_Lounge/scripts.inc | 33 ++-- .../scripts.inc | 9 +- data/maps/DiglettsCave_NorthEntrance/scripts.inc | 3 +- data/maps/DiglettsCave_SouthEntrance/scripts.inc | 3 +- data/maps/FiveIsland/scripts.inc | 9 +- data/maps/FiveIsland_House1/scripts.inc | 3 +- data/maps/FiveIsland_House2/scripts.inc | 3 +- data/maps/FiveIsland_LostCave_Room1/scripts.inc | 3 +- data/maps/FiveIsland_LostCave_Room10/scripts.inc | 6 +- data/maps/FiveIsland_LostCave_Room4/scripts.inc | 3 +- data/maps/FiveIsland_Meadow/scripts.inc | 15 +- data/maps/FiveIsland_MemorialPillar/scripts.inc | 36 ++--- data/maps/FiveIsland_PokemonCenter_1F/scripts.inc | 6 +- data/maps/FiveIsland_ResortGorgeous/scripts.inc | 6 +- .../FiveIsland_ResortGorgeous_House/scripts.inc | 36 ++--- data/maps/FiveIsland_RocketWarehouse/scripts.inc | 42 ++--- data/maps/FiveIsland_WaterLabyrinth/scripts.inc | 18 +-- data/maps/FourIsland/scripts.inc | 45 ++---- data/maps/FourIsland_House1/scripts.inc | 3 +- data/maps/FourIsland_IcefallCave_Back/scripts.inc | 27 ++-- data/maps/FourIsland_LoreleisHouse/scripts.inc | 12 +- data/maps/FourIsland_Mart/scripts.inc | 6 +- data/maps/FourIsland_PokemonCenter_1F/scripts.inc | 9 +- data/maps/FourIsland_PokemonDayCare/scripts.inc | 72 +++------ data/maps/FuchsiaCity/scripts.inc | 54 +++---- data/maps/FuchsiaCity_Building1/scripts.inc | 27 ++-- data/maps/FuchsiaCity_Gym/scripts.inc | 42 ++--- data/maps/FuchsiaCity_House1/scripts.inc | 9 +- data/maps/FuchsiaCity_House2/scripts.inc | 18 +-- data/maps/FuchsiaCity_House3/scripts.inc | 24 +-- data/maps/FuchsiaCity_Mart/scripts.inc | 9 +- data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc | 9 +- .../FuchsiaCity_SafariZone_Entrance/scripts.inc | 45 ++---- data/maps/FuchsiaCity_ZooBuilding/scripts.inc | 12 +- .../IndigoPlateau_PokemonCenter_1F/scripts.inc | 15 +- data/maps/LavenderTown/scripts.inc | 27 ++-- data/maps/LavenderTown_House1/scripts.inc | 9 +- data/maps/LavenderTown_House2/scripts.inc | 27 ++-- data/maps/LavenderTown_Mart/scripts.inc | 12 +- .../maps/LavenderTown_PokemonCenter_1F/scripts.inc | 9 +- .../LavenderTown_VolunteerPokemonHouse/scripts.inc | 36 ++--- data/maps/MtEmber_Exterior/scripts.inc | 45 ++---- data/maps/MtMoon_1F/scripts.inc | 24 +-- data/maps/MtMoon_B2F/scripts.inc | 27 ++-- data/maps/OneIsland/scripts.inc | 21 +-- data/maps/OneIsland_House1/scripts.inc | 6 +- data/maps/OneIsland_House2/scripts.inc | 3 +- data/maps/OneIsland_KindleRoad/scripts.inc | 6 +- .../maps/OneIsland_KindleRoad_EmberSpa/scripts.inc | 27 ++-- data/maps/OneIsland_PokemonCenter_1F/scripts.inc | 150 ++++++------------ data/maps/OneIsland_TreasureBeach/scripts.inc | 3 +- data/maps/PalletTown/scripts.inc | 54 +++---- data/maps/PalletTown_GarysHouse/scripts.inc | 69 +++----- data/maps/PalletTown_PlayersHouse_1F/scripts.inc | 21 +-- data/maps/PalletTown_PlayersHouse_2F/scripts.inc | 9 +- data/maps/PalletTown_ProfessorOaksLab/scripts.inc | 174 +++++++-------------- data/maps/PewterCity/scripts.inc | 72 +++------ data/maps/PewterCity_Gym/scripts.inc | 36 ++--- data/maps/PewterCity_House1/scripts.inc | 9 +- data/maps/PewterCity_House2/scripts.inc | 6 +- data/maps/PewterCity_Mart/scripts.inc | 9 +- data/maps/PewterCity_Museum_1F/scripts.inc | 48 ++---- data/maps/PewterCity_Museum_2F/scripts.inc | 21 +-- data/maps/PewterCity_PokemonCenter_1F/scripts.inc | 12 +- data/maps/PokemonLeague_AgathasRoom/scripts.inc | 12 +- data/maps/PokemonLeague_BrunosRoom/scripts.inc | 12 +- data/maps/PokemonLeague_ChampionsRoom/scripts.inc | 21 +-- data/maps/PokemonLeague_HallOfFame/scripts.inc | 3 +- data/maps/PokemonLeague_LancesRoom/scripts.inc | 12 +- data/maps/PokemonLeague_LoreleisRoom/scripts.inc | 12 +- data/maps/PokemonMansion_1F/scripts.inc | 6 +- data/maps/PokemonMansion_2F/scripts.inc | 9 +- data/maps/PokemonMansion_3F/scripts.inc | 9 +- data/maps/PokemonMansion_B1F/scripts.inc | 9 +- data/maps/PokemonTower_1F/scripts.inc | 18 +-- data/maps/PokemonTower_2F/scripts.inc | 9 +- data/maps/PokemonTower_3F/scripts.inc | 9 +- data/maps/PokemonTower_4F/scripts.inc | 9 +- data/maps/PokemonTower_5F/scripts.inc | 18 +-- data/maps/PokemonTower_6F/scripts.inc | 15 +- data/maps/PokemonTower_7F/scripts.inc | 21 +-- data/maps/RockTunnel_1F/scripts.inc | 24 +-- data/maps/RockTunnel_B1F/scripts.inc | 24 +-- data/maps/RocketHideout_B1F/scripts.inc | 15 +- data/maps/RocketHideout_B2F/scripts.inc | 3 +- data/maps/RocketHideout_B3F/scripts.inc | 6 +- data/maps/RocketHideout_B4F/scripts.inc | 15 +- data/maps/RocketHideout_Elevator/scripts.inc | 3 +- data/maps/Route1/scripts.inc | 15 +- data/maps/Route10/scripts.inc | 9 +- data/maps/Route10_PokemonCenter_1F/scripts.inc | 21 +-- data/maps/Route11/scripts.inc | 3 +- data/maps/Route11_EastEntrance_1F/scripts.inc | 6 +- data/maps/Route11_EastEntrance_2F/scripts.inc | 36 ++--- data/maps/Route12/scripts.inc | 15 +- data/maps/Route12_FishingHouse/scripts.inc | 45 ++---- data/maps/Route12_NorthEntrance_1F/scripts.inc | 3 +- data/maps/Route12_NorthEntrance_2F/scripts.inc | 21 +-- data/maps/Route13/scripts.inc | 9 +- data/maps/Route14/scripts.inc | 3 +- data/maps/Route15/scripts.inc | 3 +- data/maps/Route15_WestEntrance_1F/scripts.inc | 3 +- data/maps/Route15_WestEntrance_2F/scripts.inc | 18 +-- data/maps/Route16/scripts.inc | 15 +- data/maps/Route16_House/scripts.inc | 15 +- data/maps/Route16_NorthEntrance_1F/scripts.inc | 12 +- data/maps/Route16_NorthEntrance_2F/scripts.inc | 24 +-- data/maps/Route17/scripts.inc | 18 +-- data/maps/Route18/scripts.inc | 6 +- data/maps/Route18_EastEntrance_1F/scripts.inc | 9 +- data/maps/Route18_EastEntrance_2F/scripts.inc | 21 +-- data/maps/Route19/scripts.inc | 3 +- data/maps/Route2/scripts.inc | 6 +- data/maps/Route20/scripts.inc | 3 +- data/maps/Route22/scripts.inc | 15 +- data/maps/Route23/scripts.inc | 3 +- data/maps/Route24/scripts.inc | 18 +-- data/maps/Route25/scripts.inc | 6 +- data/maps/Route25_SeaCottage/scripts.inc | 39 ++--- data/maps/Route2_EastBuilding/scripts.inc | 15 +- data/maps/Route2_House/scripts.inc | 18 +-- .../scripts.inc | 9 +- .../scripts.inc | 6 +- data/maps/Route3/scripts.inc | 6 +- data/maps/Route4/scripts.inc | 9 +- data/maps/Route4_PokemonCenter_1F/scripts.inc | 36 ++--- data/maps/Route5/scripts.inc | 3 +- data/maps/Route5_SouthEntrance/scripts.inc | 12 +- data/maps/Route6/scripts.inc | 3 +- data/maps/Route6_NorthEntrance/scripts.inc | 12 +- data/maps/Route7/scripts.inc | 3 +- data/maps/Route7_EastEntrance/scripts.inc | 12 +- data/maps/Route8/scripts.inc | 3 +- data/maps/Route8_WestEntrance/scripts.inc | 12 +- data/maps/Route9/scripts.inc | 3 +- data/maps/SSAnne_1F_Corridor/scripts.inc | 6 +- data/maps/SSAnne_1F_Room1/scripts.inc | 3 +- data/maps/SSAnne_1F_Room2/scripts.inc | 9 +- data/maps/SSAnne_1F_Room3/scripts.inc | 9 +- data/maps/SSAnne_1F_Room4/scripts.inc | 6 +- data/maps/SSAnne_1F_Room5/scripts.inc | 3 +- data/maps/SSAnne_1F_Room6/scripts.inc | 12 +- data/maps/SSAnne_1F_Room7/scripts.inc | 3 +- data/maps/SSAnne_2F_Corridor/scripts.inc | 9 +- data/maps/SSAnne_2F_Room2/scripts.inc | 6 +- data/maps/SSAnne_2F_Room3/scripts.inc | 6 +- data/maps/SSAnne_2F_Room4/scripts.inc | 6 +- data/maps/SSAnne_2F_Room5/scripts.inc | 6 +- data/maps/SSAnne_2F_Room6/scripts.inc | 6 +- data/maps/SSAnne_3F_Corridor/scripts.inc | 3 +- data/maps/SSAnne_B1F_Room1/scripts.inc | 6 +- data/maps/SSAnne_B1F_Room2/scripts.inc | 3 +- data/maps/SSAnne_B1F_Room3/scripts.inc | 3 +- data/maps/SSAnne_B1F_Room4/scripts.inc | 6 +- data/maps/SSAnne_B1F_Room5/scripts.inc | 6 +- data/maps/SSAnne_CaptainsOffice/scripts.inc | 21 +-- data/maps/SSAnne_Deck/scripts.inc | 15 +- data/maps/SSAnne_Kitchen/scripts.inc | 30 ++-- data/maps/SafariZone_Building1/scripts.inc | 6 +- data/maps/SafariZone_Building2/scripts.inc | 9 +- data/maps/SafariZone_Building3/scripts.inc | 9 +- data/maps/SafariZone_Building4/scripts.inc | 9 +- data/maps/SafariZone_Center/scripts.inc | 9 +- data/maps/SafariZone_East/scripts.inc | 9 +- data/maps/SafariZone_North/scripts.inc | 15 +- data/maps/SafariZone_SecretHouse/scripts.inc | 12 +- data/maps/SafariZone_West/scripts.inc | 12 +- data/maps/SaffronCity_Dojo/scripts.inc | 42 ++--- data/maps/SaffronCity_Duplicate/scripts.inc | 72 +++------ data/maps/SaffronCity_Gym/scripts.inc | 45 ++---- data/maps/SaffronCity_House1_1F/scripts.inc | 9 +- data/maps/SaffronCity_House1_2F/scripts.inc | 18 +-- data/maps/SaffronCity_House2/scripts.inc | 12 +- data/maps/SaffronCity_House3/scripts.inc | 12 +- data/maps/SaffronCity_Mart/scripts.inc | 9 +- data/maps/SaffronCity_PokemonCenter_1F/scripts.inc | 12 +- .../SaffronCity_PokemonTrainerFanClub/scripts.inc | 114 +++++--------- data/maps/SeafoamIslands_B4F/scripts.inc | 6 +- data/maps/SevenIsland/scripts.inc | 9 +- data/maps/SevenIsland_House_Room1/scripts.inc | 33 ++-- data/maps/SevenIsland_House_Room2/scripts.inc | 3 +- data/maps/SevenIsland_Mart/scripts.inc | 12 +- data/maps/SevenIsland_PokemonCenter_1F/scripts.inc | 9 +- .../scripts.inc | 3 +- data/maps/SevenIsland_SevaultCanyon/scripts.inc | 3 +- .../SevenIsland_SevaultCanyon_Entrance/scripts.inc | 3 +- .../SevenIsland_SevaultCanyon_House/scripts.inc | 21 +-- data/maps/SevenIsland_TrainerTower/scripts.inc | 6 +- .../SevenIsland_TrainerTower_Lobby/scripts.inc | 39 ++--- data/maps/SilphCo_10F/scripts.inc | 15 +- data/maps/SilphCo_11F/scripts.inc | 36 ++--- data/maps/SilphCo_1F/scripts.inc | 6 +- data/maps/SilphCo_2F/scripts.inc | 15 +- data/maps/SilphCo_3F/scripts.inc | 15 +- data/maps/SilphCo_4F/scripts.inc | 18 +-- data/maps/SilphCo_5F/scripts.inc | 30 ++-- data/maps/SilphCo_6F/scripts.inc | 42 ++--- data/maps/SilphCo_7F/scripts.inc | 57 +++---- data/maps/SilphCo_8F/scripts.inc | 18 +-- data/maps/SilphCo_9F/scripts.inc | 21 +-- data/maps/SixIsland/scripts.inc | 9 +- .../SixIsland_DottedHole_SapphireRoom/scripts.inc | 6 +- data/maps/SixIsland_GreenPath/scripts.inc | 6 +- data/maps/SixIsland_House/scripts.inc | 3 +- data/maps/SixIsland_Mart/scripts.inc | 6 +- data/maps/SixIsland_OutcastIsland/scripts.inc | 3 +- data/maps/SixIsland_PatternBush/scripts.inc | 36 ++--- data/maps/SixIsland_PokemonCenter_1F/scripts.inc | 9 +- data/maps/SixIsland_RuinValley/scripts.inc | 18 +-- data/maps/SixIsland_WaterPath/scripts.inc | 6 +- data/maps/SixIsland_WaterPath_House1/scripts.inc | 30 ++-- data/maps/SixIsland_WaterPath_House2/scripts.inc | 3 +- data/maps/ThreeIsland/scripts.inc | 87 ++++------- data/maps/ThreeIsland_BerryForest/scripts.inc | 21 +-- data/maps/ThreeIsland_BondBridge/scripts.inc | 6 +- data/maps/ThreeIsland_DunsparceTunnel/scripts.inc | 12 +- data/maps/ThreeIsland_House1/scripts.inc | 6 +- data/maps/ThreeIsland_House2/scripts.inc | 6 +- data/maps/ThreeIsland_House3/scripts.inc | 3 +- data/maps/ThreeIsland_House4/scripts.inc | 6 +- data/maps/ThreeIsland_House5/scripts.inc | 6 +- data/maps/ThreeIsland_Mart/scripts.inc | 12 +- data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc | 9 +- data/maps/ThreeIsland_Port/scripts.inc | 15 +- data/maps/TwoIsland/scripts.inc | 39 ++--- data/maps/TwoIsland_House/scripts.inc | 27 ++-- data/maps/TwoIsland_JoyfulGameCorner/scripts.inc | 48 ++---- data/maps/TwoIsland_PokemonCenter_1F/scripts.inc | 6 +- data/maps/UndergroundPath_EastEntrance/scripts.inc | 3 +- .../maps/UndergroundPath_NorthEntrance/scripts.inc | 15 +- .../maps/UndergroundPath_SouthEntrance/scripts.inc | 3 +- data/maps/UndergroundPath_WestEntrance/scripts.inc | 3 +- data/maps/VermilionCity/scripts.inc | 69 +++----- data/maps/VermilionCity_Gym/scripts.inc | 48 ++---- data/maps/VermilionCity_House1/scripts.inc | 18 +-- data/maps/VermilionCity_House3/scripts.inc | 12 +- data/maps/VermilionCity_Mart/scripts.inc | 9 +- .../VermilionCity_PokemonCenter_1F/scripts.inc | 9 +- data/maps/VermilionCity_PokemonFanClub/scripts.inc | 63 +++----- data/maps/VictoryRoad_1F/scripts.inc | 6 +- data/maps/VictoryRoad_2F/scripts.inc | 15 +- data/maps/VictoryRoad_3F/scripts.inc | 18 +-- data/maps/ViridianCity/scripts.inc | 75 +++------ data/maps/ViridianCity_Gym/scripts.inc | 48 ++---- data/maps/ViridianCity_House1/scripts.inc | 12 +- data/maps/ViridianCity_House2/scripts.inc | 48 ++---- data/maps/ViridianCity_Mart/scripts.inc | 18 +-- .../maps/ViridianCity_PokemonCenter_1F/scripts.inc | 9 +- data/maps/ViridianForest/scripts.inc | 39 ++--- 284 files changed, 1858 insertions(+), 3716 deletions(-) (limited to 'data/maps') diff --git a/data/maps/CeladonCity/scripts.inc b/data/maps/CeladonCity/scripts.inc index 08c160cd9..9f7dc58c2 100644 --- a/data/maps/CeladonCity/scripts.inc +++ b/data/maps/CeladonCity/scripts.inc @@ -7,25 +7,21 @@ CeladonCity_MapScript1_166C95:: @ 8166C95 end CeladonCity_EventScript_166C99:: @ 8166C99 - loadword 0, gUnknown_817FEC3 - callstd 2 + msgbox gUnknown_817FEC3, 2 end CeladonCity_EventScript_166CA2:: @ 8166CA2 lock - loadword 0, gUnknown_817FF1C - callstd 4 + msgbox gUnknown_817FF1C release end CeladonCity_EventScript_166CAD:: @ 8166CAD - loadword 0, gUnknown_817FF4A - callstd 2 + msgbox gUnknown_817FF4A, 2 end CeladonCity_EventScript_166CB6:: @ 8166CB6 - loadword 0, gUnknown_817FFC5 - callstd 2 + msgbox gUnknown_817FFC5, 2 end CeladonCity_EventScript_166CBF:: @ 8166CBF @@ -35,8 +31,7 @@ CeladonCity_EventScript_166CBF:: @ 8166CBF CeladonCity_EventScript_166CC5:: @ 8166CC5 lock faceplayer - loadword 0, gUnknown_818001B - callstd 4 + msgbox gUnknown_818001B closemessage applymovement 2, Movement_1A75E5 waitmovement 0 @@ -48,8 +43,7 @@ CeladonCity_EventScript_166CDC:: @ 8166CDC faceplayer waitse playmoncry SPECIES_POLIWRATH, 0 - loadword 0, gUnknown_8180075 - callstd 4 + msgbox gUnknown_8180075 closemessage waitmoncry applymovement 3, Movement_1A75E5 @@ -58,33 +52,27 @@ CeladonCity_EventScript_166CDC:: @ 8166CDC end CeladonCity_EventScript_166CFA:: @ 8166CFA - loadword 0, gUnknown_81800C2 - callstd 2 + msgbox gUnknown_81800C2, 2 end CeladonCity_EventScript_166D03:: @ 8166D03 - loadword 0, gUnknown_818008C - callstd 2 + msgbox gUnknown_818008C, 2 end CeladonCity_EventScript_166D0C:: @ 8166D0C - loadword 0, gUnknown_8180300 - callstd 2 + msgbox gUnknown_8180300, 2 end CeladonCity_EventScript_166D15:: @ 8166D15 - loadword 0, gUnknown_81804E1 - callstd 2 + msgbox gUnknown_81804E1, 2 end CeladonCity_EventScript_166D1E:: @ 8166D1E - loadword 0, gUnknown_81800E1 - callstd 3 + msgbox gUnknown_81800E1, 3 end CeladonCity_EventScript_166D27:: @ 8166D27 - loadword 0, gUnknown_818017A - callstd 3 + msgbox gUnknown_818017A, 3 end CeladonCity_EventScript_166D30:: @ 8166D30 @@ -92,32 +80,26 @@ CeladonCity_EventScript_166D30:: @ 8166D30 setvar VAR_0x8004, 5 setvar VAR_0x8005, 0 special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_81801A2 - callstd 4 + msgbox gUnknown_81801A2 releaseall end CeladonCity_EventScript_166D48:: @ 8166D48 - loadword 0, gUnknown_81801E5 - callstd 3 + msgbox gUnknown_81801E5, 3 end CeladonCity_EventScript_166D51:: @ 8166D51 - loadword 0, gUnknown_81801F5 - callstd 3 + msgbox gUnknown_81801F5, 3 end CeladonCity_EventScript_166D5A:: @ 8166D5A - loadword 0, gUnknown_8180224 - callstd 3 + msgbox gUnknown_8180224, 3 end CeladonCity_EventScript_166D63:: @ 8166D63 - loadword 0, gUnknown_81802A4 - callstd 3 + msgbox gUnknown_81802A4, 3 end CeladonCity_EventScript_166D6C:: @ 8166D6C - loadword 0, gUnknown_81802CF - callstd 3 + msgbox gUnknown_81802CF, 3 end diff --git a/data/maps/CeladonCity_Condominiums_1F/scripts.inc b/data/maps/CeladonCity_Condominiums_1F/scripts.inc index 0e1708b0d..b38a82d01 100644 --- a/data/maps/CeladonCity_Condominiums_1F/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_1F/scripts.inc @@ -10,22 +10,19 @@ CeladonCity_Condominiums_1F_EventScript_16C321:: @ 816C321 goto_if 1, EventScript_16C374 checkflag FLAG_0x2A6 goto_if 1, EventScript_16C36A - loadword 0, gUnknown_81960C9 - callstd 4 + msgbox gUnknown_81960C9 setflag FLAG_0x2A6 setorcopyvar VAR_0x8000, 369 setorcopyvar VAR_0x8001, 1 callstd 0 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_1A6BF9 - loadword 0, gUnknown_8196109 - callstd 4 + msgbox gUnknown_8196109 release end EventScript_16C36A:: @ 816C36A - loadword 0, gUnknown_8196148 - callstd 4 + msgbox gUnknown_8196148 release end @@ -34,8 +31,7 @@ EventScript_16C374:: @ 816C374 setvar VAR_0x8005, 4 special SetFlavorTextFlagFromSpecialVars setflag FLAG_0x2F8 - loadword 0, gUnknown_8196188 - callstd 4 + msgbox gUnknown_8196188 release end @@ -44,8 +40,7 @@ CeladonCity_Condominiums_1F_EventScript_16C38E:: @ 816C38E faceplayer waitse playmoncry SPECIES_MEOWTH, 0 - loadword 0, gUnknown_81960BB - callstd 4 + msgbox gUnknown_81960BB waitmoncry release end @@ -55,8 +50,7 @@ CeladonCity_Condominiums_1F_EventScript_16C3A1:: @ 816C3A1 faceplayer waitse playmoncry SPECIES_CLEFAIRY, 0 - loadword 0, gUnknown_819625B - callstd 4 + msgbox gUnknown_819625B waitmoncry release end @@ -66,13 +60,11 @@ CeladonCity_Condominiums_1F_EventScript_16C3B4:: @ 816C3B4 faceplayer waitse playmoncry SPECIES_NIDORAN_F, 0 - loadword 0, gUnknown_8196272 - callstd 4 + msgbox gUnknown_8196272 waitmoncry release end CeladonCity_Condominiums_1F_EventScript_16C3C7:: @ 816C3C7 - loadword 0, gUnknown_8196287 - callstd 3 + msgbox gUnknown_8196287, 3 end diff --git a/data/maps/CeladonCity_Condominiums_2F/scripts.inc b/data/maps/CeladonCity_Condominiums_2F/scripts.inc index bcd991d64..cab71a823 100644 --- a/data/maps/CeladonCity_Condominiums_2F/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_2F/scripts.inc @@ -2,6 +2,5 @@ CeladonCity_Condominiums_2F_MapScripts:: @ 816C3D0 .byte 0 CeladonCity_Condominiums_2F_EventScript_16C3D1:: @ 816C3D1 - loadword 0, gUnknown_81962A7 - callstd 3 + msgbox gUnknown_81962A7, 3 end diff --git a/data/maps/CeladonCity_Condominiums_3F/scripts.inc b/data/maps/CeladonCity_Condominiums_3F/scripts.inc index c34a44589..46c5548dc 100644 --- a/data/maps/CeladonCity_Condominiums_3F/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_3F/scripts.inc @@ -2,18 +2,15 @@ CeladonCity_Condominiums_3F_MapScripts:: @ 816C3DA .byte 0 CeladonCity_Condominiums_3F_EventScript_16C3DB:: @ 816C3DB - loadword 0, gUnknown_81962BF - callstd 2 + msgbox gUnknown_81962BF, 2 end CeladonCity_Condominiums_3F_EventScript_16C3E4:: @ 816C3E4 - loadword 0, gUnknown_81962D7 - callstd 2 + msgbox gUnknown_81962D7, 2 end CeladonCity_Condominiums_3F_EventScript_16C3ED:: @ 816C3ED - loadword 0, gUnknown_81962FB - callstd 2 + msgbox gUnknown_81962FB, 2 end CeladonCity_Condominiums_3F_EventScript_16C3F6:: @ 816C3F6 @@ -22,8 +19,7 @@ CeladonCity_Condominiums_3F_EventScript_16C3F6:: @ 816C3F6 specialvar VAR_RESULT, sub_8088F58 compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_16C412 - loadword 0, gUnknown_8196356 - callstd 4 + msgbox gUnknown_8196356 release end @@ -44,21 +40,17 @@ EventScript_16C418:: @ 816C418 end CeladonCity_Condominiums_3F_EventScript_16C435:: @ 816C435 - loadword 0, gUnknown_81964A8 - callstd 3 + msgbox gUnknown_81964A8, 3 end CeladonCity_Condominiums_3F_EventScript_16C43E:: @ 816C43E - loadword 0, gUnknown_819640C - callstd 3 + msgbox gUnknown_819640C, 3 end CeladonCity_Condominiums_3F_EventScript_16C447:: @ 816C447 - loadword 0, gUnknown_819644B - callstd 3 + msgbox gUnknown_819644B, 3 end CeladonCity_Condominiums_3F_EventScript_16C450:: @ 816C450 - loadword 0, gUnknown_8196478 - callstd 3 + msgbox gUnknown_8196478, 3 end diff --git a/data/maps/CeladonCity_Condominiums_Roof/scripts.inc b/data/maps/CeladonCity_Condominiums_Roof/scripts.inc index 4a6b0552c..a074d5778 100644 --- a/data/maps/CeladonCity_Condominiums_Roof/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_Roof/scripts.inc @@ -2,6 +2,5 @@ CeladonCity_Condominiums_Roof_MapScripts:: @ 816C459 .byte 0 CeladonCity_Condominiums_Roof_EventScript_16C45A:: @ 816C45A - loadword 0, gUnknown_81964C4 - callstd 3 + msgbox gUnknown_81964C4, 3 end diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc b/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc index f456adcc3..1a7c21dde 100644 --- a/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc @@ -2,8 +2,7 @@ CeladonCity_Condominiums_RoofRoom_MapScripts:: @ 816C463 .byte 0 CeladonCity_Condominiums_RoofRoom_EventScript_16C464:: @ 816C464 - loadword 0, gUnknown_81964D7 - callstd 2 + msgbox gUnknown_81964D7, 2 end CeladonCity_Condominiums_RoofRoom_EventScript_16C46D:: @ 816C46D @@ -27,8 +26,7 @@ EventScript_16C4A6:: @ 816C4A6 waitmessage waitfanfare getspeciesname 0, SPECIES_EEVEE - loadword 0, gUnknown_81A56A7 - callstd 5 + msgbox gUnknown_81A56A7, 5 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16C514 call EventScript_1A8C27 @@ -43,8 +41,7 @@ EventScript_16C4DA:: @ 816C4DA waitmessage waitfanfare getspeciesname 0, SPECIES_EEVEE - loadword 0, gUnknown_81A56A7 - callstd 5 + msgbox gUnknown_81A56A7, 5 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16C509 call EventScript_1A8C33 @@ -62,14 +59,12 @@ EventScript_16C514:: @ 816C514 end CeladonCity_Condominiums_RoofRoom_EventScript_16C519:: @ 816C519 - loadword 0, gUnknown_81967E3 - callstd 3 + msgbox gUnknown_81967E3, 3 end CeladonCity_Condominiums_RoofRoom_EventScript_16C522:: @ 816C522 lockall - loadword 0, gUnknown_81965C2 - callstd 4 + msgbox gUnknown_81965C2 message Text_1965F4 waitmessage setvar VAR_0x8004, 4 @@ -105,20 +100,17 @@ EventScript_16C578:: @ 816C578 end EventScript_16C5C0:: @ 816C5C0 - loadword 0, gUnknown_8196617 - callstd 4 + msgbox gUnknown_8196617 goto EventScript_16C578 end EventScript_16C5CE:: @ 816C5CE - loadword 0, gUnknown_8196695 - callstd 4 + msgbox gUnknown_8196695 goto EventScript_16C578 end EventScript_16C5DC:: @ 816C5DC - loadword 0, gUnknown_819673C - callstd 4 + msgbox gUnknown_819673C goto EventScript_16C578 end diff --git a/data/maps/CeladonCity_DepartmentStore_1F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_1F/scripts.inc index 0ad7d6c7c..593bf0016 100644 --- a/data/maps/CeladonCity_DepartmentStore_1F/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_1F/scripts.inc @@ -2,16 +2,13 @@ CeladonCity_DepartmentStore_1F_MapScripts:: @ 816BAD8 .byte 0 CeladonCity_DepartmentStore_1F_EventScript_16BAD9:: @ 816BAD9 - loadword 0, gUnknown_81954DD - callstd 2 + msgbox gUnknown_81954DD, 2 end CeladonCity_DepartmentStore_1F_EventScript_16BAE2:: @ 816BAE2 - loadword 0, gUnknown_8195537 - callstd 3 + msgbox gUnknown_8195537, 3 end CeladonCity_DepartmentStore_1F_EventScript_16BAEB:: @ 816BAEB - loadword 0, gUnknown_81955B3 - callstd 3 + msgbox gUnknown_81955B3, 3 end diff --git a/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc index bb6bdaa6a..2f8f41777 100644 --- a/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc @@ -2,18 +2,15 @@ CeladonCity_DepartmentStore_2F_MapScripts:: @ 816BAF4 .byte 0 CeladonCity_DepartmentStore_2F_EventScript_16BAF5:: @ 816BAF5 - loadword 0, gUnknown_81955C7 - callstd 2 + msgbox gUnknown_81955C7, 2 end CeladonCity_DepartmentStore_2F_EventScript_16BAFE:: @ 816BAFE - loadword 0, gUnknown_819560F - callstd 2 + msgbox gUnknown_819560F, 2 end CeladonCity_DepartmentStore_2F_EventScript_16BB07:: @ 816BB07 - loadword 0, gUnknown_8195638 - callstd 3 + msgbox gUnknown_8195638, 3 end CeladonCity_DepartmentStore_2F_EventScript_16BB10:: @ 816BB10 @@ -25,8 +22,7 @@ CeladonCity_DepartmentStore_2F_EventScript_16BB10:: @ 816BB10 message Text_1A6211 waitmessage pokemart Items_16BB38 - loadword 0, gUnknown_81A5190 - callstd 4 + msgbox gUnknown_81A5190 release end @@ -54,8 +50,7 @@ CeladonCity_DepartmentStore_2F_EventScript_16BB4E:: @ 816BB4E message Text_1A6211 waitmessage pokemart Items_16BB74 - loadword 0, gUnknown_81A5190 - callstd 4 + msgbox gUnknown_81A5190 release end diff --git a/data/maps/CeladonCity_DepartmentStore_3F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_3F/scripts.inc index e8be3e079..0ce4515d2 100644 --- a/data/maps/CeladonCity_DepartmentStore_3F/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_3F/scripts.inc @@ -6,56 +6,45 @@ CeladonCity_DepartmentStore_3F_EventScript_16BB85:: @ 816BB85 end CeladonCity_DepartmentStore_3F_EventScript_16BB8B:: @ 816BB8B - loadword 0, gUnknown_81956E9 - callstd 2 + msgbox gUnknown_81956E9, 2 end CeladonCity_DepartmentStore_3F_EventScript_16BB94:: @ 816BB94 - loadword 0, gUnknown_8195769 - callstd 2 + msgbox gUnknown_8195769, 2 end CeladonCity_DepartmentStore_3F_EventScript_16BB9D:: @ 816BB9D - loadword 0, gUnknown_81957B0 - callstd 2 + msgbox gUnknown_81957B0, 2 end CeladonCity_DepartmentStore_3F_EventScript_16BBA6:: @ 816BBA6 - loadword 0, gUnknown_8195823 - callstd 2 + msgbox gUnknown_8195823, 2 end CeladonCity_DepartmentStore_3F_EventScript_16BBAF:: @ 816BBAF - loadword 0, gUnknown_8195863 - callstd 3 + msgbox gUnknown_8195863, 3 end CeladonCity_DepartmentStore_3F_EventScript_16BBB8:: @ 816BBB8 - loadword 0, gUnknown_8195875 - callstd 3 + msgbox gUnknown_8195875, 3 end CeladonCity_DepartmentStore_3F_EventScript_16BBC1:: @ 816BBC1 - loadword 0, gUnknown_8195897 - callstd 3 + msgbox gUnknown_8195897, 3 end CeladonCity_DepartmentStore_3F_EventScript_16BBCA:: @ 816BBCA - loadword 0, gUnknown_81958B8 - callstd 3 + msgbox gUnknown_81958B8, 3 end CeladonCity_DepartmentStore_3F_EventScript_16BBD3:: @ 816BBD3 - loadword 0, gUnknown_81958D8 - callstd 3 + msgbox gUnknown_81958D8, 3 end CeladonCity_DepartmentStore_3F_EventScript_16BBDC:: @ 816BBDC - loadword 0, gUnknown_81958F6 - callstd 3 + msgbox gUnknown_81958F6, 3 end CeladonCity_DepartmentStore_3F_EventScript_16BBE5:: @ 816BBE5 - loadword 0, gUnknown_8195907 - callstd 3 + msgbox gUnknown_8195907, 3 end diff --git a/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc index 5822aa1ea..f90728d50 100644 --- a/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc @@ -2,18 +2,15 @@ CeladonCity_DepartmentStore_4F_MapScripts:: @ 816BBEE .byte 0 CeladonCity_DepartmentStore_4F_EventScript_16BBEF:: @ 816BBEF - loadword 0, gUnknown_8195A68 - callstd 2 + msgbox gUnknown_8195A68, 2 end CeladonCity_DepartmentStore_4F_EventScript_16BBF8:: @ 816BBF8 - loadword 0, gUnknown_8195AC9 - callstd 2 + msgbox gUnknown_8195AC9, 2 end CeladonCity_DepartmentStore_4F_EventScript_16BC01:: @ 816BC01 - loadword 0, gUnknown_8195B5B - callstd 3 + msgbox gUnknown_8195B5B, 3 end CeladonCity_DepartmentStore_4F_EventScript_16BC0A:: @ 816BC0A @@ -25,8 +22,7 @@ CeladonCity_DepartmentStore_4F_EventScript_16BC0A:: @ 816BC0A message Text_1A6211 waitmessage pokemart Items_16BC30 - loadword 0, gUnknown_81A5190 - callstd 4 + msgbox gUnknown_81A5190 release end diff --git a/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc index a8c808e1f..59b5a7d9b 100644 --- a/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc @@ -2,18 +2,15 @@ CeladonCity_DepartmentStore_5F_MapScripts:: @ 816BC40 .byte 0 CeladonCity_DepartmentStore_5F_EventScript_16BC41:: @ 816BC41 - loadword 0, gUnknown_8195BBA - callstd 2 + msgbox gUnknown_8195BBA, 2 end CeladonCity_DepartmentStore_5F_EventScript_16BC4A:: @ 816BC4A - loadword 0, gUnknown_8195CA0 - callstd 2 + msgbox gUnknown_8195CA0, 2 end CeladonCity_DepartmentStore_5F_EventScript_16BC53:: @ 816BC53 - loadword 0, gUnknown_8195D14 - callstd 3 + msgbox gUnknown_8195D14, 3 end CeladonCity_DepartmentStore_5F_EventScript_16BC5C:: @ 816BC5C @@ -25,8 +22,7 @@ CeladonCity_DepartmentStore_5F_EventScript_16BC5C:: @ 816BC5C message Text_1A6211 waitmessage pokemart Items_16BC84 - loadword 0, gUnknown_81A5190 - callstd 4 + msgbox gUnknown_81A5190 release end @@ -52,8 +48,7 @@ CeladonCity_DepartmentStore_5F_EventScript_16BC96:: @ 816BC96 message Text_1A6211 waitmessage pokemart Items_16BCBC - loadword 0, gUnknown_81A5190 - callstd 4 + msgbox gUnknown_81A5190 release end diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc index 0798f3d0c..ea08bae0b 100644 --- a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc @@ -40,8 +40,7 @@ EventScript_16BD38:: @ 816BD38 return EventScript_16BD3E:: @ 816BD3E - loadword 0, gUnknown_8195D22 - callstd 5 + msgbox gUnknown_8195D22, 5 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16C00C textcolor 3 @@ -157,8 +156,7 @@ EventScript_16BF19:: @ 816BF19 setvar VAR_0x8009, 304 checkflag FLAG_0x296 goto_if 1, EventScript_16C018 - loadword 0, gUnknown_8195D75 - callstd 4 + msgbox gUnknown_8195D75 goto EventScript_16BF7C end @@ -167,8 +165,7 @@ EventScript_16BF3A:: @ 816BF3A setvar VAR_0x8009, 308 checkflag FLAG_0x295 goto_if 1, EventScript_16C018 - loadword 0, gUnknown_8195E33 - callstd 4 + msgbox gUnknown_8195E33 goto EventScript_16BF7C end @@ -177,8 +174,7 @@ EventScript_16BF5B:: @ 816BF5B setvar VAR_0x8009, 321 checkflag FLAG_0x294 goto_if 1, EventScript_16C018 - loadword 0, gUnknown_8195EBF - callstd 4 + msgbox gUnknown_8195EBF goto EventScript_16BF7C end @@ -210,25 +206,21 @@ EventScript_16BF7C:: @ 816BF7C EventScript_16BFDE:: @ 816BFDE setflag FLAG_0x296 - loadword 0, gUnknown_8195DD4 - callstd 4 + msgbox gUnknown_8195DD4 return EventScript_16BFEA:: @ 816BFEA setflag FLAG_0x295 - loadword 0, gUnknown_8195E68 - callstd 4 + msgbox gUnknown_8195E68 return EventScript_16BFF6:: @ 816BFF6 setflag FLAG_0x294 - loadword 0, gUnknown_8195EF4 - callstd 4 + msgbox gUnknown_8195EF4 return EventScript_16C002:: @ 816C002 - loadword 0, gUnknown_8195F4F - callstd 4 + msgbox gUnknown_8195F4F release end @@ -237,25 +229,21 @@ EventScript_16C00C:: @ 816C00C end EventScript_16C00E:: @ 816C00E - loadword 0, gUnknown_8195FEF - callstd 4 + msgbox gUnknown_8195FEF release end EventScript_16C018:: @ 816C018 - loadword 0, gUnknown_8195F6E - callstd 4 + msgbox gUnknown_8195F6E release end CeladonCity_DepartmentStore_Roof_EventScript_16C022:: @ 816C022 - loadword 0, gUnknown_8195F98 - callstd 2 + msgbox gUnknown_8195F98, 2 end CeladonCity_DepartmentStore_Roof_EventScript_16C02B:: @ 816C02B - loadword 0, gUnknown_8196017 - callstd 3 + msgbox gUnknown_8196017, 3 end CeladonCity_DepartmentStore_Roof_EventScript_16C034:: @ 816C034 @@ -276,8 +264,7 @@ EventScript_16C045:: @ 816C045 goto_if 1, EventScript_16C094 compare_var_to_value VAR_0x8000, 2 goto_if 1, EventScript_16C0A5 - loadword 0, gUnknown_81960AE - callstd 4 + msgbox gUnknown_81960AE goto EventScript_16C14D end @@ -326,8 +313,7 @@ EventScript_16C0CB:: @ 816C0CB updatemoneybox 0, 0, 0 getitemname 0, 16384 playse SE_C_PASI - loadword 0, gUnknown_8196076 - callstd 4 + msgbox gUnknown_8196076 additem 16384, 1 goto EventScript_16C125 end @@ -339,14 +325,12 @@ EventScript_16C125:: @ 816C125 end EventScript_16C131:: @ 816C131 - loadword 0, gUnknown_819605E - callstd 4 + msgbox gUnknown_819605E goto EventScript_16C14D end EventScript_16C13F:: @ 816C13F - loadword 0, gUnknown_819608E - callstd 4 + msgbox gUnknown_819608E goto EventScript_16C14D end diff --git a/data/maps/CeladonCity_GameCorner/scripts.inc b/data/maps/CeladonCity_GameCorner/scripts.inc index aa6a469fe..1e4761881 100644 --- a/data/maps/CeladonCity_GameCorner/scripts.inc +++ b/data/maps/CeladonCity_GameCorner/scripts.inc @@ -16,8 +16,7 @@ EventScript_16C656:: @ 816C656 return CeladonCity_GameCorner_EventScript_16C684:: @ 816C684 - loadword 0, gUnknown_8196940 - callstd 2 + msgbox gUnknown_8196940, 2 end CeladonCity_GameCorner_EventScript_16C68D:: @ 816C68D @@ -80,8 +79,7 @@ EventScript_16C762:: @ 816C762 updatemoneybox 0, 0, 0 updatecoinsbox 0, 5 playse 248 - loadword 0, gUnknown_8196A62 - callstd 4 + msgbox gUnknown_8196A62 goto EventScript_16C77A end @@ -94,34 +92,29 @@ EventScript_16C77A:: @ 816C77A end EventScript_16C782:: @ 816C782 - loadword 0, gUnknown_81969DC - callstd 4 + msgbox gUnknown_81969DC goto EventScript_16C77A end EventScript_16C790:: @ 816C790 - loadword 0, gUnknown_81969FB - callstd 4 + msgbox gUnknown_81969FB goto EventScript_16C77A end EventScript_16C79E:: @ 816C79E - loadword 0, gUnknown_8196A26 - callstd 4 + msgbox gUnknown_8196A26 goto EventScript_16C77A end EventScript_16C7AC:: @ 816C7AC - loadword 0, gUnknown_8196A46 - callstd 4 + msgbox gUnknown_8196A46 goto EventScript_16C77A end CeladonCity_GameCorner_EventScript_16C7BA:: @ 816C7BA lock faceplayer - loadword 0, gUnknown_8196A82 - callstd 4 + msgbox gUnknown_8196A82 goto EventScript_16C7CA end @@ -135,8 +128,7 @@ EventScript_16C7CA:: @ 816C7CA CeladonCity_GameCorner_EventScript_16C7D7:: @ 816C7D7 lock faceplayer - loadword 0, gUnknown_8196AC7 - callstd 4 + msgbox gUnknown_8196AC7 goto EventScript_16C7CA end @@ -145,8 +137,7 @@ CeladonCity_GameCorner_EventScript_16C7E7:: @ 816C7E7 faceplayer checkflag FLAG_0x26E goto_if 1, EventScript_16C849 - loadword 0, gUnknown_8196AF3 - callstd 4 + msgbox gUnknown_8196AF3 checkflag FLAG_0x243 goto_if 0, EventScript_16C839 checkcoins VAR_0x4001 @@ -154,8 +145,7 @@ CeladonCity_GameCorner_EventScript_16C7E7:: @ 816C7E7 goto_if 4, EventScript_16C82B givecoins 10 textcolor 3 - loadword 0, gUnknown_8196B0D - callstd 4 + msgbox gUnknown_8196B0D playse 248 waitse setflag FLAG_0x26E @@ -163,21 +153,18 @@ CeladonCity_GameCorner_EventScript_16C7E7:: @ 816C7E7 end EventScript_16C82B:: @ 816C82B - loadword 0, gUnknown_8196B30 - callstd 4 + msgbox gUnknown_8196B30 goto EventScript_16C7CA end EventScript_16C839:: @ 816C839 textcolor 3 - loadword 0, gUnknown_8196F26 - callstd 4 + msgbox gUnknown_8196F26 goto EventScript_16C7CA end EventScript_16C849:: @ 816C849 - loadword 0, gUnknown_8196B49 - callstd 4 + msgbox gUnknown_8196B49 goto EventScript_16C7CA end @@ -186,30 +173,26 @@ CeladonCity_GameCorner_EventScript_16C857:: @ 816C857 faceplayer checkflag FLAG_0x4B3 goto_if 1, EventScript_16C870 - loadword 0, gUnknown_8196BAD - callstd 4 + msgbox gUnknown_8196BAD goto EventScript_16C7CA end EventScript_16C870:: @ 816C870 - loadword 0, gUnknown_8196CA1 - callstd 4 + msgbox gUnknown_8196CA1 goto EventScript_16C7CA end CeladonCity_GameCorner_EventScript_16C87E:: @ 816C87E lock faceplayer - loadword 0, gUnknown_8196B7B - callstd 4 + msgbox gUnknown_8196B7B goto EventScript_16C7CA end CeladonCity_GameCorner_EventScript_16C88E:: @ 816C88E lock faceplayer - loadword 0, gUnknown_8196CFE - callstd 4 + msgbox gUnknown_8196CFE goto EventScript_16C7CA end @@ -218,8 +201,7 @@ CeladonCity_GameCorner_EventScript_16C89E:: @ 816C89E faceplayer checkflag FLAG_0x26F goto_if 1, EventScript_16C8F0 - loadword 0, gUnknown_8196D2B - callstd 4 + msgbox gUnknown_8196D2B checkflag FLAG_0x243 goto_if 0, EventScript_16C839 checkcoins VAR_0x4001 @@ -227,8 +209,7 @@ CeladonCity_GameCorner_EventScript_16C89E:: @ 816C89E goto_if 4, EventScript_16C8E2 givecoins 20 textcolor 3 - loadword 0, gUnknown_8196D47 - callstd 4 + msgbox gUnknown_8196D47 playse 248 waitse setflag FLAG_0x26F @@ -236,14 +217,12 @@ CeladonCity_GameCorner_EventScript_16C89E:: @ 816C89E end EventScript_16C8E2:: @ 816C8E2 - loadword 0, gUnknown_8196D6F - callstd 4 + msgbox gUnknown_8196D6F goto EventScript_16C7CA end EventScript_16C8F0:: @ 816C8F0 - loadword 0, gUnknown_8196D87 - callstd 4 + msgbox gUnknown_8196D87 goto EventScript_16C7CA end @@ -252,8 +231,7 @@ CeladonCity_GameCorner_EventScript_16C8FE:: @ 816C8FE faceplayer checkflag FLAG_0x270 goto_if 1, EventScript_16C950 - loadword 0, gUnknown_8196DB7 - callstd 4 + msgbox gUnknown_8196DB7 checkflag FLAG_0x243 goto_if 0, EventScript_16C839 checkcoins VAR_0x4001 @@ -261,8 +239,7 @@ CeladonCity_GameCorner_EventScript_16C8FE:: @ 816C8FE goto_if 4, EventScript_16C942 givecoins 20 textcolor 3 - loadword 0, gUnknown_8196DF8 - callstd 4 + msgbox gUnknown_8196DF8 playse 248 waitse setflag FLAG_0x270 @@ -270,14 +247,12 @@ CeladonCity_GameCorner_EventScript_16C8FE:: @ 816C8FE end EventScript_16C942:: @ 816C942 - loadword 0, gUnknown_8196E1B - callstd 4 + msgbox gUnknown_8196E1B goto EventScript_16C7CA end EventScript_16C950:: @ 816C950 - loadword 0, gUnknown_8196E40 - callstd 4 + msgbox gUnknown_8196E40 goto EventScript_16C7CA end @@ -294,8 +269,7 @@ EventScript_16C96A:: @ 816C96A EventScript_16C96C:: @ 816C96C checkflag FLAG_0x243 goto_if 0, EventScript_16CAA0 - loadword 0, gUnknown_8196F46 - callstd 5 + msgbox gUnknown_8196F46, 5 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16C96A setfieldeffectarg 0, 255 @@ -435,15 +409,13 @@ CeladonCity_GameCorner_EventScript_16CA94:: @ 816CA94 end EventScript_16CAA0:: @ 816CAA0 - loadword 0, gUnknown_8196F0D - callstd 4 + msgbox gUnknown_8196F0D releaseall end CeladonCity_GameCorner_EventScript_16CAAA:: @ 816CAAA lockall - loadword 0, gUnknown_8196EDC - callstd 4 + msgbox gUnknown_8196EDC checkflag FLAG_0x26D call_if 0, EventScript_16CABE releaseall @@ -462,13 +434,11 @@ EventScript_16CABE:: @ 816CABE CeladonCity_GameCorner_EventScript_16CAF5:: @ 816CAF5 trainerbattle 2, 357, 0, Text_196E69, Text_196E95, EventScript_16CB10 - loadword 0, gUnknown_8196E9B - callstd 6 + msgbox gUnknown_8196E9B, 6 end EventScript_16CB10:: @ 816CB10 - loadword 0, gUnknown_8196E9B - callstd 4 + msgbox gUnknown_8196E9B closemessage compare_var_to_value VAR_FACING, 3 call_if 1, EventScript_16CB34 @@ -509,16 +479,13 @@ Movement_16CB53:: @ 816CB53 step_end CeladonCity_GameCorner_EventScript_16CB5A:: @ 816CB5A - loadword 0, gUnknown_8196F64 - callstd 3 + msgbox gUnknown_8196F64, 3 end CeladonCity_GameCorner_EventScript_16CB63:: @ 816CB63 - loadword 0, gUnknown_8196F81 - callstd 3 + msgbox gUnknown_8196F81, 3 end CeladonCity_GameCorner_EventScript_16CB6C:: @ 816CB6C - loadword 0, gUnknown_8196FA0 - callstd 3 + msgbox gUnknown_8196FA0, 3 end diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc index 60570bbbf..99fe24be1 100644 --- a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc +++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc @@ -2,13 +2,11 @@ CeladonCity_GameCorner_PrizeRoom_MapScripts:: @ 816CB75 .byte 0 CeladonCity_GameCorner_PrizeRoom_EventScript_16CB76:: @ 816CB76 - loadword 0, gUnknown_8196FC1 - callstd 2 + msgbox gUnknown_8196FC1, 2 end CeladonCity_GameCorner_PrizeRoom_EventScript_16CB7F:: @ 816CB7F - loadword 0, gUnknown_8196FFF - callstd 2 + msgbox gUnknown_8196FFF, 2 end CeladonCity_GameCorner_PrizeRoom_EventScript_16CB88:: @ 816CB88 @@ -20,8 +18,7 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_16CB88:: @ 816CB88 compare_var_to_value VAR_RESULT, 2 goto_if 1, EventScript_1A7AE0 showcoinsbox 0, 0 - loadword 0, gUnknown_8197057 - callstd 4 + msgbox gUnknown_8197057 goto EventScript_16CBB2 end @@ -83,8 +80,7 @@ EventScript_16CC55:: @ 816CC55 EventScript_16CC65:: @ 816CC65 getspeciesname 0, VAR_0x4001 - loadword 0, gUnknown_819709D - callstd 5 + msgbox gUnknown_819709D, 5 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16CC10 checkcoins VAR_RESULT @@ -147,8 +143,7 @@ EventScript_16CD52:: @ 816CD52 EventScript_16CD74:: @ 816CD74 textcolor 3 - loadword 0, gUnknown_81A5E31 - callstd 4 + msgbox gUnknown_81A5E31 hidecoinsbox 0, 0 release end @@ -163,14 +158,12 @@ EventScript_16CD83:: @ 816CD83 EventScript_16CD99:: @ 816CD99 textcolor 3 - loadword 0, gUnknown_819703E - callstd 4 + msgbox gUnknown_819703E release end EventScript_16CDA5:: @ 816CDA5 - loadword 0, gUnknown_81970D5 - callstd 4 + msgbox gUnknown_81970D5 goto EventScript_16CC10 end @@ -182,8 +175,7 @@ EventScript_16CDB3:: @ 816CDB3 message Text_1A5DF1 waitmessage waitfanfare - loadword 0, gUnknown_81A56A7 - callstd 5 + msgbox gUnknown_81A56A7, 5 compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_16CD83 goto EventScript_16CC10 @@ -197,8 +189,7 @@ EventScript_16CDE0:: @ 816CDE0 message Text_1A5DF1 waitmessage waitfanfare - loadword 0, gUnknown_81A56A7 - callstd 5 + msgbox gUnknown_81A56A7, 5 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16CE12 call EventScript_1A8C33 @@ -219,8 +210,7 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_16CE1D:: @ 816CE1D compare_var_to_value VAR_RESULT, 2 goto_if 1, EventScript_1A7AE0 showcoinsbox 0, 0 - loadword 0, gUnknown_8197057 - callstd 4 + msgbox gUnknown_8197057 goto EventScript_16CE47 end @@ -281,8 +271,7 @@ EventScript_16CEF5:: @ 816CEF5 end EventScript_16CF09:: @ 816CF09 - loadword 0, gUnknown_81970B2 - callstd 5 + msgbox gUnknown_81970B2, 5 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16CC10 goto EventScript_16CF3F @@ -290,8 +279,7 @@ EventScript_16CF09:: @ 816CF09 EventScript_16CF22:: @ 816CF22 getitemname 0, VAR_0x4001 - loadword 0, gUnknown_819709D - callstd 5 + msgbox gUnknown_819709D, 5 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16CC10 goto EventScript_16CF3F @@ -315,8 +303,7 @@ EventScript_16CF3F:: @ 816CF3F EventScript_16CF79:: @ 816CF79 textcolor 3 - loadword 0, gUnknown_81A5242 - callstd 4 + msgbox gUnknown_81A5242 hidecoinsbox 0, 0 release end @@ -330,8 +317,7 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_16CF88:: @ 816CF88 compare_var_to_value VAR_RESULT, 2 goto_if 1, EventScript_1A7AE0 showcoinsbox 0, 0 - loadword 0, gUnknown_8197057 - callstd 4 + msgbox gUnknown_8197057 goto EventScript_16CFB2 end diff --git a/data/maps/CeladonCity_Gym/scripts.inc b/data/maps/CeladonCity_Gym/scripts.inc index 30e71939c..f700d25c9 100644 --- a/data/maps/CeladonCity_Gym/scripts.inc +++ b/data/maps/CeladonCity_Gym/scripts.inc @@ -11,8 +11,7 @@ CeladonCity_Gym_EventScript_16D061:: @ 816D061 setvar VAR_0x8004, 5 setvar VAR_0x8005, 4 special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_81972B8 - callstd 4 + msgbox gUnknown_81972B8 release end @@ -29,8 +28,7 @@ EventScript_16D0A0:: @ 816D0A0 end EventScript_16D0C6:: @ 816D0C6 - loadword 0, gUnknown_8197327 - callstd 4 + msgbox gUnknown_8197327 checkitemspace ITEM_TM19, 1 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16D107 @@ -41,21 +39,18 @@ EventScript_16D0C6:: @ 816D0C6 setorcopyvar VAR_0x8002, MUS_FANFA1 callstd 9 @ gStdScript_ItemMessageAndFanfare setflag FLAG_0x293 - loadword 0, gUnknown_81973D7 - callstd 4 + msgbox gUnknown_81973D7 release end EventScript_16D107:: @ 816D107 - loadword 0, gUnknown_819745D - callstd 4 + msgbox gUnknown_819745D release end CeladonCity_Gym_EventScript_16D111:: @ 816D111 trainerbattle 0, 132, 0, Text_19747C, Text_1974C4 - loadword 0, gUnknown_81974D6 - callstd 6 + msgbox gUnknown_81974D6, 6 end CeladonCity_Gym_EventScript_16D128:: @ 816D128 @@ -63,20 +58,17 @@ CeladonCity_Gym_EventScript_16D128:: @ 816D128 setvar VAR_0x8004, 5 setvar VAR_0x8005, 2 special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_8197708 - callstd 6 + msgbox gUnknown_8197708, 6 end CeladonCity_Gym_EventScript_16D14C:: @ 816D14C trainerbattle 0, 160, 0, Text_197595, Text_1975BB - loadword 0, gUnknown_81975D1 - callstd 6 + msgbox gUnknown_81975D1, 6 end CeladonCity_Gym_EventScript_16D163:: @ 816D163 trainerbattle 0, 265, 0, Text_1974FA, Text_19751C - loadword 0, gUnknown_8197527 - callstd 6 + msgbox gUnknown_8197527, 6 end CeladonCity_Gym_EventScript_16D17A:: @ 816D17A @@ -84,33 +76,28 @@ CeladonCity_Gym_EventScript_16D17A:: @ 816D17A setvar VAR_0x8004, 5 setvar VAR_0x8005, 3 special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_8197664 - callstd 6 + msgbox gUnknown_8197664, 6 end CeladonCity_Gym_EventScript_16D19E:: @ 816D19E trainerbattle 0, 267, 0, Text_197747, Text_19777A - loadword 0, gUnknown_8197788 - callstd 6 + msgbox gUnknown_8197788, 6 end CeladonCity_Gym_EventScript_16D1B5:: @ 816D1B5 trainerbattle 0, 402, 0, Text_1977E5, Text_197832 - loadword 0, gUnknown_819783E - callstd 6 + msgbox gUnknown_819783E, 6 end CeladonCity_Gym_EventScript_16D1CC:: @ 816D1CC lockall checkflag FLAG_0x823 goto_if 1, EventScript_16D1E0 - loadword 0, gUnknown_8197874 - callstd 4 + msgbox gUnknown_8197874 releaseall end EventScript_16D1E0:: @ 816D1E0 - loadword 0, gUnknown_81978AB - callstd 4 + msgbox gUnknown_81978AB releaseall end diff --git a/data/maps/CeladonCity_Hotel/scripts.inc b/data/maps/CeladonCity_Hotel/scripts.inc index 570509191..39326647a 100644 --- a/data/maps/CeladonCity_Hotel/scripts.inc +++ b/data/maps/CeladonCity_Hotel/scripts.inc @@ -2,21 +2,17 @@ CeladonCity_Hotel_MapScripts:: @ 816D283 .byte 0 CeladonCity_Hotel_EventScript_16D284:: @ 816D284 - loadword 0, gUnknown_8197B77 - callstd 2 + msgbox gUnknown_8197B77, 2 end CeladonCity_Hotel_EventScript_16D28D:: @ 816D28D - loadword 0, gUnknown_8197BBE - callstd 2 + msgbox gUnknown_8197BBE, 2 end CeladonCity_Hotel_EventScript_16D296:: @ 816D296 - loadword 0, gUnknown_8197C0C - callstd 2 + msgbox gUnknown_8197C0C, 2 end CeladonCity_Hotel_EventScript_16D29F:: @ 816D29F - loadword 0, gUnknown_8197C30 - callstd 2 + msgbox gUnknown_8197C30, 2 end diff --git a/data/maps/CeladonCity_House1/scripts.inc b/data/maps/CeladonCity_House1/scripts.inc index a30072527..be1415217 100644 --- a/data/maps/CeladonCity_House1/scripts.inc +++ b/data/maps/CeladonCity_House1/scripts.inc @@ -2,16 +2,13 @@ CeladonCity_House1_MapScripts:: @ 816D267 .byte 0 CeladonCity_House1_EventScript_16D268:: @ 816D268 - loadword 0, gUnknown_8197A9F - callstd 2 + msgbox gUnknown_8197A9F, 2 end CeladonCity_House1_EventScript_16D271:: @ 816D271 - loadword 0, gUnknown_8197AD3 - callstd 2 + msgbox gUnknown_8197AD3, 2 end CeladonCity_House1_EventScript_16D27A:: @ 816D27A - loadword 0, gUnknown_8197B20 - callstd 2 + msgbox gUnknown_8197B20, 2 end diff --git a/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc b/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc index 8fffeef2f..3810803bc 100644 --- a/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc @@ -15,16 +15,13 @@ CeladonCity_PokemonCenter_1F_EventScript_16C5FB:: @ 816C5FB end CeladonCity_PokemonCenter_1F_EventScript_16C604:: @ 816C604 - loadword 0, gUnknown_819685B - callstd 2 + msgbox gUnknown_819685B, 2 end CeladonCity_PokemonCenter_1F_EventScript_16C60D:: @ 816C60D - loadword 0, gUnknown_81968C2 - callstd 2 + msgbox gUnknown_81968C2, 2 end CeladonCity_PokemonCenter_1F_EventScript_16C616:: @ 816C616 - loadword 0, gUnknown_8196913 - callstd 2 + msgbox gUnknown_8196913, 2 end diff --git a/data/maps/CeladonCity_Restaurant/scripts.inc b/data/maps/CeladonCity_Restaurant/scripts.inc index e8ff33eee..bf6bba315 100644 --- a/data/maps/CeladonCity_Restaurant/scripts.inc +++ b/data/maps/CeladonCity_Restaurant/scripts.inc @@ -2,13 +2,11 @@ CeladonCity_Restaurant_MapScripts:: @ 816D1EA .byte 0 CeladonCity_Restaurant_EventScript_16D1EB:: @ 816D1EB - loadword 0, gUnknown_81978E6 - callstd 2 + msgbox gUnknown_81978E6, 2 end CeladonCity_Restaurant_EventScript_16D1F4:: @ 816D1F4 - loadword 0, gUnknown_8197915 - callstd 2 + msgbox gUnknown_8197915, 2 end CeladonCity_Restaurant_EventScript_16D1FD:: @ 816D1FD @@ -16,8 +14,7 @@ CeladonCity_Restaurant_EventScript_16D1FD:: @ 816D1FD faceplayer checkflag FLAG_0x243 goto_if 1, EventScript_16D24B - loadword 0, gUnknown_81979C1 - callstd 4 + msgbox gUnknown_81979C1 checkitemspace ITEM_COIN_CASE, 1 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16D241 @@ -28,23 +25,19 @@ CeladonCity_Restaurant_EventScript_16D1FD:: @ 816D1FD end EventScript_16D241:: @ 816D241 - loadword 0, gUnknown_8197A5E - callstd 4 + msgbox gUnknown_8197A5E release end EventScript_16D24B:: @ 816D24B - loadword 0, gUnknown_8197A72 - callstd 4 + msgbox gUnknown_8197A72 release end CeladonCity_Restaurant_EventScript_16D255:: @ 816D255 - loadword 0, gUnknown_8197952 - callstd 2 + msgbox gUnknown_8197952, 2 end CeladonCity_Restaurant_EventScript_16D25E:: @ 816D25E - loadword 0, gUnknown_819798A - callstd 2 + msgbox gUnknown_819798A, 2 end diff --git a/data/maps/CeruleanCity/scripts.inc b/data/maps/CeruleanCity/scripts.inc index f13e36eea..02da1e3a3 100644 --- a/data/maps/CeruleanCity/scripts.inc +++ b/data/maps/CeruleanCity/scripts.inc @@ -41,8 +41,7 @@ EventScript_1664CC:: @ 81664CC addobject 8 applymovement 8, Movement_1665D3 waitmovement 0 - loadword 0, gUnknown_817EAD7 - callstd 4 + msgbox gUnknown_817EAD7 setvar VAR_LAST_TALKED, 8 compare_var_to_value VAR_STARTER_MON, 2 call_if 1, EventScript_166582 @@ -53,8 +52,7 @@ EventScript_1664CC:: @ 81664CC setvar VAR_0x8004, 13 setvar VAR_0x8005, 0 special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_817EB95 - callstd 4 + msgbox gUnknown_817EB95 closemessage playbgm BGM_FRLG_RIVAL_POSTBATTLE, 0 compare_var_to_value VAR_0x4001, 0 @@ -63,15 +61,13 @@ EventScript_1664CC:: @ 81664CC call_if 1, EventScript_1665A3 compare_var_to_value VAR_0x4001, 2 call_if 1, EventScript_1665B5 - loadword 0, gUnknown_817ECD4 - callstd 4 + msgbox gUnknown_817ECD4 setvar VAR_0x4052, 1 setflag FLAG_0x29B setorcopyvar VAR_0x8000, 363 setorcopyvar VAR_0x8001, 1 callstd 0 - loadword 0, gUnknown_817ED5D - callstd 4 + msgbox gUnknown_817ED5D closemessage applymovement 8, Movement_1665FB waitmovement 0 @@ -191,15 +187,13 @@ CeruleanCity_EventScript_166603:: @ 8166603 end EventScript_16662E:: @ 816662E - loadword 0, gUnknown_817EE9C - callstd 4 + msgbox gUnknown_817EE9C checkitemspace ITEM_TM28, 1 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_166677 additem ITEM_TM28, 1 giveitemfanfaremsg gUnknown_817EEBF, ITEM_TM28 - loadword 0, gUnknown_817EEED - callstd 4 + msgbox gUnknown_817EEED closemessage fadescreen 1 removeobject 2 @@ -210,8 +204,7 @@ EventScript_16662E:: @ 816662E EventScript_166677:: @ 8166677 textcolor 0 - loadword 0, gUnknown_817EF07 - callstd 4 + msgbox gUnknown_817EF07 release end @@ -237,8 +230,7 @@ CeruleanCity_EventScript_1666A3:: @ 81666A3 EventScript_1666C3:: @ 81666C3 textcolor 0 - loadword 0, Text_17EE0E - callstd 4 + msgbox Text_17EE0E setvar VAR_LAST_TALKED, 2 trainerbattle 3, 355, 0, Text_17EE70 setvar VAR_0x407D, 1 @@ -248,8 +240,7 @@ EventScript_1666C3:: @ 81666C3 CeruleanCity_EventScript_1666E7:: @ 81666E7 lock faceplayer - loadword 0, gUnknown_817F0F1 - callstd 4 + msgbox gUnknown_817F0F1 closemessage applymovement 1, Movement_1A75E5 waitmovement 0 @@ -261,37 +252,31 @@ CeruleanCity_EventScript_1666FE:: @ 81666FE faceplayer checkflag FLAG_0x234 goto_if 1, EventScript_166713 - loadword 0, gUnknown_817F01D - callstd 4 + msgbox gUnknown_817F01D release end EventScript_166713:: @ 8166713 - loadword 0, gUnknown_817EF89 - callstd 4 + msgbox gUnknown_817EF89 release end CeruleanCity_EventScript_16671D:: @ 816671D - loadword 0, gUnknown_817F0B2 - callstd 2 + msgbox gUnknown_817F0B2, 2 end CeruleanCity_EventScript_166726:: @ 8166726 - loadword 0, gUnknown_817EF3F - callstd 2 + msgbox gUnknown_817EF3F, 2 end CeruleanCity_EventScript_16672F:: @ 816672F - loadword 0, gUnknown_817F319 - callstd 2 + msgbox gUnknown_817F319, 2 end CeruleanCity_EventScript_166738:: @ 8166738 lock faceplayer - loadword 0, gUnknown_817F2CF - callstd 4 + msgbox gUnknown_817F2CF closemessage applymovement 11, Movement_1A75E5 waitmovement 0 @@ -336,18 +321,15 @@ EventScript_1667BC:: @ 81667BC return EventScript_1667C2:: @ 81667C2 - loadword 0, gUnknown_817F1A1 - callstd 4 + msgbox gUnknown_817F1A1 return EventScript_1667CB:: @ 81667CB - loadword 0, gUnknown_817F1D2 - callstd 4 + msgbox gUnknown_817F1D2 return EventScript_1667D4:: @ 81667D4 - loadword 0, gUnknown_817F1FC - callstd 4 + msgbox gUnknown_817F1FC return CeruleanCity_EventScript_1667DD:: @ 81667DD @@ -366,38 +348,31 @@ CeruleanCity_EventScript_1667DD:: @ 81667DD end EventScript_166814:: @ 8166814 - loadword 0, gUnknown_817F270 - callstd 4 + msgbox gUnknown_817F270 return EventScript_16681D:: @ 816681D - loadword 0, gUnknown_817F287 - callstd 4 + msgbox gUnknown_817F287 return EventScript_166826:: @ 8166826 - loadword 0, gUnknown_817F2A2 - callstd 4 + msgbox gUnknown_817F2A2 return EventScript_16682F:: @ 816682F - loadword 0, gUnknown_817F2B7 - callstd 4 + msgbox gUnknown_817F2B7 return CeruleanCity_EventScript_166838:: @ 8166838 - loadword 0, gUnknown_817F420 - callstd 3 + msgbox gUnknown_817F420, 3 end CeruleanCity_EventScript_166841:: @ 8166841 - loadword 0, gUnknown_817F453 - callstd 3 + msgbox gUnknown_817F453, 3 end CeruleanCity_EventScript_16684A:: @ 816684A - loadword 0, gUnknown_817F4C5 - callstd 3 + msgbox gUnknown_817F4C5, 3 end CeruleanCity_EventScript_166853:: @ 8166853 @@ -405,7 +380,6 @@ CeruleanCity_EventScript_166853:: @ 8166853 setvar VAR_0x8004, 3 setvar VAR_0x8005, 0 special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_817F4EF - callstd 4 + msgbox gUnknown_817F4EF releaseall end diff --git a/data/maps/CeruleanCity_BikeShop/scripts.inc b/data/maps/CeruleanCity_BikeShop/scripts.inc index 4a3271ed1..1ecfa9d96 100644 --- a/data/maps/CeruleanCity_BikeShop/scripts.inc +++ b/data/maps/CeruleanCity_BikeShop/scripts.inc @@ -22,14 +22,12 @@ CeruleanCity_BikeShop_EventScript_16ABBD:: @ 816ABBD end EventScript_16AC07:: @ 816AC07 - loadword 0, gUnknown_8192796 - callstd 4 + msgbox gUnknown_8192796 goto EventScript_16AC15 end EventScript_16AC15:: @ 816AC15 - loadword 0, gUnknown_819280E - callstd 4 + msgbox gUnknown_819280E hidemoneybox .byte 0 .byte 0 @@ -37,32 +35,27 @@ EventScript_16AC15:: @ 816AC15 end EventScript_16AC22:: @ 816AC22 - loadword 0, gUnknown_81927B2 - callstd 4 + msgbox gUnknown_81927B2 giveitemfanfaremsg gUnknown_81927E1, ITEM_BICYCLE, 1, BGM_FRLG_ME_KEYITEM setflag FLAG_0x271 additem ITEM_BICYCLE, 1 removeitem ITEM_BIKE_VOUCHER, 1 - loadword 0, gUnknown_819280E - callstd 4 + msgbox gUnknown_819280E release end EventScript_16AC58:: @ 816AC58 - loadword 0, gUnknown_8192833 - callstd 4 + msgbox gUnknown_8192833 release end EventScript_16AC62:: @ 816AC62 - loadword 0, gUnknown_81928A8 - callstd 4 + msgbox gUnknown_81928A8 release end CeruleanCity_BikeShop_EventScript_16AC6C:: @ 816AC6C - loadword 0, gUnknown_81928CF - callstd 2 + msgbox gUnknown_81928CF, 2 end CeruleanCity_BikeShop_EventScript_16AC75:: @ 816AC75 @@ -70,19 +63,16 @@ CeruleanCity_BikeShop_EventScript_16AC75:: @ 816AC75 faceplayer checkflag FLAG_0x271 goto_if 1, EventScript_16AC8A - loadword 0, gUnknown_8192937 - callstd 4 + msgbox gUnknown_8192937 release end EventScript_16AC8A:: @ 816AC8A - loadword 0, gUnknown_8192968 - callstd 4 + msgbox gUnknown_8192968 release end CeruleanCity_BikeShop_EventScript_16AC94:: @ 816AC94 CeruleanCity_EventScript_16AC94:: @ 816AC94 - loadword 0, gUnknown_81929AD - callstd 3 + msgbox gUnknown_81929AD, 3 end diff --git a/data/maps/CeruleanCity_Gym/scripts.inc b/data/maps/CeruleanCity_Gym/scripts.inc index e57532979..1398b9ebe 100644 --- a/data/maps/CeruleanCity_Gym/scripts.inc +++ b/data/maps/CeruleanCity_Gym/scripts.inc @@ -8,8 +8,7 @@ CeruleanCity_Gym_EventScript_16AAA1:: @ 816AAA1 trainerbattle 1, 415, 0, Text_1921EF, Text_19242D, EventScript_16AAD3 checkflag FLAG_0x297 goto_if 0, EventScript_16AAF9 - loadword 0, gUnknown_81922BF - callstd 4 + msgbox gUnknown_81922BF release end @@ -26,29 +25,25 @@ EventScript_16AAD3:: @ 816AAD3 end EventScript_16AAF9:: @ 816AAF9 - loadword 0, gUnknown_81922F7 - callstd 4 + msgbox gUnknown_81922F7 checkitemspace ITEM_TM03, 1 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16AB3A additem ITEM_TM03, 1 giveitemfanfaremsg gUnknown_81923F1, ITEM_TM03 setflag FLAG_0x297 - loadword 0, gUnknown_81922BF - callstd 4 + msgbox gUnknown_81922BF release end EventScript_16AB3A:: @ 816AB3A - loadword 0, gUnknown_819240E - callstd 4 + msgbox gUnknown_819240E release end CeruleanCity_Gym_EventScript_16AB44:: @ 816AB44 trainerbattle 0, 150, 0, Text_192481, Text_1924D0 - loadword 0, gUnknown_81924E4 - callstd 6 + msgbox gUnknown_81924E4, 6 end CeruleanCity_Gym_EventScript_16AB5B:: @ 816AB5B @@ -56,8 +51,7 @@ CeruleanCity_Gym_EventScript_16AB5B:: @ 816AB5B setvar VAR_0x8004, 3 setvar VAR_0x8005, 2 special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_8192556 - callstd 6 + msgbox gUnknown_8192556, 6 end CeruleanCity_Gym_EventScript_16AB7F:: @ 816AB7F @@ -65,14 +59,12 @@ CeruleanCity_Gym_EventScript_16AB7F:: @ 816AB7F faceplayer checkflag FLAG_0x4B1 goto_if 1, EventScript_16AB94 - loadword 0, gUnknown_81925AC - callstd 4 + msgbox gUnknown_81925AC release end EventScript_16AB94:: @ 816AB94 - loadword 0, gUnknown_8192688 - callstd 4 + msgbox gUnknown_8192688 release end @@ -80,13 +72,11 @@ CeruleanCity_Gym_EventScript_16AB9E:: @ 816AB9E lockall checkflag FLAG_0x821 goto_if 1, EventScript_16ABB2 - loadword 0, gUnknown_81926E1 - callstd 4 + msgbox gUnknown_81926E1 releaseall end EventScript_16ABB2:: @ 816ABB2 - loadword 0, gUnknown_8192719 - callstd 4 + msgbox gUnknown_8192719 releaseall end diff --git a/data/maps/CeruleanCity_House1/scripts.inc b/data/maps/CeruleanCity_House1/scripts.inc index 28be7121e..f1f9503c1 100644 --- a/data/maps/CeruleanCity_House1/scripts.inc +++ b/data/maps/CeruleanCity_House1/scripts.inc @@ -4,8 +4,7 @@ CeruleanCity_House1_MapScripts:: @ 816A7EF CeruleanCity_House1_EventScript_16A7F0:: @ 816A7F0 lock faceplayer - loadword 0, gUnknown_81918E7 - callstd 4 + msgbox gUnknown_81918E7 message Text_191967 waitmessage setvar VAR_0x8004, 0 @@ -63,59 +62,50 @@ EventScript_16A87D:: @ 816A87D end EventScript_16A8FB:: @ 816A8FB - loadword 0, gUnknown_81919BE - callstd 4 + msgbox gUnknown_81919BE goto EventScript_16A87D end EventScript_16A909:: @ 816A909 - loadword 0, gUnknown_8191A31 - callstd 4 + msgbox gUnknown_8191A31 goto EventScript_16A87D end EventScript_16A917:: @ 816A917 - loadword 0, gUnknown_8191AF9 - callstd 4 + msgbox gUnknown_8191AF9 goto EventScript_16A87D end EventScript_16A925:: @ 816A925 - loadword 0, gUnknown_8191B69 - callstd 4 + msgbox gUnknown_8191B69 goto EventScript_16A87D end EventScript_16A933:: @ 816A933 - loadword 0, gUnknown_8191C36 - callstd 4 + msgbox gUnknown_8191C36 goto EventScript_16A87D end EventScript_16A941:: @ 816A941 - loadword 0, gUnknown_8191CA9 - callstd 4 + msgbox gUnknown_8191CA9 goto EventScript_16A87D end EventScript_16A94F:: @ 816A94F - loadword 0, gUnknown_8191D78 - callstd 4 + msgbox gUnknown_8191D78 goto EventScript_16A87D EventScript_16A95C:: @ 816A95C end EventScript_16A95D:: @ 816A95D - loadword 0, gUnknown_8191DF8 - callstd 4 + msgbox gUnknown_8191DF8 goto EventScript_16A87D EventScript_16A96A:: @ 816A96A end EventScript_16A96B:: @ 816A96B - loadword 0, gUnknown_819199E - callstd 4 + msgbox gUnknown_819199E release end diff --git a/data/maps/CeruleanCity_House2/scripts.inc b/data/maps/CeruleanCity_House2/scripts.inc index 555b048dc..424080126 100644 --- a/data/maps/CeruleanCity_House2/scripts.inc +++ b/data/maps/CeruleanCity_House2/scripts.inc @@ -6,23 +6,19 @@ CeruleanCity_House2_EventScript_16A976:: @ 816A976 faceplayer checkflag FLAG_0x23F goto_if 1, EventScript_16A98B - loadword 0, gUnknown_8191E13 - callstd 4 + msgbox gUnknown_8191E13 release end EventScript_16A98B:: @ 816A98B - loadword 0, gUnknown_8191ED8 - callstd 4 + msgbox gUnknown_8191ED8 release end CeruleanCity_House2_EventScript_16A995:: @ 816A995 - loadword 0, gUnknown_8191F2A - callstd 2 + msgbox gUnknown_8191F2A, 2 end CeruleanCity_House2_EventScript_16A99E:: @ 816A99E - loadword 0, gUnknown_8191F64 - callstd 3 + msgbox gUnknown_8191F64, 3 end diff --git a/data/maps/CeruleanCity_House3/scripts.inc b/data/maps/CeruleanCity_House3/scripts.inc index efa46f2a4..edc1c1aae 100644 --- a/data/maps/CeruleanCity_House3/scripts.inc +++ b/data/maps/CeruleanCity_House3/scripts.inc @@ -2,8 +2,7 @@ CeruleanCity_House3_MapScripts:: @ 816A9A7 .byte 0 CeruleanCity_House3_EventScript_16A9A8:: @ 816A9A8 - loadword 0, gUnknown_8191F80 - callstd 2 + msgbox gUnknown_8191F80, 2 end CeruleanCity_House3_EventScript_16A9B1:: @ 816A9B1 @@ -13,8 +12,7 @@ CeruleanCity_House3_EventScript_16A9B1:: @ 816A9B1 call EventScript_1A8CAD checkflag FLAG_0x24A goto_if 1, EventScript_16AA23 - loadword 0, gUnknown_81A59FE - callstd 5 + msgbox gUnknown_81A59FE, 5 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16AA0B call EventScript_1A8CBD @@ -24,27 +22,23 @@ CeruleanCity_House3_EventScript_16A9B1:: @ 816A9B1 compare_var_to_var VAR_RESULT, VAR_0x8009 goto_if 5, EventScript_16AA15 call EventScript_1A8CD9 - loadword 0, gUnknown_81A5A9D - callstd 4 + msgbox gUnknown_81A5A9D setflag FLAG_0x24A release end EventScript_16AA0B:: @ 816AA0B - loadword 0, gUnknown_81A5A4E - callstd 4 + msgbox gUnknown_81A5A4E release end EventScript_16AA15:: @ 816AA15 getspeciesname 0, 32777 - loadword 0, gUnknown_81A5A6A - callstd 4 + msgbox gUnknown_81A5A6A release end EventScript_16AA23:: @ 816AA23 - loadword 0, gUnknown_81A5AA5 - callstd 4 + msgbox gUnknown_81A5AA5 release end diff --git a/data/maps/CeruleanCity_House4/scripts.inc b/data/maps/CeruleanCity_House4/scripts.inc index 4e53e091f..f572ed04f 100644 --- a/data/maps/CeruleanCity_House4/scripts.inc +++ b/data/maps/CeruleanCity_House4/scripts.inc @@ -26,15 +26,13 @@ CeruleanCity_House4_EventScript_16ACEF:: @ 816ACEF end EventScript_16AD59:: @ 816AD59 - loadword 0, gUnknown_8192AF0 - callstd 4 + msgbox gUnknown_8192AF0 release end EventScript_16AD63:: @ 816AD63 call EventScript_16AE23 - loadword 0, gUnknown_8192B43 - callstd 4 + msgbox gUnknown_8192B43 setorcopyvar VAR_0x8000, VAR_0x8008 setorcopyvar VAR_0x8001, 1 callstd 0 @@ -45,8 +43,7 @@ EventScript_16AD63:: @ 816AD63 EventScript_16AD89:: @ 816AD89 call EventScript_16AE23 - loadword 0, gUnknown_8192C07 - callstd 4 + msgbox gUnknown_8192C07 setorcopyvar VAR_0x8000, VAR_0x8008 setorcopyvar VAR_0x8001, 4 callstd 0 @@ -58,15 +55,13 @@ EventScript_16AD89:: @ 816AD89 EventScript_16ADAF:: @ 816ADAF applymovement 1, Movement_1A75E1 waitmovement 0 - loadword 0, gUnknown_8192CD5 - callstd 4 + msgbox gUnknown_8192CD5 release end EventScript_16ADC3:: @ 816ADC3 call EventScript_16AE23 - loadword 0, gUnknown_8192D4B - callstd 4 + msgbox gUnknown_8192D4B setorcopyvar VAR_0x8000, VAR_0x8008 setorcopyvar VAR_0x8001, 1 callstd 0 @@ -77,8 +72,7 @@ EventScript_16ADC3:: @ 816ADC3 EventScript_16ADE9:: @ 816ADE9 call EventScript_16AE23 - loadword 0, gUnknown_8192DE3 - callstd 4 + msgbox gUnknown_8192DE3 setorcopyvar VAR_0x8000, VAR_0x8008 setorcopyvar VAR_0x8001, 4 callstd 0 @@ -90,8 +84,7 @@ EventScript_16ADE9:: @ 816ADE9 EventScript_16AE0F:: @ 816AE0F applymovement 1, Movement_1A75E1 waitmovement 0 - loadword 0, gUnknown_8192EC5 - callstd 4 + msgbox gUnknown_8192EC5 release end @@ -106,7 +99,6 @@ EventScript_16AE23:: @ 816AE23 return EventScript_16AE45:: @ 816AE45 - loadword 0, gUnknown_8192F2A - callstd 4 + msgbox gUnknown_8192F2A release end diff --git a/data/maps/CeruleanCity_House5/scripts.inc b/data/maps/CeruleanCity_House5/scripts.inc index fdbe6956a..762b36ec9 100644 --- a/data/maps/CeruleanCity_House5/scripts.inc +++ b/data/maps/CeruleanCity_House5/scripts.inc @@ -6,41 +6,35 @@ CeruleanCity_House5_EventScript_16AE50:: @ 816AE50 faceplayer checkflag FLAG_0x2BB goto_if 1, EventScript_16AEB7 - loadword 0, gUnknown_8192F67 - callstd 5 + msgbox gUnknown_8192F67, 5 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16AEAD checkflag FLAG_0x847 goto_if 0, EventScript_16AEA3 - loadword 0, gUnknown_8193003 - callstd 4 + msgbox gUnknown_8193003 setflag FLAG_0x2BB setorcopyvar VAR_0x8000, 372 setorcopyvar VAR_0x8001, 1 callstd 0 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_1A6BF9 - loadword 0, gUnknown_8193033 - callstd 4 + msgbox gUnknown_8193033 release end EventScript_16AEA3:: @ 816AEA3 - loadword 0, gUnknown_819321D - callstd 4 + msgbox gUnknown_819321D release end EventScript_16AEAD:: @ 816AEAD - loadword 0, gUnknown_819325E - callstd 4 + msgbox gUnknown_819325E release end EventScript_16AEB7:: @ 816AEB7 special sub_815F094 - loadword 0, gUnknown_81932C5 - callstd 4 + msgbox gUnknown_81932C5 goto EventScript_16AEC8 end @@ -157,15 +151,13 @@ EventScript_16B034:: @ 816B034 end EventScript_16B048:: @ 816B048 - loadword 0, gUnknown_819342F - callstd 4 + msgbox gUnknown_819342F special sub_815F114 release end EventScript_16B055:: @ 816B055 - loadword 0, gUnknown_819331E - callstd 5 + msgbox gUnknown_819331E, 5 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16AEC8 copyvar VAR_0x8004, VAR_0x8009 @@ -180,26 +172,22 @@ EventScript_16B055:: @ 816B055 copyvar VAR_0x8004, VAR_0x8009 special sub_815EF5C special sub_815F070 - loadword 0, gUnknown_819337A - callstd 5 + msgbox gUnknown_819337A, 5 compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_16AEC8 - loadword 0, gUnknown_81933FB - callstd 4 + msgbox gUnknown_81933FB special sub_815F114 release end EventScript_16B0BF:: @ 816B0BF - loadword 0, gUnknown_81A5207 - callstd 4 + msgbox gUnknown_81A5207 special sub_815F114 release end EventScript_16B0CC:: @ 816B0CC - loadword 0, gUnknown_8193352 - callstd 4 + msgbox gUnknown_8193352 goto EventScript_16AEC8 end diff --git a/data/maps/CeruleanCity_Mart/scripts.inc b/data/maps/CeruleanCity_Mart/scripts.inc index f4466d856..56558f175 100644 --- a/data/maps/CeruleanCity_Mart/scripts.inc +++ b/data/maps/CeruleanCity_Mart/scripts.inc @@ -2,13 +2,11 @@ CeruleanCity_Mart_MapScripts:: @ 816AC9D .byte 0 CeruleanCity_Mart_EventScript_16AC9E:: @ 816AC9E - loadword 0, gUnknown_81929C2 - callstd 2 + msgbox gUnknown_81929C2, 2 end CeruleanCity_Mart_EventScript_16ACA7:: @ 816ACA7 - loadword 0, gUnknown_8192A79 - callstd 2 + msgbox gUnknown_8192A79, 2 end CeruleanCity_Mart_EventScript_16ACB0:: @ 816ACB0 @@ -20,8 +18,7 @@ CeruleanCity_Mart_EventScript_16ACB0:: @ 816ACB0 message Text_1A6211 waitmessage pokemart Items_16ACD8 - loadword 0, gUnknown_81A5190 - callstd 4 + msgbox gUnknown_81A5190 release end diff --git a/data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc b/data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc index 259e397a5..e5f26eb25 100644 --- a/data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc @@ -15,13 +15,11 @@ CeruleanCity_PokemonCenter_1F_EventScript_16AA3C:: @ 816AA3C end CeruleanCity_PokemonCenter_1F_EventScript_16AA45:: @ 816AA45 - loadword 0, gUnknown_8192079 - callstd 2 + msgbox gUnknown_8192079, 2 end CeruleanCity_PokemonCenter_1F_EventScript_16AA4E:: @ 816AA4E - loadword 0, gUnknown_8191FFB - callstd 2 + msgbox gUnknown_8191FFB, 2 end CeruleanCity_PokemonCenter_1F_EventScript_16AA57:: @ 816AA57 @@ -30,12 +28,10 @@ CeruleanCity_PokemonCenter_1F_EventScript_16AA57:: @ 816AA57 setvar VAR_0x8004, 13 setvar VAR_0x8005, 1 special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_8192116 - callstd 4 + msgbox gUnknown_8192116 release end CeruleanCity_PokemonCenter_1F_EventScript_16AA70:: @ 816AA70 - loadword 0, gUnknown_819214C - callstd 2 + msgbox gUnknown_819214C, 2 end diff --git a/data/maps/CinnabarIsland/scripts.inc b/data/maps/CinnabarIsland/scripts.inc index aa31cd1ca..eea34942a 100644 --- a/data/maps/CinnabarIsland/scripts.inc +++ b/data/maps/CinnabarIsland/scripts.inc @@ -70,8 +70,7 @@ EventScript_166F88:: @ 8166F88 EventScript_166FA0:: @ 8166FA0 lockall textcolor 0 - loadword 0, gUnknown_8180F09 - callstd 4 + msgbox gUnknown_8180F09 closemessage applymovement 3, Movement_166FC6 waitmovement 0 @@ -107,10 +106,8 @@ EventScript_166FCD:: @ 8166FCD call_if 0, EventScript_167048 checkflag FLAG_0x002 call_if 1, EventScript_167053 - loadword 0, gUnknown_8180C90 - callstd 4 - loadword 0, gUnknown_8180CAA - callstd 5 + msgbox gUnknown_8180C90 + msgbox gUnknown_8180CAA, 5 compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_167068 compare_var_to_value VAR_RESULT, 0 @@ -140,16 +137,14 @@ EventScript_167053:: @ 8167053 return EventScript_167068:: @ 8167068 - loadword 0, gUnknown_8180DDD - callstd 4 + msgbox gUnknown_8180DDD closemessage call EventScript_1670E6 releaseall end EventScript_167078:: @ 8167078 - loadword 0, gUnknown_8180DF8 - callstd 4 + msgbox gUnknown_8180DF8 closemessage checkflag FLAG_0x002 call_if 0, EventScript_1670A0 @@ -213,8 +208,7 @@ EventScript_1670E6:: @ 81670E6 call_if 0, EventScript_167154 checkflag FLAG_0x002 call_if 1, EventScript_167166 - loadword 0, gUnknown_8180EAD - callstd 4 + msgbox gUnknown_8180EAD closemessage checkflag FLAG_0x002 call_if 0, EventScript_167171 @@ -335,8 +329,7 @@ CinnabarIsland_EventScript_1671CA:: @ 81671CA applymovement 255, Movement_1A75E9 waitmovement 0 delay 20 - loadword 0, gUnknown_8180B20 - callstd 4 + msgbox gUnknown_8180B20 closemessage applymovement 255, Movement_1671ED waitmovement 0 @@ -353,24 +346,20 @@ CinnabarIsland_EventScript_1671EF:: @ 81671EF setvar VAR_0x8004, 8 setvar VAR_0x8005, 3 special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_8180B34 - callstd 4 + msgbox gUnknown_8180B34 release end CinnabarIsland_EventScript_167208:: @ 8167208 - loadword 0, gUnknown_8180BA0 - callstd 2 + msgbox gUnknown_8180BA0, 2 end CinnabarIsland_EventScript_167211:: @ 8167211 - loadword 0, gUnknown_8180C0D - callstd 3 + msgbox gUnknown_8180C0D, 3 end CinnabarIsland_EventScript_16721A:: @ 816721A - loadword 0, gUnknown_8180C3E - callstd 3 + msgbox gUnknown_8180C3E, 3 end CinnabarIsland_EventScript_167223:: @ 8167223 @@ -378,7 +367,6 @@ CinnabarIsland_EventScript_167223:: @ 8167223 setvar VAR_0x8004, 8 setvar VAR_0x8005, 0 special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_8180C4A - callstd 4 + msgbox gUnknown_8180C4A releaseall end diff --git a/data/maps/CinnabarIsland_Gym/scripts.inc b/data/maps/CinnabarIsland_Gym/scripts.inc index e206f46db..916966683 100644 --- a/data/maps/CinnabarIsland_Gym/scripts.inc +++ b/data/maps/CinnabarIsland_Gym/scripts.inc @@ -59,8 +59,7 @@ CinnabarIsland_Gym_EventScript_16D9D4:: @ 816D9D4 trainerbattle 1, 419, 0, Text_199543, Text_1995FA, EventScript_16DA06 checkflag FLAG_0x24E goto_if 0, EventScript_16DA34 - loadword 0, gUnknown_819971D - callstd 4 + msgbox gUnknown_819971D release end @@ -79,35 +78,30 @@ EventScript_16DA06:: @ 816DA06 end EventScript_16DA34:: @ 816DA34 - loadword 0, gUnknown_819969E - callstd 4 + msgbox gUnknown_819969E checkitemspace ITEM_TM38, 1 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16DA75 additem ITEM_TM38, 1 giveitemfanfaremsg gUnknown_81996FF, ITEM_TM38 setflag FLAG_0x24E - loadword 0, gUnknown_8199652 - callstd 4 + msgbox gUnknown_8199652 release end EventScript_16DA75:: @ 816DA75 - loadword 0, gUnknown_8199789 - callstd 4 + msgbox gUnknown_8199789 release end CinnabarIsland_Gym_EventScript_16DA7F:: @ 816DA7F trainerbattle 0, 177, 0, Text_1997A5, Text_1997D6 - loadword 0, gUnknown_81997EA - callstd 6 + msgbox gUnknown_81997EA, 6 end CinnabarIsland_Gym_EventScript_16DA96:: @ 816DA96 trainerbattle 2, 178, 0, Text_1998BD, Text_1998ED, EventScript_16DAB1 - loadword 0, gUnknown_8199911 - callstd 6 + msgbox gUnknown_8199911, 6 end EventScript_16DAB1:: @ 816DAB1 @@ -125,8 +119,7 @@ CinnabarIsland_Gym_EventScript_16DAC2:: @ 816DAC2 setvar VAR_0x8004, 8 setvar VAR_0x8005, 2 special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_81999DF - callstd 6 + msgbox gUnknown_81999DF, 6 end EventScript_16DAEA:: @ 816DAEA @@ -141,8 +134,7 @@ EventScript_16DAF5:: @ 816DAF5 CinnabarIsland_Gym_EventScript_16DAFB:: @ 816DAFB trainerbattle 2, 180, 0, Text_199AFC, Text_199B16, EventScript_16DB16 - loadword 0, gUnknown_8199B27 - callstd 6 + msgbox gUnknown_8199B27, 6 end EventScript_16DB16:: @ 816DB16 @@ -157,8 +149,7 @@ EventScript_16DB21:: @ 816DB21 CinnabarIsland_Gym_EventScript_16DB27:: @ 816DB27 trainerbattle 2, 213, 0, Text_19983F, Text_199870, EventScript_16DB42 - loadword 0, gUnknown_819987D - callstd 6 + msgbox gUnknown_819987D, 6 end EventScript_16DB42:: @ 816DB42 @@ -173,8 +164,7 @@ EventScript_16DB4D:: @ 816DB4D CinnabarIsland_Gym_EventScript_16DB53:: @ 816DB53 trainerbattle 2, 214, 0, Text_199948, Text_199973, EventScript_16DB6E - loadword 0, gUnknown_8199986 - callstd 6 + msgbox gUnknown_8199986, 6 end EventScript_16DB6E:: @ 816DB6E @@ -189,8 +179,7 @@ EventScript_16DB79:: @ 816DB79 CinnabarIsland_Gym_EventScript_16DB7F:: @ 816DB7F trainerbattle 2, 215, 0, Text_199A7F, Text_199AB9, EventScript_16DB9A - loadword 0, gUnknown_8199AC9 - callstd 6 + msgbox gUnknown_8199AC9, 6 end EventScript_16DB9A:: @ 816DB9A @@ -208,14 +197,12 @@ CinnabarIsland_Gym_EventScript_16DBAB:: @ 816DBAB faceplayer checkflag FLAG_0x4B6 goto_if 1, EventScript_16DBC0 - loadword 0, gUnknown_8199B81 - callstd 4 + msgbox gUnknown_8199B81 release end EventScript_16DBC0:: @ 816DBC0 - loadword 0, gUnknown_8199C0C - callstd 4 + msgbox gUnknown_8199C0C release end @@ -223,14 +210,12 @@ CinnabarIsland_Gym_EventScript_16DBCA:: @ 816DBCA lockall checkflag FLAG_UNK826 goto_if 1, EventScript_16DBDE - loadword 0, gUnknown_8199C29 - callstd 4 + msgbox gUnknown_8199C29 releaseall end EventScript_16DBDE:: @ 816DBDE - loadword 0, gUnknown_8199C62 - callstd 4 + msgbox gUnknown_8199C62 releaseall end @@ -247,10 +232,8 @@ CinnabarIsland_Gym_EventScript_16DBF4:: @ 816DBF4 end EventScript_16DC00:: @ 816DC00 - loadword 0, gUnknown_8199C9F - callstd 4 - loadword 0, gUnknown_8199D5A - callstd 5 + msgbox gUnknown_8199C9F + msgbox gUnknown_8199D5A, 5 compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_16DC43 compare_var_to_value VAR_RESULT, 0 @@ -260,16 +243,14 @@ EventScript_16DC00:: @ 816DC00 EventScript_16DC27:: @ 816DC27 playfanfare MUS_FANFA1 waitfanfare - loadword 0, gUnknown_8199E4F - callstd 4 + msgbox gUnknown_8199E4F return EventScript_16DC34:: @ 816DC34 waitse playse SE_BOO waitse - loadword 0, gUnknown_8199E79 - callstd 4 + msgbox gUnknown_8199E79 closemessage return @@ -306,8 +287,7 @@ EventScript_16DC7A:: @ 816DC7A compare_var_to_value VAR_0x4001, 1 call_if 1, EventScript_16DCC6 textcolor 0 - loadword 0, gUnknown_819983F - callstd 4 + msgbox gUnknown_819983F trainerbattle 3, 213, 0, Text_199870 checkflag FLAG_0x265 goto_if 1, EventScript_16DC68 @@ -349,10 +329,8 @@ CinnabarIsland_Gym_EventScript_16DCE9:: @ 816DCE9 end EventScript_16DCF5:: @ 816DCF5 - loadword 0, gUnknown_8199C9F - callstd 4 - loadword 0, gUnknown_8199D79 - callstd 5 + msgbox gUnknown_8199C9F + msgbox gUnknown_8199D79, 5 compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_16DD41 compare_var_to_value VAR_RESULT, 0 @@ -388,8 +366,7 @@ EventScript_16DD51:: @ 816DD51 compare_var_to_value VAR_0x4001, 1 call_if 1, EventScript_16DD9D textcolor 0 - loadword 0, gUnknown_81998BD - callstd 4 + msgbox gUnknown_81998BD trainerbattle 3, 178, 0, Text_1998ED checkflag FLAG_0x267 goto_if 1, EventScript_16DC68 @@ -440,10 +417,8 @@ CinnabarIsland_Gym_EventScript_16DDC7:: @ 816DDC7 end EventScript_16DDD3:: @ 816DDD3 - loadword 0, gUnknown_8199C9F - callstd 4 - loadword 0, gUnknown_8199DA9 - callstd 5 + msgbox gUnknown_8199C9F + msgbox gUnknown_8199DA9, 5 compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_16DE1F compare_var_to_value VAR_RESULT, 0 @@ -479,8 +454,7 @@ EventScript_16DE2F:: @ 816DE2F compare_var_to_value VAR_0x4001, 1 call_if 1, EventScript_16DE7B textcolor 0 - loadword 0, gUnknown_8199948 - callstd 4 + msgbox gUnknown_8199948 trainerbattle 3, 214, 0, Text_199973 checkflag FLAG_0x268 goto_if 1, EventScript_16DC68 @@ -522,10 +496,8 @@ CinnabarIsland_Gym_EventScript_16DE9E:: @ 816DE9E end EventScript_16DEAA:: @ 816DEAA - loadword 0, gUnknown_8199C9F - callstd 4 - loadword 0, gUnknown_8199DC6 - callstd 5 + msgbox gUnknown_8199C9F + msgbox gUnknown_8199DC6, 5 compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_16DEF6 compare_var_to_value VAR_RESULT, 0 @@ -561,8 +533,7 @@ EventScript_16DF06:: @ 816DF06 compare_var_to_value VAR_0x4001, 1 call_if 1, EventScript_16DF52 textcolor 0 - loadword 0, gUnknown_81999B7 - callstd 4 + msgbox gUnknown_81999B7 trainerbattle 3, 179, 0, Text_1999DB checkflag FLAG_0x269 goto_if 1, EventScript_16DC68 @@ -604,10 +575,8 @@ CinnabarIsland_Gym_EventScript_16DF75:: @ 816DF75 end EventScript_16DF81:: @ 816DF81 - loadword 0, gUnknown_8199C9F - callstd 4 - loadword 0, gUnknown_8199E00 - callstd 5 + msgbox gUnknown_8199C9F + msgbox gUnknown_8199E00, 5 compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_16DFA8 compare_var_to_value VAR_RESULT, 0 @@ -643,8 +612,7 @@ EventScript_16DFDD:: @ 816DFDD compare_var_to_value VAR_0x4001, 1 call_if 1, EventScript_16E029 textcolor 0 - loadword 0, gUnknown_8199A7F - callstd 4 + msgbox gUnknown_8199A7F trainerbattle 3, 215, 0, Text_199AB9 checkflag FLAG_0x26A goto_if 1, EventScript_16DC68 @@ -686,10 +654,8 @@ CinnabarIsland_Gym_EventScript_16E04C:: @ 816E04C end EventScript_16E058:: @ 816E058 - loadword 0, gUnknown_8199C9F - callstd 4 - loadword 0, gUnknown_8199E36 - callstd 5 + msgbox gUnknown_8199C9F + msgbox gUnknown_8199E36, 5 compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_16E0A4 compare_var_to_value VAR_RESULT, 0 @@ -725,8 +691,7 @@ EventScript_16E0B4:: @ 816E0B4 compare_var_to_value VAR_0x4001, 1 call_if 1, EventScript_16E100 textcolor 0 - loadword 0, gUnknown_8199AFC - callstd 4 + msgbox gUnknown_8199AFC trainerbattle 3, 180, 0, Text_199B16 checkflag FLAG_0x26B goto_if 1, EventScript_16DC68 diff --git a/data/maps/CinnabarIsland_Mart/scripts.inc b/data/maps/CinnabarIsland_Mart/scripts.inc index 70bae8915..be01ab1fc 100644 --- a/data/maps/CinnabarIsland_Mart/scripts.inc +++ b/data/maps/CinnabarIsland_Mart/scripts.inc @@ -2,13 +2,11 @@ CinnabarIsland_Mart_MapScripts:: @ 816EA0F .byte 0 CinnabarIsland_Mart_EventScript_16EA10:: @ 816EA10 - loadword 0, gUnknown_819A7A0 - callstd 2 + msgbox gUnknown_819A7A0, 2 end CinnabarIsland_Mart_EventScript_16EA19:: @ 816EA19 - loadword 0, gUnknown_819A7F1 - callstd 2 + msgbox gUnknown_819A7F1, 2 end CinnabarIsland_Mart_EventScript_16EA22:: @ 816EA22 @@ -20,8 +18,7 @@ CinnabarIsland_Mart_EventScript_16EA22:: @ 816EA22 message Text_1A6211 waitmessage pokemart Items_16EA48 - loadword 0, gUnknown_81A5190 - callstd 4 + msgbox gUnknown_81A5190 release end diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc index 00d3afb78..cd9529936 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc @@ -15,29 +15,24 @@ CinnabarIsland_PokemonCenter_1F_EventScript_16E8E6:: @ 816E8E6 end CinnabarIsland_PokemonCenter_1F_EventScript_16E8EF:: @ 816E8EF - loadword 0, gUnknown_819A5BE - callstd 2 + msgbox gUnknown_819A5BE, 2 end CinnabarIsland_PokemonCenter_1F_EventScript_16E8F8:: @ 816E8F8 - loadword 0, gUnknown_819A4F8 - callstd 2 + msgbox gUnknown_819A4F8, 2 end CinnabarIsland_PokemonCenter_1F_EventScript_16E901:: @ 816E901 - loadword 0, gUnknown_819A6B1 - callstd 2 + msgbox gUnknown_819A6B1, 2 end CinnabarIsland_PokemonCenter_1F_EventScript_16E90A:: @ 816E90A lock faceplayer - loadword 0, gUnknown_819A725 - callstd 5 + msgbox gUnknown_819A725, 5 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16E9A5 - loadword 0, gUnknown_819A785 - callstd 4 + msgbox gUnknown_819A785 closemessage playbgm BGM_FRLG_FOLLOW_ME, 1 savebgm BGM_FRLG_FOLLOW_ME @@ -77,8 +72,7 @@ EventScript_16E993:: @ 816E993 return EventScript_16E9A5:: @ 816E9A5 - loadword 0, gUnknown_819A766 - callstd 4 + msgbox gUnknown_819A766 release end diff --git a/data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc index b0035df63..5da8c3e89 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc @@ -12,26 +12,21 @@ EventScript_16E285:: @ 816E285 return CinnabarIsland_PokemonLab_Entrance_EventScript_16E28B:: @ 816E28B - loadword 0, gUnknown_8199EE5 - callstd 2 + msgbox gUnknown_8199EE5, 2 end CinnabarIsland_PokemonLab_Entrance_EventScript_16E294:: @ 816E294 - loadword 0, gUnknown_8199F41 - callstd 3 + msgbox gUnknown_8199F41, 3 end CinnabarIsland_PokemonLab_Entrance_EventScript_16E29D:: @ 816E29D - loadword 0, gUnknown_8199F6A - callstd 3 + msgbox gUnknown_8199F6A, 3 end CinnabarIsland_PokemonLab_Entrance_EventScript_16E2A6:: @ 816E2A6 - loadword 0, gUnknown_8199F83 - callstd 3 + msgbox gUnknown_8199F83, 3 end CinnabarIsland_PokemonLab_Entrance_EventScript_16E2AF:: @ 816E2AF - loadword 0, gUnknown_8199F9A - callstd 3 + msgbox gUnknown_8199F9A, 3 end diff --git a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc index 733c6be41..e7e540df9 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc @@ -8,8 +8,7 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E401:: @ 816E401 call EventScript_1A8CAD checkflag FLAG_0x276 goto_if 1, EventScript_16E473 - loadword 0, gUnknown_81A597B - callstd 5 + msgbox gUnknown_81A597B, 5 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16E45B call EventScript_1A8CBD @@ -19,28 +18,24 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E401:: @ 816E401 compare_var_to_var VAR_RESULT, VAR_0x8009 goto_if 5, EventScript_16E465 call EventScript_1A8CD9 - loadword 0, gUnknown_81A59DA - callstd 4 + msgbox gUnknown_81A59DA setflag FLAG_0x276 release end EventScript_16E45B:: @ 816E45B - loadword 0, gUnknown_81A59B6 - callstd 4 + msgbox gUnknown_81A59B6 release end EventScript_16E465:: @ 816E465 getspeciesname 0, 32777 - loadword 0, gUnknown_81A59C6 - callstd 4 + msgbox gUnknown_81A59C6 release end EventScript_16E473:: @ 816E473 - loadword 0, gUnknown_81A59E7 - callstd 4 + msgbox gUnknown_81A59E7 release end @@ -65,8 +60,7 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E47D:: @ 816E47D call EventScript_16E51C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_16E5C8 - loadword 0, gUnknown_819A282 - callstd 4 + msgbox gUnknown_819A282 goto EventScript_16E53A end @@ -99,8 +93,7 @@ EventScript_16E534:: @ 816E534 return EventScript_16E53A:: @ 816E53A - loadword 0, gUnknown_819A314 - callstd 4 + msgbox gUnknown_819A314 release end @@ -178,16 +171,13 @@ EventScript_16E631:: @ 816E631 EventScript_16E668:: @ 816E668 getspeciesname 0, SPECIES_OMANYTE getitemname 1, ITEM_HELIX_FOSSIL - loadword 0, gUnknown_819A3D4 - callstd 5 + msgbox gUnknown_819A3D4, 5 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16E722 - loadword 0, gUnknown_819A45D - callstd 4 + msgbox gUnknown_819A45D textcolor 0 removeitem ITEM_HELIX_FOSSIL, 1 - loadword 0, gUnknown_819A4AB - callstd 4 + msgbox gUnknown_819A4AB setvar VAR_0x406A, 1 setvar VAR_0x4069, 1 release @@ -196,16 +186,13 @@ EventScript_16E668:: @ 816E668 EventScript_16E6A6:: @ 816E6A6 getspeciesname 0, SPECIES_KABUTO getitemname 1, ITEM_DOME_FOSSIL - loadword 0, gUnknown_819A3D4 - callstd 5 + msgbox gUnknown_819A3D4, 5 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16E722 - loadword 0, gUnknown_819A45D - callstd 4 + msgbox gUnknown_819A45D textcolor 0 removeitem ITEM_DOME_FOSSIL, 1 - loadword 0, gUnknown_819A4AB - callstd 4 + msgbox gUnknown_819A4AB setvar VAR_0x406A, 1 setvar VAR_0x4069, 2 release @@ -214,30 +201,25 @@ EventScript_16E6A6:: @ 816E6A6 EventScript_16E6E4:: @ 816E6E4 getspeciesname 0, SPECIES_AERODACTYL getitemname 1, ITEM_OLD_AMBER - loadword 0, gUnknown_819A3D4 - callstd 5 + msgbox gUnknown_819A3D4, 5 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16E722 - loadword 0, gUnknown_819A45D - callstd 4 + msgbox gUnknown_819A45D textcolor 0 removeitem ITEM_OLD_AMBER, 1 - loadword 0, gUnknown_819A4AB - callstd 4 + msgbox gUnknown_819A4AB setvar VAR_0x406A, 1 setvar VAR_0x4069, 3 release end EventScript_16E722:: @ 816E722 - loadword 0, gUnknown_819A4E1 - callstd 4 + msgbox gUnknown_819A4E1 release end EventScript_16E72C:: @ 816E72C - loadword 0, gUnknown_819A4AB - callstd 4 + msgbox gUnknown_819A4AB release end @@ -253,8 +235,7 @@ EventScript_16E736:: @ 816E736 EventScript_16E758:: @ 816E758 setvar VAR_0x4001, 138 getspeciesname 0, SPECIES_OMANYTE - loadword 0, gUnknown_819A34F - callstd 4 + msgbox gUnknown_819A34F givemon SPECIES_OMANYTE, 5, ITEM_NONE, 0, 0, 0 compare_var_to_value VAR_RESULT, 2 goto_if 1, EventScript_1A927C @@ -268,8 +249,7 @@ EventScript_16E758:: @ 816E758 EventScript_16E79D:: @ 816E79D setvar VAR_0x4001, 140 getspeciesname 0, SPECIES_KABUTO - loadword 0, gUnknown_819A34F - callstd 4 + msgbox gUnknown_819A34F givemon SPECIES_KABUTO, 5, ITEM_NONE, 0, 0, 0 compare_var_to_value VAR_RESULT, 2 goto_if 1, EventScript_1A927C @@ -283,8 +263,7 @@ EventScript_16E79D:: @ 816E79D EventScript_16E7E2:: @ 816E7E2 setvar VAR_0x4001, 142 getspeciesname 0, SPECIES_AERODACTYL - loadword 0, gUnknown_819A34F - callstd 4 + msgbox gUnknown_819A34F givemon SPECIES_AERODACTYL, 5, ITEM_NONE, 0, 0, 0 compare_var_to_value VAR_RESULT, 2 goto_if 1, EventScript_1A927C @@ -302,8 +281,7 @@ EventScript_16E827:: @ 816E827 waitmessage waitfanfare setvar VAR_0x406A, 0 - loadword 0, gUnknown_81A56A7 - callstd 5 + msgbox gUnknown_81A56A7, 5 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16E895 call EventScript_1A8C27 @@ -318,8 +296,7 @@ EventScript_16E85B:: @ 816E85B waitmessage waitfanfare setvar VAR_0x406A, 0 - loadword 0, gUnknown_81A56A7 - callstd 5 + msgbox gUnknown_81A56A7, 5 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16E88A call EventScript_1A8C33 @@ -336,8 +313,7 @@ EventScript_16E895:: @ 816E895 end EventScript_16E897:: @ 816E897 - loadword 0, gUnknown_819A4E1 - callstd 4 + msgbox gUnknown_819A4E1 release end diff --git a/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc index 1e026f8f2..b7721a77a 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc @@ -2,8 +2,7 @@ CinnabarIsland_PokemonLab_Lounge_MapScripts:: @ 816E2B8 .byte 0 CinnabarIsland_PokemonLab_Lounge_EventScript_16E2B9:: @ 816E2B9 - loadword 0, gUnknown_8199FB3 - callstd 2 + msgbox gUnknown_8199FB3, 2 end CinnabarIsland_PokemonLab_Lounge_EventScript_16E2C2:: @ 816E2C2 @@ -13,8 +12,7 @@ CinnabarIsland_PokemonLab_Lounge_EventScript_16E2C2:: @ 816E2C2 call EventScript_1A8CAD checkflag FLAG_0x274 goto_if 1, EventScript_16E334 - loadword 0, gUnknown_81A59FE - callstd 5 + msgbox gUnknown_81A59FE, 5 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16E31C call EventScript_1A8CBD @@ -24,28 +22,24 @@ CinnabarIsland_PokemonLab_Lounge_EventScript_16E2C2:: @ 816E2C2 compare_var_to_var VAR_RESULT, VAR_0x8009 goto_if 5, EventScript_16E326 call EventScript_1A8CD9 - loadword 0, gUnknown_81A5A9D - callstd 4 + msgbox gUnknown_81A5A9D setflag FLAG_0x274 release end EventScript_16E31C:: @ 816E31C - loadword 0, gUnknown_81A5A4E - callstd 4 + msgbox gUnknown_81A5A4E release end EventScript_16E326:: @ 816E326 getspeciesname 0, 32777 - loadword 0, gUnknown_81A5A6A - callstd 4 + msgbox gUnknown_81A5A6A release end EventScript_16E334:: @ 816E334 - loadword 0, gUnknown_81A5AA5 - callstd 4 + msgbox gUnknown_81A5AA5 release end @@ -58,8 +52,7 @@ CinnabarIsland_PokemonLab_Lounge_EventScript_16E33E:: @ 816E33E copyvar VAR_0x8009, VAR_RESULT checkflag FLAG_0x275 goto_if 1, EventScript_16E3D4 - loadword 0, gUnknown_81A5AD6 - callstd 5 + msgbox gUnknown_81A5AD6, 5 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16E3BC special sub_80BF8FC @@ -77,27 +70,23 @@ CinnabarIsland_PokemonLab_Lounge_EventScript_16E33E:: @ 816E33E special sub_8053D68 special sub_8054440 waitstate - loadword 0, gUnknown_81A5B4A - callstd 4 + msgbox gUnknown_81A5B4A setflag FLAG_0x275 release end EventScript_16E3BC:: @ 816E3BC - loadword 0, gUnknown_81A5B08 - callstd 4 + msgbox gUnknown_81A5B08 release end EventScript_16E3C6:: @ 816E3C6 getspeciesname 0, 32777 - loadword 0, gUnknown_81A5B18 - callstd 4 + msgbox gUnknown_81A5B18 release end EventScript_16E3D4:: @ 816E3D4 - loadword 0, gUnknown_81A5B60 - callstd 4 + msgbox gUnknown_81A5B60 release end diff --git a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/scripts.inc index b331e96e8..e390fd266 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/scripts.inc @@ -6,16 +6,13 @@ CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3DF:: @ 816E3DF end CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3E5:: @ 816E3E5 - loadword 0, gUnknown_819A015 - callstd 2 + msgbox gUnknown_819A015, 2 end CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3EE:: @ 816E3EE - loadword 0, gUnknown_819A04A - callstd 3 + msgbox gUnknown_819A04A, 3 end CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3F7:: @ 816E3F7 - loadword 0, gUnknown_819A128 - callstd 3 + msgbox gUnknown_819A128, 3 end diff --git a/data/maps/DiglettsCave_NorthEntrance/scripts.inc b/data/maps/DiglettsCave_NorthEntrance/scripts.inc index ec49e53d3..890c5183c 100644 --- a/data/maps/DiglettsCave_NorthEntrance/scripts.inc +++ b/data/maps/DiglettsCave_NorthEntrance/scripts.inc @@ -2,6 +2,5 @@ DiglettsCave_NorthEntrance_MapScripts:: @ 8160EE7 .byte 0 DiglettsCave_NorthEntrance_EventScript_160EE8:: @ 8160EE8 - loadword 0, gUnknown_817462C - callstd 2 + msgbox gUnknown_817462C, 2 end diff --git a/data/maps/DiglettsCave_SouthEntrance/scripts.inc b/data/maps/DiglettsCave_SouthEntrance/scripts.inc index ebdb29ecd..0aab02b7f 100644 --- a/data/maps/DiglettsCave_SouthEntrance/scripts.inc +++ b/data/maps/DiglettsCave_SouthEntrance/scripts.inc @@ -2,6 +2,5 @@ DiglettsCave_SouthEntrance_MapScripts:: @ 8160EFB .byte 0 DiglettsCave_SouthEntrance_EventScript_160EFC:: @ 8160EFC - loadword 0, gUnknown_81746A7 - callstd 2 + msgbox gUnknown_81746A7, 2 end diff --git a/data/maps/FiveIsland/scripts.inc b/data/maps/FiveIsland/scripts.inc index bfc0af50b..916cba8a1 100644 --- a/data/maps/FiveIsland/scripts.inc +++ b/data/maps/FiveIsland/scripts.inc @@ -7,16 +7,13 @@ FiveIsland_MapScript1_167E94:: @ 8167E94 end FiveIsland_EventScript_167E98:: @ 8167E98 - loadword 0, gUnknown_8182DFB - callstd 3 + msgbox gUnknown_8182DFB, 3 end FiveIsland_EventScript_167EA1:: @ 8167EA1 - loadword 0, gUnknown_8182E26 - callstd 2 + msgbox gUnknown_8182E26, 2 end FiveIsland_EventScript_167EAA:: @ 8167EAA - loadword 0, gUnknown_8182E96 - callstd 2 + msgbox gUnknown_8182E96, 2 end diff --git a/data/maps/FiveIsland_House1/scripts.inc b/data/maps/FiveIsland_House1/scripts.inc index 3fc45b489..4f34587d7 100644 --- a/data/maps/FiveIsland_House1/scripts.inc +++ b/data/maps/FiveIsland_House1/scripts.inc @@ -2,6 +2,5 @@ FiveIsland_House1_MapScripts:: @ 8171D56 .byte 0 FiveIsland_House1_EventScript_171D57:: @ 8171D57 - loadword 0, gUnknown_81A3CAC - callstd 2 + msgbox gUnknown_81A3CAC, 2 end diff --git a/data/maps/FiveIsland_House2/scripts.inc b/data/maps/FiveIsland_House2/scripts.inc index 7197ed54b..e46909905 100644 --- a/data/maps/FiveIsland_House2/scripts.inc +++ b/data/maps/FiveIsland_House2/scripts.inc @@ -2,6 +2,5 @@ FiveIsland_House2_MapScripts:: @ 8171D60 .byte 0 FiveIsland_House2_EventScript_171D61:: @ 8171D61 - loadword 0, gUnknown_81A3D5E - callstd 2 + msgbox gUnknown_81A3D5E, 2 end diff --git a/data/maps/FiveIsland_LostCave_Room1/scripts.inc b/data/maps/FiveIsland_LostCave_Room1/scripts.inc index 45f90afca..49ab5a14f 100644 --- a/data/maps/FiveIsland_LostCave_Room1/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Room1/scripts.inc @@ -3,6 +3,5 @@ FiveIsland_LostCave_Room1_MapScripts:: @ 8164BF6 FiveIsland_LostCave_Room1_EventScript_164BF7:: @ 8164BF7 trainerbattle 0, 607, 0, Text_17CEF5, Text_17CF42 - loadword 0, gUnknown_817CF54 - callstd 6 + msgbox gUnknown_817CF54, 6 end diff --git a/data/maps/FiveIsland_LostCave_Room10/scripts.inc b/data/maps/FiveIsland_LostCave_Room10/scripts.inc index c13f2f97e..d5b03e7ff 100644 --- a/data/maps/FiveIsland_LostCave_Room10/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Room10/scripts.inc @@ -24,14 +24,12 @@ EventScript_164C52:: @ 8164C52 delay 100 applymovement 1, Movement_164CC8 waitmovement 0 - loadword 0, gUnknown_817D062 - callstd 4 + msgbox gUnknown_817D062 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 goto_if 1, EventScript_164CB6 trainerbattle 3, 606, 0, Text_17D086 - loadword 0, gUnknown_817D0B2 - callstd 4 + msgbox gUnknown_817D0B2 closemessage call EventScript_164CA5 warp MAP_FIVE_ISLAND_RESORT_GORGEOUS, 255, 39, 10 diff --git a/data/maps/FiveIsland_LostCave_Room4/scripts.inc b/data/maps/FiveIsland_LostCave_Room4/scripts.inc index 970e572d2..68104231a 100644 --- a/data/maps/FiveIsland_LostCave_Room4/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Room4/scripts.inc @@ -3,6 +3,5 @@ FiveIsland_LostCave_Room4_MapScripts:: @ 8164C10 FiveIsland_LostCave_Room4_EventScript_164C11:: @ 8164C11 trainerbattle 0, 608, 0, Text_17CFC1, Text_17CFFB - loadword 0, gUnknown_817D037 - callstd 6 + msgbox gUnknown_817D037, 6 end diff --git a/data/maps/FiveIsland_Meadow/scripts.inc b/data/maps/FiveIsland_Meadow/scripts.inc index c7b031158..2f272b58a 100644 --- a/data/maps/FiveIsland_Meadow/scripts.inc +++ b/data/maps/FiveIsland_Meadow/scripts.inc @@ -13,8 +13,7 @@ FiveIsland_Meadow_EventScript_168942:: @ 8168942 goto_if 1, EventScript_168979 checkflag FLAG_0x2D8 goto_if 1, EventScript_16895F - loadword 0, gUnknown_818AB8E - callstd 4 + msgbox gUnknown_818AB8E releaseall end @@ -31,8 +30,7 @@ EventScript_16895F:: @ 816895F end EventScript_168979:: @ 8168979 - loadword 0, gUnknown_818AC62 - callstd 4 + msgbox gUnknown_818AC62 releaseall end @@ -42,18 +40,15 @@ EventScript_168983:: @ 8168983 FiveIsland_Meadow_EventScript_16898D:: @ 816898D trainerbattle 0, 567, 0, Text_18AC88, Text_18ACB3 - loadword 0, gUnknown_818ACC5 - callstd 6 + msgbox gUnknown_818ACC5, 6 end FiveIsland_Meadow_EventScript_1689A4:: @ 81689A4 trainerbattle 0, 568, 0, Text_18ACF0, Text_18AD39 - loadword 0, gUnknown_818AD59 - callstd 6 + msgbox gUnknown_818AD59, 6 end FiveIsland_Meadow_EventScript_1689BB:: @ 81689BB trainerbattle 0, 569, 0, Text_18ADC6, Text_18ADFB - loadword 0, gUnknown_818AE16 - callstd 6 + msgbox gUnknown_818AE16, 6 end diff --git a/data/maps/FiveIsland_MemorialPillar/scripts.inc b/data/maps/FiveIsland_MemorialPillar/scripts.inc index 31751dff4..1435ba64b 100644 --- a/data/maps/FiveIsland_MemorialPillar/scripts.inc +++ b/data/maps/FiveIsland_MemorialPillar/scripts.inc @@ -7,30 +7,25 @@ FiveIsland_MemorialPillar_EventScript_1689D3:: @ 81689D3 goto_if 1, EventScript_168A18 checkflag FLAG_0x2D7 goto_if 1, EventScript_168A22 - loadword 0, gUnknown_818B02E - callstd 4 + msgbox gUnknown_818B02E closemessage applymovement 1, Movement_1A75E1 waitmovement 0 delay 45 - loadword 0, gUnknown_818B03C - callstd 4 + msgbox gUnknown_818B03C applymovement 1, Movement_1A75E9 waitmovement 0 - loadword 0, gUnknown_818B05E - callstd 4 + msgbox gUnknown_818B05E release end EventScript_168A18:: @ 8168A18 - loadword 0, gUnknown_818B2DA - callstd 4 + msgbox gUnknown_818B2DA release end EventScript_168A22:: @ 8168A22 - loadword 0, gUnknown_818B282 - callstd 4 + msgbox gUnknown_818B282 setorcopyvar VAR_0x8000, 330 setorcopyvar VAR_0x8001, 1 callstd 0 @@ -50,8 +45,7 @@ FiveIsland_MemorialPillar_EventScript_168A48:: @ 8168A48 goto_if 1, EventScript_168B0B checkflag FLAG_0x2D7 goto_if 1, EventScript_168B0B - loadword 0, gUnknown_818B095 - callstd 4 + msgbox gUnknown_818B095 checkitem ITEM_LEMONADE, 1 compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_168A86 @@ -59,8 +53,7 @@ FiveIsland_MemorialPillar_EventScript_168A48:: @ 8168A48 end EventScript_168A86:: @ 8168A86 - loadword 0, gUnknown_818B105 - callstd 5 + msgbox gUnknown_818B105, 5 compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_168A9B releaseall @@ -68,8 +61,7 @@ EventScript_168A86:: @ 8168A86 EventScript_168A9B:: @ 8168A9B removeitem ITEM_LEMONADE, 1 - loadword 0, gUnknown_818B13E - callstd 4 + msgbox gUnknown_818B13E closemessage applymovement 1, Movement_1A75EB waitmovement 0 @@ -77,8 +69,7 @@ EventScript_168A9B:: @ 8168A9B applymovement 255, Movement_1A75E7 waitmovement 0 textcolor 0 - loadword 0, gUnknown_818B171 - callstd 4 + msgbox gUnknown_818B171 setorcopyvar VAR_0x8000, 330 setorcopyvar VAR_0x8001, 1 callstd 0 @@ -89,8 +80,7 @@ EventScript_168A9B:: @ 8168A9B end EventScript_168AE8:: @ 8168AE8 - loadword 0, gUnknown_818B219 - callstd 4 + msgbox gUnknown_818B219 applymovement 1, Movement_1A75E9 waitmovement 0 setflag FLAG_0x236 @@ -98,13 +88,11 @@ EventScript_168AE8:: @ 8168AE8 EventScript_168AFE:: @ 8168AFE setflag FLAG_0x2D7 - loadword 0, gUnknown_818B23E - callstd 4 + msgbox gUnknown_818B23E releaseall end EventScript_168B0B:: @ 8168B0B - loadword 0, gUnknown_818B2F8 - callstd 4 + msgbox gUnknown_818B2F8 releaseall end diff --git a/data/maps/FiveIsland_PokemonCenter_1F/scripts.inc b/data/maps/FiveIsland_PokemonCenter_1F/scripts.inc index dd2883022..831a9d326 100644 --- a/data/maps/FiveIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/FiveIsland_PokemonCenter_1F/scripts.inc @@ -15,11 +15,9 @@ FiveIsland_PokemonCenter_1F_EventScript_171D00:: @ 8171D00 end FiveIsland_PokemonCenter_1F_EventScript_171D09:: @ 8171D09 - loadword 0, gUnknown_81A3BBA - callstd 2 + msgbox gUnknown_81A3BBA, 2 end FiveIsland_PokemonCenter_1F_EventScript_171D12:: @ 8171D12 - loadword 0, gUnknown_81A3BFD - callstd 2 + msgbox gUnknown_81A3BFD, 2 end diff --git a/data/maps/FiveIsland_ResortGorgeous/scripts.inc b/data/maps/FiveIsland_ResortGorgeous/scripts.inc index ec8cea449..a37695954 100644 --- a/data/maps/FiveIsland_ResortGorgeous/scripts.inc +++ b/data/maps/FiveIsland_ResortGorgeous/scripts.inc @@ -18,8 +18,7 @@ FiveIsland_ResortGorgeous_MapScript2_1687FE:: @ 81687FE EventScript_168808:: @ 8168808 lockall textcolor 1 - loadword 0, gUnknown_818A7DB - callstd 4 + msgbox gUnknown_818A7DB closemessage applymovement 8, Movement_1A75E9 waitmovement 0 @@ -41,6 +40,5 @@ Movement_168841:: @ 8168841 step_end FiveIsland_ResortGorgeous_EventScript_168844:: @ 8168844 - loadword 0, gUnknown_818A7FE - callstd 3 + msgbox gUnknown_818A7FE, 3 end diff --git a/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc b/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc index 63e2e0a1b..76f62155e 100644 --- a/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc +++ b/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc @@ -14,21 +14,18 @@ FiveIsland_ResortGorgeous_House_EventScript_171EBE:: @ 8171EBE goto_if 1, EventScript_171F0B compare_var_to_value VAR_STORAGE_UNKNOWN, 0 goto_if 5, EventScript_171F19 - loadword 0, gUnknown_81A42A0 - callstd 4 + msgbox gUnknown_81A42A0 goto EventScript_171EFE end EventScript_171EFE:: @ 8171EFE special sub_80CB0A8 - loadword 0, gUnknown_81A4315 - callstd 4 + msgbox gUnknown_81A4315 release end EventScript_171F0B:: @ 8171F0B - loadword 0, gUnknown_81A437A - callstd 4 + msgbox gUnknown_81A437A goto EventScript_171EFE end @@ -42,22 +39,18 @@ EventScript_171F19:: @ 8171F19 EventScript_171F34:: @ 8171F34 special sub_80CB0A8 - loadword 0, gUnknown_81A43F7 - callstd 4 + msgbox gUnknown_81A43F7 addobject 2 applymovement 2, Movement_172060 waitmovement 0 textcolor 0 - loadword 0, gUnknown_81A450B - callstd 4 + msgbox gUnknown_81A450B applymovement 1, Movement_1A75E9 waitmovement 0 textcolor 1 - loadword 0, gUnknown_81A4521 - callstd 4 + msgbox gUnknown_81A4521 textcolor 0 - loadword 0, gUnknown_81A4566 - callstd 4 + msgbox gUnknown_81A4566 closemessage compare_var_to_value VAR_FACING, 2 call_if 1, EventScript_171FCD @@ -68,8 +61,7 @@ EventScript_171F34:: @ 8171F34 compare_var_to_value VAR_FACING, 3 call_if 1, EventScript_17201A moveobjectoffscreen 2 - loadword 0, gUnknown_81A458E - callstd 4 + msgbox gUnknown_81A458E setorcopyvar VAR_0x8000, VAR_0x403B setorcopyvar VAR_0x8001, 1 callstd 0 @@ -110,19 +102,16 @@ EventScript_17201A:: @ 817201A EventScript_172025:: @ 8172025 textcolor 0 - loadword 0, gUnknown_81A45E8 - callstd 4 + msgbox gUnknown_81A45E8 textcolor 1 - loadword 0, gUnknown_81A461B - callstd 4 + msgbox gUnknown_81A461B setflag FLAG_0x002 setvar VAR_STORAGE_UNKNOWN, 0 release end EventScript_172043:: @ 8172043 - loadword 0, gUnknown_81A4632 - callstd 4 + msgbox gUnknown_81A4632 release end @@ -158,6 +147,5 @@ Movement_172060:: @ 8172060 step_end FiveIsland_ResortGorgeous_House_EventScript_172062:: @ 8172062 - loadword 0, gUnknown_81A4657 - callstd 2 + msgbox gUnknown_81A4657, 2 end diff --git a/data/maps/FiveIsland_RocketWarehouse/scripts.inc b/data/maps/FiveIsland_RocketWarehouse/scripts.inc index 9b6492471..ebb3c17e2 100644 --- a/data/maps/FiveIsland_RocketWarehouse/scripts.inc +++ b/data/maps/FiveIsland_RocketWarehouse/scripts.inc @@ -21,20 +21,17 @@ FiveIsland_RocketWarehouse_EventScript_163F5A:: @ 8163F5A lockall checkflag FLAG_0x2D5 goto_if 1, EventScript_163F6E - loadword 0, gUnknown_817B4E3 - callstd 4 + msgbox gUnknown_817B4E3 releaseall end EventScript_163F6E:: @ 8163F6E - loadword 0, gUnknown_817B512 - callstd 4 + msgbox gUnknown_817B512 releaseall end FiveIsland_RocketWarehouse_EventScript_163F78:: @ 8163F78 - loadword 0, gUnknown_817BB15 - callstd 3 + msgbox gUnknown_817BB15, 3 end FiveIsland_RocketWarehouse_EventScript_163F81:: @ 8163F81 @@ -49,21 +46,18 @@ FiveIsland_RocketWarehouse_EventScript_163F93:: @ 8163F93 trainerbattle 2, 545, 0, Text_17BBAF, Text_17BC55, EventScript_163FCD checkflag FLAG_0x844 goto_if 1, EventScript_163FB7 - loadword 0, gUnknown_817BCA3 - callstd 6 + msgbox gUnknown_817BCA3, 6 end EventScript_163FB7:: @ 8163FB7 setvar VAR_0x8004, 15 setvar VAR_0x8005, 5 special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_817BCD7 - callstd 6 + msgbox gUnknown_817BCD7, 6 end EventScript_163FCD:: @ 8163FCD - loadword 0, gUnknown_817BC6C - callstd 4 + msgbox gUnknown_817BC6C setflag FLAG_0x2DC setorcopyvar VAR_0x8000, 374 setorcopyvar VAR_0x8001, 1 @@ -73,28 +67,24 @@ EventScript_163FCD:: @ 8163FCD FiveIsland_RocketWarehouse_EventScript_163FE6:: @ 8163FE6 trainerbattle 0, 541, 0, Text_17B54D, Text_17B585 - loadword 0, gUnknown_817B5A6 - callstd 6 + msgbox gUnknown_817B5A6, 6 end FiveIsland_RocketWarehouse_EventScript_163FFD:: @ 8163FFD trainerbattle 0, 542, 0, Text_17B677, Text_17B6D9 - loadword 0, gUnknown_817B6EF - callstd 6 + msgbox gUnknown_817B6EF, 6 end FiveIsland_RocketWarehouse_EventScript_164014:: @ 8164014 trainerbattle 2, 544, 0, Text_17B8DA, Text_17B9FB, EventScript_16402F - loadword 0, gUnknown_817BA64 - callstd 6 + msgbox gUnknown_817BA64, 6 end EventScript_16402F:: @ 816402F getplayerxy VAR_0x8004, VAR_0x8005 compare_var_to_value VAR_0x8004, 24 call_if 3, EventScript_164065 - loadword 0, gUnknown_817BA64 - callstd 4 + msgbox gUnknown_817BA64 closemessage fadescreen 1 removeobject 1 @@ -115,14 +105,12 @@ EventScript_164065:: @ 8164065 FiveIsland_RocketWarehouse_EventScript_164070:: @ 8164070 trainerbattle 0, 516, 0, Text_17B5D6, Text_17B62F - loadword 0, gUnknown_817B642 - callstd 6 + msgbox gUnknown_817B642, 6 end FiveIsland_RocketWarehouse_EventScript_164087:: @ 8164087 trainerbattle 2, 543, 0, Text_17B72D, Text_17B79C, EventScript_1640A2 - loadword 0, gUnknown_817B7FA - callstd 6 + msgbox gUnknown_817B7FA, 6 end EventScript_1640A2:: @ 81640A2 @@ -130,8 +118,7 @@ EventScript_1640A2:: @ 81640A2 specialvar VAR_RESULT, player_get_direction_lower_nybble compare_var_to_value VAR_RESULT, 2 call_if 1, EventScript_16412E - loadword 0, gUnknown_817B7AE - callstd 4 + msgbox gUnknown_817B7AE closemessage compare_var_to_value VAR_0x8004, 24 call_if 3, EventScript_164144 @@ -153,8 +140,7 @@ EventScript_1640A2:: @ 81640A2 call_if 1, EventScript_164165 compare_var_to_value VAR_0x8004, 27 call_if 1, EventScript_164170 - loadword 0, gUnknown_817B7FA - callstd 4 + msgbox gUnknown_817B7FA release end diff --git a/data/maps/FiveIsland_WaterLabyrinth/scripts.inc b/data/maps/FiveIsland_WaterLabyrinth/scripts.inc index 0d387a3f1..99b0d18c0 100644 --- a/data/maps/FiveIsland_WaterLabyrinth/scripts.inc +++ b/data/maps/FiveIsland_WaterLabyrinth/scripts.inc @@ -12,13 +12,11 @@ FiveIsland_WaterLabyrinth_EventScript_16884E:: @ 816884E goto_if 1, EventScript_1688E3 checkflag FLAG_0x2DB goto_if 1, EventScript_16892C - loadword 0, gUnknown_818A80D - callstd 4 + msgbox gUnknown_818A80D specialvar VAR_RESULT, sub_80CA76C compare_var_to_value VAR_RESULT, 6 goto_if 1, EventScript_1688AC - loadword 0, gUnknown_818A88F - callstd 4 + msgbox gUnknown_818A88F release end @@ -26,14 +24,12 @@ EventScript_168895:: @ 8168895 setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_818AA0C - callstd 4 + msgbox gUnknown_818AA0C release end EventScript_1688AC:: @ 81688AC - loadword 0, gUnknown_818A8A6 - callstd 4 + msgbox gUnknown_818A8A6 goto EventScript_1688BA end @@ -63,15 +59,13 @@ EventScript_1688E3:: @ 81688E3 specialvar VAR_RESULT, sub_80CD0F4 compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_168895 - loadword 0, gUnknown_818A9C0 - callstd 4 + msgbox gUnknown_818A9C0 release end EventScript_16891F:: @ 816891F setflag FLAG_0x2DB - loadword 0, gUnknown_818A940 - callstd 4 + msgbox gUnknown_818A940 release end diff --git a/data/maps/FourIsland/scripts.inc b/data/maps/FourIsland/scripts.inc index 8e425a1bc..95876c737 100644 --- a/data/maps/FourIsland/scripts.inc +++ b/data/maps/FourIsland/scripts.inc @@ -39,8 +39,7 @@ EventScript_167CEC:: @ 8167CEC delay 25 applymovement 10, Movement_167D49 waitmovement 0 - loadword 0, gUnknown_8182B37 - callstd 4 + msgbox gUnknown_8182B37 closemessage applymovement 255, Movement_167D52 applymovement 10, Movement_167D4E @@ -86,22 +85,18 @@ FourIsland_EventScript_167D55:: @ 8167D55 goto_if 1, EventScript_167E0C compare_var_to_value VAR_RESULT, 3 goto_if 1, EventScript_167E19 - loadword 0, gUnknown_81BF555 - callstd 4 + msgbox gUnknown_81BF555 release end EventScript_167D9B:: @ 8167D9B - loadword 0, gUnknown_81BF5E3 - callstd 5 + msgbox gUnknown_81BF5E3, 5 compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_167DD1 - loadword 0, gUnknown_81BF7B6 - callstd 5 + msgbox gUnknown_81BF7B6, 5 compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_167DD1 - loadword 0, gUnknown_81BF6CF - callstd 4 + msgbox gUnknown_81BF6CF clearflag FLAG_PENDING_DAYCARE_EGG special RejectEggFromDayCare release @@ -111,8 +106,7 @@ EventScript_167DD1:: @ 8167DD1 specialvar VAR_RESULT, CalculatePlayerPartyCount compare_var_to_value VAR_RESULT, 6 goto_if 5, EventScript_167DEB - loadword 0, gUnknown_81BF6F0 - callstd 4 + msgbox gUnknown_81BF6F0 release end @@ -123,8 +117,7 @@ EventScript_167DEB:: @ 8167DEB playfanfare MUS_FANFA1 waitfanfare waitbuttonpress - loadword 0, gUnknown_81BF755 - callstd 4 + msgbox gUnknown_81BF755 special GiveEggFromDaycare clearflag FLAG_PENDING_DAYCARE_EGG release @@ -132,15 +125,13 @@ EventScript_167DEB:: @ 8167DEB EventScript_167E0C:: @ 8167E0C special GetDaycareMonNicknames - loadword 0, gUnknown_81BF69A - callstd 4 + msgbox gUnknown_81BF69A release end EventScript_167E19:: @ 8167E19 special GetDaycareMonNicknames - loadword 0, gUnknown_81BF789 - callstd 4 + msgbox gUnknown_81BF789 special SetDaycareCompatibilityString special sub_80CA68C waitmessage @@ -153,8 +144,7 @@ FourIsland_EventScript_167E2E:: @ 8167E2E faceplayer checkflag FLAG_0x844 goto_if 1, EventScript_167E43 - loadword 0, gUnknown_8182A2B - callstd 4 + msgbox gUnknown_8182A2B release end @@ -162,8 +152,7 @@ EventScript_167E43:: @ 8167E43 setvar VAR_0x8004, 9 setvar VAR_0x8005, 5 special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_8182A75 - callstd 4 + msgbox gUnknown_8182A75 release end @@ -173,22 +162,18 @@ FourIsland_EventScript_167E5A:: @ 8167E5A setvar VAR_0x8004, 9 setvar VAR_0x8005, 4 special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_8182CE3 - callstd 4 + msgbox gUnknown_8182CE3 release end FourIsland_EventScript_167E73:: @ 8167E73 - loadword 0, gUnknown_8182D8E - callstd 2 + msgbox gUnknown_8182D8E, 2 end FourIsland_EventScript_167E7C:: @ 8167E7C - loadword 0, gUnknown_8182A03 - callstd 3 + msgbox gUnknown_8182A03, 3 end FourIsland_EventScript_167E85:: @ 8167E85 - loadword 0, gUnknown_8182DEB - callstd 3 + msgbox gUnknown_8182DEB, 3 end diff --git a/data/maps/FourIsland_House1/scripts.inc b/data/maps/FourIsland_House1/scripts.inc index f3e4e1425..d7139c370 100644 --- a/data/maps/FourIsland_House1/scripts.inc +++ b/data/maps/FourIsland_House1/scripts.inc @@ -2,6 +2,5 @@ FourIsland_House1_MapScripts:: @ 8171C44 .byte 0 FourIsland_House1_EventScript_171C45:: @ 8171C45 - loadword 0, gUnknown_81A3802 - callstd 2 + msgbox gUnknown_81A3802, 2 end diff --git a/data/maps/FourIsland_IcefallCave_Back/scripts.inc b/data/maps/FourIsland_IcefallCave_Back/scripts.inc index 92be2f38f..b2451b2ec 100644 --- a/data/maps/FourIsland_IcefallCave_Back/scripts.inc +++ b/data/maps/FourIsland_IcefallCave_Back/scripts.inc @@ -14,13 +14,11 @@ EventScript_163D94:: @ 8163D94 FourIsland_IcefallCave_Back_EventScript_163D98:: @ 8163D98 lockall textcolor 1 - loadword 0, gUnknown_817B04F - callstd 4 + msgbox gUnknown_817B04F applymovement 1, Movement_163EE8 waitmovement 0 textcolor 0 - loadword 0, gUnknown_817B0B9 - callstd 4 + msgbox gUnknown_817B0B9 closemessage playse SE_PIN applymovement 3, Movement_1A75DB @@ -30,8 +28,7 @@ FourIsland_IcefallCave_Back_EventScript_163D98:: @ 8163D98 applymovement 3, Movement_1A75DD waitmovement 0 textcolor 1 - loadword 0, gUnknown_817B109 - callstd 4 + msgbox gUnknown_817B109 closemessage applymovement 3, Movement_1A75EB waitmovement 0 @@ -47,18 +44,15 @@ FourIsland_IcefallCave_Back_EventScript_163D98:: @ 8163D98 waitmovement 0 playbgm BGM_FRLG_SUSPICIOUS_EYE, 0 textcolor 0 - loadword 0, gUnknown_817B20B - callstd 4 + msgbox gUnknown_817B20B setvar VAR_LAST_TALKED, 4 trainerbattle 3, 539, 0, Text_17B251 applymovement 3, Movement_163F1B waitmovement 0 textcolor 1 - loadword 0, gUnknown_817B269 - callstd 4 + msgbox gUnknown_817B269 textcolor 0 - loadword 0, gUnknown_817B2EF - callstd 4 + msgbox gUnknown_817B2EF textcolor 1 message Text_17B313 waitmessage @@ -69,8 +63,7 @@ FourIsland_IcefallCave_Back_EventScript_163D98:: @ 8163D98 applymovement 1, Movement_163EEE waitmovement 0 textcolor 0 - loadword 0, gUnknown_817B399 - callstd 4 + msgbox gUnknown_817B399 closemessage applymovement 3, Movement_163F1D applymovement 255, Movement_163EE2 @@ -87,8 +80,7 @@ FourIsland_IcefallCave_Back_EventScript_163D98:: @ 8163D98 applymovement 255, Movement_1A75E7 waitmovement 0 textcolor 1 - loadword 0, gUnknown_817B457 - callstd 4 + msgbox gUnknown_817B457 setflag FLAG_0x08E clearflag FLAG_0x08C setvar VAR_0x4080, 1 @@ -196,6 +188,5 @@ Movement_163F23:: @ 8163F23 step_end FourIsland_IcefallCave_Back_EventScript_163F25:: @ 8163F25 - loadword 0, gUnknown_817B457 - callstd 2 + msgbox gUnknown_817B457, 2 end diff --git a/data/maps/FourIsland_LoreleisHouse/scripts.inc b/data/maps/FourIsland_LoreleisHouse/scripts.inc index 1241dca8c..d8dc716e3 100644 --- a/data/maps/FourIsland_LoreleisHouse/scripts.inc +++ b/data/maps/FourIsland_LoreleisHouse/scripts.inc @@ -13,27 +13,23 @@ FourIsland_LoreleisHouse_EventScript_171C58:: @ 8171C58 goto_if 1, EventScript_171C83 checkflag FLAG_0x2D5 goto_if 1, EventScript_171C76 - loadword 0, gUnknown_81A3826 - callstd 4 + msgbox gUnknown_81A3826 release end EventScript_171C76:: @ 8171C76 setflag FLAG_0x2D4 - loadword 0, gUnknown_81A390C - callstd 4 + msgbox gUnknown_81A390C release end EventScript_171C83:: @ 8171C83 - loadword 0, gUnknown_81A39D8 - callstd 4 + msgbox gUnknown_81A39D8 release end FourIsland_LoreleisHouse_EventScript_171C8D:: @ 8171C8D lock - loadword 0, gUnknown_81A3A42 - callstd 4 + msgbox gUnknown_81A3A42 release end diff --git a/data/maps/FourIsland_Mart/scripts.inc b/data/maps/FourIsland_Mart/scripts.inc index a99909c14..6e563b6dd 100644 --- a/data/maps/FourIsland_Mart/scripts.inc +++ b/data/maps/FourIsland_Mart/scripts.inc @@ -10,8 +10,7 @@ FourIsland_Mart_EventScript_171CAE:: @ 8171CAE message Text_1A6211 waitmessage pokemart Items_171CD4 - loadword 0, gUnknown_81A5190 - callstd 4 + msgbox gUnknown_81A5190 release end @@ -30,6 +29,5 @@ Items_171CD4:: @ 8171CD4 end FourIsland_Mart_EventScript_171CE8:: @ 8171CE8 - loadword 0, gUnknown_81A3B14 - callstd 2 + msgbox gUnknown_81A3B14, 2 end diff --git a/data/maps/FourIsland_PokemonCenter_1F/scripts.inc b/data/maps/FourIsland_PokemonCenter_1F/scripts.inc index c1f9ba768..9d085d183 100644 --- a/data/maps/FourIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/FourIsland_PokemonCenter_1F/scripts.inc @@ -15,16 +15,13 @@ FourIsland_PokemonCenter_1F_EventScript_171BF9:: @ 8171BF9 end FourIsland_PokemonCenter_1F_EventScript_171C02:: @ 8171C02 - loadword 0, gUnknown_81A3627 - callstd 2 + msgbox gUnknown_81A3627, 2 end FourIsland_PokemonCenter_1F_EventScript_171C0B:: @ 8171C0B - loadword 0, gUnknown_81A3697 - callstd 2 + msgbox gUnknown_81A3697, 2 end FourIsland_PokemonCenter_1F_EventScript_171C14:: @ 8171C14 - loadword 0, gUnknown_81A3734 - callstd 2 + msgbox gUnknown_81A3734, 2 end diff --git a/data/maps/FourIsland_PokemonDayCare/scripts.inc b/data/maps/FourIsland_PokemonDayCare/scripts.inc index 7b21a7ee2..0f9b98916 100644 --- a/data/maps/FourIsland_PokemonDayCare/scripts.inc +++ b/data/maps/FourIsland_PokemonDayCare/scripts.inc @@ -14,12 +14,10 @@ FourIsland_PokemonDayCare_EventScript_171940:: @ 8171940 goto_if 1, EventScript_171A52 compare_var_to_value VAR_RESULT, 3 goto_if 1, EventScript_171B86 - loadword 0, gUnknown_81BF7E4 - callstd 5 + msgbox gUnknown_81BF7E4, 5 compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_171993 - loadword 0, gUnknown_81BF916 - callstd 4 + msgbox gUnknown_81BF916 release end @@ -27,8 +25,7 @@ EventScript_171993:: @ 8171993 specialvar VAR_RESULT, CountPartyNonEggMons compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_171A1A - loadword 0, gUnknown_81BF839 - callstd 4 + msgbox gUnknown_81BF839 fadescreen 1 special ChooseSendDaycareMon waitstate @@ -40,8 +37,7 @@ EventScript_171993:: @ 8171993 specialvar VAR_0x8005, GetSelectedMonNickAndSpecies waitse playmoncry 32773, 0 - loadword 0, gUnknown_81BF860 - callstd 4 + msgbox gUnknown_81BF860 waitmoncry special StoreSelectedPokemonInDaycare incrementgamestat 47 @@ -52,40 +48,34 @@ EventScript_171993:: @ 8171993 end EventScript_1719F7:: @ 81719F7 - loadword 0, gUnknown_81BF976 - callstd 4 + msgbox gUnknown_81BF976 release end EventScript_171A01:: @ 8171A01 - loadword 0, gUnknown_81BF89F - callstd 5 + msgbox gUnknown_81BF89F, 5 compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_171993 goto EventScript_1719F7 end EventScript_171A1A:: @ 8171A1A - loadword 0, gUnknown_81BFAAD - callstd 4 + msgbox gUnknown_81BFAAD release end EventScript_171A24:: @ 8171A24 - loadword 0, gUnknown_81BFB09 - callstd 4 + msgbox gUnknown_81BFB09 release end EventScript_171A2E:: @ 8171A2E - loadword 0, gUnknown_81BF8F6 - callstd 4 + msgbox gUnknown_81BF8F6 release end EventScript_171A38:: @ 8171A38 - loadword 0, gUnknown_81BF9CC - callstd 4 + msgbox gUnknown_81BF9CC return EventScript_171A41:: @ 8171A41 @@ -95,16 +85,13 @@ EventScript_171A41:: @ 8171A41 return EventScript_171A52:: @ 8171A52 - loadword 0, gUnknown_81BF988 - callstd 4 + msgbox gUnknown_81BF988 setvar VAR_0x8004, 0 call EventScript_171A41 - loadword 0, gUnknown_81BF89F - callstd 5 + msgbox gUnknown_81BF89F, 5 compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_171993 - loadword 0, gUnknown_81BFAE8 - callstd 5 + msgbox gUnknown_81BFAE8, 5 compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_171A90 goto EventScript_1719F7 @@ -128,8 +115,7 @@ EventScript_171A90:: @ 8171A90 EventScript_171ACF:: @ 8171ACF special GetDaycareCost - loadword 0, gUnknown_81BFA3B - callstd 5 + msgbox gUnknown_81BFA3B, 5 compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_171AEB goto EventScript_1719F7 @@ -139,8 +125,7 @@ EventScript_171AEB:: @ 8171AEB specialvar VAR_RESULT, IsEnoughForCostInVar0x8005 compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_171B05 - loadword 0, gUnknown_81BF932 - callstd 4 + msgbox gUnknown_81BF932 release end @@ -150,13 +135,11 @@ EventScript_171B05:: @ 8171B05 specialvar VAR_RESULT, TakePokemonFromDaycare special SubtractMoneyFromVar0x8005 playse SE_T_KAMI2 - loadword 0, gUnknown_81BFA67 - callstd 4 + msgbox gUnknown_81BFA67 waitse playmoncry 32781, 0 textcolor 3 - loadword 0, gUnknown_81BFA85 - callstd 4 + msgbox gUnknown_81BFA85 call EventScript_1A6675 waitmoncry specialvar VAR_RESULT, GetDaycareState @@ -166,16 +149,14 @@ EventScript_171B05:: @ 8171B05 end EventScript_171B4E:: @ 8171B4E - loadword 0, gUnknown_81BF94F - callstd 5 + msgbox gUnknown_81BF94F, 5 compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_171A90 goto EventScript_1719F7 end EventScript_171B67:: @ 8171B67 - loadword 0, gUnknown_81BF9EF - callstd 4 + msgbox gUnknown_81BF9EF release end @@ -205,18 +186,15 @@ EventScript_171B85:: @ 8171B85 end EventScript_171B86:: @ 8171B86 - loadword 0, gUnknown_81BF988 - callstd 4 + msgbox gUnknown_81BF988 setvar VAR_0x8004, 0 call EventScript_171A41 setvar VAR_0x8004, 1 call EventScript_171A41 - loadword 0, gUnknown_81BFAE8 - callstd 5 + msgbox gUnknown_81BFAE8, 5 compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_171A90 - loadword 0, gUnknown_81BF976 - callstd 4 + msgbox gUnknown_81BF976 release end @@ -227,9 +205,7 @@ EventScript_171BBF:: @ 8171BBF goto_if 1, EventScript_1719F7 copyvar VAR_0x8004, VAR_RESULT specialvar VAR_RESULT, TakePokemonFromDaycare - loadword 0, gUnknown_81BFA67 - callstd 4 - loadword 0, gUnknown_81BF976 - callstd 4 + msgbox gUnknown_81BFA67 + msgbox gUnknown_81BF976 release end diff --git a/data/maps/FuchsiaCity/scripts.inc b/data/maps/FuchsiaCity/scripts.inc index 4a6245159..5fd7aa5cc 100644 --- a/data/maps/FuchsiaCity/scripts.inc +++ b/data/maps/FuchsiaCity/scripts.inc @@ -19,23 +19,19 @@ EventScript_166D97:: @ 8166D97 return FuchsiaCity_EventScript_166D9D:: @ 8166D9D - loadword 0, gUnknown_818056E - callstd 2 + msgbox gUnknown_818056E, 2 end FuchsiaCity_EventScript_166DA6:: @ 8166DA6 - loadword 0, gUnknown_81805C6 - callstd 2 + msgbox gUnknown_81805C6, 2 end FuchsiaCity_EventScript_166DAF:: @ 8166DAF - loadword 0, gUnknown_818062C - callstd 2 + msgbox gUnknown_818062C, 2 end FuchsiaCity_EventScript_166DB8:: @ 8166DB8 - loadword 0, gUnknown_818065A - callstd 2 + msgbox gUnknown_818065A, 2 end FuchsiaCity_EventScript_166DC1:: @ 8166DC1 @@ -44,34 +40,28 @@ FuchsiaCity_EventScript_166DC1:: @ 8166DC1 setvar VAR_0x8004, 6 setvar VAR_0x8005, 3 special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_8180ABD - callstd 4 + msgbox gUnknown_8180ABD release end FuchsiaCity_EventScript_166DDA:: @ 8166DDA - loadword 0, gUnknown_81806AB - callstd 3 + msgbox gUnknown_81806AB, 3 end FuchsiaCity_EventScript_166DE3:: @ 8166DE3 - loadword 0, gUnknown_81806D3 - callstd 3 + msgbox gUnknown_81806D3, 3 end FuchsiaCity_EventScript_166DEC:: @ 8166DEC - loadword 0, gUnknown_81806F0 - callstd 3 + msgbox gUnknown_81806F0, 3 end FuchsiaCity_EventScript_166DF5:: @ 8166DF5 - loadword 0, gUnknown_818070D - callstd 3 + msgbox gUnknown_818070D, 3 end EventScript_166DFE:: @ 8166DFE - loadword 0, gUnknown_8180727 - callstd 3 + msgbox gUnknown_8180727, 3 end FuchsiaCity_EventScript_166E07:: @ 8166E07 @@ -79,8 +69,7 @@ FuchsiaCity_EventScript_166E07:: @ 8166E07 setvar VAR_0x8004, 6 setvar VAR_0x8005, 0 special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_8180768 - callstd 4 + msgbox gUnknown_8180768 releaseall end @@ -89,8 +78,7 @@ FuchsiaCity_EventScript_166E1F:: @ 8166E1F setvar VAR_0x8004, 113 special sub_80CBDCC drawmonpic SPECIES_CHANSEY, 10, 3 - loadword 0, gUnknown_81807A9 - callstd 4 + msgbox gUnknown_81807A9 erasemonpic releaseall end @@ -100,8 +88,7 @@ FuchsiaCity_EventScript_166E38:: @ 8166E38 setvar VAR_0x8004, 100 special sub_80CBDCC drawmonpic SPECIES_VOLTORB, 10, 3 - loadword 0, gUnknown_81807D9 - callstd 4 + msgbox gUnknown_81807D9 erasemonpic releaseall end @@ -111,8 +98,7 @@ FuchsiaCity_EventScript_166E51:: @ 8166E51 setvar VAR_0x8004, 115 special sub_80CBDCC drawmonpic SPECIES_KANGASKHAN, 10, 3 - loadword 0, gUnknown_8180806 - callstd 4 + msgbox gUnknown_8180806 erasemonpic releaseall end @@ -122,8 +108,7 @@ FuchsiaCity_EventScript_166E6A:: @ 8166E6A setvar VAR_0x8004, 79 special sub_80CBDCC drawmonpic SPECIES_SLOWPOKE, 10, 3 - loadword 0, gUnknown_8180859 - callstd 4 + msgbox gUnknown_8180859 erasemonpic releaseall end @@ -133,8 +118,7 @@ FuchsiaCity_EventScript_166E83:: @ 8166E83 setvar VAR_0x8004, 131 special sub_80CBDCC drawmonpic SPECIES_LAPRAS, 10, 3 - loadword 0, gUnknown_8180887 - callstd 4 + msgbox gUnknown_8180887 erasemonpic releaseall end @@ -146,8 +130,7 @@ FuchsiaCity_EventScript_166E9C:: @ 8166E9C setvar VAR_0x8004, 140 special sub_80CBDCC drawmonpic SPECIES_KABUTO, 10, 3 - loadword 0, gUnknown_81808FA - callstd 4 + msgbox gUnknown_81808FA erasemonpic releaseall end @@ -156,8 +139,7 @@ EventScript_166EBE:: @ 8166EBE setvar VAR_0x8004, 138 special sub_80CBDCC drawmonpic SPECIES_OMANYTE, 10, 3 - loadword 0, gUnknown_81808AE - callstd 4 + msgbox gUnknown_81808AE erasemonpic releaseall end diff --git a/data/maps/FuchsiaCity_Building1/scripts.inc b/data/maps/FuchsiaCity_Building1/scripts.inc index df15b2d46..b40aa2620 100644 --- a/data/maps/FuchsiaCity_Building1/scripts.inc +++ b/data/maps/FuchsiaCity_Building1/scripts.inc @@ -8,8 +8,7 @@ FuchsiaCity_Building1_EventScript_16D74C:: @ 816D74C goto_if 1, EventScript_16D7FA checkflag FLAG_0x189 goto_if 1, EventScript_16D780 - loadword 0, gUnknown_8198DF9 - callstd 5 + msgbox gUnknown_8198DF9, 5 compare_var_to_value VAR_RESULT, 1 call_if 1, EventScript_16D7E8 compare_var_to_value VAR_RESULT, 0 @@ -23,8 +22,7 @@ EventScript_16D780:: @ 816D780 message Text_198E84 waitmessage waitfanfare - loadword 0, gUnknown_8198EAA - callstd 4 + msgbox gUnknown_8198EAA call EventScript_1A6675 checkplayergender compare_var_to_value VAR_RESULT, 0 @@ -39,37 +37,30 @@ EventScript_16D780:: @ 816D780 end EventScript_16D7D6:: @ 816D7D6 - loadword 0, gUnknown_8198ECA - callstd 4 + msgbox gUnknown_8198ECA return EventScript_16D7DF:: @ 816D7DF - loadword 0, gUnknown_8198F96 - callstd 4 + msgbox gUnknown_8198F96 return EventScript_16D7E8:: @ 816D7E8 - loadword 0, gUnknown_8198E3F - callstd 4 + msgbox gUnknown_8198E3F return EventScript_16D7F1:: @ 816D7F1 - loadword 0, gUnknown_8198E63 - callstd 4 + msgbox gUnknown_8198E63 return EventScript_16D7FA:: @ 816D7FA - loadword 0, gUnknown_819908A - callstd 4 + msgbox gUnknown_819908A release end FuchsiaCity_Building1_EventScript_16D804:: @ 816D804 - loadword 0, gUnknown_819913C - callstd 3 + msgbox gUnknown_819913C, 3 end FuchsiaCity_Building1_EventScript_16D80D:: @ 816D80D - loadword 0, gUnknown_8199167 - callstd 3 + msgbox gUnknown_8199167, 3 end diff --git a/data/maps/FuchsiaCity_Gym/scripts.inc b/data/maps/FuchsiaCity_Gym/scripts.inc index ff59fdb4b..0d9f6b583 100644 --- a/data/maps/FuchsiaCity_Gym/scripts.inc +++ b/data/maps/FuchsiaCity_Gym/scripts.inc @@ -8,8 +8,7 @@ FuchsiaCity_Gym_EventScript_16D54E:: @ 816D54E trainerbattle 1, 418, 0, Text_19832E, Text_198444, EventScript_16D580 checkflag FLAG_0x259 goto_if 0, EventScript_16D5A6 - loadword 0, gUnknown_8198481 - callstd 4 + msgbox gUnknown_8198481 release end @@ -26,35 +25,30 @@ EventScript_16D580:: @ 816D580 end EventScript_16D5A6:: @ 816D5A6 - loadword 0, gUnknown_819850E - callstd 4 + msgbox gUnknown_819850E checkitemspace ITEM_TM06, 1 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16D5E7 additem ITEM_TM06, 1 giveitemfanfaremsg gUnknown_819858F, ITEM_TM06 setflag FLAG_0x259 - loadword 0, gUnknown_81985AB - callstd 4 + msgbox gUnknown_81985AB release end EventScript_16D5E7:: @ 816D5E7 - loadword 0, gUnknown_819860D - callstd 4 + msgbox gUnknown_819860D release end FuchsiaCity_Gym_EventScript_16D5F1:: @ 816D5F1 trainerbattle 0, 294, 0, Text_198866, Text_1988B6 - loadword 0, gUnknown_81988CB - callstd 6 + msgbox gUnknown_81988CB, 6 end FuchsiaCity_Gym_EventScript_16D608:: @ 816D608 trainerbattle 0, 295, 0, Text_19891F, Text_19897F - loadword 0, gUnknown_8198985 - callstd 6 + msgbox gUnknown_8198985, 6 end FuchsiaCity_Gym_EventScript_16D61F:: @ 816D61F @@ -62,26 +56,22 @@ FuchsiaCity_Gym_EventScript_16D61F:: @ 816D61F setvar VAR_0x8004, 6 setvar VAR_0x8005, 2 special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_8198787 - callstd 6 + msgbox gUnknown_8198787, 6 end FuchsiaCity_Gym_EventScript_16D643:: @ 816D643 trainerbattle 0, 289, 0, Text_1989A1, Text_1989EA - loadword 0, gUnknown_8198A10 - callstd 6 + msgbox gUnknown_8198A10, 6 end FuchsiaCity_Gym_EventScript_16D65A:: @ 816D65A trainerbattle 0, 292, 0, Text_198629, Text_1986B4 - loadword 0, gUnknown_81986C9 - callstd 6 + msgbox gUnknown_81986C9, 6 end FuchsiaCity_Gym_EventScript_16D671:: @ 816D671 trainerbattle 0, 293, 0, Text_1987E8, Text_198812 - loadword 0, gUnknown_8198825 - callstd 6 + msgbox gUnknown_8198825, 6 end FuchsiaCity_Gym_EventScript_16D688:: @ 816D688 @@ -89,14 +79,12 @@ FuchsiaCity_Gym_EventScript_16D688:: @ 816D688 faceplayer checkflag FLAG_0x4B4 goto_if 1, EventScript_16D69D - loadword 0, gUnknown_8198A5E - callstd 4 + msgbox gUnknown_8198A5E release end EventScript_16D69D:: @ 816D69D - loadword 0, gUnknown_8198B1D - callstd 4 + msgbox gUnknown_8198B1D release end @@ -104,13 +92,11 @@ FuchsiaCity_Gym_EventScript_16D6A7:: @ 816D6A7 lockall checkflag FLAG_UNK824 goto_if 1, EventScript_16D6BB - loadword 0, gUnknown_8198B4B - callstd 4 + msgbox gUnknown_8198B4B releaseall end EventScript_16D6BB:: @ 816D6BB - loadword 0, gUnknown_8198B81 - callstd 4 + msgbox gUnknown_8198B81 releaseall end diff --git a/data/maps/FuchsiaCity_House1/scripts.inc b/data/maps/FuchsiaCity_House1/scripts.inc index 2e36ba0ee..04f996078 100644 --- a/data/maps/FuchsiaCity_House1/scripts.inc +++ b/data/maps/FuchsiaCity_House1/scripts.inc @@ -2,8 +2,7 @@ FuchsiaCity_House1_MapScripts:: @ 816D6C5 .byte 0 FuchsiaCity_House1_EventScript_16D6C6:: @ 816D6C6 - loadword 0, gUnknown_8198BBB - callstd 2 + msgbox gUnknown_8198BBB, 2 end FuchsiaCity_House1_EventScript_16D6CF:: @ 816D6CF @@ -12,12 +11,10 @@ FuchsiaCity_House1_EventScript_16D6CF:: @ 816D6CF setvar VAR_0x8004, 13 setvar VAR_0x8005, 2 special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_8198C1F - callstd 4 + msgbox gUnknown_8198C1F release end FuchsiaCity_House1_EventScript_16D6E8:: @ 816D6E8 - loadword 0, gUnknown_8198C7B - callstd 2 + msgbox gUnknown_8198C7B, 2 end diff --git a/data/maps/FuchsiaCity_House2/scripts.inc b/data/maps/FuchsiaCity_House2/scripts.inc index e9470babb..3fff1a500 100644 --- a/data/maps/FuchsiaCity_House2/scripts.inc +++ b/data/maps/FuchsiaCity_House2/scripts.inc @@ -6,37 +6,31 @@ FuchsiaCity_House2_EventScript_16D817:: @ 816D817 faceplayer checkflag FLAG_0x244 goto_if 1, EventScript_16D83F - loadword 0, gUnknown_819918E - callstd 5 + msgbox gUnknown_819918E, 5 compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_16D849 - loadword 0, gUnknown_8199337 - callstd 4 + msgbox gUnknown_8199337 release end EventScript_16D83F:: @ 816D83F - loadword 0, gUnknown_8199354 - callstd 4 + msgbox gUnknown_8199354 release end EventScript_16D849:: @ 816D849 - loadword 0, gUnknown_8199207 - callstd 4 + msgbox gUnknown_8199207 checkitemspace ITEM_GOOD_ROD, 1 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16D88A additem ITEM_GOOD_ROD, 1 giveitemfanfaremsg gUnknown_819925E, ITEM_GOOD_ROD - loadword 0, gUnknown_8199296 - callstd 4 + msgbox gUnknown_8199296 setflag FLAG_0x244 release end EventScript_16D88A:: @ 816D88A - loadword 0, gUnknown_819937E - callstd 4 + msgbox gUnknown_819937E release end diff --git a/data/maps/FuchsiaCity_House3/scripts.inc b/data/maps/FuchsiaCity_House3/scripts.inc index 31632f029..0fafd5bd0 100644 --- a/data/maps/FuchsiaCity_House3/scripts.inc +++ b/data/maps/FuchsiaCity_House3/scripts.inc @@ -4,16 +4,14 @@ FuchsiaCity_House3_MapScripts:: @ 816D894 FuchsiaCity_House3_EventScript_16D895:: @ 816D895 lock faceplayer - loadword 0, gUnknown_81993B9 - callstd 5 + msgbox gUnknown_81993B9, 5 compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_16D8B0 goto EventScript_16D941 end EventScript_16D8B0:: @ 816D8B0 - loadword 0, gUnknown_8199421 - callstd 4 + msgbox gUnknown_8199421 special sub_80BF8FC waitstate compare_var_to_value VAR_0x8004, 6 @@ -24,16 +22,14 @@ EventScript_16D8B0:: @ 816D8B0 special ScrSpecial_CountPokemonMoves compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_16D92A - loadword 0, gUnknown_8199445 - callstd 4 + msgbox gUnknown_8199445 fadescreen 1 special sub_80BF9BC fadescreen 0 compare_var_to_value VAR_0x8005, 4 goto_if 1, EventScript_16D8B0 special ScrSpecial_GetPokemonNicknameAndMoveName - loadword 0, gUnknown_8199485 - callstd 5 + msgbox gUnknown_8199485, 5 compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_16D919 goto EventScript_16D941 @@ -43,26 +39,22 @@ EventScript_16D919:: @ 816D919 special sub_80BFBA8 playfanfare MUS_ME_WASURE waitfanfare - loadword 0, gUnknown_81994B1 - callstd 4 + msgbox gUnknown_81994B1 release end EventScript_16D92A:: @ 816D92A special ScrSpecial_GetPokemonNicknameAndMoveName - loadword 0, gUnknown_8199465 - callstd 4 + msgbox gUnknown_8199465 release end EventScript_16D937:: @ 816D937 - loadword 0, gUnknown_819951F - callstd 4 + msgbox gUnknown_819951F release end EventScript_16D941:: @ 816D941 - loadword 0, gUnknown_81994EA - callstd 4 + msgbox gUnknown_81994EA release end diff --git a/data/maps/FuchsiaCity_Mart/scripts.inc b/data/maps/FuchsiaCity_Mart/scripts.inc index a4110387f..da90ac8d0 100644 --- a/data/maps/FuchsiaCity_Mart/scripts.inc +++ b/data/maps/FuchsiaCity_Mart/scripts.inc @@ -2,13 +2,11 @@ FuchsiaCity_Mart_MapScripts:: @ 816D4E0 .byte 0 FuchsiaCity_Mart_EventScript_16D4E1:: @ 816D4E1 - loadword 0, gUnknown_8198134 - callstd 2 + msgbox gUnknown_8198134, 2 end FuchsiaCity_Mart_EventScript_16D4EA:: @ 816D4EA - loadword 0, gUnknown_81980BC - callstd 2 + msgbox gUnknown_81980BC, 2 end FuchsiaCity_Mart_EventScript_16D4F3:: @ 816D4F3 @@ -20,8 +18,7 @@ FuchsiaCity_Mart_EventScript_16D4F3:: @ 816D4F3 message Text_1A6211 waitmessage pokemart Items_16D518 - loadword 0, gUnknown_81A5190 - callstd 4 + msgbox gUnknown_81A5190 release end diff --git a/data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc b/data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc index 86d44722c..6c231ac16 100644 --- a/data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc @@ -15,16 +15,13 @@ FuchsiaCity_PokemonCenter_1F_EventScript_16D700:: @ 816D700 end FuchsiaCity_PokemonCenter_1F_EventScript_16D709:: @ 816D709 - loadword 0, gUnknown_8198CB7 - callstd 2 + msgbox gUnknown_8198CB7, 2 end FuchsiaCity_PokemonCenter_1F_EventScript_16D712:: @ 816D712 - loadword 0, gUnknown_8198D2E - callstd 2 + msgbox gUnknown_8198D2E, 2 end FuchsiaCity_PokemonCenter_1F_EventScript_16D71B:: @ 816D71B - loadword 0, gUnknown_8198D9B - callstd 2 + msgbox gUnknown_8198D9B, 2 end diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc index a32bc6042..1f721cc96 100644 --- a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc +++ b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc @@ -13,8 +13,7 @@ EventScript_16D2C8:: @ 816D2C8 textcolor 0 applymovement 255, Movement_16D36A waitmovement 0 - loadword 0, gUnknown_8197E85 - callstd 4 + msgbox gUnknown_8197E85 closemessage applymovement 255, Movement_16D367 waitmovement 0 @@ -26,8 +25,7 @@ EventScript_16D2C8:: @ 816D2C8 EventScript_16D2F2:: @ 816D2F2 lockall textcolor 0 - loadword 0, gUnknown_8197E85 - callstd 4 + msgbox gUnknown_8197E85 closemessage applymovement 255, Movement_16D362 waitmovement 0 @@ -39,12 +37,10 @@ EventScript_16D2F2:: @ 816D2F2 EventScript_16D312:: @ 816D312 lockall textcolor 0 - loadword 0, gUnknown_8197E1A - callstd 5 + msgbox gUnknown_8197E1A, 5 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16D345 - loadword 0, gUnknown_8197E48 - callstd 4 + msgbox gUnknown_8197E48 closemessage applymovement 255, Movement_16D362 waitmovement 0 @@ -54,8 +50,7 @@ EventScript_16D312:: @ 816D312 end EventScript_16D345:: @ 816D345 - loadword 0, gUnknown_8197E7A - callstd 4 + msgbox gUnknown_8197E7A closemessage applymovement 255, Movement_16D365 waitmovement 0 @@ -102,17 +97,14 @@ FuchsiaCity_SafariZone_Entrance_EventScript_16D385:: @ 816D385 EventScript_16D391:: @ 816D391 textcolor 0 - loadword 0, gUnknown_8197C6B - callstd 4 + msgbox gUnknown_8197C6B applymovement 255, Movement_1A75EB waitmovement 0 showmoneybox 0, 0, 0 - loadword 0, gUnknown_8197C87 - callstd 5 + msgbox gUnknown_8197C87, 5 compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_16D3CA - loadword 0, gUnknown_8197DE9 - callstd 4 + msgbox gUnknown_8197DE9 goto EventScript_16D49A end @@ -123,15 +115,13 @@ EventScript_16D3CA:: @ 816D3CA goto_if 1, EventScript_16D48C takemoney 500, 0 updatemoneybox 0, 0, 0 - loadword 0, gUnknown_8197D07 - callstd 4 + msgbox gUnknown_8197D07 textcolor 3 playfanfare MUS_FANFA1 message Text_197D50 waitfanfare call EventScript_1A6675 - loadword 0, gUnknown_8197D80 - callstd 4 + msgbox gUnknown_8197D80 closemessage hidemoneybox .byte 0 @@ -170,14 +160,12 @@ EventScript_16D462:: @ 816D462 specialvar VAR_RESULT, sub_80CABD0 compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1A77A9 - loadword 0, gUnknown_81BFEAC - callstd 4 + msgbox gUnknown_81BFEAC goto EventScript_16D49A end EventScript_16D48C:: @ 816D48C - loadword 0, gUnknown_8197E02 - callstd 4 + msgbox gUnknown_8197E02 goto EventScript_16D49A end @@ -215,17 +203,14 @@ Movement_16D4B3:: @ 816D4B3 FuchsiaCity_SafariZone_Entrance_EventScript_16D4B7:: @ 816D4B7 lock faceplayer - loadword 0, gUnknown_8197EB0 - callstd 5 + msgbox gUnknown_8197EB0, 5 compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_16D4D6 - loadword 0, gUnknown_819809E - callstd 4 + msgbox gUnknown_819809E release end EventScript_16D4D6:: @ 816D4D6 - loadword 0, gUnknown_8197EE3 - callstd 4 + msgbox gUnknown_8197EE3 release end diff --git a/data/maps/FuchsiaCity_ZooBuilding/scripts.inc b/data/maps/FuchsiaCity_ZooBuilding/scripts.inc index f5cdd37a6..bbff0b929 100644 --- a/data/maps/FuchsiaCity_ZooBuilding/scripts.inc +++ b/data/maps/FuchsiaCity_ZooBuilding/scripts.inc @@ -2,21 +2,17 @@ FuchsiaCity_ZooBuilding_MapScripts:: @ 816D528 .byte 0 FuchsiaCity_ZooBuilding_EventScript_16D529:: @ 816D529 - loadword 0, gUnknown_819816B - callstd 2 + msgbox gUnknown_819816B, 2 end FuchsiaCity_ZooBuilding_EventScript_16D532:: @ 816D532 - loadword 0, gUnknown_81981C2 - callstd 2 + msgbox gUnknown_81981C2, 2 end FuchsiaCity_ZooBuilding_EventScript_16D53B:: @ 816D53B - loadword 0, gUnknown_819822A - callstd 2 + msgbox gUnknown_819822A, 2 end FuchsiaCity_ZooBuilding_EventScript_16D544:: @ 816D544 - loadword 0, gUnknown_8198285 - callstd 2 + msgbox gUnknown_8198285, 2 end diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc index a8db66421..a8aac2447 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc +++ b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc @@ -22,28 +22,24 @@ IndigoPlateau_PokemonCenter_1F_EventScript_16EA8A:: @ 816EA8A specialvar VAR_RESULT, sub_806E25C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_16EAA6 - loadword 0, gUnknown_819A8D8 - callstd 4 + msgbox gUnknown_819A8D8 release end EventScript_16EAA6:: @ 816EAA6 checkflag FLAG_0x844 goto_if 1, EventScript_16EAB9 - loadword 0, gUnknown_819A943 - callstd 4 + msgbox gUnknown_819A943 release end EventScript_16EAB9:: @ 816EAB9 - loadword 0, gUnknown_819A8D8 - callstd 4 + msgbox gUnknown_819A8D8 release end IndigoPlateau_PokemonCenter_1F_EventScript_16EAC3:: @ 816EAC3 - loadword 0, gUnknown_819A837 - callstd 2 + msgbox gUnknown_819A837, 2 end IndigoPlateau_PokemonCenter_1F_EventScript_16EACC:: @ 816EACC @@ -55,8 +51,7 @@ IndigoPlateau_PokemonCenter_1F_EventScript_16EACC:: @ 816EACC message Text_1A6211 waitmessage pokemart Items_16EAF4 - loadword 0, gUnknown_81A5190 - callstd 4 + msgbox gUnknown_81A5190 release end diff --git a/data/maps/LavenderTown/scripts.inc b/data/maps/LavenderTown/scripts.inc index ca396d10d..c582a18ae 100644 --- a/data/maps/LavenderTown/scripts.inc +++ b/data/maps/LavenderTown/scripts.inc @@ -11,47 +11,38 @@ LavenderTown_MapScript1_166871:: @ 8166871 LavenderTown_EventScript_16687D:: @ 816687D lock faceplayer - loadword 0, gUnknown_817F52E - callstd 5 + msgbox gUnknown_817F52E, 5 compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_16689C - loadword 0, gUnknown_817F568 - callstd 4 + msgbox gUnknown_817F568 release end EventScript_16689C:: @ 816689C - loadword 0, gUnknown_817F548 - callstd 4 + msgbox gUnknown_817F548 release end LavenderTown_EventScript_1668A6:: @ 81668A6 - loadword 0, gUnknown_817F5B6 - callstd 2 + msgbox gUnknown_817F5B6, 2 end LavenderTown_EventScript_1668AF:: @ 81668AF - loadword 0, gUnknown_817F614 - callstd 2 + msgbox gUnknown_817F614, 2 end LavenderTown_EventScript_1668B8:: @ 81668B8 - loadword 0, gUnknown_817F676 - callstd 3 + msgbox gUnknown_817F676, 3 end LavenderTown_EventScript_1668C1:: @ 81668C1 - loadword 0, gUnknown_817F69A - callstd 3 + msgbox gUnknown_817F69A, 3 end LavenderTown_EventScript_1668CA:: @ 81668CA - loadword 0, gUnknown_817F6D6 - callstd 3 + msgbox gUnknown_817F6D6, 3 end LavenderTown_EventScript_1668D3:: @ 81668D3 - loadword 0, gUnknown_817F6F7 - callstd 3 + msgbox gUnknown_817F6F7, 3 end diff --git a/data/maps/LavenderTown_House1/scripts.inc b/data/maps/LavenderTown_House1/scripts.inc index 7e415b380..406ada7ae 100644 --- a/data/maps/LavenderTown_House1/scripts.inc +++ b/data/maps/LavenderTown_House1/scripts.inc @@ -6,14 +6,12 @@ LavenderTown_House1_EventScript_16B233:: @ 816B233 faceplayer checkflag FLAG_0x23C goto_if 1, EventScript_16B248 - loadword 0, gUnknown_819397D - callstd 4 + msgbox gUnknown_819397D release end EventScript_16B248:: @ 816B248 - loadword 0, gUnknown_81939F8 - callstd 4 + msgbox gUnknown_81939F8 release end @@ -22,8 +20,7 @@ LavenderTown_House1_EventScript_16B252:: @ 816B252 faceplayer waitse playmoncry SPECIES_CUBONE, 0 - loadword 0, gUnknown_819396B - callstd 4 + msgbox gUnknown_819396B waitmoncry release end diff --git a/data/maps/LavenderTown_House2/scripts.inc b/data/maps/LavenderTown_House2/scripts.inc index 05198eccc..9074d2612 100644 --- a/data/maps/LavenderTown_House2/scripts.inc +++ b/data/maps/LavenderTown_House2/scripts.inc @@ -4,8 +4,7 @@ LavenderTown_House2_MapScripts:: @ 816B265 LavenderTown_House2_EventScript_16B266:: @ 816B266 lock faceplayer - loadword 0, gUnknown_8193A4B - callstd 5 + msgbox gUnknown_8193A4B, 5 compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_16B287 compare_var_to_value VAR_RESULT, 0 @@ -13,8 +12,7 @@ LavenderTown_House2_EventScript_16B266:: @ 816B266 end EventScript_16B287:: @ 816B287 - loadword 0, gUnknown_8193AA6 - callstd 4 + msgbox gUnknown_8193AA6 special sub_80BF8FC waitstate compare_var_to_value VAR_0x8004, 6 @@ -24,8 +22,7 @@ EventScript_16B287:: @ 816B287 end EventScript_16B2AA:: @ 816B2AA - loadword 0, gUnknown_8193BD4 - callstd 4 + msgbox gUnknown_8193BD4 release end @@ -41,8 +38,7 @@ EventScript_16B2B4:: @ 816B2B4 special TV_CopyNicknameToStringVar1AndEnsureTerminated compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_16B311 - loadword 0, gUnknown_8193AD2 - callstd 5 + msgbox gUnknown_8193AD2, 5 compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_16B31B compare_var_to_value VAR_RESULT, 0 @@ -50,32 +46,27 @@ EventScript_16B2B4:: @ 816B2B4 end EventScript_16B307:: @ 816B307 - loadword 0, gUnknown_8193CC4 - callstd 4 + msgbox gUnknown_8193CC4 release end EventScript_16B311:: @ 816B311 - loadword 0, gUnknown_8193C82 - callstd 4 + msgbox gUnknown_8193C82 release end EventScript_16B31B:: @ 816B31B - loadword 0, gUnknown_8193B36 - callstd 4 + msgbox gUnknown_8193B36 call EventScript_1A74EB specialvar VAR_RESULT, sub_80CBFA0 special TV_CopyNicknameToStringVar1AndEnsureTerminated compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_16B345 - loadword 0, gUnknown_8193BF0 - callstd 4 + msgbox gUnknown_8193BF0 release end EventScript_16B345:: @ 816B345 - loadword 0, gUnknown_8193B66 - callstd 4 + msgbox gUnknown_8193B66 release end diff --git a/data/maps/LavenderTown_Mart/scripts.inc b/data/maps/LavenderTown_Mart/scripts.inc index 4ac7d68de..ca3307efb 100644 --- a/data/maps/LavenderTown_Mart/scripts.inc +++ b/data/maps/LavenderTown_Mart/scripts.inc @@ -2,18 +2,15 @@ LavenderTown_Mart_MapScripts:: @ 816B34F .byte 0 LavenderTown_Mart_EventScript_16B350:: @ 816B350 - loadword 0, gUnknown_8193CE5 - callstd 2 + msgbox gUnknown_8193CE5, 2 end LavenderTown_Mart_EventScript_16B359:: @ 816B359 - loadword 0, gUnknown_8193DB6 - callstd 2 + msgbox gUnknown_8193DB6, 2 end LavenderTown_Mart_EventScript_16B362:: @ 816B362 - loadword 0, gUnknown_8193DF1 - callstd 2 + msgbox gUnknown_8193DF1, 2 end LavenderTown_Mart_EventScript_16B36B:: @ 816B36B @@ -25,8 +22,7 @@ LavenderTown_Mart_EventScript_16B36B:: @ 816B36B message Text_1A6211 waitmessage pokemart Items_16B390 - loadword 0, gUnknown_81A5190 - callstd 4 + msgbox gUnknown_81A5190 release end diff --git a/data/maps/LavenderTown_PokemonCenter_1F/scripts.inc b/data/maps/LavenderTown_PokemonCenter_1F/scripts.inc index a9795f7a2..55c186fdf 100644 --- a/data/maps/LavenderTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/LavenderTown_PokemonCenter_1F/scripts.inc @@ -15,16 +15,13 @@ LavenderTown_PokemonCenter_1F_EventScript_16B0FE:: @ 816B0FE end LavenderTown_PokemonCenter_1F_EventScript_16B107:: @ 816B107 - loadword 0, gUnknown_8193465 - callstd 2 + msgbox gUnknown_8193465, 2 end LavenderTown_PokemonCenter_1F_EventScript_16B110:: @ 816B110 - loadword 0, gUnknown_81934DE - callstd 2 + msgbox gUnknown_81934DE, 2 end LavenderTown_PokemonCenter_1F_EventScript_16B119:: @ 816B119 - loadword 0, gUnknown_819353A - callstd 2 + msgbox gUnknown_819353A, 2 end diff --git a/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc b/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc index 1070e8850..4ee7efbdf 100644 --- a/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc +++ b/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc @@ -6,28 +6,24 @@ LavenderTown_VolunteerPokemonHouse_EventScript_16B14A:: @ 816B14A faceplayer checkflag FLAG_0x23D goto_if 1, EventScript_16B196 - loadword 0, gUnknown_81936FF - callstd 4 + msgbox gUnknown_81936FF checkitemspace ITEM_POKE_FLUTE, 1 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16B1A0 setflag FLAG_0x23D additem ITEM_POKE_FLUTE, 1 giveitemfanfaremsg gUnknown_81937BD, ITEM_POKE_FLUTE, 1, BGM_FRLG_ME_KEYITEM - loadword 0, gUnknown_81937E5 - callstd 4 + msgbox gUnknown_81937E5 release end EventScript_16B196:: @ 816B196 - loadword 0, gUnknown_8193878 - callstd 4 + msgbox gUnknown_8193878 release end EventScript_16B1A0:: @ 816B1A0 - loadword 0, gUnknown_819385B - callstd 4 + msgbox gUnknown_819385B release end @@ -37,14 +33,12 @@ LavenderTown_VolunteerPokemonHouse_EventScript_16B1AA:: @ 816B1AA setvar VAR_0x8004, 14 setvar VAR_0x8005, 0 special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_8193652 - callstd 4 + msgbox gUnknown_8193652 release end LavenderTown_VolunteerPokemonHouse_EventScript_16B1C3:: @ 816B1C3 - loadword 0, gUnknown_81936B4 - callstd 2 + msgbox gUnknown_81936B4, 2 end LavenderTown_VolunteerPokemonHouse_EventScript_16B1CC:: @ 816B1CC @@ -52,14 +46,12 @@ LavenderTown_VolunteerPokemonHouse_EventScript_16B1CC:: @ 816B1CC faceplayer checkflag FLAG_0x23C goto_if 1, EventScript_16B1E1 - loadword 0, gUnknown_81935ED - callstd 4 + msgbox gUnknown_81935ED release end EventScript_16B1E1:: @ 816B1E1 - loadword 0, gUnknown_819361D - callstd 4 + msgbox gUnknown_819361D release end @@ -68,8 +60,7 @@ LavenderTown_VolunteerPokemonHouse_EventScript_16B1EB:: @ 816B1EB faceplayer waitse playmoncry SPECIES_NIDORINO, 0 - loadword 0, gUnknown_81936DE - callstd 4 + msgbox gUnknown_81936DE waitmoncry release end @@ -79,8 +70,7 @@ LavenderTown_VolunteerPokemonHouse_EventScript_16B1FE:: @ 816B1FE faceplayer waitse playmoncry SPECIES_PSYDUCK, 0 - loadword 0, gUnknown_81936EE - callstd 4 + msgbox gUnknown_81936EE waitmoncry release end @@ -90,12 +80,10 @@ LavenderTown_VolunteerPokemonHouse_EventScript_16B211:: @ 816B211 setvar VAR_0x8004, 14 setvar VAR_0x8005, 2 special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_81938A0 - callstd 4 + msgbox gUnknown_81938A0 releaseall end LavenderTown_VolunteerPokemonHouse_EventScript_16B229:: @ 816B229 - loadword 0, gUnknown_819392B - callstd 3 + msgbox gUnknown_819392B, 3 end diff --git a/data/maps/MtEmber_Exterior/scripts.inc b/data/maps/MtEmber_Exterior/scripts.inc index 8b7cecce8..4c7079c07 100644 --- a/data/maps/MtEmber_Exterior/scripts.inc +++ b/data/maps/MtEmber_Exterior/scripts.inc @@ -29,14 +29,12 @@ MtEmber_Exterior_EventScript_16397F:: @ 816397F goto_if 1, EventScript_16399E compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4 goto_if 1, EventScript_1639A8 - loadword 0, gUnknown_817A82A - callstd 4 + msgbox gUnknown_817A82A release end EventScript_16399E:: @ 816399E - loadword 0, gUnknown_817AA3F - callstd 4 + msgbox gUnknown_817AA3F release end @@ -44,19 +42,16 @@ EventScript_1639A8:: @ 81639A8 applymovement 2, Movement_1A75E1 waitmovement 0 playbgm BGM_FRLG_SUSPICIOUS_EYE, 0 - loadword 0, gUnknown_817AA06 - callstd 4 + msgbox gUnknown_817AA06 trainerbattle 3, 537, 0, Text_17AA34 - loadword 0, gUnknown_817AA3F - callstd 4 + msgbox gUnknown_817AA3F checktrainerflag FLAG_0x21A goto_if 1, EventScript_1639DB release end EventScript_1639DB:: @ 81639DB - loadword 0, gUnknown_817AAD7 - callstd 4 + msgbox gUnknown_817AAD7 closemessage fadescreen 1 removeobject 2 @@ -72,8 +67,7 @@ MtEmber_Exterior_EventScript_1639F0:: @ 81639F0 goto_if 1, EventScript_163A1B compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4 goto_if 1, EventScript_163A25 - loadword 0, gUnknown_817A88C - callstd 4 + msgbox gUnknown_817A88C closemessage applymovement 3, Movement_1A75E5 waitmovement 0 @@ -81,18 +75,15 @@ MtEmber_Exterior_EventScript_1639F0:: @ 81639F0 end EventScript_163A1B:: @ 8163A1B - loadword 0, gUnknown_817AA99 - callstd 4 + msgbox gUnknown_817AA99 release end EventScript_163A25:: @ 8163A25 playbgm BGM_FRLG_SUSPICIOUS_EYE, 0 - loadword 0, gUnknown_817AA56 - callstd 4 + msgbox gUnknown_817AA56 trainerbattle 3, 538, 0, Text_17AA8A - loadword 0, gUnknown_817AA99 - callstd 4 + msgbox gUnknown_817AA99 checktrainerflag FLAG_0x219 goto_if 1, EventScript_1639DB release @@ -101,16 +92,14 @@ EventScript_163A25:: @ 8163A25 MtEmber_Exterior_EventScript_163A4E:: @ 8163A4E lockall textcolor 0 - loadword 0, gUnknown_817A8B4 - callstd 4 + msgbox gUnknown_817A8B4 message Text_17A8EE waitmessage playse SE_PIN applymovement 3, Movement_1A75D9 waitmovement 0 waitbuttonpress - loadword 0, gUnknown_817A970 - callstd 4 + msgbox gUnknown_817A970 applymovement 2, Movement_1A75ED waitmovement 0 playse SE_PIN @@ -121,26 +110,22 @@ MtEmber_Exterior_EventScript_163A4E:: @ 8163A4E applymovement 3, Movement_1A75ED waitmovement 0 call EventScript_163960 - loadword 0, gUnknown_817A9E1 - callstd 4 + msgbox gUnknown_817A9E1 setvar VAR_0x407F, 2 releaseall end MtEmber_Exterior_EventScript_163AB4:: @ 8163AB4 trainerbattle 0, 595, 0, Text_17AB73, Text_17ABAA - loadword 0, gUnknown_817ABD8 - callstd 6 + msgbox gUnknown_817ABD8, 6 end MtEmber_Exterior_EventScript_163ACB:: @ 8163ACB trainerbattle 0, 597, 0, Text_17AC55, Text_17AC82 - loadword 0, gUnknown_817ACA2 - callstd 6 + msgbox gUnknown_817ACA2, 6 end MtEmber_Exterior_EventScript_163AE2:: @ 8163AE2 trainerbattle 0, 592, 0, Text_17AD06, Text_17AD6B - loadword 0, gUnknown_817AD89 - callstd 6 + msgbox gUnknown_817AD89, 6 end diff --git a/data/maps/MtMoon_1F/scripts.inc b/data/maps/MtMoon_1F/scripts.inc index 3a8e8b5ce..cd8feb26c 100644 --- a/data/maps/MtMoon_1F/scripts.inc +++ b/data/maps/MtMoon_1F/scripts.inc @@ -7,48 +7,40 @@ MtMoon_1F_MapScript1_1605EA:: @ 81605EA end MtMoon_1F_EventScript_1605EE:: @ 81605EE - loadword 0, gUnknown_8172AE0 - callstd 3 + msgbox gUnknown_8172AE0, 3 end MtMoon_1F_EventScript_1605F7:: @ 81605F7 trainerbattle 0, 181, 0, Text_17279D, Text_1727CB - loadword 0, gUnknown_81727DF - callstd 6 + msgbox gUnknown_81727DF, 6 end MtMoon_1F_EventScript_16060E:: @ 816060E trainerbattle 0, 91, 0, Text_17281D, Text_172844 - loadword 0, gUnknown_8172863 - callstd 6 + msgbox gUnknown_8172863, 6 end MtMoon_1F_EventScript_160625:: @ 8160625 trainerbattle 0, 120, 0, Text_172896, Text_1728C3 - loadword 0, gUnknown_81728D2 - callstd 6 + msgbox gUnknown_81728D2, 6 end MtMoon_1F_EventScript_16063C:: @ 816063C trainerbattle 0, 121, 0, Text_172972, Text_1729A4 - loadword 0, gUnknown_81729AC - callstd 6 + msgbox gUnknown_81729AC, 6 end MtMoon_1F_EventScript_160653:: @ 8160653 trainerbattle 0, 169, 0, Text_17290B, Text_172927 - loadword 0, gUnknown_817293C - callstd 6 + msgbox gUnknown_817293C, 6 end MtMoon_1F_EventScript_16066A:: @ 816066A trainerbattle 0, 108, 0, Text_1729EA, Text_172A1A - loadword 0, gUnknown_8172A26 - callstd 6 + msgbox gUnknown_8172A26, 6 end MtMoon_1F_EventScript_160681:: @ 8160681 trainerbattle 0, 109, 0, Text_172A55, Text_172A8F - loadword 0, gUnknown_8172A97 - callstd 6 + msgbox gUnknown_8172A97, 6 end diff --git a/data/maps/MtMoon_B2F/scripts.inc b/data/maps/MtMoon_B2F/scripts.inc index 721af3880..8c5e073f5 100644 --- a/data/maps/MtMoon_B2F/scripts.inc +++ b/data/maps/MtMoon_B2F/scripts.inc @@ -40,27 +40,23 @@ EventScript_1606DD:: @ 81606DD setvar VAR_LAST_TALKED, 3 trainerbattle 3, 170, 0, Text_172B99 setvar VAR_0x408B, 1 - loadword 0, gUnknown_8172BAB - callstd 4 + msgbox gUnknown_8172BAB return EventScript_160707:: @ 8160707 - loadword 0, gUnknown_8172BFB - callstd 4 + msgbox gUnknown_8172BFB release end EventScript_160711:: @ 8160711 - loadword 0, gUnknown_8172BAB - callstd 4 + msgbox gUnknown_8172BAB release end MtMoon_B2F_EventScript_16071B:: @ 816071B lock faceplayer - loadword 0, gUnknown_8172E77 - callstd 5 + msgbox gUnknown_8172E77, 5 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_1607DE removeobject 1 @@ -93,8 +89,7 @@ Movement_16077A:: @ 816077A MtMoon_B2F_EventScript_16077F:: @ 816077F lock faceplayer - loadword 0, gUnknown_8172E94 - callstd 5 + msgbox gUnknown_8172E94, 5 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_1607DE removeobject 2 @@ -129,24 +124,20 @@ Movement_1607E0:: @ 81607E0 MtMoon_B2F_EventScript_1607E4:: @ 81607E4 trainerbattle 0, 351, 0, Text_172C5A, Text_172CB8 - loadword 0, gUnknown_8172CCB - callstd 6 + msgbox gUnknown_8172CCB, 6 end MtMoon_B2F_EventScript_1607FB:: @ 81607FB trainerbattle 0, 352, 0, Text_172CFC, Text_172D46 - loadword 0, gUnknown_8172D51 - callstd 6 + msgbox gUnknown_8172D51, 6 end MtMoon_B2F_EventScript_160812:: @ 8160812 trainerbattle 0, 353, 0, Text_172D82, Text_172DAF - loadword 0, gUnknown_8172DC1 - callstd 6 + msgbox gUnknown_8172DC1, 6 end MtMoon_B2F_EventScript_160829:: @ 8160829 trainerbattle 0, 354, 0, Text_172DF0, Text_172E3E - loadword 0, gUnknown_8172E4B - callstd 6 + msgbox gUnknown_8172E4B, 6 end diff --git a/data/maps/OneIsland/scripts.inc b/data/maps/OneIsland/scripts.inc index f73187fc3..a456b217a 100644 --- a/data/maps/OneIsland/scripts.inc +++ b/data/maps/OneIsland/scripts.inc @@ -16,8 +16,7 @@ EventScript_16749D:: @ 816749D textcolor 0 applymovement 255, Movement_167505 waitmovement 0 - loadword 0, gUnknown_818161B - callstd 4 + msgbox gUnknown_818161B closemessage applymovement 1, Movement_167507 applymovement 255, Movement_1674F4 @@ -88,34 +87,28 @@ OneIsland_EventScript_167517:: @ 8167517 goto_if 1, EventScript_16753F checkflag FLAG_0x2A1 goto_if 1, EventScript_167535 - loadword 0, gUnknown_818174E - callstd 4 + msgbox gUnknown_818174E release end EventScript_167535:: @ 8167535 - loadword 0, gUnknown_8181858 - callstd 4 + msgbox gUnknown_8181858 release end EventScript_16753F:: @ 816753F - loadword 0, gUnknown_8181901 - callstd 4 + msgbox gUnknown_8181901 release end OneIsland_EventScript_167549:: @ 8167549 - loadword 0, gUnknown_8181A4A - callstd 2 + msgbox gUnknown_8181A4A, 2 end OneIsland_EventScript_167552:: @ 8167552 - loadword 0, gUnknown_81819E1 - callstd 3 + msgbox gUnknown_81819E1, 3 end OneIsland_EventScript_16755B:: @ 816755B - loadword 0, gUnknown_8181A0A - callstd 3 + msgbox gUnknown_8181A0A, 3 end diff --git a/data/maps/OneIsland_House1/scripts.inc b/data/maps/OneIsland_House1/scripts.inc index 00dc7780b..957dcada9 100644 --- a/data/maps/OneIsland_House1/scripts.inc +++ b/data/maps/OneIsland_House1/scripts.inc @@ -2,11 +2,9 @@ OneIsland_House1_MapScripts:: @ 817135B .byte 0 OneIsland_House1_EventScript_17135C:: @ 817135C - loadword 0, gUnknown_81A2332 - callstd 2 + msgbox gUnknown_81A2332, 2 end OneIsland_House1_EventScript_171365:: @ 8171365 - loadword 0, gUnknown_81A2380 - callstd 2 + msgbox gUnknown_81A2380, 2 end diff --git a/data/maps/OneIsland_House2/scripts.inc b/data/maps/OneIsland_House2/scripts.inc index fafdfd79c..9966217cd 100644 --- a/data/maps/OneIsland_House2/scripts.inc +++ b/data/maps/OneIsland_House2/scripts.inc @@ -2,6 +2,5 @@ OneIsland_House2_MapScripts:: @ 817136E .byte 0 OneIsland_House2_EventScript_17136F:: @ 817136F - loadword 0, gUnknown_81A23B8 - callstd 2 + msgbox gUnknown_81A23B8, 2 end diff --git a/data/maps/OneIsland_KindleRoad/scripts.inc b/data/maps/OneIsland_KindleRoad/scripts.inc index c7999b783..78c2efb13 100644 --- a/data/maps/OneIsland_KindleRoad/scripts.inc +++ b/data/maps/OneIsland_KindleRoad/scripts.inc @@ -2,11 +2,9 @@ OneIsland_KindleRoad_MapScripts:: @ 8168758 .byte 0 OneIsland_KindleRoad_EventScript_168759:: @ 8168759 - loadword 0, gUnknown_8189D02 - callstd 3 + msgbox gUnknown_8189D02, 3 end OneIsland_KindleRoad_EventScript_168762:: @ 8168762 - loadword 0, gUnknown_8189D32 - callstd 3 + msgbox gUnknown_8189D32, 3 end diff --git a/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc b/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc index bf5ae163c..0ef1ce25c 100644 --- a/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc +++ b/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc @@ -2,23 +2,19 @@ OneIsland_KindleRoad_EmberSpa_MapScripts:: @ 816535B .byte 0 OneIsland_KindleRoad_EmberSpa_EventScript_16535C:: @ 816535C - loadword 0, gUnknown_817D34A - callstd 2 + msgbox gUnknown_817D34A, 2 end OneIsland_KindleRoad_EmberSpa_EventScript_165365:: @ 8165365 - loadword 0, gUnknown_817D3DE - callstd 2 + msgbox gUnknown_817D3DE, 2 end OneIsland_KindleRoad_EmberSpa_EventScript_16536E:: @ 816536E - loadword 0, gUnknown_817D4AA - callstd 2 + msgbox gUnknown_817D4AA, 2 end OneIsland_KindleRoad_EmberSpa_EventScript_165377:: @ 8165377 - loadword 0, gUnknown_817D4E3 - callstd 2 + msgbox gUnknown_817D4E3, 2 end OneIsland_KindleRoad_EmberSpa_EventScript_165380:: @ 8165380 @@ -27,8 +23,7 @@ OneIsland_KindleRoad_EmberSpa_EventScript_165380:: @ 8165380 setvar VAR_0x8004, 10 setvar VAR_0x8005, 3 special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_817D550 - callstd 4 + msgbox gUnknown_817D550 release end @@ -37,20 +32,17 @@ OneIsland_KindleRoad_EmberSpa_EventScript_165399:: @ 8165399 faceplayer checkflag FLAG_0x2EF goto_if 1, EventScript_1653C5 - loadword 0, gUnknown_817D622 - callstd 4 + msgbox gUnknown_817D622 setorcopyvar VAR_0x8000, 344 setorcopyvar VAR_0x8001, 1 callstd 0 setflag FLAG_0x2EF - loadword 0, gUnknown_817D6F3 - callstd 4 + msgbox gUnknown_817D6F3 release end EventScript_1653C5:: @ 81653C5 - loadword 0, gUnknown_817D6F3 - callstd 4 + msgbox gUnknown_817D6F3 release end @@ -59,8 +51,7 @@ OneIsland_KindleRoad_EmberSpa_EventScript_1653CF:: @ 81653CF fadescreen 3 special sp000_heal_pokemon fadescreen 2 - loadword 0, gUnknown_817D450 - callstd 4 + msgbox gUnknown_817D450 setvar VAR_0x4001, 1 releaseall end diff --git a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc index e52bdad8d..d34f6c7c4 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc @@ -64,8 +64,7 @@ EventScript_170CB1:: @ 8170CB1 applymovement 255, Movement_170E7D applymovement 2, Movement_170E86 waitmovement 0 - loadword 0, gUnknown_81A0CDE - callstd 4 + msgbox gUnknown_81A0CDE applymovement 255, Movement_1A75EB waitmovement 0 playse SE_PIN @@ -75,15 +74,12 @@ EventScript_170CB1:: @ 8170CB1 waitmovement 0 applymovement 3, Movement_1A75DD waitmovement 0 - loadword 0, gUnknown_81A0CF7 - callstd 4 - loadword 0, gUnknown_81A0D27 - callstd 4 + msgbox gUnknown_81A0CF7 + msgbox gUnknown_81A0D27 applymovement 2, Movement_1A75ED applymovement 255, Movement_1A75E9 waitmovement 0 - loadword 0, gUnknown_81A0D72 - callstd 4 + msgbox gUnknown_81A0D72 applymovement 2, Movement_1A75EB waitmovement 0 applymovement 255, Movement_1A75EB @@ -94,42 +90,34 @@ EventScript_170CB1:: @ 8170CB1 call_if 0, EventScript_170E3D applymovement 3, Movement_1A75ED waitmovement 0 - loadword 0, gUnknown_81A0E17 - callstd 4 - loadword 0, gUnknown_81A0E90 - callstd 4 + msgbox gUnknown_81A0E17 + msgbox gUnknown_81A0E90 applymovement 3, Movement_1A75E7 waitmovement 0 - loadword 0, gUnknown_81A0ECC - callstd 4 + msgbox gUnknown_81A0ECC closemessage applymovement 2, Movement_1A75E9 waitmovement 0 - loadword 0, gUnknown_81A0F40 - callstd 4 + msgbox gUnknown_81A0F40 applymovement 2, Movement_1A75ED waitmovement 0 applymovement 255, Movement_1A75E9 waitmovement 0 - loadword 0, gUnknown_81A0FB1 - callstd 4 + msgbox gUnknown_81A0FB1 giveitemfanfaremsg gUnknown_81A10EE, ITEM_METEORITE, 1, BGM_FRLG_ME_KEYITEM additem ITEM_METEORITE, 1 applymovement 3, Movement_1A75ED waitmovement 0 - loadword 0, gUnknown_81A1113 - callstd 4 + msgbox gUnknown_81A1113 additem ITEM_TRI_PASS, 1 giveitemfanfaremsg gUnknown_81A231B, ITEM_TRI_PASS, 1, BGM_FRLG_ME_KEYITEM - loadword 0, gUnknown_81A1150 - callstd 4 + msgbox gUnknown_81A1150 compare_var_to_value VAR_0x4058, 2 call_if 4, EventScript_170E46 compare_var_to_value VAR_0x4058, 2 call_if 0, EventScript_170E58 setflag FLAG_0x845 - loadword 0, gUnknown_81A1230 - callstd 4 + msgbox gUnknown_81A1230 closemessage applymovement 2, Movement_1A75E9 waitmovement 0 @@ -141,13 +129,11 @@ EventScript_170CB1:: @ 8170CB1 end EventScript_170E34:: @ 8170E34 - loadword 0, gUnknown_81A0DE8 - callstd 4 + msgbox gUnknown_81A0DE8 return EventScript_170E3D:: @ 8170E3D - loadword 0, gUnknown_81A0DAC - callstd 4 + msgbox gUnknown_81A0DAC return EventScript_170E46:: @ 8170E46 @@ -208,16 +194,14 @@ OneIsland_PokemonCenter_1F_EventScript_170E9D:: @ 8170E9D lock checkflag FLAG_0x2A1 goto_if 1, EventScript_170EB1 - loadword 0, gUnknown_81A1266 - callstd 4 + msgbox gUnknown_81A1266 release end EventScript_170EB1:: @ 8170EB1 applymovement 2, Movement_1A75E1 waitmovement 0 - loadword 0, gUnknown_81A128C - callstd 4 + msgbox gUnknown_81A128C release end @@ -241,8 +225,7 @@ OneIsland_PokemonCenter_1F_EventScript_170EC5:: @ 8170EC5 goto_if 1, EventScript_1710FC compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 3 goto_if 1, EventScript_171134 - loadword 0, gUnknown_81A1321 - callstd 4 + msgbox gUnknown_81A1321 closemessage applymovement 3, Movement_1A75E5 waitmovement 0 @@ -250,8 +233,7 @@ OneIsland_PokemonCenter_1F_EventScript_170EC5:: @ 8170EC5 end EventScript_170F35:: @ 8170F35 - loadword 0, gUnknown_81A1EBD - callstd 4 + msgbox gUnknown_81A1EBD random 3 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_170F6D @@ -260,8 +242,7 @@ EventScript_170F35:: @ 8170F35 setvar VAR_0x8004, 13 setvar VAR_0x8005, 5 special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_81A2076 - callstd 4 + msgbox gUnknown_81A2076 release end @@ -269,8 +250,7 @@ EventScript_170F6D:: @ 8170F6D setvar VAR_0x8004, 13 setvar VAR_0x8005, 3 special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_81A1EF3 - callstd 4 + msgbox gUnknown_81A1EF3 release end @@ -278,14 +258,12 @@ EventScript_170F84:: @ 8170F84 setvar VAR_0x8004, 13 setvar VAR_0x8005, 4 special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_81A1F7C - callstd 4 + msgbox gUnknown_81A1F7C release end EventScript_170F9B:: @ 8170F9B - loadword 0, gUnknown_81A1E39 - callstd 4 + msgbox gUnknown_81A1E39 release end @@ -297,16 +275,14 @@ EventScript_170FA5:: @ 8170FA5 waitfanfare call EventScript_1A6675 removeitem ITEM_SAPPHIRE, 1 - loadword 0, gUnknown_81A1C4E - callstd 4 + msgbox gUnknown_81A1C4E closemessage applymovement 3, Movement_171142 waitmovement 0 playse SE_N call EventScript_170C2C special DrawWholeMapView - loadword 0, gUnknown_81A1D45 - callstd 4 + msgbox gUnknown_81A1D45 closemessage delay 60 applymovement 3, Movement_17113E @@ -318,12 +294,10 @@ EventScript_170FA5:: @ 8170FA5 playse SE_PC_ON call EventScript_170C36 special DrawWholeMapView - loadword 0, gUnknown_81A1D59 - callstd 4 + msgbox gUnknown_81A1D59 applymovement 3, Movement_1A75E1 waitmovement 0 - loadword 0, gUnknown_81A1D7D - callstd 4 + msgbox gUnknown_81A1D7D special sub_810B82C setflag FLAG_0x844 setflag FLAG_0x05C @@ -334,14 +308,12 @@ EventScript_170FA5:: @ 8170FA5 end EventScript_17103A:: @ 817103A - loadword 0, gUnknown_81A1BB7 - callstd 4 + msgbox gUnknown_81A1BB7 release end EventScript_171044:: @ 8171044 - loadword 0, gUnknown_81A197E - callstd 4 + msgbox gUnknown_81A197E textcolor 3 playfanfare MUS_ME_WAZA message Text_1A198D @@ -357,24 +329,21 @@ EventScript_171044:: @ 8171044 delay 30 applymovement 3, Movement_1A75E1 waitmovement 0 - loadword 0, gUnknown_81A19AA - callstd 5 + msgbox gUnknown_81A19AA, 5 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_171099 goto EventScript_1710B2 end EventScript_171099:: @ 8171099 - loadword 0, gUnknown_81A1A08 - callstd 5 + msgbox gUnknown_81A1A08, 5 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_171099 goto EventScript_1710B2 end EventScript_1710B2:: @ 81710B2 - loadword 0, gUnknown_81A1A3F - callstd 4 + msgbox gUnknown_81A1A3F removeitem ITEM_RUBY, 1 removeitem ITEM_TRI_PASS, 1 setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 @@ -394,30 +363,25 @@ EventScript_1710B2:: @ 81710B2 end EventScript_1710F2:: @ 81710F2 - loadword 0, gUnknown_81A1896 - callstd 4 + msgbox gUnknown_81A1896 release end EventScript_1710FC:: @ 81710FC - loadword 0, gUnknown_81A169B - callstd 4 + msgbox gUnknown_81A169B applymovement 3, Movement_1A75E9 waitmovement 0 - loadword 0, gUnknown_81A1723 - callstd 4 + msgbox gUnknown_81A1723 applymovement 3, Movement_1A75E1 waitmovement 0 - loadword 0, gUnknown_81A17DF - callstd 4 + msgbox gUnknown_81A17DF setvar VAR_0x407F, 1 setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4 release end EventScript_171134:: @ 8171134 - loadword 0, gUnknown_81A15EC - callstd 4 + msgbox gUnknown_81A15EC release end @@ -436,13 +400,11 @@ Movement_171142:: @ 8171142 step_end OneIsland_PokemonCenter_1F_EventScript_171148:: @ 8171148 - loadword 0, gUnknown_81A20D5 - callstd 2 + msgbox gUnknown_81A20D5, 2 end OneIsland_PokemonCenter_1F_EventScript_171151:: @ 8171151 - loadword 0, gUnknown_81A212D - callstd 2 + msgbox gUnknown_81A212D, 2 end OneIsland_PokemonCenter_1F_EventScript_17115A:: @ 817115A @@ -450,14 +412,12 @@ OneIsland_PokemonCenter_1F_EventScript_17115A:: @ 817115A faceplayer checkflag FLAG_0x844 goto_if 1, EventScript_17116F - loadword 0, gUnknown_81A218D - callstd 4 + msgbox gUnknown_81A218D release end EventScript_17116F:: @ 817116F - loadword 0, gUnknown_81A21D0 - callstd 4 + msgbox gUnknown_81A21D0 release end @@ -467,20 +427,17 @@ OneIsland_PokemonCenter_1F_EventScript_171179:: @ 8171179 goto_if 1, EventScript_1711A0 checkflag FLAG_0x2A1 goto_if 1, EventScript_171196 - loadword 0, gUnknown_81A223F - callstd 4 + msgbox gUnknown_81A223F releaseall end EventScript_171196:: @ 8171196 - loadword 0, gUnknown_81A2286 - callstd 4 + msgbox gUnknown_81A2286 releaseall end EventScript_1711A0:: @ 81711A0 - loadword 0, gUnknown_81A22CB - callstd 4 + msgbox gUnknown_81A22CB releaseall end @@ -513,8 +470,7 @@ EventScript_1711DA:: @ 81711DA playse SE_PIN applymovement 2, Movement_1A75DB waitmovement 0 - loadword 0, gUnknown_81A13B8 - callstd 4 + msgbox gUnknown_81A13B8 closemessage compare_var_to_value VAR_0x4001, 1 call_if 1, EventScript_1712E4 @@ -525,20 +481,16 @@ EventScript_1711DA:: @ 81711DA compare_var_to_value VAR_0x4001, 4 call_if 1, EventScript_171305 delay 10 - loadword 0, gUnknown_81A13CB - callstd 4 + msgbox gUnknown_81A13CB applymovement 255, Movement_1A75ED waitmovement 0 - loadword 0, gUnknown_81A1431 - callstd 4 + msgbox gUnknown_81A1431 applymovement 2, Movement_1A75ED waitmovement 0 applymovement 3, Movement_1A75E9 waitmovement 0 - loadword 0, gUnknown_81A1470 - callstd 4 - loadword 0, gUnknown_81A14E1 - callstd 4 + msgbox gUnknown_81A1470 + msgbox gUnknown_81A14E1 closemessage applymovement 2, Movement_1A75E7 waitmovement 0 @@ -546,8 +498,7 @@ EventScript_1711DA:: @ 81711DA applymovement 255, Movement_1A75EB waitmovement 0 delay 15 - loadword 0, gUnknown_81A14FB - callstd 4 + msgbox gUnknown_81A14FB closemessage applymovement 2, Movement_1A75ED waitmovement 0 @@ -556,8 +507,7 @@ EventScript_1711DA:: @ 81711DA waitmovement 0 applymovement 255, Movement_1A75ED waitmovement 0 - loadword 0, gUnknown_81A1574 - callstd 4 + msgbox gUnknown_81A1574 closemessage delay 25 applymovement 255, Movement_171326 diff --git a/data/maps/OneIsland_TreasureBeach/scripts.inc b/data/maps/OneIsland_TreasureBeach/scripts.inc index d6055235f..192cf4898 100644 --- a/data/maps/OneIsland_TreasureBeach/scripts.inc +++ b/data/maps/OneIsland_TreasureBeach/scripts.inc @@ -2,6 +2,5 @@ OneIsland_TreasureBeach_MapScripts:: @ 816876B .byte 0 OneIsland_TreasureBeach_EventScript_16876C:: @ 816876C - loadword 0, gUnknown_8189DCE - callstd 2 + msgbox gUnknown_8189DCE, 2 end diff --git a/data/maps/PalletTown/scripts.inc b/data/maps/PalletTown/scripts.inc index 26f0708c0..b8e54e837 100644 --- a/data/maps/PalletTown/scripts.inc +++ b/data/maps/PalletTown/scripts.inc @@ -52,8 +52,7 @@ EventScript_1654D8:: @ 81654D8 waitmovement 0 checkflag FLAG_SYS_RIBBON_GET goto_if 0, EventScript_1655A1 - loadword 0, gUnknown_817D8BF - callstd 4 + msgbox gUnknown_817D8BF setvar VAR_0x8004, 0 specialvar VAR_RESULT, sub_80CA3D8 copyvar VAR_0x8008, VAR_0x8005 @@ -62,8 +61,7 @@ EventScript_1654D8:: @ 81654D8 getnumberstring 1, VAR_0x8009 compare_var_to_value VAR_0x8009, 60 goto_if 0, EventScript_165593 - loadword 0, gUnknown_817D9AA - callstd 4 + msgbox gUnknown_817D9AA closemessage playbgm BGM_FRLG_FOLLOW_ME, 0 applymovement 255, Movement_1655DD @@ -94,14 +92,12 @@ EventScript_16557E:: @ 816557E end EventScript_165593:: @ 8165593 - loadword 0, gUnknown_817D925 - callstd 4 + msgbox gUnknown_817D925 goto EventScript_16557E end EventScript_1655A1:: @ 81655A1 - loadword 0, gUnknown_817DA16 - callstd 4 + msgbox gUnknown_817DA16 goto EventScript_16557E end @@ -210,8 +206,7 @@ EventScript_165605:: @ 8165605 compare_var_to_value VAR_0x4001, 1 call_if 1, EventScript_1656C3 delay 30 - loadword 0, gUnknown_817D74A - callstd 4 + msgbox gUnknown_817D74A closemessage delay 30 compare_var_to_value VAR_0x4001, 0 @@ -389,8 +384,7 @@ PalletTown_EventScript_16575C:: @ 816575C goto_if 1, EventScript_1658C2 checkflag FLAG_0x002 goto_if 1, EventScript_165801 - loadword 0, gUnknown_81B1C8B - callstd 4 + msgbox gUnknown_81B1C8B applymovement 1, Movement_1A75E1 waitmovement 0 playse SE_PIN @@ -398,8 +392,7 @@ PalletTown_EventScript_16575C:: @ 816575C waitmovement 0 applymovement 1, Movement_1A75DD waitmovement 0 - loadword 0, gUnknown_81B1C9F - callstd 4 + msgbox gUnknown_81B1C9F closemessage compare_var_to_value VAR_FACING, 4 call_if 1, EventScript_1657D7 @@ -423,24 +416,21 @@ EventScript_1657E2:: @ 81657E2 EventScript_1657ED:: @ 81657ED applymovement 1, Movement_1A75E1 waitmovement 0 - loadword 0, gUnknown_817D7C8 - callstd 4 + msgbox gUnknown_817D7C8 release end EventScript_165801:: @ 8165801 applymovement 1, Movement_1A75E1 waitmovement 0 - loadword 0, gUnknown_81B1CAF - callstd 4 + msgbox gUnknown_81B1CAF release end EventScript_165815:: @ 8165815 applymovement 1, Movement_1A75E1 waitmovement 0 - loadword 0, gUnknown_81B1CEC - callstd 4 + msgbox gUnknown_81B1CEC release end @@ -455,8 +445,7 @@ Movement_16582C:: @ 816582C step_end PalletTown_EventScript_16582F:: @ 816582F - loadword 0, gUnknown_817D80D - callstd 2 + msgbox gUnknown_817D80D, 2 end PalletTown_EventScript_165838:: @ 8165838 @@ -464,30 +453,25 @@ PalletTown_EventScript_165838:: @ 8165838 setvar VAR_0x8004, 0 setvar VAR_0x8005, 0 special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_817D866 - callstd 4 + msgbox gUnknown_817D866 releaseall end PalletTown_EventScript_165850:: @ 8165850 - loadword 0, gUnknown_817D87F - callstd 3 + msgbox gUnknown_817D87F, 3 end PalletTown_EventScript_165859:: @ 8165859 - loadword 0, gUnknown_817D88A - callstd 3 + msgbox gUnknown_817D88A, 3 end PalletTown_EventScript_165862:: @ 8165862 - loadword 0, gUnknown_817D895 - callstd 3 + msgbox gUnknown_817D895, 3 end PalletTown_EventScript_16586B:: @ 816586B lockall - loadword 0, gUnknown_81B1CC1 - callstd 4 + msgbox gUnknown_81B1CC1 setvar VAR_0x4070, 1 releaseall end @@ -503,8 +487,7 @@ PalletTown_EventScript_16587B:: @ 816587B EventScript_165894:: @ 8165894 textcolor 1 - loadword 0, gUnknown_81B1D0B - callstd 4 + msgbox gUnknown_81B1D0B closemessage delay 20 textcolor 3 @@ -514,8 +497,7 @@ EventScript_165894:: @ 8165894 special sub_80699E0 special sub_80699BC signmsg - loadword 0, gUnknown_81B1D51 - callstd 4 + msgbox gUnknown_81B1D51 normalmsg return diff --git a/data/maps/PalletTown_GarysHouse/scripts.inc b/data/maps/PalletTown_GarysHouse/scripts.inc index 1d7959229..fc6e0fac6 100644 --- a/data/maps/PalletTown_GarysHouse/scripts.inc +++ b/data/maps/PalletTown_GarysHouse/scripts.inc @@ -34,8 +34,7 @@ PalletTown_GarysHouse_EventScript_168D56:: @ 8168D56 goto_if 1, EventScript_168EF6 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1 goto_if 4, EventScript_168DAF - loadword 0, gUnknown_818D58C - callstd 4 + msgbox gUnknown_818D58C closemessage applymovement 1, Movement_1A75E5 waitmovement 0 @@ -43,8 +42,7 @@ PalletTown_GarysHouse_EventScript_168D56:: @ 8168D56 end EventScript_168DAF:: @ 8168DAF - loadword 0, gUnknown_818D5C4 - callstd 4 + msgbox gUnknown_818D5C4 release end @@ -55,12 +53,10 @@ EventScript_168DB9:: @ 8168DB9 special sub_8112364 compare_var_to_value VAR_MIRAGE_RND_L, 500 goto_if 0, EventScript_168E46 - loadword 0, gUnknown_818D7D3 - callstd 5 + msgbox gUnknown_818D7D3, 5 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_168E3C - loadword 0, gUnknown_818D8B2 - callstd 4 + msgbox gUnknown_818D8B2 special sub_80BF8FC waitstate lock @@ -70,8 +66,7 @@ EventScript_168DB9:: @ 8168DB9 specialvar VAR_RESULT, sub_80CAD54 compare_var_to_value VAR_RESULT, 412 goto_if 1, EventScript_168E32 - loadword 0, gUnknown_818D8CC - callstd 4 + msgbox gUnknown_818D8CC closemessage fadescreen 1 playfanfare MUS_ME_ASA @@ -79,26 +74,22 @@ EventScript_168DB9:: @ 8168DB9 special sub_80CC948 fadescreen 0 special TV_CopyNicknameToStringVar1AndEnsureTerminated - loadword 0, gUnknown_818D8FE - callstd 4 + msgbox gUnknown_818D8FE release end EventScript_168E32:: @ 8168E32 - loadword 0, gUnknown_818D97B - callstd 4 + msgbox gUnknown_818D97B release end EventScript_168E3C:: @ 8168E3C - loadword 0, gUnknown_818D875 - callstd 4 + msgbox gUnknown_818D875 release end EventScript_168E46:: @ 8168E46 - loadword 0, gUnknown_818D9A5 - callstd 4 + msgbox gUnknown_818D9A5 specialvar VAR_RESULT, sub_80CA76C copyvar VAR_0x8000, VAR_RESULT compare_var_to_value VAR_0x8000, 0 @@ -118,56 +109,47 @@ EventScript_168E46:: @ 8168E46 end EventScript_168EA6:: @ 8168EA6 - loadword 0, gUnknown_818DBDD - callstd 4 + msgbox gUnknown_818DBDD release end EventScript_168EB0:: @ 8168EB0 - loadword 0, gUnknown_818DB88 - callstd 4 + msgbox gUnknown_818DB88 release end EventScript_168EBA:: @ 8168EBA - loadword 0, gUnknown_818DB2E - callstd 4 + msgbox gUnknown_818DB2E release end EventScript_168EC4:: @ 8168EC4 - loadword 0, gUnknown_818DAF3 - callstd 4 + msgbox gUnknown_818DAF3 release end EventScript_168ECE:: @ 8168ECE - loadword 0, gUnknown_818DABE - callstd 4 + msgbox gUnknown_818DABE release end EventScript_168ED8:: @ 8168ED8 - loadword 0, gUnknown_818DA73 - callstd 4 + msgbox gUnknown_818DA73 release end EventScript_168EE2:: @ 8168EE2 - loadword 0, gUnknown_818DA16 - callstd 4 + msgbox gUnknown_818DA16 release end EventScript_168EEC:: @ 8168EEC - loadword 0, gUnknown_818D701 - callstd 4 + msgbox gUnknown_818D701 release end EventScript_168EF6:: @ 8168EF6 - loadword 0, gUnknown_818D60A - callstd 4 + msgbox gUnknown_818D60A closemessage checkitemspace ITEM_TOWN_MAP, 1 compare_var_to_value VAR_RESULT, 0 @@ -186,28 +168,23 @@ EventScript_168EF6:: @ 8168EF6 end EventScript_168F4F:: @ 8168F4F - loadword 0, gUnknown_818D684 - callstd 4 + msgbox gUnknown_818D684 release end EventScript_168F59:: @ 8168F59 - loadword 0, gUnknown_818D6AF - callstd 4 + msgbox gUnknown_818D6AF release end PalletTown_GarysHouse_EventScript_168F63:: @ 8168F63 - loadword 0, gUnknown_818D763 - callstd 2 + msgbox gUnknown_818D763, 2 end PalletTown_GarysHouse_EventScript_168F6C:: @ 8168F6C - loadword 0, gUnknown_818D7A1 - callstd 3 + msgbox gUnknown_818D7A1, 3 end PalletTown_GarysHouse_EventScript_168F75:: @ 8168F75 - loadword 0, gUnknown_818DC47 - callstd 3 + msgbox gUnknown_818DC47, 3 end diff --git a/data/maps/PalletTown_PlayersHouse_1F/scripts.inc b/data/maps/PalletTown_PlayersHouse_1F/scripts.inc index 3b50c5dad..c54acad65 100644 --- a/data/maps/PalletTown_PlayersHouse_1F/scripts.inc +++ b/data/maps/PalletTown_PlayersHouse_1F/scripts.inc @@ -18,22 +18,18 @@ PalletTown_PlayersHouse_1F_EventScript_168C09:: @ 8168C09 end EventScript_168C38:: @ 8168C38 - loadword 0, gUnknown_818D2F0 - callstd 4 + msgbox gUnknown_818D2F0 return EventScript_168C41:: @ 8168C41 - loadword 0, gUnknown_818D360 - callstd 4 + msgbox gUnknown_818D360 return EventScript_168C4A:: @ 8168C4A - loadword 0, gUnknown_818D3D1 - callstd 4 + msgbox gUnknown_818D3D1 closemessage call EventScript_1A6C26 - loadword 0, gUnknown_818D3F8 - callstd 4 + msgbox gUnknown_818D3F8 release end @@ -41,8 +37,7 @@ PalletTown_PlayersHouse_1F_EventScript_168C62:: @ 8168C62 lockall compare_var_to_value VAR_FACING, 2 goto_if 1, EventScript_168C78 - loadword 0, gUnknown_818D4F9 - callstd 4 + msgbox gUnknown_818D4F9 releaseall end @@ -56,11 +51,9 @@ EventScript_168C78:: @ 8168C78 end EventScript_168C91:: @ 8168C91 - loadword 0, gUnknown_818D43E - callstd 4 + msgbox gUnknown_818D43E return EventScript_168C9A:: @ 8168C9A - loadword 0, gUnknown_818D492 - callstd 4 + msgbox gUnknown_818D492 return diff --git a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc index d36443b37..1d0db7f52 100644 --- a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc +++ b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc @@ -22,13 +22,11 @@ EventScript_168CC8:: @ 8168CC8 end PalletTown_PlayersHouse_2F_EventScript_168CD2:: @ 8168CD2 - loadword 0, gUnknown_818D50B - callstd 3 + msgbox gUnknown_818D50B, 3 end PalletTown_PlayersHouse_2F_EventScript_168CDB:: @ 8168CDB - loadword 0, gUnknown_818D53B - callstd 3 + msgbox gUnknown_818D53B, 3 end gUnknown_8168CE4:: @ 8168CE4 @@ -42,8 +40,7 @@ PalletTown_PlayersHouse_2F_EventScript_168CE4:: @ 8168CE4 setvar VAR_0x8004, 1 special sub_80CA86C playse SE_PC_ON - loadword 0, gUnknown_81A5420 - callstd 4 + msgbox gUnknown_81A5420 special sub_80EB6AC waitstate special sub_812B35C diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc index 2d310234e..f147fd390 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc +++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc @@ -64,8 +64,7 @@ EventScript_169002:: @ 8169002 end EventScript_169035:: @ 8169035 - loadword 0, gUnknown_818EE60 - callstd 4 + msgbox gUnknown_818EE60 closemessage compare_var_to_value VAR_FACING, 2 call_if 1, EventScript_169174 @@ -75,18 +74,15 @@ EventScript_169035:: @ 8169035 call_if 1, EventScript_169194 compare_var_to_value VAR_FACING, 3 call_if 1, EventScript_169194 - loadword 0, gUnknown_818EF59 - callstd 4 + msgbox gUnknown_818EF59 fadedefaultbgm - loadword 0, gUnknown_818F004 - callstd 4 + msgbox gUnknown_818F004 compare_var_to_value VAR_FACING, 2 call_if 1, EventScript_1691DB compare_var_to_value VAR_FACING, 3 call_if 1, EventScript_1691E6 textcolor 3 - loadword 0, gUnknown_818F062 - callstd 4 + msgbox gUnknown_818F062 closemessage call EventScript_1A6675 compare_var_to_value VAR_FACING, 2 @@ -100,8 +96,7 @@ EventScript_169035:: @ 8169035 addobject 9 addobject 10 delay 30 - loadword 0, gUnknown_818F085 - callstd 4 + msgbox gUnknown_818F085 closemessage removeobject 9 removeobject 10 @@ -121,10 +116,8 @@ EventScript_169035:: @ 8169035 waitfanfare call EventScript_1A6675 special EnableNationalPokedex - loadword 0, gUnknown_818F103 - callstd 4 - loadword 0, gUnknown_818F1DB - callstd 4 + msgbox gUnknown_818F103 + msgbox gUnknown_818F1DB closemessage playbgm BGM_FRLG_RIVAL_POSTBATTLE, 0 compare_var_to_value VAR_FACING, 2 @@ -234,20 +227,16 @@ EventScript_16923E:: @ 816923E clearflag FLAG_SPECIAL_FLAG_0x4001 savebgm SE_STOP fadedefaultbgm - loadword 0, gUnknown_818DC94 - callstd 4 + msgbox gUnknown_818DC94 closemessage delay 60 - loadword 0, gUnknown_818DFBC - callstd 4 + msgbox gUnknown_818DFBC closemessage delay 30 applymovement 8, Movement_1692C0 waitmovement 0 - loadword 0, gUnknown_818DCB9 - callstd 4 - loadword 0, gUnknown_818E0EA - callstd 4 + msgbox gUnknown_818DCB9 + msgbox gUnknown_818E0EA setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2 releaseall end @@ -282,8 +271,7 @@ PalletTown_ProfessorOaksLab_EventScript_1692C3:: @ 81692C3 textcolor 0 applymovement 4, Movement_1A75F1 waitmovement 0 - loadword 0, gUnknown_818E177 - callstd 4 + msgbox gUnknown_818E177 closemessage applymovement 255, Movement_1692E5 waitmovement 0 @@ -319,8 +307,7 @@ EventScript_16930B:: @ 816930B waitmovement 0 applymovement 255, Movement_1A75E9 waitmovement 0 - loadword 0, gUnknown_818DDA4 - callstd 4 + msgbox gUnknown_818DDA4 closemessage applymovement 4, Movement_1A75F1 waitmovement 0 @@ -502,8 +489,7 @@ Movement_1694BE:: @ 81694BE EventScript_1694C2:: @ 81694C2 special sp000_heal_pokemon - loadword 0, gUnknown_818DE38 - callstd 4 + msgbox gUnknown_818DE38 closemessage playbgm BGM_FRLG_RIVAL_POSTBATTLE, 0 compare_var_to_value VAR_0x4002, 1 @@ -592,20 +578,17 @@ PalletTown_ProfessorOaksLab_EventScript_16955F:: @ 816955F goto_if 1, EventScript_16958B compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2 goto_if 1, EventScript_169581 - loadword 0, gUnknown_818DC67 - callstd 4 + msgbox gUnknown_818DC67 release end EventScript_169581:: @ 8169581 - loadword 0, gUnknown_818DCE2 - callstd 4 + msgbox gUnknown_818DCE2 release end EventScript_16958B:: @ 816958B - loadword 0, gUnknown_818DD75 - callstd 4 + msgbox gUnknown_818DD75 release end @@ -630,32 +613,27 @@ PalletTown_ProfessorOaksLab_EventScript_169595:: @ 8169595 goto_if 1, EventScript_169614 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 goto_if 1, EventScript_16960A - loadword 0, gUnknown_818E116 - callstd 4 + msgbox gUnknown_818E116 release end EventScript_169600:: @ 8169600 - loadword 0, gUnknown_81A72AD - callstd 4 + msgbox gUnknown_81A72AD release end EventScript_16960A:: @ 816960A - loadword 0, gUnknown_818E330 - callstd 4 + msgbox gUnknown_818E330 release end EventScript_169614:: @ 8169614 - loadword 0, gUnknown_818E3AD - callstd 4 + msgbox gUnknown_818E3AD release end EventScript_16961E:: @ 816961E - loadword 0, gUnknown_818E405 - callstd 4 + msgbox gUnknown_818E405 textcolor 3 playfanfare MUS_ME_WAZA message Text_18E4AF @@ -663,11 +641,9 @@ EventScript_16961E:: @ 816961E waitfanfare call EventScript_1A6675 removeitem ITEM_OAKS_PARCEL, 1 - loadword 0, gUnknown_818E4CA - callstd 4 + msgbox gUnknown_818E4CA playbgm BGM_FRLG_RIVAL, 0 - loadword 0, gUnknown_818DE8D - callstd 4 + msgbox gUnknown_818DE8D closemessage compare_var_to_value VAR_FACING, 2 call_if 1, EventScript_169A82 @@ -678,8 +654,7 @@ EventScript_16961E:: @ 816961E compare_var_to_value VAR_FACING, 3 call_if 1, EventScript_169A9E fadedefaultbgm - loadword 0, gUnknown_818DE99 - callstd 4 + msgbox gUnknown_818DE99 closemessage delay 30 playse SE_PIN @@ -695,8 +670,7 @@ EventScript_16961E:: @ 816961E call_if 1, EventScript_169AF5 compare_var_to_value VAR_FACING, 2 call_if 1, EventScript_169B86 - loadword 0, gUnknown_818E508 - callstd 4 + msgbox gUnknown_818E508 closemessage compare_var_to_value VAR_FACING, 2 call_if 1, EventScript_169882 @@ -706,12 +680,10 @@ EventScript_16961E:: @ 816961E call_if 1, EventScript_1698A6 compare_var_to_value VAR_FACING, 3 call_if 1, EventScript_1698B8 - loadword 0, gUnknown_818E536 - callstd 4 + msgbox gUnknown_818E536 closemessage delay 40 - loadword 0, gUnknown_818E5C5 - callstd 4 + msgbox gUnknown_818E5C5 closemessage applymovement 4, Movement_1A75E9 waitmovement 0 @@ -737,19 +709,15 @@ EventScript_16961E:: @ 816961E setflag FLAG_0x829 special sub_810B810 setvar VAR_0x407C, 1 - loadword 0, gUnknown_818E612 - callstd 4 + msgbox gUnknown_818E612 additem ITEM_POKE_BALL, 5 giveitemfanfaremsg gUnknown_818E6B3, ITEM_POKE_BALL, 5 - loadword 0, gUnknown_818E6D0 - callstd 4 + msgbox gUnknown_818E6D0 setvar VAR_0x8004, 0 setvar VAR_0x8005, 1 special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_818E784 - callstd 4 - loadword 0, gUnknown_818DEC8 - callstd 4 + msgbox gUnknown_818E784 + msgbox gUnknown_818DEC8 compare_var_to_value VAR_FACING, 2 call_if 1, EventScript_169B33 compare_var_to_value VAR_FACING, 1 @@ -758,8 +726,7 @@ EventScript_16961E:: @ 816961E call_if 1, EventScript_169B57 compare_var_to_value VAR_FACING, 3 call_if 1, EventScript_169B57 - loadword 0, gUnknown_818DEF3 - callstd 4 + msgbox gUnknown_818DEF3 closemessage playbgm BGM_FRLG_RIVAL_POSTBATTLE, 0 compare_var_to_value VAR_FACING, 2 @@ -903,8 +870,7 @@ EventScript_169913:: @ 8169913 waitmovement 0 closemessage delay 70 - loadword 0, gUnknown_81A72AD - callstd 4 + msgbox gUnknown_81A72AD setflag FLAG_0x002 release end @@ -1011,8 +977,7 @@ EventScript_1699CE:: @ 81699CE checkflag FLAG_SYS_RIBBON_GET goto_if 0, EventScript_1699F9 delay 30 - loadword 0, gUnknown_818EDF5 - callstd 4 + msgbox gUnknown_818EDF5 goto EventScript_169035 end @@ -1042,8 +1007,7 @@ EventScript_169A34:: @ 8169A34 end EventScript_169A45:: @ 8169A45 - loadword 0, gUnknown_818E89C - callstd 4 + msgbox gUnknown_818E89C additem ITEM_POKE_BALL, 5 giveitemfanfaremsg gUnknown_818E6B3, ITEM_POKE_BALL, 5 setflag FLAG_0x247 @@ -1051,14 +1015,12 @@ EventScript_169A45:: @ 8169A45 end EventScript_169A6E:: @ 8169A6E - loadword 0, gUnknown_818E871 - callstd 4 + msgbox gUnknown_818E871 release end EventScript_169A78:: @ 8169A78 - loadword 0, gUnknown_818E98E - callstd 4 + msgbox gUnknown_818E98E release end @@ -1192,8 +1154,7 @@ PalletTown_ProfessorOaksLab_EventScript_169BAB:: @ 8169BAB goto_if 4, EventScript_169DE4 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2 goto_if 1, EventScript_169BE1 - loadword 0, gUnknown_818EA19 - callstd 4 + msgbox gUnknown_818EA19 release end @@ -1211,8 +1172,7 @@ EventScript_169BE1:: @ 8169BE1 end EventScript_169C14:: @ 8169C14 - loadword 0, gUnknown_818E272 - callstd 5 + msgbox gUnknown_818E272, 5 compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_169C74 compare_var_to_value VAR_RESULT, 0 @@ -1220,8 +1180,7 @@ EventScript_169C14:: @ 8169C14 end EventScript_169C33:: @ 8169C33 - loadword 0, gUnknown_818E207 - callstd 5 + msgbox gUnknown_818E207, 5 compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_169C74 compare_var_to_value VAR_RESULT, 0 @@ -1229,8 +1188,7 @@ EventScript_169C33:: @ 8169C33 end EventScript_169C52:: @ 8169C52 - loadword 0, gUnknown_818E194 - callstd 5 + msgbox gUnknown_818E194, 5 compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_169C74 compare_var_to_value VAR_RESULT, 0 @@ -1245,8 +1203,7 @@ EventScript_169C71:: @ 8169C71 EventScript_169C74:: @ 8169C74 erasemonpic removeobject VAR_LAST_TALKED - loadword 0, gUnknown_818E2E5 - callstd 4 + msgbox gUnknown_818E2E5 call EventScript_1A6675 setflag FLAG_0x828 setflag FLAG_0x291 @@ -1257,8 +1214,7 @@ EventScript_169C74:: @ 8169C74 waitmessage playfanfare BGM_FRLG_ME_KEYITEM waitfanfare - loadword 0, gUnknown_81A56A7 - callstd 5 + msgbox gUnknown_81A56A7, 5 compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_169CCC compare_var_to_value VAR_RESULT, 0 @@ -1301,8 +1257,7 @@ EventScript_169D1F:: @ 8169D1F EventScript_169D2F:: @ 8169D2F textcolor 0 - loadword 0, gUnknown_818DD34 - callstd 4 + msgbox gUnknown_818DD34 removeobject VAR_0x4004 textcolor 3 getspeciesname 0, 16387 @@ -1359,8 +1314,7 @@ PalletTown_ProfessorOaksLab_EventScript_169D78:: @ 8169D78 goto_if 4, EventScript_169DE4 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2 goto_if 1, EventScript_169BE1 - loadword 0, gUnknown_818EA19 - callstd 4 + msgbox gUnknown_818EA19 release end @@ -1375,14 +1329,12 @@ PalletTown_ProfessorOaksLab_EventScript_169DAE:: @ 8169DAE goto_if 4, EventScript_169DE4 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2 goto_if 1, EventScript_169BE1 - loadword 0, gUnknown_818EA19 - callstd 4 + msgbox gUnknown_818EA19 release end EventScript_169DE4:: @ 8169DE4 - loadword 0, gUnknown_818EA45 - callstd 4 + msgbox gUnknown_818EA45 release end @@ -1391,8 +1343,7 @@ PalletTown_ProfessorOaksLab_EventScript_169DEE:: @ 8169DEE faceplayer checkflag FLAG_0x82C goto_if 1, EventScript_169E03 - loadword 0, gUnknown_818EBE6 - callstd 4 + msgbox gUnknown_818EBE6 release end @@ -1400,8 +1351,7 @@ EventScript_169E03:: @ 8169E03 setvar VAR_0x8004, 0 setvar VAR_0x8005, 5 special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_818ED15 - callstd 4 + msgbox gUnknown_818ED15 release end @@ -1410,8 +1360,7 @@ PalletTown_ProfessorOaksLab_EventScript_169E1A:: @ 8169E1A faceplayer checkflag FLAG_0x82C goto_if 1, EventScript_169E2F - loadword 0, gUnknown_818EBE6 - callstd 4 + msgbox gUnknown_818EBE6 release end @@ -1419,8 +1368,7 @@ EventScript_169E2F:: @ 8169E2F setvar VAR_0x8004, 1 setvar VAR_0x8005, 0 special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_818EC0B - callstd 4 + msgbox gUnknown_818EC0B release end @@ -1430,37 +1378,31 @@ PalletTown_ProfessorOaksLab_EventScript_169E46:: @ 8169E46 setvar VAR_0x8004, 0 setvar VAR_0x8005, 2 special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_818ED81 - callstd 4 + msgbox gUnknown_818ED81 release end PalletTown_ProfessorOaksLab_EventScript_169E5F:: @ 8169E5F - loadword 0, gUnknown_818E9E5 - callstd 2 + msgbox gUnknown_818E9E5, 2 end PalletTown_ProfessorOaksLab_EventScript_169E68:: @ 8169E68 - loadword 0, gUnknown_818EAF4 - callstd 3 + msgbox gUnknown_818EAF4, 3 end PalletTown_ProfessorOaksLab_EventScript_169E71:: @ 8169E71 - loadword 0, gUnknown_818EA66 - callstd 3 + msgbox gUnknown_818EA66, 3 end PalletTown_ProfessorOaksLab_EventScript_169E7A:: @ 8169E7A lockall compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 6 goto_if 4, EventScript_169E90 - loadword 0, gUnknown_818EA84 - callstd 4 + msgbox gUnknown_818EA84 releaseall end EventScript_169E90:: @ 8169E90 - loadword 0, gUnknown_818EAB6 - callstd 4 + msgbox gUnknown_818EAB6 releaseall end diff --git a/data/maps/PewterCity/scripts.inc b/data/maps/PewterCity/scripts.inc index 61b542ae3..bdd501867 100644 --- a/data/maps/PewterCity/scripts.inc +++ b/data/maps/PewterCity/scripts.inc @@ -10,14 +10,12 @@ PewterCity_MapScript1_165B94:: @ 8165B94 PewterCity_EventScript_165B9D:: @ 8165B9D lock faceplayer - loadword 0, gUnknown_817E67E - callstd 4 + msgbox gUnknown_817E67E closemessage playbgm BGM_FRLG_FOLLOW_ME, 0 compare_var_to_value VAR_FACING, 4 call_if 1, EventScript_165BD3 - loadword 0, gUnknown_817E6C7 - callstd 4 + msgbox gUnknown_817E6C7 closemessage applymovement 5, Movement_165D83 waitmovement 0 @@ -444,8 +442,7 @@ PewterCity_EventScript_165DB2:: @ 8165DB2 EventScript_165DBE:: @ 8165DBE textcolor 0 - loadword 0, gUnknown_817E67E - callstd 4 + msgbox gUnknown_817E67E closemessage playbgm BGM_FRLG_FOLLOW_ME, 0 compare_var_to_value VAR_0x4001, 0 @@ -454,8 +451,7 @@ EventScript_165DBE:: @ 8165DBE call_if 1, EventScript_165E26 compare_var_to_value VAR_0x4001, 2 call_if 1, EventScript_165E42 - loadword 0, gUnknown_817E6C7 - callstd 4 + msgbox gUnknown_817E6C7 closemessage applymovement 5, Movement_165D83 waitmovement 0 @@ -1029,19 +1025,16 @@ Movement_166042:: @ 8166042 step_end PewterCity_EventScript_166075:: @ 8166075 - loadword 0, gUnknown_817E436 - callstd 2 + msgbox gUnknown_817E436, 2 end PewterCity_EventScript_16607E:: @ 816607E lock faceplayer - loadword 0, gUnknown_817E53E - callstd 5 + msgbox gUnknown_817E53E, 5 compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_166136 - loadword 0, gUnknown_817E589 - callstd 4 + msgbox gUnknown_817E589 closemessage delay 10 playbgm BGM_FRLG_FOLLOW_ME, 0 @@ -1053,8 +1046,7 @@ PewterCity_EventScript_16607E:: @ 816607E call_if 1, EventScript_166112 compare_var_to_value VAR_FACING, 4 call_if 1, EventScript_166124 - loadword 0, gUnknown_817E5AC - callstd 4 + msgbox gUnknown_817E5AC closemessage delay 10 applymovement 2, Movement_16621C @@ -1090,8 +1082,7 @@ EventScript_166124:: @ 8166124 return EventScript_166136:: @ 8166136 - loadword 0, gUnknown_817E55C - callstd 4 + msgbox gUnknown_817E55C release end @@ -1354,42 +1345,35 @@ PewterCity_EventScript_16622B:: @ 816622B setvar VAR_0x8004, 2 setvar VAR_0x8005, 2 special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_817E49F - callstd 4 + msgbox gUnknown_817E49F release end PewterCity_EventScript_166244:: @ 8166244 lock faceplayer - loadword 0, gUnknown_817E602 - callstd 5 + msgbox gUnknown_817E602, 5 compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_166263 - loadword 0, gUnknown_817E644 - callstd 4 + msgbox gUnknown_817E644 release end EventScript_166263:: @ 8166263 - loadword 0, gUnknown_817E626 - callstd 4 + msgbox gUnknown_817E626 release end PewterCity_EventScript_16626D:: @ 816626D - loadword 0, gUnknown_817E6F6 - callstd 3 + msgbox gUnknown_817E6F6, 3 end PewterCity_EventScript_166276:: @ 8166276 - loadword 0, gUnknown_817E748 - callstd 3 + msgbox gUnknown_817E748, 3 end PewterCity_EventScript_16627F:: @ 816627F - loadword 0, gUnknown_817E7C5 - callstd 3 + msgbox gUnknown_817E7C5, 3 end PewterCity_EventScript_166288:: @ 8166288 @@ -1397,14 +1381,12 @@ PewterCity_EventScript_166288:: @ 8166288 setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_817E7DE - callstd 4 + msgbox gUnknown_817E7DE releaseall end PewterCity_EventScript_1662A0:: @ 81662A0 - loadword 0, gUnknown_817E824 - callstd 3 + msgbox gUnknown_817E824, 3 end PewterCity_EventScript_1662A9:: @ 81662A9 @@ -1450,8 +1432,7 @@ EventScript_1662DE:: @ 81662DE waitmovement 0 applymovement 7, Movement_1A75DD waitmovement 0 - loadword 0, gUnknown_817E902 - callstd 4 + msgbox gUnknown_817E902 compare_var_to_value VAR_0x4001, 0 call_if 1, EventScript_1663D5 compare_var_to_value VAR_0x4001, 1 @@ -1460,23 +1441,19 @@ EventScript_1662DE:: @ 81662DE call_if 1, EventScript_1663E6 compare_var_to_value VAR_0x4001, 3 call_if 1, EventScript_1663FC - loadword 0, gUnknown_817E90C - callstd 4 + msgbox gUnknown_817E90C textcolor 3 playfanfare BGM_FRLG_ME_KEYITEM message Text_17E970 waitmessage waitfanfare - loadword 0, gUnknown_817E99D - callstd 4 + msgbox gUnknown_817E99D special sub_80699BC signmsg - loadword 0, gUnknown_817E9C7 - callstd 4 + msgbox gUnknown_817E9C7 normalmsg call EventScript_1A6675 - loadword 0, gUnknown_817EA06 - callstd 4 + msgbox gUnknown_817EA06 closemessage compare_var_to_value VAR_0x4001, 0 call_if 1, EventScript_166412 @@ -1488,8 +1465,7 @@ EventScript_1662DE:: @ 81662DE call_if 1, EventScript_166433 delay 30 textcolor 3 - loadword 0, gUnknown_817EA36 - callstd 4 + msgbox gUnknown_817EA36 closemessage removeobject 7 setflag FLAG_0x82F diff --git a/data/maps/PewterCity_Gym/scripts.inc b/data/maps/PewterCity_Gym/scripts.inc index 3d9ee1d2f..730363a53 100644 --- a/data/maps/PewterCity_Gym/scripts.inc +++ b/data/maps/PewterCity_Gym/scripts.inc @@ -8,8 +8,7 @@ PewterCity_Gym_EventScript_16A593:: @ 816A593 trainerbattle 1, 414, 0, Text_190CD4, Text_190E4F, EventScript_16A5C5 checkflag FLAG_0x254 goto_if 0, EventScript_16A5F3 - loadword 0, gUnknown_819110F - callstd 4 + msgbox gUnknown_819110F release end @@ -28,29 +27,25 @@ EventScript_16A5C5:: @ 816A5C5 end EventScript_16A5F3:: @ 816A5F3 - loadword 0, gUnknown_8190FC1 - callstd 4 + msgbox gUnknown_8190FC1 checkitemspace ITEM_TM39, 1 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16A634 additem ITEM_TM39, 1 giveitemfanfaremsg gUnknown_8190FDB, ITEM_TM39 setflag FLAG_0x254 - loadword 0, gUnknown_8190FF8 - callstd 4 + msgbox gUnknown_8190FF8 release end EventScript_16A634:: @ 816A634 - loadword 0, gUnknown_81911CE - callstd 4 + msgbox gUnknown_81911CE release end PewterCity_Gym_EventScript_16A63E:: @ 816A63E trainerbattle 0, 142, 0, Text_1911EC, Text_191237 - loadword 0, gUnknown_819126B - callstd 6 + msgbox gUnknown_819126B, 6 end PewterCity_Gym_EventScript_16A655:: @ 816A655 @@ -58,8 +53,7 @@ PewterCity_Gym_EventScript_16A655:: @ 816A655 faceplayer checkflag FLAG_0x4B0 goto_if 1, EventScript_16A67F - loadword 0, gUnknown_8191298 - callstd 5 + msgbox gUnknown_8191298, 5 compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_16A689 compare_var_to_value VAR_RESULT, 0 @@ -67,26 +61,22 @@ PewterCity_Gym_EventScript_16A655:: @ 816A655 end EventScript_16A67F:: @ 816A67F - loadword 0, gUnknown_819143C - callstd 4 + msgbox gUnknown_819143C release end EventScript_16A689:: @ 816A689 - loadword 0, gUnknown_819133C - callstd 4 + msgbox gUnknown_819133C goto EventScript_16A6A5 end EventScript_16A697:: @ 816A697 - loadword 0, gUnknown_8191412 - callstd 4 + msgbox gUnknown_8191412 goto EventScript_16A6A5 end EventScript_16A6A5:: @ 816A6A5 - loadword 0, gUnknown_819135C - callstd 4 + msgbox gUnknown_819135C release end @@ -94,13 +84,11 @@ PewterCity_Gym_EventScript_16A6AF:: @ 816A6AF lockall checkflag FLAG_UNK820 goto_if 1, EventScript_16A6C3 - loadword 0, gUnknown_819146E - callstd 4 + msgbox gUnknown_819146E releaseall end EventScript_16A6C3:: @ 816A6C3 - loadword 0, gUnknown_81914A4 - callstd 4 + msgbox gUnknown_81914A4 releaseall end diff --git a/data/maps/PewterCity_House1/scripts.inc b/data/maps/PewterCity_House1/scripts.inc index 2b91b526c..3be582ab3 100644 --- a/data/maps/PewterCity_House1/scripts.inc +++ b/data/maps/PewterCity_House1/scripts.inc @@ -2,14 +2,12 @@ PewterCity_House1_MapScripts:: @ 816A71C .byte 0 PewterCity_House1_EventScript_16A71D:: @ 816A71D - loadword 0, gUnknown_81915DB - callstd 2 + msgbox gUnknown_81915DB, 2 end PewterCity_House1_EventScript_16A726:: @ 816A726 lock - loadword 0, gUnknown_81915CD - callstd 4 + msgbox gUnknown_81915CD call EventScript_16A749 release end @@ -27,8 +25,7 @@ EventScript_16A749:: @ 816A749 textcolor 3 waitse playmoncry SPECIES_NIDORAN_M, 0 - loadword 0, gUnknown_81915BB - callstd 4 + msgbox gUnknown_81915BB waitmoncry call EventScript_1A6675 return diff --git a/data/maps/PewterCity_House2/scripts.inc b/data/maps/PewterCity_House2/scripts.inc index 924d132b7..2db341b30 100644 --- a/data/maps/PewterCity_House2/scripts.inc +++ b/data/maps/PewterCity_House2/scripts.inc @@ -2,11 +2,9 @@ PewterCity_House2_MapScripts:: @ 816A7DC .byte 0 PewterCity_House2_EventScript_16A7DD:: @ 816A7DD - loadword 0, gUnknown_81917E4 - callstd 2 + msgbox gUnknown_81917E4, 2 end PewterCity_House2_EventScript_16A7E6:: @ 816A7E6 - loadword 0, gUnknown_8191840 - callstd 2 + msgbox gUnknown_8191840, 2 end diff --git a/data/maps/PewterCity_Mart/scripts.inc b/data/maps/PewterCity_Mart/scripts.inc index 01bc843cd..374a99048 100644 --- a/data/maps/PewterCity_Mart/scripts.inc +++ b/data/maps/PewterCity_Mart/scripts.inc @@ -2,13 +2,11 @@ PewterCity_Mart_MapScripts:: @ 816A6CD .byte 0 PewterCity_Mart_EventScript_16A6CE:: @ 816A6CE - loadword 0, gUnknown_81914DE - callstd 2 + msgbox gUnknown_81914DE, 2 end PewterCity_Mart_EventScript_16A6D7:: @ 816A6D7 - loadword 0, gUnknown_8191541 - callstd 2 + msgbox gUnknown_8191541, 2 end PewterCity_Mart_EventScript_16A6E0:: @ 816A6E0 @@ -20,8 +18,7 @@ PewterCity_Mart_EventScript_16A6E0:: @ 816A6E0 message Text_1A6211 waitmessage pokemart Items_16A708 - loadword 0, gUnknown_81A5190 - callstd 4 + msgbox gUnknown_81A5190 release end diff --git a/data/maps/PewterCity_Museum_1F/scripts.inc b/data/maps/PewterCity_Museum_1F/scripts.inc index 94b04c528..ff718e206 100644 --- a/data/maps/PewterCity_Museum_1F/scripts.inc +++ b/data/maps/PewterCity_Museum_1F/scripts.inc @@ -10,14 +10,12 @@ PewterCity_Museum_1F_EventScript_16A31B:: @ 816A31B goto_if 1, EventScript_16A348 compare_var_to_value VAR_FACING, 2 goto_if 1, EventScript_16A348 - loadword 0, gUnknown_8190539 - callstd 4 + msgbox gUnknown_8190539 release end EventScript_16A348:: @ 816A348 - loadword 0, gUnknown_8190550 - callstd 5 + msgbox gUnknown_8190550, 5 compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_16A367 compare_var_to_value VAR_RESULT, 0 @@ -25,16 +23,14 @@ EventScript_16A348:: @ 816A348 end EventScript_16A367:: @ 816A367 - loadword 0, gUnknown_81905B1 - callstd 4 + msgbox gUnknown_81905B1 applymovement 1, Movement_1A75E5 waitmovement 0 release end EventScript_16A37B:: @ 816A37B - loadword 0, gUnknown_8190627 - callstd 4 + msgbox gUnknown_8190627 applymovement 1, Movement_1A75E5 waitmovement 0 release @@ -67,12 +63,10 @@ PewterCity_Museum_1F_EventScript_16A3BB:: @ 816A3BB EventScript_16A3D1:: @ 816A3D1 textcolor 0 showmoneybox 0, 0, 0 - loadword 0, gUnknown_81904B5 - callstd 5 + msgbox gUnknown_81904B5, 5 compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_16A402 - loadword 0, gUnknown_81904F9 - callstd 4 + msgbox gUnknown_81904F9 closemessage hidemoneybox .byte 0 @@ -97,8 +91,7 @@ EventScript_16A402:: @ 816A402 takemoney 50, 0 updatemoneybox 0, 0, 0 waitse - loadword 0, gUnknown_8190505 - callstd 4 + msgbox gUnknown_8190505 setvar VAR_0x4061, 1 hidemoneybox .byte 0 @@ -122,8 +115,7 @@ EventScript_16A46B:: @ 816A46B return EventScript_16A476:: @ 816A476 - loadword 0, gUnknown_819051C - callstd 4 + msgbox gUnknown_819051C closemessage hidemoneybox .byte 0 @@ -156,13 +148,11 @@ Movement_16A499:: @ 816A499 step_end PewterCity_Museum_1F_EventScript_16A49C:: @ 816A49C - loadword 0, gUnknown_81908CD - callstd 2 + msgbox gUnknown_81908CD, 2 end PewterCity_Museum_1F_EventScript_16A4A5:: @ 816A4A5 - loadword 0, gUnknown_81906B4 - callstd 2 + msgbox gUnknown_81906B4, 2 end PewterCity_Museum_1F_EventScript_16A4AE:: @ 816A4AE @@ -170,8 +160,7 @@ PewterCity_Museum_1F_EventScript_16A4AE:: @ 816A4AE faceplayer checkflag FLAG_0x25E goto_if 1, EventScript_16A4FF - loadword 0, gUnknown_8190717 - callstd 4 + msgbox gUnknown_8190717 checkitemspace ITEM_OLD_AMBER, 1 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16A4F5 @@ -183,20 +172,17 @@ PewterCity_Museum_1F_EventScript_16A4AE:: @ 816A4AE end EventScript_16A4F5:: @ 816A4F5 - loadword 0, gUnknown_81908AE - callstd 4 + msgbox gUnknown_81908AE release end EventScript_16A4FF:: @ 816A4FF - loadword 0, gUnknown_819088E - callstd 4 + msgbox gUnknown_819088E release end PewterCity_Museum_1F_EventScript_16A509:: @ 816A509 - loadword 0, gUnknown_819090A - callstd 2 + msgbox gUnknown_819090A, 2 end PewterCity_Museum_1F_EventScript_16A512:: @ 816A512 @@ -205,8 +191,7 @@ PewterCity_Museum_1F_EventScript_16A512:: @ 816A512 setvar VAR_0x8005, 10 setvar VAR_0x8006, 3 special sub_809D504 - loadword 0, gUnknown_8190945 - callstd 4 + msgbox gUnknown_8190945 special sub_809D620 releaseall end @@ -217,8 +202,7 @@ PewterCity_Museum_1F_EventScript_16A532:: @ 816A532 setvar VAR_0x8005, 10 setvar VAR_0x8006, 3 special sub_809D504 - loadword 0, gUnknown_8190975 - callstd 4 + msgbox gUnknown_8190975 special sub_809D620 releaseall end diff --git a/data/maps/PewterCity_Museum_2F/scripts.inc b/data/maps/PewterCity_Museum_2F/scripts.inc index a891dd04c..0e57e2c70 100644 --- a/data/maps/PewterCity_Museum_2F/scripts.inc +++ b/data/maps/PewterCity_Museum_2F/scripts.inc @@ -2,36 +2,29 @@ PewterCity_Museum_2F_MapScripts:: @ 816A552 .byte 0 PewterCity_Museum_2F_EventScript_16A553:: @ 816A553 - loadword 0, gUnknown_8190B30 - callstd 2 + msgbox gUnknown_8190B30, 2 end PewterCity_Museum_2F_EventScript_16A55C:: @ 816A55C - loadword 0, gUnknown_8190B80 - callstd 2 + msgbox gUnknown_8190B80, 2 end PewterCity_Museum_2F_EventScript_16A565:: @ 816A565 - loadword 0, gUnknown_8190BF3 - callstd 2 + msgbox gUnknown_8190BF3, 2 end PewterCity_Museum_2F_EventScript_16A56E:: @ 816A56E - loadword 0, gUnknown_8190C1E - callstd 2 + msgbox gUnknown_8190C1E, 2 end PewterCity_Museum_2F_EventScript_16A577:: @ 816A577 - loadword 0, gUnknown_8190C60 - callstd 2 + msgbox gUnknown_8190C60, 2 end PewterCity_Museum_2F_EventScript_16A580:: @ 816A580 - loadword 0, gUnknown_8190C81 - callstd 3 + msgbox gUnknown_8190C81, 3 end PewterCity_Museum_2F_EventScript_16A589:: @ 816A589 - loadword 0, gUnknown_8190C8F - callstd 3 + msgbox gUnknown_8190C8F, 3 end diff --git a/data/maps/PewterCity_PokemonCenter_1F/scripts.inc b/data/maps/PewterCity_PokemonCenter_1F/scripts.inc index 0a3683479..8e536e195 100644 --- a/data/maps/PewterCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/PewterCity_PokemonCenter_1F/scripts.inc @@ -15,8 +15,7 @@ PewterCity_PokemonCenter_1F_EventScript_16A76F:: @ 816A76F end PewterCity_PokemonCenter_1F_EventScript_16A778:: @ 816A778 - loadword 0, gUnknown_81916A9 - callstd 2 + msgbox gUnknown_81916A9, 2 end PewterCity_PokemonCenter_1F_EventScript_16A781:: @ 816A781 @@ -32,18 +31,15 @@ PewterCity_PokemonCenter_1F_EventScript_16A781:: @ 816A781 end PewterCity_PokemonCenter_1F_EventScript_16A798:: @ 816A798 - loadword 0, gUnknown_8191701 - callstd 2 + msgbox gUnknown_8191701, 2 end PewterCity_PokemonCenter_1F_EventScript_16A7A1:: @ 816A7A1 lock - loadword 0, gUnknown_8191743 - callstd 4 + msgbox gUnknown_8191743 release end PewterCity_PokemonCenter_1F_EventScript_16A7AC:: @ 816A7AC - loadword 0, gUnknown_8191780 - callstd 2 + msgbox gUnknown_8191780, 2 end diff --git a/data/maps/PokemonLeague_AgathasRoom/scripts.inc b/data/maps/PokemonLeague_AgathasRoom/scripts.inc index 072fb633d..47bbf5d5b 100644 --- a/data/maps/PokemonLeague_AgathasRoom/scripts.inc +++ b/data/maps/PokemonLeague_AgathasRoom/scripts.inc @@ -78,13 +78,11 @@ EventScript_1628E8:: @ 81628E8 end EventScript_1628E9:: @ 81628E9 - loadword 0, gUnknown_817844D - callstd 4 + msgbox gUnknown_817844D return EventScript_1628F2:: @ 81628F2 - loadword 0, gUnknown_817858D - callstd 4 + msgbox gUnknown_817858D return EventScript_1628FB:: @ 81628FB @@ -96,15 +94,13 @@ EventScript_162906:: @ 8162906 return EventScript_162911:: @ 8162911 - loadword 0, gUnknown_8178700 - callstd 4 + msgbox gUnknown_8178700 release end EventScript_16291B:: @ 816291B setflag FLAG_0x4BA call EventScript_1A7506 - loadword 0, gUnknown_8178700 - callstd 4 + msgbox gUnknown_8178700 release end diff --git a/data/maps/PokemonLeague_BrunosRoom/scripts.inc b/data/maps/PokemonLeague_BrunosRoom/scripts.inc index 9f97097ca..78ce11521 100644 --- a/data/maps/PokemonLeague_BrunosRoom/scripts.inc +++ b/data/maps/PokemonLeague_BrunosRoom/scripts.inc @@ -75,13 +75,11 @@ EventScript_162750:: @ 8162750 end EventScript_162751:: @ 8162751 - loadword 0, gUnknown_817820F - callstd 4 + msgbox gUnknown_817820F return EventScript_16275A:: @ 816275A - loadword 0, gUnknown_817830C - callstd 4 + msgbox gUnknown_817830C return EventScript_162763:: @ 8162763 @@ -93,8 +91,7 @@ EventScript_16276E:: @ 816276E return EventScript_162779:: @ 8162779 - loadword 0, gUnknown_8178420 - callstd 4 + msgbox gUnknown_8178420 closemessage compare_var_to_value VAR_FACING, 2 call_if 1, EventScript_1627FA @@ -110,8 +107,7 @@ EventScript_162779:: @ 8162779 EventScript_1627B0:: @ 81627B0 setflag FLAG_0x4B9 call EventScript_1A7506 - loadword 0, gUnknown_8178420 - callstd 4 + msgbox gUnknown_8178420 closemessage compare_var_to_value VAR_FACING, 2 call_if 1, EventScript_1627FA diff --git a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc index bc445f685..2290e33e4 100644 --- a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc +++ b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc @@ -77,12 +77,10 @@ EventScript_162B76:: @ 8162B76 clearflag FLAG_0x005 setflag FLAG_0x4BC setflag FLAG_0x004 - loadword 0, gUnknown_8178F2F - callstd 4 + msgbox gUnknown_8178F2F playbgm BGM_FRLG_HALL_OF_FAME_PALLET_TOWN, 0 addobject 2 - loadword 0, gUnknown_8178FC6 - callstd 4 + msgbox gUnknown_8178FC6 closemessage applymovement 255, Movement_162D1F applymovement 1, Movement_162D41 @@ -91,19 +89,16 @@ EventScript_162B76:: @ 8162B76 delay 25 specialvar VAR_RESULT, ScrSpecial_GetStarter getspeciesname 0, 32781 - loadword 0, gUnknown_8178FCF - callstd 4 + msgbox gUnknown_8178FCF applymovement 2, Movement_1A75EB applymovement 1, Movement_1A75E7 waitmovement 0 - loadword 0, gUnknown_817908F - callstd 4 + msgbox gUnknown_817908F closemessage applymovement 2, Movement_1A75ED waitmovement 0 delay 20 - loadword 0, gUnknown_81791A3 - callstd 4 + msgbox gUnknown_81791A3 closemessage delay 13 applymovement 2, Movement_162D37 @@ -139,13 +134,11 @@ EventScript_162C91:: @ 8162C91 return EventScript_162CB3:: @ 8162CB3 - loadword 0, gUnknown_8178B6C - callstd 4 + msgbox gUnknown_8178B6C return EventScript_162CBC:: @ 8162CBC - loadword 0, gUnknown_8178CD4 - callstd 4 + msgbox gUnknown_8178CD4 return EventScript_162CC5:: @ 8162CC5 diff --git a/data/maps/PokemonLeague_HallOfFame/scripts.inc b/data/maps/PokemonLeague_HallOfFame/scripts.inc index 04a6cdd8e..30d239fd8 100644 --- a/data/maps/PokemonLeague_HallOfFame/scripts.inc +++ b/data/maps/PokemonLeague_HallOfFame/scripts.inc @@ -24,8 +24,7 @@ EventScript_162D70:: @ 8162D70 applymovement 255, Movement_1A75EB waitmovement 0 delay 18 - loadword 0, gUnknown_817922F - callstd 4 + msgbox gUnknown_817922F closemessage applymovement 1, Movement_1A75E9 applymovement 255, Movement_1A75E9 diff --git a/data/maps/PokemonLeague_LancesRoom/scripts.inc b/data/maps/PokemonLeague_LancesRoom/scripts.inc index 77d9fb158..3fb93bfc8 100644 --- a/data/maps/PokemonLeague_LancesRoom/scripts.inc +++ b/data/maps/PokemonLeague_LancesRoom/scripts.inc @@ -129,13 +129,11 @@ EventScript_162A78:: @ 8162A78 end EventScript_162A79:: @ 8162A79 - loadword 0, gUnknown_8178764 - callstd 4 + msgbox gUnknown_8178764 return EventScript_162A82:: @ 8162A82 - loadword 0, gUnknown_81788BD - callstd 4 + msgbox gUnknown_81788BD return EventScript_162A8B:: @ 8162A8B @@ -147,8 +145,7 @@ EventScript_162A96:: @ 8162A96 return EventScript_162AA1:: @ 8162AA1 - loadword 0, gUnknown_8178A52 - callstd 4 + msgbox gUnknown_8178A52 release end @@ -157,8 +154,7 @@ EventScript_162AAB:: @ 8162AAB special sub_8113530 setflag FLAG_0x4BB call EventScript_1A7563 - loadword 0, gUnknown_8178A52 - callstd 4 + msgbox gUnknown_8178A52 closemessage release end diff --git a/data/maps/PokemonLeague_LoreleisRoom/scripts.inc b/data/maps/PokemonLeague_LoreleisRoom/scripts.inc index f50f9a1e4..fcd1b9399 100644 --- a/data/maps/PokemonLeague_LoreleisRoom/scripts.inc +++ b/data/maps/PokemonLeague_LoreleisRoom/scripts.inc @@ -80,13 +80,11 @@ EventScript_162640:: @ 8162640 end EventScript_162641:: @ 8162641 - loadword 0, gUnknown_8177FA4 - callstd 4 + msgbox gUnknown_8177FA4 return EventScript_16264A:: @ 816264A - loadword 0, gUnknown_8178089 - callstd 4 + msgbox gUnknown_8178089 return EventScript_162653:: @ 8162653 @@ -98,15 +96,13 @@ EventScript_16265E:: @ 816265E return EventScript_162669:: @ 8162669 - loadword 0, gUnknown_81781B0 - callstd 4 + msgbox gUnknown_81781B0 release end EventScript_162673:: @ 8162673 setflag FLAG_0x4B8 call EventScript_1A7506 - loadword 0, gUnknown_81781B0 - callstd 4 + msgbox gUnknown_81781B0 release end diff --git a/data/maps/PokemonMansion_1F/scripts.inc b/data/maps/PokemonMansion_1F/scripts.inc index 9e3f50832..3055cc30c 100644 --- a/data/maps/PokemonMansion_1F/scripts.inc +++ b/data/maps/PokemonMansion_1F/scripts.inc @@ -24,12 +24,10 @@ PokemonMansion_1F_EventScript_162212:: @ 8162212 PokemonMansion_1F_EventScript_162226:: @ 8162226 trainerbattle 0, 335, 0, Text_177364, Text_177391 - loadword 0, gUnknown_8177397 - callstd 6 + msgbox gUnknown_8177397, 6 end PokemonMansion_1F_EventScript_16223D:: @ 816223D trainerbattle 0, 534, 0, Text_1773C6, Text_1773FD - loadword 0, gUnknown_8177418 - callstd 6 + msgbox gUnknown_8177418, 6 end diff --git a/data/maps/PokemonMansion_2F/scripts.inc b/data/maps/PokemonMansion_2F/scripts.inc index 4c6430678..275b7ac28 100644 --- a/data/maps/PokemonMansion_2F/scripts.inc +++ b/data/maps/PokemonMansion_2F/scripts.inc @@ -18,17 +18,14 @@ PokemonMansion_2F_EventScript_162264:: @ 8162264 end PokemonMansion_2F_EventScript_162278:: @ 8162278 - loadword 0, gUnknown_817751F - callstd 3 + msgbox gUnknown_817751F, 3 end PokemonMansion_2F_EventScript_162281:: @ 8162281 - loadword 0, gUnknown_8177574 - callstd 3 + msgbox gUnknown_8177574, 3 end PokemonMansion_2F_EventScript_16228A:: @ 816228A trainerbattle 0, 216, 0, Text_177498, Text_1774CB - loadword 0, gUnknown_81774E3 - callstd 6 + msgbox gUnknown_81774E3, 6 end diff --git a/data/maps/PokemonMansion_3F/scripts.inc b/data/maps/PokemonMansion_3F/scripts.inc index d87d5a14f..5495e5964 100644 --- a/data/maps/PokemonMansion_3F/scripts.inc +++ b/data/maps/PokemonMansion_3F/scripts.inc @@ -18,18 +18,15 @@ PokemonMansion_3F_EventScript_1622B1:: @ 81622B1 end PokemonMansion_3F_EventScript_1622C5:: @ 81622C5 - loadword 0, gUnknown_8177685 - callstd 3 + msgbox gUnknown_8177685, 3 end PokemonMansion_3F_EventScript_1622CE:: @ 81622CE trainerbattle 0, 218, 0, Text_1775E7, Text_177602 - loadword 0, gUnknown_8177608 - callstd 6 + msgbox gUnknown_8177608, 6 end PokemonMansion_3F_EventScript_1622E5:: @ 81622E5 trainerbattle 0, 346, 0, Text_177628, Text_177643 - loadword 0, gUnknown_8177657 - callstd 6 + msgbox gUnknown_8177657, 6 end diff --git a/data/maps/PokemonMansion_B1F/scripts.inc b/data/maps/PokemonMansion_B1F/scripts.inc index 82081b405..a09b2fa53 100644 --- a/data/maps/PokemonMansion_B1F/scripts.inc +++ b/data/maps/PokemonMansion_B1F/scripts.inc @@ -18,18 +18,15 @@ PokemonMansion_B1F_EventScript_16230C:: @ 816230C end PokemonMansion_B1F_EventScript_162320:: @ 8162320 - loadword 0, gUnknown_8177798 - callstd 3 + msgbox gUnknown_8177798, 3 end PokemonMansion_B1F_EventScript_162329:: @ 8162329 trainerbattle 0, 219, 0, Text_1776C0, Text_1776D7 - loadword 0, gUnknown_81776DE - callstd 6 + msgbox gUnknown_81776DE, 6 end PokemonMansion_B1F_EventScript_162340:: @ 8162340 trainerbattle 0, 347, 0, Text_177720, Text_177757 - loadword 0, gUnknown_817776A - callstd 6 + msgbox gUnknown_817776A, 6 end diff --git a/data/maps/PokemonTower_1F/scripts.inc b/data/maps/PokemonTower_1F/scripts.inc index bbfee991c..f9defa3ba 100644 --- a/data/maps/PokemonTower_1F/scripts.inc +++ b/data/maps/PokemonTower_1F/scripts.inc @@ -7,18 +7,15 @@ PokemonTower_1F_MapScript1_16323B:: @ 816323B end PokemonTower_1F_EventScript_16323F:: @ 816323F - loadword 0, gUnknown_8179CAB - callstd 2 + msgbox gUnknown_8179CAB, 2 end PokemonTower_1F_EventScript_163248:: @ 8163248 - loadword 0, gUnknown_8179C8C - callstd 2 + msgbox gUnknown_8179C8C, 2 end PokemonTower_1F_EventScript_163251:: @ 8163251 - loadword 0, gUnknown_8179C41 - callstd 2 + msgbox gUnknown_8179C41, 2 end PokemonTower_1F_EventScript_16325A:: @ 816325A @@ -27,18 +24,15 @@ PokemonTower_1F_EventScript_16325A:: @ 816325A checkplayergender compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_163272 - loadword 0, gUnknown_8179BFC - callstd 4 + msgbox gUnknown_8179BFC release end EventScript_163272:: @ 8163272 - loadword 0, gUnknown_8179BB8 - callstd 4 + msgbox gUnknown_8179BB8 release end PokemonTower_1F_EventScript_16327C:: @ 816327C - loadword 0, gUnknown_8179B7A - callstd 2 + msgbox gUnknown_8179B7A, 2 end diff --git a/data/maps/PokemonTower_2F/scripts.inc b/data/maps/PokemonTower_2F/scripts.inc index d281aef8b..f4657bbfc 100644 --- a/data/maps/PokemonTower_2F/scripts.inc +++ b/data/maps/PokemonTower_2F/scripts.inc @@ -2,8 +2,7 @@ PokemonTower_2F_MapScripts:: @ 8163285 .byte 0 PokemonTower_2F_EventScript_163286:: @ 8163286 - loadword 0, gUnknown_8179EAE - callstd 2 + msgbox gUnknown_8179EAE, 2 end PokemonTower_2F_EventScript_16328F:: @ 816328F @@ -29,8 +28,7 @@ EventScript_1632A7:: @ 81632A7 waitmovement 0 applymovement 1, Movement_1A75DD waitmovement 0 - loadword 0, gUnknown_8179CFF - callstd 4 + msgbox gUnknown_8179CFF setvar VAR_LAST_TALKED, 1 compare_var_to_value VAR_STARTER_MON, 2 call_if 1, EventScript_16335D @@ -38,8 +36,7 @@ EventScript_1632A7:: @ 81632A7 call_if 1, EventScript_163368 compare_var_to_value VAR_STARTER_MON, 0 call_if 1, EventScript_163373 - loadword 0, gUnknown_8179DD4 - callstd 4 + msgbox gUnknown_8179DD4 closemessage playbgm BGM_FRLG_RIVAL_POSTBATTLE, 0 compare_var_to_value VAR_0x4001, 0 diff --git a/data/maps/PokemonTower_3F/scripts.inc b/data/maps/PokemonTower_3F/scripts.inc index 7cf39e467..30591aba5 100644 --- a/data/maps/PokemonTower_3F/scripts.inc +++ b/data/maps/PokemonTower_3F/scripts.inc @@ -3,18 +3,15 @@ PokemonTower_3F_MapScripts:: @ 81633A6 PokemonTower_3F_EventScript_1633A7:: @ 81633A7 trainerbattle 0, 441, 0, Text_179FA0, Text_179FBC - loadword 0, gUnknown_8179FD3 - callstd 6 + msgbox gUnknown_8179FD3, 6 end PokemonTower_3F_EventScript_1633BE:: @ 81633BE trainerbattle 0, 442, 0, Text_179F62, Text_179F72 - loadword 0, gUnknown_8179F88 - callstd 6 + msgbox gUnknown_8179F88, 6 end PokemonTower_3F_EventScript_1633D5:: @ 81633D5 trainerbattle 0, 443, 0, Text_179F09, Text_179F21 - loadword 0, gUnknown_8179F31 - callstd 6 + msgbox gUnknown_8179F31, 6 end diff --git a/data/maps/PokemonTower_4F/scripts.inc b/data/maps/PokemonTower_4F/scripts.inc index 1baffb2f6..0837c5b9b 100644 --- a/data/maps/PokemonTower_4F/scripts.inc +++ b/data/maps/PokemonTower_4F/scripts.inc @@ -3,18 +3,15 @@ PokemonTower_4F_MapScripts:: @ 81633EC PokemonTower_4F_EventScript_1633ED:: @ 81633ED trainerbattle 0, 444, 0, Text_17A004, Text_17A017 - loadword 0, gUnknown_817A02B - callstd 6 + msgbox gUnknown_817A02B, 6 end PokemonTower_4F_EventScript_163404:: @ 8163404 trainerbattle 0, 445, 0, Text_17A046, Text_17A061 - loadword 0, gUnknown_817A067 - callstd 6 + msgbox gUnknown_817A067, 6 end PokemonTower_4F_EventScript_16341B:: @ 816341B trainerbattle 0, 446, 0, Text_17A096, Text_17A0AB - loadword 0, gUnknown_817A0BB - callstd 6 + msgbox gUnknown_817A0BB, 6 end diff --git a/data/maps/PokemonTower_5F/scripts.inc b/data/maps/PokemonTower_5F/scripts.inc index a703646cc..67c6b27f4 100644 --- a/data/maps/PokemonTower_5F/scripts.inc +++ b/data/maps/PokemonTower_5F/scripts.inc @@ -2,8 +2,7 @@ PokemonTower_5F_MapScripts:: @ 8163432 .byte 0 PokemonTower_5F_EventScript_163433:: @ 8163433 - loadword 0, gUnknown_817A0E3 - callstd 2 + msgbox gUnknown_817A0E3, 2 end PokemonTower_5F_EventScript_16343C:: @ 816343C @@ -11,8 +10,7 @@ PokemonTower_5F_EventScript_16343C:: @ 816343C fadescreen 3 special sp000_heal_pokemon fadescreen 2 - loadword 0, gUnknown_817A1FA - callstd 4 + msgbox gUnknown_817A1FA setvar VAR_0x4001, 1 releaseall end @@ -25,24 +23,20 @@ PokemonTower_5F_EventScript_163453:: @ 8163453 PokemonTower_5F_EventScript_16345B:: @ 816345B trainerbattle 0, 447, 0, Text_17A11F, Text_17A132 - loadword 0, gUnknown_817A138 - callstd 6 + msgbox gUnknown_817A138, 6 end PokemonTower_5F_EventScript_163472:: @ 8163472 trainerbattle 0, 448, 0, Text_17A150, Text_17A164 - loadword 0, gUnknown_817A176 - callstd 6 + msgbox gUnknown_817A176, 6 end PokemonTower_5F_EventScript_163489:: @ 8163489 trainerbattle 0, 449, 0, Text_17A187, Text_17A190 - loadword 0, gUnknown_817A194 - callstd 6 + msgbox gUnknown_817A194, 6 end PokemonTower_5F_EventScript_1634A0:: @ 81634A0 trainerbattle 0, 450, 0, Text_17A1AA, Text_17A1B7 - loadword 0, gUnknown_817A1BD - callstd 6 + msgbox gUnknown_817A1BD, 6 end diff --git a/data/maps/PokemonTower_6F/scripts.inc b/data/maps/PokemonTower_6F/scripts.inc index 352a8b6b2..6caa45d92 100644 --- a/data/maps/PokemonTower_6F/scripts.inc +++ b/data/maps/PokemonTower_6F/scripts.inc @@ -4,8 +4,7 @@ PokemonTower_6F_MapScripts:: @ 81634B7 PokemonTower_6F_EventScript_1634B8:: @ 81634B8 lockall textcolor 2 - loadword 0, gUnknown_817A2F8 - callstd 4 + msgbox gUnknown_817A2F8 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 goto_if 1, EventScript_1A7AE0 @@ -27,8 +26,7 @@ EventScript_1634F5:: @ 81634F5 playmoncry SPECIES_MAROWAK, 0 waitbuttonpress waitmoncry - loadword 0, gUnknown_817A342 - callstd 4 + msgbox gUnknown_817A342 setvar VAR_0x4059, 1 releaseall end @@ -39,18 +37,15 @@ Movement_163512:: @ 8163512 PokemonTower_6F_EventScript_163514:: @ 8163514 trainerbattle 0, 451, 0, Text_17A243, Text_17A253 - loadword 0, gUnknown_817A25A - callstd 6 + msgbox gUnknown_817A25A, 6 end PokemonTower_6F_EventScript_16352B:: @ 816352B trainerbattle 0, 452, 0, Text_17A272, Text_17A27F - loadword 0, gUnknown_817A293 - callstd 6 + msgbox gUnknown_817A293, 6 end PokemonTower_6F_EventScript_163542:: @ 8163542 trainerbattle 0, 453, 0, Text_17A2C8, Text_17A2DC - loadword 0, gUnknown_817A2E2 - callstd 6 + msgbox gUnknown_817A2E2, 6 end diff --git a/data/maps/PokemonTower_7F/scripts.inc b/data/maps/PokemonTower_7F/scripts.inc index 331b2db07..a62969534 100644 --- a/data/maps/PokemonTower_7F/scripts.inc +++ b/data/maps/PokemonTower_7F/scripts.inc @@ -10,8 +10,7 @@ PokemonTower_7F_EventScript_16355A:: @ 816355A setflag FLAG_0x034 clearflag FLAG_0x035 setflag FLAG_0x23C - loadword 0, gUnknown_817A529 - callstd 4 + msgbox gUnknown_817A529 closemessage warp MAP_LAVENDER_TOWN_VOLUNTEER_POKEMON_HOUSE, 255, 4, 7 waitstate @@ -20,13 +19,11 @@ PokemonTower_7F_EventScript_16355A:: @ 816355A PokemonTower_7F_EventScript_163586:: @ 8163586 trainerbattle 2, 369, 0, Text_17A380, Text_17A3A4, EventScript_1635A1 - loadword 0, gUnknown_817A3AF - callstd 6 + msgbox gUnknown_817A3AF, 6 end EventScript_1635A1:: @ 81635A1 - loadword 0, gUnknown_817A3AF - callstd 4 + msgbox gUnknown_817A3AF closemessage getplayerxy VAR_0x8004, VAR_0x8005 compare_var_to_value VAR_0x8004, 10 @@ -109,16 +106,14 @@ Movement_163633:: @ 8163633 PokemonTower_7F_EventScript_16363D:: @ 816363D trainerbattle 2, 370, 0, Text_17A3CD, Text_17A466, EventScript_163658 - loadword 0, gUnknown_817A477 - callstd 6 + msgbox gUnknown_817A477, 6 end EventScript_163658:: @ 8163658 setvar VAR_0x8004, 14 setvar VAR_0x8005, 1 special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_817A477 - callstd 4 + msgbox gUnknown_817A477 closemessage getplayerxy VAR_0x8004, VAR_0x8005 compare_var_to_value VAR_0x8004, 12 @@ -179,13 +174,11 @@ Movement_1636CD:: @ 81636CD PokemonTower_7F_EventScript_1636D6:: @ 81636D6 trainerbattle 2, 371, 0, Text_17A4CF, Text_17A4EE, EventScript_1636F1 - loadword 0, gUnknown_817A506 - callstd 6 + msgbox gUnknown_817A506, 6 end EventScript_1636F1:: @ 81636F1 - loadword 0, gUnknown_817A506 - callstd 4 + msgbox gUnknown_817A506 closemessage getplayerxy VAR_0x8004, VAR_0x8005 compare_var_to_value VAR_0x8004, 10 diff --git a/data/maps/RockTunnel_1F/scripts.inc b/data/maps/RockTunnel_1F/scripts.inc index ff8d3216b..846154c97 100644 --- a/data/maps/RockTunnel_1F/scripts.inc +++ b/data/maps/RockTunnel_1F/scripts.inc @@ -7,48 +7,40 @@ RockTunnel_1F_MapScript1_162DDC:: @ 8162DDC end RockTunnel_1F_EventScript_162DE0:: @ 8162DE0 - loadword 0, gUnknown_817962D - callstd 3 + msgbox gUnknown_817962D, 3 end RockTunnel_1F_EventScript_162DE9:: @ 8162DE9 trainerbattle 0, 192, 0, Text_179366, Text_179388 - loadword 0, gUnknown_8179396 - callstd 6 + msgbox gUnknown_8179396, 6 end RockTunnel_1F_EventScript_162E00:: @ 8162E00 trainerbattle 0, 193, 0, Text_1793F1, Text_17940E - loadword 0, gUnknown_817943A - callstd 6 + msgbox gUnknown_817943A, 6 end RockTunnel_1F_EventScript_162E17:: @ 8162E17 trainerbattle 0, 194, 0, Text_17947B, Text_1794AC - loadword 0, gUnknown_81794B4 - callstd 6 + msgbox gUnknown_81794B4, 6 end RockTunnel_1F_EventScript_162E2E:: @ 8162E2E trainerbattle 0, 168, 0, Text_1794D4, Text_1794EE - loadword 0, gUnknown_81794F9 - callstd 6 + msgbox gUnknown_81794F9, 6 end RockTunnel_1F_EventScript_162E45:: @ 8162E45 trainerbattle 0, 476, 0, Text_17951C, Text_179547 - loadword 0, gUnknown_8179558 - callstd 6 + msgbox gUnknown_8179558, 6 end RockTunnel_1F_EventScript_162E5C:: @ 8162E5C trainerbattle 0, 475, 0, Text_1795E5, Text_179604 - loadword 0, gUnknown_8179613 - callstd 6 + msgbox gUnknown_8179613, 6 end RockTunnel_1F_EventScript_162E73:: @ 8162E73 trainerbattle 0, 474, 0, Text_179577, Text_1795A1 - loadword 0, gUnknown_81795B5 - callstd 6 + msgbox gUnknown_81795B5, 6 end diff --git a/data/maps/RockTunnel_B1F/scripts.inc b/data/maps/RockTunnel_B1F/scripts.inc index 2d9a015b7..12611a767 100644 --- a/data/maps/RockTunnel_B1F/scripts.inc +++ b/data/maps/RockTunnel_B1F/scripts.inc @@ -3,48 +3,40 @@ RockTunnel_B1F_MapScripts:: @ 8162E8A RockTunnel_B1F_EventScript_162E8B:: @ 8162E8B trainerbattle 0, 158, 0, Text_179657, Text_1796B9 - loadword 0, gUnknown_81796CE - callstd 6 + msgbox gUnknown_81796CE, 6 end RockTunnel_B1F_EventScript_162EA2:: @ 8162EA2 trainerbattle 0, 159, 0, Text_1798AD, Text_1798DD - loadword 0, gUnknown_81798E9 - callstd 6 + msgbox gUnknown_81798E9, 6 end RockTunnel_B1F_EventScript_162EB9:: @ 8162EB9 trainerbattle 0, 189, 0, Text_1796E1, Text_179700 - loadword 0, gUnknown_8179712 - callstd 6 + msgbox gUnknown_8179712, 6 end RockTunnel_B1F_EventScript_162ED0:: @ 8162ED0 trainerbattle 0, 190, 0, Text_179829, Text_179856 - loadword 0, gUnknown_817987A - callstd 6 + msgbox gUnknown_817987A, 6 end RockTunnel_B1F_EventScript_162EE7:: @ 8162EE7 trainerbattle 0, 191, 0, Text_179916, Text_179932 - loadword 0, gUnknown_817993E - callstd 6 + msgbox gUnknown_817993E, 6 end RockTunnel_B1F_EventScript_162EFE:: @ 8162EFE trainerbattle 0, 164, 0, Text_17973A, Text_17975F - loadword 0, gUnknown_8179777 - callstd 6 + msgbox gUnknown_8179777, 6 end RockTunnel_B1F_EventScript_162F15:: @ 8162F15 trainerbattle 0, 165, 0, Text_1797A4, Text_1797CB - loadword 0, gUnknown_81797DE - callstd 6 + msgbox gUnknown_81797DE, 6 end RockTunnel_B1F_EventScript_162F2C:: @ 8162F2C trainerbattle 0, 166, 0, Text_179968, Text_179997 - loadword 0, gUnknown_81799AC - callstd 6 + msgbox gUnknown_81799AC, 6 end diff --git a/data/maps/RocketHideout_B1F/scripts.inc b/data/maps/RocketHideout_B1F/scripts.inc index 0d4fcd1bd..f127389ef 100644 --- a/data/maps/RocketHideout_B1F/scripts.inc +++ b/data/maps/RocketHideout_B1F/scripts.inc @@ -14,32 +14,27 @@ RocketHideout_B1F_MapScript2_1611AA:: @ 81611AA RocketHideout_B1F_EventScript_1611AE:: @ 81611AE trainerbattle 0, 358, 0, Text_174ECA, Text_174EED - loadword 0, gUnknown_8174EFA - callstd 6 + msgbox gUnknown_8174EFA, 6 end RocketHideout_B1F_EventScript_1611C5:: @ 81611C5 trainerbattle 0, 359, 0, Text_174F2C, Text_174F60 - loadword 0, gUnknown_8174F66 - callstd 6 + msgbox gUnknown_8174F66, 6 end RocketHideout_B1F_EventScript_1611DC:: @ 81611DC trainerbattle 0, 360, 0, Text_174F94, Text_174FA4 - loadword 0, gUnknown_8174FB3 - callstd 6 + msgbox gUnknown_8174FB3, 6 end RocketHideout_B1F_EventScript_1611F3:: @ 81611F3 trainerbattle 0, 361, 0, Text_174FE1, Text_174FF8 - loadword 0, gUnknown_8175007 - callstd 6 + msgbox gUnknown_8175007, 6 end RocketHideout_B1F_EventScript_16120A:: @ 816120A trainerbattle 2, 362, 0, Text_17503A, Text_17505A, EventScript_161225 - loadword 0, gUnknown_8175060 - callstd 6 + msgbox gUnknown_8175060, 6 end EventScript_161225:: @ 8161225 diff --git a/data/maps/RocketHideout_B2F/scripts.inc b/data/maps/RocketHideout_B2F/scripts.inc index 945a6de5a..80c102179 100644 --- a/data/maps/RocketHideout_B2F/scripts.inc +++ b/data/maps/RocketHideout_B2F/scripts.inc @@ -3,6 +3,5 @@ RocketHideout_B2F_MapScripts:: @ 81612A1 RocketHideout_B2F_EventScript_1612A2:: @ 81612A2 trainerbattle 0, 363, 0, Text_17508C, Text_1750BF - loadword 0, gUnknown_81750CC - callstd 6 + msgbox gUnknown_81750CC, 6 end diff --git a/data/maps/RocketHideout_B3F/scripts.inc b/data/maps/RocketHideout_B3F/scripts.inc index 3325ad50d..82fc7aa26 100644 --- a/data/maps/RocketHideout_B3F/scripts.inc +++ b/data/maps/RocketHideout_B3F/scripts.inc @@ -3,12 +3,10 @@ RocketHideout_B3F_MapScripts:: @ 81612B9 RocketHideout_B3F_EventScript_1612BA:: @ 81612BA trainerbattle 0, 364, 0, Text_17511A, Text_17514A - loadword 0, gUnknown_817515B - callstd 6 + msgbox gUnknown_817515B, 6 end RocketHideout_B3F_EventScript_1612D1:: @ 81612D1 trainerbattle 0, 365, 0, Text_17519E, Text_1751CE - loadword 0, gUnknown_81751E0 - callstd 6 + msgbox gUnknown_81751E0, 6 end diff --git a/data/maps/RocketHideout_B4F/scripts.inc b/data/maps/RocketHideout_B4F/scripts.inc index 06eb3b4e9..c382cb9b8 100644 --- a/data/maps/RocketHideout_B4F/scripts.inc +++ b/data/maps/RocketHideout_B4F/scripts.inc @@ -27,8 +27,7 @@ RocketHideout_B4F_EventScript_161317:: @ 8161317 playbgm BGM_FRLG_SUSPICIOUS_EYE, 0 waitbuttonpress trainerbattle 3, 348, 0, Text_175318 - loadword 0, gUnknown_817532D - callstd 4 + msgbox gUnknown_817532D fadescreen 1 closemessage removeobject 1 @@ -56,14 +55,12 @@ RocketHideout_B4F_EventScript_161363:: @ 8161363 RocketHideout_B4F_EventScript_161381:: @ 8161381 trainerbattle 2, 368, 0, Text_175488, Text_1754B9, EventScript_16139D - loadword 0, gUnknown_81754BD - callstd 4 + msgbox gUnknown_81754BD release end EventScript_16139D:: @ 816139D - loadword 0, gUnknown_81754BD - callstd 4 + msgbox gUnknown_81754BD addobject 4 clearflag FLAG_0x036 release @@ -84,8 +81,7 @@ RocketHideout_B4F_EventScript_1613AD:: @ 81613AD RocketHideout_B4F_EventScript_1613CE:: @ 81613CE trainerbattle 2, 366, 0, Text_1753D0, Text_1753FE, EventScript_1613E9 - loadword 0, gUnknown_817540C - callstd 6 + msgbox gUnknown_817540C, 6 end EventScript_1613E9:: @ 81613E9 @@ -103,8 +99,7 @@ EventScript_1613E9:: @ 81613E9 RocketHideout_B4F_EventScript_161418:: @ 8161418 trainerbattle 2, 367, 0, Text_175437, Text_175463, EventScript_161433 - loadword 0, gUnknown_817546A - callstd 6 + msgbox gUnknown_817546A, 6 end EventScript_161433:: @ 8161433 diff --git a/data/maps/RocketHideout_Elevator/scripts.inc b/data/maps/RocketHideout_Elevator/scripts.inc index cd442aba6..c9ffe7a0a 100644 --- a/data/maps/RocketHideout_Elevator/scripts.inc +++ b/data/maps/RocketHideout_Elevator/scripts.inc @@ -109,7 +109,6 @@ EventScript_16160E:: @ 816160E return EventScript_16161B:: @ 816161B - loadword 0, gUnknown_81754DD - callstd 4 + msgbox gUnknown_81754DD releaseall end diff --git a/data/maps/Route1/scripts.inc b/data/maps/Route1/scripts.inc index d2aeb0224..7c1e41e8c 100644 --- a/data/maps/Route1/scripts.inc +++ b/data/maps/Route1/scripts.inc @@ -6,8 +6,7 @@ Route1_EventScript_167EFE:: @ 8167EFE faceplayer checkflag FLAG_0x230 goto_if 1, EventScript_167F48 - loadword 0, gUnknown_818329D - callstd 4 + msgbox gUnknown_818329D textcolor 3 checkitemspace ITEM_POTION, 1 compare_var_to_value VAR_RESULT, 0 @@ -18,25 +17,21 @@ Route1_EventScript_167EFE:: @ 8167EFE waitmessage waitfanfare additem ITEM_POTION, 1 - loadword 0, gUnknown_8183387 - callstd 4 + msgbox gUnknown_8183387 call EventScript_1A6675 setflag FLAG_0x230 release end EventScript_167F48:: @ 8167F48 - loadword 0, gUnknown_8183347 - callstd 4 + msgbox gUnknown_8183347 release end Route1_EventScript_167F52:: @ 8167F52 - loadword 0, gUnknown_81833B9 - callstd 2 + msgbox gUnknown_81833B9, 2 end Route1_EventScript_167F5B:: @ 8167F5B - loadword 0, gUnknown_818343A - callstd 3 + msgbox gUnknown_818343A, 3 end diff --git a/data/maps/Route10/scripts.inc b/data/maps/Route10/scripts.inc index 78b962dc7..96ce99c8e 100644 --- a/data/maps/Route10/scripts.inc +++ b/data/maps/Route10/scripts.inc @@ -5,16 +5,13 @@ Route10_EventScript_167FDA:: @ 8167FDA end Route10_EventScript_167FDB:: @ 8167FDB - loadword 0, gUnknown_8184EC5 - callstd 3 + msgbox gUnknown_8184EC5, 3 end Route10_EventScript_167FE4:: @ 8167FE4 - loadword 0, gUnknown_8184EE9 - callstd 3 + msgbox gUnknown_8184EE9, 3 end Route10_EventScript_167FED:: @ 8167FED - loadword 0, gUnknown_8184EF5 - callstd 3 + msgbox gUnknown_8184EF5, 3 end diff --git a/data/maps/Route10_PokemonCenter_1F/scripts.inc b/data/maps/Route10_PokemonCenter_1F/scripts.inc index 791cab192..eccf94ec5 100644 --- a/data/maps/Route10_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route10_PokemonCenter_1F/scripts.inc @@ -16,18 +16,15 @@ Route10_PokemonCenter_1F_EventScript_16FC41:: @ 816FC41 end Route10_PokemonCenter_1F_EventScript_16FC4A:: @ 816FC4A - loadword 0, gUnknown_819E59D - callstd 2 + msgbox gUnknown_819E59D, 2 end Route10_PokemonCenter_1F_EventScript_16FC53:: @ 816FC53 - loadword 0, gUnknown_819E523 - callstd 2 + msgbox gUnknown_819E523, 2 end Route10_PokemonCenter_1F_EventScript_16FC5C:: @ 816FC5C - loadword 0, gUnknown_819E5D2 - callstd 2 + msgbox gUnknown_819E5D2, 2 end Route10_PokemonCenter_1F_EventScript_16FC65:: @ 816FC65 @@ -36,8 +33,7 @@ Route10_PokemonCenter_1F_EventScript_16FC65:: @ 816FC65 call EventScript_16FCF1 checkflag FLAG_0x2FA goto_if 1, EventScript_16FCE7 - loadword 0, gUnknown_819E5FB - callstd 5 + msgbox gUnknown_819E5FB, 5 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_1A7AD1 setvar VAR_0x8004, 0 @@ -46,22 +42,19 @@ Route10_PokemonCenter_1F_EventScript_16FC65:: @ 816FC65 call EventScript_16FCF1 compare_var_to_value VAR_0x8006, 20 goto_if 0, EventScript_1A7ABD - loadword 0, gUnknown_819E733 - callstd 4 + msgbox gUnknown_819E733 checkitemspace ITEM_EVERSTONE, 1 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_1A7AC7 additem ITEM_EVERSTONE, 1 giveitemfanfaremsg gUnknown_819E786, ITEM_EVERSTONE setflag FLAG_0x2FA - loadword 0, gUnknown_819E7AF - callstd 4 + msgbox gUnknown_819E7AF release end EventScript_16FCE7:: @ 816FCE7 - loadword 0, gUnknown_819E7AF - callstd 4 + msgbox gUnknown_819E7AF release end diff --git a/data/maps/Route11/scripts.inc b/data/maps/Route11/scripts.inc index 8f5145a05..fa85a5bb8 100644 --- a/data/maps/Route11/scripts.inc +++ b/data/maps/Route11/scripts.inc @@ -2,6 +2,5 @@ Route11_MapScripts:: @ 8167FF6 .byte 0 Route11_EventScript_167FF7:: @ 8167FF7 - loadword 0, gUnknown_8185308 - callstd 3 + msgbox gUnknown_8185308, 3 end diff --git a/data/maps/Route11_EastEntrance_1F/scripts.inc b/data/maps/Route11_EastEntrance_1F/scripts.inc index 1806b5d11..476379753 100644 --- a/data/maps/Route11_EastEntrance_1F/scripts.inc +++ b/data/maps/Route11_EastEntrance_1F/scripts.inc @@ -2,11 +2,9 @@ Route11_EastEntrance_1F_MapScripts:: @ 816FD21 .byte 0 Route11_EastEntrance_1F_EventScript_16FD22:: @ 816FD22 - loadword 0, gUnknown_819E8A6 - callstd 2 + msgbox gUnknown_819E8A6, 2 end Route11_EastEntrance_1F_EventScript_16FD2B:: @ 816FD2B - loadword 0, gUnknown_819E97B - callstd 2 + msgbox gUnknown_819E97B, 2 end diff --git a/data/maps/Route11_EastEntrance_2F/scripts.inc b/data/maps/Route11_EastEntrance_2F/scripts.inc index 10f9539b5..459c6dc84 100644 --- a/data/maps/Route11_EastEntrance_2F/scripts.inc +++ b/data/maps/Route11_EastEntrance_2F/scripts.inc @@ -5,20 +5,17 @@ Route11_EastEntrance_2F_EventScript_16FD35:: @ 816FD35 lockall checkflag FLAG_0x253 goto_if 1, EventScript_16FD49 - loadword 0, gUnknown_819EC8A - callstd 4 + msgbox gUnknown_819EC8A releaseall end EventScript_16FD49:: @ 816FD49 - loadword 0, gUnknown_819ECD9 - callstd 4 + msgbox gUnknown_819ECD9 releaseall end Route11_EastEntrance_2F_EventScript_16FD53:: @ 816FD53 - loadword 0, gUnknown_819ED1F - callstd 3 + msgbox gUnknown_819ED1F, 3 end Route11_EastEntrance_2F_EventScript_16FD5C:: @ 816FD5C @@ -28,8 +25,7 @@ Route11_EastEntrance_2F_EventScript_16FD5C:: @ 816FD5C call EventScript_1A8CAD checkflag FLAG_0x251 goto_if 1, EventScript_16FDCE - loadword 0, gUnknown_81A597B - callstd 5 + msgbox gUnknown_81A597B, 5 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16FDB6 call EventScript_1A8CBD @@ -39,28 +35,24 @@ Route11_EastEntrance_2F_EventScript_16FD5C:: @ 816FD5C compare_var_to_var VAR_RESULT, VAR_0x8009 goto_if 5, EventScript_16FDC0 call EventScript_1A8CD9 - loadword 0, gUnknown_81A59DA - callstd 4 + msgbox gUnknown_81A59DA setflag FLAG_0x251 release end EventScript_16FDB6:: @ 816FDB6 - loadword 0, gUnknown_81A59B6 - callstd 4 + msgbox gUnknown_81A59B6 release end EventScript_16FDC0:: @ 816FDC0 getspeciesname 0, 32777 - loadword 0, gUnknown_81A59C6 - callstd 4 + msgbox gUnknown_81A59C6 release end EventScript_16FDCE:: @ 816FDCE - loadword 0, gUnknown_81A59E7 - callstd 4 + msgbox gUnknown_81A59E7 release end @@ -70,8 +62,7 @@ Route11_EastEntrance_2F_EventScript_16FDD8:: @ 816FDD8 call EventScript_16FE64 checkflag FLAG_0x252 goto_if 1, EventScript_16FE5A - loadword 0, gUnknown_819E9E5 - callstd 5 + msgbox gUnknown_819E9E5, 5 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_1A7AD1 setvar VAR_0x8004, 0 @@ -80,22 +71,19 @@ Route11_EastEntrance_2F_EventScript_16FDD8:: @ 816FDD8 call EventScript_16FE64 compare_var_to_value VAR_0x8006, 30 goto_if 0, EventScript_1A7ABD - loadword 0, gUnknown_819EAE4 - callstd 4 + msgbox gUnknown_819EAE4 checkitemspace ITEM_ITEMFINDER, 1 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_1A7AC7 additem ITEM_ITEMFINDER, 1 giveitemfanfaremsg gUnknown_819EB37, ITEM_ITEMFINDER setflag FLAG_0x252 - loadword 0, gUnknown_819EB59 - callstd 4 + msgbox gUnknown_819EB59 release end EventScript_16FE5A:: @ 816FE5A - loadword 0, gUnknown_819EB59 - callstd 4 + msgbox gUnknown_819EB59 release end diff --git a/data/maps/Route12/scripts.inc b/data/maps/Route12/scripts.inc index 3fdc41c2a..89be5b2df 100644 --- a/data/maps/Route12/scripts.inc +++ b/data/maps/Route12/scripts.inc @@ -20,8 +20,7 @@ Route12_EventScript_168014:: @ 8168014 compare_var_to_value VAR_RESULT, 2 goto_if 1, EventScript_1A7AE0 special sub_8112364 - loadword 0, gUnknown_81853CC - callstd 5 + msgbox gUnknown_81853CC, 5 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16808D call EventScript_1A924B @@ -50,23 +49,19 @@ EventScript_16808D:: @ 816808D end EventScript_16808F:: @ 816808F - loadword 0, gUnknown_8185383 - callstd 4 + msgbox gUnknown_8185383 release end EventScript_168099:: @ 8168099 - loadword 0, gUnknown_8185317 - callstd 4 + msgbox gUnknown_8185317 release end Route12_EventScript_1680A3:: @ 81680A3 - loadword 0, gUnknown_8185797 - callstd 3 + msgbox gUnknown_8185797, 3 end Route12_EventScript_1680AC:: @ 81680AC - loadword 0, gUnknown_81857B3 - callstd 3 + msgbox gUnknown_81857B3, 3 end diff --git a/data/maps/Route12_FishingHouse/scripts.inc b/data/maps/Route12_FishingHouse/scripts.inc index 1973de14c..d7738d383 100644 --- a/data/maps/Route12_FishingHouse/scripts.inc +++ b/data/maps/Route12_FishingHouse/scripts.inc @@ -6,12 +6,10 @@ Route12_FishingHouse_EventScript_16FF0C:: @ 816FF0C faceplayer checkflag FLAG_0x255 goto_if 1, EventScript_16FF7F - loadword 0, gUnknown_819EFE0 - callstd 5 + msgbox gUnknown_819EFE0, 5 compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_16FF34 - loadword 0, gUnknown_819F1FA - callstd 4 + msgbox gUnknown_819F1FA release end @@ -20,18 +18,15 @@ EventScript_16FF34:: @ 816FF34 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16FF75 additem ITEM_SUPER_ROD, 1 - loadword 0, gUnknown_819F05B - callstd 4 + msgbox gUnknown_819F05B giveitemfanfaremsg gUnknown_819F0B2, ITEM_SUPER_ROD setflag FLAG_0x255 - loadword 0, gUnknown_819F0EB - callstd 4 + msgbox gUnknown_819F0EB release end EventScript_16FF75:: @ 816FF75 - loadword 0, gUnknown_819F494 - callstd 4 + msgbox gUnknown_819F494 release end @@ -45,8 +40,7 @@ EventScript_16FF7F:: @ 816FF7F compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16FFF5 special sub_80A096C - loadword 0, gUnknown_819F2DB - callstd 4 + msgbox gUnknown_819F2DB special sub_80BF8FC waitstate copyvar VAR_RESULT, VAR_0x8004 @@ -65,8 +59,7 @@ EventScript_16FF7F:: @ 816FF7F end EventScript_16FFF5:: @ 816FFF5 - loadword 0, gUnknown_819F217 - callstd 4 + msgbox gUnknown_819F217 release end @@ -75,44 +68,38 @@ EventScript_16FFFF:: @ 816FFFF end EventScript_170001:: @ 8170001 - loadword 0, gUnknown_819F468 - callstd 4 + msgbox gUnknown_819F468 release end EventScript_17000B:: @ 817000B checkflag FLAG_0x29C goto_if 0, EventScript_170031 - loadword 0, gUnknown_819F40A - callstd 4 + msgbox gUnknown_819F40A release end EventScript_17001E:: @ 817001E checkflag FLAG_0x29C goto_if 0, EventScript_170031 - loadword 0, gUnknown_819F3CB - callstd 4 + msgbox gUnknown_819F3CB release end EventScript_170031:: @ 8170031 setflag FLAG_0x29C - loadword 0, gUnknown_819F31B - callstd 4 + msgbox gUnknown_819F31B setorcopyvar VAR_0x8000, 6 setorcopyvar VAR_0x8001, 1 callstd 0 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_17005D - loadword 0, gUnknown_819F395 - callstd 4 + msgbox gUnknown_819F395 release end EventScript_17005D:: @ 817005D - loadword 0, gUnknown_819F494 - callstd 4 + msgbox gUnknown_819F494 release end @@ -120,14 +107,12 @@ Route12_FishingHouse_EventScript_170067:: @ 8170067 lockall checkflag FLAG_0x29C goto_if 1, EventScript_17007B - loadword 0, gUnknown_819F50C - callstd 4 + msgbox gUnknown_819F50C releaseall end EventScript_17007B:: @ 817007B special sub_80A096C - loadword 0, gUnknown_819F4CF - callstd 4 + msgbox gUnknown_819F4CF releaseall end diff --git a/data/maps/Route12_NorthEntrance_1F/scripts.inc b/data/maps/Route12_NorthEntrance_1F/scripts.inc index 4a5b02abe..d91f0c7c8 100644 --- a/data/maps/Route12_NorthEntrance_1F/scripts.inc +++ b/data/maps/Route12_NorthEntrance_1F/scripts.inc @@ -2,6 +2,5 @@ Route12_NorthEntrance_1F_MapScripts:: @ 816FE6D .byte 0 Route12_NorthEntrance_1F_EventScript_16FE6E:: @ 816FE6E - loadword 0, gUnknown_819EDA7 - callstd 2 + msgbox gUnknown_819EDA7, 2 end diff --git a/data/maps/Route12_NorthEntrance_2F/scripts.inc b/data/maps/Route12_NorthEntrance_2F/scripts.inc index adf7f0040..42370d54a 100644 --- a/data/maps/Route12_NorthEntrance_2F/scripts.inc +++ b/data/maps/Route12_NorthEntrance_2F/scripts.inc @@ -2,13 +2,11 @@ Route12_NorthEntrance_2F_MapScripts:: @ 816FE77 .byte 0 Route12_NorthEntrance_2F_EventScript_16FE78:: @ 816FE78 - loadword 0, gUnknown_819EF5D - callstd 3 + msgbox gUnknown_819EF5D, 3 end Route12_NorthEntrance_2F_EventScript_16FE81:: @ 816FE81 - loadword 0, gUnknown_819EFA0 - callstd 3 + msgbox gUnknown_819EFA0, 3 end Route12_NorthEntrance_2F_EventScript_16FE8A:: @ 816FE8A @@ -26,30 +24,25 @@ Route12_NorthEntrance_2F_EventScript_16FE8A:: @ 816FE8A goto_if 1, EventScript_16FEF7 additem ITEM_TM27, 1 giveitemfanfaremsg gUnknown_819EE9F, ITEM_TM27 - loadword 0, gUnknown_819EEC6 - callstd 4 + msgbox gUnknown_819EEC6 setflag FLAG_0x25B release end EventScript_16FEE5:: @ 816FEE5 - loadword 0, gUnknown_819EDE1 - callstd 4 + msgbox gUnknown_819EDE1 return EventScript_16FEEE:: @ 816FEEE - loadword 0, gUnknown_819EE40 - callstd 4 + msgbox gUnknown_819EE40 return EventScript_16FEF7:: @ 816FEF7 - loadword 0, gUnknown_819EF3F - callstd 4 + msgbox gUnknown_819EF3F release end EventScript_16FF01:: @ 816FF01 - loadword 0, gUnknown_819EEC6 - callstd 4 + msgbox gUnknown_819EEC6 release end diff --git a/data/maps/Route13/scripts.inc b/data/maps/Route13/scripts.inc index 37d91913f..fcec8204a 100644 --- a/data/maps/Route13/scripts.inc +++ b/data/maps/Route13/scripts.inc @@ -2,16 +2,13 @@ Route13_MapScripts:: @ 81680B5 .byte 0 Route13_EventScript_1680B6:: @ 81680B6 - loadword 0, gUnknown_8185DB7 - callstd 3 + msgbox gUnknown_8185DB7, 3 end Route13_EventScript_1680BF:: @ 81680BF - loadword 0, gUnknown_8185DEF - callstd 3 + msgbox gUnknown_8185DEF, 3 end Route13_EventScript_1680C8:: @ 81680C8 - loadword 0, gUnknown_8185E2C - callstd 3 + msgbox gUnknown_8185E2C, 3 end diff --git a/data/maps/Route14/scripts.inc b/data/maps/Route14/scripts.inc index 350c7ed21..207604cdc 100644 --- a/data/maps/Route14/scripts.inc +++ b/data/maps/Route14/scripts.inc @@ -2,6 +2,5 @@ Route14_MapScripts:: @ 81680D1 .byte 0 Route14_EventScript_1680D2:: @ 81680D2 - loadword 0, gUnknown_8186399 - callstd 3 + msgbox gUnknown_8186399, 3 end diff --git a/data/maps/Route15/scripts.inc b/data/maps/Route15/scripts.inc index d4e6e4cd3..a4d0a3240 100644 --- a/data/maps/Route15/scripts.inc +++ b/data/maps/Route15/scripts.inc @@ -2,6 +2,5 @@ Route15_MapScripts:: @ 81680DB .byte 0 Route15_EventScript_1680DC:: @ 81680DC - loadword 0, gUnknown_8186A77 - callstd 3 + msgbox gUnknown_8186A77, 3 end diff --git a/data/maps/Route15_WestEntrance_1F/scripts.inc b/data/maps/Route15_WestEntrance_1F/scripts.inc index b665864d1..458f5e010 100644 --- a/data/maps/Route15_WestEntrance_1F/scripts.inc +++ b/data/maps/Route15_WestEntrance_1F/scripts.inc @@ -2,6 +2,5 @@ Route15_WestEntrance_1F_MapScripts:: @ 8170088 .byte 0 Route15_WestEntrance_1F_EventScript_170089:: @ 8170089 - loadword 0, gUnknown_819F560 - callstd 2 + msgbox gUnknown_819F560, 2 end diff --git a/data/maps/Route15_WestEntrance_2F/scripts.inc b/data/maps/Route15_WestEntrance_2F/scripts.inc index 8685b0528..293349f28 100644 --- a/data/maps/Route15_WestEntrance_2F/scripts.inc +++ b/data/maps/Route15_WestEntrance_2F/scripts.inc @@ -3,8 +3,7 @@ Route15_WestEntrance_2F_MapScripts:: @ 8170092 Route15_WestEntrance_2F_EventScript_170093:: @ 8170093 lockall - loadword 0, gUnknown_819F79C - callstd 4 + msgbox gUnknown_819F79C drawmonpic SPECIES_ARTICUNO, 10, 3 delay 20 waitbuttonpress @@ -15,8 +14,7 @@ Route15_WestEntrance_2F_EventScript_170093:: @ 8170093 end Route15_WestEntrance_2F_EventScript_1700B0:: @ 81700B0 - loadword 0, gUnknown_819F7F8 - callstd 3 + msgbox gUnknown_819F7F8, 3 end Route15_WestEntrance_2F_EventScript_1700B9:: @ 81700B9 @@ -25,8 +23,7 @@ Route15_WestEntrance_2F_EventScript_1700B9:: @ 81700B9 call EventScript_170145 checkflag FLAG_0x256 goto_if 1, EventScript_17013B - loadword 0, gUnknown_819F5AB - callstd 5 + msgbox gUnknown_819F5AB, 5 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_1A7AD1 setvar VAR_0x8004, 0 @@ -35,22 +32,19 @@ Route15_WestEntrance_2F_EventScript_1700B9:: @ 81700B9 call EventScript_170145 compare_var_to_value VAR_0x8006, 50 goto_if 0, EventScript_1A7ABD - loadword 0, gUnknown_819F6AA - callstd 4 + msgbox gUnknown_819F6AA checkitemspace ITEM_EXP_SHARE, 1 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_1A7AC7 additem ITEM_EXP_SHARE, 1 giveitemfanfaremsg gUnknown_819F6FD, ITEM_EXP_SHARE setflag FLAG_0x256 - loadword 0, gUnknown_819F71F - callstd 4 + msgbox gUnknown_819F71F release end EventScript_17013B:: @ 817013B - loadword 0, gUnknown_819F71F - callstd 4 + msgbox gUnknown_819F71F release end diff --git a/data/maps/Route16/scripts.inc b/data/maps/Route16/scripts.inc index 9d2d1d621..42d8089fa 100644 --- a/data/maps/Route16/scripts.inc +++ b/data/maps/Route16/scripts.inc @@ -39,8 +39,7 @@ Route16_EventScript_168121:: @ 8168121 compare_var_to_value VAR_RESULT, 2 goto_if 1, EventScript_1A7AE0 special sub_8112364 - loadword 0, gUnknown_81853CC - callstd 5 + msgbox gUnknown_81853CC, 5 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_168197 call EventScript_1A924B @@ -68,23 +67,19 @@ EventScript_168197:: @ 8168197 end EventScript_168199:: @ 8168199 - loadword 0, gUnknown_8185383 - callstd 4 + msgbox gUnknown_8185383 release end EventScript_1681A3:: @ 81681A3 - loadword 0, gUnknown_8186F3D - callstd 4 + msgbox gUnknown_8186F3D release end Route16_EventScript_1681AD:: @ 81681AD - loadword 0, gUnknown_8186F7A - callstd 3 + msgbox gUnknown_8186F7A, 3 end Route16_EventScript_1681B6:: @ 81681B6 - loadword 0, gUnknown_8186F98 - callstd 3 + msgbox gUnknown_8186F98, 3 end diff --git a/data/maps/Route16_House/scripts.inc b/data/maps/Route16_House/scripts.inc index d48a944dc..8f30a2aa1 100644 --- a/data/maps/Route16_House/scripts.inc +++ b/data/maps/Route16_House/scripts.inc @@ -6,28 +6,24 @@ Route16_House_EventScript_17014F:: @ 817014F faceplayer checkflag FLAG_0x238 goto_if 1, EventScript_1701A5 - loadword 0, gUnknown_819F851 - callstd 4 + msgbox gUnknown_819F851 checkitemspace ITEM_HM02, 1 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_17019B additem ITEM_HM02, 1 giveitemfanfaremsg gUnknown_819F8C0, ITEM_HM02 - loadword 0, gUnknown_819F8E0 - callstd 4 + msgbox gUnknown_819F8E0 setflag FLAG_0x238 release end EventScript_17019B:: @ 817019B - loadword 0, gUnknown_819F92D - callstd 4 + msgbox gUnknown_819F92D release end EventScript_1701A5:: @ 81701A5 - loadword 0, gUnknown_819F8E0 - callstd 4 + msgbox gUnknown_819F8E0 release end @@ -36,8 +32,7 @@ Route16_House_EventScript_1701AF:: @ 81701AF faceplayer waitse playmoncry SPECIES_FEAROW, 0 - loadword 0, gUnknown_819F94F - callstd 4 + msgbox gUnknown_819F94F waitmoncry release end diff --git a/data/maps/Route16_NorthEntrance_1F/scripts.inc b/data/maps/Route16_NorthEntrance_1F/scripts.inc index 792f604cd..c30f309fd 100644 --- a/data/maps/Route16_NorthEntrance_1F/scripts.inc +++ b/data/maps/Route16_NorthEntrance_1F/scripts.inc @@ -13,8 +13,7 @@ EventScript_1701D5:: @ 81701D5 return Route16_NorthEntrance_1F_EventScript_1701DB:: @ 81701DB - loadword 0, gUnknown_819F98B - callstd 2 + msgbox gUnknown_819F98B, 2 end Route16_NorthEntrance_1F_EventScript_1701E4:: @ 81701E4 @@ -49,8 +48,7 @@ Route16_NorthEntrance_1F_EventScript_170214:: @ 8170214 EventScript_170220:: @ 8170220 textcolor 0 - loadword 0, gUnknown_819F9CC - callstd 4 + msgbox gUnknown_819F9CC closemessage applymovement 255, Movement_1A75E9 waitmovement 0 @@ -63,8 +61,7 @@ EventScript_170220:: @ 8170220 call_if 1, EventScript_17028F compare_var_to_value VAR_0x8008, 4 call_if 1, EventScript_17029A - loadword 0, gUnknown_819F95F - callstd 4 + msgbox gUnknown_819F95F closemessage applymovement 255, Movement_1702B3 waitmovement 0 @@ -118,6 +115,5 @@ Movement_1702B3:: @ 81702B3 step_end Route16_NorthEntrance_1F_EventScript_1702B5:: @ 81702B5 - loadword 0, gUnknown_819F9E8 - callstd 2 + msgbox gUnknown_819F9E8, 2 end diff --git a/data/maps/Route16_NorthEntrance_2F/scripts.inc b/data/maps/Route16_NorthEntrance_2F/scripts.inc index f72336971..02d12c228 100644 --- a/data/maps/Route16_NorthEntrance_2F/scripts.inc +++ b/data/maps/Route16_NorthEntrance_2F/scripts.inc @@ -2,23 +2,19 @@ Route16_NorthEntrance_2F_MapScripts:: @ 81702BE .byte 0 Route16_NorthEntrance_2F_EventScript_1702BF:: @ 81702BF - loadword 0, gUnknown_819FA07 - callstd 2 + msgbox gUnknown_819FA07, 2 end Route16_NorthEntrance_2F_EventScript_1702C8:: @ 81702C8 - loadword 0, gUnknown_819FA41 - callstd 2 + msgbox gUnknown_819FA41, 2 end Route16_NorthEntrance_2F_EventScript_1702D1:: @ 81702D1 - loadword 0, gUnknown_819FA6F - callstd 3 + msgbox gUnknown_819FA6F, 3 end Route16_NorthEntrance_2F_EventScript_1702DA:: @ 81702DA - loadword 0, gUnknown_819FAB9 - callstd 3 + msgbox gUnknown_819FAB9, 3 end Route16_NorthEntrance_2F_EventScript_1702E3:: @ 81702E3 @@ -27,8 +23,7 @@ Route16_NorthEntrance_2F_EventScript_1702E3:: @ 81702E3 call EventScript_17036F checkflag FLAG_0x2FD goto_if 1, EventScript_170365 - loadword 0, gUnknown_819FB0E - callstd 5 + msgbox gUnknown_819FB0E, 5 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_1A7AD1 setvar VAR_0x8004, 0 @@ -37,22 +32,19 @@ Route16_NorthEntrance_2F_EventScript_1702E3:: @ 81702E3 call EventScript_17036F compare_var_to_value VAR_0x8006, 40 goto_if 0, EventScript_1A7ABD - loadword 0, gUnknown_819FC15 - callstd 4 + msgbox gUnknown_819FC15 checkitemspace ITEM_AMULET_COIN, 1 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_1A7AC7 additem ITEM_AMULET_COIN, 1 giveitemfanfaremsg gUnknown_819FC68, ITEM_AMULET_COIN setflag FLAG_0x2FD - loadword 0, gUnknown_819FC93 - callstd 4 + msgbox gUnknown_819FC93 release end EventScript_170365:: @ 8170365 - loadword 0, gUnknown_819FC93 - callstd 4 + msgbox gUnknown_819FC93 release end diff --git a/data/maps/Route17/scripts.inc b/data/maps/Route17/scripts.inc index 97e3fdb77..12d99102a 100644 --- a/data/maps/Route17/scripts.inc +++ b/data/maps/Route17/scripts.inc @@ -2,31 +2,25 @@ Route17_MapScripts:: @ 81681BF .byte 0 Route17_EventScript_1681C0:: @ 81681C0 - loadword 0, gUnknown_81874E4 - callstd 3 + msgbox gUnknown_81874E4, 3 end Route17_EventScript_1681C9:: @ 81681C9 - loadword 0, gUnknown_8187512 - callstd 3 + msgbox gUnknown_8187512, 3 end Route17_EventScript_1681D2:: @ 81681D2 - loadword 0, gUnknown_818757B - callstd 3 + msgbox gUnknown_818757B, 3 end Route17_EventScript_1681DB:: @ 81681DB - loadword 0, gUnknown_81875BE - callstd 3 + msgbox gUnknown_81875BE, 3 end Route17_EventScript_1681E4:: @ 81681E4 - loadword 0, gUnknown_81875E3 - callstd 3 + msgbox gUnknown_81875E3, 3 end Route17_EventScript_1681ED:: @ 81681ED - loadword 0, gUnknown_8187622 - callstd 3 + msgbox gUnknown_8187622, 3 end diff --git a/data/maps/Route18/scripts.inc b/data/maps/Route18/scripts.inc index d4471a3be..548fdeeb6 100644 --- a/data/maps/Route18/scripts.inc +++ b/data/maps/Route18/scripts.inc @@ -21,11 +21,9 @@ EventScript_16821B:: @ 816821B end Route18_EventScript_16821F:: @ 816821F - loadword 0, gUnknown_8187757 - callstd 3 + msgbox gUnknown_8187757, 3 end Route18_EventScript_168228:: @ 8168228 - loadword 0, gUnknown_818777C - callstd 3 + msgbox gUnknown_818777C, 3 end diff --git a/data/maps/Route18_EastEntrance_1F/scripts.inc b/data/maps/Route18_EastEntrance_1F/scripts.inc index 840a35ec5..70a8d196b 100644 --- a/data/maps/Route18_EastEntrance_1F/scripts.inc +++ b/data/maps/Route18_EastEntrance_1F/scripts.inc @@ -13,8 +13,7 @@ EventScript_17038B:: @ 817038B return Route18_EastEntrance_1F_EventScript_170391:: @ 8170391 - loadword 0, gUnknown_819FD3A - callstd 2 + msgbox gUnknown_819FD3A, 2 end Route18_EastEntrance_1F_EventScript_17039A:: @ 817039A @@ -49,8 +48,7 @@ Route18_EastEntrance_1F_EventScript_1703CA:: @ 81703CA EventScript_1703D6:: @ 81703D6 textcolor 0 - loadword 0, gUnknown_819FD60 - callstd 4 + msgbox gUnknown_819FD60 closemessage applymovement 255, Movement_1A75E9 waitmovement 0 @@ -63,8 +61,7 @@ EventScript_1703D6:: @ 81703D6 call_if 1, EventScript_170445 compare_var_to_value VAR_0x8008, 4 call_if 1, EventScript_170450 - loadword 0, gUnknown_819FD0C - callstd 4 + msgbox gUnknown_819FD0C closemessage applymovement 255, Movement_170469 waitmovement 0 diff --git a/data/maps/Route18_EastEntrance_2F/scripts.inc b/data/maps/Route18_EastEntrance_2F/scripts.inc index 5c809fefc..5d15da418 100644 --- a/data/maps/Route18_EastEntrance_2F/scripts.inc +++ b/data/maps/Route18_EastEntrance_2F/scripts.inc @@ -2,13 +2,11 @@ Route18_EastEntrance_2F_MapScripts:: @ 817046B .byte 0 Route18_EastEntrance_2F_EventScript_17046C:: @ 817046C - loadword 0, gUnknown_819FD6B - callstd 3 + msgbox gUnknown_819FD6B, 3 end Route18_EastEntrance_2F_EventScript_170475:: @ 8170475 - loadword 0, gUnknown_819FDB3 - callstd 3 + msgbox gUnknown_819FDB3, 3 end Route18_EastEntrance_2F_EventScript_17047E:: @ 817047E @@ -18,8 +16,7 @@ Route18_EastEntrance_2F_EventScript_17047E:: @ 817047E call EventScript_1A8CAD checkflag FLAG_0x257 goto_if 1, EventScript_1704F0 - loadword 0, gUnknown_81A597B - callstd 5 + msgbox gUnknown_81A597B, 5 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_1704D8 call EventScript_1A8CBD @@ -29,27 +26,23 @@ Route18_EastEntrance_2F_EventScript_17047E:: @ 817047E compare_var_to_var VAR_RESULT, VAR_0x8009 goto_if 5, EventScript_1704E2 call EventScript_1A8CD9 - loadword 0, gUnknown_81A59DA - callstd 4 + msgbox gUnknown_81A59DA setflag FLAG_0x257 release end EventScript_1704D8:: @ 81704D8 - loadword 0, gUnknown_81A59B6 - callstd 4 + msgbox gUnknown_81A59B6 release end EventScript_1704E2:: @ 81704E2 getspeciesname 0, 32777 - loadword 0, gUnknown_81A59C6 - callstd 4 + msgbox gUnknown_81A59C6 release end EventScript_1704F0:: @ 81704F0 - loadword 0, gUnknown_81A59E7 - callstd 4 + msgbox gUnknown_81A59E7 release end diff --git a/data/maps/Route19/scripts.inc b/data/maps/Route19/scripts.inc index bc7af0745..28a71830d 100644 --- a/data/maps/Route19/scripts.inc +++ b/data/maps/Route19/scripts.inc @@ -2,6 +2,5 @@ Route19_MapScripts:: @ 8168231 .byte 0 Route19_EventScript_168232:: @ 8168232 - loadword 0, gUnknown_8187C06 - callstd 3 + msgbox gUnknown_8187C06, 3 end diff --git a/data/maps/Route2/scripts.inc b/data/maps/Route2/scripts.inc index fbcf581e4..67ba5729e 100644 --- a/data/maps/Route2/scripts.inc +++ b/data/maps/Route2/scripts.inc @@ -2,11 +2,9 @@ Route2_MapScripts:: @ 8167F64 .byte 0 Route2_EventScript_167F65:: @ 8167F65 - loadword 0, gUnknown_818345E - callstd 3 + msgbox gUnknown_818345E, 3 end Route2_EventScript_167F6E:: @ 8167F6E - loadword 0, gUnknown_8183482 - callstd 3 + msgbox gUnknown_8183482, 3 end diff --git a/data/maps/Route20/scripts.inc b/data/maps/Route20/scripts.inc index a1e894cb2..d99bebdd7 100644 --- a/data/maps/Route20/scripts.inc +++ b/data/maps/Route20/scripts.inc @@ -30,6 +30,5 @@ EventScript_16826D:: @ 816826D return Route20_EventScript_168280:: @ 8168280 - loadword 0, gUnknown_81882D1 - callstd 3 + msgbox gUnknown_81882D1, 3 end diff --git a/data/maps/Route22/scripts.inc b/data/maps/Route22/scripts.inc index 54723a44e..a116b73eb 100644 --- a/data/maps/Route22/scripts.inc +++ b/data/maps/Route22/scripts.inc @@ -38,16 +38,14 @@ EventScript_1682BE:: @ 81682BE compare_var_to_value VAR_0x4001, 2 call_if 1, EventScript_16835B delay 6 - loadword 0, gUnknown_8188890 - callstd 4 + msgbox gUnknown_8188890 compare_var_to_value VAR_STARTER_MON, 2 call_if 1, EventScript_16836D compare_var_to_value VAR_STARTER_MON, 1 call_if 1, EventScript_16837C compare_var_to_value VAR_STARTER_MON, 0 call_if 1, EventScript_16838B - loadword 0, gUnknown_8188974 - callstd 4 + msgbox gUnknown_8188974 closemessage delay 10 playbgm BGM_FRLG_RIVAL_POSTBATTLE, 0 @@ -205,8 +203,7 @@ EventScript_16841F:: @ 816841F call_if 1, EventScript_16849C compare_var_to_value VAR_0x4001, 2 call_if 1, EventScript_1684A7 - loadword 0, gUnknown_8188A3C - callstd 4 + msgbox gUnknown_8188A3C setvar VAR_LAST_TALKED, 1 compare_var_to_value VAR_STARTER_MON, 2 call_if 1, EventScript_1684B9 @@ -214,8 +211,7 @@ EventScript_16841F:: @ 816841F call_if 1, EventScript_1684C4 compare_var_to_value VAR_STARTER_MON, 0 call_if 1, EventScript_1684CF - loadword 0, gUnknown_8188B29 - callstd 4 + msgbox gUnknown_8188B29 closemessage delay 10 playbgm BGM_FRLG_RIVAL_POSTBATTLE, 0 @@ -261,6 +257,5 @@ Movement_1684DA:: @ 81684DA step_end Route22_EventScript_1684E2:: @ 81684E2 - loadword 0, gUnknown_8188BFF - callstd 3 + msgbox gUnknown_8188BFF, 3 end diff --git a/data/maps/Route23/scripts.inc b/data/maps/Route23/scripts.inc index 63e29da7e..f5c504650 100644 --- a/data/maps/Route23/scripts.inc +++ b/data/maps/Route23/scripts.inc @@ -124,6 +124,5 @@ Route23_EventScript_168601:: @ 8168601 end Route23_EventScript_168616:: @ 8168616 - loadword 0, gUnknown_8188C19 - callstd 3 + msgbox gUnknown_8188C19, 3 end diff --git a/data/maps/Route24/scripts.inc b/data/maps/Route24/scripts.inc index a083019e1..50497540d 100644 --- a/data/maps/Route24/scripts.inc +++ b/data/maps/Route24/scripts.inc @@ -6,8 +6,7 @@ Route24_EventScript_168620:: @ 8168620 faceplayer compare_var_to_value VAR_0x406B, 1 goto_if 1, EventScript_168656 - loadword 0, gUnknown_8188C3C - callstd 4 + msgbox gUnknown_8188C3C checkitemspace ITEM_NUGGET, 1 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16864C @@ -16,14 +15,12 @@ Route24_EventScript_168620:: @ 8168620 end EventScript_16864C:: @ 816864C - loadword 0, gUnknown_8188CC2 - callstd 4 + msgbox gUnknown_8188CC2 release end EventScript_168656:: @ 8168656 - loadword 0, gUnknown_8188DF1 - callstd 4 + msgbox gUnknown_8188DF1 release end @@ -47,8 +44,7 @@ EventScript_168678:: @ 8168678 call_if 1, EventScript_168708 applymovement 255, Movement_1A75EB waitmovement 0 - loadword 0, gUnknown_8188C3C - callstd 4 + msgbox gUnknown_8188C3C checkitemspace ITEM_NUGGET, 1 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_168713 @@ -65,8 +61,7 @@ EventScript_1686B9:: @ 81686B9 waitbuttonpress setvar VAR_LAST_TALKED, 1 trainerbattle 3, 356, 0, Text_188DDC - loadword 0, gUnknown_8188DF1 - callstd 4 + msgbox gUnknown_8188DF1 setvar VAR_0x406B, 1 return @@ -81,8 +76,7 @@ EventScript_168708:: @ 8168708 return EventScript_168713:: @ 8168713 - loadword 0, gUnknown_8188CC2 - callstd 4 + msgbox gUnknown_8188CC2 closemessage applymovement 255, Movement_168743 waitmovement 0 diff --git a/data/maps/Route25/scripts.inc b/data/maps/Route25/scripts.inc index 1b8dfc2a4..81b2704d4 100644 --- a/data/maps/Route25/scripts.inc +++ b/data/maps/Route25/scripts.inc @@ -2,11 +2,9 @@ Route25_MapScripts:: @ 8168745 .byte 0 Route25_EventScript_168746:: @ 8168746 - loadword 0, gUnknown_818954C - callstd 3 + msgbox gUnknown_818954C, 3 end Route25_EventScript_16874F:: @ 816874F - loadword 0, gUnknown_81895C2 - callstd 2 + msgbox gUnknown_81895C2, 2 end diff --git a/data/maps/Route25_SeaCottage/scripts.inc b/data/maps/Route25_SeaCottage/scripts.inc index 3c412fb75..791fa829a 100644 --- a/data/maps/Route25_SeaCottage/scripts.inc +++ b/data/maps/Route25_SeaCottage/scripts.inc @@ -35,22 +35,19 @@ Route25_SeaCottage_EventScript_17054B:: @ 817054B end EventScript_170580:: @ 8170580 - loadword 0, gUnknown_819FDFA - callstd 5 + msgbox gUnknown_819FDFA, 5 goto EventScript_17059C end EventScript_17058E:: @ 817058E - loadword 0, gUnknown_819FEE6 - callstd 5 + msgbox gUnknown_819FEE6, 5 goto EventScript_17059C end EventScript_17059C:: @ 817059C compare_var_to_value VAR_RESULT, 0 call_if 1, EventScript_170600 - loadword 0, gUnknown_819FFD3 - callstd 4 + msgbox gUnknown_819FFD3 closemessage delay 10 compare_var_to_value VAR_FACING, 1 @@ -82,13 +79,11 @@ EventScript_170600:: @ 8170600 return EventScript_170618:: @ 8170618 - loadword 0, gUnknown_81A0035 - callstd 4 + msgbox gUnknown_81A0035 return EventScript_170621:: @ 8170621 - loadword 0, gUnknown_81A00B6 - callstd 4 + msgbox gUnknown_81A00B6 return EventScript_17062A:: @ 817062A @@ -102,8 +97,7 @@ EventScript_170635:: @ 8170635 return EventScript_170640:: @ 8170640 - loadword 0, gUnknown_81A02CF - callstd 4 + msgbox gUnknown_81A02CF release end @@ -129,24 +123,20 @@ EventScript_17064A:: @ 817064A end EventScript_1706AC:: @ 81706AC - loadword 0, gUnknown_81A013B - callstd 4 + msgbox gUnknown_81A013B return EventScript_1706B5:: @ 81706B5 - loadword 0, gUnknown_81A01E4 - callstd 4 + msgbox gUnknown_81A01E4 return EventScript_1706BE:: @ 81706BE - loadword 0, gUnknown_81A02B4 - callstd 4 + msgbox gUnknown_81A02B4 release end EventScript_1706C8:: @ 81706C8 - loadword 0, gUnknown_81A03AB - callstd 4 + msgbox gUnknown_81A03AB release end @@ -173,15 +163,13 @@ Route25_SeaCottage_EventScript_1706DD:: @ 81706DD goto_if 1, EventScript_1707CA checkflag FLAG_0x002 goto_if 1, EventScript_1706FA - loadword 0, gUnknown_81A0402 - callstd 4 + msgbox gUnknown_81A0402 releaseall end EventScript_1706FA:: @ 81706FA fadeoutbgm 0 - loadword 0, gUnknown_81A042D - callstd 4 + msgbox gUnknown_81A042D closemessage clearflag FLAG_0x002 setflag FLAG_0x233 @@ -255,8 +243,7 @@ Movement_1707C3:: @ 81707C3 step_end EventScript_1707CA:: @ 81707CA - loadword 0, gUnknown_81A045B - callstd 4 + msgbox gUnknown_81A045B goto EventScript_1707D8 end diff --git a/data/maps/Route2_EastBuilding/scripts.inc b/data/maps/Route2_EastBuilding/scripts.inc index 513ac758b..37bb5121c 100644 --- a/data/maps/Route2_EastBuilding/scripts.inc +++ b/data/maps/Route2_EastBuilding/scripts.inc @@ -7,8 +7,7 @@ Route2_EastBuilding_EventScript_16F67F:: @ 816F67F call EventScript_16F70B checkflag FLAG_0x23B goto_if 1, EventScript_16F701 - loadword 0, gUnknown_819D64F - callstd 5 + msgbox gUnknown_819D64F, 5 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_1A7AD1 setvar VAR_0x8004, 0 @@ -17,22 +16,19 @@ Route2_EastBuilding_EventScript_16F67F:: @ 816F67F call EventScript_16F70B compare_var_to_value VAR_0x8006, 10 goto_if 0, EventScript_1A7ABD - loadword 0, gUnknown_819D74E - callstd 4 + msgbox gUnknown_819D74E checkitemspace ITEM_HM05, 1 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_1A7AC7 additem ITEM_HM05, 1 giveitemfanfaremsg gUnknown_819D7A1, ITEM_HM05 setflag FLAG_0x23B - loadword 0, gUnknown_819D7C1 - callstd 4 + msgbox gUnknown_819D7C1 release end EventScript_16F701:: @ 816F701 - loadword 0, gUnknown_819D7C1 - callstd 4 + msgbox gUnknown_819D7C1 release end @@ -42,6 +38,5 @@ EventScript_16F70B:: @ 816F70B return Route2_EastBuilding_EventScript_16F714:: @ 816F714 - loadword 0, gUnknown_819D81E - callstd 2 + msgbox gUnknown_819D81E, 2 end diff --git a/data/maps/Route2_House/scripts.inc b/data/maps/Route2_House/scripts.inc index a68521270..00b0c27eb 100644 --- a/data/maps/Route2_House/scripts.inc +++ b/data/maps/Route2_House/scripts.inc @@ -2,8 +2,7 @@ Route2_House_MapScripts:: @ 816F5F8 .byte 0 Route2_House_EventScript_16F5F9:: @ 816F5F9 - loadword 0, gUnknown_819D5E7 - callstd 2 + msgbox gUnknown_819D5E7, 2 end Route2_House_EventScript_16F602:: @ 816F602 @@ -13,8 +12,7 @@ Route2_House_EventScript_16F602:: @ 816F602 call EventScript_1A8CAD checkflag FLAG_0x248 goto_if 1, EventScript_16F674 - loadword 0, gUnknown_81A597B - callstd 5 + msgbox gUnknown_81A597B, 5 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16F65C call EventScript_1A8CBD @@ -24,27 +22,23 @@ Route2_House_EventScript_16F602:: @ 816F602 compare_var_to_var VAR_RESULT, VAR_0x8009 goto_if 5, EventScript_16F666 call EventScript_1A8CD9 - loadword 0, gUnknown_81A59DA - callstd 4 + msgbox gUnknown_81A59DA setflag FLAG_0x248 release end EventScript_16F65C:: @ 816F65C - loadword 0, gUnknown_81A59B6 - callstd 4 + msgbox gUnknown_81A59B6 release end EventScript_16F666:: @ 816F666 getspeciesname 0, 32777 - loadword 0, gUnknown_81A59C6 - callstd 4 + msgbox gUnknown_81A59C6 release end EventScript_16F674:: @ 816F674 - loadword 0, gUnknown_81A59E7 - callstd 4 + msgbox gUnknown_81A59E7 release end diff --git a/data/maps/Route2_ViridianForest_NorthEntrance/scripts.inc b/data/maps/Route2_ViridianForest_NorthEntrance/scripts.inc index d1696f7d0..6ed3f355a 100644 --- a/data/maps/Route2_ViridianForest_NorthEntrance/scripts.inc +++ b/data/maps/Route2_ViridianForest_NorthEntrance/scripts.inc @@ -2,16 +2,13 @@ Route2_ViridianForest_NorthEntrance_MapScripts:: @ 816F71D .byte 0 Route2_ViridianForest_NorthEntrance_EventScript_16F71E:: @ 816F71E - loadword 0, gUnknown_819D85C - callstd 2 + msgbox gUnknown_819D85C, 2 end Route2_ViridianForest_NorthEntrance_EventScript_16F727:: @ 816F727 - loadword 0, gUnknown_819D8D0 - callstd 2 + msgbox gUnknown_819D8D0, 2 end Route2_ViridianForest_NorthEntrance_EventScript_16F730:: @ 816F730 - loadword 0, gUnknown_819D93B - callstd 2 + msgbox gUnknown_819D93B, 2 end diff --git a/data/maps/Route2_ViridianForest_SouthEntrance/scripts.inc b/data/maps/Route2_ViridianForest_SouthEntrance/scripts.inc index 6406f21d0..a8aba4941 100644 --- a/data/maps/Route2_ViridianForest_SouthEntrance/scripts.inc +++ b/data/maps/Route2_ViridianForest_SouthEntrance/scripts.inc @@ -2,11 +2,9 @@ Route2_ViridianForest_SouthEntrance_MapScripts:: @ 816F5E5 .byte 0 Route2_ViridianForest_SouthEntrance_EventScript_16F5E6:: @ 816F5E6 - loadword 0, gUnknown_819D52C - callstd 2 + msgbox gUnknown_819D52C, 2 end Route2_ViridianForest_SouthEntrance_EventScript_16F5EF:: @ 816F5EF - loadword 0, gUnknown_819D58B - callstd 2 + msgbox gUnknown_819D58B, 2 end diff --git a/data/maps/Route3/scripts.inc b/data/maps/Route3/scripts.inc index 748f6060f..7bf593794 100644 --- a/data/maps/Route3/scripts.inc +++ b/data/maps/Route3/scripts.inc @@ -2,11 +2,9 @@ Route3_MapScripts:: @ 8167F77 .byte 0 Route3_EventScript_167F78:: @ 8167F78 - loadword 0, gUnknown_8183491 - callstd 2 + msgbox gUnknown_8183491, 2 end Route3_EventScript_167F81:: @ 8167F81 - loadword 0, gUnknown_81838C0 - callstd 3 + msgbox gUnknown_81838C0, 3 end diff --git a/data/maps/Route4/scripts.inc b/data/maps/Route4/scripts.inc index 054f686bd..230c13d3b 100644 --- a/data/maps/Route4/scripts.inc +++ b/data/maps/Route4/scripts.inc @@ -5,16 +5,13 @@ Route4_EventScript_167F8B:: @ 8167F8B end Route4_EventScript_167F8C:: @ 8167F8C - loadword 0, gUnknown_81838D7 - callstd 2 + msgbox gUnknown_81838D7, 2 end Route4_EventScript_167F95:: @ 8167F95 - loadword 0, gUnknown_818399B - callstd 3 + msgbox gUnknown_818399B, 3 end Route4_EventScript_167F9E:: @ 8167F9E - loadword 0, gUnknown_81839B4 - callstd 3 + msgbox gUnknown_81839B4, 3 end diff --git a/data/maps/Route4_PokemonCenter_1F/scripts.inc b/data/maps/Route4_PokemonCenter_1F/scripts.inc index d4904e476..fb10bc0da 100644 --- a/data/maps/Route4_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route4_PokemonCenter_1F/scripts.inc @@ -9,14 +9,12 @@ Route4_PokemonCenter_1F_MapScript1_16F744:: @ 816F744 end Route4_PokemonCenter_1F_EventScript_16F74B:: @ 816F74B - loadword 0, gUnknown_819D9D4 - callstd 2 + msgbox gUnknown_819D9D4, 2 end Route4_PokemonCenter_1F_EventScript_16F754:: @ 816F754 lock - loadword 0, gUnknown_819DA3A - callstd 4 + msgbox gUnknown_819DA3A release end @@ -34,14 +32,12 @@ Route4_PokemonCenter_1F_EventScript_16F75F:: @ 816F75F end EventScript_16F786:: @ 816F786 - loadword 0, gUnknown_819DA9A - callstd 5 + msgbox gUnknown_819DA9A, 5 goto EventScript_16F7A2 end EventScript_16F794:: @ 816F794 - loadword 0, gUnknown_819DB34 - callstd 5 + msgbox gUnknown_819DB34, 5 goto EventScript_16F7A2 end @@ -64,8 +60,7 @@ EventScript_16F7A2:: @ 816F7A2 EventScript_16F7F6:: @ 816F7F6 call EventScript_16F86F - loadword 0, gUnknown_81A56A7 - callstd 5 + msgbox gUnknown_81A56A7, 5 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16F861 call EventScript_1A8C27 @@ -80,8 +75,7 @@ EventScript_16F7F6:: @ 816F7F6 EventScript_16F822:: @ 816F822 call EventScript_16F86F - loadword 0, gUnknown_81A56A7 - callstd 5 + msgbox gUnknown_81A56A7, 5 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16F84B fadescreen 1 @@ -128,8 +122,7 @@ EventScript_16F86F:: @ 816F86F return EventScript_16F888:: @ 816F888 - loadword 0, gUnknown_819DC07 - callstd 4 + msgbox gUnknown_819DC07 hidemoneybox .byte 0 .byte 0 @@ -137,8 +130,7 @@ EventScript_16F888:: @ 816F888 end EventScript_16F895:: @ 816F895 - loadword 0, gUnknown_819DC78 - callstd 4 + msgbox gUnknown_819DC78 hidemoneybox .byte 0 .byte 0 @@ -146,15 +138,13 @@ EventScript_16F895:: @ 816F895 end EventScript_16F8A2:: @ 816F8A2 - loadword 0, gUnknown_819DC9A - callstd 4 + msgbox gUnknown_819DC9A release end EventScript_16F8AC:: @ 816F8AC textcolor 0 - loadword 0, gUnknown_819DC3E - callstd 4 + msgbox gUnknown_819DC3E hidemoneybox .byte 0 .byte 0 @@ -169,13 +159,11 @@ Route4_PokemonCenter_1F_EventScript_16F8BB:: @ 816F8BB end Route4_PokemonCenter_1F_EventScript_16F8C4:: @ 816F8C4 - loadword 0, gUnknown_819DCDB - callstd 2 + msgbox gUnknown_819DCDB, 2 end Route4_PokemonCenter_1F_EventScript_16F8CD:: @ 816F8CD lock - loadword 0, gUnknown_819DD54 - callstd 4 + msgbox gUnknown_819DD54 release end diff --git a/data/maps/Route5/scripts.inc b/data/maps/Route5/scripts.inc index 572bd6248..8356751b7 100644 --- a/data/maps/Route5/scripts.inc +++ b/data/maps/Route5/scripts.inc @@ -2,6 +2,5 @@ Route5_MapScripts:: @ 8167FA7 .byte 0 Route5_EventScript_167FA8:: @ 8167FA8 - loadword 0, gUnknown_8183DD4 - callstd 3 + msgbox gUnknown_8183DD4, 3 end diff --git a/data/maps/Route5_SouthEntrance/scripts.inc b/data/maps/Route5_SouthEntrance/scripts.inc index 7214c0f52..1993be19c 100644 --- a/data/maps/Route5_SouthEntrance/scripts.inc +++ b/data/maps/Route5_SouthEntrance/scripts.inc @@ -2,8 +2,7 @@ Route5_SouthEntrance_MapScripts:: @ 816F900 .byte 0 Route5_SouthEntrance_EventScript_16F901:: @ 816F901 - loadword 0, gUnknown_819E16D - callstd 2 + msgbox gUnknown_819E16D, 2 end Route5_SouthEntrance_EventScript_16F90A:: @ 816F90A @@ -30,8 +29,7 @@ EventScript_16F92E:: @ 816F92E waitmovement 0 checkflag FLAG_0x2A6 goto_if 1, EventScript_16F958 - loadword 0, gUnknown_819E04B - callstd 4 + msgbox gUnknown_819E04B closemessage applymovement 255, Movement_16F9C4 waitmovement 0 @@ -44,8 +42,7 @@ EventScript_16F958:: @ 816F958 end EventScript_16F963:: @ 816F963 - loadword 0, gUnknown_819E09B - callstd 4 + msgbox gUnknown_819E09B closemessage compare_var_to_value VAR_0x4001, 0 call_if 1, EventScript_16F99C @@ -53,8 +50,7 @@ EventScript_16F963:: @ 816F963 call_if 1, EventScript_16F9A7 compare_var_to_value VAR_0x4001, 2 call_if 1, EventScript_16F9B2 - loadword 0, gUnknown_819E0C1 - callstd 4 + msgbox gUnknown_819E0C1 setvar VAR_0x4062, 1 releaseall end diff --git a/data/maps/Route6/scripts.inc b/data/maps/Route6/scripts.inc index 1a88669a4..773e1c091 100644 --- a/data/maps/Route6/scripts.inc +++ b/data/maps/Route6/scripts.inc @@ -2,6 +2,5 @@ Route6_MapScripts:: @ 8167FB1 .byte 0 Route6_EventScript_167FB2:: @ 8167FB2 - loadword 0, gUnknown_8184067 - callstd 3 + msgbox gUnknown_8184067, 3 end diff --git a/data/maps/Route6_NorthEntrance/scripts.inc b/data/maps/Route6_NorthEntrance/scripts.inc index 109d259ad..aeea2f7e6 100644 --- a/data/maps/Route6_NorthEntrance/scripts.inc +++ b/data/maps/Route6_NorthEntrance/scripts.inc @@ -2,8 +2,7 @@ Route6_NorthEntrance_MapScripts:: @ 816F9C6 .byte 0 Route6_NorthEntrance_EventScript_16F9C7:: @ 816F9C7 - loadword 0, gUnknown_819E2A3 - callstd 2 + msgbox gUnknown_819E2A3, 2 end Route6_NorthEntrance_EventScript_16F9D0:: @ 816F9D0 @@ -30,8 +29,7 @@ EventScript_16F9F4:: @ 816F9F4 waitmovement 0 checkflag FLAG_0x2A6 goto_if 1, EventScript_16FA1E - loadword 0, gUnknown_819E181 - callstd 4 + msgbox gUnknown_819E181 closemessage applymovement 255, Movement_16FA8A waitmovement 0 @@ -44,8 +42,7 @@ EventScript_16FA1E:: @ 816FA1E end EventScript_16FA29:: @ 816FA29 - loadword 0, gUnknown_819E1D1 - callstd 4 + msgbox gUnknown_819E1D1 closemessage compare_var_to_value VAR_0x4001, 0 call_if 1, EventScript_16FA62 @@ -53,8 +50,7 @@ EventScript_16FA29:: @ 816FA29 call_if 1, EventScript_16FA6D compare_var_to_value VAR_0x4001, 2 call_if 1, EventScript_16FA78 - loadword 0, gUnknown_819E1F7 - callstd 4 + msgbox gUnknown_819E1F7 setvar VAR_0x4062, 1 releaseall end diff --git a/data/maps/Route7/scripts.inc b/data/maps/Route7/scripts.inc index 3a4a78567..ec34892f4 100644 --- a/data/maps/Route7/scripts.inc +++ b/data/maps/Route7/scripts.inc @@ -2,6 +2,5 @@ Route7_MapScripts:: @ 8167FBB .byte 0 Route7_EventScript_167FBC:: @ 8167FBC - loadword 0, gUnknown_8184097 - callstd 3 + msgbox gUnknown_8184097, 3 end diff --git a/data/maps/Route7_EastEntrance/scripts.inc b/data/maps/Route7_EastEntrance/scripts.inc index c6edbcc33..2aacbed22 100644 --- a/data/maps/Route7_EastEntrance/scripts.inc +++ b/data/maps/Route7_EastEntrance/scripts.inc @@ -2,8 +2,7 @@ Route7_EastEntrance_MapScripts:: @ 816FA8D .byte 0 Route7_EastEntrance_EventScript_16FA8E:: @ 816FA8E - loadword 0, gUnknown_819E3D9 - callstd 2 + msgbox gUnknown_819E3D9, 2 end Route7_EastEntrance_EventScript_16FA97:: @ 816FA97 @@ -30,8 +29,7 @@ EventScript_16FABB:: @ 816FABB waitmovement 0 checkflag FLAG_0x2A6 goto_if 1, EventScript_16FAE5 - loadword 0, gUnknown_819E2B7 - callstd 4 + msgbox gUnknown_819E2B7 closemessage applymovement 255, Movement_16FB51 waitmovement 0 @@ -44,8 +42,7 @@ EventScript_16FAE5:: @ 816FAE5 end EventScript_16FAF0:: @ 816FAF0 - loadword 0, gUnknown_819E307 - callstd 4 + msgbox gUnknown_819E307 closemessage compare_var_to_value VAR_0x4001, 0 call_if 1, EventScript_16FB29 @@ -53,8 +50,7 @@ EventScript_16FAF0:: @ 816FAF0 call_if 1, EventScript_16FB34 compare_var_to_value VAR_0x4001, 2 call_if 1, EventScript_16FB3F - loadword 0, gUnknown_819E32D - callstd 4 + msgbox gUnknown_819E32D setvar VAR_0x4062, 1 releaseall end diff --git a/data/maps/Route8/scripts.inc b/data/maps/Route8/scripts.inc index 48e262dd1..d2bc3749b 100644 --- a/data/maps/Route8/scripts.inc +++ b/data/maps/Route8/scripts.inc @@ -2,6 +2,5 @@ Route8_MapScripts:: @ 8167FC5 .byte 0 Route8_EventScript_167FC6:: @ 8167FC6 - loadword 0, gUnknown_8184576 - callstd 3 + msgbox gUnknown_8184576, 3 end diff --git a/data/maps/Route8_WestEntrance/scripts.inc b/data/maps/Route8_WestEntrance/scripts.inc index df720aa57..16d77f8f9 100644 --- a/data/maps/Route8_WestEntrance/scripts.inc +++ b/data/maps/Route8_WestEntrance/scripts.inc @@ -2,8 +2,7 @@ Route8_WestEntrance_MapScripts:: @ 816FB53 .byte 0 Route8_WestEntrance_EventScript_16FB54:: @ 816FB54 - loadword 0, gUnknown_819E50F - callstd 2 + msgbox gUnknown_819E50F, 2 end Route8_WestEntrance_EventScript_16FB5D:: @ 816FB5D @@ -30,8 +29,7 @@ EventScript_16FB81:: @ 816FB81 waitmovement 0 checkflag FLAG_0x2A6 goto_if 1, EventScript_16FBAB - loadword 0, gUnknown_819E3ED - callstd 4 + msgbox gUnknown_819E3ED closemessage applymovement 255, Movement_16FC2D waitmovement 0 @@ -54,8 +52,7 @@ EventScript_16FBC1:: @ 816FBC1 end EventScript_16FBCC:: @ 816FBCC - loadword 0, gUnknown_819E43D - callstd 4 + msgbox gUnknown_819E43D closemessage compare_var_to_value VAR_0x4001, 0 call_if 1, EventScript_16FC05 @@ -63,8 +60,7 @@ EventScript_16FBCC:: @ 816FBCC call_if 1, EventScript_16FC10 compare_var_to_value VAR_0x4001, 2 call_if 1, EventScript_16FC1B - loadword 0, gUnknown_819E463 - callstd 4 + msgbox gUnknown_819E463 setvar VAR_0x4062, 1 releaseall end diff --git a/data/maps/Route9/scripts.inc b/data/maps/Route9/scripts.inc index d722c2e01..6c3b7927b 100644 --- a/data/maps/Route9/scripts.inc +++ b/data/maps/Route9/scripts.inc @@ -2,6 +2,5 @@ Route9_MapScripts:: @ 8167FCF .byte 0 Route9_EventScript_167FD0:: @ 8167FD0 - loadword 0, gUnknown_8184B66 - callstd 3 + msgbox gUnknown_8184B66, 3 end diff --git a/data/maps/SSAnne_1F_Corridor/scripts.inc b/data/maps/SSAnne_1F_Corridor/scripts.inc index a087d4ea9..d9bd8c051 100644 --- a/data/maps/SSAnne_1F_Corridor/scripts.inc +++ b/data/maps/SSAnne_1F_Corridor/scripts.inc @@ -2,11 +2,9 @@ SSAnne_1F_Corridor_MapScripts:: @ 81608CB .byte 0 SSAnne_1F_Corridor_EventScript_1608CC:: @ 81608CC - loadword 0, gUnknown_8172EE7 - callstd 2 + msgbox gUnknown_8172EE7, 2 end SSAnne_1F_Corridor_EventScript_1608D5:: @ 81608D5 - loadword 0, gUnknown_8172F60 - callstd 2 + msgbox gUnknown_8172F60, 2 end diff --git a/data/maps/SSAnne_1F_Room1/scripts.inc b/data/maps/SSAnne_1F_Room1/scripts.inc index 76e6a74da..ca75fd46d 100644 --- a/data/maps/SSAnne_1F_Room1/scripts.inc +++ b/data/maps/SSAnne_1F_Room1/scripts.inc @@ -2,6 +2,5 @@ SSAnne_1F_Room1_MapScripts:: @ 8160BDB .byte 0 SSAnne_1F_Room1_EventScript_160BDC:: @ 8160BDC - loadword 0, gUnknown_817393B - callstd 2 + msgbox gUnknown_817393B, 2 end diff --git a/data/maps/SSAnne_1F_Room2/scripts.inc b/data/maps/SSAnne_1F_Room2/scripts.inc index 269a5ca17..4f1ef996b 100644 --- a/data/maps/SSAnne_1F_Room2/scripts.inc +++ b/data/maps/SSAnne_1F_Room2/scripts.inc @@ -2,18 +2,15 @@ SSAnne_1F_Room2_MapScripts:: @ 8160BE5 .byte 0 SSAnne_1F_Room2_EventScript_160BE6:: @ 8160BE6 - loadword 0, gUnknown_8173AC5 - callstd 2 + msgbox gUnknown_8173AC5, 2 end SSAnne_1F_Room2_EventScript_160BEF:: @ 8160BEF trainerbattle 0, 126, 0, Text_173A1A, Text_173A4F - loadword 0, gUnknown_8173A7A - callstd 6 + msgbox gUnknown_8173A7A, 6 end SSAnne_1F_Room2_EventScript_160C06:: @ 8160C06 trainerbattle 0, 96, 0, Text_173999, Text_1739B1 - loadword 0, gUnknown_81739C5 - callstd 6 + msgbox gUnknown_81739C5, 6 end diff --git a/data/maps/SSAnne_1F_Room3/scripts.inc b/data/maps/SSAnne_1F_Room3/scripts.inc index 192e8e4f8..bdfe2cc07 100644 --- a/data/maps/SSAnne_1F_Room3/scripts.inc +++ b/data/maps/SSAnne_1F_Room3/scripts.inc @@ -2,13 +2,11 @@ SSAnne_1F_Room3_MapScripts:: @ 8160C1D .byte 0 SSAnne_1F_Room3_EventScript_160C1E:: @ 8160C1E - loadword 0, gUnknown_8173B21 - callstd 2 + msgbox gUnknown_8173B21, 2 end SSAnne_1F_Room3_EventScript_160C27:: @ 8160C27 - loadword 0, gUnknown_8173AFA - callstd 2 + msgbox gUnknown_8173AFA, 2 end SSAnne_1F_Room3_EventScript_160C30:: @ 8160C30 @@ -16,8 +14,7 @@ SSAnne_1F_Room3_EventScript_160C30:: @ 8160C30 faceplayer waitse playmoncry SPECIES_WIGGLYTUFF, 0 - loadword 0, gUnknown_8173B61 - callstd 4 + msgbox gUnknown_8173B61 waitmoncry release end diff --git a/data/maps/SSAnne_1F_Room4/scripts.inc b/data/maps/SSAnne_1F_Room4/scripts.inc index 688a558bd..e37fb22fd 100644 --- a/data/maps/SSAnne_1F_Room4/scripts.inc +++ b/data/maps/SSAnne_1F_Room4/scripts.inc @@ -7,13 +7,11 @@ SSAnne_1F_Room4_EventScript_160C44:: @ 8160C44 checkplayergender compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_160C5C - loadword 0, gUnknown_8173BA4 - callstd 4 + msgbox gUnknown_8173BA4 release end EventScript_160C5C:: @ 8160C5C - loadword 0, gUnknown_8173B79 - callstd 4 + msgbox gUnknown_8173B79 release end diff --git a/data/maps/SSAnne_1F_Room5/scripts.inc b/data/maps/SSAnne_1F_Room5/scripts.inc index 8c0b40f37..553a72b52 100644 --- a/data/maps/SSAnne_1F_Room5/scripts.inc +++ b/data/maps/SSAnne_1F_Room5/scripts.inc @@ -3,6 +3,5 @@ SSAnne_1F_Room5_MapScripts:: @ 8160C66 SSAnne_1F_Room5_EventScript_160C67:: @ 8160C67 trainerbattle 0, 422, 0, Text_173BD1, Text_173BFA - loadword 0, gUnknown_8173C30 - callstd 6 + msgbox gUnknown_8173C30, 6 end diff --git a/data/maps/SSAnne_1F_Room6/scripts.inc b/data/maps/SSAnne_1F_Room6/scripts.inc index 6c413ad8f..a07797706 100644 --- a/data/maps/SSAnne_1F_Room6/scripts.inc +++ b/data/maps/SSAnne_1F_Room6/scripts.inc @@ -4,14 +4,12 @@ SSAnne_1F_Room6_MapScripts:: @ 8160DF2 SSAnne_1F_Room6_EventScript_160DF3:: @ 8160DF3 lock faceplayer - loadword 0, gUnknown_817445B - callstd 5 + msgbox gUnknown_817445B, 5 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_160E18 closemessage call EventScript_1A6C26 - loadword 0, gUnknown_8174490 - callstd 4 + msgbox gUnknown_8174490 release end @@ -19,13 +17,11 @@ EventScript_160E18:: @ 8160E18 checkplayergender compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_160E2E - loadword 0, gUnknown_8174515 - callstd 4 + msgbox gUnknown_8174515 release end EventScript_160E2E:: @ 8160E2E - loadword 0, gUnknown_81744D0 - callstd 4 + msgbox gUnknown_81744D0 release end diff --git a/data/maps/SSAnne_1F_Room7/scripts.inc b/data/maps/SSAnne_1F_Room7/scripts.inc index eaa7d1890..bc6e0cd88 100644 --- a/data/maps/SSAnne_1F_Room7/scripts.inc +++ b/data/maps/SSAnne_1F_Room7/scripts.inc @@ -3,6 +3,5 @@ SSAnne_1F_Room7_MapScripts:: @ 8160C7E SSAnne_1F_Room7_EventScript_160C7F:: @ 8160C7F trainerbattle 0, 421, 0, Text_173C52, Text_173CB4 - loadword 0, gUnknown_8173CC4 - callstd 6 + msgbox gUnknown_8173CC4, 6 end diff --git a/data/maps/SSAnne_2F_Corridor/scripts.inc b/data/maps/SSAnne_2F_Corridor/scripts.inc index 0702c3048..68ead6a96 100644 --- a/data/maps/SSAnne_2F_Corridor/scripts.inc +++ b/data/maps/SSAnne_2F_Corridor/scripts.inc @@ -41,8 +41,7 @@ EventScript_160903:: @ 8160903 call_if 1, EventScript_1609B8 compare_var_to_value VAR_0x4001, 2 call_if 1, EventScript_1609CA - loadword 0, gUnknown_8173035 - callstd 4 + msgbox gUnknown_8173035 setvar VAR_LAST_TALKED, 1 compare_var_to_value VAR_STARTER_MON, 2 call_if 1, EventScript_1609DC @@ -50,8 +49,7 @@ EventScript_160903:: @ 8160903 call_if 1, EventScript_1609E7 compare_var_to_value VAR_STARTER_MON, 0 call_if 1, EventScript_1609F2 - loadword 0, gUnknown_8173164 - callstd 4 + msgbox gUnknown_8173164 closemessage delay 10 playbgm BGM_FRLG_RIVAL_POSTBATTLE, 0 @@ -182,6 +180,5 @@ Movement_160A4C:: @ 8160A4C step_end SSAnne_2F_Corridor_EventScript_160A54:: @ 8160A54 - loadword 0, gUnknown_8172FC3 - callstd 2 + msgbox gUnknown_8172FC3, 2 end diff --git a/data/maps/SSAnne_2F_Room2/scripts.inc b/data/maps/SSAnne_2F_Room2/scripts.inc index 5762975fc..cb18a010a 100644 --- a/data/maps/SSAnne_2F_Room2/scripts.inc +++ b/data/maps/SSAnne_2F_Room2/scripts.inc @@ -3,12 +3,10 @@ SSAnne_2F_Room2_MapScripts:: @ 8160CB0 SSAnne_2F_Room2_EventScript_160CB1:: @ 8160CB1 trainerbattle 0, 223, 0, Text_173DDB, Text_173DF7 - loadword 0, gUnknown_8173E04 - callstd 6 + msgbox gUnknown_8173E04, 6 end SSAnne_2F_Room2_EventScript_160CC8:: @ 8160CC8 trainerbattle 0, 482, 0, Text_173D63, Text_173D92 - loadword 0, gUnknown_8173DB6 - callstd 6 + msgbox gUnknown_8173DB6, 6 end diff --git a/data/maps/SSAnne_2F_Room3/scripts.inc b/data/maps/SSAnne_2F_Room3/scripts.inc index fefb080fc..577503151 100644 --- a/data/maps/SSAnne_2F_Room3/scripts.inc +++ b/data/maps/SSAnne_2F_Room3/scripts.inc @@ -2,11 +2,9 @@ SSAnne_2F_Room3_MapScripts:: @ 8160CDF .byte 0 SSAnne_2F_Room3_EventScript_160CE0:: @ 8160CE0 - loadword 0, gUnknown_8173E3A - callstd 2 + msgbox gUnknown_8173E3A, 2 end SSAnne_2F_Room3_EventScript_160CE9:: @ 8160CE9 - loadword 0, gUnknown_8173E7B - callstd 2 + msgbox gUnknown_8173E7B, 2 end diff --git a/data/maps/SSAnne_2F_Room4/scripts.inc b/data/maps/SSAnne_2F_Room4/scripts.inc index fc9f91ede..26efb8bd5 100644 --- a/data/maps/SSAnne_2F_Room4/scripts.inc +++ b/data/maps/SSAnne_2F_Room4/scripts.inc @@ -3,12 +3,10 @@ SSAnne_2F_Room4_MapScripts:: @ 8160CF2 SSAnne_2F_Room4_EventScript_160CF3:: @ 8160CF3 trainerbattle 0, 483, 0, Text_173F07, Text_173F42 - loadword 0, gUnknown_8173F55 - callstd 6 + msgbox gUnknown_8173F55, 6 end SSAnne_2F_Room4_EventScript_160D0A:: @ 8160D0A trainerbattle 0, 127, 0, Text_173F83, Text_173FAB - loadword 0, gUnknown_8173FB9 - callstd 6 + msgbox gUnknown_8173FB9, 6 end diff --git a/data/maps/SSAnne_2F_Room5/scripts.inc b/data/maps/SSAnne_2F_Room5/scripts.inc index 3407bebc2..fb835d315 100644 --- a/data/maps/SSAnne_2F_Room5/scripts.inc +++ b/data/maps/SSAnne_2F_Room5/scripts.inc @@ -2,11 +2,9 @@ SSAnne_2F_Room5_MapScripts:: @ 8160D21 .byte 0 SSAnne_2F_Room5_EventScript_160D22:: @ 8160D22 - loadword 0, gUnknown_8173FF7 - callstd 2 + msgbox gUnknown_8173FF7, 2 end SSAnne_2F_Room5_EventScript_160D2B:: @ 8160D2B - loadword 0, gUnknown_817404F - callstd 2 + msgbox gUnknown_817404F, 2 end diff --git a/data/maps/SSAnne_2F_Room6/scripts.inc b/data/maps/SSAnne_2F_Room6/scripts.inc index d8e68cbe9..2fb6544da 100644 --- a/data/maps/SSAnne_2F_Room6/scripts.inc +++ b/data/maps/SSAnne_2F_Room6/scripts.inc @@ -2,11 +2,9 @@ SSAnne_2F_Room6_MapScripts:: @ 8160D34 .byte 0 SSAnne_2F_Room6_EventScript_160D35:: @ 8160D35 - loadword 0, gUnknown_81740A1 - callstd 2 + msgbox gUnknown_81740A1, 2 end SSAnne_2F_Room6_EventScript_160D3E:: @ 8160D3E - loadword 0, gUnknown_81740D6 - callstd 2 + msgbox gUnknown_81740D6, 2 end diff --git a/data/maps/SSAnne_3F_Corridor/scripts.inc b/data/maps/SSAnne_3F_Corridor/scripts.inc index 7fee476cf..b4f61fe75 100644 --- a/data/maps/SSAnne_3F_Corridor/scripts.inc +++ b/data/maps/SSAnne_3F_Corridor/scripts.inc @@ -2,6 +2,5 @@ SSAnne_3F_Corridor_MapScripts:: @ 8160A5D .byte 0 SSAnne_3F_Corridor_EventScript_160A5E:: @ 8160A5E - loadword 0, gUnknown_817320C - callstd 2 + msgbox gUnknown_817320C, 2 end diff --git a/data/maps/SSAnne_B1F_Room1/scripts.inc b/data/maps/SSAnne_B1F_Room1/scripts.inc index f2bcadc33..ec931102e 100644 --- a/data/maps/SSAnne_B1F_Room1/scripts.inc +++ b/data/maps/SSAnne_B1F_Room1/scripts.inc @@ -3,12 +3,10 @@ SSAnne_B1F_Room1_MapScripts:: @ 8160D47 SSAnne_B1F_Room1_EventScript_160D48:: @ 8160D48 trainerbattle 0, 224, 0, Text_174177, Text_1741EF - loadword 0, gUnknown_817420E - callstd 6 + msgbox gUnknown_817420E, 6 end SSAnne_B1F_Room1_EventScript_160D5F:: @ 8160D5F trainerbattle 0, 140, 0, Text_1740F6, Text_174123 - loadword 0, gUnknown_817413A - callstd 6 + msgbox gUnknown_817413A, 6 end diff --git a/data/maps/SSAnne_B1F_Room2/scripts.inc b/data/maps/SSAnne_B1F_Room2/scripts.inc index e84b8d68e..71acf74be 100644 --- a/data/maps/SSAnne_B1F_Room2/scripts.inc +++ b/data/maps/SSAnne_B1F_Room2/scripts.inc @@ -3,6 +3,5 @@ SSAnne_B1F_Room2_MapScripts:: @ 8160D76 SSAnne_B1F_Room2_EventScript_160D77:: @ 8160D77 trainerbattle 0, 138, 0, Text_174239, Text_17425C - loadword 0, gUnknown_8174272 - callstd 6 + msgbox gUnknown_8174272, 6 end diff --git a/data/maps/SSAnne_B1F_Room3/scripts.inc b/data/maps/SSAnne_B1F_Room3/scripts.inc index 55b1c3227..3a1ff97c6 100644 --- a/data/maps/SSAnne_B1F_Room3/scripts.inc +++ b/data/maps/SSAnne_B1F_Room3/scripts.inc @@ -3,6 +3,5 @@ SSAnne_B1F_Room3_MapScripts:: @ 8160D8E SSAnne_B1F_Room3_EventScript_160D8F:: @ 8160D8F trainerbattle 0, 139, 0, Text_1742A6, Text_1742C3 - loadword 0, gUnknown_81742D2 - callstd 6 + msgbox gUnknown_81742D2, 6 end diff --git a/data/maps/SSAnne_B1F_Room4/scripts.inc b/data/maps/SSAnne_B1F_Room4/scripts.inc index 2f7fb16e6..02860ab54 100644 --- a/data/maps/SSAnne_B1F_Room4/scripts.inc +++ b/data/maps/SSAnne_B1F_Room4/scripts.inc @@ -3,12 +3,10 @@ SSAnne_B1F_Room4_MapScripts:: @ 8160DA6 SSAnne_B1F_Room4_EventScript_160DA7:: @ 8160DA7 trainerbattle 0, 136, 0, Text_174315, Text_174348 - loadword 0, gUnknown_8174362 - callstd 6 + msgbox gUnknown_8174362, 6 end SSAnne_B1F_Room4_EventScript_160DBE:: @ 8160DBE trainerbattle 0, 137, 0, Text_174385, Text_1743B3 - loadword 0, gUnknown_81743C8 - callstd 6 + msgbox gUnknown_81743C8, 6 end diff --git a/data/maps/SSAnne_B1F_Room5/scripts.inc b/data/maps/SSAnne_B1F_Room5/scripts.inc index df7cbb5a5..c449d1164 100644 --- a/data/maps/SSAnne_B1F_Room5/scripts.inc +++ b/data/maps/SSAnne_B1F_Room5/scripts.inc @@ -2,8 +2,7 @@ SSAnne_B1F_Room5_MapScripts:: @ 8160DD5 .byte 0 SSAnne_B1F_Room5_EventScript_160DD6:: @ 8160DD6 - loadword 0, gUnknown_81743F8 - callstd 2 + msgbox gUnknown_81743F8, 2 end SSAnne_B1F_Room5_EventScript_160DDF:: @ 8160DDF @@ -11,8 +10,7 @@ SSAnne_B1F_Room5_EventScript_160DDF:: @ 8160DDF faceplayer waitse playmoncry SPECIES_MACHOKE, 0 - loadword 0, gUnknown_8174444 - callstd 4 + msgbox gUnknown_8174444 waitmoncry release end diff --git a/data/maps/SSAnne_CaptainsOffice/scripts.inc b/data/maps/SSAnne_CaptainsOffice/scripts.inc index 23e1d6b36..5cf0b5375 100644 --- a/data/maps/SSAnne_CaptainsOffice/scripts.inc +++ b/data/maps/SSAnne_CaptainsOffice/scripts.inc @@ -5,8 +5,7 @@ SSAnne_CaptainsOffice_EventScript_160B3A:: @ 8160B3A lock checkflag FLAG_0x237 goto_if 1, EventScript_160BB5 - loadword 0, gUnknown_8173646 - callstd 4 + msgbox gUnknown_8173646 textcolor 3 message Text_173676 waitmessage @@ -16,20 +15,17 @@ SSAnne_CaptainsOffice_EventScript_160B3A:: @ 8160B3A delay 50 applymovement 1, Movement_1A75E1 waitmovement 0 - loadword 0, gUnknown_81736A6 - callstd 4 + msgbox gUnknown_81736A6 additem ITEM_HM01, 1 giveitemfanfaremsg gUnknown_81737AF, ITEM_HM01, 1, BGM_FRLG_ME_KEYITEM - loadword 0, gUnknown_81737D2 - callstd 4 + msgbox gUnknown_81737D2 setflag FLAG_0x237 setvar VAR_MAP_SCENE_VERMILION_CITY, 1 release end EventScript_160BA0:: @ 8160BA0 - loadword 0, gUnknown_81738C3 - callstd 4 + msgbox gUnknown_81738C3 closemessage applymovement 1, Movement_1A75E5 waitmovement 0 @@ -39,17 +35,14 @@ EventScript_160BA0:: @ 8160BA0 EventScript_160BB5:: @ 8160BB5 applymovement 1, Movement_1A75E1 waitmovement 0 - loadword 0, gUnknown_8173831 - callstd 4 + msgbox gUnknown_8173831 release end SSAnne_CaptainsOffice_EventScript_160BC9:: @ 8160BC9 - loadword 0, gUnknown_81738E6 - callstd 3 + msgbox gUnknown_81738E6, 3 end SSAnne_CaptainsOffice_EventScript_160BD2:: @ 8160BD2 - loadword 0, gUnknown_8173903 - callstd 3 + msgbox gUnknown_8173903, 3 end diff --git a/data/maps/SSAnne_Deck/scripts.inc b/data/maps/SSAnne_Deck/scripts.inc index e113c5e04..3f835e568 100644 --- a/data/maps/SSAnne_Deck/scripts.inc +++ b/data/maps/SSAnne_Deck/scripts.inc @@ -2,28 +2,23 @@ SSAnne_Deck_MapScripts:: @ 8160A68 .byte 0 SSAnne_Deck_EventScript_160A69:: @ 8160A69 - loadword 0, gUnknown_817326F - callstd 2 + msgbox gUnknown_817326F, 2 end SSAnne_Deck_EventScript_160A72:: @ 8160A72 - loadword 0, gUnknown_81732C6 - callstd 2 + msgbox gUnknown_81732C6, 2 end SSAnne_Deck_EventScript_160A7B:: @ 8160A7B - loadword 0, gUnknown_81732A2 - callstd 2 + msgbox gUnknown_81732A2, 2 end SSAnne_Deck_EventScript_160A84:: @ 8160A84 trainerbattle 0, 134, 0, Text_173308, Text_17332B - loadword 0, gUnknown_817333E - callstd 6 + msgbox gUnknown_817333E, 6 end SSAnne_Deck_EventScript_160A9B:: @ 8160A9B trainerbattle 0, 135, 0, Text_173382, Text_1733A0 - loadword 0, gUnknown_81733B5 - callstd 6 + msgbox gUnknown_81733B5, 6 end diff --git a/data/maps/SSAnne_Kitchen/scripts.inc b/data/maps/SSAnne_Kitchen/scripts.inc index 727531dfa..b1b60056d 100644 --- a/data/maps/SSAnne_Kitchen/scripts.inc +++ b/data/maps/SSAnne_Kitchen/scripts.inc @@ -2,25 +2,21 @@ SSAnne_Kitchen_MapScripts:: @ 8160AB2 .byte 0 SSAnne_Kitchen_EventScript_160AB3:: @ 8160AB3 - loadword 0, gUnknown_81733F8 - callstd 2 + msgbox gUnknown_81733F8, 2 end SSAnne_Kitchen_EventScript_160ABC:: @ 8160ABC - loadword 0, gUnknown_8173429 - callstd 2 + msgbox gUnknown_8173429, 2 end SSAnne_Kitchen_EventScript_160AC5:: @ 8160AC5 - loadword 0, gUnknown_8173462 - callstd 2 + msgbox gUnknown_8173462, 2 end SSAnne_Kitchen_EventScript_160ACE:: @ 8160ACE lock faceplayer - loadword 0, gUnknown_8173570 - callstd 4 + msgbox gUnknown_8173570 random 3 copyvar VAR_0x8008, VAR_RESULT compare_var_to_value VAR_0x8008, 0 @@ -33,31 +29,25 @@ SSAnne_Kitchen_EventScript_160ACE:: @ 8160ACE end EventScript_160B03:: @ 8160B03 - loadword 0, gUnknown_817359F - callstd 4 + msgbox gUnknown_817359F return EventScript_160B0C:: @ 8160B0C - loadword 0, gUnknown_81735DF - callstd 4 + msgbox gUnknown_81735DF return EventScript_160B15:: @ 8160B15 - loadword 0, gUnknown_8173611 - callstd 4 + msgbox gUnknown_8173611 return SSAnne_Kitchen_EventScript_160B1E:: @ 8160B1E - loadword 0, gUnknown_81734A0 - callstd 2 + msgbox gUnknown_81734A0, 2 end SSAnne_Kitchen_EventScript_160B27:: @ 8160B27 - loadword 0, gUnknown_81734D3 - callstd 2 + msgbox gUnknown_81734D3, 2 end SSAnne_Kitchen_EventScript_160B30:: @ 8160B30 - loadword 0, gUnknown_817353E - callstd 2 + msgbox gUnknown_817353E, 2 end diff --git a/data/maps/SafariZone_Building1/scripts.inc b/data/maps/SafariZone_Building1/scripts.inc index 3baad36cb..668e92250 100644 --- a/data/maps/SafariZone_Building1/scripts.inc +++ b/data/maps/SafariZone_Building1/scripts.inc @@ -2,11 +2,9 @@ SafariZone_Building1_MapScripts:: @ 81623EB .byte 0 SafariZone_Building1_EventScript_1623EC:: @ 81623EC - loadword 0, gUnknown_8177A5A - callstd 2 + msgbox gUnknown_8177A5A, 2 end SafariZone_Building1_EventScript_1623F5:: @ 81623F5 - loadword 0, gUnknown_8177A82 - callstd 2 + msgbox gUnknown_8177A82, 2 end diff --git a/data/maps/SafariZone_Building2/scripts.inc b/data/maps/SafariZone_Building2/scripts.inc index 37246f3c3..717ccf36b 100644 --- a/data/maps/SafariZone_Building2/scripts.inc +++ b/data/maps/SafariZone_Building2/scripts.inc @@ -2,16 +2,13 @@ SafariZone_Building2_MapScripts:: @ 81623FE .byte 0 SafariZone_Building2_EventScript_1623FF:: @ 81623FF - loadword 0, gUnknown_8177AE2 - callstd 2 + msgbox gUnknown_8177AE2, 2 end SafariZone_Building2_EventScript_162408:: @ 8162408 - loadword 0, gUnknown_8177AAE - callstd 2 + msgbox gUnknown_8177AAE, 2 end SafariZone_Building2_EventScript_162411:: @ 8162411 - loadword 0, gUnknown_8177B16 - callstd 2 + msgbox gUnknown_8177B16, 2 end diff --git a/data/maps/SafariZone_Building3/scripts.inc b/data/maps/SafariZone_Building3/scripts.inc index a4805b1ca..a4dc55062 100644 --- a/data/maps/SafariZone_Building3/scripts.inc +++ b/data/maps/SafariZone_Building3/scripts.inc @@ -2,16 +2,13 @@ SafariZone_Building3_MapScripts:: @ 816241A .byte 0 SafariZone_Building3_EventScript_16241B:: @ 816241B - loadword 0, gUnknown_8177BAB - callstd 2 + msgbox gUnknown_8177BAB, 2 end SafariZone_Building3_EventScript_162424:: @ 8162424 - loadword 0, gUnknown_8177B38 - callstd 2 + msgbox gUnknown_8177B38, 2 end SafariZone_Building3_EventScript_16242D:: @ 816242D - loadword 0, gUnknown_8177BEC - callstd 2 + msgbox gUnknown_8177BEC, 2 end diff --git a/data/maps/SafariZone_Building4/scripts.inc b/data/maps/SafariZone_Building4/scripts.inc index ac81fffed..8f589cd8f 100644 --- a/data/maps/SafariZone_Building4/scripts.inc +++ b/data/maps/SafariZone_Building4/scripts.inc @@ -2,16 +2,13 @@ SafariZone_Building4_MapScripts:: @ 8162436 .byte 0 SafariZone_Building4_EventScript_162437:: @ 8162437 - loadword 0, gUnknown_8177D39 - callstd 2 + msgbox gUnknown_8177D39, 2 end SafariZone_Building4_EventScript_162440:: @ 8162440 - loadword 0, gUnknown_8177CEB - callstd 2 + msgbox gUnknown_8177CEB, 2 end SafariZone_Building4_EventScript_162449:: @ 8162449 - loadword 0, gUnknown_8177D8B - callstd 2 + msgbox gUnknown_8177D8B, 2 end diff --git a/data/maps/SafariZone_Center/scripts.inc b/data/maps/SafariZone_Center/scripts.inc index 90ab60e6d..9f887910a 100644 --- a/data/maps/SafariZone_Center/scripts.inc +++ b/data/maps/SafariZone_Center/scripts.inc @@ -7,16 +7,13 @@ SafariZone_Center_MapScript1_16235D:: @ 816235D end SafariZone_Center_EventScript_162361:: @ 8162361 - loadword 0, gUnknown_81777F2 - callstd 3 + msgbox gUnknown_81777F2, 3 end SafariZone_Center_EventScript_16236A:: @ 816236A - loadword 0, gUnknown_81777FD - callstd 3 + msgbox gUnknown_81777FD, 3 end SafariZone_Center_EventScript_162373:: @ 8162373 - loadword 0, gUnknown_817782F - callstd 3 + msgbox gUnknown_817782F, 3 end diff --git a/data/maps/SafariZone_East/scripts.inc b/data/maps/SafariZone_East/scripts.inc index a53570491..b38039b36 100644 --- a/data/maps/SafariZone_East/scripts.inc +++ b/data/maps/SafariZone_East/scripts.inc @@ -2,16 +2,13 @@ SafariZone_East_MapScripts:: @ 816237C .byte 0 SafariZone_East_EventScript_16237D:: @ 816237D - loadword 0, gUnknown_817783B - callstd 3 + msgbox gUnknown_817783B, 3 end SafariZone_East_EventScript_162386:: @ 8162386 - loadword 0, gUnknown_8177846 - callstd 3 + msgbox gUnknown_8177846, 3 end SafariZone_East_EventScript_16238F:: @ 816238F - loadword 0, gUnknown_8177884 - callstd 3 + msgbox gUnknown_8177884, 3 end diff --git a/data/maps/SafariZone_North/scripts.inc b/data/maps/SafariZone_North/scripts.inc index 8db400bed..f45988629 100644 --- a/data/maps/SafariZone_North/scripts.inc +++ b/data/maps/SafariZone_North/scripts.inc @@ -2,26 +2,21 @@ SafariZone_North_MapScripts:: @ 8162398 .byte 0 SafariZone_North_EventScript_162399:: @ 8162399 - loadword 0, gUnknown_817789D - callstd 3 + msgbox gUnknown_817789D, 3 end SafariZone_North_EventScript_1623A2:: @ 81623A2 - loadword 0, gUnknown_81778A8 - callstd 3 + msgbox gUnknown_81778A8, 3 end SafariZone_North_EventScript_1623AB:: @ 81623AB - loadword 0, gUnknown_81778D6 - callstd 3 + msgbox gUnknown_81778D6, 3 end SafariZone_North_EventScript_1623B4:: @ 81623B4 - loadword 0, gUnknown_81778DD - callstd 3 + msgbox gUnknown_81778DD, 3 end SafariZone_North_EventScript_1623BD:: @ 81623BD - loadword 0, gUnknown_8177935 - callstd 3 + msgbox gUnknown_8177935, 3 end diff --git a/data/maps/SafariZone_SecretHouse/scripts.inc b/data/maps/SafariZone_SecretHouse/scripts.inc index 6e9e27f70..025d36484 100644 --- a/data/maps/SafariZone_SecretHouse/scripts.inc +++ b/data/maps/SafariZone_SecretHouse/scripts.inc @@ -6,27 +6,23 @@ SafariZone_SecretHouse_EventScript_162453:: @ 8162453 faceplayer checkflag FLAG_0x239 goto_if 1, EventScript_1624A9 - loadword 0, gUnknown_8177DC1 - callstd 4 + msgbox gUnknown_8177DC1 checkitemspace ITEM_HM03, 1 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16249F additem ITEM_HM03, 1 giveitemfanfaremsg gUnknown_8177E92, ITEM_HM03 - loadword 0, gUnknown_8177EB7 - callstd 4 + msgbox gUnknown_8177EB7 setflag FLAG_0x239 release end EventScript_16249F:: @ 816249F - loadword 0, gUnknown_8177F72 - callstd 4 + msgbox gUnknown_8177F72 release end EventScript_1624A9:: @ 81624A9 - loadword 0, gUnknown_8177EB7 - callstd 4 + msgbox gUnknown_8177EB7 release end diff --git a/data/maps/SafariZone_West/scripts.inc b/data/maps/SafariZone_West/scripts.inc index fd8696508..2b8357334 100644 --- a/data/maps/SafariZone_West/scripts.inc +++ b/data/maps/SafariZone_West/scripts.inc @@ -2,21 +2,17 @@ SafariZone_West_MapScripts:: @ 81623C6 .byte 0 SafariZone_West_EventScript_1623C7:: @ 81623C7 - loadword 0, gUnknown_817796E - callstd 3 + msgbox gUnknown_817796E, 3 end SafariZone_West_EventScript_1623D0:: @ 81623D0 - loadword 0, gUnknown_8177979 - callstd 3 + msgbox gUnknown_8177979, 3 end SafariZone_West_EventScript_1623D9:: @ 81623D9 - loadword 0, gUnknown_81779F8 - callstd 3 + msgbox gUnknown_81779F8, 3 end SafariZone_West_EventScript_1623E2:: @ 81623E2 - loadword 0, gUnknown_8177A41 - callstd 3 + msgbox gUnknown_8177A41, 3 end diff --git a/data/maps/SaffronCity_Dojo/scripts.inc b/data/maps/SaffronCity_Dojo/scripts.inc index 53b26e09a..98a87ccd0 100644 --- a/data/maps/SaffronCity_Dojo/scripts.inc +++ b/data/maps/SaffronCity_Dojo/scripts.inc @@ -27,8 +27,7 @@ SaffronCity_Dojo_EventScript_16EC00:: @ 816EC00 applymovement 5, Movement_1A75E9 waitmovement 0 textcolor 0 - loadword 0, gUnknown_819B44E - callstd 5 + msgbox gUnknown_819B44E, 5 call EventScript_1A6675 compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_16EC82 @@ -37,8 +36,7 @@ SaffronCity_Dojo_EventScript_16EC00:: @ 816EC00 end EventScript_16EC3C:: @ 816EC3C - loadword 0, gUnknown_819B4E1 - callstd 4 + msgbox gUnknown_819B4E1 release end @@ -52,8 +50,7 @@ SaffronCity_Dojo_EventScript_16EC46:: @ 816EC46 applymovement 5, Movement_1A75E9 waitmovement 0 textcolor 0 - loadword 0, gUnknown_819B49E - callstd 5 + msgbox gUnknown_819B49E, 5 call EventScript_1A6675 compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_16EC82 @@ -81,8 +78,7 @@ EventScript_16ECB5:: @ 816ECB5 waitmessage waitfanfare setflag FLAG_0x278 - loadword 0, gUnknown_81A56A7 - callstd 5 + msgbox gUnknown_81A56A7, 5 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16ED29 call EventScript_1A8C27 @@ -98,8 +94,7 @@ EventScript_16ECEC:: @ 816ECEC waitmessage waitfanfare setflag FLAG_0x278 - loadword 0, gUnknown_81A56A7 - callstd 5 + msgbox gUnknown_81A56A7, 5 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16ED1E call EventScript_1A8C33 @@ -116,55 +111,46 @@ EventScript_16ED29:: @ 816ED29 end SaffronCity_Dojo_EventScript_16ED2B:: @ 816ED2B - loadword 0, gUnknown_819B52E - callstd 3 + msgbox gUnknown_819B52E, 3 end SaffronCity_Dojo_EventScript_16ED34:: @ 816ED34 - loadword 0, gUnknown_819B4F8 - callstd 3 + msgbox gUnknown_819B4F8, 3 end SaffronCity_Dojo_EventScript_16ED3D:: @ 816ED3D - loadword 0, gUnknown_819B50F - callstd 3 + msgbox gUnknown_819B50F, 3 end SaffronCity_Dojo_EventScript_16ED46:: @ 816ED46 trainerbattle 0, 321, 0, Text_19B3DF, Text_19B40F - loadword 0, gUnknown_819B41F - callstd 6 + msgbox gUnknown_819B41F, 6 end SaffronCity_Dojo_EventScript_16ED5D:: @ 816ED5D trainerbattle 0, 319, 0, Text_19B2E0, Text_19B2FD - loadword 0, gUnknown_819B30F - callstd 6 + msgbox gUnknown_819B30F, 6 end SaffronCity_Dojo_EventScript_16ED74:: @ 816ED74 trainerbattle 0, 320, 0, Text_19B341, Text_19B396 - loadword 0, gUnknown_819B3AC - callstd 6 + msgbox gUnknown_819B3AC, 6 end SaffronCity_Dojo_EventScript_16ED8B:: @ 816ED8B trainerbattle 0, 318, 0, Text_19B275, Text_19B292 - loadword 0, gUnknown_819B29D - callstd 6 + msgbox gUnknown_819B29D, 6 end SaffronCity_Dojo_EventScript_16EDA2:: @ 816EDA2 trainerbattle 2, 317, 0, Text_19B12C, Text_19B193, EventScript_16EDD0 checkflag FLAG_0x278 goto_if 1, EventScript_16EDC6 - loadword 0, gUnknown_819B1A7 - callstd 6 + msgbox gUnknown_819B1A7, 6 end EventScript_16EDC6:: @ 816EDC6 - loadword 0, gUnknown_819B24C - callstd 4 + msgbox gUnknown_819B24C release end diff --git a/data/maps/SaffronCity_Duplicate/scripts.inc b/data/maps/SaffronCity_Duplicate/scripts.inc index fa5d031b3..e7ad1b506 100644 --- a/data/maps/SaffronCity_Duplicate/scripts.inc +++ b/data/maps/SaffronCity_Duplicate/scripts.inc @@ -13,38 +13,31 @@ EventScript_167372:: @ 8167372 return SaffronCity_Duplicate_EventScript_16737A:: @ 816737A - loadword 0, gUnknown_8181003 - callstd 2 + msgbox gUnknown_8181003, 2 end SaffronCity_Duplicate_EventScript_167383:: @ 8167383 - loadword 0, gUnknown_818101F - callstd 2 + msgbox gUnknown_818101F, 2 end SaffronCity_Duplicate_EventScript_16738C:: @ 816738C - loadword 0, gUnknown_818105A - callstd 2 + msgbox gUnknown_818105A, 2 end SaffronCity_Duplicate_EventScript_167395:: @ 8167395 - loadword 0, gUnknown_8181087 - callstd 2 + msgbox gUnknown_8181087, 2 end SaffronCity_Duplicate_EventScript_16739E:: @ 816739E - loadword 0, gUnknown_81810A7 - callstd 2 + msgbox gUnknown_81810A7, 2 end SaffronCity_Duplicate_EventScript_1673A7:: @ 81673A7 - loadword 0, gUnknown_81810D5 - callstd 2 + msgbox gUnknown_81810D5, 2 end SaffronCity_Duplicate_EventScript_1673B0:: @ 81673B0 - loadword 0, gUnknown_81810F5 - callstd 2 + msgbox gUnknown_81810F5, 2 end SaffronCity_Duplicate_EventScript_1673B9:: @ 81673B9 @@ -53,36 +46,30 @@ SaffronCity_Duplicate_EventScript_1673B9:: @ 81673B9 goto_if 1, EventScript_1673D7 applymovement 6, Movement_1A75E1 waitmovement 0 - loadword 0, gUnknown_81812CA - callstd 4 + msgbox gUnknown_81812CA release end EventScript_1673D7:: @ 81673D7 textcolor 3 - loadword 0, gUnknown_8181302 - callstd 4 + msgbox gUnknown_8181302 release end SaffronCity_Duplicate_EventScript_1673E3:: @ 81673E3 - loadword 0, gUnknown_8181159 - callstd 2 + msgbox gUnknown_8181159, 2 end SaffronCity_Duplicate_EventScript_1673EC:: @ 81673EC - loadword 0, gUnknown_8181189 - callstd 2 + msgbox gUnknown_8181189, 2 end SaffronCity_Duplicate_EventScript_1673F5:: @ 81673F5 - loadword 0, gUnknown_81811BF - callstd 2 + msgbox gUnknown_81811BF, 2 end SaffronCity_Duplicate_EventScript_1673FE:: @ 81673FE - loadword 0, gUnknown_8181225 - callstd 2 + msgbox gUnknown_8181225, 2 end SaffronCity_Duplicate_EventScript_167407:: @ 8167407 @@ -90,25 +77,21 @@ SaffronCity_Duplicate_EventScript_167407:: @ 8167407 faceplayer waitse playmoncry SPECIES_PIDGEOT, 0 - loadword 0, gUnknown_8181286 - callstd 4 + msgbox gUnknown_8181286 waitmoncry release end SaffronCity_Duplicate_EventScript_16741A:: @ 816741A - loadword 0, gUnknown_8181299 - callstd 2 + msgbox gUnknown_8181299, 2 end SaffronCity_Duplicate_EventScript_167423:: @ 8167423 - loadword 0, gUnknown_8181326 - callstd 3 + msgbox gUnknown_8181326, 3 end SaffronCity_Duplicate_EventScript_16742C:: @ 816742C - loadword 0, gUnknown_8181354 - callstd 3 + msgbox gUnknown_8181354, 3 end SaffronCity_Duplicate_EventScript_167435:: @ 8167435 @@ -116,37 +99,30 @@ SaffronCity_Duplicate_EventScript_167435:: @ 8167435 setvar VAR_0x8004, 7 setvar VAR_0x8005, 0 special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_8181362 - callstd 4 + msgbox gUnknown_8181362 releaseall end SaffronCity_Duplicate_EventScript_16744D:: @ 816744D - loadword 0, gUnknown_81813AA - callstd 3 + msgbox gUnknown_81813AA, 3 end SaffronCity_Duplicate_EventScript_167456:: @ 8167456 - loadword 0, gUnknown_8181452 - callstd 3 + msgbox gUnknown_8181452, 3 end SaffronCity_Duplicate_EventScript_16745F:: @ 816745F - loadword 0, gUnknown_81814B9 - callstd 3 + msgbox gUnknown_81814B9, 3 end SaffronCity_Duplicate_EventScript_167468:: @ 8167468 - loadword 0, gUnknown_81814D3 - callstd 3 + msgbox gUnknown_81814D3, 3 end SaffronCity_Duplicate_EventScript_167471:: @ 8167471 - loadword 0, gUnknown_81814E7 - callstd 3 + msgbox gUnknown_81814E7, 3 end SaffronCity_Duplicate_EventScript_16747A:: @ 816747A - loadword 0, gUnknown_8181519 - callstd 3 + msgbox gUnknown_8181519, 3 end diff --git a/data/maps/SaffronCity_Gym/scripts.inc b/data/maps/SaffronCity_Gym/scripts.inc index 343379bbd..206b2bbb8 100644 --- a/data/maps/SaffronCity_Gym/scripts.inc +++ b/data/maps/SaffronCity_Gym/scripts.inc @@ -8,8 +8,7 @@ SaffronCity_Gym_EventScript_16EDD8:: @ 816EDD8 trainerbattle 1, 420, 0, Text_19B53C, Text_19B602, EventScript_16EE0A checkflag FLAG_0x29A goto_if 0, EventScript_16EE3D - loadword 0, gUnknown_819B7F2 - callstd 4 + msgbox gUnknown_819B7F2 release end @@ -29,29 +28,25 @@ EventScript_16EE0A:: @ 816EE0A end EventScript_16EE3D:: @ 816EE3D - loadword 0, gUnknown_819B6FA - callstd 4 + msgbox gUnknown_819B6FA checkitemspace ITEM_TM04, 1 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16EE7E additem ITEM_TM04, 1 giveitemfanfaremsg gUnknown_819B7D3, ITEM_TM04 setflag FLAG_0x29A - loadword 0, gUnknown_819B685 - callstd 4 + msgbox gUnknown_819B685 release end EventScript_16EE7E:: @ 816EE7E - loadword 0, gUnknown_819B849 - callstd 4 + msgbox gUnknown_819B849 release end SaffronCity_Gym_EventScript_16EE88:: @ 816EE88 trainerbattle 0, 280, 0, Text_19B936, Text_19B957 - loadword 0, gUnknown_819B96D - callstd 6 + msgbox gUnknown_819B96D, 6 end SaffronCity_Gym_EventScript_16EE9F:: @ 816EE9F @@ -59,38 +54,32 @@ SaffronCity_Gym_EventScript_16EE9F:: @ 816EE9F setvar VAR_0x8004, 7 setvar VAR_0x8005, 5 special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_819BAB4 - callstd 6 + msgbox gUnknown_819BAB4, 6 end SaffronCity_Gym_EventScript_16EEC3:: @ 816EEC3 trainerbattle 0, 282, 0, Text_19BB49, Text_19BBA1 - loadword 0, gUnknown_819BBB3 - callstd 6 + msgbox gUnknown_819BBB3, 6 end SaffronCity_Gym_EventScript_16EEDA:: @ 816EEDA trainerbattle 0, 283, 0, Text_19BC57, Text_19BCBC - loadword 0, gUnknown_819BCC4 - callstd 6 + msgbox gUnknown_819BCC4, 6 end SaffronCity_Gym_EventScript_16EEF1:: @ 816EEF1 trainerbattle 0, 462, 0, Text_19B86A, Text_19B8A8 - loadword 0, gUnknown_819B8B9 - callstd 6 + msgbox gUnknown_819B8B9, 6 end SaffronCity_Gym_EventScript_16EF08:: @ 816EF08 trainerbattle 0, 463, 0, Text_19B998, Text_19B9EC - loadword 0, gUnknown_819B9F7 - callstd 6 + msgbox gUnknown_819B9F7, 6 end SaffronCity_Gym_EventScript_16EF1F:: @ 816EF1F trainerbattle 0, 464, 0, Text_19BAE8, Text_19BB0D - loadword 0, gUnknown_819BB1F - callstd 6 + msgbox gUnknown_819BB1F, 6 end SaffronCity_Gym_EventScript_16EF36:: @ 816EF36 @@ -98,14 +87,12 @@ SaffronCity_Gym_EventScript_16EF36:: @ 816EF36 faceplayer checkflag FLAG_0x4B5 goto_if 1, EventScript_16EF4B - loadword 0, gUnknown_819BCF6 - callstd 4 + msgbox gUnknown_819BCF6 release end EventScript_16EF4B:: @ 816EF4B - loadword 0, gUnknown_819BDBB - callstd 4 + msgbox gUnknown_819BDBB release end @@ -113,13 +100,11 @@ SaffronCity_Gym_EventScript_16EF55:: @ 816EF55 lockall checkflag FLAG_0x825 goto_if 1, EventScript_16EF69 - loadword 0, gUnknown_819BDFE - callstd 4 + msgbox gUnknown_819BDFE releaseall end EventScript_16EF69:: @ 816EF69 - loadword 0, gUnknown_819BE37 - callstd 4 + msgbox gUnknown_819BE37 releaseall end diff --git a/data/maps/SaffronCity_House1_1F/scripts.inc b/data/maps/SaffronCity_House1_1F/scripts.inc index a09d221ab..eb0bcd429 100644 --- a/data/maps/SaffronCity_House1_1F/scripts.inc +++ b/data/maps/SaffronCity_House1_1F/scripts.inc @@ -2,13 +2,11 @@ SaffronCity_House1_1F_MapScripts:: @ 816EB36 .byte 0 SaffronCity_House1_1F_EventScript_16EB37:: @ 816EB37 - loadword 0, gUnknown_819AB9B - callstd 2 + msgbox gUnknown_819AB9B, 2 end SaffronCity_House1_1F_EventScript_16EB40:: @ 816EB40 - loadword 0, gUnknown_819ABD7 - callstd 2 + msgbox gUnknown_819ABD7, 2 end SaffronCity_House1_1F_EventScript_16EB49:: @ 816EB49 @@ -16,8 +14,7 @@ SaffronCity_House1_1F_EventScript_16EB49:: @ 816EB49 faceplayer waitse playmoncry SPECIES_CHANSEY, 0 - loadword 0, gUnknown_819AC4B - callstd 4 + msgbox gUnknown_819AC4B waitmoncry release end diff --git a/data/maps/SaffronCity_House1_2F/scripts.inc b/data/maps/SaffronCity_House1_2F/scripts.inc index cdf94c6f9..11da09898 100644 --- a/data/maps/SaffronCity_House1_2F/scripts.inc +++ b/data/maps/SaffronCity_House1_2F/scripts.inc @@ -6,16 +6,14 @@ SaffronCity_House1_2F_EventScript_16EB5D:: @ 816EB5D faceplayer waitse playmoncry SPECIES_DODUO, 0 - loadword 0, gUnknown_819B030 - callstd 4 + msgbox gUnknown_819B030 waitmoncry release end SaffronCity_House1_2F_EventScript_16EB70:: @ 816EB70 lock - loadword 0, gUnknown_819B071 - callstd 4 + msgbox gUnknown_819B071 release end @@ -38,21 +36,17 @@ SaffronCity_House1_2F_EventScript_16EB7B:: @ 816EB7B end EventScript_16EBB7:: @ 816EBB7 - loadword 0, gUnknown_819AC60 - callstd 4 + msgbox gUnknown_819AC60 return EventScript_16EBC0:: @ 816EBC0 - loadword 0, gUnknown_819ACF1 - callstd 4 + msgbox gUnknown_819ACF1 return SaffronCity_House1_2F_EventScript_16EBC9:: @ 816EBC9 - loadword 0, gUnknown_819B0D0 - callstd 3 + msgbox gUnknown_819B0D0, 3 end SaffronCity_House1_2F_EventScript_16EBD2:: @ 816EBD2 - loadword 0, gUnknown_819B0A0 - callstd 3 + msgbox gUnknown_819B0A0, 3 end diff --git a/data/maps/SaffronCity_House2/scripts.inc b/data/maps/SaffronCity_House2/scripts.inc index d9a06746e..9cc63072c 100644 --- a/data/maps/SaffronCity_House2/scripts.inc +++ b/data/maps/SaffronCity_House2/scripts.inc @@ -2,13 +2,11 @@ SaffronCity_House2_MapScripts:: @ 816EF73 .byte 0 SaffronCity_House2_EventScript_16EF74:: @ 816EF74 - loadword 0, gUnknown_819BE74 - callstd 2 + msgbox gUnknown_819BE74, 2 end SaffronCity_House2_EventScript_16EF7D:: @ 816EF7D - loadword 0, gUnknown_819BED5 - callstd 2 + msgbox gUnknown_819BED5, 2 end SaffronCity_House2_EventScript_16EF86:: @ 816EF86 @@ -16,13 +14,11 @@ SaffronCity_House2_EventScript_16EF86:: @ 816EF86 faceplayer waitse playmoncry SPECIES_PIDGEY, 0 - loadword 0, gUnknown_819BEC3 - callstd 4 + msgbox gUnknown_819BEC3 waitmoncry release end SaffronCity_House2_EventScript_16EF99:: @ 816EF99 - loadword 0, gUnknown_819BF07 - callstd 3 + msgbox gUnknown_819BF07, 3 end diff --git a/data/maps/SaffronCity_House3/scripts.inc b/data/maps/SaffronCity_House3/scripts.inc index 8d45865f0..3186be2bb 100644 --- a/data/maps/SaffronCity_House3/scripts.inc +++ b/data/maps/SaffronCity_House3/scripts.inc @@ -6,27 +6,23 @@ SaffronCity_House3_EventScript_16F05F:: @ 816F05F faceplayer checkflag FLAG_0x245 goto_if 1, EventScript_16F0B5 - loadword 0, gUnknown_819C142 - callstd 4 + msgbox gUnknown_819C142 checkitemspace ITEM_TM29, 1 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16F0AB additem ITEM_TM29, 1 giveitemfanfaremsg gUnknown_819C16C, ITEM_TM29 - loadword 0, gUnknown_819C18F - callstd 4 + msgbox gUnknown_819C18F setflag FLAG_0x245 release end EventScript_16F0AB:: @ 816F0AB - loadword 0, gUnknown_819C1FC - callstd 4 + msgbox gUnknown_819C1FC release end EventScript_16F0B5:: @ 816F0B5 - loadword 0, gUnknown_819C18F - callstd 4 + msgbox gUnknown_819C18F release end diff --git a/data/maps/SaffronCity_Mart/scripts.inc b/data/maps/SaffronCity_Mart/scripts.inc index c01665708..cd657e11f 100644 --- a/data/maps/SaffronCity_Mart/scripts.inc +++ b/data/maps/SaffronCity_Mart/scripts.inc @@ -2,13 +2,11 @@ SaffronCity_Mart_MapScripts:: @ 816EFA2 .byte 0 SaffronCity_Mart_EventScript_16EFA3:: @ 816EFA3 - loadword 0, gUnknown_819BFF1 - callstd 2 + msgbox gUnknown_819BFF1, 2 end SaffronCity_Mart_EventScript_16EFAC:: @ 816EFAC - loadword 0, gUnknown_819BF8F - callstd 2 + msgbox gUnknown_819BF8F, 2 end SaffronCity_Mart_EventScript_16EFB5:: @ 816EFB5 @@ -20,8 +18,7 @@ SaffronCity_Mart_EventScript_16EFB5:: @ 816EFB5 message Text_1A6211 waitmessage pokemart Items_16EFDC - loadword 0, gUnknown_81A5190 - callstd 4 + msgbox gUnknown_81A5190 release end diff --git a/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc b/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc index f673b2c82..288b26693 100644 --- a/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc @@ -15,13 +15,11 @@ SaffronCity_PokemonCenter_1F_EventScript_16EFFB:: @ 816EFFB end SaffronCity_PokemonCenter_1F_EventScript_16F004:: @ 816F004 - loadword 0, gUnknown_819C058 - callstd 2 + msgbox gUnknown_819C058, 2 end SaffronCity_PokemonCenter_1F_EventScript_16F00D:: @ 816F00D - loadword 0, gUnknown_819C023 - callstd 2 + msgbox gUnknown_819C023, 2 end SaffronCity_PokemonCenter_1F_EventScript_16F016:: @ 816F016 @@ -29,13 +27,11 @@ SaffronCity_PokemonCenter_1F_EventScript_16F016:: @ 816F016 faceplayer compare_var_to_value VAR_0x4060, 1 goto_if 1, EventScript_16F02D - loadword 0, gUnknown_819C0B4 - callstd 4 + msgbox gUnknown_819C0B4 release end EventScript_16F02D:: @ 816F02D - loadword 0, gUnknown_819C102 - callstd 4 + msgbox gUnknown_819C102 release end diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc b/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc index 1c0809ce3..f4e2d2427 100644 --- a/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc +++ b/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc @@ -17,15 +17,13 @@ EventScript_16F0D4:: @ 816F0D4 waitmovement 0 applymovement 1, Movement_1A75DD waitmovement 0 - loadword 0, gUnknown_819C22B - callstd 4 + msgbox gUnknown_819C22B closemessage applymovement 1, Movement_16F124 waitmovement 0 applymovement 255, Movement_1A75EB waitmovement 0 - loadword 0, gUnknown_819C235 - callstd 4 + msgbox gUnknown_819C235 setvar VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 2 releaseall end @@ -176,8 +174,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F281:: @ 816F281 specialvar VAR_RESULT, sub_8113288 compare_var_to_value VAR_RESULT, 7 goto_if 1, EventScript_16F2E4 - loadword 0, gUnknown_819C420 - callstd 4 + msgbox gUnknown_819C420 release end @@ -185,26 +182,22 @@ EventScript_16F2C0:: @ 816F2C0 specialvar VAR_RESULT, sub_8113288 compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_16F2DA - loadword 0, gUnknown_819C390 - callstd 4 + msgbox gUnknown_819C390 release end EventScript_16F2DA:: @ 816F2DA - loadword 0, gUnknown_819C3BD - callstd 4 + msgbox gUnknown_819C3BD release end EventScript_16F2E4:: @ 816F2E4 - loadword 0, gUnknown_819C4A5 - callstd 4 + msgbox gUnknown_819C4A5 release end EventScript_16F2EE:: @ 816F2EE - loadword 0, gUnknown_819C55C - callstd 4 + msgbox gUnknown_819C55C release end @@ -221,8 +214,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F2F8:: @ 816F2F8 specialvar VAR_RESULT, sub_8113288 compare_var_to_value VAR_RESULT, 7 goto_if 1, EventScript_16F35B - loadword 0, gUnknown_819CBD3 - callstd 4 + msgbox gUnknown_819CBD3 release end @@ -230,26 +222,22 @@ EventScript_16F337:: @ 816F337 specialvar VAR_RESULT, sub_8113288 compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_16F351 - loadword 0, gUnknown_819CB32 - callstd 4 + msgbox gUnknown_819CB32 release end EventScript_16F351:: @ 816F351 - loadword 0, gUnknown_819CB62 - callstd 4 + msgbox gUnknown_819CB62 release end EventScript_16F35B:: @ 816F35B - loadword 0, gUnknown_819CC2B - callstd 4 + msgbox gUnknown_819CC2B release end EventScript_16F365:: @ 816F365 - loadword 0, gUnknown_819CCC2 - callstd 4 + msgbox gUnknown_819CCC2 release end @@ -266,8 +254,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F36F:: @ 816F36F specialvar VAR_RESULT, sub_8113288 compare_var_to_value VAR_RESULT, 7 goto_if 1, EventScript_16F3D2 - loadword 0, gUnknown_819C6BA - callstd 4 + msgbox gUnknown_819C6BA release end @@ -275,26 +262,22 @@ EventScript_16F3AE:: @ 816F3AE specialvar VAR_RESULT, sub_8113288 compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_16F3C8 - loadword 0, gUnknown_819C5A9 - callstd 4 + msgbox gUnknown_819C5A9 release end EventScript_16F3C8:: @ 816F3C8 - loadword 0, gUnknown_819C600 - callstd 4 + msgbox gUnknown_819C600 release end EventScript_16F3D2:: @ 816F3D2 - loadword 0, gUnknown_819C73A - callstd 4 + msgbox gUnknown_819C73A release end EventScript_16F3DC:: @ 816F3DC - loadword 0, gUnknown_819C7C8 - callstd 4 + msgbox gUnknown_819C7C8 release end @@ -311,8 +294,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F3E6:: @ 816F3E6 specialvar VAR_RESULT, sub_8113288 compare_var_to_value VAR_RESULT, 7 goto_if 1, EventScript_16F449 - loadword 0, gUnknown_819C986 - callstd 4 + msgbox gUnknown_819C986 release end @@ -320,26 +302,22 @@ EventScript_16F425:: @ 816F425 specialvar VAR_RESULT, sub_8113288 compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_16F43F - loadword 0, gUnknown_819C81E - callstd 4 + msgbox gUnknown_819C81E release end EventScript_16F43F:: @ 816F43F - loadword 0, gUnknown_819C8C1 - callstd 4 + msgbox gUnknown_819C8C1 release end EventScript_16F449:: @ 816F449 - loadword 0, gUnknown_819C9D5 - callstd 4 + msgbox gUnknown_819C9D5 release end EventScript_16F453:: @ 816F453 - loadword 0, gUnknown_819CA7C - callstd 4 + msgbox gUnknown_819CA7C release end @@ -354,8 +332,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F45D:: @ 816F45D specialvar VAR_RESULT, sub_8113288 compare_var_to_value VAR_RESULT, 7 goto_if 1, EventScript_16F4B5 - loadword 0, gUnknown_819D01F - callstd 4 + msgbox gUnknown_819D01F release end @@ -363,20 +340,17 @@ EventScript_16F491:: @ 816F491 specialvar VAR_RESULT, sub_8113288 compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_16F4AB - loadword 0, gUnknown_819CEDF - callstd 4 + msgbox gUnknown_819CEDF release end EventScript_16F4AB:: @ 816F4AB - loadword 0, gUnknown_819CF6D - callstd 4 + msgbox gUnknown_819CF6D release end EventScript_16F4B5:: @ 816F4B5 - loadword 0, gUnknown_819D075 - callstd 4 + msgbox gUnknown_819D075 release end @@ -391,8 +365,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F4BF:: @ 816F4BF specialvar VAR_RESULT, sub_8113288 compare_var_to_value VAR_RESULT, 7 goto_if 1, EventScript_16F517 - loadword 0, gUnknown_819CDDA - callstd 4 + msgbox gUnknown_819CDDA release end @@ -400,20 +373,17 @@ EventScript_16F4F3:: @ 816F4F3 specialvar VAR_RESULT, sub_8113288 compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_16F50D - loadword 0, gUnknown_819CCF3 - callstd 4 + msgbox gUnknown_819CCF3 release end EventScript_16F50D:: @ 816F50D - loadword 0, gUnknown_819CD4E - callstd 4 + msgbox gUnknown_819CD4E release end EventScript_16F517:: @ 816F517 - loadword 0, gUnknown_819CE3A - callstd 4 + msgbox gUnknown_819CE3A release end @@ -428,8 +398,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F521:: @ 816F521 specialvar VAR_RESULT, sub_8113288 compare_var_to_value VAR_RESULT, 7 goto_if 1, EventScript_16F579 - loadword 0, gUnknown_819D1AE - callstd 4 + msgbox gUnknown_819D1AE release end @@ -437,20 +406,17 @@ EventScript_16F555:: @ 816F555 specialvar VAR_RESULT, sub_8113288 compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_16F56F - loadword 0, gUnknown_819D0E3 - callstd 4 + msgbox gUnknown_819D0E3 release end EventScript_16F56F:: @ 816F56F - loadword 0, gUnknown_819D148 - callstd 4 + msgbox gUnknown_819D148 release end EventScript_16F579:: @ 816F579 - loadword 0, gUnknown_819D211 - callstd 4 + msgbox gUnknown_819D211 release end @@ -465,8 +431,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F583:: @ 816F583 specialvar VAR_RESULT, sub_8113288 compare_var_to_value VAR_RESULT, 7 goto_if 1, EventScript_16F5DB - loadword 0, gUnknown_819D3D2 - callstd 4 + msgbox gUnknown_819D3D2 release end @@ -474,19 +439,16 @@ EventScript_16F5B7:: @ 816F5B7 specialvar VAR_RESULT, sub_8113288 compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_16F5D1 - loadword 0, gUnknown_819D2B4 - callstd 4 + msgbox gUnknown_819D2B4 release end EventScript_16F5D1:: @ 816F5D1 - loadword 0, gUnknown_819D31F - callstd 4 + msgbox gUnknown_819D31F release end EventScript_16F5DB:: @ 816F5DB - loadword 0, gUnknown_819D477 - callstd 4 + msgbox gUnknown_819D477 release end diff --git a/data/maps/SeafoamIslands_B4F/scripts.inc b/data/maps/SeafoamIslands_B4F/scripts.inc index 6d459ef93..8c20a869d 100644 --- a/data/maps/SeafoamIslands_B4F/scripts.inc +++ b/data/maps/SeafoamIslands_B4F/scripts.inc @@ -208,11 +208,9 @@ EventScript_163222:: @ 8163222 end SeafoamIslands_B4F_EventScript_163223:: @ 8163223 - loadword 0, gUnknown_8179B36 - callstd 3 + msgbox gUnknown_8179B36, 3 end SeafoamIslands_B4F_EventScript_16322C:: @ 816322C - loadword 0, gUnknown_8179B65 - callstd 3 + msgbox gUnknown_8179B65, 3 end diff --git a/data/maps/SevenIsland/scripts.inc b/data/maps/SevenIsland/scripts.inc index 1c8b3c10b..92a3ceaf4 100644 --- a/data/maps/SevenIsland/scripts.inc +++ b/data/maps/SevenIsland/scripts.inc @@ -7,16 +7,13 @@ SevenIsland_MapScript1_167EB9:: @ 8167EB9 end SevenIsland_EventScript_167EBD:: @ 8167EBD - loadword 0, gUnknown_8183046 - callstd 3 + msgbox gUnknown_8183046, 3 end SevenIsland_EventScript_167EC6:: @ 8167EC6 - loadword 0, gUnknown_818306C - callstd 2 + msgbox gUnknown_818306C, 2 end SevenIsland_EventScript_167ECF:: @ 8167ECF - loadword 0, gUnknown_8183143 - callstd 2 + msgbox gUnknown_8183143, 2 end diff --git a/data/maps/SevenIsland_House_Room1/scripts.inc b/data/maps/SevenIsland_House_Room1/scripts.inc index 03f21af78..e29885a47 100644 --- a/data/maps/SevenIsland_House_Room1/scripts.inc +++ b/data/maps/SevenIsland_House_Room1/scripts.inc @@ -51,18 +51,15 @@ EventScript_1708E9:: @ 1708E9 end EventScript_170938:: @ 8170938 - loadword 0, gUnknown_81A088C - callstd 4 + msgbox gUnknown_81A088C return EventScript_170941:: @ 8170941 - loadword 0, gUnknown_81A0971 - callstd 4 + msgbox gUnknown_81A0971 return EventScript_17094A:: @ 817094A - loadword 0, gUnknown_81A0807 - callstd 4 + msgbox gUnknown_81A0807 return Movement_170953:: @ 8170953 @@ -82,29 +79,25 @@ SevenIsland_House_Room1_EventScript_170958:: @ 8170958 call_if 1, EventScript_17097D compare_var_to_value VAR_0x4001, 1 goto_if 1, EventScript_170987 - loadword 0, gUnknown_81A049B - callstd 4 + msgbox gUnknown_81A049B release end EventScript_17097D:: @ 817097D - loadword 0, gUnknown_81A049B - callstd 4 + msgbox gUnknown_81A049B release end EventScript_170987:: @ 8170987 special SavePlayerParty special sub_80CAAAC - loadword 0, gUnknown_81A0598 - callstd 5 + msgbox gUnknown_81A0598, 5 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_170A11 call EventScript_170A1E compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_170A11 - loadword 0, gUnknown_81A0788 - callstd 5 + msgbox gUnknown_81A0788, 5 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_170A11 special LoadPlayerParty @@ -113,8 +106,7 @@ EventScript_170987:: @ 8170987 goto_if 1, EventScript_170A11 special SavePlayerParty special sub_80A03D8 - loadword 0, gUnknown_81A07C4 - callstd 4 + msgbox gUnknown_81A07C4 closemessage compare_var_to_value VAR_FACING, 2 call_if 1, EventScript_170A2D @@ -129,14 +121,12 @@ EventScript_170987:: @ 8170987 EventScript_170A11:: @ 8170A11 special LoadPlayerParty - loadword 0, gUnknown_81A064E - callstd 4 + msgbox gUnknown_81A064E release end EventScript_170A1E:: @ 8170A1E - loadword 0, gUnknown_81A06AB - callstd 4 + msgbox gUnknown_81A06AB fadescreen 1 special sub_80A0334 waitstate @@ -189,6 +179,5 @@ Movement_170A72:: @ 8170A72 step_end SevenIsland_House_Room1_EventScript_170A75:: @ 8170A75 - loadword 0, gUnknown_81A0567 - callstd 3 + msgbox gUnknown_81A0567, 3 end diff --git a/data/maps/SevenIsland_House_Room2/scripts.inc b/data/maps/SevenIsland_House_Room2/scripts.inc index a0f3f6f20..db52423e4 100644 --- a/data/maps/SevenIsland_House_Room2/scripts.inc +++ b/data/maps/SevenIsland_House_Room2/scripts.inc @@ -42,8 +42,7 @@ EventScript_170A97:: @ 8170A97 EventScript_170AFE:: @ 8170AFE setvar VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 3 - loadword 0, gUnknown_81A07EC - callstd 4 + msgbox gUnknown_81A07EC return EventScript_170B0C:: @ 8170B0C diff --git a/data/maps/SevenIsland_Mart/scripts.inc b/data/maps/SevenIsland_Mart/scripts.inc index 6fcb10461..84510f03a 100644 --- a/data/maps/SevenIsland_Mart/scripts.inc +++ b/data/maps/SevenIsland_Mart/scripts.inc @@ -10,8 +10,7 @@ SevenIsland_Mart_EventScript_170B31:: @ 8170B31 message Text_1A6211 waitmessage pokemart Items_170B58 - loadword 0, gUnknown_81A5190 - callstd 4 + msgbox gUnknown_81A5190 release end @@ -31,16 +30,13 @@ Items_170B58:: @ 8170B58 end SevenIsland_Mart_EventScript_170B6E:: @ 8170B6E - loadword 0, gUnknown_81A0A4F - callstd 2 + msgbox gUnknown_81A0A4F, 2 end SevenIsland_Mart_EventScript_170B77:: @ 8170B77 - loadword 0, gUnknown_81A0ACC - callstd 2 + msgbox gUnknown_81A0ACC, 2 end SevenIsland_Mart_EventScript_170B80:: @ 8170B80 - loadword 0, gUnknown_81A0B09 - callstd 2 + msgbox gUnknown_81A0B09, 2 end diff --git a/data/maps/SevenIsland_PokemonCenter_1F/scripts.inc b/data/maps/SevenIsland_PokemonCenter_1F/scripts.inc index 3a9681d64..09e035316 100644 --- a/data/maps/SevenIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/SevenIsland_PokemonCenter_1F/scripts.inc @@ -15,16 +15,13 @@ SevenIsland_PokemonCenter_1F_EventScript_170B98:: @ 8170B98 end SevenIsland_PokemonCenter_1F_EventScript_170BA1:: @ 8170BA1 - loadword 0, gUnknown_81A0B98 - callstd 2 + msgbox gUnknown_81A0B98, 2 end SevenIsland_PokemonCenter_1F_EventScript_170BAA:: @ 8170BAA - loadword 0, gUnknown_81A0C1F - callstd 2 + msgbox gUnknown_81A0C1F, 2 end SevenIsland_PokemonCenter_1F_EventScript_170BB3:: @ 8170BB3 - loadword 0, gUnknown_81A0CA5 - callstd 2 + msgbox gUnknown_81A0CA5, 2 end diff --git a/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/scripts.inc b/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/scripts.inc index 1b0db15d2..0aa730a5d 100644 --- a/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/scripts.inc +++ b/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/scripts.inc @@ -137,8 +137,7 @@ EventScript_164F8A:: @ 8164F8A EventScript_164F8C:: @ 8164F8C call EventScript_164F51 - loadword 0, gUnknown_817D31B - callstd 4 + msgbox gUnknown_817D31B setflag FLAG_0x849 releaseall end diff --git a/data/maps/SevenIsland_SevaultCanyon/scripts.inc b/data/maps/SevenIsland_SevaultCanyon/scripts.inc index 68f380f54..f0122ffbf 100644 --- a/data/maps/SevenIsland_SevaultCanyon/scripts.inc +++ b/data/maps/SevenIsland_SevaultCanyon/scripts.inc @@ -2,6 +2,5 @@ SevenIsland_SevaultCanyon_MapScripts:: @ 8168BFD .byte 0 SevenIsland_SevaultCanyon_EventScript_168BFE:: @ 8168BFE - loadword 0, gUnknown_818CF2B - callstd 3 + msgbox gUnknown_818CF2B, 3 end diff --git a/data/maps/SevenIsland_SevaultCanyon_Entrance/scripts.inc b/data/maps/SevenIsland_SevaultCanyon_Entrance/scripts.inc index 1a1e6867b..7fcda3492 100644 --- a/data/maps/SevenIsland_SevaultCanyon_Entrance/scripts.inc +++ b/data/maps/SevenIsland_SevaultCanyon_Entrance/scripts.inc @@ -2,6 +2,5 @@ SevenIsland_SevaultCanyon_Entrance_MapScripts:: @ 8168BF3 .byte 0 SevenIsland_SevaultCanyon_Entrance_EventScript_168BF4:: @ 8168BF4 - loadword 0, gUnknown_818C82D - callstd 3 + msgbox gUnknown_818C82D, 3 end diff --git a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc index d51aeea0b..ee65196e9 100644 --- a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc +++ b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc @@ -12,15 +12,12 @@ SevenIsland_SevaultCanyon_House_EventScript_172183:: @ 8172183 delay 30 applymovement 1, Movement_1A75E1 waitmovement 0 - loadword 0, gUnknown_81A4D72 - callstd 4 + msgbox gUnknown_81A4D72 textcolor 3 - loadword 0, gUnknown_81A4DAF - callstd 5 + msgbox gUnknown_81A4DAF, 5 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_172225 - loadword 0, gUnknown_81A4DD8 - callstd 4 + msgbox gUnknown_81A4DD8 closemessage call EventScript_1A6675 compare_var_to_value VAR_FACING, 1 @@ -32,8 +29,7 @@ SevenIsland_SevaultCanyon_House_EventScript_172183:: @ 8172183 fadedefaultbgm delay 30 call EventScript_1A6C26 - loadword 0, gUnknown_81A4DF5 - callstd 4 + msgbox gUnknown_81A4DF5 setflag FLAG_0x002 release end @@ -46,15 +42,13 @@ EventScript_172206:: @ 8172206 EventScript_172211:: @ 8172211 applymovement 1, Movement_1A75E1 waitmovement 0 - loadword 0, gUnknown_81A4D72 - callstd 4 + msgbox gUnknown_81A4D72 release end EventScript_172225:: @ 8172225 textcolor 0 - loadword 0, gUnknown_81A4DC8 - callstd 4 + msgbox gUnknown_81A4DC8 release end @@ -82,8 +76,7 @@ SevenIsland_SevaultCanyon_House_EventScript_172242:: @ 8172242 faceplayer waitse playmoncry SPECIES_CHANSEY, 0 - loadword 0, gUnknown_81A4E26 - callstd 4 + msgbox gUnknown_81A4E26 waitmoncry release end diff --git a/data/maps/SevenIsland_TrainerTower/scripts.inc b/data/maps/SevenIsland_TrainerTower/scripts.inc index 003bc4ee9..74902ebc8 100644 --- a/data/maps/SevenIsland_TrainerTower/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower/scripts.inc @@ -7,11 +7,9 @@ SevenIsland_TrainerTower_MapScript1_168BDB:: @ 8168BDB end SevenIsland_TrainerTower_EventScript_168BE1:: @ 8168BE1 - loadword 0, gUnknown_818C338 - callstd 3 + msgbox gUnknown_818C338, 3 end SevenIsland_TrainerTower_EventScript_168BEA:: @ 8168BEA - loadword 0, gUnknown_818C370 - callstd 3 + msgbox gUnknown_818C370, 3 end diff --git a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc index d763b76a9..2cc5badbf 100644 --- a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc @@ -82,8 +82,7 @@ EventScript_164920:: @ 8164920 faceplayer applymovement 255, Movement_164AD4 textcolor 1 - loadword 0, gUnknown_817C937 - callstd 4 + msgbox gUnknown_817C937 goto EventScript_16494B EventScript_164938:: @ 8164938 @@ -91,8 +90,7 @@ EventScript_164938:: @ 8164938 faceplayer applymovement 255, Movement_164AD4 textcolor 1 - loadword 0, gUnknown_817C9C0 - callstd 4 + msgbox gUnknown_817C9C0 EventScript_16494B:: @ 816494B closemessage @@ -118,13 +116,11 @@ SevenIsland_TrainerTower_Lobby_EventScript_164966:: @ 8164966 special sub_815D9E8 compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_164988 - loadword 0, gUnknown_817C9A2 - callstd 4 + msgbox gUnknown_817C9A2 goto EventScript_164990 EventScript_164988:: @ 8164988 - loadword 0, gUnknown_817CE1F - callstd 4 + msgbox gUnknown_817CE1F EventScript_164990:: @ 8164990 release @@ -139,8 +135,7 @@ SevenIsland_TrainerTower_Lobby_EventScript_164992:: @ 8164992 message Text_1A6211 waitmessage pokemart Items_1649B8 - loadword 0, gUnknown_81A5190 - callstd 4 + msgbox gUnknown_81A5190 release end @@ -163,19 +158,16 @@ SevenIsland_TrainerTower_Lobby_EventScript_1649CE:: @ 81649CE lockall applymovement 255, Movement_164AD4 textcolor 1 - loadword 0, gUnknown_817C794 - callstd 4 + msgbox gUnknown_817C794 setvar VAR_0x8004, 17 special sub_815D9E8 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_164A00 - loadword 0, gUnknown_817C7D9 - callstd 4 + msgbox gUnknown_817C7D9 goto EventScript_164A08 EventScript_164A00:: @ 8164A00 - loadword 0, gUnknown_817C850 - callstd 4 + msgbox gUnknown_817C850 EventScript_164A08:: @ 8164A08 message Text_17C88D @@ -193,8 +185,7 @@ EventScript_164A08:: @ 8164A08 end EventScript_164A45:: @ 8164A45 - loadword 0, gUnknown_817CCC9 - callstd 4 + msgbox gUnknown_817CCC9 goto EventScript_164A08 end @@ -219,16 +210,14 @@ EventScript_164AA0:: @ 8164AA0 copyvar VAR_0x8005, VAR_RESULT setvar VAR_0x4082, 1 special sp000_heal_pokemon - loadword 0, gUnknown_817C8BF - callstd 4 + msgbox gUnknown_817C8BF setvar VAR_0x8004, 6 special sub_815D9E8 releaseall end EventScript_164ABF:: @ 8164ABF - loadword 0, gUnknown_817C91D - callstd 4 + msgbox gUnknown_817C91D closemessage applymovement 255, Movement_164AD6 waitmovement 0 @@ -253,11 +242,9 @@ SevenIsland_TrainerTower_Lobby_EventScript_164AD8:: @ 8164AD8 end SevenIsland_TrainerTower_Lobby_EventScript_164AE6:: @ 8164AE6 - loadword 0, gUnknown_817CE38 - callstd 2 + msgbox gUnknown_817CE38, 2 end SevenIsland_TrainerTower_Lobby_EventScript_164AEF:: @ 8164AEF - loadword 0, gUnknown_817CE9F - callstd 2 + msgbox gUnknown_817CE9F, 2 end diff --git a/data/maps/SilphCo_10F/scripts.inc b/data/maps/SilphCo_10F/scripts.inc index 36597983f..dea6b7af4 100644 --- a/data/maps/SilphCo_10F/scripts.inc +++ b/data/maps/SilphCo_10F/scripts.inc @@ -12,30 +12,25 @@ SilphCo_10F_EventScript_161D96:: @ 8161D96 faceplayer compare_var_to_value VAR_0x4060, 1 goto_if 4, EventScript_161DAD - loadword 0, gUnknown_8176DBA - callstd 4 + msgbox gUnknown_8176DBA release end EventScript_161DAD:: @ 8161DAD - loadword 0, gUnknown_8176DCE - callstd 4 + msgbox gUnknown_8176DCE release end SilphCo_10F_EventScript_161DB7:: @ 8161DB7 - loadword 0, gUnknown_8176DF8 - callstd 3 + msgbox gUnknown_8176DF8, 3 end SilphCo_10F_EventScript_161DC0:: @ 8161DC0 trainerbattle 0, 345, 0, Text_176D57, Text_176D73 - loadword 0, gUnknown_8176D86 - callstd 6 + msgbox gUnknown_8176D86, 6 end SilphCo_10F_EventScript_161DD7:: @ 8161DD7 trainerbattle 0, 389, 0, Text_176CED, Text_176D18 - loadword 0, gUnknown_8176D25 - callstd 6 + msgbox gUnknown_8176D25, 6 end diff --git a/data/maps/SilphCo_11F/scripts.inc b/data/maps/SilphCo_11F/scripts.inc index ac317f89c..67a8b2b48 100644 --- a/data/maps/SilphCo_11F/scripts.inc +++ b/data/maps/SilphCo_11F/scripts.inc @@ -22,37 +22,31 @@ SilphCo_11F_EventScript_161DFE:: @ 8161DFE goto_if 1, EventScript_161E6B additem ITEM_MASTER_BALL, 1 giveitemfanfaremsg gUnknown_8176FBD, ITEM_MASTER_BALL, 1, BGM_FRLG_ME_KEYITEM - loadword 0, gUnknown_8176FEB - callstd 4 + msgbox gUnknown_8176FEB setflag FLAG_0x250 release end EventScript_161E59:: @ 8161E59 - loadword 0, gUnknown_8176E12 - callstd 4 + msgbox gUnknown_8176E12 return EventScript_161E62:: @ 8161E62 - loadword 0, gUnknown_8176EE7 - callstd 4 + msgbox gUnknown_8176EE7 return EventScript_161E6B:: @ 8161E6B - loadword 0, gUnknown_817708E - callstd 4 + msgbox gUnknown_817708E release end EventScript_161E75:: @ 8161E75 - loadword 0, gUnknown_8176FEB - callstd 4 + msgbox gUnknown_8176FEB release end SilphCo_11F_EventScript_161E7F:: @ 8161E7F - loadword 0, gUnknown_81770A9 - callstd 2 + msgbox gUnknown_81770A9, 2 end SilphCo_11F_EventScript_161E88:: @ 8161E88 @@ -76,8 +70,7 @@ EventScript_161EA0:: @ 8161EA0 applymovement 3, Movement_1A75ED waitmovement 0 delay 25 - loadword 0, gUnknown_8177108 - callstd 4 + msgbox gUnknown_8177108 closemessage compare_var_to_value VAR_0x4001, 0 call_if 1, EventScript_161F00 @@ -85,8 +78,7 @@ EventScript_161EA0:: @ 8161EA0 call_if 1, EventScript_161F12 setvar VAR_LAST_TALKED, 3 trainerbattle 3, 349, 0, Text_1771AB - loadword 0, gUnknown_81771C2 - callstd 4 + msgbox gUnknown_81771C2 closemessage fadescreen 1 removeobject 3 @@ -134,23 +126,19 @@ Movement_161F27:: @ 8161F27 step_end EventScript_161F2E:: @ 8161F2E - loadword 0, gUnknown_817732B - callstd 3 + msgbox gUnknown_817732B, 3 end SilphCo_11F_EventScript_161F37:: @ 8161F37 - loadword 0, gUnknown_817734A - callstd 3 + msgbox gUnknown_817734A, 3 end SilphCo_11F_EventScript_161F40:: @ 8161F40 trainerbattle 0, 390, 0, Text_1772B8, Text_1772E7 - loadword 0, gUnknown_81772F9 - callstd 6 + msgbox gUnknown_81772F9, 6 end SilphCo_11F_EventScript_161F57:: @ 8161F57 trainerbattle 0, 391, 0, Text_17726A, Text_17728C - loadword 0, gUnknown_817729B - callstd 6 + msgbox gUnknown_817729B, 6 end diff --git a/data/maps/SilphCo_1F/scripts.inc b/data/maps/SilphCo_1F/scripts.inc index 42a0e0d00..ffb126808 100644 --- a/data/maps/SilphCo_1F/scripts.inc +++ b/data/maps/SilphCo_1F/scripts.inc @@ -7,11 +7,9 @@ SilphCo_1F_MapScript1_16162B:: @ 816162B end SilphCo_1F_EventScript_16162F:: @ 816162F - loadword 0, gUnknown_81754F7 - callstd 2 + msgbox gUnknown_81754F7, 2 end SilphCo_1F_EventScript_161638:: @ 8161638 - loadword 0, gUnknown_8175549 - callstd 3 + msgbox gUnknown_8175549, 3 end diff --git a/data/maps/SilphCo_2F/scripts.inc b/data/maps/SilphCo_2F/scripts.inc index 51a8c4572..309ee5d13 100644 --- a/data/maps/SilphCo_2F/scripts.inc +++ b/data/maps/SilphCo_2F/scripts.inc @@ -16,30 +16,25 @@ EventScript_16165F:: @ 816165F end SilphCo_2F_EventScript_161660:: @ 8161660 - loadword 0, gUnknown_8175894 - callstd 3 + msgbox gUnknown_8175894, 3 end SilphCo_2F_EventScript_161669:: @ 8161669 trainerbattle 0, 336, 0, Text_175562, Text_17557E - loadword 0, gUnknown_817559F - callstd 6 + msgbox gUnknown_817559F, 6 end SilphCo_2F_EventScript_161680:: @ 8161680 trainerbattle 0, 337, 0, Text_1755C6, Text_1755E5 - loadword 0, gUnknown_81755F2 - callstd 6 + msgbox gUnknown_81755F2, 6 end SilphCo_2F_EventScript_161697:: @ 8161697 trainerbattle 0, 373, 0, Text_17562D, Text_17564A - loadword 0, gUnknown_8175651 - callstd 6 + msgbox gUnknown_8175651, 6 end SilphCo_2F_EventScript_1616AE:: @ 81616AE trainerbattle 0, 374, 0, Text_1756AD, Text_1756D8 - loadword 0, gUnknown_81756E2 - callstd 6 + msgbox gUnknown_81756E2, 6 end diff --git a/data/maps/SilphCo_3F/scripts.inc b/data/maps/SilphCo_3F/scripts.inc index 77614744d..d4b7458ce 100644 --- a/data/maps/SilphCo_3F/scripts.inc +++ b/data/maps/SilphCo_3F/scripts.inc @@ -14,30 +14,25 @@ SilphCo_3F_EventScript_1616DE:: @ 81616DE faceplayer compare_var_to_value VAR_0x4060, 1 goto_if 4, EventScript_1616F5 - loadword 0, gUnknown_81758AD - callstd 4 + msgbox gUnknown_81758AD release end EventScript_1616F5:: @ 81616F5 - loadword 0, gUnknown_81758D3 - callstd 4 + msgbox gUnknown_81758D3 release end SilphCo_3F_EventScript_1616FF:: @ 81616FF - loadword 0, gUnknown_81759DC - callstd 3 + msgbox gUnknown_81759DC, 3 end SilphCo_3F_EventScript_161708:: @ 8161708 trainerbattle 0, 338, 0, Text_175948, Text_17597D - loadword 0, gUnknown_8175990 - callstd 6 + msgbox gUnknown_8175990, 6 end SilphCo_3F_EventScript_16171F:: @ 816171F trainerbattle 0, 375, 0, Text_1758F6, Text_175911 - loadword 0, gUnknown_817591C - callstd 6 + msgbox gUnknown_817591C, 6 end diff --git a/data/maps/SilphCo_4F/scripts.inc b/data/maps/SilphCo_4F/scripts.inc index 76b85f6a6..884f2e410 100644 --- a/data/maps/SilphCo_4F/scripts.inc +++ b/data/maps/SilphCo_4F/scripts.inc @@ -14,36 +14,30 @@ SilphCo_4F_EventScript_16174F:: @ 816174F faceplayer compare_var_to_value VAR_0x4060, 1 goto_if 4, EventScript_161766 - loadword 0, gUnknown_81759F5 - callstd 4 + msgbox gUnknown_81759F5 release end EventScript_161766:: @ 8161766 - loadword 0, gUnknown_8175A15 - callstd 4 + msgbox gUnknown_8175A15 release end SilphCo_4F_EventScript_161770:: @ 8161770 - loadword 0, gUnknown_8175B57 - callstd 3 + msgbox gUnknown_8175B57, 3 end SilphCo_4F_EventScript_161779:: @ 8161779 trainerbattle 0, 339, 0, Text_175A90, Text_175AB0 - loadword 0, gUnknown_8175AC8 - callstd 6 + msgbox gUnknown_8175AC8, 6 end SilphCo_4F_EventScript_161790:: @ 8161790 trainerbattle 0, 376, 0, Text_175A2F, Text_175A5B - loadword 0, gUnknown_8175A62 - callstd 6 + msgbox gUnknown_8175A62, 6 end SilphCo_4F_EventScript_1617A7:: @ 81617A7 trainerbattle 0, 377, 0, Text_175B19, Text_175B2B - loadword 0, gUnknown_8175B38 - callstd 6 + msgbox gUnknown_8175B38, 6 end diff --git a/data/maps/SilphCo_5F/scripts.inc b/data/maps/SilphCo_5F/scripts.inc index 485b44c31..e17c791b9 100644 --- a/data/maps/SilphCo_5F/scripts.inc +++ b/data/maps/SilphCo_5F/scripts.inc @@ -16,57 +16,47 @@ SilphCo_5F_EventScript_1617E0:: @ 81617E0 faceplayer compare_var_to_value VAR_0x4060, 1 goto_if 4, EventScript_1617F7 - loadword 0, gUnknown_8175B70 - callstd 4 + msgbox gUnknown_8175B70 release end EventScript_1617F7:: @ 81617F7 - loadword 0, gUnknown_8175BB3 - callstd 4 + msgbox gUnknown_8175BB3 release end SilphCo_5F_EventScript_161801:: @ 8161801 - loadword 0, gUnknown_8175D89 - callstd 3 + msgbox gUnknown_8175D89, 3 end SilphCo_5F_EventScript_16180A:: @ 816180A - loadword 0, gUnknown_8175DE0 - callstd 3 + msgbox gUnknown_8175DE0, 3 end SilphCo_5F_EventScript_161813:: @ 8161813 - loadword 0, gUnknown_8175E28 - callstd 3 + msgbox gUnknown_8175E28, 3 end SilphCo_5F_EventScript_16181C:: @ 816181C - loadword 0, gUnknown_8175E80 - callstd 3 + msgbox gUnknown_8175E80, 3 end SilphCo_5F_EventScript_161825:: @ 8161825 trainerbattle 0, 340, 0, Text_175C40, Text_175C6D - loadword 0, gUnknown_8175C7D - callstd 6 + msgbox gUnknown_8175C7D, 6 end SilphCo_5F_EventScript_16183C:: @ 816183C trainerbattle 0, 378, 0, Text_175BE5, Text_175C09 - loadword 0, gUnknown_8175C0F - callstd 6 + msgbox gUnknown_8175C0F, 6 end SilphCo_5F_EventScript_161853:: @ 8161853 trainerbattle 0, 379, 0, Text_175D28, Text_175D4B - loadword 0, gUnknown_8175D59 - callstd 6 + msgbox gUnknown_8175D59, 6 end SilphCo_5F_EventScript_16186A:: @ 816186A trainerbattle 0, 286, 0, Text_175CBD, Text_175CEB - loadword 0, gUnknown_8175CF9 - callstd 6 + msgbox gUnknown_8175CF9, 6 end diff --git a/data/maps/SilphCo_6F/scripts.inc b/data/maps/SilphCo_6F/scripts.inc index 2cb30c65c..caeedd216 100644 --- a/data/maps/SilphCo_6F/scripts.inc +++ b/data/maps/SilphCo_6F/scripts.inc @@ -12,14 +12,12 @@ SilphCo_6F_EventScript_161891:: @ 8161891 faceplayer compare_var_to_value VAR_0x4060, 1 goto_if 4, EventScript_1618A8 - loadword 0, gUnknown_817607E - callstd 4 + msgbox gUnknown_817607E release end EventScript_1618A8:: @ 81618A8 - loadword 0, gUnknown_81760B6 - callstd 4 + msgbox gUnknown_81760B6 release end @@ -28,14 +26,12 @@ SilphCo_6F_EventScript_1618B2:: @ 81618B2 faceplayer compare_var_to_value VAR_0x4060, 1 goto_if 4, EventScript_1618C9 - loadword 0, gUnknown_8175F24 - callstd 4 + msgbox gUnknown_8175F24 release end EventScript_1618C9:: @ 81618C9 - loadword 0, gUnknown_8175F51 - callstd 4 + msgbox gUnknown_8175F51 release end @@ -44,14 +40,12 @@ SilphCo_6F_EventScript_1618D3:: @ 81618D3 faceplayer compare_var_to_value VAR_0x4060, 1 goto_if 4, EventScript_1618EA - loadword 0, gUnknown_8175F70 - callstd 4 + msgbox gUnknown_8175F70 release end EventScript_1618EA:: @ 81618EA - loadword 0, gUnknown_8175F93 - callstd 4 + msgbox gUnknown_8175F93 release end @@ -60,14 +54,12 @@ SilphCo_6F_EventScript_1618F4:: @ 81618F4 faceplayer compare_var_to_value VAR_0x4060, 1 goto_if 4, EventScript_16190B - loadword 0, gUnknown_8175FAA - callstd 4 + msgbox gUnknown_8175FAA release end EventScript_16190B:: @ 816190B - loadword 0, gUnknown_8175FD3 - callstd 4 + msgbox gUnknown_8175FD3 release end @@ -76,36 +68,30 @@ SilphCo_6F_EventScript_161915:: @ 8161915 faceplayer compare_var_to_value VAR_0x4060, 1 goto_if 4, EventScript_16192C - loadword 0, gUnknown_8176012 - callstd 4 + msgbox gUnknown_8176012 release end EventScript_16192C:: @ 816192C - loadword 0, gUnknown_817604B - callstd 4 + msgbox gUnknown_817604B release end SilphCo_6F_EventScript_161936:: @ 8161936 - loadword 0, gUnknown_817624D - callstd 3 + msgbox gUnknown_817624D, 3 end SilphCo_6F_EventScript_16193F:: @ 816193F trainerbattle 0, 341, 0, Text_176136, Text_1761BD - loadword 0, gUnknown_81761C4 - callstd 6 + msgbox gUnknown_81761C4, 6 end SilphCo_6F_EventScript_161956:: @ 8161956 trainerbattle 0, 380, 0, Text_1760DE, Text_176104 - loadword 0, gUnknown_817610F - callstd 6 + msgbox gUnknown_817610F, 6 end SilphCo_6F_EventScript_16196D:: @ 816196D trainerbattle 0, 381, 0, Text_1761F1, Text_17620E - loadword 0, gUnknown_817621B - callstd 6 + msgbox gUnknown_817621B, 6 end diff --git a/data/maps/SilphCo_7F/scripts.inc b/data/maps/SilphCo_7F/scripts.inc index 318a80390..687cbab3d 100644 --- a/data/maps/SilphCo_7F/scripts.inc +++ b/data/maps/SilphCo_7F/scripts.inc @@ -45,14 +45,12 @@ EventScript_1619D4:: @ 81619D4 applymovement 255, Movement_1A75ED applymovement 1, Movement_1A75DD waitmovement 0 - loadword 0, gUnknown_8176710 - callstd 4 + msgbox gUnknown_8176710 compare_var_to_value VAR_0x4001, 0 call_if 1, EventScript_161A73 compare_var_to_value VAR_0x4001, 1 call_if 1, EventScript_161A7F - loadword 0, gUnknown_8176727 - callstd 4 + msgbox gUnknown_8176727 setvar VAR_LAST_TALKED, 1 compare_var_to_value VAR_STARTER_MON, 2 call_if 1, EventScript_161A80 @@ -60,8 +58,7 @@ EventScript_1619D4:: @ 81619D4 call_if 1, EventScript_161A8B compare_var_to_value VAR_STARTER_MON, 0 call_if 1, EventScript_161A96 - loadword 0, gUnknown_8176827 - callstd 4 + msgbox gUnknown_8176827 closemessage playbgm BGM_FRLG_RIVAL_POSTBATTLE, 0 compare_var_to_value VAR_0x4001, 0 @@ -135,8 +132,7 @@ SilphCo_7F_EventScript_161AC8:: @ 8161AC8 faceplayer checkflag FLAG_0x246 goto_if 1, EventScript_161B8D - loadword 0, gUnknown_8176266 - callstd 4 + msgbox gUnknown_8176266 setvar VAR_0x4001, 131 givemon SPECIES_LAPRAS, 25, ITEM_NONE, 0, 0, 0 compare_var_to_value VAR_RESULT, 0 @@ -155,8 +151,7 @@ EventScript_161B12:: @ 8161B12 waitmessage waitfanfare getspeciesname 0, SPECIES_LAPRAS - loadword 0, gUnknown_81A56A7 - callstd 5 + msgbox gUnknown_81A56A7, 5 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_161B7E call EventScript_1A8C27 @@ -173,8 +168,7 @@ EventScript_161B45:: @ 8161B45 waitmessage waitfanfare getspeciesname 0, SPECIES_LAPRAS - loadword 0, gUnknown_81A56A7 - callstd 5 + msgbox gUnknown_81A56A7, 5 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_161B73 call EventScript_1A8C33 @@ -192,15 +186,13 @@ EventScript_161B7D:: @ 8161B7D EventScript_161B7E:: @ 8161B7E textcolor 0 - loadword 0, gUnknown_8176305 - callstd 4 + msgbox gUnknown_8176305 setflag FLAG_0x246 release end EventScript_161B8D:: @ 8161B8D - loadword 0, gUnknown_81763DD - callstd 4 + msgbox gUnknown_81763DD release end @@ -209,14 +201,12 @@ SilphCo_7F_EventScript_161B97:: @ 8161B97 faceplayer compare_var_to_value VAR_0x4060, 1 goto_if 4, EventScript_161BAE - loadword 0, gUnknown_8176444 - callstd 4 + msgbox gUnknown_8176444 release end EventScript_161BAE:: @ 8161BAE - loadword 0, gUnknown_8176486 - callstd 4 + msgbox gUnknown_8176486 release end @@ -225,14 +215,12 @@ SilphCo_7F_EventScript_161BB8:: @ 8161BB8 faceplayer compare_var_to_value VAR_0x4060, 1 goto_if 4, EventScript_161BCF - loadword 0, gUnknown_81764C2 - callstd 4 + msgbox gUnknown_81764C2 release end EventScript_161BCF:: @ 8161BCF - loadword 0, gUnknown_8176501 - callstd 4 + msgbox gUnknown_8176501 release end @@ -241,42 +229,35 @@ SilphCo_7F_EventScript_161BD9:: @ 8161BD9 faceplayer compare_var_to_value VAR_0x4060, 1 goto_if 4, EventScript_161BF0 - loadword 0, gUnknown_8176532 - callstd 4 + msgbox gUnknown_8176532 release end EventScript_161BF0:: @ 8161BF0 - loadword 0, gUnknown_8176573 - callstd 4 + msgbox gUnknown_8176573 release end SilphCo_7F_EventScript_161BFA:: @ 8161BFA - loadword 0, gUnknown_8176954 - callstd 3 + msgbox gUnknown_8176954, 3 end SilphCo_7F_EventScript_161C03:: @ 8161C03 trainerbattle 0, 342, 0, Text_1765E2, Text_17660C - loadword 0, gUnknown_8176616 - callstd 6 + msgbox gUnknown_8176616, 6 end SilphCo_7F_EventScript_161C1A:: @ 8161C1A trainerbattle 0, 383, 0, Text_176643, Text_176669 - loadword 0, gUnknown_8176681 - callstd 6 + msgbox gUnknown_8176681, 6 end SilphCo_7F_EventScript_161C31:: @ 8161C31 trainerbattle 0, 384, 0, Text_1766B3, Text_1766D7 - loadword 0, gUnknown_81766E5 - callstd 6 + msgbox gUnknown_81766E5, 6 end SilphCo_7F_EventScript_161C48:: @ 8161C48 trainerbattle 0, 385, 0, Text_176586, Text_1765A5 - loadword 0, gUnknown_81765B1 - callstd 6 + msgbox gUnknown_81765B1, 6 end diff --git a/data/maps/SilphCo_8F/scripts.inc b/data/maps/SilphCo_8F/scripts.inc index 6cf5dff36..99112ee5e 100644 --- a/data/maps/SilphCo_8F/scripts.inc +++ b/data/maps/SilphCo_8F/scripts.inc @@ -12,36 +12,30 @@ SilphCo_8F_EventScript_161C6F:: @ 8161C6F faceplayer compare_var_to_value VAR_0x4060, 1 goto_if 4, EventScript_161C86 - loadword 0, gUnknown_817696D - callstd 4 + msgbox gUnknown_817696D release end EventScript_161C86:: @ 8161C86 - loadword 0, gUnknown_817698C - callstd 4 + msgbox gUnknown_817698C release end SilphCo_8F_EventScript_161C90:: @ 8161C90 - loadword 0, gUnknown_8176AB2 - callstd 3 + msgbox gUnknown_8176AB2, 3 end SilphCo_8F_EventScript_161C99:: @ 8161C99 trainerbattle 0, 343, 0, Text_1769FD, Text_176A19 - loadword 0, gUnknown_8176A26 - callstd 6 + msgbox gUnknown_8176A26, 6 end SilphCo_8F_EventScript_161CB0:: @ 8161CB0 trainerbattle 0, 382, 0, Text_1769A2, Text_1769BE - loadword 0, gUnknown_81769CF - callstd 6 + msgbox gUnknown_81769CF, 6 end SilphCo_8F_EventScript_161CC7:: @ 8161CC7 trainerbattle 0, 386, 0, Text_176A56, Text_176A7C - loadword 0, gUnknown_8176A90 - callstd 6 + msgbox gUnknown_8176A90, 6 end diff --git a/data/maps/SilphCo_9F/scripts.inc b/data/maps/SilphCo_9F/scripts.inc index a8d1dab60..530ae7c1a 100644 --- a/data/maps/SilphCo_9F/scripts.inc +++ b/data/maps/SilphCo_9F/scripts.inc @@ -18,40 +18,33 @@ SilphCo_9F_EventScript_161D09:: @ 8161D09 faceplayer compare_var_to_value VAR_0x4060, 1 goto_if 4, EventScript_161D2E - loadword 0, gUnknown_8176B54 - callstd 4 + msgbox gUnknown_8176B54 closemessage call EventScript_1A6C26 - loadword 0, gUnknown_8176B81 - callstd 4 + msgbox gUnknown_8176B81 release end EventScript_161D2E:: @ 8161D2E - loadword 0, gUnknown_8176B90 - callstd 4 + msgbox gUnknown_8176B90 release end SilphCo_9F_EventScript_161D38:: @ 8161D38 - loadword 0, gUnknown_8176CD4 - callstd 3 + msgbox gUnknown_8176CD4, 3 end SilphCo_9F_EventScript_161D41:: @ 8161D41 trainerbattle 0, 344, 0, Text_176BFB, Text_176C2B - loadword 0, gUnknown_8176C3C - callstd 6 + msgbox gUnknown_8176C3C, 6 end SilphCo_9F_EventScript_161D58:: @ 8161D58 trainerbattle 0, 387, 0, Text_176BA3, Text_176BC8 - loadword 0, gUnknown_8176BD0 - callstd 6 + msgbox gUnknown_8176BD0, 6 end SilphCo_9F_EventScript_161D6F:: @ 8161D6F trainerbattle 0, 388, 0, Text_176C7A, Text_176CA0 - loadword 0, gUnknown_8176CB8 - callstd 6 + msgbox gUnknown_8176CB8, 6 end diff --git a/data/maps/SixIsland/scripts.inc b/data/maps/SixIsland/scripts.inc index 3b3392afb..3a36d37b1 100644 --- a/data/maps/SixIsland/scripts.inc +++ b/data/maps/SixIsland/scripts.inc @@ -7,16 +7,13 @@ SixIsland_MapScript1_167EDE:: @ 8167EDE end SixIsland_EventScript_167EE2:: @ 8167EE2 - loadword 0, gUnknown_81831EF - callstd 2 + msgbox gUnknown_81831EF, 2 end SixIsland_EventScript_167EEB:: @ 8167EEB - loadword 0, gUnknown_8183255 - callstd 2 + msgbox gUnknown_8183255, 2 end SixIsland_EventScript_167EF4:: @ 8167EF4 - loadword 0, gUnknown_81831C6 - callstd 3 + msgbox gUnknown_81831C6, 3 end diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc b/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc index c0094f3c2..ce372cae9 100644 --- a/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc +++ b/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc @@ -39,8 +39,7 @@ SixIsland_DottedHole_SapphireRoom_EventScript_1641B5:: @ 81641B5 compare_var_to_value VAR_FACING, 3 call_if 1, EventScript_164346 textcolor 0 - loadword 0, gUnknown_817BD97 - callstd 4 + msgbox gUnknown_817BD97 closemessage compare_var_to_value VAR_FACING, 2 call_if 1, EventScript_164351 @@ -59,8 +58,7 @@ SixIsland_DottedHole_SapphireRoom_EventScript_1641B5:: @ 81641B5 call_if 1, EventScript_164304 compare_var_to_value VAR_FACING, 3 call_if 1, EventScript_164304 - loadword 0, gUnknown_817BDD4 - callstd 4 + msgbox gUnknown_817BDD4 closemessage compare_var_to_value VAR_FACING, 2 call_if 1, EventScript_1643A5 diff --git a/data/maps/SixIsland_GreenPath/scripts.inc b/data/maps/SixIsland_GreenPath/scripts.inc index 3506af2f6..c2822ccca 100644 --- a/data/maps/SixIsland_GreenPath/scripts.inc +++ b/data/maps/SixIsland_GreenPath/scripts.inc @@ -2,11 +2,9 @@ SixIsland_GreenPath_MapScripts:: @ 8168B2D .byte 0 SixIsland_GreenPath_EventScript_168B2E:: @ 8168B2E - loadword 0, gUnknown_818B84D - callstd 3 + msgbox gUnknown_818B84D, 3 end SixIsland_GreenPath_EventScript_168B37:: @ 8168B37 - loadword 0, gUnknown_818B86B - callstd 3 + msgbox gUnknown_818B86B, 3 end diff --git a/data/maps/SixIsland_House/scripts.inc b/data/maps/SixIsland_House/scripts.inc index 46d554c10..bc6753abb 100644 --- a/data/maps/SixIsland_House/scripts.inc +++ b/data/maps/SixIsland_House/scripts.inc @@ -2,6 +2,5 @@ SixIsland_House_MapScripts:: @ 8171E5B .byte 0 SixIsland_House_EventScript_171E5C:: @ 8171E5C - loadword 0, gUnknown_81A412E - callstd 2 + msgbox gUnknown_81A412E, 2 end diff --git a/data/maps/SixIsland_Mart/scripts.inc b/data/maps/SixIsland_Mart/scripts.inc index 6fca2c7a6..711dfc9ef 100644 --- a/data/maps/SixIsland_Mart/scripts.inc +++ b/data/maps/SixIsland_Mart/scripts.inc @@ -10,8 +10,7 @@ SixIsland_Mart_EventScript_171E66:: @ 8171E66 message Text_1A6211 waitmessage pokemart Items_171E8C - loadword 0, gUnknown_81A5190 - callstd 4 + msgbox gUnknown_81A5190 release end @@ -30,6 +29,5 @@ Items_171E8C:: @ 8171E8C end SixIsland_Mart_EventScript_171EA0:: @ 8171EA0 - loadword 0, gUnknown_81A4271 - callstd 2 + msgbox gUnknown_81A4271, 2 end diff --git a/data/maps/SixIsland_OutcastIsland/scripts.inc b/data/maps/SixIsland_OutcastIsland/scripts.inc index 4c2eeb67e..9682f1cbe 100644 --- a/data/maps/SixIsland_OutcastIsland/scripts.inc +++ b/data/maps/SixIsland_OutcastIsland/scripts.inc @@ -3,6 +3,5 @@ SixIsland_OutcastIsland_MapScripts:: @ 8168B15 SixIsland_OutcastIsland_EventScript_168B16:: @ 8168B16 trainerbattle 0, 540, 0, Text_18B35A, Text_18B3C2 - loadword 0, gUnknown_818B3C8 - callstd 6 + msgbox gUnknown_818B3C8, 6 end diff --git a/data/maps/SixIsland_PatternBush/scripts.inc b/data/maps/SixIsland_PatternBush/scripts.inc index f7debc297..0575b4855 100644 --- a/data/maps/SixIsland_PatternBush/scripts.inc +++ b/data/maps/SixIsland_PatternBush/scripts.inc @@ -21,72 +21,60 @@ EventScript_164587:: @ 8164587 SixIsland_PatternBush_EventScript_164590:: @ 8164590 trainerbattle 0, 609, 0, Text_17BF3A, Text_17BF66 - loadword 0, gUnknown_817BF97 - callstd 6 + msgbox gUnknown_817BF97, 6 end SixIsland_PatternBush_EventScript_1645A7:: @ 81645A7 trainerbattle 0, 610, 0, Text_17BFEB, Text_17C028 - loadword 0, gUnknown_817C056 - callstd 6 + msgbox gUnknown_817C056, 6 end SixIsland_PatternBush_EventScript_1645BE:: @ 81645BE trainerbattle 0, 611, 0, Text_17C0BE, Text_17C0F2 - loadword 0, gUnknown_817C113 - callstd 6 + msgbox gUnknown_817C113, 6 end SixIsland_PatternBush_EventScript_1645D5:: @ 81645D5 trainerbattle 0, 612, 0, Text_17C155, Text_17C196 - loadword 0, gUnknown_817C1D0 - callstd 6 + msgbox gUnknown_817C1D0, 6 end SixIsland_PatternBush_EventScript_1645EC:: @ 81645EC trainerbattle 0, 613, 0, Text_17C246, Text_17C275 - loadword 0, gUnknown_817C2A4 - callstd 6 + msgbox gUnknown_817C2A4, 6 end SixIsland_PatternBush_EventScript_164603:: @ 8164603 trainerbattle 0, 614, 0, Text_17C2D9, Text_17C30D - loadword 0, gUnknown_817C31C - callstd 6 + msgbox gUnknown_817C31C, 6 end SixIsland_PatternBush_EventScript_16461A:: @ 816461A trainerbattle 0, 615, 0, Text_17C373, Text_17C3A5 - loadword 0, gUnknown_817C3CE - callstd 6 + msgbox gUnknown_817C3CE, 6 end SixIsland_PatternBush_EventScript_164631:: @ 8164631 trainerbattle 0, 616, 0, Text_17C42B, Text_17C458 - loadword 0, gUnknown_817C490 - callstd 6 + msgbox gUnknown_817C490, 6 end SixIsland_PatternBush_EventScript_164648:: @ 8164648 trainerbattle 0, 617, 0, Text_17C4FE, Text_17C552 - loadword 0, gUnknown_817C590 - callstd 6 + msgbox gUnknown_817C590, 6 end SixIsland_PatternBush_EventScript_16465F:: @ 816465F trainerbattle 0, 618, 0, Text_17C5DB, Text_17C609 - loadword 0, gUnknown_817C615 - callstd 6 + msgbox gUnknown_817C615, 6 end SixIsland_PatternBush_EventScript_164676:: @ 8164676 trainerbattle 0, 619, 0, Text_17C63E, Text_17C660 - loadword 0, gUnknown_817C68E - callstd 6 + msgbox gUnknown_817C68E, 6 end SixIsland_PatternBush_EventScript_16468D:: @ 816468D trainerbattle 0, 620, 0, Text_17C6C9, Text_17C6FB - loadword 0, gUnknown_817C728 - callstd 6 + msgbox gUnknown_817C728, 6 end diff --git a/data/maps/SixIsland_PokemonCenter_1F/scripts.inc b/data/maps/SixIsland_PokemonCenter_1F/scripts.inc index c9335f853..ea59d73bc 100644 --- a/data/maps/SixIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/SixIsland_PokemonCenter_1F/scripts.inc @@ -31,8 +31,7 @@ EventScript_171D97:: @ 8171D97 delay 25 applymovement 2, Movement_171DF9 waitmovement 0 - loadword 0, gUnknown_81A3F30 - callstd 4 + msgbox gUnknown_81A3F30 closemessage applymovement 255, Movement_171E02 applymovement 2, Movement_171DFE @@ -72,11 +71,9 @@ SixIsland_PokemonCenter_1F_EventScript_171E05:: @ 8171E05 end SixIsland_PokemonCenter_1F_EventScript_171E0E:: @ 8171E0E - loadword 0, gUnknown_81A3E02 - callstd 2 + msgbox gUnknown_81A3E02, 2 end SixIsland_PokemonCenter_1F_EventScript_171E17:: @ 8171E17 - loadword 0, gUnknown_81A3E87 - callstd 2 + msgbox gUnknown_81A3E87, 2 end diff --git a/data/maps/SixIsland_RuinValley/scripts.inc b/data/maps/SixIsland_RuinValley/scripts.inc index 22a482782..35bcd8f14 100644 --- a/data/maps/SixIsland_RuinValley/scripts.inc +++ b/data/maps/SixIsland_RuinValley/scripts.inc @@ -13,12 +13,10 @@ EventScript_168B63:: @ 8168B63 SixIsland_RuinValley_EventScript_168B6D:: @ 8168B6D lock - loadword 0, gUnknown_818BD47 - callstd 4 + msgbox gUnknown_818BD47 applymovement 1, Movement_1A75E1 waitmovement 0 - loadword 0, gUnknown_818BD7A - callstd 4 + msgbox gUnknown_818BD7A applymovement 1, Movement_1A75E5 waitmovement 0 release @@ -28,25 +26,21 @@ SixIsland_RuinValley_EventScript_168B94:: @ 8168B94 lockall checkflag FLAG_0x2E3 goto_if 1, EventScript_168BC1 - loadword 0, gUnknown_818BDC0 - callstd 5 + msgbox gUnknown_818BDC0, 5 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_168BCB - loadword 0, gUnknown_818BE11 - callstd 4 + msgbox gUnknown_818BE11 braillemessage gUnknown_81A929B waitbuttonpress releaseall end EventScript_168BC1:: @ 8168BC1 - loadword 0, gUnknown_818BE4B - callstd 4 + msgbox gUnknown_818BE4B releaseall end EventScript_168BCB:: @ 8168BCB - loadword 0, gUnknown_818BDF9 - callstd 4 + msgbox gUnknown_818BDF9 releaseall end diff --git a/data/maps/SixIsland_WaterPath/scripts.inc b/data/maps/SixIsland_WaterPath/scripts.inc index dba612142..2b410f112 100644 --- a/data/maps/SixIsland_WaterPath/scripts.inc +++ b/data/maps/SixIsland_WaterPath/scripts.inc @@ -2,11 +2,9 @@ SixIsland_WaterPath_MapScripts:: @ 8168B40 .byte 0 SixIsland_WaterPath_EventScript_168B41:: @ 8168B41 - loadword 0, gUnknown_818BD0C - callstd 3 + msgbox gUnknown_818BD0C, 3 end SixIsland_WaterPath_EventScript_168B4A:: @ 8168B4A - loadword 0, gUnknown_818BD27 - callstd 3 + msgbox gUnknown_818BD27, 3 end diff --git a/data/maps/SixIsland_WaterPath_House1/scripts.inc b/data/maps/SixIsland_WaterPath_House1/scripts.inc index ea48e90da..cba2d131a 100644 --- a/data/maps/SixIsland_WaterPath_House1/scripts.inc +++ b/data/maps/SixIsland_WaterPath_House1/scripts.inc @@ -13,8 +13,7 @@ SixIsland_WaterPath_House1_EventScript_17206D:: @ 817206D compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_1720E5 special sub_80A0918 - loadword 0, gUnknown_81A4A3F - callstd 4 + msgbox gUnknown_81A4A3F special sub_80BF8FC waitstate copyvar VAR_RESULT, VAR_0x8004 @@ -33,8 +32,7 @@ SixIsland_WaterPath_House1_EventScript_17206D:: @ 817206D end EventScript_1720E5:: @ 81720E5 - loadword 0, gUnknown_81A49E9 - callstd 4 + msgbox gUnknown_81A49E9 release end @@ -43,44 +41,38 @@ EventScript_1720EF:: @ 81720EF end EventScript_1720F1:: @ 81720F1 - loadword 0, gUnknown_81A4BEF - callstd 4 + msgbox gUnknown_81A4BEF release end EventScript_1720FB:: @ 81720FB checkflag FLAG_0x2D9 goto_if 0, EventScript_172121 - loadword 0, gUnknown_81A4B7A - callstd 4 + msgbox gUnknown_81A4B7A release end EventScript_17210E:: @ 817210E checkflag FLAG_0x2D9 goto_if 0, EventScript_172121 - loadword 0, gUnknown_81A4B39 - callstd 4 + msgbox gUnknown_81A4B39 release end EventScript_172121:: @ 8172121 setflag FLAG_0x2D9 - loadword 0, gUnknown_81A4A88 - callstd 4 + msgbox gUnknown_81A4A88 setorcopyvar VAR_0x8000, 8 setorcopyvar VAR_0x8001, 1 callstd 0 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_17214D - loadword 0, gUnknown_81A4AD9 - callstd 4 + msgbox gUnknown_81A4AD9 release end EventScript_17214D:: @ 817214D - loadword 0, gUnknown_81A4C47 - callstd 4 + msgbox gUnknown_81A4C47 release end @@ -88,14 +80,12 @@ SixIsland_WaterPath_House1_EventScript_172157:: @ 8172157 lockall checkflag FLAG_0x2D9 goto_if 1, EventScript_17216B - loadword 0, gUnknown_81A4CB9 - callstd 4 + msgbox gUnknown_81A4CB9 releaseall end EventScript_17216B:: @ 817216B special sub_80A0918 - loadword 0, gUnknown_81A4C6E - callstd 4 + msgbox gUnknown_81A4C6E releaseall end diff --git a/data/maps/SixIsland_WaterPath_House2/scripts.inc b/data/maps/SixIsland_WaterPath_House2/scripts.inc index 476f222a0..ed5e24c7f 100644 --- a/data/maps/SixIsland_WaterPath_House2/scripts.inc +++ b/data/maps/SixIsland_WaterPath_House2/scripts.inc @@ -2,6 +2,5 @@ SixIsland_WaterPath_House2_MapScripts:: @ 8172178 .byte 0 SixIsland_WaterPath_House2_EventScript_172179:: @ 8172179 - loadword 0, gUnknown_81A4D0D - callstd 2 + msgbox gUnknown_81A4D0D, 2 end diff --git a/data/maps/ThreeIsland/scripts.inc b/data/maps/ThreeIsland/scripts.inc index 94101ba9b..9e24c556d 100644 --- a/data/maps/ThreeIsland/scripts.inc +++ b/data/maps/ThreeIsland/scripts.inc @@ -40,30 +40,26 @@ ThreeIsland_EventScript_1677E5:: @ 81677E5 EventScript_167806:: @ 8167806 applymovement 1, Movement_1A75E1 waitmovement 0 - loadword 0, gUnknown_81827F1 - callstd 4 + msgbox gUnknown_81827F1 release end EventScript_16781A:: @ 816781A applymovement 1, Movement_1A75E1 waitmovement 0 - loadword 0, gUnknown_818275A - callstd 4 + msgbox gUnknown_818275A checkitemspace ITEM_FULL_RESTORE, 1 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_167865 giveitemfanfaremsg gUnknown_81827BE, ITEM_FULL_RESTORE additem ITEM_FULL_RESTORE, 1 setflag FLAG_0x2FC - loadword 0, gUnknown_81827F1 - callstd 4 + msgbox gUnknown_81827F1 release end EventScript_167865:: @ 8167865 - loadword 0, gUnknown_81827DB - callstd 4 + msgbox gUnknown_81827DB release end @@ -74,8 +70,7 @@ EventScript_16786F:: @ 816786F call_if 1, EventScript_167947 applymovement 1, Movement_167A1B waitmovement 0 - loadword 0, gUnknown_81820C0 - callstd 4 + msgbox gUnknown_81820C0 compare_var_to_value VAR_0x4001, 0 call_if 1, EventScript_167952 compare_var_to_value VAR_0x4001, 1 @@ -84,8 +79,7 @@ EventScript_16786F:: @ 816786F call_if 1, EventScript_16795D applymovement 5, Movement_167A19 waitmovement 0 - loadword 0, gUnknown_8182125 - callstd 4 + msgbox gUnknown_8182125 compare_var_to_value VAR_0x4001, 0 call_if 1, EventScript_167931 compare_var_to_value VAR_0x4001, 1 @@ -94,8 +88,7 @@ EventScript_16786F:: @ 816786F call_if 1, EventScript_167973 applymovement 2, Movement_167A1B waitmovement 0 - loadword 0, gUnknown_81821A9 - callstd 4 + msgbox gUnknown_81821A9 compare_var_to_value VAR_0x4001, 0 call_if 1, EventScript_167952 compare_var_to_value VAR_0x4001, 1 @@ -104,8 +97,7 @@ EventScript_16786F:: @ 816786F call_if 1, EventScript_16795D applymovement 4, Movement_167A19 waitmovement 0 - loadword 0, gUnknown_81821DC - callstd 4 + msgbox gUnknown_81821DC return EventScript_167931:: @ 8167931 @@ -154,8 +146,7 @@ ThreeIsland_EventScript_167989:: @ 8167989 EventScript_1679A1:: @ 81679A1 applymovement 2, Movement_1A75E1 waitmovement 0 - loadword 0, gUnknown_8182823 - callstd 4 + msgbox gUnknown_8182823 release end @@ -164,24 +155,19 @@ ThreeIsland_EventScript_1679B5:: @ 81679B5 textcolor 0 applymovement 1, Movement_167A1B waitmovement 0 - loadword 0, gUnknown_81821F1 - callstd 4 + msgbox gUnknown_81821F1 applymovement 3, Movement_167A19 waitmovement 0 - loadword 0, gUnknown_818221F - callstd 4 + msgbox gUnknown_818221F applymovement 1, Movement_167A1B waitmovement 0 - loadword 0, gUnknown_8182275 - callstd 4 + msgbox gUnknown_8182275 applymovement 3, Movement_167A19 waitmovement 0 - loadword 0, gUnknown_81822FB - callstd 4 + msgbox gUnknown_81822FB applymovement 1, Movement_167A1B waitmovement 0 - loadword 0, gUnknown_81823C7 - callstd 4 + msgbox gUnknown_81823C7 setvar VAR_0x407B, 3 releaseall end @@ -236,36 +222,30 @@ EventScript_167A59:: @ 8167A59 applymovement 5, Movement_167C57 waitmovement 0 playbgm BGM_FRLG_BOY_EYE, 0 - loadword 0, gUnknown_81823ED - callstd 5 + msgbox gUnknown_81823ED, 5 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_167C35 - loadword 0, gUnknown_818247D - callstd 4 + msgbox gUnknown_818247D setvar VAR_LAST_TALKED, 5 trainerbattle 3, 527, 0, Text_1824B7 applymovement 5, Movement_167C5C waitmovement 0 - loadword 0, gUnknown_81824CF - callstd 4 + msgbox gUnknown_81824CF closemessage applymovement 7, Movement_167C57 waitmovement 0 playbgm BGM_FRLG_BOY_EYE, 0 - loadword 0, gUnknown_81824EF - callstd 4 + msgbox gUnknown_81824EF setvar VAR_LAST_TALKED, 7 trainerbattle 3, 528, 0, Text_182521 applymovement 7, Movement_167C5C waitmovement 0 - loadword 0, gUnknown_8182536 - callstd 4 + msgbox gUnknown_8182536 closemessage applymovement 4, Movement_167C57 waitmovement 0 playbgm BGM_FRLG_BOY_EYE, 0 - loadword 0, gUnknown_8182582 - callstd 4 + msgbox gUnknown_8182582 setvar VAR_LAST_TALKED, 4 trainerbattle 3, 529, 0, Text_1825D4 applymovement 4, Movement_1A75E7 @@ -273,8 +253,7 @@ EventScript_167A59:: @ 8167A59 applymovement 6, Movement_1A75ED applymovement 8, Movement_1A75ED waitmovement 0 - loadword 0, gUnknown_81825E2 - callstd 4 + msgbox gUnknown_81825E2 closemessage delay 45 compare_var_to_value VAR_0x4001, 0 @@ -288,12 +267,10 @@ EventScript_167A59:: @ 8167A59 compare_var_to_value VAR_0x4001, 4 call_if 1, EventScript_167C1C playbgm BGM_FRLG_BOY_EYE, 0 - loadword 0, gUnknown_8182623 - callstd 4 + msgbox gUnknown_8182623 setvar VAR_LAST_TALKED, 3 trainerbattle 3, 742, 0, Text_1826B7 - loadword 0, gUnknown_818271D - callstd 4 + msgbox gUnknown_818271D closemessage fadescreen 1 removeobject 3 @@ -342,8 +319,7 @@ EventScript_167C1C:: @ 8167C1C return EventScript_167C35:: @ 8167C35 - loadword 0, gUnknown_8182453 - callstd 4 + msgbox gUnknown_8182453 closemessage applymovement 255, Movement_167C55 waitmovement 0 @@ -408,13 +384,11 @@ Movement_167C71:: @ 8167C71 step_end ThreeIsland_EventScript_167C77:: @ 8167C77 - loadword 0, gUnknown_81828EB - callstd 2 + msgbox gUnknown_81828EB, 2 end ThreeIsland_EventScript_167C80:: @ 8167C80 - loadword 0, gUnknown_818298A - callstd 2 + msgbox gUnknown_818298A, 2 end ThreeIsland_EventScript_167C89:: @ 8167C89 @@ -422,18 +396,15 @@ ThreeIsland_EventScript_167C89:: @ 8167C89 faceplayer waitse playmoncry SPECIES_DODUO, 0 - loadword 0, gUnknown_81829F4 - callstd 4 + msgbox gUnknown_81829F4 waitmoncry release end ThreeIsland_EventScript_167C9C:: @ 8167C9C - loadword 0, gUnknown_8182061 - callstd 3 + msgbox gUnknown_8182061, 3 end ThreeIsland_EventScript_167CA5:: @ 8167CA5 - loadword 0, gUnknown_818208B - callstd 2 + msgbox gUnknown_818208B, 2 end diff --git a/data/maps/ThreeIsland_BerryForest/scripts.inc b/data/maps/ThreeIsland_BerryForest/scripts.inc index d7413edd5..14dc9cf1a 100644 --- a/data/maps/ThreeIsland_BerryForest/scripts.inc +++ b/data/maps/ThreeIsland_BerryForest/scripts.inc @@ -10,15 +10,13 @@ ThreeIsland_BerryForest_MapScript1_163C77:: @ 8163C77 ThreeIsland_BerryForest_EventScript_163C83:: @ 8163C83 lock faceplayer - loadword 0, gUnknown_817ADD6 - callstd 4 + msgbox gUnknown_817ADD6 playse SE_PIN applymovement 1, Movement_1A75DB waitmovement 0 applymovement 1, Movement_163D22 waitmovement 0 - loadword 0, gUnknown_817AE8E - callstd 4 + msgbox gUnknown_817AE8E special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 goto_if 1, EventScript_1A7AE0 @@ -30,16 +28,14 @@ ThreeIsland_BerryForest_EventScript_163C83:: @ 8163C83 special sub_8112364 applymovement 1, Movement_1A75E1 waitmovement 0 - loadword 0, gUnknown_817AEE1 - callstd 4 + msgbox gUnknown_817AEE1 setorcopyvar VAR_0x8000, 147 setorcopyvar VAR_0x8001, 1 callstd 0 compare_var_to_value VAR_RESULT, 0 call_if 1, EventScript_163D19 special sub_80CA6DC - loadword 0, gUnknown_817AF3B - callstd 4 + msgbox gUnknown_817AF3B closemessage setflag FLAG_0x2A3 setflag FLAG_0x07A @@ -51,8 +47,7 @@ ThreeIsland_BerryForest_EventScript_163C83:: @ 8163C83 end EventScript_163D19:: @ 8163D19 - loadword 0, gUnknown_817AF9F - callstd 4 + msgbox gUnknown_817AF9F return Movement_163D22:: @ 8163D22 @@ -64,11 +59,9 @@ Movement_163D22:: @ 8163D22 step_end ThreeIsland_BerryForest_EventScript_163D28:: @ 8163D28 - loadword 0, gUnknown_817AFD6 - callstd 3 + msgbox gUnknown_817AFD6, 3 end ThreeIsland_BerryForest_EventScript_163D31:: @ 8163D31 - loadword 0, gUnknown_817B029 - callstd 3 + msgbox gUnknown_817B029, 3 end diff --git a/data/maps/ThreeIsland_BondBridge/scripts.inc b/data/maps/ThreeIsland_BondBridge/scripts.inc index 4988c3d34..008e748d7 100644 --- a/data/maps/ThreeIsland_BondBridge/scripts.inc +++ b/data/maps/ThreeIsland_BondBridge/scripts.inc @@ -2,11 +2,9 @@ ThreeIsland_BondBridge_MapScripts:: @ 8168776 .byte 0 ThreeIsland_BondBridge_EventScript_168777:: @ 8168777 - loadword 0, gUnknown_818A210 - callstd 3 + msgbox gUnknown_818A210, 3 end ThreeIsland_BondBridge_EventScript_168780:: @ 8168780 - loadword 0, gUnknown_818A223 - callstd 3 + msgbox gUnknown_818A223, 3 end diff --git a/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc b/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc index 60a51f456..75b9813fd 100644 --- a/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc +++ b/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc @@ -29,8 +29,7 @@ ThreeIsland_DunsparceTunnel_EventScript_164D60:: @ 8164D60 specialvar VAR_RESULT, sub_806E25C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_164D90 - loadword 0, gUnknown_817D13B - callstd 4 + msgbox gUnknown_817D13B closemessage applymovement 1, Movement_1A75E5 waitmovement 0 @@ -38,8 +37,7 @@ ThreeIsland_DunsparceTunnel_EventScript_164D60:: @ 8164D60 end EventScript_164D90:: @ 8164D90 - loadword 0, gUnknown_817D1C9 - callstd 4 + msgbox gUnknown_817D1C9 setorcopyvar VAR_0x8000, 110 setorcopyvar VAR_0x8001, 1 callstd 0 @@ -50,13 +48,11 @@ EventScript_164D90:: @ 8164D90 end EventScript_164DB8:: @ 8164DB8 - loadword 0, gUnknown_817D2DC - callstd 4 + msgbox gUnknown_817D2DC release end EventScript_164DC2:: @ 8164DC2 - loadword 0, gUnknown_817D28C - callstd 4 + msgbox gUnknown_817D28C release end diff --git a/data/maps/ThreeIsland_House1/scripts.inc b/data/maps/ThreeIsland_House1/scripts.inc index bdcc5d6fc..29952137a 100644 --- a/data/maps/ThreeIsland_House1/scripts.inc +++ b/data/maps/ThreeIsland_House1/scripts.inc @@ -5,12 +5,10 @@ ThreeIsland_House1_EventScript_17181A:: @ 817181A lock faceplayer special sub_80CA6DC - loadword 0, gUnknown_81A2F3E - callstd 4 + msgbox gUnknown_81A2F3E release end ThreeIsland_House1_EventScript_171829:: @ 8171829 - loadword 0, gUnknown_81A2F92 - callstd 3 + msgbox gUnknown_81A2F92, 3 end diff --git a/data/maps/ThreeIsland_House2/scripts.inc b/data/maps/ThreeIsland_House2/scripts.inc index 449f6056b..297f6e3dc 100644 --- a/data/maps/ThreeIsland_House2/scripts.inc +++ b/data/maps/ThreeIsland_House2/scripts.inc @@ -7,12 +7,10 @@ ThreeIsland_House2_EventScript_1718E0:: @ 81718E0 setvar VAR_0x8004, 7 setvar VAR_0x8005, 1 special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_81A32CA - callstd 4 + msgbox gUnknown_81A32CA release end ThreeIsland_House2_EventScript_1718F9:: @ 81718F9 - loadword 0, gUnknown_81A3245 - callstd 2 + msgbox gUnknown_81A3245, 2 end diff --git a/data/maps/ThreeIsland_House3/scripts.inc b/data/maps/ThreeIsland_House3/scripts.inc index 5ba4483c3..7ad4b0da0 100644 --- a/data/maps/ThreeIsland_House3/scripts.inc +++ b/data/maps/ThreeIsland_House3/scripts.inc @@ -2,6 +2,5 @@ ThreeIsland_House3_MapScripts:: @ 8171902 .byte 0 ThreeIsland_House3_EventScript_171903:: @ 8171903 - loadword 0, gUnknown_81A3379 - callstd 2 + msgbox gUnknown_81A3379, 2 end diff --git a/data/maps/ThreeIsland_House4/scripts.inc b/data/maps/ThreeIsland_House4/scripts.inc index 8a8abe57a..6bb77d0bc 100644 --- a/data/maps/ThreeIsland_House4/scripts.inc +++ b/data/maps/ThreeIsland_House4/scripts.inc @@ -2,11 +2,9 @@ ThreeIsland_House4_MapScripts:: @ 817190C .byte 0 ThreeIsland_House4_EventScript_17190D:: @ 817190D - loadword 0, gUnknown_81A33DB - callstd 2 + msgbox gUnknown_81A33DB, 2 end ThreeIsland_House4_EventScript_171916:: @ 8171916 - loadword 0, gUnknown_81A342F - callstd 2 + msgbox gUnknown_81A342F, 2 end diff --git a/data/maps/ThreeIsland_House5/scripts.inc b/data/maps/ThreeIsland_House5/scripts.inc index e1d7dd473..962869abd 100644 --- a/data/maps/ThreeIsland_House5/scripts.inc +++ b/data/maps/ThreeIsland_House5/scripts.inc @@ -6,13 +6,11 @@ ThreeIsland_House5_EventScript_171920:: @ 8171920 faceplayer checkflag FLAG_0x2A3 goto_if 1, EventScript_171935 - loadword 0, gUnknown_81A3469 - callstd 4 + msgbox gUnknown_81A3469 release end EventScript_171935:: @ 8171935 - loadword 0, gUnknown_81A34DB - callstd 4 + msgbox gUnknown_81A34DB release end diff --git a/data/maps/ThreeIsland_Mart/scripts.inc b/data/maps/ThreeIsland_Mart/scripts.inc index 5ce07d975..70ecca8ef 100644 --- a/data/maps/ThreeIsland_Mart/scripts.inc +++ b/data/maps/ThreeIsland_Mart/scripts.inc @@ -10,8 +10,7 @@ ThreeIsland_Mart_EventScript_17188D:: @ 817188D message Text_1A6211 waitmessage pokemart Items_1718B4 - loadword 0, gUnknown_81A5190 - callstd 4 + msgbox gUnknown_81A5190 release end @@ -28,16 +27,13 @@ Items_1718B4:: @ 81718B4 end ThreeIsland_Mart_EventScript_1718C4:: @ 81718C4 - loadword 0, gUnknown_81A3114 - callstd 2 + msgbox gUnknown_81A3114, 2 end ThreeIsland_Mart_EventScript_1718CD:: @ 81718CD - loadword 0, gUnknown_81A315C - callstd 2 + msgbox gUnknown_81A315C, 2 end ThreeIsland_Mart_EventScript_1718D6:: @ 81718D6 - loadword 0, gUnknown_81A31F0 - callstd 2 + msgbox gUnknown_81A31F0, 2 end diff --git a/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc b/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc index d2002af7c..8041d604d 100644 --- a/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc @@ -15,16 +15,13 @@ ThreeIsland_PokemonCenter_1F_EventScript_171841:: @ 8171841 end ThreeIsland_PokemonCenter_1F_EventScript_17184A:: @ 817184A - loadword 0, gUnknown_81A303B - callstd 2 + msgbox gUnknown_81A303B, 2 end ThreeIsland_PokemonCenter_1F_EventScript_171853:: @ 8171853 - loadword 0, gUnknown_81A30A3 - callstd 2 + msgbox gUnknown_81A30A3, 2 end ThreeIsland_PokemonCenter_1F_EventScript_17185C:: @ 817185C - loadword 0, gUnknown_81A2FB5 - callstd 2 + msgbox gUnknown_81A2FB5, 2 end diff --git a/data/maps/ThreeIsland_Port/scripts.inc b/data/maps/ThreeIsland_Port/scripts.inc index ae3ed949e..8fb20ce26 100644 --- a/data/maps/ThreeIsland_Port/scripts.inc +++ b/data/maps/ThreeIsland_Port/scripts.inc @@ -14,31 +14,26 @@ ThreeIsland_Port_EventScript_168796:: @ 8168796 goto_if 4, EventScript_1687B8 compare_var_to_value VAR_0x407B, 4 goto_if 4, EventScript_1687C2 - loadword 0, gUnknown_818A307 - callstd 4 + msgbox gUnknown_818A307 release end EventScript_1687B8:: @ 81687B8 - loadword 0, gUnknown_818A38B - callstd 4 + msgbox gUnknown_818A38B release end EventScript_1687C2:: @ 81687C2 - loadword 0, gUnknown_818A339 - callstd 4 + msgbox gUnknown_818A339 release end ThreeIsland_Port_EventScript_1687CC:: @ 81687CC - loadword 0, gUnknown_818A261 - callstd 2 + msgbox gUnknown_818A261, 2 end ThreeIsland_Port_EventScript_1687D5:: @ 81687D5 lock - loadword 0, gUnknown_818A2D8 - callstd 4 + msgbox gUnknown_818A2D8 release end diff --git a/data/maps/TwoIsland/scripts.inc b/data/maps/TwoIsland/scripts.inc index 6feebdb9c..39df8625b 100644 --- a/data/maps/TwoIsland/scripts.inc +++ b/data/maps/TwoIsland/scripts.inc @@ -132,8 +132,7 @@ EventScript_1676A6:: @ 81676A6 EventScript_1676D3:: @ 81676D3 pokemart Items_1676E4 - loadword 0, gUnknown_81A5190 - callstd 4 + msgbox gUnknown_81A5190 release end @@ -147,8 +146,7 @@ Items_1676E4:: @ 81676E4 EventScript_1676EC:: @ 81676EC pokemart Items_1676FC - loadword 0, gUnknown_81A5190 - callstd 4 + msgbox gUnknown_81A5190 release end @@ -164,8 +162,7 @@ Items_1676FC:: @ 81676FC EventScript_167708:: @ 8167708 pokemart Items_167718 - loadword 0, gUnknown_81A5190 - callstd 4 + msgbox gUnknown_81A5190 release end @@ -183,8 +180,7 @@ Items_167718:: @ 8167718 EventScript_167728:: @ 8167728 pokemart Items_167738 - loadword 0, gUnknown_81A5190 - callstd 4 + msgbox gUnknown_81A5190 release end @@ -203,13 +199,11 @@ Items_167738:: @ 8167738 end TwoIsland_EventScript_16774C:: @ 816774C - loadword 0, gUnknown_8181D2F - callstd 2 + msgbox gUnknown_8181D2F, 2 end TwoIsland_EventScript_167755:: @ 8167755 - loadword 0, gUnknown_8181DCA - callstd 2 + msgbox gUnknown_8181DCA, 2 end TwoIsland_EventScript_16775E:: @ 816775E @@ -218,37 +212,30 @@ TwoIsland_EventScript_16775E:: @ 816775E setvar VAR_0x8004, 10 setvar VAR_0x8005, 4 special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_8181E47 - callstd 4 + msgbox gUnknown_8181E47 release end TwoIsland_EventScript_167777:: @ 8167777 - loadword 0, gUnknown_8181F28 - callstd 2 + msgbox gUnknown_8181F28, 2 end TwoIsland_EventScript_167780:: @ 8167780 - loadword 0, gUnknown_8181F5D - callstd 2 + msgbox gUnknown_8181F5D, 2 end TwoIsland_EventScript_167789:: @ 8167789 - loadword 0, gUnknown_8181FCE - callstd 2 + msgbox gUnknown_8181FCE, 2 end TwoIsland_EventScript_167792:: @ 8167792 - loadword 0, gUnknown_8181A88 - callstd 3 + msgbox gUnknown_8181A88, 3 end TwoIsland_EventScript_16779B:: @ 816779B - loadword 0, gUnknown_8181AA7 - callstd 3 + msgbox gUnknown_8181AA7, 3 end TwoIsland_EventScript_1677A4:: @ 81677A4 - loadword 0, gUnknown_8181AC8 - callstd 3 + msgbox gUnknown_8181AC8, 3 end diff --git a/data/maps/TwoIsland_House/scripts.inc b/data/maps/TwoIsland_House/scripts.inc index 9fc9b96c8..b99b3e099 100644 --- a/data/maps/TwoIsland_House/scripts.inc +++ b/data/maps/TwoIsland_House/scripts.inc @@ -13,8 +13,7 @@ TwoIsland_House_EventScript_171619:: @ 8171619 clearflag FLAG_0x004 checkflag FLAG_0x001 goto_if 1, EventScript_17164F - loadword 0, gUnknown_81A2B88 - callstd 4 + msgbox gUnknown_81A2B88 setflag FLAG_0x001 goto EventScript_17164F end @@ -46,16 +45,14 @@ EventScript_171696:: @ 8171696 end EventScript_1716A5:: @ 81716A5 - loadword 0, gUnknown_81A2C63 - callstd 5 + msgbox gUnknown_81A2C63, 5 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_17179E goto EventScript_1716BE end EventScript_1716BE:: @ 81716BE - loadword 0, gUnknown_81A2CC3 - callstd 4 + msgbox gUnknown_81A2CC3 special sub_80BF93C waitstate compare_var_to_value VAR_0x8004, 6 @@ -69,8 +66,7 @@ EventScript_1716BE:: @ 81716BE end EventScript_1716F4:: @ 81716F4 - loadword 0, gUnknown_81A2CE1 - callstd 4 + msgbox gUnknown_81A2CE1 special sub_80E4634 waitstate compare_var_to_value VAR_0x8004, 0 @@ -86,8 +82,7 @@ EventScript_1716F4:: @ 81716F4 EventScript_171727:: @ 8171727 removeitem ITEM_BIG_MUSHROOM, 1 textcolor 3 - loadword 0, gUnknown_81A2DB3 - callstd 4 + msgbox gUnknown_81A2DB3 call EventScript_1A6675 goto EventScript_17179E end @@ -95,8 +90,7 @@ EventScript_171727:: @ 8171727 EventScript_171741:: @ 8171741 removeitem ITEM_TINY_MUSHROOM, 2 textcolor 3 - loadword 0, gUnknown_81A2D85 - callstd 4 + msgbox gUnknown_81A2D85 call EventScript_1A6675 goto EventScript_17179E end @@ -113,20 +107,17 @@ EventScript_17175B:: @ 817175B end EventScript_171782:: @ 8171782 - loadword 0, gUnknown_81A2CFC - callstd 4 + msgbox gUnknown_81A2CFC goto EventScript_1716BE end EventScript_171790:: @ 8171790 - loadword 0, gUnknown_81A2E20 - callstd 4 + msgbox gUnknown_81A2E20 goto EventScript_1716BE end EventScript_17179E:: @ 817179E - loadword 0, gUnknown_81A2DE0 - callstd 4 + msgbox gUnknown_81A2DE0 release end diff --git a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc index bb39c4f80..9bde64331 100644 --- a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc +++ b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc @@ -35,12 +35,10 @@ TwoIsland_JoyfulGameCorner_MapScript3_17141B:: @ 817141B EventScript_171435:: @ 8171435 lockall textcolor 0 - loadword 0, gUnknown_81A28B2 - callstd 4 + msgbox gUnknown_81A28B2 textcolor 1 special sub_80CA6DC - loadword 0, gUnknown_81A2931 - callstd 4 + msgbox gUnknown_81A2931 closemessage applymovement 3, Movement_1A75ED waitmovement 0 @@ -53,8 +51,7 @@ EventScript_17145F:: @ 817145F textcolor 0 applymovement 1, Movement_171520 waitmovement 0 - loadword 0, gUnknown_81A2408 - callstd 4 + msgbox gUnknown_81A2408 closemessage applymovement 1, Movement_1A75ED waitmovement 0 @@ -67,8 +64,7 @@ EventScript_17145F:: @ 817145F waitmovement 0 applymovement 255, Movement_1A75EB waitmovement 0 - loadword 0, gUnknown_81A2465 - callstd 4 + msgbox gUnknown_81A2465 closemessage playse SE_DOOR waitse @@ -78,14 +74,11 @@ EventScript_17145F:: @ 817145F addobject 2 applymovement 2, Movement_17152F waitmovement 0 - loadword 0, gUnknown_81A259A - callstd 4 + msgbox gUnknown_81A259A applymovement 2, Movement_1A75EB waitmovement 0 - loadword 0, gUnknown_81A2658 - callstd 4 - loadword 0, gUnknown_81A26D5 - callstd 4 + msgbox gUnknown_81A2658 + msgbox gUnknown_81A26D5 closemessage applymovement 2, Movement_1A75ED waitmovement 0 @@ -93,8 +86,7 @@ EventScript_17145F:: @ 817145F removeobject 2 fadedefaultbgm delay 60 - loadword 0, gUnknown_81A270C - callstd 4 + msgbox gUnknown_81A270C clearflag FLAG_0x091 setvar VAR_0x407B, 2 setvar VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 1 @@ -137,14 +129,12 @@ TwoIsland_JoyfulGameCorner_EventScript_171535:: @ 8171535 goto_if 1, EventScript_1BC060 checkflag FLAG_0x2A3 goto_if 1, EventScript_171555 - loadword 0, gUnknown_81A285C - callstd 4 + msgbox gUnknown_81A285C release end EventScript_171555:: @ 8171555 - loadword 0, gUnknown_81A288A - callstd 4 + msgbox gUnknown_81A288A release end @@ -157,16 +147,14 @@ TwoIsland_JoyfulGameCorner_EventScript_17155F:: @ 817155F goto_if 1, EventScript_1715F5 compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 3 goto_if 1, EventScript_17158A - loadword 0, gUnknown_81A2743 - callstd 4 + msgbox gUnknown_81A2743 release end EventScript_17158A:: @ 817158A checkflag FLAG_0x2FE goto_if 1, EventScript_1715C4 - loadword 0, gUnknown_81A296A - callstd 4 + msgbox gUnknown_81A296A setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 2 textcolor 3 playfanfare MUS_ME_WAZA @@ -175,8 +163,7 @@ EventScript_17158A:: @ 817158A waitfanfare call EventScript_1A6675 removeitem ITEM_METEORITE, 1 - loadword 0, gUnknown_81A2A24 - callstd 4 + msgbox gUnknown_81A2A24 goto EventScript_1715C4 end @@ -191,22 +178,19 @@ EventScript_1715C4:: @ 81715C4 end EventScript_1715F5:: @ 81715F5 - loadword 0, gUnknown_81A2AF5 - callstd 4 + msgbox gUnknown_81A2AF5 release end EventScript_1715FF:: @ 81715FF setflag FLAG_0x2FE - loadword 0, gUnknown_81A2ACA - callstd 4 + msgbox gUnknown_81A2ACA release end TwoIsland_JoyfulGameCorner_EventScript_17160C:: @ 817160C lock faceplayer - loadword 0, gUnknown_81A2B53 - callstd 4 + msgbox gUnknown_81A2B53 release end diff --git a/data/maps/TwoIsland_PokemonCenter_1F/scripts.inc b/data/maps/TwoIsland_PokemonCenter_1F/scripts.inc index 21687e467..e9578c088 100644 --- a/data/maps/TwoIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/TwoIsland_PokemonCenter_1F/scripts.inc @@ -15,11 +15,9 @@ TwoIsland_PokemonCenter_1F_EventScript_1717C3:: @ 81717C3 end TwoIsland_PokemonCenter_1F_EventScript_1717CC:: @ 81717CC - loadword 0, gUnknown_81A2E59 - callstd 2 + msgbox gUnknown_81A2E59, 2 end TwoIsland_PokemonCenter_1F_EventScript_1717D5:: @ 81717D5 - loadword 0, gUnknown_81A2EBE - callstd 2 + msgbox gUnknown_81A2EBE, 2 end diff --git a/data/maps/UndergroundPath_EastEntrance/scripts.inc b/data/maps/UndergroundPath_EastEntrance/scripts.inc index 185d2244a..31ee9f7af 100644 --- a/data/maps/UndergroundPath_EastEntrance/scripts.inc +++ b/data/maps/UndergroundPath_EastEntrance/scripts.inc @@ -2,6 +2,5 @@ UndergroundPath_EastEntrance_MapScripts:: @ 8160EDD .byte 0 UndergroundPath_EastEntrance_EventScript_160EDE:: @ 8160EDE - loadword 0, gUnknown_81745D9 - callstd 2 + msgbox gUnknown_81745D9, 2 end diff --git a/data/maps/UndergroundPath_NorthEntrance/scripts.inc b/data/maps/UndergroundPath_NorthEntrance/scripts.inc index 8236d08fd..e3941e22b 100644 --- a/data/maps/UndergroundPath_NorthEntrance/scripts.inc +++ b/data/maps/UndergroundPath_NorthEntrance/scripts.inc @@ -8,8 +8,7 @@ UndergroundPath_NorthEntrance_EventScript_160E39:: @ 8160E39 call EventScript_1A8CAD checkflag FLAG_0x24B goto_if 1, EventScript_160EAB - loadword 0, gUnknown_81A5AD6 - callstd 5 + msgbox gUnknown_81A5AD6, 5 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_160E93 call EventScript_1A8CBD @@ -19,27 +18,23 @@ UndergroundPath_NorthEntrance_EventScript_160E39:: @ 8160E39 compare_var_to_var VAR_RESULT, VAR_0x8009 goto_if 5, EventScript_160E9D call EventScript_1A8CD9 - loadword 0, gUnknown_81A5B4A - callstd 4 + msgbox gUnknown_81A5B4A setflag FLAG_0x24B release end EventScript_160E93:: @ 8160E93 - loadword 0, gUnknown_81A5B08 - callstd 4 + msgbox gUnknown_81A5B08 release end EventScript_160E9D:: @ 8160E9D getspeciesname 0, 32777 - loadword 0, gUnknown_81A5B18 - callstd 4 + msgbox gUnknown_81A5B18 release end EventScript_160EAB:: @ 8160EAB - loadword 0, gUnknown_81A5B60 - callstd 4 + msgbox gUnknown_81A5B60 release end diff --git a/data/maps/UndergroundPath_SouthEntrance/scripts.inc b/data/maps/UndergroundPath_SouthEntrance/scripts.inc index 141ea84ed..1e3d2e6e3 100644 --- a/data/maps/UndergroundPath_SouthEntrance/scripts.inc +++ b/data/maps/UndergroundPath_SouthEntrance/scripts.inc @@ -2,6 +2,5 @@ UndergroundPath_SouthEntrance_MapScripts:: @ 8160EBF .byte 0 UndergroundPath_SouthEntrance_EventScript_160EC0:: @ 8160EC0 - loadword 0, gUnknown_8174559 - callstd 2 + msgbox gUnknown_8174559, 2 end diff --git a/data/maps/UndergroundPath_WestEntrance/scripts.inc b/data/maps/UndergroundPath_WestEntrance/scripts.inc index 898c14fe2..f56217bce 100644 --- a/data/maps/UndergroundPath_WestEntrance/scripts.inc +++ b/data/maps/UndergroundPath_WestEntrance/scripts.inc @@ -2,6 +2,5 @@ UndergroundPath_WestEntrance_MapScripts:: @ 8160EC9 .byte 0 UndergroundPath_WestEntrance_EventScript_160ECA:: @ 8160ECA - loadword 0, gUnknown_817459B - callstd 2 + msgbox gUnknown_817459B, 2 end diff --git a/data/maps/VermilionCity/scripts.inc b/data/maps/VermilionCity/scripts.inc index 838408344..f9c2b2f21 100644 --- a/data/maps/VermilionCity/scripts.inc +++ b/data/maps/VermilionCity/scripts.inc @@ -31,8 +31,7 @@ EventScript_166913:: @ 8166913 return VermilionCity_EventScript_166917:: @ 8166917 - loadword 0, gUnknown_817F723 - callstd 2 + msgbox gUnknown_817F723, 2 end VermilionCity_EventScript_166920:: @ 8166920 @@ -40,14 +39,12 @@ VermilionCity_EventScript_166920:: @ 8166920 faceplayer compare_var_to_value VAR_MAP_SCENE_VERMILION_CITY, 3 goto_if 1, EventScript_166937 - loadword 0, gUnknown_817F776 - callstd 4 + msgbox gUnknown_817F776 release end EventScript_166937:: @ 8166937 - loadword 0, gUnknown_817F7A6 - callstd 4 + msgbox gUnknown_817F7A6 release end @@ -56,8 +53,7 @@ VermilionCity_EventScript_166941:: @ 8166941 faceplayer compare_var_to_value VAR_MAP_SCENE_VERMILION_CITY, 3 goto_if 1, EventScript_166996 - loadword 0, gUnknown_817FA22 - callstd 4 + msgbox gUnknown_817FA22 release end @@ -85,8 +81,7 @@ EventScript_166996:: @ 8166996 goto_if 4, EventScript_1669BB compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 1 goto_if 4, EventScript_166B3B - loadword 0, gUnknown_817FB10 - callstd 4 + msgbox gUnknown_817FB10 release end @@ -129,8 +124,7 @@ EventScript_1669FD:: @ 81669FD EventScript_166A53:: @ 8166A53 setflag FLAG_0x2F0 - loadword 0, gUnknown_817FC00 - callstd 4 + msgbox gUnknown_817FC00 return EventScript_166A5F:: @ 8166A5F @@ -152,8 +146,7 @@ EventScript_166A5F:: @ 8166A5F EventScript_166AA5:: @ 8166AA5 setflag FLAG_0x2F1 - loadword 0, gUnknown_817FC5F - callstd 4 + msgbox gUnknown_817FC5F return EventScript_166AB1:: @ 8166AB1 @@ -178,16 +171,14 @@ EventScript_166AB1:: @ 8166AB1 end EventScript_166B0B:: @ 8166B0B - loadword 0, gUnknown_817FCEC - callstd 4 + msgbox gUnknown_817FCEC setvar VAR_0x8004, 0 setvar VAR_0x8006, 9 goto EventScript_1A90DA end EventScript_166B23:: @ 8166B23 - loadword 0, gUnknown_817FD5F - callstd 4 + msgbox gUnknown_817FD5F setvar VAR_0x8004, 0 setvar VAR_0x8006, 10 goto EventScript_1A90DA @@ -238,19 +229,16 @@ EventScript_166BA0:: @ 8166BA0 waitmovement 0 compare_var_to_value VAR_MAP_SCENE_VERMILION_CITY, 3 goto_if 1, EventScript_166BED - loadword 0, gUnknown_817FA3C - callstd 4 + msgbox gUnknown_817FA3C checkflag FLAG_0x234 goto_if 0, EventScript_166BDE - loadword 0, gUnknown_817FA77 - callstd 4 + msgbox gUnknown_817FA77 setvar VAR_0x4053, 1 releaseall end EventScript_166BDE:: @ 8166BDE - loadword 0, gUnknown_817FABA - callstd 4 + msgbox gUnknown_817FABA closemessage goto EventScript_1A9108 end @@ -261,29 +249,25 @@ EventScript_166BED:: @ 8166BED goto_if 4, EventScript_1669BB compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 1 goto_if 4, EventScript_166B3B - loadword 0, gUnknown_817FB10 - callstd 4 + msgbox gUnknown_817FB10 closemessage goto EventScript_1A9108 end VermilionCity_EventScript_166C17:: @ 8166C17 - loadword 0, gUnknown_817F8AC - callstd 2 + msgbox gUnknown_817F8AC, 2 end VermilionCity_EventScript_166C20:: @ 8166C20 lock faceplayer setflag FLAG_0x2F9 - loadword 0, gUnknown_817FDD2 - callstd 4 + msgbox gUnknown_817FDD2 release end VermilionCity_EventScript_166C2F:: @ 8166C2F - loadword 0, gUnknown_817F7FD - callstd 2 + msgbox gUnknown_817F7FD, 2 end VermilionCity_EventScript_166C38:: @ 8166C38 @@ -291,27 +275,22 @@ VermilionCity_EventScript_166C38:: @ 8166C38 faceplayer waitse playmoncry SPECIES_MACHOP, 0 - loadword 0, gUnknown_817F871 - callstd 4 + msgbox gUnknown_817F871 waitmoncry - loadword 0, gUnknown_817F888 - callstd 4 + msgbox gUnknown_817F888 release end VermilionCity_EventScript_166C53:: @ 8166C53 - loadword 0, gUnknown_817F8FB - callstd 3 + msgbox gUnknown_817F8FB, 3 end VermilionCity_EventScript_166C5C:: @ 8166C5C - loadword 0, gUnknown_817F928 - callstd 3 + msgbox gUnknown_817F928, 3 end VermilionCity_EventScript_166C65:: @ 8166C65 - loadword 0, gUnknown_817F9A1 - callstd 3 + msgbox gUnknown_817F9A1, 3 end VermilionCity_EventScript_166C6E:: @ 8166C6E @@ -319,12 +298,10 @@ VermilionCity_EventScript_166C6E:: @ 8166C6E setvar VAR_0x8004, 4 setvar VAR_0x8005, 0 special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_817F9CC - callstd 4 + msgbox gUnknown_817F9CC releaseall end VermilionCity_EventScript_166C86:: @ 8166C86 - loadword 0, gUnknown_817FA11 - callstd 3 + msgbox gUnknown_817FA11, 3 end diff --git a/data/maps/VermilionCity_Gym/scripts.inc b/data/maps/VermilionCity_Gym/scripts.inc index 22dc7f6a9..d19b973f9 100644 --- a/data/maps/VermilionCity_Gym/scripts.inc +++ b/data/maps/VermilionCity_Gym/scripts.inc @@ -151,14 +151,12 @@ EventScript_16B843:: @ 816B843 goto_if 1, EventScript_16B89E compare_var_to_var VAR_0x8004, VAR_0x8008 goto_if 1, EventScript_16B885 - loadword 0, gUnknown_8195289 - callstd 4 + msgbox gUnknown_8195289 releaseall end EventScript_16B885:: @ 816B885 - loadword 0, gUnknown_81952A8 - callstd 4 + msgbox gUnknown_81952A8 playse SE_PIN waitse call EventScript_16B6BC @@ -170,8 +168,7 @@ EventScript_16B885:: @ 816B885 EventScript_16B89E:: @ 816B89E compare_var_to_var VAR_0x8005, VAR_0x8008 goto_if 1, EventScript_16B8CB - loadword 0, gUnknown_819536C - callstd 4 + msgbox gUnknown_819536C clearflag FLAG_0x001 special sub_80CADEC copyvar VAR_0x4000, VAR_0x8004 @@ -182,8 +179,7 @@ EventScript_16B89E:: @ 816B89E end EventScript_16B8CB:: @ 816B8CB - loadword 0, gUnknown_8195330 - callstd 4 + msgbox gUnknown_8195330 closemessage call EventScript_16B717 special DrawWholeMapView @@ -194,8 +190,7 @@ EventScript_16B8CB:: @ 816B8CB end EventScript_16B8E5:: @ 816B8E5 - loadword 0, gUnknown_8195289 - callstd 4 + msgbox gUnknown_8195289 releaseall end @@ -219,8 +214,7 @@ VermilionCity_Gym_EventScript_16B94A:: @ 816B94A trainerbattle 1, 416, 0, Text_194BA4, Text_194E03, EventScript_16B97C checkflag FLAG_0x231 goto_if 0, EventScript_16B9AF - loadword 0, gUnknown_8194C8E - callstd 4 + msgbox gUnknown_8194C8E release end @@ -243,22 +237,19 @@ EventScript_16B9AB:: @ 816B9AB return EventScript_16B9AF:: @ 816B9AF - loadword 0, gUnknown_8194CFA - callstd 4 + msgbox gUnknown_8194CFA checkitemspace ITEM_TM34, 1 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16B9F0 additem ITEM_TM34, 1 giveitemfanfaremsg gUnknown_8194D87, ITEM_TM34 setflag FLAG_0x231 - loadword 0, gUnknown_8194DA8 - callstd 4 + msgbox gUnknown_8194DA8 release end EventScript_16B9F0:: @ 816B9F0 - loadword 0, gUnknown_8194DE3 - callstd 4 + msgbox gUnknown_8194DE3 release end @@ -267,14 +258,12 @@ VermilionCity_Gym_EventScript_16B9FA:: @ 816B9FA setvar VAR_0x8004, 4 setvar VAR_0x8005, 4 special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_8195004 - callstd 6 + msgbox gUnknown_8195004, 6 end VermilionCity_Gym_EventScript_16BA1E:: @ 816BA1E trainerbattle 0, 220, 0, Text_194F1F, Text_194F6F - loadword 0, gUnknown_8194F76 - callstd 6 + msgbox gUnknown_8194F76, 6 end VermilionCity_Gym_EventScript_16BA35:: @ 816BA35 @@ -282,8 +271,7 @@ VermilionCity_Gym_EventScript_16BA35:: @ 816BA35 setvar VAR_0x8004, 4 setvar VAR_0x8005, 3 special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_8194EBD - callstd 6 + msgbox gUnknown_8194EBD, 6 end EventScript_16BA5D:: @ 816BA5D @@ -298,14 +286,12 @@ VermilionCity_Gym_EventScript_16BA6C:: @ 816BA6C faceplayer checkflag FLAG_0x4B2 goto_if 1, EventScript_16BA81 - loadword 0, gUnknown_81950B4 - callstd 4 + msgbox gUnknown_81950B4 release end EventScript_16BA81:: @ 816BA81 - loadword 0, gUnknown_81951EC - callstd 4 + msgbox gUnknown_81951EC release end @@ -313,13 +299,11 @@ VermilionCity_Gym_EventScript_16BA8B:: @ 816BA8B lockall checkflag FLAG_0x822 goto_if 1, EventScript_16BA9F - loadword 0, gUnknown_819520B - callstd 4 + msgbox gUnknown_819520B releaseall end EventScript_16BA9F:: @ 816BA9F - loadword 0, gUnknown_8195248 - callstd 4 + msgbox gUnknown_8195248 releaseall end diff --git a/data/maps/VermilionCity_House1/scripts.inc b/data/maps/VermilionCity_House1/scripts.inc index 3e07e1143..95f89ea38 100644 --- a/data/maps/VermilionCity_House1/scripts.inc +++ b/data/maps/VermilionCity_House1/scripts.inc @@ -6,18 +6,15 @@ VermilionCity_House1_EventScript_16B3A7:: @ 816B3A7 faceplayer checkflag FLAG_0x240 goto_if 1, EventScript_16B3CF - loadword 0, gUnknown_8193EC1 - callstd 5 + msgbox gUnknown_8193EC1, 5 compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_16B3D9 - loadword 0, gUnknown_8194028 - callstd 4 + msgbox gUnknown_8194028 release end EventScript_16B3CF:: @ 816B3CF - loadword 0, gUnknown_8194045 - callstd 4 + msgbox gUnknown_8194045 release end @@ -26,17 +23,14 @@ EventScript_16B3D9:: @ 816B3D9 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16B41A additem ITEM_OLD_ROD, 1 - loadword 0, gUnknown_8193F2A - callstd 4 + msgbox gUnknown_8193F2A giveitemfanfaremsg gUnknown_8193F81, ITEM_OLD_ROD setflag FLAG_0x240 - loadword 0, gUnknown_8193FAF - callstd 4 + msgbox gUnknown_8193FAF release end EventScript_16B41A:: @ 816B41A - loadword 0, gUnknown_819406F - callstd 4 + msgbox gUnknown_819406F release end diff --git a/data/maps/VermilionCity_House3/scripts.inc b/data/maps/VermilionCity_House3/scripts.inc index 19ca4c1d6..1344aac52 100644 --- a/data/maps/VermilionCity_House3/scripts.inc +++ b/data/maps/VermilionCity_House3/scripts.inc @@ -2,13 +2,11 @@ VermilionCity_House3_MapScripts:: @ 816BAA9 .byte 0 VermilionCity_House3_EventScript_16BAAA:: @ 816BAAA - loadword 0, gUnknown_81953AF - callstd 2 + msgbox gUnknown_81953AF, 2 end VermilionCity_House3_EventScript_16BAB3:: @ 816BAB3 - loadword 0, gUnknown_8195471 - callstd 2 + msgbox gUnknown_8195471, 2 end VermilionCity_House3_EventScript_16BABC:: @ 816BABC @@ -16,13 +14,11 @@ VermilionCity_House3_EventScript_16BABC:: @ 816BABC faceplayer waitse playmoncry SPECIES_PIDGEY, 0 - loadword 0, gUnknown_81953EE - callstd 4 + msgbox gUnknown_81953EE waitmoncry release end VermilionCity_House3_EventScript_16BACF:: @ 816BACF - loadword 0, gUnknown_8195400 - callstd 3 + msgbox gUnknown_8195400, 3 end diff --git a/data/maps/VermilionCity_Mart/scripts.inc b/data/maps/VermilionCity_Mart/scripts.inc index 7b24e8785..c4aa0d666 100644 --- a/data/maps/VermilionCity_Mart/scripts.inc +++ b/data/maps/VermilionCity_Mart/scripts.inc @@ -2,13 +2,11 @@ VermilionCity_Mart_MapScripts:: @ 816B653 .byte 0 VermilionCity_Mart_EventScript_16B654:: @ 816B654 - loadword 0, gUnknown_8194B65 - callstd 2 + msgbox gUnknown_8194B65, 2 end VermilionCity_Mart_EventScript_16B65D:: @ 816B65D - loadword 0, gUnknown_8194A77 - callstd 2 + msgbox gUnknown_8194A77, 2 end VermilionCity_Mart_EventScript_16B666:: @ 816B666 @@ -20,8 +18,7 @@ VermilionCity_Mart_EventScript_16B666:: @ 816B666 message Text_1A6211 waitmessage pokemart Items_16B68C - loadword 0, gUnknown_81A5190 - callstd 4 + msgbox gUnknown_81A5190 release end diff --git a/data/maps/VermilionCity_PokemonCenter_1F/scripts.inc b/data/maps/VermilionCity_PokemonCenter_1F/scripts.inc index 0cf7739da..7f8857c68 100644 --- a/data/maps/VermilionCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/VermilionCity_PokemonCenter_1F/scripts.inc @@ -15,16 +15,13 @@ VermilionCity_PokemonCenter_1F_EventScript_16B433:: @ 816B433 end VermilionCity_PokemonCenter_1F_EventScript_16B43C:: @ 816B43C - loadword 0, gUnknown_8194145 - callstd 2 + msgbox gUnknown_8194145, 2 end VermilionCity_PokemonCenter_1F_EventScript_16B445:: @ 816B445 - loadword 0, gUnknown_81940AF - callstd 2 + msgbox gUnknown_81940AF, 2 end VermilionCity_PokemonCenter_1F_EventScript_16B44E:: @ 816B44E - loadword 0, gUnknown_8194180 - callstd 2 + msgbox gUnknown_8194180, 2 end diff --git a/data/maps/VermilionCity_PokemonFanClub/scripts.inc b/data/maps/VermilionCity_PokemonFanClub/scripts.inc index 4fc8d5b25..2c750711d 100644 --- a/data/maps/VermilionCity_PokemonFanClub/scripts.inc +++ b/data/maps/VermilionCity_PokemonFanClub/scripts.inc @@ -6,38 +6,32 @@ VermilionCity_PokemonFanClub_EventScript_16B47F:: @ 816B47F faceplayer checkflag FLAG_0x241 goto_if 1, EventScript_16B4A7 - loadword 0, gUnknown_819457E - callstd 5 + msgbox gUnknown_819457E, 5 compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_16B4B1 - loadword 0, gUnknown_8194860 - callstd 4 + msgbox gUnknown_8194860 release end EventScript_16B4A7:: @ 816B4A7 - loadword 0, gUnknown_819488E - callstd 4 + msgbox gUnknown_819488E release end EventScript_16B4B1:: @ 816B4B1 - loadword 0, gUnknown_8194628 - callstd 4 + msgbox gUnknown_8194628 checkitemspace ITEM_BIKE_VOUCHER, 1 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16B4F2 setflag FLAG_0x241 additem ITEM_BIKE_VOUCHER, 1 giveitemfanfaremsg gUnknown_819474E, ITEM_BIKE_VOUCHER, 1, BGM_FRLG_ME_KEYITEM - loadword 0, gUnknown_819477C - callstd 4 + msgbox gUnknown_819477C release end EventScript_16B4F2:: @ 816B4F2 - loadword 0, gUnknown_81948D2 - callstd 4 + msgbox gUnknown_81948D2 release end @@ -46,8 +40,7 @@ VermilionCity_PokemonFanClub_EventScript_16B4FC:: @ 816B4FC faceplayer checkflag FLAG_0x82C goto_if 1, EventScript_16B511 - loadword 0, gUnknown_81948E6 - callstd 4 + msgbox gUnknown_81948E6 release end @@ -55,8 +48,7 @@ EventScript_16B511:: @ 816B511 setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_8194960 - callstd 4 + msgbox gUnknown_8194960 release end @@ -65,8 +57,7 @@ VermilionCity_PokemonFanClub_EventScript_16B528:: @ 816B528 faceplayer checkflag FLAG_0x003 goto_if 1, EventScript_16B54B - loadword 0, gUnknown_81944CC - callstd 4 + msgbox gUnknown_81944CC closemessage applymovement 5, Movement_1A75E5 waitmovement 0 @@ -75,8 +66,7 @@ VermilionCity_PokemonFanClub_EventScript_16B528:: @ 816B528 end EventScript_16B54B:: @ 816B54B - loadword 0, gUnknown_8194518 - callstd 4 + msgbox gUnknown_8194518 closemessage applymovement 5, Movement_1A75E5 waitmovement 0 @@ -89,8 +79,7 @@ VermilionCity_PokemonFanClub_EventScript_16B563:: @ 816B563 faceplayer checkflag FLAG_0x002 goto_if 1, EventScript_16B586 - loadword 0, gUnknown_819446F - callstd 4 + msgbox gUnknown_819446F closemessage applymovement 6, Movement_1A75E5 waitmovement 0 @@ -99,8 +88,7 @@ VermilionCity_PokemonFanClub_EventScript_16B563:: @ 816B563 end EventScript_16B586:: @ 816B586 - loadword 0, gUnknown_819449C - callstd 4 + msgbox gUnknown_819449C closemessage applymovement 6, Movement_1A75E5 waitmovement 0 @@ -113,8 +101,7 @@ VermilionCity_PokemonFanClub_EventScript_16B59E:: @ 816B59E faceplayer waitse playmoncry SPECIES_PIKACHU, 0 - loadword 0, gUnknown_819455A - callstd 4 + msgbox gUnknown_819455A waitmoncry release end @@ -124,20 +111,17 @@ VermilionCity_PokemonFanClub_EventScript_16B5B1:: @ 816B5B1 faceplayer waitse playmoncry SPECIES_SEEL, 0 - loadword 0, gUnknown_8194571 - callstd 4 + msgbox gUnknown_8194571 waitmoncry release end VermilionCity_PokemonFanClub_EventScript_16B5C4:: @ 816B5C4 - loadword 0, gUnknown_8194910 - callstd 3 + msgbox gUnknown_8194910, 3 end VermilionCity_PokemonFanClub_EventScript_16B5CD:: @ 816B5CD - loadword 0, gUnknown_819493D - callstd 3 + msgbox gUnknown_819493D, 3 end VermilionCity_House2_MapScripts:: @ 816B5D6 @@ -150,8 +134,7 @@ VermilionCity_House2_EventScript_16B5D7:: @ 816B5D7 call EventScript_1A8CAD checkflag FLAG_0x24D goto_if 1, EventScript_16B649 - loadword 0, gUnknown_81949CB - callstd 5 + msgbox gUnknown_81949CB, 5 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16B631 call EventScript_1A8CBD @@ -161,27 +144,23 @@ VermilionCity_House2_EventScript_16B5D7:: @ 816B5D7 compare_var_to_var VAR_RESULT, VAR_0x8009 goto_if 5, EventScript_16B63B call EventScript_1A8CD9 - loadword 0, gUnknown_8194A44 - callstd 4 + msgbox gUnknown_8194A44 setflag FLAG_0x24D release end EventScript_16B631:: @ 816B631 - loadword 0, gUnknown_81949FD - callstd 4 + msgbox gUnknown_81949FD release end EventScript_16B63B:: @ 816B63B getspeciesname 0, 32777 - loadword 0, gUnknown_8194A0D - callstd 4 + msgbox gUnknown_8194A0D release end EventScript_16B649:: @ 816B649 - loadword 0, gUnknown_8194A4F - callstd 4 + msgbox gUnknown_8194A4F release end diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc index 2849015d2..056e3835a 100644 --- a/data/maps/VictoryRoad_1F/scripts.inc +++ b/data/maps/VictoryRoad_1F/scripts.inc @@ -37,12 +37,10 @@ EventScript_160F62:: @ 8160F62 VictoryRoad_1F_EventScript_160F64:: @ 8160F64 trainerbattle 0, 406, 0, Text_174710, Text_174738 - loadword 0, gUnknown_8174744 - callstd 6 + msgbox gUnknown_8174744, 6 end VictoryRoad_1F_EventScript_160F7B:: @ 8160F7B trainerbattle 0, 396, 0, Text_174784, Text_1747B8 - loadword 0, gUnknown_81747C8 - callstd 6 + msgbox gUnknown_81747C8, 6 end diff --git a/data/maps/VictoryRoad_2F/scripts.inc b/data/maps/VictoryRoad_2F/scripts.inc index 14e8f60d8..ae085dc1f 100644 --- a/data/maps/VictoryRoad_2F/scripts.inc +++ b/data/maps/VictoryRoad_2F/scripts.inc @@ -57,30 +57,25 @@ EventScript_161035:: @ 8161035 VictoryRoad_2F_EventScript_161037:: @ 8161037 trainerbattle 0, 167, 0, Text_1747EF, Text_17482C - loadword 0, gUnknown_817483E - callstd 6 + msgbox gUnknown_817483E, 6 end VictoryRoad_2F_EventScript_16104E:: @ 816104E trainerbattle 0, 325, 0, Text_174877, Text_1748B4 - loadword 0, gUnknown_81748BB - callstd 6 + msgbox gUnknown_81748BB, 6 end VictoryRoad_2F_EventScript_161065:: @ 8161065 trainerbattle 0, 287, 0, Text_1748EE, Text_17491B - loadword 0, gUnknown_8174927 - callstd 6 + msgbox gUnknown_8174927, 6 end VictoryRoad_2F_EventScript_16107C:: @ 816107C trainerbattle 0, 290, 0, Text_174995, Text_1749B0 - loadword 0, gUnknown_81749BB - callstd 6 + msgbox gUnknown_81749BB, 6 end VictoryRoad_2F_EventScript_161093:: @ 8161093 trainerbattle 0, 298, 0, Text_174942, Text_17495A - loadword 0, gUnknown_8174969 - callstd 6 + msgbox gUnknown_8174969, 6 end diff --git a/data/maps/VictoryRoad_3F/scripts.inc b/data/maps/VictoryRoad_3F/scripts.inc index eadeb1632..7aafcb1b4 100644 --- a/data/maps/VictoryRoad_3F/scripts.inc +++ b/data/maps/VictoryRoad_3F/scripts.inc @@ -33,36 +33,30 @@ EventScript_161101:: @ 8161101 VictoryRoad_3F_EventScript_161103:: @ 8161103 trainerbattle 0, 393, 0, Text_174B60, Text_174B83 - loadword 0, gUnknown_8174B99 - callstd 6 + msgbox gUnknown_8174B99, 6 end VictoryRoad_3F_EventScript_16111A:: @ 816111A trainerbattle 0, 394, 0, Text_174C8A, Text_174CA9 - loadword 0, gUnknown_8174CBD - callstd 6 + msgbox gUnknown_8174CBD, 6 end VictoryRoad_3F_EventScript_161131:: @ 8161131 trainerbattle 0, 403, 0, Text_174C30, Text_174C5A - loadword 0, gUnknown_8174C67 - callstd 6 + msgbox gUnknown_8174C67, 6 end VictoryRoad_3F_EventScript_161148:: @ 8161148 trainerbattle 0, 404, 0, Text_174BCA, Text_174BF4 - loadword 0, gUnknown_8174C03 - callstd 6 + msgbox gUnknown_8174C03, 6 end VictoryRoad_3F_EventScript_16115F:: @ 816115F trainerbattle 4, 485, 0, Text_174D0C, Text_174D45, Text_174D96 - loadword 0, gUnknown_8174D64 - callstd 6 + msgbox gUnknown_8174D64, 6 end VictoryRoad_3F_EventScript_16117A:: @ 816117A trainerbattle 4, 485, 0, Text_174E08, Text_174E39, Text_174E8D - loadword 0, gUnknown_8174E48 - callstd 6 + msgbox gUnknown_8174E48, 6 end diff --git a/data/maps/ViridianCity/scripts.inc b/data/maps/ViridianCity/scripts.inc index 876219174..860f50a4a 100644 --- a/data/maps/ViridianCity/scripts.inc +++ b/data/maps/ViridianCity/scripts.inc @@ -52,8 +52,7 @@ ViridianCity_EventScript_16596D:: @ 816596D applymovement 255, Movement_1A75E9 waitmovement 0 delay 20 - loadword 0, gUnknown_817E2F5 - callstd 4 + msgbox gUnknown_817E2F5 closemessage applymovement 255, Movement_165992 waitmovement 0 @@ -65,33 +64,27 @@ Movement_165992:: @ 8165992 step_end ViridianCity_EventScript_165994:: @ 8165994 - loadword 0, gUnknown_817E1BB - callstd 3 + msgbox gUnknown_817E1BB, 3 end ViridianCity_EventScript_16599D:: @ 816599D - loadword 0, gUnknown_817E1E7 - callstd 3 + msgbox gUnknown_817E1E7, 3 end ViridianCity_EventScript_1659A6:: @ 81659A6 - loadword 0, gUnknown_817E24D - callstd 3 + msgbox gUnknown_817E24D, 3 end ViridianCity_EventScript_1659AF:: @ 81659AF - loadword 0, gUnknown_817E2DB - callstd 3 + msgbox gUnknown_817E2DB, 3 end ViridianCity_EventScript_1659B8:: @ 81659B8 - loadword 0, gUnknown_817E2F5 - callstd 3 + msgbox gUnknown_817E2F5, 3 end ViridianCity_EventScript_1659C1:: @ 81659C1 - loadword 0, gUnknown_817DABB - callstd 2 + msgbox gUnknown_817DABB, 2 end ViridianCity_EventScript_1659CA:: @ 81659CA @@ -99,8 +92,7 @@ ViridianCity_EventScript_1659CA:: @ 81659CA faceplayer compare_var_to_value VAR_0x405A, 1 goto_if 1, EventScript_1659EC - loadword 0, gUnknown_817DB39 - callstd 4 + msgbox gUnknown_817DB39 closemessage applymovement 3, Movement_1A75E5 waitmovement 0 @@ -108,8 +100,7 @@ ViridianCity_EventScript_1659CA:: @ 81659CA end EventScript_1659EC:: @ 81659EC - loadword 0, gUnknown_817DB78 - callstd 4 + msgbox gUnknown_817DB78 release end @@ -127,24 +118,20 @@ ViridianCity_EventScript_1659F6:: @ 81659F6 end EventScript_165A23:: @ 8165A23 - loadword 0, gUnknown_817E046 - callstd 5 + msgbox gUnknown_817E046, 5 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_165A40 - loadword 0, gUnknown_817E0EA - callstd 4 + msgbox gUnknown_817E0EA release end EventScript_165A40:: @ 8165A40 - loadword 0, gUnknown_817E14E - callstd 4 + msgbox gUnknown_817E14E release end EventScript_165A4A:: @ 8165A4A - loadword 0, gUnknown_817DF61 - callstd 4 + msgbox gUnknown_817DF61 release end @@ -154,14 +141,12 @@ EventScript_165A54:: @ 8165A54 end EventScript_165A5B:: @ 8165A5B - loadword 0, gUnknown_817DEEB - callstd 4 + msgbox gUnknown_817DEEB release end EventScript_165A65:: @ 8165A65 - loadword 0, gUnknown_817DE9B - callstd 4 + msgbox gUnknown_817DE9B special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 goto_if 1, EventScript_1A7AE0 @@ -172,8 +157,7 @@ EventScript_165A65:: @ 8165A65 end EventScript_165A84:: @ 8165A84 - loadword 0, gUnknown_817DD03 - callstd 4 + msgbox gUnknown_817DD03 closemessage release end @@ -181,8 +165,7 @@ EventScript_165A84:: @ 8165A84 ViridianCity_EventScript_165A8F:: @ 8165A8F lock faceplayer - loadword 0, gUnknown_817DB98 - callstd 5 + msgbox gUnknown_817DB98, 5 compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_165AB0 compare_var_to_value VAR_RESULT, 0 @@ -190,14 +173,12 @@ ViridianCity_EventScript_165A8F:: @ 8165A8F end EventScript_165AB0:: @ 8165AB0 - loadword 0, gUnknown_817DBE4 - callstd 4 + msgbox gUnknown_817DBE4 release end EventScript_165ABA:: @ 8165ABA - loadword 0, gUnknown_817DBD5 - callstd 4 + msgbox gUnknown_817DBD5 release end @@ -206,14 +187,12 @@ ViridianCity_EventScript_165AC4:: @ 8165AC4 faceplayer compare_var_to_value VAR_0x4051, 0 goto_if 1, EventScript_165ADB - loadword 0, gUnknown_817DC99 - callstd 4 + msgbox gUnknown_817DC99 release end EventScript_165ADB:: @ 8165ADB - loadword 0, gUnknown_817DC4E - callstd 4 + msgbox gUnknown_817DC4E closemessage applymovement 5, Movement_1A75E5 waitmovement 0 @@ -227,8 +206,7 @@ ViridianCity_EventScript_165AF0:: @ 8165AF0 ViridianCity_EventScript_165AF6:: @ 8165AF6 lockall textcolor 0 - loadword 0, gUnknown_817DD03 - callstd 4 + msgbox gUnknown_817DD03 closemessage applymovement 255, Movement_165B0E waitmovement 0 @@ -262,8 +240,7 @@ ViridianCity_EventScript_165B2E:: @ 8165B2E end EventScript_165B4C:: @ 8165B4C - loadword 0, gUnknown_817DD4E - callstd 4 + msgbox gUnknown_817DD4E closemessage special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 @@ -273,12 +250,10 @@ EventScript_165B4C:: @ 8165B4C waitstate lock faceplayer - loadword 0, gUnknown_817DE9B - callstd 4 + msgbox gUnknown_817DE9B setvar VAR_0x4051, 2 setorcopyvar VAR_0x8000, 366 setorcopyvar VAR_0x8001, 1 callstd 0 - loadword 0, gUnknown_817DEEB - callstd 4 + msgbox gUnknown_817DEEB return diff --git a/data/maps/ViridianCity_Gym/scripts.inc b/data/maps/ViridianCity_Gym/scripts.inc index 283b4e15b..a5dfb05fe 100644 --- a/data/maps/ViridianCity_Gym/scripts.inc +++ b/data/maps/ViridianCity_Gym/scripts.inc @@ -8,8 +8,7 @@ ViridianCity_Gym_EventScript_169ECA:: @ 8169ECA trainerbattle 1, 350, 0, Text_18F352, Text_18F43F, EventScript_169F04 checkflag FLAG_0x298 goto_if 0, EventScript_169F2F - loadword 0, gUnknown_818F4A2 - callstd 4 + msgbox gUnknown_818F4A2 closemessage fadescreen 1 removeobject 8 @@ -31,71 +30,60 @@ EventScript_169F04:: @ 8169F04 end EventScript_169F2F:: @ 8169F2F - loadword 0, gUnknown_818F586 - callstd 4 + msgbox gUnknown_818F586 checkitemspace ITEM_TM26, 1 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_169F70 additem ITEM_TM26, 1 giveitemfanfaremsg gUnknown_818F675, ITEM_TM26 setflag FLAG_0x298 - loadword 0, gUnknown_818F695 - callstd 4 + msgbox gUnknown_818F695 release end EventScript_169F70:: @ 8169F70 - loadword 0, gUnknown_818F71B - callstd 4 + msgbox gUnknown_818F71B release end ViridianCity_Gym_EventScript_169F7A:: @ 8169F7A trainerbattle 0, 296, 0, Text_18F7F3, Text_18F824 - loadword 0, gUnknown_818F840 - callstd 6 + msgbox gUnknown_818F840, 6 end ViridianCity_Gym_EventScript_169F91:: @ 8169F91 trainerbattle 0, 297, 0, Text_18F98A, Text_18F9BB - loadword 0, gUnknown_818F9CC - callstd 6 + msgbox gUnknown_818F9CC, 6 end ViridianCity_Gym_EventScript_169FA8:: @ 8169FA8 trainerbattle 0, 322, 0, Text_18F7AD, Text_18F7D6 - loadword 0, gUnknown_818F7DD - callstd 6 + msgbox gUnknown_818F7DD, 6 end ViridianCity_Gym_EventScript_169FBF:: @ 8169FBF trainerbattle 0, 323, 0, Text_18F86C, Text_18F899 - loadword 0, gUnknown_818F8A0 - callstd 6 + msgbox gUnknown_818F8A0, 6 end ViridianCity_Gym_EventScript_169FD6:: @ 8169FD6 trainerbattle 0, 324, 0, Text_18F92C, Text_18F95A - loadword 0, gUnknown_818F960 - callstd 6 + msgbox gUnknown_818F960, 6 end ViridianCity_Gym_EventScript_169FED:: @ 8169FED trainerbattle 0, 392, 0, Text_18F9E7, Text_18FA2D - loadword 0, gUnknown_818FA3B - callstd 6 + msgbox gUnknown_818FA3B, 6 end ViridianCity_Gym_EventScript_16A004:: @ 816A004 trainerbattle 0, 400, 0, Text_18F73B, Text_18F769 - loadword 0, gUnknown_818F77B - callstd 6 + msgbox gUnknown_818F77B, 6 end ViridianCity_Gym_EventScript_16A01B:: @ 816A01B trainerbattle 0, 401, 0, Text_18F8CB, Text_18F8EE - loadword 0, gUnknown_818F8FE - callstd 6 + msgbox gUnknown_818F8FE, 6 end ViridianCity_Gym_EventScript_16A032:: @ 816A032 @@ -103,8 +91,7 @@ ViridianCity_Gym_EventScript_16A032:: @ 816A032 faceplayer checkflag FLAG_0x4B7 goto_if 1, EventScript_16A047 - loadword 0, gUnknown_818FA81 - callstd 4 + msgbox gUnknown_818FA81 release end @@ -112,8 +99,7 @@ EventScript_16A047:: @ 816A047 setvar VAR_0x8004, 15 setvar VAR_0x8005, 4 special SetFlavorTextFlagFromSpecialVars - loadword 0, gUnknown_818FB56 - callstd 4 + msgbox gUnknown_818FB56 release end @@ -121,13 +107,11 @@ ViridianCity_Gym_EventScript_16A05E:: @ 816A05E lockall checkflag FLAG_0x827 goto_if 1, EventScript_16A072 - loadword 0, gUnknown_818FB8D - callstd 4 + msgbox gUnknown_818FB8D releaseall end EventScript_16A072:: @ 816A072 - loadword 0, gUnknown_818FBC1 - callstd 4 + msgbox gUnknown_818FBC1 releaseall end diff --git a/data/maps/ViridianCity_House1/scripts.inc b/data/maps/ViridianCity_House1/scripts.inc index 1b8e860d0..b82b0ed2f 100644 --- a/data/maps/ViridianCity_House1/scripts.inc +++ b/data/maps/ViridianCity_House1/scripts.inc @@ -2,13 +2,11 @@ ViridianCity_House1_MapScripts:: @ 8169E9A .byte 0 ViridianCity_House1_EventScript_169E9B:: @ 8169E9B - loadword 0, gUnknown_818F292 - callstd 2 + msgbox gUnknown_818F292, 2 end ViridianCity_House1_EventScript_169EA4:: @ 8169EA4 - loadword 0, gUnknown_818F30F - callstd 2 + msgbox gUnknown_818F30F, 2 end ViridianCity_House1_EventScript_169EAD:: @ 8169EAD @@ -16,13 +14,11 @@ ViridianCity_House1_EventScript_169EAD:: @ 8169EAD faceplayer waitse playmoncry SPECIES_SPEAROW, 0 - loadword 0, gUnknown_818F32C - callstd 4 + msgbox gUnknown_818F32C waitmoncry release end ViridianCity_House1_EventScript_169EC0:: @ 8169EC0 - loadword 0, gUnknown_818F33D - callstd 3 + msgbox gUnknown_818F33D, 3 end diff --git a/data/maps/ViridianCity_House2/scripts.inc b/data/maps/ViridianCity_House2/scripts.inc index 4f22b42eb..b6ebea215 100644 --- a/data/maps/ViridianCity_House2/scripts.inc +++ b/data/maps/ViridianCity_House2/scripts.inc @@ -4,8 +4,7 @@ ViridianCity_House2_MapScripts:: @ 816A07C ViridianCity_House2_EventScript_16A07D:: @ 816A07D lock faceplayer - loadword 0, gUnknown_818FC00 - callstd 4 + msgbox gUnknown_818FC00 closemessage applymovement 2, Movement_1A75E9 waitmovement 0 @@ -15,8 +14,7 @@ ViridianCity_House2_EventScript_16A07D:: @ 816A07D ViridianCity_House2_EventScript_16A094:: @ 816A094 lock faceplayer - loadword 0, gUnknown_818FC2B - callstd 4 + msgbox gUnknown_818FC2B closemessage applymovement 1, Movement_1A75E5 waitmovement 0 @@ -25,31 +23,23 @@ ViridianCity_House2_EventScript_16A094:: @ 816A094 ViridianCity_House2_EventScript_16A0AB:: @ 816A0AB lockall - loadword 0, gUnknown_818FC65 - callstd 4 - loadword 0, gUnknown_818FF19 - callstd 5 + msgbox gUnknown_818FC65 + msgbox gUnknown_818FF19, 5 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16A11B - loadword 0, gUnknown_818FD23 - callstd 4 - loadword 0, gUnknown_818FF19 - callstd 5 + msgbox gUnknown_818FD23 + msgbox gUnknown_818FF19, 5 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16A11B - loadword 0, gUnknown_818FDA8 - callstd 4 - loadword 0, gUnknown_818FF19 - callstd 5 + msgbox gUnknown_818FDA8 + msgbox gUnknown_818FF19, 5 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16A11B - loadword 0, gUnknown_818FE5C - callstd 4 + msgbox gUnknown_818FE5C applymovement 2, Movement_1A75E9 waitmovement 0 textcolor 1 - loadword 0, gUnknown_818FF28 - callstd 4 + msgbox gUnknown_818FF28 releaseall end @@ -59,8 +49,7 @@ EventScript_16A11B:: @ 816A11B ViridianCity_House2_EventScript_16A11D:: @ 816A11D lockall - loadword 0, gUnknown_818FF4B - callstd 4 + msgbox gUnknown_818FF4B goto EventScript_16A12C end @@ -86,32 +75,27 @@ EventScript_16A12C:: @ 816A12C end EventScript_16A18B:: @ 816A18B - loadword 0, gUnknown_818FFA9 - callstd 4 + msgbox gUnknown_818FFA9 goto EventScript_16A12C end EventScript_16A199:: @ 816A199 - loadword 0, gUnknown_8190025 - callstd 4 + msgbox gUnknown_8190025 goto EventScript_16A12C end EventScript_16A1A7:: @ 816A1A7 - loadword 0, gUnknown_819009F - callstd 4 + msgbox gUnknown_819009F goto EventScript_16A12C end EventScript_16A1B5:: @ 816A1B5 - loadword 0, gUnknown_819010F - callstd 4 + msgbox gUnknown_819010F goto EventScript_16A12C end EventScript_16A1C3:: @ 816A1C3 - loadword 0, gUnknown_8190199 - callstd 4 + msgbox gUnknown_8190199 goto EventScript_16A12C end diff --git a/data/maps/ViridianCity_Mart/scripts.inc b/data/maps/ViridianCity_Mart/scripts.inc index 250538d21..630bb4122 100644 --- a/data/maps/ViridianCity_Mart/scripts.inc +++ b/data/maps/ViridianCity_Mart/scripts.inc @@ -22,14 +22,12 @@ EventScript_16A205:: @ 816A205 textcolor 0 applymovement 1, Movement_1A75ED waitmovement 0 - loadword 0, gUnknown_819021A - callstd 4 + msgbox gUnknown_819021A closemessage applymovement 1, Movement_16A262 applymovement 255, Movement_16A25C waitmovement 0 - loadword 0, gUnknown_819023A - callstd 4 + msgbox gUnknown_819023A setvar VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 1 additem ITEM_OAKS_PARCEL, 1 giveitemfanfaremsg gUnknown_8190289, ITEM_OAKS_PARCEL, 1, BGM_FRLG_ME_KEYITEM @@ -64,8 +62,7 @@ ViridianCity_Mart_EventScript_16A268:: @ 816A268 message Text_1A6211 waitmessage pokemart Items_16A298 - loadword 0, gUnknown_81A5190 - callstd 4 + msgbox gUnknown_81A5190 release end @@ -80,17 +77,14 @@ Items_16A298:: @ 816A298 end EventScript_16A2A4:: @ 816A2A4 - loadword 0, Text_1902BF - callstd 4 + msgbox Text_1902BF release end ViridianCity_Mart_EventScript_16A2AE:: @ 816A2AE - loadword 0, gUnknown_81902F5 - callstd 2 + msgbox gUnknown_81902F5, 2 end ViridianCity_Mart_EventScript_16A2B7:: @ 816A2B7 - loadword 0, gUnknown_819032C - callstd 2 + msgbox gUnknown_819032C, 2 end diff --git a/data/maps/ViridianCity_PokemonCenter_1F/scripts.inc b/data/maps/ViridianCity_PokemonCenter_1F/scripts.inc index 34fbab8d2..a3bb38219 100644 --- a/data/maps/ViridianCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/ViridianCity_PokemonCenter_1F/scripts.inc @@ -15,16 +15,13 @@ ViridianCity_PokemonCenter_1F_EventScript_16A2CF:: @ 816A2CF end ViridianCity_PokemonCenter_1F_EventScript_16A2D8:: @ 816A2D8 - loadword 0, gUnknown_81903E5 - callstd 2 + msgbox gUnknown_81903E5, 2 end ViridianCity_PokemonCenter_1F_EventScript_16A2E1:: @ 816A2E1 - loadword 0, gUnknown_8190384 - callstd 2 + msgbox gUnknown_8190384, 2 end ViridianCity_PokemonCenter_1F_EventScript_16A2EA:: @ 816A2EA - loadword 0, gUnknown_8190450 - callstd 2 + msgbox gUnknown_8190450, 2 end diff --git a/data/maps/ViridianForest/scripts.inc b/data/maps/ViridianForest/scripts.inc index 68c5da06a..bf8438d65 100644 --- a/data/maps/ViridianForest/scripts.inc +++ b/data/maps/ViridianForest/scripts.inc @@ -7,71 +7,58 @@ ViridianForest_MapScript1_160525:: @ 8160525 end ViridianForest_EventScript_160529:: @ 8160529 - loadword 0, gUnknown_8172255 - callstd 2 + msgbox gUnknown_8172255, 2 end ViridianForest_EventScript_160532:: @ 8160532 - loadword 0, gUnknown_8172559 - callstd 2 + msgbox gUnknown_8172559, 2 end ViridianForest_EventScript_16053B:: @ 816053B - loadword 0, gUnknown_81725C7 - callstd 3 + msgbox gUnknown_81725C7, 3 end ViridianForest_EventScript_160544:: @ 8160544 - loadword 0, gUnknown_8172629 - callstd 3 + msgbox gUnknown_8172629, 3 end ViridianForest_EventScript_16054D:: @ 816054D - loadword 0, gUnknown_817265C - callstd 3 + msgbox gUnknown_817265C, 3 end ViridianForest_EventScript_160556:: @ 8160556 - loadword 0, gUnknown_81726A3 - callstd 3 + msgbox gUnknown_81726A3, 3 end ViridianForest_EventScript_16055F:: @ 816055F - loadword 0, gUnknown_817271D - callstd 3 + msgbox gUnknown_817271D, 3 end ViridianForest_EventScript_160568:: @ 8160568 - loadword 0, gUnknown_8172773 - callstd 3 + msgbox gUnknown_8172773, 3 end ViridianForest_EventScript_160571:: @ 8160571 trainerbattle 0, 102, 0, Text_1722C7, Text_1722F9 - loadword 0, gUnknown_8172315 - callstd 6 + msgbox gUnknown_8172315, 6 end ViridianForest_EventScript_160588:: @ 8160588 trainerbattle 0, 103, 0, Text_17234A, Text_17237D - loadword 0, gUnknown_8172398 - callstd 6 + msgbox gUnknown_8172398, 6 end ViridianForest_EventScript_16059F:: @ 816059F trainerbattle 0, 104, 0, Text_1723D4, Text_172402 - loadword 0, gUnknown_817241F - callstd 6 + msgbox gUnknown_817241F, 6 end ViridianForest_EventScript_1605B6:: @ 81605B6 trainerbattle 0, 531, 0, Text_172482, Text_1724BF - loadword 0, gUnknown_81724DC - callstd 6 + msgbox gUnknown_81724DC, 6 end ViridianForest_EventScript_1605CD:: @ 81605CD trainerbattle 0, 532, 0, Text_1724F9, Text_17251B - loadword 0, gUnknown_8172527 - callstd 6 + msgbox gUnknown_8172527, 6 end -- cgit v1.2.3 From d7bd4d3bd17e84cace0ac902aab2f9bb38894c77 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 16 May 2019 09:52:32 -0400 Subject: Propagate giveitem macro --- data/maps/CeladonCity_Condominiums_1F/scripts.inc | 4 +--- data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc | 4 ++-- data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc | 6 ++---- data/maps/CeladonCity_GameCorner/scripts.inc | 2 +- data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc | 14 ++++++-------- data/maps/CeruleanCity/scripts.inc | 4 +--- data/maps/CeruleanCity_House3/scripts.inc | 2 +- data/maps/CeruleanCity_House4/scripts.inc | 16 ++++------------ data/maps/CeruleanCity_House5/scripts.inc | 14 +++++--------- data/maps/CinnabarIsland/scripts.inc | 2 +- data/maps/CinnabarIsland_Gym/scripts.inc | 12 ++++++------ data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc | 2 +- .../CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc | 12 ++++++------ data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc | 4 ++-- data/maps/FiveIsland_MemorialPillar/scripts.inc | 10 +++------- data/maps/FiveIsland_ResortGorgeous_House/scripts.inc | 4 +--- data/maps/FiveIsland_RocketWarehouse/scripts.inc | 4 +--- data/maps/FourIsland/scripts.inc | 4 ++-- data/maps/FourIsland_PokemonDayCare/scripts.inc | 14 +++++++------- data/maps/FuchsiaCity_Building1/scripts.inc | 2 +- data/maps/FuchsiaCity_House2/scripts.inc | 2 +- data/maps/FuchsiaCity_House3/scripts.inc | 4 ++-- data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc | 6 +++--- data/maps/LavenderTown/scripts.inc | 2 +- data/maps/LavenderTown_House2/scripts.inc | 4 ++-- data/maps/MtMoon_B2F/scripts.inc | 4 ++-- data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc | 4 +--- data/maps/OneIsland_PokemonCenter_1F/scripts.inc | 4 ++-- data/maps/PalletTown_GarysHouse/scripts.inc | 2 +- data/maps/PalletTown_ProfessorOaksLab/scripts.inc | 8 ++++---- data/maps/PewterCity/scripts.inc | 4 ++-- data/maps/PewterCity_Gym/scripts.inc | 2 +- data/maps/PewterCity_Museum_1F/scripts.inc | 4 ++-- data/maps/RocketHideout_B4F/scripts.inc | 8 ++------ data/maps/Route10_PokemonCenter_1F/scripts.inc | 2 +- data/maps/Route11_EastEntrance_2F/scripts.inc | 4 ++-- data/maps/Route12/scripts.inc | 2 +- data/maps/Route12_FishingHouse/scripts.inc | 6 ++---- data/maps/Route15_WestEntrance_2F/scripts.inc | 2 +- data/maps/Route16/scripts.inc | 2 +- data/maps/Route16_NorthEntrance_2F/scripts.inc | 2 +- data/maps/Route18_EastEntrance_2F/scripts.inc | 2 +- data/maps/Route25_SeaCottage/scripts.inc | 4 ++-- data/maps/Route2_EastBuilding/scripts.inc | 2 +- data/maps/Route2_House/scripts.inc | 2 +- data/maps/Route4_PokemonCenter_1F/scripts.inc | 8 ++++---- data/maps/SSAnne_1F_Room6/scripts.inc | 2 +- data/maps/SaffronCity_Dojo/scripts.inc | 8 ++++---- data/maps/SevenIsland_House_Room1/scripts.inc | 4 ++-- data/maps/SevenIsland_SevaultCanyon_House/scripts.inc | 2 +- data/maps/SilphCo_7F/scripts.inc | 4 ++-- data/maps/SixIsland_RuinValley/scripts.inc | 2 +- data/maps/SixIsland_WaterPath_House1/scripts.inc | 4 +--- data/maps/ThreeIsland/scripts.inc | 2 +- data/maps/ThreeIsland_BerryForest/scripts.inc | 4 +--- data/maps/ThreeIsland_DunsparceTunnel/scripts.inc | 4 +--- data/maps/TwoIsland_House/scripts.inc | 2 +- data/maps/UndergroundPath_NorthEntrance/scripts.inc | 2 +- data/maps/VermilionCity_House1/scripts.inc | 2 +- data/maps/VermilionCity_PokemonFanClub/scripts.inc | 4 ++-- data/maps/ViridianCity/scripts.inc | 8 +++----- data/maps/ViridianCity_House2/scripts.inc | 6 +++--- 62 files changed, 124 insertions(+), 168 deletions(-) (limited to 'data/maps') diff --git a/data/maps/CeladonCity_Condominiums_1F/scripts.inc b/data/maps/CeladonCity_Condominiums_1F/scripts.inc index b38a82d01..88dd869b9 100644 --- a/data/maps/CeladonCity_Condominiums_1F/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_1F/scripts.inc @@ -12,9 +12,7 @@ CeladonCity_Condominiums_1F_EventScript_16C321:: @ 816C321 goto_if 1, EventScript_16C36A msgbox gUnknown_81960C9 setflag FLAG_0x2A6 - setorcopyvar VAR_0x8000, 369 - setorcopyvar VAR_0x8001, 1 - callstd 0 + giveitem ITEM_TEA compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_1A6BF9 msgbox gUnknown_8196109 diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc b/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc index 1a7c21dde..f4ad8d3dc 100644 --- a/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc @@ -26,7 +26,7 @@ EventScript_16C4A6:: @ 816C4A6 waitmessage waitfanfare getspeciesname 0, SPECIES_EEVEE - msgbox gUnknown_81A56A7, 5 + msgbox gUnknown_81A56A7, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16C514 call EventScript_1A8C27 @@ -41,7 +41,7 @@ EventScript_16C4DA:: @ 816C4DA waitmessage waitfanfare getspeciesname 0, SPECIES_EEVEE - msgbox gUnknown_81A56A7, 5 + msgbox gUnknown_81A56A7, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16C509 call EventScript_1A8C33 diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc index ea08bae0b..1128bcd80 100644 --- a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc @@ -40,7 +40,7 @@ EventScript_16BD38:: @ 816BD38 return EventScript_16BD3E:: @ 816BD3E - msgbox gUnknown_8195D22, 5 + msgbox gUnknown_8195D22, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16C00C textcolor 3 @@ -191,9 +191,7 @@ EventScript_16BF7C:: @ 816BF7C message Text_195DAD waitmessage waitfanfare - setorcopyvar VAR_0x8000, VAR_0x8009 - setorcopyvar VAR_0x8001, 1 - callstd 8 + giveitem VAR_0x8009, 1, 8 call EventScript_1A6675 compare_var_to_value VAR_0x8008, 26 call_if 1, EventScript_16BFDE diff --git a/data/maps/CeladonCity_GameCorner/scripts.inc b/data/maps/CeladonCity_GameCorner/scripts.inc index 1e4761881..347c40273 100644 --- a/data/maps/CeladonCity_GameCorner/scripts.inc +++ b/data/maps/CeladonCity_GameCorner/scripts.inc @@ -269,7 +269,7 @@ EventScript_16C96A:: @ 816C96A EventScript_16C96C:: @ 816C96C checkflag FLAG_0x243 goto_if 0, EventScript_16CAA0 - msgbox gUnknown_8196F46, 5 + msgbox gUnknown_8196F46, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16C96A setfieldeffectarg 0, 255 diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc index 99fe24be1..925b4ad02 100644 --- a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc +++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc @@ -80,7 +80,7 @@ EventScript_16CC55:: @ 816CC55 EventScript_16CC65:: @ 816CC65 getspeciesname 0, VAR_0x4001 - msgbox gUnknown_819709D, 5 + msgbox gUnknown_819709D, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16CC10 checkcoins VAR_RESULT @@ -175,7 +175,7 @@ EventScript_16CDB3:: @ 816CDB3 message Text_1A5DF1 waitmessage waitfanfare - msgbox gUnknown_81A56A7, 5 + msgbox gUnknown_81A56A7, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_16CD83 goto EventScript_16CC10 @@ -189,7 +189,7 @@ EventScript_16CDE0:: @ 816CDE0 message Text_1A5DF1 waitmessage waitfanfare - msgbox gUnknown_81A56A7, 5 + msgbox gUnknown_81A56A7, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16CE12 call EventScript_1A8C33 @@ -271,7 +271,7 @@ EventScript_16CEF5:: @ 816CEF5 end EventScript_16CF09:: @ 816CF09 - msgbox gUnknown_81970B2, 5 + msgbox gUnknown_81970B2, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16CC10 goto EventScript_16CF3F @@ -279,7 +279,7 @@ EventScript_16CF09:: @ 816CF09 EventScript_16CF22:: @ 816CF22 getitemname 0, VAR_0x4001 - msgbox gUnknown_819709D, 5 + msgbox gUnknown_819709D, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16CC10 goto EventScript_16CF3F @@ -295,9 +295,7 @@ EventScript_16CF3F:: @ 816CF3F goto_if 1, EventScript_16CF79 takecoins VAR_0x4002 updatecoinsbox 0, 5 - setorcopyvar VAR_0x8000, VAR_0x4001 - setorcopyvar VAR_0x8001, 1 - callstd 0 + giveitem VAR_0x4001 goto EventScript_16CC10 end diff --git a/data/maps/CeruleanCity/scripts.inc b/data/maps/CeruleanCity/scripts.inc index 02da1e3a3..5d593cd60 100644 --- a/data/maps/CeruleanCity/scripts.inc +++ b/data/maps/CeruleanCity/scripts.inc @@ -64,9 +64,7 @@ EventScript_1664CC:: @ 81664CC msgbox gUnknown_817ECD4 setvar VAR_0x4052, 1 setflag FLAG_0x29B - setorcopyvar VAR_0x8000, 363 - setorcopyvar VAR_0x8001, 1 - callstd 0 + giveitem ITEM_FAME_CHECKER msgbox gUnknown_817ED5D closemessage applymovement 8, Movement_1665FB diff --git a/data/maps/CeruleanCity_House3/scripts.inc b/data/maps/CeruleanCity_House3/scripts.inc index edc1c1aae..f6caa2b92 100644 --- a/data/maps/CeruleanCity_House3/scripts.inc +++ b/data/maps/CeruleanCity_House3/scripts.inc @@ -12,7 +12,7 @@ CeruleanCity_House3_EventScript_16A9B1:: @ 816A9B1 call EventScript_1A8CAD checkflag FLAG_0x24A goto_if 1, EventScript_16AA23 - msgbox gUnknown_81A59FE, 5 + msgbox gUnknown_81A59FE, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16AA0B call EventScript_1A8CBD diff --git a/data/maps/CeruleanCity_House4/scripts.inc b/data/maps/CeruleanCity_House4/scripts.inc index f572ed04f..a4c0b74e3 100644 --- a/data/maps/CeruleanCity_House4/scripts.inc +++ b/data/maps/CeruleanCity_House4/scripts.inc @@ -33,9 +33,7 @@ EventScript_16AD59:: @ 816AD59 EventScript_16AD63:: @ 816AD63 call EventScript_16AE23 msgbox gUnknown_8192B43 - setorcopyvar VAR_0x8000, VAR_0x8008 - setorcopyvar VAR_0x8001, 1 - callstd 0 + giveitem VAR_0x8008 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16AE45 release @@ -44,9 +42,7 @@ EventScript_16AD63:: @ 816AD63 EventScript_16AD89:: @ 816AD89 call EventScript_16AE23 msgbox gUnknown_8192C07 - setorcopyvar VAR_0x8000, VAR_0x8008 - setorcopyvar VAR_0x8001, 4 - callstd 0 + giveitem VAR_0x8008, 4 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16AE45 release @@ -62,9 +58,7 @@ EventScript_16ADAF:: @ 816ADAF EventScript_16ADC3:: @ 816ADC3 call EventScript_16AE23 msgbox gUnknown_8192D4B - setorcopyvar VAR_0x8000, VAR_0x8008 - setorcopyvar VAR_0x8001, 1 - callstd 0 + giveitem VAR_0x8008 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16AE45 release @@ -73,9 +67,7 @@ EventScript_16ADC3:: @ 816ADC3 EventScript_16ADE9:: @ 816ADE9 call EventScript_16AE23 msgbox gUnknown_8192DE3 - setorcopyvar VAR_0x8000, VAR_0x8008 - setorcopyvar VAR_0x8001, 4 - callstd 0 + giveitem VAR_0x8008, 4 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16AE45 release diff --git a/data/maps/CeruleanCity_House5/scripts.inc b/data/maps/CeruleanCity_House5/scripts.inc index 762b36ec9..8bf244f7d 100644 --- a/data/maps/CeruleanCity_House5/scripts.inc +++ b/data/maps/CeruleanCity_House5/scripts.inc @@ -6,16 +6,14 @@ CeruleanCity_House5_EventScript_16AE50:: @ 816AE50 faceplayer checkflag FLAG_0x2BB goto_if 1, EventScript_16AEB7 - msgbox gUnknown_8192F67, 5 + msgbox gUnknown_8192F67, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16AEAD checkflag FLAG_0x847 goto_if 0, EventScript_16AEA3 msgbox gUnknown_8193003 setflag FLAG_0x2BB - setorcopyvar VAR_0x8000, 372 - setorcopyvar VAR_0x8001, 1 - callstd 0 + giveitem ITEM_POWDER_JAR compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_1A6BF9 msgbox gUnknown_8193033 @@ -157,22 +155,20 @@ EventScript_16B048:: @ 816B048 end EventScript_16B055:: @ 816B055 - msgbox gUnknown_819331E, 5 + msgbox gUnknown_819331E, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16AEC8 copyvar VAR_0x8004, VAR_0x8009 specialvar VAR_RESULT, sub_815EEB0 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16B0CC - setorcopyvar VAR_0x8000, VAR_0x8008 - setorcopyvar VAR_0x8001, 1 - callstd 0 + giveitem VAR_0x8008 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16B0BF copyvar VAR_0x8004, VAR_0x8009 special sub_815EF5C special sub_815F070 - msgbox gUnknown_819337A, 5 + msgbox gUnknown_819337A, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_16AEC8 msgbox gUnknown_81933FB diff --git a/data/maps/CinnabarIsland/scripts.inc b/data/maps/CinnabarIsland/scripts.inc index eea34942a..328a34bcb 100644 --- a/data/maps/CinnabarIsland/scripts.inc +++ b/data/maps/CinnabarIsland/scripts.inc @@ -107,7 +107,7 @@ EventScript_166FCD:: @ 8166FCD checkflag FLAG_0x002 call_if 1, EventScript_167053 msgbox gUnknown_8180C90 - msgbox gUnknown_8180CAA, 5 + msgbox gUnknown_8180CAA, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_167068 compare_var_to_value VAR_RESULT, 0 diff --git a/data/maps/CinnabarIsland_Gym/scripts.inc b/data/maps/CinnabarIsland_Gym/scripts.inc index 916966683..6e4431f87 100644 --- a/data/maps/CinnabarIsland_Gym/scripts.inc +++ b/data/maps/CinnabarIsland_Gym/scripts.inc @@ -233,7 +233,7 @@ CinnabarIsland_Gym_EventScript_16DBF4:: @ 816DBF4 EventScript_16DC00:: @ 816DC00 msgbox gUnknown_8199C9F - msgbox gUnknown_8199D5A, 5 + msgbox gUnknown_8199D5A, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_16DC43 compare_var_to_value VAR_RESULT, 0 @@ -330,7 +330,7 @@ CinnabarIsland_Gym_EventScript_16DCE9:: @ 816DCE9 EventScript_16DCF5:: @ 816DCF5 msgbox gUnknown_8199C9F - msgbox gUnknown_8199D79, 5 + msgbox gUnknown_8199D79, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_16DD41 compare_var_to_value VAR_RESULT, 0 @@ -418,7 +418,7 @@ CinnabarIsland_Gym_EventScript_16DDC7:: @ 816DDC7 EventScript_16DDD3:: @ 816DDD3 msgbox gUnknown_8199C9F - msgbox gUnknown_8199DA9, 5 + msgbox gUnknown_8199DA9, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_16DE1F compare_var_to_value VAR_RESULT, 0 @@ -497,7 +497,7 @@ CinnabarIsland_Gym_EventScript_16DE9E:: @ 816DE9E EventScript_16DEAA:: @ 816DEAA msgbox gUnknown_8199C9F - msgbox gUnknown_8199DC6, 5 + msgbox gUnknown_8199DC6, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_16DEF6 compare_var_to_value VAR_RESULT, 0 @@ -576,7 +576,7 @@ CinnabarIsland_Gym_EventScript_16DF75:: @ 816DF75 EventScript_16DF81:: @ 816DF81 msgbox gUnknown_8199C9F - msgbox gUnknown_8199E00, 5 + msgbox gUnknown_8199E00, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_16DFA8 compare_var_to_value VAR_RESULT, 0 @@ -655,7 +655,7 @@ CinnabarIsland_Gym_EventScript_16E04C:: @ 816E04C EventScript_16E058:: @ 816E058 msgbox gUnknown_8199C9F - msgbox gUnknown_8199E36, 5 + msgbox gUnknown_8199E36, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_16E0A4 compare_var_to_value VAR_RESULT, 0 diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc index cd9529936..0323e4fe4 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc @@ -29,7 +29,7 @@ CinnabarIsland_PokemonCenter_1F_EventScript_16E901:: @ 816E901 CinnabarIsland_PokemonCenter_1F_EventScript_16E90A:: @ 816E90A lock faceplayer - msgbox gUnknown_819A725, 5 + msgbox gUnknown_819A725, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16E9A5 msgbox gUnknown_819A785 diff --git a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc index e7e540df9..a615d299f 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc @@ -8,7 +8,7 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E401:: @ 816E401 call EventScript_1A8CAD checkflag FLAG_0x276 goto_if 1, EventScript_16E473 - msgbox gUnknown_81A597B, 5 + msgbox gUnknown_81A597B, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16E45B call EventScript_1A8CBD @@ -171,7 +171,7 @@ EventScript_16E631:: @ 816E631 EventScript_16E668:: @ 816E668 getspeciesname 0, SPECIES_OMANYTE getitemname 1, ITEM_HELIX_FOSSIL - msgbox gUnknown_819A3D4, 5 + msgbox gUnknown_819A3D4, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16E722 msgbox gUnknown_819A45D @@ -186,7 +186,7 @@ EventScript_16E668:: @ 816E668 EventScript_16E6A6:: @ 816E6A6 getspeciesname 0, SPECIES_KABUTO getitemname 1, ITEM_DOME_FOSSIL - msgbox gUnknown_819A3D4, 5 + msgbox gUnknown_819A3D4, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16E722 msgbox gUnknown_819A45D @@ -201,7 +201,7 @@ EventScript_16E6A6:: @ 816E6A6 EventScript_16E6E4:: @ 816E6E4 getspeciesname 0, SPECIES_AERODACTYL getitemname 1, ITEM_OLD_AMBER - msgbox gUnknown_819A3D4, 5 + msgbox gUnknown_819A3D4, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16E722 msgbox gUnknown_819A45D @@ -281,7 +281,7 @@ EventScript_16E827:: @ 816E827 waitmessage waitfanfare setvar VAR_0x406A, 0 - msgbox gUnknown_81A56A7, 5 + msgbox gUnknown_81A56A7, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16E895 call EventScript_1A8C27 @@ -296,7 +296,7 @@ EventScript_16E85B:: @ 816E85B waitmessage waitfanfare setvar VAR_0x406A, 0 - msgbox gUnknown_81A56A7, 5 + msgbox gUnknown_81A56A7, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16E88A call EventScript_1A8C33 diff --git a/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc index b7721a77a..9d6494e31 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc @@ -12,7 +12,7 @@ CinnabarIsland_PokemonLab_Lounge_EventScript_16E2C2:: @ 816E2C2 call EventScript_1A8CAD checkflag FLAG_0x274 goto_if 1, EventScript_16E334 - msgbox gUnknown_81A59FE, 5 + msgbox gUnknown_81A59FE, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16E31C call EventScript_1A8CBD @@ -52,7 +52,7 @@ CinnabarIsland_PokemonLab_Lounge_EventScript_16E33E:: @ 816E33E copyvar VAR_0x8009, VAR_RESULT checkflag FLAG_0x275 goto_if 1, EventScript_16E3D4 - msgbox gUnknown_81A5AD6, 5 + msgbox gUnknown_81A5AD6, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16E3BC special sub_80BF8FC diff --git a/data/maps/FiveIsland_MemorialPillar/scripts.inc b/data/maps/FiveIsland_MemorialPillar/scripts.inc index 1435ba64b..ef3ff4ef5 100644 --- a/data/maps/FiveIsland_MemorialPillar/scripts.inc +++ b/data/maps/FiveIsland_MemorialPillar/scripts.inc @@ -26,9 +26,7 @@ EventScript_168A18:: @ 8168A18 EventScript_168A22:: @ 8168A22 msgbox gUnknown_818B282 - setorcopyvar VAR_0x8000, 330 - setorcopyvar VAR_0x8001, 1 - callstd 0 + giveitem ITEM_TM42 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_168AFE call EventScript_168AE8 @@ -53,7 +51,7 @@ FiveIsland_MemorialPillar_EventScript_168A48:: @ 8168A48 end EventScript_168A86:: @ 8168A86 - msgbox gUnknown_818B105, 5 + msgbox gUnknown_818B105, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_168A9B releaseall @@ -70,9 +68,7 @@ EventScript_168A9B:: @ 8168A9B waitmovement 0 textcolor 0 msgbox gUnknown_818B171 - setorcopyvar VAR_0x8000, 330 - setorcopyvar VAR_0x8001, 1 - callstd 0 + giveitem ITEM_TM42 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_168AFE call EventScript_168AE8 diff --git a/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc b/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc index 76f62155e..ccdc69d54 100644 --- a/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc +++ b/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc @@ -62,9 +62,7 @@ EventScript_171F34:: @ 8171F34 call_if 1, EventScript_17201A moveobjectoffscreen 2 msgbox gUnknown_81A458E - setorcopyvar VAR_0x8000, VAR_0x403B - setorcopyvar VAR_0x8001, 1 - callstd 0 + giveitem VAR_0x403B compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_172025 setflag FLAG_0x002 diff --git a/data/maps/FiveIsland_RocketWarehouse/scripts.inc b/data/maps/FiveIsland_RocketWarehouse/scripts.inc index ebb3c17e2..f59cc2838 100644 --- a/data/maps/FiveIsland_RocketWarehouse/scripts.inc +++ b/data/maps/FiveIsland_RocketWarehouse/scripts.inc @@ -59,9 +59,7 @@ EventScript_163FB7:: @ 8163FB7 EventScript_163FCD:: @ 8163FCD msgbox gUnknown_817BC6C setflag FLAG_0x2DC - setorcopyvar VAR_0x8000, 374 - setorcopyvar VAR_0x8001, 1 - callstd 0 + giveitem ITEM_SAPPHIRE release end diff --git a/data/maps/FourIsland/scripts.inc b/data/maps/FourIsland/scripts.inc index 95876c737..4c54e61a4 100644 --- a/data/maps/FourIsland/scripts.inc +++ b/data/maps/FourIsland/scripts.inc @@ -90,10 +90,10 @@ FourIsland_EventScript_167D55:: @ 8167D55 end EventScript_167D9B:: @ 8167D9B - msgbox gUnknown_81BF5E3, 5 + msgbox gUnknown_81BF5E3, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_167DD1 - msgbox gUnknown_81BF7B6, 5 + msgbox gUnknown_81BF7B6, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_167DD1 msgbox gUnknown_81BF6CF diff --git a/data/maps/FourIsland_PokemonDayCare/scripts.inc b/data/maps/FourIsland_PokemonDayCare/scripts.inc index 0f9b98916..a968b6b9a 100644 --- a/data/maps/FourIsland_PokemonDayCare/scripts.inc +++ b/data/maps/FourIsland_PokemonDayCare/scripts.inc @@ -14,7 +14,7 @@ FourIsland_PokemonDayCare_EventScript_171940:: @ 8171940 goto_if 1, EventScript_171A52 compare_var_to_value VAR_RESULT, 3 goto_if 1, EventScript_171B86 - msgbox gUnknown_81BF7E4, 5 + msgbox gUnknown_81BF7E4, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_171993 msgbox gUnknown_81BF916 @@ -53,7 +53,7 @@ EventScript_1719F7:: @ 81719F7 end EventScript_171A01:: @ 8171A01 - msgbox gUnknown_81BF89F, 5 + msgbox gUnknown_81BF89F, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_171993 goto EventScript_1719F7 @@ -88,10 +88,10 @@ EventScript_171A52:: @ 8171A52 msgbox gUnknown_81BF988 setvar VAR_0x8004, 0 call EventScript_171A41 - msgbox gUnknown_81BF89F, 5 + msgbox gUnknown_81BF89F, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_171993 - msgbox gUnknown_81BFAE8, 5 + msgbox gUnknown_81BFAE8, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_171A90 goto EventScript_1719F7 @@ -115,7 +115,7 @@ EventScript_171A90:: @ 8171A90 EventScript_171ACF:: @ 8171ACF special GetDaycareCost - msgbox gUnknown_81BFA3B, 5 + msgbox gUnknown_81BFA3B, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_171AEB goto EventScript_1719F7 @@ -149,7 +149,7 @@ EventScript_171B05:: @ 8171B05 end EventScript_171B4E:: @ 8171B4E - msgbox gUnknown_81BF94F, 5 + msgbox gUnknown_81BF94F, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_171A90 goto EventScript_1719F7 @@ -191,7 +191,7 @@ EventScript_171B86:: @ 8171B86 call EventScript_171A41 setvar VAR_0x8004, 1 call EventScript_171A41 - msgbox gUnknown_81BFAE8, 5 + msgbox gUnknown_81BFAE8, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_171A90 msgbox gUnknown_81BF976 diff --git a/data/maps/FuchsiaCity_Building1/scripts.inc b/data/maps/FuchsiaCity_Building1/scripts.inc index b40aa2620..6092301c9 100644 --- a/data/maps/FuchsiaCity_Building1/scripts.inc +++ b/data/maps/FuchsiaCity_Building1/scripts.inc @@ -8,7 +8,7 @@ FuchsiaCity_Building1_EventScript_16D74C:: @ 816D74C goto_if 1, EventScript_16D7FA checkflag FLAG_0x189 goto_if 1, EventScript_16D780 - msgbox gUnknown_8198DF9, 5 + msgbox gUnknown_8198DF9, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 call_if 1, EventScript_16D7E8 compare_var_to_value VAR_RESULT, 0 diff --git a/data/maps/FuchsiaCity_House2/scripts.inc b/data/maps/FuchsiaCity_House2/scripts.inc index 3fff1a500..ac6e74297 100644 --- a/data/maps/FuchsiaCity_House2/scripts.inc +++ b/data/maps/FuchsiaCity_House2/scripts.inc @@ -6,7 +6,7 @@ FuchsiaCity_House2_EventScript_16D817:: @ 816D817 faceplayer checkflag FLAG_0x244 goto_if 1, EventScript_16D83F - msgbox gUnknown_819918E, 5 + msgbox gUnknown_819918E, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_16D849 msgbox gUnknown_8199337 diff --git a/data/maps/FuchsiaCity_House3/scripts.inc b/data/maps/FuchsiaCity_House3/scripts.inc index 0fafd5bd0..500a45ac8 100644 --- a/data/maps/FuchsiaCity_House3/scripts.inc +++ b/data/maps/FuchsiaCity_House3/scripts.inc @@ -4,7 +4,7 @@ FuchsiaCity_House3_MapScripts:: @ 816D894 FuchsiaCity_House3_EventScript_16D895:: @ 816D895 lock faceplayer - msgbox gUnknown_81993B9, 5 + msgbox gUnknown_81993B9, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_16D8B0 goto EventScript_16D941 @@ -29,7 +29,7 @@ EventScript_16D8B0:: @ 816D8B0 compare_var_to_value VAR_0x8005, 4 goto_if 1, EventScript_16D8B0 special ScrSpecial_GetPokemonNicknameAndMoveName - msgbox gUnknown_8199485, 5 + msgbox gUnknown_8199485, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_16D919 goto EventScript_16D941 diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc index 1f721cc96..08267468a 100644 --- a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc +++ b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc @@ -37,7 +37,7 @@ EventScript_16D2F2:: @ 816D2F2 EventScript_16D312:: @ 816D312 lockall textcolor 0 - msgbox gUnknown_8197E1A, 5 + msgbox gUnknown_8197E1A, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16D345 msgbox gUnknown_8197E48 @@ -101,7 +101,7 @@ EventScript_16D391:: @ 816D391 applymovement 255, Movement_1A75EB waitmovement 0 showmoneybox 0, 0, 0 - msgbox gUnknown_8197C87, 5 + msgbox gUnknown_8197C87, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_16D3CA msgbox gUnknown_8197DE9 @@ -203,7 +203,7 @@ Movement_16D4B3:: @ 816D4B3 FuchsiaCity_SafariZone_Entrance_EventScript_16D4B7:: @ 816D4B7 lock faceplayer - msgbox gUnknown_8197EB0, 5 + msgbox gUnknown_8197EB0, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_16D4D6 msgbox gUnknown_819809E diff --git a/data/maps/LavenderTown/scripts.inc b/data/maps/LavenderTown/scripts.inc index c582a18ae..1329fe26b 100644 --- a/data/maps/LavenderTown/scripts.inc +++ b/data/maps/LavenderTown/scripts.inc @@ -11,7 +11,7 @@ LavenderTown_MapScript1_166871:: @ 8166871 LavenderTown_EventScript_16687D:: @ 816687D lock faceplayer - msgbox gUnknown_817F52E, 5 + msgbox gUnknown_817F52E, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_16689C msgbox gUnknown_817F568 diff --git a/data/maps/LavenderTown_House2/scripts.inc b/data/maps/LavenderTown_House2/scripts.inc index 9074d2612..9d293b3a3 100644 --- a/data/maps/LavenderTown_House2/scripts.inc +++ b/data/maps/LavenderTown_House2/scripts.inc @@ -4,7 +4,7 @@ LavenderTown_House2_MapScripts:: @ 816B265 LavenderTown_House2_EventScript_16B266:: @ 816B266 lock faceplayer - msgbox gUnknown_8193A4B, 5 + msgbox gUnknown_8193A4B, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_16B287 compare_var_to_value VAR_RESULT, 0 @@ -38,7 +38,7 @@ EventScript_16B2B4:: @ 816B2B4 special TV_CopyNicknameToStringVar1AndEnsureTerminated compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_16B311 - msgbox gUnknown_8193AD2, 5 + msgbox gUnknown_8193AD2, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_16B31B compare_var_to_value VAR_RESULT, 0 diff --git a/data/maps/MtMoon_B2F/scripts.inc b/data/maps/MtMoon_B2F/scripts.inc index 8c5e073f5..71c14d647 100644 --- a/data/maps/MtMoon_B2F/scripts.inc +++ b/data/maps/MtMoon_B2F/scripts.inc @@ -56,7 +56,7 @@ EventScript_160711:: @ 8160711 MtMoon_B2F_EventScript_16071B:: @ 816071B lock faceplayer - msgbox gUnknown_8172E77, 5 + msgbox gUnknown_8172E77, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_1607DE removeobject 1 @@ -89,7 +89,7 @@ Movement_16077A:: @ 816077A MtMoon_B2F_EventScript_16077F:: @ 816077F lock faceplayer - msgbox gUnknown_8172E94, 5 + msgbox gUnknown_8172E94, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_1607DE removeobject 2 diff --git a/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc b/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc index 0ef1ce25c..cf597a732 100644 --- a/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc +++ b/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc @@ -33,9 +33,7 @@ OneIsland_KindleRoad_EmberSpa_EventScript_165399:: @ 8165399 checkflag FLAG_0x2EF goto_if 1, EventScript_1653C5 msgbox gUnknown_817D622 - setorcopyvar VAR_0x8000, 344 - setorcopyvar VAR_0x8001, 1 - callstd 0 + giveitem ITEM_HM06 setflag FLAG_0x2EF msgbox gUnknown_817D6F3 release diff --git a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc index d34f6c7c4..15bfb7e4d 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc @@ -329,14 +329,14 @@ EventScript_171044:: @ 8171044 delay 30 applymovement 3, Movement_1A75E1 waitmovement 0 - msgbox gUnknown_81A19AA, 5 + msgbox gUnknown_81A19AA, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_171099 goto EventScript_1710B2 end EventScript_171099:: @ 8171099 - msgbox gUnknown_81A1A08, 5 + msgbox gUnknown_81A1A08, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_171099 goto EventScript_1710B2 diff --git a/data/maps/PalletTown_GarysHouse/scripts.inc b/data/maps/PalletTown_GarysHouse/scripts.inc index fc6e0fac6..fdfd8dee8 100644 --- a/data/maps/PalletTown_GarysHouse/scripts.inc +++ b/data/maps/PalletTown_GarysHouse/scripts.inc @@ -53,7 +53,7 @@ EventScript_168DB9:: @ 8168DB9 special sub_8112364 compare_var_to_value VAR_MIRAGE_RND_L, 500 goto_if 0, EventScript_168E46 - msgbox gUnknown_818D7D3, 5 + msgbox gUnknown_818D7D3, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_168E3C msgbox gUnknown_818D8B2 diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc index f147fd390..e095287b8 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc +++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc @@ -1172,7 +1172,7 @@ EventScript_169BE1:: @ 8169BE1 end EventScript_169C14:: @ 8169C14 - msgbox gUnknown_818E272, 5 + msgbox gUnknown_818E272, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_169C74 compare_var_to_value VAR_RESULT, 0 @@ -1180,7 +1180,7 @@ EventScript_169C14:: @ 8169C14 end EventScript_169C33:: @ 8169C33 - msgbox gUnknown_818E207, 5 + msgbox gUnknown_818E207, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_169C74 compare_var_to_value VAR_RESULT, 0 @@ -1188,7 +1188,7 @@ EventScript_169C33:: @ 8169C33 end EventScript_169C52:: @ 8169C52 - msgbox gUnknown_818E194, 5 + msgbox gUnknown_818E194, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_169C74 compare_var_to_value VAR_RESULT, 0 @@ -1214,7 +1214,7 @@ EventScript_169C74:: @ 8169C74 waitmessage playfanfare BGM_FRLG_ME_KEYITEM waitfanfare - msgbox gUnknown_81A56A7, 5 + msgbox gUnknown_81A56A7, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_169CCC compare_var_to_value VAR_RESULT, 0 diff --git a/data/maps/PewterCity/scripts.inc b/data/maps/PewterCity/scripts.inc index bdd501867..9c8e7bb8e 100644 --- a/data/maps/PewterCity/scripts.inc +++ b/data/maps/PewterCity/scripts.inc @@ -1031,7 +1031,7 @@ PewterCity_EventScript_166075:: @ 8166075 PewterCity_EventScript_16607E:: @ 816607E lock faceplayer - msgbox gUnknown_817E53E, 5 + msgbox gUnknown_817E53E, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_166136 msgbox gUnknown_817E589 @@ -1352,7 +1352,7 @@ PewterCity_EventScript_16622B:: @ 816622B PewterCity_EventScript_166244:: @ 8166244 lock faceplayer - msgbox gUnknown_817E602, 5 + msgbox gUnknown_817E602, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_166263 msgbox gUnknown_817E644 diff --git a/data/maps/PewterCity_Gym/scripts.inc b/data/maps/PewterCity_Gym/scripts.inc index 730363a53..af2f707b3 100644 --- a/data/maps/PewterCity_Gym/scripts.inc +++ b/data/maps/PewterCity_Gym/scripts.inc @@ -53,7 +53,7 @@ PewterCity_Gym_EventScript_16A655:: @ 816A655 faceplayer checkflag FLAG_0x4B0 goto_if 1, EventScript_16A67F - msgbox gUnknown_8191298, 5 + msgbox gUnknown_8191298, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_16A689 compare_var_to_value VAR_RESULT, 0 diff --git a/data/maps/PewterCity_Museum_1F/scripts.inc b/data/maps/PewterCity_Museum_1F/scripts.inc index ff718e206..f5f8d5887 100644 --- a/data/maps/PewterCity_Museum_1F/scripts.inc +++ b/data/maps/PewterCity_Museum_1F/scripts.inc @@ -15,7 +15,7 @@ PewterCity_Museum_1F_EventScript_16A31B:: @ 816A31B end EventScript_16A348:: @ 816A348 - msgbox gUnknown_8190550, 5 + msgbox gUnknown_8190550, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_16A367 compare_var_to_value VAR_RESULT, 0 @@ -63,7 +63,7 @@ PewterCity_Museum_1F_EventScript_16A3BB:: @ 816A3BB EventScript_16A3D1:: @ 816A3D1 textcolor 0 showmoneybox 0, 0, 0 - msgbox gUnknown_81904B5, 5 + msgbox gUnknown_81904B5, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_16A402 msgbox gUnknown_81904F9 diff --git a/data/maps/RocketHideout_B4F/scripts.inc b/data/maps/RocketHideout_B4F/scripts.inc index c382cb9b8..d492212dd 100644 --- a/data/maps/RocketHideout_B4F/scripts.inc +++ b/data/maps/RocketHideout_B4F/scripts.inc @@ -45,9 +45,7 @@ RocketHideout_B4F_EventScript_161363:: @ 8161363 lock faceplayer removeobject 2 - setorcopyvar VAR_0x8000, 359 - setorcopyvar VAR_0x8001, 1 - callstd 0 + giveitem ITEM_SILPH_SCOPE compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_1A6BF9 release @@ -71,9 +69,7 @@ RocketHideout_B4F_EventScript_1613AD:: @ 81613AD faceplayer setflag FLAG_0x2A5 removeobject 4 - setorcopyvar VAR_0x8000, 356 - setorcopyvar VAR_0x8001, 1 - callstd 0 + giveitem ITEM_LIFT_KEY compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_1A6BF9 release diff --git a/data/maps/Route10_PokemonCenter_1F/scripts.inc b/data/maps/Route10_PokemonCenter_1F/scripts.inc index eccf94ec5..819902f19 100644 --- a/data/maps/Route10_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route10_PokemonCenter_1F/scripts.inc @@ -33,7 +33,7 @@ Route10_PokemonCenter_1F_EventScript_16FC65:: @ 816FC65 call EventScript_16FCF1 checkflag FLAG_0x2FA goto_if 1, EventScript_16FCE7 - msgbox gUnknown_819E5FB, 5 + msgbox gUnknown_819E5FB, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_1A7AD1 setvar VAR_0x8004, 0 diff --git a/data/maps/Route11_EastEntrance_2F/scripts.inc b/data/maps/Route11_EastEntrance_2F/scripts.inc index 459c6dc84..f2d8e7f26 100644 --- a/data/maps/Route11_EastEntrance_2F/scripts.inc +++ b/data/maps/Route11_EastEntrance_2F/scripts.inc @@ -25,7 +25,7 @@ Route11_EastEntrance_2F_EventScript_16FD5C:: @ 816FD5C call EventScript_1A8CAD checkflag FLAG_0x251 goto_if 1, EventScript_16FDCE - msgbox gUnknown_81A597B, 5 + msgbox gUnknown_81A597B, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16FDB6 call EventScript_1A8CBD @@ -62,7 +62,7 @@ Route11_EastEntrance_2F_EventScript_16FDD8:: @ 816FDD8 call EventScript_16FE64 checkflag FLAG_0x252 goto_if 1, EventScript_16FE5A - msgbox gUnknown_819E9E5, 5 + msgbox gUnknown_819E9E5, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_1A7AD1 setvar VAR_0x8004, 0 diff --git a/data/maps/Route12/scripts.inc b/data/maps/Route12/scripts.inc index 89be5b2df..64fb7b75f 100644 --- a/data/maps/Route12/scripts.inc +++ b/data/maps/Route12/scripts.inc @@ -20,7 +20,7 @@ Route12_EventScript_168014:: @ 8168014 compare_var_to_value VAR_RESULT, 2 goto_if 1, EventScript_1A7AE0 special sub_8112364 - msgbox gUnknown_81853CC, 5 + msgbox gUnknown_81853CC, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16808D call EventScript_1A924B diff --git a/data/maps/Route12_FishingHouse/scripts.inc b/data/maps/Route12_FishingHouse/scripts.inc index d7738d383..a01c88061 100644 --- a/data/maps/Route12_FishingHouse/scripts.inc +++ b/data/maps/Route12_FishingHouse/scripts.inc @@ -6,7 +6,7 @@ Route12_FishingHouse_EventScript_16FF0C:: @ 816FF0C faceplayer checkflag FLAG_0x255 goto_if 1, EventScript_16FF7F - msgbox gUnknown_819EFE0, 5 + msgbox gUnknown_819EFE0, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_16FF34 msgbox gUnknown_819F1FA @@ -89,9 +89,7 @@ EventScript_17001E:: @ 817001E EventScript_170031:: @ 8170031 setflag FLAG_0x29C msgbox gUnknown_819F31B - setorcopyvar VAR_0x8000, 6 - setorcopyvar VAR_0x8001, 1 - callstd 0 + giveitem ITEM_NET_BALL compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_17005D msgbox gUnknown_819F395 diff --git a/data/maps/Route15_WestEntrance_2F/scripts.inc b/data/maps/Route15_WestEntrance_2F/scripts.inc index 293349f28..4bab5d4ea 100644 --- a/data/maps/Route15_WestEntrance_2F/scripts.inc +++ b/data/maps/Route15_WestEntrance_2F/scripts.inc @@ -23,7 +23,7 @@ Route15_WestEntrance_2F_EventScript_1700B9:: @ 81700B9 call EventScript_170145 checkflag FLAG_0x256 goto_if 1, EventScript_17013B - msgbox gUnknown_819F5AB, 5 + msgbox gUnknown_819F5AB, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_1A7AD1 setvar VAR_0x8004, 0 diff --git a/data/maps/Route16/scripts.inc b/data/maps/Route16/scripts.inc index 42d8089fa..dba835410 100644 --- a/data/maps/Route16/scripts.inc +++ b/data/maps/Route16/scripts.inc @@ -39,7 +39,7 @@ Route16_EventScript_168121:: @ 8168121 compare_var_to_value VAR_RESULT, 2 goto_if 1, EventScript_1A7AE0 special sub_8112364 - msgbox gUnknown_81853CC, 5 + msgbox gUnknown_81853CC, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_168197 call EventScript_1A924B diff --git a/data/maps/Route16_NorthEntrance_2F/scripts.inc b/data/maps/Route16_NorthEntrance_2F/scripts.inc index 02d12c228..676358b5f 100644 --- a/data/maps/Route16_NorthEntrance_2F/scripts.inc +++ b/data/maps/Route16_NorthEntrance_2F/scripts.inc @@ -23,7 +23,7 @@ Route16_NorthEntrance_2F_EventScript_1702E3:: @ 81702E3 call EventScript_17036F checkflag FLAG_0x2FD goto_if 1, EventScript_170365 - msgbox gUnknown_819FB0E, 5 + msgbox gUnknown_819FB0E, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_1A7AD1 setvar VAR_0x8004, 0 diff --git a/data/maps/Route18_EastEntrance_2F/scripts.inc b/data/maps/Route18_EastEntrance_2F/scripts.inc index 5d15da418..6b516576c 100644 --- a/data/maps/Route18_EastEntrance_2F/scripts.inc +++ b/data/maps/Route18_EastEntrance_2F/scripts.inc @@ -16,7 +16,7 @@ Route18_EastEntrance_2F_EventScript_17047E:: @ 817047E call EventScript_1A8CAD checkflag FLAG_0x257 goto_if 1, EventScript_1704F0 - msgbox gUnknown_81A597B, 5 + msgbox gUnknown_81A597B, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_1704D8 call EventScript_1A8CBD diff --git a/data/maps/Route25_SeaCottage/scripts.inc b/data/maps/Route25_SeaCottage/scripts.inc index 791fa829a..cffcdfd84 100644 --- a/data/maps/Route25_SeaCottage/scripts.inc +++ b/data/maps/Route25_SeaCottage/scripts.inc @@ -35,12 +35,12 @@ Route25_SeaCottage_EventScript_17054B:: @ 817054B end EventScript_170580:: @ 8170580 - msgbox gUnknown_819FDFA, 5 + msgbox gUnknown_819FDFA, MSGBOX_YESNO goto EventScript_17059C end EventScript_17058E:: @ 817058E - msgbox gUnknown_819FEE6, 5 + msgbox gUnknown_819FEE6, MSGBOX_YESNO goto EventScript_17059C end diff --git a/data/maps/Route2_EastBuilding/scripts.inc b/data/maps/Route2_EastBuilding/scripts.inc index 37bb5121c..21b6f9193 100644 --- a/data/maps/Route2_EastBuilding/scripts.inc +++ b/data/maps/Route2_EastBuilding/scripts.inc @@ -7,7 +7,7 @@ Route2_EastBuilding_EventScript_16F67F:: @ 816F67F call EventScript_16F70B checkflag FLAG_0x23B goto_if 1, EventScript_16F701 - msgbox gUnknown_819D64F, 5 + msgbox gUnknown_819D64F, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_1A7AD1 setvar VAR_0x8004, 0 diff --git a/data/maps/Route2_House/scripts.inc b/data/maps/Route2_House/scripts.inc index 00b0c27eb..8d064c68c 100644 --- a/data/maps/Route2_House/scripts.inc +++ b/data/maps/Route2_House/scripts.inc @@ -12,7 +12,7 @@ Route2_House_EventScript_16F602:: @ 816F602 call EventScript_1A8CAD checkflag FLAG_0x248 goto_if 1, EventScript_16F674 - msgbox gUnknown_81A597B, 5 + msgbox gUnknown_81A597B, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16F65C call EventScript_1A8CBD diff --git a/data/maps/Route4_PokemonCenter_1F/scripts.inc b/data/maps/Route4_PokemonCenter_1F/scripts.inc index fb10bc0da..d2d305823 100644 --- a/data/maps/Route4_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route4_PokemonCenter_1F/scripts.inc @@ -32,12 +32,12 @@ Route4_PokemonCenter_1F_EventScript_16F75F:: @ 816F75F end EventScript_16F786:: @ 816F786 - msgbox gUnknown_819DA9A, 5 + msgbox gUnknown_819DA9A, MSGBOX_YESNO goto EventScript_16F7A2 end EventScript_16F794:: @ 816F794 - msgbox gUnknown_819DB34, 5 + msgbox gUnknown_819DB34, MSGBOX_YESNO goto EventScript_16F7A2 end @@ -60,7 +60,7 @@ EventScript_16F7A2:: @ 816F7A2 EventScript_16F7F6:: @ 816F7F6 call EventScript_16F86F - msgbox gUnknown_81A56A7, 5 + msgbox gUnknown_81A56A7, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16F861 call EventScript_1A8C27 @@ -75,7 +75,7 @@ EventScript_16F7F6:: @ 816F7F6 EventScript_16F822:: @ 816F822 call EventScript_16F86F - msgbox gUnknown_81A56A7, 5 + msgbox gUnknown_81A56A7, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16F84B fadescreen 1 diff --git a/data/maps/SSAnne_1F_Room6/scripts.inc b/data/maps/SSAnne_1F_Room6/scripts.inc index a07797706..ac794e8c2 100644 --- a/data/maps/SSAnne_1F_Room6/scripts.inc +++ b/data/maps/SSAnne_1F_Room6/scripts.inc @@ -4,7 +4,7 @@ SSAnne_1F_Room6_MapScripts:: @ 8160DF2 SSAnne_1F_Room6_EventScript_160DF3:: @ 8160DF3 lock faceplayer - msgbox gUnknown_817445B, 5 + msgbox gUnknown_817445B, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_160E18 closemessage diff --git a/data/maps/SaffronCity_Dojo/scripts.inc b/data/maps/SaffronCity_Dojo/scripts.inc index 98a87ccd0..120dcbb77 100644 --- a/data/maps/SaffronCity_Dojo/scripts.inc +++ b/data/maps/SaffronCity_Dojo/scripts.inc @@ -27,7 +27,7 @@ SaffronCity_Dojo_EventScript_16EC00:: @ 816EC00 applymovement 5, Movement_1A75E9 waitmovement 0 textcolor 0 - msgbox gUnknown_819B44E, 5 + msgbox gUnknown_819B44E, MSGBOX_YESNO call EventScript_1A6675 compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_16EC82 @@ -50,7 +50,7 @@ SaffronCity_Dojo_EventScript_16EC46:: @ 816EC46 applymovement 5, Movement_1A75E9 waitmovement 0 textcolor 0 - msgbox gUnknown_819B49E, 5 + msgbox gUnknown_819B49E, MSGBOX_YESNO call EventScript_1A6675 compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_16EC82 @@ -78,7 +78,7 @@ EventScript_16ECB5:: @ 816ECB5 waitmessage waitfanfare setflag FLAG_0x278 - msgbox gUnknown_81A56A7, 5 + msgbox gUnknown_81A56A7, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16ED29 call EventScript_1A8C27 @@ -94,7 +94,7 @@ EventScript_16ECEC:: @ 816ECEC waitmessage waitfanfare setflag FLAG_0x278 - msgbox gUnknown_81A56A7, 5 + msgbox gUnknown_81A56A7, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16ED1E call EventScript_1A8C33 diff --git a/data/maps/SevenIsland_House_Room1/scripts.inc b/data/maps/SevenIsland_House_Room1/scripts.inc index e29885a47..d9f6f8526 100644 --- a/data/maps/SevenIsland_House_Room1/scripts.inc +++ b/data/maps/SevenIsland_House_Room1/scripts.inc @@ -91,13 +91,13 @@ EventScript_17097D:: @ 817097D EventScript_170987:: @ 8170987 special SavePlayerParty special sub_80CAAAC - msgbox gUnknown_81A0598, 5 + msgbox gUnknown_81A0598, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_170A11 call EventScript_170A1E compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_170A11 - msgbox gUnknown_81A0788, 5 + msgbox gUnknown_81A0788, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_170A11 special LoadPlayerParty diff --git a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc index ee65196e9..fb408420a 100644 --- a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc +++ b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc @@ -14,7 +14,7 @@ SevenIsland_SevaultCanyon_House_EventScript_172183:: @ 8172183 waitmovement 0 msgbox gUnknown_81A4D72 textcolor 3 - msgbox gUnknown_81A4DAF, 5 + msgbox gUnknown_81A4DAF, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_172225 msgbox gUnknown_81A4DD8 diff --git a/data/maps/SilphCo_7F/scripts.inc b/data/maps/SilphCo_7F/scripts.inc index 687cbab3d..e302289a5 100644 --- a/data/maps/SilphCo_7F/scripts.inc +++ b/data/maps/SilphCo_7F/scripts.inc @@ -151,7 +151,7 @@ EventScript_161B12:: @ 8161B12 waitmessage waitfanfare getspeciesname 0, SPECIES_LAPRAS - msgbox gUnknown_81A56A7, 5 + msgbox gUnknown_81A56A7, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_161B7E call EventScript_1A8C27 @@ -168,7 +168,7 @@ EventScript_161B45:: @ 8161B45 waitmessage waitfanfare getspeciesname 0, SPECIES_LAPRAS - msgbox gUnknown_81A56A7, 5 + msgbox gUnknown_81A56A7, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_161B73 call EventScript_1A8C33 diff --git a/data/maps/SixIsland_RuinValley/scripts.inc b/data/maps/SixIsland_RuinValley/scripts.inc index 35bcd8f14..54e79c2b3 100644 --- a/data/maps/SixIsland_RuinValley/scripts.inc +++ b/data/maps/SixIsland_RuinValley/scripts.inc @@ -26,7 +26,7 @@ SixIsland_RuinValley_EventScript_168B94:: @ 8168B94 lockall checkflag FLAG_0x2E3 goto_if 1, EventScript_168BC1 - msgbox gUnknown_818BDC0, 5 + msgbox gUnknown_818BDC0, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_168BCB msgbox gUnknown_818BE11 diff --git a/data/maps/SixIsland_WaterPath_House1/scripts.inc b/data/maps/SixIsland_WaterPath_House1/scripts.inc index cba2d131a..b57183eac 100644 --- a/data/maps/SixIsland_WaterPath_House1/scripts.inc +++ b/data/maps/SixIsland_WaterPath_House1/scripts.inc @@ -62,9 +62,7 @@ EventScript_17210E:: @ 817210E EventScript_172121:: @ 8172121 setflag FLAG_0x2D9 msgbox gUnknown_81A4A88 - setorcopyvar VAR_0x8000, 8 - setorcopyvar VAR_0x8001, 1 - callstd 0 + giveitem ITEM_NEST_BALL compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_17214D msgbox gUnknown_81A4AD9 diff --git a/data/maps/ThreeIsland/scripts.inc b/data/maps/ThreeIsland/scripts.inc index 9e24c556d..2761c612f 100644 --- a/data/maps/ThreeIsland/scripts.inc +++ b/data/maps/ThreeIsland/scripts.inc @@ -222,7 +222,7 @@ EventScript_167A59:: @ 8167A59 applymovement 5, Movement_167C57 waitmovement 0 playbgm BGM_FRLG_BOY_EYE, 0 - msgbox gUnknown_81823ED, 5 + msgbox gUnknown_81823ED, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_167C35 msgbox gUnknown_818247D diff --git a/data/maps/ThreeIsland_BerryForest/scripts.inc b/data/maps/ThreeIsland_BerryForest/scripts.inc index 14dc9cf1a..dfaa7a9b9 100644 --- a/data/maps/ThreeIsland_BerryForest/scripts.inc +++ b/data/maps/ThreeIsland_BerryForest/scripts.inc @@ -29,9 +29,7 @@ ThreeIsland_BerryForest_EventScript_163C83:: @ 8163C83 applymovement 1, Movement_1A75E1 waitmovement 0 msgbox gUnknown_817AEE1 - setorcopyvar VAR_0x8000, 147 - setorcopyvar VAR_0x8001, 1 - callstd 0 + giveitem ITEM_IAPAPA_BERRY compare_var_to_value VAR_RESULT, 0 call_if 1, EventScript_163D19 special sub_80CA6DC diff --git a/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc b/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc index 75b9813fd..9885f9059 100644 --- a/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc +++ b/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc @@ -38,9 +38,7 @@ ThreeIsland_DunsparceTunnel_EventScript_164D60:: @ 8164D60 EventScript_164D90:: @ 8164D90 msgbox gUnknown_817D1C9 - setorcopyvar VAR_0x8000, 110 - setorcopyvar VAR_0x8001, 1 - callstd 0 + giveitem ITEM_NUGGET compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_164DB8 setflag FLAG_0x2E2 diff --git a/data/maps/TwoIsland_House/scripts.inc b/data/maps/TwoIsland_House/scripts.inc index b99b3e099..8829fc845 100644 --- a/data/maps/TwoIsland_House/scripts.inc +++ b/data/maps/TwoIsland_House/scripts.inc @@ -45,7 +45,7 @@ EventScript_171696:: @ 8171696 end EventScript_1716A5:: @ 81716A5 - msgbox gUnknown_81A2C63, 5 + msgbox gUnknown_81A2C63, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_17179E goto EventScript_1716BE diff --git a/data/maps/UndergroundPath_NorthEntrance/scripts.inc b/data/maps/UndergroundPath_NorthEntrance/scripts.inc index e3941e22b..00ab7bcf3 100644 --- a/data/maps/UndergroundPath_NorthEntrance/scripts.inc +++ b/data/maps/UndergroundPath_NorthEntrance/scripts.inc @@ -8,7 +8,7 @@ UndergroundPath_NorthEntrance_EventScript_160E39:: @ 8160E39 call EventScript_1A8CAD checkflag FLAG_0x24B goto_if 1, EventScript_160EAB - msgbox gUnknown_81A5AD6, 5 + msgbox gUnknown_81A5AD6, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_160E93 call EventScript_1A8CBD diff --git a/data/maps/VermilionCity_House1/scripts.inc b/data/maps/VermilionCity_House1/scripts.inc index 95f89ea38..4c595b48c 100644 --- a/data/maps/VermilionCity_House1/scripts.inc +++ b/data/maps/VermilionCity_House1/scripts.inc @@ -6,7 +6,7 @@ VermilionCity_House1_EventScript_16B3A7:: @ 816B3A7 faceplayer checkflag FLAG_0x240 goto_if 1, EventScript_16B3CF - msgbox gUnknown_8193EC1, 5 + msgbox gUnknown_8193EC1, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_16B3D9 msgbox gUnknown_8194028 diff --git a/data/maps/VermilionCity_PokemonFanClub/scripts.inc b/data/maps/VermilionCity_PokemonFanClub/scripts.inc index 2c750711d..f34d22d2b 100644 --- a/data/maps/VermilionCity_PokemonFanClub/scripts.inc +++ b/data/maps/VermilionCity_PokemonFanClub/scripts.inc @@ -6,7 +6,7 @@ VermilionCity_PokemonFanClub_EventScript_16B47F:: @ 816B47F faceplayer checkflag FLAG_0x241 goto_if 1, EventScript_16B4A7 - msgbox gUnknown_819457E, 5 + msgbox gUnknown_819457E, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_16B4B1 msgbox gUnknown_8194860 @@ -134,7 +134,7 @@ VermilionCity_House2_EventScript_16B5D7:: @ 816B5D7 call EventScript_1A8CAD checkflag FLAG_0x24D goto_if 1, EventScript_16B649 - msgbox gUnknown_81949CB, 5 + msgbox gUnknown_81949CB, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16B631 call EventScript_1A8CBD diff --git a/data/maps/ViridianCity/scripts.inc b/data/maps/ViridianCity/scripts.inc index 860f50a4a..b41c6b929 100644 --- a/data/maps/ViridianCity/scripts.inc +++ b/data/maps/ViridianCity/scripts.inc @@ -118,7 +118,7 @@ ViridianCity_EventScript_1659F6:: @ 81659F6 end EventScript_165A23:: @ 8165A23 - msgbox gUnknown_817E046, 5 + msgbox gUnknown_817E046, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_165A40 msgbox gUnknown_817E0EA @@ -165,7 +165,7 @@ EventScript_165A84:: @ 8165A84 ViridianCity_EventScript_165A8F:: @ 8165A8F lock faceplayer - msgbox gUnknown_817DB98, 5 + msgbox gUnknown_817DB98, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_165AB0 compare_var_to_value VAR_RESULT, 0 @@ -252,8 +252,6 @@ EventScript_165B4C:: @ 8165B4C faceplayer msgbox gUnknown_817DE9B setvar VAR_0x4051, 2 - setorcopyvar VAR_0x8000, 366 - setorcopyvar VAR_0x8001, 1 - callstd 0 + giveitem ITEM_TEACHY_TV msgbox gUnknown_817DEEB return diff --git a/data/maps/ViridianCity_House2/scripts.inc b/data/maps/ViridianCity_House2/scripts.inc index b6ebea215..65ea77a5e 100644 --- a/data/maps/ViridianCity_House2/scripts.inc +++ b/data/maps/ViridianCity_House2/scripts.inc @@ -24,15 +24,15 @@ ViridianCity_House2_EventScript_16A094:: @ 816A094 ViridianCity_House2_EventScript_16A0AB:: @ 816A0AB lockall msgbox gUnknown_818FC65 - msgbox gUnknown_818FF19, 5 + msgbox gUnknown_818FF19, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16A11B msgbox gUnknown_818FD23 - msgbox gUnknown_818FF19, 5 + msgbox gUnknown_818FF19, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16A11B msgbox gUnknown_818FDA8 - msgbox gUnknown_818FF19, 5 + msgbox gUnknown_818FF19, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16A11B msgbox gUnknown_818FE5C -- cgit v1.2.3 From 006881415d315e34876f4d4f3060aca4dcf8e98d Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 16 May 2019 10:40:51 -0400 Subject: Resolve most hardcoded values in map scripts --- data/maps/BirthIsland_Exterior/scripts.inc | 6 ++-- .../CeladonCity_Condominiums_RoofRoom/scripts.inc | 2 +- .../CeladonCity_DepartmentStore_Roof/scripts.inc | 40 ++++++++++----------- data/maps/CeladonCity_GameCorner/scripts.inc | 8 ++--- .../CeladonCity_GameCorner_PrizeRoom/scripts.inc | 42 +++++++++++----------- data/maps/CeruleanCave_B1F/scripts.inc | 2 +- data/maps/CeruleanCity_House3/scripts.inc | 2 +- data/maps/CeruleanCity_House5/scripts.inc | 22 ++++++------ .../scripts.inc | 2 +- .../CinnabarIsland_PokemonLab_Lounge/scripts.inc | 4 +-- data/maps/FourIsland_PokemonDayCare/scripts.inc | 4 +-- data/maps/FuchsiaCity/scripts.inc | 14 ++++---- data/maps/FuchsiaCity_House1/scripts.inc | 2 +- data/maps/LavenderTown_House2/scripts.inc | 2 +- data/maps/MtEmber_Summit/scripts.inc | 2 +- data/maps/NavelRock_Base/scripts.inc | 6 ++-- data/maps/NavelRock_Summit/scripts.inc | 6 ++-- data/maps/PalletTown_GarysHouse/scripts.inc | 2 +- data/maps/PalletTown_ProfessorOaksLab/scripts.inc | 2 +- data/maps/PewterCity_Museum_1F/scripts.inc | 6 ++-- data/maps/PokemonLeague_ChampionsRoom/scripts.inc | 2 +- data/maps/PowerPlant/scripts.inc | 2 +- data/maps/Route11_EastEntrance_2F/scripts.inc | 2 +- data/maps/Route12_FishingHouse/scripts.inc | 2 +- data/maps/Route15_WestEntrance_2F/scripts.inc | 2 +- data/maps/Route18_EastEntrance_2F/scripts.inc | 2 +- data/maps/Route25_SeaCottage/scripts.inc | 8 ++--- data/maps/Route2_House/scripts.inc | 2 +- data/maps/SSAnne_2F_Room1/scripts.inc | 2 +- data/maps/SaffronCity_Dojo/scripts.inc | 4 +-- data/maps/SeafoamIslands_B4F/scripts.inc | 2 +- .../SevenIsland_SevaultCanyon_House/scripts.inc | 4 +-- data/maps/SilphCo_7F/scripts.inc | 2 +- data/maps/SixIsland_WaterPath_House1/scripts.inc | 2 +- .../maps/UndergroundPath_NorthEntrance/scripts.inc | 2 +- data/maps/VermilionCity_PokemonFanClub/scripts.inc | 2 +- 36 files changed, 109 insertions(+), 109 deletions(-) (limited to 'data/maps') diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc index 5c5460119..df3327bf0 100644 --- a/data/maps/BirthIsland_Exterior/scripts.inc +++ b/data/maps/BirthIsland_Exterior/scripts.inc @@ -91,7 +91,7 @@ EventScript_1652C0:: @ 81652C0 delay 40 waitmoncry setvar VAR_LAST_TALKED, 2 - setvar VAR_0x8004, 410 + setvar VAR_0x8004, SPECIES_DEOXYS setvar VAR_0x8005, 30 setvar VAR_0x8006, 0 special sub_8044838 @@ -112,12 +112,12 @@ EventScript_1652C0:: @ 81652C0 EventScript_16533A:: @ 816533A setflag FLAG_0x2F7 - setvar VAR_0x8004, 410 + setvar VAR_0x8004, SPECIES_DEOXYS goto EventScript_1A9236 end EventScript_165348:: @ 8165348 - setvar VAR_0x8004, 410 + setvar VAR_0x8004, SPECIES_DEOXYS goto EventScript_1A9236 end diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc b/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc index f4ad8d3dc..70828062d 100644 --- a/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc @@ -8,7 +8,7 @@ CeladonCity_Condominiums_RoofRoom_EventScript_16C464:: @ 816C464 CeladonCity_Condominiums_RoofRoom_EventScript_16C46D:: @ 816C46D lock faceplayer - setvar VAR_0x4001, 133 + setvar VAR_0x4001, SPECIES_EEVEE givemon SPECIES_EEVEE, 25, ITEM_NONE, 0, 0, 0 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16C4A6 diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc index 1128bcd80..e1fd2ab23 100644 --- a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc @@ -152,8 +152,8 @@ EventScript_16BED7:: @ 816BED7 end EventScript_16BF19:: @ 816BF19 - setvar VAR_0x8008, 26 - setvar VAR_0x8009, 304 + setvar VAR_0x8008, ITEM_FRESH_WATER + setvar VAR_0x8009, ITEM_TM16 checkflag FLAG_0x296 goto_if 1, EventScript_16C018 msgbox gUnknown_8195D75 @@ -161,8 +161,8 @@ EventScript_16BF19:: @ 816BF19 end EventScript_16BF3A:: @ 816BF3A - setvar VAR_0x8008, 27 - setvar VAR_0x8009, 308 + setvar VAR_0x8008, ITEM_SODA_POP + setvar VAR_0x8009, ITEM_TM20 checkflag FLAG_0x295 goto_if 1, EventScript_16C018 msgbox gUnknown_8195E33 @@ -170,8 +170,8 @@ EventScript_16BF3A:: @ 816BF3A end EventScript_16BF5B:: @ 816BF5B - setvar VAR_0x8008, 28 - setvar VAR_0x8009, 321 + setvar VAR_0x8008, ITEM_LEMONADE + setvar VAR_0x8009, ITEM_TM33 checkflag FLAG_0x294 goto_if 1, EventScript_16C018 msgbox gUnknown_8195EBF @@ -179,13 +179,13 @@ EventScript_16BF5B:: @ 816BF5B end EventScript_16BF7C:: @ 816BF7C - getitemname 0, 32776 - getitemname 1, 32777 - removeitem 32776, 1 - checkitemspace 32777, 1 + getitemname 0, VAR_0x8008 + getitemname 1, VAR_0x8009 + removeitem VAR_0x8008, 1 + checkitemspace VAR_0x8009, 1 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16C002 - additem 32777, 1 + additem VAR_0x8009, 1 textcolor 3 playfanfare MUS_FANFA1 message Text_195DAD @@ -193,11 +193,11 @@ EventScript_16BF7C:: @ 816BF7C waitfanfare giveitem VAR_0x8009, 1, 8 call EventScript_1A6675 - compare_var_to_value VAR_0x8008, 26 + compare_var_to_value VAR_0x8008, ITEM_FRESH_WATER call_if 1, EventScript_16BFDE - compare_var_to_value VAR_0x8008, 27 + compare_var_to_value VAR_0x8008, ITEM_SODA_POP call_if 1, EventScript_16BFEA - compare_var_to_value VAR_0x8008, 28 + compare_var_to_value VAR_0x8008, ITEM_LEMONADE call_if 1, EventScript_16BFF6 release end @@ -267,19 +267,19 @@ EventScript_16C045:: @ 816C045 end EventScript_16C083:: @ 816C083 - setvar VAR_0x4000, 26 + setvar VAR_0x4000, ITEM_FRESH_WATER checkmoney 200, 0 goto EventScript_16C0CB end EventScript_16C094:: @ 816C094 - setvar VAR_0x4000, 27 + setvar VAR_0x4000, ITEM_SODA_POP checkmoney 300, 0 goto EventScript_16C0CB end EventScript_16C0A5:: @ 816C0A5 - setvar VAR_0x4000, 28 + setvar VAR_0x4000, ITEM_LEMONADE checkmoney 350, 0 goto EventScript_16C0CB end @@ -299,7 +299,7 @@ EventScript_16C0C4:: @ 816C0C4 EventScript_16C0CB:: @ 816C0CB compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16C131 - checkitemspace 16384, 1 + checkitemspace VAR_0x4000, 1 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16C13F compare_var_to_value VAR_0x4001, 0 @@ -309,10 +309,10 @@ EventScript_16C0CB:: @ 816C0CB compare_var_to_value VAR_0x4001, 2 call_if 1, EventScript_16C0C4 updatemoneybox 0, 0, 0 - getitemname 0, 16384 + getitemname 0, VAR_0x4000 playse SE_C_PASI msgbox gUnknown_8196076 - additem 16384, 1 + additem VAR_0x4000, 1 goto EventScript_16C125 end diff --git a/data/maps/CeladonCity_GameCorner/scripts.inc b/data/maps/CeladonCity_GameCorner/scripts.inc index 347c40273..b54ea1152 100644 --- a/data/maps/CeladonCity_GameCorner/scripts.inc +++ b/data/maps/CeladonCity_GameCorner/scripts.inc @@ -78,7 +78,7 @@ EventScript_16C734:: @ 816C734 EventScript_16C762:: @ 816C762 updatemoneybox 0, 0, 0 updatecoinsbox 0, 5 - playse 248 + playse SE_CASHIER msgbox gUnknown_8196A62 goto EventScript_16C77A end @@ -146,7 +146,7 @@ CeladonCity_GameCorner_EventScript_16C7E7:: @ 816C7E7 givecoins 10 textcolor 3 msgbox gUnknown_8196B0D - playse 248 + playse SE_CASHIER waitse setflag FLAG_0x26E goto EventScript_16C7CA @@ -210,7 +210,7 @@ CeladonCity_GameCorner_EventScript_16C89E:: @ 816C89E givecoins 20 textcolor 3 msgbox gUnknown_8196D47 - playse 248 + playse SE_CASHIER waitse setflag FLAG_0x26F goto EventScript_16C7CA @@ -240,7 +240,7 @@ CeladonCity_GameCorner_EventScript_16C8FE:: @ 816C8FE givecoins 20 textcolor 3 msgbox gUnknown_8196DF8 - playse 248 + playse SE_CASHIER waitse setflag FLAG_0x270 goto EventScript_16C7CA diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc index 925b4ad02..a6de8a7e3 100644 --- a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc +++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc @@ -49,31 +49,31 @@ EventScript_16CC10:: @ 816CC10 end EventScript_16CC15:: @ 816CC15 - setvar VAR_0x4001, 63 + setvar VAR_0x4001, SPECIES_ABRA setvar VAR_0x4002, 180 goto EventScript_16CC65 end EventScript_16CC25:: @ 816CC25 - setvar VAR_0x4001, 35 + setvar VAR_0x4001, SPECIES_CLEFAIRY setvar VAR_0x4002, 500 goto EventScript_16CC65 end EventScript_16CC35:: @ 816CC35 - setvar VAR_0x4001, 147 + setvar VAR_0x4001, SPECIES_DRATINI setvar VAR_0x4002, 2800 goto EventScript_16CC65 end EventScript_16CC45:: @ 816CC45 - setvar VAR_0x4001, 123 + setvar VAR_0x4001, SPECIES_SCYTHER setvar VAR_0x4002, 5500 goto EventScript_16CC65 end EventScript_16CC55:: @ 816CC55 - setvar VAR_0x4001, 137 + setvar VAR_0x4001, SPECIES_PORYGON setvar VAR_0x4002, 9999 goto EventScript_16CC65 end @@ -88,17 +88,17 @@ EventScript_16CC65:: @ 816CC65 goto_if 0, EventScript_16CDA5 textcolor 3 copyvar VAR_0x8000, VAR_0x4001 - compare_var_to_value VAR_0x8000, 63 + compare_var_to_value VAR_0x8000, SPECIES_ABRA goto_if 1, EventScript_16CCD4 - compare_var_to_value VAR_0x8000, 35 + compare_var_to_value VAR_0x8000, SPECIES_CLEFAIRY goto_if 1, EventScript_16CCE9 - compare_var_to_value VAR_0x8000, 147 + compare_var_to_value VAR_0x8000, SPECIES_DRATINI goto_if 1, EventScript_16CCFE - compare_var_to_value VAR_0x8000, 123 + compare_var_to_value VAR_0x8000, SPECIES_SCYTHER goto_if 1, EventScript_16CD13 - compare_var_to_value VAR_0x8000, 137 + compare_var_to_value VAR_0x8000, SPECIES_PORYGON goto_if 1, EventScript_16CD28 - compare_var_to_value VAR_0x8000, 127 + compare_var_to_value VAR_0x8000, SPECIES_PINSIR goto_if 1, EventScript_16CD3D end @@ -236,35 +236,35 @@ EventScript_16CE47:: @ 816CE47 end EventScript_16CEA5:: @ 816CEA5 - setvar VAR_0x4001, 301 + setvar VAR_0x4001, ITEM_TM13 setvar VAR_0x4002, 4000 getmovename 1, MOVE_ICE_BEAM goto EventScript_16CF09 end EventScript_16CEB9:: @ 816CEB9 - setvar VAR_0x4001, 311 + setvar VAR_0x4001, ITEM_TM23 setvar VAR_0x4002, 3500 getmovename 1, MOVE_IRON_TAIL goto EventScript_16CF09 end EventScript_16CECD:: @ 816CECD - setvar VAR_0x4001, 312 + setvar VAR_0x4001, ITEM_TM24 setvar VAR_0x4002, 4000 getmovename 1, MOVE_THUNDERBOLT goto EventScript_16CF09 end EventScript_16CEE1:: @ 816CEE1 - setvar VAR_0x4001, 318 + setvar VAR_0x4001, ITEM_TM30 setvar VAR_0x4002, 4500 getmovename 1, MOVE_SHADOW_BALL goto EventScript_16CF09 end EventScript_16CEF5:: @ 816CEF5 - setvar VAR_0x4001, 323 + setvar VAR_0x4001, ITEM_TM35 setvar VAR_0x4002, 4000 getmovename 1, MOVE_FLAMETHROWER goto EventScript_16CF09 @@ -341,31 +341,31 @@ EventScript_16CFB2:: @ 816CFB2 end EventScript_16D010:: @ 816D010 - setvar VAR_0x4001, 194 + setvar VAR_0x4001, ITEM_SMOKE_BALL setvar VAR_0x4002, 800 goto EventScript_16CF22 end EventScript_16D020:: @ 816D020 - setvar VAR_0x4001, 205 + setvar VAR_0x4001, ITEM_MIRACLE_SEED setvar VAR_0x4002, 1000 goto EventScript_16CF22 end EventScript_16D030:: @ 816D030 - setvar VAR_0x4001, 215 + setvar VAR_0x4001, ITEM_CHARCOAL setvar VAR_0x4002, 1000 goto EventScript_16CF22 end EventScript_16D040:: @ 816D040 - setvar VAR_0x4001, 209 + setvar VAR_0x4001, ITEM_MYSTIC_WATER setvar VAR_0x4002, 1000 goto EventScript_16CF22 end EventScript_16D050:: @ 816D050 - setvar VAR_0x4001, 40 + setvar VAR_0x4001, ITEM_YELLOW_FLUTE setvar VAR_0x4002, 1600 goto EventScript_16CF22 end diff --git a/data/maps/CeruleanCave_B1F/scripts.inc b/data/maps/CeruleanCave_B1F/scripts.inc index 5f80fe18f..c1dfa35ad 100644 --- a/data/maps/CeruleanCave_B1F/scripts.inc +++ b/data/maps/CeruleanCave_B1F/scripts.inc @@ -63,7 +63,7 @@ EventScript_162560:: @ 8162560 end EventScript_162561:: @ 8162561 - setvar VAR_0x8004, 150 + setvar VAR_0x8004, SPECIES_MEWTWO goto EventScript_1A9236 EventScript_16256B:: @ 816256B diff --git a/data/maps/CeruleanCity_House3/scripts.inc b/data/maps/CeruleanCity_House3/scripts.inc index f6caa2b92..db63cb3de 100644 --- a/data/maps/CeruleanCity_House3/scripts.inc +++ b/data/maps/CeruleanCity_House3/scripts.inc @@ -33,7 +33,7 @@ EventScript_16AA0B:: @ 816AA0B end EventScript_16AA15:: @ 816AA15 - getspeciesname 0, 32777 + getspeciesname 0, VAR_0x8009 msgbox gUnknown_81A5A6A release end diff --git a/data/maps/CeruleanCity_House5/scripts.inc b/data/maps/CeruleanCity_House5/scripts.inc index 8bf244f7d..3118924fb 100644 --- a/data/maps/CeruleanCity_House5/scripts.inc +++ b/data/maps/CeruleanCity_House5/scripts.inc @@ -73,77 +73,77 @@ EventScript_16AEC8:: @ 816AEC8 EventScript_16AF6C:: @ 816AF6C getitemname 0, ITEM_ENERGY_POWDER - setvar VAR_0x8008, 30 + setvar VAR_0x8008, ITEM_ENERGY_POWDER setvar VAR_0x8009, 50 goto EventScript_16B055 end EventScript_16AF80:: @ 816AF80 getitemname 0, ITEM_ENERGY_ROOT - setvar VAR_0x8008, 31 + setvar VAR_0x8008, ITEM_ENERGY_ROOT setvar VAR_0x8009, 80 goto EventScript_16B055 end EventScript_16AF94:: @ 816AF94 getitemname 0, ITEM_HEAL_POWDER - setvar VAR_0x8008, 32 + setvar VAR_0x8008, ITEM_HEAL_POWDER setvar VAR_0x8009, 50 goto EventScript_16B055 end EventScript_16AFA8:: @ 816AFA8 getitemname 0, ITEM_REVIVAL_HERB - setvar VAR_0x8008, 33 + setvar VAR_0x8008, ITEM_REVIVAL_HERB setvar VAR_0x8009, 300 goto EventScript_16B055 end EventScript_16AFBC:: @ 816AFBC getitemname 0, ITEM_PROTEIN - setvar VAR_0x8008, 64 + setvar VAR_0x8008, ITEM_PROTEIN setvar VAR_0x8009, 1000 goto EventScript_16B055 end EventScript_16AFD0:: @ 816AFD0 getitemname 0, ITEM_IRON - setvar VAR_0x8008, 65 + setvar VAR_0x8008, ITEM_IRON setvar VAR_0x8009, 1000 goto EventScript_16B055 end EventScript_16AFE4:: @ 816AFE4 getitemname 0, ITEM_CARBOS - setvar VAR_0x8008, 66 + setvar VAR_0x8008, ITEM_CARBOS setvar VAR_0x8009, 1000 goto EventScript_16B055 end EventScript_16AFF8:: @ 816AFF8 getitemname 0, ITEM_CALCIUM - setvar VAR_0x8008, 67 + setvar VAR_0x8008, ITEM_CALCIUM setvar VAR_0x8009, 1000 goto EventScript_16B055 end EventScript_16B00C:: @ 816B00C getitemname 0, ITEM_ZINC - setvar VAR_0x8008, 70 + setvar VAR_0x8008, ITEM_ZINC setvar VAR_0x8009, 1000 goto EventScript_16B055 end EventScript_16B020:: @ 816B020 getitemname 0, ITEM_HP_UP - setvar VAR_0x8008, 63 + setvar VAR_0x8008, ITEM_HP_UP setvar VAR_0x8009, 1000 goto EventScript_16B055 end EventScript_16B034:: @ 816B034 getitemname 0, ITEM_PP_UP - setvar VAR_0x8008, 69 + setvar VAR_0x8008, ITEM_PP_UP setvar VAR_0x8009, 3000 goto EventScript_16B055 end diff --git a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc index a615d299f..c9a2c5103 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc @@ -29,7 +29,7 @@ EventScript_16E45B:: @ 816E45B end EventScript_16E465:: @ 816E465 - getspeciesname 0, 32777 + getspeciesname 0, VAR_0x8009 msgbox gUnknown_81A59C6 release end diff --git a/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc index 9d6494e31..7959c6c4c 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc @@ -33,7 +33,7 @@ EventScript_16E31C:: @ 816E31C end EventScript_16E326:: @ 816E326 - getspeciesname 0, 32777 + getspeciesname 0, VAR_0x8009 msgbox gUnknown_81A5A6A release end @@ -81,7 +81,7 @@ EventScript_16E3BC:: @ 816E3BC end EventScript_16E3C6:: @ 816E3C6 - getspeciesname 0, 32777 + getspeciesname 0, VAR_0x8009 msgbox gUnknown_81A5B18 release end diff --git a/data/maps/FourIsland_PokemonDayCare/scripts.inc b/data/maps/FourIsland_PokemonDayCare/scripts.inc index a968b6b9a..6048c1502 100644 --- a/data/maps/FourIsland_PokemonDayCare/scripts.inc +++ b/data/maps/FourIsland_PokemonDayCare/scripts.inc @@ -36,7 +36,7 @@ EventScript_171993:: @ 8171993 goto_if 1, EventScript_171A24 specialvar VAR_0x8005, GetSelectedMonNickAndSpecies waitse - playmoncry 32773, 0 + playmoncry VAR_0x8005, 0 msgbox gUnknown_81BF860 waitmoncry special StoreSelectedPokemonInDaycare @@ -137,7 +137,7 @@ EventScript_171B05:: @ 8171B05 playse SE_T_KAMI2 msgbox gUnknown_81BFA67 waitse - playmoncry 32781, 0 + playmoncry VAR_RESULT, 0 textcolor 3 msgbox gUnknown_81BFA85 call EventScript_1A6675 diff --git a/data/maps/FuchsiaCity/scripts.inc b/data/maps/FuchsiaCity/scripts.inc index 5fd7aa5cc..8eaebe8e0 100644 --- a/data/maps/FuchsiaCity/scripts.inc +++ b/data/maps/FuchsiaCity/scripts.inc @@ -75,7 +75,7 @@ FuchsiaCity_EventScript_166E07:: @ 8166E07 FuchsiaCity_EventScript_166E1F:: @ 8166E1F lockall - setvar VAR_0x8004, 113 + setvar VAR_0x8004, SPECIES_CHANSEY special sub_80CBDCC drawmonpic SPECIES_CHANSEY, 10, 3 msgbox gUnknown_81807A9 @@ -85,7 +85,7 @@ FuchsiaCity_EventScript_166E1F:: @ 8166E1F FuchsiaCity_EventScript_166E38:: @ 8166E38 lockall - setvar VAR_0x8004, 100 + setvar VAR_0x8004, SPECIES_VOLTORB special sub_80CBDCC drawmonpic SPECIES_VOLTORB, 10, 3 msgbox gUnknown_81807D9 @@ -95,7 +95,7 @@ FuchsiaCity_EventScript_166E38:: @ 8166E38 FuchsiaCity_EventScript_166E51:: @ 8166E51 lockall - setvar VAR_0x8004, 115 + setvar VAR_0x8004, SPECIES_KANGASKHAN special sub_80CBDCC drawmonpic SPECIES_KANGASKHAN, 10, 3 msgbox gUnknown_8180806 @@ -105,7 +105,7 @@ FuchsiaCity_EventScript_166E51:: @ 8166E51 FuchsiaCity_EventScript_166E6A:: @ 8166E6A lockall - setvar VAR_0x8004, 79 + setvar VAR_0x8004, SPECIES_SLOWPOKE special sub_80CBDCC drawmonpic SPECIES_SLOWPOKE, 10, 3 msgbox gUnknown_8180859 @@ -115,7 +115,7 @@ FuchsiaCity_EventScript_166E6A:: @ 8166E6A FuchsiaCity_EventScript_166E83:: @ 8166E83 lockall - setvar VAR_0x8004, 131 + setvar VAR_0x8004, SPECIES_LAPRAS special sub_80CBDCC drawmonpic SPECIES_LAPRAS, 10, 3 msgbox gUnknown_8180887 @@ -127,7 +127,7 @@ FuchsiaCity_EventScript_166E9C:: @ 8166E9C lockall checkflag FLAG_0x272 goto_if 1, EventScript_166EBE - setvar VAR_0x8004, 140 + setvar VAR_0x8004, SPECIES_KABUTO special sub_80CBDCC drawmonpic SPECIES_KABUTO, 10, 3 msgbox gUnknown_81808FA @@ -136,7 +136,7 @@ FuchsiaCity_EventScript_166E9C:: @ 8166E9C end EventScript_166EBE:: @ 8166EBE - setvar VAR_0x8004, 138 + setvar VAR_0x8004, SPECIES_OMANYTE special sub_80CBDCC drawmonpic SPECIES_OMANYTE, 10, 3 msgbox gUnknown_81808AE diff --git a/data/maps/FuchsiaCity_House1/scripts.inc b/data/maps/FuchsiaCity_House1/scripts.inc index 04f996078..9ff2ecb93 100644 --- a/data/maps/FuchsiaCity_House1/scripts.inc +++ b/data/maps/FuchsiaCity_House1/scripts.inc @@ -8,7 +8,7 @@ FuchsiaCity_House1_EventScript_16D6C6:: @ 816D6C6 FuchsiaCity_House1_EventScript_16D6CF:: @ 816D6CF lock faceplayer - setvar VAR_0x8004, 13 + setvar VAR_0x8004, 13 @ FAMECHECKER_BILL setvar VAR_0x8005, 2 special SetFlavorTextFlagFromSpecialVars msgbox gUnknown_8198C1F diff --git a/data/maps/LavenderTown_House2/scripts.inc b/data/maps/LavenderTown_House2/scripts.inc index 9d293b3a3..bbced623f 100644 --- a/data/maps/LavenderTown_House2/scripts.inc +++ b/data/maps/LavenderTown_House2/scripts.inc @@ -28,7 +28,7 @@ EventScript_16B2AA:: @ 816B2AA EventScript_16B2B4:: @ 816B2B4 specialvar VAR_RESULT, sub_80CAD54 - compare_var_to_value VAR_RESULT, 412 + compare_var_to_value VAR_RESULT, SPECIES_EGG goto_if 1, EventScript_16B307 special TV_CopyNicknameToStringVar1AndEnsureTerminated special TV_CheckMonOTIDEqualsPlayerID diff --git a/data/maps/MtEmber_Summit/scripts.inc b/data/maps/MtEmber_Summit/scripts.inc index eae1f5d13..f877e3b9b 100644 --- a/data/maps/MtEmber_Summit/scripts.inc +++ b/data/maps/MtEmber_Summit/scripts.inc @@ -61,6 +61,6 @@ EventScript_163B96:: @ 8163B96 end EventScript_163B9F:: @ 8163B9F - setvar VAR_0x8004, 146 + setvar VAR_0x8004, SPECIES_MOLTRES goto EventScript_1A9236 end diff --git a/data/maps/NavelRock_Base/scripts.inc b/data/maps/NavelRock_Base/scripts.inc index 649451b13..d2126b0e9 100644 --- a/data/maps/NavelRock_Base/scripts.inc +++ b/data/maps/NavelRock_Base/scripts.inc @@ -60,7 +60,7 @@ NavelRock_Base_EventScript_165134:: @ 8165134 playmoncry SPECIES_LUGIA, 2 waitmoncry delay 20 - setvar VAR_0x8004, 249 + setvar VAR_0x8004, SPECIES_LUGIA setvar VAR_0x8005, 70 setvar VAR_0x8006, 0 special sub_8044838 @@ -81,11 +81,11 @@ NavelRock_Base_EventScript_165134:: @ 8165134 EventScript_1651D9:: @ 81651D9 setflag FLAG_0x2F5 - setvar VAR_0x8004, 249 + setvar VAR_0x8004, SPECIES_LUGIA goto EventScript_1A9236 end EventScript_1651E7:: @ 81651E7 - setvar VAR_0x8004, 249 + setvar VAR_0x8004, SPECIES_LUGIA goto EventScript_1A9236 end diff --git a/data/maps/NavelRock_Summit/scripts.inc b/data/maps/NavelRock_Summit/scripts.inc index 24fb2e0ce..f77fbf86d 100644 --- a/data/maps/NavelRock_Summit/scripts.inc +++ b/data/maps/NavelRock_Summit/scripts.inc @@ -64,7 +64,7 @@ NavelRock_Summit_EventScript_164FFB:: @ 8164FFB applymovement 1, Movement_1650D7 waitmovement 0 special RemoveScriptFieldObject - setvar VAR_0x8004, 250 + setvar VAR_0x8004, SPECIES_HO_OH setvar VAR_0x8005, 70 setvar VAR_0x8006, 0 special sub_8044838 @@ -86,12 +86,12 @@ NavelRock_Summit_EventScript_164FFB:: @ 8164FFB EventScript_1650B4:: @ 81650B4 setflag FLAG_0x2F6 - setvar VAR_0x8004, 250 + setvar VAR_0x8004, SPECIES_HO_OH goto EventScript_1A9236 end EventScript_1650C2:: @ 81650C2 - setvar VAR_0x8004, 250 + setvar VAR_0x8004, SPECIES_HO_OH goto EventScript_1A9236 end diff --git a/data/maps/PalletTown_GarysHouse/scripts.inc b/data/maps/PalletTown_GarysHouse/scripts.inc index fdfd8dee8..57f0d4e14 100644 --- a/data/maps/PalletTown_GarysHouse/scripts.inc +++ b/data/maps/PalletTown_GarysHouse/scripts.inc @@ -64,7 +64,7 @@ EventScript_168DB9:: @ 8168DB9 compare_var_to_value VAR_0x8004, 6 goto_if 4, EventScript_168E3C specialvar VAR_RESULT, sub_80CAD54 - compare_var_to_value VAR_RESULT, 412 + compare_var_to_value VAR_RESULT, SPECIES_EGG goto_if 1, EventScript_168E32 msgbox gUnknown_818D8CC closemessage diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc index e095287b8..9f0aba04c 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc +++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc @@ -1260,7 +1260,7 @@ EventScript_169D2F:: @ 8169D2F msgbox gUnknown_818DD34 removeobject VAR_0x4004 textcolor 3 - getspeciesname 0, 16387 + getspeciesname 0, VAR_0x4003 message Text_18DD52 waitmessage playfanfare BGM_FRLG_ME_KEYITEM diff --git a/data/maps/PewterCity_Museum_1F/scripts.inc b/data/maps/PewterCity_Museum_1F/scripts.inc index f5f8d5887..e2d6a7d5c 100644 --- a/data/maps/PewterCity_Museum_1F/scripts.inc +++ b/data/maps/PewterCity_Museum_1F/scripts.inc @@ -87,7 +87,7 @@ EventScript_16A402:: @ 816A402 call_if 1, EventScript_16A460 compare_var_to_value VAR_0x4001, 2 call_if 1, EventScript_16A46B - playse 248 + playse SE_CASHIER takemoney 50, 0 updatemoneybox 0, 0, 0 waitse @@ -187,7 +187,7 @@ PewterCity_Museum_1F_EventScript_16A509:: @ 816A509 PewterCity_Museum_1F_EventScript_16A512:: @ 816A512 lockall - setvar VAR_0x8004, 142 + setvar VAR_0x8004, SPECIES_AERODACTYL setvar VAR_0x8005, 10 setvar VAR_0x8006, 3 special sub_809D504 @@ -198,7 +198,7 @@ PewterCity_Museum_1F_EventScript_16A512:: @ 816A512 PewterCity_Museum_1F_EventScript_16A532:: @ 816A532 lockall - setvar VAR_0x8004, 141 + setvar VAR_0x8004, SPECIES_KABUTOPS setvar VAR_0x8005, 10 setvar VAR_0x8006, 3 special sub_809D504 diff --git a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc index 2290e33e4..e270f182d 100644 --- a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc +++ b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc @@ -88,7 +88,7 @@ EventScript_162B76:: @ 8162B76 waitmovement 0 delay 25 specialvar VAR_RESULT, ScrSpecial_GetStarter - getspeciesname 0, 32781 + getspeciesname 0, VAR_RESULT msgbox gUnknown_8178FCF applymovement 2, Movement_1A75EB applymovement 1, Movement_1A75E7 diff --git a/data/maps/PowerPlant/scripts.inc b/data/maps/PowerPlant/scripts.inc index 5567d8ec8..e05f9c473 100644 --- a/data/maps/PowerPlant/scripts.inc +++ b/data/maps/PowerPlant/scripts.inc @@ -74,7 +74,7 @@ EventScript_16381B:: @ 816381B end EventScript_163824:: @ 8163824 - setvar VAR_0x8004, 145 + setvar VAR_0x8004, SPECIES_ZAPDOS goto EventScript_1A9236 end diff --git a/data/maps/Route11_EastEntrance_2F/scripts.inc b/data/maps/Route11_EastEntrance_2F/scripts.inc index f2d8e7f26..892d16571 100644 --- a/data/maps/Route11_EastEntrance_2F/scripts.inc +++ b/data/maps/Route11_EastEntrance_2F/scripts.inc @@ -46,7 +46,7 @@ EventScript_16FDB6:: @ 816FDB6 end EventScript_16FDC0:: @ 816FDC0 - getspeciesname 0, 32777 + getspeciesname 0, VAR_0x8009 msgbox gUnknown_81A59C6 release end diff --git a/data/maps/Route12_FishingHouse/scripts.inc b/data/maps/Route12_FishingHouse/scripts.inc index a01c88061..e9fb651a2 100644 --- a/data/maps/Route12_FishingHouse/scripts.inc +++ b/data/maps/Route12_FishingHouse/scripts.inc @@ -35,7 +35,7 @@ EventScript_16FF7F:: @ 816FF7F compare_var_to_value VAR_RESULT, 2 goto_if 1, EventScript_1A7AE0 special sub_8112364 - setvar VAR_0x8004, 129 + setvar VAR_0x8004, SPECIES_MAGIKARP specialvar VAR_RESULT, sub_80CC48C compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_16FFF5 diff --git a/data/maps/Route15_WestEntrance_2F/scripts.inc b/data/maps/Route15_WestEntrance_2F/scripts.inc index 4bab5d4ea..d8aba36d2 100644 --- a/data/maps/Route15_WestEntrance_2F/scripts.inc +++ b/data/maps/Route15_WestEntrance_2F/scripts.inc @@ -8,7 +8,7 @@ Route15_WestEntrance_2F_EventScript_170093:: @ 8170093 delay 20 waitbuttonpress erasemonpic - setvar VAR_0x8004, 144 + setvar VAR_0x8004, SPECIES_ARTICUNO special sub_80CBDCC releaseall end diff --git a/data/maps/Route18_EastEntrance_2F/scripts.inc b/data/maps/Route18_EastEntrance_2F/scripts.inc index 6b516576c..801e54efd 100644 --- a/data/maps/Route18_EastEntrance_2F/scripts.inc +++ b/data/maps/Route18_EastEntrance_2F/scripts.inc @@ -37,7 +37,7 @@ EventScript_1704D8:: @ 81704D8 end EventScript_1704E2:: @ 81704E2 - getspeciesname 0, 32777 + getspeciesname 0, VAR_0x8009 msgbox gUnknown_81A59C6 release end diff --git a/data/maps/Route25_SeaCottage/scripts.inc b/data/maps/Route25_SeaCottage/scripts.inc index cffcdfd84..1da87da68 100644 --- a/data/maps/Route25_SeaCottage/scripts.inc +++ b/data/maps/Route25_SeaCottage/scripts.inc @@ -270,7 +270,7 @@ EventScript_17082B:: @ 817082B drawmonpic SPECIES_EEVEE, 10, 3 waitbuttonpress erasemonpic - setvar VAR_0x8004, 133 + setvar VAR_0x8004, SPECIES_EEVEE special sub_80CBDCC goto EventScript_1707D8 end @@ -279,7 +279,7 @@ EventScript_170840:: @ 8170840 drawmonpic SPECIES_FLAREON, 10, 3 waitbuttonpress erasemonpic - setvar VAR_0x8004, 136 + setvar VAR_0x8004, SPECIES_FLAREON special sub_80CBDCC goto EventScript_1707D8 end @@ -288,7 +288,7 @@ EventScript_170855:: @ 8170855 drawmonpic SPECIES_JOLTEON, 10, 3 waitbuttonpress erasemonpic - setvar VAR_0x8004, 135 + setvar VAR_0x8004, SPECIES_JOLTEON special sub_80CBDCC goto EventScript_1707D8 end @@ -297,7 +297,7 @@ EventScript_17086A:: @ 817086A drawmonpic SPECIES_VAPOREON, 10, 3 waitbuttonpress erasemonpic - setvar VAR_0x8004, 134 + setvar VAR_0x8004, SPECIES_VAPOREON special sub_80CBDCC goto EventScript_1707D8 end diff --git a/data/maps/Route2_House/scripts.inc b/data/maps/Route2_House/scripts.inc index 8d064c68c..0759d70de 100644 --- a/data/maps/Route2_House/scripts.inc +++ b/data/maps/Route2_House/scripts.inc @@ -33,7 +33,7 @@ EventScript_16F65C:: @ 816F65C end EventScript_16F666:: @ 816F666 - getspeciesname 0, 32777 + getspeciesname 0, VAR_0x8009 msgbox gUnknown_81A59C6 release end diff --git a/data/maps/SSAnne_2F_Room1/scripts.inc b/data/maps/SSAnne_2F_Room1/scripts.inc index e2257e22a..f3dc1f136 100644 --- a/data/maps/SSAnne_2F_Room1/scripts.inc +++ b/data/maps/SSAnne_2F_Room1/scripts.inc @@ -6,7 +6,7 @@ SSAnne_2F_Room1_EventScript_160C97:: @ 8160C97 faceplayer message Text_173CE3 waitmessage - setvar VAR_0x8004, 143 + setvar VAR_0x8004, SPECIES_SNORLAX special sub_80CBDCC drawmonpic SPECIES_SNORLAX, 10, 3 waitbuttonpress diff --git a/data/maps/SaffronCity_Dojo/scripts.inc b/data/maps/SaffronCity_Dojo/scripts.inc index 120dcbb77..8c7bbe61a 100644 --- a/data/maps/SaffronCity_Dojo/scripts.inc +++ b/data/maps/SaffronCity_Dojo/scripts.inc @@ -23,7 +23,7 @@ SaffronCity_Dojo_EventScript_16EC00:: @ 816EC00 checkflag FLAG_0x278 goto_if 1, EventScript_16EC3C drawmonpic SPECIES_HITMONLEE, 10, 3 - setvar VAR_0x4001, 106 + setvar VAR_0x4001, SPECIES_HITMONLEE applymovement 5, Movement_1A75E9 waitmovement 0 textcolor 0 @@ -46,7 +46,7 @@ SaffronCity_Dojo_EventScript_16EC46:: @ 816EC46 checkflag FLAG_0x278 goto_if 1, EventScript_16EC3C drawmonpic SPECIES_HITMONCHAN, 10, 3 - setvar VAR_0x4001, 107 + setvar VAR_0x4001, SPECIES_HITMONCHAN applymovement 5, Movement_1A75E9 waitmovement 0 textcolor 0 diff --git a/data/maps/SeafoamIslands_B4F/scripts.inc b/data/maps/SeafoamIslands_B4F/scripts.inc index 8c20a869d..ffea0c87f 100644 --- a/data/maps/SeafoamIslands_B4F/scripts.inc +++ b/data/maps/SeafoamIslands_B4F/scripts.inc @@ -201,7 +201,7 @@ EventScript_163217:: @ 8163217 end EventScript_163218:: @ 8163218 - setvar VAR_0x8004, 144 + setvar VAR_0x8004, SPECIES_ARTICUNO goto EventScript_1A9236 EventScript_163222:: @ 8163222 diff --git a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc index fb408420a..63a9297ef 100644 --- a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc +++ b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc @@ -5,7 +5,7 @@ SevenIsland_SevaultCanyon_House_EventScript_172183:: @ 8172183 lock checkflag FLAG_0x002 goto_if 1, EventScript_172211 - playbgm 267, 0 + playbgm BGM_FRLG_CHANSEY_DANCE, 0 applymovement 1, Movement_172231 waitmovement 0 fadedefaultbgm @@ -23,7 +23,7 @@ SevenIsland_SevaultCanyon_House_EventScript_172183:: @ 8172183 compare_var_to_value VAR_FACING, 1 call_if 5, EventScript_172206 delay 30 - playbgm 267, 0 + playbgm BGM_FRLG_CHANSEY_DANCE, 0 applymovement 255, Movement_172231 waitmovement 0 fadedefaultbgm diff --git a/data/maps/SilphCo_7F/scripts.inc b/data/maps/SilphCo_7F/scripts.inc index e302289a5..9620792fe 100644 --- a/data/maps/SilphCo_7F/scripts.inc +++ b/data/maps/SilphCo_7F/scripts.inc @@ -133,7 +133,7 @@ SilphCo_7F_EventScript_161AC8:: @ 8161AC8 checkflag FLAG_0x246 goto_if 1, EventScript_161B8D msgbox gUnknown_8176266 - setvar VAR_0x4001, 131 + setvar VAR_0x4001, SPECIES_LAPRAS givemon SPECIES_LAPRAS, 25, ITEM_NONE, 0, 0, 0 compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_161B12 diff --git a/data/maps/SixIsland_WaterPath_House1/scripts.inc b/data/maps/SixIsland_WaterPath_House1/scripts.inc index b57183eac..190cbd4ce 100644 --- a/data/maps/SixIsland_WaterPath_House1/scripts.inc +++ b/data/maps/SixIsland_WaterPath_House1/scripts.inc @@ -8,7 +8,7 @@ SixIsland_WaterPath_House1_EventScript_17206D:: @ 817206D compare_var_to_value VAR_RESULT, 2 goto_if 1, EventScript_1A7AE0 special sub_8112364 - setvar VAR_0x8004, 214 + setvar VAR_0x8004, SPECIES_HERACROSS specialvar VAR_RESULT, sub_80CC48C compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_1720E5 diff --git a/data/maps/UndergroundPath_NorthEntrance/scripts.inc b/data/maps/UndergroundPath_NorthEntrance/scripts.inc index 00ab7bcf3..93fedc7a8 100644 --- a/data/maps/UndergroundPath_NorthEntrance/scripts.inc +++ b/data/maps/UndergroundPath_NorthEntrance/scripts.inc @@ -29,7 +29,7 @@ EventScript_160E93:: @ 8160E93 end EventScript_160E9D:: @ 8160E9D - getspeciesname 0, 32777 + getspeciesname 0, VAR_0x8009 msgbox gUnknown_81A5B18 release end diff --git a/data/maps/VermilionCity_PokemonFanClub/scripts.inc b/data/maps/VermilionCity_PokemonFanClub/scripts.inc index f34d22d2b..c5e46b07a 100644 --- a/data/maps/VermilionCity_PokemonFanClub/scripts.inc +++ b/data/maps/VermilionCity_PokemonFanClub/scripts.inc @@ -155,7 +155,7 @@ EventScript_16B631:: @ 816B631 end EventScript_16B63B:: @ 816B63B - getspeciesname 0, 32777 + getspeciesname 0, VAR_0x8009 msgbox gUnknown_8194A0D release end -- cgit v1.2.3 From a2d1b854d678204929580b8d82e507f908261fc1 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 16 May 2019 13:30:03 -0400 Subject: goto_if_eq and switch/case in scripts --- data/maps/BirthIsland_Exterior/scripts.inc | 24 ++-- data/maps/BirthIsland_Harbor/scripts.inc | 22 ++-- data/maps/CeladonCity_Condominiums_1F/scripts.inc | 8 +- data/maps/CeladonCity_Condominiums_3F/scripts.inc | 4 +- .../CeladonCity_Condominiums_RoofRoom/scripts.inc | 44 +++---- .../CeladonCity_DepartmentStore_2F/scripts.inc | 4 +- .../CeladonCity_DepartmentStore_4F/scripts.inc | 2 +- .../CeladonCity_DepartmentStore_5F/scripts.inc | 4 +- .../scripts.inc | 50 +++---- .../CeladonCity_DepartmentStore_Roof/scripts.inc | 144 ++++++++------------- data/maps/CeladonCity_GameCorner/scripts.inc | 34 +++-- .../CeladonCity_GameCorner_PrizeRoom/scripts.inc | 113 ++++++---------- data/maps/CeladonCity_Gym/scripts.inc | 4 +- data/maps/CeladonCity_Restaurant/scripts.inc | 4 +- data/maps/CeruleanCave_B1F/scripts.inc | 8 +- data/maps/CeruleanCity/scripts.inc | 6 +- data/maps/CeruleanCity_BikeShop/scripts.inc | 17 +-- data/maps/CeruleanCity_Gym/scripts.inc | 6 +- data/maps/CeruleanCity_House1/scripts.inc | 64 ++++----- data/maps/CeruleanCity_House2/scripts.inc | 2 +- data/maps/CeruleanCity_House3/scripts.inc | 4 +- data/maps/CeruleanCity_House4/scripts.inc | 24 ++-- data/maps/CeruleanCity_House5/scripts.inc | 57 ++++---- data/maps/CeruleanCity_Mart/scripts.inc | 2 +- data/maps/CinnabarIsland/scripts.inc | 6 +- data/maps/CinnabarIsland_Gym/scripts.inc | 56 ++++---- data/maps/CinnabarIsland_Mart/scripts.inc | 2 +- .../CinnabarIsland_PokemonCenter_1F/scripts.inc | 2 +- .../scripts.inc | 125 ++++++++---------- .../CinnabarIsland_PokemonLab_Lounge/scripts.inc | 8 +- data/maps/FiveIsland_LostCave_Room10/scripts.inc | 2 +- data/maps/FiveIsland_Meadow/scripts.inc | 4 +- data/maps/FiveIsland_MemorialPillar/scripts.inc | 18 +-- .../FiveIsland_ResortGorgeous_House/scripts.inc | 10 +- data/maps/FiveIsland_RocketWarehouse/scripts.inc | 6 +- data/maps/FiveIsland_WaterLabyrinth/scripts.inc | 14 +- data/maps/FourIsland/scripts.inc | 14 +- data/maps/FourIsland_LoreleisHouse/scripts.inc | 4 +- data/maps/FourIsland_Mart/scripts.inc | 2 +- data/maps/FourIsland_PokemonDayCare/scripts.inc | 40 +++--- data/maps/FuchsiaCity/scripts.inc | 2 +- data/maps/FuchsiaCity_Building1/scripts.inc | 4 +- data/maps/FuchsiaCity_Gym/scripts.inc | 6 +- data/maps/FuchsiaCity_House2/scripts.inc | 6 +- data/maps/FuchsiaCity_House3/scripts.inc | 10 +- data/maps/FuchsiaCity_Mart/scripts.inc | 2 +- .../FuchsiaCity_SafariZone_Entrance/scripts.inc | 10 +- .../IndigoPlateau_PokemonCenter_1F/scripts.inc | 8 +- data/maps/LavenderTown/scripts.inc | 2 +- data/maps/LavenderTown_House1/scripts.inc | 2 +- data/maps/LavenderTown_House2/scripts.inc | 16 +-- data/maps/LavenderTown_Mart/scripts.inc | 2 +- .../LavenderTown_VolunteerPokemonHouse/scripts.inc | 6 +- data/maps/MtEmber_Exterior/scripts.inc | 12 +- data/maps/MtEmber_Summit/scripts.inc | 8 +- data/maps/MtMoon_B2F/scripts.inc | 8 +- data/maps/NavelRock_Base/scripts.inc | 10 +- data/maps/NavelRock_Summit/scripts.inc | 10 +- data/maps/OneIsland/scripts.inc | 4 +- .../maps/OneIsland_KindleRoad_EmberSpa/scripts.inc | 2 +- data/maps/OneIsland_PokemonCenter_1F/scripts.inc | 32 ++--- data/maps/PalletTown/scripts.inc | 10 +- data/maps/PalletTown_GarysHouse/scripts.inc | 39 +++--- data/maps/PalletTown_PlayersHouse_1F/scripts.inc | 4 +- data/maps/PalletTown_PlayersHouse_2F/scripts.inc | 2 +- data/maps/PalletTown_ProfessorOaksLab/scripts.inc | 94 +++++++------- data/maps/PewterCity/scripts.inc | 4 +- data/maps/PewterCity_Gym/scripts.inc | 10 +- data/maps/PewterCity_Mart/scripts.inc | 2 +- data/maps/PewterCity_Museum_1F/scripts.inc | 18 +-- data/maps/PokemonLeague_AgathasRoom/scripts.inc | 2 +- data/maps/PokemonLeague_BrunosRoom/scripts.inc | 2 +- data/maps/PokemonLeague_ChampionsRoom/scripts.inc | 14 +- data/maps/PokemonLeague_LancesRoom/scripts.inc | 2 +- data/maps/PokemonLeague_LoreleisRoom/scripts.inc | 2 +- data/maps/PokemonTower_1F/scripts.inc | 2 +- data/maps/PokemonTower_6F/scripts.inc | 4 +- data/maps/PokemonTower_7F/scripts.inc | 14 +- data/maps/PowerPlant/scripts.inc | 24 ++-- data/maps/RocketHideout_B4F/scripts.inc | 4 +- data/maps/RocketHideout_Elevator/scripts.inc | 34 ++--- data/maps/Route1/scripts.inc | 4 +- data/maps/Route10_PokemonCenter_1F/scripts.inc | 6 +- data/maps/Route11_EastEntrance_2F/scripts.inc | 12 +- data/maps/Route12/scripts.inc | 10 +- data/maps/Route12_FishingHouse/scripts.inc | 22 ++-- data/maps/Route12_NorthEntrance_2F/scripts.inc | 4 +- data/maps/Route15_WestEntrance_2F/scripts.inc | 6 +- data/maps/Route16/scripts.inc | 10 +- data/maps/Route16_House/scripts.inc | 4 +- data/maps/Route16_NorthEntrance_2F/scripts.inc | 6 +- data/maps/Route18_EastEntrance_2F/scripts.inc | 4 +- data/maps/Route24/scripts.inc | 6 +- data/maps/Route25_SeaCottage/scripts.inc | 36 +++--- data/maps/Route2_EastBuilding/scripts.inc | 6 +- data/maps/Route2_House/scripts.inc | 4 +- data/maps/Route4_PokemonCenter_1F/scripts.inc | 20 +-- data/maps/Route5_SouthEntrance/scripts.inc | 2 +- data/maps/Route6_NorthEntrance/scripts.inc | 2 +- data/maps/Route7_EastEntrance/scripts.inc | 2 +- data/maps/Route8_WestEntrance/scripts.inc | 2 +- data/maps/SSAnne_1F_Room4/scripts.inc | 2 +- data/maps/SSAnne_1F_Room6/scripts.inc | 4 +- data/maps/SSAnne_CaptainsOffice/scripts.inc | 2 +- data/maps/SafariZone_SecretHouse/scripts.inc | 4 +- data/maps/SaffronCity_Dojo/scripts.inc | 20 +-- data/maps/SaffronCity_Duplicate/scripts.inc | 2 +- data/maps/SaffronCity_Gym/scripts.inc | 6 +- data/maps/SaffronCity_House1_2F/scripts.inc | 4 +- data/maps/SaffronCity_House3/scripts.inc | 4 +- data/maps/SaffronCity_Mart/scripts.inc | 2 +- data/maps/SaffronCity_PokemonCenter_1F/scripts.inc | 2 +- .../SaffronCity_PokemonTrainerFanClub/scripts.inc | 60 ++++----- data/maps/SeafoamIslands_B3F/scripts.inc | 2 +- data/maps/SeafoamIslands_B4F/scripts.inc | 12 +- data/maps/SevenIsland_House_Room1/scripts.inc | 10 +- data/maps/SevenIsland_Mart/scripts.inc | 2 +- .../scripts.inc | 28 ++-- .../SevenIsland_SevaultCanyon_House/scripts.inc | 4 +- .../SevenIsland_TrainerTower_Elevator/scripts.inc | 24 ++-- .../SevenIsland_TrainerTower_Lobby/scripts.inc | 53 +++----- data/maps/SilphCo_11F/scripts.inc | 4 +- data/maps/SilphCo_7F/scripts.inc | 12 +- data/maps/SilphCo_Elevator/scripts.inc | 63 ++++----- data/maps/SixIsland_Mart/scripts.inc | 2 +- data/maps/SixIsland_RuinValley/scripts.inc | 4 +- data/maps/SixIsland_WaterPath_House1/scripts.inc | 16 +-- data/maps/ThreeIsland/scripts.inc | 10 +- data/maps/ThreeIsland_BerryForest/scripts.inc | 2 +- data/maps/ThreeIsland_DunsparceTunnel/scripts.inc | 6 +- data/maps/ThreeIsland_House5/scripts.inc | 2 +- data/maps/ThreeIsland_Mart/scripts.inc | 2 +- data/maps/TwoIsland/scripts.inc | 28 ++-- data/maps/TwoIsland_House/scripts.inc | 30 ++--- data/maps/TwoIsland_JoyfulGameCorner/scripts.inc | 14 +- .../maps/UndergroundPath_NorthEntrance/scripts.inc | 4 +- data/maps/VermilionCity/scripts.inc | 80 +++++------- data/maps/VermilionCity_Gym/scripts.inc | 18 +-- data/maps/VermilionCity_House1/scripts.inc | 6 +- data/maps/VermilionCity_Mart/scripts.inc | 2 +- data/maps/VermilionCity_PokemonFanClub/scripts.inc | 16 +-- data/maps/VictoryRoad_1F/scripts.inc | 2 +- data/maps/VictoryRoad_2F/scripts.inc | 4 +- data/maps/VictoryRoad_3F/scripts.inc | 2 +- data/maps/ViridianCity/scripts.inc | 20 +-- data/maps/ViridianCity_Gym/scripts.inc | 6 +- data/maps/ViridianCity_House2/scripts.inc | 29 ++--- data/maps/ViridianCity_Mart/scripts.inc | 4 +- 148 files changed, 992 insertions(+), 1224 deletions(-) (limited to 'data/maps') diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc index df3327bf0..1d3fc4db6 100644 --- a/data/maps/BirthIsland_Exterior/scripts.inc +++ b/data/maps/BirthIsland_Exterior/scripts.inc @@ -26,7 +26,7 @@ EventScript_16523C:: @ 816523C EventScript_165243:: @ 8165243 checkflag FLAG_0x2F7 - goto_if 1, EventScript_1A77A9 + goto_if_eq EventScript_1A77A9 clearflag FLAG_0x09A clearflag FLAG_0x848 return @@ -48,19 +48,15 @@ BirthIsland_Exterior_EventScript_165271:: @ 8165271 faceplayer special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 special sub_80CCDFC waitstate - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1652BA - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1652BC - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1652C0 - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_1652BE + switch VAR_RESULT + case 0, EventScript_1652BA + case 1, EventScript_1652BC + case 2, EventScript_1652C0 + case 3, EventScript_1652BE end EventScript_1652BA:: @ 81652BA @@ -101,11 +97,11 @@ EventScript_1652C0:: @ 81652C0 clearflag FLAG_0x807 specialvar VAR_RESULT, sub_80CA74C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16533A + goto_if_eq EventScript_16533A compare_var_to_value VAR_RESULT, 4 - goto_if 1, EventScript_165348 + goto_if_eq EventScript_165348 compare_var_to_value VAR_RESULT, 5 - goto_if 1, EventScript_165348 + goto_if_eq EventScript_165348 setflag FLAG_0x2E4 release end diff --git a/data/maps/BirthIsland_Harbor/scripts.inc b/data/maps/BirthIsland_Harbor/scripts.inc index 70b91e3d9..487cae2f1 100644 --- a/data/maps/BirthIsland_Harbor/scripts.inc +++ b/data/maps/BirthIsland_Harbor/scripts.inc @@ -8,13 +8,10 @@ BirthIsland_Harbor_EventScript_1653E7:: @ 81653E7 waitmessage setvar VAR_0x8004, 10 multichoice 20, 8, 61, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1A91D5 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1A90F6 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_1A90F6 + switch VAR_RESULT + case 0, EventScript_1A91D5 + case 1, EventScript_1A90F6 + case 127, EventScript_1A90F6 end NavelRock_Harbor_MapScripts:: @ 8165420 @@ -27,11 +24,8 @@ NavelRock_Harbor_EventScript_165421:: @ 8165421 waitmessage setvar VAR_0x8004, 9 multichoice 20, 8, 61, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1A91D5 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1A90F6 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_1A90F6 + switch VAR_RESULT + case 0, EventScript_1A91D5 + case 1, EventScript_1A90F6 + case 127, EventScript_1A90F6 end diff --git a/data/maps/CeladonCity_Condominiums_1F/scripts.inc b/data/maps/CeladonCity_Condominiums_1F/scripts.inc index 88dd869b9..c9f358f44 100644 --- a/data/maps/CeladonCity_Condominiums_1F/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_1F/scripts.inc @@ -5,16 +5,16 @@ CeladonCity_Condominiums_1F_EventScript_16C321:: @ 816C321 lock faceplayer checkflag FLAG_0x2F8 - goto_if 1, EventScript_16C36A + goto_if_eq EventScript_16C36A checkflag FLAG_0x82C - goto_if 1, EventScript_16C374 + goto_if_eq EventScript_16C374 checkflag FLAG_0x2A6 - goto_if 1, EventScript_16C36A + goto_if_eq EventScript_16C36A msgbox gUnknown_81960C9 setflag FLAG_0x2A6 giveitem ITEM_TEA compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1A6BF9 + goto_if_eq EventScript_1A6BF9 msgbox gUnknown_8196109 release end diff --git a/data/maps/CeladonCity_Condominiums_3F/scripts.inc b/data/maps/CeladonCity_Condominiums_3F/scripts.inc index 46c5548dc..350bc76d0 100644 --- a/data/maps/CeladonCity_Condominiums_3F/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_3F/scripts.inc @@ -18,7 +18,7 @@ CeladonCity_Condominiums_3F_EventScript_16C3F6:: @ 816C3F6 faceplayer specialvar VAR_RESULT, sub_8088F58 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16C412 + goto_if_eq EventScript_16C412 msgbox gUnknown_8196356 release end @@ -33,7 +33,7 @@ EventScript_16C418:: @ 816C418 delay 60 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_80CA618 waitstate release diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc b/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc index 70828062d..8e8bb2b6b 100644 --- a/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc @@ -11,11 +11,11 @@ CeladonCity_Condominiums_RoofRoom_EventScript_16C46D:: @ 816C46D setvar VAR_0x4001, SPECIES_EEVEE givemon SPECIES_EEVEE, 25, ITEM_NONE, 0, 0, 0 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16C4A6 + goto_if_eq EventScript_16C4A6 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16C4DA + goto_if_eq EventScript_16C4DA compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A927C + goto_if_eq EventScript_1A927C release end @@ -28,7 +28,7 @@ EventScript_16C4A6:: @ 816C4A6 getspeciesname 0, SPECIES_EEVEE msgbox gUnknown_81A56A7, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16C514 + goto_if_eq EventScript_16C514 call EventScript_1A8C27 call EventScript_1A74EB goto EventScript_16C514 @@ -43,7 +43,7 @@ EventScript_16C4DA:: @ 816C4DA getspeciesname 0, SPECIES_EEVEE msgbox gUnknown_81A56A7, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16C509 + goto_if_eq EventScript_16C509 call EventScript_1A8C33 goto EventScript_16C509 end @@ -69,34 +69,24 @@ CeladonCity_Condominiums_RoofRoom_EventScript_16C522:: @ 816C522 waitmessage setvar VAR_0x8004, 4 multichoice 0, 0, 43, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_16C5C0 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16C5CE - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_16C5DC - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_16C5EA - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_16C5EA + switch VAR_RESULT + case 0, EventScript_16C5C0 + case 1, EventScript_16C5CE + case 2, EventScript_16C5DC + case 3, EventScript_16C5EA + case 127, EventScript_16C5EA end EventScript_16C578:: @ 816C578 message Text_1965F4 waitmessage multichoice 0, 0, 43, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_16C5C0 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16C5CE - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_16C5DC - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_16C5EA - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_16C5EA + switch VAR_RESULT + case 0, EventScript_16C5C0 + case 1, EventScript_16C5CE + case 2, EventScript_16C5DC + case 3, EventScript_16C5EA + case 127, EventScript_16C5EA end EventScript_16C5C0:: @ 816C5C0 diff --git a/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc index 2f8f41777..8d859502e 100644 --- a/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc @@ -16,7 +16,7 @@ CeladonCity_DepartmentStore_2F_EventScript_16BB07:: @ 816BB07 CeladonCity_DepartmentStore_2F_EventScript_16BB10:: @ 816BB10 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lock faceplayer message Text_1A6211 @@ -44,7 +44,7 @@ Items_16BB38:: @ 816BB38 CeladonCity_DepartmentStore_2F_EventScript_16BB4E:: @ 816BB4E special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lock faceplayer message Text_1A6211 diff --git a/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc index f90728d50..2aad6e02b 100644 --- a/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc @@ -16,7 +16,7 @@ CeladonCity_DepartmentStore_4F_EventScript_16BC01:: @ 816BC01 CeladonCity_DepartmentStore_4F_EventScript_16BC0A:: @ 816BC0A special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lock faceplayer message Text_1A6211 diff --git a/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc index 59b5a7d9b..05aff00cd 100644 --- a/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc @@ -16,7 +16,7 @@ CeladonCity_DepartmentStore_5F_EventScript_16BC53:: @ 816BC53 CeladonCity_DepartmentStore_5F_EventScript_16BC5C:: @ 816BC5C special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lock faceplayer message Text_1A6211 @@ -42,7 +42,7 @@ Items_16BC84:: @ 816BC84 CeladonCity_DepartmentStore_5F_EventScript_16BC96:: @ 816BC96 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lock faceplayer message Text_1A6211 diff --git a/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc index 2252f511c..6f104041e 100644 --- a/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc @@ -12,17 +12,12 @@ CeladonCity_DepartmentStore_Elevator_EventScript_16C153:: @ 816C153 waitmessage setvar VAR_0x8004, 3 specialvar VAR_RESULT, sub_80CB328 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_16C1B7 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16C1C3 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_16C1CF - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_16C1DB - compare_var_to_value VAR_0x8000, 4 - goto_if 1, EventScript_16C1E7 + switch VAR_RESULT + case 0, EventScript_16C1B7 + case 1, EventScript_16C1C3 + case 2, EventScript_16C1CF + case 3, EventScript_16C1DB + case 4, EventScript_16C1E7 end EventScript_16C1B7:: @ 816C1B7 @@ -53,28 +48,21 @@ EventScript_16C1E7:: @ 816C1E7 end EventScript_16C1F3:: @ 816C1F3 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_16C2E6 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16C2BE - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_16C296 - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_16C26E - compare_var_to_value VAR_0x8000, 4 - goto_if 1, EventScript_16C246 - compare_var_to_value VAR_0x8000, 5 - goto_if 1, EventScript_16C30E - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_16C30E + switch VAR_RESULT + case 0, EventScript_16C2E6 + case 1, EventScript_16C2BE + case 2, EventScript_16C296 + case 3, EventScript_16C26E + case 4, EventScript_16C246 + case 5, EventScript_16C30E + case 127, EventScript_16C30E end EventScript_16C246:: @ 816C246 setvar VAR_0x8006, 4 setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_1F, 255, 6, 1 compare_var_to_value VAR_0x403A, 4 - goto_if 1, EventScript_16C30E + goto_if_eq EventScript_16C30E call EventScript_16C313 setvar VAR_0x403A, 4 goto EventScript_16C30E @@ -84,7 +72,7 @@ EventScript_16C26E:: @ 816C26E setvar VAR_0x8006, 5 setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_2F, 255, 6, 1 compare_var_to_value VAR_0x403A, 5 - goto_if 1, EventScript_16C30E + goto_if_eq EventScript_16C30E call EventScript_16C313 setvar VAR_0x403A, 5 goto EventScript_16C30E @@ -94,7 +82,7 @@ EventScript_16C296:: @ 816C296 setvar VAR_0x8006, 6 setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_3F, 255, 6, 1 compare_var_to_value VAR_0x403A, 6 - goto_if 1, EventScript_16C30E + goto_if_eq EventScript_16C30E call EventScript_16C313 setvar VAR_0x403A, 6 goto EventScript_16C30E @@ -104,7 +92,7 @@ EventScript_16C2BE:: @ 816C2BE setvar VAR_0x8006, 7 setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_4F, 255, 6, 1 compare_var_to_value VAR_0x403A, 7 - goto_if 1, EventScript_16C30E + goto_if_eq EventScript_16C30E call EventScript_16C313 setvar VAR_0x403A, 7 goto EventScript_16C30E @@ -114,7 +102,7 @@ EventScript_16C2E6:: @ 816C2E6 setvar VAR_0x8006, 8 setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_5F, 255, 6, 1 compare_var_to_value VAR_0x403A, 8 - goto_if 1, EventScript_16C30E + goto_if_eq EventScript_16C30E call EventScript_16C313 setvar VAR_0x403A, 8 goto EventScript_16C30E diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc index e1fd2ab23..1c7ee50df 100644 --- a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc @@ -4,13 +4,13 @@ CeladonCity_DepartmentStore_Roof_MapScripts:: @ 816BCCC CeladonCity_DepartmentStore_Roof_EventScript_16BCCD:: @ 816BCCD special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 lock faceplayer call EventScript_16BCF6 compare_var_to_value VAR_0x4001, 0 - goto_if 1, EventScript_16C00E + goto_if_eq EventScript_16C00E goto EventScript_16BD3E end @@ -42,120 +42,87 @@ EventScript_16BD38:: @ 816BD38 EventScript_16BD3E:: @ 816BD3E msgbox gUnknown_8195D22, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16C00C + goto_if_eq EventScript_16C00C textcolor 3 message Text_195D5F waitmessage textcolor 1 - copyvar VAR_0x8000, VAR_0x4001 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16BDAE - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_16BDDA - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_16BE06 - compare_var_to_value VAR_0x8000, 4 - goto_if 1, EventScript_16BE3D - compare_var_to_value VAR_0x8000, 5 - goto_if 1, EventScript_16BE69 - compare_var_to_value VAR_0x8000, 6 - goto_if 1, EventScript_16BEA0 - compare_var_to_value VAR_0x8000, 7 - goto_if 1, EventScript_16BED7 + switch VAR_0x4001 + case 1, EventScript_16BDAE + case 2, EventScript_16BDDA + case 3, EventScript_16BE06 + case 4, EventScript_16BE3D + case 5, EventScript_16BE69 + case 6, EventScript_16BEA0 + case 7, EventScript_16BED7 end EventScript_16BDAE:: @ 816BDAE multichoice 0, 0, 32, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_16BF19 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16C00C - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_16C00C + switch VAR_RESULT + case 0, EventScript_16BF19 + case 1, EventScript_16C00C + case 127, EventScript_16C00C end EventScript_16BDDA:: @ 816BDDA multichoice 0, 0, 33, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_16BF3A - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16C00C - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_16C00C + switch VAR_RESULT + case 0, EventScript_16BF3A + case 1, EventScript_16C00C + case 127, EventScript_16C00C end EventScript_16BE06:: @ 816BE06 multichoice 0, 0, 34, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_16BF19 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16BF3A - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_16C00C - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_16C00C + switch VAR_RESULT + case 0, EventScript_16BF19 + case 1, EventScript_16BF3A + case 2, EventScript_16C00C + case 127, EventScript_16C00C end EventScript_16BE3D:: @ 816BE3D multichoice 0, 0, 35, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_16BF5B - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16C00C - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_16C00C + switch VAR_RESULT + case 0, EventScript_16BF5B + case 1, EventScript_16C00C + case 127, EventScript_16C00C end EventScript_16BE69:: @ 816BE69 multichoice 0, 0, 36, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_16BF19 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16BF5B - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_16C00C - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_16C00C + switch VAR_RESULT + case 0, EventScript_16BF19 + case 1, EventScript_16BF5B + case 2, EventScript_16C00C + case 127, EventScript_16C00C end EventScript_16BEA0:: @ 816BEA0 multichoice 0, 0, 37, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_16BF3A - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16BF5B - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_16C00C - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_16C00C + switch VAR_RESULT + case 0, EventScript_16BF3A + case 1, EventScript_16BF5B + case 2, EventScript_16C00C + case 127, EventScript_16C00C end EventScript_16BED7:: @ 816BED7 multichoice 0, 0, 38, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_16BF19 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16BF3A - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_16BF5B - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_16C00C - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_16C00C + switch VAR_RESULT + case 0, EventScript_16BF19 + case 1, EventScript_16BF3A + case 2, EventScript_16BF5B + case 3, EventScript_16C00C + case 127, EventScript_16C00C end EventScript_16BF19:: @ 816BF19 setvar VAR_0x8008, ITEM_FRESH_WATER setvar VAR_0x8009, ITEM_TM16 checkflag FLAG_0x296 - goto_if 1, EventScript_16C018 + goto_if_eq EventScript_16C018 msgbox gUnknown_8195D75 goto EventScript_16BF7C end @@ -164,7 +131,7 @@ EventScript_16BF3A:: @ 816BF3A setvar VAR_0x8008, ITEM_SODA_POP setvar VAR_0x8009, ITEM_TM20 checkflag FLAG_0x295 - goto_if 1, EventScript_16C018 + goto_if_eq EventScript_16C018 msgbox gUnknown_8195E33 goto EventScript_16BF7C end @@ -173,7 +140,7 @@ EventScript_16BF5B:: @ 816BF5B setvar VAR_0x8008, ITEM_LEMONADE setvar VAR_0x8009, ITEM_TM33 checkflag FLAG_0x294 - goto_if 1, EventScript_16C018 + goto_if_eq EventScript_16C018 msgbox gUnknown_8195EBF goto EventScript_16BF7C end @@ -184,7 +151,7 @@ EventScript_16BF7C:: @ 816BF7C removeitem VAR_0x8008, 1 checkitemspace VAR_0x8009, 1 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16C002 + goto_if_eq EventScript_16C002 additem VAR_0x8009, 1 textcolor 3 playfanfare MUS_FANFA1 @@ -255,13 +222,10 @@ CeladonCity_DepartmentStore_Roof_EventScript_16C034:: @ 816C034 EventScript_16C045:: @ 816C045 multichoice 12, 0, 26, 0 copyvar VAR_0x4001, VAR_RESULT - copyvar VAR_0x8000, VAR_0x4001 - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_16C083 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16C094 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_16C0A5 + switch VAR_0x4001 + case 0, EventScript_16C083 + case 1, EventScript_16C094 + case 2, EventScript_16C0A5 msgbox gUnknown_81960AE goto EventScript_16C14D end @@ -298,10 +262,10 @@ EventScript_16C0C4:: @ 816C0C4 EventScript_16C0CB:: @ 816C0CB compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16C131 + goto_if_eq EventScript_16C131 checkitemspace VAR_0x4000, 1 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16C13F + goto_if_eq EventScript_16C13F compare_var_to_value VAR_0x4001, 0 call_if 1, EventScript_16C0B6 compare_var_to_value VAR_0x4001, 1 diff --git a/data/maps/CeladonCity_GameCorner/scripts.inc b/data/maps/CeladonCity_GameCorner/scripts.inc index b54ea1152..dca647299 100644 --- a/data/maps/CeladonCity_GameCorner/scripts.inc +++ b/data/maps/CeladonCity_GameCorner/scripts.inc @@ -22,7 +22,7 @@ CeladonCity_GameCorner_EventScript_16C684:: @ 816C684 CeladonCity_GameCorner_EventScript_16C68D:: @ 816C68D special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lock faceplayer showmoneybox 0, 0, 0 @@ -31,24 +31,20 @@ CeladonCity_GameCorner_EventScript_16C68D:: @ 816C68D waitmessage multichoice 13, 0, 27, 0 copyvar VAR_0x8009, VAR_RESULT - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_16C6E6 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16C6E6 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_16C782 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_16C782 + switch VAR_RESULT + case 0, EventScript_16C6E6 + case 1, EventScript_16C6E6 + case 2, EventScript_16C782 + case 127, EventScript_16C782 end EventScript_16C6E6:: @ 816C6E6 checkflag FLAG_0x243 goto_if 0, EventScript_16C790 compare_var_to_value VAR_0x8009, 0 - goto_if 1, EventScript_16C734 + goto_if_eq EventScript_16C734 compare_var_to_value VAR_0x8009, 1 - goto_if 1, EventScript_16C706 + goto_if_eq EventScript_16C706 end EventScript_16C706:: @ 816C706 @@ -57,7 +53,7 @@ EventScript_16C706:: @ 816C706 goto_if 4, EventScript_16C79E checkmoney 10000, 0 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16C7AC + goto_if_eq EventScript_16C7AC givecoins 500 takemoney 10000, 0 goto EventScript_16C762 @@ -69,7 +65,7 @@ EventScript_16C734:: @ 816C734 goto_if 4, EventScript_16C79E checkmoney 1000, 0 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16C7AC + goto_if_eq EventScript_16C7AC givecoins 50 takemoney 1000, 0 goto EventScript_16C762 @@ -136,7 +132,7 @@ CeladonCity_GameCorner_EventScript_16C7E7:: @ 816C7E7 lock faceplayer checkflag FLAG_0x26E - goto_if 1, EventScript_16C849 + goto_if_eq EventScript_16C849 msgbox gUnknown_8196AF3 checkflag FLAG_0x243 goto_if 0, EventScript_16C839 @@ -172,7 +168,7 @@ CeladonCity_GameCorner_EventScript_16C857:: @ 816C857 lock faceplayer checkflag FLAG_0x4B3 - goto_if 1, EventScript_16C870 + goto_if_eq EventScript_16C870 msgbox gUnknown_8196BAD goto EventScript_16C7CA end @@ -200,7 +196,7 @@ CeladonCity_GameCorner_EventScript_16C89E:: @ 816C89E lock faceplayer checkflag FLAG_0x26F - goto_if 1, EventScript_16C8F0 + goto_if_eq EventScript_16C8F0 msgbox gUnknown_8196D2B checkflag FLAG_0x243 goto_if 0, EventScript_16C839 @@ -230,7 +226,7 @@ CeladonCity_GameCorner_EventScript_16C8FE:: @ 816C8FE lock faceplayer checkflag FLAG_0x270 - goto_if 1, EventScript_16C950 + goto_if_eq EventScript_16C950 msgbox gUnknown_8196DB7 checkflag FLAG_0x243 goto_if 0, EventScript_16C839 @@ -271,7 +267,7 @@ EventScript_16C96C:: @ 816C96C goto_if 0, EventScript_16CAA0 msgbox gUnknown_8196F46, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16C96A + goto_if_eq EventScript_16C96A setfieldeffectarg 0, 255 setfieldeffectarg 1, 10 setfieldeffectarg 2, 14 diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc index a6de8a7e3..911847541 100644 --- a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc +++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc @@ -16,7 +16,7 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_16CB88:: @ 816CB88 goto_if 0, EventScript_16CD99 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 showcoinsbox 0, 0 msgbox gUnknown_8197057 goto EventScript_16CBB2 @@ -26,21 +26,14 @@ EventScript_16CBB2:: @ 816CBB2 message Text_19707A waitmessage multichoice 11, 0, 14, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_16CC15 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16CC25 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_16CC35 - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_16CC45 - compare_var_to_value VAR_0x8000, 4 - goto_if 1, EventScript_16CC55 - compare_var_to_value VAR_0x8000, 5 - goto_if 1, EventScript_16CC10 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_16CC10 + switch VAR_RESULT + case 0, EventScript_16CC15 + case 1, EventScript_16CC25 + case 2, EventScript_16CC35 + case 3, EventScript_16CC45 + case 4, EventScript_16CC55 + case 5, EventScript_16CC10 + case 127, EventScript_16CC10 end EventScript_16CC10:: @ 816CC10 @@ -82,24 +75,18 @@ EventScript_16CC65:: @ 816CC65 getspeciesname 0, VAR_0x4001 msgbox gUnknown_819709D, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16CC10 + goto_if_eq EventScript_16CC10 checkcoins VAR_RESULT compare_var_to_var VAR_RESULT, VAR_0x4002 goto_if 0, EventScript_16CDA5 textcolor 3 - copyvar VAR_0x8000, VAR_0x4001 - compare_var_to_value VAR_0x8000, SPECIES_ABRA - goto_if 1, EventScript_16CCD4 - compare_var_to_value VAR_0x8000, SPECIES_CLEFAIRY - goto_if 1, EventScript_16CCE9 - compare_var_to_value VAR_0x8000, SPECIES_DRATINI - goto_if 1, EventScript_16CCFE - compare_var_to_value VAR_0x8000, SPECIES_SCYTHER - goto_if 1, EventScript_16CD13 - compare_var_to_value VAR_0x8000, SPECIES_PORYGON - goto_if 1, EventScript_16CD28 - compare_var_to_value VAR_0x8000, SPECIES_PINSIR - goto_if 1, EventScript_16CD3D + switch VAR_0x4001 + case SPECIES_ABRA, EventScript_16CCD4 + case SPECIES_CLEFAIRY, EventScript_16CCE9 + case SPECIES_DRATINI, EventScript_16CCFE + case SPECIES_SCYTHER, EventScript_16CD13 + case SPECIES_PORYGON, EventScript_16CD28 + case SPECIES_PINSIR, EventScript_16CD3D end EventScript_16CCD4:: @ 816CCD4 @@ -134,11 +121,11 @@ EventScript_16CD3D:: @ 816CD3D EventScript_16CD52:: @ 816CD52 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16CDB3 + goto_if_eq EventScript_16CDB3 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16CDE0 + goto_if_eq EventScript_16CDE0 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_16CD74 + goto_if_eq EventScript_16CD74 end EventScript_16CD74:: @ 816CD74 @@ -177,7 +164,7 @@ EventScript_16CDB3:: @ 816CDB3 waitfanfare msgbox gUnknown_81A56A7, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16CD83 + goto_if_eq EventScript_16CD83 goto EventScript_16CC10 end @@ -191,7 +178,7 @@ EventScript_16CDE0:: @ 816CDE0 waitfanfare msgbox gUnknown_81A56A7, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16CE12 + goto_if_eq EventScript_16CE12 call EventScript_1A8C33 goto EventScript_16CE12 end @@ -208,7 +195,7 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_16CE1D:: @ 816CE1D goto_if 0, EventScript_16CD99 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 showcoinsbox 0, 0 msgbox gUnknown_8197057 goto EventScript_16CE47 @@ -218,21 +205,14 @@ EventScript_16CE47:: @ 816CE47 message Text_19707A waitmessage multichoice 11, 0, 30, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_16CEA5 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16CEB9 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_16CECD - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_16CEE1 - compare_var_to_value VAR_0x8000, 4 - goto_if 1, EventScript_16CEF5 - compare_var_to_value VAR_0x8000, 5 - goto_if 1, EventScript_16CC10 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_16CC10 + switch VAR_RESULT + case 0, EventScript_16CEA5 + case 1, EventScript_16CEB9 + case 2, EventScript_16CECD + case 3, EventScript_16CEE1 + case 4, EventScript_16CEF5 + case 5, EventScript_16CC10 + case 127, EventScript_16CC10 end EventScript_16CEA5:: @ 816CEA5 @@ -273,7 +253,7 @@ EventScript_16CEF5:: @ 816CEF5 EventScript_16CF09:: @ 816CF09 msgbox gUnknown_81970B2, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16CC10 + goto_if_eq EventScript_16CC10 goto EventScript_16CF3F end @@ -281,7 +261,7 @@ EventScript_16CF22:: @ 816CF22 getitemname 0, VAR_0x4001 msgbox gUnknown_819709D, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16CC10 + goto_if_eq EventScript_16CC10 goto EventScript_16CF3F end @@ -292,7 +272,7 @@ EventScript_16CF3F:: @ 816CF3F goto_if 0, EventScript_16CDA5 checkitemspace VAR_0x4001, 1 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16CF79 + goto_if_eq EventScript_16CF79 takecoins VAR_0x4002 updatecoinsbox 0, 5 giveitem VAR_0x4001 @@ -313,7 +293,7 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_16CF88:: @ 816CF88 goto_if 0, EventScript_16CD99 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 showcoinsbox 0, 0 msgbox gUnknown_8197057 goto EventScript_16CFB2 @@ -323,21 +303,14 @@ EventScript_16CFB2:: @ 816CFB2 message Text_19707A waitmessage multichoice 10, 0, 41, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_16D010 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16D020 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_16D030 - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_16D040 - compare_var_to_value VAR_0x8000, 4 - goto_if 1, EventScript_16D050 - compare_var_to_value VAR_0x8000, 5 - goto_if 1, EventScript_16CC10 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_16CC10 + switch VAR_RESULT + case 0, EventScript_16D010 + case 1, EventScript_16D020 + case 2, EventScript_16D030 + case 3, EventScript_16D040 + case 4, EventScript_16D050 + case 5, EventScript_16CC10 + case 127, EventScript_16CC10 end EventScript_16D010:: @ 816D010 diff --git a/data/maps/CeladonCity_Gym/scripts.inc b/data/maps/CeladonCity_Gym/scripts.inc index f700d25c9..9131602c2 100644 --- a/data/maps/CeladonCity_Gym/scripts.inc +++ b/data/maps/CeladonCity_Gym/scripts.inc @@ -31,7 +31,7 @@ EventScript_16D0C6:: @ 816D0C6 msgbox gUnknown_8197327 checkitemspace ITEM_TM19, 1 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16D107 + goto_if_eq EventScript_16D107 additem ITEM_TM19, 1 loadword 0, gUnknown_81973BA setorcopyvar VAR_0x8000, ITEM_TM19 @@ -92,7 +92,7 @@ CeladonCity_Gym_EventScript_16D1B5:: @ 816D1B5 CeladonCity_Gym_EventScript_16D1CC:: @ 816D1CC lockall checkflag FLAG_0x823 - goto_if 1, EventScript_16D1E0 + goto_if_eq EventScript_16D1E0 msgbox gUnknown_8197874 releaseall end diff --git a/data/maps/CeladonCity_Restaurant/scripts.inc b/data/maps/CeladonCity_Restaurant/scripts.inc index bf6bba315..e52d88636 100644 --- a/data/maps/CeladonCity_Restaurant/scripts.inc +++ b/data/maps/CeladonCity_Restaurant/scripts.inc @@ -13,11 +13,11 @@ CeladonCity_Restaurant_EventScript_16D1FD:: @ 816D1FD lock faceplayer checkflag FLAG_0x243 - goto_if 1, EventScript_16D24B + goto_if_eq EventScript_16D24B msgbox gUnknown_81979C1 checkitemspace ITEM_COIN_CASE, 1 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16D241 + goto_if_eq EventScript_16D241 additem ITEM_COIN_CASE, 1 giveitemfanfaremsg gUnknown_8197A38, ITEM_COIN_CASE setflag FLAG_0x243 diff --git a/data/maps/CeruleanCave_B1F/scripts.inc b/data/maps/CeruleanCave_B1F/scripts.inc index c1dfa35ad..f2ac16317 100644 --- a/data/maps/CeruleanCave_B1F/scripts.inc +++ b/data/maps/CeruleanCave_B1F/scripts.inc @@ -27,7 +27,7 @@ EventScript_1624F1:: @ 81624F1 CeruleanCave_B1F_EventScript_1624F5:: @ 81624F5 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 lock faceplayer @@ -46,11 +46,11 @@ CeruleanCave_B1F_EventScript_1624F5:: @ 81624F5 clearflag FLAG_0x807 specialvar VAR_RESULT, sub_80CA74C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_162558 + goto_if_eq EventScript_162558 compare_var_to_value VAR_RESULT, 4 - goto_if 1, EventScript_162561 + goto_if_eq EventScript_162561 compare_var_to_value VAR_RESULT, 5 - goto_if 1, EventScript_162561 + goto_if_eq EventScript_162561 setflag FLAG_0x2BC release end diff --git a/data/maps/CeruleanCity/scripts.inc b/data/maps/CeruleanCity/scripts.inc index 5d593cd60..480a40ad0 100644 --- a/data/maps/CeruleanCity/scripts.inc +++ b/data/maps/CeruleanCity/scripts.inc @@ -174,7 +174,7 @@ CeruleanCity_EventScript_166603:: @ 8166603 lock faceplayer checktrainerflag FLAG_0x163 - goto_if 1, EventScript_16662E + goto_if_eq EventScript_16662E message Text_17EE0E waitmessage playbgm BGM_FRLG_SUSPICIOUS_EYE, 0 @@ -188,7 +188,7 @@ EventScript_16662E:: @ 816662E msgbox gUnknown_817EE9C checkitemspace ITEM_TM28, 1 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_166677 + goto_if_eq EventScript_166677 additem ITEM_TM28, 1 giveitemfanfaremsg gUnknown_817EEBF, ITEM_TM28 msgbox gUnknown_817EEED @@ -249,7 +249,7 @@ CeruleanCity_EventScript_1666FE:: @ 81666FE lock faceplayer checkflag FLAG_0x234 - goto_if 1, EventScript_166713 + goto_if_eq EventScript_166713 msgbox gUnknown_817F01D release end diff --git a/data/maps/CeruleanCity_BikeShop/scripts.inc b/data/maps/CeruleanCity_BikeShop/scripts.inc index 1ecfa9d96..51b7ba5bd 100644 --- a/data/maps/CeruleanCity_BikeShop/scripts.inc +++ b/data/maps/CeruleanCity_BikeShop/scripts.inc @@ -5,20 +5,17 @@ CeruleanCity_BikeShop_EventScript_16ABBD:: @ 816ABBD lock faceplayer checkflag FLAG_0x271 - goto_if 1, EventScript_16AC58 + goto_if_eq EventScript_16AC58 checkflag FLAG_0x241 - goto_if 1, EventScript_16AC22 + goto_if_eq EventScript_16AC22 showmoneybox 0, 0, 0 message Text_192755 waitmessage multichoice 11, 0, 13, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_16AC07 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16AC15 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_16AC15 + switch VAR_RESULT + case 0, EventScript_16AC07 + case 1, EventScript_16AC15 + case 127, EventScript_16AC15 end EventScript_16AC07:: @ 816AC07 @@ -62,7 +59,7 @@ CeruleanCity_BikeShop_EventScript_16AC75:: @ 816AC75 lock faceplayer checkflag FLAG_0x271 - goto_if 1, EventScript_16AC8A + goto_if_eq EventScript_16AC8A msgbox gUnknown_8192937 release end diff --git a/data/maps/CeruleanCity_Gym/scripts.inc b/data/maps/CeruleanCity_Gym/scripts.inc index 1398b9ebe..b21b6af7a 100644 --- a/data/maps/CeruleanCity_Gym/scripts.inc +++ b/data/maps/CeruleanCity_Gym/scripts.inc @@ -28,7 +28,7 @@ EventScript_16AAF9:: @ 816AAF9 msgbox gUnknown_81922F7 checkitemspace ITEM_TM03, 1 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16AB3A + goto_if_eq EventScript_16AB3A additem ITEM_TM03, 1 giveitemfanfaremsg gUnknown_81923F1, ITEM_TM03 setflag FLAG_0x297 @@ -58,7 +58,7 @@ CeruleanCity_Gym_EventScript_16AB7F:: @ 816AB7F lock faceplayer checkflag FLAG_0x4B1 - goto_if 1, EventScript_16AB94 + goto_if_eq EventScript_16AB94 msgbox gUnknown_81925AC release end @@ -71,7 +71,7 @@ EventScript_16AB94:: @ 816AB94 CeruleanCity_Gym_EventScript_16AB9E:: @ 816AB9E lockall checkflag FLAG_0x821 - goto_if 1, EventScript_16ABB2 + goto_if_eq EventScript_16ABB2 msgbox gUnknown_81926E1 releaseall end diff --git a/data/maps/CeruleanCity_House1/scripts.inc b/data/maps/CeruleanCity_House1/scripts.inc index f1f9503c1..18bc90fb6 100644 --- a/data/maps/CeruleanCity_House1/scripts.inc +++ b/data/maps/CeruleanCity_House1/scripts.inc @@ -10,27 +10,17 @@ CeruleanCity_House1_EventScript_16A7F0:: @ 816A7F0 setvar VAR_0x8004, 0 special sub_80CB7C4 waitstate - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_16A8FB - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16A909 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_16A917 - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_16A925 - compare_var_to_value VAR_0x8000, 4 - goto_if 1, EventScript_16A933 - compare_var_to_value VAR_0x8000, 5 - goto_if 1, EventScript_16A941 - compare_var_to_value VAR_0x8000, 6 - goto_if 1, EventScript_16A94F - compare_var_to_value VAR_0x8000, 7 - goto_if 1, EventScript_16A95D - compare_var_to_value VAR_0x8000, 8 - goto_if 1, EventScript_16A96B - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_16A96B + switch VAR_RESULT + case 0, EventScript_16A8FB + case 1, EventScript_16A909 + case 2, EventScript_16A917 + case 3, EventScript_16A925 + case 4, EventScript_16A933 + case 5, EventScript_16A941 + case 6, EventScript_16A94F + case 7, EventScript_16A95D + case 8, EventScript_16A96B + case 127, EventScript_16A96B end EventScript_16A87D:: @ 816A87D @@ -38,27 +28,17 @@ EventScript_16A87D:: @ 816A87D waitmessage special sub_80CBC5C waitstate - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_16A8FB - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16A909 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_16A917 - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_16A925 - compare_var_to_value VAR_0x8000, 4 - goto_if 1, EventScript_16A933 - compare_var_to_value VAR_0x8000, 5 - goto_if 1, EventScript_16A941 - compare_var_to_value VAR_0x8000, 6 - goto_if 1, EventScript_16A94F - compare_var_to_value VAR_0x8000, 7 - goto_if 1, EventScript_16A95D - compare_var_to_value VAR_0x8000, 8 - goto_if 1, EventScript_16A96B - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_16A96B + switch VAR_RESULT + case 0, EventScript_16A8FB + case 1, EventScript_16A909 + case 2, EventScript_16A917 + case 3, EventScript_16A925 + case 4, EventScript_16A933 + case 5, EventScript_16A941 + case 6, EventScript_16A94F + case 7, EventScript_16A95D + case 8, EventScript_16A96B + case 127, EventScript_16A96B end EventScript_16A8FB:: @ 816A8FB diff --git a/data/maps/CeruleanCity_House2/scripts.inc b/data/maps/CeruleanCity_House2/scripts.inc index 424080126..092e7d1a6 100644 --- a/data/maps/CeruleanCity_House2/scripts.inc +++ b/data/maps/CeruleanCity_House2/scripts.inc @@ -5,7 +5,7 @@ CeruleanCity_House2_EventScript_16A976:: @ 816A976 lock faceplayer checkflag FLAG_0x23F - goto_if 1, EventScript_16A98B + goto_if_eq EventScript_16A98B msgbox gUnknown_8191E13 release end diff --git a/data/maps/CeruleanCity_House3/scripts.inc b/data/maps/CeruleanCity_House3/scripts.inc index db63cb3de..5bcdb0bea 100644 --- a/data/maps/CeruleanCity_House3/scripts.inc +++ b/data/maps/CeruleanCity_House3/scripts.inc @@ -11,10 +11,10 @@ CeruleanCity_House3_EventScript_16A9B1:: @ 816A9B1 setvar VAR_0x8008, 1 call EventScript_1A8CAD checkflag FLAG_0x24A - goto_if 1, EventScript_16AA23 + goto_if_eq EventScript_16AA23 msgbox gUnknown_81A59FE, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16AA0B + goto_if_eq EventScript_16AA0B call EventScript_1A8CBD compare_var_to_value VAR_0x8004, 6 goto_if 4, EventScript_16AA0B diff --git a/data/maps/CeruleanCity_House4/scripts.inc b/data/maps/CeruleanCity_House4/scripts.inc index a4c0b74e3..bbc762b3f 100644 --- a/data/maps/CeruleanCity_House4/scripts.inc +++ b/data/maps/CeruleanCity_House4/scripts.inc @@ -4,25 +4,25 @@ CeruleanCity_House4_MapScripts:: @ 816ACEE CeruleanCity_House4_EventScript_16ACEF:: @ 816ACEF special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 lock specialvar VAR_0x8004, sub_8146CE8 copyvar VAR_0x8008, VAR_RESULT compare_var_to_value VAR_0x8004, 0 - goto_if 1, EventScript_16AD59 + goto_if_eq EventScript_16AD59 compare_var_to_value VAR_0x8004, 1 - goto_if 1, EventScript_16AD63 + goto_if_eq EventScript_16AD63 compare_var_to_value VAR_0x8004, 2 - goto_if 1, EventScript_16AD89 + goto_if_eq EventScript_16AD89 compare_var_to_value VAR_0x8004, 3 - goto_if 1, EventScript_16ADAF + goto_if_eq EventScript_16ADAF compare_var_to_value VAR_0x8004, 4 - goto_if 1, EventScript_16ADC3 + goto_if_eq EventScript_16ADC3 compare_var_to_value VAR_0x8004, 5 - goto_if 1, EventScript_16ADE9 + goto_if_eq EventScript_16ADE9 compare_var_to_value VAR_0x8004, 6 - goto_if 1, EventScript_16AE0F + goto_if_eq EventScript_16AE0F end EventScript_16AD59:: @ 816AD59 @@ -35,7 +35,7 @@ EventScript_16AD63:: @ 816AD63 msgbox gUnknown_8192B43 giveitem VAR_0x8008 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16AE45 + goto_if_eq EventScript_16AE45 release end @@ -44,7 +44,7 @@ EventScript_16AD89:: @ 816AD89 msgbox gUnknown_8192C07 giveitem VAR_0x8008, 4 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16AE45 + goto_if_eq EventScript_16AE45 release end @@ -60,7 +60,7 @@ EventScript_16ADC3:: @ 816ADC3 msgbox gUnknown_8192D4B giveitem VAR_0x8008 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16AE45 + goto_if_eq EventScript_16AE45 release end @@ -69,7 +69,7 @@ EventScript_16ADE9:: @ 816ADE9 msgbox gUnknown_8192DE3 giveitem VAR_0x8008, 4 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16AE45 + goto_if_eq EventScript_16AE45 release end diff --git a/data/maps/CeruleanCity_House5/scripts.inc b/data/maps/CeruleanCity_House5/scripts.inc index 3118924fb..d7d3e0222 100644 --- a/data/maps/CeruleanCity_House5/scripts.inc +++ b/data/maps/CeruleanCity_House5/scripts.inc @@ -5,17 +5,17 @@ CeruleanCity_House5_EventScript_16AE50:: @ 816AE50 lock faceplayer checkflag FLAG_0x2BB - goto_if 1, EventScript_16AEB7 + goto_if_eq EventScript_16AEB7 msgbox gUnknown_8192F67, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16AEAD + goto_if_eq EventScript_16AEAD checkflag FLAG_0x847 goto_if 0, EventScript_16AEA3 msgbox gUnknown_8193003 setflag FLAG_0x2BB giveitem ITEM_POWDER_JAR compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1A6BF9 + goto_if_eq EventScript_1A6BF9 msgbox gUnknown_8193033 release end @@ -42,33 +42,20 @@ EventScript_16AEC8:: @ 816AEC8 setvar VAR_0x8004, 5 special sub_80CB7C4 waitstate - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_16AF6C - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16AF80 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_16AF94 - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_16AFA8 - compare_var_to_value VAR_0x8000, 4 - goto_if 1, EventScript_16AFBC - compare_var_to_value VAR_0x8000, 5 - goto_if 1, EventScript_16AFD0 - compare_var_to_value VAR_0x8000, 6 - goto_if 1, EventScript_16AFE4 - compare_var_to_value VAR_0x8000, 7 - goto_if 1, EventScript_16AFF8 - compare_var_to_value VAR_0x8000, 8 - goto_if 1, EventScript_16B00C - compare_var_to_value VAR_0x8000, 9 - goto_if 1, EventScript_16B020 - compare_var_to_value VAR_0x8000, 10 - goto_if 1, EventScript_16B034 - compare_var_to_value VAR_0x8000, 11 - goto_if 1, EventScript_16B048 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_16B048 + switch VAR_RESULT + case 0, EventScript_16AF6C + case 1, EventScript_16AF80 + case 2, EventScript_16AF94 + case 3, EventScript_16AFA8 + case 4, EventScript_16AFBC + case 5, EventScript_16AFD0 + case 6, EventScript_16AFE4 + case 7, EventScript_16AFF8 + case 8, EventScript_16B00C + case 9, EventScript_16B020 + case 10, EventScript_16B034 + case 11, EventScript_16B048 + case 127, EventScript_16B048 end EventScript_16AF6C:: @ 816AF6C @@ -157,20 +144,20 @@ EventScript_16B048:: @ 816B048 EventScript_16B055:: @ 816B055 msgbox gUnknown_819331E, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16AEC8 + goto_if_eq EventScript_16AEC8 copyvar VAR_0x8004, VAR_0x8009 specialvar VAR_RESULT, sub_815EEB0 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16B0CC + goto_if_eq EventScript_16B0CC giveitem VAR_0x8008 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16B0BF + goto_if_eq EventScript_16B0BF copyvar VAR_0x8004, VAR_0x8009 special sub_815EF5C special sub_815F070 msgbox gUnknown_819337A, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16AEC8 + goto_if_eq EventScript_16AEC8 msgbox gUnknown_81933FB special sub_815F114 release @@ -191,7 +178,7 @@ CeruleanCity_House5_EventScript_16B0DA:: @ 816B0DA lockall special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_814EA7C waitstate releaseall diff --git a/data/maps/CeruleanCity_Mart/scripts.inc b/data/maps/CeruleanCity_Mart/scripts.inc index 56558f175..6f05c3e80 100644 --- a/data/maps/CeruleanCity_Mart/scripts.inc +++ b/data/maps/CeruleanCity_Mart/scripts.inc @@ -12,7 +12,7 @@ CeruleanCity_Mart_EventScript_16ACA7:: @ 816ACA7 CeruleanCity_Mart_EventScript_16ACB0:: @ 816ACB0 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lock faceplayer message Text_1A6211 diff --git a/data/maps/CinnabarIsland/scripts.inc b/data/maps/CinnabarIsland/scripts.inc index 328a34bcb..90d564eff 100644 --- a/data/maps/CinnabarIsland/scripts.inc +++ b/data/maps/CinnabarIsland/scripts.inc @@ -43,7 +43,7 @@ EventScript_166F52:: @ 8166F52 EventScript_166F5E:: @ 8166F5E checkflag FLAG_0x1A8 - goto_if 1, EventScript_166F68 + goto_if_eq EventScript_166F68 return EventScript_166F68:: @ 8166F68 @@ -109,9 +109,9 @@ EventScript_166FCD:: @ 8166FCD msgbox gUnknown_8180C90 msgbox gUnknown_8180CAA, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_167068 + goto_if_eq EventScript_167068 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_167078 + goto_if_eq EventScript_167078 end EventScript_167032:: @ 8167032 diff --git a/data/maps/CinnabarIsland_Gym/scripts.inc b/data/maps/CinnabarIsland_Gym/scripts.inc index 6e4431f87..ab4967fe5 100644 --- a/data/maps/CinnabarIsland_Gym/scripts.inc +++ b/data/maps/CinnabarIsland_Gym/scripts.inc @@ -4,7 +4,7 @@ CinnabarIsland_Gym_MapScripts:: @ 816D94B CinnabarIsland_Gym_MapScript1_16D951:: @ 816D951 checkflag FLAG_0x4B6 - goto_if 1, EventScript_16D991 + goto_if_eq EventScript_16D991 checkflag FLAG_0x265 call_if 1, EventScript_16D9B0 checkflag FLAG_0x267 @@ -81,7 +81,7 @@ EventScript_16DA34:: @ 816DA34 msgbox gUnknown_819969E checkitemspace ITEM_TM38, 1 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16DA75 + goto_if_eq EventScript_16DA75 additem ITEM_TM38, 1 giveitemfanfaremsg gUnknown_81996FF, ITEM_TM38 setflag FLAG_0x24E @@ -196,7 +196,7 @@ CinnabarIsland_Gym_EventScript_16DBAB:: @ 816DBAB lock faceplayer checkflag FLAG_0x4B6 - goto_if 1, EventScript_16DBC0 + goto_if_eq EventScript_16DBC0 msgbox gUnknown_8199B81 release end @@ -209,7 +209,7 @@ EventScript_16DBC0:: @ 816DBC0 CinnabarIsland_Gym_EventScript_16DBCA:: @ 816DBCA lockall checkflag FLAG_UNK826 - goto_if 1, EventScript_16DBDE + goto_if_eq EventScript_16DBDE msgbox gUnknown_8199C29 releaseall end @@ -235,9 +235,9 @@ EventScript_16DC00:: @ 816DC00 msgbox gUnknown_8199C9F msgbox gUnknown_8199D5A, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16DC43 + goto_if_eq EventScript_16DC43 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16DC6A + goto_if_eq EventScript_16DC6A end EventScript_16DC27:: @ 816DC27 @@ -257,7 +257,7 @@ EventScript_16DC34:: @ 816DC34 EventScript_16DC43:: @ 816DC43 call EventScript_16DC27 checkflag FLAG_0x265 - goto_if 1, EventScript_16DC68 + goto_if_eq EventScript_16DC68 call EventScript_16DC58 releaseall end @@ -290,7 +290,7 @@ EventScript_16DC7A:: @ 816DC7A msgbox gUnknown_819983F trainerbattle 3, 213, 0, Text_199870 checkflag FLAG_0x265 - goto_if 1, EventScript_16DC68 + goto_if_eq EventScript_16DC68 call EventScript_16DC58 releaseall end @@ -332,15 +332,15 @@ EventScript_16DCF5:: @ 816DCF5 msgbox gUnknown_8199C9F msgbox gUnknown_8199D79, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16DD41 + goto_if_eq EventScript_16DD41 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16DD1C + goto_if_eq EventScript_16DD1C end EventScript_16DD1C:: @ 816DD1C call EventScript_16DC27 checkflag FLAG_0x267 - goto_if 1, EventScript_16DC68 + goto_if_eq EventScript_16DC68 call EventScript_16DD31 releaseall end @@ -369,7 +369,7 @@ EventScript_16DD51:: @ 816DD51 msgbox gUnknown_81998BD trainerbattle 3, 178, 0, Text_1998ED checkflag FLAG_0x267 - goto_if 1, EventScript_16DC68 + goto_if_eq EventScript_16DC68 call EventScript_16DD31 releaseall end @@ -420,15 +420,15 @@ EventScript_16DDD3:: @ 816DDD3 msgbox gUnknown_8199C9F msgbox gUnknown_8199DA9, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16DE1F + goto_if_eq EventScript_16DE1F compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16DDFA + goto_if_eq EventScript_16DDFA end EventScript_16DDFA:: @ 816DDFA call EventScript_16DC27 checkflag FLAG_0x268 - goto_if 1, EventScript_16DC68 + goto_if_eq EventScript_16DC68 call EventScript_16DE0F releaseall end @@ -457,7 +457,7 @@ EventScript_16DE2F:: @ 816DE2F msgbox gUnknown_8199948 trainerbattle 3, 214, 0, Text_199973 checkflag FLAG_0x268 - goto_if 1, EventScript_16DC68 + goto_if_eq EventScript_16DC68 call EventScript_16DE0F releaseall end @@ -499,15 +499,15 @@ EventScript_16DEAA:: @ 816DEAA msgbox gUnknown_8199C9F msgbox gUnknown_8199DC6, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16DEF6 + goto_if_eq EventScript_16DEF6 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16DED1 + goto_if_eq EventScript_16DED1 end EventScript_16DED1:: @ 816DED1 call EventScript_16DC27 checkflag FLAG_0x269 - goto_if 1, EventScript_16DC68 + goto_if_eq EventScript_16DC68 call EventScript_16DEE6 releaseall end @@ -536,7 +536,7 @@ EventScript_16DF06:: @ 816DF06 msgbox gUnknown_81999B7 trainerbattle 3, 179, 0, Text_1999DB checkflag FLAG_0x269 - goto_if 1, EventScript_16DC68 + goto_if_eq EventScript_16DC68 call EventScript_16DEE6 releaseall end @@ -578,15 +578,15 @@ EventScript_16DF81:: @ 816DF81 msgbox gUnknown_8199C9F msgbox gUnknown_8199E00, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16DFA8 + goto_if_eq EventScript_16DFA8 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16DFCD + goto_if_eq EventScript_16DFCD end EventScript_16DFA8:: @ 816DFA8 call EventScript_16DC27 checkflag FLAG_0x26A - goto_if 1, EventScript_16DC68 + goto_if_eq EventScript_16DC68 call EventScript_16DFBD releaseall end @@ -615,7 +615,7 @@ EventScript_16DFDD:: @ 816DFDD msgbox gUnknown_8199A7F trainerbattle 3, 215, 0, Text_199AB9 checkflag FLAG_0x26A - goto_if 1, EventScript_16DC68 + goto_if_eq EventScript_16DC68 call EventScript_16DFBD releaseall end @@ -657,15 +657,15 @@ EventScript_16E058:: @ 816E058 msgbox gUnknown_8199C9F msgbox gUnknown_8199E36, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16E0A4 + goto_if_eq EventScript_16E0A4 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16E07F + goto_if_eq EventScript_16E07F end EventScript_16E07F:: @ 816E07F call EventScript_16DC27 checkflag FLAG_0x26B - goto_if 1, EventScript_16DC68 + goto_if_eq EventScript_16DC68 call EventScript_16E094 releaseall end @@ -694,7 +694,7 @@ EventScript_16E0B4:: @ 816E0B4 msgbox gUnknown_8199AFC trainerbattle 3, 180, 0, Text_199B16 checkflag FLAG_0x26B - goto_if 1, EventScript_16DC68 + goto_if_eq EventScript_16DC68 call EventScript_16E094 releaseall end diff --git a/data/maps/CinnabarIsland_Mart/scripts.inc b/data/maps/CinnabarIsland_Mart/scripts.inc index be01ab1fc..c82034dd0 100644 --- a/data/maps/CinnabarIsland_Mart/scripts.inc +++ b/data/maps/CinnabarIsland_Mart/scripts.inc @@ -12,7 +12,7 @@ CinnabarIsland_Mart_EventScript_16EA19:: @ 816EA19 CinnabarIsland_Mart_EventScript_16EA22:: @ 816EA22 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lock faceplayer message Text_1A6211 diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc index 0323e4fe4..f356f6106 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc @@ -31,7 +31,7 @@ CinnabarIsland_PokemonCenter_1F_EventScript_16E90A:: @ 816E90A faceplayer msgbox gUnknown_819A725, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16E9A5 + goto_if_eq EventScript_16E9A5 msgbox gUnknown_819A785 closemessage playbgm BGM_FRLG_FOLLOW_ME, 1 diff --git a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc index c9a2c5103..3b415bfab 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc @@ -7,10 +7,10 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E401:: @ 816E401 setvar VAR_0x8008, 8 call EventScript_1A8CAD checkflag FLAG_0x276 - goto_if 1, EventScript_16E473 + goto_if_eq EventScript_16E473 msgbox gUnknown_81A597B, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16E45B + goto_if_eq EventScript_16E45B call EventScript_1A8CBD compare_var_to_value VAR_0x8004, 6 goto_if 4, EventScript_16E45B @@ -46,20 +46,20 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E47D:: @ 816E47D checkflag FLAG_0x2EE call_if 1, EventScript_16E8A1 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16E897 + goto_if_eq EventScript_16E897 compare_var_to_value VAR_0x406A, 2 - goto_if 1, EventScript_16E736 + goto_if_eq EventScript_16E736 compare_var_to_value VAR_0x406A, 1 - goto_if 1, EventScript_16E72C + goto_if_eq EventScript_16E72C call EventScript_16E4EC compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16E544 + goto_if_eq EventScript_16E544 call EventScript_16E504 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16E586 + goto_if_eq EventScript_16E586 call EventScript_16E51C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16E5C8 + goto_if_eq EventScript_16E5C8 msgbox gUnknown_819A282 goto EventScript_16E53A end @@ -68,7 +68,7 @@ EventScript_16E4EC:: @ 816E4EC checkflag FLAG_0x273 goto_if 0, EventScript_16E534 checkflag FLAG_0x2ED - goto_if 1, EventScript_16E534 + goto_if_eq EventScript_16E534 setvar VAR_RESULT, 1 return @@ -76,7 +76,7 @@ EventScript_16E504:: @ 816E504 checkflag FLAG_0x272 goto_if 0, EventScript_16E534 checkflag FLAG_0x2EC - goto_if 1, EventScript_16E534 + goto_if_eq EventScript_16E534 setvar VAR_RESULT, 1 return @@ -84,7 +84,7 @@ EventScript_16E51C:: @ 816E51C checkflag FLAG_0x25E goto_if 0, EventScript_16E534 checkflag FLAG_0x2EE - goto_if 1, EventScript_16E534 + goto_if_eq EventScript_16E534 setvar VAR_RESULT, 1 return @@ -102,15 +102,12 @@ EventScript_16E544:: @ 816E544 waitmessage call EventScript_16E51C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16E5FA + goto_if_eq EventScript_16E5FA multichoice 0, 0, 21, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_16E668 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16E53A - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_16E53A + switch VAR_RESULT + case 0, EventScript_16E668 + case 1, EventScript_16E53A + case 127, EventScript_16E53A end EventScript_16E586:: @ 816E586 @@ -118,54 +115,40 @@ EventScript_16E586:: @ 816E586 waitmessage call EventScript_16E51C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16E631 + goto_if_eq EventScript_16E631 multichoice 0, 0, 22, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_16E6A6 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16E53A - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_16E53A + switch VAR_RESULT + case 0, EventScript_16E6A6 + case 1, EventScript_16E53A + case 127, EventScript_16E53A end EventScript_16E5C8:: @ 816E5C8 message Text_19A282 waitmessage multichoice 0, 0, 23, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_16E6E4 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16E53A - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_16E53A + switch VAR_RESULT + case 0, EventScript_16E6E4 + case 1, EventScript_16E53A + case 127, EventScript_16E53A end EventScript_16E5FA:: @ 816E5FA multichoice 0, 0, 24, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_16E668 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16E6E4 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_16E53A - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_16E53A + switch VAR_RESULT + case 0, EventScript_16E668 + case 1, EventScript_16E6E4 + case 2, EventScript_16E53A + case 127, EventScript_16E53A end EventScript_16E631:: @ 816E631 multichoice 0, 0, 25, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_16E6A6 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16E6E4 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_16E53A - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_16E53A + switch VAR_RESULT + case 0, EventScript_16E6A6 + case 1, EventScript_16E6E4 + case 2, EventScript_16E53A + case 127, EventScript_16E53A end EventScript_16E668:: @ 816E668 @@ -173,7 +156,7 @@ EventScript_16E668:: @ 816E668 getitemname 1, ITEM_HELIX_FOSSIL msgbox gUnknown_819A3D4, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16E722 + goto_if_eq EventScript_16E722 msgbox gUnknown_819A45D textcolor 0 removeitem ITEM_HELIX_FOSSIL, 1 @@ -188,7 +171,7 @@ EventScript_16E6A6:: @ 816E6A6 getitemname 1, ITEM_DOME_FOSSIL msgbox gUnknown_819A3D4, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16E722 + goto_if_eq EventScript_16E722 msgbox gUnknown_819A45D textcolor 0 removeitem ITEM_DOME_FOSSIL, 1 @@ -203,7 +186,7 @@ EventScript_16E6E4:: @ 816E6E4 getitemname 1, ITEM_OLD_AMBER msgbox gUnknown_819A3D4, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16E722 + goto_if_eq EventScript_16E722 msgbox gUnknown_819A45D textcolor 0 removeitem ITEM_OLD_AMBER, 1 @@ -225,11 +208,11 @@ EventScript_16E72C:: @ 816E72C EventScript_16E736:: @ 816E736 compare_var_to_value VAR_0x4069, 1 - goto_if 1, EventScript_16E758 + goto_if_eq EventScript_16E758 compare_var_to_value VAR_0x4069, 2 - goto_if 1, EventScript_16E79D + goto_if_eq EventScript_16E79D compare_var_to_value VAR_0x4069, 3 - goto_if 1, EventScript_16E7E2 + goto_if_eq EventScript_16E7E2 end EventScript_16E758:: @ 816E758 @@ -238,12 +221,12 @@ EventScript_16E758:: @ 816E758 msgbox gUnknown_819A34F givemon SPECIES_OMANYTE, 5, ITEM_NONE, 0, 0, 0 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A927C + goto_if_eq EventScript_1A927C setflag FLAG_0x2ED compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16E827 + goto_if_eq EventScript_16E827 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16E85B + goto_if_eq EventScript_16E85B end EventScript_16E79D:: @ 816E79D @@ -252,12 +235,12 @@ EventScript_16E79D:: @ 816E79D msgbox gUnknown_819A34F givemon SPECIES_KABUTO, 5, ITEM_NONE, 0, 0, 0 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A927C + goto_if_eq EventScript_1A927C setflag FLAG_0x2EC compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16E827 + goto_if_eq EventScript_16E827 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16E85B + goto_if_eq EventScript_16E85B end EventScript_16E7E2:: @ 816E7E2 @@ -266,12 +249,12 @@ EventScript_16E7E2:: @ 816E7E2 msgbox gUnknown_819A34F givemon SPECIES_AERODACTYL, 5, ITEM_NONE, 0, 0, 0 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A927C + goto_if_eq EventScript_1A927C setflag FLAG_0x2EE compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16E827 + goto_if_eq EventScript_16E827 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16E85B + goto_if_eq EventScript_16E85B end EventScript_16E827:: @ 816E827 @@ -283,7 +266,7 @@ EventScript_16E827:: @ 816E827 setvar VAR_0x406A, 0 msgbox gUnknown_81A56A7, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16E895 + goto_if_eq EventScript_16E895 call EventScript_1A8C27 call EventScript_1A74EB goto EventScript_16E895 @@ -298,7 +281,7 @@ EventScript_16E85B:: @ 816E85B setvar VAR_0x406A, 0 msgbox gUnknown_81A56A7, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16E88A + goto_if_eq EventScript_16E88A call EventScript_1A8C33 goto EventScript_16E88A end @@ -319,9 +302,9 @@ EventScript_16E897:: @ 816E897 EventScript_16E8A1:: @ 816E8A1 checkflag FLAG_0x273 - goto_if 1, EventScript_16E8B9 + goto_if_eq EventScript_16E8B9 checkflag FLAG_0x272 - goto_if 1, EventScript_16E8C8 + goto_if_eq EventScript_16E8C8 goto EventScript_16E534 end diff --git a/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc index 7959c6c4c..651fe0c76 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc @@ -11,10 +11,10 @@ CinnabarIsland_PokemonLab_Lounge_EventScript_16E2C2:: @ 816E2C2 setvar VAR_0x8008, 6 call EventScript_1A8CAD checkflag FLAG_0x274 - goto_if 1, EventScript_16E334 + goto_if_eq EventScript_16E334 msgbox gUnknown_81A59FE, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16E31C + goto_if_eq EventScript_16E31C call EventScript_1A8CBD compare_var_to_value VAR_0x8004, 6 goto_if 4, EventScript_16E31C @@ -51,10 +51,10 @@ CinnabarIsland_PokemonLab_Lounge_EventScript_16E33E:: @ 816E33E specialvar VAR_RESULT, sub_8053A9C copyvar VAR_0x8009, VAR_RESULT checkflag FLAG_0x275 - goto_if 1, EventScript_16E3D4 + goto_if_eq EventScript_16E3D4 msgbox gUnknown_81A5AD6, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16E3BC + goto_if_eq EventScript_16E3BC special sub_80BF8FC waitstate copyvar VAR_0x800A, VAR_0x8004 diff --git a/data/maps/FiveIsland_LostCave_Room10/scripts.inc b/data/maps/FiveIsland_LostCave_Room10/scripts.inc index d5b03e7ff..cd21dbcbd 100644 --- a/data/maps/FiveIsland_LostCave_Room10/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Room10/scripts.inc @@ -27,7 +27,7 @@ EventScript_164C52:: @ 8164C52 msgbox gUnknown_817D062 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_164CB6 + goto_if_eq EventScript_164CB6 trainerbattle 3, 606, 0, Text_17D086 msgbox gUnknown_817D0B2 closemessage diff --git a/data/maps/FiveIsland_Meadow/scripts.inc b/data/maps/FiveIsland_Meadow/scripts.inc index 2f272b58a..4b3b4d895 100644 --- a/data/maps/FiveIsland_Meadow/scripts.inc +++ b/data/maps/FiveIsland_Meadow/scripts.inc @@ -10,9 +10,9 @@ FiveIsland_Meadow_MapScript1_168938:: @ 8168938 FiveIsland_Meadow_EventScript_168942:: @ 8168942 lockall checkflag FLAG_0x2D6 - goto_if 1, EventScript_168979 + goto_if_eq EventScript_168979 checkflag FLAG_0x2D8 - goto_if 1, EventScript_16895F + goto_if_eq EventScript_16895F msgbox gUnknown_818AB8E releaseall end diff --git a/data/maps/FiveIsland_MemorialPillar/scripts.inc b/data/maps/FiveIsland_MemorialPillar/scripts.inc index ef3ff4ef5..23b3527f7 100644 --- a/data/maps/FiveIsland_MemorialPillar/scripts.inc +++ b/data/maps/FiveIsland_MemorialPillar/scripts.inc @@ -4,9 +4,9 @@ FiveIsland_MemorialPillar_MapScripts:: @ 81689D2 FiveIsland_MemorialPillar_EventScript_1689D3:: @ 81689D3 lock checkflag FLAG_0x236 - goto_if 1, EventScript_168A18 + goto_if_eq EventScript_168A18 checkflag FLAG_0x2D7 - goto_if 1, EventScript_168A22 + goto_if_eq EventScript_168A22 msgbox gUnknown_818B02E closemessage applymovement 1, Movement_1A75E1 @@ -28,7 +28,7 @@ EventScript_168A22:: @ 8168A22 msgbox gUnknown_818B282 giveitem ITEM_TM42 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_168AFE + goto_if_eq EventScript_168AFE call EventScript_168AE8 release end @@ -36,24 +36,24 @@ EventScript_168A22:: @ 8168A22 FiveIsland_MemorialPillar_EventScript_168A48:: @ 8168A48 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 lockall checkflag FLAG_0x236 - goto_if 1, EventScript_168B0B + goto_if_eq EventScript_168B0B checkflag FLAG_0x2D7 - goto_if 1, EventScript_168B0B + goto_if_eq EventScript_168B0B msgbox gUnknown_818B095 checkitem ITEM_LEMONADE, 1 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_168A86 + goto_if_eq EventScript_168A86 releaseall end EventScript_168A86:: @ 8168A86 msgbox gUnknown_818B105, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_168A9B + goto_if_eq EventScript_168A9B releaseall end @@ -70,7 +70,7 @@ EventScript_168A9B:: @ 8168A9B msgbox gUnknown_818B171 giveitem ITEM_TM42 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_168AFE + goto_if_eq EventScript_168AFE call EventScript_168AE8 releaseall end diff --git a/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc b/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc index ccdc69d54..a4dc96f91 100644 --- a/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc +++ b/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc @@ -4,14 +4,14 @@ FiveIsland_ResortGorgeous_House_MapScripts:: @ 8171EBD FiveIsland_ResortGorgeous_House_EventScript_171EBE:: @ 8171EBE special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 lock faceplayer checkflag FLAG_0x002 - goto_if 1, EventScript_172043 + goto_if_eq EventScript_172043 compare_var_to_value VAR_STORAGE_UNKNOWN, 65535 - goto_if 1, EventScript_171F0B + goto_if_eq EventScript_171F0B compare_var_to_value VAR_STORAGE_UNKNOWN, 0 goto_if 5, EventScript_171F19 msgbox gUnknown_81A42A0 @@ -33,7 +33,7 @@ EventScript_171F19:: @ 8171F19 copyvar VAR_0x8004, VAR_STORAGE_UNKNOWN specialvar VAR_RESULT, sub_80CC48C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_171F34 + goto_if_eq EventScript_171F34 goto EventScript_171EFE end @@ -64,7 +64,7 @@ EventScript_171F34:: @ 8171F34 msgbox gUnknown_81A458E giveitem VAR_0x403B compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_172025 + goto_if_eq EventScript_172025 setflag FLAG_0x002 setvar VAR_STORAGE_UNKNOWN, 0 release diff --git a/data/maps/FiveIsland_RocketWarehouse/scripts.inc b/data/maps/FiveIsland_RocketWarehouse/scripts.inc index f59cc2838..bac115e76 100644 --- a/data/maps/FiveIsland_RocketWarehouse/scripts.inc +++ b/data/maps/FiveIsland_RocketWarehouse/scripts.inc @@ -20,7 +20,7 @@ EventScript_163F47:: @ 8163F47 FiveIsland_RocketWarehouse_EventScript_163F5A:: @ 8163F5A lockall checkflag FLAG_0x2D5 - goto_if 1, EventScript_163F6E + goto_if_eq EventScript_163F6E msgbox gUnknown_817B4E3 releaseall end @@ -45,7 +45,7 @@ FiveIsland_RocketWarehouse_EventScript_163F81:: @ 8163F81 FiveIsland_RocketWarehouse_EventScript_163F93:: @ 8163F93 trainerbattle 2, 545, 0, Text_17BBAF, Text_17BC55, EventScript_163FCD checkflag FLAG_0x844 - goto_if 1, EventScript_163FB7 + goto_if_eq EventScript_163FB7 msgbox gUnknown_817BCA3, 6 end @@ -144,7 +144,7 @@ EventScript_1640A2:: @ 81640A2 EventScript_16412E:: @ 816412E compare_var_to_value VAR_0x8004, 27 - goto_if 1, EventScript_1A77A9 + goto_if_eq EventScript_1A77A9 applymovement 255, Movement_1A75EB waitmovement 0 return diff --git a/data/maps/FiveIsland_WaterLabyrinth/scripts.inc b/data/maps/FiveIsland_WaterLabyrinth/scripts.inc index 99b0d18c0..b3b6243ab 100644 --- a/data/maps/FiveIsland_WaterLabyrinth/scripts.inc +++ b/data/maps/FiveIsland_WaterLabyrinth/scripts.inc @@ -4,18 +4,18 @@ FiveIsland_WaterLabyrinth_MapScripts:: @ 816884D FiveIsland_WaterLabyrinth_EventScript_16884E:: @ 816884E special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 lock faceplayer checkflag FLAG_0x2DA - goto_if 1, EventScript_1688E3 + goto_if_eq EventScript_1688E3 checkflag FLAG_0x2DB - goto_if 1, EventScript_16892C + goto_if_eq EventScript_16892C msgbox gUnknown_818A80D specialvar VAR_RESULT, sub_80CA76C compare_var_to_value VAR_RESULT, 6 - goto_if 1, EventScript_1688AC + goto_if_eq EventScript_1688AC msgbox gUnknown_818A88F release end @@ -36,7 +36,7 @@ EventScript_1688AC:: @ 81688AC EventScript_1688BA:: @ 81688BA countpokemon compare_var_to_value VAR_RESULT, 6 - goto_if 1, EventScript_16891F + goto_if_eq EventScript_16891F setflag FLAG_0x2DA giveegg SPECIES_TOGEPI textcolor 3 @@ -53,12 +53,12 @@ EventScript_1688E3:: @ 81688E3 setvar VAR_0x8004, 175 specialvar VAR_RESULT, sub_80CD0F4 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_168895 + goto_if_eq EventScript_168895 getspeciesname 1, SPECIES_TOGETIC setvar VAR_0x8004, 176 specialvar VAR_RESULT, sub_80CD0F4 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_168895 + goto_if_eq EventScript_168895 msgbox gUnknown_818A9C0 release end diff --git a/data/maps/FourIsland/scripts.inc b/data/maps/FourIsland/scripts.inc index 4c54e61a4..3e4348e7b 100644 --- a/data/maps/FourIsland/scripts.inc +++ b/data/maps/FourIsland/scripts.inc @@ -73,18 +73,18 @@ Movement_167D52:: @ 8167D52 FourIsland_EventScript_167D55:: @ 8167D55 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 lock faceplayer special GetDaycareMonNicknames specialvar VAR_RESULT, GetDaycareState compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_167D9B + goto_if_eq EventScript_167D9B compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_167E0C + goto_if_eq EventScript_167E0C compare_var_to_value VAR_RESULT, 3 - goto_if 1, EventScript_167E19 + goto_if_eq EventScript_167E19 msgbox gUnknown_81BF555 release end @@ -92,10 +92,10 @@ FourIsland_EventScript_167D55:: @ 8167D55 EventScript_167D9B:: @ 8167D9B msgbox gUnknown_81BF5E3, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_167DD1 + goto_if_eq EventScript_167DD1 msgbox gUnknown_81BF7B6, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_167DD1 + goto_if_eq EventScript_167DD1 msgbox gUnknown_81BF6CF clearflag FLAG_PENDING_DAYCARE_EGG special RejectEggFromDayCare @@ -143,7 +143,7 @@ FourIsland_EventScript_167E2E:: @ 8167E2E lock faceplayer checkflag FLAG_0x844 - goto_if 1, EventScript_167E43 + goto_if_eq EventScript_167E43 msgbox gUnknown_8182A2B release end diff --git a/data/maps/FourIsland_LoreleisHouse/scripts.inc b/data/maps/FourIsland_LoreleisHouse/scripts.inc index d8dc716e3..ab7196c62 100644 --- a/data/maps/FourIsland_LoreleisHouse/scripts.inc +++ b/data/maps/FourIsland_LoreleisHouse/scripts.inc @@ -10,9 +10,9 @@ FourIsland_LoreleisHouse_EventScript_171C58:: @ 8171C58 lock faceplayer checkflag FLAG_0x2D4 - goto_if 1, EventScript_171C83 + goto_if_eq EventScript_171C83 checkflag FLAG_0x2D5 - goto_if 1, EventScript_171C76 + goto_if_eq EventScript_171C76 msgbox gUnknown_81A3826 release end diff --git a/data/maps/FourIsland_Mart/scripts.inc b/data/maps/FourIsland_Mart/scripts.inc index 6e563b6dd..026d172a9 100644 --- a/data/maps/FourIsland_Mart/scripts.inc +++ b/data/maps/FourIsland_Mart/scripts.inc @@ -4,7 +4,7 @@ FourIsland_Mart_MapScripts:: @ 8171CAD FourIsland_Mart_EventScript_171CAE:: @ 8171CAE special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lock faceplayer message Text_1A6211 diff --git a/data/maps/FourIsland_PokemonDayCare/scripts.inc b/data/maps/FourIsland_PokemonDayCare/scripts.inc index 6048c1502..050e17c06 100644 --- a/data/maps/FourIsland_PokemonDayCare/scripts.inc +++ b/data/maps/FourIsland_PokemonDayCare/scripts.inc @@ -4,19 +4,19 @@ FourIsland_PokemonDayCare_MapScripts:: @ 817193F FourIsland_PokemonDayCare_EventScript_171940:: @ 8171940 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lock faceplayer specialvar VAR_RESULT, GetDaycareState compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_171A2E + goto_if_eq EventScript_171A2E compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_171A52 + goto_if_eq EventScript_171A52 compare_var_to_value VAR_RESULT, 3 - goto_if 1, EventScript_171B86 + goto_if_eq EventScript_171B86 msgbox gUnknown_81BF7E4, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_171993 + goto_if_eq EventScript_171993 msgbox gUnknown_81BF916 release end @@ -24,7 +24,7 @@ FourIsland_PokemonDayCare_EventScript_171940:: @ 8171940 EventScript_171993:: @ 8171993 specialvar VAR_RESULT, CountPartyNonEggMons compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_171A1A + goto_if_eq EventScript_171A1A msgbox gUnknown_81BF839 fadescreen 1 special ChooseSendDaycareMon @@ -33,7 +33,7 @@ EventScript_171993:: @ 8171993 goto_if 4, EventScript_1719F7 specialvar VAR_RESULT, CountPartyAliveNonEggMons_IgnoreVar0x8004Slot compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_171A24 + goto_if_eq EventScript_171A24 specialvar VAR_0x8005, GetSelectedMonNickAndSpecies waitse playmoncry VAR_0x8005, 0 @@ -43,7 +43,7 @@ EventScript_171993:: @ 8171993 incrementgamestat 47 specialvar VAR_RESULT, GetDaycareState compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_171A01 + goto_if_eq EventScript_171A01 release end @@ -55,7 +55,7 @@ EventScript_1719F7:: @ 81719F7 EventScript_171A01:: @ 8171A01 msgbox gUnknown_81BF89F, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_171993 + goto_if_eq EventScript_171993 goto EventScript_1719F7 end @@ -90,26 +90,26 @@ EventScript_171A52:: @ 8171A52 call EventScript_171A41 msgbox gUnknown_81BF89F, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_171993 + goto_if_eq EventScript_171993 msgbox gUnknown_81BFAE8, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_171A90 + goto_if_eq EventScript_171A90 goto EventScript_1719F7 end EventScript_171A90:: @ 8171A90 specialvar VAR_RESULT, CalculatePlayerPartyCount compare_var_to_value VAR_RESULT, 6 - goto_if 1, EventScript_171B67 + goto_if_eq EventScript_171B67 specialvar VAR_RESULT, GetDaycareState setvar VAR_0x8004, 0 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_171ACF + goto_if_eq EventScript_171ACF special ShowDaycareLevelMenu waitstate copyvar VAR_0x8004, VAR_RESULT compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1719F7 + goto_if_eq EventScript_1719F7 goto EventScript_171ACF end @@ -117,14 +117,14 @@ EventScript_171ACF:: @ 8171ACF special GetDaycareCost msgbox gUnknown_81BFA3B, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_171AEB + goto_if_eq EventScript_171AEB goto EventScript_1719F7 end EventScript_171AEB:: @ 8171AEB specialvar VAR_RESULT, IsEnoughForCostInVar0x8005 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_171B05 + goto_if_eq EventScript_171B05 msgbox gUnknown_81BF932 release end @@ -144,14 +144,14 @@ EventScript_171B05:: @ 8171B05 waitmoncry specialvar VAR_RESULT, GetDaycareState compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_171B4E + goto_if_eq EventScript_171B4E goto EventScript_1719F7 end EventScript_171B4E:: @ 8171B4E msgbox gUnknown_81BF94F, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_171A90 + goto_if_eq EventScript_171A90 goto EventScript_1719F7 end @@ -193,7 +193,7 @@ EventScript_171B86:: @ 8171B86 call EventScript_171A41 msgbox gUnknown_81BFAE8, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_171A90 + goto_if_eq EventScript_171A90 msgbox gUnknown_81BF976 release end @@ -202,7 +202,7 @@ EventScript_171BBF:: @ 8171BBF special ShowDaycareLevelMenu waitstate compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1719F7 + goto_if_eq EventScript_1719F7 copyvar VAR_0x8004, VAR_RESULT specialvar VAR_RESULT, TakePokemonFromDaycare msgbox gUnknown_81BFA67 diff --git a/data/maps/FuchsiaCity/scripts.inc b/data/maps/FuchsiaCity/scripts.inc index 8eaebe8e0..9fefb3d86 100644 --- a/data/maps/FuchsiaCity/scripts.inc +++ b/data/maps/FuchsiaCity/scripts.inc @@ -126,7 +126,7 @@ FuchsiaCity_EventScript_166E83:: @ 8166E83 FuchsiaCity_EventScript_166E9C:: @ 8166E9C lockall checkflag FLAG_0x272 - goto_if 1, EventScript_166EBE + goto_if_eq EventScript_166EBE setvar VAR_0x8004, SPECIES_KABUTO special sub_80CBDCC drawmonpic SPECIES_KABUTO, 10, 3 diff --git a/data/maps/FuchsiaCity_Building1/scripts.inc b/data/maps/FuchsiaCity_Building1/scripts.inc index 6092301c9..58cacf92e 100644 --- a/data/maps/FuchsiaCity_Building1/scripts.inc +++ b/data/maps/FuchsiaCity_Building1/scripts.inc @@ -5,9 +5,9 @@ FuchsiaCity_Building1_EventScript_16D74C:: @ 816D74C lock faceplayer checkflag FLAG_0x23A - goto_if 1, EventScript_16D7FA + goto_if_eq EventScript_16D7FA checkflag FLAG_0x189 - goto_if 1, EventScript_16D780 + goto_if_eq EventScript_16D780 msgbox gUnknown_8198DF9, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 call_if 1, EventScript_16D7E8 diff --git a/data/maps/FuchsiaCity_Gym/scripts.inc b/data/maps/FuchsiaCity_Gym/scripts.inc index 0d9f6b583..6b57f6377 100644 --- a/data/maps/FuchsiaCity_Gym/scripts.inc +++ b/data/maps/FuchsiaCity_Gym/scripts.inc @@ -28,7 +28,7 @@ EventScript_16D5A6:: @ 816D5A6 msgbox gUnknown_819850E checkitemspace ITEM_TM06, 1 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16D5E7 + goto_if_eq EventScript_16D5E7 additem ITEM_TM06, 1 giveitemfanfaremsg gUnknown_819858F, ITEM_TM06 setflag FLAG_0x259 @@ -78,7 +78,7 @@ FuchsiaCity_Gym_EventScript_16D688:: @ 816D688 lock faceplayer checkflag FLAG_0x4B4 - goto_if 1, EventScript_16D69D + goto_if_eq EventScript_16D69D msgbox gUnknown_8198A5E release end @@ -91,7 +91,7 @@ EventScript_16D69D:: @ 816D69D FuchsiaCity_Gym_EventScript_16D6A7:: @ 816D6A7 lockall checkflag FLAG_UNK824 - goto_if 1, EventScript_16D6BB + goto_if_eq EventScript_16D6BB msgbox gUnknown_8198B4B releaseall end diff --git a/data/maps/FuchsiaCity_House2/scripts.inc b/data/maps/FuchsiaCity_House2/scripts.inc index ac6e74297..0568d4e4f 100644 --- a/data/maps/FuchsiaCity_House2/scripts.inc +++ b/data/maps/FuchsiaCity_House2/scripts.inc @@ -5,10 +5,10 @@ FuchsiaCity_House2_EventScript_16D817:: @ 816D817 lock faceplayer checkflag FLAG_0x244 - goto_if 1, EventScript_16D83F + goto_if_eq EventScript_16D83F msgbox gUnknown_819918E, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16D849 + goto_if_eq EventScript_16D849 msgbox gUnknown_8199337 release end @@ -22,7 +22,7 @@ EventScript_16D849:: @ 816D849 msgbox gUnknown_8199207 checkitemspace ITEM_GOOD_ROD, 1 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16D88A + goto_if_eq EventScript_16D88A additem ITEM_GOOD_ROD, 1 giveitemfanfaremsg gUnknown_819925E, ITEM_GOOD_ROD msgbox gUnknown_8199296 diff --git a/data/maps/FuchsiaCity_House3/scripts.inc b/data/maps/FuchsiaCity_House3/scripts.inc index 500a45ac8..e295ad46d 100644 --- a/data/maps/FuchsiaCity_House3/scripts.inc +++ b/data/maps/FuchsiaCity_House3/scripts.inc @@ -6,7 +6,7 @@ FuchsiaCity_House3_EventScript_16D895:: @ 816D895 faceplayer msgbox gUnknown_81993B9, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16D8B0 + goto_if_eq EventScript_16D8B0 goto EventScript_16D941 end @@ -18,20 +18,20 @@ EventScript_16D8B0:: @ 816D8B0 goto_if 4, EventScript_16D941 special sub_80BFC14 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16D937 + goto_if_eq EventScript_16D937 special ScrSpecial_CountPokemonMoves compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16D92A + goto_if_eq EventScript_16D92A msgbox gUnknown_8199445 fadescreen 1 special sub_80BF9BC fadescreen 0 compare_var_to_value VAR_0x8005, 4 - goto_if 1, EventScript_16D8B0 + goto_if_eq EventScript_16D8B0 special ScrSpecial_GetPokemonNicknameAndMoveName msgbox gUnknown_8199485, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16D919 + goto_if_eq EventScript_16D919 goto EventScript_16D941 end diff --git a/data/maps/FuchsiaCity_Mart/scripts.inc b/data/maps/FuchsiaCity_Mart/scripts.inc index da90ac8d0..fe95c748c 100644 --- a/data/maps/FuchsiaCity_Mart/scripts.inc +++ b/data/maps/FuchsiaCity_Mart/scripts.inc @@ -12,7 +12,7 @@ FuchsiaCity_Mart_EventScript_16D4EA:: @ 816D4EA FuchsiaCity_Mart_EventScript_16D4F3:: @ 816D4F3 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lock faceplayer message Text_1A6211 diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc index 08267468a..a2ee86113 100644 --- a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc +++ b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc @@ -39,7 +39,7 @@ EventScript_16D312:: @ 816D312 textcolor 0 msgbox gUnknown_8197E1A, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16D345 + goto_if_eq EventScript_16D345 msgbox gUnknown_8197E48 closemessage applymovement 255, Movement_16D362 @@ -103,7 +103,7 @@ EventScript_16D391:: @ 816D391 showmoneybox 0, 0, 0 msgbox gUnknown_8197C87, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16D3CA + goto_if_eq EventScript_16D3CA msgbox gUnknown_8197DE9 goto EventScript_16D49A end @@ -112,7 +112,7 @@ EventScript_16D3CA:: @ 816D3CA call EventScript_16D462 checkmoney 500, 0 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16D48C + goto_if_eq EventScript_16D48C takemoney 500, 0 updatemoneybox 0, 0, 0 msgbox gUnknown_8197D07 @@ -159,7 +159,7 @@ EventScript_16D462:: @ 816D462 goto_if 5, EventScript_1A77A9 specialvar VAR_RESULT, sub_80CABD0 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A77A9 + goto_if_eq EventScript_1A77A9 msgbox gUnknown_81BFEAC goto EventScript_16D49A end @@ -205,7 +205,7 @@ FuchsiaCity_SafariZone_Entrance_EventScript_16D4B7:: @ 816D4B7 faceplayer msgbox gUnknown_8197EB0, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16D4D6 + goto_if_eq EventScript_16D4D6 msgbox gUnknown_819809E release end diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc index a8aac2447..56a3cdcb3 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc +++ b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc @@ -12,7 +12,7 @@ IndigoPlateau_PokemonCenter_1F_MapScript1_16EA65:: @ 816EA65 EventScript_16EA79:: @ 816EA79 checkflag FLAG_0x844 - goto_if 1, EventScript_1A77A9 + goto_if_eq EventScript_1A77A9 setobjectxyperm 4, 4, 2 return @@ -21,14 +21,14 @@ IndigoPlateau_PokemonCenter_1F_EventScript_16EA8A:: @ 816EA8A faceplayer specialvar VAR_RESULT, sub_806E25C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16EAA6 + goto_if_eq EventScript_16EAA6 msgbox gUnknown_819A8D8 release end EventScript_16EAA6:: @ 816EAA6 checkflag FLAG_0x844 - goto_if 1, EventScript_16EAB9 + goto_if_eq EventScript_16EAB9 msgbox gUnknown_819A943 release end @@ -45,7 +45,7 @@ IndigoPlateau_PokemonCenter_1F_EventScript_16EAC3:: @ 816EAC3 IndigoPlateau_PokemonCenter_1F_EventScript_16EACC:: @ 816EACC special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lock faceplayer message Text_1A6211 diff --git a/data/maps/LavenderTown/scripts.inc b/data/maps/LavenderTown/scripts.inc index 1329fe26b..999662e6e 100644 --- a/data/maps/LavenderTown/scripts.inc +++ b/data/maps/LavenderTown/scripts.inc @@ -13,7 +13,7 @@ LavenderTown_EventScript_16687D:: @ 816687D faceplayer msgbox gUnknown_817F52E, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16689C + goto_if_eq EventScript_16689C msgbox gUnknown_817F568 release end diff --git a/data/maps/LavenderTown_House1/scripts.inc b/data/maps/LavenderTown_House1/scripts.inc index 406ada7ae..8f7ba9d44 100644 --- a/data/maps/LavenderTown_House1/scripts.inc +++ b/data/maps/LavenderTown_House1/scripts.inc @@ -5,7 +5,7 @@ LavenderTown_House1_EventScript_16B233:: @ 816B233 lock faceplayer checkflag FLAG_0x23C - goto_if 1, EventScript_16B248 + goto_if_eq EventScript_16B248 msgbox gUnknown_819397D release end diff --git a/data/maps/LavenderTown_House2/scripts.inc b/data/maps/LavenderTown_House2/scripts.inc index bbced623f..0a5c708ab 100644 --- a/data/maps/LavenderTown_House2/scripts.inc +++ b/data/maps/LavenderTown_House2/scripts.inc @@ -6,9 +6,9 @@ LavenderTown_House2_EventScript_16B266:: @ 816B266 faceplayer msgbox gUnknown_8193A4B, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16B287 + goto_if_eq EventScript_16B287 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16B2AA + goto_if_eq EventScript_16B2AA end EventScript_16B287:: @ 816B287 @@ -29,20 +29,20 @@ EventScript_16B2AA:: @ 816B2AA EventScript_16B2B4:: @ 816B2B4 specialvar VAR_RESULT, sub_80CAD54 compare_var_to_value VAR_RESULT, SPECIES_EGG - goto_if 1, EventScript_16B307 + goto_if_eq EventScript_16B307 special TV_CopyNicknameToStringVar1AndEnsureTerminated special TV_CheckMonOTIDEqualsPlayerID compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16B311 + goto_if_eq EventScript_16B311 specialvar VAR_RESULT, sub_80CAD7C special TV_CopyNicknameToStringVar1AndEnsureTerminated compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16B311 + goto_if_eq EventScript_16B311 msgbox gUnknown_8193AD2, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16B31B + goto_if_eq EventScript_16B31B compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16B2AA + goto_if_eq EventScript_16B2AA end EventScript_16B307:: @ 816B307 @@ -61,7 +61,7 @@ EventScript_16B31B:: @ 816B31B specialvar VAR_RESULT, sub_80CBFA0 special TV_CopyNicknameToStringVar1AndEnsureTerminated compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16B345 + goto_if_eq EventScript_16B345 msgbox gUnknown_8193BF0 release end diff --git a/data/maps/LavenderTown_Mart/scripts.inc b/data/maps/LavenderTown_Mart/scripts.inc index ca3307efb..380af6e9d 100644 --- a/data/maps/LavenderTown_Mart/scripts.inc +++ b/data/maps/LavenderTown_Mart/scripts.inc @@ -16,7 +16,7 @@ LavenderTown_Mart_EventScript_16B362:: @ 816B362 LavenderTown_Mart_EventScript_16B36B:: @ 816B36B special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lock faceplayer message Text_1A6211 diff --git a/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc b/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc index 4ee7efbdf..f1a079cde 100644 --- a/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc +++ b/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc @@ -5,11 +5,11 @@ LavenderTown_VolunteerPokemonHouse_EventScript_16B14A:: @ 816B14A lock faceplayer checkflag FLAG_0x23D - goto_if 1, EventScript_16B196 + goto_if_eq EventScript_16B196 msgbox gUnknown_81936FF checkitemspace ITEM_POKE_FLUTE, 1 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16B1A0 + goto_if_eq EventScript_16B1A0 setflag FLAG_0x23D additem ITEM_POKE_FLUTE, 1 giveitemfanfaremsg gUnknown_81937BD, ITEM_POKE_FLUTE, 1, BGM_FRLG_ME_KEYITEM @@ -45,7 +45,7 @@ LavenderTown_VolunteerPokemonHouse_EventScript_16B1CC:: @ 816B1CC lock faceplayer checkflag FLAG_0x23C - goto_if 1, EventScript_16B1E1 + goto_if_eq EventScript_16B1E1 msgbox gUnknown_81935ED release end diff --git a/data/maps/MtEmber_Exterior/scripts.inc b/data/maps/MtEmber_Exterior/scripts.inc index 4c7079c07..4ff35116d 100644 --- a/data/maps/MtEmber_Exterior/scripts.inc +++ b/data/maps/MtEmber_Exterior/scripts.inc @@ -26,9 +26,9 @@ EventScript_163975:: @ 8163975 MtEmber_Exterior_EventScript_16397F:: @ 816397F lock checktrainerflag FLAG_0x219 - goto_if 1, EventScript_16399E + goto_if_eq EventScript_16399E compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4 - goto_if 1, EventScript_1639A8 + goto_if_eq EventScript_1639A8 msgbox gUnknown_817A82A release end @@ -46,7 +46,7 @@ EventScript_1639A8:: @ 81639A8 trainerbattle 3, 537, 0, Text_17AA34 msgbox gUnknown_817AA3F checktrainerflag FLAG_0x21A - goto_if 1, EventScript_1639DB + goto_if_eq EventScript_1639DB release end @@ -64,9 +64,9 @@ MtEmber_Exterior_EventScript_1639F0:: @ 81639F0 lock faceplayer checktrainerflag FLAG_0x21A - goto_if 1, EventScript_163A1B + goto_if_eq EventScript_163A1B compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4 - goto_if 1, EventScript_163A25 + goto_if_eq EventScript_163A25 msgbox gUnknown_817A88C closemessage applymovement 3, Movement_1A75E5 @@ -85,7 +85,7 @@ EventScript_163A25:: @ 8163A25 trainerbattle 3, 538, 0, Text_17AA8A msgbox gUnknown_817AA99 checktrainerflag FLAG_0x219 - goto_if 1, EventScript_1639DB + goto_if_eq EventScript_1639DB release end diff --git a/data/maps/MtEmber_Summit/scripts.inc b/data/maps/MtEmber_Summit/scripts.inc index f877e3b9b..3de162df2 100644 --- a/data/maps/MtEmber_Summit/scripts.inc +++ b/data/maps/MtEmber_Summit/scripts.inc @@ -27,7 +27,7 @@ EventScript_163B2F:: @ 8163B2F MtEmber_Summit_EventScript_163B33:: @ 8163B33 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 lock faceplayer @@ -46,11 +46,11 @@ MtEmber_Summit_EventScript_163B33:: @ 8163B33 clearflag FLAG_0x807 specialvar VAR_RESULT, sub_80CA74C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_163B96 + goto_if_eq EventScript_163B96 compare_var_to_value VAR_RESULT, 4 - goto_if 1, EventScript_163B9F + goto_if_eq EventScript_163B9F compare_var_to_value VAR_RESULT, 5 - goto_if 1, EventScript_163B9F + goto_if_eq EventScript_163B9F setflag FLAG_0x2BD release end diff --git a/data/maps/MtMoon_B2F/scripts.inc b/data/maps/MtMoon_B2F/scripts.inc index 71c14d647..1947a3eb2 100644 --- a/data/maps/MtMoon_B2F/scripts.inc +++ b/data/maps/MtMoon_B2F/scripts.inc @@ -24,9 +24,9 @@ MtMoon_B2F_EventScript_1606C2:: @ 81606C2 lock faceplayer checkflag FLAG_0x232 - goto_if 1, EventScript_160707 + goto_if_eq EventScript_160707 checktrainerflag FLAG_0x0AA - goto_if 1, EventScript_160711 + goto_if_eq EventScript_160711 call EventScript_1606DD release end @@ -58,7 +58,7 @@ MtMoon_B2F_EventScript_16071B:: @ 816071B faceplayer msgbox gUnknown_8172E77, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1607DE + goto_if_eq EventScript_1607DE removeobject 1 additem ITEM_DOME_FOSSIL, 1 giveitemfanfaremsg gUnknown_8172ECD, ITEM_DOME_FOSSIL, 1, BGM_FRLG_ME_KEYITEM @@ -91,7 +91,7 @@ MtMoon_B2F_EventScript_16077F:: @ 816077F faceplayer msgbox gUnknown_8172E94, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1607DE + goto_if_eq EventScript_1607DE removeobject 2 additem ITEM_HELIX_FOSSIL, 1 giveitemfanfaremsg gUnknown_8172EB2, ITEM_HELIX_FOSSIL, 1, BGM_FRLG_ME_KEYITEM diff --git a/data/maps/NavelRock_Base/scripts.inc b/data/maps/NavelRock_Base/scripts.inc index d2126b0e9..34cca4e9b 100644 --- a/data/maps/NavelRock_Base/scripts.inc +++ b/data/maps/NavelRock_Base/scripts.inc @@ -16,7 +16,7 @@ EventScript_165105:: @ 8165105 EventScript_165109:: @ 8165109 checkflag FLAG_0x2F5 - goto_if 1, EventScript_1A77A9 + goto_if_eq EventScript_1A77A9 clearflag FLAG_0x09B return @@ -35,7 +35,7 @@ EventScript_165120:: @ 8165120 NavelRock_Base_EventScript_165134:: @ 8165134 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 lock faceplayer @@ -70,11 +70,11 @@ NavelRock_Base_EventScript_165134:: @ 8165134 clearflag FLAG_0x807 specialvar VAR_RESULT, sub_80CA74C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1651D9 + goto_if_eq EventScript_1651D9 compare_var_to_value VAR_RESULT, 4 - goto_if 1, EventScript_1651E7 + goto_if_eq EventScript_1651E7 compare_var_to_value VAR_RESULT, 5 - goto_if 1, EventScript_1651E7 + goto_if_eq EventScript_1651E7 setflag FLAG_0x2F2 release end diff --git a/data/maps/NavelRock_Summit/scripts.inc b/data/maps/NavelRock_Summit/scripts.inc index f77fbf86d..cb82149e8 100644 --- a/data/maps/NavelRock_Summit/scripts.inc +++ b/data/maps/NavelRock_Summit/scripts.inc @@ -18,7 +18,7 @@ EventScript_164FBD:: @ 8164FBD EventScript_164FC6:: @ 8164FC6 setvar VAR_0x4001, 1 checkflag FLAG_0x2F6 - goto_if 1, EventScript_1A77A9 + goto_if_eq EventScript_1A77A9 setvar VAR_0x4001, 0 clearflag FLAG_0x09C return @@ -38,7 +38,7 @@ EventScript_164FE7:: @ 8164FE7 NavelRock_Summit_EventScript_164FFB:: @ 8164FFB special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 lockall setvar VAR_0x4001, 1 @@ -75,11 +75,11 @@ NavelRock_Summit_EventScript_164FFB:: @ 8164FFB setvar VAR_LAST_TALKED, 1 specialvar VAR_RESULT, sub_80CA74C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1650B4 + goto_if_eq EventScript_1650B4 compare_var_to_value VAR_RESULT, 4 - goto_if 1, EventScript_1650C2 + goto_if_eq EventScript_1650C2 compare_var_to_value VAR_RESULT, 5 - goto_if 1, EventScript_1650C2 + goto_if_eq EventScript_1650C2 setflag FLAG_0x2F3 releaseall end diff --git a/data/maps/OneIsland/scripts.inc b/data/maps/OneIsland/scripts.inc index a456b217a..540980a3e 100644 --- a/data/maps/OneIsland/scripts.inc +++ b/data/maps/OneIsland/scripts.inc @@ -84,9 +84,9 @@ OneIsland_EventScript_167517:: @ 8167517 lock faceplayer checkflag FLAG_0x844 - goto_if 1, EventScript_16753F + goto_if_eq EventScript_16753F checkflag FLAG_0x2A1 - goto_if 1, EventScript_167535 + goto_if_eq EventScript_167535 msgbox gUnknown_818174E release end diff --git a/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc b/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc index cf597a732..fbb4fb622 100644 --- a/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc +++ b/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc @@ -31,7 +31,7 @@ OneIsland_KindleRoad_EmberSpa_EventScript_165399:: @ 8165399 lock faceplayer checkflag FLAG_0x2EF - goto_if 1, EventScript_1653C5 + goto_if_eq EventScript_1653C5 msgbox gUnknown_817D622 giveitem ITEM_HM06 setflag FLAG_0x2EF diff --git a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc index 15bfb7e4d..61efea315 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc @@ -193,7 +193,7 @@ OneIsland_PokemonCenter_1F_EventScript_170E94:: @ 8170E94 OneIsland_PokemonCenter_1F_EventScript_170E9D:: @ 8170E9D lock checkflag FLAG_0x2A1 - goto_if 1, EventScript_170EB1 + goto_if_eq EventScript_170EB1 msgbox gUnknown_81A1266 release end @@ -209,22 +209,22 @@ OneIsland_PokemonCenter_1F_EventScript_170EC5:: @ 8170EC5 lock faceplayer compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 7 - goto_if 1, EventScript_170F35 + goto_if_eq EventScript_170F35 compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 6 - goto_if 1, EventScript_170F9B + goto_if_eq EventScript_170F9B checkflag FLAG_0x2DC - goto_if 1, EventScript_170FA5 + goto_if_eq EventScript_170FA5 compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 - goto_if 1, EventScript_17103A + goto_if_eq EventScript_17103A checkflag FLAG_0x2DD - goto_if 1, EventScript_171044 + goto_if_eq EventScript_171044 compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4 - goto_if 1, EventScript_1710F2 + goto_if_eq EventScript_1710F2 specialvar VAR_RESULT, sub_806E25C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1710FC + goto_if_eq EventScript_1710FC compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 3 - goto_if 1, EventScript_171134 + goto_if_eq EventScript_171134 msgbox gUnknown_81A1321 closemessage applymovement 3, Movement_1A75E5 @@ -236,9 +236,9 @@ EventScript_170F35:: @ 8170F35 msgbox gUnknown_81A1EBD random 3 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_170F6D + goto_if_eq EventScript_170F6D compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_170F84 + goto_if_eq EventScript_170F84 setvar VAR_0x8004, 13 setvar VAR_0x8005, 5 special SetFlavorTextFlagFromSpecialVars @@ -331,14 +331,14 @@ EventScript_171044:: @ 8171044 waitmovement 0 msgbox gUnknown_81A19AA, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_171099 + goto_if_eq EventScript_171099 goto EventScript_1710B2 end EventScript_171099:: @ 8171099 msgbox gUnknown_81A1A08, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_171099 + goto_if_eq EventScript_171099 goto EventScript_1710B2 end @@ -411,7 +411,7 @@ OneIsland_PokemonCenter_1F_EventScript_17115A:: @ 817115A lock faceplayer checkflag FLAG_0x844 - goto_if 1, EventScript_17116F + goto_if_eq EventScript_17116F msgbox gUnknown_81A218D release end @@ -424,9 +424,9 @@ EventScript_17116F:: @ 817116F OneIsland_PokemonCenter_1F_EventScript_171179:: @ 8171179 lockall checkflag FLAG_0x844 - goto_if 1, EventScript_1711A0 + goto_if_eq EventScript_1711A0 checkflag FLAG_0x2A1 - goto_if 1, EventScript_171196 + goto_if_eq EventScript_171196 msgbox gUnknown_81A223F releaseall end diff --git a/data/maps/PalletTown/scripts.inc b/data/maps/PalletTown/scripts.inc index b8e54e837..ed9d01395 100644 --- a/data/maps/PalletTown/scripts.inc +++ b/data/maps/PalletTown/scripts.inc @@ -27,7 +27,7 @@ EventScript_1654A2:: @ 81654A2 EventScript_1654A8:: @ 81654A8 checkflag FLAG_0x291 - goto_if 1, EventScript_1654BD + goto_if_eq EventScript_1654BD setobjectxyperm 1, 5, 15 setobjectmovementtype 1, 7 return @@ -377,13 +377,13 @@ Movement_165758:: @ 8165758 PalletTown_EventScript_16575C:: @ 816575C lock compare_var_to_value VAR_0x4070, 2 - goto_if 1, EventScript_1657ED + goto_if_eq EventScript_1657ED compare_var_to_value VAR_0x4070, 1 - goto_if 1, EventScript_165815 + goto_if_eq EventScript_165815 compare_var_to_value VAR_0x4002, 1 - goto_if 1, EventScript_1658C2 + goto_if_eq EventScript_1658C2 checkflag FLAG_0x002 - goto_if 1, EventScript_165801 + goto_if_eq EventScript_165801 msgbox gUnknown_81B1C8B applymovement 1, Movement_1A75E1 waitmovement 0 diff --git a/data/maps/PalletTown_GarysHouse/scripts.inc b/data/maps/PalletTown_GarysHouse/scripts.inc index 57f0d4e14..dd3f05aa9 100644 --- a/data/maps/PalletTown_GarysHouse/scripts.inc +++ b/data/maps/PalletTown_GarysHouse/scripts.inc @@ -25,13 +25,13 @@ PalletTown_GarysHouse_EventScript_168D56:: @ 8168D56 setvar VAR_0x8005, 2 special UpdatePickStateFromSpecialVar8005 checkflag FLAG_0x82C - goto_if 1, EventScript_168DB9 + goto_if_eq EventScript_168DB9 compare_var_to_value VAR_0x4001, 1 - goto_if 1, EventScript_168EEC + goto_if_eq EventScript_168EEC compare_var_to_value VAR_0x4058, 2 - goto_if 1, EventScript_168F59 + goto_if_eq EventScript_168F59 compare_var_to_value VAR_0x4058, 1 - goto_if 1, EventScript_168EF6 + goto_if_eq EventScript_168EF6 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1 goto_if 4, EventScript_168DAF msgbox gUnknown_818D58C @@ -49,13 +49,13 @@ EventScript_168DAF:: @ 8168DAF EventScript_168DB9:: @ 8168DB9 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 compare_var_to_value VAR_MIRAGE_RND_L, 500 goto_if 0, EventScript_168E46 msgbox gUnknown_818D7D3, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_168E3C + goto_if_eq EventScript_168E3C msgbox gUnknown_818D8B2 special sub_80BF8FC waitstate @@ -65,7 +65,7 @@ EventScript_168DB9:: @ 8168DB9 goto_if 4, EventScript_168E3C specialvar VAR_RESULT, sub_80CAD54 compare_var_to_value VAR_RESULT, SPECIES_EGG - goto_if 1, EventScript_168E32 + goto_if_eq EventScript_168E32 msgbox gUnknown_818D8CC closemessage fadescreen 1 @@ -91,21 +91,14 @@ EventScript_168E3C:: @ 8168E3C EventScript_168E46:: @ 8168E46 msgbox gUnknown_818D9A5 specialvar VAR_RESULT, sub_80CA76C - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_168EA6 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_168EB0 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_168EBA - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_168EC4 - compare_var_to_value VAR_0x8000, 4 - goto_if 1, EventScript_168ECE - compare_var_to_value VAR_0x8000, 5 - goto_if 1, EventScript_168ED8 - compare_var_to_value VAR_0x8000, 6 - goto_if 1, EventScript_168EE2 + switch VAR_RESULT + case 0, EventScript_168EA6 + case 1, EventScript_168EB0 + case 2, EventScript_168EBA + case 3, EventScript_168EC4 + case 4, EventScript_168ECE + case 5, EventScript_168ED8 + case 6, EventScript_168EE2 end EventScript_168EA6:: @ 8168EA6 @@ -153,7 +146,7 @@ EventScript_168EF6:: @ 8168EF6 closemessage checkitemspace ITEM_TOWN_MAP, 1 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_168F4F + goto_if_eq EventScript_168F4F applymovement 1, Movement_1A75EB waitmovement 0 removeobject 2 diff --git a/data/maps/PalletTown_PlayersHouse_1F/scripts.inc b/data/maps/PalletTown_PlayersHouse_1F/scripts.inc index c54acad65..89eabeea1 100644 --- a/data/maps/PalletTown_PlayersHouse_1F/scripts.inc +++ b/data/maps/PalletTown_PlayersHouse_1F/scripts.inc @@ -5,7 +5,7 @@ PalletTown_PlayersHouse_1F_EventScript_168C09:: @ 8168C09 lock faceplayer checkflag FLAG_0x258 - goto_if 1, EventScript_168C4A + goto_if_eq EventScript_168C4A checkplayergender compare_var_to_value VAR_RESULT, 0 call_if 1, EventScript_168C38 @@ -36,7 +36,7 @@ EventScript_168C4A:: @ 8168C4A PalletTown_PlayersHouse_1F_EventScript_168C62:: @ 8168C62 lockall compare_var_to_value VAR_FACING, 2 - goto_if 1, EventScript_168C78 + goto_if_eq EventScript_168C78 msgbox gUnknown_818D4F9 releaseall end diff --git a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc index 1d0db7f52..ec105ea63 100644 --- a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc +++ b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc @@ -33,7 +33,7 @@ gUnknown_8168CE4:: @ 8168CE4 PalletTown_PlayersHouse_2F_EventScript_168CE4:: @ 8168CE4 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lockall setvar VAR_0x8004, 32 special sub_812B220 diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc index 9f0aba04c..44f6bbc5a 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc +++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc @@ -312,20 +312,20 @@ EventScript_16930B:: @ 816930B applymovement 4, Movement_1A75F1 waitmovement 0 compare_var_to_value VAR_STARTER_MON, 0 - goto_if 1, EventScript_1693D2 + goto_if_eq EventScript_1693D2 compare_var_to_value VAR_STARTER_MON, 1 - goto_if 1, EventScript_16944D + goto_if_eq EventScript_16944D compare_var_to_value VAR_STARTER_MON, 2 - goto_if 1, EventScript_16935A + goto_if_eq EventScript_16935A end EventScript_16935A:: @ 816935A compare_var_to_value VAR_0x4002, 1 - goto_if 1, EventScript_16937C + goto_if_eq EventScript_16937C compare_var_to_value VAR_0x4002, 2 - goto_if 1, EventScript_16938C + goto_if_eq EventScript_16938C compare_var_to_value VAR_0x4002, 3 - goto_if 1, EventScript_16939C + goto_if_eq EventScript_16939C end EventScript_16937C:: @ 816937C @@ -377,11 +377,11 @@ Movement_1693CD:: @ 81693CD EventScript_1693D2:: @ 81693D2 compare_var_to_value VAR_0x4002, 1 - goto_if 1, EventScript_1693F4 + goto_if_eq EventScript_1693F4 compare_var_to_value VAR_0x4002, 2 - goto_if 1, EventScript_169404 + goto_if_eq EventScript_169404 compare_var_to_value VAR_0x4002, 3 - goto_if 1, EventScript_169414 + goto_if_eq EventScript_169414 end EventScript_1693F4:: @ 81693F4 @@ -436,11 +436,11 @@ Movement_169447:: @ 8169447 EventScript_16944D:: @ 816944D compare_var_to_value VAR_0x4002, 1 - goto_if 1, EventScript_16946F + goto_if_eq EventScript_16946F compare_var_to_value VAR_0x4002, 2 - goto_if 1, EventScript_16947F + goto_if_eq EventScript_16947F compare_var_to_value VAR_0x4002, 3 - goto_if 1, EventScript_16948F + goto_if_eq EventScript_16948F end EventScript_16946F:: @ 816946F @@ -575,9 +575,9 @@ PalletTown_ProfessorOaksLab_EventScript_16955F:: @ 816955F lock faceplayer compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 - goto_if 1, EventScript_16958B + goto_if_eq EventScript_16958B compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2 - goto_if 1, EventScript_169581 + goto_if_eq EventScript_169581 msgbox gUnknown_818DC67 release end @@ -596,23 +596,23 @@ PalletTown_ProfessorOaksLab_EventScript_169595:: @ 8169595 lock faceplayer checkflag FLAG_0x002 - goto_if 1, EventScript_169600 + goto_if_eq EventScript_169600 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 9 - goto_if 1, EventScript_169903 + goto_if_eq EventScript_169903 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 8 - goto_if 1, EventScript_169A6E + goto_if_eq EventScript_169A6E checkflag FLAG_0x82C - goto_if 1, EventScript_1699CE + goto_if_eq EventScript_1699CE compare_var_to_value VAR_0x4052, 1 - goto_if 1, EventScript_169903 + goto_if_eq EventScript_169903 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 6 - goto_if 1, EventScript_1698D6 + goto_if_eq EventScript_1698D6 compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 1 goto_if 4, EventScript_16961E compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 4 - goto_if 1, EventScript_169614 + goto_if_eq EventScript_169614 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 - goto_if 1, EventScript_16960A + goto_if_eq EventScript_16960A msgbox gUnknown_818E116 release end @@ -842,14 +842,14 @@ EventScript_1698D6:: @ 81698D6 getnumberstring 0, VAR_0x8008 getnumberstring 1, VAR_0x8009 compare_var_to_value VAR_0x8009, 1 - goto_if 1, EventScript_1699FB + goto_if_eq EventScript_1699FB goto EventScript_169903 end EventScript_169903:: @ 8169903 call EventScript_1A737B checkflag FLAG_0x2F4 - goto_if 1, EventScript_169913 + goto_if_eq EventScript_169913 release end @@ -988,15 +988,15 @@ EventScript_1699F9:: @ 81699F9 EventScript_1699FB:: @ 81699FB special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 checkflag FLAG_0x24F - goto_if 1, EventScript_169A6E + goto_if_eq EventScript_169A6E checkflag FLAG_0x247 - goto_if 1, EventScript_169A78 + goto_if_eq EventScript_169A78 checkitem ITEM_POKE_BALL, 1 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_169A34 + goto_if_eq EventScript_169A34 goto EventScript_169A6E end @@ -1153,7 +1153,7 @@ PalletTown_ProfessorOaksLab_EventScript_169BAB:: @ 8169BAB compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 goto_if 4, EventScript_169DE4 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2 - goto_if 1, EventScript_169BE1 + goto_if_eq EventScript_169BE1 msgbox gUnknown_818EA19 release end @@ -1164,35 +1164,35 @@ EventScript_169BE1:: @ 8169BE1 drawmonpic VAR_0x4002, 10, 3 textcolor 0 compare_var_to_value VAR_0x4001, 0 - goto_if 1, EventScript_169C14 + goto_if_eq EventScript_169C14 compare_var_to_value VAR_0x4001, 1 - goto_if 1, EventScript_169C33 + goto_if_eq EventScript_169C33 compare_var_to_value VAR_0x4001, 2 - goto_if 1, EventScript_169C52 + goto_if_eq EventScript_169C52 end EventScript_169C14:: @ 8169C14 msgbox gUnknown_818E272, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_169C74 + goto_if_eq EventScript_169C74 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_169C71 + goto_if_eq EventScript_169C71 end EventScript_169C33:: @ 8169C33 msgbox gUnknown_818E207, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_169C74 + goto_if_eq EventScript_169C74 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_169C71 + goto_if_eq EventScript_169C71 end EventScript_169C52:: @ 8169C52 msgbox gUnknown_818E194, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_169C74 + goto_if_eq EventScript_169C74 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_169C71 + goto_if_eq EventScript_169C71 end EventScript_169C71:: @ 8169C71 @@ -1216,9 +1216,9 @@ EventScript_169C74:: @ 8169C74 waitfanfare msgbox gUnknown_81A56A7, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_169CCC + goto_if_eq EventScript_169CCC compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_169CDC + goto_if_eq EventScript_169CDC end EventScript_169CCC:: @ 8169CCC @@ -1230,11 +1230,11 @@ EventScript_169CCC:: @ 8169CCC EventScript_169CDC:: @ 8169CDC closemessage compare_var_to_value VAR_0x4001, 0 - goto_if 1, EventScript_169CFF + goto_if_eq EventScript_169CFF compare_var_to_value VAR_0x4001, 1 - goto_if 1, EventScript_169D1F + goto_if_eq EventScript_169D1F compare_var_to_value VAR_0x4001, 2 - goto_if 1, EventScript_169D0F + goto_if_eq EventScript_169D0F end EventScript_169CFF:: @ 8169CFF @@ -1313,7 +1313,7 @@ PalletTown_ProfessorOaksLab_EventScript_169D78:: @ 8169D78 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 goto_if 4, EventScript_169DE4 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2 - goto_if 1, EventScript_169BE1 + goto_if_eq EventScript_169BE1 msgbox gUnknown_818EA19 release end @@ -1328,7 +1328,7 @@ PalletTown_ProfessorOaksLab_EventScript_169DAE:: @ 8169DAE compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 goto_if 4, EventScript_169DE4 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2 - goto_if 1, EventScript_169BE1 + goto_if_eq EventScript_169BE1 msgbox gUnknown_818EA19 release end @@ -1342,7 +1342,7 @@ PalletTown_ProfessorOaksLab_EventScript_169DEE:: @ 8169DEE lock faceplayer checkflag FLAG_0x82C - goto_if 1, EventScript_169E03 + goto_if_eq EventScript_169E03 msgbox gUnknown_818EBE6 release end @@ -1359,7 +1359,7 @@ PalletTown_ProfessorOaksLab_EventScript_169E1A:: @ 8169E1A lock faceplayer checkflag FLAG_0x82C - goto_if 1, EventScript_169E2F + goto_if_eq EventScript_169E2F msgbox gUnknown_818EBE6 release end diff --git a/data/maps/PewterCity/scripts.inc b/data/maps/PewterCity/scripts.inc index 9c8e7bb8e..465f47f76 100644 --- a/data/maps/PewterCity/scripts.inc +++ b/data/maps/PewterCity/scripts.inc @@ -1033,7 +1033,7 @@ PewterCity_EventScript_16607E:: @ 816607E faceplayer msgbox gUnknown_817E53E, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_166136 + goto_if_eq EventScript_166136 msgbox gUnknown_817E589 closemessage delay 10 @@ -1354,7 +1354,7 @@ PewterCity_EventScript_166244:: @ 8166244 faceplayer msgbox gUnknown_817E602, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_166263 + goto_if_eq EventScript_166263 msgbox gUnknown_817E644 release end diff --git a/data/maps/PewterCity_Gym/scripts.inc b/data/maps/PewterCity_Gym/scripts.inc index af2f707b3..5990bf1e3 100644 --- a/data/maps/PewterCity_Gym/scripts.inc +++ b/data/maps/PewterCity_Gym/scripts.inc @@ -30,7 +30,7 @@ EventScript_16A5F3:: @ 816A5F3 msgbox gUnknown_8190FC1 checkitemspace ITEM_TM39, 1 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16A634 + goto_if_eq EventScript_16A634 additem ITEM_TM39, 1 giveitemfanfaremsg gUnknown_8190FDB, ITEM_TM39 setflag FLAG_0x254 @@ -52,12 +52,12 @@ PewterCity_Gym_EventScript_16A655:: @ 816A655 lock faceplayer checkflag FLAG_0x4B0 - goto_if 1, EventScript_16A67F + goto_if_eq EventScript_16A67F msgbox gUnknown_8191298, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16A689 + goto_if_eq EventScript_16A689 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16A697 + goto_if_eq EventScript_16A697 end EventScript_16A67F:: @ 816A67F @@ -83,7 +83,7 @@ EventScript_16A6A5:: @ 816A6A5 PewterCity_Gym_EventScript_16A6AF:: @ 816A6AF lockall checkflag FLAG_UNK820 - goto_if 1, EventScript_16A6C3 + goto_if_eq EventScript_16A6C3 msgbox gUnknown_819146E releaseall end diff --git a/data/maps/PewterCity_Mart/scripts.inc b/data/maps/PewterCity_Mart/scripts.inc index 374a99048..9e6fc4375 100644 --- a/data/maps/PewterCity_Mart/scripts.inc +++ b/data/maps/PewterCity_Mart/scripts.inc @@ -12,7 +12,7 @@ PewterCity_Mart_EventScript_16A6D7:: @ 816A6D7 PewterCity_Mart_EventScript_16A6E0:: @ 816A6E0 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lock faceplayer message Text_1A6211 diff --git a/data/maps/PewterCity_Museum_1F/scripts.inc b/data/maps/PewterCity_Museum_1F/scripts.inc index e2d6a7d5c..7540e74d5 100644 --- a/data/maps/PewterCity_Museum_1F/scripts.inc +++ b/data/maps/PewterCity_Museum_1F/scripts.inc @@ -5,11 +5,11 @@ PewterCity_Museum_1F_EventScript_16A31B:: @ 816A31B lock faceplayer compare_var_to_value VAR_FACING, 3 - goto_if 1, EventScript_16A348 + goto_if_eq EventScript_16A348 compare_var_to_value VAR_FACING, 1 - goto_if 1, EventScript_16A348 + goto_if_eq EventScript_16A348 compare_var_to_value VAR_FACING, 2 - goto_if 1, EventScript_16A348 + goto_if_eq EventScript_16A348 msgbox gUnknown_8190539 release end @@ -17,9 +17,9 @@ PewterCity_Museum_1F_EventScript_16A31B:: @ 816A31B EventScript_16A348:: @ 816A348 msgbox gUnknown_8190550, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16A367 + goto_if_eq EventScript_16A367 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16A37B + goto_if_eq EventScript_16A37B end EventScript_16A367:: @ 816A367 @@ -65,7 +65,7 @@ EventScript_16A3D1:: @ 816A3D1 showmoneybox 0, 0, 0 msgbox gUnknown_81904B5, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16A402 + goto_if_eq EventScript_16A402 msgbox gUnknown_81904F9 closemessage hidemoneybox @@ -79,7 +79,7 @@ EventScript_16A3D1:: @ 816A3D1 EventScript_16A402:: @ 816A402 checkmoney 50, 0 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16A476 + goto_if_eq EventScript_16A476 closemessage compare_var_to_value VAR_0x4001, 0 call_if 1, EventScript_16A455 @@ -159,11 +159,11 @@ PewterCity_Museum_1F_EventScript_16A4AE:: @ 816A4AE lock faceplayer checkflag FLAG_0x25E - goto_if 1, EventScript_16A4FF + goto_if_eq EventScript_16A4FF msgbox gUnknown_8190717 checkitemspace ITEM_OLD_AMBER, 1 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16A4F5 + goto_if_eq EventScript_16A4F5 setflag FLAG_0x25E removeobject 4 additem ITEM_OLD_AMBER, 1 diff --git a/data/maps/PokemonLeague_AgathasRoom/scripts.inc b/data/maps/PokemonLeague_AgathasRoom/scripts.inc index 47bbf5d5b..2a46b544d 100644 --- a/data/maps/PokemonLeague_AgathasRoom/scripts.inc +++ b/data/maps/PokemonLeague_AgathasRoom/scripts.inc @@ -51,7 +51,7 @@ PokemonLeague_AgathasRoom_EventScript_162877:: @ 8162877 setvar VAR_0x8005, 2 special UpdatePickStateFromSpecialVar8005 checkflag FLAG_0x4BA - goto_if 1, EventScript_162911 + goto_if_eq EventScript_162911 setvar VAR_0x8004, 11 setvar VAR_0x8005, 0 special SetFlavorTextFlagFromSpecialVars diff --git a/data/maps/PokemonLeague_BrunosRoom/scripts.inc b/data/maps/PokemonLeague_BrunosRoom/scripts.inc index 78ce11521..6cc4a23a4 100644 --- a/data/maps/PokemonLeague_BrunosRoom/scripts.inc +++ b/data/maps/PokemonLeague_BrunosRoom/scripts.inc @@ -51,7 +51,7 @@ PokemonLeague_BrunosRoom_EventScript_1626EC:: @ 81626EC setvar VAR_0x8005, 2 special UpdatePickStateFromSpecialVar8005 checkflag FLAG_0x4B9 - goto_if 1, EventScript_162779 + goto_if_eq EventScript_162779 setvar VAR_0x8004, 10 setvar VAR_0x8005, 0 special SetFlavorTextFlagFromSpecialVars diff --git a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc index e270f182d..b2b8bc46c 100644 --- a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc +++ b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc @@ -17,23 +17,23 @@ PokemonLeague_ChampionsRoom_MapScript2_162AF2:: @ 8162AF2 EventScript_162B1E:: @ 8162B1E checktrainerflag FLAG_0x1B6 - goto_if 1, EventScript_162B57 + goto_if_eq EventScript_162B57 checktrainerflag FLAG_0x2E3 - goto_if 1, EventScript_162B57 + goto_if_eq EventScript_162B57 return EventScript_162B31:: @ 8162B31 checktrainerflag FLAG_0x1B7 - goto_if 1, EventScript_162B57 + goto_if_eq EventScript_162B57 checktrainerflag FLAG_0x2E4 - goto_if 1, EventScript_162B57 + goto_if_eq EventScript_162B57 return EventScript_162B44:: @ 8162B44 checktrainerflag FLAG_0x1B8 - goto_if 1, EventScript_162B57 + goto_if_eq EventScript_162B57 checktrainerflag FLAG_0x2E5 - goto_if 1, EventScript_162B57 + goto_if_eq EventScript_162B57 return EventScript_162B57:: @ 8162B57 @@ -65,7 +65,7 @@ EventScript_162B76:: @ 8162B76 call_if 1, EventScript_162CBC special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_162C68 + goto_if_eq EventScript_162C68 setflag FLAG_0x003 setflag FLAG_0x005 savebgm BGM_FRLG_KACHI_LEADER diff --git a/data/maps/PokemonLeague_LancesRoom/scripts.inc b/data/maps/PokemonLeague_LancesRoom/scripts.inc index 3fb93bfc8..2eaebe6f7 100644 --- a/data/maps/PokemonLeague_LancesRoom/scripts.inc +++ b/data/maps/PokemonLeague_LancesRoom/scripts.inc @@ -105,7 +105,7 @@ PokemonLeague_LancesRoom_EventScript_162A14:: @ 8162A14 setvar VAR_0x8005, 2 special UpdatePickStateFromSpecialVar8005 checkflag FLAG_0x4BB - goto_if 1, EventScript_162AA1 + goto_if_eq EventScript_162AA1 setvar VAR_0x8004, 12 setvar VAR_0x8005, 0 special SetFlavorTextFlagFromSpecialVars diff --git a/data/maps/PokemonLeague_LoreleisRoom/scripts.inc b/data/maps/PokemonLeague_LoreleisRoom/scripts.inc index fcd1b9399..60e2b5086 100644 --- a/data/maps/PokemonLeague_LoreleisRoom/scripts.inc +++ b/data/maps/PokemonLeague_LoreleisRoom/scripts.inc @@ -56,7 +56,7 @@ PokemonLeague_LoreleisRoom_EventScript_1625DC:: @ 81625DC setvar VAR_0x8005, 2 special UpdatePickStateFromSpecialVar8005 checkflag FLAG_0x4B8 - goto_if 1, EventScript_162669 + goto_if_eq EventScript_162669 setvar VAR_0x8004, 9 setvar VAR_0x8005, 0 special SetFlavorTextFlagFromSpecialVars diff --git a/data/maps/PokemonTower_1F/scripts.inc b/data/maps/PokemonTower_1F/scripts.inc index f9defa3ba..c86280b74 100644 --- a/data/maps/PokemonTower_1F/scripts.inc +++ b/data/maps/PokemonTower_1F/scripts.inc @@ -23,7 +23,7 @@ PokemonTower_1F_EventScript_16325A:: @ 816325A faceplayer checkplayergender compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_163272 + goto_if_eq EventScript_163272 msgbox gUnknown_8179BFC release end diff --git a/data/maps/PokemonTower_6F/scripts.inc b/data/maps/PokemonTower_6F/scripts.inc index 6caa45d92..dd2bdff80 100644 --- a/data/maps/PokemonTower_6F/scripts.inc +++ b/data/maps/PokemonTower_6F/scripts.inc @@ -7,13 +7,13 @@ PokemonTower_6F_EventScript_1634B8:: @ 81634B8 msgbox gUnknown_817A2F8 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 setwildbattle SPECIES_MAROWAK, 30, ITEM_NONE special sub_807F904 waitstate special sub_8112364 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1634F5 + goto_if_eq EventScript_1634F5 applymovement 255, Movement_163512 waitmovement 0 releaseall diff --git a/data/maps/PokemonTower_7F/scripts.inc b/data/maps/PokemonTower_7F/scripts.inc index a62969534..7f319287e 100644 --- a/data/maps/PokemonTower_7F/scripts.inc +++ b/data/maps/PokemonTower_7F/scripts.inc @@ -27,11 +27,11 @@ EventScript_1635A1:: @ 81635A1 closemessage getplayerxy VAR_0x8004, VAR_0x8005 compare_var_to_value VAR_0x8004, 10 - goto_if 1, EventScript_1635E0 + goto_if_eq EventScript_1635E0 compare_var_to_value VAR_0x8004, 11 - goto_if 1, EventScript_1635F0 + goto_if_eq EventScript_1635F0 compare_var_to_value VAR_0x8004, 9 - goto_if 1, EventScript_163600 + goto_if_eq EventScript_163600 applymovement 2, Movement_16362C waitmovement 0 goto EventScript_163616 @@ -117,9 +117,9 @@ EventScript_163658:: @ 8163658 closemessage getplayerxy VAR_0x8004, VAR_0x8005 compare_var_to_value VAR_0x8004, 12 - goto_if 1, EventScript_163699 + goto_if_eq EventScript_163699 compare_var_to_value VAR_0x8004, 13 - goto_if 1, EventScript_1636A9 + goto_if_eq EventScript_1636A9 applymovement 3, Movement_1636C6 waitmovement 0 goto EventScript_1636B9 @@ -182,9 +182,9 @@ EventScript_1636F1:: @ 81636F1 closemessage getplayerxy VAR_0x8004, VAR_0x8005 compare_var_to_value VAR_0x8004, 10 - goto_if 1, EventScript_163725 + goto_if_eq EventScript_163725 compare_var_to_value VAR_0x8004, 9 - goto_if 1, EventScript_163735 + goto_if_eq EventScript_163735 applymovement 4, Movement_163754 waitmovement 0 goto EventScript_163745 diff --git a/data/maps/PowerPlant/scripts.inc b/data/maps/PowerPlant/scripts.inc index e05f9c473..cb9b3acdc 100644 --- a/data/maps/PowerPlant/scripts.inc +++ b/data/maps/PowerPlant/scripts.inc @@ -40,7 +40,7 @@ EventScript_1637B4:: @ 81637B4 PowerPlant_EventScript_1637B8:: @ 81637B8 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 lock faceplayer @@ -59,11 +59,11 @@ PowerPlant_EventScript_1637B8:: @ 81637B8 clearflag FLAG_0x807 specialvar VAR_RESULT, sub_80CA74C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16381B + goto_if_eq EventScript_16381B compare_var_to_value VAR_RESULT, 4 - goto_if 1, EventScript_163824 + goto_if_eq EventScript_163824 compare_var_to_value VAR_RESULT, 5 - goto_if 1, EventScript_163824 + goto_if_eq EventScript_163824 setflag FLAG_0x2BF release end @@ -81,7 +81,7 @@ EventScript_163824:: @ 8163824 PowerPlant_EventScript_16382F:: @ 816382F special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lock faceplayer setwildbattle SPECIES_ELECTRODE, 34, ITEM_NONE @@ -95,11 +95,11 @@ PowerPlant_EventScript_16382F:: @ 816382F special sub_8112364 specialvar VAR_RESULT, sub_80CA74C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_163884 + goto_if_eq EventScript_163884 compare_var_to_value VAR_RESULT, 4 - goto_if 1, EventScript_163884 + goto_if_eq EventScript_163884 compare_var_to_value VAR_RESULT, 5 - goto_if 1, EventScript_163884 + goto_if_eq EventScript_163884 setflag FLAG_0x2D0 release end @@ -112,7 +112,7 @@ EventScript_163884:: @ 8163884 PowerPlant_EventScript_16388D:: @ 816388D special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lock faceplayer setwildbattle SPECIES_ELECTRODE, 34, ITEM_NONE @@ -126,11 +126,11 @@ PowerPlant_EventScript_16388D:: @ 816388D special sub_8112364 specialvar VAR_RESULT, sub_80CA74C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1638E2 + goto_if_eq EventScript_1638E2 compare_var_to_value VAR_RESULT, 4 - goto_if 1, EventScript_1638E2 + goto_if_eq EventScript_1638E2 compare_var_to_value VAR_RESULT, 5 - goto_if 1, EventScript_1638E2 + goto_if_eq EventScript_1638E2 setflag FLAG_0x2D1 release end diff --git a/data/maps/RocketHideout_B4F/scripts.inc b/data/maps/RocketHideout_B4F/scripts.inc index d492212dd..949223e85 100644 --- a/data/maps/RocketHideout_B4F/scripts.inc +++ b/data/maps/RocketHideout_B4F/scripts.inc @@ -47,7 +47,7 @@ RocketHideout_B4F_EventScript_161363:: @ 8161363 removeobject 2 giveitem ITEM_SILPH_SCOPE compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1A6BF9 + goto_if_eq EventScript_1A6BF9 release end @@ -71,7 +71,7 @@ RocketHideout_B4F_EventScript_1613AD:: @ 81613AD removeobject 4 giveitem ITEM_LIFT_KEY compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1A6BF9 + goto_if_eq EventScript_1A6BF9 release end diff --git a/data/maps/RocketHideout_Elevator/scripts.inc b/data/maps/RocketHideout_Elevator/scripts.inc index c9ffe7a0a..884335234 100644 --- a/data/maps/RocketHideout_Elevator/scripts.inc +++ b/data/maps/RocketHideout_Elevator/scripts.inc @@ -14,13 +14,10 @@ RocketHideout_Elevator_EventScript_1614D9:: @ 81614D9 waitmessage setvar VAR_0x8004, 2 specialvar VAR_RESULT, sub_80CB328 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_161530 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16153C - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_161548 + switch VAR_RESULT + case 0, EventScript_161530 + case 1, EventScript_16153C + case 2, EventScript_161548 end EventScript_161530:: @ 8161530 @@ -45,24 +42,19 @@ EventScript_161553:: @ 8161553 end EventScript_161554:: @ 8161554 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_161591 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1615B9 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1615E1 - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_161609 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_161609 + switch VAR_RESULT + case 0, EventScript_161591 + case 1, EventScript_1615B9 + case 2, EventScript_1615E1 + case 3, EventScript_161609 + case 127, EventScript_161609 end EventScript_161591:: @ 8161591 setvar VAR_0x8006, 3 setdynamicwarp MAP_ROCKET_HIDEOUT_B1F, 255, 24, 25 compare_var_to_value VAR_0x403A, 3 - goto_if 1, EventScript_161609 + goto_if_eq EventScript_161609 call EventScript_16160E setvar VAR_0x403A, 3 goto EventScript_161609 @@ -74,7 +66,7 @@ EventScript_1615B9:: @ 81615B9 setvar VAR_0x8006, 2 setdynamicwarp MAP_ROCKET_HIDEOUT_B2F, 255, 28, 16 compare_var_to_value VAR_0x403A, 2 - goto_if 1, EventScript_161609 + goto_if_eq EventScript_161609 call EventScript_16160E setvar VAR_0x403A, 2 goto EventScript_161609 @@ -86,7 +78,7 @@ EventScript_1615E1:: @ 81615E1 setvar VAR_0x8006, 0 setdynamicwarp MAP_ROCKET_HIDEOUT_B4F, 255, 20, 23 compare_var_to_value VAR_0x403A, 0 - goto_if 1, EventScript_161609 + goto_if_eq EventScript_161609 call EventScript_16160E setvar VAR_0x403A, 0 goto EventScript_161609 diff --git a/data/maps/Route1/scripts.inc b/data/maps/Route1/scripts.inc index 7c1e41e8c..16bd02597 100644 --- a/data/maps/Route1/scripts.inc +++ b/data/maps/Route1/scripts.inc @@ -5,12 +5,12 @@ Route1_EventScript_167EFE:: @ 8167EFE lock faceplayer checkflag FLAG_0x230 - goto_if 1, EventScript_167F48 + goto_if_eq EventScript_167F48 msgbox gUnknown_818329D textcolor 3 checkitemspace ITEM_POTION, 1 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1A6BF9 + goto_if_eq EventScript_1A6BF9 getitemname 1, ITEM_POTION playfanfare MUS_FANFA1 message Text_1A51F6 diff --git a/data/maps/Route10_PokemonCenter_1F/scripts.inc b/data/maps/Route10_PokemonCenter_1F/scripts.inc index 819902f19..f9ec2bec4 100644 --- a/data/maps/Route10_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route10_PokemonCenter_1F/scripts.inc @@ -32,10 +32,10 @@ Route10_PokemonCenter_1F_EventScript_16FC65:: @ 816FC65 faceplayer call EventScript_16FCF1 checkflag FLAG_0x2FA - goto_if 1, EventScript_16FCE7 + goto_if_eq EventScript_16FCE7 msgbox gUnknown_819E5FB, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1A7AD1 + goto_if_eq EventScript_1A7AD1 setvar VAR_0x8004, 0 specialvar VAR_RESULT, sub_80CA3D8 getnumberstring 2, VAR_0x8006 @@ -45,7 +45,7 @@ Route10_PokemonCenter_1F_EventScript_16FC65:: @ 816FC65 msgbox gUnknown_819E733 checkitemspace ITEM_EVERSTONE, 1 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1A7AC7 + goto_if_eq EventScript_1A7AC7 additem ITEM_EVERSTONE, 1 giveitemfanfaremsg gUnknown_819E786, ITEM_EVERSTONE setflag FLAG_0x2FA diff --git a/data/maps/Route11_EastEntrance_2F/scripts.inc b/data/maps/Route11_EastEntrance_2F/scripts.inc index 892d16571..abc877c0e 100644 --- a/data/maps/Route11_EastEntrance_2F/scripts.inc +++ b/data/maps/Route11_EastEntrance_2F/scripts.inc @@ -4,7 +4,7 @@ Route11_EastEntrance_2F_MapScripts:: @ 816FD34 Route11_EastEntrance_2F_EventScript_16FD35:: @ 816FD35 lockall checkflag FLAG_0x253 - goto_if 1, EventScript_16FD49 + goto_if_eq EventScript_16FD49 msgbox gUnknown_819EC8A releaseall end @@ -24,10 +24,10 @@ Route11_EastEntrance_2F_EventScript_16FD5C:: @ 816FD5C setvar VAR_0x8008, 4 call EventScript_1A8CAD checkflag FLAG_0x251 - goto_if 1, EventScript_16FDCE + goto_if_eq EventScript_16FDCE msgbox gUnknown_81A597B, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16FDB6 + goto_if_eq EventScript_16FDB6 call EventScript_1A8CBD compare_var_to_value VAR_0x8004, 6 goto_if 4, EventScript_16FDB6 @@ -61,10 +61,10 @@ Route11_EastEntrance_2F_EventScript_16FDD8:: @ 816FDD8 faceplayer call EventScript_16FE64 checkflag FLAG_0x252 - goto_if 1, EventScript_16FE5A + goto_if_eq EventScript_16FE5A msgbox gUnknown_819E9E5, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1A7AD1 + goto_if_eq EventScript_1A7AD1 setvar VAR_0x8004, 0 specialvar VAR_RESULT, sub_80CA3D8 getnumberstring 2, VAR_0x8006 @@ -74,7 +74,7 @@ Route11_EastEntrance_2F_EventScript_16FDD8:: @ 816FDD8 msgbox gUnknown_819EAE4 checkitemspace ITEM_ITEMFINDER, 1 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1A7AC7 + goto_if_eq EventScript_1A7AC7 additem ITEM_ITEMFINDER, 1 giveitemfanfaremsg gUnknown_819EB37, ITEM_ITEMFINDER setflag FLAG_0x252 diff --git a/data/maps/Route12/scripts.inc b/data/maps/Route12/scripts.inc index 64fb7b75f..81be7952e 100644 --- a/data/maps/Route12/scripts.inc +++ b/data/maps/Route12/scripts.inc @@ -18,11 +18,11 @@ Route12_EventScript_168014:: @ 8168014 goto_if 0, EventScript_168099 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 msgbox gUnknown_81853CC, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16808D + goto_if_eq EventScript_16808D call EventScript_1A924B setwildbattle SPECIES_SNORLAX, 30, ITEM_NONE waitse @@ -36,11 +36,11 @@ Route12_EventScript_168014:: @ 8168014 clearflag FLAG_0x807 specialvar VAR_RESULT, sub_80CA74C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16808F + goto_if_eq EventScript_16808F compare_var_to_value VAR_RESULT, 4 - goto_if 1, EventScript_16808F + goto_if_eq EventScript_16808F compare_var_to_value VAR_RESULT, 5 - goto_if 1, EventScript_16808F + goto_if_eq EventScript_16808F release end diff --git a/data/maps/Route12_FishingHouse/scripts.inc b/data/maps/Route12_FishingHouse/scripts.inc index e9fb651a2..d4472473f 100644 --- a/data/maps/Route12_FishingHouse/scripts.inc +++ b/data/maps/Route12_FishingHouse/scripts.inc @@ -5,10 +5,10 @@ Route12_FishingHouse_EventScript_16FF0C:: @ 816FF0C lock faceplayer checkflag FLAG_0x255 - goto_if 1, EventScript_16FF7F + goto_if_eq EventScript_16FF7F msgbox gUnknown_819EFE0, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16FF34 + goto_if_eq EventScript_16FF34 msgbox gUnknown_819F1FA release end @@ -16,7 +16,7 @@ Route12_FishingHouse_EventScript_16FF0C:: @ 816FF0C EventScript_16FF34:: @ 816FF34 checkitemspace ITEM_SUPER_ROD, 1 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16FF75 + goto_if_eq EventScript_16FF75 additem ITEM_SUPER_ROD, 1 msgbox gUnknown_819F05B giveitemfanfaremsg gUnknown_819F0B2, ITEM_SUPER_ROD @@ -33,12 +33,12 @@ EventScript_16FF75:: @ 816FF75 EventScript_16FF7F:: @ 816FF7F special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 setvar VAR_0x8004, SPECIES_MAGIKARP specialvar VAR_RESULT, sub_80CC48C compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16FFF5 + goto_if_eq EventScript_16FFF5 special sub_80A096C msgbox gUnknown_819F2DB special sub_80BF8FC @@ -48,13 +48,13 @@ EventScript_16FF7F:: @ 816FF7F goto_if 4, EventScript_16FFFF special sub_80A0984 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_170001 + goto_if_eq EventScript_170001 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_17000B + goto_if_eq EventScript_17000B compare_var_to_value VAR_RESULT, 3 - goto_if 1, EventScript_170031 + goto_if_eq EventScript_170031 compare_var_to_value VAR_RESULT, 4 - goto_if 1, EventScript_17001E + goto_if_eq EventScript_17001E release end @@ -91,7 +91,7 @@ EventScript_170031:: @ 8170031 msgbox gUnknown_819F31B giveitem ITEM_NET_BALL compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_17005D + goto_if_eq EventScript_17005D msgbox gUnknown_819F395 release end @@ -104,7 +104,7 @@ EventScript_17005D:: @ 817005D Route12_FishingHouse_EventScript_170067:: @ 8170067 lockall checkflag FLAG_0x29C - goto_if 1, EventScript_17007B + goto_if_eq EventScript_17007B msgbox gUnknown_819F50C releaseall end diff --git a/data/maps/Route12_NorthEntrance_2F/scripts.inc b/data/maps/Route12_NorthEntrance_2F/scripts.inc index 42370d54a..3c8727208 100644 --- a/data/maps/Route12_NorthEntrance_2F/scripts.inc +++ b/data/maps/Route12_NorthEntrance_2F/scripts.inc @@ -13,7 +13,7 @@ Route12_NorthEntrance_2F_EventScript_16FE8A:: @ 816FE8A lock faceplayer checkflag FLAG_0x25B - goto_if 1, EventScript_16FF01 + goto_if_eq EventScript_16FF01 checkplayergender compare_var_to_value VAR_RESULT, 0 call_if 1, EventScript_16FEE5 @@ -21,7 +21,7 @@ Route12_NorthEntrance_2F_EventScript_16FE8A:: @ 816FE8A call_if 1, EventScript_16FEEE checkitemspace ITEM_TM27, 1 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16FEF7 + goto_if_eq EventScript_16FEF7 additem ITEM_TM27, 1 giveitemfanfaremsg gUnknown_819EE9F, ITEM_TM27 msgbox gUnknown_819EEC6 diff --git a/data/maps/Route15_WestEntrance_2F/scripts.inc b/data/maps/Route15_WestEntrance_2F/scripts.inc index d8aba36d2..36ea31ca0 100644 --- a/data/maps/Route15_WestEntrance_2F/scripts.inc +++ b/data/maps/Route15_WestEntrance_2F/scripts.inc @@ -22,10 +22,10 @@ Route15_WestEntrance_2F_EventScript_1700B9:: @ 81700B9 faceplayer call EventScript_170145 checkflag FLAG_0x256 - goto_if 1, EventScript_17013B + goto_if_eq EventScript_17013B msgbox gUnknown_819F5AB, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1A7AD1 + goto_if_eq EventScript_1A7AD1 setvar VAR_0x8004, 0 specialvar VAR_RESULT, sub_80CA3D8 getnumberstring 2, VAR_0x8006 @@ -35,7 +35,7 @@ Route15_WestEntrance_2F_EventScript_1700B9:: @ 81700B9 msgbox gUnknown_819F6AA checkitemspace ITEM_EXP_SHARE, 1 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1A7AC7 + goto_if_eq EventScript_1A7AC7 additem ITEM_EXP_SHARE, 1 giveitemfanfaremsg gUnknown_819F6FD, ITEM_EXP_SHARE setflag FLAG_0x256 diff --git a/data/maps/Route16/scripts.inc b/data/maps/Route16/scripts.inc index dba835410..e5fd83934 100644 --- a/data/maps/Route16/scripts.inc +++ b/data/maps/Route16/scripts.inc @@ -37,11 +37,11 @@ Route16_EventScript_168121:: @ 8168121 goto_if 0, EventScript_1681A3 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 msgbox gUnknown_81853CC, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_168197 + goto_if_eq EventScript_168197 call EventScript_1A924B setwildbattle SPECIES_SNORLAX, 30, ITEM_NONE waitse @@ -54,11 +54,11 @@ Route16_EventScript_168121:: @ 8168121 clearflag FLAG_0x807 specialvar VAR_RESULT, sub_80CA74C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_168199 + goto_if_eq EventScript_168199 compare_var_to_value VAR_RESULT, 4 - goto_if 1, EventScript_168199 + goto_if_eq EventScript_168199 compare_var_to_value VAR_RESULT, 5 - goto_if 1, EventScript_168199 + goto_if_eq EventScript_168199 release end diff --git a/data/maps/Route16_House/scripts.inc b/data/maps/Route16_House/scripts.inc index 8f30a2aa1..82cc7a6f4 100644 --- a/data/maps/Route16_House/scripts.inc +++ b/data/maps/Route16_House/scripts.inc @@ -5,11 +5,11 @@ Route16_House_EventScript_17014F:: @ 817014F lock faceplayer checkflag FLAG_0x238 - goto_if 1, EventScript_1701A5 + goto_if_eq EventScript_1701A5 msgbox gUnknown_819F851 checkitemspace ITEM_HM02, 1 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_17019B + goto_if_eq EventScript_17019B additem ITEM_HM02, 1 giveitemfanfaremsg gUnknown_819F8C0, ITEM_HM02 msgbox gUnknown_819F8E0 diff --git a/data/maps/Route16_NorthEntrance_2F/scripts.inc b/data/maps/Route16_NorthEntrance_2F/scripts.inc index 676358b5f..32685e669 100644 --- a/data/maps/Route16_NorthEntrance_2F/scripts.inc +++ b/data/maps/Route16_NorthEntrance_2F/scripts.inc @@ -22,10 +22,10 @@ Route16_NorthEntrance_2F_EventScript_1702E3:: @ 81702E3 faceplayer call EventScript_17036F checkflag FLAG_0x2FD - goto_if 1, EventScript_170365 + goto_if_eq EventScript_170365 msgbox gUnknown_819FB0E, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1A7AD1 + goto_if_eq EventScript_1A7AD1 setvar VAR_0x8004, 0 specialvar VAR_RESULT, sub_80CA3D8 getnumberstring 2, VAR_0x8006 @@ -35,7 +35,7 @@ Route16_NorthEntrance_2F_EventScript_1702E3:: @ 81702E3 msgbox gUnknown_819FC15 checkitemspace ITEM_AMULET_COIN, 1 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1A7AC7 + goto_if_eq EventScript_1A7AC7 additem ITEM_AMULET_COIN, 1 giveitemfanfaremsg gUnknown_819FC68, ITEM_AMULET_COIN setflag FLAG_0x2FD diff --git a/data/maps/Route18_EastEntrance_2F/scripts.inc b/data/maps/Route18_EastEntrance_2F/scripts.inc index 801e54efd..204a0f879 100644 --- a/data/maps/Route18_EastEntrance_2F/scripts.inc +++ b/data/maps/Route18_EastEntrance_2F/scripts.inc @@ -15,10 +15,10 @@ Route18_EastEntrance_2F_EventScript_17047E:: @ 817047E setvar VAR_0x8008, 5 call EventScript_1A8CAD checkflag FLAG_0x257 - goto_if 1, EventScript_1704F0 + goto_if_eq EventScript_1704F0 msgbox gUnknown_81A597B, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1704D8 + goto_if_eq EventScript_1704D8 call EventScript_1A8CBD compare_var_to_value VAR_0x8004, 6 goto_if 4, EventScript_1704D8 diff --git a/data/maps/Route24/scripts.inc b/data/maps/Route24/scripts.inc index 50497540d..91dfc90f0 100644 --- a/data/maps/Route24/scripts.inc +++ b/data/maps/Route24/scripts.inc @@ -5,11 +5,11 @@ Route24_EventScript_168620:: @ 8168620 lock faceplayer compare_var_to_value VAR_0x406B, 1 - goto_if 1, EventScript_168656 + goto_if_eq EventScript_168656 msgbox gUnknown_8188C3C checkitemspace ITEM_NUGGET, 1 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16864C + goto_if_eq EventScript_16864C call EventScript_1686B9 release end @@ -47,7 +47,7 @@ EventScript_168678:: @ 8168678 msgbox gUnknown_8188C3C checkitemspace ITEM_NUGGET, 1 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_168713 + goto_if_eq EventScript_168713 call EventScript_1686B9 releaseall end diff --git a/data/maps/Route25_SeaCottage/scripts.inc b/data/maps/Route25_SeaCottage/scripts.inc index 1da87da68..5707c9938 100644 --- a/data/maps/Route25_SeaCottage/scripts.inc +++ b/data/maps/Route25_SeaCottage/scripts.inc @@ -22,16 +22,16 @@ Route25_SeaCottage_EventScript_17054B:: @ 817054B lock faceplayer checkflag FLAG_0x003 - goto_if 1, EventScript_1706C8 + goto_if_eq EventScript_1706C8 checkflag FLAG_0x234 - goto_if 1, EventScript_170640 + goto_if_eq EventScript_170640 checkflag FLAG_0x233 - goto_if 1, EventScript_17064A + goto_if_eq EventScript_17064A checkplayergender compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_170580 + goto_if_eq EventScript_170580 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_17058E + goto_if_eq EventScript_17058E end EventScript_170580:: @ 8170580 @@ -112,7 +112,7 @@ EventScript_17064A:: @ 817064A call_if 1, EventScript_1706B5 checkitemspace ITEM_SS_TICKET, 1 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1706BE + goto_if_eq EventScript_1706BE additem ITEM_SS_TICKET, 1 giveitemfanfaremsg gUnknown_81A028E, ITEM_SS_TICKET, 1, BGM_FRLG_ME_KEYITEM setflag FLAG_0x235 @@ -160,9 +160,9 @@ Movement_1706DB:: @ 81706DB Route25_SeaCottage_EventScript_1706DD:: @ 81706DD lockall checkflag FLAG_0x003 - goto_if 1, EventScript_1707CA + goto_if_eq EventScript_1707CA checkflag FLAG_0x002 - goto_if 1, EventScript_1706FA + goto_if_eq EventScript_1706FA msgbox gUnknown_81A0402 releaseall end @@ -251,19 +251,13 @@ EventScript_1707D8:: @ 81707D8 message Text_1A0479 waitmessage multichoice 0, 0, 1, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_17082B - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_170840 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_170855 - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_17086A - compare_var_to_value VAR_0x8000, 4 - goto_if 1, EventScript_17087F - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_17087F + switch VAR_RESULT + case 0, EventScript_17082B + case 1, EventScript_170840 + case 2, EventScript_170855 + case 3, EventScript_17086A + case 4, EventScript_17087F + case 127, EventScript_17087F end EventScript_17082B:: @ 817082B diff --git a/data/maps/Route2_EastBuilding/scripts.inc b/data/maps/Route2_EastBuilding/scripts.inc index 21b6f9193..9716879a1 100644 --- a/data/maps/Route2_EastBuilding/scripts.inc +++ b/data/maps/Route2_EastBuilding/scripts.inc @@ -6,10 +6,10 @@ Route2_EastBuilding_EventScript_16F67F:: @ 816F67F faceplayer call EventScript_16F70B checkflag FLAG_0x23B - goto_if 1, EventScript_16F701 + goto_if_eq EventScript_16F701 msgbox gUnknown_819D64F, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1A7AD1 + goto_if_eq EventScript_1A7AD1 setvar VAR_0x8004, 0 specialvar VAR_RESULT, sub_80CA3D8 getnumberstring 2, VAR_0x8006 @@ -19,7 +19,7 @@ Route2_EastBuilding_EventScript_16F67F:: @ 816F67F msgbox gUnknown_819D74E checkitemspace ITEM_HM05, 1 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1A7AC7 + goto_if_eq EventScript_1A7AC7 additem ITEM_HM05, 1 giveitemfanfaremsg gUnknown_819D7A1, ITEM_HM05 setflag FLAG_0x23B diff --git a/data/maps/Route2_House/scripts.inc b/data/maps/Route2_House/scripts.inc index 0759d70de..fd7ac6c05 100644 --- a/data/maps/Route2_House/scripts.inc +++ b/data/maps/Route2_House/scripts.inc @@ -11,10 +11,10 @@ Route2_House_EventScript_16F602:: @ 816F602 setvar VAR_0x8008, 0 call EventScript_1A8CAD checkflag FLAG_0x248 - goto_if 1, EventScript_16F674 + goto_if_eq EventScript_16F674 msgbox gUnknown_81A597B, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16F65C + goto_if_eq EventScript_16F65C call EventScript_1A8CBD compare_var_to_value VAR_0x8004, 6 goto_if 4, EventScript_16F65C diff --git a/data/maps/Route4_PokemonCenter_1F/scripts.inc b/data/maps/Route4_PokemonCenter_1F/scripts.inc index d2d305823..3019e152f 100644 --- a/data/maps/Route4_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route4_PokemonCenter_1F/scripts.inc @@ -22,13 +22,13 @@ Route4_PokemonCenter_1F_EventScript_16F75F:: @ 816F75F lock faceplayer checkflag FLAG_0x249 - goto_if 1, EventScript_16F8A2 + goto_if_eq EventScript_16F8A2 showmoneybox 0, 0, 0 checkplayergender compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16F786 + goto_if_eq EventScript_16F786 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16F794 + goto_if_eq EventScript_16F794 end EventScript_16F786:: @ 816F786 @@ -43,26 +43,26 @@ EventScript_16F794:: @ 816F794 EventScript_16F7A2:: @ 816F7A2 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16F888 + goto_if_eq EventScript_16F888 checkmoney 500, 0 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16F895 + goto_if_eq EventScript_16F895 textcolor 3 setvar VAR_0x4001, 129 givemon SPECIES_MAGIKARP, 5, ITEM_NONE, 0, 0, 0 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16F7F6 + goto_if_eq EventScript_16F7F6 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16F822 + goto_if_eq EventScript_16F822 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_16F8AC + goto_if_eq EventScript_16F8AC end EventScript_16F7F6:: @ 816F7F6 call EventScript_16F86F msgbox gUnknown_81A56A7, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16F861 + goto_if_eq EventScript_16F861 call EventScript_1A8C27 fadescreen 1 hidemoneybox @@ -77,7 +77,7 @@ EventScript_16F822:: @ 816F822 call EventScript_16F86F msgbox gUnknown_81A56A7, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16F84B + goto_if_eq EventScript_16F84B fadescreen 1 hidemoneybox .byte 0 diff --git a/data/maps/Route5_SouthEntrance/scripts.inc b/data/maps/Route5_SouthEntrance/scripts.inc index 1993be19c..1ac21c6b1 100644 --- a/data/maps/Route5_SouthEntrance/scripts.inc +++ b/data/maps/Route5_SouthEntrance/scripts.inc @@ -28,7 +28,7 @@ EventScript_16F92E:: @ 816F92E applymovement 255, Movement_1A75E7 waitmovement 0 checkflag FLAG_0x2A6 - goto_if 1, EventScript_16F958 + goto_if_eq EventScript_16F958 msgbox gUnknown_819E04B closemessage applymovement 255, Movement_16F9C4 diff --git a/data/maps/Route6_NorthEntrance/scripts.inc b/data/maps/Route6_NorthEntrance/scripts.inc index aeea2f7e6..9537d2e82 100644 --- a/data/maps/Route6_NorthEntrance/scripts.inc +++ b/data/maps/Route6_NorthEntrance/scripts.inc @@ -28,7 +28,7 @@ EventScript_16F9F4:: @ 816F9F4 applymovement 255, Movement_1A75EB waitmovement 0 checkflag FLAG_0x2A6 - goto_if 1, EventScript_16FA1E + goto_if_eq EventScript_16FA1E msgbox gUnknown_819E181 closemessage applymovement 255, Movement_16FA8A diff --git a/data/maps/Route7_EastEntrance/scripts.inc b/data/maps/Route7_EastEntrance/scripts.inc index 2aacbed22..845eab835 100644 --- a/data/maps/Route7_EastEntrance/scripts.inc +++ b/data/maps/Route7_EastEntrance/scripts.inc @@ -28,7 +28,7 @@ EventScript_16FABB:: @ 816FABB applymovement 255, Movement_1A75E9 waitmovement 0 checkflag FLAG_0x2A6 - goto_if 1, EventScript_16FAE5 + goto_if_eq EventScript_16FAE5 msgbox gUnknown_819E2B7 closemessage applymovement 255, Movement_16FB51 diff --git a/data/maps/Route8_WestEntrance/scripts.inc b/data/maps/Route8_WestEntrance/scripts.inc index 16d77f8f9..1d347d2d0 100644 --- a/data/maps/Route8_WestEntrance/scripts.inc +++ b/data/maps/Route8_WestEntrance/scripts.inc @@ -28,7 +28,7 @@ EventScript_16FB81:: @ 816FB81 applymovement 255, Movement_1A75E9 waitmovement 0 checkflag FLAG_0x2A6 - goto_if 1, EventScript_16FBAB + goto_if_eq EventScript_16FBAB msgbox gUnknown_819E3ED closemessage applymovement 255, Movement_16FC2D diff --git a/data/maps/SSAnne_1F_Room4/scripts.inc b/data/maps/SSAnne_1F_Room4/scripts.inc index e37fb22fd..aa243949e 100644 --- a/data/maps/SSAnne_1F_Room4/scripts.inc +++ b/data/maps/SSAnne_1F_Room4/scripts.inc @@ -6,7 +6,7 @@ SSAnne_1F_Room4_EventScript_160C44:: @ 8160C44 faceplayer checkplayergender compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_160C5C + goto_if_eq EventScript_160C5C msgbox gUnknown_8173BA4 release end diff --git a/data/maps/SSAnne_1F_Room6/scripts.inc b/data/maps/SSAnne_1F_Room6/scripts.inc index ac794e8c2..1c6c0004c 100644 --- a/data/maps/SSAnne_1F_Room6/scripts.inc +++ b/data/maps/SSAnne_1F_Room6/scripts.inc @@ -6,7 +6,7 @@ SSAnne_1F_Room6_EventScript_160DF3:: @ 8160DF3 faceplayer msgbox gUnknown_817445B, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_160E18 + goto_if_eq EventScript_160E18 closemessage call EventScript_1A6C26 msgbox gUnknown_8174490 @@ -16,7 +16,7 @@ SSAnne_1F_Room6_EventScript_160DF3:: @ 8160DF3 EventScript_160E18:: @ 8160E18 checkplayergender compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_160E2E + goto_if_eq EventScript_160E2E msgbox gUnknown_8174515 release end diff --git a/data/maps/SSAnne_CaptainsOffice/scripts.inc b/data/maps/SSAnne_CaptainsOffice/scripts.inc index 5cf0b5375..32ab8b95c 100644 --- a/data/maps/SSAnne_CaptainsOffice/scripts.inc +++ b/data/maps/SSAnne_CaptainsOffice/scripts.inc @@ -4,7 +4,7 @@ SSAnne_CaptainsOffice_MapScripts:: @ 8160B39 SSAnne_CaptainsOffice_EventScript_160B3A:: @ 8160B3A lock checkflag FLAG_0x237 - goto_if 1, EventScript_160BB5 + goto_if_eq EventScript_160BB5 msgbox gUnknown_8173646 textcolor 3 message Text_173676 diff --git a/data/maps/SafariZone_SecretHouse/scripts.inc b/data/maps/SafariZone_SecretHouse/scripts.inc index 025d36484..67987618d 100644 --- a/data/maps/SafariZone_SecretHouse/scripts.inc +++ b/data/maps/SafariZone_SecretHouse/scripts.inc @@ -5,11 +5,11 @@ SafariZone_SecretHouse_EventScript_162453:: @ 8162453 lock faceplayer checkflag FLAG_0x239 - goto_if 1, EventScript_1624A9 + goto_if_eq EventScript_1624A9 msgbox gUnknown_8177DC1 checkitemspace ITEM_HM03, 1 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16249F + goto_if_eq EventScript_16249F additem ITEM_HM03, 1 giveitemfanfaremsg gUnknown_8177E92, ITEM_HM03 msgbox gUnknown_8177EB7 diff --git a/data/maps/SaffronCity_Dojo/scripts.inc b/data/maps/SaffronCity_Dojo/scripts.inc index 8c7bbe61a..8be7e27a6 100644 --- a/data/maps/SaffronCity_Dojo/scripts.inc +++ b/data/maps/SaffronCity_Dojo/scripts.inc @@ -21,7 +21,7 @@ SaffronCity_Dojo_EventScript_16EC00:: @ 816EC00 lock faceplayer checkflag FLAG_0x278 - goto_if 1, EventScript_16EC3C + goto_if_eq EventScript_16EC3C drawmonpic SPECIES_HITMONLEE, 10, 3 setvar VAR_0x4001, SPECIES_HITMONLEE applymovement 5, Movement_1A75E9 @@ -30,7 +30,7 @@ SaffronCity_Dojo_EventScript_16EC00:: @ 816EC00 msgbox gUnknown_819B44E, MSGBOX_YESNO call EventScript_1A6675 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16EC82 + goto_if_eq EventScript_16EC82 erasemonpic release end @@ -44,7 +44,7 @@ SaffronCity_Dojo_EventScript_16EC46:: @ 816EC46 lock faceplayer checkflag FLAG_0x278 - goto_if 1, EventScript_16EC3C + goto_if_eq EventScript_16EC3C drawmonpic SPECIES_HITMONCHAN, 10, 3 setvar VAR_0x4001, SPECIES_HITMONCHAN applymovement 5, Movement_1A75E9 @@ -53,7 +53,7 @@ SaffronCity_Dojo_EventScript_16EC46:: @ 816EC46 msgbox gUnknown_819B49E, MSGBOX_YESNO call EventScript_1A6675 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16EC82 + goto_if_eq EventScript_16EC82 erasemonpic release end @@ -62,11 +62,11 @@ EventScript_16EC82:: @ 816EC82 erasemonpic givemon VAR_0x4001, 25, ITEM_NONE, 0, 0, 0 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16ECB5 + goto_if_eq EventScript_16ECB5 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16ECEC + goto_if_eq EventScript_16ECEC compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A927C + goto_if_eq EventScript_1A927C release end @@ -80,7 +80,7 @@ EventScript_16ECB5:: @ 816ECB5 setflag FLAG_0x278 msgbox gUnknown_81A56A7, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16ED29 + goto_if_eq EventScript_16ED29 call EventScript_1A8C27 call EventScript_1A74EB goto EventScript_16ED29 @@ -96,7 +96,7 @@ EventScript_16ECEC:: @ 816ECEC setflag FLAG_0x278 msgbox gUnknown_81A56A7, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16ED1E + goto_if_eq EventScript_16ED1E call EventScript_1A8C33 goto EventScript_16ED1E end @@ -145,7 +145,7 @@ SaffronCity_Dojo_EventScript_16ED8B:: @ 816ED8B SaffronCity_Dojo_EventScript_16EDA2:: @ 816EDA2 trainerbattle 2, 317, 0, Text_19B12C, Text_19B193, EventScript_16EDD0 checkflag FLAG_0x278 - goto_if 1, EventScript_16EDC6 + goto_if_eq EventScript_16EDC6 msgbox gUnknown_819B1A7, 6 end diff --git a/data/maps/SaffronCity_Duplicate/scripts.inc b/data/maps/SaffronCity_Duplicate/scripts.inc index e7ad1b506..b19502c90 100644 --- a/data/maps/SaffronCity_Duplicate/scripts.inc +++ b/data/maps/SaffronCity_Duplicate/scripts.inc @@ -43,7 +43,7 @@ SaffronCity_Duplicate_EventScript_1673B0:: @ 81673B0 SaffronCity_Duplicate_EventScript_1673B9:: @ 81673B9 lock checkflag FLAG_0x23C - goto_if 1, EventScript_1673D7 + goto_if_eq EventScript_1673D7 applymovement 6, Movement_1A75E1 waitmovement 0 msgbox gUnknown_81812CA diff --git a/data/maps/SaffronCity_Gym/scripts.inc b/data/maps/SaffronCity_Gym/scripts.inc index 206b2bbb8..cbd8b2d02 100644 --- a/data/maps/SaffronCity_Gym/scripts.inc +++ b/data/maps/SaffronCity_Gym/scripts.inc @@ -31,7 +31,7 @@ EventScript_16EE3D:: @ 816EE3D msgbox gUnknown_819B6FA checkitemspace ITEM_TM04, 1 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16EE7E + goto_if_eq EventScript_16EE7E additem ITEM_TM04, 1 giveitemfanfaremsg gUnknown_819B7D3, ITEM_TM04 setflag FLAG_0x29A @@ -86,7 +86,7 @@ SaffronCity_Gym_EventScript_16EF36:: @ 816EF36 lock faceplayer checkflag FLAG_0x4B5 - goto_if 1, EventScript_16EF4B + goto_if_eq EventScript_16EF4B msgbox gUnknown_819BCF6 release end @@ -99,7 +99,7 @@ EventScript_16EF4B:: @ 816EF4B SaffronCity_Gym_EventScript_16EF55:: @ 816EF55 lockall checkflag FLAG_0x825 - goto_if 1, EventScript_16EF69 + goto_if_eq EventScript_16EF69 msgbox gUnknown_819BDFE releaseall end diff --git a/data/maps/SaffronCity_House1_2F/scripts.inc b/data/maps/SaffronCity_House1_2F/scripts.inc index 11da09898..8a6227b38 100644 --- a/data/maps/SaffronCity_House1_2F/scripts.inc +++ b/data/maps/SaffronCity_House1_2F/scripts.inc @@ -20,13 +20,13 @@ SaffronCity_House1_2F_EventScript_16EB70:: @ 816EB70 SaffronCity_House1_2F_EventScript_16EB7B:: @ 816EB7B special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 lock faceplayer checkitem ITEM_POKE_DOLL, 1 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1C4CF6 + goto_if_eq EventScript_1C4CF6 checkplayergender compare_var_to_value VAR_RESULT, 0 call_if 1, EventScript_16EBB7 diff --git a/data/maps/SaffronCity_House3/scripts.inc b/data/maps/SaffronCity_House3/scripts.inc index 3186be2bb..89a44eecd 100644 --- a/data/maps/SaffronCity_House3/scripts.inc +++ b/data/maps/SaffronCity_House3/scripts.inc @@ -5,11 +5,11 @@ SaffronCity_House3_EventScript_16F05F:: @ 816F05F lock faceplayer checkflag FLAG_0x245 - goto_if 1, EventScript_16F0B5 + goto_if_eq EventScript_16F0B5 msgbox gUnknown_819C142 checkitemspace ITEM_TM29, 1 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16F0AB + goto_if_eq EventScript_16F0AB additem ITEM_TM29, 1 giveitemfanfaremsg gUnknown_819C16C, ITEM_TM29 msgbox gUnknown_819C18F diff --git a/data/maps/SaffronCity_Mart/scripts.inc b/data/maps/SaffronCity_Mart/scripts.inc index cd657e11f..509fd37b6 100644 --- a/data/maps/SaffronCity_Mart/scripts.inc +++ b/data/maps/SaffronCity_Mart/scripts.inc @@ -12,7 +12,7 @@ SaffronCity_Mart_EventScript_16EFAC:: @ 816EFAC SaffronCity_Mart_EventScript_16EFB5:: @ 816EFB5 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lock faceplayer message Text_1A6211 diff --git a/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc b/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc index 288b26693..17e583372 100644 --- a/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc @@ -26,7 +26,7 @@ SaffronCity_PokemonCenter_1F_EventScript_16F016:: @ 816F016 lock faceplayer compare_var_to_value VAR_0x4060, 1 - goto_if 1, EventScript_16F02D + goto_if_eq EventScript_16F02D msgbox gUnknown_819C0B4 release end diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc b/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc index f4e2d2427..dce3faa1b 100644 --- a/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc +++ b/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc @@ -72,9 +72,9 @@ Movement_16F13E:: @ 816F13E SaffronCity_PokemonTrainerFanClub_MapScript2_16F144:: @ 816F144 compare_var_to_value VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 1 - goto_if 1, EventScript_16F267 + goto_if_eq EventScript_16F267 compare_var_to_value VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 2 - goto_if 1, EventScript_16F15B + goto_if_eq EventScript_16F15B end EventScript_16F15B:: @ 816F15B @@ -167,13 +167,13 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F281:: @ 816F281 setvar VAR_0x8004, 0 special sub_81133A4 compare_var_to_value VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 - goto_if 1, EventScript_16F2EE + goto_if_eq EventScript_16F2EE specialvar VAR_RESULT, sub_8113364 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16F2C0 + goto_if_eq EventScript_16F2C0 specialvar VAR_RESULT, sub_8113288 compare_var_to_value VAR_RESULT, 7 - goto_if 1, EventScript_16F2E4 + goto_if_eq EventScript_16F2E4 msgbox gUnknown_819C420 release end @@ -181,7 +181,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F281:: @ 816F281 EventScript_16F2C0:: @ 816F2C0 specialvar VAR_RESULT, sub_8113288 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16F2DA + goto_if_eq EventScript_16F2DA msgbox gUnknown_819C390 release end @@ -207,13 +207,13 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F2F8:: @ 816F2F8 setvar VAR_0x8004, 3 special sub_81133A4 compare_var_to_value VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 - goto_if 1, EventScript_16F365 + goto_if_eq EventScript_16F365 specialvar VAR_RESULT, sub_8113364 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16F337 + goto_if_eq EventScript_16F337 specialvar VAR_RESULT, sub_8113288 compare_var_to_value VAR_RESULT, 7 - goto_if 1, EventScript_16F35B + goto_if_eq EventScript_16F35B msgbox gUnknown_819CBD3 release end @@ -221,7 +221,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F2F8:: @ 816F2F8 EventScript_16F337:: @ 816F337 specialvar VAR_RESULT, sub_8113288 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16F351 + goto_if_eq EventScript_16F351 msgbox gUnknown_819CB32 release end @@ -247,13 +247,13 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F36F:: @ 816F36F setvar VAR_0x8004, 1 special sub_81133A4 compare_var_to_value VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 - goto_if 1, EventScript_16F3DC + goto_if_eq EventScript_16F3DC specialvar VAR_RESULT, sub_8113364 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16F3AE + goto_if_eq EventScript_16F3AE specialvar VAR_RESULT, sub_8113288 compare_var_to_value VAR_RESULT, 7 - goto_if 1, EventScript_16F3D2 + goto_if_eq EventScript_16F3D2 msgbox gUnknown_819C6BA release end @@ -261,7 +261,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F36F:: @ 816F36F EventScript_16F3AE:: @ 816F3AE specialvar VAR_RESULT, sub_8113288 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16F3C8 + goto_if_eq EventScript_16F3C8 msgbox gUnknown_819C5A9 release end @@ -287,13 +287,13 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F3E6:: @ 816F3E6 setvar VAR_0x8004, 2 special sub_81133A4 compare_var_to_value VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 - goto_if 1, EventScript_16F453 + goto_if_eq EventScript_16F453 specialvar VAR_RESULT, sub_8113364 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16F425 + goto_if_eq EventScript_16F425 specialvar VAR_RESULT, sub_8113288 compare_var_to_value VAR_RESULT, 7 - goto_if 1, EventScript_16F449 + goto_if_eq EventScript_16F449 msgbox gUnknown_819C986 release end @@ -301,7 +301,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F3E6:: @ 816F3E6 EventScript_16F425:: @ 816F425 specialvar VAR_RESULT, sub_8113288 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16F43F + goto_if_eq EventScript_16F43F msgbox gUnknown_819C81E release end @@ -328,10 +328,10 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F45D:: @ 816F45D special sub_81133A4 specialvar VAR_RESULT, sub_8113364 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16F491 + goto_if_eq EventScript_16F491 specialvar VAR_RESULT, sub_8113288 compare_var_to_value VAR_RESULT, 7 - goto_if 1, EventScript_16F4B5 + goto_if_eq EventScript_16F4B5 msgbox gUnknown_819D01F release end @@ -339,7 +339,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F45D:: @ 816F45D EventScript_16F491:: @ 816F491 specialvar VAR_RESULT, sub_8113288 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16F4AB + goto_if_eq EventScript_16F4AB msgbox gUnknown_819CEDF release end @@ -361,10 +361,10 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F4BF:: @ 816F4BF special sub_81133A4 specialvar VAR_RESULT, sub_8113364 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16F4F3 + goto_if_eq EventScript_16F4F3 specialvar VAR_RESULT, sub_8113288 compare_var_to_value VAR_RESULT, 7 - goto_if 1, EventScript_16F517 + goto_if_eq EventScript_16F517 msgbox gUnknown_819CDDA release end @@ -372,7 +372,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F4BF:: @ 816F4BF EventScript_16F4F3:: @ 816F4F3 specialvar VAR_RESULT, sub_8113288 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16F50D + goto_if_eq EventScript_16F50D msgbox gUnknown_819CCF3 release end @@ -394,10 +394,10 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F521:: @ 816F521 special sub_81133A4 specialvar VAR_RESULT, sub_8113364 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16F555 + goto_if_eq EventScript_16F555 specialvar VAR_RESULT, sub_8113288 compare_var_to_value VAR_RESULT, 7 - goto_if 1, EventScript_16F579 + goto_if_eq EventScript_16F579 msgbox gUnknown_819D1AE release end @@ -405,7 +405,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F521:: @ 816F521 EventScript_16F555:: @ 816F555 specialvar VAR_RESULT, sub_8113288 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16F56F + goto_if_eq EventScript_16F56F msgbox gUnknown_819D0E3 release end @@ -427,10 +427,10 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F583:: @ 816F583 special sub_81133A4 specialvar VAR_RESULT, sub_8113364 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16F5B7 + goto_if_eq EventScript_16F5B7 specialvar VAR_RESULT, sub_8113288 compare_var_to_value VAR_RESULT, 7 - goto_if 1, EventScript_16F5DB + goto_if_eq EventScript_16F5DB msgbox gUnknown_819D3D2 release end @@ -438,7 +438,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F583:: @ 816F583 EventScript_16F5B7:: @ 816F5B7 specialvar VAR_RESULT, sub_8113288 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16F5D1 + goto_if_eq EventScript_16F5D1 msgbox gUnknown_819D2B4 release end diff --git a/data/maps/SeafoamIslands_B3F/scripts.inc b/data/maps/SeafoamIslands_B3F/scripts.inc index 8f43bfec1..e54e7ceb7 100644 --- a/data/maps/SeafoamIslands_B3F/scripts.inc +++ b/data/maps/SeafoamIslands_B3F/scripts.inc @@ -40,7 +40,7 @@ EventScript_162FA2:: @ 8162FA2 checkflag FLAG_0x047 call_if 0, EventScript_162FF0 compare_var_to_value VAR_0x4002, 2 - goto_if 1, EventScript_16300C + goto_if_eq EventScript_16300C getplayerxy VAR_0x8008, VAR_0x8009 compare_var_to_value VAR_0x8008, 24 call_if 0, EventScript_162FF6 diff --git a/data/maps/SeafoamIslands_B4F/scripts.inc b/data/maps/SeafoamIslands_B4F/scripts.inc index ffea0c87f..5ec6bc28c 100644 --- a/data/maps/SeafoamIslands_B4F/scripts.inc +++ b/data/maps/SeafoamIslands_B4F/scripts.inc @@ -56,7 +56,7 @@ SeafoamIslands_B4F_MapScript3_1630B1:: @ 81630B1 checkflag FLAG_0x04D call_if 0, EventScript_163169 compare_var_to_value VAR_0x4002, 2 - goto_if 1, EventScript_1630D4 + goto_if_eq EventScript_1630D4 end EventScript_1630D4:: @ 81630D4 @@ -100,7 +100,7 @@ EventScript_163121:: @ 8163121 checkflag FLAG_0x04D call_if 0, EventScript_163169 compare_var_to_value VAR_0x4002, 2 - goto_if 1, EventScript_163185 + goto_if_eq EventScript_163185 getplayerxy VAR_0x8008, VAR_0x8009 compare_var_to_value VAR_0x8008, 9 call_if 0, EventScript_16316F @@ -165,7 +165,7 @@ Movement_1631AA:: @ 81631AA SeafoamIslands_B4F_EventScript_1631AC:: @ 81631AC special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 lock faceplayer @@ -184,11 +184,11 @@ SeafoamIslands_B4F_EventScript_1631AC:: @ 81631AC clearflag FLAG_0x807 specialvar VAR_RESULT, sub_80CA74C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16320F + goto_if_eq EventScript_16320F compare_var_to_value VAR_RESULT, 4 - goto_if 1, EventScript_163218 + goto_if_eq EventScript_163218 compare_var_to_value VAR_RESULT, 5 - goto_if 1, EventScript_163218 + goto_if_eq EventScript_163218 setflag FLAG_0x2BE release end diff --git a/data/maps/SevenIsland_House_Room1/scripts.inc b/data/maps/SevenIsland_House_Room1/scripts.inc index d9f6f8526..107b91ad7 100644 --- a/data/maps/SevenIsland_House_Room1/scripts.inc +++ b/data/maps/SevenIsland_House_Room1/scripts.inc @@ -78,7 +78,7 @@ SevenIsland_House_Room1_EventScript_170958:: @ 8170958 compare_var_to_value VAR_RESULT, 1 call_if 1, EventScript_17097D compare_var_to_value VAR_0x4001, 1 - goto_if 1, EventScript_170987 + goto_if_eq EventScript_170987 msgbox gUnknown_81A049B release end @@ -93,17 +93,17 @@ EventScript_170987:: @ 8170987 special sub_80CAAAC msgbox gUnknown_81A0598, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_170A11 + goto_if_eq EventScript_170A11 call EventScript_170A1E compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_170A11 + goto_if_eq EventScript_170A11 msgbox gUnknown_81A0788, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_170A11 + goto_if_eq EventScript_170A11 special LoadPlayerParty call EventScript_1A4EAF compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_170A11 + goto_if_eq EventScript_170A11 special SavePlayerParty special sub_80A03D8 msgbox gUnknown_81A07C4 diff --git a/data/maps/SevenIsland_Mart/scripts.inc b/data/maps/SevenIsland_Mart/scripts.inc index 84510f03a..ce9ad21ed 100644 --- a/data/maps/SevenIsland_Mart/scripts.inc +++ b/data/maps/SevenIsland_Mart/scripts.inc @@ -4,7 +4,7 @@ SevenIsland_Mart_MapScripts:: @ 8170B30 SevenIsland_Mart_EventScript_170B31:: @ 8170B31 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lock faceplayer message Text_1A6211 diff --git a/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/scripts.inc b/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/scripts.inc index 0aa730a5d..566ed3ee6 100644 --- a/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/scripts.inc +++ b/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/scripts.inc @@ -29,77 +29,77 @@ EventScript_164E07:: @ 8164E07 SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E39:: @ 8164E39 lockall compare_var_to_value VAR_0x4001, 100 - goto_if 1, EventScript_164F8A + goto_if_eq EventScript_164F8A call EventScript_164F2E setvar VAR_0x4001, 100 compare_var_to_value VAR_0x4008, 7 - goto_if 1, EventScript_164F8C + goto_if_eq EventScript_164F8C releaseall end SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E5C:: @ 8164E5C lockall compare_var_to_value VAR_0x4002, 100 - goto_if 1, EventScript_164F8A + goto_if_eq EventScript_164F8A call EventScript_164F2E setvar VAR_0x4002, 100 compare_var_to_value VAR_0x4008, 7 - goto_if 1, EventScript_164F8C + goto_if_eq EventScript_164F8C releaseall end SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E7F:: @ 8164E7F lockall compare_var_to_value VAR_0x4003, 100 - goto_if 1, EventScript_164F8A + goto_if_eq EventScript_164F8A call EventScript_164F2E setvar VAR_0x4003, 100 compare_var_to_value VAR_0x4008, 7 - goto_if 1, EventScript_164F8C + goto_if_eq EventScript_164F8C releaseall end SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EA2:: @ 8164EA2 lockall compare_var_to_value VAR_0x4004, 100 - goto_if 1, EventScript_164F8A + goto_if_eq EventScript_164F8A call EventScript_164F2E setvar VAR_0x4004, 100 compare_var_to_value VAR_0x4008, 7 - goto_if 1, EventScript_164F8C + goto_if_eq EventScript_164F8C releaseall end SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EC5:: @ 8164EC5 lockall compare_var_to_value VAR_0x4005, 100 - goto_if 1, EventScript_164F8A + goto_if_eq EventScript_164F8A call EventScript_164F2E setvar VAR_0x4005, 100 compare_var_to_value VAR_0x4008, 7 - goto_if 1, EventScript_164F8C + goto_if_eq EventScript_164F8C releaseall end SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EE8:: @ 8164EE8 lockall compare_var_to_value VAR_0x4006, 100 - goto_if 1, EventScript_164F8A + goto_if_eq EventScript_164F8A call EventScript_164F2E setvar VAR_0x4006, 100 compare_var_to_value VAR_0x4008, 7 - goto_if 1, EventScript_164F8C + goto_if_eq EventScript_164F8C releaseall end SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164F0B:: @ 8164F0B lockall compare_var_to_value VAR_0x4007, 100 - goto_if 1, EventScript_164F8A + goto_if_eq EventScript_164F8A call EventScript_164F2E setvar VAR_0x4007, 100 compare_var_to_value VAR_0x4008, 7 - goto_if 1, EventScript_164F8C + goto_if_eq EventScript_164F8C releaseall end diff --git a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc index 63a9297ef..4098a0e0d 100644 --- a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc +++ b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc @@ -4,7 +4,7 @@ SevenIsland_SevaultCanyon_House_MapScripts:: @ 8172182 SevenIsland_SevaultCanyon_House_EventScript_172183:: @ 8172183 lock checkflag FLAG_0x002 - goto_if 1, EventScript_172211 + goto_if_eq EventScript_172211 playbgm BGM_FRLG_CHANSEY_DANCE, 0 applymovement 1, Movement_172231 waitmovement 0 @@ -16,7 +16,7 @@ SevenIsland_SevaultCanyon_House_EventScript_172183:: @ 8172183 textcolor 3 msgbox gUnknown_81A4DAF, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_172225 + goto_if_eq EventScript_172225 msgbox gUnknown_81A4DD8 closemessage call EventScript_1A6675 diff --git a/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc b/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc index 736a2aa40..de508c706 100644 --- a/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc @@ -14,11 +14,9 @@ SevenIsland_TrainerTower_Elevator_EventScript_164B03:: @ 8164B03 waitmessage setvar VAR_0x8004, 6 specialvar VAR_RESULT, sub_80CB328 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_164B46 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_164B52 + switch VAR_RESULT + case 0, EventScript_164B46 + case 1, EventScript_164B52 end EventScript_164B46:: @ 8164B46 @@ -32,22 +30,18 @@ EventScript_164B52:: @ 8164B52 end EventScript_164B5E:: @ 8164B5E - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_164BCD - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_164B90 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_164BD3 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_164BD3 + switch VAR_RESULT + case 0, EventScript_164BCD + case 1, EventScript_164B90 + case 2, EventScript_164BD3 + case 127, EventScript_164BD3 end EventScript_164B90:: @ 8164B90 setvar VAR_0x8006, 3 setdynamicwarp MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY, 255, 17, 8 compare_var_to_value VAR_0x403A, 3 - goto_if 1, EventScript_164BD3 + goto_if_eq EventScript_164BD3 call EventScript_164BD8 setvar VAR_0x403A, 3 special sub_80CB63C diff --git a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc index 2cc5badbf..0b6b930c7 100644 --- a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc @@ -13,7 +13,7 @@ SevenIsland_TrainerTower_Lobby_MapScript1_164853:: @ 8164853 setvar VAR_0x8004, 18 special sub_815D9E8 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_164886 + goto_if_eq EventScript_164886 setvar VAR_0x4000, 0 setobjectxy 255, 9, 7 applymovement 255, Movement_164AD4 @@ -69,13 +69,10 @@ EventScript_1648ED:: @ 81648ED setvar VAR_0x4000, 1 setvar VAR_0x8004, 12 special sub_815D9E8 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_164920 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_164938 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_16495C + switch VAR_RESULT + case 0, EventScript_164920 + case 1, EventScript_164938 + case 2, EventScript_16495C EventScript_164920:: @ 8164920 lock @@ -115,7 +112,7 @@ SevenIsland_TrainerTower_Lobby_EventScript_164966:: @ 8164966 setvar VAR_0x8004, 20 special sub_815D9E8 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_164988 + goto_if_eq EventScript_164988 msgbox gUnknown_817C9A2 goto EventScript_164990 @@ -129,7 +126,7 @@ EventScript_164990:: @ 8164990 SevenIsland_TrainerTower_Lobby_EventScript_164992:: @ 8164992 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lock faceplayer message Text_1A6211 @@ -162,7 +159,7 @@ SevenIsland_TrainerTower_Lobby_EventScript_1649CE:: @ 81649CE setvar VAR_0x8004, 17 special sub_815D9E8 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_164A00 + goto_if_eq EventScript_164A00 msgbox gUnknown_817C7D9 goto EventScript_164A08 @@ -173,15 +170,11 @@ EventScript_164A08:: @ 8164A08 message Text_17C88D waitmessage multichoice 18, 6, 16, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_164A53 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_164ABF - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_164A45 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_164ABF + switch VAR_RESULT + case 0, EventScript_164A53 + case 1, EventScript_164ABF + case 2, EventScript_164A45 + case 127, EventScript_164ABF end EventScript_164A45:: @ 8164A45 @@ -191,19 +184,13 @@ EventScript_164A45:: @ 8164A45 EventScript_164A53:: @ 8164A53 multichoice 13, 3, 64, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_164AA0 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_164AA0 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_164AA0 - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_164AA0 - compare_var_to_value VAR_0x8000, 4 - goto_if 1, EventScript_164ABF - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_164ABF + switch VAR_RESULT + case 0, EventScript_164AA0 + case 1, EventScript_164AA0 + case 2, EventScript_164AA0 + case 3, EventScript_164AA0 + case 4, EventScript_164ABF + case 127, EventScript_164ABF end EventScript_164AA0:: @ 8164AA0 diff --git a/data/maps/SilphCo_11F/scripts.inc b/data/maps/SilphCo_11F/scripts.inc index 67a8b2b48..92dc9ebc0 100644 --- a/data/maps/SilphCo_11F/scripts.inc +++ b/data/maps/SilphCo_11F/scripts.inc @@ -11,7 +11,7 @@ SilphCo_11F_EventScript_161DFE:: @ 8161DFE lock faceplayer checkflag FLAG_0x250 - goto_if 1, EventScript_161E75 + goto_if_eq EventScript_161E75 checkplayergender compare_var_to_value VAR_RESULT, 0 call_if 1, EventScript_161E59 @@ -19,7 +19,7 @@ SilphCo_11F_EventScript_161DFE:: @ 8161DFE call_if 1, EventScript_161E62 checkitemspace ITEM_MASTER_BALL, 1 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_161E6B + goto_if_eq EventScript_161E6B additem ITEM_MASTER_BALL, 1 giveitemfanfaremsg gUnknown_8176FBD, ITEM_MASTER_BALL, 1, BGM_FRLG_ME_KEYITEM msgbox gUnknown_8176FEB diff --git a/data/maps/SilphCo_7F/scripts.inc b/data/maps/SilphCo_7F/scripts.inc index 9620792fe..93893b711 100644 --- a/data/maps/SilphCo_7F/scripts.inc +++ b/data/maps/SilphCo_7F/scripts.inc @@ -131,16 +131,16 @@ SilphCo_7F_EventScript_161AC8:: @ 8161AC8 lock faceplayer checkflag FLAG_0x246 - goto_if 1, EventScript_161B8D + goto_if_eq EventScript_161B8D msgbox gUnknown_8176266 setvar VAR_0x4001, SPECIES_LAPRAS givemon SPECIES_LAPRAS, 25, ITEM_NONE, 0, 0, 0 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_161B12 + goto_if_eq EventScript_161B12 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_161B45 + goto_if_eq EventScript_161B45 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A927C + goto_if_eq EventScript_1A927C release end @@ -153,7 +153,7 @@ EventScript_161B12:: @ 8161B12 getspeciesname 0, SPECIES_LAPRAS msgbox gUnknown_81A56A7, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_161B7E + goto_if_eq EventScript_161B7E call EventScript_1A8C27 call EventScript_1A74EB goto EventScript_161B7E @@ -170,7 +170,7 @@ EventScript_161B45:: @ 8161B45 getspeciesname 0, SPECIES_LAPRAS msgbox gUnknown_81A56A7, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_161B73 + goto_if_eq EventScript_161B73 call EventScript_1A8C33 goto EventScript_161B73 diff --git a/data/maps/SilphCo_Elevator/scripts.inc b/data/maps/SilphCo_Elevator/scripts.inc index 795a6dc93..d36334429 100644 --- a/data/maps/SilphCo_Elevator/scripts.inc +++ b/data/maps/SilphCo_Elevator/scripts.inc @@ -14,40 +14,27 @@ SilphCo_Elevator_EventScript_161F6F:: @ 8161F6F specialvar VAR_RESULT, sub_80CB328 special sub_80CB7C4 waitstate - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1621BF - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_162197 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_16216F - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_162147 - compare_var_to_value VAR_0x8000, 4 - goto_if 1, EventScript_16211F - compare_var_to_value VAR_0x8000, 5 - goto_if 1, EventScript_1620F7 - compare_var_to_value VAR_0x8000, 6 - goto_if 1, EventScript_1620CF - compare_var_to_value VAR_0x8000, 7 - goto_if 1, EventScript_1620A7 - compare_var_to_value VAR_0x8000, 8 - goto_if 1, EventScript_16207F - compare_var_to_value VAR_0x8000, 9 - goto_if 1, EventScript_162057 - compare_var_to_value VAR_0x8000, 10 - goto_if 1, EventScript_16202F - compare_var_to_value VAR_0x8000, 11 - goto_if 1, EventScript_1621E7 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_1621E7 + switch VAR_RESULT + case 0, EventScript_1621BF + case 1, EventScript_162197 + case 2, EventScript_16216F + case 3, EventScript_162147 + case 4, EventScript_16211F + case 5, EventScript_1620F7 + case 6, EventScript_1620CF + case 7, EventScript_1620A7 + case 8, EventScript_16207F + case 9, EventScript_162057 + case 10, EventScript_16202F + case 11, EventScript_1621E7 + case 127, EventScript_1621E7 end EventScript_16202F:: @ 816202F setvar VAR_0x8006, 4 setdynamicwarp MAP_SILPH_CO_1F, 255, 22, 3 compare_var_to_value VAR_0x403A, 4 - goto_if 1, EventScript_1621E7 + goto_if_eq EventScript_1621E7 call EventScript_1621EC setvar VAR_0x403A, 4 goto EventScript_1621E7 @@ -59,7 +46,7 @@ EventScript_162057:: @ 8162057 setvar VAR_0x8006, 5 setdynamicwarp MAP_SILPH_CO_2F, 255, 22, 3 compare_var_to_value VAR_0x403A, 5 - goto_if 1, EventScript_1621E7 + goto_if_eq EventScript_1621E7 call EventScript_1621EC setvar VAR_0x403A, 5 goto EventScript_1621E7 @@ -71,7 +58,7 @@ EventScript_16207F:: @ 816207F setvar VAR_0x8006, 6 setdynamicwarp MAP_SILPH_CO_3F, 255, 22, 3 compare_var_to_value VAR_0x403A, 6 - goto_if 1, EventScript_1621E7 + goto_if_eq EventScript_1621E7 call EventScript_1621EC setvar VAR_0x403A, 6 goto EventScript_1621E7 @@ -83,7 +70,7 @@ EventScript_1620A7:: @ 81620A7 setvar VAR_0x8006, 7 setdynamicwarp MAP_SILPH_CO_4F, 255, 22, 3 compare_var_to_value VAR_0x403A, 7 - goto_if 1, EventScript_1621E7 + goto_if_eq EventScript_1621E7 call EventScript_1621EC setvar VAR_0x403A, 7 goto EventScript_1621E7 @@ -95,7 +82,7 @@ EventScript_1620CF:: @ 81620CF setvar VAR_0x8006, 8 setdynamicwarp MAP_SILPH_CO_5F, 255, 22, 3 compare_var_to_value VAR_0x403A, 8 - goto_if 1, EventScript_1621E7 + goto_if_eq EventScript_1621E7 call EventScript_1621EC setvar VAR_0x403A, 8 goto EventScript_1621E7 @@ -107,7 +94,7 @@ EventScript_1620F7:: @ 81620F7 setvar VAR_0x8006, 9 setdynamicwarp MAP_SILPH_CO_6F, 255, 20, 3 compare_var_to_value VAR_0x403A, 9 - goto_if 1, EventScript_1621E7 + goto_if_eq EventScript_1621E7 call EventScript_1621EC setvar VAR_0x403A, 9 goto EventScript_1621E7 @@ -119,7 +106,7 @@ EventScript_16211F:: @ 816211F setvar VAR_0x8006, 10 setdynamicwarp MAP_SILPH_CO_7F, 255, 23, 3 compare_var_to_value VAR_0x403A, 10 - goto_if 1, EventScript_1621E7 + goto_if_eq EventScript_1621E7 call EventScript_1621EC setvar VAR_0x403A, 10 goto EventScript_1621E7 @@ -131,7 +118,7 @@ EventScript_162147:: @ 8162147 setvar VAR_0x8006, 11 setdynamicwarp MAP_SILPH_CO_8F, 255, 22, 3 compare_var_to_value VAR_0x403A, 11 - goto_if 1, EventScript_1621E7 + goto_if_eq EventScript_1621E7 call EventScript_1621EC setvar VAR_0x403A, 11 goto EventScript_1621E7 @@ -143,7 +130,7 @@ EventScript_16216F:: @ 816216F setvar VAR_0x8006, 12 setdynamicwarp MAP_SILPH_CO_9F, 255, 24, 3 compare_var_to_value VAR_0x403A, 12 - goto_if 1, EventScript_1621E7 + goto_if_eq EventScript_1621E7 call EventScript_1621EC setvar VAR_0x403A, 12 goto EventScript_1621E7 @@ -155,7 +142,7 @@ EventScript_162197:: @ 8162197 setvar VAR_0x8006, 13 setdynamicwarp MAP_SILPH_CO_10F, 255, 13, 3 compare_var_to_value VAR_0x403A, 13 - goto_if 1, EventScript_1621E7 + goto_if_eq EventScript_1621E7 call EventScript_1621EC setvar VAR_0x403A, 13 goto EventScript_1621E7 @@ -167,7 +154,7 @@ EventScript_1621BF:: @ 81621BF setvar VAR_0x8006, 14 setdynamicwarp MAP_SILPH_CO_11F, 255, 13, 3 compare_var_to_value VAR_0x403A, 14 - goto_if 1, EventScript_1621E7 + goto_if_eq EventScript_1621E7 call EventScript_1621EC setvar VAR_0x403A, 14 goto EventScript_1621E7 diff --git a/data/maps/SixIsland_Mart/scripts.inc b/data/maps/SixIsland_Mart/scripts.inc index 711dfc9ef..495a0a991 100644 --- a/data/maps/SixIsland_Mart/scripts.inc +++ b/data/maps/SixIsland_Mart/scripts.inc @@ -4,7 +4,7 @@ SixIsland_Mart_MapScripts:: @ 8171E65 SixIsland_Mart_EventScript_171E66:: @ 8171E66 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lock faceplayer message Text_1A6211 diff --git a/data/maps/SixIsland_RuinValley/scripts.inc b/data/maps/SixIsland_RuinValley/scripts.inc index 54e79c2b3..11c1b730f 100644 --- a/data/maps/SixIsland_RuinValley/scripts.inc +++ b/data/maps/SixIsland_RuinValley/scripts.inc @@ -25,10 +25,10 @@ SixIsland_RuinValley_EventScript_168B6D:: @ 8168B6D SixIsland_RuinValley_EventScript_168B94:: @ 8168B94 lockall checkflag FLAG_0x2E3 - goto_if 1, EventScript_168BC1 + goto_if_eq EventScript_168BC1 msgbox gUnknown_818BDC0, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_168BCB + goto_if_eq EventScript_168BCB msgbox gUnknown_818BE11 braillemessage gUnknown_81A929B waitbuttonpress diff --git a/data/maps/SixIsland_WaterPath_House1/scripts.inc b/data/maps/SixIsland_WaterPath_House1/scripts.inc index 190cbd4ce..f9df42396 100644 --- a/data/maps/SixIsland_WaterPath_House1/scripts.inc +++ b/data/maps/SixIsland_WaterPath_House1/scripts.inc @@ -6,12 +6,12 @@ SixIsland_WaterPath_House1_EventScript_17206D:: @ 817206D faceplayer special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 setvar VAR_0x8004, SPECIES_HERACROSS specialvar VAR_RESULT, sub_80CC48C compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1720E5 + goto_if_eq EventScript_1720E5 special sub_80A0918 msgbox gUnknown_81A4A3F special sub_80BF8FC @@ -21,13 +21,13 @@ SixIsland_WaterPath_House1_EventScript_17206D:: @ 817206D goto_if 4, EventScript_1720EF special sub_80A0930 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1720F1 + goto_if_eq EventScript_1720F1 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1720FB + goto_if_eq EventScript_1720FB compare_var_to_value VAR_RESULT, 3 - goto_if 1, EventScript_172121 + goto_if_eq EventScript_172121 compare_var_to_value VAR_RESULT, 4 - goto_if 1, EventScript_17210E + goto_if_eq EventScript_17210E release end @@ -64,7 +64,7 @@ EventScript_172121:: @ 8172121 msgbox gUnknown_81A4A88 giveitem ITEM_NEST_BALL compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_17214D + goto_if_eq EventScript_17214D msgbox gUnknown_81A4AD9 release end @@ -77,7 +77,7 @@ EventScript_17214D:: @ 817214D SixIsland_WaterPath_House1_EventScript_172157:: @ 8172157 lockall checkflag FLAG_0x2D9 - goto_if 1, EventScript_17216B + goto_if_eq EventScript_17216B msgbox gUnknown_81A4CB9 releaseall end diff --git a/data/maps/ThreeIsland/scripts.inc b/data/maps/ThreeIsland/scripts.inc index 2761c612f..4d6773491 100644 --- a/data/maps/ThreeIsland/scripts.inc +++ b/data/maps/ThreeIsland/scripts.inc @@ -29,9 +29,9 @@ ThreeIsland_EventScript_1677D8:: @ 81677D8 ThreeIsland_EventScript_1677E5:: @ 81677E5 lock checkflag FLAG_0x2FC - goto_if 1, EventScript_167806 + goto_if_eq EventScript_167806 compare_var_to_value VAR_0x407B, 4 - goto_if 1, EventScript_16781A + goto_if_eq EventScript_16781A setvar VAR_0x4001, 0 call EventScript_16786F release @@ -50,7 +50,7 @@ EventScript_16781A:: @ 816781A msgbox gUnknown_818275A checkitemspace ITEM_FULL_RESTORE, 1 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_167865 + goto_if_eq EventScript_167865 giveitemfanfaremsg gUnknown_81827BE, ITEM_FULL_RESTORE additem ITEM_FULL_RESTORE, 1 setflag FLAG_0x2FC @@ -137,7 +137,7 @@ EventScript_167973:: @ 8167973 ThreeIsland_EventScript_167989:: @ 8167989 lock compare_var_to_value VAR_0x407B, 4 - goto_if 1, EventScript_1679A1 + goto_if_eq EventScript_1679A1 setvar VAR_0x4001, 1 call EventScript_16786F release @@ -224,7 +224,7 @@ EventScript_167A59:: @ 8167A59 playbgm BGM_FRLG_BOY_EYE, 0 msgbox gUnknown_81823ED, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_167C35 + goto_if_eq EventScript_167C35 msgbox gUnknown_818247D setvar VAR_LAST_TALKED, 5 trainerbattle 3, 527, 0, Text_1824B7 diff --git a/data/maps/ThreeIsland_BerryForest/scripts.inc b/data/maps/ThreeIsland_BerryForest/scripts.inc index dfaa7a9b9..ec85582ef 100644 --- a/data/maps/ThreeIsland_BerryForest/scripts.inc +++ b/data/maps/ThreeIsland_BerryForest/scripts.inc @@ -19,7 +19,7 @@ ThreeIsland_BerryForest_EventScript_163C83:: @ 8163C83 msgbox gUnknown_817AE8E special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 waitse playmoncry SPECIES_HYPNO, 2 waitmoncry diff --git a/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc b/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc index 9885f9059..9fc141070 100644 --- a/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc +++ b/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc @@ -25,10 +25,10 @@ ThreeIsland_DunsparceTunnel_EventScript_164D60:: @ 8164D60 lock faceplayer checkflag FLAG_0x2E2 - goto_if 1, EventScript_164DC2 + goto_if_eq EventScript_164DC2 specialvar VAR_RESULT, sub_806E25C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_164D90 + goto_if_eq EventScript_164D90 msgbox gUnknown_817D13B closemessage applymovement 1, Movement_1A75E5 @@ -40,7 +40,7 @@ EventScript_164D90:: @ 8164D90 msgbox gUnknown_817D1C9 giveitem ITEM_NUGGET compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_164DB8 + goto_if_eq EventScript_164DB8 setflag FLAG_0x2E2 goto EventScript_164DC2 end diff --git a/data/maps/ThreeIsland_House5/scripts.inc b/data/maps/ThreeIsland_House5/scripts.inc index 962869abd..d93696c0a 100644 --- a/data/maps/ThreeIsland_House5/scripts.inc +++ b/data/maps/ThreeIsland_House5/scripts.inc @@ -5,7 +5,7 @@ ThreeIsland_House5_EventScript_171920:: @ 8171920 lock faceplayer checkflag FLAG_0x2A3 - goto_if 1, EventScript_171935 + goto_if_eq EventScript_171935 msgbox gUnknown_81A3469 release end diff --git a/data/maps/ThreeIsland_Mart/scripts.inc b/data/maps/ThreeIsland_Mart/scripts.inc index 70ecca8ef..6986607e3 100644 --- a/data/maps/ThreeIsland_Mart/scripts.inc +++ b/data/maps/ThreeIsland_Mart/scripts.inc @@ -4,7 +4,7 @@ ThreeIsland_Mart_MapScripts:: @ 817188C ThreeIsland_Mart_EventScript_17188D:: @ 817188D special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lock faceplayer message Text_1A6211 diff --git a/data/maps/TwoIsland/scripts.inc b/data/maps/TwoIsland/scripts.inc index 39df8625b..a9a42eda5 100644 --- a/data/maps/TwoIsland/scripts.inc +++ b/data/maps/TwoIsland/scripts.inc @@ -10,11 +10,11 @@ TwoIsland_MapScript1_16756A:: @ 816756A EventScript_167576:: @ 8167576 checkflag FLAG_0x844 - goto_if 1, EventScript_167597 + goto_if_eq EventScript_167597 checkflag FLAG_0x82C - goto_if 1, EventScript_1675B8 + goto_if_eq EventScript_1675B8 checkflag FLAG_0x2A3 - goto_if 1, EventScript_1675D9 + goto_if_eq EventScript_1675D9 goto EventScript_1675E8 end @@ -70,21 +70,21 @@ EventScript_167606:: @ 8167606 TwoIsland_EventScript_16760F:: @ 816760F special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lock faceplayer compare_var_to_value VAR_0x4078, 4 - goto_if 1, EventScript_167646 + goto_if_eq EventScript_167646 compare_var_to_value VAR_0x4078, 3 - goto_if 1, EventScript_16765E + goto_if_eq EventScript_16765E compare_var_to_value VAR_0x4078, 2 - goto_if 1, EventScript_167676 + goto_if_eq EventScript_167676 goto EventScript_16768E end EventScript_167646:: @ 8167646 checkflag FLAG_0x2A0 - goto_if 1, EventScript_1676A6 + goto_if_eq EventScript_1676A6 setflag FLAG_0x2A0 message Text_181CAE waitmessage @@ -93,7 +93,7 @@ EventScript_167646:: @ 8167646 EventScript_16765E:: @ 816765E checkflag FLAG_0x29F - goto_if 1, EventScript_1676A6 + goto_if_eq EventScript_1676A6 setflag FLAG_0x29F message Text_181C77 waitmessage @@ -102,7 +102,7 @@ EventScript_16765E:: @ 816765E EventScript_167676:: @ 8167676 checkflag FLAG_0x29E - goto_if 1, EventScript_1676A6 + goto_if_eq EventScript_1676A6 setflag FLAG_0x29E message Text_181B7C waitmessage @@ -111,7 +111,7 @@ EventScript_167676:: @ 8167676 EventScript_16768E:: @ 816768E checkflag FLAG_0x29D - goto_if 1, EventScript_1676A6 + goto_if_eq EventScript_1676A6 setflag FLAG_0x29D message Text_181AFE waitmessage @@ -122,11 +122,11 @@ EventScript_1676A6:: @ 81676A6 message Text_1A6211 waitmessage compare_var_to_value VAR_0x4078, 4 - goto_if 1, EventScript_167728 + goto_if_eq EventScript_167728 compare_var_to_value VAR_0x4078, 3 - goto_if 1, EventScript_167708 + goto_if_eq EventScript_167708 compare_var_to_value VAR_0x4078, 2 - goto_if 1, EventScript_1676EC + goto_if_eq EventScript_1676EC goto EventScript_1676D3 end diff --git a/data/maps/TwoIsland_House/scripts.inc b/data/maps/TwoIsland_House/scripts.inc index 8829fc845..0f940dd39 100644 --- a/data/maps/TwoIsland_House/scripts.inc +++ b/data/maps/TwoIsland_House/scripts.inc @@ -4,7 +4,7 @@ TwoIsland_House_MapScripts:: @ 8171618 TwoIsland_House_EventScript_171619:: @ 8171619 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 lock faceplayer @@ -12,7 +12,7 @@ TwoIsland_House_EventScript_171619:: @ 8171619 clearflag FLAG_0x003 clearflag FLAG_0x004 checkflag FLAG_0x001 - goto_if 1, EventScript_17164F + goto_if_eq EventScript_17164F msgbox gUnknown_81A2B88 setflag FLAG_0x001 goto EventScript_17164F @@ -26,9 +26,9 @@ EventScript_17164F:: @ 817164F compare_var_to_value VAR_RESULT, 1 call_if 1, EventScript_1717AC checkflag FLAG_0x002 - goto_if 1, EventScript_171687 + goto_if_eq EventScript_171687 checkflag FLAG_0x003 - goto_if 1, EventScript_171696 + goto_if_eq EventScript_171696 goto EventScript_17179E end @@ -47,7 +47,7 @@ EventScript_171696:: @ 8171696 EventScript_1716A5:: @ 81716A5 msgbox gUnknown_81A2C63, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_17179E + goto_if_eq EventScript_17179E goto EventScript_1716BE end @@ -59,9 +59,9 @@ EventScript_1716BE:: @ 81716BE goto_if 4, EventScript_17179E special sub_80BFC14 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_171790 + goto_if_eq EventScript_171790 compare_var_to_value VAR_0x8005, 0 - goto_if 1, EventScript_171782 + goto_if_eq EventScript_171782 goto EventScript_1716F4 end @@ -70,13 +70,13 @@ EventScript_1716F4:: @ 81716F4 special sub_80E4634 waitstate compare_var_to_value VAR_0x8004, 0 - goto_if 1, EventScript_1716BE + goto_if_eq EventScript_1716BE checkflag FLAG_0x004 - goto_if 1, EventScript_17175B + goto_if_eq EventScript_17175B checkflag FLAG_0x002 - goto_if 1, EventScript_171727 + goto_if_eq EventScript_171727 checkflag FLAG_0x003 - goto_if 1, EventScript_171741 + goto_if_eq EventScript_171741 end EventScript_171727:: @ 8171727 @@ -99,11 +99,9 @@ EventScript_17175B:: @ 817175B message Text_1A2D43 waitmessage multichoice 0, 0, 51, 1 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_171741 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_171727 + switch VAR_RESULT + case 0, EventScript_171741 + case 1, EventScript_171727 end EventScript_171782:: @ 8171782 diff --git a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc index 9bde64331..f478de107 100644 --- a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc +++ b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc @@ -126,9 +126,9 @@ TwoIsland_JoyfulGameCorner_EventScript_171535:: @ 8171535 lock faceplayer compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 4 - goto_if 1, EventScript_1BC060 + goto_if_eq EventScript_1BC060 checkflag FLAG_0x2A3 - goto_if 1, EventScript_171555 + goto_if_eq EventScript_171555 msgbox gUnknown_81A285C release end @@ -142,18 +142,18 @@ TwoIsland_JoyfulGameCorner_EventScript_17155F:: @ 817155F lock faceplayer compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 4 - goto_if 1, EventScript_1BC0CE + goto_if_eq EventScript_1BC0CE checkflag FLAG_0x2FB - goto_if 1, EventScript_1715F5 + goto_if_eq EventScript_1715F5 compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 3 - goto_if 1, EventScript_17158A + goto_if_eq EventScript_17158A msgbox gUnknown_81A2743 release end EventScript_17158A:: @ 817158A checkflag FLAG_0x2FE - goto_if 1, EventScript_1715C4 + goto_if_eq EventScript_1715C4 msgbox gUnknown_81A296A setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 2 textcolor 3 @@ -170,7 +170,7 @@ EventScript_17158A:: @ 817158A EventScript_1715C4:: @ 81715C4 checkitemspace ITEM_MOON_STONE, 1 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1715FF + goto_if_eq EventScript_1715FF additem ITEM_MOON_STONE, 1 setflag FLAG_0x2FB giveitemfanfaremsg gUnknown_81A2A9A, ITEM_MOON_STONE diff --git a/data/maps/UndergroundPath_NorthEntrance/scripts.inc b/data/maps/UndergroundPath_NorthEntrance/scripts.inc index 93fedc7a8..a88b1a55c 100644 --- a/data/maps/UndergroundPath_NorthEntrance/scripts.inc +++ b/data/maps/UndergroundPath_NorthEntrance/scripts.inc @@ -7,10 +7,10 @@ UndergroundPath_NorthEntrance_EventScript_160E39:: @ 8160E39 setvar VAR_0x8008, 2 call EventScript_1A8CAD checkflag FLAG_0x24B - goto_if 1, EventScript_160EAB + goto_if_eq EventScript_160EAB msgbox gUnknown_81A5AD6, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_160E93 + goto_if_eq EventScript_160E93 call EventScript_1A8CBD compare_var_to_value VAR_0x8004, 6 goto_if 4, EventScript_160E93 diff --git a/data/maps/VermilionCity/scripts.inc b/data/maps/VermilionCity/scripts.inc index f9c2b2f21..1f476abf3 100644 --- a/data/maps/VermilionCity/scripts.inc +++ b/data/maps/VermilionCity/scripts.inc @@ -38,7 +38,7 @@ VermilionCity_EventScript_166920:: @ 8166920 lock faceplayer compare_var_to_value VAR_MAP_SCENE_VERMILION_CITY, 3 - goto_if 1, EventScript_166937 + goto_if_eq EventScript_166937 msgbox gUnknown_817F776 release end @@ -52,7 +52,7 @@ VermilionCity_EventScript_166941:: @ 8166941 lock faceplayer compare_var_to_value VAR_MAP_SCENE_VERMILION_CITY, 3 - goto_if 1, EventScript_166996 + goto_if_eq EventScript_166996 msgbox gUnknown_817FA22 release end @@ -62,7 +62,7 @@ EventScript_166958:: @ 8166958 goto_if 0, EventScript_1A77B0 checkitem ITEM_MYSTIC_TICKET, 1 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1A77B0 + goto_if_eq EventScript_1A77B0 goto EventScript_1A77AA end @@ -71,7 +71,7 @@ EventScript_166977:: @ 8166977 goto_if 0, EventScript_1A77B0 checkitem ITEM_AURORA_TICKET, 1 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1A77B0 + goto_if_eq EventScript_1A77B0 goto EventScript_1A77AA end @@ -88,14 +88,14 @@ EventScript_166996:: @ 8166996 EventScript_1669BB:: @ 81669BB special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 call EventScript_166958 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1669FD + goto_if_eq EventScript_1669FD call EventScript_166977 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_166A5F + goto_if_eq EventScript_166A5F setvar VAR_0x8004, 0 message Text_17FBB8 waitmessage @@ -105,21 +105,17 @@ EventScript_1669BB:: @ 81669BB EventScript_1669FD:: @ 81669FD call EventScript_166977 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_166AB1 + goto_if_eq EventScript_166AB1 checkflag FLAG_0x2F0 call_if 0, EventScript_166A53 message Text_17FCC1 waitmessage multichoice 17, 6, 54, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1A911E - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_166B0B - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1A90F6 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_1A90F6 + switch VAR_RESULT + case 0, EventScript_1A911E + case 1, EventScript_166B0B + case 2, EventScript_1A90F6 + case 127, EventScript_1A90F6 end EventScript_166A53:: @ 8166A53 @@ -133,15 +129,11 @@ EventScript_166A5F:: @ 8166A5F message Text_17FCC1 waitmessage multichoice 13, 6, 55, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1A911E - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_166B23 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1A90F6 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_1A90F6 + switch VAR_RESULT + case 0, EventScript_1A911E + case 1, EventScript_166B23 + case 2, EventScript_1A90F6 + case 127, EventScript_1A90F6 end EventScript_166AA5:: @ 8166AA5 @@ -157,17 +149,12 @@ EventScript_166AB1:: @ 8166AB1 message Text_17FCC1 waitmessage multichoice 13, 5, 56, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1A911E - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_166B0B - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_166B23 - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_1A90F6 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_1A90F6 + switch VAR_RESULT + case 0, EventScript_1A911E + case 1, EventScript_166B0B + case 2, EventScript_166B23 + case 3, EventScript_1A90F6 + case 127, EventScript_1A90F6 end EventScript_166B0B:: @ 8166B0B @@ -189,17 +176,12 @@ EventScript_166B3B:: @ 8166B3B waitmessage setvar VAR_0x8004, 0 multichoice 19, 5, 57, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1A8FEE - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1A8FF9 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1A9004 - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_1A90F6 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_1A90F6 + switch VAR_RESULT + case 0, EventScript_1A8FEE + case 1, EventScript_1A8FF9 + case 2, EventScript_1A9004 + case 3, EventScript_1A90F6 + case 127, EventScript_1A90F6 end EventScript_166B88:: @ 8166B88 @@ -228,7 +210,7 @@ EventScript_166BA0:: @ 8166BA0 applymovement 255, Movement_1A75EB waitmovement 0 compare_var_to_value VAR_MAP_SCENE_VERMILION_CITY, 3 - goto_if 1, EventScript_166BED + goto_if_eq EventScript_166BED msgbox gUnknown_817FA3C checkflag FLAG_0x234 goto_if 0, EventScript_166BDE diff --git a/data/maps/VermilionCity_Gym/scripts.inc b/data/maps/VermilionCity_Gym/scripts.inc index d19b973f9..bd49a6955 100644 --- a/data/maps/VermilionCity_Gym/scripts.inc +++ b/data/maps/VermilionCity_Gym/scripts.inc @@ -42,7 +42,7 @@ VermilionCity_Gym_MapScript2_16B772:: @ 816B772 EventScript_16B778:: @ 816B778 checkflag FLAG_0x264 - goto_if 1, EventScript_1A77A9 + goto_if_eq EventScript_1A77A9 special sub_80CADEC copyvar VAR_0x4000, VAR_0x8004 copyvar VAR_0x4001, VAR_0x8005 @@ -141,16 +141,16 @@ VermilionCity_Gym_EventScript_16B837:: @ 816B837 EventScript_16B843:: @ 816B843 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 copyvar VAR_0x8004, VAR_0x4000 copyvar VAR_0x8005, VAR_0x4001 checkflag FLAG_0x264 - goto_if 1, EventScript_16B8E5 + goto_if_eq EventScript_16B8E5 checkflag FLAG_0x001 - goto_if 1, EventScript_16B89E + goto_if_eq EventScript_16B89E compare_var_to_var VAR_0x8004, VAR_0x8008 - goto_if 1, EventScript_16B885 + goto_if_eq EventScript_16B885 msgbox gUnknown_8195289 releaseall end @@ -167,7 +167,7 @@ EventScript_16B885:: @ 816B885 EventScript_16B89E:: @ 816B89E compare_var_to_var VAR_0x8005, VAR_0x8008 - goto_if 1, EventScript_16B8CB + goto_if_eq EventScript_16B8CB msgbox gUnknown_819536C clearflag FLAG_0x001 special sub_80CADEC @@ -240,7 +240,7 @@ EventScript_16B9AF:: @ 816B9AF msgbox gUnknown_8194CFA checkitemspace ITEM_TM34, 1 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16B9F0 + goto_if_eq EventScript_16B9F0 additem ITEM_TM34, 1 giveitemfanfaremsg gUnknown_8194D87, ITEM_TM34 setflag FLAG_0x231 @@ -285,7 +285,7 @@ VermilionCity_Gym_EventScript_16BA6C:: @ 816BA6C lock faceplayer checkflag FLAG_0x4B2 - goto_if 1, EventScript_16BA81 + goto_if_eq EventScript_16BA81 msgbox gUnknown_81950B4 release end @@ -298,7 +298,7 @@ EventScript_16BA81:: @ 816BA81 VermilionCity_Gym_EventScript_16BA8B:: @ 816BA8B lockall checkflag FLAG_0x822 - goto_if 1, EventScript_16BA9F + goto_if_eq EventScript_16BA9F msgbox gUnknown_819520B releaseall end diff --git a/data/maps/VermilionCity_House1/scripts.inc b/data/maps/VermilionCity_House1/scripts.inc index 4c595b48c..a7de85e8f 100644 --- a/data/maps/VermilionCity_House1/scripts.inc +++ b/data/maps/VermilionCity_House1/scripts.inc @@ -5,10 +5,10 @@ VermilionCity_House1_EventScript_16B3A7:: @ 816B3A7 lock faceplayer checkflag FLAG_0x240 - goto_if 1, EventScript_16B3CF + goto_if_eq EventScript_16B3CF msgbox gUnknown_8193EC1, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16B3D9 + goto_if_eq EventScript_16B3D9 msgbox gUnknown_8194028 release end @@ -21,7 +21,7 @@ EventScript_16B3CF:: @ 816B3CF EventScript_16B3D9:: @ 816B3D9 checkitemspace ITEM_OLD_ROD, 1 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16B41A + goto_if_eq EventScript_16B41A additem ITEM_OLD_ROD, 1 msgbox gUnknown_8193F2A giveitemfanfaremsg gUnknown_8193F81, ITEM_OLD_ROD diff --git a/data/maps/VermilionCity_Mart/scripts.inc b/data/maps/VermilionCity_Mart/scripts.inc index c4aa0d666..c83e239d9 100644 --- a/data/maps/VermilionCity_Mart/scripts.inc +++ b/data/maps/VermilionCity_Mart/scripts.inc @@ -12,7 +12,7 @@ VermilionCity_Mart_EventScript_16B65D:: @ 816B65D VermilionCity_Mart_EventScript_16B666:: @ 816B666 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lock faceplayer message Text_1A6211 diff --git a/data/maps/VermilionCity_PokemonFanClub/scripts.inc b/data/maps/VermilionCity_PokemonFanClub/scripts.inc index c5e46b07a..60d983af0 100644 --- a/data/maps/VermilionCity_PokemonFanClub/scripts.inc +++ b/data/maps/VermilionCity_PokemonFanClub/scripts.inc @@ -5,10 +5,10 @@ VermilionCity_PokemonFanClub_EventScript_16B47F:: @ 816B47F lock faceplayer checkflag FLAG_0x241 - goto_if 1, EventScript_16B4A7 + goto_if_eq EventScript_16B4A7 msgbox gUnknown_819457E, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16B4B1 + goto_if_eq EventScript_16B4B1 msgbox gUnknown_8194860 release end @@ -22,7 +22,7 @@ EventScript_16B4B1:: @ 816B4B1 msgbox gUnknown_8194628 checkitemspace ITEM_BIKE_VOUCHER, 1 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16B4F2 + goto_if_eq EventScript_16B4F2 setflag FLAG_0x241 additem ITEM_BIKE_VOUCHER, 1 giveitemfanfaremsg gUnknown_819474E, ITEM_BIKE_VOUCHER, 1, BGM_FRLG_ME_KEYITEM @@ -39,7 +39,7 @@ VermilionCity_PokemonFanClub_EventScript_16B4FC:: @ 816B4FC lock faceplayer checkflag FLAG_0x82C - goto_if 1, EventScript_16B511 + goto_if_eq EventScript_16B511 msgbox gUnknown_81948E6 release end @@ -56,7 +56,7 @@ VermilionCity_PokemonFanClub_EventScript_16B528:: @ 816B528 lock faceplayer checkflag FLAG_0x003 - goto_if 1, EventScript_16B54B + goto_if_eq EventScript_16B54B msgbox gUnknown_81944CC closemessage applymovement 5, Movement_1A75E5 @@ -78,7 +78,7 @@ VermilionCity_PokemonFanClub_EventScript_16B563:: @ 816B563 lock faceplayer checkflag FLAG_0x002 - goto_if 1, EventScript_16B586 + goto_if_eq EventScript_16B586 msgbox gUnknown_819446F closemessage applymovement 6, Movement_1A75E5 @@ -133,10 +133,10 @@ VermilionCity_House2_EventScript_16B5D7:: @ 816B5D7 setvar VAR_0x8008, 3 call EventScript_1A8CAD checkflag FLAG_0x24D - goto_if 1, EventScript_16B649 + goto_if_eq EventScript_16B649 msgbox gUnknown_81949CB, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16B631 + goto_if_eq EventScript_16B631 call EventScript_1A8CBD compare_var_to_value VAR_0x8004, 6 goto_if 4, EventScript_16B631 diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc index 056e3835a..656bd8e6c 100644 --- a/data/maps/VictoryRoad_1F/scripts.inc +++ b/data/maps/VictoryRoad_1F/scripts.inc @@ -20,7 +20,7 @@ VictoryRoad_1F_MapScript2_160F2F:: @ 8160F2F VictoryRoad_1F_EventScript_160F33:: @ 8160F33 lockall compare_var_to_value VAR_0x4064, 100 - goto_if 1, EventScript_160F62 + goto_if_eq EventScript_160F62 setmetatile 12, 14, 721, 0 setmetatile 12, 15, 737, 0 playse SE_MU_PACHI diff --git a/data/maps/VictoryRoad_2F/scripts.inc b/data/maps/VictoryRoad_2F/scripts.inc index ae085dc1f..b35ee7821 100644 --- a/data/maps/VictoryRoad_2F/scripts.inc +++ b/data/maps/VictoryRoad_2F/scripts.inc @@ -22,7 +22,7 @@ EventScript_160FC2:: @ 8160FC2 VictoryRoad_2F_EventScript_160FD5:: @ 8160FD5 lockall compare_var_to_value VAR_0x4065, 100 - goto_if 1, EventScript_161004 + goto_if_eq EventScript_161004 setmetatile 13, 10, 721, 0 setmetatile 13, 11, 737, 0 playse SE_MU_PACHI @@ -40,7 +40,7 @@ EventScript_161004:: @ 8161004 VictoryRoad_2F_EventScript_161006:: @ 8161006 lockall compare_var_to_value VAR_0x4066, 100 - goto_if 1, EventScript_161035 + goto_if_eq EventScript_161035 setmetatile 33, 16, 721, 0 setmetatile 33, 17, 737, 0 playse SE_MU_PACHI diff --git a/data/maps/VictoryRoad_3F/scripts.inc b/data/maps/VictoryRoad_3F/scripts.inc index 7aafcb1b4..17331cee4 100644 --- a/data/maps/VictoryRoad_3F/scripts.inc +++ b/data/maps/VictoryRoad_3F/scripts.inc @@ -15,7 +15,7 @@ EventScript_1610BC:: @ 81610BC VictoryRoad_3F_EventScript_1610CF:: @ 81610CF lockall compare_var_to_value VAR_0x4067, 100 - goto_if 1, EventScript_161101 + goto_if_eq EventScript_161101 setmetatile 12, 12, 721, 0 setmetatile 12, 13, 737, 0 playse SE_MU_PACHI diff --git a/data/maps/ViridianCity/scripts.inc b/data/maps/ViridianCity/scripts.inc index b41c6b929..5434fa1fa 100644 --- a/data/maps/ViridianCity/scripts.inc +++ b/data/maps/ViridianCity/scripts.inc @@ -91,7 +91,7 @@ ViridianCity_EventScript_1659CA:: @ 81659CA lock faceplayer compare_var_to_value VAR_0x405A, 1 - goto_if 1, EventScript_1659EC + goto_if_eq EventScript_1659EC msgbox gUnknown_817DB39 closemessage applymovement 3, Movement_1A75E5 @@ -108,19 +108,19 @@ ViridianCity_EventScript_1659F6:: @ 81659F6 lock faceplayer checkflag FLAG_UNK820 - goto_if 1, EventScript_165A23 + goto_if_eq EventScript_165A23 compare_var_to_value VAR_0x4051, 2 goto_if 4, EventScript_165A4A compare_var_to_value VAR_0x4051, 1 - goto_if 1, EventScript_165A54 + goto_if_eq EventScript_165A54 compare_var_to_value VAR_0x4051, 0 - goto_if 1, EventScript_165A84 + goto_if_eq EventScript_165A84 end EventScript_165A23:: @ 8165A23 msgbox gUnknown_817E046, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_165A40 + goto_if_eq EventScript_165A40 msgbox gUnknown_817E0EA release end @@ -149,7 +149,7 @@ EventScript_165A65:: @ 8165A65 msgbox gUnknown_817DE9B special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 special sub_807F888 waitstate @@ -167,9 +167,9 @@ ViridianCity_EventScript_165A8F:: @ 8165A8F faceplayer msgbox gUnknown_817DB98, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_165AB0 + goto_if_eq EventScript_165AB0 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_165ABA + goto_if_eq EventScript_165ABA end EventScript_165AB0:: @ 8165AB0 @@ -186,7 +186,7 @@ ViridianCity_EventScript_165AC4:: @ 8165AC4 lock faceplayer compare_var_to_value VAR_0x4051, 0 - goto_if 1, EventScript_165ADB + goto_if_eq EventScript_165ADB msgbox gUnknown_817DC99 release end @@ -244,7 +244,7 @@ EventScript_165B4C:: @ 8165B4C closemessage special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 special sub_807F888 waitstate diff --git a/data/maps/ViridianCity_Gym/scripts.inc b/data/maps/ViridianCity_Gym/scripts.inc index a5dfb05fe..b03bc5d93 100644 --- a/data/maps/ViridianCity_Gym/scripts.inc +++ b/data/maps/ViridianCity_Gym/scripts.inc @@ -33,7 +33,7 @@ EventScript_169F2F:: @ 8169F2F msgbox gUnknown_818F586 checkitemspace ITEM_TM26, 1 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_169F70 + goto_if_eq EventScript_169F70 additem ITEM_TM26, 1 giveitemfanfaremsg gUnknown_818F675, ITEM_TM26 setflag FLAG_0x298 @@ -90,7 +90,7 @@ ViridianCity_Gym_EventScript_16A032:: @ 816A032 lock faceplayer checkflag FLAG_0x4B7 - goto_if 1, EventScript_16A047 + goto_if_eq EventScript_16A047 msgbox gUnknown_818FA81 release end @@ -106,7 +106,7 @@ EventScript_16A047:: @ 816A047 ViridianCity_Gym_EventScript_16A05E:: @ 816A05E lockall checkflag FLAG_0x827 - goto_if 1, EventScript_16A072 + goto_if_eq EventScript_16A072 msgbox gUnknown_818FB8D releaseall end diff --git a/data/maps/ViridianCity_House2/scripts.inc b/data/maps/ViridianCity_House2/scripts.inc index 65ea77a5e..c8388e2f7 100644 --- a/data/maps/ViridianCity_House2/scripts.inc +++ b/data/maps/ViridianCity_House2/scripts.inc @@ -26,15 +26,15 @@ ViridianCity_House2_EventScript_16A0AB:: @ 816A0AB msgbox gUnknown_818FC65 msgbox gUnknown_818FF19, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16A11B + goto_if_eq EventScript_16A11B msgbox gUnknown_818FD23 msgbox gUnknown_818FF19, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16A11B + goto_if_eq EventScript_16A11B msgbox gUnknown_818FDA8 msgbox gUnknown_818FF19, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16A11B + goto_if_eq EventScript_16A11B msgbox gUnknown_818FE5C applymovement 2, Movement_1A75E9 waitmovement 0 @@ -57,21 +57,14 @@ EventScript_16A12C:: @ 816A12C message Text_18FF88 waitmessage multichoicegrid 7, 1, 15, 3, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_16A18B - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16A1A7 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_16A1C3 - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_16A199 - compare_var_to_value VAR_0x8000, 4 - goto_if 1, EventScript_16A1B5 - compare_var_to_value VAR_0x8000, 5 - goto_if 1, EventScript_16A1D1 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_16A1D1 + switch VAR_RESULT + case 0, EventScript_16A18B + case 1, EventScript_16A1A7 + case 2, EventScript_16A1C3 + case 3, EventScript_16A199 + case 4, EventScript_16A1B5 + case 5, EventScript_16A1D1 + case 127, EventScript_16A1D1 end EventScript_16A18B:: @ 816A18B diff --git a/data/maps/ViridianCity_Mart/scripts.inc b/data/maps/ViridianCity_Mart/scripts.inc index 630bb4122..44d9437ea 100644 --- a/data/maps/ViridianCity_Mart/scripts.inc +++ b/data/maps/ViridianCity_Mart/scripts.inc @@ -55,10 +55,10 @@ ViridianCity_Mart_EventScript_16A268:: @ 816A268 lock faceplayer compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 1 - goto_if 1, EventScript_16A2A4 + goto_if_eq EventScript_16A2A4 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 message Text_1A6211 waitmessage pokemart Items_16A298 -- cgit v1.2.3 From 4156dd6b5789e613e4c25ec2cfe9867ec491f85a Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 16 May 2019 13:57:21 -0400 Subject: setrespawn --- data/maps/CeladonCity_PokemonCenter_1F/scripts.inc | 2 +- data/maps/CeruleanCity_Gym/scripts.inc | 2 +- data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc | 2 +- data/maps/CinnabarIsland_Gym/scripts.inc | 2 +- data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc | 2 +- data/maps/FiveIsland_PokemonCenter_1F/scripts.inc | 2 +- data/maps/FourIsland_PokemonCenter_1F/scripts.inc | 2 +- data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc | 2 +- data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc | 2 +- data/maps/LavenderTown_PokemonCenter_1F/scripts.inc | 2 +- data/maps/OneIsland_PokemonCenter_1F/scripts.inc | 2 +- data/maps/PalletTown_PlayersHouse_2F/scripts.inc | 2 +- data/maps/PewterCity_PokemonCenter_1F/scripts.inc | 2 +- data/maps/PokemonLeague_HallOfFame/scripts.inc | 2 +- data/maps/Route10_PokemonCenter_1F/scripts.inc | 2 +- data/maps/Route4_PokemonCenter_1F/scripts.inc | 2 +- data/maps/SaffronCity_PokemonCenter_1F/scripts.inc | 2 +- data/maps/SevenIsland_PokemonCenter_1F/scripts.inc | 2 +- data/maps/SixIsland_PokemonCenter_1F/scripts.inc | 2 +- data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc | 2 +- data/maps/TwoIsland_PokemonCenter_1F/scripts.inc | 2 +- data/maps/VermilionCity_PokemonCenter_1F/scripts.inc | 2 +- data/maps/ViridianCity_PokemonCenter_1F/scripts.inc | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) (limited to 'data/maps') diff --git a/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc b/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc index 3810803bc..92bde48ad 100644 --- a/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc @@ -4,7 +4,7 @@ CeladonCity_PokemonCenter_1F_MapScripts:: @ 816C5EC .byte 0 CeladonCity_PokemonCenter_1F_MapScript1_16C5F7:: @ 816C5F7 - setrespawn 7 + setrespawn SPAWN_CELADON_CITY end CeladonCity_PokemonCenter_1F_EventScript_16C5FB:: @ 816C5FB diff --git a/data/maps/CeruleanCity_Gym/scripts.inc b/data/maps/CeruleanCity_Gym/scripts.inc index b21b6af7a..d8fe70407 100644 --- a/data/maps/CeruleanCity_Gym/scripts.inc +++ b/data/maps/CeruleanCity_Gym/scripts.inc @@ -18,7 +18,7 @@ EventScript_16AAD3:: @ 816AAD3 special SetFlavorTextFlagFromSpecialVars setflag FLAG_0x4B1 setflag FLAG_0x821 - setrespawn 4 + setrespawn SPAWN_CERULEAN_CITY setvar VAR_0x8008, 2 call EventScript_1A6B18 goto EventScript_16AAF9 diff --git a/data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc b/data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc index e5f26eb25..dcace7aee 100644 --- a/data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc @@ -4,7 +4,7 @@ CeruleanCity_PokemonCenter_1F_MapScripts:: @ 816AA2D .byte 0 CeruleanCity_PokemonCenter_1F_MapScript1_16AA38:: @ 816AA38 - setrespawn 4 + setrespawn SPAWN_CERULEAN_CITY end CeruleanCity_PokemonCenter_1F_EventScript_16AA3C:: @ 816AA3C diff --git a/data/maps/CinnabarIsland_Gym/scripts.inc b/data/maps/CinnabarIsland_Gym/scripts.inc index ab4967fe5..87461a536 100644 --- a/data/maps/CinnabarIsland_Gym/scripts.inc +++ b/data/maps/CinnabarIsland_Gym/scripts.inc @@ -69,7 +69,7 @@ EventScript_16DA06:: @ 816DA06 special SetFlavorTextFlagFromSpecialVars setflag FLAG_0x4B6 setflag FLAG_UNK826 - setrespawn 9 + setrespawn SPAWN_CINNABAR_ISLAND setvar VAR_0x4071, 1 clearflag FLAG_0x062 setvar VAR_0x8008, 7 diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc index f356f6106..53eb545d6 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc @@ -4,7 +4,7 @@ CinnabarIsland_PokemonCenter_1F_MapScripts:: @ 816E8D7 .byte 0 CinnabarIsland_PokemonCenter_1F_MapScript1_16E8E2:: @ 816E8E2 - setrespawn 9 + setrespawn SPAWN_CINNABAR_ISLAND end CinnabarIsland_PokemonCenter_1F_EventScript_16E8E6:: @ 816E8E6 diff --git a/data/maps/FiveIsland_PokemonCenter_1F/scripts.inc b/data/maps/FiveIsland_PokemonCenter_1F/scripts.inc index 831a9d326..a16cb37d1 100644 --- a/data/maps/FiveIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/FiveIsland_PokemonCenter_1F/scripts.inc @@ -4,7 +4,7 @@ FiveIsland_PokemonCenter_1F_MapScripts:: @ 8171CF1 .byte 0 FiveIsland_PokemonCenter_1F_MapScript1_171CFC:: @ 8171CFC - setrespawn 18 + setrespawn SPAWN_FIVE_ISLAND end FiveIsland_PokemonCenter_1F_EventScript_171D00:: @ 8171D00 diff --git a/data/maps/FourIsland_PokemonCenter_1F/scripts.inc b/data/maps/FourIsland_PokemonCenter_1F/scripts.inc index 9d085d183..cc4cb5ffa 100644 --- a/data/maps/FourIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/FourIsland_PokemonCenter_1F/scripts.inc @@ -4,7 +4,7 @@ FourIsland_PokemonCenter_1F_MapScripts:: @ 8171BEA .byte 0 FourIsland_PokemonCenter_1F_MapScript1_171BF5:: @ 8171BF5 - setrespawn 17 + setrespawn SPAWN_FOUR_ISLAND end FourIsland_PokemonCenter_1F_EventScript_171BF9:: @ 8171BF9 diff --git a/data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc b/data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc index 6c231ac16..062f93acc 100644 --- a/data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc @@ -4,7 +4,7 @@ FuchsiaCity_PokemonCenter_1F_MapScripts:: @ 816D6F1 .byte 0 FuchsiaCity_PokemonCenter_1F_MapScript1_16D6FC:: @ 816D6FC - setrespawn 8 + setrespawn SPAWN_FUCHSIA_CITY end FuchsiaCity_PokemonCenter_1F_EventScript_16D700:: @ 816D700 diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc index 56a3cdcb3..7dae5f353 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc +++ b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc @@ -4,7 +4,7 @@ IndigoPlateau_PokemonCenter_1F_MapScripts:: @ 816EA5A .byte 0 IndigoPlateau_PokemonCenter_1F_MapScript1_16EA65:: @ 816EA65 - setrespawn 10 + setrespawn SPAWN_INDIGO_PLATEAU specialvar VAR_RESULT, sub_806E25C compare_var_to_value VAR_RESULT, 1 call_if 1, EventScript_16EA79 diff --git a/data/maps/LavenderTown_PokemonCenter_1F/scripts.inc b/data/maps/LavenderTown_PokemonCenter_1F/scripts.inc index 55c186fdf..f7341b8f9 100644 --- a/data/maps/LavenderTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/LavenderTown_PokemonCenter_1F/scripts.inc @@ -4,7 +4,7 @@ LavenderTown_PokemonCenter_1F_MapScripts:: @ 816B0EF .byte 0 LavenderTown_PokemonCenter_1F_MapScript1_16B0FA:: @ 816B0FA - setrespawn 5 + setrespawn SPAWN_LAVENDER_TOWN end LavenderTown_PokemonCenter_1F_EventScript_16B0FE:: @ 816B0FE diff --git a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc index 61efea315..7a1941f72 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc @@ -27,7 +27,7 @@ EventScript_170C36:: @ 8170C36 return OneIsland_PokemonCenter_1F_MapScript1_170C4E:: @ 8170C4E - setrespawn 14 + setrespawn SPAWN_ONE_ISLAND compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 6 call_if 1, EventScript_170C73 compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 0 diff --git a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc index ec105ea63..3700d06be 100644 --- a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc +++ b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc @@ -9,7 +9,7 @@ PalletTown_PlayersHouse_2F_MapScript1_168CAE:: @ 8168CAE end EventScript_168CBA:: @ 8168CBA - setrespawn 1 + setrespawn SPAWN_PALLET_TOWN return PalletTown_PlayersHouse_2F_MapScript2_168CBE:: @ 8168CBE diff --git a/data/maps/PewterCity_PokemonCenter_1F/scripts.inc b/data/maps/PewterCity_PokemonCenter_1F/scripts.inc index 8e536e195..525eef027 100644 --- a/data/maps/PewterCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/PewterCity_PokemonCenter_1F/scripts.inc @@ -4,7 +4,7 @@ PewterCity_PokemonCenter_1F_MapScripts:: @ 816A760 .byte 0 PewterCity_PokemonCenter_1F_MapScript1_16A76B:: @ 816A76B - setrespawn 3 + setrespawn SPAWN_PEWTER_CITY end PewterCity_PokemonCenter_1F_EventScript_16A76F:: @ 816A76F diff --git a/data/maps/PokemonLeague_HallOfFame/scripts.inc b/data/maps/PokemonLeague_HallOfFame/scripts.inc index 30d239fd8..faadadcda 100644 --- a/data/maps/PokemonLeague_HallOfFame/scripts.inc +++ b/data/maps/PokemonLeague_HallOfFame/scripts.inc @@ -35,7 +35,7 @@ EventScript_162D70:: @ 8162D70 delay 40 setvar VAR_0x4001, 1 call EventScript_1A651A - setrespawn 1 + setrespawn SPAWN_PALLET_TOWN fadescreenspeed 1, 24 special sub_80CA2E4 waitstate diff --git a/data/maps/Route10_PokemonCenter_1F/scripts.inc b/data/maps/Route10_PokemonCenter_1F/scripts.inc index f9ec2bec4..15889ad8f 100644 --- a/data/maps/Route10_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route10_PokemonCenter_1F/scripts.inc @@ -5,7 +5,7 @@ Route10_PokemonCenter_1F_MapScripts:: @ 816FC2F Route10_PokemonCenter_1F_MapScript1_16FC3A:: @ 816FC3A setworldmapflag FLAG_WORLD_MAP_ROUTE10_POKEMON_CENTER_1F - setrespawn 13 + setrespawn SPAWN_ROUTE10 end Route10_PokemonCenter_1F_EventScript_16FC41:: @ 816FC41 diff --git a/data/maps/Route4_PokemonCenter_1F/scripts.inc b/data/maps/Route4_PokemonCenter_1F/scripts.inc index 3019e152f..6788cc0c8 100644 --- a/data/maps/Route4_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route4_PokemonCenter_1F/scripts.inc @@ -5,7 +5,7 @@ Route4_PokemonCenter_1F_MapScripts:: @ 816F739 Route4_PokemonCenter_1F_MapScript1_16F744:: @ 816F744 setworldmapflag FLAG_WORLD_MAP_ROUTE4_POKEMON_CENTER_1F - setrespawn 12 + setrespawn SPAWN_ROUTE4 end Route4_PokemonCenter_1F_EventScript_16F74B:: @ 816F74B diff --git a/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc b/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc index 17e583372..65c37eaf3 100644 --- a/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc @@ -4,7 +4,7 @@ SaffronCity_PokemonCenter_1F_MapScripts:: @ 816EFEC .byte 0 SaffronCity_PokemonCenter_1F_MapScript1_16EFF7:: @ 816EFF7 - setrespawn 11 + setrespawn SPAWN_SAFFRON_CITY end SaffronCity_PokemonCenter_1F_EventScript_16EFFB:: @ 816EFFB diff --git a/data/maps/SevenIsland_PokemonCenter_1F/scripts.inc b/data/maps/SevenIsland_PokemonCenter_1F/scripts.inc index 09e035316..170459099 100644 --- a/data/maps/SevenIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/SevenIsland_PokemonCenter_1F/scripts.inc @@ -4,7 +4,7 @@ SevenIsland_PokemonCenter_1F_MapScripts:: @ 8170B89 .byte 0 SevenIsland_PokemonCenter_1F_MapScript1_170B94:: @ 8170B94 - setrespawn 19 + setrespawn SPAWN_SEVEN_ISLAND end SevenIsland_PokemonCenter_1F_EventScript_170B98:: @ 8170B98 diff --git a/data/maps/SixIsland_PokemonCenter_1F/scripts.inc b/data/maps/SixIsland_PokemonCenter_1F/scripts.inc index ea59d73bc..593f9f979 100644 --- a/data/maps/SixIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/SixIsland_PokemonCenter_1F/scripts.inc @@ -5,7 +5,7 @@ SixIsland_PokemonCenter_1F_MapScripts:: @ 8171D6A .byte 0 SixIsland_PokemonCenter_1F_MapScript1_171D7A:: @ 8171D7A - setrespawn 20 + setrespawn SPAWN_SIX_ISLAND compare_var_to_value VAR_MAP_SCENE_SIX_ISLAND_POKEMON_CENTER_1F, 0 call_if 1, EventScript_171D89 end diff --git a/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc b/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc index 8041d604d..559b2a03c 100644 --- a/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc @@ -4,7 +4,7 @@ ThreeIsland_PokemonCenter_1F_MapScripts:: @ 8171832 .byte 0 ThreeIsland_PokemonCenter_1F_MapScript1_17183D:: @ 817183D - setrespawn 16 + setrespawn SPAWN_THREE_ISLAND end ThreeIsland_PokemonCenter_1F_EventScript_171841:: @ 8171841 diff --git a/data/maps/TwoIsland_PokemonCenter_1F/scripts.inc b/data/maps/TwoIsland_PokemonCenter_1F/scripts.inc index e9578c088..813b5d595 100644 --- a/data/maps/TwoIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/TwoIsland_PokemonCenter_1F/scripts.inc @@ -4,7 +4,7 @@ TwoIsland_PokemonCenter_1F_MapScripts:: @ 81717B4 .byte 0 TwoIsland_PokemonCenter_1F_MapScript1_1717BF:: @ 81717BF - setrespawn 15 + setrespawn SPAWN_TWO_ISLAND end TwoIsland_PokemonCenter_1F_EventScript_1717C3:: @ 81717C3 diff --git a/data/maps/VermilionCity_PokemonCenter_1F/scripts.inc b/data/maps/VermilionCity_PokemonCenter_1F/scripts.inc index 7f8857c68..f65681dc3 100644 --- a/data/maps/VermilionCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/VermilionCity_PokemonCenter_1F/scripts.inc @@ -4,7 +4,7 @@ VermilionCity_PokemonCenter_1F_MapScripts:: @ 816B424 .byte 0 VermilionCity_PokemonCenter_1F_MapScript1_16B42F:: @ 816B42F - setrespawn 6 + setrespawn SPAWN_VERMILION_CITY end VermilionCity_PokemonCenter_1F_EventScript_16B433:: @ 816B433 diff --git a/data/maps/ViridianCity_PokemonCenter_1F/scripts.inc b/data/maps/ViridianCity_PokemonCenter_1F/scripts.inc index a3bb38219..507b2bfe4 100644 --- a/data/maps/ViridianCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/ViridianCity_PokemonCenter_1F/scripts.inc @@ -4,7 +4,7 @@ ViridianCity_PokemonCenter_1F_MapScripts:: @ 816A2C0 .byte 0 ViridianCity_PokemonCenter_1F_MapScript1_16A2CB:: @ 816A2CB - setrespawn 2 + setrespawn SPAWN_VIRIDIAN_CITY end ViridianCity_PokemonCenter_1F_EventScript_16A2CF:: @ 816A2CF -- cgit v1.2.3 From cfc43d11115ab3258592801665caef9cfe859589 Mon Sep 17 00:00:00 2001 From: SatoMew Date: Fri, 17 May 2019 14:14:21 +0100 Subject: Label weather --- data/maps/BirthIsland_Exterior/map.json | 4 ++-- data/maps/BirthIsland_Harbor/map.json | 4 ++-- data/maps/CeladonCity/map.json | 4 ++-- data/maps/CeladonCity_Condominiums_1F/map.json | 4 ++-- data/maps/CeladonCity_Condominiums_2F/map.json | 4 ++-- data/maps/CeladonCity_Condominiums_3F/map.json | 4 ++-- data/maps/CeladonCity_Condominiums_Roof/map.json | 4 ++-- data/maps/CeladonCity_Condominiums_RoofRoom/map.json | 4 ++-- data/maps/CeladonCity_DepartmentStore_1F/map.json | 4 ++-- data/maps/CeladonCity_DepartmentStore_2F/map.json | 4 ++-- data/maps/CeladonCity_DepartmentStore_3F/map.json | 4 ++-- data/maps/CeladonCity_DepartmentStore_4F/map.json | 4 ++-- data/maps/CeladonCity_DepartmentStore_5F/map.json | 4 ++-- data/maps/CeladonCity_DepartmentStore_Elevator/map.json | 4 ++-- data/maps/CeladonCity_DepartmentStore_Roof/map.json | 4 ++-- data/maps/CeladonCity_GameCorner/map.json | 4 ++-- data/maps/CeladonCity_GameCorner_PrizeRoom/map.json | 4 ++-- data/maps/CeladonCity_Gym/map.json | 4 ++-- data/maps/CeladonCity_Hotel/map.json | 4 ++-- data/maps/CeladonCity_House1/map.json | 4 ++-- data/maps/CeladonCity_PokemonCenter_1F/map.json | 4 ++-- data/maps/CeladonCity_PokemonCenter_2F/map.json | 4 ++-- data/maps/CeladonCity_Restaurant/map.json | 4 ++-- data/maps/CeruleanCave_1F/map.json | 4 ++-- data/maps/CeruleanCave_2F/map.json | 4 ++-- data/maps/CeruleanCave_B1F/map.json | 4 ++-- data/maps/CeruleanCity/map.json | 4 ++-- data/maps/CeruleanCity_BikeShop/map.json | 4 ++-- data/maps/CeruleanCity_Gym/map.json | 4 ++-- data/maps/CeruleanCity_House1/map.json | 4 ++-- data/maps/CeruleanCity_House2/map.json | 4 ++-- data/maps/CeruleanCity_House3/map.json | 4 ++-- data/maps/CeruleanCity_House4/map.json | 4 ++-- data/maps/CeruleanCity_House5/map.json | 4 ++-- data/maps/CeruleanCity_Mart/map.json | 4 ++-- data/maps/CeruleanCity_PokemonCenter_1F/map.json | 4 ++-- data/maps/CeruleanCity_PokemonCenter_2F/map.json | 4 ++-- data/maps/CinnabarIsland/map.json | 4 ++-- data/maps/CinnabarIsland_Gym/map.json | 4 ++-- data/maps/CinnabarIsland_Mart/map.json | 4 ++-- data/maps/CinnabarIsland_PokemonCenter_1F/map.json | 4 ++-- data/maps/CinnabarIsland_PokemonCenter_2F/map.json | 4 ++-- data/maps/CinnabarIsland_PokemonLab_Entrance/map.json | 4 ++-- data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json | 4 ++-- data/maps/CinnabarIsland_PokemonLab_Lounge/map.json | 4 ++-- data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json | 4 ++-- data/maps/DiglettsCave_B1F/map.json | 4 ++-- data/maps/DiglettsCave_NorthEntrance/map.json | 4 ++-- data/maps/DiglettsCave_SouthEntrance/map.json | 4 ++-- data/maps/FiveIsland/map.json | 4 ++-- data/maps/FiveIsland_Harbor/map.json | 4 ++-- data/maps/FiveIsland_House1/map.json | 4 ++-- data/maps/FiveIsland_House2/map.json | 4 ++-- data/maps/FiveIsland_LostCave_Entrance/map.json | 4 ++-- data/maps/FiveIsland_LostCave_Room1/map.json | 4 ++-- data/maps/FiveIsland_LostCave_Room10/map.json | 4 ++-- data/maps/FiveIsland_LostCave_Room11/map.json | 4 ++-- data/maps/FiveIsland_LostCave_Room12/map.json | 4 ++-- data/maps/FiveIsland_LostCave_Room13/map.json | 4 ++-- data/maps/FiveIsland_LostCave_Room14/map.json | 4 ++-- data/maps/FiveIsland_LostCave_Room2/map.json | 4 ++-- data/maps/FiveIsland_LostCave_Room3/map.json | 4 ++-- data/maps/FiveIsland_LostCave_Room4/map.json | 4 ++-- data/maps/FiveIsland_LostCave_Room5/map.json | 4 ++-- data/maps/FiveIsland_LostCave_Room6/map.json | 4 ++-- data/maps/FiveIsland_LostCave_Room7/map.json | 4 ++-- data/maps/FiveIsland_LostCave_Room8/map.json | 4 ++-- data/maps/FiveIsland_LostCave_Room9/map.json | 4 ++-- data/maps/FiveIsland_Meadow/map.json | 4 ++-- data/maps/FiveIsland_MemorialPillar/map.json | 4 ++-- data/maps/FiveIsland_PokemonCenter_1F/map.json | 4 ++-- data/maps/FiveIsland_PokemonCenter_2F/map.json | 4 ++-- data/maps/FiveIsland_ResortGorgeous/map.json | 4 ++-- data/maps/FiveIsland_ResortGorgeous_House/map.json | 4 ++-- data/maps/FiveIsland_RocketWarehouse/map.json | 4 ++-- data/maps/FiveIsland_WaterLabyrinth/map.json | 4 ++-- data/maps/FourIsland/map.json | 4 ++-- data/maps/FourIsland_Harbor/map.json | 4 ++-- data/maps/FourIsland_House1/map.json | 4 ++-- data/maps/FourIsland_House2/map.json | 4 ++-- data/maps/FourIsland_IcefallCave_1F/map.json | 4 ++-- data/maps/FourIsland_IcefallCave_B1F/map.json | 4 ++-- data/maps/FourIsland_IcefallCave_Back/map.json | 4 ++-- data/maps/FourIsland_IcefallCave_Entrance/map.json | 4 ++-- data/maps/FourIsland_LoreleisHouse/map.json | 4 ++-- data/maps/FourIsland_Mart/map.json | 4 ++-- data/maps/FourIsland_PokemonCenter_1F/map.json | 4 ++-- data/maps/FourIsland_PokemonCenter_2F/map.json | 4 ++-- data/maps/FourIsland_PokemonDayCare/map.json | 4 ++-- data/maps/FuchsiaCity/map.json | 4 ++-- data/maps/FuchsiaCity_Building1/map.json | 4 ++-- data/maps/FuchsiaCity_Gym/map.json | 4 ++-- data/maps/FuchsiaCity_House1/map.json | 4 ++-- data/maps/FuchsiaCity_House2/map.json | 4 ++-- data/maps/FuchsiaCity_House3/map.json | 4 ++-- data/maps/FuchsiaCity_Mart/map.json | 4 ++-- data/maps/FuchsiaCity_PokemonCenter_1F/map.json | 4 ++-- data/maps/FuchsiaCity_PokemonCenter_2F/map.json | 4 ++-- data/maps/FuchsiaCity_SafariZone_Entrance/map.json | 4 ++-- data/maps/FuchsiaCity_ZooBuilding/map.json | 4 ++-- data/maps/IndigoPlateau_Exterior/map.json | 4 ++-- data/maps/IndigoPlateau_PokemonCenter_1F/map.json | 4 ++-- data/maps/IndigoPlateau_PokemonCenter_2F/map.json | 4 ++-- data/maps/LavenderTown/map.json | 4 ++-- data/maps/LavenderTown_House1/map.json | 4 ++-- data/maps/LavenderTown_House2/map.json | 4 ++-- data/maps/LavenderTown_Mart/map.json | 4 ++-- data/maps/LavenderTown_PokemonCenter_1F/map.json | 4 ++-- data/maps/LavenderTown_PokemonCenter_2F/map.json | 4 ++-- data/maps/LavenderTown_VolunteerPokemonHouse/map.json | 4 ++-- data/maps/MtEmber_Exterior/map.json | 4 ++-- data/maps/MtEmber_RubyPath_1F/map.json | 4 ++-- data/maps/MtEmber_RubyPath_B1F/map.json | 4 ++-- data/maps/MtEmber_RubyPath_B1F_Stairs/map.json | 4 ++-- data/maps/MtEmber_RubyPath_B2F/map.json | 4 ++-- data/maps/MtEmber_RubyPath_B2F_Stairs/map.json | 4 ++-- data/maps/MtEmber_RubyPath_B3F/map.json | 4 ++-- data/maps/MtEmber_RubyPath_B4F/map.json | 4 ++-- data/maps/MtEmber_RubyPath_B5F/map.json | 4 ++-- data/maps/MtEmber_Summit/map.json | 4 ++-- data/maps/MtEmber_SummitPath_1F/map.json | 4 ++-- data/maps/MtEmber_SummitPath_2F/map.json | 4 ++-- data/maps/MtEmber_SummitPath_3F/map.json | 4 ++-- data/maps/MtMoon_1F/map.json | 4 ++-- data/maps/MtMoon_B1F/map.json | 4 ++-- data/maps/MtMoon_B2F/map.json | 4 ++-- data/maps/NavelRock_1F/map.json | 4 ++-- data/maps/NavelRock_B1F/map.json | 4 ++-- data/maps/NavelRock_Base/map.json | 4 ++-- data/maps/NavelRock_BasePath_B10F/map.json | 4 ++-- data/maps/NavelRock_BasePath_B11F/map.json | 4 ++-- data/maps/NavelRock_BasePath_B1F/map.json | 4 ++-- data/maps/NavelRock_BasePath_B2F/map.json | 4 ++-- data/maps/NavelRock_BasePath_B3F/map.json | 4 ++-- data/maps/NavelRock_BasePath_B4F/map.json | 4 ++-- data/maps/NavelRock_BasePath_B5F/map.json | 4 ++-- data/maps/NavelRock_BasePath_B6F/map.json | 4 ++-- data/maps/NavelRock_BasePath_B7F/map.json | 4 ++-- data/maps/NavelRock_BasePath_B8F/map.json | 4 ++-- data/maps/NavelRock_BasePath_B9F/map.json | 4 ++-- data/maps/NavelRock_Exterior/map.json | 4 ++-- data/maps/NavelRock_Fork/map.json | 4 ++-- data/maps/NavelRock_Harbor/map.json | 4 ++-- data/maps/NavelRock_Summit/map.json | 4 ++-- data/maps/NavelRock_SummitPath_2F/map.json | 4 ++-- data/maps/NavelRock_SummitPath_3F/map.json | 4 ++-- data/maps/NavelRock_SummitPath_4F/map.json | 4 ++-- data/maps/NavelRock_SummitPath_5F/map.json | 4 ++-- data/maps/OneIsland/map.json | 4 ++-- data/maps/OneIsland_Harbor/map.json | 4 ++-- data/maps/OneIsland_House1/map.json | 4 ++-- data/maps/OneIsland_House2/map.json | 4 ++-- data/maps/OneIsland_KindleRoad/map.json | 4 ++-- data/maps/OneIsland_KindleRoad_EmberSpa/map.json | 4 ++-- data/maps/OneIsland_PokemonCenter_1F/map.json | 4 ++-- data/maps/OneIsland_PokemonCenter_2F/map.json | 4 ++-- data/maps/OneIsland_TreasureBeach/map.json | 4 ++-- data/maps/PalletTown/map.json | 4 ++-- data/maps/PalletTown_GarysHouse/map.json | 4 ++-- data/maps/PalletTown_PlayersHouse_1F/map.json | 4 ++-- data/maps/PalletTown_PlayersHouse_2F/map.json | 4 ++-- data/maps/PalletTown_ProfessorOaksLab/map.json | 4 ++-- data/maps/PewterCity/map.json | 4 ++-- data/maps/PewterCity_Gym/map.json | 4 ++-- data/maps/PewterCity_House1/map.json | 4 ++-- data/maps/PewterCity_House2/map.json | 4 ++-- data/maps/PewterCity_Mart/map.json | 4 ++-- data/maps/PewterCity_Museum_1F/map.json | 4 ++-- data/maps/PewterCity_Museum_2F/map.json | 4 ++-- data/maps/PewterCity_PokemonCenter_1F/map.json | 4 ++-- data/maps/PewterCity_PokemonCenter_2F/map.json | 4 ++-- data/maps/PokemonLeague_AgathasRoom/map.json | 4 ++-- data/maps/PokemonLeague_BrunosRoom/map.json | 4 ++-- data/maps/PokemonLeague_ChampionsRoom/map.json | 4 ++-- data/maps/PokemonLeague_HallOfFame/map.json | 4 ++-- data/maps/PokemonLeague_LancesRoom/map.json | 4 ++-- data/maps/PokemonLeague_LoreleisRoom/map.json | 4 ++-- data/maps/PokemonMansion_1F/map.json | 4 ++-- data/maps/PokemonMansion_2F/map.json | 4 ++-- data/maps/PokemonMansion_3F/map.json | 4 ++-- data/maps/PokemonMansion_B1F/map.json | 4 ++-- data/maps/PokemonTower_1F/map.json | 4 ++-- data/maps/PokemonTower_2F/map.json | 4 ++-- data/maps/PokemonTower_3F/map.json | 4 ++-- data/maps/PokemonTower_4F/map.json | 4 ++-- data/maps/PokemonTower_5F/map.json | 4 ++-- data/maps/PokemonTower_6F/map.json | 4 ++-- data/maps/PokemonTower_7F/map.json | 4 ++-- data/maps/PowerPlant/map.json | 4 ++-- data/maps/RockTunnel_1F/map.json | 4 ++-- data/maps/RockTunnel_B1F/map.json | 4 ++-- data/maps/RocketHideout_B1F/map.json | 4 ++-- data/maps/RocketHideout_B2F/map.json | 4 ++-- data/maps/RocketHideout_B3F/map.json | 4 ++-- data/maps/RocketHideout_B4F/map.json | 4 ++-- data/maps/RocketHideout_Elevator/map.json | 4 ++-- data/maps/Route1/map.json | 4 ++-- data/maps/Route10/map.json | 4 ++-- data/maps/Route10_PokemonCenter_1F/map.json | 4 ++-- data/maps/Route10_PokemonCenter_2F/map.json | 4 ++-- data/maps/Route11/map.json | 4 ++-- data/maps/Route11_EastEntrance_1F/map.json | 4 ++-- data/maps/Route11_EastEntrance_2F/map.json | 4 ++-- data/maps/Route12/map.json | 4 ++-- data/maps/Route12_FishingHouse/map.json | 4 ++-- data/maps/Route12_NorthEntrance_1F/map.json | 4 ++-- data/maps/Route12_NorthEntrance_2F/map.json | 4 ++-- data/maps/Route13/map.json | 4 ++-- data/maps/Route14/map.json | 4 ++-- data/maps/Route15/map.json | 4 ++-- data/maps/Route15_WestEntrance_1F/map.json | 4 ++-- data/maps/Route15_WestEntrance_2F/map.json | 4 ++-- data/maps/Route16/map.json | 4 ++-- data/maps/Route16_House/map.json | 4 ++-- data/maps/Route16_NorthEntrance_1F/map.json | 4 ++-- data/maps/Route16_NorthEntrance_2F/map.json | 4 ++-- data/maps/Route17/map.json | 4 ++-- data/maps/Route18/map.json | 4 ++-- data/maps/Route18_EastEntrance_1F/map.json | 4 ++-- data/maps/Route18_EastEntrance_2F/map.json | 4 ++-- data/maps/Route19/map.json | 4 ++-- data/maps/Route2/map.json | 4 ++-- data/maps/Route20/map.json | 4 ++-- data/maps/Route21_North/map.json | 4 ++-- data/maps/Route21_South/map.json | 4 ++-- data/maps/Route22/map.json | 4 ++-- data/maps/Route22_NorthEntrance/map.json | 4 ++-- data/maps/Route23/map.json | 4 ++-- data/maps/Route24/map.json | 4 ++-- data/maps/Route25/map.json | 4 ++-- data/maps/Route25_SeaCottage/map.json | 4 ++-- data/maps/Route2_EastBuilding/map.json | 4 ++-- data/maps/Route2_House/map.json | 4 ++-- data/maps/Route2_ViridianForest_NorthEntrance/map.json | 4 ++-- data/maps/Route2_ViridianForest_SouthEntrance/map.json | 4 ++-- data/maps/Route3/map.json | 4 ++-- data/maps/Route4/map.json | 4 ++-- data/maps/Route4_PokemonCenter_1F/map.json | 4 ++-- data/maps/Route4_PokemonCenter_2F/map.json | 4 ++-- data/maps/Route5/map.json | 4 ++-- data/maps/Route5_PokemonDayCare/map.json | 4 ++-- data/maps/Route5_SouthEntrance/map.json | 4 ++-- data/maps/Route6/map.json | 4 ++-- data/maps/Route6_NorthEntrance/map.json | 4 ++-- data/maps/Route7/map.json | 4 ++-- data/maps/Route7_EastEntrance/map.json | 4 ++-- data/maps/Route8/map.json | 4 ++-- data/maps/Route8_WestEntrance/map.json | 4 ++-- data/maps/Route9/map.json | 4 ++-- data/maps/SSAnne_1F_Corridor/map.json | 4 ++-- data/maps/SSAnne_1F_Room1/map.json | 4 ++-- data/maps/SSAnne_1F_Room2/map.json | 4 ++-- data/maps/SSAnne_1F_Room3/map.json | 4 ++-- data/maps/SSAnne_1F_Room4/map.json | 4 ++-- data/maps/SSAnne_1F_Room5/map.json | 4 ++-- data/maps/SSAnne_1F_Room6/map.json | 4 ++-- data/maps/SSAnne_1F_Room7/map.json | 4 ++-- data/maps/SSAnne_2F_Corridor/map.json | 4 ++-- data/maps/SSAnne_2F_Room1/map.json | 4 ++-- data/maps/SSAnne_2F_Room2/map.json | 4 ++-- data/maps/SSAnne_2F_Room3/map.json | 4 ++-- data/maps/SSAnne_2F_Room4/map.json | 4 ++-- data/maps/SSAnne_2F_Room5/map.json | 4 ++-- data/maps/SSAnne_2F_Room6/map.json | 4 ++-- data/maps/SSAnne_3F_Corridor/map.json | 4 ++-- data/maps/SSAnne_B1F_Corridor/map.json | 4 ++-- data/maps/SSAnne_B1F_Room1/map.json | 4 ++-- data/maps/SSAnne_B1F_Room2/map.json | 4 ++-- data/maps/SSAnne_B1F_Room3/map.json | 4 ++-- data/maps/SSAnne_B1F_Room4/map.json | 4 ++-- data/maps/SSAnne_B1F_Room5/map.json | 4 ++-- data/maps/SSAnne_CaptainsOffice/map.json | 4 ++-- data/maps/SSAnne_Deck/map.json | 4 ++-- data/maps/SSAnne_Exterior/map.json | 4 ++-- data/maps/SSAnne_Kitchen/map.json | 4 ++-- data/maps/SafariZone_Building1/map.json | 4 ++-- data/maps/SafariZone_Building2/map.json | 4 ++-- data/maps/SafariZone_Building3/map.json | 4 ++-- data/maps/SafariZone_Building4/map.json | 4 ++-- data/maps/SafariZone_Center/map.json | 4 ++-- data/maps/SafariZone_East/map.json | 4 ++-- data/maps/SafariZone_North/map.json | 4 ++-- data/maps/SafariZone_SecretHouse/map.json | 4 ++-- data/maps/SafariZone_West/map.json | 4 ++-- data/maps/SaffronCity/map.json | 4 ++-- data/maps/SaffronCity_Dojo/map.json | 4 ++-- data/maps/SaffronCity_Duplicate/map.json | 4 ++-- data/maps/SaffronCity_Gym/map.json | 4 ++-- data/maps/SaffronCity_House1_1F/map.json | 4 ++-- data/maps/SaffronCity_House1_2F/map.json | 4 ++-- data/maps/SaffronCity_House2/map.json | 4 ++-- data/maps/SaffronCity_House3/map.json | 4 ++-- data/maps/SaffronCity_Mart/map.json | 4 ++-- data/maps/SaffronCity_PokemonCenter_1F/map.json | 4 ++-- data/maps/SaffronCity_PokemonCenter_2F/map.json | 4 ++-- data/maps/SaffronCity_PokemonTrainerFanClub/map.json | 4 ++-- data/maps/SeafoamIslands_1F/map.json | 4 ++-- data/maps/SeafoamIslands_B1F/map.json | 4 ++-- data/maps/SeafoamIslands_B2F/map.json | 4 ++-- data/maps/SeafoamIslands_B3F/map.json | 4 ++-- data/maps/SeafoamIslands_B4F/map.json | 4 ++-- data/maps/SevenIsland/map.json | 4 ++-- data/maps/SevenIsland_Harbor/map.json | 4 ++-- data/maps/SevenIsland_House_Room1/map.json | 4 ++-- data/maps/SevenIsland_House_Room2/map.json | 4 ++-- data/maps/SevenIsland_Mart/map.json | 4 ++-- data/maps/SevenIsland_PokemonCenter_1F/map.json | 4 ++-- data/maps/SevenIsland_PokemonCenter_2F/map.json | 4 ++-- data/maps/SevenIsland_SeavaultCanyon_TanobyKey/map.json | 4 ++-- data/maps/SevenIsland_SevaultCanyon/map.json | 4 ++-- data/maps/SevenIsland_SevaultCanyon_Entrance/map.json | 4 ++-- data/maps/SevenIsland_SevaultCanyon_House/map.json | 4 ++-- data/maps/SevenIsland_TanobyRuins/map.json | 4 ++-- data/maps/SevenIsland_TanobyRuins_DilfordChamber/map.json | 4 ++-- data/maps/SevenIsland_TanobyRuins_LiptooChamber/map.json | 4 ++-- data/maps/SevenIsland_TanobyRuins_MoneanChamber/map.json | 4 ++-- data/maps/SevenIsland_TanobyRuins_RixyChamber/map.json | 4 ++-- data/maps/SevenIsland_TanobyRuins_ScufibChamber/map.json | 4 ++-- data/maps/SevenIsland_TanobyRuins_ViapoisChamber/map.json | 4 ++-- data/maps/SevenIsland_TanobyRuins_WeepthChamber/map.json | 4 ++-- data/maps/SevenIsland_TrainerTower/map.json | 4 ++-- data/maps/SevenIsland_TrainerTower_1F/map.json | 4 ++-- data/maps/SevenIsland_TrainerTower_2F/map.json | 4 ++-- data/maps/SevenIsland_TrainerTower_3F/map.json | 4 ++-- data/maps/SevenIsland_TrainerTower_4F/map.json | 4 ++-- data/maps/SevenIsland_TrainerTower_5F/map.json | 4 ++-- data/maps/SevenIsland_TrainerTower_6F/map.json | 4 ++-- data/maps/SevenIsland_TrainerTower_7F/map.json | 4 ++-- data/maps/SevenIsland_TrainerTower_8F/map.json | 4 ++-- data/maps/SevenIsland_TrainerTower_Elevator/map.json | 4 ++-- data/maps/SevenIsland_TrainerTower_Lobby/map.json | 4 ++-- data/maps/SevenIsland_TrainerTower_Roof/map.json | 4 ++-- data/maps/SilphCo_10F/map.json | 4 ++-- data/maps/SilphCo_11F/map.json | 4 ++-- data/maps/SilphCo_1F/map.json | 4 ++-- data/maps/SilphCo_2F/map.json | 4 ++-- data/maps/SilphCo_3F/map.json | 4 ++-- data/maps/SilphCo_4F/map.json | 4 ++-- data/maps/SilphCo_5F/map.json | 4 ++-- data/maps/SilphCo_6F/map.json | 4 ++-- data/maps/SilphCo_7F/map.json | 4 ++-- data/maps/SilphCo_8F/map.json | 4 ++-- data/maps/SilphCo_9F/map.json | 4 ++-- data/maps/SilphCo_Elevator/map.json | 4 ++-- data/maps/SixIsland/map.json | 4 ++-- data/maps/SixIsland_AlteringCave/map.json | 4 ++-- data/maps/SixIsland_DottedHole_1F/map.json | 4 ++-- data/maps/SixIsland_DottedHole_B1F/map.json | 4 ++-- data/maps/SixIsland_DottedHole_B2F/map.json | 4 ++-- data/maps/SixIsland_DottedHole_B3F/map.json | 4 ++-- data/maps/SixIsland_DottedHole_B4F/map.json | 4 ++-- data/maps/SixIsland_DottedHole_SapphireRoom/map.json | 4 ++-- data/maps/SixIsland_GreenPath/map.json | 4 ++-- data/maps/SixIsland_Harbor/map.json | 4 ++-- data/maps/SixIsland_House/map.json | 4 ++-- data/maps/SixIsland_Mart/map.json | 4 ++-- data/maps/SixIsland_OutcastIsland/map.json | 4 ++-- data/maps/SixIsland_PatternBush/map.json | 4 ++-- data/maps/SixIsland_PokemonCenter_1F/map.json | 4 ++-- data/maps/SixIsland_PokemonCenter_2F/map.json | 4 ++-- data/maps/SixIsland_RuinValley/map.json | 4 ++-- data/maps/SixIsland_WaterPath/map.json | 4 ++-- data/maps/SixIsland_WaterPath_House1/map.json | 4 ++-- data/maps/SixIsland_WaterPath_House2/map.json | 4 ++-- data/maps/ThreeIsland/map.json | 4 ++-- data/maps/ThreeIsland_BerryForest/map.json | 4 ++-- data/maps/ThreeIsland_BondBridge/map.json | 4 ++-- data/maps/ThreeIsland_DunsparceTunnel/map.json | 4 ++-- data/maps/ThreeIsland_Harbor/map.json | 4 ++-- data/maps/ThreeIsland_House1/map.json | 4 ++-- data/maps/ThreeIsland_House2/map.json | 4 ++-- data/maps/ThreeIsland_House3/map.json | 4 ++-- data/maps/ThreeIsland_House4/map.json | 4 ++-- data/maps/ThreeIsland_House5/map.json | 4 ++-- data/maps/ThreeIsland_Mart/map.json | 4 ++-- data/maps/ThreeIsland_PokemonCenter_1F/map.json | 4 ++-- data/maps/ThreeIsland_PokemonCenter_2F/map.json | 4 ++-- data/maps/ThreeIsland_Port/map.json | 4 ++-- data/maps/TwoIsland/map.json | 4 ++-- data/maps/TwoIsland_CapeBrink/map.json | 4 ++-- data/maps/TwoIsland_CapeBrink_House/map.json | 4 ++-- data/maps/TwoIsland_Harbor/map.json | 4 ++-- data/maps/TwoIsland_House/map.json | 4 ++-- data/maps/TwoIsland_JoyfulGameCorner/map.json | 4 ++-- data/maps/TwoIsland_PokemonCenter_1F/map.json | 4 ++-- data/maps/TwoIsland_PokemonCenter_2F/map.json | 4 ++-- data/maps/UndergroundPath_EastEntrance/map.json | 4 ++-- data/maps/UndergroundPath_EastWestTunnel/map.json | 4 ++-- data/maps/UndergroundPath_NorthEntrance/map.json | 4 ++-- data/maps/UndergroundPath_NorthSouthTunnel/map.json | 4 ++-- data/maps/UndergroundPath_SouthEntrance/map.json | 4 ++-- data/maps/UndergroundPath_WestEntrance/map.json | 4 ++-- data/maps/UnknownMap_00_00/map.json | 4 ++-- data/maps/UnknownMap_00_01/map.json | 4 ++-- data/maps/UnknownMap_00_02/map.json | 4 ++-- data/maps/UnknownMap_00_03/map.json | 4 ++-- data/maps/UnknownMap_00_04/map.json | 4 ++-- data/maps/UnknownMap_03_50/map.json | 4 ++-- data/maps/UnknownMap_03_51/map.json | 4 ++-- data/maps/UnknownMap_03_52/map.json | 4 ++-- data/maps/UnknownMap_03_53/map.json | 4 ++-- data/maps/UnknownMap_18_01/map.json | 4 ++-- data/maps/UnusedHouse_27_00/map.json | 4 ++-- data/maps/UnusedHouse_29_00/map.json | 4 ++-- data/maps/UnusedHouse_31_05/map.json | 4 ++-- data/maps/VermilionCity/map.json | 4 ++-- data/maps/VermilionCity_Gym/map.json | 4 ++-- data/maps/VermilionCity_House1/map.json | 4 ++-- data/maps/VermilionCity_House2/map.json | 4 ++-- data/maps/VermilionCity_House3/map.json | 4 ++-- data/maps/VermilionCity_Mart/map.json | 4 ++-- data/maps/VermilionCity_PokemonCenter_1F/map.json | 4 ++-- data/maps/VermilionCity_PokemonCenter_2F/map.json | 4 ++-- data/maps/VermilionCity_PokemonFanClub/map.json | 4 ++-- data/maps/VictoryRoad_1F/map.json | 4 ++-- data/maps/VictoryRoad_2F/map.json | 4 ++-- data/maps/VictoryRoad_3F/map.json | 4 ++-- data/maps/ViridianCity/map.json | 4 ++-- data/maps/ViridianCity_Gym/map.json | 4 ++-- data/maps/ViridianCity_House1/map.json | 4 ++-- data/maps/ViridianCity_House2/map.json | 4 ++-- data/maps/ViridianCity_Mart/map.json | 4 ++-- data/maps/ViridianCity_PokemonCenter_1F/map.json | 4 ++-- data/maps/ViridianCity_PokemonCenter_2F/map.json | 4 ++-- data/maps/ViridianForest/map.json | 4 ++-- 425 files changed, 850 insertions(+), 850 deletions(-) (limited to 'data/maps') diff --git a/data/maps/BirthIsland_Exterior/map.json b/data/maps/BirthIsland_Exterior/map.json index 521d191fa..5ee37131f 100644 --- a/data/maps/BirthIsland_Exterior/map.json +++ b/data/maps/BirthIsland_Exterior/map.json @@ -5,7 +5,7 @@ "music": "0xFFFF", "region_map_section": "MAPSEC_BIRTH_ISLAND", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_3", "unknown_18": 0, "unknown_19": 6, @@ -51,4 +51,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BirthIsland_Harbor/map.json b/data/maps/BirthIsland_Harbor/map.json index 4efbb12a4..cecda6ec5 100644 --- a/data/maps/BirthIsland_Harbor/map.json +++ b/data/maps/BirthIsland_Harbor/map.json @@ -5,7 +5,7 @@ "music": "0xFFFF", "region_map_section": "MAPSEC_BIRTH_ISLAND", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -51,4 +51,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/CeladonCity/map.json b/data/maps/CeladonCity/map.json index 0bf834686..3c3483967 100644 --- a/data/maps/CeladonCity/map.json +++ b/data/maps/CeladonCity/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_CELADON_CITY", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, - "weather": "WEATHER_2", + "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_1", "unknown_18": 1, "unknown_19": 6, @@ -381,4 +381,4 @@ "unknown": 1 } ] -} \ No newline at end of file +} diff --git a/data/maps/CeladonCity_Condominiums_1F/map.json b/data/maps/CeladonCity_Condominiums_1F/map.json index 443e9acd6..5665a7f51 100644 --- a/data/maps/CeladonCity_Condominiums_1F/map.json +++ b/data/maps/CeladonCity_Condominiums_1F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_CELADON_CITY", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -127,4 +127,4 @@ "script": "CeladonCity_Condominiums_1F_EventScript_16C3C7" } ] -} \ No newline at end of file +} diff --git a/data/maps/CeladonCity_Condominiums_2F/map.json b/data/maps/CeladonCity_Condominiums_2F/map.json index 48559628c..1fdfd5746 100644 --- a/data/maps/CeladonCity_Condominiums_2F/map.json +++ b/data/maps/CeladonCity_Condominiums_2F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_CELADON_CITY", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -87,4 +87,4 @@ "script": "CeladonCity_Condominiums_2F_EventScript_16C3D1" } ] -} \ No newline at end of file +} diff --git a/data/maps/CeladonCity_Condominiums_3F/map.json b/data/maps/CeladonCity_Condominiums_3F/map.json index c804ec6e7..0a98c9d67 100644 --- a/data/maps/CeladonCity_Condominiums_3F/map.json +++ b/data/maps/CeladonCity_Condominiums_3F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_CELADON_CITY", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -155,4 +155,4 @@ "script": "CeladonCity_Condominiums_3F_EventScript_16C447" } ] -} \ No newline at end of file +} diff --git a/data/maps/CeladonCity_Condominiums_Roof/map.json b/data/maps/CeladonCity_Condominiums_Roof/map.json index 8e3cfdba6..cbbb754bb 100644 --- a/data/maps/CeladonCity_Condominiums_Roof/map.json +++ b/data/maps/CeladonCity_Condominiums_Roof/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_CELADON_CITY", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -53,4 +53,4 @@ "script": "CeladonCity_Condominiums_Roof_EventScript_16C45A" } ] -} \ No newline at end of file +} diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/map.json b/data/maps/CeladonCity_Condominiums_RoofRoom/map.json index 9b34fffdd..aa15b14a5 100644 --- a/data/maps/CeladonCity_Condominiums_RoofRoom/map.json +++ b/data/maps/CeladonCity_Condominiums_RoofRoom/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_CELADON_CITY", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -87,4 +87,4 @@ "script": "CeladonCity_Condominiums_RoofRoom_EventScript_16C519" } ] -} \ No newline at end of file +} diff --git a/data/maps/CeladonCity_DepartmentStore_1F/map.json b/data/maps/CeladonCity_DepartmentStore_1F/map.json index 1318f0173..67badf749 100644 --- a/data/maps/CeladonCity_DepartmentStore_1F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_1F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_POKEMON_CENTER", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 4, @@ -102,4 +102,4 @@ "script": "CeladonCity_DepartmentStore_1F_EventScript_16BAEB" } ] -} \ No newline at end of file +} diff --git a/data/maps/CeladonCity_DepartmentStore_2F/map.json b/data/maps/CeladonCity_DepartmentStore_2F/map.json index 9765467e4..7363a2af5 100644 --- a/data/maps/CeladonCity_DepartmentStore_2F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_2F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_POKEMON_CENTER", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 4, @@ -99,4 +99,4 @@ "script": "CeladonCity_DepartmentStore_2F_EventScript_16BB07" } ] -} \ No newline at end of file +} diff --git a/data/maps/CeladonCity_DepartmentStore_3F/map.json b/data/maps/CeladonCity_DepartmentStore_3F/map.json index c6a314cc9..2c0cf0fbc 100644 --- a/data/maps/CeladonCity_DepartmentStore_3F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_3F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_POKEMON_CENTER", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 4, @@ -182,4 +182,4 @@ "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBE5" } ] -} \ No newline at end of file +} diff --git a/data/maps/CeladonCity_DepartmentStore_4F/map.json b/data/maps/CeladonCity_DepartmentStore_4F/map.json index 8fc5e4f09..37c0841f7 100644 --- a/data/maps/CeladonCity_DepartmentStore_4F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_4F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_POKEMON_CENTER", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 4, @@ -86,4 +86,4 @@ "script": "CeladonCity_DepartmentStore_4F_EventScript_16BC01" } ] -} \ No newline at end of file +} diff --git a/data/maps/CeladonCity_DepartmentStore_5F/map.json b/data/maps/CeladonCity_DepartmentStore_5F/map.json index 063d36602..691d9ff7c 100644 --- a/data/maps/CeladonCity_DepartmentStore_5F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_5F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_POKEMON_CENTER", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 4, @@ -99,4 +99,4 @@ "script": "CeladonCity_DepartmentStore_5F_EventScript_16BC53" } ] -} \ No newline at end of file +} diff --git a/data/maps/CeladonCity_DepartmentStore_Elevator/map.json b/data/maps/CeladonCity_DepartmentStore_Elevator/map.json index 150bd1605..7a2c88c84 100644 --- a/data/maps/CeladonCity_DepartmentStore_Elevator/map.json +++ b/data/maps/CeladonCity_DepartmentStore_Elevator/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_POKEMON_CENTER", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -46,4 +46,4 @@ "script": "CeladonCity_DepartmentStore_Elevator_EventScript_16C153" } ] -} \ No newline at end of file +} diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/map.json b/data/maps/CeladonCity_DepartmentStore_Roof/map.json index 461da4fcc..470ea3dd1 100644 --- a/data/maps/CeladonCity_DepartmentStore_Roof/map.json +++ b/data/maps/CeladonCity_DepartmentStore_Roof/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_POKEMON_CENTER", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 4, @@ -80,4 +80,4 @@ "script": "CeladonCity_DepartmentStore_Roof_EventScript_16C034" } ] -} \ No newline at end of file +} diff --git a/data/maps/CeladonCity_GameCorner/map.json b/data/maps/CeladonCity_GameCorner/map.json index fa2b1186a..a3b1df6f4 100644 --- a/data/maps/CeladonCity_GameCorner/map.json +++ b/data/maps/CeladonCity_GameCorner/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_GAMECORNER", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -466,4 +466,4 @@ "script": "CeladonCity_GameCorner_EventScript_1B2867" } ] -} \ No newline at end of file +} diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json b/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json index b9247574a..3e37651f5 100644 --- a/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json +++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_CELADON_CITY", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -104,4 +104,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/CeladonCity_Gym/map.json b/data/maps/CeladonCity_Gym/map.json index ae83a1571..d294cb8eb 100644 --- a/data/maps/CeladonCity_Gym/map.json +++ b/data/maps/CeladonCity_Gym/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_GYM", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -197,4 +197,4 @@ "script": "CeladonCity_Gym_EventScript_16D1CC" } ] -} \ No newline at end of file +} diff --git a/data/maps/CeladonCity_Hotel/map.json b/data/maps/CeladonCity_Hotel/map.json index 85d79e8bc..5959cc9aa 100644 --- a/data/maps/CeladonCity_Hotel/map.json +++ b/data/maps/CeladonCity_Hotel/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_CELADON_CITY", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -91,4 +91,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/CeladonCity_House1/map.json b/data/maps/CeladonCity_House1/map.json index 58d6ee590..900c123a0 100644 --- a/data/maps/CeladonCity_House1/map.json +++ b/data/maps/CeladonCity_House1/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_CELADON_CITY", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -78,4 +78,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/CeladonCity_PokemonCenter_1F/map.json b/data/maps/CeladonCity_PokemonCenter_1F/map.json index 717206847..800dfbecf 100644 --- a/data/maps/CeladonCity_PokemonCenter_1F/map.json +++ b/data/maps/CeladonCity_PokemonCenter_1F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_POKEMON_CENTER", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -98,4 +98,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/CeladonCity_PokemonCenter_2F/map.json b/data/maps/CeladonCity_PokemonCenter_2F/map.json index 89358eaa6..622a168d4 100644 --- a/data/maps/CeladonCity_PokemonCenter_2F/map.json +++ b/data/maps/CeladonCity_PokemonCenter_2F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_POKEMON_CENTER", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -91,4 +91,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/CeladonCity_Restaurant/map.json b/data/maps/CeladonCity_Restaurant/map.json index 284856350..eb7afdbe2 100644 --- a/data/maps/CeladonCity_Restaurant/map.json +++ b/data/maps/CeladonCity_Restaurant/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_CELADON_CITY", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -104,4 +104,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/CeruleanCave_1F/map.json b/data/maps/CeruleanCave_1F/map.json index 36bd0b680..64bf8c583 100644 --- a/data/maps/CeruleanCave_1F/map.json +++ b/data/maps/CeruleanCave_1F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_ROCKET_HIDEOUT", "region_map_section": "MAPSEC_CERULEAN_CAVE", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "unknown_18": 1, "unknown_19": 7, @@ -201,4 +201,4 @@ "unknown": 1 } ] -} \ No newline at end of file +} diff --git a/data/maps/CeruleanCave_2F/map.json b/data/maps/CeruleanCave_2F/map.json index 061e13cc3..4b747735b 100644 --- a/data/maps/CeruleanCave_2F/map.json +++ b/data/maps/CeruleanCave_2F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_ROCKET_HIDEOUT", "region_map_section": "MAPSEC_CERULEAN_CAVE", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "unknown_18": 1, "unknown_19": 7, @@ -229,4 +229,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/CeruleanCave_B1F/map.json b/data/maps/CeruleanCave_B1F/map.json index 44447c387..0dd6edb8c 100644 --- a/data/maps/CeruleanCave_B1F/map.json +++ b/data/maps/CeruleanCave_B1F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_ROCKET_HIDEOUT", "region_map_section": "MAPSEC_CERULEAN_CAVE", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "unknown_18": 1, "unknown_19": 7, @@ -181,4 +181,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/CeruleanCity/map.json b/data/maps/CeruleanCity/map.json index 602f84df8..df48d28c0 100644 --- a/data/maps/CeruleanCity/map.json +++ b/data/maps/CeruleanCity/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_CERULEAN_CITY", "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, - "weather": "WEATHER_2", + "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_1", "unknown_18": 1, "unknown_19": 6, @@ -398,4 +398,4 @@ "script": "CeruleanCity_EventScript_16AC94" } ] -} \ No newline at end of file +} diff --git a/data/maps/CeruleanCity_BikeShop/map.json b/data/maps/CeruleanCity_BikeShop/map.json index f94bc3e7e..51ac0c1a6 100644 --- a/data/maps/CeruleanCity_BikeShop/map.json +++ b/data/maps/CeruleanCity_BikeShop/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_CERULEAN_CITY", "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -135,4 +135,4 @@ "script": "CeruleanCity_BikeShop_EventScript_16AC94" } ] -} \ No newline at end of file +} diff --git a/data/maps/CeruleanCity_Gym/map.json b/data/maps/CeruleanCity_Gym/map.json index 715fbd067..a662cdf74 100644 --- a/data/maps/CeruleanCity_Gym/map.json +++ b/data/maps/CeruleanCity_Gym/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_GYM", "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -106,4 +106,4 @@ "script": "CeruleanCity_Gym_EventScript_16AB9E" } ] -} \ No newline at end of file +} diff --git a/data/maps/CeruleanCity_House1/map.json b/data/maps/CeruleanCity_House1/map.json index ad770bb63..248ba5b3f 100644 --- a/data/maps/CeruleanCity_House1/map.json +++ b/data/maps/CeruleanCity_House1/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_CERULEAN_CITY", "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/CeruleanCity_House2/map.json b/data/maps/CeruleanCity_House2/map.json index 0c2d2e4cb..207ca1f40 100644 --- a/data/maps/CeruleanCity_House2/map.json +++ b/data/maps/CeruleanCity_House2/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_CERULEAN_CITY", "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -80,4 +80,4 @@ "script": "CeruleanCity_House2_EventScript_16A99E" } ] -} \ No newline at end of file +} diff --git a/data/maps/CeruleanCity_House3/map.json b/data/maps/CeruleanCity_House3/map.json index 748aac0e2..e74a6a675 100644 --- a/data/maps/CeruleanCity_House3/map.json +++ b/data/maps/CeruleanCity_House3/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_CERULEAN_CITY", "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -65,4 +65,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/CeruleanCity_House4/map.json b/data/maps/CeruleanCity_House4/map.json index c07927a27..2fdf6ad1e 100644 --- a/data/maps/CeruleanCity_House4/map.json +++ b/data/maps/CeruleanCity_House4/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_CERULEAN_CITY", "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -38,4 +38,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/CeruleanCity_House5/map.json b/data/maps/CeruleanCity_House5/map.json index 6619a1fb4..c96495d4a 100644 --- a/data/maps/CeruleanCity_House5/map.json +++ b/data/maps/CeruleanCity_House5/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_CERULEAN_CITY", "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -46,4 +46,4 @@ "script": "CeruleanCity_House5_EventScript_16B0DA" } ] -} \ No newline at end of file +} diff --git a/data/maps/CeruleanCity_Mart/map.json b/data/maps/CeruleanCity_Mart/map.json index f0f95490c..7f3076e12 100644 --- a/data/maps/CeruleanCity_Mart/map.json +++ b/data/maps/CeruleanCity_Mart/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_POKEMON_CENTER", "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -78,4 +78,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/CeruleanCity_PokemonCenter_1F/map.json b/data/maps/CeruleanCity_PokemonCenter_1F/map.json index f85c99a58..16132e565 100644 --- a/data/maps/CeruleanCity_PokemonCenter_1F/map.json +++ b/data/maps/CeruleanCity_PokemonCenter_1F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_POKEMON_CENTER", "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -137,4 +137,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/CeruleanCity_PokemonCenter_2F/map.json b/data/maps/CeruleanCity_PokemonCenter_2F/map.json index c231d2b99..d5460e28f 100644 --- a/data/maps/CeruleanCity_PokemonCenter_2F/map.json +++ b/data/maps/CeruleanCity_PokemonCenter_2F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_POKEMON_CENTER", "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -91,4 +91,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/CinnabarIsland/map.json b/data/maps/CinnabarIsland/map.json index 395daeb62..4b680f47f 100644 --- a/data/maps/CinnabarIsland/map.json +++ b/data/maps/CinnabarIsland/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_CINNABAR_ISLAND", "region_map_section": "MAPSEC_CINNABAR_ISLAND", "requires_flash": false, - "weather": "WEATHER_2", + "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_1", "unknown_18": 1, "unknown_19": 6, @@ -155,4 +155,4 @@ "script": "CinnabarIsland_EventScript_16721A" } ] -} \ No newline at end of file +} diff --git a/data/maps/CinnabarIsland_Gym/map.json b/data/maps/CinnabarIsland_Gym/map.json index cb22dda7d..c583ac2f9 100644 --- a/data/maps/CinnabarIsland_Gym/map.json +++ b/data/maps/CinnabarIsland_Gym/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_GYM", "region_map_section": "MAPSEC_CINNABAR_ISLAND", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -262,4 +262,4 @@ "script": "CinnabarIsland_Gym_EventScript_1ACF07" } ] -} \ No newline at end of file +} diff --git a/data/maps/CinnabarIsland_Mart/map.json b/data/maps/CinnabarIsland_Mart/map.json index 5904c5e98..fa0972302 100644 --- a/data/maps/CinnabarIsland_Mart/map.json +++ b/data/maps/CinnabarIsland_Mart/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_POKEMON_CENTER", "region_map_section": "MAPSEC_CINNABAR_ISLAND", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -78,4 +78,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/map.json b/data/maps/CinnabarIsland_PokemonCenter_1F/map.json index b325d8e96..134d89ac8 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_1F/map.json +++ b/data/maps/CinnabarIsland_PokemonCenter_1F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_POKEMON_CENTER", "region_map_section": "MAPSEC_CINNABAR_ISLAND", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -137,4 +137,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/CinnabarIsland_PokemonCenter_2F/map.json b/data/maps/CinnabarIsland_PokemonCenter_2F/map.json index 8eab88cd1..181acc569 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_2F/map.json +++ b/data/maps/CinnabarIsland_PokemonCenter_2F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_POKEMON_CENTER", "region_map_section": "MAPSEC_CINNABAR_ISLAND", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -91,4 +91,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json b/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json index 51bba9ff3..f1ee3023b 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_CINNABAR_ISLAND", "region_map_section": "MAPSEC_CINNABAR_ISLAND", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -102,4 +102,4 @@ "script": "CinnabarIsland_PokemonLab_Entrance_EventScript_16E2AF" } ] -} \ No newline at end of file +} diff --git a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json index 8a12c33c7..7c7ac1268 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_CINNABAR_ISLAND", "region_map_section": "MAPSEC_CINNABAR_ISLAND", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -51,4 +51,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json b/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json index 6fb33bc66..1d9e1aa0e 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_CINNABAR_ISLAND", "region_map_section": "MAPSEC_CINNABAR_ISLAND", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -64,4 +64,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json index f1d049604..83f6135b7 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_CINNABAR_ISLAND", "region_map_section": "MAPSEC_CINNABAR_ISLAND", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -66,4 +66,4 @@ "script": "CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3EE" } ] -} \ No newline at end of file +} diff --git a/data/maps/DiglettsCave_B1F/map.json b/data/maps/DiglettsCave_B1F/map.json index 0494960fb..202d9fb6a 100644 --- a/data/maps/DiglettsCave_B1F/map.json +++ b/data/maps/DiglettsCave_B1F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_VIRIDIAN_FOREST", "region_map_section": "MAPSEC_DIGLETTS_CAVE", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "unknown_18": 1, "unknown_19": 7, @@ -31,4 +31,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/DiglettsCave_NorthEntrance/map.json b/data/maps/DiglettsCave_NorthEntrance/map.json index 77947f6db..1529d8592 100644 --- a/data/maps/DiglettsCave_NorthEntrance/map.json +++ b/data/maps/DiglettsCave_NorthEntrance/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_VIRIDIAN_FOREST", "region_map_section": "MAPSEC_DIGLETTS_CAVE", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "unknown_18": 1, "unknown_19": 7, @@ -45,4 +45,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/DiglettsCave_SouthEntrance/map.json b/data/maps/DiglettsCave_SouthEntrance/map.json index 2cbe9c6e0..27a17103e 100644 --- a/data/maps/DiglettsCave_SouthEntrance/map.json +++ b/data/maps/DiglettsCave_SouthEntrance/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_VIRIDIAN_FOREST", "region_map_section": "MAPSEC_DIGLETTS_CAVE", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "unknown_18": 1, "unknown_19": 7, @@ -45,4 +45,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/FiveIsland/map.json b/data/maps/FiveIsland/map.json index b34f0aaf0..0a087cd74 100644 --- a/data/maps/FiveIsland/map.json +++ b/data/maps/FiveIsland/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_ISLAND_FOUR", "region_map_section": "MAPSEC_FIVE_ISLAND", "requires_flash": false, - "weather": "WEATHER_2", + "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_1", "unknown_18": 1, "unknown_19": 6, @@ -104,4 +104,4 @@ "script": "FiveIsland_EventScript_167E98" } ] -} \ No newline at end of file +} diff --git a/data/maps/FiveIsland_Harbor/map.json b/data/maps/FiveIsland_Harbor/map.json index 96b4c12b2..f99fced10 100644 --- a/data/maps/FiveIsland_Harbor/map.json +++ b/data/maps/FiveIsland_Harbor/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_ISLAND_FOUR", "region_map_section": "MAPSEC_FIVE_ISLAND", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -51,4 +51,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/FiveIsland_House1/map.json b/data/maps/FiveIsland_House1/map.json index ffd475b42..817d17cda 100644 --- a/data/maps/FiveIsland_House1/map.json +++ b/data/maps/FiveIsland_House1/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_ISLAND_FOUR", "region_map_section": "MAPSEC_FIVE_ISLAND", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -38,4 +38,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/FiveIsland_House2/map.json b/data/maps/FiveIsland_House2/map.json index bc3d2853c..e9254cf3c 100644 --- a/data/maps/FiveIsland_House2/map.json +++ b/data/maps/FiveIsland_House2/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_ISLAND_FOUR", "region_map_section": "MAPSEC_FIVE_ISLAND", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -38,4 +38,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/FiveIsland_LostCave_Entrance/map.json b/data/maps/FiveIsland_LostCave_Entrance/map.json index c70a0558f..e34db7ec9 100644 --- a/data/maps/FiveIsland_LostCave_Entrance/map.json +++ b/data/maps/FiveIsland_LostCave_Entrance/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_MT_EMBER", "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "unknown_18": 1, "unknown_19": 7, @@ -31,4 +31,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/FiveIsland_LostCave_Room1/map.json b/data/maps/FiveIsland_LostCave_Room1/map.json index 195e53dcb..80c4a3ee1 100644 --- a/data/maps/FiveIsland_LostCave_Room1/map.json +++ b/data/maps/FiveIsland_LostCave_Room1/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_MT_EMBER", "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, - "weather": "WEATHER_6", + "weather": "WEATHER_FOG_HORIZONTAL", "map_type": "MAP_TYPE_4", "unknown_18": 1, "unknown_19": 7, @@ -66,4 +66,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/FiveIsland_LostCave_Room10/map.json b/data/maps/FiveIsland_LostCave_Room10/map.json index 42e7f0179..d155f030a 100644 --- a/data/maps/FiveIsland_LostCave_Room10/map.json +++ b/data/maps/FiveIsland_LostCave_Room10/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_MT_EMBER", "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, - "weather": "WEATHER_6", + "weather": "WEATHER_FOG_HORIZONTAL", "map_type": "MAP_TYPE_4", "unknown_18": 1, "unknown_19": 7, @@ -51,4 +51,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/FiveIsland_LostCave_Room11/map.json b/data/maps/FiveIsland_LostCave_Room11/map.json index 47155c19d..c7e948840 100644 --- a/data/maps/FiveIsland_LostCave_Room11/map.json +++ b/data/maps/FiveIsland_LostCave_Room11/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_MT_EMBER", "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, - "weather": "WEATHER_6", + "weather": "WEATHER_FOG_HORIZONTAL", "map_type": "MAP_TYPE_4", "unknown_18": 1, "unknown_19": 7, @@ -38,4 +38,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/FiveIsland_LostCave_Room12/map.json b/data/maps/FiveIsland_LostCave_Room12/map.json index cbe79bf74..da0d9ca31 100644 --- a/data/maps/FiveIsland_LostCave_Room12/map.json +++ b/data/maps/FiveIsland_LostCave_Room12/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_MT_EMBER", "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, - "weather": "WEATHER_6", + "weather": "WEATHER_FOG_HORIZONTAL", "map_type": "MAP_TYPE_4", "unknown_18": 1, "unknown_19": 7, @@ -38,4 +38,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/FiveIsland_LostCave_Room13/map.json b/data/maps/FiveIsland_LostCave_Room13/map.json index b39a12fd3..cef031273 100644 --- a/data/maps/FiveIsland_LostCave_Room13/map.json +++ b/data/maps/FiveIsland_LostCave_Room13/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_MT_EMBER", "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, - "weather": "WEATHER_6", + "weather": "WEATHER_FOG_HORIZONTAL", "map_type": "MAP_TYPE_4", "unknown_18": 1, "unknown_19": 7, @@ -38,4 +38,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/FiveIsland_LostCave_Room14/map.json b/data/maps/FiveIsland_LostCave_Room14/map.json index 5e4f7aa07..025120be6 100644 --- a/data/maps/FiveIsland_LostCave_Room14/map.json +++ b/data/maps/FiveIsland_LostCave_Room14/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_MT_EMBER", "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, - "weather": "WEATHER_6", + "weather": "WEATHER_FOG_HORIZONTAL", "map_type": "MAP_TYPE_4", "unknown_18": 1, "unknown_19": 7, @@ -38,4 +38,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/FiveIsland_LostCave_Room2/map.json b/data/maps/FiveIsland_LostCave_Room2/map.json index df991bd96..59da7ae72 100644 --- a/data/maps/FiveIsland_LostCave_Room2/map.json +++ b/data/maps/FiveIsland_LostCave_Room2/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_MT_EMBER", "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, - "weather": "WEATHER_6", + "weather": "WEATHER_FOG_HORIZONTAL", "map_type": "MAP_TYPE_4", "unknown_18": 1, "unknown_19": 7, @@ -45,4 +45,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/FiveIsland_LostCave_Room3/map.json b/data/maps/FiveIsland_LostCave_Room3/map.json index 0fc5622ff..129c50fe9 100644 --- a/data/maps/FiveIsland_LostCave_Room3/map.json +++ b/data/maps/FiveIsland_LostCave_Room3/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_MT_EMBER", "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, - "weather": "WEATHER_6", + "weather": "WEATHER_FOG_HORIZONTAL", "map_type": "MAP_TYPE_4", "unknown_18": 1, "unknown_19": 7, @@ -45,4 +45,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/FiveIsland_LostCave_Room4/map.json b/data/maps/FiveIsland_LostCave_Room4/map.json index b4d7633ac..98b31bca3 100644 --- a/data/maps/FiveIsland_LostCave_Room4/map.json +++ b/data/maps/FiveIsland_LostCave_Room4/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_MT_EMBER", "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, - "weather": "WEATHER_6", + "weather": "WEATHER_FOG_HORIZONTAL", "map_type": "MAP_TYPE_4", "unknown_18": 1, "unknown_19": 7, @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/FiveIsland_LostCave_Room5/map.json b/data/maps/FiveIsland_LostCave_Room5/map.json index dca189071..1df784d77 100644 --- a/data/maps/FiveIsland_LostCave_Room5/map.json +++ b/data/maps/FiveIsland_LostCave_Room5/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_MT_EMBER", "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, - "weather": "WEATHER_6", + "weather": "WEATHER_FOG_HORIZONTAL", "map_type": "MAP_TYPE_4", "unknown_18": 1, "unknown_19": 7, @@ -45,4 +45,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/FiveIsland_LostCave_Room6/map.json b/data/maps/FiveIsland_LostCave_Room6/map.json index e70d5d5cb..5a6be0290 100644 --- a/data/maps/FiveIsland_LostCave_Room6/map.json +++ b/data/maps/FiveIsland_LostCave_Room6/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_MT_EMBER", "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, - "weather": "WEATHER_6", + "weather": "WEATHER_FOG_HORIZONTAL", "map_type": "MAP_TYPE_4", "unknown_18": 1, "unknown_19": 7, @@ -45,4 +45,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/FiveIsland_LostCave_Room7/map.json b/data/maps/FiveIsland_LostCave_Room7/map.json index 90b129cb9..b18af46f7 100644 --- a/data/maps/FiveIsland_LostCave_Room7/map.json +++ b/data/maps/FiveIsland_LostCave_Room7/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_MT_EMBER", "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, - "weather": "WEATHER_6", + "weather": "WEATHER_FOG_HORIZONTAL", "map_type": "MAP_TYPE_4", "unknown_18": 1, "unknown_19": 7, @@ -45,4 +45,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/FiveIsland_LostCave_Room8/map.json b/data/maps/FiveIsland_LostCave_Room8/map.json index 7dd8dc00d..72057fbd1 100644 --- a/data/maps/FiveIsland_LostCave_Room8/map.json +++ b/data/maps/FiveIsland_LostCave_Room8/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_MT_EMBER", "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, - "weather": "WEATHER_6", + "weather": "WEATHER_FOG_HORIZONTAL", "map_type": "MAP_TYPE_4", "unknown_18": 1, "unknown_19": 7, @@ -45,4 +45,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/FiveIsland_LostCave_Room9/map.json b/data/maps/FiveIsland_LostCave_Room9/map.json index 857ef6332..54b9d6d2e 100644 --- a/data/maps/FiveIsland_LostCave_Room9/map.json +++ b/data/maps/FiveIsland_LostCave_Room9/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_MT_EMBER", "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, - "weather": "WEATHER_6", + "weather": "WEATHER_FOG_HORIZONTAL", "map_type": "MAP_TYPE_4", "unknown_18": 1, "unknown_19": 7, @@ -45,4 +45,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/FiveIsland_Meadow/map.json b/data/maps/FiveIsland_Meadow/map.json index b2c8232c8..cda0c4f2c 100644 --- a/data/maps/FiveIsland_Meadow/map.json +++ b/data/maps/FiveIsland_Meadow/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_SEVII_ISLANDS", "region_map_section": "MAPSEC_FIVE_ISLE_MEADOW", "requires_flash": false, - "weather": "WEATHER_2", + "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "unknown_18": 1, "unknown_19": 6, @@ -135,4 +135,4 @@ "script": "FiveIsland_Meadow_EventScript_168942" } ] -} \ No newline at end of file +} diff --git a/data/maps/FiveIsland_MemorialPillar/map.json b/data/maps/FiveIsland_MemorialPillar/map.json index c8a7325db..30418fb84 100644 --- a/data/maps/FiveIsland_MemorialPillar/map.json +++ b/data/maps/FiveIsland_MemorialPillar/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_SEVII_ISLANDS", "region_map_section": "MAPSEC_MEMORIAL_PILLAR", "requires_flash": false, - "weather": "WEATHER_2", + "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "unknown_18": 1, "unknown_19": 6, @@ -132,4 +132,4 @@ "unknown": 1 } ] -} \ No newline at end of file +} diff --git a/data/maps/FiveIsland_PokemonCenter_1F/map.json b/data/maps/FiveIsland_PokemonCenter_1F/map.json index d5fffc7a9..e0e708bd2 100644 --- a/data/maps/FiveIsland_PokemonCenter_1F/map.json +++ b/data/maps/FiveIsland_PokemonCenter_1F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_POKEMON_CENTER", "region_map_section": "MAPSEC_FIVE_ISLAND", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -97,4 +97,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/FiveIsland_PokemonCenter_2F/map.json b/data/maps/FiveIsland_PokemonCenter_2F/map.json index 2efdd61d5..e6b4d237b 100644 --- a/data/maps/FiveIsland_PokemonCenter_2F/map.json +++ b/data/maps/FiveIsland_PokemonCenter_2F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_POKEMON_CENTER", "region_map_section": "MAPSEC_FIVE_ISLAND", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -91,4 +91,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/FiveIsland_ResortGorgeous/map.json b/data/maps/FiveIsland_ResortGorgeous/map.json index dfb2407d0..dc53baf54 100644 --- a/data/maps/FiveIsland_ResortGorgeous/map.json +++ b/data/maps/FiveIsland_ResortGorgeous/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_SEVII_ISLANDS", "region_map_section": "MAPSEC_RESORT_GORGEOUS", "requires_flash": false, - "weather": "WEATHER_2", + "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "unknown_18": 1, "unknown_19": 6, @@ -186,4 +186,4 @@ "script": "FiveIsland_ResortGorgeous_EventScript_168844" } ] -} \ No newline at end of file +} diff --git a/data/maps/FiveIsland_ResortGorgeous_House/map.json b/data/maps/FiveIsland_ResortGorgeous_House/map.json index ec97e8cf0..f960fe89d 100644 --- a/data/maps/FiveIsland_ResortGorgeous_House/map.json +++ b/data/maps/FiveIsland_ResortGorgeous_House/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_ISLAND_FOUR", "region_map_section": "MAPSEC_RESORT_GORGEOUS", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -66,4 +66,4 @@ "script": "FiveIsland_ResortGorgeous_House_EventScript_1ACF2C" } ] -} \ No newline at end of file +} diff --git a/data/maps/FiveIsland_RocketWarehouse/map.json b/data/maps/FiveIsland_RocketWarehouse/map.json index f545a0d38..2c45cdf29 100644 --- a/data/maps/FiveIsland_RocketWarehouse/map.json +++ b/data/maps/FiveIsland_RocketWarehouse/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_ROCKET_HIDEOUT", "region_map_section": "MAPSEC_ROCKET_WAREHOUSE", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 5, @@ -363,4 +363,4 @@ "script": "FiveIsland_RocketWarehouse_EventScript_163F5A" } ] -} \ No newline at end of file +} diff --git a/data/maps/FiveIsland_WaterLabyrinth/map.json b/data/maps/FiveIsland_WaterLabyrinth/map.json index f4ed982f2..97a0961fd 100644 --- a/data/maps/FiveIsland_WaterLabyrinth/map.json +++ b/data/maps/FiveIsland_WaterLabyrinth/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_SEVII_ISLANDS", "region_map_section": "MAPSEC_WATER_LABYRINTH", "requires_flash": false, - "weather": "WEATHER_2", + "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "unknown_18": 1, "unknown_19": 6, @@ -54,4 +54,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/FourIsland/map.json b/data/maps/FourIsland/map.json index fdc2e8607..b167e2ba0 100644 --- a/data/maps/FourIsland/map.json +++ b/data/maps/FourIsland/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_ISLAND_FOUR", "region_map_section": "MAPSEC_FOUR_ISLAND", "requires_flash": false, - "weather": "WEATHER_2", + "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_1", "unknown_18": 1, "unknown_19": 6, @@ -263,4 +263,4 @@ "script": "FourIsland_EventScript_167E85" } ] -} \ No newline at end of file +} diff --git a/data/maps/FourIsland_Harbor/map.json b/data/maps/FourIsland_Harbor/map.json index 9786e2b1f..2ec5e402b 100644 --- a/data/maps/FourIsland_Harbor/map.json +++ b/data/maps/FourIsland_Harbor/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_ISLAND_FOUR", "region_map_section": "MAPSEC_FOUR_ISLAND", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -51,4 +51,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/FourIsland_House1/map.json b/data/maps/FourIsland_House1/map.json index 46c98ee57..99eb97da3 100644 --- a/data/maps/FourIsland_House1/map.json +++ b/data/maps/FourIsland_House1/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_ISLAND_FOUR", "region_map_section": "MAPSEC_FOUR_ISLAND", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -51,4 +51,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/FourIsland_House2/map.json b/data/maps/FourIsland_House2/map.json index 9419ba2c6..6811c33ae 100644 --- a/data/maps/FourIsland_House2/map.json +++ b/data/maps/FourIsland_House2/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_ISLAND_FOUR", "region_map_section": "MAPSEC_FOUR_ISLAND", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -38,4 +38,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/FourIsland_IcefallCave_1F/map.json b/data/maps/FourIsland_IcefallCave_1F/map.json index 57207c4e5..00fa4bac0 100644 --- a/data/maps/FourIsland_IcefallCave_1F/map.json +++ b/data/maps/FourIsland_IcefallCave_1F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_MT_EMBER", "region_map_section": "MAPSEC_ICEFALL_CAVE", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "unknown_18": 1, "unknown_19": 7, @@ -86,4 +86,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/FourIsland_IcefallCave_B1F/map.json b/data/maps/FourIsland_IcefallCave_B1F/map.json index 20aa98d20..940d888f1 100644 --- a/data/maps/FourIsland_IcefallCave_B1F/map.json +++ b/data/maps/FourIsland_IcefallCave_B1F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_MT_EMBER", "region_map_section": "MAPSEC_ICEFALL_CAVE", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "unknown_18": 1, "unknown_19": 7, @@ -65,4 +65,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/FourIsland_IcefallCave_Back/map.json b/data/maps/FourIsland_IcefallCave_Back/map.json index 9c26325bd..0b3ca6e97 100644 --- a/data/maps/FourIsland_IcefallCave_Back/map.json +++ b/data/maps/FourIsland_IcefallCave_Back/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_MT_EMBER", "region_map_section": "MAPSEC_ICEFALL_CAVE", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "unknown_18": 1, "unknown_19": 7, @@ -105,4 +105,4 @@ } ], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/FourIsland_IcefallCave_Entrance/map.json b/data/maps/FourIsland_IcefallCave_Entrance/map.json index 4214932de..babdb41da 100644 --- a/data/maps/FourIsland_IcefallCave_Entrance/map.json +++ b/data/maps/FourIsland_IcefallCave_Entrance/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_MT_EMBER", "region_map_section": "MAPSEC_ICEFALL_CAVE", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "unknown_18": 1, "unknown_19": 7, @@ -38,4 +38,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/FourIsland_LoreleisHouse/map.json b/data/maps/FourIsland_LoreleisHouse/map.json index ccf6352d0..9c73e30f2 100644 --- a/data/maps/FourIsland_LoreleisHouse/map.json +++ b/data/maps/FourIsland_LoreleisHouse/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_ISLAND_FOUR", "region_map_section": "MAPSEC_FOUR_ISLAND", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -220,4 +220,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/FourIsland_Mart/map.json b/data/maps/FourIsland_Mart/map.json index 999dad6c7..4fbd02275 100644 --- a/data/maps/FourIsland_Mart/map.json +++ b/data/maps/FourIsland_Mart/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_POKEMON_CENTER", "region_map_section": "MAPSEC_FOUR_ISLAND", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -64,4 +64,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/FourIsland_PokemonCenter_1F/map.json b/data/maps/FourIsland_PokemonCenter_1F/map.json index 1df35b78b..0ff5c17c2 100644 --- a/data/maps/FourIsland_PokemonCenter_1F/map.json +++ b/data/maps/FourIsland_PokemonCenter_1F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_POKEMON_CENTER", "region_map_section": "MAPSEC_FOUR_ISLAND", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -99,4 +99,4 @@ "script": "FourIsland_PokemonCenter_1F_EventScript_1ACDD0" } ] -} \ No newline at end of file +} diff --git a/data/maps/FourIsland_PokemonCenter_2F/map.json b/data/maps/FourIsland_PokemonCenter_2F/map.json index ef54040ea..f66cce064 100644 --- a/data/maps/FourIsland_PokemonCenter_2F/map.json +++ b/data/maps/FourIsland_PokemonCenter_2F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_POKEMON_CENTER", "region_map_section": "MAPSEC_FOUR_ISLAND", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -91,4 +91,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/FourIsland_PokemonDayCare/map.json b/data/maps/FourIsland_PokemonDayCare/map.json index 580fcc1c0..b9c45365a 100644 --- a/data/maps/FourIsland_PokemonDayCare/map.json +++ b/data/maps/FourIsland_PokemonDayCare/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_ISLAND_FOUR", "region_map_section": "MAPSEC_FOUR_ISLAND", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -38,4 +38,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/FuchsiaCity/map.json b/data/maps/FuchsiaCity/map.json index 1bc5c6621..4fc30ef40 100644 --- a/data/maps/FuchsiaCity/map.json +++ b/data/maps/FuchsiaCity/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_CERULEAN_CITY", "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, - "weather": "WEATHER_2", + "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_1", "unknown_18": 1, "unknown_19": 6, @@ -406,4 +406,4 @@ "unknown": 1 } ] -} \ No newline at end of file +} diff --git a/data/maps/FuchsiaCity_Building1/map.json b/data/maps/FuchsiaCity_Building1/map.json index 694e7bc51..eea444164 100644 --- a/data/maps/FuchsiaCity_Building1/map.json +++ b/data/maps/FuchsiaCity_Building1/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_CERULEAN_CITY", "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -120,4 +120,4 @@ "script": "FuchsiaCity_Building1_EventScript_16D80D" } ] -} \ No newline at end of file +} diff --git a/data/maps/FuchsiaCity_Gym/map.json b/data/maps/FuchsiaCity_Gym/map.json index 775797674..c1106fb9c 100644 --- a/data/maps/FuchsiaCity_Gym/map.json +++ b/data/maps/FuchsiaCity_Gym/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_GYM", "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -158,4 +158,4 @@ "script": "FuchsiaCity_Gym_EventScript_16D6A7" } ] -} \ No newline at end of file +} diff --git a/data/maps/FuchsiaCity_House1/map.json b/data/maps/FuchsiaCity_House1/map.json index 2686c6c25..8e4d8ad8c 100644 --- a/data/maps/FuchsiaCity_House1/map.json +++ b/data/maps/FuchsiaCity_House1/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_CERULEAN_CITY", "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -78,4 +78,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/FuchsiaCity_House2/map.json b/data/maps/FuchsiaCity_House2/map.json index d18088c38..0e443e100 100644 --- a/data/maps/FuchsiaCity_House2/map.json +++ b/data/maps/FuchsiaCity_House2/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_CERULEAN_CITY", "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/FuchsiaCity_House3/map.json b/data/maps/FuchsiaCity_House3/map.json index a3445dd83..dc819ebfc 100644 --- a/data/maps/FuchsiaCity_House3/map.json +++ b/data/maps/FuchsiaCity_House3/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_CERULEAN_CITY", "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -38,4 +38,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/FuchsiaCity_Mart/map.json b/data/maps/FuchsiaCity_Mart/map.json index 24dc3ba36..bfd8fe520 100644 --- a/data/maps/FuchsiaCity_Mart/map.json +++ b/data/maps/FuchsiaCity_Mart/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_POKEMON_CENTER", "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -78,4 +78,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/FuchsiaCity_PokemonCenter_1F/map.json b/data/maps/FuchsiaCity_PokemonCenter_1F/map.json index 04a1a80b3..bbf19625b 100644 --- a/data/maps/FuchsiaCity_PokemonCenter_1F/map.json +++ b/data/maps/FuchsiaCity_PokemonCenter_1F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_POKEMON_CENTER", "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -98,4 +98,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/FuchsiaCity_PokemonCenter_2F/map.json b/data/maps/FuchsiaCity_PokemonCenter_2F/map.json index ce72c9b33..62e56bf0b 100644 --- a/data/maps/FuchsiaCity_PokemonCenter_2F/map.json +++ b/data/maps/FuchsiaCity_PokemonCenter_2F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_POKEMON_CENTER", "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -91,4 +91,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/map.json b/data/maps/FuchsiaCity_SafariZone_Entrance/map.json index b6fbd9ec6..d986f0c05 100644 --- a/data/maps/FuchsiaCity_SafariZone_Entrance/map.json +++ b/data/maps/FuchsiaCity_SafariZone_Entrance/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_CERULEAN_CITY", "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -100,4 +100,4 @@ } ], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/FuchsiaCity_ZooBuilding/map.json b/data/maps/FuchsiaCity_ZooBuilding/map.json index 0448b9984..de3962e96 100644 --- a/data/maps/FuchsiaCity_ZooBuilding/map.json +++ b/data/maps/FuchsiaCity_ZooBuilding/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_CERULEAN_CITY", "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -91,4 +91,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/IndigoPlateau_Exterior/map.json b/data/maps/IndigoPlateau_Exterior/map.json index 29c62a76c..de82d21e1 100644 --- a/data/maps/IndigoPlateau_Exterior/map.json +++ b/data/maps/IndigoPlateau_Exterior/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_INDIGO_PLATEAU", "region_map_section": "MAPSEC_INDIGO_PLATEAU", "requires_flash": false, - "weather": "WEATHER_2", + "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_1", "unknown_18": 1, "unknown_19": 6, @@ -57,4 +57,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/map.json b/data/maps/IndigoPlateau_PokemonCenter_1F/map.json index 89ba4f048..a68bf374b 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_1F/map.json +++ b/data/maps/IndigoPlateau_PokemonCenter_1F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_GYM", "region_map_section": "MAPSEC_INDIGO_PLATEAU", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -143,4 +143,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/IndigoPlateau_PokemonCenter_2F/map.json b/data/maps/IndigoPlateau_PokemonCenter_2F/map.json index 3003616f3..5273ed61a 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_2F/map.json +++ b/data/maps/IndigoPlateau_PokemonCenter_2F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_POKEMON_CENTER", "region_map_section": "MAPSEC_INDIGO_PLATEAU", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -91,4 +91,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/LavenderTown/map.json b/data/maps/LavenderTown/map.json index 6231d9469..32071e5d2 100644 --- a/data/maps/LavenderTown/map.json +++ b/data/maps/LavenderTown/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_LAVENDER_TOWN", "region_map_section": "MAPSEC_LAVENDER_TOWN", "requires_flash": false, - "weather": "WEATHER_2", + "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_1", "unknown_18": 1, "unknown_19": 6, @@ -144,4 +144,4 @@ "script": "LavenderTown_EventScript_1668CA" } ] -} \ No newline at end of file +} diff --git a/data/maps/LavenderTown_House1/map.json b/data/maps/LavenderTown_House1/map.json index 5674da210..b7b255588 100644 --- a/data/maps/LavenderTown_House1/map.json +++ b/data/maps/LavenderTown_House1/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_LAVENDER_TOWN", "region_map_section": "MAPSEC_LAVENDER_TOWN", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -65,4 +65,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/LavenderTown_House2/map.json b/data/maps/LavenderTown_House2/map.json index 8617d5d03..fd7ec4f22 100644 --- a/data/maps/LavenderTown_House2/map.json +++ b/data/maps/LavenderTown_House2/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_CERULEAN_CITY", "region_map_section": "MAPSEC_LAVENDER_TOWN", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -52,4 +52,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/LavenderTown_Mart/map.json b/data/maps/LavenderTown_Mart/map.json index 017950cb6..441f67cdd 100644 --- a/data/maps/LavenderTown_Mart/map.json +++ b/data/maps/LavenderTown_Mart/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_POKEMON_CENTER", "region_map_section": "MAPSEC_LAVENDER_TOWN", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -91,4 +91,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/LavenderTown_PokemonCenter_1F/map.json b/data/maps/LavenderTown_PokemonCenter_1F/map.json index db62073d3..17ab5ac45 100644 --- a/data/maps/LavenderTown_PokemonCenter_1F/map.json +++ b/data/maps/LavenderTown_PokemonCenter_1F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_POKEMON_CENTER", "region_map_section": "MAPSEC_LAVENDER_TOWN", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -111,4 +111,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/LavenderTown_PokemonCenter_2F/map.json b/data/maps/LavenderTown_PokemonCenter_2F/map.json index 8b88b91ce..8b3675c0f 100644 --- a/data/maps/LavenderTown_PokemonCenter_2F/map.json +++ b/data/maps/LavenderTown_PokemonCenter_2F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_POKEMON_CENTER", "region_map_section": "MAPSEC_LAVENDER_TOWN", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -91,4 +91,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/LavenderTown_VolunteerPokemonHouse/map.json b/data/maps/LavenderTown_VolunteerPokemonHouse/map.json index a9646e5e6..f5d78cec5 100644 --- a/data/maps/LavenderTown_VolunteerPokemonHouse/map.json +++ b/data/maps/LavenderTown_VolunteerPokemonHouse/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_LAVENDER_TOWN", "region_map_section": "MAPSEC_LAVENDER_TOWN", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -139,4 +139,4 @@ "script": "LavenderTown_VolunteerPokemonHouse_EventScript_16B229" } ] -} \ No newline at end of file +} diff --git a/data/maps/MtEmber_Exterior/map.json b/data/maps/MtEmber_Exterior/map.json index bae55d1c3..165086636 100644 --- a/data/maps/MtEmber_Exterior/map.json +++ b/data/maps/MtEmber_Exterior/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_MT_EMBER", "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_3", "unknown_18": 1, "unknown_19": 6, @@ -367,4 +367,4 @@ "unknown": 1 } ] -} \ No newline at end of file +} diff --git a/data/maps/MtEmber_RubyPath_1F/map.json b/data/maps/MtEmber_RubyPath_1F/map.json index b3c9ad2aa..dfd51b629 100644 --- a/data/maps/MtEmber_RubyPath_1F/map.json +++ b/data/maps/MtEmber_RubyPath_1F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_MT_EMBER", "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "unknown_18": 1, "unknown_19": 7, @@ -104,4 +104,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MtEmber_RubyPath_B1F/map.json b/data/maps/MtEmber_RubyPath_B1F/map.json index df6b4fcb5..e60856ad9 100644 --- a/data/maps/MtEmber_RubyPath_B1F/map.json +++ b/data/maps/MtEmber_RubyPath_B1F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_MT_EMBER", "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "unknown_18": 1, "unknown_19": 7, @@ -84,4 +84,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json b/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json index 61c0cae51..c8175b887 100644 --- a/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json +++ b/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_MT_EMBER", "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "unknown_18": 1, "unknown_19": 7, @@ -45,4 +45,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MtEmber_RubyPath_B2F/map.json b/data/maps/MtEmber_RubyPath_B2F/map.json index e10a1762c..919bcc7c3 100644 --- a/data/maps/MtEmber_RubyPath_B2F/map.json +++ b/data/maps/MtEmber_RubyPath_B2F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_MT_EMBER", "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "unknown_18": 1, "unknown_19": 7, @@ -123,4 +123,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json b/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json index 5d494f5a4..e1a7e7dbe 100644 --- a/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json +++ b/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_MT_EMBER", "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "unknown_18": 1, "unknown_19": 7, @@ -58,4 +58,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MtEmber_RubyPath_B3F/map.json b/data/maps/MtEmber_RubyPath_B3F/map.json index 3b681233c..bd2088c30 100644 --- a/data/maps/MtEmber_RubyPath_B3F/map.json +++ b/data/maps/MtEmber_RubyPath_B3F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_MT_EMBER", "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "unknown_18": 1, "unknown_19": 7, @@ -169,4 +169,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MtEmber_RubyPath_B4F/map.json b/data/maps/MtEmber_RubyPath_B4F/map.json index 339c5e653..611d87ef4 100644 --- a/data/maps/MtEmber_RubyPath_B4F/map.json +++ b/data/maps/MtEmber_RubyPath_B4F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_MT_EMBER", "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "unknown_18": 1, "unknown_19": 7, @@ -214,4 +214,4 @@ "script": "MtEmber_RubyPath_B4F_EventScript_16392B" } ] -} \ No newline at end of file +} diff --git a/data/maps/MtEmber_RubyPath_B5F/map.json b/data/maps/MtEmber_RubyPath_B5F/map.json index 320bff06d..e6b80acc1 100644 --- a/data/maps/MtEmber_RubyPath_B5F/map.json +++ b/data/maps/MtEmber_RubyPath_B5F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_MT_EMBER", "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "unknown_18": 1, "unknown_19": 7, @@ -46,4 +46,4 @@ "script": "MtEmber_RubyPath_B5F_EventScript_163BAB" } ] -} \ No newline at end of file +} diff --git a/data/maps/MtEmber_Summit/map.json b/data/maps/MtEmber_Summit/map.json index eab46ccae..711f6f57d 100644 --- a/data/maps/MtEmber_Summit/map.json +++ b/data/maps/MtEmber_Summit/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_MT_EMBER", "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "unknown_18": 1, "unknown_19": 7, @@ -90,4 +90,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MtEmber_SummitPath_1F/map.json b/data/maps/MtEmber_SummitPath_1F/map.json index 8e7ccc047..16438a729 100644 --- a/data/maps/MtEmber_SummitPath_1F/map.json +++ b/data/maps/MtEmber_SummitPath_1F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_MT_EMBER", "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "unknown_18": 1, "unknown_19": 7, @@ -31,4 +31,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MtEmber_SummitPath_2F/map.json b/data/maps/MtEmber_SummitPath_2F/map.json index 69067bbcc..161cdff31 100644 --- a/data/maps/MtEmber_SummitPath_2F/map.json +++ b/data/maps/MtEmber_SummitPath_2F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_MT_EMBER", "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "unknown_18": 1, "unknown_19": 7, @@ -149,4 +149,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MtEmber_SummitPath_3F/map.json b/data/maps/MtEmber_SummitPath_3F/map.json index b30309a12..0d2f4c7b3 100644 --- a/data/maps/MtEmber_SummitPath_3F/map.json +++ b/data/maps/MtEmber_SummitPath_3F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_MT_EMBER", "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "unknown_18": 1, "unknown_19": 7, @@ -31,4 +31,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MtMoon_1F/map.json b/data/maps/MtMoon_1F/map.json index 39138d94e..314eedb18 100644 --- a/data/maps/MtMoon_1F/map.json +++ b/data/maps/MtMoon_1F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_MT_MOON", "region_map_section": "MAPSEC_MT_MOON", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "unknown_18": 1, "unknown_19": 7, @@ -236,4 +236,4 @@ "script": "MtMoon_1F_EventScript_1605EE" } ] -} \ No newline at end of file +} diff --git a/data/maps/MtMoon_B1F/map.json b/data/maps/MtMoon_B1F/map.json index 64e316565..44e8bec9d 100644 --- a/data/maps/MtMoon_B1F/map.json +++ b/data/maps/MtMoon_B1F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_MT_MOON", "region_map_section": "MAPSEC_MT_MOON", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "unknown_18": 1, "unknown_19": 7, @@ -128,4 +128,4 @@ "unknown": 1 } ] -} \ No newline at end of file +} diff --git a/data/maps/MtMoon_B2F/map.json b/data/maps/MtMoon_B2F/map.json index 9b3fa3658..093b40917 100644 --- a/data/maps/MtMoon_B2F/map.json +++ b/data/maps/MtMoon_B2F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_MT_MOON", "region_map_section": "MAPSEC_MT_MOON", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "unknown_18": 1, "unknown_19": 7, @@ -218,4 +218,4 @@ "unknown": 1 } ] -} \ No newline at end of file +} diff --git a/data/maps/NavelRock_1F/map.json b/data/maps/NavelRock_1F/map.json index 586d2c9b6..9cbfb1918 100644 --- a/data/maps/NavelRock_1F/map.json +++ b/data/maps/NavelRock_1F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_MT_EMBER", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "unknown_18": 0, "unknown_19": 6, @@ -31,4 +31,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/NavelRock_B1F/map.json b/data/maps/NavelRock_B1F/map.json index 074a3e41f..643051c4a 100644 --- a/data/maps/NavelRock_B1F/map.json +++ b/data/maps/NavelRock_B1F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_MT_EMBER", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "unknown_18": 0, "unknown_19": 6, @@ -31,4 +31,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/NavelRock_Base/map.json b/data/maps/NavelRock_Base/map.json index 5e515e7e9..50742576b 100644 --- a/data/maps/NavelRock_Base/map.json +++ b/data/maps/NavelRock_Base/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_MT_EMBER", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "unknown_18": 0, "unknown_19": 6, @@ -38,4 +38,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/NavelRock_BasePath_B10F/map.json b/data/maps/NavelRock_BasePath_B10F/map.json index c578caf34..41aaa26fe 100644 --- a/data/maps/NavelRock_BasePath_B10F/map.json +++ b/data/maps/NavelRock_BasePath_B10F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_MT_EMBER", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "unknown_18": 0, "unknown_19": 6, @@ -31,4 +31,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/NavelRock_BasePath_B11F/map.json b/data/maps/NavelRock_BasePath_B11F/map.json index a25f66a8d..ca63d3f42 100644 --- a/data/maps/NavelRock_BasePath_B11F/map.json +++ b/data/maps/NavelRock_BasePath_B11F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_MT_EMBER", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "unknown_18": 0, "unknown_19": 6, @@ -31,4 +31,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/NavelRock_BasePath_B1F/map.json b/data/maps/NavelRock_BasePath_B1F/map.json index 9127135f3..d91ec836f 100644 --- a/data/maps/NavelRock_BasePath_B1F/map.json +++ b/data/maps/NavelRock_BasePath_B1F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_MT_EMBER", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "unknown_18": 0, "unknown_19": 6, @@ -31,4 +31,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/NavelRock_BasePath_B2F/map.json b/data/maps/NavelRock_BasePath_B2F/map.json index 4ec9d4faf..795341b0d 100644 --- a/data/maps/NavelRock_BasePath_B2F/map.json +++ b/data/maps/NavelRock_BasePath_B2F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_MT_EMBER", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "unknown_18": 0, "unknown_19": 6, @@ -31,4 +31,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/NavelRock_BasePath_B3F/map.json b/data/maps/NavelRock_BasePath_B3F/map.json index c0a482b47..9ecce5260 100644 --- a/data/maps/NavelRock_BasePath_B3F/map.json +++ b/data/maps/NavelRock_BasePath_B3F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_MT_EMBER", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "unknown_18": 0, "unknown_19": 6, @@ -31,4 +31,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/NavelRock_BasePath_B4F/map.json b/data/maps/NavelRock_BasePath_B4F/map.json index c8ed7aa33..e4b6728a1 100644 --- a/data/maps/NavelRock_BasePath_B4F/map.json +++ b/data/maps/NavelRock_BasePath_B4F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_MT_EMBER", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "unknown_18": 0, "unknown_19": 6, @@ -31,4 +31,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/NavelRock_BasePath_B5F/map.json b/data/maps/NavelRock_BasePath_B5F/map.json index 55c22da08..2a66f9652 100644 --- a/data/maps/NavelRock_BasePath_B5F/map.json +++ b/data/maps/NavelRock_BasePath_B5F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_MT_EMBER", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "unknown_18": 0, "unknown_19": 6, @@ -31,4 +31,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/NavelRock_BasePath_B6F/map.json b/data/maps/NavelRock_BasePath_B6F/map.json index ad441261b..4d0f797b0 100644 --- a/data/maps/NavelRock_BasePath_B6F/map.json +++ b/data/maps/NavelRock_BasePath_B6F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_MT_EMBER", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "unknown_18": 0, "unknown_19": 6, @@ -31,4 +31,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/NavelRock_BasePath_B7F/map.json b/data/maps/NavelRock_BasePath_B7F/map.json index ea16d9bd0..053282a88 100644 --- a/data/maps/NavelRock_BasePath_B7F/map.json +++ b/data/maps/NavelRock_BasePath_B7F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_MT_EMBER", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "unknown_18": 0, "unknown_19": 6, @@ -31,4 +31,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/NavelRock_BasePath_B8F/map.json b/data/maps/NavelRock_BasePath_B8F/map.json index 27d4253f8..d46e80168 100644 --- a/data/maps/NavelRock_BasePath_B8F/map.json +++ b/data/maps/NavelRock_BasePath_B8F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_MT_EMBER", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "unknown_18": 0, "unknown_19": 6, @@ -31,4 +31,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/NavelRock_BasePath_B9F/map.json b/data/maps/NavelRock_BasePath_B9F/map.json index fd4b0e4eb..43440ca9c 100644 --- a/data/maps/NavelRock_BasePath_B9F/map.json +++ b/data/maps/NavelRock_BasePath_B9F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_MT_EMBER", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "unknown_18": 0, "unknown_19": 6, @@ -31,4 +31,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/NavelRock_Exterior/map.json b/data/maps/NavelRock_Exterior/map.json index 2caf50cac..8660ec6af 100644 --- a/data/maps/NavelRock_Exterior/map.json +++ b/data/maps/NavelRock_Exterior/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_SEVII_ISLANDS", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_3", "unknown_18": 1, "unknown_19": 6, @@ -31,4 +31,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/NavelRock_Fork/map.json b/data/maps/NavelRock_Fork/map.json index 8f58e4edc..55dc110b9 100644 --- a/data/maps/NavelRock_Fork/map.json +++ b/data/maps/NavelRock_Fork/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_MT_EMBER", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "unknown_18": 0, "unknown_19": 6, @@ -38,4 +38,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/NavelRock_Harbor/map.json b/data/maps/NavelRock_Harbor/map.json index 575542128..1cd74326e 100644 --- a/data/maps/NavelRock_Harbor/map.json +++ b/data/maps/NavelRock_Harbor/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_SEVII_ISLANDS", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -51,4 +51,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/NavelRock_Summit/map.json b/data/maps/NavelRock_Summit/map.json index ec65f3a26..84bb51d62 100644 --- a/data/maps/NavelRock_Summit/map.json +++ b/data/maps/NavelRock_Summit/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_MT_EMBER", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, - "weather": "WEATHER_11", + "weather": "WEATHER_CLOUDY", "map_type": "MAP_TYPE_4", "unknown_18": 0, "unknown_19": 6, @@ -58,4 +58,4 @@ "unknown": 129 } ] -} \ No newline at end of file +} diff --git a/data/maps/NavelRock_SummitPath_2F/map.json b/data/maps/NavelRock_SummitPath_2F/map.json index ac1dfaeee..5ed9016d8 100644 --- a/data/maps/NavelRock_SummitPath_2F/map.json +++ b/data/maps/NavelRock_SummitPath_2F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_MT_EMBER", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "unknown_18": 0, "unknown_19": 6, @@ -31,4 +31,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/NavelRock_SummitPath_3F/map.json b/data/maps/NavelRock_SummitPath_3F/map.json index 5964d839a..02873fa1a 100644 --- a/data/maps/NavelRock_SummitPath_3F/map.json +++ b/data/maps/NavelRock_SummitPath_3F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_MT_EMBER", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "unknown_18": 0, "unknown_19": 6, @@ -31,4 +31,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/NavelRock_SummitPath_4F/map.json b/data/maps/NavelRock_SummitPath_4F/map.json index 525326a31..cb655601a 100644 --- a/data/maps/NavelRock_SummitPath_4F/map.json +++ b/data/maps/NavelRock_SummitPath_4F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_MT_EMBER", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "unknown_18": 0, "unknown_19": 6, @@ -31,4 +31,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/NavelRock_SummitPath_5F/map.json b/data/maps/NavelRock_SummitPath_5F/map.json index 5aeb1faa8..4ff37dd34 100644 --- a/data/maps/NavelRock_SummitPath_5F/map.json +++ b/data/maps/NavelRock_SummitPath_5F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_MT_EMBER", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "unknown_18": 0, "unknown_19": 6, @@ -31,4 +31,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/OneIsland/map.json b/data/maps/OneIsland/map.json index fd8c53409..3a1bc3f42 100644 --- a/data/maps/OneIsland/map.json +++ b/data/maps/OneIsland/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_ISLAND_ONE", "region_map_section": "MAPSEC_ONE_ISLAND", "requires_flash": false, - "weather": "WEATHER_2", + "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_1", "unknown_18": 1, "unknown_19": 6, @@ -111,4 +111,4 @@ "script": "OneIsland_EventScript_16755B" } ] -} \ No newline at end of file +} diff --git a/data/maps/OneIsland_Harbor/map.json b/data/maps/OneIsland_Harbor/map.json index 3bf9f7876..553c9156a 100644 --- a/data/maps/OneIsland_Harbor/map.json +++ b/data/maps/OneIsland_Harbor/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_ISLAND_ONE", "region_map_section": "MAPSEC_ONE_ISLAND", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -51,4 +51,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/OneIsland_House1/map.json b/data/maps/OneIsland_House1/map.json index dd815fcd5..17900e786 100644 --- a/data/maps/OneIsland_House1/map.json +++ b/data/maps/OneIsland_House1/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_ISLAND_ONE", "region_map_section": "MAPSEC_ONE_ISLAND", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -51,4 +51,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/OneIsland_House2/map.json b/data/maps/OneIsland_House2/map.json index 0013b0de3..2eb71606a 100644 --- a/data/maps/OneIsland_House2/map.json +++ b/data/maps/OneIsland_House2/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_ISLAND_ONE", "region_map_section": "MAPSEC_ONE_ISLAND", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -38,4 +38,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/OneIsland_KindleRoad/map.json b/data/maps/OneIsland_KindleRoad/map.json index 375dabd15..b14e36b13 100644 --- a/data/maps/OneIsland_KindleRoad/map.json +++ b/data/maps/OneIsland_KindleRoad/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_ROUTE_3", "region_map_section": "MAPSEC_KINDLE_ROAD", "requires_flash": false, - "weather": "WEATHER_2", + "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "unknown_18": 1, "unknown_19": 6, @@ -437,4 +437,4 @@ "script": "OneIsland_KindleRoad_EventScript_168759" } ] -} \ No newline at end of file +} diff --git a/data/maps/OneIsland_KindleRoad_EmberSpa/map.json b/data/maps/OneIsland_KindleRoad_EmberSpa/map.json index 3045795db..1fc1d1cc4 100644 --- a/data/maps/OneIsland_KindleRoad_EmberSpa/map.json +++ b/data/maps/OneIsland_KindleRoad_EmberSpa/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_CERULEAN_CITY", "region_map_section": "MAPSEC_EMBER_SPA", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "unknown_18": 0, "unknown_19": 6, @@ -113,4 +113,4 @@ } ], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/OneIsland_PokemonCenter_1F/map.json b/data/maps/OneIsland_PokemonCenter_1F/map.json index 381d1f9d4..ae6597955 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/map.json +++ b/data/maps/OneIsland_PokemonCenter_1F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_POKEMON_NETWORK_CENTER", "region_map_section": "MAPSEC_ONE_ISLAND", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -211,4 +211,4 @@ "script": "OneIsland_PokemonCenter_1F_EventScript_171179" } ] -} \ No newline at end of file +} diff --git a/data/maps/OneIsland_PokemonCenter_2F/map.json b/data/maps/OneIsland_PokemonCenter_2F/map.json index f9f5e5c81..f233af596 100644 --- a/data/maps/OneIsland_PokemonCenter_2F/map.json +++ b/data/maps/OneIsland_PokemonCenter_2F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_POKEMON_NETWORK_CENTER", "region_map_section": "MAPSEC_ONE_ISLAND", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -91,4 +91,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/OneIsland_TreasureBeach/map.json b/data/maps/OneIsland_TreasureBeach/map.json index 4dbcb7a74..74517e890 100644 --- a/data/maps/OneIsland_TreasureBeach/map.json +++ b/data/maps/OneIsland_TreasureBeach/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_ROUTE_3", "region_map_section": "MAPSEC_TREASURE_BEACH", "requires_flash": false, - "weather": "WEATHER_2", + "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "unknown_18": 1, "unknown_19": 6, @@ -122,4 +122,4 @@ "unknown": 1 } ] -} \ No newline at end of file +} diff --git a/data/maps/PalletTown/map.json b/data/maps/PalletTown/map.json index 38e88b144..224a99322 100644 --- a/data/maps/PalletTown/map.json +++ b/data/maps/PalletTown/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_PALLET_TOWN", "region_map_section": "MAPSEC_PALLET_TOWN", "requires_flash": false, - "weather": "WEATHER_2", + "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_1", "unknown_18": 1, "unknown_19": 6, @@ -153,4 +153,4 @@ "script": "PalletTown_EventScript_16586B" } ] -} \ No newline at end of file +} diff --git a/data/maps/PalletTown_GarysHouse/map.json b/data/maps/PalletTown_GarysHouse/map.json index 71b380a90..5db9cb1f6 100644 --- a/data/maps/PalletTown_GarysHouse/map.json +++ b/data/maps/PalletTown_GarysHouse/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_PALLET_TOWN", "region_map_section": "MAPSEC_PALLET_TOWN", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -87,4 +87,4 @@ "script": "PalletTown_GarysHouse_EventScript_168F75" } ] -} \ No newline at end of file +} diff --git a/data/maps/PalletTown_PlayersHouse_1F/map.json b/data/maps/PalletTown_PlayersHouse_1F/map.json index a573f0526..3db904de7 100644 --- a/data/maps/PalletTown_PlayersHouse_1F/map.json +++ b/data/maps/PalletTown_PlayersHouse_1F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_PALLET_TOWN", "region_map_section": "MAPSEC_PALLET_TOWN", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -67,4 +67,4 @@ "script": "PalletTown_PlayersHouse_1F_EventScript_168C62" } ] -} \ No newline at end of file +} diff --git a/data/maps/PalletTown_PlayersHouse_2F/map.json b/data/maps/PalletTown_PlayersHouse_2F/map.json index c9c62b631..dd470b406 100644 --- a/data/maps/PalletTown_PlayersHouse_2F/map.json +++ b/data/maps/PalletTown_PlayersHouse_2F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_PALLET_TOWN", "region_map_section": "MAPSEC_PALLET_TOWN", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -46,4 +46,4 @@ "script": "PalletTown_PlayersHouse_2F_EventScript_168CDB" } ] -} \ No newline at end of file +} diff --git a/data/maps/PalletTown_ProfessorOaksLab/map.json b/data/maps/PalletTown_ProfessorOaksLab/map.json index 8e651c9d8..9d74bea9c 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/map.json +++ b/data/maps/PalletTown_ProfessorOaksLab/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_OAK_LAB", "region_map_section": "MAPSEC_PALLET_TOWN", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -253,4 +253,4 @@ "script": "PalletTown_ProfessorOaksLab_EventScript_169E7A" } ] -} \ No newline at end of file +} diff --git a/data/maps/PewterCity/map.json b/data/maps/PewterCity/map.json index 4ac852cdc..4db31c4ce 100644 --- a/data/maps/PewterCity/map.json +++ b/data/maps/PewterCity/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_VIRIDIAN_CITY", "region_map_section": "MAPSEC_PEWTER_CITY", "requires_flash": false, - "weather": "WEATHER_2", + "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_1", "unknown_18": 1, "unknown_19": 6, @@ -278,4 +278,4 @@ "unknown": 1 } ] -} \ No newline at end of file +} diff --git a/data/maps/PewterCity_Gym/map.json b/data/maps/PewterCity_Gym/map.json index 81a12e91f..bd7ae17c2 100644 --- a/data/maps/PewterCity_Gym/map.json +++ b/data/maps/PewterCity_Gym/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_GYM", "region_map_section": "MAPSEC_PEWTER_CITY", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -93,4 +93,4 @@ "script": "PewterCity_Gym_EventScript_16A6AF" } ] -} \ No newline at end of file +} diff --git a/data/maps/PewterCity_House1/map.json b/data/maps/PewterCity_House1/map.json index 941fb3805..cb05ba932 100644 --- a/data/maps/PewterCity_House1/map.json +++ b/data/maps/PewterCity_House1/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_VIRIDIAN_CITY", "region_map_section": "MAPSEC_PEWTER_CITY", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -78,4 +78,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/PewterCity_House2/map.json b/data/maps/PewterCity_House2/map.json index 8b60f9557..368dc049c 100644 --- a/data/maps/PewterCity_House2/map.json +++ b/data/maps/PewterCity_House2/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_VIRIDIAN_CITY", "region_map_section": "MAPSEC_PEWTER_CITY", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -65,4 +65,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/PewterCity_Mart/map.json b/data/maps/PewterCity_Mart/map.json index 7c7f2a616..ba1e82180 100644 --- a/data/maps/PewterCity_Mart/map.json +++ b/data/maps/PewterCity_Mart/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_POKEMON_CENTER", "region_map_section": "MAPSEC_PEWTER_CITY", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -78,4 +78,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/PewterCity_Museum_1F/map.json b/data/maps/PewterCity_Museum_1F/map.json index bfa941559..583d0f0db 100644 --- a/data/maps/PewterCity_Museum_1F/map.json +++ b/data/maps/PewterCity_Museum_1F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_VIRIDIAN_CITY", "region_map_section": "MAPSEC_PEWTER_CITY", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -195,4 +195,4 @@ "script": "PewterCity_Museum_1F_EventScript_1ACE1C" } ] -} \ No newline at end of file +} diff --git a/data/maps/PewterCity_Museum_2F/map.json b/data/maps/PewterCity_Museum_2F/map.json index fc75fdbd7..0fba1289f 100644 --- a/data/maps/PewterCity_Museum_2F/map.json +++ b/data/maps/PewterCity_Museum_2F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_VIRIDIAN_CITY", "region_map_section": "MAPSEC_PEWTER_CITY", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -147,4 +147,4 @@ "script": "PewterCity_Museum_2F_EventScript_16A589" } ] -} \ No newline at end of file +} diff --git a/data/maps/PewterCity_PokemonCenter_1F/map.json b/data/maps/PewterCity_PokemonCenter_1F/map.json index fd244b488..efff5db0c 100644 --- a/data/maps/PewterCity_PokemonCenter_1F/map.json +++ b/data/maps/PewterCity_PokemonCenter_1F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_POKEMON_CENTER", "region_map_section": "MAPSEC_PEWTER_CITY", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -137,4 +137,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/PewterCity_PokemonCenter_2F/map.json b/data/maps/PewterCity_PokemonCenter_2F/map.json index 0b6b59689..f50a1608c 100644 --- a/data/maps/PewterCity_PokemonCenter_2F/map.json +++ b/data/maps/PewterCity_PokemonCenter_2F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_POKEMON_CENTER", "region_map_section": "MAPSEC_PEWTER_CITY", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -91,4 +91,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/PokemonLeague_AgathasRoom/map.json b/data/maps/PokemonLeague_AgathasRoom/map.json index 2f349ed52..84f663e66 100644 --- a/data/maps/PokemonLeague_AgathasRoom/map.json +++ b/data/maps/PokemonLeague_AgathasRoom/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_POKEMON_TOWER", "region_map_section": "MAPSEC_POKEMON_LEAGUE", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -45,4 +45,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/PokemonLeague_BrunosRoom/map.json b/data/maps/PokemonLeague_BrunosRoom/map.json index c2e0209a5..bb94a0bbe 100644 --- a/data/maps/PokemonLeague_BrunosRoom/map.json +++ b/data/maps/PokemonLeague_BrunosRoom/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_ROCKET_HIDEOUT", "region_map_section": "MAPSEC_POKEMON_LEAGUE", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -45,4 +45,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/PokemonLeague_ChampionsRoom/map.json b/data/maps/PokemonLeague_ChampionsRoom/map.json index 5c4da669c..cf1c5bfa2 100644 --- a/data/maps/PokemonLeague_ChampionsRoom/map.json +++ b/data/maps/PokemonLeague_ChampionsRoom/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_INDIGO_PLATEAU", "region_map_section": "MAPSEC_POKEMON_LEAGUE", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -58,4 +58,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/PokemonLeague_HallOfFame/map.json b/data/maps/PokemonLeague_HallOfFame/map.json index c7529d73f..c2b3725fa 100644 --- a/data/maps/PokemonLeague_HallOfFame/map.json +++ b/data/maps/PokemonLeague_HallOfFame/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_HALL_OF_FAME_PALLET_TOWN", "region_map_section": "MAPSEC_POKEMON_LEAGUE", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -38,4 +38,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/PokemonLeague_LancesRoom/map.json b/data/maps/PokemonLeague_LancesRoom/map.json index f1f1a4dc8..c844c29d9 100644 --- a/data/maps/PokemonLeague_LancesRoom/map.json +++ b/data/maps/PokemonLeague_LancesRoom/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_INDIGO_PLATEAU", "region_map_section": "MAPSEC_POKEMON_LEAGUE", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -45,4 +45,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/PokemonLeague_LoreleisRoom/map.json b/data/maps/PokemonLeague_LoreleisRoom/map.json index f853b99ba..33b250e35 100644 --- a/data/maps/PokemonLeague_LoreleisRoom/map.json +++ b/data/maps/PokemonLeague_LoreleisRoom/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_GYM", "region_map_section": "MAPSEC_POKEMON_LEAGUE", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -45,4 +45,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/PokemonMansion_1F/map.json b/data/maps/PokemonMansion_1F/map.json index a1de1c947..fb42651aa 100644 --- a/data/maps/PokemonMansion_1F/map.json +++ b/data/maps/PokemonMansion_1F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_POKEMON_MANSION", "region_map_section": "MAPSEC_POKEMON_MANSION", "requires_flash": false, - "weather": "WEATHER_11", + "weather": "WEATHER_CLOUDY", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 7, @@ -170,4 +170,4 @@ "unknown": 1 } ] -} \ No newline at end of file +} diff --git a/data/maps/PokemonMansion_2F/map.json b/data/maps/PokemonMansion_2F/map.json index edfc69272..685e1dada 100644 --- a/data/maps/PokemonMansion_2F/map.json +++ b/data/maps/PokemonMansion_2F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_POKEMON_MANSION", "region_map_section": "MAPSEC_POKEMON_MANSION", "requires_flash": false, - "weather": "WEATHER_11", + "weather": "WEATHER_CLOUDY", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 7, @@ -127,4 +127,4 @@ "script": "PokemonMansion_2F_EventScript_162278" } ] -} \ No newline at end of file +} diff --git a/data/maps/PokemonMansion_3F/map.json b/data/maps/PokemonMansion_3F/map.json index cabb1dae5..9372efde9 100644 --- a/data/maps/PokemonMansion_3F/map.json +++ b/data/maps/PokemonMansion_3F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_POKEMON_MANSION", "region_map_section": "MAPSEC_POKEMON_MANSION", "requires_flash": false, - "weather": "WEATHER_11", + "weather": "WEATHER_CLOUDY", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 7, @@ -150,4 +150,4 @@ "unknown": 1 } ] -} \ No newline at end of file +} diff --git a/data/maps/PokemonMansion_B1F/map.json b/data/maps/PokemonMansion_B1F/map.json index b12b4fc61..0eac3643d 100644 --- a/data/maps/PokemonMansion_B1F/map.json +++ b/data/maps/PokemonMansion_B1F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_POKEMON_MANSION", "region_map_section": "MAPSEC_POKEMON_MANSION", "requires_flash": false, - "weather": "WEATHER_11", + "weather": "WEATHER_CLOUDY", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 7, @@ -134,4 +134,4 @@ "unknown": 1 } ] -} \ No newline at end of file +} diff --git a/data/maps/PokemonTower_1F/map.json b/data/maps/PokemonTower_1F/map.json index 0a7c0726f..ec5026d87 100644 --- a/data/maps/PokemonTower_1F/map.json +++ b/data/maps/PokemonTower_1F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_POKEMON_TOWER", "region_map_section": "MAPSEC_POKEMON_TOWER", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 5, @@ -111,4 +111,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/PokemonTower_2F/map.json b/data/maps/PokemonTower_2F/map.json index 1d83dc368..bcffe3fee 100644 --- a/data/maps/PokemonTower_2F/map.json +++ b/data/maps/PokemonTower_2F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_POKEMON_TOWER", "region_map_section": "MAPSEC_POKEMON_TOWER", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 5, @@ -77,4 +77,4 @@ } ], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/PokemonTower_3F/map.json b/data/maps/PokemonTower_3F/map.json index e4109d22a..853179061 100644 --- a/data/maps/PokemonTower_3F/map.json +++ b/data/maps/PokemonTower_3F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_POKEMON_TOWER", "region_map_section": "MAPSEC_POKEMON_TOWER", "requires_flash": false, - "weather": "WEATHER_6", + "weather": "WEATHER_FOG_HORIZONTAL", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 5, @@ -84,4 +84,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/PokemonTower_4F/map.json b/data/maps/PokemonTower_4F/map.json index e9262ecba..a1641b4e0 100644 --- a/data/maps/PokemonTower_4F/map.json +++ b/data/maps/PokemonTower_4F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_POKEMON_TOWER", "region_map_section": "MAPSEC_POKEMON_TOWER", "requires_flash": false, - "weather": "WEATHER_6", + "weather": "WEATHER_FOG_HORIZONTAL", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 5, @@ -110,4 +110,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/PokemonTower_5F/map.json b/data/maps/PokemonTower_5F/map.json index e44ded9f5..2609e8dfe 100644 --- a/data/maps/PokemonTower_5F/map.json +++ b/data/maps/PokemonTower_5F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_POKEMON_TOWER", "region_map_section": "MAPSEC_POKEMON_TOWER", "requires_flash": false, - "weather": "WEATHER_6", + "weather": "WEATHER_FOG_HORIZONTAL", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 5, @@ -287,4 +287,4 @@ "unknown": 1 } ] -} \ No newline at end of file +} diff --git a/data/maps/PokemonTower_6F/map.json b/data/maps/PokemonTower_6F/map.json index 8243176bb..ef96f5aa8 100644 --- a/data/maps/PokemonTower_6F/map.json +++ b/data/maps/PokemonTower_6F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_POKEMON_TOWER", "region_map_section": "MAPSEC_POKEMON_TOWER", "requires_flash": false, - "weather": "WEATHER_6", + "weather": "WEATHER_FOG_HORIZONTAL", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 5, @@ -116,4 +116,4 @@ } ], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/PokemonTower_7F/map.json b/data/maps/PokemonTower_7F/map.json index 71ca0d08e..880589588 100644 --- a/data/maps/PokemonTower_7F/map.json +++ b/data/maps/PokemonTower_7F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_POKEMON_TOWER", "region_map_section": "MAPSEC_POKEMON_TOWER", "requires_flash": false, - "weather": "WEATHER_6", + "weather": "WEATHER_FOG_HORIZONTAL", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 5, @@ -87,4 +87,4 @@ "unknown": 129 } ] -} \ No newline at end of file +} diff --git a/data/maps/PowerPlant/map.json b/data/maps/PowerPlant/map.json index bc65392c2..21ffe2703 100644 --- a/data/maps/PowerPlant/map.json +++ b/data/maps/PowerPlant/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_POKEMON_MANSION", "region_map_section": "MAPSEC_POWER_PLANT", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 7, @@ -176,4 +176,4 @@ "unknown": 1 } ] -} \ No newline at end of file +} diff --git a/data/maps/RockTunnel_1F/map.json b/data/maps/RockTunnel_1F/map.json index d1e0c78f6..94d643a8c 100644 --- a/data/maps/RockTunnel_1F/map.json +++ b/data/maps/RockTunnel_1F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_MT_MOON", "region_map_section": "MAPSEC_ROCK_TUNNEL", "requires_flash": true, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "unknown_18": 1, "unknown_19": 7, @@ -198,4 +198,4 @@ "script": "RockTunnel_1F_EventScript_162DE0" } ] -} \ No newline at end of file +} diff --git a/data/maps/RockTunnel_B1F/map.json b/data/maps/RockTunnel_B1F/map.json index 474efd82f..3df881ece 100644 --- a/data/maps/RockTunnel_B1F/map.json +++ b/data/maps/RockTunnel_B1F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_MT_MOON", "region_map_section": "MAPSEC_ROCK_TUNNEL", "requires_flash": true, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "unknown_18": 1, "unknown_19": 7, @@ -384,4 +384,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/RocketHideout_B1F/map.json b/data/maps/RocketHideout_B1F/map.json index 6bcfd6dcb..0513b11d4 100644 --- a/data/maps/RocketHideout_B1F/map.json +++ b/data/maps/RocketHideout_B1F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_ROCKET_HIDEOUT", "region_map_section": "MAPSEC_ROCKET_HIDEOUT", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 7, @@ -161,4 +161,4 @@ "unknown": 1 } ] -} \ No newline at end of file +} diff --git a/data/maps/RocketHideout_B2F/map.json b/data/maps/RocketHideout_B2F/map.json index a5b3bbe4b..55cb6f583 100644 --- a/data/maps/RocketHideout_B2F/map.json +++ b/data/maps/RocketHideout_B2F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_ROCKET_HIDEOUT", "region_map_section": "MAPSEC_ROCKET_HIDEOUT", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 7, @@ -118,4 +118,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/RocketHideout_B3F/map.json b/data/maps/RocketHideout_B3F/map.json index 46a504ca0..5e44100bc 100644 --- a/data/maps/RocketHideout_B3F/map.json +++ b/data/maps/RocketHideout_B3F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_ROCKET_HIDEOUT", "region_map_section": "MAPSEC_ROCKET_HIDEOUT", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 7, @@ -107,4 +107,4 @@ "unknown": 1 } ] -} \ No newline at end of file +} diff --git a/data/maps/RocketHideout_B4F/map.json b/data/maps/RocketHideout_B4F/map.json index 8f28dd94e..fe5dc1de4 100644 --- a/data/maps/RocketHideout_B4F/map.json +++ b/data/maps/RocketHideout_B4F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_ROCKET_HIDEOUT", "region_map_section": "MAPSEC_ROCKET_HIDEOUT", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 7, @@ -175,4 +175,4 @@ "unknown": 1 } ] -} \ No newline at end of file +} diff --git a/data/maps/RocketHideout_Elevator/map.json b/data/maps/RocketHideout_Elevator/map.json index 6b16ec8eb..806a91cda 100644 --- a/data/maps/RocketHideout_Elevator/map.json +++ b/data/maps/RocketHideout_Elevator/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_ROCKET_HIDEOUT", "region_map_section": "MAPSEC_ROCKET_HIDEOUT", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 6, @@ -39,4 +39,4 @@ "script": "RocketHideout_Elevator_EventScript_1614D9" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route1/map.json b/data/maps/Route1/map.json index 8996e5b45..eae0e3eb5 100644 --- a/data/maps/Route1/map.json +++ b/data/maps/Route1/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_ROUTE_1", "region_map_section": "MAPSEC_ROUTE_1", "requires_flash": false, - "weather": "WEATHER_2", + "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "unknown_18": 1, "unknown_19": 6, @@ -62,4 +62,4 @@ "script": "Route1_EventScript_167F5B" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route10/map.json b/data/maps/Route10/map.json index 4314e572c..0038ec3d9 100644 --- a/data/maps/Route10/map.json +++ b/data/maps/Route10/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_ROUTE_3", "region_map_section": "MAPSEC_ROUTE_10", "requires_flash": false, - "weather": "WEATHER_2", + "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "unknown_18": 1, "unknown_19": 6, @@ -261,4 +261,4 @@ "unknown": 1 } ] -} \ No newline at end of file +} diff --git a/data/maps/Route10_PokemonCenter_1F/map.json b/data/maps/Route10_PokemonCenter_1F/map.json index 868607faf..0dcb36f49 100644 --- a/data/maps/Route10_PokemonCenter_1F/map.json +++ b/data/maps/Route10_PokemonCenter_1F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_POKEMON_CENTER", "region_map_section": "MAPSEC_ROUTE_10", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -111,4 +111,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Route10_PokemonCenter_2F/map.json b/data/maps/Route10_PokemonCenter_2F/map.json index 1f185774b..599efb07c 100644 --- a/data/maps/Route10_PokemonCenter_2F/map.json +++ b/data/maps/Route10_PokemonCenter_2F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_POKEMON_CENTER", "region_map_section": "MAPSEC_ROUTE_10", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -91,4 +91,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Route11/map.json b/data/maps/Route11/map.json index 6800fad19..1403fe6de 100644 --- a/data/maps/Route11/map.json +++ b/data/maps/Route11/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_ROUTE_11", "region_map_section": "MAPSEC_ROUTE_11", "requires_flash": false, - "weather": "WEATHER_2", + "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "unknown_18": 1, "unknown_19": 6, @@ -236,4 +236,4 @@ "unknown": 1 } ] -} \ No newline at end of file +} diff --git a/data/maps/Route11_EastEntrance_1F/map.json b/data/maps/Route11_EastEntrance_1F/map.json index 701eef973..a4e6448b4 100644 --- a/data/maps/Route11_EastEntrance_1F/map.json +++ b/data/maps/Route11_EastEntrance_1F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_VERMILION_CITY", "region_map_section": "MAPSEC_ROUTE_11", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 1, "unknown_19": 2, @@ -79,4 +79,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Route11_EastEntrance_2F/map.json b/data/maps/Route11_EastEntrance_2F/map.json index d8867ca6b..c6bdd37f5 100644 --- a/data/maps/Route11_EastEntrance_2F/map.json +++ b/data/maps/Route11_EastEntrance_2F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_VERMILION_CITY", "region_map_section": "MAPSEC_ROUTE_11", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -66,4 +66,4 @@ "script": "Route11_EastEntrance_2F_EventScript_16FD53" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route12/map.json b/data/maps/Route12/map.json index 2b4da6469..76603c9d5 100644 --- a/data/maps/Route12/map.json +++ b/data/maps/Route12/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_ROUTE_11", "region_map_section": "MAPSEC_ROUTE_12", "requires_flash": false, - "weather": "WEATHER_2", + "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "unknown_18": 1, "unknown_19": 6, @@ -286,4 +286,4 @@ "unknown": 1 } ] -} \ No newline at end of file +} diff --git a/data/maps/Route12_FishingHouse/map.json b/data/maps/Route12_FishingHouse/map.json index 016bd3f4f..6628b4966 100644 --- a/data/maps/Route12_FishingHouse/map.json +++ b/data/maps/Route12_FishingHouse/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_CELADON_CITY", "region_map_section": "MAPSEC_ROUTE_12", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -60,4 +60,4 @@ "script": "Route12_FishingHouse_EventScript_170067" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route12_NorthEntrance_1F/map.json b/data/maps/Route12_NorthEntrance_1F/map.json index e712f5608..4eb283e56 100644 --- a/data/maps/Route12_NorthEntrance_1F/map.json +++ b/data/maps/Route12_NorthEntrance_1F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_VIRIDIAN_CITY", "region_map_section": "MAPSEC_ROUTE_12", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 1, "unknown_19": 2, @@ -66,4 +66,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Route12_NorthEntrance_2F/map.json b/data/maps/Route12_NorthEntrance_2F/map.json index 8dd3a5404..b14f95f2c 100644 --- a/data/maps/Route12_NorthEntrance_2F/map.json +++ b/data/maps/Route12_NorthEntrance_2F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_VIRIDIAN_CITY", "region_map_section": "MAPSEC_ROUTE_12", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -53,4 +53,4 @@ "script": "Route12_NorthEntrance_2F_EventScript_16FE81" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route13/map.json b/data/maps/Route13/map.json index 0417505f5..f67b3f3b5 100644 --- a/data/maps/Route13/map.json +++ b/data/maps/Route13/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_ROUTE_11", "region_map_section": "MAPSEC_ROUTE_13", "requires_flash": false, - "weather": "WEATHER_2", + "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "unknown_18": 1, "unknown_19": 6, @@ -202,4 +202,4 @@ "unknown": 1 } ] -} \ No newline at end of file +} diff --git a/data/maps/Route14/map.json b/data/maps/Route14/map.json index cdfb7882e..95ba61886 100644 --- a/data/maps/Route14/map.json +++ b/data/maps/Route14/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_ROUTE_11", "region_map_section": "MAPSEC_ROUTE_14", "requires_flash": false, - "weather": "WEATHER_2", + "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "unknown_18": 1, "unknown_19": 6, @@ -249,4 +249,4 @@ "unknown": 1 } ] -} \ No newline at end of file +} diff --git a/data/maps/Route15/map.json b/data/maps/Route15/map.json index 213b89fdc..84f075445 100644 --- a/data/maps/Route15/map.json +++ b/data/maps/Route15/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_ROUTE_11", "region_map_section": "MAPSEC_ROUTE_15", "requires_flash": false, - "weather": "WEATHER_2", + "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "unknown_18": 1, "unknown_19": 6, @@ -233,4 +233,4 @@ "script": "Route15_EventScript_1680DC" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route15_WestEntrance_1F/map.json b/data/maps/Route15_WestEntrance_1F/map.json index d39ee196e..81896d704 100644 --- a/data/maps/Route15_WestEntrance_1F/map.json +++ b/data/maps/Route15_WestEntrance_1F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_VIRIDIAN_CITY", "region_map_section": "MAPSEC_ROUTE_15", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 1, "unknown_19": 2, @@ -66,4 +66,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Route15_WestEntrance_2F/map.json b/data/maps/Route15_WestEntrance_2F/map.json index 6be75b750..3d72c90e1 100644 --- a/data/maps/Route15_WestEntrance_2F/map.json +++ b/data/maps/Route15_WestEntrance_2F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_VIRIDIAN_CITY", "region_map_section": "MAPSEC_ROUTE_15", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -53,4 +53,4 @@ "script": "Route15_WestEntrance_2F_EventScript_1700B0" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route16/map.json b/data/maps/Route16/map.json index a8dd02f92..50bcad08a 100644 --- a/data/maps/Route16/map.json +++ b/data/maps/Route16/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_ROUTE_3", "region_map_section": "MAPSEC_ROUTE_16", "requires_flash": false, - "weather": "WEATHER_2", + "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "unknown_18": 1, "unknown_19": 6, @@ -218,4 +218,4 @@ "unknown": 129 } ] -} \ No newline at end of file +} diff --git a/data/maps/Route16_House/map.json b/data/maps/Route16_House/map.json index 890b5d9f4..834ef6ef6 100644 --- a/data/maps/Route16_House/map.json +++ b/data/maps/Route16_House/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_CELADON_CITY", "region_map_section": "MAPSEC_ROUTE_16", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -65,4 +65,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Route16_NorthEntrance_1F/map.json b/data/maps/Route16_NorthEntrance_1F/map.json index 1216fc987..bcb49452d 100644 --- a/data/maps/Route16_NorthEntrance_1F/map.json +++ b/data/maps/Route16_NorthEntrance_1F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_VIRIDIAN_CITY", "region_map_section": "MAPSEC_ROUTE_16", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 1, "unknown_19": 2, @@ -179,4 +179,4 @@ } ], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Route16_NorthEntrance_2F/map.json b/data/maps/Route16_NorthEntrance_2F/map.json index e4cdf8626..85d1ccccb 100644 --- a/data/maps/Route16_NorthEntrance_2F/map.json +++ b/data/maps/Route16_NorthEntrance_2F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_VIRIDIAN_CITY", "region_map_section": "MAPSEC_ROUTE_16", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -79,4 +79,4 @@ "script": "Route16_NorthEntrance_2F_EventScript_1702DA" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route17/map.json b/data/maps/Route17/map.json index 3e2049c31..f51773f86 100644 --- a/data/maps/Route17/map.json +++ b/data/maps/Route17/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_ROUTE_3", "region_map_section": "MAPSEC_ROUTE_17", "requires_flash": false, - "weather": "WEATHER_2", + "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "unknown_18": 1, "unknown_19": 6, @@ -246,4 +246,4 @@ "unknown": 1 } ] -} \ No newline at end of file +} diff --git a/data/maps/Route18/map.json b/data/maps/Route18/map.json index 760f31bad..f18809806 100644 --- a/data/maps/Route18/map.json +++ b/data/maps/Route18/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_ROUTE_3", "region_map_section": "MAPSEC_ROUTE_18", "requires_flash": false, - "weather": "WEATHER_2", + "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "unknown_18": 1, "unknown_19": 6, @@ -97,4 +97,4 @@ "script": "Route18_EventScript_16821F" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route18_EastEntrance_1F/map.json b/data/maps/Route18_EastEntrance_1F/map.json index 16286a240..1342a562e 100644 --- a/data/maps/Route18_EastEntrance_1F/map.json +++ b/data/maps/Route18_EastEntrance_1F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_VIRIDIAN_CITY", "region_map_section": "MAPSEC_ROUTE_18", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 1, "unknown_19": 2, @@ -152,4 +152,4 @@ } ], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Route18_EastEntrance_2F/map.json b/data/maps/Route18_EastEntrance_2F/map.json index e304e53f9..c8be7d1e5 100644 --- a/data/maps/Route18_EastEntrance_2F/map.json +++ b/data/maps/Route18_EastEntrance_2F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_VIRIDIAN_CITY", "region_map_section": "MAPSEC_ROUTE_18", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -53,4 +53,4 @@ "script": "Route18_EastEntrance_2F_EventScript_170475" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route19/map.json b/data/maps/Route19/map.json index 055c49371..afa7b3b03 100644 --- a/data/maps/Route19/map.json +++ b/data/maps/Route19/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_ROUTE_3", "region_map_section": "MAPSEC_ROUTE_19", "requires_flash": false, - "weather": "WEATHER_2", + "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "unknown_18": 1, "unknown_19": 6, @@ -192,4 +192,4 @@ "script": "Route19_EventScript_168232" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route2/map.json b/data/maps/Route2/map.json index a8fde02a1..92a7b66e8 100644 --- a/data/maps/Route2/map.json +++ b/data/maps/Route2/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_ROUTE_1", "region_map_section": "MAPSEC_ROUTE_2", "requires_flash": false, - "weather": "WEATHER_2", + "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "unknown_18": 1, "unknown_19": 6, @@ -205,4 +205,4 @@ "script": "Route2_EventScript_167F65" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route20/map.json b/data/maps/Route20/map.json index 80213fc07..86db038c8 100644 --- a/data/maps/Route20/map.json +++ b/data/maps/Route20/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_ROUTE_3", "region_map_section": "MAPSEC_ROUTE_20", "requires_flash": false, - "weather": "WEATHER_2", + "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "unknown_18": 1, "unknown_19": 6, @@ -210,4 +210,4 @@ "unknown": 1 } ] -} \ No newline at end of file +} diff --git a/data/maps/Route21_North/map.json b/data/maps/Route21_North/map.json index 42b87c9bc..1a5a65b84 100644 --- a/data/maps/Route21_North/map.json +++ b/data/maps/Route21_North/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_ROUTE_3", "region_map_section": "MAPSEC_ROUTE_21", "requires_flash": false, - "weather": "WEATHER_2", + "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "unknown_18": 1, "unknown_19": 6, @@ -116,4 +116,4 @@ "unknown": 1 } ] -} \ No newline at end of file +} diff --git a/data/maps/Route21_South/map.json b/data/maps/Route21_South/map.json index 125dc88fc..324dd7ea0 100644 --- a/data/maps/Route21_South/map.json +++ b/data/maps/Route21_South/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_ROUTE_3", "region_map_section": "MAPSEC_ROUTE_21", "requires_flash": false, - "weather": "WEATHER_2", + "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "unknown_18": 1, "unknown_19": 6, @@ -93,4 +93,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Route22/map.json b/data/maps/Route22/map.json index 2acb37549..5b6ea3621 100644 --- a/data/maps/Route22/map.json +++ b/data/maps/Route22/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_ROUTE_3", "region_map_section": "MAPSEC_ROUTE_22", "requires_flash": false, - "weather": "WEATHER_2", + "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "unknown_18": 1, "unknown_19": 6, @@ -119,4 +119,4 @@ "script": "Route22_EventScript_1684E2" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route22_NorthEntrance/map.json b/data/maps/Route22_NorthEntrance/map.json index e68b94f7c..2f341b5fc 100644 --- a/data/maps/Route22_NorthEntrance/map.json +++ b/data/maps/Route22_NorthEntrance/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_VIRIDIAN_FOREST", "region_map_section": "MAPSEC_ROUTE_22", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -69,4 +69,4 @@ } ], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Route23/map.json b/data/maps/Route23/map.json index 924371f26..54238b10e 100644 --- a/data/maps/Route23/map.json +++ b/data/maps/Route23/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_INDIGO_PLATEAU", "region_map_section": "MAPSEC_ROUTE_23", "requires_flash": false, - "weather": "WEATHER_2", + "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "unknown_18": 1, "unknown_19": 6, @@ -607,4 +607,4 @@ "script": "Route23_EventScript_168616" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route24/map.json b/data/maps/Route24/map.json index edc86edb8..f4b8dee3f 100644 --- a/data/maps/Route24/map.json +++ b/data/maps/Route24/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_ROUTE_24", "region_map_section": "MAPSEC_ROUTE_24", "requires_flash": false, - "weather": "WEATHER_2", + "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "unknown_18": 1, "unknown_19": 6, @@ -161,4 +161,4 @@ "unknown": 1 } ] -} \ No newline at end of file +} diff --git a/data/maps/Route25/map.json b/data/maps/Route25/map.json index 4e6baf2be..de4155fe6 100644 --- a/data/maps/Route25/map.json +++ b/data/maps/Route25/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_ROUTE_24", "region_map_section": "MAPSEC_ROUTE_25", "requires_flash": false, - "weather": "WEATHER_2", + "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "unknown_18": 1, "unknown_19": 6, @@ -244,4 +244,4 @@ "unknown": 1 } ] -} \ No newline at end of file +} diff --git a/data/maps/Route25_SeaCottage/map.json b/data/maps/Route25_SeaCottage/map.json index 62edc1927..7777ee3da 100644 --- a/data/maps/Route25_SeaCottage/map.json +++ b/data/maps/Route25_SeaCottage/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_CERULEAN_CITY", "region_map_section": "MAPSEC_ROUTE_25", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -73,4 +73,4 @@ "script": "Route25_SeaCottage_EventScript_1706DD" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route2_EastBuilding/map.json b/data/maps/Route2_EastBuilding/map.json index 97931c051..cf6552f51 100644 --- a/data/maps/Route2_EastBuilding/map.json +++ b/data/maps/Route2_EastBuilding/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_VIRIDIAN_CITY", "region_map_section": "MAPSEC_ROUTE_2", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 1, "unknown_19": 2, @@ -72,4 +72,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Route2_House/map.json b/data/maps/Route2_House/map.json index cbb0eb947..78d88e7e5 100644 --- a/data/maps/Route2_House/map.json +++ b/data/maps/Route2_House/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_VIRIDIAN_CITY", "region_map_section": "MAPSEC_ROUTE_2", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -65,4 +65,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Route2_ViridianForest_NorthEntrance/map.json b/data/maps/Route2_ViridianForest_NorthEntrance/map.json index 271446b94..06dfcb2ad 100644 --- a/data/maps/Route2_ViridianForest_NorthEntrance/map.json +++ b/data/maps/Route2_ViridianForest_NorthEntrance/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_VIRIDIAN_CITY", "region_map_section": "MAPSEC_ROUTE_2", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 1, "unknown_19": 2, @@ -85,4 +85,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Route2_ViridianForest_SouthEntrance/map.json b/data/maps/Route2_ViridianForest_SouthEntrance/map.json index 8dc14d62f..9fcf669d5 100644 --- a/data/maps/Route2_ViridianForest_SouthEntrance/map.json +++ b/data/maps/Route2_ViridianForest_SouthEntrance/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_VIRIDIAN_CITY", "region_map_section": "MAPSEC_ROUTE_2", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 1, "unknown_19": 2, @@ -72,4 +72,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Route3/map.json b/data/maps/Route3/map.json index 01e64cf74..7dd795ed8 100644 --- a/data/maps/Route3/map.json +++ b/data/maps/Route3/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_ROUTE_3", "region_map_section": "MAPSEC_ROUTE_3", "requires_flash": false, - "weather": "WEATHER_2", + "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "unknown_18": 1, "unknown_19": 6, @@ -162,4 +162,4 @@ "unknown": 1 } ] -} \ No newline at end of file +} diff --git a/data/maps/Route4/map.json b/data/maps/Route4/map.json index d7c4363a4..2afb866f2 100644 --- a/data/maps/Route4/map.json +++ b/data/maps/Route4/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_ROUTE_3", "region_map_section": "MAPSEC_ROUTE_4", "requires_flash": false, - "weather": "WEATHER_2", + "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "unknown_18": 1, "unknown_19": 6, @@ -183,4 +183,4 @@ "unknown": 1 } ] -} \ No newline at end of file +} diff --git a/data/maps/Route4_PokemonCenter_1F/map.json b/data/maps/Route4_PokemonCenter_1F/map.json index 51492a5b3..066ee63c6 100644 --- a/data/maps/Route4_PokemonCenter_1F/map.json +++ b/data/maps/Route4_PokemonCenter_1F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_POKEMON_CENTER", "region_map_section": "MAPSEC_ROUTE_4", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -124,4 +124,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Route4_PokemonCenter_2F/map.json b/data/maps/Route4_PokemonCenter_2F/map.json index a601bf6fc..0852a5537 100644 --- a/data/maps/Route4_PokemonCenter_2F/map.json +++ b/data/maps/Route4_PokemonCenter_2F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_POKEMON_CENTER", "region_map_section": "MAPSEC_ROUTE_4", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -91,4 +91,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Route5/map.json b/data/maps/Route5/map.json index b6f8cadef..0c79d7687 100644 --- a/data/maps/Route5/map.json +++ b/data/maps/Route5/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_ROUTE_3", "region_map_section": "MAPSEC_ROUTE_5", "requires_flash": false, - "weather": "WEATHER_2", + "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "unknown_18": 1, "unknown_19": 6, @@ -64,4 +64,4 @@ "script": "Route5_EventScript_167FA8" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route5_PokemonDayCare/map.json b/data/maps/Route5_PokemonDayCare/map.json index 6ea473e4f..18409b100 100644 --- a/data/maps/Route5_PokemonDayCare/map.json +++ b/data/maps/Route5_PokemonDayCare/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_VIRIDIAN_CITY", "region_map_section": "MAPSEC_ROUTE_5", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -52,4 +52,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Route5_SouthEntrance/map.json b/data/maps/Route5_SouthEntrance/map.json index b153ebe11..fe0565acb 100644 --- a/data/maps/Route5_SouthEntrance/map.json +++ b/data/maps/Route5_SouthEntrance/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_VIRIDIAN_CITY", "region_map_section": "MAPSEC_ROUTE_5", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 1, "unknown_19": 2, @@ -87,4 +87,4 @@ } ], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Route6/map.json b/data/maps/Route6/map.json index 13dc779ef..7a1c9b9f1 100644 --- a/data/maps/Route6/map.json +++ b/data/maps/Route6/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_ROUTE_3", "region_map_section": "MAPSEC_ROUTE_6", "requires_flash": false, - "weather": "WEATHER_2", + "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "unknown_18": 1, "unknown_19": 6, @@ -154,4 +154,4 @@ "unknown": 1 } ] -} \ No newline at end of file +} diff --git a/data/maps/Route6_NorthEntrance/map.json b/data/maps/Route6_NorthEntrance/map.json index 99fb33e28..e22d5be5d 100644 --- a/data/maps/Route6_NorthEntrance/map.json +++ b/data/maps/Route6_NorthEntrance/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_VIRIDIAN_CITY", "region_map_section": "MAPSEC_ROUTE_6", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 1, "unknown_19": 2, @@ -87,4 +87,4 @@ } ], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Route7/map.json b/data/maps/Route7/map.json index 2974e7ba8..8c889d5c2 100644 --- a/data/maps/Route7/map.json +++ b/data/maps/Route7/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_ROUTE_3", "region_map_section": "MAPSEC_ROUTE_7", "requires_flash": false, - "weather": "WEATHER_2", + "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "unknown_18": 1, "unknown_19": 6, @@ -73,4 +73,4 @@ "unknown": 1 } ] -} \ No newline at end of file +} diff --git a/data/maps/Route7_EastEntrance/map.json b/data/maps/Route7_EastEntrance/map.json index 618183024..a2c775f2c 100644 --- a/data/maps/Route7_EastEntrance/map.json +++ b/data/maps/Route7_EastEntrance/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_VIRIDIAN_CITY", "region_map_section": "MAPSEC_ROUTE_7", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 1, "unknown_19": 2, @@ -87,4 +87,4 @@ } ], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Route8/map.json b/data/maps/Route8/map.json index cec23d53d..6a5534a2c 100644 --- a/data/maps/Route8/map.json +++ b/data/maps/Route8/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_ROUTE_3", "region_map_section": "MAPSEC_ROUTE_8", "requires_flash": false, - "weather": "WEATHER_2", + "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "unknown_18": 1, "unknown_19": 6, @@ -273,4 +273,4 @@ "unknown": 1 } ] -} \ No newline at end of file +} diff --git a/data/maps/Route8_WestEntrance/map.json b/data/maps/Route8_WestEntrance/map.json index d46acda0f..d9736b5eb 100644 --- a/data/maps/Route8_WestEntrance/map.json +++ b/data/maps/Route8_WestEntrance/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_VIRIDIAN_CITY", "region_map_section": "MAPSEC_ROUTE_8", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 1, "unknown_19": 2, @@ -87,4 +87,4 @@ } ], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Route9/map.json b/data/maps/Route9/map.json index 72877fc69..ec21a527b 100644 --- a/data/maps/Route9/map.json +++ b/data/maps/Route9/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_ROUTE_3", "region_map_section": "MAPSEC_ROUTE_9", "requires_flash": false, - "weather": "WEATHER_2", + "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "unknown_18": 1, "unknown_19": 6, @@ -219,4 +219,4 @@ "unknown": 1 } ] -} \ No newline at end of file +} diff --git a/data/maps/SSAnne_1F_Corridor/map.json b/data/maps/SSAnne_1F_Corridor/map.json index 864ebe0dd..4ba7c113d 100644 --- a/data/maps/SSAnne_1F_Corridor/map.json +++ b/data/maps/SSAnne_1F_Corridor/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 6, @@ -135,4 +135,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SSAnne_1F_Room1/map.json b/data/maps/SSAnne_1F_Room1/map.json index e83821225..c54bbc8de 100644 --- a/data/maps/SSAnne_1F_Room1/map.json +++ b/data/maps/SSAnne_1F_Room1/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 6, @@ -38,4 +38,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SSAnne_1F_Room2/map.json b/data/maps/SSAnne_1F_Room2/map.json index 4649e12ca..81fcf337b 100644 --- a/data/maps/SSAnne_1F_Room2/map.json +++ b/data/maps/SSAnne_1F_Room2/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 6, @@ -77,4 +77,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SSAnne_1F_Room3/map.json b/data/maps/SSAnne_1F_Room3/map.json index b47bf6ddd..1e8b1f145 100644 --- a/data/maps/SSAnne_1F_Room3/map.json +++ b/data/maps/SSAnne_1F_Room3/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 6, @@ -64,4 +64,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SSAnne_1F_Room4/map.json b/data/maps/SSAnne_1F_Room4/map.json index 4a4c62769..56d910b4b 100644 --- a/data/maps/SSAnne_1F_Room4/map.json +++ b/data/maps/SSAnne_1F_Room4/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 6, @@ -38,4 +38,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SSAnne_1F_Room5/map.json b/data/maps/SSAnne_1F_Room5/map.json index d7d2eb16f..c32c962d9 100644 --- a/data/maps/SSAnne_1F_Room5/map.json +++ b/data/maps/SSAnne_1F_Room5/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 6, @@ -38,4 +38,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SSAnne_1F_Room6/map.json b/data/maps/SSAnne_1F_Room6/map.json index 75cc7b348..8dbbe1e1b 100644 --- a/data/maps/SSAnne_1F_Room6/map.json +++ b/data/maps/SSAnne_1F_Room6/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 6, @@ -38,4 +38,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SSAnne_1F_Room7/map.json b/data/maps/SSAnne_1F_Room7/map.json index 0dffef5c4..323374027 100644 --- a/data/maps/SSAnne_1F_Room7/map.json +++ b/data/maps/SSAnne_1F_Room7/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 6, @@ -38,4 +38,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SSAnne_2F_Corridor/map.json b/data/maps/SSAnne_2F_Corridor/map.json index d634f353e..6dcb6a7ee 100644 --- a/data/maps/SSAnne_2F_Corridor/map.json +++ b/data/maps/SSAnne_2F_Corridor/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 6, @@ -135,4 +135,4 @@ } ], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SSAnne_2F_Room1/map.json b/data/maps/SSAnne_2F_Room1/map.json index 2094f497b..10f3c8604 100644 --- a/data/maps/SSAnne_2F_Room1/map.json +++ b/data/maps/SSAnne_2F_Room1/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 6, @@ -38,4 +38,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SSAnne_2F_Room2/map.json b/data/maps/SSAnne_2F_Room2/map.json index c4c95231a..5fe5c9ff2 100644 --- a/data/maps/SSAnne_2F_Room2/map.json +++ b/data/maps/SSAnne_2F_Room2/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 6, @@ -64,4 +64,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SSAnne_2F_Room3/map.json b/data/maps/SSAnne_2F_Room3/map.json index 266e87a29..7241e3d01 100644 --- a/data/maps/SSAnne_2F_Room3/map.json +++ b/data/maps/SSAnne_2F_Room3/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 6, @@ -51,4 +51,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SSAnne_2F_Room4/map.json b/data/maps/SSAnne_2F_Room4/map.json index 9e3a3c62c..54ed72c44 100644 --- a/data/maps/SSAnne_2F_Room4/map.json +++ b/data/maps/SSAnne_2F_Room4/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 6, @@ -64,4 +64,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SSAnne_2F_Room5/map.json b/data/maps/SSAnne_2F_Room5/map.json index 64e5cdac3..3512aa723 100644 --- a/data/maps/SSAnne_2F_Room5/map.json +++ b/data/maps/SSAnne_2F_Room5/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 6, @@ -51,4 +51,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SSAnne_2F_Room6/map.json b/data/maps/SSAnne_2F_Room6/map.json index c64e8a018..7b2d2666e 100644 --- a/data/maps/SSAnne_2F_Room6/map.json +++ b/data/maps/SSAnne_2F_Room6/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 6, @@ -51,4 +51,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SSAnne_3F_Corridor/map.json b/data/maps/SSAnne_3F_Corridor/map.json index e60513ea2..c34977686 100644 --- a/data/maps/SSAnne_3F_Corridor/map.json +++ b/data/maps/SSAnne_3F_Corridor/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 6, @@ -52,4 +52,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SSAnne_B1F_Corridor/map.json b/data/maps/SSAnne_B1F_Corridor/map.json index a0c76bf1d..9accdb250 100644 --- a/data/maps/SSAnne_B1F_Corridor/map.json +++ b/data/maps/SSAnne_B1F_Corridor/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 6, @@ -69,4 +69,4 @@ "unknown": 1 } ] -} \ No newline at end of file +} diff --git a/data/maps/SSAnne_B1F_Room1/map.json b/data/maps/SSAnne_B1F_Room1/map.json index 673c16c67..87ea2dc4c 100644 --- a/data/maps/SSAnne_B1F_Room1/map.json +++ b/data/maps/SSAnne_B1F_Room1/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 6, @@ -51,4 +51,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SSAnne_B1F_Room2/map.json b/data/maps/SSAnne_B1F_Room2/map.json index 2557bf329..0f1d75d5f 100644 --- a/data/maps/SSAnne_B1F_Room2/map.json +++ b/data/maps/SSAnne_B1F_Room2/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 6, @@ -51,4 +51,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SSAnne_B1F_Room3/map.json b/data/maps/SSAnne_B1F_Room3/map.json index 9c6634dd1..bb99ece2f 100644 --- a/data/maps/SSAnne_B1F_Room3/map.json +++ b/data/maps/SSAnne_B1F_Room3/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 6, @@ -51,4 +51,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SSAnne_B1F_Room4/map.json b/data/maps/SSAnne_B1F_Room4/map.json index f8802f3bb..a587f56b3 100644 --- a/data/maps/SSAnne_B1F_Room4/map.json +++ b/data/maps/SSAnne_B1F_Room4/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 6, @@ -51,4 +51,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SSAnne_B1F_Room5/map.json b/data/maps/SSAnne_B1F_Room5/map.json index 0d3ad10c8..0ea2a8747 100644 --- a/data/maps/SSAnne_B1F_Room5/map.json +++ b/data/maps/SSAnne_B1F_Room5/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 6, @@ -64,4 +64,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SSAnne_CaptainsOffice/map.json b/data/maps/SSAnne_CaptainsOffice/map.json index 204ab5a18..9870b5f09 100644 --- a/data/maps/SSAnne_CaptainsOffice/map.json +++ b/data/maps/SSAnne_CaptainsOffice/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 6, @@ -60,4 +60,4 @@ "script": "SSAnne_CaptainsOffice_EventScript_160BD2" } ] -} \ No newline at end of file +} diff --git a/data/maps/SSAnne_Deck/map.json b/data/maps/SSAnne_Deck/map.json index 1ed41546e..d4bf928af 100644 --- a/data/maps/SSAnne_Deck/map.json +++ b/data/maps/SSAnne_Deck/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 6, @@ -97,4 +97,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SSAnne_Exterior/map.json b/data/maps/SSAnne_Exterior/map.json index 8ef5cbc5a..4694c1520 100644 --- a/data/maps/SSAnne_Exterior/map.json +++ b/data/maps/SSAnne_Exterior/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 6, @@ -76,4 +76,4 @@ "unknown": 1 } ] -} \ No newline at end of file +} diff --git a/data/maps/SSAnne_Kitchen/map.json b/data/maps/SSAnne_Kitchen/map.json index bb094e87c..968c8c15c 100644 --- a/data/maps/SSAnne_Kitchen/map.json +++ b/data/maps/SSAnne_Kitchen/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 6, @@ -157,4 +157,4 @@ "unknown": 1 } ] -} \ No newline at end of file +} diff --git a/data/maps/SafariZone_Building1/map.json b/data/maps/SafariZone_Building1/map.json index 09b84bb5b..93f66a692 100644 --- a/data/maps/SafariZone_Building1/map.json +++ b/data/maps/SafariZone_Building1/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_SAFARI_ZONE", "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -65,4 +65,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SafariZone_Building2/map.json b/data/maps/SafariZone_Building2/map.json index 96282855f..178ecdc06 100644 --- a/data/maps/SafariZone_Building2/map.json +++ b/data/maps/SafariZone_Building2/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_SAFARI_ZONE", "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -78,4 +78,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SafariZone_Building3/map.json b/data/maps/SafariZone_Building3/map.json index 47480065a..768e83b94 100644 --- a/data/maps/SafariZone_Building3/map.json +++ b/data/maps/SafariZone_Building3/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_SAFARI_ZONE", "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -91,4 +91,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SafariZone_Building4/map.json b/data/maps/SafariZone_Building4/map.json index 2cfc647cd..0769bd7a2 100644 --- a/data/maps/SafariZone_Building4/map.json +++ b/data/maps/SafariZone_Building4/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_SAFARI_ZONE", "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -78,4 +78,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SafariZone_Center/map.json b/data/maps/SafariZone_Center/map.json index 0ef1fd180..2eec6d8da 100644 --- a/data/maps/SafariZone_Center/map.json +++ b/data/maps/SafariZone_Center/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_SAFARI_ZONE", "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_3", "unknown_18": 1, "unknown_19": 6, @@ -153,4 +153,4 @@ "script": "SafariZone_Center_EventScript_162373" } ] -} \ No newline at end of file +} diff --git a/data/maps/SafariZone_East/map.json b/data/maps/SafariZone_East/map.json index 6f7c8eeb7..23a6d3596 100644 --- a/data/maps/SafariZone_East/map.json +++ b/data/maps/SafariZone_East/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_SAFARI_ZONE", "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_3", "unknown_18": 1, "unknown_19": 6, @@ -141,4 +141,4 @@ "script": "SafariZone_East_EventScript_162386" } ] -} \ No newline at end of file +} diff --git a/data/maps/SafariZone_North/map.json b/data/maps/SafariZone_North/map.json index 4462b8485..f69e86fd5 100644 --- a/data/maps/SafariZone_North/map.json +++ b/data/maps/SafariZone_North/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_SAFARI_ZONE", "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_3", "unknown_18": 1, "unknown_19": 6, @@ -184,4 +184,4 @@ "script": "SafariZone_North_EventScript_162399" } ] -} \ No newline at end of file +} diff --git a/data/maps/SafariZone_SecretHouse/map.json b/data/maps/SafariZone_SecretHouse/map.json index 83c1c7c34..0616c4782 100644 --- a/data/maps/SafariZone_SecretHouse/map.json +++ b/data/maps/SafariZone_SecretHouse/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_SAFARI_ZONE", "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -52,4 +52,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SafariZone_West/map.json b/data/maps/SafariZone_West/map.json index 9945f2516..e91ecd175 100644 --- a/data/maps/SafariZone_West/map.json +++ b/data/maps/SafariZone_West/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_SAFARI_ZONE", "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_3", "unknown_18": 1, "unknown_19": 6, @@ -185,4 +185,4 @@ "unknown": 1 } ] -} \ No newline at end of file +} diff --git a/data/maps/SaffronCity/map.json b/data/maps/SaffronCity/map.json index b705126ff..f86012a9a 100644 --- a/data/maps/SaffronCity/map.json +++ b/data/maps/SaffronCity/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_VIRIDIAN_CITY", "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, - "weather": "WEATHER_2", + "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_1", "unknown_18": 1, "unknown_19": 6, @@ -37,4 +37,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SaffronCity_Dojo/map.json b/data/maps/SaffronCity_Dojo/map.json index bbbbcaa96..a8d80bb8e 100644 --- a/data/maps/SaffronCity_Dojo/map.json +++ b/data/maps/SaffronCity_Dojo/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_VIRIDIAN_CITY", "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -178,4 +178,4 @@ "script": "SaffronCity_Dojo_EventScript_16ED3D" } ] -} \ No newline at end of file +} diff --git a/data/maps/SaffronCity_Duplicate/map.json b/data/maps/SaffronCity_Duplicate/map.json index 0dc64583f..06bcbfd01 100644 --- a/data/maps/SaffronCity_Duplicate/map.json +++ b/data/maps/SaffronCity_Duplicate/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_VIRIDIAN_CITY", "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, - "weather": "WEATHER_2", + "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_1", "unknown_18": 1, "unknown_19": 6, @@ -404,4 +404,4 @@ "script": "SaffronCity_Duplicate_EventScript_16747A" } ] -} \ No newline at end of file +} diff --git a/data/maps/SaffronCity_Gym/map.json b/data/maps/SaffronCity_Gym/map.json index 96f9f5ee3..8b27fea95 100644 --- a/data/maps/SaffronCity_Gym/map.json +++ b/data/maps/SaffronCity_Gym/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_GYM", "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 1, @@ -381,4 +381,4 @@ "script": "SaffronCity_Gym_EventScript_16EF55" } ] -} \ No newline at end of file +} diff --git a/data/maps/SaffronCity_House1_1F/map.json b/data/maps/SaffronCity_House1_1F/map.json index b48e123b6..20fca424a 100644 --- a/data/maps/SaffronCity_House1_1F/map.json +++ b/data/maps/SaffronCity_House1_1F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_VIRIDIAN_CITY", "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -85,4 +85,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SaffronCity_House1_2F/map.json b/data/maps/SaffronCity_House1_2F/map.json index ab0e164f9..3a1d497f9 100644 --- a/data/maps/SaffronCity_House1_2F/map.json +++ b/data/maps/SaffronCity_House1_2F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_VIRIDIAN_CITY", "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -101,4 +101,4 @@ "unknown": 1 } ] -} \ No newline at end of file +} diff --git a/data/maps/SaffronCity_House2/map.json b/data/maps/SaffronCity_House2/map.json index de11d7982..81cbaddb9 100644 --- a/data/maps/SaffronCity_House2/map.json +++ b/data/maps/SaffronCity_House2/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_VIRIDIAN_CITY", "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -99,4 +99,4 @@ "script": "SaffronCity_House2_EventScript_16EF99" } ] -} \ No newline at end of file +} diff --git a/data/maps/SaffronCity_House3/map.json b/data/maps/SaffronCity_House3/map.json index eda6fe9fc..be9412971 100644 --- a/data/maps/SaffronCity_House3/map.json +++ b/data/maps/SaffronCity_House3/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_VIRIDIAN_CITY", "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -52,4 +52,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SaffronCity_Mart/map.json b/data/maps/SaffronCity_Mart/map.json index 00e191a94..b2882fff3 100644 --- a/data/maps/SaffronCity_Mart/map.json +++ b/data/maps/SaffronCity_Mart/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_POKEMON_CENTER", "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -78,4 +78,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SaffronCity_PokemonCenter_1F/map.json b/data/maps/SaffronCity_PokemonCenter_1F/map.json index 46de82e0c..2e26f7368 100644 --- a/data/maps/SaffronCity_PokemonCenter_1F/map.json +++ b/data/maps/SaffronCity_PokemonCenter_1F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_POKEMON_CENTER", "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -124,4 +124,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SaffronCity_PokemonCenter_2F/map.json b/data/maps/SaffronCity_PokemonCenter_2F/map.json index a79fb8efd..303a60ce7 100644 --- a/data/maps/SaffronCity_PokemonCenter_2F/map.json +++ b/data/maps/SaffronCity_PokemonCenter_2F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_POKEMON_CENTER", "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -91,4 +91,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/map.json b/data/maps/SaffronCity_PokemonTrainerFanClub/map.json index 0403a7806..875585c68 100644 --- a/data/maps/SaffronCity_PokemonTrainerFanClub/map.json +++ b/data/maps/SaffronCity_PokemonTrainerFanClub/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_VIRIDIAN_CITY", "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -155,4 +155,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SeafoamIslands_1F/map.json b/data/maps/SeafoamIslands_1F/map.json index cdf4bcd0a..c2927eef5 100644 --- a/data/maps/SeafoamIslands_1F/map.json +++ b/data/maps/SeafoamIslands_1F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_VIRIDIAN_FOREST", "region_map_section": "MAPSEC_SEAFOAM_ISLANDS", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "unknown_18": 1, "unknown_19": 7, @@ -106,4 +106,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SeafoamIslands_B1F/map.json b/data/maps/SeafoamIslands_B1F/map.json index 94c850eb0..161ba065c 100644 --- a/data/maps/SeafoamIslands_B1F/map.json +++ b/data/maps/SeafoamIslands_B1F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_VIRIDIAN_FOREST", "region_map_section": "MAPSEC_SEAFOAM_ISLANDS", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "unknown_18": 1, "unknown_19": 7, @@ -147,4 +147,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SeafoamIslands_B2F/map.json b/data/maps/SeafoamIslands_B2F/map.json index bb614f803..b4984b189 100644 --- a/data/maps/SeafoamIslands_B2F/map.json +++ b/data/maps/SeafoamIslands_B2F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_VIRIDIAN_FOREST", "region_map_section": "MAPSEC_SEAFOAM_ISLANDS", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "unknown_18": 1, "unknown_19": 7, @@ -134,4 +134,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SeafoamIslands_B3F/map.json b/data/maps/SeafoamIslands_B3F/map.json index b9e12e16b..06815d1da 100644 --- a/data/maps/SeafoamIslands_B3F/map.json +++ b/data/maps/SeafoamIslands_B3F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_VIRIDIAN_FOREST", "region_map_section": "MAPSEC_SEAFOAM_ISLANDS", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "unknown_18": 1, "unknown_19": 7, @@ -169,4 +169,4 @@ "unknown": 1 } ] -} \ No newline at end of file +} diff --git a/data/maps/SeafoamIslands_B4F/map.json b/data/maps/SeafoamIslands_B4F/map.json index 64a6719d7..6f3a99b06 100644 --- a/data/maps/SeafoamIslands_B4F/map.json +++ b/data/maps/SeafoamIslands_B4F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_VIRIDIAN_FOREST", "region_map_section": "MAPSEC_SEAFOAM_ISLANDS", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "unknown_18": 1, "unknown_19": 7, @@ -150,4 +150,4 @@ "script": "SeafoamIslands_B4F_EventScript_163223" } ] -} \ No newline at end of file +} diff --git a/data/maps/SevenIsland/map.json b/data/maps/SevenIsland/map.json index dd9a59fa6..003bd5192 100644 --- a/data/maps/SevenIsland/map.json +++ b/data/maps/SevenIsland/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_ISLAND_SIX", "region_map_section": "MAPSEC_SEVEN_ISLAND", "requires_flash": false, - "weather": "WEATHER_2", + "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_1", "unknown_18": 1, "unknown_19": 6, @@ -104,4 +104,4 @@ "script": "SevenIsland_EventScript_167EBD" } ] -} \ No newline at end of file +} diff --git a/data/maps/SevenIsland_Harbor/map.json b/data/maps/SevenIsland_Harbor/map.json index af0fce3fb..df4507662 100644 --- a/data/maps/SevenIsland_Harbor/map.json +++ b/data/maps/SevenIsland_Harbor/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_ISLAND_SIX", "region_map_section": "MAPSEC_SEVEN_ISLAND", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -51,4 +51,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SevenIsland_House_Room1/map.json b/data/maps/SevenIsland_House_Room1/map.json index 50b67816d..f7181d41f 100644 --- a/data/maps/SevenIsland_House_Room1/map.json +++ b/data/maps/SevenIsland_House_Room1/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_ISLAND_SIX", "region_map_section": "MAPSEC_SEVEN_ISLAND", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -53,4 +53,4 @@ "script": "SevenIsland_House_Room1_EventScript_170A75" } ] -} \ No newline at end of file +} diff --git a/data/maps/SevenIsland_House_Room2/map.json b/data/maps/SevenIsland_House_Room2/map.json index 890afc5e4..474d071d5 100644 --- a/data/maps/SevenIsland_House_Room2/map.json +++ b/data/maps/SevenIsland_House_Room2/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_ISLAND_SIX", "region_map_section": "MAPSEC_SEVEN_ISLAND", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -38,4 +38,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SevenIsland_Mart/map.json b/data/maps/SevenIsland_Mart/map.json index 452e6e8b4..4d4be3485 100644 --- a/data/maps/SevenIsland_Mart/map.json +++ b/data/maps/SevenIsland_Mart/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_POKEMON_CENTER", "region_map_section": "MAPSEC_SEVEN_ISLAND", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -77,4 +77,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SevenIsland_PokemonCenter_1F/map.json b/data/maps/SevenIsland_PokemonCenter_1F/map.json index 4dfee823f..9cf243db6 100644 --- a/data/maps/SevenIsland_PokemonCenter_1F/map.json +++ b/data/maps/SevenIsland_PokemonCenter_1F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_POKEMON_CENTER", "region_map_section": "MAPSEC_SEVEN_ISLAND", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -110,4 +110,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SevenIsland_PokemonCenter_2F/map.json b/data/maps/SevenIsland_PokemonCenter_2F/map.json index baca4a4c0..e7d48f819 100644 --- a/data/maps/SevenIsland_PokemonCenter_2F/map.json +++ b/data/maps/SevenIsland_PokemonCenter_2F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_POKEMON_CENTER", "region_map_section": "MAPSEC_SEVEN_ISLAND", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -91,4 +91,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/map.json b/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/map.json index ba4e6386b..fe1f030fd 100644 --- a/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/map.json +++ b/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_TANOBY_RUINS", "region_map_section": "MAPSEC_TANOBY_KEY", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "unknown_18": 1, "unknown_19": 7, @@ -180,4 +180,4 @@ } ], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SevenIsland_SevaultCanyon/map.json b/data/maps/SevenIsland_SevaultCanyon/map.json index a896d334d..fbdaec45b 100644 --- a/data/maps/SevenIsland_SevaultCanyon/map.json +++ b/data/maps/SevenIsland_SevaultCanyon/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_SEVII_ISLANDS", "region_map_section": "MAPSEC_SEVAULT_CANYON", "requires_flash": false, - "weather": "WEATHER_2", + "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "unknown_18": 1, "unknown_19": 6, @@ -320,4 +320,4 @@ "script": "SevenIsland_SevaultCanyon_EventScript_168BFE" } ] -} \ No newline at end of file +} diff --git a/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json b/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json index 4975264fe..6011ec09d 100644 --- a/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_SEVII_ISLANDS", "region_map_section": "MAPSEC_CANYON_ENTRANCE", "requires_flash": false, - "weather": "WEATHER_2", + "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "unknown_18": 1, "unknown_19": 6, @@ -136,4 +136,4 @@ "script": "SevenIsland_SevaultCanyon_Entrance_EventScript_168BF4" } ] -} \ No newline at end of file +} diff --git a/data/maps/SevenIsland_SevaultCanyon_House/map.json b/data/maps/SevenIsland_SevaultCanyon_House/map.json index 21f0ae7fe..a1a85b829 100644 --- a/data/maps/SevenIsland_SevaultCanyon_House/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_House/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_ISLAND_SIX", "region_map_section": "MAPSEC_SEVAULT_CANYON", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -64,4 +64,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SevenIsland_TanobyRuins/map.json b/data/maps/SevenIsland_TanobyRuins/map.json index 33c2fb842..1659d862d 100644 --- a/data/maps/SevenIsland_TanobyRuins/map.json +++ b/data/maps/SevenIsland_TanobyRuins/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_SEVII_ISLANDS", "region_map_section": "MAPSEC_TANOBY_RUINS", "requires_flash": false, - "weather": "WEATHER_2", + "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "unknown_18": 1, "unknown_19": 6, @@ -162,4 +162,4 @@ "unknown": 1 } ] -} \ No newline at end of file +} diff --git a/data/maps/SevenIsland_TanobyRuins_DilfordChamber/map.json b/data/maps/SevenIsland_TanobyRuins_DilfordChamber/map.json index 3b00c0be4..7347361dc 100644 --- a/data/maps/SevenIsland_TanobyRuins_DilfordChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_DilfordChamber/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_TANOBY_RUINS", "region_map_section": "MAPSEC_DILFORD_CHAMBER", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "unknown_18": 1, "unknown_19": 7, @@ -24,4 +24,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SevenIsland_TanobyRuins_LiptooChamber/map.json b/data/maps/SevenIsland_TanobyRuins_LiptooChamber/map.json index 9bb534692..42e25a9bd 100644 --- a/data/maps/SevenIsland_TanobyRuins_LiptooChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_LiptooChamber/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_TANOBY_RUINS", "region_map_section": "MAPSEC_LIPTOO_CHAMBER", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "unknown_18": 1, "unknown_19": 7, @@ -24,4 +24,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SevenIsland_TanobyRuins_MoneanChamber/map.json b/data/maps/SevenIsland_TanobyRuins_MoneanChamber/map.json index 706cf4907..1bdee8840 100644 --- a/data/maps/SevenIsland_TanobyRuins_MoneanChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_MoneanChamber/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_TANOBY_RUINS", "region_map_section": "MAPSEC_MONEAN_CHAMBER", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "unknown_18": 1, "unknown_19": 7, @@ -24,4 +24,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SevenIsland_TanobyRuins_RixyChamber/map.json b/data/maps/SevenIsland_TanobyRuins_RixyChamber/map.json index e92f18cba..af7181502 100644 --- a/data/maps/SevenIsland_TanobyRuins_RixyChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_RixyChamber/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_TANOBY_RUINS", "region_map_section": "MAPSEC_RIXY_CHAMBER", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "unknown_18": 1, "unknown_19": 7, @@ -24,4 +24,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SevenIsland_TanobyRuins_ScufibChamber/map.json b/data/maps/SevenIsland_TanobyRuins_ScufibChamber/map.json index 03ca8f69a..58fa3d18c 100644 --- a/data/maps/SevenIsland_TanobyRuins_ScufibChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_ScufibChamber/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_TANOBY_RUINS", "region_map_section": "MAPSEC_SCUFIB_CHAMBER", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "unknown_18": 1, "unknown_19": 7, @@ -24,4 +24,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/map.json b/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/map.json index 9f99b7b99..90cf4bd82 100644 --- a/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_TANOBY_RUINS", "region_map_section": "MAPSEC_VIAPOIS_CHAMBER", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "unknown_18": 1, "unknown_19": 7, @@ -24,4 +24,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SevenIsland_TanobyRuins_WeepthChamber/map.json b/data/maps/SevenIsland_TanobyRuins_WeepthChamber/map.json index 85294ca41..542f8f61e 100644 --- a/data/maps/SevenIsland_TanobyRuins_WeepthChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_WeepthChamber/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_TANOBY_RUINS", "region_map_section": "MAPSEC_WEEPTH_CHAMBER", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "unknown_18": 1, "unknown_19": 7, @@ -24,4 +24,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SevenIsland_TrainerTower/map.json b/data/maps/SevenIsland_TrainerTower/map.json index 3b7aa0b8a..3c509950e 100644 --- a/data/maps/SevenIsland_TrainerTower/map.json +++ b/data/maps/SevenIsland_TrainerTower/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_SEVII_ISLANDS", "region_map_section": "MAPSEC_TRAINER_TOWER", "requires_flash": false, - "weather": "WEATHER_2", + "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "unknown_18": 1, "unknown_19": 6, @@ -99,4 +99,4 @@ "script": "SevenIsland_TrainerTower_EventScript_168BEA" } ] -} \ No newline at end of file +} diff --git a/data/maps/SevenIsland_TrainerTower_1F/map.json b/data/maps/SevenIsland_TrainerTower_1F/map.json index 85be6d070..f894c679f 100644 --- a/data/maps/SevenIsland_TrainerTower_1F/map.json +++ b/data/maps/SevenIsland_TrainerTower_1F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_TRAINER_TOWER", "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 2, @@ -125,4 +125,4 @@ } ], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SevenIsland_TrainerTower_2F/map.json b/data/maps/SevenIsland_TrainerTower_2F/map.json index 8df192771..1af583fc9 100644 --- a/data/maps/SevenIsland_TrainerTower_2F/map.json +++ b/data/maps/SevenIsland_TrainerTower_2F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_TRAINER_TOWER", "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 2, @@ -132,4 +132,4 @@ } ], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SevenIsland_TrainerTower_3F/map.json b/data/maps/SevenIsland_TrainerTower_3F/map.json index 4e4b1c06b..1ada6e08b 100644 --- a/data/maps/SevenIsland_TrainerTower_3F/map.json +++ b/data/maps/SevenIsland_TrainerTower_3F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_TRAINER_TOWER", "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 2, @@ -132,4 +132,4 @@ } ], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SevenIsland_TrainerTower_4F/map.json b/data/maps/SevenIsland_TrainerTower_4F/map.json index 59aca5b37..e16cdcc95 100644 --- a/data/maps/SevenIsland_TrainerTower_4F/map.json +++ b/data/maps/SevenIsland_TrainerTower_4F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_TRAINER_TOWER", "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 2, @@ -132,4 +132,4 @@ } ], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SevenIsland_TrainerTower_5F/map.json b/data/maps/SevenIsland_TrainerTower_5F/map.json index 4e08a33b4..d30f293c6 100644 --- a/data/maps/SevenIsland_TrainerTower_5F/map.json +++ b/data/maps/SevenIsland_TrainerTower_5F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_TRAINER_TOWER", "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 2, @@ -132,4 +132,4 @@ } ], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SevenIsland_TrainerTower_6F/map.json b/data/maps/SevenIsland_TrainerTower_6F/map.json index c548fa61a..03436ecc9 100644 --- a/data/maps/SevenIsland_TrainerTower_6F/map.json +++ b/data/maps/SevenIsland_TrainerTower_6F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_TRAINER_TOWER", "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 2, @@ -132,4 +132,4 @@ } ], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SevenIsland_TrainerTower_7F/map.json b/data/maps/SevenIsland_TrainerTower_7F/map.json index 90eb22605..cc738186e 100644 --- a/data/maps/SevenIsland_TrainerTower_7F/map.json +++ b/data/maps/SevenIsland_TrainerTower_7F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_TRAINER_TOWER", "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 2, @@ -132,4 +132,4 @@ } ], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SevenIsland_TrainerTower_8F/map.json b/data/maps/SevenIsland_TrainerTower_8F/map.json index cac6bbb6c..bcf7ce583 100644 --- a/data/maps/SevenIsland_TrainerTower_8F/map.json +++ b/data/maps/SevenIsland_TrainerTower_8F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_TRAINER_TOWER", "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 2, @@ -132,4 +132,4 @@ } ], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SevenIsland_TrainerTower_Elevator/map.json b/data/maps/SevenIsland_TrainerTower_Elevator/map.json index 0525e1da2..a1130c118 100644 --- a/data/maps/SevenIsland_TrainerTower_Elevator/map.json +++ b/data/maps/SevenIsland_TrainerTower_Elevator/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_TRAINER_TOWER", "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 2, @@ -32,4 +32,4 @@ "script": "SevenIsland_TrainerTower_Elevator_EventScript_164B03" } ] -} \ No newline at end of file +} diff --git a/data/maps/SevenIsland_TrainerTower_Lobby/map.json b/data/maps/SevenIsland_TrainerTower_Lobby/map.json index fcda1fb2e..d65c41577 100644 --- a/data/maps/SevenIsland_TrainerTower_Lobby/map.json +++ b/data/maps/SevenIsland_TrainerTower_Lobby/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_TRAINER_TOWER", "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 2, @@ -122,4 +122,4 @@ "script": "SevenIsland_TrainerTower_Lobby_EventScript_164AD8" } ] -} \ No newline at end of file +} diff --git a/data/maps/SevenIsland_TrainerTower_Roof/map.json b/data/maps/SevenIsland_TrainerTower_Roof/map.json index 23e94c0be..b8f8f858b 100644 --- a/data/maps/SevenIsland_TrainerTower_Roof/map.json +++ b/data/maps/SevenIsland_TrainerTower_Roof/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_TRAINER_TOWER", "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 2, @@ -45,4 +45,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SilphCo_10F/map.json b/data/maps/SilphCo_10F/map.json index d921ece8a..51dcc5ee6 100644 --- a/data/maps/SilphCo_10F/map.json +++ b/data/maps/SilphCo_10F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_SILPH", "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 7, @@ -183,4 +183,4 @@ "script": "SilphCo_10F_EventScript_161DB7" } ] -} \ No newline at end of file +} diff --git a/data/maps/SilphCo_11F/map.json b/data/maps/SilphCo_11F/map.json index 5f9090f8b..1d479e041 100644 --- a/data/maps/SilphCo_11F/map.json +++ b/data/maps/SilphCo_11F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_SILPH", "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 7, @@ -181,4 +181,4 @@ "script": "SilphCo_11F_EventScript_161F37" } ] -} \ No newline at end of file +} diff --git a/data/maps/SilphCo_1F/map.json b/data/maps/SilphCo_1F/map.json index 5cf3e4082..325cef8b5 100644 --- a/data/maps/SilphCo_1F/map.json +++ b/data/maps/SilphCo_1F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_SILPH", "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 7, @@ -74,4 +74,4 @@ "script": "SilphCo_1F_EventScript_161638" } ] -} \ No newline at end of file +} diff --git a/data/maps/SilphCo_2F/map.json b/data/maps/SilphCo_2F/map.json index 5e1d73414..51d1ba7a6 100644 --- a/data/maps/SilphCo_2F/map.json +++ b/data/maps/SilphCo_2F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_SILPH", "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 7, @@ -205,4 +205,4 @@ "script": "SilphCo_2F_EventScript_161660" } ] -} \ No newline at end of file +} diff --git a/data/maps/SilphCo_3F/map.json b/data/maps/SilphCo_3F/map.json index e1466fec7..b900dd5dd 100644 --- a/data/maps/SilphCo_3F/map.json +++ b/data/maps/SilphCo_3F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_SILPH", "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 7, @@ -213,4 +213,4 @@ "script": "SilphCo_3F_EventScript_1616FF" } ] -} \ No newline at end of file +} diff --git a/data/maps/SilphCo_4F/map.json b/data/maps/SilphCo_4F/map.json index 080c7162a..04966c66f 100644 --- a/data/maps/SilphCo_4F/map.json +++ b/data/maps/SilphCo_4F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_SILPH", "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 7, @@ -244,4 +244,4 @@ "script": "SilphCo_4F_EventScript_161770" } ] -} \ No newline at end of file +} diff --git a/data/maps/SilphCo_5F/map.json b/data/maps/SilphCo_5F/map.json index 3ad8ee8df..b3f512516 100644 --- a/data/maps/SilphCo_5F/map.json +++ b/data/maps/SilphCo_5F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_SILPH", "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 7, @@ -315,4 +315,4 @@ "script": "SilphCo_5F_EventScript_16181C" } ] -} \ No newline at end of file +} diff --git a/data/maps/SilphCo_6F/map.json b/data/maps/SilphCo_6F/map.json index c1db9b3c1..c9c1b2f09 100644 --- a/data/maps/SilphCo_6F/map.json +++ b/data/maps/SilphCo_6F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_SILPH", "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 7, @@ -228,4 +228,4 @@ "script": "SilphCo_6F_EventScript_161936" } ] -} \ No newline at end of file +} diff --git a/data/maps/SilphCo_7F/map.json b/data/maps/SilphCo_7F/map.json index 575558327..36f2d0ba7 100644 --- a/data/maps/SilphCo_7F/map.json +++ b/data/maps/SilphCo_7F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_SILPH", "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 7, @@ -323,4 +323,4 @@ "script": "SilphCo_7F_EventScript_161BFA" } ] -} \ No newline at end of file +} diff --git a/data/maps/SilphCo_8F/map.json b/data/maps/SilphCo_8F/map.json index 763c9284b..9c23aac86 100644 --- a/data/maps/SilphCo_8F/map.json +++ b/data/maps/SilphCo_8F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_SILPH", "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 7, @@ -190,4 +190,4 @@ "script": "SilphCo_8F_EventScript_161C90" } ] -} \ No newline at end of file +} diff --git a/data/maps/SilphCo_9F/map.json b/data/maps/SilphCo_9F/map.json index 5e50d24ca..05bbe1138 100644 --- a/data/maps/SilphCo_9F/map.json +++ b/data/maps/SilphCo_9F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_SILPH", "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 7, @@ -243,4 +243,4 @@ "script": "SilphCo_9F_EventScript_161D38" } ] -} \ No newline at end of file +} diff --git a/data/maps/SilphCo_Elevator/map.json b/data/maps/SilphCo_Elevator/map.json index a1208a5d8..be61c86d2 100644 --- a/data/maps/SilphCo_Elevator/map.json +++ b/data/maps/SilphCo_Elevator/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_SILPH", "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 6, @@ -32,4 +32,4 @@ "script": "SilphCo_Elevator_EventScript_161F6F" } ] -} \ No newline at end of file +} diff --git a/data/maps/SixIsland/map.json b/data/maps/SixIsland/map.json index 0f5344713..f65e61afd 100644 --- a/data/maps/SixIsland/map.json +++ b/data/maps/SixIsland/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_ISLAND_SIX", "region_map_section": "MAPSEC_SIX_ISLAND", "requires_flash": false, - "weather": "WEATHER_2", + "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_1", "unknown_18": 1, "unknown_19": 6, @@ -95,4 +95,4 @@ "unknown": 1 } ] -} \ No newline at end of file +} diff --git a/data/maps/SixIsland_AlteringCave/map.json b/data/maps/SixIsland_AlteringCave/map.json index 123c8e6bb..c5376d59d 100644 --- a/data/maps/SixIsland_AlteringCave/map.json +++ b/data/maps/SixIsland_AlteringCave/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_MT_EMBER", "region_map_section": "MAPSEC_ALTERING_CAVE", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "unknown_18": 1, "unknown_19": 7, @@ -24,4 +24,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SixIsland_DottedHole_1F/map.json b/data/maps/SixIsland_DottedHole_1F/map.json index 3edfe625f..bd7bb4933 100644 --- a/data/maps/SixIsland_DottedHole_1F/map.json +++ b/data/maps/SixIsland_DottedHole_1F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_TANOBY_RUINS", "region_map_section": "MAPSEC_DOTTED_HOLE", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "unknown_18": 1, "unknown_19": 7, @@ -45,4 +45,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SixIsland_DottedHole_B1F/map.json b/data/maps/SixIsland_DottedHole_B1F/map.json index 221b7f31a..497bde584 100644 --- a/data/maps/SixIsland_DottedHole_B1F/map.json +++ b/data/maps/SixIsland_DottedHole_B1F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_TANOBY_RUINS", "region_map_section": "MAPSEC_DOTTED_HOLE", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "unknown_18": 1, "unknown_19": 7, @@ -60,4 +60,4 @@ "script": "SixIsland_DottedHole_B1F_EventScript_16418C" } ] -} \ No newline at end of file +} diff --git a/data/maps/SixIsland_DottedHole_B2F/map.json b/data/maps/SixIsland_DottedHole_B2F/map.json index 7c43b1177..c01e689f5 100644 --- a/data/maps/SixIsland_DottedHole_B2F/map.json +++ b/data/maps/SixIsland_DottedHole_B2F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_TANOBY_RUINS", "region_map_section": "MAPSEC_DOTTED_HOLE", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "unknown_18": 1, "unknown_19": 7, @@ -60,4 +60,4 @@ "script": "SixIsland_DottedHole_B2F_EventScript_1641A7" } ] -} \ No newline at end of file +} diff --git a/data/maps/SixIsland_DottedHole_B3F/map.json b/data/maps/SixIsland_DottedHole_B3F/map.json index dddb7b32c..97bf261ca 100644 --- a/data/maps/SixIsland_DottedHole_B3F/map.json +++ b/data/maps/SixIsland_DottedHole_B3F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_TANOBY_RUINS", "region_map_section": "MAPSEC_DOTTED_HOLE", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "unknown_18": 1, "unknown_19": 7, @@ -60,4 +60,4 @@ "script": "SixIsland_DottedHole_B3F_EventScript_16419E" } ] -} \ No newline at end of file +} diff --git a/data/maps/SixIsland_DottedHole_B4F/map.json b/data/maps/SixIsland_DottedHole_B4F/map.json index 5d187df80..f418ee608 100644 --- a/data/maps/SixIsland_DottedHole_B4F/map.json +++ b/data/maps/SixIsland_DottedHole_B4F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_TANOBY_RUINS", "region_map_section": "MAPSEC_DOTTED_HOLE", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "unknown_18": 1, "unknown_19": 7, @@ -60,4 +60,4 @@ "script": "SixIsland_DottedHole_B4F_EventScript_164195" } ] -} \ No newline at end of file +} diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/map.json b/data/maps/SixIsland_DottedHole_SapphireRoom/map.json index 08894ae8c..db1a1715a 100644 --- a/data/maps/SixIsland_DottedHole_SapphireRoom/map.json +++ b/data/maps/SixIsland_DottedHole_SapphireRoom/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_TANOBY_RUINS", "region_map_section": "MAPSEC_DOTTED_HOLE", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "unknown_18": 1, "unknown_19": 7, @@ -66,4 +66,4 @@ "script": "SixIsland_DottedHole_SapphireRoom_EventScript_16441F" } ] -} \ No newline at end of file +} diff --git a/data/maps/SixIsland_GreenPath/map.json b/data/maps/SixIsland_GreenPath/map.json index cbc6b6784..abcf7f0af 100644 --- a/data/maps/SixIsland_GreenPath/map.json +++ b/data/maps/SixIsland_GreenPath/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_SEVII_ISLANDS", "region_map_section": "MAPSEC_GREEN_PATH", "requires_flash": false, - "weather": "WEATHER_2", + "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "unknown_18": 1, "unknown_19": 6, @@ -94,4 +94,4 @@ "unknown": 1 } ] -} \ No newline at end of file +} diff --git a/data/maps/SixIsland_Harbor/map.json b/data/maps/SixIsland_Harbor/map.json index 3e5254f71..4af0b5351 100644 --- a/data/maps/SixIsland_Harbor/map.json +++ b/data/maps/SixIsland_Harbor/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_ISLAND_SIX", "region_map_section": "MAPSEC_SIX_ISLAND", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -51,4 +51,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SixIsland_House/map.json b/data/maps/SixIsland_House/map.json index 3f50160d3..4444ed8af 100644 --- a/data/maps/SixIsland_House/map.json +++ b/data/maps/SixIsland_House/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_ISLAND_SIX", "region_map_section": "MAPSEC_SIX_ISLAND", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -38,4 +38,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SixIsland_Mart/map.json b/data/maps/SixIsland_Mart/map.json index a30466efb..f6e686c5f 100644 --- a/data/maps/SixIsland_Mart/map.json +++ b/data/maps/SixIsland_Mart/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_POKEMON_CENTER", "region_map_section": "MAPSEC_SIX_ISLAND", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -64,4 +64,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SixIsland_OutcastIsland/map.json b/data/maps/SixIsland_OutcastIsland/map.json index dd19cb543..459fc1275 100644 --- a/data/maps/SixIsland_OutcastIsland/map.json +++ b/data/maps/SixIsland_OutcastIsland/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_SEVII_ISLANDS", "region_map_section": "MAPSEC_OUTCAST_ISLAND", "requires_flash": false, - "weather": "WEATHER_2", + "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "unknown_18": 1, "unknown_19": 6, @@ -141,4 +141,4 @@ "unknown": 1 } ] -} \ No newline at end of file +} diff --git a/data/maps/SixIsland_PatternBush/map.json b/data/maps/SixIsland_PatternBush/map.json index a72372cc5..8d0953181 100644 --- a/data/maps/SixIsland_PatternBush/map.json +++ b/data/maps/SixIsland_PatternBush/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_VIRIDIAN_FOREST", "region_map_section": "MAPSEC_PATTERN_BUSH", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_3", "unknown_18": 1, "unknown_19": 7, @@ -216,4 +216,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SixIsland_PokemonCenter_1F/map.json b/data/maps/SixIsland_PokemonCenter_1F/map.json index d58082f97..5a22c24ba 100644 --- a/data/maps/SixIsland_PokemonCenter_1F/map.json +++ b/data/maps/SixIsland_PokemonCenter_1F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_POKEMON_CENTER", "region_map_section": "MAPSEC_SIX_ISLAND", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -84,4 +84,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SixIsland_PokemonCenter_2F/map.json b/data/maps/SixIsland_PokemonCenter_2F/map.json index 3ba0ff43a..d5865a28b 100644 --- a/data/maps/SixIsland_PokemonCenter_2F/map.json +++ b/data/maps/SixIsland_PokemonCenter_2F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_POKEMON_CENTER", "region_map_section": "MAPSEC_SIX_ISLAND", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -91,4 +91,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SixIsland_RuinValley/map.json b/data/maps/SixIsland_RuinValley/map.json index 1262705c6..8e5fc1b9f 100644 --- a/data/maps/SixIsland_RuinValley/map.json +++ b/data/maps/SixIsland_RuinValley/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_SEVII_ISLANDS", "region_map_section": "MAPSEC_RUIN_VALLEY", "requires_flash": false, - "weather": "WEATHER_2", + "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "unknown_18": 1, "unknown_19": 6, @@ -260,4 +260,4 @@ "script": "SixIsland_RuinValley_EventScript_168B94" } ] -} \ No newline at end of file +} diff --git a/data/maps/SixIsland_WaterPath/map.json b/data/maps/SixIsland_WaterPath/map.json index 86bbb290b..2539323d8 100644 --- a/data/maps/SixIsland_WaterPath/map.json +++ b/data/maps/SixIsland_WaterPath/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_SEVII_ISLANDS", "region_map_section": "MAPSEC_WATER_PATH", "requires_flash": false, - "weather": "WEATHER_2", + "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "unknown_18": 1, "unknown_19": 6, @@ -207,4 +207,4 @@ "script": "SixIsland_WaterPath_EventScript_168B4A" } ] -} \ No newline at end of file +} diff --git a/data/maps/SixIsland_WaterPath_House1/map.json b/data/maps/SixIsland_WaterPath_House1/map.json index 84b136633..5a446e953 100644 --- a/data/maps/SixIsland_WaterPath_House1/map.json +++ b/data/maps/SixIsland_WaterPath_House1/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_CERULEAN_CITY", "region_map_section": "MAPSEC_WATER_PATH", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -46,4 +46,4 @@ "script": "SixIsland_WaterPath_House1_EventScript_172157" } ] -} \ No newline at end of file +} diff --git a/data/maps/SixIsland_WaterPath_House2/map.json b/data/maps/SixIsland_WaterPath_House2/map.json index c671d9f29..915052f9f 100644 --- a/data/maps/SixIsland_WaterPath_House2/map.json +++ b/data/maps/SixIsland_WaterPath_House2/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_CERULEAN_CITY", "region_map_section": "MAPSEC_WATER_PATH", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -38,4 +38,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/ThreeIsland/map.json b/data/maps/ThreeIsland/map.json index 0b11d5bf2..8e45d33fc 100644 --- a/data/maps/ThreeIsland/map.json +++ b/data/maps/ThreeIsland/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_ISLAND_ONE", "region_map_section": "MAPSEC_THREE_ISLAND", "requires_flash": false, - "weather": "WEATHER_2", + "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_1", "unknown_18": 1, "unknown_19": 6, @@ -368,4 +368,4 @@ "unknown": 1 } ] -} \ No newline at end of file +} diff --git a/data/maps/ThreeIsland_BerryForest/map.json b/data/maps/ThreeIsland_BerryForest/map.json index 542a70dc9..9bafdc69d 100644 --- a/data/maps/ThreeIsland_BerryForest/map.json +++ b/data/maps/ThreeIsland_BerryForest/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_VIRIDIAN_FOREST", "region_map_section": "MAPSEC_BERRY_FOREST", "requires_flash": false, - "weather": "WEATHER_11", + "weather": "WEATHER_CLOUDY", "map_type": "MAP_TYPE_3", "unknown_18": 1, "unknown_19": 7, @@ -353,4 +353,4 @@ "unknown": 1 } ] -} \ No newline at end of file +} diff --git a/data/maps/ThreeIsland_BondBridge/map.json b/data/maps/ThreeIsland_BondBridge/map.json index 2afa51258..904817c10 100644 --- a/data/maps/ThreeIsland_BondBridge/map.json +++ b/data/maps/ThreeIsland_BondBridge/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_ROUTE_3", "region_map_section": "MAPSEC_BOND_BRIDGE", "requires_flash": false, - "weather": "WEATHER_2", + "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "unknown_18": 1, "unknown_19": 6, @@ -197,4 +197,4 @@ "script": "ThreeIsland_BondBridge_EventScript_168780" } ] -} \ No newline at end of file +} diff --git a/data/maps/ThreeIsland_DunsparceTunnel/map.json b/data/maps/ThreeIsland_DunsparceTunnel/map.json index 624dd99f2..3f22711d1 100644 --- a/data/maps/ThreeIsland_DunsparceTunnel/map.json +++ b/data/maps/ThreeIsland_DunsparceTunnel/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_VIRIDIAN_FOREST", "region_map_section": "MAPSEC_THREE_ISLE_PATH", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "unknown_18": 1, "unknown_19": 7, @@ -55,4 +55,4 @@ "unknown": 1 } ] -} \ No newline at end of file +} diff --git a/data/maps/ThreeIsland_Harbor/map.json b/data/maps/ThreeIsland_Harbor/map.json index 4348bde2f..cd5781ee7 100644 --- a/data/maps/ThreeIsland_Harbor/map.json +++ b/data/maps/ThreeIsland_Harbor/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_ISLAND_ONE", "region_map_section": "MAPSEC_THREE_ISLE_PORT", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -51,4 +51,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/ThreeIsland_House1/map.json b/data/maps/ThreeIsland_House1/map.json index b7d96db3c..b25e6eeb5 100644 --- a/data/maps/ThreeIsland_House1/map.json +++ b/data/maps/ThreeIsland_House1/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_ISLAND_ONE", "region_map_section": "MAPSEC_THREE_ISLAND", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -46,4 +46,4 @@ "script": "ThreeIsland_House1_EventScript_171829" } ] -} \ No newline at end of file +} diff --git a/data/maps/ThreeIsland_House2/map.json b/data/maps/ThreeIsland_House2/map.json index ca21bcb96..b8102556b 100644 --- a/data/maps/ThreeIsland_House2/map.json +++ b/data/maps/ThreeIsland_House2/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_ISLAND_ONE", "region_map_section": "MAPSEC_THREE_ISLAND", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -51,4 +51,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/ThreeIsland_House3/map.json b/data/maps/ThreeIsland_House3/map.json index 87b46b302..6f4b8c555 100644 --- a/data/maps/ThreeIsland_House3/map.json +++ b/data/maps/ThreeIsland_House3/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_ISLAND_ONE", "region_map_section": "MAPSEC_THREE_ISLAND", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -38,4 +38,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/ThreeIsland_House4/map.json b/data/maps/ThreeIsland_House4/map.json index 42e328dbc..277a4bdc5 100644 --- a/data/maps/ThreeIsland_House4/map.json +++ b/data/maps/ThreeIsland_House4/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_ISLAND_ONE", "region_map_section": "MAPSEC_THREE_ISLAND", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -51,4 +51,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/ThreeIsland_House5/map.json b/data/maps/ThreeIsland_House5/map.json index ccc509b37..264b6cbcb 100644 --- a/data/maps/ThreeIsland_House5/map.json +++ b/data/maps/ThreeIsland_House5/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_ISLAND_ONE", "region_map_section": "MAPSEC_THREE_ISLAND", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -38,4 +38,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/ThreeIsland_Mart/map.json b/data/maps/ThreeIsland_Mart/map.json index ed3bb6395..f8cd93f18 100644 --- a/data/maps/ThreeIsland_Mart/map.json +++ b/data/maps/ThreeIsland_Mart/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_POKEMON_CENTER", "region_map_section": "MAPSEC_THREE_ISLAND", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -77,4 +77,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/ThreeIsland_PokemonCenter_1F/map.json b/data/maps/ThreeIsland_PokemonCenter_1F/map.json index 3292e5409..603c14528 100644 --- a/data/maps/ThreeIsland_PokemonCenter_1F/map.json +++ b/data/maps/ThreeIsland_PokemonCenter_1F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_POKEMON_CENTER", "region_map_section": "MAPSEC_THREE_ISLAND", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -84,4 +84,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/ThreeIsland_PokemonCenter_2F/map.json b/data/maps/ThreeIsland_PokemonCenter_2F/map.json index b396f5897..70b900e08 100644 --- a/data/maps/ThreeIsland_PokemonCenter_2F/map.json +++ b/data/maps/ThreeIsland_PokemonCenter_2F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_POKEMON_CENTER", "region_map_section": "MAPSEC_THREE_ISLAND", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -91,4 +91,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/ThreeIsland_Port/map.json b/data/maps/ThreeIsland_Port/map.json index dcc447fbb..c40740fee 100644 --- a/data/maps/ThreeIsland_Port/map.json +++ b/data/maps/ThreeIsland_Port/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_ROUTE_3", "region_map_section": "MAPSEC_THREE_ISLE_PORT", "requires_flash": false, - "weather": "WEATHER_2", + "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "unknown_18": 1, "unknown_19": 6, @@ -84,4 +84,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/TwoIsland/map.json b/data/maps/TwoIsland/map.json index 42e6a428e..17826d8fd 100644 --- a/data/maps/TwoIsland/map.json +++ b/data/maps/TwoIsland/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_ISLAND_ONE", "region_map_section": "MAPSEC_TWO_ISLAND", "requires_flash": false, - "weather": "WEATHER_2", + "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_1", "unknown_18": 1, "unknown_19": 6, @@ -191,4 +191,4 @@ "script": "TwoIsland_EventScript_1677A4" } ] -} \ No newline at end of file +} diff --git a/data/maps/TwoIsland_CapeBrink/map.json b/data/maps/TwoIsland_CapeBrink/map.json index b5981e934..1661ef953 100644 --- a/data/maps/TwoIsland_CapeBrink/map.json +++ b/data/maps/TwoIsland_CapeBrink/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_ROUTE_3", "region_map_section": "MAPSEC_CAPE_BRINK", "requires_flash": false, - "weather": "WEATHER_2", + "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "unknown_18": 1, "unknown_19": 6, @@ -49,4 +49,4 @@ "unknown": 1 } ] -} \ No newline at end of file +} diff --git a/data/maps/TwoIsland_CapeBrink_House/map.json b/data/maps/TwoIsland_CapeBrink_House/map.json index e974ef1f0..12c9ff372 100644 --- a/data/maps/TwoIsland_CapeBrink_House/map.json +++ b/data/maps/TwoIsland_CapeBrink_House/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_ISLAND_ONE", "region_map_section": "MAPSEC_CAPE_BRINK", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -38,4 +38,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/TwoIsland_Harbor/map.json b/data/maps/TwoIsland_Harbor/map.json index 9a715d4b0..29fe94fc7 100644 --- a/data/maps/TwoIsland_Harbor/map.json +++ b/data/maps/TwoIsland_Harbor/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_ISLAND_ONE", "region_map_section": "MAPSEC_TWO_ISLAND", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -51,4 +51,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/TwoIsland_House/map.json b/data/maps/TwoIsland_House/map.json index 04a3d1b43..9289eb6b1 100644 --- a/data/maps/TwoIsland_House/map.json +++ b/data/maps/TwoIsland_House/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_ISLAND_ONE", "region_map_section": "MAPSEC_TWO_ISLAND", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -38,4 +38,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/TwoIsland_JoyfulGameCorner/map.json b/data/maps/TwoIsland_JoyfulGameCorner/map.json index 40015e536..1017feaef 100644 --- a/data/maps/TwoIsland_JoyfulGameCorner/map.json +++ b/data/maps/TwoIsland_JoyfulGameCorner/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_GAMECORNER", "region_map_section": "MAPSEC_TWO_ISLAND", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -92,4 +92,4 @@ "script": "TwoIsland_JoyfulGameCorner_EventScript_1BC2FC" } ] -} \ No newline at end of file +} diff --git a/data/maps/TwoIsland_PokemonCenter_1F/map.json b/data/maps/TwoIsland_PokemonCenter_1F/map.json index b1987bbd4..f9bb96a3d 100644 --- a/data/maps/TwoIsland_PokemonCenter_1F/map.json +++ b/data/maps/TwoIsland_PokemonCenter_1F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_POKEMON_CENTER", "region_map_section": "MAPSEC_TWO_ISLAND", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -71,4 +71,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/TwoIsland_PokemonCenter_2F/map.json b/data/maps/TwoIsland_PokemonCenter_2F/map.json index acb0edbd2..719f84889 100644 --- a/data/maps/TwoIsland_PokemonCenter_2F/map.json +++ b/data/maps/TwoIsland_PokemonCenter_2F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_POKEMON_CENTER", "region_map_section": "MAPSEC_TWO_ISLAND", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -91,4 +91,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/UndergroundPath_EastEntrance/map.json b/data/maps/UndergroundPath_EastEntrance/map.json index f443b0f6f..0b2af8aab 100644 --- a/data/maps/UndergroundPath_EastEntrance/map.json +++ b/data/maps/UndergroundPath_EastEntrance/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_VIRIDIAN_CITY", "region_map_section": "MAPSEC_UNDERGROUND_PATH_2", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 6, @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/UndergroundPath_EastWestTunnel/map.json b/data/maps/UndergroundPath_EastWestTunnel/map.json index 1a015a69f..8797f8e3f 100644 --- a/data/maps/UndergroundPath_EastWestTunnel/map.json +++ b/data/maps/UndergroundPath_EastWestTunnel/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_ROUTE_1", "region_map_section": "MAPSEC_UNDERGROUND_PATH_2", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 1, "unknown_19": 6, @@ -95,4 +95,4 @@ "unknown": 1 } ] -} \ No newline at end of file +} diff --git a/data/maps/UndergroundPath_NorthEntrance/map.json b/data/maps/UndergroundPath_NorthEntrance/map.json index 7ef24dda9..36ce0da5c 100644 --- a/data/maps/UndergroundPath_NorthEntrance/map.json +++ b/data/maps/UndergroundPath_NorthEntrance/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_VIRIDIAN_CITY", "region_map_section": "MAPSEC_UNDERGROUND_PATH", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 6, @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/UndergroundPath_NorthSouthTunnel/map.json b/data/maps/UndergroundPath_NorthSouthTunnel/map.json index 2d049212a..238b408ea 100644 --- a/data/maps/UndergroundPath_NorthSouthTunnel/map.json +++ b/data/maps/UndergroundPath_NorthSouthTunnel/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_ROUTE_1", "region_map_section": "MAPSEC_UNDERGROUND_PATH", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 1, "unknown_19": 6, @@ -95,4 +95,4 @@ "unknown": 1 } ] -} \ No newline at end of file +} diff --git a/data/maps/UndergroundPath_SouthEntrance/map.json b/data/maps/UndergroundPath_SouthEntrance/map.json index e6e3ee5f3..5e48882a8 100644 --- a/data/maps/UndergroundPath_SouthEntrance/map.json +++ b/data/maps/UndergroundPath_SouthEntrance/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_VIRIDIAN_CITY", "region_map_section": "MAPSEC_UNDERGROUND_PATH", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 6, @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/UndergroundPath_WestEntrance/map.json b/data/maps/UndergroundPath_WestEntrance/map.json index e824381d4..54a036c06 100644 --- a/data/maps/UndergroundPath_WestEntrance/map.json +++ b/data/maps/UndergroundPath_WestEntrance/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_VIRIDIAN_CITY", "region_map_section": "MAPSEC_UNDERGROUND_PATH_2", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 6, @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/UnknownMap_00_00/map.json b/data/maps/UnknownMap_00_00/map.json index 74edf8a09..edf3c52b7 100644 --- a/data/maps/UnknownMap_00_00/map.json +++ b/data/maps/UnknownMap_00_00/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_POKEMON_CENTER", "region_map_section": "MAPSEC_SPECIAL_AREA", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -64,4 +64,4 @@ } ], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/UnknownMap_00_01/map.json b/data/maps/UnknownMap_00_01/map.json index a8136a755..ad1ec4084 100644 --- a/data/maps/UnknownMap_00_01/map.json +++ b/data/maps/UnknownMap_00_01/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_POKEMON_CENTER", "region_map_section": "MAPSEC_SPECIAL_AREA", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -64,4 +64,4 @@ } ], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/UnknownMap_00_02/map.json b/data/maps/UnknownMap_00_02/map.json index 8a90d86ff..76294433e 100644 --- a/data/maps/UnknownMap_00_02/map.json +++ b/data/maps/UnknownMap_00_02/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_POKEMON_CENTER", "region_map_section": "MAPSEC_SPECIAL_AREA", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -96,4 +96,4 @@ } ], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/UnknownMap_00_03/map.json b/data/maps/UnknownMap_00_03/map.json index 6ef7c2d04..05301e782 100644 --- a/data/maps/UnknownMap_00_03/map.json +++ b/data/maps/UnknownMap_00_03/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_POKEMON_CENTER", "region_map_section": "MAPSEC_SPECIAL_AREA", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -82,4 +82,4 @@ } ], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/UnknownMap_00_04/map.json b/data/maps/UnknownMap_00_04/map.json index 10edd9838..851ad7f1d 100644 --- a/data/maps/UnknownMap_00_04/map.json +++ b/data/maps/UnknownMap_00_04/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_UNION_ROOM", "region_map_section": "MAPSEC_SPECIAL_AREA", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -142,4 +142,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/UnknownMap_03_50/map.json b/data/maps/UnknownMap_03_50/map.json index 1a166cfc8..e3a542b51 100644 --- a/data/maps/UnknownMap_03_50/map.json +++ b/data/maps/UnknownMap_03_50/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_SEVII_ISLANDS", "region_map_section": "MAPSEC_SEVII_ISLE_6", "requires_flash": false, - "weather": "WEATHER_2", + "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "unknown_18": 1, "unknown_19": 6, @@ -22,4 +22,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/UnknownMap_03_51/map.json b/data/maps/UnknownMap_03_51/map.json index c96dcbb8a..80d857ec6 100644 --- a/data/maps/UnknownMap_03_51/map.json +++ b/data/maps/UnknownMap_03_51/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_SEVII_ISLANDS", "region_map_section": "MAPSEC_SEVII_ISLE_7", "requires_flash": false, - "weather": "WEATHER_2", + "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "unknown_18": 1, "unknown_19": 6, @@ -22,4 +22,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/UnknownMap_03_52/map.json b/data/maps/UnknownMap_03_52/map.json index 5141b16dc..23b9a845d 100644 --- a/data/maps/UnknownMap_03_52/map.json +++ b/data/maps/UnknownMap_03_52/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_SEVII_ISLANDS", "region_map_section": "MAPSEC_SEVII_ISLE_8", "requires_flash": false, - "weather": "WEATHER_2", + "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "unknown_18": 1, "unknown_19": 6, @@ -16,4 +16,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/UnknownMap_03_53/map.json b/data/maps/UnknownMap_03_53/map.json index 6c57c230e..f92091f77 100644 --- a/data/maps/UnknownMap_03_53/map.json +++ b/data/maps/UnknownMap_03_53/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_SEVII_ISLANDS", "region_map_section": "MAPSEC_SEVII_ISLE_9", "requires_flash": false, - "weather": "WEATHER_2", + "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_3", "unknown_18": 1, "unknown_19": 6, @@ -16,4 +16,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/UnknownMap_18_01/map.json b/data/maps/UnknownMap_18_01/map.json index 5a592a7e0..5d21e06d1 100644 --- a/data/maps/UnknownMap_18_01/map.json +++ b/data/maps/UnknownMap_18_01/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_ROUTE_3", "region_map_section": "MAPSEC_ROUTE_6", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -16,4 +16,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/UnusedHouse_27_00/map.json b/data/maps/UnusedHouse_27_00/map.json index a1b37a7f0..afa2d0b7a 100644 --- a/data/maps/UnusedHouse_27_00/map.json +++ b/data/maps/UnusedHouse_27_00/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_ROUTE_3", "region_map_section": "MAPSEC_ROUTE_19", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -16,4 +16,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/UnusedHouse_29_00/map.json b/data/maps/UnusedHouse_29_00/map.json index 685feaa61..34ef0104b 100644 --- a/data/maps/UnusedHouse_29_00/map.json +++ b/data/maps/UnusedHouse_29_00/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_INDIGO_PLATEAU", "region_map_section": "MAPSEC_ROUTE_23", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -16,4 +16,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/UnusedHouse_31_05/map.json b/data/maps/UnusedHouse_31_05/map.json index 97996c85d..3445b9f56 100644 --- a/data/maps/UnusedHouse_31_05/map.json +++ b/data/maps/UnusedHouse_31_05/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_ISLAND_SIX", "region_map_section": "MAPSEC_SEVEN_ISLAND", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -16,4 +16,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/VermilionCity/map.json b/data/maps/VermilionCity/map.json index eb3112c5c..30efc81c4 100644 --- a/data/maps/VermilionCity/map.json +++ b/data/maps/VermilionCity/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_VERMILION_CITY", "region_map_section": "MAPSEC_VERMILION_CITY", "requires_flash": false, - "weather": "WEATHER_2", + "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_1", "unknown_18": 1, "unknown_19": 6, @@ -285,4 +285,4 @@ "unknown": 1 } ] -} \ No newline at end of file +} diff --git a/data/maps/VermilionCity_Gym/map.json b/data/maps/VermilionCity_Gym/map.json index cc98e944b..9545fed01 100644 --- a/data/maps/VermilionCity_Gym/map.json +++ b/data/maps/VermilionCity_Gym/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_GYM", "region_map_section": "MAPSEC_VERMILION_CITY", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -224,4 +224,4 @@ "script": "VermilionCity_Gym_EventScript_16B837" } ] -} \ No newline at end of file +} diff --git a/data/maps/VermilionCity_House1/map.json b/data/maps/VermilionCity_House1/map.json index 8195bf6ac..73b782e11 100644 --- a/data/maps/VermilionCity_House1/map.json +++ b/data/maps/VermilionCity_House1/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_CERULEAN_CITY", "region_map_section": "MAPSEC_VERMILION_CITY", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -52,4 +52,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/VermilionCity_House2/map.json b/data/maps/VermilionCity_House2/map.json index 0e218b3d1..a4daf98d6 100644 --- a/data/maps/VermilionCity_House2/map.json +++ b/data/maps/VermilionCity_House2/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_VERMILION_CITY", "region_map_section": "MAPSEC_VERMILION_CITY", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -52,4 +52,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/VermilionCity_House3/map.json b/data/maps/VermilionCity_House3/map.json index 2108ec768..da5d4b82a 100644 --- a/data/maps/VermilionCity_House3/map.json +++ b/data/maps/VermilionCity_House3/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_VERMILION_CITY", "region_map_section": "MAPSEC_VERMILION_CITY", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -99,4 +99,4 @@ "script": "VermilionCity_House3_EventScript_16BACF" } ] -} \ No newline at end of file +} diff --git a/data/maps/VermilionCity_Mart/map.json b/data/maps/VermilionCity_Mart/map.json index 9b014e0de..2dcf37084 100644 --- a/data/maps/VermilionCity_Mart/map.json +++ b/data/maps/VermilionCity_Mart/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_POKEMON_CENTER", "region_map_section": "MAPSEC_VERMILION_CITY", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -78,4 +78,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/VermilionCity_PokemonCenter_1F/map.json b/data/maps/VermilionCity_PokemonCenter_1F/map.json index c1f76237e..47d4a391e 100644 --- a/data/maps/VermilionCity_PokemonCenter_1F/map.json +++ b/data/maps/VermilionCity_PokemonCenter_1F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_POKEMON_CENTER", "region_map_section": "MAPSEC_VERMILION_CITY", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -137,4 +137,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/VermilionCity_PokemonCenter_2F/map.json b/data/maps/VermilionCity_PokemonCenter_2F/map.json index 942ef3885..5d077ec8f 100644 --- a/data/maps/VermilionCity_PokemonCenter_2F/map.json +++ b/data/maps/VermilionCity_PokemonCenter_2F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_POKEMON_CENTER", "region_map_section": "MAPSEC_VERMILION_CITY", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -91,4 +91,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/VermilionCity_PokemonFanClub/map.json b/data/maps/VermilionCity_PokemonFanClub/map.json index 4be1c66f0..2f9255233 100644 --- a/data/maps/VermilionCity_PokemonFanClub/map.json +++ b/data/maps/VermilionCity_PokemonFanClub/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_VERMILION_CITY", "region_map_section": "MAPSEC_VERMILION_CITY", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -132,4 +132,4 @@ "script": "VermilionCity_PokemonFanClub_EventScript_16B5CD" } ] -} \ No newline at end of file +} diff --git a/data/maps/VictoryRoad_1F/map.json b/data/maps/VictoryRoad_1F/map.json index fae861a3e..a62dd427d 100644 --- a/data/maps/VictoryRoad_1F/map.json +++ b/data/maps/VictoryRoad_1F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_MT_MOON", "region_map_section": "MAPSEC_KANTO_VICTORY_ROAD", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "unknown_18": 1, "unknown_19": 7, @@ -152,4 +152,4 @@ "unknown": 1 } ] -} \ No newline at end of file +} diff --git a/data/maps/VictoryRoad_2F/map.json b/data/maps/VictoryRoad_2F/map.json index 6a0ba1819..058247ece 100644 --- a/data/maps/VictoryRoad_2F/map.json +++ b/data/maps/VictoryRoad_2F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_MT_MOON", "region_map_section": "MAPSEC_KANTO_VICTORY_ROAD", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "unknown_18": 1, "unknown_19": 7, @@ -269,4 +269,4 @@ } ], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/VictoryRoad_3F/map.json b/data/maps/VictoryRoad_3F/map.json index 78a5c1b4e..5ba23ad2e 100644 --- a/data/maps/VictoryRoad_3F/map.json +++ b/data/maps/VictoryRoad_3F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_MT_MOON", "region_map_section": "MAPSEC_KANTO_VICTORY_ROAD", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_4", "unknown_18": 1, "unknown_19": 7, @@ -219,4 +219,4 @@ } ], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/ViridianCity/map.json b/data/maps/ViridianCity/map.json index 5c15a8364..2c47e786f 100644 --- a/data/maps/ViridianCity/map.json +++ b/data/maps/ViridianCity/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_VIRIDIAN_CITY", "region_map_section": "MAPSEC_VIRIDIAN_CITY", "requires_flash": false, - "weather": "WEATHER_2", + "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_1", "unknown_18": 1, "unknown_19": 6, @@ -259,4 +259,4 @@ "script": "ViridianCity_EventScript_1659B8" } ] -} \ No newline at end of file +} diff --git a/data/maps/ViridianCity_Gym/map.json b/data/maps/ViridianCity_Gym/map.json index accf4290d..6b9738c4d 100644 --- a/data/maps/ViridianCity_Gym/map.json +++ b/data/maps/ViridianCity_Gym/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_GYM", "region_map_section": "MAPSEC_VIRIDIAN_CITY", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -193,4 +193,4 @@ "unknown": 129 } ] -} \ No newline at end of file +} diff --git a/data/maps/ViridianCity_House1/map.json b/data/maps/ViridianCity_House1/map.json index bbb006933..ef18aa4c4 100644 --- a/data/maps/ViridianCity_House1/map.json +++ b/data/maps/ViridianCity_House1/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_VIRIDIAN_CITY", "region_map_section": "MAPSEC_VIRIDIAN_CITY", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -86,4 +86,4 @@ "script": "ViridianCity_House1_EventScript_169EC0" } ] -} \ No newline at end of file +} diff --git a/data/maps/ViridianCity_House2/map.json b/data/maps/ViridianCity_House2/map.json index 021a26f6a..5f6b02a03 100644 --- a/data/maps/ViridianCity_House2/map.json +++ b/data/maps/ViridianCity_House2/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_VIRIDIAN_CITY", "region_map_section": "MAPSEC_VIRIDIAN_CITY", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -101,4 +101,4 @@ "script": "ViridianCity_House2_EventScript_1ACD65" } ] -} \ No newline at end of file +} diff --git a/data/maps/ViridianCity_Mart/map.json b/data/maps/ViridianCity_Mart/map.json index 3b0216fde..3915e053d 100644 --- a/data/maps/ViridianCity_Mart/map.json +++ b/data/maps/ViridianCity_Mart/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_POKEMON_CENTER", "region_map_section": "MAPSEC_VIRIDIAN_CITY", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -78,4 +78,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/ViridianCity_PokemonCenter_1F/map.json b/data/maps/ViridianCity_PokemonCenter_1F/map.json index bed78482f..a63b5d733 100644 --- a/data/maps/ViridianCity_PokemonCenter_1F/map.json +++ b/data/maps/ViridianCity_PokemonCenter_1F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_POKEMON_CENTER", "region_map_section": "MAPSEC_VIRIDIAN_CITY", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -98,4 +98,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/ViridianCity_PokemonCenter_2F/map.json b/data/maps/ViridianCity_PokemonCenter_2F/map.json index 20f2abea7..5d66d7096 100644 --- a/data/maps/ViridianCity_PokemonCenter_2F/map.json +++ b/data/maps/ViridianCity_PokemonCenter_2F/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_POKEMON_CENTER", "region_map_section": "MAPSEC_VIRIDIAN_CITY", "requires_flash": false, - "weather": "WEATHER_0", + "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "unknown_18": 0, "unknown_19": 0, @@ -91,4 +91,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/ViridianForest/map.json b/data/maps/ViridianForest/map.json index 5034e3afa..ca91c7017 100644 --- a/data/maps/ViridianForest/map.json +++ b/data/maps/ViridianForest/map.json @@ -5,7 +5,7 @@ "music": "BGM_FRLG_VIRIDIAN_FOREST", "region_map_section": "MAPSEC_VIRIDIAN_FOREST", "requires_flash": false, - "weather": "WEATHER_11", + "weather": "WEATHER_CLOUDY", "map_type": "MAP_TYPE_3", "unknown_18": 1, "unknown_19": 7, @@ -264,4 +264,4 @@ "unknown": 1 } ] -} \ No newline at end of file +} -- cgit v1.2.3 From d045449298a6edba1492e6e99100862d4e5b9510 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 17 May 2019 18:48:53 -0400 Subject: prof_pc --- data/maps/PalletTown/scripts.inc | 2 +- data/maps/PalletTown_ProfessorOaksLab/scripts.inc | 2 +- data/maps/Route10_PokemonCenter_1F/scripts.inc | 2 +- data/maps/Route11_EastEntrance_2F/scripts.inc | 2 +- data/maps/Route15_WestEntrance_2F/scripts.inc | 2 +- data/maps/Route16_NorthEntrance_2F/scripts.inc | 2 +- data/maps/Route2_EastBuilding/scripts.inc | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) (limited to 'data/maps') diff --git a/data/maps/PalletTown/scripts.inc b/data/maps/PalletTown/scripts.inc index ed9d01395..c1790fb90 100644 --- a/data/maps/PalletTown/scripts.inc +++ b/data/maps/PalletTown/scripts.inc @@ -54,7 +54,7 @@ EventScript_1654D8:: @ 81654D8 goto_if 0, EventScript_1655A1 msgbox gUnknown_817D8BF setvar VAR_0x8004, 0 - specialvar VAR_RESULT, sub_80CA3D8 + specialvar VAR_RESULT, Special_GetPokedexCount copyvar VAR_0x8008, VAR_0x8005 copyvar VAR_0x8009, VAR_0x8006 getnumberstring 0, VAR_0x8008 diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc index 44f6bbc5a..449c31027 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc +++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc @@ -836,7 +836,7 @@ Movement_1698D0:: @ 81698D0 EventScript_1698D6:: @ 81698D6 setvar VAR_0x8004, 0 - specialvar VAR_RESULT, sub_80CA3D8 + specialvar VAR_RESULT, Special_GetPokedexCount copyvar VAR_0x8008, VAR_0x8005 copyvar VAR_0x8009, VAR_0x8006 getnumberstring 0, VAR_0x8008 diff --git a/data/maps/Route10_PokemonCenter_1F/scripts.inc b/data/maps/Route10_PokemonCenter_1F/scripts.inc index 15889ad8f..7d47d07df 100644 --- a/data/maps/Route10_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route10_PokemonCenter_1F/scripts.inc @@ -37,7 +37,7 @@ Route10_PokemonCenter_1F_EventScript_16FC65:: @ 816FC65 compare_var_to_value VAR_RESULT, 0 goto_if_eq EventScript_1A7AD1 setvar VAR_0x8004, 0 - specialvar VAR_RESULT, sub_80CA3D8 + specialvar VAR_RESULT, Special_GetPokedexCount getnumberstring 2, VAR_0x8006 call EventScript_16FCF1 compare_var_to_value VAR_0x8006, 20 diff --git a/data/maps/Route11_EastEntrance_2F/scripts.inc b/data/maps/Route11_EastEntrance_2F/scripts.inc index abc877c0e..334e71ec4 100644 --- a/data/maps/Route11_EastEntrance_2F/scripts.inc +++ b/data/maps/Route11_EastEntrance_2F/scripts.inc @@ -66,7 +66,7 @@ Route11_EastEntrance_2F_EventScript_16FDD8:: @ 816FDD8 compare_var_to_value VAR_RESULT, 0 goto_if_eq EventScript_1A7AD1 setvar VAR_0x8004, 0 - specialvar VAR_RESULT, sub_80CA3D8 + specialvar VAR_RESULT, Special_GetPokedexCount getnumberstring 2, VAR_0x8006 call EventScript_16FE64 compare_var_to_value VAR_0x8006, 30 diff --git a/data/maps/Route15_WestEntrance_2F/scripts.inc b/data/maps/Route15_WestEntrance_2F/scripts.inc index 36ea31ca0..1e06c0394 100644 --- a/data/maps/Route15_WestEntrance_2F/scripts.inc +++ b/data/maps/Route15_WestEntrance_2F/scripts.inc @@ -27,7 +27,7 @@ Route15_WestEntrance_2F_EventScript_1700B9:: @ 81700B9 compare_var_to_value VAR_RESULT, 0 goto_if_eq EventScript_1A7AD1 setvar VAR_0x8004, 0 - specialvar VAR_RESULT, sub_80CA3D8 + specialvar VAR_RESULT, Special_GetPokedexCount getnumberstring 2, VAR_0x8006 call EventScript_170145 compare_var_to_value VAR_0x8006, 50 diff --git a/data/maps/Route16_NorthEntrance_2F/scripts.inc b/data/maps/Route16_NorthEntrance_2F/scripts.inc index 32685e669..6fa870c27 100644 --- a/data/maps/Route16_NorthEntrance_2F/scripts.inc +++ b/data/maps/Route16_NorthEntrance_2F/scripts.inc @@ -27,7 +27,7 @@ Route16_NorthEntrance_2F_EventScript_1702E3:: @ 81702E3 compare_var_to_value VAR_RESULT, 0 goto_if_eq EventScript_1A7AD1 setvar VAR_0x8004, 0 - specialvar VAR_RESULT, sub_80CA3D8 + specialvar VAR_RESULT, Special_GetPokedexCount getnumberstring 2, VAR_0x8006 call EventScript_17036F compare_var_to_value VAR_0x8006, 40 diff --git a/data/maps/Route2_EastBuilding/scripts.inc b/data/maps/Route2_EastBuilding/scripts.inc index 9716879a1..a1b2d0e7a 100644 --- a/data/maps/Route2_EastBuilding/scripts.inc +++ b/data/maps/Route2_EastBuilding/scripts.inc @@ -11,7 +11,7 @@ Route2_EastBuilding_EventScript_16F67F:: @ 816F67F compare_var_to_value VAR_RESULT, 0 goto_if_eq EventScript_1A7AD1 setvar VAR_0x8004, 0 - specialvar VAR_RESULT, sub_80CA3D8 + specialvar VAR_RESULT, Special_GetPokedexCount getnumberstring 2, VAR_0x8006 call EventScript_16F70B compare_var_to_value VAR_0x8006, 10 -- cgit v1.2.3 From 44e30e713664330179a41f08a90ad7f168fd82da Mon Sep 17 00:00:00 2001 From: garak Date: Tue, 21 May 2019 17:00:28 -0400 Subject: split map text into map directories --- data/maps/CeladonCity/text.inc | 114 +++++++ data/maps/CeladonCity_Condominiums_1F/text.inc | 37 +++ data/maps/CeladonCity_Condominiums_2F/text.inc | 3 + data/maps/CeladonCity_Condominiums_3F/text.inc | 42 +++ data/maps/CeladonCity_Condominiums_Roof/text.inc | 3 + .../CeladonCity_Condominiums_RoofRoom/text.inc | 52 +++ data/maps/CeladonCity_DepartmentStore_1F/text.inc | 17 + data/maps/CeladonCity_DepartmentStore_2F/text.inc | 13 + data/maps/CeladonCity_DepartmentStore_3F/text.inc | 56 ++++ data/maps/CeladonCity_DepartmentStore_4F/text.inc | 41 +++ data/maps/CeladonCity_DepartmentStore_5F/text.inc | 23 ++ .../maps/CeladonCity_DepartmentStore_Roof/text.inc | 82 +++++ data/maps/CeladonCity_GameCorner/text.inc | 148 +++++++++ .../maps/CeladonCity_GameCorner_PrizeRoom/text.inc | 31 ++ data/maps/CeladonCity_Gym/text.inc | 170 ++++++++++ data/maps/CeladonCity_Hotel/text.inc | 21 ++ data/maps/CeladonCity_House1/text.inc | 16 + data/maps/CeladonCity_PokemonCenter_1F/text.inc | 15 + data/maps/CeladonCity_Restaurant/text.inc | 37 +++ data/maps/CeruleanCave_B1F/text.inc | 3 + data/maps/CeruleanCity/text.inc | 181 +++++++++++ data/maps/CeruleanCity_BikeShop/text.inc | 56 ++++ data/maps/CeruleanCity_Gym/text.inc | 92 ++++++ data/maps/CeruleanCity_House1/text.inc | 72 +++++ data/maps/CeruleanCity_House2/text.inc | 22 ++ data/maps/CeruleanCity_House3/text.inc | 6 + data/maps/CeruleanCity_House4/text.inc | 62 ++++ data/maps/CeruleanCity_House5/text.inc | 70 ++++ data/maps/CeruleanCity_Mart/text.inc | 14 + data/maps/CeruleanCity_PokemonCenter_1F/text.inc | 27 ++ data/maps/CinnabarIsland/text.inc | 75 +++++ data/maps/CinnabarIsland_Gym/text.inc | 196 +++++++++++ data/maps/CinnabarIsland_Mart/text.inc | 9 + data/maps/CinnabarIsland_PokemonCenter_1F/text.inc | 38 +++ .../CinnabarIsland_PokemonLab_Entrance/text.inc | 28 ++ .../text.inc | 75 +++++ .../maps/CinnabarIsland_PokemonLab_Lounge/text.inc | 6 + .../text.inc | 19 ++ data/maps/DiglettsCave_NorthEntrance/text.inc | 6 + data/maps/DiglettsCave_SouthEntrance/text.inc | 6 + data/maps/FiveIsland/text.inc | 16 + data/maps/FiveIsland_House1/text.inc | 15 + data/maps/FiveIsland_House2/text.inc | 8 + data/maps/FiveIsland_LostCave_Room1/text.inc | 15 + data/maps/FiveIsland_LostCave_Room10/text.inc | 16 + data/maps/FiveIsland_LostCave_Room4/text.inc | 12 + data/maps/FiveIsland_Meadow/text.inc | 70 ++++ data/maps/FiveIsland_MemorialPillar/text.inc | 99 ++++++ data/maps/FiveIsland_PokemonCenter_1F/text.inc | 10 + data/maps/FiveIsland_ResortGorgeous/text.inc | 93 ++++++ data/maps/FiveIsland_ResortGorgeous_House/text.inc | 68 ++++ data/maps/FiveIsland_RocketWarehouse/text.inc | 137 ++++++++ data/maps/FiveIsland_WaterLabyrinth/text.inc | 49 +++ data/maps/FourIsland/text.inc | 56 ++++ data/maps/FourIsland_House1/text.inc | 23 ++ data/maps/FourIsland_IcefallCave_Back/text.inc | 73 +++++ data/maps/FourIsland_LoreleisHouse/text.inc | 29 ++ data/maps/FourIsland_Mart/text.inc | 16 + data/maps/FourIsland_PokemonCenter_1F/text.inc | 44 +++ data/maps/FuchsiaCity/text.inc | 111 +++++++ data/maps/FuchsiaCity_Building1/text.inc | 64 ++++ data/maps/FuchsiaCity_Gym/text.inc | 156 +++++++++ data/maps/FuchsiaCity_House1/text.inc | 17 + data/maps/FuchsiaCity_House2/text.inc | 37 +++ data/maps/FuchsiaCity_House3/text.inc | 35 ++ data/maps/FuchsiaCity_Mart/text.inc | 10 + data/maps/FuchsiaCity_PokemonCenter_1F/text.inc | 18 ++ data/maps/FuchsiaCity_SafariZone_Entrance/text.inc | 73 +++++ data/maps/FuchsiaCity_ZooBuilding/text.inc | 25 ++ data/maps/IndigoPlateau_PokemonCenter_1F/text.inc | 24 ++ data/maps/LavenderTown/text.inc | 40 +++ data/maps/LavenderTown_House1/text.inc | 16 + data/maps/LavenderTown_House2/text.inc | 47 +++ data/maps/LavenderTown_Mart/text.inc | 20 ++ data/maps/LavenderTown_PokemonCenter_1F/text.inc | 16 + .../LavenderTown_VolunteerPokemonHouse/text.inc | 67 ++++ data/maps/MtEmber_Exterior/text.inc | 143 +++++++++ data/maps/MtEmber_RubyPath_B3F/text.inc | 3 + data/maps/MtMoon_1F/text.inc | 87 +++++ data/maps/MtMoon_B2F/text.inc | 90 ++++++ data/maps/OneIsland/text.inc | 70 ++++ data/maps/OneIsland_House1/text.inc | 9 + data/maps/OneIsland_House2/text.inc | 5 + data/maps/OneIsland_KindleRoad/text.inc | 164 ++++++++++ data/maps/OneIsland_KindleRoad_EmberSpa/text.inc | 54 ++++ data/maps/OneIsland_PokemonCenter_1F/text.inc | 357 +++++++++++++++++++++ data/maps/OneIsland_TreasureBeach/text.inc | 18 ++ data/maps/PalletTown/text.inc | 67 ++++ data/maps/PalletTown_GarysHouse/text.inc | 121 +++++++ data/maps/PalletTown_PlayersHouse_1F/text.inc | 100 ++++++ data/maps/PalletTown_PlayersHouse_2F/text.inc | 10 + data/maps/PalletTown_ProfessorOaksLab/text.inc | 356 ++++++++++++++++++++ data/maps/PewterCity/text.inc | 153 +++++++++ data/maps/PewterCity_Gym/text.inc | 119 +++++++ data/maps/PewterCity_House1/text.inc | 15 + data/maps/PewterCity_House2/text.inc | 14 + data/maps/PewterCity_Mart/text.inc | 11 + data/maps/PewterCity_Museum_1F/text.inc | 86 +++++ data/maps/PewterCity_Museum_2F/text.inc | 54 ++++ data/maps/PewterCity_PokemonCenter_1F/text.inc | 27 ++ data/maps/PokemonLeague_AgathasRoom/text.inc | 41 +++ data/maps/PokemonLeague_BrunosRoom/text.inc | 34 ++ data/maps/PokemonLeague_ChampionsRoom/text.inc | 101 ++++++ data/maps/PokemonLeague_HallOfFame/text.inc | 15 + data/maps/PokemonLeague_LancesRoom/text.inc | 52 +++ data/maps/PokemonLeague_LoreleisRoom/text.inc | 33 ++ data/maps/PokemonMansion_1F/text.inc | 24 ++ data/maps/PokemonMansion_2F/text.inc | 33 ++ data/maps/PokemonMansion_3F/text.inc | 35 ++ data/maps/PokemonMansion_B1F/text.inc | 28 ++ data/maps/PokemonTower_1F/text.inc | 29 ++ data/maps/PokemonTower_2F/text.inc | 36 +++ data/maps/PokemonTower_3F/text.inc | 36 +++ data/maps/PokemonTower_4F/text.inc | 33 ++ data/maps/PokemonTower_5F/text.inc | 51 +++ data/maps/PokemonTower_6F/text.inc | 43 +++ data/maps/PokemonTower_7F/text.inc | 50 +++ data/maps/RockTunnel_1F/text.inc | 83 +++++ data/maps/RockTunnel_B1F/text.inc | 95 ++++++ data/maps/RocketHideout_B1F/text.inc | 53 +++ data/maps/RocketHideout_B2F/text.inc | 12 + data/maps/RocketHideout_B3F/text.inc | 26 ++ data/maps/RocketHideout_B4F/text.inc | 56 ++++ data/maps/RocketHideout_Elevator/text.inc | 3 + data/maps/Route1/text.inc | 28 ++ data/maps/Route10/text.inc | 86 +++++ data/maps/Route10_PokemonCenter_1F/text.inc | 48 +++ data/maps/Route11/text.inc | 113 +++++++ data/maps/Route11_EastEntrance_1F/text.inc | 20 ++ data/maps/Route11_EastEntrance_2F/text.inc | 52 +++ data/maps/Route12/text.inc | 111 +++++++ data/maps/Route12_FishingHouse/text.inc | 89 +++++ data/maps/Route12_NorthEntrance_1F/text.inc | 4 + data/maps/Route12_NorthEntrance_2F/text.inc | 35 ++ data/maps/Route13/text.inc | 162 ++++++++++ data/maps/Route14/text.inc | 126 ++++++++ data/maps/Route15/text.inc | 153 +++++++++ data/maps/Route15_WestEntrance_1F/text.inc | 5 + data/maps/Route15_WestEntrance_2F/text.inc | 41 +++ data/maps/Route16/text.inc | 113 +++++++ data/maps/Route16_House/text.inc | 21 ++ data/maps/Route16_NorthEntrance_1F/text.inc | 16 + data/maps/Route16_NorthEntrance_2F/text.inc | 47 +++ data/maps/Route17/text.inc | 165 ++++++++++ data/maps/Route18/text.inc | 40 +++ data/maps/Route18_EastEntrance_1F/text.inc | 11 + data/maps/Route18_EastEntrance_2F/text.inc | 10 + data/maps/Route19/text.inc | 119 +++++++ data/maps/Route2/text.inc | 7 + data/maps/Route20/text.inc | 151 +++++++++ data/maps/Route22/text.inc | 201 ++++++++++++ data/maps/Route23/text.inc | 4 + data/maps/Route24/text.inc | 35 ++ data/maps/Route25/text.inc | 185 +++++++++++ data/maps/Route25_SeaCottage/text.inc | 108 +++++++ data/maps/Route2_EastBuilding/text.inc | 32 ++ data/maps/Route2_House/text.inc | 6 + .../Route2_ViridianForest_NorthEntrance/text.inc | 20 ++ .../Route2_ViridianForest_SouthEntrance/text.inc | 10 + data/maps/Route3/text.inc | 104 ++++++ data/maps/Route4/text.inc | 24 ++ data/maps/Route4_PokemonCenter_1F/text.inc | 54 ++++ data/maps/Route5/text.inc | 60 ++++ data/maps/Route5_SouthEntrance/text.inc | 95 ++++++ data/maps/Route6/text.inc | 73 +++++ data/maps/Route6_NorthEntrance/text.inc | 26 ++ data/maps/Route7/text.inc | 4 + data/maps/Route7_EastEntrance/text.inc | 26 ++ data/maps/Route8/text.inc | 110 +++++++ data/maps/Route8_WestEntrance/text.inc | 26 ++ data/maps/Route9/text.inc | 159 +++++++++ data/maps/SSAnne_1F_Corridor/text.inc | 14 + data/maps/SSAnne_1F_Room1/text.inc | 6 + data/maps/SSAnne_1F_Room2/text.inc | 31 ++ data/maps/SSAnne_1F_Room3/text.inc | 11 + data/maps/SSAnne_1F_Room4/text.inc | 8 + data/maps/SSAnne_1F_Room5/text.inc | 12 + data/maps/SSAnne_1F_Room6/text.inc | 16 + data/maps/SSAnne_1F_Room7/text.inc | 11 + data/maps/SSAnne_2F_Corridor/text.inc | 37 +++ data/maps/SSAnne_2F_Room1/text.inc | 6 + data/maps/SSAnne_2F_Room2/text.inc | 23 ++ data/maps/SSAnne_2F_Room3/text.inc | 12 + data/maps/SSAnne_2F_Room4/text.inc | 22 ++ data/maps/SSAnne_2F_Room5/text.inc | 11 + data/maps/SSAnne_2F_Room6/text.inc | 7 + data/maps/SSAnne_3F_Corridor/text.inc | 6 + data/maps/SSAnne_B1F_Room1/text.inc | 26 ++ data/maps/SSAnne_B1F_Room2/text.inc | 10 + data/maps/SSAnne_B1F_Room3/text.inc | 11 + data/maps/SSAnne_B1F_Room4/text.inc | 23 ++ data/maps/SSAnne_B1F_Room5/text.inc | 8 + data/maps/SSAnne_CaptainsOffice/text.inc | 53 +++ data/maps/SSAnne_Deck/text.inc | 35 ++ data/maps/SSAnne_Kitchen/text.inc | 48 +++ data/maps/SafariZone_Building1/text.inc | 8 + data/maps/SafariZone_Building2/text.inc | 12 + data/maps/SafariZone_Building3/text.inc | 15 + data/maps/SafariZone_Building4/text.inc | 22 ++ data/maps/SafariZone_Center/text.inc | 11 + data/maps/SafariZone_East/text.inc | 12 + data/maps/SafariZone_North/text.inc | 21 ++ data/maps/SafariZone_SecretHouse/text.inc | 28 ++ data/maps/SafariZone_West/text.inc | 20 ++ data/maps/SaffronCity_Dojo/text.inc | 105 ++++++ data/maps/SaffronCity_Duplicate/text.inc | 106 ++++++ data/maps/SaffronCity_Gym/text.inc | 160 +++++++++ data/maps/SaffronCity_House1_1F/text.inc | 32 ++ data/maps/SaffronCity_House1_2F/text.inc | 100 ++++++ data/maps/SaffronCity_House2/text.inc | 20 ++ data/maps/SaffronCity_House3/text.inc | 18 ++ data/maps/SaffronCity_Mart/text.inc | 10 + data/maps/SaffronCity_PokemonCenter_1F/text.inc | 20 ++ .../SaffronCity_PokemonTrainerFanClub/text.inc | 290 +++++++++++++++++ data/maps/SeafoamIslands_B4F/text.inc | 29 ++ data/maps/SevenIsland/text.inc | 38 +++ data/maps/SevenIsland_House_Room1/text.inc | 92 ++++++ data/maps/SevenIsland_Mart/text.inc | 17 + data/maps/SevenIsland_PokemonCenter_1F/text.inc | 19 ++ .../SevenIsland_SeavaultCanyon_TanobyKey/text.inc | 4 + data/maps/SevenIsland_SevaultCanyon/text.inc | 122 +++++++ .../SevenIsland_SevaultCanyon_Entrance/text.inc | 101 ++++++ data/maps/SevenIsland_SevaultCanyon_House/text.inc | 22 ++ data/maps/SevenIsland_TrainerTower/text.inc | 97 ++++++ data/maps/SevenIsland_TrainerTower_Lobby/text.inc | 118 +++++++ data/maps/SilphCo_10F/text.inc | 33 ++ data/maps/SilphCo_11F/text.inc | 94 ++++++ data/maps/SilphCo_1F/text.inc | 13 + data/maps/SilphCo_2F/text.inc | 74 +++++ data/maps/SilphCo_3F/text.inc | 34 ++ data/maps/SilphCo_4F/text.inc | 45 +++ data/maps/SilphCo_5F/text.inc | 74 +++++ data/maps/SilphCo_6F/text.inc | 86 +++++ data/maps/SilphCo_7F/text.inc | 146 +++++++++ data/maps/SilphCo_8F/text.inc | 42 +++ data/maps/SilphCo_9F/text.inc | 55 ++++ data/maps/SixIsland/text.inc | 14 + .../SixIsland_DottedHole_SapphireRoom/text.inc | 24 ++ data/maps/SixIsland_GreenPath/text.inc | 94 ++++++ data/maps/SixIsland_House/text.inc | 7 + data/maps/SixIsland_Mart/text.inc | 12 + data/maps/SixIsland_OutcastIsland/text.inc | 13 + data/maps/SixIsland_PatternBush/text.inc | 156 +++++++++ data/maps/SixIsland_PokemonCenter_1F/text.inc | 36 +++ data/maps/SixIsland_RuinValley/text.inc | 23 ++ data/maps/SixIsland_WaterPath/text.inc | 102 ++++++ data/maps/SixIsland_WaterPath_House1/text.inc | 105 ++++++ data/maps/SixIsland_WaterPath_House2/text.inc | 6 + data/maps/ThreeIsland/text.inc | 167 ++++++++++ data/maps/ThreeIsland_BerryForest/text.inc | 43 +++ data/maps/ThreeIsland_BondBridge/text.inc | 101 ++++++ data/maps/ThreeIsland_DunsparceTunnel/text.inc | 27 ++ data/maps/ThreeIsland_House1/text.inc | 9 + data/maps/ThreeIsland_House2/text.inc | 17 + data/maps/ThreeIsland_House3/text.inc | 5 + data/maps/ThreeIsland_House4/text.inc | 10 + data/maps/ThreeIsland_House5/text.inc | 12 + data/maps/ThreeIsland_Mart/text.inc | 17 + data/maps/ThreeIsland_PokemonCenter_1F/text.inc | 19 ++ data/maps/ThreeIsland_Port/text.inc | 26 ++ data/maps/TwoIsland/text.inc | 86 +++++ data/maps/TwoIsland_House/text.inc | 47 +++ data/maps/TwoIsland_JoyfulGameCorner/text.inc | 113 +++++++ data/maps/TwoIsland_PokemonCenter_1F/text.inc | 14 + data/maps/UndergroundPath_EastEntrance/text.inc | 5 + data/maps/UndergroundPath_SouthEntrance/text.inc | 4 + data/maps/UndergroundPath_WestEntrance/text.inc | 4 + data/maps/VermilionCity/text.inc | 131 ++++++++ data/maps/VermilionCity_Gym/text.inc | 140 ++++++++ data/maps/VermilionCity_House1/text.inc | 40 +++ data/maps/VermilionCity_House3/text.inc | 20 ++ data/maps/VermilionCity_Mart/text.inc | 14 + data/maps/VermilionCity_PokemonCenter_1F/text.inc | 19 ++ data/maps/VermilionCity_PokemonFanClub/text.inc | 144 +++++++++ data/maps/VictoryRoad_1F/text.inc | 22 ++ data/maps/VictoryRoad_2F/text.inc | 54 ++++ data/maps/VictoryRoad_3F/text.inc | 103 ++++++ data/maps/ViridianCity/text.inc | 125 ++++++++ data/maps/ViridianCity_Gym/text.inc | 171 ++++++++++ data/maps/ViridianCity_House1/text.inc | 16 + data/maps/ViridianCity_House2/text.inc | 93 ++++++ data/maps/ViridianCity_Mart/text.inc | 26 ++ data/maps/ViridianCity_PokemonCenter_1F/text.inc | 18 ++ data/maps/ViridianForest/text.inc | 105 ++++++ 284 files changed, 15250 insertions(+) create mode 100644 data/maps/CeladonCity/text.inc create mode 100644 data/maps/CeladonCity_Condominiums_1F/text.inc create mode 100644 data/maps/CeladonCity_Condominiums_2F/text.inc create mode 100644 data/maps/CeladonCity_Condominiums_3F/text.inc create mode 100644 data/maps/CeladonCity_Condominiums_Roof/text.inc create mode 100644 data/maps/CeladonCity_Condominiums_RoofRoom/text.inc create mode 100644 data/maps/CeladonCity_DepartmentStore_1F/text.inc create mode 100644 data/maps/CeladonCity_DepartmentStore_2F/text.inc create mode 100644 data/maps/CeladonCity_DepartmentStore_3F/text.inc create mode 100644 data/maps/CeladonCity_DepartmentStore_4F/text.inc create mode 100644 data/maps/CeladonCity_DepartmentStore_5F/text.inc create mode 100644 data/maps/CeladonCity_DepartmentStore_Roof/text.inc create mode 100644 data/maps/CeladonCity_GameCorner/text.inc create mode 100644 data/maps/CeladonCity_GameCorner_PrizeRoom/text.inc create mode 100644 data/maps/CeladonCity_Gym/text.inc create mode 100644 data/maps/CeladonCity_Hotel/text.inc create mode 100644 data/maps/CeladonCity_House1/text.inc create mode 100644 data/maps/CeladonCity_PokemonCenter_1F/text.inc create mode 100644 data/maps/CeladonCity_Restaurant/text.inc create mode 100644 data/maps/CeruleanCave_B1F/text.inc create mode 100644 data/maps/CeruleanCity/text.inc create mode 100644 data/maps/CeruleanCity_BikeShop/text.inc create mode 100644 data/maps/CeruleanCity_Gym/text.inc create mode 100644 data/maps/CeruleanCity_House1/text.inc create mode 100644 data/maps/CeruleanCity_House2/text.inc create mode 100644 data/maps/CeruleanCity_House3/text.inc create mode 100644 data/maps/CeruleanCity_House4/text.inc create mode 100644 data/maps/CeruleanCity_House5/text.inc create mode 100644 data/maps/CeruleanCity_Mart/text.inc create mode 100644 data/maps/CeruleanCity_PokemonCenter_1F/text.inc create mode 100644 data/maps/CinnabarIsland/text.inc create mode 100644 data/maps/CinnabarIsland_Gym/text.inc create mode 100644 data/maps/CinnabarIsland_Mart/text.inc create mode 100644 data/maps/CinnabarIsland_PokemonCenter_1F/text.inc create mode 100644 data/maps/CinnabarIsland_PokemonLab_Entrance/text.inc create mode 100644 data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/text.inc create mode 100644 data/maps/CinnabarIsland_PokemonLab_Lounge/text.inc create mode 100644 data/maps/CinnabarIsland_PokemonLab_ResearchRoom/text.inc create mode 100644 data/maps/DiglettsCave_NorthEntrance/text.inc create mode 100644 data/maps/DiglettsCave_SouthEntrance/text.inc create mode 100644 data/maps/FiveIsland/text.inc create mode 100644 data/maps/FiveIsland_House1/text.inc create mode 100644 data/maps/FiveIsland_House2/text.inc create mode 100644 data/maps/FiveIsland_LostCave_Room1/text.inc create mode 100644 data/maps/FiveIsland_LostCave_Room10/text.inc create mode 100644 data/maps/FiveIsland_LostCave_Room4/text.inc create mode 100644 data/maps/FiveIsland_Meadow/text.inc create mode 100644 data/maps/FiveIsland_MemorialPillar/text.inc create mode 100644 data/maps/FiveIsland_PokemonCenter_1F/text.inc create mode 100644 data/maps/FiveIsland_ResortGorgeous/text.inc create mode 100644 data/maps/FiveIsland_ResortGorgeous_House/text.inc create mode 100644 data/maps/FiveIsland_RocketWarehouse/text.inc create mode 100644 data/maps/FiveIsland_WaterLabyrinth/text.inc create mode 100644 data/maps/FourIsland/text.inc create mode 100644 data/maps/FourIsland_House1/text.inc create mode 100644 data/maps/FourIsland_IcefallCave_Back/text.inc create mode 100644 data/maps/FourIsland_LoreleisHouse/text.inc create mode 100644 data/maps/FourIsland_Mart/text.inc create mode 100644 data/maps/FourIsland_PokemonCenter_1F/text.inc create mode 100644 data/maps/FuchsiaCity/text.inc create mode 100644 data/maps/FuchsiaCity_Building1/text.inc create mode 100644 data/maps/FuchsiaCity_Gym/text.inc create mode 100644 data/maps/FuchsiaCity_House1/text.inc create mode 100644 data/maps/FuchsiaCity_House2/text.inc create mode 100644 data/maps/FuchsiaCity_House3/text.inc create mode 100644 data/maps/FuchsiaCity_Mart/text.inc create mode 100644 data/maps/FuchsiaCity_PokemonCenter_1F/text.inc create mode 100644 data/maps/FuchsiaCity_SafariZone_Entrance/text.inc create mode 100644 data/maps/FuchsiaCity_ZooBuilding/text.inc create mode 100644 data/maps/IndigoPlateau_PokemonCenter_1F/text.inc create mode 100644 data/maps/LavenderTown/text.inc create mode 100644 data/maps/LavenderTown_House1/text.inc create mode 100644 data/maps/LavenderTown_House2/text.inc create mode 100644 data/maps/LavenderTown_Mart/text.inc create mode 100644 data/maps/LavenderTown_PokemonCenter_1F/text.inc create mode 100644 data/maps/LavenderTown_VolunteerPokemonHouse/text.inc create mode 100644 data/maps/MtEmber_Exterior/text.inc create mode 100644 data/maps/MtEmber_RubyPath_B3F/text.inc create mode 100644 data/maps/MtMoon_1F/text.inc create mode 100644 data/maps/MtMoon_B2F/text.inc create mode 100644 data/maps/OneIsland/text.inc create mode 100644 data/maps/OneIsland_House1/text.inc create mode 100644 data/maps/OneIsland_House2/text.inc create mode 100644 data/maps/OneIsland_KindleRoad/text.inc create mode 100644 data/maps/OneIsland_KindleRoad_EmberSpa/text.inc create mode 100644 data/maps/OneIsland_PokemonCenter_1F/text.inc create mode 100644 data/maps/OneIsland_TreasureBeach/text.inc create mode 100644 data/maps/PalletTown/text.inc create mode 100644 data/maps/PalletTown_GarysHouse/text.inc create mode 100644 data/maps/PalletTown_PlayersHouse_1F/text.inc create mode 100644 data/maps/PalletTown_PlayersHouse_2F/text.inc create mode 100644 data/maps/PalletTown_ProfessorOaksLab/text.inc create mode 100644 data/maps/PewterCity/text.inc create mode 100644 data/maps/PewterCity_Gym/text.inc create mode 100644 data/maps/PewterCity_House1/text.inc create mode 100644 data/maps/PewterCity_House2/text.inc create mode 100644 data/maps/PewterCity_Mart/text.inc create mode 100644 data/maps/PewterCity_Museum_1F/text.inc create mode 100644 data/maps/PewterCity_Museum_2F/text.inc create mode 100644 data/maps/PewterCity_PokemonCenter_1F/text.inc create mode 100644 data/maps/PokemonLeague_AgathasRoom/text.inc create mode 100644 data/maps/PokemonLeague_BrunosRoom/text.inc create mode 100644 data/maps/PokemonLeague_ChampionsRoom/text.inc create mode 100644 data/maps/PokemonLeague_HallOfFame/text.inc create mode 100644 data/maps/PokemonLeague_LancesRoom/text.inc create mode 100644 data/maps/PokemonLeague_LoreleisRoom/text.inc create mode 100644 data/maps/PokemonMansion_1F/text.inc create mode 100644 data/maps/PokemonMansion_2F/text.inc create mode 100644 data/maps/PokemonMansion_3F/text.inc create mode 100644 data/maps/PokemonMansion_B1F/text.inc create mode 100644 data/maps/PokemonTower_1F/text.inc create mode 100644 data/maps/PokemonTower_2F/text.inc create mode 100644 data/maps/PokemonTower_3F/text.inc create mode 100644 data/maps/PokemonTower_4F/text.inc create mode 100644 data/maps/PokemonTower_5F/text.inc create mode 100644 data/maps/PokemonTower_6F/text.inc create mode 100644 data/maps/PokemonTower_7F/text.inc create mode 100644 data/maps/RockTunnel_1F/text.inc create mode 100644 data/maps/RockTunnel_B1F/text.inc create mode 100644 data/maps/RocketHideout_B1F/text.inc create mode 100644 data/maps/RocketHideout_B2F/text.inc create mode 100644 data/maps/RocketHideout_B3F/text.inc create mode 100644 data/maps/RocketHideout_B4F/text.inc create mode 100644 data/maps/RocketHideout_Elevator/text.inc create mode 100644 data/maps/Route1/text.inc create mode 100644 data/maps/Route10/text.inc create mode 100644 data/maps/Route10_PokemonCenter_1F/text.inc create mode 100644 data/maps/Route11/text.inc create mode 100644 data/maps/Route11_EastEntrance_1F/text.inc create mode 100644 data/maps/Route11_EastEntrance_2F/text.inc create mode 100644 data/maps/Route12/text.inc create mode 100644 data/maps/Route12_FishingHouse/text.inc create mode 100644 data/maps/Route12_NorthEntrance_1F/text.inc create mode 100644 data/maps/Route12_NorthEntrance_2F/text.inc create mode 100644 data/maps/Route13/text.inc create mode 100644 data/maps/Route14/text.inc create mode 100644 data/maps/Route15/text.inc create mode 100644 data/maps/Route15_WestEntrance_1F/text.inc create mode 100644 data/maps/Route15_WestEntrance_2F/text.inc create mode 100644 data/maps/Route16/text.inc create mode 100644 data/maps/Route16_House/text.inc create mode 100644 data/maps/Route16_NorthEntrance_1F/text.inc create mode 100644 data/maps/Route16_NorthEntrance_2F/text.inc create mode 100644 data/maps/Route17/text.inc create mode 100644 data/maps/Route18/text.inc create mode 100644 data/maps/Route18_EastEntrance_1F/text.inc create mode 100644 data/maps/Route18_EastEntrance_2F/text.inc create mode 100644 data/maps/Route19/text.inc create mode 100644 data/maps/Route2/text.inc create mode 100644 data/maps/Route20/text.inc create mode 100644 data/maps/Route22/text.inc create mode 100644 data/maps/Route23/text.inc create mode 100644 data/maps/Route24/text.inc create mode 100644 data/maps/Route25/text.inc create mode 100644 data/maps/Route25_SeaCottage/text.inc create mode 100644 data/maps/Route2_EastBuilding/text.inc create mode 100644 data/maps/Route2_House/text.inc create mode 100644 data/maps/Route2_ViridianForest_NorthEntrance/text.inc create mode 100644 data/maps/Route2_ViridianForest_SouthEntrance/text.inc create mode 100644 data/maps/Route3/text.inc create mode 100644 data/maps/Route4/text.inc create mode 100644 data/maps/Route4_PokemonCenter_1F/text.inc create mode 100644 data/maps/Route5/text.inc create mode 100644 data/maps/Route5_SouthEntrance/text.inc create mode 100644 data/maps/Route6/text.inc create mode 100644 data/maps/Route6_NorthEntrance/text.inc create mode 100644 data/maps/Route7/text.inc create mode 100644 data/maps/Route7_EastEntrance/text.inc create mode 100644 data/maps/Route8/text.inc create mode 100644 data/maps/Route8_WestEntrance/text.inc create mode 100644 data/maps/Route9/text.inc create mode 100644 data/maps/SSAnne_1F_Corridor/text.inc create mode 100644 data/maps/SSAnne_1F_Room1/text.inc create mode 100644 data/maps/SSAnne_1F_Room2/text.inc create mode 100644 data/maps/SSAnne_1F_Room3/text.inc create mode 100644 data/maps/SSAnne_1F_Room4/text.inc create mode 100644 data/maps/SSAnne_1F_Room5/text.inc create mode 100644 data/maps/SSAnne_1F_Room6/text.inc create mode 100644 data/maps/SSAnne_1F_Room7/text.inc create mode 100644 data/maps/SSAnne_2F_Corridor/text.inc create mode 100644 data/maps/SSAnne_2F_Room1/text.inc create mode 100644 data/maps/SSAnne_2F_Room2/text.inc create mode 100644 data/maps/SSAnne_2F_Room3/text.inc create mode 100644 data/maps/SSAnne_2F_Room4/text.inc create mode 100644 data/maps/SSAnne_2F_Room5/text.inc create mode 100644 data/maps/SSAnne_2F_Room6/text.inc create mode 100644 data/maps/SSAnne_3F_Corridor/text.inc create mode 100644 data/maps/SSAnne_B1F_Room1/text.inc create mode 100644 data/maps/SSAnne_B1F_Room2/text.inc create mode 100644 data/maps/SSAnne_B1F_Room3/text.inc create mode 100644 data/maps/SSAnne_B1F_Room4/text.inc create mode 100644 data/maps/SSAnne_B1F_Room5/text.inc create mode 100644 data/maps/SSAnne_CaptainsOffice/text.inc create mode 100644 data/maps/SSAnne_Deck/text.inc create mode 100644 data/maps/SSAnne_Kitchen/text.inc create mode 100644 data/maps/SafariZone_Building1/text.inc create mode 100644 data/maps/SafariZone_Building2/text.inc create mode 100644 data/maps/SafariZone_Building3/text.inc create mode 100644 data/maps/SafariZone_Building4/text.inc create mode 100644 data/maps/SafariZone_Center/text.inc create mode 100644 data/maps/SafariZone_East/text.inc create mode 100644 data/maps/SafariZone_North/text.inc create mode 100644 data/maps/SafariZone_SecretHouse/text.inc create mode 100644 data/maps/SafariZone_West/text.inc create mode 100644 data/maps/SaffronCity_Dojo/text.inc create mode 100644 data/maps/SaffronCity_Duplicate/text.inc create mode 100644 data/maps/SaffronCity_Gym/text.inc create mode 100644 data/maps/SaffronCity_House1_1F/text.inc create mode 100644 data/maps/SaffronCity_House1_2F/text.inc create mode 100644 data/maps/SaffronCity_House2/text.inc create mode 100644 data/maps/SaffronCity_House3/text.inc create mode 100644 data/maps/SaffronCity_Mart/text.inc create mode 100644 data/maps/SaffronCity_PokemonCenter_1F/text.inc create mode 100644 data/maps/SaffronCity_PokemonTrainerFanClub/text.inc create mode 100644 data/maps/SeafoamIslands_B4F/text.inc create mode 100644 data/maps/SevenIsland/text.inc create mode 100644 data/maps/SevenIsland_House_Room1/text.inc create mode 100644 data/maps/SevenIsland_Mart/text.inc create mode 100644 data/maps/SevenIsland_PokemonCenter_1F/text.inc create mode 100644 data/maps/SevenIsland_SeavaultCanyon_TanobyKey/text.inc create mode 100644 data/maps/SevenIsland_SevaultCanyon/text.inc create mode 100644 data/maps/SevenIsland_SevaultCanyon_Entrance/text.inc create mode 100644 data/maps/SevenIsland_SevaultCanyon_House/text.inc create mode 100644 data/maps/SevenIsland_TrainerTower/text.inc create mode 100644 data/maps/SevenIsland_TrainerTower_Lobby/text.inc create mode 100644 data/maps/SilphCo_10F/text.inc create mode 100644 data/maps/SilphCo_11F/text.inc create mode 100644 data/maps/SilphCo_1F/text.inc create mode 100644 data/maps/SilphCo_2F/text.inc create mode 100644 data/maps/SilphCo_3F/text.inc create mode 100644 data/maps/SilphCo_4F/text.inc create mode 100644 data/maps/SilphCo_5F/text.inc create mode 100644 data/maps/SilphCo_6F/text.inc create mode 100644 data/maps/SilphCo_7F/text.inc create mode 100644 data/maps/SilphCo_8F/text.inc create mode 100644 data/maps/SilphCo_9F/text.inc create mode 100644 data/maps/SixIsland/text.inc create mode 100644 data/maps/SixIsland_DottedHole_SapphireRoom/text.inc create mode 100644 data/maps/SixIsland_GreenPath/text.inc create mode 100644 data/maps/SixIsland_House/text.inc create mode 100644 data/maps/SixIsland_Mart/text.inc create mode 100644 data/maps/SixIsland_OutcastIsland/text.inc create mode 100644 data/maps/SixIsland_PatternBush/text.inc create mode 100644 data/maps/SixIsland_PokemonCenter_1F/text.inc create mode 100644 data/maps/SixIsland_RuinValley/text.inc create mode 100644 data/maps/SixIsland_WaterPath/text.inc create mode 100644 data/maps/SixIsland_WaterPath_House1/text.inc create mode 100644 data/maps/SixIsland_WaterPath_House2/text.inc create mode 100644 data/maps/ThreeIsland/text.inc create mode 100644 data/maps/ThreeIsland_BerryForest/text.inc create mode 100644 data/maps/ThreeIsland_BondBridge/text.inc create mode 100644 data/maps/ThreeIsland_DunsparceTunnel/text.inc create mode 100644 data/maps/ThreeIsland_House1/text.inc create mode 100644 data/maps/ThreeIsland_House2/text.inc create mode 100644 data/maps/ThreeIsland_House3/text.inc create mode 100644 data/maps/ThreeIsland_House4/text.inc create mode 100644 data/maps/ThreeIsland_House5/text.inc create mode 100644 data/maps/ThreeIsland_Mart/text.inc create mode 100644 data/maps/ThreeIsland_PokemonCenter_1F/text.inc create mode 100644 data/maps/ThreeIsland_Port/text.inc create mode 100644 data/maps/TwoIsland/text.inc create mode 100644 data/maps/TwoIsland_House/text.inc create mode 100644 data/maps/TwoIsland_JoyfulGameCorner/text.inc create mode 100644 data/maps/TwoIsland_PokemonCenter_1F/text.inc create mode 100644 data/maps/UndergroundPath_EastEntrance/text.inc create mode 100644 data/maps/UndergroundPath_SouthEntrance/text.inc create mode 100644 data/maps/UndergroundPath_WestEntrance/text.inc create mode 100644 data/maps/VermilionCity/text.inc create mode 100644 data/maps/VermilionCity_Gym/text.inc create mode 100644 data/maps/VermilionCity_House1/text.inc create mode 100644 data/maps/VermilionCity_House3/text.inc create mode 100644 data/maps/VermilionCity_Mart/text.inc create mode 100644 data/maps/VermilionCity_PokemonCenter_1F/text.inc create mode 100644 data/maps/VermilionCity_PokemonFanClub/text.inc create mode 100644 data/maps/VictoryRoad_1F/text.inc create mode 100644 data/maps/VictoryRoad_2F/text.inc create mode 100644 data/maps/VictoryRoad_3F/text.inc create mode 100644 data/maps/ViridianCity/text.inc create mode 100644 data/maps/ViridianCity_Gym/text.inc create mode 100644 data/maps/ViridianCity_House1/text.inc create mode 100644 data/maps/ViridianCity_House2/text.inc create mode 100644 data/maps/ViridianCity_Mart/text.inc create mode 100644 data/maps/ViridianCity_PokemonCenter_1F/text.inc create mode 100644 data/maps/ViridianForest/text.inc (limited to 'data/maps') diff --git a/data/maps/CeladonCity/text.inc b/data/maps/CeladonCity/text.inc new file mode 100644 index 000000000..f10516c9d --- /dev/null +++ b/data/maps/CeladonCity/text.inc @@ -0,0 +1,114 @@ +gUnknown_817FEC3:: @ 817FEC3 + .string "I got my KOFFING in CINNABAR.\p" + .string "It's usually nice, but it breathes\n" + .string "poison when it's angry.$" + +gUnknown_817FF1C:: @ 817FF1C + .string "Heheh! This GYM is great!\n" + .string "It's full of women!$" + +gUnknown_817FF4A:: @ 817FF4A + .string "CELADON takes pride in its efforts\n" + .string "to keep the city beautiful.\p" + .string "That's why the new GAME CORNER is\n" + .string "bad for our city's image.$" + +gUnknown_817FFC5:: @ 817FFC5 + .string "Moan…\n" + .string "I blew it all at the slots!\p" + .string "I knew I should have cashed in my\n" + .string "COINS for prizes!$" + +gUnknown_818001B:: @ 818001B + .string "This is my trusted pal, POLIWRATH.\p" + .string "It evolved from a POLIWHIRL when\n" + .string "I used a WATER STONE.$" + +gUnknown_8180075:: @ 8180075 + .string "POLIWRATH: Ribi ribit!$" + +gUnknown_818008C:: @ 818008C + .string "What are you staring at?\n" + .string "Get lost, or I'll punch you.$" + +gUnknown_81800C2:: @ 81800C2 + .string "Keep out of TEAM ROCKET's way!$" + +gUnknown_81800E1:: @ 81800E1 + .string "TRAINER TIPS\p" + .string "X ACCURACY boosts the accuracy of\n" + .string "techniques.\p" + .string "DIRE HIT jacks up the likelihood\n" + .string "of critical hits.\p" + .string "Get your items at the CELADON\n" + .string "DEPT. STORE!$" + +gUnknown_818017A:: @ 818017A + .string "CELADON CITY\n" + .string "The City of Rainbow Dreams$" + +gUnknown_81801A2:: @ 81801A2 + .string "CELADON CITY POKéMON GYM\n" + .string "LEADER: ERIKA\l" + .string "The Nature-Loving Princess!$" + +gUnknown_81801E5:: @ 81801E5 + .string "CELADON MANSION$" + +gUnknown_81801F5:: @ 81801F5 + .string "Find what you need at the\n" + .string "CELADON DEPT. STORE!$" + +gUnknown_8180224:: @ 8180224 + .string "TRAINER TIPS\p" + .string "GUARD SPEC. protects POKéMON\n" + .string "from status-reduction moves during\l" + .string "battle.\p" + .string "Get your items at the\n" + .string "CELADON DEPT. STORE!$" + +gUnknown_81802A4:: @ 81802A4 + .string "COINS exchanged for prizes!\n" + .string "PRIZE EXCHANGE$" + +gUnknown_81802CF:: @ 81802CF + .string "ROCKET GAME CORNER\n" + .string "The playground for grown-ups!$" + +gUnknown_8180300:: @ 8180300 + .string "Aaaagh, ow…\n" + .string "I scalded my tongue!\p" + .string "This nice old lady in the MANSION\n" + .string "gave me some TEA.\p" + .string "But it was boiling hot!\n" + .string "Gotta cool it to drink it.$" + +Text_180388:: @ 8180388 + .string "Hello, there!\p" + .string "I've seen you about, but I never\n" + .string "had a chance to chat.\p" + .string "It must be good luck that brought\n" + .string "us together finally.\p" + .string "I'd like to celebrate by teaching\n" + .string "you the move SOFTBOILED.$" + +Text_18043F:: @ 818043F + .string "I'll always be keeping an eye out\n" + .string "for you.\p" + .string "I hope we can chat again.$" + +Text_180484:: @ 8180484 + .string "So, who's the POKéMON that gets\n" + .string "the chance to learn SOFTBOILED?$" + +Text_1804C4:: @ 81804C4 + .string "I wish you the best of luck!$" + +gUnknown_81804E1:: @ 81804E1 + .string "Oh, what am I to do…\p" + .string "Someone stole our SILPH SCOPE.\p" + .string "The thief came running this way,\n" + .string "I'm sure of it.\p" + .string "But I lost sight of him!\n" + .string "Where'd he go?$" + diff --git a/data/maps/CeladonCity_Condominiums_1F/text.inc b/data/maps/CeladonCity_Condominiums_1F/text.inc new file mode 100644 index 000000000..7cfb9c2a1 --- /dev/null +++ b/data/maps/CeladonCity_Condominiums_1F/text.inc @@ -0,0 +1,37 @@ +gUnknown_81960BB:: @ 81960BB + .string "MEOWTH: Meow!$" + +gUnknown_81960C9:: @ 81960C9 + .string "You shouldn't spend all your money\n" + .string "on drinks.\p" + .string "Try this instead.$" + +gUnknown_8196109:: @ 8196109 + .string "Nothing beats thirst like some hot\n" + .string "TEA.\p" + .string "It really is the best.$" + +gUnknown_8196148:: @ 8196148 + .string "My dear POKéMON keep me company.\n" + .string "MEOWTH even brings money home!$" + +gUnknown_8196188:: @ 8196188 + .string "Oh, hello, dearie.\n" + .string "Did you enjoy my TEA?\p" + .string "By the way, dear. Are you, by any\n" + .string "chance, from PALLET TOWN?\p" + .string "A girl from PALLET TOWN, DAISY,\n" + .string "she enjoys TEA every day.\p" + .string "She visits the CELADON DEPT. STORE\n" + .string "to buy some TEA.$" + +gUnknown_819625B:: @ 819625B + .string "CLEFAIRY: Pi pippippi!$" + +gUnknown_8196272:: @ 8196272 + .string "NIDORAN♀: Kya kyaoo!$" + +gUnknown_8196287:: @ 8196287 + .string "CELADON MANSION\n" + .string "Manager's Suite$" + diff --git a/data/maps/CeladonCity_Condominiums_2F/text.inc b/data/maps/CeladonCity_Condominiums_2F/text.inc new file mode 100644 index 000000000..1913e1529 --- /dev/null +++ b/data/maps/CeladonCity_Condominiums_2F/text.inc @@ -0,0 +1,3 @@ +gUnknown_81962A7:: @ 81962A7 + .string "GAME FREAK Meeting Room$" + diff --git a/data/maps/CeladonCity_Condominiums_3F/text.inc b/data/maps/CeladonCity_Condominiums_3F/text.inc new file mode 100644 index 000000000..3f7179dfe --- /dev/null +++ b/data/maps/CeladonCity_Condominiums_3F/text.inc @@ -0,0 +1,42 @@ +gUnknown_81962BF:: @ 81962BF + .string "Me?\n" + .string "I'm the programmer!$" + +gUnknown_81962D7:: @ 81962D7 + .string "I'm the graphic artist!\n" + .string "I drew you!$" + +gUnknown_81962FB:: @ 81962FB + .string "I wrote the story!\n" + .string "Isn't ERIKA cute?\p" + .string "I like MISTY a lot, too!\n" + .string "Oh, and SABRINA, I like her!$" + +gUnknown_8196356:: @ 8196356 + .string "Is that right?\p" + .string "I'm the game designer!\p" + .string "Filling up your POKéDEX is tough,\n" + .string "but don't quit!\p" + .string "When you finish, come tell me!$" + +Text_1963CD:: @ 81963CD + .string "Wow! Excellent!\n" + .string "You completed your POKéDEX!\l" + .string "Congratulations!\l" + .string "…$" + +gUnknown_819640C:: @ 819640C + .string "It's the game program! Messing with\n" + .string "it could bug out the game!$" + +gUnknown_819644B:: @ 819644B + .string "Someone's playing a game instead of\n" + .string "working!$" + +gUnknown_8196478:: @ 8196478 + .string "It's the script!\n" + .string "Better not look at the ending!$" + +gUnknown_81964A8:: @ 81964A8 + .string "GAME FREAK Development Room$" + diff --git a/data/maps/CeladonCity_Condominiums_Roof/text.inc b/data/maps/CeladonCity_Condominiums_Roof/text.inc new file mode 100644 index 000000000..02398e70b --- /dev/null +++ b/data/maps/CeladonCity_Condominiums_Roof/text.inc @@ -0,0 +1,3 @@ +gUnknown_81964C4:: @ 81964C4 + .string "I KNOW EVERYTHING!$" + diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/text.inc b/data/maps/CeladonCity_Condominiums_RoofRoom/text.inc new file mode 100644 index 000000000..bb09c8ce3 --- /dev/null +++ b/data/maps/CeladonCity_Condominiums_RoofRoom/text.inc @@ -0,0 +1,52 @@ +gUnknown_81964D7:: @ 81964D7 + .string "There is nothing that I don't know,\n" + .string "like I wrote on the blackboard.\p" + .string "I know about the world of POKéMON\n" + .string "in your GAME BOY ADVANCE!\p" + .string "Get together with your friends and\n" + .string "enjoy trading POKéMON!$" + +Text_196591:: @ 8196591 + .string "{PLAYER} obtained an EEVEE!$" + +Text_1965A7:: @ 81965A7 + .string "ポケモンが　いっぱいだ\n" + .string "ボックスを　かえて　きなさい$" + +gUnknown_81965C2:: @ 81965C2 + .string "POKéMON Lecture\p" + .string "Playing with the Wireless Adapter$" + +Text_1965F4:: @ 81965F4 + .string "Which heading do you want to read?$" + +gUnknown_8196617:: @ 8196617 + .string "The POKéMON WIRELESS CLUB is\n" + .string "upstairs at any POKéMON CENTER.\p" + .string "Visit one to link up with friend(s)\n" + .string "using your Wireless Adapter.$" + +gUnknown_8196695:: @ 8196695 + .string "To link only with a friend, go to\n" + .string "the DIRECT CORNER.\p" + .string "It is the right counter at the\n" + .string "POKéMON WIRELESS CLUB.\p" + .string "Go into the TRADE CORNER or the\n" + .string "COLOSSEUM with your friend.$" + +gUnknown_819673C:: @ 819673C + .string "To link and communicate with\n" + .string "anyone, go to the UNION ROOM.\p" + .string "It is the left counter at the\n" + .string "POKéMON WIRELESS CLUB.\p" + .string "Go to the UNION ROOM and enjoy\n" + .string "meeting other TRAINERS.$" + +gUnknown_81967E3:: @ 81967E3 + .string "It's a pamphlet on TMs.\p" + .string "… …\p" + .string "There are fifty TMs in all.\p" + .string "There are also seven HMs that\n" + .string "can be used repeatedly.\p" + .string "SILPH CO.$" + diff --git a/data/maps/CeladonCity_DepartmentStore_1F/text.inc b/data/maps/CeladonCity_DepartmentStore_1F/text.inc new file mode 100644 index 000000000..e78a8c6d2 --- /dev/null +++ b/data/maps/CeladonCity_DepartmentStore_1F/text.inc @@ -0,0 +1,17 @@ +gUnknown_81954DD:: @ 81954DD + .string "Hello!\n" + .string "Welcome to CELADON DEPT. STORE.\p" + .string "The board on the right describes\n" + .string "the store layout.$" + +gUnknown_8195537:: @ 8195537 + .string "1F: SERVICE COUNTER\p" + .string "2F: TRAINER'S MARKET\p" + .string "3F: TV GAME SHOP\p" + .string "4F: WISE MAN GIFTS\p" + .string "5F: DRUGSTORE\p" + .string "ROOFTOP SQUARE: VENDING MACHINES$" + +gUnknown_81955B3:: @ 81955B3 + .string "1F: SERVICE COUNTER$" + diff --git a/data/maps/CeladonCity_DepartmentStore_2F/text.inc b/data/maps/CeladonCity_DepartmentStore_2F/text.inc new file mode 100644 index 000000000..22bf6b36c --- /dev/null +++ b/data/maps/CeladonCity_DepartmentStore_2F/text.inc @@ -0,0 +1,13 @@ +gUnknown_81955C7:: @ 81955C7 + .string "SUPER REPEL keeps weak POKéMON at\n" + .string "bay…\p" + .string "Hmm, it's a more powerful REPEL.$" + +gUnknown_819560F:: @ 819560F + .string "For long outings, you should buy\n" + .string "REVIVE.$" + +gUnknown_8195638:: @ 8195638 + .string "Top-Grade Items for TRAINERS!\p" + .string "2F: TRAINER'S MARKET$" + diff --git a/data/maps/CeladonCity_DepartmentStore_3F/text.inc b/data/maps/CeladonCity_DepartmentStore_3F/text.inc new file mode 100644 index 000000000..7d4db12cc --- /dev/null +++ b/data/maps/CeladonCity_DepartmentStore_3F/text.inc @@ -0,0 +1,56 @@ +Text_19566B:: @ 819566B + .string "We have a customer, LANCE, who\n" + .string "occasionally comes.\p" + .string "He always buys capes.\p" + .string "I wonder… Does he have many\n" + .string "identical capes at home?$" + +gUnknown_81956E9:: @ 81956E9 + .string "Captured POKéMON are registered\n" + .string "with an ID No. and the OT.\p" + .string "OT stands for “Original TRAINER” -\n" + .string "the TRAINER that caught it first.$" + +gUnknown_8195769:: @ 8195769 + .string "All right!\p" + .string "My buddy's going to trade me his\n" + .string "KANGASKHAN for my HAUNTER!$" + +gUnknown_81957B0:: @ 81957B0 + .string "Come on, HAUNTER!\p" + .string "I love HAUNTER!\n" + .string "I collect them!\p" + .string "Huh?\p" + .string "HAUNTER turned into a different\n" + .string "POKéMON while being traded!$" + +gUnknown_8195823:: @ 8195823 + .string "You can identify POKéMON you get\n" + .string "in trades by their ID Numbers.$" + +gUnknown_8195863:: @ 8195863 + .string "It's a Super NES.$" + +gUnknown_8195875:: @ 8195875 + .string "An RPG!\n" + .string "There's no time for that!$" + +gUnknown_8195897:: @ 8195897 + .string "A sports game!\n" + .string "Dad'll like that!$" + +gUnknown_81958B8:: @ 81958B8 + .string "A puzzle game!\n" + .string "Looks addictive!$" + +gUnknown_81958D8:: @ 81958D8 + .string "A fighting game!\n" + .string "Looks tough!$" + +gUnknown_81958F6:: @ 81958F6 + .string "3F: TV GAME SHOP$" + +gUnknown_8195907:: @ 8195907 + .string "Red and Green!\n" + .string "Both are POKéMON!$" + diff --git a/data/maps/CeladonCity_DepartmentStore_4F/text.inc b/data/maps/CeladonCity_DepartmentStore_4F/text.inc new file mode 100644 index 000000000..efe6c5835 --- /dev/null +++ b/data/maps/CeladonCity_DepartmentStore_4F/text.inc @@ -0,0 +1,41 @@ +Text_195928:: @ 8195928 + .string "Oh, hi!\n" + .string "I finally finished POKéMON.\p" + .string "Not done yet? How about I teach\n" + .string "you a good move?\p" + .string "The move I have in mind is\n" + .string "COUNTER.\p" + .string "Not like the one I'm leaning on,\n" + .string "mind you!$" + +Text_1959CC:: @ 81959CC + .string "You're not interested? Come see\n" + .string "me if you change your mind.$" + +Text_195A08:: @ 8195A08 + .string "Which POKéMON should I teach\n" + .string "COUNTER to?$" + +Text_195A31:: @ 8195A31 + .string "Are you using that COUNTER move\n" + .string "I taught your POKéMON?$" + +gUnknown_8195A68:: @ 8195A68 + .string "I'm getting a present for my\n" + .string "girlfriend.\p" + .string "I guess a POKé DOLL will be it.\n" + .string "It's the popular thing.$" + +gUnknown_8195AC9:: @ 8195AC9 + .string "I heard something useful.\p" + .string "If a wild POKéMON appears, you can\n" + .string "distract it with a POKé DOLL.\p" + .string "You can run away while the wild\n" + .string "POKéMON is distracted.$" + +gUnknown_8195B5B:: @ 8195B5B + .string "Express yourself with gifts!\n" + .string "4F: WISE MAN GIFTS\p" + .string "Evolution Special!\n" + .string "Element STONES on sale now!$" + diff --git a/data/maps/CeladonCity_DepartmentStore_5F/text.inc b/data/maps/CeladonCity_DepartmentStore_5F/text.inc new file mode 100644 index 000000000..b8cee5afa --- /dev/null +++ b/data/maps/CeladonCity_DepartmentStore_5F/text.inc @@ -0,0 +1,23 @@ +gUnknown_8195BBA:: @ 8195BBA + .string "POKéMON stat enhancers can be\n" + .string "bought only here.\p" + .string "HP UP increases the base HP of a\n" + .string "POKéMON.\p" + .string "CALCIUM raises the base SP. ATK\n" + .string "stat of one POKéMON.\p" + .string "ZINC boosts the base SP. DEF stat\n" + .string "of one POKéMON.\p" + .string "CARBOS enhances the base SPEED\n" + .string "stat.$" + +gUnknown_8195CA0:: @ 8195CA0 + .string "I'm here for POKéMON stat\n" + .string "enhancers.\p" + .string "PROTEIN increases the base ATTACK\n" + .string "power.\p" + .string "IRON increases the base DEFENSE\n" + .string "stat.$" + +gUnknown_8195D14:: @ 8195D14 + .string "5F: DRUGSTORE$" + diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/text.inc b/data/maps/CeladonCity_DepartmentStore_Roof/text.inc new file mode 100644 index 000000000..a03cfedaf --- /dev/null +++ b/data/maps/CeladonCity_DepartmentStore_Roof/text.inc @@ -0,0 +1,82 @@ +gUnknown_8195D22:: @ 8195D22 + .string "I'm thirsty!\n" + .string "I want something to drink!\p" + .string "{SIZE}ÁGive her a drink?$" + +Text_195D5F:: @ 8195D5F + .string "Give her which drink?$" + +gUnknown_8195D75:: @ 8195D75 + .string "Yay!\p" + .string "FRESH WATER!\p" + .string "Thank you!\n" + .string "You can have this from me!$" + +Text_195DAD:: @ 8195DAD + .string "{PLAYER} received a {STR_VAR_2}\n" + .string "from the little girl.$" + +gUnknown_8195DD4:: @ 8195DD4 + .string "TM16 contains LIGHT SCREEN.\p" + .string "It's a move that weakens the power\n" + .string "of special attacks by your foe.$" + +gUnknown_8195E33:: @ 8195E33 + .string "Yay!\p" + .string "SODA POP!\p" + .string "Thank you!\n" + .string "You can have this from me!$" + +gUnknown_8195E68:: @ 8195E68 + .string "TM20 contains SAFEGUARD.\p" + .string "It's a move that prevents status\n" + .string "problems among your POKéMON.$" + +gUnknown_8195EBF:: @ 8195EBF + .string "Yay!\p" + .string "LEMONADE!\p" + .string "Thank you!\n" + .string "You can have this from me!$" + +gUnknown_8195EF4:: @ 8195EF4 + .string "TM33 contains REFLECT.\p" + .string "It's a move that weakens the power\n" + .string "of physical attacks by your foe.$" + +gUnknown_8195F4F:: @ 8195F4F + .string "You don't have space for this!$" + +gUnknown_8195F6E:: @ 8195F6E + .string "No, thank you!\n" + .string "I'm not thirsty after all!$" + +gUnknown_8195F98:: @ 8195F98 + .string "My sister is a TRAINER, believe it\n" + .string "or not.\p" + .string "But, she's so immature, she drives\n" + .string "me nuts!$" + +gUnknown_8195FEF:: @ 8195FEF + .string "I'm thirsty!\n" + .string "I want something to drink!$" + +gUnknown_8196017:: @ 8196017 + .string "ROOFTOP SQUARE:\n" + .string "VENDING MACHINES$" + +Text_196038:: @ 8196038 + .string "A vending machine!\n" + .string "What does it have?$" + +gUnknown_819605E:: @ 819605E + .string "Oops, not enough money!$" + +gUnknown_8196076:: @ 8196076 + .string "A can of {STR_VAR_1} popped out!$" + +gUnknown_819608E:: @ 819608E + .string "There's no more room for stuff!$" + +gUnknown_81960AE:: @ 81960AE + .string "Not thirsty!$" + diff --git a/data/maps/CeladonCity_GameCorner/text.inc b/data/maps/CeladonCity_GameCorner/text.inc new file mode 100644 index 000000000..a388a736f --- /dev/null +++ b/data/maps/CeladonCity_GameCorner/text.inc @@ -0,0 +1,148 @@ +gUnknown_8196940:: @ 8196940 + .string "Welcome!\p" + .string "You can exchange your COINS for\n" + .string "fabulous prizes next door.$" + +Text_196984:: @ 8196984 + .string "Welcome to ROCKET GAME CORNER!\p" + .string "Do you need some game COINS?\n" + .string "Would you like to buy some?$" + +gUnknown_81969DC:: @ 81969DC + .string "No?\n" + .string "Please come play sometime!$" + +gUnknown_81969FB:: @ 81969FB + .string "Oh, I'm sorry.\n" + .string "You don't have a COIN CASE.$" + +gUnknown_8196A26:: @ 8196A26 + .string "Whoops!\n" + .string "Your COIN CASE is full.$" + +gUnknown_8196A46:: @ 8196A46 + .string "You can't afford the COINS.$" + +gUnknown_8196A62:: @ 8196A62 + .string "Thank you.\n" + .string "Here are your COINS!$" + +gUnknown_8196A82:: @ 8196A82 + .string "Keep this quiet.\p" + .string "It's rumored that this place is run\n" + .string "by TEAM ROCKET.$" + +gUnknown_8196AC7:: @ 8196AC7 + .string "I think these machines have\n" + .string "different odds.$" + +gUnknown_8196AF3:: @ 8196AF3 + .string "Kid, do you want to play?$" + +gUnknown_8196B0D:: @ 8196B0D + .string "{PLAYER} received 10 COINS\n" + .string "from the man.$" + +gUnknown_8196B30:: @ 8196B30 + .string "You don't need my COINS!$" + +gUnknown_8196B49:: @ 8196B49 + .string "Wins seem to come and go.\n" + .string "Nothing's a sure thing.$" + +gUnknown_8196B7B:: @ 8196B7B + .string "These slot games…\n" + .string "Win or lose, it's only by luck.$" + +gUnknown_8196BAD:: @ 8196BAD + .string "Hey!\p" + .string "You have better things to do,\n" + .string "champ in the making!\p" + .string "CELADON GYM's LEADER is ERIKA.\p" + .string "She is a user of GRASS-type\n" + .string "POKéMON, and at one with nature.\p" + .string "She might appear docile because of\n" + .string "her flower arranging…\p" + .string "But she's not one to be taken\n" + .string "lightly!$" + +gUnknown_8196CA1:: @ 8196CA1 + .string "They offer rare POKéMON that can\n" + .string "be exchanged for your COINS.\p" + .string "But, I just can't seem to win!$" + +gUnknown_8196CFE:: @ 8196CFE + .string "Games are scary!\n" + .string "It's so easy to get hooked!$" + +gUnknown_8196D2B:: @ 8196D2B + .string "What's up?\n" + .string "Want some COINS?$" + +gUnknown_8196D47:: @ 8196D47 + .string "{PLAYER} received 20 COINS\n" + .string "from the nice guy.$" + +gUnknown_8196D6F:: @ 8196D6F + .string "You have lots of COINS!$" + +gUnknown_8196D87:: @ 8196D87 + .string "Darn! I need more COINS for the\n" + .string "POKéMON I want!$" + +gUnknown_8196DB7:: @ 8196DB7 + .string "Hey, what? You're throwing me off!\n" + .string "Here are some COINS, so shoo!$" + +gUnknown_8196DF8:: @ 8196DF8 + .string "{PLAYER} received 20 COINS\n" + .string "from the man.$" + +gUnknown_8196E1B:: @ 8196E1B + .string "You've got plenty of your own\n" + .string "COINS!$" + +gUnknown_8196E40:: @ 8196E40 + .string "The trick is to watch the reels\n" + .string "closely.$" + +Text_196E69:: @ 8196E69 + .string "I'm guarding this poster!\n" + .string "Go away, or else!$" + +Text_196E95:: @ 8196E95 + .string "Dang!$" + +gUnknown_8196E9B:: @ 8196E9B + .string "The TEAM ROCKET HIDEOUT might\n" + .string "be discovered!\p" + .string "I better tell BOSS!$" + +gUnknown_8196EDC:: @ 8196EDC + .string "Hey!\p" + .string "A switch behind the poster!?\n" + .string "Let's push it!$" + +gUnknown_8196F0D:: @ 8196F0D + .string "A COIN CASE is required…$" + +gUnknown_8196F26:: @ 8196F26 + .string "Oops!\n" + .string "Don't have the COIN CASE!$" + +gUnknown_8196F46:: @ 8196F46 + .string "A slot machine!\n" + .string "Want to play?$" + +gUnknown_8196F64:: @ 8196F64 + .string "OUT OF ORDER\n" + .string "This is broken.$" + +gUnknown_8196F81:: @ 8196F81 + .string "OUT TO LUNCH\n" + .string "This is reserved.$" + +gUnknown_8196FA0:: @ 8196FA0 + .string "Someone's keys!\n" + .string "They'll be back.$" + diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/text.inc b/data/maps/CeladonCity_GameCorner_PrizeRoom/text.inc new file mode 100644 index 000000000..a5a21b9bc --- /dev/null +++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/text.inc @@ -0,0 +1,31 @@ +gUnknown_8196FC1:: @ 8196FC1 + .string "I sure do fancy that PORYGON!\n" + .string "But, it's hard to win at slots!$" + +gUnknown_8196FFF:: @ 8196FFF + .string "Gahaha! I raked it in today!\n" + .string "If only every day were like this…$" + +gUnknown_819703E:: @ 819703E + .string "A COIN CASE is required…$" + +gUnknown_8197057:: @ 8197057 + .string "We exchange your COINS for prizes.$" + +Text_19707A:: @ 819707A + .string "Which prize would you like?$" + +gUnknown_8197096:: @ 8197096 + .string "はい どうぞ$" + +gUnknown_819709D:: @ 819709D + .string "So, you want the {STR_VAR_1}?$" + +gUnknown_81970B2:: @ 81970B2 + .string "Okay, a TM of {STR_VAR_2}\n" + .string "is what you want?$" + +gUnknown_81970D5:: @ 81970D5 + .string "Sorry, you'll need more COINS\n" + .string "than that.$" + diff --git a/data/maps/CeladonCity_Gym/text.inc b/data/maps/CeladonCity_Gym/text.inc new file mode 100644 index 000000000..27d1a6a21 --- /dev/null +++ b/data/maps/CeladonCity_Gym/text.inc @@ -0,0 +1,170 @@ +gUnknown_81970FE:: @ 81970FE + .string "おきゃくさん もう もてないよ$" @ I'm sorry I don't have any more + +gUnknown_819710E:: @ 819710E + .string "あっ そう$" @ I see + +Text_197114:: @ 8197114 + .string "Hello…\n" + .string "Lovely weather, isn't it?\l" + .string "It's so pleasant…\p" + + .string "…Oh, dear…\n" + .string "I must have dozed off. Welcome.\p" + + .string "My name is ERIKA.\n" + .string "I am the LEADER of CELADON GYM.\p" + + .string "I am a student of the art of\n" + .string "flower arranging.\p" + + .string "My POKéMON are solely of the\n" + .string "GRASS type.\p" + + .string "…Oh, I'm sorry, I had no idea that\n" + .string "you wished to challenge me.\p" + + .string "Very well, but I shall not lose.{PLAY_BGM BGM_FRLG_LEADER_EYE}$" + +Text_197260:: @ 8197260 + .string "Oh!\n" + .string "I concede defeat.\l" + .string "You are remarkably strong.\p" + + .string "I must confer on you the\n" + .string "RAINBOWBADGE.$" + +gUnknown_81972B8:: @ 81972B8 + .string "You are cataloging POKéMON?\n" + .string "I must say I'm impressed.\p" + + .string "I would never collect POKéMON if\n" + .string "they were unattractive.$" + +gUnknown_8197327:: @ 8197327 + .string "The RAINBOWBADGE will make\n" + .string "POKéMON up to Lv. 50 obey.\p" + + .string "It also allows POKéMON to use\n" + .string "STRENGTH in and out of battle.\p" + + .string "Please also take this with you.$" + +gUnknown_81973BA:: @ 81973BA + .string "{PLAYER} received TM19\n" + .string "from ERIKA.$" + +gUnknown_81973D7:: @ 81973D7 + .string "TM19 contains GIGA DRAIN.\p" + + .string "Half the damage it inflicts is\n" + .string "drained to heal your POKéMON.\p" + + .string "Wouldn't you agree that it's a\n" + .string "wonderful move?$" + +gUnknown_819745D:: @ 819745D + .string "You should make room for this.$" + +Text_19747C:: @ 819747C + .string "I should tell you about this GYM.\p" + .string "Only real ladies are allowed in\n" + .string "here!$" + +Text_1974C4:: @ 81974C4 + .string "You're too rough!$" + +gUnknown_81974D6:: @ 81974D6 + .string "Bleaah!\n" + .string "I hope ERIKA wipes you out!$" + +Text_1974FA:: @ 81974FA + .string "Oh, welcome.\n" + .string "I was getting bored.$" + +Text_19751C:: @ 819751C + .string "My makeup!$" + +gUnknown_8197527:: @ 8197527 + .string "GRASS-type POKéMON are tough\n" + .string "against the WATER type.\p" + .string "They also have an edge on ROCK-\n" + .string "and GROUND-type POKéMON.$" + +Text_197595:: @ 8197595 + .string "…Weren't you peeking in here\n" + .string "earlier?$" + +Text_1975BB:: @ 81975BB + .string "You're an eye-opener!$" + +gUnknown_81975D1:: @ 81975D1 + .string "Oh, you were looking at ERIKA…\n" + .string "You weren't looking at me…$" + +Text_19760B:: @ 819760B + .string "Look, look!\n" + .string "See my POKéMON!\p" + .string "I like the GRASS type.\n" + .string "I like how they're easy to raise.$" + +Text_197660:: @ 8197660 + .string "No!$" + +gUnknown_8197664:: @ 8197664 + .string "We only use GRASS-type POKéMON at\n" + .string "our GYM.\p" + .string "Why? We also use them for making\n" + .string "flower arrangements!$" + +Text_1976C5:: @ 81976C5 + .string "Oh, hey!\p" + .string "We don't like BUG- or FIRE-type\n" + .string "POKéMON in here!$" + +Text_1976FF:: @ 81976FF + .string "Oh!\n" + .string "You!$" + +gUnknown_8197708:: @ 8197708 + .string "Our LEADER ERIKA might be quiet,\n" + .string "but she's famous around here.$" + +Text_197747:: @ 8197747 + .string "Pleased to meet you.\n" + .string "My hobby is POKéMON training.$" + +Text_19777A:: @ 819777A + .string "Oh!\n" + .string "Splendid!$" + +gUnknown_8197788:: @ 8197788 + .string "I have a blind date coming up.\n" + .string "I have to learn to be polite,\l" + .string "especially if I have to battle.$" + +Text_1977E5:: @ 81977E5 + .string "Welcome to CELADON GYM!\p" + .string "You'd better not underestimate\n" + .string "the nice ladies here.$" + +Text_197832:: @ 8197832 + .string "Oh!\n" + .string "Beaten!$" + +gUnknown_819783E:: @ 819783E + .string "I didn't bring my best POKéMON.\n" + .string "Wait until next time!$" + +gUnknown_8197874:: @ 8197874 + .string "CELADON POKéMON GYM\n" + .string "LEADER: ERIKA\p" + .string "WINNING TRAINERS:\n" + .string "{RIVAL}$" + +gUnknown_81978AB:: @ 81978AB + .string "CELADON POKéMON GYM\n" + .string "LEADER: ERIKA\p" + .string "WINNING TRAINERS:\n" + .string "{RIVAL}, {PLAYER}$" + diff --git a/data/maps/CeladonCity_Hotel/text.inc b/data/maps/CeladonCity_Hotel/text.inc new file mode 100644 index 000000000..b1c989120 --- /dev/null +++ b/data/maps/CeladonCity_Hotel/text.inc @@ -0,0 +1,21 @@ +Text_197B6F:: @ 8197B6F + .string "ぶつだん　だ‥$" + +gUnknown_8197B77:: @ 8197B77 + .string "POKéMON?\n" + .string "No, this is a hotel for people.\p" + .string "We're full up, unfortunately.$" + +gUnknown_8197BBE:: @ 8197BBE + .string "I'm on vacation with my brother and\n" + .string "boyfriend.\p" + .string "CELADON is such a pretty city!$" + +gUnknown_8197C0C:: @ 8197C0C + .string "Why?\n" + .string "Why did she bring her brother?$" + +gUnknown_8197C30:: @ 8197C30 + .string "Yippee! I'm on vacation!\n" + .string "My sis brought me along! Awesome!$" + diff --git a/data/maps/CeladonCity_House1/text.inc b/data/maps/CeladonCity_House1/text.inc new file mode 100644 index 000000000..df6acb986 --- /dev/null +++ b/data/maps/CeladonCity_House1/text.inc @@ -0,0 +1,16 @@ +gUnknown_8197A9F:: @ 8197A9F + .string "Hehehe!\p" + .string "The slots just reel in the dough,\n" + .string "big-time!$" + +gUnknown_8197AD3:: @ 8197AD3 + .string "CHIEF!\p" + .string "We just shipped two thousand\n" + .string "more POKéMON as slot prizes\l" + .string "again today!$" + +gUnknown_8197B20:: @ 8197B20 + .string "Don't touch the poster at the GAME\n" + .string "CORNER!\p" + .string "There's no secret switch behind it!$" + diff --git a/data/maps/CeladonCity_PokemonCenter_1F/text.inc b/data/maps/CeladonCity_PokemonCenter_1F/text.inc new file mode 100644 index 000000000..098582351 --- /dev/null +++ b/data/maps/CeladonCity_PokemonCenter_1F/text.inc @@ -0,0 +1,15 @@ +gUnknown_819685B:: @ 819685B + .string "A POKé FLUTE awakens sleeping\n" + .string "POKéMON. You know that.\p" + .string "It does so with a sound that only\n" + .string "they can hear.$" + +gUnknown_81968C2:: @ 81968C2 + .string "I rode here from FUCHSIA.\p" + .string "It's an uphill ride on CYCLING\n" + .string "ROAD, so I'm exhausted.$" + +gUnknown_8196913:: @ 8196913 + .string "If I had a BIKE, I would go to\n" + .string "CYCLING ROAD!$" + diff --git a/data/maps/CeladonCity_Restaurant/text.inc b/data/maps/CeladonCity_Restaurant/text.inc new file mode 100644 index 000000000..87edeb186 --- /dev/null +++ b/data/maps/CeladonCity_Restaurant/text.inc @@ -0,0 +1,37 @@ +gUnknown_81978E6:: @ 81978E6 + .string "Hi!\p" + .string "Sorry, but we're taking a break\n" + .string "right now.$" + +gUnknown_8197915:: @ 8197915 + .string "My POKéMON are weak, so I often\n" + .string "have to go to the DRUGSTORE.$" + +gUnknown_8197952:: @ 8197952 + .string "Psst! There's a basement under the\n" + .string "GAME CORNER, I hear.$" + +gUnknown_819798A:: @ 819798A + .string "Munch…\p" + .string "The man at that table lost it all\n" + .string "at the slots.$" + +gUnknown_81979C1:: @ 81979C1 + .string "Go ahead! Laugh!\n" + .string "I'm flat-out busted!\p" + .string "No more slots for me!\n" + .string "I'm going straight!\p" + .string "Here!\n" + .string "I won't be needing this anymore!$" + +gUnknown_8197A38:: @ 8197A38 + .string "{PLAYER} received a COIN CASE\n" + .string "from the man.$" + +gUnknown_8197A5E:: @ 8197A5E + .string "Make room for this!$" + +gUnknown_8197A72:: @ 8197A72 + .string "I always thought I was going to\n" + .string "win it back…$" + diff --git a/data/maps/CeruleanCave_B1F/text.inc b/data/maps/CeruleanCave_B1F/text.inc new file mode 100644 index 000000000..2358efe24 --- /dev/null +++ b/data/maps/CeruleanCave_B1F/text.inc @@ -0,0 +1,3 @@ +Text_177F9F:: @ 8177F9F + .string "Mew!$" + diff --git a/data/maps/CeruleanCity/text.inc b/data/maps/CeruleanCity/text.inc new file mode 100644 index 000000000..9a6c42035 --- /dev/null +++ b/data/maps/CeruleanCity/text.inc @@ -0,0 +1,181 @@ +gUnknown_817EAD7:: @ 817EAD7 + .string "{RIVAL}: Yo! {PLAYER}!\p" + .string "You're still struggling along back\n" + .string "here?\p" + .string "I'm doing great! I caught a bunch\n" + .string "of strong and smart POKéMON!\p" + .string "Here, let me see what you caught,\n" + .string "{PLAYER}!$" + +Text_17EB71:: @ 817EB71 + .string "Hey!\n" + .string "Take it easy!\l" + .string "You won already!$" + +gUnknown_817EB95:: @ 817EB95 + .string "{RIVAL}: Hey, guess what?\p" + .string "I went to BILL's and got him to\n" + .string "show me his rare POKéMON.\p" + .string "That added a lot of pages to my\n" + .string "POKéDEX!\p" + .string "After all, BILL's world famous as a\n" + .string "POKéMANIAC.\p" + .string "He invented the POKéMON Storage\n" + .string "System on PC, too.\p" + .string "Since you're using his system,\n" + .string "you should go thank him.\p" + .string "Well, I better get rolling!\n" + .string "Smell ya later!$" + +gUnknown_817ECD4:: @ 817ECD4 + .string "Oh, yeah, right.\p" + .string "I feel sorry for you. No, really.\n" + .string "You're always plodding behind me.\p" + .string "So here, I'll give you a little\n" + .string "present as a favor.$" + +gUnknown_817ED5D:: @ 817ED5D + .string "A chatty gossip like you…\n" + .string "That thing's perfect.\p" + .string "I don't need it because I don't\n" + .string "give a hoot about others.\p" + .string "All right, this time I really am\n" + .string "gone. Smell ya!$" + +Text_17EDF8:: @ 817EDF8 + .string "なんたって！\n" + .string "おれは　てんさい　だからよ！$" + +Text_17EE0E:: @ 817EE0E + .string "Hey! Stay out!\n" + .string "It's not your yard!\p" + .string "…Huh?\n" + .string "Me?\p" + .string "I'm an innocent bystander!\n" + .string "Don't you believe me?{PLAY_BGM}{BGM_FRLG_SUSPICIOUS_EYE}$" + +Text_17EE70:: @ 817EE70 + .string "GRUNT: Stop! I give up!\n" + .string "I'll leave quietly!$" + +gUnknown_817EE9C:: @ 817EE9C + .string "…Okay.\n" + .string "I'll return the TM I stole.$" + +gUnknown_817EEBF:: @ 817EEBF + .string "{PLAYER} recovered TM28 from\n" + .string "the TEAM ROCKET GRUNT.$" + +gUnknown_817EEED:: @ 817EEED + .string "I better get moving!\n" + .string "Bye!$" + +gUnknown_817EF07:: @ 817EF07 + .string "Make room for this!\n" + .string "I can't run until I give it to you!$" + +gUnknown_817EF3F:: @ 817EF3F + .string "You're a TRAINER, too?\p" + .string "Collecting, battling…\n" + .string "It's a tough life, isn't it?$" + +gUnknown_817EF89:: @ 817EF89 + .string "Did you know that you can CUT down\n" + .string "small trees?\p" + .string "Even that small tree in front of\n" + .string "the shop can be CUT down.\p" + .string "I think there's a way around it,\n" + .string "though.$" + +gUnknown_817F01D:: @ 817F01D + .string "If that SLOWBRO wasn't there, you\n" + .string "could CUT down the small tree.\p" + .string "That way, you could get to the\n" + .string "other side.\p" + .string "I think there's a way around it,\n" + .string "though.$" + +gUnknown_817F0B2:: @ 817F0B2 + .string "You're making an encyclopedia on\n" + .string "POKéMON? That sounds amusing.$" + +gUnknown_817F0F1:: @ 817F0F1 + .string "The people here were robbed.\p" + .string "It's obvious that TEAM ROCKET is\n" + .string "behind this most heinous crime!\p" + .string "Even our POLICE FORCE has\n" + .string "trouble with the ROCKETS!$" + +Text_17F183:: @ 817F183 + .string "Okay! SLOWBRO!\n" + .string "Use SONICBOOM!$" + +gUnknown_817F1A1:: @ 817F1A1 + .string "Come on, SLOWBRO, pay attention!$" + +Text_17F1C2:: @ 817F1C2 + .string "SLOWBRO, punch!$" + +gUnknown_817F1D2:: @ 817F1D2 + .string "No!\n" + .string "You blew it again!$" + +Text_17F1E9:: @ 817F1E9 + .string "SLOWBRO, WITHDRAW!$" + +gUnknown_817F1FC:: @ 817F1FC + .string "No! That's wrong!\n" + .string "It's so hard to control POKéMON!\p" + .string "Your POKéMON's obedience depends\n" + .string "on your abilities as a TRAINER.$" + +gUnknown_817F270:: @ 817F270 + .string "SLOWBRO took a snooze…$" + +gUnknown_817F287:: @ 817F287 + .string "SLOWBRO is loafing around…$" + +gUnknown_817F2A2:: @ 817F2A2 + .string "SLOWBRO turned away…$" + +gUnknown_817F2B7:: @ 817F2B7 + .string "SLOWBRO ignored orders…$" + +gUnknown_817F2CF:: @ 817F2CF + .string "I want a bright red bicycle.\p" + .string "I'll keep it at home, so it won't\n" + .string "get dirty.$" + +gUnknown_817F319:: @ 817F319 + .string "This is CERULEAN CAVE.\p" + .string "Horribly strong POKéMON live inside\n" + .string "there.\p" + .string "It takes a very special TRAINER to\n" + .string "be allowed inside there.\p" + .string "You'd have to be strong enough to\n" + .string "become the POKéMON LEAGUE\l" + .string "CHAMPION for starters.\p" + .string "And, you would have to have\n" + .string "made a great achievement.$" + +gUnknown_817F420:: @ 817F420 + .string "CERULEAN CITY\n" + .string "A Mysterious, Blue Aura Surrounds\l" + .string "It$" + +gUnknown_817F453:: @ 817F453 + .string "TRAINER TIPS\p" + .string "A POKéMON can be made to hold\n" + .string "an item.\p" + .string "Some items can even be used by\n" + .string "the holding POKéMON in battle.$" + +gUnknown_817F4C5:: @ 817F4C5 + .string "Grass and caves handled easily!\n" + .string "BIKE SHOP$" + +gUnknown_817F4EF:: @ 817F4EF + .string "CERULEAN CITY POKéMON GYM\n" + .string "LEADER: MISTY\l" + .string "The Tomboyish Mermaid!$" + diff --git a/data/maps/CeruleanCity_BikeShop/text.inc b/data/maps/CeruleanCity_BikeShop/text.inc new file mode 100644 index 000000000..18fc8aaef --- /dev/null +++ b/data/maps/CeruleanCity_BikeShop/text.inc @@ -0,0 +1,56 @@ +Text_192755:: @ 8192755 + .string "Hi!\n" + .string "Welcome to our BIKE SHOP.\p" + .string "Have we got just the BIKE for\n" + .string "you!$" + +gUnknown_8192796:: @ 8192796 + .string "Sorry!\n" + .string "You can't afford it!$" + +gUnknown_81927B2:: @ 81927B2 + .string "Oh, that's…\p" + .string "A BIKE VOUCHER!\p" + .string "Okay!\n" + .string "Here you go!$" + +gUnknown_81927E1:: @ 81927E1 + .string "{PLAYER} exchanged the\n" + .string "BIKE VOUCHER for a BICYCLE.$" + +gUnknown_819280E:: @ 819280E + .string "Thank you!\n" + .string "Come back again sometime!$" + +gUnknown_8192833:: @ 8192833 + .string "How do you like your new BICYCLE?\n" + .string "Do you like how it rides?\p" + .string "You can take it out on CYCLING\n" + .string "ROAD and even into caves!$" + +gUnknown_81928A8:: @ 81928A8 + .string "You better make room for your\n" + .string "BICYCLE!$" + +gUnknown_81928CF:: @ 81928CF + .string "A plain city bike is good enough\n" + .string "for me.\p" + .string "After all, you can't put a shopping\n" + .string "basket on a mountain bike.$" + +gUnknown_8192937:: @ 8192937 + .string "These bikes are cool, but they're\n" + .string "way expensive!$" + +gUnknown_8192968:: @ 8192968 + .string "Wow.\n" + .string "Your BIKE is really cool!$" + +Text_192987:: @ 8192987 + .string "ついに　はつばい！\p" + .string "ドイツ　せい　さいこうきゅう\n" + .string "おりたたみ　じてんしゃ！$" + +gUnknown_81929AD:: @ 81929AD + .string "A shiny new BICYCLE!$" + diff --git a/data/maps/CeruleanCity_Gym/text.inc b/data/maps/CeruleanCity_Gym/text.inc new file mode 100644 index 000000000..5f253b875 --- /dev/null +++ b/data/maps/CeruleanCity_Gym/text.inc @@ -0,0 +1,92 @@ +Text_1921EF:: @ 81921EF + .string "Hi, you're a new face!\p" + .string "Only those TRAINERS who have a\n" + .string "policy about POKéMON can turn pro.\p" + .string "What is your approach when you\n" + .string "catch and train POKéMON?\p" + .string "My policy is an all-out offensive\n" + .string "with WATER-type POKéMON!{PLAY_BGM}{BGM_FRLG_LEADER_EYE}$" + +gUnknown_81922BF:: @ 81922BF + .string "TM03 teaches WATER PULSE.\p" + .string "Use it on an aquatic POKéMON!$" + +gUnknown_81922F7:: @ 81922F7 + .string "The CASCADEBADGE makes all\n" + .string "POKéMON up to Lv. 30 obey.\p" + .string "That includes even outsiders you\n" + .string "got in trades.\p" + .string "There's more. You can now use CUT\n" + .string "anytime, even out of battle.\p" + .string "You can CUT down small trees to\n" + .string "open new pathways.\p" + .string "You can also have my favorite TM.$" + +gUnknown_81923F1:: @ 81923F1 + .string "{PLAYER} received TM03\n" + .string "from MISTY.$" + +gUnknown_819240E:: @ 819240E + .string "You better make room for this!$" + +Text_19242D:: @ 819242D + .string "Wow!\n" + .string "You're too much!\p" + .string "All right!\p" + .string "You can have the CASCADEBADGE to\n" + .string "show you beat me.$" + +Text_192481:: @ 8192481 + .string "What? You?\n" + .string "I'm more than good enough for you!\p" + .string "MISTY won't have to be bothered.$" + +Text_1924D0:: @ 81924D0 + .string "You overwhelmed me!$" + +gUnknown_81924E4:: @ 81924E4 + .string "You have to face other TRAINERS\n" + .string "to see how good you really are.$" + +Text_192524:: @ 8192524 + .string "Splash!\p" + .string "I'm first up!\n" + .string "Let's do it!$" + +Text_192547:: @ 8192547 + .string "That can't be!$" + +gUnknown_8192556:: @ 8192556 + .string "MISTY is a TRAINER who's going to\n" + .string "keep improving.\p" + .string "She won't lose to someone like you!$" + +gUnknown_81925AC:: @ 81925AC + .string "Yo!\n" + .string "Champ in the making!\p" + .string "Let me give you some advice!\p" + .string "The LEADER, MISTY, is a pro who\n" + .string "uses WATER-type POKéMON.\p" + .string "You can drain all their water with\n" + .string "GRASS-type POKéMON.\p" + .string "Or, you might use ELECTRIC-type\n" + .string "POKéMON and zap them!$" + +gUnknown_8192688:: @ 8192688 + .string "You beat MISTY!\n" + .string "See, what'd I tell ya?\p" + .string "You and me, kid, we make a pretty\n" + .string "darn-good team!$" + +gUnknown_81926E1:: @ 81926E1 + .string "CERULEAN POKéMON GYM\n" + .string "LEADER: MISTY\p" + .string "WINNING TRAINERS:\n" + .string "{RIVAL}$" + +gUnknown_8192719:: @ 8192719 + .string "CERULEAN POKéMON GYM\n" + .string "LEADER: MISTY\p" + .string "WINNING TRAINERS:\n" + .string "{RIVAL}, {PLAYER}$" + diff --git a/data/maps/CeruleanCity_House1/text.inc b/data/maps/CeruleanCity_House1/text.inc new file mode 100644 index 000000000..1e4ceceda --- /dev/null +++ b/data/maps/CeruleanCity_House1/text.inc @@ -0,0 +1,72 @@ +gUnknown_81918E7:: @ 81918E7 + .string "Only skilled TRAINERS can collect\n" + .string "POKéMON BADGES.\p" + .string "I see you have at least one.\p" + .string "Those BADGES have amazing secrets,\n" + .string "did you know?$" + +Text_191967:: @ 8191967 + .string "Now then…\p" + .string "Which of the eight BADGES should\n" + .string "I describe?$" + +gUnknown_819199E:: @ 819199E + .string "Come visit me anytime you wish.$" + +gUnknown_81919BE:: @ 81919BE + .string "The ATTACK stat of all your\n" + .string "POKéMON increases a little bit.\p" + .string "It also lets you use the move\n" + .string "FLASH outside of battle.$" + +gUnknown_8191A31:: @ 8191A31 + .string "POKéMON up to Lv. 30 will obey\n" + .string "you.\p" + .string "That includes even outsiders you\n" + .string "obtain in trades.\p" + .string "POKéMON of higher levels will\n" + .string "be unruly in battle, however.\p" + .string "It also lets you use the move\n" + .string "CUT outside of battle.$" + +gUnknown_8191AF9:: @ 8191AF9 + .string "The SPEED stat of all your\n" + .string "POKéMON increases a little bit.\p" + .string "It also lets you use the move\n" + .string "FLY outside of battle.$" + +gUnknown_8191B69:: @ 8191B69 + .string "POKéMON up to Lv. 50 will obey\n" + .string "you.\p" + .string "That includes even outsiders you\n" + .string "obtain in trades.\p" + .string "POKéMON of higher levels will\n" + .string "be unruly in battle, however.\p" + .string "It also lets you use the move\n" + .string "STRENGTH outside of battle.$" + +gUnknown_8191C36:: @ 8191C36 + .string "The DEFENSE stat of all your\n" + .string "POKéMON increases a little bit.\p" + .string "It also lets you use the move\n" + .string "SURF outside of battle.$" + +gUnknown_8191CA9:: @ 8191CA9 + .string "POKéMON up to Lv. 70 will obey\n" + .string "you.\p" + .string "That includes even outsiders you\n" + .string "obtain in trades.\p" + .string "POKéMON of higher levels will\n" + .string "be unruly in battle, however.\p" + .string "It also lets you use the move\n" + .string "ROCK SMASH outside of battle.$" + +gUnknown_8191D78:: @ 8191D78 + .string "The SP. ATK and SP. DEF stats of\n" + .string "all your POKéMON rise a little bit.\p" + .string "It also lets you use the move\n" + .string "WATERFALL outside of battle.$" + +gUnknown_8191DF8:: @ 8191DF8 + .string "All POKéMON will obey you!$" + diff --git a/data/maps/CeruleanCity_House2/text.inc b/data/maps/CeruleanCity_House2/text.inc new file mode 100644 index 000000000..291a0ee46 --- /dev/null +++ b/data/maps/CeruleanCity_House2/text.inc @@ -0,0 +1,22 @@ +gUnknown_8191E13:: @ 8191E13 + .string "Those miserable ROCKETS!\p" + .string "Look what they've done to my\n" + .string "house!\p" + .string "They stole a TM for teaching\n" + .string "POKéMON how to DIG holes!\p" + .string "I was going to use it on a\n" + .string "MANKEY or a SANDSHREW…\p" + .string "That cost me a bundle, it did!$" + +gUnknown_8191ED8:: @ 8191ED8 + .string "I figure what's lost is lost.\p" + .string "I decided to teach DIGLETT how to\n" + .string "DIG without a TM.$" + +gUnknown_8191F2A:: @ 8191F2A + .string "TEAM ROCKET must be trying to DIG\n" + .string "their way into no good!$" + +gUnknown_8191F64:: @ 8191F64 + .string "TEAM ROCKET left a way out!$" + diff --git a/data/maps/CeruleanCity_House3/text.inc b/data/maps/CeruleanCity_House3/text.inc new file mode 100644 index 000000000..e2859798a --- /dev/null +++ b/data/maps/CeruleanCity_House3/text.inc @@ -0,0 +1,6 @@ +gUnknown_8191F80:: @ 8191F80 + .string "My husband likes trading POKéMON.\p" + .string "You're collecting POKéMON for your\n" + .string "POKéDEX, aren't you?\p" + .string "Would you please trade with him?$" + diff --git a/data/maps/CeruleanCity_House4/text.inc b/data/maps/CeruleanCity_House4/text.inc new file mode 100644 index 000000000..7e7e5eb88 --- /dev/null +++ b/data/maps/CeruleanCity_House4/text.inc @@ -0,0 +1,62 @@ +gUnknown_8192AF0:: @ 8192AF0 + .string "Sigh…\n" + .string "Too much time, too little to do…\p" + .string "Is nothing entertaining happening\n" + .string "anywhere?$" + +gUnknown_8192B43:: @ 8192B43 + .string "Ah!\n" + .string "A new news report!\p" + .string "Hmm…\p" + .string "I see!\n" + .string "That was quite informative!\p" + .string "I applaud you for taking interest\n" + .string "in the news at your young age.\p" + .string "As my thanks for sharing the news\n" + .string "with me, I want you to have this.$" + +gUnknown_8192C07:: @ 8192C07 + .string "Oh, oh!\n" + .string "Th-this news report!\p" + .string "Hmm…\p" + .string "Amazing!\n" + .string "What an incredible piece of news!\p" + .string "I haven't seen a news story this\n" + .string "incredible in too long a time!\p" + .string "Thanks for sharing this fantastic\n" + .string "news. Have a bunch of BERRIES!$" + +gUnknown_8192CD5:: @ 8192CD5 + .string "It seems such a shame to not share\n" + .string "this news with other folks…\p" + .string "I wish I could tell someone…\n" + .string "Let others know the news…$" + +gUnknown_8192D4B:: @ 8192D4B + .string "Ah, you've spread the news for me?\p" + .string "Good news becomes worthwhile when\n" + .string "all sorts of people share it.\p" + .string "As my thanks for your spreading\n" + .string "the news, take this!$" + +gUnknown_8192DE3:: @ 8192DE3 + .string "You've spread the news some more?\n" + .string "Magnificent!\p" + .string "That piece of news must be\n" + .string "delighted to be passed around so.\p" + .string "Yes, indeed!\p" + .string "Consider this a show of\n" + .string "appreciation from me and the news.\p" + .string "I'll give you more BERRIES than\n" + .string "I usually do.$" + +gUnknown_8192EC5:: @ 8192EC5 + .string "I'm quite enjoying myself with all\n" + .string "sorts of news.\p" + .string "Yes, I am satisfied!\n" + .string "I won't be bored for a while.$" + +gUnknown_8192F2A:: @ 8192F2A + .string "Hm? Your BERRY POUCH is full.\n" + .string "My gift remains ungiven, then.$" + diff --git a/data/maps/CeruleanCity_House5/text.inc b/data/maps/CeruleanCity_House5/text.inc new file mode 100644 index 000000000..2e3add5a1 --- /dev/null +++ b/data/maps/CeruleanCity_House5/text.inc @@ -0,0 +1,70 @@ +gUnknown_8192F67:: @ 8192F67 + .string "I concoct a variety of medicine\n" + .string "from BERRY POWDER.\p" + .string "Using good BERRY POWDER, I can\n" + .string "make any kind of medicine.\p" + .string "Now tell me, have you any interest\n" + .string "in BERRIES?$" + +gUnknown_8193003:: @ 8193003 + .string "Ah, good! For you, then, I have\n" + .string "just the thing.$" + +gUnknown_8193033:: @ 8193033 + .string "There's something new on the second\n" + .string "floor of POKéMON CENTERS, at the\l" + .string "DIRECT CORNER.\p" + .string "They installed a Wireless Adapter\n" + .string "machine for crushing BERRIES.\p" + .string "This is where you come in.\p" + .string "I have a favor to ask, one that\n" + .string "I can entrust only to you.\p" + .string "Could you make BERRY POWDER for\n" + .string "me using that machine?\p" + .string "Don't forget, the machine is at the\n" + .string "DIRECT CORNER of POKéMON CENTERS.\p" + .string "I'll concoct medicine for you if\n" + .string "you bring me some BERRY POWDER.\p" + .string "Don't forget, crush BERRIES into\n" + .string "BERRY POWDER and bring it to me.$" + +gUnknown_819321D:: @ 819321D + .string "Why must you lie to me?\p" + .string "How many BERRIES do you have?\n" + .string "Not a one!$" + +gUnknown_819325E:: @ 819325E + .string "You have no interest in BERRIES?\p" + .string "Young one, it's important to take an\n" + .string "interest in all sorts of things.$" + +gUnknown_81932C5:: @ 81932C5 + .string "Er-hem! Have you brought me some\n" + .string "BERRY POWDER?$" + +Text_1932F4:: @ 81932F4 + .string "With what would you like to \n" + .string "exchange it?$" + +gUnknown_819331E:: @ 819331E + .string "Fine, you'll exchange your BERRY\n" + .string "POWDER for one {STR_VAR_1}?$" + +gUnknown_8193352:: @ 8193352 + .string "Hm? You don't have enough\n" + .string "BERRY POWDER.$" + +gUnknown_819337A:: @ 819337A + .string "This is fine BERRY POWDER indeed.\n" + .string "It will make excellent medicine.\p" + .string "Would you like to trade more BERRY\n" + .string "POWDER for something else?$" + +gUnknown_81933FB:: @ 81933FB + .string "That's fine, then.\n" + .string "I'll hope to see you back again.$" + +gUnknown_819342F:: @ 819342F + .string "Come see me if you'd like to trade\n" + .string "your BERRY POWDER.$" + diff --git a/data/maps/CeruleanCity_Mart/text.inc b/data/maps/CeruleanCity_Mart/text.inc new file mode 100644 index 000000000..e2106bbe5 --- /dev/null +++ b/data/maps/CeruleanCity_Mart/text.inc @@ -0,0 +1,14 @@ +gUnknown_81929C2:: @ 81929C2 + .string "REPEL not only keeps bugs away,\n" + .string "it also works on weak POKéMON.\p" + .string "Put your strongest POKéMON at the\n" + .string "left of the POKéMON LIST.\p" + .string "If your first POKéMON is strong,\n" + .string "REPEL's effect is boosted.$" + +gUnknown_8192A79:: @ 8192A79 + .string "Do you know about RARE CANDY?\n" + .string "They don't sell it in shops.\p" + .string "I think it makes POKéMON grow\n" + .string "very quickly all of a sudden.$" + diff --git a/data/maps/CeruleanCity_PokemonCenter_1F/text.inc b/data/maps/CeruleanCity_PokemonCenter_1F/text.inc new file mode 100644 index 000000000..2b60409d2 --- /dev/null +++ b/data/maps/CeruleanCity_PokemonCenter_1F/text.inc @@ -0,0 +1,27 @@ +gUnknown_8191FFB:: @ 8191FFB + .string "That BILL!\p" + .string "I heard that he'll do whatever it\n" + .string "takes to get rare POKéMON.\p" + .string "He's not above doing all sorts\n" + .string "of things, I've heard.$" + +gUnknown_8192079:: @ 8192079 + .string "Have you heard about BILL?\p" + .string "Everyone calls him a POKéMANIAC!\p" + .string "I think people are just jealous of\n" + .string "BILL, though.\p" + .string "Who wouldn't want to boast about\n" + .string "their POKéMON?$" + +gUnknown_8192116:: @ 8192116 + .string "BILL has lots of POKéMON!\n" + .string "He collects rare ones, too!$" + +gUnknown_819214C:: @ 819214C + .string "Why don't you go upstairs and try\n" + .string "trading POKéMON with your friends?\p" + .string "You could get a lot more variety\n" + .string "by trading.\p" + .string "The POKéMON you get in trades grow\n" + .string "quickly, too.$" + diff --git a/data/maps/CinnabarIsland/text.inc b/data/maps/CinnabarIsland/text.inc new file mode 100644 index 000000000..26ce19f09 --- /dev/null +++ b/data/maps/CinnabarIsland/text.inc @@ -0,0 +1,75 @@ +gUnknown_8180B20:: @ 8180B20 + .string "The door is locked…$" + +gUnknown_8180B34:: @ 8180B34 + .string "CINNABAR GYM's BLAINE is quite the\n" + .string "odd fellow.\p" + .string "He's lived on the island since way\n" + .string "before the LAB was built.$" + +gUnknown_8180BA0:: @ 8180BA0 + .string "Scientists conduct experiments \n" + .string "in the burned-out building.\p" + .string "You know, the one they call the\n" + .string "POKéMON MANSION.$" + +gUnknown_8180C0D:: @ 8180C0D + .string "CINNABAR ISLAND\n" + .string "The Fiery Town of Burning Desire$" + +gUnknown_8180C3E:: @ 8180C3E + .string "POKéMON LAB$" + +gUnknown_8180C4A:: @ 8180C4A + .string "CINNABAR ISLAND POKéMON GYM\n" + .string "LEADER: BLAINE\l" + .string "The Hotheaded Quiz Master!$" + +gUnknown_8180C90:: @ 8180C90 + .string "Huh?\n" + .string "Hey, if it isn't {PLAYER}!$" + +gUnknown_8180CAA:: @ 8180CAA + .string "Look, it's me, BILL.\n" + .string "Long time no see!\p" + .string "I hope you're still using my\n" + .string "PC system.\p" + .string "Well, listen, since we met up here,\n" + .string "how about spending time with me?\p" + .string "There's this little island in the far\n" + .string "south called ONE ISLAND.\p" + .string "A friend invited me, so I'm on my\n" + .string "way out there.\p" + .string "How about it?\n" + .string "Do you feel like coming with me?$" + +gUnknown_8180DDD:: @ 8180DDD + .string "All right, then.\n" + .string "Let's go!$" + +gUnknown_8180DF8:: @ 8180DF8 + .string "What, are you too busy?\p" + .string "Well, all right.\n" + .string "The boat hasn't arrived yet anyway.\p" + .string "I'll be waiting at the POKéMON\n" + .string "CENTER over there.\p" + .string "Come see me when you're done with\n" + .string "your business here.$" + +gUnknown_8180EAD:: @ 8180EAD + .string "Looks like my pal's boat arrived,\n" + .string "too.\p" + .string "He sent it specially here to\n" + .string "CINNABAR to pick me up.$" + +gUnknown_8180F09:: @ 8180F09 + .string "Hey, wasn't that a long cruise?\p" + .string "My buddy CELIO seemed to enjoy\n" + .string "your company.\p" + .string "I'm sure he'd welcome you if you\n" + .string "were to visit him again.\p" + .string "If you have a TRI-PASS, you can\n" + .string "always take a ferry there from\l" + .string "VERMILION PORT.\p" + .string "All right, thanks for your company!$" + diff --git a/data/maps/CinnabarIsland_Gym/text.inc b/data/maps/CinnabarIsland_Gym/text.inc new file mode 100644 index 000000000..e5ceccbd4 --- /dev/null +++ b/data/maps/CinnabarIsland_Gym/text.inc @@ -0,0 +1,196 @@ +Text_199543:: @ 8199543 + .string "Hah!\p" + .string "I am BLAINE, the red-hot LEADER\n" + .string "of CINNABAR GYM!\p" + .string "My fiery POKéMON are all rough\n" + .string "and ready with intense heat!\p" + .string "They incinerate all challengers!\p" + .string "Hah!\n" + .string "You better have BURN HEAL!{PLAY_BGM}{BGM_FRLG_LEADER_EYE}$" + +Text_1995FA:: @ 81995FA + .string "I have burned down to nothing!\n" + .string "Not even ashes remain!\p" + .string "You have earned the VOLCANOBADGE.$" + +gUnknown_8199652:: @ 8199652 + .string "FIRE BLAST is the ultimate fire\n" + .string "technique.\p" + .string "Don't waste it on WATER POKéMON.$" + +gUnknown_819969E:: @ 819969E + .string "Hah!\p" + .string "The VOLCANOBADGE heightens the\n" + .string "SPECIAL stats of your POKéMON.\p" + .string "Here, you can have this, too!$" + +gUnknown_81996FF:: @ 81996FF + .string "{PLAYER} received TM38\n" + .string "from BLAINE.$" + +gUnknown_819971D:: @ 819971D + .string "TM38 contains FIRE BLAST.\n" + .string "Teach it to FIRE-type POKéMON.\p" + .string "VULPIX or CHARMELEON would be\n" + .string "ideal for that move.$" + +gUnknown_8199789:: @ 8199789 + .string "Make space for this, child!$" + +Text_1997A5:: @ 81997A5 + .string "Do you know how hot POKéMON fire\n" + .string "breath can get?$" + +Text_1997D6:: @ 81997D6 + .string "Yow!\n" + .string "Hot, hot, hot!$" + +gUnknown_81997EA:: @ 81997EA + .string "Fire, or to be more precise,\n" + .string "combustion…\p" + .string "…Oxygen in the air…\n" + .string "Blah, blah, blah, blah…$" + +Text_19983F:: @ 819983F +gUnknown_819983F:: @ 819983F + .string "I was a thief, but I went straight\n" + .string "as a TRAINER.$" + +Text_199870:: @ 8199870 + .string "I surrender!$" + +gUnknown_819987D:: @ 819987D + .string "I get this uncontrollable urge to\n" + .string "steal other people's POKéMON.$" + +Text_1998BD:: @ 81998BD +gUnknown_81998BD:: @ 81998BD + .string "I've studied POKéMON thoroughly.\n" + .string "You can't win!$" + +Text_1998ED:: @ 81998ED + .string "Waah!\n" + .string "My studies were insufficient!$" + +gUnknown_8199911:: @ 8199911 + .string "My theories are too complicated\n" + .string "for you to understand.$" + +Text_199948:: @ 8199948 +gUnknown_8199948:: @ 8199948 + .string "I like using FIRE-type POKéMON.\n" + .string "I just do.$" + +Text_199973:: @ 8199973 + .string "Too hot to handle!$" + +gUnknown_8199986:: @ 8199986 + .string "I wish there were a thief POKéMON.\n" + .string "I'd use that!$" + +Text_1999B7:: @ 81999B7 +gUnknown_81999B7:: @ 81999B7 + .string "I know why BLAINE became a\n" + .string "TRAINER.$" + +Text_1999DB:: @ 81999DB + .string "Ow!$" + +gUnknown_81999DF:: @ 81999DF + .string "Our LEADER, BLAINE, became lost\n" + .string "in the mountains but good.\p" + .string "Night fell when a fiery bird\n" + .string "POKéMON appeared.\p" + .string "Its light allowed BLAINE to find\n" + .string "his way down safely.$" + +Text_199A7F:: @ 8199A7F +gUnknown_8199A7F:: @ 8199A7F + .string "I've been to many GYMS, but this\n" + .string "one best suits my style.$" + +Text_199AB9:: @ 8199AB9 + .string "Yowza!\n" + .string "Too hot!$" + +gUnknown_8199AC9:: @ 8199AC9 + .string "PONYTA, NINETALES…\n" + .string "Those are popular FIRE POKéMON.$" + +Text_199AFC:: @ 8199AFC +gUnknown_8199AFC:: @ 8199AFC + .string "Fire is weak against H2O.$" + +Text_199B16:: @ 8199B16 + .string "Oh!\n" + .string "Snuffed out!$" + +gUnknown_8199B27:: @ 8199B27 + .string "Water beats fire, of course.\p" + .string "But fire melts ice, so the FIRE\n" + .string "type beats ICE-type POKéMON.$" + +gUnknown_8199B81:: @ 8199B81 + .string "Yo!\n" + .string "Champ in the making!\p" + .string "The hotheaded BLAINE is a FIRE\n" + .string "POKéMON pro.\p" + .string "Douse his spirits with water!\p" + .string "You'd better take some\n" + .string "BURN HEALS, too.$" + +gUnknown_8199C0C:: @ 8199C0C + .string "{PLAYER}!\n" + .string "You beat that firebrand!$" + +gUnknown_8199C29:: @ 8199C29 + .string "CINNABAR POKéMON GYM\n" + .string "LEADER: BLAINE\p" + .string "WINNING TRAINERS:\n" + .string "{RIVAL}$" + +gUnknown_8199C62:: @ 8199C62 + .string "CINNABAR POKéMON GYM\n" + .string "LEADER: BLAINE\p" + .string "WINNING TRAINERS:\n" + .string "{RIVAL}, {PLAYER}$" + +gUnknown_8199C9F:: @ 8199C9F + .string "POKéMON Quiz!\p" + .string "Get it right, and the door opens to\n" + .string "the next room.\p" + .string "Get it wrong, and face a TRAINER!\p" + .string "If you want to conserve your\n" + .string "POKéMON for the GYM LEADER…\p" + .string "Then get it right!\n" + .string "Here we go!$" + +gUnknown_8199D5A:: @ 8199D5A + .string "CATERPIE evolves into METAPOD?$" + +gUnknown_8199D79:: @ 8199D79 + .string "There are nine certified POKéMON\n" + .string "LEAGUE BADGES?$" + +gUnknown_8199DA9:: @ 8199DA9 + .string "POLIWAG evolves three times?$" + +gUnknown_8199DC6:: @ 8199DC6 + .string "Are electric moves effective\n" + .string "against GROUND-type POKéMON?$" + +gUnknown_8199E00:: @ 8199E00 + .string "POKéMON of the same kind and level\n" + .string "are not identical?$" + +gUnknown_8199E36:: @ 8199E36 + .string "TM28 contains TOMBSTONY?$" + +gUnknown_8199E4F:: @ 8199E4F + .string "You're absolutely correct!\p" + .string "Go on through!$" + +gUnknown_8199E79:: @ 8199E79 + .string "Sorry!\n" + .string "Bad call!$" + diff --git a/data/maps/CinnabarIsland_Mart/text.inc b/data/maps/CinnabarIsland_Mart/text.inc new file mode 100644 index 000000000..189baff6a --- /dev/null +++ b/data/maps/CinnabarIsland_Mart/text.inc @@ -0,0 +1,9 @@ +gUnknown_819A7A0:: @ 819A7A0 + .string "Don't they have X ATTACK?\p" + .string "I like it because it raises the\n" + .string "ATTACK stat in battle.$" + +gUnknown_819A7F1:: @ 819A7F1 + .string "It never hurts to have extra items.\n" + .string "You never know what might happen.$" + diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/text.inc b/data/maps/CinnabarIsland_PokemonCenter_1F/text.inc new file mode 100644 index 000000000..c88fbbf28 --- /dev/null +++ b/data/maps/CinnabarIsland_PokemonCenter_1F/text.inc @@ -0,0 +1,38 @@ +gUnknown_819A4F8:: @ 819A4F8 + .string "I came to visit the CINNABAR GYM,\n" + .string "but the door is locked tight.\p" + .string "There should be a key for it\n" + .string "somewhere.\p" + .string "Could it be in that burned-out\n" + .string "mansion?\p" + .string "The GYM LEADER's friend used to\n" + .string "live there, they say.$" + +gUnknown_819A5BE:: @ 819A5BE + .string "Do you have lots of friends?\p" + .string "Linking up with the usual friends\n" + .string "is fun, of course.\p" + .string "But how about visiting the\n" + .string "UNION ROOM every so often?\p" + .string "Who knows, you may end up making\n" + .string "new friends.\p" + .string "I think it would be worth your time\n" + .string "to check the UNION ROOM.$" + +gUnknown_819A6B1:: @ 819A6B1 + .string "POKéMON can still learn techniques\n" + .string "after canceling evolution.\p" + .string "Evolution can wait until new moves\n" + .string "have been learned.$" + +gUnknown_819A725:: @ 819A725 + .string "BILL: Hey, you kept me waiting!\n" + .string "Ready to set sail to ONE ISLAND?$" + +gUnknown_819A766:: @ 819A766 + .string "Oh, you're still not done yet?$" + +gUnknown_819A785:: @ 819A785 + .string "Well, that's it.\n" + .string "Let's go!$" + diff --git a/data/maps/CinnabarIsland_PokemonLab_Entrance/text.inc b/data/maps/CinnabarIsland_PokemonLab_Entrance/text.inc new file mode 100644 index 000000000..a14866bd4 --- /dev/null +++ b/data/maps/CinnabarIsland_PokemonLab_Entrance/text.inc @@ -0,0 +1,28 @@ +Text_199E8A:: @ 8199E8A + .string "It's a photo of BLAINE and\n" + .string "MR. FUJI.\p" + .string "They're standing shoulder to\n" + .string "shoulder with big grins.$" + +gUnknown_8199EE5:: @ 8199EE5 + .string "We study POKéMON extensively\n" + .string "every day.\p" + .string "People often bring us rare POKéMON\n" + .string "for examination.$" + +gUnknown_8199F41:: @ 8199F41 + .string "A photo of the LAB's founder…\n" + .string "DR. FUJI?!$" + +gUnknown_8199F6A:: @ 8199F6A + .string "POKéMON LAB\n" + .string "Meeting Room$" + +gUnknown_8199F83:: @ 8199F83 + .string "POKéMON LAB\n" + .string "R & D Room$" + +gUnknown_8199F9A:: @ 8199F9A + .string "POKéMON LAB\n" + .string "Testing Room$" + diff --git a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/text.inc b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/text.inc new file mode 100644 index 000000000..dda99e8ea --- /dev/null +++ b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/text.inc @@ -0,0 +1,75 @@ +Text_19A137:: @ 819A137 + .string "Tch-tch-tch!\n" + .string "I'll teach you a nifty move.\p" + .string "Teach it to a POKéMON, and watch\n" + .string "the fun unfold!\p" + .string "It's a move called METRONOME.\n" + .string "Does it strike your fancy?$" + +Text_19A1CB:: @ 819A1CB + .string "I tell you, it's a lot of fun!$" + +Text_19A1EA:: @ 819A1EA + .string "Okay!\n" + .string "Which POKéMON should I teach?$" + +Text_19A20E:: @ 819A20E + .string "Tch-tch-tch!\n" + .string "That's the sound of a METRONOME.\p" + .string "It tweaks your POKéMON's brain into\n" + .string "using moves it doesn't even know.$" + +Text_19A282:: @ 819A282 +gUnknown_819A282:: @ 819A282 + .string "Hiya!\p" + .string "I am important doctor.\n" + .string "Yes, very much so, indeed.\p" + .string "Here, I study rare POKéMON fossils.\n" + .string "All the time, I study.\p" + .string "You!\n" + .string "Have you a fossil for me?$" + +gUnknown_819A314:: @ 819A314 + .string "No!\n" + .string "Is too bad!$" + +Text_19A324:: @ 819A324 + .string "ちょっと　じかん　かかるよ！\p" + .string "そこらへんを　すこし\n" + .string "ブラブラ　してくると　よろしー！$" + +gUnknown_819A34F:: @ 819A34F + .string "You late.\n" + .string "Where were you?\p" + .string "Your fossil is back to life!\n" + .string "It was {STR_VAR_1} like I think!$" + +Text_19A39E:: @ 819A39E + .string "{PLAYER} received the {STR_VAR_1}\n" + .string "from the doctor.$" + +Text_19A3C2:: @ 819A3C2 + .string "ポケモン　いっぱいで　もてないね！$" + +gUnknown_819A3D4:: @ 819A3D4 + .string "Oh!\n" + .string "That is {STR_VAR_2}, it is!\p" + .string "It is fossil of {STR_VAR_1},\n" + .string "a POKéMON that is already extinct!\p" + .string "My Resurrection Machine will make\n" + .string "that POKéMON live again!$" + +gUnknown_819A45D:: @ 819A45D + .string "So!\n" + .string "You hurry and give me that!\p" + .string "{SIZE}Á{PLAYER} handed over the\n" + .string "{STR_VAR_2} to the weird doctor.$" + +gUnknown_819A4AB:: @ 819A4AB + .string "I take a little time!\n" + .string "You go for walk a little while!$" + +gUnknown_819A4E1:: @ 819A4E1 + .string "Aiyah!\n" + .string "You come again!$" + diff --git a/data/maps/CinnabarIsland_PokemonLab_Lounge/text.inc b/data/maps/CinnabarIsland_PokemonLab_Lounge/text.inc new file mode 100644 index 000000000..24d539c13 --- /dev/null +++ b/data/maps/CinnabarIsland_PokemonLab_Lounge/text.inc @@ -0,0 +1,6 @@ +gUnknown_8199FB3:: @ 8199FB3 + .string "I found this most remarkable fossil\n" + .string "inside MT. MOON.\p" + .string "I think it's of a rare, prehistoric\n" + .string "POKéMON.$" + diff --git a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/text.inc b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/text.inc new file mode 100644 index 000000000..e3343e8e3 --- /dev/null +++ b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/text.inc @@ -0,0 +1,19 @@ +gUnknown_819A015:: @ 819A015 + .string "EEVEE can evolve into one of three\n" + .string "kinds of POKéMON.$" + +gUnknown_819A04A:: @ 819A04A + .string "There's an e-mail message.\p" + .string "… … …\p" + .string "There are three legendary bird\n" + .string "POKéMON.\p" + .string "They are ARTICUNO, ZAPDOS, and\n" + .string "MOLTRES.\p" + .string "Their whereabouts are unknown.\p" + .string "We plan to explore the cavern\n" + .string "close to CERULEAN.\p" + .string "From: POKéMON RESEARCH TEAM…$" + +gUnknown_819A128:: @ 819A128 + .string "An amber pipe!$" + diff --git a/data/maps/DiglettsCave_NorthEntrance/text.inc b/data/maps/DiglettsCave_NorthEntrance/text.inc new file mode 100644 index 000000000..89dcb5a38 --- /dev/null +++ b/data/maps/DiglettsCave_NorthEntrance/text.inc @@ -0,0 +1,6 @@ +gUnknown_817462C:: @ 817462C + .string "I went inside ROCK TUNNEL, but it's\n" + .string "pitch-black and scary in there.\p" + .string "If I could get a POKéMON to use\n" + .string "FLASH and light it up…$" + diff --git a/data/maps/DiglettsCave_SouthEntrance/text.inc b/data/maps/DiglettsCave_SouthEntrance/text.inc new file mode 100644 index 000000000..4c97cdc0b --- /dev/null +++ b/data/maps/DiglettsCave_SouthEntrance/text.inc @@ -0,0 +1,6 @@ +gUnknown_81746A7:: @ 81746A7 + .string "Well, isn't this a surprise!\n" + .string "DIGLETT dug this long tunnel!\p" + .string "It goes right to VIRIDIAN CITY,\n" + .string "they tell me.$" + diff --git a/data/maps/FiveIsland/text.inc b/data/maps/FiveIsland/text.inc new file mode 100644 index 000000000..40c0d7b4e --- /dev/null +++ b/data/maps/FiveIsland/text.inc @@ -0,0 +1,16 @@ +gUnknown_8182DFB:: @ 8182DFB + .string "FIVE ISLAND\n" + .string "Chrono Island: Where Time Goes$" + +gUnknown_8182E26:: @ 8182E26 + .string "Oh, this stinks. I wanted to play in\n" + .string "the MEADOW.\p" + .string "But they put up a weird building\n" + .string "on it, so I can't play there.$" + +gUnknown_8182E96:: @ 8182E96 + .string "It's been getting busier around\n" + .string "these parts lately.\p" + .string "I haven't been catching many good\n" + .string "fish lately, either.$" + diff --git a/data/maps/FiveIsland_House1/text.inc b/data/maps/FiveIsland_House1/text.inc new file mode 100644 index 000000000..7fa7e5ac1 --- /dev/null +++ b/data/maps/FiveIsland_House1/text.inc @@ -0,0 +1,15 @@ +Text_1A3C71:: @ 81A3C71 + .string "こんばんの　おかずは\n" + .string "ようい　しなくて　いいぞ！\p" + .string "って　だんなが\n" + .string "つりに　いったん　だけど‥\l" + .string "しんじて　いいのかねえ$" + +gUnknown_81A3CAC:: @ 81A3CAC + .string "Don't worry about buying anything\n" + .string "for dinner tonight!\p" + .string "…That's what my husband said when\n" + .string "he went off fishing today.\p" + .string "I'm not sure if I can count on him\n" + .string "to live up to that promise.$" + diff --git a/data/maps/FiveIsland_House2/text.inc b/data/maps/FiveIsland_House2/text.inc new file mode 100644 index 000000000..bad18b3a3 --- /dev/null +++ b/data/maps/FiveIsland_House2/text.inc @@ -0,0 +1,8 @@ +gUnknown_81A3D5E:: @ 81A3D5E + .string "That MEADOW has belonged to our\n" + .string "family for generations.\p" + .string "I should have had a giant mansion\n" + .string "built on it.\p" + .string "It would be preferable to having\n" + .string "those thugs run wild on it!$" + diff --git a/data/maps/FiveIsland_LostCave_Room1/text.inc b/data/maps/FiveIsland_LostCave_Room1/text.inc new file mode 100644 index 000000000..820a9a10f --- /dev/null +++ b/data/maps/FiveIsland_LostCave_Room1/text.inc @@ -0,0 +1,15 @@ +Text_17CEF5:: @ 817CEF5 + .string "Aiyeeeeeh!\p" + .string "I thought this was an ancient ruin.\n" + .string "But it's teeming with ghosts!$" + +Text_17CF42:: @ 817CF42 + .string "Aiyeeeeeh!\n" + .string "Mercy!$" + +gUnknown_817CF54:: @ 817CF54 + .string "I'm trying to get out of here, but\n" + .string "I always end up at the same spot.\p" + .string "Maybe the number of boulders is\n" + .string "a hint…$" + diff --git a/data/maps/FiveIsland_LostCave_Room10/text.inc b/data/maps/FiveIsland_LostCave_Room10/text.inc new file mode 100644 index 000000000..da92ae5e7 --- /dev/null +++ b/data/maps/FiveIsland_LostCave_Room10/text.inc @@ -0,0 +1,16 @@ +gUnknown_817D062:: @ 817D062 + .string "W-what do you intend to do with\n" + .string "me?$" + +Text_17D086:: @ 817D086 + .string "Oh… I was afraid that you meant to\n" + .string "harm me.$" + +gUnknown_817D0B2:: @ 817D0B2 + .string "I am so glad that you happened\n" + .string "here.\p" + .string "I grew rather bored of walking,\n" + .string "and I am feeling fatigued.\p" + .string "May I ask you to take me home\n" + .string "from here?$" + diff --git a/data/maps/FiveIsland_LostCave_Room4/text.inc b/data/maps/FiveIsland_LostCave_Room4/text.inc new file mode 100644 index 000000000..a9a8c0daf --- /dev/null +++ b/data/maps/FiveIsland_LostCave_Room4/text.inc @@ -0,0 +1,12 @@ +Text_17CFC1:: @ 817CFC1 + .string "I think there is a mysterious power\n" + .string "at work in this cave.$" + +Text_17CFFB:: @ 817CFFB + .string "If you don't go into the right\n" + .string "tunnel, you won't get ahead.$" + +gUnknown_817D037:: @ 817D037 + .string "Earlier, a lady went into the caves\n" + .string "ahead.$" + diff --git a/data/maps/FiveIsland_Meadow/text.inc b/data/maps/FiveIsland_Meadow/text.inc new file mode 100644 index 000000000..7ffd69619 --- /dev/null +++ b/data/maps/FiveIsland_Meadow/text.inc @@ -0,0 +1,70 @@ +Text_18AAD5:: @ 818AAD5 + .string "This is an excellent environment\n" + .string "for raising POKéMON.$" + +Text_18AB0B:: @ 818AB0B + .string "Your POKéMON are growing up\n" + .string "admirably well!$" + +Text_18AB37:: @ 818AB37 + .string "You know, I think you have the\n" + .string "talent to be a good BREEDER.$" + +Text_18AB73:: @ 818AB73 + .string "とびらを　あけるには\n" + .string "パスワードが　2つ　いるようだ$" + +gUnknown_818AB8E:: @ 818AB8E + .string "{PLAYER} entered a password.\p" + .string "“GOLDEEN need log.”\p" + .string "… … … … … …\p" + .string "Another password is needed to\n" + .string "open the door…$" + +Text_18ABF4:: @ 818ABF4 + .string "{PLAYER} entered two passwords.\p" + .string "“GOLDEEN need log.”\n" + .string "“Yes, nah, CHANSEY.”\p" + .string "… … … … … …\p" + .string "The WAREHOUSE's door opened!$" + +gUnknown_818AC62:: @ 818AC62 + .string "The WAREHOUSE's door is already\n" + .string "open.$" + +Text_18AC88:: @ 818AC88 + .string "This area's strictly off-limits!\n" + .string "Out, out!$" + +Text_18ACB3:: @ 818ACB3 + .string "Is this for real?$" + +gUnknown_818ACC5:: @ 818ACC5 + .string "You don't have any business here!\n" + .string "Go home!$" + +Text_18ACF0:: @ 818ACF0 + .string "There's nothing past here except\n" + .string "our WAREHOUSE.\p" + .string "So what brings you here?$" + +Text_18AD39:: @ 818AD39 + .string "That wasn't supposed to happen…$" + +gUnknown_818AD59:: @ 818AD59 + .string "You're wanting to know what's inside\n" + .string "this WAREHOUSE?\p" + .string "It's better you didn't know.\n" + .string "For your own sake, I mean.$" + +Text_18ADC6:: @ 818ADC6 + .string "You'd be wasting time even if you\n" + .string "were to get by me.$" + +Text_18ADFB:: @ 818ADFB + .string "Oh, that makes me furious!$" + +gUnknown_818AE16:: @ 818AE16 + .string "You won't be able to get in without\n" + .string "the passwords anyway.$" + diff --git a/data/maps/FiveIsland_MemorialPillar/text.inc b/data/maps/FiveIsland_MemorialPillar/text.inc new file mode 100644 index 000000000..051f3fdc1 --- /dev/null +++ b/data/maps/FiveIsland_MemorialPillar/text.inc @@ -0,0 +1,99 @@ +Text_18AE50:: @ 818AE50 + .string "I'm the eldest of the BIRD\n" + .string "BROTHERS.\p" + .string "The best thing about birds…\n" + .string "It has to be the beak.$" + +Text_18AEA8:: @ 818AEA8 + .string "Oh, so sharp!$" + +Text_18AEB6:: @ 818AEB6 + .string "You can fly to FOUR ISLAND from\n" + .string "here.$" + +Text_18AEDC:: @ 818AEDC + .string "I'm the middle kid of the BIRD\n" + .string "BROTHERS.\p" + .string "The best thing about birds…\n" + .string "It has to be the wings.$" + +Text_18AF39:: @ 818AF39 + .string "Flap, flap!$" + +Text_18AF45:: @ 818AF45 + .string "There was a really somber guy\n" + .string "over that way.$" + +Text_18AF72:: @ 818AF72 + .string "I'm the youngest of the BIRD\n" + .string "BROTHERS.\p" + .string "The best thing about birds…\n" + .string "It has to be the down.$" + +Text_18AFCC:: @ 818AFCC + .string "Down is so comfy…\n" + .string "It makes me drowsy…$" + +Text_18AFF2:: @ 818AFF2 + .string "It fills me with happiness when\n" + .string "bird POKéMON beg playfully…$" + +gUnknown_818B02E:: @ 818B02E + .string "Scrub, scrub…$" + +gUnknown_818B03C:: @ 818B03C + .string "Hello…\n" + .string "Your POKéMON look healthy…$" + +gUnknown_818B05E:: @ 818B05E + .string "This is where I buried my ONIX…\n" + .string "It was named TECTONIX…$" + +gUnknown_818B095:: @ 818B095 + .string "“Here lies TECTONIX” is engraved\n" + .string "on a boulder.\p" + .string "There is a LEMONADE placed as an\n" + .string "offering in front of the grave.$" + +gUnknown_818B105:: @ 818B105 + .string "Would you like to leave another\n" + .string "LEMONADE as an offering?$" + +gUnknown_818B13E:: @ 818B13E + .string "{PLAYER} placed a can of LEMONADE\n" + .string "in front of the grave.$" + +gUnknown_818B171:: @ 818B171 + .string "Th-thank you…\p" + .string "That was my TECTONIX's favorite\n" + .string "drink…\p" + .string "I don't even know you, but your\n" + .string "act of kindness…\p" + .string "It's uplifted me a little.\p" + .string "Can you please take this as my\n" + .string "thanks?$" + +gUnknown_818B219:: @ 818B219 + .string "Please be good to your POKéMON,\n" + .string "too.$" + +gUnknown_818B23E:: @ 818B23E + .string "If you don't have room for it,\n" + .string "I'll hold it for you till next time.$" + +gUnknown_818B282:: @ 818B282 + .string "Oh, it's you from that time…\p" + .string "I still have that thing I wanted\n" + .string "you to have as my thanks.$" + +gUnknown_818B2DA:: @ 818B2DA + .string "Scrub, scrub…\p" + .string "… … …\n" + .string "TECTONIX…$" + +gUnknown_818B2F8:: @ 818B2F8 + .string "Boulders and rocks are neatly piled\n" + .string "up as a cairn.\p" + .string "“Here lies TECTONIX” is engraved\n" + .string "on a boulder.$" + diff --git a/data/maps/FiveIsland_PokemonCenter_1F/text.inc b/data/maps/FiveIsland_PokemonCenter_1F/text.inc new file mode 100644 index 000000000..e1b0e1ea4 --- /dev/null +++ b/data/maps/FiveIsland_PokemonCenter_1F/text.inc @@ -0,0 +1,10 @@ +gUnknown_81A3BBA:: @ 81A3BBA + .string "I'm on my way to prepare a meal\n" + .string "for a certain high-society person.$" + +gUnknown_81A3BFD:: @ 81A3BFD + .string "You're on a quest to catch every\n" + .string "single kind of POKéMON?\p" + .string "…How incredible. Please tell me if\n" + .string "you catch a strong one!$" + diff --git a/data/maps/FiveIsland_ResortGorgeous/text.inc b/data/maps/FiveIsland_ResortGorgeous/text.inc new file mode 100644 index 000000000..d984ab092 --- /dev/null +++ b/data/maps/FiveIsland_ResortGorgeous/text.inc @@ -0,0 +1,93 @@ +Text_18A3E2:: @ 818A3E2 + .string "With these hands, I will create\n" + .string "my victory!$" + +Text_18A40E:: @ 818A40E + .string "The shame of this…\n" + .string "I'm red-faced…$" + +Text_18A430:: @ 818A430 + .string "Uh-oh, my paint tubes have\n" + .string "scattered everywhere!$" + +Text_18A461:: @ 818A461 + .string "Excuse me!\n" + .string "I'm trying to paint.\l" + .string "Please keep out of my sight!$" + +Text_18A49E:: @ 818A49E + .string "This loss…\n" + .string "I feel like I'm whiting out…$" + +Text_18A4C6:: @ 818A4C6 + .string "GILLIAN?\n" + .string "Please tilt your head slightly…\l" + .string "There! That's the look I want!$" + +Text_18A50E:: @ 818A50E + .string "Hmm…\n" + .string "The angle, it is not quite there…$" + +Text_18A535:: @ 818A535 + .string "Oh…\n" + .string "My feelings, they are blue…$" + +Text_18A555:: @ 818A555 + .string "The sky and the sea…\n" + .string "They are so fickle.\p" + .string "Their changing expressions make\n" + .string "them difficult to capture.$" + +Text_18A5B9:: @ 818A5B9 + .string "I am visiting my friend's retreat,\n" + .string "if you must know.$" + +Text_18A5EE:: @ 818A5EE + .string "Oh, my, so strong.$" + +Text_18A601:: @ 818A601 + .string "I find it pleasurable to leisurely\n" + .string "battle in the gentle sea breeze.$" + +Text_18A645:: @ 818A645 + .string "I'm thinking of having a pool\n" + .string "made specially for POKéMON.$" + +Text_18A67F:: @ 818A67F + .string "Oh, my goodness gracious!$" + +Text_18A699:: @ 818A699 + .string "A pool would be nice, but I must\n" + .string "say, a sun-room may be sublime.$" + +Text_18A6DA:: @ 818A6DA + .string "I'm a good runner.\n" + .string "I'm really fast!$" + +Text_18A6FE:: @ 818A6FE + .string "Oops!\n" + .string "I rushed things!$" + +Text_18A715:: @ 818A715 + .string "When I run with the wind, it feels\n" + .string "like I could fly!$" + +Text_18A74A:: @ 818A74A + .string "I say, this marine life here at\n" + .string "this resort agrees with me.$" + +Text_18A786:: @ 818A786 + .string "That's a shocker!\n" + .string "You must be joking.$" + +Text_18A7AC:: @ 818A7AC + .string "Getting so serious over this…\n" + .string "How nonsensical.$" + +gUnknown_818A7DB:: @ 818A7DB + .string "SELPHY: Thank you.\p" + .string "You may go now.$" + +gUnknown_818A7FE:: @ 818A7FE + .string "SELPHY'S HOUSE$" + diff --git a/data/maps/FiveIsland_ResortGorgeous_House/text.inc b/data/maps/FiveIsland_ResortGorgeous_House/text.inc new file mode 100644 index 000000000..1d872274b --- /dev/null +++ b/data/maps/FiveIsland_ResortGorgeous_House/text.inc @@ -0,0 +1,68 @@ +gUnknown_81A42A0:: @ 81A42A0 + .string "SELPHY: Oh?\n" + .string "Do I know you from somewhere?\p" + .string "Oh, but that doesn't matter.\p" + .string "I am exquisitely bored.\n" + .string "Please, hear my wish.$" + +gUnknown_81A4315:: @ 81A4315 + .string "I wish to see a POKéMON.\n" + .string "A darling {STR_VAR_1}.\p" + .string "I want to see one right away.\n" + .string "Please, make my wish come true.$" + +gUnknown_81A437A:: @ 81A437A + .string "SELPHY: Oh, I'm tired of this.\n" + .string "I'm tired of waiting for you.\p" + .string "I'll forgive you this time, but\n" + .string "please don't fail me next time.$" + +gUnknown_81A43F7:: @ 81A43F7 + .string "SELPHY: Oh, hello, there.\p" + .string "Oh, my gracious. That must be the\n" + .string "{STR_VAR_1} you caught for me.\p" + .string "Giggle…\n" + .string "I see a resemblance to you.\p" + .string "Thank you so kindly.\p" + .string "… … … … … …\n" + .string "Is something the matter?\p" + .string "You may leave.\p" + .string "… … … … … …\n" + .string "Oh, fine. I understand now.\p" + .string "SEBASTIAN!\n" + .string "I need you here this instant!$" + +gUnknown_81A450B:: @ 81A450B + .string "Butler: Yes, my lady.$" + +gUnknown_81A4521:: @ 81A4521 + .string "SELPHY: See to it that this person\n" + .string "is given a token of appreciation.$" + +gUnknown_81A4566:: @ 81A4566 + .string "Butler: I shall do as you bid,\n" + .string "my lady.$" + +gUnknown_81A458E:: @ 81A458E + .string "Butler: I sincerely thank you for\n" + .string "pleasing Lady SELPHY.\p" + .string "Please accept this as her thanks…$" + +gUnknown_81A45E8:: @ 81A45E8 + .string "Butler: Your BAG appears to be\n" + .string "unfortunately full.$" + +gUnknown_81A461B:: @ 81A461B + .string "Oh…\n" + .string "How disappointing.$" + +gUnknown_81A4632:: @ 81A4632 + .string "SELPHY: I wish you the best of\n" + .string "luck.$" + +gUnknown_81A4657:: @ 81A4657 + .string "Butler: The smile of Lady SELPHY\n" + .string "has the brilliance of the sun.\p" + .string "Please, I beg you to bring joy\n" + .string "to Lady SELPHY.$" + diff --git a/data/maps/FiveIsland_RocketWarehouse/text.inc b/data/maps/FiveIsland_RocketWarehouse/text.inc new file mode 100644 index 000000000..b77ebd7c8 --- /dev/null +++ b/data/maps/FiveIsland_RocketWarehouse/text.inc @@ -0,0 +1,137 @@ +gUnknown_817B4E3:: @ 817B4E3 + .string "There are many POKéMON locked\n" + .string "away in the pen…$" + +gUnknown_817B512:: @ 817B512 + .string "The pen door is unlocked.\n" + .string "The POKéMON appear to have fled.$" + +Text_17B54D:: @ 817B54D + .string "Did you come here knowing it's\n" + .string "TEAM ROCKET's WAREHOUSE?$" + +Text_17B585:: @ 817B585 + .string "What do you think you're doing?!$" + +gUnknown_817B5A6:: @ 817B5A6 + .string "TEAM ROCKET broke up?\n" + .string "What planet are you from?$" + +Text_17B5D6:: @ 817B5D6 + .string "Oh, now your POKéMON look strong.\n" + .string "You're willing to sell them?\p" + .string "Oh?\n" + .string "You wanted to battle?$" + +Text_17B62F:: @ 817B62F + .string "Oh, but…\n" + .string "Too much!$" + +gUnknown_817B642:: @ 817B642 + .string "We can give you a great price.\n" + .string "Sell us your POKéMON!$" + +Text_17B677:: @ 817B677 + .string "I got word about you from the\n" + .string "others.\p" + .string "But there's no way a kid like you'd\n" + .string "know our BOSS GIOVANNI!$" + +Text_17B6D9:: @ 817B6D9 + .string "Don't…you…dare…laugh…$" + +gUnknown_817B6EF:: @ 817B6EF + .string "Don't mess in the doings of adults,\n" + .string "you jumped-up pip-squeak!$" + +Text_17B72D:: @ 817B72D + .string "I don't know or care if what I'm\n" + .string "doing is right or wrong…\p" + .string "I just put my faith in GIOVANNI\n" + .string "and do as I am told.$" + +Text_17B79C:: @ 817B79C + .string "I…\n" + .string "I'm shattered…$" + +gUnknown_817B7AE:: @ 817B7AE + .string "You're doing things according to\n" + .string "your beliefs and morals.\p" + .string "I understand now…$" + +gUnknown_817B7FA:: @ 817B7FA + .string "I've made it so you can come back\n" + .string "in through there.\p" + .string "Why don't you go get rested and\n" + .string "refreshed for what lies ahead?\p" + .string "The ADMIN after me outranks me\n" + .string "thoroughly as a TRAINER.\p" + .string "You'd better steel yourself for one\n" + .string "harsh challenge.$" + +Text_17B8DA:: @ 817B8DA + .string "That's quite enough of you \n" + .string "playing the hero, kid.\p" + .string "Spreading lies about how TEAM\n" + .string "ROCKET has disbanded…\p" + .string "It's such an obvious attempt to\n" + .string "cause confusion in our ranks.\p" + .string "Fortunately, we're not so ignorant\n" + .string "to fall for the lies of a child!\p" + .string "And now, I'll show you how scary\n" + .string "an angry adult can be!$" + +Text_17B9FB:: @ 817B9FB + .string "Urgh…\n" + .string "You were too strong…\p" + .string "…\n" + .string "Th-that's GIOVANNI's BADGE!\p" + .string "So it's true?\n" + .string "TEAM ROCKET really has disbanded?$" + +gUnknown_817BA64:: @ 817BA64 + .string "We will abandon this WAREHOUSE…\p" + .string "But don't think this is over.\n" + .string "I won't let this be the end.\p" + .string "I will find GIOVANNI.\n" + .string "And I will resurrect TEAM ROCKET!\l" + .string "I will…\p" + .string "Until then, farewell!$" + +gUnknown_817BB15:: @ 817BB15 + .string "A report with graphs and text is on\n" + .string "the PC monitor.\p" + .string "“The Influence of Magnetic Waves\n" + .string "on POKéMON Evolution”…\p" + .string "… … … … … …\p" + .string "It's too difficult to understand…$" + +Text_17BBAF:: @ 817BBAF + .string "I almost managed to sell the\n" + .string "SAPPHIRE for huge money…\p" + .string "Then, you just had to come along\n" + .string "and blow the whole deal apart!\p" + .string "Fufu… Fufufufu…\n" + .string "There's no forgiveness for you!$" + +Text_17BC55:: @ 817BC55 + .string "Gah! Darn!\n" + .string "Darn! Darn!$" + +gUnknown_817BC6C:: @ 817BC6C + .string "If I can't sell it, it's worthless!\n" + .string "Go ahead, take it!$" + +gUnknown_817BCA3:: @ 817BCA3 + .string "What do you want now?\n" + .string "Go on, get lost, leave me be.$" + +gUnknown_817BCD7:: @ 817BCD7 + .string "What, you again?\p" + .string "You… You're not GIOVANNI's kid,\n" + .string "are you?\p" + .string "No, that can't be right!\n" + .string "GIOVANNI's kid has red hair.\p" + .string "You don't have any reasons for\n" + .string "bugging me. Leave me alone!$" + diff --git a/data/maps/FiveIsland_WaterLabyrinth/text.inc b/data/maps/FiveIsland_WaterLabyrinth/text.inc new file mode 100644 index 000000000..111671eb9 --- /dev/null +++ b/data/maps/FiveIsland_WaterLabyrinth/text.inc @@ -0,0 +1,49 @@ +gUnknown_818A80D:: @ 818A80D + .string "You travel all over the place,\n" + .string "don't you?\p" + .string "You're not driving your POKéMON\n" + .string "too harshly, are you?\p" + .string "Let me take a look.\n" + .string "… … … … … …$" + +gUnknown_818A88F:: @ 818A88F + .string "Ah, hmm…\n" + .string "I see, I see…$" + +gUnknown_818A8A6:: @ 818A8A6 + .string "Oh, impressive.\n" + .string "You treat your POKéMON right.\p" + .string "I think you can be entrusted with\n" + .string "this.\p" + .string "Please, I'd like you to have this.$" + +Text_18A91F:: @ 818A91F + .string "{PLAYER} received an EGG\n" + .string "from the man!$" + +gUnknown_818A940:: @ 818A940 + .string "…Unfortunately, you don't have\n" + .string "space for this in your party.\p" + .string "You'd better come back for it\n" + .string "another time.$" + +Text_18A9A9:: @ 818A9A9 + .string "やあ\n" + .string "タマゴを　もらいに\l" + .string "きて　くれたんだね$" + +gUnknown_818A9C0:: @ 818A9C0 + .string "I received that EGG while I was\n" + .string "traveling.\p" + .string "I'm glad I met someone like you.$" + +gUnknown_818AA0C:: @ 818AA0C + .string "Oh, hello.\n" + .string "That's a cute {STR_VAR_2}.\p" + .string "Seeing it reminds me of a sweet \n" + .string "little girl I met while traveling.\p" + .string "She was gently grooming POKéMON…\n" + .string "She was a little angel.\p" + .string "That little girl's name…\n" + .string "I think it was DAISY.$" + diff --git a/data/maps/FourIsland/text.inc b/data/maps/FourIsland/text.inc new file mode 100644 index 000000000..04845b223 --- /dev/null +++ b/data/maps/FourIsland/text.inc @@ -0,0 +1,56 @@ +gUnknown_8182A03:: @ 8182A03 + .string "FOUR ISLAND\n" + .string "The Warm, Blue, Floe Island$" + +gUnknown_8182A2B:: @ 8182A2B + .string "LORELEI has returned.\p" + .string "Did she find the city life too\n" + .string "stressful, I wonder?$" + +gUnknown_8182A75:: @ 8182A75 + .string "LORELEI has gone back.\p" + .string "The LAPRAS she has, I imagine it\n" + .string "to be the one she met as a child.\p" + .string "I believe it was in ICEFALL CAVE\n" + .string "that she caught it.\p" + .string "Perhaps that POKéMON has been with\n" + .string "her ever since.$" + +gUnknown_8182B37:: @ 8182B37 + .string "{RIVAL}: Hey!\n" + .string "{PLAYER}!\p" + .string "What are you doing here in the\n" + .string "SEVII ISLANDS?\p" + .string "You should quit copying me,\n" + .string "you know?\p" + .string "Anyways, I already got my POKéMON\n" + .string "EGG, so I'm done with this island.\p" + .string "Heh, I bet you don't even know\n" + .string "about POKéMON EGGS.\p" + .string "You'll never fill your NATIONAL\n" + .string "POKéDEX that way.\p" + .string "By the way, I saw someone we both\n" + .string "know on this island.\p" + .string "Why don't you go look around if\n" + .string "it makes you curious?\p" + .string "Me, I don't have the time to\n" + .string "waste.\p" + .string "Be smelling ya!$" + +gUnknown_8182CE3:: @ 8182CE3 + .string "Oh, you found me!\n" + .string "Please don't tell LORELEI.\p" + .string "Did you know that LORELEI has lots\n" + .string "and lots of stuffed dolls?\p" + .string "Every time she comes back to\n" + .string "FOUR ISLAND, her collection grows!$" + +gUnknown_8182D8E:: @ 8182D8E + .string "Ooh, chilly!\p" + .string "I made a slushie using ice I\n" + .string "shaved inside ICEFALL CAVE.\p" + .string "It's chilly and tasty!$" + +gUnknown_8182DEB:: @ 8182DEB + .string "LORELEI'S HOUSE$" + diff --git a/data/maps/FourIsland_House1/text.inc b/data/maps/FourIsland_House1/text.inc new file mode 100644 index 000000000..2d4f8c4bd --- /dev/null +++ b/data/maps/FourIsland_House1/text.inc @@ -0,0 +1,23 @@ +Text_1A3778:: @ 81A3778 + .string "そーれ　ぼよーん！\n" + .string "どっちが　さきに　へたばるか？\l" + .string "のしかかり　しょうぶ　してるんだ\p" + .string "きみは　なかまに　はいったら\n" + .string "つぶれそうだな‥\l" + .string "かわりに　きみの　ポケモンに\l" + .string "のしかかり　おしえて　やろっか？$" + +Text_1A37DB:: @ 81A37DB + .string "また　おいで　ぼよーん！$" + +Text_1A37E8:: @ 81A37E8 + .string "どの　ポケモンに\n" + .string "おしえたい　かい？$" + +Text_1A37FB:: @ 81A37FB + .string "ぼよよーん！$" + +gUnknown_81A3802:: @ 81A3802 + .string "There! Boing!\n" + .string "You're awfully heavy!$" + diff --git a/data/maps/FourIsland_IcefallCave_Back/text.inc b/data/maps/FourIsland_IcefallCave_Back/text.inc new file mode 100644 index 000000000..f65e95854 --- /dev/null +++ b/data/maps/FourIsland_IcefallCave_Back/text.inc @@ -0,0 +1,73 @@ +gUnknown_817B04F:: @ 817B04F + .string "LORELEI: Keep your filthy hands\n" + .string "off the POKéMON in the cave!\p" + .string "Do as I say, or you'll have me to\n" + .string "answer to!$" + +gUnknown_817B0B9:: @ 817B0B9 + .string "Aww, shut it, lady, and leave\n" + .string "us be.\p" + .string "Don't let your glasses get all\n" + .string "steamed up!$" + +gUnknown_817B109:: @ 817B109 + .string "LORELEI: {PLAYER}?!\n" + .string "What are you doing here?\p" + .string "No, we can catch up later.\n" + .string "Right now, I need your help.\p" + .string "Help me kick these poachers out\n" + .string "before they do anything else.\p" + .string "They've been catching POKéMON\n" + .string "here, then selling them off!\p" + .string "Are you ready?\n" + .string "You take that one, please!$" + +gUnknown_817B20B:: @ 817B20B + .string "W-what?!\p" + .string "Who says we can't do what we want\n" + .string "with the POKéMON we catch?$" + +Text_17B251:: @ 817B251 + .string "We didn't plan on this!$" + +gUnknown_817B269:: @ 817B269 + .string "LORELEI: Humph.\n" + .string "So despicably weak.\p" + .string "You!\n" + .string "Tell me!\p" + .string "Where have you taken the captured\n" + .string "POKéMON?\p" + .string "I'm smashing your ring once and\n" + .string "for all!$" + +gUnknown_817B2EF:: @ 817B2EF + .string "N-no way!\n" + .string "I'm not telling you that!$" + +Text_17B313:: @ 817B313 + .string "LORELEI: If you won't confess,\n" + .string "we'll deep-freeze you.\p" + .string "My LAPRAS is furious for what\n" + .string "you've done to its friends.\p" + .string "Go, LAPRAS!\n" + .string "ICE BEAM…$" + +gUnknown_817B399:: @ 817B399 + .string "Wawaah! Okay!\n" + .string "I'll talk!\p" + .string "The POKéMON are in the ROCKET\n" + .string "WAREHOUSE on FIVE ISLAND.\p" + .string "There! I said it!\n" + .string "We'll be going now!\p" + .string "…But I doubt you'll ever make it\n" + .string "into the ROCKET WAREHOUSE!\p" + .string "Heheheheh!$" + +gUnknown_817B457:: @ 817B457 + .string "{PLAYER}, thank you.\n" + .string "But this is awful…\p" + .string "I was born and raised here on\n" + .string "these islands.\p" + .string "I had no idea that those horrible\n" + .string "criminals were loose here…$" + diff --git a/data/maps/FourIsland_LoreleisHouse/text.inc b/data/maps/FourIsland_LoreleisHouse/text.inc new file mode 100644 index 000000000..5c7d0cd81 --- /dev/null +++ b/data/maps/FourIsland_LoreleisHouse/text.inc @@ -0,0 +1,29 @@ +gUnknown_81A3826:: @ 81A3826 + .string "LORELEI: There's something weighing\n" + .string "heavily on my mind.\p" + .string "If anything were to happen on\n" + .string "the island where I was born…\p" + .string "I wouldn't know about it if I were\n" + .string "in the POKéMON LEAGUE.\p" + .string "I wonder if that would make me\n" + .string "irresponsible to my home…$" + +gUnknown_81A390C:: @ 81A390C + .string "LORELEI: So, you managed to solve\n" + .string "all the problems here?\p" + .string "That's wonderful.\p" + .string "That means there isn't any reason\n" + .string "for me to be here all the time.\p" + .string "Thank you…\p" + .string "I'll return to the POKéMON LEAGUE\n" + .string "in a short while.$" + +gUnknown_81A39D8:: @ 81A39D8 + .string "I don't know what will happen in\n" + .string "the future, but…\p" + .string "I will do what I can here and now.\n" + .string "That's all I can do.$" + +gUnknown_81A3A42:: @ 81A3A42 + .string "Stuffed POKéMON dolls galore!$" + diff --git a/data/maps/FourIsland_Mart/text.inc b/data/maps/FourIsland_Mart/text.inc new file mode 100644 index 000000000..eba66dd37 --- /dev/null +++ b/data/maps/FourIsland_Mart/text.inc @@ -0,0 +1,16 @@ +Text_1A3A60:: @ 81A3A60 + .string "We've had a great and powerful\n" + .string "TRAINER grow up on this island.\p" + .string "I bet even you'd know her.\n" + .string "It's LORELEI of the ELITE FOUR!\p" + .string "When LORELEI was just a tyke,\n" + .string "I taught her about POKéMON.$" + +gUnknown_81A3B14:: @ 81A3B14 + .string "The SEVII ISLANDS are in a warm\n" + .string "region overall.\p" + .string "But there is one exception you\n" + .string "need to know about.\p" + .string "The ICEFALL CAVE is frigid because\n" + .string "of the POKéMON that live in it.$" + diff --git a/data/maps/FourIsland_PokemonCenter_1F/text.inc b/data/maps/FourIsland_PokemonCenter_1F/text.inc new file mode 100644 index 000000000..59beaf443 --- /dev/null +++ b/data/maps/FourIsland_PokemonCenter_1F/text.inc @@ -0,0 +1,44 @@ +Text_1A3505:: @ 81A3505 + .string "Ready?\n" + .string "Boing!\p" + .string "We're having a BODY SLAM match\n" + .string "to see who wimps out first.\p" + .string "If you were to join us, you'd be\n" + .string "squashed like a bug, though…\p" + .string "How about I teach BODY SLAM to\n" + .string "a POKéMON of yours instead?$" + +Text_1A35C7:: @ 81A35C7 + .string "Come again!\n" + .string "Boing!$" + +Text_1A35DA:: @ 81A35DA + .string "Which POKéMON wants to learn how\n" + .string "to BODY SLAM?$" + +Text_1A3609:: @ 81A3609 + .string "Boioing!$" + +Text_1A3612:: @ 81A3612 + .string "それ　ぼよーん！\n" + .string "おまえ　おもいなあー！$" + +gUnknown_81A3627:: @ 81A3627 + .string "There's a rare kind of ICE POKéMON\n" + .string "that lives in the cave.\p" + .string "We get a lot of visitors hoping to\n" + .string "see that POKéMON.$" + +gUnknown_81A3697:: @ 81A3697 + .string "Oh? A POKéMON EGG?\n" + .string "…I have no idea.\p" + .string "…Oh, wait. The DAY-CARE people\n" + .string "in town were saying something.\p" + .string "They said that they'd found EGGS\n" + .string "before on their property.$" + +gUnknown_81A3734:: @ 81A3734 + .string "What's this?\p" + .string "The new POKéMON JOURNAL hasn't\n" + .string "arrived on this island?$" + diff --git a/data/maps/FuchsiaCity/text.inc b/data/maps/FuchsiaCity/text.inc new file mode 100644 index 000000000..2916a29cf --- /dev/null +++ b/data/maps/FuchsiaCity/text.inc @@ -0,0 +1,111 @@ +gUnknown_818056E:: @ 818056E + .string "Did you try the SAFARI GAME?\p" + .string "There are some rare POKéMON that\n" + .string "can only be caught there.$" + +gUnknown_81805C6:: @ 81805C6 + .string "The SAFARI ZONE has a zoo in front\n" + .string "of the entrance.\p" + .string "Out back is the SAFARI GAME for\n" + .string "catching POKéMON.$" + +gUnknown_818062C:: @ 818062C + .string "ERIK: Where's SARA?\n" + .string "I said I'd meet her here.$" + +gUnknown_818065A:: @ 818065A + .string "That item ball in there…\n" + .string "Were you wanting that?\p" + .string "Me, too!\n" + .string "…Huh? That's a POKéMON?$" + +gUnknown_81806AB:: @ 81806AB + .string "FUCHSIA CITY\n" + .string "Behold! It's Passion Pink!$" + +gUnknown_81806D3:: @ 81806D3 + .string "POKéMON PARADISE\n" + .string "SAFARI ZONE$" + +gUnknown_81806F0:: @ 81806F0 + .string "SAFARI GAME\n" + .string "POKéMON-U-CATCH!$" + +gUnknown_818070D:: @ 818070D + .string "SAFARI ZONE\n" + .string "WARDEN'S HOME$" + +gUnknown_8180727:: @ 8180727 + .string "POKéMON PARADISE!\n" + .string "Welcome to the SAFARI ZONE!\l" + .string "SAFARI ZONE OFFICE$" + +gUnknown_8180768:: @ 8180768 + .string "FUCHSIA CITY POKéMON GYM\n" + .string "LEADER: KOGA\l" + .string "The Poisonous Ninja Master$" + +gUnknown_81807A9:: @ 81807A9 + .string "Name: CHANSEY\n" + .string "Catching one is all up to chance.$" + +gUnknown_81807D9:: @ 81807D9 + .string "Name: VOLTORB\n" + .string "The very image of a POKé BALL.$" + +gUnknown_8180806:: @ 8180806 + .string "Name: KANGASKHAN\p" + .string "A maternal POKéMON that raises its\n" + .string "young in a pouch on its belly.$" + +gUnknown_8180859:: @ 8180859 + .string "Name: SLOWPOKE\n" + .string "Friendly and very slow moving.$" + +gUnknown_8180887:: @ 8180887 + .string "Name: LAPRAS\n" + .string "AKA the king of the seas.$" + +gUnknown_81808AE:: @ 81808AE + .string "Name: OMANYTE\n" + .string "An extremely rare POKéMON that was\l" + .string "regenerated from a fossil.$" + +gUnknown_81808FA:: @ 81808FA + .string "Name: KABUTO\n" + .string "An extremely rare POKéMON that was\l" + .string "regenerated from a fossil.$" + +Text_180945:: @ 8180945 + .string "……$" + +Text_180948:: @ 8180948 + .string "Aww, I wish I was a KANGASKHAN\n" + .string "baby.\p" + .string "I'd love to be a substitute for the\n" + .string "baby…\p" + .string "And snuggle in the mother\n" + .string "KANGASKHAN's belly pouch.\p" + .string "But only POKéMON can use the\n" + .string "technique SUBSTITUTE…\p" + .string "Want me to teach SUBSTITUTE to\n" + .string "one of your POKéMON?$" + +Text_180A32:: @ 8180A32 + .string "Oh, really?\n" + .string "SUBSTITUTE seems so fun…$" + +Text_180A57:: @ 8180A57 + .string "Which POKéMON wants to learn\n" + .string "SUBSTITUTE?$" + +Text_180A80:: @ 8180A80 + .string "Boy, what I'd give to crawl inside\n" + .string "a KANGASKHAN belly pouch…$" + +gUnknown_8180ABD:: @ 8180ABD + .string "My father is the GYM LEADER of\n" + .string "this town.\p" + .string "I'm training to use POISON POKéMON\n" + .string "as well as my father.$" + diff --git a/data/maps/FuchsiaCity_Building1/text.inc b/data/maps/FuchsiaCity_Building1/text.inc new file mode 100644 index 000000000..dd4069e1f --- /dev/null +++ b/data/maps/FuchsiaCity_Building1/text.inc @@ -0,0 +1,64 @@ +gUnknown_8198DF9:: @ 8198DF9 + .string "WARDEN: Hif fuff hefifoo!\p" + .string "Ha lof ha feef ee hafahi ho.\n" + .string "Heff hee fwee!$" + +gUnknown_8198E3F:: @ 8198E3F + .string "Ah howhee ho hoo!\n" + .string "Eef ee hafahi ho!$" + +gUnknown_8198E63:: @ 8198E63 + .string "Ha?\n" + .string "He ohay heh ha hoo ee haheh!$" + +Text_198E84:: @ 8198E84 + .string "{PLAYER} gave the GOLD TEETH\n" + .string "to the WARDEN.$" + +gUnknown_8198EAA:: @ 8198EAA + .string "The WARDEN popped in his teeth!$" + +gUnknown_8198ECA:: @ 8198ECA + .string "WARDEN: Thanks, son!\n" + .string "You're a real lifesaver!\p" + .string "No one could understand a word\n" + .string "that I said, not a one!\p" + .string "I was too ashamed to show my face\n" + .string "around the OFFICE, even.\p" + .string "Let me give you something for your\n" + .string "trouble.$" + +gUnknown_8198F96:: @ 8198F96 + .string "WARDEN: Thank you, lassie!\n" + .string "You're a real lifesaver!\p" + .string "No one could understand a word\n" + .string "that I said, not a one!\p" + .string "I was too ashamed to show my face\n" + .string "around the OFFICE, even.\p" + .string "Let me give you something for your\n" + .string "trouble.$" + +gUnknown_8199068:: @ 8199068 + .string "{PLAYER} received HM04\n" + .string "from the WARDEN.$" + +gUnknown_819908A:: @ 819908A + .string "WARDEN: Inside HM04 you'll find\n" + .string "STRENGTH.\p" + .string "It lets POKéMON move boulders when\n" + .string "you're outside of battle.\p" + .string "Oh yes, did you find the SECRET\n" + .string "HOUSE in the SAFARI ZONE?$" + +Text_19912B:: @ 819912B + .string "なんや　にもつ\n" + .string "いっぱいやんけ！$" + +gUnknown_819913C:: @ 819913C + .string "POKéMON photos and fossils are on\n" + .string "display.$" + +gUnknown_8199167:: @ 8199167 + .string "Old POKéMON merchandise is on\n" + .string "display.$" + diff --git a/data/maps/FuchsiaCity_Gym/text.inc b/data/maps/FuchsiaCity_Gym/text.inc new file mode 100644 index 000000000..3967461b5 --- /dev/null +++ b/data/maps/FuchsiaCity_Gym/text.inc @@ -0,0 +1,156 @@ +Text_19832E:: @ 819832E + .string "KOGA: Fwahahaha!\p" + .string "A mere child like you dares to\n" + .string "challenge me?\p" + .string "The very idea makes me shiver\n" + .string "with mirth!\p" + .string "Very well, I shall show you true\n" + .string "terror as a ninja master.\p" + .string "Poison brings steady doom.\n" + .string "Sleep renders foes helpless.\p" + .string "Despair to the creeping horror of\n" + .string "POISON-type POKéMON!{PLAY_BGM}{BGM_FRLG_LEADER_EYE}$" + +Text_198444:: @ 8198444 + .string "Humph!\n" + .string "You have proven your worth!\p" + .string "Here!\n" + .string "Take the SOULBADGE!$" + +gUnknown_8198481:: @ 8198481 + .string "When afflicted by TOXIC, a POKéMON\n" + .string "suffers more and more.\p" + .string "It suffers worsening damage as the\n" + .string "battle wears on!\p" + .string "It will surely terrorize foes!$" + +gUnknown_819850E:: @ 819850E + .string "Now that you have the SOULBADGE,\n" + .string "the DEFENSE of your POKéMON rises.\p" + .string "It also lets you SURF outside of\n" + .string "battle.\p" + .string "Ah!\n" + .string "Take this, too!$" + +gUnknown_819858F:: @ 819858F + .string "{PLAYER} received TM06\n" + .string "from KOGA.$" + +gUnknown_81985AB:: @ 81985AB + .string "Sealed within that TM06 lies\n" + .string "TOXIC!\p" + .string "It is a secret technique dating\n" + .string "back some four hundred years.$" + +gUnknown_819860D:: @ 819860D + .string "Make space for this, child!$" + +Text_198629:: @ 8198629 + .string "Strength isn't the key for POKéMON.\n" + .string "Do you understand this?\p" + .string "POKéMON is about strategy!\p" + .string "I'll show you how strategy can\n" + .string "beat brute strength.$" + +Text_1986B4:: @ 81986B4 + .string "What?\n" + .string "Extraordinary!$" + +gUnknown_81986C9:: @ 81986C9 + .string "So, you mix brawn with brains?\n" + .string "Good strategy!\p" + .string "That's remarkable for a child\n" + .string "TRAINER.$" + +Text_19871E:: @ 819871E + .string "I was a magician once upon a time.\p" + .string "But I dreamt of becoming a ninja,\n" + .string "so I joined this GYM.$" + +Text_198779:: @ 8198779 + .string "I'm done for!$" + +gUnknown_8198787:: @ 8198787 + .string "Even though I've lost, I will keep\n" + .string "training according to the teachings\l" + .string "of KOGA, my ninja master.$" + +Text_1987E8:: @ 81987E8 + .string "Let's see you beat my special\n" + .string "techniques!$" + +Text_198812:: @ 8198812 + .string "You had me fooled!$" + +gUnknown_8198825:: @ 8198825 + .string "I like poison and sleep techniques,\n" + .string "as they linger after battle!$" + +Text_198866:: @ 8198866 + .string "Stop right there!\p" + .string "The famed invisible walls of\n" + .string "FUCHSIA GYM have you frustrated?$" + +Text_1988B6:: @ 81988B6 + .string "Whoa!\n" + .string "You've got it!$" + +gUnknown_81988CB:: @ 81988CB + .string "You impressed me!\n" + .string "Here's a hint!\p" + .string "Look very closely for gaps in the\n" + .string "invisible walls!$" + +Text_19891F:: @ 819891F + .string "I also study the way of the ninja\n" + .string "with Master KOGA!\p" + .string "Ninja have a long history of using\n" + .string "animals!$" + +Text_19897F:: @ 819897F + .string "Awoo!$" + +gUnknown_8198985:: @ 8198985 + .string "I still have much to learn.$" + +Text_1989A1:: @ 81989A1 + .string "Master KOGA comes from a long line\n" + .string "of ninjas.\p" + .string "What did you descend from?$" + +Text_1989EA:: @ 81989EA + .string "You're more skilled than I'd\n" + .string "thought!$" + +gUnknown_8198A10:: @ 8198A10 + .string "Where there is light, there is\n" + .string "shadow!\p" + .string "Light and shadow!\n" + .string "Which do you choose?$" + +gUnknown_8198A5E:: @ 8198A5E + .string "Yo!\n" + .string "Champ in the making!\p" + .string "FUCHSIA GYM is a tricked-up place.\n" + .string "It's riddled with invisible walls!\p" + .string "KOGA might appear close, but he's\n" + .string "blocked off.\p" + .string "You have to find gaps in the walls\n" + .string "to reach him.$" + +gUnknown_8198B1D:: @ 8198B1D + .string "It's amazing how ninja can terrify,\n" + .string "even now!$" + +gUnknown_8198B4B:: @ 8198B4B + .string "FUCHSIA POKéMON GYM\n" + .string "LEADER: KOGA\p" + .string "WINNING TRAINERS:\n" + .string "{RIVAL}$" + +gUnknown_8198B81:: @ 8198B81 + .string "FUCHSIA POKéMON GYM\n" + .string "LEADER: KOGA\p" + .string "WINNING TRAINERS:\n" + .string "{RIVAL}, {PLAYER}$" + diff --git a/data/maps/FuchsiaCity_House1/text.inc b/data/maps/FuchsiaCity_House1/text.inc new file mode 100644 index 000000000..e34e5d19e --- /dev/null +++ b/data/maps/FuchsiaCity_House1/text.inc @@ -0,0 +1,17 @@ +gUnknown_8198BBB:: @ 8198BBB + .string "The SAFARI ZONE's WARDEN is old, \n" + .string "but he's still very much active.\p" + .string "All his teeth are false, though.$" + +gUnknown_8198C1F:: @ 8198C1F + .string "Hmm?\n" + .string "You've met BILL?\p" + .string "He's my grandson!\p" + .string "He always liked collecting things,\n" + .string "even as a child!$" + +gUnknown_8198C7B:: @ 8198C7B + .string "BILL files his own POKéMON data on\n" + .string "his PC.\p" + .string "Did he show you?$" + diff --git a/data/maps/FuchsiaCity_House2/text.inc b/data/maps/FuchsiaCity_House2/text.inc new file mode 100644 index 000000000..bf425f98e --- /dev/null +++ b/data/maps/FuchsiaCity_House2/text.inc @@ -0,0 +1,37 @@ +gUnknown_819918E:: @ 819918E + .string "I'm the FISHING GURU's older\n" + .string "brother.\p" + .string "I simply looove fishing!\n" + .string "I can't bear to go without.\p" + .string "Tell me, do you like to fish?$" + +gUnknown_8199207:: @ 8199207 + .string "Grand! I like your style.\n" + .string "I think we can be friends.\p" + .string "Take this and fish, young friend!$" + +gUnknown_819925E:: @ 819925E + .string "{PLAYER} received a GOOD ROD from\n" + .string "the FISHING GURU's brother.$" + +gUnknown_8199296:: @ 8199296 + .string "Fishing is a way of life!\n" + .string "It is like the finest poetry.\p" + .string "A crummy OLD ROD could only catch\n" + .string "MAGIKARP, yes?\p" + .string "But with a GOOD ROD, you can\n" + .string "catch much better POKéMON.$" + +gUnknown_8199337:: @ 8199337 + .string "Oh…\n" + .string "That's so disappointing…$" + +gUnknown_8199354:: @ 8199354 + .string "Hello there, {PLAYER}!\p" + .string "How are the fish biting?$" + +gUnknown_819937E:: @ 819937E + .string "Oh, no!\p" + .string "I had a gift for you, but you have\n" + .string "no room for it!$" + diff --git a/data/maps/FuchsiaCity_House3/text.inc b/data/maps/FuchsiaCity_House3/text.inc new file mode 100644 index 000000000..e4fbd2f6a --- /dev/null +++ b/data/maps/FuchsiaCity_House3/text.inc @@ -0,0 +1,35 @@ +gUnknown_81993B9:: @ 81993B9 + .string "Uh…\n" + .string "Oh, yes, I'm the MOVE DELETER.\p" + .string "I can make POKéMON forget their\n" + .string "moves.\p" + .string "Would you like me to do that?$" + +gUnknown_8199421:: @ 8199421 + .string "Which POKéMON should forget a\n" + .string "move?$" + +gUnknown_8199445:: @ 8199445 + .string "Which move should be forgotten?$" + +gUnknown_8199465:: @ 8199465 + .string "{STR_VAR_1} seems to know only one\n" + .string "move…$" + +gUnknown_8199485:: @ 8199485 + .string "Hm! {STR_VAR_1}'s {STR_VAR_2}?\n" + .string "That move should be forgotten?$" + +gUnknown_81994B1:: @ 81994B1 + .string "It worked to perfection!\p" + .string "{STR_VAR_1} has forgotten\n" + .string "{STR_VAR_2} completely.$" + +gUnknown_81994EA:: @ 81994EA + .string "Come again if there are other\n" + .string "moves to be forgotten.$" + +gUnknown_819951F:: @ 819951F + .string "What?\n" + .string "No EGG should know any moves.$" + diff --git a/data/maps/FuchsiaCity_Mart/text.inc b/data/maps/FuchsiaCity_Mart/text.inc new file mode 100644 index 000000000..69f9bc5f8 --- /dev/null +++ b/data/maps/FuchsiaCity_Mart/text.inc @@ -0,0 +1,10 @@ +gUnknown_81980BC:: @ 81980BC + .string "Don't they have any pennants\n" + .string "promoting the SAFARI ZONE?\p" + .string "How about some paper lanterns?\n" + .string "Aren't there even any calendars?$" + +gUnknown_8198134:: @ 8198134 + .string "Did you try X SPEED?\n" + .string "It speeds up a POKéMON in battle.$" + diff --git a/data/maps/FuchsiaCity_PokemonCenter_1F/text.inc b/data/maps/FuchsiaCity_PokemonCenter_1F/text.inc new file mode 100644 index 000000000..7d3a627be --- /dev/null +++ b/data/maps/FuchsiaCity_PokemonCenter_1F/text.inc @@ -0,0 +1,18 @@ +gUnknown_8198CB7:: @ 8198CB7 + .string "You can't become a good TRAINER\n" + .string "with just one strong POKéMON.\p" + .string "But raising many POKéMON evenly\n" + .string "is no easy task, either.$" + +gUnknown_8198D2E:: @ 8198D2E + .string "There's a narrow trail west of\n" + .string "VIRIDIAN CITY.\p" + .string "It goes to the POKéMON LEAGUE HQ.\n" + .string "The HQ governs all TRAINERS.$" + +gUnknown_8198D9B:: @ 8198D9B + .string "If you're working on a POKéDEX,\n" + .string "visit the SAFARI ZONE.\p" + .string "All sorts of rare POKéMON breed\n" + .string "there.$" + diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/text.inc b/data/maps/FuchsiaCity_SafariZone_Entrance/text.inc new file mode 100644 index 000000000..bda1357a4 --- /dev/null +++ b/data/maps/FuchsiaCity_SafariZone_Entrance/text.inc @@ -0,0 +1,73 @@ +gUnknown_8197C6B:: @ 8197C6B + .string "Welcome to the SAFARI ZONE!$" + +gUnknown_8197C87:: @ 8197C87 + .string "For just ¥500, you can play the\n" + .string "SAFARI GAME.\p" + .string "You can roam the wide-open safari\n" + .string "and catch what you like.\p" + .string "Would you like to play?$" + +gUnknown_8197D07:: @ 8197D07 + .string "That'll be ¥500, please!\p" + .string "We only use a special kind of \n" + .string "POKé BALLS here.$" + +Text_197D50:: @ 8197D50 + .string "{PLAYER} received 30 SAFARI BALLS\n" + .string "from the attendant.$" + +gUnknown_8197D80:: @ 8197D80 + .string "We'll call you on the PA when you\n" + .string "run out of time or SAFARI BALLS.\p" + .string "Well, I'll wish you the best of\n" + .string "luck!$" + +gUnknown_8197DE9:: @ 8197DE9 + .string "Okay.\n" + .string "Please come again!$" + +gUnknown_8197E02:: @ 8197E02 + .string "Oops!\n" + .string "Not enough money!$" + +gUnknown_8197E1A:: @ 8197E1A + .string "Are you going to leave the\n" + .string "SAFARI ZONE early?$" + +gUnknown_8197E48:: @ 8197E48 + .string "Please return any SAFARI BALLS\n" + .string "you may have left.$" + +gUnknown_8197E7A:: @ 8197E7A + .string "Good luck!$" + +gUnknown_8197E85:: @ 8197E85 + .string "Did you catch your fair share?\n" + .string "Come again!$" + +gUnknown_8197EB0:: @ 8197EB0 + .string "Hi! Is it your first time here at\n" + .string "the SAFARI ZONE?$" + +gUnknown_8197EE3:: @ 8197EE3 + .string "The SAFARI ZONE actually has\n" + .string "four zones in it.\p" + .string "Each zone has different kinds of\n" + .string "POKéMON, even some rare ones.\p" + .string "Use the supplied SAFARI BALLS to\n" + .string "catch them.\p" + .string "You can also throw BAIT or ROCKS\n" + .string "besides the SAFARI BALLS.\p" + .string "If you throw BAIT, the POKéMON\n" + .string "becomes less likely to flee, but\l" + .string "harder to catch.\p" + .string "If you throw ROCKS, the POKéMON\n" + .string "becomes more likely to flee, but\l" + .string "easier to catch.\p" + .string "When you run out of time or SAFARI\n" + .string "BALLS, it's game over for you!$" + +gUnknown_819809E:: @ 819809E + .string "Sorry, you're a regular here!$" + diff --git a/data/maps/FuchsiaCity_ZooBuilding/text.inc b/data/maps/FuchsiaCity_ZooBuilding/text.inc new file mode 100644 index 000000000..36b7e8a3e --- /dev/null +++ b/data/maps/FuchsiaCity_ZooBuilding/text.inc @@ -0,0 +1,25 @@ +gUnknown_819816B:: @ 819816B + .string "We nicknamed the WARDEN\n" + .string "“SLOWPOKE.”\p" + .string "You know, he has that vacant look\n" + .string "like a SLOWPOKE.$" + +gUnknown_81981C2:: @ 81981C2 + .string "WARDEN SLOWPOKE is very\n" + .string "knowledgeable about POKéMON.\p" + .string "He even has some fossils of rare,\n" + .string "extinct POKéMON.$" + +gUnknown_819822A:: @ 819822A + .string "WARDEN SLOWPOKE came in, but\n" + .string "I couldn't understand him.\p" + .string "I think he's got a speech problem!$" + +gUnknown_8198285:: @ 8198285 + .string "WARDEN SLOWPOKE is running a\n" + .string "promotion campaign right now.\p" + .string "Try to get to the farthest corner\n" + .string "of the SAFARI ZONE.\p" + .string "If you can make it, you'll win a\n" + .string "very convenient prize.$" + diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/text.inc b/data/maps/IndigoPlateau_PokemonCenter_1F/text.inc new file mode 100644 index 000000000..7a4d158b3 --- /dev/null +++ b/data/maps/IndigoPlateau_PokemonCenter_1F/text.inc @@ -0,0 +1,24 @@ +gUnknown_819A837:: @ 819A837 + .string "Yo!\n" + .string "Champ in the making!\p" + .string "At the POKéMON LEAGUE, you will\n" + .string "face the ELITE FOUR all in a row.\p" + .string "If you lose, you have to start all\n" + .string "over again!\p" + .string "This is it!\n" + .string "Go for it!$" + +gUnknown_819A8D8:: @ 819A8D8 + .string "From here on, you face the\n" + .string "ELITE FOUR one by one.\p" + .string "If you win, a door opens to the\n" + .string "next TRAINER. Good luck!$" + +gUnknown_819A943:: @ 819A943 + .string "I am so sorry, but you've wasted\n" + .string "your time coming here.\p" + .string "LORELEI of the ELITE FOUR is\n" + .string "absent, you see.\p" + .string "As a result, the POKéMON LEAGUE is\n" + .string "closed for the time being.$" + diff --git a/data/maps/LavenderTown/text.inc b/data/maps/LavenderTown/text.inc new file mode 100644 index 000000000..d3d76a189 --- /dev/null +++ b/data/maps/LavenderTown/text.inc @@ -0,0 +1,40 @@ +gUnknown_817F52E:: @ 817F52E + .string "Do you believe in ghosts?$" + +gUnknown_817F548:: @ 817F548 + .string "Really?\n" + .string "So there are believers…$" + +gUnknown_817F568:: @ 817F568 + .string "Hahaha, I guess not.\p" + .string "That white hand on your shoulder…\n" + .string "I'm just imagining it.$" + +gUnknown_817F5B6:: @ 817F5B6 + .string "This town is known as the grave\n" + .string "site of POKéMON.\p" + .string "Memorial services are held in\n" + .string "POKéMON TOWER.$" + +gUnknown_817F614:: @ 817F614 + .string "Ghosts appeared in POKéMON TOWER.\p" + .string "I think they're the spirits of\n" + .string "POKéMON that the ROCKETS killed.$" + +gUnknown_817F676:: @ 817F676 + .string "LAVENDER TOWN\n" + .string "The Noble Purple Town$" + +gUnknown_817F69A:: @ 817F69A + .string "New SILPH SCOPE!\n" + .string "Make the Invisible Plain to See!\p" + .string "SILPH CO.$" + +gUnknown_817F6D6:: @ 817F6D6 + .string "LAVENDER VOLUNTEER\n" + .string "POKéMON HOUSE$" + +gUnknown_817F6F7:: @ 817F6F7 + .string "POKéMON TOWER\n" + .string "Becalm the Spirits of POKéMON$" + diff --git a/data/maps/LavenderTown_House1/text.inc b/data/maps/LavenderTown_House1/text.inc new file mode 100644 index 000000000..0b61cb72d --- /dev/null +++ b/data/maps/LavenderTown_House1/text.inc @@ -0,0 +1,16 @@ +gUnknown_819396B:: @ 819396B + .string "CUBONE: Kyarugoo!$" + +gUnknown_819397D:: @ 819397D + .string "Those horrible ROCKETS!\n" + .string "They deserve no mercy!\p" + .string "That poor CUBONE's mother…\p" + .string "It was killed trying to escape from\n" + .string "TEAM ROCKET.$" + +gUnknown_81939F8:: @ 81939F8 + .string "The ghost of POKéMON TOWER is\n" + .string "gone!\p" + .string "Someone must have soothed its\n" + .string "restless spirit!$" + diff --git a/data/maps/LavenderTown_House2/text.inc b/data/maps/LavenderTown_House2/text.inc new file mode 100644 index 000000000..50fa577ff --- /dev/null +++ b/data/maps/LavenderTown_House2/text.inc @@ -0,0 +1,47 @@ +gUnknown_8193A4B:: @ 8193A4B + .string "Hello, hello!\n" + .string "I am the official NAME RATER!\p" + .string "Want me to rate the nicknames of\n" + .string "your POKéMON?$" + +gUnknown_8193AA6:: @ 8193AA6 + .string "Which POKéMON's nickname should\n" + .string "I critique?$" + +gUnknown_8193AD2:: @ 8193AD2 + .string "{STR_VAR_1}, is it?\n" + .string "That is a decent nickname!\p" + .string "But, would you like me to give it\n" + .string "a nicer name?\p" + .string "How about it?$" + +gUnknown_8193B36:: @ 8193B36 + .string "Ah, good. Then, what shall the new\n" + .string "nickname be?$" + +gUnknown_8193B66:: @ 8193B66 + .string "Done! From now on, this POKéMON\n" + .string "shall be known as {STR_VAR_1}!\p" + .string "It is a better name than before!\n" + .string "How fortunate for you!$" + +gUnknown_8193BD4:: @ 8193BD4 + .string "I see.\n" + .string "Do come visit again.$" + +gUnknown_8193BF0:: @ 8193BF0 + .string "Done! From now on, this POKéMON\n" + .string "shall be known as {STR_VAR_1}!\p" + .string "It looks no different from before,\n" + .string "and yet, this is vastly superior!\p" + .string "How fortunate for you!$" + +gUnknown_8193C82:: @ 8193C82 + .string "{STR_VAR_1}, is it?\n" + .string "That is a truly impeccable name!\p" + .string "Take good care of {STR_VAR_1}!$" + +gUnknown_8193CC4:: @ 8193CC4 + .string "Now, now.\n" + .string "That is merely an EGG!$" + diff --git a/data/maps/LavenderTown_Mart/text.inc b/data/maps/LavenderTown_Mart/text.inc new file mode 100644 index 000000000..024f526ed --- /dev/null +++ b/data/maps/LavenderTown_Mart/text.inc @@ -0,0 +1,20 @@ +gUnknown_8193CE5:: @ 8193CE5 + .string "I'm searching for items that raise\n" + .string "the stats of POKéMON.\p" + .string "They're effective over the course\n" + .string "of a single battle.\p" + .string "X ATTACK, X DEFEND, X SPEED, \n" + .string "and X SPECIAL are what I'm after.\p" + .string "Do you know where I can get them?$" + +gUnknown_8193DB6:: @ 8193DB6 + .string "Did you buy some REVIVES?\n" + .string "They revive any fainted POKéMON!$" + +gUnknown_8193DF1:: @ 8193DF1 + .string "Sometimes, a TRAINER duo will\n" + .string "challenge you with two POKéMON\l" + .string "at the same time.\p" + .string "If that happens, you have to send\n" + .string "out two POKéMON to battle, too.$" + diff --git a/data/maps/LavenderTown_PokemonCenter_1F/text.inc b/data/maps/LavenderTown_PokemonCenter_1F/text.inc new file mode 100644 index 000000000..f86c82e6e --- /dev/null +++ b/data/maps/LavenderTown_PokemonCenter_1F/text.inc @@ -0,0 +1,16 @@ +gUnknown_8193465:: @ 8193465 + .string "TEAM ROCKET will do anything for\n" + .string "the sake of money!\p" + .string "There is no job too dirty, no deed\n" + .string "too heinous, no crime too wicked!$" + +gUnknown_81934DE:: @ 81934DE + .string "I saw CUBONE's mother trying to\n" + .string "escape from TEAM ROCKET.\p" + .string "She was killed trying to get away…$" + +gUnknown_819353A:: @ 819353A + .string "You know how the CUBONE species\n" + .string "wears skulls, right?\p" + .string "People will pay a lot for one.$" + diff --git a/data/maps/LavenderTown_VolunteerPokemonHouse/text.inc b/data/maps/LavenderTown_VolunteerPokemonHouse/text.inc new file mode 100644 index 000000000..c7245da55 --- /dev/null +++ b/data/maps/LavenderTown_VolunteerPokemonHouse/text.inc @@ -0,0 +1,67 @@ +Text_19358E:: @ 819358E + .string "I recently moved to this town.\p" + .string "I hear that MR. FUJI's not from\n" + .string "these parts originally, either.$" + +gUnknown_81935ED:: @ 81935ED + .string "That's odd, MR. FUJI isn't here.\n" + .string "Where'd he go?$" + +gUnknown_819361D:: @ 819361D + .string "MR. FUJI had been praying alone\n" + .string "for CUBONE's mother.$" + +gUnknown_8193652:: @ 8193652 + .string "This is really MR. FUJI's house.\p" + .string "He's really kind.\p" + .string "He looks after abandoned and\n" + .string "orphaned POKéMON.$" + +gUnknown_81936B4:: @ 81936B4 + .string "It's so warm!\n" + .string "POKéMON are so nice to hug.$" + +gUnknown_81936DE:: @ 81936DE + .string "NIDORINO: Gaoo!$" + +gUnknown_81936EE:: @ 81936EE + .string "PSYDUCK: Gwappa!$" + +gUnknown_81936FF:: @ 81936FF + .string "MR. FUJI: {PLAYER}…\p" + .string "Your POKéDEX quest is one that\n" + .string "requires strong dedication.\p" + .string "Without deep love for POKéMON,\n" + .string "your quest may fail.\p" + .string "I'm not sure if this will help you,\n" + .string "but I'd like you to have it.$" + +gUnknown_81937BD:: @ 81937BD + .string "{PLAYER} received a POKé FLUTE\n" + .string "from MR. FUJI.$" + +gUnknown_81937E5:: @ 81937E5 + .string "Upon hearing the POKé FLUTE,\n" + .string "sleeping POKéMON will spring awake.\p" + .string "Try using it on POKéMON that are\n" + .string "sleeping obstacles.$" + +gUnknown_819385B:: @ 819385B + .string "You must make room for this!$" + +gUnknown_8193878:: @ 8193878 + .string "MR. FUJI: Has my POKé FLUTE\n" + .string "helped you?$" + +gUnknown_81938A0:: @ 81938A0 + .string "POKéMON FAN MAGAZINE\n" + .string "Monthly Grand Prize Drawing!\p" + .string "The application form is…\p" + .string "Gone! It's been clipped out.\n" + .string "Someone must have applied already.$" + +gUnknown_819392B:: @ 819392B + .string "POKéMON magazines line the shelf.\p" + .string "POKéMON INSIDER…\p" + .string "POKéMON FAN…$" + diff --git a/data/maps/MtEmber_Exterior/text.inc b/data/maps/MtEmber_Exterior/text.inc new file mode 100644 index 000000000..d9a365f95 --- /dev/null +++ b/data/maps/MtEmber_Exterior/text.inc @@ -0,0 +1,143 @@ +Text_17A642:: @ 817A642 + .string "Can you imagine?\n" + .string "If this volcano were to erupt?\p" + .string "The explosion would be the end of\n" + .string "us. How terrifying is that?\p" + .string "While we're terrified, would you\n" + .string "like me to teach EXPLOSION?$" + +Text_17A6ED:: @ 817A6ED + .string "Yeah, you're right.\n" + .string "It is too terrifying.$" + +Text_17A717:: @ 817A717 + .string "You're terribly brave!\p" + .string "Which POKéMON should I teach\n" + .string "EXPLOSION?$" + +Text_17A756:: @ 817A756 + .string "Using EXPLOSION while on this\n" + .string "volcano…\p" + .string "What a terrifying thrill!$" + +Text_17A797:: @ 817A797 + .string "こ　この　かざんが\n" + .string "もし　だいばくはつ　したら\l" + .string "お　おれら　ひとたまりも\l" + .string "ないなあ　‥ブルブル！\p" + .string "こ　こわい　ついでに\n" + .string "だいばくはつ　でも　おぼえてみる？$" + +Text_17A7E5:: @ 817A7E5 + .string "や　やっぱ　こわいもんな\n" + .string "ブルブル$" + +Text_17A7F7:: @ 817A7F7 + .string "つ　つよきだね！\n" + .string "じゃあ　どの　ポケモンに　する？$" + +Text_17A811:: @ 817A811 + .string "かざんで　だいばくはつを‥\n" + .string "す　すごい　スリル！$" + +gUnknown_817A82A:: @ 817A82A + .string "Over here.\n" + .string "We'll try digging here.\p" + .string "That treasure the ADMINS've been\n" + .string "talking about should be here.$" + +gUnknown_817A88C:: @ 817A88C + .string "What the…?\n" + .string "You're in the way. Get lost.$" + +gUnknown_817A8B4:: @ 817A8B4 + .string "Whew, punched through at last.\n" + .string "Let's go treasure hunting!$" + +Text_17A8EE:: @ 817A8EE + .string "Any treasure we find, we haul back\n" + .string "to the WAREHOUSE, understood?\p" + .string "…Oh, and what're the passwords?\n" + .string "At the ROCKET WAREHOUSE, I mean.$" + +gUnknown_817A970:: @ 817A970 + .string "What, you forgot the password?\n" + .string "There're actually two.\p" + .string "The first one's “GOLDEEN need\n" + .string "log.”\p" + .string "And the second one is…$" + +gUnknown_817A9E1:: @ 817A9E1 + .string "Hey!\n" + .string "This snoop's been listening in!$" + +gUnknown_817AA06:: @ 817AA06 + .string "You've been eavesdropping on us,\n" + .string "haven't you?$" + +Text_17AA34:: @ 817AA34 + .string "Huh, what?$" + +gUnknown_817AA3F:: @ 817AA3F + .string "Why'd you have to win?$" + +gUnknown_817AA56:: @ 817AA56 + .string "Trying to horn in on our treasure?\n" + .string "Don't bet on it!$" + +Text_17AA8A:: @ 817AA8A + .string "Wait!\n" + .string "But how?$" + +gUnknown_817AA99:: @ 817AA99 + .string "Develop amnesia conveniently and\n" + .string "forget everything you heard!$" + +gUnknown_817AAD7:: @ 817AAD7 + .string "What a setback…\n" + .string "We'll have to regroup.\p" + .string "You! Don't even think about taking\n" + .string "a step inside here!\p" + .string "If you know what's good for you,\n" + .string "don't even think about this!$" + +Text_17AB73:: @ 817AB73 + .string "An active volcano is one that's\n" + .string "erupting, or about to.$" + +Text_17ABAA:: @ 817ABAA + .string "Whew… That was hot!\n" + .string "Sweat's erupting from me!$" + +gUnknown_817ABD8:: @ 817ABD8 + .string "They say there're over 1,500\n" + .string "active volcanoes in the world.\p" + .string "Just thinking about them makes me\n" + .string "feel all hot and gooey inside!$" + +Text_17AC55:: @ 817AC55 + .string "Do you know how caves form inside\n" + .string "volcanoes?$" + +Text_17AC82:: @ 817AC82 + .string "Atchah!\n" + .string "You're shockingly good!$" + +gUnknown_817ACA2:: @ 817ACA2 + .string "When lava at the surface of magma\n" + .string "hardens, and the magma inside flows\l" + .string "out, caverns are left behind.$" + +Text_17AD06:: @ 817AD06 + .string "I've been in training so I can mend\n" + .string "my broken heart…\p" + .string "It toughened me up physically at\n" + .string "least! Hi-yah!$" + +Text_17AD6B:: @ 817AD6B + .string "I think I tried to overdo it…$" + +gUnknown_817AD89:: @ 817AD89 + .string "The way you battle, it reminds me\n" + .string "of the guy who dumped me…$" + diff --git a/data/maps/MtEmber_RubyPath_B3F/text.inc b/data/maps/MtEmber_RubyPath_B3F/text.inc new file mode 100644 index 000000000..4cf8b5a50 --- /dev/null +++ b/data/maps/MtEmber_RubyPath_B3F/text.inc @@ -0,0 +1,3 @@ +gUnknown_817ADC5:: @ 817ADC5 + .string "{PLAYER} found a RUBY!$" + diff --git a/data/maps/MtMoon_1F/text.inc b/data/maps/MtMoon_1F/text.inc new file mode 100644 index 000000000..86028da5c --- /dev/null +++ b/data/maps/MtMoon_1F/text.inc @@ -0,0 +1,87 @@ +Text_17279D:: @ 817279D + .string "WHOA!\n" + .string "You shocked me!\l" + .string "…Oh, you're just a kid!$" + +Text_1727CB:: @ 81727CB + .string "Wow!\n" + .string "Shocked again!$" + +gUnknown_81727DF:: @ 81727DF + .string "Kids like you shouldn't be\n" + .string "wandering around here in the dark.$" + +Text_17281D:: @ 817281D + .string "Did you come to explore the cave,\n" + .string "too?$" + +Text_172844:: @ 8172844 + .string "Losing stinks!\n" + .string "It's so uncool.$" + +gUnknown_8172863:: @ 8172863 + .string "I came all the way down here to\n" + .string "show off to girls.$" + +Text_172896:: @ 8172896 + .string "Wow! It's way bigger in here than\n" + .string "I thought!$" + +Text_1728C3:: @ 81728C3 + .string "Oh!\n" + .string "I lost it!$" + +gUnknown_81728D2:: @ 81728D2 + .string "How do you get out of here?\n" + .string "It's so big, I may get lost.$" + +Text_17290B:: @ 817290B + .string "What!\n" + .string "Don't sneak up on me!$" + +Text_172927:: @ 8172927 + .string "My POKéMON won't do!$" + +gUnknown_817293C:: @ 817293C + .string "I have to find stronger POKéMON.\n" + .string "Where might they be?$" + +Text_172972:: @ 8172972 + .string "What?\n" + .string "I'm waiting for my friends to find\l" + .string "me here.$" + +Text_1729A4:: @ 81729A4 + .string "I lost?$" + +gUnknown_81729AC:: @ 81729AC + .string "I came because I heard there are\n" + .string "some very rare fossils here.$" + +Text_1729EA:: @ 81729EA + .string "Suspicious men are in the cave.\n" + .string "What about you?$" + +Text_172A1A:: @ 8172A1A + .string "You got me!$" + +gUnknown_8172A26:: @ 8172A26 + .string "I saw them!\n" + .string "I'm sure they're from TEAM ROCKET!$" + +Text_172A55:: @ 8172A55 + .string "You need to go through this cave\n" + .string "to get to CERULEAN CITY.$" + +Text_172A8F:: @ 8172A8F + .string "I lost.$" + +gUnknown_8172A97:: @ 8172A97 + .string "ZUBAT is tough!\n" + .string "But if you can catch one, you'll\l" + .string "be able to count on it.$" + +gUnknown_8172AE0:: @ 8172AE0 + .string "Beware!\n" + .string "ZUBAT is a bloodsucker!$" + diff --git a/data/maps/MtMoon_B2F/text.inc b/data/maps/MtMoon_B2F/text.inc new file mode 100644 index 000000000..2f27312db --- /dev/null +++ b/data/maps/MtMoon_B2F/text.inc @@ -0,0 +1,90 @@ +Text_172B00:: @ 8172B00 + .string "Hi, I'm excavating for fossils here\n" + .string "under MT. MOON.\p" + .string "Sometimes, BROCK of PEWTER GYM\n" + .string "lends me a hand.$" + +Text_172B64:: @ 8172B64 + .string "Hey, stop!\p" + .string "I found these fossils!\n" + .string "They're both mine!$" + +Text_172B99:: @ 8172B99 + .string "Okay!\n" + .string "I'll share!$" + +gUnknown_8172BAB:: @ 8172BAB + .string "We'll each take a fossil!\n" + .string "No being greedy!$" + +Text_172BD6:: @ 8172BD6 + .string "All right.\n" + .string "Then this fossil is mine!$" + +gUnknown_8172BFB:: @ 8172BFB + .string "Far away, on CINNABAR ISLAND,\n" + .string "there's a POKéMON LAB.\p" + .string "They do research on regenerating\n" + .string "fossils.$" + +Text_172C5A:: @ 8172C5A + .string "We, TEAM ROCKET, shall find the\n" + .string "fossils!\p" + .string "Reviving POKéMON from them will\n" + .string "earn us huge riches!$" + +Text_172CB8:: @ 8172CB8 + .string "Urgh!\n" + .string "Now I'm mad!$" + +gUnknown_8172CCB:: @ 8172CCB + .string "You made me mad!\n" + .string "TEAM ROCKET will blacklist you!$" + +Text_172CFC:: @ 8172CFC + .string "We, TEAM ROCKET, are POKéMON\n" + .string "gangsters!\l" + .string "We strike fear with our strength!$" + +Text_172D46:: @ 8172D46 + .string "I blew it!$" + +gUnknown_8172D51:: @ 8172D51 + .string "Darn it all!\n" + .string "My associates won't stand for this!$" + +Text_172D82:: @ 8172D82 + .string "We're pulling a big job here!\n" + .string "Get lost, kid!$" + +Text_172DAF:: @ 8172DAF + .string "So, you are good…$" + +gUnknown_8172DC1:: @ 8172DC1 + .string "If you find a fossil, give it to me\n" + .string "and scram!$" + +Text_172DF0:: @ 8172DF0 + .string "Little kids shouldn't be messing\n" + .string "around with grown-ups!\p" + .string "It could be bad news!$" + +Text_172E3E:: @ 8172E3E + .string "I'm steamed!$" + +gUnknown_8172E4B:: @ 8172E4B + .string "POKéMON lived here long before\n" + .string "people came.$" + +gUnknown_8172E77:: @ 8172E77 + .string "Do you want the DOME FOSSIL?$" + +gUnknown_8172E94:: @ 8172E94 + .string "Do you want the HELIX FOSSIL?$" + +gUnknown_8172EB2:: @ 8172EB2 + .string "Obtained the HELIX FOSSIL!$" + +gUnknown_8172ECD:: @ 8172ECD + .string "Obtained the DOME FOSSIL!$" + diff --git a/data/maps/OneIsland/text.inc b/data/maps/OneIsland/text.inc new file mode 100644 index 000000000..f3777a036 --- /dev/null +++ b/data/maps/OneIsland/text.inc @@ -0,0 +1,70 @@ +Text_181569:: @ 8181569 + .string "This FAN CLUB…\n" + .string "No one here has a clue!\p" + .string "How could they not recognize\n" + .string "the brilliance that is LANCE?\p" + .string "He stands for justice!\n" + .string "He's cool, and yet passionate!\l" + .string "He's the greatest, LANCE!$" + +gUnknown_818161B:: @ 818161B + .string "BILL: Here we are!\n" + .string "This is ONE ISLAND.\p" + .string "There are several islands around\n" + .string "here, and this is one of them.\p" + .string "My friend CELIO sent the boat to\n" + .string "fetch me here.\p" + .string "He's in charge of the island's PC\n" + .string "network by his lonesome.\p" + .string "…Why am I telling you this now?\n" + .string "Let's just go see CELIO!$" + +Text_181726:: @ 8181726 + .string "Ahoy, there!\n" + .string "Where do you want to sail?$" + +gUnknown_818174E:: @ 818174E + .string "Here we are on an island smack in\n" + .string "the middle of nowhere.\p" + .string "We're lucky to have an upstanding\n" + .string "young man like CELIO here.\p" + .string "My granddaughter was in a tizzy\n" + .string "over CELIO's friend.\p" + .string "Something about a famous\n" + .string "POKéMANIAC?\p" + .string "I'm not sure what that means, but\n" + .string "CELIO is quite the man!$" + +gUnknown_8181858:: @ 8181858 + .string "My granddaughter was in a tizzy\n" + .string "over a new breakthrough.\p" + .string "She said we now have PC linkage\n" + .string "with people in KANTO.\p" + .string "I'm not sure what that means, but\n" + .string "CELIO is quite the man!$" + +gUnknown_8181901:: @ 8181901 + .string "My granddaughter was in a tizzy\n" + .string "over a new breakthrough.\p" + .string "She said we finally have PC linkage\n" + .string "with people in HOENN.\p" + .string "I'm not sure what that means, but\n" + .string "CELIO is quite the man.\p" + .string "He would make a fine husband for\n" + .string "my granddaughter!$" + +gUnknown_81819E1:: @ 81819E1 + .string "ONE ISLAND\n" + .string "Friends Gather at Knot Island$" + +gUnknown_8181A0A:: @ 8181A0A + .string "Expanding the POKéMON World!\n" + .string "POKéMON NET CENTER$" + +Text_181A3A:: @ 8181A3A + .string "グレンタウンに　もどりますか？$" + +gUnknown_8181A4A:: @ 8181A4A + .string "Hi, sight-seeing, are you?\n" + .string "Isn't the warm climate here great?$" + diff --git a/data/maps/OneIsland_House1/text.inc b/data/maps/OneIsland_House1/text.inc new file mode 100644 index 000000000..a050b31b0 --- /dev/null +++ b/data/maps/OneIsland_House1/text.inc @@ -0,0 +1,9 @@ +gUnknown_81A2332:: @ 81A2332 + .string "On sunny days, I step out and gaze\n" + .string "upon the volcano.\p" + .string "That's my daily routine.$" + +gUnknown_81A2380:: @ 81A2380 + .string "Let me think… When was the last\n" + .string "time MT. EMBER erupted?$" + diff --git a/data/maps/OneIsland_House2/text.inc b/data/maps/OneIsland_House2/text.inc new file mode 100644 index 000000000..c147325c1 --- /dev/null +++ b/data/maps/OneIsland_House2/text.inc @@ -0,0 +1,5 @@ +gUnknown_81A23B8:: @ 81A23B8 + .string "Young people all want to go off to\n" + .string "big cities.\p" + .string "But I want to stay here forever!$" + diff --git a/data/maps/OneIsland_KindleRoad/text.inc b/data/maps/OneIsland_KindleRoad/text.inc new file mode 100644 index 000000000..93537a5f3 --- /dev/null +++ b/data/maps/OneIsland_KindleRoad/text.inc @@ -0,0 +1,164 @@ +Text_18961F:: @ 818961F + .string "The weather's gorgeous!\n" + .string "Perfect for a battle!$" + +Text_18964D:: @ 818964D + .string "Aiyeeeeh!$" + +Text_189657:: @ 8189657 + .string "Please don't splash my face!\n" + .string "You'll ruin the makeup.$" + +Text_18968C:: @ 818968C + .string "I'm beginning to get a sunburn…$" + +Text_1896AC:: @ 81896AC + .string "Oh, you're so awful.$" + +Text_1896C1:: @ 81896C1 + .string "I like that cap you have.\n" + .string "Maybe I should wear one, too…$" + +Text_1896F9:: @ 81896F9 + .string "Seen from here, MT. EMBER towers\n" + .string "into the sky.$" + +Text_189728:: @ 8189728 + .string "Well, aren't you tough?$" + +Text_189740:: @ 8189740 + .string "The sky is immense around these\n" + .string "parts.$" + +Text_189767:: @ 8189767 + .string "I took a break from swimming,\n" + .string "only to have you challenge me?$" + +Text_1897A4:: @ 81897A4 + .string "Hey, what the…\n" + .string "You're good, you!$" + +Text_1897C5:: @ 81897C5 + .string "Instead of using SURF all the time,\n" + .string "you should swim some.$" + +Text_1897FF:: @ 81897FF + .string "Wait! Wait a second!\n" + .string "I think I've hooked a big one!$" + +Text_189833:: @ 8189833 + .string "I've lost it all again…$" + +Text_18984B:: @ 818984B + .string "Not only did I lose, the big one\n" + .string "got away from me, too!$" + +Text_189883:: @ 8189883 + .string "Could you help me out with my\n" + .string "training?$" + +Text_1898AB:: @ 81898AB + .string "You were a cut above me.$" + +Text_1898C4:: @ 81898C4 + .string "It's clear that you're skilled.\n" + .string "I like you!$" + +Text_1898F0:: @ 81898F0 + .string "There isn't a day in which we don't\n" + .string "train!$" + +Text_18991B:: @ 818991B + .string "I'm such a fool!$" + +Text_18992C:: @ 818992C + .string "I'll train even harder from now on!$" + +Text_189950:: @ 8189950 + .string "Every morning, before breakfast,\n" + .string "I swim around this island.$" + +Text_18998C:: @ 818998C + .string "Gasp…\n" + .string "Gasp…$" + +Text_189998:: @ 8189998 + .string "I lost because I'm pooped from all\n" + .string "the running I did…$" + +Text_1899CE:: @ 81899CE + .string "Dress appropriately for battle!\n" + .string "Lose that frivolous outfit!$" + +Text_189A0A:: @ 8189A0A + .string "Why me?!$" + +Text_189A13:: @ 8189A13 + .string "Even martial artists are becoming\n" + .string "fashion conscious these days…$" + +Text_189A53:: @ 8189A53 + .string "You know, everything tastes great\n" + .string "when you're out in the wild.$" + +Text_189A92:: @ 8189A92 + .string "Awww, blown!$" + +Text_189A9F:: @ 8189A9F + .string "The water in volcanic regions is\n" + .string "delicious.$" + +Text_189ACB:: @ 8189ACB + .string "My lunch filled us up, so will you\n" + .string "battle us for some exercise?$" + +Text_189B0B:: @ 8189B0B + .string "That made me all sweaty.$" + +Text_189B24:: @ 8189B24 + .string "What should I do?\n" + .string "I feel famished again.$" + +Text_189B4D:: @ 8189B4D + .string "KIA: My big brother and I make\n" + .string "an awesome combination!$" + +Text_189B84:: @ 8189B84 + .string "KIA: Huh?!\n" + .string "I can't believe it!$" + +Text_189BA3:: @ 8189BA3 + .string "KIA: How could there be anyone\n" + .string "better than my big brother?$" + +Text_189BDE:: @ 8189BDE + .string "KIA: If you want to battle with\n" + .string "us, you have to bring at least two\l" + .string "POKéMON with you.$" + +Text_189C33:: @ 8189C33 + .string "MIK: Together with KIA, I'm afraid\n" + .string "of nothing!$" + +Text_189C62:: @ 8189C62 + .string "MIK: Whoa!\n" + .string "That's too much!$" + +Text_189C7E:: @ 8189C7E + .string "MIK: How could my combination\n" + .string "with KIA fail?$" + +Text_189CAB:: @ 8189CAB + .string "MIK: Hey, do you want to battle\n" + .string "with us two?\p" + .string "Bring two or more POKéMON with\n" + .string "you, then.$" + +gUnknown_8189D02:: @ 8189D02 + .string "This is KINDLE ROAD.\p" + .string "Go straight for MT. EMBER.$" + +gUnknown_8189D32:: @ 8189D32 + .string "Light the Fire in Your Heart!\n" + .string "EMBER SPA$" + diff --git a/data/maps/OneIsland_KindleRoad_EmberSpa/text.inc b/data/maps/OneIsland_KindleRoad_EmberSpa/text.inc new file mode 100644 index 000000000..ffc4fea83 --- /dev/null +++ b/data/maps/OneIsland_KindleRoad_EmberSpa/text.inc @@ -0,0 +1,54 @@ +gUnknown_817D34A:: @ 817D34A + .string "Hm!\n" + .string "Haaaaaaaaaaah!\p" + .string "Aaaah! This is heavenly!\n" + .string "The water warms me to my core!\p" + .string "You should jump in, too.\p" + .string "Go to the middle, relax, and get\n" + .string "good and warm!$" + +gUnknown_817D3DE:: @ 817D3DE + .string "My favorite part of bathing comes\n" + .string "up right after this.\p" + .string "I enjoy a bowl of chowder to\n" + .string "warm me from the inside, too!$" + +gUnknown_817D450:: @ 817D450 + .string "The water is perfectly warm.\n" + .string "It feels exquisite…\p" + .string "{PLAYER} and the POKéMON were\n" + .string "fully refreshed!$" + +gUnknown_817D4AA:: @ 817D4AA + .string "Soaking in a hot spring pool is\n" + .string "therapeutic, people say.$" + +gUnknown_817D4E3:: @ 817D4E3 + .string "Have a look at my face.\n" + .string "See how smooth my skin is?\p" + .string "The hot spring's water keeps my\n" + .string "skin younger than my age.$" + +gUnknown_817D550:: @ 817D550 + .string "After an honest day of training,\n" + .string "nothing beats a relaxing soak in\l" + .string "the hot spring pool.\p" + .string "BRUNO, who's a senior ahead of me,\n" + .string "visits the SPA on occasion.\p" + .string "He comes to rehab injuries, both\n" + .string "his own and his POKéMON's.$" + +gUnknown_817D622:: @ 817D622 + .string "Hot springs go hand-in-hand with\n" + .string "volcanoes.\p" + .string "The EMBER SPA here, well,\n" + .string "I made it years ago.\p" + .string "I hewed the pool right out of a\n" + .string "gigantic boulder by hand.\p" + .string "I was using this at the time.\n" + .string "I suppose I can part with it.$" + +gUnknown_817D6F3:: @ 817D6F3 + .string "That shatters boulders as if they\n" + .string "were made of crackers.$" + diff --git a/data/maps/OneIsland_PokemonCenter_1F/text.inc b/data/maps/OneIsland_PokemonCenter_1F/text.inc new file mode 100644 index 000000000..3e9e5b521 --- /dev/null +++ b/data/maps/OneIsland_PokemonCenter_1F/text.inc @@ -0,0 +1,357 @@ +gUnknown_81A0CDE:: @ 81A0CDE + .string "BILL: Hey, there!\n" + .string "CELIO!$" + +gUnknown_81A0CF7:: @ 81A0CF7 + .string "CELIO: BILL!\n" + .string "I can't believe you came out here.$" + +gUnknown_81A0D27:: @ 81A0D27 + .string "BILL: Well, absolutely!\n" + .string "How's your research coming along?\p" + .string "…Oh, wait a sec.$" + +gUnknown_81A0D72:: @ 81A0D72 + .string "{PLAYER}, this is my buddy CELIO.\n" + .string "He's one dedicated PC MANIAC!$" + +gUnknown_81A0DAC:: @ 81A0DAC + .string "CELIO, this is {PLAYER}, a rising\n" + .string "contender as the POKéMON CHAMP!$" + +gUnknown_81A0DE8:: @ 81A0DE8 + .string "CELIO, this is {PLAYER}, the\n" + .string "reigning POKéMON CHAMP!$" + +gUnknown_81A0E17:: @ 81A0E17 + .string "CELIO: That's really impressive.\p" + .string "I hate to say it, but I have zero\n" + .string "aptitude for battling.\p" + .string "Anyways, I'm glad to meet you.$" + +gUnknown_81A0E90:: @ 81A0E90 + .string "BILL: So, bring me up to speed.\n" + .string "How's your machine running?$" + +gUnknown_81A0ECC:: @ 81A0ECC + .string "CELIO: It's running fine, but we're\n" + .string "too remote out here.\p" + .string "The PCs on this island just can't\n" + .string "link with your PC, BILL.$" + +gUnknown_81A0F40:: @ 81A0F40 + .string "BILL: Oh, yeah?\n" + .string "Okay, let me take a look-see.\p" + .string "…Hang on here…\n" + .string "I think we can make it work.\l" + .string "Let me help you, okay?$" + +gUnknown_81A0FB1:: @ 81A0FB1 + .string "{PLAYER}, can I get you to wait for\n" + .string "me just a bit?\p" + .string "…Actually, can I get you to do\n" + .string "me a favor?\p" + .string "The island next to this one's\n" + .string "called TWO ISLAND.\p" + .string "There's a guy there that runs\n" + .string "a GAME CORNER.\p" + .string "He has this thing for rare rocks\n" + .string "and gems.\p" + .string "We keep in touch, being fellow\n" + .string "maniacs.\p" + .string "So, can I get you to deliver this\n" + .string "METEORITE to him?$" + +gUnknown_81A10EE:: @ 81A10EE + .string "{PLAYER} accepted the METEORITE\n" + .string "from BILL.$" + +gUnknown_81A1113:: @ 81A1113 + .string "CELIO: {PLAYER}, if you are going\n" + .string "to TWO ISLAND, please take this.$" + +gUnknown_81A1150:: @ 81A1150 + .string "It's a PASS for the ferry service\n" + .string "serving the local islands.\p" + .string "It will let you travel between the\n" + .string "ISLANDS ONE, TWO, and THREE.\p" + .string "Oh, you should have this, too.$" + +Text_1A11EC:: @ 81A11EC + .string "{PLAYER} received an extra page\n" + .string "for the TOWN MAP!$" + +gUnknown_81A1218:: @ 81A1218 + .string "{PLAYER} received\n" + .string "a TOWN MAP!$" + +gUnknown_81A1230:: @ 81A1230 + .string "BILL: I'll catch you later!\n" + .string "Say hi to the guy for me!$" + +gUnknown_81A1266:: @ 81A1266 + .string "Hmm…\p" + .string "How about we try this like this…$" + +gUnknown_81A128C:: @ 81A128C + .string "Oh, hey, {PLAYER}!\p" + .string "Did you see?\n" + .string "We got the PC working!\p" + .string "I've got a few things to show\n" + .string "CELIO here.\p" + .string "Can you go out on a stroll or\n" + .string "something for a while more?$" + +gUnknown_81A1321:: @ 81A1321 + .string "I'm sorry for taking up so much of\n" + .string "BILL's time.\p" + .string "I'm also sorry for being such a \n" + .string "poor host on your visit here.$" + +Text_1A1390:: @ 81A1390 + .string "The usual PC services aren't\n" + .string "available…$" + +gUnknown_81A13B8:: @ 81A13B8 + .string "BILL: Oh, hey!\n" + .string "{PLAYER}!$" + +gUnknown_81A13CB:: @ 81A13CB + .string "BILL: What kept you so long?\n" + .string "Been out having a good time?\p" + .string "We got it done.\n" + .string "The PCs are up and running!$" + +gUnknown_81A1431:: @ 81A1431 + .string "CELIO: The job went incredibly\n" + .string "quick.\p" + .string "BILL is one amazing guy…$" + +gUnknown_81A1470:: @ 81A1470 + .string "BILL: No, no! There was almost\n" + .string "nothing left for me to do.\p" + .string "CELIO, I have to hand it to you.\n" + .string "You've learned a lot.$" + +gUnknown_81A14E1:: @ 81A14E1 + .string "CELIO: Oh, really?\n" + .string "Ehehe…$" + +gUnknown_81A14FB:: @ 81A14FB + .string "BILL: Well, there you have it.\n" + .string "I'm finished with the job.\l" + .string "We should head back to KANTO.\p" + .string "CELIO, I'll be seeing you again.$" + +gUnknown_81A1574:: @ 81A1574 + .string "CELIO: {PLAYER}, I'm really sorry\n" + .string "that we sent you off alone today.\p" + .string "I promise, I will show you around\n" + .string "these islands sometime.$" + +gUnknown_81A15EC:: @ 81A15EC + .string "CELIO: Hello!\n" + .string "You look awfully busy as always.\p" + .string "How am I doing?\p" + .string "Well, I'm modifying my Network\n" + .string "Machine.\p" + .string "When I get done with the machine,\n" + .string "I hope you'll be first to use it,\l" + .string "{PLAYER}.$" + +gUnknown_81A169B:: @ 81A169B + .string "CELIO: {PLAYER}, how have things\n" + .string "been for you?\p" + .string "Oh, is that right?\n" + .string "You've caught more POKéMON.\p" + .string "Do you know what?\n" + .string "Maybe I can be useful to you.$" + +gUnknown_81A1723:: @ 81A1723 + .string "I'm modifying the Network Machine\n" + .string "right now.\p" + .string "I'm changing it so it can handle\n" + .string "trades over long distances.\p" + .string "When I get finished, you'll be\n" + .string "trading for exotic POKéMON from\l" + .string "TRAINERS far away.$" + +gUnknown_81A17DF:: @ 81A17DF + .string "But, there is a slight catch.\p" + .string "For the link to work, the Machine\n" + .string "needs a special gemstone.\p" + .string "It's supposed to be on ONE ISLAND,\n" + .string "but I haven't found one yet.\p" + .string "Who knows where it could be.$" + +gUnknown_81A1896:: @ 81A1896 + .string "I was trying to find the gem\n" + .string "even while I was studying.\p" + .string "As a result, I've made no headway\n" + .string "in both my search and studies…\p" + .string "If I relied on BILL, I'm sure my\n" + .string "research would progress.\p" + .string "But this time, I want to try to do\n" + .string "things by myself.$" + +gUnknown_81A197E:: @ 81A197E + .string "Oh!\n" + .string "Th-that's…$" + +Text_1A198D:: @ 81A198D + .string "{PLAYER} handed the RUBY\n" + .string "to CELIO.$" + +gUnknown_81A19AA:: @ 81A19AA + .string "Thank you!\n" + .string "{PLAYER}, you're simply amazing.\p" + .string "… … … … … …\p" + .string "Um… May I ask one more giant favor\n" + .string "of you?$" + +gUnknown_81A1A08:: @ 81A1A08 + .string "It… It's not anything weird.\n" + .string "Please, I need your help.$" + +gUnknown_81A1A3F:: @ 81A1A3F + .string "While I was studying gemstones,\n" + .string "I discovered something important.\p" + .string "There is another gem that forms\n" + .string "a pair with this RUBY.\p" + .string "That other gemstone is supposed to\n" + .string "be in the SEVII ISLANDS.\p" + .string "{PLAYER}, please, I need you to go\n" + .string "find the other gem.\p" + .string "{PLAYER}, may I have your ferry\n" + .string "PASS and the TOWN MAP?$" + +Text_1A1B56:: @ 81A1B56 + .string "{PLAYER} returned the TRI-PASS and\n" + .string "received the RAINBOW PASS.$" + +Text_1A1B8E:: @ 81A1B8E + .string "Obtained an extra page for the\n" + .string "TOWN MAP!$" + +gUnknown_81A1BB7:: @ 81A1BB7 + .string "This is my own ferry PASS.\p" + .string "It will let you get to all the\n" + .string "SEVII ISLANDS.\p" + .string "{PLAYER}, please, I can't do\n" + .string "it without your help.$" + +Text_1A1C2D:: @ 81A1C2D + .string "{PLAYER} handed the SAPPHIRE\n" + .string "to CELIO.$" + +gUnknown_81A1C4E:: @ 81A1C4E + .string "CELIO: So this is the gem that\n" + .string "forms a pair with the RUBY…\p" + .string "{PLAYER}, you've gone through a lot\n" + .string "to get this, didn't you?\p" + .string "You don't have to tell me. I know\n" + .string "it wasn't easy.\p" + .string "Thank you so much!\p" + .string "Now it's my turn to work for you!\n" + .string "Please give me a little time.$" + +gUnknown_81A1D45:: @ 81A1D45 + .string "Okay, this is good…$" + +gUnknown_81A1D59:: @ 81A1D59 + .string "I did it!\n" + .string "I linked up with LANETTE!$" + +gUnknown_81A1D7D:: @ 81A1D7D + .string "{PLAYER}…\n" + .string "{PLAYER}, I did it!\p" + .string "I've managed to link up with\n" + .string "TRAINERS in the HOENN region!\p" + .string "Finally, the Network Machine is\n" + .string "fully operational!\p" + .string "{PLAYER}, I owe it all to you!\p" + .string "Thanks to you, my dream came\n" + .string "true…$" + +gUnknown_81A1E39:: @ 81A1E39 + .string "I…\n" + .string "I'm not crying.\p" + .string "That's enough about me!\p" + .string "{PLAYER}, you're going to keep\n" + .string "looking for exotic POKéMON, right?\p" + .string "I wish you the best of luck!$" + +gUnknown_81A1EBD:: @ 81A1EBD + .string "CELIO: Hello!\p" + .string "{PLAYER}, I've been hearing rumors\n" + .string "about you.$" + +gUnknown_81A1EF3:: @ 81A1EF3 + .string "{PLAYER}, what's your favorite kind\n" + .string "of POKéMON?\p" + .string "BILL is a POKéMANIAC, so he loves\n" + .string "every kind.\p" + .string "Apparently, the first one he caught\n" + .string "was an ABRA.$" + +gUnknown_81A1F7C:: @ 81A1F7C + .string "By the way, {PLAYER}, you're from\n" + .string "PALLET TOWN, aren't you?\p" + .string "I've heard that it's a quiet and\n" + .string "pleasant place.\p" + .string "BILL's hometown is GOLDENROD CITY,\n" + .string "where his folks still live.\p" + .string "I've heard that it's quite the\n" + .string "festive, bustling city.\p" + .string "I'd like to go there one day.$" + +gUnknown_81A2076:: @ 81A2076 + .string "{PLAYER}, is there anything that\n" + .string "you can't stand?\p" + .string "Apparently, BILL simply can't\n" + .string "stomach milk at all.$" + +gUnknown_81A20D5:: @ 81A20D5 + .string "Oh, you're a stranger here!\n" + .string "Hi! Where did you come from?\p" + .string "…PALLET TOWN?\n" + .string "I don't know it!$" + +gUnknown_81A212D:: @ 81A212D + .string "On this island, there's an enormous\n" + .string "volcano.\p" + .string "It hasn't erupted lately, so why\n" + .string "not enjoy a hike?$" + +gUnknown_81A218D:: @ 81A218D + .string "I wish I could trade POKéMON with\n" + .string "my boyfriend who lives far away…$" + +gUnknown_81A21D0:: @ 81A21D0 + .string "I traded POKéMON with my boyfriend\n" + .string "far away!\p" + .string "Everyone's saying that we can\n" + .string "thank you and CELIO.\p" + .string "So, thank you!$" + +gUnknown_81A223F:: @ 81A223F + .string "Network Machine\n" + .string "Link Level 0\p" + .string "…POKéMON Storage System under\n" + .string "adjustment…$" + +gUnknown_81A2286:: @ 81A2286 + .string "Network Machine\n" + .string "Link Level 1\p" + .string "Link established with the KANTO\n" + .string "region.$" + +gUnknown_81A22CB:: @ 81A22CB + .string "Network Machine\n" + .string "Link Level 2\p" + .string "Link established with the KANTO\n" + .string "and HOENN regions.$" + +gUnknown_81A231B:: @ 81A231B + .string "Obtained the TRI-PASS!$" + diff --git a/data/maps/OneIsland_TreasureBeach/text.inc b/data/maps/OneIsland_TreasureBeach/text.inc new file mode 100644 index 000000000..344ed5203 --- /dev/null +++ b/data/maps/OneIsland_TreasureBeach/text.inc @@ -0,0 +1,18 @@ +Text_189D5A:: @ 8189D5A + .string "Lying back, rocked by the waves…\n" + .string "It's exquisite.$" + +Text_189D8B:: @ 8189D8B + .string "I lost…\n" + .string "It feels awful.$" + +Text_189DA3:: @ 8189DA3 + .string "The sea is pleasantly warm in these\n" + .string "parts.$" + +gUnknown_8189DCE:: @ 8189DCE + .string "Good things get washed up by the\n" + .string "ocean current onto this beach.\p" + .string "That's why I often come here for\n" + .string "some beachcombing.$" + diff --git a/data/maps/PalletTown/text.inc b/data/maps/PalletTown/text.inc new file mode 100644 index 000000000..ad476a541 --- /dev/null +++ b/data/maps/PalletTown/text.inc @@ -0,0 +1,67 @@ +Text_17D72C:: @ 817D72C + .string "OAK: Hey! Wait!\n" + .string "Don't go out!$" + +gUnknown_817D74A:: @ 817D74A + .string "OAK: It's unsafe!\n" + .string "Wild POKéMON live in tall grass!\p" + .string "You need your own POKéMON for\n" + .string "your protection.\p" + .string "I know!\n" + .string "Here, come with me!$" + +gUnknown_817D7C8:: @ 817D7C8 + .string "I'm raising POKéMON, too.\p" + .string "When they get strong, they can\n" + .string "protect me.$" + +gUnknown_817D80D:: @ 817D80D + .string "Technology is incredible!\p" + .string "You can now store and recall items\n" + .string "and POKéMON as data via PC.$" + +gUnknown_817D866:: @ 817D866 + .string "OAK POKéMON RESEARCH LAB$" + +gUnknown_817D87F:: @ 817D87F + .string "{PLAYER}'s house$" + +gUnknown_817D88A:: @ 817D88A + .string "{RIVAL}'s house$" + +gUnknown_817D895:: @ 817D895 + .string "PALLET TOWN\n" + .string "Shades of your journey await!$" + +gUnknown_817D8BF:: @ 817D8BF + .string "OAK: Ah, {PLAYER}!\n" + .string "You're back, are you?\p" + .string "How much have you filled in your\n" + .string "POKéDEX?\p" + .string "May I see it?\p" + .string "Let's see…$" + +gUnknown_817D925:: @ 817D925 + .string "You've caught {STR_VAR_2}…\p" + .string "Hm, it looks as if you're putting\n" + .string "in an honest effort.\p" + .string "When you manage to fill it some\n" + .string "more, come show me, please.$" + +gUnknown_817D9AA:: @ 817D9AA + .string "You've caught… {STR_VAR_2}!?\n" + .string "Now, this is impressive!\p" + .string "There's something I wanted to ask\n" + .string "of you, {PLAYER}.\p" + .string "Come.\n" + .string "Follow me.$" + +gUnknown_817DA16:: @ 817DA16 + .string "OAK: Ah, {PLAYER}!\n" + .string "You seem to be enjoying traveling.\p" + .string "Knowing you, {PLAYER}, I can easily\n" + .string "imagine you going out to even more\l" + .string "exotic locales.\p" + .string "Good for you, good for you.\n" + .string "Hohoho.$" + diff --git a/data/maps/PalletTown_GarysHouse/text.inc b/data/maps/PalletTown_GarysHouse/text.inc new file mode 100644 index 000000000..92d05fbef --- /dev/null +++ b/data/maps/PalletTown_GarysHouse/text.inc @@ -0,0 +1,121 @@ +gUnknown_818D58C:: @ 818D58C + .string "DAISY: Hi, {PLAYER}!\p" + .string "My brother, {RIVAL}, is out at\n" + .string "Grandpa's LAB.$" + +gUnknown_818D5C4:: @ 818D5C4 + .string "DAISY: {PLAYER}, I heard you had\n" + .string "a battle against {RIVAL}.\p" + .string "I wish I'd seen that!$" + +gUnknown_818D60A:: @ 818D60A + .string "Grandpa asked you to run an\n" + .string "errand?\p" + .string "Gee, that's lazy of him.\n" + .string "Here, this will help you.$" + +gUnknown_818D661:: @ 818D661 + .string "{PLAYER} received a TOWN MAP\n" + .string "from DAISY.$" + +gUnknown_818D684:: @ 818D684 + .string "You don't have space for this in\n" + .string "your BAG.$" + +gUnknown_818D6AF:: @ 818D6AF + .string "You can use the TOWN MAP to find\n" + .string "out where you are, or check the\l" + .string "names of places.$" + +gUnknown_818D701:: @ 818D701 + .string "DAISY: Just like people, POKéMON\n" + .string "are living things.\p" + .string "When they get tired, please give\n" + .string "them a rest.$" + +gUnknown_818D763:: @ 818D763 + .string "It's a big map of the KANTO region.\n" + .string "Now this would be useful!$" + +gUnknown_818D7A1:: @ 818D7A1 + .string "The shelves are crammed full of\n" + .string "books on POKéMON.$" + +gUnknown_818D7D3:: @ 818D7D3 + .string "DAISY: Hi, {PLAYER}!\n" + .string "Good timing.\p" + .string "I'm about to have some tea.\n" + .string "Would you like to join me?\p" + .string "Oh, but look.\n" + .string "Your POKéMON are a little dirty.\p" + .string "Would you like me to groom one?$" + +gUnknown_818D875:: @ 818D875 + .string "You don't need any grooming done?\n" + .string "Okay, we'll just have tea.$" + +gUnknown_818D8B2:: @ 818D8B2 + .string "Which one should I groom?$" + +gUnknown_818D8CC:: @ 818D8CC + .string "DAISY: Okay, I'll get it looking\n" + .string "nice in no time.$" + +gUnknown_818D8FE:: @ 818D8FE + .string "{SIZE}Á{STR_VAR_1} looks dreamily content…\p" + .string "{SIZE}ÈDAISY: There you go! All done.\n" + .string "See? Doesn't it look nice?\p" + .string "Giggle…\n" + .string "It's such a cute POKéMON.$" + +gUnknown_818D97B:: @ 818D97B + .string "Oh, sorry. I honestly can't\n" + .string "groom an EGG.$" + +gUnknown_818D9A5:: @ 818D9A5 + .string "DAISY: Your POKéMON grow to love\n" + .string "you if you raise them with love.\p" + .string "For example, {PLAYER}, may I see\n" + .string "your first POKéMON?$" + +gUnknown_818DA16:: @ 818DA16 + .string "It couldn't possibly love you\n" + .string "any more than it does now.\p" + .string "Your POKéMON is happy beyond\n" + .string "words.$" + +gUnknown_818DA73:: @ 818DA73 + .string "It looks very happy.\p" + .string "I wish {RIVAL} could see this and\n" + .string "learn something from it.$" + +gUnknown_818DABE:: @ 818DABE + .string "It's quite friendly with you.\n" + .string "Keep being good to it!$" + +gUnknown_818DAF3:: @ 818DAF3 + .string "It's warming up to you.\n" + .string "Trust must be growing between you.$" + +gUnknown_818DB2E:: @ 818DB2E + .string "It's not quite familiar with you\n" + .string "yet.\p" + .string "POKéMON are all quite wary when\n" + .string "you first get them.$" + +gUnknown_818DB88:: @ 818DB88 + .string "{PLAYER}, I don't like the way it\n" + .string "glares at you.\p" + .string "Could you try being a little nicer\n" + .string "to it?$" + +gUnknown_818DBDD:: @ 818DBDD + .string "…Um, it's not easy for me to say\n" + .string "this, but…\p" + .string "Is there some reason why your\n" + .string "POKéMON would hate you so much?$" + +gUnknown_818DC47:: @ 818DC47 + .string "“The lovely and sweet\n" + .string "CLEFAIRY”$" + diff --git a/data/maps/PalletTown_PlayersHouse_1F/text.inc b/data/maps/PalletTown_PlayersHouse_1F/text.inc new file mode 100644 index 000000000..faa31c9d1 --- /dev/null +++ b/data/maps/PalletTown_PlayersHouse_1F/text.inc @@ -0,0 +1,100 @@ +Text_18CF4D:: @ 818CF4D + .string "Training by oneself is certainly\n" + .string "not a bad thing.\p" + .string "But it's also not bad to aim for\n" + .string "the top with a partner.\p" + .string "Even BRUNO…\n" + .string "He trained with a fellow by the\l" + .string "name of BRAWLY before.$" + +Text_18CFFB:: @ 818CFFB + .string "Do you know anything about this\n" + .string "stone chamber?$" + +Text_18D02A:: @ 818D02A + .string "That was uncalled for.\n" + .string "You didn't have to be so rough.$" + +Text_18D061:: @ 818D061 + .string "The TANOBY RUINS date back at\n" + .string "least 1,500 years.\p" + .string "But it's a baffling mystery as to\n" + .string "why it was built in the first place.$" + +Text_18D0D9:: @ 818D0D9 + .string "A mystic POKéMON is said to sleep\n" + .string "inside here.$" + +Text_18D108:: @ 818D108 + .string "I'm not much good in battle.$" + +Text_18D125:: @ 818D125 + .string "I hear there are other ruins like\n" + .string "the one here.\p" + .string "Might they be the resting places\n" + .string "of other mystic POKéMON?$" + +Text_18D18F:: @ 818D18F + .string "CLIFFORD is teaching me how to\n" + .string "paint.$" + +Text_18D1B5:: @ 818D1B5 + .string "We might get in trouble for being\n" + .string "noisy here.$" + +Text_18D1E3:: @ 818D1E3 + .string "I said that I wanted to paint an\n" + .string "old building.\p" + .string "So CLIFFORD brought me here.$" + +Text_18D22F:: @ 818D22F + .string "Today, in addition to our lesson,\n" + .string "we came to see the chamber.$" + +Text_18D26D:: @ 818D26D + .string "My, how extraordinary.$" + +Text_18D284:: @ 818D284 + .string "Ah, so you are studying POKéMON\n" + .string "on your own…\p" + .string "Yes, you certainly are quite the\n" + .string "extraordinary person, indeed.$" + +gUnknown_818D2F0:: @ 818D2F0 + .string "MOM: …Right.\n" + .string "All boys leave home someday.\l" + .string "It said so on TV.\p" + .string "Oh, yes. PROF. OAK, next door, was\n" + .string "looking for you.$" + +gUnknown_818D360:: @ 818D360 + .string "MOM: …Right.\n" + .string "All girls dream of traveling.\l" + .string "It said so on TV.\p" + .string "Oh, yes. PROF. OAK, next door, was\n" + .string "looking for you.$" + +gUnknown_818D3D1:: @ 818D3D1 + .string "MOM: {PLAYER}!\n" + .string "You should take a quick rest.$" + +gUnknown_818D3F8:: @ 818D3F8 + .string "MOM: Oh, good! You and your\n" + .string "POKéMON are looking great.\l" + .string "Take care now!$" + +gUnknown_818D43E:: @ 818D43E + .string "There's a movie on TV.\n" + .string "Four boys are walking on railroad\l" + .string "tracks.\p" + .string "…I better go, too.$" + +gUnknown_818D492:: @ 818D492 + .string "There's a movie on TV.\n" + .string "A girl with her hair in pigtails is\l" + .string "walking up a brick road.\p" + .string "…I better go, too.$" + +gUnknown_818D4F9:: @ 818D4F9 + .string "Oops, wrong side…$" + diff --git a/data/maps/PalletTown_PlayersHouse_2F/text.inc b/data/maps/PalletTown_PlayersHouse_2F/text.inc new file mode 100644 index 000000000..e6c794231 --- /dev/null +++ b/data/maps/PalletTown_PlayersHouse_2F/text.inc @@ -0,0 +1,10 @@ +gUnknown_818D50B:: @ 818D50B + .string "{PLAYER} played with the NES.\p" + .string "…Okay!\n" + .string "It's time to go!$" + +gUnknown_818D53B:: @ 818D53B + .string "It's a posted notice…\p" + .string "If you're confused, ask for HELP!\n" + .string "Press the L or R Button!$" + diff --git a/data/maps/PalletTown_ProfessorOaksLab/text.inc b/data/maps/PalletTown_ProfessorOaksLab/text.inc new file mode 100644 index 000000000..3d0c7ba57 --- /dev/null +++ b/data/maps/PalletTown_ProfessorOaksLab/text.inc @@ -0,0 +1,356 @@ +gUnknown_818DC67:: @ 818DC67 + .string "{RIVAL}: What, it's only {PLAYER}?\n" + .string "Gramps isn't around.$" + +gUnknown_818DC94:: @ 818DC94 + .string "{RIVAL}: Gramps!\n" + .string "I'm fed up with waiting!$" + +gUnknown_818DCB9:: @ 818DCB9 + .string "{RIVAL}: Hey! Gramps! No fair!\n" + .string "What about me?$" + +gUnknown_818DCE2:: @ 818DCE2 + .string "{RIVAL}: Heh, I don't need to be\n" + .string "greedy like you. I'm mature!\p" + .string "Go ahead and choose, {PLAYER}!$" + +gUnknown_818DD34:: @ 818DD34 + .string "{RIVAL}: I'll take this one, then!$" + +Text_18DD52:: @ 818DD52 + .string "{RIVAL} received the {STR_VAR_1}\n" + .string "from PROF. OAK!$" + +gUnknown_818DD75:: @ 818DD75 + .string "{RIVAL}: My POKéMON looks a lot\n" + .string "tougher than yours.$" + +gUnknown_818DDA4:: @ 818DDA4 + .string "{RIVAL}: Wait, {PLAYER}!\n" + .string "Let's check out our POKéMON!\p" + .string "Come on, I'll take you on!$" + +Text_18DDEA:: @ 818DDEA + .string "WHAT?\n" + .string "Unbelievable!\l" + .string "I picked the wrong POKéMON!$" + +Text_18DE1A:: @ 818DE1A + .string "{RIVAL}: Yeah!\n" + .string "Am I great or what?$" + +gUnknown_818DE38:: @ 818DE38 + .string "{RIVAL}: Okay! I'll make my\n" + .string "POKéMON battle to toughen it up!\p" + .string "{PLAYER}! Gramps!\n" + .string "Smell you later!$" + +gUnknown_818DE8D:: @ 818DE8D + .string "{RIVAL}: Gramps!$" + +gUnknown_818DE99:: @ 818DE99 + .string "{RIVAL}: I almost forgot!\n" + .string "What did you call me for?$" + +gUnknown_818DEC8:: @ 818DEC8 + .string "{RIVAL}: All right, Gramps!\n" + .string "Leave it all to me!$" + +gUnknown_818DEF3:: @ 818DEF3 + .string "{PLAYER}, I hate to say it, but you\n" + .string "won't be necessary for this.\p" + .string "I know! I'll borrow a TOWN MAP\n" + .string "from my sis!\p" + .string "I'll tell her not to lend you one,\n" + .string "{PLAYER}! Hahaha!\p" + .string "Don't bother coming around to\n" + .string "my place after this!$" + +gUnknown_818DFBC:: @ 818DFBC + .string "OAK: {RIVAL}?\n" + .string "Let me think…\p" + .string "Oh, that's right, I told you to\n" + .string "come! Just wait!\p" + .string "Here, {PLAYER}.\p" + .string "There are three POKéMON here.\p" + .string "Haha!\p" + .string "The POKéMON are held inside\n" + .string "these POKé BALLS.\p" + .string "When I was young, I was a serious\n" + .string "POKéMON TRAINER.\p" + .string "But now, in my old age, I have\n" + .string "only these three left.\p" + .string "You can have one.\n" + .string "Go on, choose!$" + +gUnknown_818E0EA:: @ 818E0EA + .string "OAK: Be patient, {RIVAL}.\n" + .string "You can have one, too!$" + +gUnknown_818E116:: @ 818E116 + .string "OAK: Now, {PLAYER}.\p" + .string "Inside those three POKé BALLS are\n" + .string "POKéMON.\p" + .string "Which one will you choose for\n" + .string "yourself?$" + +gUnknown_818E177:: @ 818E177 + .string "OAK: Hey!\n" + .string "Don't go away yet!$" + +gUnknown_818E194:: @ 818E194 + .string "Ah! CHARMANDER is your choice.\n" + .string "You should raise it patiently.\p" + .string "So, {PLAYER}, you're claiming the\n" + .string "FIRE POKéMON CHARMANDER?$" + +gUnknown_818E207:: @ 818E207 + .string "Hm! SQUIRTLE is your choice.\n" + .string "It's one worth raising.\p" + .string "So, {PLAYER}, you've decided on the\n" + .string "WATER POKéMON SQUIRTLE?$" + +gUnknown_818E272:: @ 818E272 + .string "I see! BULBASAUR is your choice.\n" + .string "It's very easy to raise.\p" + .string "So, {PLAYER}, you want to go with\n" + .string "the GRASS POKéMON BULBASAUR?$" + +gUnknown_818E2E5:: @ 818E2E5 + .string "This POKéMON is really quite\n" + .string "energetic!$" + +Text_18E30D:: @ 818E30D + .string "{PLAYER} received the {STR_VAR_1}\n" + .string "from PROF. OAK!$" + +gUnknown_818E330:: @ 818E330 + .string "OAK: If a wild POKéMON appears,\n" + .string "your POKéMON can battle it.\p" + .string "With it at your side, you should be\n" + .string "able to reach the next town.$" + +gUnknown_818E3AD:: @ 818E3AD + .string "OAK: {PLAYER}, raise your young\n" + .string "POKéMON by making it battle.\p" + .string "It has to battle for it to grow.$" + +gUnknown_818E405:: @ 818E405 + .string "OAK: Oh, {PLAYER}!\n" + .string "How is my old POKéMON?\p" + .string "Well, it seems to be growing more\n" + .string "attached to you.\p" + .string "You must be talented as a POKéMON\n" + .string "TRAINER.\p" + .string "What's that?\n" + .string "You have something for me?$" + +Text_18E4AF:: @ 818E4AF + .string "{PLAYER} delivered OAK'S PARCEL.$" + +gUnknown_818E4CA:: @ 818E4CA + .string "Ah! \n" + .string "It's the custom POKé BALL!\p" + .string "I had it on order.\n" + .string "Thank you!$" + +gUnknown_818E508:: @ 818E508 + .string "OAK: Oh, right!\n" + .string "I have a request for you two.$" + +gUnknown_818E536:: @ 818E536 + .string "On the desk there is my invention,\n" + .string "the POKéDEX!\p" + .string "It automatically records data on\n" + .string "POKéMON you've seen or caught.\p" + .string "It's a high-tech encyclopedia!$" + +gUnknown_818E5C5:: @ 818E5C5 + .string "OAK: {PLAYER} and {RIVAL}.\n" + .string "Take these with you.$" + +Text_18E5EA:: @ 818E5EA + .string "{PLAYER} received the POKéDEX\n" + .string "from PROF. OAK.$" + +gUnknown_818E612:: @ 818E612 + .string "OAK: You can't get detailed data\n" + .string "on POKéMON by just seeing them.\p" + .string "You must catch them to obtain\n" + .string "complete data.\p" + .string "So, here are some tools for\n" + .string "catching wild POKéMON.$" + +gUnknown_818E6B3:: @ 818E6B3 + .string "{PLAYER} received five POKé BALLS.$" + +gUnknown_818E6D0:: @ 818E6D0 + .string "When a wild POKéMON appears,\n" + .string "it's fair game.\p" + .string "Just throw a POKé BALL at it and\n" + .string "try to catch it!\p" + .string "This won't always work, however.\p" + .string "A healthy POKéMON can escape.\n" + .string "You have to be lucky!$" + +gUnknown_818E784:: @ 818E784 + .string "To make a complete guide on all\n" + .string "the POKéMON in the world…\p" + .string "That was my dream!\p" + .string "But, I'm too old.\n" + .string "I can't get the job done.\p" + .string "So, I want you two to fulfill my\n" + .string "dream for me.\p" + .string "Get moving, you two.\p" + .string "This is a great undertaking in\n" + .string "POKéMON history!$" + +gUnknown_818E871:: @ 818E871 + .string "POKéMON around the world wait for\n" + .string "you, {PLAYER}!$" + +gUnknown_818E89C:: @ 818E89C + .string "Ah, {PLAYER}!\n" + .string "How is your POKéDEX shaping up?\p" + .string "{RIVAL} has already caught some\n" + .string "POKéMON and added to the data.\p" + .string "So, {PLAYER}, let's have a look at\n" + .string "your POKéDEX.\p" + .string "…What's the matter?\n" + .string "You've added no new data at all.\p" + .string "I'll give you these, so do try a\n" + .string "little harder.$" + +gUnknown_818E98E:: @ 818E98E + .string "OAK: Come see me sometime.\p" + .string "After all, I want to know how your\n" + .string "POKéDEX is coming along.$" + +gUnknown_818E9E5:: @ 818E9E5 + .string "It's like an encyclopedia, but the\n" + .string "pages are blank.$" + +gUnknown_818EA19:: @ 818EA19 + .string "Those are POKé BALLS.\n" + .string "They contain POKéMON!$" + +gUnknown_818EA45:: @ 818EA45 + .string "That's PROF. OAK's last POKéMON.$" + +gUnknown_818EA66:: @ 818EA66 + .string "Press START to open the MENU!$" + +gUnknown_818EA84:: @ 818EA84 + .string "The SAVE option is on the MENU.\n" + .string "Use it regularly.$" + +gUnknown_818EAB6:: @ 818EAB6 + .string "All POKéMON types have strong and\n" + .string "weak points against others.$" + +gUnknown_818EAF4:: @ 818EAF4 + .string "There's an e-mail message here.\p" + .string "…\p" + .string "Finally!\n" + .string "The ultimate TRAINERS of the\l" + .string "POKéMON LEAGUE are ready to\l" + .string "take on all comers!\p" + .string "Bring your best POKéMON and see\n" + .string "how you rate as a TRAINER!\p" + .string "POKéMON LEAGUE HQ\n" + .string "INDIGO PLATEAU\p" + .string "PROF. OAK, please visit us!\n" + .string "…$" + +gUnknown_818EBE6:: @ 818EBE6 + .string "I study POKéMON as PROF. OAK's\n" + .string "AIDE.$" + +gUnknown_818EC0B:: @ 818EC0B + .string "Hi, {PLAYER}. I bet you've become\n" + .string "good friends with your POKéMON.\p" + .string "By the way, did you know about\n" + .string "DAISY?\p" + .string "If you show DAISY your POKéMON,\n" + .string "she can tell how much it likes you.\p" + .string "Occasionally, she will even groom\n" + .string "a POKéMON for you.\p" + .string "This is a secret, so please don't\n" + .string "tell anyone.$" + +gUnknown_818ED15:: @ 818ED15 + .string "PROF. OAK is going to have his own\n" + .string "radio show soon.\p" + .string "The program will be called PROF.\n" + .string "OAK's POKéMON SEMINAR.$" + +gUnknown_818ED81:: @ 818ED81 + .string "PROF. OAK may not look like much,\n" + .string "but he's the authority on POKéMON.\p" + .string "Many POKéMON TRAINERS hold him in\n" + .string "high regard.$" + +gUnknown_818EDF5:: @ 818EDF5 + .string "Ah, now this is excellent!\p" + .string "{PLAYER}, I have another important\n" + .string "favor to ask of you.\p" + .string "I need you to listen closely.$" + +gUnknown_818EE60:: @ 818EE60 + .string "Recently, there have been sightings\n" + .string "of many rare POKéMON species.\p" + .string "I'm talking about POKéMON that\n" + .string "have never been seen in KANTO.\p" + .string "I would love to go see things for\n" + .string "myself, but I'm much too old.\p" + .string "Since I can't do it, {PLAYER}, I'd\n" + .string "like you to go in my place.$" + +gUnknown_818EF59:: @ 818EF59 + .string "{RIVAL}: Hey, I heard that!\p" + .string "Gramps, what's with favoring\n" + .string "{PLAYER} over me all the time?\p" + .string "I went and collected more POKéMON,\n" + .string "and faster, too.\p" + .string "You should just let me handle\n" + .string "everything.$" + +gUnknown_818F004:: @ 818F004 + .string "OAK: I know, I know.\n" + .string "Of course I need your help, too.\p" + .string "Now, I need to see both your\n" + .string "POKéDEXES.$" + +gUnknown_818F062:: @ 818F062 + .string "PROF. OAK took both POKéDEX\n" + .string "units.$" + +gUnknown_818F085:: @ 818F085 + .string "… … … … … …\p" + .string "… … … … … …\p" + .string "…And that's done!\p" + .string "Now these units can record data on\n" + .string "a lot more POKéMON.$" + +Text_18F0E8:: @ 818F0E8 + .string "{PLAYER}'s POKéDEX was upgraded!$" + +gUnknown_818F103:: @ 818F103 + .string "Now, {PLAYER} and {RIVAL}!\p" + .string "This time, you really must work\n" + .string "towards filling your POKéDEXES.\p" + .string "I urge you to make them the best\n" + .string "and the most complete of all time!\p" + .string "Truly, this is a monumentally great\n" + .string "undertaking in POKéMON history!$" + +gUnknown_818F1DB:: @ 818F1DB + .string "{RIVAL}: Gramps, calm down.\n" + .string "Don't get so excited.\p" + .string "I'll get the POKéDEX completed,\n" + .string "don't you worry about a thing.\p" + .string "I think I'll try looking around\n" + .string "ONE ISLAND first…\p" + .string "Anyways, I'm outta here!$" + diff --git a/data/maps/PewterCity/text.inc b/data/maps/PewterCity/text.inc new file mode 100644 index 000000000..de975f32d --- /dev/null +++ b/data/maps/PewterCity/text.inc @@ -0,0 +1,153 @@ +Text_17E316:: @ 817E316 + .string "Yawn!\n" + .string "I must have dozed off in the sun.\p" + .string "I had this weird dream about\n" + .string "a DROWZEE eating my dream.\p" + .string "And…\n" + .string "I learned how to eat dreams…\p" + .string "Oogh, this is too spooky!\p" + .string "Let me teach it to a POKéMON so\n" + .string "I can forget about it!$" + +Text_17E3E9:: @ 817E3E9 + .string "…Snore…$" + +Text_17E3F1:: @ 817E3F1 + .string "Which POKéMON wants to learn\n" + .string "DREAM EATER?$" + +Text_17E41B:: @ 817E41B + .string "…ZZZ…\n" + .string "I…can't eat…anymore…$" + +gUnknown_817E436:: @ 817E436 + .string "CLEFAIRY came from the moon.\n" + .string "That's what the rumor is.\p" + .string "They appeared after MOON STONES\n" + .string "fell on MT. MOON.$" + +gUnknown_817E49F:: @ 817E49F + .string "There aren't many serious POKéMON\n" + .string "TRAINERS here.\p" + .string "They're all like BUG CATCHERS,\n" + .string "you know, just hobbyists.\p" + .string "But PEWTER GYM's BROCK isn't like\n" + .string "that, not one bit.$" + +gUnknown_817E53E:: @ 817E53E + .string "Did you check out the MUSEUM?$" + +gUnknown_817E55C:: @ 817E55C + .string "Weren't those fossils from MT. MOON\n" + .string "amazing?$" + +gUnknown_817E589:: @ 817E589 + .string "Really?\n" + .string "You absolutely have to go!$" + +gUnknown_817E5AC:: @ 817E5AC + .string "This is it, the MUSEUM.\p" + .string "You have to pay to get in, but it's\n" + .string "worth it. See you around!$" + +gUnknown_817E602:: @ 817E602 + .string "Psssst!\n" + .string "Do you know what I'm doing?$" + +gUnknown_817E626:: @ 817E626 + .string "That's right!\n" + .string "It's hard work!$" + +gUnknown_817E644:: @ 817E644 + .string "I'm spraying REPEL to keep wild\n" + .string "POKéMON out of my garden!$" + +gUnknown_817E67E:: @ 817E67E + .string "You're a TRAINER, right?\p" + .string "BROCK's looking for new\n" + .string "challengers. Follow me!$" + +gUnknown_817E6C7:: @ 817E6C7 + .string "If you have the right stuff,\n" + .string "go take on BROCK!$" + +gUnknown_817E6F6:: @ 817E6F6 + .string "TRAINER TIPS\p" + .string "All POKéMON that appear in battle,\n" + .string "however briefly, earn EXP Points.$" + +gUnknown_817E748:: @ 817E748 + .string "NOTICE!\p" + .string "Thieves have been stealing POKéMON\n" + .string "fossils from MT. MOON.\p" + .string "Please call the PEWTER POLICE if\n" + .string "you have any information.$" + +gUnknown_817E7C5:: @ 817E7C5 + .string "PEWTER MUSEUM OF SCIENCE$" + +gUnknown_817E7DE:: @ 817E7DE + .string "PEWTER CITY POKéMON GYM\n" + .string "LEADER: BROCK\l" + .string "The Rock-Solid POKéMON TRAINER!$" + +gUnknown_817E824:: @ 817E824 + .string "PEWTER CITY\n" + .string "A Stone Gray City$" + +Text_17E842:: @ 817E842 + .string "あッれー！\n" + .string "その　ジムバッジ‥‥\l" + .string "すげえな　タケシに　かったのかよ！\p" + .string "かんどう　したから\n" + .string "おれの　たからもの　やるよ！$" + +Text_17E87E:: @ 817E87E + .string "なかには　きのみが　はいってるぜ\p" + .string "やくに　たつ　きのみも\n" + .string "はいって　いるから\l" + .string "だいじに　つかって　くれよ！$" + +Text_17E8B4:: @ 817E8B4 + .string "ポケモンに　きのみを\n" + .string "もたせて　おけば\l" + .string "たたかっている　ときに\l" + .string "かってに　つかって　くれるんだ\p" + .string "キズぐすり　とか　どくけし　より\n" + .string "てがるで　べんり　だろ？$" + +gUnknown_817E902:: @ 817E902 + .string "Oh, {PLAYER}{KUN}!$" + +gUnknown_817E90C:: @ 817E90C + .string "I'm glad I caught up to you.\n" + .string "I'm PROF. OAK's AIDE.\p" + .string "I've been asked to deliver this,\n" + .string "so here you go.$" + +Text_17E970:: @ 817E970 + .string "{PLAYER} received the\n" + .string "RUNNING SHOES from the AIDE.$" + +gUnknown_817E99D:: @ 817E99D + .string "{PLAYER} switched shoes with the\n" + .string "RUNNING SHOES.$" + +gUnknown_817E9C7:: @ 817E9C7 + .string "Press the B Button to run.\n" + .string "But only where there's room to run!$" + +gUnknown_817EA06:: @ 817EA06 + .string "Well, I must be going back to\n" + .string "the LAB.\p" + .string "Bye-bye!$" + +gUnknown_817EA36:: @ 817EA36 + .string "There's a letter attached…\p" + .string "Dear {PLAYER},\p" + .string "Here is a pair of RUNNING SHOES\n" + .string "for my beloved challenger.\p" + .string "Remember, I'll always cheer for\n" + .string "you! Don't ever give up!\p" + .string "From Mom$" + diff --git a/data/maps/PewterCity_Gym/text.inc b/data/maps/PewterCity_Gym/text.inc new file mode 100644 index 000000000..31e5c61f0 --- /dev/null +++ b/data/maps/PewterCity_Gym/text.inc @@ -0,0 +1,119 @@ +Text_190CD4:: @ 8190CD4 + .string "So, you're here. I'm BROCK.\n" + .string "I'm PEWTER's GYM LEADER.\p" + .string "My rock-hard willpower is evident\n" + .string "even in my POKéMON.\p" + .string "My POKéMON are all rock hard, and\n" + .string "have true-grit determination.\p" + .string "That's right - my POKéMON are all\n" + .string "the ROCK type!\p" + .string "Fuhaha! You're going to challenge\n" + .string "me knowing that you'll lose?\p" + .string "That's the TRAINER's honor that\n" + .string "compels you to challenge me.\p" + .string "Fine, then!\n" + .string "Show me your best!{PLAY_BGM}{BGM_FRLG_LEADER_EYE}$" + +Text_190E4F:: @ 8190E4F + .string "I took you for granted, and so\n" + .string "I lost.\p" + .string "As proof of your victory, I confer\n" + .string "on you this…the official POKéMON\l" + .string "LEAGUE BOULDERBADGE.\p" + .string "{SIZE}Á{PLAYER} received the BOULDERBADGE\n" + .string "from BROCK!{PAUSE_MUSIC}{PLAY_BGM}{MUS_ME_BACHI}{PAUSE 0xFE}{PAUSE 0x56}{RESUME_MUSIC}\p" + .string "{SIZE}ÇJust having the BOULDERBADGE makes\n" + .string "your POKéMON more powerful.\p" + .string "It also enables the use of the\n" + .string "move FLASH outside of battle.\p" + .string "Of course, a POKéMON must know the\n" + .string "move FLASH to use it.$" + +gUnknown_8190FC1:: @ 8190FC1 + .string "Wait!\n" + .string "Take this with you.$" + +gUnknown_8190FDB:: @ 8190FDB + .string "{PLAYER} received TM39\n" + .string "from BROCK.$" + +gUnknown_8190FF8:: @ 8190FF8 + .string "A TM, Technical Machine, contains a\n" + .string "technique for POKéMON.\p" + .string "Using a TM teaches the move it\n" + .string "contains to a POKéMON.\p" + .string "A TM is good for only one use.\p" + .string "So, when you use one, pick the\n" + .string "POKéMON carefully.\p" + .string "Anyways…\n" + .string "TM39 contains ROCK TOMB.\p" + .string "It hurls boulders at the foe and\n" + .string "lowers its SPEED.$" + +gUnknown_819110F:: @ 819110F + .string "There are all kinds of TRAINERS in\n" + .string "this huge world of ours.\p" + .string "You appear to be very gifted as a\n" + .string "POKéMON TRAINER.\p" + .string "So let me make a suggestion.\p" + .string "Go to the GYM in CERULEAN and test\n" + .string "your abilities.$" + +gUnknown_81911CE:: @ 81911CE + .string "You don't have room for this.$" + +Text_1911EC:: @ 81911EC + .string "Stop right there, kid!\p" + .string "You're ten thousand light-years \n" + .string "from facing BROCK!$" + +Text_191237:: @ 8191237 + .string "Darn!\p" + .string "Light-years isn't time…\n" + .string "It measures distance!$" + +gUnknown_819126B:: @ 819126B + .string "You're pretty hot.\n" + .string "…But not as hot as BROCK!$" + +gUnknown_8191298:: @ 8191298 + .string "Hiya!\n" + .string "Do you want to dream big?\p" + .string "Do you dare to dream of becoming\n" + .string "the POKéMON champ?\p" + .string "I'm no TRAINER, but I can advise\n" + .string "you on how to win.\p" + .string "Let me take you to the top!$" + +gUnknown_819133C:: @ 819133C + .string "All right!\n" + .string "Let's get happening!$" + +gUnknown_819135C:: @ 819135C + .string "The first POKéMON out in a match is\n" + .string "at the left of the POKéMON LIST.\p" + .string "By changing the order of POKéMON,\n" + .string "you may gain an advantage.\p" + .string "Try different orders to suit your\n" + .string "opponent's party.$" + +gUnknown_8191412:: @ 8191412 + .string "It's a free service!\n" + .string "Let's get happening!$" + +gUnknown_819143C:: @ 819143C + .string "Just as I thought!\n" + .string "You're POKéMON champ material!$" + +gUnknown_819146E:: @ 819146E + .string "PEWTER POKéMON GYM\n" + .string "LEADER: BROCK\p" + .string "WINNING TRAINERS:\n" + .string "{RIVAL}$" + +gUnknown_81914A4:: @ 81914A4 + .string "PEWTER POKéMON GYM\n" + .string "LEADER: BROCK\p" + .string "WINNING TRAINERS:\n" + .string "{RIVAL}, {PLAYER}$" + diff --git a/data/maps/PewterCity_House1/text.inc b/data/maps/PewterCity_House1/text.inc new file mode 100644 index 000000000..b0a691229 --- /dev/null +++ b/data/maps/PewterCity_House1/text.inc @@ -0,0 +1,15 @@ +gUnknown_81915BB:: @ 81915BB + .string "NIDORAN♂: Bowbow!$" + +gUnknown_81915CD:: @ 81915CD + .string "NIDORAN, sit!$" + +gUnknown_81915DB:: @ 81915DB + .string "Our POKéMON's an outsider, so it's\n" + .string "finicky and hard to handle.\p" + .string "An outsider is a POKéMON that you\n" + .string "get in a trade.\p" + .string "It grows fast, but it may ignore an\n" + .string "unskilled TRAINER in battle.\p" + .string "If only we had some BADGES…$" + diff --git a/data/maps/PewterCity_House2/text.inc b/data/maps/PewterCity_House2/text.inc new file mode 100644 index 000000000..6dc70b2ba --- /dev/null +++ b/data/maps/PewterCity_House2/text.inc @@ -0,0 +1,14 @@ +gUnknown_81917E4:: @ 81917E4 + .string "POKéMON learn new techniques as\n" + .string "they grow.\p" + .string "But some moves must be taught to\n" + .string "them by people.$" + +gUnknown_8191840:: @ 8191840 + .string "A POKéMON becomes easier to \n" + .string "catch if it has a status problem.\p" + .string "Sleep, poison, burn, or paralysis…\n" + .string "Those are all effective.\p" + .string "But catching POKéMON is never\n" + .string "a sure thing!$" + diff --git a/data/maps/PewterCity_Mart/text.inc b/data/maps/PewterCity_Mart/text.inc new file mode 100644 index 000000000..24dcbdbb2 --- /dev/null +++ b/data/maps/PewterCity_Mart/text.inc @@ -0,0 +1,11 @@ +gUnknown_81914DE:: @ 81914DE + .string "A shady old guy sucked me into\n" + .string "buying this weird fish POKéMON!\p" + .string "It's totally weak and it cost ¥500!$" + +gUnknown_8191541:: @ 8191541 + .string "Good things can happen if you raise\n" + .string "POKéMON diligently.\p" + .string "Even the weak ones can surprise\n" + .string "you if you don't give up on them.$" + diff --git a/data/maps/PewterCity_Museum_1F/text.inc b/data/maps/PewterCity_Museum_1F/text.inc new file mode 100644 index 000000000..0c784c4d2 --- /dev/null +++ b/data/maps/PewterCity_Museum_1F/text.inc @@ -0,0 +1,86 @@ +gUnknown_81904B5:: @ 81904B5 + .string "Yes, yes.\n" + .string "It's ¥50 for a child's ticket.\p" + .string "Would you like to come in?$" + +gUnknown_81904F9:: @ 81904F9 + .string "Come again!$" + +gUnknown_8190505:: @ 8190505 + .string "Right, ¥50!\n" + .string "Thank you!$" + +gUnknown_819051C:: @ 819051C + .string "You don't have enough money.$" + +gUnknown_8190539:: @ 8190539 + .string "Please enjoy yourself.$" + +gUnknown_8190550:: @ 8190550 + .string "You can't sneak in the back way!\n" + .string "Nice try, kid, but no.\p" + .string "Oh, whatever!\n" + .string "Do you know what AMBER is?$" + +gUnknown_81905B1:: @ 81905B1 + .string "AMBER contains the genetic matter\n" + .string "of ancient POKéMON.\p" + .string "There's a LAB somewhere trying to\n" + .string "resurrect POKéMON from AMBER.$" + +gUnknown_8190627:: @ 8190627 + .string "AMBER is actually sap, that gooey\n" + .string "stuff that oozes from trees.\p" + .string "The ancient sap fossilized over\n" + .string "time to become rock-hard AMBER.$" + +Text_1906A6:: @ 81906A6 + .string "あちらへ　おまわりください$" + +gUnknown_81906B4:: @ 81906B4 + .string "I should be grateful for my long\n" + .string "life.\p" + .string "Never did I think I would get to\n" + .string "see the bones of a dragon!$" + +gUnknown_8190717:: @ 8190717 + .string "Ssh! Listen, I need to share a\n" + .string "secret with someone.\p" + .string "I think that this chunk of AMBER\n" + .string "contains POKéMON DNA!\p" + .string "It would be a shattering scientific\n" + .string "breakthrough if POKéMON could be\l" + .string "resurrected from it.\p" + .string "But, my colleagues just ignore\n" + .string "what I have to say.\p" + .string "So, I have a favor to ask!\p" + .string "I want you to get this examined at\n" + .string "a POKéMON LAB somewhere.$" + +gUnknown_8190866:: @ 8190866 + .string "{PLAYER} received the OLD AMBER\n" + .string "from the man.$" + +gUnknown_819088E:: @ 819088E + .string "Ssh!\n" + .string "Get the OLD AMBER checked!$" + +gUnknown_81908AE:: @ 81908AE + .string "You don't have space for this.$" + +gUnknown_81908CD:: @ 81908CD + .string "We have two fossils of rare,\n" + .string "prehistoric POKéMON on exhibit.$" + +gUnknown_819090A:: @ 819090A + .string "There is a beautiful piece of\n" + .string "AMBER in a clear gold color.$" + +gUnknown_8190945:: @ 8190945 + .string "AERODACTYL Fossil\n" + .string "A primitive and rare POKéMON.$" + +gUnknown_8190975:: @ 8190975 + .string "KABUTOPS Fossil\n" + .string "A primitive and rare POKéMON.$" + diff --git a/data/maps/PewterCity_Museum_2F/text.inc b/data/maps/PewterCity_Museum_2F/text.inc new file mode 100644 index 000000000..b1767c681 --- /dev/null +++ b/data/maps/PewterCity_Museum_2F/text.inc @@ -0,0 +1,54 @@ +Text_1909A3:: @ 81909A3 + .string "The secrets of space…\n" + .string "The mysteries of earth…\p" + .string "There are so many things about\n" + .string "which we know so little.\p" + .string "But that should spur us to study\n" + .string "harder, not toss in the towel.\p" + .string "The only thing you should toss…\p" + .string "Well, how about SEISMIC TOSS?\n" + .string "Should I teach that to a POKéMON?$" + +Text_190AA9:: @ 8190AA9 + .string "Is that so?\n" + .string "I'm sure you'll be back for it.$" + +Text_190AD5:: @ 8190AD5 + .string "Which POKéMON wants to learn\n" + .string "SEISMIC TOSS?$" + +Text_190B00:: @ 8190B00 + .string "I hope you won't toss in the towel.\n" + .string "Keep it up.$" + +gUnknown_8190B30:: @ 8190B30 + .string "MOON STONE, huh?\p" + .string "What's so special about it?\n" + .string "Looks like an ordinary rock to me.$" + +gUnknown_8190B80:: @ 8190B80 + .string "July 20, 1969!\p" + .string "Humankind first set foot on the\n" + .string "moon that day.\p" + .string "I bought a color TV just so I\n" + .string "could watch that news.$" + +gUnknown_8190BF3:: @ 8190BF3 + .string "This month, we're running a space\n" + .string "exhibit.$" + +gUnknown_8190C1E:: @ 8190C1E + .string "I want a PIKACHU!\n" + .string "It's so cute!\p" + .string "I asked my daddy to catch me one!$" + +gUnknown_8190C60:: @ 8190C60 + .string "Yeah, a PIKACHU soon, I promise!$" + +gUnknown_8190C81:: @ 8190C81 + .string "Space Shuttle$" + +gUnknown_8190C8F:: @ 8190C8F + .string "A meteorite that fell on MT. MOON.\n" + .string "It is thought to be a MOON STONE.$" + diff --git a/data/maps/PewterCity_PokemonCenter_1F/text.inc b/data/maps/PewterCity_PokemonCenter_1F/text.inc new file mode 100644 index 000000000..f297bfa51 --- /dev/null +++ b/data/maps/PewterCity_PokemonCenter_1F/text.inc @@ -0,0 +1,27 @@ +gUnknown_81916A9:: @ 81916A9 + .string "What!?\p" + .string "TEAM ROCKET is at MT. MOON?\n" + .string "Huh?\p" + .string "I'm on the phone!\n" + .string "Scram!$" + +Text_1916EA:: @ 81916EA + .string "JIGGLYPUFF: Puu pupuu!$" + +gUnknown_8191701:: @ 8191701 + .string "Yawn!\p" + .string "When JIGGLYPUFF sings, POKéMON get\n" + .string "drowsy…\p" + .string "…Me, too…\n" + .string "Snore…$" + +gUnknown_8191743:: @ 8191743 + .string "I really want a PIKACHU, so I'm\n" + .string "trading my CLEFAIRY for one.$" + +gUnknown_8191780:: @ 8191780 + .string "I'm trading POKéMON with that kid\n" + .string "there.\p" + .string "I had two PIKACHU, so I figured\n" + .string "I might as well trade one.$" + diff --git a/data/maps/PokemonLeague_AgathasRoom/text.inc b/data/maps/PokemonLeague_AgathasRoom/text.inc new file mode 100644 index 000000000..24c44d812 --- /dev/null +++ b/data/maps/PokemonLeague_AgathasRoom/text.inc @@ -0,0 +1,41 @@ +gUnknown_817844D:: @ 817844D + .string "I am AGATHA of the ELITE FOUR.\p" + .string "I hear OAK's taken a lot of\n" + .string "interest in you, child.\p" + .string "That old duff was once tough and\n" + .string "handsome.\p" + .string "But that was decades ago.\n" + .string "He's a shadow of his former self.\p" + .string "Now he just wants to fiddle with\n" + .string "his POKéDEX.\p" + .string "He's wrong.\n" + .string "POKéMON are for battling!\p" + .string "{PLAYER}! I'll show you how a real\n" + .string "TRAINER battles!{PLAY_BGM}{BGM_FRLG_LEADER_EYE}$" + +gUnknown_817858D:: @ 817858D + .string "I am AGATHA of the ELITE FOUR.\p" + .string "You're the child that OAK's taken\n" + .string "under his wing, aren't you?\p" + .string "That old duff was once tough and\n" + .string "handsome.\p" + .string "But that was decades ago.\n" + .string "He's a shadow of his former self.\p" + .string "Now he just wants to fiddle with\n" + .string "his POKéDEX.\p" + .string "He's wrong.\n" + .string "POKéMON are for battling!\p" + .string "{PLAYER}! I'll show you how a real\n" + .string "TRAINER battles!{PLAY_BGM}{BGM_FRLG_LEADER_EYE}$" + +Text_1786D7:: @ 81786D7 + .string "Oh, my!\n" + .string "You're something special, child!$" + +gUnknown_8178700:: @ 8178700 + .string "You win!\p" + .string "I see what the old duff sees in\n" + .string "you now.\p" + .string "I have nothing else to say.\n" + .string "Run along now, child!$" + diff --git a/data/maps/PokemonLeague_BrunosRoom/text.inc b/data/maps/PokemonLeague_BrunosRoom/text.inc new file mode 100644 index 000000000..516da0437 --- /dev/null +++ b/data/maps/PokemonLeague_BrunosRoom/text.inc @@ -0,0 +1,34 @@ +gUnknown_817820F:: @ 817820F + .string "I am BRUNO of the ELITE FOUR!\p" + .string "Through rigorous training, people\n" + .string "and POKéMON can become stronger\l" + .string "without limit.\p" + .string "I've lived and trained with my\n" + .string "fighting POKéMON!\l" + .string "And that will never change!\p" + .string "{PLAYER}!\p" + .string "We will grind you down with our\n" + .string "superior power!\p" + .string "Hoo hah!{PLAY_BGM}{BGM_FRLG_LEADER_EYE}$" + +gUnknown_817830C:: @ 817830C + .string "I am BRUNO of the ELITE FOUR!\p" + .string "Through rigorous training, people\n" + .string "and POKéMON can become stronger\l" + .string "without limit.\p" + .string "I've lived and trained with my\n" + .string "fighting POKéMON!\l" + .string "And that will never change!\p" + .string "{PLAYER}!\p" + .string "We will grind you down with our\n" + .string "superior power!\p" + .string "Hoo hah!{PLAY_BGM}{BGM_FRLG_LEADER_EYE}$" + +Text_178409:: @ 8178409 + .string "Why?\n" + .string "How could I lose?$" + +gUnknown_8178420:: @ 8178420 + .string "My job is done.\n" + .string "Go face your next challenge.$" + diff --git a/data/maps/PokemonLeague_ChampionsRoom/text.inc b/data/maps/PokemonLeague_ChampionsRoom/text.inc new file mode 100644 index 000000000..a99db09db --- /dev/null +++ b/data/maps/PokemonLeague_ChampionsRoom/text.inc @@ -0,0 +1,101 @@ +gUnknown_8178B6C:: @ 8178B6C + .string "{RIVAL}: Hey, {PLAYER}!\p" + .string "I was looking forward to seeing\n" + .string "you, {PLAYER}.\p" + .string "My rival should be strong to keep\n" + .string "me sharp.\p" + .string "While working on my POKéDEX, I\n" + .string "looked all over for POKéMON.\p" + .string "Not only that, I assembled teams\n" + .string "that would beat any POKéMON type.\p" + .string "And now…\p" + .string "I'm the POKéMON LEAGUE CHAMPION!\p" + .string "{PLAYER}!\n" + .string "Do you know what that means?\p" + .string "I'll tell you.\p" + .string "I am the most powerful TRAINER in\n" + .string "the world!$" + +gUnknown_8178CD4:: @ 8178CD4 + .string "{RIVAL}: Hey, {PLAYER}!\p" + .string "You came back, {PLAYER}!\n" + .string "Hahah, that is so great!\p" + .string "My rival should be strong to keep\n" + .string "me sharp.\p" + .string "While working on my POKéDEX, I\n" + .string "looked all over for POKéMON.\p" + .string "Not only that, I assembled teams\n" + .string "that would beat any POKéMON type.\p" + .string "And now…\p" + .string "I'm the POKéMON LEAGUE CHAMPION!\p" + .string "{PLAYER}!\n" + .string "Do you know what that means?\p" + .string "I'll tell you.\p" + .string "I am the most powerful TRAINER in\n" + .string "the world!$" + +Text_178E3F:: @ 8178E3F + .string "NO!\n" + .string "That can't be!\l" + .string "You beat me at my best!\p" + .string "After all that work to become\n" + .string "the LEAGUE CHAMP?\p" + .string "My reign is over already?\n" + .string "It's not fair!$" + +Text_178EC3:: @ 8178EC3 + .string "はーはッ！\n" + .string "かった！　かった！　かった！\p" + .string "{PLAYER}に　まける　ような\n" + .string "おれさま　では　なーい！\p" + .string "ま！　ポケモンの\n" + .string "てんさい　{RIVAL}さま　あいてに\l" + .string "ここまで　よく　がんばった！\p" + .string "ほめて　つかわす！\n" + .string "はーッ！　はーはッはッ！$" + +gUnknown_8178F2F:: @ 8178F2F + .string "Why?\n" + .string "Why did I lose?\p" + .string "I never made any mistakes raising\n" + .string "my POKéMON…\p" + .string "Darn it! You're the new POKéMON\n" + .string "LEAGUE CHAMPION!\p" + .string "Although I don't like to admit it…$" + +gUnknown_8178FC6:: @ 8178FC6 + .string "OAK: {PLAYER}!$" + +gUnknown_8178FCF:: @ 8178FCF + .string "OAK: So, you've won!\n" + .string "Sincerely, congratulations!\p" + .string "You're the new POKéMON LEAGUE\n" + .string "CHAMPION!\p" + .string "You've grown up so much since you\n" + .string "first left with {STR_VAR_1} to work\l" + .string "on the POKéDEX.\p" + .string "{PLAYER}, you have come of age!$" + +gUnknown_817908F:: @ 817908F + .string "OAK: {RIVAL}…\n" + .string "I'm disappointed in you.\p" + .string "I came when I heard you'd beaten\n" + .string "the ELITE FOUR.\p" + .string "But, when I got here, you had\n" + .string "already lost!\p" + .string "{RIVAL}, do you understand why\n" + .string "you lost?\p" + .string "You have forgotten to treat your\n" + .string "POKéMON with love and trust.\p" + .string "Without them, you will never\n" + .string "become a CHAMP again!$" + +gUnknown_81791A3:: @ 81791A3 + .string "OAK: {PLAYER}.\p" + .string "You understand that your victory\n" + .string "was not just your own doing.\p" + .string "The bond you share with your\n" + .string "POKéMON is marvelous.\p" + .string "{PLAYER}!\n" + .string "Come with me!$" + diff --git a/data/maps/PokemonLeague_HallOfFame/text.inc b/data/maps/PokemonLeague_HallOfFame/text.inc new file mode 100644 index 000000000..111f655cc --- /dev/null +++ b/data/maps/PokemonLeague_HallOfFame/text.inc @@ -0,0 +1,15 @@ +gUnknown_817922F:: @ 817922F + .string "OAK: Er-hem!\n" + .string "Congratulations, {PLAYER}!\p" + .string "This floor is the POKéMON HALL OF\n" + .string "FAME.\p" + .string "POKéMON LEAGUE CHAMPIONS are\n" + .string "honored for their exploits here.\p" + .string "Their POKéMON are also recorded in\n" + .string "the HALL OF FAME.\p" + .string "{PLAYER}!\p" + .string "You have worked hard to become\n" + .string "the new LEAGUE CHAMPION.\p" + .string "Congratulations, {PLAYER}, you and\n" + .string "your POKéMON are HALL OF FAMERS!$" + diff --git a/data/maps/PokemonLeague_LancesRoom/text.inc b/data/maps/PokemonLeague_LancesRoom/text.inc new file mode 100644 index 000000000..ea0b7df7e --- /dev/null +++ b/data/maps/PokemonLeague_LancesRoom/text.inc @@ -0,0 +1,52 @@ +gUnknown_8178764:: @ 8178764 + .string "Ah! I've heard about you,\n" + .string "{PLAYER}!\p" + .string "I lead the ELITE FOUR.\p" + .string "You can call me LANCE the dragon\n" + .string "TRAINER.\p" + .string "You know that dragons are\n" + .string "mythical POKéMON.\p" + .string "They're hard to catch and raise,\n" + .string "but their powers are superior.\p" + .string "They're virtually indestructible.\n" + .string "There's no being clever with them.\p" + .string "Well, are you ready to lose?\p" + .string "Your LEAGUE challenge ends with\n" + .string "me, {PLAYER}!{PLAY_BGM}{BGM_FRLG_LEADER_EYE}$" + +gUnknown_81788BD:: @ 81788BD + .string "Ah!\n" + .string "So, you've returned, {PLAYER}!\p" + .string "I lead the ELITE FOUR.\p" + .string "You can call me LANCE the dragon\n" + .string "TRAINER.\p" + .string "You know that dragons are\n" + .string "mythical POKéMON.\p" + .string "They're hard to catch and raise,\n" + .string "but their powers are superior.\p" + .string "They're virtually indestructible.\n" + .string "There's no being clever with them.\p" + .string "Well, are you ready to lose?\p" + .string "Your LEAGUE challenge ends with\n" + .string "me, {PLAYER}!{PLAY_BGM}{BGM_FRLG_LEADER_EYE}$" + +Text_178A15:: @ 8178A15 + .string "That's it!\p" + .string "I hate to admit it, but you are a\n" + .string "POKéMON master!$" + +gUnknown_8178A52:: @ 8178A52 + .string "I still can't believe my dragons\n" + .string "lost to you, {PLAYER}.\p" + .string "You are now the POKéMON LEAGUE\n" + .string "CHAMPION!\p" + .string "…Or, you would have been, but\n" + .string "you have one more challenge left.\p" + .string "There is one more TRAINER to face!\n" + .string "His name is…\p" + .string "{RIVAL}!\p" + .string "He beat the ELITE FOUR before\n" + .string "you.\p" + .string "He is the real POKéMON LEAGUE\n" + .string "CHAMPION.$" + diff --git a/data/maps/PokemonLeague_LoreleisRoom/text.inc b/data/maps/PokemonLeague_LoreleisRoom/text.inc new file mode 100644 index 000000000..56beafa3d --- /dev/null +++ b/data/maps/PokemonLeague_LoreleisRoom/text.inc @@ -0,0 +1,33 @@ +gUnknown_8177FA4:: @ 8177FA4 + .string "Welcome to the POKéMON LEAGUE.\p" + .string "I am LORELEI of the ELITE FOUR.\p" + .string "No one can best me when it comes\n" + .string "to icy POKéMON.\p" + .string "Freezing moves are powerful.\p" + .string "Your POKéMON will be at my mercy\n" + .string "when they are frozen solid.\p" + .string "Hahaha!\n" + .string "Are you ready?{PLAY_BGM}{BGM_FRLG_LEADER_EYE}$" + +gUnknown_8178089:: @ 8178089 + .string "Welcome to the POKéMON LEAGUE.\p" + .string "I, LORELEI of the ELITE FOUR,\n" + .string "have returned!\p" + .string "You know how it goes.\n" + .string "No one can best me when it comes\l" + .string "to icy POKéMON.\p" + .string "Freezing moves are powerful.\p" + .string "Your POKéMON will be at my mercy\n" + .string "when they are frozen solid.\p" + .string "Hahaha!\n" + .string "Are you ready?{PLAY_BGM}{BGM_FRLG_LEADER_EYE}$" + +Text_178191:: @ 8178191 + .string "…Things shouldn't be this way!$" + +gUnknown_81781B0:: @ 81781B0 + .string "You're better than I thought.\n" + .string "Go on ahead.\p" + .string "You only got a taste of the\n" + .string "POKéMON LEAGUE's power.$" + diff --git a/data/maps/PokemonMansion_1F/text.inc b/data/maps/PokemonMansion_1F/text.inc new file mode 100644 index 000000000..52eece07b --- /dev/null +++ b/data/maps/PokemonMansion_1F/text.inc @@ -0,0 +1,24 @@ +Text_177364:: @ 8177364 + .string "Who are you?\n" + .string "There shouldn't be anyone here.$" + +Text_177391:: @ 8177391 + .string "Ouch!$" + +gUnknown_8177397:: @ 8177397 + .string "A key? I don't know what you're\n" + .string "talking about.$" + +Text_1773C6:: @ 81773C6 + .string "W-w-waah! You startled me!\n" + .string "I thought you were a ghost.$" + +Text_1773FD:: @ 81773FD + .string "Tch!\n" + .string "I can't get any wins.$" + +gUnknown_8177418:: @ 8177418 + .string "I was exploring here by myself,\n" + .string "but I feel spooked.\p" + .string "I ought to go soon.$" + diff --git a/data/maps/PokemonMansion_2F/text.inc b/data/maps/PokemonMansion_2F/text.inc new file mode 100644 index 000000000..4428137de --- /dev/null +++ b/data/maps/PokemonMansion_2F/text.inc @@ -0,0 +1,33 @@ +Text_177460:: @ 8177460 + .string "A secret switch!\p" + .string "Press it?$" + +Text_17747B:: @ 817747B + .string "Who wouldn't?$" + +Text_177489:: @ 8177489 + .string "Not quite yet!$" + +Text_177498:: @ 8177498 + .string "I can't get out!\n" + .string "This old place is one big puzzle.$" + +Text_1774CB:: @ 81774CB + .string "Oh, no!\n" + .string "My bag of loot!$" + +gUnknown_81774E3:: @ 81774E3 + .string "The switches here open and close\n" + .string "alternating sets of doors.$" + +gUnknown_817751F:: @ 817751F + .string "Diary: July 5\n" + .string "Guyana, South America\p" + .string "A new POKéMON was discovered deep\n" + .string "in the jungle.$" + +gUnknown_8177574:: @ 8177574 + .string "Diary: July 10\n" + .string "We christened the newly discovered\l" + .string "POKéMON, MEW.$" + diff --git a/data/maps/PokemonMansion_3F/text.inc b/data/maps/PokemonMansion_3F/text.inc new file mode 100644 index 000000000..1c027784c --- /dev/null +++ b/data/maps/PokemonMansion_3F/text.inc @@ -0,0 +1,35 @@ +Text_1775B4:: @ 81775B4 + .string "ひみつの　スイッチが　ある！\p" + .string "おして　みますか？$" + +Text_1775CD:: @ 81775CD + .string "おしてみよう！　‥ポチッとな$" + +Text_1775DC:: @ 81775DC + .string "ÈÒçè ÀÊúòŒ$" + +Text_1775E7:: @ 81775E7 + .string "This place is, like, huge!$" + +Text_177602:: @ 8177602 + .string "Ayah!$" + +gUnknown_8177608:: @ 8177608 + .string "I wonder where my partner went.$" + +Text_177628:: @ 8177628 + .string "My mentor once lived here.$" + +Text_177643:: @ 8177643 + .string "Whew!\n" + .string "Overwhelming!$" + +gUnknown_8177657:: @ 8177657 + .string "So, you're stuck?\n" + .string "Try jumping off over there!$" + +gUnknown_8177685:: @ 8177685 + .string "Diary: Feb. 6\n" + .string "MEW gave birth.\p" + .string "We named the newborn MEWTWO.$" + diff --git a/data/maps/PokemonMansion_B1F/text.inc b/data/maps/PokemonMansion_B1F/text.inc new file mode 100644 index 000000000..b04ee2397 --- /dev/null +++ b/data/maps/PokemonMansion_B1F/text.inc @@ -0,0 +1,28 @@ +Text_1776C0:: @ 81776C0 + .string "Uh-oh…\n" + .string "Where am I now?$" + +Text_1776D7:: @ 81776D7 + .string "Awooh!$" + +gUnknown_81776DE:: @ 81776DE + .string "You can find stuff lying around.\n" + .string "The residents must've left them.$" + +Text_177720:: @ 8177720 + .string "This place is ideal for a lab.\n" + .string "Look at all this space.$" + +Text_177757:: @ 8177757 + .string "What was that for?$" + +gUnknown_817776A:: @ 817776A + .string "I like it here.\n" + .string "It's conducive to my studies.$" + +gUnknown_8177798:: @ 8177798 + .string "Diary: Sept. 1\n" + .string "MEWTWO is far too powerful.\p" + .string "We have failed to curb its vicious\n" + .string "tendencies…$" + diff --git a/data/maps/PokemonTower_1F/text.inc b/data/maps/PokemonTower_1F/text.inc new file mode 100644 index 000000000..33aca9fb7 --- /dev/null +++ b/data/maps/PokemonTower_1F/text.inc @@ -0,0 +1,29 @@ +gUnknown_8179B7A:: @ 8179B7A + .string "POKéMON TOWER was erected in the\n" + .string "memory of POKéMON that died.$" + +gUnknown_8179BB8:: @ 8179BB8 + .string "Did you come to pay respects?\p" + .string "Bless your POKéMON-loving heart,\n" + .string "son.$" + +gUnknown_8179BFC:: @ 8179BFC + .string "Did you come to pay respects?\p" + .string "Bless your POKéMON-loving heart,\n" + .string "girl.$" + +gUnknown_8179C41:: @ 8179C41 + .string "I came to pray for my dearly\n" + .string "departed CLEFAIRY.\p" + .string "Sniff!\n" + .string "I'm awash in tears…$" + +gUnknown_8179C8C:: @ 8179C8C + .string "My GROWLITHE…\n" + .string "Why did you die?$" + +gUnknown_8179CAB:: @ 8179CAB + .string "I am a CHANNELER.\p" + .string "There are spirits up to mischief.\n" + .string "I sense them high in the TOWER.$" + diff --git a/data/maps/PokemonTower_2F/text.inc b/data/maps/PokemonTower_2F/text.inc new file mode 100644 index 000000000..b45235d7d --- /dev/null +++ b/data/maps/PokemonTower_2F/text.inc @@ -0,0 +1,36 @@ +gUnknown_8179CFF:: @ 8179CFF + .string "{RIVAL}: Hey, {PLAYER}!\n" + .string "What brings you here?\l" + .string "Is your POKéMON dead?\p" + .string "Hey! It's alive!\p" + .string "I can at least make them faint!\n" + .string "Let's go!$" + +Text_179D73:: @ 8179D73 + .string "What?\n" + .string "You stinker!\p" + .string "I took it easy on you, too!$" + +Text_179DA2:: @ 8179DA2 + .string "{RIVAL}“あーあ‥！\n" + .string "ほんとに　くたばっちまったぞ！\l" + .string "よわいなー！\l" + .string "もっと　ちゃんと　そだてて　やれよ$" + +gUnknown_8179DD4:: @ 8179DD4 + .string "How's your POKéDEX coming?\n" + .string "I just caught a CUBONE!\p" + .string "I can't find the bigger MAROWAK.\n" + .string "Where could they be?\p" + .string "I bet there aren't any left!\p" + .string "Well, I better get going.\n" + .string "I've got a lot to accomplish,\l" + .string "unlike you.\p" + .string "Smell ya later!$" + +gUnknown_8179EAE:: @ 8179EAE + .string "Even we could not identify the\n" + .string "wayward ghosts.\p" + .string "A SILPH SCOPE might be able to\n" + .string "unmask them.$" + diff --git a/data/maps/PokemonTower_3F/text.inc b/data/maps/PokemonTower_3F/text.inc new file mode 100644 index 000000000..49388655d --- /dev/null +++ b/data/maps/PokemonTower_3F/text.inc @@ -0,0 +1,36 @@ +Text_179F09:: @ 8179F09 + .string "Urrg… Awaa…\n" + .string "Huhu… Graa…$" + +Text_179F21:: @ 8179F21 + .string "Hwa!\n" + .string "I'm saved!$" + +gUnknown_8179F31:: @ 8179F31 + .string "The ghosts can be identified by\n" + .string "the SILPH SCOPE.$" + +Text_179F62:: @ 8179F62 + .string "Kekeke…\n" + .string "Kwaaah!$" + +Text_179F72:: @ 8179F72 + .string "Hmm?\n" + .string "What am I doing?$" + +gUnknown_8179F88:: @ 8179F88 + .string "Sorry!\n" + .string "I was possessed!$" + +Text_179FA0:: @ 8179FA0 + .string "Be gone!\n" + .string "Malevolent spirit!$" + +Text_179FBC:: @ 8179FBC + .string "Whew!\n" + .string "The spirit left!$" + +gUnknown_8179FD3:: @ 8179FD3 + .string "The others above…\n" + .string "They must have been possessed.$" + diff --git a/data/maps/PokemonTower_4F/text.inc b/data/maps/PokemonTower_4F/text.inc new file mode 100644 index 000000000..69a18a2f6 --- /dev/null +++ b/data/maps/PokemonTower_4F/text.inc @@ -0,0 +1,33 @@ +Text_17A004:: @ 817A004 + .string "Ghost! No!\n" + .string "Kwaaah!$" + +Text_17A017:: @ 817A017 + .string "Where is the ghost?$" + +gUnknown_817A02B:: @ 817A02B + .string "I must have been dreaming…$" + +Text_17A046:: @ 817A046 + .string "Be cursed with me!\n" + .string "Kwaaah!$" + +Text_17A061:: @ 817A061 + .string "What!$" + +gUnknown_817A067:: @ 817A067 + .string "We can't determine the identity of\n" + .string "the ghosts…$" + +Text_17A096:: @ 817A096 + .string "Huhuhu…\n" + .string "Beat me not!$" + +Text_17A0AB:: @ 817A0AB + .string "Huh?\n" + .string "Who? What?$" + +gUnknown_817A0BB:: @ 817A0BB + .string "May the departed POKéMON rest in\n" + .string "peace…$" + diff --git a/data/maps/PokemonTower_5F/text.inc b/data/maps/PokemonTower_5F/text.inc new file mode 100644 index 000000000..5fef4219e --- /dev/null +++ b/data/maps/PokemonTower_5F/text.inc @@ -0,0 +1,51 @@ +gUnknown_817A0E3:: @ 817A0E3 + .string "Come, child!\n" + .string "I have purified this space.\l" + .string "You can rest here.$" + +Text_17A11F:: @ 817A11F + .string "Give…me…\n" + .string "your…all…$" + +Text_17A132:: @ 817A132 + .string "Gasp!$" + +gUnknown_817A138:: @ 817A138 + .string "I was under possession.$" + +Text_17A150:: @ 817A150 + .string "You…shall…\n" + .string "join…us…$" + +Text_17A164:: @ 817A164 + .string "What a nightmare!$" + +gUnknown_817A176:: @ 817A176 + .string "I was possessed.$" + +Text_17A187:: @ 817A187 + .string "Zombies!$" + +Text_17A190:: @ 817A190 + .string "Ha?$" + +gUnknown_817A194:: @ 817A194 + .string "I regained my senses.$" + +Text_17A1AA:: @ 817A1AA + .string "Urgah…\n" + .string "Urff…$" + +Text_17A1B7:: @ 817A1B7 + .string "Whoo!$" + +gUnknown_817A1BD:: @ 817A1BD + .string "I fell to evil spirits despite my\n" + .string "training in the mountains…$" + +gUnknown_817A1FA:: @ 817A1FA + .string "Entered the purified and protected\n" + .string "zone.\p" + .string "{PLAYER}'s POKéMON were fully\n" + .string "healed.$" + diff --git a/data/maps/PokemonTower_6F/text.inc b/data/maps/PokemonTower_6F/text.inc new file mode 100644 index 000000000..5f6747816 --- /dev/null +++ b/data/maps/PokemonTower_6F/text.inc @@ -0,0 +1,43 @@ +Text_17A243:: @ 817A243 + .string "Give…me…\n" + .string "blood…$" + +Text_17A253:: @ 817A253 + .string "Groan!$" + +gUnknown_817A25A:: @ 817A25A + .string "I feel anemic and weak…$" + +Text_17A272:: @ 817A272 + .string "Urff…\n" + .string "Kwaah!$" + +Text_17A27F:: @ 817A27F + .string "Something fell out!$" + +gUnknown_817A293:: @ 817A293 + .string "My hair didn't fall out!\n" + .string "It was a malevolent spirit!$" + +Text_17A2C8:: @ 817A2C8 + .string "Ke…ke…ke…\n" + .string "ke…ke…ke!$" + +Text_17A2DC:: @ 817A2DC + .string "Keee!$" + +gUnknown_817A2E2:: @ 817A2E2 + .string "What's going on here?$" + +gUnknown_817A2F8:: @ 817A2F8 + .string "Be gone…\n" + .string "Intruders…$" + +Text_17A30C:: @ 817A30C + .string "The ghost was the restless spirit\n" + .string "of CUBONE's mother!$" + +gUnknown_817A342:: @ 817A342 + .string "The mother's spirit was calmed.\p" + .string "It departed to the afterlife…$" + diff --git a/data/maps/PokemonTower_7F/text.inc b/data/maps/PokemonTower_7F/text.inc new file mode 100644 index 000000000..d55f9c2e2 --- /dev/null +++ b/data/maps/PokemonTower_7F/text.inc @@ -0,0 +1,50 @@ +Text_17A380:: @ 817A380 + .string "What do you want?\n" + .string "Why are you here?$" + +Text_17A3A4:: @ 817A3A4 + .string "I give up!$" + +gUnknown_817A3AF:: @ 817A3AF + .string "I'm not going to forget this!$" + +Text_17A3CD:: @ 817A3CD + .string "This old guy marched right up to\n" + .string "our HIDEOUT.\p" + .string "Then, he starts ranting about how\n" + .string "TEAM ROCKET's abusing POKéMON.\p" + .string "So, we're just talking it over as\n" + .string "adults.$" + +Text_17A466:: @ 817A466 + .string "Please!\n" + .string "No more!$" + +gUnknown_817A477:: @ 817A477 + .string "POKéMON are only good for making\n" + .string "money. Why not use them?\p" + .string "You stay out of our business!$" + +Text_17A4CF:: @ 817A4CF + .string "You're not saving anyone, kid!$" + +Text_17A4EE:: @ 817A4EE + .string "Don't fight us ROCKETS!$" + +gUnknown_817A506:: @ 817A506 + .string "You're not getting away with this!$" + +gUnknown_817A529:: @ 817A529 + .string "MR. FUJI: Heh?\n" + .string "You came to save me?\p" + .string "Thank you. But, I came here of my\n" + .string "own free will.\p" + .string "I came to calm the spirit of\n" + .string "CUBONE's mother.\p" + .string "I think MAROWAK's spirit has\n" + .string "finally left us.\p" + .string "I must thank you for your kind\n" + .string "concern.\p" + .string "Follow me to my home, POKéMON\n" + .string "HOUSE, at the foot of this tower.$" + diff --git a/data/maps/RockTunnel_1F/text.inc b/data/maps/RockTunnel_1F/text.inc new file mode 100644 index 000000000..56bc4ecbe --- /dev/null +++ b/data/maps/RockTunnel_1F/text.inc @@ -0,0 +1,83 @@ +Text_179366:: @ 8179366 + .string "This tunnel goes a long way, kid!$" + +Text_179388:: @ 8179388 + .string "Doh!\n" + .string "You win!$" + +gUnknown_8179396:: @ 8179396 + .string "Watch for ONIX.\n" + .string "They appear only occasionally.\p" + .string "High-level ones can put the\n" + .string "squeeze on you!$" + +Text_1793F1:: @ 81793F1 + .string "Hmm.\n" + .string "Maybe I'm lost in here…$" + +Text_17940E:: @ 817940E + .string "Ease up!\n" + .string "What am I doing?\l" + .string "Which way is out?$" + +gUnknown_817943A:: @ 817943A + .string "That sleeping POKéMON on ROUTE 12\n" + .string "forced me to take this detour.$" + +Text_17947B:: @ 817947B + .string "Outsiders like you need to show me\n" + .string "some respect!$" + +Text_1794AC:: @ 81794AC + .string "I give!$" + +gUnknown_81794B4:: @ 81794B4 + .string "You're talented enough to hike!$" + +Text_1794D4:: @ 81794D4 + .string "POKéMON fight!\n" + .string "Ready, go!$" + +Text_1794EE:: @ 81794EE + .string "Game over!$" + +gUnknown_81794F9:: @ 81794F9 + .string "Oh well, I'll get a ZUBAT as I go!$" + +Text_17951C:: @ 817951C + .string "Eek!\p" + .string "Don't try anything funny in the\n" + .string "dark!$" + +Text_179547:: @ 8179547 + .string "It was too dark…$" + +gUnknown_8179558:: @ 8179558 + .string "I saw a MACHOP in this tunnel.$" + +Text_179577:: @ 8179577 + .string "I came this far looking for wild\n" + .string "POKéMON.$" + +Text_1795A1:: @ 81795A1 + .string "I'm out of POKéMON!$" + +gUnknown_81795B5:: @ 81795B5 + .string "You looked cute and harmless.\n" + .string "Was I ever wrong!$" + +Text_1795E5:: @ 81795E5 + .string "You have POKéMON!\n" + .string "Let's start!$" + +Text_179604:: @ 8179604 + .string "You play hard!$" + +gUnknown_8179613:: @ 8179613 + .string "Whew!\n" + .string "I'm all sweaty now.$" + +gUnknown_817962D:: @ 817962D + .string "ROCK TUNNEL\n" + .string "CERULEAN CITY - LAVENDER TOWN$" + diff --git a/data/maps/RockTunnel_B1F/text.inc b/data/maps/RockTunnel_B1F/text.inc new file mode 100644 index 000000000..b82f09657 --- /dev/null +++ b/data/maps/RockTunnel_B1F/text.inc @@ -0,0 +1,95 @@ +Text_179657:: @ 8179657 + .string "Do you know how you can avoid\n" + .string "getting lost in the mountains?\p" + .string "You can bend twigs as trail\n" + .string "markers.$" + +Text_1796B9:: @ 81796B9 + .string "Ohhh!\n" + .string "I did my best!$" + +gUnknown_81796CE:: @ 81796CE + .string "I want to go home!$" + +Text_1796E1:: @ 81796E1 + .string "Hahaha!\n" + .string "Can you beat my power?$" + +Text_179700:: @ 8179700 + .string "Oops!\n" + .string "Outmuscled!$" + +gUnknown_8179712:: @ 8179712 + .string "I go for power because I hate\n" + .string "thinking.$" + +Text_17973A:: @ 817973A + .string "You have a POKéDEX?\n" + .string "I want one, too.$" + +Text_17975F:: @ 817975F + .string "Shoot!\n" + .string "I am so jealous!$" + +gUnknown_8179777:: @ 8179777 + .string "When you finish your POKéDEX,\n" + .string "can I have it?$" + +Text_1797A4:: @ 81797A4 + .string "Um… Do you know about POKéMON\n" + .string "cosplay?$" + +Text_1797CB:: @ 81797CB + .string "Well, that's that.$" + +gUnknown_81797DE:: @ 81797DE + .string "POKéMON cosplay is dressing up as\n" + .string "POKéMON for fun.\p" + .string "CLEFAIRY is a favorite.$" + +Text_179829:: @ 8179829 + .string "My POKéMON techniques will leave\n" + .string "you crying!$" + +Text_179856:: @ 8179856 + .string "I give!\n" + .string "You're a better technician!$" + +gUnknown_817987A:: @ 817987A + .string "In mountains, you'll often find\n" + .string "ROCK-type POKéMON.$" + +Text_1798AD:: @ 81798AD + .string "I don't often come here, but I will\n" + .string "battle you.$" + +Text_1798DD:: @ 81798DD + .string "Oh!\n" + .string "I lost!$" + +gUnknown_81798E9:: @ 81798E9 + .string "I like tiny POKéMON.\n" + .string "Big ones are too scary!$" + +Text_179916:: @ 8179916 + .string "Hit me with your best shot!$" + +Text_179932:: @ 8179932 + .string "Fired away!$" + +gUnknown_817993E:: @ 817993E + .string "I'll raise my POKéMON to beat\n" + .string "yours, kid.$" + +Text_179968:: @ 8179968 + .string "I draw illustrations of POKéMON\n" + .string "when I'm home.$" + +Text_179997:: @ 8179997 + .string "Whew…\n" + .string "I'm exhausted…$" + +gUnknown_81799AC:: @ 81799AC + .string "I'm an artist, not a fighter.\n" + .string "I'll go home to draw.$" + diff --git a/data/maps/RocketHideout_B1F/text.inc b/data/maps/RocketHideout_B1F/text.inc new file mode 100644 index 000000000..fd7647e2b --- /dev/null +++ b/data/maps/RocketHideout_B1F/text.inc @@ -0,0 +1,53 @@ +Text_174ECA:: @ 8174ECA + .string "Who are you?\n" + .string "How did you get here?$" + +Text_174EED:: @ 8174EED + .string "Oww!\n" + .string "Beaten!$" + +gUnknown_8174EFA:: @ 8174EFA + .string "Blast it… You're dissing TEAM\n" + .string "ROCKET, aren't you?$" + +Text_174F2C:: @ 8174F2C + .string "You broke into TEAM ROCKET's\n" + .string "operation? What nerve!$" + +Text_174F60:: @ 8174F60 + .string "Boom!$" + +gUnknown_8174F66:: @ 8174F66 + .string "You're not going to get away with\n" + .string "this, brat!$" + +Text_174F94:: @ 8174F94 + .string "Intruder alert!$" + +Text_174FA4:: @ 8174FA4 + .string "I can't do it!$" + +gUnknown_8174FB3:: @ 8174FB3 + .string "SILPH SCOPE? Humph!\n" + .string "I don't know where it is.$" + +Text_174FE1:: @ 8174FE1 + .string "Why did you come here?$" + +Text_174FF8:: @ 8174FF8 + .string "This won't do!$" + +gUnknown_8175007:: @ 8175007 + .string "Okay, I'll talk…\n" + .string "Take the elevator to see my BOSS.$" + +Text_17503A:: @ 817503A + .string "Are you lost, you little mouse?$" + +Text_17505A:: @ 817505A + .string "Why…?$" + +gUnknown_8175060:: @ 8175060 + .string "Uh-oh, that ruckus somehow opened\n" + .string "the door!$" + diff --git a/data/maps/RocketHideout_B2F/text.inc b/data/maps/RocketHideout_B2F/text.inc new file mode 100644 index 000000000..d21c21555 --- /dev/null +++ b/data/maps/RocketHideout_B2F/text.inc @@ -0,0 +1,12 @@ +Text_17508C:: @ 817508C + .string "BOSS said you can see ghosts with\n" + .string "the SILPH SCOPE.$" + +Text_1750BF:: @ 81750BF + .string "I surrender!$" + +gUnknown_81750CC:: @ 81750CC + .string "The TEAM ROCKET HQ has four\n" + .string "underground floors.\p" + .string "Think you can reach the BOSS?$" + diff --git a/data/maps/RocketHideout_B3F/text.inc b/data/maps/RocketHideout_B3F/text.inc new file mode 100644 index 000000000..deedfce38 --- /dev/null +++ b/data/maps/RocketHideout_B3F/text.inc @@ -0,0 +1,26 @@ +Text_17511A:: @ 817511A + .string "Stop meddling in TEAM ROCKET's\n" + .string "affairs or else!$" + +Text_17514A:: @ 817514A + .string "Oof!\n" + .string "Taken down!$" + +gUnknown_817515B:: @ 817515B + .string "SILPH SCOPE?\n" + .string "Oh, that machine the BOSS stole.\p" + .string "It's here somewhere.$" + +Text_17519E:: @ 817519E + .string "We got word from upstairs that you\n" + .string "were coming!$" + +Text_1751CE:: @ 81751CE + .string "What?\n" + .string "I lost? No!$" + +gUnknown_81751E0:: @ 81751E0 + .string "Go ahead and go!\p" + .string "But you can't run the elevator\n" + .string "without the LIFT KEY.$" + diff --git a/data/maps/RocketHideout_B4F/text.inc b/data/maps/RocketHideout_B4F/text.inc new file mode 100644 index 000000000..4ceba8968 --- /dev/null +++ b/data/maps/RocketHideout_B4F/text.inc @@ -0,0 +1,56 @@ +Text_175226:: @ 8175226 + .string "So! I must say, I am impressed you\n" + .string "got here.\p" + .string "TEAM ROCKET captures POKéMON from\n" + .string "around the world.\p" + .string "They're important tools for keeping\n" + .string "our criminal enterprise going.\p" + .string "I am the leader, GIOVANNI!\p" + .string "For your insolence, you will feel a\n" + .string "world of pain!$" + +Text_175318:: @ 8175318 + .string "WHAT!\n" + .string "This can't be!$" + +gUnknown_817532D:: @ 817532D + .string "I see that you raise POKéMON with\n" + .string "utmost care.\p" + .string "A child like you would never\n" + .string "understand what I hope to achieve.\p" + .string "I shall step aside this time!\p" + .string "I hope we meet again…$" + +Text_1753D0:: @ 81753D0 + .string "I know you!\n" + .string "You ruined our plans at MT. MOON!$" + +Text_1753FE:: @ 81753FE + .string "Burned again!$" + +gUnknown_817540C:: @ 817540C + .string "Do you have something against TEAM\n" + .string "ROCKET?$" + +Text_175437:: @ 8175437 + .string "How can you not see the beauty of\n" + .string "our evil?$" + +Text_175463:: @ 8175463 + .string "Ayaya!$" + +gUnknown_817546A:: @ 817546A + .string "BOSS!\n" + .string "I'm sorry I failed you!$" + +Text_175488:: @ 8175488 + .string "The elevator doesn't work?\n" + .string "Who has the LIFT KEY?$" + +Text_1754B9:: @ 81754B9 + .string "No!$" + +gUnknown_81754BD:: @ 81754BD + .string "Oh, no!\n" + .string "I dropped the LIFT KEY!$" + diff --git a/data/maps/RocketHideout_Elevator/text.inc b/data/maps/RocketHideout_Elevator/text.inc new file mode 100644 index 000000000..89de8f918 --- /dev/null +++ b/data/maps/RocketHideout_Elevator/text.inc @@ -0,0 +1,3 @@ +gUnknown_81754DD:: @ 81754DD + .string "It appears to need a key.$" + diff --git a/data/maps/Route1/text.inc b/data/maps/Route1/text.inc new file mode 100644 index 000000000..7b4150b03 --- /dev/null +++ b/data/maps/Route1/text.inc @@ -0,0 +1,28 @@ +gUnknown_818329D:: @ 818329D + .string "Hi!\n" + .string "I work at a POKéMON MART.\p" + .string "It's part of a convenient chain\n" + .string "selling all sorts of items.\p" + .string "Please, visit us in VIRIDIAN CITY.\p" + .string "I know, I'll give you a sample.\n" + .string "Here you go!$" + +gUnknown_8183347:: @ 8183347 + .string "Please come see us if you need\n" + .string "POKé BALLS for catching POKéMON.$" + +gUnknown_8183387:: @ 8183387 + .string "{PLAYER} put the POTION away in\n" + .string "the BAG's ITEMS POCKET.$" + +gUnknown_81833B9:: @ 81833B9 + .string "See those ledges along the road?\p" + .string "It's a bit scary, but you can jump\n" + .string "from them.\p" + .string "You can get back to PALLET TOWN\n" + .string "quicker that way.$" + +gUnknown_818343A:: @ 818343A + .string "ROUTE 1\n" + .string "PALLET TOWN - VIRIDIAN CITY$" + diff --git a/data/maps/Route10/text.inc b/data/maps/Route10/text.inc new file mode 100644 index 000000000..af45c8923 --- /dev/null +++ b/data/maps/Route10/text.inc @@ -0,0 +1,86 @@ +Text_184B8A:: @ 8184B8A + .string "Wow, you came all the way here?\n" + .string "Maybe you're a POKéMANIAC, too?\l" + .string "Want to see my collection?$" + +Text_184BE5:: @ 8184BE5 + .string "Humph.\n" + .string "I'm not angry!$" + +Text_184BFB:: @ 8184BFB + .string "I have more rare POKéMON at home!$" + +Text_184C1D:: @ 8184C1D + .string "Ha-hahah-ah-ha!$" + +Text_184C2D:: @ 8184C2D + .string "Ha-haha!\n" + .string "Not laughing!\l" + .string "Ha-hay fever! Haha-ha-choo!$" + +Text_184C60:: @ 8184C60 + .string "Haha-ha-choo!\n" + .string "Ha-choo!\l" + .string "Snort! Snivel!$" + +Text_184C86:: @ 8184C86 + .string "Hi, kid!\n" + .string "Want to see my POKéMON?$" + +Text_184CA7:: @ 8184CA7 + .string "Oh, no!\n" + .string "My POKéMON!$" + +Text_184CBB:: @ 8184CBB + .string "I don't like you.\n" + .string "I don't like anyone better than me!$" + +Text_184CF1:: @ 8184CF1 + .string "I've been out at a POKéMON GYM\n" + .string "a few times.\p" + .string "…But I always lose.$" + +Text_184D31:: @ 8184D31 + .string "Ohh!\n" + .string "After all my training!$" + +Text_184D4D:: @ 8184D4D + .string "I noticed some POKéMANIACS\n" + .string "prowling around.\p" + .string "Can you imagine? Them?\n" + .string "Up here in the mountains?$" + +Text_184DAA:: @ 8184DAA + .string "Ah!\n" + .string "This mountain air is delicious!$" + +Text_184DCE:: @ 8184DCE + .string "That cleared my head!$" + +Text_184DE4:: @ 8184DE4 + .string "I feel bloated on mountain air!$" + +Text_184E04:: @ 8184E04 + .string "I'm feeling a bit faint.\n" + .string "I haven't hiked in some time.$" + +Text_184E3B:: @ 8184E3B + .string "I'm too tired.\n" + .string "I wasn't up for it.$" + +Text_184E5E:: @ 8184E5E + .string "The POKéMON here in the mountains\n" + .string "are so chunky…\p" + .string "I wish there were pink POKéMON\n" + .string "with a floral pattern!$" + +gUnknown_8184EC5:: @ 8184EC5 + .string "ROCK TUNNEL\n" + .string "Detour to LAVENDER TOWN$" + +gUnknown_8184EE9:: @ 8184EE9 + .string "ROCK TUNNEL$" + +gUnknown_8184EF5:: @ 8184EF5 + .string "POWER PLANT$" + diff --git a/data/maps/Route10_PokemonCenter_1F/text.inc b/data/maps/Route10_PokemonCenter_1F/text.inc new file mode 100644 index 000000000..3360854fe --- /dev/null +++ b/data/maps/Route10_PokemonCenter_1F/text.inc @@ -0,0 +1,48 @@ +gUnknown_819E523:: @ 819E523 + .string "The types of POKéMON match up\n" + .string "differently with each other.\p" + .string "Every type is stronger than some\n" + .string "types and weaker than others.$" + +gUnknown_819E59D:: @ 819E59D + .string "A NUGGET is totally useless.\n" + .string "So I sold it for ¥5000.$" + +gUnknown_819E5D2:: @ 819E5D2 + .string "I heard that ghosts haunt\n" + .string "LAVENDER TOWN.$" + +gUnknown_819E5FB:: @ 819E5FB + .string "Oh… {PLAYER}!\n" + .string "I've been looking for you!\p" + .string "It's me, one of the ever-present\n" + .string "AIDES to PROF. OAK.\p" + .string "If your POKéDEX has complete data\n" + .string "on twenty species, I'm supposed to\l" + .string "give you a reward from PROF. OAK.\p" + .string "He entrusted me with this\n" + .string "EVERSTONE.\p" + .string "So, {PLAYER}, let me ask you.\p" + .string "Have you gathered data on at least\n" + .string "twenty kinds of POKéMON?$" + +gUnknown_819E733:: @ 819E733 + .string "Great! You have caught or owned\n" + .string "{STR_VAR_3} kinds of POKéMON!\p" + .string "Congratulations!\n" + .string "Here you go!$" + +gUnknown_819E786:: @ 819E786 + .string "{PLAYER} received the EVERSTONE\n" + .string "from the AIDE.$" + +gUnknown_819E7AF:: @ 819E7AF + .string "Making POKéMON evolve certainly\n" + .string "can add to the POKéDEX.\p" + .string "However, at times, you may not\n" + .string "want a certain POKéMON to evolve.\p" + .string "In that case, give the EVERSTONE\n" + .string "to that POKéMON.\p" + .string "It will prevent evolution according\n" + .string "to the PROFESSOR.$" + diff --git a/data/maps/Route11/text.inc b/data/maps/Route11/text.inc new file mode 100644 index 000000000..19515d010 --- /dev/null +++ b/data/maps/Route11/text.inc @@ -0,0 +1,113 @@ +Text_184F01:: @ 8184F01 + .string "Win, lose, or draw!$" + +Text_184F15:: @ 8184F15 + .string "Atcha!\n" + .string "Didn't go my way!$" + +Text_184F2E:: @ 8184F2E + .string "POKéMON is life!\n" + .string "And to live is to play games!$" + +Text_184F5D:: @ 8184F5D + .string "Competition!\n" + .string "I can't get enough!$" + +Text_184F7E:: @ 8184F7E + .string "I had a chance!$" + +Text_184F8E:: @ 8184F8E + .string "You can't be a coward in the world\n" + .string "of POKéMON!$" + +Text_184FBD:: @ 8184FBD + .string "Let's go, but don't cheat!$" + +Text_184FD8:: @ 8184FD8 + .string "Huh?\n" + .string "That's not right!$" + +Text_184FEF:: @ 8184FEF + .string "I did my best.\n" + .string "I have no regrets.$" + +Text_185011:: @ 8185011 + .string "Careful!\n" + .string "I'm laying down some cables!$" + +Text_185037:: @ 8185037 + .string "That was electric!$" + +Text_18504A:: @ 818504A + .string "Spread the word to save energy!$" + +Text_18506A:: @ 818506A + .string "I just became a TRAINER.\n" + .string "But, I think I can win.$" + +Text_18509B:: @ 818509B + .string "My POKéMON couldn't win…\n" + .string "Haven't they grown enough?$" + +Text_1850CF:: @ 81850CF + .string "What now?\n" + .string "Leave me alone!$" + +Text_1850E9:: @ 81850E9 + .string "Fwahaha!\n" + .string "I have never lost!$" + +Text_185105:: @ 8185105 + .string "My first loss!$" + +Text_185114:: @ 8185114 + .string "You were just lucky, that's all.$" + +Text_185135:: @ 8185135 + .string "I have never won before…$" + +Text_18514E:: @ 818514E + .string "I saw this coming…$" + +Text_185161:: @ 8185161 + .string "I was unlucky, as always.$" + +Text_18517B:: @ 818517B + .string "I'm the best in my class.\n" + .string "I train every morning.$" + +Text_1851AC:: @ 81851AC + .string "Darn!\n" + .string "My POKéMON need to be stronger!$" + +Text_1851D2:: @ 81851D2 + .string "There's a fat POKéMON that comes\n" + .string "down from the mountains.\p" + .string "I bet it'd be strong if you can\n" + .string "catch it.$" + +Text_185236:: @ 8185236 + .string "Watch out for live wires!$" + +Text_185250:: @ 8185250 + .string "Whoa!\n" + .string "You spark plug!$" + +Text_185266:: @ 8185266 + .string "Well, better get back to work.$" + +Text_185285:: @ 8185285 + .string "I raised my POKéMON carefully.\n" + .string "They should be ready by now!$" + +Text_1852C1:: @ 81852C1 + .string "Bye-bye!\n" + .string "Thank you, and good-bye!$" + +Text_1852E3:: @ 81852E3 + .string "Tch…\n" + .string "I better go find stronger ones!$" + +gUnknown_8185308:: @ 8185308 + .string "DIGLETT'S CAVE$" + diff --git a/data/maps/Route11_EastEntrance_1F/text.inc b/data/maps/Route11_EastEntrance_1F/text.inc new file mode 100644 index 000000000..335e7e3e9 --- /dev/null +++ b/data/maps/Route11_EastEntrance_1F/text.inc @@ -0,0 +1,20 @@ +Text_19E890:: @ 819E890 + .string "{PLAYER}{KUN}の　バッグ\n" + .string "いっぱい　みたい　だね$" + +gUnknown_819E8A6:: @ 819E8A6 + .string "Don't you think it's hard to think\n" + .string "up good names for POKéMON?\p" + .string "Especially if you've caught a\n" + .string "whole bunch?\p" + .string "In LAVENDER TOWN, there's a man\n" + .string "who rates POKéMON nicknames.\p" + .string "He can even help you rename your\n" + .string "POKéMON, too.$" + +gUnknown_819E97B:: @ 819E97B + .string "If you're aiming to reach LAVENDER\n" + .string "TOWN, take ROCK TUNNEL.\p" + .string "You can get to ROCK TUNNEL from\n" + .string "CERULEAN CITY.$" + diff --git a/data/maps/Route11_EastEntrance_2F/text.inc b/data/maps/Route11_EastEntrance_2F/text.inc new file mode 100644 index 000000000..aa693a495 --- /dev/null +++ b/data/maps/Route11_EastEntrance_2F/text.inc @@ -0,0 +1,52 @@ +gUnknown_819E9E5:: @ 819E9E5 + .string "Hi! Remember me?\n" + .string "I'm one of PROF. OAK's AIDES.\p" + .string "If your POKéDEX has complete data\n" + .string "on {STR_VAR_1} species, I'm supposed to\l" + .string "give you a reward.\p" + .string "PROF. OAK entrusted me with the\n" + .string "{STR_VAR_2} for you.\p" + .string "So, {PLAYER}, let me ask you.\p" + .string "Have you gathered data on at least\n" + .string "{STR_VAR_1} kinds of POKéMON?$" + +gUnknown_819EAE4:: @ 819EAE4 + .string "Great! You have caught or owned\n" + .string "{STR_VAR_3} kinds of POKéMON!\p" + .string "Congratulations!\n" + .string "Here you go!$" + +gUnknown_819EB37:: @ 819EB37 + .string "{PLAYER} received the {STR_VAR_2}\n" + .string "from the AIDE.$" + +gUnknown_819EB59:: @ 819EB59 + .string "There are items on the ground that\n" + .string "may be hidden from view.\p" + .string "Use the ITEMFINDER to detect any\n" + .string "hidden items close to you.\p" + .string "The machine is a bit limited.\n" + .string "It can't pinpoint item locations.\p" + .string "What it does is show the direction\n" + .string "where the item is.\p" + .string "Use it to get your bearings, then\n" + .string "search the suspect area by hand.$" + +gUnknown_819EC8A:: @ 819EC8A + .string "Let's see what the binoculars have\n" + .string "to show…\p" + .string "A big POKéMON is asleep on a road!$" + +gUnknown_819ECD9:: @ 819ECD9 + .string "Let's see what the binoculars have\n" + .string "to show…\p" + .string "What a breathtaking view!$" + +gUnknown_819ED1F:: @ 819ED1F + .string "Let's see what the binoculars have\n" + .string "to show…\p" + .string "To get to LAVENDER TOWN from\n" + .string "CERULEAN CITY…\p" + .string "ROCK TUNNEL appears to be a good\n" + .string "route to take.$" + diff --git a/data/maps/Route12/text.inc b/data/maps/Route12/text.inc new file mode 100644 index 000000000..bf82fcf59 --- /dev/null +++ b/data/maps/Route12/text.inc @@ -0,0 +1,111 @@ +gUnknown_8185317:: @ 8185317 + .string "A POKéMON is sprawled out in\n" + .string "a deep and comfortable slumber.$" + +Text_185354:: @ 8185354 + .string "SNORLAX woke up!\p" + .string "It attacked in a grumpy rage!$" + +gUnknown_8185383:: @ 8185383 + .string "SNORLAX calmed down.\n" + .string "It gave a huge yawn…\l" + .string "And returned to the mountains.$" + +gUnknown_81853CC:: @ 81853CC + .string "Want to use the POKé FLUTE?$" + +Text_1853E8:: @ 81853E8 + .string "{PLAYER} played the POKé FLUTE.$" + +Text_185402:: @ 8185402 + .string "Yeah!\n" + .string "I got a bite here!$" + +Text_18541B:: @ 818541B + .string "Tch!\n" + .string "Just a small fry…$" + +Text_185432:: @ 8185432 + .string "Hang on!\n" + .string "My line's snagged!$" + +Text_18544E:: @ 818544E + .string "Be patient.\n" + .string "Fishing is a waiting game.$" + +Text_185475:: @ 8185475 + .string "That one got away!$" + +Text_185488:: @ 8185488 + .string "With a better ROD, I could catch\n" + .string "better POKéMON…$" + +Text_1854B9:: @ 81854B9 + .string "I'm searching for a MOON STONE.\n" + .string "Have you found one?$" + +Text_1854ED:: @ 81854ED + .string "Oww!$" + +Text_1854F2:: @ 81854F2 + .string "I could have made my POKéMON\n" + .string "evolve with a MOON STONE.\p" + .string "I would have won then, I bet.$" + +Text_185547:: @ 8185547 + .string "Electricity is my specialty.\p" + .string "I don't know a thing about POKéMON\n" + .string "of the sea, though.$" + +Text_18559B:: @ 818559B + .string "Unplugged!$" + +Text_1855A6:: @ 81855A6 + .string "Water conducts electricity, so you\n" + .string "should zap sea POKéMON.$" + +Text_1855E1:: @ 81855E1 + .string "The FISHING FOOL versus POKéMON\n" + .string "KID!$" + +Text_185606:: @ 8185606 + .string "Touch too much!$" + +Text_185616:: @ 8185616 + .string "I guess you get to be good at\n" + .string "what you like.\p" + .string "Well, you beat me at POKéMON,\n" + .string "but you can't top me at fishing.$" + +Text_185682:: @ 8185682 + .string "I love fishing, don't get me wrong.\p" + .string "But it'd be best if I also had more\n" + .string "work.$" + +Text_1856D0:: @ 81856D0 + .string "It's not easy…$" + +Text_1856DF:: @ 81856DF + .string "It's all right.\n" + .string "Losing doesn't bug me anymore.$" + +Text_18570E:: @ 818570E + .string "What's catching?\p" + .string "You never know what you could\n" + .string "catch!$" + +Text_185744:: @ 8185744 + .string "Lost it!$" + +Text_18574D:: @ 818574D + .string "What, MAGIKARP?\p" + .string "I catch them all the time, sure.\n" + .string "But, boy are they wimpy.$" + +gUnknown_8185797:: @ 8185797 + .string "ROUTE 12 \n" + .string "North to LAVENDER$" + +gUnknown_81857B3:: @ 81857B3 + .string "SPORTFISHING AREA$" + diff --git a/data/maps/Route12_FishingHouse/text.inc b/data/maps/Route12_FishingHouse/text.inc new file mode 100644 index 000000000..4f1f3f1fd --- /dev/null +++ b/data/maps/Route12_FishingHouse/text.inc @@ -0,0 +1,89 @@ +gUnknown_819EFE0:: @ 819EFE0 + .string "I'm the FISHING GURU's younger\n" + .string "brother.\p" + .string "I simply looove fishing!\n" + .string "I can't bear to go without.\p" + .string "Tell me, do you like to fish?$" + +gUnknown_819F05B:: @ 819F05B + .string "Grand! I like your style.\n" + .string "I think we can be friends.\p" + .string "Take this and fish, young friend!$" + +gUnknown_819F0B2:: @ 819F0B2 + .string "{PLAYER} received a SUPER ROD from\n" + .string "the FISHING GURU's brother.$" + +gUnknown_819F0EB:: @ 819F0EB + .string "Fishing is a way of life!\n" + .string "It is like the finest poetry.\p" + .string "From the seas to rivers, go out\n" + .string "and land the big one, my friend.\p" + .string "Now, I have a request.\p" + .string "If you catch a big MAGIKARP \n" + .string "with that ROD, I want to see it.\p" + .string "As much as I love to fish, I also\n" + .string "love seeing gigantic MAGIKARP.$" + +gUnknown_819F1FA:: @ 819F1FA + .string "Oh…\n" + .string "That's so disappointing…$" + +gUnknown_819F217:: @ 819F217 + .string "Hello there, {PLAYER}!\n" + .string "Have you been fishing?\p" + .string "Try fishing with the SUPER ROD in\n" + .string "any body of water.\p" + .string "You'll find different POKéMON in\n" + .string "different places.\p" + .string "Oh, and don't forget to bring me\n" + .string "gigantic MAGIKARP.$" + +gUnknown_819F2DB:: @ 819F2DB + .string "Oh? {PLAYER}?\n" + .string "Why, if it isn't a MAGIKARP!\p" + .string "Allow me to see it, quick!$" + +gUnknown_819F31B:: @ 819F31B + .string "… … …Whoa!\n" + .string "{STR_VAR_2} inches!\p" + .string "You have a rare appreciation for\n" + .string "the fine, poetic aspects of fishing!\p" + .string "You must take this.\n" + .string "I insist!$" + +gUnknown_819F395:: @ 819F395 + .string "I'll look forward to seeing greater\n" + .string "records from you!$" + +gUnknown_819F3CB:: @ 819F3CB + .string "Huh?\n" + .string "{STR_VAR_2} inches?\p" + .string "This is the same size as the one\n" + .string "I saw before.$" + +gUnknown_819F40A:: @ 819F40A + .string "Hmm…\n" + .string "This one is {STR_VAR_2} inches long.\p" + .string "It doesn't measure up to the\n" + .string "{STR_VAR_3}-inch one you brought before.$" + +gUnknown_819F468:: @ 819F468 + .string "Uh… That doesn't look much like\n" + .string "a MAGIKARP.$" + +gUnknown_819F494:: @ 819F494 + .string "Oh, no!\p" + .string "I had a gift for you, but you have\n" + .string "no room for it.$" + +gUnknown_819F4CF:: @ 819F4CF + .string "The most gigantic MAGIKARP\n" + .string "I have ever witnessed…\p" + .string "{STR_VAR_3} inches!$" + +gUnknown_819F50C:: @ 819F50C + .string "It's a blank chart of some sort.\p" + .string "It has spaces for writing in\n" + .string "records of some kind.$" + diff --git a/data/maps/Route12_NorthEntrance_1F/text.inc b/data/maps/Route12_NorthEntrance_1F/text.inc new file mode 100644 index 000000000..32f34428f --- /dev/null +++ b/data/maps/Route12_NorthEntrance_1F/text.inc @@ -0,0 +1,4 @@ +gUnknown_819EDA7:: @ 819EDA7 + .string "There's a lookout spot upstairs.\n" + .string "The view is magnificent.$" + diff --git a/data/maps/Route12_NorthEntrance_2F/text.inc b/data/maps/Route12_NorthEntrance_2F/text.inc new file mode 100644 index 000000000..df2ac596b --- /dev/null +++ b/data/maps/Route12_NorthEntrance_2F/text.inc @@ -0,0 +1,35 @@ +gUnknown_819EDE1:: @ 819EDE1 + .string "My POKéMON's ashes are stored in\n" + .string "POKéMON TOWER.\p" + .string "You can have this TM.\n" + .string "I don't need it anymore…$" + +gUnknown_819EE40:: @ 819EE40 + .string "My POKéMON's ashes are stored in\n" + .string "POKéMON TOWER.\p" + .string "You can have this TM.\n" + .string "I don't need it anymore…$" + +gUnknown_819EE9F:: @ 819EE9F + .string "{PLAYER} received TM27\n" + .string "from the little girl.$" + +gUnknown_819EEC6:: @ 819EEC6 + .string "TM27 is a move called RETURN…\p" + .string "If you treat your POKéMON good,\n" + .string "it will return your love by working\l" + .string "its hardest in battle.$" + +gUnknown_819EF3F:: @ 819EF3F + .string "You don't have room for this.$" + +gUnknown_819EF5D:: @ 819EF5D + .string "Let's see what the binoculars have\n" + .string "to show…\p" + .string "There's a man fishing!$" + +gUnknown_819EFA0:: @ 819EFA0 + .string "Let's see what the binoculars have\n" + .string "to show…\p" + .string "It's POKéMON TOWER!$" + diff --git a/data/maps/Route13/text.inc b/data/maps/Route13/text.inc new file mode 100644 index 000000000..1b570d424 --- /dev/null +++ b/data/maps/Route13/text.inc @@ -0,0 +1,162 @@ +Text_1857C5:: @ 81857C5 + .string "JES: If I win, I'm going to\n" + .string "propose to GIA.$" + +Text_1857F1:: @ 81857F1 + .string "JES: Oh, please, why couldn't you\n" + .string "let us win?$" + +Text_18581F:: @ 818581F + .string "JES: Oh, GIA, forgive me,\n" + .string "my love!$" + +Text_185842:: @ 8185842 + .string "JES: GIA and I, we'll be\n" + .string "together forever.\p" + .string "We won't battle unless you have\n" + .string "two POKéMON of your own.$" + +Text_1858A6:: @ 81858A6 + .string "GIA: Hey, JES…\p" + .string "If we win, I'll marry you!$" + +Text_1858D0:: @ 81858D0 + .string "GIA: Oh, but why?$" + +Text_1858E2:: @ 81858E2 + .string "GIA: JES, you silly!\n" + .string "You ruined this!$" + +Text_185908:: @ 8185908 + .string "GIA: I can't bear to battle\n" + .string "without my JES!\p" + .string "Don't you have one more POKéMON?$" + +Text_185955:: @ 8185955 + .string "My bird POKéMON want to battle\n" + .string "with you!$" + +Text_18597E:: @ 818597E + .string "My PIDGEY and PIDGEOTTO combo\n" + .string "lost?$" + +Text_1859A2:: @ 81859A2 + .string "My POKéMON look happy even though\n" + .string "they lost.$" + +Text_1859CF:: @ 81859CF + .string "I'm told I'm good for a kid.$" + +Text_1859EC:: @ 81859EC + .string "Ohh!\n" + .string "I lost!$" + +Text_1859F9:: @ 81859F9 + .string "I want to become a good TRAINER.\n" + .string "I'll train hard, just watch.$" + +Text_185A37:: @ 8185A37 + .string "Wow!\n" + .string "Your BADGES are too cool!$" + +Text_185A56:: @ 8185A56 + .string "Not enough!$" + +Text_185A62:: @ 8185A62 + .string "You got those BADGES from GYM\n" + .string "LEADERS. I know!$" + +Text_185A91:: @ 8185A91 + .string "My cute POKéMON wish to make your\n" + .string "acquaintance.$" + +Text_185AC1:: @ 8185AC1 + .string "Good going!\n" + .string "You totally won!$" + +Text_185ADE:: @ 8185ADE + .string "You have to make POKéMON battle\n" + .string "to toughen them up.$" + +Text_185B12:: @ 8185B12 + .string "I found CARBOS in a cave once\n" + .string "while I was spelunking.$" + +Text_185B48:: @ 8185B48 + .string "Oh, too bad!\n" + .string "I just messed up!$" + +Text_185B67:: @ 8185B67 + .string "CARBOS boosted the SPEED of my\n" + .string "POKéMON.$" + +Text_185B8F:: @ 8185B8F + .string "I'm not going to lose.\n" + .string "Not when the wind's blowing my way!$" + +Text_185BCA:: @ 8185BCA + .string "The wind turned!$" + +Text_185BDB:: @ 8185BDB + .string "I'm beat.\n" + .string "I guess I'll FLY home.$" + +Text_185BFC:: @ 8185BFC + .string "Sure, I'll play with you, sweetie.$" + +Text_185C1F:: @ 8185C1F + .string "Oh!\n" + .string "You little beast!$" + +Text_185C35:: @ 8185C35 + .string "I wonder which is stronger, male or\n" + .string "female POKéMON?$" + +Text_185C69:: @ 8185C69 + .string "Do you want to battle some\n" + .string "POKéMON with me?$" + +Text_185C95:: @ 8185C95 + .string "It's over already?$" + +Text_185CA8:: @ 8185CA8 + .string "I don't know anything about\n" + .string "POKéMON actually.\p" + .string "The ones I use… I picked them\n" + .string "for their looks!$" + +Text_185D05:: @ 8185D05 + .string "What're you lookin' at?$" + +Text_185D1D:: @ 8185D1D + .string "Dang!\n" + .string "Stripped gears!$" + +Text_185D33:: @ 8185D33 + .string "Get lost!$" + +Text_185D3D:: @ 8185D3D + .string "I always go with bird POKéMON.\n" + .string "I've dedicated myself to them.$" + +Text_185D7B:: @ 8185D7B + .string "Out of power!$" + +Text_185D89:: @ 8185D89 + .string "I wish I could fly like PIDGEY and\n" + .string "PIDGEOTTO…$" + +gUnknown_8185DB7:: @ 8185DB7 + .string "TRAINER TIPS\p" + .string "Look, look!\n" + .string "Look to the left of that post!$" + +gUnknown_8185DEF:: @ 8185DEF + .string "TRAINER TIPS\p" + .string "Use SELECT to switch items in the\n" + .string "ITEMS window.$" + +gUnknown_8185E2C:: @ 8185E2C + .string "ROUTE 13\n" + .string "North to SILENCE BRIDGE$" + diff --git a/data/maps/Route14/text.inc b/data/maps/Route14/text.inc new file mode 100644 index 000000000..37008ab3b --- /dev/null +++ b/data/maps/Route14/text.inc @@ -0,0 +1,126 @@ +Text_185E4D:: @ 8185E4D + .string "You need to use TMs to teach good\n" + .string "moves to POKéMON.$" + +Text_185E81:: @ 8185E81 + .string "Not good enough quite yet.$" + +Text_185E9C:: @ 8185E9C + .string "You have some HMs, right? POKéMON\n" + .string "can't forget those moves easily.$" + +Text_185EDF:: @ 8185EDF + .string "My bird POKéMON should be ready\n" + .string "for battle.$" + +Text_185F0B:: @ 8185F0B + .string "Not ready yet!$" + +Text_185F1A:: @ 8185F1A + .string "My bird POKéMON need to learn\n" + .string "better moves.$" + +Text_185F46:: @ 8185F46 + .string "They have TMs on sale at the\n" + .string "CELADON DEPT. STORE.\p" + .string "TMs aren't really rare, but not\n" + .string "many people have HMs.$" + +Text_185FAE:: @ 8185FAE + .string "Aww, bummer!$" + +Text_185FBB:: @ 8185FBB + .string "Try teaching POKéMON a move that's\n" + .string "the same type as it.\p" + .string "That apparently boosts the power\n" + .string "of the move.$" + +Text_186021:: @ 8186021 + .string "Have you taught your bird POKéMON\n" + .string "how to FLY?\p" + .string "You'll be able to soar with it into\n" + .string "the sky!$" + +Text_18607C:: @ 818607C + .string "Shot down in flames!$" + +Text_186091:: @ 8186091 + .string "Bird POKéMON are my one true love.\n" + .string "I don't want to raise anything else.$" + +Text_1860D9:: @ 81860D9 + .string "Have you heard the legend of the\n" + .string "winged mirages?$" + +Text_18610A:: @ 818610A + .string "Why?\n" + .string "Why'd I lose?$" + +Text_18611D:: @ 818611D + .string "Well, the winged mirages are the\n" + .string "legendary bird POKéMON.\p" + .string "There are three of them: ARTICUNO,\n" + .string "ZAPDOS, and MOLTRES.$" + +Text_18618E:: @ 818618E + .string "I'm not into it, but okay.\n" + .string "Let's go!$" + +Text_1861B3:: @ 81861B3 + .string "I knew it!$" + +Text_1861BE:: @ 81861BE + .string "Winning, losing… It's insignificant\n" + .string "under this huge sky.$" + +Text_1861F7:: @ 81861F7 + .string "C'mon, c'mon.\n" + .string "Let's go, let's go, let's go!$" + +Text_186223:: @ 8186223 + .string "Arrg!\n" + .string "Lost! Get lost!$" + +Text_186239:: @ 8186239 + .string "What, what, what?\n" + .string "What do you want still?$" + +Text_186263:: @ 8186263 + .string "I need to burn some time.\n" + .string "Shut up and battle.$" + +Text_186291:: @ 8186291 + .string "What?\n" + .string "You!?$" + +Text_18629D:: @ 818629D + .string "Raising POKéMON is a drag, man.$" + +Text_1862BD:: @ 81862BD + .string "We ride out here because of the\n" + .string "wide-open spaces.$" + +Text_1862EF:: @ 81862EF + .string "Wipeout!$" + +Text_1862F8:: @ 81862F8 + .string "It's cool you made your POKéMON so\n" + .string "strong.\p" + .string "Might is right!\n" + .string "And you know it!$" + +Text_186344:: @ 8186344 + .string "POKéMON battle?\n" + .string "Cool! Rumble!$" + +Text_186362:: @ 8186362 + .string "Blown away!$" + +Text_18636E:: @ 818636E + .string "You know who'd win, you and me\n" + .string "one-on-one!$" + +gUnknown_8186399:: @ 8186399 + .string "ROUTE 14\n" + .string "West to FUCHSIA CITY$" + diff --git a/data/maps/Route15/text.inc b/data/maps/Route15/text.inc new file mode 100644 index 000000000..34e3a0c60 --- /dev/null +++ b/data/maps/Route15/text.inc @@ -0,0 +1,153 @@ +Text_1863B7:: @ 81863B7 + .string "KIRI: JAN, let's try really,\n" + .string "really hard together.$" + +Text_1863EA:: @ 81863EA + .string "KIRI: Whimper…\n" + .string "We lost, didn't we?$" + +Text_18640D:: @ 818640D + .string "KIRI: Did we lose because of me?$" + +Text_18642E:: @ 818642E + .string "KIRI: We can battle if you have\n" + .string "two POKéMON.$" + +Text_18645B:: @ 818645B + .string "JAN: KIRI, here we go!\n" + .string "We have to try hard!$" + +Text_186487:: @ 8186487 + .string "JAN: Eeeeh!\n" + .string "No fair!$" + +Text_18649C:: @ 818649C + .string "JAN: KIRI, don't cry!\n" + .string "We'll just try harder next time.$" + +Text_1864D3:: @ 81864D3 + .string "JAN: You want to battle?\n" + .string "You don't have enough POKéMON.$" + +Text_18650B:: @ 818650B + .string "I just got some POKéMON in trades.\n" + .string "Can I try them out on you?$" + +Text_186549:: @ 8186549 + .string "Not good enough!$" + +Text_18655A:: @ 818655A + .string "You can't change the nickname of\n" + .string "any POKéMON you get in a trade.\p" + .string "Only the Original TRAINER can get\n" + .string "the nickname changed.$" + +Text_1865D3:: @ 81865D3 + .string "You look gentle, so I think I can\n" + .string "beat you.\p" + .string "I'll give it a go!$" + +Text_186612:: @ 8186612 + .string "No, wrong!$" + +Text_18661D:: @ 818661D + .string "I'm afraid of BIKERS. They look so\n" + .string "ugly and mean!$" + +Text_18664F:: @ 818664F + .string "When I whistle, I can summon bird\n" + .string "POKéMON.$" + +Text_18667A:: @ 818667A + .string "Ow!\n" + .string "That's tragic!$" + +Text_18668D:: @ 818668D + .string "Maybe I'm not cut out for battles.\n" + .string "I'm not the right type, I guess.$" + +Text_1866D1:: @ 81866D1 + .string "Hmm? My birds are shivering!\n" + .string "You're good, aren't you?$" + +Text_186707:: @ 8186707 + .string "Just as I thought!$" + +Text_18671A:: @ 818671A + .string "This is so obvious, you should know\n" + .string "this, but…\p" + .string "Moves like EARTHQUAKE and FISSURE\n" + .string "have no effect on bird POKéMON.$" + +Text_18678B:: @ 818678B + .string "Oh, you're a little cutie!\n" + .string "So like a darling POKéMON!$" + +Text_1867C1:: @ 81867C1 + .string "You looked so cute, too!$" + +Text_1867DA:: @ 81867DA + .string "I forgive you.\n" + .string "I can take it.\l" + .string "I'm a big girl now.$" + +Text_18680C:: @ 818680C + .string "I raise POKéMON for protection\n" + .string "because I live alone.$" + +Text_186841:: @ 8186841 + .string "POKéMON isn't about winning or\n" + .string "losing for me.$" + +Text_18686F:: @ 818686F + .string "I love having my POKéMON greet me\n" + .string "when I get home.\p" + .string "It's so reassuring.$" + +Text_1868B6:: @ 81868B6 + .string "Hey, kid! C'mon!\n" + .string "I just got these off some loser!$" + +Text_1868E8:: @ 81868E8 + .string "Why not?$" + +Text_1868F1:: @ 81868F1 + .string "Life's too short.\n" + .string "It's cool to live as an outlaw.\l" + .string "TEAM ROCKET RULES!$" + +Text_186936:: @ 8186936 + .string "Fork over all your cash when you\n" + .string "lose to me, kid!$" + +Text_186968:: @ 8186968 + .string "That can't be true!$" + +Text_18697C:: @ 818697C + .string "I was just joking about the money.\n" + .string "Don't take me all serious.$" + +Text_1869BA:: @ 81869BA + .string "What's cool and happening?\n" + .string "Trading POKéMON!$" + +Text_1869E6:: @ 81869E6 + .string "I said trade!$" + +Text_1869F4:: @ 81869F4 + .string "I trade POKéMON with my friends\n" + .string "all the time.$" + +Text_186A22:: @ 8186A22 + .string "Want to play with my POKéMON?$" + +Text_186A40:: @ 8186A40 + .string "I was too impatient!$" + +Text_186A55:: @ 8186A55 + .string "I'll go train with weaker people.$" + +gUnknown_8186A77:: @ 8186A77 + .string "ROUTE 15\n" + .string "West to FUCHSIA CITY$" + diff --git a/data/maps/Route15_WestEntrance_1F/text.inc b/data/maps/Route15_WestEntrance_1F/text.inc new file mode 100644 index 000000000..e843e10a8 --- /dev/null +++ b/data/maps/Route15_WestEntrance_1F/text.inc @@ -0,0 +1,5 @@ +gUnknown_819F560:: @ 819F560 + .string "Are you the kid who's working on\n" + .string "a POKéDEX?\p" + .string "PROF. OAK's AIDE came by here.$" + diff --git a/data/maps/Route15_WestEntrance_2F/text.inc b/data/maps/Route15_WestEntrance_2F/text.inc new file mode 100644 index 000000000..e5518b8e2 --- /dev/null +++ b/data/maps/Route15_WestEntrance_2F/text.inc @@ -0,0 +1,41 @@ +gUnknown_819F5AB:: @ 819F5AB + .string "Hi! Remember me?\n" + .string "I'm one of PROF. OAK's AIDES.\p" + .string "If your POKéDEX has complete data\n" + .string "on {STR_VAR_1} species, I'm supposed to\l" + .string "give you a reward.\p" + .string "PROF. OAK entrusted me with the\n" + .string "{STR_VAR_2} for you.\p" + .string "So, {PLAYER}, let me ask you.\p" + .string "Have you gathered data on at least\n" + .string "{STR_VAR_1} kinds of POKéMON?$" + +gUnknown_819F6AA:: @ 819F6AA + .string "Great! You have caught or owned\n" + .string "{STR_VAR_3} kinds of POKéMON!\p" + .string "Congratulations!\n" + .string "Here you go!$" + +gUnknown_819F6FD:: @ 819F6FD + .string "{PLAYER} received the {STR_VAR_2}\n" + .string "from the AIDE.$" + +gUnknown_819F71F:: @ 819F71F + .string "EXP. SHARE is an item to be held\n" + .string "by a POKéMON.\p" + .string "The POKéMON will receive a share\n" + .string "of the EXP. Points without having\l" + .string "to battle.$" + +gUnknown_819F79C:: @ 819F79C + .string "Let's see what the binoculars have\n" + .string "to show…\p" + .string "A large, shining bird is flying\n" + .string "toward the sea.$" + +gUnknown_819F7F8:: @ 819F7F8 + .string "Let's see what the binoculars have\n" + .string "to show…\p" + .string "It looks like a small island on\n" + .string "the horizon!$" + diff --git a/data/maps/Route16/text.inc b/data/maps/Route16/text.inc new file mode 100644 index 000000000..1945cf510 --- /dev/null +++ b/data/maps/Route16/text.inc @@ -0,0 +1,113 @@ +Text_186A95:: @ 8186A95 + .string "MYA: You're perfect.\n" + .string "Help me train my little brother?$" + +Text_186ACB:: @ 8186ACB + .string "MYA: RON, you have to focus!\n" + .string "Concentrate on what you're doing!$" + +Text_186B0A:: @ 8186B0A + .string "MYA: Okay, we'll turn it up.\n" + .string "I'll add to our training menu!$" + +Text_186B46:: @ 8186B46 + .string "MYA: Do you want to challenge us?\n" + .string "You'll need two POKéMON, though.$" + +Text_186B89:: @ 8186B89 + .string "RON: My sister gets scary when we\n" + .string "lose.$" + +Text_186BB1:: @ 8186BB1 + .string "RON: Oh, no, no…\n" + .string "Sis, I'm sorry!$" + +Text_186BD2:: @ 8186BD2 + .string "RON: Oh, bleah…\n" + .string "I wish I had a nice sister…$" + +Text_186BFE:: @ 8186BFE + .string "RON: Did you want to battle with\n" + .string "my sister and me?\p" + .string "You need two POKéMON, then.$" + +Text_186C4D:: @ 8186C4D + .string "What do you want?$" + +Text_186C5F:: @ 8186C5F + .string "Don't you dare laugh!$" + +Text_186C75:: @ 8186C75 + .string "We like just hanging here.\n" + .string "What's it to you?$" + +Text_186CA2:: @ 8186CA2 + .string "Nice BIKE!\n" + .string "Hand it over!$" + +Text_186CBB:: @ 8186CBB + .string "Knockout!$" + +Text_186CC5:: @ 8186CC5 + .string "Forget it, who needs your BIKE!$" + +Text_186CE5:: @ 8186CE5 + .string "Come out and play, little mouse!$" + +Text_186D06:: @ 8186D06 + .string "You little rat!$" + +Text_186D16:: @ 8186D16 + .string "I hate losing!\n" + .string "Get out of my face!$" + +Text_186D39:: @ 8186D39 + .string "Hey, you just bumped me!$" + +Text_186D52:: @ 8186D52 + .string "Kaboom!$" + +Text_186D5A:: @ 8186D5A + .string "We'll always be hanging around here\n" + .string "even if you don't like it.\p" + .string "You can detour to VERMILION from\n" + .string "FUCHSIA going along the coast.$" + +Text_186DD9:: @ 8186DD9 + .string "I'm feeling hungry and mean!\n" + .string "I need a punching bag!$" + +Text_186E0D:: @ 8186E0D + .string "Bad, bad, bad!$" + +Text_186E1C:: @ 8186E1C + .string "If I'm going to have POKéMON, they\n" + .string "may as well be ferocious.\p" + .string "I'd use them to leave my enemies\n" + .string "in tatters.$" + +Text_186E86:: @ 8186E86 + .string "Hey, there!\n" + .string "Let's have ourselves a good time!$" + +Text_186EB4:: @ 8186EB4 + .string "Don't make me mad!$" + +Text_186EC7:: @ 8186EC7 + .string "I get my kicks by harassing people\n" + .string "with my stinking POKéMON.\p" + .string "They're great for startling people.\n" + .string "And, they bite, too.$" + +gUnknown_8186F3D:: @ 8186F3D + .string "A POKéMON is sprawled out in\n" + .string "a deep and comfortable slumber.$" + +gUnknown_8186F7A:: @ 8186F7A + .string "Enjoy the slope!\n" + .string "CYCLING ROAD$" + +gUnknown_8186F98:: @ 8186F98 + .string "ROUTE 16\n" + .string "CELADON CITY - FUCHSIA CITY$" + diff --git a/data/maps/Route16_House/text.inc b/data/maps/Route16_House/text.inc new file mode 100644 index 000000000..136cf9604 --- /dev/null +++ b/data/maps/Route16_House/text.inc @@ -0,0 +1,21 @@ +gUnknown_819F851:: @ 819F851 + .string "Oh, dear.\n" + .string "You've found my secret retreat.\p" + .string "Please don't tell anyone I'm here.\n" + .string "I'll make it up to you with this!$" + +gUnknown_819F8C0:: @ 819F8C0 + .string "{PLAYER} received HM02\n" + .string "from the girl.$" + +gUnknown_819F8E0:: @ 819F8E0 + .string "HM02 is FLY.\n" + .string "It's a wonderfully convenient move.\p" + .string "Please, put it to good use.$" + +gUnknown_819F92D:: @ 819F92D + .string "You don't have any room for this.$" + +gUnknown_819F94F:: @ 819F94F + .string "FEAROW: Kyueen!$" + diff --git a/data/maps/Route16_NorthEntrance_1F/text.inc b/data/maps/Route16_NorthEntrance_1F/text.inc new file mode 100644 index 000000000..8cc60117c --- /dev/null +++ b/data/maps/Route16_NorthEntrance_1F/text.inc @@ -0,0 +1,16 @@ +gUnknown_819F95F:: @ 819F95F + .string "No pedestrians are allowed on\n" + .string "CYCLING ROAD!$" + +gUnknown_819F98B:: @ 819F98B + .string "CYCLING ROAD is a downhill course\n" + .string "by the sea. It's a great ride.$" + +gUnknown_819F9CC:: @ 819F9CC + .string "Excuse me!\n" + .string "Wait up, please!$" + +gUnknown_819F9E8:: @ 819F9E8 + .string "How'd you get in?\n" + .string "Good effort!$" + diff --git a/data/maps/Route16_NorthEntrance_2F/text.inc b/data/maps/Route16_NorthEntrance_2F/text.inc new file mode 100644 index 000000000..4839bfe8a --- /dev/null +++ b/data/maps/Route16_NorthEntrance_2F/text.inc @@ -0,0 +1,47 @@ +gUnknown_819FA07:: @ 819FA07 + .string "I'm on a relaxing ride on my new\n" + .string "bike with my girlfriend.$" + +gUnknown_819FA41:: @ 819FA41 + .string "We're going riding together on our\n" + .string "new bikes.$" + +gUnknown_819FA6F:: @ 819FA6F + .string "Let's see what the binoculars have\n" + .string "to show…\p" + .string "It's the CELADON DEPT. STORE!$" + +gUnknown_819FAB9:: @ 819FAB9 + .string "Let's see what the binoculars have\n" + .string "to show…\p" + .string "There's a long path over water far\n" + .string "away.$" + +gUnknown_819FB0E:: @ 819FB0E + .string "Hi! Remember me?\n" + .string "I'm one of PROF. OAK's AIDES.\p" + .string "If your POKéDEX has complete data\n" + .string "on 40 species, I'm supposed to\l" + .string "give you a reward.\p" + .string "PROF. OAK entrusted me with an\n" + .string "AMULET COIN for you.\p" + .string "So, {PLAYER}, let me ask you.\p" + .string "Have you gathered data on at least\n" + .string "40 kinds of POKéMON?$" + +gUnknown_819FC15:: @ 819FC15 + .string "Great! You have caught or owned\n" + .string "{STR_VAR_3} kinds of POKéMON!\p" + .string "Congratulations!\n" + .string "Here you go!$" + +gUnknown_819FC68:: @ 819FC68 + .string "{PLAYER} received the AMULET COIN\n" + .string "from the AIDE.$" + +gUnknown_819FC93:: @ 819FC93 + .string "An AMULET COIN is an item to be\n" + .string "held by a POKéMON.\p" + .string "If the POKéMON appears in a winning\n" + .string "battle, you will earn more money.$" + diff --git a/data/maps/Route17/text.inc b/data/maps/Route17/text.inc new file mode 100644 index 000000000..6627d5cd0 --- /dev/null +++ b/data/maps/Route17/text.inc @@ -0,0 +1,165 @@ +Text_186FBD:: @ 8186FBD + .string "JED: Our love knows no bounds.\n" + .string "We're in love and we show it!$" + +Text_186FFA:: @ 8186FFA + .string "JED: Oh, no!\n" + .string "My love has seen me as a loser!$" + +Text_187027:: @ 8187027 + .string "JED: Listen, LEA.\n" + .string "You need to focus less on me.$" + +Text_187057:: @ 8187057 + .string "JED: You have just one POKéMON?\n" + .string "Is there no love in your heart?$" + +Text_187097:: @ 8187097 + .string "LEA: Sometimes, the intensity of\n" + .string "our love scares me.$" + +Text_1870CC:: @ 81870CC + .string "LEA: Ohh! But JED looks cool\n" + .string "even in a loss!$" + +Text_1870F9:: @ 81870F9 + .string "LEA: Ehehe, I'm sorry.\n" + .string "JED is so cool.$" + +Text_187120:: @ 8187120 + .string "LEA: Oh, you don't have two\n" + .string "POKéMON with you?\p" + .string "Doesn't it feel lonely for you or\n" + .string "your POKéMON?$" + +Text_18717E:: @ 818717E + .string "There's no getting rich quick in\n" + .string "battling kids.$" + +Text_1871AE:: @ 81871AE + .string "Burned out!$" + +Text_1871BA:: @ 81871BA + .string "You can find good stuff lying\n" + .string "around on CYCLING ROAD.\p" + .string "There's good money in picking them\n" + .string "up and selling them.$" + +Text_187228:: @ 8187228 + .string "I'm mighty proud of my bod, kiddo.\n" + .string "Come on!$" + +Text_187254:: @ 8187254 + .string "Whoo!$" + +Text_18725A:: @ 818725A + .string "I could belly-bump you outta\n" + .string "here!$" + +Text_18727D:: @ 818727D + .string "You heading to FUCHSIA?$" + +Text_187295:: @ 8187295 + .string "Crash and burn!$" + +Text_1872A5:: @ 81872A5 + .string "I love racing downhill!$" + +Text_1872BD:: @ 81872BD + .string "We're BIKERS!\n" + .string "We rule the roads, man!$" + +Text_1872E3:: @ 81872E3 + .string "Smoked!$" + +Text_1872EB:: @ 81872EB + .string "Are you looking for adventure?$" + +Text_18730A:: @ 818730A + .string "Let VOLTORB electrify you!$" + +Text_187325:: @ 8187325 + .string "Grounded out!$" + +Text_187333:: @ 8187333 + .string "I got my VOLTORB at the abandoned\n" + .string "POWER PLANT.$" + +Text_187362:: @ 8187362 + .string "I leveled up my POKéMON, but it\n" + .string "won't evolve. Why?$" + +Text_187395:: @ 8187395 + .string "Why, you!$" + +Text_18739F:: @ 818739F + .string "Maybe some POKéMON need element\n" + .string "STONES to evolve.$" + +Text_1873D1:: @ 81873D1 + .string "I need a little exercise!$" + +Text_1873EB:: @ 81873EB + .string "Whew!\n" + .string "Good workout!$" + +Text_1873FF:: @ 81873FF + .string "I'm sure I lost weight there!$" + +Text_18741D:: @ 818741D + .string "Be a rebel!$" + +Text_187429:: @ 8187429 + .string "Aaaargh!$" + +Text_187432:: @ 8187432 + .string "Be ready to fight for your beliefs!$" + +Text_187456:: @ 8187456 + .string "Nice BIKE!\n" + .string "How's it handle?$" + +Text_187472:: @ 8187472 + .string "Shoot!$" + +Text_187479:: @ 8187479 + .string "The slope makes it hard to steer.$" + +Text_18749B:: @ 818749B + .string "Get lost, kid!\n" + .string "I'm bushed!$" + +Text_1874B6:: @ 81874B6 + .string "Are you satisfied?$" + +Text_1874C9:: @ 81874C9 + .string "I need to catch a few z's!$" + +gUnknown_81874E4:: @ 81874E4 + .string "It's a notice.\p" + .string "Watch out for discarded items.$" + +gUnknown_8187512:: @ 8187512 + .string "TRAINER TIPS\p" + .string "All POKéMON are unique.\p" + .string "Even POKéMON of the same species\n" + .string "and level grow at different rates.$" + +gUnknown_818757B:: @ 818757B + .string "TRAINER TIPS\p" + .string "Press the B Button to stay in place\n" + .string "while on a slope.$" + +gUnknown_81875BE:: @ 81875BE + .string "ROUTE 17\n" + .string "CELADON CITY - FUCHSIA CITY$" + +gUnknown_81875E3:: @ 81875E3 + .string "It's a notice!\p" + .string "Don't throw the game, throw POKé\n" + .string "BALLS instead!$" + +gUnknown_8187622:: @ 8187622 + .string "CYCLING ROAD\n" + .string "Slope ends here!$" + diff --git a/data/maps/Route18/text.inc b/data/maps/Route18/text.inc new file mode 100644 index 000000000..c22a6360a --- /dev/null +++ b/data/maps/Route18/text.inc @@ -0,0 +1,40 @@ +Text_187640:: @ 8187640 + .string "I always check every grassy area\n" + .string "for new POKéMON.$" + +Text_187672:: @ 8187672 + .string "Tch!$" + +Text_187677:: @ 8187677 + .string "I wish I had a BIKE!$" + +Text_18768C:: @ 818768C + .string "Kurukkoo!\n" + .string "How do you like my birdcall?$" + +Text_1876B3:: @ 81876B3 + .string "I had to bug you!$" + +Text_1876C5:: @ 81876C5 + .string "I collect sea POKéMON on weekends\n" + .string "because the sea is so close.$" + +Text_187704:: @ 8187704 + .string "This is my turf!\n" + .string "Get out of here!$" + +Text_187726:: @ 8187726 + .string "Darn!$" + +Text_18772C:: @ 818772C + .string "This is my fave area for catching\n" + .string "POKéMON.$" + +gUnknown_8187757:: @ 8187757 + .string "ROUTE 18\n" + .string "CELADON CITY - FUCHSIA CITY$" + +gUnknown_818777C:: @ 818777C + .string "CYCLING ROAD\n" + .string "No pedestrians permitted!$" + diff --git a/data/maps/Route18_EastEntrance_1F/text.inc b/data/maps/Route18_EastEntrance_1F/text.inc new file mode 100644 index 000000000..5de293cba --- /dev/null +++ b/data/maps/Route18_EastEntrance_1F/text.inc @@ -0,0 +1,11 @@ +gUnknown_819FD0C:: @ 819FD0C + .string "You need a BICYCLE to go out on\n" + .string "CYCLING ROAD!$" + +gUnknown_819FD3A:: @ 819FD3A + .string "CYCLING ROAD is all uphill from\n" + .string "here.$" + +gUnknown_819FD60:: @ 819FD60 + .string "Excuse me!$" + diff --git a/data/maps/Route18_EastEntrance_2F/text.inc b/data/maps/Route18_EastEntrance_2F/text.inc new file mode 100644 index 000000000..8a479371c --- /dev/null +++ b/data/maps/Route18_EastEntrance_2F/text.inc @@ -0,0 +1,10 @@ +gUnknown_819FD6B:: @ 819FD6B + .string "Let's see what the binoculars have\n" + .string "to show…\p" + .string "PALLET TOWN is in the west.$" + +gUnknown_819FDB3:: @ 819FDB3 + .string "Let's see what the binoculars have\n" + .string "to show…\p" + .string "There are people swimming.$" + diff --git a/data/maps/Route19/text.inc b/data/maps/Route19/text.inc new file mode 100644 index 000000000..a76ff89d7 --- /dev/null +++ b/data/maps/Route19/text.inc @@ -0,0 +1,119 @@ +Text_1877A3:: @ 81877A3 + .string "I have to exercise and warm up\n" + .string "before going out for a swim.$" + +Text_1877DF:: @ 81877DF + .string "All warmed up!$" + +Text_1877EE:: @ 81877EE + .string "Thanks, kid!\n" + .string "I'm ready for a swim.$" + +Text_187811:: @ 8187811 + .string "Wait! Slow down!\n" + .string "You'll have a heart attack!$" + +Text_18783E:: @ 818783E + .string "Ooh!\n" + .string "That's chilly!$" + +Text_187852:: @ 8187852 + .string "Watch out for TENTACOOL.\n" + .string "They sting so painfully.$" + +Text_187884:: @ 8187884 + .string "I love swimming!\n" + .string "What about you?$" + +Text_1878A5:: @ 81878A5 + .string "Belly flop!$" + +Text_1878B1:: @ 81878B1 + .string "I can beat even marine POKéMON\n" + .string "at swimming.$" + +Text_1878DD:: @ 81878DD + .string "What's beyond the horizon?$" + +Text_1878F8:: @ 81878F8 + .string "Glub!$" + +Text_1878FE:: @ 81878FE + .string "I see a couple of islands over\n" + .string "yonder!$" + +Text_187925:: @ 8187925 + .string "I tried diving for POKéMON, but it\n" + .string "was a no-go.$" + +Text_187955:: @ 8187955 + .string "Help!$" + +Text_18795B:: @ 818795B + .string "I guess you have to fish for sea\n" + .string "POKéMON.$" + +Text_187985:: @ 8187985 + .string "I look at the sea to forget all\n" + .string "the bad things that happened.$" + +Text_1879C3:: @ 81879C3 + .string "Ooh!\n" + .string "Traumatic!$" + +Text_1879D3:: @ 81879D3 + .string "I'm looking at the sea to forget\n" + .string "the bad thing that happened!$" + +Text_187A11:: @ 8187A11 + .string "Oh, I just love your ride!\n" + .string "Can I have it if I win?$" + +Text_187A44:: @ 8187A44 + .string "Oh! I lost!$" + +Text_187A50:: @ 8187A50 + .string "It's still a long way to go to\n" + .string "SEAFOAM ISLANDS…\p" + .string "I want to go back to FUCHSIA…$" + +Text_187A9E:: @ 8187A9E + .string "Swimming's great!\n" + .string "Sunburns aren't!$" + +Text_187AC1:: @ 8187AC1 + .string "Shocker!$" + +Text_187ACA:: @ 8187ACA + .string "My boyfriend wanted to swim to\n" + .string "SEAFOAM ISLANDS.$" + +Text_187AFA:: @ 8187AFA + .string "Ahoy, there!\n" + .string "These waters are treacherous!$" + +Text_187B25:: @ 8187B25 + .string "Ooh!\n" + .string "Dangerous!$" + +Text_187B35:: @ 8187B35 + .string "M-my legs! They cramped up!\n" + .string "Glub, glub…$" + +Text_187B5D:: @ 8187B5D + .string "I swam here with my friends…\n" + .string "I'm tired…$" + +Text_187B85:: @ 8187B85 + .string "I'm exhausted…$" + +Text_187B94:: @ 8187B94 + .string "If I were to ride a POKéMON on\n" + .string "the sea, I'd like a LAPRAS.\p" + .string "LAPRAS is so big, I bet it\n" + .string "would keep me dry on water.$" + +gUnknown_8187C06:: @ 8187C06 + .string "SEA ROUTE 19\n" + .string "FUCHSIA CITY - SEAFOAM ISLANDS$" + diff --git a/data/maps/Route2/text.inc b/data/maps/Route2/text.inc new file mode 100644 index 000000000..4197b7071 --- /dev/null +++ b/data/maps/Route2/text.inc @@ -0,0 +1,7 @@ +gUnknown_818345E:: @ 818345E + .string "ROUTE 2\n" + .string "VIRIDIAN CITY - PEWTER CITY$" + +gUnknown_8183482:: @ 8183482 + .string "DIGLETT'S CAVE$" + diff --git a/data/maps/Route20/text.inc b/data/maps/Route20/text.inc new file mode 100644 index 000000000..070575cc7 --- /dev/null +++ b/data/maps/Route20/text.inc @@ -0,0 +1,151 @@ +Text_187C32:: @ 8187C32 + .string "LIA: I'm looking after my brother.\n" + .string "He just became a TRAINER.$" + +Text_187C6F:: @ 8187C6F + .string "LIA: That's no way to treat my\n" + .string "little brother!$" + +Text_187C9E:: @ 8187C9E + .string "LIA: Do you have a younger\n" + .string "brother?\p" + .string "I hope you're teaching him all\n" + .string "sorts of things.$" + +Text_187CF2:: @ 8187CF2 + .string "LIA: I want to battle together\n" + .string "with my little brother.\p" + .string "Don't you have two POKéMON?$" + +Text_187D45:: @ 8187D45 + .string "LUC: My big sis taught me how\n" + .string "to swim and train POKéMON.$" + +Text_187D7E:: @ 8187D7E + .string "LUC: Oh, wow!\n" + .string "Someone tougher than my big sis!$" + +Text_187DAD:: @ 8187DAD + .string "LUC: My big sis is strong and nice.\n" + .string "I think she's awesome!$" + +Text_187DE8:: @ 8187DE8 + .string "LUC: I don't want to if I can't\n" + .string "battle you with my big sis.\p" + .string "Don't you have two POKéMON?$" + +Text_187E40:: @ 8187E40 + .string "The water is shallow here.\n" + .string "There are many people swimming.$" + +Text_187E7B:: @ 8187E7B + .string "Splash!$" + +Text_187E83:: @ 8187E83 + .string "I wish I could ride my POKéMON.\n" + .string "I bet you're not tired.$" + +Text_187EBB:: @ 8187EBB + .string "SEAFOAM is a quiet getaway.\n" + .string "I'm vacationing here.$" + +Text_187EED:: @ 8187EED + .string "Quit it!$" + +Text_187EF6:: @ 8187EF6 + .string "There's a huge cavern underneath\n" + .string "this island.$" + +Text_187F24:: @ 8187F24 + .string "I love floating with the fishes\n" + .string "here among the waves.$" + +Text_187F5A:: @ 8187F5A + .string "Yowch!$" + +Text_187F61:: @ 8187F61 + .string "Want to float with me?$" + +Text_187F78:: @ 8187F78 + .string "Are you on vacation, too?$" + +Text_187F92:: @ 8187F92 + .string "No mercy at all!$" + +Text_187FA3:: @ 8187FA3 + .string "SEAFOAM used to be a single island\n" + .string "in the distant past.$" + +Text_187FDB:: @ 8187FDB + .string "Check out my buff physique!$" + +Text_187FF7:: @ 8187FF7 + .string "Wimpy!$" + +Text_187FFE:: @ 8187FFE + .string "I should've been buffing up my\n" + .string "POKéMON, not me!$" + +Text_18802E:: @ 818802E + .string "Why are you riding a POKéMON?\n" + .string "Can't you swim?$" + +Text_18805C:: @ 818805C + .string "Ouch!\n" + .string "Torpedoed!$" + +Text_18806D:: @ 818806D + .string "Riding a POKéMON sure looks fun!$" + +Text_18808E:: @ 818808E + .string "I rode my bird POKéMON here.$" + +Text_1880AB:: @ 81880AB + .string "Oh, no!\n" + .string "Now what am I to do?$" + +Text_1880C8:: @ 81880C8 + .string "My birds are exhausted.\n" + .string "They can't FLY me back!$" + +Text_1880F8:: @ 81880F8 + .string "My boyfriend gave me big pearls.$" + +Text_188119:: @ 8188119 + .string "Oh, no!\n" + .string "My pearls were in them!$" + +Text_188139:: @ 8188139 + .string "Will my pearls grow bigger inside\n" + .string "CLOYSTER?$" + +Text_188165:: @ 8188165 + .string "I swam here from CINNABAR ISLAND.\n" + .string "It wasn't easy, I tell you.$" + +Text_1881A3:: @ 81881A3 + .string "I'm so disappointed!$" + +Text_1881B8:: @ 81881B8 + .string "POKéMON have taken over an\n" + .string "abandoned mansion on CINNABAR.\p" + .string "They call it the POKéMON MANSION\n" + .string "now.$" + +Text_188218:: @ 8188218 + .string "CINNABAR, in the west, has a LAB\n" + .string "for POKéMON.\p" + .string "My daddy works there.$" + +Text_18825C:: @ 818825C + .string "Wait!\n" + .string "You're supposed to wait!$" + +Text_18827B:: @ 818827B + .string "CINNABAR is a volcanic island.\p" + .string "I heard it rose out of the sea\n" + .string "when a volcano erupted.$" + +gUnknown_81882D1:: @ 81882D1 + .string "SEAFOAM ISLANDS$" + diff --git a/data/maps/Route22/text.inc b/data/maps/Route22/text.inc new file mode 100644 index 000000000..7bfe6931b --- /dev/null +++ b/data/maps/Route22/text.inc @@ -0,0 +1,201 @@ +Text_1882E1:: @ 81882E1 + .string "Strong TRAINERS and WATER POKéMON\n" + .string "are common sights in these parts.\p" + .string "They say that MISTY of the\n" + .string "CERULEAN GYM trains here.$" + +Text_18835A:: @ 818835A + .string "You want to know if the fish are\n" + .string "biting?$" + +Text_188383:: @ 8188383 + .string "Dang!$" + +Text_188389:: @ 8188389 + .string "I can't catch anything good.\n" + .string "Not one good POKéMON to be had!$" + +Text_1883C6:: @ 81883C6 + .string "I got a big haul!\n" + .string "Wanna go for it?$" + +Text_1883E9:: @ 81883E9 + .string "Heheh, MAGIKARP just don't make\n" + .string "the grade, do they?$" + +Text_18841D:: @ 818841D + .string "I seem to only catch MAGIKARP!$" + +Text_18843C:: @ 818843C + .string "The sea cleanses my body and soul!$" + +Text_18845F:: @ 818845F + .string "Ayah!$" + +Text_188465:: @ 8188465 + .string "The sea is great and all, but I\n" + .string "like the mountains, too.$" + +Text_18849E:: @ 818849E + .string "おれだって　たまには\n" + .string "およぎに　くるぜ！$" + +Text_1884B3:: @ 81884B3 + .string "ぐわわ！$" + +Text_1884B8:: @ 81884B8 + .string "うきやすそう　だと？\n" + .string "うるせー　おおきな　おせわだッ！$" + +Text_1884D4:: @ 81884D4 + .string "I caught my POKéMON at sea.$" + +Text_1884F0:: @ 81884F0 + .string "Diver!!\n" + .string "Down!!$" + +Text_1884FF:: @ 81884FF + .string "Where'd you catch your POKéMON?$" + +Text_18851F:: @ 818851F + .string "Right now, I'm in a triathlon meet.$" + +Text_188543:: @ 8188543 + .string "Pant…\n" + .string "Pant… Pant…$" + +Text_188555:: @ 8188555 + .string "I'm beat! But, I still have the\n" + .string "bike race and marathon left!$" + +Text_188592:: @ 8188592 + .string "Ahh!\n" + .string "Feel the sun and the wind!$" + +Text_1885B2:: @ 81885B2 + .string "Yow!\n" + .string "I lost!$" + +Text_1885BF:: @ 81885BF + .string "I'm sunburnt to a crisp!$" + +Text_1885D8:: @ 81885D8 + .string "Hey, don't scare away the fish!$" + +Text_1885F8:: @ 81885F8 + .string "Sorry! I'm just so frustrated from\n" + .string "not catching anything.$" + +Text_188632:: @ 8188632 + .string "Sheesh, I haven't caught a thing.\n" + .string "Could this place actually be a\l" + .string "giant pool or something?$" + +Text_18868C:: @ 818868C + .string "Keep me company till I get a hit.$" + +Text_1886AE:: @ 81886AE + .string "That burned some time.$" + +Text_1886C5:: @ 81886C5 + .string "Oh wait!\n" + .string "I got a bite! Yeah!$" + +Text_1886E2:: @ 81886E2 + .string "LIL: Huh? A battle?\n" + .string "IAN, can't you do it alone?$" + +Text_188712:: @ 8188712 + .string "LIL: Oh, see?\n" + .string "We lost. Happy now?$" + +Text_188734:: @ 8188734 + .string "LIL: I'm tired.\n" + .string "Can't we go home already?$" + +Text_18875E:: @ 818875E + .string "LIL: Huh? A battle?\n" + .string "I can't be bothered to do it alone.\l" + .string "Bring two POKéMON, won't you?$" + +Text_1887B4:: @ 81887B4 + .string "IAN: My sis doesn't get enough\n" + .string "exercise, so I made her come.$" + +Text_1887F1:: @ 81887F1 + .string "IAN: Awww, Sis!\n" + .string "Get it together!$" + +Text_188812:: @ 8188812 + .string "IAN: Come on, Sis!\p" + .string "You're not going to lose weight\n" + .string "like this!$" + +Text_188850:: @ 8188850 + .string "IAN: We want a two-on-two battle.\n" + .string "So can you bring two POKéMON?$" + +gUnknown_8188890:: @ 8188890 + .string "{RIVAL}: Hey! {PLAYER}!\p" + .string "You're off to the POKéMON LEAGUE?\n" + .string "Forget about it!\p" + .string "You probably don't have any\n" + .string "BADGES, do you?\p" + .string "The guard won't let you through\n" + .string "without them.\p" + .string "By the way, did your POKéMON get\n" + .string "any stronger?$" + +Text_188959:: @ 8188959 + .string "Awww!\n" + .string "You just lucked out!$" + +gUnknown_8188974:: @ 8188974 + .string "I heard the POKéMON LEAGUE is\n" + .string "crawling with tough TRAINERS.\p" + .string "I have to figure out how to get\n" + .string "past them.\p" + .string "You should quit dawdling and get a\n" + .string "move on!$" + +Text_188A07:: @ 8188A07 + .string "{RIVAL}“なんだ？\n" + .string "ポケモン　2ひきも\l" + .string "もってるの　なぜか　だって？\p" + .string "おまえも\n" + .string "つかまえれば　いい　じゃん！$" + +gUnknown_8188A3C:: @ 8188A3C + .string "{RIVAL}: What? {PLAYER}!\n" + .string "What a surprise to see you here!\p" + .string "So you're going to the POKéMON\n" + .string "LEAGUE?\p" + .string "You collected all the BADGES, too?\n" + .string "That's cool!\p" + .string "Then I'll whip you, {PLAYER}, as a\n" + .string "warm-up for the POKéMON LEAGUE!\p" + .string "Come on!$" + +Text_188B08:: @ 8188B08 + .string "What!?\p" + .string "I was just careless, you!$" + +gUnknown_8188B29:: @ 8188B29 + .string "That loosened me up.\n" + .string "I'm ready for the POKéMON LEAGUE!\p" + .string "{PLAYER}, you need more practice.\p" + .string "But hey, you know that!\n" + .string "I'm out of here. Smell ya!$" + +Text_188BAF:: @ 8188BAF + .string "{RIVAL}“ひゃははッ　{PLAYER}ー！\n" + .string "それで　がんばってるのかよ！\l" + .string "おれの　さいのうに　くらべりゃ\l" + .string "{PLAYER}は　まだまだ　だな！\p" + .string "もっと　れんしゅう　こいよ！\n" + .string "あははーッ！$" + +gUnknown_8188BFF:: @ 8188BFF + .string "POKéMON LEAGUE\n" + .string "Front Gate$" + diff --git a/data/maps/Route23/text.inc b/data/maps/Route23/text.inc new file mode 100644 index 000000000..6bdcaf47d --- /dev/null +++ b/data/maps/Route23/text.inc @@ -0,0 +1,4 @@ +gUnknown_8188C19:: @ 8188C19 + .string "VICTORY ROAD GATE -\n" + .string "POKéMON LEAGUE$" + diff --git a/data/maps/Route24/text.inc b/data/maps/Route24/text.inc new file mode 100644 index 000000000..04ef64ea5 --- /dev/null +++ b/data/maps/Route24/text.inc @@ -0,0 +1,35 @@ +gUnknown_8188C3C:: @ 8188C3C + .string "Congratulations! You beat our\n" + .string "five contest TRAINERS!\p" + .string "You just earned a fabulous prize!$" + +gUnknown_8188C93:: @ 8188C93 + .string "{PLAYER} received a NUGGET\n" + .string "from the mystery TRAINER!$" + +gUnknown_8188CC2:: @ 8188CC2 + .string "You don't have any room!$" + +Text_188CDB:: @ 8188CDB + .string "By the way, how would you like to\n" + .string "join TEAM ROCKET?\p" + .string "We're a group of professional\n" + .string "criminals specializing in POKéMON!\p" + .string "Want to join?\p" + .string "Are you sure?\p" + .string "Come on, join us!\p" + .string "I'm telling you to join!\p" + .string "…Okay, you need convincing!\p" + .string "I'll make you an offer you can't\n" + .string "refuse!$" + +Text_188DDC:: @ 8188DDC + .string "Arrgh!\n" + .string "You are good!$" + +gUnknown_8188DF1:: @ 8188DF1 + .string "With your ability, you'd become\n" + .string "a top leader in TEAM ROCKET.\p" + .string "Come on, think of the opportunity!\n" + .string "Don't let this chance go to waste.$" + diff --git a/data/maps/Route25/text.inc b/data/maps/Route25/text.inc new file mode 100644 index 000000000..cdc124108 --- /dev/null +++ b/data/maps/Route25/text.inc @@ -0,0 +1,185 @@ +Text_188E74:: @ 8188E74 + .string "I saw your feat from the grass!$" + +Text_188E94:: @ 8188E94 + .string "I thought not!$" + +Text_188EA3:: @ 8188EA3 + .string "I hid because the people on the\n" + .string "bridge frightened me.$" + +Text_188ED9:: @ 8188ED9 + .string "Okay! I'm No. 5!\n" + .string "I'll stomp you!$" + +Text_188EFA:: @ 8188EFA + .string "Whoa!\n" + .string "Too much!$" + +Text_188F0A:: @ 8188F0A + .string "I did my best. I have no regrets!$" + +Text_188F2C:: @ 8188F2C + .string "I'm No. 4!\n" + .string "Getting tired?$" + +Text_188F46:: @ 8188F46 + .string "I lost, too!$" + +Text_188F53:: @ 8188F53 + .string "I did my best, so I've no regrets!$" + +Text_188F76:: @ 8188F76 + .string "Here's No. 3!\n" + .string "I won't be easy!$" + +Text_188F95:: @ 8188F95 + .string "Ow!\n" + .string "Stomped flat!$" + +Text_188FA7:: @ 8188FA7 + .string "I did my best. I have no regrets!$" + +Text_188FC9:: @ 8188FC9 + .string "I'm second!\n" + .string "Now it's serious!$" + +Text_188FE7:: @ 8188FE7 + .string "How could I lose?$" + +Text_188FF9:: @ 8188FF9 + .string "I did my best. I have no regrets!$" + +Text_18901B:: @ 818901B + .string "People call this the NUGGET\n" + .string "BRIDGE!\p" + .string "Beat us five TRAINERS and win\n" + .string "a fabulous prize!\p" + .string "Think you got what it takes?$" + +Text_18908C:: @ 818908C + .string "Whoo!\n" + .string "Good stuff!$" + +Text_18909E:: @ 818909E + .string "I did my best. I have no regrets!$" + +Text_1890C0:: @ 81890C0 + .string "Local TRAINERS come here to\n" + .string "practice.$" + +Text_1890E6:: @ 81890E6 + .string "You're decent.$" + +Text_1890F5:: @ 81890F5 + .string "All POKéMON have weaknesses.\n" + .string "Even the strongest ones.\p" + .string "That's why it's best to raise\n" + .string "POKéMON of different types.$" + +Text_189165:: @ 8189165 + .string "Dad took me to a great party on\n" + .string "the S.S. ANNE at VERMILION CITY.$" + +Text_1891A6:: @ 81891A6 + .string "I'm not mad!$" + +Text_1891B3:: @ 81891B3 + .string "On the S.S. ANNE, I saw TRAINERS\n" + .string "from around the world.$" + +Text_1891EB:: @ 81891EB + .string "I'm a cool guy.\n" + .string "I've got a girlfriend!$" + +Text_189212:: @ 8189212 + .string "Aww, darn…$" + +Text_18921D:: @ 818921D + .string "Oh, well.\n" + .string "My girlfriend will cheer me up.$" + +Text_189247:: @ 8189247 + .string "Hi!\n" + .string "My boyfriend is cool!$" + +Text_189261:: @ 8189261 + .string "My conditioning isn't the best…$" + +Text_189281:: @ 8189281 + .string "I wish my boyfriend was as good\n" + .string "as you.$" + +Text_1892A9:: @ 81892A9 + .string "I had this feeling…\n" + .string "I knew I had to battle you!$" + +Text_1892D9:: @ 81892D9 + .string "I knew I'd lose, too!$" + +Text_1892EF:: @ 81892EF + .string "If your POKéMON gets confused,\n" + .string "switch it out.\p" + .string "That's a good tactic.$" + +Text_189333:: @ 8189333 + .string "My friend has many cute POKéMON.\n" + .string "I'm so jealous!$" + +Text_189364:: @ 8189364 + .string "I'm not so jealous!$" + +Text_189378:: @ 8189378 + .string "You came from MT. MOON?\n" + .string "May I have a CLEFAIRY?$" + +Text_1893A7:: @ 81893A7 + .string "I just got down from MT. MOON,\n" + .string "but I've still got gas in the tank!$" + +Text_1893EA:: @ 81893EA + .string "You worked hard!$" + +Text_1893FB:: @ 81893FB + .string "Drat!\n" + .string "A ZUBAT bit me back in that cave.$" + +Text_189423:: @ 8189423 + .string "I'm off to see a POKéMANIAC's\n" + .string "collection at the cape.$" + +Text_189459:: @ 8189459 + .string "You done got me, and real good,\n" + .string "too!$" + +Text_18947E:: @ 818947E + .string "The POKéMANIAC sure lives up to\n" + .string "his name.\p" + .string "His collection includes many rare\n" + .string "species of POKéMON.$" + +Text_1894DE:: @ 81894DE + .string "You're going to see BILL?\n" + .string "First, we battle!$" + +Text_18950A:: @ 818950A + .string "You're something.$" + +Text_18951C:: @ 818951C + .string "The trail below is a shortcut to\n" + .string "CERULEAN CITY.$" + +gUnknown_818954C:: @ 818954C + .string "SEA COTTAGE\n" + .string "BILL lives here!$" + +Text_189569:: @ 8189569 + .string "This cape is a famous date spot.\p" + .string "MISTY, the GYM LEADER, has high\n" + .string "hopes about this place.$" + +gUnknown_81895C2:: @ 81895C2 + .string "Hello, are you here alone?\p" + .string "If you're out at CERULEAN's cape…\n" + .string "Well, it should be as a couple.$" + diff --git a/data/maps/Route25_SeaCottage/text.inc b/data/maps/Route25_SeaCottage/text.inc new file mode 100644 index 000000000..6ecacdd89 --- /dev/null +++ b/data/maps/Route25_SeaCottage/text.inc @@ -0,0 +1,108 @@ +gUnknown_819FDFA:: @ 819FDFA + .string "Hiya! I'm a POKéMON…\n" + .string "…No I'm not!\p" + .string "Call me BILL!\n" + .string "I'm a true-blue POKéMANIAC!\p" + .string "Hey!\n" + .string "What's with that skeptical look?\p" + .string "I'm not joshing you, pal.\p" + .string "I screwed up an experiment and got\n" + .string "combined with a POKéMON!\p" + .string "So, how about it?\n" + .string "Help me out here!$" + +gUnknown_819FEE6:: @ 819FEE6 + .string "Hiya! I'm a POKéMON…\n" + .string "…No I'm not!\p" + .string "Call me BILL!\n" + .string "I'm a true-blue POKéMANIAC!\p" + .string "Hey!\n" + .string "What's with that skeptical look?\p" + .string "I'm not joshing you, lady.\p" + .string "I screwed up an experiment and got\n" + .string "combined with a POKéMON!\p" + .string "So, how about it?\n" + .string "Help me out here!$" + +gUnknown_819FFD3:: @ 819FFD3 + .string "Wait till I get inside the\n" + .string "TELEPORTER.\p" + .string "When I do, go to my PC and run\n" + .string "the Cell Separation System.$" + +gUnknown_81A0035:: @ 81A0035 + .string "No!?\n" + .string "Now don't be so cold!\p" + .string "Come on, you gotta help a guy in\n" + .string "deep, deep trouble!\p" + .string "What do you say, chief?\n" + .string "Please?\l" + .string "Okay?\l" + .string "All right!$" + +gUnknown_81A00B6:: @ 81A00B6 + .string "No!?\n" + .string "Now don't be so cold!\p" + .string "Come on, you gotta help a guy in\n" + .string "deep, deep trouble!\p" + .string "What do you say, beautiful?\n" + .string "Please?\l" + .string "Okay?\l" + .string "All right!$" + +gUnknown_81A013B:: @ 81A013B + .string "BILL: Yeehah!\n" + .string "Thanks, bud! I owe you one!\p" + .string "So, did you come to see my\n" + .string "POKéMON collection?\p" + .string "You didn't?\n" + .string "That's a bummer.\p" + .string "I've got to thank you…\n" + .string "Oh, here, maybe this'll do.$" + +gUnknown_81A01E4:: @ 81A01E4 + .string "BILL: Yeehah!\n" + .string "Thanks, lady! I owe you one!\p" + .string "So, did you come to see my\n" + .string "POKéMON collection?\p" + .string "You didn't?\n" + .string "That's a bummer.\p" + .string "I've got to thank you…\n" + .string "Oh, here, maybe this'll do.$" + +gUnknown_81A028E:: @ 81A028E + .string "{PLAYER} received an S.S. TICKET\n" + .string "from BILL.$" + +gUnknown_81A02B4:: @ 81A02B4 + .string "You've got too much stuff!$" + +gUnknown_81A02CF:: @ 81A02CF + .string "That cruise ship S.S. ANNE is in\n" + .string "VERMILION CITY.\p" + .string "I hear there are lots of TRAINERS\n" + .string "on board, too.\p" + .string "They invited me to their party, but\n" + .string "I can't stand fancy do's.\p" + .string "Why don't you go instead of me?\n" + .string "Go on and have a good time.$" + +gUnknown_81A03AB:: @ 81A03AB + .string "BILL: Feel like checking out some\n" + .string "of my rare POKéMON on my PC?\p" + .string "Go on, check out my PC.$" + +gUnknown_81A0402:: @ 81A0402 + .string "TELEPORTER is displayed on the PC\n" + .string "monitor.$" + +gUnknown_81A042D:: @ 81A042D + .string "{PLAYER} initiated the TELEPORTER's\n" + .string "Cell Separator.$" + +gUnknown_81A045B:: @ 81A045B + .string "BILL's favorite POKéMON list!$" + +Text_1A0479:: @ 81A0479 + .string "Which POKéMON do you want to see?$" + diff --git a/data/maps/Route2_EastBuilding/text.inc b/data/maps/Route2_EastBuilding/text.inc new file mode 100644 index 000000000..228cf3c4d --- /dev/null +++ b/data/maps/Route2_EastBuilding/text.inc @@ -0,0 +1,32 @@ +gUnknown_819D64F:: @ 819D64F + .string "Hi! Remember me?\n" + .string "I'm one of PROF. OAK's AIDES.\p" + .string "If your POKéDEX has complete data\n" + .string "on ten species, I'm supposed to\l" + .string "give you a reward.\p" + .string "PROF. OAK entrusted me with\n" + .string "HM05 for you.\p" + .string "So, {PLAYER}, let me ask you.\p" + .string "Have you gathered data on at least\n" + .string "ten kinds of POKéMON?$" + +gUnknown_819D74E:: @ 819D74E + .string "Great! You have caught or owned\n" + .string "{STR_VAR_3} kinds of POKéMON!\p" + .string "Congratulations!\n" + .string "Here you go!$" + +gUnknown_819D7A1:: @ 819D7A1 + .string "{PLAYER} received HM05\n" + .string "from the AIDE.$" + +gUnknown_819D7C1:: @ 819D7C1 + .string "HM05 contains the hidden move\n" + .string "FLASH.\p" + .string "FLASH lights up even the darkest\n" + .string "of caves and dungeons.$" + +gUnknown_819D81E:: @ 819D81E + .string "Once a POKéMON learns FLASH, you\n" + .string "can get through ROCK TUNNEL.$" + diff --git a/data/maps/Route2_House/text.inc b/data/maps/Route2_House/text.inc new file mode 100644 index 000000000..5fde449d3 --- /dev/null +++ b/data/maps/Route2_House/text.inc @@ -0,0 +1,6 @@ +gUnknown_819D5E7:: @ 819D5E7 + .string "A fainted POKéMON just has no\n" + .string "energy left to battle.\p" + .string "It can still use moves like CUT\n" + .string "outside of battle.$" + diff --git a/data/maps/Route2_ViridianForest_NorthEntrance/text.inc b/data/maps/Route2_ViridianForest_NorthEntrance/text.inc new file mode 100644 index 000000000..630d39fc9 --- /dev/null +++ b/data/maps/Route2_ViridianForest_NorthEntrance/text.inc @@ -0,0 +1,20 @@ +gUnknown_819D85C:: @ 819D85C + .string "Many POKéMON live only in forests \n" + .string "and caves.\p" + .string "You need to be persistent and look\n" + .string "everywhere to get different kinds.$" + +gUnknown_819D8D0:: @ 819D8D0 + .string "Have you noticed the skinny trees\n" + .string "on the roadside?\p" + .string "They can be cut down by a special\n" + .string "POKéMON move, I hear.$" + +gUnknown_819D93B:: @ 819D93B + .string "Do you know the evolution-cancel\n" + .string "technique?\p" + .string "When a POKéMON is evolving, you\n" + .string "can stop the process.\p" + .string "It's a technique for raising\n" + .string "POKéMON the way they are.$" + diff --git a/data/maps/Route2_ViridianForest_SouthEntrance/text.inc b/data/maps/Route2_ViridianForest_SouthEntrance/text.inc new file mode 100644 index 000000000..c92538340 --- /dev/null +++ b/data/maps/Route2_ViridianForest_SouthEntrance/text.inc @@ -0,0 +1,10 @@ +gUnknown_819D52C:: @ 819D52C + .string "Are you going to VIRIDIAN FOREST?\n" + .string "It's a natural maze in there.\l" + .string "Be careful you don't get lost.$" + +gUnknown_819D58B:: @ 819D58B + .string "RATTATA may be small, but don't\n" + .string "underestimate its wicked bite.\p" + .string "Have you caught one already?$" + diff --git a/data/maps/Route3/text.inc b/data/maps/Route3/text.inc new file mode 100644 index 000000000..32aa96e19 --- /dev/null +++ b/data/maps/Route3/text.inc @@ -0,0 +1,104 @@ +gUnknown_8183491:: @ 8183491 + .string "Whew… I better take a rest…\n" + .string "Groan…\p" + .string "That tunnel from CERULEAN takes a\n" + .string "lot out of you!$" + +Text_1834E6:: @ 81834E6 + .string "Hey!\n" + .string "I saw you in VIRIDIAN FOREST!$" + +Text_183509:: @ 8183509 + .string "You beat me again!$" + +Text_18351C:: @ 818351C + .string "There are other kinds of POKéMON\n" + .string "than the ones you find in forests.$" + +Text_183560:: @ 8183560 + .string "Hi!\n" + .string "I like shorts!\p" + .string "They're delightfully comfy and\n" + .string "easy to wear!$" + +Text_1835A0:: @ 81835A0 + .string "I don't believe it!$" + +Text_1835B4:: @ 81835B4 + .string "Are you using a POKéMON CENTER's\n" + .string "PC for storing your POKéMON?\p" + .string "Each BOX can hold up to\n" + .string "30 POKéMON.$" + +Text_183616:: @ 8183616 + .string "Excuse me!\n" + .string "You looked at me, didn't you?$" + +Text_18363F:: @ 818363F + .string "You're mean!$" + +Text_18364C:: @ 818364C + .string "You shouldn't be staring if you\n" + .string "don't want to battle!$" + +Text_183682:: @ 8183682 + .string "Are you a TRAINER?\n" + .string "Let's get with it right away!$" + +Text_1836B3:: @ 81836B3 + .string "If I had new POKéMON, I would've\n" + .string "won!$" + +Text_1836D9:: @ 81836D9 + .string "If a POKéMON BOX on the PC gets\n" + .string "full, just switch to another BOX.$" + +Text_18371B:: @ 818371B + .string "That look you gave me…\n" + .string "It's so intriguing!$" + +Text_183746:: @ 8183746 + .string "Be nice!$" + +Text_18374F:: @ 818374F + .string "You can avoid battles by not\n" + .string "letting TRAINERS see you.$" + +Text_183786:: @ 8183786 + .string "Hey! You're not wearing shorts!\n" + .string "What's wrong with you?$" + +Text_1837BD:: @ 81837BD + .string "Lost!\n" + .string "Lost! Lost!$" + +Text_1837CF:: @ 81837CF + .string "I always wear shorts, even in\n" + .string "winter. That's my policy.$" + +Text_183807:: @ 8183807 + .string "I'll battle you with the POKéMON\n" + .string "I just caught.$" + +Text_183837:: @ 8183837 + .string "Done like dinner!$" + +Text_183849:: @ 8183849 + .string "Trained POKéMON are stronger than\n" + .string "the wild ones.$" + +Text_18387A:: @ 818387A + .string "Eek!\n" + .string "Did you touch me?$" + +Text_183891:: @ 8183891 + .string "That's it?$" + +Text_18389C:: @ 818389C + .string "ROUTE 4 is at the foot of\n" + .string "MT. MOON.$" + +gUnknown_81838C0:: @ 81838C0 + .string "ROUTE 3\n" + .string "MT. MOON AHEAD$" + diff --git a/data/maps/Route4/text.inc b/data/maps/Route4/text.inc new file mode 100644 index 000000000..49648cde0 --- /dev/null +++ b/data/maps/Route4/text.inc @@ -0,0 +1,24 @@ +gUnknown_81838D7:: @ 81838D7 + .string "Ouch! I tripped over a rocky\n" + .string "POKéMON, GEODUDE!$" + +Text_183906:: @ 8183906 + .string "I came to MT. MOON in search of\n" + .string "mushroom POKéMON.$" + +Text_183938:: @ 8183938 + .string "After all I did to catch them!$" + +Text_183957:: @ 8183957 + .string "There might not be any more\n" + .string "mushrooms here.\p" + .string "I think I got them all.$" + +gUnknown_818399B:: @ 818399B + .string "MT. MOON\n" + .string "Tunnel Entrance$" + +gUnknown_81839B4:: @ 81839B4 + .string "ROUTE 4\n" + .string "MT. MOON - CERULEAN CITY$" + diff --git a/data/maps/Route4_PokemonCenter_1F/text.inc b/data/maps/Route4_PokemonCenter_1F/text.inc new file mode 100644 index 000000000..f357b7f76 --- /dev/null +++ b/data/maps/Route4_PokemonCenter_1F/text.inc @@ -0,0 +1,54 @@ +gUnknown_819D9D4:: @ 819D9D4 + .string "Okay, set six POKé BALLS in my\n" + .string "belt…\p" + .string "Yeah, that'll do it. At most, you\n" + .string "can have six POKéMON with you.$" + +gUnknown_819DA3A:: @ 819DA3A + .string "TEAM ROCKET attacks CERULEAN\n" + .string "citizens…\p" + .string "Not a day goes by without TEAM\n" + .string "ROCKET being in the news.$" + +gUnknown_819DA9A:: @ 819DA9A + .string "MAN: Hello there, laddie!\n" + .string "Have I got a deal just for you!\p" + .string "I'll let you have a secret POKéMON\n" + .string "- a MAGIKARP - for just ¥500!\p" + .string "So, you'll buy it, am I right?$" + +gUnknown_819DB34:: @ 819DB34 + .string "MAN: Hello there, sweetie pie!\n" + .string "Have I got a deal just for you!\p" + .string "I'll let you have a secret POKéMON\n" + .string "- a MAGIKARP - for just ¥500!\p" + .string "So, you'll buy it, am I right?$" + +Text_19DBD3:: @ 819DBD3 + .string "{PLAYER} paid an outrageous ¥500\n" + .string "and bought the MAGIKARP…$" + +gUnknown_819DC07:: @ 819DC07 + .string "No? You say no? I'm only doing this\n" + .string "as a favor to you!$" + +gUnknown_819DC3E:: @ 819DC3E + .string "There's no more room for any more\n" + .string "POKéMON, it looks like.$" + +gUnknown_819DC78:: @ 819DC78 + .string "You'll need more money than that!$" + +gUnknown_819DC9A:: @ 819DC9A + .string "MAN: Well, I don't give refunds.\n" + .string "You knew what you were getting!$" + +gUnknown_819DCDB:: @ 819DCDB + .string "Sometimes, you'll have too many\n" + .string "POKéMON with you to add any more.\p" + .string "In that case, you should just\n" + .string "store some using any PC.$" + +gUnknown_819DD54:: @ 819DD54 + .string "It's a newspaper.$" + diff --git a/data/maps/Route5/text.inc b/data/maps/Route5/text.inc new file mode 100644 index 000000000..066d8cfa6 --- /dev/null +++ b/data/maps/Route5/text.inc @@ -0,0 +1,60 @@ +Text_1839D5:: @ 81839D5 + .string "A punch of roaring ferocity!\p" + .string "Packed with destructive power!\p" + .string "When the chips are down,\n" + .string "MEGA PUNCH is the ultimate attack!\l" + .string "You agree, yes?\p" + .string "Now!\n" + .string "Let me teach it to your POKéMON!$" + +Text_183A83:: @ 8183A83 + .string "You'll be back when you understand\n" + .string "the worth of MEGA PUNCH.$" + +Text_183ABF:: @ 8183ABF + .string "Fine!\n" + .string "Which POKéMON will learn it?$" + +Text_183AE2:: @ 8183AE2 + .string "Now, we are comrades in the way of\n" + .string "punching!\p" + .string "You should go before you're seen\n" + .string "by the misguided fool who trains\l" + .string "only his silly kicking over there.$" + +Text_183B74:: @ 8183B74 + .string "A kick of brutal ferocity!\p" + .string "Packed with destructive power!\p" + .string "When you get right down to it,\n" + .string "MEGA KICK is the ultimate attack!\l" + .string "Don't you agree?\p" + .string "Okay!\n" + .string "I'll teach it to your POKéMON!$" + +Text_183C25:: @ 8183C25 + .string "You'll come crawling back when you\n" + .string "realize the value of MEGA KICK.$" + +Text_183C68:: @ 8183C68 + .string "All right!\n" + .string "Which POKéMON wants to learn it?$" + +Text_183C94:: @ 8183C94 + .string "Now, we are soul mates in the way\n" + .string "of kicking!\p" + .string "You should run before you're seen\n" + .string "by the deluded nitwit who trains\l" + .string "only simple punching over there.$" + +Text_183D26:: @ 8183D26 + .string "Oh, wow, that's the BOULDERBADGE!\n" + .string "You got it from BROCK, didn't you?\p" + .string "BROCK is cool. He's not just tough.\n" + .string "People like and respect him.\p" + .string "I want to become a GYM LEADER\n" + .string "like him.$" + +gUnknown_8183DD4:: @ 8183DD4 + .string "UNDERGROUND PATH\n" + .string "CERULEAN CITY - VERMILION CITY$" + diff --git a/data/maps/Route5_SouthEntrance/text.inc b/data/maps/Route5_SouthEntrance/text.inc new file mode 100644 index 000000000..079423f34 --- /dev/null +++ b/data/maps/Route5_SouthEntrance/text.inc @@ -0,0 +1,95 @@ +Text_19DD66:: @ 819DD66 + .string "I run the DAY-CARE service.\p" + .string "Would you like me to raise one of\n" + .string "your POKéMON?$" + +Text_19DDB2:: @ 819DDB2 + .string "Come again.$" + +Text_19DDBE:: @ 819DDBE + .string "Which POKéMON should I raise?$" + +Text_19DDDC:: @ 819DDDC + .string "Fine.\n" + .string "Come anytime you like.$" + +Text_19DDF9:: @ 819DDF9 + .string "Fine, I'll look after your\n" + .string "{STR_VAR_1} for a while.$" + +Text_19DE24:: @ 819DE24 + .string "Come see me in a while.$" + +Text_19DE3C:: @ 819DE3C + .string "You're back already?\p" + .string "Your {STR_VAR_1} needs to spend\n" + .string "some more time with me.$" + +Text_19DE80:: @ 819DE80 + .string "You owe me ¥{STR_VAR_2} for the return\n" + .string "of this POKéMON.$" + +Text_19DEAF:: @ 819DEAF + .string "Thank you!\n" + .string "Here's your POKéMON.$" + +Text_19DECF:: @ 819DECF + .string "{PLAYER} got {STR_VAR_1} back\n" + .string "from the DAY-CARE MAN.$" + +Text_19DEF5:: @ 819DEF5 + .string "Oh? You only have one POKéMON\n" + .string "with you.$" + +Text_19DF1D:: @ 819DF1D + .string "If you leave me that POKéMON,\n" + .string "what will you battle with?$" + +Text_19DF56:: @ 819DF56 + .string "Your {STR_VAR_1} has grown a lot.\n" + .string "Yes, quite a lot, I'd say.\p" + .string "Let me see…\n" + .string "By level, it's grown by {STR_VAR_2}.\p" + .string "Aren't I great?$" + +Text_19DFC2:: @ 819DFC2 + .string "You can't take this POKéMON back\n" + .string "if you've got no room for it.$" + +Text_19E001:: @ 819E001 + .string "You don't have enough money.$" + +Text_19E01E:: @ 819E01E + .string "きみの\n" + .string "みてみるかね？$" + +Text_19E02A:: @ 819E02A + .string "わるいけど　ひでんのわざを　もった\n" + .string "ポケモンは　あずかれないなぁ$" + +gUnknown_819E04B:: @ 819E04B + .string "I'm on guard duty.\n" + .string "Gee, I'm thirsty, though!\p" + .string "Oh, wait there, the road's closed.$" + +gUnknown_819E09B:: @ 819E09B + .string "Oh, that TEA…\n" + .string "It looks awfully tasty…$" + +gUnknown_819E0C1:: @ 819E0C1 + .string "Huh? I can have this drink?\n" + .string "Gee, thanks!\l" + .string "… …\l" + .string "Glug, glug…\l" + .string "… …\l" + .string "Gulp…\l" + .string "If you want to go to SAFFRON\l" + .string "CITY…\l" + .string "… …\l" + .string "You can go on through.\p" + .string "I'll share this TEA with the other\n" + .string "guards!$" + +gUnknown_819E16D:: @ 819E16D + .string "Hi, how's it going?$" + diff --git a/data/maps/Route6/text.inc b/data/maps/Route6/text.inc new file mode 100644 index 000000000..b8ae84e32 --- /dev/null +++ b/data/maps/Route6/text.inc @@ -0,0 +1,73 @@ +Text_183E04:: @ 8183E04 + .string "Who's there?\n" + .string "Quit listening in on us!$" + +Text_183E2A:: @ 8183E2A + .string "I just can't win!$" + +Text_183E3C:: @ 8183E3C + .string "Whisper…\n" + .string "Whisper…$" + +Text_183E4E:: @ 8183E4E + .string "Excuse me!\n" + .string "This is a private conversation!$" + +Text_183E79:: @ 8183E79 + .string "Ugh!\n" + .string "I hate losing.$" + +Text_183E8D:: @ 8183E8D + .string "Whisper…\n" + .string "Whisper…$" + +Text_183E9F:: @ 8183E9F + .string "There aren't many bugs out here.$" + +Text_183EC0:: @ 8183EC0 + .string "No!\n" + .string "You're kidding!$" + +Text_183ED4:: @ 8183ED4 + .string "I like bugs, so I'm going back to\n" + .string "VIRIDIAN FOREST.$" + +Text_183F07:: @ 8183F07 + .string "Huh?\n" + .string "You want to talk to me?$" + +Text_183F24:: @ 8183F24 + .string "This stinks…\n" + .string "I couldn't beat your challenge…$" + +Text_183F51:: @ 8183F51 + .string "I should bring more POKéMON with\n" + .string "me. I'll feel safer that way.$" + +Text_183F90:: @ 8183F90 + .string "Me?\n" + .string "Well, okay. I'll play!$" + +Text_183FAB:: @ 8183FAB + .string "Things just didn't work…$" + +Text_183FC4:: @ 8183FC4 + .string "I want to get stronger.\n" + .string "What's your secret?$" + +Text_183FF0:: @ 8183FF0 + .string "I've never seen you around.\n" + .string "Are you good?$" + +Text_18401A:: @ 818401A + .string "You're too good!$" + +Text_18402B:: @ 818402B + .string "Are my POKéMON weak?\n" + .string "Or, am I just bad?\l" + .string "Which do you think?$" + +gUnknown_8184067:: @ 8184067 + .string "UNDERGROUND PATH\n" + .string "CERULEAN CITY - VERMILION CITY$" + diff --git a/data/maps/Route6_NorthEntrance/text.inc b/data/maps/Route6_NorthEntrance/text.inc new file mode 100644 index 000000000..3d581e1fb --- /dev/null +++ b/data/maps/Route6_NorthEntrance/text.inc @@ -0,0 +1,26 @@ +gUnknown_819E181:: @ 819E181 + .string "I'm on guard duty.\n" + .string "Gee, I'm thirsty, though!\p" + .string "Oh, wait there, the road's closed.$" + +gUnknown_819E1D1:: @ 819E1D1 + .string "Oh, that TEA…\n" + .string "It looks awfully tasty…$" + +gUnknown_819E1F7:: @ 819E1F7 + .string "Huh? I can have this drink?\n" + .string "Gee, thanks!\l" + .string "… …\l" + .string "Glug, glug…\l" + .string "… …\l" + .string "Gulp…\l" + .string "If you want to go to SAFFRON\l" + .string "CITY…\l" + .string "… …\l" + .string "You can go on through.\p" + .string "I'll share this TEA with the other\n" + .string "guards!$" + +gUnknown_819E2A3:: @ 819E2A3 + .string "Hi, how's it going?$" + diff --git a/data/maps/Route7/text.inc b/data/maps/Route7/text.inc new file mode 100644 index 000000000..3f1cdda5b --- /dev/null +++ b/data/maps/Route7/text.inc @@ -0,0 +1,4 @@ +gUnknown_8184097:: @ 8184097 + .string "UNDERGROUND PATH\n" + .string "CELADON CITY - LAVENDER TOWN$" + diff --git a/data/maps/Route7_EastEntrance/text.inc b/data/maps/Route7_EastEntrance/text.inc new file mode 100644 index 000000000..94db43e94 --- /dev/null +++ b/data/maps/Route7_EastEntrance/text.inc @@ -0,0 +1,26 @@ +gUnknown_819E2B7:: @ 819E2B7 + .string "I'm on guard duty.\n" + .string "Gee, I'm thirsty, though!\p" + .string "Oh, wait there, the road's closed.$" + +gUnknown_819E307:: @ 819E307 + .string "Oh, that TEA…\n" + .string "It looks awfully tasty…$" + +gUnknown_819E32D:: @ 819E32D + .string "Huh? I can have this drink?\n" + .string "Gee, thanks!\l" + .string "… …\l" + .string "Glug, glug…\l" + .string "… …\l" + .string "Gulp…\l" + .string "If you want to go to SAFFRON\l" + .string "CITY…\l" + .string "… …\l" + .string "You can go on through.\p" + .string "I'll share this TEA with the other\n" + .string "guards!$" + +gUnknown_819E3D9:: @ 819E3D9 + .string "Hi, how's it going?$" + diff --git a/data/maps/Route8/text.inc b/data/maps/Route8/text.inc new file mode 100644 index 000000000..83f725c6a --- /dev/null +++ b/data/maps/Route8/text.inc @@ -0,0 +1,110 @@ +Text_1840C5:: @ 81840C5 + .string "You look good at POKéMON, but how\n" + .string "is your chemistry grade?$" + +Text_184100:: @ 8184100 + .string "Ow!\n" + .string "Meltdown!$" + +Text_18410E:: @ 818410E + .string "I am better at school than this!$" + +Text_18412F:: @ 818412F + .string "All right!\n" + .string "Let's play a game!$" + +Text_18414D:: @ 818414D + .string "Drat!\n" + .string "Came up short!$" + +Text_184162:: @ 8184162 + .string "Things didn't work today.$" + +Text_18417C:: @ 818417C + .string "You should be informed.\n" + .string "You need strategy to win at this!$" + +Text_1841B6:: @ 81841B6 + .string "It's not logical!$" + +Text_1841C8:: @ 81841C8 + .string "Go with GRIMER first…and…\n" + .string "…and…then…$" + +Text_1841ED:: @ 81841ED + .string "I like NIDORAN, so I collect them!$" + +Text_184210:: @ 8184210 + .string "Why?\n" + .string "Why??$" + +Text_18421B:: @ 818421B + .string "When POKéMON grow up, they get\n" + .string "ugly! They shouldn't evolve.$" + +Text_184257:: @ 8184257 + .string "School is fun, but so are POKéMON.$" + +Text_18427A:: @ 818427A + .string "You made it clear to me that\n" + .string "I should stick with school.$" + +Text_1842B3:: @ 81842B3 + .string "I was planning on getting some\n" + .string "fresh air for a change, but…\p" + .string "We're stuck here because of the\n" + .string "gates at SAFFRON.$" + +Text_184321:: @ 8184321 + .string "MEOWTH is so cute, meow, meow,\n" + .string "meow!$" + +Text_184346:: @ 8184346 + .string "Meeeeyow!$" + +Text_184350:: @ 8184350 + .string "I think PIDGEY and RATTATA are\n" + .string "cute, too!$" + +Text_18437A:: @ 818437A + .string "We must look silly standing here\n" + .string "like this.$" + +Text_1843A6:: @ 81843A6 + .string "Look what you did to my poor, cute\n" + .string "POKéMON!$" + +Text_1843D2:: @ 81843D2 + .string "SAFFRON's gatekeeper won't let us\n" + .string "go through.\p" + .string "I know he's doing his job, but I\n" + .string "think he's mean.$" + +Text_184432:: @ 8184432 + .string "I'm a rambling, gaming dude!$" + +Text_18444F:: @ 818444F + .string "Missed the big chance!$" + +Text_184466:: @ 8184466 + .string "Playing games and POKéMON are like\n" + .string "eating peanuts! I just can't stop!$" + +Text_1844AC:: @ 81844AC + .string "What's a cute, round, and fluffy\n" + .string "POKéMON?$" + +Text_1844D6:: @ 81844D6 + .string "Stop!\p" + .string "Don't be so mean to my CLEFAIRY!$" + +Text_1844FD:: @ 81844FD + .string "I read that CLEFAIRY evolves when\n" + .string "it's exposed to a MOON STONE.\p" + .string "I read that in a POKéMON JOURNAL.\n" + .string "I wonder if it's true?$" + +gUnknown_8184576:: @ 8184576 + .string "UNDERGROUND PATH\n" + .string "CELADON CITY - LAVENDER TOWN$" + diff --git a/data/maps/Route8_WestEntrance/text.inc b/data/maps/Route8_WestEntrance/text.inc new file mode 100644 index 000000000..58e2ee8ef --- /dev/null +++ b/data/maps/Route8_WestEntrance/text.inc @@ -0,0 +1,26 @@ +gUnknown_819E3ED:: @ 819E3ED + .string "I'm on guard duty.\n" + .string "Gee, I'm thirsty, though!\p" + .string "Oh, wait there, the road's closed.$" + +gUnknown_819E43D:: @ 819E43D + .string "Oh, that TEA…\n" + .string "It looks awfully tasty…$" + +gUnknown_819E463:: @ 819E463 + .string "Huh? I can have this drink?\n" + .string "Gee, thanks!\l" + .string "… …\l" + .string "Glug, glug…\l" + .string "… …\l" + .string "Gulp…\l" + .string "If you want to go to SAFFRON\l" + .string "CITY…\l" + .string "… …\l" + .string "You can go on through.\p" + .string "I'll share this TEA with the other\n" + .string "guards!$" + +gUnknown_819E50F:: @ 819E50F + .string "Hi, how's it going?$" + diff --git a/data/maps/Route9/text.inc b/data/maps/Route9/text.inc new file mode 100644 index 000000000..3a4506533 --- /dev/null +++ b/data/maps/Route9/text.inc @@ -0,0 +1,159 @@ +Text_1845A4:: @ 81845A4 + .string "ELI: Twin power is fantastic.\n" + .string "Did you know?$" + +Text_1845D0:: @ 81845D0 + .string "ELI: But…\n" + .string "We used our twin power…$" + +Text_1845F2:: @ 81845F2 + .string "ELI: I caught my POKéMON with\n" + .string "ANNE!$" + +Text_184616:: @ 8184616 + .string "ELI: We can't battle if you don't\n" + .string "have two POKéMON.$" + +Text_18464A:: @ 818464A + .string "ANNE: We'll shock you with our twin\n" + .string "power!$" + +Text_184675:: @ 8184675 + .string "ANNE: Our twin power…$" + +Text_18468B:: @ 818468B + .string "ANNE: I'm raising POKéMON with\n" + .string "ELI.$" + +Text_1846AF:: @ 81846AF + .string "ANNE: Hi, hi! Let's battle!\n" + .string "But bring two POKéMON.$" + +Text_1846E2:: @ 81846E2 + .string "My bike's acting up, man.$" + +Text_1846FC:: @ 81846FC + .string "Aww, man.\n" + .string "I'm not into this.$" + +Text_184719:: @ 8184719 + .string "I got grass caught up in my\n" + .string "spokes, man.$" + +Text_184742:: @ 8184742 + .string "Clear the way, or I'll run you\n" + .string "down!$" + +Text_184767:: @ 8184767 + .string "You for real, kid?$" + +Text_18477A:: @ 818477A + .string "Don't think you're all special and\n" + .string "all just because of this.$" + +Text_1847B7:: @ 81847B7 + .string "You have POKéMON with you!\n" + .string "You're mine!$" + +Text_1847DF:: @ 81847DF + .string "You deceived me…$" + +Text_1847F0:: @ 81847F0 + .string "The tunnel coming up is pitch-black\n" + .string "inside.\p" + .string "You'll need FLASH to get through\n" + .string "there.$" + +Text_184844:: @ 8184844 + .string "Who's that walking there with those\n" + .string "good-looking POKéMON?$" + +Text_18487E:: @ 818487E + .string "Out like a light!$" + +Text_184890:: @ 8184890 + .string "Keep walking!$" + +Text_18489E:: @ 818489E + .string "I'm taking the ROCK TUNNEL to\n" + .string "go to LAVENDER…$" + +Text_1848CC:: @ 81848CC + .string "Can't measure up…$" + +Text_1848DE:: @ 81848DE + .string "Are you off to ROCK TUNNEL, too?$" + +Text_1848FF:: @ 81848FF + .string "Don't you dare patronize me!$" + +Text_18491C:: @ 818491C + .string "No!\n" + .string "You're too much.$" + +Text_184931:: @ 8184931 + .string "You're obviously talented.\n" + .string "Good luck to you!$" + +Text_18495E:: @ 818495E + .string "Bwahaha!\n" + .string "Great! I was bored, eh!$" + +Text_18497F:: @ 818497F + .string "Keep it coming, eh!\p" + .string "Oh wait.\n" + .string "I'm out of POKéMON!$" + +Text_1849B0:: @ 81849B0 + .string "You sure had guts standing up to\n" + .string "me there, eh?$" + +Text_1849DF:: @ 81849DF + .string "Hahaha!\n" + .string "Aren't you a little toughie!$" + +Text_184A04:: @ 8184A04 + .string "What's that?$" + +Text_184A11:: @ 8184A11 + .string "Hahaha!\n" + .string "Kids should be tough!$" + +Text_184A2F:: @ 8184A2F + .string "I got up early every day to raise\n" + .string "my POKéMON from cocoons!$" + +Text_184A6A:: @ 8184A6A + .string "WHAT?\p" + .string "What a total waste of time!$" + +Text_184A8C:: @ 8184A8C + .string "I have to collect more than bugs\n" + .string "to get stronger…$" + +Text_184ABE:: @ 8184ABE + .string "Hahahaha!\n" + .string "Bring it on!$" + +Text_184AD5:: @ 8184AD5 + .string "Hahahaha!\n" + .string "You beat me fair!$" + +Text_184AF1:: @ 8184AF1 + .string "Hahahaha!\n" + .string "Us hearty guys always laugh!$" + +Text_184B18:: @ 8184B18 + .string "Go, my super BUG POKéMON!$" + +Text_184B32:: @ 8184B32 + .string "My bugs…$" + +Text_184B3B:: @ 8184B3B + .string "If you don't like BUG POKéMON,\n" + .string "you bug me!$" + +gUnknown_8184B66:: @ 8184B66 + .string "ROUTE 9\n" + .string "CERULEAN CITY - ROCK TUNNEL$" + diff --git a/data/maps/SSAnne_1F_Corridor/text.inc b/data/maps/SSAnne_1F_Corridor/text.inc new file mode 100644 index 000000000..dff534c9a --- /dev/null +++ b/data/maps/SSAnne_1F_Corridor/text.inc @@ -0,0 +1,14 @@ +gUnknown_8172EE7:: @ 8172EE7 + .string "Bonjour!\n" + .string "I am le waiter on this ship!\p" + .string "I will be happy to serve you\n" + .string "anything you please!\p" + .string "… … …\n" + .string "Ah! Le strong silent type!$" + +gUnknown_8172F60:: @ 8172F60 + .string "The passengers are restless from\n" + .string "this long voyage.\p" + .string "You might be challenged by the\n" + .string "more bored ones!$" + diff --git a/data/maps/SSAnne_1F_Room1/text.inc b/data/maps/SSAnne_1F_Room1/text.inc new file mode 100644 index 000000000..252ab2283 --- /dev/null +++ b/data/maps/SSAnne_1F_Room1/text.inc @@ -0,0 +1,6 @@ +gUnknown_817393B:: @ 817393B + .string "Ssh…!\n" + .string "I'm a GLOBAL POLICE agent.\p" + .string "I'm on the trail of TEAM ROCKET.\n" + .string "They're up to nothing good!$" + diff --git a/data/maps/SSAnne_1F_Room2/text.inc b/data/maps/SSAnne_1F_Room2/text.inc new file mode 100644 index 000000000..92dc9a93c --- /dev/null +++ b/data/maps/SSAnne_1F_Room2/text.inc @@ -0,0 +1,31 @@ +Text_173999:: @ 8173999 + .string "I love POKéMON!\n" + .string "Do you?$" + +Text_1739B1:: @ 81739B1 + .string "Wow! \n" + .string "You're great!$" + +gUnknown_81739C5:: @ 81739C5 + .string "Listen, listen!\n" + .string "Let me be your friend, okay?\p" + .string "Then we can trade POKéMON and\n" + .string "do stuff.$" + +Text_173A1A:: @ 8173A1A + .string "I collected these POKéMON\n" + .string "from all around the world!$" + +Text_173A4F:: @ 8173A4F + .string "Oh, no!\n" + .string "I went around the world for these!$" + +gUnknown_8173A7A:: @ 8173A7A + .string "You hurt my poor POKéMON!\p" + .string "I demand that you heal them at a\n" + .string "POKéMON CENTER!$" + +gUnknown_8173AC5:: @ 8173AC5 + .string "We are cruising around the world,\n" + .string "my children and I.$" + diff --git a/data/maps/SSAnne_1F_Room3/text.inc b/data/maps/SSAnne_1F_Room3/text.inc new file mode 100644 index 000000000..32709c631 --- /dev/null +++ b/data/maps/SSAnne_1F_Room3/text.inc @@ -0,0 +1,11 @@ +gUnknown_8173AFA:: @ 8173AFA + .string "A world cruise is so elegant yet\n" + .string "cozy!$" + +gUnknown_8173B21:: @ 8173B21 + .string "I always travel with WIGGLYTUFF.\n" + .string "I never leave home without it.$" + +gUnknown_8173B61:: @ 8173B61 + .string "WIGGLYTUFF: Puup pupuu!$" + diff --git a/data/maps/SSAnne_1F_Room4/text.inc b/data/maps/SSAnne_1F_Room4/text.inc new file mode 100644 index 000000000..8b3f4c775 --- /dev/null +++ b/data/maps/SSAnne_1F_Room4/text.inc @@ -0,0 +1,8 @@ +gUnknown_8173B79:: @ 8173B79 + .string "Waiter, I would like a cherry pie,\n" + .string "please!$" + +gUnknown_8173BA4:: @ 8173BA4 + .string "Waitress, I would like a cherry\n" + .string "pie, please!$" + diff --git a/data/maps/SSAnne_1F_Room5/text.inc b/data/maps/SSAnne_1F_Room5/text.inc new file mode 100644 index 000000000..09d582707 --- /dev/null +++ b/data/maps/SSAnne_1F_Room5/text.inc @@ -0,0 +1,12 @@ +Text_173BD1:: @ 8173BD1 + .string "You insolent pup!\n" + .string "How dare you barge in!$" + +Text_173BFA:: @ 8173BFA + .string "Humph! You rude child!\n" + .string "You have no sense of courtesy!$" + +gUnknown_8173C30:: @ 8173C30 + .string "I wish to be left alone!\n" + .string "Get out!$" + diff --git a/data/maps/SSAnne_1F_Room6/text.inc b/data/maps/SSAnne_1F_Room6/text.inc new file mode 100644 index 000000000..442992f02 --- /dev/null +++ b/data/maps/SSAnne_1F_Room6/text.inc @@ -0,0 +1,16 @@ +gUnknown_817445B:: @ 817445B + .string "You look tired. Would you like to\n" + .string "take a short rest?$" + +gUnknown_8174490:: @ 8174490 + .string "I'm glad to see that everyone is\n" + .string "looking refreshed and chipper.$" + +gUnknown_81744D0:: @ 81744D0 + .string "Oh, I'm sorry for fussing over you.\n" + .string "You look like my little brother…$" + +gUnknown_8174515:: @ 8174515 + .string "Oh, I'm sorry for fussing over you.\n" + .string "You look like my little sister…$" + diff --git a/data/maps/SSAnne_1F_Room7/text.inc b/data/maps/SSAnne_1F_Room7/text.inc new file mode 100644 index 000000000..d4fed83fb --- /dev/null +++ b/data/maps/SSAnne_1F_Room7/text.inc @@ -0,0 +1,11 @@ +Text_173C52:: @ 8173C52 + .string "I am but a solitary traveler…\p" + .string "My sole companions and friends are\n" + .string "POKéMON I caught on my journeys…$" + +Text_173CB4:: @ 8173CB4 + .string "My, my friends…$" + +gUnknown_8173CC4:: @ 8173CC4 + .string "You should be nice to friends!$" + diff --git a/data/maps/SSAnne_2F_Corridor/text.inc b/data/maps/SSAnne_2F_Corridor/text.inc new file mode 100644 index 000000000..fde6846f2 --- /dev/null +++ b/data/maps/SSAnne_2F_Corridor/text.inc @@ -0,0 +1,37 @@ +gUnknown_8172FC3:: @ 8172FC3 + .string "This ship, she is a luxury liner for\n" + .string "TRAINERS of the world!\p" + .string "At every port, we hold parties with\n" + .string "invited TRAINERS.$" + +gUnknown_8173035:: @ 8173035 + .string "{RIVAL}: Bonjour!\n" + .string "{PLAYER}!\p" + .string "Imagine seeing you here!\n" + .string "{PLAYER}, were you really invited?\p" + .string "So how's your POKéDEX coming?\p" + .string "I already caught 40 kinds, pal.\n" + .string "Different kinds are everywhere.\p" + .string "Crawl around in grassy areas, and\n" + .string "look hard for them.$" + +Text_173110:: @ 8173110 + .string "Humph!\p" + .string "At least you're raising your\n" + .string "POKéMON!$" + +Text_17313D:: @ 817313D + .string "{PLAYER}‥！\n" + .string "ふなよい　してるのか！\p" + .string "もっと　からだ\n" + .string "きたえた　ほうが　いいぜ！$" + +gUnknown_8173164:: @ 8173164 + .string "{RIVAL}: I heard there was a CUT\n" + .string "master on board.\p" + .string "But he was just a seasick old man!\p" + .string "CUT itself is really useful.\n" + .string "Yup, it'll be handy.\p" + .string "You should go see him, too.\n" + .string "Smell ya!$" + diff --git a/data/maps/SSAnne_2F_Room1/text.inc b/data/maps/SSAnne_2F_Room1/text.inc new file mode 100644 index 000000000..5a18af424 --- /dev/null +++ b/data/maps/SSAnne_2F_Room1/text.inc @@ -0,0 +1,6 @@ +Text_173CE3:: @ 8173CE3 + .string "I've journeyed far and wide, but in\n" + .string "all my travels I've never seen\l" + .string "any POKéMON sleep like this one!\p" + .string "It was something like this!$" + diff --git a/data/maps/SSAnne_2F_Room2/text.inc b/data/maps/SSAnne_2F_Room2/text.inc new file mode 100644 index 000000000..a931a8e47 --- /dev/null +++ b/data/maps/SSAnne_2F_Room2/text.inc @@ -0,0 +1,23 @@ +Text_173D63:: @ 8173D63 + .string "Competing against the young keeps\n" + .string "me youthful.$" + +Text_173D92:: @ 8173D92 + .string "Good match!\n" + .string "Ah, I feel young again!$" + +gUnknown_8173DB6:: @ 8173DB6 + .string "Fifteen years ago, I would\n" + .string "have won!$" + +Text_173DDB:: @ 8173DDB + .string "Check out what I fished up!$" + +Text_173DF7:: @ 8173DF7 + .string "I'm all out!$" + +gUnknown_8173E04:: @ 8173E04 + .string "Party?\p" + .string "The cruise ship's party should be\n" + .string "over by now.$" + diff --git a/data/maps/SSAnne_2F_Room3/text.inc b/data/maps/SSAnne_2F_Room3/text.inc new file mode 100644 index 000000000..c87c96ae0 --- /dev/null +++ b/data/maps/SSAnne_2F_Room3/text.inc @@ -0,0 +1,12 @@ +gUnknown_8173E3A:: @ 8173E3A + .string "Ah, yes, I have seen some POKéMON\n" + .string "ferry people across the water!$" + +gUnknown_8173E7B:: @ 8173E7B + .string "Small trees can be chopped down\n" + .string "using the move CUT.\p" + .string "But remember this!\n" + .string "CUT is an HM technique.\p" + .string "Once learned, it is not so easily\n" + .string "discarded.$" + diff --git a/data/maps/SSAnne_2F_Room4/text.inc b/data/maps/SSAnne_2F_Room4/text.inc new file mode 100644 index 000000000..69e7a7b0d --- /dev/null +++ b/data/maps/SSAnne_2F_Room4/text.inc @@ -0,0 +1,22 @@ +Text_173F07:: @ 8173F07 + .string "Which do you find more worthy,\n" + .string "a strong or a rare POKéMON?$" + +Text_173F42:: @ 8173F42 + .string "I must salute you!$" + +gUnknown_8173F55:: @ 8173F55 + .string "Personally, I prefer strong and\n" + .string "rare POKéMON.$" + +Text_173F83:: @ 8173F83 + .string "I don't believe I saw you at the\n" + .string "party?$" + +Text_173FAB:: @ 8173FAB + .string "Take it easy!$" + +gUnknown_8173FB9:: @ 8173FB9 + .string "Oh, I adore your strong POKéMON!\n" + .string "Oh, how I envy you for them!$" + diff --git a/data/maps/SSAnne_2F_Room5/text.inc b/data/maps/SSAnne_2F_Room5/text.inc new file mode 100644 index 000000000..75d44d3a5 --- /dev/null +++ b/data/maps/SSAnne_2F_Room5/text.inc @@ -0,0 +1,11 @@ +gUnknown_8173FF7:: @ 8173FF7 + .string "Have you gone to the SAFARI ZONE\n" + .string "in FUCHSIA CITY?\p" + .string "There are many kinds of rare\n" + .string "POKéMON.$" + +gUnknown_817404F:: @ 817404F + .string "Me and my daddy think the SAFARI\n" + .string "ZONE is awesome!\l" + .string "I wish we could go there again.$" + diff --git a/data/maps/SSAnne_2F_Room6/text.inc b/data/maps/SSAnne_2F_Room6/text.inc new file mode 100644 index 000000000..6f5b0abff --- /dev/null +++ b/data/maps/SSAnne_2F_Room6/text.inc @@ -0,0 +1,7 @@ +gUnknown_81740A1:: @ 81740A1 + .string "The CAPTAIN said he's awfully sick.\n" + .string "He was all pale.$" + +gUnknown_81740D6:: @ 81740D6 + .string "I hear many people get seasick.$" + diff --git a/data/maps/SSAnne_3F_Corridor/text.inc b/data/maps/SSAnne_3F_Corridor/text.inc new file mode 100644 index 000000000..7d4a71bb4 --- /dev/null +++ b/data/maps/SSAnne_3F_Corridor/text.inc @@ -0,0 +1,6 @@ +gUnknown_817320C:: @ 817320C + .string "Our CAPTAIN is a sword master.\n" + .string "He's awesome at using CUT.\p" + .string "They say he even teaches CUT\n" + .string "to POKéMON!$" + diff --git a/data/maps/SSAnne_B1F_Room1/text.inc b/data/maps/SSAnne_B1F_Room1/text.inc new file mode 100644 index 000000000..2802e4a84 --- /dev/null +++ b/data/maps/SSAnne_B1F_Room1/text.inc @@ -0,0 +1,26 @@ +Text_1740F6:: @ 81740F6 + .string "Matey, you're walking the plank if\n" + .string "you lose!$" + +Text_174123:: @ 8174123 + .string "Argh!\n" + .string "Beaten by a kid!$" + +gUnknown_817413A:: @ 817413A + .string "When we're out at sea, jellyfish\n" + .string "POKéMON sometimes drift by.$" + +Text_174177:: @ 8174177 + .string "Hello, stranger!\p" + .string "I can't tell if you're from the seas\n" + .string "or mountains, but stop and chat.\p" + .string "All my POKéMON are from the sea.$" + +Text_1741EF:: @ 81741EF + .string "Darn!\n" + .string "I let that one get away!$" + +gUnknown_817420E:: @ 817420E + .string "I was going to make you my\n" + .string "assistant, too!$" + diff --git a/data/maps/SSAnne_B1F_Room2/text.inc b/data/maps/SSAnne_B1F_Room2/text.inc new file mode 100644 index 000000000..df94d6351 --- /dev/null +++ b/data/maps/SSAnne_B1F_Room2/text.inc @@ -0,0 +1,10 @@ +Text_174239:: @ 8174239 + .string "Even us sailors have POKéMON, too!$" + +Text_17425C:: @ 817425C + .string "Okay, you're not bad.$" + +gUnknown_8174272:: @ 8174272 + .string "We caught all our POKéMON while\n" + .string "we were out at sea.$" + diff --git a/data/maps/SSAnne_B1F_Room3/text.inc b/data/maps/SSAnne_B1F_Room3/text.inc new file mode 100644 index 000000000..f74b96052 --- /dev/null +++ b/data/maps/SSAnne_B1F_Room3/text.inc @@ -0,0 +1,11 @@ +Text_1742A6:: @ 81742A6 + .string "I like feisty kids like you!$" + +Text_1742C3:: @ 81742C3 + .string "Argh!\n" + .string "Lost it!$" + +gUnknown_81742D2:: @ 81742D2 + .string "Sea POKéMON live in deep water.\n" + .string "You'll need a ROD to fish them up!$" + diff --git a/data/maps/SSAnne_B1F_Room4/text.inc b/data/maps/SSAnne_B1F_Room4/text.inc new file mode 100644 index 000000000..d2f19f49f --- /dev/null +++ b/data/maps/SSAnne_B1F_Room4/text.inc @@ -0,0 +1,23 @@ +Text_174315:: @ 8174315 + .string "You know what they say about\n" + .string "sailors and battling!$" + +Text_174348:: @ 8174348 + .string "Right!\n" + .string "Good battle, mate!$" + +gUnknown_8174362:: @ 8174362 + .string "Hahaha!\n" + .string "Want to be a sailor, mate?$" + +Text_174385:: @ 8174385 + .string "Come on, then!\n" + .string "My sailor's pride is at stake!$" + +Text_1743B3:: @ 81743B3 + .string "Your spirit sank me!$" + +gUnknown_81743C8:: @ 81743C8 + .string "Did you see the FISHING GURU in\n" + .string "VERMILION CITY?$" + diff --git a/data/maps/SSAnne_B1F_Room5/text.inc b/data/maps/SSAnne_B1F_Room5/text.inc new file mode 100644 index 000000000..ac30dbe95 --- /dev/null +++ b/data/maps/SSAnne_B1F_Room5/text.inc @@ -0,0 +1,8 @@ +gUnknown_81743F8:: @ 81743F8 + .string "My buddy MACHOKE is super strong!\p" + .string "He has enough STRENGTH to move\n" + .string "big rocks!$" + +gUnknown_8174444:: @ 8174444 + .string "MACHOKE: Gwoh! Goggoh!$" + diff --git a/data/maps/SSAnne_CaptainsOffice/text.inc b/data/maps/SSAnne_CaptainsOffice/text.inc new file mode 100644 index 000000000..eab68b9bd --- /dev/null +++ b/data/maps/SSAnne_CaptainsOffice/text.inc @@ -0,0 +1,53 @@ +gUnknown_8173646:: @ 8173646 + .string "CAPTAIN: Ooargh…\n" + .string "I feel hideous…\l" + .string "Urrp! Seasick…$" + +Text_173676:: @ 8173676 + .string "{PLAYER} rubbed the CAPTAIN's\n" + .string "back!\p" + .string "Rub-rub…\n" + .string "Rub-rub…$" + +gUnknown_81736A6:: @ 81736A6 + .string "CAPTAIN: Whew! Thank you!\n" + .string "I'm feeling much better now.\p" + .string "You want to see my hidden CUT\n" + .string "technique?\p" + .string "I could show you my prized CUT\n" + .string "technique if I weren't so ill…\p" + .string "I know! You can have this!\n" + .string "This HIDDEN MACHINE!\p" + .string "Teach CUT to your POKéMON, and\n" + .string "you can see it CUT anytime!$" + +gUnknown_81737AF:: @ 81737AF + .string "{PLAYER} obtained HM01\n" + .string "from the CAPTAIN!$" + +gUnknown_81737D2:: @ 81737D2 + .string "Using CUT, you can chop down\n" + .string "small trees.\p" + .string "Why not try it with the trees\n" + .string "around VERMILION CITY?$" + +gUnknown_8173831:: @ 8173831 + .string "CAPTAIN: …Whew!\p" + .string "Now that I'm not sick anymore,\n" + .string "I guess it's time.\p" + .string "The S.S. ANNE will set sail soon!\p" + .string "Farewell, until our return to\n" + .string "VERMILION CITY!$" + +gUnknown_81738C3:: @ 81738C3 + .string "Oh, no!\n" + .string "You have no room for this!$" + +gUnknown_81738E6:: @ 81738E6 + .string "Yuck!\n" + .string "Shouldn't have looked!$" + +gUnknown_8173903:: @ 8173903 + .string "How to Conquer Seasickness…\n" + .string "The CAPTAIN's reading this!$" + diff --git a/data/maps/SSAnne_Deck/text.inc b/data/maps/SSAnne_Deck/text.inc new file mode 100644 index 000000000..08be9fc7d --- /dev/null +++ b/data/maps/SSAnne_Deck/text.inc @@ -0,0 +1,35 @@ +gUnknown_817326F:: @ 817326F + .string "The party's over.\n" + .string "The ship will be departing soon.$" + +gUnknown_81732A2:: @ 81732A2 + .string "Whew!\n" + .string "Scrubbing decks is hard work!$" + +gUnknown_81732C6:: @ 81732C6 + .string "Urf… I feel ill…\p" + .string "I got seasick, so I stepped out to\n" + .string "get some air…$" + +Text_173308:: @ 8173308 + .string "Hey, matey!\p" + .string "Let's do a little jig!$" + +Text_17332B:: @ 817332B + .string "You're impressive!$" + +gUnknown_817333E:: @ 817333E + .string "How many kinds of POKéMON do you\n" + .string "think there are in this big world?$" + +Text_173382:: @ 8173382 + .string "Ahoy, there!\n" + .string "Are you seasick?$" + +Text_1733A0:: @ 81733A0 + .string "I was just careless!$" + +gUnknown_81733B5:: @ 81733B5 + .string "My pa said there are 100 kinds of\n" + .string "POKéMON. I think there are more.$" + diff --git a/data/maps/SSAnne_Kitchen/text.inc b/data/maps/SSAnne_Kitchen/text.inc new file mode 100644 index 000000000..edd115076 --- /dev/null +++ b/data/maps/SSAnne_Kitchen/text.inc @@ -0,0 +1,48 @@ +gUnknown_81733F8:: @ 81733F8 + .string "You, mon petit!\n" + .string "We're busy here!\l" + .string "Out of the way!$" + +gUnknown_8173429:: @ 8173429 + .string "I saw an odd BERRY in the trash.\n" + .string "I wonder what that was?$" + +gUnknown_8173462:: @ 8173462 + .string "I'm so busy I'm getting dizzy!\n" + .string "You have to give me room here!$" + +gUnknown_81734A0:: @ 81734A0 + .string "Hum-de-hum-de-ho…\p" + .string "I peel spuds every day!\n" + .string "Hum-hum…$" + +gUnknown_81734D3:: @ 81734D3 + .string "Did you hear about SNORLAX?\n" + .string "It's a glutton.\p" + .string "No other POKéMON eats and sleeps\n" + .string "the way SNORLAX can and does!$" + +gUnknown_817353E:: @ 817353E + .string "Snivel… Sniff…\p" + .string "I only get to peel onions…\n" + .string "Snivel…$" + +gUnknown_8173570:: @ 8173570 + .string "Er-hem!\n" + .string "Indeed I am le CHEF!\p" + .string "Le main course is$" + +gUnknown_817359F:: @ 817359F + .string "Salmon du Salad!\p" + .string "Les guests may gripe it's fish\n" + .string "again, however!$" + +gUnknown_81735DF:: @ 81735DF + .string "Eels au Barbecue!\p" + .string "Les guests will mutiny, I fear.$" + +gUnknown_8173611:: @ 8173611 + .string "Prime Beefsteak!\p" + .string "But, have I enough fillets du\n" + .string "beef?$" + diff --git a/data/maps/SafariZone_Building1/text.inc b/data/maps/SafariZone_Building1/text.inc new file mode 100644 index 000000000..a071cffeb --- /dev/null +++ b/data/maps/SafariZone_Building1/text.inc @@ -0,0 +1,8 @@ +gUnknown_8177A5A:: @ 8177A5A + .string "SARA: Where did my boyfriend,\n" + .string "ERIK, go?$" + +gUnknown_8177A82:: @ 8177A82 + .string "I'm catching POKéMON to take home\n" + .string "as gifts.$" + diff --git a/data/maps/SafariZone_Building2/text.inc b/data/maps/SafariZone_Building2/text.inc new file mode 100644 index 000000000..b25194a31 --- /dev/null +++ b/data/maps/SafariZone_Building2/text.inc @@ -0,0 +1,12 @@ +gUnknown_8177AAE:: @ 8177AAE + .string "How many did you catch?\n" + .string "I'm bushed from the effort!$" + +gUnknown_8177AE2:: @ 8177AE2 + .string "I caught a CHANSEY!\p" + .string "That makes this all worthwhile.$" + +gUnknown_8177B16:: @ 8177B16 + .string "Whew!\n" + .string "I'm tired from all the fun!$" + diff --git a/data/maps/SafariZone_Building3/text.inc b/data/maps/SafariZone_Building3/text.inc new file mode 100644 index 000000000..d7956d083 --- /dev/null +++ b/data/maps/SafariZone_Building3/text.inc @@ -0,0 +1,15 @@ +gUnknown_8177B38:: @ 8177B38 + .string "You can keep any item you find in\n" + .string "the SAFARI ZONE.\p" + .string "But, you'll run out of time if you\n" + .string "try for all of them at once.$" + +gUnknown_8177BAB:: @ 8177BAB + .string "Go to the deepest part of the\n" + .string "SAFARI ZONE. You will win a prize!$" + +gUnknown_8177BEC:: @ 8177BEC + .string "My EEVEE evolved into FLAREON.\p" + .string "But, a friend's EEVEE turned into a\n" + .string "VAPOREON. I wonder why?$" + diff --git a/data/maps/SafariZone_Building4/text.inc b/data/maps/SafariZone_Building4/text.inc new file mode 100644 index 000000000..66bf06ba2 --- /dev/null +++ b/data/maps/SafariZone_Building4/text.inc @@ -0,0 +1,22 @@ +Text_177C47:: @ 8177C47 + .string "The SAFARI ZONE's huge, wouldn't\n" + .string "you say?\p" + .string "FUCHSIA's GYM LEADER, KOGA, \n" + .string "patrols the grounds every so often.\p" + .string "Thanks to him, we can play here\n" + .string "knowing that we're safe.$" + +gUnknown_8177CEB:: @ 8177CEB + .string "Tossing ROCKS at POKéMON might\n" + .string "make them run, but they'll be\l" + .string "easier to catch.$" + +gUnknown_8177D39:: @ 8177D39 + .string "Using BAIT will make POKéMON more\n" + .string "likely to stick around if they get\l" + .string "busy eating.$" + +gUnknown_8177D8B:: @ 8177D8B + .string "I hiked a lot, but I didn't see any\n" + .string "POKéMON I wanted.$" + diff --git a/data/maps/SafariZone_Center/text.inc b/data/maps/SafariZone_Center/text.inc new file mode 100644 index 000000000..7116a230a --- /dev/null +++ b/data/maps/SafariZone_Center/text.inc @@ -0,0 +1,11 @@ +gUnknown_81777F2:: @ 81777F2 + .string "REST HOUSE$" + +gUnknown_81777FD:: @ 81777FD + .string "TRAINER TIPS\p" + .string "Press START to check\n" + .string "remaining time.$" + +gUnknown_817782F:: @ 817782F + .string "CENTER AREA$" + diff --git a/data/maps/SafariZone_East/text.inc b/data/maps/SafariZone_East/text.inc new file mode 100644 index 000000000..785cc3a5e --- /dev/null +++ b/data/maps/SafariZone_East/text.inc @@ -0,0 +1,12 @@ +gUnknown_817783B:: @ 817783B + .string "REST HOUSE$" + +gUnknown_8177846:: @ 8177846 + .string "TRAINER TIPS\p" + .string "The remaining time declines only\n" + .string "while you walk.$" + +gUnknown_8177884:: @ 8177884 + .string "AREA 1\n" + .string "WEST: CENTER AREA$" + diff --git a/data/maps/SafariZone_North/text.inc b/data/maps/SafariZone_North/text.inc new file mode 100644 index 000000000..a7978dcfe --- /dev/null +++ b/data/maps/SafariZone_North/text.inc @@ -0,0 +1,21 @@ +gUnknown_817789D:: @ 817789D + .string "REST HOUSE$" + +gUnknown_81778A8:: @ 81778A8 + .string "TRAINER TIPS\p" + .string "The SECRET HOUSE is still ahead.$" + +gUnknown_81778D6:: @ 81778D6 + .string "AREA 2$" + +gUnknown_81778DD:: @ 81778DD + .string "TRAINER TIPS\p" + .string "POKéMON hide in tall grass.\p" + .string "Zigzag through grassy areas to\n" + .string "flush them out.$" + +gUnknown_8177935:: @ 8177935 + .string "TRAINER TIPS\p" + .string "Win a free HM for finding the\n" + .string "SECRET HOUSE.$" + diff --git a/data/maps/SafariZone_SecretHouse/text.inc b/data/maps/SafariZone_SecretHouse/text.inc new file mode 100644 index 000000000..04ea02125 --- /dev/null +++ b/data/maps/SafariZone_SecretHouse/text.inc @@ -0,0 +1,28 @@ +gUnknown_8177DC1:: @ 8177DC1 + .string "Ah! Finally!\p" + .string "You're the first person to reach\n" + .string "the SECRET HOUSE!\p" + .string "Although I made a campaign\n" + .string "for our grand opening,\p" + .string "I was getting worried that no one\n" + .string "would win our campaign prize.\p" + .string "Congratulations!\n" + .string "You have won!$" + +gUnknown_8177E92:: @ 8177E92 + .string "{PLAYER} received HM03\n" + .string "from the attendant!$" + +gUnknown_8177EB7:: @ 8177EB7 + .string "HM03 is SURF.\p" + .string "POKéMON will be able to ferry you\n" + .string "across water using it.\p" + .string "And, this HM isn't disposable, so\n" + .string "you can use it over and over.\p" + .string "You're super lucky for winning this\n" + .string "fabulous prize!$" + +gUnknown_8177F72:: @ 8177F72 + .string "You don't have room for this\n" + .string "fabulous prize!$" + diff --git a/data/maps/SafariZone_West/text.inc b/data/maps/SafariZone_West/text.inc new file mode 100644 index 000000000..14a097ada --- /dev/null +++ b/data/maps/SafariZone_West/text.inc @@ -0,0 +1,20 @@ +gUnknown_817796E:: @ 817796E + .string "REST HOUSE$" + +gUnknown_8177979:: @ 8177979 + .string "REQUEST NOTICE\p" + .string "Please find the SAFARI WARDEN's\n" + .string "lost GOLD TEETH.\l" + .string "They're around here somewhere.\p" + .string "Reward offered!\n" + .string "Contact: WARDEN$" + +gUnknown_81779F8:: @ 81779F8 + .string "TRAINER TIPS\p" + .string "Zone Exploration Campaign!\n" + .string "The Search for the SECRET HOUSE!$" + +gUnknown_8177A41:: @ 8177A41 + .string "AREA 3\n" + .string "EAST: CENTER AREA$" + diff --git a/data/maps/SaffronCity_Dojo/text.inc b/data/maps/SaffronCity_Dojo/text.inc new file mode 100644 index 000000000..d85b5a843 --- /dev/null +++ b/data/maps/SaffronCity_Dojo/text.inc @@ -0,0 +1,105 @@ +Text_19B123:: @ 819B123 + .string "？　みえないぞ‥$" + +Text_19B12C:: @ 819B12C + .string "Grunt!\p" + .string "I am the KARATE MASTER!\n" + .string "I am the LEADER here!\p" + .string "You wish to challenge us?\n" + .string "Expect no mercy!\p" + .string "Fwaaa!$" + +Text_19B193:: @ 819B193 + .string "Hwa!\n" + .string "Arrgh! Beaten!$" + +gUnknown_819B1A7:: @ 819B1A7 + .string "Indeed, I have lost!\p" + .string "But, I beseech you, do not take\n" + .string "our emblem as your trophy!\p" + .string "In return, I will give you a prized\n" + .string "FIGHTING POKéMON!\p" + .string "Choose whichever one you like!$" + +gUnknown_819B24C:: @ 819B24C + .string "Grunt!\n" + .string "Stay and train at karate with us!$" + +Text_19B275:: @ 819B275 + .string "Hoargh!\n" + .string "Take your shoes off!$" + +Text_19B292:: @ 819B292 + .string "I give up!$" + +gUnknown_819B29D:: @ 819B29D + .string "You wait 'til you see our MASTER!\n" + .string "I'm a small fry compared to him!$" + +Text_19B2E0:: @ 819B2E0 + .string "I hear you're good!\n" + .string "Show me!$" + +Text_19B2FD:: @ 819B2FD + .string "Judge!\n" + .string "One point!$" + +gUnknown_819B30F:: @ 819B30F + .string "Our MASTER is a pro fighter.\n" + .string "Be prepared to lose!$" + +Text_19B341:: @ 819B341 + .string "Hiyah!\n" + .string "I have no fear for anything tough!\p" + .string "I shatter boulders for training\n" + .string "every day!$" + +Text_19B396:: @ 819B396 + .string "Yow!\n" + .string "Stubbed fingers!$" + +gUnknown_819B3AC:: @ 819B3AC + .string "The only thing that frightens us is\n" + .string "psychic power!$" + +Text_19B3DF:: @ 819B3DF + .string "Hwaah!\p" + .string "You're trespassing in our\n" + .string "FIGHTING DOJO!$" + +Text_19B40F:: @ 819B40F + .string "Oof!\n" + .string "I give up!$" + +gUnknown_819B41F:: @ 819B41F + .string "The prime fighters across the land\n" + .string "train here.$" + +gUnknown_819B44E:: @ 819B44E + .string "You want the hard-kicking\n" + .string "HITMONLEE?$" + +Text_19B473:: @ 819B473 + .string "{PLAYER} received the {STR_VAR_1}\n" + .string "from the KARATE MASTER.$" + +gUnknown_819B49E:: @ 819B49E + .string "You want the piston-punching\n" + .string "HITMONCHAN?$" + +Text_19B4C7:: @ 819B4C7 + .string "{PLAYER}は　カラテ　だいおう　から\n" + .string "{STR_VAR_1}を　もらった！$" + +gUnknown_819B4E1:: @ 819B4E1 + .string "Better not get greedy…$" + +gUnknown_819B4F8:: @ 819B4F8 + .string "Enemies on every side!$" + +gUnknown_819B50F:: @ 819B50F + .string "What goes around comes around.$" + +gUnknown_819B52E:: @ 819B52E + .string "FIGHTING DOJO$" + diff --git a/data/maps/SaffronCity_Duplicate/text.inc b/data/maps/SaffronCity_Duplicate/text.inc new file mode 100644 index 000000000..aaa009647 --- /dev/null +++ b/data/maps/SaffronCity_Duplicate/text.inc @@ -0,0 +1,106 @@ +gUnknown_8181003:: @ 8181003 + .string "What do you want?\n" + .string "Get lost!$" + +gUnknown_818101F:: @ 818101F + .string "BOSS said he'll take this town\n" + .string "in the name of TEAM ROCKET!$" + +gUnknown_818105A:: @ 818105A + .string "Don't get defiant!\n" + .string "Or I'll have to hurt you!$" + +gUnknown_8181087:: @ 8181087 + .string "SAFFRON belongs to TEAM ROCKET!$" + +gUnknown_81810A7:: @ 81810A7 + .string "My life as a criminal makes me feel\n" + .string "so alive!$" + +gUnknown_81810D5:: @ 81810D5 + .string "Ow!\n" + .string "Watch where you're walking!$" + +gUnknown_81810F5:: @ 81810F5 + .string "With SILPH under control, we can\n" + .string "exploit POKéMON around the world!\p" + .string "We'll get stinking rich, yeahah!$" + +gUnknown_8181159:: @ 8181159 + .string "You beat TEAM ROCKET all alone?\n" + .string "That's amazing!$" + +gUnknown_8181189:: @ 8181189 + .string "Yeah! TEAM ROCKET is gone!\n" + .string "It's safe to go out again!$" + +gUnknown_81811BF:: @ 81811BF + .string "People fled from here in droves\n" + .string "when those ROCKETS came.\p" + .string "They should be flocking back to\n" + .string "SAFFRON now.$" + +gUnknown_8181225:: @ 8181225 + .string "I flew here on my PIDGEOT when\n" + .string "I read about SILPH.\p" + .string "It's already over?\n" + .string "I missed the media action…$" + +gUnknown_8181286:: @ 8181286 + .string "PIDGEOT: Bi bibii!$" + +gUnknown_8181299:: @ 8181299 + .string "I saw the ROCKET BOSS escaping\n" + .string "SILPH's building.$" + +gUnknown_81812CA:: @ 81812CA + .string "I'm a security guard.\p" + .string "Suspicious kids I don't allow in!$" + +gUnknown_8181302:: @ 8181302 + .string "…\n" + .string "Snore…\p" + .string "Hah! He's taking a snooze!$" + +gUnknown_8181326:: @ 8181326 + .string "SAFFRON CITY\n" + .string "Shining, Golden Land of Commerce$" + +gUnknown_8181354:: @ 8181354 + .string "FIGHTING DOJO$" + +gUnknown_8181362:: @ 8181362 + .string "SAFFRON CITY POKéMON GYM\n" + .string "LEADER: SABRINA\l" + .string "The Master of PSYCHIC POKéMON!$" + +gUnknown_81813AA:: @ 81813AA + .string "TRAINER TIPS\p" + .string "FULL HEAL cures all ailments like\n" + .string "burns, paralysis, poisoning,\l" + .string "freezing, and sleep.\p" + .string "It costs a bit more, but it's more\n" + .string "convenient than buying other items.$" + +gUnknown_8181452:: @ 8181452 + .string "TRAINER TIPS\p" + .string "The new GREAT BALL offers improved\n" + .string "catching rates.\p" + .string "Try it on those hard-to-catch\n" + .string "POKéMON.$" + +gUnknown_81814B9:: @ 81814B9 + .string "SILPH CO. OFFICE BUILDING$" + +gUnknown_81814D3:: @ 81814D3 + .string "MR. PSYCHIC'S HOUSE$" + +gUnknown_81814E7:: @ 81814E7 + .string "SILPH's latest product!\n" + .string "Release to be determined…$" + +gUnknown_8181519:: @ 8181519 + .string "POKéMON TRAINER FAN CLUB\p" + .string "Many TRAINERS have scribbled their\n" + .string "names on this sign.$" + diff --git a/data/maps/SaffronCity_Gym/text.inc b/data/maps/SaffronCity_Gym/text.inc new file mode 100644 index 000000000..2d2f1ad1a --- /dev/null +++ b/data/maps/SaffronCity_Gym/text.inc @@ -0,0 +1,160 @@ +Text_19B53C:: @ 819B53C + .string "I had a vision of your arrival.\p" + .string "I have had psychic powers since\n" + .string "I was a child.\p" + .string "It started when a spoon I\n" + .string "carelessly tossed, bent.\p" + .string "I dislike battling, but if you wish,\n" + .string "I will show you my powers!{PLAY_BGM}{BGM_FRLG_LEADER_EYE}$" + +Text_19B602:: @ 819B602 + .string "This loss shocks me!\n" + .string "But, a loss is a loss.\p" + .string "I admit, I didn't work hard enough\n" + .string "to win.\p" + .string "Your victory has earned you the\n" + .string "MARSHBADGE.$" + +gUnknown_819B685:: @ 819B685 + .string "Psychic power isn't something that\n" + .string "only a few people have.\p" + .string "Everyone has psychic power.\n" + .string "People just don't realize it.$" + +gUnknown_819B6FA:: @ 819B6FA + .string "The MARSHBADGE makes POKéMON up\n" + .string "to Lv. 70 obey you.\p" + .string "Stronger POKéMON will become wild,\n" + .string "ignoring your orders in battle.\p" + .string "Just don't raise your POKéMON too\n" + .string "much to avoid that problem.\p" + .string "Wait, please take this TM with you.$" + +gUnknown_819B7D3:: @ 819B7D3 + .string "{PLAYER} received TM04 from\n" + .string "SABRINA.$" + +gUnknown_819B7F2:: @ 819B7F2 + .string "TM04 is CALM MIND.\p" + .string "It makes the POKéMON concentrate\n" + .string "to raise both SP. ATK and SP. DEF.$" + +gUnknown_819B849:: @ 819B849 + .string "Your BAG is full of other items.$" + +Text_19B86A:: @ 819B86A + .string "SABRINA is far younger than I,\n" + .string "but she has earned my respect.$" + +Text_19B8A8:: @ 819B8A8 + .string "Not good enough!$" + +gUnknown_819B8B9:: @ 819B8B9 + .string "In a battle of equals, the one\n" + .string "with the stronger will wins.\p" + .string "If you wish to beat SABRINA, focus\n" + .string "and will yourself to victory.$" + +Text_19B936:: @ 819B936 + .string "Does our unseen power scare you?$" + +Text_19B957:: @ 819B957 + .string "I never foresaw this!$" + +gUnknown_819B96D:: @ 819B96D + .string "PSYCHIC POKéMON fear only ghosts\n" + .string "and bugs!$" + +Text_19B998:: @ 819B998 + .string "POKéMON take on the appearance of\n" + .string "their TRAINERS.\p" + .string "Your POKéMON must be tough, then!$" + +Text_19B9EC:: @ 819B9EC + .string "I knew it!$" + +gUnknown_819B9F7:: @ 819B9F7 + .string "I have much to learn still…\p" + .string "I must master PSYCHIC and teach it\n" + .string "to my POKéMON…$" + +Text_19BA45:: @ 819BA45 + .string "You understand, don't you?\p" + .string "That power alone isn't enough to\n" + .string "win in the world of POKéMON?$" + +Text_19BA9E:: @ 819BA9E + .string "I don't believe this!$" + +gUnknown_819BAB4:: @ 819BAB4 + .string "SABRINA just wiped out the KARATE\n" + .string "MASTER next door.$" + +Text_19BAE8:: @ 819BAE8 + .string "You and I, our POKéMON shall\n" + .string "battle!$" + +Text_19BB0D:: @ 819BB0D + .string "I lost after all!$" + +gUnknown_819BB1F:: @ 819BB1F + .string "I knew that this was going to take\n" + .string "place.$" + +Text_19BB49:: @ 819BB49 + .string "SABRINA is young, but she's also\n" + .string "our highly skilled LEADER.\p" + .string "You won't reach her easily!$" + +Text_19BBA1:: @ 819BBA1 + .string "Ow!\n" + .string "Down and out!$" + +gUnknown_819BBB3:: @ 819BBB3 + .string "There used to be two POKéMON GYMS\n" + .string "in SAFFRON.\p" + .string "The FIGHTING DOJO next door lost\n" + .string "its GYM status, though.\p" + .string "We simply creamed them when we\n" + .string "decided to have just one GYM.$" + +Text_19BC57:: @ 819BC57 + .string "SAFFRON POKéMON GYM is famous for\n" + .string "training psychics.\p" + .string "You want to see SABRINA, don't\n" + .string "you? I can tell!$" + +Text_19BCBC:: @ 819BCBC + .string "Arrrgh!$" + +gUnknown_819BCC4:: @ 819BCC4 + .string "That's right! I used telepathy to\n" + .string "read your mind!$" + +gUnknown_819BCF6:: @ 819BCF6 + .string "Yo!\n" + .string "Champ in the making!\p" + .string "SABRINA's POKéMON use psychic\n" + .string "power instead of force.\p" + .string "FIGHTING POKéMON are especially\n" + .string "weak against PSYCHIC POKéMON.\p" + .string "They'll get destroyed before they\n" + .string "can even aim a punch!$" + +gUnknown_819BDBB:: @ 819BDBB + .string "Psychic power, huh?\p" + .string "If I had that, I'd make a bundle\n" + .string "at the slots!$" + +gUnknown_819BDFE:: @ 819BDFE + .string "SAFFRON POKéMON GYM\n" + .string "LEADER: SABRINA\p" + .string "WINNING TRAINERS:\n" + .string "{RIVAL}$" + +gUnknown_819BE37:: @ 819BE37 + .string "SAFFRON POKéMON GYM\n" + .string "LEADER: SABRINA\p" + .string "WINNING TRAINERS:\n" + .string "{RIVAL}, {PLAYER}$" + diff --git a/data/maps/SaffronCity_House1_1F/text.inc b/data/maps/SaffronCity_House1_1F/text.inc new file mode 100644 index 000000000..04bedb057 --- /dev/null +++ b/data/maps/SaffronCity_House1_1F/text.inc @@ -0,0 +1,32 @@ +Text_19A9E7:: @ 819A9E7 + .string "AGATHA's GHOST-type POKéMON are\n" + .string "horrifically terrifying in toughness.\p" + .string "I took my FIGHTING-type POKéMON\n" + .string "and raised them to the max.\p" + .string "I went at AGATHA feeling pretty\n" + .string "confident, but she whupped us.\p" + .string "That old lady's also got a really\n" + .string "short fuse, too.\p" + .string "It doesn't take anything to get\n" + .string "that scary lady hollering.$" + +Text_19AB16:: @ 819AB16 + .string "Maybe becoming an ELITE FOUR\n" + .string "member is in the blood.\p" + .string "From what I've heard, LANCE has\n" + .string "a cousin who's a GYM LEADER\l" + .string "somewhere far away.$" + +gUnknown_819AB9B:: @ 819AB9B + .string "My daughter is so self-centered.\n" + .string "She has but a few friends.$" + +gUnknown_819ABD7:: @ 819ABD7 + .string "My daughter likes to mimic people.\n" + .string "It's rather vexing.\p" + .string "Her mimicry has earned her the\n" + .string "nickname COPYCAT around here.$" + +gUnknown_819AC4B:: @ 819AC4B + .string "CHANSEY: Chaan! Sii!$" + diff --git a/data/maps/SaffronCity_House1_2F/text.inc b/data/maps/SaffronCity_House1_2F/text.inc new file mode 100644 index 000000000..d9fc46f7c --- /dev/null +++ b/data/maps/SaffronCity_House1_2F/text.inc @@ -0,0 +1,100 @@ +gUnknown_819AC60:: @ 819AC60 + .string "{PLAYER}: Hi!\n" + .string "Do you like POKéMON?\p" + .string "{PLAYER}: Uh, no, I just asked you.\p" + .string "{PLAYER}: Huh?\n" + .string "You're strange!\p" + .string "COPYCAT: Hmm? Quit mimicking?\n" + .string "But, that's my favorite hobby!$" + +gUnknown_819ACF1:: @ 819ACF1 + .string "{PLAYER}: Hi.\n" + .string "You must like POKéMON.\p" + .string "{PLAYER}: No, not me.\n" + .string "I asked you.\p" + .string "{PLAYER}: Pardon?\n" + .string "You're weird!\l" + .string " \l" + .string "COPYCAT: Hmm? Quit mimicking?\l" + .string "But that's my favorite hobby!$" + +Text_19AD85:: @ 819AD85 + .string "Oh wow!\n" + .string "A POKé DOLL!\p" + .string "For me?\n" + .string "Thank you!\p" + .string "You know what?\n" + .string "I can teach the move MIMIC.$" + +Text_19ADD8:: @ 819ADD8 + .string "Don't you like MIMIC?$" + +Text_19ADEE:: @ 819ADEE + .string "I really love MIMIC!\n" + .string "Who's going to learn it?$" + +Text_19AE1C:: @ 819AE1C + .string "{PLAYER}: Hi!\n" + .string "Thanks for earlier!\p" + .string "{PLAYER}: Pardon?\p" + .string "{PLAYER}: Is it that fun to mimic my\n" + .string "every move?\p" + .string "COPYCAT: You bet!\n" + .string "It's a scream!$" + +Text_19AE90:: @ 819AE90 + .string "{PLAYER}: Hi!\n" + .string "Thanks for what you did for us.\p" + .string "{PLAYER}: Pardon?\p" + .string "{PLAYER}: Is it really that fun to\n" + .string "copy what I say and do?\p" + .string "COPYCAT: You bet!\n" + .string "It's a scream!$" + +Text_19AF1A:: @ 819AF1A + .string "にもつが　いっぱいね！$" + +Text_19AF26:: @ 819AF26 + .string "{PLAYER}“やあ！　こんにちは！\n" + .string "きみ　ポケモン　すきかい？\p" + .string "{PLAYER}“ぼく　じゃなくって\n" + .string "きみに　きいてるんだ　けど\p" + .string "{PLAYER}“‥‥　えー　なんだよ！\n" + .string "ヘンな　やつ　だなあ！\p" + .string "モノマネむすめ“‥‥　なに？\n" + .string "ひとの　マネ　すんなって？\p" + .string "だって　あたし　\n" + .string "ものまね　しゅみ　なんだ　もん！”$" + +Text_19AFB0:: @ 819AFB0 + .string "{PLAYER}“こんにちは！\n" + .string "ポケモン　すきなのね？\p" + .string "{PLAYER}“わたし　じゃなくって\n" + .string "あなたに　きいてるんだ　けど\p" + .string "{PLAYER}“‥　えー　なんなの！\n" + .string "おかしなこ　ねー！\p" + .string "モノマネむすめ“‥　なに？\n" + .string "ひとの　マネ　すんなって？\p" + .string "だって　あたし\n" + .string "ものまね　しゅみ　なんだ　もん！$" + +gUnknown_819B030:: @ 819B030 + .string "DODUO: Giiih!\p" + .string "PRETTY MIRROR LOOK AT ME,\n" + .string "SEE HOW PRETTY I CAN BE?$" + +gUnknown_819B071:: @ 819B071 + .string "This is a rare POKéMON!\n" + .string "Huh? It's only a doll!$" + +gUnknown_819B0A0:: @ 819B0A0 + .string "A game with MARIO wearing a bucket\n" + .string "on his head!$" + +gUnknown_819B0D0:: @ 819B0D0 + .string "…\p" + .string "My Secrets!\p" + .string "Skill: Mimicry!\n" + .string "Hobby: Collecting dolls!\l" + .string "Favorite POKéMON: CLEFAIRY!$" + diff --git a/data/maps/SaffronCity_House2/text.inc b/data/maps/SaffronCity_House2/text.inc new file mode 100644 index 000000000..9558880b7 --- /dev/null +++ b/data/maps/SaffronCity_House2/text.inc @@ -0,0 +1,20 @@ +gUnknown_819BE74:: @ 819BE74 + .string "…Thank you for writing.\n" + .string "I hope to see you soon!\p" + .string "…Hey!\n" + .string "Don't look at my letter!$" + +gUnknown_819BEC3:: @ 819BEC3 + .string "PIDGEY: Kurukkoo!$" + +gUnknown_819BED5:: @ 819BED5 + .string "The COPYCAT is cute!\n" + .string "I'm getting her a POKé DOLL.$" + +gUnknown_819BF07:: @ 819BF07 + .string "I was given a PP UP as a gift.\p" + .string "It's used to increase the PP of\n" + .string "a POKéMON's move.\p" + .string "I should use it on a powerful move\n" + .string "with only a few PP.$" + diff --git a/data/maps/SaffronCity_House3/text.inc b/data/maps/SaffronCity_House3/text.inc new file mode 100644 index 000000000..42699924f --- /dev/null +++ b/data/maps/SaffronCity_House3/text.inc @@ -0,0 +1,18 @@ +gUnknown_819C142:: @ 819C142 + .string "…Wait! Don't say a word!\p" + .string "You wanted this!$" + +gUnknown_819C16C:: @ 819C16C + .string "{PLAYER} received TM29\n" + .string "from MR. PSYCHIC.$" + +gUnknown_819C18F:: @ 819C18F + .string "You already know, don't you?\n" + .string "TM29 is PSYCHIC.\p" + .string "It's an attack that may also lower\n" + .string "the target's special stats.$" + +gUnknown_819C1FC:: @ 819C1FC + .string "Where do you plan to put this?\n" + .string "You've no room.$" + diff --git a/data/maps/SaffronCity_Mart/text.inc b/data/maps/SaffronCity_Mart/text.inc new file mode 100644 index 000000000..5acbdbd9c --- /dev/null +++ b/data/maps/SaffronCity_Mart/text.inc @@ -0,0 +1,10 @@ +gUnknown_819BF8F:: @ 819BF8F + .string "MAX REPEL keeps weaker POKéMON\n" + .string "from appearing.\p" + .string "MAX REPEL stays effective longer\n" + .string "than SUPER REPEL.$" + +gUnknown_819BFF1:: @ 819BFF1 + .string "REVIVE is costly, but it revives\n" + .string "fainted POKéMON!$" + diff --git a/data/maps/SaffronCity_PokemonCenter_1F/text.inc b/data/maps/SaffronCity_PokemonCenter_1F/text.inc new file mode 100644 index 000000000..8a3e43a10 --- /dev/null +++ b/data/maps/SaffronCity_PokemonCenter_1F/text.inc @@ -0,0 +1,20 @@ +gUnknown_819C023:: @ 819C023 + .string "POKéMON growth rates differ from\n" + .string "species to species.$" + +gUnknown_819C058:: @ 819C058 + .string "SILPH CO. is widely known to all.\p" + .string "It's a victim of its own fame - it\n" + .string "attracted TEAM ROCKET.$" + +gUnknown_819C0B4:: @ 819C0B4 + .string "Sigh…\n" + .string "Wouldn't this be great?\p" + .string "If the ELITE FOUR came and\n" + .string "stomped TEAM ROCKET?$" + +gUnknown_819C102:: @ 819C102 + .string "TEAM ROCKET took off!\n" + .string "We can go out safely again!\l" + .string "That's great!$" + diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/text.inc b/data/maps/SaffronCity_PokemonTrainerFanClub/text.inc new file mode 100644 index 000000000..ecbf0b024 --- /dev/null +++ b/data/maps/SaffronCity_PokemonTrainerFanClub/text.inc @@ -0,0 +1,290 @@ +gUnknown_819C22B:: @ 819C22B + .string "Huh?\n" + .string "You…$" + +gUnknown_819C235:: @ 819C235 + .string "Are you maybe…\n" + .string "… …\p" + .string "You are!\n" + .string "You are {PLAYER}!\p" + .string "We were just talking about you!\p" + .string "We were talking about how an\n" + .string "incredibly good TRAINER appeared.\p" + .string "And that someone is you!\n" + .string "You're so cool!\p" + .string "So, we decided that we'll become\n" + .string "your FAN CLUB!\p" + .string "We all hope you'll keep battling\n" + .string "and show us how cool you are.\p" + .string "That way, maybe other people will\n" + .string "become fans just like me.$" + +gUnknown_819C390:: @ 819C390 + .string "I'll always be cheering for you!\p" + .string "Go, {PLAYER}, go!$" + +gUnknown_819C3BD:: @ 819C3BD + .string "I'll always believe in you,\n" + .string "{PLAYER}.\p" + .string "Please show the others what you're\n" + .string "like when you battle seriously.$" + +gUnknown_819C420:: @ 819C420 + .string "I'm sorry.\n" + .string "I was your fan before.\p" + .string "But now, you seem to have lost\n" + .string "the drive you had before.\p" + .string "Lately, I think {STR_VAR_1} has been\n" + .string "a lot cooler.$" + +gUnknown_819C4A5:: @ 819C4A5 + .string "Oh!\n" + .string "{PLAYER}!\p" + .string "Everyone's been all excited about\n" + .string "you recently.\p" + .string "I can understand why.\n" + .string "I know that you're strong.\p" + .string "But, do you know what?\p" + .string "Once I became {STR_VAR_1}'s fan,\n" + .string "I can't just stop being a fan.$" + +gUnknown_819C55C:: @ 819C55C + .string "I think TRAINERS are so cool when\n" + .string "they're battling.\p" + .string "Don't you think so, too?$" + +gUnknown_819C5A9:: @ 819C5A9 + .string "Oh! It's {PLAYER}!\n" + .string "Too cool!\p" + .string "Oh!\n" + .string "Oh, yeah!\p" + .string "Can you autograph something?\n" + .string "How about my shorts?$" + +gUnknown_819C600:: @ 819C600 + .string "However hot it's been…\p" + .string "And however cold it may get…\p" + .string "I've always believed in, and worn,\n" + .string "shorts!\p" + .string "I'm counting on you to keep\n" + .string "winning!\p" + .string "I believe in you just as much as\n" + .string "I believe in shorts!$" + +gUnknown_819C6BA:: @ 819C6BA + .string "BROCK's my hero!\n" + .string "He's a man among men!\p" + .string "Heheh, I got my mom to do\n" + .string "something for me.\p" + .string "I got her to embroider “BROCK”\n" + .string "on my shorts!$" + +gUnknown_819C73A:: @ 819C73A + .string "… …\p" + .string "… …\n" + .string "I'm BROCK's fan!\p" + .string "Even if I were his only fan,\n" + .string "I swear it on my rock-hard will,\l" + .string "and on my shorts!\p" + .string "I'll be his fan to the bitter end!$" + +gUnknown_819C7C8:: @ 819C7C8 + .string "BROCK's the last word on cool,\n" + .string "end of story!\p" + .string "Now there's a guy who I want to\n" + .string "be like!$" + +gUnknown_819C81E:: @ 819C81E + .string "{PLAYER}, I've had the pleasure of\n" + .string "watching you battle.\p" + .string "It brings back sweet memories of\n" + .string "my own long-lost youth.\p" + .string "May you continue to find success.\n" + .string "You have a fan in me!$" + +gUnknown_819C8C1:: @ 819C8C1 + .string "I have journeyed far and wide\n" + .string "across the lands.\p" + .string "But never have I seen a TRAINER\n" + .string "of your magnificence.\p" + .string "Take courage in your abilities\n" + .string "and keep battling on!\p" + .string "Make that a promise to me,\n" + .string "my young idol!$" + +gUnknown_819C986:: @ 819C986 + .string "Hmm…\n" + .string "And you are?\p" + .string "Were you hoping to sign up for\n" + .string "a membership in our FAN CLUB?$" + +gUnknown_819C9D5:: @ 819C9D5 + .string "Ah, so you are the much-\n" + .string "talked-about {PLAYER}.\p" + .string "You certainly do have the look of\n" + .string "a winner.\p" + .string "But for me to accept you as\n" + .string "a true POKéMON great…\p" + .string "… …\p" + .string "You've still a ways to go!$" + +gUnknown_819CA7C:: @ 819CA7C + .string "All of us gathered here are fans\n" + .string "of POKéMON TRAINERS.\p" + .string "The way they look in battle…\n" + .string "They are the picture of coolness.\p" + .string "Perhaps you will be talked about\n" + .string "here, too, if you keep winning.$" + +gUnknown_819CB32:: @ 819CB32 + .string "It's {PLAYER}!\n" + .string "It's {PLAYER}!\p" + .string "I want to be like {PLAYER} one day!$" + +gUnknown_819CB62:: @ 819CB62 + .string "Everyone stopped being {PLAYER}'s\n" + .string "fan…\p" + .string "But that means I can have {PLAYER}\n" + .string "all to myself!\p" + .string "Yay! Go for it!\n" + .string "My one and only {PLAYER}!$" + +gUnknown_819CBD3:: @ 819CBD3 + .string "Do you know what?\n" + .string "I want to be like SABRINA!\p" + .string "I want to be a psychic girl just\n" + .string "like her!$" + +gUnknown_819CC2B:: @ 819CC2B + .string "Even if I'm the only one, I won't\n" + .string "stop being SABRINA's fan.\p" + .string "My dream is to be like SABRINA,\n" + .string "cute, but cool.\p" + .string "I want to be a psychic girl just\n" + .string "like her!$" + +gUnknown_819CCC2:: @ 819CCC2 + .string "I wonder if I can become a cool\n" + .string "TRAINER one day?$" + +gUnknown_819CCF3:: @ 819CCF3 + .string "Oh, man, oh, man!\n" + .string "Cool! Too cool!\p" + .string "…Huh?\n" + .string "No, not you.\p" + .string "Just the way you battle.\n" + .string "That's cool.$" + +gUnknown_819CD4E:: @ 819CD4E + .string "Yo, {PLAYER}!\p" + .string "Looks like I'm the only one left\n" + .string "out of your fans.\p" + .string "But, you know, I like being an only\n" + .string "fan… It's less stressful.\p" + .string "Keep up and at it!$" + +gUnknown_819CDDA:: @ 819CDDA + .string "{STR_VAR_1}'s cool, huh?\n" + .string "I love the way he talks.\p" + .string "I'd really relish a chance to meet\n" + .string "him in person once.$" + +gUnknown_819CE3A:: @ 819CE3A + .string "Huh, can you believe it?\n" + .string "Everyone turned into your fans.\p" + .string "So after all we've been through,\n" + .string "I'm the lone {STR_VAR_1} fan?\p" + .string "Eh, being the one and only\n" + .string "{STR_VAR_1} fan's my style, anyway.$" + +gUnknown_819CEDF:: @ 819CEDF + .string "Oh, my goodness!\n" + .string "Is it really you, {PLAYER}?\p" + .string "I have to tell you, I adore the\n" + .string "way you battle.\p" + .string "I hope you'll keep at it.\n" + .string "I'll be your number one fan!$" + +gUnknown_819CF6D:: @ 819CF6D + .string "Oh, my goodness!\n" + .string "If it isn't {PLAYER}!\p" + .string "It's so disappointing… I realized\n" + .string "I'm your number-one-and-only fan!\p" + .string "Well, it can't be helped!\n" + .string "Let me cheer you on, at least!\p" + .string "Hurray, hurray, {PLAYER}!$" + +gUnknown_819D01F:: @ 819D01F + .string "Recently, {STR_VAR_1} has been on\n" + .string "fire.\p" + .string "The way he battles… It's just \n" + .string "the way that I like it!$" + +gUnknown_819D075:: @ 819D075 + .string "Oh, hello!\n" + .string "If it isn't {PLAYER}!\p" + .string "Lately, all everyone talks about\n" + .string "is you.\p" + .string "I'm feeling lonesome because I\n" + .string "prefer {STR_VAR_1}.$" + +gUnknown_819D0E3:: @ 819D0E3 + .string "Amazing!\n" + .string "{PLAYER}, you really are amazing!\p" + .string "Instead of just watching, maybe\n" + .string "I should become a TRAINER, too.$" + +gUnknown_819D148:: @ 819D148 + .string "I'm your only fan…\n" + .string "Sigh… This is lonely…\p" + .string "Can't you try harder and make the\n" + .string "others take notice of you?$" + +gUnknown_819D1AE:: @ 819D1AE + .string "Master {STR_VAR_1} is so dignified…\n" + .string "He is so my type.\p" + .string "Why can't the others see the\n" + .string "dignity he simply oozes?$" + +gUnknown_819D211:: @ 819D211 + .string "I believe in Master {STR_VAR_1}\n" + .string "with all my heart.\p" + .string "Even if I am the only one to\n" + .string "believe in him.\p" + .string "I won't ever feel lonesome, though.\p" + .string "Not if I keep thinking about Master\n" + .string "{STR_VAR_1}.$" + +gUnknown_819D2B4:: @ 819D2B4 + .string "Hiyah!\p" + .string "Your battling style is most\n" + .string "educational.\p" + .string "I hope that you will keep plugging\n" + .string "away at success, hiyah!$" + +gUnknown_819D31F:: @ 819D31F + .string "Instead of just watching others\n" + .string "battle, battle yourself!\p" + .string "…My DOJO's MASTER chewed me out\n" + .string "like that…\p" + .string "But I won't let that stop me from\n" + .string "being your fan!\p" + .string "I can't stop being your fan!$" + +gUnknown_819D3D2:: @ 819D3D2 + .string "Hiyah! There is but one TRAINER\n" + .string "who has my respect.\p" + .string "And that is none other than my\n" + .string "MASTER at the FIGHTING DOJO.\p" + .string "You should become a fan of my\n" + .string "MASTER like me! Hiyah!$" + +gUnknown_819D477:: @ 819D477 + .string "Hiyah! I respect my MASTER at the\n" + .string "FIGHTING DOJO.\p" + .string "I will never become a fan of\n" + .string "anyone other than my MASTER!\p" + .string "I will even sneak out of the DOJO\n" + .string "to spread word of his greatness.\p" + .string "Hiyah!$" + diff --git a/data/maps/SeafoamIslands_B4F/text.inc b/data/maps/SeafoamIslands_B4F/text.inc new file mode 100644 index 000000000..b2ef7d7e5 --- /dev/null +++ b/data/maps/SeafoamIslands_B4F/text.inc @@ -0,0 +1,29 @@ +Text_1799E0:: @ 81799E0 + .string "When you're up on a rocky mountain\n" + .string "like this, rockslides are a threat.\p" + .string "Can you imagine?\n" + .string "Boulders tumbling down on you?\p" + .string "That'd be, like, waaaaaaaaaaah!\n" + .string "Total terror!\p" + .string "You don't seem to be scared.\n" + .string "Want to try using ROCK SLIDE?$" + +Text_179AC0:: @ 8179AC0 + .string "Oh, so you are scared after all.$" + +Text_179AE1:: @ 8179AE1 + .string "Which POKéMON should I teach\n" + .string "ROCK SLIDE?$" + +Text_179B0A:: @ 8179B0A + .string "It might be scary to use it in this\n" + .string "tunnel…$" + +gUnknown_8179B36:: @ 8179B36 + .string "Hint: Boulders might change the\n" + .string "flow of water.$" + +gUnknown_8179B65:: @ 8179B65 + .string "DANGER\n" + .string "Fast current!$" + diff --git a/data/maps/SevenIsland/text.inc b/data/maps/SevenIsland/text.inc new file mode 100644 index 000000000..2795443a2 --- /dev/null +++ b/data/maps/SevenIsland/text.inc @@ -0,0 +1,38 @@ +Text_182F01:: @ 8182F01 + .string "Not many people come out here.\p" + .string "If I train here, I'm convinced that\n" + .string "I'll get stronger and stronger.\p" + .string "Yep, stronger and stronger…\p" + .string "How would you like to learn a move\n" + .string "like that? It's SWORDS DANCE.$" + +Text_182FC1:: @ 8182FC1 + .string "Well, that's fine, too.$" + +Text_182FD9:: @ 8182FD9 + .string "All right, pick which POKéMON\n" + .string "I should teach it to.$" + +Text_18300D:: @ 818300D + .string "If only we could keep getting\n" + .string "stronger and stronger, eh?$" + +gUnknown_8183046:: @ 8183046 + .string "SEVEN ISLAND\n" + .string "Quest Island of Infinity$" + +gUnknown_818306C:: @ 818306C + .string "These islands are called the SEVII\n" + .string "ISLANDS because there are seven.\p" + .string "…Or at least that's what the young\n" + .string "people believe.\p" + .string "The truth is, these islands are so\n" + .string "named because they are said to\l" + .string "have been made in seven days.$" + +gUnknown_8183143:: @ 8183143 + .string "This island has been left virtually\n" + .string "untouched in its natural state.\p" + .string "It could be a little difficult to\n" + .string "hike around because of that.$" + diff --git a/data/maps/SevenIsland_House_Room1/text.inc b/data/maps/SevenIsland_House_Room1/text.inc new file mode 100644 index 000000000..2e6c7f2f8 --- /dev/null +++ b/data/maps/SevenIsland_House_Room1/text.inc @@ -0,0 +1,92 @@ +gUnknown_81A049B:: @ 81A049B + .string "I may not look like much now,\n" + .string "but when I was younger…\p" + .string "I flew everywhere, challenging\n" + .string "TRAINERS wherever I found them.\p" + .string "Now, my only source of enjoyment\n" + .string "is reminiscing about the past while\l" + .string "watching battles.$" + +gUnknown_81A0567:: @ 81A0567 + .string "There is a slight breeze blowing\n" + .string "around the box.$" + +gUnknown_81A0598:: @ 81A0598 + .string "Ah!\n" + .string "Welcome, my friend!\p" + .string "Let me tell you something. There's\n" + .string "a hidden room in the basement.\p" + .string "A TRAINER named {STR_VAR_1} is\n" + .string "waiting there now.\p" + .string "Tell me, you did come to challenge\n" + .string "{STR_VAR_1}, am I right?$" + +gUnknown_81A064E:: @ 81A064E + .string "Oh…\n" + .string "You won't battle…\p" + .string "I see, I see.\n" + .string "… …\p" + .string "Well, perhaps if you change your\n" + .string "mind, do come back.$" + +gUnknown_81A06AB:: @ 81A06AB + .string "Ah!\n" + .string "You will battle for me?\p" + .string "It was worth my time moving the\n" + .string "box aside, then.\p" + .string "… …\n" + .string "But there is one slight problem.\p" + .string "This hidden room is not built very\n" + .string "sturdy.\p" + .string "Can I get you to limit it to\n" + .string "battles of three POKéMON per side?$" + +gUnknown_81A0788:: @ 81A0788 + .string "Fine! Before your battle, would\n" + .string "you like to save your game?$" + +gUnknown_81A07C4:: @ 81A07C4 + .string "All right.\n" + .string "Don't hold anything back!$" + +Text_1A07E9:: @ 81A07E9 + .string "{STR_VAR_1}$" + +gUnknown_81A07EC:: @ 81A07EC + .string "The match ended up a draw.$" + +gUnknown_81A0807:: @ 81A0807 + .string "A draw, was it?\p" + .string "However, let me say that it was\n" + .string "a worthy spectacle.\p" + .string "I'd say it was a wonderful battle\n" + .string "with a real sense of depth!$" + +Text_1A0889:: @ 81A0889 + .string "{STR_VAR_1}$" + +gUnknown_81A088C:: @ 81A088C + .string "Bravo!\p" + .string "Bravo, indeed!\n" + .string "What an astounding battle!\p" + .string "It was so astounding, why, it keeps\n" + .string "filling my eyes with tears!\p" + .string "The thrust and parry of expertly\n" + .string "used techniques!\p" + .string "The clash of power upon power!\p" + .string "Yes!\n" + .string "It was sheer magnificence!$" + +Text_1A096E:: @ 81A096E + .string "{STR_VAR_1}$" + +gUnknown_81A0971:: @ 81A0971 + .string "Too bad!\n" + .string "I feel your disappointment.\p" + .string "However, that disappointment is\n" + .string "what will make you better.\p" + .string "Use it, learn from it, and make it\n" + .string "motivate you to seek greatness.\p" + .string "Forget not this disappointment\n" + .string "and redouble your training!$" + diff --git a/data/maps/SevenIsland_Mart/text.inc b/data/maps/SevenIsland_Mart/text.inc new file mode 100644 index 000000000..9716c2427 --- /dev/null +++ b/data/maps/SevenIsland_Mart/text.inc @@ -0,0 +1,17 @@ +gUnknown_81A0A4F:: @ 81A0A4F + .string "POKéMON have personalities of their\n" + .string "own, just like people.\p" + .string "My PIKACHU has a HASTY nature,\n" + .string "so it grew to be a speedy POKéMON.$" + +gUnknown_81A0ACC:: @ 81A0ACC + .string "Okay, preparations are complete\n" + .string "for me to explore the RUINS.$" + +gUnknown_81A0B09:: @ 81A0B09 + .string "I need to fish on SEVEN ISLAND.\p" + .string "That will complete my fishing tour\n" + .string "of the SEVII ISLANDS.\p" + .string "I'd better stock up on some\n" + .string "POKé BALLS first, though.$" + diff --git a/data/maps/SevenIsland_PokemonCenter_1F/text.inc b/data/maps/SevenIsland_PokemonCenter_1F/text.inc new file mode 100644 index 000000000..44e325ca0 --- /dev/null +++ b/data/maps/SevenIsland_PokemonCenter_1F/text.inc @@ -0,0 +1,19 @@ +gUnknown_81A0B98:: @ 81A0B98 + .string "On this island, different events\n" + .string "occur depending on connections.\p" + .string "What are those connections?\p" + .string "They are for you to discover on\n" + .string "your own.$" + +gUnknown_81A0C1F:: @ 81A0C1F + .string "Did you ride a SEAGALLOP ferry\n" + .string "to get here?\p" + .string "There are at least ten of those\n" + .string "high-speed ships.\p" + .string "I don't know where they all go,\n" + .string "though.$" + +gUnknown_81A0CA5:: @ 81A0CA5 + .string "If you're confident, you should\n" + .string "check out TRAINER TOWER.$" + diff --git a/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/text.inc b/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/text.inc new file mode 100644 index 000000000..c6f137869 --- /dev/null +++ b/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/text.inc @@ -0,0 +1,4 @@ +gUnknown_817D31B:: @ 817D31B + .string "A mysterious rumble echoed\n" + .string "somewhere far away.$" + diff --git a/data/maps/SevenIsland_SevaultCanyon/text.inc b/data/maps/SevenIsland_SevaultCanyon/text.inc new file mode 100644 index 000000000..3d728797a --- /dev/null +++ b/data/maps/SevenIsland_SevaultCanyon/text.inc @@ -0,0 +1,122 @@ +Text_18C887:: @ 818C887 + .string "My conditioning's in top form!$" + +Text_18C8A6:: @ 818C8A6 + .string "Huh?\n" + .string "Something's not right…$" + +Text_18C8C2:: @ 818C8C2 + .string "The way I am now, I may have to\n" + .string "hold off on TRAINER TOWER…$" + +Text_18C8FD:: @ 818C8FD + .string "It doesn't matter if you happen to\n" + .string "have the strongest POKéMON…\p" + .string "It doesn't mean a thing if you don't\n" + .string "know how to use them properly!$" + +Text_18C980:: @ 818C980 + .string "You're a master at this.$" + +Text_18C999:: @ 818C999 + .string "You see them every so often,\n" + .string "TRAINERS with awesome POKéMON\l" + .string "who have no idea what to do.\p" + .string "Before training POKéMON, TRAINERS\n" + .string "themselves need to grow up.$" + +Text_18CA2F:: @ 818CA2F + .string "I work to protect the environment.\n" + .string "In turn, nature protects me!$" + +Text_18CA6F:: @ 818CA6F + .string "Whoa! You're tough!\n" + .string "How about protecting me?$" + +Text_18CA9C:: @ 818CA9C + .string "From far out among the stars, our\n" + .string "planet is just a drop of water.\p" + .string "But we want to protect that drop\n" + .string "of water for everyone.$" + +Text_18CB16:: @ 818CB16 + .string "Those shoes you have are pretty\n" + .string "snazzy.$" + +Text_18CB3E:: @ 818CB3E + .string "You're hot stuff in spite of your\n" + .string "cute looks.$" + +Text_18CB6C:: @ 818CB6C + .string "Your mom bought those snazzy\n" + .string "RUNNING SHOES for you?\p" + .string "She must adore you.$" + +Text_18CBB4:: @ 818CBB4 + .string "You look strong.\n" + .string "Let me battle you, please!$" + +Text_18CBE0:: @ 818CBE0 + .string "I knew it!\n" + .string "You're as tough as I thought!$" + +Text_18CC09:: @ 818CC09 + .string "The way you battle has given me\n" + .string "a lot of useful data.\p" + .string "Thanks so much!$" + +Text_18CC4F:: @ 818CC4F + .string "I was given the best possible\n" + .string "education to become this strong.\p" + .string "I don't want to lose to anyone!$" + +Text_18CCAE:: @ 818CCAE + .string "Thank you. I feel like I've been\n" + .string "set free by losing to you.$" + +Text_18CCEA:: @ 818CCEA + .string "For some reason, I get furious\n" + .string "over the slightest thing.\p" + .string "I'll calm myself by breathing\n" + .string "deeply.$" + +Text_18CD49:: @ 818CD49 + .string "LEX: My darling NYA, together\n" + .string "we could win!$" + +Text_18CD75:: @ 818CD75 + .string "LEX: I seem to have been too\n" + .string "careless…$" + +Text_18CD9C:: @ 818CD9C + .string "LEX: I think it was a good\n" + .string "experience for NYA.\p" + .string "You have my gratitude.$" + +Text_18CDE2:: @ 818CDE2 + .string "LEX: May I ask you to battle the\n" + .string "both of us at the same time?$" + +Text_18CE20:: @ 818CE20 + .string "NYA: I'll do my best so I won't\n" + .string "drag down my mentor, LEX!$" + +Text_18CE5A:: @ 818CE5A + .string "NYA: Oh, no…\n" + .string "I'm so sorry, I…$" + +Text_18CE78:: @ 818CE78 + .string "NYA: I think I'm going to need\n" + .string "much more seasoning and tutoring\l" + .string "under LEX…\p" + .string "…So, LEX, please, may I stay with\n" + .string "you like this?$" + +Text_18CEF4:: @ 818CEF4 + .string "NYA: I'm sorry, but may we battle\n" + .string "in two-on-two style?$" + +gUnknown_818CF2B:: @ 818CF2B + .string "SEVAULT CANYON\n" + .string "TANOBY RUINS AHEAD$" + diff --git a/data/maps/SevenIsland_SevaultCanyon_Entrance/text.inc b/data/maps/SevenIsland_SevaultCanyon_Entrance/text.inc new file mode 100644 index 000000000..86ade1dbd --- /dev/null +++ b/data/maps/SevenIsland_SevaultCanyon_Entrance/text.inc @@ -0,0 +1,101 @@ +Text_18C384:: @ 818C384 + .string "トレーナータワーには\n" + .string "いまは　はいれない　みたい‥$" + +Text_18C39E:: @ 818C39E + .string "トレーナータワーが　あいてる！\n" + .string "さっそく　はいってみよう！$" + +Text_18C3BC:: @ 818C3BC + .string "Kyahaha!\n" + .string "I'll flick you away effortlessly!$" + +Text_18C3E7:: @ 818C3E7 + .string "Tch!\n" + .string "Too strong for me!$" + +Text_18C3FF:: @ 818C3FF + .string "What's that?\n" + .string "I don't act the way I look?\p" + .string "Heh, that's a part of my strategy!$" + +Text_18C44B:: @ 818C44B + .string "Howdy!\n" + .string "Are you a member of my fan club?$" + +Text_18C473:: @ 818C473 + .string "Oh, so you're not a fan…\p" + .string "Well, I can change that.\n" + .string "Let me sing for you!$" + +Text_18C4BA:: @ 818C4BA + .string "Lalalah…\n" + .string "My POKéMON, I send them out,\l" + .string "all the girls scream and shout!$" + +Text_18C500:: @ 818C500 + .string "This island is too spread out…\n" + .string "It's not easy patrolling the place.$" + +Text_18C543:: @ 818C543 + .string "Uh-huh…$" + +Text_18C54B:: @ 818C54B + .string "TRAINERS like you from cities,\n" + .string "they sure are tough.\p" + .string "You'll be headed for the TOWER,\n" + .string "won't you?$" + +Text_18C5AA:: @ 818C5AA + .string "I punish people who abuse\n" + .string "POKéMON!$" + +Text_18C5CD:: @ 818C5CD + .string "You don't seem to be a problem\n" + .string "TRAINER.$" + +Text_18C5F5:: @ 818C5F5 + .string "If you treat your POKéMON with\n" + .string "kindness, they'll understand.$" + +Text_18C632:: @ 818C632 + .string "EVE: I'll team up with JON and\n" + .string "battle together.$" + +Text_18C662:: @ 818C662 + .string "EVE: Me and JON, we lost.\n" + .string "Ehehe.$" + +Text_18C683:: @ 818C683 + .string "EVE: I'm going to work harder with\n" + .string "JON.$" + +Text_18C6AB:: @ 818C6AB + .string "EVE: I want to team up with JON\n" + .string "when I battle you.\p" + .string "Come back with two POKéMON, okay?$" + +Text_18C700:: @ 818C700 + .string "JON: When I'm with EVE, it feels\n" + .string "like we could never lose.$" + +Text_18C73B:: @ 818C73B + .string "JON: When I'm with EVE,\n" + .string "it doesn't feel like I've lost!$" + +Text_18C773:: @ 818C773 + .string "JON: When I'm with EVE, I feel\n" + .string "giddy whether I win or lose.\p" + .string "It's magical!$" + +Text_18C7BD:: @ 818C7BD + .string "JON: If it's with EVE, I'll be\n" + .string "happy to battle with you.\p" + .string "So, I'd like to make it a\n" + .string "two-on-two battle, if I may.$" + +gUnknown_818C82D:: @ 818C82D + .string "SEVAULT CANYON ENTRANCE\p" + .string "TRAINERS are asked to refrain from\n" + .string "damaging plants in the CANYON.$" + diff --git a/data/maps/SevenIsland_SevaultCanyon_House/text.inc b/data/maps/SevenIsland_SevaultCanyon_House/text.inc new file mode 100644 index 000000000..0602136b9 --- /dev/null +++ b/data/maps/SevenIsland_SevaultCanyon_House/text.inc @@ -0,0 +1,22 @@ +gUnknown_81A4D72:: @ 81A4D72 + .string "Dance, dance!\n" + .string "CHANSEY Dance!\p" + .string "You join in, too!\n" + .string "Dance, dance!$" + +gUnknown_81A4DAF:: @ 81A4DAF + .string "Would you like to dance?$" + +gUnknown_81A4DC8:: @ 81A4DC8 + .string "Come on, dance!$" + +gUnknown_81A4DD8:: @ 81A4DD8 + .string "{PLAYER} danced the CHANSEY Dance!$" + +gUnknown_81A4DF5:: @ 81A4DF5 + .string "Ahahahaha!\p" + .string "There, you're all chipper now!\n" + .string "Lucky!$" + +gUnknown_81A4E26:: @ 81A4E26 + .string "CHANSEY: Chansi! Chansi!$" diff --git a/data/maps/SevenIsland_TrainerTower/text.inc b/data/maps/SevenIsland_TrainerTower/text.inc new file mode 100644 index 000000000..027b3de54 --- /dev/null +++ b/data/maps/SevenIsland_TrainerTower/text.inc @@ -0,0 +1,97 @@ +Text_18BE5D:: @ 818BE5D + .string "There appear to be many secrets\n" + .string "still unsolved in this world.$" + +Text_18BE9B:: @ 818BE9B + .string "Hmm…$" + +Text_18BEA0:: @ 818BEA0 + .string "I suggest to you that you, too,\n" + .string "give a thought to the secrets and\l" + .string "mysteries of our world once a day.$" + +Text_18BF05:: @ 818BF05 + .string "I'm curious, what compelled you to\n" + .string "come here?$" + +Text_18BF33:: @ 818BF33 + .string "It's been so long since I battled,\n" + .string "my instincts are off.$" + +Text_18BF6C:: @ 818BF6C + .string "There are several ruins on the\n" + .string "SEVII ISLANDS.\p" + .string "The majority of them date back\n" + .string "a long way.$" + +Text_18BFC5:: @ 818BFC5 + .string "It's been said that there are\n" + .string "mysterious stones on this island.\p" + .string "I suspect it has something to do\n" + .string "with the ruins here.$" + +Text_18C03B:: @ 818C03B + .string "Oh, interesting.$" + +Text_18C04C:: @ 818C04C + .string "Those ruins over there…\p" + .string "I haven't had any luck in finding\n" + .string "how I can get inside.$" + +Text_18C09C:: @ 818C09C + .string "A battle with you, so high up!$" + +Text_18C0BB:: @ 818C0BB + .string "Oh, the heartbreak of losing so\n" + .string "easily to you!$" + +Text_18C0EA:: @ 818C0EA + .string "Experience the joy of climbing!$" + +Text_18C10A:: @ 818C10A + .string "I'm pretty familiar with the land\n" + .string "around these parts.$" + +Text_18C140:: @ 818C140 + .string "You don't need to be so pushy.\n" + .string "I'll be happy to tell you.$" + +Text_18C17A:: @ 818C17A + .string "The door to the ruins…\n" + .string "It has these strange patterns\l" + .string "engraved on the outside.\p" + .string "I don't know what they mean,\n" + .string "though.$" + +Text_18C1ED:: @ 818C1ED + .string "I sensed your approach.$" + +Text_18C205:: @ 818C205 + .string "Give up…$" + +Text_18C20E:: @ 818C20E + .string "In your future, I sense that you\n" + .string "will meet many others.\p" + .string "I think you will be linked to each\n" + .string "other by a strange power.$" + +Text_18C283:: @ 818C283 + .string "Somewhere on this island, peculiar\n" + .string "POKéMON are sleeping.$" + +Text_18C2BC:: @ 818C2BC + .string "What an amazing TRAINER!$" + +Text_18C2D5:: @ 818C2D5 + .string "Somewhere on this island, peculiar\n" + .string "POKéMON are sleeping.\p" + .string "Could it be that they're waiting\n" + .string "for you?$" + +gUnknown_818C338:: @ 818C338 + .string "TRAINER TOWER ENTRANCE\n" + .string "Rise to the Challenge, TRAINERS!$" + +gUnknown_818C370:: @ 818C370 + .string "TRAINER TOWER AHEAD$" + diff --git a/data/maps/SevenIsland_TrainerTower_Lobby/text.inc b/data/maps/SevenIsland_TrainerTower_Lobby/text.inc new file mode 100644 index 000000000..bf1e73b91 --- /dev/null +++ b/data/maps/SevenIsland_TrainerTower_Lobby/text.inc @@ -0,0 +1,118 @@ +gUnknown_817C794:: @ 817C794 + .string "Hello!\p" + .string "Welcome to TRAINER TOWER where\n" + .string "TRAINERS gather from all over!$" + +gUnknown_817C7D9:: @ 817C7D9 + .string "TRAINERS from all over the world\n" + .string "gather here to battle.\p" + .string "Let me see…\p" + .string "Right now, there are TRAINERS only\n" + .string "up to Floor {STR_VAR_1}.$" + +gUnknown_817C850:: @ 817C850 + .string "TRAINERS are awaiting your\n" + .string "challenge up to the eighth floor.$" + +Text_17C88D:: @ 817C88D + .string "Would you like to challenge the\n" + .string "waiting TRAINERS?$" + +gUnknown_817C8BF:: @ 817C8BF + .string "Okay, I'll get the clock started,\n" + .string "so give it everything you have.\p" + .string "On your marks…\p" + .string "Get set…\p" + .string "Go!$" + +gUnknown_817C91D:: @ 817C91D + .string "Please do visit us again!$" + +gUnknown_817C937:: @ 817C937 + .string "That was too bad.\p" + .string "I think you put in a tremendous\n" + .string "effort in your battling.\p" + .string "Please come back and try again!$" + +gUnknown_817C9A2:: @ 817C9A2 + .string "I hope you give it your best.$" + +gUnknown_817C9C0:: @ 817C9C0 + .string "When the TRAINERS switch places,\n" + .string "the movement can be hectic.\p" + .string "To avoid the stampede, we moved\n" + .string "the reception counter here.\p" + .string "I'm sorry for the inconvenience.$" + +Text_17CA5A:: @ 817CA5A + .string "Hello…\p" + .string "I am the owner of this TOWER…\p" + .string "How the sky soars above this\n" + .string "rooftop…\p" + .string "The caress of the winds up here…\p" + .string "It's all so perfect…\p" + .string "The way you battled…\n" + .string "It, too, was perfection…$" + +Text_17CB09:: @ 817CB09 + .string "This is for you…$" + +Text_17CB1A:: @ 817CB1A + .string "Oh!\n" + .string "Stupendous!\p" + .string "It's marvelous how you've come up\n" + .string "here so quickly.\p" + .string "The fact is, you've done it in\n" + .string "record time…\p" + .string "I'll have your record posted at\n" + .string "the reception counter.$" + +Text_17CBC0:: @ 817CBC0 + .string "You seem to have taken your sweet\n" + .string "time getting here…$" + +Text_17CBF5:: @ 817CBF5 + .string "What I would like to see is a\n" + .string "better time out of you…\p" + .string "I'm counting on you.\p" + .string "Until then, farewell…$" + +Text_17CC56:: @ 817CC56 + .string "{STR_VAR_1} min. {STR_VAR_2}.{STR_VAR_3} sec.$" + +Text_17CC69:: @ 817CC69 + .string "せいせきひょうです$" + +Text_17CC73:: @ 817CC73 + .string "This is a two-on-two battle.\p" + .string "You may not battle unless you have\n" + .string "at least two POKéMON.$" + +gUnknown_817CCC9:: @ 817CCC9 + .string "Here at TRAINER TOWER, there is an\n" + .string "event called TIME ATTACK.\p" + .string "You will be timed on how quickly\n" + .string "you can get from the reception\l" + .string "counter to the OWNER on the roof.\p" + .string "The best times will be recorded on\n" + .string "the Time Board.\p" + .string "Try competing with friends to see\n" + .string "who can beat it the fastest.\p" + .string "You will not earn any EXP. Points\n" + .string "or money by beating TRAINERS here.$" + +gUnknown_817CE1F:: @ 817CE1F + .string "Thank you for competing!$" + +gUnknown_817CE38:: @ 817CE38 + .string "I'm here to see how good I am.\p" + .string "I wonder what kinds of TRAINERS\n" + .string "are waiting for me?\p" + .string "It's nerve-racking!$" + +gUnknown_817CE9F:: @ 817CE9F + .string "Gasp, gasp…\n" + .string "Gasp…\p" + .string "Never mind battling! These stairs…\n" + .string "They're tougher than any battle…$" + diff --git a/data/maps/SilphCo_10F/text.inc b/data/maps/SilphCo_10F/text.inc new file mode 100644 index 000000000..a910cd435 --- /dev/null +++ b/data/maps/SilphCo_10F/text.inc @@ -0,0 +1,33 @@ +Text_176CED:: @ 8176CED + .string "Welcome to 10F!\n" + .string "So good of you to join me!$" + +Text_176D18:: @ 8176D18 + .string "I'm stunned!$" + +gUnknown_8176D25:: @ 8176D25 + .string "Nice try, but the boardroom is up\n" + .string "one more floor.$" + +Text_176D57:: @ 8176D57 + .string "Enough of your silly games!$" + +Text_176D73:: @ 8176D73 + .string "No continues left!$" + +gUnknown_8176D86:: @ 8176D86 + .string "Are you satisfied with beating me?\n" + .string "Then go on home!$" + +gUnknown_8176DBA:: @ 8176DBA + .string "Waaaaa!\n" + .string "I'm scared!$" + +gUnknown_8176DCE:: @ 8176DCE + .string "About me crying…\n" + .string "Please keep it a secret.$" + +gUnknown_8176DF8:: @ 8176DF8 + .string "SILPH CO. HEAD OFFICE\n" + .string "10F$" + diff --git a/data/maps/SilphCo_11F/text.inc b/data/maps/SilphCo_11F/text.inc new file mode 100644 index 000000000..dcb60219a --- /dev/null +++ b/data/maps/SilphCo_11F/text.inc @@ -0,0 +1,94 @@ +gUnknown_8176E12:: @ 8176E12 + .string "PRESIDENT: Oh, dear boy!\n" + .string "Thank you for saving SILPH.\p" + .string "I will never forget you saved us in\n" + .string "our moment of peril.\p" + .string "I have to thank you in some way.\p" + .string "Because I am rich, I can give you\n" + .string "anything.\p" + .string "Here, maybe this will do.$" + +gUnknown_8176EE7:: @ 8176EE7 + .string "PRESIDENT: Oh, dear girl!\n" + .string "Thank you for saving SILPH.\p" + .string "I will never forget you saved us in\n" + .string "our moment of peril.\p" + .string "I have to thank you in some way.\p" + .string "Because I am rich, I can give you\n" + .string "anything.\p" + .string "Here, maybe this will do.$" + +gUnknown_8176FBD:: @ 8176FBD + .string "{PLAYER} obtained a MASTER BALL\n" + .string "from the PRESIDENT!$" + +gUnknown_8176FEB:: @ 8176FEB + .string "PRESIDENT: You can't buy that\n" + .string "anywhere.\p" + .string "It's our secret prototype MASTER\n" + .string "BALL.\p" + .string "It will catch any POKéMON without\n" + .string "fail!\p" + .string "You should be quiet about using it,\n" + .string "though.$" + +gUnknown_817708E:: @ 817708E + .string "You have no room for this.$" + +gUnknown_81770A9:: @ 81770A9 + .string "SECRETARY: Thank you for rescuing\n" + .string "all of us.\p" + .string "We, from the PRESIDENT down,\n" + .string "are indebted to you.$" + +gUnknown_8177108:: @ 8177108 + .string "Ah, {PLAYER}!\n" + .string "So we meet again!\p" + .string "The PRESIDENT and I are discussing\n" + .string "a vital business proposition.\p" + .string "Keep your nose out of grown-up\n" + .string "matters…\p" + .string "Or, experience a world of pain!$" + +Text_1771AB:: @ 81771AB + .string "Arrgh!!\n" + .string "I lost again!?$" + +gUnknown_81771C2:: @ 81771C2 + .string "Blast it all!\n" + .string "You ruined our plans for SILPH!\p" + .string "But, TEAM ROCKET will never fall!\p" + .string "{PLAYER}! Never forget that all\n" + .string "POKéMON exist for TEAM ROCKET!\p" + .string "I must go, but I shall return!$" + +Text_17726A:: @ 817726A + .string "Stop right there!\n" + .string "Don't you move!$" + +Text_17728C:: @ 817728C + .string "Don't…\n" + .string "Please!$" + +gUnknown_817729B:: @ 817729B + .string "So, you want to see my BOSS?$" + +Text_1772B8:: @ 81772B8 + .string "Halt! Do you have an appointment\n" + .string "with my BOSS?$" + +Text_1772E7:: @ 81772E7 + .string "Gaah!\n" + .string "Demolished!$" + +gUnknown_81772F9:: @ 81772F9 + .string "Watch your step…\n" + .string "My BOSS likes his POKéMON tough!$" + +gUnknown_817732B:: @ 817732B + .string "The monitor has POKéMON on it!$" + +gUnknown_817734A:: @ 817734A + .string "SILPH CO. HEAD OFFICE\n" + .string "11F$" + diff --git a/data/maps/SilphCo_1F/text.inc b/data/maps/SilphCo_1F/text.inc new file mode 100644 index 000000000..048102660 --- /dev/null +++ b/data/maps/SilphCo_1F/text.inc @@ -0,0 +1,13 @@ +gUnknown_81754F7:: @ 81754F7 + .string "Welcome.\p" + .string "The PRESIDENT is in the boardroom\n" + .string "on 11F.$" + +Text_17552A:: @ 817552A + .string "めちゃめちゃに　こわされてる\n" + .string "とうぶん　なおりそうに　ない‥$" + +gUnknown_8175549:: @ 8175549 + .string "SILPH CO. HEAD OFFICE\n" + .string "1F$" + diff --git a/data/maps/SilphCo_2F/text.inc b/data/maps/SilphCo_2F/text.inc new file mode 100644 index 000000000..ee3fbc0b0 --- /dev/null +++ b/data/maps/SilphCo_2F/text.inc @@ -0,0 +1,74 @@ +Text_175562:: @ 8175562 + .string "Help!\n" + .string "I'm a SILPH employee.$" + +Text_17557E:: @ 817557E + .string "How did you know\n" + .string "I was a ROCKET?$" + +gUnknown_817559F:: @ 817559F + .string "I work for both SILPH and TEAM\n" + .string "ROCKET.$" + +Text_1755C6:: @ 81755C6 + .string "It's off-limits here!\n" + .string "Go home!$" + +Text_1755E5:: @ 81755E5 + .string "You're good.$" + +gUnknown_81755F2:: @ 81755F2 + .string "Can you solve the maze in here?\n" + .string "It's not easy, I tell you!$" + +Text_17562D:: @ 817562D + .string "No kids are allowed in here!$" + +Text_17564A:: @ 817564A + .string "Tough!$" + +gUnknown_8175651:: @ 8175651 + .string "Diamond-shaped tiles are teleport\n" + .string "blocks.\p" + .string "They're transporters for this\n" + .string "high-tech building.$" + +Text_1756AD:: @ 81756AD + .string "Hey, kid!\n" + .string "What are you wandering here for?$" + +Text_1756D8:: @ 81756D8 + .string "I goofed!$" + +gUnknown_81756E2:: @ 81756E2 + .string "SILPH CO. will be associated with\n" + .string "TEAM ROCKET!$" + +Text_175711:: @ 8175711 + .string "Eeek!\n" + .string "No! Stop! Help!\p" + .string "Oh, you're not with TEAM ROCKET.\n" + .string "I'm sorry, I thought…\p" + .string "Will you forgive me if I teach\n" + .string "you the THUNDER WAVE technique?$" + +Text_17579D:: @ 817579D + .string "Oh…\n" + .string "But THUNDER WAVE is convenient…$" + +Text_1757C1:: @ 81757C1 + .string "Which POKéMON should I teach\n" + .string "THUNDER WAVE?$" + +Text_1757EC:: @ 81757EC + .string "THUNDER WAVE causes paralysis in\n" + .string "the target POKéMON.\p" + .string "A paralyzed POKéMON may be unable\n" + .string "to move in battle.\p" + .string "It's an ELECTRIC-type move, so it\n" + .string "won't work on some POKéMON.$" + +gUnknown_8175894:: @ 8175894 + .string "SILPH CO. HEAD OFFICE\n" + .string "2F$" + diff --git a/data/maps/SilphCo_3F/text.inc b/data/maps/SilphCo_3F/text.inc new file mode 100644 index 000000000..6b8a8d4d1 --- /dev/null +++ b/data/maps/SilphCo_3F/text.inc @@ -0,0 +1,34 @@ +gUnknown_81758AD:: @ 81758AD + .string "I work for SILPH CO.\n" + .string "What am I to do?$" + +gUnknown_81758D3:: @ 81758D3 + .string "{PLAYER}!\n" + .string "You and your POKéMON saved us!$" + +Text_1758F6:: @ 81758F6 + .string "Quit messing with us, kid!$" + +Text_175911:: @ 8175911 + .string "I give up!$" + +gUnknown_817591C:: @ 817591C + .string "A hint? You can open doors with\n" + .string "a CARD KEY!$" + +Text_175948:: @ 8175948 + .string "I support TEAM ROCKET more than\n" + .string "I support SILPH CO.!$" + +Text_17597D:: @ 817597D + .string "You really got me!$" + +gUnknown_8175990:: @ 8175990 + .string "Humph…\p" + .string "TEAM ROCKET said that if I helped\n" + .string "them, they'd let me study POKéMON.$" + +gUnknown_81759DC:: @ 81759DC + .string "SILPH CO. HEAD OFFICE\n" + .string "3F$" + diff --git a/data/maps/SilphCo_4F/text.inc b/data/maps/SilphCo_4F/text.inc new file mode 100644 index 000000000..d8741f9a3 --- /dev/null +++ b/data/maps/SilphCo_4F/text.inc @@ -0,0 +1,45 @@ +gUnknown_81759F5:: @ 81759F5 + .string "Sssh!\n" + .string "Can't you see I'm hiding?$" + +gUnknown_8175A15:: @ 8175A15 + .string "Huh?\n" + .string "TEAM ROCKET is gone?$" + +Text_175A2F:: @ 8175A2F + .string "TEAM ROCKET has taken control\n" + .string "of SILPH CO.!$" + +Text_175A5B:: @ 8175A5B + .string "Arrgh!$" + +gUnknown_8175A62:: @ 8175A62 + .string "Fwahahaha!\n" + .string "My BOSS has been after this place!$" + +Text_175A90:: @ 8175A90 + .string "My POKéMON is my loyal servant.$" + +Text_175AB0:: @ 8175AB0 + .string "Darn!\n" + .string "You weak POKéMON!$" + +gUnknown_8175AC8:: @ 8175AC8 + .string "The doors are electronically\n" + .string "locked.\p" + .string "It takes a CARD KEY to open the\n" + .string "doors here.$" + +Text_175B19:: @ 8175B19 + .string "Intruder spotted!$" + +Text_175B2B:: @ 8175B2B + .string "Who are you?$" + +gUnknown_8175B38:: @ 8175B38 + .string "I better tell the BOSS on 11F!$" + +gUnknown_8175B57:: @ 8175B57 + .string "SILPH CO. HEAD OFFICE\n" + .string "4F$" + diff --git a/data/maps/SilphCo_5F/text.inc b/data/maps/SilphCo_5F/text.inc new file mode 100644 index 000000000..5a768d5f5 --- /dev/null +++ b/data/maps/SilphCo_5F/text.inc @@ -0,0 +1,74 @@ +gUnknown_8175B70:: @ 8175B70 + .string "TEAM ROCKET is in an uproar over\n" + .string "some intruder.\p" + .string "That's you, right?$" + +gUnknown_8175BB3:: @ 8175BB3 + .string "TEAM ROCKET took off!\n" + .string "You're our hero! Thank you!$" + +Text_175BE5:: @ 8175BE5 + .string "I heard a kid was wandering\n" + .string "around.$" + +Text_175C09:: @ 8175C09 + .string "Boom!$" + +gUnknown_8175C0F:: @ 8175C0F + .string "It's not smart to pick a fight with\n" + .string "TEAM ROCKET!$" + +Text_175C40:: @ 8175C40 + .string "We study POKé BALL technology on\n" + .string "this floor.$" + +Text_175C6D:: @ 8175C6D + .string "Dang!\n" + .string "Blast it!$" + +gUnknown_8175C7D:: @ 8175C7D + .string "We worked on the ultimate POKé\n" + .string "BALL which would catch anything.$" + +Text_175CBD:: @ 8175CBD + .string "Whaaat?\p" + .string "There shouldn't be any children\n" + .string "here!$" + +Text_175CEB:: @ 8175CEB + .string "Oh, goodness!$" + +gUnknown_8175CF9:: @ 8175CF9 + .string "You're only on 5F.\n" + .string "It's a long way to my BOSS!$" + +Text_175D28:: @ 8175D28 + .string "Show TEAM ROCKET a little respect!$" + +Text_175D4B:: @ 8175D4B + .string "Cough…\n" + .string "Cough…$" + +gUnknown_8175D59:: @ 8175D59 + .string "Which reminds me.\p" + .string "KOFFING evolves into WEEZING!$" + +gUnknown_8175D89:: @ 8175D89 + .string "It's a POKéMON REPORT!\p" + .string "POKéMON LAB created PORYGON,\n" + .string "the first virtual-reality POKéMON.$" + +gUnknown_8175DE0:: @ 8175DE0 + .string "It's a POKéMON REPORT!\p" + .string "Over 350 POKéMON techniques have\n" + .string "been confirmed.$" + +gUnknown_8175E28:: @ 8175E28 + .string "It's a POKéMON REPORT!\p" + .string "Some POKéMON have been confirmed\n" + .string "to evolve when they are traded.$" + +gUnknown_8175E80:: @ 8175E80 + .string "SILPH CO. HEAD OFFICE\n" + .string "5F$" + diff --git a/data/maps/SilphCo_6F/text.inc b/data/maps/SilphCo_6F/text.inc new file mode 100644 index 000000000..1de83df51 --- /dev/null +++ b/data/maps/SilphCo_6F/text.inc @@ -0,0 +1,86 @@ +Text_175E99:: @ 8175E99 + .string "Those thugs that took over our\n" + .string "building…\p" + .string "Their BOSS said he was looking for\n" + .string "strong POKéMON.\p" + .string "I hope our PRESIDENT managed to\n" + .string "avoid trouble…$" + +gUnknown_8175F24:: @ 8175F24 + .string "The ROCKETS came and took over\n" + .string "the building!$" + +gUnknown_8175F51:: @ 8175F51 + .string "Well, better get back to work.$" + +gUnknown_8175F70:: @ 8175F70 + .string "Oh dear, oh dear.\n" + .string "Help me, please!$" + +gUnknown_8175F93:: @ 8175F93 + .string "We got engaged.\n" + .string "Heheh!$" + +gUnknown_8175FAA:: @ 8175FAA + .string "That man next to me…\n" + .string "He's such a coward!$" + +gUnknown_8175FD3:: @ 8175FD3 + .string "He's so helpless, he needed\n" + .string "someone like me to look after him.$" + +gUnknown_8176012:: @ 8176012 + .string "TEAM ROCKET is trying to conquer\n" + .string "the world with POKéMON.$" + +gUnknown_817604B:: @ 817604B + .string "TEAM ROCKET ran away, and it's all\n" + .string "because of you!$" + +gUnknown_817607E:: @ 817607E + .string "They must have targeted SILPH for\n" + .string "our POKéMON products.$" + +gUnknown_81760B6:: @ 81760B6 + .string "Come work for SILPH when you\n" + .string "get older.$" + +Text_1760DE:: @ 81760DE + .string "I am one of the four ROCKET\n" + .string "BROTHERS!$" + +Text_176104:: @ 8176104 + .string "Flame out!$" + +gUnknown_817610F:: @ 817610F + .string "No matter!\n" + .string "My brothers will avenge me!$" + +Text_176136:: @ 8176136 + .string "That rotten PRESIDENT!\p" + .string "Serves him right for shipping me\n" + .string "off to the TIKSI BRANCH!\p" + .string "That's why TEAM ROCKET came after\n" + .string "us, I'm sure of it!$" + +Text_1761BD:: @ 81761BD + .string "Shoot!$" + +gUnknown_81761C4:: @ 81761C4 + .string "TIKSI BRANCH?\n" + .string "It's in Russian no-man's-land!$" + +Text_1761F1:: @ 81761F1 + .string "You dare betray TEAM ROCKET?$" + +Text_17620E:: @ 817620E + .string "You traitor!$" + +gUnknown_817621B:: @ 817621B + .string "If you stand for justice, you\n" + .string "betray us bad guys!$" + +gUnknown_817624D:: @ 817624D + .string "SILPH CO. HEAD OFFICE\n" + .string "6F$" + diff --git a/data/maps/SilphCo_7F/text.inc b/data/maps/SilphCo_7F/text.inc new file mode 100644 index 000000000..d977d816e --- /dev/null +++ b/data/maps/SilphCo_7F/text.inc @@ -0,0 +1,146 @@ +gUnknown_8176266:: @ 8176266 + .string "Oh! Hi! You're not a ROCKET!\n" + .string "You came to save us?\l" + .string "Why, thank you!\p" + .string "I want you to have this POKéMON\n" + .string "for saving us.$" + +Text_1762D7:: @ 81762D7 + .string "{PLAYER} obtained a LAPRAS from\n" + .string "the SILPH employee!$" + +gUnknown_8176305:: @ 8176305 + .string "It's a LAPRAS.\n" + .string "It's a very intelligent POKéMON.\p" + .string "We kept it in our lab, but it will\n" + .string "be much better off with you.\p" + .string "I think you will be a good TRAINER\n" + .string "for LAPRAS!\p" + .string "It's a good swimmer.\n" + .string "It'll give you a lift across water!$" + +gUnknown_81763DD:: @ 81763DD + .string "TEAM ROCKET's BOSS went to the\n" + .string "boardroom!\p" + .string "Is our PRESIDENT okay?\n" + .string "I'm worried.$" + +Text_17642B:: @ 817642B + .string "あ‥　もう　もてないぞ$" + +Text_176437:: @ 8176437 + .string "たすかったよ　ありがと！$" + +gUnknown_8176444:: @ 8176444 + .string "TEAM ROCKET was after the MASTER\n" + .string "BALL, which catches any POKéMON.$" + +gUnknown_8176486:: @ 8176486 + .string "We canceled the MASTER BALL\n" + .string "project because of TEAM ROCKET.$" + +gUnknown_81764C2:: @ 81764C2 + .string "It would be bad if TEAM ROCKET\n" + .string "took over SILPH or our POKéMON.$" + +gUnknown_8176501:: @ 8176501 + .string "Wow!\p" + .string "You chased off TEAM ROCKET all by\n" + .string "yourself?$" + +gUnknown_8176532:: @ 8176532 + .string "You!\n" + .string "It's really dangerous here!\p" + .string "You came to save me?\n" + .string "You can't!$" + +gUnknown_8176573:: @ 8176573 + .string "Thank you so much!$" + +Text_176586:: @ 8176586 + .string "Uh-oh!\n" + .string "I smell a little mouse!$" + +Text_1765A5:: @ 81765A5 + .string "Lights out!$" + +gUnknown_81765B1:: @ 81765B1 + .string "You won't find my BOSS by just\n" + .string "scurrying around!$" + +Text_1765E2:: @ 81765E2 + .string "Heheh!\p" + .string "You mistook me for a SILPH worker?$" + +Text_17660C:: @ 817660C + .string "I'm done!$" + +gUnknown_8176616:: @ 8176616 + .string "Despite your age, you are a\n" + .string "skilled TRAINER!$" + +Text_176643:: @ 8176643 + .string "I am one of the four ROCKET\n" + .string "BROTHERS!$" + +Text_176669:: @ 8176669 + .string "Aack!\n" + .string "Brothers, I lost!$" + +gUnknown_8176681:: @ 8176681 + .string "Doesn't matter.\n" + .string "My brothers will repay the favor!$" + +Text_1766B3:: @ 81766B3 + .string "A child intruder?\n" + .string "That must be you!$" + +Text_1766D7:: @ 81766D7 + .string "Fine!\n" + .string "I lost!$" + +gUnknown_81766E5:: @ 81766E5 + .string "Go on home before my BOSS gets\n" + .string "ticked off!$" + +gUnknown_8176710:: @ 8176710 + .string "{RIVAL}: What kept you, {PLAYER}?$" + +gUnknown_8176727:: @ 8176727 + .string "{RIVAL}: Hahaha! I thought you'd\n" + .string "turn up if I waited here!\p" + .string "I guess TEAM ROCKET slowed you\n" + .string "down! Not that I care!\p" + .string "I saw you in SAFFRON, so I decided\n" + .string "to see if you got better!$" + +Text_1767D0:: @ 81767D0 + .string "Oh, man!\n" + .string "So, you are ready for BOSS\l" + .string "ROCKET!$" + +Text_1767FC:: @ 81767FC + .string "{RIVAL}“おまえなあ‥\p" + .string "こんな　うでまえじゃ\n" + .string "まだまだ‥\l" + .string "いちにんまえ　とは　いえないぜ$" + +gUnknown_8176827:: @ 8176827 + .string "Well, {PLAYER}!\n" + .string "I'm moving on up and ahead!\p" + .string "By checking my POKéDEX, I'm\n" + .string "starting to see what's strong and\l" + .string "how they evolve!\p" + .string "Am I a genius or what?\p" + .string "I'm going to the POKéMON LEAGUE to\n" + .string "boot out the ELITE FOUR.\p" + .string "I'll become the world's most\n" + .string "powerful TRAINER!\p" + .string "{PLAYER}, well, good luck to you!\n" + .string "Don't sweat it!\l" + .string "Smell ya!$" + +gUnknown_8176954:: @ 8176954 + .string "SILPH CO. HEAD OFFICE\n" + .string "7F$" + diff --git a/data/maps/SilphCo_8F/text.inc b/data/maps/SilphCo_8F/text.inc new file mode 100644 index 000000000..858d5da17 --- /dev/null +++ b/data/maps/SilphCo_8F/text.inc @@ -0,0 +1,42 @@ +gUnknown_817696D:: @ 817696D + .string "I wonder if SILPH is finished…$" + +gUnknown_817698C:: @ 817698C + .string "Thanks for saving us!$" + +Text_1769A2:: @ 81769A2 + .string "That's as far as you'll go!$" + +Text_1769BE:: @ 81769BE + .string "Not enough grit!$" + +gUnknown_81769CF:: @ 81769CF + .string "If you don't turn back…\n" + .string "I'll call for backup!$" + +Text_1769FD:: @ 81769FD + .string "You're causing us problems!$" + +Text_176A19:: @ 8176A19 + .string "Huh?\n" + .string "I lost?$" + +gUnknown_8176A26:: @ 8176A26 + .string "So, what do you think of SILPH\n" + .string "BUILDING's maze?$" + +Text_176A56:: @ 8176A56 + .string "I am one of the four ROCKET\n" + .string "BROTHERS!$" + +Text_176A7C:: @ 8176A7C + .string "Whoo!\n" + .string "Oh, Brothers!$" + +gUnknown_8176A90:: @ 8176A90 + .string "I'll leave you up to my brothers.$" + +gUnknown_8176AB2:: @ 8176AB2 + .string "SILPH CO. HEAD OFFICE\n" + .string "8F$" + diff --git a/data/maps/SilphCo_9F/text.inc b/data/maps/SilphCo_9F/text.inc new file mode 100644 index 000000000..bf400f768 --- /dev/null +++ b/data/maps/SilphCo_9F/text.inc @@ -0,0 +1,55 @@ +Text_176ACB:: @ 8176ACB + .string "TEAM ROCKET's BOSS is terribly\n" + .string "cruel!\p" + .string "To him, POKéMON are just tools to\n" + .string "be used.\p" + .string "What will happen if that tyrant\n" + .string "takes over our company…$" + +gUnknown_8176B54:: @ 8176B54 + .string "You look tired.\n" + .string "You should take a quick nap.$" + +gUnknown_8176B81:: @ 8176B81 + .string "Don't give up!$" + +gUnknown_8176B90:: @ 8176B90 + .string "Thank you so much.$" + +Text_176BA3:: @ 8176BA3 + .string "Your POKéMON seem to adore you,\n" + .string "kid!$" + +Text_176BC8:: @ 8176BC8 + .string "Ghaaah!$" + +gUnknown_8176BD0:: @ 8176BD0 + .string "If I had started as a TRAINER at\n" + .string "your age…$" + +Text_176BFB:: @ 8176BFB + .string "Your POKéMON have weak points!\n" + .string "I can nail them!$" + +Text_176C2B:: @ 8176C2B + .string "You hammered me!$" + +gUnknown_8176C3C:: @ 8176C3C + .string "Exploiting weak spots does work.\n" + .string "Think about type advantages.$" + +Text_176C7A:: @ 8176C7A + .string "I am one of the four ROCKET\n" + .string "BROTHERS!$" + +Text_176CA0:: @ 8176CA0 + .string "Warg!\n" + .string "Brothers, I lost!$" + +gUnknown_8176CB8:: @ 8176CB8 + .string "My brothers will avenge me!$" + +gUnknown_8176CD4:: @ 8176CD4 + .string "SILPH CO. HEAD OFFICE\n" + .string "9F$" + diff --git a/data/maps/SixIsland/text.inc b/data/maps/SixIsland/text.inc new file mode 100644 index 000000000..bade2abd1 --- /dev/null +++ b/data/maps/SixIsland/text.inc @@ -0,0 +1,14 @@ +gUnknown_81831C6:: @ 81831C6 + .string "SIX ISLAND\n" + .string "Fortune Island of Aged Wisdom$" + +gUnknown_81831EF:: @ 81831EF + .string "Keep going this way and you'll get\n" + .string "to the WATER PATH.\p" + .string "Stay on that and you'll get to\n" + .string "the RUIN VALLEY.$" + +gUnknown_8183255:: @ 8183255 + .string "When you're this far away from the\n" + .string "city, the sky at night is fantastic.$" + diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/text.inc b/data/maps/SixIsland_DottedHole_SapphireRoom/text.inc new file mode 100644 index 000000000..713e8cadf --- /dev/null +++ b/data/maps/SixIsland_DottedHole_SapphireRoom/text.inc @@ -0,0 +1,24 @@ +Text_17BD82:: @ 817BD82 + .string "{PLAYER} found a SAPPHIRE!$" + +gUnknown_817BD97:: @ 817BD97 + .string "Fufu… Fufufufu…\n" + .string "I guessed right.\p" + .string "I was right in tailing you!$" + +gUnknown_817BDD4:: @ 817BDD4 + .string "I knew that there was a SAPPHIRE\n" + .string "here, so it belongs to me!\p" + .string "I'll sell it to TEAM ROCKET for\n" + .string "serious money.\p" + .string "…D-don't glare at me like that!\p" + .string "If you want it back, why don't you\n" + .string "go get it after I sell it?\p" + .string "I'll even tell you one of the\n" + .string "passwords to TEAM ROCKET's\l" + .string "WAREHOUSE.\p" + .string "The WAREHOUSE password I know is\n" + .string "“Yes, nah, CHANSEY.”\p" + .string "I'm done.\n" + .string "Don't think badly of me!$" + diff --git a/data/maps/SixIsland_GreenPath/text.inc b/data/maps/SixIsland_GreenPath/text.inc new file mode 100644 index 000000000..97d8bc2c8 --- /dev/null +++ b/data/maps/SixIsland_GreenPath/text.inc @@ -0,0 +1,94 @@ +Text_18B400:: @ 818B400 + .string "I'm having no luck at all.\n" + .string "A battle'd be a change of pace!$" + +Text_18B43B:: @ 818B43B + .string "Nope, no luck at all…$" + +Text_18B451:: @ 818B451 + .string "I can't very well go home without\n" + .string "catching something, though.$" + +Text_18B48F:: @ 818B48F + .string "Gasp… Gasp…\p" + .string "I swam here from SIX ISLE PORT\n" + .string "in one go.$" + +Text_18B4C5:: @ 818B4C5 + .string "Gasp…\n" + .string "Gasp…$" + +Text_18B4D1:: @ 818B4D1 + .string "I'm only at the halfway point…\n" + .string "I'm beat…$" + +Text_18B4FA:: @ 818B4FA + .string "It's not so easy sending POKéMON\n" + .string "out while swimming, you know?$" + +Text_18B539:: @ 818B539 + .string "I didn't lose to you at swimming.\n" + .string "This doesn't bother me.$" + +Text_18B573:: @ 818B573 + .string "Are you headed for the island up\n" + .string "past here?\p" + .string "I didn't see anything interesting\n" + .string "there.$" + +Text_18B5C8:: @ 818B5C8 + .string "AVA: Let's have a two-on-two\n" + .string "marine battle!$" + +Text_18B5F4:: @ 818B5F4 + .string "AVA: Oh, you're amazing!\n" + .string "Even better, you're on your own!$" + +Text_18B62E:: @ 818B62E + .string "AVA: You know, I do prefer the\n" + .string "sea over any pool.$" + +Text_18B660:: @ 818B660 + .string "AVA: You're challenging us to\n" + .string "a battle?\p" + .string "You'll need at least two POKéMON\n" + .string "if you want to do that.$" + +Text_18B6C1:: @ 818B6C1 + .string "GEB: Big Sister, help!\n" + .string "Please battle with me!$" + +Text_18B6EF:: @ 818B6EF + .string "GEB: Wow, Big Sister, this person's\n" + .string "really good!$" + +Text_18B720:: @ 818B720 + .string "GEB: I'm hanging onto my sister\n" + .string "because I can't touch the bottom.$" + +Text_18B762:: @ 818B762 + .string "GEB: Please battle against me and\n" + .string "my sister!\p" + .string "…Oh, you don't have two POKéMON?$" + +Text_18B7B0:: @ 818B7B0 + .string "…Huh?\p" + .string "I was envisioning my house, but\n" + .string "this is where I TELEPORT?$" + +Text_18B7F0:: @ 818B7F0 + .string "Big boo-boo!$" + +Text_18B7FD:: @ 818B7FD + .string "I am so scatterbrained!\p" + .string "I need to focus so I can TELEPORT\n" + .string "properly to my house!$" + +gUnknown_818B84D:: @ 818B84D + .string "GREEN PATH\n" + .string "PATTERN BUSH AHEAD$" + +gUnknown_818B86B:: @ 818B86B + .string "GREEN PATH\n" + .string "Think Green, Keep Nature Clean!$" + diff --git a/data/maps/SixIsland_House/text.inc b/data/maps/SixIsland_House/text.inc new file mode 100644 index 000000000..06fd9c274 --- /dev/null +++ b/data/maps/SixIsland_House/text.inc @@ -0,0 +1,7 @@ +gUnknown_81A412E:: @ 81A412E + .string "There's nothing that young people'd\n" + .string "find exciting here on this island.\p" + .string "But, this is a good place in terms\n" + .string "of nature and history.\p" + .string "Relax and enjoy your stay.$" + diff --git a/data/maps/SixIsland_Mart/text.inc b/data/maps/SixIsland_Mart/text.inc new file mode 100644 index 000000000..34e6275a2 --- /dev/null +++ b/data/maps/SixIsland_Mart/text.inc @@ -0,0 +1,12 @@ +Text_1A41CA:: @ 81A41CA + .string "Play with POKéMON lots and live\n" + .string "a long life!\p" + .string "Take AGATHA, for example.\p" + .string "She set a record for being the\n" + .string "oldest-ever ELITE FOUR member.\p" + .string "She spurs me to do bigger things.$" + +gUnknown_81A4271:: @ 81A4271 + .string "I should buy some MAIL and write\n" + .string "him a letter…$" + diff --git a/data/maps/SixIsland_OutcastIsland/text.inc b/data/maps/SixIsland_OutcastIsland/text.inc new file mode 100644 index 000000000..47b138e41 --- /dev/null +++ b/data/maps/SixIsland_OutcastIsland/text.inc @@ -0,0 +1,13 @@ +Text_18B35A:: @ 818B35A + .string "There're no rare POKéMON around\n" + .string "these parts! Not a one!\p" + .string "That burns me up, man.\n" + .string "I'll take it out on you!$" + +Text_18B3C2:: @ 818B3C2 + .string "…Huh?$" + +gUnknown_818B3C8:: @ 818B3C8 + .string "So listen, you haven't seen any\n" + .string "rare POKéMON, have you?$" + diff --git a/data/maps/SixIsland_PatternBush/text.inc b/data/maps/SixIsland_PatternBush/text.inc new file mode 100644 index 000000000..eddaf1ed9 --- /dev/null +++ b/data/maps/SixIsland_PatternBush/text.inc @@ -0,0 +1,156 @@ +Text_17BF3A:: @ 817BF3A + .string "I'm curious, how do you raise your\n" + .string "POKéMON?$" + +Text_17BF66:: @ 817BF66 + .string "You raise your POKéMON with a\n" + .string "whole lot of love!$" + +gUnknown_817BF97:: @ 817BF97 + .string "In the same way your mother raised\n" + .string "you full of love, you should raise\l" + .string "your POKéMON.$" + +Text_17BFEB:: @ 817BFEB + .string "I'm working to preserve the natural\n" + .string "ecology of POKéMON here.$" + +Text_17C028:: @ 817C028 + .string "Oh, for someone so young, you are\n" + .string "tremendous!$" + +gUnknown_817C056:: @ 817C056 + .string "I'm not saying that you shouldn't\n" + .string "catch POKéMON.\p" + .string "I just want people to raise their\n" + .string "POKéMON responsibly.$" + +Text_17C0BE:: @ 817C0BE + .string "I caught a BUG POKéMON that lives\n" + .string "only around here!$" + +Text_17C0F2:: @ 817C0F2 + .string "Heheh…\n" + .string "Isn't my POKéMON awesome?$" + +gUnknown_817C113:: @ 817C113 + .string "There's a girl near the BUSH who\n" + .string "measures HERACROSS for TRAINERS.$" + +Text_17C155:: @ 817C155 + .string "You know, it just doesn't feel right\n" + .string "if I don't use BUG POKéMON.$" + +Text_17C196:: @ 817C196 + .string "It's okay, losing is a fun part of\n" + .string "POKéMON's appeal, too.$" + +gUnknown_817C1D0:: @ 817C1D0 + .string "By the way, “appeal” is a weird\n" + .string "word, if you think about it.\p" + .string "Like, is it like an orange peel?\n" + .string "Or like a ringing bell?$" + +Text_17C246:: @ 817C246 + .string "Yeah, yeah, yeah!\n" + .string "Look at all the BUG POKéMON!$" + +Text_17C275:: @ 817C275 + .string "I got beat while I was still busy\n" + .string "celebrating!$" + +gUnknown_817C2A4:: @ 817C2A4 + .string "I'm going to bring my little brother\n" + .string "here next time.$" + +Text_17C2D9:: @ 817C2D9 + .string "Look, look! There are funny\n" + .string "patterns on the ground.$" + +Text_17C30D:: @ 817C30D + .string "Super awesome!$" + +gUnknown_817C31C:: @ 817C31C + .string "The funny patterns on the ground…\p" + .string "They look like the patterns on my\n" + .string "grandpa's clothes.$" + +Text_17C373:: @ 817C373 + .string "I bet you think I'm just some guy,\n" + .string "don't you, eh?$" + +Text_17C3A5:: @ 817C3A5 + .string "I bet you think I'm weak,\n" + .string "don't you, eh?$" + +gUnknown_817C3CE:: @ 817C3CE + .string "Ayup, you townies come around all\n" + .string "so dandy with a hat that flashy…\p" + .string "How about giving me that?$" + +Text_17C42B:: @ 817C42B + .string "Take a deep breath.\n" + .string "Isn't the air delicious?$" + +Text_17C458:: @ 817C458 + .string "If you'd like, I can teach you how\n" + .string "to breathe properly.$" + +gUnknown_817C490:: @ 817C490 + .string "First, exhale.\n" + .string "Blow everything out.\p" + .string "When you can't exhale anymore,\n" + .string "inhale the clean air!\p" + .string "Isn't it refreshing?$" + +Text_17C4FE:: @ 817C4FE + .string "I love BUG POKéMON.\n" + .string "That's why I'm here all the time.\p" + .string "Am I the only girl like that?$" + +Text_17C552:: @ 817C552 + .string "I lost, but I'm still laughing.\n" + .string "Am I the only girl like that?$" + +gUnknown_817C590:: @ 817C590 + .string "I'm going to keep on collecting\n" + .string "BUG POKéMON.\p" + .string "Am I the only girl like that?$" + +Text_17C5DB:: @ 817C5DB + .string "This is a good spot.\n" + .string "I'll pitch my tent here.$" + +Text_17C609:: @ 817C609 + .string "Wimped out…$" + +gUnknown_817C615:: @ 817C615 + .string "I'm going to observe the night sky\n" + .string "here.$" + +Text_17C63E:: @ 817C63E + .string "Oh, yuck!\n" + .string "I think a bug stung me!$" + +Text_17C660:: @ 817C660 + .string "It wasn't a bug.\n" + .string "I cut my shin on some grass.$" + +gUnknown_817C68E:: @ 817C68E + .string "A little cut like that…\n" + .string "A little spit's enough to cure it!$" + +Text_17C6C9:: @ 817C6C9 + .string "Have you noticed something odd\n" + .string "about these parts?$" + +Text_17C6FB:: @ 817C6FB + .string "Have you taken a good look around\n" + .string "your feet?$" + +gUnknown_817C728:: @ 817C728 + .string "There are places here in PATTERN\n" + .string "BUSH where grass won't grow.\p" + .string "What could be the cause of such\n" + .string "a phenomenon?$" + diff --git a/data/maps/SixIsland_PokemonCenter_1F/text.inc b/data/maps/SixIsland_PokemonCenter_1F/text.inc new file mode 100644 index 000000000..a7b4f3336 --- /dev/null +++ b/data/maps/SixIsland_PokemonCenter_1F/text.inc @@ -0,0 +1,36 @@ +gUnknown_81A3E02:: @ 81A3E02 + .string "For ten years, I've searched for\n" + .string "RUINS.\p" + .string "No, make that twenty years.\p" + .string "I get this feeling that there's\n" + .string "something hidden on this island.$" + +gUnknown_81A3E87:: @ 81A3E87 + .string "You know of POKéMON that evolve\n" + .string "only upon trading, yes?\p" + .string "But did you know that there are\n" + .string "still others?\p" + .string "Some POKéMON evolve only when\n" + .string "traded while holding specific items.$" + +gUnknown_81A3F30:: @ 81A3F30 + .string "{RIVAL}: Hey, {PLAYER}!\n" + .string "How's your POKéDEX filling up?\p" + .string "It looks like it's impossible to get\n" + .string "all the POKéMON by hanging around\l" + .string "just these parts.\p" + .string "Maybe there are POKéMON we don't\n" + .string "know about somewhere far away…\p" + .string "… … … … … … … … …\p" + .string "Well, if I can't do it, there's no\n" + .string "way for you to get it done.\p" + .string "I'm not going to get all desperate\n" + .string "over this.\p" + .string "I'll keep collecting POKéMON at my\n" + .string "own pace while I train them.\p" + .string "That's what I'll do.\n" + .string "So there's no point staying here.\l" + .string "I may as well leave for home.\p" + .string "That's that, then!\n" + .string "Smell ya later!$" + diff --git a/data/maps/SixIsland_RuinValley/text.inc b/data/maps/SixIsland_RuinValley/text.inc new file mode 100644 index 000000000..14cee7a88 --- /dev/null +++ b/data/maps/SixIsland_RuinValley/text.inc @@ -0,0 +1,23 @@ +gUnknown_818BD47:: @ 818BD47 + .string "I can't figure out how I'm supposed\n" + .string "to get inside.$" + +gUnknown_818BD7A:: @ 818BD7A + .string "Let me tell you, I found this\n" + .string "place.\p" + .string "Don't look so envious, will you?$" + +gUnknown_818BDC0:: @ 818BDC0 + .string "The door doesn't budge at all.\n" + .string "Check it more thoroughly?$" + +gUnknown_818BDF9:: @ 818BDF9 + .string "{PLAYER} left the door alone.$" + +gUnknown_818BE11:: @ 818BE11 + .string "On closer inspection, there are\n" + .string "several dots on the door…$" + +gUnknown_818BE4B:: @ 818BE4B + .string "The door is open.$" + diff --git a/data/maps/SixIsland_WaterPath/text.inc b/data/maps/SixIsland_WaterPath/text.inc new file mode 100644 index 000000000..70a8ce017 --- /dev/null +++ b/data/maps/SixIsland_WaterPath/text.inc @@ -0,0 +1,102 @@ +Text_18B896:: @ 818B896 + .string "I let a pleasant breeze lead me\n" + .string "all the way here.$" + +Text_18B8C8:: @ 818B8C8 + .string "Giggle… You're so cute when you're\n" + .string "determined.$" + +Text_18B8F7:: @ 818B8F7 + .string "I want to go to the woods over\n" + .string "there, but…\p" + .string "There are lots of BUG POKéMON.\n" + .string "They scare me a little.$" + +Text_18B959:: @ 818B959 + .string "I'm practicing in secret so no one\n" + .string "can see me.$" + +Text_18B988:: @ 818B988 + .string "Nobody saw me losing, right?$" + +Text_18B9A5:: @ 818B9A5 + .string "As a performer, I don't want people\n" + .string "to know about the effort I put in.$" + +Text_18B9EC:: @ 818B9EC + .string "What, you're suggesting that you're\n" + .string "sick of seeing SWIMMERS like me?\p" + .string "Aww, don't be hatin'!$" + +Text_18BA47:: @ 818BA47 + .string "Oh, no, no, no.$" + +Text_18BA57:: @ 818BA57 + .string "I couldn't lift the stigma of being\n" + .string "a SWIMMER…$" + +Text_18BA86:: @ 818BA86 + .string "My boyfriend's always busy, so I\n" + .string "come swimming by myself.$" + +Text_18BAC0:: @ 818BAC0 + .string "Awww, I knew this would happen!$" + +Text_18BAE0:: @ 818BAE0 + .string "When I can't be with my boyfriend,\n" + .string "I spend time with the POKéMON he\l" + .string "gave me.$" + +Text_18BB2D:: @ 818BB2D + .string "Tell me, where are the mountains\n" + .string "around these parts?$" + +Text_18BB62:: @ 818BB62 + .string "I lost my way while I was busy\n" + .string "battling!$" + +Text_18BB8B:: @ 818BB8B + .string "Aren't there any mountains around\n" + .string "these parts?$" + +Text_18BBBA:: @ 818BBBA + .string "MIU: Hello, POKéMON!\n" + .string "It's time to play!$" + +Text_18BBE2:: @ 818BBE2 + .string "MIU: Oh, no!\n" + .string "Mommy!$" + +Text_18BBF6:: @ 818BBF6 + .string "MIU: It makes me all sad inside\n" + .string "when we lose…$" + +Text_18BC24:: @ 818BC24 + .string "MIU: MIA and I are TWINS.\n" + .string "We want to battle together.$" + +Text_18BC5A:: @ 818BC5A + .string "MIA: Hello, POKéMON!\n" + .string "It's time to battle!$" + +Text_18BC84:: @ 818BC84 + .string "MIA: You're mean!\n" + .string "You're bad for winning!$" + +Text_18BCAE:: @ 818BCAE + .string "MIA: Ohh…\n" + .string "I'm sorry, my POKéMON…$" + +Text_18BCCF:: @ 818BCCF + .string "MIA: Oh, you only have one\n" + .string "POKéMON?\p" + .string "Don't you feel lonesome?$" + +gUnknown_818BD0C:: @ 818BD0C + .string "Wanted!\n" + .string "The Ultimate Horn!$" + +gUnknown_818BD27:: @ 818BD27 + .string "WATER PATH\n" + .string "Leads to RUIN VALLEY$" + diff --git a/data/maps/SixIsland_WaterPath_House1/text.inc b/data/maps/SixIsland_WaterPath_House1/text.inc new file mode 100644 index 000000000..71ecedc96 --- /dev/null +++ b/data/maps/SixIsland_WaterPath_House1/text.inc @@ -0,0 +1,105 @@ +Text_1A46C6:: @ 81A46C6 + .string "I perfected the ultimate move of\n" + .string "its type…\p" + .string "But will no one take it for\n" + .string "future use?\p" + .string "…Hm? Hmmm!\p" + .string "Y-you…\n" + .string "Th-that {STR_VAR_1}…$" + +Text_1A4737:: @ 81A4737 + .string "…No…\n" + .string "I was just mistaken.$" + +Text_1A4751:: @ 81A4751 + .string "Oh! This is the one!\n" + .string "This is the POKéMON!\p" + .string "This {STR_VAR_1} is worthy of\n" + .string "learning my ultimate move!\p" + .string "Will you allow it?\p" + .string "Will you allow your {STR_VAR_1} to\n" + .string "learn my {STR_VAR_2}?$" + +Text_1A47E5:: @ 81A47E5 + .string "Gaah! You reject it?\n" + .string "No, I won't be dissuaded!$" + +Text_1A4814:: @ 81A4814 + .string "You will allow it?\p" + .string "Then, let me confer my ultimate\n" + .string "{STR_VAR_2} on your {STR_VAR_1}.\p" + .string "Ggggrah-awooo!$" + +Text_1A4865:: @ 81A4865 + .string "Gasp, gasp, gasp…\p" + .string "I didn't think I could teach that\n" + .string "move while I still lived…$" + +Text_1A48B3:: @ 81A48B3 + .string "I implore you to make the best\n" + .string "use of that move and gain power!$" + +Text_1A48F3:: @ 81A48F3 + .string "Gasp, gasp, gasp…\p" + .string "I have no regrets now.\n" + .string "I've passed on everything I know.\p" + .string "Now I can live out my life knowing\n" + .string "my work is done.$" + +Text_1A4972:: @ 81A4972 + .string "After I passed on my knowledge to\n" + .string "you, I felt so much relief.\p" + .string "In fact, I feel rejuvenated,\n" + .string "as if I were younger again!$" + +gUnknown_81A49E9:: @ 81A49E9 + .string "Hera, hera, HERACROSS!\n" + .string "Big and shiny, it's the bug boss!\l" + .string "Love it, need it, HERACROSS!$" + +gUnknown_81A4A3F:: @ 81A4A3F + .string "Eeeeek!\n" + .string "That's a HERACROSS!\p" + .string "Please, please, may I measure how\n" + .string "big it is?$" + +gUnknown_81A4A88:: @ 81A4A88 + .string "Eeeek, it's {STR_VAR_2} inches!\n" + .string "I've never seen anything like this!\l" + .string "You deserve a reward!$" + +gUnknown_81A4AD9:: @ 81A4AD9 + .string "I want to see a much, much bigger\n" + .string "HERACROSS than that one.\p" + .string "Oh, how I adore them, big\n" + .string "HERACROSS!$" + +gUnknown_81A4B39:: @ 81A4B39 + .string "Huh? This {STR_VAR_2}-inch measurement…\n" + .string "Oh, boo! It's the same as before.$" + +gUnknown_81A4B7A:: @ 81A4B7A + .string "Oh, it's just {STR_VAR_2} inches.\n" + .string "The HERACROSS before was bigger.\p" + .string "It was {STR_VAR_3} inches, the biggest\n" + .string "HERACROSS you've brought me.$" + +gUnknown_81A4BEF:: @ 81A4BEF + .string "Oh, no! This won't do!\p" + .string "HERACROSS looks much more macho\n" + .string "and cool, and has a lovely horn!$" + +gUnknown_81A4C47:: @ 81A4C47 + .string "Your BAG is full.\n" + .string "My reward won't fit.$" + +gUnknown_81A4C6E:: @ 81A4C6E + .string "The biggest HERACROSS that I have\n" + .string "ever seen measured so far is:\p" + .string "{STR_VAR_3} inches!$" + +gUnknown_81A4CB9:: @ 81A4CB9 + .string "It's a blank chart of some sort.\p" + .string "It has spaces for writing in\n" + .string "records of some kind.$" + diff --git a/data/maps/SixIsland_WaterPath_House2/text.inc b/data/maps/SixIsland_WaterPath_House2/text.inc new file mode 100644 index 000000000..03c8e187b --- /dev/null +++ b/data/maps/SixIsland_WaterPath_House2/text.inc @@ -0,0 +1,6 @@ +gUnknown_81A4D0D:: @ 81A4D0D + .string "My height is 67.0 inches on the\n" + .string "button.\p" + .string "I know it is this precisely because\n" + .string "my neighbor measured me.$" + diff --git a/data/maps/ThreeIsland/text.inc b/data/maps/ThreeIsland/text.inc new file mode 100644 index 000000000..31e058a67 --- /dev/null +++ b/data/maps/ThreeIsland/text.inc @@ -0,0 +1,167 @@ +gUnknown_8182061:: @ 8182061 + .string "THREE ISLAND\n" + .string "Kin Island of Family Bonding$" + +gUnknown_818208B:: @ 818208B + .string "Hyahoo!\p" + .string "From this day on, this island\n" + .string "belongs to us!$" + +gUnknown_81820C0:: @ 81820C0 + .string "We don't need you people bringing\n" + .string "your noise and trouble here!\p" + .string "We're asking you to go back to\n" + .string "KANTO!$" + +gUnknown_8182125:: @ 8182125 + .string "Hey, go cry somewhere else.\n" + .string "Our boss is on his way.\p" + .string "When he gets here, we'll give you\n" + .string "a k-rad motorbike show you won't\l" + .string "soon forget!$" + +gUnknown_81821A9:: @ 81821A9 + .string "W-what!? Not on your life!\n" + .string "Get off the island now!$" + +gUnknown_81821DC:: @ 81821DC + .string "Who's gonna make me?$" + +gUnknown_81821F1:: @ 81821F1 + .string "Are you the boss?\n" + .string "Go back to KANTO right now!$" + +gUnknown_818221F:: @ 818221F + .string "Hah?\p" + .string "I just got here, pal.\p" + .string "What's with the hostile attitude?\n" + .string "It's mighty cold of you!$" + +gUnknown_8182275:: @ 8182275 + .string "Your gang of followers have been\n" + .string "raising havoc on their bikes.\p" + .string "Do you have any idea how much\n" + .string "trouble they've caused us on the\l" + .string "island?$" + +gUnknown_81822FB:: @ 81822FB + .string "No, man, I don't get it at all.\p" + .string "Look at this place.\n" + .string "What do you do for entertainment?\p" + .string "You ought to be thanking us for\n" + .string "livening up this sleepy village.\p" + .string "But hey, if you insist, you can try\n" + .string "making us leave.$" + +gUnknown_81823C7:: @ 81823C7 + .string "Grr… You cowards…\n" + .string "So tough in a pack…$" + +gUnknown_81823ED:: @ 81823ED + .string "You, what are you staring at?\n" + .string "Don't you know it's not polite?\p" + .string "You wanna make something of it\n" + .string "or what?$" + +gUnknown_8182453:: @ 8182453 + .string "That's smart.\n" + .string "Keep your nose out of this.$" + +gUnknown_818247D:: @ 818247D + .string "Heh, I like your guts.\n" + .string "You'll be losing money to me, but…$" + +Text_1824B7:: @ 81824B7 + .string "Wha…\n" + .string "What is this kid?!$" + +gUnknown_81824CF:: @ 81824CF + .string "Aww, man…\n" + .string "Don't you dare laugh!$" + +gUnknown_81824EF:: @ 81824EF + .string "Aren't you from KANTO?\n" + .string "You should be on our side!$" + +Text_182521:: @ 8182521 + .string "Stop fooling around!$" + +gUnknown_8182536:: @ 8182536 + .string "What's the matter with you,\n" + .string "getting all hot like that?\p" + .string "Totally uncool, man!$" + +gUnknown_8182582:: @ 8182582 + .string "We invited the boss out here,\n" + .string "but you had to mess it up!\p" + .string "You embarrassed us, man!$" + +Text_1825D4:: @ 81825D4 + .string "… … … … … …$" + +gUnknown_81825E2:: @ 81825E2 + .string "Boss, I'm telling you, you've gotta\n" + .string "do something about this kid!$" + +gUnknown_8182623:: @ 8182623 + .string "I've been watching you, and I'd say\n" + .string "you've done enough.\p" + .string "What are you, their friend or\n" + .string "something?\p" + .string "Then I guess you'll be battling me\n" + .string "in their place.$" + +Text_1826B7:: @ 81826B7 + .string "All right, enough!\n" + .string "We'll leave like you wanted!\p" + .string "We'll be happy to see the last of\n" + .string "this boring island!$" + +gUnknown_818271D:: @ 818271D + .string "Humph! Yeah, go right on hanging\n" + .string "around with these hayseeds!$" + +gUnknown_818275A:: @ 818275A + .string "Thank you! Those goons were\n" + .string "nothing but bad trouble.\p" + .string "Oh, look, your POKéMON got hurt\n" + .string "on my account.$" + +gUnknown_81827BE:: @ 81827BE + .string "{PLAYER} was given\n" + .string "a FULL RESTORE.$" + +gUnknown_81827DB:: @ 81827DB + .string "Oh?\n" + .string "Your BAG is full.$" + +gUnknown_81827F1:: @ 81827F1 + .string "You've got seriously impressive\n" + .string "POKéMON with you.$" + +gUnknown_8182823:: @ 8182823 + .string "It'd be fantastic if someone as\n" + .string "strong as you lived here.\p" + .string "I hope you'll at least stay here\n" + .string "a while.\p" + .string "…I beg your pardon?\n" + .string "You're looking for LOSTELLE?\p" + .string "LOSTELLE went off towards BOND\n" + .string "BRIDGE a while ago.$" + +gUnknown_81828EB:: @ 81828EB + .string "THREE ISLAND is actually the most\n" + .string "populous of the islands here.\p" + .string "Still, it could be less sleepy.\p" + .string "But I wouldn't want to see goons\n" + .string "like those BIKERS here again.$" + +gUnknown_818298A:: @ 818298A + .string "I'm going to train my DODUO in the\n" + .string "BERRY FOREST.\p" + .string "When it evolves, I'm going to play\n" + .string "a game on TWO ISLAND.$" + +gUnknown_81829F4:: @ 81829F4 + .string "DODUO: Gigiih!$" + diff --git a/data/maps/ThreeIsland_BerryForest/text.inc b/data/maps/ThreeIsland_BerryForest/text.inc new file mode 100644 index 000000000..807df9c30 --- /dev/null +++ b/data/maps/ThreeIsland_BerryForest/text.inc @@ -0,0 +1,43 @@ +gUnknown_817ADD6:: @ 817ADD6 + .string "LOSTELLE: Whimper… Sniff…\n" + .string "Oh! Please, help!\p" + .string "A scary POKéMON appeared there\n" + .string "a little while ago.\p" + .string "It kept scaring.\n" + .string "It made LOSTELLE scared.\p" + .string "I'm too scared to move!\n" + .string "But I want to go home…$" + +gUnknown_817AE8E:: @ 817AE8E + .string "Oh! Here it comes again!\n" + .string "No! Go away! It's scaring me!\p" + .string "Waaaaaaah!\n" + .string "I want my daddy!$" + +gUnknown_817AEE1:: @ 817AEE1 + .string "Ohh! That was so scary!\n" + .string "Thank you!\p" + .string "LOSTELLE came to pick some\n" + .string "BERRIES.\p" + .string "You can have this!$" + +gUnknown_817AF3B:: @ 817AF3B + .string "What's your name?\p" + .string "LOSTELLE's scared, so can I go\n" + .string "with you to my daddy's house?\p" + .string "Okay!\n" + .string "Let's go home!$" + +gUnknown_817AF9F:: @ 817AF9F + .string "Your BERRY POUCH is full.\n" + .string "I guess you don't want this.$" + +gUnknown_817AFD6:: @ 817AFD6 + .string "Welcome to the BERRY FOREST\p" + .string "Be friendly and share BERRIES with\n" + .string "others and POKéMON.$" + +gUnknown_817B029:: @ 817B029 + .string "Beware of wild, BERRY-loving\n" + .string "POKéMON!$" + diff --git a/data/maps/ThreeIsland_BondBridge/text.inc b/data/maps/ThreeIsland_BondBridge/text.inc new file mode 100644 index 000000000..dbf984c85 --- /dev/null +++ b/data/maps/ThreeIsland_BondBridge/text.inc @@ -0,0 +1,101 @@ +Text_189E42:: @ 8189E42 + .string "The salty tang of the sea…\n" + .string "It tickles my heart.$" + +Text_189E72:: @ 8189E72 + .string "…Sniff, sniff…\n" + .string "Something smells unpleasant…$" + +Text_189E9E:: @ 8189E9E + .string "Perhaps that reek is your sweaty\n" + .string "POKéMON's body odor…$" + +Text_189ED4:: @ 8189ED4 + .string "Where are you off to in such\n" + .string "a hurry?$" + +Text_189EFA:: @ 8189EFA + .string "You're raising some wonderful\n" + .string "POKéMON.$" + +Text_189F21:: @ 8189F21 + .string "If you keep going this way, you'll\n" + .string "eventually reach BERRY FOREST.$" + +Text_189F63:: @ 8189F63 + .string "My mommy said that I can't swim\n" + .string "without my float ring.$" + +Text_189F9A:: @ 8189F9A + .string "Waaah!\n" + .string "Waaah!$" + +Text_189FA8:: @ 8189FA8 + .string "This year, I'm going to finally\n" + .string "learn how to swim!$" + +Text_189FDB:: @ 8189FDB + .string "Yay, yay!\n" + .string "POKéMON!$" + +Text_189FEE:: @ 8189FEE + .string "What happens now?$" + +Text_18A000:: @ 818A000 + .string "Did I just win?\n" + .string "Or did I lose?$" + +Text_18A01F:: @ 818A01F + .string "Oh, no, don't come here!\n" + .string "Please, stay away from me!$" + +Text_18A053:: @ 818A053 + .string "Okay, you've won!\n" + .string "Now will you please go away?$" + +Text_18A082:: @ 818A082 + .string "A POKéMON bit through my \n" + .string "swimsuit.\p" + .string "I can't get out of the water!$" + +Text_18A0C4:: @ 818A0C4 + .string "JOY: We'll teach you what our\n" + .string "favorite POKéMON is!$" + +Text_18A0F7:: @ 818A0F7 + .string "JOY: Ohh…\n" + .string "MEG!$" + +Text_18A106:: @ 818A106 + .string "JOY: Wasn't that fun?\n" + .string "I hope we can battle again!$" + +Text_18A138:: @ 818A138 + .string "JOY: I really want to battle with\n" + .string "MEG.\p" + .string "One POKéMON isn't enough.$" + +Text_18A179:: @ 818A179 + .string "MEG: We'll show you our favorite\n" + .string "POKéMON.$" + +Text_18A1A3:: @ 818A1A3 + .string "MEG: Ohh…\n" + .string "JOY!$" + +Text_18A1B2:: @ 818A1B2 + .string "MEG: JOY, wasn't that fun?$" + +Text_18A1CD:: @ 818A1CD + .string "MEG: I want to battle together\n" + .string "with JOY.\p" + .string "One POKéMON isn't enough.$" + +gUnknown_818A210:: @ 818A210 + .string "BERRY FOREST AHEAD$" + +gUnknown_818A223:: @ 818A223 + .string "BOND BRIDGE\n" + .string "Please be quiet when crossing.\p" + .string "BERRY FOREST AHEAD$" + diff --git a/data/maps/ThreeIsland_DunsparceTunnel/text.inc b/data/maps/ThreeIsland_DunsparceTunnel/text.inc new file mode 100644 index 000000000..e8c5269dd --- /dev/null +++ b/data/maps/ThreeIsland_DunsparceTunnel/text.inc @@ -0,0 +1,27 @@ +gUnknown_817D13B:: @ 817D13B + .string "Hey, there!\n" + .string "How's it going?\p" + .string "What am I doing here, you ask?\n" + .string "Why, I'm prospecting for gold!\p" + .string "When I strike it rich, I'm buying\n" + .string "a house in KANTO.$" + +gUnknown_817D1C9:: @ 817D1C9 + .string "Hey, there! How's it going?\n" + .string "Did you hear? I've struck gold!\p" + .string "You remembered that I was\n" + .string "prospecting, didn't you?\p" + .string "You can't begin to imagine just\n" + .string "how happy I am.\p" + .string "So, I'll show you!\n" + .string "This is for you!$" + +gUnknown_817D28C:: @ 817D28C + .string "That's a NUGGET!\p" + .string "I can't give you any nuggets of\n" + .string "wisdom, so that'll have to do!$" + +gUnknown_817D2DC:: @ 817D2DC + .string "Whoops, your BAG is crammed full!\n" + .string "I'll give this to you later.$" + diff --git a/data/maps/ThreeIsland_House1/text.inc b/data/maps/ThreeIsland_House1/text.inc new file mode 100644 index 000000000..250671619 --- /dev/null +++ b/data/maps/ThreeIsland_House1/text.inc @@ -0,0 +1,9 @@ +gUnknown_81A2F3E:: @ 81A2F3E + .string "LOSTELLE: Hi, {PLAYER}!\n" + .string "You're always so cool!\p" + .string "I'll make lunch for you, too, one\n" + .string "day, {PLAYER}.$" + +gUnknown_81A2F92:: @ 81A2F92 + .string "Rare rocks and gems are displayed.$" + diff --git a/data/maps/ThreeIsland_House2/text.inc b/data/maps/ThreeIsland_House2/text.inc new file mode 100644 index 000000000..cae2b9055 --- /dev/null +++ b/data/maps/ThreeIsland_House2/text.inc @@ -0,0 +1,17 @@ +gUnknown_81A3245:: @ 81A3245 + .string "Urrrrrrrrgggghhhh…\n" + .string "Kwaaaaah!\p" + .string "…It's useless! I can't make this\n" + .string "spoon bend with my mind.\p" + .string "Maybe I really don't have any\n" + .string "psychic powers.$" + +gUnknown_81A32CA:: @ 81A32CA + .string "You know about a girl GYM LEADER\n" + .string "in SAFFRON CITY?\p" + .string "She uses PSYCHIC-type POKéMON,\n" + .string "right?\p" + .string "I admire her, I really do.\p" + .string "I've heard that she's one cool\n" + .string "customer and beautiful, too.$" + diff --git a/data/maps/ThreeIsland_House3/text.inc b/data/maps/ThreeIsland_House3/text.inc new file mode 100644 index 000000000..24b2c86c9 --- /dev/null +++ b/data/maps/ThreeIsland_House3/text.inc @@ -0,0 +1,5 @@ +gUnknown_81A3379:: @ 81A3379 + .string "I bought this house because I\n" + .string "wanted to live somewhere quiet.\p" + .string "Today, I think I'll go out fishing.$" + diff --git a/data/maps/ThreeIsland_House4/text.inc b/data/maps/ThreeIsland_House4/text.inc new file mode 100644 index 000000000..a32fb6a5f --- /dev/null +++ b/data/maps/ThreeIsland_House4/text.inc @@ -0,0 +1,10 @@ +gUnknown_81A33DB:: @ 81A33DB + .string "You must never, ever go out to\n" + .string "the BERRY FOREST alone.\p" + .string "Why?\n" + .string "There are ghosts there.$" + +gUnknown_81A342F:: @ 81A342F + .string "Papa keeps lying to me, and won't\n" + .string "let me go out and play!$" + diff --git a/data/maps/ThreeIsland_House5/text.inc b/data/maps/ThreeIsland_House5/text.inc new file mode 100644 index 000000000..16a034922 --- /dev/null +++ b/data/maps/ThreeIsland_House5/text.inc @@ -0,0 +1,12 @@ +gUnknown_81A3469:: @ 81A3469 + .string "Me?\n" + .string "I'm not LOSTELLE.\p" + .string "She's probably gone to the\n" + .string "BERRY FOREST, I think.\p" + .string "She picks BERRIES there for making\n" + .string "lunch.$" + +gUnknown_81A34DB:: @ 81A34DB + .string "I think I'll go play with LOSTELLE\n" + .string "today.$" + diff --git a/data/maps/ThreeIsland_Mart/text.inc b/data/maps/ThreeIsland_Mart/text.inc new file mode 100644 index 000000000..2618bf28e --- /dev/null +++ b/data/maps/ThreeIsland_Mart/text.inc @@ -0,0 +1,17 @@ +gUnknown_81A3114:: @ 81A3114 + .string "Is it true?\p" + .string "CELADON DEPT. STORE is several\n" + .string "times bigger than this shop?$" + +gUnknown_81A315C:: @ 81A315C + .string "I sometimes buy medicine here.\p" + .string "But a lot of people heal POKéMON\n" + .string "with BERRIES from BERRY FOREST.\p" + .string "After all, BERRIES are free and\n" + .string "they never run out.$" + +gUnknown_81A31F0:: @ 81A31F0 + .string "Those BIKERS were about to trash\n" + .string "this POKéMON MART.\p" + .string "Am I glad they decided to leave!$" + diff --git a/data/maps/ThreeIsland_PokemonCenter_1F/text.inc b/data/maps/ThreeIsland_PokemonCenter_1F/text.inc new file mode 100644 index 000000000..449f80d70 --- /dev/null +++ b/data/maps/ThreeIsland_PokemonCenter_1F/text.inc @@ -0,0 +1,19 @@ +gUnknown_81A2FB5:: @ 81A2FB5 + .string "Hey, did you hear the news?\p" + .string "The PC network here can now link\n" + .string "with PCs in KANTO.\p" + .string "I don't know how that came about,\n" + .string "but it's fantastic!$" + +gUnknown_81A303B:: @ 81A303B + .string "It's impossible to SURF between the\n" + .string "islands around these parts.\p" + .string "The tides are too fast and\n" + .string "treacherous.$" + +gUnknown_81A30A3:: @ 81A30A3 + .string "Let's crush BERRIES!\n" + .string "…That'd be wasting BERRIES?\p" + .string "You can always find some BERRIES\n" + .string "on the ground in BERRY FOREST.$" + diff --git a/data/maps/ThreeIsland_Port/text.inc b/data/maps/ThreeIsland_Port/text.inc new file mode 100644 index 000000000..e98d5f53c --- /dev/null +++ b/data/maps/ThreeIsland_Port/text.inc @@ -0,0 +1,26 @@ +gUnknown_818A261:: @ 818A261 + .string "We're the KANTO RIDER FEDERATION!\n" + .string "Vroom! Vavavavooom! Vroom!\p" + .string "My bike's wimpy, so I have to\n" + .string "make exhaust noises myself!$" + +gUnknown_818A2D8:: @ 818A2D8 + .string "Hey, hey, lady!\n" + .string "Fork over some spending money!$" + +gUnknown_818A307:: @ 818A307 + .string "Aiyeeh!\p" + .string "Wh-who are you?!\n" + .string "I… I'll call the police!$" + +gUnknown_818A339:: @ 818A339 + .string "Those BIKERS…\n" + .string "Are they gone?\p" + .string "Oh, thank goodness!\n" + .string "They certainly had me terrified!$" + +gUnknown_818A38B:: @ 818A38B + .string "Those BIKERS ran off, and\n" + .string "LOSTELLE was found safe.\p" + .string "Everything turned out for the best!$" + diff --git a/data/maps/TwoIsland/text.inc b/data/maps/TwoIsland/text.inc new file mode 100644 index 000000000..fca7d80ee --- /dev/null +++ b/data/maps/TwoIsland/text.inc @@ -0,0 +1,86 @@ +gUnknown_8181A88:: @ 8181A88 + .string "TWO ISLAND\n" + .string "Boon Island for Two$" + +gUnknown_8181AA7:: @ 8181AA7 + .string "Skip & Chomp!\n" + .string "Joyful GAME CORNER$" + +gUnknown_8181AC8:: @ 8181AC8 + .string "DANGER! FAST CURRENT!\n" + .string "Fishing and surfing prohibited!$" + +Text_181AFE:: @ 8181AFE + .string "Oh!\n" + .string "Hello, welcome to my shop!\p" + .string "We've only opened up recently.\p" + .string "Our merchandise is limited, but I\n" + .string "hope we can serve your needs.$" + +Text_181B7C:: @ 8181B7C + .string "I can't tell you how grateful I am\n" + .string "for your rescue of LOSTELLE.\p" + .string "Thanks to your feat, the people of\n" + .string "THREE ISLAND have changed their\l" + .string "attitudes about KANTO people.\p" + .string "And, I'm from KANTO, you see.\p" + .string "The people of THREE ISLAND\n" + .string "helped me add to my merchandise.$" + +Text_181C77:: @ 8181C77 + .string "Hi! I'm giving it my best here.\n" + .string "I hope you do too, {PLAYER}.$" + +Text_181CAE:: @ 8181CAE + .string "Oh, hello, {PLAYER}!\n" + .string "Welcome!\p" + .string "I've started bringing in items from\n" + .string "distant lands.\p" + .string "I've got some rare items in, too.\n" + .string "Please have a look!$" + +gUnknown_8181D2F:: @ 8181D2F + .string "That fellow there, he moved here\n" + .string "from CELADON CITY.\p" + .string "He started up a shop with his\n" + .string "younger brother.\p" + .string "You have to wonder if he knew what\n" + .string "he was getting into.$" + +gUnknown_8181DCA:: @ 8181DCA + .string "The shopkeeper's brother took\n" + .string "a job at the GAME CORNER.\p" + .string "He's trying to pull together money\n" + .string "so they can buy more merchandise.$" + +gUnknown_8181E47:: @ 8181E47 + .string "Listen, listen.\n" + .string "Did you know?\p" + .string "A famous TRAINER came to the\n" + .string "ISLAND a little while back.\p" + .string "He's one of the ELITE FOUR.\n" + .string "His name is BRUNO.\p" + .string "He went away disappointed when he\n" + .string "found out that they were all sold\l" + .string "out of Rage Candybars.$" + +gUnknown_8181F28:: @ 8181F28 + .string "The discerning TRAINER knows to\n" + .string "buy rare items here!$" + +gUnknown_8181F5D:: @ 8181F5D + .string "There's an old woman who lives in\n" + .string "a cottage out on the cape.\p" + .string "She gives the eye to POKéMON.\n" + .string "It's a bit unnerving.$" + +gUnknown_8181FCE:: @ 8181FCE + .string "Boing! Boing!\n" + .string "Have you tried the jumping game?\p" + .string "The POKéMON you can enter…\n" + .string "Boing!\p" + .string "Some go boing!\p" + .string "And some go boooooooing!\p" + .string "Did you know that?\n" + .string "Boing!$" + diff --git a/data/maps/TwoIsland_House/text.inc b/data/maps/TwoIsland_House/text.inc new file mode 100644 index 000000000..0f0aeda5e --- /dev/null +++ b/data/maps/TwoIsland_House/text.inc @@ -0,0 +1,47 @@ +gUnknown_81A2B88:: @ 81A2B88 + .string "I'm the POKéMON MOVE MANIAC.\p" + .string "I know every single move that\n" + .string "POKéMON learn growing up.\p" + .string "I'm also a mushroom maniac.\p" + .string "Bring me two TINYMUSHROOMS,\n" + .string "or one BIG MUSHROOM.\p" + .string "If you do that for me, I'll teach\n" + .string "a move to one POKéMON.$" + +gUnknown_81A2C63:: @ 81A2C63 + .string "Sniff, sniff…\n" + .string "Hm! You smell of MUSHROOMS!\p" + .string "Do you want me to teach a move\n" + .string "to a POKéMON of yours?$" + +gUnknown_81A2CC3:: @ 81A2CC3 + .string "Which POKéMON needs tutoring?$" + +gUnknown_81A2CE1:: @ 81A2CE1 + .string "Which move should I teach?$" + +gUnknown_81A2CFC:: @ 81A2CFC + .string "Sorry…\p" + .string "It doesn't appear as if I have a\n" + .string "move I can teach that POKéMON.$" + +Text_1A2D43:: @ 81A2D43 + .string "Then, I'll need a MUSHROOM or two.\n" + .string "What are you going to give me?$" + +gUnknown_81A2D85:: @ 81A2D85 + .string "{PLAYER} handed over two\n" + .string "TINYMUSHROOMS in exchange.$" + +gUnknown_81A2DB3:: @ 81A2DB3 + .string "{PLAYER} handed over one\n" + .string "BIG MUSHROOM in exchange.$" + +gUnknown_81A2DE0:: @ 81A2DE0 + .string "If your POKéMON need to learn a\n" + .string "move, I need a MUSHROOM or two.$" + +gUnknown_81A2E20:: @ 81A2E20 + .string "Hunh? There isn't a single move\n" + .string "that I can teach an EGG.$" + diff --git a/data/maps/TwoIsland_JoyfulGameCorner/text.inc b/data/maps/TwoIsland_JoyfulGameCorner/text.inc new file mode 100644 index 000000000..21f6dd8ec --- /dev/null +++ b/data/maps/TwoIsland_JoyfulGameCorner/text.inc @@ -0,0 +1,113 @@ +gUnknown_81A2408:: @ 81A2408 + .string "Now, where's LOSTELLE gotten to\n" + .string "today?\p" + .string "She always brings me lunch every\n" + .string "day right about now…$" + +gUnknown_81A2465:: @ 81A2465 + .string "Hm? You, there!\n" + .string "Are you a friend of LOSTELLE's?\p" + .string "Have you seen LOSTELLE around?\n" + .string "I don't know where she might be.\l" + .string "She should've been here long ago.\p" + .string "LOSTELLE's a cutie - she got my\n" + .string "looks - so what if someone…\p" + .string "What if something's happened to\n" + .string "my LOSTELLE?!\p" + .string "Please, help me find her!\n" + .string "Please go search THREE ISLAND!$" + +gUnknown_81A259A:: @ 81A259A + .string "Hah? What is this GAME CORNER?\n" + .string "How much sadder can this get?\p" + .string "Those clowns…\p" + .string "They said they'd be waiting on the\n" + .string "island, so where are they?\p" + .string "Hey, you! Is this the only THREE\n" + .string "ISLAND around here?$" + +gUnknown_81A2658:: @ 81A2658 + .string "Try waking up before you crawl out\n" + .string "of bed, you punk.\p" + .string "This is TWO ISLAND!\p" + .string "Move it! Get your filthy motorbike\n" + .string "out of my place!$" + +gUnknown_81A26D5:: @ 81A26D5 + .string "Huh…\n" + .string "Oh, oh, gotcha.\p" + .string "Tch…\n" + .string "These islands are confusing…$" + +gUnknown_81A270C:: @ 81A270C + .string "Would you look at that?\n" + .string "That punk scuffed up my floor.$" + +gUnknown_81A2743:: @ 81A2743 + .string "Hey, but listen! I'm begging you,\n" + .string "you have to go to THREE ISLAND.\p" + .string "If anything were to happen to my\n" + .string "LOSTELLE…\p" + .string "My place is the house with the red\n" + .string "roof on THREE ISLAND.\p" + .string "She may just show up late here,\n" + .string "so I can't run off anywhere.\p" + .string "That's why I have to get you to do\n" + .string "me this big favor.$" + +gUnknown_81A285C:: @ 81A285C + .string "I'm sorry.\n" + .string "We're not running any games today.$" + +gUnknown_81A288A:: @ 81A288A + .string "We'll get the games going soon\n" + .string "for you!$" + +gUnknown_81A28B2:: @ 81A28B2 + .string "So you rescued LOSTELLE?\n" + .string "How can I thank you?\p" + .string "LOSTELLE, darling, forgive me!\p" + .string "Daddy didn't know you were scared\n" + .string "and in trouble!$" + +gUnknown_81A2931:: @ 81A2931 + .string "LOSTELLE: It's okay, Daddy.\n" + .string "I got to be friends with {PLAYER}!$" + +gUnknown_81A296A:: @ 81A296A + .string "Oh, what's that?\n" + .string "You're saying that this is for me?\p" + .string "How did you know that I love rare\n" + .string "rocks and gems?\p" + .string "You sure know how to make a guy\n" + .string "happy.$" + +Text_1A29F7:: @ 81A29F7 + .string "{PLAYER} handed the METEORITE\n" + .string "to LOSTELLE's daddy.$" + +gUnknown_81A2A24:: @ 81A2A24 + .string "Oh, I see, this is from BILL!\n" + .string "You have to thank him for me!\p" + .string "You know, you've been fantastic.\n" + .string "I want you to have this.$" + +gUnknown_81A2A9A:: @ 81A2A9A + .string "{PLAYER} received a MOON STONE\n" + .string "from LOSTELLE's daddy.$" + +gUnknown_81A2ACA:: @ 81A2ACA + .string "Your BAG's not going to fit another\n" + .string "thing…$" + +gUnknown_81A2AF5:: @ 81A2AF5 + .string "All right, I'll get the GAME CORNER\n" + .string "running right away.\p" + .string "You have to come visit with a\n" + .string "friend.$" + +gUnknown_81A2B53:: @ 81A2B53 + .string "Listen, listen!\p" + .string "Please show me you being cool\n" + .string "again!$" + diff --git a/data/maps/TwoIsland_PokemonCenter_1F/text.inc b/data/maps/TwoIsland_PokemonCenter_1F/text.inc new file mode 100644 index 000000000..514825cdf --- /dev/null +++ b/data/maps/TwoIsland_PokemonCenter_1F/text.inc @@ -0,0 +1,14 @@ +gUnknown_81A2E59:: @ 81A2E59 + .string "Have you visited the GAME CORNER\n" + .string "already?\p" + .string "It's no good to go alone.\n" + .string "You have to take a friend along.$" + +gUnknown_81A2EBE:: @ 81A2EBE + .string "Not many people live on\n" + .string "TWO ISLAND.\p" + .string "There is this old lady who lives\n" + .string "out on the cape.\p" + .string "She's been there since I don't know\n" + .string "when.$" + diff --git a/data/maps/UndergroundPath_EastEntrance/text.inc b/data/maps/UndergroundPath_EastEntrance/text.inc new file mode 100644 index 000000000..f44fb5a21 --- /dev/null +++ b/data/maps/UndergroundPath_EastEntrance/text.inc @@ -0,0 +1,5 @@ +gUnknown_81745D9:: @ 81745D9 + .string "The DEPARTMENT STORE in CELADON\n" + .string "has a great selection.\p" + .string "Do you go there very often?$" + diff --git a/data/maps/UndergroundPath_SouthEntrance/text.inc b/data/maps/UndergroundPath_SouthEntrance/text.inc new file mode 100644 index 000000000..07e9c0368 --- /dev/null +++ b/data/maps/UndergroundPath_SouthEntrance/text.inc @@ -0,0 +1,4 @@ +gUnknown_8174559:: @ 8174559 + .string "People often lose things in the\n" + .string "darkness of the UNDERGROUND PATH.$" + diff --git a/data/maps/UndergroundPath_WestEntrance/text.inc b/data/maps/UndergroundPath_WestEntrance/text.inc new file mode 100644 index 000000000..5447a5206 --- /dev/null +++ b/data/maps/UndergroundPath_WestEntrance/text.inc @@ -0,0 +1,4 @@ +gUnknown_817459B:: @ 817459B + .string "I heard a sleepy POKéMON appeared\n" + .string "out near CELADON CITY, too.$" + diff --git a/data/maps/VermilionCity/text.inc b/data/maps/VermilionCity/text.inc new file mode 100644 index 000000000..bce18d9fb --- /dev/null +++ b/data/maps/VermilionCity/text.inc @@ -0,0 +1,131 @@ +gUnknown_817F723:: @ 817F723 + .string "We're careful about pollution here.\p" + .string "We've heard GRIMER multiplies in\n" + .string "toxic sludge.$" + +gUnknown_817F776:: @ 817F776 + .string "Did you see the S.S. ANNE moored\n" + .string "in the harbor?$" + +gUnknown_817F7A6:: @ 817F7A6 + .string "So, the S.S. ANNE has departed?\p" + .string "She'll be back in VERMILION about\n" + .string "this time next year.$" + +gUnknown_817F7FD:: @ 817F7FD + .string "I'm putting up a building on this\n" + .string "plot of land. I own it all.\p" + .string "My POKéMON is tamping the land\n" + .string "to lay the foundation.$" + +gUnknown_817F871:: @ 817F871 + .string "MACHOP: Guoh! Gogogoh!$" + +gUnknown_817F888:: @ 817F888 + .string "A MACHOP is stomping the land flat.$" + +gUnknown_817F8AC:: @ 817F8AC + .string "The S.S. ANNE is a famous luxury\n" + .string "cruise ship.\p" + .string "It visits VERMILION once a year.$" + +gUnknown_817F8FB:: @ 817F8FB + .string "VERMILION CITY\n" + .string "The Port of Exquisite Sunsets$" + +gUnknown_817F928:: @ 817F928 + .string "NOTICE!\p" + .string "ROUTE 12 may be blocked off by a\n" + .string "sleeping POKéMON.\p" + .string "Detour through ROCK TUNNEL to\n" + .string "LAVENDER TOWN.\p" + .string "VERMILION POLICE$" + +gUnknown_817F9A1:: @ 817F9A1 + .string "POKéMON FAN CLUB\n" + .string "All POKéMON fans welcome!$" + +gUnknown_817F9CC:: @ 817F9CC + .string "VERMILION CITY POKéMON GYM\n" + .string "LEADER: LT. SURGE\l" + .string "The Lightning American!$" + +gUnknown_817FA11:: @ 817FA11 + .string "VERMILION HARBOR$" + +gUnknown_817FA22:: @ 817FA22 + .string "Welcome to the S.S. ANNE!$" + +gUnknown_817FA3C:: @ 817FA3C + .string "Welcome to the S.S. ANNE!\p" + .string "Excuse me, do you have a ticket?$" + +gUnknown_817FA77:: @ 817FA77 + .string "{SIZE}Á{PLAYER} flashed the S.S. TICKET!\p" + .string "{SIZE}ÇGreat!\n" + .string "Welcome to the S.S. ANNE!$" + +gUnknown_817FABA:: @ 817FABA + .string "{SIZE}Á{PLAYER} doesn't have the needed\n" + .string "S.S. TICKET.\p" + .string "{SIZE}ÇSorry!\p" + .string "You need a ticket to get aboard.$" + +gUnknown_817FB10:: @ 817FB10 + .string "The ship set sail.$" + +Text_17FB23:: @ 817FB23 + .string "Ah, you have a TRI-PASS.\p" + .string "Would you like to board\n" + .string "a SEAGALLOP ferry?$" + +Text_17FB67:: @ 817FB67 + .string "Okay, everything's in order.\p" + .string "SEAGALLOP HI-SPEED 7 will be\n" + .string "departing immediately.$" + +Text_17FBB8:: @ 817FBB8 + .string "Ah, you have a RAINBOW PASS.\p" + .string "Would you like to board\n" + .string "a SEAGALLOP ferry?$" + +gUnknown_817FC00:: @ 817FC00 + .string "Oh! That's a MYSTICTICKET!\n" + .string "Now that is rare.\p" + .string "We'll be happy to take you to\n" + .string "NAVEL ROCK anytime.$" + +gUnknown_817FC5F:: @ 817FC5F + .string "Oh! That's an AURORATICKET!\n" + .string "Now that is rare.\p" + .string "We'll be happy to take you to\n" + .string "BIRTH ISLAND anytime.$" + +Text_17FCC1:: @ 817FCC1 + .string "Would you like to board\n" + .string "a SEAGALLOP ferry?$" + +gUnknown_817FCEC:: @ 817FCEC + .string "Okay, everything's in order for you\n" + .string "to board a special ferry.\p" + .string "SEAGALLOP HI-SPEED 10 will be\n" + .string "departing immediately.$" + +gUnknown_817FD5F:: @ 817FD5F + .string "Okay, everything's in order for you\n" + .string "to board a special ferry.\p" + .string "SEAGALLOP HI-SPEED 12 will be\n" + .string "departing immediately.$" + +gUnknown_817FDD2:: @ 817FDD2 + .string "Oh, hello, {PLAYER}!\n" + .string "How are you doing?\p" + .string "It's me, one of PROF. OAK's AIDES.\p" + .string "Did you meet the other AIDE?\p" + .string "He had a package from PROF. OAK\n" + .string "for you, {PLAYER}.\p" + .string "He said he'd look for you around\n" + .string "ROUTE 2, {PLAYER}.\p" + .string "If you're in the ROUTE 2 area,\n" + .string "please look for him.$" + diff --git a/data/maps/VermilionCity_Gym/text.inc b/data/maps/VermilionCity_Gym/text.inc new file mode 100644 index 000000000..6d05aaf99 --- /dev/null +++ b/data/maps/VermilionCity_Gym/text.inc @@ -0,0 +1,140 @@ +Text_194BA4:: @ 8194BA4 + .string "Hey, kid! What do you think you're\n" + .string "doing here?\p" + .string "You won't live long in combat!\n" + .string "Not with your puny power!\p" + .string "I tell you, kid, electric POKéMON\n" + .string "saved me during the war!\p" + .string "They zapped my enemies into\n" + .string "paralysis!\p" + .string "The same as I'll do to you!{PLAY_BGM}{BGM_FRLG_LEADER_EYE}$" + +gUnknown_8194C8E:: @ 8194C8E + .string "A little word of advice, kid!\p" + .string "Electricity is sure powerful!\p" + .string "But, it's useless against GROUND-\n" + .string "type POKéMON!$" + +gUnknown_8194CFA:: @ 8194CFA + .string "The THUNDERBADGE cranks up your\n" + .string "POKéMON's SPEED!\p" + .string "It also lets your POKéMON FLY\n" + .string "lightning-quick anytime, kid!\p" + .string "You're special, kid!\n" + .string "Take this!$" + +gUnknown_8194D87:: @ 8194D87 + .string "{PLAYER} received TM34\n" + .string "from LT. SURGE.$" + +gUnknown_8194DA8:: @ 8194DA8 + .string "TM34 contains SHOCK WAVE!\p" + .string "Teach it to an ELECTRIC POKéMON!$" + +gUnknown_8194DE3:: @ 8194DE3 + .string "Yo, kid, make room in your BAG!$" + +Text_194E03:: @ 8194E03 + .string "Now that's a shocker!\p" + .string "You're the real deal, kid!\p" + .string "Fine, then, take the THUNDERBADGE!$" + +Text_194E57:: @ 8194E57 + .string "When I was in the Army, LT. SURGE\n" + .string "was my strict CO.\p" + .string "He was a hard taskmaster.$" + +Text_194EA5:: @ 8194EA5 + .string "Stop!\n" + .string "You're very good!$" + +gUnknown_8194EBD:: @ 8194EBD + .string "It's not easy opening that door.\p" + .string "LT. SURGE was always famous for\n" + .string "his cautious nature in the Army.$" + +Text_194F1F:: @ 8194F1F + .string "I'm a lightweight, but I'm good\n" + .string "with electricity!\p" + .string "That's why I joined this GYM.$" + +Text_194F6F:: @ 8194F6F + .string "Fried!$" + +gUnknown_8194F76:: @ 8194F76 + .string "Okay, I'll talk!\p" + .string "LT. SURGE said he hid door\n" + .string "switches inside something.$" + +Text_194FBD:: @ 8194FBD + .string "This is no place for kids!\n" + .string "Not even if you're good!$" + +Text_194FF1:: @ 8194FF1 + .string "Wow!\n" + .string "Surprised me!$" + +gUnknown_8195004:: @ 8195004 + .string "LT. SURGE installed the traps in\n" + .string "the GYM himself.\p" + .string "He set up double locks everywhere.\n" + .string "Let me give you a hint.\p" + .string "When you open the first lock, the\n" + .string "second lock is right next to it.$" + +gUnknown_81950B4:: @ 81950B4 + .string "Yo!\n" + .string "Champ in the making!\p" + .string "LT. SURGE has a nickname.\p" + .string "People refer to him as the\n" + .string "Lightning American!\p" + .string "He's an expert on electric\n" + .string "POKéMON.\p" + .string "BIRD/WATER-type POKéMON match\n" + .string "poorly against the ELECTRIC type.\p" + .string "Beware of paralysis, too.\p" + .string "LT. SURGE is very cautious.\p" + .string "He's locked himself in, so it won't\n" + .string "be easy getting to him.$" + +gUnknown_81951EC:: @ 81951EC + .string "Whew!\n" + .string "That match was electric!$" + +gUnknown_819520B:: @ 819520B + .string "VERMILION POKéMON GYM\n" + .string "LEADER: LT. SURGE\p" + .string "WINNING TRAINERS:\n" + .string "{RIVAL}$" + +gUnknown_8195248:: @ 8195248 + .string "VERMILION POKéMON GYM\n" + .string "LEADER: LT. SURGE\p" + .string "WINNING TRAINERS:\n" + .string "{RIVAL}, {PLAYER}$" + +gUnknown_8195289:: @ 8195289 + .string "Nope!\n" + .string "There's only trash here.$" + +gUnknown_81952A8:: @ 81952A8 + .string "Hey! There's a switch under the\n" + .string "trash! Turn it on!\p" + .string "The first electric lock opened!$" + +Text_1952FB:: @ 81952FB + .string "ガサゴソ‥！\n" + .string "おっと！　ゴミばこの　そこに\l" + .string "また　スイッチが　あった！\l" + .string "おして　みよう！　‥　ポチッとな$" + +gUnknown_8195330:: @ 8195330 + .string "The second electric lock opened!\n" + .string "The motorized door opened!$" + +gUnknown_819536C:: @ 819536C + .string "Nope!\n" + .string "There's only trash here.\p" + .string "Hey!\n" + .string "The electric locks were reset!$" + diff --git a/data/maps/VermilionCity_House1/text.inc b/data/maps/VermilionCity_House1/text.inc new file mode 100644 index 000000000..66ea21646 --- /dev/null +++ b/data/maps/VermilionCity_House1/text.inc @@ -0,0 +1,40 @@ +Text_193E82:: @ 8193E82 + .string "この　あいだ　やまおくで\n" + .string "きんのたまを　ひろい　ましてね！\p" + .string "つかえない　しなもの　ですが\n" + .string "うったら　なんと　5000¥でした$" + +gUnknown_8193EC1:: @ 8193EC1 + .string "I'm the FISHING GURU!\p" + .string "I simply looove fishing!\n" + .string "I can't bear to go without.\p" + .string "Tell me, do you like to fish?$" + +gUnknown_8193F2A:: @ 8193F2A + .string "Grand! I like your style.\n" + .string "I think we can be friends.\p" + .string "Take this and fish, young friend!$" + +gUnknown_8193F81:: @ 8193F81 + .string "{PLAYER} received an OLD ROD from\n" + .string "the FISHING GURU.$" + +gUnknown_8193FAF:: @ 8193FAF + .string "Fishing is a way of life!\n" + .string "It is like the finest poetry.\p" + .string "From the seas to rivers, go out\n" + .string "and land the big one, my friend.$" + +gUnknown_8194028:: @ 8194028 + .string "Oh…\n" + .string "That's so disappointing…$" + +gUnknown_8194045:: @ 8194045 + .string "Hello there, {PLAYER}!\p" + .string "How are the fish biting?$" + +gUnknown_819406F:: @ 819406F + .string "Oh, no!\p" + .string "I had a nice gift for you, but you\n" + .string "have no room for it!$" + diff --git a/data/maps/VermilionCity_House3/text.inc b/data/maps/VermilionCity_House3/text.inc new file mode 100644 index 000000000..99ea3e49e --- /dev/null +++ b/data/maps/VermilionCity_House3/text.inc @@ -0,0 +1,20 @@ +gUnknown_81953AF:: @ 81953AF + .string "I'm getting my PIDGEY to fly a\n" + .string "letter to SAFFRON in the north.$" + +gUnknown_81953EE:: @ 81953EE + .string "PIDGEY: Kurukkoo!$" + +gUnknown_8195400:: @ 8195400 + .string "Dear PIPPI,\n" + .string "I hope to see you soon.\p" + .string "I heard SAFFRON has problems with\n" + .string "TEAM ROCKET.\p" + .string "VERMILION appears to be safe.$" + +gUnknown_8195471:: @ 8195471 + .string "I want to exchange MAIL with all\n" + .string "sorts of people.\p" + .string "I send my PIDGEY to a UNION ROOM\n" + .string "to exchange MAIL for me.$" + diff --git a/data/maps/VermilionCity_Mart/text.inc b/data/maps/VermilionCity_Mart/text.inc new file mode 100644 index 000000000..2d85d941f --- /dev/null +++ b/data/maps/VermilionCity_Mart/text.inc @@ -0,0 +1,14 @@ +gUnknown_8194A77:: @ 8194A77 + .string "There are wicked people who will\n" + .string "use POKéMON for criminal acts.\p" + .string "TEAM ROCKET traffics in rare\n" + .string "POKéMON, for example.\p" + .string "They also abandon POKéMON that\n" + .string "they consider unpopular or useless.\p" + .string "That's the sort of horrid people\n" + .string "they are, TEAM ROCKET.$" + +gUnknown_8194B65:: @ 8194B65 + .string "I think POKéMON can be good or\n" + .string "bad. It depends on the TRAINER.$" + diff --git a/data/maps/VermilionCity_PokemonCenter_1F/text.inc b/data/maps/VermilionCity_PokemonCenter_1F/text.inc new file mode 100644 index 000000000..811f01edf --- /dev/null +++ b/data/maps/VermilionCity_PokemonCenter_1F/text.inc @@ -0,0 +1,19 @@ +gUnknown_81940AF:: @ 81940AF + .string "Even if they are the same level,\n" + .string "POKéMON can have very different\l" + .string "stats and abilities.\p" + .string "A POKéMON raised by a TRAINER is\n" + .string "stronger than one in the wild.$" + +gUnknown_8194145:: @ 8194145 + .string "My POKéMON was poisoned!\n" + .string "It fainted while we were walking!$" + +gUnknown_8194180:: @ 8194180 + .string "It is true that a higher-level\n" + .string "POKéMON will be more powerful…\p" + .string "But, all POKéMON will have weak\n" + .string "points against specific types.\p" + .string "So, there appears to be no\n" + .string "universally strong POKéMON.$" + diff --git a/data/maps/VermilionCity_PokemonFanClub/text.inc b/data/maps/VermilionCity_PokemonFanClub/text.inc new file mode 100644 index 000000000..1264be24d --- /dev/null +++ b/data/maps/VermilionCity_PokemonFanClub/text.inc @@ -0,0 +1,144 @@ +Text_194234:: @ 8194234 + .string "The urge to battle with someone\n" + .string "you've tangled with before…\p" + .string "Have you ever had that urge?\n" + .string "I'm sure you have.\p" + .string "I wanted to battle certain people\n" + .string "again over and over, too.\p" + .string "So, I've been giving these away.\n" + .string "Please, take one!$" + +Text_19430F:: @ 819430F + .string "Use that device and you'll find\n" + .string "TRAINERS looking for a rematch.\p" + .string "You have to charge its battery to\n" + .string "use it, though.$" + +Text_194381:: @ 8194381 + .string "How do you use the VS SEEKER?\n" + .string "There's nothing to it.\p" + .string "Use it like beep-beep-beep, and\n" + .string "TRAINERS around you will notice.\p" + .string "If any TRAINER wants a rematch,\n" + .string "it will let you know immediately.\p" + .string "Charge its battery and use it\n" + .string "while you're on a road.$" + +gUnknown_819446F:: @ 819446F + .string "Won't you admire my PIKACHU's\n" + .string "adorable tail?$" + +gUnknown_819449C:: @ 819449C + .string "Humph!\p" + .string "My PIKACHU is twice as cute as\n" + .string "that one!$" + +gUnknown_81944CC:: @ 81944CC + .string "I just adore my SEEL!\n" + .string "It's so lovable!\p" + .string "It squeals, “Kyuuuh,” when I\n" + .string "hug it!$" + +gUnknown_8194518:: @ 8194518 + .string "Oh, dear!\p" + .string "My SEEL is far more attractive.\n" + .string "By double, I would say.$" + +gUnknown_819455A:: @ 819455A + .string "PIKACHU: Chu! Pikachu!$" + +gUnknown_8194571:: @ 8194571 + .string "SEEL: Kyuoo!$" + +gUnknown_819457E:: @ 819457E + .string "I chair the POKéMON Fan Club!\p" + .string "I raise more than a hundred\n" + .string "POKéMON!\p" + .string "I'm very fussy when it comes to\n" + .string "POKéMON! I surely am!\p" + .string "So…\p" + .string "Did you come visit to hear about\n" + .string "my POKéMON?$" + +gUnknown_8194628:: @ 8194628 + .string "Good!\n" + .string "Then listen up!\p" + .string "My favorite RAPIDASH…\p" + .string "It's…cute…lovely…smart… \n" + .string "plus…amazing…you think so?…\l" + .string "oh yes…it's…stunning…\l" + .string "kindly…love it!\p" + .string "Hug it…when…sleeping…warm\n" + .string "and cuddly…spectacular…\l" + .string "ravishing…\l" + .string "…Oops! Look at the time!\l" + .string "I kept you too long!\p" + .string "Thanks for hearing me out!\n" + .string "I want you to have this!$" + +gUnknown_819474E:: @ 819474E + .string "{PLAYER} received a BIKE VOUCHER\n" + .string "from the CHAIRMAN.$" + +gUnknown_819477C:: @ 819477C + .string "Take that BIKE VOUCHER to the\n" + .string "BIKE SHOP in CERULEAN CITY.\p" + .string "Exchange that for a BICYCLE\n" + .string "free of charge!\p" + .string "Don't worry, my favorite FEAROW\n" + .string "will FLY me anywhere I need to go.\p" + .string "So, I have no need for a BICYCLE.\p" + .string "I hope you like cycling!$" + +gUnknown_8194860:: @ 8194860 + .string "Oh. Come back when you want to\n" + .string "hear my story!$" + +gUnknown_819488E:: @ 819488E + .string "Hello, {PLAYER}!\p" + .string "Did you come see me about my\n" + .string "POKéMON again?\p" + .string "No?\n" + .string "Too bad!$" + +gUnknown_81948D2:: @ 81948D2 + .string "Make room for this!$" + +gUnknown_81948E6:: @ 81948E6 + .string "Our CHAIRMAN is very vocal about\n" + .string "POKéMON.$" + +gUnknown_8194910:: @ 8194910 + .string "Let's all listen politely to other\n" + .string "TRAINERS!$" + +gUnknown_819493D:: @ 819493D + .string "If someone brags, brag right back!$" + +gUnknown_8194960:: @ 8194960 + .string "Our CHAIRMAN really does adore his\n" + .string "POKéMON.\p" + .string "But the person who is most liked by\n" + .string "POKéMON is DAISY, I think.$" + +gUnknown_81949CB:: @ 81949CB + .string "Hi!\n" + .string "Do you have a {STR_VAR_1}?\p" + .string "Want to trade it for my\n" + .string "{STR_VAR_2}?$" + +gUnknown_81949FD:: @ 81949FD + .string "That's too bad.$" + +gUnknown_8194A0D:: @ 8194A0D + .string "…This is no {STR_VAR_1}.\p" + .string "If you get one, please trade it\n" + .string "to me!$" + +gUnknown_8194A44:: @ 8194A44 + .string "Thank you!$" + +gUnknown_8194A4F:: @ 8194A4F + .string "How is my old {STR_VAR_2}?\p" + .string "My {STR_VAR_1} is doing great!$" + diff --git a/data/maps/VictoryRoad_1F/text.inc b/data/maps/VictoryRoad_1F/text.inc new file mode 100644 index 000000000..46cd136ad --- /dev/null +++ b/data/maps/VictoryRoad_1F/text.inc @@ -0,0 +1,22 @@ +Text_174710:: @ 8174710 + .string "I wonder if you are good enough\n" + .string "for me?$" + +Text_174738:: @ 8174738 + .string "I lost out…$" + +gUnknown_8174744:: @ 8174744 + .string "I never wanted to lose to anybody,\n" + .string "especially to a younger kid…$" + +Text_174784:: @ 8174784 + .string "I can see you're good.\n" + .string "Let me see exactly how good!$" + +Text_1747B8:: @ 81747B8 + .string "I had a chance…$" + +gUnknown_81747C8:: @ 81747C8 + .string "Tch!\n" + .string "I concede, you are better than I!$" + diff --git a/data/maps/VictoryRoad_2F/text.inc b/data/maps/VictoryRoad_2F/text.inc new file mode 100644 index 000000000..d125ef160 --- /dev/null +++ b/data/maps/VictoryRoad_2F/text.inc @@ -0,0 +1,54 @@ +Text_1747EF:: @ 81747EF + .string "If you can get through here,\n" + .string "you can go meet the ELITE FOUR.$" + +Text_17482C:: @ 817482C + .string "No!\n" + .string "Unbelievable!$" + +gUnknown_817483E:: @ 817483E + .string "I can beat you when it comes to\n" + .string "knowledge about POKéMON!$" + +Text_174877:: @ 8174877 + .string "This here is VICTORY ROAD.\n" + .string "It's the final test for TRAINERS!$" + +Text_1748B4:: @ 81748B4 + .string "Atcho!$" + +gUnknown_81748BB:: @ 81748BB + .string "If you get stuck, try moving some\n" + .string "boulders around.$" + +Text_1748EE:: @ 81748EE + .string "Ah, so you wish to challenge the\n" + .string "ELITE FOUR?$" + +Text_17491B:: @ 817491B + .string "You got me!$" + +gUnknown_8174927:: @ 8174927 + .string "{RIVAL} also came through here.$" + +Text_174942:: @ 8174942 + .string "Come on!\n" + .string "I'll whip you!$" + +Text_17495A:: @ 817495A + .string "I got whipped!$" + +gUnknown_8174969:: @ 8174969 + .string "You earned the right to be on\n" + .string "VICTORY ROAD…$" + +Text_174995:: @ 8174995 + .string "Is VICTORY ROAD too tough?$" + +Text_1749B0:: @ 81749B0 + .string "Well done!$" + +gUnknown_81749BB:: @ 81749BB + .string "Many TRAINERS give up their\n" + .string "challenge here and go home.$" + diff --git a/data/maps/VictoryRoad_3F/text.inc b/data/maps/VictoryRoad_3F/text.inc new file mode 100644 index 000000000..fbda3b739 --- /dev/null +++ b/data/maps/VictoryRoad_3F/text.inc @@ -0,0 +1,103 @@ +Text_1749F3:: @ 81749F3 + .string "ギヤーオ！$" + +Text_1749F9:: @ 81749F9 + .string "You should be proud of yourself,\n" + .string "having battled your way through\l" + .string "VICTORY ROAD so courageously.\p" + .string "In recognition of your feat,\n" + .string "I'll teach you DOUBLE-EDGE.\p" + .string "Would you like me to teach that\n" + .string "technique?$" + +Text_174ABC:: @ 8174ABC + .string "I'll teach you the technique\n" + .string "anytime.$" + +Text_174AE2:: @ 8174AE2 + .string "Which POKéMON should I teach\n" + .string "DOUBLE-EDGE?$" + +Text_174B0C:: @ 8174B0C + .string "Keep that drive going for the\n" + .string "POKéMON LEAGUE!\p" + .string "Take a run at them and knock 'em\n" + .string "out!$" + +Text_174B60:: @ 8174B60 + .string "I heard rumors of a child prodigy.$" + +Text_174B83:: @ 8174B83 + .string "The rumors were true!$" + +gUnknown_8174B99:: @ 8174B99 + .string "So, it was you who beat GIOVANNI\n" + .string "of TEAM ROCKET?$" + +Text_174BCA:: @ 8174BCA + .string "TRAINERS live to seek stronger\n" + .string "opponents.$" + +Text_174BF4:: @ 8174BF4 + .string "Oh!\n" + .string "So strong!$" + +gUnknown_8174C03:: @ 8174C03 + .string "By fighting tough battles, you get\n" + .string "stronger.$" + +Text_174C30:: @ 8174C30 + .string "I'll show you just how good you\n" + .string "are. Not!$" + +Text_174C5A:: @ 8174C5A + .string "I'm furious!$" + +gUnknown_8174C67:: @ 8174C67 + .string "You showed me just how good\n" + .string "I was…$" + +Text_174C8A:: @ 8174C8A + .string "Only the chosen can pass here!$" + +Text_174CA9:: @ 8174CA9 + .string "I don't believe it!$" + +gUnknown_8174CBD:: @ 8174CBD + .string "All TRAINERS here are headed to\n" + .string "the POKéMON LEAGUE.\p" + .string "Don't let down your guard.$" + +Text_174D0C:: @ 8174D0C + .string "RAY: Together, the two of us are\n" + .string "destined for greatness!$" + +Text_174D45:: @ 8174D45 + .string "RAY: Ludicrous!\n" + .string "This can't be!$" + +gUnknown_8174D64:: @ 8174D64 + .string "RAY: You've beaten us.\n" + .string "Greatness remains elusive…$" + +Text_174D96:: @ 8174D96 + .string "RAY: Together, the two of us are\n" + .string "striving for the pinnacle.\p" + .string "We need you to bring two POKéMON\n" + .string "into battle with us.$" + +Text_174E08:: @ 8174E08 + .string "TYRA: We're trying to become\n" + .string "champions together.$" + +Text_174E39:: @ 8174E39 + .string "TYRA: Oh, but…$" + +gUnknown_8174E48:: @ 8174E48 + .string "TYRA: You've taught me that power\n" + .string "can be infinite in shape and form.$" + +Text_174E8D:: @ 8174E8D + .string "TYRA: You can't battle with us if\n" + .string "you have only one POKéMON.$" + diff --git a/data/maps/ViridianCity/text.inc b/data/maps/ViridianCity/text.inc new file mode 100644 index 000000000..37b1d3c55 --- /dev/null +++ b/data/maps/ViridianCity/text.inc @@ -0,0 +1,125 @@ +gUnknown_817DABB:: @ 817DABB + .string "Those POKé BALLS at your waist!\n" + .string "You have POKéMON, don't you?\p" + .string "It's great that you can carry and\n" + .string "use POKéMON anytime, anywhere.$" + +gUnknown_817DB39:: @ 817DB39 + .string "This POKéMON GYM is always closed.\p" + .string "I wonder who the LEADER is?$" + +gUnknown_817DB78:: @ 817DB78 + .string "VIRIDIAN GYM's LEADER returned!$" + +gUnknown_817DB98:: @ 817DB98 + .string "You want to know about the two\n" + .string "kinds of caterpillar POKéMON?$" + +gUnknown_817DBD5:: @ 817DBD5 + .string "Oh, okay then!$" + +gUnknown_817DBE4:: @ 817DBE4 + .string "CATERPIE has no poison,\n" + .string "but WEEDLE does.\p" + .string "Watch that your POKéMON aren't\n" + .string "stabbed by WEEDLE's POISON STING.$" + +gUnknown_817DC4E:: @ 817DC4E + .string "Oh, Grandpa!\n" + .string "Don't be so mean!\p" + .string "I'm so sorry.\n" + .string "He hasn't had his coffee yet.$" + +gUnknown_817DC99:: @ 817DC99 + .string "I go shopping in PEWTER CITY\n" + .string "occasionally.\p" + .string "I have to take the winding trail in\n" + .string "VIRIDIAN FOREST when I go.$" + +gUnknown_817DD03:: @ 817DD03 + .string "I absolutely forbid you from\n" + .string "going through here!\p" + .string "This is private property!$" + +gUnknown_817DD4E:: @ 817DD4E + .string "Well, now, I've had my coffee, and\n" + .string "that's what I need to get going!\p" + .string "Hm?\n" + .string "What is that red box you have?\p" + .string "Ah, so you're working on your\n" + .string "POKéDEX.\p" + .string "Then let me give you a word of\n" + .string "advice.\p" + .string "Whenever you catch a POKéMON,\n" + .string "the POKéDEX automatically updates\l" + .string "its data.\p" + .string "…You don't know how to catch\n" + .string "a POKéMON?\p" + .string "I suppose I had better show you\n" + .string "then!$" + +gUnknown_817DE9B:: @ 817DE9B + .string "There! Now tell me, that was\n" + .string "educational, was it not?\p" + .string "And here, take this, too.$" + +gUnknown_817DEEB:: @ 817DEEB + .string "If there's something you don't\n" + .string "understand, watch that.\p" + .string "It will teach you about the basics\n" + .string "of being a POKéMON TRAINER.$" + +gUnknown_817DF61:: @ 817DF61 + .string "Well, now, I've had my coffee, and\n" + .string "that's what I need to get going!\p" + .string "But I made it too strong.\n" + .string "It gave me a headache…\p" + .string "Incidentally, are you filling your\n" + .string "POKéDEX?\p" + .string "At first, focus on weakening the\n" + .string "POKéMON before trying to catch it.$" + +gUnknown_817E046:: @ 817E046 + .string "Well, now, I've had my coffee, and\n" + .string "that's what I need to get going!\p" + .string "But I made it too strong.\n" + .string "It gave me a headache…\p" + .string "Incidentally, is my old TEACHY TV\n" + .string "helping you?$" + +gUnknown_817E0EA:: @ 817E0EA + .string "Wahaha!\n" + .string "It's my grandson on the show!\p" + .string "Since he's the one doing the\n" + .string "teaching, you're bound to learn.$" + +gUnknown_817E14E:: @ 817E14E + .string "Hm… You're too busy to not even\n" + .string "have the time for TEACHY TV…\p" + .string "Time is money, and neither should\n" + .string "be ill spent…$" + +gUnknown_817E1BB:: @ 817E1BB + .string "VIRIDIAN CITY \n" + .string "The Eternally Green Paradise$" + +gUnknown_817E1E7:: @ 817E1E7 + .string "TRAINER TIPS\p" + .string "Catch POKéMON and expand your\n" + .string "collection.\p" + .string "The more you have, the easier it\n" + .string "is to battle.$" + +gUnknown_817E24D:: @ 817E24D + .string "TRAINER TIPS\p" + .string "The battle moves of POKéMON are\n" + .string "limited by their POWER POINTS, PP.\p" + .string "To replenish PP, rest your tired\n" + .string "POKéMON at a POKéMON CENTER.$" + +gUnknown_817E2DB:: @ 817E2DB + .string "VIRIDIAN CITY POKéMON GYM$" + +gUnknown_817E2F5:: @ 817E2F5 + .string "VIRIDIAN GYM's doors are locked…$" + diff --git a/data/maps/ViridianCity_Gym/text.inc b/data/maps/ViridianCity_Gym/text.inc new file mode 100644 index 000000000..608d52755 --- /dev/null +++ b/data/maps/ViridianCity_Gym/text.inc @@ -0,0 +1,171 @@ +Text_18F352:: @ 818F352 + .string "Fwahahaha!\n" + .string "Welcome to my hideout!\p" + .string "It shall be so until I can restore\n" + .string "TEAM ROCKET to its former glory.\p" + .string "But, you have found me again.\n" + .string "So be it.\l" + .string "This time, I'm not holding back!\p" + .string "Once more, you shall face\n" + .string "GIOVANNI, the greatest TRAINER!{PLAY_BGM}{BGM_FRLG_SUSPICIOUS_EYE}$" + +Text_18F43F:: @ 818F43F + .string "Ha!\n" + .string "That was a truly intense fight.\l" + .string "You have won!\p" + .string "As proof, here is the EARTHBADGE!\n" + .string "{PAUSE_MUSIC}{PLAY_BGM}{MUS_ME_BACHI}{PAUSE 0xFE}{PAUSE 0x56}{RESUME_MUSIC}$" + +gUnknown_818F4A2:: @ 818F4A2 + .string "Having lost in this fashion, \n" + .string "I can't face my followers.\l" + .string "I have betrayed their trust.\p" + .string "As of today, TEAM ROCKET is\n" + .string "finished forever!\p" + .string "As for myself, I shall dedicate\n" + .string "my life to training again.\p" + .string "Let us meet again someday!\n" + .string "Farewell!$" + +gUnknown_818F586:: @ 818F586 + .string "The EARTHBADGE makes POKéMON of\n" + .string "any level obey without question.\p" + .string "It is evidence of your mastery as\n" + .string "a POKéMON TRAINER.\p" + .string "With it, you can challenge the\n" + .string "POKéMON LEAGUE.\p" + .string "Also, take this TM.\p" + .string "Consider it a gift for your POKéMON\n" + .string "LEAGUE challenge.$" + +gUnknown_818F675:: @ 818F675 + .string "{PLAYER} received TM26\n" + .string "from GIOVANNI.$" + +gUnknown_818F695:: @ 818F695 + .string "TM26 contains EARTHQUAKE.\p" + .string "It is a powerful attack that causes\n" + .string "a massive tremor.\p" + .string "I made it when I ran the GYM here,\n" + .string "far too long ago… $" + +gUnknown_818F71B:: @ 818F71B + .string "You do not have space for this!$" + +Text_18F73B:: @ 818F73B + .string "Heh!\n" + .string "You must be running out of steam\l" + .string "by now!$" + +Text_18F769:: @ 818F769 + .string "I ran out of gas!$" + +gUnknown_818F77B:: @ 818F77B + .string "You'll need power to keep up with\n" + .string "our GYM LEADER.$" + +Text_18F7AD:: @ 818F7AD + .string "Rrrroar!\n" + .string "I'm working myself into a rage!$" + +Text_18F7D6:: @ 818F7D6 + .string "Wargh!$" + +gUnknown_818F7DD:: @ 818F7DD + .string "I'm still not worthy!$" + +Text_18F7F3:: @ 818F7F3 + .string "POKéMON and I, we make wonderful\n" + .string "music together!$" + +Text_18F824:: @ 818F824 + .string "You are in perfect harmony!$" + +gUnknown_818F840:: @ 818F840 + .string "Do you know the identity of our\n" + .string "GYM LEADER?$" + +Text_18F86C:: @ 818F86C + .string "Karate is the ultimate form of\n" + .string "martial arts!$" + +Text_18F899:: @ 818F899 + .string "Aiyah!$" + +gUnknown_818F8A0:: @ 818F8A0 + .string "If my POKéMON were as good at\n" + .string "karate as I…$" + +Text_18F8CB:: @ 818F8CB + .string "The truly talented win with style.$" + +Text_18F8EE:: @ 818F8EE + .string "I lost my grip!$" + +gUnknown_818F8FE:: @ 818F8FE + .string "The LEADER will scold me for\n" + .string "losing this way…$" + +Text_18F92C:: @ 818F92C + .string "I'm the KARATE KING!\n" + .string "Your fate rests with me!$" + +Text_18F95A:: @ 818F95A + .string "Ayah!$" + +gUnknown_818F960:: @ 818F960 + .string "The POKéMON LEAGUE?\n" + .string "You? Don't get cocky!$" + +Text_18F98A:: @ 818F98A + .string "Your POKéMON will cower at the\n" + .string "crack of my whip!$" + +Text_18F9BB:: @ 818F9BB + .string "Yowch!\n" + .string "Whiplash!$" + +gUnknown_818F9CC:: @ 818F9CC + .string "Wait!\n" + .string "I was just careless!$" + +Text_18F9E7:: @ 818F9E7 + .string "VIRIDIAN GYM was closed for a\n" + .string "long time.\p" + .string "But now, our LEADER is back!$" + +Text_18FA2D:: @ 818FA2D + .string "I was beaten?$" + +gUnknown_818FA3B:: @ 818FA3B + .string "You can go on to the POKéMON\n" + .string "LEAGUE only by defeating our GYM\l" + .string "LEADER!$" + +gUnknown_818FA81:: @ 818FA81 + .string "Yo!\n" + .string "Champ in the making!\p" + .string "Even I don't know the VIRIDIAN\n" + .string "LEADER's identity.\p" + .string "But one thing's certain.\n" + .string "This will be the toughest of all\l" + .string "the GYM LEADERS.\p" + .string "Also, I heard that the TRAINERS\n" + .string "here like GROUND-type POKéMON.$" + +gUnknown_818FB56:: @ 818FB56 + .string "Blow me away! GIOVANNI was the\n" + .string "GYM LEADER of VIRIDIAN?$" + +gUnknown_818FB8D:: @ 818FB8D + .string "VIRIDIAN POKéMON GYM\n" + .string "LEADER: ?\p" + .string "WINNING TRAINERS:\n" + .string "{RIVAL}$" + +gUnknown_818FBC1:: @ 818FBC1 + .string "VIRIDIAN POKéMON GYM\n" + .string "LEADER: GIOVANNI\p" + .string "WINNING TRAINERS:\n" + .string "{RIVAL}, {PLAYER}$" + diff --git a/data/maps/ViridianCity_House1/text.inc b/data/maps/ViridianCity_House1/text.inc new file mode 100644 index 000000000..c1ec37238 --- /dev/null +++ b/data/maps/ViridianCity_House1/text.inc @@ -0,0 +1,16 @@ +gUnknown_818F292:: @ 818F292 + .string "Coming up with nicknames is fun,\n" + .string "but it's not so easy to do.\p" + .string "Clever names are nice, but simple\n" + .string "names are easier to remember.$" + +gUnknown_818F30F:: @ 818F30F + .string "My daddy loves POKéMON, too.$" + +gUnknown_818F32C:: @ 818F32C + .string "SPEARY: Tetweet!$" + +gUnknown_818F33D:: @ 818F33D + .string "SPEAROW\n" + .string "Name: SPEARY$" + diff --git a/data/maps/ViridianCity_House2/text.inc b/data/maps/ViridianCity_House2/text.inc new file mode 100644 index 000000000..a575c0f34 --- /dev/null +++ b/data/maps/ViridianCity_House2/text.inc @@ -0,0 +1,93 @@ +gUnknown_818FC00:: @ 818FC00 + .string "Whew! I'm trying to memorize all my\n" + .string "notes.$" + +gUnknown_818FC2B:: @ 818FC2B + .string "Okay!\p" + .string "Be sure to read what's on the\n" + .string "blackboard carefully!$" + +gUnknown_818FC65:: @ 818FC65 + .string "Let's check out the notebook.\p" + .string "First page…\p" + .string "POKé BALLS are used to catch\n" + .string "POKéMON.\p" + .string "Up to six POKéMON can be carried\n" + .string "in your party.\p" + .string "People who raise and battle\n" + .string "with POKéMON are called TRAINERS.$" + +gUnknown_818FD23:: @ 818FD23 + .string "Second page…\p" + .string "A healthy POKéMON may be hard to\n" + .string "catch, so weaken it first.\p" + .string "Poison, burn, or cause another\n" + .string "status problem to weaken it.$" + +gUnknown_818FDA8:: @ 818FDA8 + .string "Third page…\p" + .string "POKéMON TRAINERS seek others to\n" + .string "engage in POKéMON battles.\p" + .string "To TRAINERS, the taste of victory\n" + .string "is sweet, indeed.\p" + .string "Battles are constantly waged at\n" + .string "POKéMON GYMS everywhere.$" + +gUnknown_818FE5C:: @ 818FE5C + .string "Fourth page…\p" + .string "The ultimate goal for all POKéMON\n" + .string "TRAINERS is simple.\p" + .string "It is to defeat the top eight\n" + .string "POKéMON GYM LEADERS.\p" + .string "Do so to earn the right to face…\p" + .string "The ELITE FOUR of the POKéMON\n" + .string "LEAGUE!$" + +gUnknown_818FF19:: @ 818FF19 + .string "Turn the page?$" + +gUnknown_818FF28:: @ 818FF28 + .string "GIRL: Hey!\n" + .string "Don't look at my notes!$" + +gUnknown_818FF4B:: @ 818FF4B + .string "The blackboard lists POKéMON\n" + .string "STATUS problems during battles.$" + +Text_18FF88:: @ 818FF88 + .string "Which topic do you want to read?$" + +gUnknown_818FFA9:: @ 818FFA9 + .string "A POKéMON can't attack if it's\n" + .string "asleep.\p" + .string "POKéMON will stay asleep even\n" + .string "after battles.\p" + .string "Use AWAKENING to awaken one\n" + .string "from sleep.$" + +gUnknown_8190025:: @ 8190025 + .string "A burn reduces ATTACK power.\n" + .string "It also causes ongoing HP loss.\p" + .string "A burn remains after a battle.\n" + .string "Use BURN HEAL to cure a burn.$" + +gUnknown_819009F:: @ 819009F + .string "When poisoned, a POKéMON's health\n" + .string "steadily drops.\p" + .string "Poison lingers after battles.\n" + .string "Use an ANTIDOTE to cure poison!$" + +gUnknown_819010F:: @ 819010F + .string "A frozen POKéMON becomes\n" + .string "helplessly immobile.\p" + .string "It stays frozen even after the\n" + .string "battle ends.\p" + .string "Use ICE HEAL to thaw out the\n" + .string "suffering POKéMON.$" + +gUnknown_8190199:: @ 8190199 + .string "Paralysis reduces SPEED and may\n" + .string "prevent the POKéMON from moving.\p" + .string "Paralysis remains after battles.\n" + .string "Use PARLYZ HEAL for treatment.$" + diff --git a/data/maps/ViridianCity_Mart/text.inc b/data/maps/ViridianCity_Mart/text.inc new file mode 100644 index 000000000..a610e83cd --- /dev/null +++ b/data/maps/ViridianCity_Mart/text.inc @@ -0,0 +1,26 @@ +gUnknown_819021A:: @ 819021A + .string "Hey!\n" + .string "You came from PALLET TOWN?$" + +gUnknown_819023A:: @ 819023A + .string "You know PROF. OAK, right?\p" + .string "His order came in.\n" + .string "Can I get you to take it to him?$" + +gUnknown_8190289:: @ 8190289 + .string "{PLAYER} received OAK'S PARCEL\n" + .string "from the POKéMON MART clerk.$" + +Text_1902BF:: @ 81902BF + .string "Okay, thanks! Please say hi to\n" + .string "PROF. OAK for me, too.$" + +gUnknown_81902F5:: @ 81902F5 + .string "This shop does good business in\n" + .string "ANTIDOTES, I've heard.$" + +gUnknown_819032C:: @ 819032C + .string "I've got to buy some POTIONS.\p" + .string "You never know when your POKéMON\n" + .string "will need quick healing.$" + diff --git a/data/maps/ViridianCity_PokemonCenter_1F/text.inc b/data/maps/ViridianCity_PokemonCenter_1F/text.inc new file mode 100644 index 000000000..18b535a45 --- /dev/null +++ b/data/maps/ViridianCity_PokemonCenter_1F/text.inc @@ -0,0 +1,18 @@ +gUnknown_8190384:: @ 8190384 + .string "Please feel free to use that PC in\n" + .string "the corner.\p" + .string "The receptionist told me so.\n" + .string "It's so kind of her!$" + +gUnknown_81903E5:: @ 81903E5 + .string "There's a POKéMON CENTER in every\n" + .string "town ahead.\p" + .string "They charge no money, so don't\n" + .string "be shy about healing POKéMON.$" + +gUnknown_8190450:: @ 8190450 + .string "POKéMON CENTERS heal your tired,\n" + .string "hurt, or fainted POKéMON.\p" + .string "They make all POKéMON completely\n" + .string "healthy.$" + diff --git a/data/maps/ViridianForest/text.inc b/data/maps/ViridianForest/text.inc new file mode 100644 index 000000000..e3dc737a2 --- /dev/null +++ b/data/maps/ViridianForest/text.inc @@ -0,0 +1,105 @@ +gUnknown_8172255:: @ 8172255 + .string "I came here with some friends to\n" + .string "catch us some BUG POKéMON!\p" + .string "They're all itching to get into\n" + .string "some POKéMON battles!$" + +Text_1722C7:: @ 81722C7 + .string "Hey! You have POKéMON!\n" + .string "Come on!\l" + .string "Let's battle 'em!$" + +Text_1722F9:: @ 81722F9 + .string "No!\nCATERPIE can't hack it!$" + +gUnknown_8172315:: @ 8172315 + .string "Ssh! You'll scare the bugs away.\n" + .string "Another time, okay?$" + +Text_17234A:: @ 817234A + .string "Yo!\n" + .string "You can't jam out if you're a\l" + .string "POKéMON TRAINER!$" + +Text_17237D:: @ 817237D + .string "Huh?\n" + .string "I ran out of POKéMON!$" + +gUnknown_8172398:: @ 8172398 + .string "That totally stinks! I'm going to\n" + .string "catch some stronger ones!$" + +Text_1723D4:: @ 81723D4 + .string "Hey, wait up!\n" + .string "What's the hurry? Why the rush?$" + +Text_172402:: @ 8172402 + .string "I give!\n" + .string "You're good at this!$" + +gUnknown_817241F:: @ 817241F + .string "Sometimes, you can find stuff on\n" + .string "the ground.\p" + .string "I'm looking for the stuff I\n" + .string "dropped. Can you help me?$" + +Text_172482:: @ 8172482 + .string "I might be little, but I won't like\n" + .string "it if you go easy on me!$" + +Text_1724BF:: @ 81724BF + .string "Oh, boo.\n" + .string "Nothing went right.$" + +gUnknown_81724DC:: @ 81724DC + .string "I lost some of my allowance…$" + +Text_1724F9:: @ 81724F9 + .string "Did you know that POKéMON evolve?$" + +Text_17251B:: @ 817251B + .string "Oh!\n" + .string "I lost!$" + +gUnknown_8172527:: @ 8172527 + .string "BUG POKéMON evolve quickly.\n" + .string "They're a lot of fun!$" + +gUnknown_8172559:: @ 8172559 + .string "I was throwing POKé BALLS to\n" + .string "catch POKéMON, and I ran out.\p" + .string "That's why you can never have too\n" + .string "many POKé BALLS.$" + +gUnknown_81725C7:: @ 81725C7 + .string "TRAINER TIPS\p" + .string "If your POKéMON are weak and you\n" + .string "want to avoid battles, stay away\l" + .string "from grassy areas!$" + +gUnknown_8172629:: @ 8172629 + .string "For poison, use ANTIDOTE!\n" + .string "Get it at POKéMON MARTS!$" + +gUnknown_817265C:: @ 817265C + .string "TRAINER TIPS\p" + .string "Contact PROF. OAK via a PC to\n" + .string "get your POKéDEX evaluated!$" + +gUnknown_81726A3:: @ 81726A3 + .string "TRAINER TIPS\p" + .string "You can't catch a POKéMON that\n" + .string "belongs to someone else.\p" + .string "Throw POKé BALLS only at wild\n" + .string "POKéMON to catch them!$" + +gUnknown_817271D:: @ 817271D + .string "TRAINER TIPS\p" + .string "Weaken POKéMON before attempting\n" + .string "capture!\p" + .string "When healthy, they may escape!$" + +gUnknown_8172773:: @ 8172773 + .string "LEAVING VIRIDIAN FOREST\n" + .string "PEWTER CITY AHEAD$" + -- cgit v1.2.3 From e30052e271c649ae2ca08cbbbdf2dc2052e6ae38 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 13 Jun 2019 13:45:46 -0400 Subject: help_system: through sub_813C3AC --- data/maps/Route25_SeaCottage/scripts.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps') diff --git a/data/maps/Route25_SeaCottage/scripts.inc b/data/maps/Route25_SeaCottage/scripts.inc index 5707c9938..cbcdba4e9 100644 --- a/data/maps/Route25_SeaCottage/scripts.inc +++ b/data/maps/Route25_SeaCottage/scripts.inc @@ -118,7 +118,7 @@ EventScript_17064A:: @ 817064A setflag FLAG_0x235 setflag FLAG_0x031 setflag FLAG_0x234 - setflag FLAG_0x834 + setflag FLAG_SYS_NOT_SOMEONES_PC goto EventScript_170640 end -- cgit v1.2.3 From 601d2feeac2ffd2edf936e06340e5255f74139a9 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 14 Jun 2019 11:33:13 -0400 Subject: Decompile SS Anne --- data/maps/SSAnne_Exterior/scripts.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps') diff --git a/data/maps/SSAnne_Exterior/scripts.inc b/data/maps/SSAnne_Exterior/scripts.inc index 0d08a0152..d0e530489 100644 --- a/data/maps/SSAnne_Exterior/scripts.inc +++ b/data/maps/SSAnne_Exterior/scripts.inc @@ -20,7 +20,7 @@ SSAnne_Exterior_160859:: @ 8160859 call_if 4, EventScript_1608AC fadenewbgm BGM_FRLG_SURF delay 50 - special sub_815D334 + special Special_SSAnneDepartureCutscene waitstate removeobject 1 applymovement 255, Movement_1608B7 -- cgit v1.2.3 From cac04f6033d63dd645e4d54da458ad32ea32efa6 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 14 Jun 2019 11:55:29 -0400 Subject: Rename VAR_0x4053 --- data/maps/SSAnne_Exterior/scripts.inc | 2 +- data/maps/VermilionCity/map.json | 4 ++-- data/maps/VermilionCity/scripts.inc | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'data/maps') diff --git a/data/maps/SSAnne_Exterior/scripts.inc b/data/maps/SSAnne_Exterior/scripts.inc index d0e530489..b0112c459 100644 --- a/data/maps/SSAnne_Exterior/scripts.inc +++ b/data/maps/SSAnne_Exterior/scripts.inc @@ -26,7 +26,7 @@ SSAnne_Exterior_160859:: @ 8160859 applymovement 255, Movement_1608B7 waitmovement 0 setvar VAR_MAP_SCENE_VERMILION_CITY, 2 - setvar VAR_0x4053, 0 + setvar VAR_VERMILION_CITY_TICKET_CHECK_TRIGGER, 0 warp MAP_VERMILION_CITY, 255, 23, 34 waitstate releaseall diff --git a/data/maps/VermilionCity/map.json b/data/maps/VermilionCity/map.json index 30efc81c4..d041e9157 100644 --- a/data/maps/VermilionCity/map.json +++ b/data/maps/VermilionCity/map.json @@ -207,7 +207,7 @@ "x": 22, "y": 33, "elevation": 0, - "var": "VAR_0x4053", + "var": "VAR_VERMILION_CITY_TICKET_CHECK_TRIGGER", "var_value": 0, "script": "VermilionCity_EventScript_166B8A" }, @@ -216,7 +216,7 @@ "x": 23, "y": 33, "elevation": 0, - "var": "VAR_0x4053", + "var": "VAR_VERMILION_CITY_TICKET_CHECK_TRIGGER", "var_value": 0, "script": "VermilionCity_EventScript_166B91" }, diff --git a/data/maps/VermilionCity/scripts.inc b/data/maps/VermilionCity/scripts.inc index 1f476abf3..c809fd7bd 100644 --- a/data/maps/VermilionCity/scripts.inc +++ b/data/maps/VermilionCity/scripts.inc @@ -200,7 +200,7 @@ VermilionCity_EventScript_166B91:: @ 8166B91 VermilionCity_EventScript_166B98:: @ 8166B98 lockall - setvar VAR_0x4053, 0 + setvar VAR_VERMILION_CITY_TICKET_CHECK_TRIGGER, 0 releaseall end @@ -215,7 +215,7 @@ EventScript_166BA0:: @ 8166BA0 checkflag FLAG_0x234 goto_if 0, EventScript_166BDE msgbox gUnknown_817FA77 - setvar VAR_0x4053, 1 + setvar VAR_VERMILION_CITY_TICKET_CHECK_TRIGGER, 1 releaseall end -- cgit v1.2.3