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; }