Merge branch 'master' of github.com:mid-kid/pokepicross

14 files changed, 23 insertions, 16 deletions

diff --git a/gfx/game_select/game_select.bin.xor b/gfx/game_select/game_select.bin.xor
new file mode 100644
index 0000000..7f3803d
--- /dev/null
+++ b/gfx/game_select/game_select.bin.xor
diff --git a/gfx/game_select/game_select.png b/gfx/game_select/game_select.png
new file mode 100644
index 0000000..3b1b189
--- /dev/null
+++ b/gfx/game_select/game_select.png
diff --git a/gfx/game_select/pokemon_picross.attrmap b/gfx/game_select/pokemon_picross.attrmap
new file mode 100644
index 0000000..5861905
--- /dev/null
+++ b/gfx/game_select/pokemon_picross.attrmap
diff --git a/gfx/game_select/pokemon_picross.tilemap b/gfx/game_select/pokemon_picross.tilemap
new file mode 100644
index 0000000..63aa168
--- /dev/null
+++ b/gfx/game_select/pokemon_picross.tilemap
diff --git a/gfx/game_select/pokemon_picross.tilemap_attrmap.xor b/gfx/game_select/pokemon_picross.tilemap_attrmap.xor
new file mode 100644
index 0000000..e36d310
--- /dev/null
+++ b/gfx/game_select/pokemon_picross.tilemap_attrmap.xor
diff --git a/gfx/game_select/safari_picross.attrmap b/gfx/game_select/safari_picross.attrmap
new file mode 100644
index 0000000..64ee47a
--- /dev/null
+++ b/gfx/game_select/safari_picross.attrmap
@@ -0,0 +1 @@
+































































































































































































\ No newline at end of file
diff --git a/gfx/game_select/safari_picross.tilemap b/gfx/game_select/safari_picross.tilemap
new file mode 100644
index 0000000..8c5ef0e
--- /dev/null
+++ b/gfx/game_select/safari_picross.tilemap
@@ -0,0 +1,2 @@
+���ف�����������ڀ��oooooooooooo���ی�����������܀��oooooooooooo��������������������oooooooooooo��������������������oooooooooooo�HIJi
+
���������oooooooooooo�XYZy���������oooooooooooo�()*+,-./�����������oooooooooooo�89:;<=>?�����������oooooooooooo�HIJKLMNO�����������oooooooooooo�XYZ[\]^_݀���������oooooooooooo�klmno���߀���������oooooooooooo�{|}~��辀���������oooooooooooo���������€ù���ĀŹoooooooooooo���������ހǹ���Ȁɹoooooooooooo���������������Ѐѹoooooooooooo�����������������ҹ�oooooooooooo����������������ع��oooooooooooo��������������������oooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo
\ No newline at end of file
diff --git a/gfx/game_select/safari_picross.tilemap_attrmap.xor b/gfx/game_select/safari_picross.tilemap_attrmap.xor
new file mode 100644
index 0000000..c2cd4c1
--- /dev/null
+++ b/gfx/game_select/safari_picross.tilemap_attrmap.xor
diff --git a/gfx/gfx.mk b/gfx/gfx.mk
index ac7c62b..df4c26e 100644
--- a/gfx/gfx.mk
+++ b/gfx/gfx.mk
@@ -9,12 +9,11 @@ RGBGFXFLAGS :=
 $(dir_build)/%.bin: %.png | $$(dir $$@)
 	$(RGBGFX) $(RGBGFXFLAGS) -o $@ $<
 
-$(dir_build)/gfx/sprites/%.bin: RGBGFXFLAGS = -h
-
-# data_select.tilemap_attrmap.xor decompresses to data_select.tilemap concatenated with data_select.attrmap
-$(dir_build)/gfx/data_select/data_select.tilemap_attrmap: gfx/data_select/data_select.tilemap gfx/data_select/data_select.attrmap | $$(dir $$@)
+$(dir_build)/%.tilemap_attrmap: %.tilemap %.attrmap | $$(dir $$@)
 	cat $^ > $@
 
