diff --git a/.gitattributes b/.gitattributes index f1b476bc..bcd91a7b 100644 --- a/.gitattributes +++ b/.gitattributes @@ -20,8 +20,10 @@ *.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 *.1bpp binary diff=hex *.lz binary diff=hex +*.bgmap binary diff=hex 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..359aac6c 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 ../dimensions/%.dimensions + 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/permissions/challenge_hall_cgb.bin b/src/data/maps/permissions/challenge_hall_cgb.bin deleted file mode 100644 index f96f651a..00000000 Binary files a/src/data/maps/permissions/challenge_hall_cgb.bin and /dev/null differ diff --git a/src/data/maps/permissions/challenge_hall_cgb.bin.lz.match b/src/data/maps/permissions/challenge_hall_cgb.bin.lz.match deleted file mode 100644 index ab54f1c4..00000000 Binary files a/src/data/maps/permissions/challenge_hall_cgb.bin.lz.match and /dev/null differ diff --git a/src/data/maps/permissions/challenge_hall_entrance_cgb.bin b/src/data/maps/permissions/challenge_hall_entrance_cgb.bin deleted file mode 100644 index c4590ec0..00000000 Binary files a/src/data/maps/permissions/challenge_hall_entrance_cgb.bin and /dev/null differ diff --git a/src/data/maps/permissions/challenge_hall_entrance_cgb.bin.lz.match b/src/data/maps/permissions/challenge_hall_entrance_cgb.bin.lz.match deleted file mode 100644 index 76a9ae13..00000000 Binary files a/src/data/maps/permissions/challenge_hall_entrance_cgb.bin.lz.match and /dev/null differ diff --git a/src/data/maps/permissions/challenge_machine_map_event_cgb.bin b/src/data/maps/permissions/challenge_machine_map_event_cgb.bin deleted file mode 100644 index 6decae2f..00000000 Binary files a/src/data/maps/permissions/challenge_machine_map_event_cgb.bin and /dev/null differ diff --git a/src/data/maps/permissions/club_lobby_cgb.bin b/src/data/maps/permissions/club_lobby_cgb.bin deleted file mode 100644 index 058db94c..00000000 Binary files a/src/data/maps/permissions/club_lobby_cgb.bin and /dev/null differ diff --git a/src/data/maps/permissions/club_lobby_cgb.bin.lz.match b/src/data/maps/permissions/club_lobby_cgb.bin.lz.match deleted file mode 100644 index f79c177e..00000000 Binary files a/src/data/maps/permissions/club_lobby_cgb.bin.lz.match and /dev/null differ diff --git a/src/data/maps/permissions/deck_machine_map_event_cgb.bin b/src/data/maps/permissions/deck_machine_map_event_cgb.bin deleted file mode 100644 index f8834a2a..00000000 --- a/src/data/maps/permissions/deck_machine_map_event_cgb.bin +++ /dev/null @@ -1 +0,0 @@ -€€ \ No newline at end of file diff --git a/src/data/maps/permissions/deck_machine_room_cgb.bin b/src/data/maps/permissions/deck_machine_room_cgb.bin deleted file mode 100644 index 84f3e892..00000000 Binary files a/src/data/maps/permissions/deck_machine_room_cgb.bin and /dev/null differ diff --git a/src/data/maps/permissions/deck_machine_room_cgb.bin.lz.match b/src/data/maps/permissions/deck_machine_room_cgb.bin.lz.match deleted file mode 100644 index d1c4beba..00000000 Binary files a/src/data/maps/permissions/deck_machine_room_cgb.bin.lz.match and /dev/null differ diff --git a/src/data/maps/permissions/fighting_club_cgb.bin b/src/data/maps/permissions/fighting_club_cgb.bin deleted file mode 100644 index 3f9bf0d4..00000000 Binary files a/src/data/maps/permissions/fighting_club_cgb.bin and /dev/null differ diff --git a/src/data/maps/permissions/fighting_club_cgb.bin.lz.match b/src/data/maps/permissions/fighting_club_cgb.bin.lz.match deleted file mode 100644 index 2b3f72fc..00000000 Binary files a/src/data/maps/permissions/fighting_club_cgb.bin.lz.match and /dev/null differ diff --git a/src/data/maps/permissions/fighting_club_entrance_cgb.bin b/src/data/maps/permissions/fighting_club_entrance_cgb.bin deleted file mode 100644 index c4590ec0..00000000 Binary files a/src/data/maps/permissions/fighting_club_entrance_cgb.bin and /dev/null differ diff --git a/src/data/maps/permissions/fighting_club_entrance_cgb.bin.lz.match b/src/data/maps/permissions/fighting_club_entrance_cgb.bin.lz.match deleted file mode 100644 index 76a9ae13..00000000 Binary files a/src/data/maps/permissions/fighting_club_entrance_cgb.bin.lz.match and /dev/null differ diff --git a/src/data/maps/permissions/fire_club_cgb.bin b/src/data/maps/permissions/fire_club_cgb.bin deleted file mode 100644 index 903ed171..00000000 Binary files a/src/data/maps/permissions/fire_club_cgb.bin and /dev/null differ diff --git a/src/data/maps/permissions/fire_club_cgb.bin.lz.match b/src/data/maps/permissions/fire_club_cgb.bin.lz.match deleted file mode 100644 index e2b6e527..00000000 Binary files a/src/data/maps/permissions/fire_club_cgb.bin.lz.match and /dev/null differ diff --git a/src/data/maps/permissions/fire_club_entrance_cgb.bin b/src/data/maps/permissions/fire_club_entrance_cgb.bin deleted file mode 100644 index c4590ec0..00000000 Binary files a/src/data/maps/permissions/fire_club_entrance_cgb.bin and /dev/null differ diff --git a/src/data/maps/permissions/fire_club_entrance_cgb.bin.lz.match b/src/data/maps/permissions/fire_club_entrance_cgb.bin.lz.match deleted file mode 100644 index 76a9ae13..00000000 Binary files a/src/data/maps/permissions/fire_club_entrance_cgb.bin.lz.match and /dev/null differ diff --git a/src/data/maps/permissions/grass_club_cgb.bin b/src/data/maps/permissions/grass_club_cgb.bin deleted file mode 100644 index 46f87f05..00000000 Binary files a/src/data/maps/permissions/grass_club_cgb.bin and /dev/null differ diff --git a/src/data/maps/permissions/grass_club_cgb.bin.lz.match b/src/data/maps/permissions/grass_club_cgb.bin.lz.match deleted file mode 100644 index dbe8ade4..00000000 Binary files a/src/data/maps/permissions/grass_club_cgb.bin.lz.match and /dev/null differ diff --git a/src/data/maps/permissions/grass_club_entrance_cgb.bin b/src/data/maps/permissions/grass_club_entrance_cgb.bin deleted file mode 100644 index c4590ec0..00000000 Binary files a/src/data/maps/permissions/grass_club_entrance_cgb.bin and /dev/null differ diff --git a/src/data/maps/permissions/grass_club_entrance_cgb.bin.lz.match b/src/data/maps/permissions/grass_club_entrance_cgb.bin.lz.match deleted file mode 100644 index 76a9ae13..00000000 Binary files a/src/data/maps/permissions/grass_club_entrance_cgb.bin.lz.match and /dev/null differ diff --git a/src/data/maps/permissions/hall_of_honor_cgb.bin b/src/data/maps/permissions/hall_of_honor_cgb.bin deleted file mode 100644 index ffb2e92b..00000000 Binary files a/src/data/maps/permissions/hall_of_honor_cgb.bin and /dev/null differ diff --git a/src/data/maps/permissions/hall_of_honor_cgb.bin.lz.match b/src/data/maps/permissions/hall_of_honor_cgb.bin.lz.match deleted file mode 100644 index a59ca31a..00000000 Binary files a/src/data/maps/permissions/hall_of_honor_cgb.bin.lz.match and /dev/null differ diff --git a/src/data/maps/permissions/hall_of_honor_door_map_event_cgb.bin b/src/data/maps/permissions/hall_of_honor_door_map_event_cgb.bin deleted file mode 100644 index 593f4708..00000000 Binary files a/src/data/maps/permissions/hall_of_honor_door_map_event_cgb.bin and /dev/null differ diff --git a/src/data/maps/permissions/ishihara_cgb.bin b/src/data/maps/permissions/ishihara_cgb.bin deleted file mode 100644 index 641a3712..00000000 Binary files a/src/data/maps/permissions/ishihara_cgb.bin and /dev/null differ diff --git a/src/data/maps/permissions/ishihara_cgb.bin.lz.match b/src/data/maps/permissions/ishihara_cgb.bin.lz.match deleted file mode 100644 index c1b17c26..00000000 Binary files a/src/data/maps/permissions/ishihara_cgb.bin.lz.match and /dev/null differ diff --git a/src/data/maps/permissions/lightning_club_cgb.bin b/src/data/maps/permissions/lightning_club_cgb.bin deleted file mode 100644 index f2a87dfa..00000000 Binary files a/src/data/maps/permissions/lightning_club_cgb.bin and /dev/null differ diff --git a/src/data/maps/permissions/lightning_club_cgb.bin.lz.match b/src/data/maps/permissions/lightning_club_cgb.bin.lz.match deleted file mode 100644 index 20d4b9f8..00000000 Binary files a/src/data/maps/permissions/lightning_club_cgb.bin.lz.match and /dev/null differ diff --git a/src/data/maps/permissions/lightning_club_entrance_cgb.bin b/src/data/maps/permissions/lightning_club_entrance_cgb.bin deleted file mode 100644 index c4590ec0..00000000 Binary files a/src/data/maps/permissions/lightning_club_entrance_cgb.bin and /dev/null differ diff --git a/src/data/maps/permissions/lightning_club_entrance_cgb.bin.lz.match b/src/data/maps/permissions/lightning_club_entrance_cgb.bin.lz.match deleted file mode 100644 index 76a9ae13..00000000 Binary files a/src/data/maps/permissions/lightning_club_entrance_cgb.bin.lz.match and /dev/null differ diff --git a/src/data/maps/permissions/mason_laboratory_cgb.bin b/src/data/maps/permissions/mason_laboratory_cgb.bin deleted file mode 100644 index 39f0936a..00000000 Binary files a/src/data/maps/permissions/mason_laboratory_cgb.bin and /dev/null differ diff --git a/src/data/maps/permissions/mason_laboratory_cgb.bin.lz.match b/src/data/maps/permissions/mason_laboratory_cgb.bin.lz.match deleted file mode 100644 index e19760c0..00000000 Binary files a/src/data/maps/permissions/mason_laboratory_cgb.bin.lz.match and /dev/null differ diff --git a/src/data/maps/permissions/pokemon_dome_cgb.bin b/src/data/maps/permissions/pokemon_dome_cgb.bin deleted file mode 100644 index e34666f5..00000000 Binary files a/src/data/maps/permissions/pokemon_dome_cgb.bin and /dev/null differ diff --git a/src/data/maps/permissions/pokemon_dome_cgb.bin.lz.match b/src/data/maps/permissions/pokemon_dome_cgb.bin.lz.match deleted file mode 100644 index 4640de50..00000000 Binary files a/src/data/maps/permissions/pokemon_dome_cgb.bin.lz.match and /dev/null differ diff --git a/src/data/maps/permissions/pokemon_dome_door_map_event_cgb.bin b/src/data/maps/permissions/pokemon_dome_door_map_event_cgb.bin deleted file mode 100644 index 593f4708..00000000 Binary files a/src/data/maps/permissions/pokemon_dome_door_map_event_cgb.bin and /dev/null differ diff --git a/src/data/maps/permissions/pokemon_dome_entrance_cgb.bin b/src/data/maps/permissions/pokemon_dome_entrance_cgb.bin deleted file mode 100644 index fbbbf412..00000000 Binary files a/src/data/maps/permissions/pokemon_dome_entrance_cgb.bin and /dev/null differ diff --git a/src/data/maps/permissions/pokemon_dome_entrance_cgb.bin.lz.match b/src/data/maps/permissions/pokemon_dome_entrance_cgb.bin.lz.match deleted file mode 100644 index f5fab0cf..00000000 Binary files a/src/data/maps/permissions/pokemon_dome_entrance_cgb.bin.lz.match and /dev/null differ diff --git a/src/data/maps/permissions/psychic_club_cgb.bin b/src/data/maps/permissions/psychic_club_cgb.bin deleted file mode 100644 index 3cf3248c..00000000 Binary files a/src/data/maps/permissions/psychic_club_cgb.bin and /dev/null differ diff --git a/src/data/maps/permissions/psychic_club_cgb.bin.lz.match b/src/data/maps/permissions/psychic_club_cgb.bin.lz.match deleted file mode 100644 index 60ec1cba..00000000 Binary files a/src/data/maps/permissions/psychic_club_cgb.bin.lz.match and /dev/null differ diff --git a/src/data/maps/permissions/psychic_club_entrance_cgb.bin b/src/data/maps/permissions/psychic_club_entrance_cgb.bin deleted file mode 100644 index c4590ec0..00000000 Binary files a/src/data/maps/permissions/psychic_club_entrance_cgb.bin and /dev/null differ diff --git a/src/data/maps/permissions/psychic_club_entrance_cgb.bin.lz.match b/src/data/maps/permissions/psychic_club_entrance_cgb.bin.lz.match deleted file mode 100644 index 76a9ae13..00000000 Binary files a/src/data/maps/permissions/psychic_club_entrance_cgb.bin.lz.match and /dev/null differ diff --git a/src/data/maps/permissions/rock_club_cgb.bin b/src/data/maps/permissions/rock_club_cgb.bin deleted file mode 100644 index 890a11cc..00000000 Binary files a/src/data/maps/permissions/rock_club_cgb.bin and /dev/null differ diff --git a/src/data/maps/permissions/rock_club_cgb.bin.lz.match b/src/data/maps/permissions/rock_club_cgb.bin.lz.match deleted file mode 100644 index 67977046..00000000 Binary files a/src/data/maps/permissions/rock_club_cgb.bin.lz.match and /dev/null differ diff --git a/src/data/maps/permissions/rock_club_entrance_cgb.bin b/src/data/maps/permissions/rock_club_entrance_cgb.bin deleted file mode 100644 index c4590ec0..00000000 Binary files a/src/data/maps/permissions/rock_club_entrance_cgb.bin and /dev/null differ diff --git a/src/data/maps/permissions/rock_club_entrance_cgb.bin.lz.match b/src/data/maps/permissions/rock_club_entrance_cgb.bin.lz.match deleted file mode 100644 index 76a9ae13..00000000 Binary files a/src/data/maps/permissions/rock_club_entrance_cgb.bin.lz.match and /dev/null differ diff --git a/src/data/maps/permissions/science_club_cgb.bin b/src/data/maps/permissions/science_club_cgb.bin deleted file mode 100644 index 4a3f1e52..00000000 Binary files a/src/data/maps/permissions/science_club_cgb.bin and /dev/null differ diff --git a/src/data/maps/permissions/science_club_cgb.bin.lz.match b/src/data/maps/permissions/science_club_cgb.bin.lz.match deleted file mode 100644 index 66ccc024..00000000 Binary files a/src/data/maps/permissions/science_club_cgb.bin.lz.match and /dev/null differ diff --git a/src/data/maps/permissions/science_club_entrance_cgb.bin b/src/data/maps/permissions/science_club_entrance_cgb.bin deleted file mode 100644 index c4590ec0..00000000 Binary files a/src/data/maps/permissions/science_club_entrance_cgb.bin and /dev/null differ diff --git a/src/data/maps/permissions/science_club_entrance_cgb.bin.lz.match b/src/data/maps/permissions/science_club_entrance_cgb.bin.lz.match deleted file mode 100644 index 76a9ae13..00000000 Binary files a/src/data/maps/permissions/science_club_entrance_cgb.bin.lz.match and /dev/null differ diff --git a/src/data/maps/permissions/water_club_cgb.bin b/src/data/maps/permissions/water_club_cgb.bin deleted file mode 100644 index 62bc0d59..00000000 Binary files a/src/data/maps/permissions/water_club_cgb.bin and /dev/null differ diff --git a/src/data/maps/permissions/water_club_cgb.bin.lz.match b/src/data/maps/permissions/water_club_cgb.bin.lz.match deleted file mode 100644 index ca1332de..00000000 Binary files a/src/data/maps/permissions/water_club_cgb.bin.lz.match and /dev/null differ diff --git a/src/data/maps/permissions/water_club_entrance_cgb.bin b/src/data/maps/permissions/water_club_entrance_cgb.bin deleted file mode 100644 index c4590ec0..00000000 Binary files a/src/data/maps/permissions/water_club_entrance_cgb.bin and /dev/null differ diff --git a/src/data/maps/permissions/water_club_entrance_cgb.bin.lz.match b/src/data/maps/permissions/water_club_entrance_cgb.bin.lz.match deleted file mode 100644 index 76a9ae13..00000000 Binary files a/src/data/maps/permissions/water_club_entrance_cgb.bin.lz.match and /dev/null differ diff --git a/src/data/maps/tilemaps.asm b/src/data/maps/tilemaps.asm index 31fbf6ed..c3184563 100644 --- a/src/data/maps/tilemaps.asm +++ b/src/data/maps/tilemaps.asm @@ -1,365 +1,324 @@ OverworldMapTilemap:: - db $14 ; width - db $12 ; height + INCBIN "data/maps/tiles/dimensions/overworld_map.dimensions" 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 + INCBIN "data/maps/tiles/dimensions/overworld_map.dimensions" dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/overworld_map_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/overworld_map.bgmap.lz" MasonLaboratoryTilemap:: - db $1c ; width - db $1e ; height + INCBIN "data/maps/tiles/dimensions/mason_laboratory.dimensions" 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" MasonLaboratoryCGBTilemap:: - db $1c ; width - db $1e ; height + INCBIN "data/maps/tiles/dimensions/mason_laboratory.dimensions" dw MasonLaboratoryCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/mason_laboratory_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/mason_laboratory.bgmap.lz" MasonLaboratoryCGBPermissions: - INCBIN "data/maps/permissions/mason_laboratory_cgb.bin.lz" + INCBIN "data/maps/permissions/mason_laboratory.bin.lz" ChallengeMachineMapEventTilemap:: - db $04 ; width - db $06 ; height + INCBIN "data/maps/tiles/dimensions/challenge_machine_map_event.dimensions" 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" ChallengeMachineMapEventCGBTilemap:: - db $04 ; width - db $06 ; height + INCBIN "data/maps/tiles/dimensions/challenge_machine_map_event.dimensions" 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.bgmap.lz" ChallengeMachineMapEventCGBPermissions: - INCBIN "data/maps/permissions/challenge_machine_map_event_cgb.bin.lz" + INCBIN "data/maps/permissions/challenge_machine_map_event.bin.lz" DeckMachineRoomTilemap:: - db $18 ; width - db $1e ; height + INCBIN "data/maps/tiles/dimensions/deck_machine_room.dimensions" 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" DeckMachineRoomCGBTilemap:: - db $18 ; width - db $1e ; height + INCBIN "data/maps/tiles/dimensions/deck_machine_room.dimensions" dw DeckMachineRoomCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/deck_machine_room_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/deck_machine_room.bgmap.lz" DeckMachineRoomCGBPermissions: - INCBIN "data/maps/permissions/deck_machine_room_cgb.bin.lz" + INCBIN "data/maps/permissions/deck_machine_room.bin.lz" DeckMachineMapEventTilemap:: - db $04 ; width - db $01 ; height + INCBIN "data/maps/tiles/dimensions/deck_machine_map_event.dimensions" 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" DeckMachineMapEventCGBTilemap:: - db $04 ; width - db $01 ; height + INCBIN "data/maps/tiles/dimensions/deck_machine_map_event.dimensions" 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.bgmap.lz" DeckMachineMapEventCGBPermissions: - INCBIN "data/maps/permissions/deck_machine_map_event_cgb.bin.lz" + INCBIN "data/maps/permissions/deck_machine_map_event.bin.lz" IshiharaTilemap:: - db $14 ; width - db $18 ; height + INCBIN "data/maps/tiles/dimensions/ishihara.dimensions" 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" IshiharaCGBTilemap:: - db $14 ; width - db $18 ; height + INCBIN "data/maps/tiles/dimensions/ishihara.dimensions" dw IshiharaCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/ishihara_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/ishihara.bgmap.lz" IshiharaCGBPermissions: - INCBIN "data/maps/permissions/ishihara_cgb.bin.lz" + INCBIN "data/maps/permissions/ishihara.bin.lz" FightingClubEntranceTilemap:: - db $14 ; width - db $12 ; height + INCBIN "data/maps/tiles/dimensions/fighting_club_entrance.dimensions" 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" FightingClubEntranceCGBTilemap:: - db $14 ; width - db $12 ; height + INCBIN "data/maps/tiles/dimensions/fighting_club_entrance.dimensions" dw FightingClubEntranceCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/fighting_club_entrance_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/fighting_club_entrance.bgmap.lz" FightingClubEntranceCGBPermissions: - INCBIN "data/maps/permissions/fighting_club_entrance_cgb.bin.lz" + INCBIN "data/maps/permissions/fighting_club_entrance.bin.lz" RockClubEntranceTilemap:: - db $14 ; width - db $12 ; height + INCBIN "data/maps/tiles/dimensions/rock_club_entrance.dimensions" 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" RockClubEntranceCGBTilemap:: - db $14 ; width - db $12 ; height + INCBIN "data/maps/tiles/dimensions/rock_club_entrance.dimensions" dw RockClubEntranceCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/rock_club_entrance_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/rock_club_entrance.bgmap.lz" RockClubEntranceCGBPermissions: - INCBIN "data/maps/permissions/rock_club_entrance_cgb.bin.lz" + INCBIN "data/maps/permissions/rock_club_entrance.bin.lz" WaterClubEntranceTilemap:: - db $14 ; width - db $12 ; height + INCBIN "data/maps/tiles/dimensions/water_club_entrance.dimensions" 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" WaterClubEntranceCGBTilemap:: - db $14 ; width - db $12 ; height + INCBIN "data/maps/tiles/dimensions/water_club_entrance.dimensions" dw WaterClubEntranceCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/water_club_entrance_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/water_club_entrance.bgmap.lz" WaterClubEntranceCGBPermissions: - INCBIN "data/maps/permissions/water_club_entrance_cgb.bin.lz" + INCBIN "data/maps/permissions/water_club_entrance.bin.lz" LightningClubEntranceTilemap:: - db $14 ; width - db $12 ; height + INCBIN "data/maps/tiles/dimensions/lightning_club_entrance.dimensions" 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" LightningClubEntranceCGBTilemap:: - db $14 ; width - db $12 ; height + INCBIN "data/maps/tiles/dimensions/lightning_club_entrance.dimensions" dw LightningClubEntranceCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/lightning_club_entrance_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/lightning_club_entrance.bgmap.lz" LightningClubEntranceCGBPermissions: - INCBIN "data/maps/permissions/lightning_club_entrance_cgb.bin.lz" + INCBIN "data/maps/permissions/lightning_club_entrance.bin.lz" GrassClubEntranceTilemap:: - db $14 ; width - db $12 ; height + INCBIN "data/maps/tiles/dimensions/grass_club_entrance.dimensions" 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" GrassClubEntranceCGBTilemap:: - db $14 ; width - db $12 ; height + INCBIN "data/maps/tiles/dimensions/grass_club_entrance.dimensions" dw GrassClubEntranceCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/grass_club_entrance_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/grass_club_entrance.bgmap.lz" GrassClubEntranceCGBPermissions: - INCBIN "data/maps/permissions/grass_club_entrance_cgb.bin.lz" + INCBIN "data/maps/permissions/grass_club_entrance.bin.lz" PsychicClubEntranceTilemap:: - db $14 ; width - db $12 ; height + INCBIN "data/maps/tiles/dimensions/psychic_club_entrance.dimensions" 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" PsychicClubEntranceCGBTilemap:: - db $14 ; width - db $12 ; height + INCBIN "data/maps/tiles/dimensions/psychic_club_entrance.dimensions" dw PsychicClubEntranceCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/psychic_club_entrance_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/psychic_club_entrance.bgmap.lz" PsychicClubEntranceCGBPermissions: - INCBIN "data/maps/permissions/psychic_club_entrance_cgb.bin.lz" + INCBIN "data/maps/permissions/psychic_club_entrance.bin.lz" ScienceClubEntranceTilemap:: - db $14 ; width - db $12 ; height + INCBIN "data/maps/tiles/dimensions/science_club_entrance.dimensions" 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" ScienceClubEntranceCGBTilemap:: - db $14 ; width - db $12 ; height + INCBIN "data/maps/tiles/dimensions/science_club_entrance.dimensions" dw ScienceClubEntranceCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/science_club_entrance_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/science_club_entrance.bgmap.lz" ScienceClubEntranceCGBPermissions: - INCBIN "data/maps/permissions/science_club_entrance_cgb.bin.lz" + INCBIN "data/maps/permissions/science_club_entrance.bin.lz" FireClubEntranceTilemap:: - db $14 ; width - db $12 ; height + INCBIN "data/maps/tiles/dimensions/fire_club_entrance.dimensions" 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" FireClubEntranceCGBTilemap:: - db $14 ; width - db $12 ; height + INCBIN "data/maps/tiles/dimensions/fire_club_entrance.dimensions" dw FireClubEntranceCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/fire_club_entrance_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/fire_club_entrance.bgmap.lz" FireClubEntranceCGBPermissions: - INCBIN "data/maps/permissions/fire_club_entrance_cgb.bin.lz" + INCBIN "data/maps/permissions/fire_club_entrance.bin.lz" ChallengeHallEntranceTilemap:: - db $14 ; width - db $12 ; height + INCBIN "data/maps/tiles/dimensions/challenge_hall_entrance.dimensions" 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" ChallengeHallEntranceCGBTilemap:: - db $14 ; width - db $12 ; height + INCBIN "data/maps/tiles/dimensions/challenge_hall_entrance.dimensions" dw ChallengeHallEntranceCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/challenge_hall_entrance_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/challenge_hall_entrance.bgmap.lz" ChallengeHallEntranceCGBPermissions: - INCBIN "data/maps/permissions/challenge_hall_entrance_cgb.bin.lz" + INCBIN "data/maps/permissions/challenge_hall_entrance.bin.lz" ClubLobbyTilemap:: - db $1c ; width - db $1a ; height + INCBIN "data/maps/tiles/dimensions/club_lobby.dimensions" 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" ClubLobbyCGBTilemap:: - db $1c ; width - db $1a ; height + INCBIN "data/maps/tiles/dimensions/club_lobby.dimensions" dw ClubLobbyCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/club_lobby_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/club_lobby.bgmap.lz" ClubLobbyCGBPermissions: - INCBIN "data/maps/permissions/club_lobby_cgb.bin.lz" + INCBIN "data/maps/permissions/club_lobby.bin.lz" FightingClubTilemap:: - db $18 ; width - db $12 ; height + INCBIN "data/maps/tiles/dimensions/fighting_club.dimensions" 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" FightingClubCGBTilemap:: - db $18 ; width - db $12 ; height + INCBIN "data/maps/tiles/dimensions/fighting_club.dimensions" dw FightingClubCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/fighting_club_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/fighting_club.bgmap.lz" FightingClubCGBPermissions: - INCBIN "data/maps/permissions/fighting_club_cgb.bin.lz" + INCBIN "data/maps/permissions/fighting_club.bin.lz" RockClubTilemap:: - db $1c ; width - db $1e ; height + INCBIN "data/maps/tiles/dimensions/rock_club.dimensions" 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" RockClubCGBTilemap:: - db $1c ; width - db $1e ; height + INCBIN "data/maps/tiles/dimensions/rock_club.dimensions" dw RockClubCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/rock_club_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/rock_club.bgmap.lz" RockClubCGBPermissions: - INCBIN "data/maps/permissions/rock_club_cgb.bin.lz" + INCBIN "data/maps/permissions/rock_club.bin.lz" PokemonDomeDoorMapEventTilemap:: - db $04 ; width - db $03 ; height + INCBIN "data/maps/tiles/dimensions/pokemon_dome_door_map_event.dimensions" 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" PokemonDomeDoorMapEventCGBTilemap:: - db $04 ; width - db $03 ; height + INCBIN "data/maps/tiles/dimensions/pokemon_dome_door_map_event.dimensions" 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.bgmap.lz" PokemonDomeDoorMapEventCGBPermissions: - INCBIN "data/maps/permissions/pokemon_dome_door_map_event_cgb.bin.lz" + INCBIN "data/maps/permissions/pokemon_dome_door_map_event.bin.lz" HallOfHonorDoorMapEventTilemap:: - db $04 ; width - db $03 ; height + INCBIN "data/maps/tiles/dimensions/hall_of_honor_door_map_event.dimensions" 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" HallOfHonorDoorMapEventCGBTilemap:: - db $04 ; width - db $03 ; height + INCBIN "data/maps/tiles/dimensions/hall_of_honor_door_map_event.dimensions" 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.bgmap.lz" HallOfHonorDoorMapEventCGBPermissions: - INCBIN "data/maps/permissions/hall_of_honor_door_map_event_cgb.bin.lz" + INCBIN "data/maps/permissions/hall_of_honor_door_map_event.bin.lz" GrassMedalTilemap:: - db $03 ; width - db $03 ; height + INCBIN "data/maps/tiles/dimensions/grass_medal.dimensions" dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/grass_medal.bin.lz" + INCBIN "data/maps/tiles/cgb/grass_medal.bgmap.lz" AnimData1:: frame_table AnimFrameTable0 diff --git a/src/data/maps/tiles/aerodactyl_intro_cgb.bin b/src/data/maps/tiles/aerodactyl_intro_cgb.bin deleted file mode 100644 index 1d2a1c76..00000000 Binary files a/src/data/maps/tiles/aerodactyl_intro_cgb.bin and /dev/null differ diff --git a/src/data/maps/tiles/card_pop.bin b/src/data/maps/tiles/card_pop.bin deleted file mode 100644 index 932cac41..00000000 Binary files a/src/data/maps/tiles/card_pop.bin and /dev/null differ diff --git a/src/data/maps/tiles/card_pop_cgb.bin b/src/data/maps/tiles/card_pop_cgb.bin deleted file mode 100644 index c1d21829..00000000 Binary files a/src/data/maps/tiles/card_pop_cgb.bin and /dev/null differ diff --git a/src/data/maps/tiles/aerodactyl_intro_cgb.bin.lz.match b/src/data/maps/tiles/cgb/aerodactyl_intro.bgmap.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.bgmap.lz.match diff --git a/src/data/maps/tiles/cgb/aerodactyl_intro.bin b/src/data/maps/tiles/cgb/aerodactyl_intro.bin new file mode 100644 index 00000000..074fe70b Binary files /dev/null and b/src/data/maps/tiles/cgb/aerodactyl_intro.bin differ diff --git a/src/data/maps/tiles/card_pop_cgb.bin.lz.match b/src/data/maps/tiles/cgb/card_pop.bgmap.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.bgmap.lz.match diff --git a/src/data/maps/tiles/cgb/card_pop.bin b/src/data/maps/tiles/cgb/card_pop.bin new file mode 100644 index 00000000..730e03e0 Binary files /dev/null and b/src/data/maps/tiles/cgb/card_pop.bin differ diff --git a/src/data/maps/tiles/challenge_hall_cgb.bin.lz.match b/src/data/maps/tiles/cgb/challenge_hall.bgmap.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.bgmap.lz.match 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 00000000..5e5431ef Binary files /dev/null and b/src/data/maps/tiles/cgb/challenge_hall.bin differ diff --git a/src/data/maps/tiles/challenge_hall_entrance_cgb.bin.lz.match b/src/data/maps/tiles/cgb/challenge_hall_entrance.bgmap.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.bgmap.lz.match 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 00000000..00425ecf Binary files /dev/null and b/src/data/maps/tiles/cgb/challenge_hall_entrance.bin differ 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.bgmap.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.bgmap.lz.match 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/charizard_intro_cgb.bin.lz.match b/src/data/maps/tiles/cgb/charizard_intro.bgmap.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.bgmap.lz.match diff --git a/src/data/maps/tiles/cgb/charizard_intro.bin b/src/data/maps/tiles/cgb/charizard_intro.bin new file mode 100644 index 00000000..b87664fb Binary files /dev/null and b/src/data/maps/tiles/cgb/charizard_intro.bin differ diff --git a/src/data/maps/tiles/club_lobby_cgb.bin.lz.match b/src/data/maps/tiles/cgb/club_lobby.bgmap.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.bgmap.lz.match 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/colosseum_cgb.bin.lz.match b/src/data/maps/tiles/cgb/colosseum.bgmap.lz.match similarity index 100% rename from src/data/maps/tiles/colosseum_cgb.bin.lz.match rename to src/data/maps/tiles/cgb/colosseum.bgmap.lz.match diff --git a/src/data/maps/tiles/cgb/colosseum.bin b/src/data/maps/tiles/cgb/colosseum.bin new file mode 100644 index 00000000..ac4abe5e Binary files /dev/null and b/src/data/maps/tiles/cgb/colosseum.bin differ diff --git a/src/data/maps/tiles/copyright_cgb.bin.lz.match b/src/data/maps/tiles/cgb/copyright.bgmap.lz.match similarity index 100% rename from src/data/maps/tiles/copyright_cgb.bin.lz.match rename to src/data/maps/tiles/cgb/copyright.bgmap.lz.match diff --git a/src/data/maps/tiles/copyright_cgb.bin b/src/data/maps/tiles/cgb/copyright.bin similarity index 53% rename from src/data/maps/tiles/copyright_cgb.bin rename to src/data/maps/tiles/cgb/copyright.bin index 76bb056a..00584328 100644 Binary files a/src/data/maps/tiles/copyright_cgb.bin and b/src/data/maps/tiles/cgb/copyright.bin differ 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/deck_machine_room_cgb.bin.lz.match b/src/data/maps/tiles/cgb/deck_machine_room.bgmap.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.bgmap.lz.match 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/evolution_cgb.bin.lz.match b/src/data/maps/tiles/cgb/evolution.bgmap.lz.match similarity index 100% rename from src/data/maps/tiles/evolution_cgb.bin.lz.match rename to src/data/maps/tiles/cgb/evolution.bgmap.lz.match diff --git a/src/data/maps/tiles/cgb/evolution.bin b/src/data/maps/tiles/cgb/evolution.bin new file mode 100644 index 00000000..042f3532 Binary files /dev/null and b/src/data/maps/tiles/cgb/evolution.bin differ diff --git a/src/data/maps/tiles/fighting_club_cgb.bin.lz.match b/src/data/maps/tiles/cgb/fighting_club.bgmap.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.bgmap.lz.match 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 00000000..11835019 Binary files /dev/null and b/src/data/maps/tiles/cgb/fighting_club.bin differ diff --git a/src/data/maps/tiles/fighting_club_entrance_cgb.bin.lz.match b/src/data/maps/tiles/cgb/fighting_club_entrance.bgmap.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.bgmap.lz.match diff --git a/src/data/maps/tiles/cgb/fighting_club_entrance.bin b/src/data/maps/tiles/cgb/fighting_club_entrance.bin new file mode 100644 index 00000000..463fe463 Binary files /dev/null and b/src/data/maps/tiles/cgb/fighting_club_entrance.bin differ diff --git a/src/data/maps/tiles/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/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.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/fire_club_cgb.bin.lz.match b/src/data/maps/tiles/cgb/fire_club.bgmap.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.bgmap.lz.match 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/fire_club_entrance_cgb.bin.lz.match b/src/data/maps/tiles/cgb/fire_club_entrance.bgmap.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.bgmap.lz.match diff --git a/src/data/maps/tiles/cgb/fire_club_entrance.bin b/src/data/maps/tiles/cgb/fire_club_entrance.bin new file mode 100644 index 00000000..188b1e80 Binary files /dev/null and b/src/data/maps/tiles/cgb/fire_club_entrance.bin differ diff --git a/src/data/maps/tiles/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/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.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/gameboy_link_cgb.bin.lz.match b/src/data/maps/tiles/cgb/gameboy_link.bgmap.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.bgmap.lz.match diff --git a/src/data/maps/tiles/cgb/gameboy_link.bin b/src/data/maps/tiles/cgb/gameboy_link.bin new file mode 100644 index 00000000..0dd0f5bc Binary files /dev/null and b/src/data/maps/tiles/cgb/gameboy_link.bin differ diff --git a/src/data/maps/tiles/gameboy_link_connecting_cgb.bin.lz.match b/src/data/maps/tiles/cgb/gameboy_link_connecting.bgmap.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.bgmap.lz.match diff --git a/src/data/maps/tiles/cgb/gameboy_link_connecting.bin b/src/data/maps/tiles/cgb/gameboy_link_connecting.bin new file mode 100644 index 00000000..316f90b2 Binary files /dev/null and b/src/data/maps/tiles/cgb/gameboy_link_connecting.bin differ diff --git a/src/data/maps/tiles/gameboy_printer_cgb.bin.lz.match b/src/data/maps/tiles/cgb/gameboy_printer.bgmap.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.bgmap.lz.match 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 00000000..78462f9f Binary files /dev/null and b/src/data/maps/tiles/cgb/gameboy_printer.bin differ diff --git a/src/data/maps/tiles/grass_club_cgb.bin.lz.match b/src/data/maps/tiles/cgb/grass_club.bgmap.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.bgmap.lz.match diff --git a/src/data/maps/tiles/cgb/grass_club.bin b/src/data/maps/tiles/cgb/grass_club.bin new file mode 100644 index 00000000..00e06ec8 Binary files /dev/null and b/src/data/maps/tiles/cgb/grass_club.bin differ diff --git a/src/data/maps/tiles/grass_club_entrance_cgb.bin.lz.match b/src/data/maps/tiles/cgb/grass_club_entrance.bgmap.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.bgmap.lz.match diff --git a/src/data/maps/tiles/cgb/grass_club_entrance.bin b/src/data/maps/tiles/cgb/grass_club_entrance.bin new file mode 100644 index 00000000..3644dc32 Binary files /dev/null and b/src/data/maps/tiles/cgb/grass_club_entrance.bin differ diff --git a/src/data/maps/tiles/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/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.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/hall_of_honor_cgb.bin.lz.match b/src/data/maps/tiles/cgb/hall_of_honor.bgmap.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.bgmap.lz.match 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.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/ishihara_cgb.bin.lz.match b/src/data/maps/tiles/cgb/ishihara.bgmap.lz.match similarity index 100% rename from src/data/maps/tiles/ishihara_cgb.bin.lz.match rename to src/data/maps/tiles/cgb/ishihara.bgmap.lz.match 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/japanese_title_screen_cgb.bin.lz.match b/src/data/maps/tiles/cgb/japanese_title_screen.bgmap.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.bgmap.lz.match 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/japanese_title_screen_2_cgb.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/japanese_title_screen_2_cgb.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.bin b/src/data/maps/tiles/cgb/japanese_title_screen_2.bin new file mode 100644 index 00000000..ef281754 Binary files /dev/null and b/src/data/maps/tiles/cgb/japanese_title_screen_2.bin differ diff --git a/src/data/maps/tiles/laboratory_cgb.bin.lz.match b/src/data/maps/tiles/cgb/laboratory.bgmap.lz.match similarity index 100% rename from src/data/maps/tiles/laboratory_cgb.bin.lz.match rename to src/data/maps/tiles/cgb/laboratory.bgmap.lz.match diff --git a/src/data/maps/tiles/cgb/laboratory.bin b/src/data/maps/tiles/cgb/laboratory.bin new file mode 100644 index 00000000..945bd4c2 Binary files /dev/null and b/src/data/maps/tiles/cgb/laboratory.bin differ diff --git a/src/data/maps/tiles/lightning_club_cgb.bin.lz.match b/src/data/maps/tiles/cgb/lightning_club.bgmap.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.bgmap.lz.match diff --git a/src/data/maps/tiles/cgb/lightning_club.bin b/src/data/maps/tiles/cgb/lightning_club.bin new file mode 100644 index 00000000..b6f5cef3 Binary files /dev/null and b/src/data/maps/tiles/cgb/lightning_club.bin differ diff --git a/src/data/maps/tiles/lightning_club_entrance_cgb.bin.lz.match b/src/data/maps/tiles/cgb/lightning_club_entrance.bgmap.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.bgmap.lz.match 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 00000000..1e2635f9 Binary files /dev/null and b/src/data/maps/tiles/cgb/lightning_club_entrance.bin differ diff --git a/src/data/maps/tiles/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/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.bin b/src/data/maps/tiles/cgb/lightning_medal.bin new file mode 100644 index 00000000..d0726cf6 --- /dev/null +++ b/src/data/maps/tiles/cgb/lightning_medal.bin @@ -0,0 +1 @@ +Œœ¬­® \ No newline at end of file diff --git a/src/data/maps/tiles/mason_laboratory_cgb.bin.lz.match b/src/data/maps/tiles/cgb/mason_laboratory.bgmap.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.bgmap.lz.match diff --git a/src/data/maps/tiles/cgb/mason_laboratory.bin b/src/data/maps/tiles/cgb/mason_laboratory.bin new file mode 100644 index 00000000..725cd697 --- /dev/null +++ b/src/data/maps/tiles/cgb/mason_laboratory.bin @@ -0,0 +1 @@ +‚‹ƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒ‘„ŠˆÂÓ“““ÀÁ““““ ¡¢“ÈÉÈÉÈÉÈÉŠˆŠˆÄÅ›»³´µ¶££££°±²£ÊËÊËÊËÊËŠˆŠˆÆÇ«º·¸¹ºÊËÊËÊËÊËŠˆŠˆ¼¾¾¿¼¾¾¿ÌÍÌÍÌÍÌÍŠˆŠˆŠˆŠˆŠˆŠˆŠˆŠˆ‡‰Šˆ–•Šˆ¦¥ŠˆŠˆŠˆŠˆŒÈÉÈÉÈÉ‚„Šˆœ½ÊËÊËÊËŠˆŠˆœŸÎÏÎÏÎÏŠˆŠˆ¬­®¯ŠˆŠˆ¼¾¾¿ŠˆŠˆŠˆŠˆŠˆŠˆŠˆŠˆ  ŠˆŠˆ ŠˆŠˆ  ŠˆŠˆ  Šˆ‡ƒƒƒƒƒƒƒƒƒƒƒ†…ƒƒƒƒƒƒƒ’‰–““““““““““““””““““““““•¦££££££££££££¤¤££££££££¥€€€€€€€€€€€€€€€€€€€€€€€€ \ No newline at end of file diff --git a/src/data/maps/tiles/mystery_cgb.bin.lz.match b/src/data/maps/tiles/cgb/mystery.bgmap.lz.match similarity index 100% rename from src/data/maps/tiles/mystery_cgb.bin.lz.match rename to src/data/maps/tiles/cgb/mystery.bgmap.lz.match diff --git a/src/data/maps/tiles/cgb/mystery.bin b/src/data/maps/tiles/cgb/mystery.bin new file mode 100644 index 00000000..f740defd Binary files /dev/null and b/src/data/maps/tiles/cgb/mystery.bin differ diff --git a/src/data/maps/tiles/overworld_map_cgb.bin.lz.match b/src/data/maps/tiles/cgb/overworld_map.bgmap.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.bgmap.lz.match diff --git a/src/data/maps/tiles/cgb/overworld_map.bin b/src/data/maps/tiles/cgb/overworld_map.bin new file mode 100644 index 00000000..ff585957 Binary files /dev/null and b/src/data/maps/tiles/cgb/overworld_map.bin differ diff --git a/src/data/maps/tiles/pokemon_dome_cgb.bin.lz.match b/src/data/maps/tiles/cgb/pokemon_dome.bgmap.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.bgmap.lz.match 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 00000000..71f31d90 Binary files /dev/null and b/src/data/maps/tiles/cgb/pokemon_dome.bin differ 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/pokemon_dome_entrance_cgb.bin.lz.match b/src/data/maps/tiles/cgb/pokemon_dome_entrance.bgmap.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.bgmap.lz.match 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/psychic_club_cgb.bin.lz.match b/src/data/maps/tiles/cgb/psychic_club.bgmap.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.bgmap.lz.match 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/psychic_club_entrance_cgb.bin.lz.match b/src/data/maps/tiles/cgb/psychic_club_entrance.bgmap.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.bgmap.lz.match 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 00000000..c3ae07db Binary files /dev/null and b/src/data/maps/tiles/cgb/psychic_club_entrance.bin differ diff --git a/src/data/maps/tiles/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/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.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/rock_club_cgb.bin.lz.match b/src/data/maps/tiles/cgb/rock_club.bgmap.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.bgmap.lz.match 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/rock_club_entrance_cgb.bin.lz.match b/src/data/maps/tiles/cgb/rock_club_entrance.bgmap.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.bgmap.lz.match diff --git a/src/data/maps/tiles/cgb/rock_club_entrance.bin b/src/data/maps/tiles/cgb/rock_club_entrance.bin new file mode 100644 index 00000000..9e687e2d Binary files /dev/null and b/src/data/maps/tiles/cgb/rock_club_entrance.bin differ diff --git a/src/data/maps/tiles/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/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.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/science_club_cgb.bin.lz.match b/src/data/maps/tiles/cgb/science_club.bgmap.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.bgmap.lz.match 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/science_club_entrance_cgb.bin.lz.match b/src/data/maps/tiles/cgb/science_club_entrance.bgmap.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.bgmap.lz.match 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 00000000..0a99b268 Binary files /dev/null and b/src/data/maps/tiles/cgb/science_club_entrance.bin differ diff --git a/src/data/maps/tiles/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/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.bin b/src/data/maps/tiles/cgb/science_medal.bin new file mode 100644 index 00000000..f3f03fc0 --- /dev/null +++ b/src/data/maps/tiles/cgb/science_medal.bin @@ -0,0 +1 @@ +ƒ„…“”•£¤¥ \ No newline at end of file diff --git a/src/data/maps/tiles/scyther_intro_cgb.bin.lz.match b/src/data/maps/tiles/cgb/scyther_intro.bgmap.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.bgmap.lz.match diff --git a/src/data/maps/tiles/cgb/scyther_intro.bin b/src/data/maps/tiles/cgb/scyther_intro.bin new file mode 100644 index 00000000..f9a5270b Binary files /dev/null and b/src/data/maps/tiles/cgb/scyther_intro.bin differ diff --git a/src/data/maps/tiles/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/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.bin b/src/data/maps/tiles/cgb/solid_tiles_1.bin new file mode 100644 index 00000000..acace153 Binary files /dev/null and b/src/data/maps/tiles/cgb/solid_tiles_1.bin differ diff --git a/src/data/maps/tiles/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/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.bin b/src/data/maps/tiles/cgb/solid_tiles_2.bin new file mode 100644 index 00000000..cf72c9e1 Binary files /dev/null and b/src/data/maps/tiles/cgb/solid_tiles_2.bin differ diff --git a/src/data/maps/tiles/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/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.bin b/src/data/maps/tiles/cgb/solid_tiles_3.bin new file mode 100644 index 00000000..ff2dcb3f Binary files /dev/null and b/src/data/maps/tiles/cgb/solid_tiles_3.bin differ diff --git a/src/data/maps/tiles/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/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.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/title_screen_cgb.bin.lz.match b/src/data/maps/tiles/cgb/title_screen.bgmap.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.bgmap.lz.match 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 00000000..439a40c9 Binary files /dev/null and b/src/data/maps/tiles/cgb/title_screen.bin differ diff --git a/src/data/maps/tiles/water_club_cgb.bin.lz.match b/src/data/maps/tiles/cgb/water_club.bgmap.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.bgmap.lz.match 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 00000000..50ceecfa Binary files /dev/null and b/src/data/maps/tiles/cgb/water_club.bin differ diff --git a/src/data/maps/tiles/water_club_entrance_cgb.bin.lz.match b/src/data/maps/tiles/cgb/water_club_entrance.bgmap.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.bgmap.lz.match 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 00000000..b7674404 Binary files /dev/null and b/src/data/maps/tiles/cgb/water_club_entrance.bin differ diff --git a/src/data/maps/tiles/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/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.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/src/data/maps/tiles/challenge_hall_cgb.bin b/src/data/maps/tiles/challenge_hall_cgb.bin deleted file mode 100644 index c7cbd6bf..00000000 Binary files a/src/data/maps/tiles/challenge_hall_cgb.bin and /dev/null differ diff --git a/src/data/maps/tiles/challenge_hall_entrance_cgb.bin b/src/data/maps/tiles/challenge_hall_entrance_cgb.bin deleted file mode 100644 index 3f8455e8..00000000 Binary files a/src/data/maps/tiles/challenge_hall_entrance_cgb.bin and /dev/null differ diff --git a/src/data/maps/tiles/challenge_machine_map_event_cgb.bin b/src/data/maps/tiles/challenge_machine_map_event_cgb.bin deleted file mode 100644 index 764e29a8..00000000 --- a/src/data/maps/tiles/challenge_machine_map_event_cgb.bin +++ /dev/null @@ -1 +0,0 @@ -ĞÑÒÓÔÕÖ×ÜİŞßğñòóôõö÷ \ No newline at end of file diff --git a/src/data/maps/tiles/charizard_intro_cgb.bin b/src/data/maps/tiles/charizard_intro_cgb.bin deleted file mode 100644 index a4d4498d..00000000 Binary files a/src/data/maps/tiles/charizard_intro_cgb.bin and /dev/null differ diff --git a/src/data/maps/tiles/club_lobby_cgb.bin b/src/data/maps/tiles/club_lobby_cgb.bin deleted file mode 100644 index 76896973..00000000 --- a/src/data/maps/tiles/club_lobby_cgb.bin +++ /dev/null @@ -1 +0,0 @@ -‚Šƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒ’„‡ˆ“””•ÀÀ¤¥ÀÀÀÀÀÀ¤¥ÀÀ–—–—–—‡ˆ‡ˆ½½½½ĞĞ´µĞĞôõĞĞ´µĞЦ§¦§¦§‡ˆ‡ˆö÷¦§¦§¦§‡ˆ‡ˆ˜™¶·¶·¶·‡ˆ‡ˆ˜™‡ˆ‡ˆÊÊÉÉÉÌÉÉĘ́™‡ˆ‡ˆš›¨¨Ë¨¨¨Ë¨¨©‡ˆ‡ˆª«¾¾¾¾¾¾¾¾¾¿‘‡ˆº»ÂÁ‡ˆ¼¹ÒчˆİÜ܇ˆŞàà‡ˆŞáᇈâãŒêæçß‚„‡ˆä土è釈‡ˆœŸ‡ˆ‡ˆâã¬ë®¯æ燈‡ˆìíä弸¸¹èéì퇈‡ˆîïî‡ˆğñğñ‡ˆ‡ˆòóò󇈑‰ƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒ‹ÂÀÀÀÀÀÀÀÀÀÀÀÀÀÀÀÀÀÀÀÀÀÀÀÀÀÀÁÒĞĞĞĞĞĞĞĞĞĞĞĞĞĞĞĞĞĞĞĞĞĞĞĞĞĞÑ€€€€€€€€€€€€€€€€€€€€€€€€€€€€ \ No newline at end of file diff --git a/src/data/maps/tiles/colosseum_cgb.bin b/src/data/maps/tiles/colosseum_cgb.bin deleted file mode 100644 index a33f9b44..00000000 Binary files a/src/data/maps/tiles/colosseum_cgb.bin and /dev/null differ diff --git a/src/data/maps/tiles/deck_machine_map_event_cgb.bin b/src/data/maps/tiles/deck_machine_map_event_cgb.bin deleted file mode 100644 index 32bc9868..00000000 --- a/src/data/maps/tiles/deck_machine_map_event_cgb.bin +++ /dev/null @@ -1 +0,0 @@ -ÜİŞß \ No newline at end of file diff --git a/src/data/maps/tiles/deck_machine_room_cgb.bin b/src/data/maps/tiles/deck_machine_room_cgb.bin deleted file mode 100644 index 64217fcb..00000000 --- a/src/data/maps/tiles/deck_machine_room_cgb.bin +++ /dev/null @@ -1 +0,0 @@ -‚‹ìïîíìïîíìïîíìïîíìïîí‘„ŠˆÔÕÖ×ÔÕÖ×ÔÕÖ×ÔÕÖ×ÔÕÖ׊ˆŠˆÜİŞßØÙÚÛØÙÚÛØÙÚÛØÙÚÛŠˆŠˆğñòóğñòóğñòóğñòóğñò󊈊ˆôõö÷ôõö÷ôõö÷ôõö÷ôõö÷ŠˆŠˆŠˆŠˆŠˆŠˆŠˆ‡‰ĞÑÒÓĞÑÒÓŠˆ–•ÔÕÖ×ÔÕÖ׊ˆ¦¥ØÙÚÛØÙÚÛŠˆğñòóğñòóŠˆôõö÷ôõö÷ŠˆŠˆ‚„ŠˆŠˆŠˆŠˆĞÑÒÓĞÑÒÓĞÑÒÓŠˆŠˆÔÕÖ×ÔÕÖ×ÔÕÖ׊ˆŠˆØÙÚÛØÙÚÛŠˆ Šˆøùúûğñòóğñò󊈊ˆôõö÷ôõö÷ôõö÷ŠˆŠˆŠˆŠˆŠˆŠˆŠˆŠˆŠˆŠˆŠˆ‡ƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒ’‰–““““““““““““““““““““““•¦££££££££££££££££££££££¥€€€€€€€€€€€€€€€€€€€€€€€€ \ No newline at end of file diff --git a/src/data/maps/tiles/dimensions/aerodactyl_intro.dimensions b/src/data/maps/tiles/dimensions/aerodactyl_intro.dimensions new file mode 100644 index 00000000..78682ddc --- /dev/null +++ b/src/data/maps/tiles/dimensions/aerodactyl_intro.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/dimensions/card_pop.dimensions b/src/data/maps/tiles/dimensions/card_pop.dimensions new file mode 100644 index 00000000..c31de8c7 --- /dev/null +++ b/src/data/maps/tiles/dimensions/card_pop.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/dimensions/challenge_hall.dimensions b/src/data/maps/tiles/dimensions/challenge_hall.dimensions new file mode 100644 index 00000000..136d0638 --- /dev/null +++ b/src/data/maps/tiles/dimensions/challenge_hall.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/dimensions/challenge_hall_entrance.dimensions b/src/data/maps/tiles/dimensions/challenge_hall_entrance.dimensions new file mode 100644 index 00000000..c31de8c7 --- /dev/null +++ b/src/data/maps/tiles/dimensions/challenge_hall_entrance.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/dimensions/challenge_machine_map_event.dimensions b/src/data/maps/tiles/dimensions/challenge_machine_map_event.dimensions new file mode 100644 index 00000000..d333ecd2 --- /dev/null +++ b/src/data/maps/tiles/dimensions/challenge_machine_map_event.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/dimensions/charizard_intro.dimensions b/src/data/maps/tiles/dimensions/charizard_intro.dimensions new file mode 100644 index 00000000..78682ddc --- /dev/null +++ b/src/data/maps/tiles/dimensions/charizard_intro.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/dimensions/club_lobby.dimensions b/src/data/maps/tiles/dimensions/club_lobby.dimensions new file mode 100644 index 00000000..016f7567 --- /dev/null +++ b/src/data/maps/tiles/dimensions/club_lobby.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/dimensions/colosseum.dimensions b/src/data/maps/tiles/dimensions/colosseum.dimensions new file mode 100644 index 00000000..78682ddc --- /dev/null +++ b/src/data/maps/tiles/dimensions/colosseum.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/dimensions/companies.dimensions b/src/data/maps/tiles/dimensions/companies.dimensions new file mode 100644 index 00000000..c31de8c7 --- /dev/null +++ b/src/data/maps/tiles/dimensions/companies.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/dimensions/copyright.dimensions b/src/data/maps/tiles/dimensions/copyright.dimensions new file mode 100644 index 00000000..c31de8c7 --- /dev/null +++ b/src/data/maps/tiles/dimensions/copyright.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/dimensions/deck_machine_map_event.dimensions b/src/data/maps/tiles/dimensions/deck_machine_map_event.dimensions new file mode 100644 index 00000000..5e7f5cc1 --- /dev/null +++ b/src/data/maps/tiles/dimensions/deck_machine_map_event.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/dimensions/deck_machine_room.dimensions b/src/data/maps/tiles/dimensions/deck_machine_room.dimensions new file mode 100644 index 00000000..271de7a4 --- /dev/null +++ b/src/data/maps/tiles/dimensions/deck_machine_room.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/dimensions/evolution.dimensions b/src/data/maps/tiles/dimensions/evolution.dimensions new file mode 100644 index 00000000..78682ddc --- /dev/null +++ b/src/data/maps/tiles/dimensions/evolution.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/dimensions/fighting_club.dimensions b/src/data/maps/tiles/dimensions/fighting_club.dimensions new file mode 100644 index 00000000..2cd85792 --- /dev/null +++ b/src/data/maps/tiles/dimensions/fighting_club.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/dimensions/fighting_club_entrance.dimensions b/src/data/maps/tiles/dimensions/fighting_club_entrance.dimensions new file mode 100644 index 00000000..c31de8c7 --- /dev/null +++ b/src/data/maps/tiles/dimensions/fighting_club_entrance.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/dimensions/fighting_medal.dimensions b/src/data/maps/tiles/dimensions/fighting_medal.dimensions new file mode 100644 index 00000000..5e2ed41f --- /dev/null +++ b/src/data/maps/tiles/dimensions/fighting_medal.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/dimensions/fire_club.dimensions b/src/data/maps/tiles/dimensions/fire_club.dimensions new file mode 100644 index 00000000..3eb40bb1 --- /dev/null +++ b/src/data/maps/tiles/dimensions/fire_club.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/dimensions/fire_club_entrance.dimensions b/src/data/maps/tiles/dimensions/fire_club_entrance.dimensions new file mode 100644 index 00000000..c31de8c7 --- /dev/null +++ b/src/data/maps/tiles/dimensions/fire_club_entrance.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/dimensions/fire_medal.dimensions b/src/data/maps/tiles/dimensions/fire_medal.dimensions new file mode 100644 index 00000000..5e2ed41f --- /dev/null +++ b/src/data/maps/tiles/dimensions/fire_medal.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/dimensions/gameboy_link.dimensions b/src/data/maps/tiles/dimensions/gameboy_link.dimensions new file mode 100644 index 00000000..c31de8c7 --- /dev/null +++ b/src/data/maps/tiles/dimensions/gameboy_link.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/dimensions/gameboy_link_connecting.dimensions b/src/data/maps/tiles/dimensions/gameboy_link_connecting.dimensions new file mode 100644 index 00000000..c31de8c7 --- /dev/null +++ b/src/data/maps/tiles/dimensions/gameboy_link_connecting.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/dimensions/gameboy_printer.dimensions b/src/data/maps/tiles/dimensions/gameboy_printer.dimensions new file mode 100644 index 00000000..c31de8c7 --- /dev/null +++ b/src/data/maps/tiles/dimensions/gameboy_printer.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/dimensions/grass_club.dimensions b/src/data/maps/tiles/dimensions/grass_club.dimensions new file mode 100644 index 00000000..3eb40bb1 --- /dev/null +++ b/src/data/maps/tiles/dimensions/grass_club.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/dimensions/grass_club_entrance.dimensions b/src/data/maps/tiles/dimensions/grass_club_entrance.dimensions new file mode 100644 index 00000000..c31de8c7 --- /dev/null +++ b/src/data/maps/tiles/dimensions/grass_club_entrance.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/dimensions/grass_medal.dimensions b/src/data/maps/tiles/dimensions/grass_medal.dimensions new file mode 100644 index 00000000..5e2ed41f --- /dev/null +++ b/src/data/maps/tiles/dimensions/grass_medal.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/dimensions/hall_of_honor.dimensions b/src/data/maps/tiles/dimensions/hall_of_honor.dimensions new file mode 100644 index 00000000..9c057b30 --- /dev/null +++ b/src/data/maps/tiles/dimensions/hall_of_honor.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/dimensions/hall_of_honor_door_map_event.dimensions b/src/data/maps/tiles/dimensions/hall_of_honor_door_map_event.dimensions new file mode 100644 index 00000000..6bebb85a --- /dev/null +++ b/src/data/maps/tiles/dimensions/hall_of_honor_door_map_event.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/dimensions/ishihara.dimensions b/src/data/maps/tiles/dimensions/ishihara.dimensions new file mode 100644 index 00000000..5844d81d --- /dev/null +++ b/src/data/maps/tiles/dimensions/ishihara.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/dimensions/japanese_title_screen.dimensions b/src/data/maps/tiles/dimensions/japanese_title_screen.dimensions new file mode 100644 index 00000000..c31de8c7 --- /dev/null +++ b/src/data/maps/tiles/dimensions/japanese_title_screen.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/dimensions/japanese_title_screen_2.dimensions b/src/data/maps/tiles/dimensions/japanese_title_screen_2.dimensions new file mode 100644 index 00000000..c31de8c7 --- /dev/null +++ b/src/data/maps/tiles/dimensions/japanese_title_screen_2.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/dimensions/laboratory.dimensions b/src/data/maps/tiles/dimensions/laboratory.dimensions new file mode 100644 index 00000000..78682ddc --- /dev/null +++ b/src/data/maps/tiles/dimensions/laboratory.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/dimensions/lightning_club.dimensions b/src/data/maps/tiles/dimensions/lightning_club.dimensions new file mode 100644 index 00000000..3eb40bb1 --- /dev/null +++ b/src/data/maps/tiles/dimensions/lightning_club.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/dimensions/lightning_club_entrance.dimensions b/src/data/maps/tiles/dimensions/lightning_club_entrance.dimensions new file mode 100644 index 00000000..c31de8c7 --- /dev/null +++ b/src/data/maps/tiles/dimensions/lightning_club_entrance.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/dimensions/lightning_medal.dimensions b/src/data/maps/tiles/dimensions/lightning_medal.dimensions new file mode 100644 index 00000000..5e2ed41f --- /dev/null +++ b/src/data/maps/tiles/dimensions/lightning_medal.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/dimensions/mason_laboratory.dimensions b/src/data/maps/tiles/dimensions/mason_laboratory.dimensions new file mode 100644 index 00000000..959ba312 --- /dev/null +++ b/src/data/maps/tiles/dimensions/mason_laboratory.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/dimensions/mystery.dimensions b/src/data/maps/tiles/dimensions/mystery.dimensions new file mode 100644 index 00000000..78682ddc --- /dev/null +++ b/src/data/maps/tiles/dimensions/mystery.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/dimensions/nintendo.dimensions b/src/data/maps/tiles/dimensions/nintendo.dimensions new file mode 100644 index 00000000..c31de8c7 --- /dev/null +++ b/src/data/maps/tiles/dimensions/nintendo.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/dimensions/opponent.dimensions b/src/data/maps/tiles/dimensions/opponent.dimensions new file mode 100644 index 00000000..5c4b3b87 --- /dev/null +++ b/src/data/maps/tiles/dimensions/opponent.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/dimensions/overworld_map.dimensions b/src/data/maps/tiles/dimensions/overworld_map.dimensions new file mode 100644 index 00000000..c31de8c7 --- /dev/null +++ b/src/data/maps/tiles/dimensions/overworld_map.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/dimensions/player.dimensions b/src/data/maps/tiles/dimensions/player.dimensions new file mode 100644 index 00000000..5c4b3b87 --- /dev/null +++ b/src/data/maps/tiles/dimensions/player.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/dimensions/pokemon_dome.dimensions b/src/data/maps/tiles/dimensions/pokemon_dome.dimensions new file mode 100644 index 00000000..136d0638 --- /dev/null +++ b/src/data/maps/tiles/dimensions/pokemon_dome.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/dimensions/pokemon_dome_door_map_event.dimensions b/src/data/maps/tiles/dimensions/pokemon_dome_door_map_event.dimensions new file mode 100644 index 00000000..6bebb85a --- /dev/null +++ b/src/data/maps/tiles/dimensions/pokemon_dome_door_map_event.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/dimensions/pokemon_dome_entrance.dimensions b/src/data/maps/tiles/dimensions/pokemon_dome_entrance.dimensions new file mode 100644 index 00000000..c1c711a1 --- /dev/null +++ b/src/data/maps/tiles/dimensions/pokemon_dome_entrance.dimensions @@ -0,0 +1 @@ +  \ No newline at end of file diff --git a/src/data/maps/tiles/dimensions/psychic_club.dimensions b/src/data/maps/tiles/dimensions/psychic_club.dimensions new file mode 100644 index 00000000..0bc92d84 --- /dev/null +++ b/src/data/maps/tiles/dimensions/psychic_club.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/dimensions/psychic_club_entrance.dimensions b/src/data/maps/tiles/dimensions/psychic_club_entrance.dimensions new file mode 100644 index 00000000..c31de8c7 --- /dev/null +++ b/src/data/maps/tiles/dimensions/psychic_club_entrance.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/dimensions/psychic_medal.dimensions b/src/data/maps/tiles/dimensions/psychic_medal.dimensions new file mode 100644 index 00000000..5e2ed41f --- /dev/null +++ b/src/data/maps/tiles/dimensions/psychic_medal.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/dimensions/rock_club.dimensions b/src/data/maps/tiles/dimensions/rock_club.dimensions new file mode 100644 index 00000000..959ba312 --- /dev/null +++ b/src/data/maps/tiles/dimensions/rock_club.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/dimensions/rock_club_entrance.dimensions b/src/data/maps/tiles/dimensions/rock_club_entrance.dimensions new file mode 100644 index 00000000..c31de8c7 --- /dev/null +++ b/src/data/maps/tiles/dimensions/rock_club_entrance.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/dimensions/rock_medal.dimensions b/src/data/maps/tiles/dimensions/rock_medal.dimensions new file mode 100644 index 00000000..5e2ed41f --- /dev/null +++ b/src/data/maps/tiles/dimensions/rock_medal.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/dimensions/science_club.dimensions b/src/data/maps/tiles/dimensions/science_club.dimensions new file mode 100644 index 00000000..3eb40bb1 --- /dev/null +++ b/src/data/maps/tiles/dimensions/science_club.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/dimensions/science_club_entrance.dimensions b/src/data/maps/tiles/dimensions/science_club_entrance.dimensions new file mode 100644 index 00000000..c31de8c7 --- /dev/null +++ b/src/data/maps/tiles/dimensions/science_club_entrance.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/dimensions/science_medal.dimensions b/src/data/maps/tiles/dimensions/science_medal.dimensions new file mode 100644 index 00000000..5e2ed41f --- /dev/null +++ b/src/data/maps/tiles/dimensions/science_medal.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/dimensions/scyther_intro.dimensions b/src/data/maps/tiles/dimensions/scyther_intro.dimensions new file mode 100644 index 00000000..78682ddc --- /dev/null +++ b/src/data/maps/tiles/dimensions/scyther_intro.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/dimensions/solid_tiles_1.dimensions b/src/data/maps/tiles/dimensions/solid_tiles_1.dimensions new file mode 100644 index 00000000..c31de8c7 --- /dev/null +++ b/src/data/maps/tiles/dimensions/solid_tiles_1.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/dimensions/solid_tiles_2.dimensions b/src/data/maps/tiles/dimensions/solid_tiles_2.dimensions new file mode 100644 index 00000000..c31de8c7 --- /dev/null +++ b/src/data/maps/tiles/dimensions/solid_tiles_2.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/dimensions/solid_tiles_3.dimensions b/src/data/maps/tiles/dimensions/solid_tiles_3.dimensions new file mode 100644 index 00000000..c31de8c7 --- /dev/null +++ b/src/data/maps/tiles/dimensions/solid_tiles_3.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/dimensions/solid_tiles_4.dimensions b/src/data/maps/tiles/dimensions/solid_tiles_4.dimensions new file mode 100644 index 00000000..322f8454 --- /dev/null +++ b/src/data/maps/tiles/dimensions/solid_tiles_4.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/dimensions/title_screen.dimensions b/src/data/maps/tiles/dimensions/title_screen.dimensions new file mode 100644 index 00000000..c31de8c7 --- /dev/null +++ b/src/data/maps/tiles/dimensions/title_screen.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/dimensions/water_club.dimensions b/src/data/maps/tiles/dimensions/water_club.dimensions new file mode 100644 index 00000000..3eb40bb1 --- /dev/null +++ b/src/data/maps/tiles/dimensions/water_club.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/dimensions/water_club_entrance.dimensions b/src/data/maps/tiles/dimensions/water_club_entrance.dimensions new file mode 100644 index 00000000..c31de8c7 --- /dev/null +++ b/src/data/maps/tiles/dimensions/water_club_entrance.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/dimensions/water_medal.dimensions b/src/data/maps/tiles/dimensions/water_medal.dimensions new file mode 100644 index 00000000..5e2ed41f --- /dev/null +++ b/src/data/maps/tiles/dimensions/water_medal.dimensions @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/maps/tiles/evolution_cgb.bin b/src/data/maps/tiles/evolution_cgb.bin deleted file mode 100644 index 571a5dee..00000000 Binary files a/src/data/maps/tiles/evolution_cgb.bin and /dev/null differ diff --git a/src/data/maps/tiles/fighting_club_cgb.bin b/src/data/maps/tiles/fighting_club_cgb.bin deleted file mode 100644 index 7a0c4a20..00000000 Binary files a/src/data/maps/tiles/fighting_club_cgb.bin and /dev/null differ diff --git a/src/data/maps/tiles/fighting_club_entrance_cgb.bin b/src/data/maps/tiles/fighting_club_entrance_cgb.bin deleted file mode 100644 index c98b4116..00000000 Binary files a/src/data/maps/tiles/fighting_club_entrance_cgb.bin and /dev/null differ diff --git a/src/data/maps/tiles/fighting_medal.bin b/src/data/maps/tiles/fighting_medal.bin deleted file mode 100644 index ac07e57a..00000000 --- a/src/data/maps/tiles/fighting_medal.bin +++ /dev/null @@ -1 +0,0 @@ -°±²¹º»ÀÁ \ No newline at end of file diff --git a/src/data/maps/tiles/fire_club_cgb.bin b/src/data/maps/tiles/fire_club_cgb.bin deleted file mode 100644 index ec22980b..00000000 --- a/src/data/maps/tiles/fire_club_cgb.bin +++ /dev/null @@ -1 +0,0 @@ -ƒ‘„„„„„„„„„„„„„„„„„„„„„„„„”…“’Š‹Š‹Š‹Š‹Š‹Š‹Š‹Š‹Š‹Š‹Š‹Š‹“’“’“’“’ˆ‰ˆ‰ˆ‰ˆ‰ˆ‰ˆ‰ˆ‰ˆ‰ˆ‰ˆ‰ˆ‰ˆ‰“’“’‚‚»¼‚‚•––—‚‚¿À‚‚“’“’‚‚½¾‚‚˜™š›‚‚Á‚‚“’“’‚‚ËÌ‚‚˜™š›‚‚Í΂‚“’“’‚‚ÏĞ‚‚˜™š›‚‚ÑÒ‚‚“’“’‚‚ÓÔ‚‚˜™š›‚‚ÕÖ‚‚“’“’‚‚‚‚‚˜™š›‚‚‚‚‚“’“’‚‚‚‚‚˜™š›‚‚‚‚‚“’“’‚‚‚‚‚˜™š›‚‚‚‚‚“’“’‚‚»¼‚‚˜™š›‚‚¿À‚‚“’“’‚‚½¾‚‚˜™š›‚‚Á‚‚“’“’‚‚ËÌ‚‚˜™š›‚‚Í΂‚“’“’‚‚ÏĞ‚‚˜™š›‚‚ÑÒ‚‚“’“’‚‚ÓÔ‚‚˜™š›‚‚ÕÖ‚‚“’“’‚‚‚‚‚˜™š›‚‚‚‚‚“’“’‚‚‚‚‚˜™š›‚‚‚‚‚“’“’‚‚‚‚‚˜™š›‚‚‚‚‚“’“’‚‚»¼‚‚˜™š›‚‚¿À‚‚“’“’‚‚½¾‚‚˜™š›‚‚Á‚‚“’“’‚‚ËÌ‚‚˜™š›‚‚Í΂‚“’“’‚‚ÏĞ‚‚˜™š›‚‚ÑÒ‚‚“’“’‚‚ÓÔ‚‚˜™š›‚‚ÕÖ‚‚“’“’‚‚‚‚‚˜™š›‚‚‚‚‚“’“’‚‚‚‚‚˜™š›‚‚‚‚‚“’“’‚‚‚‚‚˜™š›‚‚‚‚‚“’„„„„„„„„„‡˜™š›†„„„„„„„„„œŒŠ‹Š‹Š‹Š‹Š‹Œ˜™š›ŒŠ‹Š‹Š‹Š‹Š‹Œ˜™š›€€€€€€€€€€€€˜™š›€€€€€€€€€€€€ \ No newline at end of file diff --git a/src/data/maps/tiles/fire_club_entrance_cgb.bin b/src/data/maps/tiles/fire_club_entrance_cgb.bin deleted file mode 100644 index f3be7743..00000000 Binary files a/src/data/maps/tiles/fire_club_entrance_cgb.bin and /dev/null differ diff --git a/src/data/maps/tiles/fire_medal.bin b/src/data/maps/tiles/fire_medal.bin deleted file mode 100644 index 5f4ad48b..00000000 --- a/src/data/maps/tiles/fire_medal.bin +++ /dev/null @@ -1 +0,0 @@ -†‡ˆ–—˜¦§¨ \ No newline at end of file diff --git a/src/data/maps/tiles/gameboy_link_cgb.bin b/src/data/maps/tiles/gameboy_link_cgb.bin deleted file mode 100644 index 776aaa9c..00000000 Binary files a/src/data/maps/tiles/gameboy_link_cgb.bin and /dev/null differ diff --git a/src/data/maps/tiles/gameboy_link_connecting_cgb.bin b/src/data/maps/tiles/gameboy_link_connecting_cgb.bin deleted file mode 100644 index 584b349a..00000000 Binary files a/src/data/maps/tiles/gameboy_link_connecting_cgb.bin and /dev/null differ diff --git a/src/data/maps/tiles/gameboy_printer_cgb.bin b/src/data/maps/tiles/gameboy_printer_cgb.bin deleted file mode 100644 index 7e89471c..00000000 Binary files a/src/data/maps/tiles/gameboy_printer_cgb.bin and /dev/null differ 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.lz.match b/src/data/maps/tiles/gb/card_pop.bgmap.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.bgmap.lz.match diff --git a/src/data/maps/tiles/gb/card_pop.bin b/src/data/maps/tiles/gb/card_pop.bin new file mode 100644 index 00000000..15843cf8 Binary files /dev/null and b/src/data/maps/tiles/gb/card_pop.bin differ 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/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/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/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/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/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/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/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/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/grass_club_cgb.bin b/src/data/maps/tiles/grass_club_cgb.bin deleted file mode 100644 index de3e7d36..00000000 Binary files a/src/data/maps/tiles/grass_club_cgb.bin and /dev/null differ diff --git a/src/data/maps/tiles/grass_club_entrance_cgb.bin b/src/data/maps/tiles/grass_club_entrance_cgb.bin deleted file mode 100644 index f898f521..00000000 Binary files a/src/data/maps/tiles/grass_club_entrance_cgb.bin and /dev/null differ diff --git a/src/data/maps/tiles/grass_medal.bin b/src/data/maps/tiles/grass_medal.bin deleted file mode 100644 index 1129d464..00000000 --- a/src/data/maps/tiles/grass_medal.bin +++ /dev/null @@ -1 +0,0 @@ -€‚‘’ ¡¢ \ No newline at end of file diff --git a/src/data/maps/tiles/hall_of_honor_cgb.bin b/src/data/maps/tiles/hall_of_honor_cgb.bin deleted file mode 100644 index 67e774a0..00000000 --- a/src/data/maps/tiles/hall_of_honor_cgb.bin +++ /dev/null @@ -1 +0,0 @@ -‰ŠŠŠŠŠŠŠŠŠŠŠŠŠŠŠŠŠŠŠŠ™‹ìê““““““““ŒŒ““““““““ìêì꣣££££££Ì¤¥Ì££££££££ìêìêߪîïğñîïܦ§Üğñîïğñߪìêìê¿»•–òˆ•–¼½¾¼òˆ•–òˆ¿»ìêìêîïğñîïğñîïğñîïğñîïğñìêìê•–òˆ•–òˆ•–òˆ•–òˆ•–òˆìêìêğñîïğñîïğñîïğñîïğñîïìêìêòˆ•–òˆõ–òˆ•–¹•–òˆ•–ìêìêîïğñîïÂÃÄÅÆÇÈÉğñîïğñìêìê•–òˆĞÑÒÓÔÕÖ×ØÒÚĞ•–òˆìêìêğñîïàáâãäåæçèâáàğñîïìêìêòˆ•–ÛÙÏ€ÎËËÊ€ÁÀÛòˆ•–ìêìêîïğñº¸·¶ÎËËʵ´³ºîïğñìêìê•–òˆ•ôøœËË›ö÷󈕖òˆìêìêğñîïğñîïğñîïğñîïğñîïìêìêòˆ•–òˆ•–òˆ•–òˆ•–òˆ•–ìêìêîïğñîïğñîïğñîïğñîïğñìêìê•–òˆ•–òˆ•–òˆ•–òˆ•–òˆìêìêğñîïğñîïğñîïğñîïğñîïìêìêߪ•–òˆ•–òˆ•–òˆ•–òˆßŞìêìê¿»ğñîïğñîïğñîïğñîï¿»ìêé ŠŠŠŠŠŠŠ„•–òˆƒŠŠŠŠŠŠŠŸë’““““““““íííí““““““““‘¢££££££££‚íííí‚££££££££¡€€€€€€€€€€ííí퀀€€€€€€€€ \ No newline at end of file diff --git a/src/data/maps/tiles/hall_of_honor_door_map_event_cgb.bin b/src/data/maps/tiles/hall_of_honor_door_map_event_cgb.bin deleted file mode 100644 index 0599eee9..00000000 --- a/src/data/maps/tiles/hall_of_honor_door_map_event_cgb.bin +++ /dev/null @@ -1 +0,0 @@ -õõõõõõõõõõõõ \ No newline at end of file diff --git a/src/data/maps/tiles/ishihara_cgb.bin b/src/data/maps/tiles/ishihara_cgb.bin deleted file mode 100644 index 40087ab2..00000000 --- a/src/data/maps/tiles/ishihara_cgb.bin +++ /dev/null @@ -1 +0,0 @@ -ƒ„„„„„„„„„„„„„„„„¢…“’––¬­œœœœœœ“’“’ˆ‰Š‹ŸŸŸŸŸŸ“’“’˜™š›ŸŸŸŸŸŸ“’“’Œª«ª«ª«ª«ª«ª«“’“’‚‚‚‚‚‚‚‚“’“’‚‚ººººººº‚‚“’“’‚‚»¼¼¼¼¼¼½‚‚“’“’‚‚»¼¼¼¼¼¼½‚Á“’“’‚‚»¼¼¼¼¼¼½‚ÃÄ“’“’‚‚¾¿¿¿¿¿¿À‚ÅÆ“’“’‚‚‚‚‚‚‚ÇÈ“’“’œœœ‚‚œœœ“’“’ŸŸŸ‚‚ŸŸŸ“’“’¨©¨©¨©‚‚¨©¨©¨©“’“’‚‚‚‚‚‚‚‚“’“’‚‚‚‚‚‚‚‚“’“’‚‚‚‚‚‚‚‚“’“’ÉÊÉÊ‚‚‚‚‚‚“’“’ËÌËÌ‚‚‚‚‚‚“’‘ „„„„„‡‚‚†„„„„„£¡•––––––—‚‚—––––––”¥¦¦¦¦¦¦§‚‚§¦¦¦¦¦¦¤€€€€€€€€‚‚€€€€€€€€ \ No newline at end of file diff --git a/src/data/maps/tiles/japanese_title_screen_2_cgb.bin b/src/data/maps/tiles/japanese_title_screen_2_cgb.bin deleted file mode 100644 index e8f96aed..00000000 Binary files a/src/data/maps/tiles/japanese_title_screen_2_cgb.bin and /dev/null differ diff --git a/src/data/maps/tiles/japanese_title_screen_cgb.bin b/src/data/maps/tiles/japanese_title_screen_cgb.bin deleted file mode 100644 index db155a97..00000000 --- a/src/data/maps/tiles/japanese_title_screen_cgb.bin +++ /dev/null @@ -1 +0,0 @@ -€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€Š‰€€€€’“”•–—˜™š›œŸˆ‡€€€¡¢£¤¥¦§¨©ª«¬­®¯†…€€€±²³´µ¶·¸¹º»¼½¾¿„€€€ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎσ‚€€ĞÑÒÓÔÕÖ×ØÙÚÛÜİŞß€€€€€€‹à° ‘€€€€€€€€€€€€€€€Œ€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€ \ No newline at end of file diff --git a/src/data/maps/tiles/laboratory_cgb.bin b/src/data/maps/tiles/laboratory_cgb.bin deleted file mode 100644 index a4c51191..00000000 Binary files a/src/data/maps/tiles/laboratory_cgb.bin and /dev/null differ diff --git a/src/data/maps/tiles/lightning_club_cgb.bin b/src/data/maps/tiles/lightning_club_cgb.bin deleted file mode 100644 index 0449c2cd..00000000 Binary files a/src/data/maps/tiles/lightning_club_cgb.bin and /dev/null differ diff --git a/src/data/maps/tiles/lightning_club_entrance_cgb.bin b/src/data/maps/tiles/lightning_club_entrance_cgb.bin deleted file mode 100644 index 7b667ba4..00000000 Binary files a/src/data/maps/tiles/lightning_club_entrance_cgb.bin and /dev/null differ diff --git a/src/data/maps/tiles/lightning_medal.bin b/src/data/maps/tiles/lightning_medal.bin deleted file mode 100644 index 9f349a23..00000000 --- a/src/data/maps/tiles/lightning_medal.bin +++ /dev/null @@ -1 +0,0 @@ -Œœ¬­® \ No newline at end of file diff --git a/src/data/maps/tiles/mason_laboratory_cgb.bin b/src/data/maps/tiles/mason_laboratory_cgb.bin deleted file mode 100644 index 7f475011..00000000 --- a/src/data/maps/tiles/mason_laboratory_cgb.bin +++ /dev/null @@ -1 +0,0 @@ -‚‹ƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒƒ‘„ŠˆÂÓ“““ÀÁ““““ ¡¢“ÈÉÈÉÈÉÈÉŠˆŠˆÄÅ›»³´µ¶££££°±²£ÊËÊËÊËÊËŠˆŠˆÆÇ«º·¸¹ºÊËÊËÊËÊËŠˆŠˆ¼¾¾¿¼¾¾¿ÌÍÌÍÌÍÌÍŠˆŠˆŠˆŠˆŠˆŠˆŠˆŠˆ‡‰Šˆ–•Šˆ¦¥ŠˆŠˆŠˆŠˆŒÈÉÈÉÈÉ‚„Šˆœ½ÊËÊËÊËŠˆŠˆœŸÎÏÎÏÎÏŠˆŠˆ¬­®¯ŠˆŠˆ¼¾¾¿ŠˆŠˆŠˆŠˆŠˆŠˆŠˆŠˆ ŠˆŠˆ ŠˆŠˆŠˆ ŠˆŠˆ ‡ƒƒƒƒƒƒƒƒƒƒƒ†…ƒƒƒƒƒƒƒ’‰–““““““““““““””““““““““•¦££££££££££££¤¤££££££££¥€€€€€€€€€€€€€€€€€€€€€€€€ \ No newline at end of file diff --git a/src/data/maps/tiles/mystery_cgb.bin b/src/data/maps/tiles/mystery_cgb.bin deleted file mode 100644 index 1cd54499..00000000 Binary files a/src/data/maps/tiles/mystery_cgb.bin and /dev/null differ diff --git a/src/data/maps/tiles/overworld_map_cgb.bin b/src/data/maps/tiles/overworld_map_cgb.bin deleted file mode 100644 index a67600ee..00000000 Binary files a/src/data/maps/tiles/overworld_map_cgb.bin and /dev/null differ diff --git a/src/data/maps/tiles/pokemon_dome_cgb.bin b/src/data/maps/tiles/pokemon_dome_cgb.bin deleted file mode 100644 index bb83ff5f..00000000 Binary files a/src/data/maps/tiles/pokemon_dome_cgb.bin and /dev/null differ diff --git a/src/data/maps/tiles/pokemon_dome_door_map_event_cgb.bin b/src/data/maps/tiles/pokemon_dome_door_map_event_cgb.bin deleted file mode 100644 index 7cc22621..00000000 --- a/src/data/maps/tiles/pokemon_dome_door_map_event_cgb.bin +++ /dev/null @@ -1 +0,0 @@ -ÄÅÄÅÂÃÂÃÄÅÄÅ \ No newline at end of file diff --git a/src/data/maps/tiles/pokemon_dome_entrance_cgb.bin b/src/data/maps/tiles/pokemon_dome_entrance_cgb.bin deleted file mode 100644 index d27d4f11..00000000 --- a/src/data/maps/tiles/pokemon_dome_entrance_cgb.bin +++ /dev/null @@ -1 +0,0 @@ -ƒ ‚‚‚‡…†ˆ´µ´µ´µ““““““““““°±²³–—˜™’“ª«†ˆ†ˆ¶·¶·¶·££££££££££ÀÁ¸¹¦§¨©¢£º»†ˆ†ˆ¶·¶·¶·ÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂì­†ˆ†ˆ¾¿¾¿¾¿ÄÅÄÅÄÅÄÅÄÅÄÅÄÅÄÅÄÅÄż½†ˆ†ˆÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂƈ†ˆÄÅÄÅÄÅÄÅÄÅÄÅÄÅÄÅÄÅÄÅÄÅÄÅÄÅÄņˆ†ˆÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂƈ†ˆ´µ´µ´µÄÅÄÅÄÅÄÅÄÅÄÅÄÅÄÅÄÅÄÅÄņˆ†ˆ¶·¶·¶·ÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂƈ†ˆ®¯®¯®¯ÄÅÄÅÄÅÄÅÄÅÄÅÄÅÄÅÄÅÄÅÆdžˆ†ˆÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÈɆˆ†ˆÄÅÄÅÄÅÄÅÄÅÄÅÄÅÄÅÄÅÄÅÄÅÄÅÄÅʈˆ†ˆÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÌ͆ˆ‰„‚ÄÅÄÅ•¥’““““““““““““”ÂÃÂÔ““““““““““““‘¢££££££££££££¤ÄÅÄŤ££££££££££££¡€€€€€€€€€€€€€€ÂÃÂÀ€€€€€€€€€€€€€ \ No newline at end of file diff --git a/src/data/maps/tiles/psychic_club_cgb.bin b/src/data/maps/tiles/psychic_club_cgb.bin deleted file mode 100644 index 08d8e8d1..00000000 --- a/src/data/maps/tiles/psychic_club_cgb.bin +++ /dev/null @@ -1 +0,0 @@ -ƒ•„„„„„„„„„„„„„„„„„„„„„„„„…’‘¢£¢£¢£¢£¢£¢£¢£¢£¢£¢£¢£¢£’‘’‘¤¥¤¥¤¥¤¥¤¥¤¥¤¥¤¥¤¥¤¥¤¥¤¥’‘’‘œœœœœœœœœœœœ’‘’‘°±Œ—°±’‘’‘ŸŸŸŸ²³ˆ‰Š‹²³ŸŸŸŸ’‘’‘°±´µ˜™š›´µ°±’‘’‘ŸŸ²³Ÿ¶·ˆ‰Š‹¶·Ÿ²³ŸŸ’‘’‘´µ¸¹˜™š›¸¹´µ’‘’‘ŸŸ¶·ŸŸˆ‰Š‹ŸŸ¶·ŸŸ’‘’‘¸¹˜™š›¸¹’‘’‘ŸŸŸŸŸˆ‰Š‹ŸŸŸŸŸ’‘’‘˜™š›’‘’‘ŸŸŸŸŸˆ‰Š‹ŸŸŸŸŸ’‘’‘°±˜™š›°±’‘’‘ŸŸ²³ŸŸˆ‰Š‹ŸŸ²³ŸŸ’‘’‘´µ°±˜™š›°±´µ’‘’‘ŸŸ¶·Ÿ²³ˆ‰Š‹²³Ÿ¶·ŸŸ’‘’‘¸¹´µ˜™š›´µ¸¹’‘’‘ŸŸŸŸ¶·ˆ‰Š‹¶·ŸŸŸŸ’‘’‘¸¹˜™š›¸¹’‘’‘ŸŸŸŸŸˆ‰Š‹ŸŸŸŸŸ’‘’‘˜™š›’‘’‘ŸŸŸŸŸˆ‰Š‹ŸŸŸŸŸ’‘“‚„„„„„„„„„‡˜™š›†„„„„„„„„„”–£¢£¢£¢£¢£¢£ ˆ‰Š‹ ¢£¢£¢£¢£¢£¢¥¤¥¤¥¤¥¤¥¤¥¡˜™š›¡¤¥¤¥¤¥¤¥¤¥¤€€€€€€€€€€€€ˆ‰Š‹€€€€€€€€€€€€ \ No newline at end of file diff --git a/src/data/maps/tiles/psychic_club_entrance_cgb.bin b/src/data/maps/tiles/psychic_club_entrance_cgb.bin deleted file mode 100644 index f9e323e4..00000000 Binary files a/src/data/maps/tiles/psychic_club_entrance_cgb.bin and /dev/null differ diff --git a/src/data/maps/tiles/psychic_medal.bin b/src/data/maps/tiles/psychic_medal.bin deleted file mode 100644 index 6626ea3c..00000000 --- a/src/data/maps/tiles/psychic_medal.bin +++ /dev/null @@ -1 +0,0 @@ -¶·¸¿ŸÆǯ \ No newline at end of file diff --git a/src/data/maps/tiles/rock_club_cgb.bin b/src/data/maps/tiles/rock_club_cgb.bin deleted file mode 100644 index cf331b59..00000000 --- a/src/data/maps/tiles/rock_club_cgb.bin +++ /dev/null @@ -1 +0,0 @@ -ƒ „„„„„„„„„„„„„„„„„„„„„„„„‘…‚’“”“”“”“”“”“”“”“”“”“”“”“”‚’‚’‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‚’‚’ŒŒ•Š‹¹ºº»Š‹•ŒŒ‚’‚’œœ¥š›µ¶·¸š›¥œœ‚’‚’Œ••ª«µ¶·¸ª«•–Œ‚’‚’œ¥¬­µ¶·¸¬­¥œ‚’‚’••–µ¶·¸•–•‚’‚’¥¥¦µ¶·¸¥¦¥‚’‚’••–µ¶·¸•–•‚’‚’•¥Š‹µ¶·¸Š‹¥¦‚’‚’Ÿ¥¦•š›µ¶·¸š›••–Ÿ‚’‚’®¯¥ª«µ¶·¸ª«¥®¯‚’‚’•–Ÿ••¬­µ¶·¸¬­•–Ÿ•–‚’‚’®¯¥•–µ¶·¸•–¥®¯‚’‚’Ÿ¥¦•¥¦µ¶·¸¥¦••–Ÿ‚’‚’®¯•¥•–µ¶·¸•–¥¦®¯‚’‚’•¥¦µ¶·¸¥¦•‚’‚’¥Š‹µ¶·¸Š‹¥‚’‚’•š›µ¶·¸š›•‚’‚’¥ª«µ¶·¸ª«¥‚’‚’•¬­µ¶·¸¬­•‚’‚’Œ¥•–µ¶·¸•–¥Œ‚’‚’œ¥•¥¦µ¶·¸¥¦•¦œ‚’‚’ŒŒ¥•–µ¶·¸•–¥ŒŒ‚’‚’œœ•¥¦µ¶·¸¥¦•œœ‚’¢„„„„„„„„„‡µ¶·¸†„„„„„„„„„¡ˆ™“”“”“”“”“”—µ¶·¸—“”“”“”“”“”˜©‰‰‰‰‰‰‰‰‰‰§µ¶·¸§‰‰‰‰‰‰‰‰‰‰¨€€€€€€€€€€€€µ¶·¸€€€€€€€€€€€€ \ No newline at end of file diff --git a/src/data/maps/tiles/rock_club_entrance_cgb.bin b/src/data/maps/tiles/rock_club_entrance_cgb.bin deleted file mode 100644 index 82f471b0..00000000 Binary files a/src/data/maps/tiles/rock_club_entrance_cgb.bin and /dev/null differ diff --git a/src/data/maps/tiles/rock_medal.bin b/src/data/maps/tiles/rock_medal.bin deleted file mode 100644 index 1162d9fe..00000000 --- a/src/data/maps/tiles/rock_medal.bin +++ /dev/null @@ -1 +0,0 @@ -³´µ¼½¾ÃÄÅ \ No newline at end of file diff --git a/src/data/maps/tiles/science_club_cgb.bin b/src/data/maps/tiles/science_club_cgb.bin deleted file mode 100644 index b5309223..00000000 --- a/src/data/maps/tiles/science_club_cgb.bin +++ /dev/null @@ -1 +0,0 @@ -°Â±±±±±±±±±±±±±±Æ±±±±±±±±Æ²ÃÀ¨¨£”¨¨‰Š‹Œ‰Š‹ŒÃÀ‰Š‹Œ‰Š‹ŒÃÀÃÀ‚ƒ„¸¸™Ç›œ™Ç›œÃÀ™Ç›œ™Ç›œÃÀÃÀ‘’“¤¤©ª«¬©ª«¬ÃÀ©ª«¬©ª«¬ÃÀÃÀ ¡¡¢¤¤¹º»¼¹º»¼ÃÀ¹º»¼¹º»¼ÃÀÃÀ¤¤¤¤¤¤¤¤¤¤¤¤¤¤ÃÀ¤¤¤¤¤¤¤¤ÃÀÃÀ¤¤¤¤¤¤¤¤¤¤¤¤¤¤ÃÀ¤¤¤¤¤¤¤¤ÃÀÃÀ¤¤¤¤¤¤¤¤¤¤¤¤¤¤ÃÀ¤¤¤¤¤¤¤¤ÃÀÃÀ¤¤¤¤¤¤¤¤¤¤¤¤¤¤ÃÀ¤¤¤¤¤¤¤¤ÃÀÃÀ¤¤¤¤¤¤¤¤¤¤¤¤¤¤ÃÀ¤¤¤¤¤¤¤¤ÃÀÃÀ¤¤¤¤¤¤¤¤¤¤¤¤¤¤ÃÀ¤¤¤¤¤¤¤¤ÃÀÃÀ¤¤¤¤¤¤¤¤¤¤¤¤¤¤ÃÀ¤¤¤¤¤¤¤¤ÃÀÚ±±±±±´¤¤³±±±±±ÉĤ¤¤¤¤¤¤¤ÃÀÃÀ…†…†¨ˆ¤¤§¨¨¨¨¨¨ˆ¤¤¤¤¤¤¤¤ÃÀÃÀ•–•–¸˜¤¤·¸¸¸¸¸¸˜¤¤¤¤¤¤¤¤ÃÀÃÀ¥¦¥¦¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤ÃÀÃÀµ¶µ¶¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤ÃÀÃÀ¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤ÃÀÃÀ¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤ÃÀÃÀ¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤ÃÀÃÀ¤¤¤¤¤¤¤¤¤¤¤¤½½½ÃÀÃÀ¤¤¤¤¤¤¤¤¤¤¤¤Ÿ¾Ÿ¾Ÿ¾ÃÀÃÀ¤¤¤¤¤¤¤¤¤¤¤¤­®¯¿­®¯¿­®¯¿ÃÀÃÀ¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤ÃÀÃÀ¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤ÃÀÃÀ¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤ÃÀÃÀ¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤ÃÀÃÀ¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤¤ÃÀÁű±±±±±±±±´ÊËÌͳ±±±±±±±±±ÉĨ¨¨¨¨¨¨¨¨¨¨‡ÎÏĞч¨¨¨¨¨¨¨¨¨¨ˆ¸¸¸¸¸¸¸¸¸¸¸—ÎÏĞÑ—¸¸¸¸¸¸¸¸¸¸˜€€€€€€€€€€€€ÎÏĞÑ€€€€€€€€€€€€ \ No newline at end of file diff --git a/src/data/maps/tiles/science_club_entrance_cgb.bin b/src/data/maps/tiles/science_club_entrance_cgb.bin deleted file mode 100644 index e5f661f5..00000000 Binary files a/src/data/maps/tiles/science_club_entrance_cgb.bin and /dev/null differ diff --git a/src/data/maps/tiles/science_medal.bin b/src/data/maps/tiles/science_medal.bin deleted file mode 100644 index 225d66c6..00000000 --- a/src/data/maps/tiles/science_medal.bin +++ /dev/null @@ -1 +0,0 @@ -ƒ„…“”•£¤¥ \ No newline at end of file diff --git a/src/data/maps/tiles/scyther_intro_cgb.bin b/src/data/maps/tiles/scyther_intro_cgb.bin deleted file mode 100644 index d4f72406..00000000 Binary files a/src/data/maps/tiles/scyther_intro_cgb.bin and /dev/null differ diff --git a/src/data/maps/tiles/solid_tiles_1.bin b/src/data/maps/tiles/solid_tiles_1.bin deleted file mode 100644 index ba3d0b2c..00000000 Binary files a/src/data/maps/tiles/solid_tiles_1.bin and /dev/null differ diff --git a/src/data/maps/tiles/solid_tiles_2.bin b/src/data/maps/tiles/solid_tiles_2.bin deleted file mode 100644 index dd72a49a..00000000 Binary files a/src/data/maps/tiles/solid_tiles_2.bin and /dev/null differ diff --git a/src/data/maps/tiles/solid_tiles_3.bin b/src/data/maps/tiles/solid_tiles_3.bin deleted file mode 100644 index ad685b1a..00000000 Binary files a/src/data/maps/tiles/solid_tiles_3.bin and /dev/null differ diff --git a/src/data/maps/tiles/solid_tiles_4.bin b/src/data/maps/tiles/solid_tiles_4.bin deleted file mode 100644 index 1c2409d3..00000000 --- a/src/data/maps/tiles/solid_tiles_4.bin +++ /dev/null @@ -1,5 +0,0 @@ -üüüüüüüü - ıııııııı - şşşşşşşş - ÿÿÿÿÿÿÿÿ -  \ No newline at end of file diff --git a/src/data/maps/tiles/title_screen_cgb.bin b/src/data/maps/tiles/title_screen_cgb.bin deleted file mode 100644 index d1ac30e5..00000000 Binary files a/src/data/maps/tiles/title_screen_cgb.bin and /dev/null differ diff --git a/src/data/maps/tiles/water_club_cgb.bin b/src/data/maps/tiles/water_club_cgb.bin deleted file mode 100644 index 11a52e8b..00000000 Binary files a/src/data/maps/tiles/water_club_cgb.bin and /dev/null differ diff --git a/src/data/maps/tiles/water_club_entrance_cgb.bin b/src/data/maps/tiles/water_club_entrance_cgb.bin deleted file mode 100644 index 63f45f3e..00000000 Binary files a/src/data/maps/tiles/water_club_entrance_cgb.bin and /dev/null differ diff --git a/src/data/maps/tiles/water_medal.bin b/src/data/maps/tiles/water_medal.bin deleted file mode 100644 index b5947d91..00000000 --- a/src/data/maps/tiles/water_medal.bin +++ /dev/null @@ -1 +0,0 @@ -‰Š‹™š›©ª« \ No newline at end of file diff --git a/src/gfx.asm b/src/gfx.asm index 85d732be..475403c7 100644 --- a/src/gfx.asm +++ b/src/gfx.asm @@ -44,499 +44,434 @@ INCBIN "gfx/duel/box_messages.2bpp" SECTION "Gfx 3", ROMX WaterClubTilemap:: - db $1c ; width - db $20 ; height + INCBIN "data/maps/tiles/dimensions/water_club.dimensions" 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" WaterClubCGBTilemap:: - db $1c ; width - db $20 ; height + INCBIN "data/maps/tiles/dimensions/water_club.dimensions" dw WaterClubCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/water_club_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/water_club.bgmap.lz" WaterClubCGBPermissions: - INCBIN "data/maps/permissions/water_club_cgb.bin.lz" + INCBIN "data/maps/permissions/water_club.bin.lz" LightningClubTilemap:: - db $1c ; width - db $20 ; height + INCBIN "data/maps/tiles/dimensions/lightning_club.dimensions" 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" LightningClubCGBTilemap:: - db $1c ; width - db $20 ; height + INCBIN "data/maps/tiles/dimensions/lightning_club.dimensions" dw LightningClubCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/lightning_club_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/lightning_club.bgmap.lz" LightningClubCGBPermissions: - INCBIN "data/maps/permissions/lightning_club_cgb.bin.lz" + INCBIN "data/maps/permissions/lightning_club.bin.lz" GrassClubTilemap:: - db $1c ; width - db $20 ; height + INCBIN "data/maps/tiles/dimensions/grass_club.dimensions" 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" GrassClubCGBTilemap:: - db $1c ; width - db $20 ; height + INCBIN "data/maps/tiles/dimensions/grass_club.dimensions" dw GrassClubCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/grass_club_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/grass_club.bgmap.lz" GrassClubCGBPermissions: - INCBIN "data/maps/permissions/grass_club_cgb.bin.lz" + INCBIN "data/maps/permissions/grass_club.bin.lz" PsychicClubTilemap:: - db $1c ; width - db $1c ; height + INCBIN "data/maps/tiles/dimensions/psychic_club.dimensions" 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" PsychicClubCGBTilemap:: - db $1c ; width - db $1c ; height + INCBIN "data/maps/tiles/dimensions/psychic_club.dimensions" dw PsychicClubCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/psychic_club_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/psychic_club.bgmap.lz" PsychicClubCGBPermissions: - INCBIN "data/maps/permissions/psychic_club_cgb.bin.lz" + INCBIN "data/maps/permissions/psychic_club.bin.lz" ScienceClubTilemap:: - db $1c ; width - db $20 ; height + INCBIN "data/maps/tiles/dimensions/science_club.dimensions" 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" ScienceClubCGBTilemap:: - db $1c ; width - db $20 ; height + INCBIN "data/maps/tiles/dimensions/science_club.dimensions" dw ScienceClubCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/science_club_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/science_club.bgmap.lz" ScienceClubCGBPermissions: - INCBIN "data/maps/permissions/science_club_cgb.bin.lz" + INCBIN "data/maps/permissions/science_club.bin.lz" FireClubTilemap:: - db $1c ; width - db $20 ; height + INCBIN "data/maps/tiles/dimensions/fire_club.dimensions" 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" FireClubCGBTilemap:: - db $1c ; width - db $20 ; height + INCBIN "data/maps/tiles/dimensions/fire_club.dimensions" dw FireClubCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/fire_club_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/fire_club.bgmap.lz" FireClubCGBPermissions: - INCBIN "data/maps/permissions/fire_club_cgb.bin.lz" + INCBIN "data/maps/permissions/fire_club.bin.lz" ChallengeHallTilemap:: - db $20 ; width - db $20 ; height + INCBIN "data/maps/tiles/dimensions/challenge_hall.dimensions" 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" ChallengeHallCGBTilemap:: - db $20 ; width - db $20 ; height + INCBIN "data/maps/tiles/dimensions/challenge_hall.dimensions" dw ChallengeHallCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/challenge_hall_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/challenge_hall.bgmap.lz" ChallengeHallCGBPermissions: - INCBIN "data/maps/permissions/challenge_hall_cgb.bin.lz" + INCBIN "data/maps/permissions/challenge_hall.bin.lz" PokemonDomeEntranceTilemap:: - db $20 ; width - db $12 ; height + INCBIN "data/maps/tiles/dimensions/pokemon_dome_entrance.dimensions" 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" PokemonDomeEntranceCGBTilemap:: - db $20 ; width - db $12 ; height + INCBIN "data/maps/tiles/dimensions/pokemon_dome_entrance.dimensions" dw PokemonDomeEntranceCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/pokemon_dome_entrance_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/pokemon_dome_entrance.bgmap.lz" PokemonDomeEntranceCGBPermissions: - INCBIN "data/maps/permissions/pokemon_dome_entrance_cgb.bin.lz" + INCBIN "data/maps/permissions/pokemon_dome_entrance.bin.lz" PokemonDomeTilemap:: - db $20 ; width - db $20 ; height + INCBIN "data/maps/tiles/dimensions/pokemon_dome.dimensions" 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" PokemonDomeCGBTilemap:: - db $20 ; width - db $20 ; height + INCBIN "data/maps/tiles/dimensions/pokemon_dome.dimensions" dw PokemonDomeCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/pokemon_dome_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/pokemon_dome.bgmap.lz" PokemonDomeCGBPermissions: - INCBIN "data/maps/permissions/pokemon_dome_cgb.bin.lz" + INCBIN "data/maps/permissions/pokemon_dome.bin.lz" HallOfHonorTilemap:: - db $18 ; width - db $1a ; height + INCBIN "data/maps/tiles/dimensions/hall_of_honor.dimensions" 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" HallOfHonorCGBTilemap:: - db $18 ; width - db $1a ; height + INCBIN "data/maps/tiles/dimensions/hall_of_honor.dimensions" dw HallOfHonorCGBPermissions db TRUE ; cgb mode - INCBIN "data/maps/tiles/hall_of_honor_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/hall_of_honor.bgmap.lz" HallOfHonorCGBPermissions: - INCBIN "data/maps/permissions/hall_of_honor_cgb.bin.lz" + INCBIN "data/maps/permissions/hall_of_honor.bin.lz" CardPopCGBTilemap:: - db $14 ; width - db $12 ; height + INCBIN "data/maps/tiles/dimensions/card_pop.dimensions" dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/card_pop_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/card_pop.bgmap.lz" CardPopTilemap:: - db $14 ; width - db $12 ; height + INCBIN "data/maps/tiles/dimensions/card_pop.dimensions" dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/card_pop.bin.lz" + INCBIN "data/maps/tiles/gb/card_pop.bgmap.lz" ScienceMedalTilemap:: - db $03 ; width - db $03 ; height + INCBIN "data/maps/tiles/dimensions/science_medal.dimensions" dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/science_medal.bin.lz" + INCBIN "data/maps/tiles/cgb/science_medal.bgmap.lz" FireMedalTilemap:: - db $03 ; width - db $03 ; height + INCBIN "data/maps/tiles/dimensions/fire_medal.dimensions" dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/fire_medal.bin.lz" + INCBIN "data/maps/tiles/cgb/fire_medal.bgmap.lz" WaterMedalTilemap:: - db $03 ; width - db $03 ; height + INCBIN "data/maps/tiles/dimensions/water_medal.dimensions" dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/water_medal.bin.lz" + INCBIN "data/maps/tiles/cgb/water_medal.bgmap.lz" LightningMedalTilemap:: - db $03 ; width - db $03 ; height + INCBIN "data/maps/tiles/dimensions/lightning_medal.dimensions" dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/lightning_medal.bin.lz" + INCBIN "data/maps/tiles/cgb/lightning_medal.bgmap.lz" FightingMedalTilemap:: - db $03 ; width - db $03 ; height + INCBIN "data/maps/tiles/dimensions/fighting_medal.dimensions" dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/fighting_medal.bin.lz" + INCBIN "data/maps/tiles/cgb/fighting_medal.bgmap.lz" RockMedalTilemap:: - db $03 ; width - db $03 ; height + INCBIN "data/maps/tiles/dimensions/rock_medal.dimensions" dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/rock_medal.bin.lz" + INCBIN "data/maps/tiles/cgb/rock_medal.bgmap.lz" PsychicMedalTilemap:: - db $03 ; width - db $03 ; height + INCBIN "data/maps/tiles/dimensions/psychic_medal.dimensions" dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/psychic_medal.bin.lz" + INCBIN "data/maps/tiles/cgb/psychic_medal.bgmap.lz" GameBoyLinkCGBTilemap:: - db $14 ; width - db $12 ; height + INCBIN "data/maps/tiles/dimensions/gameboy_link.dimensions" dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/gameboy_link_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/gameboy_link.bgmap.lz" GameBoyLinkTilemap:: - db $14 ; width - db $12 ; height + INCBIN "data/maps/tiles/dimensions/gameboy_link.dimensions" 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 + INCBIN "data/maps/tiles/dimensions/gameboy_link_connecting.dimensions" dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/gameboy_link_connecting_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/gameboy_link_connecting.bgmap.lz" GameBoyLinkConnectingTilemap:: - db $14 ; width - db $12 ; height + INCBIN "data/maps/tiles/dimensions/gameboy_link_connecting.dimensions" 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 + INCBIN "data/maps/tiles/dimensions/gameboy_printer.dimensions" dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/gameboy_printer_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/gameboy_printer.bgmap.lz" GameBoyPrinterTilemap:: - db $14 ; width - db $12 ; height + INCBIN "data/maps/tiles/dimensions/gameboy_printer.dimensions" 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 + INCBIN "data/maps/tiles/dimensions/colosseum.dimensions" 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 + INCBIN "data/maps/tiles/dimensions/colosseum.dimensions" dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/colosseum_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/colosseum.bgmap.lz" EvolutionTilemap:: - db $08 ; width - db $0c ; height + INCBIN "data/maps/tiles/dimensions/evolution.dimensions" 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 + INCBIN "data/maps/tiles/dimensions/evolution.dimensions" dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/evolution_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/evolution.bgmap.lz" MysteryTilemap:: - db $08 ; width - db $0c ; height + INCBIN "data/maps/tiles/dimensions/mystery.dimensions" 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 + INCBIN "data/maps/tiles/dimensions/mystery.dimensions" dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/mystery_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/mystery.bgmap.lz" LaboratoryTilemap:: - db $08 ; width - db $0c ; height + INCBIN "data/maps/tiles/dimensions/laboratory.dimensions" 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 + INCBIN "data/maps/tiles/dimensions/laboratory.dimensions" dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/laboratory_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/laboratory.bgmap.lz" CharizardIntroTilemap:: - db $08 ; width - db $0c ; height + INCBIN "data/maps/tiles/dimensions/charizard_intro.dimensions" 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 + INCBIN "data/maps/tiles/dimensions/charizard_intro.dimensions" dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/charizard_intro_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/charizard_intro.bgmap.lz" ScytherIntroTilemap:: - db $08 ; width - db $0c ; height + INCBIN "data/maps/tiles/dimensions/scyther_intro.dimensions" 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 + INCBIN "data/maps/tiles/dimensions/scyther_intro.dimensions" dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/scyther_intro_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/scyther_intro.bgmap.lz" AerodactylIntroTilemap:: - db $08 ; width - db $0c ; height + INCBIN "data/maps/tiles/dimensions/aerodactyl_intro.dimensions" 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 + INCBIN "data/maps/tiles/dimensions/aerodactyl_intro.dimensions" dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/aerodactyl_intro_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/aerodactyl_intro.bgmap.lz" JapaneseTitleScreenTilemap:: - db $14 ; width - db $12 ; height + INCBIN "data/maps/tiles/dimensions/japanese_title_screen.dimensions" 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 + INCBIN "data/maps/tiles/dimensions/japanese_title_screen.dimensions" dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/japanese_title_screen_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/japanese_title_screen.bgmap.lz" SolidTiles1Tilemap:: - db $14 ; width - db $12 ; height + INCBIN "data/maps/tiles/dimensions/solid_tiles_1.dimensions" dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/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/dimensions/solid_tiles_2.dimensions" dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/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/dimensions/solid_tiles_3.dimensions" dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/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/dimensions/japanese_title_screen_2.dimensions" 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 + INCBIN "data/maps/tiles/dimensions/japanese_title_screen_2.dimensions" 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.bgmap.lz" SolidTiles4Tilemap:: - db $08 ; width - db $04 ; height + INCBIN "data/maps/tiles/dimensions/solid_tiles_4.dimensions" dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/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/dimensions/player.dimensions" 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 + INCBIN "data/maps/tiles/dimensions/opponent.dimensions" 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 + INCBIN "data/maps/tiles/dimensions/title_screen.dimensions" 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 + INCBIN "data/maps/tiles/dimensions/title_screen.dimensions" dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/title_screen_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/title_screen.bgmap.lz" CopyrightTilemap:: - db $14 ; width - db $12 ; height + INCBIN "data/maps/tiles/dimensions/copyright.dimensions" 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 + INCBIN "data/maps/tiles/dimensions/copyright.dimensions" dw NULL db TRUE ; cgb mode - INCBIN "data/maps/tiles/copyright_cgb.bin.lz" + INCBIN "data/maps/tiles/cgb/copyright.bgmap.lz" NintendoTilemap:: - db $14 ; width - db $12 ; height + INCBIN "data/maps/tiles/dimensions/nintendo.dimensions" 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 + INCBIN "data/maps/tiles/dimensions/companies.dimensions" dw NULL db FALSE ; cgb mode - INCBIN "data/maps/tiles/companies.bin.lz" + INCBIN "data/maps/tiles/gb/companies.bin.lz" IshiharaTilesetGfx:: dw 77 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..2b7f7d6b --- /dev/null +++ b/tools/bgmap.c @@ -0,0 +1,105 @@ +#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 *dimFilename) +{ + struct Dimensions dimensions; + FILE *fd = fopen(dimFilename, "rb"); + if (fd != NULL) + { + dimensions.width = fgetc(fd); + dimensions.height = fgetc(fd); + fclose(fd); + } + return dimensions; +} + +int main(int argc, char *argv[]) +{ + const char *programName = argv[0]; + + if (argc != 4) + { + usage(programName); + return 1; + } + + const char *inFilename = argv[1]; + const char *dimFilename = argv[2]; + const char *outFilename = argv[3]; + + const struct Dimensions dimensions = getDimensions(dimFilename); + + 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); + + return 0; +}