ref: 08e6009e61487a38b1e30c52252122b5ec7f9188
parent: f2fa5349d5c5db627f49cbfef44086c201e473cc
parent: 227005231951bf9adec1935866018878f1a558f3
author: pikalaxalt <[email protected]>
date: Tue Mar 8 14:54:13 EST 2016
Merge branch 'master' of https://github.com/pret/pokecrystal
--- a/Makefile
+++ b/Makefile
@@ -2,9 +2,9 @@
MD5 := md5sum -c --quiet
.SUFFIXES:
-.SUFFIXES: .2bpp
.PHONY: all clean crystal crystal11
.SECONDEXPANSION:
+.PRECIOUS: %.2bpp %.1bpp
poketools := extras/pokemontools
gfx := $(PYTHON) gfx.py
@@ -60,16 +60,13 @@
rgblink -n $*.sym -m $*.map -o $@ $^
rgbfix -Cjv -i BYTE -k 01 -l 0x33 -m 0x10 -p 0 -r 3 -t PM_CRYSTAL $@
-
%.png: ;
%.2bpp: %.png ; $(gfx) 2bpp $<
%.1bpp: %.png ; $(gfx) 1bpp $<
-%.lz: % ; $(gfx) lz $<
+%.lz: % ; $(gfx) lz $<
-
%.pal: %.2bpp ;
gfx/pics/%/normal.pal gfx/pics/%/bitmask.asm gfx/pics/%/frames.asm: gfx/pics/%/front.2bpp ;
%.bin: ;
%.blk: ;
%.tilemap: ;
-
--- a/home/text.asm
+++ b/home/text.asm
@@ -226,25 +226,12 @@
endm
dict2: macro
-if \1 == 0
- and a
-else
cp \1
-endc
- jr nz, \@
+ jr nz, ._\@
ld a, \2
-\@:
+._\@:
endm
-dict3: macro
-if \1 == 0
- and a
-else
- cp \1
-endc
- jr z, \2
-endm
-
dict "<DAY>", Char15
dict "<LINE>", LineChar
dict "<NEXT>", NextLineChar
@@ -281,31 +268,34 @@
dict "<USER>", PlaceMoveUsersName
dict "<ENEMY>", PlaceEnemysName
dict "<PLAY_G>", PlaceGenderedPlayerName
- dict3 $e4, .place
- dict3 $e5, .place
- jr .nope
+ cp "ﾟ"
+ jr z, .place ; should be .diacritic
+ cp "ﾞ"
+ jr z, .place ; should be .diacritic
+ jr .not_diacritic
+
+.diacritic
ld b, a
call Diacritic
jp NextChar
-.nope
- cp $60
+.not_diacritic
+ cp $60 ; Regular characters
jr nc, .place
- cp $40
+ cp "パ"
jr nc, .handakuten
.dakuten
-
cp $20
jr nc, .daku1
- add $80
+ add "カ" - "ガ"
jr .daku2
.daku1
- add $90
+ add "か" - "が"
.daku2
- ld b, $e5 ; dakuten
+ ld b, "ﾞ" ; dakuten
call Diacritic
jr .place
@@ -317,7 +307,7 @@
.han1
add "は" - "ぱ"
.han2
- ld b, $e4 ; handakuten
+ ld b, "ﾟ" ; handakuten
call Diacritic
.place
@@ -347,18 +337,18 @@
PrintRedsName: print_name RedsName ; 119b
PrintGreensName: print_name GreensName ; 11a2
-TrainerChar: print_name TrainerCharText ; 11a9
-TMChar: print_name TMCharText ; 11b0
-PCChar: print_name PCCharText ; 11b7
-RocketChar: print_name RocketCharText ; 11be
-PlacePOKe: print_name PlacePOKeText ; 11c5
-PlaceKougeki: print_name KougekiText ; 11cc
-SixDotsChar: print_name SixDotsCharText ; 11d3
-PlacePKMN: print_name PlacePKMNText ; 11da
-PlacePOKE: print_name PlacePOKEText ; 11e1
-Char35: print_name Char35Text ; 11e8
-Char36: print_name Char36Text ; 11ef
-Char37: print_name Char37Text ; 11f6
+TrainerChar: print_name TrainerCharText ; 11a9
+TMChar: print_name TMCharText ; 11b0
+PCChar: print_name PCCharText ; 11b7
+RocketChar: print_name RocketCharText ; 11be
+PlacePOKe: print_name PlacePOKeText ; 11c5
+PlaceKougeki: print_name KougekiText ; 11cc
+SixDotsChar: print_name SixDotsCharText ; 11d3
+PlacePKMN: print_name PlacePKMNText ; 11da
+PlacePOKE: print_name PlacePOKEText ; 11e1
+Char35: print_name Char35Text ; 11e8
+Char36: print_name Char36Text ; 11ef
+Char37: print_name Char37Text ; 11f6
PlaceMoveTargetsName:: ; 11fd
--- a/macros/charmap.asm
+++ b/macros/charmap.asm
@@ -191,6 +191,7 @@
charmap "ビ", $1a
charmap "ブ", $1b
charmap "ボ", $1c
+; charmap "ベ", $1d
charmap "が", $26
charmap "ぎ", $27
@@ -273,11 +274,13 @@
charmap "ュ", $ae
charmap "ョ", $af
charmap "ィ", $b0
+
charmap "あ", $b1
charmap "い", $b2
charmap "う", $b3
charmap "え", $b4
charmap "お", $b5
+
charmap "か", $b6
charmap "き", $b7
charmap "く", $b8
@@ -303,6 +306,7 @@
charmap "ふ", $cc
charmap "へ", $cd
charmap "ほ", $ce
+
charmap "ま", $cf
charmap "み", $d0
charmap "む", $d1
@@ -323,6 +327,10 @@
charmap "ゃ", $e0
charmap "ゅ", $e1
charmap "ょ", $e2
+
charmap "ー", $e3
+
+ charmap "ﾟ", $e4
+ charmap "ﾞ", $e5
charmap "ァ", $e9