Merge pull request #140 from ElectroDeoxys/bgmap

Bgmap
pret · Nov 11, 2023 · 0677ed2 · 0677ed2
2 parents cf85e77 + 5334320
commit 0677ed2
Show file tree

Hide file tree

Showing 376 changed files with 447 additions and 378 deletions.
diff --git 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
@@ -22,6 +22,9 @@
 *.2bpp
 *.pal
 
+# intermediate BG map files
+*.bgmap
+
 # compressed data
 *.lz
 

diff --git 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
diff --git a/src/data/maps/permissions/challenge_hall_cgb.bin.lz.match b/src/data/maps/permissions/challenge_hall_cgb.bin.lz.match
diff --git a/src/data/maps/permissions/challenge_hall_entrance_cgb.bin b/src/data/maps/permissions/challenge_hall_entrance_cgb.bin
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
diff --git a/src/data/maps/permissions/challenge_machine_map_event_cgb.bin b/src/data/maps/permissions/challenge_machine_map_event_cgb.bin
diff --git a/src/data/maps/permissions/club_lobby_cgb.bin b/src/data/maps/permissions/club_lobby_cgb.bin
diff --git a/src/data/maps/permissions/club_lobby_cgb.bin.lz.match b/src/data/maps/permissions/club_lobby_cgb.bin.lz.match
diff --git a/src/data/maps/permissions/deck_machine_map_event_cgb.bin b/src/data/maps/permissions/deck_machine_map_event_cgb.bin
diff --git a/src/data/maps/permissions/deck_machine_room_cgb.bin b/src/data/maps/permissions/deck_machine_room_cgb.bin
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
diff --git a/src/data/maps/permissions/fighting_club_cgb.bin b/src/data/maps/permissions/fighting_club_cgb.bin
diff --git a/src/data/maps/permissions/fighting_club_cgb.bin.lz.match b/src/data/maps/permissions/fighting_club_cgb.bin.lz.match
diff --git a/src/data/maps/permissions/fighting_club_entrance_cgb.bin b/src/data/maps/permissions/fighting_club_entrance_cgb.bin
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
diff --git a/src/data/maps/permissions/fire_club_cgb.bin b/src/data/maps/permissions/fire_club_cgb.bin
diff --git a/src/data/maps/permissions/fire_club_cgb.bin.lz.match b/src/data/maps/permissions/fire_club_cgb.bin.lz.match
diff --git a/src/data/maps/permissions/fire_club_entrance_cgb.bin b/src/data/maps/permissions/fire_club_entrance_cgb.bin
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
diff --git a/src/data/maps/permissions/grass_club_cgb.bin b/src/data/maps/permissions/grass_club_cgb.bin
diff --git a/src/data/maps/permissions/grass_club_cgb.bin.lz.match b/src/data/maps/permissions/grass_club_cgb.bin.lz.match
diff --git a/src/data/maps/permissions/grass_club_entrance_cgb.bin b/src/data/maps/permissions/grass_club_entrance_cgb.bin
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
diff --git a/src/data/maps/permissions/hall_of_honor_cgb.bin b/src/data/maps/permissions/hall_of_honor_cgb.bin
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
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
diff --git a/src/data/maps/permissions/ishihara_cgb.bin b/src/data/maps/permissions/ishihara_cgb.bin
diff --git a/src/data/maps/permissions/ishihara_cgb.bin.lz.match b/src/data/maps/permissions/ishihara_cgb.bin.lz.match
diff --git a/src/data/maps/permissions/lightning_club_cgb.bin b/src/data/maps/permissions/lightning_club_cgb.bin
diff --git a/src/data/maps/permissions/lightning_club_cgb.bin.lz.match b/src/data/maps/permissions/lightning_club_cgb.bin.lz.match
diff --git a/src/data/maps/permissions/lightning_club_entrance_cgb.bin b/src/data/maps/permissions/lightning_club_entrance_cgb.bin
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
diff --git a/src/data/maps/permissions/mason_laboratory_cgb.bin b/src/data/maps/permissions/mason_laboratory_cgb.bin
diff --git a/src/data/maps/permissions/mason_laboratory_cgb.bin.lz.match b/src/data/maps/permissions/mason_laboratory_cgb.bin.lz.match
diff --git a/src/data/maps/permissions/pokemon_dome_cgb.bin b/src/data/maps/permissions/pokemon_dome_cgb.bin
diff --git a/src/data/maps/permissions/pokemon_dome_cgb.bin.lz.match b/src/data/maps/permissions/pokemon_dome_cgb.bin.lz.match
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
diff --git a/src/data/maps/permissions/pokemon_dome_entrance_cgb.bin b/src/data/maps/permissions/pokemon_dome_entrance_cgb.bin
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
diff --git a/src/data/maps/permissions/psychic_club_cgb.bin b/src/data/maps/permissions/psychic_club_cgb.bin
diff --git a/src/data/maps/permissions/psychic_club_cgb.bin.lz.match b/src/data/maps/permissions/psychic_club_cgb.bin.lz.match
diff --git a/src/data/maps/permissions/psychic_club_entrance_cgb.bin b/src/data/maps/permissions/psychic_club_entrance_cgb.bin
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
diff --git a/src/data/maps/permissions/rock_club_cgb.bin b/src/data/maps/permissions/rock_club_cgb.bin
diff --git a/src/data/maps/permissions/rock_club_cgb.bin.lz.match b/src/data/maps/permissions/rock_club_cgb.bin.lz.match
diff --git a/src/data/maps/permissions/rock_club_entrance_cgb.bin b/src/data/maps/permissions/rock_club_entrance_cgb.bin
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
diff --git a/src/data/maps/permissions/science_club_cgb.bin b/src/data/maps/permissions/science_club_cgb.bin
diff --git a/src/data/maps/permissions/science_club_cgb.bin.lz.match b/src/data/maps/permissions/science_club_cgb.bin.lz.match
diff --git a/src/data/maps/permissions/science_club_entrance_cgb.bin b/src/data/maps/permissions/science_club_entrance_cgb.bin
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
diff --git a/src/data/maps/permissions/water_club_cgb.bin b/src/data/maps/permissions/water_club_cgb.bin
diff --git a/src/data/maps/permissions/water_club_cgb.bin.lz.match b/src/data/maps/permissions/water_club_cgb.bin.lz.match
diff --git a/src/data/maps/permissions/water_club_entrance_cgb.bin b/src/data/maps/permissions/water_club_entrance_cgb.bin
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
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,6 +22,9 @@ @@
     *.2bpp
     *.pal
+    # intermediate BG map files
+    *.bgmap
     # compressed data
     *.lz
@@ Expand Down @@