diff --git a/constants/flypoint_constants.asm b/constants/flypoint_constants.asm index d4c4e613..bfd3b605 100644 --- a/constants/flypoint_constants.asm +++ b/constants/flypoint_constants.asm @@ -4,12 +4,12 @@ const FLY_POINT_SILENT_HILL ; 0 const FLY_POINT_OLD ; 1 const FLY_POINT_WEST ; 2 - const FLY_POINT_HAITEKU ; 3 - const FLY_POINT_FONTO ; 4 - const FLY_POINT_BAADON ; 5 + const FLY_POINT_HIGH_TECH ; 3 + const FLY_POINT_FONT ; 4 + const FLY_POINT_BIRDON ; 5 const FLY_POINT_NEWTYPE ; 6 const FLY_POINT_SUGAR ; 7 - const FLY_POINT_BULL_FOREST ; 8 + const FLY_POINT_BLUE_FOREST ; 8 const FLY_POINT_STAND ; 9 const FLY_POINT_KANTO ; 10 const FLY_POINT_PRINCE ; 11 diff --git a/constants/landmark_constants.asm b/constants/landmark_constants.asm index 56a7b022..3d2187fc 100644 --- a/constants/landmark_constants.asm +++ b/constants/landmark_constants.asm @@ -1,45 +1,45 @@ const_def - const LANDMARK_NONE ; 00 - const LANDMARK_NORTH ; 01 - const LANDMARK_BULL_FOREST_ROUTE_3 ; 02 - const LANDMARK_BULL_FOREST ; 03 - const LANDMARK_BULL_FOREST_ROUTE_2 ; 04 - const LANDMARK_STAND ; 05 - const LANDMARK_STAND_ROUTE ; 06 - const LANDMARK_KANTO_EAST_ROUTE ; 07 - const LANDMARK_KANTO ; 08 - const LANDMARK_ROUTE_SILENT_EAST ; 09 - const LANDMARK_SILENT_HILL ; 0a - const LANDMARK_PRINCE ; 0b - const LANDMARK_MT_FUJI ; 0c - const LANDMARK_ROUTE_1_P1 ; 0d - const LANDMARK_ROUTE_1_P2 ; 0e - const LANDMARK_OLD_CITY ; 0f - const LANDMARK_ROUTE_2 ; 10 - const LANDMARK_WEST ; 11 - const LANDMARK_BAADON_ROUTE_1 ; 12 - const LANDMARK_BAADON ; 13 - const LANDMARK_BAADON_ROUTE_2 ; 14 - const LANDMARK_BAADON_ROUTE_3 ; 15 - const LANDMARK_ROUTE_15 ; 16 - const LANDMARK_NEWTYPE ; 17 - const LANDMARK_SUGAR_ROUTE ; 18 - const LANDMARK_SUGAR ; 19 - const LANDMARK_NEWTYPE_ROUTE ; 1a - const LANDMARK_ROUTE_18 ; 1b - const LANDMARK_BULL_FOREST_ROUTE_1 ; 1c - const LANDMARK_1C ; 1d - const LANDMARK_1D ; 1e - const LANDMARK_FONTO_ROUTE_3 ; 1f - const LANDMARK_FONTO ; 20 - const LANDMARK_FONTO_ROUTE_2 ; 21 - const LANDMARK_FONTO_ROUTE_6 ; 22 - const LANDMARK_FONTO_ROUTE_5 ; 23 - const LANDMARK_SOUTH ; 24 - const LANDMARK_FONTO_ROUTE_1 ; 25 - const LANDMARK_HAITEKU_WEST_ROUTE_OCEAN ; 26 - const LANDMARK_HAITEKU_WEST_ROUTE ; 27 - const LANDMARK_HAITEKU ; 28 - const LANDMARK_WASTE_BRIDGE ; 29 - const LANDMARK_FONTO_ROUTE_4 ; 2a - const LANDMARK_FONTO_BRIDGE ; 2b + const LANDMARK_NONE ; 00 + const LANDMARK_NORTH ; 01 + const LANDMARK_BLUE_FOREST_ROUTE_3 ; 02 + const LANDMARK_BLUE_FOREST ; 03 + const LANDMARK_BLUE_FOREST_ROUTE_2 ; 04 + const LANDMARK_STAND ; 05 + const LANDMARK_STAND_ROUTE ; 06 + const LANDMARK_KANTO_EAST_ROUTE ; 07 + const LANDMARK_KANTO ; 08 + const LANDMARK_ROUTE_SILENT_EAST ; 09 + const LANDMARK_SILENT_HILL ; 0a + const LANDMARK_PRINCE ; 0b + const LANDMARK_MT_FUJI ; 0c + const LANDMARK_ROUTE_1_P1 ; 0d + const LANDMARK_ROUTE_1_P2 ; 0e + const LANDMARK_OLD_CITY ; 0f + const LANDMARK_ROUTE_2 ; 10 + const LANDMARK_WEST ; 11 + const LANDMARK_BIRDON_ROUTE_1 ; 12 + const LANDMARK_BIRDON ; 13 + const LANDMARK_BIRDON_ROUTE_2 ; 14 + const LANDMARK_BIRDON_ROUTE_3 ; 15 + const LANDMARK_ROUTE_15 ; 16 + const LANDMARK_NEWTYPE ; 17 + const LANDMARK_SUGAR_ROUTE ; 18 + const LANDMARK_SUGAR ; 19 + const LANDMARK_NEWTYPE_ROUTE ; 1a + const LANDMARK_ROUTE_18 ; 1b + const LANDMARK_BLUE_FOREST_ROUTE_1 ; 1c + const LANDMARK_1C ; 1d + const LANDMARK_1D ; 1e + const LANDMARK_FONT_ROUTE_3 ; 1f + const LANDMARK_FONT ; 20 + const LANDMARK_FONT_ROUTE_2 ; 21 + const LANDMARK_FONT_ROUTE_6 ; 22 + const LANDMARK_FONT_ROUTE_5 ; 23 + const LANDMARK_SOUTH ; 24 + const LANDMARK_FONT_ROUTE_1 ; 25 + const LANDMARK_HIGH_TECH_WEST_ROUTE_OCEAN ; 26 + const LANDMARK_HIGH_TECH_WEST_ROUTE ; 27 + const LANDMARK_HIGH_TECH ; 28 + const LANDMARK_WASTE_BRIDGE ; 29 + const LANDMARK_FONT_ROUTE_4 ; 2a + const LANDMARK_FONT_BRIDGE ; 2b diff --git a/constants/map_constants.asm b/constants/map_constants.asm index d93d9a78..c97e44ac 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -39,7 +39,7 @@ ENDM map_const SILENT_HILL_LAB_FRONT, 4, 8 ; 12 map_const SILENT_HILL_LAB_BACK, 4, 4 ; 13 map_const UNUSED_MAP_13, 4, 4 ; 14 - map_const SHIZUKANA_OKA, 25, 18 ; 15 + map_const SILENT_HILLS, 25, 18 ; 15 endgroup newgroup OLD ; 2 @@ -89,57 +89,57 @@ ENDM map_const WEST_HOUSE_2, 5, 4 ; 19 endgroup - newgroup HAITEKU ; 4 - map_const HAITEKU_WEST_ROUTE, 25, 9 ; 1 - map_const HAITEKU_WEST_ROUTE_OCEAN, 10, 27 ; 2 - map_const HAITEKU, 20, 18 ; 3 - map_const HAITEKU_WEST_ROUTE_GATE, 5, 4 ; 4 - map_const HAITEKU_POKECENTER_1F, 8, 4 ; 5 - map_const HAITEKU_POKECENTER_2F, 8, 4 ; 6 - map_const HAITEKU_LEAGUE_1F, 4, 8 ; 7 - map_const HAITEKU_LEAGUE_2F, 5, 9 ; 8 - map_const HAITEKU_MART, 6, 4 ; 9 - map_const HAITEKU_HOUSE_1, 5, 4 ; 10 - map_const HAITEKU_HOUSE_2, 5, 4 ; 11 - map_const HAITEKU_IMPOSTER_OAK_HOUSE, 5, 4 ; 12 - map_const HAITEKU_AQUARIUM_1F, 8, 4 ; 13 - map_const HAITEKU_AQUARIUM_2F, 8, 4 ; 14 + newgroup HIGHTECH ; 4 + map_const HIGHTECH_WEST_ROUTE, 25, 9 ; 1 + map_const HIGHTECH_WEST_ROUTE_OCEAN, 10, 27 ; 2 + map_const HIGHTECH, 20, 18 ; 3 + map_const HIGHTECH_WEST_ROUTE_GATE, 5, 4 ; 4 + map_const HIGHTECH_POKECENTER_1F, 8, 4 ; 5 + map_const HIGHTECH_POKECENTER_2F, 8, 4 ; 6 + map_const HIGHTECH_LEAGUE_1F, 4, 8 ; 7 + map_const HIGHTECH_LEAGUE_2F, 5, 9 ; 8 + map_const HIGHTECH_MART, 6, 4 ; 9 + map_const HIGHTECH_HOUSE_1, 5, 4 ; 10 + map_const HIGHTECH_HOUSE_2, 5, 4 ; 11 + map_const HIGHTECH_IMPOSTER_OAK_HOUSE, 5, 4 ; 12 + map_const HIGHTECH_AQUARIUM_1F, 8, 4 ; 13 + map_const HIGHTECH_AQUARIUM_2F, 8, 4 ; 14 endgroup - newgroup FONTO ; 5 - map_const FONTO_ROUTE_1, 35, 9 ; 1 - map_const FONTO_ROUTE_2, 10, 18 ; 2 - map_const FONTO_ROUTE_3, 25, 9 ; 3 - map_const FONTO_ROUTE_4, 10, 18 ; 4 - map_const FONTO_ROUTE_5, 10, 18 ; 5 - map_const FONTO_ROUTE_6, 35, 9 ; 6 - map_const FONTO, 10, 9 ; 7 - map_const FONTO_ROUTE_GATE_1, 5, 4 ; 8 - map_const FONTO_ROUTE_GATE_2, 5, 4 ; 9 - map_const FONTO_ROUTE_GATE_3, 5, 4 ; 10 - map_const FONTO_ROCKET_HOUSE, 8, 4 ; 11 - map_const FONTO_MART, 8, 4 ; 12 - map_const FONTO_HOUSE, 5, 4 ; 13 - map_const FONTO_POKECENTER_1F, 8, 4 ; 14 - map_const FONTO_POKECENTER_2F, 8, 4 ; 15 - map_const FONTO_LAB, 5, 4 ; 16 + newgroup FONT ; 5 + map_const FONT_ROUTE_1, 35, 9 ; 1 + map_const FONT_ROUTE_2, 10, 18 ; 2 + map_const FONT_ROUTE_3, 25, 9 ; 3 + map_const FONT_ROUTE_4, 10, 18 ; 4 + map_const FONT_ROUTE_5, 10, 18 ; 5 + map_const FONT_ROUTE_6, 35, 9 ; 6 + map_const FONT, 10, 9 ; 7 + map_const FONT_ROUTE_GATE_1, 5, 4 ; 8 + map_const FONT_ROUTE_GATE_2, 5, 4 ; 9 + map_const FONT_ROUTE_GATE_3, 5, 4 ; 10 + map_const FONT_ROCKET_HOUSE, 8, 4 ; 11 + map_const FONT_MART, 8, 4 ; 12 + map_const FONT_HOUSE, 5, 4 ; 13 + map_const FONT_POKECENTER_1F, 8, 4 ; 14 + map_const FONT_POKECENTER_2F, 8, 4 ; 15 + map_const FONT_LAB, 5, 4 ; 16 endgroup - newgroup BAADON ; 6 - map_const BAADON_ROUTE_1, 10, 27 ; 1 - map_const BAADON_ROUTE_2, 50, 9 ; 2 - map_const BAADON_ROUTE_3, 10, 18 ; 3 - map_const BAADON, 10, 9 ; 4 - map_const BAADON_ROUTE_GATE_WEST, 5, 4 ; 5 - map_const BAADON_ROUTE_GATE_NEWTYPE, 5, 4 ; 6 - map_const BAADON_MART, 8, 4 ; 7 - map_const BAADON_POKECENTER_1F, 8, 4 ; 8 - map_const BAADON_POKECENTER_2F, 8, 4 ; 9 - map_const BAADON_HOUSE_1, 4, 4 ; 10 - map_const BAADON_WALLPAPER_HOUSE, 4, 4 ; 11 - map_const BAADON_HOUSE_2, 5, 4 ; 12 - map_const BAADON_LEAGUE_1F, 4, 8 ; 13 - map_const BAADON_LEAGUE_2F, 5, 9 ; 14 + newgroup BIRDON ; 6 + map_const BIRDON_ROUTE_1, 10, 27 ; 1 + map_const BIRDON_ROUTE_2, 50, 9 ; 2 + map_const BIRDON_ROUTE_3, 10, 18 ; 3 + map_const BIRDON, 10, 9 ; 4 + map_const BIRDON_ROUTE_GATE_WEST, 5, 4 ; 5 + map_const BIRDON_ROUTE_GATE_NEWTYPE, 5, 4 ; 6 + map_const BIRDON_MART, 8, 4 ; 7 + map_const BIRDON_POKECENTER_1F, 8, 4 ; 8 + map_const BIRDON_POKECENTER_2F, 8, 4 ; 9 + map_const BIRDON_HOUSE_1, 4, 4 ; 10 + map_const BIRDON_WALLPAPER_HOUSE, 4, 4 ; 11 + map_const BIRDON_HOUSE_2, 5, 4 ; 12 + map_const BIRDON_LEAGUE_1F, 4, 8 ; 13 + map_const BIRDON_LEAGUE_2F, 5, 9 ; 14 endgroup newgroup NEWTYPE ; 7 @@ -176,22 +176,22 @@ ENDM map_const SUGAR_POKECENTER_2F, 8, 4 ; 8 endgroup - newgroup BULL ; 9 - map_const BULL_FOREST_ROUTE_1, 25, 9 ; 1 - map_const BULL_FOREST_ROUTE_2, 10, 27 ; 2 - map_const BULL_FOREST_ROUTE_3, 10, 27 ; 3 - map_const BULL_FOREST, 20, 18 ; 4 - map_const BULL_FOREST_ROUTE_1_HOUSE, 5, 4 ; 5 - map_const BULL_FOREST_ROUTE_GATE_STAND, 5, 4 ; 6 - map_const BULL_MART, 8, 4 ; 7 - map_const BULL_HOUSE_1, 4, 4 ; 8 - map_const BULL_HOUSE_2, 5, 4 ; 9 - map_const BULL_HOUSE_3, 5, 4 ; 10 - map_const BULL_POKECENTER_1F, 8, 4 ; 11 - map_const BULL_POKECENTER_2F, 8, 4 ; 12 - map_const BULL_LEAGUE_1F, 4, 8 ; 13 - map_const BULL_LEAGUE_2F, 5, 9 ; 14 - map_const BULL_HOUSE_4, 5, 4 ; 15 + newgroup BLUE ; 9 + map_const BLUE_FOREST_ROUTE_1, 25, 9 ; 1 + map_const BLUE_FOREST_ROUTE_2, 10, 27 ; 2 + map_const BLUE_FOREST_ROUTE_3, 10, 27 ; 3 + map_const BLUE_FOREST, 20, 18 ; 4 + map_const BLUE_FOREST_ROUTE_1_HOUSE, 5, 4 ; 5 + map_const BLUE_FOREST_ROUTE_GATE_STAND, 5, 4 ; 6 + map_const BLUE_MART, 8, 4 ; 7 + map_const BLUE_HOUSE_1, 4, 4 ; 8 + map_const BLUE_HOUSE_2, 5, 4 ; 9 + map_const BLUE_HOUSE_3, 5, 4 ; 10 + map_const BLUE_POKECENTER_1F, 8, 4 ; 11 + map_const BLUE_POKECENTER_2F, 8, 4 ; 12 + map_const BLUE_LEAGUE_1F, 4, 8 ; 13 + map_const BLUE_LEAGUE_2F, 5, 9 ; 14 + map_const BLUE_HOUSE_4, 5, 4 ; 15 endgroup newgroup STAND ; 10 diff --git a/constants/palette_constants.asm b/constants/palette_constants.asm index 1d3231c9..95ac1e13 100644 --- a/constants/palette_constants.asm +++ b/constants/palette_constants.asm @@ -6,12 +6,12 @@ const PAL_TOWN_WEST ; 03 const PAL_TOWN_NEWTYPE ; 04 const PAL_TOWN_SUGAR ; 05 - const PAL_TOWN_FONTO ; 06 + const PAL_TOWN_FONT ; 06 const PAL_TOWN_SILENTHILL ; 07 - const PAL_TOWN_HAITEKU ; 08 + const PAL_TOWN_HIGHTECH ; 08 const PAL_TOWN_SOUTH ; 09 - const PAL_TOWN_BULL ; 0a - const PAL_TOWN_BAADON ; 0b + const PAL_TOWN_BLUE ; 0a + const PAL_TOWN_BIRDON ; 0b const PAL_TOWN_OLDCITY ; 0c const PAL_NIGHTTIME ; 0d const PAL_BLACK ; 0e diff --git a/constants/tileset_constants.asm b/constants/tileset_constants.asm index 4dc47b00..acf5ac8e 100644 --- a/constants/tileset_constants.asm +++ b/constants/tileset_constants.asm @@ -3,10 +3,10 @@ const TILESET_SILENT_HILL const TILESET_OLD_CITY const TILESET_WEST - const TILESET_HAITEKU - const TILESET_BAADON - const TILESET_FONTO - const TILESET_BULL_FOREST + const TILESET_HIGH_TECH + const TILESET_BIRDON + const TILESET_FONT + const TILESET_NORTH const TILESET_KANTO const TILESET_SOUTH const TILESET_HOUSE diff --git a/data/maps/flypoints.asm b/data/maps/flypoints.asm index 351b1a24..da73e5fd 100644 --- a/data/maps/flypoints.asm +++ b/data/maps/flypoints.asm @@ -11,17 +11,17 @@ SECTION "data/maps/flypoints.asm", ROMX FlyPointPaths: db FLY_POINT_PRINCE, FLY_POINT_N_A, FLY_POINT_OLD, FLY_POINT_KANTO ; FLY_POINT_SILENT_HILL - db FLY_POINT_HAITEKU, FLY_POINT_SILENT_HILL, FLY_POINT_WEST, FLY_POINT_SILENT_HILL ; FLY_POINT_OLD - db FLY_POINT_BAADON, FLY_POINT_OLD, FLY_POINT_HAITEKU, FLY_POINT_OLD ; FLY_POINT_WEST - db FLY_POINT_FONTO, FLY_POINT_WEST, FLY_POINT_SOUTH, FLY_POINT_WEST ; FLY_POINT_HAITEKU - db FLY_POINT_SOUTH, FLY_POINT_HAITEKU, FLY_POINT_SOUTH, FLY_POINT_BAADON ; FLY_POINT_FONTO - db FLY_POINT_FONTO, FLY_POINT_WEST, FLY_POINT_FONTO, FLY_POINT_NEWTYPE ; FLY_POINT_BAADON - db FLY_POINT_SUGAR, FLY_POINT_N_A, FLY_POINT_BAADON, FLY_POINT_BULL_FOREST ; FLY_POINT_NEWTYPE + db FLY_POINT_HIGH_TECH, FLY_POINT_SILENT_HILL, FLY_POINT_WEST, FLY_POINT_SILENT_HILL ; FLY_POINT_OLD + db FLY_POINT_BIRDON, FLY_POINT_OLD, FLY_POINT_HIGH_TECH, FLY_POINT_OLD ; FLY_POINT_WEST + db FLY_POINT_FONT, FLY_POINT_WEST, FLY_POINT_SOUTH, FLY_POINT_WEST ; FLY_POINT_HIGH_TECH + db FLY_POINT_SOUTH, FLY_POINT_HIGH_TECH, FLY_POINT_SOUTH, FLY_POINT_BIRDON ; FLY_POINT_FONT + db FLY_POINT_FONT, FLY_POINT_WEST, FLY_POINT_FONT, FLY_POINT_NEWTYPE ; FLY_POINT_BIRDON + db FLY_POINT_SUGAR, FLY_POINT_N_A, FLY_POINT_BIRDON, FLY_POINT_BLUE_FOREST ; FLY_POINT_NEWTYPE db FLY_POINT_N_A, FLY_POINT_NEWTYPE, FLY_POINT_N_A, FLY_POINT_N_A ; FLY_POINT_SUGAR - db FLY_POINT_NORTH, FLY_POINT_STAND, FLY_POINT_NEWTYPE, FLY_POINT_NORTH ; FLY_POINT_BULL_FOREST - db FLY_POINT_BULL_FOREST, FLY_POINT_KANTO, FLY_POINT_KANTO, FLY_POINT_BULL_FOREST ; FLY_POINT_STAND + db FLY_POINT_NORTH, FLY_POINT_STAND, FLY_POINT_NEWTYPE, FLY_POINT_NORTH ; FLY_POINT_BLUE_FOREST + db FLY_POINT_BLUE_FOREST, FLY_POINT_KANTO, FLY_POINT_KANTO, FLY_POINT_BLUE_FOREST ; FLY_POINT_STAND db FLY_POINT_STAND, FLY_POINT_SILENT_HILL, FLY_POINT_SILENT_HILL, FLY_POINT_STAND ; FLY_POINT_KANTO db FLY_POINT_MT_FUJI, FLY_POINT_SILENT_HILL, FLY_POINT_N_A, FLY_POINT_N_A ; FLY_POINT_PRINCE db FLY_POINT_N_A, FLY_POINT_PRINCE, FLY_POINT_N_A, FLY_POINT_N_A ; FLY_POINT_MT_FUJI - db FLY_POINT_FONTO, FLY_POINT_HAITEKU, FLY_POINT_N_A, FLY_POINT_FONTO ; FLY_POINT_SOUTH - db FLY_POINT_N_A, FLY_POINT_BULL_FOREST, FLY_POINT_BULL_FOREST, FLY_POINT_N_A ; FLY_POINT_NORTH + db FLY_POINT_FONT, FLY_POINT_HIGH_TECH, FLY_POINT_N_A, FLY_POINT_FONT ; FLY_POINT_SOUTH + db FLY_POINT_N_A, FLY_POINT_BLUE_FOREST, FLY_POINT_BLUE_FOREST, FLY_POINT_N_A ; FLY_POINT_NORTH diff --git a/data/maps/landmarks.asm b/data/maps/landmarks.asm index 14a43895..92f61289 100644 --- a/data/maps/landmarks.asm +++ b/data/maps/landmarks.asm @@ -12,9 +12,9 @@ SECTION "data/maps/landmarks.asm", ROMX LandmarkPositions: landmark -8, -16 ; LANDMARK_NONE landmark 148, 12 ; LANDMARK_NORTH - landmark 148, 24 ; LANDMARK_BULL_FOREST_ROUTE_3 - landmark 148, 36 ; LANDMARK_BULL_FOREST - landmark 148, 48 ; LANDMARK_BULL_FOREST_ROUTE_2 + landmark 148, 24 ; LANDMARK_BLUE_FOREST_ROUTE_3 + landmark 148, 36 ; LANDMARK_BLUE_FOREST + landmark 148, 48 ; LANDMARK_BLUE_FOREST_ROUTE_2 landmark 148, 60 ; LANDMARK_STAND landmark 148, 76 ; LANDMARK_STAND_ROUTE landmark 140, 92 ; LANDMARK_KANTO_EAST_ROUTE @@ -28,32 +28,32 @@ LandmarkPositions: landmark 84, 76 ; LANDMARK_OLD_CITY landmark 72, 76 ; LANDMARK_ROUTE_2 landmark 60, 76 ; LANDMARK_WEST - landmark 60, 64 ; LANDMARK_BAADON_ROUTE_1 - landmark 60, 52 ; LANDMARK_BAADON - landmark 84, 52 ; LANDMARK_BAADON_ROUTE_2 - landmark 100, 52 ; LANDMARK_BAADON_ROUTE_3 + landmark 60, 64 ; LANDMARK_BIRDON_ROUTE_1 + landmark 60, 52 ; LANDMARK_BIRDON + landmark 84, 52 ; LANDMARK_BIRDON_ROUTE_2 + landmark 100, 52 ; LANDMARK_BIRDON_ROUTE_3 landmark 108, 60 ; LANDMARK_ROUTE_15 landmark 116, 60 ; LANDMARK_NEWTYPE landmark 116, 48 ; LANDMARK_SUGAR_ROUTE landmark 116, 36 ; LANDMARK_SUGAR landmark 124, 60 ; LANDMARK_NEWTYPE_ROUTE landmark 132, 44 ; LANDMARK_ROUTE_18 - landmark 140, 36 ; LANDMARK_BULL_FOREST_ROUTE_1 + landmark 140, 36 ; LANDMARK_BLUE_FOREST_ROUTE_1 landmark 120, 76 ; LANDMARK_1C landmark 96, 68 ; LANDMARK_1D - landmark 48, 44 ; LANDMARK_FONTO_ROUTE_3 - landmark 36, 44 ; LANDMARK_FONTO - landmark 36, 36 ; LANDMARK_FONTO_ROUTE_2 - landmark 24, 28 ; LANDMARK_FONTO_ROUTE_6 - landmark 12, 36 ; LANDMARK_FONTO_ROUTE_5 + landmark 48, 44 ; LANDMARK_FONT_ROUTE_3 + landmark 36, 44 ; LANDMARK_FONT + landmark 36, 36 ; LANDMARK_FONT_ROUTE_2 + landmark 24, 28 ; LANDMARK_FONT_ROUTE_6 + landmark 12, 36 ; LANDMARK_FONT_ROUTE_5 landmark 12, 44 ; LANDMARK_SOUTH - landmark 24, 44 ; LANDMARK_FONTO_ROUTE_1 - landmark 12, 56 ; LANDMARK_HAITEKU_WEST_ROUTE_OCEAN - landmark 20, 68 ; LANDMARK_HAITEKU_WEST_ROUTE - landmark 36, 68 ; LANDMARK_HAITEKU + landmark 24, 44 ; LANDMARK_FONT_ROUTE_1 + landmark 12, 56 ; LANDMARK_HIGH_TECH_WEST_ROUTE_OCEAN + landmark 20, 68 ; LANDMARK_HIGH_TECH_WEST_ROUTE + landmark 36, 68 ; LANDMARK_HIGH_TECH landmark 48, 68 ; LANDMARK_WASTE_BRIDGE - landmark 60, 44 ; LANDMARK_FONTO_ROUTE_4 - landmark 36, 56 ; LANDMARK_FONTO_BRIDGE + landmark 60, 44 ; LANDMARK_FONT_ROUTE_4 + landmark 36, 56 ; LANDMARK_FONT_BRIDGE SECTION "data/maps/landmarks.asm@LandmarkNames", ROMX diff --git a/data/maps/maps.asm b/data/maps/maps.asm index 47690067..1c593841 100644 --- a/data/maps/maps.asm +++ b/data/maps/maps.asm @@ -19,12 +19,12 @@ MapGroupPointers: dw MapGroup_SilentHill dw MapGroup_OldCity dw MapGroup_West - dw MapGroup_Haiteku - dw MapGroup_Fonto - dw MapGroup_Baadon + dw MapGroup_HighTech + dw MapGroup_Font + dw MapGroup_Birdon dw MapGroup_Newtype dw MapGroup_Sugar - dw MapGroup_Bull + dw MapGroup_Blue dw MapGroup_Stand dw MapGroup_Kanto dw MapGroup_Prince @@ -49,7 +49,7 @@ MapGroup_SilentHill: map SilentHillLabFront, TILESET_LAB, INDOOR, LANDMARK_SILENT_HILL map SilentHillLabBack, TILESET_LAB, INDOOR, LANDMARK_SILENT_HILL map UnusedMap13, TILESET_LAB, INDOOR, LANDMARK_SILENT_HILL - map ShizukanaOka, TILESET_FOREST, CAVE, LANDMARK_NONE + map SilentHills, TILESET_FOREST, CAVE, LANDMARK_NONE MapGroup_OldCity: map Route2, TILESET_OLD_CITY, ROUTE, LANDMARK_ROUTE_2 @@ -96,55 +96,55 @@ MapGroup_West: map WestHouse1, TILESET_HOUSE, INDOOR, LANDMARK_WEST map WestHouse2, TILESET_HOUSE, INDOOR, LANDMARK_WEST -MapGroup_Haiteku: - map HaitekuWestRoute, TILESET_HAITEKU, ROUTE, LANDMARK_HAITEKU_WEST_ROUTE - map HaitekuWestRouteOcean, TILESET_HAITEKU, ROUTE, LANDMARK_HAITEKU_WEST_ROUTE_OCEAN - map Haiteku, TILESET_HAITEKU, TOWN, LANDMARK_HAITEKU - map HaitekuWestRouteGate, TILESET_GATE, GATE, LANDMARK_HAITEKU_WEST_ROUTE_OCEAN - map HaitekuPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_HAITEKU - map HaitekuPokecenter2F, TILESET_POKECENTER, INDOOR, LANDMARK_HAITEKU - map HaitekuLeague1F, TILESET_TOWER, INDOOR, LANDMARK_HAITEKU - map HaitekuLeague2F, TILESET_GYM, INDOOR, LANDMARK_HAITEKU - map HaitekuMart, TILESET_MART, INDOOR, LANDMARK_HAITEKU - map HaitekuHouse1, TILESET_HOUSE, INDOOR, LANDMARK_HAITEKU - map HaitekuHouse2, TILESET_HOUSE, INDOOR, LANDMARK_HAITEKU - map HaitekuImposterOakHouse, TILESET_HOUSE, INDOOR, LANDMARK_HAITEKU - map HaitekuAquarium1F, TILESET_AQUARIUM, INDOOR, LANDMARK_HAITEKU - map HaitekuAquarium2F, TILESET_AQUARIUM, INDOOR, LANDMARK_HAITEKU +MapGroup_HighTech: + map HighTechWestRoute, TILESET_HIGH_TECH, ROUTE, LANDMARK_HIGH_TECH_WEST_ROUTE + map HighTechWestRouteOcean, TILESET_HIGH_TECH, ROUTE, LANDMARK_HIGH_TECH_WEST_ROUTE_OCEAN + map HighTech, TILESET_HIGH_TECH, TOWN, LANDMARK_HIGH_TECH + map HighTechWestRouteGate, TILESET_GATE, GATE, LANDMARK_HIGH_TECH_WEST_ROUTE_OCEAN + map HighTechPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_HIGH_TECH + map HighTechPokecenter2F, TILESET_POKECENTER, INDOOR, LANDMARK_HIGH_TECH + map HighTechLeague1F, TILESET_TOWER, INDOOR, LANDMARK_HIGH_TECH + map HighTechLeague2F, TILESET_GYM, INDOOR, LANDMARK_HIGH_TECH + map HighTechMart, TILESET_MART, INDOOR, LANDMARK_HIGH_TECH + map HighTechHouse1, TILESET_HOUSE, INDOOR, LANDMARK_HIGH_TECH + map HighTechHouse2, TILESET_HOUSE, INDOOR, LANDMARK_HIGH_TECH + map HighTechImposterOakHouse, TILESET_HOUSE, INDOOR, LANDMARK_HIGH_TECH + map HighTechAquarium1F, TILESET_AQUARIUM, INDOOR, LANDMARK_HIGH_TECH + map HighTechAquarium2F, TILESET_AQUARIUM, INDOOR, LANDMARK_HIGH_TECH -MapGroup_Fonto: - map FontoRoute1, TILESET_FONTO, ROUTE, LANDMARK_FONTO_ROUTE_1 - map FontoRoute2, TILESET_FONTO, ROUTE, LANDMARK_FONTO_ROUTE_2 - map FontoRoute3, TILESET_FONTO, ROUTE, LANDMARK_FONTO_ROUTE_3 - map FontoRoute4, TILESET_FONTO, ROUTE, LANDMARK_FONTO_ROUTE_4 - map FontoRoute5, TILESET_FONTO, ROUTE, LANDMARK_FONTO_ROUTE_5 - map FontoRoute6, TILESET_FONTO, ROUTE, LANDMARK_FONTO_ROUTE_6 - map Fonto, TILESET_FONTO, TOWN, LANDMARK_FONTO - map FontoRouteGate1, TILESET_GATE, GATE, LANDMARK_FONTO_ROUTE_1 - map FontoRouteGate2, TILESET_GATE, GATE, LANDMARK_FONTO_ROUTE_4 - map FontoRouteGate3, TILESET_GATE, GATE, LANDMARK_FONTO_ROUTE_5 - map FontoRocketHouse, TILESET_ROCKET_HOUSE, INDOOR, LANDMARK_FONTO - map FontoMart, TILESET_MART, INDOOR, LANDMARK_FONTO - map FontoHouse, TILESET_HOUSE, INDOOR, LANDMARK_FONTO - map FontoPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_FONTO - map FontoPokecenter2F, TILESET_POKECENTER, INDOOR, LANDMARK_FONTO - map FontoLab, TILESET_LAB, INDOOR, LANDMARK_FONTO +MapGroup_Font: + map FontRoute1, TILESET_FONT, ROUTE, LANDMARK_FONT_ROUTE_1 + map FontRoute2, TILESET_FONT, ROUTE, LANDMARK_FONT_ROUTE_2 + map FontRoute3, TILESET_FONT, ROUTE, LANDMARK_FONT_ROUTE_3 + map FontRoute4, TILESET_FONT, ROUTE, LANDMARK_FONT_ROUTE_4 + map FontRoute5, TILESET_FONT, ROUTE, LANDMARK_FONT_ROUTE_5 + map FontRoute6, TILESET_FONT, ROUTE, LANDMARK_FONT_ROUTE_6 + map Font, TILESET_FONT, TOWN, LANDMARK_FONT + map FontRouteGate1, TILESET_GATE, GATE, LANDMARK_FONT_ROUTE_1 + map FontRouteGate2, TILESET_GATE, GATE, LANDMARK_FONT_ROUTE_4 + map FontRouteGate3, TILESET_GATE, GATE, LANDMARK_FONT_ROUTE_5 + map FontRocketHouse, TILESET_ROCKET_HOUSE, INDOOR, LANDMARK_FONT + map FontMart, TILESET_MART, INDOOR, LANDMARK_FONT + map FontHouse, TILESET_HOUSE, INDOOR, LANDMARK_FONT + map FontPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_FONT + map FontPokecenter2F, TILESET_POKECENTER, INDOOR, LANDMARK_FONT + map FontLab, TILESET_LAB, INDOOR, LANDMARK_FONT -MapGroup_Baadon: - map BaadonRoute1, TILESET_BAADON, ROUTE, LANDMARK_BAADON_ROUTE_1 - map BaadonRoute2, TILESET_BAADON, ROUTE, LANDMARK_BAADON_ROUTE_2 - map BaadonRoute3, TILESET_BAADON, ROUTE, LANDMARK_BAADON_ROUTE_3 - map Baadon, TILESET_BAADON, TOWN, LANDMARK_BAADON - map BaadonRouteGateWest, TILESET_GATE, GATE, LANDMARK_BAADON_ROUTE_1 - map BaadonRouteGateNewtype, TILESET_GATE, GATE, LANDMARK_BAADON_ROUTE_3 - map BaadonMart, TILESET_MART, INDOOR, LANDMARK_BAADON - map BaadonPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_BAADON - map BaadonPokecenter2F, TILESET_POKECENTER, INDOOR, LANDMARK_BAADON - map BaadonHouse1, TILESET_TRADITIONAL_HOUSE, INDOOR, LANDMARK_BAADON - map BaadonWallpaperHouse, TILESET_AQUARIUM, INDOOR, LANDMARK_BAADON - map BaadonHouse2, TILESET_HOUSE, INDOOR, LANDMARK_BAADON - map BaadonLeague1F, TILESET_TOWER, INDOOR, LANDMARK_BAADON - map BaadonLeague2F, TILESET_GYM, INDOOR, LANDMARK_BAADON +MapGroup_Birdon: + map BirdonRoute1, TILESET_BIRDON, ROUTE, LANDMARK_BIRDON_ROUTE_1 + map BirdonRoute2, TILESET_BIRDON, ROUTE, LANDMARK_BIRDON_ROUTE_2 + map BirdonRoute3, TILESET_BIRDON, ROUTE, LANDMARK_BIRDON_ROUTE_3 + map Birdon, TILESET_BIRDON, TOWN, LANDMARK_BIRDON + map BirdonRouteGateWest, TILESET_GATE, GATE, LANDMARK_BIRDON_ROUTE_1 + map BirdonRouteGateNewtype, TILESET_GATE, GATE, LANDMARK_BIRDON_ROUTE_3 + map BirdonMart, TILESET_MART, INDOOR, LANDMARK_BIRDON + map BirdonPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_BIRDON + map BirdonPokecenter2F, TILESET_POKECENTER, INDOOR, LANDMARK_BIRDON + map BirdonHouse1, TILESET_TRADITIONAL_HOUSE, INDOOR, LANDMARK_BIRDON + map BirdonWallpaperHouse, TILESET_AQUARIUM, INDOOR, LANDMARK_BIRDON + map BirdonHouse2, TILESET_HOUSE, INDOOR, LANDMARK_BIRDON + map BirdonLeague1F, TILESET_TOWER, INDOOR, LANDMARK_BIRDON + map BirdonLeague2F, TILESET_GYM, INDOOR, LANDMARK_BIRDON MapGroup_Newtype: map Route15, TILESET_SILENT_HILL, ROUTE, LANDMARK_ROUTE_15 @@ -169,8 +169,8 @@ MapGroup_Newtype: map NewtypeHouse3, TILESET_HOUSE, INDOOR, LANDMARK_NEWTYPE MapGroup_Sugar: - map SugarRoute, TILESET_HAITEKU, ROUTE, LANDMARK_SUGAR_ROUTE - map Sugar, TILESET_HAITEKU, TOWN, LANDMARK_SUGAR + map SugarRoute, TILESET_HIGH_TECH, ROUTE, LANDMARK_SUGAR_ROUTE + map Sugar, TILESET_HIGH_TECH, TOWN, LANDMARK_SUGAR map SugarRouteGate, TILESET_GATE, GATE, LANDMARK_SUGAR_ROUTE map SugarHouse, TILESET_GYM, INDOOR, LANDMARK_SUGAR map SugarHouse2, TILESET_TRADITIONAL_HOUSE, INDOOR, LANDMARK_SUGAR @@ -178,22 +178,22 @@ MapGroup_Sugar: map SugarPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_SUGAR map SugarPokecenter2F, TILESET_POKECENTER, INDOOR, LANDMARK_SUGAR -MapGroup_Bull: - map BullForestRoute1, TILESET_BULL_FOREST, ROUTE, LANDMARK_BULL_FOREST_ROUTE_1 - map BullForestRoute2, TILESET_BULL_FOREST, ROUTE, LANDMARK_BULL_FOREST_ROUTE_2 - map BullForestRoute3, TILESET_BULL_FOREST, ROUTE, LANDMARK_BULL_FOREST_ROUTE_3 - map BullForest, TILESET_BULL_FOREST, TOWN, LANDMARK_BULL_FOREST - map BullForestRoute1House, TILESET_HOUSE, INDOOR, LANDMARK_BULL_FOREST_ROUTE_1 - map BullForestRouteGateStand, TILESET_GATE, GATE, LANDMARK_BULL_FOREST_ROUTE_2 - map BullMart, TILESET_MART, INDOOR, LANDMARK_BULL_FOREST - map BullHouse1, TILESET_TRADITIONAL_HOUSE, INDOOR, LANDMARK_BULL_FOREST - map BullHouse2, TILESET_HOUSE, INDOOR, LANDMARK_BULL_FOREST - map BullHouse3, TILESET_HOUSE, INDOOR, LANDMARK_BULL_FOREST - map BullPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_BULL_FOREST - map BullPokecenter2F, TILESET_POKECENTER, INDOOR, LANDMARK_BULL_FOREST - map BullLeague1F, TILESET_TOWER, INDOOR, LANDMARK_BULL_FOREST - map BullLeague2F, TILESET_GYM, INDOOR, LANDMARK_BULL_FOREST - map BullHouse4, TILESET_HOUSE, INDOOR, LANDMARK_BULL_FOREST +MapGroup_Blue: + map BlueForestRoute1, TILESET_NORTH, ROUTE, LANDMARK_BLUE_FOREST_ROUTE_1 + map BlueForestRoute2, TILESET_NORTH, ROUTE, LANDMARK_BLUE_FOREST_ROUTE_2 + map BlueForestRoute3, TILESET_NORTH, ROUTE, LANDMARK_BLUE_FOREST_ROUTE_3 + map BlueForest, TILESET_NORTH, TOWN, LANDMARK_BLUE_FOREST + map BlueForestRoute1House, TILESET_HOUSE, INDOOR, LANDMARK_BLUE_FOREST_ROUTE_1 + map BlueForestRouteGateStand, TILESET_GATE, GATE, LANDMARK_BLUE_FOREST_ROUTE_2 + map BlueMart, TILESET_MART, INDOOR, LANDMARK_BLUE_FOREST + map BlueHouse1, TILESET_TRADITIONAL_HOUSE, INDOOR, LANDMARK_BLUE_FOREST + map BlueHouse2, TILESET_HOUSE, INDOOR, LANDMARK_BLUE_FOREST + map BlueHouse3, TILESET_HOUSE, INDOOR, LANDMARK_BLUE_FOREST + map BluePokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_BLUE_FOREST + map BluePokecenter2F, TILESET_POKECENTER, INDOOR, LANDMARK_BLUE_FOREST + map BlueLeague1F, TILESET_TOWER, INDOOR, LANDMARK_BLUE_FOREST + map BlueLeague2F, TILESET_GYM, INDOOR, LANDMARK_BLUE_FOREST + map BlueHouse4, TILESET_HOUSE, INDOOR, LANDMARK_BLUE_FOREST MapGroup_Stand: map StandRoute, TILESET_SILENT_HILL, ROUTE, LANDMARK_STAND_ROUTE @@ -267,7 +267,7 @@ MapGroup_South: map SouthHouse2, TILESET_HOUSE, INDOOR, LANDMARK_SOUTH MapGroup_North: - map North, TILESET_BULL_FOREST, TOWN, LANDMARK_NORTH + map North, TILESET_NORTH, TOWN, LANDMARK_NORTH map NorthHouse1, TILESET_HOUSE, INDOOR, LANDMARK_NORTH map NorthMart, TILESET_MART, INDOOR, LANDMARK_NORTH map NorthHouse2, TILESET_HOUSE, INDOOR, LANDMARK_NORTH diff --git a/data/maps/objects/Baadon.asm b/data/maps/objects/Baadon.asm deleted file mode 100644 index 678c745f..00000000 --- a/data/maps/objects/Baadon.asm +++ /dev/null @@ -1,36 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/objects/Baadon.asm", ROMX - - map_attributes Baadon, BAADON, NORTH | SOUTH | EAST - connection north, FontoRoute4, FONTO_ROUTE_4, 0 - connection south, BaadonRoute1, BAADON_ROUTE_1, 0 - connection east, BaadonRoute2, BAADON_ROUTE_2, 0 - -Baadon_MapEvents:: - dw $4000 ; unknown - - def_warp_events - warp_event 3, 4, BAADON_MART, 1, 50 - warp_event 15, 4, BAADON_POKECENTER_1F, 1, 56 - warp_event 4, 9, BAADON_HOUSE_1, 1, 83 - warp_event 3, 13, BAADON_WALLPAPER_HOUSE, 1, 114 - warp_event 9, 13, BAADON_HOUSE_2, 1, 117 - warp_event 14, 15, BAADON_LEAGUE_1F, 1, 136 - warp_event 15, 15, BAADON_LEAGUE_1F, 2, 136 - warp_event 8, 5, FONTO_ROUTE_GATE_2, 1, 53 - warp_event 9, 5, FONTO_ROUTE_GATE_2, 2, 53 - - def_bg_events - bg_event 4, 4, 1 - bg_event 16, 4, 2 - bg_event 11, 10, 3 - bg_event 6, 14, 4 - - def_object_events - object_event 14, 8, SPRITE_SUPER_NERD, SPRITEMOVEFN_RANDOM_WALK_XY, 2, 2, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 6, 9, SPRITE_YOUNGSTER, SPRITEMOVEFN_RANDOM_WALK_Y, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 10, 14, SPRITE_TWIN, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -Baadon_Blocks:: -INCBIN "maps/Baadon.blk" diff --git a/data/maps/objects/BaadonHouse1.asm b/data/maps/objects/BaadonHouse1.asm deleted file mode 100644 index 24aa0674..00000000 --- a/data/maps/objects/BaadonHouse1.asm +++ /dev/null @@ -1,20 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/objects/BaadonHouse1.asm", ROMX - - map_attributes BaadonHouse1, BAADON_HOUSE_1, 0 - -BaadonHouse1_MapEvents:: - dw $4000 ; unknown - - def_warp_events - warp_event 3, 7, BAADON, 3, 42 - warp_event 4, 7, BAADON, 3, 43 - - def_bg_events - - def_object_events - object_event 2, 3, SPRITE_ELDER, SPRITEMOVEFN_TURN_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -BaadonHouse1_Blocks:: -INCBIN "maps/BaadonHouse1.blk" diff --git a/data/maps/objects/BaadonHouse2.asm b/data/maps/objects/BaadonHouse2.asm deleted file mode 100644 index 37df2c7d..00000000 --- a/data/maps/objects/BaadonHouse2.asm +++ /dev/null @@ -1,20 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/objects/BaadonHouse2.asm", ROMX - - map_attributes BaadonHouse2, BAADON_HOUSE_2, 0 - -BaadonHouse2_MapEvents:: - dw $4000 ; unknown - - def_warp_events - warp_event 4, 7, BAADON, 5, 47 - warp_event 5, 7, BAADON, 5, 47 - - def_bg_events - - def_object_events - object_event 7, 5, SPRITE_GRANNY, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -BaadonHouse2_Blocks:: -INCBIN "maps/BaadonHouse2.blk" diff --git a/data/maps/objects/BaadonRoute1.asm b/data/maps/objects/BaadonRoute1.asm deleted file mode 100644 index b55f9bd7..00000000 --- a/data/maps/objects/BaadonRoute1.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/objects/BaadonRoute1.asm", ROMX - - map_attributes BaadonRoute1, BAADON_ROUTE_1, NORTH | SOUTH - connection north, Baadon, BAADON, 0 - connection south, West, WEST, -5 - -BaadonRoute1_MapEvents:: - dw $4000 ; unknown - - def_warp_events - warp_event 12, 48, BAADON_ROUTE_GATE_WEST, 3, 407 - warp_event 13, 48, BAADON_ROUTE_GATE_WEST, 4, 407 - - def_bg_events - - def_object_events - -BaadonRoute1_Blocks:: -INCBIN "maps/BaadonRoute1.blk" diff --git a/data/maps/objects/BaadonRoute2.asm b/data/maps/objects/BaadonRoute2.asm deleted file mode 100644 index 1cee9538..00000000 --- a/data/maps/objects/BaadonRoute2.asm +++ /dev/null @@ -1,19 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/objects/BaadonRoute2.asm", ROMX - - map_attributes BaadonRoute2, BAADON_ROUTE_2, WEST | EAST - connection west, Baadon, BAADON, 0 - connection east, BaadonRoute3, BAADON_ROUTE_3, 0 - -BaadonRoute2_MapEvents:: - dw $4000 ; unknown - - def_warp_events - - def_bg_events - - def_object_events - -BaadonRoute2_Blocks:: -INCBIN "maps/BaadonRoute2.blk" diff --git a/data/maps/objects/BaadonRoute3.asm b/data/maps/objects/BaadonRoute3.asm deleted file mode 100644 index d1ee4a50..00000000 --- a/data/maps/objects/BaadonRoute3.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/objects/BaadonRoute3.asm", ROMX - - map_attributes BaadonRoute3, BAADON_ROUTE_3, SOUTH | WEST - connection south, Route15, ROUTE_15, 0 - connection west, BaadonRoute2, BAADON_ROUTE_2, 0 - -BaadonRoute3_MapEvents:: - dw $4000 ; unknown - - def_warp_events - warp_event 8, 30, BAADON_ROUTE_GATE_NEWTYPE, 3, 261 - warp_event 9, 30, BAADON_ROUTE_GATE_NEWTYPE, 4, 261 - - def_bg_events - - def_object_events - -BaadonRoute3_Blocks:: -INCBIN "maps/BaadonRoute3.blk" diff --git a/data/maps/objects/BaadonRouteGateNewtype.asm b/data/maps/objects/BaadonRouteGateNewtype.asm deleted file mode 100644 index e81841f2..00000000 --- a/data/maps/objects/BaadonRouteGateNewtype.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/objects/BaadonRouteGateNewtype.asm", ROMX - - map_attributes BaadonRouteGateNewtype, BAADON_ROUTE_GATE_NEWTYPE, 0 - -BaadonRouteGateNewtype_MapEvents:: - dw $4000 ; unknown - - def_warp_events - warp_event 4, 7, ROUTE_15, 1, 47 - warp_event 5, 7, ROUTE_15, 2, 47 - warp_event 4, 0, BAADON_ROUTE_3, 1, 14 - warp_event 5, 0, BAADON_ROUTE_3, 2, 14 - - def_bg_events - - def_object_events - -BaadonRouteGateNewtype_Blocks:: -INCBIN "maps/BaadonRouteGateNewtype.blk" diff --git a/data/maps/objects/BaadonRouteGateWest.asm b/data/maps/objects/BaadonRouteGateWest.asm deleted file mode 100644 index 4dab1779..00000000 --- a/data/maps/objects/BaadonRouteGateWest.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/objects/BaadonRouteGateWest.asm", ROMX - - map_attributes BaadonRouteGateWest, BAADON_ROUTE_GATE_WEST, 0 - -BaadonRouteGateWest_MapEvents:: - dw $4000 ; unknown - - def_warp_events - warp_event 4, 7, WEST, 11, 47 - warp_event 5, 7, WEST, 12, 47 - warp_event 4, 0, BAADON_ROUTE_1, 1, 14 - warp_event 5, 0, BAADON_ROUTE_1, 2, 14 - - def_bg_events - - def_object_events - -BaadonRouteGateWest_Blocks:: -INCBIN "maps/BaadonRouteGateWest.blk" diff --git a/data/maps/objects/BaadonWallpaperHouse.asm b/data/maps/objects/BaadonWallpaperHouse.asm deleted file mode 100644 index d3b6f097..00000000 --- a/data/maps/objects/BaadonWallpaperHouse.asm +++ /dev/null @@ -1,19 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/objects/BaadonWallpaperHouse.asm", ROMX - - map_attributes BaadonWallpaperHouse, BAADON_WALLPAPER_HOUSE, 0 - -BaadonWallpaperHouse_MapEvents:: - dw $4000 ; unknown - - def_warp_events - warp_event 2, 7, BAADON, 4, 42 - warp_event 3, 7, BAADON, 4, 42 - - def_bg_events - - def_object_events - -BaadonWallpaperHouse_Blocks:: -INCBIN "maps/BaadonWallpaperHouse.blk" diff --git a/data/maps/objects/Birdon.asm b/data/maps/objects/Birdon.asm new file mode 100644 index 00000000..69acd73d --- /dev/null +++ b/data/maps/objects/Birdon.asm @@ -0,0 +1,36 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/Birdon.asm", ROMX + + map_attributes Birdon, BIRDON, NORTH | SOUTH | EAST + connection north, FontRoute4, FONT_ROUTE_4, 0 + connection south, BirdonRoute1, BIRDON_ROUTE_1, 0 + connection east, BirdonRoute2, BIRDON_ROUTE_2, 0 + +Birdon_MapEvents:: + dw $4000 ; unknown + + def_warp_events + warp_event 3, 4, BIRDON_MART, 1, 50 + warp_event 15, 4, BIRDON_POKECENTER_1F, 1, 56 + warp_event 4, 9, BIRDON_HOUSE_1, 1, 83 + warp_event 3, 13, BIRDON_WALLPAPER_HOUSE, 1, 114 + warp_event 9, 13, BIRDON_HOUSE_2, 1, 117 + warp_event 14, 15, BIRDON_LEAGUE_1F, 1, 136 + warp_event 15, 15, BIRDON_LEAGUE_1F, 2, 136 + warp_event 8, 5, FONT_ROUTE_GATE_2, 1, 53 + warp_event 9, 5, FONT_ROUTE_GATE_2, 2, 53 + + def_bg_events + bg_event 4, 4, 1 + bg_event 16, 4, 2 + bg_event 11, 10, 3 + bg_event 6, 14, 4 + + def_object_events + object_event 14, 8, SPRITE_SUPER_NERD, SPRITEMOVEFN_RANDOM_WALK_XY, 2, 2, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 6, 9, SPRITE_YOUNGSTER, SPRITEMOVEFN_RANDOM_WALK_Y, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 10, 14, SPRITE_TWIN, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +Birdon_Blocks:: +INCBIN "maps/Birdon.blk" diff --git a/data/maps/objects/BirdonHouse1.asm b/data/maps/objects/BirdonHouse1.asm new file mode 100644 index 00000000..26ebda65 --- /dev/null +++ b/data/maps/objects/BirdonHouse1.asm @@ -0,0 +1,20 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/BirdonHouse1.asm", ROMX + + map_attributes BirdonHouse1, BIRDON_HOUSE_1, 0 + +BirdonHouse1_MapEvents:: + dw $4000 ; unknown + + def_warp_events + warp_event 3, 7, BIRDON, 3, 42 + warp_event 4, 7, BIRDON, 3, 43 + + def_bg_events + + def_object_events + object_event 2, 3, SPRITE_ELDER, SPRITEMOVEFN_TURN_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +BirdonHouse1_Blocks:: +INCBIN "maps/BirdonHouse1.blk" diff --git a/data/maps/objects/BirdonHouse2.asm b/data/maps/objects/BirdonHouse2.asm new file mode 100644 index 00000000..e65b09ec --- /dev/null +++ b/data/maps/objects/BirdonHouse2.asm @@ -0,0 +1,20 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/BirdonHouse2.asm", ROMX + + map_attributes BirdonHouse2, BIRDON_HOUSE_2, 0 + +BirdonHouse2_MapEvents:: + dw $4000 ; unknown + + def_warp_events + warp_event 4, 7, BIRDON, 5, 47 + warp_event 5, 7, BIRDON, 5, 47 + + def_bg_events + + def_object_events + object_event 7, 5, SPRITE_GRANNY, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +BirdonHouse2_Blocks:: +INCBIN "maps/BirdonHouse2.blk" diff --git a/data/maps/objects/BaadonLeague1F.asm b/data/maps/objects/BirdonLeague1F.asm similarity index 65% rename from data/maps/objects/BaadonLeague1F.asm rename to data/maps/objects/BirdonLeague1F.asm index 0c6ce9ac..821ee520 100644 --- a/data/maps/objects/BaadonLeague1F.asm +++ b/data/maps/objects/BirdonLeague1F.asm @@ -1,16 +1,16 @@ INCLUDE "constants.asm" -SECTION "data/maps/objects/BaadonLeague1F.asm", ROMX +SECTION "data/maps/objects/BirdonLeague1F.asm", ROMX - map_attributes BaadonLeague1F, BAADON_LEAGUE_1F, 0 + map_attributes BirdonLeague1F, BIRDON_LEAGUE_1F, 0 -BaadonLeague1F_MapEvents:: +BirdonLeague1F_MapEvents:: dw $4000 ; unknown def_warp_events - warp_event 3, 15, BAADON, 6, 82 - warp_event 4, 15, BAADON, 7, 83 - warp_event 7, 1, BAADON_LEAGUE_2F, 1, 14 + warp_event 3, 15, BIRDON, 6, 82 + warp_event 4, 15, BIRDON, 7, 83 + warp_event 7, 1, BIRDON_LEAGUE_2F, 1, 14 def_bg_events @@ -21,5 +21,5 @@ BaadonLeague1F_MapEvents:: object_event 3, 1, SPRITE_COOLTRAINER_M, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 6, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEFN_RANDOM_WALK_Y, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 -BaadonLeague1F_Blocks:: -INCBIN "maps/BaadonLeague1F.blk" +BirdonLeague1F_Blocks:: +INCBIN "maps/BirdonLeague1F.blk" diff --git a/data/maps/objects/BaadonLeague2F.asm b/data/maps/objects/BirdonLeague2F.asm similarity index 71% rename from data/maps/objects/BaadonLeague2F.asm rename to data/maps/objects/BirdonLeague2F.asm index 94f4ad34..4d4f9986 100644 --- a/data/maps/objects/BaadonLeague2F.asm +++ b/data/maps/objects/BirdonLeague2F.asm @@ -1,14 +1,14 @@ INCLUDE "constants.asm" -SECTION "data/maps/objects/BaadonLeague2F.asm", ROMX +SECTION "data/maps/objects/BirdonLeague2F.asm", ROMX - map_attributes BaadonLeague2F, BAADON_LEAGUE_2F, 0 + map_attributes BirdonLeague2F, BIRDON_LEAGUE_2F, 0 -BaadonLeague2F_MapEvents:: +BirdonLeague2F_MapEvents:: dw $4000 ; unknown def_warp_events - warp_event 7, 15, BAADON_LEAGUE_1F, 3, 92 + warp_event 7, 15, BIRDON_LEAGUE_1F, 3, 92 def_bg_events @@ -19,5 +19,5 @@ BaadonLeague2F_MapEvents:: object_event 9, 9, SPRITE_COOLTRAINER_M, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 2, 11, SPRITE_COOLTRAINER_F, SPRITEMOVEFN_TURN_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -BaadonLeague2F_Blocks:: -INCBIN "maps/BaadonLeague2F.blk" +BirdonLeague2F_Blocks:: +INCBIN "maps/BirdonLeague2F.blk" diff --git a/data/maps/objects/BaadonMart.asm b/data/maps/objects/BirdonMart.asm similarity index 62% rename from data/maps/objects/BaadonMart.asm rename to data/maps/objects/BirdonMart.asm index 26f24e27..d67374e1 100644 --- a/data/maps/objects/BaadonMart.asm +++ b/data/maps/objects/BirdonMart.asm @@ -1,15 +1,15 @@ INCLUDE "constants.asm" -SECTION "data/maps/objects/BaadonMart.asm", ROMX +SECTION "data/maps/objects/BirdonMart.asm", ROMX - map_attributes BaadonMart, BAADON_MART, 0 + map_attributes BirdonMart, BIRDON_MART, 0 -BaadonMart_MapEvents:: +BirdonMart_MapEvents:: dw $4000 ; unknown def_warp_events - warp_event 4, 7, BAADON, 1, 59 - warp_event 5, 7, BAADON, 1, 59 + warp_event 4, 7, BIRDON, 1, 59 + warp_event 5, 7, BIRDON, 1, 59 def_bg_events @@ -18,5 +18,5 @@ BaadonMart_MapEvents:: object_event 10, 5, SPRITE_YOUNGSTER, SPRITEMOVEFN_RANDOM_WALK_X, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 4, 1, SPRITE_TEACHER, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -BaadonMart_Blocks:: -INCBIN "maps/BaadonMart.blk" +BirdonMart_Blocks:: +INCBIN "maps/BirdonMart.blk" diff --git a/data/maps/objects/BaadonPokecenter1F.asm b/data/maps/objects/BirdonPokecenter1F.asm similarity index 54% rename from data/maps/objects/BaadonPokecenter1F.asm rename to data/maps/objects/BirdonPokecenter1F.asm index bf53c4e4..37422e98 100644 --- a/data/maps/objects/BaadonPokecenter1F.asm +++ b/data/maps/objects/BirdonPokecenter1F.asm @@ -1,16 +1,16 @@ INCLUDE "constants.asm" -SECTION "data/maps/objects/BaadonPokecenter1F.asm", ROMX +SECTION "data/maps/objects/BirdonPokecenter1F.asm", ROMX - map_attributes BaadonPokecenter1F, BAADON_POKECENTER_1F, 0 + map_attributes BirdonPokecenter1F, BIRDON_POKECENTER_1F, 0 -BaadonPokecenter1F_MapEvents:: +BirdonPokecenter1F_MapEvents:: dw $4000 ; unknown def_warp_events - warp_event 5, 7, BAADON, 2, 59 - warp_event 6, 7, BAADON, 2, 60 - warp_event 0, 7, BAADON_POKECENTER_2F, 1, 57 + warp_event 5, 7, BIRDON, 2, 59 + warp_event 6, 7, BIRDON, 2, 60 + warp_event 0, 7, BIRDON_POKECENTER_2F, 1, 57 def_bg_events @@ -19,5 +19,5 @@ BaadonPokecenter1F_MapEvents:: object_event 2, 5, SPRITE_GENTLEMAN, SPRITEMOVEFN_RANDOM_WALK_Y, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 object_event 10, 1, SPRITE_POKEFAN_M, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -BaadonPokecenter1F_Blocks:: -INCBIN "maps/BaadonPokecenter1F.blk" +BirdonPokecenter1F_Blocks:: +INCBIN "maps/BirdonPokecenter1F.blk" diff --git a/data/maps/objects/BaadonPokecenter2F.asm b/data/maps/objects/BirdonPokecenter2F.asm similarity index 60% rename from data/maps/objects/BaadonPokecenter2F.asm rename to data/maps/objects/BirdonPokecenter2F.asm index 329cbe25..945dae59 100644 --- a/data/maps/objects/BaadonPokecenter2F.asm +++ b/data/maps/objects/BirdonPokecenter2F.asm @@ -1,14 +1,14 @@ INCLUDE "constants.asm" -SECTION "data/maps/objects/BaadonPokecenter2F.asm", ROMX +SECTION "data/maps/objects/BirdonPokecenter2F.asm", ROMX - map_attributes BaadonPokecenter2F, BAADON_POKECENTER_2F, 0 + map_attributes BirdonPokecenter2F, BIRDON_POKECENTER_2F, 0 -BaadonPokecenter2F_MapEvents:: +BirdonPokecenter2F_MapEvents:: dw $4000 ; unknown def_warp_events - warp_event 0, 7, BAADON_POKECENTER_1F, 3, 57 + warp_event 0, 7, BIRDON_POKECENTER_1F, 3, 57 def_bg_events @@ -17,5 +17,5 @@ BaadonPokecenter2F_MapEvents:: object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 14, 7, SPRITE_FISHING_GURU, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -BaadonPokecenter2F_Blocks:: -INCBIN "maps/BaadonPokecenter2F.blk" +BirdonPokecenter2F_Blocks:: +INCBIN "maps/BirdonPokecenter2F.blk" diff --git a/data/maps/objects/BirdonRoute1.asm b/data/maps/objects/BirdonRoute1.asm new file mode 100644 index 00000000..7c444151 --- /dev/null +++ b/data/maps/objects/BirdonRoute1.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/BirdonRoute1.asm", ROMX + + map_attributes BirdonRoute1, BIRDON_ROUTE_1, NORTH | SOUTH + connection north, Birdon, BIRDON, 0 + connection south, West, WEST, -5 + +BirdonRoute1_MapEvents:: + dw $4000 ; unknown + + def_warp_events + warp_event 12, 48, BIRDON_ROUTE_GATE_WEST, 3, 407 + warp_event 13, 48, BIRDON_ROUTE_GATE_WEST, 4, 407 + + def_bg_events + + def_object_events + +BirdonRoute1_Blocks:: +INCBIN "maps/BirdonRoute1.blk" diff --git a/data/maps/objects/BirdonRoute2.asm b/data/maps/objects/BirdonRoute2.asm new file mode 100644 index 00000000..9aa8146b --- /dev/null +++ b/data/maps/objects/BirdonRoute2.asm @@ -0,0 +1,19 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/BirdonRoute2.asm", ROMX + + map_attributes BirdonRoute2, BIRDON_ROUTE_2, WEST | EAST + connection west, Birdon, BIRDON, 0 + connection east, BirdonRoute3, BIRDON_ROUTE_3, 0 + +BirdonRoute2_MapEvents:: + dw $4000 ; unknown + + def_warp_events + + def_bg_events + + def_object_events + +BirdonRoute2_Blocks:: +INCBIN "maps/BirdonRoute2.blk" diff --git a/data/maps/objects/BirdonRoute3.asm b/data/maps/objects/BirdonRoute3.asm new file mode 100644 index 00000000..2d5763ba --- /dev/null +++ b/data/maps/objects/BirdonRoute3.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/BirdonRoute3.asm", ROMX + + map_attributes BirdonRoute3, BIRDON_ROUTE_3, SOUTH | WEST + connection south, Route15, ROUTE_15, 0 + connection west, BirdonRoute2, BIRDON_ROUTE_2, 0 + +BirdonRoute3_MapEvents:: + dw $4000 ; unknown + + def_warp_events + warp_event 8, 30, BIRDON_ROUTE_GATE_NEWTYPE, 3, 261 + warp_event 9, 30, BIRDON_ROUTE_GATE_NEWTYPE, 4, 261 + + def_bg_events + + def_object_events + +BirdonRoute3_Blocks:: +INCBIN "maps/BirdonRoute3.blk" diff --git a/data/maps/objects/BirdonRouteGateNewtype.asm b/data/maps/objects/BirdonRouteGateNewtype.asm new file mode 100644 index 00000000..1ff85bb3 --- /dev/null +++ b/data/maps/objects/BirdonRouteGateNewtype.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/BirdonRouteGateNewtype.asm", ROMX + + map_attributes BirdonRouteGateNewtype, BIRDON_ROUTE_GATE_NEWTYPE, 0 + +BirdonRouteGateNewtype_MapEvents:: + dw $4000 ; unknown + + def_warp_events + warp_event 4, 7, ROUTE_15, 1, 47 + warp_event 5, 7, ROUTE_15, 2, 47 + warp_event 4, 0, BIRDON_ROUTE_3, 1, 14 + warp_event 5, 0, BIRDON_ROUTE_3, 2, 14 + + def_bg_events + + def_object_events + +BirdonRouteGateNewtype_Blocks:: +INCBIN "maps/BirdonRouteGateNewtype.blk" diff --git a/data/maps/objects/BirdonRouteGateWest.asm b/data/maps/objects/BirdonRouteGateWest.asm new file mode 100644 index 00000000..0a1e137e --- /dev/null +++ b/data/maps/objects/BirdonRouteGateWest.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/BirdonRouteGateWest.asm", ROMX + + map_attributes BirdonRouteGateWest, BIRDON_ROUTE_GATE_WEST, 0 + +BirdonRouteGateWest_MapEvents:: + dw $4000 ; unknown + + def_warp_events + warp_event 4, 7, WEST, 11, 47 + warp_event 5, 7, WEST, 12, 47 + warp_event 4, 0, BIRDON_ROUTE_1, 1, 14 + warp_event 5, 0, BIRDON_ROUTE_1, 2, 14 + + def_bg_events + + def_object_events + +BirdonRouteGateWest_Blocks:: +INCBIN "maps/BirdonRouteGateWest.blk" diff --git a/data/maps/objects/BirdonWallpaperHouse.asm b/data/maps/objects/BirdonWallpaperHouse.asm new file mode 100644 index 00000000..c33c3e41 --- /dev/null +++ b/data/maps/objects/BirdonWallpaperHouse.asm @@ -0,0 +1,19 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/BirdonWallpaperHouse.asm", ROMX + + map_attributes BirdonWallpaperHouse, BIRDON_WALLPAPER_HOUSE, 0 + +BirdonWallpaperHouse_MapEvents:: + dw $4000 ; unknown + + def_warp_events + warp_event 2, 7, BIRDON, 4, 42 + warp_event 3, 7, BIRDON, 4, 42 + + def_bg_events + + def_object_events + +BirdonWallpaperHouse_Blocks:: +INCBIN "maps/BirdonWallpaperHouse.blk" diff --git a/data/maps/objects/BlueForest.asm b/data/maps/objects/BlueForest.asm new file mode 100644 index 00000000..4ba09e83 --- /dev/null +++ b/data/maps/objects/BlueForest.asm @@ -0,0 +1,36 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/BlueForest.asm", ROMX + + map_attributes BlueForest, BLUE_FOREST, NORTH | SOUTH | WEST + connection north, BlueForestRoute3, BLUE_FOREST_ROUTE_3, 5 + connection south, BlueForestRoute2, BLUE_FOREST_ROUTE_2, 5 + connection west, BlueForestRoute1, BLUE_FOREST_ROUTE_1, 9 + +BlueForest_MapEvents:: + dw $4000 ; unknown + + def_warp_events + warp_event 25, 6, BLUE_MART, 1, 117 + warp_event 9, 9, BLUE_HOUSE_1, 1, 135 + warp_event 27, 11, BLUE_HOUSE_2, 1, 170 + warp_event 19, 13, BLUE_HOUSE_3, 1, 192 + warp_event 13, 18, BLUE_POKECENTER_1F, 1, 267 + warp_event 26, 21, BLUE_LEAGUE_1F, 1, 300 + warp_event 27, 21, BLUE_LEAGUE_1F, 2, 300 + warp_event 3, 22, BLUE_HOUSE_4, 1, 314 + + def_bg_events + bg_event 26, 6, 1 + bg_event 2, 16, 2 + bg_event 14, 18, 3 + + def_object_events + object_event 21, 9, SPRITE_TWIN, SPRITEMOVEFN_RANDOM_WALK_X, 3, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 11, 12, SPRITE_YOUNGSTER, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 7, 16, SPRITE_GRANNY, SPRITEMOVEFN_RANDOM_WALK_X, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 20, 19, SPRITE_TEACHER, SPRITEMOVEFN_RANDOM_WALK_XY, 2, 2, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 20, 29, SPRITE_BUG_CATCHER_BOY, SPRITEMOVEFN_RANDOM_WALK_Y, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 + +BlueForest_Blocks:: +INCBIN "maps/BlueForest.blk" diff --git a/data/maps/objects/BlueForestRoute1.asm b/data/maps/objects/BlueForestRoute1.asm new file mode 100644 index 00000000..246a6dbb --- /dev/null +++ b/data/maps/objects/BlueForestRoute1.asm @@ -0,0 +1,22 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/BlueForestRoute1.asm", ROMX + + map_attributes BlueForestRoute1, BLUE_FOREST_ROUTE_1, SOUTH | EAST + connection south, Route18, ROUTE_18, 0 + connection east, BlueForest, BLUE_FOREST, -9 + +BlueForestRoute1_MapEvents:: + dw $4000 ; unknown + + def_warp_events + warp_event 8, 12, NEWTYPE_ROUTE_GATE, 3, 222 + warp_event 9, 12, NEWTYPE_ROUTE_GATE, 4, 222 + warp_event 9, 5, BLUE_FOREST_ROUTE_1_HOUSE, 1, 98 + + def_bg_events + + def_object_events + +BlueForestRoute1_Blocks:: +INCBIN "maps/BlueForestRoute1.blk" diff --git a/data/maps/objects/BlueForestRoute1House.asm b/data/maps/objects/BlueForestRoute1House.asm new file mode 100644 index 00000000..25991456 --- /dev/null +++ b/data/maps/objects/BlueForestRoute1House.asm @@ -0,0 +1,20 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/BlueForestRoute1House.asm", ROMX + + map_attributes BlueForestRoute1House, BLUE_FOREST_ROUTE_1_HOUSE, 0 + +BlueForestRoute1House_MapEvents:: + dw $4000 ; unknown + + def_warp_events + warp_event 4, 7, BLUE_FOREST_ROUTE_1, 3, 47 + warp_event 5, 7, BLUE_FOREST_ROUTE_1, 3, 47 + + def_bg_events + + def_object_events + object_event 1, 5, SPRITE_COOLTRAINER_F, SPRITEMOVEFN_RANDOM_WALK_X, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +BlueForestRoute1House_Blocks:: +INCBIN "maps/BlueForestRoute1House.blk" diff --git a/data/maps/objects/BlueForestRoute2.asm b/data/maps/objects/BlueForestRoute2.asm new file mode 100644 index 00000000..3d02e7e9 --- /dev/null +++ b/data/maps/objects/BlueForestRoute2.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/BlueForestRoute2.asm", ROMX + + map_attributes BlueForestRoute2, BLUE_FOREST_ROUTE_2, NORTH | SOUTH + connection north, BlueForest, BLUE_FOREST, -5 + connection south, Stand, STAND, -10 + +BlueForestRoute2_MapEvents:: + dw $4000 ; unknown + + def_warp_events + warp_event 8, 48, BLUE_FOREST_ROUTE_GATE_STAND, 3, 405 + warp_event 9, 48, BLUE_FOREST_ROUTE_GATE_STAND, 4, 405 + + def_bg_events + + def_object_events + +BlueForestRoute2_Blocks:: +INCBIN "maps/BlueForestRoute2.blk" diff --git a/data/maps/objects/BlueForestRoute3.asm b/data/maps/objects/BlueForestRoute3.asm new file mode 100644 index 00000000..243ea522 --- /dev/null +++ b/data/maps/objects/BlueForestRoute3.asm @@ -0,0 +1,19 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/BlueForestRoute3.asm", ROMX + + map_attributes BlueForestRoute3, BLUE_FOREST_ROUTE_3, NORTH | SOUTH + connection north, North, NORTH, 0 + connection south, BlueForest, BLUE_FOREST, -5 + +BlueForestRoute3_MapEvents:: + dw $4000 ; unknown + + def_warp_events + + def_bg_events + + def_object_events + +BlueForestRoute3_Blocks:: +INCBIN "maps/BlueForestRoute3.blk" diff --git a/data/maps/objects/BlueForestRouteGateStand.asm b/data/maps/objects/BlueForestRouteGateStand.asm new file mode 100644 index 00000000..d8847a8c --- /dev/null +++ b/data/maps/objects/BlueForestRouteGateStand.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/BlueForestRouteGateStand.asm", ROMX + + map_attributes BlueForestRouteGateStand, BLUE_FOREST_ROUTE_GATE_STAND, 0 + +BlueForestRouteGateStand_MapEvents:: + dw $4000 ; unknown + + def_warp_events + warp_event 4, 7, STAND, 9, 47 + warp_event 5, 7, STAND, 10, 47 + warp_event 4, 0, BLUE_FOREST_ROUTE_2, 1, 14 + warp_event 5, 0, BLUE_FOREST_ROUTE_2, 2, 14 + + def_bg_events + + def_object_events + +BlueForestRouteGateStand_Blocks:: +INCBIN "maps/BlueForestRouteGateStand.blk" diff --git a/data/maps/objects/BlueHouse1.asm b/data/maps/objects/BlueHouse1.asm new file mode 100644 index 00000000..041b4446 --- /dev/null +++ b/data/maps/objects/BlueHouse1.asm @@ -0,0 +1,20 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/BlueHouse1.asm", ROMX + + map_attributes BlueHouse1, BLUE_HOUSE_1, 0 + +BlueHouse1_MapEvents:: + dw $4000 ; unknown + + def_warp_events + warp_event 3, 7, BLUE_FOREST, 2, 42 + warp_event 4, 7, BLUE_FOREST, 2, 43 + + def_bg_events + + def_object_events + object_event 2, 3, SPRITE_KIKUKO, SPRITEMOVEFN_TURN_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +BlueHouse1_Blocks:: +INCBIN "maps/BlueHouse1.blk" diff --git a/data/maps/objects/BlueHouse2.asm b/data/maps/objects/BlueHouse2.asm new file mode 100644 index 00000000..f1fdbb7b --- /dev/null +++ b/data/maps/objects/BlueHouse2.asm @@ -0,0 +1,20 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/BlueHouse2.asm", ROMX + + map_attributes BlueHouse2, BLUE_HOUSE_2, 0 + +BlueHouse2_MapEvents:: + dw $4000 ; unknown + + def_warp_events + warp_event 4, 7, BLUE_FOREST, 3, 47 + warp_event 5, 7, BLUE_FOREST, 3, 47 + + def_bg_events + + def_object_events + object_event 8, 4, SPRITE_GRANNY, SPRITEMOVEFN_RANDOM_WALK_Y, 0, 1, -1, -1, 0, 0, 0, 0, 0, 0 + +BlueHouse2_Blocks:: +INCBIN "maps/BlueHouse2.blk" diff --git a/data/maps/objects/BlueHouse3.asm b/data/maps/objects/BlueHouse3.asm new file mode 100644 index 00000000..e2e7535b --- /dev/null +++ b/data/maps/objects/BlueHouse3.asm @@ -0,0 +1,20 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/BlueHouse3.asm", ROMX + + map_attributes BlueHouse3, BLUE_HOUSE_3, 0 + +BlueHouse3_MapEvents:: + dw $4000 ; unknown + + def_warp_events + warp_event 4, 7, BLUE_FOREST, 4, 47 + warp_event 5, 7, BLUE_FOREST, 4, 47 + + def_bg_events + + def_object_events + object_event 4, 3, SPRITE_GRAMPS, SPRITEMOVEFN_TURN_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +BlueHouse3_Blocks:: +INCBIN "maps/BlueHouse3.blk" diff --git a/data/maps/objects/BlueHouse4.asm b/data/maps/objects/BlueHouse4.asm new file mode 100644 index 00000000..2fac3e3b --- /dev/null +++ b/data/maps/objects/BlueHouse4.asm @@ -0,0 +1,19 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/BlueHouse4.asm", ROMX + + map_attributes BlueHouse4, BLUE_HOUSE_4, 0 + +BlueHouse4_MapEvents:: + dw $4000 ; unknown + + def_warp_events + warp_event 4, 7, BLUE_FOREST, 8, 47 + warp_event 5, 7, BLUE_FOREST, 8, 47 + + def_bg_events + + def_object_events + +BlueHouse4_Blocks:: +INCBIN "maps/BlueHouse4.blk" diff --git a/data/maps/objects/BullLeague1F.asm b/data/maps/objects/BlueLeague1F.asm similarity index 66% rename from data/maps/objects/BullLeague1F.asm rename to data/maps/objects/BlueLeague1F.asm index dd475ae6..7ad5e923 100644 --- a/data/maps/objects/BullLeague1F.asm +++ b/data/maps/objects/BlueLeague1F.asm @@ -1,16 +1,16 @@ INCLUDE "constants.asm" -SECTION "data/maps/objects/BullLeague1F.asm", ROMX +SECTION "data/maps/objects/BlueLeague1F.asm", ROMX - map_attributes BullLeague1F, BULL_LEAGUE_1F, 0 + map_attributes BlueLeague1F, BLUE_LEAGUE_1F, 0 -BullLeague1F_MapEvents:: +BlueLeague1F_MapEvents:: dw $4000 ; unknown def_warp_events - warp_event 3, 15, BULL_FOREST, 6, 82 - warp_event 4, 15, BULL_FOREST, 7, 83 - warp_event 7, 1, BULL_LEAGUE_2F, 1, 14 + warp_event 3, 15, BLUE_FOREST, 6, 82 + warp_event 4, 15, BLUE_FOREST, 7, 83 + warp_event 7, 1, BLUE_LEAGUE_2F, 1, 14 def_bg_events @@ -21,5 +21,5 @@ BullLeague1F_MapEvents:: object_event 3, 1, SPRITE_COOLTRAINER_M, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 6, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEFN_RANDOM_WALK_Y, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 -BullLeague1F_Blocks:: -INCBIN "maps/BullLeague1F.blk" +BlueLeague1F_Blocks:: +INCBIN "maps/BlueLeague1F.blk" diff --git a/data/maps/objects/BullLeague2F.asm b/data/maps/objects/BlueLeague2F.asm similarity index 72% rename from data/maps/objects/BullLeague2F.asm rename to data/maps/objects/BlueLeague2F.asm index 92048d94..b23b7537 100644 --- a/data/maps/objects/BullLeague2F.asm +++ b/data/maps/objects/BlueLeague2F.asm @@ -1,14 +1,14 @@ INCLUDE "constants.asm" -SECTION "data/maps/objects/BullLeague2F.asm", ROMX +SECTION "data/maps/objects/BlueLeague2F.asm", ROMX - map_attributes BullLeague2F, BULL_LEAGUE_2F, 0 + map_attributes BlueLeague2F, BLUE_LEAGUE_2F, 0 -BullLeague2F_MapEvents:: +BlueLeague2F_MapEvents:: dw $4000 ; unknown def_warp_events - warp_event 7, 15, BULL_LEAGUE_1F, 3, 92 + warp_event 7, 15, BLUE_LEAGUE_1F, 3, 92 def_bg_events @@ -19,5 +19,5 @@ BullLeague2F_MapEvents:: object_event 2, 11, SPRITE_COOLTRAINER_F, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 7, 11, SPRITE_COOLTRAINER_F, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -BullLeague2F_Blocks:: -INCBIN "maps/BullLeague2F.blk" +BlueLeague2F_Blocks:: +INCBIN "maps/BlueLeague2F.blk" diff --git a/data/maps/objects/BullMart.asm b/data/maps/objects/BlueMart.asm similarity index 62% rename from data/maps/objects/BullMart.asm rename to data/maps/objects/BlueMart.asm index 85c3d017..d2298591 100644 --- a/data/maps/objects/BullMart.asm +++ b/data/maps/objects/BlueMart.asm @@ -1,15 +1,15 @@ INCLUDE "constants.asm" -SECTION "data/maps/objects/BullMart.asm", ROMX +SECTION "data/maps/objects/BlueMart.asm", ROMX - map_attributes BullMart, BULL_MART, 0 + map_attributes BlueMart, BLUE_MART, 0 -BullMart_MapEvents:: +BlueMart_MapEvents:: dw $4000 ; unknown def_warp_events - warp_event 4, 7, BULL_FOREST, 1, 59 - warp_event 5, 7, BULL_FOREST, 1, 59 + warp_event 4, 7, BLUE_FOREST, 1, 59 + warp_event 5, 7, BLUE_FOREST, 1, 59 def_bg_events @@ -18,5 +18,5 @@ BullMart_MapEvents:: object_event 10, 5, SPRITE_FISHER, SPRITEMOVEFN_RANDOM_WALK_X, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 4, 1, SPRITE_YOUNGSTER, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -BullMart_Blocks:: -INCBIN "maps/BullMart.blk" +BlueMart_Blocks:: +INCBIN "maps/BlueMart.blk" diff --git a/data/maps/objects/BullPokecenter1F.asm b/data/maps/objects/BluePokecenter1F.asm similarity index 59% rename from data/maps/objects/BullPokecenter1F.asm rename to data/maps/objects/BluePokecenter1F.asm index 5af014e7..049a018e 100644 --- a/data/maps/objects/BullPokecenter1F.asm +++ b/data/maps/objects/BluePokecenter1F.asm @@ -1,16 +1,16 @@ INCLUDE "constants.asm" -SECTION "data/maps/objects/BullPokecenter1F.asm", ROMX +SECTION "data/maps/objects/BluePokecenter1F.asm", ROMX - map_attributes BullPokecenter1F, BULL_POKECENTER_1F, 0 + map_attributes BluePokecenter1F, BLUE_POKECENTER_1F, 0 -BullPokecenter1F_MapEvents:: +BluePokecenter1F_MapEvents:: dw $4000 ; unknown def_warp_events - warp_event 5, 7, BULL_FOREST, 5, 59 - warp_event 6, 7, BULL_FOREST, 5, 60 - warp_event 0, 7, BULL_POKECENTER_2F, 1, 57 + warp_event 5, 7, BLUE_FOREST, 5, 59 + warp_event 6, 7, BLUE_FOREST, 5, 60 + warp_event 0, 7, BLUE_POKECENTER_2F, 1, 57 def_bg_events @@ -20,5 +20,5 @@ BullPokecenter1F_MapEvents:: object_event 2, 5, SPRITE_COOLTRAINER_M, SPRITEMOVEFN_RANDOM_WALK_Y, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 object_event 10, 1, SPRITE_GRANNY, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -BullPokecenter1F_Blocks:: -INCBIN "maps/BullPokecenter1F.blk" +BluePokecenter1F_Blocks:: +INCBIN "maps/BluePokecenter1F.blk" diff --git a/data/maps/objects/BullPokecenter2F.asm b/data/maps/objects/BluePokecenter2F.asm similarity index 62% rename from data/maps/objects/BullPokecenter2F.asm rename to data/maps/objects/BluePokecenter2F.asm index 0aecfab5..30149df3 100644 --- a/data/maps/objects/BullPokecenter2F.asm +++ b/data/maps/objects/BluePokecenter2F.asm @@ -1,14 +1,14 @@ INCLUDE "constants.asm" -SECTION "data/maps/objects/BullPokecenter2F.asm", ROMX +SECTION "data/maps/objects/BluePokecenter2F.asm", ROMX - map_attributes BullPokecenter2F, BULL_POKECENTER_2F, 0 + map_attributes BluePokecenter2F, BLUE_POKECENTER_2F, 0 -BullPokecenter2F_MapEvents:: +BluePokecenter2F_MapEvents:: dw $4000 ; unknown def_warp_events - warp_event 0, 7, BULL_POKECENTER_1F, 3, 57 + warp_event 0, 7, BLUE_POKECENTER_1F, 3, 57 def_bg_events @@ -17,5 +17,5 @@ BullPokecenter2F_MapEvents:: object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 14, 7, SPRITE_FISHING_GURU, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -BullPokecenter2F_Blocks:: -INCBIN "maps/BullPokecenter2F.blk" +BluePokecenter2F_Blocks:: +INCBIN "maps/BluePokecenter2F.blk" diff --git a/data/maps/objects/BullForest.asm b/data/maps/objects/BullForest.asm deleted file mode 100644 index 7890c50f..00000000 --- a/data/maps/objects/BullForest.asm +++ /dev/null @@ -1,36 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/objects/BullForest.asm", ROMX - - map_attributes BullForest, BULL_FOREST, NORTH | SOUTH | WEST - connection north, BullForestRoute3, BULL_FOREST_ROUTE_3, 5 - connection south, BullForestRoute2, BULL_FOREST_ROUTE_2, 5 - connection west, BullForestRoute1, BULL_FOREST_ROUTE_1, 9 - -BullForest_MapEvents:: - dw $4000 ; unknown - - def_warp_events - warp_event 25, 6, BULL_MART, 1, 117 - warp_event 9, 9, BULL_HOUSE_1, 1, 135 - warp_event 27, 11, BULL_HOUSE_2, 1, 170 - warp_event 19, 13, BULL_HOUSE_3, 1, 192 - warp_event 13, 18, BULL_POKECENTER_1F, 1, 267 - warp_event 26, 21, BULL_LEAGUE_1F, 1, 300 - warp_event 27, 21, BULL_LEAGUE_1F, 2, 300 - warp_event 3, 22, BULL_HOUSE_4, 1, 314 - - def_bg_events - bg_event 26, 6, 1 - bg_event 2, 16, 2 - bg_event 14, 18, 3 - - def_object_events - object_event 21, 9, SPRITE_TWIN, SPRITEMOVEFN_RANDOM_WALK_X, 3, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 11, 12, SPRITE_YOUNGSTER, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 7, 16, SPRITE_GRANNY, SPRITEMOVEFN_RANDOM_WALK_X, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 20, 19, SPRITE_TEACHER, SPRITEMOVEFN_RANDOM_WALK_XY, 2, 2, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 20, 29, SPRITE_BUG_CATCHER_BOY, SPRITEMOVEFN_RANDOM_WALK_Y, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 - -BullForest_Blocks:: -INCBIN "maps/BullForest.blk" diff --git a/data/maps/objects/BullForestRoute1.asm b/data/maps/objects/BullForestRoute1.asm deleted file mode 100644 index f837fdf7..00000000 --- a/data/maps/objects/BullForestRoute1.asm +++ /dev/null @@ -1,22 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/objects/BullForestRoute1.asm", ROMX - - map_attributes BullForestRoute1, BULL_FOREST_ROUTE_1, SOUTH | EAST - connection south, Route18, ROUTE_18, 0 - connection east, BullForest, BULL_FOREST, -9 - -BullForestRoute1_MapEvents:: - dw $4000 ; unknown - - def_warp_events - warp_event 8, 12, NEWTYPE_ROUTE_GATE, 3, 222 - warp_event 9, 12, NEWTYPE_ROUTE_GATE, 4, 222 - warp_event 9, 5, BULL_FOREST_ROUTE_1_HOUSE, 1, 98 - - def_bg_events - - def_object_events - -BullForestRoute1_Blocks:: -INCBIN "maps/BullForestRoute1.blk" diff --git a/data/maps/objects/BullForestRoute1House.asm b/data/maps/objects/BullForestRoute1House.asm deleted file mode 100644 index 89ec35b3..00000000 --- a/data/maps/objects/BullForestRoute1House.asm +++ /dev/null @@ -1,20 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/objects/BullForestRoute1House.asm", ROMX - - map_attributes BullForestRoute1House, BULL_FOREST_ROUTE_1_HOUSE, 0 - -BullForestRoute1House_MapEvents:: - dw $4000 ; unknown - - def_warp_events - warp_event 4, 7, BULL_FOREST_ROUTE_1, 3, 47 - warp_event 5, 7, BULL_FOREST_ROUTE_1, 3, 47 - - def_bg_events - - def_object_events - object_event 1, 5, SPRITE_COOLTRAINER_F, SPRITEMOVEFN_RANDOM_WALK_X, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -BullForestRoute1House_Blocks:: -INCBIN "maps/BullForestRoute1House.blk" diff --git a/data/maps/objects/BullForestRoute2.asm b/data/maps/objects/BullForestRoute2.asm deleted file mode 100644 index d1322a18..00000000 --- a/data/maps/objects/BullForestRoute2.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/objects/BullForestRoute2.asm", ROMX - - map_attributes BullForestRoute2, BULL_FOREST_ROUTE_2, NORTH | SOUTH - connection north, BullForest, BULL_FOREST, -5 - connection south, Stand, STAND, -10 - -BullForestRoute2_MapEvents:: - dw $4000 ; unknown - - def_warp_events - warp_event 8, 48, BULL_FOREST_ROUTE_GATE_STAND, 3, 405 - warp_event 9, 48, BULL_FOREST_ROUTE_GATE_STAND, 4, 405 - - def_bg_events - - def_object_events - -BullForestRoute2_Blocks:: -INCBIN "maps/BullForestRoute2.blk" diff --git a/data/maps/objects/BullForestRoute3.asm b/data/maps/objects/BullForestRoute3.asm deleted file mode 100644 index b53b0888..00000000 --- a/data/maps/objects/BullForestRoute3.asm +++ /dev/null @@ -1,19 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/objects/BullForestRoute3.asm", ROMX - - map_attributes BullForestRoute3, BULL_FOREST_ROUTE_3, NORTH | SOUTH - connection north, North, NORTH, 0 - connection south, BullForest, BULL_FOREST, -5 - -BullForestRoute3_MapEvents:: - dw $4000 ; unknown - - def_warp_events - - def_bg_events - - def_object_events - -BullForestRoute3_Blocks:: -INCBIN "maps/BullForestRoute3.blk" diff --git a/data/maps/objects/BullForestRouteGateStand.asm b/data/maps/objects/BullForestRouteGateStand.asm deleted file mode 100644 index 49609d8d..00000000 --- a/data/maps/objects/BullForestRouteGateStand.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/objects/BullForestRouteGateStand.asm", ROMX - - map_attributes BullForestRouteGateStand, BULL_FOREST_ROUTE_GATE_STAND, 0 - -BullForestRouteGateStand_MapEvents:: - dw $4000 ; unknown - - def_warp_events - warp_event 4, 7, STAND, 9, 47 - warp_event 5, 7, STAND, 10, 47 - warp_event 4, 0, BULL_FOREST_ROUTE_2, 1, 14 - warp_event 5, 0, BULL_FOREST_ROUTE_2, 2, 14 - - def_bg_events - - def_object_events - -BullForestRouteGateStand_Blocks:: -INCBIN "maps/BullForestRouteGateStand.blk" diff --git a/data/maps/objects/BullHouse1.asm b/data/maps/objects/BullHouse1.asm deleted file mode 100644 index 29956aeb..00000000 --- a/data/maps/objects/BullHouse1.asm +++ /dev/null @@ -1,20 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/objects/BullHouse1.asm", ROMX - - map_attributes BullHouse1, BULL_HOUSE_1, 0 - -BullHouse1_MapEvents:: - dw $4000 ; unknown - - def_warp_events - warp_event 3, 7, BULL_FOREST, 2, 42 - warp_event 4, 7, BULL_FOREST, 2, 43 - - def_bg_events - - def_object_events - object_event 2, 3, SPRITE_KIKUKO, SPRITEMOVEFN_TURN_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -BullHouse1_Blocks:: -INCBIN "maps/BullHouse1.blk" diff --git a/data/maps/objects/BullHouse2.asm b/data/maps/objects/BullHouse2.asm deleted file mode 100644 index ec3a78a2..00000000 --- a/data/maps/objects/BullHouse2.asm +++ /dev/null @@ -1,20 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/objects/BullHouse2.asm", ROMX - - map_attributes BullHouse2, BULL_HOUSE_2, 0 - -BullHouse2_MapEvents:: - dw $4000 ; unknown - - def_warp_events - warp_event 4, 7, BULL_FOREST, 3, 47 - warp_event 5, 7, BULL_FOREST, 3, 47 - - def_bg_events - - def_object_events - object_event 8, 4, SPRITE_GRANNY, SPRITEMOVEFN_RANDOM_WALK_Y, 0, 1, -1, -1, 0, 0, 0, 0, 0, 0 - -BullHouse2_Blocks:: -INCBIN "maps/BullHouse2.blk" diff --git a/data/maps/objects/BullHouse3.asm b/data/maps/objects/BullHouse3.asm deleted file mode 100644 index 59655e87..00000000 --- a/data/maps/objects/BullHouse3.asm +++ /dev/null @@ -1,20 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/objects/BullHouse3.asm", ROMX - - map_attributes BullHouse3, BULL_HOUSE_3, 0 - -BullHouse3_MapEvents:: - dw $4000 ; unknown - - def_warp_events - warp_event 4, 7, BULL_FOREST, 4, 47 - warp_event 5, 7, BULL_FOREST, 4, 47 - - def_bg_events - - def_object_events - object_event 4, 3, SPRITE_GRAMPS, SPRITEMOVEFN_TURN_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -BullHouse3_Blocks:: -INCBIN "maps/BullHouse3.blk" diff --git a/data/maps/objects/BullHouse4.asm b/data/maps/objects/BullHouse4.asm deleted file mode 100644 index 3b602c3b..00000000 --- a/data/maps/objects/BullHouse4.asm +++ /dev/null @@ -1,19 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/objects/BullHouse4.asm", ROMX - - map_attributes BullHouse4, BULL_HOUSE_4, 0 - -BullHouse4_MapEvents:: - dw $4000 ; unknown - - def_warp_events - warp_event 4, 7, BULL_FOREST, 8, 47 - warp_event 5, 7, BULL_FOREST, 8, 47 - - def_bg_events - - def_object_events - -BullHouse4_Blocks:: -INCBIN "maps/BullHouse4.blk" diff --git a/data/maps/objects/Fonto.asm b/data/maps/objects/Font.asm similarity index 53% rename from data/maps/objects/Fonto.asm rename to data/maps/objects/Font.asm index 63095a61..597e9fcc 100644 --- a/data/maps/objects/Fonto.asm +++ b/data/maps/objects/Font.asm @@ -1,21 +1,21 @@ INCLUDE "constants.asm" -SECTION "data/maps/objects/Fonto.asm", ROMX +SECTION "data/maps/objects/Font.asm", ROMX - map_attributes Fonto, FONTO, NORTH | WEST | EAST - connection north, FontoRoute2, FONTO_ROUTE_2, 0 - connection west, FontoRoute1, FONTO_ROUTE_1, 0 - connection east, FontoRoute3, FONTO_ROUTE_3, 0 + map_attributes Font, FONT, NORTH | WEST | EAST + connection north, FontRoute2, FONT_ROUTE_2, 0 + connection west, FontRoute1, FONT_ROUTE_1, 0 + connection east, FontRoute3, FONT_ROUTE_3, 0 -Fonto_MapEvents:: +Font_MapEvents:: dw $4000 ; unknown def_warp_events - warp_event 4, 3, FONTO_ROCKET_HOUSE, 1, 35 - warp_event 15, 4, FONTO_MART, 1, 56 - warp_event 3, 7, FONTO_HOUSE, 1, 66 - warp_event 3, 12, FONTO_POKECENTER_1F, 1, 114 - warp_event 16, 13, FONTO_LAB, 1, 121 + warp_event 4, 3, FONT_ROCKET_HOUSE, 1, 35 + warp_event 15, 4, FONT_MART, 1, 56 + warp_event 3, 7, FONT_HOUSE, 1, 66 + warp_event 3, 12, FONT_POKECENTER_1F, 1, 114 + warp_event 16, 13, FONT_LAB, 1, 121 def_bg_events bg_event 15, 4, 1 @@ -30,5 +30,5 @@ Fonto_MapEvents:: object_event 5, 14, SPRITE_YOUNGSTER, SPRITEMOVEFN_RANDOM_WALK_X, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 16, 8, SPRITE_TWIN, SPRITEMOVEFN_RANDOM_WALK_XY, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0 -Fonto_Blocks:: -INCBIN "maps/Fonto.blk" +Font_Blocks:: +INCBIN "maps/Font.blk" diff --git a/data/maps/objects/FontHouse.asm b/data/maps/objects/FontHouse.asm new file mode 100644 index 00000000..e34ee8e5 --- /dev/null +++ b/data/maps/objects/FontHouse.asm @@ -0,0 +1,20 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/FontHouse.asm", ROMX + + map_attributes FontHouse, FONT_HOUSE, 0 + +FontHouse_MapEvents:: + dw $4000 ; unknown + + def_warp_events + warp_event 4, 7, FONT, 3, 47 + warp_event 5, 7, FONT, 3, 47 + + def_bg_events + + def_object_events + object_event 8, 4, SPRITE_GENTLEMAN, SPRITEMOVEFN_RANDOM_WALK_Y, 0, 1, -1, -1, 0, 0, 0, 0, 0, 0 + +FontHouse_Blocks:: +INCBIN "maps/FontHouse.blk" diff --git a/data/maps/objects/FontoLab.asm b/data/maps/objects/FontLab.asm similarity index 57% rename from data/maps/objects/FontoLab.asm rename to data/maps/objects/FontLab.asm index 4e4f876f..083e97c0 100644 --- a/data/maps/objects/FontoLab.asm +++ b/data/maps/objects/FontLab.asm @@ -1,15 +1,15 @@ INCLUDE "constants.asm" -SECTION "data/maps/objects/FontoLab.asm", ROMX +SECTION "data/maps/objects/FontLab.asm", ROMX - map_attributes FontoLab, FONTO_LAB, 0 + map_attributes FontLab, FONT_LAB, 0 -FontoLab_MapEvents:: +FontLab_MapEvents:: dw $4000 ; unknown def_warp_events - warp_event 3, 7, FONTO, 5, 46 - warp_event 4, 7, FONTO, 5, 47 + warp_event 3, 7, FONT, 5, 46 + warp_event 4, 7, FONT, 5, 47 def_bg_events @@ -17,5 +17,5 @@ FontoLab_MapEvents:: object_event 2, 2, SPRITE_SCIENTIST, SPRITEMOVEFN_RANDOM_WALK_X, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 8, 5, SPRITE_SCIENTIST, SPRITEMOVEFN_RANDOM_WALK_X, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 -FontoLab_Blocks:: -INCBIN "maps/FontoLab.blk" +FontLab_Blocks:: +INCBIN "maps/FontLab.blk" diff --git a/data/maps/objects/FontoMart.asm b/data/maps/objects/FontMart.asm similarity index 62% rename from data/maps/objects/FontoMart.asm rename to data/maps/objects/FontMart.asm index 992256f4..1f6d005e 100644 --- a/data/maps/objects/FontoMart.asm +++ b/data/maps/objects/FontMart.asm @@ -1,15 +1,15 @@ INCLUDE "constants.asm" -SECTION "data/maps/objects/FontoMart.asm", ROMX +SECTION "data/maps/objects/FontMart.asm", ROMX - map_attributes FontoMart, FONTO_MART, 0 + map_attributes FontMart, FONT_MART, 0 -FontoMart_MapEvents:: +FontMart_MapEvents:: dw $4000 ; unknown def_warp_events - warp_event 4, 7, FONTO, 2, 59 - warp_event 5, 7, FONTO, 2, 59 + warp_event 4, 7, FONT, 2, 59 + warp_event 5, 7, FONT, 2, 59 def_bg_events @@ -18,5 +18,5 @@ FontoMart_MapEvents:: object_event 10, 5, SPRITE_GIRL, SPRITEMOVEFN_RANDOM_WALK_X, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 4, 1, SPRITE_POKEFAN_M, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -FontoMart_Blocks:: -INCBIN "maps/FontoMart.blk" +FontMart_Blocks:: +INCBIN "maps/FontMart.blk" diff --git a/data/maps/objects/FontoPokecenter1F.asm b/data/maps/objects/FontPokecenter1F.asm similarity index 60% rename from data/maps/objects/FontoPokecenter1F.asm rename to data/maps/objects/FontPokecenter1F.asm index b0e0d136..19cc792f 100644 --- a/data/maps/objects/FontoPokecenter1F.asm +++ b/data/maps/objects/FontPokecenter1F.asm @@ -1,16 +1,16 @@ INCLUDE "constants.asm" -SECTION "data/maps/objects/FontoPokecenter1F.asm", ROMX +SECTION "data/maps/objects/FontPokecenter1F.asm", ROMX - map_attributes FontoPokecenter1F, FONTO_POKECENTER_1F, 0 + map_attributes FontPokecenter1F, FONT_POKECENTER_1F, 0 -FontoPokecenter1F_MapEvents:: +FontPokecenter1F_MapEvents:: dw $4000 ; unknown def_warp_events - warp_event 5, 7, FONTO, 4, 59 - warp_event 6, 7, FONTO, 4, 60 - warp_event 0, 7, FONTO_POKECENTER_2F, 1, 57 + warp_event 5, 7, FONT, 4, 59 + warp_event 6, 7, FONT, 4, 60 + warp_event 0, 7, FONT_POKECENTER_2F, 1, 57 def_bg_events @@ -20,5 +20,5 @@ FontoPokecenter1F_MapEvents:: object_event 2, 5, SPRITE_COOLTRAINER_M, SPRITEMOVEFN_RANDOM_WALK_Y, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 object_event 10, 1, SPRITE_YOUNGSTER, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -FontoPokecenter1F_Blocks:: -INCBIN "maps/FontoPokecenter1F.blk" +FontPokecenter1F_Blocks:: +INCBIN "maps/FontPokecenter1F.blk" diff --git a/data/maps/objects/FontoPokecenter2F.asm b/data/maps/objects/FontPokecenter2F.asm similarity index 61% rename from data/maps/objects/FontoPokecenter2F.asm rename to data/maps/objects/FontPokecenter2F.asm index f095d8ca..af601915 100644 --- a/data/maps/objects/FontoPokecenter2F.asm +++ b/data/maps/objects/FontPokecenter2F.asm @@ -1,14 +1,14 @@ INCLUDE "constants.asm" -SECTION "data/maps/objects/FontoPokecenter2F.asm", ROMX +SECTION "data/maps/objects/FontPokecenter2F.asm", ROMX - map_attributes FontoPokecenter2F, FONTO_POKECENTER_2F, 0 + map_attributes FontPokecenter2F, FONT_POKECENTER_2F, 0 -FontoPokecenter2F_MapEvents:: +FontPokecenter2F_MapEvents:: dw $4000 ; unknown def_warp_events - warp_event 0, 7, FONTO_POKECENTER_1F, 3, 57 + warp_event 0, 7, FONT_POKECENTER_1F, 3, 57 def_bg_events @@ -17,5 +17,5 @@ FontoPokecenter2F_MapEvents:: object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 14, 7, SPRITE_FISHING_GURU, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -FontoPokecenter2F_Blocks:: -INCBIN "maps/FontoPokecenter2F.blk" +FontPokecenter2F_Blocks:: +INCBIN "maps/FontPokecenter2F.blk" diff --git a/data/maps/objects/FontoRocketHouse.asm b/data/maps/objects/FontRocketHouse.asm similarity index 64% rename from data/maps/objects/FontoRocketHouse.asm rename to data/maps/objects/FontRocketHouse.asm index 1de81ff0..fd46463d 100644 --- a/data/maps/objects/FontoRocketHouse.asm +++ b/data/maps/objects/FontRocketHouse.asm @@ -1,15 +1,15 @@ INCLUDE "constants.asm" -SECTION "data/maps/objects/FontoRocketHouse.asm", ROMX +SECTION "data/maps/objects/FontRocketHouse.asm", ROMX - map_attributes FontoRocketHouse, FONTO_ROCKET_HOUSE, 0 + map_attributes FontRocketHouse, FONT_ROCKET_HOUSE, 0 -FontoRocketHouse_MapEvents:: +FontRocketHouse_MapEvents:: dw $4000 ; unknown def_warp_events - warp_event 12, 7, FONTO, 1, 63 - warp_event 13, 7, FONTO, 1, 63 + warp_event 12, 7, FONT, 1, 63 + warp_event 13, 7, FONT, 1, 63 def_bg_events @@ -19,5 +19,5 @@ FontoRocketHouse_MapEvents:: object_event 14, 2, SPRITE_ROCKET_M, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 12, 2, SPRITE_PIDGEY, SPRITEMOVEFN_RANDOM_WALK_X, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 -FontoRocketHouse_Blocks:: -INCBIN "maps/FontoRocketHouse.blk" +FontRocketHouse_Blocks:: +INCBIN "maps/FontRocketHouse.blk" diff --git a/data/maps/objects/FontRoute1.asm b/data/maps/objects/FontRoute1.asm new file mode 100644 index 00000000..9ed94971 --- /dev/null +++ b/data/maps/objects/FontRoute1.asm @@ -0,0 +1,20 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/FontRoute1.asm", ROMX + + map_attributes FontRoute1, FONT_ROUTE_1, WEST | EAST + connection west, South, SOUTH, 0 + connection east, Font, FONT, 0 + +FontRoute1_MapEvents:: + dw $4000 ; unknown + + def_warp_events + warp_event 6, 9, FONT_ROUTE_GATE_1, 3, 209 + + def_bg_events + + def_object_events + +FontRoute1_Blocks:: +INCBIN "maps/FontRoute1.blk" diff --git a/data/maps/objects/FontRoute2.asm b/data/maps/objects/FontRoute2.asm new file mode 100644 index 00000000..1d00c838 --- /dev/null +++ b/data/maps/objects/FontRoute2.asm @@ -0,0 +1,19 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/FontRoute2.asm", ROMX + + map_attributes FontRoute2, FONT_ROUTE_2, SOUTH | WEST + connection south, Font, FONT, 0 + connection west, FontRoute6, FONT_ROUTE_6, 0 + +FontRoute2_MapEvents:: + dw $4000 ; unknown + + def_warp_events + + def_bg_events + + def_object_events + +FontRoute2_Blocks:: +INCBIN "maps/FontRoute2.blk" diff --git a/data/maps/objects/FontRoute3.asm b/data/maps/objects/FontRoute3.asm new file mode 100644 index 00000000..ebbfd910 --- /dev/null +++ b/data/maps/objects/FontRoute3.asm @@ -0,0 +1,19 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/FontRoute3.asm", ROMX + + map_attributes FontRoute3, FONT_ROUTE_3, WEST | EAST + connection west, Font, FONT, 0 + connection east, FontRoute4, FONT_ROUTE_4, 0 + +FontRoute3_MapEvents:: + dw $4000 ; unknown + + def_warp_events + + def_bg_events + + def_object_events + +FontRoute3_Blocks:: +INCBIN "maps/FontRoute3.blk" diff --git a/data/maps/objects/FontRoute4.asm b/data/maps/objects/FontRoute4.asm new file mode 100644 index 00000000..0e41d2fe --- /dev/null +++ b/data/maps/objects/FontRoute4.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/FontRoute4.asm", ROMX + + map_attributes FontRoute4, FONT_ROUTE_4, SOUTH | WEST + connection south, Birdon, BIRDON, 0 + connection west, FontRoute3, FONT_ROUTE_3, 0 + +FontRoute4_MapEvents:: + dw $4000 ; unknown + + def_warp_events + warp_event 8, 30, FONT_ROUTE_GATE_2, 3, 261 + warp_event 9, 30, FONT_ROUTE_GATE_2, 4, 261 + + def_bg_events + + def_object_events + +FontRoute4_Blocks:: +INCBIN "maps/FontRoute4.blk" diff --git a/data/maps/objects/FontRoute5.asm b/data/maps/objects/FontRoute5.asm new file mode 100644 index 00000000..a276b927 --- /dev/null +++ b/data/maps/objects/FontRoute5.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/FontRoute5.asm", ROMX + + map_attributes FontRoute5, FONT_ROUTE_5, SOUTH | EAST + connection south, South, SOUTH, -10 + connection east, FontRoute6, FONT_ROUTE_6, 0 + +FontRoute5_MapEvents:: + dw $4000 ; unknown + + def_warp_events + warp_event 8, 30, FONT_ROUTE_GATE_3, 3, 261 + warp_event 9, 30, FONT_ROUTE_GATE_3, 4, 261 + + def_bg_events + + def_object_events + +FontRoute5_Blocks:: +INCBIN "maps/FontRoute5.blk" diff --git a/data/maps/objects/FontRoute6.asm b/data/maps/objects/FontRoute6.asm new file mode 100644 index 00000000..f8469051 --- /dev/null +++ b/data/maps/objects/FontRoute6.asm @@ -0,0 +1,19 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/FontRoute6.asm", ROMX + + map_attributes FontRoute6, FONT_ROUTE_6, WEST | EAST + connection west, FontRoute5, FONT_ROUTE_5, 0 + connection east, FontRoute2, FONT_ROUTE_2, 0 + +FontRoute6_MapEvents:: + dw $4000 ; unknown + + def_warp_events + + def_bg_events + + def_object_events + +FontRoute6_Blocks:: +INCBIN "maps/FontRoute6.blk" diff --git a/data/maps/objects/FontRouteGate1.asm b/data/maps/objects/FontRouteGate1.asm new file mode 100644 index 00000000..acc45e5d --- /dev/null +++ b/data/maps/objects/FontRouteGate1.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/FontRouteGate1.asm", ROMX + + map_attributes FontRouteGate1, FONT_ROUTE_GATE_1, 0 + +FontRouteGate1_MapEvents:: + dw $4000 ; unknown + + def_warp_events + warp_event 0, 7, SOUTH, 7, 45 + warp_event 1, 7, SOUTH, 7, 45 + warp_event 8, 7, FONT_ROUTE_1, 1, 49 + warp_event 9, 7, FONT_ROUTE_1, 1, 49 + + def_bg_events + + def_object_events + +FontRouteGate1_Blocks:: +INCBIN "maps/FontRouteGate1.blk" diff --git a/data/maps/objects/FontRouteGate2.asm b/data/maps/objects/FontRouteGate2.asm new file mode 100644 index 00000000..8ecd2eec --- /dev/null +++ b/data/maps/objects/FontRouteGate2.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/FontRouteGate2.asm", ROMX + + map_attributes FontRouteGate2, FONT_ROUTE_GATE_2, 0 + +FontRouteGate2_MapEvents:: + dw $4000 ; unknown + + def_warp_events + warp_event 4, 7, BIRDON, 8, 47 + warp_event 5, 7, BIRDON, 9, 47 + warp_event 4, 0, FONT_ROUTE_4, 1, 14 + warp_event 5, 0, FONT_ROUTE_4, 2, 14 + + def_bg_events + + def_object_events + +FontRouteGate2_Blocks:: +INCBIN "maps/FontRouteGate2.blk" diff --git a/data/maps/objects/FontRouteGate3.asm b/data/maps/objects/FontRouteGate3.asm new file mode 100644 index 00000000..b8c25717 --- /dev/null +++ b/data/maps/objects/FontRouteGate3.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/FontRouteGate3.asm", ROMX + + map_attributes FontRouteGate3, FONT_ROUTE_GATE_3, 0 + +FontRouteGate3_MapEvents:: + dw $4000 ; unknown + + def_warp_events + warp_event 4, 7, SOUTH, 5, 47 + warp_event 5, 7, SOUTH, 6, 47 + warp_event 4, 0, FONT_ROUTE_5, 1, 14 + warp_event 5, 0, FONT_ROUTE_5, 2, 14 + + def_bg_events + + def_object_events + +FontRouteGate3_Blocks:: +INCBIN "maps/FontRouteGate3.blk" diff --git a/data/maps/objects/FontoHouse.asm b/data/maps/objects/FontoHouse.asm deleted file mode 100644 index 43486d6a..00000000 --- a/data/maps/objects/FontoHouse.asm +++ /dev/null @@ -1,20 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/objects/FontoHouse.asm", ROMX - - map_attributes FontoHouse, FONTO_HOUSE, 0 - -FontoHouse_MapEvents:: - dw $4000 ; unknown - - def_warp_events - warp_event 4, 7, FONTO, 3, 47 - warp_event 5, 7, FONTO, 3, 47 - - def_bg_events - - def_object_events - object_event 8, 4, SPRITE_GENTLEMAN, SPRITEMOVEFN_RANDOM_WALK_Y, 0, 1, -1, -1, 0, 0, 0, 0, 0, 0 - -FontoHouse_Blocks:: -INCBIN "maps/FontoHouse.blk" diff --git a/data/maps/objects/FontoRoute1.asm b/data/maps/objects/FontoRoute1.asm deleted file mode 100644 index 85de2722..00000000 --- a/data/maps/objects/FontoRoute1.asm +++ /dev/null @@ -1,20 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/objects/FontoRoute1.asm", ROMX - - map_attributes FontoRoute1, FONTO_ROUTE_1, WEST | EAST - connection west, South, SOUTH, 0 - connection east, Fonto, FONTO, 0 - -FontoRoute1_MapEvents:: - dw $4000 ; unknown - - def_warp_events - warp_event 6, 9, FONTO_ROUTE_GATE_1, 3, 209 - - def_bg_events - - def_object_events - -FontoRoute1_Blocks:: -INCBIN "maps/FontoRoute1.blk" diff --git a/data/maps/objects/FontoRoute2.asm b/data/maps/objects/FontoRoute2.asm deleted file mode 100644 index 3614edc5..00000000 --- a/data/maps/objects/FontoRoute2.asm +++ /dev/null @@ -1,19 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/objects/FontoRoute2.asm", ROMX - - map_attributes FontoRoute2, FONTO_ROUTE_2, SOUTH | WEST - connection south, Fonto, FONTO, 0 - connection west, FontoRoute6, FONTO_ROUTE_6, 0 - -FontoRoute2_MapEvents:: - dw $4000 ; unknown - - def_warp_events - - def_bg_events - - def_object_events - -FontoRoute2_Blocks:: -INCBIN "maps/FontoRoute2.blk" diff --git a/data/maps/objects/FontoRoute3.asm b/data/maps/objects/FontoRoute3.asm deleted file mode 100644 index bb198c5b..00000000 --- a/data/maps/objects/FontoRoute3.asm +++ /dev/null @@ -1,19 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/objects/FontoRoute3.asm", ROMX - - map_attributes FontoRoute3, FONTO_ROUTE_3, WEST | EAST - connection west, Fonto, FONTO, 0 - connection east, FontoRoute4, FONTO_ROUTE_4, 0 - -FontoRoute3_MapEvents:: - dw $4000 ; unknown - - def_warp_events - - def_bg_events - - def_object_events - -FontoRoute3_Blocks:: -INCBIN "maps/FontoRoute3.blk" diff --git a/data/maps/objects/FontoRoute4.asm b/data/maps/objects/FontoRoute4.asm deleted file mode 100644 index 6d5745cc..00000000 --- a/data/maps/objects/FontoRoute4.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/objects/FontoRoute4.asm", ROMX - - map_attributes FontoRoute4, FONTO_ROUTE_4, SOUTH | WEST - connection south, Baadon, BAADON, 0 - connection west, FontoRoute3, FONTO_ROUTE_3, 0 - -FontoRoute4_MapEvents:: - dw $4000 ; unknown - - def_warp_events - warp_event 8, 30, FONTO_ROUTE_GATE_2, 3, 261 - warp_event 9, 30, FONTO_ROUTE_GATE_2, 4, 261 - - def_bg_events - - def_object_events - -FontoRoute4_Blocks:: -INCBIN "maps/FontoRoute4.blk" diff --git a/data/maps/objects/FontoRoute5.asm b/data/maps/objects/FontoRoute5.asm deleted file mode 100644 index 3cf32d4c..00000000 --- a/data/maps/objects/FontoRoute5.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/objects/FontoRoute5.asm", ROMX - - map_attributes FontoRoute5, FONTO_ROUTE_5, SOUTH | EAST - connection south, South, SOUTH, -10 - connection east, FontoRoute6, FONTO_ROUTE_6, 0 - -FontoRoute5_MapEvents:: - dw $4000 ; unknown - - def_warp_events - warp_event 8, 30, FONTO_ROUTE_GATE_3, 3, 261 - warp_event 9, 30, FONTO_ROUTE_GATE_3, 4, 261 - - def_bg_events - - def_object_events - -FontoRoute5_Blocks:: -INCBIN "maps/FontoRoute5.blk" diff --git a/data/maps/objects/FontoRoute6.asm b/data/maps/objects/FontoRoute6.asm deleted file mode 100644 index e84a1b19..00000000 --- a/data/maps/objects/FontoRoute6.asm +++ /dev/null @@ -1,19 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/objects/FontoRoute6.asm", ROMX - - map_attributes FontoRoute6, FONTO_ROUTE_6, WEST | EAST - connection west, FontoRoute5, FONTO_ROUTE_5, 0 - connection east, FontoRoute2, FONTO_ROUTE_2, 0 - -FontoRoute6_MapEvents:: - dw $4000 ; unknown - - def_warp_events - - def_bg_events - - def_object_events - -FontoRoute6_Blocks:: -INCBIN "maps/FontoRoute6.blk" diff --git a/data/maps/objects/FontoRouteGate1.asm b/data/maps/objects/FontoRouteGate1.asm deleted file mode 100644 index ba947987..00000000 --- a/data/maps/objects/FontoRouteGate1.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/objects/FontoRouteGate1.asm", ROMX - - map_attributes FontoRouteGate1, FONTO_ROUTE_GATE_1, 0 - -FontoRouteGate1_MapEvents:: - dw $4000 ; unknown - - def_warp_events - warp_event 0, 7, SOUTH, 7, 45 - warp_event 1, 7, SOUTH, 7, 45 - warp_event 8, 7, FONTO_ROUTE_1, 1, 49 - warp_event 9, 7, FONTO_ROUTE_1, 1, 49 - - def_bg_events - - def_object_events - -FontoRouteGate1_Blocks:: -INCBIN "maps/FontoRouteGate1.blk" diff --git a/data/maps/objects/FontoRouteGate2.asm b/data/maps/objects/FontoRouteGate2.asm deleted file mode 100644 index 7aa3c659..00000000 --- a/data/maps/objects/FontoRouteGate2.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/objects/FontoRouteGate2.asm", ROMX - - map_attributes FontoRouteGate2, FONTO_ROUTE_GATE_2, 0 - -FontoRouteGate2_MapEvents:: - dw $4000 ; unknown - - def_warp_events - warp_event 4, 7, BAADON, 8, 47 - warp_event 5, 7, BAADON, 9, 47 - warp_event 4, 0, FONTO_ROUTE_4, 1, 14 - warp_event 5, 0, FONTO_ROUTE_4, 2, 14 - - def_bg_events - - def_object_events - -FontoRouteGate2_Blocks:: -INCBIN "maps/FontoRouteGate2.blk" diff --git a/data/maps/objects/FontoRouteGate3.asm b/data/maps/objects/FontoRouteGate3.asm deleted file mode 100644 index 0546dfcf..00000000 --- a/data/maps/objects/FontoRouteGate3.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/objects/FontoRouteGate3.asm", ROMX - - map_attributes FontoRouteGate3, FONTO_ROUTE_GATE_3, 0 - -FontoRouteGate3_MapEvents:: - dw $4000 ; unknown - - def_warp_events - warp_event 4, 7, SOUTH, 5, 47 - warp_event 5, 7, SOUTH, 6, 47 - warp_event 4, 0, FONTO_ROUTE_5, 1, 14 - warp_event 5, 0, FONTO_ROUTE_5, 2, 14 - - def_bg_events - - def_object_events - -FontoRouteGate3_Blocks:: -INCBIN "maps/FontoRouteGate3.blk" diff --git a/data/maps/objects/HaitekuHouse1.asm b/data/maps/objects/HaitekuHouse1.asm deleted file mode 100644 index 4b6c1524..00000000 --- a/data/maps/objects/HaitekuHouse1.asm +++ /dev/null @@ -1,20 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/objects/HaitekuHouse1.asm", ROMX - - map_attributes HaitekuHouse1, HAITEKU_HOUSE_1, 0 - -HaitekuHouse1_MapEvents:: - dw $4000 ; unknown - - def_warp_events - warp_event 4, 7, HAITEKU, 5, 47 - warp_event 5, 7, HAITEKU, 5, 47 - - def_bg_events - - def_object_events - object_event 7, 3, SPRITE_FISHING_GURU, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -HaitekuHouse1_Blocks:: -INCBIN "maps/HaitekuHouse1.blk" diff --git a/data/maps/objects/HaitekuHouse2.asm b/data/maps/objects/HaitekuHouse2.asm deleted file mode 100644 index f62da980..00000000 --- a/data/maps/objects/HaitekuHouse2.asm +++ /dev/null @@ -1,20 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/objects/HaitekuHouse2.asm", ROMX - - map_attributes HaitekuHouse2, HAITEKU_HOUSE_2, 0 - -HaitekuHouse2_MapEvents:: - dw $4000 ; unknown - - def_warp_events - warp_event 4, 7, HAITEKU, 6, 47 - warp_event 5, 7, HAITEKU, 6, 47 - - def_bg_events - - def_object_events - object_event 7, 3, SPRITE_SAILOR, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -HaitekuHouse2_Blocks:: -INCBIN "maps/HaitekuHouse2.blk" diff --git a/data/maps/objects/HaitekuImposterOakHouse.asm b/data/maps/objects/HaitekuImposterOakHouse.asm deleted file mode 100644 index 08dd1cd3..00000000 --- a/data/maps/objects/HaitekuImposterOakHouse.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/objects/HaitekuImposterOakHouse.asm", ROMX - - map_attributes HaitekuImposterOakHouse, HAITEKU_IMPOSTER_OAK_HOUSE, 0 - -HaitekuImposterOakHouse_MapEvents:: - dw $4000 ; unknown - - def_warp_events - warp_event 4, 7, HAITEKU, 7, 47 - warp_event 5, 7, HAITEKU, 7, 47 - - def_bg_events - - def_object_events - object_event 7, 3, SPRITE_EVIL_OKIDO, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 1, 2, SPRITE_POKEFAN_F, SPRITEMOVEFN_RANDOM_WALK_X, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 - -HaitekuImposterOakHouse_Blocks:: -INCBIN "maps/HaitekuImposterOakHouse.blk" diff --git a/data/maps/objects/HaitekuWestRoute.asm b/data/maps/objects/HaitekuWestRoute.asm deleted file mode 100644 index f78213cb..00000000 --- a/data/maps/objects/HaitekuWestRoute.asm +++ /dev/null @@ -1,19 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/objects/HaitekuWestRoute.asm", ROMX - - map_attributes HaitekuWestRoute, HAITEKU_WEST_ROUTE, WEST | EAST - connection west, HaitekuWestRouteOcean, HAITEKU_WEST_ROUTE_OCEAN, -18 - connection east, Haiteku, HAITEKU, 0 - -HaitekuWestRoute_MapEvents:: - dw $4000 ; unknown - - def_warp_events - - def_bg_events - - def_object_events - -HaitekuWestRoute_Blocks:: -INCBIN "maps/HaitekuWestRoute.blk" diff --git a/data/maps/objects/HaitekuWestRouteGate.asm b/data/maps/objects/HaitekuWestRouteGate.asm deleted file mode 100644 index eeb7e90b..00000000 --- a/data/maps/objects/HaitekuWestRouteGate.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/objects/HaitekuWestRouteGate.asm", ROMX - - map_attributes HaitekuWestRouteGate, HAITEKU_WEST_ROUTE_GATE, 0 - -HaitekuWestRouteGate_MapEvents:: - dw $4000 ; unknown - - def_warp_events - warp_event 4, 7, HAITEKU_WEST_ROUTE_OCEAN, 1, 47 - warp_event 5, 7, HAITEKU_WEST_ROUTE_OCEAN, 2, 47 - warp_event 4, 0, SOUTH, 8, 14 - warp_event 5, 0, SOUTH, 9, 14 - - def_bg_events - - def_object_events - -HaitekuWestRouteGate_Blocks:: -INCBIN "maps/HaitekuWestRouteGate.blk" diff --git a/data/maps/objects/HaitekuWestRouteOcean.asm b/data/maps/objects/HaitekuWestRouteOcean.asm deleted file mode 100644 index eee5980b..00000000 --- a/data/maps/objects/HaitekuWestRouteOcean.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "data/maps/objects/HaitekuWestRouteOcean.asm", ROMX - - map_attributes HaitekuWestRouteOcean, HAITEKU_WEST_ROUTE_OCEAN, NORTH | EAST - connection north, South, SOUTH, -10 - connection east, HaitekuWestRoute, HAITEKU_WEST_ROUTE, 18 - -HaitekuWestRouteOcean_MapEvents:: - dw $4000 ; unknown - - def_warp_events - warp_event 10, 9, HAITEKU_WEST_ROUTE_GATE, 1, 86 - warp_event 11, 9, HAITEKU_WEST_ROUTE_GATE, 2, 86 - - def_bg_events - - def_object_events - -HaitekuWestRouteOcean_Blocks:: -INCBIN "maps/HaitekuWestRouteOcean.blk" diff --git a/data/maps/objects/Haiteku.asm b/data/maps/objects/HighTech.asm similarity index 53% rename from data/maps/objects/Haiteku.asm rename to data/maps/objects/HighTech.asm index 04ceb7c9..3602b980 100644 --- a/data/maps/objects/Haiteku.asm +++ b/data/maps/objects/HighTech.asm @@ -1,23 +1,23 @@ INCLUDE "constants.asm" -SECTION "data/maps/objects/Haiteku.asm", ROMX +SECTION "data/maps/objects/HighTech.asm", ROMX - map_attributes Haiteku, HAITEKU, WEST - connection west, HaitekuWestRoute, HAITEKU_WEST_ROUTE, 0 + map_attributes HighTech, HIGHTECH, WEST + connection west, HighTechWestRoute, HIGHTECH_WEST_ROUTE, 0 -Haiteku_MapEvents:: +HighTech_MapEvents:: dw $4000 ; unknown def_warp_events - warp_event 31, 10, HAITEKU_POKECENTER_1F, 1, 172 - warp_event 10, 11, HAITEKU_LEAGUE_1F, 1, 162 - warp_event 11, 11, HAITEKU_LEAGUE_1F, 2, 162 - warp_event 31, 16, HAITEKU_MART, 1, 250 - warp_event 7, 17, HAITEKU_HOUSE_1, 1, 238 - warp_event 15, 17, HAITEKU_HOUSE_2, 1, 242 - warp_event 33, 20, HAITEKU_IMPOSTER_OAK_HOUSE, 1, 303 - warp_event 6, 27, HAITEKU_AQUARIUM_1F, 1, 368 - warp_event 7, 27, HAITEKU_AQUARIUM_1F, 2, 368 + warp_event 31, 10, HIGHTECH_POKECENTER_1F, 1, 172 + warp_event 10, 11, HIGHTECH_LEAGUE_1F, 1, 162 + warp_event 11, 11, HIGHTECH_LEAGUE_1F, 2, 162 + warp_event 31, 16, HIGHTECH_MART, 1, 250 + warp_event 7, 17, HIGHTECH_HOUSE_1, 1, 238 + warp_event 15, 17, HIGHTECH_HOUSE_2, 1, 242 + warp_event 33, 20, HIGHTECH_IMPOSTER_OAK_HOUSE, 1, 303 + warp_event 6, 27, HIGHTECH_AQUARIUM_1F, 1, 368 + warp_event 7, 27, HIGHTECH_AQUARIUM_1F, 2, 368 def_bg_events bg_event 24, 7, 1 @@ -36,5 +36,5 @@ Haiteku_MapEvents:: object_event 26, 10, SPRITE_SAILOR, SPRITEMOVEFN_RANDOM_WALK_X, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 10, 14, SPRITE_GENTLEMAN, SPRITEMOVEFN_RANDOM_WALK_X, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 -Haiteku_Blocks:: -INCBIN "maps/Haiteku.blk" +HighTech_Blocks:: +INCBIN "maps/HighTech.blk" diff --git a/data/maps/objects/HaitekuAquarium1F.asm b/data/maps/objects/HighTechAquarium1F.asm similarity index 53% rename from data/maps/objects/HaitekuAquarium1F.asm rename to data/maps/objects/HighTechAquarium1F.asm index e3564ab7..7b7d20a5 100644 --- a/data/maps/objects/HaitekuAquarium1F.asm +++ b/data/maps/objects/HighTechAquarium1F.asm @@ -1,16 +1,16 @@ INCLUDE "constants.asm" -SECTION "data/maps/objects/HaitekuAquarium1F.asm", ROMX +SECTION "data/maps/objects/HighTechAquarium1F.asm", ROMX - map_attributes HaitekuAquarium1F, HAITEKU_AQUARIUM_1F, 0 + map_attributes HighTechAquarium1F, HIGHTECH_AQUARIUM_1F, 0 -HaitekuAquarium1F_MapEvents:: +HighTechAquarium1F_MapEvents:: dw $4000 ; unknown def_warp_events - warp_event 12, 7, HAITEKU, 8, 63 - warp_event 13, 7, HAITEKU, 9, 63 - warp_event 0, 7, HAITEKU_AQUARIUM_2F, 1, 57 + warp_event 12, 7, HIGHTECH, 8, 63 + warp_event 13, 7, HIGHTECH, 9, 63 + warp_event 0, 7, HIGHTECH_AQUARIUM_2F, 1, 57 def_bg_events @@ -19,5 +19,5 @@ HaitekuAquarium1F_MapEvents:: object_event 12, 2, SPRITE_YOUNGSTER, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 4, 5, SPRITE_LASS, SPRITEMOVEFN_RANDOM_WALK_XY, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0 -HaitekuAquarium1F_Blocks:: -INCBIN "maps/HaitekuAquarium1F.blk" +HighTechAquarium1F_Blocks:: +INCBIN "maps/HighTechAquarium1F.blk" diff --git a/data/maps/objects/HaitekuAquarium2F.asm b/data/maps/objects/HighTechAquarium2F.asm similarity index 52% rename from data/maps/objects/HaitekuAquarium2F.asm rename to data/maps/objects/HighTechAquarium2F.asm index f0802dfa..95568595 100644 --- a/data/maps/objects/HaitekuAquarium2F.asm +++ b/data/maps/objects/HighTechAquarium2F.asm @@ -1,14 +1,14 @@ INCLUDE "constants.asm" -SECTION "data/maps/objects/HaitekuAquarium2F.asm", ROMX +SECTION "data/maps/objects/HighTechAquarium2F.asm", ROMX - map_attributes HaitekuAquarium2F, HAITEKU_AQUARIUM_2F, 0 + map_attributes HighTechAquarium2F, HIGHTECH_AQUARIUM_2F, 0 -HaitekuAquarium2F_MapEvents:: +HighTechAquarium2F_MapEvents:: dw $4000 ; unknown def_warp_events - warp_event 0, 7, HAITEKU_AQUARIUM_1F, 3, 57 + warp_event 0, 7, HIGHTECH_AQUARIUM_1F, 3, 57 def_bg_events @@ -16,5 +16,5 @@ HaitekuAquarium2F_MapEvents:: object_event 7, 6, SPRITE_POKEFAN_M, SPRITEMOVEFN_RANDOM_WALK_X, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 10, 4, SPRITE_TEACHER, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -HaitekuAquarium2F_Blocks:: -INCBIN "maps/HaitekuAquarium2F.blk" +HighTechAquarium2F_Blocks:: +INCBIN "maps/HighTechAquarium2F.blk" diff --git a/data/maps/objects/HighTechHouse1.asm b/data/maps/objects/HighTechHouse1.asm new file mode 100644 index 00000000..7c298849 --- /dev/null +++ b/data/maps/objects/HighTechHouse1.asm @@ -0,0 +1,20 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/HighTechHouse1.asm", ROMX + + map_attributes HighTechHouse1, HIGHTECH_HOUSE_1, 0 + +HighTechHouse1_MapEvents:: + dw $4000 ; unknown + + def_warp_events + warp_event 4, 7, HIGHTECH, 5, 47 + warp_event 5, 7, HIGHTECH, 5, 47 + + def_bg_events + + def_object_events + object_event 7, 3, SPRITE_FISHING_GURU, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +HighTechHouse1_Blocks:: +INCBIN "maps/HighTechHouse1.blk" diff --git a/data/maps/objects/HighTechHouse2.asm b/data/maps/objects/HighTechHouse2.asm new file mode 100644 index 00000000..056156bb --- /dev/null +++ b/data/maps/objects/HighTechHouse2.asm @@ -0,0 +1,20 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/HighTechHouse2.asm", ROMX + + map_attributes HighTechHouse2, HIGHTECH_HOUSE_2, 0 + +HighTechHouse2_MapEvents:: + dw $4000 ; unknown + + def_warp_events + warp_event 4, 7, HIGHTECH, 6, 47 + warp_event 5, 7, HIGHTECH, 6, 47 + + def_bg_events + + def_object_events + object_event 7, 3, SPRITE_SAILOR, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +HighTechHouse2_Blocks:: +INCBIN "maps/HighTechHouse2.blk" diff --git a/data/maps/objects/HighTechImposterOakHouse.asm b/data/maps/objects/HighTechImposterOakHouse.asm new file mode 100644 index 00000000..cebdb051 --- /dev/null +++ b/data/maps/objects/HighTechImposterOakHouse.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/HighTechImposterOakHouse.asm", ROMX + + map_attributes HighTechImposterOakHouse, HIGHTECH_IMPOSTER_OAK_HOUSE, 0 + +HighTechImposterOakHouse_MapEvents:: + dw $4000 ; unknown + + def_warp_events + warp_event 4, 7, HIGHTECH, 7, 47 + warp_event 5, 7, HIGHTECH, 7, 47 + + def_bg_events + + def_object_events + object_event 7, 3, SPRITE_EVIL_OKIDO, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 1, 2, SPRITE_POKEFAN_F, SPRITEMOVEFN_RANDOM_WALK_X, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 + +HighTechImposterOakHouse_Blocks:: +INCBIN "maps/HighTechImposterOakHouse.blk" diff --git a/data/maps/objects/HaitekuLeague1F.asm b/data/maps/objects/HighTechLeague1F.asm similarity index 64% rename from data/maps/objects/HaitekuLeague1F.asm rename to data/maps/objects/HighTechLeague1F.asm index f48a658d..705076f1 100644 --- a/data/maps/objects/HaitekuLeague1F.asm +++ b/data/maps/objects/HighTechLeague1F.asm @@ -1,16 +1,16 @@ INCLUDE "constants.asm" -SECTION "data/maps/objects/HaitekuLeague1F.asm", ROMX +SECTION "data/maps/objects/HighTechLeague1F.asm", ROMX - map_attributes HaitekuLeague1F, HAITEKU_LEAGUE_1F, 0 + map_attributes HighTechLeague1F, HIGHTECH_LEAGUE_1F, 0 -HaitekuLeague1F_MapEvents:: +HighTechLeague1F_MapEvents:: dw $4000 ; unknown def_warp_events - warp_event 3, 15, HAITEKU, 2, 82 - warp_event 4, 15, HAITEKU, 3, 83 - warp_event 7, 1, HAITEKU_LEAGUE_2F, 1, 14 + warp_event 3, 15, HIGHTECH, 2, 82 + warp_event 4, 15, HIGHTECH, 3, 83 + warp_event 7, 1, HIGHTECH_LEAGUE_2F, 1, 14 def_bg_events @@ -21,5 +21,5 @@ HaitekuLeague1F_MapEvents:: object_event 3, 1, SPRITE_COOLTRAINER_M, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 6, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEFN_RANDOM_WALK_Y, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 -HaitekuLeague1F_Blocks:: -INCBIN "maps/HaitekuLeague1F.blk" +HighTechLeague1F_Blocks:: +INCBIN "maps/HighTechLeague1F.blk" diff --git a/data/maps/objects/HaitekuLeague2F.asm b/data/maps/objects/HighTechLeague2F.asm similarity index 70% rename from data/maps/objects/HaitekuLeague2F.asm rename to data/maps/objects/HighTechLeague2F.asm index 2c0c24c8..c3f75c05 100644 --- a/data/maps/objects/HaitekuLeague2F.asm +++ b/data/maps/objects/HighTechLeague2F.asm @@ -1,14 +1,14 @@ INCLUDE "constants.asm" -SECTION "data/maps/objects/HaitekuLeague2F.asm", ROMX +SECTION "data/maps/objects/HighTechLeague2F.asm", ROMX - map_attributes HaitekuLeague2F, HAITEKU_LEAGUE_2F, 0 + map_attributes HighTechLeague2F, HIGHTECH_LEAGUE_2F, 0 -HaitekuLeague2F_MapEvents:: +HighTechLeague2F_MapEvents:: dw $4000 ; unknown def_warp_events - warp_event 7, 15, HAITEKU_LEAGUE_1F, 3, 92 + warp_event 7, 15, HIGHTECH_LEAGUE_1F, 3, 92 def_bg_events @@ -19,5 +19,5 @@ HaitekuLeague2F_MapEvents:: object_event 2, 10, SPRITE_COOLTRAINER_M, SPRITEMOVEFN_TURN_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 7, 7, SPRITE_COOLTRAINER_F, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -HaitekuLeague2F_Blocks:: -INCBIN "maps/HaitekuLeague2F.blk" +HighTechLeague2F_Blocks:: +INCBIN "maps/HighTechLeague2F.blk" diff --git a/data/maps/objects/HaitekuMart.asm b/data/maps/objects/HighTechMart.asm similarity index 60% rename from data/maps/objects/HaitekuMart.asm rename to data/maps/objects/HighTechMart.asm index ed4c9e61..e259aafa 100644 --- a/data/maps/objects/HaitekuMart.asm +++ b/data/maps/objects/HighTechMart.asm @@ -1,15 +1,15 @@ INCLUDE "constants.asm" -SECTION "data/maps/objects/HaitekuMart.asm", ROMX +SECTION "data/maps/objects/HighTechMart.asm", ROMX - map_attributes HaitekuMart, HAITEKU_MART, 0 + map_attributes HighTechMart, HIGHTECH_MART, 0 -HaitekuMart_MapEvents:: +HighTechMart_MapEvents:: dw $4000 ; unknown def_warp_events - warp_event 4, 7, HAITEKU, 4, 51 - warp_event 5, 7, HAITEKU, 4, 51 + warp_event 4, 7, HIGHTECH, 4, 51 + warp_event 5, 7, HIGHTECH, 4, 51 def_bg_events @@ -18,5 +18,5 @@ HaitekuMart_MapEvents:: object_event 10, 5, SPRITE_POKEFAN_M, SPRITEMOVEFN_RANDOM_WALK_X, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 4, 1, SPRITE_SAILOR, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -HaitekuMart_Blocks:: -INCBIN "maps/HaitekuMart.blk" +HighTechMart_Blocks:: +INCBIN "maps/HighTechMart.blk" diff --git a/data/maps/objects/HaitekuPokecenter1F.asm b/data/maps/objects/HighTechPokecenter1F.asm similarity index 57% rename from data/maps/objects/HaitekuPokecenter1F.asm rename to data/maps/objects/HighTechPokecenter1F.asm index e12c19c3..704fe102 100644 --- a/data/maps/objects/HaitekuPokecenter1F.asm +++ b/data/maps/objects/HighTechPokecenter1F.asm @@ -1,16 +1,16 @@ INCLUDE "constants.asm" -SECTION "data/maps/objects/HaitekuPokecenter1F.asm", ROMX +SECTION "data/maps/objects/HighTechPokecenter1F.asm", ROMX - map_attributes HaitekuPokecenter1F, HAITEKU_POKECENTER_1F, 0 + map_attributes HighTechPokecenter1F, HIGHTECH_POKECENTER_1F, 0 -HaitekuPokecenter1F_MapEvents:: +HighTechPokecenter1F_MapEvents:: dw $4000 ; unknown def_warp_events - warp_event 5, 7, HAITEKU, 1, 59 - warp_event 6, 7, HAITEKU, 1, 60 - warp_event 0, 7, HAITEKU_POKECENTER_2F, 1, 57 + warp_event 5, 7, HIGHTECH, 1, 59 + warp_event 6, 7, HIGHTECH, 1, 60 + warp_event 0, 7, HIGHTECH_POKECENTER_2F, 1, 57 def_bg_events @@ -20,5 +20,5 @@ HaitekuPokecenter1F_MapEvents:: object_event 2, 5, SPRITE_FISHER, SPRITEMOVEFN_RANDOM_WALK_Y, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 object_event 10, 1, SPRITE_SAILOR, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -HaitekuPokecenter1F_Blocks:: -INCBIN "maps/HaitekuPokecenter1F.blk" +HighTechPokecenter1F_Blocks:: +INCBIN "maps/HighTechPokecenter1F.blk" diff --git a/data/maps/objects/HaitekuPokecenter2F.asm b/data/maps/objects/HighTechPokecenter2F.asm similarity index 59% rename from data/maps/objects/HaitekuPokecenter2F.asm rename to data/maps/objects/HighTechPokecenter2F.asm index a182febe..5b1f2c04 100644 --- a/data/maps/objects/HaitekuPokecenter2F.asm +++ b/data/maps/objects/HighTechPokecenter2F.asm @@ -1,14 +1,14 @@ INCLUDE "constants.asm" -SECTION "data/maps/objects/HaitekuPokecenter2F.asm", ROMX +SECTION "data/maps/objects/HighTechPokecenter2F.asm", ROMX - map_attributes HaitekuPokecenter2F, HAITEKU_POKECENTER_2F, 0 + map_attributes HighTechPokecenter2F, HIGHTECH_POKECENTER_2F, 0 -HaitekuPokecenter2F_MapEvents:: +HighTechPokecenter2F_MapEvents:: dw $4000 ; unknown def_warp_events - warp_event 0, 7, HAITEKU_POKECENTER_1F, 3, 57 + warp_event 0, 7, HIGHTECH_POKECENTER_1F, 3, 57 def_bg_events @@ -17,5 +17,5 @@ HaitekuPokecenter2F_MapEvents:: object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 14, 7, SPRITE_FISHING_GURU, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -HaitekuPokecenter2F_Blocks:: -INCBIN "maps/HaitekuPokecenter2F.blk" +HighTechPokecenter2F_Blocks:: +INCBIN "maps/HighTechPokecenter2F.blk" diff --git a/data/maps/objects/HighTechWestRoute.asm b/data/maps/objects/HighTechWestRoute.asm new file mode 100644 index 00000000..801921b3 --- /dev/null +++ b/data/maps/objects/HighTechWestRoute.asm @@ -0,0 +1,19 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/HighTechWestRoute.asm", ROMX + + map_attributes HighTechWestRoute, HIGHTECH_WEST_ROUTE, WEST | EAST + connection west, HighTechWestRouteOcean, HIGHTECH_WEST_ROUTE_OCEAN, -18 + connection east, HighTech, HIGHTECH, 0 + +HighTechWestRoute_MapEvents:: + dw $4000 ; unknown + + def_warp_events + + def_bg_events + + def_object_events + +HighTechWestRoute_Blocks:: +INCBIN "maps/HighTechWestRoute.blk" diff --git a/data/maps/objects/HighTechWestRouteGate.asm b/data/maps/objects/HighTechWestRouteGate.asm new file mode 100644 index 00000000..f6508bef --- /dev/null +++ b/data/maps/objects/HighTechWestRouteGate.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/HighTechWestRouteGate.asm", ROMX + + map_attributes HighTechWestRouteGate, HIGHTECH_WEST_ROUTE_GATE, 0 + +HighTechWestRouteGate_MapEvents:: + dw $4000 ; unknown + + def_warp_events + warp_event 4, 7, HIGHTECH_WEST_ROUTE_OCEAN, 1, 47 + warp_event 5, 7, HIGHTECH_WEST_ROUTE_OCEAN, 2, 47 + warp_event 4, 0, SOUTH, 8, 14 + warp_event 5, 0, SOUTH, 9, 14 + + def_bg_events + + def_object_events + +HighTechWestRouteGate_Blocks:: +INCBIN "maps/HighTechWestRouteGate.blk" diff --git a/data/maps/objects/HighTechWestRouteOcean.asm b/data/maps/objects/HighTechWestRouteOcean.asm new file mode 100644 index 00000000..0b8f1050 --- /dev/null +++ b/data/maps/objects/HighTechWestRouteOcean.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "data/maps/objects/HighTechWestRouteOcean.asm", ROMX + + map_attributes HighTechWestRouteOcean, HIGHTECH_WEST_ROUTE_OCEAN, NORTH | EAST + connection north, South, SOUTH, -10 + connection east, HighTechWestRoute, HIGHTECH_WEST_ROUTE, 18 + +HighTechWestRouteOcean_MapEvents:: + dw $4000 ; unknown + + def_warp_events + warp_event 10, 9, HIGHTECH_WEST_ROUTE_GATE, 1, 86 + warp_event 11, 9, HIGHTECH_WEST_ROUTE_GATE, 2, 86 + + def_bg_events + + def_object_events + +HighTechWestRouteOcean_Blocks:: +INCBIN "maps/HighTechWestRouteOcean.blk" diff --git a/data/maps/objects/NewtypeRouteGate.asm b/data/maps/objects/NewtypeRouteGate.asm index 13135ed2..1d12fea9 100644 --- a/data/maps/objects/NewtypeRouteGate.asm +++ b/data/maps/objects/NewtypeRouteGate.asm @@ -10,8 +10,8 @@ NewtypeRouteGate_MapEvents:: def_warp_events warp_event 4, 7, ROUTE_18, 1, 47 warp_event 5, 7, ROUTE_18, 2, 47 - warp_event 4, 0, BULL_FOREST_ROUTE_1, 1, 14 - warp_event 5, 0, BULL_FOREST_ROUTE_1, 2, 14 + warp_event 4, 0, BLUE_FOREST_ROUTE_1, 1, 14 + warp_event 5, 0, BLUE_FOREST_ROUTE_1, 2, 14 def_bg_events diff --git a/data/maps/objects/North.asm b/data/maps/objects/North.asm index 46f13c67..dee423b3 100644 --- a/data/maps/objects/North.asm +++ b/data/maps/objects/North.asm @@ -3,7 +3,7 @@ INCLUDE "constants.asm" SECTION "data/maps/objects/North.asm", ROMX map_attributes North, NORTH, SOUTH - connection south, BullForestRoute3, BULL_FOREST_ROUTE_3, 0 + connection south, BlueForestRoute3, BLUE_FOREST_ROUTE_3, 0 North_MapEvents:: dw $4000 ; unknown diff --git a/data/maps/objects/Route15.asm b/data/maps/objects/Route15.asm index 6432ab39..56fc59de 100644 --- a/data/maps/objects/Route15.asm +++ b/data/maps/objects/Route15.asm @@ -3,15 +3,15 @@ INCLUDE "constants.asm" SECTION "data/maps/objects/Route15.asm", ROMX map_attributes Route15, ROUTE_15, NORTH | EAST - connection north, BaadonRoute3, BAADON_ROUTE_3, 0 + connection north, BirdonRoute3, BIRDON_ROUTE_3, 0 connection east, Newtype, NEWTYPE, 0 Route15_MapEvents:: dw $4000 ; unknown def_warp_events - warp_event 8, 5, BAADON_ROUTE_GATE_NEWTYPE, 1, 68 - warp_event 9, 5, BAADON_ROUTE_GATE_NEWTYPE, 2, 68 + warp_event 8, 5, BIRDON_ROUTE_GATE_NEWTYPE, 1, 68 + warp_event 9, 5, BIRDON_ROUTE_GATE_NEWTYPE, 2, 68 warp_event 9, 10, ROUTE_15_POKECENTER_1F, 1, 131 warp_event 14, 12, ROUTE_15, 6, 155 warp_event 14, 13, ROUTE_15, 7, 155 diff --git a/data/maps/objects/Route18.asm b/data/maps/objects/Route18.asm index 3a17ff5b..9cbca7ac 100644 --- a/data/maps/objects/Route18.asm +++ b/data/maps/objects/Route18.asm @@ -3,7 +3,7 @@ INCLUDE "constants.asm" SECTION "data/maps/objects/Route18.asm", ROMX map_attributes Route18, ROUTE_18, NORTH | WEST - connection north, BullForestRoute1, BULL_FOREST_ROUTE_1, 0 + connection north, BlueForestRoute1, BLUE_FOREST_ROUTE_1, 0 connection west, NewtypeRoute, NEWTYPE_ROUTE, 36 Route18_MapEvents:: diff --git a/data/maps/objects/Route1P1.asm b/data/maps/objects/Route1P1.asm index a757da22..0c9e61b2 100644 --- a/data/maps/objects/Route1P1.asm +++ b/data/maps/objects/Route1P1.asm @@ -10,8 +10,8 @@ Route1P1_MapEvents:: dw $4000 ; unknown def_warp_events - warp_event 8, 8, SHIZUKANA_OKA, 2, 110 - warp_event 8, 9, SHIZUKANA_OKA, 3, 110 + warp_event 8, 8, SILENT_HILLS, 2, 110 + warp_event 8, 9, SILENT_HILLS, 3, 110 def_bg_events bg_event 12, 7, 1 diff --git a/data/maps/objects/Route1P2.asm b/data/maps/objects/Route1P2.asm index 7cab0aec..bd852bfa 100644 --- a/data/maps/objects/Route1P2.asm +++ b/data/maps/objects/Route1P2.asm @@ -12,8 +12,8 @@ Route1P2_MapEvents:: def_warp_events warp_event 8, 5, ROUTE_1_GATE_1F, 1, 53 warp_event 9, 5, ROUTE_1_GATE_1F, 2, 53 - warp_event 8, 25, SHIZUKANA_OKA, 6, 213 - warp_event 9, 25, SHIZUKANA_OKA, 9, 213 + warp_event 8, 25, SILENT_HILLS, 6, 213 + warp_event 9, 25, SILENT_HILLS, 9, 213 def_bg_events bg_event 10, 20, 1 diff --git a/data/maps/objects/ShizukanaOka.asm b/data/maps/objects/SilentHills.asm similarity index 86% rename from data/maps/objects/ShizukanaOka.asm rename to data/maps/objects/SilentHills.asm index 2c62398c..102d5cbb 100644 --- a/data/maps/objects/ShizukanaOka.asm +++ b/data/maps/objects/SilentHills.asm @@ -1,10 +1,10 @@ INCLUDE "constants.asm" -SECTION "data/maps/objects/ShizukanaOka.asm", ROMX +SECTION "data/maps/objects/SilentHills.asm", ROMX - map_attributes ShizukanaOka, SHIZUKANA_OKA, 0 + map_attributes SilentHills, SILENT_HILLS, 0 -ShizukanaOka_MapEvents:: +SilentHills_MapEvents:: dw $4000 ; unknown def_warp_events @@ -31,5 +31,5 @@ ShizukanaOka_MapEvents:: object_event 36, 16, SPRITE_TEACHER, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 5, 0, 0 object_event 9, 25, SPRITE_YOUNGSTER, SPRITEMOVEFN_TURN_RIGHT, 0, 0, -1, -1, 0, 0, 0, 4, 0, 0 -ShizukanaOka_Blocks:: -INCBIN "maps/ShizukanaOka.blk" +SilentHills_Blocks:: +INCBIN "maps/SilentHills.blk" diff --git a/data/maps/objects/South.asm b/data/maps/objects/South.asm index 2a189be0..ab748bb1 100644 --- a/data/maps/objects/South.asm +++ b/data/maps/objects/South.asm @@ -3,9 +3,9 @@ INCLUDE "constants.asm" SECTION "data/maps/objects/South.asm", ROMX map_attributes South, SOUTH, NORTH | SOUTH | EAST - connection north, FontoRoute5, FONTO_ROUTE_5, 10 - connection south, HaitekuWestRouteOcean, HAITEKU_WEST_ROUTE_OCEAN, 10 - connection east, FontoRoute1, FONTO_ROUTE_1, 0 + connection north, FontRoute5, FONT_ROUTE_5, 10 + connection south, HighTechWestRouteOcean, HIGHTECH_WEST_ROUTE_OCEAN, 10 + connection east, FontRoute1, FONT_ROUTE_1, 0 South_MapEvents:: dw $4000 ; unknown @@ -15,11 +15,11 @@ South_MapEvents:: warp_event 33, 14, SOUTH_POKECENTER_1F, 1, 225 warp_event 19, 22, SOUTH_MART, 1, 322 warp_event 33, 23, SOUTH_HOUSE_2, 1, 329 - warp_event 30, 5, FONTO_ROUTE_GATE_3, 1, 94 - warp_event 31, 5, FONTO_ROUTE_GATE_3, 2, 94 - warp_event 35, 19, FONTO_ROUTE_GATE_1, 2, 278 - warp_event 30, 30, HAITEKU_WEST_ROUTE_GATE, 3, 432 - warp_event 31, 30, HAITEKU_WEST_ROUTE_GATE, 4, 432 + warp_event 30, 5, FONT_ROUTE_GATE_3, 1, 94 + warp_event 31, 5, FONT_ROUTE_GATE_3, 2, 94 + warp_event 35, 19, FONT_ROUTE_GATE_1, 2, 278 + warp_event 30, 30, HIGHTECH_WEST_ROUTE_GATE, 3, 432 + warp_event 31, 30, HIGHTECH_WEST_ROUTE_GATE, 4, 432 def_bg_events bg_event 30, 14, 1 diff --git a/data/maps/objects/Stand.asm b/data/maps/objects/Stand.asm index 88dff821..b635bb65 100644 --- a/data/maps/objects/Stand.asm +++ b/data/maps/objects/Stand.asm @@ -3,7 +3,7 @@ INCLUDE "constants.asm" SECTION "data/maps/objects/Stand.asm", ROMX map_attributes Stand, STAND, NORTH | SOUTH - connection north, BullForestRoute2, BULL_FOREST_ROUTE_2, 10 + connection north, BlueForestRoute2, BLUE_FOREST_ROUTE_2, 10 connection south, StandRoute, STAND_ROUTE, 10 Stand_MapEvents:: @@ -18,8 +18,8 @@ Stand_MapEvents:: warp_event 17, 31, STAND_ROCKET_HOUSE_1F, 1, 425 warp_event 34, 31, STAND_LEAGUE_1F, 1, 434 warp_event 35, 31, STAND_LEAGUE_1F, 2, 434 - warp_event 30, 13, BULL_FOREST_ROUTE_GATE_STAND, 1, 198 - warp_event 31, 13, BULL_FOREST_ROUTE_GATE_STAND, 2, 198 + warp_event 30, 13, BLUE_FOREST_ROUTE_GATE_STAND, 1, 198 + warp_event 31, 13, BLUE_FOREST_ROUTE_GATE_STAND, 2, 198 def_bg_events bg_event 8, 8, 1 diff --git a/data/maps/objects/West.asm b/data/maps/objects/West.asm index 3b0724cb..f2dd6673 100644 --- a/data/maps/objects/West.asm +++ b/data/maps/objects/West.asm @@ -3,7 +3,7 @@ INCLUDE "constants.asm" SECTION "data/maps/objects/West.asm", ROMX map_attributes West, WEST, NORTH | EAST - connection north, BaadonRoute1, BAADON_ROUTE_1, 5 + connection north, BirdonRoute1, BIRDON_ROUTE_1, 5 connection east, Route2, ROUTE_2, 5 West_MapEvents:: @@ -20,8 +20,8 @@ West_MapEvents:: warp_event 15, 19, WEST_GYM, 2, 268 warp_event 26, 19, WEST_HOUSE_1, 1, 274 warp_event 32, 19, WEST_HOUSE_2, 1, 277 - warp_event 22, 5, BAADON_ROUTE_GATE_WEST, 1, 90 - warp_event 23, 5, BAADON_ROUTE_GATE_WEST, 2, 90 + warp_event 22, 5, BIRDON_ROUTE_GATE_WEST, 1, 90 + warp_event 23, 5, BIRDON_ROUTE_GATE_WEST, 2, 90 warp_event 35, 15, ROUTE_2_GATE_1F, 1, 226 def_bg_events diff --git a/data/maps/spawn_points.asm b/data/maps/spawn_points.asm index 908ef0a6..db572fb0 100644 --- a/data/maps/spawn_points.asm +++ b/data/maps/spawn_points.asm @@ -13,12 +13,12 @@ SpawnPoints: db GROUP_SILENT_HILL, MAP_SILENT_HILL, $05, $05 db GROUP_OLD_CITY, MAP_OLD_CITY, $1b, $1d db GROUP_WEST, MAP_WEST, $19, $0f - db GROUP_HAITEKU, MAP_HAITEKU, $1f, $0b - db GROUP_FONTO, MAP_FONTO, $03, $0d - db GROUP_BAADON, MAP_BAADON, $0f, $05 + db GROUP_HIGHTECH, MAP_HIGHTECH, $1f, $0b + db GROUP_FONT, MAP_FONT, $03, $0d + db GROUP_BIRDON, MAP_BIRDON, $0f, $05 db GROUP_NEWTYPE, MAP_NEWTYPE, $07, $09 db GROUP_SUGAR, MAP_SUGAR, $09, $0b - db GROUP_BULL_FOREST, MAP_BULL_FOREST, $0d, $13 + db GROUP_BLUE_FOREST, MAP_BLUE_FOREST, $0d, $13 db GROUP_STAND, MAP_STAND, $21, $15 db GROUP_KANTO, MAP_KANTO, $31, $1f db GROUP_PRINCE, MAP_PRINCE, $05, $05 @@ -58,15 +58,15 @@ SpawnPoints: db GROUP_OLD_CITY_GYM, MAP_OLD_CITY_GYM, $06, $06 db GROUP_WEST_GYM, MAP_WEST_GYM, $06, $06 - db GROUP_HAITEKU_LEAGUE_2F, MAP_HAITEKU_LEAGUE_2F, $06, $06 - db GROUP_BAADON_LEAGUE_2F, MAP_BAADON_LEAGUE_2F, $06, $06 + db GROUP_HIGHTECH_LEAGUE_2F, MAP_HIGHTECH_LEAGUE_2F, $06, $06 + db GROUP_BIRDON_LEAGUE_2F, MAP_BIRDON_LEAGUE_2F, $06, $06 db GROUP_NEWTYPE_LEAGUE_2F, MAP_NEWTYPE_LEAGUE_2F, $06, $06 - db GROUP_BULL_LEAGUE_2F, MAP_BULL_LEAGUE_2F, $06, $06 + db GROUP_BLUE_LEAGUE_2F, MAP_BLUE_LEAGUE_2F, $06, $06 db GROUP_STAND_LEAGUE_2F, MAP_STAND_LEAGUE_2F, $06, $06 db GROUP_KANTO_LEAGUE_2F, MAP_KANTO_LEAGUE_2F, $06, $06 db GROUP_KANTO_LEAGUE_2_2F, MAP_KANTO_LEAGUE_2_2F, $06, $06 ; Only appears in debug menu, likely for the purposes of testing the demo - db GROUP_SHIZUKANA_OKA, MAP_SHIZUKANA_OKA, $10, $10 + db GROUP_SILENT_HILLS, MAP_SILENT_HILLS, $10, $10 db $ff, $ff, $ff, $ff \ No newline at end of file diff --git a/data/maps/sprite_sets.asm b/data/maps/sprite_sets.asm index 663e66c5..09eb67e5 100644 --- a/data/maps/sprite_sets.asm +++ b/data/maps/sprite_sets.asm @@ -11,12 +11,12 @@ MapGroupSpriteSets: db $01 ; MAPGROUP_SILENT db $02 ; MAPGROUP_OLD db $03 ; MAPGROUP_WEST - db $04 ; MAPGROUP_HAITEKU - db $05 ; MAPGROUP_FONTO - db $06 ; MAPGROUP_BAADON + db $04 ; MAPGROUP_HIGHTECH + db $05 ; MAPGROUP_FONT + db $06 ; MAPGROUP_BIRDON db $07 ; MAPGROUP_NEWTYPE db $08 ; MAPGROUP_SUGAR - db $0e ; MAPGROUP_BULL + db $0e ; MAPGROUP_BLUE db $09 ; MAPGROUP_STAND db $0a ; MAPGROUP_KANTO db $0b ; MAPGROUP_PRINCE diff --git a/data/sgb/super_palettes.inc b/data/sgb/super_palettes.inc index 593d77d4..9eae2d98 100644 --- a/data/sgb/super_palettes.inc +++ b/data/sgb/super_palettes.inc @@ -5,12 +5,12 @@ SuperPalettes:: RGB 28,28,28, 18,18,18, 15,20,20, 04,04,04 ; TOWN_WEST RGB 28,28,28, 16,21,30, 15,20,20, 04,04,04 ; TOWN_NEWTYPE RGB 28,28,28, 25,19,31, 15,20,20, 04,04,04 ; TOWN_SUGAR - RGB 28,28,28, 31,20,00, 15,20,20, 04,04,04 ; TOWN_FONTO + RGB 28,28,28, 31,20,00, 15,20,20, 04,04,04 ; TOWN_FONT RGB 28,28,28, 12,28,22, 15,20,20, 04,04,04 ; TOWN_SILENTHILL - RGB 28,28,28, 31,17,21, 15,20,20, 04,04,04 ; TOWN_HAITEKU + RGB 28,28,28, 31,17,21, 15,20,20, 04,04,04 ; TOWN_HIGHTECH RGB 28,28,28, 26,10,06, 15,20,20, 04,04,04 ; TOWN_SOUTH - RGB 28,28,28, 18,14,31, 15,20,20, 04,04,04 ; TOWN_BULL - RGB 28,28,28, 29,26,03, 15,20,20, 04,04,04 ; TOWN_BAADON + RGB 28,28,28, 18,14,31, 15,20,20, 04,04,04 ; TOWN_BLUE + RGB 28,28,28, 29,26,03, 15,20,20, 04,04,04 ; TOWN_BIRDON RGB 28,28,28, 21,14,09, 15,20,20, 04,04,04 ; TOWN_OLDCITY RGB 28,28,28, 12,28,22, 15,20,20, 04,04,04 ; NIGHTTIME RGB 28,28,28, 07,07,07, 02,03,03, 04,04,04 ; BLACK diff --git a/data/tileset_anims.asm b/data/tileset_anims.asm index f9eb323d..86d45223 100644 --- a/data/tileset_anims.asm +++ b/data/tileset_anims.asm @@ -58,7 +58,7 @@ TilesetGenericAnim: tileframe WriteTileFromAnimBuffer, vTileset tile $53 tileframe DoneTileAnimation -TilesetFontoAnim: +TilesetFontAnim: ; UnusedTilesetAnim4 in pokegold/pokecrystal. ; Scrolls tile $54 like a waterfall; scrolls tile $03 like cave water. tileframe ReadTileToAnimBuffer, vTileset tile $54 diff --git a/data/tileset_headers.asm b/data/tileset_headers.asm index 48180687..91f07d0c 100644 --- a/data/tileset_headers.asm +++ b/data/tileset_headers.asm @@ -14,10 +14,10 @@ Tilesets: tileset SilentHill, TilesetGenericAnim tileset OldCity, TilesetWaterAnim tileset West, TilesetFlowerAnim - tileset Haiteku, TilesetFlowerAnim - tileset Baadon, TilesetWaterAnim - tileset Fonto, TilesetFontoAnim - tileset BullForest, TilesetWaterAnim + tileset HighTech, TilesetFlowerAnim + tileset Birdon, TilesetWaterAnim + tileset Font, TilesetFontAnim + tileset North, TilesetWaterAnim tileset Kanto, TilesetFlowerAnim tileset South, TilesetWaterAnim tileset House, TilesetNoAnim diff --git a/data/tilesets/baadon_collision.bin b/data/tilesets/birdon_collision.bin similarity index 100% rename from data/tilesets/baadon_collision.bin rename to data/tilesets/birdon_collision.bin diff --git a/data/tilesets/baadon_metatiles.bin b/data/tilesets/birdon_metatiles.bin similarity index 100% rename from data/tilesets/baadon_metatiles.bin rename to data/tilesets/birdon_metatiles.bin diff --git a/data/tilesets/fonto_collision.bin b/data/tilesets/font_collision.bin similarity index 100% rename from data/tilesets/fonto_collision.bin rename to data/tilesets/font_collision.bin diff --git a/data/tilesets/fonto_metatiles.bin b/data/tilesets/font_metatiles.bin similarity index 100% rename from data/tilesets/fonto_metatiles.bin rename to data/tilesets/font_metatiles.bin diff --git a/data/tilesets/haiteku_collision.bin b/data/tilesets/hightech_collision.bin similarity index 100% rename from data/tilesets/haiteku_collision.bin rename to data/tilesets/hightech_collision.bin diff --git a/data/tilesets/haiteku_metatiles.bin b/data/tilesets/hightech_metatiles.bin similarity index 100% rename from data/tilesets/haiteku_metatiles.bin rename to data/tilesets/hightech_metatiles.bin diff --git a/data/tilesets/bull_forest_collision.bin b/data/tilesets/north_collision.bin similarity index 100% rename from data/tilesets/bull_forest_collision.bin rename to data/tilesets/north_collision.bin diff --git a/data/tilesets/bull_forest_metatiles.bin b/data/tilesets/north_metatiles.bin similarity index 100% rename from data/tilesets/bull_forest_metatiles.bin rename to data/tilesets/north_metatiles.bin diff --git a/data/wild/grassmons.inc b/data/wild/grassmons.inc index 4db75c28..9fd0a263 100644 --- a/data/wild/grassmons.inc +++ b/data/wild/grassmons.inc @@ -103,7 +103,7 @@ endc db 11, DEX_ODDISH db 13, DEX_ODDISH - map_id BAADON_ROUTE_1 + map_id BIRDON_ROUTE_1 db 6 percent, 10 percent, 14 percent ; encounter rates: morn/day/nite ; morn db 19, DEX_DITTO @@ -127,7 +127,7 @@ endc db 23, DEX_DROWZEE db 23, DEX_DROWZEE - map_id HAITEKU_WEST_ROUTE + map_id HIGHTECH_WEST_ROUTE db 6 percent, 10 percent, 14 percent ; encounter rates: morn/day/nite ; morn db 12, DEX_EXEGGCUTE @@ -151,7 +151,7 @@ endc db 16, DEX_EKANS db 16, DEX_EKANS - map_id HAITEKU_WEST_ROUTE_OCEAN + map_id HIGHTECH_WEST_ROUTE_OCEAN db 6 percent, 10 percent, 14 percent ; encounter rates: morn/day/nite ; morn db 25, DEX_TENTACOOL @@ -175,7 +175,7 @@ endc db 35, DEX_HANEEI db 45, DEX_TENTACOOL - map_id FONTO_ROUTE_1 + map_id FONT_ROUTE_1 db 6 percent, 10 percent, 14 percent ; encounter rates: morn/day/nite ; morn db 25, DEX_TENTACOOL @@ -199,7 +199,7 @@ endc db 35, DEX_HANEEI db 45, DEX_TENTACOOL - map_id FONTO_ROUTE_2 + map_id FONT_ROUTE_2 db 6 percent, 10 percent, 14 percent ; encounter rates: morn/day/nite ; morn db 25, DEX_TENTACOOL @@ -223,7 +223,7 @@ endc db 35, DEX_HANEEI db 45, DEX_TENTACOOL - map_id FONTO_ROUTE_3 + map_id FONT_ROUTE_3 db 6 percent, 10 percent, 14 percent ; encounter rates: morn/day/nite ; morn db 16, DEX_MACHOP @@ -247,7 +247,7 @@ endc db 20, DEX_DROWZEE db 20, DEX_DROWZEE - map_id FONTO_ROUTE_4 + map_id FONT_ROUTE_4 db 6 percent, 10 percent, 14 percent ; encounter rates: morn/day/nite ; morn db 17, DEX_SPEAROW @@ -271,7 +271,7 @@ endc db 21, DEX_BULU db 21, DEX_BULU - map_id BAADON_ROUTE_2 + map_id BIRDON_ROUTE_2 db 6 percent, 10 percent, 14 percent ; encounter rates: morn/day/nite ; morn db 21, DEX_SPEAROW @@ -295,7 +295,7 @@ endc db 25, DEX_BULU db 25, DEX_BULU - map_id BAADON_ROUTE_3 + map_id BIRDON_ROUTE_3 db 6 percent, 10 percent, 14 percent ; encounter rates: morn/day/nite ; morn db 23, DEX_HANEKO @@ -415,7 +415,7 @@ endc db 36, DEX_HYPNO db 36, DEX_WOLFMAN - map_id BULL_FOREST_ROUTE_1 + map_id BLUE_FOREST_ROUTE_1 db 6 percent, 10 percent, 14 percent ; encounter rates: morn/day/nite ; morn db 29, DEX_REDIBA @@ -439,7 +439,7 @@ endc db 37, DEX_WOLFMAN db 37, DEX_WOLFMAN - map_id BULL_FOREST_ROUTE_2 + map_id BLUE_FOREST_ROUTE_2 db 6 percent, 10 percent, 14 percent ; encounter rates: morn/day/nite ; morn db 32, DEX_MILTANK @@ -535,7 +535,7 @@ endc db 35, DEX_ARBOK db 35, DEX_HOHO - map_id FONTO_ROUTE_5 + map_id FONT_ROUTE_5 db 6 percent, 10 percent, 14 percent ; encounter rates: morn/day/nite ; morn db 25, DEX_TENTACOOL @@ -559,7 +559,7 @@ endc db 35, DEX_HANEEI db 45, DEX_TENTACOOL - map_id FONTO_ROUTE_6 + map_id FONT_ROUTE_6 db 6 percent, 10 percent, 14 percent ; encounter rates: morn/day/nite ; morn db 25, DEX_TENTACOOL @@ -583,7 +583,7 @@ endc db 35, DEX_HANEEI db 45, DEX_TENTACOOL - map_id BULL_FOREST_ROUTE_3 + map_id BLUE_FOREST_ROUTE_3 db 6 percent, 10 percent, 14 percent ; encounter rates: morn/day/nite ; morn db 25, DEX_TENTACOOL @@ -607,7 +607,7 @@ endc db 35, DEX_TENTACRUEL db 45, DEX_TENTACOOL - map_id SHIZUKANA_OKA + map_id SILENT_HILLS db 8 percent, 8 percent, 8 percent ; encounter rates: morn/day/nite ; morn db 7, DEX_REDIBA diff --git a/engine/gfx/sgb_layouts.asm b/engine/gfx/sgb_layouts.asm index c509b978..e0abb7e7 100644 --- a/engine/gfx/sgb_layouts.asm +++ b/engine/gfx/sgb_layouts.asm @@ -406,12 +406,12 @@ MapGroupPalettes: db PAL_TOWN_SILENTHILL ; Silent Hill db PAL_TOWN_OLDCITY ; Old City db PAL_TOWN_WEST ; West - db PAL_TOWN_HAITEKU ; Haiteku - db PAL_TOWN_FONTO ; Fonto - db PAL_TOWN_BAADON ; Baadon + db PAL_TOWN_HIGHTECH ; HighTech + db PAL_TOWN_FONT ; Font + db PAL_TOWN_BIRDON ; Birdon db PAL_TOWN_NEWTYPE ; Newtype db PAL_TOWN_SUGAR ; Sugar - db PAL_TOWN_BULL ; Bull + db PAL_TOWN_BLUE ; Blue db PAL_TOWN_STAND ; Stand db PAL_TOWN_WEST ; Kanto db PAL_TOWN_STAND ; Prince diff --git a/engine/menu/empty_sram.asm b/engine/menu/empty_sram.asm index 936d69d2..363dd4f4 100644 --- a/engine/menu/empty_sram.asm +++ b/engine/menu/empty_sram.asm @@ -409,7 +409,7 @@ UnknownMapBufferPointers: db $01, $02, $A2, $D2, $72, $7C, $A2, $D3 ; ROUTE1P2 db $01, $05, $A3, $D2, $6B, $40, $A3, $D3 ; ROUTE1_GATE_1F db $01, $06, $A4, $D2, $29, $41, $A4, $D3 ; ROUTE1_GATE_2F - db $01, $0F, $A5, $D2, $55, $56, $A5, $D3 ; SHIZUKANA_OKA + db $01, $0F, $A5, $D2, $55, $56, $A5, $D3 ; SILENT_HILLS db $02, $11, $A6, $D2, $8F, $47, $A6, $D3 ; OLD_CITY_POKECENTER_2F db -1 diff --git a/gfx/gfx.asm b/gfx/gfx.asm index 3e903e34..7b1379fd 100644 --- a/gfx/gfx.asm +++ b/gfx/gfx.asm @@ -156,37 +156,37 @@ INCBIN "data/tilesets/aquarium_metatiles.bin" Aquarium_Coll: INCBIN "data/tilesets/aquarium_collision.bin" -SECTION "gfx.asm@Bank 7 Tilesets Bull Forest", ROMX -BullForest_GFX: -INCBIN "gfx/tilesets/bull_forest.common.2bpp" -BullForest_Meta: -INCBIN "data/tilesets/bull_forest_metatiles.bin" -BullForest_Coll: -INCBIN "data/tilesets/bull_forest_collision.bin" +SECTION "gfx.asm@Bank 7 Tilesets North", ROMX +North_GFX: +INCBIN "gfx/tilesets/north.common.2bpp" +North_Meta: +INCBIN "data/tilesets/north_metatiles.bin" +North_Coll: +INCBIN "data/tilesets/north_collision.bin" -SECTION "gfx.asm@Bank 7 Tilesets Fonto", ROMX -Fonto_GFX: -INCBIN "gfx/tilesets/fonto.common.2bpp" -Fonto_Meta: -INCBIN "data/tilesets/fonto_metatiles.bin" -Fonto_Coll: -INCBIN "data/tilesets/fonto_collision.bin" +SECTION "gfx.asm@Bank 7 Tilesets Font", ROMX +Font_GFX: +INCBIN "gfx/tilesets/font.common.2bpp" +Font_Meta: +INCBIN "data/tilesets/font_metatiles.bin" +Font_Coll: +INCBIN "data/tilesets/font_collision.bin" -SECTION "gfx.asm@Bank 7 Tilesets Haiteku", ROMX -Haiteku_GFX: -INCBIN "gfx/tilesets/haiteku.common.2bpp" -Haiteku_Meta: -INCBIN "data/tilesets/haiteku_metatiles.bin" -Haiteku_Coll: -INCBIN "data/tilesets/haiteku_collision.bin" +SECTION "gfx.asm@Bank 7 Tilesets HighTech", ROMX +HighTech_GFX: +INCBIN "gfx/tilesets/hightech.common.2bpp" +HighTech_Meta: +INCBIN "data/tilesets/hightech_metatiles.bin" +HighTech_Coll: +INCBIN "data/tilesets/hightech_collision.bin" -SECTION "gfx.asm@Bank 8 Tilesets Baadon", ROMX -Baadon_GFX: -INCBIN "gfx/tilesets/baadon.common.2bpp" -Baadon_Meta: -INCBIN "data/tilesets/baadon_metatiles.bin" -Baadon_Coll: -INCBIN "data/tilesets/baadon_collision.bin" +SECTION "gfx.asm@Bank 8 Tilesets Birdon", ROMX +Birdon_GFX: +INCBIN "gfx/tilesets/birdon.common.2bpp" +Birdon_Meta: +INCBIN "data/tilesets/birdon_metatiles.bin" +Birdon_Coll: +INCBIN "data/tilesets/birdon_collision.bin" SECTION "gfx.asm@Bank 8 Tilesets Kanto", ROMX Kanto_GFX: diff --git a/gfx/tilesets/baadon.common.png b/gfx/tilesets/birdon.common.png similarity index 100% rename from gfx/tilesets/baadon.common.png rename to gfx/tilesets/birdon.common.png diff --git a/gfx/tilesets/fonto.common.png b/gfx/tilesets/font.common.png similarity index 100% rename from gfx/tilesets/fonto.common.png rename to gfx/tilesets/font.common.png diff --git a/gfx/tilesets/haiteku.common.png b/gfx/tilesets/hightech.common.png similarity index 100% rename from gfx/tilesets/haiteku.common.png rename to gfx/tilesets/hightech.common.png diff --git a/gfx/tilesets/bull_forest.common.png b/gfx/tilesets/north.common.png similarity index 100% rename from gfx/tilesets/bull_forest.common.png rename to gfx/tilesets/north.common.png diff --git a/layout.link b/layout.link index 63c5e5ab..858eb85a 100644 --- a/layout.link +++ b/layout.link @@ -210,15 +210,15 @@ ROMX $07 org $4b00 "gfx.asm@Bank 7 Tilesets Aquarium" org $5600 - "gfx.asm@Bank 7 Tilesets Bull Forest" + "gfx.asm@Bank 7 Tilesets North" org $6400 - "gfx.asm@Bank 7 Tilesets Fonto" + "gfx.asm@Bank 7 Tilesets Font" org $7200 - "gfx.asm@Bank 7 Tilesets Haiteku" + "gfx.asm@Bank 7 Tilesets HighTech" ROMX $08 org $4000 - "gfx.asm@Bank 8 Tilesets Baadon" + "gfx.asm@Bank 8 Tilesets Birdon" org $4e00 "gfx.asm@Bank 8 Tilesets Kanto" org $5c00 @@ -494,66 +494,66 @@ ROMX $26 ROMX $27 org $4000 - "data/maps/objects/HaitekuWestRouteGate.asm" - "scripts/HaitekuWestRouteGate.asm" - "data/maps/objects/HaitekuPokecenter1F.asm" - "scripts/HaitekuPokecenter1F.asm" - "data/maps/objects/HaitekuPokecenter2F.asm" - "scripts/HaitekuPokecenter2F.asm" - "data/maps/objects/HaitekuLeague1F.asm" - "scripts/HaitekuLeague1F.asm" - "data/maps/objects/HaitekuLeague2F.asm" - "scripts/HaitekuLeague2F.asm" - "data/maps/objects/HaitekuMart.asm" - "scripts/HaitekuMart.asm" - "data/maps/objects/HaitekuHouse1.asm" - "scripts/HaitekuHouse1.asm" - "data/maps/objects/HaitekuHouse2.asm" - "scripts/HaitekuHouse2.asm" - "data/maps/objects/HaitekuImposterOakHouse.asm" - "scripts/HaitekuImposterOakHouse.asm" - "data/maps/objects/HaitekuAquarium1F.asm" - "scripts/HaitekuAquarium1F.asm" - "data/maps/objects/HaitekuAquarium2F.asm" - "scripts/HaitekuAquarium2F.asm" - "data/maps/objects/FontoRouteGate1.asm" - "scripts/FontoRouteGate1.asm" - "data/maps/objects/FontoRouteGate2.asm" - "scripts/FontoRouteGate2.asm" - "data/maps/objects/FontoRouteGate3.asm" - "scripts/FontoRouteGate3.asm" - "data/maps/objects/FontoRocketHouse.asm" - "scripts/FontoRocketHouse.asm" - "data/maps/objects/FontoMart.asm" - "scripts/FontoMart.asm" - "data/maps/objects/FontoHouse.asm" - "scripts/FontoHouse.asm" - "data/maps/objects/FontoPokecenter1F.asm" - "scripts/FontoPokecenter1F.asm" - "data/maps/objects/FontoPokecenter2F.asm" - "scripts/FontoPokecenter2F.asm" - "data/maps/objects/FontoLab.asm" - "scripts/FontoLab.asm" - "data/maps/objects/BaadonMart.asm" - "scripts/BaadonMart.asm" - "data/maps/objects/BaadonPokecenter1F.asm" - "scripts/BaadonPokecenter1F.asm" - "data/maps/objects/BaadonPokecenter2F.asm" - "scripts/BaadonPokecenter2F.asm" - "data/maps/objects/BaadonHouse1.asm" - "scripts/BaadonHouse1.asm" - "data/maps/objects/BaadonWallpaperHouse.asm" - "scripts/BaadonWallpaperHouse.asm" - "data/maps/objects/BaadonHouse2.asm" - "scripts/BaadonHouse2.asm" - "data/maps/objects/BaadonLeague1F.asm" - "scripts/BaadonLeague1F.asm" - "data/maps/objects/BaadonLeague2F.asm" - "scripts/BaadonLeague2F.asm" - "data/maps/objects/BaadonRouteGateWest.asm" - "scripts/BaadonRouteGateWest.asm" - "data/maps/objects/BaadonRouteGateNewtype.asm" - "scripts/BaadonRouteGateNewtype.asm" + "data/maps/objects/HighTechWestRouteGate.asm" + "scripts/HighTechWestRouteGate.asm" + "data/maps/objects/HighTechPokecenter1F.asm" + "scripts/HighTechPokecenter1F.asm" + "data/maps/objects/HighTechPokecenter2F.asm" + "scripts/HighTechPokecenter2F.asm" + "data/maps/objects/HighTechLeague1F.asm" + "scripts/HighTechLeague1F.asm" + "data/maps/objects/HighTechLeague2F.asm" + "scripts/HighTechLeague2F.asm" + "data/maps/objects/HighTechMart.asm" + "scripts/HighTechMart.asm" + "data/maps/objects/HighTechHouse1.asm" + "scripts/HighTechHouse1.asm" + "data/maps/objects/HighTechHouse2.asm" + "scripts/HighTechHouse2.asm" + "data/maps/objects/HighTechImposterOakHouse.asm" + "scripts/HighTechImposterOakHouse.asm" + "data/maps/objects/HighTechAquarium1F.asm" + "scripts/HighTechAquarium1F.asm" + "data/maps/objects/HighTechAquarium2F.asm" + "scripts/HighTechAquarium2F.asm" + "data/maps/objects/FontRouteGate1.asm" + "scripts/FontRouteGate1.asm" + "data/maps/objects/FontRouteGate2.asm" + "scripts/FontRouteGate2.asm" + "data/maps/objects/FontRouteGate3.asm" + "scripts/FontRouteGate3.asm" + "data/maps/objects/FontRocketHouse.asm" + "scripts/FontRocketHouse.asm" + "data/maps/objects/FontMart.asm" + "scripts/FontMart.asm" + "data/maps/objects/FontHouse.asm" + "scripts/FontHouse.asm" + "data/maps/objects/FontPokecenter1F.asm" + "scripts/FontPokecenter1F.asm" + "data/maps/objects/FontPokecenter2F.asm" + "scripts/FontPokecenter2F.asm" + "data/maps/objects/FontLab.asm" + "scripts/FontLab.asm" + "data/maps/objects/BirdonMart.asm" + "scripts/BirdonMart.asm" + "data/maps/objects/BirdonPokecenter1F.asm" + "scripts/BirdonPokecenter1F.asm" + "data/maps/objects/BirdonPokecenter2F.asm" + "scripts/BirdonPokecenter2F.asm" + "data/maps/objects/BirdonHouse1.asm" + "scripts/BirdonHouse1.asm" + "data/maps/objects/BirdonWallpaperHouse.asm" + "scripts/BirdonWallpaperHouse.asm" + "data/maps/objects/BirdonHouse2.asm" + "scripts/BirdonHouse2.asm" + "data/maps/objects/BirdonLeague1F.asm" + "scripts/BirdonLeague1F.asm" + "data/maps/objects/BirdonLeague2F.asm" + "scripts/BirdonLeague2F.asm" + "data/maps/objects/BirdonRouteGateWest.asm" + "scripts/BirdonRouteGateWest.asm" + "data/maps/objects/BirdonRouteGateNewtype.asm" + "scripts/BirdonRouteGateNewtype.asm" "data/maps/objects/NewtypePokecenter1F.asm" "scripts/NewtypePokecenter1F.asm" "data/maps/objects/NewtypePokecenter2F.asm" @@ -598,28 +598,28 @@ ROMX $27 "scripts/SugarPokecenter1F.asm" "data/maps/objects/SugarPokecenter2F.asm" "scripts/SugarPokecenter2F.asm" - "data/maps/objects/BullForestRoute1House.asm" - "scripts/BullForestRoute1House.asm" - "data/maps/objects/BullForestRouteGateStand.asm" - "scripts/BullForestRouteGateStand.asm" - "data/maps/objects/BullMart.asm" - "scripts/BullMart.asm" - "data/maps/objects/BullHouse1.asm" - "scripts/BullHouse1.asm" - "data/maps/objects/BullHouse2.asm" - "scripts/BullHouse2.asm" - "data/maps/objects/BullHouse3.asm" - "scripts/BullHouse3.asm" - "data/maps/objects/BullPokecenter1F.asm" - "scripts/BullPokecenter1F.asm" - "data/maps/objects/BullPokecenter2F.asm" - "scripts/BullPokecenter2F.asm" - "data/maps/objects/BullLeague1F.asm" - "scripts/BullLeague1F.asm" - "data/maps/objects/BullLeague2F.asm" - "scripts/BullLeague2F.asm" - "data/maps/objects/BullHouse4.asm" - "scripts/BullHouse4.asm" + "data/maps/objects/BlueForestRoute1House.asm" + "scripts/BlueForestRoute1House.asm" + "data/maps/objects/BlueForestRouteGateStand.asm" + "scripts/BlueForestRouteGateStand.asm" + "data/maps/objects/BlueMart.asm" + "scripts/BlueMart.asm" + "data/maps/objects/BlueHouse1.asm" + "scripts/BlueHouse1.asm" + "data/maps/objects/BlueHouse2.asm" + "scripts/BlueHouse2.asm" + "data/maps/objects/BlueHouse3.asm" + "scripts/BlueHouse3.asm" + "data/maps/objects/BluePokecenter1F.asm" + "scripts/BluePokecenter1F.asm" + "data/maps/objects/BluePokecenter2F.asm" + "scripts/BluePokecenter2F.asm" + "data/maps/objects/BlueLeague1F.asm" + "scripts/BlueLeague1F.asm" + "data/maps/objects/BlueLeague2F.asm" + "scripts/BlueLeague2F.asm" + "data/maps/objects/BlueHouse4.asm" + "scripts/BlueHouse4.asm" "data/maps/objects/StandRouteGateKanto.asm" "scripts/StandRouteGateKanto.asm" "data/maps/objects/StandLab.asm" @@ -773,8 +773,8 @@ ROMX $2f "scripts/SlowpokeWellEntrance.asm" "data/maps/objects/SlowpokeWellMain.asm" "scripts/SlowpokeWellMain.asm" - "data/maps/objects/ShizukanaOka.asm" - "scripts/ShizukanaOka.asm" + "data/maps/objects/SilentHills.asm" + "scripts/SilentHills.asm" ROMX $30 org $4000 @@ -826,18 +826,18 @@ ROMX $36 "scripts/OldCity.asm" "data/maps/objects/West.asm" "scripts/West.asm" - "data/maps/objects/Haiteku.asm" - "scripts/Haiteku.asm" - "data/maps/objects/Fonto.asm" - "scripts/Fonto.asm" - "data/maps/objects/Baadon.asm" - "scripts/Baadon.asm" + "data/maps/objects/HighTech.asm" + "scripts/HighTech.asm" + "data/maps/objects/Font.asm" + "scripts/Font.asm" + "data/maps/objects/Birdon.asm" + "scripts/Birdon.asm" "data/maps/objects/Newtype.asm" "scripts/Newtype.asm" "data/maps/objects/Sugar.asm" "scripts/Sugar.asm" - "data/maps/objects/BullForest.asm" - "scripts/BullForest.asm" + "data/maps/objects/BlueForest.asm" + "scripts/BlueForest.asm" "data/maps/objects/Stand.asm" "scripts/Stand.asm" "data/maps/objects/Kanto.asm" @@ -854,38 +854,38 @@ ROMX $36 "data/maps/objects/Route1P2.asm" "data/maps/objects/Route2.asm" "scripts/Route2.asm" - "data/maps/objects/HaitekuWestRoute.asm" - "scripts/HaitekuWestRoute.asm" - "data/maps/objects/HaitekuWestRouteOcean.asm" - "scripts/HaitekuWestRouteOcean.asm" - "data/maps/objects/FontoRoute1.asm" - "scripts/FontoRoute1.asm" - "data/maps/objects/FontoRoute6.asm" - "scripts/FontoRoute6.asm" - "data/maps/objects/FontoRoute2.asm" - "scripts/FontoRoute2.asm" - "data/maps/objects/FontoRoute4.asm" - "scripts/FontoRoute4.asm" - "data/maps/objects/FontoRoute3.asm" - "scripts/FontoRoute3.asm" - "data/maps/objects/BaadonRoute1.asm" - "scripts/BaadonRoute1.asm" - "data/maps/objects/BaadonRoute2.asm" - "scripts/BaadonRoute2.asm" - "data/maps/objects/BaadonRoute3.asm" - "scripts/BaadonRoute3.asm" + "data/maps/objects/HighTechWestRoute.asm" + "scripts/HighTechWestRoute.asm" + "data/maps/objects/HighTechWestRouteOcean.asm" + "scripts/HighTechWestRouteOcean.asm" + "data/maps/objects/FontRoute1.asm" + "scripts/FontRoute1.asm" + "data/maps/objects/FontRoute6.asm" + "scripts/FontRoute6.asm" + "data/maps/objects/FontRoute2.asm" + "scripts/FontRoute2.asm" + "data/maps/objects/FontRoute4.asm" + "scripts/FontRoute4.asm" + "data/maps/objects/FontRoute3.asm" + "scripts/FontRoute3.asm" + "data/maps/objects/BirdonRoute1.asm" + "scripts/BirdonRoute1.asm" + "data/maps/objects/BirdonRoute2.asm" + "scripts/BirdonRoute2.asm" + "data/maps/objects/BirdonRoute3.asm" + "scripts/BirdonRoute3.asm" "data/maps/objects/Route15.asm" "scripts/Route15.asm" "data/maps/objects/NewtypeRoute.asm" "scripts/NewtypeRoute.asm" "data/maps/objects/Route18.asm" "scripts/Route18.asm" - "data/maps/objects/BullForestRoute1.asm" - "scripts/BullForestRoute1.asm" + "data/maps/objects/BlueForestRoute1.asm" + "scripts/BlueForestRoute1.asm" "data/maps/objects/SugarRoute.asm" "scripts/SugarRoute.asm" - "data/maps/objects/BullForestRoute2.asm" - "scripts/BullForestRoute2.asm" + "data/maps/objects/BlueForestRoute2.asm" + "scripts/BlueForestRoute2.asm" "data/maps/objects/StandRoute.asm" "scripts/StandRoute.asm" "data/maps/objects/KantoEastRoute.asm" @@ -896,10 +896,10 @@ ROMX $36 "scripts/PrinceRoute.asm" "data/maps/objects/MtFujiRoute.asm" "scripts/MtFujiRoute.asm" - "data/maps/objects/FontoRoute5.asm" - "scripts/FontoRoute5.asm" - "data/maps/objects/BullForestRoute3.asm" - "scripts/BullForestRoute3.asm" + "data/maps/objects/FontRoute5.asm" + "scripts/FontRoute5.asm" + "data/maps/objects/BlueForestRoute3.asm" + "scripts/BlueForestRoute3.asm" "scripts/SilentHill.asm" "engine/menu/set_time.asm" "scripts/Route1P1.asm" diff --git a/maps/Baadon.blk b/maps/Birdon.blk similarity index 100% rename from maps/Baadon.blk rename to maps/Birdon.blk diff --git a/maps/BaadonHouse1.blk b/maps/BirdonHouse1.blk similarity index 100% rename from maps/BaadonHouse1.blk rename to maps/BirdonHouse1.blk diff --git a/maps/BaadonHouse2.blk b/maps/BirdonHouse2.blk similarity index 100% rename from maps/BaadonHouse2.blk rename to maps/BirdonHouse2.blk diff --git a/maps/BaadonLeague1F.blk b/maps/BirdonLeague1F.blk similarity index 100% rename from maps/BaadonLeague1F.blk rename to maps/BirdonLeague1F.blk diff --git a/maps/BaadonLeague2F.blk b/maps/BirdonLeague2F.blk similarity index 100% rename from maps/BaadonLeague2F.blk rename to maps/BirdonLeague2F.blk diff --git a/maps/BaadonMart.blk b/maps/BirdonMart.blk similarity index 100% rename from maps/BaadonMart.blk rename to maps/BirdonMart.blk diff --git a/maps/BaadonPokecenter1F.blk b/maps/BirdonPokecenter1F.blk similarity index 100% rename from maps/BaadonPokecenter1F.blk rename to maps/BirdonPokecenter1F.blk diff --git a/maps/BaadonPokecenter2F.blk b/maps/BirdonPokecenter2F.blk similarity index 100% rename from maps/BaadonPokecenter2F.blk rename to maps/BirdonPokecenter2F.blk diff --git a/maps/BaadonRoute1.blk b/maps/BirdonRoute1.blk similarity index 100% rename from maps/BaadonRoute1.blk rename to maps/BirdonRoute1.blk diff --git a/maps/BaadonRoute2.blk b/maps/BirdonRoute2.blk similarity index 100% rename from maps/BaadonRoute2.blk rename to maps/BirdonRoute2.blk diff --git a/maps/BaadonRoute3.blk b/maps/BirdonRoute3.blk similarity index 100% rename from maps/BaadonRoute3.blk rename to maps/BirdonRoute3.blk diff --git a/maps/BaadonRouteGateNewtype.blk b/maps/BirdonRouteGateNewtype.blk similarity index 100% rename from maps/BaadonRouteGateNewtype.blk rename to maps/BirdonRouteGateNewtype.blk diff --git a/maps/BaadonRouteGateWest.blk b/maps/BirdonRouteGateWest.blk similarity index 100% rename from maps/BaadonRouteGateWest.blk rename to maps/BirdonRouteGateWest.blk diff --git a/maps/BaadonWallpaperHouse.blk b/maps/BirdonWallpaperHouse.blk similarity index 100% rename from maps/BaadonWallpaperHouse.blk rename to maps/BirdonWallpaperHouse.blk diff --git a/maps/BullForest.blk b/maps/BlueForest.blk similarity index 100% rename from maps/BullForest.blk rename to maps/BlueForest.blk diff --git a/maps/BullForestRoute1.blk b/maps/BlueForestRoute1.blk similarity index 100% rename from maps/BullForestRoute1.blk rename to maps/BlueForestRoute1.blk diff --git a/maps/BullForestRoute1House.blk b/maps/BlueForestRoute1House.blk similarity index 100% rename from maps/BullForestRoute1House.blk rename to maps/BlueForestRoute1House.blk diff --git a/maps/BullForestRoute2.blk b/maps/BlueForestRoute2.blk similarity index 100% rename from maps/BullForestRoute2.blk rename to maps/BlueForestRoute2.blk diff --git a/maps/BullForestRoute3.blk b/maps/BlueForestRoute3.blk similarity index 100% rename from maps/BullForestRoute3.blk rename to maps/BlueForestRoute3.blk diff --git a/maps/BullForestRouteGateStand.blk b/maps/BlueForestRouteGateStand.blk similarity index 100% rename from maps/BullForestRouteGateStand.blk rename to maps/BlueForestRouteGateStand.blk diff --git a/maps/BullHouse1.blk b/maps/BlueHouse1.blk similarity index 100% rename from maps/BullHouse1.blk rename to maps/BlueHouse1.blk diff --git a/maps/BullHouse2.blk b/maps/BlueHouse2.blk similarity index 100% rename from maps/BullHouse2.blk rename to maps/BlueHouse2.blk diff --git a/maps/BullHouse3.blk b/maps/BlueHouse3.blk similarity index 100% rename from maps/BullHouse3.blk rename to maps/BlueHouse3.blk diff --git a/maps/BullHouse4.blk b/maps/BlueHouse4.blk similarity index 100% rename from maps/BullHouse4.blk rename to maps/BlueHouse4.blk diff --git a/maps/BullLeague1F.blk b/maps/BlueLeague1F.blk similarity index 100% rename from maps/BullLeague1F.blk rename to maps/BlueLeague1F.blk diff --git a/maps/BullLeague2F.blk b/maps/BlueLeague2F.blk similarity index 100% rename from maps/BullLeague2F.blk rename to maps/BlueLeague2F.blk diff --git a/maps/BullMart.blk b/maps/BlueMart.blk similarity index 100% rename from maps/BullMart.blk rename to maps/BlueMart.blk diff --git a/maps/BullPokecenter1F.blk b/maps/BluePokecenter1F.blk similarity index 100% rename from maps/BullPokecenter1F.blk rename to maps/BluePokecenter1F.blk diff --git a/maps/BullPokecenter2F.blk b/maps/BluePokecenter2F.blk similarity index 100% rename from maps/BullPokecenter2F.blk rename to maps/BluePokecenter2F.blk diff --git a/maps/Fonto.blk b/maps/Font.blk similarity index 100% rename from maps/Fonto.blk rename to maps/Font.blk diff --git a/maps/FontoHouse.blk b/maps/FontHouse.blk similarity index 100% rename from maps/FontoHouse.blk rename to maps/FontHouse.blk diff --git a/maps/FontoLab.blk b/maps/FontLab.blk similarity index 100% rename from maps/FontoLab.blk rename to maps/FontLab.blk diff --git a/maps/FontoMart.blk b/maps/FontMart.blk similarity index 100% rename from maps/FontoMart.blk rename to maps/FontMart.blk diff --git a/maps/FontoPokecenter1F.blk b/maps/FontPokecenter1F.blk similarity index 100% rename from maps/FontoPokecenter1F.blk rename to maps/FontPokecenter1F.blk diff --git a/maps/FontoPokecenter2F.blk b/maps/FontPokecenter2F.blk similarity index 100% rename from maps/FontoPokecenter2F.blk rename to maps/FontPokecenter2F.blk diff --git a/maps/FontoRocketHouse.blk b/maps/FontRocketHouse.blk similarity index 100% rename from maps/FontoRocketHouse.blk rename to maps/FontRocketHouse.blk diff --git a/maps/FontoRoute1.blk b/maps/FontRoute1.blk similarity index 100% rename from maps/FontoRoute1.blk rename to maps/FontRoute1.blk diff --git a/maps/FontoRoute2.blk b/maps/FontRoute2.blk similarity index 100% rename from maps/FontoRoute2.blk rename to maps/FontRoute2.blk diff --git a/maps/FontoRoute3.blk b/maps/FontRoute3.blk similarity index 100% rename from maps/FontoRoute3.blk rename to maps/FontRoute3.blk diff --git a/maps/FontoRoute4.blk b/maps/FontRoute4.blk similarity index 100% rename from maps/FontoRoute4.blk rename to maps/FontRoute4.blk diff --git a/maps/FontoRoute5.blk b/maps/FontRoute5.blk similarity index 100% rename from maps/FontoRoute5.blk rename to maps/FontRoute5.blk diff --git a/maps/FontoRoute6.blk b/maps/FontRoute6.blk similarity index 100% rename from maps/FontoRoute6.blk rename to maps/FontRoute6.blk diff --git a/maps/FontoRouteGate1.blk b/maps/FontRouteGate1.blk similarity index 100% rename from maps/FontoRouteGate1.blk rename to maps/FontRouteGate1.blk diff --git a/maps/FontoRouteGate2.blk b/maps/FontRouteGate2.blk similarity index 100% rename from maps/FontoRouteGate2.blk rename to maps/FontRouteGate2.blk diff --git a/maps/FontoRouteGate3.blk b/maps/FontRouteGate3.blk similarity index 100% rename from maps/FontoRouteGate3.blk rename to maps/FontRouteGate3.blk diff --git a/maps/Haiteku.blk b/maps/HighTech.blk similarity index 100% rename from maps/Haiteku.blk rename to maps/HighTech.blk diff --git a/maps/HaitekuAquarium1F.blk b/maps/HighTechAquarium1F.blk similarity index 100% rename from maps/HaitekuAquarium1F.blk rename to maps/HighTechAquarium1F.blk diff --git a/maps/HaitekuAquarium2F.blk b/maps/HighTechAquarium2F.blk similarity index 100% rename from maps/HaitekuAquarium2F.blk rename to maps/HighTechAquarium2F.blk diff --git a/maps/HaitekuHouse1.blk b/maps/HighTechHouse1.blk similarity index 100% rename from maps/HaitekuHouse1.blk rename to maps/HighTechHouse1.blk diff --git a/maps/HaitekuHouse2.blk b/maps/HighTechHouse2.blk similarity index 100% rename from maps/HaitekuHouse2.blk rename to maps/HighTechHouse2.blk diff --git a/maps/HaitekuImposterOakHouse.blk b/maps/HighTechImposterOakHouse.blk similarity index 100% rename from maps/HaitekuImposterOakHouse.blk rename to maps/HighTechImposterOakHouse.blk diff --git a/maps/HaitekuLeague1F.blk b/maps/HighTechLeague1F.blk similarity index 100% rename from maps/HaitekuLeague1F.blk rename to maps/HighTechLeague1F.blk diff --git a/maps/HaitekuLeague2F.blk b/maps/HighTechLeague2F.blk similarity index 100% rename from maps/HaitekuLeague2F.blk rename to maps/HighTechLeague2F.blk diff --git a/maps/HaitekuMart.blk b/maps/HighTechMart.blk similarity index 100% rename from maps/HaitekuMart.blk rename to maps/HighTechMart.blk diff --git a/maps/HaitekuPokecenter1F.blk b/maps/HighTechPokecenter1F.blk similarity index 100% rename from maps/HaitekuPokecenter1F.blk rename to maps/HighTechPokecenter1F.blk diff --git a/maps/HaitekuPokecenter2F.blk b/maps/HighTechPokecenter2F.blk similarity index 100% rename from maps/HaitekuPokecenter2F.blk rename to maps/HighTechPokecenter2F.blk diff --git a/maps/HaitekuWestRoute.blk b/maps/HighTechWestRoute.blk similarity index 100% rename from maps/HaitekuWestRoute.blk rename to maps/HighTechWestRoute.blk diff --git a/maps/HaitekuWestRouteGate.blk b/maps/HighTechWestRouteGate.blk similarity index 100% rename from maps/HaitekuWestRouteGate.blk rename to maps/HighTechWestRouteGate.blk diff --git a/maps/HaitekuWestRouteOcean.blk b/maps/HighTechWestRouteOcean.blk similarity index 100% rename from maps/HaitekuWestRouteOcean.blk rename to maps/HighTechWestRouteOcean.blk diff --git a/maps/ShizukanaOka.blk b/maps/SilentHills.blk similarity index 100% rename from maps/ShizukanaOka.blk rename to maps/SilentHills.blk diff --git a/ram/wram.asm b/ram/wram.asm index 3f0005b4..d6a8c0cb 100644 --- a/ram/wram.asm +++ b/ram/wram.asm @@ -1576,7 +1576,7 @@ wRoute1P1CurScript:: db wRoute1P2CurScript:: db wRoute1Gate1FCurScript:: db wRoute1Gate2FCurScript:: db -wShizukanaOkaCurScript:: db +wSilentHillsCurScript:: db wd2a6:: db diff --git a/scripts/Baadon.asm b/scripts/Baadon.asm deleted file mode 100644 index 3d659ab3..00000000 --- a/scripts/Baadon.asm +++ /dev/null @@ -1,8 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "scripts/Baadon.asm", ROMX - -Baadon_ScriptLoader:: - ret - - db "@" diff --git a/scripts/BaadonPokecenter1F.asm b/scripts/BaadonPokecenter1F.asm deleted file mode 100644 index 1c29390f..00000000 --- a/scripts/BaadonPokecenter1F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "scripts/BaadonPokecenter1F.asm", ROMX - -BaadonPokecenter1F_ScriptLoader:: - ret - -BaadonPokecenter1F_TextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/scripts/BaadonPokecenter2F.asm b/scripts/BaadonPokecenter2F.asm deleted file mode 100644 index cd420b0d..00000000 --- a/scripts/BaadonPokecenter2F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "scripts/BaadonPokecenter2F.asm", ROMX - -BaadonPokecenter2F_ScriptLoader:: - ret - -BaadonPokecenter2F_TextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/scripts/BaadonRoute1.asm b/scripts/BaadonRoute1.asm deleted file mode 100644 index 1e296c34..00000000 --- a/scripts/BaadonRoute1.asm +++ /dev/null @@ -1,8 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "scripts/BaadonRoute1.asm", ROMX - -BaadonRoute1_ScriptLoader:: - ret - - db "@" diff --git a/scripts/BaadonRoute2.asm b/scripts/BaadonRoute2.asm deleted file mode 100644 index ddd74e4b..00000000 --- a/scripts/BaadonRoute2.asm +++ /dev/null @@ -1,8 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "scripts/BaadonRoute2.asm", ROMX - -BaadonRoute2_ScriptLoader:: - ret - - db "@" diff --git a/scripts/BaadonRoute3.asm b/scripts/BaadonRoute3.asm deleted file mode 100644 index 6a3a0048..00000000 --- a/scripts/BaadonRoute3.asm +++ /dev/null @@ -1,8 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "scripts/BaadonRoute3.asm", ROMX - -BaadonRoute3_ScriptLoader:: - ret - - db "@" diff --git a/scripts/BaadonRouteGateNewtype.asm b/scripts/BaadonRouteGateNewtype.asm deleted file mode 100644 index 318601a2..00000000 --- a/scripts/BaadonRouteGateNewtype.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "scripts/BaadonRouteGateNewtype.asm", ROMX - -BaadonRouteGateNewtype_ScriptLoader:: - ret - -BaadonRouteGateNewtype_TextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/scripts/BaadonRouteGateWest.asm b/scripts/BaadonRouteGateWest.asm deleted file mode 100644 index 8ab52321..00000000 --- a/scripts/BaadonRouteGateWest.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "scripts/BaadonRouteGateWest.asm", ROMX - -BaadonRouteGateWest_ScriptLoader:: - ret - -BaadonRouteGateWest_TextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/scripts/BaadonWallpaperHouse.asm b/scripts/BaadonWallpaperHouse.asm deleted file mode 100644 index 9fbfa9a6..00000000 --- a/scripts/BaadonWallpaperHouse.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "scripts/BaadonWallpaperHouse.asm", ROMX - -BaadonWallpaperHouse_ScriptLoader:: - ret - -BaadonWallpaperHouse_TextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/scripts/Birdon.asm b/scripts/Birdon.asm new file mode 100644 index 00000000..35daa687 --- /dev/null +++ b/scripts/Birdon.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "scripts/Birdon.asm", ROMX + +Birdon_ScriptLoader:: + ret + + db "@" diff --git a/scripts/BaadonHouse1.asm b/scripts/BirdonHouse1.asm similarity index 74% rename from scripts/BaadonHouse1.asm rename to scripts/BirdonHouse1.asm index 2f754e83..76943cb1 100644 --- a/scripts/BaadonHouse1.asm +++ b/scripts/BirdonHouse1.asm @@ -1,11 +1,11 @@ INCLUDE "constants.asm" -SECTION "scripts/BaadonHouse1.asm", ROMX +SECTION "scripts/BirdonHouse1.asm", ROMX -BaadonHouse1_ScriptLoader:: +BirdonHouse1_ScriptLoader:: ret -BaadonHouse1_TextPointers:: +BirdonHouse1_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/BaadonHouse2.asm b/scripts/BirdonHouse2.asm similarity index 74% rename from scripts/BaadonHouse2.asm rename to scripts/BirdonHouse2.asm index 709e9384..a8a08155 100644 --- a/scripts/BaadonHouse2.asm +++ b/scripts/BirdonHouse2.asm @@ -1,11 +1,11 @@ INCLUDE "constants.asm" -SECTION "scripts/BaadonHouse2.asm", ROMX +SECTION "scripts/BirdonHouse2.asm", ROMX -BaadonHouse2_ScriptLoader:: +BirdonHouse2_ScriptLoader:: ret -BaadonHouse2_TextPointers:: +BirdonHouse2_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/BaadonLeague1F.asm b/scripts/BirdonLeague1F.asm similarity index 73% rename from scripts/BaadonLeague1F.asm rename to scripts/BirdonLeague1F.asm index 5e32cec1..5f912d13 100644 --- a/scripts/BaadonLeague1F.asm +++ b/scripts/BirdonLeague1F.asm @@ -1,11 +1,11 @@ INCLUDE "constants.asm" -SECTION "scripts/BaadonLeague1F.asm", ROMX +SECTION "scripts/BirdonLeague1F.asm", ROMX -BaadonLeague1F_ScriptLoader:: +BirdonLeague1F_ScriptLoader:: ret -BaadonLeague1F_TextPointers:: +BirdonLeague1F_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/BaadonLeague2F.asm b/scripts/BirdonLeague2F.asm similarity index 73% rename from scripts/BaadonLeague2F.asm rename to scripts/BirdonLeague2F.asm index 0bae8973..15100cbd 100644 --- a/scripts/BaadonLeague2F.asm +++ b/scripts/BirdonLeague2F.asm @@ -1,11 +1,11 @@ INCLUDE "constants.asm" -SECTION "scripts/BaadonLeague2F.asm", ROMX +SECTION "scripts/BirdonLeague2F.asm", ROMX -BaadonLeague2F_ScriptLoader:: +BirdonLeague2F_ScriptLoader:: ret -BaadonLeague2F_TextPointers:: +BirdonLeague2F_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/BullHouse2.asm b/scripts/BirdonMart.asm similarity index 75% rename from scripts/BullHouse2.asm rename to scripts/BirdonMart.asm index 8951b48c..c10230ec 100644 --- a/scripts/BullHouse2.asm +++ b/scripts/BirdonMart.asm @@ -1,11 +1,11 @@ INCLUDE "constants.asm" -SECTION "scripts/BullHouse2.asm", ROMX +SECTION "scripts/BirdonMart.asm", ROMX -BullHouse2_ScriptLoader:: +BirdonMart_ScriptLoader:: ret -BullHouse2_TextPointers:: +BirdonMart_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/BirdonPokecenter1F.asm b/scripts/BirdonPokecenter1F.asm new file mode 100644 index 00000000..c97b9cc8 --- /dev/null +++ b/scripts/BirdonPokecenter1F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/BirdonPokecenter1F.asm", ROMX + +BirdonPokecenter1F_ScriptLoader:: + ret + +BirdonPokecenter1F_TextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/BirdonPokecenter2F.asm b/scripts/BirdonPokecenter2F.asm new file mode 100644 index 00000000..a29cfe5c --- /dev/null +++ b/scripts/BirdonPokecenter2F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/BirdonPokecenter2F.asm", ROMX + +BirdonPokecenter2F_ScriptLoader:: + ret + +BirdonPokecenter2F_TextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/BirdonRoute1.asm b/scripts/BirdonRoute1.asm new file mode 100644 index 00000000..5a9723f1 --- /dev/null +++ b/scripts/BirdonRoute1.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "scripts/BirdonRoute1.asm", ROMX + +BirdonRoute1_ScriptLoader:: + ret + + db "@" diff --git a/scripts/BirdonRoute2.asm b/scripts/BirdonRoute2.asm new file mode 100644 index 00000000..9945354b --- /dev/null +++ b/scripts/BirdonRoute2.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "scripts/BirdonRoute2.asm", ROMX + +BirdonRoute2_ScriptLoader:: + ret + + db "@" diff --git a/scripts/BirdonRoute3.asm b/scripts/BirdonRoute3.asm new file mode 100644 index 00000000..075ed7b6 --- /dev/null +++ b/scripts/BirdonRoute3.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "scripts/BirdonRoute3.asm", ROMX + +BirdonRoute3_ScriptLoader:: + ret + + db "@" diff --git a/scripts/BirdonRouteGateNewtype.asm b/scripts/BirdonRouteGateNewtype.asm new file mode 100644 index 00000000..32cca9cc --- /dev/null +++ b/scripts/BirdonRouteGateNewtype.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/BirdonRouteGateNewtype.asm", ROMX + +BirdonRouteGateNewtype_ScriptLoader:: + ret + +BirdonRouteGateNewtype_TextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/BirdonRouteGateWest.asm b/scripts/BirdonRouteGateWest.asm new file mode 100644 index 00000000..771c530e --- /dev/null +++ b/scripts/BirdonRouteGateWest.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/BirdonRouteGateWest.asm", ROMX + +BirdonRouteGateWest_ScriptLoader:: + ret + +BirdonRouteGateWest_TextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/BirdonWallpaperHouse.asm b/scripts/BirdonWallpaperHouse.asm new file mode 100644 index 00000000..4add1ea9 --- /dev/null +++ b/scripts/BirdonWallpaperHouse.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/BirdonWallpaperHouse.asm", ROMX + +BirdonWallpaperHouse_ScriptLoader:: + ret + +BirdonWallpaperHouse_TextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/BlueForest.asm b/scripts/BlueForest.asm new file mode 100644 index 00000000..378b9b52 --- /dev/null +++ b/scripts/BlueForest.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "scripts/BlueForest.asm", ROMX + +BlueForest_ScriptLoader:: + ret + + db "@" diff --git a/scripts/BlueForestRoute1.asm b/scripts/BlueForestRoute1.asm new file mode 100644 index 00000000..b07b95fd --- /dev/null +++ b/scripts/BlueForestRoute1.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "scripts/BlueForestRoute1.asm", ROMX + +BlueForestRoute1_ScriptLoader:: + ret + + db "@" diff --git a/scripts/BlueForestRoute1House.asm b/scripts/BlueForestRoute1House.asm new file mode 100644 index 00000000..2fb7bba8 --- /dev/null +++ b/scripts/BlueForestRoute1House.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/BlueForestRoute1House.asm", ROMX + +BlueForestRoute1House_ScriptLoader:: + ret + +BlueForestRoute1House_TextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/BlueForestRoute2.asm b/scripts/BlueForestRoute2.asm new file mode 100644 index 00000000..7380d178 --- /dev/null +++ b/scripts/BlueForestRoute2.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "scripts/BlueForestRoute2.asm", ROMX + +BlueForestRoute2_ScriptLoader:: + ret + + db "@" diff --git a/scripts/BlueForestRoute3.asm b/scripts/BlueForestRoute3.asm new file mode 100644 index 00000000..47df2727 --- /dev/null +++ b/scripts/BlueForestRoute3.asm @@ -0,0 +1,10 @@ +INCLUDE "constants.asm" + +SECTION "scripts/BlueForestRoute3.asm", ROMX + +BlueForestRoute3_ScriptLoader:: + ret + + db "@" + + ret diff --git a/scripts/BlueForestRouteGateStand.asm b/scripts/BlueForestRouteGateStand.asm new file mode 100644 index 00000000..8b1db35f --- /dev/null +++ b/scripts/BlueForestRouteGateStand.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/BlueForestRouteGateStand.asm", ROMX + +BlueForestRouteGateStand_ScriptLoader:: + ret + +BlueForestRouteGateStand_TextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/BullHouse3.asm b/scripts/BlueHouse1.asm similarity index 75% rename from scripts/BullHouse3.asm rename to scripts/BlueHouse1.asm index 221755e3..ecaee777 100644 --- a/scripts/BullHouse3.asm +++ b/scripts/BlueHouse1.asm @@ -1,11 +1,11 @@ INCLUDE "constants.asm" -SECTION "scripts/BullHouse3.asm", ROMX +SECTION "scripts/BlueHouse1.asm", ROMX -BullHouse3_ScriptLoader:: +BlueHouse1_ScriptLoader:: ret -BullHouse3_TextPointers:: +BlueHouse1_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/BaadonMart.asm b/scripts/BlueHouse2.asm similarity index 75% rename from scripts/BaadonMart.asm rename to scripts/BlueHouse2.asm index 40ac4c13..fe4ed5ea 100644 --- a/scripts/BaadonMart.asm +++ b/scripts/BlueHouse2.asm @@ -1,11 +1,11 @@ INCLUDE "constants.asm" -SECTION "scripts/BaadonMart.asm", ROMX +SECTION "scripts/BlueHouse2.asm", ROMX -BaadonMart_ScriptLoader:: +BlueHouse2_ScriptLoader:: ret -BaadonMart_TextPointers:: +BlueHouse2_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/BullHouse1.asm b/scripts/BlueHouse3.asm similarity index 75% rename from scripts/BullHouse1.asm rename to scripts/BlueHouse3.asm index df627cc2..ddae7da4 100644 --- a/scripts/BullHouse1.asm +++ b/scripts/BlueHouse3.asm @@ -1,11 +1,11 @@ INCLUDE "constants.asm" -SECTION "scripts/BullHouse1.asm", ROMX +SECTION "scripts/BlueHouse3.asm", ROMX -BullHouse1_ScriptLoader:: +BlueHouse3_ScriptLoader:: ret -BullHouse1_TextPointers:: +BlueHouse3_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/BlueHouse4.asm b/scripts/BlueHouse4.asm new file mode 100644 index 00000000..6195d7ee --- /dev/null +++ b/scripts/BlueHouse4.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/BlueHouse4.asm", ROMX + +BlueHouse4_ScriptLoader:: + ret + +BlueHouse4_TextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/BlueLeague1F.asm b/scripts/BlueLeague1F.asm new file mode 100644 index 00000000..2565526a --- /dev/null +++ b/scripts/BlueLeague1F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/BlueLeague1F.asm", ROMX + +BlueLeague1F_ScriptLoader:: + ret + +BlueLeague1F_TextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/BlueLeague2F.asm b/scripts/BlueLeague2F.asm new file mode 100644 index 00000000..f1833221 --- /dev/null +++ b/scripts/BlueLeague2F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/BlueLeague2F.asm", ROMX + +BlueLeague2F_ScriptLoader:: + ret + +BlueLeague2F_TextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/BullMart.asm b/scripts/BlueMart.asm similarity index 76% rename from scripts/BullMart.asm rename to scripts/BlueMart.asm index bef01b25..5c2cf0d6 100644 --- a/scripts/BullMart.asm +++ b/scripts/BlueMart.asm @@ -1,11 +1,11 @@ INCLUDE "constants.asm" -SECTION "scripts/BullMart.asm", ROMX +SECTION "scripts/BlueMart.asm", ROMX -BullMart_ScriptLoader:: +BlueMart_ScriptLoader:: ret -BullMart_TextPointers:: +BlueMart_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/BluePokecenter1F.asm b/scripts/BluePokecenter1F.asm new file mode 100644 index 00000000..56c52385 --- /dev/null +++ b/scripts/BluePokecenter1F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/BluePokecenter1F.asm", ROMX + +BluePokecenter1F_ScriptLoader:: + ret + +BluePokecenter1F_TextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/BluePokecenter2F.asm b/scripts/BluePokecenter2F.asm new file mode 100644 index 00000000..03635001 --- /dev/null +++ b/scripts/BluePokecenter2F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/BluePokecenter2F.asm", ROMX + +BluePokecenter2F_ScriptLoader:: + ret + +BluePokecenter2F_TextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/BullForest.asm b/scripts/BullForest.asm deleted file mode 100644 index f7d6977c..00000000 --- a/scripts/BullForest.asm +++ /dev/null @@ -1,8 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "scripts/BullForest.asm", ROMX - -BullForest_ScriptLoader:: - ret - - db "@" diff --git a/scripts/BullForestRoute1.asm b/scripts/BullForestRoute1.asm deleted file mode 100644 index 29840721..00000000 --- a/scripts/BullForestRoute1.asm +++ /dev/null @@ -1,8 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "scripts/BullForestRoute1.asm", ROMX - -BullForestRoute1_ScriptLoader:: - ret - - db "@" diff --git a/scripts/BullForestRoute1House.asm b/scripts/BullForestRoute1House.asm deleted file mode 100644 index 91067e92..00000000 --- a/scripts/BullForestRoute1House.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "scripts/BullForestRoute1House.asm", ROMX - -BullForestRoute1House_ScriptLoader:: - ret - -BullForestRoute1House_TextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/scripts/BullForestRoute2.asm b/scripts/BullForestRoute2.asm deleted file mode 100644 index 90dd7d2f..00000000 --- a/scripts/BullForestRoute2.asm +++ /dev/null @@ -1,8 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "scripts/BullForestRoute2.asm", ROMX - -BullForestRoute2_ScriptLoader:: - ret - - db "@" diff --git a/scripts/BullForestRoute3.asm b/scripts/BullForestRoute3.asm deleted file mode 100644 index 34719f11..00000000 --- a/scripts/BullForestRoute3.asm +++ /dev/null @@ -1,10 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "scripts/BullForestRoute3.asm", ROMX - -BullForestRoute3_ScriptLoader:: - ret - - db "@" - - ret diff --git a/scripts/BullForestRouteGateStand.asm b/scripts/BullForestRouteGateStand.asm deleted file mode 100644 index 9f14c344..00000000 --- a/scripts/BullForestRouteGateStand.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "scripts/BullForestRouteGateStand.asm", ROMX - -BullForestRouteGateStand_ScriptLoader:: - ret - -BullForestRouteGateStand_TextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/scripts/BullHouse4.asm b/scripts/BullHouse4.asm deleted file mode 100644 index 0adf0715..00000000 --- a/scripts/BullHouse4.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "scripts/BullHouse4.asm", ROMX - -BullHouse4_ScriptLoader:: - ret - -BullHouse4_TextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/scripts/BullLeague1F.asm b/scripts/BullLeague1F.asm deleted file mode 100644 index d9aac086..00000000 --- a/scripts/BullLeague1F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "scripts/BullLeague1F.asm", ROMX - -BullLeague1F_ScriptLoader:: - ret - -BullLeague1F_TextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/scripts/BullLeague2F.asm b/scripts/BullLeague2F.asm deleted file mode 100644 index 2616c267..00000000 --- a/scripts/BullLeague2F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "scripts/BullLeague2F.asm", ROMX - -BullLeague2F_ScriptLoader:: - ret - -BullLeague2F_TextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/scripts/BullPokecenter1F.asm b/scripts/BullPokecenter1F.asm deleted file mode 100644 index ac479ac6..00000000 --- a/scripts/BullPokecenter1F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "scripts/BullPokecenter1F.asm", ROMX - -BullPokecenter1F_ScriptLoader:: - ret - -BullPokecenter1F_TextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/scripts/BullPokecenter2F.asm b/scripts/BullPokecenter2F.asm deleted file mode 100644 index 58d0cf0b..00000000 --- a/scripts/BullPokecenter2F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "scripts/BullPokecenter2F.asm", ROMX - -BullPokecenter2F_ScriptLoader:: - ret - -BullPokecenter2F_TextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/scripts/Font.asm b/scripts/Font.asm new file mode 100644 index 00000000..d1cb66d6 --- /dev/null +++ b/scripts/Font.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "scripts/Font.asm", ROMX + +Font_ScriptLoader:: + ret + + db "@" diff --git a/scripts/FontoMart.asm b/scripts/FontHouse.asm similarity index 76% rename from scripts/FontoMart.asm rename to scripts/FontHouse.asm index 3e1b7024..f72d4445 100644 --- a/scripts/FontoMart.asm +++ b/scripts/FontHouse.asm @@ -1,11 +1,11 @@ INCLUDE "constants.asm" -SECTION "scripts/FontoMart.asm", ROMX +SECTION "scripts/FontHouse.asm", ROMX -FontoMart_ScriptLoader:: +FontHouse_ScriptLoader:: ret -FontoMart_TextPointers:: +FontHouse_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/FontoLab.asm b/scripts/FontLab.asm similarity index 76% rename from scripts/FontoLab.asm rename to scripts/FontLab.asm index 761d99e6..4589b27d 100644 --- a/scripts/FontoLab.asm +++ b/scripts/FontLab.asm @@ -1,11 +1,11 @@ INCLUDE "constants.asm" -SECTION "scripts/FontoLab.asm", ROMX +SECTION "scripts/FontLab.asm", ROMX -FontoLab_ScriptLoader:: +FontLab_ScriptLoader:: ret -FontoLab_TextPointers:: +FontLab_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/FontMart.asm b/scripts/FontMart.asm new file mode 100644 index 00000000..db584c2a --- /dev/null +++ b/scripts/FontMart.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/FontMart.asm", ROMX + +FontMart_ScriptLoader:: + ret + +FontMart_TextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/FontPokecenter1F.asm b/scripts/FontPokecenter1F.asm new file mode 100644 index 00000000..c13b9de0 --- /dev/null +++ b/scripts/FontPokecenter1F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/FontPokecenter1F.asm", ROMX + +FontPokecenter1F_ScriptLoader:: + ret + +FontPokecenter1F_TextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/FontPokecenter2F.asm b/scripts/FontPokecenter2F.asm new file mode 100644 index 00000000..7ee03fc8 --- /dev/null +++ b/scripts/FontPokecenter2F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/FontPokecenter2F.asm", ROMX + +FontPokecenter2F_ScriptLoader:: + ret + +FontPokecenter2F_TextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/FontRocketHouse.asm b/scripts/FontRocketHouse.asm new file mode 100644 index 00000000..abc77f56 --- /dev/null +++ b/scripts/FontRocketHouse.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/FontRocketHouse.asm", ROMX + +FontRocketHouse_ScriptLoader:: + ret + +FontRocketHouse_TextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/FontRoute1.asm b/scripts/FontRoute1.asm new file mode 100644 index 00000000..7627ac38 --- /dev/null +++ b/scripts/FontRoute1.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "scripts/FontRoute1.asm", ROMX + +FontRoute1_ScriptLoader:: + ret + + db "@" diff --git a/scripts/FontRoute2.asm b/scripts/FontRoute2.asm new file mode 100644 index 00000000..977f6489 --- /dev/null +++ b/scripts/FontRoute2.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "scripts/FontRoute2.asm", ROMX + +FontRoute2_ScriptLoader:: + ret + + db "@" diff --git a/scripts/FontRoute3.asm b/scripts/FontRoute3.asm new file mode 100644 index 00000000..42f23f4e --- /dev/null +++ b/scripts/FontRoute3.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "scripts/FontRoute3.asm", ROMX + +FontRoute3_ScriptLoader:: + ret + + db "@" diff --git a/scripts/FontRoute4.asm b/scripts/FontRoute4.asm new file mode 100644 index 00000000..ee86ea2e --- /dev/null +++ b/scripts/FontRoute4.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "scripts/FontRoute4.asm", ROMX + +FontRoute4_ScriptLoader:: + ret + + db "@" diff --git a/scripts/FontRoute5.asm b/scripts/FontRoute5.asm new file mode 100644 index 00000000..528498ea --- /dev/null +++ b/scripts/FontRoute5.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "scripts/FontRoute5.asm", ROMX + +FontRoute5_ScriptLoader:: + ret + + db "@" diff --git a/scripts/FontRoute6.asm b/scripts/FontRoute6.asm new file mode 100644 index 00000000..12089acf --- /dev/null +++ b/scripts/FontRoute6.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "scripts/FontRoute6.asm", ROMX + +FontRoute6_ScriptLoader:: + ret + + db "@" diff --git a/scripts/FontRouteGate1.asm b/scripts/FontRouteGate1.asm new file mode 100644 index 00000000..ee8468b9 --- /dev/null +++ b/scripts/FontRouteGate1.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/FontRouteGate1.asm", ROMX + +FontRouteGate1_ScriptLoader:: + ret + +FontRouteGate1_TextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/FontRouteGate2.asm b/scripts/FontRouteGate2.asm new file mode 100644 index 00000000..4b1cd82e --- /dev/null +++ b/scripts/FontRouteGate2.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/FontRouteGate2.asm", ROMX + +FontRouteGate2_ScriptLoader:: + ret + +FontRouteGate2_TextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/FontRouteGate3.asm b/scripts/FontRouteGate3.asm new file mode 100644 index 00000000..bab9e441 --- /dev/null +++ b/scripts/FontRouteGate3.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/FontRouteGate3.asm", ROMX + +FontRouteGate3_ScriptLoader:: + ret + +FontRouteGate3_TextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/Fonto.asm b/scripts/Fonto.asm deleted file mode 100644 index cdb3b518..00000000 --- a/scripts/Fonto.asm +++ /dev/null @@ -1,8 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "scripts/Fonto.asm", ROMX - -Fonto_ScriptLoader:: - ret - - db "@" diff --git a/scripts/FontoHouse.asm b/scripts/FontoHouse.asm deleted file mode 100644 index d7e933de..00000000 --- a/scripts/FontoHouse.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "scripts/FontoHouse.asm", ROMX - -FontoHouse_ScriptLoader:: - ret - -FontoHouse_TextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/scripts/FontoPokecenter1F.asm b/scripts/FontoPokecenter1F.asm deleted file mode 100644 index bf6035f2..00000000 --- a/scripts/FontoPokecenter1F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "scripts/FontoPokecenter1F.asm", ROMX - -FontoPokecenter1F_ScriptLoader:: - ret - -FontoPokecenter1F_TextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/scripts/FontoPokecenter2F.asm b/scripts/FontoPokecenter2F.asm deleted file mode 100644 index cc0f64e1..00000000 --- a/scripts/FontoPokecenter2F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "scripts/FontoPokecenter2F.asm", ROMX - -FontoPokecenter2F_ScriptLoader:: - ret - -FontoPokecenter2F_TextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/scripts/FontoRocketHouse.asm b/scripts/FontoRocketHouse.asm deleted file mode 100644 index ea208024..00000000 --- a/scripts/FontoRocketHouse.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "scripts/FontoRocketHouse.asm", ROMX - -FontoRocketHouse_ScriptLoader:: - ret - -FontoRocketHouse_TextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/scripts/FontoRoute1.asm b/scripts/FontoRoute1.asm deleted file mode 100644 index cce38f6f..00000000 --- a/scripts/FontoRoute1.asm +++ /dev/null @@ -1,8 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "scripts/FontoRoute1.asm", ROMX - -FontoRoute1_ScriptLoader:: - ret - - db "@" diff --git a/scripts/FontoRoute2.asm b/scripts/FontoRoute2.asm deleted file mode 100644 index ceeaf821..00000000 --- a/scripts/FontoRoute2.asm +++ /dev/null @@ -1,8 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "scripts/FontoRoute2.asm", ROMX - -FontoRoute2_ScriptLoader:: - ret - - db "@" diff --git a/scripts/FontoRoute3.asm b/scripts/FontoRoute3.asm deleted file mode 100644 index b22aea10..00000000 --- a/scripts/FontoRoute3.asm +++ /dev/null @@ -1,8 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "scripts/FontoRoute3.asm", ROMX - -FontoRoute3_ScriptLoader:: - ret - - db "@" diff --git a/scripts/FontoRoute4.asm b/scripts/FontoRoute4.asm deleted file mode 100644 index 2a6ed325..00000000 --- a/scripts/FontoRoute4.asm +++ /dev/null @@ -1,8 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "scripts/FontoRoute4.asm", ROMX - -FontoRoute4_ScriptLoader:: - ret - - db "@" diff --git a/scripts/FontoRoute5.asm b/scripts/FontoRoute5.asm deleted file mode 100644 index ebe3686a..00000000 --- a/scripts/FontoRoute5.asm +++ /dev/null @@ -1,8 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "scripts/FontoRoute5.asm", ROMX - -FontoRoute5_ScriptLoader:: - ret - - db "@" diff --git a/scripts/FontoRoute6.asm b/scripts/FontoRoute6.asm deleted file mode 100644 index 8e817e0b..00000000 --- a/scripts/FontoRoute6.asm +++ /dev/null @@ -1,8 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "scripts/FontoRoute6.asm", ROMX - -FontoRoute6_ScriptLoader:: - ret - - db "@" diff --git a/scripts/FontoRouteGate1.asm b/scripts/FontoRouteGate1.asm deleted file mode 100644 index c7acf6ab..00000000 --- a/scripts/FontoRouteGate1.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "scripts/FontoRouteGate1.asm", ROMX - -FontoRouteGate1_ScriptLoader:: - ret - -FontoRouteGate1_TextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/scripts/FontoRouteGate2.asm b/scripts/FontoRouteGate2.asm deleted file mode 100644 index 84f7a83c..00000000 --- a/scripts/FontoRouteGate2.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "scripts/FontoRouteGate2.asm", ROMX - -FontoRouteGate2_ScriptLoader:: - ret - -FontoRouteGate2_TextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/scripts/FontoRouteGate3.asm b/scripts/FontoRouteGate3.asm deleted file mode 100644 index f05a809c..00000000 --- a/scripts/FontoRouteGate3.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "scripts/FontoRouteGate3.asm", ROMX - -FontoRouteGate3_ScriptLoader:: - ret - -FontoRouteGate3_TextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/scripts/Haiteku.asm b/scripts/Haiteku.asm deleted file mode 100644 index 65480ac4..00000000 --- a/scripts/Haiteku.asm +++ /dev/null @@ -1,8 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "scripts/Haiteku.asm", ROMX - -Haiteku_ScriptLoader:: - ret - - db "@" diff --git a/scripts/HaitekuAquarium1F.asm b/scripts/HaitekuAquarium1F.asm deleted file mode 100644 index 256ee88f..00000000 --- a/scripts/HaitekuAquarium1F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "scripts/HaitekuAquarium1F.asm", ROMX - -HaitekuAquarium1F_ScriptLoader:: - ret - -HaitekuAquarium1F_TextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/scripts/HaitekuAquarium2F.asm b/scripts/HaitekuAquarium2F.asm deleted file mode 100644 index cba5c08c..00000000 --- a/scripts/HaitekuAquarium2F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "scripts/HaitekuAquarium2F.asm", ROMX - -HaitekuAquarium2F_ScriptLoader:: - ret - -HaitekuAquarium2F_TextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/scripts/HaitekuHouse1.asm b/scripts/HaitekuHouse1.asm deleted file mode 100644 index 6c9c611f..00000000 --- a/scripts/HaitekuHouse1.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "scripts/HaitekuHouse1.asm", ROMX - -HaitekuHouse1_ScriptLoader:: - ret - -HaitekuHouse1_TextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/scripts/HaitekuHouse2.asm b/scripts/HaitekuHouse2.asm deleted file mode 100644 index 474a06b4..00000000 --- a/scripts/HaitekuHouse2.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "scripts/HaitekuHouse2.asm", ROMX - -HaitekuHouse2_ScriptLoader:: - ret - -HaitekuHouse2_TextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/scripts/HaitekuImposterOakHouse.asm b/scripts/HaitekuImposterOakHouse.asm deleted file mode 100644 index 15698e9e..00000000 --- a/scripts/HaitekuImposterOakHouse.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "scripts/HaitekuImposterOakHouse.asm", ROMX - -HaitekuImposterOakHouse_ScriptLoader:: - ret - -HaitekuImposterOakHouse_TextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/scripts/HaitekuLeague1F.asm b/scripts/HaitekuLeague1F.asm deleted file mode 100644 index 43b584bd..00000000 --- a/scripts/HaitekuLeague1F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "scripts/HaitekuLeague1F.asm", ROMX - -HaitekuLeague1F_ScriptLoader:: - ret - -HaitekuLeague1F_TextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/scripts/HaitekuLeague2F.asm b/scripts/HaitekuLeague2F.asm deleted file mode 100644 index 75d079ef..00000000 --- a/scripts/HaitekuLeague2F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "scripts/HaitekuLeague2F.asm", ROMX - -HaitekuLeague2F_ScriptLoader:: - ret - -HaitekuLeague2F_TextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/scripts/HaitekuMart.asm b/scripts/HaitekuMart.asm deleted file mode 100644 index 56ecfe9b..00000000 --- a/scripts/HaitekuMart.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "scripts/HaitekuMart.asm", ROMX - -HaitekuMart_ScriptLoader:: - ret - -HaitekuMart_TextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/scripts/HaitekuPokecenter1F.asm b/scripts/HaitekuPokecenter1F.asm deleted file mode 100644 index 87554411..00000000 --- a/scripts/HaitekuPokecenter1F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "scripts/HaitekuPokecenter1F.asm", ROMX - -HaitekuPokecenter1F_ScriptLoader:: - ret - -HaitekuPokecenter1F_TextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/scripts/HaitekuPokecenter2F.asm b/scripts/HaitekuPokecenter2F.asm deleted file mode 100644 index ed82559a..00000000 --- a/scripts/HaitekuPokecenter2F.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "scripts/HaitekuPokecenter2F.asm", ROMX - -HaitekuPokecenter2F_ScriptLoader:: - ret - -HaitekuPokecenter2F_TextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/scripts/HaitekuWestRoute.asm b/scripts/HaitekuWestRoute.asm deleted file mode 100644 index a24631bf..00000000 --- a/scripts/HaitekuWestRoute.asm +++ /dev/null @@ -1,8 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "scripts/HaitekuWestRoute.asm", ROMX - -HaitekuWestRoute_ScriptLoader:: - ret - - db "@" diff --git a/scripts/HaitekuWestRouteGate.asm b/scripts/HaitekuWestRouteGate.asm deleted file mode 100644 index e99f757f..00000000 --- a/scripts/HaitekuWestRouteGate.asm +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "scripts/HaitekuWestRouteGate.asm", ROMX - -HaitekuWestRouteGate_ScriptLoader:: - ret - -HaitekuWestRouteGate_TextPointers:: - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText - dw MapDefaultText diff --git a/scripts/HaitekuWestRouteOcean.asm b/scripts/HaitekuWestRouteOcean.asm deleted file mode 100644 index d3155bb3..00000000 --- a/scripts/HaitekuWestRouteOcean.asm +++ /dev/null @@ -1,8 +0,0 @@ -INCLUDE "constants.asm" - -SECTION "scripts/HaitekuWestRouteOcean.asm", ROMX - -HaitekuWestRouteOcean_ScriptLoader:: - ret - - db "@" diff --git a/scripts/HighTech.asm b/scripts/HighTech.asm new file mode 100644 index 00000000..57f1d4c4 --- /dev/null +++ b/scripts/HighTech.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "scripts/HighTech.asm", ROMX + +HighTech_ScriptLoader:: + ret + + db "@" diff --git a/scripts/HighTechAquarium1F.asm b/scripts/HighTechAquarium1F.asm new file mode 100644 index 00000000..22153810 --- /dev/null +++ b/scripts/HighTechAquarium1F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/HighTechAquarium1F.asm", ROMX + +HighTechAquarium1F_ScriptLoader:: + ret + +HighTechAquarium1F_TextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/HighTechAquarium2F.asm b/scripts/HighTechAquarium2F.asm new file mode 100644 index 00000000..cabd6262 --- /dev/null +++ b/scripts/HighTechAquarium2F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/HighTechAquarium2F.asm", ROMX + +HighTechAquarium2F_ScriptLoader:: + ret + +HighTechAquarium2F_TextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/HighTechHouse1.asm b/scripts/HighTechHouse1.asm new file mode 100644 index 00000000..6abc4014 --- /dev/null +++ b/scripts/HighTechHouse1.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/HighTechHouse1.asm", ROMX + +HighTechHouse1_ScriptLoader:: + ret + +HighTechHouse1_TextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/HighTechHouse2.asm b/scripts/HighTechHouse2.asm new file mode 100644 index 00000000..17445e1f --- /dev/null +++ b/scripts/HighTechHouse2.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/HighTechHouse2.asm", ROMX + +HighTechHouse2_ScriptLoader:: + ret + +HighTechHouse2_TextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/HighTechImposterOakHouse.asm b/scripts/HighTechImposterOakHouse.asm new file mode 100644 index 00000000..e59ec078 --- /dev/null +++ b/scripts/HighTechImposterOakHouse.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/HighTechImposterOakHouse.asm", ROMX + +HighTechImposterOakHouse_ScriptLoader:: + ret + +HighTechImposterOakHouse_TextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/HighTechLeague1F.asm b/scripts/HighTechLeague1F.asm new file mode 100644 index 00000000..fd305fd4 --- /dev/null +++ b/scripts/HighTechLeague1F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/HighTechLeague1F.asm", ROMX + +HighTechLeague1F_ScriptLoader:: + ret + +HighTechLeague1F_TextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/HighTechLeague2F.asm b/scripts/HighTechLeague2F.asm new file mode 100644 index 00000000..d2e4b8ac --- /dev/null +++ b/scripts/HighTechLeague2F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/HighTechLeague2F.asm", ROMX + +HighTechLeague2F_ScriptLoader:: + ret + +HighTechLeague2F_TextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/HighTechMart.asm b/scripts/HighTechMart.asm new file mode 100644 index 00000000..6f9dea2f --- /dev/null +++ b/scripts/HighTechMart.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/HighTechMart.asm", ROMX + +HighTechMart_ScriptLoader:: + ret + +HighTechMart_TextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/HighTechPokecenter1F.asm b/scripts/HighTechPokecenter1F.asm new file mode 100644 index 00000000..e4a76908 --- /dev/null +++ b/scripts/HighTechPokecenter1F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/HighTechPokecenter1F.asm", ROMX + +HighTechPokecenter1F_ScriptLoader:: + ret + +HighTechPokecenter1F_TextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/HighTechPokecenter2F.asm b/scripts/HighTechPokecenter2F.asm new file mode 100644 index 00000000..e803d040 --- /dev/null +++ b/scripts/HighTechPokecenter2F.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/HighTechPokecenter2F.asm", ROMX + +HighTechPokecenter2F_ScriptLoader:: + ret + +HighTechPokecenter2F_TextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/HighTechWestRoute.asm b/scripts/HighTechWestRoute.asm new file mode 100644 index 00000000..20ce0ac2 --- /dev/null +++ b/scripts/HighTechWestRoute.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "scripts/HighTechWestRoute.asm", ROMX + +HighTechWestRoute_ScriptLoader:: + ret + + db "@" diff --git a/scripts/HighTechWestRouteGate.asm b/scripts/HighTechWestRouteGate.asm new file mode 100644 index 00000000..4e79a872 --- /dev/null +++ b/scripts/HighTechWestRouteGate.asm @@ -0,0 +1,21 @@ +INCLUDE "constants.asm" + +SECTION "scripts/HighTechWestRouteGate.asm", ROMX + +HighTechWestRouteGate_ScriptLoader:: + ret + +HighTechWestRouteGate_TextPointers:: + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText + dw MapDefaultText diff --git a/scripts/HighTechWestRouteOcean.asm b/scripts/HighTechWestRouteOcean.asm new file mode 100644 index 00000000..94a744dd --- /dev/null +++ b/scripts/HighTechWestRouteOcean.asm @@ -0,0 +1,8 @@ +INCLUDE "constants.asm" + +SECTION "scripts/HighTechWestRouteOcean.asm", ROMX + +HighTechWestRouteOcean_ScriptLoader:: + ret + + db "@" diff --git a/scripts/ShizukanaOka.asm b/scripts/SilentHills.asm similarity index 69% rename from scripts/ShizukanaOka.asm rename to scripts/SilentHills.asm index 09db6c02..ce8205b9 100644 --- a/scripts/ShizukanaOka.asm +++ b/scripts/SilentHills.asm @@ -1,18 +1,18 @@ INCLUDE "constants.asm" -SECTION "scripts/ShizukanaOka.asm", ROMX +SECTION "scripts/SilentHills.asm", ROMX -ShizukanaOka_ScriptLoader:: - ld hl, ShizukanaOkaScriptPointers +SilentHills_ScriptLoader:: + ld hl, SilentHillsScriptPointers call RunMapScript call WriteBackMapScriptNumber ret -ShizukanaOkaScriptPointers: - dw ShizukanaOkaScript - dw ShizukanaOkaNPCIDs +SilentHillsScriptPointers: + dw SilentHillsScript + dw SilentHillsNPCIDs -ShizukanaOkaNPCIDs: +SilentHillsNPCIDs: db 0 db 1 db 2 @@ -21,34 +21,34 @@ ShizukanaOkaNPCIDs: db 5 db $FF -ShizukanaOkaSignPointers: - dw ShizukanaOkaSignpost1 - dw ShizukanaOkaSignpost2 +SilentHillsSignPointers: + dw SilentHillsSignpost1 + dw SilentHillsSignpost2 -ShizukanaOka_TextPointers: - dw ShizukanaOkaText1 - dw ShizukanaOkaTrainer2 - dw ShizukanaOkaTrainer3 - dw ShizukanaOkaTrainer4 - dw ShizukanaOkaTrainer5 - dw ShizukanaOkaTrainer6 +SilentHills_TextPointers: + dw SilentHillsText1 + dw SilentHillsTrainer2 + dw SilentHillsTrainer3 + dw SilentHillsTrainer4 + dw SilentHillsTrainer5 + dw SilentHillsTrainer6 -ShizukanaOkaScript: - ld hl, ShizukanaOkaNPCIDs - ld de, ShizukanaOkaSignPointers +SilentHillsScript: + ld hl, SilentHillsNPCIDs + ld de, SilentHillsSignPointers call CallMapTextSubroutine ret -ShizukanaOkaText1: - ld hl, ShizukanaOkaText1String +SilentHillsText1: + ld hl, SilentHillsText1String call OpenTextbox ret -ShizukanaOkaTrainer2: +SilentHillsTrainer2: ld hl, $D3A5 bit 1, [hl] jr nz, .Trainer2Won - ld hl, ShizukanaOkaTrainer2EncounterString + ld hl, SilentHillsTrainer2EncounterString call OpenTextbox ld hl, wd3a5 set 1, [hl] @@ -59,15 +59,15 @@ ShizukanaOkaTrainer2: call InitTrainerBattle ret .Trainer2Won ;Already won - ld hl, ShizukanaOkaTrainer2WonString + ld hl, SilentHillsTrainer2WonString call OpenTextbox ret -ShizukanaOkaTrainer3: +SilentHillsTrainer3: ld hl, wd3a5 bit 2, [hl] jr nz, .Trainer3Won - ld hl, ShizukanaOkaTrainer3EncounterString + ld hl, SilentHillsTrainer3EncounterString call OpenTextbox ld hl, wd3a5 set 2, [hl] @@ -78,15 +78,15 @@ ShizukanaOkaTrainer3: call InitTrainerBattle ret .Trainer3Won ;Already won - ld hl, ShizukanaOkaTrainer3WonString + ld hl, SilentHillsTrainer3WonString call OpenTextbox ret -ShizukanaOkaTrainer4: +SilentHillsTrainer4: ld hl, wd3a5 bit 3, [hl] jr nz, .Trainer4Won - ld hl, ShizukanaOkaTrainer4EncounterString + ld hl, SilentHillsTrainer4EncounterString call OpenTextbox ld hl, wd3a5 set 3, [hl] @@ -97,15 +97,15 @@ ShizukanaOkaTrainer4: call InitTrainerBattle ret .Trainer4Won ;Already won - ld hl, ShizukanaOkaTrainer4WonString + ld hl, SilentHillsTrainer4WonString call OpenTextbox ret -ShizukanaOkaTrainer5: +SilentHillsTrainer5: ld hl, wd3a5 bit 4, [hl] jr nz, .Trainer5Won - ld hl, ShizukanaOkaTrainer5EncounterString + ld hl, SilentHillsTrainer5EncounterString call OpenTextbox ld hl, wd3a5 set 4, [hl] @@ -116,15 +116,15 @@ ShizukanaOkaTrainer5: call InitTrainerBattle ret .Trainer5Won ;Already won - ld hl, ShizukanaOkaTrainer5WonString + ld hl, SilentHillsTrainer5WonString call OpenTextbox ret -ShizukanaOkaTrainer6: +SilentHillsTrainer6: ld hl, wd3a5 bit 5, [hl] jr nz, .Trainer6Won - ld hl, ShizukanaOkaTrainer6EncounterString + ld hl, SilentHillsTrainer6EncounterString call OpenTextbox ld hl, wd3a5 set 5, [hl] @@ -135,21 +135,21 @@ ShizukanaOkaTrainer6: call InitTrainerBattle ret .Trainer6Won ;Already won - ld hl, ShizukanaOkaTrainer6WonString + ld hl, SilentHillsTrainer6WonString call OpenTextbox ret -ShizukanaOkaSignpost2: - ld hl, ShizukanaOkaSignpost2String +SilentHillsSignpost2: + ld hl, SilentHillsSignpost2String call OpenTextbox ret -ShizukanaOkaSignpost1: - ld hl, ShizukanaOkaSignpost1String +SilentHillsSignpost1: + ld hl, SilentHillsSignpost1String call OpenTextbox ret -ShizukanaOkaTrainer6EncounterString: +SilentHillsTrainer6EncounterString: text "ねえ　ねえ　みてよ" para "これ　ぜったい" @@ -160,13 +160,13 @@ ShizukanaOkaTrainer6EncounterString: line "わかってないから　しかたないよ" done -ShizukanaOkaTrainer6WonString: +SilentHillsTrainer6WonString: text "あたらしい　ポケモンだけでなく" line "あたらしい　タイプも" cont "みつかったって　うわさだよ" done -ShizukanaOkaTrainer5EncounterString: +SilentHillsTrainer5EncounterString: text "いい　てんきねー" line "あなた　ちょうしは　いかが？" done @@ -175,11 +175,11 @@ ShizukanaOkaTrainer5EncounterString: line "⋯⋯なにいってるのかしら　あたし" done -ShizukanaOkaTrainer5WonString: +SilentHillsTrainer5WonString: text "なんで　こうなるの？" line "さんぽしてた　だけなのに@@" -ShizukanaOkaTrainer4EncounterString: +SilentHillsTrainer4EncounterString: text "こんなところで" line "ひを　ふく　れんしゅう！" done @@ -187,7 +187,7 @@ ShizukanaOkaTrainer4EncounterString: text "あちち　しっぱいだー" done -ShizukanaOkaTrainer4WonString: +SilentHillsTrainer4WonString: text "よるになると　くらくなるから" line "こどもは　はやく　かえりなさい！" @@ -195,7 +195,7 @@ ShizukanaOkaTrainer4WonString: line "おれは　ひをふくから　だいじょうぶ" done -ShizukanaOkaTrainer3EncounterString: +SilentHillsTrainer3EncounterString: text "むしポケモンの　ことなら" line "だれよりも　くわしいよ" done @@ -203,7 +203,7 @@ ShizukanaOkaTrainer3EncounterString: text "パラパラー" done -ShizukanaOkaTrainer3WonString: +SilentHillsTrainer3WonString: text "ポケモンずかんを　つくるんだって？" line "ちょっと　みせてよ" @@ -211,7 +211,7 @@ ShizukanaOkaTrainer3WonString: line "タイプべつに　ポケモン　さがせるんだ" done -ShizukanaOkaTrainer2EncounterString: +SilentHillsTrainer2EncounterString: text "いっとくけど" line "きみよりも　べんきょう　してるから" cont "きみよりも　つよいよ　ぜったい！" @@ -220,13 +220,13 @@ ShizukanaOkaTrainer2EncounterString: text "な　なぜなんだ？" done -ShizukanaOkaTrainer2WonString: +SilentHillsTrainer2WonString: text "おかしいよ⋯⋯" line "まいにち　ポケモンの　べんきょうを" cont "きちんと　してるのに　まけるなんて" done -ShizukanaOkaText1String: +SilentHillsText1String: text "この　おかの　ポケモンは　よわい！" line "だから　ここで　しゅぎょう　している" cont "トレーナーも　おおいよ" @@ -235,12 +235,12 @@ ShizukanaOkaText1String: line "うでだめしを　するといい" done -ShizukanaOkaSignpost2String: +SilentHillsSignpost2String: text "しずかな　おか" line "サイレントヒル　は　こちら" done -ShizukanaOkaSignpost1String: +SilentHillsSignpost1String: text "しずかな　おか" line "オールドシティ　は　こちら" done diff --git a/scripts/dummy_text_pointers.asm b/scripts/dummy_text_pointers.asm index 2a274c23..f1ebaeb7 100644 --- a/scripts/dummy_text_pointers.asm +++ b/scripts/dummy_text_pointers.asm @@ -3,12 +3,12 @@ INCLUDE "constants.asm" SECTION "scripts/dummy_text_pointers.asm", ROMX OldCity_TextPointers:: West_TextPointers:: -Haiteku_TextPointers:: -Fonto_TextPointers:: -Baadon_TextPointers:: +HighTech_TextPointers:: +Font_TextPointers:: +Birdon_TextPointers:: Newtype_TextPointers:: Sugar_TextPointers:: -BullForest_TextPointers:: +BlueForest_TextPointers:: Stand_TextPointers:: Kanto_TextPointers:: Prince_TextPointers:: @@ -16,29 +16,29 @@ MtFuji_TextPointers:: South_TextPointers:: North_TextPointers:: Route2_TextPointers:: -HaitekuWestRoute_TextPointers:: -HaitekuWestRouteOcean_TextPointers:: -FontoRoute1_TextPointers:: -FontoRoute6_TextPointers:: -FontoRoute2_TextPointers:: -FontoRoute4_TextPointers:: -FontoRoute3_TextPointers:: -BaadonRoute1_TextPointers:: -BaadonRoute2_TextPointers:: -BaadonRoute3_TextPointers:: +HighTechWestRoute_TextPointers:: +HighTechWestRouteOcean_TextPointers:: +FontRoute1_TextPointers:: +FontRoute6_TextPointers:: +FontRoute2_TextPointers:: +FontRoute4_TextPointers:: +FontRoute3_TextPointers:: +BirdonRoute1_TextPointers:: +BirdonRoute2_TextPointers:: +BirdonRoute3_TextPointers:: Route15_TextPointers:: NewtypeRoute_TextPointers:: Route18_TextPointers:: -BullForestRoute1_TextPointers:: +BlueForestRoute1_TextPointers:: SugarRoute_TextPointers:: -BullForestRoute2_TextPointers:: +BlueForestRoute2_TextPointers:: StandRoute_TextPointers:: KantoEastRoute_TextPointers:: RouteSilentEast_TextPointers:: PrinceRoute_TextPointers:: MtFujiRoute_TextPointers:: -FontoRoute5_TextPointers:: -BullForestRoute3_TextPointers:: +FontRoute5_TextPointers:: +BlueForestRoute3_TextPointers:: dw GameFreakText dw GameFreakText dw GameFreakText