+$(dir_build)/gfx/sprites/%.bin: RGBGFXFLAGS = -h
+
 # data_select.bin.xor decompresses to 2bpp-encoded data_select.png with an extra byte $33 (ASCII "3") appended
 $(dir_build)/gfx/data_select/data_select.bin: gfx/data_select/data_select.bin.png | $$(dir $$@)
 	$(RGBGFX) $(RGBGFXFLAGS) -o $@ $<
diff --git a/source/bank_00.asm b/source/bank_00.asm
index 9cbddd7..1e7cc35 100644
--- a/source/bank_00.asm
+++ b/source/bank_00.asm
@@ -1424,10 +1424,7 @@ text_draw_char:
     ld d, [hl]
     ld hl, gfx_text_chars_bw
     add hl, de
-    ld a, l
-    ld [w_vwf_char_addr + 0], a
-    ld a, h
-    ld [w_vwf_char_addr + 1], a
+    ld16 w_vwf_char_addr, hl
     ld a, BANK(gfx_text_chars_bw)
     ld [w_vwf_char_bank], a
 
diff --git a/source/bank_02.asm b/source/bank_02.asm
index a15b070..7b25e93 100644
--- a/source/bank_02.asm
+++ b/source/bank_02.asm
@@ -72,10 +72,7 @@ textbox_print_char::
 .done
     ; Back up string pointer
     pop hl
-    ld a, l
-    ld [w_textbox_cur_string + 0], a
-    ld a, h
-    ld [w_textbox_cur_string + 1], a
+    ld16 w_textbox_cur_string, hl
 
     ; Check if the next character is a terminator
     ld a, [hl+]
@@ -102,10 +99,7 @@ textbox_draw_char::
     ld d, [hl]
     ld hl, gfx_text_chars_dark
     add hl, de
-    ld a, l
-    ld [w_vwf_char_addr + 0], a
-    ld a, h
-    ld [w_vwf_char_addr + 1], a
+    ld16 w_vwf_char_addr, hl
     ld a, BANK(gfx_text_chars_dark)
     ld [w_vwf_char_bank], a
 
diff --git a/source/bank_76.asm b/source/bank_76.asm
index e4dbb0f..8775628 100644
--- a/source/bank_76.asm
+++ b/source/bank_76.asm
@@ -25,3 +25,8 @@ INCBIN "gfx/levels/lv_7_cycling_road_sgb.bin"
 gfx_lv_7_cycling_road_duplicate::
 INCBIN "gfx/levels/lv_7_cycling_road_unused.bin"
 .end::
+
+SECTION "compressed_tilemap_attrmap_safari_picross", ROMX[$7c35], BANK[$76]
+compressed_tilemap_attrmap_safari_picross::
+INCBIN "gfx/game_select/safari_picross.tilemap_attrmap.xor"
+.end::
diff --git a/source/bank_79.asm b/source/bank_79.asm
new file mode 100644
index 0000000..457da66
--- /dev/null
+++ b/source/bank_79.asm
@@ -0,0 +1,4 @@
+SECTION "compressed_gfx_game_select", ROMX[$6ba1], BANK[$79]
+compressed_gfx_game_select::
+INCBIN "gfx/game_select/game_select.bin.xor"
+.end::
diff --git a/source/bank_7a.asm b/source/bank_7a.asm
index c743f69..09e13b8 100644
--- a/source/bank_7a.asm
+++ b/source/bank_7a.asm
@@ -7,3 +7,8 @@ INCBIN "gfx/title/title.tilemap"
 attrmap_title::
 INCBIN "gfx/title/title.attrmap"
 .end::
+
+SECTION "compressed_tilemap_attrmap_pokemon_picross", ROMX[$7d18], BANK[$7a]
+compressed_tilemap_attrmap_pokemon_picross::
+INCBIN "gfx/game_select/pokemon_picross.tilemap_attrmap.xor"
+.end::