diff --git a/data/layouts/LavaridgeTown/map.bin b/data/layouts/LavaridgeTown/map.bin index a001f8cd38..604ad5f3f8 100644 --- a/data/layouts/LavaridgeTown/map.bin +++ b/data/layouts/LavaridgeTown/map.bin @@ -1,3 +1,3 @@ -qqqq{ttttt|qqqqqqq66{tttzq2񭀬񭀬xttttttttr{2t2|qqqNKLOq6rr񋍐񋉖JHIMyy0123rr򔾖񋍆PQRS2289:;򷠶rr񠫞򘄨XYZ[󩅍`ABC򷠶rr`abc550 1"1044rr򑺐񚢠򎰬0 1"10000 1"1000rr񚠀񚠀220 1"1000 1"1000rr燘燘00 1!11111!1!1111rr22200(1)1)1)1)1)1)1)1)1)1)1rr񠙁񣝹񣞃000000000000rr0000 0 0 +qqqq{ttttt|qqqqqqq66{tttzq2񭀬񭀬xttttttttr{2t2|qqqNKLOq6rr񋍐񋉖JHIMyy0123rr2332PQRS2289:;򷠶rr񠫞򘄨XYZ[󩅍`ABC򷠶rr`abc550 1"1044rr򑺐񚢠򎰬0 1"10000 1"1000rr񚠀񚠀220 1"1000 1"1000rr燘燘00 1!11111!1!1111rr22200(1)1)1)1)1)1)1)1)1)1)1rr񠙁񣝹񣞃000000000000rr0000 0 0 00 0 0 00rr0000rr000  4rr򼯽000 !" !"4rr000000000000400004m000000000000000򷠶qqrm0000000000000044qqllllllllllllllll \ No newline at end of file diff --git a/data/maps/DewfordTown/map.json b/data/maps/DewfordTown/map.json index 4ad6364593..f073a74368 100644 --- a/data/maps/DewfordTown/map.json +++ b/data/maps/DewfordTown/map.json @@ -89,19 +89,6 @@ "trainer_sight_or_berry_tree_id": "0", "script": "DewfordTown_EventScript_TrendyPhraseBoy", "flag": "0" - }, - { - "graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE", - "x": 4, - "y": 10, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_NONE", - "movement_range_x": 0, - "movement_range_y": 0, - "trainer_type": "TRAINER_TYPE_NONE", - "trainer_sight_or_berry_tree_id": "LIGHT_TYPE_PKMN_CENTER_SIGN", - "script": "NULL", - "flag": "0" } ], "warp_events": [ diff --git a/data/maps/EverGrandeCity/map.json b/data/maps/EverGrandeCity/map.json index 86ad3a91b3..58978b7ff8 100644 --- a/data/maps/EverGrandeCity/map.json +++ b/data/maps/EverGrandeCity/map.json @@ -19,21 +19,7 @@ "direction": "left" } ], - "object_events": [ - { - "graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE", - "x": 29, - "y": 48, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_NONE", - "movement_range_x": 0, - "movement_range_y": 0, - "trainer_type": "TRAINER_TYPE_NONE", - "trainer_sight_or_berry_tree_id": "LIGHT_TYPE_PKMN_CENTER_SIGN", - "script": "NULL", - "flag": "0" - } - ], + "object_events": [], "warp_events": [ { "x": 18, diff --git a/data/maps/LavaridgeTown/map.json b/data/maps/LavaridgeTown/map.json index a70ec8b545..ecf7c5b9f1 100644 --- a/data/maps/LavaridgeTown/map.json +++ b/data/maps/LavaridgeTown/map.json @@ -77,7 +77,7 @@ "x": 4, "y": 4, "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", diff --git a/data/maps/LilycoveCity/map.json b/data/maps/LilycoveCity/map.json index 1b9004eaa5..0b829ea09e 100644 --- a/data/maps/LilycoveCity/map.json +++ b/data/maps/LilycoveCity/map.json @@ -310,19 +310,6 @@ "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_EventScript_FatMan", "flag": "0" - }, - { - "graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE", - "x": 26, - "y": 14, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_NONE", - "movement_range_x": 0, - "movement_range_y": 0, - "trainer_type": "TRAINER_TYPE_NONE", - "trainer_sight_or_berry_tree_id": "LIGHT_TYPE_PKMN_CENTER_SIGN", - "script": "NULL", - "flag": "0" } ], "warp_events": [ diff --git a/data/maps/MauvilleCity/map.json b/data/maps/MauvilleCity/map.json index 1ebe629476..0d193e4022 100644 --- a/data/maps/MauvilleCity/map.json +++ b/data/maps/MauvilleCity/map.json @@ -177,32 +177,6 @@ "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_MAUVILLE_CITY_SCOTT" - }, - { - "graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE", - "x": 24, - "y": 5, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_NONE", - "movement_range_x": 0, - "movement_range_y": 0, - "trainer_type": "TRAINER_TYPE_NONE", - "trainer_sight_or_berry_tree_id": "LIGHT_TYPE_PKMN_CENTER_SIGN", - "script": "NULL", - "flag": "0" - }, - { - "graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE", - "x": 25, - "y": 14, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_NONE", - "movement_range_x": 0, - "movement_range_y": 0, - "trainer_type": "TRAINER_TYPE_NONE", - "trainer_sight_or_berry_tree_id": "LIGHT_TYPE_POKE_MART_SIGN", - "script": "NULL", - "flag": "0" } ], "warp_events": [ diff --git a/data/maps/MossdeepCity/map.json b/data/maps/MossdeepCity/map.json index 4891f9968a..a7ec32d7b1 100644 --- a/data/maps/MossdeepCity/map.json +++ b/data/maps/MossdeepCity/map.json @@ -250,32 +250,6 @@ "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_EventScript_BlackBelt", "flag": "0" - }, - { - "graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE", - "x": 30, - "y": 16, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_NONE", - "movement_range_x": 0, - "movement_range_y": 0, - "trainer_type": "TRAINER_TYPE_NONE", - "trainer_sight_or_berry_tree_id": "LIGHT_TYPE_PKMN_CENTER_SIGN", - "script": "NULL", - "flag": "0" - }, - { - "graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE", - "x": 39, - "y": 18, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_NONE", - "movement_range_x": 0, - "movement_range_y": 0, - "trainer_type": "TRAINER_TYPE_NONE", - "trainer_sight_or_berry_tree_id": "LIGHT_TYPE_POKE_MART_SIGN", - "script": "NULL", - "flag": "0" } ], "warp_events": [ diff --git a/data/maps/PacifidlogTown/map.json b/data/maps/PacifidlogTown/map.json index 2a06e4aca7..37cfe8ad08 100644 --- a/data/maps/PacifidlogTown/map.json +++ b/data/maps/PacifidlogTown/map.json @@ -63,19 +63,6 @@ "trainer_sight_or_berry_tree_id": "0", "script": "PacifidlogTown_EventScript_NinjaBoy", "flag": "0" - }, - { - "graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE", - "x": 10, - "y": 15, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_NONE", - "movement_range_x": 0, - "movement_range_y": 0, - "trainer_type": "TRAINER_TYPE_NONE", - "trainer_sight_or_berry_tree_id": "LIGHT_TYPE_PKMN_CENTER_SIGN", - "script": "NULL", - "flag": "0" } ], "warp_events": [ @@ -122,9 +109,7 @@ "dest_warp_id": "0" } ], - "coord_events": [ - - ], + "coord_events": [], "bg_events": [ { "type": "sign", diff --git a/data/maps/PetalburgCity/map.json b/data/maps/PetalburgCity/map.json index 54bae3539c..7aaca8145c 100644 --- a/data/maps/PetalburgCity/map.json +++ b/data/maps/PetalburgCity/map.json @@ -141,32 +141,6 @@ "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_PETALBURG_CITY_SCOTT" - }, - { - "graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE", - "x": 22, - "y": 16, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_NONE", - "movement_range_x": 0, - "movement_range_y": 0, - "trainer_type": "TRAINER_TYPE_NONE", - "trainer_sight_or_berry_tree_id": "LIGHT_TYPE_PKMN_CENTER_SIGN", - "script": "NULL", - "flag": "0" - }, - { - "graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE", - "x": 27, - "y": 12, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_NONE", - "movement_range_x": 0, - "movement_range_y": 0, - "trainer_type": "TRAINER_TYPE_NONE", - "trainer_sight_or_berry_tree_id": "LIGHT_TYPE_POKE_MART_SIGN", - "script": "NULL", - "flag": "0" } ], "warp_events": [ diff --git a/data/maps/Route102/map.json b/data/maps/Route102/map.json index 3a1726751b..8ad17aae4d 100644 --- a/data/maps/Route102/map.json +++ b/data/maps/Route102/map.json @@ -141,27 +141,10 @@ "trainer_sight_or_berry_tree_id": "3", "script": "Route102_EventScript_Allen", "flag": "0" - }, - { - "graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE", - "x": -3, - "y": 2, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_NONE", - "movement_range_x": 0, - "movement_range_y": 0, - "trainer_type": "TRAINER_TYPE_NONE", - "trainer_sight_or_berry_tree_id": "LIGHT_TYPE_POKE_MART_SIGN", - "script": "NULL", - "flag": "0" } ], - "warp_events": [ - - ], - "coord_events": [ - - ], + "warp_events": [], + "coord_events": [], "bg_events": [ { "type": "sign", diff --git a/data/maps/RustboroCity/map.json b/data/maps/RustboroCity/map.json index a32ce7d610..9a987ab284 100644 --- a/data/maps/RustboroCity/map.json +++ b/data/maps/RustboroCity/map.json @@ -237,227 +237,6 @@ "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_EventScript_Boy1", "flag": "0" - }, - { - "graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE", - "x": 19, - "y": 37, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_NONE", - "movement_range_x": 0, - "movement_range_y": 0, - "trainer_type": "TRAINER_TYPE_NONE", - "trainer_sight_or_berry_tree_id": "LIGHT_TYPE_BALL", - "script": "NULL", - "flag": "0" - }, - { - "graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE", - "x": 22, - "y": 37, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_NONE", - "movement_range_x": 0, - "movement_range_y": 0, - "trainer_type": "TRAINER_TYPE_NONE", - "trainer_sight_or_berry_tree_id": "LIGHT_TYPE_BALL", - "script": "NULL", - "flag": "0" - }, - { - "graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE", - "x": 19, - "y": 30, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_NONE", - "movement_range_x": 0, - "movement_range_y": 0, - "trainer_type": "TRAINER_TYPE_NONE", - "trainer_sight_or_berry_tree_id": "LIGHT_TYPE_BALL", - "script": "NULL", - "flag": "0" - }, - { - "graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE", - "x": 22, - "y": 30, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_NONE", - "movement_range_x": 0, - "movement_range_y": 0, - "trainer_type": "TRAINER_TYPE_NONE", - "trainer_sight_or_berry_tree_id": "LIGHT_TYPE_BALL", - "script": "NULL", - "flag": "0" - }, - { - "graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE", - "x": 19, - "y": 23, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_NONE", - "movement_range_x": 0, - "movement_range_y": 0, - "trainer_type": "TRAINER_TYPE_NONE", - "trainer_sight_or_berry_tree_id": "LIGHT_TYPE_BALL", - "script": "NULL", - "flag": "0" - }, - { - "graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE", - "x": 22, - "y": 23, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_NONE", - "movement_range_x": 0, - "movement_range_y": 0, - "trainer_type": "TRAINER_TYPE_NONE", - "trainer_sight_or_berry_tree_id": "LIGHT_TYPE_BALL", - "script": "NULL", - "flag": "0" - }, - { - "graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE", - "x": 22, - "y": 44, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_NONE", - "movement_range_x": 0, - "movement_range_y": 0, - "trainer_type": "TRAINER_TYPE_NONE", - "trainer_sight_or_berry_tree_id": "LIGHT_TYPE_BALL", - "script": "NULL", - "flag": "0" - }, - { - "graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE", - "x": 19, - "y": 44, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_NONE", - "movement_range_x": 0, - "movement_range_y": 0, - "trainer_type": "TRAINER_TYPE_NONE", - "trainer_sight_or_berry_tree_id": "LIGHT_TYPE_BALL", - "script": "NULL", - "flag": "0" - }, - { - "graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE", - "x": 29, - "y": 48, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_NONE", - "movement_range_x": 0, - "movement_range_y": 0, - "trainer_type": "TRAINER_TYPE_NONE", - "trainer_sight_or_berry_tree_id": "LIGHT_TYPE_BALL", - "script": "NULL", - "flag": "0" - }, - { - "graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE", - "x": 14, - "y": 19, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_NONE", - "movement_range_x": 0, - "movement_range_y": 0, - "trainer_type": "TRAINER_TYPE_NONE", - "trainer_sight_or_berry_tree_id": "LIGHT_TYPE_BALL", - "script": "NULL", - "flag": "0" - }, - { - "graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE", - "x": 15, - "y": 17, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_NONE", - "movement_range_x": 0, - "movement_range_y": 0, - "trainer_type": "TRAINER_TYPE_NONE", - "trainer_sight_or_berry_tree_id": "LIGHT_TYPE_BALL", - "script": "NULL", - "flag": "0" - }, - { - "graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE", - "x": 9, - "y": 19, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_NONE", - "movement_range_x": 0, - "movement_range_y": 0, - "trainer_type": "TRAINER_TYPE_NONE", - "trainer_sight_or_berry_tree_id": "LIGHT_TYPE_BALL", - "script": "NULL", - "flag": "0" - }, - { - "graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE", - "x": 8, - "y": 17, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_NONE", - "movement_range_x": 0, - "movement_range_y": 0, - "trainer_type": "TRAINER_TYPE_NONE", - "trainer_sight_or_berry_tree_id": "LIGHT_TYPE_BALL", - "script": "NULL", - "flag": "0" - }, - { - "graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE", - "x": 19, - "y": 15, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_NONE", - "movement_range_x": 0, - "movement_range_y": 0, - "trainer_type": "TRAINER_TYPE_NONE", - "trainer_sight_or_berry_tree_id": "LIGHT_TYPE_BALL", - "script": "NULL", - "flag": "0" - }, - { - "graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE", - "x": 22, - "y": 15, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_NONE", - "movement_range_x": 0, - "movement_range_y": 0, - "trainer_type": "TRAINER_TYPE_NONE", - "trainer_sight_or_berry_tree_id": "LIGHT_TYPE_BALL", - "script": "NULL", - "flag": "0" - }, - { - "graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE", - "x": 14, - "y": 54, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_NONE", - "movement_range_x": 0, - "movement_range_y": 0, - "trainer_type": "TRAINER_TYPE_NONE", - "trainer_sight_or_berry_tree_id": "LIGHT_TYPE_BALL", - "script": "NULL", - "flag": "0" - }, - { - "graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE", - "x": 17, - "y": 54, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_NONE", - "movement_range_x": 0, - "movement_range_y": 0, - "trainer_type": "TRAINER_TYPE_NONE", - "trainer_sight_or_berry_tree_id": "LIGHT_TYPE_BALL", - "script": "NULL", - "flag": "0" } ], "warp_events": [ diff --git a/data/maps/SlateportCity/map.json b/data/maps/SlateportCity/map.json index e2b6d47c67..972b51447e 100644 --- a/data/maps/SlateportCity/map.json +++ b/data/maps/SlateportCity/map.json @@ -484,32 +484,6 @@ "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_SLATEPORT_CITY_SCOTT" - }, - { - "graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE", - "x": 21, - "y": 19, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_NONE", - "movement_range_x": 0, - "movement_range_y": 0, - "trainer_type": "TRAINER_TYPE_NONE", - "trainer_sight_or_berry_tree_id": "LIGHT_TYPE_PKMN_CENTER_SIGN", - "script": "NULL", - "flag": "0" - }, - { - "graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE", - "x": 15, - "y": 26, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_NONE", - "movement_range_x": 0, - "movement_range_y": 0, - "trainer_type": "TRAINER_TYPE_NONE", - "trainer_sight_or_berry_tree_id": "LIGHT_TYPE_POKE_MART_SIGN", - "script": "NULL", - "flag": "0" } ], "warp_events": [ diff --git a/data/maps/VerdanturfTown/map.json b/data/maps/VerdanturfTown/map.json index d2522517ab..ae40730c0e 100644 --- a/data/maps/VerdanturfTown/map.json +++ b/data/maps/VerdanturfTown/map.json @@ -76,32 +76,6 @@ "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_EventScript_Camper", "flag": "0" - }, - { - "graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE", - "x": 18, - "y": 3, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_NONE", - "movement_range_x": 0, - "movement_range_y": 0, - "trainer_type": "TRAINER_TYPE_NONE", - "trainer_sight_or_berry_tree_id": "LIGHT_TYPE_PKMN_CENTER_SIGN", - "script": "NULL", - "flag": "0" - }, - { - "graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE", - "x": 14, - "y": 3, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_NONE", - "movement_range_x": 0, - "movement_range_y": 0, - "trainer_type": "TRAINER_TYPE_NONE", - "trainer_sight_or_berry_tree_id": "LIGHT_TYPE_POKE_MART_SIGN", - "script": "NULL", - "flag": "0" } ], "warp_events": [ diff --git a/data/tilesets/primary/general/metatile_attributes.bin b/data/tilesets/primary/general/metatile_attributes.bin index 552dafb603..d9cd29016d 100644 Binary files a/data/tilesets/primary/general/metatile_attributes.bin and b/data/tilesets/primary/general/metatile_attributes.bin differ diff --git a/data/tilesets/primary/general/metatiles.bin b/data/tilesets/primary/general/metatiles.bin index 813543f580..af899bcc5e 100644 Binary files a/data/tilesets/primary/general/metatiles.bin and b/data/tilesets/primary/general/metatiles.bin differ diff --git a/data/tilesets/primary/general/palettes/04.pal b/data/tilesets/primary/general/palettes/04.pal index 313337d6da..d8051b7bac 100644 --- a/data/tilesets/primary/general/palettes/04.pal +++ b/data/tilesets/primary/general/palettes/04.pal @@ -1,14 +1,14 @@ JASC-PAL 0100 16 -0 0 0 -216 224 232 +24 41 82 +255 255 255 222 230 238 -184 200 224 -152 176 216 -112 184 240 +255 0 255 +255 0 255 +255 0 255 156 164 189 -80 104 208 +82 106 213 65 90 189 57 82 156 41 65 139 @@ -16,4 +16,4 @@ JASC-PAL 139 164 222 106 131 213 82 106 213 -96 168 232 +115 197 164 diff --git a/data/tilesets/primary/general/palettes/04.pla b/data/tilesets/primary/general/palettes/04.pla deleted file mode 100644 index 5f08f88f35..0000000000 --- a/data/tilesets/primary/general/palettes/04.pla +++ /dev/null @@ -1,6 +0,0 @@ -# Color indices to set high bit -1 -3 -4 -5 -15 \ No newline at end of file diff --git a/data/tilesets/primary/general/palettes/13.pal b/data/tilesets/primary/general/palettes/13.pal index 73fec5261a..4b0812f094 100644 --- a/data/tilesets/primary/general/palettes/13.pal +++ b/data/tilesets/primary/general/palettes/13.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -232 0 128 -232 228 216 -222 230 238 -224 214 184 -216 200 152 -244 226 171 -156 164 189 -80 104 208 -65 90 189 -57 82 156 -41 65 139 -172 197 230 -139 164 222 -106 131 213 -82 106 213 -221 205 143 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/primary/general/tiles.png b/data/tilesets/primary/general/tiles.png index b22b3f1fcb..17426ab80e 100644 Binary files a/data/tilesets/primary/general/tiles.png and b/data/tilesets/primary/general/tiles.png differ diff --git a/data/tilesets/secondary/dewford/metatile_attributes.bin b/data/tilesets/secondary/dewford/metatile_attributes.bin index 158238664f..67ee25d405 100644 Binary files a/data/tilesets/secondary/dewford/metatile_attributes.bin and b/data/tilesets/secondary/dewford/metatile_attributes.bin differ diff --git a/data/tilesets/secondary/dewford/metatiles.bin b/data/tilesets/secondary/dewford/metatiles.bin index 9e1f54e174..728d5b6325 100644 Binary files a/data/tilesets/secondary/dewford/metatiles.bin and b/data/tilesets/secondary/dewford/metatiles.bin differ diff --git a/data/tilesets/secondary/dewford/tiles.png b/data/tilesets/secondary/dewford/tiles.png index 2af1303c27..33e61b435d 100644 Binary files a/data/tilesets/secondary/dewford/tiles.png and b/data/tilesets/secondary/dewford/tiles.png differ diff --git a/data/tilesets/secondary/ever_grande/palettes/01.pal b/data/tilesets/secondary/ever_grande/palettes/01.pal index 2c02767613..3c6e40c2e9 100644 --- a/data/tilesets/secondary/ever_grande/palettes/01.pal +++ b/data/tilesets/secondary/ever_grande/palettes/01.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -0 197 0 -246 197 123 -238 156 90 -205 115 41 -164 90 49 +24 41 82 +255 255 255 +222 230 238 +189 205 230 +156 180 222 131 131 139 98 98 123 65 74 106 41 49 90 -224 226 171 -216 200 152 -255 255 238 -222 222 197 -197 197 164 -164 172 123 -255 255 115 +115 189 246 +98 172 238 +255 189 131 +238 148 115 +222 106 98 +205 65 82 +115 197 164 diff --git a/data/tilesets/secondary/ever_grande/palettes/08.pal b/data/tilesets/secondary/ever_grande/palettes/08.pal index fcd13d7723..083dd5080a 100644 --- a/data/tilesets/secondary/ever_grande/palettes/08.pal +++ b/data/tilesets/secondary/ever_grande/palettes/08.pal @@ -1,7 +1,7 @@ JASC-PAL 0100 16 -0 0 0 +24 41 82 246 197 123 238 156 90 205 115 41 diff --git a/data/tilesets/secondary/ever_grande/palettes/08.pla b/data/tilesets/secondary/ever_grande/palettes/08.pla deleted file mode 100644 index 5eb702de80..0000000000 --- a/data/tilesets/secondary/ever_grande/palettes/08.pla +++ /dev/null @@ -1,3 +0,0 @@ -# Color indices to set high bit -9 -10 \ No newline at end of file diff --git a/data/tilesets/secondary/fallarbor/palettes/00.pal b/data/tilesets/secondary/fallarbor/palettes/00.pal index 87f9999aef..ede0c60a19 100644 --- a/data/tilesets/secondary/fallarbor/palettes/00.pal +++ b/data/tilesets/secondary/fallarbor/palettes/00.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -0 192 0 -222 230 164 -180 197 115 -148 156 82 -123 131 65 +115 197 164 +255 255 255 +222 230 238 +189 205 230 +156 180 222 131 131 139 98 98 123 65 74 106 -88 168 168 -221 205 143 -244 226 171 -255 205 82 -230 156 49 -222 123 32 -156 98 41 -128 192 216 +189 189 131 +115 189 246 +98 172 238 +115 189 246 +98 164 222 +82 139 197 +74 115 172 +115 197 164 diff --git a/data/tilesets/secondary/fallarbor/palettes/07.pal b/data/tilesets/secondary/fallarbor/palettes/07.pal index 6cb1ea50e7..724a8f09db 100644 --- a/data/tilesets/secondary/fallarbor/palettes/07.pal +++ b/data/tilesets/secondary/fallarbor/palettes/07.pal @@ -1,7 +1,7 @@ JASC-PAL 0100 16 -0 0 0 +24 41 82 222 230 164 180 197 115 148 156 82 @@ -9,11 +9,11 @@ JASC-PAL 131 131 139 98 98 123 65 74 106 -88 168 168 +41 49 90 90 172 172 131 197 222 255 205 82 230 156 49 222 123 32 156 98 41 -128 192 216 +115 197 164 diff --git a/data/tilesets/secondary/fallarbor/palettes/07.pla b/data/tilesets/secondary/fallarbor/palettes/07.pla deleted file mode 100644 index 5eb702de80..0000000000 --- a/data/tilesets/secondary/fallarbor/palettes/07.pla +++ /dev/null @@ -1,3 +0,0 @@ -# Color indices to set high bit -9 -10 \ No newline at end of file diff --git a/data/tilesets/secondary/fallarbor/tiles.png b/data/tilesets/secondary/fallarbor/tiles.png index 06b86ff956..3582d1d030 100644 Binary files a/data/tilesets/secondary/fallarbor/tiles.png and b/data/tilesets/secondary/fallarbor/tiles.png differ diff --git a/data/tilesets/secondary/fortree/metatiles.bin b/data/tilesets/secondary/fortree/metatiles.bin index 1b0958cbd1..ecc00d7e70 100644 Binary files a/data/tilesets/secondary/fortree/metatiles.bin and b/data/tilesets/secondary/fortree/metatiles.bin differ diff --git a/data/tilesets/secondary/fortree/palettes/08.pal b/data/tilesets/secondary/fortree/palettes/08.pal index 1d8a56f8e7..40b922e287 100644 --- a/data/tilesets/secondary/fortree/palettes/08.pal +++ b/data/tilesets/secondary/fortree/palettes/08.pal @@ -1,7 +1,7 @@ JASC-PAL 0100 16 -176 184 200 +255 255 255 255 255 255 246 238 189 230 213 172 @@ -16,4 +16,4 @@ JASC-PAL 0 0 0 172 180 197 123 123 123 -176 184 200 +115 197 164 diff --git a/data/tilesets/secondary/fortree/palettes/08.pla b/data/tilesets/secondary/fortree/palettes/08.pla deleted file mode 100644 index 69488b50cb..0000000000 --- a/data/tilesets/secondary/fortree/palettes/08.pla +++ /dev/null @@ -1,6 +0,0 @@ -# Color indices to set high bit -0 -8 -9 -11 -15 \ No newline at end of file diff --git a/data/tilesets/secondary/fortree/tiles.png b/data/tilesets/secondary/fortree/tiles.png index 2da9fcbfab..9cd688c5ed 100644 Binary files a/data/tilesets/secondary/fortree/tiles.png and b/data/tilesets/secondary/fortree/tiles.png differ diff --git a/data/tilesets/secondary/lavaridge/metatiles.bin b/data/tilesets/secondary/lavaridge/metatiles.bin index c9bc71442a..fd0314ed78 100644 Binary files a/data/tilesets/secondary/lavaridge/metatiles.bin and b/data/tilesets/secondary/lavaridge/metatiles.bin differ diff --git a/data/tilesets/secondary/lavaridge/palettes/06.pal b/data/tilesets/secondary/lavaridge/palettes/06.pal index 3ea0c42542..00e1478a73 100644 --- a/data/tilesets/secondary/lavaridge/palettes/06.pal +++ b/data/tilesets/secondary/lavaridge/palettes/06.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -224 40 0 -64 72 104 -192 200 0 -224 232 232 -248 248 248 -248 112 64 -224 112 64 -176 96 88 -160 80 80 -200 48 0 -144 48 0 -240 24 24 -240 144 0 -144 160 64 -104 120 136 -224 40 0 +0 0 0 +65 74 106 +197 205 0 +230 238 238 +255 255 255 +255 115 65 +230 115 65 +180 98 90 +164 82 82 +205 49 0 +148 49 0 +246 24 24 +246 148 0 +148 164 65 +106 123 139 +222 222 0 diff --git a/data/tilesets/secondary/lavaridge/palettes/06.pla b/data/tilesets/secondary/lavaridge/palettes/06.pla deleted file mode 100644 index 26f59249a8..0000000000 --- a/data/tilesets/secondary/lavaridge/palettes/06.pla +++ /dev/null @@ -1,7 +0,0 @@ -# Color indices to set high bit -0 -9 -10 -11 -12 -15 \ No newline at end of file diff --git a/data/tilesets/secondary/lavaridge/tiles.png b/data/tilesets/secondary/lavaridge/tiles.png index 03c832c37a..2f6898a0f7 100644 Binary files a/data/tilesets/secondary/lavaridge/tiles.png and b/data/tilesets/secondary/lavaridge/tiles.png differ diff --git a/data/tilesets/secondary/lilycove/metatile_attributes.bin b/data/tilesets/secondary/lilycove/metatile_attributes.bin index f31cc9a047..0f4e01b923 100644 Binary files a/data/tilesets/secondary/lilycove/metatile_attributes.bin and b/data/tilesets/secondary/lilycove/metatile_attributes.bin differ diff --git a/data/tilesets/secondary/lilycove/metatiles.bin b/data/tilesets/secondary/lilycove/metatiles.bin index f82bdff5c6..6018ac8ec3 100644 Binary files a/data/tilesets/secondary/lilycove/metatiles.bin and b/data/tilesets/secondary/lilycove/metatiles.bin differ diff --git a/data/tilesets/secondary/lilycove/palettes/06.pal b/data/tilesets/secondary/lilycove/palettes/06.pal index a40ff7909c..4b0812f094 100644 --- a/data/tilesets/secondary/lilycove/palettes/06.pal +++ b/data/tilesets/secondary/lilycove/palettes/06.pal @@ -2,17 +2,17 @@ JASC-PAL 0100 16 0 0 0 -168 184 240 -112 144 208 -115 148 213 -90 115 189 -131 131 139 -216 208 216 -65 74 106 -222 213 222 -112 144 208 -131 197 213 -248 248 248 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 0 0 0 0 0 0 0 0 0 diff --git a/data/tilesets/secondary/lilycove/palettes/06.pla b/data/tilesets/secondary/lilycove/palettes/06.pla deleted file mode 100644 index 77b77f073c..0000000000 --- a/data/tilesets/secondary/lilycove/palettes/06.pla +++ /dev/null @@ -1,6 +0,0 @@ -# Color indices to set high bit -1 -2 -6 -9 -10 \ No newline at end of file diff --git a/data/tilesets/secondary/lilycove/palettes/15.pal b/data/tilesets/secondary/lilycove/palettes/15.pal index 41c4142bb9..e7717d74ea 100644 --- a/data/tilesets/secondary/lilycove/palettes/15.pal +++ b/data/tilesets/secondary/lilycove/palettes/15.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -24 200 0 -244 226 171 -221 205 143 -115 148 213 -90 115 189 -131 131 139 -232 228 216 -65 74 106 -222 213 222 -221 205 143 -244 226 171 -248 248 248 -0 0 0 -0 0 0 -0 0 0 +115 197 164 +255 213 180 +255 197 148 +222 148 115 +123 65 65 +57 74 123 +41 57 98 +24 41 82 +16 32 57 +222 230 238 +255 197 90 +189 156 90 +255 98 90 +197 65 65 +255 255 255 0 0 0 diff --git a/data/tilesets/secondary/lilycove/tiles.png b/data/tilesets/secondary/lilycove/tiles.png index 56be3ab4dc..44111c4487 100644 Binary files a/data/tilesets/secondary/lilycove/tiles.png and b/data/tilesets/secondary/lilycove/tiles.png differ diff --git a/data/tilesets/secondary/mauville/metatiles.bin b/data/tilesets/secondary/mauville/metatiles.bin index 148991e52e..a71ead8e57 100644 Binary files a/data/tilesets/secondary/mauville/metatiles.bin and b/data/tilesets/secondary/mauville/metatiles.bin differ diff --git a/data/tilesets/secondary/mauville/palettes/07.pal b/data/tilesets/secondary/mauville/palettes/07.pal index f3618ff714..fa1dbd2962 100644 --- a/data/tilesets/secondary/mauville/palettes/07.pal +++ b/data/tilesets/secondary/mauville/palettes/07.pal @@ -9,11 +9,11 @@ JASC-PAL 131 131 139 98 98 123 65 74 106 -40 48 88 +41 49 90 213 213 213 164 164 172 230 197 246 213 139 222 197 115 164 148 98 106 -168 200 224 +172 205 230 diff --git a/data/tilesets/secondary/mauville/palettes/07.pla b/data/tilesets/secondary/mauville/palettes/07.pla deleted file mode 100644 index 5e51fe661a..0000000000 --- a/data/tilesets/secondary/mauville/palettes/07.pla +++ /dev/null @@ -1,3 +0,0 @@ -# Color indices to set high bit -1 -15 \ No newline at end of file diff --git a/data/tilesets/secondary/mauville/palettes/08.pal b/data/tilesets/secondary/mauville/palettes/08.pal index 3742cfd9ba..bc7cb5c883 100644 --- a/data/tilesets/secondary/mauville/palettes/08.pal +++ b/data/tilesets/secondary/mauville/palettes/08.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 123 180 189 -0 248 0 +115 189 246 131 197 98 57 139 49 57 82 0 255 255 98 255 255 255 222 230 238 -0 248 0 +189 205 230 255 172 222 230 131 180 213 90 139 -0 248 0 +164 213 197 115 197 164 -0 248 0 -0 248 0 +65 180 131 +24 164 106 diff --git a/data/tilesets/secondary/mauville/palettes/09.pal b/data/tilesets/secondary/mauville/palettes/09.pal index 312bb1aac7..9c37027c3d 100644 --- a/data/tilesets/secondary/mauville/palettes/09.pal +++ b/data/tilesets/secondary/mauville/palettes/09.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 123 180 189 -248 0 248 +255 255 255 131 197 98 57 139 49 57 82 0 255 255 98 172 197 230 -248 0 248 -248 0 248 +139 164 222 +106 131 213 255 230 148 238 197 115 -248 0 248 +230 172 82 164 213 197 115 197 164 -248 0 248 -248 0 248 +65 180 131 +24 164 106 diff --git a/data/tilesets/secondary/mauville/palettes/10.pal b/data/tilesets/secondary/mauville/palettes/10.pal index b0d6736e5e..a2e1cdc176 100644 --- a/data/tilesets/secondary/mauville/palettes/10.pal +++ b/data/tilesets/secondary/mauville/palettes/10.pal @@ -9,9 +9,9 @@ JASC-PAL 131 131 139 98 98 123 65 74 106 -144 216 248 +41 49 90 246 197 98 -144 216 248 +148 222 255 230 172 238 213 139 222 197 115 164 diff --git a/data/tilesets/secondary/mauville/palettes/10.pla b/data/tilesets/secondary/mauville/palettes/10.pla deleted file mode 100644 index 24701d55f5..0000000000 --- a/data/tilesets/secondary/mauville/palettes/10.pla +++ /dev/null @@ -1,4 +0,0 @@ -# Color indices to set high bit -1 -9 -10 \ No newline at end of file diff --git a/data/tilesets/secondary/mauville/palettes/11.pal b/data/tilesets/secondary/mauville/palettes/11.pal index a48424b133..c73ec2fe82 100644 --- a/data/tilesets/secondary/mauville/palettes/11.pal +++ b/data/tilesets/secondary/mauville/palettes/11.pal @@ -1,7 +1,7 @@ JASC-PAL 0100 16 -123 180 189 +172 180 139 255 255 255 222 230 238 164 180 197 diff --git a/data/tilesets/secondary/mauville/palettes/11.pla b/data/tilesets/secondary/mauville/palettes/11.pla deleted file mode 100644 index 0dcbee2087..0000000000 --- a/data/tilesets/secondary/mauville/palettes/11.pla +++ /dev/null @@ -1,3 +0,0 @@ -# Color indices to set high bit -7 -8 \ No newline at end of file diff --git a/data/tilesets/secondary/mauville/tiles.png b/data/tilesets/secondary/mauville/tiles.png index 09bab36577..208a052c53 100644 Binary files a/data/tilesets/secondary/mauville/tiles.png and b/data/tilesets/secondary/mauville/tiles.png differ diff --git a/data/tilesets/secondary/mossdeep/metatiles.bin b/data/tilesets/secondary/mossdeep/metatiles.bin index 1fe4faf9c5..5fc527d0ff 100644 Binary files a/data/tilesets/secondary/mossdeep/metatiles.bin and b/data/tilesets/secondary/mossdeep/metatiles.bin differ diff --git a/data/tilesets/secondary/mossdeep/palettes/01.pal b/data/tilesets/secondary/mossdeep/palettes/01.pal index e845b832bc..1d09f740d5 100644 --- a/data/tilesets/secondary/mossdeep/palettes/01.pal +++ b/data/tilesets/secondary/mossdeep/palettes/01.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -0 192 0 +131 197 98 255 255 255 -205 205 197 -180 180 164 -180 189 222 -139 139 148 +222 230 238 +189 205 230 +156 180 222 +131 131 139 98 98 123 65 74 106 41 49 90 -255 248 180 -224 217 159 -255 213 49 -238 148 16 -205 213 131 -148 148 74 -90 82 8 +115 189 246 +98 172 238 +255 189 131 +238 148 115 +222 106 98 +205 65 82 +115 197 164 diff --git a/data/tilesets/secondary/mossdeep/palettes/02.pal b/data/tilesets/secondary/mossdeep/palettes/02.pal index 14fb4a9897..4c41030f66 100644 --- a/data/tilesets/secondary/mossdeep/palettes/02.pal +++ b/data/tilesets/secondary/mossdeep/palettes/02.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -0 32 0 -248 248 248 -248 0 248 -224 0 232 -64 128 96 -120 120 144 -96 96 120 -64 72 104 -255 227 148 -184 184 192 -160 160 152 -240 216 152 -208 144 112 -184 80 80 -128 56 64 -240 144 48 +24 41 82 +180 255 131 +131 197 98 +57 139 49 +57 82 0 +222 148 115 +106 90 90 +164 98 90 +65 57 49 +255 197 148 +222 106 98 +205 65 82 +164 213 197 +115 197 164 +65 180 131 +24 164 106 diff --git a/data/tilesets/secondary/mossdeep/palettes/08.pal b/data/tilesets/secondary/mossdeep/palettes/08.pal index 5b086f0511..07d79210a7 100644 --- a/data/tilesets/secondary/mossdeep/palettes/08.pal +++ b/data/tilesets/secondary/mossdeep/palettes/08.pal @@ -1,7 +1,7 @@ JASC-PAL 0100 16 -0 0 0 +131 197 98 255 255 255 205 205 197 180 180 164 diff --git a/data/tilesets/secondary/mossdeep/palettes/08.pla b/data/tilesets/secondary/mossdeep/palettes/08.pla deleted file mode 100644 index 5eb702de80..0000000000 --- a/data/tilesets/secondary/mossdeep/palettes/08.pla +++ /dev/null @@ -1,3 +0,0 @@ -# Color indices to set high bit -9 -10 \ No newline at end of file diff --git a/data/tilesets/secondary/mossdeep/palettes/09.pal b/data/tilesets/secondary/mossdeep/palettes/09.pal index 0883321166..cee575bae6 100644 --- a/data/tilesets/secondary/mossdeep/palettes/09.pal +++ b/data/tilesets/secondary/mossdeep/palettes/09.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -0 32 0 -248 248 248 -248 0 248 -224 0 232 -64 128 96 -120 120 144 -96 96 120 -64 72 104 -80 72 104 -184 184 192 -160 160 152 -240 216 152 -208 144 112 -184 80 80 -128 56 64 -240 144 48 +131 197 98 +255 255 255 +139 205 123 +98 172 98 +65 131 98 +123 123 148 +98 98 123 +65 74 106 +41 49 90 +189 189 197 +164 164 156 +246 222 156 +213 148 115 +189 82 82 +131 57 65 +246 148 49 diff --git a/data/tilesets/secondary/mossdeep/tiles.png b/data/tilesets/secondary/mossdeep/tiles.png index 6c1bb1d396..cc4591f880 100644 Binary files a/data/tilesets/secondary/mossdeep/tiles.png and b/data/tilesets/secondary/mossdeep/tiles.png differ diff --git a/data/tilesets/secondary/pacifidlog/palettes/02.pal b/data/tilesets/secondary/pacifidlog/palettes/02.pal index 9ea109ce00..4c41030f66 100644 --- a/data/tilesets/secondary/pacifidlog/palettes/02.pal +++ b/data/tilesets/secondary/pacifidlog/palettes/02.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -0 0 128 -222 230 164 -180 189 123 -156 164 98 -131 139 74 -90 98 41 -98 98 123 -65 74 106 -32 32 82 -238 230 164 -238 197 98 -205 156 57 -164 123 24 -131 82 49 -131 131 139 -244 226 171 +24 41 82 +180 255 131 +131 197 98 +57 139 49 +57 82 0 +222 148 115 +106 90 90 +164 98 90 +65 57 49 +255 197 148 +222 106 98 +205 65 82 +164 213 197 +115 197 164 +65 180 131 +24 164 106 diff --git a/data/tilesets/secondary/pacifidlog/palettes/09.pal b/data/tilesets/secondary/pacifidlog/palettes/09.pal index 653ffdfb3e..780f5b0ab6 100644 --- a/data/tilesets/secondary/pacifidlog/palettes/09.pal +++ b/data/tilesets/secondary/pacifidlog/palettes/09.pal @@ -16,4 +16,4 @@ JASC-PAL 164 123 24 131 82 49 131 131 139 -64 72 104 +82 106 213 diff --git a/data/tilesets/secondary/pacifidlog/palettes/09.pla b/data/tilesets/secondary/pacifidlog/palettes/09.pla deleted file mode 100644 index 321117092b..0000000000 --- a/data/tilesets/secondary/pacifidlog/palettes/09.pla +++ /dev/null @@ -1,2 +0,0 @@ -# Color indices to set high bit -15 \ No newline at end of file diff --git a/data/tilesets/secondary/pacifidlog/tiles.png b/data/tilesets/secondary/pacifidlog/tiles.png index 31f78891d4..9fe620e1ef 100644 Binary files a/data/tilesets/secondary/pacifidlog/tiles.png and b/data/tilesets/secondary/pacifidlog/tiles.png differ diff --git a/data/tilesets/secondary/petalburg/metatiles.bin b/data/tilesets/secondary/petalburg/metatiles.bin index 3ca46efec7..3711f4aeef 100644 Binary files a/data/tilesets/secondary/petalburg/metatiles.bin and b/data/tilesets/secondary/petalburg/metatiles.bin differ diff --git a/data/tilesets/secondary/petalburg/palettes/02.pal b/data/tilesets/secondary/petalburg/palettes/02.pal index 4897614451..4c41030f66 100644 --- a/data/tilesets/secondary/petalburg/palettes/02.pal +++ b/data/tilesets/secondary/petalburg/palettes/02.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -0 192 0 -232 224 200 -208 200 144 -200 176 120 -168 136 120 -128 128 136 -96 96 120 -64 72 104 -40 48 88 -244 226 171 -221 205 143 -248 224 176 -248 184 168 -240 160 128 -200 136 104 -248 192 32 +24 41 82 +180 255 131 +131 197 98 +57 139 49 +57 82 0 +222 148 115 +106 90 90 +164 98 90 +65 57 49 +255 197 148 +222 106 98 +205 65 82 +164 213 197 +115 197 164 +65 180 131 +24 164 106 diff --git a/data/tilesets/secondary/petalburg/palettes/06.pal b/data/tilesets/secondary/petalburg/palettes/06.pal index f4190e865c..b893aa09e4 100644 --- a/data/tilesets/secondary/petalburg/palettes/06.pal +++ b/data/tilesets/secondary/petalburg/palettes/06.pal @@ -1,7 +1,7 @@ JASC-PAL 0100 16 -0 0 0 +24 41 82 255 255 255 230 222 222 213 213 197 @@ -16,4 +16,4 @@ JASC-PAL 205 197 123 180 164 123 164 139 98 -248 224 120 +115 197 164 diff --git a/data/tilesets/secondary/petalburg/palettes/06.pla b/data/tilesets/secondary/petalburg/palettes/06.pla deleted file mode 100644 index 5eb702de80..0000000000 --- a/data/tilesets/secondary/petalburg/palettes/06.pla +++ /dev/null @@ -1,3 +0,0 @@ -# Color indices to set high bit -9 -10 \ No newline at end of file diff --git a/data/tilesets/secondary/petalburg/palettes/07.pal b/data/tilesets/secondary/petalburg/palettes/07.pal index 41d1339942..4b0812f094 100644 --- a/data/tilesets/secondary/petalburg/palettes/07.pal +++ b/data/tilesets/secondary/petalburg/palettes/07.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 0 0 0 -213 222 172 0 0 0 -189 189 131 -164 172 123 -131 131 139 -98 106 123 -65 74 106 0 0 0 -164 213 230 -106 189 197 -112 192 160 -205 213 238 -156 156 180 -115 172 57 -248 224 120 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/petalburg/palettes/07.pla b/data/tilesets/secondary/petalburg/palettes/07.pla deleted file mode 100644 index 5eb702de80..0000000000 --- a/data/tilesets/secondary/petalburg/palettes/07.pla +++ /dev/null @@ -1,3 +0,0 @@ -# Color indices to set high bit -9 -10 \ No newline at end of file diff --git a/data/tilesets/secondary/petalburg/palettes/09.pal b/data/tilesets/secondary/petalburg/palettes/09.pal index 4d052b9c30..c4a6e250af 100644 --- a/data/tilesets/secondary/petalburg/palettes/09.pal +++ b/data/tilesets/secondary/petalburg/palettes/09.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -0 0 0 -232 224 200 -208 200 144 -200 176 120 -168 136 120 -128 128 136 -96 96 120 -64 72 104 -40 48 88 -152 200 240 -120 152 232 -248 224 176 -248 184 168 -240 160 128 -200 136 104 -248 192 32 +24 41 82 +238 230 205 +213 205 148 +205 180 123 +172 139 123 +131 131 139 +98 98 123 +65 74 106 +41 49 90 +156 205 246 +98 156 238 +255 230 180 +255 189 172 +246 164 131 +205 139 106 +115 197 164 diff --git a/data/tilesets/secondary/petalburg/palettes/09.pla b/data/tilesets/secondary/petalburg/palettes/09.pla deleted file mode 100644 index 5eb702de80..0000000000 --- a/data/tilesets/secondary/petalburg/palettes/09.pla +++ /dev/null @@ -1,3 +0,0 @@ -# Color indices to set high bit -9 -10 \ No newline at end of file diff --git a/data/tilesets/secondary/petalburg/tiles.png b/data/tilesets/secondary/petalburg/tiles.png index c3ae46ad7c..00d6d94a4e 100644 Binary files a/data/tilesets/secondary/petalburg/tiles.png and b/data/tilesets/secondary/petalburg/tiles.png differ diff --git a/data/tilesets/secondary/rustboro/metatiles.bin b/data/tilesets/secondary/rustboro/metatiles.bin index 649b09fac9..5a0d1b0d14 100644 Binary files a/data/tilesets/secondary/rustboro/metatiles.bin and b/data/tilesets/secondary/rustboro/metatiles.bin differ diff --git a/data/tilesets/secondary/rustboro/palettes/06.pal b/data/tilesets/secondary/rustboro/palettes/06.pal index 1a3e98a28e..955b1d21a8 100644 --- a/data/tilesets/secondary/rustboro/palettes/06.pal +++ b/data/tilesets/secondary/rustboro/palettes/06.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 115 197 164 -255 255 255 -216 224 232 -184 200 224 -136 144 152 -131 131 139 -98 98 123 -64 72 104 -40 48 88 -205 213 230 -139 180 213 -128 128 136 -216 224 232 0 0 0 0 0 0 -248 224 120 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/rustboro/palettes/06.pla b/data/tilesets/secondary/rustboro/palettes/06.pla deleted file mode 100644 index 7fe6c388e7..0000000000 --- a/data/tilesets/secondary/rustboro/palettes/06.pla +++ /dev/null @@ -1,7 +0,0 @@ -# Colors in palette to set high (alpha) bit -2 -3 -4 -5 -9 -10 \ No newline at end of file diff --git a/data/tilesets/secondary/rustboro/palettes/10.pal b/data/tilesets/secondary/rustboro/palettes/10.pal index d68d54ce9a..6f0bfa7ee9 100644 --- a/data/tilesets/secondary/rustboro/palettes/10.pal +++ b/data/tilesets/secondary/rustboro/palettes/10.pal @@ -5,7 +5,7 @@ JASC-PAL 255 255 255 222 222 222 172 180 189 -136 144 152 +139 148 156 131 131 139 98 98 123 65 74 106 diff --git a/data/tilesets/secondary/rustboro/tiles.png b/data/tilesets/secondary/rustboro/tiles.png index 1cf8473a20..c3a3bfbab4 100644 Binary files a/data/tilesets/secondary/rustboro/tiles.png and b/data/tilesets/secondary/rustboro/tiles.png differ diff --git a/data/tilesets/secondary/slateport/metatile_attributes.bin b/data/tilesets/secondary/slateport/metatile_attributes.bin index 0f311a694f..d4894828bb 100644 Binary files a/data/tilesets/secondary/slateport/metatile_attributes.bin and b/data/tilesets/secondary/slateport/metatile_attributes.bin differ diff --git a/data/tilesets/secondary/slateport/metatiles.bin b/data/tilesets/secondary/slateport/metatiles.bin index 81c28bc3c6..72f671f71d 100644 Binary files a/data/tilesets/secondary/slateport/metatiles.bin and b/data/tilesets/secondary/slateport/metatiles.bin differ diff --git a/data/tilesets/secondary/slateport/palettes/06.pal b/data/tilesets/secondary/slateport/palettes/06.pal index 1e7d9a8220..0c2d8d3ca3 100644 --- a/data/tilesets/secondary/slateport/palettes/06.pal +++ b/data/tilesets/secondary/slateport/palettes/06.pal @@ -1,7 +1,7 @@ JASC-PAL 0100 16 -0 0 0 +24 41 82 255 255 255 230 230 238 205 205 222 @@ -16,4 +16,4 @@ JASC-PAL 197 180 189 164 156 164 131 106 172 -112 192 160 +115 197 164 diff --git a/data/tilesets/secondary/slateport/palettes/06.pla b/data/tilesets/secondary/slateport/palettes/06.pla deleted file mode 100644 index 07f021d4b4..0000000000 --- a/data/tilesets/secondary/slateport/palettes/06.pla +++ /dev/null @@ -1,2 +0,0 @@ -# Color indices to set high bit -8 \ No newline at end of file diff --git a/data/tilesets/secondary/slateport/palettes/12.pal b/data/tilesets/secondary/slateport/palettes/12.pal index 7ef1f4f2db..4b0812f094 100644 --- a/data/tilesets/secondary/slateport/palettes/12.pal +++ b/data/tilesets/secondary/slateport/palettes/12.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 0 0 0 -222 205 148 -184 168 80 -168 224 200 -216 216 176 -148 148 156 -98 98 123 -64 72 104 -184 184 152 -0 0 0 -148 205 255 -184 224 216 0 0 0 0 0 0 0 0 0 -248 224 120 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/tilesets/secondary/slateport/palettes/12.pla b/data/tilesets/secondary/slateport/palettes/12.pla deleted file mode 100644 index 27f716b90d..0000000000 --- a/data/tilesets/secondary/slateport/palettes/12.pla +++ /dev/null @@ -1,6 +0,0 @@ -# Color indices to set high bit -3 -4 -8 -10 -11 \ No newline at end of file diff --git a/data/tilesets/secondary/slateport/palettes/15.pal b/data/tilesets/secondary/slateport/palettes/15.pal index 25b623a269..e7717d74ea 100644 --- a/data/tilesets/secondary/slateport/palettes/15.pal +++ b/data/tilesets/secondary/slateport/palettes/15.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -0 32 0 +115 197 164 +255 213 180 +255 197 148 +222 148 115 +123 65 65 +57 74 123 +41 57 98 +24 41 82 +16 32 57 +222 230 238 +255 197 90 +189 156 90 +255 98 90 +197 65 65 255 255 255 -230 230 238 -205 205 222 -197 180 222 -123 131 156 -98 98 123 -65 74 106 -255 231 138 -205 205 148 -172 148 90 -222 213 238 -197 180 189 -164 156 164 -131 106 172 -112 192 160 +0 0 0 diff --git a/data/tilesets/secondary/slateport/tiles.png b/data/tilesets/secondary/slateport/tiles.png index c5f01eb1d0..ff7588d2dd 100644 Binary files a/data/tilesets/secondary/slateport/tiles.png and b/data/tilesets/secondary/slateport/tiles.png differ diff --git a/data/tilesets/secondary/sootopolis/palettes/06.pal b/data/tilesets/secondary/sootopolis/palettes/06.pal index 44cd60931b..b9e93fa5f0 100644 --- a/data/tilesets/secondary/sootopolis/palettes/06.pal +++ b/data/tilesets/secondary/sootopolis/palettes/06.pal @@ -1,7 +1,7 @@ JASC-PAL 0100 16 -248 240 176 +115 197 164 255 255 255 238 238 213 222 222 180 @@ -10,10 +10,10 @@ JASC-PAL 98 98 123 65 74 106 41 49 90 -64 72 104 -80 88 80 +0 0 0 +0 0 0 156 164 156 123 131 123 98 106 98 82 90 82 -248 240 176 +0 0 0 diff --git a/data/tilesets/secondary/sootopolis/palettes/06.pla b/data/tilesets/secondary/sootopolis/palettes/06.pla deleted file mode 100644 index 82b8d1306f..0000000000 --- a/data/tilesets/secondary/sootopolis/palettes/06.pla +++ /dev/null @@ -1,5 +0,0 @@ -# Color indices to set high bit -0 -9 -10 -15 \ No newline at end of file diff --git a/data/tilesets/secondary/sootopolis/palettes/10.pal b/data/tilesets/secondary/sootopolis/palettes/10.pal index 01d065e528..6ca963250f 100644 --- a/data/tilesets/secondary/sootopolis/palettes/10.pal +++ b/data/tilesets/secondary/sootopolis/palettes/10.pal @@ -1,7 +1,7 @@ JASC-PAL 0100 16 -246 74 65 +115 197 164 139 115 106 115 90 82 90 65 65 @@ -16,4 +16,4 @@ JASC-PAL 148 74 41 82 139 197 74 115 172 -246 74 65 +0 0 0 diff --git a/data/tilesets/secondary/sootopolis/palettes/10.pla b/data/tilesets/secondary/sootopolis/palettes/10.pla deleted file mode 100644 index 2b4c8a150e..0000000000 --- a/data/tilesets/secondary/sootopolis/palettes/10.pla +++ /dev/null @@ -1,8 +0,0 @@ -# Color indices to set high bit -0 -8 -9 -10 -11 -12 -15 \ No newline at end of file diff --git a/data/tilesets/secondary/sootopolis/palettes/15.pal b/data/tilesets/secondary/sootopolis/palettes/15.pal index ee115befc9..e7717d74ea 100644 --- a/data/tilesets/secondary/sootopolis/palettes/15.pal +++ b/data/tilesets/secondary/sootopolis/palettes/15.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -0 192 0 +115 197 164 +255 213 180 +255 197 148 +222 148 115 +123 65 65 +57 74 123 +41 57 98 +24 41 82 +16 32 57 +222 230 238 +255 197 90 +189 156 90 +255 98 90 +197 65 65 255 255 255 -238 238 213 -222 222 180 -180 180 148 -131 131 139 -98 98 123 -65 74 106 -41 49 90 -244 226 171 -221 205 143 -156 164 156 -123 131 123 -98 106 98 -82 90 82 -248 240 176 +0 0 0 diff --git a/data/tilesets/secondary/sootopolis/tiles.png b/data/tilesets/secondary/sootopolis/tiles.png index f9a6be2154..d27c817f00 100644 Binary files a/data/tilesets/secondary/sootopolis/tiles.png and b/data/tilesets/secondary/sootopolis/tiles.png differ diff --git a/src/data/tilesets/headers.h b/src/data/tilesets/headers.h index f72eeebc42..f6afbcef53 100644 --- a/src/data/tilesets/headers.h +++ b/src/data/tilesets/headers.h @@ -15,7 +15,6 @@ const struct Tileset gTileset_General = { .isCompressed = TRUE, - .swapPalettes = SWAP_PAL(4), .isSecondary = FALSE, .tiles = gTilesetTiles_General, .palettes = gTilesetPalettes_General, @@ -27,7 +26,6 @@ const struct Tileset gTileset_General = const struct Tileset gTileset_Petalburg = { .isCompressed = TRUE, - .swapPalettes = SWAP_PAL(9), .isSecondary = TRUE, .tiles = gTilesetTiles_Petalburg, .palettes = gTilesetPalettes_Petalburg, @@ -61,7 +59,6 @@ const struct Tileset gTileset_Dewford = const struct Tileset gTileset_Slateport = { .isCompressed = TRUE, - .swapPalettes = SWAP_PAL(6), .isSecondary = TRUE, .tiles = gTilesetTiles_Slateport, .palettes = gTilesetPalettes_Slateport, @@ -95,7 +92,6 @@ const struct Tileset gTileset_Lavaridge = const struct Tileset gTileset_Fallarbor = { .isCompressed = TRUE, - .swapPalettes = SWAP_PAL(7), .isSecondary = TRUE, .tiles = gTilesetTiles_Fallarbor, .palettes = gTilesetPalettes_Fallarbor, @@ -118,7 +114,6 @@ const struct Tileset gTileset_Fortree = const struct Tileset gTileset_Lilycove = { .isCompressed = TRUE, - .swapPalettes = SWAP_PAL(6), .isSecondary = TRUE, .tiles = gTilesetTiles_Lilycove, .palettes = gTilesetPalettes_Lilycove, @@ -130,7 +125,6 @@ const struct Tileset gTileset_Lilycove = const struct Tileset gTileset_Mossdeep = { .isCompressed = TRUE, - .swapPalettes = SWAP_PAL(8), .isSecondary = TRUE, .tiles = gTilesetTiles_Mossdeep, .palettes = gTilesetPalettes_Mossdeep, @@ -148,13 +142,11 @@ const struct Tileset gTileset_EverGrande = .metatiles = gMetatiles_EverGrande, .metatileAttributes = gMetatileAttributes_EverGrande, .callback = InitTilesetAnim_EverGrande, - .swapPalettes = SWAP_PAL(8), }; const struct Tileset gTileset_Pacifidlog = { .isCompressed = TRUE, - .swapPalettes = SWAP_PAL(9), .isSecondary = TRUE, .tiles = gTilesetTiles_Pacifidlog, .palettes = gTilesetPalettes_Pacifidlog, @@ -166,7 +158,6 @@ const struct Tileset gTileset_Pacifidlog = const struct Tileset gTileset_Sootopolis = { .isCompressed = TRUE, - .swapPalettes = SWAP_PAL(6), .isSecondary = TRUE, .tiles = gTilesetTiles_Sootopolis, .palettes = gTilesetPalettes_Sootopolis,