From 698c0cf933fb934ed1ece055f5edbdb9e66ac22e Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Tue, 20 Jun 2017 21:30:42 -0700 Subject: Dump last variable-width font data --- data/vwf_character_widths.asm | 621 ++++++++++++++++++++++++++++++++++++++++++ main.asm | 284 +------------------ 2 files changed, 628 insertions(+), 277 deletions(-) create mode 100755 data/vwf_character_widths.asm diff --git a/data/vwf_character_widths.asm b/data/vwf_character_widths.asm new file mode 100755 index 0000000..7726e5e --- /dev/null +++ b/data/vwf_character_widths.asm @@ -0,0 +1,621 @@ +CharacterWidthIndices1: ; 0x2962f + db $00 + db $E8 + db $E9 + db $F3 + db $F4 + db $F5 + db $F1 + db $F2 + db $F0 + db $EF + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $A1 + db $00 + db $00 + db $00 + db $00 + db $F8 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $ED + db $EE + db $F6 + db $F7 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $EA + db $EB + db $00 + db $00 + db $00 + db $B2 + db $00 + db $EC + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $A3 + db $A2 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + +CharacterWidthIndices2: ; 0x2969c + db $A8 + db $A9 + db $AA + db $AB + db $AC + db $AD + db $AE + db $AF + db $B0 + db $B1 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $B3 + db $B4 + db $B5 + db $B6 + db $B7 + db $B8 + db $B9 + db $BA + db $BB + db $BC + db $BD + db $BE + db $BF + db $C0 + db $C1 + db $C2 + db $C3 + db $C4 + db $C5 + db $C6 + db $C7 + db $C8 + db $C9 + db $CA + db $CB + db $CC + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $00 + db $CD + db $CE + db $CF + db $D0 + db $D1 + db $D2 + db $D3 + db $D4 + db $D5 + db $D6 + db $D7 + db $D8 + db $D9 + db $DA + db $DB + db $DC + db $DD + db $DE + db $DF + db $E0 + db $E1 + db $E2 + db $E3 + db $E4 + db $E5 + db $E6 + +CharacterWidthIndices4: ; 0x296e8 + db $30 + db $01 + db $31 + db $02 + db $32 + db $03 + db $33 + db $04 + db $34 + db $05 + db $06 + db $38 + db $07 + db $39 + db $08 + db $3A + db $09 + db $3B + db $0A + db $3C + db $0B + db $3D + db $0C + db $3E + db $0D + db $3F + db $0E + db $40 + db $0F + db $41 + db $10 + db $42 + db $11 + db $43 + db $2F + db $12 + db $44 + db $13 + db $45 + db $14 + db $46 + db $15 + db $16 + db $17 + db $18 + db $19 + db $1A + db $47 + db $4C + db $1B + db $48 + db $4D + db $1C + db $49 + db $4E + db $1D + db $4A + db $4F + db $1E + db $4B + db $50 + db $1F + db $20 + db $21 + db $22 + db $23 + db $35 + db $24 + db $36 + db $25 + db $37 + db $26 + db $27 + db $28 + db $29 + db $2A + db $2B + db $00 + db $2C + db $00 + db $00 + db $2D + db $2E + +CharacterWidthIndices3: ; 0x2973b + db $80 + db $51 + db $81 + db $52 + db $82 + db $53 + db $83 + db $54 + db $84 + db $55 + db $56 + db $88 + db $57 + db $89 + db $58 + db $8A + db $59 + db $8B + db $5A + db $8C + db $5B + db $8D + db $5C + db $8E + db $5D + db $8F + db $5E + db $90 + db $5F + db $91 + db $60 + db $92 + db $61 + db $93 + db $7F + db $62 + db $94 + db $63 + db $95 + db $64 + db $96 + db $65 + db $66 + db $67 + db $68 + db $69 + db $6A + db $97 + db $9C + db $6B + db $98 + db $9D + db $6C + db $99 + db $9E + db $6D + db $9A + db $9F + db $6E + db $9B + db $A0 + db $6F + db $70 + db $00 + db $71 + db $72 + db $73 + db $85 + db $74 + db $86 + db $75 + db $87 + db $76 + db $77 + db $78 + db $79 + db $7A + db $7B + db $00 + db $7C + db $00 + db $00 + db $7D + db $7E + db $00 + db $00 + db $00 + +CharacterWidths: ; 0x29792 +; The Pokedex shows variable-width font. This list specifies the width of every letter (tile?) + db $05 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $05 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $06 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $08 ; "A" + db $07 ; "B" + db $07 ; "C" + db $07 ; "D" + db $07 ; "E" + db $07 ; "F" + db $07 ; "G" + db $07 ; "H" + db $05 ; "I" + db $08 ; "J" + db $07 ; "K" + db $07 ; "L" + db $08 ; "M" + db $07 ; "N" + db $07 ; "O" + db $07 ; "P" + db $08 ; "Q" + db $07 ; "R" + db $07 ; "S" + db $08 ; "T" + db $07 ; "U" + db $08 ; "V" + db $08 ; "W" + db $08 ; "X" + db $08 ; "Y" + db $08 ; "Z" + db $07 + db $08 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $08 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $05 + db $08 + db $07 + db $07 + db $08 + db $07 + db $07 + db $07 + db $08 + db $07 + db $07 + db $08 + db $07 + db $08 + db $08 + db $08 + db $08 + db $08 + db $07 ; "a" + db $07 ; "b" + db $07 ; "c" + db $07 ; "d" + db $07 ; "e" + db $07 ; "f" + db $07 ; "g" + db $07 ; "h" + db $03 ; "i" + db $07 ; "j" + db $07 ; "k" + db $03 ; "l" + db $08 ; "m" + db $07 ; "n" + db $07 ; "o" + db $07 ; "p" + db $07 ; "q" + db $07 ; "r" + db $07 ; "s" + db $07 ; "t" + db $07 ; "u" + db $07 ; "v" + db $08 ; "w" + db $07 ; "x" + db $07 ; "y" + db $07 ; "z" + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $07 + db $03 + db $07 + db $05 + db $05 + db $05 + db $05 + db $05 + db $07 + db $07 + db $07 + db $07 + db $05 + db $07 + db $07 + db $07 + db $07 + db $07 diff --git a/main.asm b/main.asm index e3145b0..3cac760 100755 --- a/main.asm +++ b/main.asm @@ -44316,7 +44316,7 @@ Func_295e1: ; 0x295e1 .asm_295f9 push hl - call Func_29605 + call GetCharacterWidthIndex ld c, a ld b, $0 add hl, bc @@ -44325,11 +44325,11 @@ Func_295e1: ; 0x295e1 scf ret -Func_29605: ; 0x29605 +GetCharacterWidthIndex: ; 0x29605 ld a, b cp $81 jr nz, .asm_29611 - ld hl, Data_2962f + ld hl, CharacterWidthIndices1 ld a, c sub $40 ret @@ -44337,7 +44337,7 @@ Func_29605: ; 0x29605 .asm_29611 cp $83 jr nz, .asm_2961c - ld hl, Data_2973b + ld hl, CharacterWidthIndices3 ld a, c sub $40 ret @@ -44346,288 +44346,18 @@ Func_29605: ; 0x29605 ld a, c cp $9f jr nc, .asm_29628 - ld hl, Data_2969c + ld hl, CharacterWidthIndices2 ld a, c sub $4f ret .asm_29628 - ld hl, Data_296e8 + ld hl, CharacterWidthIndices4 ld a, c sub $9f ret -Data_2962f: - dr $2962f, $2969c - -Data_2969c: - dr $2969c, $296e8 - -Data_296e8: - dr $296e8, $2973b - -Data_2973b: - dr $2973b, $29792 - -CharacterWidths: ; 0x29792 -; The Pokedex shows variable-width font. This list specifies the width of every letter (tile?) - db $05 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $05 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $06 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $08 ; "A" - db $07 ; "B" - db $07 ; "C" - db $07 ; "D" - db $07 ; "E" - db $07 ; "F" - db $07 ; "G" - db $07 ; "H" - db $05 ; "I" - db $08 ; "J" - db $07 ; "K" - db $07 ; "L" - db $08 ; "M" - db $07 ; "N" - db $07 ; "O" - db $07 ; "P" - db $08 ; "Q" - db $07 ; "R" - db $07 ; "S" - db $08 ; "T" - db $07 ; "U" - db $08 ; "V" - db $08 ; "W" - db $08 ; "X" - db $08 ; "Y" - db $08 ; "Z" - db $07 - db $08 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $08 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $05 - db $08 - db $07 - db $07 - db $08 - db $07 - db $07 - db $07 - db $08 - db $07 - db $07 - db $08 - db $07 - db $08 - db $08 - db $08 - db $08 - db $08 - db $07 ; "a" - db $07 ; "b" - db $07 ; "c" - db $07 ; "d" - db $07 ; "e" - db $07 ; "f" - db $07 ; "g" - db $07 ; "h" - db $03 ; "i" - db $07 ; "j" - db $07 ; "k" - db $03 ; "l" - db $08 ; "m" - db $07 ; "n" - db $07 ; "o" - db $07 ; "p" - db $07 ; "q" - db $07 ; "r" - db $07 ; "s" - db $07 ; "t" - db $07 ; "u" - db $07 ; "v" - db $08 ; "w" - db $07 ; "x" - db $07 ; "y" - db $07 ; "z" - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $07 - db $03 - db $07 - db $05 - db $05 - db $05 - db $05 - db $05 - db $07 - db $07 - db $07 - db $07 - db $05 - db $07 - db $07 - db $07 - db $07 - db $07 - +INCLUDE "data/vwf_character_widths.asm" INCLUDE "text/pokedex_mon_names.asm" INCLUDE "data/mon_species.asm" INCLUDE "text/pokedex_species.asm" -- cgit v1.2.3