From a7f801f84fb08265898d4f8d3d92b904b9306860 Mon Sep 17 00:00:00 2001 From: ElectroDeoxys Date: Sun, 5 Nov 2023 16:25:15 +0000 Subject: [PATCH 1/7] Restructure GB and CGB map files --- .../permissions/{ => cgb}/challenge_hall.bin | Bin .../{ => cgb}/challenge_hall.bin.lz.match | Bin .../{ => cgb}/challenge_hall_entrance.bin | Bin .../challenge_hall_entrance.bin.lz.match | Bin .../{ => cgb}/challenge_machine_map_event.bin | Bin .../maps/permissions/{ => cgb}/club_lobby.bin | Bin .../{ => cgb}/club_lobby.bin.lz.match | Bin .../{ => cgb}/deck_machine_map_event.bin | 0 .../{ => cgb}/deck_machine_room.bin | Bin .../{ => cgb}/deck_machine_room.bin.lz.match | Bin .../permissions/{ => cgb}/fighting_club.bin | Bin .../{ => cgb}/fighting_club.bin.lz.match | Bin .../{ => cgb}/fighting_club_entrance.bin | Bin .../fighting_club_entrance.bin.lz.match | Bin .../maps/permissions/{ => cgb}/fire_club.bin | Bin .../{ => cgb}/fire_club.bin.lz.match | Bin .../{ => cgb}/fire_club_entrance.bin | Bin .../{ => cgb}/fire_club_entrance.bin.lz.match | Bin .../maps/permissions/{ => cgb}/grass_club.bin | Bin .../{ => cgb}/grass_club.bin.lz.match | Bin .../{ => cgb}/grass_club_entrance.bin | Bin .../grass_club_entrance.bin.lz.match | Bin .../permissions/{ => cgb}/hall_of_honor.bin | Bin .../{ => cgb}/hall_of_honor.bin.lz.match | Bin .../hall_of_honor_door_map_event.bin | Bin .../maps/permissions/{ => cgb}/ishihara.bin | Bin .../{ => cgb}/ishihara.bin.lz.match | Bin .../permissions/{ => cgb}/lightning_club.bin | Bin .../{ => cgb}/lightning_club.bin.lz.match | Bin .../{ => cgb}/lightning_club_entrance.bin | Bin .../lightning_club_entrance.bin.lz.match | Bin .../{ => cgb}/mason_laboratory.bin | Bin .../{ => cgb}/mason_laboratory.bin.lz.match | Bin .../permissions/{ => cgb}/pokemon_dome.bin | Bin .../{ => cgb}/pokemon_dome.bin.lz.match | Bin .../{ => cgb}/pokemon_dome_door_map_event.bin | Bin .../{ => cgb}/pokemon_dome_entrance.bin | Bin .../pokemon_dome_entrance.bin.lz.match | Bin .../permissions/{ => cgb}/psychic_club.bin | Bin .../{ => cgb}/psychic_club.bin.lz.match | Bin .../{ => cgb}/psychic_club_entrance.bin | Bin .../psychic_club_entrance.bin.lz.match | Bin .../maps/permissions/{ => cgb}/rock_club.bin | Bin .../{ => cgb}/rock_club.bin.lz.match | Bin .../{ => cgb}/rock_club_entrance.bin | Bin .../{ => cgb}/rock_club_entrance.bin.lz.match | Bin .../permissions/{ => cgb}/science_club.bin | Bin .../{ => cgb}/science_club.bin.lz.match | Bin .../{ => cgb}/science_club_entrance.bin | Bin .../science_club_entrance.bin.lz.match | Bin .../maps/permissions/{ => cgb}/water_club.bin | Bin .../{ => cgb}/water_club.bin.lz.match | Bin .../{ => cgb}/water_club_entrance.bin | Bin .../water_club_entrance.bin.lz.match | Bin .../challenge_hall.bin} | Bin .../challenge_hall.bin.lz.match} | Bin .../challenge_hall_entrance.bin} | Bin .../challenge_hall_entrance.bin.lz.match} | Bin .../challenge_machine_map_event.bin} | Bin .../{club_lobby_cgb.bin => gb/club_lobby.bin} | Bin .../club_lobby.bin.lz.match} | Bin .../deck_machine_map_event.bin} | 0 .../deck_machine_room.bin} | Bin .../deck_machine_room.bin.lz.match} | Bin .../fighting_club.bin} | Bin .../fighting_club.bin.lz.match} | Bin .../fighting_club_entrance.bin} | Bin .../fighting_club_entrance.bin.lz.match} | Bin .../{fire_club_cgb.bin => gb/fire_club.bin} | Bin .../fire_club.bin.lz.match} | Bin .../fire_club_entrance.bin} | Bin .../fire_club_entrance.bin.lz.match} | Bin .../{grass_club_cgb.bin => gb/grass_club.bin} | Bin .../grass_club.bin.lz.match} | Bin .../grass_club_entrance.bin} | Bin .../grass_club_entrance.bin.lz.match} | Bin .../hall_of_honor.bin} | Bin .../hall_of_honor.bin.lz.match} | Bin .../hall_of_honor_door_map_event.bin} | Bin .../{ishihara_cgb.bin => gb/ishihara.bin} | Bin .../ishihara.bin.lz.match} | Bin .../lightning_club.bin} | Bin .../lightning_club.bin.lz.match} | Bin .../lightning_club_entrance.bin} | Bin .../lightning_club_entrance.bin.lz.match} | Bin .../mason_laboratory.bin} | Bin .../mason_laboratory.bin.lz.match} | Bin .../pokemon_dome.bin} | Bin .../pokemon_dome.bin.lz.match} | Bin .../pokemon_dome_door_map_event.bin} | Bin .../pokemon_dome_entrance.bin} | Bin .../pokemon_dome_entrance.bin.lz.match} | Bin .../psychic_club.bin} | Bin .../psychic_club.bin.lz.match} | Bin .../psychic_club_entrance.bin} | Bin .../psychic_club_entrance.bin.lz.match} | Bin .../{rock_club_cgb.bin => gb/rock_club.bin} | Bin .../rock_club.bin.lz.match} | Bin .../rock_club_entrance.bin} | Bin .../rock_club_entrance.bin.lz.match} | Bin .../science_club.bin} | Bin .../science_club.bin.lz.match} | Bin .../science_club_entrance.bin} | Bin .../science_club_entrance.bin.lz.match} | Bin .../{water_club_cgb.bin => gb/water_club.bin} | Bin .../water_club.bin.lz.match} | Bin .../water_club_entrance.bin} | Bin .../water_club_entrance.bin.lz.match} | Bin src/data/maps/tilemaps.asm | 158 ++++++++-------- .../aerodactyl_intro.bin} | Bin .../aerodactyl_intro.bin.lz.match} | Bin .../{card_pop_cgb.bin => cgb/card_pop.bin} | Bin .../card_pop.bin.lz.match} | Bin .../challenge_hall.bin} | Bin .../challenge_hall.bin.lz.match} | Bin .../challenge_hall_entrance.bin} | Bin .../challenge_hall_entrance.bin.lz.match} | Bin .../challenge_machine_map_event.bin} | 0 .../challenge_machine_map_event.bin.lz.match} | 0 .../charizard_intro.bin} | Bin .../charizard_intro.bin.lz.match} | Bin .../club_lobby.bin} | 0 .../club_lobby.bin.lz.match} | 0 .../{colosseum_cgb.bin => cgb/colosseum.bin} | Bin .../colosseum.bin.lz.match} | Bin .../{copyright_cgb.bin => cgb/copyright.bin} | Bin .../copyright.bin.lz.match} | Bin .../deck_machine_map_event.bin} | 0 .../deck_machine_room.bin} | 0 .../deck_machine_room.bin.lz.match} | Bin .../{evolution_cgb.bin => cgb/evolution.bin} | Bin .../evolution.bin.lz.match} | Bin .../fighting_club.bin} | Bin .../fighting_club.bin.lz.match} | Bin .../fighting_club_entrance.bin} | Bin .../fighting_club_entrance.bin.lz.match} | Bin .../{fire_club_cgb.bin => cgb/fire_club.bin} | 0 .../fire_club.bin.lz.match} | Bin .../fire_club_entrance.bin} | Bin .../fire_club_entrance.bin.lz.match} | Bin .../gameboy_link.bin} | Bin .../gameboy_link.bin.lz.match} | Bin .../gameboy_link_connecting.bin} | Bin .../gameboy_link_connecting.bin.lz.match} | Bin .../gameboy_printer.bin} | Bin .../gameboy_printer.bin.lz.match} | Bin .../grass_club.bin} | Bin .../grass_club.bin.lz.match} | Bin .../grass_club_entrance.bin} | Bin .../grass_club_entrance.bin.lz.match} | Bin .../hall_of_honor.bin} | 0 .../hall_of_honor.bin.lz.match} | Bin .../hall_of_honor_door_map_event.bin} | 0 .../{ishihara_cgb.bin => cgb/ishihara.bin} | 0 .../ishihara.bin.lz.match} | Bin .../japanese_title_screen.bin} | 0 .../japanese_title_screen.bin.lz.match} | Bin .../japanese_title_screen_2.bin} | Bin .../japanese_title_screen_2.bin.lz.match} | Bin .../laboratory.bin} | Bin .../laboratory.bin.lz.match} | Bin .../lightning_club.bin} | Bin .../lightning_club.bin.lz.match} | Bin .../lightning_club_entrance.bin} | Bin .../lightning_club_entrance.bin.lz.match} | Bin .../mason_laboratory.bin} | 0 .../mason_laboratory.bin.lz.match} | Bin .../{mystery_cgb.bin => cgb/mystery.bin} | Bin .../mystery.bin.lz.match} | Bin .../overworld_map.bin} | Bin .../overworld_map.bin.lz.match} | Bin .../pokemon_dome.bin} | Bin .../pokemon_dome.bin.lz.match} | Bin .../pokemon_dome_door_map_event.bin} | 0 .../pokemon_dome_entrance.bin} | 0 .../pokemon_dome_entrance.bin.lz.match} | Bin .../psychic_club.bin} | 0 .../psychic_club.bin.lz.match} | Bin .../psychic_club_entrance.bin} | Bin .../psychic_club_entrance.bin.lz.match} | Bin .../{rock_club_cgb.bin => cgb/rock_club.bin} | 0 .../rock_club.bin.lz.match} | Bin .../rock_club_entrance.bin} | Bin .../rock_club_entrance.bin.lz.match} | Bin .../science_club.bin} | 0 .../science_club.bin.lz.match} | Bin .../science_club_entrance.bin} | Bin .../science_club_entrance.bin.lz.match} | Bin .../scyther_intro.bin} | Bin .../scyther_intro.bin.lz.match} | Bin .../title_screen.bin} | Bin .../title_screen.bin.lz.match} | Bin .../water_club.bin} | Bin .../water_club.bin.lz.match} | Bin .../water_club_entrance.bin} | Bin .../water_club_entrance.bin.lz.match} | Bin .../maps/tiles/{ => gb}/aerodactyl_intro.bin | 0 src/data/maps/tiles/{ => gb}/card_pop.bin | Bin .../maps/tiles/{ => gb}/card_pop.bin.lz.match | Bin .../maps/tiles/{ => gb}/challenge_hall.bin | 0 .../{ => gb}/challenge_hall.bin.lz.match | Bin .../{ => gb}/challenge_hall_entrance.bin | 0 .../challenge_hall_entrance.bin.lz.match | 0 .../{ => gb}/challenge_machine_map_event.bin | 0 .../maps/tiles/{ => gb}/charizard_intro.bin | 0 src/data/maps/tiles/{ => gb}/club_lobby.bin | 0 .../tiles/{ => gb}/club_lobby.bin.lz.match | Bin src/data/maps/tiles/{ => gb}/colosseum.bin | 0 src/data/maps/tiles/{ => gb}/companies.bin | Bin .../tiles/{ => gb}/companies.bin.lz.match | Bin src/data/maps/tiles/{ => gb}/copyright.bin | Bin .../tiles/{ => gb}/copyright.bin.lz.match | Bin .../tiles/{ => gb}/deck_machine_map_event.bin | 0 .../maps/tiles/{ => gb}/deck_machine_room.bin | 0 .../{ => gb}/deck_machine_room.bin.lz.match | Bin src/data/maps/tiles/{ => gb}/evolution.bin | 0 .../maps/tiles/{ => gb}/fighting_club.bin | 0 .../tiles/{ => gb}/fighting_club.bin.lz.match | Bin .../tiles/{ => gb}/fighting_club_entrance.bin | 0 .../fighting_club_entrance.bin.lz.match | Bin .../maps/tiles/{ => gb}/fighting_medal.bin | 0 .../{ => gb}/fighting_medal.bin.lz.match | 0 src/data/maps/tiles/{ => gb}/fire_club.bin | 0 .../tiles/{ => gb}/fire_club.bin.lz.match | Bin .../tiles/{ => gb}/fire_club_entrance.bin | 0 .../{ => gb}/fire_club_entrance.bin.lz.match | Bin src/data/maps/tiles/{ => gb}/fire_medal.bin | 0 .../tiles/{ => gb}/fire_medal.bin.lz.match | 0 src/data/maps/tiles/{ => gb}/gameboy_link.bin | 0 .../tiles/{ => gb}/gameboy_link.bin.lz.match | Bin .../{ => gb}/gameboy_link_connecting.bin | 0 .../gameboy_link_connecting.bin.lz.match | Bin .../maps/tiles/{ => gb}/gameboy_printer.bin | 0 .../{ => gb}/gameboy_printer.bin.lz.match | Bin src/data/maps/tiles/{ => gb}/grass_club.bin | 0 .../tiles/{ => gb}/grass_club.bin.lz.match | Bin .../tiles/{ => gb}/grass_club_entrance.bin | 0 .../{ => gb}/grass_club_entrance.bin.lz.match | Bin src/data/maps/tiles/{ => gb}/grass_medal.bin | 0 .../tiles/{ => gb}/grass_medal.bin.lz.match | 0 .../maps/tiles/{ => gb}/hall_of_honor.bin | 0 .../tiles/{ => gb}/hall_of_honor.bin.lz.match | Bin .../{ => gb}/hall_of_honor_door_map_event.bin | 0 src/data/maps/tiles/{ => gb}/ishihara.bin | 0 .../maps/tiles/{ => gb}/ishihara.bin.lz.match | Bin .../tiles/{ => gb}/japanese_title_screen.bin | 0 .../japanese_title_screen.bin.lz.match | Bin .../{ => gb}/japanese_title_screen_2.bin | 0 .../japanese_title_screen_2.bin.lz.match | Bin src/data/maps/tiles/{ => gb}/laboratory.bin | 0 .../maps/tiles/{ => gb}/lightning_club.bin | 0 .../{ => gb}/lightning_club.bin.lz.match | Bin .../{ => gb}/lightning_club_entrance.bin | 0 .../lightning_club_entrance.bin.lz.match | Bin .../maps/tiles/{ => gb}/lightning_medal.bin | 0 .../{ => gb}/lightning_medal.bin.lz.match | 0 .../maps/tiles/{ => gb}/mason_laboratory.bin | 0 .../{ => gb}/mason_laboratory.bin.lz.match | Bin src/data/maps/tiles/{ => gb}/mystery.bin | 0 src/data/maps/tiles/{ => gb}/nintendo.bin | Bin .../maps/tiles/{ => gb}/nintendo.bin.lz.match | Bin src/data/maps/tiles/{ => gb}/opponent.bin | 0 .../maps/tiles/{ => gb}/overworld_map.bin | 0 .../tiles/{ => gb}/overworld_map.bin.lz.match | Bin src/data/maps/tiles/{ => gb}/player.bin | 0 src/data/maps/tiles/{ => gb}/pokemon_dome.bin | 0 .../tiles/{ => gb}/pokemon_dome.bin.lz.match | Bin .../{ => gb}/pokemon_dome_door_map_event.bin | 0 .../tiles/{ => gb}/pokemon_dome_entrance.bin | 0 .../pokemon_dome_entrance.bin.lz.match | Bin src/data/maps/tiles/{ => gb}/psychic_club.bin | 0 .../tiles/{ => gb}/psychic_club.bin.lz.match | Bin .../tiles/{ => gb}/psychic_club_entrance.bin | 0 .../psychic_club_entrance.bin.lz.match | Bin .../maps/tiles/{ => gb}/psychic_medal.bin | 0 .../tiles/{ => gb}/psychic_medal.bin.lz.match | 0 src/data/maps/tiles/{ => gb}/rock_club.bin | 0 .../tiles/{ => gb}/rock_club.bin.lz.match | Bin .../tiles/{ => gb}/rock_club_entrance.bin | 0 .../{ => gb}/rock_club_entrance.bin.lz.match | Bin src/data/maps/tiles/{ => gb}/rock_medal.bin | 0 .../tiles/{ => gb}/rock_medal.bin.lz.match | 0 src/data/maps/tiles/{ => gb}/science_club.bin | 0 .../tiles/{ => gb}/science_club.bin.lz.match | Bin .../tiles/{ => gb}/science_club_entrance.bin | 0 .../science_club_entrance.bin.lz.match | Bin .../maps/tiles/{ => gb}/science_medal.bin | 0 .../tiles/{ => gb}/science_medal.bin.lz.match | 0 .../maps/tiles/{ => gb}/scyther_intro.bin | 0 .../maps/tiles/{ => gb}/solid_tiles_1.bin | Bin .../tiles/{ => gb}/solid_tiles_1.bin.lz.match | Bin .../maps/tiles/{ => gb}/solid_tiles_2.bin | Bin .../tiles/{ => gb}/solid_tiles_2.bin.lz.match | Bin .../maps/tiles/{ => gb}/solid_tiles_3.bin | Bin .../tiles/{ => gb}/solid_tiles_3.bin.lz.match | Bin .../maps/tiles/{ => gb}/solid_tiles_4.bin | 0 .../tiles/{ => gb}/solid_tiles_4.bin.lz.match | 0 src/data/maps/tiles/{ => gb}/title_screen.bin | Bin .../tiles/{ => gb}/title_screen.bin.lz.match | Bin src/data/maps/tiles/{ => gb}/water_club.bin | 0 .../tiles/{ => gb}/water_club.bin.lz.match | Bin .../tiles/{ => gb}/water_club_entrance.bin | 0 .../{ => gb}/water_club_entrance.bin.lz.match | Bin src/data/maps/tiles/{ => gb}/water_medal.bin | 0 .../tiles/{ => gb}/water_medal.bin.lz.match | 0 src/gfx.asm | 170 +++++++++--------- 306 files changed, 164 insertions(+), 164 deletions(-) rename src/data/maps/permissions/{ => cgb}/challenge_hall.bin (100%) rename src/data/maps/permissions/{ => cgb}/challenge_hall.bin.lz.match (100%) rename src/data/maps/permissions/{ => cgb}/challenge_hall_entrance.bin (100%) rename src/data/maps/permissions/{ => cgb}/challenge_hall_entrance.bin.lz.match (100%) rename src/data/maps/permissions/{ => cgb}/challenge_machine_map_event.bin (100%) rename src/data/maps/permissions/{ => cgb}/club_lobby.bin (100%) rename src/data/maps/permissions/{ => cgb}/club_lobby.bin.lz.match (100%) rename src/data/maps/permissions/{ => cgb}/deck_machine_map_event.bin (100%) rename src/data/maps/permissions/{ => cgb}/deck_machine_room.bin (100%) rename src/data/maps/permissions/{ => cgb}/deck_machine_room.bin.lz.match (100%) rename src/data/maps/permissions/{ => cgb}/fighting_club.bin (100%) rename src/data/maps/permissions/{ => cgb}/fighting_club.bin.lz.match (100%) rename src/data/maps/permissions/{ => cgb}/fighting_club_entrance.bin (100%) rename src/data/maps/permissions/{ => cgb}/fighting_club_entrance.bin.lz.match (100%) rename src/data/maps/permissions/{ => cgb}/fire_club.bin (100%) rename src/data/maps/permissions/{ => cgb}/fire_club.bin.lz.match (100%) rename src/data/maps/permissions/{ => cgb}/fire_club_entrance.bin (100%) rename src/data/maps/permissions/{ => cgb}/fire_club_entrance.bin.lz.match (100%) rename src/data/maps/permissions/{ => cgb}/grass_club.bin (100%) rename src/data/maps/permissions/{ => cgb}/grass_club.bin.lz.match (100%) rename src/data/maps/permissions/{ => cgb}/grass_club_entrance.bin (100%) rename src/data/maps/permissions/{ => cgb}/grass_club_entrance.bin.lz.match (100%) rename src/data/maps/permissions/{ => cgb}/hall_of_honor.bin (100%) rename src/data/maps/permissions/{ => cgb}/hall_of_honor.bin.lz.match (100%) rename src/data/maps/permissions/{ => cgb}/hall_of_honor_door_map_event.bin (100%) rename src/data/maps/permissions/{ => cgb}/ishihara.bin (100%) rename src/data/maps/permissions/{ => cgb}/ishihara.bin.lz.match (100%) rename src/data/maps/permissions/{ => cgb}/lightning_club.bin (100%) rename src/data/maps/permissions/{ => cgb}/lightning_club.bin.lz.match (100%) rename src/data/maps/permissions/{ => cgb}/lightning_club_entrance.bin (100%) rename src/data/maps/permissions/{ => cgb}/lightning_club_entrance.bin.lz.match (100%) rename src/data/maps/permissions/{ => cgb}/mason_laboratory.bin (100%) rename src/data/maps/permissions/{ => cgb}/mason_laboratory.bin.lz.match (100%) rename src/data/maps/permissions/{ => cgb}/pokemon_dome.bin (100%) rename src/data/maps/permissions/{ => cgb}/pokemon_dome.bin.lz.match (100%) rename src/data/maps/permissions/{ => cgb}/pokemon_dome_door_map_event.bin (100%) rename src/data/maps/permissions/{ => cgb}/pokemon_dome_entrance.bin (100%) rename src/data/maps/permissions/{ => cgb}/pokemon_dome_entrance.bin.lz.match (100%) rename src/data/maps/permissions/{ => cgb}/psychic_club.bin (100%) rename src/data/maps/permissions/{ => cgb}/psychic_club.bin.lz.match (100%) rename src/data/maps/permissions/{ => cgb}/psychic_club_entrance.bin (100%) rename src/data/maps/permissions/{ => cgb}/psychic_club_entrance.bin.lz.match (100%) rename src/data/maps/permissions/{ => cgb}/rock_club.bin (100%) rename src/data/maps/permissions/{ => cgb}/rock_club.bin.lz.match (100%) rename src/data/maps/permissions/{ => cgb}/rock_club_entrance.bin (100%) rename src/data/maps/permissions/{ => cgb}/rock_club_entrance.bin.lz.match (100%) rename src/data/maps/permissions/{ => cgb}/science_club.bin (100%) rename src/data/maps/permissions/{ => cgb}/science_club.bin.lz.match (100%) rename src/data/maps/permissions/{ => cgb}/science_club_entrance.bin (100%) rename src/data/maps/permissions/{ => cgb}/science_club_entrance.bin.lz.match (100%) rename src/data/maps/permissions/{ => cgb}/water_club.bin (100%) rename src/data/maps/permissions/{ => cgb}/water_club.bin.lz.match (100%) rename src/data/maps/permissions/{ => cgb}/water_club_entrance.bin (100%) rename src/data/maps/permissions/{ => cgb}/water_club_entrance.bin.lz.match (100%) rename src/data/maps/permissions/{challenge_hall_cgb.bin => gb/challenge_hall.bin} (100%) rename src/data/maps/permissions/{challenge_hall_cgb.bin.lz.match => gb/challenge_hall.bin.lz.match} (100%) rename src/data/maps/permissions/{challenge_hall_entrance_cgb.bin => gb/challenge_hall_entrance.bin} (100%) rename src/data/maps/permissions/{challenge_hall_entrance_cgb.bin.lz.match => gb/challenge_hall_entrance.bin.lz.match} (100%) rename src/data/maps/permissions/{challenge_machine_map_event_cgb.bin => gb/challenge_machine_map_event.bin} (100%) rename src/data/maps/permissions/{club_lobby_cgb.bin => gb/club_lobby.bin} (100%) rename src/data/maps/permissions/{club_lobby_cgb.bin.lz.match => gb/club_lobby.bin.lz.match} (100%) rename src/data/maps/permissions/{deck_machine_map_event_cgb.bin => gb/deck_machine_map_event.bin} (100%) rename src/data/maps/permissions/{deck_machine_room_cgb.bin => gb/deck_machine_room.bin} (100%) rename src/data/maps/permissions/{deck_machine_room_cgb.bin.lz.match => gb/deck_machine_room.bin.lz.match} (100%) rename src/data/maps/permissions/{fighting_club_cgb.bin => gb/fighting_club.bin} (100%) rename src/data/maps/permissions/{fighting_club_cgb.bin.lz.match => gb/fighting_club.bin.lz.match} (100%) rename src/data/maps/permissions/{fighting_club_entrance_cgb.bin => gb/fighting_club_entrance.bin} (100%) rename src/data/maps/permissions/{fighting_club_entrance_cgb.bin.lz.match => gb/fighting_club_entrance.bin.lz.match} (100%) rename src/data/maps/permissions/{fire_club_cgb.bin => gb/fire_club.bin} (100%) rename src/data/maps/permissions/{fire_club_cgb.bin.lz.match => gb/fire_club.bin.lz.match} (100%) rename src/data/maps/permissions/{fire_club_entrance_cgb.bin => gb/fire_club_entrance.bin} (100%) rename src/data/maps/permissions/{fire_club_entrance_cgb.bin.lz.match => gb/fire_club_entrance.bin.lz.match} (100%) rename src/data/maps/permissions/{grass_club_cgb.bin => gb/grass_club.bin} (100%) rename src/data/maps/permissions/{grass_club_cgb.bin.lz.match => gb/grass_club.bin.lz.match} (100%) rename src/data/maps/permissions/{grass_club_entrance_cgb.bin => gb/grass_club_entrance.bin} (100%) rename src/data/maps/permissions/{grass_club_entrance_cgb.bin.lz.match => gb/grass_club_entrance.bin.lz.match} (100%) rename src/data/maps/permissions/{hall_of_honor_cgb.bin => gb/hall_of_honor.bin} (100%) rename src/data/maps/permissions/{hall_of_honor_cgb.bin.lz.match => gb/hall_of_honor.bin.lz.match} (100%) rename src/data/maps/permissions/{hall_of_honor_door_map_event_cgb.bin => gb/hall_of_honor_door_map_event.bin} (100%) rename src/data/maps/permissions/{ishihara_cgb.bin => gb/ishihara.bin} (100%) rename src/data/maps/permissions/{ishihara_cgb.bin.lz.match => gb/ishihara.bin.lz.match} (100%) rename src/data/maps/permissions/{lightning_club_cgb.bin => gb/lightning_club.bin} (100%) rename src/data/maps/permissions/{lightning_club_cgb.bin.lz.match => gb/lightning_club.bin.lz.match} (100%) rename src/data/maps/permissions/{lightning_club_entrance_cgb.bin => gb/lightning_club_entrance.bin} (100%) rename src/data/maps/permissions/{lightning_club_entrance_cgb.bin.lz.match => gb/lightning_club_entrance.bin.lz.match} (100%) rename src/data/maps/permissions/{mason_laboratory_cgb.bin => gb/mason_laboratory.bin} (100%) rename src/data/maps/permissions/{mason_laboratory_cgb.bin.lz.match => gb/mason_laboratory.bin.lz.match} (100%) rename src/data/maps/permissions/{pokemon_dome_cgb.bin => gb/pokemon_dome.bin} (100%) rename src/data/maps/permissions/{pokemon_dome_cgb.bin.lz.match => gb/pokemon_dome.bin.lz.match} (100%) rename src/data/maps/permissions/{pokemon_dome_door_map_event_cgb.bin => gb/pokemon_dome_door_map_event.bin} (100%) rename src/data/maps/permissions/{pokemon_dome_entrance_cgb.bin => gb/pokemon_dome_entrance.bin} (100%) rename src/data/maps/permissions/{pokemon_dome_entrance_cgb.bin.lz.match => gb/pokemon_dome_entrance.bin.lz.match} (100%) rename src/data/maps/permissions/{psychic_club_cgb.bin => gb/psychic_club.bin} (100%) rename src/data/maps/permissions/{psychic_club_cgb.bin.lz.match => gb/psychic_club.bin.lz.match} (100%) rename src/data/maps/permissions/{psychic_club_entrance_cgb.bin => gb/psychic_club_entrance.bin} (100%) rename src/data/maps/permissions/{psychic_club_entrance_cgb.bin.lz.match => gb/psychic_club_entrance.bin.lz.match} (100%) rename src/data/maps/permissions/{rock_club_cgb.bin => gb/rock_club.bin} (100%) rename src/data/maps/permissions/{rock_club_cgb.bin.lz.match => gb/rock_club.bin.lz.match} (100%) rename src/data/maps/permissions/{rock_club_entrance_cgb.bin => gb/rock_club_entrance.bin} (100%) rename src/data/maps/permissions/{rock_club_entrance_cgb.bin.lz.match => gb/rock_club_entrance.bin.lz.match} (100%) rename src/data/maps/permissions/{science_club_cgb.bin => gb/science_club.bin} (100%) rename src/data/maps/permissions/{science_club_cgb.bin.lz.match => gb/science_club.bin.lz.match} (100%) rename src/data/maps/permissions/{science_club_entrance_cgb.bin => gb/science_club_entrance.bin} (100%) rename src/data/maps/permissions/{science_club_entrance_cgb.bin.lz.match => gb/science_club_entrance.bin.lz.match} (100%) rename src/data/maps/permissions/{water_club_cgb.bin => gb/water_club.bin} (100%) rename src/data/maps/permissions/{water_club_cgb.bin.lz.match => gb/water_club.bin.lz.match} (100%) rename src/data/maps/permissions/{water_club_entrance_cgb.bin => gb/water_club_entrance.bin} (100%) rename src/data/maps/permissions/{water_club_entrance_cgb.bin.lz.match => gb/water_club_entrance.bin.lz.match} (100%) rename src/data/maps/tiles/{aerodactyl_intro_cgb.bin => cgb/aerodactyl_intro.bin} (100%) rename src/data/maps/tiles/{aerodactyl_intro_cgb.bin.lz.match => cgb/aerodactyl_intro.bin.lz.match} (100%) rename src/data/maps/tiles/{card_pop_cgb.bin => cgb/card_pop.bin} (100%) rename src/data/maps/tiles/{card_pop_cgb.bin.lz.match => cgb/card_pop.bin.lz.match} (100%) rename src/data/maps/tiles/{challenge_hall_cgb.bin => cgb/challenge_hall.bin} (100%) rename src/data/maps/tiles/{challenge_hall_cgb.bin.lz.match => cgb/challenge_hall.bin.lz.match} (100%) rename src/data/maps/tiles/{challenge_hall_entrance_cgb.bin => cgb/challenge_hall_entrance.bin} (100%) rename src/data/maps/tiles/{challenge_hall_entrance_cgb.bin.lz.match => cgb/challenge_hall_entrance.bin.lz.match} (100%) rename src/data/maps/tiles/{challenge_machine_map_event_cgb.bin => cgb/challenge_machine_map_event.bin} (100%) rename src/data/maps/tiles/{challenge_machine_map_event_cgb.bin.lz.match => cgb/challenge_machine_map_event.bin.lz.match} (100%) rename src/data/maps/tiles/{charizard_intro_cgb.bin => cgb/charizard_intro.bin} (100%) rename src/data/maps/tiles/{charizard_intro_cgb.bin.lz.match => cgb/charizard_intro.bin.lz.match} (100%) rename src/data/maps/tiles/{club_lobby_cgb.bin => cgb/club_lobby.bin} (100%) rename src/data/maps/tiles/{club_lobby_cgb.bin.lz.match => cgb/club_lobby.bin.lz.match} (100%) rename src/data/maps/tiles/{colosseum_cgb.bin => cgb/colosseum.bin} (100%) rename src/data/maps/tiles/{colosseum_cgb.bin.lz.match => cgb/colosseum.bin.lz.match} (100%) rename src/data/maps/tiles/{copyright_cgb.bin => cgb/copyright.bin} (100%) rename src/data/maps/tiles/{copyright_cgb.bin.lz.match => cgb/copyright.bin.lz.match} (100%) rename src/data/maps/tiles/{deck_machine_map_event_cgb.bin => cgb/deck_machine_map_event.bin} (100%) rename src/data/maps/tiles/{deck_machine_room_cgb.bin => cgb/deck_machine_room.bin} (100%) rename src/data/maps/tiles/{deck_machine_room_cgb.bin.lz.match => cgb/deck_machine_room.bin.lz.match} (100%) rename src/data/maps/tiles/{evolution_cgb.bin => cgb/evolution.bin} (100%) rename src/data/maps/tiles/{evolution_cgb.bin.lz.match => cgb/evolution.bin.lz.match} (100%) rename src/data/maps/tiles/{fighting_club_cgb.bin => cgb/fighting_club.bin} (100%) rename src/data/maps/tiles/{fighting_club_cgb.bin.lz.match => cgb/fighting_club.bin.lz.match} (100%) rename src/data/maps/tiles/{fighting_club_entrance_cgb.bin => cgb/fighting_club_entrance.bin} (100%) rename src/data/maps/tiles/{fighting_club_entrance_cgb.bin.lz.match => cgb/fighting_club_entrance.bin.lz.match} (100%) rename src/data/maps/tiles/{fire_club_cgb.bin => cgb/fire_club.bin} (100%) rename src/data/maps/tiles/{fire_club_cgb.bin.lz.match => cgb/fire_club.bin.lz.match} (100%) rename src/data/maps/tiles/{fire_club_entrance_cgb.bin => cgb/fire_club_entrance.bin} (100%) rename src/data/maps/tiles/{fire_club_entrance_cgb.bin.lz.match => cgb/fire_club_entrance.bin.lz.match} (100%) rename src/data/maps/tiles/{gameboy_link_cgb.bin => cgb/gameboy_link.bin} (100%) rename src/data/maps/tiles/{gameboy_link_cgb.bin.lz.match => cgb/gameboy_link.bin.lz.match} (100%) rename src/data/maps/tiles/{gameboy_link_connecting_cgb.bin => cgb/gameboy_link_connecting.bin} (100%) rename src/data/maps/tiles/{gameboy_link_connecting_cgb.bin.lz.match => cgb/gameboy_link_connecting.bin.lz.match} (100%) rename src/data/maps/tiles/{gameboy_printer_cgb.bin => cgb/gameboy_printer.bin} (100%) rename src/data/maps/tiles/{gameboy_printer_cgb.bin.lz.match => cgb/gameboy_printer.bin.lz.match} (100%) rename src/data/maps/tiles/{grass_club_cgb.bin => cgb/grass_club.bin} (100%) rename src/data/maps/tiles/{grass_club_cgb.bin.lz.match => cgb/grass_club.bin.lz.match} (100%) rename src/data/maps/tiles/{grass_club_entrance_cgb.bin => cgb/grass_club_entrance.bin} (100%) rename src/data/maps/tiles/{grass_club_entrance_cgb.bin.lz.match => cgb/grass_club_entrance.bin.lz.match} (100%) rename src/data/maps/tiles/{hall_of_honor_cgb.bin => cgb/hall_of_honor.bin} (100%) rename src/data/maps/tiles/{hall_of_honor_cgb.bin.lz.match => cgb/hall_of_honor.bin.lz.match} (100%) rename src/data/maps/tiles/{hall_of_honor_door_map_event_cgb.bin => cgb/hall_of_honor_door_map_event.bin} (100%) rename src/data/maps/tiles/{ishihara_cgb.bin => cgb/ishihara.bin} (100%) rename src/data/maps/tiles/{ishihara_cgb.bin.lz.match => cgb/ishihara.bin.lz.match} (100%) rename src/data/maps/tiles/{japanese_title_screen_cgb.bin => cgb/japanese_title_screen.bin} (100%) rename src/data/maps/tiles/{japanese_title_screen_cgb.bin.lz.match => cgb/japanese_title_screen.bin.lz.match} (100%) rename src/data/maps/tiles/{japanese_title_screen_2_cgb.bin => cgb/japanese_title_screen_2.bin} (100%) rename src/data/maps/tiles/{japanese_title_screen_2_cgb.bin.lz.match => cgb/japanese_title_screen_2.bin.lz.match} (100%) rename src/data/maps/tiles/{laboratory_cgb.bin => cgb/laboratory.bin} (100%) rename src/data/maps/tiles/{laboratory_cgb.bin.lz.match => cgb/laboratory.bin.lz.match} (100%) rename src/data/maps/tiles/{lightning_club_cgb.bin => cgb/lightning_club.bin} (100%) rename src/data/maps/tiles/{lightning_club_cgb.bin.lz.match => cgb/lightning_club.bin.lz.match} (100%) rename src/data/maps/tiles/{lightning_club_entrance_cgb.bin => cgb/lightning_club_entrance.bin} (100%) rename src/data/maps/tiles/{lightning_club_entrance_cgb.bin.lz.match => cgb/lightning_club_entrance.bin.lz.match} (100%) rename src/data/maps/tiles/{mason_laboratory_cgb.bin => cgb/mason_laboratory.bin} (100%) rename src/data/maps/tiles/{mason_laboratory_cgb.bin.lz.match => cgb/mason_laboratory.bin.lz.match} (100%) rename src/data/maps/tiles/{mystery_cgb.bin => cgb/mystery.bin} (100%) rename src/data/maps/tiles/{mystery_cgb.bin.lz.match => cgb/mystery.bin.lz.match} (100%) rename src/data/maps/tiles/{overworld_map_cgb.bin => cgb/overworld_map.bin} (100%) rename src/data/maps/tiles/{overworld_map_cgb.bin.lz.match => cgb/overworld_map.bin.lz.match} (100%) rename src/data/maps/tiles/{pokemon_dome_cgb.bin => cgb/pokemon_dome.bin} (100%) rename src/data/maps/tiles/{pokemon_dome_cgb.bin.lz.match => cgb/pokemon_dome.bin.lz.match} (100%) rename src/data/maps/tiles/{pokemon_dome_door_map_event_cgb.bin => cgb/pokemon_dome_door_map_event.bin} (100%) rename src/data/maps/tiles/{pokemon_dome_entrance_cgb.bin => cgb/pokemon_dome_entrance.bin} (100%) rename src/data/maps/tiles/{pokemon_dome_entrance_cgb.bin.lz.match => cgb/pokemon_dome_entrance.bin.lz.match} (100%) rename src/data/maps/tiles/{psychic_club_cgb.bin => cgb/psychic_club.bin} (100%) rename src/data/maps/tiles/{psychic_club_cgb.bin.lz.match => cgb/psychic_club.bin.lz.match} (100%) rename src/data/maps/tiles/{psychic_club_entrance_cgb.bin => cgb/psychic_club_entrance.bin} (100%) rename src/data/maps/tiles/{psychic_club_entrance_cgb.bin.lz.match => cgb/psychic_club_entrance.bin.lz.match} (100%) rename src/data/maps/tiles/{rock_club_cgb.bin => cgb/rock_club.bin} (100%) rename src/data/maps/tiles/{rock_club_cgb.bin.lz.match => cgb/rock_club.bin.lz.match} (100%) rename src/data/maps/tiles/{rock_club_entrance_cgb.bin => cgb/rock_club_entrance.bin} (100%) rename src/data/maps/tiles/{rock_club_entrance_cgb.bin.lz.match => cgb/rock_club_entrance.bin.lz.match} (100%) rename src/data/maps/tiles/{science_club_cgb.bin => cgb/science_club.bin} (100%) rename src/data/maps/tiles/{science_club_cgb.bin.lz.match => cgb/science_club.bin.lz.match} (100%) rename src/data/maps/tiles/{science_club_entrance_cgb.bin => cgb/science_club_entrance.bin} (100%) rename src/data/maps/tiles/{science_club_entrance_cgb.bin.lz.match => cgb/science_club_entrance.bin.lz.match} (100%) rename src/data/maps/tiles/{scyther_intro_cgb.bin => cgb/scyther_intro.bin} (100%) rename src/data/maps/tiles/{scyther_intro_cgb.bin.lz.match => cgb/scyther_intro.bin.lz.match} (100%) rename src/data/maps/tiles/{title_screen_cgb.bin => cgb/title_screen.bin} (100%) rename src/data/maps/tiles/{title_screen_cgb.bin.lz.match => cgb/title_screen.bin.lz.match} (100%) rename src/data/maps/tiles/{water_club_cgb.bin => cgb/water_club.bin} (100%) rename src/data/maps/tiles/{water_club_cgb.bin.lz.match => cgb/water_club.bin.lz.match} (100%) rename src/data/maps/tiles/{water_club_entrance_cgb.bin => cgb/water_club_entrance.bin} (100%) rename src/data/maps/tiles/{water_club_entrance_cgb.bin.lz.match => cgb/water_club_entrance.bin.lz.match} (100%) rename src/data/maps/tiles/{ => gb}/aerodactyl_intro.bin (100%) rename src/data/maps/tiles/{ => gb}/card_pop.bin (100%) rename src/data/maps/tiles/{ => gb}/card_pop.bin.lz.match (100%) rename src/data/maps/tiles/{ => gb}/challenge_hall.bin (100%) rename src/data/maps/tiles/{ => gb}/challenge_hall.bin.lz.match (100%) rename src/data/maps/tiles/{ => gb}/challenge_hall_entrance.bin (100%) rename src/data/maps/tiles/{ => gb}/challenge_hall_entrance.bin.lz.match (100%) rename src/data/maps/tiles/{ => gb}/challenge_machine_map_event.bin (100%) rename src/data/maps/tiles/{ => gb}/charizard_intro.bin (100%) rename src/data/maps/tiles/{ => gb}/club_lobby.bin (100%) rename src/data/maps/tiles/{ => gb}/club_lobby.bin.lz.match (100%) rename src/data/maps/tiles/{ => gb}/colosseum.bin (100%) rename src/data/maps/tiles/{ => gb}/companies.bin (100%) rename src/data/maps/tiles/{ => gb}/companies.bin.lz.match (100%) rename src/data/maps/tiles/{ => gb}/copyright.bin (100%) rename src/data/maps/tiles/{ => gb}/copyright.bin.lz.match (100%) rename src/data/maps/tiles/{ => gb}/deck_machine_map_event.bin (100%) rename src/data/maps/tiles/{ => gb}/deck_machine_room.bin (100%) rename src/data/maps/tiles/{ => gb}/deck_machine_room.bin.lz.match (100%) rename src/data/maps/tiles/{ => gb}/evolution.bin (100%) rename src/data/maps/tiles/{ => gb}/fighting_club.bin (100%) rename src/data/maps/tiles/{ => gb}/fighting_club.bin.lz.match (100%) rename src/data/maps/tiles/{ => gb}/fighting_club_entrance.bin (100%) rename src/data/maps/tiles/{ => gb}/fighting_club_entrance.bin.lz.match (100%) rename src/data/maps/tiles/{ => gb}/fighting_medal.bin (100%) rename src/data/maps/tiles/{ => gb}/fighting_medal.bin.lz.match (100%) rename src/data/maps/tiles/{ => gb}/fire_club.bin (100%) rename src/data/maps/tiles/{ => gb}/fire_club.bin.lz.match (100%) rename src/data/maps/tiles/{ => gb}/fire_club_entrance.bin (100%) rename src/data/maps/tiles/{ => gb}/fire_club_entrance.bin.lz.match (100%) rename src/data/maps/tiles/{ => gb}/fire_medal.bin (100%) rename src/data/maps/tiles/{ => gb}/fire_medal.bin.lz.match (100%) rename src/data/maps/tiles/{ => gb}/gameboy_link.bin (100%) rename src/data/maps/tiles/{ => gb}/gameboy_link.bin.lz.match (100%) rename src/data/maps/tiles/{ => gb}/gameboy_link_connecting.bin (100%) rename src/data/maps/tiles/{ => gb}/gameboy_link_connecting.bin.lz.match (100%) rename src/data/maps/tiles/{ => gb}/gameboy_printer.bin (100%) rename src/data/maps/tiles/{ => gb}/gameboy_printer.bin.lz.match (100%) rename src/data/maps/tiles/{ => gb}/grass_club.bin (100%) rename src/data/maps/tiles/{ => gb}/grass_club.bin.lz.match (100%) rename src/data/maps/tiles/{ => gb}/grass_club_entrance.bin (100%) rename src/data/maps/tiles/{ => gb}/grass_club_entrance.bin.lz.match (100%) rename src/data/maps/tiles/{ => gb}/grass_medal.bin (100%) rename src/data/maps/tiles/{ => gb}/grass_medal.bin.lz.match (100%) rename src/data/maps/tiles/{ => gb}/hall_of_honor.bin (100%) rename src/data/maps/tiles/{ => gb}/hall_of_honor.bin.lz.match (100%) rename src/data/maps/tiles/{ => gb}/hall_of_honor_door_map_event.bin (100%) rename src/data/maps/tiles/{ => gb}/ishihara.bin (100%) rename src/data/maps/tiles/{ => gb}/ishihara.bin.lz.match (100%) rename src/data/maps/tiles/{ => gb}/japanese_title_screen.bin (100%) rename src/data/maps/tiles/{ => gb}/japanese_title_screen.bin.lz.match (100%) rename src/data/maps/tiles/{ => gb}/japanese_title_screen_2.bin (100%) rename src/data/maps/tiles/{ => gb}/japanese_title_screen_2.bin.lz.match (100%) rename src/data/maps/tiles/{ => gb}/laboratory.bin (100%) rename src/data/maps/tiles/{ => gb}/lightning_club.bin (100%) rename src/data/maps/tiles/{ => gb}/lightning_club.bin.lz.match (100%) rename src/data/maps/tiles/{ => gb}/lightning_club_entrance.bin (100%) rename src/data/maps/tiles/{ => gb}/lightning_club_entrance.bin.lz.match (100%) rename src/data/maps/tiles/{ => gb}/lightning_medal.bin (100%) rename src/data/maps/tiles/{ => gb}/lightning_medal.bin.lz.match (100%) rename src/data/maps/tiles/{ => gb}/mason_laboratory.bin (100%) rename src/data/maps/tiles/{ => gb}/mason_laboratory.bin.lz.match (100%) rename src/data/maps/tiles/{ => gb}/mystery.bin (100%) rename src/data/maps/tiles/{ => gb}/nintendo.bin (100%) rename src/data/maps/tiles/{ => gb}/nintendo.bin.lz.match (100%) rename src/data/maps/tiles/{ => gb}/opponent.bin (100%) rename src/data/maps/tiles/{ => gb}/overworld_map.bin (100%) rename src/data/maps/tiles/{ => gb}/overworld_map.bin.lz.match (100%) rename src/data/maps/tiles/{ => gb}/player.bin (100%) rename src/data/maps/tiles/{ => gb}/pokemon_dome.bin (100%) rename src/data/maps/tiles/{ => gb}/pokemon_dome.bin.lz.match (100%) rename src/data/maps/tiles/{ => gb}/pokemon_dome_door_map_event.bin (100%) rename src/data/maps/tiles/{ => gb}/pokemon_dome_entrance.bin (100%) rename src/data/maps/tiles/{ => gb}/pokemon_dome_entrance.bin.lz.match (100%) rename src/data/maps/tiles/{ => gb}/psychic_club.bin (100%) rename src/data/maps/tiles/{ => gb}/psychic_club.bin.lz.match (100%) rename src/data/maps/tiles/{ => gb}/psychic_club_entrance.bin (100%) rename src/data/maps/tiles/{ => gb}/psychic_club_entrance.bin.lz.match (100%) rename src/data/maps/tiles/{ => gb}/psychic_medal.bin (100%) rename src/data/maps/tiles/{ => gb}/psychic_medal.bin.lz.match (100%) rename src/data/maps/tiles/{ => gb}/rock_club.bin (100%) rename src/data/maps/tiles/{ => gb}/rock_club.bin.lz.match (100%) rename src/data/maps/tiles/{ => gb}/rock_club_entrance.bin (100%) rename src/data/maps/tiles/{ => gb}/rock_club_entrance.bin.lz.match (100%) rename src/data/maps/tiles/{ => gb}/rock_medal.bin (100%) rename src/data/maps/tiles/{ => gb}/rock_medal.bin.lz.match (100%) rename src/data/maps/tiles/{ => gb}/science_club.bin (100%) rename src/data/maps/tiles/{ => gb}/science_club.bin.lz.match (100%) rename src/data/maps/tiles/{ => gb}/science_club_entrance.bin (100%) rename src/data/maps/tiles/{ => gb}/science_club_entrance.bin.lz.match (100%) rename src/data/maps/tiles/{ => gb}/science_medal.bin (100%) rename src/data/maps/tiles/{ => gb}/science_medal.bin.lz.match (100%) rename src/data/maps/tiles/{ => gb}/scyther_intro.bin (100%) rename src/data/maps/tiles/{ => gb}/solid_tiles_1.bin (100%) rename src/data/maps/tiles/{ => gb}/solid_tiles_1.bin.lz.match (100%) rename src/data/maps/tiles/{ => gb}/solid_tiles_2.bin (100%) rename src/data/maps/tiles/{ => gb}/solid_tiles_2.bin.lz.match (100%) rename src/data/maps/tiles/{ => gb}/solid_tiles_3.bin (100%) rename src/data/maps/tiles/{ => gb}/solid_tiles_3.bin.lz.match (100%) rename src/data/maps/tiles/{ => gb}/solid_tiles_4.bin (100%) rename src/data/maps/tiles/{ => gb}/solid_tiles_4.bin.lz.match (100%) rename src/data/maps/tiles/{ => gb}/title_screen.bin (100%) rename src/data/maps/tiles/{ => gb}/title_screen.bin.lz.match (100%) rename src/data/maps/tiles/{ => gb}/water_club.bin (100%) rename src/data/maps/tiles/{ => gb}/water_club.bin.lz.match (100%) rename src/data/maps/tiles/{ => gb}/water_club_entrance.bin (100%) rename src/data/maps/tiles/{ => gb}/water_club_entrance.bin.lz.match (100%) rename src/data/maps/tiles/{ => gb}/water_medal.bin (100%) rename src/data/maps/tiles/{ => gb}/water_medal.bin.lz.match (100%) diff --git a/src/data/maps/permissions/challenge_hall.bin b/src/data/maps/permissions/cgb/challenge_hall.bin similarity index 100% rename from src/data/maps/permissions/challenge_hall.bin rename to src/data/maps/permissions/cgb/challenge_hall.bin diff --git a/src/data/maps/permissions/challenge_hall.bin.lz.match b/src/data/maps/permissions/cgb/challenge_hall.bin.lz.match similarity index 100% rename from src/data/maps/permissions/challenge_hall.bin.lz.match rename to src/data/maps/permissions/cgb/challenge_hall.bin.lz.match diff --git a/src/data/maps/permissions/challenge_hall_entrance.bin b/src/data/maps/permissions/cgb/challenge_hall_entrance.bin similarity index 100% rename from src/data/maps/permissions/challenge_hall_entrance.bin rename to src/data/maps/permissions/cgb/challenge_hall_entrance.bin diff --git a/src/data/maps/permissions/challenge_hall_entrance.bin.lz.match b/src/data/maps/permissions/cgb/challenge_hall_entrance.bin.lz.match similarity index 100% rename from src/data/maps/permissions/challenge_hall_entrance.bin.lz.match rename to src/data/maps/permissions/cgb/challenge_hall_entrance.bin.lz.match diff --git a/src/data/maps/permissions/challenge_machine_map_event.bin b/src/data/maps/permissions/cgb/challenge_machine_map_event.bin similarity index 100% rename from src/data/maps/permissions/challenge_machine_map_event.bin rename to src/data/maps/permissions/cgb/challenge_machine_map_event.bin diff --git a/src/data/maps/permissions/club_lobby.bin b/src/data/maps/permissions/cgb/club_lobby.bin similarity index 100% rename from src/data/maps/permissions/club_lobby.bin rename to src/data/maps/permissions/cgb/club_lobby.bin diff --git a/src/data/maps/permissions/club_lobby.bin.lz.match b/src/data/maps/permissions/cgb/club_lobby.bin.lz.match similarity index 100% rename from src/data/maps/permissions/club_lobby.bin.lz.match rename to src/data/maps/permissions/cgb/club_lobby.bin.lz.match diff --git a/src/data/maps/permissions/deck_machine_map_event.bin b/src/data/maps/permissions/cgb/deck_machine_map_event.bin similarity index 100% rename from src/data/maps/permissions/deck_machine_map_event.bin rename to src/data/maps/permissions/cgb/deck_machine_map_event.bin diff --git a/src/data/maps/permissions/deck_machine_room.bin b/src/data/maps/permissions/cgb/deck_machine_room.bin similarity index 100% rename from src/data/maps/permissions/deck_machine_room.bin rename to src/data/maps/permissions/cgb/deck_machine_room.bin diff --git a/src/data/maps/permissions/deck_machine_room.bin.lz.match b/src/data/maps/permissions/cgb/deck_machine_room.bin.lz.match similarity index 100% rename from src/data/maps/permissions/deck_machine_room.bin.lz.match rename to src/data/maps/permissions/cgb/deck_machine_room.bin.lz.match diff --git a/src/data/maps/permissions/fighting_club.bin b/src/data/maps/permissions/cgb/fighting_club.bin similarity index 100% rename from src/data/maps/permissions/fighting_club.bin rename to src/data/maps/permissions/cgb/fighting_club.bin diff --git a/src/data/maps/permissions/fighting_club.bin.lz.match b/src/data/maps/permissions/cgb/fighting_club.bin.lz.match similarity index 100% rename from src/data/maps/permissions/fighting_club.bin.lz.match rename to src/data/maps/permissions/cgb/fighting_club.bin.lz.match diff --git a/src/data/maps/permissions/fighting_club_entrance.bin b/src/data/maps/permissions/cgb/fighting_club_entrance.bin similarity index 100% rename from src/data/maps/permissions/fighting_club_entrance.bin rename to src/data/maps/permissions/cgb/fighting_club_entrance.bin diff --git a/src/data/maps/permissions/fighting_club_entrance.bin.lz.match b/src/data/maps/permissions/cgb/fighting_club_entrance.bin.lz.match similarity index 100% rename from src/data/maps/permissions/fighting_club_entrance.bin.lz.match rename to src/data/maps/permissions/cgb/fighting_club_entrance.bin.lz.match diff --git a/src/data/maps/permissions/fire_club.bin b/src/data/maps/permissions/cgb/fire_club.bin similarity index 100% rename from src/data/maps/permissions/fire_club.bin rename to src/data/maps/permissions/cgb/fire_club.bin diff --git a/src/data/maps/permissions/fire_club.bin.lz.match b/src/data/maps/permissions/cgb/fire_club.bin.lz.match similarity index 100% rename from src/data/maps/permissions/fire_club.bin.lz.match rename to src/data/maps/permissions/cgb/fire_club.bin.lz.match diff --git a/src/data/maps/permissions/fire_club_entrance.bin b/src/data/maps/permissions/cgb/fire_club_entrance.bin similarity index 100% rename from src/data/maps/permissions/fire_club_entrance.bin rename to src/data/maps/permissions/cgb/fire_club_entrance.bin diff --git a/src/data/maps/permissions/fire_club_entrance.bin.lz.match b/src/data/maps/permissions/cgb/fire_club_entrance.bin.lz.match similarity index 100% rename from src/data/maps/permissions/fire_club_entrance.bin.lz.match rename to src/data/maps/permissions/cgb/fire_club_entrance.bin.lz.match diff --git a/src/data/maps/permissions/grass_club.bin b/src/data/maps/permissions/cgb/grass_club.bin similarity index 100% rename from src/data/maps/permissions/grass_club.bin rename to src/data/maps/permissions/cgb/grass_club.bin diff --git a/src/data/maps/permissions/grass_club.bin.lz.match b/src/data/maps/permissions/cgb/grass_club.bin.lz.match similarity index 100% rename from src/data/maps/permissions/grass_club.bin.lz.match rename to src/data/maps/permissions/cgb/grass_club.bin.lz.match diff --git a/src/data/maps/permissions/grass_club_entrance.bin b/src/data/maps/permissions/cgb/grass_club_entrance.bin similarity index 100% rename from src/data/maps/permissions/grass_club_entrance.bin rename to src/data/maps/permissions/cgb/grass_club_entrance.bin diff --git a/src/data/maps/permissions/grass_club_entrance.bin.lz.match b/src/data/maps/permissions/cgb/grass_club_entrance.bin.lz.match similarity index 100% rename from src/data/maps/permissions/grass_club_entrance.bin.lz.match rename to src/data/maps/permissions/cgb/grass_club_entrance.bin.lz.match diff --git a/src/data/maps/permissions/hall_of_honor.bin b/src/data/maps/permissions/cgb/hall_of_honor.bin similarity index 100% rename from src/data/maps/permissions/hall_of_honor.bin rename to src/data/maps/permissions/cgb/hall_of_honor.bin diff --git a/src/data/maps/permissions/hall_of_honor.bin.lz.match b/src/data/maps/permissions/cgb/hall_of_honor.bin.lz.match similarity index 100% rename from src/data/maps/permissions/hall_of_honor.bin.lz.match rename to src/data/maps/permissions/cgb/hall_of_honor.bin.lz.match diff --git a/src/data/maps/permissions/hall_of_honor_door_map_event.bin b/src/data/maps/permissions/cgb/hall_of_honor_door_map_event.bin similarity index 100% rename from src/data/maps/permissions/hall_of_honor_door_map_event.bin rename to src/data/maps/permissions/cgb/hall_of_honor_door_map_event.bin diff --git a/src/data/maps/permissions/ishihara.bin b/src/data/maps/permissions/cgb/ishihara.bin similarity index 100% rename from src/data/maps/permissions/ishihara.bin rename to src/data/maps/permissions/cgb/ishihara.bin diff --git a/src/data/maps/permissions/ishihara.bin.lz.match b/src/data/maps/permissions/cgb/ishihara.bin.lz.match similarity index 100% rename from src/data/maps/permissions/ishihara.bin.lz.match rename to src/data/maps/permissions/cgb/ishihara.bin.lz.match diff --git a/src/data/maps/permissions/lightning_club.bin b/src/data/maps/permissions/cgb/lightning_club.bin similarity index 100% rename from src/data/maps/permissions/lightning_club.bin rename to src/data/maps/permissions/cgb/lightning_club.bin diff --git a/src/data/maps/permissions/lightning_club.bin.lz.match b/src/data/maps/permissions/cgb/lightning_club.bin.lz.match similarity index 100% rename from src/data/maps/permissions/lightning_club.bin.lz.match rename to src/data/maps/permissions/cgb/lightning_club.bin.lz.match diff --git a/src/data/maps/permissions/lightning_club_entrance.bin b/src/data/maps/permissions/cgb/lightning_club_entrance.bin similarity index 100% rename from src/data/maps/permissions/lightning_club_entrance.bin rename to src/data/maps/permissions/cgb/lightning_club_entrance.bin diff --git a/src/data/maps/permissions/lightning_club_entrance.bin.lz.match b/src/data/maps/permissions/cgb/lightning_club_entrance.bin.lz.match similarity index 100% rename from src/data/maps/permissions/lightning_club_entrance.bin.lz.match rename to src/data/maps/permissions/cgb/lightning_club_entrance.bin.lz.match diff --git a/src/data/maps/permissions/mason_laboratory.bin b/src/data/maps/permissions/cgb/mason_laboratory.bin similarity index 100% rename from src/data/maps/permissions/mason_laboratory.bin rename to src/data/maps/permissions/cgb/mason_laboratory.bin diff --git a/src/data/maps/permissions/mason_laboratory.bin.lz.match b/src/data/maps/permissions/cgb/mason_laboratory.bin.lz.match similarity index 100% rename from src/data/maps/permissions/mason_laboratory.bin.lz.match rename to src/data/maps/permissions/cgb/mason_laboratory.bin.lz.match diff --git a/src/data/maps/permissions/pokemon_dome.bin b/src/data/maps/permissions/cgb/pokemon_dome.bin similarity index 100% rename from src/data/maps/permissions/pokemon_dome.bin rename to src/data/maps/permissions/cgb/pokemon_dome.bin diff --git a/src/data/maps/permissions/pokemon_dome.bin.lz.match b/src/data/maps/permissions/cgb/pokemon_dome.bin.lz.match similarity index 100% rename from src/data/maps/permissions/pokemon_dome.bin.lz.match rename to src/data/maps/permissions/cgb/pokemon_dome.bin.lz.match diff --git a/src/data/maps/permissions/pokemon_dome_door_map_event.bin b/src/data/maps/permissions/cgb/pokemon_dome_door_map_event.bin similarity index 100% rename from src/data/maps/permissions/pokemon_dome_door_map_event.bin rename to src/data/maps/permissions/cgb/pokemon_dome_door_map_event.bin diff --git a/src/data/maps/permissions/pokemon_dome_entrance.bin b/src/data/maps/permissions/cgb/pokemon_dome_entrance.bin similarity index 100% rename from src/data/maps/permissions/pokemon_dome_entrance.bin rename to src/data/maps/permissions/cgb/pokemon_dome_entrance.bin diff --git a/src/data/maps/permissions/pokemon_dome_entrance.bin.lz.match b/src/data/maps/permissions/cgb/pokemon_dome_entrance.bin.lz.match similarity index 100% rename from src/data/maps/permissions/pokemon_dome_entrance.bin.lz.match rename to src/data/maps/permissions/cgb/pokemon_dome_entrance.bin.lz.match diff --git a/src/data/maps/permissions/psychic_club.bin b/src/data/maps/permissions/cgb/psychic_club.bin similarity index 100% rename from src/data/maps/permissions/psychic_club.bin rename to src/data/maps/permissions/cgb/psychic_club.bin diff --git a/src/data/maps/permissions/psychic_club.bin.lz.match b/src/data/maps/permissions/cgb/psychic_club.bin.lz.match similarity index 100% rename from src/data/maps/permissions/psychic_club.bin.lz.match rename to src/data/maps/permissions/cgb/psychic_club.bin.lz.match diff --git a/src/data/maps/permissions/psychic_club_entrance.bin b/src/data/maps/permissions/cgb/psychic_club_entrance.bin similarity index 100% rename from src/data/maps/permissions/psychic_club_entrance.bin rename to src/data/maps/permissions/cgb/psychic_club_entrance.bin diff --git a/src/data/maps/permissions/psychic_club_entrance.bin.lz.match b/src/data/maps/permissions/cgb/psychic_club_entrance.bin.lz.match similarity index 100% rename from src/data/maps/permissions/psychic_club_entrance.bin.lz.match rename to src/data/maps/permissions/cgb/psychic_club_entrance.bin.lz.match diff --git a/src/data/maps/permissions/rock_club.bin b/src/data/maps/permissions/cgb/rock_club.bin similarity index 100% rename from src/data/maps/permissions/rock_club.bin rename to src/data/maps/permissions/cgb/rock_club.bin diff --git a/src/data/maps/permissions/rock_club.bin.lz.match b/src/data/maps/permissions/cgb/rock_club.bin.lz.match similarity index 100% rename from src/data/maps/permissions/rock_club.bin.lz.match rename to src/data/maps/permissions/cgb/rock_club.bin.lz.match diff --git a/src/data/maps/permissions/rock_club_entrance.bin b/src/data/maps/permissions/cgb/rock_club_entrance.bin similarity index 100% rename from src/data/maps/permissions/rock_club_entrance.bin rename to src/data/maps/permissions/cgb/rock_club_entrance.bin diff --git a/src/data/maps/permissions/rock_club_entrance.bin.lz.match b/src/data/maps/permissions/cgb/rock_club_entrance.bin.lz.match similarity index 100% rename from src/data/maps/permissions/rock_club_entrance.bin.lz.match rename to src/data/maps/permissions/cgb/rock_club_entrance.bin.lz.match diff --git a/src/data/maps/permissions/science_club.bin b/src/data/maps/permissions/cgb/science_club.bin similarity index 100% rename from src/data/maps/permissions/science_club.bin rename to src/data/maps/permissions/cgb/science_club.bin diff --git a/src/data/maps/permissions/science_club.bin.lz.match b/src/data/maps/permissions/cgb/science_club.bin.lz.match similarity index 100% rename from src/data/maps/permissions/science_club.bin.lz.match rename to src/data/maps/permissions/cgb/science_club.bin.lz.match diff --git a/src/data/maps/permissions/science_club_entrance.bin b/src/data/maps/permissions/cgb/science_club_entrance.bin similarity index 100% rename from src/data/maps/permissions/science_club_entrance.bin rename to src/data/maps/permissions/cgb/science_club_entrance.bin diff --git a/src/data/maps/permissions/science_club_entrance.bin.lz.match b/src/data/maps/permissions/cgb/science_club_entrance.bin.lz.match similarity index 100% rename from src/data/maps/permissions/science_club_entrance.bin.lz.match rename to src/data/maps/permissions/cgb/science_club_entrance.bin.lz.match diff --git a/src/data/maps/permissions/water_club.bin b/src/data/maps/permissions/cgb/water_club.bin similarity index 100% rename from src/data/maps/permissions/water_club.bin rename to src/data/maps/permissions/cgb/water_club.bin diff --git a/src/data/maps/permissions/water_club.bin.lz.match b/src/data/maps/permissions/cgb/water_club.bin.lz.match similarity index 100% rename from src/data/maps/permissions/water_club.bin.lz.match rename to src/data/maps/permissions/cgb/water_club.bin.lz.match diff --git a/src/data/maps/permissions/water_club_entrance.bin b/src/data/maps/permissions/cgb/water_club_entrance.bin similarity index 100% rename from src/data/maps/permissions/water_club_entrance.bin rename to src/data/maps/permissions/cgb/water_club_entrance.bin diff --git a/src/data/maps/permissions/water_club_entrance.bin.lz.match b/src/data/maps/permissions/cgb/water_club_entrance.bin.lz.match similarity index 100% rename from src/data/maps/permissions/water_club_entrance.bin.lz.match rename to src/data/maps/permissions/cgb/water_club_entrance.bin.lz.match diff --git a/src/data/maps/permissions/challenge_hall_cgb.bin b/src/data/maps/permissions/gb/challenge_hall.bin similarity index 100% rename from src/data/maps/permissions/challenge_hall_cgb.bin rename to src/data/maps/permissions/gb/challenge_hall.bin diff --git a/src/data/maps/permissions/challenge_hall_cgb.bin.lz.match b/src/data/maps/permissions/gb/challenge_hall.bin.lz.match similarity index 100% rename from src/data/maps/permissions/challenge_hall_cgb.bin.lz.match rename to src/data/maps/permissions/gb/challenge_hall.bin.lz.match diff --git a/src/data/maps/permissions/challenge_hall_entrance_cgb.bin b/src/data/maps/permissions/gb/challenge_hall_entrance.bin similarity index 100% rename from src/data/maps/permissions/challenge_hall_entrance_cgb.bin rename to src/data/maps/permissions/gb/challenge_hall_entrance.bin diff --git a/src/data/maps/permissions/challenge_hall_entrance_cgb.bin.lz.match b/src/data/maps/permissions/gb/challenge_hall_entrance.bin.lz.match similarity index 100% rename from src/data/maps/permissions/challenge_hall_entrance_cgb.bin.lz.match rename to src/data/maps/permissions/gb/challenge_hall_entrance.bin.lz.match diff --git a/src/data/maps/permissions/challenge_machine_map_event_cgb.bin b/src/data/maps/permissions/gb/challenge_machine_map_event.bin similarity index 100% rename from src/data/maps/permissions/challenge_machine_map_event_cgb.bin rename to src/data/maps/permissions/gb/challenge_machine_map_event.bin diff --git a/src/data/maps/permissions/club_lobby_cgb.bin b/src/data/maps/permissions/gb/club_lobby.bin similarity index 100% rename from src/data/maps/permissions/club_lobby_cgb.bin rename to src/data/maps/permissions/gb/club_lobby.bin diff --git a/src/data/maps/permissions/club_lobby_cgb.bin.lz.match b/src/data/maps/permissions/gb/club_lobby.bin.lz.match similarity index 100% rename from src/data/maps/permissions/club_lobby_cgb.bin.lz.match rename to src/data/maps/permissions/gb/club_lobby.bin.lz.match diff --git a/src/data/maps/permissions/deck_machine_map_event_cgb.bin b/src/data/maps/permissions/gb/deck_machine_map_event.bin similarity index 100% rename from src/data/maps/permissions/deck_machine_map_event_cgb.bin rename to src/data/maps/permissions/gb/deck_machine_map_event.bin diff --git a/src/data/maps/permissions/deck_machine_room_cgb.bin b/src/data/maps/permissions/gb/deck_machine_room.bin similarity index 100% rename from src/data/maps/permissions/deck_machine_room_cgb.bin rename to src/data/maps/permissions/gb/deck_machine_room.bin diff --git a/src/data/maps/permissions/deck_machine_room_cgb.bin.lz.match b/src/data/maps/permissions/gb/deck_machine_room.bin.lz.match similarity index 100% rename from src/data/maps/permissions/deck_machine_room_cgb.bin.lz.match rename to src/data/maps/permissions/gb/deck_machine_room.bin.lz.match diff --git a/src/data/maps/permissions/fighting_club_cgb.bin b/src/data/maps/permissions/gb/fighting_club.bin similarity index 100% rename from src/data/maps/permissions/fighting_club_cgb.bin rename to src/data/maps/permissions/gb/fighting_club.bin diff --git a/src/data/maps/permissions/fighting_club_cgb.bin.lz.match b/src/data/maps/permissions/gb/fighting_club.bin.lz.match similarity index 100% rename from src/data/maps/permissions/fighting_club_cgb.bin.lz.match rename to src/data/maps/permissions/gb/fighting_club.bin.lz.match diff --git a/src/data/maps/permissions/fighting_club_entrance_cgb.bin b/src/data/maps/permissions/gb/fighting_club_entrance.bin similarity index 100% rename from src/data/maps/permissions/fighting_club_entrance_cgb.bin rename to src/data/maps/permissions/gb/fighting_club_entrance.bin diff --git a/src/data/maps/permissions/fighting_club_entrance_cgb.bin.lz.match b/src/data/maps/permissions/gb/fighting_club_entrance.bin.lz.match similarity index 100% rename from src/data/maps/permissions/fighting_club_entrance_cgb.bin.lz.match rename to src/data/maps/permissions/gb/fighting_club_entrance.bin.lz.match diff --git a/src/data/maps/permissions/fire_club_cgb.bin b/src/data/maps/permissions/gb/fire_club.bin similarity index 100% rename from src/data/maps/permissions/fire_club_cgb.bin rename to src/data/maps/permissions/gb/fire_club.bin diff --git a/src/data/maps/permissions/fire_club_cgb.bin.lz.match b/src/data/maps/permissions/gb/fire_club.bin.lz.match similarity index 100% rename from src/data/maps/permissions/fire_club_cgb.bin.lz.match rename to src/data/maps/permissions/gb/fire_club.bin.lz.match diff --git a/src/data/maps/permissions/fire_club_entrance_cgb.bin b/src/data/maps/permissions/gb/fire_club_entrance.bin similarity index 100% rename from src/data/maps/permissions/fire_club_entrance_cgb.bin rename to src/data/maps/permissions/gb/fire_club_entrance.bin diff --git a/src/data/maps/permissions/fire_club_entrance_cgb.bin.lz.match b/src/data/maps/permissions/gb/fire_club_entrance.bin.lz.match similarity index 100% rename from src/data/maps/permissions/fire_club_entrance_cgb.bin.lz.match rename to src/data/maps/permissions/gb/fire_club_entrance.bin.lz.match diff --git a/src/data/maps/permissions/grass_club_cgb.bin b/src/data/maps/permissions/gb/grass_club.bin similarity index 100% rename from src/data/maps/permissions/grass_club_cgb.bin rename to src/data/maps/permissions/gb/grass_club.bin diff --git a/src/data/maps/permissions/grass_club_cgb.bin.lz.match b/src/data/maps/permissions/gb/grass_club.bin.lz.match similarity index 100% rename from src/data/maps/permissions/grass_club_cgb.bin.lz.match rename to src/data/maps/permissions/gb/grass_club.bin.lz.match diff --git a/src/data/maps/permissions/grass_club_entrance_cgb.bin b/src/data/maps/permissions/gb/grass_club_entrance.bin similarity index 100% rename from src/data/maps/permissions/grass_club_entrance_cgb.bin rename to src/data/maps/permissions/gb/grass_club_entrance.bin diff --git a/src/data/maps/permissions/grass_club_entrance_cgb.bin.lz.match b/src/data/maps/permissions/gb/grass_club_entrance.bin.lz.match similarity index 100% rename from src/data/maps/permissions/grass_club_entrance_cgb.bin.lz.match rename to src/data/maps/permissions/gb/grass_club_entrance.bin.lz.match diff --git a/src/data/maps/permissions/hall_of_honor_cgb.bin b/src/data/maps/permissions/gb/hall_of_honor.bin similarity index 100% rename from src/data/maps/permissions/hall_of_honor_cgb.bin rename to src/data/maps/permissions/gb/hall_of_honor.bin diff --git a/src/data/maps/permissions/hall_of_honor_cgb.bin.lz.match b/src/data/maps/permissions/gb/hall_of_honor.bin.lz.match similarity index 100% rename from src/data/maps/permissions/hall_of_honor_cgb.bin.lz.match rename to src/data/maps/permissions/gb/hall_of_honor.bin.lz.match diff --git a/src/data/maps/permissions/hall_of_honor_door_map_event_cgb.bin b/src/data/maps/permissions/gb/hall_of_honor_door_map_event.bin similarity index 100% rename from src/data/maps/permissions/hall_of_honor_door_map_event_cgb.bin rename to src/data/maps/permissions/gb/hall_of_honor_door_map_event.bin diff --git a/src/data/maps/permissions/ishihara_cgb.bin b/src/data/maps/permissions/gb/ishihara.bin similarity index 100% rename from src/data/maps/permissions/ishihara_cgb.bin rename to src/data/maps/permissions/gb/ishihara.bin diff --git a/src/data/maps/permissions/ishihara_cgb.bin.lz.match b/src/data/maps/permissions/gb/ishihara.bin.lz.match similarity index 100% rename from src/data/maps/permissions/ishihara_cgb.bin.lz.match rename to src/data/maps/permissions/gb/ishihara.bin.lz.match diff --git a/src/data/maps/permissions/lightning_club_cgb.bin b/src/data/maps/permissions/gb/lightning_club.bin similarity index 100% rename from src/data/maps/permissions/lightning_club_cgb.bin rename to src/data/maps/permissions/gb/lightning_club.bin diff --git a/src/data/maps/permissions/lightning_club_cgb.bin.lz.match b/src/data/maps/permissions/gb/lightning_club.bin.lz.match similarity index 100% rename from src/data/maps/permissions/lightning_club_cgb.bin.lz.match rename to src/data/maps/permissions/gb/lightning_club.bin.lz.match diff --git a/src/data/maps/permissions/lightning_club_entrance_cgb.bin b/src/data/maps/permissions/gb/lightning_club_entrance.bin similarity index 100% rename from src/data/maps/permissions/lightning_club_entrance_cgb.bin rename to src/data/maps/permissions/gb/lightning_club_entrance.bin diff --git a/src/data/maps/permissions/lightning_club_entrance_cgb.bin.lz.match b/src/data/maps/permissions/gb/lightning_club_entrance.bin.lz.match similarity index 100% rename from src/data/maps/permissions/lightning_club_entrance_cgb.bin.lz.match rename to src/data/maps/permissions/gb/lightning_club_entrance.bin.lz.match diff --git a/src/data/maps/permissions/mason_laboratory_cgb.bin b/src/data/maps/permissions/gb/mason_laboratory.bin similarity index 100% rename from src/data/maps/permissions/mason_laboratory_cgb.bin rename to src/data/maps/permissions/gb/mason_laboratory.bin diff --git a/src/data/maps/permissions/mason_laboratory_cgb.bin.lz.match b/src/data/maps/permissions/gb/mason_laboratory.bin.lz.match similarity index 100% rename from src/data/maps/permissions/mason_laboratory_cgb.bin.lz.match rename to src/data/maps/permissions/gb/mason_laboratory.bin.lz.match diff --git a/src/data/maps/permissions/pokemon_dome_cgb.bin b/src/data/maps/permissions/gb/pokemon_dome.bin similarity index 100% rename from src/data/maps/permissions/pokemon_dome_cgb.bin rename to src/data/maps/permissions/gb/pokemon_dome.bin diff --git a/src/data/maps/permissions/pokemon_dome_cgb.bin.lz.match b/src/data/maps/permissions/gb/pokemon_dome.bin.lz.match similarity index 100% rename from src/data/maps/permissions/pokemon_dome_cgb.bin.lz.match rename to src/data/maps/permissions/gb/pokemon_dome.bin.lz.match diff --git a/src/data/maps/permissions/pokemon_dome_door_map_event_cgb.bin b/src/data/maps/permissions/gb/pokemon_dome_door_map_event.bin similarity index 100% rename from src/data/maps/permissions/pokemon_dome_door_map_event_cgb.bin rename to src/data/maps/permissions/gb/pokemon_dome_door_map_event.bin diff --git a/src/data/maps/permissions/pokemon_dome_entrance_cgb.bin b/src/data/maps/permissions/gb/pokemon_dome_entrance.bin similarity index 100% rename from src/data/maps/permissions/pokemon_dome_entrance_cgb.bin rename to src/data/maps/permissions/gb/pokemon_dome_entrance.bin diff --git a/src/data/maps/permissions/pokemon_dome_entrance_cgb.bin.lz.match b/src/data/maps/permissions/gb/pokemon_dome_entrance.bin.lz.match similarity index 100% rename from src/data/maps/permissions/pokemon_dome_entrance_cgb.bin.lz.match rename to src/data/maps/permissions/gb/pokemon_dome_entrance.bin.lz.match diff --git a/src/data/maps/permissions/psychic_club_cgb.bin b/src/data/maps/permissions/gb/psychic_club.bin similarity index 100% rename from src/data/maps/permissions/psychic_club_cgb.bin rename to src/data/maps/permissions/gb/psychic_club.bin diff --git a/src/data/maps/permissions/psychic_club_cgb.bin.lz.match b/src/data/maps/permissions/gb/psychic_club.bin.lz.match similarity index 100% rename from src/data/maps/permissions/psychic_club_cgb.bin.lz.match rename to src/data/maps/permissions/gb/psychic_club.bin.lz.match diff --git a/src/data/maps/permissions/psychic_club_entrance_cgb.bin b/src/data/maps/permissions/gb/psychic_club_entrance.bin similarity index 100% rename from src/data/maps/permissions/psychic_club_entrance_cgb.bin rename to src/data/maps/permissions/gb/psychic_club_entrance.bin diff --git a/src/data/maps/permissions/psychic_club_entrance_cgb.bin.lz.match b/src/data/maps/permissions/gb/psychic_club_entrance.bin.lz.match similarity index 100% rename from src/data/maps/permissions/psychic_club_entrance_cgb.bin.lz.match rename to src/data/maps/permissions/gb/psychic_club_entrance.bin.lz.match diff --git a/src/data/maps/permissions/rock_club_cgb.bin b/src/data/maps/permissions/gb/rock_club.bin similarity index 100% rename from src/data/maps/permissions/rock_club_cgb.bin rename to src/data/maps/permissions/gb/rock_club.bin diff --git a/src/data/maps/permissions/rock_club_cgb.bin.lz.match b/src/data/maps/permissions/gb/rock_club.bin.lz.match similarity index 100% rename from src/data/maps/permissions/rock_club_cgb.bin.lz.match rename to src/data/maps/permissions/gb/rock_club.bin.lz.match diff --git a/src/data/maps/permissions/rock_club_entrance_cgb.bin b/src/data/maps/permissions/gb/rock_club_entrance.bin similarity index 100% rename from src/data/maps/permissions/rock_club_entrance_cgb.bin rename to src/data/maps/permissions/gb/rock_club_entrance.bin diff --git a/src/data/maps/permissions/rock_club_entrance_cgb.bin.lz.match b/src/data/maps/permissions/gb/rock_club_entrance.bin.lz.match similarity index 100% rename from src/data/maps/permissions/rock_club_entrance_cgb.bin.lz.match rename to src/data/maps/permissions/gb/rock_club_entrance.bin.lz.match diff --git a/src/data/maps/permissions/science_club_cgb.bin b/src/data/maps/permissions/gb/science_club.bin similarity index 100% rename from src/data/maps/permissions/science_club_cgb.bin rename to src/data/maps/permissions/gb/science_club.bin diff --git a/src/data/maps/permissions/science_club_cgb.bin.lz.match b/src/data/maps/permissions/gb/science_club.bin.lz.match similarity index 100% rename from src/data/maps/permissions/science_club_cgb.bin.lz.match rename to src/data/maps/permissions/gb/science_club.bin.lz.match diff --git a/src/data/maps/permissions/science_club_entrance_cgb.bin b/src/data/maps/permissions/gb/science_club_entrance.bin similarity index 100% rename from src/data/maps/permissions/science_club_entrance_cgb.bin rename to src/data/maps/permissions/gb/science_club_entrance.bin diff --git a/src/data/maps/permissions/science_club_entrance_cgb.bin.lz.match b/src/data/maps/permissions/gb/science_club_entrance.bin.lz.match similarity index 100% rename from src/data/maps/permissions/science_club_entrance_cgb.bin.lz.match rename to src/data/maps/permissions/gb/science_club_entrance.bin.lz.match diff --git a/src/data/maps/permissions/water_club_cgb.bin b/src/data/maps/permissions/gb/water_club.bin similarity index 100% rename from src/data/maps/permissions/water_club_cgb.bin rename to src/data/maps/permissions/gb/water_club.bin diff --git a/src/data/maps/permissions/water_club_cgb.bin.lz.match b/src/data/maps/permissions/gb/water_club.bin.lz.match similarity index 100% rename from src/data/maps/permissions/water_club_cgb.bin.lz.match rename to src/data/maps/permissions/gb/water_club.bin.lz.match diff --git a/src/data/maps/permissions/water_club_entrance_cgb.bin b/src/data/maps/permissions/gb/water_club_entrance.bin similarity index 100% rename from src/data/maps/permissions/water_club_entrance_cgb.bin rename to src/data/maps/permissions/gb/water_club_entrance.bin diff --git a/src/data/maps/permissions/water_club_entrance_cgb.bin.lz.match b/src/data/maps/permissions/gb/water_club_entrance.bin.lz.match similarity index 100% rename from src/data/maps/permissions/water_club_entrance_cgb.bin.lz.match rename to src/data/maps/permissions/gb/water_club_entrance.bin.lz.match diff --git a/src/data/maps/tilemaps.asm b/src/data/maps/tilemaps.asm index 31fbf6ed..f40377f7 100644 --- a/src/data/maps/tilemaps.asm +++ b/src/data/maps/tilemaps.asm @@ -3,363 +3,363 @@ OverworldMapTilemap:: db $12 ; height dw NULL db FALSE ; cgb mode - INCBIN "data/maps/tiles/overworld_map.bin.lz" + INCBIN "data/maps/tiles/gb/overworld_map.bin.lz" OverworldMapCGBTilemap:: db $14 ; width db $12 ; height dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/overworld_map_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/overworld_map.bin.lz" MasonLaboratoryTilemap:: db $1c ; width db $1e ; height dw MasonLaboratoryPermissions db FALSE ; cgb mode - INCBIN "data/maps/tiles/mason_laboratory.bin.lz" + INCBIN "data/maps/tiles/gb/mason_laboratory.bin.lz" MasonLaboratoryPermissions: - INCBIN "data/maps/permissions/mason_laboratory.bin.lz" + INCBIN "data/maps/permissions/gb/mason_laboratory.bin.lz" MasonLaboratoryCGBTilemap:: db $1c ; width db $1e ; height dw MasonLaboratoryCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/mason_laboratory_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/mason_laboratory.bin.lz" MasonLaboratoryCGBPermissions: - INCBIN "data/maps/permissions/mason_laboratory_cgb.bin.lz" + INCBIN "data/maps/permissions/cgb/mason_laboratory.bin.lz" ChallengeMachineMapEventTilemap:: db $04 ; width db $06 ; height dw ChallengeMachineMapEventPermissions db FALSE ; cgb mode - INCBIN "data/maps/tiles/challenge_machine_map_event.bin.lz" + INCBIN "data/maps/tiles/gb/challenge_machine_map_event.bin.lz" ChallengeMachineMapEventPermissions: - INCBIN "data/maps/permissions/challenge_machine_map_event.bin.lz" + INCBIN "data/maps/permissions/gb/challenge_machine_map_event.bin.lz" ChallengeMachineMapEventCGBTilemap:: db $04 ; width db $06 ; height dw ChallengeMachineMapEventCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/challenge_machine_map_event_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/challenge_machine_map_event.bin.lz" ChallengeMachineMapEventCGBPermissions: - INCBIN "data/maps/permissions/challenge_machine_map_event_cgb.bin.lz" + INCBIN "data/maps/permissions/cgb/challenge_machine_map_event.bin.lz" DeckMachineRoomTilemap:: db $18 ; width db $1e ; height dw DeckMachineRoomPermissions db FALSE ; cgb mode - INCBIN "data/maps/tiles/deck_machine_room.bin.lz" + INCBIN "data/maps/tiles/gb/deck_machine_room.bin.lz" DeckMachineRoomPermissions: - INCBIN "data/maps/permissions/deck_machine_room.bin.lz" + INCBIN "data/maps/permissions/gb/deck_machine_room.bin.lz" DeckMachineRoomCGBTilemap:: db $18 ; width db $1e ; height dw DeckMachineRoomCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/deck_machine_room_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/deck_machine_room.bin.lz" DeckMachineRoomCGBPermissions: - INCBIN "data/maps/permissions/deck_machine_room_cgb.bin.lz" + INCBIN "data/maps/permissions/cgb/deck_machine_room.bin.lz" DeckMachineMapEventTilemap:: db $04 ; width db $01 ; height dw DeckMachineMapEventPermissions db FALSE ; cgb mode - INCBIN "data/maps/tiles/deck_machine_map_event.bin.lz" + INCBIN "data/maps/tiles/gb/deck_machine_map_event.bin.lz" DeckMachineMapEventPermissions: - INCBIN "data/maps/permissions/deck_machine_map_event.bin.lz" + INCBIN "data/maps/permissions/gb/deck_machine_map_event.bin.lz" DeckMachineMapEventCGBTilemap:: db $04 ; width db $01 ; height dw DeckMachineMapEventCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/deck_machine_map_event_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/deck_machine_map_event.bin.lz" DeckMachineMapEventCGBPermissions: - INCBIN "data/maps/permissions/deck_machine_map_event_cgb.bin.lz" + INCBIN "data/maps/permissions/cgb/deck_machine_map_event.bin.lz" IshiharaTilemap:: db $14 ; width db $18 ; height dw IshiharaPermissions db FALSE ; cgb mode - INCBIN "data/maps/tiles/ishihara.bin.lz" + INCBIN "data/maps/tiles/gb/ishihara.bin.lz" IshiharaPermissions: - INCBIN "data/maps/permissions/ishihara.bin.lz" + INCBIN "data/maps/permissions/gb/ishihara.bin.lz" IshiharaCGBTilemap:: db $14 ; width db $18 ; height dw IshiharaCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/ishihara_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/ishihara.bin.lz" IshiharaCGBPermissions: - INCBIN "data/maps/permissions/ishihara_cgb.bin.lz" + INCBIN "data/maps/permissions/cgb/ishihara.bin.lz" FightingClubEntranceTilemap:: db $14 ; width db $12 ; height dw FightingClubEntrancePermissions db FALSE ; cgb mode - INCBIN "data/maps/tiles/fighting_club_entrance.bin.lz" + INCBIN "data/maps/tiles/gb/fighting_club_entrance.bin.lz" FightingClubEntrancePermissions: - INCBIN "data/maps/permissions/fighting_club_entrance.bin.lz" + INCBIN "data/maps/permissions/gb/fighting_club_entrance.bin.lz" FightingClubEntranceCGBTilemap:: db $14 ; width db $12 ; height dw FightingClubEntranceCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/fighting_club_entrance_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/fighting_club_entrance.bin.lz" FightingClubEntranceCGBPermissions: - INCBIN "data/maps/permissions/fighting_club_entrance_cgb.bin.lz" + INCBIN "data/maps/permissions/cgb/fighting_club_entrance.bin.lz" RockClubEntranceTilemap:: db $14 ; width db $12 ; height dw RockClubEntrancePermissions db FALSE ; cgb mode - INCBIN "data/maps/tiles/rock_club_entrance.bin.lz" + INCBIN "data/maps/tiles/gb/rock_club_entrance.bin.lz" RockClubEntrancePermissions: - INCBIN "data/maps/permissions/rock_club_entrance.bin.lz" + INCBIN "data/maps/permissions/gb/rock_club_entrance.bin.lz" RockClubEntranceCGBTilemap:: db $14 ; width db $12 ; height dw RockClubEntranceCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/rock_club_entrance_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/rock_club_entrance.bin.lz" RockClubEntranceCGBPermissions: - INCBIN "data/maps/permissions/rock_club_entrance_cgb.bin.lz" + INCBIN "data/maps/permissions/cgb/rock_club_entrance.bin.lz" WaterClubEntranceTilemap:: db $14 ; width db $12 ; height dw WaterClubEntrancePermissions db FALSE ; cgb mode - INCBIN "data/maps/tiles/water_club_entrance.bin.lz" + INCBIN "data/maps/tiles/gb/water_club_entrance.bin.lz" WaterClubEntrancePermissions: - INCBIN "data/maps/permissions/water_club_entrance.bin.lz" + INCBIN "data/maps/permissions/gb/water_club_entrance.bin.lz" WaterClubEntranceCGBTilemap:: db $14 ; width db $12 ; height dw WaterClubEntranceCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/water_club_entrance_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/water_club_entrance.bin.lz" WaterClubEntranceCGBPermissions: - INCBIN "data/maps/permissions/water_club_entrance_cgb.bin.lz" + INCBIN "data/maps/permissions/cgb/water_club_entrance.bin.lz" LightningClubEntranceTilemap:: db $14 ; width db $12 ; height dw LightningClubEntrancePermissions db FALSE ; cgb mode - INCBIN "data/maps/tiles/lightning_club_entrance.bin.lz" + INCBIN "data/maps/tiles/gb/lightning_club_entrance.bin.lz" LightningClubEntrancePermissions: - INCBIN "data/maps/permissions/lightning_club_entrance.bin.lz" + INCBIN "data/maps/permissions/gb/lightning_club_entrance.bin.lz" LightningClubEntranceCGBTilemap:: db $14 ; width db $12 ; height dw LightningClubEntranceCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/lightning_club_entrance_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/lightning_club_entrance.bin.lz" LightningClubEntranceCGBPermissions: - INCBIN "data/maps/permissions/lightning_club_entrance_cgb.bin.lz" + INCBIN "data/maps/permissions/cgb/lightning_club_entrance.bin.lz" GrassClubEntranceTilemap:: db $14 ; width db $12 ; height dw GrassClubEntrancePermissions db FALSE ; cgb mode - INCBIN "data/maps/tiles/grass_club_entrance.bin.lz" + INCBIN "data/maps/tiles/gb/grass_club_entrance.bin.lz" GrassClubEntrancePermissions: - INCBIN "data/maps/permissions/grass_club_entrance.bin.lz" + INCBIN "data/maps/permissions/gb/grass_club_entrance.bin.lz" GrassClubEntranceCGBTilemap:: db $14 ; width db $12 ; height dw GrassClubEntranceCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/grass_club_entrance_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/grass_club_entrance.bin.lz" GrassClubEntranceCGBPermissions: - INCBIN "data/maps/permissions/grass_club_entrance_cgb.bin.lz" + INCBIN "data/maps/permissions/cgb/grass_club_entrance.bin.lz" PsychicClubEntranceTilemap:: db $14 ; width db $12 ; height dw PsychicClubEntrancePermissions db FALSE ; cgb mode - INCBIN "data/maps/tiles/psychic_club_entrance.bin.lz" + INCBIN "data/maps/tiles/gb/psychic_club_entrance.bin.lz" PsychicClubEntrancePermissions: - INCBIN "data/maps/permissions/psychic_club_entrance.bin.lz" + INCBIN "data/maps/permissions/gb/psychic_club_entrance.bin.lz" PsychicClubEntranceCGBTilemap:: db $14 ; width db $12 ; height dw PsychicClubEntranceCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/psychic_club_entrance_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/psychic_club_entrance.bin.lz" PsychicClubEntranceCGBPermissions: - INCBIN "data/maps/permissions/psychic_club_entrance_cgb.bin.lz" + INCBIN "data/maps/permissions/cgb/psychic_club_entrance.bin.lz" ScienceClubEntranceTilemap:: db $14 ; width db $12 ; height dw ScienceClubEntrancePermissions db FALSE ; cgb mode - INCBIN "data/maps/tiles/science_club_entrance.bin.lz" + INCBIN "data/maps/tiles/gb/science_club_entrance.bin.lz" ScienceClubEntrancePermissions: - INCBIN "data/maps/permissions/science_club_entrance.bin.lz" + INCBIN "data/maps/permissions/gb/science_club_entrance.bin.lz" ScienceClubEntranceCGBTilemap:: db $14 ; width db $12 ; height dw ScienceClubEntranceCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/science_club_entrance_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/science_club_entrance.bin.lz" ScienceClubEntranceCGBPermissions: - INCBIN "data/maps/permissions/science_club_entrance_cgb.bin.lz" + INCBIN "data/maps/permissions/cgb/science_club_entrance.bin.lz" FireClubEntranceTilemap:: db $14 ; width db $12 ; height dw FireClubEntrancePermissions db FALSE ; cgb mode - INCBIN "data/maps/tiles/fire_club_entrance.bin.lz" + INCBIN "data/maps/tiles/gb/fire_club_entrance.bin.lz" FireClubEntrancePermissions: - INCBIN "data/maps/permissions/fire_club_entrance.bin.lz" + INCBIN "data/maps/permissions/gb/fire_club_entrance.bin.lz" FireClubEntranceCGBTilemap:: db $14 ; width db $12 ; height dw FireClubEntranceCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/fire_club_entrance_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/fire_club_entrance.bin.lz" FireClubEntranceCGBPermissions: - INCBIN "data/maps/permissions/fire_club_entrance_cgb.bin.lz" + INCBIN "data/maps/permissions/cgb/fire_club_entrance.bin.lz" ChallengeHallEntranceTilemap:: db $14 ; width db $12 ; height dw ChallengeHallEntrancePermissions db FALSE ; cgb mode - INCBIN "data/maps/tiles/challenge_hall_entrance.bin.lz" + INCBIN "data/maps/tiles/gb/challenge_hall_entrance.bin.lz" ChallengeHallEntrancePermissions: - INCBIN "data/maps/permissions/challenge_hall_entrance.bin.lz" + INCBIN "data/maps/permissions/gb/challenge_hall_entrance.bin.lz" ChallengeHallEntranceCGBTilemap:: db $14 ; width db $12 ; height dw ChallengeHallEntranceCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/challenge_hall_entrance_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/challenge_hall_entrance.bin.lz" ChallengeHallEntranceCGBPermissions: - INCBIN "data/maps/permissions/challenge_hall_entrance_cgb.bin.lz" + INCBIN "data/maps/permissions/cgb/challenge_hall_entrance.bin.lz" ClubLobbyTilemap:: db $1c ; width db $1a ; height dw ClubLobbyPermissions db FALSE ; cgb mode - INCBIN "data/maps/tiles/club_lobby.bin.lz" + INCBIN "data/maps/tiles/gb/club_lobby.bin.lz" ClubLobbyPermissions: - INCBIN "data/maps/permissions/club_lobby.bin.lz" + INCBIN "data/maps/permissions/gb/club_lobby.bin.lz" ClubLobbyCGBTilemap:: db $1c ; width db $1a ; height dw ClubLobbyCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/club_lobby_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/club_lobby.bin.lz" ClubLobbyCGBPermissions: - INCBIN "data/maps/permissions/club_lobby_cgb.bin.lz" + INCBIN "data/maps/permissions/cgb/club_lobby.bin.lz" FightingClubTilemap:: db $18 ; width db $12 ; height dw FightingClubPermissions db FALSE ; cgb mode - INCBIN "data/maps/tiles/fighting_club.bin.lz" + INCBIN "data/maps/tiles/gb/fighting_club.bin.lz" FightingClubPermissions: - INCBIN "data/maps/permissions/fighting_club.bin.lz" + INCBIN "data/maps/permissions/gb/fighting_club.bin.lz" FightingClubCGBTilemap:: db $18 ; width db $12 ; height dw FightingClubCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/fighting_club_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/fighting_club.bin.lz" FightingClubCGBPermissions: - INCBIN "data/maps/permissions/fighting_club_cgb.bin.lz" + INCBIN "data/maps/permissions/cgb/fighting_club.bin.lz" RockClubTilemap:: db $1c ; width db $1e ; height dw RockClubPermissions db FALSE ; cgb mode - INCBIN "data/maps/tiles/rock_club.bin.lz" + INCBIN "data/maps/tiles/gb/rock_club.bin.lz" RockClubPermissions: - INCBIN "data/maps/permissions/rock_club.bin.lz" + INCBIN "data/maps/permissions/gb/rock_club.bin.lz" RockClubCGBTilemap:: db $1c ; width db $1e ; height dw RockClubCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/rock_club_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/rock_club.bin.lz" RockClubCGBPermissions: - INCBIN "data/maps/permissions/rock_club_cgb.bin.lz" + INCBIN "data/maps/permissions/cgb/rock_club.bin.lz" PokemonDomeDoorMapEventTilemap:: db $04 ; width db $03 ; height dw PokemonDomeDoorMapEventPermissions db FALSE ; cgb mode - INCBIN "data/maps/tiles/pokemon_dome_door_map_event.bin.lz" + INCBIN "data/maps/tiles/gb/pokemon_dome_door_map_event.bin.lz" PokemonDomeDoorMapEventPermissions: - INCBIN "data/maps/permissions/pokemon_dome_door_map_event.bin.lz" + INCBIN "data/maps/permissions/gb/pokemon_dome_door_map_event.bin.lz" PokemonDomeDoorMapEventCGBTilemap:: db $04 ; width db $03 ; height dw PokemonDomeDoorMapEventCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/pokemon_dome_door_map_event_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/pokemon_dome_door_map_event.bin.lz" PokemonDomeDoorMapEventCGBPermissions: - INCBIN "data/maps/permissions/pokemon_dome_door_map_event_cgb.bin.lz" + INCBIN "data/maps/permissions/cgb/pokemon_dome_door_map_event.bin.lz" HallOfHonorDoorMapEventTilemap:: db $04 ; width db $03 ; height dw HallOfHonorDoorMapEventPermissions db FALSE ; cgb mode - INCBIN "data/maps/tiles/hall_of_honor_door_map_event.bin.lz" + INCBIN "data/maps/tiles/gb/hall_of_honor_door_map_event.bin.lz" HallOfHonorDoorMapEventPermissions: - INCBIN "data/maps/permissions/hall_of_honor_door_map_event.bin.lz" + INCBIN "data/maps/permissions/gb/hall_of_honor_door_map_event.bin.lz" HallOfHonorDoorMapEventCGBTilemap:: db $04 ; width db $03 ; height dw HallOfHonorDoorMapEventCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/hall_of_honor_door_map_event_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/hall_of_honor_door_map_event.bin.lz" HallOfHonorDoorMapEventCGBPermissions: - INCBIN "data/maps/permissions/hall_of_honor_door_map_event_cgb.bin.lz" + INCBIN "data/maps/permissions/cgb/hall_of_honor_door_map_event.bin.lz" GrassMedalTilemap:: db $03 ; width db $03 ; height dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/grass_medal.bin.lz" + INCBIN "data/maps/tiles/gb/grass_medal.bin.lz" AnimData1:: frame_table AnimFrameTable0 diff --git a/src/data/maps/tiles/aerodactyl_intro_cgb.bin b/src/data/maps/tiles/cgb/aerodactyl_intro.bin similarity index 100% rename from src/data/maps/tiles/aerodactyl_intro_cgb.bin rename to src/data/maps/tiles/cgb/aerodactyl_intro.bin diff --git a/src/data/maps/tiles/aerodactyl_intro_cgb.bin.lz.match b/src/data/maps/tiles/cgb/aerodactyl_intro.bin.lz.match similarity index 100% rename from src/data/maps/tiles/aerodactyl_intro_cgb.bin.lz.match rename to src/data/maps/tiles/cgb/aerodactyl_intro.bin.lz.match diff --git a/src/data/maps/tiles/card_pop_cgb.bin b/src/data/maps/tiles/cgb/card_pop.bin similarity index 100% rename from src/data/maps/tiles/card_pop_cgb.bin rename to src/data/maps/tiles/cgb/card_pop.bin diff --git a/src/data/maps/tiles/card_pop_cgb.bin.lz.match b/src/data/maps/tiles/cgb/card_pop.bin.lz.match similarity index 100% rename from src/data/maps/tiles/card_pop_cgb.bin.lz.match rename to src/data/maps/tiles/cgb/card_pop.bin.lz.match diff --git a/src/data/maps/tiles/challenge_hall_cgb.bin b/src/data/maps/tiles/cgb/challenge_hall.bin similarity index 100% rename from src/data/maps/tiles/challenge_hall_cgb.bin rename to src/data/maps/tiles/cgb/challenge_hall.bin diff --git a/src/data/maps/tiles/challenge_hall_cgb.bin.lz.match b/src/data/maps/tiles/cgb/challenge_hall.bin.lz.match similarity index 100% rename from src/data/maps/tiles/challenge_hall_cgb.bin.lz.match rename to src/data/maps/tiles/cgb/challenge_hall.bin.lz.match diff --git a/src/data/maps/tiles/challenge_hall_entrance_cgb.bin b/src/data/maps/tiles/cgb/challenge_hall_entrance.bin similarity index 100% rename from src/data/maps/tiles/challenge_hall_entrance_cgb.bin rename to src/data/maps/tiles/cgb/challenge_hall_entrance.bin diff --git a/src/data/maps/tiles/challenge_hall_entrance_cgb.bin.lz.match b/src/data/maps/tiles/cgb/challenge_hall_entrance.bin.lz.match similarity index 100% rename from src/data/maps/tiles/challenge_hall_entrance_cgb.bin.lz.match rename to src/data/maps/tiles/cgb/challenge_hall_entrance.bin.lz.match diff --git a/src/data/maps/tiles/challenge_machine_map_event_cgb.bin b/src/data/maps/tiles/cgb/challenge_machine_map_event.bin similarity index 100% rename from src/data/maps/tiles/challenge_machine_map_event_cgb.bin rename to src/data/maps/tiles/cgb/challenge_machine_map_event.bin diff --git a/src/data/maps/tiles/challenge_machine_map_event_cgb.bin.lz.match b/src/data/maps/tiles/cgb/challenge_machine_map_event.bin.lz.match similarity index 100% rename from src/data/maps/tiles/challenge_machine_map_event_cgb.bin.lz.match rename to src/data/maps/tiles/cgb/challenge_machine_map_event.bin.lz.match diff --git a/src/data/maps/tiles/charizard_intro_cgb.bin b/src/data/maps/tiles/cgb/charizard_intro.bin similarity index 100% rename from src/data/maps/tiles/charizard_intro_cgb.bin rename to src/data/maps/tiles/cgb/charizard_intro.bin diff --git a/src/data/maps/tiles/charizard_intro_cgb.bin.lz.match b/src/data/maps/tiles/cgb/charizard_intro.bin.lz.match similarity index 100% rename from src/data/maps/tiles/charizard_intro_cgb.bin.lz.match rename to src/data/maps/tiles/cgb/charizard_intro.bin.lz.match diff --git a/src/data/maps/tiles/club_lobby_cgb.bin b/src/data/maps/tiles/cgb/club_lobby.bin similarity index 100% rename from src/data/maps/tiles/club_lobby_cgb.bin rename to src/data/maps/tiles/cgb/club_lobby.bin diff --git a/src/data/maps/tiles/club_lobby_cgb.bin.lz.match b/src/data/maps/tiles/cgb/club_lobby.bin.lz.match similarity index 100% rename from src/data/maps/tiles/club_lobby_cgb.bin.lz.match rename to src/data/maps/tiles/cgb/club_lobby.bin.lz.match diff --git a/src/data/maps/tiles/colosseum_cgb.bin b/src/data/maps/tiles/cgb/colosseum.bin similarity index 100% rename from src/data/maps/tiles/colosseum_cgb.bin rename to src/data/maps/tiles/cgb/colosseum.bin diff --git a/src/data/maps/tiles/colosseum_cgb.bin.lz.match b/src/data/maps/tiles/cgb/colosseum.bin.lz.match similarity index 100% rename from src/data/maps/tiles/colosseum_cgb.bin.lz.match rename to src/data/maps/tiles/cgb/colosseum.bin.lz.match diff --git a/src/data/maps/tiles/copyright_cgb.bin b/src/data/maps/tiles/cgb/copyright.bin similarity index 100% rename from src/data/maps/tiles/copyright_cgb.bin rename to src/data/maps/tiles/cgb/copyright.bin diff --git a/src/data/maps/tiles/copyright_cgb.bin.lz.match b/src/data/maps/tiles/cgb/copyright.bin.lz.match similarity index 100% rename from src/data/maps/tiles/copyright_cgb.bin.lz.match rename to src/data/maps/tiles/cgb/copyright.bin.lz.match diff --git a/src/data/maps/tiles/deck_machine_map_event_cgb.bin b/src/data/maps/tiles/cgb/deck_machine_map_event.bin similarity index 100% rename from src/data/maps/tiles/deck_machine_map_event_cgb.bin rename to src/data/maps/tiles/cgb/deck_machine_map_event.bin diff --git a/src/data/maps/tiles/deck_machine_room_cgb.bin b/src/data/maps/tiles/cgb/deck_machine_room.bin similarity index 100% rename from src/data/maps/tiles/deck_machine_room_cgb.bin rename to src/data/maps/tiles/cgb/deck_machine_room.bin diff --git a/src/data/maps/tiles/deck_machine_room_cgb.bin.lz.match b/src/data/maps/tiles/cgb/deck_machine_room.bin.lz.match similarity index 100% rename from src/data/maps/tiles/deck_machine_room_cgb.bin.lz.match rename to src/data/maps/tiles/cgb/deck_machine_room.bin.lz.match diff --git a/src/data/maps/tiles/evolution_cgb.bin b/src/data/maps/tiles/cgb/evolution.bin similarity index 100% rename from src/data/maps/tiles/evolution_cgb.bin rename to src/data/maps/tiles/cgb/evolution.bin diff --git a/src/data/maps/tiles/evolution_cgb.bin.lz.match b/src/data/maps/tiles/cgb/evolution.bin.lz.match similarity index 100% rename from src/data/maps/tiles/evolution_cgb.bin.lz.match rename to src/data/maps/tiles/cgb/evolution.bin.lz.match diff --git a/src/data/maps/tiles/fighting_club_cgb.bin b/src/data/maps/tiles/cgb/fighting_club.bin similarity index 100% rename from src/data/maps/tiles/fighting_club_cgb.bin rename to src/data/maps/tiles/cgb/fighting_club.bin diff --git a/src/data/maps/tiles/fighting_club_cgb.bin.lz.match b/src/data/maps/tiles/cgb/fighting_club.bin.lz.match similarity index 100% rename from src/data/maps/tiles/fighting_club_cgb.bin.lz.match rename to src/data/maps/tiles/cgb/fighting_club.bin.lz.match diff --git a/src/data/maps/tiles/fighting_club_entrance_cgb.bin b/src/data/maps/tiles/cgb/fighting_club_entrance.bin similarity index 100% rename from src/data/maps/tiles/fighting_club_entrance_cgb.bin rename to src/data/maps/tiles/cgb/fighting_club_entrance.bin diff --git a/src/data/maps/tiles/fighting_club_entrance_cgb.bin.lz.match b/src/data/maps/tiles/cgb/fighting_club_entrance.bin.lz.match similarity index 100% rename from src/data/maps/tiles/fighting_club_entrance_cgb.bin.lz.match rename to src/data/maps/tiles/cgb/fighting_club_entrance.bin.lz.match diff --git a/src/data/maps/tiles/fire_club_cgb.bin b/src/data/maps/tiles/cgb/fire_club.bin similarity index 100% rename from src/data/maps/tiles/fire_club_cgb.bin rename to src/data/maps/tiles/cgb/fire_club.bin diff --git a/src/data/maps/tiles/fire_club_cgb.bin.lz.match b/src/data/maps/tiles/cgb/fire_club.bin.lz.match similarity index 100% rename from src/data/maps/tiles/fire_club_cgb.bin.lz.match rename to src/data/maps/tiles/cgb/fire_club.bin.lz.match diff --git a/src/data/maps/tiles/fire_club_entrance_cgb.bin b/src/data/maps/tiles/cgb/fire_club_entrance.bin similarity index 100% rename from src/data/maps/tiles/fire_club_entrance_cgb.bin rename to src/data/maps/tiles/cgb/fire_club_entrance.bin diff --git a/src/data/maps/tiles/fire_club_entrance_cgb.bin.lz.match b/src/data/maps/tiles/cgb/fire_club_entrance.bin.lz.match similarity index 100% rename from src/data/maps/tiles/fire_club_entrance_cgb.bin.lz.match rename to src/data/maps/tiles/cgb/fire_club_entrance.bin.lz.match diff --git a/src/data/maps/tiles/gameboy_link_cgb.bin b/src/data/maps/tiles/cgb/gameboy_link.bin similarity index 100% rename from src/data/maps/tiles/gameboy_link_cgb.bin rename to src/data/maps/tiles/cgb/gameboy_link.bin diff --git a/src/data/maps/tiles/gameboy_link_cgb.bin.lz.match b/src/data/maps/tiles/cgb/gameboy_link.bin.lz.match similarity index 100% rename from src/data/maps/tiles/gameboy_link_cgb.bin.lz.match rename to src/data/maps/tiles/cgb/gameboy_link.bin.lz.match diff --git a/src/data/maps/tiles/gameboy_link_connecting_cgb.bin b/src/data/maps/tiles/cgb/gameboy_link_connecting.bin similarity index 100% rename from src/data/maps/tiles/gameboy_link_connecting_cgb.bin rename to src/data/maps/tiles/cgb/gameboy_link_connecting.bin diff --git a/src/data/maps/tiles/gameboy_link_connecting_cgb.bin.lz.match b/src/data/maps/tiles/cgb/gameboy_link_connecting.bin.lz.match similarity index 100% rename from src/data/maps/tiles/gameboy_link_connecting_cgb.bin.lz.match rename to src/data/maps/tiles/cgb/gameboy_link_connecting.bin.lz.match diff --git a/src/data/maps/tiles/gameboy_printer_cgb.bin b/src/data/maps/tiles/cgb/gameboy_printer.bin similarity index 100% rename from src/data/maps/tiles/gameboy_printer_cgb.bin rename to src/data/maps/tiles/cgb/gameboy_printer.bin diff --git a/src/data/maps/tiles/gameboy_printer_cgb.bin.lz.match b/src/data/maps/tiles/cgb/gameboy_printer.bin.lz.match similarity index 100% rename from src/data/maps/tiles/gameboy_printer_cgb.bin.lz.match rename to src/data/maps/tiles/cgb/gameboy_printer.bin.lz.match diff --git a/src/data/maps/tiles/grass_club_cgb.bin b/src/data/maps/tiles/cgb/grass_club.bin similarity index 100% rename from src/data/maps/tiles/grass_club_cgb.bin rename to src/data/maps/tiles/cgb/grass_club.bin diff --git a/src/data/maps/tiles/grass_club_cgb.bin.lz.match b/src/data/maps/tiles/cgb/grass_club.bin.lz.match similarity index 100% rename from src/data/maps/tiles/grass_club_cgb.bin.lz.match rename to src/data/maps/tiles/cgb/grass_club.bin.lz.match diff --git a/src/data/maps/tiles/grass_club_entrance_cgb.bin b/src/data/maps/tiles/cgb/grass_club_entrance.bin similarity index 100% rename from src/data/maps/tiles/grass_club_entrance_cgb.bin rename to src/data/maps/tiles/cgb/grass_club_entrance.bin diff --git a/src/data/maps/tiles/grass_club_entrance_cgb.bin.lz.match b/src/data/maps/tiles/cgb/grass_club_entrance.bin.lz.match similarity index 100% rename from src/data/maps/tiles/grass_club_entrance_cgb.bin.lz.match rename to src/data/maps/tiles/cgb/grass_club_entrance.bin.lz.match diff --git a/src/data/maps/tiles/hall_of_honor_cgb.bin b/src/data/maps/tiles/cgb/hall_of_honor.bin similarity index 100% rename from src/data/maps/tiles/hall_of_honor_cgb.bin rename to src/data/maps/tiles/cgb/hall_of_honor.bin diff --git a/src/data/maps/tiles/hall_of_honor_cgb.bin.lz.match b/src/data/maps/tiles/cgb/hall_of_honor.bin.lz.match similarity index 100% rename from src/data/maps/tiles/hall_of_honor_cgb.bin.lz.match rename to src/data/maps/tiles/cgb/hall_of_honor.bin.lz.match diff --git a/src/data/maps/tiles/hall_of_honor_door_map_event_cgb.bin b/src/data/maps/tiles/cgb/hall_of_honor_door_map_event.bin similarity index 100% rename from src/data/maps/tiles/hall_of_honor_door_map_event_cgb.bin rename to src/data/maps/tiles/cgb/hall_of_honor_door_map_event.bin diff --git a/src/data/maps/tiles/ishihara_cgb.bin b/src/data/maps/tiles/cgb/ishihara.bin similarity index 100% rename from src/data/maps/tiles/ishihara_cgb.bin rename to src/data/maps/tiles/cgb/ishihara.bin diff --git a/src/data/maps/tiles/ishihara_cgb.bin.lz.match b/src/data/maps/tiles/cgb/ishihara.bin.lz.match similarity index 100% rename from src/data/maps/tiles/ishihara_cgb.bin.lz.match rename to src/data/maps/tiles/cgb/ishihara.bin.lz.match diff --git a/src/data/maps/tiles/japanese_title_screen_cgb.bin b/src/data/maps/tiles/cgb/japanese_title_screen.bin similarity index 100% rename from src/data/maps/tiles/japanese_title_screen_cgb.bin rename to src/data/maps/tiles/cgb/japanese_title_screen.bin diff --git a/src/data/maps/tiles/japanese_title_screen_cgb.bin.lz.match b/src/data/maps/tiles/cgb/japanese_title_screen.bin.lz.match similarity index 100% rename from src/data/maps/tiles/japanese_title_screen_cgb.bin.lz.match rename to src/data/maps/tiles/cgb/japanese_title_screen.bin.lz.match diff --git a/src/data/maps/tiles/japanese_title_screen_2_cgb.bin b/src/data/maps/tiles/cgb/japanese_title_screen_2.bin similarity index 100% rename from src/data/maps/tiles/japanese_title_screen_2_cgb.bin rename to src/data/maps/tiles/cgb/japanese_title_screen_2.bin diff --git a/src/data/maps/tiles/japanese_title_screen_2_cgb.bin.lz.match b/src/data/maps/tiles/cgb/japanese_title_screen_2.bin.lz.match similarity index 100% rename from src/data/maps/tiles/japanese_title_screen_2_cgb.bin.lz.match rename to src/data/maps/tiles/cgb/japanese_title_screen_2.bin.lz.match diff --git a/src/data/maps/tiles/laboratory_cgb.bin b/src/data/maps/tiles/cgb/laboratory.bin similarity index 100% rename from src/data/maps/tiles/laboratory_cgb.bin rename to src/data/maps/tiles/cgb/laboratory.bin diff --git a/src/data/maps/tiles/laboratory_cgb.bin.lz.match b/src/data/maps/tiles/cgb/laboratory.bin.lz.match similarity index 100% rename from src/data/maps/tiles/laboratory_cgb.bin.lz.match rename to src/data/maps/tiles/cgb/laboratory.bin.lz.match diff --git a/src/data/maps/tiles/lightning_club_cgb.bin b/src/data/maps/tiles/cgb/lightning_club.bin similarity index 100% rename from src/data/maps/tiles/lightning_club_cgb.bin rename to src/data/maps/tiles/cgb/lightning_club.bin diff --git a/src/data/maps/tiles/lightning_club_cgb.bin.lz.match b/src/data/maps/tiles/cgb/lightning_club.bin.lz.match similarity index 100% rename from src/data/maps/tiles/lightning_club_cgb.bin.lz.match rename to src/data/maps/tiles/cgb/lightning_club.bin.lz.match diff --git a/src/data/maps/tiles/lightning_club_entrance_cgb.bin b/src/data/maps/tiles/cgb/lightning_club_entrance.bin similarity index 100% rename from src/data/maps/tiles/lightning_club_entrance_cgb.bin rename to src/data/maps/tiles/cgb/lightning_club_entrance.bin diff --git a/src/data/maps/tiles/lightning_club_entrance_cgb.bin.lz.match b/src/data/maps/tiles/cgb/lightning_club_entrance.bin.lz.match similarity index 100% rename from src/data/maps/tiles/lightning_club_entrance_cgb.bin.lz.match rename to src/data/maps/tiles/cgb/lightning_club_entrance.bin.lz.match diff --git a/src/data/maps/tiles/mason_laboratory_cgb.bin b/src/data/maps/tiles/cgb/mason_laboratory.bin similarity index 100% rename from src/data/maps/tiles/mason_laboratory_cgb.bin rename to src/data/maps/tiles/cgb/mason_laboratory.bin diff --git a/src/data/maps/tiles/mason_laboratory_cgb.bin.lz.match b/src/data/maps/tiles/cgb/mason_laboratory.bin.lz.match similarity index 100% rename from src/data/maps/tiles/mason_laboratory_cgb.bin.lz.match rename to src/data/maps/tiles/cgb/mason_laboratory.bin.lz.match diff --git a/src/data/maps/tiles/mystery_cgb.bin b/src/data/maps/tiles/cgb/mystery.bin similarity index 100% rename from src/data/maps/tiles/mystery_cgb.bin rename to src/data/maps/tiles/cgb/mystery.bin diff --git a/src/data/maps/tiles/mystery_cgb.bin.lz.match b/src/data/maps/tiles/cgb/mystery.bin.lz.match similarity index 100% rename from src/data/maps/tiles/mystery_cgb.bin.lz.match rename to src/data/maps/tiles/cgb/mystery.bin.lz.match diff --git a/src/data/maps/tiles/overworld_map_cgb.bin b/src/data/maps/tiles/cgb/overworld_map.bin similarity index 100% rename from src/data/maps/tiles/overworld_map_cgb.bin rename to src/data/maps/tiles/cgb/overworld_map.bin diff --git a/src/data/maps/tiles/overworld_map_cgb.bin.lz.match b/src/data/maps/tiles/cgb/overworld_map.bin.lz.match similarity index 100% rename from src/data/maps/tiles/overworld_map_cgb.bin.lz.match rename to src/data/maps/tiles/cgb/overworld_map.bin.lz.match diff --git a/src/data/maps/tiles/pokemon_dome_cgb.bin b/src/data/maps/tiles/cgb/pokemon_dome.bin similarity index 100% rename from src/data/maps/tiles/pokemon_dome_cgb.bin rename to src/data/maps/tiles/cgb/pokemon_dome.bin diff --git a/src/data/maps/tiles/pokemon_dome_cgb.bin.lz.match b/src/data/maps/tiles/cgb/pokemon_dome.bin.lz.match similarity index 100% rename from src/data/maps/tiles/pokemon_dome_cgb.bin.lz.match rename to src/data/maps/tiles/cgb/pokemon_dome.bin.lz.match diff --git a/src/data/maps/tiles/pokemon_dome_door_map_event_cgb.bin b/src/data/maps/tiles/cgb/pokemon_dome_door_map_event.bin similarity index 100% rename from src/data/maps/tiles/pokemon_dome_door_map_event_cgb.bin rename to src/data/maps/tiles/cgb/pokemon_dome_door_map_event.bin diff --git a/src/data/maps/tiles/pokemon_dome_entrance_cgb.bin b/src/data/maps/tiles/cgb/pokemon_dome_entrance.bin similarity index 100% rename from src/data/maps/tiles/pokemon_dome_entrance_cgb.bin rename to src/data/maps/tiles/cgb/pokemon_dome_entrance.bin diff --git a/src/data/maps/tiles/pokemon_dome_entrance_cgb.bin.lz.match b/src/data/maps/tiles/cgb/pokemon_dome_entrance.bin.lz.match similarity index 100% rename from src/data/maps/tiles/pokemon_dome_entrance_cgb.bin.lz.match rename to src/data/maps/tiles/cgb/pokemon_dome_entrance.bin.lz.match diff --git a/src/data/maps/tiles/psychic_club_cgb.bin b/src/data/maps/tiles/cgb/psychic_club.bin similarity index 100% rename from src/data/maps/tiles/psychic_club_cgb.bin rename to src/data/maps/tiles/cgb/psychic_club.bin diff --git a/src/data/maps/tiles/psychic_club_cgb.bin.lz.match b/src/data/maps/tiles/cgb/psychic_club.bin.lz.match similarity index 100% rename from src/data/maps/tiles/psychic_club_cgb.bin.lz.match rename to src/data/maps/tiles/cgb/psychic_club.bin.lz.match diff --git a/src/data/maps/tiles/psychic_club_entrance_cgb.bin b/src/data/maps/tiles/cgb/psychic_club_entrance.bin similarity index 100% rename from src/data/maps/tiles/psychic_club_entrance_cgb.bin rename to src/data/maps/tiles/cgb/psychic_club_entrance.bin diff --git a/src/data/maps/tiles/psychic_club_entrance_cgb.bin.lz.match b/src/data/maps/tiles/cgb/psychic_club_entrance.bin.lz.match similarity index 100% rename from src/data/maps/tiles/psychic_club_entrance_cgb.bin.lz.match rename to src/data/maps/tiles/cgb/psychic_club_entrance.bin.lz.match diff --git a/src/data/maps/tiles/rock_club_cgb.bin b/src/data/maps/tiles/cgb/rock_club.bin similarity index 100% rename from src/data/maps/tiles/rock_club_cgb.bin rename to src/data/maps/tiles/cgb/rock_club.bin diff --git a/src/data/maps/tiles/rock_club_cgb.bin.lz.match b/src/data/maps/tiles/cgb/rock_club.bin.lz.match similarity index 100% rename from src/data/maps/tiles/rock_club_cgb.bin.lz.match rename to src/data/maps/tiles/cgb/rock_club.bin.lz.match diff --git a/src/data/maps/tiles/rock_club_entrance_cgb.bin b/src/data/maps/tiles/cgb/rock_club_entrance.bin similarity index 100% rename from src/data/maps/tiles/rock_club_entrance_cgb.bin rename to src/data/maps/tiles/cgb/rock_club_entrance.bin diff --git a/src/data/maps/tiles/rock_club_entrance_cgb.bin.lz.match b/src/data/maps/tiles/cgb/rock_club_entrance.bin.lz.match similarity index 100% rename from src/data/maps/tiles/rock_club_entrance_cgb.bin.lz.match rename to src/data/maps/tiles/cgb/rock_club_entrance.bin.lz.match diff --git a/src/data/maps/tiles/science_club_cgb.bin b/src/data/maps/tiles/cgb/science_club.bin similarity index 100% rename from src/data/maps/tiles/science_club_cgb.bin rename to src/data/maps/tiles/cgb/science_club.bin diff --git a/src/data/maps/tiles/science_club_cgb.bin.lz.match b/src/data/maps/tiles/cgb/science_club.bin.lz.match similarity index 100% rename from src/data/maps/tiles/science_club_cgb.bin.lz.match rename to src/data/maps/tiles/cgb/science_club.bin.lz.match diff --git a/src/data/maps/tiles/science_club_entrance_cgb.bin b/src/data/maps/tiles/cgb/science_club_entrance.bin similarity index 100% rename from src/data/maps/tiles/science_club_entrance_cgb.bin rename to src/data/maps/tiles/cgb/science_club_entrance.bin diff --git a/src/data/maps/tiles/science_club_entrance_cgb.bin.lz.match b/src/data/maps/tiles/cgb/science_club_entrance.bin.lz.match similarity index 100% rename from src/data/maps/tiles/science_club_entrance_cgb.bin.lz.match rename to src/data/maps/tiles/cgb/science_club_entrance.bin.lz.match diff --git a/src/data/maps/tiles/scyther_intro_cgb.bin b/src/data/maps/tiles/cgb/scyther_intro.bin similarity index 100% rename from src/data/maps/tiles/scyther_intro_cgb.bin rename to src/data/maps/tiles/cgb/scyther_intro.bin diff --git a/src/data/maps/tiles/scyther_intro_cgb.bin.lz.match b/src/data/maps/tiles/cgb/scyther_intro.bin.lz.match similarity index 100% rename from src/data/maps/tiles/scyther_intro_cgb.bin.lz.match rename to src/data/maps/tiles/cgb/scyther_intro.bin.lz.match diff --git a/src/data/maps/tiles/title_screen_cgb.bin b/src/data/maps/tiles/cgb/title_screen.bin similarity index 100% rename from src/data/maps/tiles/title_screen_cgb.bin rename to src/data/maps/tiles/cgb/title_screen.bin diff --git a/src/data/maps/tiles/title_screen_cgb.bin.lz.match b/src/data/maps/tiles/cgb/title_screen.bin.lz.match similarity index 100% rename from src/data/maps/tiles/title_screen_cgb.bin.lz.match rename to src/data/maps/tiles/cgb/title_screen.bin.lz.match diff --git a/src/data/maps/tiles/water_club_cgb.bin b/src/data/maps/tiles/cgb/water_club.bin similarity index 100% rename from src/data/maps/tiles/water_club_cgb.bin rename to src/data/maps/tiles/cgb/water_club.bin diff --git a/src/data/maps/tiles/water_club_cgb.bin.lz.match b/src/data/maps/tiles/cgb/water_club.bin.lz.match similarity index 100% rename from src/data/maps/tiles/water_club_cgb.bin.lz.match rename to src/data/maps/tiles/cgb/water_club.bin.lz.match diff --git a/src/data/maps/tiles/water_club_entrance_cgb.bin b/src/data/maps/tiles/cgb/water_club_entrance.bin similarity index 100% rename from src/data/maps/tiles/water_club_entrance_cgb.bin rename to src/data/maps/tiles/cgb/water_club_entrance.bin diff --git a/src/data/maps/tiles/water_club_entrance_cgb.bin.lz.match b/src/data/maps/tiles/cgb/water_club_entrance.bin.lz.match similarity index 100% rename from src/data/maps/tiles/water_club_entrance_cgb.bin.lz.match rename to src/data/maps/tiles/cgb/water_club_entrance.bin.lz.match diff --git a/src/data/maps/tiles/aerodactyl_intro.bin b/src/data/maps/tiles/gb/aerodactyl_intro.bin similarity index 100% rename from src/data/maps/tiles/aerodactyl_intro.bin rename to src/data/maps/tiles/gb/aerodactyl_intro.bin diff --git a/src/data/maps/tiles/card_pop.bin b/src/data/maps/tiles/gb/card_pop.bin similarity index 100% rename from src/data/maps/tiles/card_pop.bin rename to src/data/maps/tiles/gb/card_pop.bin diff --git a/src/data/maps/tiles/card_pop.bin.lz.match b/src/data/maps/tiles/gb/card_pop.bin.lz.match similarity index 100% rename from src/data/maps/tiles/card_pop.bin.lz.match rename to src/data/maps/tiles/gb/card_pop.bin.lz.match diff --git a/src/data/maps/tiles/challenge_hall.bin b/src/data/maps/tiles/gb/challenge_hall.bin similarity index 100% rename from src/data/maps/tiles/challenge_hall.bin rename to src/data/maps/tiles/gb/challenge_hall.bin diff --git a/src/data/maps/tiles/challenge_hall.bin.lz.match b/src/data/maps/tiles/gb/challenge_hall.bin.lz.match similarity index 100% rename from src/data/maps/tiles/challenge_hall.bin.lz.match rename to src/data/maps/tiles/gb/challenge_hall.bin.lz.match diff --git a/src/data/maps/tiles/challenge_hall_entrance.bin b/src/data/maps/tiles/gb/challenge_hall_entrance.bin similarity index 100% rename from src/data/maps/tiles/challenge_hall_entrance.bin rename to src/data/maps/tiles/gb/challenge_hall_entrance.bin diff --git a/src/data/maps/tiles/challenge_hall_entrance.bin.lz.match b/src/data/maps/tiles/gb/challenge_hall_entrance.bin.lz.match similarity index 100% rename from src/data/maps/tiles/challenge_hall_entrance.bin.lz.match rename to src/data/maps/tiles/gb/challenge_hall_entrance.bin.lz.match diff --git a/src/data/maps/tiles/challenge_machine_map_event.bin b/src/data/maps/tiles/gb/challenge_machine_map_event.bin similarity index 100% rename from src/data/maps/tiles/challenge_machine_map_event.bin rename to src/data/maps/tiles/gb/challenge_machine_map_event.bin diff --git a/src/data/maps/tiles/charizard_intro.bin b/src/data/maps/tiles/gb/charizard_intro.bin similarity index 100% rename from src/data/maps/tiles/charizard_intro.bin rename to src/data/maps/tiles/gb/charizard_intro.bin diff --git a/src/data/maps/tiles/club_lobby.bin b/src/data/maps/tiles/gb/club_lobby.bin similarity index 100% rename from src/data/maps/tiles/club_lobby.bin rename to src/data/maps/tiles/gb/club_lobby.bin diff --git a/src/data/maps/tiles/club_lobby.bin.lz.match b/src/data/maps/tiles/gb/club_lobby.bin.lz.match similarity index 100% rename from src/data/maps/tiles/club_lobby.bin.lz.match rename to src/data/maps/tiles/gb/club_lobby.bin.lz.match diff --git a/src/data/maps/tiles/colosseum.bin b/src/data/maps/tiles/gb/colosseum.bin similarity index 100% rename from src/data/maps/tiles/colosseum.bin rename to src/data/maps/tiles/gb/colosseum.bin diff --git a/src/data/maps/tiles/companies.bin b/src/data/maps/tiles/gb/companies.bin similarity index 100% rename from src/data/maps/tiles/companies.bin rename to src/data/maps/tiles/gb/companies.bin diff --git a/src/data/maps/tiles/companies.bin.lz.match b/src/data/maps/tiles/gb/companies.bin.lz.match similarity index 100% rename from src/data/maps/tiles/companies.bin.lz.match rename to src/data/maps/tiles/gb/companies.bin.lz.match diff --git a/src/data/maps/tiles/copyright.bin b/src/data/maps/tiles/gb/copyright.bin similarity index 100% rename from src/data/maps/tiles/copyright.bin rename to src/data/maps/tiles/gb/copyright.bin diff --git a/src/data/maps/tiles/copyright.bin.lz.match b/src/data/maps/tiles/gb/copyright.bin.lz.match similarity index 100% rename from src/data/maps/tiles/copyright.bin.lz.match rename to src/data/maps/tiles/gb/copyright.bin.lz.match diff --git a/src/data/maps/tiles/deck_machine_map_event.bin b/src/data/maps/tiles/gb/deck_machine_map_event.bin similarity index 100% rename from src/data/maps/tiles/deck_machine_map_event.bin rename to src/data/maps/tiles/gb/deck_machine_map_event.bin diff --git a/src/data/maps/tiles/deck_machine_room.bin b/src/data/maps/tiles/gb/deck_machine_room.bin similarity index 100% rename from src/data/maps/tiles/deck_machine_room.bin rename to src/data/maps/tiles/gb/deck_machine_room.bin diff --git a/src/data/maps/tiles/deck_machine_room.bin.lz.match b/src/data/maps/tiles/gb/deck_machine_room.bin.lz.match similarity index 100% rename from src/data/maps/tiles/deck_machine_room.bin.lz.match rename to src/data/maps/tiles/gb/deck_machine_room.bin.lz.match diff --git a/src/data/maps/tiles/evolution.bin b/src/data/maps/tiles/gb/evolution.bin similarity index 100% rename from src/data/maps/tiles/evolution.bin rename to src/data/maps/tiles/gb/evolution.bin diff --git a/src/data/maps/tiles/fighting_club.bin b/src/data/maps/tiles/gb/fighting_club.bin similarity index 100% rename from src/data/maps/tiles/fighting_club.bin rename to src/data/maps/tiles/gb/fighting_club.bin diff --git a/src/data/maps/tiles/fighting_club.bin.lz.match b/src/data/maps/tiles/gb/fighting_club.bin.lz.match similarity index 100% rename from src/data/maps/tiles/fighting_club.bin.lz.match rename to src/data/maps/tiles/gb/fighting_club.bin.lz.match diff --git a/src/data/maps/tiles/fighting_club_entrance.bin b/src/data/maps/tiles/gb/fighting_club_entrance.bin similarity index 100% rename from src/data/maps/tiles/fighting_club_entrance.bin rename to src/data/maps/tiles/gb/fighting_club_entrance.bin diff --git a/src/data/maps/tiles/fighting_club_entrance.bin.lz.match b/src/data/maps/tiles/gb/fighting_club_entrance.bin.lz.match similarity index 100% rename from src/data/maps/tiles/fighting_club_entrance.bin.lz.match rename to src/data/maps/tiles/gb/fighting_club_entrance.bin.lz.match diff --git a/src/data/maps/tiles/fighting_medal.bin b/src/data/maps/tiles/gb/fighting_medal.bin similarity index 100% rename from src/data/maps/tiles/fighting_medal.bin rename to src/data/maps/tiles/gb/fighting_medal.bin diff --git a/src/data/maps/tiles/fighting_medal.bin.lz.match b/src/data/maps/tiles/gb/fighting_medal.bin.lz.match similarity index 100% rename from src/data/maps/tiles/fighting_medal.bin.lz.match rename to src/data/maps/tiles/gb/fighting_medal.bin.lz.match diff --git a/src/data/maps/tiles/fire_club.bin b/src/data/maps/tiles/gb/fire_club.bin similarity index 100% rename from src/data/maps/tiles/fire_club.bin rename to src/data/maps/tiles/gb/fire_club.bin diff --git a/src/data/maps/tiles/fire_club.bin.lz.match b/src/data/maps/tiles/gb/fire_club.bin.lz.match similarity index 100% rename from src/data/maps/tiles/fire_club.bin.lz.match rename to src/data/maps/tiles/gb/fire_club.bin.lz.match diff --git a/src/data/maps/tiles/fire_club_entrance.bin b/src/data/maps/tiles/gb/fire_club_entrance.bin similarity index 100% rename from src/data/maps/tiles/fire_club_entrance.bin rename to src/data/maps/tiles/gb/fire_club_entrance.bin diff --git a/src/data/maps/tiles/fire_club_entrance.bin.lz.match b/src/data/maps/tiles/gb/fire_club_entrance.bin.lz.match similarity index 100% rename from src/data/maps/tiles/fire_club_entrance.bin.lz.match rename to src/data/maps/tiles/gb/fire_club_entrance.bin.lz.match diff --git a/src/data/maps/tiles/fire_medal.bin b/src/data/maps/tiles/gb/fire_medal.bin similarity index 100% rename from src/data/maps/tiles/fire_medal.bin rename to src/data/maps/tiles/gb/fire_medal.bin diff --git a/src/data/maps/tiles/fire_medal.bin.lz.match b/src/data/maps/tiles/gb/fire_medal.bin.lz.match similarity index 100% rename from src/data/maps/tiles/fire_medal.bin.lz.match rename to src/data/maps/tiles/gb/fire_medal.bin.lz.match diff --git a/src/data/maps/tiles/gameboy_link.bin b/src/data/maps/tiles/gb/gameboy_link.bin similarity index 100% rename from src/data/maps/tiles/gameboy_link.bin rename to src/data/maps/tiles/gb/gameboy_link.bin diff --git a/src/data/maps/tiles/gameboy_link.bin.lz.match b/src/data/maps/tiles/gb/gameboy_link.bin.lz.match similarity index 100% rename from src/data/maps/tiles/gameboy_link.bin.lz.match rename to src/data/maps/tiles/gb/gameboy_link.bin.lz.match diff --git a/src/data/maps/tiles/gameboy_link_connecting.bin b/src/data/maps/tiles/gb/gameboy_link_connecting.bin similarity index 100% rename from src/data/maps/tiles/gameboy_link_connecting.bin rename to src/data/maps/tiles/gb/gameboy_link_connecting.bin diff --git a/src/data/maps/tiles/gameboy_link_connecting.bin.lz.match b/src/data/maps/tiles/gb/gameboy_link_connecting.bin.lz.match similarity index 100% rename from src/data/maps/tiles/gameboy_link_connecting.bin.lz.match rename to src/data/maps/tiles/gb/gameboy_link_connecting.bin.lz.match diff --git a/src/data/maps/tiles/gameboy_printer.bin b/src/data/maps/tiles/gb/gameboy_printer.bin similarity index 100% rename from src/data/maps/tiles/gameboy_printer.bin rename to src/data/maps/tiles/gb/gameboy_printer.bin diff --git a/src/data/maps/tiles/gameboy_printer.bin.lz.match b/src/data/maps/tiles/gb/gameboy_printer.bin.lz.match similarity index 100% rename from src/data/maps/tiles/gameboy_printer.bin.lz.match rename to src/data/maps/tiles/gb/gameboy_printer.bin.lz.match diff --git a/src/data/maps/tiles/grass_club.bin b/src/data/maps/tiles/gb/grass_club.bin similarity index 100% rename from src/data/maps/tiles/grass_club.bin rename to src/data/maps/tiles/gb/grass_club.bin diff --git a/src/data/maps/tiles/grass_club.bin.lz.match b/src/data/maps/tiles/gb/grass_club.bin.lz.match similarity index 100% rename from src/data/maps/tiles/grass_club.bin.lz.match rename to src/data/maps/tiles/gb/grass_club.bin.lz.match diff --git a/src/data/maps/tiles/grass_club_entrance.bin b/src/data/maps/tiles/gb/grass_club_entrance.bin similarity index 100% rename from src/data/maps/tiles/grass_club_entrance.bin rename to src/data/maps/tiles/gb/grass_club_entrance.bin diff --git a/src/data/maps/tiles/grass_club_entrance.bin.lz.match b/src/data/maps/tiles/gb/grass_club_entrance.bin.lz.match similarity index 100% rename from src/data/maps/tiles/grass_club_entrance.bin.lz.match rename to src/data/maps/tiles/gb/grass_club_entrance.bin.lz.match diff --git a/src/data/maps/tiles/grass_medal.bin b/src/data/maps/tiles/gb/grass_medal.bin similarity index 100% rename from src/data/maps/tiles/grass_medal.bin rename to src/data/maps/tiles/gb/grass_medal.bin diff --git a/src/data/maps/tiles/grass_medal.bin.lz.match b/src/data/maps/tiles/gb/grass_medal.bin.lz.match similarity index 100% rename from src/data/maps/tiles/grass_medal.bin.lz.match rename to src/data/maps/tiles/gb/grass_medal.bin.lz.match diff --git a/src/data/maps/tiles/hall_of_honor.bin b/src/data/maps/tiles/gb/hall_of_honor.bin similarity index 100% rename from src/data/maps/tiles/hall_of_honor.bin rename to src/data/maps/tiles/gb/hall_of_honor.bin diff --git a/src/data/maps/tiles/hall_of_honor.bin.lz.match b/src/data/maps/tiles/gb/hall_of_honor.bin.lz.match similarity index 100% rename from src/data/maps/tiles/hall_of_honor.bin.lz.match rename to src/data/maps/tiles/gb/hall_of_honor.bin.lz.match diff --git a/src/data/maps/tiles/hall_of_honor_door_map_event.bin b/src/data/maps/tiles/gb/hall_of_honor_door_map_event.bin similarity index 100% rename from src/data/maps/tiles/hall_of_honor_door_map_event.bin rename to src/data/maps/tiles/gb/hall_of_honor_door_map_event.bin diff --git a/src/data/maps/tiles/ishihara.bin b/src/data/maps/tiles/gb/ishihara.bin similarity index 100% rename from src/data/maps/tiles/ishihara.bin rename to src/data/maps/tiles/gb/ishihara.bin diff --git a/src/data/maps/tiles/ishihara.bin.lz.match b/src/data/maps/tiles/gb/ishihara.bin.lz.match similarity index 100% rename from src/data/maps/tiles/ishihara.bin.lz.match rename to src/data/maps/tiles/gb/ishihara.bin.lz.match diff --git a/src/data/maps/tiles/japanese_title_screen.bin b/src/data/maps/tiles/gb/japanese_title_screen.bin similarity index 100% rename from src/data/maps/tiles/japanese_title_screen.bin rename to src/data/maps/tiles/gb/japanese_title_screen.bin diff --git a/src/data/maps/tiles/japanese_title_screen.bin.lz.match b/src/data/maps/tiles/gb/japanese_title_screen.bin.lz.match similarity index 100% rename from src/data/maps/tiles/japanese_title_screen.bin.lz.match rename to src/data/maps/tiles/gb/japanese_title_screen.bin.lz.match diff --git a/src/data/maps/tiles/japanese_title_screen_2.bin b/src/data/maps/tiles/gb/japanese_title_screen_2.bin similarity index 100% rename from src/data/maps/tiles/japanese_title_screen_2.bin rename to src/data/maps/tiles/gb/japanese_title_screen_2.bin diff --git a/src/data/maps/tiles/japanese_title_screen_2.bin.lz.match b/src/data/maps/tiles/gb/japanese_title_screen_2.bin.lz.match similarity index 100% rename from src/data/maps/tiles/japanese_title_screen_2.bin.lz.match rename to src/data/maps/tiles/gb/japanese_title_screen_2.bin.lz.match diff --git a/src/data/maps/tiles/laboratory.bin b/src/data/maps/tiles/gb/laboratory.bin similarity index 100% rename from src/data/maps/tiles/laboratory.bin rename to src/data/maps/tiles/gb/laboratory.bin diff --git a/src/data/maps/tiles/lightning_club.bin b/src/data/maps/tiles/gb/lightning_club.bin similarity index 100% rename from src/data/maps/tiles/lightning_club.bin rename to src/data/maps/tiles/gb/lightning_club.bin diff --git a/src/data/maps/tiles/lightning_club.bin.lz.match b/src/data/maps/tiles/gb/lightning_club.bin.lz.match similarity index 100% rename from src/data/maps/tiles/lightning_club.bin.lz.match rename to src/data/maps/tiles/gb/lightning_club.bin.lz.match diff --git a/src/data/maps/tiles/lightning_club_entrance.bin b/src/data/maps/tiles/gb/lightning_club_entrance.bin similarity index 100% rename from src/data/maps/tiles/lightning_club_entrance.bin rename to src/data/maps/tiles/gb/lightning_club_entrance.bin diff --git a/src/data/maps/tiles/lightning_club_entrance.bin.lz.match b/src/data/maps/tiles/gb/lightning_club_entrance.bin.lz.match similarity index 100% rename from src/data/maps/tiles/lightning_club_entrance.bin.lz.match rename to src/data/maps/tiles/gb/lightning_club_entrance.bin.lz.match diff --git a/src/data/maps/tiles/lightning_medal.bin b/src/data/maps/tiles/gb/lightning_medal.bin similarity index 100% rename from src/data/maps/tiles/lightning_medal.bin rename to src/data/maps/tiles/gb/lightning_medal.bin diff --git a/src/data/maps/tiles/lightning_medal.bin.lz.match b/src/data/maps/tiles/gb/lightning_medal.bin.lz.match similarity index 100% rename from src/data/maps/tiles/lightning_medal.bin.lz.match rename to src/data/maps/tiles/gb/lightning_medal.bin.lz.match diff --git a/src/data/maps/tiles/mason_laboratory.bin b/src/data/maps/tiles/gb/mason_laboratory.bin similarity index 100% rename from src/data/maps/tiles/mason_laboratory.bin rename to src/data/maps/tiles/gb/mason_laboratory.bin diff --git a/src/data/maps/tiles/mason_laboratory.bin.lz.match b/src/data/maps/tiles/gb/mason_laboratory.bin.lz.match similarity index 100% rename from src/data/maps/tiles/mason_laboratory.bin.lz.match rename to src/data/maps/tiles/gb/mason_laboratory.bin.lz.match diff --git a/src/data/maps/tiles/mystery.bin b/src/data/maps/tiles/gb/mystery.bin similarity index 100% rename from src/data/maps/tiles/mystery.bin rename to src/data/maps/tiles/gb/mystery.bin diff --git a/src/data/maps/tiles/nintendo.bin b/src/data/maps/tiles/gb/nintendo.bin similarity index 100% rename from src/data/maps/tiles/nintendo.bin rename to src/data/maps/tiles/gb/nintendo.bin diff --git a/src/data/maps/tiles/nintendo.bin.lz.match b/src/data/maps/tiles/gb/nintendo.bin.lz.match similarity index 100% rename from src/data/maps/tiles/nintendo.bin.lz.match rename to src/data/maps/tiles/gb/nintendo.bin.lz.match diff --git a/src/data/maps/tiles/opponent.bin b/src/data/maps/tiles/gb/opponent.bin similarity index 100% rename from src/data/maps/tiles/opponent.bin rename to src/data/maps/tiles/gb/opponent.bin diff --git a/src/data/maps/tiles/overworld_map.bin b/src/data/maps/tiles/gb/overworld_map.bin similarity index 100% rename from src/data/maps/tiles/overworld_map.bin rename to src/data/maps/tiles/gb/overworld_map.bin diff --git a/src/data/maps/tiles/overworld_map.bin.lz.match b/src/data/maps/tiles/gb/overworld_map.bin.lz.match similarity index 100% rename from src/data/maps/tiles/overworld_map.bin.lz.match rename to src/data/maps/tiles/gb/overworld_map.bin.lz.match diff --git a/src/data/maps/tiles/player.bin b/src/data/maps/tiles/gb/player.bin similarity index 100% rename from src/data/maps/tiles/player.bin rename to src/data/maps/tiles/gb/player.bin diff --git a/src/data/maps/tiles/pokemon_dome.bin b/src/data/maps/tiles/gb/pokemon_dome.bin similarity index 100% rename from src/data/maps/tiles/pokemon_dome.bin rename to src/data/maps/tiles/gb/pokemon_dome.bin diff --git a/src/data/maps/tiles/pokemon_dome.bin.lz.match b/src/data/maps/tiles/gb/pokemon_dome.bin.lz.match similarity index 100% rename from src/data/maps/tiles/pokemon_dome.bin.lz.match rename to src/data/maps/tiles/gb/pokemon_dome.bin.lz.match diff --git a/src/data/maps/tiles/pokemon_dome_door_map_event.bin b/src/data/maps/tiles/gb/pokemon_dome_door_map_event.bin similarity index 100% rename from src/data/maps/tiles/pokemon_dome_door_map_event.bin rename to src/data/maps/tiles/gb/pokemon_dome_door_map_event.bin diff --git a/src/data/maps/tiles/pokemon_dome_entrance.bin b/src/data/maps/tiles/gb/pokemon_dome_entrance.bin similarity index 100% rename from src/data/maps/tiles/pokemon_dome_entrance.bin rename to src/data/maps/tiles/gb/pokemon_dome_entrance.bin diff --git a/src/data/maps/tiles/pokemon_dome_entrance.bin.lz.match b/src/data/maps/tiles/gb/pokemon_dome_entrance.bin.lz.match similarity index 100% rename from src/data/maps/tiles/pokemon_dome_entrance.bin.lz.match rename to src/data/maps/tiles/gb/pokemon_dome_entrance.bin.lz.match diff --git a/src/data/maps/tiles/psychic_club.bin b/src/data/maps/tiles/gb/psychic_club.bin similarity index 100% rename from src/data/maps/tiles/psychic_club.bin rename to src/data/maps/tiles/gb/psychic_club.bin diff --git a/src/data/maps/tiles/psychic_club.bin.lz.match b/src/data/maps/tiles/gb/psychic_club.bin.lz.match similarity index 100% rename from src/data/maps/tiles/psychic_club.bin.lz.match rename to src/data/maps/tiles/gb/psychic_club.bin.lz.match diff --git a/src/data/maps/tiles/psychic_club_entrance.bin b/src/data/maps/tiles/gb/psychic_club_entrance.bin similarity index 100% rename from src/data/maps/tiles/psychic_club_entrance.bin rename to src/data/maps/tiles/gb/psychic_club_entrance.bin diff --git a/src/data/maps/tiles/psychic_club_entrance.bin.lz.match b/src/data/maps/tiles/gb/psychic_club_entrance.bin.lz.match similarity index 100% rename from src/data/maps/tiles/psychic_club_entrance.bin.lz.match rename to src/data/maps/tiles/gb/psychic_club_entrance.bin.lz.match diff --git a/src/data/maps/tiles/psychic_medal.bin b/src/data/maps/tiles/gb/psychic_medal.bin similarity index 100% rename from src/data/maps/tiles/psychic_medal.bin rename to src/data/maps/tiles/gb/psychic_medal.bin diff --git a/src/data/maps/tiles/psychic_medal.bin.lz.match b/src/data/maps/tiles/gb/psychic_medal.bin.lz.match similarity index 100% rename from src/data/maps/tiles/psychic_medal.bin.lz.match rename to src/data/maps/tiles/gb/psychic_medal.bin.lz.match diff --git a/src/data/maps/tiles/rock_club.bin b/src/data/maps/tiles/gb/rock_club.bin similarity index 100% rename from src/data/maps/tiles/rock_club.bin rename to src/data/maps/tiles/gb/rock_club.bin diff --git a/src/data/maps/tiles/rock_club.bin.lz.match b/src/data/maps/tiles/gb/rock_club.bin.lz.match similarity index 100% rename from src/data/maps/tiles/rock_club.bin.lz.match rename to src/data/maps/tiles/gb/rock_club.bin.lz.match diff --git a/src/data/maps/tiles/rock_club_entrance.bin b/src/data/maps/tiles/gb/rock_club_entrance.bin similarity index 100% rename from src/data/maps/tiles/rock_club_entrance.bin rename to src/data/maps/tiles/gb/rock_club_entrance.bin diff --git a/src/data/maps/tiles/rock_club_entrance.bin.lz.match b/src/data/maps/tiles/gb/rock_club_entrance.bin.lz.match similarity index 100% rename from src/data/maps/tiles/rock_club_entrance.bin.lz.match rename to src/data/maps/tiles/gb/rock_club_entrance.bin.lz.match diff --git a/src/data/maps/tiles/rock_medal.bin b/src/data/maps/tiles/gb/rock_medal.bin similarity index 100% rename from src/data/maps/tiles/rock_medal.bin rename to src/data/maps/tiles/gb/rock_medal.bin diff --git a/src/data/maps/tiles/rock_medal.bin.lz.match b/src/data/maps/tiles/gb/rock_medal.bin.lz.match similarity index 100% rename from src/data/maps/tiles/rock_medal.bin.lz.match rename to src/data/maps/tiles/gb/rock_medal.bin.lz.match diff --git a/src/data/maps/tiles/science_club.bin b/src/data/maps/tiles/gb/science_club.bin similarity index 100% rename from src/data/maps/tiles/science_club.bin rename to src/data/maps/tiles/gb/science_club.bin diff --git a/src/data/maps/tiles/science_club.bin.lz.match b/src/data/maps/tiles/gb/science_club.bin.lz.match similarity index 100% rename from src/data/maps/tiles/science_club.bin.lz.match rename to src/data/maps/tiles/gb/science_club.bin.lz.match diff --git a/src/data/maps/tiles/science_club_entrance.bin b/src/data/maps/tiles/gb/science_club_entrance.bin similarity index 100% rename from src/data/maps/tiles/science_club_entrance.bin rename to src/data/maps/tiles/gb/science_club_entrance.bin diff --git a/src/data/maps/tiles/science_club_entrance.bin.lz.match b/src/data/maps/tiles/gb/science_club_entrance.bin.lz.match similarity index 100% rename from src/data/maps/tiles/science_club_entrance.bin.lz.match rename to src/data/maps/tiles/gb/science_club_entrance.bin.lz.match diff --git a/src/data/maps/tiles/science_medal.bin b/src/data/maps/tiles/gb/science_medal.bin similarity index 100% rename from src/data/maps/tiles/science_medal.bin rename to src/data/maps/tiles/gb/science_medal.bin diff --git a/src/data/maps/tiles/science_medal.bin.lz.match b/src/data/maps/tiles/gb/science_medal.bin.lz.match similarity index 100% rename from src/data/maps/tiles/science_medal.bin.lz.match rename to src/data/maps/tiles/gb/science_medal.bin.lz.match diff --git a/src/data/maps/tiles/scyther_intro.bin b/src/data/maps/tiles/gb/scyther_intro.bin similarity index 100% rename from src/data/maps/tiles/scyther_intro.bin rename to src/data/maps/tiles/gb/scyther_intro.bin diff --git a/src/data/maps/tiles/solid_tiles_1.bin b/src/data/maps/tiles/gb/solid_tiles_1.bin similarity index 100% rename from src/data/maps/tiles/solid_tiles_1.bin rename to src/data/maps/tiles/gb/solid_tiles_1.bin diff --git a/src/data/maps/tiles/solid_tiles_1.bin.lz.match b/src/data/maps/tiles/gb/solid_tiles_1.bin.lz.match similarity index 100% rename from src/data/maps/tiles/solid_tiles_1.bin.lz.match rename to src/data/maps/tiles/gb/solid_tiles_1.bin.lz.match diff --git a/src/data/maps/tiles/solid_tiles_2.bin b/src/data/maps/tiles/gb/solid_tiles_2.bin similarity index 100% rename from src/data/maps/tiles/solid_tiles_2.bin rename to src/data/maps/tiles/gb/solid_tiles_2.bin diff --git a/src/data/maps/tiles/solid_tiles_2.bin.lz.match b/src/data/maps/tiles/gb/solid_tiles_2.bin.lz.match similarity index 100% rename from src/data/maps/tiles/solid_tiles_2.bin.lz.match rename to src/data/maps/tiles/gb/solid_tiles_2.bin.lz.match diff --git a/src/data/maps/tiles/solid_tiles_3.bin b/src/data/maps/tiles/gb/solid_tiles_3.bin similarity index 100% rename from src/data/maps/tiles/solid_tiles_3.bin rename to src/data/maps/tiles/gb/solid_tiles_3.bin diff --git a/src/data/maps/tiles/solid_tiles_3.bin.lz.match b/src/data/maps/tiles/gb/solid_tiles_3.bin.lz.match similarity index 100% rename from src/data/maps/tiles/solid_tiles_3.bin.lz.match rename to src/data/maps/tiles/gb/solid_tiles_3.bin.lz.match diff --git a/src/data/maps/tiles/solid_tiles_4.bin b/src/data/maps/tiles/gb/solid_tiles_4.bin similarity index 100% rename from src/data/maps/tiles/solid_tiles_4.bin rename to src/data/maps/tiles/gb/solid_tiles_4.bin diff --git a/src/data/maps/tiles/solid_tiles_4.bin.lz.match b/src/data/maps/tiles/gb/solid_tiles_4.bin.lz.match similarity index 100% rename from src/data/maps/tiles/solid_tiles_4.bin.lz.match rename to src/data/maps/tiles/gb/solid_tiles_4.bin.lz.match diff --git a/src/data/maps/tiles/title_screen.bin b/src/data/maps/tiles/gb/title_screen.bin similarity index 100% rename from src/data/maps/tiles/title_screen.bin rename to src/data/maps/tiles/gb/title_screen.bin diff --git a/src/data/maps/tiles/title_screen.bin.lz.match b/src/data/maps/tiles/gb/title_screen.bin.lz.match similarity index 100% rename from src/data/maps/tiles/title_screen.bin.lz.match rename to src/data/maps/tiles/gb/title_screen.bin.lz.match diff --git a/src/data/maps/tiles/water_club.bin b/src/data/maps/tiles/gb/water_club.bin similarity index 100% rename from src/data/maps/tiles/water_club.bin rename to src/data/maps/tiles/gb/water_club.bin diff --git a/src/data/maps/tiles/water_club.bin.lz.match b/src/data/maps/tiles/gb/water_club.bin.lz.match similarity index 100% rename from src/data/maps/tiles/water_club.bin.lz.match rename to src/data/maps/tiles/gb/water_club.bin.lz.match diff --git a/src/data/maps/tiles/water_club_entrance.bin b/src/data/maps/tiles/gb/water_club_entrance.bin similarity index 100% rename from src/data/maps/tiles/water_club_entrance.bin rename to src/data/maps/tiles/gb/water_club_entrance.bin diff --git a/src/data/maps/tiles/water_club_entrance.bin.lz.match b/src/data/maps/tiles/gb/water_club_entrance.bin.lz.match similarity index 100% rename from src/data/maps/tiles/water_club_entrance.bin.lz.match rename to src/data/maps/tiles/gb/water_club_entrance.bin.lz.match diff --git a/src/data/maps/tiles/water_medal.bin b/src/data/maps/tiles/gb/water_medal.bin similarity index 100% rename from src/data/maps/tiles/water_medal.bin rename to src/data/maps/tiles/gb/water_medal.bin diff --git a/src/data/maps/tiles/water_medal.bin.lz.match b/src/data/maps/tiles/gb/water_medal.bin.lz.match similarity index 100% rename from src/data/maps/tiles/water_medal.bin.lz.match rename to src/data/maps/tiles/gb/water_medal.bin.lz.match diff --git a/src/gfx.asm b/src/gfx.asm index 85d732be..c1ad25fc 100644 --- a/src/gfx.asm +++ b/src/gfx.asm @@ -48,495 +48,495 @@ WaterClubTilemap:: db $20 ; height dw WaterClubPermissions db FALSE ; cgb mode - INCBIN "data/maps/tiles/water_club.bin.lz" + INCBIN "data/maps/tiles/gb/water_club.bin.lz" WaterClubPermissions: - INCBIN "data/maps/permissions/water_club.bin.lz" + INCBIN "data/maps/permissions/cgb/water_club.bin.lz" WaterClubCGBTilemap:: db $1c ; width db $20 ; height dw WaterClubCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/water_club_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/water_club.bin.lz" WaterClubCGBPermissions: - INCBIN "data/maps/permissions/water_club_cgb.bin.lz" + INCBIN "data/maps/permissions/cgb/water_club.bin.lz" LightningClubTilemap:: db $1c ; width db $20 ; height dw LightningClubPermissions db FALSE ; cgb mode - INCBIN "data/maps/tiles/lightning_club.bin.lz" + INCBIN "data/maps/tiles/gb/lightning_club.bin.lz" LightningClubPermissions: - INCBIN "data/maps/permissions/lightning_club.bin.lz" + INCBIN "data/maps/permissions/cgb/lightning_club.bin.lz" LightningClubCGBTilemap:: db $1c ; width db $20 ; height dw LightningClubCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/lightning_club_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/lightning_club.bin.lz" LightningClubCGBPermissions: - INCBIN "data/maps/permissions/lightning_club_cgb.bin.lz" + INCBIN "data/maps/permissions/cgb/lightning_club.bin.lz" GrassClubTilemap:: db $1c ; width db $20 ; height dw GrassClubPermissions db FALSE ; cgb mode - INCBIN "data/maps/tiles/grass_club.bin.lz" + INCBIN "data/maps/tiles/gb/grass_club.bin.lz" GrassClubPermissions: - INCBIN "data/maps/permissions/grass_club.bin.lz" + INCBIN "data/maps/permissions/cgb/grass_club.bin.lz" GrassClubCGBTilemap:: db $1c ; width db $20 ; height dw GrassClubCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/grass_club_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/grass_club.bin.lz" GrassClubCGBPermissions: - INCBIN "data/maps/permissions/grass_club_cgb.bin.lz" + INCBIN "data/maps/permissions/cgb/grass_club.bin.lz" PsychicClubTilemap:: db $1c ; width db $1c ; height dw PsychicClubPermissions db FALSE ; cgb mode - INCBIN "data/maps/tiles/psychic_club.bin.lz" + INCBIN "data/maps/tiles/gb/psychic_club.bin.lz" PsychicClubPermissions: - INCBIN "data/maps/permissions/psychic_club.bin.lz" + INCBIN "data/maps/permissions/cgb/psychic_club.bin.lz" PsychicClubCGBTilemap:: db $1c ; width db $1c ; height dw PsychicClubCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/psychic_club_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/psychic_club.bin.lz" PsychicClubCGBPermissions: - INCBIN "data/maps/permissions/psychic_club_cgb.bin.lz" + INCBIN "data/maps/permissions/cgb/psychic_club.bin.lz" ScienceClubTilemap:: db $1c ; width db $20 ; height dw ScienceClubPermissions db FALSE ; cgb mode - INCBIN "data/maps/tiles/science_club.bin.lz" + INCBIN "data/maps/tiles/gb/science_club.bin.lz" ScienceClubPermissions: - INCBIN "data/maps/permissions/science_club.bin.lz" + INCBIN "data/maps/permissions/cgb/science_club.bin.lz" ScienceClubCGBTilemap:: db $1c ; width db $20 ; height dw ScienceClubCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/science_club_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/science_club.bin.lz" ScienceClubCGBPermissions: - INCBIN "data/maps/permissions/science_club_cgb.bin.lz" + INCBIN "data/maps/permissions/cgb/science_club.bin.lz" FireClubTilemap:: db $1c ; width db $20 ; height dw FireClubPermissions db FALSE ; cgb mode - INCBIN "data/maps/tiles/fire_club.bin.lz" + INCBIN "data/maps/tiles/gb/fire_club.bin.lz" FireClubPermissions: - INCBIN "data/maps/permissions/fire_club.bin.lz" + INCBIN "data/maps/permissions/cgb/fire_club.bin.lz" FireClubCGBTilemap:: db $1c ; width db $20 ; height dw FireClubCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/fire_club_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/fire_club.bin.lz" FireClubCGBPermissions: - INCBIN "data/maps/permissions/fire_club_cgb.bin.lz" + INCBIN "data/maps/permissions/cgb/fire_club.bin.lz" ChallengeHallTilemap:: db $20 ; width db $20 ; height dw ChallengeHallPermissions db FALSE ; cgb mode - INCBIN "data/maps/tiles/challenge_hall.bin.lz" + INCBIN "data/maps/tiles/gb/challenge_hall.bin.lz" ChallengeHallPermissions: - INCBIN "data/maps/permissions/challenge_hall.bin.lz" + INCBIN "data/maps/permissions/cgb/challenge_hall.bin.lz" ChallengeHallCGBTilemap:: db $20 ; width db $20 ; height dw ChallengeHallCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/challenge_hall_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/challenge_hall.bin.lz" ChallengeHallCGBPermissions: - INCBIN "data/maps/permissions/challenge_hall_cgb.bin.lz" + INCBIN "data/maps/permissions/cgb/challenge_hall.bin.lz" PokemonDomeEntranceTilemap:: db $20 ; width db $12 ; height dw PokemonDomeEntrancePermissions db FALSE ; cgb mode - INCBIN "data/maps/tiles/pokemon_dome_entrance.bin.lz" + INCBIN "data/maps/tiles/gb/pokemon_dome_entrance.bin.lz" PokemonDomeEntrancePermissions: - INCBIN "data/maps/permissions/pokemon_dome_entrance.bin.lz" + INCBIN "data/maps/permissions/cgb/pokemon_dome_entrance.bin.lz" PokemonDomeEntranceCGBTilemap:: db $20 ; width db $12 ; height dw PokemonDomeEntranceCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/pokemon_dome_entrance_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/pokemon_dome_entrance.bin.lz" PokemonDomeEntranceCGBPermissions: - INCBIN "data/maps/permissions/pokemon_dome_entrance_cgb.bin.lz" + INCBIN "data/maps/permissions/cgb/pokemon_dome_entrance.bin.lz" PokemonDomeTilemap:: db $20 ; width db $20 ; height dw PokemonDomePermissions db FALSE ; cgb mode - INCBIN "data/maps/tiles/pokemon_dome.bin.lz" + INCBIN "data/maps/tiles/gb/pokemon_dome.bin.lz" PokemonDomePermissions: - INCBIN "data/maps/permissions/pokemon_dome.bin.lz" + INCBIN "data/maps/permissions/cgb/pokemon_dome.bin.lz" PokemonDomeCGBTilemap:: db $20 ; width db $20 ; height dw PokemonDomeCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/pokemon_dome_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/pokemon_dome.bin.lz" PokemonDomeCGBPermissions: - INCBIN "data/maps/permissions/pokemon_dome_cgb.bin.lz" + INCBIN "data/maps/permissions/cgb/pokemon_dome.bin.lz" HallOfHonorTilemap:: db $18 ; width db $1a ; height dw HallOfHonorPermissions db FALSE ; cgb mode - INCBIN "data/maps/tiles/hall_of_honor.bin.lz" + INCBIN "data/maps/tiles/gb/hall_of_honor.bin.lz" HallOfHonorPermissions: - INCBIN "data/maps/permissions/hall_of_honor.bin.lz" + INCBIN "data/maps/permissions/cgb/hall_of_honor.bin.lz" HallOfHonorCGBTilemap:: db $18 ; width db $1a ; height dw HallOfHonorCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/hall_of_honor_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/hall_of_honor.bin.lz" HallOfHonorCGBPermissions: - INCBIN "data/maps/permissions/hall_of_honor_cgb.bin.lz" + INCBIN "data/maps/permissions/cgb/hall_of_honor.bin.lz" CardPopCGBTilemap:: db $14 ; width db $12 ; height dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/card_pop_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/card_pop.bin.lz" CardPopTilemap:: db $14 ; width db $12 ; height dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/card_pop.bin.lz" + INCBIN "data/maps/tiles/gb/card_pop.bin.lz" ScienceMedalTilemap:: db $03 ; width db $03 ; height dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/science_medal.bin.lz" + INCBIN "data/maps/tiles/gb/science_medal.bin.lz" FireMedalTilemap:: db $03 ; width db $03 ; height dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/fire_medal.bin.lz" + INCBIN "data/maps/tiles/gb/fire_medal.bin.lz" WaterMedalTilemap:: db $03 ; width db $03 ; height dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/water_medal.bin.lz" + INCBIN "data/maps/tiles/gb/water_medal.bin.lz" LightningMedalTilemap:: db $03 ; width db $03 ; height dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/lightning_medal.bin.lz" + INCBIN "data/maps/tiles/gb/lightning_medal.bin.lz" FightingMedalTilemap:: db $03 ; width db $03 ; height dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/fighting_medal.bin.lz" + INCBIN "data/maps/tiles/gb/fighting_medal.bin.lz" RockMedalTilemap:: db $03 ; width db $03 ; height dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/rock_medal.bin.lz" + INCBIN "data/maps/tiles/gb/rock_medal.bin.lz" PsychicMedalTilemap:: db $03 ; width db $03 ; height dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/psychic_medal.bin.lz" + INCBIN "data/maps/tiles/gb/psychic_medal.bin.lz" GameBoyLinkCGBTilemap:: db $14 ; width db $12 ; height dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/gameboy_link_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/gameboy_link.bin.lz" GameBoyLinkTilemap:: db $14 ; width db $12 ; height dw NULL db FALSE ; cgb mode - INCBIN "data/maps/tiles/gameboy_link.bin.lz" + INCBIN "data/maps/tiles/gb/gameboy_link.bin.lz" GameBoyLinkConnectingCGBTilemap:: db $14 ; width db $12 ; height dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/gameboy_link_connecting_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/gameboy_link_connecting.bin.lz" GameBoyLinkConnectingTilemap:: db $14 ; width db $12 ; height dw NULL db FALSE ; cgb mode - INCBIN "data/maps/tiles/gameboy_link_connecting.bin.lz" + INCBIN "data/maps/tiles/gb/gameboy_link_connecting.bin.lz" GameBoyPrinterCGBTilemap:: db $14 ; width db $12 ; height dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/gameboy_printer_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/gameboy_printer.bin.lz" GameBoyPrinterTilemap:: db $14 ; width db $12 ; height dw NULL db FALSE ; cgb mode - INCBIN "data/maps/tiles/gameboy_printer.bin.lz" + INCBIN "data/maps/tiles/gb/gameboy_printer.bin.lz" ColosseumTilemap:: db $08 ; width db $0c ; height dw NULL db FALSE ; cgb mode - INCBIN "data/maps/tiles/colosseum.bin.lz" + INCBIN "data/maps/tiles/gb/colosseum.bin.lz" ColosseumCGBTilemap:: db $08 ; width db $0c ; height dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/colosseum_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/colosseum.bin.lz" EvolutionTilemap:: db $08 ; width db $0c ; height dw NULL db FALSE ; cgb mode - INCBIN "data/maps/tiles/evolution.bin.lz" + INCBIN "data/maps/tiles/gb/evolution.bin.lz" EvolutionCGBTilemap:: db $08 ; width db $0c ; height dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/evolution_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/evolution.bin.lz" MysteryTilemap:: db $08 ; width db $0c ; height dw NULL db FALSE ; cgb mode - INCBIN "data/maps/tiles/mystery.bin.lz" + INCBIN "data/maps/tiles/gb/mystery.bin.lz" MysteryCGBTilemap:: db $08 ; width db $0c ; height dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/mystery_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/mystery.bin.lz" LaboratoryTilemap:: db $08 ; width db $0c ; height dw NULL db FALSE ; cgb mode - INCBIN "data/maps/tiles/laboratory.bin.lz" + INCBIN "data/maps/tiles/gb/laboratory.bin.lz" LaboratoryCGBTilemap:: db $08 ; width db $0c ; height dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/laboratory_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/laboratory.bin.lz" CharizardIntroTilemap:: db $08 ; width db $0c ; height dw NULL db FALSE ; cgb mode - INCBIN "data/maps/tiles/charizard_intro.bin.lz" + INCBIN "data/maps/tiles/gb/charizard_intro.bin.lz" CharizardIntroCGBTilemap:: db $08 ; width db $0c ; height dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/charizard_intro_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/charizard_intro.bin.lz" ScytherIntroTilemap:: db $08 ; width db $0c ; height dw NULL db FALSE ; cgb mode - INCBIN "data/maps/tiles/scyther_intro.bin.lz" + INCBIN "data/maps/tiles/gb/scyther_intro.bin.lz" ScytherIntroCGBTilemap:: db $08 ; width db $0c ; height dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/scyther_intro_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/scyther_intro.bin.lz" AerodactylIntroTilemap:: db $08 ; width db $0c ; height dw NULL db FALSE ; cgb mode - INCBIN "data/maps/tiles/aerodactyl_intro.bin.lz" + INCBIN "data/maps/tiles/gb/aerodactyl_intro.bin.lz" AerodactylIntroCGBTilemap:: db $08 ; width db $0c ; height dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/aerodactyl_intro_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/aerodactyl_intro.bin.lz" JapaneseTitleScreenTilemap:: db $14 ; width db $12 ; height dw NULL db FALSE ; cgb mode - INCBIN "data/maps/tiles/japanese_title_screen.bin.lz" + INCBIN "data/maps/tiles/gb/japanese_title_screen.bin.lz" JapaneseTitleScreenCGBTilemap:: db $14 ; width db $12 ; height dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/japanese_title_screen_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/japanese_title_screen.bin.lz" SolidTiles1Tilemap:: db $14 ; width db $12 ; height dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/solid_tiles_1.bin.lz" + INCBIN "data/maps/tiles/gb/solid_tiles_1.bin.lz" SolidTiles2Tilemap:: db $14 ; width db $12 ; height dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/solid_tiles_2.bin.lz" + INCBIN "data/maps/tiles/gb/solid_tiles_2.bin.lz" SolidTiles3Tilemap:: db $14 ; width db $12 ; height dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/solid_tiles_3.bin.lz" + INCBIN "data/maps/tiles/gb/solid_tiles_3.bin.lz" JapaneseTitleScreen2Tilemap:: db $14 ; width db $12 ; height dw NULL db FALSE ; cgb mode - INCBIN "data/maps/tiles/japanese_title_screen_2.bin.lz" + INCBIN "data/maps/tiles/gb/japanese_title_screen_2.bin.lz" JapaneseTitleScreen2CGBTilemap:: db $14 ; width db $12 ; height dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/japanese_title_screen_2_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/japanese_title_screen_2.bin.lz" SolidTiles4Tilemap:: db $08 ; width db $04 ; height dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/solid_tiles_4.bin.lz" + INCBIN "data/maps/tiles/gb/solid_tiles_4.bin.lz" PlayerTilemap:: db $06 ; width db $06 ; height dw NULL db FALSE ; cgb mode - INCBIN "data/maps/tiles/player.bin.lz" + INCBIN "data/maps/tiles/gb/player.bin.lz" OpponentTilemap:: db $06 ; width db $06 ; height dw NULL db FALSE ; cgb mode - INCBIN "data/maps/tiles/opponent.bin.lz" + INCBIN "data/maps/tiles/gb/opponent.bin.lz" TitleScreenTilemap:: db $14 ; width db $12 ; height dw NULL db FALSE ; cgb mode - INCBIN "data/maps/tiles/title_screen.bin.lz" + INCBIN "data/maps/tiles/gb/title_screen.bin.lz" TitleScreenCGBTilemap:: db $14 ; width db $12 ; height dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/title_screen_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/title_screen.bin.lz" CopyrightTilemap:: db $14 ; width db $12 ; height dw NULL db FALSE ; cgb mode - INCBIN "data/maps/tiles/copyright.bin.lz" + INCBIN "data/maps/tiles/gb/copyright.bin.lz" CopyrightCGBTilemap:: db $14 ; width db $12 ; height dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/copyright_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/copyright.bin.lz" NintendoTilemap:: db $14 ; width db $12 ; height dw NULL db FALSE ; cgb mode - INCBIN "data/maps/tiles/nintendo.bin.lz" + INCBIN "data/maps/tiles/gb/nintendo.bin.lz" CompaniesTilemap:: db $14 ; width db $12 ; height dw NULL db FALSE ; cgb mode - INCBIN "data/maps/tiles/companies.bin.lz" + INCBIN "data/maps/tiles/gb/companies.bin.lz" IshiharaTilesetGfx:: dw 77 From 1c890458846e2011cc2dfdcdfbccbfc520f4c894 Mon Sep 17 00:00:00 2001 From: ElectroDeoxys Date: Tue, 7 Nov 2023 17:26:14 +0000 Subject: [PATCH 2/7] Add dimension files and change file extensions --- .gitattributes | 1 + src/data/maps/tilemaps.asm | 165 ++++------- ...actyl_intro.bin => aerodactyl_intro.bgmap} | Bin ....match => aerodactyl_intro.bgmap.lz.match} | Bin .../tiles/cgb/aerodactyl_intro.dimensions | 1 + .../cgb/{card_pop.bin => card_pop.bgmap} | Bin ...p.bin.lz.match => card_pop.bgmap.lz.match} | Bin src/data/maps/tiles/cgb/card_pop.dimensions | 1 + .../card_pop_noncgb.bgmap} | Bin .../card_pop_noncgb.bgmap.lz.match} | Bin .../maps/tiles/cgb/card_pop_noncgb.dimensions | 1 + ...hallenge_hall.bin => challenge_hall.bgmap} | Bin ...lz.match => challenge_hall.bgmap.lz.match} | Bin .../maps/tiles/cgb/challenge_hall.dimensions | 1 + ...ance.bin => challenge_hall_entrance.bgmap} | Bin ...=> challenge_hall_entrance.bgmap.lz.match} | Bin .../cgb/challenge_hall_entrance.dimensions | 1 + ....bin => challenge_machine_map_event.bgmap} | 0 ...hallenge_machine_map_event.bgmap.lz.match} | 0 .../challenge_machine_map_event.dimensions | 1 + ...rizard_intro.bin => charizard_intro.bgmap} | Bin ...z.match => charizard_intro.bgmap.lz.match} | Bin .../maps/tiles/cgb/charizard_intro.dimensions | 1 + .../cgb/{club_lobby.bin => club_lobby.bgmap} | 0 ...bin.lz.match => club_lobby.bgmap.lz.match} | 0 src/data/maps/tiles/cgb/club_lobby.dimensions | 1 + .../cgb/{colosseum.bin => colosseum.bgmap} | Bin ....bin.lz.match => colosseum.bgmap.lz.match} | Bin src/data/maps/tiles/cgb/colosseum.dimensions | 1 + .../cgb/{copyright.bin => copyright.bgmap} | Bin ....bin.lz.match => copyright.bgmap.lz.match} | Bin src/data/maps/tiles/cgb/copyright.dimensions | 1 + ...event.bin => deck_machine_map_event.bgmap} | 0 .../cgb/deck_machine_map_event.dimensions | 1 + ...chine_room.bin => deck_machine_room.bgmap} | 0 ...match => deck_machine_room.bgmap.lz.match} | Bin .../tiles/cgb/deck_machine_room.dimensions | 1 + .../cgb/{evolution.bin => evolution.bgmap} | Bin ....bin.lz.match => evolution.bgmap.lz.match} | Bin src/data/maps/tiles/cgb/evolution.dimensions | 1 + ...{fighting_club.bin => fighting_club.bgmap} | Bin ....lz.match => fighting_club.bgmap.lz.match} | Bin .../maps/tiles/cgb/fighting_club.dimensions | 1 + ...rance.bin => fighting_club_entrance.bgmap} | Bin ... => fighting_club_entrance.bgmap.lz.match} | Bin .../cgb/fighting_club_entrance.dimensions | 1 + .../fighting_medal.bgmap} | 0 .../fighting_medal.bgmap.lz.match} | 0 .../maps/tiles/cgb/fighting_medal.dimensions | 1 + .../cgb/{fire_club.bin => fire_club.bgmap} | 0 ....bin.lz.match => fire_club.bgmap.lz.match} | Bin src/data/maps/tiles/cgb/fire_club.dimensions | 1 + ..._entrance.bin => fire_club_entrance.bgmap} | Bin ...atch => fire_club_entrance.bgmap.lz.match} | Bin .../tiles/cgb/fire_club_entrance.dimensions | 1 + .../fire_medal.bin => cgb/fire_medal.bgmap} | 0 .../fire_medal.bgmap.lz.match} | 0 src/data/maps/tiles/cgb/fire_medal.dimensions | 1 + .../{gameboy_link.bin => gameboy_link.bgmap} | Bin ...n.lz.match => gameboy_link.bgmap.lz.match} | Bin .../maps/tiles/cgb/gameboy_link.dimensions | 1 + ...ting.bin => gameboy_link_connecting.bgmap} | Bin ...=> gameboy_link_connecting.bgmap.lz.match} | Bin .../cgb/gameboy_link_connecting.dimensions | 1 + ...eboy_printer.bin => gameboy_printer.bgmap} | Bin ...z.match => gameboy_printer.bgmap.lz.match} | Bin .../maps/tiles/cgb/gameboy_printer.dimensions | 1 + .../cgb/{grass_club.bin => grass_club.bgmap} | Bin ...bin.lz.match => grass_club.bgmap.lz.match} | Bin src/data/maps/tiles/cgb/grass_club.dimensions | 1 + ...entrance.bin => grass_club_entrance.bgmap} | Bin ...tch => grass_club_entrance.bgmap.lz.match} | Bin .../tiles/cgb/grass_club_entrance.dimensions | 1 + .../grass_medal.bin => cgb/grass_medal.bgmap} | 0 .../grass_medal.bgmap.lz.match} | 0 .../maps/tiles/cgb/grass_medal.dimensions | 1 + ...{hall_of_honor.bin => hall_of_honor.bgmap} | 0 ....lz.match => hall_of_honor.bgmap.lz.match} | Bin .../maps/tiles/cgb/hall_of_honor.dimensions | 1 + ...bin => hall_of_honor_door_map_event.bgmap} | 0 .../hall_of_honor_door_map_event.dimensions | 1 + .../cgb/{ishihara.bin => ishihara.bgmap} | 0 ...a.bin.lz.match => ishihara.bgmap.lz.match} | Bin src/data/maps/tiles/cgb/ishihara.dimensions | 1 + ...screen.bin => japanese_title_screen.bgmap} | 0 ...h => japanese_title_screen.bgmap.lz.match} | Bin .../cgb/japanese_title_screen.dimensions | 1 + ...en_2.bin => japanese_title_screen_2.bgmap} | Bin ...=> japanese_title_screen_2.bgmap.lz.match} | Bin .../cgb/japanese_title_screen_2.dimensions | 1 + .../cgb/{laboratory.bin => laboratory.bgmap} | Bin ...bin.lz.match => laboratory.bgmap.lz.match} | Bin src/data/maps/tiles/cgb/laboratory.dimensions | 1 + ...ightning_club.bin => lightning_club.bgmap} | Bin ...lz.match => lightning_club.bgmap.lz.match} | Bin .../maps/tiles/cgb/lightning_club.dimensions | 1 + ...ance.bin => lightning_club_entrance.bgmap} | Bin ...=> lightning_club_entrance.bgmap.lz.match} | Bin .../cgb/lightning_club_entrance.dimensions | 1 + .../lightning_medal.bgmap} | 0 .../lightning_medal.bgmap.lz.match} | 0 .../maps/tiles/cgb/lightning_medal.dimensions | 1 + ..._laboratory.bin => mason_laboratory.bgmap} | 0 ....match => mason_laboratory.bgmap.lz.match} | Bin .../tiles/cgb/mason_laboratory.dimensions | 1 + .../tiles/cgb/{mystery.bin => mystery.bgmap} | Bin ...ry.bin.lz.match => mystery.bgmap.lz.match} | Bin src/data/maps/tiles/cgb/mystery.dimensions | 1 + ...{overworld_map.bin => overworld_map.bgmap} | Bin ....lz.match => overworld_map.bgmap.lz.match} | Bin .../maps/tiles/cgb/overworld_map.dimensions | 1 + .../{pokemon_dome.bin => pokemon_dome.bgmap} | Bin ...n.lz.match => pokemon_dome.bgmap.lz.match} | Bin .../maps/tiles/cgb/pokemon_dome.dimensions | 1 + ....bin => pokemon_dome_door_map_event.bgmap} | 0 .../pokemon_dome_door_map_event.dimensions | 1 + ...trance.bin => pokemon_dome_entrance.bgmap} | 0 ...h => pokemon_dome_entrance.bgmap.lz.match} | Bin .../cgb/pokemon_dome_entrance.dimensions | 1 + .../{psychic_club.bin => psychic_club.bgmap} | 0 ...n.lz.match => psychic_club.bgmap.lz.match} | Bin .../maps/tiles/cgb/psychic_club.dimensions | 1 + ...trance.bin => psychic_club_entrance.bgmap} | Bin ...h => psychic_club_entrance.bgmap.lz.match} | Bin .../cgb/psychic_club_entrance.dimensions | 1 + .../psychic_medal.bgmap} | 0 .../psychic_medal.bgmap.lz.match} | 0 .../maps/tiles/cgb/psychic_medal.dimensions | 1 + .../cgb/{rock_club.bin => rock_club.bgmap} | 0 ....bin.lz.match => rock_club.bgmap.lz.match} | Bin src/data/maps/tiles/cgb/rock_club.dimensions | 1 + ..._entrance.bin => rock_club_entrance.bgmap} | Bin ...atch => rock_club_entrance.bgmap.lz.match} | Bin .../tiles/cgb/rock_club_entrance.dimensions | 1 + .../rock_medal.bin => cgb/rock_medal.bgmap} | 0 .../rock_medal.bgmap.lz.match} | 0 src/data/maps/tiles/cgb/rock_medal.dimensions | 1 + .../{science_club.bin => science_club.bgmap} | 0 ...n.lz.match => science_club.bgmap.lz.match} | Bin .../maps/tiles/cgb/science_club.dimensions | 1 + ...trance.bin => science_club_entrance.bgmap} | Bin ...h => science_club_entrance.bgmap.lz.match} | Bin .../cgb/science_club_entrance.dimensions | 1 + .../science_medal.bgmap} | 0 .../science_medal.bgmap.lz.match} | 0 .../maps/tiles/cgb/science_medal.dimensions | 1 + ...{scyther_intro.bin => scyther_intro.bgmap} | Bin ....lz.match => scyther_intro.bgmap.lz.match} | Bin .../maps/tiles/cgb/scyther_intro.dimensions | 1 + .../solid_tiles_1.bgmap} | Bin .../solid_tiles_1.bgmap.lz.match} | Bin .../maps/tiles/cgb/solid_tiles_1.dimensions | 1 + .../solid_tiles_2.bgmap} | Bin .../solid_tiles_2.bgmap.lz.match} | Bin .../maps/tiles/cgb/solid_tiles_2.dimensions | 1 + .../solid_tiles_3.bgmap} | Bin .../solid_tiles_3.bgmap.lz.match} | Bin .../maps/tiles/cgb/solid_tiles_3.dimensions | 1 + .../solid_tiles_4.bgmap} | 0 .../solid_tiles_4.bgmap.lz.match} | 0 .../maps/tiles/cgb/solid_tiles_4.dimensions | 1 + .../{title_screen.bin => title_screen.bgmap} | Bin ...n.lz.match => title_screen.bgmap.lz.match} | Bin .../maps/tiles/cgb/title_screen.dimensions | 1 + .../cgb/{water_club.bin => water_club.bgmap} | Bin ...bin.lz.match => water_club.bgmap.lz.match} | Bin src/data/maps/tiles/cgb/water_club.dimensions | 1 + ...entrance.bin => water_club_entrance.bgmap} | Bin ...tch => water_club_entrance.bgmap.lz.match} | Bin .../tiles/cgb/water_club_entrance.dimensions | 1 + .../water_medal.bin => cgb/water_medal.bgmap} | 0 .../water_medal.bgmap.lz.match} | 0 .../maps/tiles/cgb/water_medal.dimensions | 1 + .../maps/tiles/gb/aerodactyl_intro.dimensions | 1 + .../maps/tiles/gb/challenge_hall.dimensions | 1 + .../gb/challenge_hall_entrance.dimensions | 1 + .../gb/challenge_machine_map_event.dimensions | 1 + .../maps/tiles/gb/charizard_intro.dimensions | 1 + src/data/maps/tiles/gb/club_lobby.dimensions | 1 + src/data/maps/tiles/gb/colosseum.dimensions | 1 + src/data/maps/tiles/gb/companies.dimensions | 1 + src/data/maps/tiles/gb/copyright.dimensions | 1 + .../gb/deck_machine_map_event.dimensions | 1 + .../tiles/gb/deck_machine_room.dimensions | 1 + src/data/maps/tiles/gb/evolution.dimensions | 1 + .../maps/tiles/gb/fighting_club.dimensions | 1 + .../gb/fighting_club_entrance.dimensions | 1 + src/data/maps/tiles/gb/fire_club.dimensions | 1 + .../tiles/gb/fire_club_entrance.dimensions | 1 + .../maps/tiles/gb/gameboy_link.dimensions | 1 + .../gb/gameboy_link_connecting.dimensions | 1 + .../maps/tiles/gb/gameboy_printer.dimensions | 1 + src/data/maps/tiles/gb/grass_club.dimensions | 1 + .../tiles/gb/grass_club_entrance.dimensions | 1 + .../maps/tiles/gb/hall_of_honor.dimensions | 1 + .../hall_of_honor_door_map_event.dimensions | 1 + src/data/maps/tiles/gb/ishihara.dimensions | 1 + .../tiles/gb/japanese_title_screen.dimensions | 1 + .../gb/japanese_title_screen_2.dimensions | 1 + src/data/maps/tiles/gb/laboratory.dimensions | 1 + .../maps/tiles/gb/lightning_club.dimensions | 1 + .../gb/lightning_club_entrance.dimensions | 1 + .../maps/tiles/gb/mason_laboratory.dimensions | 1 + src/data/maps/tiles/gb/mystery.dimensions | 1 + src/data/maps/tiles/gb/nintendo.dimensions | 1 + src/data/maps/tiles/gb/opponent.dimensions | 1 + .../maps/tiles/gb/overworld_map.dimensions | 1 + src/data/maps/tiles/gb/player.dimensions | 1 + .../maps/tiles/gb/pokemon_dome.dimensions | 1 + .../gb/pokemon_dome_door_map_event.dimensions | 1 + .../tiles/gb/pokemon_dome_entrance.dimensions | 1 + .../maps/tiles/gb/psychic_club.dimensions | 1 + .../tiles/gb/psychic_club_entrance.dimensions | 1 + src/data/maps/tiles/gb/rock_club.dimensions | 1 + .../tiles/gb/rock_club_entrance.dimensions | 1 + .../maps/tiles/gb/science_club.dimensions | 1 + .../tiles/gb/science_club_entrance.dimensions | 1 + .../maps/tiles/gb/scyther_intro.dimensions | 1 + .../maps/tiles/gb/title_screen.dimensions | 1 + src/data/maps/tiles/gb/water_club.dimensions | 1 + .../tiles/gb/water_club_entrance.dimensions | 1 + src/gfx.asm | 269 +++++++----------- 222 files changed, 271 insertions(+), 270 deletions(-) rename src/data/maps/tiles/cgb/{aerodactyl_intro.bin => aerodactyl_intro.bgmap} (100%) rename src/data/maps/tiles/cgb/{aerodactyl_intro.bin.lz.match => aerodactyl_intro.bgmap.lz.match} (100%) create mode 100644 src/data/maps/tiles/cgb/aerodactyl_intro.dimensions rename src/data/maps/tiles/cgb/{card_pop.bin => card_pop.bgmap} (100%) rename src/data/maps/tiles/cgb/{card_pop.bin.lz.match => card_pop.bgmap.lz.match} (100%) create mode 100644 src/data/maps/tiles/cgb/card_pop.dimensions rename src/data/maps/tiles/{gb/card_pop.bin => cgb/card_pop_noncgb.bgmap} (100%) rename src/data/maps/tiles/{gb/card_pop.bin.lz.match => cgb/card_pop_noncgb.bgmap.lz.match} (100%) create mode 100644 src/data/maps/tiles/cgb/card_pop_noncgb.dimensions rename src/data/maps/tiles/cgb/{challenge_hall.bin => challenge_hall.bgmap} (100%) rename src/data/maps/tiles/cgb/{challenge_hall.bin.lz.match => challenge_hall.bgmap.lz.match} (100%) create mode 100644 src/data/maps/tiles/cgb/challenge_hall.dimensions rename src/data/maps/tiles/cgb/{challenge_hall_entrance.bin => challenge_hall_entrance.bgmap} (100%) rename src/data/maps/tiles/cgb/{challenge_hall_entrance.bin.lz.match => challenge_hall_entrance.bgmap.lz.match} (100%) create mode 100644 src/data/maps/tiles/cgb/challenge_hall_entrance.dimensions rename src/data/maps/tiles/cgb/{challenge_machine_map_event.bin => challenge_machine_map_event.bgmap} (100%) rename src/data/maps/tiles/cgb/{challenge_machine_map_event.bin.lz.match => challenge_machine_map_event.bgmap.lz.match} (100%) create mode 100644 src/data/maps/tiles/cgb/challenge_machine_map_event.dimensions rename src/data/maps/tiles/cgb/{charizard_intro.bin => charizard_intro.bgmap} (100%) rename src/data/maps/tiles/cgb/{charizard_intro.bin.lz.match => charizard_intro.bgmap.lz.match} (100%) create mode 100644 src/data/maps/tiles/cgb/charizard_intro.dimensions rename src/data/maps/tiles/cgb/{club_lobby.bin => club_lobby.bgmap} (100%) rename src/data/maps/tiles/cgb/{club_lobby.bin.lz.match => club_lobby.bgmap.lz.match} (100%) create mode 100644 src/data/maps/tiles/cgb/club_lobby.dimensions rename src/data/maps/tiles/cgb/{colosseum.bin => colosseum.bgmap} (100%) rename src/data/maps/tiles/cgb/{colosseum.bin.lz.match => colosseum.bgmap.lz.match} (100%) create mode 100644 src/data/maps/tiles/cgb/colosseum.dimensions rename src/data/maps/tiles/cgb/{copyright.bin => copyright.bgmap} (100%) rename src/data/maps/tiles/cgb/{copyright.bin.lz.match => copyright.bgmap.lz.match} (100%) create mode 100644 src/data/maps/tiles/cgb/copyright.dimensions rename src/data/maps/tiles/cgb/{deck_machine_map_event.bin => deck_machine_map_event.bgmap} (100%) create mode 100644 src/data/maps/tiles/cgb/deck_machine_map_event.dimensions rename src/data/maps/tiles/cgb/{deck_machine_room.bin => deck_machine_room.bgmap} (100%) rename src/data/maps/tiles/cgb/{deck_machine_room.bin.lz.match => deck_machine_room.bgmap.lz.match} (100%) create mode 100644 src/data/maps/tiles/cgb/deck_machine_room.dimensions rename src/data/maps/tiles/cgb/{evolution.bin => evolution.bgmap} (100%) rename src/data/maps/tiles/cgb/{evolution.bin.lz.match => evolution.bgmap.lz.match} (100%) create mode 100644 src/data/maps/tiles/cgb/evolution.dimensions rename src/data/maps/tiles/cgb/{fighting_club.bin => fighting_club.bgmap} (100%) rename src/data/maps/tiles/cgb/{fighting_club.bin.lz.match => fighting_club.bgmap.lz.match} (100%) create mode 100644 src/data/maps/tiles/cgb/fighting_club.dimensions rename src/data/maps/tiles/cgb/{fighting_club_entrance.bin => fighting_club_entrance.bgmap} (100%) rename src/data/maps/tiles/cgb/{fighting_club_entrance.bin.lz.match => fighting_club_entrance.bgmap.lz.match} (100%) create mode 100644 src/data/maps/tiles/cgb/fighting_club_entrance.dimensions rename src/data/maps/tiles/{gb/fighting_medal.bin => cgb/fighting_medal.bgmap} (100%) rename src/data/maps/tiles/{gb/fighting_medal.bin.lz.match => cgb/fighting_medal.bgmap.lz.match} (100%) create mode 100644 src/data/maps/tiles/cgb/fighting_medal.dimensions rename src/data/maps/tiles/cgb/{fire_club.bin => fire_club.bgmap} (100%) rename src/data/maps/tiles/cgb/{fire_club.bin.lz.match => fire_club.bgmap.lz.match} (100%) create mode 100644 src/data/maps/tiles/cgb/fire_club.dimensions rename src/data/maps/tiles/cgb/{fire_club_entrance.bin => fire_club_entrance.bgmap} (100%) rename src/data/maps/tiles/cgb/{fire_club_entrance.bin.lz.match => fire_club_entrance.bgmap.lz.match} (100%) create mode 100644 src/data/maps/tiles/cgb/fire_club_entrance.dimensions rename src/data/maps/tiles/{gb/fire_medal.bin => cgb/fire_medal.bgmap} (100%) rename src/data/maps/tiles/{gb/fire_medal.bin.lz.match => cgb/fire_medal.bgmap.lz.match} (100%) create mode 100644 src/data/maps/tiles/cgb/fire_medal.dimensions rename src/data/maps/tiles/cgb/{gameboy_link.bin => gameboy_link.bgmap} (100%) rename src/data/maps/tiles/cgb/{gameboy_link.bin.lz.match => gameboy_link.bgmap.lz.match} (100%) create mode 100644 src/data/maps/tiles/cgb/gameboy_link.dimensions rename src/data/maps/tiles/cgb/{gameboy_link_connecting.bin => gameboy_link_connecting.bgmap} (100%) rename src/data/maps/tiles/cgb/{gameboy_link_connecting.bin.lz.match => gameboy_link_connecting.bgmap.lz.match} (100%) create mode 100644 src/data/maps/tiles/cgb/gameboy_link_connecting.dimensions rename src/data/maps/tiles/cgb/{gameboy_printer.bin => gameboy_printer.bgmap} (100%) rename src/data/maps/tiles/cgb/{gameboy_printer.bin.lz.match => gameboy_printer.bgmap.lz.match} (100%) create mode 100644 src/data/maps/tiles/cgb/gameboy_printer.dimensions rename src/data/maps/tiles/cgb/{grass_club.bin => grass_club.bgmap} (100%) rename src/data/maps/tiles/cgb/{grass_club.bin.lz.match => grass_club.bgmap.lz.match} (100%) create mode 100644 src/data/maps/tiles/cgb/grass_club.dimensions rename src/data/maps/tiles/cgb/{grass_club_entrance.bin => grass_club_entrance.bgmap} (100%) rename src/data/maps/tiles/cgb/{grass_club_entrance.bin.lz.match => grass_club_entrance.bgmap.lz.match} (100%) create mode 100644 src/data/maps/tiles/cgb/grass_club_entrance.dimensions rename src/data/maps/tiles/{gb/grass_medal.bin => cgb/grass_medal.bgmap} (100%) rename src/data/maps/tiles/{gb/grass_medal.bin.lz.match => cgb/grass_medal.bgmap.lz.match} (100%) create mode 100644 src/data/maps/tiles/cgb/grass_medal.dimensions rename src/data/maps/tiles/cgb/{hall_of_honor.bin => hall_of_honor.bgmap} (100%) rename src/data/maps/tiles/cgb/{hall_of_honor.bin.lz.match => hall_of_honor.bgmap.lz.match} (100%) create mode 100644 src/data/maps/tiles/cgb/hall_of_honor.dimensions rename src/data/maps/tiles/cgb/{hall_of_honor_door_map_event.bin => hall_of_honor_door_map_event.bgmap} (100%) create mode 100644 src/data/maps/tiles/cgb/hall_of_honor_door_map_event.dimensions rename src/data/maps/tiles/cgb/{ishihara.bin => ishihara.bgmap} (100%) rename src/data/maps/tiles/cgb/{ishihara.bin.lz.match => ishihara.bgmap.lz.match} (100%) create mode 100644 src/data/maps/tiles/cgb/ishihara.dimensions rename src/data/maps/tiles/cgb/{japanese_title_screen.bin => japanese_title_screen.bgmap} (100%) rename src/data/maps/tiles/cgb/{japanese_title_screen.bin.lz.match => japanese_title_screen.bgmap.lz.match} (100%) create mode 100644 src/data/maps/tiles/cgb/japanese_title_screen.dimensions rename src/data/maps/tiles/cgb/{japanese_title_screen_2.bin => japanese_title_screen_2.bgmap} (100%) rename src/data/maps/tiles/cgb/{japanese_title_screen_2.bin.lz.match => japanese_title_screen_2.bgmap.lz.match} (100%) create mode 100644 src/data/maps/tiles/cgb/japanese_title_screen_2.dimensions rename src/data/maps/tiles/cgb/{laboratory.bin => laboratory.bgmap} (100%) rename src/data/maps/tiles/cgb/{laboratory.bin.lz.match => laboratory.bgmap.lz.match} (100%) create mode 100644 src/data/maps/tiles/cgb/laboratory.dimensions rename src/data/maps/tiles/cgb/{lightning_club.bin => lightning_club.bgmap} (100%) rename src/data/maps/tiles/cgb/{lightning_club.bin.lz.match => lightning_club.bgmap.lz.match} (100%) create mode 100644 src/data/maps/tiles/cgb/lightning_club.dimensions rename src/data/maps/tiles/cgb/{lightning_club_entrance.bin => lightning_club_entrance.bgmap} (100%) rename src/data/maps/tiles/cgb/{lightning_club_entrance.bin.lz.match => lightning_club_entrance.bgmap.lz.match} (100%) create mode 100644 src/data/maps/tiles/cgb/lightning_club_entrance.dimensions rename src/data/maps/tiles/{gb/lightning_medal.bin => cgb/lightning_medal.bgmap} (100%) rename src/data/maps/tiles/{gb/lightning_medal.bin.lz.match => cgb/lightning_medal.bgmap.lz.match} (100%) create mode 100644 src/data/maps/tiles/cgb/lightning_medal.dimensions rename src/data/maps/tiles/cgb/{mason_laboratory.bin => mason_laboratory.bgmap} (100%) rename src/data/maps/tiles/cgb/{mason_laboratory.bin.lz.match => mason_laboratory.bgmap.lz.match} (100%) create mode 100644 src/data/maps/tiles/cgb/mason_laboratory.dimensions rename src/data/maps/tiles/cgb/{mystery.bin => mystery.bgmap} (100%) rename src/data/maps/tiles/cgb/{mystery.bin.lz.match => mystery.bgmap.lz.match} (100%) create mode 100644 src/data/maps/tiles/cgb/mystery.dimensions rename src/data/maps/tiles/cgb/{overworld_map.bin => overworld_map.bgmap} (100%) rename src/data/maps/tiles/cgb/{overworld_map.bin.lz.match => overworld_map.bgmap.lz.match} (100%) create mode 100644 src/data/maps/tiles/cgb/overworld_map.dimensions rename src/data/maps/tiles/cgb/{pokemon_dome.bin => pokemon_dome.bgmap} (100%) rename src/data/maps/tiles/cgb/{pokemon_dome.bin.lz.match => pokemon_dome.bgmap.lz.match} (100%) create mode 100644 src/data/maps/tiles/cgb/pokemon_dome.dimensions rename src/data/maps/tiles/cgb/{pokemon_dome_door_map_event.bin => pokemon_dome_door_map_event.bgmap} (100%) create mode 100644 src/data/maps/tiles/cgb/pokemon_dome_door_map_event.dimensions rename src/data/maps/tiles/cgb/{pokemon_dome_entrance.bin => pokemon_dome_entrance.bgmap} (100%) rename src/data/maps/tiles/cgb/{pokemon_dome_entrance.bin.lz.match => pokemon_dome_entrance.bgmap.lz.match} (100%) create mode 100644 src/data/maps/tiles/cgb/pokemon_dome_entrance.dimensions rename src/data/maps/tiles/cgb/{psychic_club.bin => psychic_club.bgmap} (100%) rename src/data/maps/tiles/cgb/{psychic_club.bin.lz.match => psychic_club.bgmap.lz.match} (100%) create mode 100644 src/data/maps/tiles/cgb/psychic_club.dimensions rename src/data/maps/tiles/cgb/{psychic_club_entrance.bin => psychic_club_entrance.bgmap} (100%) rename src/data/maps/tiles/cgb/{psychic_club_entrance.bin.lz.match => psychic_club_entrance.bgmap.lz.match} (100%) create mode 100644 src/data/maps/tiles/cgb/psychic_club_entrance.dimensions rename src/data/maps/tiles/{gb/psychic_medal.bin => cgb/psychic_medal.bgmap} (100%) rename src/data/maps/tiles/{gb/psychic_medal.bin.lz.match => cgb/psychic_medal.bgmap.lz.match} (100%) create mode 100644 src/data/maps/tiles/cgb/psychic_medal.dimensions rename src/data/maps/tiles/cgb/{rock_club.bin => rock_club.bgmap} (100%) rename src/data/maps/tiles/cgb/{rock_club.bin.lz.match => rock_club.bgmap.lz.match} (100%) create mode 100644 src/data/maps/tiles/cgb/rock_club.dimensions rename src/data/maps/tiles/cgb/{rock_club_entrance.bin => rock_club_entrance.bgmap} (100%) rename src/data/maps/tiles/cgb/{rock_club_entrance.bin.lz.match => rock_club_entrance.bgmap.lz.match} (100%) create mode 100644 src/data/maps/tiles/cgb/rock_club_entrance.dimensions rename src/data/maps/tiles/{gb/rock_medal.bin => cgb/rock_medal.bgmap} (100%) rename src/data/maps/tiles/{gb/rock_medal.bin.lz.match => cgb/rock_medal.bgmap.lz.match} (100%) create mode 100644 src/data/maps/tiles/cgb/rock_medal.dimensions rename src/data/maps/tiles/cgb/{science_club.bin => science_club.bgmap} (100%) rename src/data/maps/tiles/cgb/{science_club.bin.lz.match => science_club.bgmap.lz.match} (100%) create mode 100644 src/data/maps/tiles/cgb/science_club.dimensions rename src/data/maps/tiles/cgb/{science_club_entrance.bin => science_club_entrance.bgmap} (100%) rename src/data/maps/tiles/cgb/{science_club_entrance.bin.lz.match => science_club_entrance.bgmap.lz.match} (100%) create mode 100644 src/data/maps/tiles/cgb/science_club_entrance.dimensions rename src/data/maps/tiles/{gb/science_medal.bin => cgb/science_medal.bgmap} (100%) rename src/data/maps/tiles/{gb/science_medal.bin.lz.match => cgb/science_medal.bgmap.lz.match} (100%) create mode 100644 src/data/maps/tiles/cgb/science_medal.dimensions rename src/data/maps/tiles/cgb/{scyther_intro.bin => scyther_intro.bgmap} (100%) rename src/data/maps/tiles/cgb/{scyther_intro.bin.lz.match => scyther_intro.bgmap.lz.match} (100%) create mode 100644 src/data/maps/tiles/cgb/scyther_intro.dimensions rename src/data/maps/tiles/{gb/solid_tiles_1.bin => cgb/solid_tiles_1.bgmap} (100%) rename src/data/maps/tiles/{gb/solid_tiles_1.bin.lz.match => cgb/solid_tiles_1.bgmap.lz.match} (100%) create mode 100644 src/data/maps/tiles/cgb/solid_tiles_1.dimensions rename src/data/maps/tiles/{gb/solid_tiles_2.bin => cgb/solid_tiles_2.bgmap} (100%) rename src/data/maps/tiles/{gb/solid_tiles_2.bin.lz.match => cgb/solid_tiles_2.bgmap.lz.match} (100%) create mode 100644 src/data/maps/tiles/cgb/solid_tiles_2.dimensions rename src/data/maps/tiles/{gb/solid_tiles_3.bin => cgb/solid_tiles_3.bgmap} (100%) rename src/data/maps/tiles/{gb/solid_tiles_3.bin.lz.match => cgb/solid_tiles_3.bgmap.lz.match} (100%) create mode 100644 src/data/maps/tiles/cgb/solid_tiles_3.dimensions rename src/data/maps/tiles/{gb/solid_tiles_4.bin => cgb/solid_tiles_4.bgmap} (100%) rename src/data/maps/tiles/{gb/solid_tiles_4.bin.lz.match => cgb/solid_tiles_4.bgmap.lz.match} (100%) create mode 100644 src/data/maps/tiles/cgb/solid_tiles_4.dimensions rename src/data/maps/tiles/cgb/{title_screen.bin => title_screen.bgmap} (100%) rename src/data/maps/tiles/cgb/{title_screen.bin.lz.match => title_screen.bgmap.lz.match} (100%) create mode 100644 src/data/maps/tiles/cgb/title_screen.dimensions rename src/data/maps/tiles/cgb/{water_club.bin => water_club.bgmap} (100%) rename src/data/maps/tiles/cgb/{water_club.bin.lz.match => water_club.bgmap.lz.match} (100%) create mode 100644 src/data/maps/tiles/cgb/water_club.dimensions rename src/data/maps/tiles/cgb/{water_club_entrance.bin => water_club_entrance.bgmap} (100%) rename src/data/maps/tiles/cgb/{water_club_entrance.bin.lz.match => water_club_entrance.bgmap.lz.match} (100%) create mode 100644 src/data/maps/tiles/cgb/water_club_entrance.dimensions rename src/data/maps/tiles/{gb/water_medal.bin => cgb/water_medal.bgmap} (100%) rename src/data/maps/tiles/{gb/water_medal.bin.lz.match => cgb/water_medal.bgmap.lz.match} (100%) create mode 100644 src/data/maps/tiles/cgb/water_medal.dimensions create mode 100644 src/data/maps/tiles/gb/aerodactyl_intro.dimensions create mode 100644 src/data/maps/tiles/gb/challenge_hall.dimensions create mode 100644 src/data/maps/tiles/gb/challenge_hall_entrance.dimensions create mode 100644 src/data/maps/tiles/gb/challenge_machine_map_event.dimensions create mode 100644 src/data/maps/tiles/gb/charizard_intro.dimensions create mode 100644 src/data/maps/tiles/gb/club_lobby.dimensions create mode 100644 src/data/maps/tiles/gb/colosseum.dimensions create mode 100644 src/data/maps/tiles/gb/companies.dimensions create mode 100644 src/data/maps/tiles/gb/copyright.dimensions create mode 100644 src/data/maps/tiles/gb/deck_machine_map_event.dimensions create mode 100644 src/data/maps/tiles/gb/deck_machine_room.dimensions create mode 100644 src/data/maps/tiles/gb/evolution.dimensions create mode 100644 src/data/maps/tiles/gb/fighting_club.dimensions create mode 100644 src/data/maps/tiles/gb/fighting_club_entrance.dimensions create mode 100644 src/data/maps/tiles/gb/fire_club.dimensions create mode 100644 src/data/maps/tiles/gb/fire_club_entrance.dimensions create mode 100644 src/data/maps/tiles/gb/gameboy_link.dimensions create mode 100644 src/data/maps/tiles/gb/gameboy_link_connecting.dimensions create mode 100644 src/data/maps/tiles/gb/gameboy_printer.dimensions create mode 100644 src/data/maps/tiles/gb/grass_club.dimensions create mode 100644 src/data/maps/tiles/gb/grass_club_entrance.dimensions create mode 100644 src/data/maps/tiles/gb/hall_of_honor.dimensions create mode 100644 src/data/maps/tiles/gb/hall_of_honor_door_map_event.dimensions create mode 100644 src/data/maps/tiles/gb/ishihara.dimensions create mode 100644 src/data/maps/tiles/gb/japanese_title_screen.dimensions create mode 100644 src/data/maps/tiles/gb/japanese_title_screen_2.dimensions create mode 100644 src/data/maps/tiles/gb/laboratory.dimensions create mode 100644 src/data/maps/tiles/gb/lightning_club.dimensions create mode 100644 src/data/maps/tiles/gb/lightning_club_entrance.dimensions create mode 100644 src/data/maps/tiles/gb/mason_laboratory.dimensions create mode 100644 src/data/maps/tiles/gb/mystery.dimensions create mode 100644 src/data/maps/tiles/gb/nintendo.dimensions create mode 100644 src/data/maps/tiles/gb/opponent.dimensions create mode 100644 src/data/maps/tiles/gb/overworld_map.dimensions create mode 100644 src/data/maps/tiles/gb/player.dimensions create mode 100644 src/data/maps/tiles/gb/pokemon_dome.dimensions create mode 100644 src/data/maps/tiles/gb/pokemon_dome_door_map_event.dimensions create mode 100644 src/data/maps/tiles/gb/pokemon_dome_entrance.dimensions create mode 100644 src/data/maps/tiles/gb/psychic_club.dimensions create mode 100644 src/data/maps/tiles/gb/psychic_club_entrance.dimensions create mode 100644 src/data/maps/tiles/gb/rock_club.dimensions create mode 100644 src/data/maps/tiles/gb/rock_club_entrance.dimensions create mode 100644 src/data/maps/tiles/gb/science_club.dimensions create mode 100644 src/data/maps/tiles/gb/science_club_entrance.dimensions create mode 100644 src/data/maps/tiles/gb/scyther_intro.dimensions create mode 100644 src/data/maps/tiles/gb/title_screen.dimensions create mode 100644 src/data/maps/tiles/gb/water_club.dimensions create mode 100644 src/data/maps/tiles/gb/water_club_entrance.dimensions diff --git a/.gitattributes b/.gitattributes index f1b476bc..62a0ad6f 100644 --- a/.gitattributes +++ b/.gitattributes @@ -25,3 +25,4 @@ *.2bpp binary diff=hex *.1bpp binary diff=hex *.lz binary diff=hex +*.bgmap binary diff=hex diff --git a/src/data/maps/tilemaps.asm b/src/data/maps/tilemaps.asm index f40377f7..38f4dfc3 100644 --- a/src/data/maps/tilemaps.asm +++ b/src/data/maps/tilemaps.asm @@ -1,20 +1,17 @@ OverworldMapTilemap:: - db $14 ; width - db $12 ; height + INCBIN "data/maps/tiles/gb/overworld_map.dimensions" dw NULL db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/overworld_map.bin.lz" OverworldMapCGBTilemap:: - db $14 ; width - db $12 ; height + INCBIN "data/maps/tiles/cgb/overworld_map.dimensions" dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/cgb/overworld_map.bin.lz" + INCBIN "data/maps/tiles/cgb/overworld_map.bgmap.lz" MasonLaboratoryTilemap:: - db $1c ; width - db $1e ; height + INCBIN "data/maps/tiles/gb/mason_laboratory.dimensions" dw MasonLaboratoryPermissions db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/mason_laboratory.bin.lz" @@ -22,17 +19,15 @@ MasonLaboratoryPermissions: INCBIN "data/maps/permissions/gb/mason_laboratory.bin.lz" MasonLaboratoryCGBTilemap:: - db $1c ; width - db $1e ; height + INCBIN "data/maps/tiles/cgb/mason_laboratory.dimensions" dw MasonLaboratoryCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/cgb/mason_laboratory.bin.lz" + INCBIN "data/maps/tiles/cgb/mason_laboratory.bgmap.lz" MasonLaboratoryCGBPermissions: INCBIN "data/maps/permissions/cgb/mason_laboratory.bin.lz" ChallengeMachineMapEventTilemap:: - db $04 ; width - db $06 ; height + INCBIN "data/maps/tiles/gb/challenge_machine_map_event.dimensions" dw ChallengeMachineMapEventPermissions db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/challenge_machine_map_event.bin.lz" @@ -40,17 +35,15 @@ ChallengeMachineMapEventPermissions: INCBIN "data/maps/permissions/gb/challenge_machine_map_event.bin.lz" ChallengeMachineMapEventCGBTilemap:: - db $04 ; width - db $06 ; height + INCBIN "data/maps/tiles/cgb/challenge_machine_map_event.dimensions" dw ChallengeMachineMapEventCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/cgb/challenge_machine_map_event.bin.lz" + INCBIN "data/maps/tiles/cgb/challenge_machine_map_event.bgmap.lz" ChallengeMachineMapEventCGBPermissions: INCBIN "data/maps/permissions/cgb/challenge_machine_map_event.bin.lz" DeckMachineRoomTilemap:: - db $18 ; width - db $1e ; height + INCBIN "data/maps/tiles/gb/deck_machine_room.dimensions" dw DeckMachineRoomPermissions db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/deck_machine_room.bin.lz" @@ -58,17 +51,15 @@ DeckMachineRoomPermissions: INCBIN "data/maps/permissions/gb/deck_machine_room.bin.lz" DeckMachineRoomCGBTilemap:: - db $18 ; width - db $1e ; height + INCBIN "data/maps/tiles/cgb/deck_machine_room.dimensions" dw DeckMachineRoomCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/cgb/deck_machine_room.bin.lz" + INCBIN "data/maps/tiles/cgb/deck_machine_room.bgmap.lz" DeckMachineRoomCGBPermissions: INCBIN "data/maps/permissions/cgb/deck_machine_room.bin.lz" DeckMachineMapEventTilemap:: - db $04 ; width - db $01 ; height + INCBIN "data/maps/tiles/gb/deck_machine_map_event.dimensions" dw DeckMachineMapEventPermissions db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/deck_machine_map_event.bin.lz" @@ -76,17 +67,15 @@ DeckMachineMapEventPermissions: INCBIN "data/maps/permissions/gb/deck_machine_map_event.bin.lz" DeckMachineMapEventCGBTilemap:: - db $04 ; width - db $01 ; height + INCBIN "data/maps/tiles/cgb/deck_machine_map_event.dimensions" dw DeckMachineMapEventCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/cgb/deck_machine_map_event.bin.lz" + INCBIN "data/maps/tiles/cgb/deck_machine_map_event.bgmap.lz" DeckMachineMapEventCGBPermissions: INCBIN "data/maps/permissions/cgb/deck_machine_map_event.bin.lz" IshiharaTilemap:: - db $14 ; width - db $18 ; height + INCBIN "data/maps/tiles/gb/ishihara.dimensions" dw IshiharaPermissions db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/ishihara.bin.lz" @@ -94,17 +83,15 @@ IshiharaPermissions: INCBIN "data/maps/permissions/gb/ishihara.bin.lz" IshiharaCGBTilemap:: - db $14 ; width - db $18 ; height + INCBIN "data/maps/tiles/cgb/ishihara.dimensions" dw IshiharaCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/cgb/ishihara.bin.lz" + INCBIN "data/maps/tiles/cgb/ishihara.bgmap.lz" IshiharaCGBPermissions: INCBIN "data/maps/permissions/cgb/ishihara.bin.lz" FightingClubEntranceTilemap:: - db $14 ; width - db $12 ; height + INCBIN "data/maps/tiles/gb/fighting_club_entrance.dimensions" dw FightingClubEntrancePermissions db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/fighting_club_entrance.bin.lz" @@ -112,17 +99,15 @@ FightingClubEntrancePermissions: INCBIN "data/maps/permissions/gb/fighting_club_entrance.bin.lz" FightingClubEntranceCGBTilemap:: - db $14 ; width - db $12 ; height + INCBIN "data/maps/tiles/cgb/fighting_club_entrance.dimensions" dw FightingClubEntranceCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/cgb/fighting_club_entrance.bin.lz" + INCBIN "data/maps/tiles/cgb/fighting_club_entrance.bgmap.lz" FightingClubEntranceCGBPermissions: INCBIN "data/maps/permissions/cgb/fighting_club_entrance.bin.lz" RockClubEntranceTilemap:: - db $14 ; width - db $12 ; height + INCBIN "data/maps/tiles/gb/rock_club_entrance.dimensions" dw RockClubEntrancePermissions db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/rock_club_entrance.bin.lz" @@ -130,17 +115,15 @@ RockClubEntrancePermissions: INCBIN "data/maps/permissions/gb/rock_club_entrance.bin.lz" RockClubEntranceCGBTilemap:: - db $14 ; width - db $12 ; height + INCBIN "data/maps/tiles/cgb/rock_club_entrance.dimensions" dw RockClubEntranceCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/cgb/rock_club_entrance.bin.lz" + INCBIN "data/maps/tiles/cgb/rock_club_entrance.bgmap.lz" RockClubEntranceCGBPermissions: INCBIN "data/maps/permissions/cgb/rock_club_entrance.bin.lz" WaterClubEntranceTilemap:: - db $14 ; width - db $12 ; height + INCBIN "data/maps/tiles/gb/water_club_entrance.dimensions" dw WaterClubEntrancePermissions db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/water_club_entrance.bin.lz" @@ -148,17 +131,15 @@ WaterClubEntrancePermissions: INCBIN "data/maps/permissions/gb/water_club_entrance.bin.lz" WaterClubEntranceCGBTilemap:: - db $14 ; width - db $12 ; height + INCBIN "data/maps/tiles/cgb/water_club_entrance.dimensions" dw WaterClubEntranceCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/cgb/water_club_entrance.bin.lz" + INCBIN "data/maps/tiles/cgb/water_club_entrance.bgmap.lz" WaterClubEntranceCGBPermissions: INCBIN "data/maps/permissions/cgb/water_club_entrance.bin.lz" LightningClubEntranceTilemap:: - db $14 ; width - db $12 ; height + INCBIN "data/maps/tiles/gb/lightning_club_entrance.dimensions" dw LightningClubEntrancePermissions db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/lightning_club_entrance.bin.lz" @@ -166,17 +147,15 @@ LightningClubEntrancePermissions: INCBIN "data/maps/permissions/gb/lightning_club_entrance.bin.lz" LightningClubEntranceCGBTilemap:: - db $14 ; width - db $12 ; height + INCBIN "data/maps/tiles/cgb/lightning_club_entrance.dimensions" dw LightningClubEntranceCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/cgb/lightning_club_entrance.bin.lz" + INCBIN "data/maps/tiles/cgb/lightning_club_entrance.bgmap.lz" LightningClubEntranceCGBPermissions: INCBIN "data/maps/permissions/cgb/lightning_club_entrance.bin.lz" GrassClubEntranceTilemap:: - db $14 ; width - db $12 ; height + INCBIN "data/maps/tiles/gb/grass_club_entrance.dimensions" dw GrassClubEntrancePermissions db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/grass_club_entrance.bin.lz" @@ -184,17 +163,15 @@ GrassClubEntrancePermissions: INCBIN "data/maps/permissions/gb/grass_club_entrance.bin.lz" GrassClubEntranceCGBTilemap:: - db $14 ; width - db $12 ; height + INCBIN "data/maps/tiles/cgb/grass_club_entrance.dimensions" dw GrassClubEntranceCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/cgb/grass_club_entrance.bin.lz" + INCBIN "data/maps/tiles/cgb/grass_club_entrance.bgmap.lz" GrassClubEntranceCGBPermissions: INCBIN "data/maps/permissions/cgb/grass_club_entrance.bin.lz" PsychicClubEntranceTilemap:: - db $14 ; width - db $12 ; height + INCBIN "data/maps/tiles/gb/psychic_club_entrance.dimensions" dw PsychicClubEntrancePermissions db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/psychic_club_entrance.bin.lz" @@ -202,17 +179,15 @@ PsychicClubEntrancePermissions: INCBIN "data/maps/permissions/gb/psychic_club_entrance.bin.lz" PsychicClubEntranceCGBTilemap:: - db $14 ; width - db $12 ; height + INCBIN "data/maps/tiles/cgb/psychic_club_entrance.dimensions" dw PsychicClubEntranceCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/cgb/psychic_club_entrance.bin.lz" + INCBIN "data/maps/tiles/cgb/psychic_club_entrance.bgmap.lz" PsychicClubEntranceCGBPermissions: INCBIN "data/maps/permissions/cgb/psychic_club_entrance.bin.lz" ScienceClubEntranceTilemap:: - db $14 ; width - db $12 ; height + INCBIN "data/maps/tiles/gb/science_club_entrance.dimensions" dw ScienceClubEntrancePermissions db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/science_club_entrance.bin.lz" @@ -220,17 +195,15 @@ ScienceClubEntrancePermissions: INCBIN "data/maps/permissions/gb/science_club_entrance.bin.lz" ScienceClubEntranceCGBTilemap:: - db $14 ; width - db $12 ; height + INCBIN "data/maps/tiles/cgb/science_club_entrance.dimensions" dw ScienceClubEntranceCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/cgb/science_club_entrance.bin.lz" + INCBIN "data/maps/tiles/cgb/science_club_entrance.bgmap.lz" ScienceClubEntranceCGBPermissions: INCBIN "data/maps/permissions/cgb/science_club_entrance.bin.lz" FireClubEntranceTilemap:: - db $14 ; width - db $12 ; height + INCBIN "data/maps/tiles/gb/fire_club_entrance.dimensions" dw FireClubEntrancePermissions db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/fire_club_entrance.bin.lz" @@ -238,17 +211,15 @@ FireClubEntrancePermissions: INCBIN "data/maps/permissions/gb/fire_club_entrance.bin.lz" FireClubEntranceCGBTilemap:: - db $14 ; width - db $12 ; height + INCBIN "data/maps/tiles/cgb/fire_club_entrance.dimensions" dw FireClubEntranceCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/cgb/fire_club_entrance.bin.lz" + INCBIN "data/maps/tiles/cgb/fire_club_entrance.bgmap.lz" FireClubEntranceCGBPermissions: INCBIN "data/maps/permissions/cgb/fire_club_entrance.bin.lz" ChallengeHallEntranceTilemap:: - db $14 ; width - db $12 ; height + INCBIN "data/maps/tiles/gb/challenge_hall_entrance.dimensions" dw ChallengeHallEntrancePermissions db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/challenge_hall_entrance.bin.lz" @@ -256,17 +227,15 @@ ChallengeHallEntrancePermissions: INCBIN "data/maps/permissions/gb/challenge_hall_entrance.bin.lz" ChallengeHallEntranceCGBTilemap:: - db $14 ; width - db $12 ; height + INCBIN "data/maps/tiles/cgb/challenge_hall_entrance.dimensions" dw ChallengeHallEntranceCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/cgb/challenge_hall_entrance.bin.lz" + INCBIN "data/maps/tiles/cgb/challenge_hall_entrance.bgmap.lz" ChallengeHallEntranceCGBPermissions: INCBIN "data/maps/permissions/cgb/challenge_hall_entrance.bin.lz" ClubLobbyTilemap:: - db $1c ; width - db $1a ; height + INCBIN "data/maps/tiles/gb/club_lobby.dimensions" dw ClubLobbyPermissions db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/club_lobby.bin.lz" @@ -274,17 +243,15 @@ ClubLobbyPermissions: INCBIN "data/maps/permissions/gb/club_lobby.bin.lz" ClubLobbyCGBTilemap:: - db $1c ; width - db $1a ; height + INCBIN "data/maps/tiles/cgb/club_lobby.dimensions" dw ClubLobbyCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/cgb/club_lobby.bin.lz" + INCBIN "data/maps/tiles/cgb/club_lobby.bgmap.lz" ClubLobbyCGBPermissions: INCBIN "data/maps/permissions/cgb/club_lobby.bin.lz" FightingClubTilemap:: - db $18 ; width - db $12 ; height + INCBIN "data/maps/tiles/gb/fighting_club.dimensions" dw FightingClubPermissions db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/fighting_club.bin.lz" @@ -292,17 +259,15 @@ FightingClubPermissions: INCBIN "data/maps/permissions/gb/fighting_club.bin.lz" FightingClubCGBTilemap:: - db $18 ; width - db $12 ; height + INCBIN "data/maps/tiles/cgb/fighting_club.dimensions" dw FightingClubCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/cgb/fighting_club.bin.lz" + INCBIN "data/maps/tiles/cgb/fighting_club.bgmap.lz" FightingClubCGBPermissions: INCBIN "data/maps/permissions/cgb/fighting_club.bin.lz" RockClubTilemap:: - db $1c ; width - db $1e ; height + INCBIN "data/maps/tiles/gb/rock_club.dimensions" dw RockClubPermissions db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/rock_club.bin.lz" @@ -310,17 +275,15 @@ RockClubPermissions: INCBIN "data/maps/permissions/gb/rock_club.bin.lz" RockClubCGBTilemap:: - db $1c ; width - db $1e ; height + INCBIN "data/maps/tiles/cgb/rock_club.dimensions" dw RockClubCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/cgb/rock_club.bin.lz" + INCBIN "data/maps/tiles/cgb/rock_club.bgmap.lz" RockClubCGBPermissions: INCBIN "data/maps/permissions/cgb/rock_club.bin.lz" PokemonDomeDoorMapEventTilemap:: - db $04 ; width - db $03 ; height + INCBIN "data/maps/tiles/gb/pokemon_dome_door_map_event.dimensions" dw PokemonDomeDoorMapEventPermissions db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/pokemon_dome_door_map_event.bin.lz" @@ -328,17 +291,15 @@ PokemonDomeDoorMapEventPermissions: INCBIN "data/maps/permissions/gb/pokemon_dome_door_map_event.bin.lz" PokemonDomeDoorMapEventCGBTilemap:: - db $04 ; width - db $03 ; height + INCBIN "data/maps/tiles/cgb/pokemon_dome_door_map_event.dimensions" dw PokemonDomeDoorMapEventCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/cgb/pokemon_dome_door_map_event.bin.lz" + INCBIN "data/maps/tiles/cgb/pokemon_dome_door_map_event.bgmap.lz" PokemonDomeDoorMapEventCGBPermissions: INCBIN "data/maps/permissions/cgb/pokemon_dome_door_map_event.bin.lz" HallOfHonorDoorMapEventTilemap:: - db $04 ; width - db $03 ; height + INCBIN "data/maps/tiles/gb/hall_of_honor_door_map_event.dimensions" dw HallOfHonorDoorMapEventPermissions db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/hall_of_honor_door_map_event.bin.lz" @@ -346,20 +307,18 @@ HallOfHonorDoorMapEventPermissions: INCBIN "data/maps/permissions/gb/hall_of_honor_door_map_event.bin.lz" HallOfHonorDoorMapEventCGBTilemap:: - db $04 ; width - db $03 ; height + INCBIN "data/maps/tiles/cgb/hall_of_honor_door_map_event.dimensions" dw HallOfHonorDoorMapEventCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/cgb/hall_of_honor_door_map_event.bin.lz" + INCBIN "data/maps/tiles/cgb/hall_of_honor_door_map_event.bgmap.lz" HallOfHonorDoorMapEventCGBPermissions: INCBIN "data/maps/permissions/cgb/hall_of_honor_door_map_event.bin.lz" GrassMedalTilemap:: - db $03 ; width - db $03 ; height + INCBIN "data/maps/tiles/cgb/grass_medal.dimensions" dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/gb/grass_medal.bin.lz" + INCBIN "data/maps/tiles/cgb/grass_medal.bgmap.lz" AnimData1:: frame_table AnimFrameTable0 diff --git a/src/data/maps/tiles/cgb/aerodactyl_intro.bin b/src/data/maps/tiles/cgb/aerodactyl_intro.bgmap similarity index 100% rename from src/data/maps/tiles/cgb/aerodactyl_intro.bin rename to src/data/maps/tiles/cgb/aerodactyl_intro.bgmap diff --git a/src/data/maps/tiles/cgb/aerodactyl_intro.bin.lz.match b/src/data/maps/tiles/cgb/aerodactyl_intro.bgmap.lz.match similarity index 100% rename from src/data/maps/tiles/cgb/aerodactyl_intro.bin.lz.match rename to src/data/maps/tiles/cgb/aerodactyl_intro.bgmap.lz.match diff --git a/src/data/maps/tiles/cgb/aerodactyl_intro.dimensions b/src/data/maps/tiles/cgb/aerodactyl_intro.dimensions new file mode 100644 index 00000000..78682ddc --- /dev/null +++ b/src/data/maps/tiles/cgb/aerodactyl_intro.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/card_pop.bin b/src/data/maps/tiles/cgb/card_pop.bgmap similarity index 100% rename from src/data/maps/tiles/cgb/card_pop.bin rename to src/data/maps/tiles/cgb/card_pop.bgmap diff --git a/src/data/maps/tiles/cgb/card_pop.bin.lz.match b/src/data/maps/tiles/cgb/card_pop.bgmap.lz.match similarity index 100% rename from src/data/maps/tiles/cgb/card_pop.bin.lz.match rename to src/data/maps/tiles/cgb/card_pop.bgmap.lz.match diff --git a/src/data/maps/tiles/cgb/card_pop.dimensions b/src/data/maps/tiles/cgb/card_pop.dimensions new file mode 100644 index 00000000..c31de8c7 --- /dev/null +++ b/src/data/maps/tiles/cgb/card_pop.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/gb/card_pop.bin b/src/data/maps/tiles/cgb/card_pop_noncgb.bgmap similarity index 100% rename from src/data/maps/tiles/gb/card_pop.bin rename to src/data/maps/tiles/cgb/card_pop_noncgb.bgmap diff --git a/src/data/maps/tiles/gb/card_pop.bin.lz.match b/src/data/maps/tiles/cgb/card_pop_noncgb.bgmap.lz.match similarity index 100% rename from src/data/maps/tiles/gb/card_pop.bin.lz.match rename to src/data/maps/tiles/cgb/card_pop_noncgb.bgmap.lz.match diff --git a/src/data/maps/tiles/cgb/card_pop_noncgb.dimensions b/src/data/maps/tiles/cgb/card_pop_noncgb.dimensions new file mode 100644 index 00000000..c31de8c7 --- /dev/null +++ b/src/data/maps/tiles/cgb/card_pop_noncgb.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/challenge_hall.bin b/src/data/maps/tiles/cgb/challenge_hall.bgmap similarity index 100% rename from src/data/maps/tiles/cgb/challenge_hall.bin rename to src/data/maps/tiles/cgb/challenge_hall.bgmap diff --git a/src/data/maps/tiles/cgb/challenge_hall.bin.lz.match b/src/data/maps/tiles/cgb/challenge_hall.bgmap.lz.match similarity index 100% rename from src/data/maps/tiles/cgb/challenge_hall.bin.lz.match rename to src/data/maps/tiles/cgb/challenge_hall.bgmap.lz.match diff --git a/src/data/maps/tiles/cgb/challenge_hall.dimensions b/src/data/maps/tiles/cgb/challenge_hall.dimensions new file mode 100644 index 00000000..136d0638 --- /dev/null +++ b/src/data/maps/tiles/cgb/challenge_hall.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/challenge_hall_entrance.bin b/src/data/maps/tiles/cgb/challenge_hall_entrance.bgmap similarity index 100% rename from src/data/maps/tiles/cgb/challenge_hall_entrance.bin rename to src/data/maps/tiles/cgb/challenge_hall_entrance.bgmap diff --git a/src/data/maps/tiles/cgb/challenge_hall_entrance.bin.lz.match b/src/data/maps/tiles/cgb/challenge_hall_entrance.bgmap.lz.match similarity index 100% rename from src/data/maps/tiles/cgb/challenge_hall_entrance.bin.lz.match rename to src/data/maps/tiles/cgb/challenge_hall_entrance.bgmap.lz.match diff --git a/src/data/maps/tiles/cgb/challenge_hall_entrance.dimensions b/src/data/maps/tiles/cgb/challenge_hall_entrance.dimensions new file mode 100644 index 00000000..c31de8c7 --- /dev/null +++ b/src/data/maps/tiles/cgb/challenge_hall_entrance.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/challenge_machine_map_event.bin b/src/data/maps/tiles/cgb/challenge_machine_map_event.bgmap similarity index 100% rename from src/data/maps/tiles/cgb/challenge_machine_map_event.bin rename to src/data/maps/tiles/cgb/challenge_machine_map_event.bgmap diff --git a/src/data/maps/tiles/cgb/challenge_machine_map_event.bin.lz.match b/src/data/maps/tiles/cgb/challenge_machine_map_event.bgmap.lz.match similarity index 100% rename from src/data/maps/tiles/cgb/challenge_machine_map_event.bin.lz.match rename to src/data/maps/tiles/cgb/challenge_machine_map_event.bgmap.lz.match diff --git a/src/data/maps/tiles/cgb/challenge_machine_map_event.dimensions b/src/data/maps/tiles/cgb/challenge_machine_map_event.dimensions new file mode 100644 index 00000000..d333ecd2 --- /dev/null +++ b/src/data/maps/tiles/cgb/challenge_machine_map_event.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/charizard_intro.bin b/src/data/maps/tiles/cgb/charizard_intro.bgmap similarity index 100% rename from src/data/maps/tiles/cgb/charizard_intro.bin rename to src/data/maps/tiles/cgb/charizard_intro.bgmap diff --git a/src/data/maps/tiles/cgb/charizard_intro.bin.lz.match b/src/data/maps/tiles/cgb/charizard_intro.bgmap.lz.match similarity index 100% rename from src/data/maps/tiles/cgb/charizard_intro.bin.lz.match rename to src/data/maps/tiles/cgb/charizard_intro.bgmap.lz.match diff --git a/src/data/maps/tiles/cgb/charizard_intro.dimensions b/src/data/maps/tiles/cgb/charizard_intro.dimensions new file mode 100644 index 00000000..78682ddc --- /dev/null +++ b/src/data/maps/tiles/cgb/charizard_intro.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/club_lobby.bin b/src/data/maps/tiles/cgb/club_lobby.bgmap similarity index 100% rename from src/data/maps/tiles/cgb/club_lobby.bin rename to src/data/maps/tiles/cgb/club_lobby.bgmap diff --git a/src/data/maps/tiles/cgb/club_lobby.bin.lz.match b/src/data/maps/tiles/cgb/club_lobby.bgmap.lz.match similarity index 100% rename from src/data/maps/tiles/cgb/club_lobby.bin.lz.match rename to src/data/maps/tiles/cgb/club_lobby.bgmap.lz.match diff --git a/src/data/maps/tiles/cgb/club_lobby.dimensions b/src/data/maps/tiles/cgb/club_lobby.dimensions new file mode 100644 index 00000000..016f7567 --- /dev/null +++ b/src/data/maps/tiles/cgb/club_lobby.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/colosseum.bin b/src/data/maps/tiles/cgb/colosseum.bgmap similarity index 100% rename from src/data/maps/tiles/cgb/colosseum.bin rename to src/data/maps/tiles/cgb/colosseum.bgmap diff --git a/src/data/maps/tiles/cgb/colosseum.bin.lz.match b/src/data/maps/tiles/cgb/colosseum.bgmap.lz.match similarity index 100% rename from src/data/maps/tiles/cgb/colosseum.bin.lz.match rename to src/data/maps/tiles/cgb/colosseum.bgmap.lz.match diff --git a/src/data/maps/tiles/cgb/colosseum.dimensions b/src/data/maps/tiles/cgb/colosseum.dimensions new file mode 100644 index 00000000..78682ddc --- /dev/null +++ b/src/data/maps/tiles/cgb/colosseum.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/copyright.bin b/src/data/maps/tiles/cgb/copyright.bgmap similarity index 100% rename from src/data/maps/tiles/cgb/copyright.bin rename to src/data/maps/tiles/cgb/copyright.bgmap diff --git a/src/data/maps/tiles/cgb/copyright.bin.lz.match b/src/data/maps/tiles/cgb/copyright.bgmap.lz.match similarity index 100% rename from src/data/maps/tiles/cgb/copyright.bin.lz.match rename to src/data/maps/tiles/cgb/copyright.bgmap.lz.match diff --git a/src/data/maps/tiles/cgb/copyright.dimensions b/src/data/maps/tiles/cgb/copyright.dimensions new file mode 100644 index 00000000..c31de8c7 --- /dev/null +++ b/src/data/maps/tiles/cgb/copyright.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/deck_machine_map_event.bin b/src/data/maps/tiles/cgb/deck_machine_map_event.bgmap similarity index 100% rename from src/data/maps/tiles/cgb/deck_machine_map_event.bin rename to src/data/maps/tiles/cgb/deck_machine_map_event.bgmap diff --git a/src/data/maps/tiles/cgb/deck_machine_map_event.dimensions b/src/data/maps/tiles/cgb/deck_machine_map_event.dimensions new file mode 100644 index 00000000..5e7f5cc1 --- /dev/null +++ b/src/data/maps/tiles/cgb/deck_machine_map_event.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/deck_machine_room.bin b/src/data/maps/tiles/cgb/deck_machine_room.bgmap similarity index 100% rename from src/data/maps/tiles/cgb/deck_machine_room.bin rename to src/data/maps/tiles/cgb/deck_machine_room.bgmap diff --git a/src/data/maps/tiles/cgb/deck_machine_room.bin.lz.match b/src/data/maps/tiles/cgb/deck_machine_room.bgmap.lz.match similarity index 100% rename from src/data/maps/tiles/cgb/deck_machine_room.bin.lz.match rename to src/data/maps/tiles/cgb/deck_machine_room.bgmap.lz.match diff --git a/src/data/maps/tiles/cgb/deck_machine_room.dimensions b/src/data/maps/tiles/cgb/deck_machine_room.dimensions new file mode 100644 index 00000000..271de7a4 --- /dev/null +++ b/src/data/maps/tiles/cgb/deck_machine_room.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/evolution.bin b/src/data/maps/tiles/cgb/evolution.bgmap similarity index 100% rename from src/data/maps/tiles/cgb/evolution.bin rename to src/data/maps/tiles/cgb/evolution.bgmap diff --git a/src/data/maps/tiles/cgb/evolution.bin.lz.match b/src/data/maps/tiles/cgb/evolution.bgmap.lz.match similarity index 100% rename from src/data/maps/tiles/cgb/evolution.bin.lz.match rename to src/data/maps/tiles/cgb/evolution.bgmap.lz.match diff --git a/src/data/maps/tiles/cgb/evolution.dimensions b/src/data/maps/tiles/cgb/evolution.dimensions new file mode 100644 index 00000000..78682ddc --- /dev/null +++ b/src/data/maps/tiles/cgb/evolution.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/fighting_club.bin b/src/data/maps/tiles/cgb/fighting_club.bgmap similarity index 100% rename from src/data/maps/tiles/cgb/fighting_club.bin rename to src/data/maps/tiles/cgb/fighting_club.bgmap diff --git a/src/data/maps/tiles/cgb/fighting_club.bin.lz.match b/src/data/maps/tiles/cgb/fighting_club.bgmap.lz.match similarity index 100% rename from src/data/maps/tiles/cgb/fighting_club.bin.lz.match rename to src/data/maps/tiles/cgb/fighting_club.bgmap.lz.match diff --git a/src/data/maps/tiles/cgb/fighting_club.dimensions b/src/data/maps/tiles/cgb/fighting_club.dimensions new file mode 100644 index 00000000..2cd85792 --- /dev/null +++ b/src/data/maps/tiles/cgb/fighting_club.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/fighting_club_entrance.bin b/src/data/maps/tiles/cgb/fighting_club_entrance.bgmap similarity index 100% rename from src/data/maps/tiles/cgb/fighting_club_entrance.bin rename to src/data/maps/tiles/cgb/fighting_club_entrance.bgmap diff --git a/src/data/maps/tiles/cgb/fighting_club_entrance.bin.lz.match b/src/data/maps/tiles/cgb/fighting_club_entrance.bgmap.lz.match similarity index 100% rename from src/data/maps/tiles/cgb/fighting_club_entrance.bin.lz.match rename to src/data/maps/tiles/cgb/fighting_club_entrance.bgmap.lz.match diff --git a/src/data/maps/tiles/cgb/fighting_club_entrance.dimensions b/src/data/maps/tiles/cgb/fighting_club_entrance.dimensions new file mode 100644 index 00000000..c31de8c7 --- /dev/null +++ b/src/data/maps/tiles/cgb/fighting_club_entrance.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/gb/fighting_medal.bin b/src/data/maps/tiles/cgb/fighting_medal.bgmap similarity index 100% rename from src/data/maps/tiles/gb/fighting_medal.bin rename to src/data/maps/tiles/cgb/fighting_medal.bgmap diff --git a/src/data/maps/tiles/gb/fighting_medal.bin.lz.match b/src/data/maps/tiles/cgb/fighting_medal.bgmap.lz.match similarity index 100% rename from src/data/maps/tiles/gb/fighting_medal.bin.lz.match rename to src/data/maps/tiles/cgb/fighting_medal.bgmap.lz.match diff --git a/src/data/maps/tiles/cgb/fighting_medal.dimensions b/src/data/maps/tiles/cgb/fighting_medal.dimensions new file mode 100644 index 00000000..5e2ed41f --- /dev/null +++ b/src/data/maps/tiles/cgb/fighting_medal.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/fire_club.bin b/src/data/maps/tiles/cgb/fire_club.bgmap similarity index 100% rename from src/data/maps/tiles/cgb/fire_club.bin rename to src/data/maps/tiles/cgb/fire_club.bgmap diff --git a/src/data/maps/tiles/cgb/fire_club.bin.lz.match b/src/data/maps/tiles/cgb/fire_club.bgmap.lz.match similarity index 100% rename from src/data/maps/tiles/cgb/fire_club.bin.lz.match rename to src/data/maps/tiles/cgb/fire_club.bgmap.lz.match diff --git a/src/data/maps/tiles/cgb/fire_club.dimensions b/src/data/maps/tiles/cgb/fire_club.dimensions new file mode 100644 index 00000000..3eb40bb1 --- /dev/null +++ b/src/data/maps/tiles/cgb/fire_club.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/fire_club_entrance.bin b/src/data/maps/tiles/cgb/fire_club_entrance.bgmap similarity index 100% rename from src/data/maps/tiles/cgb/fire_club_entrance.bin rename to src/data/maps/tiles/cgb/fire_club_entrance.bgmap diff --git a/src/data/maps/tiles/cgb/fire_club_entrance.bin.lz.match b/src/data/maps/tiles/cgb/fire_club_entrance.bgmap.lz.match similarity index 100% rename from src/data/maps/tiles/cgb/fire_club_entrance.bin.lz.match rename to src/data/maps/tiles/cgb/fire_club_entrance.bgmap.lz.match diff --git a/src/data/maps/tiles/cgb/fire_club_entrance.dimensions b/src/data/maps/tiles/cgb/fire_club_entrance.dimensions new file mode 100644 index 00000000..c31de8c7 --- /dev/null +++ b/src/data/maps/tiles/cgb/fire_club_entrance.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/gb/fire_medal.bin b/src/data/maps/tiles/cgb/fire_medal.bgmap similarity index 100% rename from src/data/maps/tiles/gb/fire_medal.bin rename to src/data/maps/tiles/cgb/fire_medal.bgmap diff --git a/src/data/maps/tiles/gb/fire_medal.bin.lz.match b/src/data/maps/tiles/cgb/fire_medal.bgmap.lz.match similarity index 100% rename from src/data/maps/tiles/gb/fire_medal.bin.lz.match rename to src/data/maps/tiles/cgb/fire_medal.bgmap.lz.match diff --git a/src/data/maps/tiles/cgb/fire_medal.dimensions b/src/data/maps/tiles/cgb/fire_medal.dimensions new file mode 100644 index 00000000..5e2ed41f --- /dev/null +++ b/src/data/maps/tiles/cgb/fire_medal.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/gameboy_link.bin b/src/data/maps/tiles/cgb/gameboy_link.bgmap similarity index 100% rename from src/data/maps/tiles/cgb/gameboy_link.bin rename to src/data/maps/tiles/cgb/gameboy_link.bgmap diff --git a/src/data/maps/tiles/cgb/gameboy_link.bin.lz.match b/src/data/maps/tiles/cgb/gameboy_link.bgmap.lz.match similarity index 100% rename from src/data/maps/tiles/cgb/gameboy_link.bin.lz.match rename to src/data/maps/tiles/cgb/gameboy_link.bgmap.lz.match diff --git a/src/data/maps/tiles/cgb/gameboy_link.dimensions b/src/data/maps/tiles/cgb/gameboy_link.dimensions new file mode 100644 index 00000000..c31de8c7 --- /dev/null +++ b/src/data/maps/tiles/cgb/gameboy_link.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/gameboy_link_connecting.bin b/src/data/maps/tiles/cgb/gameboy_link_connecting.bgmap similarity index 100% rename from src/data/maps/tiles/cgb/gameboy_link_connecting.bin rename to src/data/maps/tiles/cgb/gameboy_link_connecting.bgmap diff --git a/src/data/maps/tiles/cgb/gameboy_link_connecting.bin.lz.match b/src/data/maps/tiles/cgb/gameboy_link_connecting.bgmap.lz.match similarity index 100% rename from src/data/maps/tiles/cgb/gameboy_link_connecting.bin.lz.match rename to src/data/maps/tiles/cgb/gameboy_link_connecting.bgmap.lz.match diff --git a/src/data/maps/tiles/cgb/gameboy_link_connecting.dimensions b/src/data/maps/tiles/cgb/gameboy_link_connecting.dimensions new file mode 100644 index 00000000..c31de8c7 --- /dev/null +++ b/src/data/maps/tiles/cgb/gameboy_link_connecting.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/gameboy_printer.bin b/src/data/maps/tiles/cgb/gameboy_printer.bgmap similarity index 100% rename from src/data/maps/tiles/cgb/gameboy_printer.bin rename to src/data/maps/tiles/cgb/gameboy_printer.bgmap diff --git a/src/data/maps/tiles/cgb/gameboy_printer.bin.lz.match b/src/data/maps/tiles/cgb/gameboy_printer.bgmap.lz.match similarity index 100% rename from src/data/maps/tiles/cgb/gameboy_printer.bin.lz.match rename to src/data/maps/tiles/cgb/gameboy_printer.bgmap.lz.match diff --git a/src/data/maps/tiles/cgb/gameboy_printer.dimensions b/src/data/maps/tiles/cgb/gameboy_printer.dimensions new file mode 100644 index 00000000..c31de8c7 --- /dev/null +++ b/src/data/maps/tiles/cgb/gameboy_printer.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/grass_club.bin b/src/data/maps/tiles/cgb/grass_club.bgmap similarity index 100% rename from src/data/maps/tiles/cgb/grass_club.bin rename to src/data/maps/tiles/cgb/grass_club.bgmap diff --git a/src/data/maps/tiles/cgb/grass_club.bin.lz.match b/src/data/maps/tiles/cgb/grass_club.bgmap.lz.match similarity index 100% rename from src/data/maps/tiles/cgb/grass_club.bin.lz.match rename to src/data/maps/tiles/cgb/grass_club.bgmap.lz.match diff --git a/src/data/maps/tiles/cgb/grass_club.dimensions b/src/data/maps/tiles/cgb/grass_club.dimensions new file mode 100644 index 00000000..3eb40bb1 --- /dev/null +++ b/src/data/maps/tiles/cgb/grass_club.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/grass_club_entrance.bin b/src/data/maps/tiles/cgb/grass_club_entrance.bgmap similarity index 100% rename from src/data/maps/tiles/cgb/grass_club_entrance.bin rename to src/data/maps/tiles/cgb/grass_club_entrance.bgmap diff --git a/src/data/maps/tiles/cgb/grass_club_entrance.bin.lz.match b/src/data/maps/tiles/cgb/grass_club_entrance.bgmap.lz.match similarity index 100% rename from src/data/maps/tiles/cgb/grass_club_entrance.bin.lz.match rename to src/data/maps/tiles/cgb/grass_club_entrance.bgmap.lz.match diff --git a/src/data/maps/tiles/cgb/grass_club_entrance.dimensions b/src/data/maps/tiles/cgb/grass_club_entrance.dimensions new file mode 100644 index 00000000..c31de8c7 --- /dev/null +++ b/src/data/maps/tiles/cgb/grass_club_entrance.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/gb/grass_medal.bin b/src/data/maps/tiles/cgb/grass_medal.bgmap similarity index 100% rename from src/data/maps/tiles/gb/grass_medal.bin rename to src/data/maps/tiles/cgb/grass_medal.bgmap diff --git a/src/data/maps/tiles/gb/grass_medal.bin.lz.match b/src/data/maps/tiles/cgb/grass_medal.bgmap.lz.match similarity index 100% rename from src/data/maps/tiles/gb/grass_medal.bin.lz.match rename to src/data/maps/tiles/cgb/grass_medal.bgmap.lz.match diff --git a/src/data/maps/tiles/cgb/grass_medal.dimensions b/src/data/maps/tiles/cgb/grass_medal.dimensions new file mode 100644 index 00000000..5e2ed41f --- /dev/null +++ b/src/data/maps/tiles/cgb/grass_medal.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/hall_of_honor.bin b/src/data/maps/tiles/cgb/hall_of_honor.bgmap similarity index 100% rename from src/data/maps/tiles/cgb/hall_of_honor.bin rename to src/data/maps/tiles/cgb/hall_of_honor.bgmap diff --git a/src/data/maps/tiles/cgb/hall_of_honor.bin.lz.match b/src/data/maps/tiles/cgb/hall_of_honor.bgmap.lz.match similarity index 100% rename from src/data/maps/tiles/cgb/hall_of_honor.bin.lz.match rename to src/data/maps/tiles/cgb/hall_of_honor.bgmap.lz.match diff --git a/src/data/maps/tiles/cgb/hall_of_honor.dimensions b/src/data/maps/tiles/cgb/hall_of_honor.dimensions new file mode 100644 index 00000000..9c057b30 --- /dev/null +++ b/src/data/maps/tiles/cgb/hall_of_honor.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/hall_of_honor_door_map_event.bin b/src/data/maps/tiles/cgb/hall_of_honor_door_map_event.bgmap similarity index 100% rename from src/data/maps/tiles/cgb/hall_of_honor_door_map_event.bin rename to src/data/maps/tiles/cgb/hall_of_honor_door_map_event.bgmap diff --git a/src/data/maps/tiles/cgb/hall_of_honor_door_map_event.dimensions b/src/data/maps/tiles/cgb/hall_of_honor_door_map_event.dimensions new file mode 100644 index 00000000..6bebb85a --- /dev/null +++ b/src/data/maps/tiles/cgb/hall_of_honor_door_map_event.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/ishihara.bin b/src/data/maps/tiles/cgb/ishihara.bgmap similarity index 100% rename from src/data/maps/tiles/cgb/ishihara.bin rename to src/data/maps/tiles/cgb/ishihara.bgmap diff --git a/src/data/maps/tiles/cgb/ishihara.bin.lz.match b/src/data/maps/tiles/cgb/ishihara.bgmap.lz.match similarity index 100% rename from src/data/maps/tiles/cgb/ishihara.bin.lz.match rename to src/data/maps/tiles/cgb/ishihara.bgmap.lz.match diff --git a/src/data/maps/tiles/cgb/ishihara.dimensions b/src/data/maps/tiles/cgb/ishihara.dimensions new file mode 100644 index 00000000..5844d81d --- /dev/null +++ b/src/data/maps/tiles/cgb/ishihara.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/japanese_title_screen.bin b/src/data/maps/tiles/cgb/japanese_title_screen.bgmap similarity index 100% rename from src/data/maps/tiles/cgb/japanese_title_screen.bin rename to src/data/maps/tiles/cgb/japanese_title_screen.bgmap diff --git a/src/data/maps/tiles/cgb/japanese_title_screen.bin.lz.match b/src/data/maps/tiles/cgb/japanese_title_screen.bgmap.lz.match similarity index 100% rename from src/data/maps/tiles/cgb/japanese_title_screen.bin.lz.match rename to src/data/maps/tiles/cgb/japanese_title_screen.bgmap.lz.match diff --git a/src/data/maps/tiles/cgb/japanese_title_screen.dimensions b/src/data/maps/tiles/cgb/japanese_title_screen.dimensions new file mode 100644 index 00000000..c31de8c7 --- /dev/null +++ b/src/data/maps/tiles/cgb/japanese_title_screen.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/japanese_title_screen_2.bin b/src/data/maps/tiles/cgb/japanese_title_screen_2.bgmap similarity index 100% rename from src/data/maps/tiles/cgb/japanese_title_screen_2.bin rename to src/data/maps/tiles/cgb/japanese_title_screen_2.bgmap diff --git a/src/data/maps/tiles/cgb/japanese_title_screen_2.bin.lz.match b/src/data/maps/tiles/cgb/japanese_title_screen_2.bgmap.lz.match similarity index 100% rename from src/data/maps/tiles/cgb/japanese_title_screen_2.bin.lz.match rename to src/data/maps/tiles/cgb/japanese_title_screen_2.bgmap.lz.match diff --git a/src/data/maps/tiles/cgb/japanese_title_screen_2.dimensions b/src/data/maps/tiles/cgb/japanese_title_screen_2.dimensions new file mode 100644 index 00000000..c31de8c7 --- /dev/null +++ b/src/data/maps/tiles/cgb/japanese_title_screen_2.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/laboratory.bin b/src/data/maps/tiles/cgb/laboratory.bgmap similarity index 100% rename from src/data/maps/tiles/cgb/laboratory.bin rename to src/data/maps/tiles/cgb/laboratory.bgmap diff --git a/src/data/maps/tiles/cgb/laboratory.bin.lz.match b/src/data/maps/tiles/cgb/laboratory.bgmap.lz.match similarity index 100% rename from src/data/maps/tiles/cgb/laboratory.bin.lz.match rename to src/data/maps/tiles/cgb/laboratory.bgmap.lz.match diff --git a/src/data/maps/tiles/cgb/laboratory.dimensions b/src/data/maps/tiles/cgb/laboratory.dimensions new file mode 100644 index 00000000..78682ddc --- /dev/null +++ b/src/data/maps/tiles/cgb/laboratory.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/lightning_club.bin b/src/data/maps/tiles/cgb/lightning_club.bgmap similarity index 100% rename from src/data/maps/tiles/cgb/lightning_club.bin rename to src/data/maps/tiles/cgb/lightning_club.bgmap diff --git a/src/data/maps/tiles/cgb/lightning_club.bin.lz.match b/src/data/maps/tiles/cgb/lightning_club.bgmap.lz.match similarity index 100% rename from src/data/maps/tiles/cgb/lightning_club.bin.lz.match rename to src/data/maps/tiles/cgb/lightning_club.bgmap.lz.match diff --git a/src/data/maps/tiles/cgb/lightning_club.dimensions b/src/data/maps/tiles/cgb/lightning_club.dimensions new file mode 100644 index 00000000..3eb40bb1 --- /dev/null +++ b/src/data/maps/tiles/cgb/lightning_club.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/lightning_club_entrance.bin b/src/data/maps/tiles/cgb/lightning_club_entrance.bgmap similarity index 100% rename from src/data/maps/tiles/cgb/lightning_club_entrance.bin rename to src/data/maps/tiles/cgb/lightning_club_entrance.bgmap diff --git a/src/data/maps/tiles/cgb/lightning_club_entrance.bin.lz.match b/src/data/maps/tiles/cgb/lightning_club_entrance.bgmap.lz.match similarity index 100% rename from src/data/maps/tiles/cgb/lightning_club_entrance.bin.lz.match rename to src/data/maps/tiles/cgb/lightning_club_entrance.bgmap.lz.match diff --git a/src/data/maps/tiles/cgb/lightning_club_entrance.dimensions b/src/data/maps/tiles/cgb/lightning_club_entrance.dimensions new file mode 100644 index 00000000..c31de8c7 --- /dev/null +++ b/src/data/maps/tiles/cgb/lightning_club_entrance.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/gb/lightning_medal.bin b/src/data/maps/tiles/cgb/lightning_medal.bgmap similarity index 100% rename from src/data/maps/tiles/gb/lightning_medal.bin rename to src/data/maps/tiles/cgb/lightning_medal.bgmap diff --git a/src/data/maps/tiles/gb/lightning_medal.bin.lz.match b/src/data/maps/tiles/cgb/lightning_medal.bgmap.lz.match similarity index 100% rename from src/data/maps/tiles/gb/lightning_medal.bin.lz.match rename to src/data/maps/tiles/cgb/lightning_medal.bgmap.lz.match diff --git a/src/data/maps/tiles/cgb/lightning_medal.dimensions b/src/data/maps/tiles/cgb/lightning_medal.dimensions new file mode 100644 index 00000000..5e2ed41f --- /dev/null +++ b/src/data/maps/tiles/cgb/lightning_medal.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/mason_laboratory.bin b/src/data/maps/tiles/cgb/mason_laboratory.bgmap similarity index 100% rename from src/data/maps/tiles/cgb/mason_laboratory.bin rename to src/data/maps/tiles/cgb/mason_laboratory.bgmap diff --git a/src/data/maps/tiles/cgb/mason_laboratory.bin.lz.match b/src/data/maps/tiles/cgb/mason_laboratory.bgmap.lz.match similarity index 100% rename from src/data/maps/tiles/cgb/mason_laboratory.bin.lz.match rename to src/data/maps/tiles/cgb/mason_laboratory.bgmap.lz.match diff --git a/src/data/maps/tiles/cgb/mason_laboratory.dimensions b/src/data/maps/tiles/cgb/mason_laboratory.dimensions new file mode 100644 index 00000000..959ba312 --- /dev/null +++ b/src/data/maps/tiles/cgb/mason_laboratory.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/mystery.bin b/src/data/maps/tiles/cgb/mystery.bgmap similarity index 100% rename from src/data/maps/tiles/cgb/mystery.bin rename to src/data/maps/tiles/cgb/mystery.bgmap diff --git a/src/data/maps/tiles/cgb/mystery.bin.lz.match b/src/data/maps/tiles/cgb/mystery.bgmap.lz.match similarity index 100% rename from src/data/maps/tiles/cgb/mystery.bin.lz.match rename to src/data/maps/tiles/cgb/mystery.bgmap.lz.match diff --git a/src/data/maps/tiles/cgb/mystery.dimensions b/src/data/maps/tiles/cgb/mystery.dimensions new file mode 100644 index 00000000..78682ddc --- /dev/null +++ b/src/data/maps/tiles/cgb/mystery.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/overworld_map.bin b/src/data/maps/tiles/cgb/overworld_map.bgmap similarity index 100% rename from src/data/maps/tiles/cgb/overworld_map.bin rename to src/data/maps/tiles/cgb/overworld_map.bgmap diff --git a/src/data/maps/tiles/cgb/overworld_map.bin.lz.match b/src/data/maps/tiles/cgb/overworld_map.bgmap.lz.match similarity index 100% rename from src/data/maps/tiles/cgb/overworld_map.bin.lz.match rename to src/data/maps/tiles/cgb/overworld_map.bgmap.lz.match diff --git a/src/data/maps/tiles/cgb/overworld_map.dimensions b/src/data/maps/tiles/cgb/overworld_map.dimensions new file mode 100644 index 00000000..c31de8c7 --- /dev/null +++ b/src/data/maps/tiles/cgb/overworld_map.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/pokemon_dome.bin b/src/data/maps/tiles/cgb/pokemon_dome.bgmap similarity index 100% rename from src/data/maps/tiles/cgb/pokemon_dome.bin rename to src/data/maps/tiles/cgb/pokemon_dome.bgmap diff --git a/src/data/maps/tiles/cgb/pokemon_dome.bin.lz.match b/src/data/maps/tiles/cgb/pokemon_dome.bgmap.lz.match similarity index 100% rename from src/data/maps/tiles/cgb/pokemon_dome.bin.lz.match rename to src/data/maps/tiles/cgb/pokemon_dome.bgmap.lz.match diff --git a/src/data/maps/tiles/cgb/pokemon_dome.dimensions b/src/data/maps/tiles/cgb/pokemon_dome.dimensions new file mode 100644 index 00000000..136d0638 --- /dev/null +++ b/src/data/maps/tiles/cgb/pokemon_dome.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/pokemon_dome_door_map_event.bin b/src/data/maps/tiles/cgb/pokemon_dome_door_map_event.bgmap similarity index 100% rename from src/data/maps/tiles/cgb/pokemon_dome_door_map_event.bin rename to src/data/maps/tiles/cgb/pokemon_dome_door_map_event.bgmap diff --git a/src/data/maps/tiles/cgb/pokemon_dome_door_map_event.dimensions b/src/data/maps/tiles/cgb/pokemon_dome_door_map_event.dimensions new file mode 100644 index 00000000..6bebb85a --- /dev/null +++ b/src/data/maps/tiles/cgb/pokemon_dome_door_map_event.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/pokemon_dome_entrance.bin b/src/data/maps/tiles/cgb/pokemon_dome_entrance.bgmap similarity index 100% rename from src/data/maps/tiles/cgb/pokemon_dome_entrance.bin rename to src/data/maps/tiles/cgb/pokemon_dome_entrance.bgmap diff --git a/src/data/maps/tiles/cgb/pokemon_dome_entrance.bin.lz.match b/src/data/maps/tiles/cgb/pokemon_dome_entrance.bgmap.lz.match similarity index 100% rename from src/data/maps/tiles/cgb/pokemon_dome_entrance.bin.lz.match rename to src/data/maps/tiles/cgb/pokemon_dome_entrance.bgmap.lz.match diff --git a/src/data/maps/tiles/cgb/pokemon_dome_entrance.dimensions b/src/data/maps/tiles/cgb/pokemon_dome_entrance.dimensions new file mode 100644 index 00000000..c1c711a1 --- /dev/null +++ b/src/data/maps/tiles/cgb/pokemon_dome_entrance.dimensions @@ -0,0 +1 @@ +  \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/psychic_club.bin b/src/data/maps/tiles/cgb/psychic_club.bgmap similarity index 100% rename from src/data/maps/tiles/cgb/psychic_club.bin rename to src/data/maps/tiles/cgb/psychic_club.bgmap diff --git a/src/data/maps/tiles/cgb/psychic_club.bin.lz.match b/src/data/maps/tiles/cgb/psychic_club.bgmap.lz.match similarity index 100% rename from src/data/maps/tiles/cgb/psychic_club.bin.lz.match rename to src/data/maps/tiles/cgb/psychic_club.bgmap.lz.match diff --git a/src/data/maps/tiles/cgb/psychic_club.dimensions b/src/data/maps/tiles/cgb/psychic_club.dimensions new file mode 100644 index 00000000..0bc92d84 --- /dev/null +++ b/src/data/maps/tiles/cgb/psychic_club.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/psychic_club_entrance.bin b/src/data/maps/tiles/cgb/psychic_club_entrance.bgmap similarity index 100% rename from src/data/maps/tiles/cgb/psychic_club_entrance.bin rename to src/data/maps/tiles/cgb/psychic_club_entrance.bgmap diff --git a/src/data/maps/tiles/cgb/psychic_club_entrance.bin.lz.match b/src/data/maps/tiles/cgb/psychic_club_entrance.bgmap.lz.match similarity index 100% rename from src/data/maps/tiles/cgb/psychic_club_entrance.bin.lz.match rename to src/data/maps/tiles/cgb/psychic_club_entrance.bgmap.lz.match diff --git a/src/data/maps/tiles/cgb/psychic_club_entrance.dimensions b/src/data/maps/tiles/cgb/psychic_club_entrance.dimensions new file mode 100644 index 00000000..c31de8c7 --- /dev/null +++ b/src/data/maps/tiles/cgb/psychic_club_entrance.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/gb/psychic_medal.bin b/src/data/maps/tiles/cgb/psychic_medal.bgmap similarity index 100% rename from src/data/maps/tiles/gb/psychic_medal.bin rename to src/data/maps/tiles/cgb/psychic_medal.bgmap diff --git a/src/data/maps/tiles/gb/psychic_medal.bin.lz.match b/src/data/maps/tiles/cgb/psychic_medal.bgmap.lz.match similarity index 100% rename from src/data/maps/tiles/gb/psychic_medal.bin.lz.match rename to src/data/maps/tiles/cgb/psychic_medal.bgmap.lz.match diff --git a/src/data/maps/tiles/cgb/psychic_medal.dimensions b/src/data/maps/tiles/cgb/psychic_medal.dimensions new file mode 100644 index 00000000..5e2ed41f --- /dev/null +++ b/src/data/maps/tiles/cgb/psychic_medal.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/rock_club.bin b/src/data/maps/tiles/cgb/rock_club.bgmap similarity index 100% rename from src/data/maps/tiles/cgb/rock_club.bin rename to src/data/maps/tiles/cgb/rock_club.bgmap diff --git a/src/data/maps/tiles/cgb/rock_club.bin.lz.match b/src/data/maps/tiles/cgb/rock_club.bgmap.lz.match similarity index 100% rename from src/data/maps/tiles/cgb/rock_club.bin.lz.match rename to src/data/maps/tiles/cgb/rock_club.bgmap.lz.match diff --git a/src/data/maps/tiles/cgb/rock_club.dimensions b/src/data/maps/tiles/cgb/rock_club.dimensions new file mode 100644 index 00000000..959ba312 --- /dev/null +++ b/src/data/maps/tiles/cgb/rock_club.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/rock_club_entrance.bin b/src/data/maps/tiles/cgb/rock_club_entrance.bgmap similarity index 100% rename from src/data/maps/tiles/cgb/rock_club_entrance.bin rename to src/data/maps/tiles/cgb/rock_club_entrance.bgmap diff --git a/src/data/maps/tiles/cgb/rock_club_entrance.bin.lz.match b/src/data/maps/tiles/cgb/rock_club_entrance.bgmap.lz.match similarity index 100% rename from src/data/maps/tiles/cgb/rock_club_entrance.bin.lz.match rename to src/data/maps/tiles/cgb/rock_club_entrance.bgmap.lz.match diff --git a/src/data/maps/tiles/cgb/rock_club_entrance.dimensions b/src/data/maps/tiles/cgb/rock_club_entrance.dimensions new file mode 100644 index 00000000..c31de8c7 --- /dev/null +++ b/src/data/maps/tiles/cgb/rock_club_entrance.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/gb/rock_medal.bin b/src/data/maps/tiles/cgb/rock_medal.bgmap similarity index 100% rename from src/data/maps/tiles/gb/rock_medal.bin rename to src/data/maps/tiles/cgb/rock_medal.bgmap diff --git a/src/data/maps/tiles/gb/rock_medal.bin.lz.match b/src/data/maps/tiles/cgb/rock_medal.bgmap.lz.match similarity index 100% rename from src/data/maps/tiles/gb/rock_medal.bin.lz.match rename to src/data/maps/tiles/cgb/rock_medal.bgmap.lz.match diff --git a/src/data/maps/tiles/cgb/rock_medal.dimensions b/src/data/maps/tiles/cgb/rock_medal.dimensions new file mode 100644 index 00000000..5e2ed41f --- /dev/null +++ b/src/data/maps/tiles/cgb/rock_medal.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/science_club.bin b/src/data/maps/tiles/cgb/science_club.bgmap similarity index 100% rename from src/data/maps/tiles/cgb/science_club.bin rename to src/data/maps/tiles/cgb/science_club.bgmap diff --git a/src/data/maps/tiles/cgb/science_club.bin.lz.match b/src/data/maps/tiles/cgb/science_club.bgmap.lz.match similarity index 100% rename from src/data/maps/tiles/cgb/science_club.bin.lz.match rename to src/data/maps/tiles/cgb/science_club.bgmap.lz.match diff --git a/src/data/maps/tiles/cgb/science_club.dimensions b/src/data/maps/tiles/cgb/science_club.dimensions new file mode 100644 index 00000000..3eb40bb1 --- /dev/null +++ b/src/data/maps/tiles/cgb/science_club.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/science_club_entrance.bin b/src/data/maps/tiles/cgb/science_club_entrance.bgmap similarity index 100% rename from src/data/maps/tiles/cgb/science_club_entrance.bin rename to src/data/maps/tiles/cgb/science_club_entrance.bgmap diff --git a/src/data/maps/tiles/cgb/science_club_entrance.bin.lz.match b/src/data/maps/tiles/cgb/science_club_entrance.bgmap.lz.match similarity index 100% rename from src/data/maps/tiles/cgb/science_club_entrance.bin.lz.match rename to src/data/maps/tiles/cgb/science_club_entrance.bgmap.lz.match diff --git a/src/data/maps/tiles/cgb/science_club_entrance.dimensions b/src/data/maps/tiles/cgb/science_club_entrance.dimensions new file mode 100644 index 00000000..c31de8c7 --- /dev/null +++ b/src/data/maps/tiles/cgb/science_club_entrance.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/gb/science_medal.bin b/src/data/maps/tiles/cgb/science_medal.bgmap similarity index 100% rename from src/data/maps/tiles/gb/science_medal.bin rename to src/data/maps/tiles/cgb/science_medal.bgmap diff --git a/src/data/maps/tiles/gb/science_medal.bin.lz.match b/src/data/maps/tiles/cgb/science_medal.bgmap.lz.match similarity index 100% rename from src/data/maps/tiles/gb/science_medal.bin.lz.match rename to src/data/maps/tiles/cgb/science_medal.bgmap.lz.match diff --git a/src/data/maps/tiles/cgb/science_medal.dimensions b/src/data/maps/tiles/cgb/science_medal.dimensions new file mode 100644 index 00000000..5e2ed41f --- /dev/null +++ b/src/data/maps/tiles/cgb/science_medal.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/scyther_intro.bin b/src/data/maps/tiles/cgb/scyther_intro.bgmap similarity index 100% rename from src/data/maps/tiles/cgb/scyther_intro.bin rename to src/data/maps/tiles/cgb/scyther_intro.bgmap diff --git a/src/data/maps/tiles/cgb/scyther_intro.bin.lz.match b/src/data/maps/tiles/cgb/scyther_intro.bgmap.lz.match similarity index 100% rename from src/data/maps/tiles/cgb/scyther_intro.bin.lz.match rename to src/data/maps/tiles/cgb/scyther_intro.bgmap.lz.match diff --git a/src/data/maps/tiles/cgb/scyther_intro.dimensions b/src/data/maps/tiles/cgb/scyther_intro.dimensions new file mode 100644 index 00000000..78682ddc --- /dev/null +++ b/src/data/maps/tiles/cgb/scyther_intro.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/gb/solid_tiles_1.bin b/src/data/maps/tiles/cgb/solid_tiles_1.bgmap similarity index 100% rename from src/data/maps/tiles/gb/solid_tiles_1.bin rename to src/data/maps/tiles/cgb/solid_tiles_1.bgmap diff --git a/src/data/maps/tiles/gb/solid_tiles_1.bin.lz.match b/src/data/maps/tiles/cgb/solid_tiles_1.bgmap.lz.match similarity index 100% rename from src/data/maps/tiles/gb/solid_tiles_1.bin.lz.match rename to src/data/maps/tiles/cgb/solid_tiles_1.bgmap.lz.match diff --git a/src/data/maps/tiles/cgb/solid_tiles_1.dimensions b/src/data/maps/tiles/cgb/solid_tiles_1.dimensions new file mode 100644 index 00000000..c31de8c7 --- /dev/null +++ b/src/data/maps/tiles/cgb/solid_tiles_1.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/gb/solid_tiles_2.bin b/src/data/maps/tiles/cgb/solid_tiles_2.bgmap similarity index 100% rename from src/data/maps/tiles/gb/solid_tiles_2.bin rename to src/data/maps/tiles/cgb/solid_tiles_2.bgmap diff --git a/src/data/maps/tiles/gb/solid_tiles_2.bin.lz.match b/src/data/maps/tiles/cgb/solid_tiles_2.bgmap.lz.match similarity index 100% rename from src/data/maps/tiles/gb/solid_tiles_2.bin.lz.match rename to src/data/maps/tiles/cgb/solid_tiles_2.bgmap.lz.match diff --git a/src/data/maps/tiles/cgb/solid_tiles_2.dimensions b/src/data/maps/tiles/cgb/solid_tiles_2.dimensions new file mode 100644 index 00000000..c31de8c7 --- /dev/null +++ b/src/data/maps/tiles/cgb/solid_tiles_2.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/gb/solid_tiles_3.bin b/src/data/maps/tiles/cgb/solid_tiles_3.bgmap similarity index 100% rename from src/data/maps/tiles/gb/solid_tiles_3.bin rename to src/data/maps/tiles/cgb/solid_tiles_3.bgmap diff --git a/src/data/maps/tiles/gb/solid_tiles_3.bin.lz.match b/src/data/maps/tiles/cgb/solid_tiles_3.bgmap.lz.match similarity index 100% rename from src/data/maps/tiles/gb/solid_tiles_3.bin.lz.match rename to src/data/maps/tiles/cgb/solid_tiles_3.bgmap.lz.match diff --git a/src/data/maps/tiles/cgb/solid_tiles_3.dimensions b/src/data/maps/tiles/cgb/solid_tiles_3.dimensions new file mode 100644 index 00000000..c31de8c7 --- /dev/null +++ b/src/data/maps/tiles/cgb/solid_tiles_3.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/gb/solid_tiles_4.bin b/src/data/maps/tiles/cgb/solid_tiles_4.bgmap similarity index 100% rename from src/data/maps/tiles/gb/solid_tiles_4.bin rename to src/data/maps/tiles/cgb/solid_tiles_4.bgmap diff --git a/src/data/maps/tiles/gb/solid_tiles_4.bin.lz.match b/src/data/maps/tiles/cgb/solid_tiles_4.bgmap.lz.match similarity index 100% rename from src/data/maps/tiles/gb/solid_tiles_4.bin.lz.match rename to src/data/maps/tiles/cgb/solid_tiles_4.bgmap.lz.match diff --git a/src/data/maps/tiles/cgb/solid_tiles_4.dimensions b/src/data/maps/tiles/cgb/solid_tiles_4.dimensions new file mode 100644 index 00000000..322f8454 --- /dev/null +++ b/src/data/maps/tiles/cgb/solid_tiles_4.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/title_screen.bin b/src/data/maps/tiles/cgb/title_screen.bgmap similarity index 100% rename from src/data/maps/tiles/cgb/title_screen.bin rename to src/data/maps/tiles/cgb/title_screen.bgmap diff --git a/src/data/maps/tiles/cgb/title_screen.bin.lz.match b/src/data/maps/tiles/cgb/title_screen.bgmap.lz.match similarity index 100% rename from src/data/maps/tiles/cgb/title_screen.bin.lz.match rename to src/data/maps/tiles/cgb/title_screen.bgmap.lz.match diff --git a/src/data/maps/tiles/cgb/title_screen.dimensions b/src/data/maps/tiles/cgb/title_screen.dimensions new file mode 100644 index 00000000..c31de8c7 --- /dev/null +++ b/src/data/maps/tiles/cgb/title_screen.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/water_club.bin b/src/data/maps/tiles/cgb/water_club.bgmap similarity index 100% rename from src/data/maps/tiles/cgb/water_club.bin rename to src/data/maps/tiles/cgb/water_club.bgmap diff --git a/src/data/maps/tiles/cgb/water_club.bin.lz.match b/src/data/maps/tiles/cgb/water_club.bgmap.lz.match similarity index 100% rename from src/data/maps/tiles/cgb/water_club.bin.lz.match rename to src/data/maps/tiles/cgb/water_club.bgmap.lz.match diff --git a/src/data/maps/tiles/cgb/water_club.dimensions b/src/data/maps/tiles/cgb/water_club.dimensions new file mode 100644 index 00000000..3eb40bb1 --- /dev/null +++ b/src/data/maps/tiles/cgb/water_club.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/water_club_entrance.bin b/src/data/maps/tiles/cgb/water_club_entrance.bgmap similarity index 100% rename from src/data/maps/tiles/cgb/water_club_entrance.bin rename to src/data/maps/tiles/cgb/water_club_entrance.bgmap diff --git a/src/data/maps/tiles/cgb/water_club_entrance.bin.lz.match b/src/data/maps/tiles/cgb/water_club_entrance.bgmap.lz.match similarity index 100% rename from src/data/maps/tiles/cgb/water_club_entrance.bin.lz.match rename to src/data/maps/tiles/cgb/water_club_entrance.bgmap.lz.match diff --git a/src/data/maps/tiles/cgb/water_club_entrance.dimensions b/src/data/maps/tiles/cgb/water_club_entrance.dimensions new file mode 100644 index 00000000..c31de8c7 --- /dev/null +++ b/src/data/maps/tiles/cgb/water_club_entrance.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/gb/water_medal.bin b/src/data/maps/tiles/cgb/water_medal.bgmap similarity index 100% rename from src/data/maps/tiles/gb/water_medal.bin rename to src/data/maps/tiles/cgb/water_medal.bgmap diff --git a/src/data/maps/tiles/gb/water_medal.bin.lz.match b/src/data/maps/tiles/cgb/water_medal.bgmap.lz.match similarity index 100% rename from src/data/maps/tiles/gb/water_medal.bin.lz.match rename to src/data/maps/tiles/cgb/water_medal.bgmap.lz.match diff --git a/src/data/maps/tiles/cgb/water_medal.dimensions b/src/data/maps/tiles/cgb/water_medal.dimensions new file mode 100644 index 00000000..5e2ed41f --- /dev/null +++ b/src/data/maps/tiles/cgb/water_medal.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/gb/aerodactyl_intro.dimensions b/src/data/maps/tiles/gb/aerodactyl_intro.dimensions new file mode 100644 index 00000000..78682ddc --- /dev/null +++ b/src/data/maps/tiles/gb/aerodactyl_intro.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/gb/challenge_hall.dimensions b/src/data/maps/tiles/gb/challenge_hall.dimensions new file mode 100644 index 00000000..136d0638 --- /dev/null +++ b/src/data/maps/tiles/gb/challenge_hall.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/gb/challenge_hall_entrance.dimensions b/src/data/maps/tiles/gb/challenge_hall_entrance.dimensions new file mode 100644 index 00000000..c31de8c7 --- /dev/null +++ b/src/data/maps/tiles/gb/challenge_hall_entrance.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/gb/challenge_machine_map_event.dimensions b/src/data/maps/tiles/gb/challenge_machine_map_event.dimensions new file mode 100644 index 00000000..d333ecd2 --- /dev/null +++ b/src/data/maps/tiles/gb/challenge_machine_map_event.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/gb/charizard_intro.dimensions b/src/data/maps/tiles/gb/charizard_intro.dimensions new file mode 100644 index 00000000..78682ddc --- /dev/null +++ b/src/data/maps/tiles/gb/charizard_intro.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/gb/club_lobby.dimensions b/src/data/maps/tiles/gb/club_lobby.dimensions new file mode 100644 index 00000000..016f7567 --- /dev/null +++ b/src/data/maps/tiles/gb/club_lobby.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/gb/colosseum.dimensions b/src/data/maps/tiles/gb/colosseum.dimensions new file mode 100644 index 00000000..78682ddc --- /dev/null +++ b/src/data/maps/tiles/gb/colosseum.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/gb/companies.dimensions b/src/data/maps/tiles/gb/companies.dimensions new file mode 100644 index 00000000..c31de8c7 --- /dev/null +++ b/src/data/maps/tiles/gb/companies.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/gb/copyright.dimensions b/src/data/maps/tiles/gb/copyright.dimensions new file mode 100644 index 00000000..c31de8c7 --- /dev/null +++ b/src/data/maps/tiles/gb/copyright.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/gb/deck_machine_map_event.dimensions b/src/data/maps/tiles/gb/deck_machine_map_event.dimensions new file mode 100644 index 00000000..5e7f5cc1 --- /dev/null +++ b/src/data/maps/tiles/gb/deck_machine_map_event.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/gb/deck_machine_room.dimensions b/src/data/maps/tiles/gb/deck_machine_room.dimensions new file mode 100644 index 00000000..271de7a4 --- /dev/null +++ b/src/data/maps/tiles/gb/deck_machine_room.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/gb/evolution.dimensions b/src/data/maps/tiles/gb/evolution.dimensions new file mode 100644 index 00000000..78682ddc --- /dev/null +++ b/src/data/maps/tiles/gb/evolution.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/gb/fighting_club.dimensions b/src/data/maps/tiles/gb/fighting_club.dimensions new file mode 100644 index 00000000..2cd85792 --- /dev/null +++ b/src/data/maps/tiles/gb/fighting_club.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/gb/fighting_club_entrance.dimensions b/src/data/maps/tiles/gb/fighting_club_entrance.dimensions new file mode 100644 index 00000000..c31de8c7 --- /dev/null +++ b/src/data/maps/tiles/gb/fighting_club_entrance.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/gb/fire_club.dimensions b/src/data/maps/tiles/gb/fire_club.dimensions new file mode 100644 index 00000000..3eb40bb1 --- /dev/null +++ b/src/data/maps/tiles/gb/fire_club.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/gb/fire_club_entrance.dimensions b/src/data/maps/tiles/gb/fire_club_entrance.dimensions new file mode 100644 index 00000000..c31de8c7 --- /dev/null +++ b/src/data/maps/tiles/gb/fire_club_entrance.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/gb/gameboy_link.dimensions b/src/data/maps/tiles/gb/gameboy_link.dimensions new file mode 100644 index 00000000..c31de8c7 --- /dev/null +++ b/src/data/maps/tiles/gb/gameboy_link.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/gb/gameboy_link_connecting.dimensions b/src/data/maps/tiles/gb/gameboy_link_connecting.dimensions new file mode 100644 index 00000000..c31de8c7 --- /dev/null +++ b/src/data/maps/tiles/gb/gameboy_link_connecting.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/gb/gameboy_printer.dimensions b/src/data/maps/tiles/gb/gameboy_printer.dimensions new file mode 100644 index 00000000..c31de8c7 --- /dev/null +++ b/src/data/maps/tiles/gb/gameboy_printer.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/gb/grass_club.dimensions b/src/data/maps/tiles/gb/grass_club.dimensions new file mode 100644 index 00000000..3eb40bb1 --- /dev/null +++ b/src/data/maps/tiles/gb/grass_club.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/gb/grass_club_entrance.dimensions b/src/data/maps/tiles/gb/grass_club_entrance.dimensions new file mode 100644 index 00000000..c31de8c7 --- /dev/null +++ b/src/data/maps/tiles/gb/grass_club_entrance.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/gb/hall_of_honor.dimensions b/src/data/maps/tiles/gb/hall_of_honor.dimensions new file mode 100644 index 00000000..9c057b30 --- /dev/null +++ b/src/data/maps/tiles/gb/hall_of_honor.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/gb/hall_of_honor_door_map_event.dimensions b/src/data/maps/tiles/gb/hall_of_honor_door_map_event.dimensions new file mode 100644 index 00000000..6bebb85a --- /dev/null +++ b/src/data/maps/tiles/gb/hall_of_honor_door_map_event.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/gb/ishihara.dimensions b/src/data/maps/tiles/gb/ishihara.dimensions new file mode 100644 index 00000000..5844d81d --- /dev/null +++ b/src/data/maps/tiles/gb/ishihara.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/gb/japanese_title_screen.dimensions b/src/data/maps/tiles/gb/japanese_title_screen.dimensions new file mode 100644 index 00000000..c31de8c7 --- /dev/null +++ b/src/data/maps/tiles/gb/japanese_title_screen.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/gb/japanese_title_screen_2.dimensions b/src/data/maps/tiles/gb/japanese_title_screen_2.dimensions new file mode 100644 index 00000000..c31de8c7 --- /dev/null +++ b/src/data/maps/tiles/gb/japanese_title_screen_2.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/gb/laboratory.dimensions b/src/data/maps/tiles/gb/laboratory.dimensions new file mode 100644 index 00000000..78682ddc --- /dev/null +++ b/src/data/maps/tiles/gb/laboratory.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/gb/lightning_club.dimensions b/src/data/maps/tiles/gb/lightning_club.dimensions new file mode 100644 index 00000000..3eb40bb1 --- /dev/null +++ b/src/data/maps/tiles/gb/lightning_club.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/gb/lightning_club_entrance.dimensions b/src/data/maps/tiles/gb/lightning_club_entrance.dimensions new file mode 100644 index 00000000..c31de8c7 --- /dev/null +++ b/src/data/maps/tiles/gb/lightning_club_entrance.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/gb/mason_laboratory.dimensions b/src/data/maps/tiles/gb/mason_laboratory.dimensions new file mode 100644 index 00000000..959ba312 --- /dev/null +++ b/src/data/maps/tiles/gb/mason_laboratory.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/gb/mystery.dimensions b/src/data/maps/tiles/gb/mystery.dimensions new file mode 100644 index 00000000..78682ddc --- /dev/null +++ b/src/data/maps/tiles/gb/mystery.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/gb/nintendo.dimensions b/src/data/maps/tiles/gb/nintendo.dimensions new file mode 100644 index 00000000..c31de8c7 --- /dev/null +++ b/src/data/maps/tiles/gb/nintendo.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/gb/opponent.dimensions b/src/data/maps/tiles/gb/opponent.dimensions new file mode 100644 index 00000000..5c4b3b87 --- /dev/null +++ b/src/data/maps/tiles/gb/opponent.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/gb/overworld_map.dimensions b/src/data/maps/tiles/gb/overworld_map.dimensions new file mode 100644 index 00000000..c31de8c7 --- /dev/null +++ b/src/data/maps/tiles/gb/overworld_map.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/gb/player.dimensions b/src/data/maps/tiles/gb/player.dimensions new file mode 100644 index 00000000..5c4b3b87 --- /dev/null +++ b/src/data/maps/tiles/gb/player.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/gb/pokemon_dome.dimensions b/src/data/maps/tiles/gb/pokemon_dome.dimensions new file mode 100644 index 00000000..136d0638 --- /dev/null +++ b/src/data/maps/tiles/gb/pokemon_dome.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/gb/pokemon_dome_door_map_event.dimensions b/src/data/maps/tiles/gb/pokemon_dome_door_map_event.dimensions new file mode 100644 index 00000000..6bebb85a --- /dev/null +++ b/src/data/maps/tiles/gb/pokemon_dome_door_map_event.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/gb/pokemon_dome_entrance.dimensions b/src/data/maps/tiles/gb/pokemon_dome_entrance.dimensions new file mode 100644 index 00000000..c1c711a1 --- /dev/null +++ b/src/data/maps/tiles/gb/pokemon_dome_entrance.dimensions @@ -0,0 +1 @@ +  \ No newline at end of file diff --git a/src/data/maps/tiles/gb/psychic_club.dimensions b/src/data/maps/tiles/gb/psychic_club.dimensions new file mode 100644 index 00000000..0bc92d84 --- /dev/null +++ b/src/data/maps/tiles/gb/psychic_club.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/gb/psychic_club_entrance.dimensions b/src/data/maps/tiles/gb/psychic_club_entrance.dimensions new file mode 100644 index 00000000..c31de8c7 --- /dev/null +++ b/src/data/maps/tiles/gb/psychic_club_entrance.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/gb/rock_club.dimensions b/src/data/maps/tiles/gb/rock_club.dimensions new file mode 100644 index 00000000..959ba312 --- /dev/null +++ b/src/data/maps/tiles/gb/rock_club.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/gb/rock_club_entrance.dimensions b/src/data/maps/tiles/gb/rock_club_entrance.dimensions new file mode 100644 index 00000000..c31de8c7 --- /dev/null +++ b/src/data/maps/tiles/gb/rock_club_entrance.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/gb/science_club.dimensions b/src/data/maps/tiles/gb/science_club.dimensions new file mode 100644 index 00000000..3eb40bb1 --- /dev/null +++ b/src/data/maps/tiles/gb/science_club.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/gb/science_club_entrance.dimensions b/src/data/maps/tiles/gb/science_club_entrance.dimensions new file mode 100644 index 00000000..c31de8c7 --- /dev/null +++ b/src/data/maps/tiles/gb/science_club_entrance.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/gb/scyther_intro.dimensions b/src/data/maps/tiles/gb/scyther_intro.dimensions new file mode 100644 index 00000000..78682ddc --- /dev/null +++ b/src/data/maps/tiles/gb/scyther_intro.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/gb/title_screen.dimensions b/src/data/maps/tiles/gb/title_screen.dimensions new file mode 100644 index 00000000..c31de8c7 --- /dev/null +++ b/src/data/maps/tiles/gb/title_screen.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/gb/water_club.dimensions b/src/data/maps/tiles/gb/water_club.dimensions new file mode 100644 index 00000000..3eb40bb1 --- /dev/null +++ b/src/data/maps/tiles/gb/water_club.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/gb/water_club_entrance.dimensions b/src/data/maps/tiles/gb/water_club_entrance.dimensions new file mode 100644 index 00000000..c31de8c7 --- /dev/null +++ b/src/data/maps/tiles/gb/water_club_entrance.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/gfx.asm b/src/gfx.asm index c1ad25fc..a5f449a3 100644 --- a/src/gfx.asm +++ b/src/gfx.asm @@ -44,8 +44,7 @@ INCBIN "gfx/duel/box_messages.2bpp" SECTION "Gfx 3", ROMX WaterClubTilemap:: - db $1c ; width - db $20 ; height + INCBIN "data/maps/tiles/gb/water_club.dimensions" dw WaterClubPermissions db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/water_club.bin.lz" @@ -53,17 +52,15 @@ WaterClubPermissions: INCBIN "data/maps/permissions/cgb/water_club.bin.lz" WaterClubCGBTilemap:: - db $1c ; width - db $20 ; height + INCBIN "data/maps/tiles/cgb/water_club.dimensions" dw WaterClubCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/cgb/water_club.bin.lz" + INCBIN "data/maps/tiles/cgb/water_club.bgmap.lz" WaterClubCGBPermissions: INCBIN "data/maps/permissions/cgb/water_club.bin.lz" LightningClubTilemap:: - db $1c ; width - db $20 ; height + INCBIN "data/maps/tiles/gb/lightning_club.dimensions" dw LightningClubPermissions db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/lightning_club.bin.lz" @@ -71,17 +68,15 @@ LightningClubPermissions: INCBIN "data/maps/permissions/cgb/lightning_club.bin.lz" LightningClubCGBTilemap:: - db $1c ; width - db $20 ; height + INCBIN "data/maps/tiles/cgb/lightning_club.dimensions" dw LightningClubCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/cgb/lightning_club.bin.lz" + INCBIN "data/maps/tiles/cgb/lightning_club.bgmap.lz" LightningClubCGBPermissions: INCBIN "data/maps/permissions/cgb/lightning_club.bin.lz" GrassClubTilemap:: - db $1c ; width - db $20 ; height + INCBIN "data/maps/tiles/gb/grass_club.dimensions" dw GrassClubPermissions db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/grass_club.bin.lz" @@ -89,17 +84,15 @@ GrassClubPermissions: INCBIN "data/maps/permissions/cgb/grass_club.bin.lz" GrassClubCGBTilemap:: - db $1c ; width - db $20 ; height + INCBIN "data/maps/tiles/cgb/grass_club.dimensions" dw GrassClubCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/cgb/grass_club.bin.lz" + INCBIN "data/maps/tiles/cgb/grass_club.bgmap.lz" GrassClubCGBPermissions: INCBIN "data/maps/permissions/cgb/grass_club.bin.lz" PsychicClubTilemap:: - db $1c ; width - db $1c ; height + INCBIN "data/maps/tiles/gb/psychic_club.dimensions" dw PsychicClubPermissions db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/psychic_club.bin.lz" @@ -107,17 +100,15 @@ PsychicClubPermissions: INCBIN "data/maps/permissions/cgb/psychic_club.bin.lz" PsychicClubCGBTilemap:: - db $1c ; width - db $1c ; height + INCBIN "data/maps/tiles/cgb/psychic_club.dimensions" dw PsychicClubCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/cgb/psychic_club.bin.lz" + INCBIN "data/maps/tiles/cgb/psychic_club.bgmap.lz" PsychicClubCGBPermissions: INCBIN "data/maps/permissions/cgb/psychic_club.bin.lz" ScienceClubTilemap:: - db $1c ; width - db $20 ; height + INCBIN "data/maps/tiles/gb/science_club.dimensions" dw ScienceClubPermissions db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/science_club.bin.lz" @@ -125,17 +116,15 @@ ScienceClubPermissions: INCBIN "data/maps/permissions/cgb/science_club.bin.lz" ScienceClubCGBTilemap:: - db $1c ; width - db $20 ; height + INCBIN "data/maps/tiles/cgb/science_club.dimensions" dw ScienceClubCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/cgb/science_club.bin.lz" + INCBIN "data/maps/tiles/cgb/science_club.bgmap.lz" ScienceClubCGBPermissions: INCBIN "data/maps/permissions/cgb/science_club.bin.lz" FireClubTilemap:: - db $1c ; width - db $20 ; height + INCBIN "data/maps/tiles/gb/fire_club.dimensions" dw FireClubPermissions db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/fire_club.bin.lz" @@ -143,17 +132,15 @@ FireClubPermissions: INCBIN "data/maps/permissions/cgb/fire_club.bin.lz" FireClubCGBTilemap:: - db $1c ; width - db $20 ; height + INCBIN "data/maps/tiles/cgb/fire_club.dimensions" dw FireClubCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/cgb/fire_club.bin.lz" + INCBIN "data/maps/tiles/cgb/fire_club.bgmap.lz" FireClubCGBPermissions: INCBIN "data/maps/permissions/cgb/fire_club.bin.lz" ChallengeHallTilemap:: - db $20 ; width - db $20 ; height + INCBIN "data/maps/tiles/gb/challenge_hall.dimensions" dw ChallengeHallPermissions db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/challenge_hall.bin.lz" @@ -161,17 +148,15 @@ ChallengeHallPermissions: INCBIN "data/maps/permissions/cgb/challenge_hall.bin.lz" ChallengeHallCGBTilemap:: - db $20 ; width - db $20 ; height + INCBIN "data/maps/tiles/cgb/challenge_hall.dimensions" dw ChallengeHallCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/cgb/challenge_hall.bin.lz" + INCBIN "data/maps/tiles/cgb/challenge_hall.bgmap.lz" ChallengeHallCGBPermissions: INCBIN "data/maps/permissions/cgb/challenge_hall.bin.lz" PokemonDomeEntranceTilemap:: - db $20 ; width - db $12 ; height + INCBIN "data/maps/tiles/gb/pokemon_dome_entrance.dimensions" dw PokemonDomeEntrancePermissions db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/pokemon_dome_entrance.bin.lz" @@ -179,17 +164,15 @@ PokemonDomeEntrancePermissions: INCBIN "data/maps/permissions/cgb/pokemon_dome_entrance.bin.lz" PokemonDomeEntranceCGBTilemap:: - db $20 ; width - db $12 ; height + INCBIN "data/maps/tiles/cgb/pokemon_dome_entrance.dimensions" dw PokemonDomeEntranceCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/cgb/pokemon_dome_entrance.bin.lz" + INCBIN "data/maps/tiles/cgb/pokemon_dome_entrance.bgmap.lz" PokemonDomeEntranceCGBPermissions: INCBIN "data/maps/permissions/cgb/pokemon_dome_entrance.bin.lz" PokemonDomeTilemap:: - db $20 ; width - db $20 ; height + INCBIN "data/maps/tiles/gb/pokemon_dome.dimensions" dw PokemonDomePermissions db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/pokemon_dome.bin.lz" @@ -197,17 +180,15 @@ PokemonDomePermissions: INCBIN "data/maps/permissions/cgb/pokemon_dome.bin.lz" PokemonDomeCGBTilemap:: - db $20 ; width - db $20 ; height + INCBIN "data/maps/tiles/cgb/pokemon_dome.dimensions" dw PokemonDomeCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/cgb/pokemon_dome.bin.lz" + INCBIN "data/maps/tiles/cgb/pokemon_dome.bgmap.lz" PokemonDomeCGBPermissions: INCBIN "data/maps/permissions/cgb/pokemon_dome.bin.lz" HallOfHonorTilemap:: - db $18 ; width - db $1a ; height + INCBIN "data/maps/tiles/gb/hall_of_honor.dimensions" dw HallOfHonorPermissions db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/hall_of_honor.bin.lz" @@ -215,325 +196,279 @@ HallOfHonorPermissions: INCBIN "data/maps/permissions/cgb/hall_of_honor.bin.lz" HallOfHonorCGBTilemap:: - db $18 ; width - db $1a ; height + INCBIN "data/maps/tiles/cgb/hall_of_honor.dimensions" dw HallOfHonorCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/cgb/hall_of_honor.bin.lz" + INCBIN "data/maps/tiles/cgb/hall_of_honor.bgmap.lz" HallOfHonorCGBPermissions: INCBIN "data/maps/permissions/cgb/hall_of_honor.bin.lz" CardPopCGBTilemap:: - db $14 ; width - db $12 ; height + INCBIN "data/maps/tiles/cgb/card_pop.dimensions" dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/cgb/card_pop.bin.lz" + INCBIN "data/maps/tiles/cgb/card_pop.bgmap.lz" CardPopTilemap:: - db $14 ; width - db $12 ; height + INCBIN "data/maps/tiles/cgb/card_pop_noncgb.dimensions" dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/gb/card_pop.bin.lz" + INCBIN "data/maps/tiles/cgb/card_pop_noncgb.bgmap.lz" ScienceMedalTilemap:: - db $03 ; width - db $03 ; height + INCBIN "data/maps/tiles/cgb/science_medal.dimensions" dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/gb/science_medal.bin.lz" + INCBIN "data/maps/tiles/cgb/science_medal.bgmap.lz" FireMedalTilemap:: - db $03 ; width - db $03 ; height + INCBIN "data/maps/tiles/cgb/fire_medal.dimensions" dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/gb/fire_medal.bin.lz" + INCBIN "data/maps/tiles/cgb/fire_medal.bgmap.lz" WaterMedalTilemap:: - db $03 ; width - db $03 ; height + INCBIN "data/maps/tiles/cgb/water_medal.dimensions" dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/gb/water_medal.bin.lz" + INCBIN "data/maps/tiles/cgb/water_medal.bgmap.lz" LightningMedalTilemap:: - db $03 ; width - db $03 ; height + INCBIN "data/maps/tiles/cgb/lightning_medal.dimensions" dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/gb/lightning_medal.bin.lz" + INCBIN "data/maps/tiles/cgb/lightning_medal.bgmap.lz" FightingMedalTilemap:: - db $03 ; width - db $03 ; height + INCBIN "data/maps/tiles/cgb/fighting_medal.dimensions" dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/gb/fighting_medal.bin.lz" + INCBIN "data/maps/tiles/cgb/fighting_medal.bgmap.lz" RockMedalTilemap:: - db $03 ; width - db $03 ; height + INCBIN "data/maps/tiles/cgb/rock_medal.dimensions" dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/gb/rock_medal.bin.lz" + INCBIN "data/maps/tiles/cgb/rock_medal.bgmap.lz" PsychicMedalTilemap:: - db $03 ; width - db $03 ; height + INCBIN "data/maps/tiles/cgb/psychic_medal.dimensions" dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/gb/psychic_medal.bin.lz" + INCBIN "data/maps/tiles/cgb/psychic_medal.bgmap.lz" GameBoyLinkCGBTilemap:: - db $14 ; width - db $12 ; height + INCBIN "data/maps/tiles/cgb/gameboy_link.dimensions" dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/cgb/gameboy_link.bin.lz" + INCBIN "data/maps/tiles/cgb/gameboy_link.bgmap.lz" GameBoyLinkTilemap:: - db $14 ; width - db $12 ; height + INCBIN "data/maps/tiles/gb/gameboy_link.dimensions" dw NULL db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/gameboy_link.bin.lz" GameBoyLinkConnectingCGBTilemap:: - db $14 ; width - db $12 ; height + INCBIN "data/maps/tiles/cgb/gameboy_link_connecting.dimensions" dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/cgb/gameboy_link_connecting.bin.lz" + INCBIN "data/maps/tiles/cgb/gameboy_link_connecting.bgmap.lz" GameBoyLinkConnectingTilemap:: - db $14 ; width - db $12 ; height + INCBIN "data/maps/tiles/gb/gameboy_link_connecting.dimensions" dw NULL db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/gameboy_link_connecting.bin.lz" GameBoyPrinterCGBTilemap:: - db $14 ; width - db $12 ; height + INCBIN "data/maps/tiles/cgb/gameboy_printer.dimensions" dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/cgb/gameboy_printer.bin.lz" + INCBIN "data/maps/tiles/cgb/gameboy_printer.bgmap.lz" GameBoyPrinterTilemap:: - db $14 ; width - db $12 ; height + INCBIN "data/maps/tiles/gb/gameboy_printer.dimensions" dw NULL db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/gameboy_printer.bin.lz" ColosseumTilemap:: - db $08 ; width - db $0c ; height + INCBIN "data/maps/tiles/gb/colosseum.dimensions" dw NULL db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/colosseum.bin.lz" ColosseumCGBTilemap:: - db $08 ; width - db $0c ; height + INCBIN "data/maps/tiles/cgb/colosseum.dimensions" dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/cgb/colosseum.bin.lz" + INCBIN "data/maps/tiles/cgb/colosseum.bgmap.lz" EvolutionTilemap:: - db $08 ; width - db $0c ; height + INCBIN "data/maps/tiles/gb/evolution.dimensions" dw NULL db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/evolution.bin.lz" EvolutionCGBTilemap:: - db $08 ; width - db $0c ; height + INCBIN "data/maps/tiles/cgb/evolution.dimensions" dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/cgb/evolution.bin.lz" + INCBIN "data/maps/tiles/cgb/evolution.bgmap.lz" MysteryTilemap:: - db $08 ; width - db $0c ; height + INCBIN "data/maps/tiles/gb/mystery.dimensions" dw NULL db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/mystery.bin.lz" MysteryCGBTilemap:: - db $08 ; width - db $0c ; height + INCBIN "data/maps/tiles/cgb/mystery.dimensions" dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/cgb/mystery.bin.lz" + INCBIN "data/maps/tiles/cgb/mystery.bgmap.lz" LaboratoryTilemap:: - db $08 ; width - db $0c ; height + INCBIN "data/maps/tiles/gb/laboratory.dimensions" dw NULL db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/laboratory.bin.lz" LaboratoryCGBTilemap:: - db $08 ; width - db $0c ; height + INCBIN "data/maps/tiles/cgb/laboratory.dimensions" dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/cgb/laboratory.bin.lz" + INCBIN "data/maps/tiles/cgb/laboratory.bgmap.lz" CharizardIntroTilemap:: - db $08 ; width - db $0c ; height + INCBIN "data/maps/tiles/gb/charizard_intro.dimensions" dw NULL db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/charizard_intro.bin.lz" CharizardIntroCGBTilemap:: - db $08 ; width - db $0c ; height + INCBIN "data/maps/tiles/cgb/charizard_intro.dimensions" dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/cgb/charizard_intro.bin.lz" + INCBIN "data/maps/tiles/cgb/charizard_intro.bgmap.lz" ScytherIntroTilemap:: - db $08 ; width - db $0c ; height + INCBIN "data/maps/tiles/gb/scyther_intro.dimensions" dw NULL db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/scyther_intro.bin.lz" ScytherIntroCGBTilemap:: - db $08 ; width - db $0c ; height + INCBIN "data/maps/tiles/cgb/scyther_intro.dimensions" dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/cgb/scyther_intro.bin.lz" + INCBIN "data/maps/tiles/cgb/scyther_intro.bgmap.lz" AerodactylIntroTilemap:: - db $08 ; width - db $0c ; height + INCBIN "data/maps/tiles/gb/aerodactyl_intro.dimensions" dw NULL db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/aerodactyl_intro.bin.lz" AerodactylIntroCGBTilemap:: - db $08 ; width - db $0c ; height + INCBIN "data/maps/tiles/cgb/aerodactyl_intro.dimensions" dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/cgb/aerodactyl_intro.bin.lz" + INCBIN "data/maps/tiles/cgb/aerodactyl_intro.bgmap.lz" JapaneseTitleScreenTilemap:: - db $14 ; width - db $12 ; height + INCBIN "data/maps/tiles/gb/japanese_title_screen.dimensions" dw NULL db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/japanese_title_screen.bin.lz" JapaneseTitleScreenCGBTilemap:: - db $14 ; width - db $12 ; height + INCBIN "data/maps/tiles/cgb/japanese_title_screen.dimensions" dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/cgb/japanese_title_screen.bin.lz" + INCBIN "data/maps/tiles/cgb/japanese_title_screen.bgmap.lz" SolidTiles1Tilemap:: - db $14 ; width - db $12 ; height + INCBIN "data/maps/tiles/cgb/solid_tiles_1.dimensions" dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/gb/solid_tiles_1.bin.lz" + INCBIN "data/maps/tiles/cgb/solid_tiles_1.bgmap.lz" SolidTiles2Tilemap:: - db $14 ; width - db $12 ; height + INCBIN "data/maps/tiles/cgb/solid_tiles_2.dimensions" dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/gb/solid_tiles_2.bin.lz" + INCBIN "data/maps/tiles/cgb/solid_tiles_2.bgmap.lz" SolidTiles3Tilemap:: - db $14 ; width - db $12 ; height + INCBIN "data/maps/tiles/cgb/solid_tiles_3.dimensions" dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/gb/solid_tiles_3.bin.lz" + INCBIN "data/maps/tiles/cgb/solid_tiles_3.bgmap.lz" JapaneseTitleScreen2Tilemap:: - db $14 ; width - db $12 ; height + INCBIN "data/maps/tiles/gb/japanese_title_screen_2.dimensions" dw NULL db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/japanese_title_screen_2.bin.lz" JapaneseTitleScreen2CGBTilemap:: - db $14 ; width - db $12 ; height + INCBIN "data/maps/tiles/cgb/japanese_title_screen_2.dimensions" dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/cgb/japanese_title_screen_2.bin.lz" + INCBIN "data/maps/tiles/cgb/japanese_title_screen_2.bgmap.lz" SolidTiles4Tilemap:: - db $08 ; width - db $04 ; height + INCBIN "data/maps/tiles/cgb/solid_tiles_4.dimensions" dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/gb/solid_tiles_4.bin.lz" + INCBIN "data/maps/tiles/cgb/solid_tiles_4.bgmap.lz" PlayerTilemap:: - db $06 ; width - db $06 ; height + INCBIN "data/maps/tiles/gb/player.dimensions" dw NULL db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/player.bin.lz" OpponentTilemap:: - db $06 ; width - db $06 ; height + INCBIN "data/maps/tiles/gb/opponent.dimensions" dw NULL db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/opponent.bin.lz" TitleScreenTilemap:: - db $14 ; width - db $12 ; height + INCBIN "data/maps/tiles/gb/title_screen.dimensions" dw NULL db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/title_screen.bin.lz" TitleScreenCGBTilemap:: - db $14 ; width - db $12 ; height + INCBIN "data/maps/tiles/cgb/title_screen.dimensions" dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/cgb/title_screen.bin.lz" + INCBIN "data/maps/tiles/cgb/title_screen.bgmap.lz" CopyrightTilemap:: - db $14 ; width - db $12 ; height + INCBIN "data/maps/tiles/gb/copyright.dimensions" dw NULL db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/copyright.bin.lz" CopyrightCGBTilemap:: - db $14 ; width - db $12 ; height + INCBIN "data/maps/tiles/cgb/copyright.dimensions" dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/cgb/copyright.bin.lz" + INCBIN "data/maps/tiles/cgb/copyright.bgmap.lz" NintendoTilemap:: - db $14 ; width - db $12 ; height + INCBIN "data/maps/tiles/gb/nintendo.dimensions" dw NULL db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/nintendo.bin.lz" CompaniesTilemap:: - db $14 ; width - db $12 ; height + INCBIN "data/maps/tiles/gb/companies.dimensions" dw NULL db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/companies.bin.lz" From a2eea69b6e96f61d69f230234cbd8bed147f78d5 Mon Sep 17 00:00:00 2001 From: ElectroDeoxys Date: Tue, 7 Nov 2023 17:37:28 +0000 Subject: [PATCH 3/7] Add bgmap tool to generate *bgmap files --- .gitignore | 3 + Makefile | 6 +- .../maps/tiles/cgb/aerodactyl_intro.bgmap | Bin 192 -> 0 bytes src/data/maps/tiles/cgb/aerodactyl_intro.bin | Bin 0 -> 192 bytes src/data/maps/tiles/cgb/card_pop.bgmap | Bin 720 -> 0 bytes src/data/maps/tiles/cgb/card_pop.bin | Bin 0 -> 720 bytes src/data/maps/tiles/cgb/card_pop_noncgb.bgmap | Bin 720 -> 0 bytes src/data/maps/tiles/cgb/card_pop_noncgb.bin | Bin 0 -> 720 bytes src/data/maps/tiles/cgb/challenge_hall.bgmap | Bin 2048 -> 0 bytes src/data/maps/tiles/cgb/challenge_hall.bin | Bin 0 -> 2048 bytes .../tiles/cgb/challenge_hall_entrance.bgmap | Bin 720 -> 0 bytes .../tiles/cgb/challenge_hall_entrance.bin | Bin 0 -> 720 bytes .../cgb/challenge_machine_map_event.bgmap | 1 - .../tiles/cgb/challenge_machine_map_event.bin | 1 + src/data/maps/tiles/cgb/charizard_intro.bgmap | Bin 192 -> 0 bytes src/data/maps/tiles/cgb/charizard_intro.bin | Bin 0 -> 192 bytes src/data/maps/tiles/cgb/club_lobby.bgmap | 1 - src/data/maps/tiles/cgb/club_lobby.bin | 1 + src/data/maps/tiles/cgb/colosseum.bgmap | Bin 192 -> 0 bytes src/data/maps/tiles/cgb/colosseum.bin | Bin 0 -> 192 bytes .../cgb/{copyright.bgmap => copyright.bin} | Bin 720 -> 720 bytes .../tiles/cgb/deck_machine_map_event.bgmap | 1 - .../maps/tiles/cgb/deck_machine_map_event.bin | 1 + .../maps/tiles/cgb/deck_machine_room.bgmap | 1 - src/data/maps/tiles/cgb/deck_machine_room.bin | 1 + src/data/maps/tiles/cgb/evolution.bgmap | Bin 192 -> 0 bytes src/data/maps/tiles/cgb/evolution.bin | Bin 0 -> 192 bytes src/data/maps/tiles/cgb/fighting_club.bgmap | Bin 864 -> 0 bytes src/data/maps/tiles/cgb/fighting_club.bin | Bin 0 -> 864 bytes .../tiles/cgb/fighting_club_entrance.bgmap | Bin 720 -> 0 bytes .../maps/tiles/cgb/fighting_club_entrance.bin | Bin 0 -> 720 bytes src/data/maps/tiles/cgb/fighting_medal.bgmap | 1 - src/data/maps/tiles/cgb/fighting_medal.bin | 1 + src/data/maps/tiles/cgb/fire_club.bgmap | 1 - src/data/maps/tiles/cgb/fire_club.bin | 1 + .../maps/tiles/cgb/fire_club_entrance.bgmap | Bin 720 -> 0 bytes .../maps/tiles/cgb/fire_club_entrance.bin | Bin 0 -> 720 bytes src/data/maps/tiles/cgb/fire_medal.bgmap | 1 - src/data/maps/tiles/cgb/fire_medal.bin | 1 + src/data/maps/tiles/cgb/gameboy_link.bgmap | Bin 720 -> 0 bytes src/data/maps/tiles/cgb/gameboy_link.bin | Bin 0 -> 720 bytes .../tiles/cgb/gameboy_link_connecting.bgmap | Bin 720 -> 0 bytes .../tiles/cgb/gameboy_link_connecting.bin | Bin 0 -> 720 bytes src/data/maps/tiles/cgb/gameboy_printer.bgmap | Bin 720 -> 0 bytes src/data/maps/tiles/cgb/gameboy_printer.bin | Bin 0 -> 720 bytes src/data/maps/tiles/cgb/grass_club.bgmap | Bin 1792 -> 0 bytes src/data/maps/tiles/cgb/grass_club.bin | Bin 0 -> 1792 bytes .../maps/tiles/cgb/grass_club_entrance.bgmap | Bin 720 -> 0 bytes .../maps/tiles/cgb/grass_club_entrance.bin | Bin 0 -> 720 bytes src/data/maps/tiles/cgb/grass_medal.bgmap | 1 - src/data/maps/tiles/cgb/grass_medal.bin | 1 + src/data/maps/tiles/cgb/hall_of_honor.bgmap | 1 - src/data/maps/tiles/cgb/hall_of_honor.bin | 1 + .../cgb/hall_of_honor_door_map_event.bgmap | 1 - .../cgb/hall_of_honor_door_map_event.bin | 1 + src/data/maps/tiles/cgb/ishihara.bgmap | 1 - src/data/maps/tiles/cgb/ishihara.bin | 1 + .../tiles/cgb/japanese_title_screen.bgmap | 1 - .../maps/tiles/cgb/japanese_title_screen.bin | 1 + .../tiles/cgb/japanese_title_screen_2.bgmap | Bin 720 -> 0 bytes .../tiles/cgb/japanese_title_screen_2.bin | Bin 0 -> 720 bytes src/data/maps/tiles/cgb/laboratory.bgmap | Bin 192 -> 0 bytes src/data/maps/tiles/cgb/laboratory.bin | Bin 0 -> 192 bytes src/data/maps/tiles/cgb/lightning_club.bgmap | Bin 1792 -> 0 bytes src/data/maps/tiles/cgb/lightning_club.bin | Bin 0 -> 1792 bytes .../tiles/cgb/lightning_club_entrance.bgmap | Bin 720 -> 0 bytes .../tiles/cgb/lightning_club_entrance.bin | Bin 0 -> 720 bytes src/data/maps/tiles/cgb/lightning_medal.bgmap | 1 - src/data/maps/tiles/cgb/lightning_medal.bin | 1 + .../maps/tiles/cgb/mason_laboratory.bgmap | 1 - src/data/maps/tiles/cgb/mason_laboratory.bin | 1 + src/data/maps/tiles/cgb/mystery.bgmap | Bin 192 -> 0 bytes src/data/maps/tiles/cgb/mystery.bin | Bin 0 -> 192 bytes src/data/maps/tiles/cgb/overworld_map.bgmap | Bin 720 -> 0 bytes src/data/maps/tiles/cgb/overworld_map.bin | Bin 0 -> 720 bytes src/data/maps/tiles/cgb/pokemon_dome.bgmap | Bin 2048 -> 0 bytes src/data/maps/tiles/cgb/pokemon_dome.bin | Bin 0 -> 2048 bytes .../cgb/pokemon_dome_door_map_event.bgmap | 1 - .../tiles/cgb/pokemon_dome_door_map_event.bin | 1 + .../tiles/cgb/pokemon_dome_entrance.bgmap | 1 - .../maps/tiles/cgb/pokemon_dome_entrance.bin | 1 + src/data/maps/tiles/cgb/psychic_club.bgmap | 1 - src/data/maps/tiles/cgb/psychic_club.bin | 1 + .../tiles/cgb/psychic_club_entrance.bgmap | Bin 720 -> 0 bytes .../maps/tiles/cgb/psychic_club_entrance.bin | Bin 0 -> 720 bytes src/data/maps/tiles/cgb/psychic_medal.bgmap | 1 - src/data/maps/tiles/cgb/psychic_medal.bin | 1 + src/data/maps/tiles/cgb/rock_club.bgmap | 1 - src/data/maps/tiles/cgb/rock_club.bin | 1 + .../maps/tiles/cgb/rock_club_entrance.bgmap | Bin 720 -> 0 bytes .../maps/tiles/cgb/rock_club_entrance.bin | Bin 0 -> 720 bytes src/data/maps/tiles/cgb/rock_medal.bgmap | 1 - src/data/maps/tiles/cgb/rock_medal.bin | 1 + src/data/maps/tiles/cgb/science_club.bgmap | 1 - src/data/maps/tiles/cgb/science_club.bin | 1 + .../tiles/cgb/science_club_entrance.bgmap | Bin 720 -> 0 bytes .../maps/tiles/cgb/science_club_entrance.bin | Bin 0 -> 720 bytes src/data/maps/tiles/cgb/science_medal.bgmap | 1 - src/data/maps/tiles/cgb/science_medal.bin | 1 + src/data/maps/tiles/cgb/scyther_intro.bgmap | Bin 192 -> 0 bytes src/data/maps/tiles/cgb/scyther_intro.bin | Bin 0 -> 192 bytes src/data/maps/tiles/cgb/solid_tiles_1.bgmap | Bin 720 -> 0 bytes src/data/maps/tiles/cgb/solid_tiles_1.bin | Bin 0 -> 720 bytes src/data/maps/tiles/cgb/solid_tiles_2.bgmap | Bin 720 -> 0 bytes src/data/maps/tiles/cgb/solid_tiles_2.bin | Bin 0 -> 720 bytes src/data/maps/tiles/cgb/solid_tiles_3.bgmap | Bin 720 -> 0 bytes src/data/maps/tiles/cgb/solid_tiles_3.bin | Bin 0 -> 720 bytes src/data/maps/tiles/cgb/solid_tiles_4.bgmap | 5 - src/data/maps/tiles/cgb/solid_tiles_4.bin | 5 + src/data/maps/tiles/cgb/title_screen.bgmap | Bin 720 -> 0 bytes src/data/maps/tiles/cgb/title_screen.bin | Bin 0 -> 720 bytes src/data/maps/tiles/cgb/water_club.bgmap | Bin 1792 -> 0 bytes src/data/maps/tiles/cgb/water_club.bin | Bin 0 -> 1792 bytes .../maps/tiles/cgb/water_club_entrance.bgmap | Bin 720 -> 0 bytes .../maps/tiles/cgb/water_club_entrance.bin | Bin 0 -> 720 bytes src/data/maps/tiles/cgb/water_medal.bgmap | 1 - src/data/maps/tiles/cgb/water_medal.bin | 1 + tools/.gitignore | 1 + tools/Makefile | 2 +- tools/bgmap.c | 116 ++++++++++++++++++ 120 files changed, 154 insertions(+), 30 deletions(-) delete mode 100644 src/data/maps/tiles/cgb/aerodactyl_intro.bgmap create mode 100644 src/data/maps/tiles/cgb/aerodactyl_intro.bin delete mode 100644 src/data/maps/tiles/cgb/card_pop.bgmap create mode 100644 src/data/maps/tiles/cgb/card_pop.bin delete mode 100644 src/data/maps/tiles/cgb/card_pop_noncgb.bgmap create mode 100644 src/data/maps/tiles/cgb/card_pop_noncgb.bin delete mode 100644 src/data/maps/tiles/cgb/challenge_hall.bgmap create mode 100644 src/data/maps/tiles/cgb/challenge_hall.bin delete mode 100644 src/data/maps/tiles/cgb/challenge_hall_entrance.bgmap create mode 100644 src/data/maps/tiles/cgb/challenge_hall_entrance.bin delete mode 100644 src/data/maps/tiles/cgb/challenge_machine_map_event.bgmap create mode 100644 src/data/maps/tiles/cgb/challenge_machine_map_event.bin delete mode 100644 src/data/maps/tiles/cgb/charizard_intro.bgmap create mode 100644 src/data/maps/tiles/cgb/charizard_intro.bin delete mode 100644 src/data/maps/tiles/cgb/club_lobby.bgmap create mode 100644 src/data/maps/tiles/cgb/club_lobby.bin delete mode 100644 src/data/maps/tiles/cgb/colosseum.bgmap create mode 100644 src/data/maps/tiles/cgb/colosseum.bin rename src/data/maps/tiles/cgb/{copyright.bgmap => copyright.bin} (53%) delete mode 100644 src/data/maps/tiles/cgb/deck_machine_map_event.bgmap create mode 100644 src/data/maps/tiles/cgb/deck_machine_map_event.bin delete mode 100644 src/data/maps/tiles/cgb/deck_machine_room.bgmap create mode 100644 src/data/maps/tiles/cgb/deck_machine_room.bin delete mode 100644 src/data/maps/tiles/cgb/evolution.bgmap create mode 100644 src/data/maps/tiles/cgb/evolution.bin delete mode 100644 src/data/maps/tiles/cgb/fighting_club.bgmap create mode 100644 src/data/maps/tiles/cgb/fighting_club.bin delete mode 100644 src/data/maps/tiles/cgb/fighting_club_entrance.bgmap create mode 100644 src/data/maps/tiles/cgb/fighting_club_entrance.bin delete mode 100644 src/data/maps/tiles/cgb/fighting_medal.bgmap create mode 100644 src/data/maps/tiles/cgb/fighting_medal.bin delete mode 100644 src/data/maps/tiles/cgb/fire_club.bgmap create mode 100644 src/data/maps/tiles/cgb/fire_club.bin delete mode 100644 src/data/maps/tiles/cgb/fire_club_entrance.bgmap create mode 100644 src/data/maps/tiles/cgb/fire_club_entrance.bin delete mode 100644 src/data/maps/tiles/cgb/fire_medal.bgmap create mode 100644 src/data/maps/tiles/cgb/fire_medal.bin delete mode 100644 src/data/maps/tiles/cgb/gameboy_link.bgmap create mode 100644 src/data/maps/tiles/cgb/gameboy_link.bin delete mode 100644 src/data/maps/tiles/cgb/gameboy_link_connecting.bgmap create mode 100644 src/data/maps/tiles/cgb/gameboy_link_connecting.bin delete mode 100644 src/data/maps/tiles/cgb/gameboy_printer.bgmap create mode 100644 src/data/maps/tiles/cgb/gameboy_printer.bin delete mode 100644 src/data/maps/tiles/cgb/grass_club.bgmap create mode 100644 src/data/maps/tiles/cgb/grass_club.bin delete mode 100644 src/data/maps/tiles/cgb/grass_club_entrance.bgmap create mode 100644 src/data/maps/tiles/cgb/grass_club_entrance.bin delete mode 100644 src/data/maps/tiles/cgb/grass_medal.bgmap create mode 100644 src/data/maps/tiles/cgb/grass_medal.bin delete mode 100644 src/data/maps/tiles/cgb/hall_of_honor.bgmap create mode 100644 src/data/maps/tiles/cgb/hall_of_honor.bin delete mode 100644 src/data/maps/tiles/cgb/hall_of_honor_door_map_event.bgmap create mode 100644 src/data/maps/tiles/cgb/hall_of_honor_door_map_event.bin delete mode 100644 src/data/maps/tiles/cgb/ishihara.bgmap create mode 100644 src/data/maps/tiles/cgb/ishihara.bin delete mode 100644 src/data/maps/tiles/cgb/japanese_title_screen.bgmap create mode 100644 src/data/maps/tiles/cgb/japanese_title_screen.bin delete mode 100644 src/data/maps/tiles/cgb/japanese_title_screen_2.bgmap create mode 100644 src/data/maps/tiles/cgb/japanese_title_screen_2.bin delete mode 100644 src/data/maps/tiles/cgb/laboratory.bgmap create mode 100644 src/data/maps/tiles/cgb/laboratory.bin delete mode 100644 src/data/maps/tiles/cgb/lightning_club.bgmap create mode 100644 src/data/maps/tiles/cgb/lightning_club.bin delete mode 100644 src/data/maps/tiles/cgb/lightning_club_entrance.bgmap create mode 100644 src/data/maps/tiles/cgb/lightning_club_entrance.bin delete mode 100644 src/data/maps/tiles/cgb/lightning_medal.bgmap create mode 100644 src/data/maps/tiles/cgb/lightning_medal.bin delete mode 100644 src/data/maps/tiles/cgb/mason_laboratory.bgmap create mode 100644 src/data/maps/tiles/cgb/mason_laboratory.bin delete mode 100644 src/data/maps/tiles/cgb/mystery.bgmap create mode 100644 src/data/maps/tiles/cgb/mystery.bin delete mode 100644 src/data/maps/tiles/cgb/overworld_map.bgmap create mode 100644 src/data/maps/tiles/cgb/overworld_map.bin delete mode 100644 src/data/maps/tiles/cgb/pokemon_dome.bgmap create mode 100644 src/data/maps/tiles/cgb/pokemon_dome.bin delete mode 100644 src/data/maps/tiles/cgb/pokemon_dome_door_map_event.bgmap create mode 100644 src/data/maps/tiles/cgb/pokemon_dome_door_map_event.bin delete mode 100644 src/data/maps/tiles/cgb/pokemon_dome_entrance.bgmap create mode 100644 src/data/maps/tiles/cgb/pokemon_dome_entrance.bin delete mode 100644 src/data/maps/tiles/cgb/psychic_club.bgmap create mode 100644 src/data/maps/tiles/cgb/psychic_club.bin delete mode 100644 src/data/maps/tiles/cgb/psychic_club_entrance.bgmap create mode 100644 src/data/maps/tiles/cgb/psychic_club_entrance.bin delete mode 100644 src/data/maps/tiles/cgb/psychic_medal.bgmap create mode 100644 src/data/maps/tiles/cgb/psychic_medal.bin delete mode 100644 src/data/maps/tiles/cgb/rock_club.bgmap create mode 100644 src/data/maps/tiles/cgb/rock_club.bin delete mode 100644 src/data/maps/tiles/cgb/rock_club_entrance.bgmap create mode 100644 src/data/maps/tiles/cgb/rock_club_entrance.bin delete mode 100644 src/data/maps/tiles/cgb/rock_medal.bgmap create mode 100644 src/data/maps/tiles/cgb/rock_medal.bin delete mode 100644 src/data/maps/tiles/cgb/science_club.bgmap create mode 100644 src/data/maps/tiles/cgb/science_club.bin delete mode 100644 src/data/maps/tiles/cgb/science_club_entrance.bgmap create mode 100644 src/data/maps/tiles/cgb/science_club_entrance.bin delete mode 100644 src/data/maps/tiles/cgb/science_medal.bgmap create mode 100644 src/data/maps/tiles/cgb/science_medal.bin delete mode 100644 src/data/maps/tiles/cgb/scyther_intro.bgmap create mode 100644 src/data/maps/tiles/cgb/scyther_intro.bin delete mode 100644 src/data/maps/tiles/cgb/solid_tiles_1.bgmap create mode 100644 src/data/maps/tiles/cgb/solid_tiles_1.bin delete mode 100644 src/data/maps/tiles/cgb/solid_tiles_2.bgmap create mode 100644 src/data/maps/tiles/cgb/solid_tiles_2.bin delete mode 100644 src/data/maps/tiles/cgb/solid_tiles_3.bgmap create mode 100644 src/data/maps/tiles/cgb/solid_tiles_3.bin delete mode 100644 src/data/maps/tiles/cgb/solid_tiles_4.bgmap create mode 100644 src/data/maps/tiles/cgb/solid_tiles_4.bin delete mode 100644 src/data/maps/tiles/cgb/title_screen.bgmap create mode 100644 src/data/maps/tiles/cgb/title_screen.bin delete mode 100644 src/data/maps/tiles/cgb/water_club.bgmap create mode 100644 src/data/maps/tiles/cgb/water_club.bin delete mode 100644 src/data/maps/tiles/cgb/water_club_entrance.bgmap create mode 100644 src/data/maps/tiles/cgb/water_club_entrance.bin delete mode 100644 src/data/maps/tiles/cgb/water_medal.bgmap create mode 100644 src/data/maps/tiles/cgb/water_medal.bin create mode 100644 tools/bgmap.c diff --git a/.gitignore b/.gitignore index 368003a2..b828663e 100644 --- a/.gitignore +++ b/.gitignore @@ -22,6 +22,9 @@ *.2bpp *.pal +# intermediate BG map files +*.bgmap + # compressed data *.lz diff --git a/Makefile b/Makefile index ab1ac833..f1af0a24 100644 --- a/Makefile +++ b/Makefile @@ -44,7 +44,8 @@ clean: tidy -delete find src/data \ - \( -iname '*.lz' \) \ + \( -iname '*.lz' \ + -o -iname '*.bgmap' \) \ -delete tidy: @@ -163,6 +164,9 @@ src/gfx/titlescreen/title_screen_cgb.2bpp: rgbgfx += -x 12 $(if $(tools/gfx),\ tools/gfx $(tools/gfx) -d1 -o $@ $@) +%.bgmap: %.bin + tools/bgmap $(tools/bgmap) $< $@ + # remove -m if you don't care for matching %.lz: % tools/compressor -m $(tools/compressor) $< $@ diff --git a/src/data/maps/tiles/cgb/aerodactyl_intro.bgmap b/src/data/maps/tiles/cgb/aerodactyl_intro.bgmap deleted file mode 100644 index 1d2a1c76a00b2cdc320863cde8edfc53188a4280..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 192 zcmXwwRT9EL6a-%&2Z!JUcY?dSySux?Raio{tLCF;Y6L<`B$h~JfFMwGdV|qqwpa-c zug@O{hQbl-*<8L*ER`$3V}Wk3KNyb2liwdux!vs#$J63d3{eBl7rIIG1w5O7hqG)K6gtTaoTXD_^UVMx)CO_j$Fs}uL6jnrw ziYlf}ZE0IO+SQ)+mC!LcJF!#CTfxrkoLla==YdBmRPD*yyz$NlpM24=u1ykPiXhX> zFv}cEEE8viRn}N%g98ppazu(W8L|{9c`iJcTyagA8)`gL=YdFRaMv2*3~yO>YJKdTFHq&Vd&c0J30+r#%`0jr?;=)GEmM9 z4h@ftj*VMw6ZXle>6zJbPHy5^4sHKj2 z8fc`6X2%8h{>Z=1TGgg@b(k+e&}m)jR*(F()AXuO{Tk4qh8#C+BO2A1#x>#oHmNC1 zYsRmgwK@BApSK0SVo^(4){5g+wWf7#Xj5CZ{l)FruI*`G2i~EM9Cxe}oqA{9xm|qw qUWQ!RwcU8P-kt6p_h66qWY3>W;Oao;#a`{r-oG4v{KDz}bMFHYM$t3? literal 0 HcmV?d00001 diff --git a/src/data/maps/tiles/cgb/card_pop_noncgb.bgmap b/src/data/maps/tiles/cgb/card_pop_noncgb.bgmap deleted file mode 100644 index 932cac419751d84a73c9d43d243090bd11dc7b65..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 720 zcmZo@zyu6f0H&&j1}w@L8X7h-QfJ%?Jb_wQP)x zY+xG5XlVHR?>_@06G)z!g_Vt+1EdZp%fZ0`QU|1f0HltSi<_r`m#?9LU!XxyNLU1< z4kQOu0%CwwvH{hJiit}|N=Y{~$jHjcD<~?#)PaowX#fI{I%O4AHFXWmh6XKd9bG+r z18nL*_8J-)n}A%`U}bG%YG!T$Q^&@}26GY^4-7F( zgb_v=W1I;lnPQq5W|?E&!}9qLq9)aPGq_iI3d>Q;|>)n~Zi&i~MV0D#7+lK=n! literal 0 HcmV?d00001 diff --git a/src/data/maps/tiles/cgb/challenge_hall.bgmap b/src/data/maps/tiles/cgb/challenge_hall.bgmap deleted file mode 100644 index c7cbd6bf2810cb80c77845abef398b5ec66684d7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2048 zcmb7_Sx?(Q6ooTsoD!Q*wk`?$SZrFBN=VphT3QK-E@6p8o4zD%q{0Kx1-d*yofc>- zb$jaaKpHjJ5axP(Jsvy7?uq1?Yx$dVkH^uBPF(({#>PjlND(R)N~QA`N>uOOczOc$ z^&68{iv_^5S-7Trf?AT&X-O&;YPE}(YE7eo(C|aswtxQev`WkR(6Fk- z;dSHa82EtdN5|+-2>1m>sF;5{fjoWijJr;~o$&Y!vKcCzlMLe_Kk_N5H;sHQFZK_d zpAY7@?Y{nOPtUo&erJVH{$x^7fL9dO0rEWmz~I@guFSw71oxk%=2xCyH~zNV1zdC6w0`Rb`bX`* zsvR`M1x%~?K-Ikbr+z=+qc1mFQ?qUl=G3g!ys!R`zp5=aDpl5lX;rEer|#UpLju@7 z=lga1X$O^RqxF``YF4Vuo#zkp4(@*c%nN!rq(X1eAD+i|&sey^|Ht)r-ohU$^!Dd> z3AO;o1OC_tAKCxk2Lz@8f9OH@#o@VIcov5j9mOgRA9m$;;_#xQSjFMFTX+_S7ahea zn!h&VJO0L@gE8NYyZ6{hg;&^qoU?HWjylvdxKCpRgW`BT@VbgtnL< diff --git a/src/data/maps/tiles/cgb/challenge_hall.bin b/src/data/maps/tiles/cgb/challenge_hall.bin new file mode 100644 index 0000000000000000000000000000000000000000..5e5431ef8e6b4f16f9574efe5de429572abcda3f GIT binary patch literal 2048 zcmbVN*NziG5M-Nf!|bx;3?Iwg!5ttW9f&L;9XUvMzzazN9?0qL0kFwPq$k1yL1dWP z*}feQv(_4w>}k(bb#<+6&5*2@wf})(8Id7bCkJJl9J5%GFU_$64|pnq^Q`CFWru8N zZEQh{*Ex%2`SKhq@Q@$zRldg8`3B$QTYQ`E*qsZk=ZEC5>}u_v)^AR>BrDRD>0UZf z;0ZtG7yOc6@oRp=Px%=?w>y*UPWKVG(5U}FGMKDNSEncGXMuP8K7xzvPCEoHG^$6h zU&-%8^^RBf-XU;9|3AqL6Y3K~7BfwErw)PZ>ro?9sAnT)zG?lV2iKoJ%n!c>*}^P0 zb1mi>)YS~l@-NC3XS2*~3u93G`lk8WPA`%9k>8)cE`Mq=i#gH!{`1rPcj;dF3vkn3 zqRSRny7t=iHv0Xe->bf{9hs!c!W1A!a*V}_6Psb>eMztC|4H_Tu3r17G|CfXCs z(I)IcJwXGt{^*Ggr|5Lo9Pq`SQ# z|EJHiTF2>g3F})t@9Hf6{Qcfd>fZj&BlPq?tGjH7zLXFs*-W4)W~slFdipR4*N zUNMg9{hs~Q&~KHUHMif0sONAEW4|1bqvf5acU!fNiq0}x%Q+%v%R5i+wrU-l_8+U| NoRKv>p#Hr$e*v<4m>>WE literal 0 HcmV?d00001 diff --git a/src/data/maps/tiles/cgb/challenge_hall_entrance.bgmap b/src/data/maps/tiles/cgb/challenge_hall_entrance.bgmap deleted file mode 100644 index 3f8455e82c3b681a642df2a00d8347418296915d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 720 zcma*lU2?)86b0bk4(Ov>Hfl?YFX{@SY#@eB+19G@-`Z+95R%5w8P5ZAX7~oePbODa>B8X_nmCE`@&o&^m!jH2QxovRP%>+BLXG z8=U7F(M#X$mTT#p!Adk4m%_EMOQ-j_&1QQ8rQkgOtm0y#-R@9xjIlzvLbTuC=Q_P( z<-F4u-ch}`(IAqd!lLtc{ku1y}vHiHVK@W7i1c8?L2V4hukl$AJfhN diff --git a/src/data/maps/tiles/cgb/challenge_hall_entrance.bin b/src/data/maps/tiles/cgb/challenge_hall_entrance.bin new file mode 100644 index 0000000000000000000000000000000000000000..00425ecf1ac044fa72873d811febfb72bbe2ffff GIT binary patch literal 720 zcma))Sq{P=6h*xT%BNel4z=o!x&ns{XuB!rskY7o&jyOs7(xhed%}C6r-CM`dU#m! z6qWVjHQTYJD+Y53d^+j>1 NFDjp)oEwVE=Pw#T)6M_@ literal 0 HcmV?d00001 diff --git a/src/data/maps/tiles/cgb/challenge_machine_map_event.bgmap b/src/data/maps/tiles/cgb/challenge_machine_map_event.bgmap deleted file mode 100644 index 764e29a8..00000000 --- a/src/data/maps/tiles/cgb/challenge_machine_map_event.bgmap +++ /dev/null @@ -1 +0,0 @@ -ÐÑÒÓÔÕÖ×ÜÝÞßðñòóôõö÷ \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/challenge_machine_map_event.bin b/src/data/maps/tiles/cgb/challenge_machine_map_event.bin new file mode 100644 index 00000000..37c86546 --- /dev/null +++ b/src/data/maps/tiles/cgb/challenge_machine_map_event.bin @@ -0,0 +1 @@ +ÐÑÒÓÔÕÖ×ÜÝÞßðñòóôõö÷ \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/charizard_intro.bgmap b/src/data/maps/tiles/cgb/charizard_intro.bgmap deleted file mode 100644 index a4d4498da3ed9ccf46cae44b6f18765266fe035a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 192 zcmXwz!xBS56a}Z=Gt}A;b@F8{*}#kw?7=-eu1vm368!pZkJKuKc8Dz37!USHpX#g}6GDP^Y?_ z45`rV5shk0<4SwNlb-UTm$a-E<+Q3bt!v*0K2$+P9qCvnx~Afr=r+2G?xP1i>Vr?d M_~wUS{-`(n1JG(htN;K2 literal 0 HcmV?d00001 diff --git a/src/data/maps/tiles/cgb/club_lobby.bgmap b/src/data/maps/tiles/cgb/club_lobby.bgmap deleted file mode 100644 index 76896973..00000000 --- a/src/data/maps/tiles/cgb/club_lobby.bgmap +++ /dev/null @@ -1 +0,0 @@ -‚Šƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒ’„‡ˆ“””•ÀÀ¤¥ÀÀÀÀÀÀ¤¥ÀÀ–—–—–—‡ˆ‡ˆ½½½½ÐдµÐÐôõÐдµÐЦ§¦§¦§‡ˆ‡ˆö÷¦§¦§¦§‡ˆ‡ˆ˜™¶·¶·¶·‡ˆ‡ˆ˜™‡ˆ‡ˆÊÊÉÉÉÌÉÉĘ́™‡ˆ‡ˆš›¨¨Ë¨¨¨Ë¨¨©‡ˆ‡ˆª«¾¾¾¾¾¾¾¾¾¿‘‡ˆº»ÂÁ‡ˆ¼¹ÒчˆÝÜ܇ˆÞàà‡ˆÞáᇈâãŒêæçß‚„‡ˆä圞žŸè釈‡ˆœŸ‡ˆ‡ˆâã¬ë®¯æ燈‡ˆìíä弸¸¹èéì퇈‡ˆîïî‡ˆðñðñ‡ˆ‡ˆòóò󇈑‰ƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒ‹ÂÀÀÀÀÀÀÀÀÀÀÀÀÀÀÀÀÀÀÀÀÀÀÀÀÀÀÁÒÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÑ€€€€€€€€€€€€€€€€€€€€€€€€€€€€ \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/club_lobby.bin b/src/data/maps/tiles/cgb/club_lobby.bin new file mode 100644 index 00000000..387e16e5 --- /dev/null +++ b/src/data/maps/tiles/cgb/club_lobby.bin @@ -0,0 +1 @@ +‚Šƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒ’„‡ˆ“””•ÀÀ¤¥ÀÀÀÀÀÀ¤¥ÀÀ–—–—–—‡ˆ‡ˆ½½½½ÐдµÐÐôõÐдµÐЦ§¦§¦§‡ˆ‡ˆö÷¦§¦§¦§‡ˆ‡ˆ˜™¶·¶·¶·‡ˆ‡ˆ˜™‡ˆ‡ˆÊÊÉÉÉÌÉÉĘ́™‡ˆ‡ˆš›¨¨Ë¨¨¨Ë¨¨©‡ˆ‡ˆª«¾¾¾¾¾¾¾¾¾¿‘‡ˆº»ÂÁ‡ˆ¼¹ÒчˆÝÜ܇ˆÞàà‡ˆÞáᇈâãŒêæçß‚„‡ˆä圞žŸè釈‡ˆœŸ‡ˆ‡ˆâã¬ë®¯æ燈‡ˆìíä弸¸¹èéì퇈‡ˆîïî‡ˆðñðñ‡ˆ‡ˆòóò󇈑‰ƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒ‹ÂÀÀÀÀÀÀÀÀÀÀÀÀÀÀÀÀÀÀÀÀÀÀÀÀÀÀÁÒÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÑ€€€€€€€€€€€€€€€€€€€€€€€€€€€€ \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/colosseum.bgmap b/src/data/maps/tiles/cgb/colosseum.bgmap deleted file mode 100644 index a33f9b44fe3b4d6504c6f5dc99c69fbac511e57f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 192 zcmXxaRT9Eb5Jb^I7LL0Ff+jdIT!TBoJ-~jbdc3)Rr@Adxk{f7Dgp@=Vilwq3N-~)L zwL9HjUmXn5tMz89?e+)!KVSO$^L4t=93dNsrQGsBqdT54OA2w(m=Ec?Tr49uU+T3aBtZq!qJulmt-wxdAqV} zD_GHLJXqZt*0h#A+LH|!GUAPQ#(eO}ns0vi<&O3Q%u;YM3PB|k9lG@B^QDQVnrW_umRiXpuY8IsremEbu75@}KJNek literal 0 HcmV?d00001 diff --git a/src/data/maps/tiles/cgb/copyright.bgmap b/src/data/maps/tiles/cgb/copyright.bin similarity index 53% rename from src/data/maps/tiles/cgb/copyright.bgmap rename to src/data/maps/tiles/cgb/copyright.bin index 76bb056a11989d36369acee081275352f9902163..00584328d1a50f8a393f923b81f5f7dec89e7101 100644 GIT binary patch literal 720 zcmdsyHxh(E3OOaPja72xU8GL@drk wIMMLop8~NF)t0 yPfT1wQc7AzR#8bAs1MmZ2%AX5fXX1|@$mBTbII}Z$}@mWL^BV>C*Hu}p%MT`Sp&xa diff --git a/src/data/maps/tiles/cgb/deck_machine_map_event.bgmap b/src/data/maps/tiles/cgb/deck_machine_map_event.bgmap deleted file mode 100644 index 32bc9868..00000000 --- a/src/data/maps/tiles/cgb/deck_machine_map_event.bgmap +++ /dev/null @@ -1 +0,0 @@ -ÜÝÞß \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/deck_machine_map_event.bin b/src/data/maps/tiles/cgb/deck_machine_map_event.bin new file mode 100644 index 00000000..2aa19937 --- /dev/null +++ b/src/data/maps/tiles/cgb/deck_machine_map_event.bin @@ -0,0 +1 @@ +ÜÝÞß \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/deck_machine_room.bgmap b/src/data/maps/tiles/cgb/deck_machine_room.bgmap deleted file mode 100644 index 64217fcb..00000000 --- a/src/data/maps/tiles/cgb/deck_machine_room.bgmap +++ /dev/null @@ -1 +0,0 @@ -‚‹ìïîíìïîíìïîíìïîíìïîí‘„ŠˆÔÕÖ×ÔÕÖ×ÔÕÖ×ÔÕÖ×ÔÕÖ׊ˆŠˆÜÝÞßØÙÚÛØÙÚÛØÙÚÛØÙÚÛŠˆŠˆðñòóðñòóðñòóðñòóðñò󊈊ˆôõö÷ôõö÷ôõö÷ôõö÷ôõö÷ŠˆŠˆŠˆŠˆŠˆŠˆŠˆ‡‰ÐÑÒÓÐÑÒÓŠˆ–•ÔÕÖ×ÔÕÖ׊ˆ¦¥ØÙÚÛØÙÚÛŠˆðñòóðñòóŠˆôõö÷ôõö÷ŠˆŠˆ‚„ŠˆŠˆŠˆŠˆÐÑÒÓÐÑÒÓÐÑÒÓŠˆŠˆÔÕÖ×ÔÕÖ×ÔÕÖ׊ˆŠˆØÙÚÛØÙÚÛŠˆ Šˆøùúûðñòóðñò󊈊ˆôõö÷ôõö÷ôõö÷ŠˆŠˆŠˆŠˆŠˆŠˆŠˆŠˆŠˆŠˆŠˆ‡ƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒ’‰–““““““““““““““““““““““•¦££££££££££££££££££££££¥€€€€€€€€€€€€€€€€€€€€€€€€ \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/deck_machine_room.bin b/src/data/maps/tiles/cgb/deck_machine_room.bin new file mode 100644 index 00000000..9fc73475 --- /dev/null +++ b/src/data/maps/tiles/cgb/deck_machine_room.bin @@ -0,0 +1 @@ +‚‹ìïîíìïîíìïîíìïîíìïîí‘„ŠˆÔÕÖ×ÔÕÖ×ÔÕÖ×ÔÕÖ×ÔÕÖ׊ˆŠˆÜÝÞßØÙÚÛØÙÚÛØÙÚÛØÙÚÛŠˆŠˆðñòóðñòóðñòóðñòóðñò󊈊ˆôõö÷ôõö÷ôõö÷ôõö÷ôõö÷ŠˆŠˆŠˆŠˆŠˆŠˆŠˆ‡‰ÐÑÒÓÐÑÒÓŠˆ–•ÔÕÖ×ÔÕÖ׊ˆ¦¥ØÙÚÛØÙÚÛŠˆðñòóðñòóŠˆôõö÷ôõö÷ŠˆŠˆ‚„ŠˆŠˆŠˆŠˆÐÑÒÓÐÑÒÓÐÑÒÓŠˆŠˆÔÕÖ×ÔÕÖ×ÔÕÖ׊ˆŠˆ    ØÙÚÛØÙÚÛŠˆŠˆøùúûðñòóðñò󊈊ˆôõö÷ôõö÷ôõö÷ŠˆŠˆŠˆŠˆŠˆŠˆŠˆŠˆŠˆŠˆŠˆ‡ƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒ’‰–““““““““““““““““““““““•¦££££££££££££££££££££££¥€€€€€€€€€€€€€€€€€€€€€€€€ \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/evolution.bgmap b/src/data/maps/tiles/cgb/evolution.bgmap deleted file mode 100644 index 571a5dee3615afb49be9fa0c9efba5d055fd2822..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 192 zcmXxZ)fR$K07TL2{c;lxgWM3rfmXtXi{fL&c%0 zBQ?iPoH}#oK6ywQ9+M|c&%U+&==k-gPrqR!MvWOaVbYXESvgDcmK79j+OloOu08t> l)SbI<>B_Ymw_f5k-r_wz;xoRY6$3FCLopMXn2ouZkAEf+KDYn? literal 0 HcmV?d00001 diff --git a/src/data/maps/tiles/cgb/fighting_club.bgmap b/src/data/maps/tiles/cgb/fighting_club.bgmap deleted file mode 100644 index 7a0c4a20cb926331c04c614721bcadee45598183..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 864 zcmb`F$x^~V5QfRbz-v>5;FTFOcvXn{5@do)6x>*|p)B$w&}3#(G$bd!zVu)9)n9$+ zTKn<@&AO2Tqr3~a{P%CMrJ5!aJPd2z<*j z5taph5F%ZSCq@3}*I~QxrZe!%WmIpb{og;hKM29cwkiE6#{E%TbWbwJ{mHz@$L+#P z`}6L>?Vd>c^Zee^@xVQ&Vf6Xsc+ThFUCZ~pdiDLch77lz?3#-mS-Rm8`@KK-uvKbl igMd$Td{i&#fbXdEpgxkMzK&H5_&QVxDM|MI+TQ}+*(&G& diff --git a/src/data/maps/tiles/cgb/fighting_club.bin b/src/data/maps/tiles/cgb/fighting_club.bin new file mode 100644 index 0000000000000000000000000000000000000000..11835019294f891cd905556b6ac4480d3be61b03 GIT binary patch literal 864 zcmbV~>rMhO5QRByhrTumqJKeI{j0*_OTeOX6TE^qKtS|K+<~;AYqH&tli8$mzMPzF zrie=%WK z-@jphH~$(p$TFtSEjq|D`|uYyNnGaKzuREz3A^Hwouj+l(=_FmL z?Ld3aFRyRAWKXKXDv&a8J_^H_2ZM)3AjYV|HYL_?}Nby zJ8(G?`mqyYzs_k|Q;r!_AzICpVCUz0T}~SZhezvN-pHLh9DY)Kc7Ac`xFF!MvfOC& zMe$X;bL}`OCAG!3S=!J4a`(o~=eKC0h-J=)E4eg8Jv@a&_ARZ{g1@nKD4%Q|B literal 0 HcmV?d00001 diff --git a/src/data/maps/tiles/cgb/fighting_medal.bgmap b/src/data/maps/tiles/cgb/fighting_medal.bgmap deleted file mode 100644 index ac07e57a..00000000 --- a/src/data/maps/tiles/cgb/fighting_medal.bgmap +++ /dev/null @@ -1 +0,0 @@ -°±²¹º»ÀÁ \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/fighting_medal.bin b/src/data/maps/tiles/cgb/fighting_medal.bin new file mode 100644 index 00000000..8155a93e --- /dev/null +++ b/src/data/maps/tiles/cgb/fighting_medal.bin @@ -0,0 +1 @@ +°±²¹º»ÀÁ \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/fire_club.bgmap b/src/data/maps/tiles/cgb/fire_club.bgmap deleted file mode 100644 index ec22980b..00000000 --- a/src/data/maps/tiles/cgb/fire_club.bgmap +++ /dev/null @@ -1 +0,0 @@ -ƒ‘„„„„„„„„„„„„„„„„„„„„„„„„”…“’Š‹Š‹Š‹Š‹Š‹Š‹Š‹Š‹Š‹Š‹Š‹Š‹“’“’ŽŽŽŽŽŽŽŽŽŽŽŽ“’“’ˆ‰ˆ‰ˆ‰ˆ‰ˆ‰ˆ‰ˆ‰ˆ‰ˆ‰ˆ‰ˆ‰ˆ‰“’“’‚‚»¼‚‚•––—‚‚¿À‚‚“’“’‚‚½¾‚‚˜™š›‚‚Á‚‚“’“’‚‚ËÌ‚‚˜™š›‚‚Í΂‚“’“’‚‚ÏЂ‚˜™š›‚‚ÑÒ‚‚“’“’‚‚ÓÔ‚‚˜™š›‚‚ÕÖ‚‚“’“’‚‚‚‚‚˜™š›‚‚‚‚‚“’“’‚‚‚‚‚˜™š›‚‚‚‚‚“’“’‚‚‚‚‚˜™š›‚‚‚‚‚“’“’‚‚»¼‚‚˜™š›‚‚¿À‚‚“’“’‚‚½¾‚‚˜™š›‚‚Á‚‚“’“’‚‚ËÌ‚‚˜™š›‚‚Í΂‚“’“’‚‚ÏЂ‚˜™š›‚‚ÑÒ‚‚“’“’‚‚ÓÔ‚‚˜™š›‚‚ÕÖ‚‚“’“’‚‚‚‚‚˜™š›‚‚‚‚‚“’“’‚‚‚‚‚˜™š›‚‚‚‚‚“’“’‚‚‚‚‚˜™š›‚‚‚‚‚“’“’‚‚»¼‚‚˜™š›‚‚¿À‚‚“’“’‚‚½¾‚‚˜™š›‚‚Á‚‚“’“’‚‚ËÌ‚‚˜™š›‚‚Í΂‚“’“’‚‚ÏЂ‚˜™š›‚‚ÑÒ‚‚“’“’‚‚ÓÔ‚‚˜™š›‚‚ÕÖ‚‚“’“’‚‚‚‚‚˜™š›‚‚‚‚‚“’“’‚‚‚‚‚˜™š›‚‚‚‚‚“’“’‚‚‚‚‚˜™š›‚‚‚‚‚“’ž„„„„„„„„„‡˜™š›†„„„„„„„„„œŒŠ‹Š‹Š‹Š‹Š‹Œ˜™š›ŒŠ‹Š‹Š‹Š‹Š‹ŒŽŽŽŽŽ˜™š›ŽŽŽŽŽ€€€€€€€€€€€€˜™š›€€€€€€€€€€€€ \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/fire_club.bin b/src/data/maps/tiles/cgb/fire_club.bin new file mode 100644 index 00000000..5f07cb43 --- /dev/null +++ b/src/data/maps/tiles/cgb/fire_club.bin @@ -0,0 +1 @@ +ƒ‘„„„„„„„„„„„„„„„„„„„„„„„„”…“’Š‹Š‹Š‹Š‹Š‹Š‹Š‹Š‹Š‹Š‹Š‹Š‹“’“’ŽŽŽŽŽŽŽŽŽŽŽŽ“’“’ˆ‰ˆ‰ˆ‰ˆ‰ˆ‰ˆ‰ˆ‰ˆ‰ˆ‰ˆ‰ˆ‰ˆ‰“’“’‚‚»¼‚‚•––—‚‚¿À‚‚“’“’‚‚½¾‚‚˜™š›‚‚Á‚‚“’“’‚‚ËÌ‚‚˜™š›‚‚Í΂‚“’“’‚‚ÏЂ‚˜™š›‚‚ÑÒ‚‚“’“’‚‚ÓÔ‚‚˜™š›‚‚ÕÖ‚‚“’“’‚‚‚‚‚˜™š›‚‚‚‚‚“’“’‚‚‚‚‚˜™š›‚‚‚‚‚“’“’‚‚‚‚‚˜™š›‚‚‚‚‚“’“’‚‚»¼‚‚˜™š›‚‚¿À‚‚“’“’‚‚½¾‚‚˜™š›‚‚Á‚‚“’“’‚‚ËÌ‚‚˜™š›‚‚Í΂‚“’“’‚‚ÏЂ‚˜™š›‚‚ÑÒ‚‚“’“’‚‚ÓÔ‚‚˜™š›‚‚ÕÖ‚‚“’“’‚‚‚‚‚˜™š›‚‚‚‚‚“’“’‚‚‚‚‚˜™š›‚‚‚‚‚“’“’‚‚‚‚‚˜™š›‚‚‚‚‚“’“’‚‚»¼‚‚˜™š›‚‚¿À‚‚“’“’‚‚½¾‚‚˜™š›‚‚Á‚‚“’“’‚‚ËÌ‚‚˜™š›‚‚Í΂‚“’“’‚‚ÏЂ‚˜™š›‚‚ÑÒ‚‚“’“’‚‚ÓÔ‚‚˜™š›‚‚ÕÖ‚‚“’“’‚‚‚‚‚˜™š›‚‚‚‚‚“’“’‚‚‚‚‚˜™š›‚‚‚‚‚“’“’‚‚‚‚‚˜™š›‚‚‚‚‚“’ž„„„„„„„„„‡˜™š›†„„„„„„„„„œŒŠ‹Š‹Š‹Š‹Š‹Œ˜™š›ŒŠ‹Š‹Š‹Š‹Š‹ŒŽŽŽŽŽ˜™š›ŽŽŽŽŽ€€€€€€€€€€€€˜™š›€€€€€€€€€€€€ \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/fire_club_entrance.bgmap b/src/data/maps/tiles/cgb/fire_club_entrance.bgmap deleted file mode 100644 index f3be7743487dc00c3e9b328173fbbaead4c9f9b8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 720 zcmaKqOH%?d5QGh8;mBVWL{=A{oUL*pR}KrgiX1G#pW<5qK?McVGfC|N(LPLdRev>^ zBvU@vg{n`_FRy!K&nm(ykTP&S3f0}cQZcw#!AGIV3I$UvM?MPm!=u&-xJ1MM#g#~J z!{LY>xEu-n*a@*;<20=)#|)|v%|=SF^K+dxr-w(!C+pm{kvn%hey8~SrhnnMAmFjG z++^}WacgjU?KmkVwaIeRDRYbbuaEm# zY;yRx^?u7O4_7q*amxFG(|KR&HMb)e&-tbz#o)}oKn<5=xsE0!;LN^2Z6CK|1h($E5*b^0eDDdIvKi0WEQ1=dDB=Qbyoxu`mTSXu4S6!TV${>eSiFnATsxNQ$dkzp zmx}u}=L@!ApWIJUam5u-f}5S&E3SoRB(8_<33o+hx~2-beO13DU-B>KHg$TUXSxk> zE4E@A=D&SMBYL675VvOQ6K+65x~GQ_mzJ~MI^Xp>>)p=#_Rh^O$nCwKNZdjEiYWd5 zL@c4W0;-M~c{@wjmmB%dT1PLG8`>9hKkbXjo9G?AP;O{n45xiDc^An*87`Rr1A>{> Az5oCK literal 0 HcmV?d00001 diff --git a/src/data/maps/tiles/cgb/fire_medal.bgmap b/src/data/maps/tiles/cgb/fire_medal.bgmap deleted file mode 100644 index 5f4ad48b..00000000 --- a/src/data/maps/tiles/cgb/fire_medal.bgmap +++ /dev/null @@ -1 +0,0 @@ -†‡ˆ–—˜¦§¨ \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/fire_medal.bin b/src/data/maps/tiles/cgb/fire_medal.bin new file mode 100644 index 00000000..19485869 --- /dev/null +++ b/src/data/maps/tiles/cgb/fire_medal.bin @@ -0,0 +1 @@ +†‡ˆ–—˜¦§¨ \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/gameboy_link.bgmap b/src/data/maps/tiles/cgb/gameboy_link.bgmap deleted file mode 100644 index 776aaa9c465c508ce6cf4c143ed0fbc735abcd9b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 720 zcmdUr#}2|U42ILb|G|u~H(_rOn*$?k4nUyHhoOcDi8e=s#CNilFaDhX*dYq+7Jxz{ z-}W3%mzz?L7w7u?lm>#Ku=Ya7d|fuNcp}MIDve$y%UCX7D5|__t=<4=w$N*L0J^>Y z06ju9InS(2hNJP@o1?c{E4}S*KjC~j!+Dzp=gU&Lg7-~6_KQS?I2?@=dS~Nu72E<*@!WPF#H8 z#-s4!6Z^J)31}B2#3x~5#Q7pYQjsEUx{PGC%aNx*kqT9Q_~kLDM%{D`X=>Nvk2W2; z^yok7CZ?OSP~D0(8wLy&BgSUlQl{F?DDh31h(u+p*vVcFax~pZ?ap%1XIHryZ@=@s HzV-umwV>D9 literal 0 HcmV?d00001 diff --git a/src/data/maps/tiles/cgb/gameboy_link_connecting.bgmap b/src/data/maps/tiles/cgb/gameboy_link_connecting.bgmap deleted file mode 100644 index 584b349abf62b191d14ee437555858b3769e1796..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 720 zcmd^*w+_Nk3`HML%Kw`ZdMES_qBBrJX8;1BegeI>ffwpPMmElLEgf670lq;Zd|Ln_ z8v3;-mB|$}tyBR_XKD>iYjt{qQM$ z5R0$Yn{6TqkV m&`-c*z4v}b6UTLXd>`Nn1AaK-xbXx(A$Oox{`LR$knvgT^iH-2{^)NHRl;S<=io=2>vLt{(NIMay`%M3x-Olqj>p zD*b!bShr`r=v8m3*oJqTY_ZJ_yX>()kbBpMKJ}%O|6Gl_%bjsflLHPNM;yC%zxAVE rHSE;8DtQVNnX+lSa9rAzU0cil<4-}P?M^p#>t}b?@jl!e33t05%WvM( literal 0 HcmV?d00001 diff --git a/src/data/maps/tiles/cgb/gameboy_printer.bgmap b/src/data/maps/tiles/cgb/gameboy_printer.bgmap deleted file mode 100644 index 7e89471ce8c97e89813ba52887d17360fdf857be..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 720 zcmZ{f*;2wl6hud;gx|js6%jXZ0R$Dq9Z^I94F(YR_%q&+YSYEiFWoig)J%=Ybj*xQ zTOu-HwS=)TPQ#^%m_2J>&=)P=jXLqlp-e4%Nqe*Y!|K0t3 zp?IKP>+SvH^J~6WK0G?ER7JjjeBb|#yhQNdal(I`)K1UNFO(yC92-Xm0>%x-%^aIK aHW)V;H*;*}*kIgX+|03=V}o&nasL6unc0^B diff --git a/src/data/maps/tiles/cgb/gameboy_printer.bin b/src/data/maps/tiles/cgb/gameboy_printer.bin new file mode 100644 index 0000000000000000000000000000000000000000..78462f9f8ec73f5ffaf1520faacfada6e68b824a GIT binary patch literal 720 zcmeIuM^gep5Qbryue$yFOOPB@BALS+9#$hBofzL+d#Sf9?sca$x3E`bz-kP z`gC?ztMT3E5C39s?zw+h+boy!`EtHAgKK`SJ)*gj;A4$b(s8N%X-HSF@EVyX)!%G{Kng31j?m>7vZg0`-aI8`y3LT@~Q zAoQpa{4vDg*#2pLy7NNHE!T6vPKlHWefn4?CD8;` zT>D!41o;7^&$<@ePMk`Ui(P(D(-V=nQbX}lugfn;u0Hk$Nw3SVlKixLR8Nyix$*p^ zK1+J(iE@hDHaK_ET*jh4?11%#dOUZXk>FQM^ds1wP4@*?8&Qjg1u z%>Hv6$%IVFq}*rsSwHGW_=RqVT0=W9m=D=QHi!lhexci;*3eGetGvo~veS&+1nbZi z?h%(uE+@%pGtQFIZOFQ88k^sPuf<`VOW|?{xhh>*t1W5|e?wdej4NG*Z4j4oC7iib z`;~n!*-t_oy}i7a8{vetsA8Tc7cCAkU`NEq^eM%}`Zl_YI2q02pzA4ec}`zaO!~pj zlS8+-gXFO0gRkc+9q$H7EPQ#t1>u+v_;@!+<^{2dTd%5xQM%1wpLc_VKRJhSsI}g! ztm>iKTz!`LARckZr!p!Z<3gfya1xCY)=%@Y>>RC8+j`ogrgv}>(#IyN>P7d0u zbx?QWZ2mNdIBDT%hi>^;Kbt@15S+9lime~dqtfR<*}`4qm-*xl??I^*E84zcek~3x zyay%Y*){57aq!_iC}9JKUzc@VEY9CbS>QiB@cqF?oPKYJ;*nDw=?z!;e@Add7I(Dg-ZnErA9-r!DTQy-7NEtXEh3a;sR17Xw@KI>8V$l@Kk&i+>zSBAZmuUF^xH9Q^ zGI?PKE>A)~c0%knIZbQIF@q{Zx04d={M?|=>E8aq;VQRfN z&F8NapA9e09VexvHd$`5VD9qj`eqYXsl9P*>-z`pVV{GC%NGhlMByK-{Q0$hUmy3q zT<7p{tNng*9K8`zT%(GZ62sWO?nJ* zYqn-v=D+)p5aC!+M* zi`a$Yaws}xWb7B|0L*gM AN&o-= literal 0 HcmV?d00001 diff --git a/src/data/maps/tiles/cgb/grass_medal.bgmap b/src/data/maps/tiles/cgb/grass_medal.bgmap deleted file mode 100644 index 1129d464..00000000 --- a/src/data/maps/tiles/cgb/grass_medal.bgmap +++ /dev/null @@ -1 +0,0 @@ -€‚‘’ ¡¢ \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/grass_medal.bin b/src/data/maps/tiles/cgb/grass_medal.bin new file mode 100644 index 00000000..d849d712 --- /dev/null +++ b/src/data/maps/tiles/cgb/grass_medal.bin @@ -0,0 +1 @@ +€‚‘’ ¡¢ \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/hall_of_honor.bgmap b/src/data/maps/tiles/cgb/hall_of_honor.bgmap deleted file mode 100644 index 67e774a0..00000000 --- a/src/data/maps/tiles/cgb/hall_of_honor.bgmap +++ /dev/null @@ -1 +0,0 @@ -‰ŠŠŠŠŠŠŠŠŠŠŠŠŠŠŠŠŠŠŠŠ™‹ìê““““““““ŒŽŒ““““““““ìêì꣣££££££Ì¤¥Ì££££££££ìêìêßÞîïðñîïܦ§ÜðñîïðñßÞìêìê¿»•–òˆ•–¼½¾¼òˆ•–òˆ¿»ìêìêîïðñîïðñîïðñîïðñîïðñìêìê•–òˆ•–òˆ•–òˆ•–òˆ•–òˆìêìêðñîïðñîïðñîïðñîïðñîïìêìêòˆ•–òˆõ–òˆ•–¹•–òˆ•–ìêìêîïðñîïÂÃÄÅÆÇÈÉðñîïðñìêìê•–òˆÐÑÒÓÔÕÖ×ØÒÚЕ–òˆìêìêðñîïàáâãäåæçèâáàðñîïìêìêòˆ•–ÛÙÏ€ÎËËÊ€ÁÀÛòˆ•–ìêìêîïðñº¸·¶ÎËËʵ´³ºîïðñìêìê•–òˆ•ôøžœËË›ö÷󈕖òˆìêìêðñîïðñîïðñîïðñîïðñîïìêìêòˆ•–òˆ•–òˆ•–òˆ•–òˆ•–ìêìêîïðñîïðñîïðñîïðñîïðñìêìê•–òˆ•–òˆ•–òˆ•–òˆ•–òˆìêìêðñîïðñîïðñîïðñîïðñîïìêìêßÞ•–òˆ•–òˆ•–òˆ•–òˆßÞìêìê¿»ðñîïðñîïðñîïðñîï¿»ìêé ŠŠŠŠŠŠŠ„•–òˆƒŠŠŠŠŠŠŠŸë’““““““““íííí““““““““‘¢££££££££‚íííí‚££££££££¡€€€€€€€€€€ííí퀀€€€€€€€€ \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/hall_of_honor.bin b/src/data/maps/tiles/cgb/hall_of_honor.bin new file mode 100644 index 00000000..991c396c --- /dev/null +++ b/src/data/maps/tiles/cgb/hall_of_honor.bin @@ -0,0 +1 @@ +‰ŠŠŠŠŠŠŠŠŠŠŠŠŠŠŠŠŠŠŠŠ™‹ìê““““““““ŒŽŒ““““““““ìêì꣣££££££Ì¤¥Ì££££££££ìêìêßÞîïðñîïܦ§ÜðñîïðñßÞìêìê¿»•–òˆ•–¼½¾¼òˆ•–òˆ¿»ìêìêîïðñîïðñîïðñîïðñîïðñìêìê•–òˆ•–òˆ•–òˆ•–òˆ•–òˆìêìêðñîïðñîïðñîïðñîïðñîïìêìêòˆ•–òˆõ–òˆ•–¹•–òˆ•–ìêìêîïðñîïÂÃÄÅÆÇÈÉðñîïðñìêìê•–òˆÐÑÒÓÔÕÖ×ØÒÚЕ–òˆìêìêðñîïàáâãäåæçèâáàðñîïìêìêòˆ•–ÛÙÏ€ÎËËÊ€ÁÀÛòˆ•–ìêìêîïðñº¸·¶ÎËËʵ´³ºîïðñìêìê•–òˆ•ôøžœËË›ö÷󈕖òˆìêìêðñîïðñîïðñîïðñîïðñîïìêìêòˆ•–òˆ•–òˆ•–òˆ•–òˆ•–ìêìêîïðñîïðñîïðñîïðñîïðñìêìê•–òˆ•–òˆ•–òˆ•–òˆ•–òˆìêìêðñîïðñîïðñîïðñîïðñîïìêìêßÞ•–òˆ•–òˆ•–òˆ•–òˆßÞìêìê¿»ðñîïðñîïðñîïðñîï¿»ìêé ŠŠŠŠŠŠŠ„•–òˆƒŠŠŠŠŠŠŠŸë’““““““““íííí““““““““‘¢££££££££‚íííí‚££££££££¡€€€€€€€€€€ííí퀀€€€€€€€€ \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/hall_of_honor_door_map_event.bgmap b/src/data/maps/tiles/cgb/hall_of_honor_door_map_event.bgmap deleted file mode 100644 index 0599eee9..00000000 --- a/src/data/maps/tiles/cgb/hall_of_honor_door_map_event.bgmap +++ /dev/null @@ -1 +0,0 @@ -õõõõõõõõõõõõ \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/hall_of_honor_door_map_event.bin b/src/data/maps/tiles/cgb/hall_of_honor_door_map_event.bin new file mode 100644 index 00000000..d888e762 --- /dev/null +++ b/src/data/maps/tiles/cgb/hall_of_honor_door_map_event.bin @@ -0,0 +1 @@ +õõõõõõõõõõõõ \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/ishihara.bgmap b/src/data/maps/tiles/cgb/ishihara.bgmap deleted file mode 100644 index 40087ab2..00000000 --- a/src/data/maps/tiles/cgb/ishihara.bgmap +++ /dev/null @@ -1 +0,0 @@ -ƒ„„„„„„„„„„„„„„„„¢…“’––¬­œœœœœœ“’“’ˆ‰Š‹žŸžŸžŸžŸžŸžŸ“’“’˜™š›žŸžŸžŸžŸžŸžŸ“’“’ŒŽª«ª«ª«ª«ª«ª«“’“’‚‚‚‚‚‚‚‚“’“’‚‚ººººººº‚‚“’“’‚‚»¼¼¼¼¼¼½‚‚“’“’‚‚»¼¼¼¼¼¼½‚Á“’“’‚‚»¼¼¼¼¼¼½‚ÃÄ“’“’‚‚¾¿¿¿¿¿¿À‚ÅÆ“’“’‚‚‚‚‚‚‚ÇÈ“’“’œœœ‚‚œœœ“’“’žŸžŸžŸ‚‚žŸžŸžŸ“’“’¨©¨©¨©‚‚¨©¨©¨©“’“’‚‚‚‚‚‚‚‚“’“’‚‚‚‚‚‚‚‚“’“’‚‚‚‚‚‚‚‚“’“’ÉÊÉÊ‚‚‚‚‚‚“’“’ËÌËÌ‚‚‚‚‚‚“’‘ „„„„„‡‚‚†„„„„„£¡•––––––—‚‚—––––––”¥¦¦¦¦¦¦§‚‚§¦¦¦¦¦¦¤€€€€€€€€‚‚€€€€€€€€ \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/ishihara.bin b/src/data/maps/tiles/cgb/ishihara.bin new file mode 100644 index 00000000..f0355e7a --- /dev/null +++ b/src/data/maps/tiles/cgb/ishihara.bin @@ -0,0 +1 @@ +ƒ„„„„„„„„„„„„„„„„¢…“’––¬­œœœœœœ“’“’ˆ‰Š‹žŸžŸžŸžŸžŸžŸ“’“’˜™š›žŸžŸžŸžŸžŸžŸ“’“’ŒŽª«ª«ª«ª«ª«ª«“’“’‚‚‚‚‚‚‚‚“’“’‚‚ººººººº‚‚“’“’‚‚»¼¼¼¼¼¼½‚‚“’“’‚‚»¼¼¼¼¼¼½‚Á“’“’‚‚»¼¼¼¼¼¼½‚ÃÄ“’“’‚‚¾¿¿¿¿¿¿À‚ÅÆ“’“’‚‚‚‚‚‚‚ÇÈ“’“’œœœ‚‚œœœ“’“’žŸžŸžŸ‚‚žŸžŸžŸ“’“’¨©¨©¨©‚‚¨©¨©¨©“’“’‚‚‚‚‚‚‚‚“’“’‚‚‚‚‚‚‚‚“’“’‚‚‚‚‚‚‚‚“’“’ÉÊÉÊ‚‚‚‚‚‚“’“’ËÌËÌ‚‚‚‚‚‚“’‘ „„„„„‡‚‚†„„„„„£¡•––––––—‚‚—––––––”¥¦¦¦¦¦¦§‚‚§¦¦¦¦¦¦¤€€€€€€€€‚‚€€€€€€€€ \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/japanese_title_screen.bgmap b/src/data/maps/tiles/cgb/japanese_title_screen.bgmap deleted file mode 100644 index db155a97..00000000 --- a/src/data/maps/tiles/cgb/japanese_title_screen.bgmap +++ /dev/null @@ -1 +0,0 @@ -€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€ŽŠ‰€€€€’“”•–—˜™š›œžŸˆ‡€€€¡¢£¤¥¦§¨©ª«¬­®¯†…€€€±²³´µ¶·¸¹º»¼½¾¿„€€€ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎσ‚€€ÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞ߀€€€€€‹à° ‘€€€€€€€€€€€€€€€Œ€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€ \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/japanese_title_screen.bin b/src/data/maps/tiles/cgb/japanese_title_screen.bin new file mode 100644 index 00000000..a3377275 --- /dev/null +++ b/src/data/maps/tiles/cgb/japanese_title_screen.bin @@ -0,0 +1 @@ +€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€ŽŠ‰€€€€’“”•–—˜™š›œžŸˆ‡€€€¡¢£¤¥¦§¨©ª«¬­®¯†…€€€±²³´µ¶·¸¹º»¼½¾¿„€€€ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎσ‚€€ÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞ߀€€€€€‹à° ‘€€€€€€€€€€€€€€€Œ€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€ \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/japanese_title_screen_2.bgmap b/src/data/maps/tiles/cgb/japanese_title_screen_2.bgmap deleted file mode 100644 index e8f96aed99968e5beef931a08376f68ee4738745..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 720 zcmZQ%WM*MyW9Q)H;^yJu;}>9LVq|1sU}9omVPRlkW@Z2ZUS0+UMn+)~Q894|NhxU= zSvh$HK_Q4bCKeVZCT3=!1_maOIz=UA6;(BL4NWa=9bG+r0}vmi1Sk&!Ky|#lhDMAg zre@|AmR8m_ws!UohK$B0AS;p8aR6<0baHlab#wRd^z!!c_45y~wz71B83d$(Ze?KL z;NW0j3I#dBOG?YiD=Mq1YijH28+3KFL3SZI4{9%Cb4zPmdq-zicTaC${{$^f4UjspyP)Pm z+{ZY1%G7DoXUv>6d(PZ>^B1VAsiLR>sRjFkaq*I+%a*TLxoY*Awd>YzP>`2{sbd2J zpgJxtpno@Q-m-Pu_8mKS?cTF@-~I!#GSGMf%7fH_%;Vw$I^@vdBS()NKXH=r^qI5g z&R>w0k_4KE;td84ka?FbU%7hi`i+~6x9{A&cmIKexEOYIj~+jH`t13OmyEC9ynXln zgQ$owc6FaVfBE|D`wvFO-+%u8`_CZ2&&LQ#R!D#YY%eblHy0-dJ0l|-D+}|lpMl0g pj7(e*zyxLh(+&_Yeth-t*2Pl?H*Q?CaMHx4MnPUCMu-e52>?%bimU(t diff --git a/src/data/maps/tiles/cgb/japanese_title_screen_2.bin b/src/data/maps/tiles/cgb/japanese_title_screen_2.bin new file mode 100644 index 0000000000000000000000000000000000000000..ef281754fcbe82537ce4eace02148d357820c915 GIT binary patch literal 720 zcmXZWV{lzj6o%nCY%8**iGuM&_4wdJG<=DUa>P-tiC9eWmsk?pietr`oCNn!#>A~764 zuM4!2TFE521W7O@%3R8rl6r(sLD5*+Onlh9nht96E>HKb8c`8tmN>ru_RaG@r zUDZ%ERV`JUI@Ber&Z0BxOu8QRX+T37(U>MQRn1g$)k3vYtyF8;(3bQ%txls;>vpuK z10AIko#{eXy3w5;^rRQP=|f+_b(l`&Hb!g!1Jxh~GlZcGV>lxi$tXrMhOwm7p*qEX zH-U*vVlq>h$~2}kgPF`?HglLuhz{04|J?!>vWUejVX3{$UT&|jSK6!W)vRGHNlbuA z>~-teARA>9o7uuvw%Ob59rjLp7rWWRUJ{vv=3m`@4#+_cahM|<<(S)hf|H!$G-o(V z0v+GP^Zq-}1-Zy2E^~#eTyxzGZgPv;+~F>9bsQ7h>+bVF9`cCCJmD$NT=#;Pyy7)) zcuOqpZ(@4gd-)(A`NU_w@YPj{AN=GOzxe|?y7o2EBAhtJ$3!*8L^0Y#HcFJ(CX%s? s$9$J>Qcg06pLxi07Axa^a4?&ixp8873czx0zB;)uBFFVlL8tN;K2 literal 0 HcmV?d00001 diff --git a/src/data/maps/tiles/cgb/laboratory.bgmap b/src/data/maps/tiles/cgb/laboratory.bgmap deleted file mode 100644 index a4c511914b23c1cdf6636a0f34a1a6f61a8d4b4f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 192 zcmZo@1cP=4D3~x245q{Q3l=U~ykzOJGGAUP0cWVM`u@ePj6p8j6Y-Mtl4ws&YKV8uUNTi^_sQo*2DNacJA7}XYaoKF#d^? Yr%s(0EW@``L3Ld$lfD+r;<&SO|~TW+) lr^W|;J{d6Ni*H7ZS!<)McG~NpqfRo*BCGrgD5#Lax&bybKH>lX literal 0 HcmV?d00001 diff --git a/src/data/maps/tiles/cgb/lightning_club.bgmap b/src/data/maps/tiles/cgb/lightning_club.bgmap deleted file mode 100644 index 0449c2cd7c7c38f69449ddbfbacace7462e6ca91..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1792 zcmc(g*H6PR5XR}CPw+q2VJ{I{wwSFLNY+2;>#3#v^PE&k}46i2(X7hS9Eu@7aeO>*0bVtHkSkny7 zA&8&l^+@G1QO`gxAA=BAOTgKw1kAy9Y{XA$_9?PFG^}exmVHWligS=mmms?xb|^Oy z@PmV>fPY5dma^Gxf{MSm(doC+)k*ebUDBP8$7FRo*{XrQfIVo#!iqgG|4Yfe?TESlNIUC(L?b)yzRW}>_wvzZM*pPZQE@Mb#OzckLZiL-SFvpsK zI_?p&D(&Z#+~JWmlXaYpTq0+3hPA`rpdW9t{(t8{yn&3XP zQjgzh&Ku-pEv}x#f}E_$7GO#&y^#hC3;U^ Y%@@BCx>kLz8j85eFVxY*q|avYe^!)2E&u=k literal 0 HcmV?d00001 diff --git a/src/data/maps/tiles/cgb/lightning_club_entrance.bgmap b/src/data/maps/tiles/cgb/lightning_club_entrance.bgmap deleted file mode 100644 index 7b667ba47c67b2211e279dd0f2d16de80effd0b4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 720 zcmaKqNmBwb5QPn9;K*N=MMnoWJX6I$u2eaYD^;9bO8u2=QG z>U5GWA5@^dhsUSqU9$D6unMFMoR30vH&iMH7c2NEG+Ciwisi^hp&s39oq$U;{3fnM zdKr&j*@4TE(2t!E`!!C}nsUsb3ej$*1Uo<1>vDQ{bbPYPZ5z3BCzC0~jjQXX-Y6> z-^+ClAGg}?XUoGC&3~NozTkA;m$RDN5sc@2TajXLW?!I|%d%WglM--dU!bm!+pz-Y HypQ_@TXELh diff --git a/src/data/maps/tiles/cgb/lightning_club_entrance.bin b/src/data/maps/tiles/cgb/lightning_club_entrance.bin new file mode 100644 index 0000000000000000000000000000000000000000..1e2635f9ce162c57db158cc04a7a06da12714536 GIT binary patch literal 720 zcma))*-ip66o&aZ?evmYW*1Qeye5(5)uc0WL$R;ATH0_ibE+!|Fwtv1k z)13LzxJ1TQ9-n;7CTz-cHp`%jEQ+{53vc3GwB%a1TwR__t{C<7FcKf4C)c*++VW&_ z!=>VW&G?+n*%$YdR9tZdT*1xG?G@KVBNEp|=Y+ea65UXl+`g*cf-m^DbDJ7H(+k~& zxFuV%HS^!Try;%4Lx@|k)d|<9M|z?`h)c^^Z=CP?o%L?({dni*7vy%{ZzOIn{zR01 z2N6psu7HYTM&8cS_2pLnv*ytY<%agf+)w*r@&>v`FO(bF7sF{^Ox{59}Jbzcml6C+ui3dNeSW!}kw`{G)5s1bDP)F}r20R;y3TRn+;c#b<2@;^x#8Bbmb1JS z?9LiAY1xB4THBtiV?#!anJ{I>J99Stu;rIO{&C^PPkZ;wTD+z&s;3ILPf{KFA zg&Re2p@NE_qTa&y>)e`wnbVtL`s18??rrh6uYcsjlMW3?bhYVnU-H)N-+%U!ALLRY zqR0rLYJJs*8;_stYg0NX(@<*Ii1QaNa@Lir*Qk>xuiw1gzvz2WQ4|TG6BW1@FJI;P zGTndh&`&z&o<7^%rbr2`0V`mV6>H&})~>BAk3XO2tfsE`@Np0PG%zVN9;sy z?8Mh^Ageof?}0OzUDXp=tFajrYd>9<<$?0^neRUe*qu84X<;#NiK>H(c|7K**(!&k z&F-sW=R;M(ln9m*Gm_EscCoW*g1??RI}F3WgeU{%mG3jmLQA9yg6vbX5{BR z{7|^NIi~O%ed!n$8FXwhMJtcEZXuBqSut!;PA#(ZmNX z+-M*yzyt^h5ac!p;_J*@ZX1&3%go};FW;H-9Z-Mct@JM*KpmRrf_fHjB~)+W9sHJm zm1fIft!~eN_Az#V>Dv%@J-xOP7TZ|;~x(@4dLwx6I zj>=4bf@SfUyL3|#jaG0KZ@NQdI;SYfnuQvcAwz3$l`1fUiphezhx>TT%~Lc{1t#2r zTf-bZ<}<@inhI_at5y%}zb565yyAEIUA}pVbkX{S+zs2gTQ7)3u_Q|3FxKTi#3SdY z6Vg?Dk00Nfcg4ghdUj{85z#X~=yKtAO4)2n8nSJ``I(ua3i_N^}%rDwe=wzxXCe0>I=Dpl~ ejQ1Nr)+XBQ*W9JqXPU-&%Ja48=cd{`A@v`|w8ZcL literal 0 HcmV?d00001 diff --git a/src/data/maps/tiles/cgb/pokemon_dome.bgmap b/src/data/maps/tiles/cgb/pokemon_dome.bgmap deleted file mode 100644 index bb83ff5f234de734063c064457139d5285c56ff2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2048 zcmchY$#T;`5Qbw27HF|qZI&!7ArL|qAOr|S5|*&TGsPx3P{{$%F&DruKsZAc=m|jY zK=A|tYQTp6TQi!L65BcPtI9Jy)~D{jN2Pi9V%=)#87>>Ie|qn9Q5=OJ9b&`9==&Ch~E29Q726YD-mn3dkP> ze(#p@g8=-%U^{+b5WMTQ<6Rg0_(VH?d;+}Zwc|Yx{Ola@f1mGw2P)|aMh>g9bAsoG z1f;|Zg?_@9%Ea&8w;xA>7dH;UOvj<&2`%ehf_n@EaPxy>~Moj&ZXaAZ% zKQ{JIPbt6f&w%xx@W%gvgNC`YuyEJRD`!&w+&eIM|Ma7%2gd)Yp+ltfAxc#c4_`_B zQ@glh7Uc!A|CgptlZMg-N_E(5jxcUYqpw`mq}Ap#Z{%QQRZpHGp%L| z`%j-A1L&>OA^m~(@AseNnxrc3InI5`JY&{0&tEW5@Q=}a(!f)GzCKVD;3@M*vnF{| zp?QO6@|&D;%BcW+g#4L>#cupRq%hXZ diff --git a/src/data/maps/tiles/cgb/pokemon_dome.bin b/src/data/maps/tiles/cgb/pokemon_dome.bin new file mode 100644 index 0000000000000000000000000000000000000000..71f31d90e000d65c19dc056419eb534c2bd7c718 GIT binary patch literal 2048 zcmb`I$#T;`5QZ5LZm|E6SS^;Y2eU(fV89f6!Vb@b9de+O1K?vWfM0-chAQ9*fOnvH zf&djrKrN|fgft3v3jZ~wvAe(N{w-Vmik{G{Q;%qZWVtim(QEolAE@h8o38j*{cHYp zzwL~7W0v`zQyn_#f2o}Ezg9ZVc+c>2YI)+?yp~7LssF`)Q{UB(!kRLDO_4i8>Q9nO zGekk68E1Ube1ClZR$+Bc(}tg>e9QwgQh$Y3x`KJHe}!O1_?^{V)j@e?gg;(8Q5%$J zM)*s$%PIfcd+e<=PN4a9UyCmr4Z)1?elAkTd);}^^r*T^fqiaJtba3xc!UM*WS&mF6Bquv{|jnSEvONkNi~}GaxQjsKCat9)5Kfg{6+Kp_^E!W>>5dXxf%a| zZw1^}6D?$OcrU-7q<(TH@86`o2+w`B@HVcQ%@sa>Zolt^&z?ERUig0N<@1Ceq-Hjk z`SysZ}=ry7ZJ@mdv&ubxi%T`PZWt^l%AD{iSmL E0CVTo%m4rY literal 0 HcmV?d00001 diff --git a/src/data/maps/tiles/cgb/pokemon_dome_door_map_event.bgmap b/src/data/maps/tiles/cgb/pokemon_dome_door_map_event.bgmap deleted file mode 100644 index 7cc22621..00000000 --- a/src/data/maps/tiles/cgb/pokemon_dome_door_map_event.bgmap +++ /dev/null @@ -1 +0,0 @@ -ÄÅÄÅÂÃÂÃÄÅÄÅ \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/pokemon_dome_door_map_event.bin b/src/data/maps/tiles/cgb/pokemon_dome_door_map_event.bin new file mode 100644 index 00000000..94e90aa9 --- /dev/null +++ b/src/data/maps/tiles/cgb/pokemon_dome_door_map_event.bin @@ -0,0 +1 @@ +ÄÅÄÅÂÃÂÃÄÅÄÅ \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/pokemon_dome_entrance.bgmap b/src/data/maps/tiles/cgb/pokemon_dome_entrance.bgmap deleted file mode 100644 index d27d4f11..00000000 --- a/src/data/maps/tiles/cgb/pokemon_dome_entrance.bgmap +++ /dev/null @@ -1 +0,0 @@ -ƒ ‚‚‚‡…†ˆ´µ´µ´µ““““““““““°±²³–—˜™’“ª«†ˆ†ˆ¶·¶·¶·££££££££££ÀÁ¸¹¦§¨©¢£º»†ˆ†ˆ¶·¶·¶·ÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂì­†ˆ†ˆ¾¿¾¿¾¿ÄÅÄÅÄÅÄÅÄÅÄÅÄÅÄÅÄÅÄż½†ˆ†ˆÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂƈ†ˆÄÅÄÅÄÅÄÅÄÅÄÅÄÅÄÅÄÅÄÅÄÅÄÅÄÅÄņˆ†ˆÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂƈ†ˆ´µ´µ´µÄÅÄÅÄÅÄÅÄÅÄÅÄÅÄÅÄÅÄÅÄņˆ†ˆ¶·¶·¶·ÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂƈ†ˆ®¯®¯®¯ÄÅÄÅÄÅÄÅÄÅÄÅÄÅÄÅÄÅÄÅÆdžˆ†ˆÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÈɆˆ†ˆÄÅÄÅÄÅÄÅÄÅÄÅÄÅÄÅÄÅÄÅÄÅÄÅÄÅʈˆ†ˆÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÌ͆ˆ‰„‚ÄÅÄÅ•¥’““““““““““““”ÂÃÂÔ““““““““““““‘¢££££££££££££¤ÄÅÄŤ££££££££££££¡€€€€€€€€€€€€€€ÂÃÂÀ€€€€€€€€€€€€€ \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/pokemon_dome_entrance.bin b/src/data/maps/tiles/cgb/pokemon_dome_entrance.bin new file mode 100644 index 00000000..8a5a4450 --- /dev/null +++ b/src/data/maps/tiles/cgb/pokemon_dome_entrance.bin @@ -0,0 +1 @@ +ƒ ‚‚‚‡…†ˆ´µ´µ´µ““““““““““°±²³–—˜™’“ª«†ˆ†ˆ¶·¶·¶·££££££££££ÀÁ¸¹¦§¨©¢£º»†ˆ†ˆ¶·¶·¶·ÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂì­†ˆ†ˆ¾¿¾¿¾¿ÄÅÄÅÄÅÄÅÄÅÄÅÄÅÄÅÄÅÄż½†ˆ†ˆÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂƈ†ˆÄÅÄÅÄÅÄÅÄÅÄÅÄÅÄÅÄÅÄÅÄÅÄÅÄÅÄņˆ†ˆÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂƈ†ˆ´µ´µ´µÄÅÄÅÄÅÄÅÄÅÄÅÄÅÄÅÄÅÄÅÄņˆ†ˆ¶·¶·¶·ÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂƈ†ˆ®¯®¯®¯ÄÅÄÅÄÅÄÅÄÅÄÅÄÅÄÅÄÅÄÅÆdžˆ†ˆÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÈɆˆ†ˆÄÅÄÅÄÅÄÅÄÅÄÅÄÅÄÅÄÅÄÅÄÅÄÅÄÅʈˆ†ˆÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÌ͆ˆ‰„‚ÄÅÄÅ•¥’““““““““““““”ÂÃÂÔ““““““““““““‘¢££££££££££££¤ÄÅÄŤ££££££££££££¡€€€€€€€€€€€€€€ÂÃÂÀ€€€€€€€€€€€€€ \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/psychic_club.bgmap b/src/data/maps/tiles/cgb/psychic_club.bgmap deleted file mode 100644 index 08d8e8d1..00000000 --- a/src/data/maps/tiles/cgb/psychic_club.bgmap +++ /dev/null @@ -1 +0,0 @@ -ƒ•„„„„„„„„„„„„„„„„„„„„„„„„…’‘¢£¢£¢£¢£¢£¢£¢£¢£¢£¢£¢£¢£’‘’‘¤¥¤¥¤¥¤¥¤¥¤¥¤¥¤¥¤¥¤¥¤¥¤¥’‘’‘œœœœœœœœœœœœ’‘’‘ŽŽŽŽ°±Œ—°±ŽŽŽŽ’‘’‘žŸžŸžŸžŸ²³ˆ‰Š‹²³žŸžŸžŸžŸ’‘’‘ŽŽ°±Ž´µ˜™š›´µŽ°±ŽŽ’‘’‘žŸžŸ²³žŸ¶·ˆ‰Š‹¶·žŸ²³žŸžŸ’‘’‘ŽŽ´µŽ¸¹˜™š›¸¹Ž´µŽŽ’‘’‘žŸžŸ¶·žŸžŸˆ‰Š‹žŸžŸ¶·žŸžŸ’‘’‘ŽŽ¸¹ŽŽ˜™š›ŽŽ¸¹ŽŽ’‘’‘žŸžŸžŸžŸžŸˆ‰Š‹žŸžŸžŸžŸžŸ’‘’‘ŽŽŽŽŽ˜™š›ŽŽŽŽŽ’‘’‘žŸžŸžŸžŸžŸˆ‰Š‹žŸžŸžŸžŸžŸ’‘’‘ŽŽ°±ŽŽ˜™š›ŽŽ°±ŽŽ’‘’‘žŸžŸ²³žŸžŸˆ‰Š‹žŸžŸ²³žŸžŸ’‘’‘ŽŽ´µŽ°±˜™š›°±Ž´µŽŽ’‘’‘žŸžŸ¶·žŸ²³ˆ‰Š‹²³žŸ¶·žŸžŸ’‘’‘ŽŽ¸¹Ž´µ˜™š›´µŽ¸¹ŽŽ’‘’‘žŸžŸžŸžŸ¶·ˆ‰Š‹¶·žŸžŸžŸžŸ’‘’‘ŽŽŽŽ¸¹˜™š›¸¹ŽŽŽŽ’‘’‘žŸžŸžŸžŸžŸˆ‰Š‹žŸžŸžŸžŸžŸ’‘’‘ŽŽŽŽŽ˜™š›ŽŽŽŽŽ’‘’‘žŸžŸžŸžŸžŸˆ‰Š‹žŸžŸžŸžŸžŸ’‘“‚„„„„„„„„„‡˜™š›†„„„„„„„„„”–£¢£¢£¢£¢£¢£ ˆ‰Š‹ ¢£¢£¢£¢£¢£¢¥¤¥¤¥¤¥¤¥¤¥¡˜™š›¡¤¥¤¥¤¥¤¥¤¥¤€€€€€€€€€€€€ˆ‰Š‹€€€€€€€€€€€€ \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/psychic_club.bin b/src/data/maps/tiles/cgb/psychic_club.bin new file mode 100644 index 00000000..68d7b52d --- /dev/null +++ b/src/data/maps/tiles/cgb/psychic_club.bin @@ -0,0 +1 @@ +ƒ•„„„„„„„„„„„„„„„„„„„„„„„„…’‘¢£¢£¢£¢£¢£¢£¢£¢£¢£¢£¢£¢£’‘’‘¤¥¤¥¤¥¤¥¤¥¤¥¤¥¤¥¤¥¤¥¤¥¤¥’‘’‘œœœœœœœœœœœœ’‘’‘ŽŽŽŽ°±Œ—°±ŽŽŽŽ’‘’‘žŸžŸžŸžŸ²³ˆ‰Š‹²³žŸžŸžŸžŸ’‘’‘ŽŽ°±Ž´µ˜™š›´µŽ°±ŽŽ’‘’‘žŸžŸ²³žŸ¶·ˆ‰Š‹¶·žŸ²³žŸžŸ’‘’‘ŽŽ´µŽ¸¹˜™š›¸¹Ž´µŽŽ’‘’‘žŸžŸ¶·žŸžŸˆ‰Š‹žŸžŸ¶·žŸžŸ’‘’‘ŽŽ¸¹ŽŽ˜™š›ŽŽ¸¹ŽŽ’‘’‘žŸžŸžŸžŸžŸˆ‰Š‹žŸžŸžŸžŸžŸ’‘’‘ŽŽŽŽŽ˜™š›ŽŽŽŽŽ’‘’‘žŸžŸžŸžŸžŸˆ‰Š‹žŸžŸžŸžŸžŸ’‘’‘ŽŽ°±ŽŽ˜™š›ŽŽ°±ŽŽ’‘’‘žŸžŸ²³žŸžŸˆ‰Š‹žŸžŸ²³žŸžŸ’‘’‘ŽŽ´µŽ°±˜™š›°±Ž´µŽŽ’‘’‘žŸžŸ¶·žŸ²³ˆ‰Š‹²³žŸ¶·žŸžŸ’‘’‘ŽŽ¸¹Ž´µ˜™š›´µŽ¸¹ŽŽ’‘’‘žŸžŸžŸžŸ¶·ˆ‰Š‹¶·žŸžŸžŸžŸ’‘’‘ŽŽŽŽ¸¹˜™š›¸¹ŽŽŽŽ’‘’‘žŸžŸžŸžŸžŸˆ‰Š‹žŸžŸžŸžŸžŸ’‘’‘ŽŽŽŽŽ˜™š›ŽŽŽŽŽ’‘’‘žŸžŸžŸžŸžŸˆ‰Š‹žŸžŸžŸžŸžŸ’‘“‚„„„„„„„„„‡˜™š›†„„„„„„„„„”–£¢£¢£¢£¢£¢£ ˆ‰Š‹ ¢£¢£¢£¢£¢£¢¥¤¥¤¥¤¥¤¥¤¥¡˜™š›¡¤¥¤¥¤¥¤¥¤¥¤€€€€€€€€€€€€ˆ‰Š‹€€€€€€€€€€€€ \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/psychic_club_entrance.bgmap b/src/data/maps/tiles/cgb/psychic_club_entrance.bgmap deleted file mode 100644 index f9e323e461d2f25357821fb08f52b648a40f1026..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 720 zcmaKqOH%?d5QGh8;mBVWL{=A{oUL*pR}Krgiu@1-uf7!!R8TNIlhiH{?ZZ@8^;eTg zGUbC^sQUE$^14U%tRk!eDFf%DP~F`t6@!Zvd=#3jP%y=Eix%+E1w+O`ZdEn>~rvNxqM!TC|tox^Y6|3`naFP zCWnt(@3-9Ya7FVUr@SvXo%f|)b320ZoNp>p49@He)Nomr>u6E}&g=`+_HjE_;GFky Ezvmd&G5`Po diff --git a/src/data/maps/tiles/cgb/psychic_club_entrance.bin b/src/data/maps/tiles/cgb/psychic_club_entrance.bin new file mode 100644 index 0000000000000000000000000000000000000000..c3ae07dbeaddb253ad9c773a4314de6da26df4e8 GIT binary patch literal 720 zcma))$x;F_6h*nbq_gCgnMDu**Hp={b-}O&{SXzmiZY2zB5Fb^>Cnxh>s42hTc=;A zUY|5Bk+GG>2cNJhoAI2@GN>VoA}-Lzt9TP_xi&1Fu#k=UswPU%CJek~Z zskmQrzF-UX$^9f1S6l%lxY@bA;#z1%;(F+wa932OYpRgjSM^)+CI516Q>RCIqT3L+ zVk@>`{@Zu-Oe1;;acj0d;RZCMdwK|QX*uhy^IgBQ-tD|^@7(-?+}`_%#2v)1h|=#* z#1e`tpz4^Bx3hG8xsm^@b@W2Hp?xv;)4rIziQdr*<%agfaM~A>caaQ~;ez=;HQ3iO literal 0 HcmV?d00001 diff --git a/src/data/maps/tiles/cgb/psychic_medal.bgmap b/src/data/maps/tiles/cgb/psychic_medal.bgmap deleted file mode 100644 index 6626ea3c..00000000 --- a/src/data/maps/tiles/cgb/psychic_medal.bgmap +++ /dev/null @@ -1 +0,0 @@ -¶·¸¿ŸÆǯ \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/psychic_medal.bin b/src/data/maps/tiles/cgb/psychic_medal.bin new file mode 100644 index 00000000..b803f2ce --- /dev/null +++ b/src/data/maps/tiles/cgb/psychic_medal.bin @@ -0,0 +1 @@ +¶·¸¿ŸÆǯ \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/rock_club.bgmap b/src/data/maps/tiles/cgb/rock_club.bgmap deleted file mode 100644 index cf331b59..00000000 --- a/src/data/maps/tiles/cgb/rock_club.bgmap +++ /dev/null @@ -1 +0,0 @@ -ƒ „„„„„„„„„„„„„„„„„„„„„„„„‘…‚’“”“”“”“”“”“”“”“”“”“”“”“”‚’‚’‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‚’‚’ŒŒ•Š‹¹ºº»Š‹•ŒŒ‚’‚’œœ¥š›µ¶·¸š›¥œœ‚’‚’Œ••ª«µ¶·¸ª«•–Œ‚’‚’œ¥¬­µ¶·¸¬­¥œ‚’‚’••–µ¶·¸•–•‚’‚’¥¥¦µ¶·¸¥¦¥‚’‚’••–µ¶·¸•–•‚’‚’Ž•¥Š‹µ¶·¸Š‹¥¦Ž‚’‚’žŸ¥¦•š›µ¶·¸š›••–žŸ‚’‚’®¯Ž¥ª«µ¶·¸ª«¥Ž®¯‚’‚’•–žŸ••¬­µ¶·¸¬­•–žŸ•–‚’‚’Ž®¯¥•–µ¶·¸•–¥®¯Ž‚’‚’žŸ¥¦•¥¦µ¶·¸¥¦••–žŸ‚’‚’®¯•¥•–µ¶·¸•–¥¦®¯‚’‚’•¥¦µ¶·¸¥¦•‚’‚’¥Š‹µ¶·¸Š‹¥‚’‚’•š›µ¶·¸š›•‚’‚’¥ª«µ¶·¸ª«¥‚’‚’•¬­µ¶·¸¬­•‚’‚’Œ¥•–µ¶·¸•–¥Œ‚’‚’œ¥•¥¦µ¶·¸¥¦•¦œ‚’‚’ŒŒ¥•–µ¶·¸•–¥ŒŒ‚’‚’œœ•¥¦µ¶·¸¥¦•œœ‚’¢„„„„„„„„„‡µ¶·¸†„„„„„„„„„¡ˆ™“”“”“”“”“”—µ¶·¸—“”“”“”“”“”˜©‰‰‰‰‰‰‰‰‰‰§µ¶·¸§‰‰‰‰‰‰‰‰‰‰¨€€€€€€€€€€€€µ¶·¸€€€€€€€€€€€€ \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/rock_club.bin b/src/data/maps/tiles/cgb/rock_club.bin new file mode 100644 index 00000000..938623c2 --- /dev/null +++ b/src/data/maps/tiles/cgb/rock_club.bin @@ -0,0 +1 @@ +ƒ „„„„„„„„„„„„„„„„„„„„„„„„‘…‚’“”“”“”“”“”“”“”“”“”“”“”“”‚’‚’‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‚’‚’ŒŒ•Š‹¹ºº»Š‹•ŒŒ‚’‚’œœ¥š›µ¶·¸š›¥œœ‚’‚’Œ••ª«µ¶·¸ª«•–Œ‚’‚’œ¥¬­µ¶·¸¬­¥œ‚’‚’••–µ¶·¸•–•‚’‚’¥¥¦µ¶·¸¥¦¥‚’‚’••–µ¶·¸•–•‚’‚’Ž•¥Š‹µ¶·¸Š‹¥¦Ž‚’‚’žŸ¥¦•š›µ¶·¸š›••–žŸ‚’‚’®¯Ž¥ª«µ¶·¸ª«¥Ž®¯‚’‚’•–žŸ••¬­µ¶·¸¬­•–žŸ•–‚’‚’Ž®¯¥•–µ¶·¸•–¥®¯Ž‚’‚’žŸ¥¦•¥¦µ¶·¸¥¦••–žŸ‚’‚’®¯•¥•–µ¶·¸•–¥¦®¯‚’‚’•¥¦µ¶·¸¥¦•‚’‚’¥Š‹µ¶·¸Š‹¥‚’‚’•š›µ¶·¸š›•‚’‚’¥ª«µ¶·¸ª«¥‚’‚’•¬­µ¶·¸¬­•‚’‚’Œ¥•–µ¶·¸•–¥Œ‚’‚’œ¥•¥¦µ¶·¸¥¦•¦œ‚’‚’ŒŒ¥•–µ¶·¸•–¥ŒŒ‚’‚’œœ•¥¦µ¶·¸¥¦•œœ‚’¢„„„„„„„„„‡µ¶·¸†„„„„„„„„„¡ˆ™“”“”“”“”“”—µ¶·¸—“”“”“”“”“”˜©‰‰‰‰‰‰‰‰‰‰§µ¶·¸§‰‰‰‰‰‰‰‰‰‰¨€€€€€€€€€€€€µ¶·¸€€€€€€€€€€€€ \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/rock_club_entrance.bgmap b/src/data/maps/tiles/cgb/rock_club_entrance.bgmap deleted file mode 100644 index 82f471b03f996f89299749d360f8edeec3ae344d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 720 zcmaKqNmBwb5QPn9;K*N=MMnoWJX6I$u2eaYE9k#)`3Hh4vbdmVUUyP6Lhv2BUe)`m z(@DB~P=WRy9-p3f$=0jFDv&a8J_^;{P^lPPtl*>2WQBq$mLng9dUUUK0xr?;o469` zWjuam2QEiKKXyXw*EmgU$}xi~M7xy|?EGA>%jx0K@yRN;ZRF0KOr{h!uCAMo3j!W1 z%gttQ6nAcJ&mAYFq&8V@K4-2!xVZd}D_7q+w)Nu^_pr~w!{zdMA)@dPR$6?m-`B@| zFV{JI+-kp{Ee}^T|8dIug420l&T4K)FrM>mMT)_heSumo%W^$UO2C;014Y?HHW9IPQN#sWcoXlUCD*#;>hffA#i*x;k@yfjxwb9WmM4=N zE*1A{#^-F#zPO*H;)*Na3T}38uec@}k+?28C)_oa=!VMV_Er5Be8In++tlcpUg$2w zE!mQ-ng8}Z4e6C0Lfne2PPje|=#id6Tw2b0<9yfetan@Q$2&K_Ah+{=BXN82C!+K_ zh*&~#1ymd}@^+T4FSqiaHIH5>H?%M2e%cq4H_$zLq1@2E7*6|Q@(z-LGF&kK2hWw( A?f?J) literal 0 HcmV?d00001 diff --git a/src/data/maps/tiles/cgb/rock_medal.bgmap b/src/data/maps/tiles/cgb/rock_medal.bgmap deleted file mode 100644 index 1162d9fe..00000000 --- a/src/data/maps/tiles/cgb/rock_medal.bgmap +++ /dev/null @@ -1 +0,0 @@ -³´µ¼½¾ÃÄÅ \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/rock_medal.bin b/src/data/maps/tiles/cgb/rock_medal.bin new file mode 100644 index 00000000..7d839f3e --- /dev/null +++ b/src/data/maps/tiles/cgb/rock_medal.bin @@ -0,0 +1 @@ +³´µ¼½¾ÃÄÅ \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/science_club.bgmap b/src/data/maps/tiles/cgb/science_club.bgmap deleted file mode 100644 index b5309223..00000000 --- a/src/data/maps/tiles/cgb/science_club.bgmap +++ /dev/null @@ -1 +0,0 @@ -°Â±±±±±±±±±±±±±±Æ±±±±±±±±Æ²ÃÀ¨¨£”¨¨‰Š‹Œ‰Š‹ŒÃÀ‰Š‹Œ‰Š‹ŒÃÀÃÀ‚ƒ„¸¸™Ç›œ™Ç›œÃÀ™Ç›œ™Ç›œÃÀÃÀ‘’“¤¤©ª«¬©ª«¬ÃÀ©ª«¬©ª«¬ÃÀÃÀ ¡¡¢¤¤¹º»¼¹º»¼ÃÀ¹º»¼¹º»¼ÃÀÃÀ¤¤¤¤¤¤¤¤¤¤¤¤¤¤ÃÀ¤¤¤¤¤¤¤¤ÃÀÃÀ¤¤¤¤¤¤¤¤¤¤¤¤¤¤ÃÀ¤¤¤¤¤¤¤¤ÃÀÃÀ¤¤¤¤¤¤¤¤¤¤¤¤¤¤ÃÀ¤¤¤¤¤¤¤¤ÃÀÃÀ¤¤¤¤¤¤¤¤¤¤¤¤¤¤ÃÀ¤¤¤¤¤¤¤¤ÃÀÃÀ¤¤¤¤¤¤¤¤¤¤¤¤¤¤ÃÀ¤¤¤¤¤¤¤¤ÃÀÃÀ¤¤¤¤¤¤¤¤¤¤¤¤¤¤ÃÀ¤¤¤¤¤¤¤¤ÃÀÃÀ¤¤¤¤¤¤¤¤¤¤¤¤¤¤ÃÀ¤¤¤¤¤¤¤¤ÃÀÚ±±±±±´¤¤³±±±±±ÉĤ¤¤¤¤¤¤¤ÃÀÃÀ…†…†¨ˆ¤¤§¨¨¨¨¨¨ˆ¤¤¤¤¤¤¤¤ÃÀÃÀ•–•–¸˜¤¤·¸¸¸¸¸¸˜¤¤¤¤¤¤¤¤ÃÀÃÀ¥¦¥¦¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤ÃÀÃÀµ¶µ¶¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤ÃÀÃÀ¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤ÃÀÃÀ¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤ÃÀÃÀ¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤ÃÀÃÀ¤¤¤¤¤¤¤¤¤¤¤¤Ž½Ž½Ž½ÃÀÃÀ¤¤¤¤¤¤¤¤¤¤¤¤žŸ¾žŸ¾žŸ¾ÃÀÃÀ¤¤¤¤¤¤¤¤¤¤¤¤­®¯¿­®¯¿­®¯¿ÃÀÃÀ¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤ÃÀÃÀ¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤ÃÀÃÀ¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤ÃÀÃÀ¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤ÃÀÃÀ¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤ÃÀÁű±±±±±±±±´ÊËÌͳ±±±±±±±±±ÉĨ¨¨¨¨¨¨¨¨¨¨‡ÎÏÐч¨¨¨¨¨¨¨¨¨¨ˆ¸¸¸¸¸¸¸¸¸¸¸—ÎÏÐÑ—¸¸¸¸¸¸¸¸¸¸˜€€€€€€€€€€€€ÎÏÐÑ€€€€€€€€€€€€ \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/science_club.bin b/src/data/maps/tiles/cgb/science_club.bin new file mode 100644 index 00000000..dee0d1d2 --- /dev/null +++ b/src/data/maps/tiles/cgb/science_club.bin @@ -0,0 +1 @@ +°Â±±±±±±±±±±±±±±Æ±±±±±±±±Æ²ÃÀ¨¨£”¨¨‰Š‹Œ‰Š‹ŒÃÀ‰Š‹Œ‰Š‹ŒÃÀÃÀ‚ƒ„¸¸™Ç›œ™Ç›œÃÀ™Ç›œ™Ç›œÃÀÃÀ‘’“¤¤©ª«¬©ª«¬ÃÀ©ª«¬©ª«¬ÃÀÃÀ ¡¡¢¤¤¹º»¼¹º»¼ÃÀ¹º»¼¹º»¼ÃÀÃÀ¤¤¤¤¤¤¤¤¤¤¤¤¤¤ÃÀ¤¤¤¤¤¤¤¤ÃÀÃÀ¤¤¤¤¤¤¤¤¤¤¤¤¤¤ÃÀ¤¤¤¤¤¤¤¤ÃÀÃÀ¤¤¤¤¤¤¤¤¤¤¤¤¤¤ÃÀ¤¤¤¤¤¤¤¤ÃÀÃÀ¤¤¤¤¤¤¤¤¤¤¤¤¤¤ÃÀ¤¤¤¤¤¤¤¤ÃÀÃÀ¤¤¤¤¤¤¤¤¤¤¤¤¤¤ÃÀ¤¤¤¤¤¤¤¤ÃÀÃÀ¤¤¤¤¤¤¤¤¤¤¤¤¤¤ÃÀ¤¤¤¤¤¤¤¤ÃÀÃÀ¤¤¤¤¤¤¤¤¤¤¤¤¤¤ÃÀ¤¤¤¤¤¤¤¤ÃÀÚ±±±±±´¤¤³±±±±±ÉĤ¤¤¤¤¤¤¤ÃÀÃÀ…†…†¨ˆ¤¤§¨¨¨¨¨¨ˆ¤¤¤¤¤¤¤¤ÃÀÃÀ•–•–¸˜¤¤·¸¸¸¸¸¸˜¤¤¤¤¤¤¤¤ÃÀÃÀ¥¦¥¦¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤ÃÀÃÀµ¶µ¶¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤ÃÀÃÀ¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤ÃÀÃÀ¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤ÃÀÃÀ¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤ÃÀÃÀ¤¤¤¤¤¤¤¤¤¤¤¤Ž½Ž½Ž½ÃÀÃÀ¤¤¤¤¤¤¤¤¤¤¤¤žŸ¾žŸ¾žŸ¾ÃÀÃÀ¤¤¤¤¤¤¤¤¤¤¤¤­®¯¿­®¯¿­®¯¿ÃÀÃÀ¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤ÃÀÃÀ¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤ÃÀÃÀ¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤ÃÀÃÀ¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤ÃÀÃÀ¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤ÃÀÁű±±±±±±±±´ÊËÌͳ±±±±±±±±±ÉĨ¨¨¨¨¨¨¨¨¨¨‡ÎÏÐч¨¨¨¨¨¨¨¨¨¨ˆ¸¸¸¸¸¸¸¸¸¸¸—ÎÏÐÑ—¸¸¸¸¸¸¸¸¸¸˜€€€€€€€€€€€€ÎÏÐÑ€€€€€€€€€€€€ \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/science_club_entrance.bgmap b/src/data/maps/tiles/cgb/science_club_entrance.bgmap deleted file mode 100644 index e5f661f528855c836a4e7422d0d69b07ebad40ed..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 720 zcmaKqOH%?d5QGh8;mBVWL{=A{oUL*pR}Kp~iYWMJd@CTRpkR6?sa+u2hpDdWuO^dZ z$_Kkp_38QLb&u>>MOXz=2F^#Jy1Q2@1{W*%C^T82V2b6)N1=Xr)H(r|X!yUl66tL? z9I*qJBcUHVA@*yWrZwf5K^3CeNC|d+uG8l9@aXtto!d5Y=Z?qk6rW$-TsSTWc&scp znS4;(>JM%mC#9q|S#COIu6xzH{*NnHJ~_7aYleH+=iuRT`MeNOxPq1D-<$XKaX*Vq z4j;GPZ@J~+isnB~d0%ik?@PVrb_C-&-&CX+oY@zs;j%2((WC^N*%zqo<94jTIq&0s E0RlMIq5uE@ diff --git a/src/data/maps/tiles/cgb/science_club_entrance.bin b/src/data/maps/tiles/cgb/science_club_entrance.bin new file mode 100644 index 0000000000000000000000000000000000000000..0a99b26884e8e8e691477774949a9e317a382e8f GIT binary patch literal 720 zcma))$x;F_6h*nbq_gCgnMDu**Hp={b-}O%C;S;jnM5WLH6fLB=w{LNsw>H@)2~yn zPa2oV*vjLBPuP^rc+O@S)R09H7ii;Eyot748J#u0Q(}14nHpH#i zifx$x_8mRbh+ab6nypW`A>GphJ%+fnob}fEuHRYjcHXylZhk>-@BKvL4&qlt>GvmM y3B?sqbaG`6MJgU?71!Dl5KW$rE7J0qg%c5P4DXKgP$5`s9E_H z&>VvbDXe+LOxz?)QYodC(VDi*w%IYeDrryqI^cy!i+8+dj}Lt06QB9Q PFMjifzZ~(8WBzjj%!opa literal 0 HcmV?d00001 diff --git a/src/data/maps/tiles/cgb/solid_tiles_1.bgmap b/src/data/maps/tiles/cgb/solid_tiles_1.bgmap deleted file mode 100644 index ba3d0b2cc658df5084c4c3a68a878be073b4ac94..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 720 zcmbV|OAY`b2t(yFdjA^_Mk*|rXr>#R@T^iIVir-2lNv-W=4S3c$1ZWH)_J#_x*k{W zb>1!4UBhMjm;2USw6uD({)k1NKESWMZw`A*4jn|_k%xUw9D1G{e3gf{P8@zdIsBo@ ZvpJMF+>Si}*|~?wr17?CyzL$)^8&C*22}t6 diff --git a/src/data/maps/tiles/cgb/solid_tiles_1.bin b/src/data/maps/tiles/cgb/solid_tiles_1.bin new file mode 100644 index 0000000000000000000000000000000000000000..acace1535caf4e92a7f104af54e6b6dbe3d07901 GIT binary patch literal 720 zcmb`F%L)TA3go zHkIG0jv-{E$0{o;hkyiogZxf)=p6zQY}s-MNN6wlo$8dBw$x;D+uu!gI9_%89;4$H z3Q*w{bFSN7Pr5zl(Q#KDK;aiVuUqaIk!$sT_i$St)qjSrWS<7G9x&QSDs# zN^77dhrJRaJ#vXH4czTT2}XN>yP=+;vHJxl!lab+d%-P}3|se;UvN1=fGlgR?%6XwZTuvmx%XtgRlp$x3`54zu>l-Q PT6Gc-OA3!ATQ1#yUdIF0 diff --git a/src/data/maps/tiles/cgb/solid_tiles_2.bin b/src/data/maps/tiles/cgb/solid_tiles_2.bin new file mode 100644 index 0000000000000000000000000000000000000000..cf72c9e1d342e382c05721752013e099ab41e3db GIT binary patch literal 720 zcma*k+Y*Ez3@hwiIIrITn_+dpc;GZe0~m z;k@{^-{~C6ONWBT{RpDFLXGo0y_pU)52x8;-8p-sdzBtzI9=QHhtuhrer}#W>bTBn G{ir`*vIEut literal 0 HcmV?d00001 diff --git a/src/data/maps/tiles/cgb/solid_tiles_3.bgmap b/src/data/maps/tiles/cgb/solid_tiles_3.bgmap deleted file mode 100644 index ad685b1af471793c01979f752c7d944474439c6e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 720 zcmeH_OAde_3`9HhAY%=toGcaCus z5t&(43(SA+%YVUFOt~wTVN(^3QE5{N2HQzTUM_ggfE8c> zXEK`F%xM0)zRY*-LMCJl=TFbRGd%lgL5>Yo0SW^BpeM2*azfndyl^jUg2u^1iv||v LK_m4x?^gE%QJ4rP literal 0 HcmV?d00001 diff --git a/src/data/maps/tiles/cgb/solid_tiles_4.bgmap b/src/data/maps/tiles/cgb/solid_tiles_4.bgmap deleted file mode 100644 index 1c2409d3..00000000 --- a/src/data/maps/tiles/cgb/solid_tiles_4.bgmap +++ /dev/null @@ -1,5 +0,0 @@ -üüüüüüüü - ýýýýýýýý - þþþþþþþþ - ÿÿÿÿÿÿÿÿ -  \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/solid_tiles_4.bin b/src/data/maps/tiles/cgb/solid_tiles_4.bin new file mode 100644 index 00000000..46d4ded5 --- /dev/null +++ b/src/data/maps/tiles/cgb/solid_tiles_4.bin @@ -0,0 +1,5 @@ +üü ü +ü ü ü üüýý ý +ý ý ý ýýþþ þ +þ þ þ þþÿÿ ÿ +ÿ ÿ ÿ ÿÿ \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/title_screen.bgmap b/src/data/maps/tiles/cgb/title_screen.bgmap deleted file mode 100644 index d1ac30e53ba8a285a11acdf9e0e96b3e069b34c1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 720 zcmZQz00BlOW)@a9FcVHNf&rY%z|O(R#m&RZ$1fl#BrLKHECEpiC&6N(V&W2#QqnTA za`Fm_O6xa(1mP;643LOXY zP*_x4Qd(ACTv1+GRb5yBQpp4dNRUzF>}`JIdkXDU$6tN z27|G1(c&dbmn~nha@FcJYj(VB+ZXiIb;Joj!B+ S)ag^F&Yiz-8Jju>1_l7&B4!c* diff --git a/src/data/maps/tiles/cgb/title_screen.bin b/src/data/maps/tiles/cgb/title_screen.bin new file mode 100644 index 0000000000000000000000000000000000000000..439a40c9d16e39b163b02f7b7c937f48034a6e68 GIT binary patch literal 720 zcmZ{fWph+P5Jm6lH@mpI!{Y8P2?Td{cPGJu1cFNv+}+*X-5tUoB1=`?+og)`4}E9m zbl+(y2rxVxA;JW=fyzT(@{ykc6r>P^DMC?-QJfN#agWO;@#0~X^F`Ni%89tXgH>f+=75B5?C06Zb&wr@B+Nb?Gpo2Q3!#bj)I;P_~p_6(TJ3yy& zT4!`t=X72dbWxXdSyyyb*Yqfcd#opVs%Ltx7ka5zdaXBlt9N>@5BjBSpZus#`ka$r V^i|*f*68WGe(0xuD?2d?{s9M=W)c7Z literal 0 HcmV?d00001 diff --git a/src/data/maps/tiles/cgb/water_club.bgmap b/src/data/maps/tiles/cgb/water_club.bgmap deleted file mode 100644 index 11a52e8bebd2721479bcb3d694e4be4152f9084f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1792 zcmb7_Yfscr5Qb^HNn>RfK|w$Pe=1)2TCw_B6vE0SX%sfAXd;^IdK&pEv?%zVptU)82k?r$;=zYxD`vtycFB_7AEZ;km$U8QpNtt=A8a z4v*?A9$iM#ohuE}Q#^O6<}6>ReOelSn#AKEdi^Gd!VsKom*vm4hf+z?v@BDGVR&w> z(fn|6V{?4F6}RI!_J#PkbNb_FL>$NrGr%Cg?e6XFNww`bZb|I(i!cnLUuVBFj$t{j z*=RPTnq&}P-UpEo_$xiFX5_eyO)8SOmJe^*A6LtBXh~WmDwY07G1XHoNjgLB$RE^_ zjzF*-`=l16{&HBZ&LCP;*b_O4x7;6|%!BKJLxJtM<(Df%m$*O9m1S^Fi05BZ&>tQd z9^wA_abfuG8}(9qgGcm*b4m*<<}T~Rz#%DTpw!mZdvlhRa;h)c?661AmtKVQ83E@_y;YISz3XlbzjE?-#w3^G|@@wd<;b zdR6b2e%#b_r$1DHIaDfn9hE_E=0>MKDEH@X-p@V{bKj4TPwr*u{4IXcOEP%AqQ48P pS4PLKuIl_5zi&_m&tK{9!WOtKoxkMw6}ed!;8;3q7z0@pxqnlKjRyb# diff --git a/src/data/maps/tiles/cgb/water_club.bin b/src/data/maps/tiles/cgb/water_club.bin new file mode 100644 index 0000000000000000000000000000000000000000..50ceecfa6985371ead2be0aee29d7eb7b4663365 GIT binary patch literal 1792 zcmb7_X-^bE5QeFqO)8Aj!y$O!0Y4QF$qJax9ApA-%E%?u3MjI+=BMbU5{ zvIm8;3Ez_&)sn{ciMHC3zSB{?&^96!dnl`B-ONU>BlwTb$dzLGE6R#lF>lS9*)zY)Z^x2*uOAdG*P72pgM@9%q(B2&`{uy>@wlZ-Z}CtoAJ6Mo zd6UHnO|bCPLv((GWZ*YloXm@!9IH_sAsCQ(e$;{|N3BXNsEFDWkMd)l=sP1U^qwOTKt@u-@stxNs7Ax7*|a+vdxx0CZdJ(ulEjP*4O@tPsWxKHZIVNS$d zJ9ndJpYzWb#vi9m4)G&yo-aS2kS00K&GW_QMxI<~&XDF`^Ut)zmGjpuANEUZ;wY|s zUoP67Z109N{8*SjA~UA@jAC{N zO(q`{U)7>(>nTu+PE6*IbF zn;brFz2EPahbx-@IN^Q4>AWvzb+;oJ&-tbz#o)}oKn<5=xwa-H;LN^2Egx610_VJs FTLS6a*D(M9 diff --git a/src/data/maps/tiles/cgb/water_club_entrance.bin b/src/data/maps/tiles/cgb/water_club_entrance.bin new file mode 100644 index 0000000000000000000000000000000000000000..b76744041ecf36dd0d74968595ac612f92011812 GIT binary patch literal 720 zcma))$x;F_6h*zfq_gyw859s1U9(`=x?tF<{DPqT1Ct^k-~^bEN;-72=z7(aDQdG2?ISoz3~R%~Gh~3OQuZ#7K-qQ?513)#SEExDg0Vv5V+7H)QKueb*4k+=@pCtRKiRHPEQeO12|U-3`pHdT72J`F)p5aDe4>)Mo AF#rGn literal 0 HcmV?d00001 diff --git a/src/data/maps/tiles/cgb/water_medal.bgmap b/src/data/maps/tiles/cgb/water_medal.bgmap deleted file mode 100644 index b5947d91..00000000 --- a/src/data/maps/tiles/cgb/water_medal.bgmap +++ /dev/null @@ -1 +0,0 @@ -‰Š‹™š›©ª« \ No newline at end of file diff --git a/src/data/maps/tiles/cgb/water_medal.bin b/src/data/maps/tiles/cgb/water_medal.bin new file mode 100644 index 00000000..997fff76 --- /dev/null +++ b/src/data/maps/tiles/cgb/water_medal.bin @@ -0,0 +1 @@ +‰Š‹™š›©ª« \ No newline at end of file diff --git a/tools/.gitignore b/tools/.gitignore index 0db9d952..9c253a7c 100644 --- a/tools/.gitignore +++ b/tools/.gitignore @@ -1,5 +1,6 @@ scan_includes gfx compressor +bgmap *.exe diff --git a/tools/Makefile b/tools/Makefile index d5b35f9a..b913ef12 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -3,7 +3,7 @@ CC := gcc CFLAGS := -O3 -std=c99 -Wall -Wextra -pedantic -tools := scan_includes gfx compressor +tools := scan_includes gfx compressor bgmap all: $(tools) @: diff --git a/tools/bgmap.c b/tools/bgmap.c new file mode 100644 index 00000000..0063f13c --- /dev/null +++ b/tools/bgmap.c @@ -0,0 +1,116 @@ +#include +#include +#include +#include +#include + +#define MAX_FILE_SIZE 0x8000 + +struct Dimensions +{ + unsigned width; + unsigned height; +}; + +void usage(const char *programName) +{ + fprintf(stderr, "Usage: %s \n\n", programName); + fputs("Interleaves tile and attribute bytes according to map dimensions.\n", stderr); +} + +int *readFileToBuffer(const char *inFilename, unsigned *fileSize) +{ + FILE *fi = fopen(inFilename, "rb"); + if (fi == NULL) + return NULL; + + int *fileBuffer = (int*) malloc(MAX_FILE_SIZE * sizeof(int)); + for (unsigned i = 0; i < MAX_FILE_SIZE; i++) + { + int c = fgetc(fi); + if (feof(fi)) + { + *fileSize = i; + break; + } + fileBuffer[i] = c; + } + + fclose(fi); + return fileBuffer; +} + +struct Dimensions getDimensions(const char *name) +{ + char *dimensionsFilename = (char*) malloc((strlen(name) + strlen(".dimensions") + 1) * sizeof(char)); + strcpy(dimensionsFilename, name); + strcat(dimensionsFilename, ".dimensions"); + + struct Dimensions dimensions; + FILE *fd = fopen(dimensionsFilename, "rb"); + if (fd != NULL) + { + dimensions.width = fgetc(fd); + dimensions.height = fgetc(fd); + fclose(fd); + } + + free(dimensionsFilename); + return dimensions; +} + +int main(int argc, char *argv[]) +{ + const char *programName = argv[0]; + + if (argc != 3) + { + usage(programName); + return 1; + } + + const char *inFilename = argv[1]; + const char *outFilename = argv[2]; + + char *name = (char*) malloc((strlen(inFilename)) * sizeof(char)); + const size_t nameLen = strcspn(inFilename, "."); + strncpy(name, inFilename, nameLen); + name[nameLen] = '\0'; + + const struct Dimensions dimensions = getDimensions(name); + + unsigned fileSize; + int *fileBuffer = readFileToBuffer(inFilename, &fileSize); + if (fileBuffer == NULL) + { + fprintf(stderr, "Error: %d (%s)\n", errno, strerror(errno)); + return 1; + } + + if (fileSize != dimensions.width * dimensions.height * 2) + { + fprintf(stderr, "Error, dimensions don't match the map data size: dimensions = %dx%d, file size = %d\n", dimensions.width, dimensions.height, fileSize); + return 1; + } + + int *outBuffer = (int*) malloc(fileSize * sizeof(int)); + unsigned idx = 0; + for (unsigned h = 0; h < dimensions.height; h++) + { + for (unsigned w = 0; w < dimensions.width; w++) + { + outBuffer[dimensions.width * (2 * h + 0) + w] = fileBuffer[idx++]; + outBuffer[dimensions.width * (2 * h + 1) + w] = fileBuffer[idx++]; + } + } + + FILE *fo = fopen(outFilename, "wb"); + for (unsigned i = 0; i < fileSize; i++) + fputc(outBuffer[i], fo); + + free(fileBuffer); + free(outBuffer); + free(name); + + return 0; +} From 9a889d4f3eb12b847a70cc52233ec94a4485fe6f Mon Sep 17 00:00:00 2001 From: ElectroDeoxys Date: Wed, 8 Nov 2023 21:29:41 +0000 Subject: [PATCH 4/7] Join GB and CGB permissions in one directory --- .../permissions/{cgb => }/challenge_hall.bin | Bin .../{cgb => }/challenge_hall.bin.lz.match | Bin .../{cgb => }/challenge_hall_entrance.bin | Bin .../challenge_hall_entrance.bin.lz.match | Bin .../{cgb => }/challenge_machine_map_event.bin | Bin .../maps/permissions/{cgb => }/club_lobby.bin | Bin .../{cgb => }/club_lobby.bin.lz.match | Bin .../{cgb => }/deck_machine_map_event.bin | 0 .../{cgb => }/deck_machine_room.bin | Bin .../{cgb => }/deck_machine_room.bin.lz.match | Bin .../permissions/{cgb => }/fighting_club.bin | Bin .../{cgb => }/fighting_club.bin.lz.match | Bin .../{cgb => }/fighting_club_entrance.bin | Bin .../fighting_club_entrance.bin.lz.match | Bin .../maps/permissions/{cgb => }/fire_club.bin | Bin .../{cgb => }/fire_club.bin.lz.match | Bin .../{cgb => }/fire_club_entrance.bin | Bin .../{cgb => }/fire_club_entrance.bin.lz.match | Bin .../maps/permissions/gb/challenge_hall.bin | Bin 256 -> 0 bytes .../gb/challenge_hall.bin.lz.match | Bin 47 -> 0 bytes .../gb/challenge_hall_entrance.bin | Bin 90 -> 0 bytes .../gb/challenge_hall_entrance.bin.lz.match | Bin 20 -> 0 bytes .../gb/challenge_machine_map_event.bin | Bin 6 -> 0 bytes src/data/maps/permissions/gb/club_lobby.bin | Bin 182 -> 0 bytes .../permissions/gb/club_lobby.bin.lz.match | Bin 28 -> 0 bytes .../permissions/gb/deck_machine_map_event.bin | 1 - .../maps/permissions/gb/deck_machine_room.bin | Bin 180 -> 0 bytes .../gb/deck_machine_room.bin.lz.match | Bin 24 -> 0 bytes .../maps/permissions/gb/fighting_club.bin | Bin 108 -> 0 bytes .../permissions/gb/fighting_club.bin.lz.match | Bin 17 -> 0 bytes .../permissions/gb/fighting_club_entrance.bin | Bin 90 -> 0 bytes .../gb/fighting_club_entrance.bin.lz.match | Bin 20 -> 0 bytes src/data/maps/permissions/gb/fire_club.bin | Bin 224 -> 0 bytes .../permissions/gb/fire_club.bin.lz.match | Bin 28 -> 0 bytes .../permissions/gb/fire_club_entrance.bin | Bin 90 -> 0 bytes .../gb/fire_club_entrance.bin.lz.match | Bin 20 -> 0 bytes src/data/maps/permissions/gb/grass_club.bin | Bin 224 -> 0 bytes .../permissions/gb/grass_club.bin.lz.match | Bin 36 -> 0 bytes .../permissions/gb/grass_club_entrance.bin | Bin 90 -> 0 bytes .../gb/grass_club_entrance.bin.lz.match | Bin 20 -> 0 bytes .../maps/permissions/gb/hall_of_honor.bin | Bin 156 -> 0 bytes .../permissions/gb/hall_of_honor.bin.lz.match | Bin 24 -> 0 bytes .../gb/hall_of_honor_door_map_event.bin | Bin 4 -> 0 bytes src/data/maps/permissions/gb/ishihara.bin | Bin 120 -> 0 bytes .../maps/permissions/gb/ishihara.bin.lz.match | Bin 20 -> 0 bytes .../maps/permissions/gb/lightning_club.bin | Bin 224 -> 0 bytes .../gb/lightning_club.bin.lz.match | Bin 34 -> 0 bytes .../gb/lightning_club_entrance.bin | Bin 90 -> 0 bytes .../gb/lightning_club_entrance.bin.lz.match | Bin 20 -> 0 bytes .../maps/permissions/gb/mason_laboratory.bin | Bin 210 -> 0 bytes .../gb/mason_laboratory.bin.lz.match | Bin 29 -> 0 bytes src/data/maps/permissions/gb/pokemon_dome.bin | Bin 256 -> 0 bytes .../permissions/gb/pokemon_dome.bin.lz.match | Bin 33 -> 0 bytes .../gb/pokemon_dome_door_map_event.bin | Bin 4 -> 0 bytes .../permissions/gb/pokemon_dome_entrance.bin | Bin 144 -> 0 bytes .../gb/pokemon_dome_entrance.bin.lz.match | Bin 20 -> 0 bytes src/data/maps/permissions/gb/psychic_club.bin | Bin 196 -> 0 bytes .../permissions/gb/psychic_club.bin.lz.match | Bin 31 -> 0 bytes .../permissions/gb/psychic_club_entrance.bin | Bin 90 -> 0 bytes .../gb/psychic_club_entrance.bin.lz.match | Bin 20 -> 0 bytes src/data/maps/permissions/gb/rock_club.bin | Bin 210 -> 0 bytes .../permissions/gb/rock_club.bin.lz.match | Bin 33 -> 0 bytes .../permissions/gb/rock_club_entrance.bin | Bin 90 -> 0 bytes .../gb/rock_club_entrance.bin.lz.match | Bin 20 -> 0 bytes src/data/maps/permissions/gb/science_club.bin | Bin 224 -> 0 bytes .../permissions/gb/science_club.bin.lz.match | Bin 31 -> 0 bytes .../permissions/gb/science_club_entrance.bin | Bin 90 -> 0 bytes .../gb/science_club_entrance.bin.lz.match | Bin 20 -> 0 bytes src/data/maps/permissions/gb/water_club.bin | Bin 224 -> 0 bytes .../permissions/gb/water_club.bin.lz.match | Bin 36 -> 0 bytes .../permissions/gb/water_club_entrance.bin | Bin 90 -> 0 bytes .../gb/water_club_entrance.bin.lz.match | Bin 20 -> 0 bytes .../maps/permissions/{cgb => }/grass_club.bin | Bin .../{cgb => }/grass_club.bin.lz.match | Bin .../{cgb => }/grass_club_entrance.bin | Bin .../grass_club_entrance.bin.lz.match | Bin .../permissions/{cgb => }/hall_of_honor.bin | Bin .../{cgb => }/hall_of_honor.bin.lz.match | Bin .../hall_of_honor_door_map_event.bin | Bin .../maps/permissions/{cgb => }/ishihara.bin | Bin .../{cgb => }/ishihara.bin.lz.match | Bin .../permissions/{cgb => }/lightning_club.bin | Bin .../{cgb => }/lightning_club.bin.lz.match | Bin .../{cgb => }/lightning_club_entrance.bin | Bin .../lightning_club_entrance.bin.lz.match | Bin .../{cgb => }/mason_laboratory.bin | Bin .../{cgb => }/mason_laboratory.bin.lz.match | Bin .../permissions/{cgb => }/pokemon_dome.bin | Bin .../{cgb => }/pokemon_dome.bin.lz.match | Bin .../{cgb => }/pokemon_dome_door_map_event.bin | Bin .../{cgb => }/pokemon_dome_entrance.bin | Bin .../pokemon_dome_entrance.bin.lz.match | Bin .../permissions/{cgb => }/psychic_club.bin | Bin .../{cgb => }/psychic_club.bin.lz.match | Bin .../{cgb => }/psychic_club_entrance.bin | Bin .../psychic_club_entrance.bin.lz.match | Bin .../maps/permissions/{cgb => }/rock_club.bin | Bin .../{cgb => }/rock_club.bin.lz.match | Bin .../{cgb => }/rock_club_entrance.bin | Bin .../{cgb => }/rock_club_entrance.bin.lz.match | Bin .../permissions/{cgb => }/science_club.bin | Bin .../{cgb => }/science_club.bin.lz.match | Bin .../{cgb => }/science_club_entrance.bin | Bin .../science_club_entrance.bin.lz.match | Bin .../maps/permissions/{cgb => }/water_club.bin | Bin .../{cgb => }/water_club.bin.lz.match | Bin .../{cgb => }/water_club_entrance.bin | Bin .../water_club_entrance.bin.lz.match | Bin src/data/maps/tilemaps.asm | 76 +++++++++--------- src/gfx.asm | 40 ++++----- 110 files changed, 58 insertions(+), 59 deletions(-) rename src/data/maps/permissions/{cgb => }/challenge_hall.bin (100%) rename src/data/maps/permissions/{cgb => }/challenge_hall.bin.lz.match (100%) rename src/data/maps/permissions/{cgb => }/challenge_hall_entrance.bin (100%) rename src/data/maps/permissions/{cgb => }/challenge_hall_entrance.bin.lz.match (100%) rename src/data/maps/permissions/{cgb => }/challenge_machine_map_event.bin (100%) rename src/data/maps/permissions/{cgb => }/club_lobby.bin (100%) rename src/data/maps/permissions/{cgb => }/club_lobby.bin.lz.match (100%) rename src/data/maps/permissions/{cgb => }/deck_machine_map_event.bin (100%) rename src/data/maps/permissions/{cgb => }/deck_machine_room.bin (100%) rename src/data/maps/permissions/{cgb => }/deck_machine_room.bin.lz.match (100%) rename src/data/maps/permissions/{cgb => }/fighting_club.bin (100%) rename src/data/maps/permissions/{cgb => }/fighting_club.bin.lz.match (100%) rename src/data/maps/permissions/{cgb => }/fighting_club_entrance.bin (100%) rename src/data/maps/permissions/{cgb => }/fighting_club_entrance.bin.lz.match (100%) rename src/data/maps/permissions/{cgb => }/fire_club.bin (100%) rename src/data/maps/permissions/{cgb => }/fire_club.bin.lz.match (100%) rename src/data/maps/permissions/{cgb => }/fire_club_entrance.bin (100%) rename src/data/maps/permissions/{cgb => }/fire_club_entrance.bin.lz.match (100%) delete mode 100644 src/data/maps/permissions/gb/challenge_hall.bin delete mode 100644 src/data/maps/permissions/gb/challenge_hall.bin.lz.match delete mode 100644 src/data/maps/permissions/gb/challenge_hall_entrance.bin delete mode 100644 src/data/maps/permissions/gb/challenge_hall_entrance.bin.lz.match delete mode 100644 src/data/maps/permissions/gb/challenge_machine_map_event.bin delete mode 100644 src/data/maps/permissions/gb/club_lobby.bin delete mode 100644 src/data/maps/permissions/gb/club_lobby.bin.lz.match delete mode 100644 src/data/maps/permissions/gb/deck_machine_map_event.bin delete mode 100644 src/data/maps/permissions/gb/deck_machine_room.bin delete mode 100644 src/data/maps/permissions/gb/deck_machine_room.bin.lz.match delete mode 100644 src/data/maps/permissions/gb/fighting_club.bin delete mode 100644 src/data/maps/permissions/gb/fighting_club.bin.lz.match delete mode 100644 src/data/maps/permissions/gb/fighting_club_entrance.bin delete mode 100644 src/data/maps/permissions/gb/fighting_club_entrance.bin.lz.match delete mode 100644 src/data/maps/permissions/gb/fire_club.bin delete mode 100644 src/data/maps/permissions/gb/fire_club.bin.lz.match delete mode 100644 src/data/maps/permissions/gb/fire_club_entrance.bin delete mode 100644 src/data/maps/permissions/gb/fire_club_entrance.bin.lz.match delete mode 100644 src/data/maps/permissions/gb/grass_club.bin delete mode 100644 src/data/maps/permissions/gb/grass_club.bin.lz.match delete mode 100644 src/data/maps/permissions/gb/grass_club_entrance.bin delete mode 100644 src/data/maps/permissions/gb/grass_club_entrance.bin.lz.match delete mode 100644 src/data/maps/permissions/gb/hall_of_honor.bin delete mode 100644 src/data/maps/permissions/gb/hall_of_honor.bin.lz.match delete mode 100644 src/data/maps/permissions/gb/hall_of_honor_door_map_event.bin delete mode 100644 src/data/maps/permissions/gb/ishihara.bin delete mode 100644 src/data/maps/permissions/gb/ishihara.bin.lz.match delete mode 100644 src/data/maps/permissions/gb/lightning_club.bin delete mode 100644 src/data/maps/permissions/gb/lightning_club.bin.lz.match delete mode 100644 src/data/maps/permissions/gb/lightning_club_entrance.bin delete mode 100644 src/data/maps/permissions/gb/lightning_club_entrance.bin.lz.match delete mode 100644 src/data/maps/permissions/gb/mason_laboratory.bin delete mode 100644 src/data/maps/permissions/gb/mason_laboratory.bin.lz.match delete mode 100644 src/data/maps/permissions/gb/pokemon_dome.bin delete mode 100644 src/data/maps/permissions/gb/pokemon_dome.bin.lz.match delete mode 100644 src/data/maps/permissions/gb/pokemon_dome_door_map_event.bin delete mode 100644 src/data/maps/permissions/gb/pokemon_dome_entrance.bin delete mode 100644 src/data/maps/permissions/gb/pokemon_dome_entrance.bin.lz.match delete mode 100644 src/data/maps/permissions/gb/psychic_club.bin delete mode 100644 src/data/maps/permissions/gb/psychic_club.bin.lz.match delete mode 100644 src/data/maps/permissions/gb/psychic_club_entrance.bin delete mode 100644 src/data/maps/permissions/gb/psychic_club_entrance.bin.lz.match delete mode 100644 src/data/maps/permissions/gb/rock_club.bin delete mode 100644 src/data/maps/permissions/gb/rock_club.bin.lz.match delete mode 100644 src/data/maps/permissions/gb/rock_club_entrance.bin delete mode 100644 src/data/maps/permissions/gb/rock_club_entrance.bin.lz.match delete mode 100644 src/data/maps/permissions/gb/science_club.bin delete mode 100644 src/data/maps/permissions/gb/science_club.bin.lz.match delete mode 100644 src/data/maps/permissions/gb/science_club_entrance.bin delete mode 100644 src/data/maps/permissions/gb/science_club_entrance.bin.lz.match delete mode 100644 src/data/maps/permissions/gb/water_club.bin delete mode 100644 src/data/maps/permissions/gb/water_club.bin.lz.match delete mode 100644 src/data/maps/permissions/gb/water_club_entrance.bin delete mode 100644 src/data/maps/permissions/gb/water_club_entrance.bin.lz.match rename src/data/maps/permissions/{cgb => }/grass_club.bin (100%) rename src/data/maps/permissions/{cgb => }/grass_club.bin.lz.match (100%) rename src/data/maps/permissions/{cgb => }/grass_club_entrance.bin (100%) rename src/data/maps/permissions/{cgb => }/grass_club_entrance.bin.lz.match (100%) rename src/data/maps/permissions/{cgb => }/hall_of_honor.bin (100%) rename src/data/maps/permissions/{cgb => }/hall_of_honor.bin.lz.match (100%) rename src/data/maps/permissions/{cgb => }/hall_of_honor_door_map_event.bin (100%) rename src/data/maps/permissions/{cgb => }/ishihara.bin (100%) rename src/data/maps/permissions/{cgb => }/ishihara.bin.lz.match (100%) rename src/data/maps/permissions/{cgb => }/lightning_club.bin (100%) rename src/data/maps/permissions/{cgb => }/lightning_club.bin.lz.match (100%) rename src/data/maps/permissions/{cgb => }/lightning_club_entrance.bin (100%) rename src/data/maps/permissions/{cgb => }/lightning_club_entrance.bin.lz.match (100%) rename src/data/maps/permissions/{cgb => }/mason_laboratory.bin (100%) rename src/data/maps/permissions/{cgb => }/mason_laboratory.bin.lz.match (100%) rename src/data/maps/permissions/{cgb => }/pokemon_dome.bin (100%) rename src/data/maps/permissions/{cgb => }/pokemon_dome.bin.lz.match (100%) rename src/data/maps/permissions/{cgb => }/pokemon_dome_door_map_event.bin (100%) rename src/data/maps/permissions/{cgb => }/pokemon_dome_entrance.bin (100%) rename src/data/maps/permissions/{cgb => }/pokemon_dome_entrance.bin.lz.match (100%) rename src/data/maps/permissions/{cgb => }/psychic_club.bin (100%) rename src/data/maps/permissions/{cgb => }/psychic_club.bin.lz.match (100%) rename src/data/maps/permissions/{cgb => }/psychic_club_entrance.bin (100%) rename src/data/maps/permissions/{cgb => }/psychic_club_entrance.bin.lz.match (100%) rename src/data/maps/permissions/{cgb => }/rock_club.bin (100%) rename src/data/maps/permissions/{cgb => }/rock_club.bin.lz.match (100%) rename src/data/maps/permissions/{cgb => }/rock_club_entrance.bin (100%) rename src/data/maps/permissions/{cgb => }/rock_club_entrance.bin.lz.match (100%) rename src/data/maps/permissions/{cgb => }/science_club.bin (100%) rename src/data/maps/permissions/{cgb => }/science_club.bin.lz.match (100%) rename src/data/maps/permissions/{cgb => }/science_club_entrance.bin (100%) rename src/data/maps/permissions/{cgb => }/science_club_entrance.bin.lz.match (100%) rename src/data/maps/permissions/{cgb => }/water_club.bin (100%) rename src/data/maps/permissions/{cgb => }/water_club.bin.lz.match (100%) rename src/data/maps/permissions/{cgb => }/water_club_entrance.bin (100%) rename src/data/maps/permissions/{cgb => }/water_club_entrance.bin.lz.match (100%) diff --git a/src/data/maps/permissions/cgb/challenge_hall.bin b/src/data/maps/permissions/challenge_hall.bin similarity index 100% rename from src/data/maps/permissions/cgb/challenge_hall.bin rename to src/data/maps/permissions/challenge_hall.bin diff --git a/src/data/maps/permissions/cgb/challenge_hall.bin.lz.match b/src/data/maps/permissions/challenge_hall.bin.lz.match similarity index 100% rename from src/data/maps/permissions/cgb/challenge_hall.bin.lz.match rename to src/data/maps/permissions/challenge_hall.bin.lz.match diff --git a/src/data/maps/permissions/cgb/challenge_hall_entrance.bin b/src/data/maps/permissions/challenge_hall_entrance.bin similarity index 100% rename from src/data/maps/permissions/cgb/challenge_hall_entrance.bin rename to src/data/maps/permissions/challenge_hall_entrance.bin diff --git a/src/data/maps/permissions/cgb/challenge_hall_entrance.bin.lz.match b/src/data/maps/permissions/challenge_hall_entrance.bin.lz.match similarity index 100% rename from src/data/maps/permissions/cgb/challenge_hall_entrance.bin.lz.match rename to src/data/maps/permissions/challenge_hall_entrance.bin.lz.match diff --git a/src/data/maps/permissions/cgb/challenge_machine_map_event.bin b/src/data/maps/permissions/challenge_machine_map_event.bin similarity index 100% rename from src/data/maps/permissions/cgb/challenge_machine_map_event.bin rename to src/data/maps/permissions/challenge_machine_map_event.bin diff --git a/src/data/maps/permissions/cgb/club_lobby.bin b/src/data/maps/permissions/club_lobby.bin similarity index 100% rename from src/data/maps/permissions/cgb/club_lobby.bin rename to src/data/maps/permissions/club_lobby.bin diff --git a/src/data/maps/permissions/cgb/club_lobby.bin.lz.match b/src/data/maps/permissions/club_lobby.bin.lz.match similarity index 100% rename from src/data/maps/permissions/cgb/club_lobby.bin.lz.match rename to src/data/maps/permissions/club_lobby.bin.lz.match diff --git a/src/data/maps/permissions/cgb/deck_machine_map_event.bin b/src/data/maps/permissions/deck_machine_map_event.bin similarity index 100% rename from src/data/maps/permissions/cgb/deck_machine_map_event.bin rename to src/data/maps/permissions/deck_machine_map_event.bin diff --git a/src/data/maps/permissions/cgb/deck_machine_room.bin b/src/data/maps/permissions/deck_machine_room.bin similarity index 100% rename from src/data/maps/permissions/cgb/deck_machine_room.bin rename to src/data/maps/permissions/deck_machine_room.bin diff --git a/src/data/maps/permissions/cgb/deck_machine_room.bin.lz.match b/src/data/maps/permissions/deck_machine_room.bin.lz.match similarity index 100% rename from src/data/maps/permissions/cgb/deck_machine_room.bin.lz.match rename to src/data/maps/permissions/deck_machine_room.bin.lz.match diff --git a/src/data/maps/permissions/cgb/fighting_club.bin b/src/data/maps/permissions/fighting_club.bin similarity index 100% rename from src/data/maps/permissions/cgb/fighting_club.bin rename to src/data/maps/permissions/fighting_club.bin diff --git a/src/data/maps/permissions/cgb/fighting_club.bin.lz.match b/src/data/maps/permissions/fighting_club.bin.lz.match similarity index 100% rename from src/data/maps/permissions/cgb/fighting_club.bin.lz.match rename to src/data/maps/permissions/fighting_club.bin.lz.match diff --git a/src/data/maps/permissions/cgb/fighting_club_entrance.bin b/src/data/maps/permissions/fighting_club_entrance.bin similarity index 100% rename from src/data/maps/permissions/cgb/fighting_club_entrance.bin rename to src/data/maps/permissions/fighting_club_entrance.bin diff --git a/src/data/maps/permissions/cgb/fighting_club_entrance.bin.lz.match b/src/data/maps/permissions/fighting_club_entrance.bin.lz.match similarity index 100% rename from src/data/maps/permissions/cgb/fighting_club_entrance.bin.lz.match rename to src/data/maps/permissions/fighting_club_entrance.bin.lz.match diff --git a/src/data/maps/permissions/cgb/fire_club.bin b/src/data/maps/permissions/fire_club.bin similarity index 100% rename from src/data/maps/permissions/cgb/fire_club.bin rename to src/data/maps/permissions/fire_club.bin diff --git a/src/data/maps/permissions/cgb/fire_club.bin.lz.match b/src/data/maps/permissions/fire_club.bin.lz.match similarity index 100% rename from src/data/maps/permissions/cgb/fire_club.bin.lz.match rename to src/data/maps/permissions/fire_club.bin.lz.match diff --git a/src/data/maps/permissions/cgb/fire_club_entrance.bin b/src/data/maps/permissions/fire_club_entrance.bin similarity index 100% rename from src/data/maps/permissions/cgb/fire_club_entrance.bin rename to src/data/maps/permissions/fire_club_entrance.bin diff --git a/src/data/maps/permissions/cgb/fire_club_entrance.bin.lz.match b/src/data/maps/permissions/fire_club_entrance.bin.lz.match similarity index 100% rename from src/data/maps/permissions/cgb/fire_club_entrance.bin.lz.match rename to src/data/maps/permissions/fire_club_entrance.bin.lz.match diff --git a/src/data/maps/permissions/gb/challenge_hall.bin b/src/data/maps/permissions/gb/challenge_hall.bin deleted file mode 100644 index f96f651ae889a786c7d5052b091f25e9fee53715..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 256 zcmbV^K@I>Q2*Y^#o^FQ$j3?s`utGNJQYd1d*f?`(m^*snDInwA&K{l`$fJHjP;>e} Kc9qL=^=Mwz6*U0> diff --git a/src/data/maps/permissions/gb/challenge_hall.bin.lz.match b/src/data/maps/permissions/gb/challenge_hall.bin.lz.match deleted file mode 100644 index ab54f1c4fe07186dc2436148017ee375e30b28e1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 47 zcmV+~0MP${fbZb$?P2Zi5&-9S01XH)8Y}Y*5Q70UX#iaRLl9zA278I-kpBRot<8 diff --git a/src/data/maps/permissions/gb/challenge_machine_map_event.bin b/src/data/maps/permissions/gb/challenge_machine_map_event.bin deleted file mode 100644 index 6decae2f07b70f862ffd15636775add02060b939..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6 NcmZo@XlP(y000RF0s#O3 diff --git a/src/data/maps/permissions/gb/club_lobby.bin b/src/data/maps/permissions/gb/club_lobby.bin deleted file mode 100644 index 058db94cc17ea6b7ed913ad9b2d7a050d2781270..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 182 zcmZXN2@U`t2*Z5(o~|8-5}P0!PLu`}US$m+9oZ0OB_HC;T~8D3~1U{{WK^AQ2P* diff --git a/src/data/maps/permissions/gb/deck_machine_map_event.bin b/src/data/maps/permissions/gb/deck_machine_map_event.bin deleted file mode 100644 index f8834a2a..00000000 --- a/src/data/maps/permissions/gb/deck_machine_map_event.bin +++ /dev/null @@ -1 +0,0 @@ -€€ \ No newline at end of file diff --git a/src/data/maps/permissions/gb/deck_machine_room.bin b/src/data/maps/permissions/gb/deck_machine_room.bin deleted file mode 100644 index 84f3e892be9a092134e5b0f966ecc924f2f11b6b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 180 xcmZo@zyTQGprHZIWPq{3nxMkSY>*I44TKHhfz<#Bm>8-WkSGM8iop1^y_x764@({)V diff --git a/src/data/maps/permissions/gb/fighting_club.bin b/src/data/maps/permissions/gb/fighting_club.bin deleted file mode 100644 index 3f9bf0d475fc61c877e0ad278b5e3dbfac2b1251..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 108 jcmZo@Kn4s@020H&h6ytuDPaI|;Nl<&AOMNM0F(^?R5uxc diff --git a/src/data/maps/permissions/gb/fighting_club.bin.lz.match b/src/data/maps/permissions/gb/fighting_club.bin.lz.match deleted file mode 100644 index 2b3f72fc342f83b710fa8c14331850dde8efd025..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17 ZcmZo@c)#oU-!E^Tt$Ot<8 diff --git a/src/data/maps/permissions/gb/fire_club.bin b/src/data/maps/permissions/gb/fire_club.bin deleted file mode 100644 index 903ed171a8c14282d7e31bb9c97e2b0198883322..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 224 zcmZo@KmiO$prL_*0f<1L0f;~t$OM802oKB#6CgPRz*Gs922z+Rsi6<-1(4wg0OJ7w Ds=+1! diff --git a/src/data/maps/permissions/gb/fire_club.bin.lz.match b/src/data/maps/permissions/gb/fire_club.bin.lz.match deleted file mode 100644 index e2b6e527a1397da0b0a4fe2af495362ed0530d9c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 28 mcmV+%0OS9FfbY!X?G@<=|NQ{}01+bpT}1y?X87#w#sKZ{o)De@ diff --git a/src/data/maps/permissions/gb/fire_club_entrance.bin b/src/data/maps/permissions/gb/fire_club_entrance.bin deleted file mode 100644 index c4590ec081e28249b674e49bb135112f3509a340..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 90 kcmZo@XlP(y01_Yy0+3iRA%+G73&up~0P6+{Luit<8 diff --git a/src/data/maps/permissions/gb/grass_club.bin b/src/data/maps/permissions/gb/grass_club.bin deleted file mode 100644 index 46f87f051b26b0837af7cdf6ad9646397e363ffb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 224 zcmZ9D0TKWp2*P^0Pj6sa#+3=9h@pjB8a&#r%87t-Cbl8tz_dKd>;xFMXmq{1`sad} PZzJWyd=5;aSt_>yO}R9I diff --git a/src/data/maps/permissions/gb/grass_club.bin.lz.match b/src/data/maps/permissions/gb/grass_club.bin.lz.match deleted file mode 100644 index dbe8ade4865c33cada6090b0fb8ebc5866145d68..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 36 ucmV+<0Nek7fbYWY?NRRI$LZ}&02T=+Gvv(WB#TfMNB|{5{Zr=r?d@QI8xz+6 diff --git a/src/data/maps/permissions/gb/grass_club_entrance.bin b/src/data/maps/permissions/gb/grass_club_entrance.bin deleted file mode 100644 index c4590ec081e28249b674e49bb135112f3509a340..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 90 kcmZo@XlP(y01_Yy0+3iRA%+G73&up~0P6+{Luit<8 diff --git a/src/data/maps/permissions/gb/hall_of_honor.bin b/src/data/maps/permissions/gb/hall_of_honor.bin deleted file mode 100644 index ffb2e92b00d41c2f0737d9bd319ab2a04595ba0a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 156 zcmZupNe%!&4DobNA6iWu#=+7QvH^e`G6!>M?}oC;cJ*==`v2=yUhIToO!g!X|1u;2 diff --git a/src/data/maps/permissions/gb/hall_of_honor.bin.lz.match b/src/data/maps/permissions/gb/hall_of_honor.bin.lz.match deleted file mode 100644 index a59ca31a6f50adbb73df71819e2bdbf40de5df55..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 24 gcmZo@c)$708?UDvH-CQ5V=&_S@9kgy?epUI0J$6vumAu6 diff --git a/src/data/maps/permissions/gb/hall_of_honor_door_map_event.bin b/src/data/maps/permissions/gb/hall_of_honor_door_map_event.bin deleted file mode 100644 index 593f4708db84ac8fd0f5cc47c634f38c013fe9e4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4 LcmZQzU|;|M00aO5 diff --git a/src/data/maps/permissions/gb/ishihara.bin b/src/data/maps/permissions/gb/ishihara.bin deleted file mode 100644 index 641a37123249642232d19a55e68817f079a769fb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 120 pcmZo@zycVcprHYS1yl`}1nFd80Ff{;AO|W7WWm@V7EB$S1ptrX9{~UW diff --git a/src/data/maps/permissions/gb/ishihara.bin.lz.match b/src/data/maps/permissions/gb/ishihara.bin.lz.match deleted file mode 100644 index c1b17c265706af4b4e58b42460e762941aa5a79c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 20 ccmZo@c>nS9^L`e_wtxSBFuZ&@@e=t<8 diff --git a/src/data/maps/permissions/gb/mason_laboratory.bin b/src/data/maps/permissions/gb/mason_laboratory.bin deleted file mode 100644 index 39f0936aedf28e7d3712f1e6c756b6bbde75ab3a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 210 zcmZo@zyJ(D01*VSV4$G^#sbm!cnl~iK|H8xu%U1s0aJjAfhu4Cg9kSY%s}P=0GP8T AfdBvi diff --git a/src/data/maps/permissions/gb/mason_laboratory.bin.lz.match b/src/data/maps/permissions/gb/mason_laboratory.bin.lz.match deleted file mode 100644 index e19760c078e1b235fa0e9afa09ae93ca8ee4a553..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 29 ncmV+&0OJ3kfbaN#>*LQ19row|HsvP$SSBX?sVx?KL87?{~gZocuW*F diff --git a/src/data/maps/permissions/gb/pokemon_dome_door_map_event.bin b/src/data/maps/permissions/gb/pokemon_dome_door_map_event.bin deleted file mode 100644 index 593f4708db84ac8fd0f5cc47c634f38c013fe9e4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4 LcmZQzU|;|M00aO5 diff --git a/src/data/maps/permissions/gb/pokemon_dome_entrance.bin b/src/data/maps/permissions/gb/pokemon_dome_entrance.bin deleted file mode 100644 index fbbbf412d6b8557045842fe006f184d7ac3847a3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 144 lcmZo@zyu6%0F;BX!3<13suDDLR7nN~ARhvdm|y`o9{{8XAb|h? diff --git a/src/data/maps/permissions/gb/pokemon_dome_entrance.bin.lz.match b/src/data/maps/permissions/gb/pokemon_dome_entrance.bin.lz.match deleted file mode 100644 index f5fab0cff13b66d409363871c0d083bdb5cca1ae..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 20 ccmZo@c>m$k(|r#g{+5%w$H4n*-q%k70FmeoC;$Ke diff --git a/src/data/maps/permissions/gb/psychic_club.bin b/src/data/maps/permissions/gb/psychic_club.bin deleted file mode 100644 index 3cf3248c40a82b38a2e559f7a1dbda895cd3d4e4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 196 zcmZ9G$q@iB2m&pg(!-&-c%ZA83Gk>c0Rmd8n{6{rz=>+*?xtR|Xa_wQ^TJddnb=rA J`I`zI4K3=2CIJ8d diff --git a/src/data/maps/permissions/gb/psychic_club.bin.lz.match b/src/data/maps/permissions/gb/psychic_club.bin.lz.match deleted file mode 100644 index 60ec1cba0193438b18766ac8fcff55db2dfda74b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 31 ncmZo@cz@>cYhykRhrg0#3<7-qe;Lkb$(-S{_`~qx?XkB2t<8 diff --git a/src/data/maps/permissions/gb/rock_club.bin b/src/data/maps/permissions/gb/rock_club.bin deleted file mode 100644 index 890a11ccbfb4a5d71b1ddf61eefcc6c0ca0a9812..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 210 zcmZXKNe;j;3NF*YcDX<%YY80nSb&qK@;QO KAcgxrweSJ{U@rjx diff --git a/src/data/maps/permissions/gb/rock_club.bin.lz.match b/src/data/maps/permissions/gb/rock_club.bin.lz.match deleted file mode 100644 index 67977046a4b9a759a75720815e7244970fbcdde8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 33 rcmV++0N($AfbZe$07U!&Qtso;0OJk6{w&QM5MOIj$N*mVto6GvGY}Dn diff --git a/src/data/maps/permissions/gb/rock_club_entrance.bin b/src/data/maps/permissions/gb/rock_club_entrance.bin deleted file mode 100644 index c4590ec081e28249b674e49bb135112f3509a340..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 90 kcmZo@XlP(y01_Yy0+3iRA%+G73&up~0P6+{Luit<8 diff --git a/src/data/maps/permissions/gb/science_club.bin b/src/data/maps/permissions/gb/science_club.bin deleted file mode 100644 index 4a3f1e526d819c7bb78a2344c9482bc772c38b42..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 224 zcmaitQ3?Ps2tqr$M_;cT#6FskCTK|yV)$qXQ87!-$K{DkbmJSv_?4NFp`vB?f#_c%F6b=9Y diff --git a/src/data/maps/permissions/gb/science_club_entrance.bin b/src/data/maps/permissions/gb/science_club_entrance.bin deleted file mode 100644 index c4590ec081e28249b674e49bb135112f3509a340..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 90 kcmZo@XlP(y01_Yy0+3iRA%+G73&up~0P6+{Luit<8 diff --git a/src/data/maps/permissions/gb/water_club.bin b/src/data/maps/permissions/gb/water_club.bin deleted file mode 100644 index 62bc0d59b9fa8545ed39683946608089b734b062..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 224 zcmZvU0S*8l2m*aNPfrA=bFpRMQNUM$hymLp$<9h$-ie+~F$dJ`K{lB`^GM^kO*J^l KRFA7zqt_2OF+TwS diff --git a/src/data/maps/permissions/gb/water_club.bin.lz.match b/src/data/maps/permissions/gb/water_club.bin.lz.match deleted file mode 100644 index ca1332de5004679c3b94fa3e756b54fa32435522..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 36 ucmV+<0Nek7fbaA5?h5Vg%>f diff --git a/src/data/maps/permissions/gb/water_club_entrance.bin b/src/data/maps/permissions/gb/water_club_entrance.bin deleted file mode 100644 index c4590ec081e28249b674e49bb135112f3509a340..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 90 kcmZo@XlP(y01_Yy0+3iRA%+G73&up~0P6+{Luit<8 diff --git a/src/data/maps/permissions/cgb/grass_club.bin b/src/data/maps/permissions/grass_club.bin similarity index 100% rename from src/data/maps/permissions/cgb/grass_club.bin rename to src/data/maps/permissions/grass_club.bin diff --git a/src/data/maps/permissions/cgb/grass_club.bin.lz.match b/src/data/maps/permissions/grass_club.bin.lz.match similarity index 100% rename from src/data/maps/permissions/cgb/grass_club.bin.lz.match rename to src/data/maps/permissions/grass_club.bin.lz.match diff --git a/src/data/maps/permissions/cgb/grass_club_entrance.bin b/src/data/maps/permissions/grass_club_entrance.bin similarity index 100% rename from src/data/maps/permissions/cgb/grass_club_entrance.bin rename to src/data/maps/permissions/grass_club_entrance.bin diff --git a/src/data/maps/permissions/cgb/grass_club_entrance.bin.lz.match b/src/data/maps/permissions/grass_club_entrance.bin.lz.match similarity index 100% rename from src/data/maps/permissions/cgb/grass_club_entrance.bin.lz.match rename to src/data/maps/permissions/grass_club_entrance.bin.lz.match diff --git a/src/data/maps/permissions/cgb/hall_of_honor.bin b/src/data/maps/permissions/hall_of_honor.bin similarity index 100% rename from src/data/maps/permissions/cgb/hall_of_honor.bin rename to src/data/maps/permissions/hall_of_honor.bin diff --git a/src/data/maps/permissions/cgb/hall_of_honor.bin.lz.match b/src/data/maps/permissions/hall_of_honor.bin.lz.match similarity index 100% rename from src/data/maps/permissions/cgb/hall_of_honor.bin.lz.match rename to src/data/maps/permissions/hall_of_honor.bin.lz.match diff --git a/src/data/maps/permissions/cgb/hall_of_honor_door_map_event.bin b/src/data/maps/permissions/hall_of_honor_door_map_event.bin similarity index 100% rename from src/data/maps/permissions/cgb/hall_of_honor_door_map_event.bin rename to src/data/maps/permissions/hall_of_honor_door_map_event.bin diff --git a/src/data/maps/permissions/cgb/ishihara.bin b/src/data/maps/permissions/ishihara.bin similarity index 100% rename from src/data/maps/permissions/cgb/ishihara.bin rename to src/data/maps/permissions/ishihara.bin diff --git a/src/data/maps/permissions/cgb/ishihara.bin.lz.match b/src/data/maps/permissions/ishihara.bin.lz.match similarity index 100% rename from src/data/maps/permissions/cgb/ishihara.bin.lz.match rename to src/data/maps/permissions/ishihara.bin.lz.match diff --git a/src/data/maps/permissions/cgb/lightning_club.bin b/src/data/maps/permissions/lightning_club.bin similarity index 100% rename from src/data/maps/permissions/cgb/lightning_club.bin rename to src/data/maps/permissions/lightning_club.bin diff --git a/src/data/maps/permissions/cgb/lightning_club.bin.lz.match b/src/data/maps/permissions/lightning_club.bin.lz.match similarity index 100% rename from src/data/maps/permissions/cgb/lightning_club.bin.lz.match rename to src/data/maps/permissions/lightning_club.bin.lz.match diff --git a/src/data/maps/permissions/cgb/lightning_club_entrance.bin b/src/data/maps/permissions/lightning_club_entrance.bin similarity index 100% rename from src/data/maps/permissions/cgb/lightning_club_entrance.bin rename to src/data/maps/permissions/lightning_club_entrance.bin diff --git a/src/data/maps/permissions/cgb/lightning_club_entrance.bin.lz.match b/src/data/maps/permissions/lightning_club_entrance.bin.lz.match similarity index 100% rename from src/data/maps/permissions/cgb/lightning_club_entrance.bin.lz.match rename to src/data/maps/permissions/lightning_club_entrance.bin.lz.match diff --git a/src/data/maps/permissions/cgb/mason_laboratory.bin b/src/data/maps/permissions/mason_laboratory.bin similarity index 100% rename from src/data/maps/permissions/cgb/mason_laboratory.bin rename to src/data/maps/permissions/mason_laboratory.bin diff --git a/src/data/maps/permissions/cgb/mason_laboratory.bin.lz.match b/src/data/maps/permissions/mason_laboratory.bin.lz.match similarity index 100% rename from src/data/maps/permissions/cgb/mason_laboratory.bin.lz.match rename to src/data/maps/permissions/mason_laboratory.bin.lz.match diff --git a/src/data/maps/permissions/cgb/pokemon_dome.bin b/src/data/maps/permissions/pokemon_dome.bin similarity index 100% rename from src/data/maps/permissions/cgb/pokemon_dome.bin rename to src/data/maps/permissions/pokemon_dome.bin diff --git a/src/data/maps/permissions/cgb/pokemon_dome.bin.lz.match b/src/data/maps/permissions/pokemon_dome.bin.lz.match similarity index 100% rename from src/data/maps/permissions/cgb/pokemon_dome.bin.lz.match rename to src/data/maps/permissions/pokemon_dome.bin.lz.match diff --git a/src/data/maps/permissions/cgb/pokemon_dome_door_map_event.bin b/src/data/maps/permissions/pokemon_dome_door_map_event.bin similarity index 100% rename from src/data/maps/permissions/cgb/pokemon_dome_door_map_event.bin rename to src/data/maps/permissions/pokemon_dome_door_map_event.bin diff --git a/src/data/maps/permissions/cgb/pokemon_dome_entrance.bin b/src/data/maps/permissions/pokemon_dome_entrance.bin similarity index 100% rename from src/data/maps/permissions/cgb/pokemon_dome_entrance.bin rename to src/data/maps/permissions/pokemon_dome_entrance.bin diff --git a/src/data/maps/permissions/cgb/pokemon_dome_entrance.bin.lz.match b/src/data/maps/permissions/pokemon_dome_entrance.bin.lz.match similarity index 100% rename from src/data/maps/permissions/cgb/pokemon_dome_entrance.bin.lz.match rename to src/data/maps/permissions/pokemon_dome_entrance.bin.lz.match diff --git a/src/data/maps/permissions/cgb/psychic_club.bin b/src/data/maps/permissions/psychic_club.bin similarity index 100% rename from src/data/maps/permissions/cgb/psychic_club.bin rename to src/data/maps/permissions/psychic_club.bin diff --git a/src/data/maps/permissions/cgb/psychic_club.bin.lz.match b/src/data/maps/permissions/psychic_club.bin.lz.match similarity index 100% rename from src/data/maps/permissions/cgb/psychic_club.bin.lz.match rename to src/data/maps/permissions/psychic_club.bin.lz.match diff --git a/src/data/maps/permissions/cgb/psychic_club_entrance.bin b/src/data/maps/permissions/psychic_club_entrance.bin similarity index 100% rename from src/data/maps/permissions/cgb/psychic_club_entrance.bin rename to src/data/maps/permissions/psychic_club_entrance.bin diff --git a/src/data/maps/permissions/cgb/psychic_club_entrance.bin.lz.match b/src/data/maps/permissions/psychic_club_entrance.bin.lz.match similarity index 100% rename from src/data/maps/permissions/cgb/psychic_club_entrance.bin.lz.match rename to src/data/maps/permissions/psychic_club_entrance.bin.lz.match diff --git a/src/data/maps/permissions/cgb/rock_club.bin b/src/data/maps/permissions/rock_club.bin similarity index 100% rename from src/data/maps/permissions/cgb/rock_club.bin rename to src/data/maps/permissions/rock_club.bin diff --git a/src/data/maps/permissions/cgb/rock_club.bin.lz.match b/src/data/maps/permissions/rock_club.bin.lz.match similarity index 100% rename from src/data/maps/permissions/cgb/rock_club.bin.lz.match rename to src/data/maps/permissions/rock_club.bin.lz.match diff --git a/src/data/maps/permissions/cgb/rock_club_entrance.bin b/src/data/maps/permissions/rock_club_entrance.bin similarity index 100% rename from src/data/maps/permissions/cgb/rock_club_entrance.bin rename to src/data/maps/permissions/rock_club_entrance.bin diff --git a/src/data/maps/permissions/cgb/rock_club_entrance.bin.lz.match b/src/data/maps/permissions/rock_club_entrance.bin.lz.match similarity index 100% rename from src/data/maps/permissions/cgb/rock_club_entrance.bin.lz.match rename to src/data/maps/permissions/rock_club_entrance.bin.lz.match diff --git a/src/data/maps/permissions/cgb/science_club.bin b/src/data/maps/permissions/science_club.bin similarity index 100% rename from src/data/maps/permissions/cgb/science_club.bin rename to src/data/maps/permissions/science_club.bin diff --git a/src/data/maps/permissions/cgb/science_club.bin.lz.match b/src/data/maps/permissions/science_club.bin.lz.match similarity index 100% rename from src/data/maps/permissions/cgb/science_club.bin.lz.match rename to src/data/maps/permissions/science_club.bin.lz.match diff --git a/src/data/maps/permissions/cgb/science_club_entrance.bin b/src/data/maps/permissions/science_club_entrance.bin similarity index 100% rename from src/data/maps/permissions/cgb/science_club_entrance.bin rename to src/data/maps/permissions/science_club_entrance.bin diff --git a/src/data/maps/permissions/cgb/science_club_entrance.bin.lz.match b/src/data/maps/permissions/science_club_entrance.bin.lz.match similarity index 100% rename from src/data/maps/permissions/cgb/science_club_entrance.bin.lz.match rename to src/data/maps/permissions/science_club_entrance.bin.lz.match diff --git a/src/data/maps/permissions/cgb/water_club.bin b/src/data/maps/permissions/water_club.bin similarity index 100% rename from src/data/maps/permissions/cgb/water_club.bin rename to src/data/maps/permissions/water_club.bin diff --git a/src/data/maps/permissions/cgb/water_club.bin.lz.match b/src/data/maps/permissions/water_club.bin.lz.match similarity index 100% rename from src/data/maps/permissions/cgb/water_club.bin.lz.match rename to src/data/maps/permissions/water_club.bin.lz.match diff --git a/src/data/maps/permissions/cgb/water_club_entrance.bin b/src/data/maps/permissions/water_club_entrance.bin similarity index 100% rename from src/data/maps/permissions/cgb/water_club_entrance.bin rename to src/data/maps/permissions/water_club_entrance.bin diff --git a/src/data/maps/permissions/cgb/water_club_entrance.bin.lz.match b/src/data/maps/permissions/water_club_entrance.bin.lz.match similarity index 100% rename from src/data/maps/permissions/cgb/water_club_entrance.bin.lz.match rename to src/data/maps/permissions/water_club_entrance.bin.lz.match diff --git a/src/data/maps/tilemaps.asm b/src/data/maps/tilemaps.asm index 38f4dfc3..0dbc7b3f 100644 --- a/src/data/maps/tilemaps.asm +++ b/src/data/maps/tilemaps.asm @@ -16,7 +16,7 @@ MasonLaboratoryTilemap:: db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/mason_laboratory.bin.lz" MasonLaboratoryPermissions: - INCBIN "data/maps/permissions/gb/mason_laboratory.bin.lz" + INCBIN "data/maps/permissions/mason_laboratory.bin.lz" MasonLaboratoryCGBTilemap:: INCBIN "data/maps/tiles/cgb/mason_laboratory.dimensions" @@ -24,7 +24,7 @@ MasonLaboratoryCGBTilemap:: db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/mason_laboratory.bgmap.lz" MasonLaboratoryCGBPermissions: - INCBIN "data/maps/permissions/cgb/mason_laboratory.bin.lz" + INCBIN "data/maps/permissions/mason_laboratory.bin.lz" ChallengeMachineMapEventTilemap:: INCBIN "data/maps/tiles/gb/challenge_machine_map_event.dimensions" @@ -32,7 +32,7 @@ ChallengeMachineMapEventTilemap:: db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/challenge_machine_map_event.bin.lz" ChallengeMachineMapEventPermissions: - INCBIN "data/maps/permissions/gb/challenge_machine_map_event.bin.lz" + INCBIN "data/maps/permissions/challenge_machine_map_event.bin.lz" ChallengeMachineMapEventCGBTilemap:: INCBIN "data/maps/tiles/cgb/challenge_machine_map_event.dimensions" @@ -40,7 +40,7 @@ ChallengeMachineMapEventCGBTilemap:: db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/challenge_machine_map_event.bgmap.lz" ChallengeMachineMapEventCGBPermissions: - INCBIN "data/maps/permissions/cgb/challenge_machine_map_event.bin.lz" + INCBIN "data/maps/permissions/challenge_machine_map_event.bin.lz" DeckMachineRoomTilemap:: INCBIN "data/maps/tiles/gb/deck_machine_room.dimensions" @@ -48,7 +48,7 @@ DeckMachineRoomTilemap:: db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/deck_machine_room.bin.lz" DeckMachineRoomPermissions: - INCBIN "data/maps/permissions/gb/deck_machine_room.bin.lz" + INCBIN "data/maps/permissions/deck_machine_room.bin.lz" DeckMachineRoomCGBTilemap:: INCBIN "data/maps/tiles/cgb/deck_machine_room.dimensions" @@ -56,7 +56,7 @@ DeckMachineRoomCGBTilemap:: db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/deck_machine_room.bgmap.lz" DeckMachineRoomCGBPermissions: - INCBIN "data/maps/permissions/cgb/deck_machine_room.bin.lz" + INCBIN "data/maps/permissions/deck_machine_room.bin.lz" DeckMachineMapEventTilemap:: INCBIN "data/maps/tiles/gb/deck_machine_map_event.dimensions" @@ -64,7 +64,7 @@ DeckMachineMapEventTilemap:: db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/deck_machine_map_event.bin.lz" DeckMachineMapEventPermissions: - INCBIN "data/maps/permissions/gb/deck_machine_map_event.bin.lz" + INCBIN "data/maps/permissions/deck_machine_map_event.bin.lz" DeckMachineMapEventCGBTilemap:: INCBIN "data/maps/tiles/cgb/deck_machine_map_event.dimensions" @@ -72,7 +72,7 @@ DeckMachineMapEventCGBTilemap:: db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/deck_machine_map_event.bgmap.lz" DeckMachineMapEventCGBPermissions: - INCBIN "data/maps/permissions/cgb/deck_machine_map_event.bin.lz" + INCBIN "data/maps/permissions/deck_machine_map_event.bin.lz" IshiharaTilemap:: INCBIN "data/maps/tiles/gb/ishihara.dimensions" @@ -80,7 +80,7 @@ IshiharaTilemap:: db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/ishihara.bin.lz" IshiharaPermissions: - INCBIN "data/maps/permissions/gb/ishihara.bin.lz" + INCBIN "data/maps/permissions/ishihara.bin.lz" IshiharaCGBTilemap:: INCBIN "data/maps/tiles/cgb/ishihara.dimensions" @@ -88,7 +88,7 @@ IshiharaCGBTilemap:: db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/ishihara.bgmap.lz" IshiharaCGBPermissions: - INCBIN "data/maps/permissions/cgb/ishihara.bin.lz" + INCBIN "data/maps/permissions/ishihara.bin.lz" FightingClubEntranceTilemap:: INCBIN "data/maps/tiles/gb/fighting_club_entrance.dimensions" @@ -96,7 +96,7 @@ FightingClubEntranceTilemap:: db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/fighting_club_entrance.bin.lz" FightingClubEntrancePermissions: - INCBIN "data/maps/permissions/gb/fighting_club_entrance.bin.lz" + INCBIN "data/maps/permissions/fighting_club_entrance.bin.lz" FightingClubEntranceCGBTilemap:: INCBIN "data/maps/tiles/cgb/fighting_club_entrance.dimensions" @@ -104,7 +104,7 @@ FightingClubEntranceCGBTilemap:: db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/fighting_club_entrance.bgmap.lz" FightingClubEntranceCGBPermissions: - INCBIN "data/maps/permissions/cgb/fighting_club_entrance.bin.lz" + INCBIN "data/maps/permissions/fighting_club_entrance.bin.lz" RockClubEntranceTilemap:: INCBIN "data/maps/tiles/gb/rock_club_entrance.dimensions" @@ -112,7 +112,7 @@ RockClubEntranceTilemap:: db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/rock_club_entrance.bin.lz" RockClubEntrancePermissions: - INCBIN "data/maps/permissions/gb/rock_club_entrance.bin.lz" + INCBIN "data/maps/permissions/rock_club_entrance.bin.lz" RockClubEntranceCGBTilemap:: INCBIN "data/maps/tiles/cgb/rock_club_entrance.dimensions" @@ -120,7 +120,7 @@ RockClubEntranceCGBTilemap:: db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/rock_club_entrance.bgmap.lz" RockClubEntranceCGBPermissions: - INCBIN "data/maps/permissions/cgb/rock_club_entrance.bin.lz" + INCBIN "data/maps/permissions/rock_club_entrance.bin.lz" WaterClubEntranceTilemap:: INCBIN "data/maps/tiles/gb/water_club_entrance.dimensions" @@ -128,7 +128,7 @@ WaterClubEntranceTilemap:: db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/water_club_entrance.bin.lz" WaterClubEntrancePermissions: - INCBIN "data/maps/permissions/gb/water_club_entrance.bin.lz" + INCBIN "data/maps/permissions/water_club_entrance.bin.lz" WaterClubEntranceCGBTilemap:: INCBIN "data/maps/tiles/cgb/water_club_entrance.dimensions" @@ -136,7 +136,7 @@ WaterClubEntranceCGBTilemap:: db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/water_club_entrance.bgmap.lz" WaterClubEntranceCGBPermissions: - INCBIN "data/maps/permissions/cgb/water_club_entrance.bin.lz" + INCBIN "data/maps/permissions/water_club_entrance.bin.lz" LightningClubEntranceTilemap:: INCBIN "data/maps/tiles/gb/lightning_club_entrance.dimensions" @@ -144,7 +144,7 @@ LightningClubEntranceTilemap:: db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/lightning_club_entrance.bin.lz" LightningClubEntrancePermissions: - INCBIN "data/maps/permissions/gb/lightning_club_entrance.bin.lz" + INCBIN "data/maps/permissions/lightning_club_entrance.bin.lz" LightningClubEntranceCGBTilemap:: INCBIN "data/maps/tiles/cgb/lightning_club_entrance.dimensions" @@ -152,7 +152,7 @@ LightningClubEntranceCGBTilemap:: db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/lightning_club_entrance.bgmap.lz" LightningClubEntranceCGBPermissions: - INCBIN "data/maps/permissions/cgb/lightning_club_entrance.bin.lz" + INCBIN "data/maps/permissions/lightning_club_entrance.bin.lz" GrassClubEntranceTilemap:: INCBIN "data/maps/tiles/gb/grass_club_entrance.dimensions" @@ -160,7 +160,7 @@ GrassClubEntranceTilemap:: db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/grass_club_entrance.bin.lz" GrassClubEntrancePermissions: - INCBIN "data/maps/permissions/gb/grass_club_entrance.bin.lz" + INCBIN "data/maps/permissions/grass_club_entrance.bin.lz" GrassClubEntranceCGBTilemap:: INCBIN "data/maps/tiles/cgb/grass_club_entrance.dimensions" @@ -168,7 +168,7 @@ GrassClubEntranceCGBTilemap:: db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/grass_club_entrance.bgmap.lz" GrassClubEntranceCGBPermissions: - INCBIN "data/maps/permissions/cgb/grass_club_entrance.bin.lz" + INCBIN "data/maps/permissions/grass_club_entrance.bin.lz" PsychicClubEntranceTilemap:: INCBIN "data/maps/tiles/gb/psychic_club_entrance.dimensions" @@ -176,7 +176,7 @@ PsychicClubEntranceTilemap:: db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/psychic_club_entrance.bin.lz" PsychicClubEntrancePermissions: - INCBIN "data/maps/permissions/gb/psychic_club_entrance.bin.lz" + INCBIN "data/maps/permissions/psychic_club_entrance.bin.lz" PsychicClubEntranceCGBTilemap:: INCBIN "data/maps/tiles/cgb/psychic_club_entrance.dimensions" @@ -184,7 +184,7 @@ PsychicClubEntranceCGBTilemap:: db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/psychic_club_entrance.bgmap.lz" PsychicClubEntranceCGBPermissions: - INCBIN "data/maps/permissions/cgb/psychic_club_entrance.bin.lz" + INCBIN "data/maps/permissions/psychic_club_entrance.bin.lz" ScienceClubEntranceTilemap:: INCBIN "data/maps/tiles/gb/science_club_entrance.dimensions" @@ -192,7 +192,7 @@ ScienceClubEntranceTilemap:: db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/science_club_entrance.bin.lz" ScienceClubEntrancePermissions: - INCBIN "data/maps/permissions/gb/science_club_entrance.bin.lz" + INCBIN "data/maps/permissions/science_club_entrance.bin.lz" ScienceClubEntranceCGBTilemap:: INCBIN "data/maps/tiles/cgb/science_club_entrance.dimensions" @@ -200,7 +200,7 @@ ScienceClubEntranceCGBTilemap:: db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/science_club_entrance.bgmap.lz" ScienceClubEntranceCGBPermissions: - INCBIN "data/maps/permissions/cgb/science_club_entrance.bin.lz" + INCBIN "data/maps/permissions/science_club_entrance.bin.lz" FireClubEntranceTilemap:: INCBIN "data/maps/tiles/gb/fire_club_entrance.dimensions" @@ -208,7 +208,7 @@ FireClubEntranceTilemap:: db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/fire_club_entrance.bin.lz" FireClubEntrancePermissions: - INCBIN "data/maps/permissions/gb/fire_club_entrance.bin.lz" + INCBIN "data/maps/permissions/fire_club_entrance.bin.lz" FireClubEntranceCGBTilemap:: INCBIN "data/maps/tiles/cgb/fire_club_entrance.dimensions" @@ -216,7 +216,7 @@ FireClubEntranceCGBTilemap:: db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/fire_club_entrance.bgmap.lz" FireClubEntranceCGBPermissions: - INCBIN "data/maps/permissions/cgb/fire_club_entrance.bin.lz" + INCBIN "data/maps/permissions/fire_club_entrance.bin.lz" ChallengeHallEntranceTilemap:: INCBIN "data/maps/tiles/gb/challenge_hall_entrance.dimensions" @@ -224,7 +224,7 @@ ChallengeHallEntranceTilemap:: db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/challenge_hall_entrance.bin.lz" ChallengeHallEntrancePermissions: - INCBIN "data/maps/permissions/gb/challenge_hall_entrance.bin.lz" + INCBIN "data/maps/permissions/challenge_hall_entrance.bin.lz" ChallengeHallEntranceCGBTilemap:: INCBIN "data/maps/tiles/cgb/challenge_hall_entrance.dimensions" @@ -232,7 +232,7 @@ ChallengeHallEntranceCGBTilemap:: db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/challenge_hall_entrance.bgmap.lz" ChallengeHallEntranceCGBPermissions: - INCBIN "data/maps/permissions/cgb/challenge_hall_entrance.bin.lz" + INCBIN "data/maps/permissions/challenge_hall_entrance.bin.lz" ClubLobbyTilemap:: INCBIN "data/maps/tiles/gb/club_lobby.dimensions" @@ -240,7 +240,7 @@ ClubLobbyTilemap:: db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/club_lobby.bin.lz" ClubLobbyPermissions: - INCBIN "data/maps/permissions/gb/club_lobby.bin.lz" + INCBIN "data/maps/permissions/club_lobby.bin.lz" ClubLobbyCGBTilemap:: INCBIN "data/maps/tiles/cgb/club_lobby.dimensions" @@ -248,7 +248,7 @@ ClubLobbyCGBTilemap:: db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/club_lobby.bgmap.lz" ClubLobbyCGBPermissions: - INCBIN "data/maps/permissions/cgb/club_lobby.bin.lz" + INCBIN "data/maps/permissions/club_lobby.bin.lz" FightingClubTilemap:: INCBIN "data/maps/tiles/gb/fighting_club.dimensions" @@ -256,7 +256,7 @@ FightingClubTilemap:: db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/fighting_club.bin.lz" FightingClubPermissions: - INCBIN "data/maps/permissions/gb/fighting_club.bin.lz" + INCBIN "data/maps/permissions/fighting_club.bin.lz" FightingClubCGBTilemap:: INCBIN "data/maps/tiles/cgb/fighting_club.dimensions" @@ -264,7 +264,7 @@ FightingClubCGBTilemap:: db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/fighting_club.bgmap.lz" FightingClubCGBPermissions: - INCBIN "data/maps/permissions/cgb/fighting_club.bin.lz" + INCBIN "data/maps/permissions/fighting_club.bin.lz" RockClubTilemap:: INCBIN "data/maps/tiles/gb/rock_club.dimensions" @@ -272,7 +272,7 @@ RockClubTilemap:: db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/rock_club.bin.lz" RockClubPermissions: - INCBIN "data/maps/permissions/gb/rock_club.bin.lz" + INCBIN "data/maps/permissions/rock_club.bin.lz" RockClubCGBTilemap:: INCBIN "data/maps/tiles/cgb/rock_club.dimensions" @@ -280,7 +280,7 @@ RockClubCGBTilemap:: db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/rock_club.bgmap.lz" RockClubCGBPermissions: - INCBIN "data/maps/permissions/cgb/rock_club.bin.lz" + INCBIN "data/maps/permissions/rock_club.bin.lz" PokemonDomeDoorMapEventTilemap:: INCBIN "data/maps/tiles/gb/pokemon_dome_door_map_event.dimensions" @@ -288,7 +288,7 @@ PokemonDomeDoorMapEventTilemap:: db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/pokemon_dome_door_map_event.bin.lz" PokemonDomeDoorMapEventPermissions: - INCBIN "data/maps/permissions/gb/pokemon_dome_door_map_event.bin.lz" + INCBIN "data/maps/permissions/pokemon_dome_door_map_event.bin.lz" PokemonDomeDoorMapEventCGBTilemap:: INCBIN "data/maps/tiles/cgb/pokemon_dome_door_map_event.dimensions" @@ -296,7 +296,7 @@ PokemonDomeDoorMapEventCGBTilemap:: db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/pokemon_dome_door_map_event.bgmap.lz" PokemonDomeDoorMapEventCGBPermissions: - INCBIN "data/maps/permissions/cgb/pokemon_dome_door_map_event.bin.lz" + INCBIN "data/maps/permissions/pokemon_dome_door_map_event.bin.lz" HallOfHonorDoorMapEventTilemap:: INCBIN "data/maps/tiles/gb/hall_of_honor_door_map_event.dimensions" @@ -304,7 +304,7 @@ HallOfHonorDoorMapEventTilemap:: db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/hall_of_honor_door_map_event.bin.lz" HallOfHonorDoorMapEventPermissions: - INCBIN "data/maps/permissions/gb/hall_of_honor_door_map_event.bin.lz" + INCBIN "data/maps/permissions/hall_of_honor_door_map_event.bin.lz" HallOfHonorDoorMapEventCGBTilemap:: INCBIN "data/maps/tiles/cgb/hall_of_honor_door_map_event.dimensions" @@ -312,7 +312,7 @@ HallOfHonorDoorMapEventCGBTilemap:: db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/hall_of_honor_door_map_event.bgmap.lz" HallOfHonorDoorMapEventCGBPermissions: - INCBIN "data/maps/permissions/cgb/hall_of_honor_door_map_event.bin.lz" + INCBIN "data/maps/permissions/hall_of_honor_door_map_event.bin.lz" GrassMedalTilemap:: INCBIN "data/maps/tiles/cgb/grass_medal.dimensions" diff --git a/src/gfx.asm b/src/gfx.asm index a5f449a3..2feedf39 100644 --- a/src/gfx.asm +++ b/src/gfx.asm @@ -49,7 +49,7 @@ WaterClubTilemap:: db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/water_club.bin.lz" WaterClubPermissions: - INCBIN "data/maps/permissions/cgb/water_club.bin.lz" + INCBIN "data/maps/permissions/water_club.bin.lz" WaterClubCGBTilemap:: INCBIN "data/maps/tiles/cgb/water_club.dimensions" @@ -57,7 +57,7 @@ WaterClubCGBTilemap:: db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/water_club.bgmap.lz" WaterClubCGBPermissions: - INCBIN "data/maps/permissions/cgb/water_club.bin.lz" + INCBIN "data/maps/permissions/water_club.bin.lz" LightningClubTilemap:: INCBIN "data/maps/tiles/gb/lightning_club.dimensions" @@ -65,7 +65,7 @@ LightningClubTilemap:: db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/lightning_club.bin.lz" LightningClubPermissions: - INCBIN "data/maps/permissions/cgb/lightning_club.bin.lz" + INCBIN "data/maps/permissions/lightning_club.bin.lz" LightningClubCGBTilemap:: INCBIN "data/maps/tiles/cgb/lightning_club.dimensions" @@ -73,7 +73,7 @@ LightningClubCGBTilemap:: db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/lightning_club.bgmap.lz" LightningClubCGBPermissions: - INCBIN "data/maps/permissions/cgb/lightning_club.bin.lz" + INCBIN "data/maps/permissions/lightning_club.bin.lz" GrassClubTilemap:: INCBIN "data/maps/tiles/gb/grass_club.dimensions" @@ -81,7 +81,7 @@ GrassClubTilemap:: db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/grass_club.bin.lz" GrassClubPermissions: - INCBIN "data/maps/permissions/cgb/grass_club.bin.lz" + INCBIN "data/maps/permissions/grass_club.bin.lz" GrassClubCGBTilemap:: INCBIN "data/maps/tiles/cgb/grass_club.dimensions" @@ -89,7 +89,7 @@ GrassClubCGBTilemap:: db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/grass_club.bgmap.lz" GrassClubCGBPermissions: - INCBIN "data/maps/permissions/cgb/grass_club.bin.lz" + INCBIN "data/maps/permissions/grass_club.bin.lz" PsychicClubTilemap:: INCBIN "data/maps/tiles/gb/psychic_club.dimensions" @@ -97,7 +97,7 @@ PsychicClubTilemap:: db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/psychic_club.bin.lz" PsychicClubPermissions: - INCBIN "data/maps/permissions/cgb/psychic_club.bin.lz" + INCBIN "data/maps/permissions/psychic_club.bin.lz" PsychicClubCGBTilemap:: INCBIN "data/maps/tiles/cgb/psychic_club.dimensions" @@ -105,7 +105,7 @@ PsychicClubCGBTilemap:: db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/psychic_club.bgmap.lz" PsychicClubCGBPermissions: - INCBIN "data/maps/permissions/cgb/psychic_club.bin.lz" + INCBIN "data/maps/permissions/psychic_club.bin.lz" ScienceClubTilemap:: INCBIN "data/maps/tiles/gb/science_club.dimensions" @@ -113,7 +113,7 @@ ScienceClubTilemap:: db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/science_club.bin.lz" ScienceClubPermissions: - INCBIN "data/maps/permissions/cgb/science_club.bin.lz" + INCBIN "data/maps/permissions/science_club.bin.lz" ScienceClubCGBTilemap:: INCBIN "data/maps/tiles/cgb/science_club.dimensions" @@ -121,7 +121,7 @@ ScienceClubCGBTilemap:: db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/science_club.bgmap.lz" ScienceClubCGBPermissions: - INCBIN "data/maps/permissions/cgb/science_club.bin.lz" + INCBIN "data/maps/permissions/science_club.bin.lz" FireClubTilemap:: INCBIN "data/maps/tiles/gb/fire_club.dimensions" @@ -129,7 +129,7 @@ FireClubTilemap:: db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/fire_club.bin.lz" FireClubPermissions: - INCBIN "data/maps/permissions/cgb/fire_club.bin.lz" + INCBIN "data/maps/permissions/fire_club.bin.lz" FireClubCGBTilemap:: INCBIN "data/maps/tiles/cgb/fire_club.dimensions" @@ -137,7 +137,7 @@ FireClubCGBTilemap:: db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/fire_club.bgmap.lz" FireClubCGBPermissions: - INCBIN "data/maps/permissions/cgb/fire_club.bin.lz" + INCBIN "data/maps/permissions/fire_club.bin.lz" ChallengeHallTilemap:: INCBIN "data/maps/tiles/gb/challenge_hall.dimensions" @@ -145,7 +145,7 @@ ChallengeHallTilemap:: db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/challenge_hall.bin.lz" ChallengeHallPermissions: - INCBIN "data/maps/permissions/cgb/challenge_hall.bin.lz" + INCBIN "data/maps/permissions/challenge_hall.bin.lz" ChallengeHallCGBTilemap:: INCBIN "data/maps/tiles/cgb/challenge_hall.dimensions" @@ -153,7 +153,7 @@ ChallengeHallCGBTilemap:: db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/challenge_hall.bgmap.lz" ChallengeHallCGBPermissions: - INCBIN "data/maps/permissions/cgb/challenge_hall.bin.lz" + INCBIN "data/maps/permissions/challenge_hall.bin.lz" PokemonDomeEntranceTilemap:: INCBIN "data/maps/tiles/gb/pokemon_dome_entrance.dimensions" @@ -161,7 +161,7 @@ PokemonDomeEntranceTilemap:: db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/pokemon_dome_entrance.bin.lz" PokemonDomeEntrancePermissions: - INCBIN "data/maps/permissions/cgb/pokemon_dome_entrance.bin.lz" + INCBIN "data/maps/permissions/pokemon_dome_entrance.bin.lz" PokemonDomeEntranceCGBTilemap:: INCBIN "data/maps/tiles/cgb/pokemon_dome_entrance.dimensions" @@ -169,7 +169,7 @@ PokemonDomeEntranceCGBTilemap:: db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/pokemon_dome_entrance.bgmap.lz" PokemonDomeEntranceCGBPermissions: - INCBIN "data/maps/permissions/cgb/pokemon_dome_entrance.bin.lz" + INCBIN "data/maps/permissions/pokemon_dome_entrance.bin.lz" PokemonDomeTilemap:: INCBIN "data/maps/tiles/gb/pokemon_dome.dimensions" @@ -177,7 +177,7 @@ PokemonDomeTilemap:: db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/pokemon_dome.bin.lz" PokemonDomePermissions: - INCBIN "data/maps/permissions/cgb/pokemon_dome.bin.lz" + INCBIN "data/maps/permissions/pokemon_dome.bin.lz" PokemonDomeCGBTilemap:: INCBIN "data/maps/tiles/cgb/pokemon_dome.dimensions" @@ -185,7 +185,7 @@ PokemonDomeCGBTilemap:: db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/pokemon_dome.bgmap.lz" PokemonDomeCGBPermissions: - INCBIN "data/maps/permissions/cgb/pokemon_dome.bin.lz" + INCBIN "data/maps/permissions/pokemon_dome.bin.lz" HallOfHonorTilemap:: INCBIN "data/maps/tiles/gb/hall_of_honor.dimensions" @@ -193,7 +193,7 @@ HallOfHonorTilemap:: db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/hall_of_honor.bin.lz" HallOfHonorPermissions: - INCBIN "data/maps/permissions/cgb/hall_of_honor.bin.lz" + INCBIN "data/maps/permissions/hall_of_honor.bin.lz" HallOfHonorCGBTilemap:: INCBIN "data/maps/tiles/cgb/hall_of_honor.dimensions" @@ -201,7 +201,7 @@ HallOfHonorCGBTilemap:: db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/hall_of_honor.bgmap.lz" HallOfHonorCGBPermissions: - INCBIN "data/maps/permissions/cgb/hall_of_honor.bin.lz" + INCBIN "data/maps/permissions/hall_of_honor.bin.lz" CardPopCGBTilemap:: INCBIN "data/maps/tiles/cgb/card_pop.dimensions" From a3f147060d0fd289d434c951d62579933941c03a Mon Sep 17 00:00:00 2001 From: ElectroDeoxys Date: Wed, 8 Nov 2023 21:37:40 +0000 Subject: [PATCH 5/7] Move GB Card Pop to tiles/gb --- .../card_pop.bgmap.lz.match} | Bin .../{cgb/card_pop_noncgb.bin => gb/card_pop.bin} | Bin .../card_pop.dimensions} | 0 src/gfx.asm | 4 ++-- 4 files changed, 2 insertions(+), 2 deletions(-) rename src/data/maps/tiles/{cgb/card_pop_noncgb.bgmap.lz.match => gb/card_pop.bgmap.lz.match} (100%) rename src/data/maps/tiles/{cgb/card_pop_noncgb.bin => gb/card_pop.bin} (100%) rename src/data/maps/tiles/{cgb/card_pop_noncgb.dimensions => gb/card_pop.dimensions} (100%) diff --git a/src/data/maps/tiles/cgb/card_pop_noncgb.bgmap.lz.match b/src/data/maps/tiles/gb/card_pop.bgmap.lz.match similarity index 100% rename from src/data/maps/tiles/cgb/card_pop_noncgb.bgmap.lz.match rename to src/data/maps/tiles/gb/card_pop.bgmap.lz.match diff --git a/src/data/maps/tiles/cgb/card_pop_noncgb.bin b/src/data/maps/tiles/gb/card_pop.bin similarity index 100% rename from src/data/maps/tiles/cgb/card_pop_noncgb.bin rename to src/data/maps/tiles/gb/card_pop.bin diff --git a/src/data/maps/tiles/cgb/card_pop_noncgb.dimensions b/src/data/maps/tiles/gb/card_pop.dimensions similarity index 100% rename from src/data/maps/tiles/cgb/card_pop_noncgb.dimensions rename to src/data/maps/tiles/gb/card_pop.dimensions diff --git a/src/gfx.asm b/src/gfx.asm index 2feedf39..6094469b 100644 --- a/src/gfx.asm +++ b/src/gfx.asm @@ -210,10 +210,10 @@ CardPopCGBTilemap:: INCBIN "data/maps/tiles/cgb/card_pop.bgmap.lz" CardPopTilemap:: - INCBIN "data/maps/tiles/cgb/card_pop_noncgb.dimensions" + INCBIN "data/maps/tiles/gb/card_pop.dimensions" dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/cgb/card_pop_noncgb.bgmap.lz" + INCBIN "data/maps/tiles/gb/card_pop.bgmap.lz" ScienceMedalTilemap:: INCBIN "data/maps/tiles/cgb/science_medal.dimensions" From 1ab6706d48715f7747867022a711a6d1cfa1ee94 Mon Sep 17 00:00:00 2001 From: ElectroDeoxys Date: Fri, 10 Nov 2023 11:59:36 +0000 Subject: [PATCH 6/7] Join dimensions files for GB and GBC together --- Makefile | 4 +- src/data/maps/tilemaps.asm | 82 +++++------ .../aerodactyl_intro.dimensions | 0 .../{cgb => dimensions}/card_pop.dimensions | 0 .../challenge_hall.dimensions | 0 .../challenge_hall_entrance.dimensions | 0 .../challenge_machine_map_event.dimensions | 0 .../charizard_intro.dimensions | 0 .../{cgb => dimensions}/club_lobby.dimensions | 0 .../{cgb => dimensions}/colosseum.dimensions | 0 .../{gb => dimensions}/companies.dimensions | 0 .../{cgb => dimensions}/copyright.dimensions | 0 .../deck_machine_map_event.dimensions | 0 .../deck_machine_room.dimensions | 0 .../{cgb => dimensions}/evolution.dimensions | 0 .../fighting_club.dimensions | 0 .../fighting_club_entrance.dimensions | 0 .../fighting_medal.dimensions | 0 .../{cgb => dimensions}/fire_club.dimensions | 0 .../fire_club_entrance.dimensions | 0 .../{cgb => dimensions}/fire_medal.dimensions | 0 .../gameboy_link.dimensions | 0 .../gameboy_link_connecting.dimensions | 0 .../gameboy_printer.dimensions | 0 .../{cgb => dimensions}/grass_club.dimensions | 0 .../grass_club_entrance.dimensions | 0 .../grass_medal.dimensions | 0 .../hall_of_honor.dimensions | 0 .../hall_of_honor_door_map_event.dimensions | 0 .../{cgb => dimensions}/ishihara.dimensions | 0 .../japanese_title_screen.dimensions | 0 .../japanese_title_screen_2.dimensions | 0 .../{cgb => dimensions}/laboratory.dimensions | 0 .../lightning_club.dimensions | 0 .../lightning_club_entrance.dimensions | 0 .../lightning_medal.dimensions | 0 .../mason_laboratory.dimensions | 0 .../{cgb => dimensions}/mystery.dimensions | 0 .../{gb => dimensions}/nintendo.dimensions | 0 .../{gb => dimensions}/opponent.dimensions | 0 .../overworld_map.dimensions | 0 .../{gb => dimensions}/player.dimensions | 0 .../pokemon_dome.dimensions | 0 .../pokemon_dome_door_map_event.dimensions | 0 .../pokemon_dome_entrance.dimensions | 0 .../psychic_club.dimensions | 0 .../psychic_club_entrance.dimensions | 0 .../psychic_medal.dimensions | 0 .../{cgb => dimensions}/rock_club.dimensions | 0 .../rock_club_entrance.dimensions | 0 .../{cgb => dimensions}/rock_medal.dimensions | 0 .../science_club.dimensions | 0 .../science_club_entrance.dimensions | 0 .../science_medal.dimensions | 0 .../scyther_intro.dimensions | 0 .../solid_tiles_1.dimensions | 0 .../solid_tiles_2.dimensions | 0 .../solid_tiles_3.dimensions | 0 .../solid_tiles_4.dimensions | 0 .../title_screen.dimensions | 0 .../{cgb => dimensions}/water_club.dimensions | 0 .../water_club_entrance.dimensions | 0 .../water_medal.dimensions | 0 .../maps/tiles/gb/aerodactyl_intro.dimensions | 1 - src/data/maps/tiles/gb/card_pop.dimensions | 1 - .../maps/tiles/gb/challenge_hall.dimensions | 1 - .../gb/challenge_hall_entrance.dimensions | 1 - .../gb/challenge_machine_map_event.dimensions | 1 - .../maps/tiles/gb/charizard_intro.dimensions | 1 - src/data/maps/tiles/gb/club_lobby.dimensions | 1 - src/data/maps/tiles/gb/colosseum.dimensions | 1 - src/data/maps/tiles/gb/copyright.dimensions | 1 - .../gb/deck_machine_map_event.dimensions | 1 - .../tiles/gb/deck_machine_room.dimensions | 1 - src/data/maps/tiles/gb/evolution.dimensions | 1 - .../maps/tiles/gb/fighting_club.dimensions | 1 - .../gb/fighting_club_entrance.dimensions | 1 - src/data/maps/tiles/gb/fire_club.dimensions | 1 - .../tiles/gb/fire_club_entrance.dimensions | 1 - .../maps/tiles/gb/gameboy_link.dimensions | 1 - .../gb/gameboy_link_connecting.dimensions | 1 - .../maps/tiles/gb/gameboy_printer.dimensions | 1 - src/data/maps/tiles/gb/grass_club.dimensions | 1 - .../tiles/gb/grass_club_entrance.dimensions | 1 - .../maps/tiles/gb/hall_of_honor.dimensions | 1 - .../hall_of_honor_door_map_event.dimensions | 1 - src/data/maps/tiles/gb/ishihara.dimensions | 1 - .../tiles/gb/japanese_title_screen.dimensions | 1 - .../gb/japanese_title_screen_2.dimensions | 1 - src/data/maps/tiles/gb/laboratory.dimensions | 1 - .../maps/tiles/gb/lightning_club.dimensions | 1 - .../gb/lightning_club_entrance.dimensions | 1 - .../maps/tiles/gb/mason_laboratory.dimensions | 1 - src/data/maps/tiles/gb/mystery.dimensions | 1 - .../maps/tiles/gb/overworld_map.dimensions | 1 - .../maps/tiles/gb/pokemon_dome.dimensions | 1 - .../gb/pokemon_dome_door_map_event.dimensions | 1 - .../tiles/gb/pokemon_dome_entrance.dimensions | 1 - .../maps/tiles/gb/psychic_club.dimensions | 1 - .../tiles/gb/psychic_club_entrance.dimensions | 1 - src/data/maps/tiles/gb/rock_club.dimensions | 1 - .../tiles/gb/rock_club_entrance.dimensions | 1 - .../maps/tiles/gb/science_club.dimensions | 1 - .../tiles/gb/science_club_entrance.dimensions | 1 - .../maps/tiles/gb/scyther_intro.dimensions | 1 - .../maps/tiles/gb/title_screen.dimensions | 1 - src/data/maps/tiles/gb/water_club.dimensions | 1 - .../tiles/gb/water_club_entrance.dimensions | 1 - src/gfx.asm | 130 +++++++++--------- tools/bgmap.c | 23 +--- 110 files changed, 114 insertions(+), 170 deletions(-) rename src/data/maps/tiles/{cgb => dimensions}/aerodactyl_intro.dimensions (100%) rename src/data/maps/tiles/{cgb => dimensions}/card_pop.dimensions (100%) rename src/data/maps/tiles/{cgb => dimensions}/challenge_hall.dimensions (100%) rename src/data/maps/tiles/{cgb => dimensions}/challenge_hall_entrance.dimensions (100%) rename src/data/maps/tiles/{cgb => dimensions}/challenge_machine_map_event.dimensions (100%) rename src/data/maps/tiles/{cgb => dimensions}/charizard_intro.dimensions (100%) rename src/data/maps/tiles/{cgb => dimensions}/club_lobby.dimensions (100%) rename src/data/maps/tiles/{cgb => dimensions}/colosseum.dimensions (100%) rename src/data/maps/tiles/{gb => dimensions}/companies.dimensions (100%) rename src/data/maps/tiles/{cgb => dimensions}/copyright.dimensions (100%) rename src/data/maps/tiles/{cgb => dimensions}/deck_machine_map_event.dimensions (100%) rename src/data/maps/tiles/{cgb => dimensions}/deck_machine_room.dimensions (100%) rename src/data/maps/tiles/{cgb => dimensions}/evolution.dimensions (100%) rename src/data/maps/tiles/{cgb => dimensions}/fighting_club.dimensions (100%) rename src/data/maps/tiles/{cgb => dimensions}/fighting_club_entrance.dimensions (100%) rename src/data/maps/tiles/{cgb => dimensions}/fighting_medal.dimensions (100%) rename src/data/maps/tiles/{cgb => dimensions}/fire_club.dimensions (100%) rename src/data/maps/tiles/{cgb => dimensions}/fire_club_entrance.dimensions (100%) rename src/data/maps/tiles/{cgb => dimensions}/fire_medal.dimensions (100%) rename src/data/maps/tiles/{cgb => dimensions}/gameboy_link.dimensions (100%) rename src/data/maps/tiles/{cgb => dimensions}/gameboy_link_connecting.dimensions (100%) rename src/data/maps/tiles/{cgb => dimensions}/gameboy_printer.dimensions (100%) rename src/data/maps/tiles/{cgb => dimensions}/grass_club.dimensions (100%) rename src/data/maps/tiles/{cgb => dimensions}/grass_club_entrance.dimensions (100%) rename src/data/maps/tiles/{cgb => dimensions}/grass_medal.dimensions (100%) rename src/data/maps/tiles/{cgb => dimensions}/hall_of_honor.dimensions (100%) rename src/data/maps/tiles/{cgb => dimensions}/hall_of_honor_door_map_event.dimensions (100%) rename src/data/maps/tiles/{cgb => dimensions}/ishihara.dimensions (100%) rename src/data/maps/tiles/{cgb => dimensions}/japanese_title_screen.dimensions (100%) rename src/data/maps/tiles/{cgb => dimensions}/japanese_title_screen_2.dimensions (100%) rename src/data/maps/tiles/{cgb => dimensions}/laboratory.dimensions (100%) rename src/data/maps/tiles/{cgb => dimensions}/lightning_club.dimensions (100%) rename src/data/maps/tiles/{cgb => dimensions}/lightning_club_entrance.dimensions (100%) rename src/data/maps/tiles/{cgb => dimensions}/lightning_medal.dimensions (100%) rename src/data/maps/tiles/{cgb => dimensions}/mason_laboratory.dimensions (100%) rename src/data/maps/tiles/{cgb => dimensions}/mystery.dimensions (100%) rename src/data/maps/tiles/{gb => dimensions}/nintendo.dimensions (100%) rename src/data/maps/tiles/{gb => dimensions}/opponent.dimensions (100%) rename src/data/maps/tiles/{cgb => dimensions}/overworld_map.dimensions (100%) rename src/data/maps/tiles/{gb => dimensions}/player.dimensions (100%) rename src/data/maps/tiles/{cgb => dimensions}/pokemon_dome.dimensions (100%) rename src/data/maps/tiles/{cgb => dimensions}/pokemon_dome_door_map_event.dimensions (100%) rename src/data/maps/tiles/{cgb => dimensions}/pokemon_dome_entrance.dimensions (100%) rename src/data/maps/tiles/{cgb => dimensions}/psychic_club.dimensions (100%) rename src/data/maps/tiles/{cgb => dimensions}/psychic_club_entrance.dimensions (100%) rename src/data/maps/tiles/{cgb => dimensions}/psychic_medal.dimensions (100%) rename src/data/maps/tiles/{cgb => dimensions}/rock_club.dimensions (100%) rename src/data/maps/tiles/{cgb => dimensions}/rock_club_entrance.dimensions (100%) rename src/data/maps/tiles/{cgb => dimensions}/rock_medal.dimensions (100%) rename src/data/maps/tiles/{cgb => dimensions}/science_club.dimensions (100%) rename src/data/maps/tiles/{cgb => dimensions}/science_club_entrance.dimensions (100%) rename src/data/maps/tiles/{cgb => dimensions}/science_medal.dimensions (100%) rename src/data/maps/tiles/{cgb => dimensions}/scyther_intro.dimensions (100%) rename src/data/maps/tiles/{cgb => dimensions}/solid_tiles_1.dimensions (100%) rename src/data/maps/tiles/{cgb => dimensions}/solid_tiles_2.dimensions (100%) rename src/data/maps/tiles/{cgb => dimensions}/solid_tiles_3.dimensions (100%) rename src/data/maps/tiles/{cgb => dimensions}/solid_tiles_4.dimensions (100%) rename src/data/maps/tiles/{cgb => dimensions}/title_screen.dimensions (100%) rename src/data/maps/tiles/{cgb => dimensions}/water_club.dimensions (100%) rename src/data/maps/tiles/{cgb => dimensions}/water_club_entrance.dimensions (100%) rename src/data/maps/tiles/{cgb => dimensions}/water_medal.dimensions (100%) delete mode 100644 src/data/maps/tiles/gb/aerodactyl_intro.dimensions delete mode 100644 src/data/maps/tiles/gb/card_pop.dimensions delete mode 100644 src/data/maps/tiles/gb/challenge_hall.dimensions delete mode 100644 src/data/maps/tiles/gb/challenge_hall_entrance.dimensions delete mode 100644 src/data/maps/tiles/gb/challenge_machine_map_event.dimensions delete mode 100644 src/data/maps/tiles/gb/charizard_intro.dimensions delete mode 100644 src/data/maps/tiles/gb/club_lobby.dimensions delete mode 100644 src/data/maps/tiles/gb/colosseum.dimensions delete mode 100644 src/data/maps/tiles/gb/copyright.dimensions delete mode 100644 src/data/maps/tiles/gb/deck_machine_map_event.dimensions delete mode 100644 src/data/maps/tiles/gb/deck_machine_room.dimensions delete mode 100644 src/data/maps/tiles/gb/evolution.dimensions delete mode 100644 src/data/maps/tiles/gb/fighting_club.dimensions delete mode 100644 src/data/maps/tiles/gb/fighting_club_entrance.dimensions delete mode 100644 src/data/maps/tiles/gb/fire_club.dimensions delete mode 100644 src/data/maps/tiles/gb/fire_club_entrance.dimensions delete mode 100644 src/data/maps/tiles/gb/gameboy_link.dimensions delete mode 100644 src/data/maps/tiles/gb/gameboy_link_connecting.dimensions delete mode 100644 src/data/maps/tiles/gb/gameboy_printer.dimensions delete mode 100644 src/data/maps/tiles/gb/grass_club.dimensions delete mode 100644 src/data/maps/tiles/gb/grass_club_entrance.dimensions delete mode 100644 src/data/maps/tiles/gb/hall_of_honor.dimensions delete mode 100644 src/data/maps/tiles/gb/hall_of_honor_door_map_event.dimensions delete mode 100644 src/data/maps/tiles/gb/ishihara.dimensions delete mode 100644 src/data/maps/tiles/gb/japanese_title_screen.dimensions delete mode 100644 src/data/maps/tiles/gb/japanese_title_screen_2.dimensions delete mode 100644 src/data/maps/tiles/gb/laboratory.dimensions delete mode 100644 src/data/maps/tiles/gb/lightning_club.dimensions delete mode 100644 src/data/maps/tiles/gb/lightning_club_entrance.dimensions delete mode 100644 src/data/maps/tiles/gb/mason_laboratory.dimensions delete mode 100644 src/data/maps/tiles/gb/mystery.dimensions delete mode 100644 src/data/maps/tiles/gb/overworld_map.dimensions delete mode 100644 src/data/maps/tiles/gb/pokemon_dome.dimensions delete mode 100644 src/data/maps/tiles/gb/pokemon_dome_door_map_event.dimensions delete mode 100644 src/data/maps/tiles/gb/pokemon_dome_entrance.dimensions delete mode 100644 src/data/maps/tiles/gb/psychic_club.dimensions delete mode 100644 src/data/maps/tiles/gb/psychic_club_entrance.dimensions delete mode 100644 src/data/maps/tiles/gb/rock_club.dimensions delete mode 100644 src/data/maps/tiles/gb/rock_club_entrance.dimensions delete mode 100644 src/data/maps/tiles/gb/science_club.dimensions delete mode 100644 src/data/maps/tiles/gb/science_club_entrance.dimensions delete mode 100644 src/data/maps/tiles/gb/scyther_intro.dimensions delete mode 100644 src/data/maps/tiles/gb/title_screen.dimensions delete mode 100644 src/data/maps/tiles/gb/water_club.dimensions delete mode 100644 src/data/maps/tiles/gb/water_club_entrance.dimensions diff --git a/Makefile b/Makefile index f1af0a24..359aac6c 100644 --- a/Makefile +++ b/Makefile @@ -164,8 +164,8 @@ src/gfx/titlescreen/title_screen_cgb.2bpp: rgbgfx += -x 12 $(if $(tools/gfx),\ tools/gfx $(tools/gfx) -d1 -o $@ $@) -%.bgmap: %.bin - tools/bgmap $(tools/bgmap) $< $@ +%.bgmap: %.bin ../dimensions/%.dimensions + tools/bgmap $(tools/bgmap) $^ $@ # remove -m if you don't care for matching %.lz: % diff --git a/src/data/maps/tilemaps.asm b/src/data/maps/tilemaps.asm index 0dbc7b3f..c3184563 100644 --- a/src/data/maps/tilemaps.asm +++ b/src/data/maps/tilemaps.asm @@ -1,17 +1,17 @@ OverworldMapTilemap:: - INCBIN "data/maps/tiles/gb/overworld_map.dimensions" + INCBIN "data/maps/tiles/dimensions/overworld_map.dimensions" dw NULL db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/overworld_map.bin.lz" OverworldMapCGBTilemap:: - INCBIN "data/maps/tiles/cgb/overworld_map.dimensions" + INCBIN "data/maps/tiles/dimensions/overworld_map.dimensions" dw NULL db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/overworld_map.bgmap.lz" MasonLaboratoryTilemap:: - INCBIN "data/maps/tiles/gb/mason_laboratory.dimensions" + INCBIN "data/maps/tiles/dimensions/mason_laboratory.dimensions" dw MasonLaboratoryPermissions db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/mason_laboratory.bin.lz" @@ -19,7 +19,7 @@ MasonLaboratoryPermissions: INCBIN "data/maps/permissions/mason_laboratory.bin.lz" MasonLaboratoryCGBTilemap:: - INCBIN "data/maps/tiles/cgb/mason_laboratory.dimensions" + INCBIN "data/maps/tiles/dimensions/mason_laboratory.dimensions" dw MasonLaboratoryCGBPermissions db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/mason_laboratory.bgmap.lz" @@ -27,7 +27,7 @@ MasonLaboratoryCGBPermissions: INCBIN "data/maps/permissions/mason_laboratory.bin.lz" ChallengeMachineMapEventTilemap:: - INCBIN "data/maps/tiles/gb/challenge_machine_map_event.dimensions" + INCBIN "data/maps/tiles/dimensions/challenge_machine_map_event.dimensions" dw ChallengeMachineMapEventPermissions db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/challenge_machine_map_event.bin.lz" @@ -35,7 +35,7 @@ ChallengeMachineMapEventPermissions: INCBIN "data/maps/permissions/challenge_machine_map_event.bin.lz" ChallengeMachineMapEventCGBTilemap:: - INCBIN "data/maps/tiles/cgb/challenge_machine_map_event.dimensions" + INCBIN "data/maps/tiles/dimensions/challenge_machine_map_event.dimensions" dw ChallengeMachineMapEventCGBPermissions db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/challenge_machine_map_event.bgmap.lz" @@ -43,7 +43,7 @@ ChallengeMachineMapEventCGBPermissions: INCBIN "data/maps/permissions/challenge_machine_map_event.bin.lz" DeckMachineRoomTilemap:: - INCBIN "data/maps/tiles/gb/deck_machine_room.dimensions" + INCBIN "data/maps/tiles/dimensions/deck_machine_room.dimensions" dw DeckMachineRoomPermissions db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/deck_machine_room.bin.lz" @@ -51,7 +51,7 @@ DeckMachineRoomPermissions: INCBIN "data/maps/permissions/deck_machine_room.bin.lz" DeckMachineRoomCGBTilemap:: - INCBIN "data/maps/tiles/cgb/deck_machine_room.dimensions" + INCBIN "data/maps/tiles/dimensions/deck_machine_room.dimensions" dw DeckMachineRoomCGBPermissions db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/deck_machine_room.bgmap.lz" @@ -59,7 +59,7 @@ DeckMachineRoomCGBPermissions: INCBIN "data/maps/permissions/deck_machine_room.bin.lz" DeckMachineMapEventTilemap:: - INCBIN "data/maps/tiles/gb/deck_machine_map_event.dimensions" + INCBIN "data/maps/tiles/dimensions/deck_machine_map_event.dimensions" dw DeckMachineMapEventPermissions db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/deck_machine_map_event.bin.lz" @@ -67,7 +67,7 @@ DeckMachineMapEventPermissions: INCBIN "data/maps/permissions/deck_machine_map_event.bin.lz" DeckMachineMapEventCGBTilemap:: - INCBIN "data/maps/tiles/cgb/deck_machine_map_event.dimensions" + INCBIN "data/maps/tiles/dimensions/deck_machine_map_event.dimensions" dw DeckMachineMapEventCGBPermissions db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/deck_machine_map_event.bgmap.lz" @@ -75,7 +75,7 @@ DeckMachineMapEventCGBPermissions: INCBIN "data/maps/permissions/deck_machine_map_event.bin.lz" IshiharaTilemap:: - INCBIN "data/maps/tiles/gb/ishihara.dimensions" + INCBIN "data/maps/tiles/dimensions/ishihara.dimensions" dw IshiharaPermissions db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/ishihara.bin.lz" @@ -83,7 +83,7 @@ IshiharaPermissions: INCBIN "data/maps/permissions/ishihara.bin.lz" IshiharaCGBTilemap:: - INCBIN "data/maps/tiles/cgb/ishihara.dimensions" + INCBIN "data/maps/tiles/dimensions/ishihara.dimensions" dw IshiharaCGBPermissions db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/ishihara.bgmap.lz" @@ -91,7 +91,7 @@ IshiharaCGBPermissions: INCBIN "data/maps/permissions/ishihara.bin.lz" FightingClubEntranceTilemap:: - INCBIN "data/maps/tiles/gb/fighting_club_entrance.dimensions" + INCBIN "data/maps/tiles/dimensions/fighting_club_entrance.dimensions" dw FightingClubEntrancePermissions db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/fighting_club_entrance.bin.lz" @@ -99,7 +99,7 @@ FightingClubEntrancePermissions: INCBIN "data/maps/permissions/fighting_club_entrance.bin.lz" FightingClubEntranceCGBTilemap:: - INCBIN "data/maps/tiles/cgb/fighting_club_entrance.dimensions" + INCBIN "data/maps/tiles/dimensions/fighting_club_entrance.dimensions" dw FightingClubEntranceCGBPermissions db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/fighting_club_entrance.bgmap.lz" @@ -107,7 +107,7 @@ FightingClubEntranceCGBPermissions: INCBIN "data/maps/permissions/fighting_club_entrance.bin.lz" RockClubEntranceTilemap:: - INCBIN "data/maps/tiles/gb/rock_club_entrance.dimensions" + INCBIN "data/maps/tiles/dimensions/rock_club_entrance.dimensions" dw RockClubEntrancePermissions db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/rock_club_entrance.bin.lz" @@ -115,7 +115,7 @@ RockClubEntrancePermissions: INCBIN "data/maps/permissions/rock_club_entrance.bin.lz" RockClubEntranceCGBTilemap:: - INCBIN "data/maps/tiles/cgb/rock_club_entrance.dimensions" + INCBIN "data/maps/tiles/dimensions/rock_club_entrance.dimensions" dw RockClubEntranceCGBPermissions db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/rock_club_entrance.bgmap.lz" @@ -123,7 +123,7 @@ RockClubEntranceCGBPermissions: INCBIN "data/maps/permissions/rock_club_entrance.bin.lz" WaterClubEntranceTilemap:: - INCBIN "data/maps/tiles/gb/water_club_entrance.dimensions" + INCBIN "data/maps/tiles/dimensions/water_club_entrance.dimensions" dw WaterClubEntrancePermissions db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/water_club_entrance.bin.lz" @@ -131,7 +131,7 @@ WaterClubEntrancePermissions: INCBIN "data/maps/permissions/water_club_entrance.bin.lz" WaterClubEntranceCGBTilemap:: - INCBIN "data/maps/tiles/cgb/water_club_entrance.dimensions" + INCBIN "data/maps/tiles/dimensions/water_club_entrance.dimensions" dw WaterClubEntranceCGBPermissions db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/water_club_entrance.bgmap.lz" @@ -139,7 +139,7 @@ WaterClubEntranceCGBPermissions: INCBIN "data/maps/permissions/water_club_entrance.bin.lz" LightningClubEntranceTilemap:: - INCBIN "data/maps/tiles/gb/lightning_club_entrance.dimensions" + INCBIN "data/maps/tiles/dimensions/lightning_club_entrance.dimensions" dw LightningClubEntrancePermissions db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/lightning_club_entrance.bin.lz" @@ -147,7 +147,7 @@ LightningClubEntrancePermissions: INCBIN "data/maps/permissions/lightning_club_entrance.bin.lz" LightningClubEntranceCGBTilemap:: - INCBIN "data/maps/tiles/cgb/lightning_club_entrance.dimensions" + INCBIN "data/maps/tiles/dimensions/lightning_club_entrance.dimensions" dw LightningClubEntranceCGBPermissions db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/lightning_club_entrance.bgmap.lz" @@ -155,7 +155,7 @@ LightningClubEntranceCGBPermissions: INCBIN "data/maps/permissions/lightning_club_entrance.bin.lz" GrassClubEntranceTilemap:: - INCBIN "data/maps/tiles/gb/grass_club_entrance.dimensions" + INCBIN "data/maps/tiles/dimensions/grass_club_entrance.dimensions" dw GrassClubEntrancePermissions db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/grass_club_entrance.bin.lz" @@ -163,7 +163,7 @@ GrassClubEntrancePermissions: INCBIN "data/maps/permissions/grass_club_entrance.bin.lz" GrassClubEntranceCGBTilemap:: - INCBIN "data/maps/tiles/cgb/grass_club_entrance.dimensions" + INCBIN "data/maps/tiles/dimensions/grass_club_entrance.dimensions" dw GrassClubEntranceCGBPermissions db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/grass_club_entrance.bgmap.lz" @@ -171,7 +171,7 @@ GrassClubEntranceCGBPermissions: INCBIN "data/maps/permissions/grass_club_entrance.bin.lz" PsychicClubEntranceTilemap:: - INCBIN "data/maps/tiles/gb/psychic_club_entrance.dimensions" + INCBIN "data/maps/tiles/dimensions/psychic_club_entrance.dimensions" dw PsychicClubEntrancePermissions db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/psychic_club_entrance.bin.lz" @@ -179,7 +179,7 @@ PsychicClubEntrancePermissions: INCBIN "data/maps/permissions/psychic_club_entrance.bin.lz" PsychicClubEntranceCGBTilemap:: - INCBIN "data/maps/tiles/cgb/psychic_club_entrance.dimensions" + INCBIN "data/maps/tiles/dimensions/psychic_club_entrance.dimensions" dw PsychicClubEntranceCGBPermissions db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/psychic_club_entrance.bgmap.lz" @@ -187,7 +187,7 @@ PsychicClubEntranceCGBPermissions: INCBIN "data/maps/permissions/psychic_club_entrance.bin.lz" ScienceClubEntranceTilemap:: - INCBIN "data/maps/tiles/gb/science_club_entrance.dimensions" + INCBIN "data/maps/tiles/dimensions/science_club_entrance.dimensions" dw ScienceClubEntrancePermissions db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/science_club_entrance.bin.lz" @@ -195,7 +195,7 @@ ScienceClubEntrancePermissions: INCBIN "data/maps/permissions/science_club_entrance.bin.lz" ScienceClubEntranceCGBTilemap:: - INCBIN "data/maps/tiles/cgb/science_club_entrance.dimensions" + INCBIN "data/maps/tiles/dimensions/science_club_entrance.dimensions" dw ScienceClubEntranceCGBPermissions db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/science_club_entrance.bgmap.lz" @@ -203,7 +203,7 @@ ScienceClubEntranceCGBPermissions: INCBIN "data/maps/permissions/science_club_entrance.bin.lz" FireClubEntranceTilemap:: - INCBIN "data/maps/tiles/gb/fire_club_entrance.dimensions" + INCBIN "data/maps/tiles/dimensions/fire_club_entrance.dimensions" dw FireClubEntrancePermissions db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/fire_club_entrance.bin.lz" @@ -211,7 +211,7 @@ FireClubEntrancePermissions: INCBIN "data/maps/permissions/fire_club_entrance.bin.lz" FireClubEntranceCGBTilemap:: - INCBIN "data/maps/tiles/cgb/fire_club_entrance.dimensions" + INCBIN "data/maps/tiles/dimensions/fire_club_entrance.dimensions" dw FireClubEntranceCGBPermissions db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/fire_club_entrance.bgmap.lz" @@ -219,7 +219,7 @@ FireClubEntranceCGBPermissions: INCBIN "data/maps/permissions/fire_club_entrance.bin.lz" ChallengeHallEntranceTilemap:: - INCBIN "data/maps/tiles/gb/challenge_hall_entrance.dimensions" + INCBIN "data/maps/tiles/dimensions/challenge_hall_entrance.dimensions" dw ChallengeHallEntrancePermissions db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/challenge_hall_entrance.bin.lz" @@ -227,7 +227,7 @@ ChallengeHallEntrancePermissions: INCBIN "data/maps/permissions/challenge_hall_entrance.bin.lz" ChallengeHallEntranceCGBTilemap:: - INCBIN "data/maps/tiles/cgb/challenge_hall_entrance.dimensions" + INCBIN "data/maps/tiles/dimensions/challenge_hall_entrance.dimensions" dw ChallengeHallEntranceCGBPermissions db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/challenge_hall_entrance.bgmap.lz" @@ -235,7 +235,7 @@ ChallengeHallEntranceCGBPermissions: INCBIN "data/maps/permissions/challenge_hall_entrance.bin.lz" ClubLobbyTilemap:: - INCBIN "data/maps/tiles/gb/club_lobby.dimensions" + INCBIN "data/maps/tiles/dimensions/club_lobby.dimensions" dw ClubLobbyPermissions db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/club_lobby.bin.lz" @@ -243,7 +243,7 @@ ClubLobbyPermissions: INCBIN "data/maps/permissions/club_lobby.bin.lz" ClubLobbyCGBTilemap:: - INCBIN "data/maps/tiles/cgb/club_lobby.dimensions" + INCBIN "data/maps/tiles/dimensions/club_lobby.dimensions" dw ClubLobbyCGBPermissions db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/club_lobby.bgmap.lz" @@ -251,7 +251,7 @@ ClubLobbyCGBPermissions: INCBIN "data/maps/permissions/club_lobby.bin.lz" FightingClubTilemap:: - INCBIN "data/maps/tiles/gb/fighting_club.dimensions" + INCBIN "data/maps/tiles/dimensions/fighting_club.dimensions" dw FightingClubPermissions db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/fighting_club.bin.lz" @@ -259,7 +259,7 @@ FightingClubPermissions: INCBIN "data/maps/permissions/fighting_club.bin.lz" FightingClubCGBTilemap:: - INCBIN "data/maps/tiles/cgb/fighting_club.dimensions" + INCBIN "data/maps/tiles/dimensions/fighting_club.dimensions" dw FightingClubCGBPermissions db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/fighting_club.bgmap.lz" @@ -267,7 +267,7 @@ FightingClubCGBPermissions: INCBIN "data/maps/permissions/fighting_club.bin.lz" RockClubTilemap:: - INCBIN "data/maps/tiles/gb/rock_club.dimensions" + INCBIN "data/maps/tiles/dimensions/rock_club.dimensions" dw RockClubPermissions db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/rock_club.bin.lz" @@ -275,7 +275,7 @@ RockClubPermissions: INCBIN "data/maps/permissions/rock_club.bin.lz" RockClubCGBTilemap:: - INCBIN "data/maps/tiles/cgb/rock_club.dimensions" + INCBIN "data/maps/tiles/dimensions/rock_club.dimensions" dw RockClubCGBPermissions db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/rock_club.bgmap.lz" @@ -283,7 +283,7 @@ RockClubCGBPermissions: INCBIN "data/maps/permissions/rock_club.bin.lz" PokemonDomeDoorMapEventTilemap:: - INCBIN "data/maps/tiles/gb/pokemon_dome_door_map_event.dimensions" + INCBIN "data/maps/tiles/dimensions/pokemon_dome_door_map_event.dimensions" dw PokemonDomeDoorMapEventPermissions db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/pokemon_dome_door_map_event.bin.lz" @@ -291,7 +291,7 @@ PokemonDomeDoorMapEventPermissions: INCBIN "data/maps/permissions/pokemon_dome_door_map_event.bin.lz" PokemonDomeDoorMapEventCGBTilemap:: - INCBIN "data/maps/tiles/cgb/pokemon_dome_door_map_event.dimensions" + INCBIN "data/maps/tiles/dimensions/pokemon_dome_door_map_event.dimensions" dw PokemonDomeDoorMapEventCGBPermissions db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/pokemon_dome_door_map_event.bgmap.lz" @@ -299,7 +299,7 @@ PokemonDomeDoorMapEventCGBPermissions: INCBIN "data/maps/permissions/pokemon_dome_door_map_event.bin.lz" HallOfHonorDoorMapEventTilemap:: - INCBIN "data/maps/tiles/gb/hall_of_honor_door_map_event.dimensions" + INCBIN "data/maps/tiles/dimensions/hall_of_honor_door_map_event.dimensions" dw HallOfHonorDoorMapEventPermissions db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/hall_of_honor_door_map_event.bin.lz" @@ -307,7 +307,7 @@ HallOfHonorDoorMapEventPermissions: INCBIN "data/maps/permissions/hall_of_honor_door_map_event.bin.lz" HallOfHonorDoorMapEventCGBTilemap:: - INCBIN "data/maps/tiles/cgb/hall_of_honor_door_map_event.dimensions" + INCBIN "data/maps/tiles/dimensions/hall_of_honor_door_map_event.dimensions" dw HallOfHonorDoorMapEventCGBPermissions db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/hall_of_honor_door_map_event.bgmap.lz" @@ -315,7 +315,7 @@ HallOfHonorDoorMapEventCGBPermissions: INCBIN "data/maps/permissions/hall_of_honor_door_map_event.bin.lz" GrassMedalTilemap:: - INCBIN "data/maps/tiles/cgb/grass_medal.dimensions" + INCBIN "data/maps/tiles/dimensions/grass_medal.dimensions" dw NULL db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/grass_medal.bgmap.lz" diff --git a/src/data/maps/tiles/cgb/aerodactyl_intro.dimensions b/src/data/maps/tiles/dimensions/aerodactyl_intro.dimensions similarity index 100% rename from src/data/maps/tiles/cgb/aerodactyl_intro.dimensions rename to src/data/maps/tiles/dimensions/aerodactyl_intro.dimensions diff --git a/src/data/maps/tiles/cgb/card_pop.dimensions b/src/data/maps/tiles/dimensions/card_pop.dimensions similarity index 100% rename from src/data/maps/tiles/cgb/card_pop.dimensions rename to src/data/maps/tiles/dimensions/card_pop.dimensions diff --git a/src/data/maps/tiles/cgb/challenge_hall.dimensions b/src/data/maps/tiles/dimensions/challenge_hall.dimensions similarity index 100% rename from src/data/maps/tiles/cgb/challenge_hall.dimensions rename to src/data/maps/tiles/dimensions/challenge_hall.dimensions diff --git a/src/data/maps/tiles/cgb/challenge_hall_entrance.dimensions b/src/data/maps/tiles/dimensions/challenge_hall_entrance.dimensions similarity index 100% rename from src/data/maps/tiles/cgb/challenge_hall_entrance.dimensions rename to src/data/maps/tiles/dimensions/challenge_hall_entrance.dimensions diff --git a/src/data/maps/tiles/cgb/challenge_machine_map_event.dimensions b/src/data/maps/tiles/dimensions/challenge_machine_map_event.dimensions similarity index 100% rename from src/data/maps/tiles/cgb/challenge_machine_map_event.dimensions rename to src/data/maps/tiles/dimensions/challenge_machine_map_event.dimensions diff --git a/src/data/maps/tiles/cgb/charizard_intro.dimensions b/src/data/maps/tiles/dimensions/charizard_intro.dimensions similarity index 100% rename from src/data/maps/tiles/cgb/charizard_intro.dimensions rename to src/data/maps/tiles/dimensions/charizard_intro.dimensions diff --git a/src/data/maps/tiles/cgb/club_lobby.dimensions b/src/data/maps/tiles/dimensions/club_lobby.dimensions similarity index 100% rename from src/data/maps/tiles/cgb/club_lobby.dimensions rename to src/data/maps/tiles/dimensions/club_lobby.dimensions diff --git a/src/data/maps/tiles/cgb/colosseum.dimensions b/src/data/maps/tiles/dimensions/colosseum.dimensions similarity index 100% rename from src/data/maps/tiles/cgb/colosseum.dimensions rename to src/data/maps/tiles/dimensions/colosseum.dimensions diff --git a/src/data/maps/tiles/gb/companies.dimensions b/src/data/maps/tiles/dimensions/companies.dimensions similarity index 100% rename from src/data/maps/tiles/gb/companies.dimensions rename to src/data/maps/tiles/dimensions/companies.dimensions diff --git a/src/data/maps/tiles/cgb/copyright.dimensions b/src/data/maps/tiles/dimensions/copyright.dimensions similarity index 100% rename from src/data/maps/tiles/cgb/copyright.dimensions rename to src/data/maps/tiles/dimensions/copyright.dimensions diff --git a/src/data/maps/tiles/cgb/deck_machine_map_event.dimensions b/src/data/maps/tiles/dimensions/deck_machine_map_event.dimensions similarity index 100% rename from src/data/maps/tiles/cgb/deck_machine_map_event.dimensions rename to src/data/maps/tiles/dimensions/deck_machine_map_event.dimensions diff --git a/src/data/maps/tiles/cgb/deck_machine_room.dimensions b/src/data/maps/tiles/dimensions/deck_machine_room.dimensions similarity index 100% rename from src/data/maps/tiles/cgb/deck_machine_room.dimensions rename to src/data/maps/tiles/dimensions/deck_machine_room.dimensions diff --git a/src/data/maps/tiles/cgb/evolution.dimensions b/src/data/maps/tiles/dimensions/evolution.dimensions similarity index 100% rename from src/data/maps/tiles/cgb/evolution.dimensions rename to src/data/maps/tiles/dimensions/evolution.dimensions diff --git a/src/data/maps/tiles/cgb/fighting_club.dimensions b/src/data/maps/tiles/dimensions/fighting_club.dimensions similarity index 100% rename from src/data/maps/tiles/cgb/fighting_club.dimensions rename to src/data/maps/tiles/dimensions/fighting_club.dimensions diff --git a/src/data/maps/tiles/cgb/fighting_club_entrance.dimensions b/src/data/maps/tiles/dimensions/fighting_club_entrance.dimensions similarity index 100% rename from src/data/maps/tiles/cgb/fighting_club_entrance.dimensions rename to src/data/maps/tiles/dimensions/fighting_club_entrance.dimensions diff --git a/src/data/maps/tiles/cgb/fighting_medal.dimensions b/src/data/maps/tiles/dimensions/fighting_medal.dimensions similarity index 100% rename from src/data/maps/tiles/cgb/fighting_medal.dimensions rename to src/data/maps/tiles/dimensions/fighting_medal.dimensions diff --git a/src/data/maps/tiles/cgb/fire_club.dimensions b/src/data/maps/tiles/dimensions/fire_club.dimensions similarity index 100% rename from src/data/maps/tiles/cgb/fire_club.dimensions rename to src/data/maps/tiles/dimensions/fire_club.dimensions diff --git a/src/data/maps/tiles/cgb/fire_club_entrance.dimensions b/src/data/maps/tiles/dimensions/fire_club_entrance.dimensions similarity index 100% rename from src/data/maps/tiles/cgb/fire_club_entrance.dimensions rename to src/data/maps/tiles/dimensions/fire_club_entrance.dimensions diff --git a/src/data/maps/tiles/cgb/fire_medal.dimensions b/src/data/maps/tiles/dimensions/fire_medal.dimensions similarity index 100% rename from src/data/maps/tiles/cgb/fire_medal.dimensions rename to src/data/maps/tiles/dimensions/fire_medal.dimensions diff --git a/src/data/maps/tiles/cgb/gameboy_link.dimensions b/src/data/maps/tiles/dimensions/gameboy_link.dimensions similarity index 100% rename from src/data/maps/tiles/cgb/gameboy_link.dimensions rename to src/data/maps/tiles/dimensions/gameboy_link.dimensions diff --git a/src/data/maps/tiles/cgb/gameboy_link_connecting.dimensions b/src/data/maps/tiles/dimensions/gameboy_link_connecting.dimensions similarity index 100% rename from src/data/maps/tiles/cgb/gameboy_link_connecting.dimensions rename to src/data/maps/tiles/dimensions/gameboy_link_connecting.dimensions diff --git a/src/data/maps/tiles/cgb/gameboy_printer.dimensions b/src/data/maps/tiles/dimensions/gameboy_printer.dimensions similarity index 100% rename from src/data/maps/tiles/cgb/gameboy_printer.dimensions rename to src/data/maps/tiles/dimensions/gameboy_printer.dimensions diff --git a/src/data/maps/tiles/cgb/grass_club.dimensions b/src/data/maps/tiles/dimensions/grass_club.dimensions similarity index 100% rename from src/data/maps/tiles/cgb/grass_club.dimensions rename to src/data/maps/tiles/dimensions/grass_club.dimensions diff --git a/src/data/maps/tiles/cgb/grass_club_entrance.dimensions b/src/data/maps/tiles/dimensions/grass_club_entrance.dimensions similarity index 100% rename from src/data/maps/tiles/cgb/grass_club_entrance.dimensions rename to src/data/maps/tiles/dimensions/grass_club_entrance.dimensions diff --git a/src/data/maps/tiles/cgb/grass_medal.dimensions b/src/data/maps/tiles/dimensions/grass_medal.dimensions similarity index 100% rename from src/data/maps/tiles/cgb/grass_medal.dimensions rename to src/data/maps/tiles/dimensions/grass_medal.dimensions diff --git a/src/data/maps/tiles/cgb/hall_of_honor.dimensions b/src/data/maps/tiles/dimensions/hall_of_honor.dimensions similarity index 100% rename from src/data/maps/tiles/cgb/hall_of_honor.dimensions rename to src/data/maps/tiles/dimensions/hall_of_honor.dimensions diff --git a/src/data/maps/tiles/cgb/hall_of_honor_door_map_event.dimensions b/src/data/maps/tiles/dimensions/hall_of_honor_door_map_event.dimensions similarity index 100% rename from src/data/maps/tiles/cgb/hall_of_honor_door_map_event.dimensions rename to src/data/maps/tiles/dimensions/hall_of_honor_door_map_event.dimensions diff --git a/src/data/maps/tiles/cgb/ishihara.dimensions b/src/data/maps/tiles/dimensions/ishihara.dimensions similarity index 100% rename from src/data/maps/tiles/cgb/ishihara.dimensions rename to src/data/maps/tiles/dimensions/ishihara.dimensions diff --git a/src/data/maps/tiles/cgb/japanese_title_screen.dimensions b/src/data/maps/tiles/dimensions/japanese_title_screen.dimensions similarity index 100% rename from src/data/maps/tiles/cgb/japanese_title_screen.dimensions rename to src/data/maps/tiles/dimensions/japanese_title_screen.dimensions diff --git a/src/data/maps/tiles/cgb/japanese_title_screen_2.dimensions b/src/data/maps/tiles/dimensions/japanese_title_screen_2.dimensions similarity index 100% rename from src/data/maps/tiles/cgb/japanese_title_screen_2.dimensions rename to src/data/maps/tiles/dimensions/japanese_title_screen_2.dimensions diff --git a/src/data/maps/tiles/cgb/laboratory.dimensions b/src/data/maps/tiles/dimensions/laboratory.dimensions similarity index 100% rename from src/data/maps/tiles/cgb/laboratory.dimensions rename to src/data/maps/tiles/dimensions/laboratory.dimensions diff --git a/src/data/maps/tiles/cgb/lightning_club.dimensions b/src/data/maps/tiles/dimensions/lightning_club.dimensions similarity index 100% rename from src/data/maps/tiles/cgb/lightning_club.dimensions rename to src/data/maps/tiles/dimensions/lightning_club.dimensions diff --git a/src/data/maps/tiles/cgb/lightning_club_entrance.dimensions b/src/data/maps/tiles/dimensions/lightning_club_entrance.dimensions similarity index 100% rename from src/data/maps/tiles/cgb/lightning_club_entrance.dimensions rename to src/data/maps/tiles/dimensions/lightning_club_entrance.dimensions diff --git a/src/data/maps/tiles/cgb/lightning_medal.dimensions b/src/data/maps/tiles/dimensions/lightning_medal.dimensions similarity index 100% rename from src/data/maps/tiles/cgb/lightning_medal.dimensions rename to src/data/maps/tiles/dimensions/lightning_medal.dimensions diff --git a/src/data/maps/tiles/cgb/mason_laboratory.dimensions b/src/data/maps/tiles/dimensions/mason_laboratory.dimensions similarity index 100% rename from src/data/maps/tiles/cgb/mason_laboratory.dimensions rename to src/data/maps/tiles/dimensions/mason_laboratory.dimensions diff --git a/src/data/maps/tiles/cgb/mystery.dimensions b/src/data/maps/tiles/dimensions/mystery.dimensions similarity index 100% rename from src/data/maps/tiles/cgb/mystery.dimensions rename to src/data/maps/tiles/dimensions/mystery.dimensions diff --git a/src/data/maps/tiles/gb/nintendo.dimensions b/src/data/maps/tiles/dimensions/nintendo.dimensions similarity index 100% rename from src/data/maps/tiles/gb/nintendo.dimensions rename to src/data/maps/tiles/dimensions/nintendo.dimensions diff --git a/src/data/maps/tiles/gb/opponent.dimensions b/src/data/maps/tiles/dimensions/opponent.dimensions similarity index 100% rename from src/data/maps/tiles/gb/opponent.dimensions rename to src/data/maps/tiles/dimensions/opponent.dimensions diff --git a/src/data/maps/tiles/cgb/overworld_map.dimensions b/src/data/maps/tiles/dimensions/overworld_map.dimensions similarity index 100% rename from src/data/maps/tiles/cgb/overworld_map.dimensions rename to src/data/maps/tiles/dimensions/overworld_map.dimensions diff --git a/src/data/maps/tiles/gb/player.dimensions b/src/data/maps/tiles/dimensions/player.dimensions similarity index 100% rename from src/data/maps/tiles/gb/player.dimensions rename to src/data/maps/tiles/dimensions/player.dimensions diff --git a/src/data/maps/tiles/cgb/pokemon_dome.dimensions b/src/data/maps/tiles/dimensions/pokemon_dome.dimensions similarity index 100% rename from src/data/maps/tiles/cgb/pokemon_dome.dimensions rename to src/data/maps/tiles/dimensions/pokemon_dome.dimensions diff --git a/src/data/maps/tiles/cgb/pokemon_dome_door_map_event.dimensions b/src/data/maps/tiles/dimensions/pokemon_dome_door_map_event.dimensions similarity index 100% rename from src/data/maps/tiles/cgb/pokemon_dome_door_map_event.dimensions rename to src/data/maps/tiles/dimensions/pokemon_dome_door_map_event.dimensions diff --git a/src/data/maps/tiles/cgb/pokemon_dome_entrance.dimensions b/src/data/maps/tiles/dimensions/pokemon_dome_entrance.dimensions similarity index 100% rename from src/data/maps/tiles/cgb/pokemon_dome_entrance.dimensions rename to src/data/maps/tiles/dimensions/pokemon_dome_entrance.dimensions diff --git a/src/data/maps/tiles/cgb/psychic_club.dimensions b/src/data/maps/tiles/dimensions/psychic_club.dimensions similarity index 100% rename from src/data/maps/tiles/cgb/psychic_club.dimensions rename to src/data/maps/tiles/dimensions/psychic_club.dimensions diff --git a/src/data/maps/tiles/cgb/psychic_club_entrance.dimensions b/src/data/maps/tiles/dimensions/psychic_club_entrance.dimensions similarity index 100% rename from src/data/maps/tiles/cgb/psychic_club_entrance.dimensions rename to src/data/maps/tiles/dimensions/psychic_club_entrance.dimensions diff --git a/src/data/maps/tiles/cgb/psychic_medal.dimensions b/src/data/maps/tiles/dimensions/psychic_medal.dimensions similarity index 100% rename from src/data/maps/tiles/cgb/psychic_medal.dimensions rename to src/data/maps/tiles/dimensions/psychic_medal.dimensions diff --git a/src/data/maps/tiles/cgb/rock_club.dimensions b/src/data/maps/tiles/dimensions/rock_club.dimensions similarity index 100% rename from src/data/maps/tiles/cgb/rock_club.dimensions rename to src/data/maps/tiles/dimensions/rock_club.dimensions diff --git a/src/data/maps/tiles/cgb/rock_club_entrance.dimensions b/src/data/maps/tiles/dimensions/rock_club_entrance.dimensions similarity index 100% rename from src/data/maps/tiles/cgb/rock_club_entrance.dimensions rename to src/data/maps/tiles/dimensions/rock_club_entrance.dimensions diff --git a/src/data/maps/tiles/cgb/rock_medal.dimensions b/src/data/maps/tiles/dimensions/rock_medal.dimensions similarity index 100% rename from src/data/maps/tiles/cgb/rock_medal.dimensions rename to src/data/maps/tiles/dimensions/rock_medal.dimensions diff --git a/src/data/maps/tiles/cgb/science_club.dimensions b/src/data/maps/tiles/dimensions/science_club.dimensions similarity index 100% rename from src/data/maps/tiles/cgb/science_club.dimensions rename to src/data/maps/tiles/dimensions/science_club.dimensions diff --git a/src/data/maps/tiles/cgb/science_club_entrance.dimensions b/src/data/maps/tiles/dimensions/science_club_entrance.dimensions similarity index 100% rename from src/data/maps/tiles/cgb/science_club_entrance.dimensions rename to src/data/maps/tiles/dimensions/science_club_entrance.dimensions diff --git a/src/data/maps/tiles/cgb/science_medal.dimensions b/src/data/maps/tiles/dimensions/science_medal.dimensions similarity index 100% rename from src/data/maps/tiles/cgb/science_medal.dimensions rename to src/data/maps/tiles/dimensions/science_medal.dimensions diff --git a/src/data/maps/tiles/cgb/scyther_intro.dimensions b/src/data/maps/tiles/dimensions/scyther_intro.dimensions similarity index 100% rename from src/data/maps/tiles/cgb/scyther_intro.dimensions rename to src/data/maps/tiles/dimensions/scyther_intro.dimensions diff --git a/src/data/maps/tiles/cgb/solid_tiles_1.dimensions b/src/data/maps/tiles/dimensions/solid_tiles_1.dimensions similarity index 100% rename from src/data/maps/tiles/cgb/solid_tiles_1.dimensions rename to src/data/maps/tiles/dimensions/solid_tiles_1.dimensions diff --git a/src/data/maps/tiles/cgb/solid_tiles_2.dimensions b/src/data/maps/tiles/dimensions/solid_tiles_2.dimensions similarity index 100% rename from src/data/maps/tiles/cgb/solid_tiles_2.dimensions rename to src/data/maps/tiles/dimensions/solid_tiles_2.dimensions diff --git a/src/data/maps/tiles/cgb/solid_tiles_3.dimensions b/src/data/maps/tiles/dimensions/solid_tiles_3.dimensions similarity index 100% rename from src/data/maps/tiles/cgb/solid_tiles_3.dimensions rename to src/data/maps/tiles/dimensions/solid_tiles_3.dimensions diff --git a/src/data/maps/tiles/cgb/solid_tiles_4.dimensions b/src/data/maps/tiles/dimensions/solid_tiles_4.dimensions similarity index 100% rename from src/data/maps/tiles/cgb/solid_tiles_4.dimensions rename to src/data/maps/tiles/dimensions/solid_tiles_4.dimensions diff --git a/src/data/maps/tiles/cgb/title_screen.dimensions b/src/data/maps/tiles/dimensions/title_screen.dimensions similarity index 100% rename from src/data/maps/tiles/cgb/title_screen.dimensions rename to src/data/maps/tiles/dimensions/title_screen.dimensions diff --git a/src/data/maps/tiles/cgb/water_club.dimensions b/src/data/maps/tiles/dimensions/water_club.dimensions similarity index 100% rename from src/data/maps/tiles/cgb/water_club.dimensions rename to src/data/maps/tiles/dimensions/water_club.dimensions diff --git a/src/data/maps/tiles/cgb/water_club_entrance.dimensions b/src/data/maps/tiles/dimensions/water_club_entrance.dimensions similarity index 100% rename from src/data/maps/tiles/cgb/water_club_entrance.dimensions rename to src/data/maps/tiles/dimensions/water_club_entrance.dimensions diff --git a/src/data/maps/tiles/cgb/water_medal.dimensions b/src/data/maps/tiles/dimensions/water_medal.dimensions similarity index 100% rename from src/data/maps/tiles/cgb/water_medal.dimensions rename to src/data/maps/tiles/dimensions/water_medal.dimensions diff --git a/src/data/maps/tiles/gb/aerodactyl_intro.dimensions b/src/data/maps/tiles/gb/aerodactyl_intro.dimensions deleted file mode 100644 index 78682ddc..00000000 --- a/src/data/maps/tiles/gb/aerodactyl_intro.dimensions +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/data/maps/tiles/gb/card_pop.dimensions b/src/data/maps/tiles/gb/card_pop.dimensions deleted file mode 100644 index c31de8c7..00000000 --- a/src/data/maps/tiles/gb/card_pop.dimensions +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/data/maps/tiles/gb/challenge_hall.dimensions b/src/data/maps/tiles/gb/challenge_hall.dimensions deleted file mode 100644 index 136d0638..00000000 --- a/src/data/maps/tiles/gb/challenge_hall.dimensions +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/data/maps/tiles/gb/challenge_hall_entrance.dimensions b/src/data/maps/tiles/gb/challenge_hall_entrance.dimensions deleted file mode 100644 index c31de8c7..00000000 --- a/src/data/maps/tiles/gb/challenge_hall_entrance.dimensions +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/data/maps/tiles/gb/challenge_machine_map_event.dimensions b/src/data/maps/tiles/gb/challenge_machine_map_event.dimensions deleted file mode 100644 index d333ecd2..00000000 --- a/src/data/maps/tiles/gb/challenge_machine_map_event.dimensions +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/data/maps/tiles/gb/charizard_intro.dimensions b/src/data/maps/tiles/gb/charizard_intro.dimensions deleted file mode 100644 index 78682ddc..00000000 --- a/src/data/maps/tiles/gb/charizard_intro.dimensions +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/data/maps/tiles/gb/club_lobby.dimensions b/src/data/maps/tiles/gb/club_lobby.dimensions deleted file mode 100644 index 016f7567..00000000 --- a/src/data/maps/tiles/gb/club_lobby.dimensions +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/data/maps/tiles/gb/colosseum.dimensions b/src/data/maps/tiles/gb/colosseum.dimensions deleted file mode 100644 index 78682ddc..00000000 --- a/src/data/maps/tiles/gb/colosseum.dimensions +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/data/maps/tiles/gb/copyright.dimensions b/src/data/maps/tiles/gb/copyright.dimensions deleted file mode 100644 index c31de8c7..00000000 --- a/src/data/maps/tiles/gb/copyright.dimensions +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/data/maps/tiles/gb/deck_machine_map_event.dimensions b/src/data/maps/tiles/gb/deck_machine_map_event.dimensions deleted file mode 100644 index 5e7f5cc1..00000000 --- a/src/data/maps/tiles/gb/deck_machine_map_event.dimensions +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/data/maps/tiles/gb/deck_machine_room.dimensions b/src/data/maps/tiles/gb/deck_machine_room.dimensions deleted file mode 100644 index 271de7a4..00000000 --- a/src/data/maps/tiles/gb/deck_machine_room.dimensions +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/data/maps/tiles/gb/evolution.dimensions b/src/data/maps/tiles/gb/evolution.dimensions deleted file mode 100644 index 78682ddc..00000000 --- a/src/data/maps/tiles/gb/evolution.dimensions +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/data/maps/tiles/gb/fighting_club.dimensions b/src/data/maps/tiles/gb/fighting_club.dimensions deleted file mode 100644 index 2cd85792..00000000 --- a/src/data/maps/tiles/gb/fighting_club.dimensions +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/data/maps/tiles/gb/fighting_club_entrance.dimensions b/src/data/maps/tiles/gb/fighting_club_entrance.dimensions deleted file mode 100644 index c31de8c7..00000000 --- a/src/data/maps/tiles/gb/fighting_club_entrance.dimensions +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/data/maps/tiles/gb/fire_club.dimensions b/src/data/maps/tiles/gb/fire_club.dimensions deleted file mode 100644 index 3eb40bb1..00000000 --- a/src/data/maps/tiles/gb/fire_club.dimensions +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/data/maps/tiles/gb/fire_club_entrance.dimensions b/src/data/maps/tiles/gb/fire_club_entrance.dimensions deleted file mode 100644 index c31de8c7..00000000 --- a/src/data/maps/tiles/gb/fire_club_entrance.dimensions +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/data/maps/tiles/gb/gameboy_link.dimensions b/src/data/maps/tiles/gb/gameboy_link.dimensions deleted file mode 100644 index c31de8c7..00000000 --- a/src/data/maps/tiles/gb/gameboy_link.dimensions +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/data/maps/tiles/gb/gameboy_link_connecting.dimensions b/src/data/maps/tiles/gb/gameboy_link_connecting.dimensions deleted file mode 100644 index c31de8c7..00000000 --- a/src/data/maps/tiles/gb/gameboy_link_connecting.dimensions +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/data/maps/tiles/gb/gameboy_printer.dimensions b/src/data/maps/tiles/gb/gameboy_printer.dimensions deleted file mode 100644 index c31de8c7..00000000 --- a/src/data/maps/tiles/gb/gameboy_printer.dimensions +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/data/maps/tiles/gb/grass_club.dimensions b/src/data/maps/tiles/gb/grass_club.dimensions deleted file mode 100644 index 3eb40bb1..00000000 --- a/src/data/maps/tiles/gb/grass_club.dimensions +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/data/maps/tiles/gb/grass_club_entrance.dimensions b/src/data/maps/tiles/gb/grass_club_entrance.dimensions deleted file mode 100644 index c31de8c7..00000000 --- a/src/data/maps/tiles/gb/grass_club_entrance.dimensions +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/data/maps/tiles/gb/hall_of_honor.dimensions b/src/data/maps/tiles/gb/hall_of_honor.dimensions deleted file mode 100644 index 9c057b30..00000000 --- a/src/data/maps/tiles/gb/hall_of_honor.dimensions +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/data/maps/tiles/gb/hall_of_honor_door_map_event.dimensions b/src/data/maps/tiles/gb/hall_of_honor_door_map_event.dimensions deleted file mode 100644 index 6bebb85a..00000000 --- a/src/data/maps/tiles/gb/hall_of_honor_door_map_event.dimensions +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/data/maps/tiles/gb/ishihara.dimensions b/src/data/maps/tiles/gb/ishihara.dimensions deleted file mode 100644 index 5844d81d..00000000 --- a/src/data/maps/tiles/gb/ishihara.dimensions +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/data/maps/tiles/gb/japanese_title_screen.dimensions b/src/data/maps/tiles/gb/japanese_title_screen.dimensions deleted file mode 100644 index c31de8c7..00000000 --- a/src/data/maps/tiles/gb/japanese_title_screen.dimensions +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/data/maps/tiles/gb/japanese_title_screen_2.dimensions b/src/data/maps/tiles/gb/japanese_title_screen_2.dimensions deleted file mode 100644 index c31de8c7..00000000 --- a/src/data/maps/tiles/gb/japanese_title_screen_2.dimensions +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/data/maps/tiles/gb/laboratory.dimensions b/src/data/maps/tiles/gb/laboratory.dimensions deleted file mode 100644 index 78682ddc..00000000 --- a/src/data/maps/tiles/gb/laboratory.dimensions +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/data/maps/tiles/gb/lightning_club.dimensions b/src/data/maps/tiles/gb/lightning_club.dimensions deleted file mode 100644 index 3eb40bb1..00000000 --- a/src/data/maps/tiles/gb/lightning_club.dimensions +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/data/maps/tiles/gb/lightning_club_entrance.dimensions b/src/data/maps/tiles/gb/lightning_club_entrance.dimensions deleted file mode 100644 index c31de8c7..00000000 --- a/src/data/maps/tiles/gb/lightning_club_entrance.dimensions +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/data/maps/tiles/gb/mason_laboratory.dimensions b/src/data/maps/tiles/gb/mason_laboratory.dimensions deleted file mode 100644 index 959ba312..00000000 --- a/src/data/maps/tiles/gb/mason_laboratory.dimensions +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/data/maps/tiles/gb/mystery.dimensions b/src/data/maps/tiles/gb/mystery.dimensions deleted file mode 100644 index 78682ddc..00000000 --- a/src/data/maps/tiles/gb/mystery.dimensions +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/data/maps/tiles/gb/overworld_map.dimensions b/src/data/maps/tiles/gb/overworld_map.dimensions deleted file mode 100644 index c31de8c7..00000000 --- a/src/data/maps/tiles/gb/overworld_map.dimensions +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/data/maps/tiles/gb/pokemon_dome.dimensions b/src/data/maps/tiles/gb/pokemon_dome.dimensions deleted file mode 100644 index 136d0638..00000000 --- a/src/data/maps/tiles/gb/pokemon_dome.dimensions +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/data/maps/tiles/gb/pokemon_dome_door_map_event.dimensions b/src/data/maps/tiles/gb/pokemon_dome_door_map_event.dimensions deleted file mode 100644 index 6bebb85a..00000000 --- a/src/data/maps/tiles/gb/pokemon_dome_door_map_event.dimensions +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/data/maps/tiles/gb/pokemon_dome_entrance.dimensions b/src/data/maps/tiles/gb/pokemon_dome_entrance.dimensions deleted file mode 100644 index c1c711a1..00000000 --- a/src/data/maps/tiles/gb/pokemon_dome_entrance.dimensions +++ /dev/null @@ -1 +0,0 @@ -  \ No newline at end of file diff --git a/src/data/maps/tiles/gb/psychic_club.dimensions b/src/data/maps/tiles/gb/psychic_club.dimensions deleted file mode 100644 index 0bc92d84..00000000 --- a/src/data/maps/tiles/gb/psychic_club.dimensions +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/data/maps/tiles/gb/psychic_club_entrance.dimensions b/src/data/maps/tiles/gb/psychic_club_entrance.dimensions deleted file mode 100644 index c31de8c7..00000000 --- a/src/data/maps/tiles/gb/psychic_club_entrance.dimensions +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/data/maps/tiles/gb/rock_club.dimensions b/src/data/maps/tiles/gb/rock_club.dimensions deleted file mode 100644 index 959ba312..00000000 --- a/src/data/maps/tiles/gb/rock_club.dimensions +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/data/maps/tiles/gb/rock_club_entrance.dimensions b/src/data/maps/tiles/gb/rock_club_entrance.dimensions deleted file mode 100644 index c31de8c7..00000000 --- a/src/data/maps/tiles/gb/rock_club_entrance.dimensions +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/data/maps/tiles/gb/science_club.dimensions b/src/data/maps/tiles/gb/science_club.dimensions deleted file mode 100644 index 3eb40bb1..00000000 --- a/src/data/maps/tiles/gb/science_club.dimensions +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/data/maps/tiles/gb/science_club_entrance.dimensions b/src/data/maps/tiles/gb/science_club_entrance.dimensions deleted file mode 100644 index c31de8c7..00000000 --- a/src/data/maps/tiles/gb/science_club_entrance.dimensions +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/data/maps/tiles/gb/scyther_intro.dimensions b/src/data/maps/tiles/gb/scyther_intro.dimensions deleted file mode 100644 index 78682ddc..00000000 --- a/src/data/maps/tiles/gb/scyther_intro.dimensions +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/data/maps/tiles/gb/title_screen.dimensions b/src/data/maps/tiles/gb/title_screen.dimensions deleted file mode 100644 index c31de8c7..00000000 --- a/src/data/maps/tiles/gb/title_screen.dimensions +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/data/maps/tiles/gb/water_club.dimensions b/src/data/maps/tiles/gb/water_club.dimensions deleted file mode 100644 index 3eb40bb1..00000000 --- a/src/data/maps/tiles/gb/water_club.dimensions +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/data/maps/tiles/gb/water_club_entrance.dimensions b/src/data/maps/tiles/gb/water_club_entrance.dimensions deleted file mode 100644 index c31de8c7..00000000 --- a/src/data/maps/tiles/gb/water_club_entrance.dimensions +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/gfx.asm b/src/gfx.asm index 6094469b..475403c7 100644 --- a/src/gfx.asm +++ b/src/gfx.asm @@ -44,7 +44,7 @@ INCBIN "gfx/duel/box_messages.2bpp" SECTION "Gfx 3", ROMX WaterClubTilemap:: - INCBIN "data/maps/tiles/gb/water_club.dimensions" + INCBIN "data/maps/tiles/dimensions/water_club.dimensions" dw WaterClubPermissions db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/water_club.bin.lz" @@ -52,7 +52,7 @@ WaterClubPermissions: INCBIN "data/maps/permissions/water_club.bin.lz" WaterClubCGBTilemap:: - INCBIN "data/maps/tiles/cgb/water_club.dimensions" + INCBIN "data/maps/tiles/dimensions/water_club.dimensions" dw WaterClubCGBPermissions db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/water_club.bgmap.lz" @@ -60,7 +60,7 @@ WaterClubCGBPermissions: INCBIN "data/maps/permissions/water_club.bin.lz" LightningClubTilemap:: - INCBIN "data/maps/tiles/gb/lightning_club.dimensions" + INCBIN "data/maps/tiles/dimensions/lightning_club.dimensions" dw LightningClubPermissions db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/lightning_club.bin.lz" @@ -68,7 +68,7 @@ LightningClubPermissions: INCBIN "data/maps/permissions/lightning_club.bin.lz" LightningClubCGBTilemap:: - INCBIN "data/maps/tiles/cgb/lightning_club.dimensions" + INCBIN "data/maps/tiles/dimensions/lightning_club.dimensions" dw LightningClubCGBPermissions db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/lightning_club.bgmap.lz" @@ -76,7 +76,7 @@ LightningClubCGBPermissions: INCBIN "data/maps/permissions/lightning_club.bin.lz" GrassClubTilemap:: - INCBIN "data/maps/tiles/gb/grass_club.dimensions" + INCBIN "data/maps/tiles/dimensions/grass_club.dimensions" dw GrassClubPermissions db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/grass_club.bin.lz" @@ -84,7 +84,7 @@ GrassClubPermissions: INCBIN "data/maps/permissions/grass_club.bin.lz" GrassClubCGBTilemap:: - INCBIN "data/maps/tiles/cgb/grass_club.dimensions" + INCBIN "data/maps/tiles/dimensions/grass_club.dimensions" dw GrassClubCGBPermissions db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/grass_club.bgmap.lz" @@ -92,7 +92,7 @@ GrassClubCGBPermissions: INCBIN "data/maps/permissions/grass_club.bin.lz" PsychicClubTilemap:: - INCBIN "data/maps/tiles/gb/psychic_club.dimensions" + INCBIN "data/maps/tiles/dimensions/psychic_club.dimensions" dw PsychicClubPermissions db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/psychic_club.bin.lz" @@ -100,7 +100,7 @@ PsychicClubPermissions: INCBIN "data/maps/permissions/psychic_club.bin.lz" PsychicClubCGBTilemap:: - INCBIN "data/maps/tiles/cgb/psychic_club.dimensions" + INCBIN "data/maps/tiles/dimensions/psychic_club.dimensions" dw PsychicClubCGBPermissions db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/psychic_club.bgmap.lz" @@ -108,7 +108,7 @@ PsychicClubCGBPermissions: INCBIN "data/maps/permissions/psychic_club.bin.lz" ScienceClubTilemap:: - INCBIN "data/maps/tiles/gb/science_club.dimensions" + INCBIN "data/maps/tiles/dimensions/science_club.dimensions" dw ScienceClubPermissions db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/science_club.bin.lz" @@ -116,7 +116,7 @@ ScienceClubPermissions: INCBIN "data/maps/permissions/science_club.bin.lz" ScienceClubCGBTilemap:: - INCBIN "data/maps/tiles/cgb/science_club.dimensions" + INCBIN "data/maps/tiles/dimensions/science_club.dimensions" dw ScienceClubCGBPermissions db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/science_club.bgmap.lz" @@ -124,7 +124,7 @@ ScienceClubCGBPermissions: INCBIN "data/maps/permissions/science_club.bin.lz" FireClubTilemap:: - INCBIN "data/maps/tiles/gb/fire_club.dimensions" + INCBIN "data/maps/tiles/dimensions/fire_club.dimensions" dw FireClubPermissions db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/fire_club.bin.lz" @@ -132,7 +132,7 @@ FireClubPermissions: INCBIN "data/maps/permissions/fire_club.bin.lz" FireClubCGBTilemap:: - INCBIN "data/maps/tiles/cgb/fire_club.dimensions" + INCBIN "data/maps/tiles/dimensions/fire_club.dimensions" dw FireClubCGBPermissions db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/fire_club.bgmap.lz" @@ -140,7 +140,7 @@ FireClubCGBPermissions: INCBIN "data/maps/permissions/fire_club.bin.lz" ChallengeHallTilemap:: - INCBIN "data/maps/tiles/gb/challenge_hall.dimensions" + INCBIN "data/maps/tiles/dimensions/challenge_hall.dimensions" dw ChallengeHallPermissions db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/challenge_hall.bin.lz" @@ -148,7 +148,7 @@ ChallengeHallPermissions: INCBIN "data/maps/permissions/challenge_hall.bin.lz" ChallengeHallCGBTilemap:: - INCBIN "data/maps/tiles/cgb/challenge_hall.dimensions" + INCBIN "data/maps/tiles/dimensions/challenge_hall.dimensions" dw ChallengeHallCGBPermissions db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/challenge_hall.bgmap.lz" @@ -156,7 +156,7 @@ ChallengeHallCGBPermissions: INCBIN "data/maps/permissions/challenge_hall.bin.lz" PokemonDomeEntranceTilemap:: - INCBIN "data/maps/tiles/gb/pokemon_dome_entrance.dimensions" + INCBIN "data/maps/tiles/dimensions/pokemon_dome_entrance.dimensions" dw PokemonDomeEntrancePermissions db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/pokemon_dome_entrance.bin.lz" @@ -164,7 +164,7 @@ PokemonDomeEntrancePermissions: INCBIN "data/maps/permissions/pokemon_dome_entrance.bin.lz" PokemonDomeEntranceCGBTilemap:: - INCBIN "data/maps/tiles/cgb/pokemon_dome_entrance.dimensions" + INCBIN "data/maps/tiles/dimensions/pokemon_dome_entrance.dimensions" dw PokemonDomeEntranceCGBPermissions db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/pokemon_dome_entrance.bgmap.lz" @@ -172,7 +172,7 @@ PokemonDomeEntranceCGBPermissions: INCBIN "data/maps/permissions/pokemon_dome_entrance.bin.lz" PokemonDomeTilemap:: - INCBIN "data/maps/tiles/gb/pokemon_dome.dimensions" + INCBIN "data/maps/tiles/dimensions/pokemon_dome.dimensions" dw PokemonDomePermissions db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/pokemon_dome.bin.lz" @@ -180,7 +180,7 @@ PokemonDomePermissions: INCBIN "data/maps/permissions/pokemon_dome.bin.lz" PokemonDomeCGBTilemap:: - INCBIN "data/maps/tiles/cgb/pokemon_dome.dimensions" + INCBIN "data/maps/tiles/dimensions/pokemon_dome.dimensions" dw PokemonDomeCGBPermissions db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/pokemon_dome.bgmap.lz" @@ -188,7 +188,7 @@ PokemonDomeCGBPermissions: INCBIN "data/maps/permissions/pokemon_dome.bin.lz" HallOfHonorTilemap:: - INCBIN "data/maps/tiles/gb/hall_of_honor.dimensions" + INCBIN "data/maps/tiles/dimensions/hall_of_honor.dimensions" dw HallOfHonorPermissions db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/hall_of_honor.bin.lz" @@ -196,7 +196,7 @@ HallOfHonorPermissions: INCBIN "data/maps/permissions/hall_of_honor.bin.lz" HallOfHonorCGBTilemap:: - INCBIN "data/maps/tiles/cgb/hall_of_honor.dimensions" + INCBIN "data/maps/tiles/dimensions/hall_of_honor.dimensions" dw HallOfHonorCGBPermissions db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/hall_of_honor.bgmap.lz" @@ -204,271 +204,271 @@ HallOfHonorCGBPermissions: INCBIN "data/maps/permissions/hall_of_honor.bin.lz" CardPopCGBTilemap:: - INCBIN "data/maps/tiles/cgb/card_pop.dimensions" + INCBIN "data/maps/tiles/dimensions/card_pop.dimensions" dw NULL db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/card_pop.bgmap.lz" CardPopTilemap:: - INCBIN "data/maps/tiles/gb/card_pop.dimensions" + INCBIN "data/maps/tiles/dimensions/card_pop.dimensions" dw NULL db TRUE ; cgb mode INCBIN "data/maps/tiles/gb/card_pop.bgmap.lz" ScienceMedalTilemap:: - INCBIN "data/maps/tiles/cgb/science_medal.dimensions" + INCBIN "data/maps/tiles/dimensions/science_medal.dimensions" dw NULL db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/science_medal.bgmap.lz" FireMedalTilemap:: - INCBIN "data/maps/tiles/cgb/fire_medal.dimensions" + INCBIN "data/maps/tiles/dimensions/fire_medal.dimensions" dw NULL db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/fire_medal.bgmap.lz" WaterMedalTilemap:: - INCBIN "data/maps/tiles/cgb/water_medal.dimensions" + INCBIN "data/maps/tiles/dimensions/water_medal.dimensions" dw NULL db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/water_medal.bgmap.lz" LightningMedalTilemap:: - INCBIN "data/maps/tiles/cgb/lightning_medal.dimensions" + INCBIN "data/maps/tiles/dimensions/lightning_medal.dimensions" dw NULL db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/lightning_medal.bgmap.lz" FightingMedalTilemap:: - INCBIN "data/maps/tiles/cgb/fighting_medal.dimensions" + INCBIN "data/maps/tiles/dimensions/fighting_medal.dimensions" dw NULL db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/fighting_medal.bgmap.lz" RockMedalTilemap:: - INCBIN "data/maps/tiles/cgb/rock_medal.dimensions" + INCBIN "data/maps/tiles/dimensions/rock_medal.dimensions" dw NULL db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/rock_medal.bgmap.lz" PsychicMedalTilemap:: - INCBIN "data/maps/tiles/cgb/psychic_medal.dimensions" + INCBIN "data/maps/tiles/dimensions/psychic_medal.dimensions" dw NULL db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/psychic_medal.bgmap.lz" GameBoyLinkCGBTilemap:: - INCBIN "data/maps/tiles/cgb/gameboy_link.dimensions" + INCBIN "data/maps/tiles/dimensions/gameboy_link.dimensions" dw NULL db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/gameboy_link.bgmap.lz" GameBoyLinkTilemap:: - INCBIN "data/maps/tiles/gb/gameboy_link.dimensions" + INCBIN "data/maps/tiles/dimensions/gameboy_link.dimensions" dw NULL db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/gameboy_link.bin.lz" GameBoyLinkConnectingCGBTilemap:: - INCBIN "data/maps/tiles/cgb/gameboy_link_connecting.dimensions" + INCBIN "data/maps/tiles/dimensions/gameboy_link_connecting.dimensions" dw NULL db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/gameboy_link_connecting.bgmap.lz" GameBoyLinkConnectingTilemap:: - INCBIN "data/maps/tiles/gb/gameboy_link_connecting.dimensions" + INCBIN "data/maps/tiles/dimensions/gameboy_link_connecting.dimensions" dw NULL db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/gameboy_link_connecting.bin.lz" GameBoyPrinterCGBTilemap:: - INCBIN "data/maps/tiles/cgb/gameboy_printer.dimensions" + INCBIN "data/maps/tiles/dimensions/gameboy_printer.dimensions" dw NULL db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/gameboy_printer.bgmap.lz" GameBoyPrinterTilemap:: - INCBIN "data/maps/tiles/gb/gameboy_printer.dimensions" + INCBIN "data/maps/tiles/dimensions/gameboy_printer.dimensions" dw NULL db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/gameboy_printer.bin.lz" ColosseumTilemap:: - INCBIN "data/maps/tiles/gb/colosseum.dimensions" + INCBIN "data/maps/tiles/dimensions/colosseum.dimensions" dw NULL db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/colosseum.bin.lz" ColosseumCGBTilemap:: - INCBIN "data/maps/tiles/cgb/colosseum.dimensions" + INCBIN "data/maps/tiles/dimensions/colosseum.dimensions" dw NULL db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/colosseum.bgmap.lz" EvolutionTilemap:: - INCBIN "data/maps/tiles/gb/evolution.dimensions" + INCBIN "data/maps/tiles/dimensions/evolution.dimensions" dw NULL db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/evolution.bin.lz" EvolutionCGBTilemap:: - INCBIN "data/maps/tiles/cgb/evolution.dimensions" + INCBIN "data/maps/tiles/dimensions/evolution.dimensions" dw NULL db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/evolution.bgmap.lz" MysteryTilemap:: - INCBIN "data/maps/tiles/gb/mystery.dimensions" + INCBIN "data/maps/tiles/dimensions/mystery.dimensions" dw NULL db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/mystery.bin.lz" MysteryCGBTilemap:: - INCBIN "data/maps/tiles/cgb/mystery.dimensions" + INCBIN "data/maps/tiles/dimensions/mystery.dimensions" dw NULL db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/mystery.bgmap.lz" LaboratoryTilemap:: - INCBIN "data/maps/tiles/gb/laboratory.dimensions" + INCBIN "data/maps/tiles/dimensions/laboratory.dimensions" dw NULL db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/laboratory.bin.lz" LaboratoryCGBTilemap:: - INCBIN "data/maps/tiles/cgb/laboratory.dimensions" + INCBIN "data/maps/tiles/dimensions/laboratory.dimensions" dw NULL db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/laboratory.bgmap.lz" CharizardIntroTilemap:: - INCBIN "data/maps/tiles/gb/charizard_intro.dimensions" + INCBIN "data/maps/tiles/dimensions/charizard_intro.dimensions" dw NULL db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/charizard_intro.bin.lz" CharizardIntroCGBTilemap:: - INCBIN "data/maps/tiles/cgb/charizard_intro.dimensions" + INCBIN "data/maps/tiles/dimensions/charizard_intro.dimensions" dw NULL db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/charizard_intro.bgmap.lz" ScytherIntroTilemap:: - INCBIN "data/maps/tiles/gb/scyther_intro.dimensions" + INCBIN "data/maps/tiles/dimensions/scyther_intro.dimensions" dw NULL db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/scyther_intro.bin.lz" ScytherIntroCGBTilemap:: - INCBIN "data/maps/tiles/cgb/scyther_intro.dimensions" + INCBIN "data/maps/tiles/dimensions/scyther_intro.dimensions" dw NULL db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/scyther_intro.bgmap.lz" AerodactylIntroTilemap:: - INCBIN "data/maps/tiles/gb/aerodactyl_intro.dimensions" + INCBIN "data/maps/tiles/dimensions/aerodactyl_intro.dimensions" dw NULL db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/aerodactyl_intro.bin.lz" AerodactylIntroCGBTilemap:: - INCBIN "data/maps/tiles/cgb/aerodactyl_intro.dimensions" + INCBIN "data/maps/tiles/dimensions/aerodactyl_intro.dimensions" dw NULL db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/aerodactyl_intro.bgmap.lz" JapaneseTitleScreenTilemap:: - INCBIN "data/maps/tiles/gb/japanese_title_screen.dimensions" + INCBIN "data/maps/tiles/dimensions/japanese_title_screen.dimensions" dw NULL db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/japanese_title_screen.bin.lz" JapaneseTitleScreenCGBTilemap:: - INCBIN "data/maps/tiles/cgb/japanese_title_screen.dimensions" + INCBIN "data/maps/tiles/dimensions/japanese_title_screen.dimensions" dw NULL db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/japanese_title_screen.bgmap.lz" SolidTiles1Tilemap:: - INCBIN "data/maps/tiles/cgb/solid_tiles_1.dimensions" + INCBIN "data/maps/tiles/dimensions/solid_tiles_1.dimensions" dw NULL db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/solid_tiles_1.bgmap.lz" SolidTiles2Tilemap:: - INCBIN "data/maps/tiles/cgb/solid_tiles_2.dimensions" + INCBIN "data/maps/tiles/dimensions/solid_tiles_2.dimensions" dw NULL db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/solid_tiles_2.bgmap.lz" SolidTiles3Tilemap:: - INCBIN "data/maps/tiles/cgb/solid_tiles_3.dimensions" + INCBIN "data/maps/tiles/dimensions/solid_tiles_3.dimensions" dw NULL db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/solid_tiles_3.bgmap.lz" JapaneseTitleScreen2Tilemap:: - INCBIN "data/maps/tiles/gb/japanese_title_screen_2.dimensions" + INCBIN "data/maps/tiles/dimensions/japanese_title_screen_2.dimensions" dw NULL db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/japanese_title_screen_2.bin.lz" JapaneseTitleScreen2CGBTilemap:: - INCBIN "data/maps/tiles/cgb/japanese_title_screen_2.dimensions" + INCBIN "data/maps/tiles/dimensions/japanese_title_screen_2.dimensions" dw NULL db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/japanese_title_screen_2.bgmap.lz" SolidTiles4Tilemap:: - INCBIN "data/maps/tiles/cgb/solid_tiles_4.dimensions" + INCBIN "data/maps/tiles/dimensions/solid_tiles_4.dimensions" dw NULL db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/solid_tiles_4.bgmap.lz" PlayerTilemap:: - INCBIN "data/maps/tiles/gb/player.dimensions" + INCBIN "data/maps/tiles/dimensions/player.dimensions" dw NULL db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/player.bin.lz" OpponentTilemap:: - INCBIN "data/maps/tiles/gb/opponent.dimensions" + INCBIN "data/maps/tiles/dimensions/opponent.dimensions" dw NULL db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/opponent.bin.lz" TitleScreenTilemap:: - INCBIN "data/maps/tiles/gb/title_screen.dimensions" + INCBIN "data/maps/tiles/dimensions/title_screen.dimensions" dw NULL db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/title_screen.bin.lz" TitleScreenCGBTilemap:: - INCBIN "data/maps/tiles/cgb/title_screen.dimensions" + INCBIN "data/maps/tiles/dimensions/title_screen.dimensions" dw NULL db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/title_screen.bgmap.lz" CopyrightTilemap:: - INCBIN "data/maps/tiles/gb/copyright.dimensions" + INCBIN "data/maps/tiles/dimensions/copyright.dimensions" dw NULL db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/copyright.bin.lz" CopyrightCGBTilemap:: - INCBIN "data/maps/tiles/cgb/copyright.dimensions" + INCBIN "data/maps/tiles/dimensions/copyright.dimensions" dw NULL db TRUE ; cgb mode INCBIN "data/maps/tiles/cgb/copyright.bgmap.lz" NintendoTilemap:: - INCBIN "data/maps/tiles/gb/nintendo.dimensions" + INCBIN "data/maps/tiles/dimensions/nintendo.dimensions" dw NULL db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/nintendo.bin.lz" CompaniesTilemap:: - INCBIN "data/maps/tiles/gb/companies.dimensions" + INCBIN "data/maps/tiles/dimensions/companies.dimensions" dw NULL db FALSE ; cgb mode INCBIN "data/maps/tiles/gb/companies.bin.lz" diff --git a/tools/bgmap.c b/tools/bgmap.c index 0063f13c..2b7f7d6b 100644 --- a/tools/bgmap.c +++ b/tools/bgmap.c @@ -40,22 +40,16 @@ int *readFileToBuffer(const char *inFilename, unsigned *fileSize) return fileBuffer; } -struct Dimensions getDimensions(const char *name) +struct Dimensions getDimensions(const char *dimFilename) { - char *dimensionsFilename = (char*) malloc((strlen(name) + strlen(".dimensions") + 1) * sizeof(char)); - strcpy(dimensionsFilename, name); - strcat(dimensionsFilename, ".dimensions"); - struct Dimensions dimensions; - FILE *fd = fopen(dimensionsFilename, "rb"); + FILE *fd = fopen(dimFilename, "rb"); if (fd != NULL) { dimensions.width = fgetc(fd); dimensions.height = fgetc(fd); fclose(fd); } - - free(dimensionsFilename); return dimensions; } @@ -63,21 +57,17 @@ int main(int argc, char *argv[]) { const char *programName = argv[0]; - if (argc != 3) + if (argc != 4) { usage(programName); return 1; } const char *inFilename = argv[1]; - const char *outFilename = argv[2]; - - char *name = (char*) malloc((strlen(inFilename)) * sizeof(char)); - const size_t nameLen = strcspn(inFilename, "."); - strncpy(name, inFilename, nameLen); - name[nameLen] = '\0'; + const char *dimFilename = argv[2]; + const char *outFilename = argv[3]; - const struct Dimensions dimensions = getDimensions(name); + const struct Dimensions dimensions = getDimensions(dimFilename); unsigned fileSize; int *fileBuffer = readFileToBuffer(inFilename, &fileSize); @@ -110,7 +100,6 @@ int main(int argc, char *argv[]) free(fileBuffer); free(outBuffer); - free(name); return 0; } From 5334320afaced1a22ecbb696aa1747a55f90545c Mon Sep 17 00:00:00 2001 From: ElectroDeoxys Date: Fri, 10 Nov 2023 12:00:50 +0000 Subject: [PATCH 7/7] Add dimensions files to .gitattributes --- .gitattributes | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitattributes b/.gitattributes index 62a0ad6f..bcd91a7b 100644 --- a/.gitattributes +++ b/.gitattributes @@ -20,6 +20,7 @@ *.png binary diff=hex *.bin binary diff=hex *.lz.match binary diff=hex +*.dimensions binary diff=hex # these are generated but just in case *.2bpp binary diff=hex