Skip to content

Commit

Permalink
Join dimensions files for GB and GBC together
Browse files Browse the repository at this point in the history
  • Loading branch information
ElectroDeoxys committed Nov 10, 2023
1 parent a3f1470 commit 1ab6706
Show file tree
Hide file tree
Showing 110 changed files with 114 additions and 170 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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: %
Expand Down
82 changes: 41 additions & 41 deletions src/data/maps/tilemaps.asm
Original file line number Diff line number Diff line change
@@ -1,321 +1,321 @@
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"
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"
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"
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"
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"
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"
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"
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"
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"
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"
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"
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"
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"
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"
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"
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"
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"
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"
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"
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"
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"
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"
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"
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"
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"
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"
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"
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"
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"
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"
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"
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"
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"
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"
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"
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"
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"
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"
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"
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
1 change: 0 additions & 1 deletion src/data/maps/tiles/gb/aerodactyl_intro.dimensions

This file was deleted.

1 change: 0 additions & 1 deletion src/data/maps/tiles/gb/card_pop.dimensions

This file was deleted.

1 change: 0 additions & 1 deletion src/data/maps/tiles/gb/challenge_hall.dimensions

This file was deleted.

1 change: 0 additions & 1 deletion src/data/maps/tiles/gb/challenge_hall_entrance.dimensions

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion src/data/maps/tiles/gb/charizard_intro.dimensions

This file was deleted.

1 change: 0 additions & 1 deletion src/data/maps/tiles/gb/club_lobby.dimensions

This file was deleted.

1 change: 0 additions & 1 deletion src/data/maps/tiles/gb/colosseum.dimensions

This file was deleted.

Loading

0 comments on commit 1ab6706

Please sign in to comment.