diff options
| -rw-r--r-- | Expand-tilesets-from-192-to-255-tiles.md | 48 |
1 files changed, 20 insertions, 28 deletions
diff --git a/Expand-tilesets-from-192-to-255-tiles.md b/Expand-tilesets-from-192-to-255-tiles.md index 6f76166..1ed58e7 100644 --- a/Expand-tilesets-from-192-to-255-tiles.md +++ b/Expand-tilesets-from-192-to-255-tiles.md @@ -189,21 +189,21 @@ Edit [engine/gfx/load_font.asm](../blob/master/engine/gfx/load_font.asm): ld de, Font ld hl, vTiles1 lb bc, BANK(Font), 32 ; "A" to "]" - call Get1bpp_2 + call Get1bppViaHDMA ld de, Font + 32 * LEN_1BPP_TILE ld hl, vTiles1 tile $20 - lb bc, BANK(Font), 32 ; "a" to $bf + lb bc, BANK(Font), 26 ; "a" to "z" (skip "┌" to "┘") - call Get1bpp_2 + call Get1bppViaHDMA ld de, Font + 64 * LEN_1BPP_TILE ld hl, vTiles1 tile $40 - lb bc, BANK(Font), 32 ; "Ä" to "←" + lb bc, BANK(Font), 32 ; $c0 to "←" - call Get1bpp_2 + call Get1bppViaHDMA ld de, Font + 96 * LEN_1BPP_TILE ld hl, vTiles1 tile $60 lb bc, BANK(Font), 32 ; "'" to "9" - call Get1bpp_2 + call Get1bppViaHDMA ret _LoadFontsExtra1:: @@ -242,15 +242,15 @@ And edit [mobile/mobile_41.asm](../blob/master/mobile/mobile_41.asm): - ld hl, vTiles2 tile "▲" ; $61 - lb bc, BANK(FontsExtra2_UpArrowGFX), 1 - call Get2bpp - ld de, GFX_106514 + ld de, MobileDialingFrameGFX - ld hl, vTiles2 tile "☎" ; $62 + ld hl, vTiles2 tile $62 ld c, 9 - ld b, BANK(GFX_106514) + ld b, BANK(MobileDialingFrameGFX) call Get2bpp ld de, $40b0 ld hl, vTiles2 tile $6b - ld b, $f ; XXX no graphics at 0f:40b0 + ld b, $0f ; no graphics at 0f:40b0; JP leftover??? call Get2bpp farcall LoadFrame ret @@ -321,7 +321,7 @@ Edit [engine/events/magikarp.asm](../blob/master/engine/events/magikarp.asm): And edit [engine/events/map_name_sign.asm](../blob/master/engine/events/map_name_sign.asm): ```diff - ReturnFromMapSetupScript:: +InitMapNameSign:: ... ; Display for 60 frames @@ -363,19 +363,12 @@ Edit [home/map.asm](../blob/master/home/map.asm). ldh a, [rVBK] push af - ld a, $1 - ldh [rVBK], a - - ... - - ldh a, [rVBK] - push af - ld a, $1 + ld a, BANK(vTiles5) ldh [rVBK], a - ld hl, wDecompressScratch + $60 tiles + ld hl, wDecompressScratch + $80 tiles - ld de, vTiles2 + ld de, vTiles5 - ld bc, $60 tiles + ld bc, $80 tiles call CopyBytes @@ -446,7 +439,7 @@ The `ROOF` values are for tiles $60–$7E, which can be used for maps, and the ` By default, sprites will disappear when they're behind (on top of) tiles $60–$6F or $D0–$FF, as well as the regular font tiles. This is so they won't appear on top of textboxes. This is caused by [engine/overworld/map_objects.asm](../blob/master/engine/overworld/map_objects.asm): ```asm -Function56cd: +CheckObjectCoveredByTextbox: ... ld c, a push bc @@ -503,14 +496,13 @@ Edit [home/text.asm](../blob/master/home/text.asm): - cp "パ" - jr nc, .handakuten - --.dakuten - cp FIRST_HIRAGANA_DAKUTEN_CHAR - jr nc, .hiragana_dakuten - add "カ" - "ガ" -- jr .katakana_dakuten +- jr .place_dakuten -.hiragana_dakuten - add "か" - "が" --.katakana_dakuten +-.place_dakuten - ld b, "ﾞ" ; dakuten - call Diacritic - jr .place @@ -519,10 +511,10 @@ Edit [home/text.asm](../blob/master/home/text.asm): - cp "ぱ" - jr nc, .hiragana_handakuten - add "ハ" - "パ" -- jr .katakana_handakuten +- jr .place_handakuten -.hiragana_handakuten - add "は" - "ぱ" --.katakana_handakuten +-.place_handakuten - ld b, "ﾟ" ; handakuten - call Diacritic - @@ -543,26 +535,26 @@ Edit [engine/gfx/load_font.asm](../blob/master/engine/gfx/load_font.asm) again: LoadFrame: ld a, [wTextboxFrame] maskbits NUM_FRAMES - ld bc, 6 * LEN_1BPP_TILE + ld bc, TEXTBOX_FRAME_TILES * LEN_1BPP_TILE ld hl, Frames call AddNTimes ld d, h ld e, l - ld hl, vTiles2 tile "┌" ; $79 + ld hl, vTiles0 tile "┌" ; $ba - lb bc, BANK(Frames), 6 ; "┌" to "┘" - call Get1bpp_2 + lb bc, BANK(Frames), TEXTBOX_FRAME_TILES ; "┌" to "┘" + call Get1bppViaHDMA ld hl, vTiles2 tile " " ; $7f ld de, TextboxSpaceGFX lb bc, BANK(TextboxSpaceGFX), 1 - call Get1bpp_2 + call Get1bppViaHDMA ret ``` Edit [mobile/mobile_41.asm](../blob/master/mobile/mobile_41.asm) again: ```diff - Function10649b: + Function10649b: ; unreferenced ld a, [wTextboxFrame] maskbits NUM_FRAMES ld bc, 6 * LEN_1BPP_TILE |